From abb64433fc7a1d5e7c852ee65675c8abebd8fda1 Mon Sep 17 00:00:00 2001
From: Gabe Lyons <gabe.lyons@acryl.io>
Date: Mon, 30 Dec 2024 13:32:28 -0800
Subject: [PATCH 001/249] fix(tests): fixing QueryPropertiesMapperTest.java
 (#12241)

---
 .../types/common/mappers/QueryPropertiesMapperTest.java       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/common/mappers/QueryPropertiesMapperTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/common/mappers/QueryPropertiesMapperTest.java
index 756115cf2054a9..a0251adca78f9d 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/common/mappers/QueryPropertiesMapperTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/common/mappers/QueryPropertiesMapperTest.java
@@ -55,10 +55,6 @@ public void testMapWithRequiredFields() throws Exception {
     assertEquals(result.getLastModified().getTime().longValue(), 2000L);
     assertEquals(result.getLastModified().getActor(), userUrn.toString());
 
-    // Verify createdOn resolved stamp
-    assertEquals(result.getCreatedOn().getTime().longValue(), 1000L);
-    assertEquals(result.getCreatedOn().getActor().getUrn(), userUrn.toString());
-
     // Verify optional fields are null
     assertNull(result.getName());
     assertNull(result.getDescription());

From ee54f1fb6181c85a85194dde7cc86ab7af5745b7 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Mon, 30 Dec 2024 17:44:09 -0600
Subject: [PATCH 002/249] feat(delete): delete logic non-strict monotonically
 increasing version (#12242)

---
 .../linkedin/metadata/entity/AspectDao.java   |  11 ++
 .../metadata/entity/EntityServiceImpl.java    |  18 ++-
 .../entity/cassandra/CassandraAspectDao.java  |  33 ++++--
 .../metadata/entity/ebean/EbeanAspectDao.java |  53 ++++++---
 .../metadata/entity/EntityServiceTest.java    | 105 ++++++++++++++++++
 5 files changed, 188 insertions(+), 32 deletions(-)

diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/AspectDao.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/AspectDao.java
index 7a8c5c76c31c3a..0d5bdd9ff64286 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/AspectDao.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/AspectDao.java
@@ -6,6 +6,7 @@
 import com.linkedin.metadata.entity.ebean.PartitionedStream;
 import com.linkedin.metadata.entity.restoreindices.RestoreIndicesArgs;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
+import com.linkedin.util.Pair;
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.Map;
@@ -155,6 +156,16 @@ default Map<String, Long> getNextVersions(
 
   long getMaxVersion(@Nonnull final String urn, @Nonnull final String aspectName);
 
+  /**
+   * Return the min/max version for the given URN & aspect
+   *
+   * @param urn the urn
+   * @param aspectName the aspect
+   * @return the range of versions, if they do not exist -1 is returned
+   */
+  @Nonnull
+  Pair<Long, Long> getVersionRange(@Nonnull final String urn, @Nonnull final String aspectName);
+
   void setWritable(boolean canWrite);
 
   @Nonnull
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
index 8ae09111204cab..75f16ae4d981d2 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
@@ -2229,8 +2229,9 @@ public Set<Urn> exists(
   }
 
   /** Does not emit MCL */
+  @VisibleForTesting
   @Nullable
-  private RollbackResult deleteAspectWithoutMCL(
+  RollbackResult deleteAspectWithoutMCL(
       @Nonnull OperationContext opContext,
       String urn,
       String aspectName,
@@ -2288,11 +2289,14 @@ private RollbackResult deleteAspectWithoutMCL(
 
               // 4. Fetch all preceding aspects, that match
               List<EntityAspect> aspectsToDelete = new ArrayList<>();
-              long maxVersion = aspectDao.getMaxVersion(urn, aspectName);
+              Pair<Long, Long> versionRange = aspectDao.getVersionRange(urn, aspectName);
+              long minVersion = Math.max(0, versionRange.getFirst());
+              long maxVersion = Math.max(0, versionRange.getSecond());
+
               EntityAspect.EntitySystemAspect survivingAspect = null;
-              String previousMetadata = null;
+
               boolean filterMatch = true;
-              while (maxVersion > 0 && filterMatch) {
+              while (maxVersion > minVersion && filterMatch) {
                 EntityAspect.EntitySystemAspect candidateAspect =
                     (EntityAspect.EntitySystemAspect)
                         EntityUtils.toSystemAspect(
@@ -2305,11 +2309,13 @@ private RollbackResult deleteAspectWithoutMCL(
                     previousSysMetadata != null && filterMatch(previousSysMetadata, conditions);
                 if (filterMatch) {
                   aspectsToDelete.add(candidateAspect.getEntityAspect());
-                  maxVersion = maxVersion - 1;
+                } else if (candidateAspect == null) {
+                  // potential gap
+                  filterMatch = true;
                 } else {
                   survivingAspect = candidateAspect;
-                  previousMetadata = survivingAspect.getMetadataRaw();
                 }
+                maxVersion = maxVersion - 1;
               }
 
               // Delete validation hooks
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/cassandra/CassandraAspectDao.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/cassandra/CassandraAspectDao.java
index 4d177d50ea44de..c5a6615ac4face 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/cassandra/CassandraAspectDao.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/cassandra/CassandraAspectDao.java
@@ -36,6 +36,7 @@
 import com.linkedin.metadata.query.ExtraInfo;
 import com.linkedin.metadata.query.ExtraInfoArray;
 import com.linkedin.metadata.query.ListResultMetadata;
+import com.linkedin.util.Pair;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.sql.Timestamp;
@@ -110,7 +111,14 @@ public Map<String, Map<String, EntityAspect>> getLatestAspects(
   @Override
   public long getMaxVersion(@Nonnull final String urn, @Nonnull final String aspectName) {
     validateConnection();
-    Map<String, Long> result = getMaxVersions(urn, ImmutableSet.of(aspectName));
+    Map<String, Pair<Long, Long>> result = getVersionRanges(urn, ImmutableSet.of(aspectName));
+    return result.get(aspectName).getSecond();
+  }
+
+  @Override
+  @Nonnull
+  public Pair<Long, Long> getVersionRange(@Nonnull String urn, @Nonnull String aspectName) {
+    Map<String, Pair<Long, Long>> result = getVersionRanges(urn, ImmutableSet.of(aspectName));
     return result.get(aspectName);
   }
 
@@ -148,15 +156,17 @@ public boolean checkIfAspectExists(@Nonnull String aspectName) {
     return rs.one() != null;
   }
 
-  private Map<String, Long> getMaxVersions(
+  private Map<String, Pair<Long, Long>> getVersionRanges(
       @Nonnull final String urn, @Nonnull final Set<String> aspectNames) {
     SimpleStatement ss =
         selectFrom(CassandraAspect.TABLE_NAME)
             .selectors(
                 Selector.column(CassandraAspect.URN_COLUMN),
                 Selector.column(CassandraAspect.ASPECT_COLUMN),
+                Selector.function("min", Selector.column(CassandraAspect.VERSION_COLUMN))
+                    .as("min_version"),
                 Selector.function("max", Selector.column(CassandraAspect.VERSION_COLUMN))
-                    .as(CassandraAspect.VERSION_COLUMN))
+                    .as("max_version"))
             .whereColumn(CassandraAspect.URN_COLUMN)
             .isEqualTo(literal(urn))
             .whereColumn(CassandraAspect.ASPECT_COLUMN)
@@ -168,21 +178,21 @@ private Map<String, Long> getMaxVersions(
             .build();
 
     ResultSet rs = _cqlSession.execute(ss);
-    Map<String, Long> aspectVersions =
+    Map<String, Pair<Long, Long>> aspectVersionRanges =
         rs.all().stream()
             .collect(
                 Collectors.toMap(
                     row -> row.getString(CassandraAspect.ASPECT_COLUMN),
-                    row -> row.getLong(CassandraAspect.VERSION_COLUMN)));
+                    row -> Pair.of(row.getLong("min_version"), row.getLong("max_version"))));
 
-    // For each requested aspect that didn't come back from DB, add a version -1
+    // For each requested aspect that didn't come back from DB, add a version range of (-1, -1)
     for (String aspect : aspectNames) {
-      if (!aspectVersions.containsKey(aspect)) {
-        aspectVersions.put(aspect, -1L);
+      if (!aspectVersionRanges.containsKey(aspect)) {
+        aspectVersionRanges.put(aspect, Pair.of(-1L, -1L));
       }
     }
 
-    return aspectVersions;
+    return aspectVersionRanges;
   }
 
   @Override
@@ -551,11 +561,12 @@ public Map<String, Map<String, Long>> getNextVersions(Map<String, Set<String>> u
     Map<String, Map<String, Long>> result = new HashMap<>();
 
     for (Map.Entry<String, Set<String>> aspectNames : urnAspectMap.entrySet()) {
-      Map<String, Long> maxVersions = getMaxVersions(aspectNames.getKey(), aspectNames.getValue());
+      Map<String, Pair<Long, Long>> maxVersions =
+          getVersionRanges(aspectNames.getKey(), aspectNames.getValue());
       Map<String, Long> nextVersions = new HashMap<>();
 
       for (String aspectName : aspectNames.getValue()) {
-        long latestVersion = maxVersions.get(aspectName);
+        long latestVersion = maxVersions.get(aspectName).getSecond();
         long nextVal = latestVersion < 0 ? ASPECT_LATEST_VERSION : latestVersion + 1L;
         nextVersions.put(aspectName, nextVal);
       }
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/ebean/EbeanAspectDao.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/ebean/EbeanAspectDao.java
index ea580a97c51886..ad8333407a2760 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/ebean/EbeanAspectDao.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/ebean/EbeanAspectDao.java
@@ -38,6 +38,8 @@
 import io.ebean.Query;
 import io.ebean.RawSql;
 import io.ebean.RawSqlBuilder;
+import io.ebean.SqlQuery;
+import io.ebean.SqlRow;
 import io.ebean.Transaction;
 import io.ebean.TxScope;
 import io.ebean.annotation.TxIsolation;
@@ -247,10 +249,18 @@ private void saveEbeanAspect(
       @Nonnull final EbeanAspectV2 ebeanAspect,
       final boolean insert) {
     validateConnection();
-    if (insert) {
-      _server.insert(ebeanAspect, txContext.tx());
+    if (txContext != null && txContext.tx() != null) {
+      if (insert) {
+        _server.insert(ebeanAspect, txContext.tx());
+      } else {
+        _server.update(ebeanAspect, txContext.tx());
+      }
     } else {
-      _server.update(ebeanAspect, txContext.tx());
+      if (insert) {
+        _server.insert(ebeanAspect);
+      } else {
+        _server.update(ebeanAspect);
+      }
     }
   }
 
@@ -864,20 +874,33 @@ public <T> T runInTransactionWithRetryUnlocked(
   }
 
   @Override
-  public long getMaxVersion(@Nonnull final String urn, @Nonnull final String aspectName) {
+  @Nonnull
+  public Pair<Long, Long> getVersionRange(
+      @Nonnull final String urn, @Nonnull final String aspectName) {
     validateConnection();
-    final List<EbeanAspectV2.PrimaryKey> result =
-        _server
-            .find(EbeanAspectV2.class)
-            .where()
-            .eq(EbeanAspectV2.URN_COLUMN, urn.toString())
-            .eq(EbeanAspectV2.ASPECT_COLUMN, aspectName)
-            .orderBy()
-            .desc(EbeanAspectV2.VERSION_COLUMN)
-            .setMaxRows(1)
-            .findIds();
 
-    return result.isEmpty() ? -1 : result.get(0).getVersion();
+    // Use SQL aggregation to get both min and max in a single query
+    SqlQuery query =
+        _server.sqlQuery(
+            "SELECT MIN(version) as min_version, MAX(version) as max_version "
+                + "FROM metadata_aspect_v2 "
+                + "WHERE urn = :urn AND aspect = :aspect");
+
+    query.setParameter("urn", urn);
+    query.setParameter("aspect", aspectName);
+
+    SqlRow result = query.findOne();
+
+    if (result == null) {
+      return Pair.of(-1L, -1L);
+    }
+
+    return Pair.of(result.getLong("min_version"), result.getLong("max_version"));
+  }
+
+  @Override
+  public long getMaxVersion(@Nonnull final String urn, @Nonnull final String aspectName) {
+    return getVersionRange(urn, aspectName).getSecond();
   }
 
   /**
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/entity/EntityServiceTest.java b/metadata-io/src/test/java/com/linkedin/metadata/entity/EntityServiceTest.java
index c00632e5cf5424..6eda210baf7d4a 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/entity/EntityServiceTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/entity/EntityServiceTest.java
@@ -84,6 +84,8 @@
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.test.metadata.context.TestOperationContexts;
 import jakarta.annotation.Nonnull;
+import java.sql.Timestamp;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -2670,6 +2672,109 @@ public void testPatchAddNonExistent() throws Exception {
         "Expected all tags");
   }
 
+  @Test
+  public void testDeleteUrnWithRunIdFilterNonMatch() throws Exception {
+    Urn entityUrn = UrnUtils.getUrn("urn:li:corpuser:deleteWithFilterNonMatch");
+
+    // Create aspects with different run IDs
+    SystemMetadata metadata1 = AspectGenerationUtils.createSystemMetadata();
+    metadata1.setRunId("run-123");
+
+    SystemMetadata metadata2 = AspectGenerationUtils.createSystemMetadata();
+    metadata2.setRunId("run-456"); // Different run ID
+
+    String aspectName = AspectGenerationUtils.getAspectName(new CorpUserInfo());
+
+    // First ingest the aspect that should survive (run-456)
+    CorpUserInfo writeAspect1 = AspectGenerationUtils.createCorpUserInfo("first@test.com");
+    List<Pair<String, RecordTemplate>> firstPair = new ArrayList<>();
+    firstPair.add(getAspectRecordPair(writeAspect1, CorpUserInfo.class));
+    _entityServiceImpl.ingestAspects(opContext, entityUrn, firstPair, TEST_AUDIT_STAMP, metadata2);
+
+    // Then ingest the aspect that should be deleted (run-123)
+    CorpUserInfo writeAspect2 = AspectGenerationUtils.createCorpUserInfo("second@test.com");
+    List<Pair<String, RecordTemplate>> secondPair = new ArrayList<>();
+    secondPair.add(getAspectRecordPair(writeAspect2, CorpUserInfo.class));
+    _entityServiceImpl.ingestAspects(opContext, entityUrn, secondPair, TEST_AUDIT_STAMP, metadata1);
+
+    // When we try to delete with runId=run-123, the version with runId=run-456 should survive
+    RollbackResult result =
+        _entityServiceImpl.deleteAspectWithoutMCL(
+            opContext,
+            entityUrn.toString(),
+            aspectName,
+            Collections.singletonMap("runId", "run-123"),
+            true);
+
+    // The aspect with run-456 should still exist
+    RecordTemplate survivingAspect =
+        _entityServiceImpl.getLatestAspect(opContext, entityUrn, aspectName);
+    assertTrue(DataTemplateUtil.areEqual(writeAspect1, survivingAspect));
+
+    // Verify the RollbackResult details
+    assertNotNull(result);
+    assertEquals(result.getUrn(), entityUrn);
+    assertEquals(result.getEntityName(), "corpuser");
+    assertEquals(result.getAspectName(), aspectName);
+  }
+
+  @Test
+  public void testDeleteUrnWithRunIdFilterNonMatchVersionGap() throws Exception {
+    Urn entityUrn = UrnUtils.getUrn("urn:li:corpuser:deleteWithFilterNonMatch");
+    String aspectName = AspectGenerationUtils.getAspectName(new CorpUserInfo());
+
+    // Metadata that should be preserved (run-456)
+    SystemMetadata metadata456 = AspectGenerationUtils.createSystemMetadata();
+    metadata456.setRunId("run-456"); // Different run ID
+    CorpUserInfo writeAspect456 = AspectGenerationUtils.createCorpUserInfo("first@test.com");
+    List<Pair<String, RecordTemplate>> firstPair = new ArrayList<>();
+    firstPair.add(getAspectRecordPair(writeAspect456, CorpUserInfo.class));
+    _entityServiceImpl.ingestAspects(
+        opContext, entityUrn, firstPair, TEST_AUDIT_STAMP, metadata456);
+
+    // Metadata that should be deleted (run-123)
+    SystemMetadata metadata123 = AspectGenerationUtils.createSystemMetadata();
+    metadata123.setRunId("run-123");
+    CorpUserInfo writeAspect123 = AspectGenerationUtils.createCorpUserInfo("second@test.com");
+    List<Pair<String, RecordTemplate>> secondPair = new ArrayList<>();
+    secondPair.add(getAspectRecordPair(writeAspect123, CorpUserInfo.class));
+    _entityServiceImpl.ingestAspects(
+        opContext, entityUrn, secondPair, TEST_AUDIT_STAMP, metadata123);
+
+    // Then insert another run-123 with version gap
+    _aspectDao.saveAspect(
+        null,
+        entityUrn.toString(),
+        aspectName,
+        RecordUtils.toJsonString(writeAspect123),
+        TEST_AUDIT_STAMP.getActor().toString(),
+        null,
+        Timestamp.from(Instant.ofEpochMilli(TEST_AUDIT_STAMP.getTime())),
+        RecordUtils.toJsonString(metadata123),
+        10L,
+        true);
+
+    // When we try to delete with runId=run-123, the version with runId=run-456 should survive
+    RollbackResult result =
+        _entityServiceImpl.deleteAspectWithoutMCL(
+            opContext,
+            entityUrn.toString(),
+            aspectName,
+            Collections.singletonMap("runId", "run-123"),
+            true);
+
+    // The aspect with run-456 should still exist
+    RecordTemplate survivingAspect =
+        _entityServiceImpl.getLatestAspect(opContext, entityUrn, aspectName);
+    assertTrue(DataTemplateUtil.areEqual(writeAspect456, survivingAspect));
+
+    // Verify the RollbackResult details
+    assertNotNull(result);
+    assertEquals(result.getUrn(), entityUrn);
+    assertEquals(result.getEntityName(), "corpuser");
+    assertEquals(result.getAspectName(), aspectName);
+  }
+
   @Nonnull
   protected com.linkedin.entity.Entity createCorpUserEntity(Urn entityUrn, String email)
       throws Exception {

From 96c60580a6f3171314787a65dc072f2debb42771 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Mon, 30 Dec 2024 21:04:17 -0600
Subject: [PATCH 003/249] docs(graphql): create graphql best practices (#12229)

---
 docs-website/sidebars.js                   |    5 +
 docs/api/graphql/graphql-best-practices.md | 1022 ++++++++++++++++++++
 docs/api/graphql/how-to-set-up-graphql.md  |   27 +
 3 files changed, 1054 insertions(+)
 create mode 100644 docs/api/graphql/graphql-best-practices.md

diff --git a/docs-website/sidebars.js b/docs-website/sidebars.js
index c18d8671318f64..bcb06affedcff0 100644
--- a/docs-website/sidebars.js
+++ b/docs-website/sidebars.js
@@ -780,6 +780,11 @@ module.exports = {
                   label: "Getting Started With GraphQL",
                   id: "docs/api/graphql/getting-started",
                 },
+                {
+                  type: "doc",
+                  label: "GraphQL Best Practices",
+                  id: "docs/api/graphql/graphql-best-practices",
+                },
                 {
                   type: "doc",
                   label: "Access Token Management",
diff --git a/docs/api/graphql/graphql-best-practices.md b/docs/api/graphql/graphql-best-practices.md
new file mode 100644
index 00000000000000..d4c85d52e29f98
--- /dev/null
+++ b/docs/api/graphql/graphql-best-practices.md
@@ -0,0 +1,1022 @@
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# GraphQL Best Practices
+
+## Introduction:
+
+DataHub’s GraphQL API is designed to power the UI. The following guidelines are written with this use-case in mind.
+
+## General Best Practices
+
+### Query Optimizations
+
+> One of GraphQL's biggest advantages over a traditional REST API is its support for **declarative data fetching**. Each component can (and should) query exactly the fields it requires to render, with no superfluous data sent over the network. If instead your root component executes a single, enormous query to obtain data for all of its children, it might query on behalf of components that *aren't even rendered* given the current state. This can result in a delayed response, and it drastically reduces the likelihood that the query's result can be reused by a **server-side response cache**. [[ref](https://www.apolloGraphQL.com/docs/react/data/operation-best-practices#query-only-the-data-you-need-where-you-need-it)]
+>
+1. Minimize over-fetching by only requesting data needed to be displayed.
+2. Limit result counts and use pagination (additionally see section below on `Deep Pagination`).
+3. Avoid deeply nested queries and instead break out queries into separate requests for the nested objects.
+
+### Client-side Caching
+
+Clients, such as Apollo Client (javascript, python `apollo-client-python`), offer [client-side caching](https://www.apolloGraphQL.com/docs/react/caching/overview) to prevent requests to the service and are able to understand the content of the GraphQL query. This enables more advanced caching vs HTTP response caching.
+
+### Reuse Pieces of Query Logic with Fragments
+
+One powerful feature of GraphQL that we recommend you use is [fragments](https://hygraph.com/learn/GraphQL/fragments). Fragments allow you to define pieces of a query that you can reuse across any client-side query that you define. Basically, you can define a set of fields that you want to query, and reuse it in multiple places.
+
+This technique makes maintaining your GraphQL queries much more doable. For example, if you want to request a new field for an entity type across many queries, you’re able to update it in one place if you’re leveraging fragments.
+
+## Search Query Best Practices
+
+### Deep Pagination:  search* vs scroll* APIs
+
+`search*` APIs such as [`searchAcrossEntities`](https://datahubproject.io/docs/GraphQL/queries/#searchacrossentities) are designed for minimal pagination (< ~50). They do not perform well for deep pagination requests. Use the equivalent `scroll*` APIs such as [`scrollAcrossEntities`](https://datahubproject.io/docs/GraphQL/queries/#scrollacrossentities) when expecting the need to paginate deeply into the result set.
+
+Note: that it is impossible to use `search*` for paginating beyond 10k results.
+
+#### Examples
+
+In the following examples we demonstrate pagination for both `scroll*` and `search*` requests. This particular request is searching for two entities, Datasets and Charts, that
+contain `pet` in the entities' name or title. The results will only include the URN for the entities.
+
+<Tab>
+<TabItem value="Scroll" label="Scroll" default>
+Page 1 Request:
+
+```graphql
+{
+  scrollAcrossEntities(
+    input: {
+      types: [DATASET, CHART]
+      count: 2
+      query: "*"
+      orFilters: [
+        { and: [{ field: "name", condition: CONTAIN, values: ["pet"] }] },
+        { and: [{ field: "title", condition: CONTAIN, values: ["pet"] }] }
+      ]
+    }
+  ) {
+    nextScrollId
+    searchResults {
+      entity {
+        ... on Dataset {
+          urn
+        }
+        ... on Chart {
+          urn
+        }
+      }
+    }
+  }
+}
+```
+
+Page 1 Result:
+
+```json
+{
+  "data": {
+    "scrollAcrossEntities": {
+      "nextScrollId": "eyJzb3J0IjpbMi4wNzk2ODc2LCJ1cm46bGk6ZGF0YXNldDoodXJuOmxpOmRhdGFQbGF0Zm9ybTpzbm93Zmxha2UsbG9uZ190YWlsX2NvbXBhbmlvbnMuYWRvcHRpb24ucGV0X3Byb2ZpbGVzLFBST0QpIl0sInBpdElkIjpudWxsLCJleHBpcmF0aW9uVGltZSI6MH0=",
+      "searchResults": [
+        {
+          "entity": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,long_tail_companions.analytics.pet_details,PROD)"
+          }
+        },
+        {
+          "entity": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,long_tail_companions.adoption.pet_profiles,PROD)"
+          }
+        }
+      ]
+    }
+  },
+  "extensions": {}
+}
+```
+
+Page 2 Request:
+
+```graphql
+{
+  scrollAcrossEntities(
+    input: {
+      scrollId: "eyJzb3J0IjpbMi4wNzk2ODc2LCJ1cm46bGk6ZGF0YXNldDoodXJuOmxpOmRhdGFQbGF0Zm9ybTpzbm93Zmxha2UsbG9uZ190YWlsX2NvbXBhbmlvbnMuYWRvcHRpb24ucGV0X3Byb2ZpbGVzLFBST0QpIl0sInBpdElkIjpudWxsLCJleHBpcmF0aW9uVGltZSI6MH0="
+      types: [DATASET, CHART]
+      count: 2
+      query: "*"
+      orFilters: [
+        { and: [{ field: "name", condition: CONTAIN, values: ["pet"] }] },
+        { and: [{ field: "title", condition: CONTAIN, values: ["pet"] }] }
+      ]
+    }
+  ) {
+    nextScrollId
+    searchResults {
+      entity {
+        ... on Dataset {
+          urn
+        }
+        ... on Chart {
+          urn
+        }
+      }
+    }
+  }
+}
+```
+
+Page 2 Result:
+
+```json
+{
+  "data": {
+    "scrollAcrossEntities": {
+      "nextScrollId": "eyJzb3J0IjpbMS43MTg3NSwidXJuOmxpOmRhdGFzZXQ6KHVybjpsaTpkYXRhUGxhdGZvcm06c25vd2ZsYWtlLGxvbmdfdGFpbF9jb21wYW5pb25zLmFkb3B0aW9uLnBldHMsUFJPRCkiXSwicGl0SWQiOm51bGwsImV4cGlyYXRpb25UaW1lIjowfQ==",
+      "searchResults": [
+        {
+          "entity": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,long_tail_companions.analytics.pet_status_history,PROD)"
+          }
+        },
+        {
+          "entity": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,long_tail_companions.adoption.pets,PROD)"
+          }
+        }
+      ]
+    }
+  },
+  "extensions": {}
+}
+```
+</TabItem>
+
+<TabItem value="Search" label="Search">
+Page 1 Request:
+
+```graphql
+{
+  searchAcrossEntities(
+    input: {
+      types: [DATASET, CHART]
+      count: 2,
+      start: 0
+      query: "*"
+      orFilters: [
+        { and: [{ field: "name", condition: CONTAIN, values: ["pet"] }] },
+        { and: [{ field: "title", condition: CONTAIN, values: ["pet"] }] }
+      ]
+    }
+  ) {
+    searchResults {
+      entity {
+        ... on Dataset {
+          urn
+        }
+        ... on Chart {
+          urn
+        }
+      }
+    }
+  }
+}
+```
+
+Page 1 Response:
+
+```json
+{
+  "data": {
+    "searchAcrossEntities": {
+      "searchResults": [
+        {
+          "entity": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,long_tail_companions.analytics.pet_details,PROD)"
+          }
+        },
+        {
+          "entity": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,long_tail_companions.adoption.pet_profiles,PROD)"
+          }
+        }
+      ]
+    }
+  },
+  "extensions": {}
+}
+```
+
+Page 2 Request:
+
+```graphql
+{
+  searchAcrossEntities(
+    input: {
+      types: [DATASET, CHART]
+      count: 2,
+      start: 2
+      query: "*"
+      orFilters: [
+        { and: [{ field: "name", condition: CONTAIN, values: ["pet"] }] },
+        { and: [{ field: "title", condition: CONTAIN, values: ["pet"] }] }
+      ]
+    }
+  ) {
+    searchResults {
+      entity {
+        ... on Dataset {
+          urn
+        }
+        ... on Chart {
+          urn
+        }
+      }
+    }
+  }
+}
+```
+
+Page 2 Response:
+
+```json
+{
+  "data": {
+    "searchAcrossEntities": {
+      "searchResults": [
+        {
+          "entity": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,long_tail_companions.analytics.pet_status_history,PROD)"
+          }
+        },
+        {
+          "entity": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,long_tail_companions.adoption.pets,PROD)"
+          }
+        }
+      ]
+    }
+  },
+  "extensions": {}
+}
+```
+</TabItem>
+</Tab>
+
+### SearchFlags: Highlighting and Aggregation
+
+When performing queries which accept [`searchFlags`](https://datahubproject.io/docs/GraphQL/inputObjects#searchflags) and highlighting and aggregation is not needed, be sure to disable these flags.
+
+- skipHighlighting: true
+- skipAggregates: true
+
+As a fallback, if only certain fields require highlighting use `customHighlightingFields` to limit highlighting to the specific fields.
+
+<Tab>
+<TabItem value="Skip" label="Skip Example" default>
+
+Example for skipping highlighting and aggregates, typically used for scrolling search requests.
+
+```graphql
+{
+  scrollAcrossEntities(
+    input: {types: [DATASET], count: 2, query: "pet", searchFlags: {skipAggregates: true, skipHighlighting: true}}
+  ) {
+    searchResults {
+      entity {
+        ... on Dataset {
+          urn
+        }
+      }
+      matchedFields {
+        name
+        value
+      }
+    }
+    facets {
+      displayName
+      aggregations {
+        value
+        count
+      }
+    }
+  }
+}
+```
+
+Response:
+
+Note that a few `matchedFields` are still returned by default [`urn`, `customProperties`]
+
+```json
+{
+  "data": {
+    "scrollAcrossEntities": {
+      "searchResults": [
+        {
+          "entity": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,long_tail_companions.analytics.pet_details,PROD)"
+          },
+          "matchedFields": [
+            {
+              "name": "urn",
+              "value": ""
+            },
+            {
+              "name": "customProperties",
+              "value": ""
+            }
+          ]
+        },
+        {
+          "entity": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,long_tail_companions.analytics.pet_details,PROD)"
+          },
+          "matchedFields": [
+            {
+              "name": "urn",
+              "value": ""
+            },
+            {
+              "name": "customProperties",
+              "value": ""
+            }
+          ]
+        }
+      ],
+      "facets": []
+    }
+  },
+  "extensions": {}
+}
+```
+
+</TabItem>
+
+<TabItem value="Custom" label="Custom Highlighting">
+
+Custom highlighting can be used for searchAcrossEntities when only a limited number of fields are useful for highlighting. In this example we specifically request highlighting for `description`.
+
+```graphql
+{
+  searchAcrossEntities(
+    input: {types: [DATASET], count: 2, query: "pet", searchFlags: {customHighlightingFields: ["description"]}}
+  ) {
+    searchResults {
+      entity {
+        ... on Dataset {
+          urn
+        }
+      }
+      matchedFields {
+        name
+        value
+      }
+    }
+  }
+}
+```
+
+Response:
+
+```json
+{
+  "data": {
+    "searchAcrossEntities": {
+      "searchResults": [
+        {
+          "entity": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:dbt,long_tail_companions.analytics.pet_details,PROD)"
+          },
+          "matchedFields": [
+            {
+              "name": "urn",
+              "value": ""
+            },
+            {
+              "name": "customProperties",
+              "value": ""
+            },
+            {
+              "name": "description",
+              "value": "Table with all pet-related details"
+            }
+          ]
+        },
+        {
+          "entity": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,long_tail_companions.analytics.pet_details,PROD)"
+          },
+          "matchedFields": [
+            {
+              "name": "urn",
+              "value": ""
+            },
+            {
+              "name": "customProperties",
+              "value": ""
+            }
+          ]
+        }
+      ]
+    }
+  },
+  "extensions": {}
+}
+```
+
+</TabItem>
+</Tab>
+
+
+### Aggregation
+
+When aggregation is required with `searchAcrossEntities`, it is possible to set the `count` to 0 to avoid fetching the top search hits, only returning the aggregations. Alternatively [aggregateAcrossEntities](https://datahubproject.io/docs/GraphQL/queries#aggregateacrossentities) provides counts and can provide faster results from server-side caching.
+
+Request:
+
+```graphql
+{
+  searchAcrossEntities(
+    input: {types: [DATASET], count: 0, query: "pet", searchFlags: {skipHighlighting: true}}
+  ) {
+    searchResults {
+      entity {
+        ... on Dataset {
+          urn
+        }
+      }
+      matchedFields {
+        name
+        value
+      }
+    }
+    facets {
+      displayName
+      aggregations {
+        value
+        count
+      }
+    }
+  }
+}
+```
+
+Response:
+
+```json
+{
+  "data": {
+    "searchAcrossEntities": {
+      "searchResults": [],
+      "facets": [
+        {
+          "displayName": "Container",
+          "aggregations": [
+            {
+              "value": "urn:li:container:b41c14bc5cb3ccfbb0433c8cbdef2992",
+              "count": 4
+            },
+            {
+              "value": "urn:li:container:701919de0ec93cb338fe9bac0b35403c",
+              "count": 3
+            }
+          ]
+        },
+        {
+          "displayName": "Sub Type",
+          "aggregations": [
+            {
+              "value": "table",
+              "count": 9
+            },
+            {
+              "value": "view",
+              "count": 6
+            },
+            {
+              "value": "explore",
+              "count": 5
+            },
+            {
+              "value": "source",
+              "count": 4
+            },
+            {
+              "value": "incremental",
+              "count": 1
+            }
+          ]
+        },
+        {
+          "displayName": "Type",
+          "aggregations": [
+            {
+              "value": "DATASET",
+              "count": 24
+            }
+          ]
+        },
+        {
+          "displayName": "Environment",
+          "aggregations": [
+            {
+              "value": "PROD",
+              "count": 24
+            }
+          ]
+        },
+        {
+          "displayName": "Glossary Term",
+          "aggregations": [
+            {
+              "value": "urn:li:glossaryTerm:Adoption.DaysInStatus",
+              "count": 1
+            },
+            {
+              "value": "urn:li:glossaryTerm:Ecommerce.HighRisk",
+              "count": 1
+            },
+            {
+              "value": "urn:li:glossaryTerm:Classification.Confidential",
+              "count": 1
+            }
+          ]
+        },
+        {
+          "displayName": "Domain",
+          "aggregations": [
+            {
+              "value": "urn:li:domain:094dc54b-0ebc-40a6-a4cf-e1b75e8b8089",
+              "count": 6
+            },
+            {
+              "value": "urn:li:domain:7d64d0fa-66c3-445c-83db-3a324723daf8",
+              "count": 2
+            }
+          ]
+        },
+        {
+          "displayName": "Owned By",
+          "aggregations": [
+            {
+              "value": "urn:li:corpGroup:Adoption",
+              "count": 5
+            },
+            {
+              "value": "urn:li:corpuser:shannon@longtail.com",
+              "count": 4
+            },
+            {
+              "value": "urn:li:corpuser:admin",
+              "count": 2
+            },
+            {
+              "value": "urn:li:corpGroup:Analytics Engineering",
+              "count": 2
+            },
+            {
+              "value": "urn:li:corpuser:avigdor@longtail.com",
+              "count": 1
+            },
+            {
+              "value": "urn:li:corpuser:prentiss@longtail.com",
+              "count": 1
+            },
+            {
+              "value": "urn:li:corpuser:tasha@longtail.com",
+              "count": 1
+            },
+            {
+              "value": "urn:li:corpuser:ricca@longtail.com",
+              "count": 1
+            },
+            {
+              "value": "urn:li:corpuser:emilee@longtail.com",
+              "count": 1
+            }
+          ]
+        },
+        {
+          "displayName": "Platform",
+          "aggregations": [
+            {
+              "value": "urn:li:dataPlatform:looker",
+              "count": 8
+            },
+            {
+              "value": "urn:li:dataPlatform:dbt",
+              "count": 7
+            },
+            {
+              "value": "urn:li:dataPlatform:snowflake",
+              "count": 7
+            },
+            {
+              "value": "urn:li:dataPlatform:s3",
+              "count": 1
+            },
+            {
+              "value": "urn:li:dataPlatform:mongodb",
+              "count": 1
+            }
+          ]
+        },
+        {
+          "displayName": "Tag",
+          "aggregations": [
+            {
+              "value": "urn:li:tag:prod_model",
+              "count": 3
+            },
+            {
+              "value": "urn:li:tag:pii",
+              "count": 2
+            },
+            {
+              "value": "urn:li:tag:business critical",
+              "count": 2
+            },
+            {
+              "value": "urn:li:tag:business_critical",
+              "count": 2
+            },
+            {
+              "value": "urn:li:tag:Tier1",
+              "count": 1
+            },
+            {
+              "value": "urn:li:tag:prod",
+              "count": 1
+            }
+          ]
+        },
+        {
+          "displayName": "Type",
+          "aggregations": [
+            {
+              "value": "DATASET",
+              "count": 24
+            }
+          ]
+        }
+      ]
+    }
+  },
+  "extensions": {}
+}
+```
+
+### Limit Search Entity Types
+
+When querying for specific entities, enumerate only the entity types required using `types` , for example [`DATASET` , `CHART`]
+
+### Limit Results
+
+Limit search results based on the amount of information being requested. For example, a minimal number of attributes can fetch 1,000 - 2,000 results in a single page, however as the number of attributes increases (especially nested objects) the `count` should be lowered, 20-25 for very complex requests.
+
+## Lineage Query Best Practices
+
+There are two primary ways to query lineage:
+
+### Search Across Lineage
+
+`searchAcrossLineage` / `scrollAcrossLineage` root query:
+
+- Recommended for all lineage queries
+- Only the shortest path is guaranteed to show up in `paths`
+- Supports querying indirect lineage (depth > 1)
+    - Depending on the fanout of the lineage, 3+ hops may not return data, use 1-hop queries for the fastest response times.
+    - Specify using a filter with name `"degree"` and values `"1"` , `"2"`, and / or `"3+"`
+
+The following examples are demonstrated using sample data for `urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD)`.
+
+<p align="center">
+  <img width="90%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/api/graphql/graphql-best-practices/sample_lineage.png"/>
+</p>
+
+<Tab>
+<TabItem value="Upstream1" label="1-Hop Upstream">
+
+The following example queries show UPSTREAM lineage with progressively higher degrees, first with degree `["1"]` and then `["1","2"]`.
+
+1-Hop Upstreams:
+
+Request:
+
+```graphql
+{
+  searchAcrossLineage(
+    input: {urn: "urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD)", query: "*", count: 10, start: 0, direction: UPSTREAM, orFilters: [{and: [{field: "degree", condition: EQUAL, values: ["1"]}]}], searchFlags: {skipAggregates: true, skipHighlighting: true}}
+  ) {
+    start
+    count
+    total
+    searchResults {
+      entity {
+        urn
+        type
+        ... on Dataset {
+          name
+        }
+      }
+      paths {
+        path {
+          ... on Dataset {
+            urn
+          }
+        }
+      }
+      degree
+    }
+  }
+}
+```
+
+Response:
+
+```json
+{
+  "data": {
+    "searchAcrossLineage": {
+      "start": 0,
+      "count": 10,
+      "total": 1,
+      "searchResults": [
+        {
+          "entity": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:hdfs,SampleHdfsDataset,PROD)",
+            "type": "DATASET",
+            "name": "SampleHdfsDataset"
+          },
+          "paths": [
+            {
+              "path": [
+                {
+                  "urn": "urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD)"
+                },
+                {
+                  "urn": "urn:li:dataset:(urn:li:dataPlatform:hdfs,SampleHdfsDataset,PROD)"
+                }
+              ]
+            }
+          ],
+          "degree": 1
+        }
+      ]
+    }
+  },
+  "extensions": {}
+}
+```
+</TabItem>
+
+<TabItem value="Upstream2" label="2-Hop Upstream">
+1-Hop & 2-Hop Upstreams:
+
+Request:
+
+```graphql
+{
+  searchAcrossLineage(
+    input: {urn: "urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD)", query: "*", count: 10, start: 0, direction: UPSTREAM, orFilters: [{and: [{field: "degree", condition: EQUAL, values: ["1","2"]}]}], searchFlags: {skipAggregates: true, skipHighlighting: true}}
+  ) {
+    start
+    count
+    total
+    searchResults {
+      entity {
+        urn
+        type
+        ... on Dataset {
+          name
+        }
+      }
+      paths {
+        path {
+          ... on Dataset {
+            urn
+          }
+        }
+      }
+      degree
+    }
+  }
+}
+```
+
+```json
+{
+  "data": {
+    "searchAcrossLineage": {
+      "start": 0,
+      "count": 10,
+      "total": 2,
+      "searchResults": [
+        {
+          "entity": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:hdfs,SampleHdfsDataset,PROD)",
+            "type": "DATASET",
+            "name": "SampleHdfsDataset"
+          },
+          "paths": [
+            {
+              "path": [
+                {
+                  "urn": "urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD)"
+                },
+                {
+                  "urn": "urn:li:dataset:(urn:li:dataPlatform:hdfs,SampleHdfsDataset,PROD)"
+                }
+              ]
+            }
+          ],
+          "degree": 1
+        },
+        {
+          "entity": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:kafka,SampleKafkaDataset,PROD)",
+            "type": "DATASET",
+            "name": "SampleKafkaDataset"
+          },
+          "paths": [
+            {
+              "path": [
+                {
+                  "urn": "urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD)"
+                },
+                {
+                  "urn": "urn:li:dataset:(urn:li:dataPlatform:hdfs,SampleHdfsDataset,PROD)"
+                },
+                {
+                  "urn": "urn:li:dataset:(urn:li:dataPlatform:kafka,SampleKafkaDataset,PROD)"
+                }
+              ]
+            }
+          ],
+          "degree": 2
+        }
+      ]
+    }
+  },
+  "extensions": {}
+}
+```
+
+</TabItem>
+</Tab>
+
+### Lineage Subquery
+
+The previous query requires a root or starting node in the lineage graph. The following request offers a way to request lineage for multiple nodes at once with a few limitations.
+
+`lineage` query on `EntityWithRelationship` entities:
+
+- A more direct reflection of the graph index
+- 1-hop lineage only
+- Multiple URNs
+- Should not be requested too many times in a single request. 20 is a tested limit
+
+The following examples are based on the sample lineage graph shown here:
+
+<p align="center">
+  <img width="90%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/api/graphql/graphql-best-practices/sample_bulk_lineage.png"/>
+</p>
+
+Example Request:
+
+```graphql
+query getBulkEntityLineageV2($urns: [String!]! = ["urn:li:dataJob:(urn:li:dataFlow:(airflow,dag_abc,PROD),task_123)", "urn:li:dataJob:(urn:li:dataFlow:(airflow,dag_abc,PROD),task_456)"]) {
+  entities(urns: $urns) {
+    urn
+    type
+    ... on DataJob {
+      jobId
+      dataFlow {
+        flowId
+      }
+      properties {
+        name
+      }
+      upstream: lineage(input: {direction: UPSTREAM, start: 0, count: 10}) {
+        total
+        relationships {
+          type
+          entity {
+            urn
+            type
+          }
+        }
+      }
+      downstream: lineage(input: {direction: DOWNSTREAM, start: 0, count: 10}) {
+        total
+        relationships {
+          type
+          entity {
+            urn
+            type
+          }
+        }
+      }
+    }
+  }
+}
+```
+
+Example Response:
+
+```json
+{
+  "data": {
+    "entities": [
+      {
+        "urn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,dag_abc,PROD),task_123)",
+        "type": "DATA_JOB",
+        "jobId": "task_123",
+        "dataFlow": {
+          "flowId": "dag_abc"
+        },
+        "properties": {
+          "name": "User Creations"
+        },
+        "upstream": {
+          "total": 1,
+          "relationships": [
+            {
+              "type": "Consumes",
+              "entity": {
+                "urn": "urn:li:dataset:(urn:li:dataPlatform:hive,logging_events,PROD)",
+                "type": "DATASET"
+              }
+            }
+          ]
+        },
+        "downstream": {
+          "total": 2,
+          "relationships": [
+            {
+              "type": "DownstreamOf",
+              "entity": {
+                "urn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,dag_abc,PROD),task_456)",
+                "type": "DATA_JOB"
+              }
+            },
+            {
+              "type": "Produces",
+              "entity": {
+                "urn": "urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD)",
+                "type": "DATASET"
+              }
+            }
+          ]
+        }
+      },
+      {
+        "urn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,dag_abc,PROD),task_456)",
+        "type": "DATA_JOB",
+        "jobId": "task_456",
+        "dataFlow": {
+          "flowId": "dag_abc"
+        },
+        "properties": {
+          "name": "User Deletions"
+        },
+        "upstream": {
+          "total": 2,
+          "relationships": [
+            {
+              "type": "DownstreamOf",
+              "entity": {
+                "urn": "urn:li:dataJob:(urn:li:dataFlow:(airflow,dag_abc,PROD),task_123)",
+                "type": "DATA_JOB"
+              }
+            },
+            {
+              "type": "Consumes",
+              "entity": {
+                "urn": "urn:li:dataset:(urn:li:dataPlatform:hive,logging_events,PROD)",
+                "type": "DATASET"
+              }
+            }
+          ]
+        },
+        "downstream": {
+          "total": 1,
+          "relationships": [
+            {
+              "type": "Produces",
+              "entity": {
+                "urn": "urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_deleted,PROD)",
+                "type": "DATASET"
+              }
+            }
+          ]
+        }
+      }
+    ]
+  },
+  "extensions": {}
+}
+```
\ No newline at end of file
diff --git a/docs/api/graphql/how-to-set-up-graphql.md b/docs/api/graphql/how-to-set-up-graphql.md
index 2be2f935b12b10..8a6db7f6c105a2 100644
--- a/docs/api/graphql/how-to-set-up-graphql.md
+++ b/docs/api/graphql/how-to-set-up-graphql.md
@@ -1,3 +1,6 @@
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
 # How To Set Up GraphQL
 
 ## Preparing Local Datahub Deployment
@@ -29,6 +32,7 @@ DataHub provides a browser-based GraphQL Explorer Tool ([GraphiQL](https://githu
 This interface allows you to easily craft queries and mutations against real metadata stored in your live DataHub deployment.
 
 To experiment with GraphiQL before deploying it in your live DataHub deployment, you can access a demo site provided by DataHub at https://demo.datahubproject.io/api/graphiql.
+
 For instance, you can create a tag by posting the following query:
 
 ```json
@@ -43,6 +47,29 @@ mutation createTag {
 
 For a detailed usage guide, check out [How to use GraphiQL](https://www.gatsbyjs.com/docs/how-to/querying-data/running-queries-with-graphiql/).
 
+To navigate to `GraphiQL` on the demo site or your local instance, select `GraphiQL` from the user profile drop-down menu as
+shown below.
+
+<Tab>
+<TabItem value="DataHub" label="DataHub" default>
+<p align="center">
+  <img width="90%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/api/graphql/how-to-set-up-graphql/datahub_graphiql_link.png"/>
+</p>
+![graphiql_link.png](../../../../../Desktop/datahub_graphiql_link.png)
+</TabItem>
+<TabItem value="DataHubCloud" label="DataHub Cloud">
+<p align="center">
+  <img width="90%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/api/graphql/how-to-set-up-graphql/datahubcloud_graphiql_link.png"/>
+</p>
+</TabItem>
+</Tab>
+
+This link will then display the following interface for exploring GraphQL queries.
+
+<p align="center">
+  <img width="90%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/api/graphql/how-to-set-up-graphql/datahub_graphiql.png"/>
+</p>
+
 ### CURL
 
 CURL is a command-line tool used for transferring data using various protocols including HTTP, HTTPS, and others.

From 7198f711dc3ae580c5b5ca205acd2f5ca6dfddea Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Tue, 31 Dec 2024 08:50:44 -0600
Subject: [PATCH 004/249] fix(ci): further consolidate NODE_OPTIONS (#12217)

---
 .github/workflows/build-and-test.yml          |   4 +-
 .../workflows/contributor-open-pr-comment.yml |   2 +-
 .github/workflows/docker-unified.yml          |   2 -
 datahub-web-react/build.gradle                |   2 +-
 datahub-web-react/package.json                |  12 +-
 datahub-web-react/src/Mocks.tsx               |   1 +
 datahub-web-react/vite.config.ts              |   8 +
 datahub-web-react/yarn.lock                   | 141 ++++++++++++++++--
 docs/developers.md                            |   1 +
 9 files changed, 147 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 98071b536a336a..784dce0f11b2b5 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -109,8 +109,6 @@ jobs:
         if: ${{  matrix.command == 'frontend' && needs.setup.outputs.frontend_change == 'true' }}
         run: |
           ./gradlew :datahub-frontend:build :datahub-web-react:build --parallel
-        env:
-          NODE_OPTIONS: "--max-old-space-size=4096"
       - name: Gradle compile (jdk8) for legacy Spark
         if: ${{  matrix.command == 'except_metadata_ingestion' && needs.setup.outputs.backend_change == 'true' }}
         run: |
@@ -157,4 +155,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: Event File
-          path: ${{ github.event_path }}
\ No newline at end of file
+          path: ${{ github.event_path }}
diff --git a/.github/workflows/contributor-open-pr-comment.yml b/.github/workflows/contributor-open-pr-comment.yml
index 2f700290ee0f28..decc7ab27a411d 100644
--- a/.github/workflows/contributor-open-pr-comment.yml
+++ b/.github/workflows/contributor-open-pr-comment.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Get and Format Username (PR only)
         if: github.event_name == 'pull_request'
diff --git a/.github/workflows/docker-unified.yml b/.github/workflows/docker-unified.yml
index 47c26068347c07..a5200c7e917d81 100644
--- a/.github/workflows/docker-unified.yml
+++ b/.github/workflows/docker-unified.yml
@@ -445,8 +445,6 @@ jobs:
         run: |
           ./gradlew :datahub-frontend:dist -x test -x yarnTest -x yarnLint --parallel
           mv ./datahub-frontend/build/distributions/datahub-frontend-*.zip datahub-frontend.zip
-        env:
-          NODE_OPTIONS: "--max-old-space-size=4096"
       - name: Build and push
         uses: ./.github/actions/docker-custom-build-and-push
         with:
diff --git a/datahub-web-react/build.gradle b/datahub-web-react/build.gradle
index bf1aa401e3f560..3dad778a2b3038 100644
--- a/datahub-web-react/build.gradle
+++ b/datahub-web-react/build.gradle
@@ -79,7 +79,7 @@ task yarnServe(type: YarnTask, dependsOn: [yarnInstall, yarnGenerate]) {
 
 task yarnTest(type: YarnTask, dependsOn: [yarnInstall, yarnGenerate]) {
   // Explicitly runs in non-watch mode.
-  args = ['run', 'test', 'run']
+  args = ['run', project.hasProperty('withCoverage') ? 'test-coverage' : 'test', 'run']
 }
 
 task yarnLint(type: YarnTask, dependsOn: [yarnInstall, yarnGenerate]) {
diff --git a/datahub-web-react/package.json b/datahub-web-react/package.json
index 2d1d667a89f14a..a608698d7602c4 100644
--- a/datahub-web-react/package.json
+++ b/datahub-web-react/package.json
@@ -89,10 +89,11 @@
     "scripts": {
         "analyze": "source-map-explorer 'dist/assets/*.js'",
         "start": "yarn run generate && vite",
-        "ec2-dev": "yarn run generate && CI=true;export CI;vite",
-        "build": "yarn run generate && NODE_OPTIONS='--max-old-space-size=4096 --openssl-legacy-provider' CI=false vite build",
-        "test": "vitest",
-        "generate": "graphql-codegen --config codegen.yml",
+        "ec2-dev": "yarn run generate && CI=true vite",
+        "build": "yarn run generate && CI=false NODE_OPTIONS='--max-old-space-size=5120 --openssl-legacy-provider' vite build",
+        "test": "NODE_OPTIONS='--max-old-space-size=5120 --openssl-legacy-provider' vitest",
+        "test-coverage": "yarn test run --coverage",
+        "generate": "NODE_OPTIONS='--max-old-space-size=5120 --openssl-legacy-provider' graphql-codegen --config codegen.yml",
         "lint": "eslint . --ext .ts,.tsx --quiet && yarn format-check && yarn type-check",
         "lint-fix": "eslint '*/**/*.{ts,tsx}' --quiet --fix && yarn format",
         "format-check": "prettier --check src",
@@ -100,7 +101,7 @@
         "type-check": "tsc --noEmit",
         "type-watch": "tsc -w --noEmit",
         "storybook": "storybook dev -p 6006",
-        "build-storybook": "storybook build"
+        "build-storybook": "NODE_OPTIONS='--max-old-space-size=5120 --openssl-legacy-provider' storybook build"
     },
     "browserslist": {
         "production": [
@@ -135,6 +136,7 @@
         "@typescript-eslint/eslint-plugin": "^5.38.1",
         "@typescript-eslint/parser": "^5.38.1",
         "@vitejs/plugin-react": "^4.1.1",
+        "@vitest/coverage-v8": "^0.34.6",
         "eslint": "^8.2.0",
         "eslint-config-airbnb": "19.0.4",
         "eslint-config-airbnb-typescript": "^17.0.0",
diff --git a/datahub-web-react/src/Mocks.tsx b/datahub-web-react/src/Mocks.tsx
index 73a789030ce6fb..2da9e733eb4072 100644
--- a/datahub-web-react/src/Mocks.tsx
+++ b/datahub-web-react/src/Mocks.tsx
@@ -1714,6 +1714,7 @@ export const mlModel = {
     },
     tags: [],
     properties: {
+        name: 'trust model',
         description: 'a ml trust model',
         date: null,
         version: '1',
diff --git a/datahub-web-react/vite.config.ts b/datahub-web-react/vite.config.ts
index 2532b24067754d..c43470dee031a8 100644
--- a/datahub-web-react/vite.config.ts
+++ b/datahub-web-react/vite.config.ts
@@ -68,6 +68,11 @@ export default defineConfig(({ mode }) => {
         envPrefix: 'REACT_APP_',
         build: {
             outDir: 'dist',
+            target: 'esnext',
+            minify: 'esbuild',
+            reportCompressedSize: false,
+            // Limit number of worker threads to reduce CPU pressure
+            workers: 3, // default is number of CPU cores
         },
         server: {
             open: false,
@@ -92,8 +97,11 @@ export default defineConfig(({ mode }) => {
             css: true,
             // reporters: ['verbose'],
             coverage: {
+		enabled: true,
+		provider: 'v8',
                 reporter: ['text', 'json', 'html'],
                 include: ['src/**/*'],
+		reportsDirectory: '../build/coverage-reports/datahub-web-react/',
                 exclude: [],
             },
         },
diff --git a/datahub-web-react/yarn.lock b/datahub-web-react/yarn.lock
index dc7260efd183fd..f16e8aa506e2cc 100644
--- a/datahub-web-react/yarn.lock
+++ b/datahub-web-react/yarn.lock
@@ -20,6 +20,14 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
+"@ampproject/remapping@^2.2.1":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
+  integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
 "@analytics/amplitude@0.0.3":
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/@analytics/amplitude/-/amplitude-0.0.3.tgz#15ccb76094d6f1003979a4f3aa5d3263781bd776"
@@ -1017,6 +1025,11 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
+"@bcoe/v8-coverage@^0.2.3":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
+  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
+
 "@ctrl/tinycolor@^3.3.1", "@ctrl/tinycolor@^3.4.0":
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.4.0.tgz#c3c5ae543c897caa9c2a68630bed355be5f9990f"
@@ -1941,6 +1954,11 @@
   resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8"
   integrity sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==
 
+"@istanbuljs/schema@^0.1.2":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
+  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
+
 "@jest/schemas@^29.6.3":
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
@@ -2009,6 +2027,14 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+  version "0.3.25"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
+  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
 "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.18"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
@@ -2017,14 +2043,6 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
-"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
-  version "0.3.25"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
-  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.1.0"
-    "@jridgewell/sourcemap-codec" "^1.4.14"
-
 "@linaria/core@3.0.0-beta.13":
   version "3.0.0-beta.13"
   resolved "https://registry.yarnpkg.com/@linaria/core/-/core-3.0.0-beta.13.tgz#049c5be5faa67e341e413a0f6b641d5d78d91056"
@@ -3974,6 +3992,11 @@
     "@types/react" "*"
     hoist-non-react-statics "^3.3.0"
 
+"@types/istanbul-lib-coverage@^2.0.1":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
+  integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==
+
 "@types/js-cookie@^2.2.6":
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.2.6.tgz#f1a1cb35aff47bc5cfb05cb0c441ca91e914c26f"
@@ -4714,6 +4737,23 @@
     "@types/babel__core" "^7.20.3"
     react-refresh "^0.14.0"
 
+"@vitest/coverage-v8@^0.34.6":
+  version "0.34.6"
+  resolved "https://registry.yarnpkg.com/@vitest/coverage-v8/-/coverage-v8-0.34.6.tgz#931d9223fa738474e00c08f52b84e0f39cedb6d1"
+  integrity sha512-fivy/OK2d/EsJFoEoxHFEnNGTg+MmdZBAVK9Ka4qhXR2K3J0DS08vcGVwzDtXSuUMabLv4KtPcpSKkcMXFDViw==
+  dependencies:
+    "@ampproject/remapping" "^2.2.1"
+    "@bcoe/v8-coverage" "^0.2.3"
+    istanbul-lib-coverage "^3.2.0"
+    istanbul-lib-report "^3.0.1"
+    istanbul-lib-source-maps "^4.0.1"
+    istanbul-reports "^3.1.5"
+    magic-string "^0.30.1"
+    picocolors "^1.0.0"
+    std-env "^3.3.3"
+    test-exclude "^6.0.0"
+    v8-to-istanbul "^9.1.0"
+
 "@vitest/expect@0.34.6":
   version "0.34.6"
   resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-0.34.6.tgz#608a7b7a9aa3de0919db99b4cc087340a03ea77e"
@@ -7282,6 +7322,18 @@ glob@^7.0.5, glob@^7.1.1, glob@^7.1.3, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.1.4:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -7612,6 +7664,11 @@ html-encoding-sniffer@^3.0.0:
   dependencies:
     whatwg-encoding "^2.0.0"
 
+html-escaper@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
+
 html-void-elements@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483"
@@ -8154,6 +8211,37 @@ isomorphic.js@^0.2.4:
   resolved "https://registry.yarnpkg.com/isomorphic.js/-/isomorphic.js-0.2.5.tgz#13eecf36f2dba53e85d355e11bf9d4208c6f7f88"
   integrity sha512-PIeMbHqMt4DnUP3MA/Flc0HElYjMXArsw1qwJZcm9sqR8mq3l8NYizFMty0pWwE/tzIGH3EKK5+jes5mAr85yw==
 
+istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
+  integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
+
+istanbul-lib-report@^3.0.0, istanbul-lib-report@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
+  integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==
+  dependencies:
+    istanbul-lib-coverage "^3.0.0"
+    make-dir "^4.0.0"
+    supports-color "^7.1.0"
+
+istanbul-lib-source-maps@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
+  integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
+  dependencies:
+    debug "^4.1.1"
+    istanbul-lib-coverage "^3.0.0"
+    source-map "^0.6.1"
+
+istanbul-reports@^3.1.5:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.7.tgz#daed12b9e1dca518e15c056e1e537e741280fa0b"
+  integrity sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==
+  dependencies:
+    html-escaper "^2.0.0"
+    istanbul-lib-report "^3.0.0"
+
 jake@^10.8.5:
   version "10.8.7"
   resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f"
@@ -8542,6 +8630,13 @@ make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
+make-dir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
+  integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
+  dependencies:
+    semver "^7.5.3"
+
 make-error@^1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
@@ -8819,7 +8914,7 @@ min-indent@^1.0.0, min-indent@^1.0.1:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
-minimatch@3.0.5, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.2, minimatch@^4.2.3, minimatch@^5.0.1:
+minimatch@3.0.5, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2, minimatch@^4.2.3, minimatch@^5.0.1:
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3"
   integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==
@@ -10891,6 +10986,11 @@ semver@^7.3.7:
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.5.3, semver@^7.6.2:
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
+
 semver@^7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
@@ -10898,11 +10998,6 @@ semver@^7.5.4:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^7.6.2:
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
-  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
-
 sentence-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/sentence-case/-/sentence-case-3.0.4.tgz#3645a7b8c117c787fde8702056225bb62a45131f"
@@ -11381,6 +11476,15 @@ temp@^0.9.4:
     mkdirp "^0.5.1"
     rimraf "~2.6.2"
 
+test-exclude@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
+  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
+  dependencies:
+    "@istanbuljs/schema" "^0.1.2"
+    glob "^7.1.4"
+    minimatch "^3.0.4"
+
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -11873,6 +11977,15 @@ uuid@^9.0.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
   integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
 
+v8-to-istanbul@^9.1.0:
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz#b9572abfa62bd556c16d75fdebc1a411d5ff3175"
+  integrity sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.12"
+    "@types/istanbul-lib-coverage" "^2.0.1"
+    convert-source-map "^2.0.0"
+
 value-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c"
diff --git a/docs/developers.md b/docs/developers.md
index 401169490dd4b6..0d398e6232b23d 100644
--- a/docs/developers.md
+++ b/docs/developers.md
@@ -9,6 +9,7 @@ title: "Local Development"
 - [Java 17 JDK](https://openjdk.org/projects/jdk/17/)
 - [Python 3.10](https://www.python.org/downloads/release/python-3100/)
 - [Docker](https://www.docker.com/)
+- [Node 22.x](https://nodejs.org/en/about/previous-releases)
 - [Docker Compose >=2.20](https://docs.docker.com/compose/)
 - Docker engine with at least 8GB of memory to run tests.
 

From 4ed128cf28513d97961e551b4235ecf50d04955c Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Tue, 31 Dec 2024 21:36:25 +0530
Subject: [PATCH 005/249] chore: cleanup extra lines (#12248)

---
 smoke-test/tests/cypress/integration_test.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/smoke-test/tests/cypress/integration_test.py b/smoke-test/tests/cypress/integration_test.py
index 33c67a923c278d..fa7274158f9e23 100644
--- a/smoke-test/tests/cypress/integration_test.py
+++ b/smoke-test/tests/cypress/integration_test.py
@@ -212,9 +212,6 @@ def test_run_cypress(auth_session):
     else:
         record_arg = " "
 
-    rest_specs = set(os.listdir("tests/cypress/cypress/e2e"))
-    cypress_suite1_specs = {"mutations", "search", "views"}
-    rest_specs.difference_update(set(cypress_suite1_specs))
     print(f"test strategy is {test_strategy}")
     test_spec_arg = ""
     specs_str = ",".join([f"**/{f}" for f in _get_cypress_tests_batch()])

From f5ecee1501e7646f6dc0a5a13202d32c7b096ba8 Mon Sep 17 00:00:00 2001
From: Jay <159848059+jayacryl@users.noreply.github.com>
Date: Tue, 31 Dec 2024 17:56:32 -0500
Subject: [PATCH 006/249] fix(docs-site) hero image typo (#12250)

---
 docs-website/static/img/hero.png | Bin 380503 -> 380547 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs-website/static/img/hero.png b/docs-website/static/img/hero.png
index 44b11c2781143f106c6929cc439d5d21feff18ce..a520a6d8a6b6ff8208291bbd79e0f1df58036267 100644
GIT binary patch
delta 97725
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

delta 97754
zcmX6^1zT3#5~aJlK^p1ql5PQ|ySuxNG)RMhbV({8-QC??FWnt4&BgEjf%BX_d(F&R
zYi0*$;V)$3$1@`1(Lg}p(Ll<nQC}qRkVB1~1ZswALWXKWg=#|AX~OhN0LYm%GVXK;
zIgN8)*XGua@NDGPptup_WC@lMFHGzpdB|X(;zI4o@Sd)}8CiJRkqL5cK-`T!Mv{9i
z@Z4XIR<PTi$6{t@JrEMJ!wJ>1C89!i_nT51Ur!?6NHUk+9%;I3e%)9UN^_=E&g4q~
z&lmhY*2wAj;?GG%rJNZN4Ma!Z??>`A1+bVpbJZ73>)j%7xS%S&eM0l~FlpI##-%xB
z=G=5bdyG^HvNP&UsTpU}-=e1d5#8kK+@TB+TJ|fJ|HPf$%-7B<VZf)CenbQ&QBL;0
z^{kF{L<n%D&<>N_h7TxS8Nez>e$!*RmfAvV3pQLZ-3;s9VyyI01r)whHr?2sx3CyU
ze2QSgof^g(5}?kA=leAM848iEmP{WJGt7(vt6cOgirnh@Q?#ySbw&K>mV3x;?i_59
z6i1UI`ef|47KW4<-S0M?PuB_^7d-d3V8ex?sWWuQW9;orreZ$P+cVxCea8;b^_6<m
zzaHPTVtfUWWDT}nO90tMX<?kzmzd1O*FtcsaQ#?Cd22^Hd}1zL)XoVUyIrvBr7AtD
ze7968z_<&I8Ozn~+9{ph8FwY3g+x#F`=z~$%~&kR%-ES-XUF~N=`<ML$k4G_q5XwF
zflCn6tIJa#33v%*?R$ZX{Fx+nbpXrSSer^fiLB(n?D<;b4p@2$df3H1sZoADYqH(>
z`cgg8ff~Cigr6l)H=hy>LFFG$|9ftL-bmZY`gshMFw9)?0XYiUX^5tDVxYOBJRvT`
z)^LsLuS4AESXb;}vUXTGozV*=Lt{D^^8B>C!A~h!s*~rjRUzf|tZgT8zqUitZTj^$
z(M5pp+z(r<EWj$urqdj>V@?W&H$a?v2wMnnd}<&P)7N<^vix=)+Q_n*;#BUq&a!|0
zIp=LZfYW7zIHAOBAWfY}wii=J{?Qoe7gwYn(I*nzBo?l>0seqvJ{dcueFm0<tVlD0
z&Rh^2hr@5?QHsP$2>vX>+b~J)B0dbno<`)uZ-gKJJ_BMQZXpz8yN?e>g=q`q*R<r<
z)NOD`-p8h7LqSPn*m@OdtHDVQDyuVJ5=c`^TgC$uz$XFX`KAS6cY%o-iv=|&87EJ=
zCUm@#21^FXw2hL9n0$CJ`ED|ow2Lwu65I+y2Z_zkiJd9cXBJ9CWutjT2xlsj6iV~Z
ztW7q5QeewaA=A*%BlDoj_Xjp<t%k(b$+LypU74nVDh)5c!3Kt7s-X|2A1Ii7NLGw`
z#OaV5OWkwL9T@f1mD=mDmSu6<3VM>6mu319_=`>_Z)-h6h%8asN;tg3%0ArFY9f1A
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
YS50-W!7YgK9n7aBrzTte>Rs^v0fa-$2LJ#7


From 554a37a5514c9c0afbbea0fdea99244873a38ee4 Mon Sep 17 00:00:00 2001
From: Jonny Dixon <45681293+acrylJonny@users.noreply.github.com>
Date: Wed, 1 Jan 2025 09:19:27 +0000
Subject: [PATCH 007/249] fix(ingest/aws_common): update tests execution on EC2
 instance (#12252)

---
 .../tests/unit/test_aws_common.py             | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/metadata-ingestion/tests/unit/test_aws_common.py b/metadata-ingestion/tests/unit/test_aws_common.py
index 9291fb91134b1c..dd1f06cf9bfd55 100644
--- a/metadata-ingestion/tests/unit/test_aws_common.py
+++ b/metadata-ingestion/tests/unit/test_aws_common.py
@@ -17,6 +17,14 @@
 )
 
 
+@pytest.fixture
+def mock_disable_ec2_metadata():
+    """Disable EC2 metadata detection"""
+    with patch("requests.put") as mock_put:
+        mock_put.return_value.status_code = 404
+        yield mock_put
+
+
 @pytest.fixture
 def mock_aws_config():
     return AwsConnectionConfig(
@@ -27,17 +35,19 @@ def mock_aws_config():
 
 
 class TestAwsCommon:
-    def test_environment_detection_no_environment(self):
+    def test_environment_detection_no_environment(self, mock_disable_ec2_metadata):
         """Test environment detection when no AWS environment is present"""
         with patch.dict(os.environ, {}, clear=True):
             assert detect_aws_environment() == AwsEnvironment.UNKNOWN
 
-    def test_environment_detection_lambda(self):
+    def test_environment_detection_lambda(self, mock_disable_ec2_metadata):
         """Test Lambda environment detection"""
         with patch.dict(os.environ, {"AWS_LAMBDA_FUNCTION_NAME": "test-function"}):
             assert detect_aws_environment() == AwsEnvironment.LAMBDA
 
-    def test_environment_detection_lambda_cloudformation(self):
+    def test_environment_detection_lambda_cloudformation(
+        self, mock_disable_ec2_metadata
+    ):
         """Test CloudFormation Lambda environment detection"""
         with patch.dict(
             os.environ,
@@ -48,7 +58,7 @@ def test_environment_detection_lambda_cloudformation(self):
         ):
             assert detect_aws_environment() == AwsEnvironment.CLOUD_FORMATION
 
-    def test_environment_detection_eks(self):
+    def test_environment_detection_eks(self, mock_disable_ec2_metadata):
         """Test EKS environment detection"""
         with patch.dict(
             os.environ,
@@ -59,19 +69,19 @@ def test_environment_detection_eks(self):
         ):
             assert detect_aws_environment() == AwsEnvironment.EKS
 
-    def test_environment_detection_app_runner(self):
+    def test_environment_detection_app_runner(self, mock_disable_ec2_metadata):
         """Test App Runner environment detection"""
         with patch.dict(os.environ, {"AWS_APP_RUNNER_SERVICE_ID": "service-id"}):
             assert detect_aws_environment() == AwsEnvironment.APP_RUNNER
 
-    def test_environment_detection_ecs(self):
+    def test_environment_detection_ecs(self, mock_disable_ec2_metadata):
         """Test ECS environment detection"""
         with patch.dict(
             os.environ, {"ECS_CONTAINER_METADATA_URI_V4": "http://169.254.170.2/v4"}
         ):
             assert detect_aws_environment() == AwsEnvironment.ECS
 
-    def test_environment_detection_beanstalk(self):
+    def test_environment_detection_beanstalk(self, mock_disable_ec2_metadata):
         """Test Elastic Beanstalk environment detection"""
         with patch.dict(os.environ, {"ELASTIC_BEANSTALK_ENVIRONMENT_NAME": "my-env"}):
             assert detect_aws_environment() == AwsEnvironment.BEANSTALK
@@ -103,6 +113,7 @@ def test_ec2_metadata_token_failure(self, mock_put):
     @patch("requests.put")
     def test_is_running_on_ec2(self, mock_put, mock_get):
         """Test EC2 instance detection with IMDSv2"""
+        # Explicitly mock EC2 metadata responses
         mock_put.return_value.status_code = 200
         mock_put.return_value.text = "token123"
         mock_get.return_value.status_code = 200
@@ -322,7 +333,9 @@ def test_aws_connection_config_validation_error(self):
             ),
         ],
     )
-    def test_environment_detection_parametrized(self, env_vars, expected_environment):
+    def test_environment_detection_parametrized(
+        self, mock_disable_ec2_metadata, env_vars, expected_environment
+    ):
         """Parametrized test for environment detection with different configurations"""
         with patch.dict(os.environ, env_vars, clear=True):
             assert detect_aws_environment() == expected_environment

From ea249caee1bffadd237ee7031c4502dac0f87af6 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Wed, 1 Jan 2025 16:52:17 +0530
Subject: [PATCH 008/249] fix(ingest): json serializable fix (#12246)

---
 .../datahub_ingestion_run_summary_provider.py |  45 +++++-
 .../test_datahub_ingestion_reporter.py        | 135 ++++++++++++++++++
 2 files changed, 179 insertions(+), 1 deletion(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/reporting/datahub_ingestion_run_summary_provider.py b/metadata-ingestion/src/datahub/ingestion/reporting/datahub_ingestion_run_summary_provider.py
index 28def68ccf3f55..c143a8b49f4b7c 100644
--- a/metadata-ingestion/src/datahub/ingestion/reporting/datahub_ingestion_run_summary_provider.py
+++ b/metadata-ingestion/src/datahub/ingestion/reporting/datahub_ingestion_run_summary_provider.py
@@ -146,12 +146,55 @@ def __init__(self, sink: Sink, report_recipe: bool, ctx: PipelineContext) -> Non
             aspect_value=source_info_aspect,
         )
 
+    @staticmethod
+    def _convert_sets_to_lists(obj: Any) -> Any:
+        """
+        Recursively converts all sets to lists in a Python object.
+        Works with nested dictionaries, lists, and sets.
+
+        Args:
+            obj: Any Python object that might contain sets
+
+        Returns:
+            The object with all sets converted to lists
+        """
+        if isinstance(obj, dict):
+            return {
+                key: DatahubIngestionRunSummaryProvider._convert_sets_to_lists(value)
+                for key, value in obj.items()
+            }
+        elif isinstance(obj, list):
+            return [
+                DatahubIngestionRunSummaryProvider._convert_sets_to_lists(element)
+                for element in obj
+            ]
+        elif isinstance(obj, set):
+            return [
+                DatahubIngestionRunSummaryProvider._convert_sets_to_lists(element)
+                for element in obj
+            ]
+        elif isinstance(obj, tuple):
+            return tuple(
+                DatahubIngestionRunSummaryProvider._convert_sets_to_lists(element)
+                for element in obj
+            )
+        else:
+            return obj
+
     def _get_recipe_to_report(self, ctx: PipelineContext) -> str:
         assert ctx.pipeline_config
         if not self.report_recipe or not ctx.pipeline_config.get_raw_dict():
             return ""
         else:
-            return json.dumps(redact_raw_config(ctx.pipeline_config.get_raw_dict()))
+            redacted_recipe = redact_raw_config(ctx.pipeline_config.get_raw_dict())
+            # This is required otherwise json dumps will fail
+            # with a TypeError: Object of type set is not JSON serializable
+            converted_recipe = (
+                DatahubIngestionRunSummaryProvider._convert_sets_to_lists(
+                    redacted_recipe
+                )
+            )
+            return json.dumps(converted_recipe)
 
     def _emit_aspect(self, entity_urn: Urn, aspect_value: _Aspect) -> None:
         self.sink.write_record_async(
diff --git a/metadata-ingestion/tests/unit/reporting/test_datahub_ingestion_reporter.py b/metadata-ingestion/tests/unit/reporting/test_datahub_ingestion_reporter.py
index 749ea03a7f20a8..2ab6208e2dcc68 100644
--- a/metadata-ingestion/tests/unit/reporting/test_datahub_ingestion_reporter.py
+++ b/metadata-ingestion/tests/unit/reporting/test_datahub_ingestion_reporter.py
@@ -1,3 +1,5 @@
+from typing import Any, Dict, List, Set, Tuple, Union
+
 import pytest
 
 from datahub.ingestion.reporting.datahub_ingestion_run_summary_provider import (
@@ -50,3 +52,136 @@ def test_default_config():
     typed_config = DatahubIngestionRunSummaryProviderConfig.parse_obj({})
     assert typed_config.sink is None
     assert typed_config.report_recipe is True
+
+
+def test_simple_set() -> None:
+    """Test conversion of a simple set"""
+    input_data: Set[int] = {1, 2, 3}
+    expected: List[int] = [1, 2, 3]
+    result = DatahubIngestionRunSummaryProvider._convert_sets_to_lists(input_data)
+    assert sorted(result) == sorted(expected)
+    assert isinstance(result, list)
+
+
+def test_nested_dict_with_sets() -> None:
+    """Test conversion of nested dictionary containing sets"""
+    input_data: Dict[str, Union[Set[int], Dict[str, Set[str]]]] = {
+        "set1": {1, 2, 3},
+        "dict1": {"set2": {"a", "b"}},
+    }
+    expected = {
+        "set1": [1, 2, 3],
+        "dict1": {"set2": ["a", "b"]},
+    }
+    result = DatahubIngestionRunSummaryProvider._convert_sets_to_lists(input_data)
+
+    def sort_nested_lists(d):
+        return {
+            k: (
+                sorted(v)
+                if isinstance(v, list)
+                else (sort_nested_lists(v) if isinstance(v, dict) else v)
+            )
+            for k, v in d.items()
+        }
+
+    assert sort_nested_lists(result) == sort_nested_lists(expected)
+
+
+def test_nested_lists_with_sets() -> None:
+    """Test conversion of nested lists containing sets"""
+    input_data = [{1, 2}, [{3, 4}, {5, 6}]]
+    expected = [[1, 2], [[3, 4], [5, 6]]]
+    result = DatahubIngestionRunSummaryProvider._convert_sets_to_lists(input_data)
+    assert [
+        sorted(x)
+        if isinstance(x, list) and len(x) > 0 and not isinstance(x[0], list)
+        else x
+        for x in result
+    ] == [
+        sorted(x)
+        if isinstance(x, list) and len(x) > 0 and not isinstance(x[0], list)
+        else x
+        for x in expected
+    ]
+
+
+def test_tuple_with_sets() -> None:
+    """Test conversion of tuples containing sets"""
+    input_data = (1, {2, 3}, 4)
+    expected = (1, [2, 3], 4)
+    result = DatahubIngestionRunSummaryProvider._convert_sets_to_lists(input_data)
+    assert (result[0], sorted(result[1]), result[2]) == (
+        expected[0],
+        sorted(expected[1]),
+        expected[2],
+    )
+    assert isinstance(result, tuple)
+
+
+def test_mixed_nested_structure() -> None:
+    """Test conversion of a complex nested structure"""
+    input_data = {
+        "simple_set": {1, 2, 3},
+        "nested_dict": {
+            "another_set": {"a", "b", "c"},
+            "mixed_list": [1, {2, 3}, {"x", "y"}],
+        },
+        "tuple_with_set": (1, {4, 5}, 6),
+        "list_of_sets": [{1, 2}, {3, 4}],
+    }
+    result = DatahubIngestionRunSummaryProvider._convert_sets_to_lists(input_data)
+
+    # Verify structure types
+    assert isinstance(result["simple_set"], list)
+    assert isinstance(result["nested_dict"]["another_set"], list)
+    assert isinstance(result["nested_dict"]["mixed_list"][1], list)
+    assert isinstance(result["nested_dict"]["mixed_list"][2], list)
+    assert isinstance(result["tuple_with_set"], tuple)
+    assert isinstance(result["tuple_with_set"][1], list)
+    assert isinstance(result["list_of_sets"][0], list)
+
+
+def test_non_set_data() -> None:
+    """Test that non-set data remains unchanged"""
+    input_data = {
+        "string": "hello",
+        "int": 42,
+        "float": 3.14,
+        "bool": True,
+        "none": None,
+        "list": [1, 2, 3],
+        "dict": {"a": 1, "b": 2},
+    }
+    result = DatahubIngestionRunSummaryProvider._convert_sets_to_lists(input_data)
+    assert result == input_data
+
+
+def test_empty_structures() -> None:
+    """Test handling of empty structures"""
+    input_data: Dict[
+        str, Union[Set[Any], Dict[Any, Any], List[Any], Tuple[Any, ...]]
+    ] = {"empty_set": set(), "empty_dict": {}, "empty_list": [], "empty_tuple": ()}
+    expected: Dict[
+        str, Union[List[Any], Dict[Any, Any], List[Any], Tuple[Any, ...]]
+    ] = {"empty_set": [], "empty_dict": {}, "empty_list": [], "empty_tuple": ()}
+    result = DatahubIngestionRunSummaryProvider._convert_sets_to_lists(input_data)
+    assert result == expected
+
+
+def test_json_serializable() -> None:
+    """Test that the converted structure is JSON serializable"""
+    import json
+
+    input_data = {
+        "set": {1, 2, 3},
+        "nested": {"set": {"a", "b"}},
+        "mixed": [1, {2, 3}, {"x"}],
+    }
+    result = DatahubIngestionRunSummaryProvider._convert_sets_to_lists(input_data)
+    try:
+        json.dumps(result)
+        serializable = True
+    except TypeError:
+        serializable = False
+    assert serializable

From 67ef55efc7a65485b944722fb4895ea54e644f1d Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Thu, 2 Jan 2025 15:11:35 +0530
Subject: [PATCH 009/249] fix(ingest/gc): soft deletion loop fix (#12255)

---
 .../source/gc/dataprocess_cleanup.py          |   8 +-
 .../source/gc/soft_deleted_entity_cleanup.py  | 230 ++++++++++++------
 2 files changed, 163 insertions(+), 75 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/gc/dataprocess_cleanup.py b/metadata-ingestion/src/datahub/ingestion/source/gc/dataprocess_cleanup.py
index 3f7a1fc453bcdb..64c1a0ad0bfbad 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/gc/dataprocess_cleanup.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/gc/dataprocess_cleanup.py
@@ -167,7 +167,7 @@ class DataJobEntity:
 class DataProcessCleanupReport(SourceReport):
     num_aspects_removed: int = 0
     num_aspect_removed_by_type: TopKDict[str, int] = field(default_factory=TopKDict)
-    sample_removed_aspects_by_type: TopKDict[str, LossyList[str]] = field(
+    sample_soft_deleted_aspects_by_type: TopKDict[str, LossyList[str]] = field(
         default_factory=TopKDict
     )
     num_data_flows_found: int = 0
@@ -286,9 +286,9 @@ def delete_entity(self, urn: str, type: str) -> None:
         self.report.num_aspect_removed_by_type[type] = (
             self.report.num_aspect_removed_by_type.get(type, 0) + 1
         )
-        if type not in self.report.sample_removed_aspects_by_type:
-            self.report.sample_removed_aspects_by_type[type] = LossyList()
-        self.report.sample_removed_aspects_by_type[type].append(urn)
+        if type not in self.report.sample_soft_deleted_aspects_by_type:
+            self.report.sample_soft_deleted_aspects_by_type[type] = LossyList()
+        self.report.sample_soft_deleted_aspects_by_type[type].append(urn)
 
         if self.dry_run:
             logger.info(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py b/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
index 93f004ab675edc..4c0355834f9b4f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
@@ -1,9 +1,10 @@
 import logging
 import time
-from concurrent.futures import ThreadPoolExecutor, as_completed
+from concurrent.futures import FIRST_COMPLETED, Future, ThreadPoolExecutor, wait
 from dataclasses import dataclass, field
 from datetime import datetime, timezone
-from typing import List, Optional
+from threading import Lock
+from typing import Dict, Iterable, List, Optional
 
 from pydantic import Field
 
@@ -18,12 +19,28 @@
 
 logger = logging.getLogger(__name__)
 
+QUERY_QUERY_ENTITY = """
+query listQueries($input: ScrollAcrossEntitiesInput!) {
+  scrollAcrossEntities(input: $input) {
+    nextScrollId
+    count
+    searchResults {
+      entity {
+        ... on QueryEntity {
+          urn
+        }
+      }
+    }
+  }
+}
+"""
+
 
 class SoftDeletedEntitiesCleanupConfig(ConfigModel):
     enabled: bool = Field(
         default=True, description="Whether to do soft deletion cleanup."
     )
-    retention_days: Optional[int] = Field(
+    retention_days: int = Field(
         10,
         description="Number of days to retain metadata in DataHub",
     )
@@ -62,23 +79,30 @@ class SoftDeletedEntitiesCleanupConfig(ConfigModel):
         default=None,
         description="Query to filter entities",
     )
+
     limit_entities_delete: Optional[int] = Field(
         25000, description="Max number of entities to delete."
     )
 
-    runtime_limit_seconds: Optional[int] = Field(
-        None,
+    futures_max_at_time: int = Field(
+        1000, description="Max number of futures to have at a time."
+    )
+
+    runtime_limit_seconds: int = Field(
+        7200,  # 2 hours by default
         description="Runtime limit in seconds",
     )
 
 
 @dataclass
 class SoftDeletedEntitiesReport(SourceReport):
-    num_soft_deleted_entity_removed: int = 0
-    num_soft_deleted_entity_removed_by_type: TopKDict[str, int] = field(
-        default_factory=TopKDict
-    )
-    sample_soft_deleted_removed_aspects_by_type: TopKDict[str, LossyList[str]] = field(
+    num_queries_found: int = 0
+    num_soft_deleted_entity_processed: int = 0
+    num_soft_deleted_retained_due_to_age: int = 0
+    num_soft_deleted_entity_removal_started: int = 0
+    num_hard_deleted: int = 0
+    num_hard_deleted_by_type: TopKDict[str, int] = field(default_factory=TopKDict)
+    sample_hard_deleted_aspects_by_type: TopKDict[str, LossyList[str]] = field(
         default_factory=TopKDict
     )
 
@@ -103,48 +127,53 @@ def __init__(
         self.config = config
         self.report = report
         self.dry_run = dry_run
+        self.start_time = 0.0
+        self._report_lock: Lock = Lock()
+        self.last_print_time = 0.0
+
+    def _increment_retained_count(self) -> None:
+        """Thread-safe method to update report fields"""
+        with self._report_lock:
+            self.report.num_soft_deleted_retained_due_to_age += 1
+
+    def _increment_removal_started_count(self) -> None:
+        """Thread-safe method to update report fields"""
+        with self._report_lock:
+            self.report.num_soft_deleted_entity_removal_started += 1
+
+    def _update_report(self, urn: str, entity_type: str) -> None:
+        """Thread-safe method to update report fields"""
+        with self._report_lock:
+            self.report.num_hard_deleted += 1
+
+            current_count = self.report.num_hard_deleted_by_type.get(entity_type, 0)
+            self.report.num_hard_deleted_by_type[entity_type] = current_count + 1
+            if entity_type not in self.report.sample_hard_deleted_aspects_by_type:
+                self.report.sample_hard_deleted_aspects_by_type[
+                    entity_type
+                ] = LossyList()
+            self.report.sample_hard_deleted_aspects_by_type[entity_type].append(urn)
 
     def delete_entity(self, urn: str) -> None:
         assert self.ctx.graph
 
         entity_urn = Urn.from_string(urn)
-        self.report.num_soft_deleted_entity_removed += 1
-        self.report.num_soft_deleted_entity_removed_by_type[entity_urn.entity_type] = (
-            self.report.num_soft_deleted_entity_removed_by_type.get(
-                entity_urn.entity_type, 0
-            )
-            + 1
-        )
-        if (
-            entity_urn.entity_type
-            not in self.report.sample_soft_deleted_removed_aspects_by_type
-        ):
-            self.report.sample_soft_deleted_removed_aspects_by_type[
-                entity_urn.entity_type
-            ] = LossyList()
-        self.report.sample_soft_deleted_removed_aspects_by_type[
-            entity_urn.entity_type
-        ].append(urn)
-
         if self.dry_run:
             logger.info(
                 f"Dry run is on otherwise it would have deleted {urn} with hard deletion"
             )
             return
-
+        self._increment_removal_started_count()
         self.ctx.graph.delete_entity(urn=urn, hard=True)
         self.ctx.graph.delete_references_to_urn(
             urn=urn,
             dry_run=False,
         )
+        self._update_report(urn, entity_urn.entity_type)
 
     def delete_soft_deleted_entity(self, urn: str) -> None:
         assert self.ctx.graph
 
-        if self.config.retention_days is None:
-            logger.info("Retention days is not set, skipping soft delete cleanup")
-            return
-
         retention_time = (
             int(datetime.now(timezone.utc).timestamp())
             - self.config.retention_days * 24 * 60 * 60
@@ -157,15 +186,85 @@ def delete_soft_deleted_entity(self, urn: str) -> None:
             ]["created"]["time"] < (retention_time * 1000):
                 logger.debug(f"Hard deleting {urn}")
                 self.delete_entity(urn)
+            else:
+                self._increment_retained_count()
+
+    def _print_report(self) -> None:
+        time_taken = round(time.time() - self.last_print_time, 1)
+        # Print report every 2 minutes
+        if time_taken > 120:
+            self.last_print_time = time.time()
+            logger.info(f"\n{self.report.as_string()}")
+
+    def _process_futures(self, futures: Dict[Future, str]) -> Dict[Future, str]:
+        done, not_done = wait(futures, return_when=FIRST_COMPLETED)
+        futures = {future: urn for future, urn in futures.items() if future in not_done}
+
+        for future in done:
+            self._print_report()
+            if future.exception():
+                logger.error(
+                    f"Failed to delete entity {futures[future]}: {future.exception()}"
+                )
+                self.report.failure(
+                    f"Failed to delete entity {futures[future]}",
+                    exc=future.exception(),
+                )
+            self.report.num_soft_deleted_entity_processed += 1
+            if (
+                self.report.num_soft_deleted_entity_processed % self.config.batch_size
+                == 0
+            ):
+                if self.config.delay:
+                    logger.debug(
+                        f"Sleeping for {self.config.delay} seconds before further processing batch"
+                    )
+                    time.sleep(self.config.delay)
+        return futures
 
-    def cleanup_soft_deleted_entities(self) -> None:
-        if not self.config.enabled:
-            return
+    def _get_soft_deleted_queries(self) -> Iterable[str]:
         assert self.ctx.graph
-        start_time = time.time()
-
-        deleted_count_retention = 0
-        urns = self.ctx.graph.get_urns_by_filter(
+        scroll_id: Optional[str] = None
+        while True:
+            try:
+                result = self.ctx.graph.execute_graphql(
+                    QUERY_QUERY_ENTITY,
+                    {
+                        "input": {
+                            "types": ["QUERY"],
+                            "query": "*",
+                            "scrollId": scroll_id if scroll_id else None,
+                            "count": self.config.batch_size,
+                            "orFilters": [
+                                {
+                                    "and": [
+                                        {
+                                            "field": "removed",
+                                            "values": ["true"],
+                                            "condition": "EQUAL",
+                                        }
+                                    ]
+                                }
+                            ],
+                        }
+                    },
+                )
+            except Exception as e:
+                self.report.failure(
+                    f"While trying to get queries with {scroll_id}", exc=e
+                )
+                break
+            scroll_across_entities = result.get("scrollAcrossEntities")
+            if not scroll_across_entities:
+                break
+            scroll_id = scroll_across_entities.get("nextScrollId")
+            self.report.num_queries_found += scroll_across_entities.get("count")
+            for query in scroll_across_entities.get("searchResults"):
+                yield query["entity"]["urn"]
+
+    def _get_urns(self) -> Iterable[str]:
+        assert self.ctx.graph
+        yield from self.ctx.graph.get_urns_by_filter(
             entity_types=self.config.entity_types,
             platform=self.config.platform,
             env=self.config.env,
@@ -173,52 +272,41 @@ def cleanup_soft_deleted_entities(self) -> None:
             status=RemovedStatusFilter.ONLY_SOFT_DELETED,
             batch_size=self.config.batch_size,
         )
+        yield from self._get_soft_deleted_queries()
+
+    def cleanup_soft_deleted_entities(self) -> None:
+        if not self.config.enabled:
+            return
+        self.start_time = time.time()
 
-        futures = {}
+        futures: Dict[Future, str] = dict()
         with ThreadPoolExecutor(max_workers=self.config.max_workers) as executor:
-            num_urns_submitted = 0
-            for urn in urns:
-                num_urns_submitted += 1
+            for urn in self._get_urns():
+                self._print_report()
+                while len(futures) >= self.config.futures_max_at_time:
+                    futures = self._process_futures(futures)
                 if (
                     self.config.limit_entities_delete
-                    and num_urns_submitted > self.config.limit_entities_delete
+                    and self.report.num_hard_deleted > self.config.limit_entities_delete
                 ):
                     logger.info(
-                        f"Limit of {self.config.limit_entities_delete} entities reached. Stopping"
+                        f"Limit of {self.config.limit_entities_delete} entities reached. Stopped adding more."
                     )
                     break
                 if (
                     self.config.runtime_limit_seconds
-                    and time.time() - start_time > self.config.runtime_limit_seconds
+                    and time.time() - self.start_time
+                    > self.config.runtime_limit_seconds
                 ):
                     logger.info(
-                        f"Runtime limit of {self.config.runtime_limit_seconds} seconds reached. Stopping"
+                        f"Runtime limit of {self.config.runtime_limit_seconds} seconds reached. Not submitting more futures."
                     )
                     break
 
                 future = executor.submit(self.delete_soft_deleted_entity, urn)
                 futures[future] = urn
 
-            if not futures:
-                return
-            for future in as_completed(futures):
-                if future.exception():
-                    logger.error(
-                        f"Failed to delete entity {futures[future]}: {future.exception()}"
-                    )
-                    self.report.failure(
-                        f"Failed to delete entity {futures[future]}",
-                        exc=future.exception(),
-                    )
-                deleted_count_retention += 1
-
-                if deleted_count_retention % self.config.batch_size == 0:
-                    logger.info(
-                        f"Processed {deleted_count_retention} soft deleted entity and deleted {self.report.num_soft_deleted_entity_removed} entities so far"
-                    )
-
-                    if self.config.delay:
-                        logger.debug(
-                            f"Sleeping for {self.config.delay} seconds before getting next batch"
-                        )
-                        time.sleep(self.config.delay)
+            logger.info(f"Waiting for {len(futures)} futures to complete")
+            while len(futures) > 0:
+                self._print_report()
+                futures = self._process_futures(futures)

From a814cb389f364ab4a4782d3f4987fe047d07962a Mon Sep 17 00:00:00 2001
From: sagar-salvi-apptware
 <159135491+sagar-salvi-apptware@users.noreply.github.com>
Date: Thu, 2 Jan 2025 17:59:22 +0530
Subject: [PATCH 010/249] fix(ingest/bigquery): All View generation when
 queries_v2 is turned off (#12181)

Co-authored-by: Mayuri Nehate <33225191+mayurinehate@users.noreply.github.com>
---
 docs/how/updating-datahub.md                  |    1 +
 .../ingestion/source/bigquery_v2/bigquery.py  |   28 +-
 .../source/bigquery_v2/bigquery_config.py     |   12 +-
 .../source/bigquery_v2/bigquery_schema_gen.py |   28 +-
 .../ingestion/source/bigquery_v2/lineage.py   |   31 +-
 .../bigquery_mcp_lineage_golden_1.json        |  977 +++++++++++++++
 .../bigquery_mcp_lineage_golden_2.json        | 1064 +++++++++++++++++
 .../integration/bigquery_v2/test_bigquery.py  |  145 +++
 8 files changed, 2220 insertions(+), 66 deletions(-)
 create mode 100644 metadata-ingestion/tests/integration/bigquery_v2/bigquery_mcp_lineage_golden_1.json
 create mode 100644 metadata-ingestion/tests/integration/bigquery_v2/bigquery_mcp_lineage_golden_2.json

diff --git a/docs/how/updating-datahub.md b/docs/how/updating-datahub.md
index d6620fde0bf794..19261da23bcf96 100644
--- a/docs/how/updating-datahub.md
+++ b/docs/how/updating-datahub.md
@@ -18,6 +18,7 @@ This file documents any backwards-incompatible changes in DataHub and assists pe
 
 ## Next
 - #12191 - Configs `include_view_lineage` and `include_view_column_lineage` are removed from snowflake ingestion source. View and External Table DDL lineage will always be ingested when definitions are available.
+- #12181 - Configs `include_view_lineage`, `include_view_column_lineage` and `lineage_parse_view_ddl` are removed from bigquery ingestion source. View and Snapshot lineage will always be ingested when definitions are available.
 - #11560 - The PowerBI ingestion source configuration option include_workspace_name_in_dataset_urn determines whether the workspace name is included in the PowerBI dataset's URN.<br/> PowerBI allows to have identical name of semantic model and their tables across the workspace, It will overwrite the semantic model in-case of multi-workspace ingestion.<br/>
   Entity urn with `include_workspace_name_in_dataset_urn: false`
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py
index 16a5268a2dea76..38eab3606b7e95 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py
@@ -206,9 +206,7 @@ def test_connection(config_dict: dict) -> TestConnectionReport:
 
     def _init_schema_resolver(self) -> SchemaResolver:
         schema_resolution_required = (
-            self.config.use_queries_v2
-            or self.config.lineage_parse_view_ddl
-            or self.config.lineage_use_sql_parser
+            self.config.use_queries_v2 or self.config.lineage_use_sql_parser
         )
         schema_ingestion_enabled = (
             self.config.include_schema_metadata
@@ -255,18 +253,16 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
         for project in projects:
             yield from self.bq_schema_extractor.get_project_workunits(project)
 
-        if self.config.use_queries_v2:
-            # Always ingest View and Snapshot lineage with schema ingestion
-            self.report.set_ingestion_stage("*", "View and Snapshot Lineage")
-
-            yield from self.lineage_extractor.get_lineage_workunits_for_views_and_snapshots(
-                [p.id for p in projects],
-                self.bq_schema_extractor.view_refs_by_project,
-                self.bq_schema_extractor.view_definitions,
-                self.bq_schema_extractor.snapshot_refs_by_project,
-                self.bq_schema_extractor.snapshots_by_ref,
-            )
+        self.report.set_ingestion_stage("*", "View and Snapshot Lineage")
+        yield from self.lineage_extractor.get_lineage_workunits_for_views_and_snapshots(
+            [p.id for p in projects],
+            self.bq_schema_extractor.view_refs_by_project,
+            self.bq_schema_extractor.view_definitions,
+            self.bq_schema_extractor.snapshot_refs_by_project,
+            self.bq_schema_extractor.snapshots_by_ref,
+        )
 
+        if self.config.use_queries_v2:
             # if both usage and lineage are disabled then skip queries extractor piece
             if (
                 not self.config.include_usage_statistics
@@ -306,10 +302,6 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
             if self.config.include_table_lineage:
                 yield from self.lineage_extractor.get_lineage_workunits(
                     [p.id for p in projects],
-                    self.bq_schema_extractor.view_refs_by_project,
-                    self.bq_schema_extractor.view_definitions,
-                    self.bq_schema_extractor.snapshot_refs_by_project,
-                    self.bq_schema_extractor.snapshots_by_ref,
                     self.bq_schema_extractor.table_refs,
                 )
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_config.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_config.py
index 4af41921c9fa3c..ef323260b014e6 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_config.py
@@ -463,10 +463,6 @@ def have_table_data_read_permission(self) -> bool:
         default=True,
         description="Use sql parser to resolve view/table lineage.",
     )
-    lineage_parse_view_ddl: bool = Field(
-        default=True,
-        description="Sql parse view ddl to get lineage.",
-    )
 
     lineage_sql_parser_use_raw_names: bool = Field(
         default=False,
@@ -572,11 +568,9 @@ def have_table_data_read_permission(self) -> bool:
         "See [this](https://cloud.google.com/bigquery/docs/information-schema-jobs#scope_and_syntax) for details.",
     )
 
-    # include_view_lineage and include_view_column_lineage are inherited from SQLCommonConfig
-    # but not used in bigquery so we hide them from docs.
-    include_view_lineage: bool = Field(default=True, hidden_from_docs=True)
-
-    include_view_column_lineage: bool = Field(default=True, hidden_from_docs=True)
+    _include_view_lineage = pydantic_removed_field("include_view_lineage")
+    _include_view_column_lineage = pydantic_removed_field("include_view_column_lineage")
+    _lineage_parse_view_ddl = pydantic_removed_field("lineage_parse_view_ddl")
 
     @root_validator(pre=True)
     def set_include_schema_metadata(cls, values: Dict) -> Dict:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py
index 4a3b47f6b543a6..bc2688e6b481ab 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py
@@ -653,14 +653,11 @@ def _process_view(
             self.report.report_dropped(table_identifier.raw_table_name())
             return
 
-        if self.store_table_refs:
-            table_ref = str(
-                BigQueryTableRef(table_identifier).get_sanitized_table_ref()
-            )
-            self.table_refs.add(table_ref)
-            if self.config.lineage_parse_view_ddl and view.view_definition:
-                self.view_refs_by_project[project_id].add(table_ref)
-                self.view_definitions[table_ref] = view.view_definition
+        table_ref = str(BigQueryTableRef(table_identifier).get_sanitized_table_ref())
+        self.table_refs.add(table_ref)
+        if view.view_definition:
+            self.view_refs_by_project[project_id].add(table_ref)
+            self.view_definitions[table_ref] = view.view_definition
 
         view.column_count = len(columns)
         if not view.column_count:
@@ -701,14 +698,11 @@ def _process_snapshot(
                 f"Snapshot doesn't have any column or unable to get columns for snapshot: {table_identifier}"
             )
 
-        if self.store_table_refs:
-            table_ref = str(
-                BigQueryTableRef(table_identifier).get_sanitized_table_ref()
-            )
-            self.table_refs.add(table_ref)
-            if snapshot.base_table_identifier:
-                self.snapshot_refs_by_project[project_id].add(table_ref)
-                self.snapshots_by_ref[table_ref] = snapshot
+        table_ref = str(BigQueryTableRef(table_identifier).get_sanitized_table_ref())
+        self.table_refs.add(table_ref)
+        if snapshot.base_table_identifier:
+            self.snapshot_refs_by_project[project_id].add(table_ref)
+            self.snapshots_by_ref[table_ref] = snapshot
 
         yield from self.gen_snapshot_dataset_workunits(
             table=snapshot,
@@ -1148,7 +1142,7 @@ def gen_schema_metadata(
             foreignKeys=foreign_keys if foreign_keys else None,
         )
 
-        if self.config.lineage_parse_view_ddl or self.config.lineage_use_sql_parser:
+        if self.config.lineage_use_sql_parser:
             self.sql_parser_schema_resolver.add_schema_metadata(
                 dataset_urn, schema_metadata
             )
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/lineage.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/lineage.py
index 321b1b6207fabf..ba3357aa8ca20c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/lineage.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/lineage.py
@@ -291,16 +291,15 @@ def get_lineage_workunits_for_views_and_snapshots(
         snapshots_by_ref: FileBackedDict[BigqueryTableSnapshot],
     ) -> Iterable[MetadataWorkUnit]:
         for project in projects:
-            if self.config.lineage_parse_view_ddl:
-                for view in view_refs_by_project[project]:
-                    self.datasets_skip_audit_log_lineage.add(view)
-                    self.aggregator.add_view_definition(
-                        view_urn=self.identifiers.gen_dataset_urn_from_raw_ref(
-                            BigQueryTableRef.from_string_name(view)
-                        ),
-                        view_definition=view_definitions[view],
-                        default_db=project,
-                    )
+            for view in view_refs_by_project[project]:
+                self.datasets_skip_audit_log_lineage.add(view)
+                self.aggregator.add_view_definition(
+                    view_urn=self.identifiers.gen_dataset_urn_from_raw_ref(
+                        BigQueryTableRef.from_string_name(view)
+                    ),
+                    view_definition=view_definitions[view],
+                    default_db=project,
+                )
 
             for snapshot_ref in snapshot_refs_by_project[project]:
                 snapshot = snapshots_by_ref[snapshot_ref]
@@ -322,23 +321,11 @@ def get_lineage_workunits_for_views_and_snapshots(
     def get_lineage_workunits(
         self,
         projects: List[str],
-        view_refs_by_project: Dict[str, Set[str]],
-        view_definitions: FileBackedDict[str],
-        snapshot_refs_by_project: Dict[str, Set[str]],
-        snapshots_by_ref: FileBackedDict[BigqueryTableSnapshot],
         table_refs: Set[str],
     ) -> Iterable[MetadataWorkUnit]:
         if not self._should_ingest_lineage():
             return
 
-        yield from self.get_lineage_workunits_for_views_and_snapshots(
-            projects,
-            view_refs_by_project,
-            view_definitions,
-            snapshot_refs_by_project,
-            snapshots_by_ref,
-        )
-
         if self.config.use_exported_bigquery_audit_metadata:
             projects = ["*"]  # project_id not used when using exported metadata
 
diff --git a/metadata-ingestion/tests/integration/bigquery_v2/bigquery_mcp_lineage_golden_1.json b/metadata-ingestion/tests/integration/bigquery_v2/bigquery_mcp_lineage_golden_1.json
new file mode 100644
index 00000000000000..8f411ca5137711
--- /dev/null
+++ b/metadata-ingestion/tests/integration/bigquery_v2/bigquery_mcp_lineage_golden_1.json
@@ -0,0 +1,977 @@
+[
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "bigquery",
+                "env": "PROD",
+                "project_id": "project-id-1"
+            },
+            "name": "project-id-1",
+            "env": "PROD"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Project"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:068bd9323110994a40019fcf6cfc60d3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "bigquery",
+                "env": "PROD",
+                "project_id": "project-id-1",
+                "dataset_id": "bigquery-dataset-1",
+                "location": "US"
+            },
+            "externalUrl": "https://console.cloud.google.com/bigquery?project=project-id-1&ws=!1m4!1m3!3m2!1sproject-id-1!2sbigquery-dataset-1",
+            "name": "bigquery-dataset-1",
+            "env": "PROD"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Dataset"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+                    "urn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "project-id-1.bigquery-dataset-1.table-1",
+            "platform": "urn:li:dataPlatform:bigquery",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "age",
+                    "nullable": false,
+                    "description": "comment",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "INT",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": [
+                            {
+                                "tag": "urn:li:tag:Test Policy Tag"
+                            }
+                        ]
+                    },
+                    "isPartOfKey": false,
+                    "isPartitioningKey": false
+                },
+                {
+                    "fieldPath": "email",
+                    "nullable": false,
+                    "description": "comment",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "STRING",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": []
+                    },
+                    "isPartOfKey": false,
+                    "isPartitioningKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "externalUrl": "https://console.cloud.google.com/bigquery?project=project-id-1&ws=!1m5!1m4!4m3!1sproject-id-1!2sbigquery-dataset-1!3stable-1",
+            "name": "table-1",
+            "qualifiedName": "project-id-1.bigquery-dataset-1.table-1",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:bigquery,project-id-1)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+                    "urn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3"
+                },
+                {
+                    "id": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+                    "urn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "project-id-1.bigquery-dataset-1.view-1",
+            "platform": "urn:li:dataPlatform:bigquery",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "age",
+                    "nullable": false,
+                    "description": "comment",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "INT",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": [
+                            {
+                                "tag": "urn:li:tag:Test Policy Tag"
+                            }
+                        ]
+                    },
+                    "isPartOfKey": false,
+                    "isPartitioningKey": false
+                },
+                {
+                    "fieldPath": "email",
+                    "nullable": false,
+                    "description": "comment",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "STRING",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": []
+                    },
+                    "isPartOfKey": false,
+                    "isPartitioningKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "externalUrl": "https://console.cloud.google.com/bigquery?project=project-id-1&ws=!1m5!1m4!4m3!1sproject-id-1!2sbigquery-dataset-1!3sview-1",
+            "name": "view-1",
+            "qualifiedName": "project-id-1.bigquery-dataset-1.view-1",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:bigquery,project-id-1)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "create view `bigquery-dataset-1.view-1` as select email from `bigquery-dataset-1.table-1`",
+            "viewLanguage": "SQL"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+                    "urn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3"
+                },
+                {
+                    "id": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+                    "urn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "project-id-1.bigquery-dataset-1.snapshot-table-1",
+            "platform": "urn:li:dataPlatform:bigquery",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "age",
+                    "nullable": false,
+                    "description": "comment",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "INT",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": [
+                            {
+                                "tag": "urn:li:tag:Test Policy Tag"
+                            }
+                        ]
+                    },
+                    "isPartOfKey": false,
+                    "isPartitioningKey": false
+                },
+                {
+                    "fieldPath": "email",
+                    "nullable": false,
+                    "description": "comment",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "STRING",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": []
+                    },
+                    "isPartOfKey": false,
+                    "isPartitioningKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "externalUrl": "https://console.cloud.google.com/bigquery?project=project-id-1&ws=!1m5!1m4!4m3!1sproject-id-1!2sbigquery-dataset-1!3ssnapshot-table-1",
+            "name": "snapshot-table-1",
+            "qualifiedName": "project-id-1.bigquery-dataset-1.snapshot-table-1",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:bigquery,project-id-1)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Bigquery Table Snapshot"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1643871600000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+                    "type": "COPY"
+                }
+            ],
+            "fineGrainedLineages": [
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD),age)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD),age)"
+                    ],
+                    "confidenceScore": 1.0
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD),email)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD),email)"
+                    ],
+                    "confidenceScore": 1.0
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+                    "urn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3"
+                },
+                {
+                    "id": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+                    "urn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1643871600000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+                    "type": "VIEW",
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Abigquery%2Cproject-id-1.bigquery-dataset-1.view-1%2CPROD%29"
+                }
+            ],
+            "fineGrainedLineages": [
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD),email)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD),email)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Abigquery%2Cproject-id-1.bigquery-dataset-1.view-1%2CPROD%29"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Abigquery%2Cproject-id-1.bigquery-dataset-1.view-1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "CREATE VIEW `bigquery-dataset-1.view-1` AS\nSELECT\n  email\nFROM `bigquery-dataset-1.table-1`",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:_ingestion"
+            },
+            "lastModified": {
+                "time": 1643871600000,
+                "actor": "urn:li:corpuser:_ingestion"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Abigquery%2Cproject-id-1.bigquery-dataset-1.view-1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD),email)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD),email)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Abigquery%2Cproject-id-1.bigquery-dataset-1.view-1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Abigquery%2Cproject-id-1.bigquery-dataset-1.view-1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "tag",
+    "entityUrn": "urn:li:tag:Test Policy Tag",
+    "changeType": "UPSERT",
+    "aspectName": "tagKey",
+    "aspect": {
+        "json": {
+            "name": "Test Policy Tag"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-0mn4n3",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/bigquery_v2/bigquery_mcp_lineage_golden_2.json b/metadata-ingestion/tests/integration/bigquery_v2/bigquery_mcp_lineage_golden_2.json
new file mode 100644
index 00000000000000..26abc09569ccfa
--- /dev/null
+++ b/metadata-ingestion/tests/integration/bigquery_v2/bigquery_mcp_lineage_golden_2.json
@@ -0,0 +1,1064 @@
+[
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "bigquery",
+                "env": "PROD",
+                "project_id": "project-id-1"
+            },
+            "name": "project-id-1",
+            "env": "PROD"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Project"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:068bd9323110994a40019fcf6cfc60d3"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "bigquery",
+                "env": "PROD",
+                "project_id": "project-id-1",
+                "dataset_id": "bigquery-dataset-1",
+                "location": "US"
+            },
+            "externalUrl": "https://console.cloud.google.com/bigquery?project=project-id-1&ws=!1m4!1m3!3m2!1sproject-id-1!2sbigquery-dataset-1",
+            "name": "bigquery-dataset-1",
+            "env": "PROD"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Dataset"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+                    "urn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "project-id-1.bigquery-dataset-1.table-1",
+            "platform": "urn:li:dataPlatform:bigquery",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "age",
+                    "nullable": false,
+                    "description": "comment",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "INT",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": [
+                            {
+                                "tag": "urn:li:tag:Test Policy Tag"
+                            }
+                        ]
+                    },
+                    "isPartOfKey": false,
+                    "isPartitioningKey": false
+                },
+                {
+                    "fieldPath": "email",
+                    "nullable": false,
+                    "description": "comment",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "STRING",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": []
+                    },
+                    "isPartOfKey": false,
+                    "isPartitioningKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "externalUrl": "https://console.cloud.google.com/bigquery?project=project-id-1&ws=!1m5!1m4!4m3!1sproject-id-1!2sbigquery-dataset-1!3stable-1",
+            "name": "table-1",
+            "qualifiedName": "project-id-1.bigquery-dataset-1.table-1",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:bigquery,project-id-1)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+                    "urn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3"
+                },
+                {
+                    "id": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+                    "urn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "project-id-1.bigquery-dataset-1.view-1",
+            "platform": "urn:li:dataPlatform:bigquery",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "age",
+                    "nullable": false,
+                    "description": "comment",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "INT",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": [
+                            {
+                                "tag": "urn:li:tag:Test Policy Tag"
+                            }
+                        ]
+                    },
+                    "isPartOfKey": false,
+                    "isPartitioningKey": false
+                },
+                {
+                    "fieldPath": "email",
+                    "nullable": false,
+                    "description": "comment",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "STRING",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": []
+                    },
+                    "isPartOfKey": false,
+                    "isPartitioningKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "externalUrl": "https://console.cloud.google.com/bigquery?project=project-id-1&ws=!1m5!1m4!4m3!1sproject-id-1!2sbigquery-dataset-1!3sview-1",
+            "name": "view-1",
+            "qualifiedName": "project-id-1.bigquery-dataset-1.view-1",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:bigquery,project-id-1)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "create view `bigquery-dataset-1.view-1` as select email from `bigquery-dataset-1.table-1`",
+            "viewLanguage": "SQL"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+                    "urn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3"
+                },
+                {
+                    "id": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+                    "urn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "project-id-1.bigquery-dataset-1.snapshot-table-1",
+            "platform": "urn:li:dataPlatform:bigquery",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "age",
+                    "nullable": false,
+                    "description": "comment",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "INT",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": [
+                            {
+                                "tag": "urn:li:tag:Test Policy Tag"
+                            }
+                        ]
+                    },
+                    "isPartOfKey": false,
+                    "isPartitioningKey": false
+                },
+                {
+                    "fieldPath": "email",
+                    "nullable": false,
+                    "description": "comment",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "STRING",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": []
+                    },
+                    "isPartOfKey": false,
+                    "isPartitioningKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "externalUrl": "https://console.cloud.google.com/bigquery?project=project-id-1&ws=!1m5!1m4!4m3!1sproject-id-1!2sbigquery-dataset-1!3ssnapshot-table-1",
+            "name": "snapshot-table-1",
+            "qualifiedName": "project-id-1.bigquery-dataset-1.snapshot-table-1",
+            "description": "",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:bigquery,project-id-1)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Bigquery Table Snapshot"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1643871600000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+                    "type": "COPY"
+                }
+            ],
+            "fineGrainedLineages": [
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD),age)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD),age)"
+                    ],
+                    "confidenceScore": 1.0
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD),email)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD),email)"
+                    ],
+                    "confidenceScore": 1.0
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:068bd9323110994a40019fcf6cfc60d3",
+                    "urn": "urn:li:container:068bd9323110994a40019fcf6cfc60d3"
+                },
+                {
+                    "id": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0",
+                    "urn": "urn:li:container:8df46c5e3ded05a3122b0015822c0ef0"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1643871600000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+                    "type": "VIEW",
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Abigquery%2Cproject-id-1.bigquery-dataset-1.view-1%2CPROD%29"
+                }
+            ],
+            "fineGrainedLineages": [
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD),email)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD),email)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Abigquery%2Cproject-id-1.bigquery-dataset-1.view-1%2CPROD%29"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Abigquery%2Cproject-id-1.bigquery-dataset-1.view-1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "CREATE VIEW `bigquery-dataset-1.view-1` AS\nSELECT\n  email\nFROM `bigquery-dataset-1.table-1`",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:_ingestion"
+            },
+            "lastModified": {
+                "time": 1643871600000,
+                "actor": "urn:li:corpuser:_ingestion"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Abigquery%2Cproject-id-1.bigquery-dataset-1.view-1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD),email)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD),email)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Abigquery%2Cproject-id-1.bigquery-dataset-1.view-1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.snapshot-table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1643760000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 0,
+            "totalSqlQueries": 0,
+            "topSqlQueries": [],
+            "userCounts": [],
+            "fieldCounts": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.view-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1643760000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 0,
+            "totalSqlQueries": 0,
+            "topSqlQueries": [],
+            "userCounts": [],
+            "fieldCounts": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,project-id-1.bigquery-dataset-1.table-1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1643760000000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 0,
+            "totalSqlQueries": 0,
+            "topSqlQueries": [],
+            "userCounts": [],
+            "fieldCounts": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Abigquery%2Cproject-id-1.bigquery-dataset-1.view-1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "tag",
+    "entityUrn": "urn:li:tag:Test Policy Tag",
+    "changeType": "UPSERT",
+    "aspectName": "tagKey",
+    "aspect": {
+        "json": {
+            "name": "Test Policy Tag"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1643871600000,
+        "runId": "bigquery-2022_02_03-07_00_00-k4o1z9",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/bigquery_v2/test_bigquery.py b/metadata-ingestion/tests/integration/bigquery_v2/test_bigquery.py
index 1f146886361617..2dd320041a1132 100644
--- a/metadata-ingestion/tests/integration/bigquery_v2/test_bigquery.py
+++ b/metadata-ingestion/tests/integration/bigquery_v2/test_bigquery.py
@@ -4,6 +4,7 @@
 from typing import Any, Dict, Optional
 from unittest.mock import MagicMock, patch
 
+import pytest
 from freezegun import freeze_time
 from google.cloud.bigquery.table import TableListItem
 
@@ -577,3 +578,147 @@ def test_bigquery_queries_v2_lineage_usage_ingest(
         output_path=mcp_output_path,
         golden_path=mcp_golden_path,
     )
+
+
+@freeze_time(FROZEN_TIME)
+@patch.object(BigQuerySchemaApi, "get_snapshots_for_dataset")
+@patch.object(BigQuerySchemaApi, "get_views_for_dataset")
+@patch.object(BigQuerySchemaApi, "get_tables_for_dataset")
+@patch.object(BigQuerySchemaGenerator, "get_core_table_details")
+@patch.object(BigQuerySchemaApi, "get_datasets_for_project_id")
+@patch.object(BigQuerySchemaApi, "get_columns_for_dataset")
+@patch.object(BigQueryDataReader, "get_sample_data_for_table")
+@patch("google.cloud.bigquery.Client")
+@patch("google.cloud.datacatalog_v1.PolicyTagManagerClient")
+@patch("google.cloud.resourcemanager_v3.ProjectsClient")
+@pytest.mark.parametrize(
+    "use_queries_v2, include_table_lineage, include_usage_statistics, golden_file",
+    [
+        (True, False, False, "bigquery_mcp_lineage_golden_1.json"),
+        (True, True, False, "bigquery_mcp_lineage_golden_1.json"),
+        (False, False, True, "bigquery_mcp_lineage_golden_2.json"),
+        (False, True, True, "bigquery_mcp_lineage_golden_2.json"),
+    ],
+)
+def test_bigquery_lineage_v2_ingest_view_snapshots(
+    client,
+    policy_tag_manager_client,
+    projects_client,
+    get_sample_data_for_table,
+    get_columns_for_dataset,
+    get_datasets_for_project_id,
+    get_core_table_details,
+    get_tables_for_dataset,
+    get_views_for_dataset,
+    get_snapshots_for_dataset,
+    pytestconfig,
+    tmp_path,
+    use_queries_v2,
+    include_table_lineage,
+    include_usage_statistics,
+    golden_file,
+):
+    test_resources_dir = pytestconfig.rootpath / "tests/integration/bigquery_v2"
+    mcp_golden_path = f"{test_resources_dir}/{golden_file}"
+    mcp_output_path = "{}/{}_output.json".format(tmp_path, golden_file)
+
+    dataset_name = "bigquery-dataset-1"
+    get_datasets_for_project_id.return_value = [
+        BigqueryDataset(name=dataset_name, location="US")
+    ]
+
+    table_list_item = TableListItem(
+        {"tableReference": {"projectId": "", "datasetId": "", "tableId": ""}}
+    )
+    table_name = "table-1"
+    snapshot_table_name = "snapshot-table-1"
+    view_name = "view-1"
+    get_core_table_details.return_value = {table_name: table_list_item}
+    columns = [
+        BigqueryColumn(
+            name="age",
+            ordinal_position=1,
+            is_nullable=False,
+            field_path="col_1",
+            data_type="INT",
+            comment="comment",
+            is_partition_column=False,
+            cluster_column_position=None,
+            policy_tags=["Test Policy Tag"],
+        ),
+        BigqueryColumn(
+            name="email",
+            ordinal_position=1,
+            is_nullable=False,
+            field_path="col_2",
+            data_type="STRING",
+            comment="comment",
+            is_partition_column=False,
+            cluster_column_position=None,
+        ),
+    ]
+
+    get_columns_for_dataset.return_value = {
+        table_name: columns,
+        snapshot_table_name: columns,
+        view_name: columns,
+    }
+    get_sample_data_for_table.return_value = {
+        "age": [random.randint(1, 80) for i in range(20)],
+        "email": [random_email() for i in range(20)],
+    }
+
+    bigquery_table = BigqueryTable(
+        name=table_name,
+        comment=None,
+        created=None,
+        last_altered=None,
+        size_in_bytes=None,
+        rows_count=None,
+    )
+    get_tables_for_dataset.return_value = iter([bigquery_table])
+
+    bigquery_view = BigqueryView(
+        name=view_name,
+        comment=None,
+        created=None,
+        view_definition=f"create view `{dataset_name}.view-1` as select email from `{dataset_name}.table-1`",
+        last_altered=None,
+        size_in_bytes=None,
+        rows_count=None,
+        materialized=False,
+    )
+
+    get_views_for_dataset.return_value = iter([bigquery_view])
+    snapshot_table = BigqueryTableSnapshot(
+        name=snapshot_table_name,
+        comment=None,
+        created=None,
+        last_altered=None,
+        size_in_bytes=None,
+        rows_count=None,
+        base_table_identifier=BigqueryTableIdentifier(
+            project_id="project-id-1",
+            dataset="bigquery-dataset-1",
+            table="table-1",
+        ),
+    )
+    get_snapshots_for_dataset.return_value = iter([snapshot_table])
+
+    pipeline_config_dict: Dict[str, Any] = recipe(
+        mcp_output_path=mcp_output_path,
+        source_config_override={
+            "use_queries_v2": use_queries_v2,
+            "include_table_lineage": include_table_lineage,
+            "include_usage_statistics": include_usage_statistics,
+            "classification": {"enabled": False},
+        },
+    )
+
+    run_and_get_pipeline(pipeline_config_dict)
+
+    mce_helpers.check_golden_file(
+        pytestconfig,
+        output_path=mcp_output_path,
+        golden_path=mcp_golden_path,
+    )

From 7f64ffd2f7541900bbcd2b7b5b3f6dde237a8667 Mon Sep 17 00:00:00 2001
From: sagar-salvi-apptware
 <159135491+sagar-salvi-apptware@users.noreply.github.com>
Date: Thu, 2 Jan 2025 18:44:45 +0530
Subject: [PATCH 011/249] test(ingest/athena): add connector integration tests
 (#12256)

---
 .../integration/athena/athena_mce_golden.json | 1362 +++++++++++++++++
 .../integration/athena/test_athena_source.py  |  163 ++
 2 files changed, 1525 insertions(+)
 create mode 100644 metadata-ingestion/tests/integration/athena/athena_mce_golden.json
 create mode 100644 metadata-ingestion/tests/integration/athena/test_athena_source.py

diff --git a/metadata-ingestion/tests/integration/athena/athena_mce_golden.json b/metadata-ingestion/tests/integration/athena/athena_mce_golden.json
new file mode 100644
index 00000000000000..1b3fdb0bdb2538
--- /dev/null
+++ b/metadata-ingestion/tests/integration/athena/athena_mce_golden.json
@@ -0,0 +1,1362 @@
+[
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:28d9272f625e7a366dfdc276b6ce4a67",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "athena",
+                "env": "PROD",
+                "database": "test_schema"
+            },
+            "name": "test_schema",
+            "env": "PROD"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:28d9272f625e7a366dfdc276b6ce4a67",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:28d9272f625e7a366dfdc276b6ce4a67",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:athena"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:28d9272f625e7a366dfdc276b6ce4a67",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Database"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:28d9272f625e7a366dfdc276b6ce4a67",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:28d9272f625e7a366dfdc276b6ce4a67"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "key": "value",
+                            "table_type": "EXTERNAL_TABLE",
+                            "is_view": "True",
+                            "view_definition": "CREATE VIEW \"test_schema\".test_view_1 AS\nSELECT *\nFROM\n  \"test_schema\".\"test_table\""
+                        },
+                        "name": "test_table",
+                        "description": "Test table description",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "test_schema.test_table",
+                        "platform": "urn:li:dataPlatform:athena",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "[version=2.0].[type=string].employee_id",
+                                "nullable": false,
+                                "description": "Unique identifier for the employee",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "VARCHAR",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "isPartitioningKey": false,
+                                "jsonProps": "{\"native_data_type\": \"VARCHAR\", \"_nullable\": false}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=long].annual_salary",
+                                "nullable": true,
+                                "description": "Annual salary of the employee in USD",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "BIGINT",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "isPartitioningKey": false,
+                                "jsonProps": "{\"native_data_type\": \"BIGINT\", \"_nullable\": true}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=string].employee_name",
+                                "nullable": false,
+                                "description": "Full name of the employee",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "VARCHAR",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "isPartitioningKey": false,
+                                "jsonProps": "{\"native_data_type\": \"VARCHAR\", \"_nullable\": false}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=struct].[type=map].[type=struct].job_history",
+                                "nullable": true,
+                                "description": "Job history map: year to details (company, role)",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.MapType": {
+                                            "keyType": "string",
+                                            "valueType": "record"
+                                        }
+                                    }
+                                },
+                                "nativeDataType": "MapType(String(), STRUCT(year=INTEGER(), company=String(), role=String()))",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "isPartitioningKey": false,
+                                "jsonProps": "{\"native_data_type\": \"MapType(String(), STRUCT(year=INTEGER(), company=String(), role=String()))\", \"key_type\": {\"type\": \"string\", \"native_data_type\": \"VARCHAR\", \"_nullable\": true}, \"key_native_data_type\": \"VARCHAR\"}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=struct].[type=map].[type=struct].job_history.[type=int].year",
+                                "nullable": true,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "INTEGER",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "jsonProps": "{\"native_data_type\": \"INTEGER\", \"_nullable\": true}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=struct].[type=map].[type=struct].job_history.[type=string].company",
+                                "nullable": true,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "VARCHAR",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "jsonProps": "{\"native_data_type\": \"VARCHAR\", \"_nullable\": true}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=struct].[type=map].[type=struct].job_history.[type=string].role",
+                                "nullable": true,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "VARCHAR",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "jsonProps": "{\"native_data_type\": \"VARCHAR\", \"_nullable\": true}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=struct].[type=map].[type=long].department_budgets",
+                                "nullable": true,
+                                "description": "Map of department names to their respective budgets",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.MapType": {
+                                            "keyType": "string",
+                                            "valueType": "long"
+                                        }
+                                    }
+                                },
+                                "nativeDataType": "MapType(String(), BIGINT())",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "isPartitioningKey": false,
+                                "jsonProps": "{\"native_data_type\": \"MapType(String(), BIGINT())\", \"key_type\": {\"type\": \"string\", \"native_data_type\": \"VARCHAR\", \"_nullable\": true}, \"key_native_data_type\": \"VARCHAR\"}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=struct].[type=array].[type=string].skills",
+                                "nullable": true,
+                                "description": "List of skills possessed by the employee",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.ArrayType": {
+                                            "nestedType": [
+                                                "string"
+                                            ]
+                                        }
+                                    }
+                                },
+                                "nativeDataType": "array<VARCHAR>",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "isPartitioningKey": false,
+                                "jsonProps": "{\"native_data_type\": \"array<VARCHAR>\"}"
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:28d9272f625e7a366dfdc276b6ce4a67",
+                    "urn": "urn:li:container:28d9272f625e7a366dfdc276b6ce4a67"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:28d9272f625e7a366dfdc276b6ce4a67"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "key": "value",
+                            "table_type": "EXTERNAL_TABLE",
+                            "is_view": "True",
+                            "view_definition": "CREATE VIEW \"test_schema\".test_view_2 AS\nSELECT employee_id, employee_name, skills\nFROM\n  \"test_schema\".\"test_view_1\""
+                        },
+                        "name": "test_view_1",
+                        "description": "Test table description",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "test_schema.test_view_1",
+                        "platform": "urn:li:dataPlatform:athena",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "[version=2.0].[type=string].employee_id",
+                                "nullable": false,
+                                "description": "Unique identifier for the employee",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "VARCHAR",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "isPartitioningKey": false,
+                                "jsonProps": "{\"native_data_type\": \"VARCHAR\", \"_nullable\": false}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=long].annual_salary",
+                                "nullable": true,
+                                "description": "Annual salary of the employee in USD",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "BIGINT",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "isPartitioningKey": false,
+                                "jsonProps": "{\"native_data_type\": \"BIGINT\", \"_nullable\": true}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=string].employee_name",
+                                "nullable": false,
+                                "description": "Full name of the employee",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "VARCHAR",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "isPartitioningKey": false,
+                                "jsonProps": "{\"native_data_type\": \"VARCHAR\", \"_nullable\": false}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=struct].[type=map].[type=struct].job_history",
+                                "nullable": true,
+                                "description": "Job history map: year to details (company, role)",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.MapType": {
+                                            "keyType": "string",
+                                            "valueType": "record"
+                                        }
+                                    }
+                                },
+                                "nativeDataType": "MapType(String(), STRUCT(year=INTEGER(), company=String(), role=String()))",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "isPartitioningKey": false,
+                                "jsonProps": "{\"native_data_type\": \"MapType(String(), STRUCT(year=INTEGER(), company=String(), role=String()))\", \"key_type\": {\"type\": \"string\", \"native_data_type\": \"VARCHAR\", \"_nullable\": true}, \"key_native_data_type\": \"VARCHAR\"}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=struct].[type=map].[type=struct].job_history.[type=int].year",
+                                "nullable": true,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "INTEGER",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "jsonProps": "{\"native_data_type\": \"INTEGER\", \"_nullable\": true}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=struct].[type=map].[type=struct].job_history.[type=string].company",
+                                "nullable": true,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "VARCHAR",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "jsonProps": "{\"native_data_type\": \"VARCHAR\", \"_nullable\": true}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=struct].[type=map].[type=struct].job_history.[type=string].role",
+                                "nullable": true,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "VARCHAR",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "jsonProps": "{\"native_data_type\": \"VARCHAR\", \"_nullable\": true}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=struct].[type=map].[type=long].department_budgets",
+                                "nullable": true,
+                                "description": "Map of department names to their respective budgets",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.MapType": {
+                                            "keyType": "string",
+                                            "valueType": "long"
+                                        }
+                                    }
+                                },
+                                "nativeDataType": "MapType(String(), BIGINT())",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "isPartitioningKey": false,
+                                "jsonProps": "{\"native_data_type\": \"MapType(String(), BIGINT())\", \"key_type\": {\"type\": \"string\", \"native_data_type\": \"VARCHAR\", \"_nullable\": true}, \"key_native_data_type\": \"VARCHAR\"}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=struct].[type=array].[type=string].skills",
+                                "nullable": true,
+                                "description": "List of skills possessed by the employee",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.ArrayType": {
+                                            "nestedType": [
+                                                "string"
+                                            ]
+                                        }
+                                    }
+                                },
+                                "nativeDataType": "array<VARCHAR>",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "isPartitioningKey": false,
+                                "jsonProps": "{\"native_data_type\": \"array<VARCHAR>\"}"
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "CREATE VIEW \"test_schema\".test_view_1 AS\nSELECT *\nFROM\n  \"test_schema\".\"test_table\"",
+            "viewLanguage": "SQL"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:28d9272f625e7a366dfdc276b6ce4a67",
+                    "urn": "urn:li:container:28d9272f625e7a366dfdc276b6ce4a67"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:28d9272f625e7a366dfdc276b6ce4a67"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_2,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "key": "value",
+                            "table_type": "EXTERNAL_TABLE",
+                            "is_view": "True",
+                            "view_definition": "CREATE VIEW \"test_schema\".test_view_2 AS\nSELECT employee_id, employee_name, skills\nFROM\n  \"test_schema\".\"test_view_1\""
+                        },
+                        "name": "test_view_2",
+                        "description": "Test table description",
+                        "tags": []
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "test_schema.test_view_2",
+                        "platform": "urn:li:dataPlatform:athena",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.MySqlDDL": {
+                                "tableSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "[version=2.0].[type=string].employee_id",
+                                "nullable": false,
+                                "description": "Unique identifier for the employee",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "VARCHAR",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "isPartitioningKey": false,
+                                "jsonProps": "{\"native_data_type\": \"VARCHAR\", \"_nullable\": false}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=long].annual_salary",
+                                "nullable": true,
+                                "description": "Annual salary of the employee in USD",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "BIGINT",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "isPartitioningKey": false,
+                                "jsonProps": "{\"native_data_type\": \"BIGINT\", \"_nullable\": true}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=string].employee_name",
+                                "nullable": false,
+                                "description": "Full name of the employee",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "VARCHAR",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "isPartitioningKey": false,
+                                "jsonProps": "{\"native_data_type\": \"VARCHAR\", \"_nullable\": false}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=struct].[type=map].[type=struct].job_history",
+                                "nullable": true,
+                                "description": "Job history map: year to details (company, role)",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.MapType": {
+                                            "keyType": "string",
+                                            "valueType": "record"
+                                        }
+                                    }
+                                },
+                                "nativeDataType": "MapType(String(), STRUCT(year=INTEGER(), company=String(), role=String()))",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "isPartitioningKey": false,
+                                "jsonProps": "{\"native_data_type\": \"MapType(String(), STRUCT(year=INTEGER(), company=String(), role=String()))\", \"key_type\": {\"type\": \"string\", \"native_data_type\": \"VARCHAR\", \"_nullable\": true}, \"key_native_data_type\": \"VARCHAR\"}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=struct].[type=map].[type=struct].job_history.[type=int].year",
+                                "nullable": true,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "INTEGER",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "jsonProps": "{\"native_data_type\": \"INTEGER\", \"_nullable\": true}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=struct].[type=map].[type=struct].job_history.[type=string].company",
+                                "nullable": true,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "VARCHAR",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "jsonProps": "{\"native_data_type\": \"VARCHAR\", \"_nullable\": true}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=struct].[type=map].[type=struct].job_history.[type=string].role",
+                                "nullable": true,
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "VARCHAR",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "jsonProps": "{\"native_data_type\": \"VARCHAR\", \"_nullable\": true}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=struct].[type=map].[type=long].department_budgets",
+                                "nullable": true,
+                                "description": "Map of department names to their respective budgets",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.MapType": {
+                                            "keyType": "string",
+                                            "valueType": "long"
+                                        }
+                                    }
+                                },
+                                "nativeDataType": "MapType(String(), BIGINT())",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "isPartitioningKey": false,
+                                "jsonProps": "{\"native_data_type\": \"MapType(String(), BIGINT())\", \"key_type\": {\"type\": \"string\", \"native_data_type\": \"VARCHAR\", \"_nullable\": true}, \"key_native_data_type\": \"VARCHAR\"}"
+                            },
+                            {
+                                "fieldPath": "[version=2.0].[type=struct].[type=array].[type=string].skills",
+                                "nullable": true,
+                                "description": "List of skills possessed by the employee",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.ArrayType": {
+                                            "nestedType": [
+                                                "string"
+                                            ]
+                                        }
+                                    }
+                                },
+                                "nativeDataType": "array<VARCHAR>",
+                                "recursive": false,
+                                "isPartOfKey": false,
+                                "isPartitioningKey": false,
+                                "jsonProps": "{\"native_data_type\": \"array<VARCHAR>\"}"
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "CREATE VIEW \"test_schema\".test_view_2 AS\nSELECT employee_id, employee_name, skills\nFROM\n  \"test_schema\".\"test_view_1\"",
+            "viewLanguage": "SQL"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:28d9272f625e7a366dfdc276b6ce4a67",
+                    "urn": "urn:li:container:28d9272f625e7a366dfdc276b6ce4a67"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1671098400000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:s3,test-bucket/test_table,PROD)",
+                    "type": "COPY"
+                }
+            ],
+            "fineGrainedLineages": [
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:s3,test-bucket/test_table,PROD),employee_id)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD),employee_id)"
+                    ],
+                    "confidenceScore": 1.0
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:s3,test-bucket/test_table,PROD),annual_salary)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD),annual_salary)"
+                    ],
+                    "confidenceScore": 1.0
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:s3,test-bucket/test_table,PROD),employee_name)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD),employee_name)"
+                    ],
+                    "confidenceScore": 1.0
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:s3,test-bucket/test_table,PROD),job_history)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD),job_history)"
+                    ],
+                    "confidenceScore": 1.0
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:s3,test-bucket/test_table,PROD),department_budgets)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD),department_budgets)"
+                    ],
+                    "confidenceScore": 1.0
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:s3,test-bucket/test_table,PROD),skills)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD),skills)"
+                    ],
+                    "confidenceScore": 1.0
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1671098400000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD)",
+                    "type": "VIEW",
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_1%2CPROD%29"
+                }
+            ],
+            "fineGrainedLineages": [
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD),employee_id)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD),employee_id)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD),annual_salary)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD),annual_salary)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD),employee_name)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD),employee_name)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD),job_history)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD),job_history)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD),department_budgets)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD),department_budgets)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD),skills)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD),skills)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_1%2CPROD%29"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "CREATE VIEW \"test_schema\".test_view_1 AS\nSELECT\n  *\nFROM \"test_schema\".\"test_table\"",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:_ingestion"
+            },
+            "lastModified": {
+                "time": 1671098400000,
+                "actor": "urn:li:corpuser:_ingestion"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD),annual_salary)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD),department_budgets)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD),employee_id)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD),employee_name)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD),job_history)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_table,PROD),skills)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD),employee_id)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD),annual_salary)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD),employee_name)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD),job_history)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD),department_budgets)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD),skills)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:athena"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1671098400000,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD)",
+                    "type": "VIEW",
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_2%2CPROD%29"
+                }
+            ],
+            "fineGrainedLineages": [
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD),employee_id)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_2,PROD),employee_id)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_2%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD),employee_name)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_2,PROD),employee_name)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_2%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD),skills)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_2,PROD),skills)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_2%2CPROD%29"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_2%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "CREATE VIEW \"test_schema\".test_view_2 AS\nSELECT\n  employee_id,\n  employee_name,\n  skills\nFROM \"test_schema\".\"test_view_1\"",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:_ingestion"
+            },
+            "lastModified": {
+                "time": 1671098400000,
+                "actor": "urn:li:corpuser:_ingestion"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_2%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD),employee_id)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD),employee_name)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_1,PROD),skills)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_2,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_2,PROD),employee_id)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_2,PROD),employee_name)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:athena,test_schema.test_view_2,PROD),skills)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_2%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:athena"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Aathena%2Ctest_schema.test_view_2%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1671098400000,
+        "runId": "athena-test",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/athena/test_athena_source.py b/metadata-ingestion/tests/integration/athena/test_athena_source.py
new file mode 100644
index 00000000000000..56e7cbe6b3e2dd
--- /dev/null
+++ b/metadata-ingestion/tests/integration/athena/test_athena_source.py
@@ -0,0 +1,163 @@
+from unittest.mock import MagicMock, patch
+
+from freezegun import freeze_time
+from sqlalchemy import ARRAY, BIGINT, INTEGER, String
+from sqlalchemy_bigquery import STRUCT
+
+from datahub.ingestion.run.pipeline import Pipeline
+from datahub.ingestion.source.aws.s3_util import make_s3_urn
+from datahub.ingestion.source.sql.athena import AthenaSource
+from datahub.utilities.sqlalchemy_type_converter import MapType
+from tests.test_helpers import (  # Ensure mce_helpers is available for validation.
+    mce_helpers,
+)
+
+FROZEN_TIME = "2022-12-15 10:00:00"
+
+
+@freeze_time(FROZEN_TIME)
+def test_athena_source_ingestion(pytestconfig, tmp_path):
+    """Test Athena source ingestion and generate MCP JSON file for validation."""
+    output_file_name = "athena_mce_output.json"
+    golden_file_name = "athena_mce_golden.json"
+    test_resources_dir = pytestconfig.rootpath / "tests/integration/athena"
+
+    # Mock dependencies
+    with patch.object(
+        AthenaSource, "get_inspectors"
+    ) as mock_get_inspectors, patch.object(
+        AthenaSource, "get_table_properties"
+    ) as mock_get_table_properties:
+        # Mock engine and inspectors
+        mock_inspector = MagicMock()
+        mock_get_inspectors.return_value = [mock_inspector]
+        mock_engine_instance = MagicMock()
+        mock_engine_instance.url.database = ""
+        mock_inspector.engine = mock_engine_instance
+
+        # Mock schema and table names
+        mock_inspector.get_schema_names.return_value = ["test_schema"]
+        mock_inspector.get_table_names.return_value = ["test_table"]
+        mock_inspector.get_view_names.return_value = ["test_view_1", "test_view_2"]
+
+        # Mock view definitions
+        def mock_get_view_definition(view_name, schema):
+            if view_name == "test_view_1":
+                return (
+                    'CREATE VIEW "test_schema".test_view_1 AS\n'
+                    "SELECT *\n"
+                    "FROM\n"
+                    '  "test_schema"."test_table"'
+                )
+            elif view_name == "test_view_2":
+                return (
+                    'CREATE VIEW "test_schema".test_view_2 AS\n'
+                    "SELECT employee_id, employee_name, skills\n"
+                    "FROM\n"
+                    '  "test_schema"."test_view_1"'
+                )
+            return ""
+
+        mock_inspector.get_view_definition.side_effect = mock_get_view_definition
+
+        mock_inspector.get_columns.return_value = [
+            {
+                "name": "employee_id",
+                "type": String(),
+                "nullable": False,
+                "default": None,
+                "autoincrement": False,
+                "comment": "Unique identifier for the employee",
+                "dialect_options": {"awsathena_partition": None},
+            },
+            {
+                "name": "annual_salary",
+                "type": BIGINT(),
+                "nullable": True,
+                "default": None,
+                "autoincrement": False,
+                "comment": "Annual salary of the employee in USD",
+                "dialect_options": {"awsathena_partition": None},
+            },
+            {
+                "name": "employee_name",
+                "type": String(),
+                "nullable": False,
+                "default": None,
+                "autoincrement": False,
+                "comment": "Full name of the employee",
+                "dialect_options": {"awsathena_partition": None},
+            },
+            {
+                "name": "job_history",
+                "type": MapType(
+                    String(), STRUCT(year=INTEGER(), company=String(), role=String())
+                ),
+                "nullable": True,
+                "default": None,
+                "autoincrement": False,
+                "comment": "Job history map: year to details (company, role)",
+                "dialect_options": {"awsathena_partition": None},
+            },
+            {
+                "name": "department_budgets",
+                "type": MapType(String(), BIGINT()),
+                "nullable": True,
+                "default": None,
+                "autoincrement": False,
+                "comment": "Map of department names to their respective budgets",
+                "dialect_options": {"awsathena_partition": None},
+            },
+            {
+                "name": "skills",
+                "type": ARRAY(String()),
+                "nullable": True,
+                "default": None,
+                "autoincrement": False,
+                "comment": "List of skills possessed by the employee",
+                "dialect_options": {"awsathena_partition": None},
+            },
+        ]
+        # Mock table properties
+        mock_get_table_properties.return_value = (
+            "Test table description",
+            {"key": "value", "table_type": "EXTERNAL_TABLE"},
+            make_s3_urn("s3://test-bucket/test_table", "PROD"),
+        )
+
+        # Define the pipeline configuration
+        config_dict = {
+            "run_id": "athena-test",
+            "source": {
+                "type": "athena",
+                "config": {
+                    "aws_region": "us-east-1",
+                    "work_group": "primary",
+                    "query_result_location": "s3://athena-query-results/",
+                    "catalog_name": "awsdatacatalog",
+                    "include_views": True,
+                    "include_tables": True,
+                    "profiling": {
+                        "enabled": False,
+                    },
+                },
+            },
+            "sink": {
+                "type": "file",
+                "config": {
+                    "filename": f"{tmp_path}/{output_file_name}",
+                },
+            },
+        }
+
+        # Create and run the pipeline
+        pipeline = Pipeline.create(config_dict)
+        pipeline.run()
+        pipeline.raise_from_status()
+
+        # Validate the output with the golden file
+        mce_helpers.check_golden_file(
+            pytestconfig=pytestconfig,
+            output_path=f"{tmp_path}/{output_file_name}",
+            golden_path=f"{test_resources_dir}/{golden_file_name}",
+        )

From ccf5fc708f918de84019d280bd8dc795c19f09e1 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Thu, 2 Jan 2025 11:53:31 -0500
Subject: [PATCH 012/249] chore(ingest): refactor common pytest args (#12240)

---
 metadata-ingestion/build.gradle | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/metadata-ingestion/build.gradle b/metadata-ingestion/build.gradle
index fc1409fbed74e4..ac8658bd869272 100644
--- a/metadata-ingestion/build.gradle
+++ b/metadata-ingestion/build.gradle
@@ -127,6 +127,9 @@ task lintFix(type: Exec, dependsOn: installDev) {
     "mypy --show-traceback --show-error-codes src/ tests/ examples/"
 }
 
+def pytest_default_env = "PYTHONDEVMODE=1"
+def pytest_default_args = "--durations=30 -vv --continue-on-collection-errors"
+
 task testQuick(type: Exec, dependsOn: [installDev, ':metadata-models:generateJsonSchema']) {
   // We can't enforce the coverage requirements if we run a subset of the tests.
   inputs.files(project.fileTree(dir: "src/", include: "**/*.py"))
@@ -135,7 +138,7 @@ task testQuick(type: Exec, dependsOn: [installDev, ':metadata-models:generateJso
   def cvg_arg = get_coverage_args("quick")
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
-    "pytest ${cvg_arg} tests/unit --random-order --durations=20 -m 'not integration' -vv --continue-on-collection-errors --junit-xml=junit.quick.xml"
+    "${pytest_default_env} pytest ${cvg_arg} tests/unit ${pytest_default_args} --random-order -m 'not integration' --junit-xml=junit.quick.xml"
 }
 
 task installDevTest(type: Exec, dependsOn: [install]) {
@@ -155,7 +158,7 @@ task testSingle(dependsOn: [installDevTest]) {
   if (testFile != 'unknown')  {
     exec {
       commandLine 'bash', '-c',
-        "source ${venv_name}/bin/activate && pytest ${testFile}"
+        "source ${venv_name}/bin/activate && ${pytest_default_env} pytest ${testFile} ${pytest_default_args}"
     }
   } else {
    throw new GradleException("No file provided. Use -PtestFile=<test_file>")
@@ -167,25 +170,25 @@ task testIntegrationBatch0(type: Exec, dependsOn: [installDevTest]) {
   def cvg_arg = get_coverage_args("intBatch0")
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
-    "pytest ${cvg_arg} --durations=50 -m 'integration_batch_0' -vv --continue-on-collection-errors --junit-xml=junit.integrationbatch0.xml"
+    "${pytest_default_env} pytest ${cvg_arg} ${pytest_default_args} -m 'integration_batch_0' --junit-xml=junit.integrationbatch0.xml"
 }
 task testIntegrationBatch1(type: Exec, dependsOn: [installDevTest]) {
   def cvg_arg = get_coverage_args("intBatch1")
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
-    "pytest ${cvg_arg} --durations=50 -m 'integration_batch_1' -vv --continue-on-collection-errors --junit-xml=junit.integrationbatch1.xml"
+    "${pytest_default_env} pytest ${cvg_arg} ${pytest_default_args} -m 'integration_batch_1' --junit-xml=junit.integrationbatch1.xml"
 }
 task testIntegrationBatch2(type: Exec, dependsOn: [installDevTest]) {
   def cvg_arg = get_coverage_args("intBatch2")
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
-    "pytest ${cvg_arg} --durations=20 -m 'integration_batch_2' -vv --continue-on-collection-errors --junit-xml=junit.integrationbatch2.xml"
+    "${pytest_default_env} pytest ${cvg_arg} ${pytest_default_args} -m 'integration_batch_2' --junit-xml=junit.integrationbatch2.xml"
 }
 
 task testFull(type: Exec, dependsOn: [installDevTest]) {
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
-    "pytest --durations=50 -vv --continue-on-collection-errors --junit-xml=junit.full.xml"
+    "${pytest_default_env} pytest ${pytest_default_args} --junit-xml=junit.full.xml"
 }
 
 task specGen(type: Exec, dependsOn: [codegen, installDevTest]) {

From bdc34b7b35aa5b707a9b4d57d2842c8c3727b712 Mon Sep 17 00:00:00 2001
From: Pedro Silva <pedro@acryl.io>
Date: Thu, 2 Jan 2025 17:28:10 +0000
Subject: [PATCH 013/249] fix(sample data): Update timestamps in
 bootstrap_mce.json to more recent (#12257)

---
 metadata-ingestion/examples/mce_files/bootstrap_mce.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/metadata-ingestion/examples/mce_files/bootstrap_mce.json b/metadata-ingestion/examples/mce_files/bootstrap_mce.json
index bc218e5e8c2d53..d4e3d3aa5d8c42 100644
--- a/metadata-ingestion/examples/mce_files/bootstrap_mce.json
+++ b/metadata-ingestion/examples/mce_files/bootstrap_mce.json
@@ -3394,7 +3394,7 @@
     "changeType":"UPSERT",
     "aspectName":"datasetProfile",
     "aspect":{
-      "value":"{\"timestampMillis\": 1723488954865, \"rowCount\": 4500, \"columnCount\": 2, \"sizeInBytes\": 842000200000, \"fieldProfiles\": [{\"fieldPath\": \"field_foo\", \"uniqueCount\": 2, \"uniqueProportion\": 0.00044, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"true\", \"false\"]}, {\"fieldPath\": \"field_bar\", \"uniqueCount\": 2, \"uniqueProportion\": 0.00044, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"false\"]}]}",
+      "value":"{\"timestampMillis\": 1735823280000, \"rowCount\": 4500, \"columnCount\": 2, \"sizeInBytes\": 842000200000, \"fieldProfiles\": [{\"fieldPath\": \"field_foo\", \"uniqueCount\": 2, \"uniqueProportion\": 0.00044, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"true\", \"false\"]}, {\"fieldPath\": \"field_bar\", \"uniqueCount\": 2, \"uniqueProportion\": 0.00044, \"nullCount\": 0, \"nullProportion\": 0.0, \"sampleValues\": [\"false\"]}]}",
       "contentType":"application/json"
     },
     "systemMetadata":null
@@ -3418,7 +3418,7 @@
     "changeType":"UPSERT",
     "aspectName":"operation",
     "aspect":{
-      "value":"{\"timestampMillis\": 1679515693000, \"operationType\": \"INSERT\", \"lastUpdatedTimestamp\": 1629097200001 }",
+      "value":"{\"timestampMillis\": 1711138093000, \"operationType\": \"INSERT\", \"lastUpdatedTimestamp\": 1629097200001 }",
       "contentType":"application/json"
     },
     "systemMetadata":null
@@ -3584,7 +3584,7 @@
     "changeType": "UPSERT",
     "aspectName": "assertionRunEvent",
     "aspect": {
-      "value": "{\"timestampMillis\": 1675155843000, \"partitionSpec\": {\"type\": \"PARTITION\", \"partition\": \"{\\\"category\\\": \\\"catA\\\"}\"}, \"runId\": \"2021-12-28T12:00:00Z\", \"assertionUrn\": \"urn:li:assertion:358c683782c93c2fc2bd4bdd4fdb0153\", \"asserteeUrn\": \"urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD)\", \"batchSpec\": {\"customProperties\": {\"data_asset_name\": \"data__foo1__asset\", \"datasource_name\": \"my_hive_datasource\"}, \"nativeBatchId\": \"c8f12129f2e57412eee5fb8656154d05\", \"limit\": 10}, \"status\": \"COMPLETE\", \"result\": {\"type\": \"SUCCESS\", \"nativeResults\": {}}}",
+      "value": "{\"timestampMillis\": 1730554659000, \"partitionSpec\": {\"type\": \"PARTITION\", \"partition\": \"{\\\"category\\\": \\\"catA\\\"}\"}, \"runId\": \"2021-12-28T12:00:00Z\", \"assertionUrn\": \"urn:li:assertion:358c683782c93c2fc2bd4bdd4fdb0153\", \"asserteeUrn\": \"urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD)\", \"batchSpec\": {\"customProperties\": {\"data_asset_name\": \"data__foo1__asset\", \"datasource_name\": \"my_hive_datasource\"}, \"nativeBatchId\": \"c8f12129f2e57412eee5fb8656154d05\", \"limit\": 10}, \"status\": \"COMPLETE\", \"result\": {\"type\": \"SUCCESS\", \"nativeResults\": {}}}",
       "contentType": "application/json"
     },
     "systemMetadata": null

From f396d8d87a6b6567874340d530bbda966fda684e Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Thu, 2 Jan 2025 15:36:07 -0500
Subject: [PATCH 014/249] refactor(sdk/patch): improve patch implementation
 internals (#12253)

---
 .github/workflows/airflow-plugin.yml          |   4 +-
 .github/workflows/metadata-ingestion.yml      |   9 +-
 .github/workflows/prefect-plugin.yml          |   4 +-
 .../src/datahub/emitter/mce_builder.py        |   6 +-
 .../src/datahub/emitter/mcp_patch_builder.py  |  48 +++-
 .../specific/aspect_helpers/__init__.py       |   0
 .../aspect_helpers/custom_properties.py       |  79 ++++++
 .../specific/aspect_helpers/ownership.py      |  67 ++++++
 .../aspect_helpers/structured_properties.py   |  72 ++++++
 .../datahub/specific/aspect_helpers/tags.py   |  42 ++++
 .../datahub/specific/aspect_helpers/terms.py  |  43 ++++
 .../src/datahub/specific/chart.py             | 212 +++-------------
 .../src/datahub/specific/custom_properties.py |  37 ---
 .../src/datahub/specific/dashboard.py         | 227 +++---------------
 .../src/datahub/specific/datajob.py           | 223 +++--------------
 .../src/datahub/specific/dataproduct.py       | 110 ++-------
 .../src/datahub/specific/dataset.py           | 181 ++++----------
 .../src/datahub/specific/form.py              |  44 +---
 .../src/datahub/specific/ownership.py         |  48 ----
 .../datahub/specific/structured_properties.py |  53 ----
 .../datahub/specific/structured_property.py   |  18 +-
 21 files changed, 535 insertions(+), 992 deletions(-)
 create mode 100644 metadata-ingestion/src/datahub/specific/aspect_helpers/__init__.py
 create mode 100644 metadata-ingestion/src/datahub/specific/aspect_helpers/custom_properties.py
 create mode 100644 metadata-ingestion/src/datahub/specific/aspect_helpers/ownership.py
 create mode 100644 metadata-ingestion/src/datahub/specific/aspect_helpers/structured_properties.py
 create mode 100644 metadata-ingestion/src/datahub/specific/aspect_helpers/tags.py
 create mode 100644 metadata-ingestion/src/datahub/specific/aspect_helpers/terms.py
 delete mode 100644 metadata-ingestion/src/datahub/specific/custom_properties.py
 delete mode 100644 metadata-ingestion/src/datahub/specific/ownership.py
 delete mode 100644 metadata-ingestion/src/datahub/specific/structured_properties.py

diff --git a/.github/workflows/airflow-plugin.yml b/.github/workflows/airflow-plugin.yml
index 26fcceb8aeab70..b824a21be63f8f 100644
--- a/.github/workflows/airflow-plugin.yml
+++ b/.github/workflows/airflow-plugin.yml
@@ -84,8 +84,8 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           directory: ./build/coverage-reports/
           fail_ci_if_error: false
-          flags: airflow,airflow-${{ matrix.extra_pip_extras }}
-          name: pytest-airflow-${{ matrix.python-version }}-${{ matrix.extra_pip_requirements }}
+          flags: airflow-${{ matrix.python-version }}-${{ matrix.extra_pip_extras }}
+          name: pytest-airflow
           verbose: true
 
   event-file:
diff --git a/.github/workflows/metadata-ingestion.yml b/.github/workflows/metadata-ingestion.yml
index 106cba1473982e..f4d87b361b5edc 100644
--- a/.github/workflows/metadata-ingestion.yml
+++ b/.github/workflows/metadata-ingestion.yml
@@ -41,9 +41,6 @@ jobs:
             "testIntegrationBatch1",
             "testIntegrationBatch2",
           ]
-        include:
-          - python-version: "3.8"
-          - python-version: "3.11"
       fail-fast: false
     steps:
       - name: Free up disk space
@@ -92,14 +89,14 @@ jobs:
             **/junit.*.xml
             !**/binary/**
       - name: Upload coverage to Codecov
-        if: ${{ always() && matrix.python-version == '3.10' }}
+        if: ${{ always() }}
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           directory: ./build/coverage-reports/
           fail_ci_if_error: false
-          flags: pytest-${{ matrix.command }}
-          name: pytest-${{ matrix.python-version }}-${{ matrix.command }}
+          flags: ingestion-${{ matrix.python-version }}-${{ matrix.command }}
+          name: pytest-ingestion
           verbose: true
 
   event-file:
diff --git a/.github/workflows/prefect-plugin.yml b/.github/workflows/prefect-plugin.yml
index d77142a1f00ded..879df032409f28 100644
--- a/.github/workflows/prefect-plugin.yml
+++ b/.github/workflows/prefect-plugin.yml
@@ -67,8 +67,8 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           directory: ./build/coverage-reports/
           fail_ci_if_error: false
-          flags: prefect,prefect-${{ matrix.python-version }}
-          name: pytest-prefect-${{ matrix.python-version }}
+          flags: prefect-${{ matrix.python-version }}
+          name: pytest-prefect
           verbose: true
 
   event-file:
diff --git a/metadata-ingestion/src/datahub/emitter/mce_builder.py b/metadata-ingestion/src/datahub/emitter/mce_builder.py
index 110624aa61cb89..f095fffbaea6b4 100644
--- a/metadata-ingestion/src/datahub/emitter/mce_builder.py
+++ b/metadata-ingestion/src/datahub/emitter/mce_builder.py
@@ -24,6 +24,7 @@
 
 import typing_inspect
 from avrogen.dict_wrapper import DictWrapper
+from typing_extensions import assert_never
 
 from datahub.emitter.enum_helpers import get_enum_options
 from datahub.metadata.schema_classes import (
@@ -269,9 +270,8 @@ def make_owner_urn(owner: str, owner_type: OwnerType) -> str:
         return make_user_urn(owner)
     elif owner_type == OwnerType.GROUP:
         return make_group_urn(owner)
-    # This should pretty much never happen.
-    # TODO: With Python 3.11, we can use typing.assert_never() here.
-    return f"urn:li:{owner_type.value}:{owner}"
+    else:
+        assert_never(owner_type)
 
 
 def make_ownership_type_urn(type: str) -> str:
diff --git a/metadata-ingestion/src/datahub/emitter/mcp_patch_builder.py b/metadata-ingestion/src/datahub/emitter/mcp_patch_builder.py
index 1ed8ce1d5a6158..17026a4114c128 100644
--- a/metadata-ingestion/src/datahub/emitter/mcp_patch_builder.py
+++ b/metadata-ingestion/src/datahub/emitter/mcp_patch_builder.py
@@ -2,7 +2,19 @@
 import time
 from collections import defaultdict
 from dataclasses import dataclass
-from typing import Any, Dict, List, Optional, Sequence, Union
+from typing import (
+    Any,
+    Dict,
+    List,
+    Literal,
+    Optional,
+    Protocol,
+    Tuple,
+    Union,
+    runtime_checkable,
+)
+
+from typing_extensions import LiteralString
 
 from datahub.emitter.aspect import JSON_PATCH_CONTENT_TYPE
 from datahub.emitter.serialization_helper import pre_json_transform
@@ -19,25 +31,36 @@
 from datahub.utilities.urns.urn import guess_entity_type
 
 
+@runtime_checkable
+class SupportsToObj(Protocol):
+    def to_obj(self) -> Any:
+        ...
+
+
 def _recursive_to_obj(obj: Any) -> Any:
     if isinstance(obj, list):
         return [_recursive_to_obj(v) for v in obj]
-    elif hasattr(obj, "to_obj"):
+    elif isinstance(obj, SupportsToObj):
         return obj.to_obj()
     else:
         return obj
 
 
+PatchPath = Tuple[Union[LiteralString, Urn], ...]
+PatchOp = Literal["add", "remove", "replace"]
+
+
 @dataclass
-class _Patch:
-    op: str  # one of ['add', 'remove', 'replace']; we don't support move, copy or test
-    path: str
+class _Patch(SupportsToObj):
+    op: PatchOp
+    path: PatchPath
     value: Any
 
     def to_obj(self) -> Dict:
+        quoted_path = "/" + "/".join(MetadataPatchProposal.quote(p) for p in self.path)
         return {
             "op": self.op,
-            "path": self.path,
+            "path": quoted_path,
             "value": _recursive_to_obj(self.value),
         }
 
@@ -63,15 +86,16 @@ def __init__(
 
     # Json Patch quoting based on https://jsonpatch.com/#json-pointer
     @classmethod
-    def quote(cls, value: str) -> str:
-        return value.replace("~", "~0").replace("/", "~1")
+    def quote(cls, value: Union[str, Urn]) -> str:
+        return str(value).replace("~", "~0").replace("/", "~1")
 
     def _add_patch(
-        self, aspect_name: str, op: str, path: Union[str, Sequence[str]], value: Any
+        self,
+        aspect_name: str,
+        op: PatchOp,
+        path: PatchPath,
+        value: Any,
     ) -> None:
-        if not isinstance(path, str):
-            path = "/" + "/".join(self.quote(p) for p in path)
-
         # TODO: Validate that aspectName is a valid aspect for this entityType
         self.patches[aspect_name].append(_Patch(op, path, value))
 
diff --git a/metadata-ingestion/src/datahub/specific/aspect_helpers/__init__.py b/metadata-ingestion/src/datahub/specific/aspect_helpers/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/metadata-ingestion/src/datahub/specific/aspect_helpers/custom_properties.py b/metadata-ingestion/src/datahub/specific/aspect_helpers/custom_properties.py
new file mode 100644
index 00000000000000..1fd1585a913581
--- /dev/null
+++ b/metadata-ingestion/src/datahub/specific/aspect_helpers/custom_properties.py
@@ -0,0 +1,79 @@
+from abc import abstractmethod
+from typing import Dict, Optional, Tuple
+
+from typing_extensions import Self
+
+from datahub.emitter.mcp_patch_builder import MetadataPatchProposal, PatchPath
+
+
+class HasCustomPropertiesPatch(MetadataPatchProposal):
+    @classmethod
+    @abstractmethod
+    def _custom_properties_location(self) -> Tuple[str, PatchPath]:
+        ...
+
+    def add_custom_property(self, key: str, value: str) -> Self:
+        """Add a custom property to the entity.
+
+        Args:
+            key: The key of the custom property.
+            value: The value of the custom property.
+
+        Returns:
+            The patch builder instance.
+        """
+        aspect_name, path = self._custom_properties_location()
+        self._add_patch(
+            aspect_name,
+            "add",
+            path=(*path, key),
+            value=value,
+        )
+        return self
+
+    def add_custom_properties(
+        self, custom_properties: Optional[Dict[str, str]] = None
+    ) -> Self:
+        if custom_properties is not None:
+            for key, value in custom_properties.items():
+                self.add_custom_property(key, value)
+        return self
+
+    def remove_custom_property(self, key: str) -> Self:
+        """Remove a custom property from the entity.
+
+        Args:
+            key: The key of the custom property to remove.
+
+        Returns:
+            The patch builder instance.
+        """
+        aspect_name, path = self._custom_properties_location()
+        self._add_patch(
+            aspect_name,
+            "remove",
+            path=(*path, key),
+            value={},
+        )
+        return self
+
+    def set_custom_properties(self, custom_properties: Dict[str, str]) -> Self:
+        """Sets the custom properties of the entity.
+
+        This method replaces all existing custom properties with the given dictionary.
+
+        Args:
+            custom_properties: A dictionary containing the custom properties to be set.
+
+        Returns:
+            The patch builder instance.
+        """
+
+        aspect_name, path = self._custom_properties_location()
+        self._add_patch(
+            aspect_name,
+            "add",
+            path=path,
+            value=custom_properties,
+        )
+        return self
diff --git a/metadata-ingestion/src/datahub/specific/aspect_helpers/ownership.py b/metadata-ingestion/src/datahub/specific/aspect_helpers/ownership.py
new file mode 100644
index 00000000000000..1e2c789c7def35
--- /dev/null
+++ b/metadata-ingestion/src/datahub/specific/aspect_helpers/ownership.py
@@ -0,0 +1,67 @@
+from typing import List, Optional
+
+from typing_extensions import Self
+
+from datahub.emitter.mcp_patch_builder import MetadataPatchProposal
+from datahub.metadata.schema_classes import (
+    OwnerClass,
+    OwnershipClass,
+    OwnershipTypeClass,
+)
+
+
+class HasOwnershipPatch(MetadataPatchProposal):
+    def add_owner(self, owner: OwnerClass) -> Self:
+        """Add an owner to the entity.
+
+        Args:
+            owner: The Owner object to add.
+
+        Returns:
+            The patch builder instance.
+        """
+        self._add_patch(
+            OwnershipClass.ASPECT_NAME,
+            "add",
+            path=("owners", owner.owner, str(owner.type)),
+            value=owner,
+        )
+        return self
+
+    def remove_owner(
+        self, owner: str, owner_type: Optional[OwnershipTypeClass] = None
+    ) -> Self:
+        """Remove an owner from the entity.
+
+        If owner_type is not provided, the owner will be removed regardless of ownership type.
+
+        Args:
+            owner: The owner to remove.
+            owner_type: The ownership type of the owner (optional).
+
+        Returns:
+            The patch builder instance.
+        """
+        self._add_patch(
+            OwnershipClass.ASPECT_NAME,
+            "remove",
+            path=("owners", owner) + ((str(owner_type),) if owner_type else ()),
+            value=owner,
+        )
+        return self
+
+    def set_owners(self, owners: List[OwnerClass]) -> Self:
+        """Set the owners of the entity.
+
+        This will effectively replace all existing owners with the new list - it doesn't really patch things.
+
+        Args:
+            owners: The list of owners to set.
+
+        Returns:
+            The patch builder instance.
+        """
+        self._add_patch(
+            OwnershipClass.ASPECT_NAME, "add", path=("owners",), value=owners
+        )
+        return self
diff --git a/metadata-ingestion/src/datahub/specific/aspect_helpers/structured_properties.py b/metadata-ingestion/src/datahub/specific/aspect_helpers/structured_properties.py
new file mode 100644
index 00000000000000..48050bbad8e50d
--- /dev/null
+++ b/metadata-ingestion/src/datahub/specific/aspect_helpers/structured_properties.py
@@ -0,0 +1,72 @@
+from typing import List, Union
+
+from typing_extensions import Self
+
+from datahub.emitter.mcp_patch_builder import MetadataPatchProposal
+from datahub.metadata.schema_classes import (
+    StructuredPropertiesClass,
+    StructuredPropertyValueAssignmentClass,
+)
+from datahub.utilities.urns.structured_properties_urn import (
+    make_structured_property_urn,
+)
+
+
+class HasStructuredPropertiesPatch(MetadataPatchProposal):
+    def set_structured_property(
+        self, key: str, value: Union[str, float, List[Union[str, float]]]
+    ) -> Self:
+        """Add or update a structured property.
+
+        Args:
+            key: the name of the property (either bare or urn form)
+            value: the value of the property (for multi-valued properties, this can be a list)
+
+        Returns:
+            The patch builder instance.
+        """
+        self.remove_structured_property(key)
+        self.add_structured_property(key, value)
+        return self
+
+    def remove_structured_property(self, key: str) -> Self:
+        """Remove a structured property.
+
+        Args:
+            key: the name of the property (either bare or urn form)
+
+        Returns:
+            The patch builder instance.
+        """
+
+        self._add_patch(
+            StructuredPropertiesClass.ASPECT_NAME,
+            "remove",
+            path=("properties", make_structured_property_urn(key)),
+            value={},
+        )
+        return self
+
+    def add_structured_property(
+        self, key: str, value: Union[str, float, List[Union[str, float]]]
+    ) -> Self:
+        """Add a structured property.
+
+        Args:
+            key: the name of the property (either bare or urn form)
+            value: the value of the property (for multi-valued properties, this value will be appended to the list)
+
+        Returns:
+            The patch builder instance.
+        """
+
+        self._add_patch(
+            StructuredPropertiesClass.ASPECT_NAME,
+            "add",
+            path=("properties", make_structured_property_urn(key)),
+            value=StructuredPropertyValueAssignmentClass(
+                propertyUrn=make_structured_property_urn(key),
+                values=value if isinstance(value, list) else [value],
+            ),
+        )
+        return self
diff --git a/metadata-ingestion/src/datahub/specific/aspect_helpers/tags.py b/metadata-ingestion/src/datahub/specific/aspect_helpers/tags.py
new file mode 100644
index 00000000000000..afbc9115ca6e2b
--- /dev/null
+++ b/metadata-ingestion/src/datahub/specific/aspect_helpers/tags.py
@@ -0,0 +1,42 @@
+from typing import Union
+
+from typing_extensions import Self
+
+from datahub.emitter.mcp_patch_builder import MetadataPatchProposal
+from datahub.metadata.schema_classes import (
+    GlobalTagsClass as GlobalTags,
+    TagAssociationClass as Tag,
+)
+from datahub.metadata.urns import TagUrn, Urn
+
+
+class HasTagsPatch(MetadataPatchProposal):
+    def add_tag(self, tag: Tag) -> Self:
+        """Adds a tag to the entity.
+
+        Args:
+            tag: The Tag object representing the tag to be added.
+
+        Returns:
+            The patch builder instance.
+        """
+
+        # TODO: Make this support raw strings, in addition to Tag objects.
+        self._add_patch(
+            GlobalTags.ASPECT_NAME, "add", path=("tags", tag.tag), value=tag
+        )
+        return self
+
+    def remove_tag(self, tag: Union[str, Urn]) -> Self:
+        """Removes a tag from the entity.
+
+        Args:
+            tag: The tag to remove, specified as a string or Urn object.
+
+        Returns:
+            The patch builder instance.
+        """
+        if isinstance(tag, str) and not tag.startswith("urn:li:tag:"):
+            tag = TagUrn.create_from_id(tag)
+        self._add_patch(GlobalTags.ASPECT_NAME, "remove", path=("tags", tag), value={})
+        return self
diff --git a/metadata-ingestion/src/datahub/specific/aspect_helpers/terms.py b/metadata-ingestion/src/datahub/specific/aspect_helpers/terms.py
new file mode 100644
index 00000000000000..ae199124372b40
--- /dev/null
+++ b/metadata-ingestion/src/datahub/specific/aspect_helpers/terms.py
@@ -0,0 +1,43 @@
+from typing import Union
+
+from typing_extensions import Self
+
+from datahub.emitter.mcp_patch_builder import MetadataPatchProposal
+from datahub.metadata.schema_classes import (
+    GlossaryTermAssociationClass as Term,
+    GlossaryTermsClass,
+)
+from datahub.metadata.urns import GlossaryTermUrn, Urn
+
+
+class HasTermsPatch(MetadataPatchProposal):
+    def add_term(self, term: Term) -> Self:
+        """Adds a glossary term to the entity.
+
+        Args:
+            term: The Term object representing the glossary term to be added.
+
+        Returns:
+            The patch builder instance.
+        """
+        # TODO: Make this support raw strings, in addition to Term objects.
+        self._add_patch(
+            GlossaryTermsClass.ASPECT_NAME, "add", path=("terms", term.urn), value=term
+        )
+        return self
+
+    def remove_term(self, term: Union[str, Urn]) -> Self:
+        """Removes a glossary term from the entity.
+
+        Args:
+            term: The term to remove, specified as a string or Urn object.
+
+        Returns:
+            The patch builder instance.
+        """
+        if isinstance(term, str) and not term.startswith("urn:li:glossaryTerm:"):
+            term = GlossaryTermUrn(term)
+        self._add_patch(
+            GlossaryTermsClass.ASPECT_NAME, "remove", path=("terms", term), value={}
+        )
+        return self
diff --git a/metadata-ingestion/src/datahub/specific/chart.py b/metadata-ingestion/src/datahub/specific/chart.py
index 104a7c21a07e2f..f44a2ffc0d68ab 100644
--- a/metadata-ingestion/src/datahub/specific/chart.py
+++ b/metadata-ingestion/src/datahub/specific/chart.py
@@ -1,28 +1,29 @@
-from typing import Dict, List, Optional, Union
+from typing import List, Optional, Tuple, Union
 
-from datahub.emitter.mcp_patch_builder import MetadataPatchProposal
+from datahub.emitter.mcp_patch_builder import MetadataPatchProposal, PatchPath
 from datahub.metadata.schema_classes import (
     AccessLevelClass,
     ChangeAuditStampsClass,
     ChartInfoClass as ChartInfo,
     ChartTypeClass,
     EdgeClass as Edge,
-    GlobalTagsClass as GlobalTags,
-    GlossaryTermAssociationClass as Term,
-    GlossaryTermsClass as GlossaryTerms,
     KafkaAuditHeaderClass,
-    OwnerClass as Owner,
-    OwnershipTypeClass,
     SystemMetadataClass,
-    TagAssociationClass as Tag,
 )
-from datahub.specific.custom_properties import CustomPropertiesPatchHelper
-from datahub.specific.ownership import OwnershipPatchHelper
-from datahub.utilities.urns.tag_urn import TagUrn
+from datahub.specific.aspect_helpers.custom_properties import HasCustomPropertiesPatch
+from datahub.specific.aspect_helpers.ownership import HasOwnershipPatch
+from datahub.specific.aspect_helpers.tags import HasTagsPatch
+from datahub.specific.aspect_helpers.terms import HasTermsPatch
 from datahub.utilities.urns.urn import Urn
 
 
-class ChartPatchBuilder(MetadataPatchProposal):
+class ChartPatchBuilder(
+    HasOwnershipPatch,
+    HasCustomPropertiesPatch,
+    HasTagsPatch,
+    HasTermsPatch,
+    MetadataPatchProposal,
+):
     def __init__(
         self,
         urn: str,
@@ -40,55 +41,10 @@ def __init__(
         super().__init__(
             urn, system_metadata=system_metadata, audit_header=audit_header
         )
-        self.custom_properties_patch_helper = CustomPropertiesPatchHelper(
-            self, ChartInfo.ASPECT_NAME
-        )
-        self.ownership_patch_helper = OwnershipPatchHelper(self)
-
-    def add_owner(self, owner: Owner) -> "ChartPatchBuilder":
-        """
-        Adds an owner to the ChartPatchBuilder.
-
-        Args:
-            owner: The Owner object to add.
-
-        Returns:
-            The ChartPatchBuilder instance.
-        """
-        self.ownership_patch_helper.add_owner(owner)
-        return self
 
-    def remove_owner(
-        self, owner: str, owner_type: Optional[OwnershipTypeClass] = None
-    ) -> "ChartPatchBuilder":
-        """
-        Removes an owner from the ChartPatchBuilder.
-
-        Args:
-            owner: The owner to remove.
-            owner_type: The ownership type of the owner (optional).
-
-        Returns:
-            The ChartPatchBuilder instance.
-
-        Notes:
-            `owner_type` is optional.
-        """
-        self.ownership_patch_helper.remove_owner(owner, owner_type)
-        return self
-
-    def set_owners(self, owners: List[Owner]) -> "ChartPatchBuilder":
-        """
-        Sets the owners of the ChartPatchBuilder.
-
-        Args:
-            owners: A list of Owner objects.
-
-        Returns:
-            The ChartPatchBuilder instance.
-        """
-        self.ownership_patch_helper.set_owners(owners)
-        return self
+    @classmethod
+    def _custom_properties_location(cls) -> Tuple[str, PatchPath]:
+        return ChartInfo.ASPECT_NAME, ("customProperties",)
 
     def add_input_edge(self, input: Union[Edge, Urn, str]) -> "ChartPatchBuilder":
         """
@@ -120,7 +76,7 @@ def add_input_edge(self, input: Union[Edge, Urn, str]) -> "ChartPatchBuilder":
         self._add_patch(
             ChartInfo.ASPECT_NAME,
             "add",
-            path=f"/inputEdges/{self.quote(input_urn)}",
+            path=("inputEdges", input_urn),
             value=input_urn,
         )
         return self
@@ -138,7 +94,7 @@ def remove_input_edge(self, input: Union[str, Urn]) -> "ChartPatchBuilder":
         self._add_patch(
             ChartInfo.ASPECT_NAME,
             "remove",
-            path=f"/inputEdges/{self.quote(str(input))}",
+            path=("inputEdges", str(input)),
             value={},
         )
         return self
@@ -159,129 +115,17 @@ def set_input_edges(self, inputs: List[Edge]) -> "ChartPatchBuilder":
         self._add_patch(
             ChartInfo.ASPECT_NAME,
             "add",
-            path="/inputEdges",
+            path=("inputEdges",),
             value=inputs,
         )
         return self
 
-    def add_tag(self, tag: Tag) -> "ChartPatchBuilder":
-        """
-        Adds a tag to the ChartPatchBuilder.
-
-        Args:
-            tag: The Tag object representing the tag to be added.
-
-        Returns:
-            The ChartPatchBuilder instance.
-        """
-        self._add_patch(
-            GlobalTags.ASPECT_NAME, "add", path=f"/tags/{tag.tag}", value=tag
-        )
-        return self
-
-    def remove_tag(self, tag: Union[str, Urn]) -> "ChartPatchBuilder":
-        """
-        Removes a tag from the ChartPatchBuilder.
-
-        Args:
-            tag: The tag to remove, specified as a string or Urn object.
-
-        Returns:
-            The ChartPatchBuilder instance.
-        """
-        if isinstance(tag, str) and not tag.startswith("urn:li:tag:"):
-            tag = TagUrn.create_from_id(tag)
-        self._add_patch(GlobalTags.ASPECT_NAME, "remove", path=f"/tags/{tag}", value={})
-        return self
-
-    def add_term(self, term: Term) -> "ChartPatchBuilder":
-        """
-        Adds a glossary term to the ChartPatchBuilder.
-
-        Args:
-            term: The Term object representing the glossary term to be added.
-
-        Returns:
-            The ChartPatchBuilder instance.
-        """
-        self._add_patch(
-            GlossaryTerms.ASPECT_NAME, "add", path=f"/terms/{term.urn}", value=term
-        )
-        return self
-
-    def remove_term(self, term: Union[str, Urn]) -> "ChartPatchBuilder":
-        """
-        Removes a glossary term from the ChartPatchBuilder.
-
-        Args:
-            term: The term to remove, specified as a string or Urn object.
-
-        Returns:
-            The ChartPatchBuilder instance.
-        """
-        if isinstance(term, str) and not term.startswith("urn:li:glossaryTerm:"):
-            term = "urn:li:glossaryTerm:" + term
-        self._add_patch(
-            GlossaryTerms.ASPECT_NAME, "remove", path=f"/terms/{term}", value={}
-        )
-        return self
-
-    def set_custom_properties(
-        self, custom_properties: Dict[str, str]
-    ) -> "ChartPatchBuilder":
-        """
-        Sets the custom properties for the ChartPatchBuilder.
-
-        Args:
-            custom_properties: A dictionary containing the custom properties to be set.
-
-        Returns:
-            The ChartPatchBuilder instance.
-
-        Notes:
-            This method replaces all existing custom properties with the given dictionary.
-        """
-        self._add_patch(
-            ChartInfo.ASPECT_NAME,
-            "add",
-            path="/customProperties",
-            value=custom_properties,
-        )
-        return self
-
-    def add_custom_property(self, key: str, value: str) -> "ChartPatchBuilder":
-        """
-        Adds a custom property to the ChartPatchBuilder.
-
-        Args:
-            key: The key of the custom property.
-            value: The value of the custom property.
-
-        Returns:
-            The ChartPatchBuilder instance.
-        """
-        self.custom_properties_patch_helper.add_property(key, value)
-        return self
-
-    def remove_custom_property(self, key: str) -> "ChartPatchBuilder":
-        """
-        Removes a custom property from the ChartPatchBuilder.
-
-        Args:
-            key: The key of the custom property to remove.
-
-        Returns:
-            The ChartPatchBuilder instance.
-        """
-        self.custom_properties_patch_helper.remove_property(key)
-        return self
-
     def set_title(self, title: str) -> "ChartPatchBuilder":
         assert title, "ChartInfo title should not be None"
         self._add_patch(
             ChartInfo.ASPECT_NAME,
             "add",
-            path="/title",
+            path=("title",),
             value=title,
         )
 
@@ -292,7 +136,7 @@ def set_description(self, description: str) -> "ChartPatchBuilder":
         self._add_patch(
             ChartInfo.ASPECT_NAME,
             "add",
-            path="/description",
+            path=("description",),
             value=description,
         )
 
@@ -303,7 +147,7 @@ def set_last_refreshed(self, last_refreshed: Optional[int]) -> "ChartPatchBuilde
             self._add_patch(
                 ChartInfo.ASPECT_NAME,
                 "add",
-                path="/lastRefreshed",
+                path=("lastRefreshed",),
                 value=last_refreshed,
             )
 
@@ -316,7 +160,7 @@ def set_last_modified(
             self._add_patch(
                 ChartInfo.ASPECT_NAME,
                 "add",
-                path="/lastModified",
+                path=("lastModified",),
                 value=last_modified,
             )
 
@@ -327,7 +171,7 @@ def set_external_url(self, external_url: Optional[str]) -> "ChartPatchBuilder":
             self._add_patch(
                 ChartInfo.ASPECT_NAME,
                 "add",
-                path="/externalUrl",
+                path=("externalUrl",),
                 value=external_url,
             )
         return self
@@ -337,7 +181,7 @@ def set_chart_url(self, dashboard_url: Optional[str]) -> "ChartPatchBuilder":
             self._add_patch(
                 ChartInfo.ASPECT_NAME,
                 "add",
-                path="/chartUrl",
+                path=("chartUrl",),
                 value=dashboard_url,
             )
 
@@ -350,7 +194,7 @@ def set_type(
             self._add_patch(
                 ChartInfo.ASPECT_NAME,
                 "add",
-                path="/type",
+                path=("type",),
                 value=type,
             )
 
@@ -363,7 +207,7 @@ def set_access(
             self._add_patch(
                 ChartInfo.ASPECT_NAME,
                 "add",
-                path="/access",
+                path=("access",),
                 value=access,
             )
 
@@ -375,7 +219,7 @@ def add_inputs(self, input_urns: Optional[List[str]]) -> "ChartPatchBuilder":
                 self._add_patch(
                     aspect_name=ChartInfo.ASPECT_NAME,
                     op="add",
-                    path=f"/inputs/{urn}",
+                    path=("inputs", urn),
                     value=urn,
                 )
 
diff --git a/metadata-ingestion/src/datahub/specific/custom_properties.py b/metadata-ingestion/src/datahub/specific/custom_properties.py
deleted file mode 100644
index d399a448cc0c23..00000000000000
--- a/metadata-ingestion/src/datahub/specific/custom_properties.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from typing import Generic, TypeVar
-
-from datahub.emitter.mcp_patch_builder import MetadataPatchProposal
-
-_Parent = TypeVar("_Parent", bound=MetadataPatchProposal)
-
-
-class CustomPropertiesPatchHelper(Generic[_Parent]):
-    def __init__(
-        self,
-        parent: _Parent,
-        aspect_name: str,
-    ) -> None:
-        self.aspect_name = aspect_name
-        self._parent = parent
-        self.aspect_field = "customProperties"
-
-    def parent(self) -> _Parent:
-        return self._parent
-
-    def add_property(self, key: str, value: str) -> "CustomPropertiesPatchHelper":
-        self._parent._add_patch(
-            self.aspect_name,
-            "add",
-            path=f"/{self.aspect_field}/{key}",
-            value=value,
-        )
-        return self
-
-    def remove_property(self, key: str) -> "CustomPropertiesPatchHelper":
-        self._parent._add_patch(
-            self.aspect_name,
-            "remove",
-            path=f"/{self.aspect_field}/{key}",
-            value={},
-        )
-        return self
diff --git a/metadata-ingestion/src/datahub/specific/dashboard.py b/metadata-ingestion/src/datahub/specific/dashboard.py
index da5abbfd1dc129..515fcf0c6da955 100644
--- a/metadata-ingestion/src/datahub/specific/dashboard.py
+++ b/metadata-ingestion/src/datahub/specific/dashboard.py
@@ -1,27 +1,28 @@
-from typing import Dict, List, Optional, Union
+from typing import List, Optional, Tuple, Union
 
-from datahub.emitter.mcp_patch_builder import MetadataPatchProposal
+from datahub.emitter.mcp_patch_builder import MetadataPatchProposal, PatchPath
 from datahub.metadata.schema_classes import (
     AccessLevelClass,
     ChangeAuditStampsClass,
     DashboardInfoClass as DashboardInfo,
     EdgeClass as Edge,
-    GlobalTagsClass as GlobalTags,
-    GlossaryTermAssociationClass as Term,
-    GlossaryTermsClass as GlossaryTerms,
     KafkaAuditHeaderClass,
-    OwnerClass as Owner,
-    OwnershipTypeClass,
     SystemMetadataClass,
-    TagAssociationClass as Tag,
 )
-from datahub.specific.custom_properties import CustomPropertiesPatchHelper
-from datahub.specific.ownership import OwnershipPatchHelper
-from datahub.utilities.urns.tag_urn import TagUrn
+from datahub.specific.aspect_helpers.custom_properties import HasCustomPropertiesPatch
+from datahub.specific.aspect_helpers.ownership import HasOwnershipPatch
+from datahub.specific.aspect_helpers.tags import HasTagsPatch
+from datahub.specific.aspect_helpers.terms import HasTermsPatch
 from datahub.utilities.urns.urn import Urn
 
 
-class DashboardPatchBuilder(MetadataPatchProposal):
+class DashboardPatchBuilder(
+    HasOwnershipPatch,
+    HasCustomPropertiesPatch,
+    HasTagsPatch,
+    HasTermsPatch,
+    MetadataPatchProposal,
+):
     def __init__(
         self,
         urn: str,
@@ -39,55 +40,10 @@ def __init__(
         super().__init__(
             urn, system_metadata=system_metadata, audit_header=audit_header
         )
-        self.custom_properties_patch_helper = CustomPropertiesPatchHelper(
-            self, DashboardInfo.ASPECT_NAME
-        )
-        self.ownership_patch_helper = OwnershipPatchHelper(self)
-
-    def add_owner(self, owner: Owner) -> "DashboardPatchBuilder":
-        """
-        Adds an owner to the DashboardPatchBuilder.
-
-        Args:
-            owner: The Owner object to add.
-
-        Returns:
-            The DashboardPatchBuilder instance.
-        """
-        self.ownership_patch_helper.add_owner(owner)
-        return self
-
-    def remove_owner(
-        self, owner: str, owner_type: Optional[OwnershipTypeClass] = None
-    ) -> "DashboardPatchBuilder":
-        """
-        Removes an owner from the DashboardPatchBuilder.
-
-        Args:
-            owner: The owner to remove.
-            owner_type: The ownership type of the owner (optional).
-
-        Returns:
-            The DashboardPatchBuilder instance.
-
-        Notes:
-            `owner_type` is optional.
-        """
-        self.ownership_patch_helper.remove_owner(owner, owner_type)
-        return self
-
-    def set_owners(self, owners: List[Owner]) -> "DashboardPatchBuilder":
-        """
-        Sets the owners of the DashboardPatchBuilder.
 
-        Args:
-            owners: A list of Owner objects.
-
-        Returns:
-            The DashboardPatchBuilder instance.
-        """
-        self.ownership_patch_helper.set_owners(owners)
-        return self
+    @classmethod
+    def _custom_properties_location(cls) -> Tuple[str, PatchPath]:
+        return DashboardInfo.ASPECT_NAME, ("customProperties",)
 
     def add_dataset_edge(
         self, dataset: Union[Edge, Urn, str]
@@ -126,7 +82,7 @@ def add_dataset_edge(
         self._add_patch(
             DashboardInfo.ASPECT_NAME,
             "add",
-            path=f"/datasetEdges/{self.quote(dataset_urn)}",
+            path=("datasetEdges", dataset_urn),
             value=dataset_edge,
         )
         return self
@@ -144,7 +100,7 @@ def remove_dataset_edge(self, dataset: Union[str, Urn]) -> "DashboardPatchBuilde
         self._add_patch(
             DashboardInfo.ASPECT_NAME,
             "remove",
-            path=f"/datasetEdges/{dataset}",
+            path=("datasetEdges", dataset),
             value={},
         )
         return self
@@ -169,7 +125,7 @@ def set_dataset_edges(self, datasets: List[Edge]) -> "DashboardPatchBuilder":
         self._add_patch(
             DashboardInfo.ASPECT_NAME,
             "add",
-            path="/datasetEdges",
+            path=("datasetEdges",),
             value=datasets,
         )
         return self
@@ -209,7 +165,7 @@ def add_chart_edge(self, chart: Union[Edge, Urn, str]) -> "DashboardPatchBuilder
         self._add_patch(
             DashboardInfo.ASPECT_NAME,
             "add",
-            path=f"/chartEdges/{self.quote(chart_urn)}",
+            path=("chartEdges", chart_urn),
             value=chart_edge,
         )
         return self
@@ -227,7 +183,7 @@ def remove_chart_edge(self, chart: Union[str, Urn]) -> "DashboardPatchBuilder":
         self._add_patch(
             DashboardInfo.ASPECT_NAME,
             "remove",
-            path=f"/chartEdges/{chart}",
+            path=("chartEdges", chart),
             value={},
         )
         return self
@@ -252,129 +208,17 @@ def set_chart_edges(self, charts: List[Edge]) -> "DashboardPatchBuilder":
         self._add_patch(
             DashboardInfo.ASPECT_NAME,
             "add",
-            path="/chartEdges",
+            path=("chartEdges",),
             value=charts,
         )
         return self
 
-    def add_tag(self, tag: Tag) -> "DashboardPatchBuilder":
-        """
-        Adds a tag to the DashboardPatchBuilder.
-
-        Args:
-            tag: The Tag object representing the tag to be added.
-
-        Returns:
-            The DashboardPatchBuilder instance.
-        """
-        self._add_patch(
-            GlobalTags.ASPECT_NAME, "add", path=f"/tags/{tag.tag}", value=tag
-        )
-        return self
-
-    def remove_tag(self, tag: Union[str, Urn]) -> "DashboardPatchBuilder":
-        """
-        Removes a tag from the DashboardPatchBuilder.
-
-        Args:
-            tag: The tag to remove, specified as a string or Urn object.
-
-        Returns:
-            The DashboardPatchBuilder instance.
-        """
-        if isinstance(tag, str) and not tag.startswith("urn:li:tag:"):
-            tag = TagUrn.create_from_id(tag)
-        self._add_patch(GlobalTags.ASPECT_NAME, "remove", path=f"/tags/{tag}", value={})
-        return self
-
-    def add_term(self, term: Term) -> "DashboardPatchBuilder":
-        """
-        Adds a glossary term to the DashboardPatchBuilder.
-
-        Args:
-            term: The Term object representing the glossary term to be added.
-
-        Returns:
-            The DashboardPatchBuilder instance.
-        """
-        self._add_patch(
-            GlossaryTerms.ASPECT_NAME, "add", path=f"/terms/{term.urn}", value=term
-        )
-        return self
-
-    def remove_term(self, term: Union[str, Urn]) -> "DashboardPatchBuilder":
-        """
-        Removes a glossary term from the DashboardPatchBuilder.
-
-        Args:
-            term: The term to remove, specified as a string or Urn object.
-
-        Returns:
-            The DashboardPatchBuilder instance.
-        """
-        if isinstance(term, str) and not term.startswith("urn:li:glossaryTerm:"):
-            term = "urn:li:glossaryTerm:" + term
-        self._add_patch(
-            GlossaryTerms.ASPECT_NAME, "remove", path=f"/terms/{term}", value={}
-        )
-        return self
-
-    def set_custom_properties(
-        self, custom_properties: Dict[str, str]
-    ) -> "DashboardPatchBuilder":
-        """
-        Sets the custom properties for the DashboardPatchBuilder.
-
-        Args:
-            custom_properties: A dictionary containing the custom properties to be set.
-
-        Returns:
-            The DashboardPatchBuilder instance.
-
-        Notes:
-            This method replaces all existing custom properties with the given dictionary.
-        """
-        self._add_patch(
-            DashboardInfo.ASPECT_NAME,
-            "add",
-            path="/customProperties",
-            value=custom_properties,
-        )
-        return self
-
-    def add_custom_property(self, key: str, value: str) -> "DashboardPatchBuilder":
-        """
-        Adds a custom property to the DashboardPatchBuilder.
-
-        Args:
-            key: The key of the custom property.
-            value: The value of the custom property.
-
-        Returns:
-            The DashboardPatchBuilder instance.
-        """
-        self.custom_properties_patch_helper.add_property(key, value)
-        return self
-
-    def remove_custom_property(self, key: str) -> "DashboardPatchBuilder":
-        """
-        Removes a custom property from the DashboardPatchBuilder.
-
-        Args:
-            key: The key of the custom property to remove.
-
-        Returns:
-            The DashboardPatchBuilder instance.
-        """
-        self.custom_properties_patch_helper.remove_property(key)
-        return self
-
     def set_title(self, title: str) -> "DashboardPatchBuilder":
         assert title, "DashboardInfo title should not be None"
         self._add_patch(
             DashboardInfo.ASPECT_NAME,
             "add",
-            path="/title",
+            path=("title",),
             value=title,
         )
 
@@ -385,27 +229,18 @@ def set_description(self, description: str) -> "DashboardPatchBuilder":
         self._add_patch(
             DashboardInfo.ASPECT_NAME,
             "add",
-            path="/description",
+            path=("description",),
             value=description,
         )
 
         return self
 
-    def add_custom_properties(
-        self, custom_properties: Optional[Dict[str, str]] = None
-    ) -> "DashboardPatchBuilder":
-        if custom_properties:
-            for key, value in custom_properties.items():
-                self.custom_properties_patch_helper.add_property(key, value)
-
-        return self
-
     def set_external_url(self, external_url: Optional[str]) -> "DashboardPatchBuilder":
         if external_url:
             self._add_patch(
                 DashboardInfo.ASPECT_NAME,
                 "add",
-                path="/externalUrl",
+                path=("externalUrl",),
                 value=external_url,
             )
         return self
@@ -416,7 +251,7 @@ def add_charts(self, chart_urns: Optional[List[str]]) -> "DashboardPatchBuilder"
                 self._add_patch(
                     aspect_name=DashboardInfo.ASPECT_NAME,
                     op="add",
-                    path=f"/charts/{urn}",
+                    path=("charts", urn),
                     value=urn,
                 )
 
@@ -430,7 +265,7 @@ def add_datasets(
                 self._add_patch(
                     aspect_name=DashboardInfo.ASPECT_NAME,
                     op="add",
-                    path=f"/datasets/{urn}",
+                    path=("datasets", urn),
                     value=urn,
                 )
 
@@ -443,7 +278,7 @@ def set_dashboard_url(
             self._add_patch(
                 DashboardInfo.ASPECT_NAME,
                 "add",
-                path="/dashboardUrl",
+                path=("dashboardUrl",),
                 value=dashboard_url,
             )
 
@@ -456,7 +291,7 @@ def set_access(
             self._add_patch(
                 DashboardInfo.ASPECT_NAME,
                 "add",
-                path="/access",
+                path=("access",),
                 value=access,
             )
 
@@ -469,7 +304,7 @@ def set_last_refreshed(
             self._add_patch(
                 DashboardInfo.ASPECT_NAME,
                 "add",
-                path="/lastRefreshed",
+                path=("lastRefreshed",),
                 value=last_refreshed,
             )
 
@@ -482,7 +317,7 @@ def set_last_modified(
             self._add_patch(
                 DashboardInfo.ASPECT_NAME,
                 "add",
-                path="/lastModified",
+                path=("lastModified",),
                 value=last_modified,
             )
 
diff --git a/metadata-ingestion/src/datahub/specific/datajob.py b/metadata-ingestion/src/datahub/specific/datajob.py
index 6ff4741b09c26a..fd826c6dd59ca3 100644
--- a/metadata-ingestion/src/datahub/specific/datajob.py
+++ b/metadata-ingestion/src/datahub/specific/datajob.py
@@ -1,25 +1,27 @@
-from typing import Dict, List, Optional, Union
+from typing import List, Optional, Tuple, Union
 
-from datahub.emitter.mcp_patch_builder import MetadataPatchProposal
+from datahub.emitter.mcp_patch_builder import MetadataPatchProposal, PatchPath
 from datahub.metadata.schema_classes import (
     DataJobInfoClass as DataJobInfo,
     DataJobInputOutputClass as DataJobInputOutput,
     EdgeClass as Edge,
-    GlobalTagsClass as GlobalTags,
-    GlossaryTermAssociationClass as Term,
-    GlossaryTermsClass as GlossaryTerms,
     KafkaAuditHeaderClass,
-    OwnerClass as Owner,
-    OwnershipTypeClass,
     SystemMetadataClass,
-    TagAssociationClass as Tag,
 )
-from datahub.metadata.urns import SchemaFieldUrn, TagUrn, Urn
-from datahub.specific.custom_properties import CustomPropertiesPatchHelper
-from datahub.specific.ownership import OwnershipPatchHelper
-
-
-class DataJobPatchBuilder(MetadataPatchProposal):
+from datahub.metadata.urns import SchemaFieldUrn, Urn
+from datahub.specific.aspect_helpers.custom_properties import HasCustomPropertiesPatch
+from datahub.specific.aspect_helpers.ownership import HasOwnershipPatch
+from datahub.specific.aspect_helpers.tags import HasTagsPatch
+from datahub.specific.aspect_helpers.terms import HasTermsPatch
+
+
+class DataJobPatchBuilder(
+    HasOwnershipPatch,
+    HasCustomPropertiesPatch,
+    HasTagsPatch,
+    HasTermsPatch,
+    MetadataPatchProposal,
+):
     def __init__(
         self,
         urn: str,
@@ -37,55 +39,10 @@ def __init__(
         super().__init__(
             urn, system_metadata=system_metadata, audit_header=audit_header
         )
-        self.custom_properties_patch_helper = CustomPropertiesPatchHelper(
-            self, DataJobInfo.ASPECT_NAME
-        )
-        self.ownership_patch_helper = OwnershipPatchHelper(self)
-
-    def add_owner(self, owner: Owner) -> "DataJobPatchBuilder":
-        """
-        Adds an owner to the DataJobPatchBuilder.
-
-        Args:
-            owner: The Owner object to add.
-
-        Returns:
-            The DataJobPatchBuilder instance.
-        """
-        self.ownership_patch_helper.add_owner(owner)
-        return self
-
-    def remove_owner(
-        self, owner: str, owner_type: Optional[OwnershipTypeClass] = None
-    ) -> "DataJobPatchBuilder":
-        """
-        Removes an owner from the DataJobPatchBuilder.
-
-        Args:
-            owner: The owner to remove.
-            owner_type: The ownership type of the owner (optional).
-
-        Returns:
-            The DataJobPatchBuilder instance.
-
-        Notes:
-            `owner_type` is optional.
-        """
-        self.ownership_patch_helper.remove_owner(owner, owner_type)
-        return self
-
-    def set_owners(self, owners: List[Owner]) -> "DataJobPatchBuilder":
-        """
-        Sets the owners of the DataJobPatchBuilder.
-
-        Args:
-            owners: A list of Owner objects.
 
-        Returns:
-            The DataJobPatchBuilder instance.
-        """
-        self.ownership_patch_helper.set_owners(owners)
-        return self
+    @classmethod
+    def _custom_properties_location(cls) -> Tuple[str, PatchPath]:
+        return DataJobInfo.ASPECT_NAME, ("customProperties",)
 
     def add_input_datajob(self, input: Union[Edge, Urn, str]) -> "DataJobPatchBuilder":
         """
@@ -120,7 +77,7 @@ def add_input_datajob(self, input: Union[Edge, Urn, str]) -> "DataJobPatchBuilde
         self._add_patch(
             DataJobInputOutput.ASPECT_NAME,
             "add",
-            path=f"/inputDatajobEdges/{self.quote(input_urn)}",
+            path=("inputDatajobEdges", input_urn),
             value=input_edge,
         )
         return self
@@ -138,7 +95,7 @@ def remove_input_datajob(self, input: Union[str, Urn]) -> "DataJobPatchBuilder":
         self._add_patch(
             DataJobInputOutput.ASPECT_NAME,
             "remove",
-            path=f"/inputDatajobEdges/{input}",
+            path=("inputDatajobEdges", input),
             value={},
         )
         return self
@@ -163,7 +120,7 @@ def set_input_datajobs(self, inputs: List[Edge]) -> "DataJobPatchBuilder":
         self._add_patch(
             DataJobInputOutput.ASPECT_NAME,
             "add",
-            path="/inputDatajobEdges",
+            path=("inputDatajobEdges",),
             value=inputs,
         )
         return self
@@ -201,7 +158,7 @@ def add_input_dataset(self, input: Union[Edge, Urn, str]) -> "DataJobPatchBuilde
         self._add_patch(
             DataJobInputOutput.ASPECT_NAME,
             "add",
-            path=f"/inputDatasetEdges/{self.quote(input_urn)}",
+            path=("inputDatasetEdges", input_urn),
             value=input_edge,
         )
         return self
@@ -219,7 +176,7 @@ def remove_input_dataset(self, input: Union[str, Urn]) -> "DataJobPatchBuilder":
         self._add_patch(
             DataJobInputOutput.ASPECT_NAME,
             "remove",
-            path=f"/inputDatasetEdges/{self.quote(str(input))}",
+            path=("inputDatasetEdges", input),
             value={},
         )
         return self
@@ -244,7 +201,7 @@ def set_input_datasets(self, inputs: List[Edge]) -> "DataJobPatchBuilder":
         self._add_patch(
             DataJobInputOutput.ASPECT_NAME,
             "add",
-            path="/inputDatasetEdges",
+            path=("inputDatasetEdges",),
             value=inputs,
         )
         return self
@@ -284,7 +241,7 @@ def add_output_dataset(
         self._add_patch(
             DataJobInputOutput.ASPECT_NAME,
             "add",
-            path=f"/outputDatasetEdges/{self.quote(output_urn)}",
+            path=("outputDatasetEdges", output_urn),
             value=output_edge,
         )
         return self
@@ -302,7 +259,7 @@ def remove_output_dataset(self, output: Union[str, Urn]) -> "DataJobPatchBuilder
         self._add_patch(
             DataJobInputOutput.ASPECT_NAME,
             "remove",
-            path=f"/outputDatasetEdges/{self.quote(str(output))}",
+            path=("outputDatasetEdges", output),
             value={},
         )
         return self
@@ -327,7 +284,7 @@ def set_output_datasets(self, outputs: List[Edge]) -> "DataJobPatchBuilder":
         self._add_patch(
             DataJobInputOutput.ASPECT_NAME,
             "add",
-            path="/outputDatasetEdges",
+            path=("outputDatasetEdges",),
             value=outputs,
         )
         return self
@@ -351,7 +308,7 @@ def add_input_dataset_field(self, input: Union[Urn, str]) -> "DataJobPatchBuilde
         self._add_patch(
             DataJobInputOutput.ASPECT_NAME,
             "add",
-            path=f"/inputDatasetFields/{self.quote(input_urn)}",
+            path=("inputDatasetFields", input_urn),
             value={},
         )
         return self
@@ -372,7 +329,7 @@ def remove_input_dataset_field(
         self._add_patch(
             DataJobInputOutput.ASPECT_NAME,
             "remove",
-            path=f"/inputDatasetFields/{self.quote(input_urn)}",
+            path=("inputDatasetFields", input_urn),
             value={},
         )
         return self
@@ -397,7 +354,7 @@ def set_input_dataset_fields(self, inputs: List[Edge]) -> "DataJobPatchBuilder":
         self._add_patch(
             DataJobInputOutput.ASPECT_NAME,
             "add",
-            path="/inputDatasetFields",
+            path=("inputDatasetFields",),
             value=inputs,
         )
         return self
@@ -423,7 +380,7 @@ def add_output_dataset_field(
         self._add_patch(
             DataJobInputOutput.ASPECT_NAME,
             "add",
-            path=f"/outputDatasetFields/{self.quote(output_urn)}",
+            path=("outputDatasetFields", output_urn),
             value={},
         )
         return self
@@ -444,7 +401,7 @@ def remove_output_dataset_field(
         self._add_patch(
             DataJobInputOutput.ASPECT_NAME,
             "remove",
-            path=f"/outputDatasetFields/{self.quote(output_urn)}",
+            path=("outputDatasetFields", output_urn),
             value={},
         )
         return self
@@ -469,119 +426,7 @@ def set_output_dataset_fields(self, outputs: List[Edge]) -> "DataJobPatchBuilder
         self._add_patch(
             DataJobInputOutput.ASPECT_NAME,
             "add",
-            path="/outputDatasetFields",
+            path=("outputDatasetFields",),
             value=outputs,
         )
         return self
-
-    def add_tag(self, tag: Tag) -> "DataJobPatchBuilder":
-        """
-        Adds a tag to the DataJobPatchBuilder.
-
-        Args:
-            tag: The Tag object representing the tag to be added.
-
-        Returns:
-            The DataJobPatchBuilder instance.
-        """
-        self._add_patch(
-            GlobalTags.ASPECT_NAME, "add", path=f"/tags/{tag.tag}", value=tag
-        )
-        return self
-
-    def remove_tag(self, tag: Union[str, Urn]) -> "DataJobPatchBuilder":
-        """
-        Removes a tag from the DataJobPatchBuilder.
-
-        Args:
-            tag: The tag to remove, specified as a string or Urn object.
-
-        Returns:
-            The DataJobPatchBuilder instance.
-        """
-        if isinstance(tag, str) and not tag.startswith("urn:li:tag:"):
-            tag = TagUrn.create_from_id(tag)
-        self._add_patch(GlobalTags.ASPECT_NAME, "remove", path=f"/tags/{tag}", value={})
-        return self
-
-    def add_term(self, term: Term) -> "DataJobPatchBuilder":
-        """
-        Adds a glossary term to the DataJobPatchBuilder.
-
-        Args:
-            term: The Term object representing the glossary term to be added.
-
-        Returns:
-            The DataJobPatchBuilder instance.
-        """
-        self._add_patch(
-            GlossaryTerms.ASPECT_NAME, "add", path=f"/terms/{term.urn}", value=term
-        )
-        return self
-
-    def remove_term(self, term: Union[str, Urn]) -> "DataJobPatchBuilder":
-        """
-        Removes a glossary term from the DataJobPatchBuilder.
-
-        Args:
-            term: The term to remove, specified as a string or Urn object.
-
-        Returns:
-            The DataJobPatchBuilder instance.
-        """
-        if isinstance(term, str) and not term.startswith("urn:li:glossaryTerm:"):
-            term = "urn:li:glossaryTerm:" + term
-        self._add_patch(
-            GlossaryTerms.ASPECT_NAME, "remove", path=f"/terms/{term}", value={}
-        )
-        return self
-
-    def set_custom_properties(
-        self, custom_properties: Dict[str, str]
-    ) -> "DataJobPatchBuilder":
-        """
-        Sets the custom properties for the DataJobPatchBuilder.
-
-        Args:
-            custom_properties: A dictionary containing the custom properties to be set.
-
-        Returns:
-            The DataJobPatchBuilder instance.
-
-        Notes:
-            This method replaces all existing custom properties with the given dictionary.
-        """
-        self._add_patch(
-            DataJobInfo.ASPECT_NAME,
-            "add",
-            path="/customProperties",
-            value=custom_properties,
-        )
-        return self
-
-    def add_custom_property(self, key: str, value: str) -> "DataJobPatchBuilder":
-        """
-        Adds a custom property to the DataJobPatchBuilder.
-
-        Args:
-            key: The key of the custom property.
-            value: The value of the custom property.
-
-        Returns:
-            The DataJobPatchBuilder instance.
-        """
-        self.custom_properties_patch_helper.add_property(key, value)
-        return self
-
-    def remove_custom_property(self, key: str) -> "DataJobPatchBuilder":
-        """
-        Removes a custom property from the DataJobPatchBuilder.
-
-        Args:
-            key: The key of the custom property to remove.
-
-        Returns:
-            The DataJobPatchBuilder instance.
-        """
-        self.custom_properties_patch_helper.remove_property(key)
-        return self
diff --git a/metadata-ingestion/src/datahub/specific/dataproduct.py b/metadata-ingestion/src/datahub/specific/dataproduct.py
index f9830a4b23df05..d38d2d4156315d 100644
--- a/metadata-ingestion/src/datahub/specific/dataproduct.py
+++ b/metadata-ingestion/src/datahub/specific/dataproduct.py
@@ -1,25 +1,25 @@
-from typing import Dict, List, Optional, Union
+from typing import List, Optional, Tuple
 
-from datahub.emitter.mcp_patch_builder import MetadataPatchProposal
+from datahub.emitter.mcp_patch_builder import MetadataPatchProposal, PatchPath
 from datahub.metadata.schema_classes import (
     DataProductAssociationClass as DataProductAssociation,
     DataProductPropertiesClass as DataProductProperties,
-    GlobalTagsClass as GlobalTags,
-    GlossaryTermAssociationClass as Term,
-    GlossaryTermsClass as GlossaryTerms,
     KafkaAuditHeaderClass,
-    OwnerClass as Owner,
-    OwnershipTypeClass,
     SystemMetadataClass,
-    TagAssociationClass as Tag,
 )
-from datahub.specific.custom_properties import CustomPropertiesPatchHelper
-from datahub.specific.ownership import OwnershipPatchHelper
-from datahub.utilities.urns.tag_urn import TagUrn
-from datahub.utilities.urns.urn import Urn
-
-
-class DataProductPatchBuilder(MetadataPatchProposal):
+from datahub.specific.aspect_helpers.custom_properties import HasCustomPropertiesPatch
+from datahub.specific.aspect_helpers.ownership import HasOwnershipPatch
+from datahub.specific.aspect_helpers.tags import HasTagsPatch
+from datahub.specific.aspect_helpers.terms import HasTermsPatch
+
+
+class DataProductPatchBuilder(
+    HasOwnershipPatch,
+    HasCustomPropertiesPatch,
+    HasTagsPatch,
+    HasTermsPatch,
+    MetadataPatchProposal,
+):
     def __init__(
         self,
         urn: str,
@@ -31,59 +31,16 @@ def __init__(
             system_metadata=system_metadata,
             audit_header=audit_header,
         )
-        self.custom_properties_patch_helper = CustomPropertiesPatchHelper(
-            self, DataProductProperties.ASPECT_NAME
-        )
-        self.ownership_patch_helper = OwnershipPatchHelper(self)
-
-    def add_owner(self, owner: Owner) -> "DataProductPatchBuilder":
-        self.ownership_patch_helper.add_owner(owner)
-        return self
-
-    def remove_owner(
-        self, owner: str, owner_type: Optional[OwnershipTypeClass] = None
-    ) -> "DataProductPatchBuilder":
-        """
-        param: owner_type is optional
-        """
-        self.ownership_patch_helper.remove_owner(owner, owner_type)
-        return self
-
-    def set_owners(self, owners: List[Owner]) -> "DataProductPatchBuilder":
-        self.ownership_patch_helper.set_owners(owners)
-        return self
-
-    def add_tag(self, tag: Tag) -> "DataProductPatchBuilder":
-        self._add_patch(
-            GlobalTags.ASPECT_NAME, "add", path=f"/tags/{tag.tag}", value=tag
-        )
-        return self
-
-    def remove_tag(self, tag: Union[str, Urn]) -> "DataProductPatchBuilder":
-        if isinstance(tag, str) and not tag.startswith("urn:li:tag:"):
-            tag = TagUrn.create_from_id(tag)
-        self._add_patch(GlobalTags.ASPECT_NAME, "remove", path=f"/tags/{tag}", value={})
-        return self
-
-    def add_term(self, term: Term) -> "DataProductPatchBuilder":
-        self._add_patch(
-            GlossaryTerms.ASPECT_NAME, "add", path=f"/terms/{term.urn}", value=term
-        )
-        return self
 
-    def remove_term(self, term: Union[str, Urn]) -> "DataProductPatchBuilder":
-        if isinstance(term, str) and not term.startswith("urn:li:glossaryTerm:"):
-            term = "urn:li:glossaryTerm:" + term
-        self._add_patch(
-            GlossaryTerms.ASPECT_NAME, "remove", path=f"/terms/{term}", value={}
-        )
-        return self
+    @classmethod
+    def _custom_properties_location(cls) -> Tuple[str, PatchPath]:
+        return DataProductProperties.ASPECT_NAME, ("customProperties",)
 
     def set_name(self, name: str) -> "DataProductPatchBuilder":
         self._add_patch(
             DataProductProperties.ASPECT_NAME,
             "add",
-            path="/name",
+            path=("name",),
             value=name,
         )
         return self
@@ -92,37 +49,18 @@ def set_description(self, description: str) -> "DataProductPatchBuilder":
         self._add_patch(
             DataProductProperties.ASPECT_NAME,
             "add",
-            path="/description",
+            path=("description",),
             value=description,
         )
         return self
 
-    def set_custom_properties(
-        self, custom_properties: Dict[str, str]
-    ) -> "DataProductPatchBuilder":
-        self._add_patch(
-            DataProductProperties.ASPECT_NAME,
-            "add",
-            path="/customProperties",
-            value=custom_properties,
-        )
-        return self
-
-    def add_custom_property(self, key: str, value: str) -> "DataProductPatchBuilder":
-        self.custom_properties_patch_helper.add_property(key, value)
-        return self
-
-    def remove_custom_property(self, key: str) -> "DataProductPatchBuilder":
-        self.custom_properties_patch_helper.remove_property(key)
-        return self
-
     def set_assets(
         self, assets: List[DataProductAssociation]
     ) -> "DataProductPatchBuilder":
         self._add_patch(
             DataProductProperties.ASPECT_NAME,
             "add",
-            path="/assets",
+            path=("assets",),
             value=assets,
         )
         return self
@@ -131,7 +69,7 @@ def add_asset(self, asset_urn: str) -> "DataProductPatchBuilder":
         self._add_patch(
             DataProductProperties.ASPECT_NAME,
             "add",
-            path=f"/assets/{self.quote(asset_urn)}",
+            path=("assets", asset_urn),
             value=DataProductAssociation(destinationUrn=asset_urn),
         )
         return self
@@ -140,7 +78,7 @@ def remove_asset(self, asset_urn: str) -> "DataProductPatchBuilder":
         self._add_patch(
             DataProductProperties.ASPECT_NAME,
             "remove",
-            path=f"/assets/{self.quote(asset_urn)}",
+            path=("assets", asset_urn),
             value={},
         )
         return self
@@ -149,7 +87,7 @@ def set_external_url(self, external_url: str) -> "DataProductPatchBuilder":
         self._add_patch(
             DataProductProperties.ASPECT_NAME,
             "add",
-            path="/externalUrl",
+            path=("externalUrl",),
             value=external_url,
         )
         return self
diff --git a/metadata-ingestion/src/datahub/specific/dataset.py b/metadata-ingestion/src/datahub/specific/dataset.py
index b171dc4cc2939f..6332386684bbf0 100644
--- a/metadata-ingestion/src/datahub/specific/dataset.py
+++ b/metadata-ingestion/src/datahub/specific/dataset.py
@@ -1,27 +1,27 @@
-from typing import Dict, Generic, List, Optional, Tuple, TypeVar, Union
+from typing import Generic, List, Optional, Tuple, TypeVar, Union
 
-from datahub.emitter.mcp_patch_builder import MetadataPatchProposal
+from datahub.emitter.mcp_patch_builder import MetadataPatchProposal, PatchPath
 from datahub.metadata.com.linkedin.pegasus2avro.common import TimeStamp
 from datahub.metadata.schema_classes import (
     DatasetPropertiesClass as DatasetProperties,
     EditableDatasetPropertiesClass as EditableDatasetProperties,
     EditableSchemaMetadataClass as EditableSchemaMetadata,
     FineGrainedLineageClass as FineGrainedLineage,
-    GlobalTagsClass as GlobalTags,
     GlossaryTermAssociationClass as Term,
-    GlossaryTermsClass as GlossaryTerms,
     KafkaAuditHeaderClass,
-    OwnerClass as Owner,
-    OwnershipTypeClass,
     SchemaMetadataClass,
     SystemMetadataClass,
     TagAssociationClass as Tag,
     UpstreamClass as Upstream,
     UpstreamLineageClass as UpstreamLineage,
 )
-from datahub.specific.custom_properties import CustomPropertiesPatchHelper
-from datahub.specific.ownership import OwnershipPatchHelper
-from datahub.specific.structured_properties import StructuredPropertiesPatchHelper
+from datahub.specific.aspect_helpers.custom_properties import HasCustomPropertiesPatch
+from datahub.specific.aspect_helpers.ownership import HasOwnershipPatch
+from datahub.specific.aspect_helpers.structured_properties import (
+    HasStructuredPropertiesPatch,
+)
+from datahub.specific.aspect_helpers.tags import HasTagsPatch
+from datahub.specific.aspect_helpers.terms import HasTermsPatch
 from datahub.utilities.urns.tag_urn import TagUrn
 from datahub.utilities.urns.urn import Urn
 
@@ -48,7 +48,7 @@ def add_tag(self, tag: Tag) -> "FieldPatchHelper":
         self._parent._add_patch(
             self.aspect_name,
             "add",
-            path=f"/{self.aspect_field}/{self.field_path}/globalTags/tags/{tag.tag}",
+            path=(self.aspect_field, self.field_path, "globalTags", "tags", tag.tag),
             value=tag,
         )
         return self
@@ -59,7 +59,7 @@ def remove_tag(self, tag: Union[str, Urn]) -> "FieldPatchHelper":
         self._parent._add_patch(
             self.aspect_name,
             "remove",
-            path=f"/{self.aspect_field}/{self.field_path}/globalTags/tags/{tag}",
+            path=(self.aspect_field, self.field_path, "globalTags", "tags", tag),
             value={},
         )
         return self
@@ -68,7 +68,13 @@ def add_term(self, term: Term) -> "FieldPatchHelper":
         self._parent._add_patch(
             self.aspect_name,
             "add",
-            path=f"/{self.aspect_field}/{self.field_path}/glossaryTerms/terms/{term.urn}",
+            path=(
+                self.aspect_field,
+                self.field_path,
+                "glossaryTerms",
+                "terms",
+                term.urn,
+            ),
             value=term,
         )
         return self
@@ -79,7 +85,7 @@ def remove_term(self, term: Union[str, Urn]) -> "FieldPatchHelper":
         self._parent._add_patch(
             self.aspect_name,
             "remove",
-            path=f"/{self.aspect_field}/{self.field_path}/glossaryTerms/terms/{term}",
+            path=(self.aspect_field, self.field_path, "glossaryTerms", "terms", term),
             value={},
         )
         return self
@@ -88,7 +94,14 @@ def parent(self) -> _Parent:
         return self._parent
 
 
-class DatasetPatchBuilder(MetadataPatchProposal):
+class DatasetPatchBuilder(
+    HasOwnershipPatch,
+    HasCustomPropertiesPatch,
+    HasStructuredPropertiesPatch,
+    HasTagsPatch,
+    HasTermsPatch,
+    MetadataPatchProposal,
+):
     def __init__(
         self,
         urn: str,
@@ -98,34 +111,16 @@ def __init__(
         super().__init__(
             urn, system_metadata=system_metadata, audit_header=audit_header
         )
-        self.custom_properties_patch_helper = CustomPropertiesPatchHelper(
-            self, DatasetProperties.ASPECT_NAME
-        )
-        self.ownership_patch_helper = OwnershipPatchHelper(self)
-        self.structured_properties_patch_helper = StructuredPropertiesPatchHelper(self)
-
-    def add_owner(self, owner: Owner) -> "DatasetPatchBuilder":
-        self.ownership_patch_helper.add_owner(owner)
-        return self
 
-    def remove_owner(
-        self, owner: str, owner_type: Optional[OwnershipTypeClass] = None
-    ) -> "DatasetPatchBuilder":
-        """
-        param: owner_type is optional
-        """
-        self.ownership_patch_helper.remove_owner(owner, owner_type)
-        return self
-
-    def set_owners(self, owners: List[Owner]) -> "DatasetPatchBuilder":
-        self.ownership_patch_helper.set_owners(owners)
-        return self
+    @classmethod
+    def _custom_properties_location(cls) -> Tuple[str, PatchPath]:
+        return DatasetProperties.ASPECT_NAME, ("customProperties",)
 
     def add_upstream_lineage(self, upstream: Upstream) -> "DatasetPatchBuilder":
         self._add_patch(
             UpstreamLineage.ASPECT_NAME,
             "add",
-            path=f"/upstreams/{self.quote(upstream.dataset)}",
+            path=("upstreams", upstream.dataset),
             value=upstream,
         )
         return self
@@ -136,14 +131,14 @@ def remove_upstream_lineage(
         self._add_patch(
             UpstreamLineage.ASPECT_NAME,
             "remove",
-            path=f"/upstreams/{dataset}",
+            path=("upstreams", dataset),
             value={},
         )
         return self
 
     def set_upstream_lineages(self, upstreams: List[Upstream]) -> "DatasetPatchBuilder":
         self._add_patch(
-            UpstreamLineage.ASPECT_NAME, "add", path="/upstreams", value=upstreams
+            UpstreamLineage.ASPECT_NAME, "add", path=("upstreams",), value=upstreams
         )
         return self
 
@@ -159,7 +154,7 @@ def add_fine_grained_upstream_lineage(
             self._add_patch(
                 UpstreamLineage.ASPECT_NAME,
                 "add",
-                path=DatasetPatchBuilder.quote_fine_grained_path(
+                path=self._build_fine_grained_path(
                     transform_op, downstream_urn, query_id, upstream_urn
                 ),
                 value={"confidenceScore": fine_grained_lineage.confidenceScore},
@@ -179,12 +174,15 @@ def get_fine_grained_key(
         return transform_op, downstream_urn, query_id
 
     @classmethod
-    def quote_fine_grained_path(
+    def _build_fine_grained_path(
         cls, transform_op: str, downstream_urn: str, query_id: str, upstream_urn: str
-    ) -> str:
+    ) -> PatchPath:
         return (
-            f"/fineGrainedLineages/{cls.quote(transform_op)}/"
-            f"{cls.quote(downstream_urn)}/{cls.quote(query_id)}/{cls.quote(upstream_urn)}"
+            "fineGrainedLineages",
+            transform_op,
+            downstream_urn,
+            query_id,
+            upstream_urn,
         )
 
     def remove_fine_grained_upstream_lineage(
@@ -199,7 +197,7 @@ def remove_fine_grained_upstream_lineage(
             self._add_patch(
                 UpstreamLineage.ASPECT_NAME,
                 "remove",
-                path=DatasetPatchBuilder.quote_fine_grained_path(
+                path=self._build_fine_grained_path(
                     transform_op, downstream_urn, query_id, upstream_urn
                 ),
                 value={},
@@ -212,37 +210,11 @@ def set_fine_grained_upstream_lineages(
         self._add_patch(
             UpstreamLineage.ASPECT_NAME,
             "add",
-            path="/fineGrainedLineages",
+            path=("fineGrainedLineages",),
             value=fine_grained_lineages,
         )
         return self
 
-    def add_tag(self, tag: Tag) -> "DatasetPatchBuilder":
-        self._add_patch(
-            GlobalTags.ASPECT_NAME, "add", path=f"/tags/{tag.tag}", value=tag
-        )
-        return self
-
-    def remove_tag(self, tag: Union[str, Urn]) -> "DatasetPatchBuilder":
-        if isinstance(tag, str) and not tag.startswith("urn:li:tag:"):
-            tag = TagUrn.create_from_id(tag)
-        self._add_patch(GlobalTags.ASPECT_NAME, "remove", path=f"/tags/{tag}", value={})
-        return self
-
-    def add_term(self, term: Term) -> "DatasetPatchBuilder":
-        self._add_patch(
-            GlossaryTerms.ASPECT_NAME, "add", path=f"/terms/{term.urn}", value=term
-        )
-        return self
-
-    def remove_term(self, term: Union[str, Urn]) -> "DatasetPatchBuilder":
-        if isinstance(term, str) and not term.startswith("urn:li:glossaryTerm:"):
-            term = "urn:li:glossaryTerm:" + term
-        self._add_patch(
-            GlossaryTerms.ASPECT_NAME, "remove", path=f"/terms/{term}", value={}
-        )
-        return self
-
     def for_field(
         self, field_path: str, editable: bool = True
     ) -> FieldPatchHelper["DatasetPatchBuilder"]:
@@ -269,38 +241,11 @@ def set_description(
                     else EditableDatasetProperties.ASPECT_NAME
                 ),
                 "add",
-                path="/description",
+                path=("description",),
                 value=description,
             )
         return self
 
-    def set_custom_properties(
-        self, custom_properties: Dict[str, str]
-    ) -> "DatasetPatchBuilder":
-        self._add_patch(
-            DatasetProperties.ASPECT_NAME,
-            "add",
-            path="/customProperties",
-            value=custom_properties,
-        )
-        return self
-
-    def add_custom_property(self, key: str, value: str) -> "DatasetPatchBuilder":
-        self.custom_properties_patch_helper.add_property(key, value)
-        return self
-
-    def add_custom_properties(
-        self, custom_properties: Optional[Dict[str, str]] = None
-    ) -> "DatasetPatchBuilder":
-        if custom_properties is not None:
-            for key, value in custom_properties.items():
-                self.custom_properties_patch_helper.add_property(key, value)
-        return self
-
-    def remove_custom_property(self, key: str) -> "DatasetPatchBuilder":
-        self.custom_properties_patch_helper.remove_property(key)
-        return self
-
     def set_display_name(
         self, display_name: Optional[str] = None
     ) -> "DatasetPatchBuilder":
@@ -308,7 +253,7 @@ def set_display_name(
             self._add_patch(
                 DatasetProperties.ASPECT_NAME,
                 "add",
-                path="/name",
+                path=("name",),
                 value=display_name,
             )
         return self
@@ -320,7 +265,7 @@ def set_qualified_name(
             self._add_patch(
                 DatasetProperties.ASPECT_NAME,
                 "add",
-                path="/qualifiedName",
+                path=("qualifiedName",),
                 value=qualified_name,
             )
         return self
@@ -332,7 +277,7 @@ def set_created(
             self._add_patch(
                 DatasetProperties.ASPECT_NAME,
                 "add",
-                path="/created",
+                path=("created",),
                 value=timestamp,
             )
         return self
@@ -344,37 +289,7 @@ def set_last_modified(
             self._add_patch(
                 DatasetProperties.ASPECT_NAME,
                 "add",
-                path="/lastModified",
+                path=("lastModified",),
                 value=timestamp,
             )
         return self
-
-    def set_structured_property(
-        self, property_name: str, value: Union[str, float, List[Union[str, float]]]
-    ) -> "DatasetPatchBuilder":
-        """
-        This is a helper method to set a structured property.
-        @param property_name: the name of the property (either bare or urn form)
-        @param value: the value of the property (for multi-valued properties, this can be a list)
-        """
-        self.structured_properties_patch_helper.set_property(property_name, value)
-        return self
-
-    def add_structured_property(
-        self, property_name: str, value: Union[str, float]
-    ) -> "DatasetPatchBuilder":
-        """
-        This is a helper method to add a structured property.
-        @param property_name: the name of the property (either bare or urn form)
-        @param value: the value of the property (for multi-valued properties, this value will be appended to the list)
-        """
-        self.structured_properties_patch_helper.add_property(property_name, value)
-        return self
-
-    def remove_structured_property(self, property_name: str) -> "DatasetPatchBuilder":
-        """
-        This is a helper method to remove a structured property.
-        @param property_name: the name of the property (either bare or urn form)
-        """
-        self.structured_properties_patch_helper.remove_property(property_name)
-        return self
diff --git a/metadata-ingestion/src/datahub/specific/form.py b/metadata-ingestion/src/datahub/specific/form.py
index 78182c202f7162..281b3cac99b2c1 100644
--- a/metadata-ingestion/src/datahub/specific/form.py
+++ b/metadata-ingestion/src/datahub/specific/form.py
@@ -5,15 +5,13 @@
     FormInfoClass as FormInfo,
     FormPromptClass,
     KafkaAuditHeaderClass,
-    OwnerClass as Owner,
-    OwnershipTypeClass,
     SystemMetadataClass,
 )
-from datahub.specific.ownership import OwnershipPatchHelper
+from datahub.specific.aspect_helpers.ownership import HasOwnershipPatch
 from datahub.utilities.urns.urn import Urn
 
 
-class FormPatchBuilder(MetadataPatchProposal):
+class FormPatchBuilder(HasOwnershipPatch, MetadataPatchProposal):
     def __init__(
         self,
         urn: str,
@@ -23,31 +21,13 @@ def __init__(
         super().__init__(
             urn, system_metadata=system_metadata, audit_header=audit_header
         )
-        self.ownership_patch_helper = OwnershipPatchHelper(self)
-
-    def add_owner(self, owner: Owner) -> "FormPatchBuilder":
-        self.ownership_patch_helper.add_owner(owner)
-        return self
-
-    def remove_owner(
-        self, owner: str, owner_type: Optional[OwnershipTypeClass] = None
-    ) -> "FormPatchBuilder":
-        """
-        param: owner_type is optional
-        """
-        self.ownership_patch_helper.remove_owner(owner, owner_type)
-        return self
-
-    def set_owners(self, owners: List[Owner]) -> "FormPatchBuilder":
-        self.ownership_patch_helper.set_owners(owners)
-        return self
 
     def set_name(self, name: Optional[str] = None) -> "FormPatchBuilder":
         if name is not None:
             self._add_patch(
                 FormInfo.ASPECT_NAME,
                 "add",
-                path="/name",
+                path=("name",),
                 value=name,
             )
         return self
@@ -57,7 +37,7 @@ def set_description(self, description: Optional[str] = None) -> "FormPatchBuilde
             self._add_patch(
                 FormInfo.ASPECT_NAME,
                 "add",
-                path="/description",
+                path=("description",),
                 value=description,
             )
         return self
@@ -67,7 +47,7 @@ def set_type(self, type: Optional[str] = None) -> "FormPatchBuilder":
             self._add_patch(
                 FormInfo.ASPECT_NAME,
                 "add",
-                path="/type",
+                path=("type",),
                 value=type,
             )
         return self
@@ -76,7 +56,7 @@ def add_prompt(self, prompt: FormPromptClass) -> "FormPatchBuilder":
         self._add_patch(
             FormInfo.ASPECT_NAME,
             "add",
-            path=f"/prompts/{self.quote(prompt.id)}",
+            path=("prompts", prompt.id),
             value=prompt,
         )
         return self
@@ -90,7 +70,7 @@ def remove_prompt(self, prompt_id: str) -> "FormPatchBuilder":
         self._add_patch(
             FormInfo.ASPECT_NAME,
             "remove",
-            path=f"/prompts/{self.quote(prompt_id)}",
+            path=("prompts", prompt_id),
             value=prompt_id,
         )
         return self
@@ -104,7 +84,7 @@ def set_ownership_form(self, is_ownership: bool) -> "FormPatchBuilder":
         self._add_patch(
             FormInfo.ASPECT_NAME,
             "add",
-            path="/actors/owners",
+            path=("actors", "owners"),
             value=is_ownership,
         )
         return self
@@ -113,7 +93,7 @@ def add_assigned_user(self, user_urn: Union[str, Urn]) -> "FormPatchBuilder":
         self._add_patch(
             FormInfo.ASPECT_NAME,
             "add",
-            path=f"/actors/users/{self.quote(str(user_urn))}",
+            path=("actors", "users", user_urn),
             value=user_urn,
         )
         return self
@@ -122,7 +102,7 @@ def remove_assigned_user(self, user_urn: Union[str, Urn]) -> "FormPatchBuilder":
         self._add_patch(
             FormInfo.ASPECT_NAME,
             "remove",
-            path=f"/actors/users/{self.quote(str(user_urn))}",
+            path=("actors", "users", user_urn),
             value=user_urn,
         )
         return self
@@ -131,7 +111,7 @@ def add_assigned_group(self, group_urn: Union[str, Urn]) -> "FormPatchBuilder":
         self._add_patch(
             FormInfo.ASPECT_NAME,
             "add",
-            path=f"/actors/groups/{self.quote(str(group_urn))}",
+            path=("actors", "groups", group_urn),
             value=group_urn,
         )
         return self
@@ -140,7 +120,7 @@ def remove_assigned_group(self, group_urn: Union[str, Urn]) -> "FormPatchBuilder
         self._add_patch(
             FormInfo.ASPECT_NAME,
             "remove",
-            path=f"/actors/groups/{self.quote(str(group_urn))}",
+            path=("actors", "groups", group_urn),
             value=group_urn,
         )
         return self
diff --git a/metadata-ingestion/src/datahub/specific/ownership.py b/metadata-ingestion/src/datahub/specific/ownership.py
deleted file mode 100644
index b377a8814f38a0..00000000000000
--- a/metadata-ingestion/src/datahub/specific/ownership.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from typing import Generic, List, Optional, TypeVar
-
-from datahub.emitter.mcp_patch_builder import MetadataPatchProposal
-from datahub.metadata.schema_classes import (
-    OwnerClass,
-    OwnershipClass,
-    OwnershipTypeClass,
-)
-
-_Parent = TypeVar("_Parent", bound=MetadataPatchProposal)
-
-
-class OwnershipPatchHelper(Generic[_Parent]):
-    def __init__(self, parent: _Parent) -> None:
-        self._parent = parent
-        self.aspect_field = OwnershipClass.ASPECT_NAME
-
-    def parent(self) -> _Parent:
-        return self._parent
-
-    def add_owner(self, owner: OwnerClass) -> "OwnershipPatchHelper":
-        self._parent._add_patch(
-            OwnershipClass.ASPECT_NAME,
-            "add",
-            path=f"/owners/{owner.owner}/{owner.type}",
-            value=owner,
-        )
-        return self
-
-    def remove_owner(
-        self, owner: str, owner_type: Optional[OwnershipTypeClass] = None
-    ) -> "OwnershipPatchHelper":
-        """
-        param: owner_type is optional
-        """
-        self._parent._add_patch(
-            OwnershipClass.ASPECT_NAME,
-            "remove",
-            path=f"/owners/{owner}" + (f"/{owner_type}" if owner_type else ""),
-            value=owner,
-        )
-        return self
-
-    def set_owners(self, owners: List[OwnerClass]) -> "OwnershipPatchHelper":
-        self._parent._add_patch(
-            OwnershipClass.ASPECT_NAME, "add", path="/owners", value=owners
-        )
-        return self
diff --git a/metadata-ingestion/src/datahub/specific/structured_properties.py b/metadata-ingestion/src/datahub/specific/structured_properties.py
deleted file mode 100644
index 17d896249c4746..00000000000000
--- a/metadata-ingestion/src/datahub/specific/structured_properties.py
+++ /dev/null
@@ -1,53 +0,0 @@
-from typing import Generic, List, TypeVar, Union
-
-from datahub.emitter.mcp_patch_builder import MetadataPatchProposal
-from datahub.metadata.schema_classes import StructuredPropertyValueAssignmentClass
-from datahub.utilities.urns.structured_properties_urn import (
-    make_structured_property_urn,
-)
-
-_Parent = TypeVar("_Parent", bound=MetadataPatchProposal)
-
-
-class StructuredPropertiesPatchHelper(Generic[_Parent]):
-    def __init__(
-        self,
-        parent: _Parent,
-        aspect_name: str = "structuredProperties",
-    ) -> None:
-        self.aspect_name = aspect_name
-        self._parent = parent
-        self.aspect_field = "properties"
-
-    def parent(self) -> _Parent:
-        return self._parent
-
-    def set_property(
-        self, key: str, value: Union[str, float, List[Union[str, float]]]
-    ) -> "StructuredPropertiesPatchHelper":
-        self.remove_property(key)
-        self.add_property(key, value)
-        return self
-
-    def remove_property(self, key: str) -> "StructuredPropertiesPatchHelper":
-        self._parent._add_patch(
-            self.aspect_name,
-            "remove",
-            path=(self.aspect_field, make_structured_property_urn(key)),
-            value={},
-        )
-        return self
-
-    def add_property(
-        self, key: str, value: Union[str, float, List[Union[str, float]]]
-    ) -> "StructuredPropertiesPatchHelper":
-        self._parent._add_patch(
-            self.aspect_name,
-            "add",
-            path=(self.aspect_field, make_structured_property_urn(key)),
-            value=StructuredPropertyValueAssignmentClass(
-                propertyUrn=make_structured_property_urn(key),
-                values=value if isinstance(value, list) else [value],
-            ),
-        )
-        return self
diff --git a/metadata-ingestion/src/datahub/specific/structured_property.py b/metadata-ingestion/src/datahub/specific/structured_property.py
index 50f1f079c2aa72..bcae174ed3c4f4 100644
--- a/metadata-ingestion/src/datahub/specific/structured_property.py
+++ b/metadata-ingestion/src/datahub/specific/structured_property.py
@@ -29,7 +29,7 @@ def set_qualified_name(
         self._add_patch(
             StructuredPropertyDefinition.ASPECT_NAME,
             "add",
-            path="/qualifiedName",
+            path=("qualifiedName",),
             value=qualified_name,
         )
         return self
@@ -41,7 +41,7 @@ def set_display_name(
             self._add_patch(
                 StructuredPropertyDefinition.ASPECT_NAME,
                 "add",
-                path="/displayName",
+                path=("displayName",),
                 value=display_name,
             )
         return self
@@ -53,7 +53,7 @@ def set_value_type(
         self._add_patch(
             StructuredPropertyDefinition.ASPECT_NAME,
             "add",
-            path="/valueType",
+            path=("valueType",),
             value=value_type,
         )
         return self
@@ -66,7 +66,7 @@ def set_type_qualifier(
             self._add_patch(
                 StructuredPropertyDefinition.ASPECT_NAME,
                 "add",
-                path="/typeQualifier",
+                path=("typeQualifier",),
                 value=type_qualifier,
             )
         return self
@@ -78,7 +78,7 @@ def add_allowed_value(
         self._add_patch(
             StructuredPropertyDefinition.ASPECT_NAME,
             "add",
-            path=f"/allowedValues/{str(allowed_value.get('value'))}",
+            path=("allowedValues", str(allowed_value.get("value"))),
             value=allowed_value,
         )
         return self
@@ -87,7 +87,7 @@ def set_cardinality(self, cardinality: str) -> "StructuredPropertyPatchBuilder":
         self._add_patch(
             StructuredPropertyDefinition.ASPECT_NAME,
             "add",
-            path="/cardinality",
+            path=("cardinality",),
             value=cardinality,
         )
         return self
@@ -98,7 +98,7 @@ def add_entity_type(
         self._add_patch(
             StructuredPropertyDefinition.ASPECT_NAME,
             "add",
-            path=f"/entityTypes/{self.quote(str(entity_type))}",
+            path=("entityTypes", str(entity_type)),
             value=entity_type,
         )
         return self
@@ -110,7 +110,7 @@ def set_description(
             self._add_patch(
                 StructuredPropertyDefinition.ASPECT_NAME,
                 "add",
-                path="/description",
+                path=("description",),
                 value=description,
             )
         return self
@@ -119,7 +119,7 @@ def set_immutable(self, immutable: bool) -> "StructuredPropertyPatchBuilder":
         self._add_patch(
             StructuredPropertyDefinition.ASPECT_NAME,
             "add",
-            path="/immutable",
+            path=("immutable",),
             value=immutable,
         )
         return self

From 4a898e15945eff826e5e4cf3cce86bb237c8e5ea Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Thu, 2 Jan 2025 17:25:23 -0600
Subject: [PATCH 015/249] feat(auth): user.props authentication (#12259)

---
 datahub-frontend/app/auth/AuthModule.java     | 11 +++++--
 .../app/config/ConfigurationProvider.java     |  4 +++
 .../upgrade/config/SystemUpdateConfig.java    |  3 +-
 docs/authentication/guides/add-users.md       | 30 +++++++++++++++++++
 docs/how/updating-datahub.md                  |  1 +
 .../SampleDataFixtureConfiguration.java       |  4 +--
 .../SearchLineageFixtureConfiguration.java    |  2 +-
 .../MCLSpringCommonTestConfiguration.java     |  3 +-
 .../metadata/context/ActorContext.java        | 16 +++++++---
 .../metadata/context/OperationContext.java    | 25 +++++++++++-----
 .../context/TestOperationContexts.java        |  3 +-
 .../metadata/context/ActorContextTest.java    | 25 ++++++++--------
 .../context/OperationContextTest.java         |  5 ++--
 .../AuthenticationConfiguration.java          |  3 ++
 .../authorization/DataHubAuthorizerTest.java  |  3 +-
 .../src/main/resources/application.yaml       |  3 ++
 .../SystemOperationContextFactory.java        |  6 ++--
 .../IngestDataPlatformInstancesStepTest.java  |  2 +-
 18 files changed, 112 insertions(+), 37 deletions(-)

diff --git a/datahub-frontend/app/auth/AuthModule.java b/datahub-frontend/app/auth/AuthModule.java
index b95515684f01fc..3de0170fc70389 100644
--- a/datahub-frontend/app/auth/AuthModule.java
+++ b/datahub-frontend/app/auth/AuthModule.java
@@ -181,7 +181,12 @@ protected OperationContext provideOperationContext(
       final Authentication systemAuthentication,
       final ConfigurationProvider configurationProvider) {
     ActorContext systemActorContext =
-        ActorContext.builder().systemAuth(true).authentication(systemAuthentication).build();
+        ActorContext.builder()
+            .systemAuth(true)
+            .authentication(systemAuthentication)
+            .enforceExistenceEnabled(
+                configurationProvider.getAuthentication().isEnforceExistenceEnabled())
+            .build();
     OperationContextConfig systemConfig =
         OperationContextConfig.builder()
             .viewAuthorizationConfiguration(configurationProvider.getAuthorization().getView())
@@ -197,7 +202,9 @@ protected OperationContext provideOperationContext(
         .entityRegistryContext(EntityRegistryContext.builder().build(EmptyEntityRegistry.EMPTY))
         .validationContext(ValidationContext.builder().alternateValidation(false).build())
         .retrieverContext(RetrieverContext.EMPTY)
-        .build(systemAuthentication);
+        .build(
+            systemAuthentication,
+            configurationProvider.getAuthentication().isEnforceExistenceEnabled());
   }
 
   @Provides
diff --git a/datahub-frontend/app/config/ConfigurationProvider.java b/datahub-frontend/app/config/ConfigurationProvider.java
index 97e916769a6c45..9bc28be1bfc89f 100644
--- a/datahub-frontend/app/config/ConfigurationProvider.java
+++ b/datahub-frontend/app/config/ConfigurationProvider.java
@@ -1,5 +1,6 @@
 package config;
 
+import com.datahub.authentication.AuthenticationConfiguration;
 import com.datahub.authorization.AuthorizationConfiguration;
 import com.linkedin.metadata.config.VisualConfiguration;
 import com.linkedin.metadata.config.cache.CacheConfiguration;
@@ -30,4 +31,7 @@ public class ConfigurationProvider {
 
   /** Configuration for authorization */
   private AuthorizationConfiguration authorization;
+
+  /** Configuration for authentication */
+  private AuthenticationConfiguration authentication;
 }
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/SystemUpdateConfig.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/SystemUpdateConfig.java
index fdd84da6044f73..d0493019a40af2 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/SystemUpdateConfig.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/SystemUpdateConfig.java
@@ -194,7 +194,8 @@ protected OperationContext javaSystemOperationContext(
             ValidationContext.builder()
                 .alternateValidation(
                     configurationProvider.getFeatureFlags().isAlternateMCPValidation())
-                .build());
+                .build(),
+            true);
 
     entityServiceAspectRetriever.setSystemOperationContext(systemOperationContext);
     systemGraphRetriever.setSystemOperationContext(systemOperationContext);
diff --git a/docs/authentication/guides/add-users.md b/docs/authentication/guides/add-users.md
index 30da5c9f229f94..dbd44b63086783 100644
--- a/docs/authentication/guides/add-users.md
+++ b/docs/authentication/guides/add-users.md
@@ -1,3 +1,6 @@
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
 # Onboarding Users to DataHub
 
 New user accounts can be provisioned on DataHub in 3 ways:
@@ -94,6 +97,11 @@ using this mechanism. It is highly recommended that admins change or remove the
 
 ## Adding new users using a user.props file
 
+:::NOTE
+Adding users via the `user.props` will require disabling existence checks on GMS using the `METADATA_SERVICE_AUTH_ENFORCE_EXISTENCE_ENABLED=false` environment variable or using the API to enable the user prior to login.
+The directions below demonstrate using the API to enable the user.
+:::
+
 To define a set of username / password combinations that should be allowed to log in to DataHub (in addition to the root 'datahub' user),
 create a new file called `user.props` at the file path `${HOME}/.datahub/plugins/frontend/auth/user.props` within the `datahub-frontend-react` container
 or pod.
@@ -107,6 +115,28 @@ janesmith:janespassword
 johndoe:johnspassword
 ```
 
+In order to enable the user access with the credential defined in `user.props`, set the `status` aspect on the user with an Admin user. This can be done using an API call or via the [OpenAPI UI interface](/docs/api/openapi/openapi-usage-guide.md).
+
+<Tabs>
+<TabItem value="openapi" label="OpenAPI" default>
+
+Example enabling login for the `janesmith` user from the example above. Make sure to update the example with your access token.
+
+```shell
+curl -X 'POST' \
+  'http://localhost:9002/openapi/v3/entity/corpuser/urn%3Ali%3Acorpuser%3Ajanesmith/status?async=false&systemMetadata=false&createIfEntityNotExists=false&createIfNotExists=true' \
+  -H 'accept: application/json' \
+  -H 'Content-Type: application/json' \
+  -H 'Authorization: Bearer <access token>' \
+  -d '{
+  "value": {
+    "removed": false
+  }
+}'
+```
+</TabItem>
+</Tabs>
+
 Once you've saved the file, simply start the DataHub containers & navigate to `http://localhost:9002/login`
 to verify that your new credentials work.
 
diff --git a/docs/how/updating-datahub.md b/docs/how/updating-datahub.md
index 19261da23bcf96..07577079d66d12 100644
--- a/docs/how/updating-datahub.md
+++ b/docs/how/updating-datahub.md
@@ -66,6 +66,7 @@ This file documents any backwards-incompatible changes in DataHub and assists pe
   changed to NOT fill out `created` and `lastModified` auditstamps by default
   for input and output dataset edges. This should not have any user-observable
   impact (time-based lineage viz will still continue working based on observed time), but could break assumptions previously being made by clients.
+- #12158 - Users provisioned with `user.props` will need to be enabled before login in order to be granted access to DataHub.
 
 ### Potential Downtime
 
diff --git a/metadata-io/src/test/java/io/datahubproject/test/fixtures/search/SampleDataFixtureConfiguration.java b/metadata-io/src/test/java/io/datahubproject/test/fixtures/search/SampleDataFixtureConfiguration.java
index 5e387d7d88292a..968f0dd4dd61ef 100644
--- a/metadata-io/src/test/java/io/datahubproject/test/fixtures/search/SampleDataFixtureConfiguration.java
+++ b/metadata-io/src/test/java/io/datahubproject/test/fixtures/search/SampleDataFixtureConfiguration.java
@@ -137,7 +137,7 @@ protected OperationContext sampleDataOperationContext(
 
     return testOpContext.toBuilder()
         .searchContext(SearchContext.builder().indexConvention(indexConvention).build())
-        .build(testOpContext.getSessionAuthentication());
+        .build(testOpContext.getSessionAuthentication(), true);
   }
 
   @Bean(name = "longTailOperationContext")
@@ -148,7 +148,7 @@ protected OperationContext longTailOperationContext(
 
     return testOpContext.toBuilder()
         .searchContext(SearchContext.builder().indexConvention(indexConvention).build())
-        .build(testOpContext.getSessionAuthentication());
+        .build(testOpContext.getSessionAuthentication(), true);
   }
 
   protected EntityIndexBuilders entityIndexBuildersHelper(OperationContext opContext) {
diff --git a/metadata-io/src/test/java/io/datahubproject/test/fixtures/search/SearchLineageFixtureConfiguration.java b/metadata-io/src/test/java/io/datahubproject/test/fixtures/search/SearchLineageFixtureConfiguration.java
index b7b698c73ddac3..26443e019829bf 100644
--- a/metadata-io/src/test/java/io/datahubproject/test/fixtures/search/SearchLineageFixtureConfiguration.java
+++ b/metadata-io/src/test/java/io/datahubproject/test/fixtures/search/SearchLineageFixtureConfiguration.java
@@ -162,7 +162,7 @@ protected OperationContext searchLineageOperationContext(
 
     return testOpContext.toBuilder()
         .searchContext(SearchContext.builder().indexConvention(indexConvention).build())
-        .build(testOpContext.getSessionAuthentication());
+        .build(testOpContext.getSessionAuthentication(), true);
   }
 
   @Bean(name = "searchLineageESIndexBuilder")
diff --git a/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLSpringCommonTestConfiguration.java b/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLSpringCommonTestConfiguration.java
index f16c9dbd82e749..c92749385145de 100644
--- a/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLSpringCommonTestConfiguration.java
+++ b/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLSpringCommonTestConfiguration.java
@@ -95,7 +95,8 @@ public OperationContext operationContext(
         mock(ServicesRegistryContext.class),
         indexConvention,
         TestOperationContexts.emptyActiveUsersRetrieverContext(() -> entityRegistry),
-        mock(ValidationContext.class));
+        mock(ValidationContext.class),
+        true);
   }
 
   @MockBean SpringStandardPluginConfiguration springStandardPluginConfiguration;
diff --git a/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/ActorContext.java b/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/ActorContext.java
index c08b7fad4dee32..11e38dfb179e0c 100644
--- a/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/ActorContext.java
+++ b/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/ActorContext.java
@@ -29,23 +29,31 @@
 @EqualsAndHashCode
 public class ActorContext implements ContextInterface {
 
-  public static ActorContext asSystem(Authentication systemAuthentication) {
-    return ActorContext.builder().systemAuth(true).authentication(systemAuthentication).build();
+  public static ActorContext asSystem(
+      Authentication systemAuthentication, boolean enforceExistenceEnabled) {
+    return ActorContext.builder()
+        .systemAuth(true)
+        .authentication(systemAuthentication)
+        .enforceExistenceEnabled(enforceExistenceEnabled)
+        .build();
   }
 
   public static ActorContext asSessionRestricted(
       Authentication authentication,
       Set<DataHubPolicyInfo> dataHubPolicySet,
-      Collection<Urn> groupMembership) {
+      Collection<Urn> groupMembership,
+      boolean enforceExistenceEnabled) {
     return ActorContext.builder()
         .systemAuth(false)
         .authentication(authentication)
         .policyInfoSet(dataHubPolicySet)
         .groupMembership(groupMembership)
+        .enforceExistenceEnabled(enforceExistenceEnabled)
         .build();
   }
 
   private final Authentication authentication;
+  private final boolean enforceExistenceEnabled;
 
   @EqualsAndHashCode.Exclude @Builder.Default
   private final Set<DataHubPolicyInfo> policyInfoSet = Collections.emptySet();
@@ -79,7 +87,7 @@ public boolean isActive(AspectRetriever aspectRetriever) {
 
     Map<String, Aspect> aspectMap = urnAspectMap.getOrDefault(selfUrn, Map.of());
 
-    if (!aspectMap.containsKey(CORP_USER_KEY_ASPECT_NAME)) {
+    if (enforceExistenceEnabled && !aspectMap.containsKey(CORP_USER_KEY_ASPECT_NAME)) {
       // user is hard deleted
       return false;
     }
diff --git a/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/OperationContext.java b/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/OperationContext.java
index 9158129235b39e..30255f7ebcac36 100644
--- a/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/OperationContext.java
+++ b/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/OperationContext.java
@@ -152,7 +152,8 @@ public static OperationContext asSystem(
       @Nullable ServicesRegistryContext servicesRegistryContext,
       @Nullable IndexConvention indexConvention,
       @Nullable RetrieverContext retrieverContext,
-      @Nonnull ValidationContext validationContext) {
+      @Nonnull ValidationContext validationContext,
+      boolean enforceExistenceEnabled) {
     return asSystem(
         config,
         systemAuthentication,
@@ -161,7 +162,8 @@ public static OperationContext asSystem(
         indexConvention,
         retrieverContext,
         validationContext,
-        ObjectMapperContext.DEFAULT);
+        ObjectMapperContext.DEFAULT,
+        enforceExistenceEnabled);
   }
 
   public static OperationContext asSystem(
@@ -172,10 +174,15 @@ public static OperationContext asSystem(
       @Nullable IndexConvention indexConvention,
       @Nullable RetrieverContext retrieverContext,
       @Nonnull ValidationContext validationContext,
-      @Nonnull ObjectMapperContext objectMapperContext) {
+      @Nonnull ObjectMapperContext objectMapperContext,
+      boolean enforceExistenceEnabled) {
 
     ActorContext systemActorContext =
-        ActorContext.builder().systemAuth(true).authentication(systemAuthentication).build();
+        ActorContext.builder()
+            .systemAuth(true)
+            .authentication(systemAuthentication)
+            .enforceExistenceEnabled(enforceExistenceEnabled)
+            .build();
     OperationContextConfig systemConfig =
         config.toBuilder().allowSystemAuthentication(true).build();
     SearchContext systemSearchContext =
@@ -457,13 +464,16 @@ public int hashCode() {
   public static class OperationContextBuilder {
 
     @Nonnull
-    public OperationContext build(@Nonnull Authentication sessionAuthentication) {
-      return build(sessionAuthentication, false);
+    public OperationContext build(
+        @Nonnull Authentication sessionAuthentication, boolean enforceExistenceEnabled) {
+      return build(sessionAuthentication, false, enforceExistenceEnabled);
     }
 
     @Nonnull
     public OperationContext build(
-        @Nonnull Authentication sessionAuthentication, boolean skipCache) {
+        @Nonnull Authentication sessionAuthentication,
+        boolean skipCache,
+        boolean enforceExistenceEnabled) {
       final Urn actorUrn = UrnUtils.getUrn(sessionAuthentication.getActor().toUrnStr());
       final ActorContext sessionActor =
           ActorContext.builder()
@@ -476,6 +486,7 @@ public OperationContext build(
                           .equals(sessionAuthentication.getActor()))
               .policyInfoSet(this.authorizationContext.getAuthorizer().getActorPolicies(actorUrn))
               .groupMembership(this.authorizationContext.getAuthorizer().getActorGroups(actorUrn))
+              .enforceExistenceEnabled(enforceExistenceEnabled)
               .build();
       return build(sessionActor, skipCache);
     }
diff --git a/metadata-operation-context/src/main/java/io/datahubproject/test/metadata/context/TestOperationContexts.java b/metadata-operation-context/src/main/java/io/datahubproject/test/metadata/context/TestOperationContexts.java
index 4abfbb196f067c..92d62d42295b92 100644
--- a/metadata-operation-context/src/main/java/io/datahubproject/test/metadata/context/TestOperationContexts.java
+++ b/metadata-operation-context/src/main/java/io/datahubproject/test/metadata/context/TestOperationContexts.java
@@ -260,7 +260,8 @@ public static OperationContext systemContext(
             servicesRegistryContext,
             indexConvention,
             retrieverContext,
-            validationContext);
+            validationContext,
+            true);
 
     if (postConstruct != null) {
       postConstruct.accept(operationContext);
diff --git a/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/ActorContextTest.java b/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/ActorContextTest.java
index 15fe2bc277b9b9..de6f71408e2589 100644
--- a/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/ActorContextTest.java
+++ b/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/ActorContextTest.java
@@ -87,42 +87,43 @@ public void actorContextId() {
     Authentication userAuth = new Authentication(new Actor(ActorType.USER, "USER"), "");
 
     assertEquals(
-        ActorContext.asSessionRestricted(userAuth, Set.of(), Set.of()).getCacheKeyComponent(),
-        ActorContext.asSessionRestricted(userAuth, Set.of(), Set.of()).getCacheKeyComponent(),
+        ActorContext.asSessionRestricted(userAuth, Set.of(), Set.of(), true).getCacheKeyComponent(),
+        ActorContext.asSessionRestricted(userAuth, Set.of(), Set.of(), true).getCacheKeyComponent(),
         "Expected equality across instances");
 
     assertEquals(
-        ActorContext.asSessionRestricted(userAuth, Set.of(), Set.of()).getCacheKeyComponent(),
+        ActorContext.asSessionRestricted(userAuth, Set.of(), Set.of(), true).getCacheKeyComponent(),
         ActorContext.asSessionRestricted(
-                userAuth, Set.of(), Set.of(UrnUtils.getUrn("urn:li:corpGroup:group1")))
+                userAuth, Set.of(), Set.of(UrnUtils.getUrn("urn:li:corpGroup:group1")), true)
             .getCacheKeyComponent(),
         "Expected no impact to cache context from group membership");
 
     assertEquals(
-        ActorContext.asSessionRestricted(userAuth, Set.of(POLICY_ABC, POLICY_D), Set.of())
+        ActorContext.asSessionRestricted(userAuth, Set.of(POLICY_ABC, POLICY_D), Set.of(), true)
             .getCacheKeyComponent(),
-        ActorContext.asSessionRestricted(userAuth, Set.of(POLICY_ABC, POLICY_D), Set.of())
+        ActorContext.asSessionRestricted(userAuth, Set.of(POLICY_ABC, POLICY_D), Set.of(), true)
             .getCacheKeyComponent(),
         "Expected equality when non-ownership policies are identical");
 
     assertNotEquals(
-        ActorContext.asSessionRestricted(userAuth, Set.of(POLICY_ABC_RESOURCE, POLICY_D), Set.of())
+        ActorContext.asSessionRestricted(
+                userAuth, Set.of(POLICY_ABC_RESOURCE, POLICY_D), Set.of(), true)
             .getCacheKeyComponent(),
-        ActorContext.asSessionRestricted(userAuth, Set.of(POLICY_ABC, POLICY_D), Set.of())
+        ActorContext.asSessionRestricted(userAuth, Set.of(POLICY_ABC, POLICY_D), Set.of(), true)
             .getCacheKeyComponent(),
         "Expected differences with non-identical resource policy");
 
     assertNotEquals(
-        ActorContext.asSessionRestricted(userAuth, Set.of(POLICY_D_OWNER), Set.of())
+        ActorContext.asSessionRestricted(userAuth, Set.of(POLICY_D_OWNER), Set.of(), true)
             .getCacheKeyComponent(),
-        ActorContext.asSessionRestricted(userAuth, Set.of(POLICY_D), Set.of())
+        ActorContext.asSessionRestricted(userAuth, Set.of(POLICY_D), Set.of(), true)
             .getCacheKeyComponent(),
         "Expected differences with ownership policy");
 
     assertNotEquals(
-        ActorContext.asSessionRestricted(userAuth, Set.of(POLICY_D_OWNER_TYPE), Set.of())
+        ActorContext.asSessionRestricted(userAuth, Set.of(POLICY_D_OWNER_TYPE), Set.of(), true)
             .getCacheKeyComponent(),
-        ActorContext.asSessionRestricted(userAuth, Set.of(POLICY_D), Set.of())
+        ActorContext.asSessionRestricted(userAuth, Set.of(POLICY_D), Set.of(), true)
             .getCacheKeyComponent(),
         "Expected differences with ownership type policy");
   }
diff --git a/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/OperationContextTest.java b/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/OperationContextTest.java
index f77b244d8f2d86..a2575c1c562209 100644
--- a/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/OperationContextTest.java
+++ b/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/OperationContextTest.java
@@ -27,7 +27,8 @@ public void testSystemPrivilegeEscalation() {
             mock(ServicesRegistryContext.class),
             null,
             TestOperationContexts.emptyActiveUsersRetrieverContext(null),
-            mock(ValidationContext.class));
+            mock(ValidationContext.class),
+            true);
 
     OperationContext opContext =
         systemOpContext.asSession(RequestContext.TEST, Authorizer.EMPTY, userAuth);
@@ -51,7 +52,7 @@ public void testSystemPrivilegeEscalation() {
                 systemOpContext.getOperationContextConfig().toBuilder()
                     .allowSystemAuthentication(false)
                     .build())
-            .build(userAuth);
+            .build(userAuth, true);
 
     assertEquals(
         opContextNoSystem.getAuthentication(),
diff --git a/metadata-service/auth-config/src/main/java/com/datahub/authentication/AuthenticationConfiguration.java b/metadata-service/auth-config/src/main/java/com/datahub/authentication/AuthenticationConfiguration.java
index 442263bbd6b43e..81cc5e60552a77 100644
--- a/metadata-service/auth-config/src/main/java/com/datahub/authentication/AuthenticationConfiguration.java
+++ b/metadata-service/auth-config/src/main/java/com/datahub/authentication/AuthenticationConfiguration.java
@@ -9,6 +9,9 @@ public class AuthenticationConfiguration {
   /** Whether authentication is enabled */
   private boolean enabled;
 
+  /** Whether user existence is enforced */
+  private boolean enforceExistenceEnabled;
+
   /**
    * List of configurations for {@link com.datahub.plugins.auth.authentication.Authenticator}s to be
    * registered
diff --git a/metadata-service/auth-impl/src/test/java/com/datahub/authorization/DataHubAuthorizerTest.java b/metadata-service/auth-impl/src/test/java/com/datahub/authorization/DataHubAuthorizerTest.java
index 4437682bfeb0a1..ce9c636be16ac7 100644
--- a/metadata-service/auth-impl/src/test/java/com/datahub/authorization/DataHubAuthorizerTest.java
+++ b/metadata-service/auth-impl/src/test/java/com/datahub/authorization/DataHubAuthorizerTest.java
@@ -320,7 +320,8 @@ public void setupTest() throws Exception {
             mock(ServicesRegistryContext.class),
             mock(IndexConvention.class),
             mock(RetrieverContext.class),
-            mock(ValidationContext.class));
+            mock(ValidationContext.class),
+            true);
 
     _dataHubAuthorizer =
         new DataHubAuthorizer(
diff --git a/metadata-service/configuration/src/main/resources/application.yaml b/metadata-service/configuration/src/main/resources/application.yaml
index f6fa4a37fdadbc..c029cb4648d012 100644
--- a/metadata-service/configuration/src/main/resources/application.yaml
+++ b/metadata-service/configuration/src/main/resources/application.yaml
@@ -6,6 +6,9 @@ authentication:
   # Enable if you want all requests to the Metadata Service to be authenticated.
   enabled: ${METADATA_SERVICE_AUTH_ENABLED:true}
 
+  # Disable if you want to skip validation of deleted user's tokens
+  enforceExistenceEnabled: ${METADATA_SERVICE_AUTH_ENFORCE_EXISTENCE_ENABLED:true}
+
   # Required if enabled is true! A configurable chain of Authenticators
   authenticators:
     # Required for authenticating requests with DataHub-issued Access Tokens - best not to remove.
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/context/SystemOperationContextFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/context/SystemOperationContextFactory.java
index 3e2823591e168c..78107cc0ecc900 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/context/SystemOperationContextFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/context/SystemOperationContextFactory.java
@@ -79,7 +79,8 @@ protected OperationContext javaSystemOperationContext(
             ValidationContext.builder()
                 .alternateValidation(
                     configurationProvider.getFeatureFlags().isAlternateMCPValidation())
-                .build());
+                .build(),
+            configurationProvider.getAuthentication().isEnforceExistenceEnabled());
 
     entityClientAspectRetriever.setSystemOperationContext(systemOperationContext);
     entityServiceAspectRetriever.setSystemOperationContext(systemOperationContext);
@@ -134,7 +135,8 @@ protected OperationContext restliSystemOperationContext(
             ValidationContext.builder()
                 .alternateValidation(
                     configurationProvider.getFeatureFlags().isAlternateMCPValidation())
-                .build());
+                .build(),
+            configurationProvider.getAuthentication().isEnforceExistenceEnabled());
 
     entityClientAspectRetriever.setSystemOperationContext(systemOperationContext);
     systemGraphRetriever.setSystemOperationContext(systemOperationContext);
diff --git a/metadata-service/factories/src/test/java/com/linkedin/metadata/boot/steps/IngestDataPlatformInstancesStepTest.java b/metadata-service/factories/src/test/java/com/linkedin/metadata/boot/steps/IngestDataPlatformInstancesStepTest.java
index cc21819cf4ab58..b47c779f768a9b 100644
--- a/metadata-service/factories/src/test/java/com/linkedin/metadata/boot/steps/IngestDataPlatformInstancesStepTest.java
+++ b/metadata-service/factories/src/test/java/com/linkedin/metadata/boot/steps/IngestDataPlatformInstancesStepTest.java
@@ -87,7 +87,7 @@ public void testExecuteChecksKeySpecForAllUrns() throws Exception {
     mockOpContext =
         mockOpContext.toBuilder()
             .entityRegistryContext(spyEntityRegistryContext)
-            .build(mockOpContext.getSessionAuthentication());
+            .build(mockOpContext.getSessionAuthentication(), true);
 
     mockDBWithWorkToDo(migrationsDao, countOfCorpUserEntities, countOfChartEntities);
 

From 539f521388a9ad86ce9565a819b31d0da8f8d5b2 Mon Sep 17 00:00:00 2001
From: Gabe Lyons <gabe.lyons@acryl.io>
Date: Thu, 2 Jan 2025 15:56:54 -0800
Subject: [PATCH 016/249] docs(delete): Document un-soft-delete commands in
 delete-metadata.md (#12251)

---
 docs/how/delete-metadata.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/how/delete-metadata.md b/docs/how/delete-metadata.md
index e36940bf398356..1b1a9952f78983 100644
--- a/docs/how/delete-metadata.md
+++ b/docs/how/delete-metadata.md
@@ -97,6 +97,21 @@ The start and end time fields filter on the `timestampMillis` field of the times
 - `ddddddddd` (e.g. `1684384045`): a unix timestamp
 - `min`, `max`, `now`: special keywords
 
+#### Undo-ing soft deletion of entities
+
+You can restore soft-deleted entities using the `undo-by-filter` command. This reverts the effect of a soft delete. 
+
+```shell
+# Restore (un-soft-delete) a single soft-deleted entity
+datahub delete undo-by-filter --urn "urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_deleted,PROD)"
+
+# Restore all soft-deleted entities from a specific platform
+datahub delete undo-by-filter --platform snowflake
+
+# You can adjust the batch size (default 3000, max 10000) for better performance
+datahub delete undo-by-filter --platform snowflake --batch-size 5000
+```
+
 ## Delete CLI Examples
 
 :::note

From 1190dd95b2cedadbd2a5e8295d47497333b2288b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20G=C3=B3mez=20Villamor?= <sgomezvillamor@gmail.com>
Date: Fri, 3 Jan 2025 09:15:53 +0100
Subject: [PATCH 017/249] fix(tableau): fixes some aspects being emitted
 multiple times (#12258)

---
 .../ingestion/source/tableau/tableau.py       |  3 ++
 .../source/tableau/tableau_common.py          | 18 ++++++++
 .../tests/unit/test_tableau_source.py         | 46 ++++++++++++++++++-
 3 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
index d47e10c9eb5c62..008216fea89508 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
@@ -109,6 +109,7 @@
     make_filter,
     make_fine_grained_lineage_class,
     make_upstream_class,
+    optimize_query_filter,
     published_datasource_graphql_query,
     query_metadata_cursor_based_pagination,
     sheet_graphql_query,
@@ -1363,6 +1364,8 @@ def get_connection_objects(
         query_filter: dict = {},
         page_size_override: Optional[int] = None,
     ) -> Iterable[dict]:
+        query_filter = optimize_query_filter(query_filter)
+
         # Calls the get_connection_object_page function to get the objects,
         # and automatically handles pagination.
         page_size = page_size_override or self.config.page_size
diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau_common.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau_common.py
index 61b56c4bee5bda..8f9d81eb9a18c1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau_common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau_common.py
@@ -1,3 +1,4 @@
+import copy
 import html
 import json
 import logging
@@ -35,6 +36,7 @@
     UpstreamClass,
 )
 from datahub.sql_parsing.sqlglot_lineage import ColumnLineageInfo, SqlParsingResult
+from datahub.utilities.ordered_set import OrderedSet
 
 logger = logging.getLogger(__name__)
 
@@ -1000,3 +1002,19 @@ def get_filter_pages(query_filter: dict, page_size: int) -> List[dict]:
         ]
 
     return filter_pages
+
+
+def optimize_query_filter(query_filter: dict) -> dict:
+    """
+    Duplicates in the filter cause duplicates in the result,
+    leading to entities/aspects being emitted multiple times unnecessarily
+    """
+    optimized_query = copy.deepcopy(query_filter)
+
+    if query_filter.get(c.ID_WITH_IN):
+        optimized_query[c.ID_WITH_IN] = list(OrderedSet(query_filter[c.ID_WITH_IN]))
+    if query_filter.get(c.PROJECT_NAME_WITH_IN):
+        optimized_query[c.PROJECT_NAME_WITH_IN] = list(
+            OrderedSet(query_filter[c.PROJECT_NAME_WITH_IN])
+        )
+    return optimized_query
diff --git a/metadata-ingestion/tests/unit/test_tableau_source.py b/metadata-ingestion/tests/unit/test_tableau_source.py
index 44e59decaecbd7..227519fdb464a8 100644
--- a/metadata-ingestion/tests/unit/test_tableau_source.py
+++ b/metadata-ingestion/tests/unit/test_tableau_source.py
@@ -1,4 +1,4 @@
-from typing import Any, Dict
+from typing import Any, Dict, List
 
 import pytest
 
@@ -7,6 +7,7 @@
 from datahub.ingestion.source.tableau.tableau_common import (
     get_filter_pages,
     make_filter,
+    optimize_query_filter,
     tableau_field_to_schema_field,
 )
 from datahub.metadata.com.linkedin.pegasus2avro.schema import SchemaField
@@ -203,3 +204,46 @@ def test_get_filter_pages_id_filter_splits_into_multiple_filters():
         {c.ID_WITH_IN: filter_dict[c.ID_WITH_IN][i : i + page_size]}
         for i in range(0, num_ids, page_size)
     ]
+
+
+def test_optimize_query_filter_removes_duplicates():
+    query_filter = {
+        c.ID_WITH_IN: ["id1", "id2", "id1"],
+        c.PROJECT_NAME_WITH_IN: ["project1", "project2", "project1"],
+    }
+    result = optimize_query_filter(query_filter)
+    assert len(result) == 2
+    assert result[c.ID_WITH_IN] == ["id1", "id2"]
+    assert result[c.PROJECT_NAME_WITH_IN] == ["project1", "project2"]
+
+
+def test_optimize_query_filter_handles_empty_lists():
+    query_filter: Dict[str, List[str]] = {c.ID_WITH_IN: [], c.PROJECT_NAME_WITH_IN: []}
+    result = optimize_query_filter(query_filter)
+    assert len(result) == 2
+    assert result[c.ID_WITH_IN] == []
+    assert result[c.PROJECT_NAME_WITH_IN] == []
+
+
+def test_optimize_query_filter_handles_missing_keys():
+    query_filter: Dict[str, List[str]] = {}
+    result = optimize_query_filter(query_filter)
+    assert result == {}
+
+
+def test_optimize_query_filter_handles_other_keys():
+    query_filter = {"any_other_key": ["id1", "id2", "id1"]}
+    result = optimize_query_filter(query_filter)
+    assert len(result) == 1
+    assert result["any_other_key"] == ["id1", "id2", "id1"]
+
+
+def test_optimize_query_filter_handles_no_duplicates():
+    query_filter = {
+        c.ID_WITH_IN: ["id1", "id2"],
+        c.PROJECT_NAME_WITH_IN: ["project1", "project2"],
+    }
+    result = optimize_query_filter(query_filter)
+    assert len(result) == 2
+    assert result[c.ID_WITH_IN] == ["id1", "id2"]
+    assert result[c.PROJECT_NAME_WITH_IN] == ["project1", "project2"]

From b76db335a2f33775a1d0d48c56018a9765ddf458 Mon Sep 17 00:00:00 2001
From: skrydal <piotr.skrydalewicz@acryl.io>
Date: Fri, 3 Jan 2025 13:33:45 +0100
Subject: [PATCH 018/249] fix(ingestion/redshift): Bumped redshift-connector
 dependency due to CVE-2024-12745 (#12265)

---
 metadata-ingestion/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py
index 8357262537bcf8..5a48f8b7918dce 100644
--- a/metadata-ingestion/setup.py
+++ b/metadata-ingestion/setup.py
@@ -207,7 +207,7 @@
     # Clickhouse 0.8.3 adds support for SQLAlchemy 1.4.x
     "sqlalchemy-redshift>=0.8.3",
     "GeoAlchemy2",
-    "redshift-connector>=2.1.0",
+    "redshift-connector>=2.1.5",
     *path_spec_common,
 }
 

From f9e2c4939139c05307c9dbf7830d3373d1bc1ad3 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Fri, 3 Jan 2025 22:15:52 +0530
Subject: [PATCH 019/249] fix(ingest/gc): logging and stopping fix (#12266)

---
 .../source/gc/execution_request_cleanup.py    | 18 +++++--
 .../source/gc/soft_deleted_entity_cleanup.py  | 49 +++++++++++--------
 metadata-ingestion/tests/unit/test_gc.py      | 28 +++++++++++
 3 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/gc/execution_request_cleanup.py b/metadata-ingestion/src/datahub/ingestion/source/gc/execution_request_cleanup.py
index 170a6ada3e336f..f9a00d7f009058 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/gc/execution_request_cleanup.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/gc/execution_request_cleanup.py
@@ -141,7 +141,9 @@ def _scroll_execution_requests(
                 break
             if self.report.ergc_read_errors >= self.config.max_read_errors:
                 self.report.failure(
-                    f"ergc({self.instance_id}): too many read errors, aborting."
+                    title="Too many read errors, aborting",
+                    message="Too many read errors, aborting",
+                    context=str(self.instance_id),
                 )
                 break
             try:
@@ -158,8 +160,11 @@ def _scroll_execution_requests(
                     break
                 params["scrollId"] = document["scrollId"]
             except Exception as e:
-                logger.error(
-                    f"ergc({self.instance_id}): failed to fetch next batch of execution requests: {e}"
+                self.report.failure(
+                    title="Failed to fetch next batch of execution requests",
+                    message="Failed to fetch next batch of execution requests",
+                    context=str(self.instance_id),
+                    exc=e,
                 )
                 self.report.ergc_read_errors += 1
 
@@ -231,8 +236,11 @@ def _delete_entry(self, entry: CleanupRecord) -> None:
             self.graph.delete_entity(entry.urn, True)
         except Exception as e:
             self.report.ergc_delete_errors += 1
-            logger.error(
-                f"ergc({self.instance_id}): failed to delete ExecutionRequest {entry.request_id}: {e}"
+            self.report.failure(
+                title="Failed to delete ExecutionRequest",
+                message="Failed to delete ExecutionRequest",
+                context=str(self.instance_id),
+                exc=e,
             )
 
     def _reached_runtime_limit(self) -> bool:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py b/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
index 4c0355834f9b4f..cf810d05aa2ca1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
@@ -105,6 +105,8 @@ class SoftDeletedEntitiesReport(SourceReport):
     sample_hard_deleted_aspects_by_type: TopKDict[str, LossyList[str]] = field(
         default_factory=TopKDict
     )
+    runtime_limit_reached: bool = False
+    deletion_limit_reached: bool = False
 
 
 class SoftDeletedEntitiesCleanup:
@@ -163,6 +165,8 @@ def delete_entity(self, urn: str) -> None:
                 f"Dry run is on otherwise it would have deleted {urn} with hard deletion"
             )
             return
+        if self._deletion_limit_reached() or self._times_up():
+            return
         self._increment_removal_started_count()
         self.ctx.graph.delete_entity(urn=urn, hard=True)
         self.ctx.graph.delete_references_to_urn(
@@ -203,11 +207,10 @@ def _process_futures(self, futures: Dict[Future, str]) -> Dict[Future, str]:
         for future in done:
             self._print_report()
             if future.exception():
-                logger.error(
-                    f"Failed to delete entity {futures[future]}: {future.exception()}"
-                )
                 self.report.failure(
-                    f"Failed to delete entity {futures[future]}",
+                    title="Failed to delete entity",
+                    message="Failed to delete entity",
+                    context=futures[future],
                     exc=future.exception(),
                 )
             self.report.num_soft_deleted_entity_processed += 1
@@ -274,6 +277,26 @@ def _get_urns(self) -> Iterable[str]:
         )
         yield from self._get_soft_deleted_queries()
 
+    def _times_up(self) -> bool:
+        if (
+            self.config.runtime_limit_seconds
+            and time.time() - self.start_time > self.config.runtime_limit_seconds
+        ):
+            with self._report_lock:
+                self.report.runtime_limit_reached = True
+            return True
+        return False
+
+    def _deletion_limit_reached(self) -> bool:
+        if (
+            self.config.limit_entities_delete
+            and self.report.num_hard_deleted > self.config.limit_entities_delete
+        ):
+            with self._report_lock:
+                self.report.deletion_limit_reached = True
+            return True
+        return False
+
     def cleanup_soft_deleted_entities(self) -> None:
         if not self.config.enabled:
             return
@@ -285,24 +308,8 @@ def cleanup_soft_deleted_entities(self) -> None:
                 self._print_report()
                 while len(futures) >= self.config.futures_max_at_time:
                     futures = self._process_futures(futures)
-                if (
-                    self.config.limit_entities_delete
-                    and self.report.num_hard_deleted > self.config.limit_entities_delete
-                ):
-                    logger.info(
-                        f"Limit of {self.config.limit_entities_delete} entities reached. Stopped adding more."
-                    )
+                if self._deletion_limit_reached() or self._times_up():
                     break
-                if (
-                    self.config.runtime_limit_seconds
-                    and time.time() - self.start_time
-                    > self.config.runtime_limit_seconds
-                ):
-                    logger.info(
-                        f"Runtime limit of {self.config.runtime_limit_seconds} seconds reached. Not submitting more futures."
-                    )
-                    break
-
                 future = executor.submit(self.delete_soft_deleted_entity, urn)
                 futures[future] = urn
 
diff --git a/metadata-ingestion/tests/unit/test_gc.py b/metadata-ingestion/tests/unit/test_gc.py
index 8f00d5e064db85..fde9a3f2e0cf03 100644
--- a/metadata-ingestion/tests/unit/test_gc.py
+++ b/metadata-ingestion/tests/unit/test_gc.py
@@ -9,6 +9,34 @@
     DataProcessCleanupConfig,
     DataProcessCleanupReport,
 )
+from datahub.ingestion.source.gc.soft_deleted_entity_cleanup import (
+    SoftDeletedEntitiesCleanup,
+    SoftDeletedEntitiesCleanupConfig,
+    SoftDeletedEntitiesReport,
+)
+
+
+class TestSoftDeletedEntitiesCleanup(unittest.TestCase):
+    def setUp(self):
+        self.ctx = PipelineContext(run_id="test_run")
+        self.ctx.graph = MagicMock()
+        self.config = SoftDeletedEntitiesCleanupConfig()
+        self.report = SoftDeletedEntitiesReport()
+        self.cleanup = SoftDeletedEntitiesCleanup(
+            self.ctx, self.config, self.report, dry_run=True
+        )
+
+    def test_update_report(self):
+        self.cleanup._update_report(
+            urn="urn:li:dataset:1",
+            entity_type="dataset",
+        )
+        self.assertEqual(1, self.report.num_hard_deleted)
+        self.assertEqual(1, self.report.num_hard_deleted_by_type["dataset"])
+
+    def test_increment_retained_count(self):
+        self.cleanup._increment_retained_count()
+        self.assertEqual(1, self.report.num_soft_deleted_retained_due_to_age)
 
 
 class TestDataProcessCleanup(unittest.TestCase):

From fba09966f36d86e33b19ee423706e0f79ee2ad7e Mon Sep 17 00:00:00 2001
From: Mayuri Nehate <33225191+mayurinehate@users.noreply.github.com>
Date: Sat, 4 Jan 2025 00:19:42 +0530
Subject: [PATCH 020/249] fix(ingest): consistent fingerprint for sql parsing
 aggregator (#12239)

---
 .../source/snowflake/snowflake_queries.py     | 10 ++--
 .../ingestion/source/usage/usage_common.py    | 16 ++++++-
 .../sql_parsing/sql_parsing_aggregator.py     |  4 +-
 .../test_add_known_query_lineage.json         | 16 +++----
 .../aggregator_goldens/test_table_rename.json | 14 +++---
 .../test_table_rename_with_temp.json          | 12 ++---
 .../aggregator_goldens/test_table_swap.json   | 46 +++++++++----------
 .../test_table_swap_with_temp.json            | 24 +++++-----
 .../unit/sql_parsing/test_sqlglot_utils.py    | 12 +++++
 .../tests/unit/test_usage_common.py           |  6 +++
 10 files changed, 96 insertions(+), 64 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_queries.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_queries.py
index 36825dc33fe7dc..b82734cbbe84ea 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_queries.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_queries.py
@@ -61,6 +61,7 @@
     ColumnRef,
     DownstreamColumnRef,
 )
+from datahub.sql_parsing.sqlglot_utils import get_query_fingerprint
 from datahub.utilities.file_backed_collections import ConnectionWrapper, FileBackedList
 from datahub.utilities.perf_timer import PerfTimer
 
@@ -475,10 +476,11 @@ def _parse_audit_log_row(
 
         entry = PreparsedQuery(
             # Despite having Snowflake's fingerprints available, our own fingerprinting logic does a better
-            # job at eliminating redundant / repetitive queries. As such, we don't include the fingerprint
-            # here so that the aggregator auto-generates one.
-            # query_id=res["query_fingerprint"],
-            query_id=None,
+            # job at eliminating redundant / repetitive queries. As such, we include the fast fingerprint
+            # here
+            query_id=get_query_fingerprint(
+                res["query_text"], self.identifiers.platform, fast=True
+            ),
             query_text=res["query_text"],
             upstreams=upstreams,
             downstream=downstream,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/usage/usage_common.py b/metadata-ingestion/src/datahub/ingestion/source/usage/usage_common.py
index 2b7aae8330905e..95c2345232a1ee 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/usage/usage_common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/usage/usage_common.py
@@ -54,6 +54,20 @@ def default_user_urn_builder(email: str) -> str:
     return builder.make_user_urn(email.split("@")[0])
 
 
+def extract_user_email(user: str) -> Optional[str]:
+    """Extracts user email from user input
+
+    >>> extract_user_email('urn:li:corpuser:abc@xyz.com')
+    'abc@xyz.com'
+    >>> extract_user_email('urn:li:corpuser:abc')
+    >>> extract_user_email('abc@xyz.com')
+    'abc@xyz.com'
+    """
+    if user.startswith(("urn:li:corpuser:", "urn:li:corpGroup:")):
+        user = user.split(":")[-1]
+    return user if "@" in user else None
+
+
 def make_usage_workunit(
     bucket_start_time: datetime,
     resource: ResourceType,
@@ -104,7 +118,7 @@ def make_usage_workunit(
             DatasetUserUsageCountsClass(
                 user=user_urn_builder(user),
                 count=count,
-                userEmail=user if "@" in user else None,
+                userEmail=extract_user_email(user),
             )
             for user, count in user_freq
         ],
diff --git a/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py b/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py
index f81eb291e89e1d..a4a49f77882168 100644
--- a/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py
+++ b/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py
@@ -198,7 +198,7 @@ def id(self) -> str:
 
 @dataclasses.dataclass
 class PreparsedQuery:
-    # If not provided, we will generate one using the fast fingerprint generator.
+    # If not provided, we will generate one using the fingerprint generator.
     query_id: Optional[QueryId]
 
     query_text: str
@@ -622,7 +622,6 @@ def add_known_query_lineage(
             query_fingerprint = get_query_fingerprint(
                 known_query_lineage.query_text,
                 platform=self.platform.platform_name,
-                fast=True,
             )
         formatted_query = self._maybe_format_query(known_query_lineage.query_text)
 
@@ -848,7 +847,6 @@ def add_preparsed_query(
             query_fingerprint = get_query_fingerprint(
                 parsed.query_text,
                 platform=self.platform.platform_name,
-                fast=True,
             )
 
         # Format the query.
diff --git a/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_add_known_query_lineage.json b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_add_known_query_lineage.json
index 0d8822736c95eb..31d7419b2c8cca 100644
--- a/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_add_known_query_lineage.json
+++ b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_add_known_query_lineage.json
@@ -18,7 +18,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.bar,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:6ed1d12fbf2ccc8138ceec08cc35b981030d6d004bfad9743c7afd84260fa63f"
+                    "query": "urn:li:query:02e2ec36678bea2a8c4c855fed5255d087cfeb2710d326e95fd9b48a9c4fc0ae"
                 }
             ],
             "fineGrainedLineages": [
@@ -32,7 +32,7 @@
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.foo,PROD),a)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:6ed1d12fbf2ccc8138ceec08cc35b981030d6d004bfad9743c7afd84260fa63f"
+                    "query": "urn:li:query:02e2ec36678bea2a8c4c855fed5255d087cfeb2710d326e95fd9b48a9c4fc0ae"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -44,7 +44,7 @@
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.foo,PROD),b)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:6ed1d12fbf2ccc8138ceec08cc35b981030d6d004bfad9743c7afd84260fa63f"
+                    "query": "urn:li:query:02e2ec36678bea2a8c4c855fed5255d087cfeb2710d326e95fd9b48a9c4fc0ae"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -56,7 +56,7 @@
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.foo,PROD),c)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:6ed1d12fbf2ccc8138ceec08cc35b981030d6d004bfad9743c7afd84260fa63f"
+                    "query": "urn:li:query:02e2ec36678bea2a8c4c855fed5255d087cfeb2710d326e95fd9b48a9c4fc0ae"
                 }
             ]
         }
@@ -64,7 +64,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:6ed1d12fbf2ccc8138ceec08cc35b981030d6d004bfad9743c7afd84260fa63f",
+    "entityUrn": "urn:li:query:02e2ec36678bea2a8c4c855fed5255d087cfeb2710d326e95fd9b48a9c4fc0ae",
     "changeType": "UPSERT",
     "aspectName": "queryProperties",
     "aspect": {
@@ -87,7 +87,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:6ed1d12fbf2ccc8138ceec08cc35b981030d6d004bfad9743c7afd84260fa63f",
+    "entityUrn": "urn:li:query:02e2ec36678bea2a8c4c855fed5255d087cfeb2710d326e95fd9b48a9c4fc0ae",
     "changeType": "UPSERT",
     "aspectName": "querySubjects",
     "aspect": {
@@ -114,7 +114,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:6ed1d12fbf2ccc8138ceec08cc35b981030d6d004bfad9743c7afd84260fa63f",
+    "entityUrn": "urn:li:query:02e2ec36678bea2a8c4c855fed5255d087cfeb2710d326e95fd9b48a9c4fc0ae",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -137,7 +137,7 @@
             },
             "operationType": "INSERT",
             "customProperties": {
-                "query_urn": "urn:li:query:6ed1d12fbf2ccc8138ceec08cc35b981030d6d004bfad9743c7afd84260fa63f"
+                "query_urn": "urn:li:query:02e2ec36678bea2a8c4c855fed5255d087cfeb2710d326e95fd9b48a9c4fc0ae"
             },
             "lastUpdatedTimestamp": 20000
         }
diff --git a/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_rename.json b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_rename.json
index fd8475090f009e..e22947fd96ce45 100644
--- a/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_rename.json
+++ b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_rename.json
@@ -133,7 +133,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.foo_staging,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:88d742bcc0216d6ccb50c7430d1d97494d5dfcfa90160ffa123108844ad261e4"
+                    "query": "urn:li:query:07a307ad99d3c4a7e54d20c004a4f2d52496f3f5283b33013f80e6323700d97b"
                 }
             ],
             "fineGrainedLineages": [
@@ -147,7 +147,7 @@
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.foo,PROD),a)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:88d742bcc0216d6ccb50c7430d1d97494d5dfcfa90160ffa123108844ad261e4"
+                    "query": "urn:li:query:07a307ad99d3c4a7e54d20c004a4f2d52496f3f5283b33013f80e6323700d97b"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -159,7 +159,7 @@
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.foo,PROD),b)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:88d742bcc0216d6ccb50c7430d1d97494d5dfcfa90160ffa123108844ad261e4"
+                    "query": "urn:li:query:07a307ad99d3c4a7e54d20c004a4f2d52496f3f5283b33013f80e6323700d97b"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -171,7 +171,7 @@
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.foo,PROD),c)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:88d742bcc0216d6ccb50c7430d1d97494d5dfcfa90160ffa123108844ad261e4"
+                    "query": "urn:li:query:07a307ad99d3c4a7e54d20c004a4f2d52496f3f5283b33013f80e6323700d97b"
                 }
             ]
         }
@@ -179,7 +179,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:88d742bcc0216d6ccb50c7430d1d97494d5dfcfa90160ffa123108844ad261e4",
+    "entityUrn": "urn:li:query:07a307ad99d3c4a7e54d20c004a4f2d52496f3f5283b33013f80e6323700d97b",
     "changeType": "UPSERT",
     "aspectName": "queryProperties",
     "aspect": {
@@ -202,7 +202,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:88d742bcc0216d6ccb50c7430d1d97494d5dfcfa90160ffa123108844ad261e4",
+    "entityUrn": "urn:li:query:07a307ad99d3c4a7e54d20c004a4f2d52496f3f5283b33013f80e6323700d97b",
     "changeType": "UPSERT",
     "aspectName": "querySubjects",
     "aspect": {
@@ -229,7 +229,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:88d742bcc0216d6ccb50c7430d1d97494d5dfcfa90160ffa123108844ad261e4",
+    "entityUrn": "urn:li:query:07a307ad99d3c4a7e54d20c004a4f2d52496f3f5283b33013f80e6323700d97b",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
diff --git a/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_rename_with_temp.json b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_rename_with_temp.json
index a4ac349c3c455c..b657b46476cbbd 100644
--- a/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_rename_with_temp.json
+++ b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_rename_with_temp.json
@@ -133,7 +133,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.foo_dep,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:composite_2efc2a13ee673ccf7b195f8f2c0e4ba0570194d8200c3c20b1eb7e8ca4fb4332"
+                    "query": "urn:li:query:composite_c035c933cc4ce5cf8a111bcaf419b8e66a1e41853bb154ff9aaa24cd00ecf51e"
                 }
             ],
             "fineGrainedLineages": [
@@ -147,7 +147,7 @@
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.foo,PROD),a)"
                     ],
                     "confidenceScore": 0.2,
-                    "query": "urn:li:query:composite_2efc2a13ee673ccf7b195f8f2c0e4ba0570194d8200c3c20b1eb7e8ca4fb4332"
+                    "query": "urn:li:query:composite_c035c933cc4ce5cf8a111bcaf419b8e66a1e41853bb154ff9aaa24cd00ecf51e"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -159,7 +159,7 @@
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.foo,PROD),b)"
                     ],
                     "confidenceScore": 0.2,
-                    "query": "urn:li:query:composite_2efc2a13ee673ccf7b195f8f2c0e4ba0570194d8200c3c20b1eb7e8ca4fb4332"
+                    "query": "urn:li:query:composite_c035c933cc4ce5cf8a111bcaf419b8e66a1e41853bb154ff9aaa24cd00ecf51e"
                 }
             ]
         }
@@ -167,7 +167,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:composite_2efc2a13ee673ccf7b195f8f2c0e4ba0570194d8200c3c20b1eb7e8ca4fb4332",
+    "entityUrn": "urn:li:query:composite_c035c933cc4ce5cf8a111bcaf419b8e66a1e41853bb154ff9aaa24cd00ecf51e",
     "changeType": "UPSERT",
     "aspectName": "queryProperties",
     "aspect": {
@@ -190,7 +190,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:composite_2efc2a13ee673ccf7b195f8f2c0e4ba0570194d8200c3c20b1eb7e8ca4fb4332",
+    "entityUrn": "urn:li:query:composite_c035c933cc4ce5cf8a111bcaf419b8e66a1e41853bb154ff9aaa24cd00ecf51e",
     "changeType": "UPSERT",
     "aspectName": "querySubjects",
     "aspect": {
@@ -217,7 +217,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:composite_2efc2a13ee673ccf7b195f8f2c0e4ba0570194d8200c3c20b1eb7e8ca4fb4332",
+    "entityUrn": "urn:li:query:composite_c035c933cc4ce5cf8a111bcaf419b8e66a1e41853bb154ff9aaa24cd00ecf51e",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
diff --git a/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_swap.json b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_swap.json
index d9d46a4b14a146..09a98a81f2602e 100644
--- a/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_swap.json
+++ b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_swap.json
@@ -133,7 +133,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,dev.public.person_info_swap,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:b256c8cc8f386b209ef8da55485d46c3fbd471b942f804d370e24350b3087405"
+                    "query": "urn:li:query:1ed34195f33514203e8359ca22772e03a3588b669e0db00b1681e1a8d0862300"
                 }
             ],
             "fineGrainedLineages": [
@@ -147,7 +147,7 @@
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,dev.public.person_info,PROD),a)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:b256c8cc8f386b209ef8da55485d46c3fbd471b942f804d370e24350b3087405"
+                    "query": "urn:li:query:1ed34195f33514203e8359ca22772e03a3588b669e0db00b1681e1a8d0862300"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -159,7 +159,7 @@
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,dev.public.person_info,PROD),b)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:b256c8cc8f386b209ef8da55485d46c3fbd471b942f804d370e24350b3087405"
+                    "query": "urn:li:query:1ed34195f33514203e8359ca22772e03a3588b669e0db00b1681e1a8d0862300"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -171,7 +171,7 @@
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,dev.public.person_info,PROD),c)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:b256c8cc8f386b209ef8da55485d46c3fbd471b942f804d370e24350b3087405"
+                    "query": "urn:li:query:1ed34195f33514203e8359ca22772e03a3588b669e0db00b1681e1a8d0862300"
                 }
             ]
         }
@@ -179,7 +179,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:b256c8cc8f386b209ef8da55485d46c3fbd471b942f804d370e24350b3087405",
+    "entityUrn": "urn:li:query:1ed34195f33514203e8359ca22772e03a3588b669e0db00b1681e1a8d0862300",
     "changeType": "UPSERT",
     "aspectName": "queryProperties",
     "aspect": {
@@ -202,7 +202,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:b256c8cc8f386b209ef8da55485d46c3fbd471b942f804d370e24350b3087405",
+    "entityUrn": "urn:li:query:1ed34195f33514203e8359ca22772e03a3588b669e0db00b1681e1a8d0862300",
     "changeType": "UPSERT",
     "aspectName": "querySubjects",
     "aspect": {
@@ -229,7 +229,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:b256c8cc8f386b209ef8da55485d46c3fbd471b942f804d370e24350b3087405",
+    "entityUrn": "urn:li:query:1ed34195f33514203e8359ca22772e03a3588b669e0db00b1681e1a8d0862300",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -257,7 +257,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,dev.public.person_info_swap,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:6f71602f39d01a39b3f8bd411c74c5ac08dc4b90bc3d49b257089acb19fa8559"
+                    "query": "urn:li:query:76f0a8e1da90c4d33b5741c6e1014251ce2d1650ba0f58ab136ebaf1bb64dc8c"
                 }
             ]
         }
@@ -265,7 +265,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:6f71602f39d01a39b3f8bd411c74c5ac08dc4b90bc3d49b257089acb19fa8559",
+    "entityUrn": "urn:li:query:76f0a8e1da90c4d33b5741c6e1014251ce2d1650ba0f58ab136ebaf1bb64dc8c",
     "changeType": "UPSERT",
     "aspectName": "queryProperties",
     "aspect": {
@@ -288,7 +288,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:6f71602f39d01a39b3f8bd411c74c5ac08dc4b90bc3d49b257089acb19fa8559",
+    "entityUrn": "urn:li:query:76f0a8e1da90c4d33b5741c6e1014251ce2d1650ba0f58ab136ebaf1bb64dc8c",
     "changeType": "UPSERT",
     "aspectName": "querySubjects",
     "aspect": {
@@ -306,7 +306,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:6f71602f39d01a39b3f8bd411c74c5ac08dc4b90bc3d49b257089acb19fa8559",
+    "entityUrn": "urn:li:query:76f0a8e1da90c4d33b5741c6e1014251ce2d1650ba0f58ab136ebaf1bb64dc8c",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -334,7 +334,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,dev.public.person_info_dep,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:4b1fad909083e1ed5c47c146bd01247ed4d6295d175c34f9065b8fc6000fc7ae"
+                    "query": "urn:li:query:37c14a3bbb67360d19d1666fa4e11b67ef81926e1e2bcd46b87ea239d27a549d"
                 }
             ]
         }
@@ -342,7 +342,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:4b1fad909083e1ed5c47c146bd01247ed4d6295d175c34f9065b8fc6000fc7ae",
+    "entityUrn": "urn:li:query:37c14a3bbb67360d19d1666fa4e11b67ef81926e1e2bcd46b87ea239d27a549d",
     "changeType": "UPSERT",
     "aspectName": "queryProperties",
     "aspect": {
@@ -365,7 +365,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:4b1fad909083e1ed5c47c146bd01247ed4d6295d175c34f9065b8fc6000fc7ae",
+    "entityUrn": "urn:li:query:37c14a3bbb67360d19d1666fa4e11b67ef81926e1e2bcd46b87ea239d27a549d",
     "changeType": "UPSERT",
     "aspectName": "querySubjects",
     "aspect": {
@@ -383,7 +383,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:4b1fad909083e1ed5c47c146bd01247ed4d6295d175c34f9065b8fc6000fc7ae",
+    "entityUrn": "urn:li:query:37c14a3bbb67360d19d1666fa4e11b67ef81926e1e2bcd46b87ea239d27a549d",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -411,7 +411,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,dev.public.person_info,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:3886d427c84692923797048da6d3991693e89ce44e10d1917c12e8b6fd493904"
+                    "query": "urn:li:query:f4eb748a53291bbea59e080f6d415b08dfd7003d0b7c3d538d02f4e404b30943"
                 },
                 {
                     "auditStamp": {
@@ -424,7 +424,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,dev.public.person_info_incremental,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:481d0392ffeffdafd198d94e0a9f778dd722b60daa47083a32800b99ea21f86f"
+                    "query": "urn:li:query:29935c31db1f06edf50d62a59d2874a86c51570256ab3b3102984439c03be1f2"
                 }
             ]
         }
@@ -432,7 +432,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:3886d427c84692923797048da6d3991693e89ce44e10d1917c12e8b6fd493904",
+    "entityUrn": "urn:li:query:f4eb748a53291bbea59e080f6d415b08dfd7003d0b7c3d538d02f4e404b30943",
     "changeType": "UPSERT",
     "aspectName": "queryProperties",
     "aspect": {
@@ -455,7 +455,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:3886d427c84692923797048da6d3991693e89ce44e10d1917c12e8b6fd493904",
+    "entityUrn": "urn:li:query:f4eb748a53291bbea59e080f6d415b08dfd7003d0b7c3d538d02f4e404b30943",
     "changeType": "UPSERT",
     "aspectName": "querySubjects",
     "aspect": {
@@ -473,7 +473,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:3886d427c84692923797048da6d3991693e89ce44e10d1917c12e8b6fd493904",
+    "entityUrn": "urn:li:query:f4eb748a53291bbea59e080f6d415b08dfd7003d0b7c3d538d02f4e404b30943",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -484,7 +484,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:481d0392ffeffdafd198d94e0a9f778dd722b60daa47083a32800b99ea21f86f",
+    "entityUrn": "urn:li:query:29935c31db1f06edf50d62a59d2874a86c51570256ab3b3102984439c03be1f2",
     "changeType": "UPSERT",
     "aspectName": "queryProperties",
     "aspect": {
@@ -507,7 +507,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:481d0392ffeffdafd198d94e0a9f778dd722b60daa47083a32800b99ea21f86f",
+    "entityUrn": "urn:li:query:29935c31db1f06edf50d62a59d2874a86c51570256ab3b3102984439c03be1f2",
     "changeType": "UPSERT",
     "aspectName": "querySubjects",
     "aspect": {
@@ -525,7 +525,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:481d0392ffeffdafd198d94e0a9f778dd722b60daa47083a32800b99ea21f86f",
+    "entityUrn": "urn:li:query:29935c31db1f06edf50d62a59d2874a86c51570256ab3b3102984439c03be1f2",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
diff --git a/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_swap_with_temp.json b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_swap_with_temp.json
index b4eaf76a149337..69bcd8eb10e951 100644
--- a/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_swap_with_temp.json
+++ b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_table_swap_with_temp.json
@@ -133,7 +133,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,dev.public.person_info,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:composite_9e36ef19163461d35b618fd1eea2a3f6a5d10a23a979a6d5ef688b31f277abb3"
+                    "query": "urn:li:query:composite_a10e266957d5007837642526d09f058ca461e42e2159ff45c328ebd069c112df"
                 },
                 {
                     "auditStamp": {
@@ -146,7 +146,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,dev.public.person_info_dep,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:composite_9e36ef19163461d35b618fd1eea2a3f6a5d10a23a979a6d5ef688b31f277abb3"
+                    "query": "urn:li:query:composite_a10e266957d5007837642526d09f058ca461e42e2159ff45c328ebd069c112df"
                 }
             ],
             "fineGrainedLineages": [
@@ -161,7 +161,7 @@
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,dev.public.person_info,PROD),a)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:composite_9e36ef19163461d35b618fd1eea2a3f6a5d10a23a979a6d5ef688b31f277abb3"
+                    "query": "urn:li:query:composite_a10e266957d5007837642526d09f058ca461e42e2159ff45c328ebd069c112df"
                 }
             ]
         }
@@ -169,7 +169,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:composite_9e36ef19163461d35b618fd1eea2a3f6a5d10a23a979a6d5ef688b31f277abb3",
+    "entityUrn": "urn:li:query:composite_a10e266957d5007837642526d09f058ca461e42e2159ff45c328ebd069c112df",
     "changeType": "UPSERT",
     "aspectName": "queryProperties",
     "aspect": {
@@ -192,7 +192,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:composite_9e36ef19163461d35b618fd1eea2a3f6a5d10a23a979a6d5ef688b31f277abb3",
+    "entityUrn": "urn:li:query:composite_a10e266957d5007837642526d09f058ca461e42e2159ff45c328ebd069c112df",
     "changeType": "UPSERT",
     "aspectName": "querySubjects",
     "aspect": {
@@ -219,7 +219,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:composite_9e36ef19163461d35b618fd1eea2a3f6a5d10a23a979a6d5ef688b31f277abb3",
+    "entityUrn": "urn:li:query:composite_a10e266957d5007837642526d09f058ca461e42e2159ff45c328ebd069c112df",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -247,7 +247,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,dev.public.person_info,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:composite_49daa72ac1d22734879a6bed1224daa7f8c1293750d6d7b8a24a0aa0e9f74d80"
+                    "query": "urn:li:query:composite_5d8360cfc2f57f023d9945749848ad52227674fefc9fec568e7fbb1787cfd544"
                 },
                 {
                     "auditStamp": {
@@ -260,7 +260,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,dev.public.person_info_dep,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:composite_49daa72ac1d22734879a6bed1224daa7f8c1293750d6d7b8a24a0aa0e9f74d80"
+                    "query": "urn:li:query:composite_5d8360cfc2f57f023d9945749848ad52227674fefc9fec568e7fbb1787cfd544"
                 }
             ],
             "fineGrainedLineages": [
@@ -275,7 +275,7 @@
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,dev.public.person_info_backup,PROD),a)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:composite_49daa72ac1d22734879a6bed1224daa7f8c1293750d6d7b8a24a0aa0e9f74d80"
+                    "query": "urn:li:query:composite_5d8360cfc2f57f023d9945749848ad52227674fefc9fec568e7fbb1787cfd544"
                 }
             ]
         }
@@ -283,7 +283,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:composite_49daa72ac1d22734879a6bed1224daa7f8c1293750d6d7b8a24a0aa0e9f74d80",
+    "entityUrn": "urn:li:query:composite_5d8360cfc2f57f023d9945749848ad52227674fefc9fec568e7fbb1787cfd544",
     "changeType": "UPSERT",
     "aspectName": "queryProperties",
     "aspect": {
@@ -306,7 +306,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:composite_49daa72ac1d22734879a6bed1224daa7f8c1293750d6d7b8a24a0aa0e9f74d80",
+    "entityUrn": "urn:li:query:composite_5d8360cfc2f57f023d9945749848ad52227674fefc9fec568e7fbb1787cfd544",
     "changeType": "UPSERT",
     "aspectName": "querySubjects",
     "aspect": {
@@ -330,7 +330,7 @@
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:composite_49daa72ac1d22734879a6bed1224daa7f8c1293750d6d7b8a24a0aa0e9f74d80",
+    "entityUrn": "urn:li:query:composite_5d8360cfc2f57f023d9945749848ad52227674fefc9fec568e7fbb1787cfd544",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
diff --git a/metadata-ingestion/tests/unit/sql_parsing/test_sqlglot_utils.py b/metadata-ingestion/tests/unit/sql_parsing/test_sqlglot_utils.py
index dbe24ade6944f6..c3c3a4a15d915b 100644
--- a/metadata-ingestion/tests/unit/sql_parsing/test_sqlglot_utils.py
+++ b/metadata-ingestion/tests/unit/sql_parsing/test_sqlglot_utils.py
@@ -186,3 +186,15 @@ def test_query_fingerprint():
     assert get_query_fingerprint(
         "select 1 + 1", platform="postgres"
     ) != get_query_fingerprint("select 2", platform="postgres")
+
+
+def test_redshift_query_fingerprint():
+    query1 = "insert into insert_into_table (select * from base_table);"
+    query2 = "INSERT INTO insert_into_table (SELECT * FROM base_table)"
+
+    assert get_query_fingerprint(query1, "redshift") == get_query_fingerprint(
+        query2, "redshift"
+    )
+    assert get_query_fingerprint(query1, "redshift", True) != get_query_fingerprint(
+        query2, "redshift", True
+    )
diff --git a/metadata-ingestion/tests/unit/test_usage_common.py b/metadata-ingestion/tests/unit/test_usage_common.py
index e01f0ea77df837..bd6d194835dd96 100644
--- a/metadata-ingestion/tests/unit/test_usage_common.py
+++ b/metadata-ingestion/tests/unit/test_usage_common.py
@@ -5,6 +5,7 @@
 from freezegun import freeze_time
 from pydantic import ValidationError
 
+import datahub.ingestion.source.usage.usage_common
 from datahub.configuration.common import AllowDenyPattern
 from datahub.configuration.time_window_config import BucketDuration, get_time_bucket
 from datahub.emitter.mce_builder import make_dataset_urn_with_platform_instance
@@ -28,6 +29,7 @@
     UserUsageCountsClass,
     WindowDurationClass,
 )
+from datahub.testing.doctest import assert_doctest
 
 _TestTableRef = str
 
@@ -373,3 +375,7 @@ def test_convert_usage_aggregation_class():
             eventGranularity=TimeWindowSizeClass(unit=CalendarIntervalClass.MONTH),
         ),
     )
+
+
+def test_extract_user_email():
+    assert_doctest(datahub.ingestion.source.usage.usage_common)

From d2b67cab6d1fa2e30accac59f833bb6366307352 Mon Sep 17 00:00:00 2001
From: Gabe Lyons <gabe.lyons@acryl.io>
Date: Fri, 3 Jan 2025 11:57:34 -0800
Subject: [PATCH 021/249] docs(queries_v2): set use_queries_v2 to true in
 snowflake_recipe.yml (#12269)

---
 metadata-ingestion/docs/sources/snowflake/snowflake_recipe.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/metadata-ingestion/docs/sources/snowflake/snowflake_recipe.yml b/metadata-ingestion/docs/sources/snowflake/snowflake_recipe.yml
index 7e8dbcff88e1c0..3226f23c963ddf 100644
--- a/metadata-ingestion/docs/sources/snowflake/snowflake_recipe.yml
+++ b/metadata-ingestion/docs/sources/snowflake/snowflake_recipe.yml
@@ -4,6 +4,9 @@ source:
     # This option is recommended to be used to ingest all lineage
     ignore_start_time_lineage: true
 
+    # This flag tells the snowflake ingestion to use the more advanced query parsing. This will become the default eventually.
+    use_queries_v2: true
+
     # Coordinates
     account_id: "abc48144"
     warehouse: "COMPUTE_WH"

From 8093882d45c821090ec58c9c499517158588c1b9 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Sun, 5 Jan 2025 12:40:58 +0530
Subject: [PATCH 022/249] feat(ingest/gc): truncate query usage statistics
 aspect (#12268)

---
 .../src/datahub/ingestion/source/gc/datahub_gc.py              | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/gc/datahub_gc.py b/metadata-ingestion/src/datahub/ingestion/source/gc/datahub_gc.py
index 168b787b85e8be..443368e6d8b4fb 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/gc/datahub_gc.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/gc/datahub_gc.py
@@ -188,6 +188,9 @@ def truncate_indices(self) -> None:
         self._truncate_timeseries_helper(
             aspect_name="dashboardUsageStatistics", entity_type="dashboard"
         )
+        self._truncate_timeseries_helper(
+            aspect_name="queryusagestatistics", entity_type="query"
+        )
 
     def _truncate_timeseries_helper(self, aspect_name: str, entity_type: str) -> None:
         self._truncate_timeseries_with_watch_optional(

From b86bbf726275be256331c01707704626035f3067 Mon Sep 17 00:00:00 2001
From: Mayuri Nehate <33225191+mayurinehate@users.noreply.github.com>
Date: Mon, 6 Jan 2025 12:14:59 +0530
Subject: [PATCH 023/249] fix(ingest/tableau): retry on auth error for special
 case (#12264)

---
 .../ingestion/source/tableau/tableau.py       | 68 ++++++++++++++-----
 .../tableau/test_tableau_ingest.py            | 64 ++++++++++++++++-
 2 files changed, 112 insertions(+), 20 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
index 008216fea89508..d149402741e82f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
@@ -2,9 +2,9 @@
 import logging
 import re
 import time
-from collections import OrderedDict
-from dataclasses import dataclass
-from datetime import datetime
+from collections import OrderedDict, defaultdict
+from dataclasses import dataclass, field as dataclass_field
+from datetime import datetime, timedelta, timezone
 from functools import lru_cache
 from typing import (
     Any,
@@ -196,6 +196,11 @@
     504,  # Gateway Timeout
 ]
 
+# From experience, this expiry time typically ranges from 50 minutes
+# to 2 hours but might as well be configurable. We will allow upto
+# 10 minutes of such expiry time
+REGULAR_AUTH_EXPIRY_PERIOD = timedelta(minutes=10)
+
 logger: logging.Logger = logging.getLogger(__name__)
 
 # Replace / with |
@@ -637,6 +642,7 @@ class SiteIdContentUrl:
     site_content_url: str
 
 
+@dataclass
 class TableauSourceReport(StaleEntityRemovalSourceReport):
     get_all_datasources_query_failed: bool = False
     num_get_datasource_query_failures: int = 0
@@ -653,7 +659,14 @@ class TableauSourceReport(StaleEntityRemovalSourceReport):
     num_upstream_table_lineage_failed_parse_sql: int = 0
     num_upstream_fine_grained_lineage_failed_parse_sql: int = 0
     num_hidden_assets_skipped: int = 0
-    logged_in_user: List[UserInfo] = []
+    logged_in_user: List[UserInfo] = dataclass_field(default_factory=list)
+    last_authenticated_at: Optional[datetime] = None
+
+    num_expected_tableau_metadata_queries: int = 0
+    num_actual_tableau_metadata_queries: int = 0
+    tableau_server_error_stats: Dict[str, int] = dataclass_field(
+        default_factory=(lambda: defaultdict(int))
+    )
 
 
 def report_user_role(report: TableauSourceReport, server: Server) -> None:
@@ -724,6 +737,7 @@ def _authenticate(self, site_content_url: str) -> None:
         try:
             logger.info(f"Authenticated to Tableau site: '{site_content_url}'")
             self.server = self.config.make_tableau_client(site_content_url)
+            self.report.last_authenticated_at = datetime.now(timezone.utc)
             report_user_role(report=self.report, server=self.server)
         # Note that we're not catching ConfigurationError, since we want that to throw.
         except ValueError as e:
@@ -807,10 +821,13 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                 site_source = TableauSiteSource(
                     config=self.config,
                     ctx=self.ctx,
-                    site=site
-                    if site
-                    else SiteIdContentUrl(
-                        site_id=self.server.site_id, site_content_url=self.config.site
+                    site=(
+                        site
+                        if site
+                        else SiteIdContentUrl(
+                            site_id=self.server.site_id,
+                            site_content_url=self.config.site,
+                        )
                     ),
                     report=self.report,
                     server=self.server,
@@ -925,6 +942,7 @@ def _re_authenticate(self) -> None:
         # Sign-in again may not be enough because Tableau sometimes caches invalid sessions
         # so we need to recreate the Tableau Server object
         self.server = self.config.make_tableau_client(self.site_content_url)
+        self.report.last_authenticated_at = datetime.now(timezone.utc)
 
     def _populate_usage_stat_registry(self) -> None:
         if self.server is None:
@@ -1190,6 +1208,7 @@ def get_connection_object_page(
         )
         try:
             assert self.server is not None
+            self.report.num_actual_tableau_metadata_queries += 1
             query_data = query_metadata_cursor_based_pagination(
                 server=self.server,
                 main_query=query,
@@ -1199,25 +1218,36 @@ def get_connection_object_page(
                 qry_filter=query_filter,
             )
 
-        except REAUTHENTICATE_ERRORS:
-            if not retry_on_auth_error:
+        except REAUTHENTICATE_ERRORS as e:
+            self.report.tableau_server_error_stats[e.__class__.__name__] += 1
+            if not retry_on_auth_error or retries_remaining <= 0:
                 raise
 
-            # If ingestion has been running for over 2 hours, the Tableau
-            # temporary credentials will expire. If this happens, this exception
-            # will be thrown, and we need to re-authenticate and retry.
-            self._re_authenticate()
+            # We have been getting some irregular authorization errors like below well before the expected expiry time
+            # - within few seconds of initial authentication . We'll retry without re-auth for such cases.
+            # <class 'tableauserverclient.server.endpoint.exceptions.NonXMLResponseError'>:
+            # b'{"timestamp":"xxx","status":401,"error":"Unauthorized","path":"/relationship-service-war/graphql"}'
+            if self.report.last_authenticated_at and (
+                datetime.now(timezone.utc) - self.report.last_authenticated_at
+                > REGULAR_AUTH_EXPIRY_PERIOD
+            ):
+                # If ingestion has been running for over 2 hours, the Tableau
+                # temporary credentials will expire. If this happens, this exception
+                # will be thrown, and we need to re-authenticate and retry.
+                self._re_authenticate()
+
             return self.get_connection_object_page(
                 query=query,
                 connection_type=connection_type,
                 query_filter=query_filter,
                 fetch_size=fetch_size,
                 current_cursor=current_cursor,
-                retry_on_auth_error=False,
+                retry_on_auth_error=True,
                 retries_remaining=retries_remaining - 1,
             )
 
         except InternalServerError as ise:
+            self.report.tableau_server_error_stats[InternalServerError.__name__] += 1
             # In some cases Tableau Server returns 504 error, which is a timeout error, so it worths to retry.
             # Extended with other retryable errors.
             if ise.code in RETRIABLE_ERROR_CODES:
@@ -1230,13 +1260,14 @@ def get_connection_object_page(
                     query_filter=query_filter,
                     fetch_size=fetch_size,
                     current_cursor=current_cursor,
-                    retry_on_auth_error=False,
+                    retry_on_auth_error=True,
                     retries_remaining=retries_remaining - 1,
                 )
             else:
                 raise ise
 
         except OSError:
+            self.report.tableau_server_error_stats[OSError.__name__] += 1
             # In tableauseverclient 0.26 (which was yanked and released in 0.28 on 2023-10-04),
             # the request logic was changed to use threads.
             # https://github.com/tableau/server-client-python/commit/307d8a20a30f32c1ce615cca7c6a78b9b9bff081
@@ -1251,7 +1282,7 @@ def get_connection_object_page(
                 query_filter=query_filter,
                 fetch_size=fetch_size,
                 current_cursor=current_cursor,
-                retry_on_auth_error=False,
+                retry_on_auth_error=True,
                 retries_remaining=retries_remaining - 1,
             )
 
@@ -1339,7 +1370,7 @@ def get_connection_object_page(
                         query_filter=query_filter,
                         fetch_size=fetch_size,
                         current_cursor=current_cursor,
-                        retry_on_auth_error=False,
+                        retry_on_auth_error=True,
                         retries_remaining=retries_remaining,
                     )
                 raise RuntimeError(f"Query {connection_type} error: {errors}")
@@ -1377,6 +1408,7 @@ def get_connection_objects(
             while has_next_page:
                 filter_: str = make_filter(filter_page)
 
+                self.report.num_expected_tableau_metadata_queries += 1
                 (
                     connection_objects,
                     current_cursor,
diff --git a/metadata-ingestion/tests/integration/tableau/test_tableau_ingest.py b/metadata-ingestion/tests/integration/tableau/test_tableau_ingest.py
index 71e5ad10c2fc5e..d7868038a40aa1 100644
--- a/metadata-ingestion/tests/integration/tableau/test_tableau_ingest.py
+++ b/metadata-ingestion/tests/integration/tableau/test_tableau_ingest.py
@@ -1,6 +1,6 @@
 import json
 import pathlib
-from typing import Any, Dict, List, cast
+from typing import Any, Dict, List, Union, cast
 from unittest import mock
 
 import pytest
@@ -13,10 +13,15 @@
     GroupItem,
     ProjectItem,
     SiteItem,
+    UserItem,
     ViewItem,
     WorkbookItem,
 )
 from tableauserverclient.models.reference_item import ResourceReference
+from tableauserverclient.server.endpoint.exceptions import (
+    NonXMLResponseError,
+    TableauError,
+)
 
 from datahub.emitter.mce_builder import DEFAULT_ENV, make_schema_field_urn
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
@@ -270,7 +275,7 @@ def side_effect_site_get_by_id(id, *arg, **kwargs):
 
 
 def mock_sdk_client(
-    side_effect_query_metadata_response: List[dict],
+    side_effect_query_metadata_response: List[Union[dict, TableauError]],
     datasources_side_effect: List[dict],
     sign_out_side_effect: List[dict],
 ) -> mock.MagicMock:
@@ -1312,6 +1317,61 @@ def test_permission_warning(pytestconfig, tmp_path, mock_datahub_graph):
             )
 
 
+@freeze_time(FROZEN_TIME)
+@pytest.mark.integration
+def test_retry_on_error(pytestconfig, tmp_path, mock_datahub_graph):
+    with mock.patch(
+        "datahub.ingestion.source.state_provider.datahub_ingestion_checkpointing_provider.DataHubGraph",
+        mock_datahub_graph,
+    ) as mock_checkpoint:
+        mock_checkpoint.return_value = mock_datahub_graph
+
+        with mock.patch("datahub.ingestion.source.tableau.tableau.Server") as mock_sdk:
+            mock_client = mock_sdk_client(
+                side_effect_query_metadata_response=[
+                    NonXMLResponseError(
+                        """{"timestamp":"xxx","status":401,"error":"Unauthorized","path":"/relationship-service-war/graphql"}"""
+                    ),
+                    *mock_data(),
+                ],
+                sign_out_side_effect=[{}],
+                datasources_side_effect=[{}],
+            )
+            mock_client.users = mock.Mock()
+            mock_client.users.get_by_id.side_effect = [
+                UserItem(
+                    name="name", site_role=UserItem.Roles.SiteAdministratorExplorer
+                )
+            ]
+            mock_sdk.return_value = mock_client
+
+            reporter = TableauSourceReport()
+            tableau_source = TableauSiteSource(
+                platform="tableau",
+                config=mock.MagicMock(),
+                ctx=mock.MagicMock(),
+                site=mock.MagicMock(spec=SiteItem, id="Site1", content_url="site1"),
+                server=mock_sdk.return_value,
+                report=reporter,
+            )
+
+            tableau_source.get_connection_object_page(
+                query=mock.MagicMock(),
+                connection_type=mock.MagicMock(),
+                query_filter=mock.MagicMock(),
+                current_cursor=None,
+                retries_remaining=1,
+                fetch_size=10,
+            )
+
+            assert reporter.num_actual_tableau_metadata_queries == 2
+            assert reporter.tableau_server_error_stats
+            assert reporter.tableau_server_error_stats["NonXMLResponseError"] == 1
+
+            assert reporter.warnings == []
+            assert reporter.failures == []
+
+
 @freeze_time(FROZEN_TIME)
 @pytest.mark.parametrize(
     "extract_project_hierarchy, allowed_projects",

From 842c8f94a5177d7053bf596d571db9c99df2e4b6 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Mon, 6 Jan 2025 16:39:02 +0530
Subject: [PATCH 024/249] fix(ingest/gc): infinite loop query entities (#12274)

---
 .../datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py b/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
index cf810d05aa2ca1..32243106bb53f6 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
@@ -258,7 +258,7 @@ def _get_soft_deleted_queries(self) -> Iterable[str]:
                 )
                 break
             scroll_across_entities = result.get("scrollAcrossEntities")
-            if not scroll_across_entities:
+            if not scroll_across_entities or not scroll_across_entities.get("count"):
                 break
             scroll_id = scroll_across_entities.get("nextScrollId")
             self.report.num_queries_found += scroll_across_entities.get("count")

From 91c1c6bf77247e8a37855aecd77919cefbe6d0d7 Mon Sep 17 00:00:00 2001
From: Mayuri Nehate <33225191+mayurinehate@users.noreply.github.com>
Date: Mon, 6 Jan 2025 21:48:56 +0530
Subject: [PATCH 025/249] fix(ingest/snowflake): use fast query fingerprint for
 lineage (#12275)

---
 .../source/snowflake/snowflake_lineage_v2.py        |  4 ++++
 .../datahub/sql_parsing/sql_parsing_aggregator.py   | 13 ++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_lineage_v2.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_lineage_v2.py
index 6b200590d7ab63..e93ecf30171f65 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_lineage_v2.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_lineage_v2.py
@@ -40,6 +40,7 @@
     ColumnRef,
     DownstreamColumnRef,
 )
+from datahub.sql_parsing.sqlglot_utils import get_query_fingerprint
 from datahub.utilities.perf_timer import PerfTimer
 from datahub.utilities.time import ts_millis_to_datetime
 
@@ -239,6 +240,9 @@ def get_known_query_lineage(
         downstream_table_urn = self.identifiers.gen_dataset_urn(dataset_name)
 
         known_lineage = KnownQueryLineageInfo(
+            query_id=get_query_fingerprint(
+                query.query_text, self.identifiers.platform, fast=True
+            ),
             query_text=query.query_text,
             downstream=downstream_table_urn,
             upstreams=self.map_query_result_upstreams(
diff --git a/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py b/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py
index a4a49f77882168..25b63ffac45f96 100644
--- a/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py
+++ b/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py
@@ -165,6 +165,7 @@ class KnownQueryLineageInfo:
     timestamp: Optional[datetime] = None
     session_id: Optional[str] = None
     query_type: QueryType = QueryType.UNKNOWN
+    query_id: Optional[str] = None
 
 
 @dataclasses.dataclass
@@ -618,11 +619,13 @@ def add_known_query_lineage(
         self.report.num_known_query_lineage += 1
 
         # Generate a fingerprint for the query.
-        with self.report.sql_fingerprinting_timer:
-            query_fingerprint = get_query_fingerprint(
-                known_query_lineage.query_text,
-                platform=self.platform.platform_name,
-            )
+        query_fingerprint = known_query_lineage.query_id
+        if not query_fingerprint:
+            with self.report.sql_fingerprinting_timer:
+                query_fingerprint = get_query_fingerprint(
+                    known_query_lineage.query_text,
+                    platform=self.platform.platform_name,
+                )
         formatted_query = self._maybe_format_query(known_query_lineage.query_text)
 
         # Register the query.

From 3316d407f74486655ae57209c7377903d2e498d4 Mon Sep 17 00:00:00 2001
From: Tamas Nemeth <treff7es@gmail.com>
Date: Mon, 6 Jan 2025 18:21:24 +0100
Subject: [PATCH 026/249] fix(spark): Finegrained lineage is emitted on the
 DataJob and not on the emitted Datasets. (#11956)

---
 .../java/acryl-spark-lineage/README.md        | 101 +++++++------
 .../datahub/spark/DatahubEventEmitter.java    |  26 +++-
 .../datahub/spark/conf/SparkConfigParser.java |  19 +++
 .../datahub/spark/conf/SparkLineageConf.java  |   2 +
 .../spark/OpenLineageEventToDatahubTest.java  |  28 ++++
 .../ol_events/map_partition_job.json          |  66 +++++++++
 .../config/DatahubOpenlineageConfig.java      |   2 +
 .../converter/OpenLineageToDataHub.java       |  23 ++-
 .../openlineage/dataset/DatahubJob.java       | 136 +++++++++++++-----
 9 files changed, 319 insertions(+), 84 deletions(-)
 create mode 100644 metadata-integration/java/acryl-spark-lineage/src/test/resources/ol_events/map_partition_job.json

diff --git a/metadata-integration/java/acryl-spark-lineage/README.md b/metadata-integration/java/acryl-spark-lineage/README.md
index 97851e90e860ed..e51c884c297d7e 100644
--- a/metadata-integration/java/acryl-spark-lineage/README.md
+++ b/metadata-integration/java/acryl-spark-lineage/README.md
@@ -24,7 +24,7 @@ When running jobs using spark-submit, the agent needs to be configured in the co
 
 ```text
 #Configuring DataHub spark agent jar
-spark.jars.packages                          io.acryl:acryl-spark-lineage:0.2.16
+spark.jars.packages                          io.acryl:acryl-spark-lineage:0.2.17
 spark.extraListeners                         datahub.spark.DatahubSparkListener
 spark.datahub.rest.server                    http://localhost:8080
 ```
@@ -32,7 +32,7 @@ spark.datahub.rest.server                    http://localhost:8080
 ## spark-submit command line
 
 ```sh
-spark-submit --packages io.acryl:acryl-spark-lineage:0.2.16 --conf "spark.extraListeners=datahub.spark.DatahubSparkListener" my_spark_job_to_run.py
+spark-submit --packages io.acryl:acryl-spark-lineage:0.2.17 --conf "spark.extraListeners=datahub.spark.DatahubSparkListener" my_spark_job_to_run.py
 ```
 
 ### Configuration Instructions:  Amazon EMR
@@ -41,7 +41,7 @@ Set the following spark-defaults configuration properties as it
 stated [here](https://docs.aws.amazon.com/emr/latest/ReleaseGuide/emr-spark-configure.html)
 
 ```text
-spark.jars.packages                          io.acryl:acryl-spark-lineage:0.2.16
+spark.jars.packages                          io.acryl:acryl-spark-lineage:0.2.17
 spark.extraListeners                         datahub.spark.DatahubSparkListener
 spark.datahub.rest.server                    https://your_datahub_host/gms
 #If you have authentication set up then you also need to specify the Datahub access token
@@ -56,7 +56,7 @@ When running interactive jobs from a notebook, the listener can be configured wh
 spark = SparkSession.builder
 .master("spark://spark-master:7077")
 .appName("test-application")
-.config("spark.jars.packages", "io.acryl:acryl-spark-lineage:0.2.16")
+.config("spark.jars.packages", "io.acryl:acryl-spark-lineage:0.2.17")
 .config("spark.extraListeners", "datahub.spark.DatahubSparkListener")
 .config("spark.datahub.rest.server", "http://localhost:8080")
 .enableHiveSupport()
@@ -79,7 +79,7 @@ appName("test-application")
 config("spark.master","spark://spark-master:7077")
         .
 
-config("spark.jars.packages","io.acryl:acryl-spark-lineage:0.2.16")
+config("spark.jars.packages","io.acryl:acryl-spark-lineage:0.2.17")
         .
 
 config("spark.extraListeners","datahub.spark.DatahubSparkListener")
@@ -158,45 +158,47 @@ information like tokens.
 
 ## Configuration Options
 
-| Field                                                  | Required | Default               | Description                                                                                                                                                                               |
-|--------------------------------------------------------|----------|-----------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| spark.jars.packages                                    | ✅        |                       | Set with latest/required version  io.acryl:acryl-spark-lineage:0.2.15                                                                                                                     |
-| spark.extraListeners                                   | ✅        |                       | datahub.spark.DatahubSparkListener                                                                                                                                                        |
-| spark.datahub.emitter                                  |          | rest                  | Specify the ways to emit metadata. By default it sends to DataHub using REST emitter. Valid options are rest, kafka or file                                                               |
-| spark.datahub.rest.server                              |          | http://localhost:8080 | Datahub server url  eg:<http://localhost:8080>                                                                                                                                            |
-| spark.datahub.rest.token                               |          |                       | Authentication token.                                                                                                                                                                     |
-| spark.datahub.rest.disable_ssl_verification            |          | false                 | Disable SSL certificate validation. Caution: Only use this if you know what you are doing!                                                                                                |
-| spark.datahub.rest.disable_chunked_encoding            |          | false                 | Disable Chunked Transfer Encoding. In some environment chunked encoding causes issues. With this config option it can be disabled.                                                        ||
-| spark.datahub.rest.max_retries                         |          | 0                     | Number of times a request retried if failed                                                                                                                                               |
-| spark.datahub.rest.retry_interval                      |          | 10                    | Number of seconds to wait between retries                                                                                                                                                 |
-| spark.datahub.file.filename                            |          |                       | The file where metadata will be written if file emitter is set                                                                                                                            |
-| spark.datahub.kafka.bootstrap                          |          |                       | The Kafka bootstrap server url to use if the Kafka emitter is set                                                                                                                         |
-| spark.datahub.kafka.schema_registry_url                |          |                       | The Schema registry url to use if the Kafka emitter is set                                                                                                                                |
-| spark.datahub.kafka.schema_registry_config.            |          |                       | Additional config to pass in to the Schema Registry Client                                                                                                                                |
-| spark.datahub.kafka.producer_config.                   |          |                       | Additional config to pass in to the Kafka producer. For example: `--conf "spark.datahub.kafka.producer_config.client.id=my_client_id"`                                                    |
-| spark.datahub.metadata.pipeline.platformInstance       |          |                       | Pipeline level platform instance                                                                                                                                                          |
-| spark.datahub.metadata.dataset.platformInstance        |          |                       | dataset level platform instance (it is usefult to set if you have it in your glue ingestion)                                                                                              |
-| spark.datahub.metadata.dataset.env                     |          | PROD                  | [Supported values](https://datahubproject.io/docs/graphql/enums#fabrictype). In all other cases, will fallback to PROD                                                                    |
-| spark.datahub.metadata.dataset.hivePlatformAlias       |          | hive                  | By default, datahub assigns Hive-like tables to the Hive platform. If you are using Glue as your Hive metastore, set this config flag to `glue`                                           |
+| Field                                                  | Required | Default               | Description                                                                                                                                                                              |
+|--------------------------------------------------------|----------|-----------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| spark.jars.packages                                    | ✅        |                       | Set with latest/required version  io.acryl:acryl-spark-lineage:0.2.15                                                                                                                    |
+| spark.extraListeners                                   | ✅        |                       | datahub.spark.DatahubSparkListener                                                                                                                                                       |
+| spark.datahub.emitter                                  |          | rest                  | Specify the ways to emit metadata. By default it sends to DataHub using REST emitter. Valid options are rest, kafka or file                                                              |
+| spark.datahub.rest.server                              |          | http://localhost:8080 | Datahub server url  eg:<http://localhost:8080>                                                                                                                                           |
+| spark.datahub.rest.token                               |          |                       | Authentication token.                                                                                                                                                                    |
+| spark.datahub.rest.disable_ssl_verification            |          | false                 | Disable SSL certificate validation. Caution: Only use this if you know what you are doing!                                                                                               |
+| spark.datahub.rest.disable_chunked_encoding            |          | false                 | Disable Chunked Transfer Encoding. In some environment chunked encoding causes issues. With this config option it can be disabled.                                                       ||
+| spark.datahub.rest.max_retries                         |          | 0                     | Number of times a request retried if failed                                                                                                                                              |
+| spark.datahub.rest.retry_interval                      |          | 10                    | Number of seconds to wait between retries                                                                                                                                                |
+| spark.datahub.file.filename                            |          |                       | The file where metadata will be written if file emitter is set                                                                                                                           |
+| spark.datahub.kafka.bootstrap                          |          |                       | The Kafka bootstrap server url to use if the Kafka emitter is set                                                                                                                        |
+| spark.datahub.kafka.schema_registry_url                |          |                       | The Schema registry url to use if the Kafka emitter is set                                                                                                                               |
+| spark.datahub.kafka.schema_registry_config.            |          |                       | Additional config to pass in to the Schema Registry Client                                                                                                                               |
+| spark.datahub.kafka.producer_config.                   |          |                       | Additional config to pass in to the Kafka producer. For example: `--conf "spark.datahub.kafka.producer_config.client.id=my_client_id"`                                                   |
+| spark.datahub.metadata.pipeline.platformInstance       |          |                       | Pipeline level platform instance                                                                                                                                                         |
+| spark.datahub.metadata.dataset.platformInstance        |          |                       | dataset level platform instance (it is usefult to set if you have it in your glue ingestion)                                                                                             |
+| spark.datahub.metadata.dataset.env                     |          | PROD                  | [Supported values](https://datahubproject.io/docs/graphql/enums#fabrictype). In all other cases, will fallback to PROD                                                                   |
+| spark.datahub.metadata.dataset.hivePlatformAlias       |          | hive                  | By default, datahub assigns Hive-like tables to the Hive platform. If you are using Glue as your Hive metastore, set this config flag to `glue`                                          |
 | spark.datahub.metadata.include_scheme                  |          | true                  | Include scheme from the path URI (e.g. hdfs://, s3://) in the dataset URN. We recommend setting this value to false, it is set to true for backwards compatibility with previous versions |
-| spark.datahub.metadata.remove_partition_pattern        |          |                       | Remove partition pattern. (e.g. /partition=\d+) It change database/table/partition=123 to database/table                                                                                  |
-| spark.datahub.coalesce_jobs                            |          | true                  | Only one datajob(task) will be emitted containing all input and output datasets for the spark application                                                                                 |
-| spark.datahub.parent.datajob_urn                       |          |                       | Specified dataset will be set as upstream dataset for datajob created. Effective only when spark.datahub.coalesce_jobs is set to true                                                     |
-| spark.datahub.metadata.dataset.materialize             |          | false                 | Materialize Datasets in DataHub                                                                                                                                                           |
-| spark.datahub.platform.s3.path_spec_list               |          |                       | List of pathspec per platform                                                                                                                                                             |
-| spark.datahub.metadata.dataset.include_schema_metadata | false    |                       | Emit dataset schema metadata based on the spark execution. It is recommended to get schema information from platform specific DataHub sources  as this is less reliable                   |
-| spark.datahub.flow_name                                |          |                       | If it is set it will be used as the DataFlow name otherwise it uses spark app name as flow_name                                                                                           |
-| spark.datahub.file_partition_regexp                    |          |                       | Strip partition part from the path if path end matches with the specified regexp. Example `year=.*/month=.*/day=.*`                                                                       |
-| spark.datahub.tags                                     |          |                       | Comma separated list of tags to attach to the DataFlow                                                                                                                                    |
-| spark.datahub.domains                                  |          |                       | Comma separated list of domain urns to attach to the DataFlow                                                                                                                             |
-| spark.datahub.stage_metadata_coalescing                |          |                       | Normally it coalesces and sends metadata at the onApplicationEnd event which is never called on Databricks or on Glue. You should enable this on Databricks if you want coalesced run.    |
-| spark.datahub.patch.enabled                            |          | false                 | Set this to true to send lineage as a patch, which appends rather than overwrites existing Dataset lineage edges. By default, it is disabled.                                             |
-| spark.datahub.metadata.dataset.lowerCaseUrns           |          | false                 | Set this to true to lowercase dataset urns. By default, it is disabled.                                                                                                                   |
-| spark.datahub.disableSymlinkResolution                 |          | false                 | Set this to true if you prefer using the s3 location instead of the Hive table. By default, it is disabled.                                                                               |
-| spark.datahub.s3.bucket                                |          |                       | The name of the bucket where metadata will be written if s3 emitter is set                                                                                                                |
-| spark.datahub.s3.prefix                                |          |                       | The prefix for the file where metadata will be written on s3 if s3 emitter is set                                                                                                         |
-| spark.datahub.s3.filename                              |          |                       | The name of the file where metadata will be written if it is not set random filename will be used on s3 if s3 emitter is set                                                              |
-
+| spark.datahub.metadata.remove_partition_pattern        |          |                       | Remove partition pattern. (e.g. /partition=\d+) It change database/table/partition=123 to database/table                                                                                 |
+| spark.datahub.coalesce_jobs                            |          | true                  | Only one datajob(task) will be emitted containing all input and output datasets for the spark application                                                                                |
+| spark.datahub.parent.datajob_urn                       |          |                       | Specified dataset will be set as upstream dataset for datajob created. Effective only when spark.datahub.coalesce_jobs is set to true                                                    |
+| spark.datahub.metadata.dataset.materialize             |          | false                 | Materialize Datasets in DataHub                                                                                                                                                          |
+| spark.datahub.platform.s3.path_spec_list               |          |                       | List of pathspec per platform                                                                                                                                                            |
+| spark.datahub.metadata.dataset.include_schema_metadata | false    |                       | Emit dataset schema metadata based on the spark execution. It is recommended to get schema information from platform specific DataHub sources  as this is less reliable                  |
+| spark.datahub.flow_name                                |          |                       | If it is set it will be used as the DataFlow name otherwise it uses spark app name as flow_name                                                                                          |
+| spark.datahub.file_partition_regexp                    |          |                       | Strip partition part from the path if path end matches with the specified regexp. Example `year=.*/month=.*/day=.*`                                                                      |
+| spark.datahub.tags                                     |          |                       | Comma separated list of tags to attach to the DataFlow                                                                                                                                   |
+| spark.datahub.domains                                  |          |                       | Comma separated list of domain urns to attach to the DataFlow                                                                                                                            |
+| spark.datahub.stage_metadata_coalescing                |          |                       | Normally it coalesces and sends metadata at the onApplicationEnd event which is never called on Databricks or on Glue. You should enable this on Databricks if you want coalesced run.   |
+| spark.datahub.patch.enabled                            |          | false                 | Set this to true to send lineage as a patch, which appends rather than overwrites existing Dataset lineage edges. By default, it is disabled.                          |
+| spark.datahub.metadata.dataset.lowerCaseUrns           |          | false                 | Set this to true to lowercase dataset urns. By default, it is disabled.                                                                                                                  |
+| spark.datahub.disableSymlinkResolution                 |          | false                 | Set this to true if you prefer using the s3 location instead of the Hive table. By default, it is disabled.                                                                              |
+| spark.datahub.s3.bucket                                |          |                       | The name of the bucket where metadata will be written if s3 emitter is set                                                                                                               |
+| spark.datahub.s3.prefix                                |          |                       | The prefix for the file where metadata will be written on s3 if s3 emitter is set                                                                                                        |
+| spark.datahub.s3.filename                              |          |                       | The name of the file where metadata will be written if it is not set random filename will be used on s3 if s3 emitter is set                                                             |
+| spark.datahub.s3.filename                              |          |                       | The name of the file where metadata will be written if it is not set random filename will be used on s3 if s3 emitter is set                                                             |
+|spark.datahub.log.mcps                                  |          | true                  | Set this to true to log MCPS to the log. By default, it is enabled.                                                                                                                      |
+|spark.datahub.legacyLineageCleanup.enabled|    | false                 | Set this to true to remove legacy lineages from older Spark Plugin runs. This will remove those lineages from the Datasets which it adds to DataJob. By default, it is disabled.         |
 
 ## What to Expect: The Metadata Model
 
@@ -358,6 +360,19 @@ Use Java 8 to build the project. The project uses Gradle as the build tool. To b
 + 
 ## Changelog
 
+### Version 0.2.17
+- *Major changes*: 
+  - Finegrained lineage is emitted on the DataJob and not on the emitted Datasets. This is the correct behaviour which was not correct earlier. This causes earlier emitted finegrained lineages won't be overwritten by the new ones.
+    You can remove the old lineages by setting `spark.datahub.legacyLineageCleanup.enabled=true`. Make sure you have the latest server if you enable with patch support. (this was introduced since 0.2.17-rc5)
+
+- *Changes*:
+  - OpenLineage 1.25.0 upgrade
+  - Add option to disable chunked encoding in the datahub rest sink -> `spark.datahub.rest.disable_chunked_encoding`
+  - Add option to specify the mcp kafka topic for the datahub kafka sink -> `spark.datahub.kafka.mcp_topic`
+  - Add option to remove legacy lineages from older Spark Plugin runs. This will remove those lineages from the Datasets which it adds to DataJob -> `spark.datahub.legacyLineageCleanup.enabled`
+- *Fixes*:
+  - Fix handling map transformation in the lineage. Earlier it generated wrong lineage for map transformation.
+
 ### Version 0.2.16
 - Remove logging DataHub config into logs
 
diff --git a/metadata-integration/java/acryl-spark-lineage/src/main/java/datahub/spark/DatahubEventEmitter.java b/metadata-integration/java/acryl-spark-lineage/src/main/java/datahub/spark/DatahubEventEmitter.java
index 0bcc7db9e87408..84f397226ce912 100644
--- a/metadata-integration/java/acryl-spark-lineage/src/main/java/datahub/spark/DatahubEventEmitter.java
+++ b/metadata-integration/java/acryl-spark-lineage/src/main/java/datahub/spark/DatahubEventEmitter.java
@@ -1,12 +1,18 @@
 package datahub.spark;
 
+import static com.linkedin.metadata.Constants.*;
 import static datahub.spark.converter.SparkStreamingEventToDatahub.*;
 import static io.datahubproject.openlineage.converter.OpenLineageToDataHub.*;
 import static io.datahubproject.openlineage.utils.DatahubUtils.*;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.StreamReadConstraints;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.linkedin.common.GlobalTags;
 import com.linkedin.common.UrnArray;
 import com.linkedin.common.urn.DataJobUrn;
+import com.linkedin.data.DataMap;
+import com.linkedin.data.template.JacksonDataTemplateCodec;
 import com.linkedin.data.template.StringMap;
 import com.linkedin.dataprocess.DataProcessInstanceRelationships;
 import com.linkedin.dataprocess.RunResultType;
@@ -62,12 +68,23 @@ public class DatahubEventEmitter extends EventEmitter {
   private final Map<String, MetadataChangeProposalWrapper> schemaMap = new HashMap<>();
   private SparkLineageConf datahubConf;
   private static final int DEFAULT_TIMEOUT_SEC = 10;
+  private final ObjectMapper objectMapper;
+  private final JacksonDataTemplateCodec dataTemplateCodec;
 
   private final EventFormatter eventFormatter = new EventFormatter();
 
   public DatahubEventEmitter(SparkOpenLineageConfig config, String applicationJobName)
       throws URISyntaxException {
     super(config, applicationJobName);
+    objectMapper = new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL);
+    int maxSize =
+        Integer.parseInt(
+            System.getenv()
+                .getOrDefault(INGESTION_MAX_SERIALIZED_STRING_LENGTH, MAX_JACKSON_STRING_SIZE));
+    objectMapper
+        .getFactory()
+        .setStreamReadConstraints(StreamReadConstraints.builder().maxStringLength(maxSize).build());
+    dataTemplateCodec = new JacksonDataTemplateCodec(objectMapper.getFactory());
   }
 
   private Optional<Emitter> getEmitter() {
@@ -407,7 +424,14 @@ protected void emitMcps(List<MetadataChangeProposal> mcps) {
           .map(
               mcp -> {
                 try {
-                  log.info("emitting mcpw: " + mcp);
+                  if (this.datahubConf.isLogMcps()) {
+                    DataMap map = mcp.data();
+                    String serializedMCP = dataTemplateCodec.mapToString(map);
+                    log.info("emitting mcpw: {}", serializedMCP);
+                  } else {
+                    log.info(
+                        "emitting aspect: {} for urn: {}", mcp.getAspectName(), mcp.getEntityUrn());
+                  }
                   return emitter.get().emit(mcp);
                 } catch (IOException ioException) {
                   log.error("Failed to emit metadata to DataHub", ioException);
diff --git a/metadata-integration/java/acryl-spark-lineage/src/main/java/datahub/spark/conf/SparkConfigParser.java b/metadata-integration/java/acryl-spark-lineage/src/main/java/datahub/spark/conf/SparkConfigParser.java
index 3860285083c4bb..824cd1a687b264 100644
--- a/metadata-integration/java/acryl-spark-lineage/src/main/java/datahub/spark/conf/SparkConfigParser.java
+++ b/metadata-integration/java/acryl-spark-lineage/src/main/java/datahub/spark/conf/SparkConfigParser.java
@@ -31,6 +31,7 @@ public class SparkConfigParser {
   public static final String FILE_EMITTER_FILE_NAME = "file.filename";
   public static final String DISABLE_SSL_VERIFICATION_KEY = "rest.disable_ssl_verification";
   public static final String REST_DISABLE_CHUNKED_ENCODING = "rest.disable_chunked_encoding";
+  public static final String CONFIG_LOG_MCPS = "log.mcps";
 
   public static final String MAX_RETRIES = "rest.max_retries";
   public static final String RETRY_INTERVAL_IN_SEC = "rest.retry_interval_in_sec";
@@ -51,6 +52,7 @@ public class SparkConfigParser {
 
   public static final String COALESCE_KEY = "coalesce_jobs";
   public static final String PATCH_ENABLED = "patch.enabled";
+  public static final String LEGACY_LINEAGE_CLEANUP = "legacyLineageCleanup.enabled";
   public static final String DISABLE_SYMLINK_RESOLUTION = "disableSymlinkResolution";
 
   public static final String STAGE_METADATA_COALESCING = "stage_metadata_coalescing";
@@ -158,6 +160,7 @@ public static DatahubOpenlineageConfig sparkConfigToDatahubOpenlineageConf(
       Config sparkConfig, SparkAppContext sparkAppContext) {
     DatahubOpenlineageConfig.DatahubOpenlineageConfigBuilder builder =
         DatahubOpenlineageConfig.builder();
+    builder.isSpark(true);
     builder.filePartitionRegexpPattern(
         SparkConfigParser.getFilePartitionRegexpPattern(sparkConfig));
     builder.fabricType(SparkConfigParser.getCommonFabricType(sparkConfig));
@@ -172,6 +175,7 @@ public static DatahubOpenlineageConfig sparkConfigToDatahubOpenlineageConf(
     builder.commonDatasetPlatformInstance(SparkConfigParser.getCommonPlatformInstance(sparkConfig));
     builder.hivePlatformAlias(SparkConfigParser.getHivePlatformAlias(sparkConfig));
     builder.usePatch(SparkConfigParser.isPatchEnabled(sparkConfig));
+    builder.removeLegacyLineage(SparkConfigParser.isLegacyLineageCleanupEnabled(sparkConfig));
     builder.disableSymlinkResolution(SparkConfigParser.isDisableSymlinkResolution(sparkConfig));
     builder.lowerCaseDatasetUrns(SparkConfigParser.isLowerCaseDatasetUrns(sparkConfig));
     try {
@@ -311,6 +315,13 @@ public static boolean isDatasetMaterialize(Config datahubConfig) {
         && datahubConfig.getBoolean(DATASET_MATERIALIZE_KEY);
   }
 
+  public static boolean isLogMcps(Config datahubConfig) {
+    if (datahubConfig.hasPath(CONFIG_LOG_MCPS)) {
+      return datahubConfig.getBoolean(CONFIG_LOG_MCPS);
+    }
+    return true;
+  }
+
   public static boolean isIncludeSchemaMetadata(Config datahubConfig) {
     if (datahubConfig.hasPath(DATASET_INCLUDE_SCHEMA_METADATA)) {
       return datahubConfig.getBoolean(DATASET_INCLUDE_SCHEMA_METADATA);
@@ -352,6 +363,14 @@ public static boolean isPatchEnabled(Config datahubConfig) {
     return datahubConfig.hasPath(PATCH_ENABLED) && datahubConfig.getBoolean(PATCH_ENABLED);
   }
 
+  public static boolean isLegacyLineageCleanupEnabled(Config datahubConfig) {
+    if (!datahubConfig.hasPath(LEGACY_LINEAGE_CLEANUP)) {
+      return false;
+    }
+    return datahubConfig.hasPath(LEGACY_LINEAGE_CLEANUP)
+        && datahubConfig.getBoolean(LEGACY_LINEAGE_CLEANUP);
+  }
+
   public static boolean isDisableSymlinkResolution(Config datahubConfig) {
     if (!datahubConfig.hasPath(DISABLE_SYMLINK_RESOLUTION)) {
       return false;
diff --git a/metadata-integration/java/acryl-spark-lineage/src/main/java/datahub/spark/conf/SparkLineageConf.java b/metadata-integration/java/acryl-spark-lineage/src/main/java/datahub/spark/conf/SparkLineageConf.java
index 014cff873bbde9..96afe729b82c00 100644
--- a/metadata-integration/java/acryl-spark-lineage/src/main/java/datahub/spark/conf/SparkLineageConf.java
+++ b/metadata-integration/java/acryl-spark-lineage/src/main/java/datahub/spark/conf/SparkLineageConf.java
@@ -17,6 +17,7 @@ public class SparkLineageConf {
   final DatahubOpenlineageConfig openLineageConf;
   @Builder.Default final boolean coalesceEnabled = true;
   @Builder.Default final boolean emitCoalescePeriodically = false;
+  @Builder.Default final boolean logMcps = true;
   final SparkAppContext sparkAppContext;
   final DatahubEmitterConfig datahubEmitterConfig;
   @Builder.Default final List<String> tags = new LinkedList<>();
@@ -32,6 +33,7 @@ public static SparkLineageConf toSparkLineageConf(
         SparkConfigParser.sparkConfigToDatahubOpenlineageConf(sparkConfig, sparkAppContext);
     builder.openLineageConf(datahubOpenlineageConfig);
     builder.coalesceEnabled(SparkConfigParser.isCoalesceEnabled(sparkConfig));
+    builder.logMcps(SparkConfigParser.isLogMcps(sparkConfig));
     if (SparkConfigParser.getTags(sparkConfig) != null) {
       builder.tags(Arrays.asList(Objects.requireNonNull(SparkConfigParser.getTags(sparkConfig))));
     }
diff --git a/metadata-integration/java/acryl-spark-lineage/src/test/java/datahub/spark/OpenLineageEventToDatahubTest.java b/metadata-integration/java/acryl-spark-lineage/src/test/java/datahub/spark/OpenLineageEventToDatahubTest.java
index ef2b17e9932f2f..b9a142364d4e89 100644
--- a/metadata-integration/java/acryl-spark-lineage/src/test/java/datahub/spark/OpenLineageEventToDatahubTest.java
+++ b/metadata-integration/java/acryl-spark-lineage/src/test/java/datahub/spark/OpenLineageEventToDatahubTest.java
@@ -814,4 +814,32 @@ public void testProcessGCSInputsOutputs() throws URISyntaxException, IOException
           dataset.getUrn().toString());
     }
   }
+
+  public void testProcessMappartitionJob() throws URISyntaxException, IOException {
+    DatahubOpenlineageConfig.DatahubOpenlineageConfigBuilder builder =
+        DatahubOpenlineageConfig.builder();
+    builder.fabricType(FabricType.DEV);
+    builder.lowerCaseDatasetUrns(true);
+    builder.materializeDataset(true);
+    builder.includeSchemaMetadata(true);
+    builder.isSpark(true);
+
+    String olEvent =
+        IOUtils.toString(
+            this.getClass().getResourceAsStream("/ol_events/map_partition_job.json"),
+            StandardCharsets.UTF_8);
+
+    OpenLineage.RunEvent runEvent = OpenLineageClientUtils.runEventFromJson(olEvent);
+    DatahubJob datahubJob = OpenLineageToDataHub.convertRunEventToJob(runEvent, builder.build());
+
+    assertNotNull(datahubJob);
+
+    assertEquals(1, datahubJob.getInSet().size());
+    for (DatahubDataset dataset : datahubJob.getInSet()) {
+      assertEquals(
+          "urn:li:dataset:(urn:li:dataPlatform:s3,my-bucket/my_dir/my_file.csv,DEV)",
+          dataset.getUrn().toString());
+    }
+    assertEquals(0, datahubJob.getOutSet().size());
+  }
 }
diff --git a/metadata-integration/java/acryl-spark-lineage/src/test/resources/ol_events/map_partition_job.json b/metadata-integration/java/acryl-spark-lineage/src/test/resources/ol_events/map_partition_job.json
new file mode 100644
index 00000000000000..39560a782840ce
--- /dev/null
+++ b/metadata-integration/java/acryl-spark-lineage/src/test/resources/ol_events/map_partition_job.json
@@ -0,0 +1,66 @@
+{
+  "eventTime": "2024-11-20T12:59:29.059Z",
+  "producer": "https://github.com/OpenLineage/OpenLineage/tree/1.24.2/integration/spark",
+  "schemaURL": "https://openlineage.io/spec/2-0-2/OpenLineage.json#/$defs/RunEvent",
+  "eventType": "START",
+  "run": {
+    "runId": "01902a1e-0b05-750e-b38d-439998f7a853",
+    "facets": {
+      "parent": {
+        "_producer": "https://github.com/OpenLineage/OpenLineage/tree/1.24.2/integration/spark",
+        "_schemaURL": "https://openlineage.io/spec/facets/1-0-1/ParentRunFacet.json#/$defs/ParentRunFacet",
+        "run": {
+          "runId": "01902a1e-0b05-750e-b38d-439998f7a853"
+        },
+        "job": {
+          "namespace": "default",
+          "name": "spark_context_session"
+        }
+      },
+      "processing_engine": {
+        "_producer": "https://github.com/OpenLineage/OpenLineage/tree/1.24.2/integration/spark",
+        "_schemaURL": "https://openlineage.io/spec/facets/1-1-1/ProcessingEngineRunFacet.json#/$defs/ProcessingEngineRunFacet",
+        "version": "3.4.2",
+        "name": "spark"
+      },
+      "spark_jobDetails": {
+        "_producer": "https://github.com/OpenLineage/OpenLineage/tree/1.24.2/integration/spark",
+        "_schemaURL": "https://openlineage.io/spec/2-0-2/OpenLineage.json#/$defs/RunFacet",
+        "jobId": 0
+      },
+      "spark_properties": {
+        "_producer": "https://github.com/OpenLineage/OpenLineage/tree/1.24.2/integration/spark",
+        "_schemaURL": "https://openlineage.io/spec/2-0-2/OpenLineage.json#/$defs/RunFacet",
+        "properties": {
+          "spark.master": "yarn",
+          "spark.app.name": "SparkContextSession"
+        }
+      }
+    }
+  },
+  "job": {
+    "namespace": "default",
+    "name": "spark_context_session.map_partitions_parallel_collection",
+    "facets": {
+      "jobType": {
+        "_producer": "https://github.com/OpenLineage/OpenLineage/tree/1.24.2/integration/spark",
+        "_schemaURL": "https://openlineage.io/spec/facets/2-0-3/JobTypeJobFacet.json#/$defs/JobTypeJobFacet",
+        "processingType": "BATCH",
+        "integration": "SPARK",
+        "jobType": "RDD_JOB"
+      }
+    }
+  },
+  "inputs": [
+    {
+      "namespace": "s3://my-bucket",
+      "name": "my_dir/my_file.csv"
+    }
+  ],
+  "outputs": [
+    {
+      "namespace": "s3://my-bucket",
+      "name": "my_dir/my_file.csv"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/metadata-integration/java/openlineage-converter/src/main/java/io/datahubproject/openlineage/config/DatahubOpenlineageConfig.java b/metadata-integration/java/openlineage-converter/src/main/java/io/datahubproject/openlineage/config/DatahubOpenlineageConfig.java
index 5abb3c90d232bd..c725673eae47b5 100644
--- a/metadata-integration/java/openlineage-converter/src/main/java/io/datahubproject/openlineage/config/DatahubOpenlineageConfig.java
+++ b/metadata-integration/java/openlineage-converter/src/main/java/io/datahubproject/openlineage/config/DatahubOpenlineageConfig.java
@@ -16,6 +16,7 @@
 @Getter
 @ToString
 public class DatahubOpenlineageConfig {
+  @Builder.Default private final boolean isSpark = false;
   @Builder.Default private final boolean isStreaming = false;
   @Builder.Default private final String pipelineName = null;
   private final String platformInstance;
@@ -34,6 +35,7 @@ public class DatahubOpenlineageConfig {
   @Builder.Default private Map<String, String> urnAliases = new HashMap<>();
   @Builder.Default private final boolean disableSymlinkResolution = false;
   @Builder.Default private final boolean lowerCaseDatasetUrns = false;
+  @Builder.Default private final boolean removeLegacyLineage = false;
 
   public List<PathSpec> getPathSpecsForPlatform(String platform) {
     if ((pathSpecs == null) || (pathSpecs.isEmpty())) {
diff --git a/metadata-integration/java/openlineage-converter/src/main/java/io/datahubproject/openlineage/converter/OpenLineageToDataHub.java b/metadata-integration/java/openlineage-converter/src/main/java/io/datahubproject/openlineage/converter/OpenLineageToDataHub.java
index 9237ee60f473b4..9fcfc68bd03f55 100644
--- a/metadata-integration/java/openlineage-converter/src/main/java/io/datahubproject/openlineage/converter/OpenLineageToDataHub.java
+++ b/metadata-integration/java/openlineage-converter/src/main/java/io/datahubproject/openlineage/converter/OpenLineageToDataHub.java
@@ -675,9 +675,30 @@ private static void convertJobToDataJob(
     datahubJob.setJobInfo(dji);
     DataJobInputOutput inputOutput = new DataJobInputOutput();
 
+    boolean inputsEqualOutputs = false;
+    if ((datahubConf.isSpark())
+        && ((event.getInputs() != null && event.getOutputs() != null)
+            && (event.getInputs().size() == event.getOutputs().size()))) {
+      inputsEqualOutputs =
+          event.getInputs().stream()
+              .map(OpenLineage.Dataset::getName)
+              .collect(Collectors.toSet())
+              .equals(
+                  event.getOutputs().stream()
+                      .map(OpenLineage.Dataset::getName)
+                      .collect(Collectors.toSet()));
+      if (inputsEqualOutputs) {
+        log.info(
+            "Inputs equals Outputs: {}. This is most probably because of an rdd map operation and we only process Inputs",
+            inputsEqualOutputs);
+      }
+    }
+
     processJobInputs(datahubJob, event, datahubConf);
 
-    processJobOutputs(datahubJob, event, datahubConf);
+    if (!inputsEqualOutputs) {
+      processJobOutputs(datahubJob, event, datahubConf);
+    }
 
     DataProcessInstanceRunEvent dpire = processDataProcessInstanceResult(event);
     datahubJob.setDataProcessInstanceRunEvent(dpire);
diff --git a/metadata-integration/java/openlineage-converter/src/main/java/io/datahubproject/openlineage/dataset/DatahubJob.java b/metadata-integration/java/openlineage-converter/src/main/java/io/datahubproject/openlineage/dataset/DatahubJob.java
index 60caaae359677f..e2aa2c3a04c406 100644
--- a/metadata-integration/java/openlineage-converter/src/main/java/io/datahubproject/openlineage/dataset/DatahubJob.java
+++ b/metadata-integration/java/openlineage-converter/src/main/java/io/datahubproject/openlineage/dataset/DatahubJob.java
@@ -28,7 +28,10 @@
 import com.linkedin.dataprocess.DataProcessInstanceRelationships;
 import com.linkedin.dataprocess.DataProcessInstanceRunEvent;
 import com.linkedin.dataset.FineGrainedLineage;
+import com.linkedin.dataset.FineGrainedLineageArray;
 import com.linkedin.dataset.Upstream;
+import com.linkedin.dataset.UpstreamArray;
+import com.linkedin.dataset.UpstreamLineage;
 import com.linkedin.domain.Domains;
 import com.linkedin.metadata.aspect.patch.builder.DataJobInputOutputPatchBuilder;
 import com.linkedin.metadata.aspect.patch.builder.GlobalTagsPatchBuilder;
@@ -167,11 +170,34 @@ public List<MetadataChangeProposal> toMcps(DatahubOpenlineageConfig config) thro
     return mcps;
   }
 
+  private FineGrainedLineageArray mergeFinegrainedLineages() {
+    FineGrainedLineageArray fgls = new FineGrainedLineageArray();
+
+    for (DatahubDataset dataset : inSet) {
+      if (dataset.lineage != null && dataset.lineage.getFineGrainedLineages() != null) {
+        dataset.lineage.getFineGrainedLineages().stream()
+            .filter(Objects::nonNull)
+            .forEach(fgls::add);
+      }
+    }
+
+    for (DatahubDataset dataset : outSet) {
+      if (dataset.lineage != null && dataset.lineage.getFineGrainedLineages() != null) {
+        dataset.lineage.getFineGrainedLineages().stream()
+            .filter(Objects::nonNull)
+            .forEach(fgls::add);
+      }
+    }
+
+    return fgls;
+  }
+
   private void generateDataJobInputOutputMcp(
       EdgeArray inputEdges,
       EdgeArray outputEdges,
       DatahubOpenlineageConfig config,
       List<MetadataChangeProposal> mcps) {
+
     DataJobInputOutput dataJobInputOutput = new DataJobInputOutput();
     log.info("Adding DataJob edges to {}", jobUrn);
     if (config.isUsePatch() && (!parentJobs.isEmpty() || !inSet.isEmpty() || !outSet.isEmpty())) {
@@ -186,6 +212,27 @@ private void generateDataJobInputOutputMcp(
       for (DataJobUrn parentJob : parentJobs) {
         dataJobInputOutputPatchBuilder.addInputDatajobEdge(parentJob);
       }
+
+      FineGrainedLineageArray fgls = mergeFinegrainedLineages();
+      fgls.forEach(
+          fgl -> {
+            Objects.requireNonNull(fgl.getUpstreams())
+                .forEach(
+                    upstream -> {
+                      Objects.requireNonNull(fgl.getDownstreams())
+                          .forEach(
+                              downstream -> {
+                                dataJobInputOutputPatchBuilder.addFineGrainedUpstreamField(
+                                    upstream,
+                                    fgl.getConfidenceScore(),
+                                    StringUtils.defaultIfEmpty(
+                                        fgl.getTransformOperation(), "TRANSFORM"),
+                                    downstream,
+                                    fgl.getQuery());
+                              });
+                    });
+          });
+
       MetadataChangeProposal dataJobInputOutputMcp = dataJobInputOutputPatchBuilder.build();
       log.info(
           "dataJobInputOutputMcp: {}",
@@ -195,6 +242,8 @@ private void generateDataJobInputOutputMcp(
       mcps.add(dataJobInputOutputPatchBuilder.build());
 
     } else {
+      FineGrainedLineageArray fgls = mergeFinegrainedLineages();
+      dataJobInputOutput.setFineGrainedLineages(fgls);
       dataJobInputOutput.setInputDatasetEdges(inputEdges);
       dataJobInputOutput.setInputDatasets(new DatasetUrnArray());
       dataJobInputOutput.setOutputDatasetEdges(outputEdges);
@@ -235,6 +284,49 @@ private void generateDataProcessInstanceMcp(
     generateDataProcessInstanceRelationship(mcps);
   }
 
+  private void deleteOldDatasetLineage(
+      DatahubDataset dataset, DatahubOpenlineageConfig config, List<MetadataChangeProposal> mcps) {
+    if (dataset.getLineage() != null) {
+      if (config.isUsePatch()) {
+        if (!dataset.getLineage().getUpstreams().isEmpty()) {
+          UpstreamLineagePatchBuilder upstreamLineagePatchBuilder =
+              new UpstreamLineagePatchBuilder().urn(dataset.getUrn());
+          for (Upstream upstream : dataset.getLineage().getUpstreams()) {
+            upstreamLineagePatchBuilder.removeUpstream(upstream.getDataset());
+          }
+
+          log.info("Removing FineGrainedLineage to {}", dataset.getUrn());
+          for (FineGrainedLineage fineGrainedLineage :
+              Objects.requireNonNull(dataset.getLineage().getFineGrainedLineages())) {
+            for (Urn upstream : Objects.requireNonNull(fineGrainedLineage.getUpstreams())) {
+              for (Urn downstream : Objects.requireNonNull(fineGrainedLineage.getDownstreams())) {
+                upstreamLineagePatchBuilder.removeFineGrainedUpstreamField(
+                    upstream,
+                    StringUtils.defaultIfEmpty(
+                        fineGrainedLineage.getTransformOperation(), "TRANSFORM"),
+                    downstream,
+                    null);
+              }
+            }
+          }
+          MetadataChangeProposal mcp = upstreamLineagePatchBuilder.build();
+          log.info(
+              "upstreamLineagePatch: {}",
+              mcp.getAspect().getValue().asString(Charset.defaultCharset()));
+          mcps.add(mcp);
+        }
+      } else {
+        if (!dataset.getLineage().getUpstreams().isEmpty()) {
+          // Remove earlier created UpstreamLineage which most probably was created by the plugin.
+          UpstreamLineage upstreamLineage = new UpstreamLineage();
+          upstreamLineage.setUpstreams(new UpstreamArray());
+          upstreamLineage.setFineGrainedLineages(new FineGrainedLineageArray());
+          addAspectToMcps(dataset.getUrn(), DATASET_ENTITY_TYPE, upstreamLineage, mcps);
+        }
+      }
+    }
+  }
+
   private Pair<UrnArray, EdgeArray> processDownstreams(
       DatahubOpenlineageConfig config, List<MetadataChangeProposal> mcps) {
     UrnArray outputUrnArray = new UrnArray();
@@ -263,43 +355,13 @@ private Pair<UrnArray, EdgeArray> processDownstreams(
                 dataset.getUrn(), DATASET_ENTITY_TYPE, dataset.getSchemaMetadata(), mcps);
           }
 
-          if (dataset.getLineage() != null) {
-            if (config.isUsePatch()) {
-              if (!dataset.getLineage().getUpstreams().isEmpty()) {
-                UpstreamLineagePatchBuilder upstreamLineagePatchBuilder =
-                    new UpstreamLineagePatchBuilder().urn(dataset.getUrn());
-                for (Upstream upstream : dataset.getLineage().getUpstreams()) {
-                  upstreamLineagePatchBuilder.addUpstream(
-                      upstream.getDataset(), upstream.getType());
-                }
-
-                log.info("Adding FineGrainedLineage to {}", dataset.getUrn());
-                for (FineGrainedLineage fineGrainedLineage :
-                    Objects.requireNonNull(dataset.getLineage().getFineGrainedLineages())) {
-                  for (Urn upstream : Objects.requireNonNull(fineGrainedLineage.getUpstreams())) {
-                    for (Urn downstream :
-                        Objects.requireNonNull(fineGrainedLineage.getDownstreams())) {
-                      upstreamLineagePatchBuilder.addFineGrainedUpstreamField(
-                          upstream,
-                          fineGrainedLineage.getConfidenceScore(),
-                          StringUtils.defaultIfEmpty(
-                              fineGrainedLineage.getTransformOperation(), "TRANSFORM"),
-                          downstream,
-                          null);
-                    }
-                  }
-                }
-                MetadataChangeProposal mcp = upstreamLineagePatchBuilder.build();
-                log.info(
-                    "upstreamLineagePatch: {}",
-                    mcp.getAspect().getValue().asString(Charset.defaultCharset()));
-                mcps.add(mcp);
-              }
-            } else {
-              addAspectToMcps(dataset.getUrn(), DATASET_ENTITY_TYPE, dataset.getLineage(), mcps);
-            }
+          // Remove lineage which was added by older plugin that set lineage on Datasets and not on
+          // DataJobs
+          if (config.isRemoveLegacyLineage()) {
+            deleteOldDatasetLineage(dataset, config, mcps);
           }
         });
+
     return Pair.of(outputUrnArray, outputEdges);
   }
 
@@ -330,10 +392,6 @@ private Pair<UrnArray, EdgeArray> processUpstreams(
             addAspectToMcps(
                 dataset.getUrn(), DATASET_ENTITY_TYPE, dataset.getSchemaMetadata(), mcps);
           }
-
-          if (dataset.getLineage() != null) {
-            addAspectToMcps(dataset.getUrn(), DATASET_ENTITY_TYPE, dataset.getLineage(), mcps);
-          }
         });
     return Pair.of(inputUrnArray, inputEdges);
   }

From fb471f112e93c90ec1c02b2bd52976ea5d68aa06 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Mon, 6 Jan 2025 13:32:46 -0500
Subject: [PATCH 027/249] docs(tableau): clarify docs around tableau
 permissions (#12270)

---
 .../docs/sources/tableau/tableau_pre.md       | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/metadata-ingestion/docs/sources/tableau/tableau_pre.md b/metadata-ingestion/docs/sources/tableau/tableau_pre.md
index aeb67f85b241b9..65ff08367fdc8f 100644
--- a/metadata-ingestion/docs/sources/tableau/tableau_pre.md
+++ b/metadata-ingestion/docs/sources/tableau/tableau_pre.md
@@ -3,9 +3,24 @@
 In order to ingest metadata from Tableau, you will need:
 
 - Tableau Server Version 2021.1.10 and above. It may also work for older versions.
-- [Enable the Tableau Metadata API](https://help.tableau.com/current/api/metadata_api/en-us/docs/meta_api_start.html#enable-the-tableau-metadata-api-for-tableau-server) for Tableau Server, if its not already enabled.
-- Tableau Credentials (Username/Password or [Personal Access Token](https://help.tableau.com/current/pro/desktop/en-us/useracct.htm#create-and-revoke-personal-access-tokens))
-- The user or token must have **Site Administrator Explorer** permissions.
+- [Enable the Tableau Metadata API](https://help.tableau.com/current/api/metadata_api/en-us/docs/meta_api_start.html#enable-the-tableau-metadata-api-for-tableau-server) for Tableau Server, if its not already enabled. This is always enabled for Tableau Cloud.
+
+### Authentication
+
+DataHub supports two authentication methods:
+
+1. Username/Password
+2. [Personal Access Token](https://help.tableau.com/current/pro/desktop/en-us/useracct.htm#create-and-revoke-personal-access-tokens)
+
+Either way, the user/token must have the **Site Administrator Explorer** site role.
+
+:::info
+
+We need the `Site Administrator Explorer` site role in order to get complete metadata from Tableau.
+
+With any lower role, the Tableau Metadata API returns missing/partial metadata. This particularly affects data source fields and definitions, which impacts our ability to extract columns and generate column lineage. As such, other site roles like `Viewer` are insufficient with the current Tableau Metadata API.
+
+:::
 
 ### Ingestion through UI
 
@@ -46,8 +61,8 @@ This ingestion source maps the following Source System Concepts to DataHub Conce
 
 | Source Concept              | DataHub Concept                                               | Notes                             |
 | --------------------------- | ------------------------------------------------------------- | --------------------------------- |
-| `"Tableau"`                 | [Data Platform](../../metamodel/entities/dataPlatform.md)     |  
-| Project                 | [Container](../../metamodel/entities/container.md)      | SubType `"Project"`              |
+| `"Tableau"`                 | [Data Platform](../../metamodel/entities/dataPlatform.md)     |
+| Project                     | [Container](../../metamodel/entities/container.md)            | SubType `"Project"`               |
 | Embedded DataSource         | [Dataset](../../metamodel/entities/dataset.md)                | SubType `"Embedded Data Source"`  |
 | Published DataSource        | [Dataset](../../metamodel/entities/dataset.md)                | SubType `"Published Data Source"` |
 | Custom SQL Table            | [Dataset](../../metamodel/entities/dataset.md)                | SubTypes `"View"`, `"Custom SQL"` |
@@ -75,14 +90,15 @@ Lineage is emitted as received from Tableau's metadata API for
 
 ### Troubleshooting
 
-### Why are only some workbooks/custom SQLs/published datasources ingested from the specified project?
+#### Why are only some workbooks/custom SQLs/published datasources ingested from the specified project?
 
 This may happen when the Tableau API returns NODE_LIMIT_EXCEEDED error in response to metadata query and returns partial results with message "Showing partial results. , The request exceeded the ‘n’ node limit. Use pagination, additional filtering, or both in the query to adjust results." To resolve this, consider
 
 - reducing the page size using the `page_size` config param in datahub recipe (Defaults to 10).
 - increasing tableau configuration [metadata query node limit](https://help.tableau.com/current/server/en-us/cli_configuration-set_tsm.htm#metadata_nodelimit) to higher value.
 
-### `PERMISSIONS_MODE_SWITCHED` error in ingestion report 
+#### `PERMISSIONS_MODE_SWITCHED` error in ingestion report
+
 This error occurs if the Tableau site is using external assets. For more detail, refer to the Tableau documentation [Manage Permissions for External Assets](https://help.tableau.com/current/online/en-us/dm_perms_assets.htm).
 
 Follow the below steps to enable the derived permissions:

From ba8bf538ca3308143058264d1f0fbaa6978f36fe Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Mon, 6 Jan 2025 13:52:35 -0500
Subject: [PATCH 028/249] feat(ingest): enable `EnsureAspectSizeProcessor` for
 all sources (#12262)

---
 .../src/datahub/emitter/rest_emitter.py       | 23 ++++++++++++-------
 .../auto_ensure_aspect_size.py                |  8 ++++---
 .../src/datahub/ingestion/api/source.py       |  4 ++++
 .../datahub/ingestion/source/unity/source.py  |  4 ----
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/metadata-ingestion/src/datahub/emitter/rest_emitter.py b/metadata-ingestion/src/datahub/emitter/rest_emitter.py
index 04242c8bf45d2b..7c67349c74db10 100644
--- a/metadata-ingestion/src/datahub/emitter/rest_emitter.py
+++ b/metadata-ingestion/src/datahub/emitter/rest_emitter.py
@@ -13,6 +13,7 @@
 from datahub import nice_version_name
 from datahub.cli import config_utils
 from datahub.cli.cli_utils import ensure_has_system_metadata, fixup_gms_url
+from datahub.cli.env_utils import get_boolean_env_variable
 from datahub.configuration.common import ConfigurationError, OperationalError
 from datahub.emitter.generic_emitter import Emitter
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
@@ -46,6 +47,8 @@
     os.getenv("DATAHUB_REST_EMITTER_DEFAULT_RETRY_MAX_TIMES", "4")
 )
 
+_DATAHUB_EMITTER_TRACE = get_boolean_env_variable("DATAHUB_EMITTER_TRACE", False)
+
 # The limit is 16mb. We will use a max of 15mb to have some space
 # for overhead like request headers.
 # This applies to pretty much all calls to GMS.
@@ -291,7 +294,8 @@ def emit_mcps(
         mcps: Sequence[Union[MetadataChangeProposal, MetadataChangeProposalWrapper]],
         async_flag: Optional[bool] = None,
     ) -> int:
-        logger.debug("Attempting to emit batch mcps")
+        if _DATAHUB_EMITTER_TRACE:
+            logger.debug(f"Attempting to emit MCP batch of size {len(mcps)}")
         url = f"{self._gms_server}/aspects?action=ingestProposalBatch"
         for mcp in mcps:
             ensure_has_system_metadata(mcp)
@@ -304,22 +308,25 @@ def emit_mcps(
         current_chunk_size = INGEST_MAX_PAYLOAD_BYTES
         for mcp_obj in mcp_objs:
             mcp_obj_size = len(json.dumps(mcp_obj))
-            logger.debug(
-                f"Iterating through object with size {mcp_obj_size} (type: {mcp_obj.get('aspectName')}"
-            )
+            if _DATAHUB_EMITTER_TRACE:
+                logger.debug(
+                    f"Iterating through object with size {mcp_obj_size} (type: {mcp_obj.get('aspectName')}"
+                )
 
             if (
                 mcp_obj_size + current_chunk_size > INGEST_MAX_PAYLOAD_BYTES
                 or len(mcp_obj_chunks[-1]) >= BATCH_INGEST_MAX_PAYLOAD_LENGTH
             ):
-                logger.debug("Decided to create new chunk")
+                if _DATAHUB_EMITTER_TRACE:
+                    logger.debug("Decided to create new chunk")
                 mcp_obj_chunks.append([])
                 current_chunk_size = 0
             mcp_obj_chunks[-1].append(mcp_obj)
             current_chunk_size += mcp_obj_size
-        logger.debug(
-            f"Decided to send {len(mcps)} mcps in {len(mcp_obj_chunks)} chunks"
-        )
+        if len(mcp_obj_chunks) > 0:
+            logger.debug(
+                f"Decided to send {len(mcps)} MCP batch in {len(mcp_obj_chunks)} chunks"
+            )
 
         for mcp_obj_chunk in mcp_obj_chunks:
             # TODO: We're calling json.dumps on each MCP object twice, once to estimate
diff --git a/metadata-ingestion/src/datahub/ingestion/api/auto_work_units/auto_ensure_aspect_size.py b/metadata-ingestion/src/datahub/ingestion/api/auto_work_units/auto_ensure_aspect_size.py
index 559f0b77f59dfa..b63c96b617ff06 100644
--- a/metadata-ingestion/src/datahub/ingestion/api/auto_work_units/auto_ensure_aspect_size.py
+++ b/metadata-ingestion/src/datahub/ingestion/api/auto_work_units/auto_ensure_aspect_size.py
@@ -1,10 +1,9 @@
 import json
 import logging
-from typing import Iterable, List
+from typing import TYPE_CHECKING, Iterable, List
 
 from datahub.emitter.rest_emitter import INGEST_MAX_PAYLOAD_BYTES
 from datahub.emitter.serialization_helper import pre_json_transform
-from datahub.ingestion.api.source import SourceReport
 from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.metadata.schema_classes import (
     DatasetProfileClass,
@@ -12,12 +11,15 @@
     SchemaMetadataClass,
 )
 
+if TYPE_CHECKING:
+    from datahub.ingestion.api.source import SourceReport
+
 logger = logging.getLogger(__name__)
 
 
 class EnsureAspectSizeProcessor:
     def __init__(
-        self, report: SourceReport, payload_constraint: int = INGEST_MAX_PAYLOAD_BYTES
+        self, report: "SourceReport", payload_constraint: int = INGEST_MAX_PAYLOAD_BYTES
     ):
         self.report = report
         self.payload_constraint = payload_constraint
diff --git a/metadata-ingestion/src/datahub/ingestion/api/source.py b/metadata-ingestion/src/datahub/ingestion/api/source.py
index c3638635b19aac..75dc980e234ac8 100644
--- a/metadata-ingestion/src/datahub/ingestion/api/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/api/source.py
@@ -31,6 +31,9 @@
 from datahub.ingestion.api.auto_work_units.auto_dataset_properties_aspect import (
     auto_patch_last_modified,
 )
+from datahub.ingestion.api.auto_work_units.auto_ensure_aspect_size import (
+    EnsureAspectSizeProcessor,
+)
 from datahub.ingestion.api.closeable import Closeable
 from datahub.ingestion.api.common import PipelineContext, RecordEnvelope, WorkUnit
 from datahub.ingestion.api.report import Report
@@ -450,6 +453,7 @@ def get_workunit_processors(self) -> List[Optional[MetadataWorkUnitProcessor]]:
             browse_path_processor,
             partial(auto_workunit_reporter, self.get_report()),
             auto_patch_last_modified,
+            EnsureAspectSizeProcessor(self.get_report()).ensure_aspect_size,
         ]
 
     @staticmethod
diff --git a/metadata-ingestion/src/datahub/ingestion/source/unity/source.py b/metadata-ingestion/src/datahub/ingestion/source/unity/source.py
index 7bfa7fdb28aaf8..9d9a746580f939 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/unity/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/unity/source.py
@@ -26,9 +26,6 @@
     gen_containers,
 )
 from datahub.emitter.sql_parsing_builder import SqlParsingBuilder
-from datahub.ingestion.api.auto_work_units.auto_ensure_aspect_size import (
-    EnsureAspectSizeProcessor,
-)
 from datahub.ingestion.api.common import PipelineContext
 from datahub.ingestion.api.decorators import (
     SupportStatus,
@@ -263,7 +260,6 @@ def get_workunit_processors(self) -> List[Optional[MetadataWorkUnitProcessor]]:
             StaleEntityRemovalHandler.create(
                 self, self.config, self.ctx
             ).workunit_processor,
-            EnsureAspectSizeProcessor(self.get_report()).ensure_aspect_size,
         ]
 
     def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:

From 30a77c022a6cc65e4d487301349389f5361efa1b Mon Sep 17 00:00:00 2001
From: skrydal <piotr.skrydalewicz@acryl.io>
Date: Mon, 6 Jan 2025 22:12:56 +0100
Subject: [PATCH 029/249] fix(ingestion/classifier): temporary measure to avoid
 deadlocks for classifier (#12261)

---
 metadata-ingestion/docs/dev_guides/classification.md         | 4 ++--
 .../src/datahub/ingestion/glossary/classifier.py             | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/metadata-ingestion/docs/dev_guides/classification.md b/metadata-ingestion/docs/dev_guides/classification.md
index 39eac229a66013..457725b6783e52 100644
--- a/metadata-ingestion/docs/dev_guides/classification.md
+++ b/metadata-ingestion/docs/dev_guides/classification.md
@@ -7,10 +7,10 @@ The classification feature enables sources to be configured to automatically pre
 Note that a `.` is used to denote nested fields in the YAML recipe.
 
 | Field                     | Required | Type                                    | Description                                                                                                                                                                                                                                                                                                                              | Default                                                    |
-| ------------------------- | -------- | --------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------- |
+| ------------------------- | -------- | --------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |------------------------------------------------------------|
 | enabled                   |          | boolean                                 | Whether classification should be used to auto-detect glossary terms                                                                                                                                                                                                                                                                      | False                                                      |
 | sample_size               |          | int                                     | Number of sample values used for classification.                                                                                                                                                                                                                                                                                         | 100                                                        |
-| max_workers               |          | int                                     | Number of worker processes to use for classification. Set to 1 to disable.                                                                                                                                                                                                                                                               | Number of cpu cores or 4                                   |
+| max_workers               |          | int                                     | Number of worker processes to use for classification. Note that any number above 1 might lead to a deadlock. Set to 1 to disable.                                                                                                                                                                                                                                                               | 1                                                          |
 | info_type_to_term         |          | Dict[str,string]                        | Optional mapping to provide glossary term identifier for info type.                                                                                                                                                                                                                                                                      | By default, info type is used as glossary term identifier. |
 | classifiers               |          | Array of object                         | Classifiers to use to auto-detect glossary terms. If more than one classifier, infotype predictions from the classifier defined later in sequence take precedance.                                                                                                                                                                       | [{'type': 'datahub', 'config': None}]                      |
 | table_pattern             |          | AllowDenyPattern (see below for fields) | Regex patterns to filter tables for classification. This is used in combination with other patterns in parent config. Specify regex to match the entire table name in `database.schema.table` format. e.g. to match all tables starting with customer in Customer database and public schema, use the regex 'Customer.public.customer.*' | {'allow': ['.*'], 'deny': [], 'ignoreCase': True}          |
diff --git a/metadata-ingestion/src/datahub/ingestion/glossary/classifier.py b/metadata-ingestion/src/datahub/ingestion/glossary/classifier.py
index ddcb74e354613a..bdcdcb8990eba7 100644
--- a/metadata-ingestion/src/datahub/ingestion/glossary/classifier.py
+++ b/metadata-ingestion/src/datahub/ingestion/glossary/classifier.py
@@ -1,4 +1,3 @@
-import os
 from abc import ABCMeta, abstractmethod
 from dataclasses import dataclass
 from typing import Any, Dict, List, Optional
@@ -38,8 +37,8 @@ class ClassificationConfig(ConfigModel):
     )
 
     max_workers: int = Field(
-        default=(os.cpu_count() or 4),
-        description="Number of worker processes to use for classification. Set to 1 to disable.",
+        default=1,
+        description="Number of worker processes to use for classification. Note that any number above 1 might lead to a deadlock. Set to 1 to disable.",
     )
 
     table_pattern: AllowDenyPattern = Field(

From a06a229499bfd88eb800ae2808abc97e3b42a360 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Mon, 6 Jan 2025 18:29:51 -0500
Subject: [PATCH 030/249] feat(ingest/datahub): use stream_results with mysql
 (#12278)

---
 metadata-ingestion/setup.py                   |  2 +-
 .../ingestion/source/datahub/config.py        | 10 ++++++++++
 .../source/datahub/datahub_database_reader.py | 20 +++----------------
 .../source/datahub/datahub_source.py          |  2 +-
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py
index 5a48f8b7918dce..d5dbb98d3cb17b 100644
--- a/metadata-ingestion/setup.py
+++ b/metadata-ingestion/setup.py
@@ -461,7 +461,7 @@
     "mssql-odbc": sql_common | mssql_common | {"pyodbc"},
     "mysql": mysql,
     # mariadb should have same dependency as mysql
-    "mariadb": sql_common | {"pymysql>=1.0.2"},
+    "mariadb": sql_common | mysql,
     "okta": {"okta~=1.7.0", "nest-asyncio"},
     "oracle": sql_common | {"oracledb"},
     "postgres": sql_common | postgres_common,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/datahub/config.py b/metadata-ingestion/src/datahub/ingestion/source/datahub/config.py
index cd3c2146e6d848..09f38913f11b19 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/datahub/config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/datahub/config.py
@@ -1,6 +1,7 @@
 import os
 from typing import Optional, Set
 
+import pydantic
 from pydantic import Field, root_validator
 
 from datahub.configuration.common import AllowDenyPattern
@@ -119,3 +120,12 @@ def check_ingesting_data(cls, values):
                 " Please specify at least one of `database_connection` or `kafka_connection`, ideally both."
             )
         return values
+
+    @pydantic.validator("database_connection")
+    def validate_mysql_scheme(
+        cls, v: SQLAlchemyConnectionConfig
+    ) -> SQLAlchemyConnectionConfig:
+        if "mysql" in v.scheme:
+            if v.scheme != "mysql+pymysql":
+                raise ValueError("For MySQL, the scheme must be mysql+pymysql.")
+        return v
diff --git a/metadata-ingestion/src/datahub/ingestion/source/datahub/datahub_database_reader.py b/metadata-ingestion/src/datahub/ingestion/source/datahub/datahub_database_reader.py
index 80906ca63115f5..ee105f4862caba 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/datahub/datahub_database_reader.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/datahub/datahub_database_reader.py
@@ -151,8 +151,10 @@ def execute_server_cursor(
         self, query: str, params: Dict[str, Any]
     ) -> Iterable[Dict[str, Any]]:
         with self.engine.connect() as conn:
-            if self.engine.dialect.name == "postgresql":
+            if self.engine.dialect.name in ["postgresql", "mysql", "mariadb"]:
                 with conn.begin():  # Transaction required for PostgreSQL server-side cursor
+                    # Note that stream_results=True is mainly supported by PostgreSQL and MySQL-based dialects.
+                    # https://docs.sqlalchemy.org/en/14/core/connections.html#sqlalchemy.engine.Connection.execution_options.params.stream_results
                     conn = conn.execution_options(
                         stream_results=True,
                         yield_per=self.config.database_query_batch_size,
@@ -160,22 +162,6 @@ def execute_server_cursor(
                     result = conn.execute(query, params)
                     for row in result:
                         yield dict(row)
-            elif self.engine.dialect.name == "mysql":  # MySQL
-                import MySQLdb
-
-                with contextlib.closing(
-                    conn.connection.cursor(MySQLdb.cursors.SSCursor)
-                ) as cursor:
-                    logger.debug(f"Using Cursor type: {cursor.__class__.__name__}")
-                    cursor.execute(query, params)
-
-                    columns = [desc[0] for desc in cursor.description]
-                    while True:
-                        rows = cursor.fetchmany(self.config.database_query_batch_size)
-                        if not rows:
-                            break  # Use break instead of return in generator
-                        for row in rows:
-                            yield dict(zip(columns, row))
             else:
                 raise ValueError(f"Unsupported dialect: {self.engine.dialect.name}")
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/datahub/datahub_source.py b/metadata-ingestion/src/datahub/ingestion/source/datahub/datahub_source.py
index cb72441344088c..12daba298a2014 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/datahub/datahub_source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/datahub/datahub_source.py
@@ -130,7 +130,7 @@ def _get_database_workunits(
             self._commit_progress(i)
 
     def _get_kafka_workunits(
-        self, from_offsets: Dict[int, int], soft_deleted_urns: List[str] = []
+        self, from_offsets: Dict[int, int], soft_deleted_urns: List[str]
     ) -> Iterable[MetadataWorkUnit]:
         if self.config.kafka_connection is None:
             return

From 124e2006e11e3f94f131187c848877d65bb810b2 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Tue, 7 Jan 2025 16:42:08 +0530
Subject: [PATCH 031/249] ci: fix shellcheck warnings, update actions (#12281)

---
 .github/workflows/build-and-test.yml              | 4 ++--
 .github/workflows/close-stale-issues.yml          | 2 +-
 .github/workflows/contributor-open-pr-comment.yml | 6 +++---
 .github/workflows/docker-unified.yml              | 6 +++---
 .github/workflows/metadata-io.yml                 | 4 ++--
 .github/workflows/spark-smoke-test.yml            | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 784dce0f11b2b5..0cca80c8fdf982 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -113,7 +113,7 @@ jobs:
         if: ${{  matrix.command == 'except_metadata_ingestion' && needs.setup.outputs.backend_change == 'true' }}
         run: |
           ./gradlew -PjavaClassVersionDefault=8 :metadata-integration:java:spark-lineage:compileJava
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: Test Results (build)
@@ -152,7 +152,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Event File
           path: ${{ github.event_path }}
diff --git a/.github/workflows/close-stale-issues.yml b/.github/workflows/close-stale-issues.yml
index 98e3041f288040..005f41b767ea6d 100644
--- a/.github/workflows/close-stale-issues.yml
+++ b/.github/workflows/close-stale-issues.yml
@@ -10,7 +10,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v9
         with:
           ascending: true
           operations-per-run: 100
diff --git a/.github/workflows/contributor-open-pr-comment.yml b/.github/workflows/contributor-open-pr-comment.yml
index decc7ab27a411d..fe60601b0159bd 100644
--- a/.github/workflows/contributor-open-pr-comment.yml
+++ b/.github/workflows/contributor-open-pr-comment.yml
@@ -17,12 +17,12 @@ jobs:
       - name: Get and Format Username (PR only)
         if: github.event_name == 'pull_request'
         run: |
-          formatted_username=$(echo "${{ github.event.pull_request.user.login }}" | tr '[:upper:]' '[:lower:]' | sed 's/ /-/g')
-          echo "FORMATTED_USERNAME=$formatted_username" >> $GITHUB_ENV
+          formatted_username="$(echo "${{ github.event.pull_request.user.login }}" | tr '[:upper:]' '[:lower:]' | sed 's/ /-/g')"
+          echo "FORMATTED_USERNAME=${formatted_username}" >> "$GITHUB_ENV"
 
       - name: Create Comment (PR only)
         if: github.event_name == 'pull_request'
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             if (context.payload.pull_request) {
diff --git a/.github/workflows/docker-unified.yml b/.github/workflows/docker-unified.yml
index a5200c7e917d81..e44e6b11c6d057 100644
--- a/.github/workflows/docker-unified.yml
+++ b/.github/workflows/docker-unified.yml
@@ -1253,19 +1253,19 @@ jobs:
           TEST_STRATEGY="-${{ matrix.test_strategy }}-${{ matrix.batch }}"
           source .github/scripts/docker_logs.sh
       - name: Upload logs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: docker-logs-${{ matrix.test_strategy }}-${{ matrix.batch }}
           path: "docker_logs/*.log"
           retention-days: 5
       - name: Upload screenshots
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-snapshots-${{ matrix.test_strategy }}-${{ matrix.batch }}
           path: smoke-test/tests/cypress/cypress/screenshots/
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: Test Results (smoke tests) ${{ matrix.test_strategy }} ${{ matrix.batch }}
diff --git a/.github/workflows/metadata-io.yml b/.github/workflows/metadata-io.yml
index 2225baecde64c6..aedcd9257d83ba 100644
--- a/.github/workflows/metadata-io.yml
+++ b/.github/workflows/metadata-io.yml
@@ -70,7 +70,7 @@ jobs:
       - name: Gradle build (and test)
         run: |
           ./gradlew :metadata-io:test
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: Test Results (metadata-io)
@@ -95,7 +95,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Event File
           path: ${{ github.event_path }}
diff --git a/.github/workflows/spark-smoke-test.yml b/.github/workflows/spark-smoke-test.yml
index 23413336404f2b..e6a6705a72879c 100644
--- a/.github/workflows/spark-smoke-test.yml
+++ b/.github/workflows/spark-smoke-test.yml
@@ -72,14 +72,14 @@ jobs:
           docker logs elasticsearch >& elasticsearch-${{ matrix.test_strategy }}.log || true
           docker logs datahub-frontend-react >& frontend-${{ matrix.test_strategy }}.log || true
       - name: Upload logs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: docker logs
           path: |
             "**/build/container-logs/*.log"
             "*.log"
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: Test Results (smoke tests)

From f940c70c73acedc625257eb2a1a4aa5164738c02 Mon Sep 17 00:00:00 2001
From: skrydal <piotr.skrydalewicz@acryl.io>
Date: Tue, 7 Jan 2025 14:34:09 +0100
Subject: [PATCH 032/249] docs(business attribute): clarify support (#12260)

---
 docs/businessattributes.md | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/docs/businessattributes.md b/docs/businessattributes.md
index 3e912e7e609805..2359c2ac85b585 100644
--- a/docs/businessattributes.md
+++ b/docs/businessattributes.md
@@ -1,5 +1,10 @@
+import FeatureAvailability from '@site/src/components/FeatureAvailability';
+
 # Business Attributes
 
+<FeatureAvailability ossOnly />
+
+>**Note:** This is <b>BETA</b> feature
 
 ## What are Business Attributes
 A Business Attribute, as its name implies, is an attribute with a business focus. It embodies the traits or properties of an entity within a business framework. This attribute is a crucial piece of data for a business, utilised to define or control the entity throughout the organisation. If a business process or concept is depicted as a comprehensive logical model, then each Business Attribute can be considered as an individual component within that model. While business names and descriptions are generally managed through glossary terms, Business Attributes encompass additional characteristics such as data quality rules/assertions, data privacy markers, data usage protocols, standard tags, and supplementary documentation, alongside Names and Descriptions.
@@ -70,9 +75,11 @@ Description inherited from business attribute is greyed out to differentiate bet
 </p>
 
 ### Enable Business Attributes Feature
-By default, business attribute is disabled. To enable Business Attributes feature, set the following configuration in [application.yaml](../metadata-service/configuration/src/main/resources/application.yaml)
-
-businessAttributeEntityEnabled : true
+By default, business attribute is disabled. To enable Business Attributes feature, export environmental variable 
+(may be done via `extraEnvs` for GMS deployment):
+```shell
+BUSINESS_ATTRIBUTE_ENTITY_ENABLED=true
+```
 
 ### What updates are planned for the Business Attributes feature?
 

From 03e3f46175df71b83f2c3adcffd97a9962747698 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Tue, 7 Jan 2025 10:46:35 -0500
Subject: [PATCH 033/249] fix(airflow): fix tests with Airflow 2.4 (#12279)

---
 metadata-ingestion-modules/airflow-plugin/setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metadata-ingestion-modules/airflow-plugin/setup.py b/metadata-ingestion-modules/airflow-plugin/setup.py
index 2693aab0700da3..d07063dbffc5c4 100644
--- a/metadata-ingestion-modules/airflow-plugin/setup.py
+++ b/metadata-ingestion-modules/airflow-plugin/setup.py
@@ -119,6 +119,7 @@ def get_long_description():
         "pendulum<3.0",
         "Flask-Session<0.6.0",
         "connexion<3.0",
+        "marshmallow<3.24.0",
     },
 }
 

From afa94a588754c28c8e11f5aa0963808ba5ee6599 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Tue, 7 Jan 2025 17:00:13 -0500
Subject: [PATCH 034/249] fix(ingest): better correctness on the emitter ->
 graph conversion (#12272)

---
 .../src/datahub/cli/cli_utils.py              |  11 +-
 .../src/datahub/emitter/rest_emitter.py       | 209 +++++++++++-------
 .../src/datahub/ingestion/graph/client.py     |  25 ++-
 .../src/datahub/ingestion/graph/config.py     |   2 +-
 .../tests/unit/sdk/test_rest_emitter.py       |  32 +--
 5 files changed, 167 insertions(+), 112 deletions(-)

diff --git a/metadata-ingestion/src/datahub/cli/cli_utils.py b/metadata-ingestion/src/datahub/cli/cli_utils.py
index f80181192ba583..ca4a11b41925e5 100644
--- a/metadata-ingestion/src/datahub/cli/cli_utils.py
+++ b/metadata-ingestion/src/datahub/cli/cli_utils.py
@@ -3,7 +3,7 @@
 import time
 import typing
 from datetime import datetime
-from typing import Any, Dict, List, Optional, Tuple, Type, Union
+from typing import Any, Dict, List, Optional, Tuple, Type, TypeVar, Union
 
 import click
 import requests
@@ -33,6 +33,15 @@ def first_non_null(ls: List[Optional[str]]) -> Optional[str]:
     return next((el for el in ls if el is not None and el.strip() != ""), None)
 
 
+_T = TypeVar("_T")
+
+
+def get_or_else(value: Optional[_T], default: _T) -> _T:
+    # Normally we'd use `value or default`. However, that runs into issues
+    # when value is falsey but not None.
+    return value if value is not None else default
+
+
 def parse_run_restli_response(response: requests.Response) -> dict:
     response_json = response.json()
     if response.status_code != 200:
diff --git a/metadata-ingestion/src/datahub/emitter/rest_emitter.py b/metadata-ingestion/src/datahub/emitter/rest_emitter.py
index 7c67349c74db10..74b8ade7da445b 100644
--- a/metadata-ingestion/src/datahub/emitter/rest_emitter.py
+++ b/metadata-ingestion/src/datahub/emitter/rest_emitter.py
@@ -1,9 +1,21 @@
+from __future__ import annotations
+
 import functools
 import json
 import logging
 import os
 from json.decoder import JSONDecodeError
-from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Sequence, Union
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Dict,
+    List,
+    Optional,
+    Sequence,
+    Tuple,
+    Union,
+)
 
 import requests
 from deprecated import deprecated
@@ -12,9 +24,13 @@
 
 from datahub import nice_version_name
 from datahub.cli import config_utils
-from datahub.cli.cli_utils import ensure_has_system_metadata, fixup_gms_url
+from datahub.cli.cli_utils import ensure_has_system_metadata, fixup_gms_url, get_or_else
 from datahub.cli.env_utils import get_boolean_env_variable
-from datahub.configuration.common import ConfigurationError, OperationalError
+from datahub.configuration.common import (
+    ConfigModel,
+    ConfigurationError,
+    OperationalError,
+)
 from datahub.emitter.generic_emitter import Emitter
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.emitter.request_helper import make_curl_command
@@ -31,10 +47,8 @@
 
 logger = logging.getLogger(__name__)
 
-_DEFAULT_CONNECT_TIMEOUT_SEC = 30  # 30 seconds should be plenty to connect
-_DEFAULT_READ_TIMEOUT_SEC = (
-    30  # Any ingest call taking longer than 30 seconds should be abandoned
-)
+_DEFAULT_TIMEOUT_SEC = 30  # 30 seconds should be plenty to connect
+_TIMEOUT_LOWER_BOUND_SEC = 1  # if below this, we log a warning
 _DEFAULT_RETRY_STATUS_CODES = [  # Additional status codes to retry on
     429,
     500,
@@ -63,15 +77,76 @@
 )
 
 
+class RequestsSessionConfig(ConfigModel):
+    timeout: Union[float, Tuple[float, float], None] = _DEFAULT_TIMEOUT_SEC
+
+    retry_status_codes: List[int] = _DEFAULT_RETRY_STATUS_CODES
+    retry_methods: List[str] = _DEFAULT_RETRY_METHODS
+    retry_max_times: int = _DEFAULT_RETRY_MAX_TIMES
+
+    extra_headers: Dict[str, str] = {}
+
+    ca_certificate_path: Optional[str] = None
+    client_certificate_path: Optional[str] = None
+    disable_ssl_verification: bool = False
+
+    def build_session(self) -> requests.Session:
+        session = requests.Session()
+
+        if self.extra_headers:
+            session.headers.update(self.extra_headers)
+
+        if self.client_certificate_path:
+            session.cert = self.client_certificate_path
+
+        if self.ca_certificate_path:
+            session.verify = self.ca_certificate_path
+
+        if self.disable_ssl_verification:
+            session.verify = False
+
+        try:
+            # Set raise_on_status to False to propagate errors:
+            # https://stackoverflow.com/questions/70189330/determine-status-code-from-python-retry-exception
+            # Must call `raise_for_status` after making a request, which we do
+            retry_strategy = Retry(
+                total=self.retry_max_times,
+                status_forcelist=self.retry_status_codes,
+                backoff_factor=2,
+                allowed_methods=self.retry_methods,
+                raise_on_status=False,
+            )
+        except TypeError:
+            # Prior to urllib3 1.26, the Retry class used `method_whitelist` instead of `allowed_methods`.
+            retry_strategy = Retry(
+                total=self.retry_max_times,
+                status_forcelist=self.retry_status_codes,
+                backoff_factor=2,
+                method_whitelist=self.retry_methods,
+                raise_on_status=False,
+            )
+
+        adapter = HTTPAdapter(
+            pool_connections=100, pool_maxsize=100, max_retries=retry_strategy
+        )
+        session.mount("http://", adapter)
+        session.mount("https://", adapter)
+
+        if self.timeout is not None:
+            # Shim session.request to apply default timeout values.
+            # Via https://stackoverflow.com/a/59317604.
+            session.request = functools.partial(  # type: ignore
+                session.request,
+                timeout=self.timeout,
+            )
+
+        return session
+
+
 class DataHubRestEmitter(Closeable, Emitter):
     _gms_server: str
     _token: Optional[str]
     _session: requests.Session
-    _connect_timeout_sec: float = _DEFAULT_CONNECT_TIMEOUT_SEC
-    _read_timeout_sec: float = _DEFAULT_READ_TIMEOUT_SEC
-    _retry_status_codes: List[int] = _DEFAULT_RETRY_STATUS_CODES
-    _retry_methods: List[str] = _DEFAULT_RETRY_METHODS
-    _retry_max_times: int = _DEFAULT_RETRY_MAX_TIMES
 
     def __init__(
         self,
@@ -102,15 +177,13 @@ def __init__(
 
         self._session = requests.Session()
 
-        self._session.headers.update(
-            {
-                "X-RestLi-Protocol-Version": "2.0.0",
-                "X-DataHub-Py-Cli-Version": nice_version_name(),
-                "Content-Type": "application/json",
-            }
-        )
+        headers = {
+            "X-RestLi-Protocol-Version": "2.0.0",
+            "X-DataHub-Py-Cli-Version": nice_version_name(),
+            "Content-Type": "application/json",
+        }
         if token:
-            self._session.headers.update({"Authorization": f"Bearer {token}"})
+            headers["Authorization"] = f"Bearer {token}"
         else:
             # HACK: When no token is provided but system auth env variables are set, we use them.
             # Ideally this should simply get passed in as config, instead of being sneakily injected
@@ -119,75 +192,43 @@ def __init__(
             # rest emitter, and the rest sink uses the rest emitter under the hood.
             system_auth = config_utils.get_system_auth()
             if system_auth is not None:
-                self._session.headers.update({"Authorization": system_auth})
-
-        if extra_headers:
-            self._session.headers.update(extra_headers)
-
-        if client_certificate_path:
-            self._session.cert = client_certificate_path
-
-        if ca_certificate_path:
-            self._session.verify = ca_certificate_path
-
-        if disable_ssl_verification:
-            self._session.verify = False
-
-        self._connect_timeout_sec = (
-            connect_timeout_sec or timeout_sec or _DEFAULT_CONNECT_TIMEOUT_SEC
-        )
-        self._read_timeout_sec = (
-            read_timeout_sec or timeout_sec or _DEFAULT_READ_TIMEOUT_SEC
-        )
-
-        if self._connect_timeout_sec < 1 or self._read_timeout_sec < 1:
-            logger.warning(
-                f"Setting timeout values lower than 1 second is not recommended. Your configuration is connect_timeout:{self._connect_timeout_sec}s, read_timeout:{self._read_timeout_sec}s"
-            )
-
-        if retry_status_codes is not None:  # Only if missing. Empty list is allowed
-            self._retry_status_codes = retry_status_codes
-
-        if retry_methods is not None:
-            self._retry_methods = retry_methods
-
-        if retry_max_times:
-            self._retry_max_times = retry_max_times
+                headers["Authorization"] = system_auth
 
-        try:
-            # Set raise_on_status to False to propagate errors:
-            # https://stackoverflow.com/questions/70189330/determine-status-code-from-python-retry-exception
-            # Must call `raise_for_status` after making a request, which we do
-            retry_strategy = Retry(
-                total=self._retry_max_times,
-                status_forcelist=self._retry_status_codes,
-                backoff_factor=2,
-                allowed_methods=self._retry_methods,
-                raise_on_status=False,
-            )
-        except TypeError:
-            # Prior to urllib3 1.26, the Retry class used `method_whitelist` instead of `allowed_methods`.
-            retry_strategy = Retry(
-                total=self._retry_max_times,
-                status_forcelist=self._retry_status_codes,
-                backoff_factor=2,
-                method_whitelist=self._retry_methods,
-                raise_on_status=False,
+        timeout: float | tuple[float, float]
+        if connect_timeout_sec is not None or read_timeout_sec is not None:
+            timeout = (
+                connect_timeout_sec or timeout_sec or _DEFAULT_TIMEOUT_SEC,
+                read_timeout_sec or timeout_sec or _DEFAULT_TIMEOUT_SEC,
             )
+            if (
+                timeout[0] < _TIMEOUT_LOWER_BOUND_SEC
+                or timeout[1] < _TIMEOUT_LOWER_BOUND_SEC
+            ):
+                logger.warning(
+                    f"Setting timeout values lower than {_TIMEOUT_LOWER_BOUND_SEC} second is not recommended. Your configuration is (connect_timeout, read_timeout) = {timeout} seconds"
+                )
+        else:
+            timeout = get_or_else(timeout_sec, _DEFAULT_TIMEOUT_SEC)
+            if timeout < _TIMEOUT_LOWER_BOUND_SEC:
+                logger.warning(
+                    f"Setting timeout values lower than {_TIMEOUT_LOWER_BOUND_SEC} second is not recommended. Your configuration is timeout = {timeout} seconds"
+                )
 
-        adapter = HTTPAdapter(
-            pool_connections=100, pool_maxsize=100, max_retries=retry_strategy
-        )
-        self._session.mount("http://", adapter)
-        self._session.mount("https://", adapter)
-
-        # Shim session.request to apply default timeout values.
-        # Via https://stackoverflow.com/a/59317604.
-        self._session.request = functools.partial(  # type: ignore
-            self._session.request,
-            timeout=(self._connect_timeout_sec, self._read_timeout_sec),
+        self._session_config = RequestsSessionConfig(
+            timeout=timeout,
+            retry_status_codes=get_or_else(
+                retry_status_codes, _DEFAULT_RETRY_STATUS_CODES
+            ),
+            retry_methods=get_or_else(retry_methods, _DEFAULT_RETRY_METHODS),
+            retry_max_times=get_or_else(retry_max_times, _DEFAULT_RETRY_MAX_TIMES),
+            extra_headers={**headers, **(extra_headers or {})},
+            ca_certificate_path=ca_certificate_path,
+            client_certificate_path=client_certificate_path,
+            disable_ssl_verification=disable_ssl_verification,
         )
 
+        self._session = self._session_config.build_session()
+
     def test_connection(self) -> None:
         url = f"{self._gms_server}/config"
         response = self._session.get(url)
diff --git a/metadata-ingestion/src/datahub/ingestion/graph/client.py b/metadata-ingestion/src/datahub/ingestion/graph/client.py
index ca9a41172e5b6e..7de6e8130a7ab6 100644
--- a/metadata-ingestion/src/datahub/ingestion/graph/client.py
+++ b/metadata-ingestion/src/datahub/ingestion/graph/client.py
@@ -179,21 +179,24 @@ def frontend_base_url(self) -> str:
 
     @classmethod
     def from_emitter(cls, emitter: DatahubRestEmitter) -> "DataHubGraph":
+        session_config = emitter._session_config
+        if isinstance(session_config.timeout, tuple):
+            # TODO: This is slightly lossy. Eventually, we want to modify the emitter
+            # to accept a tuple for timeout_sec, and then we'll be able to remove this.
+            timeout_sec: Optional[float] = session_config.timeout[0]
+        else:
+            timeout_sec = session_config.timeout
         return cls(
             DatahubClientConfig(
                 server=emitter._gms_server,
                 token=emitter._token,
-                timeout_sec=emitter._read_timeout_sec,
-                retry_status_codes=emitter._retry_status_codes,
-                retry_max_times=emitter._retry_max_times,
-                extra_headers=emitter._session.headers,
-                disable_ssl_verification=emitter._session.verify is False,
-                ca_certificate_path=(
-                    emitter._session.verify
-                    if isinstance(emitter._session.verify, str)
-                    else None
-                ),
-                client_certificate_path=emitter._session.cert,
+                timeout_sec=timeout_sec,
+                retry_status_codes=session_config.retry_status_codes,
+                retry_max_times=session_config.retry_max_times,
+                extra_headers=session_config.extra_headers,
+                disable_ssl_verification=session_config.disable_ssl_verification,
+                ca_certificate_path=session_config.ca_certificate_path,
+                client_certificate_path=session_config.client_certificate_path,
             )
         )
 
diff --git a/metadata-ingestion/src/datahub/ingestion/graph/config.py b/metadata-ingestion/src/datahub/ingestion/graph/config.py
index 5f269e14e1a4af..8f0a5844c97c4b 100644
--- a/metadata-ingestion/src/datahub/ingestion/graph/config.py
+++ b/metadata-ingestion/src/datahub/ingestion/graph/config.py
@@ -10,7 +10,7 @@ class DatahubClientConfig(ConfigModel):
     # by callers / the CLI, but the actual client should not have any magic.
     server: str
     token: Optional[str] = None
-    timeout_sec: Optional[int] = None
+    timeout_sec: Optional[float] = None
     retry_status_codes: Optional[List[int]] = None
     retry_max_times: Optional[int] = None
     extra_headers: Optional[Dict[str, str]] = None
diff --git a/metadata-ingestion/tests/unit/sdk/test_rest_emitter.py b/metadata-ingestion/tests/unit/sdk/test_rest_emitter.py
index b4d7cb17b66f5c..81120dfc87aba3 100644
--- a/metadata-ingestion/tests/unit/sdk/test_rest_emitter.py
+++ b/metadata-ingestion/tests/unit/sdk/test_rest_emitter.py
@@ -4,39 +4,41 @@
 MOCK_GMS_ENDPOINT = "http://fakegmshost:8080"
 
 
-def test_datahub_rest_emitter_construction():
+def test_datahub_rest_emitter_construction() -> None:
     emitter = DatahubRestEmitter(MOCK_GMS_ENDPOINT)
-    assert emitter._connect_timeout_sec == rest_emitter._DEFAULT_CONNECT_TIMEOUT_SEC
-    assert emitter._read_timeout_sec == rest_emitter._DEFAULT_READ_TIMEOUT_SEC
-    assert emitter._retry_status_codes == rest_emitter._DEFAULT_RETRY_STATUS_CODES
-    assert emitter._retry_max_times == rest_emitter._DEFAULT_RETRY_MAX_TIMES
+    assert emitter._session_config.timeout == rest_emitter._DEFAULT_TIMEOUT_SEC
+    assert (
+        emitter._session_config.retry_status_codes
+        == rest_emitter._DEFAULT_RETRY_STATUS_CODES
+    )
+    assert (
+        emitter._session_config.retry_max_times == rest_emitter._DEFAULT_RETRY_MAX_TIMES
+    )
 
 
-def test_datahub_rest_emitter_timeout_construction():
+def test_datahub_rest_emitter_timeout_construction() -> None:
     emitter = DatahubRestEmitter(
         MOCK_GMS_ENDPOINT, connect_timeout_sec=2, read_timeout_sec=4
     )
-    assert emitter._connect_timeout_sec == 2
-    assert emitter._read_timeout_sec == 4
+    assert emitter._session_config.timeout == (2, 4)
 
 
-def test_datahub_rest_emitter_general_timeout_construction():
+def test_datahub_rest_emitter_general_timeout_construction() -> None:
     emitter = DatahubRestEmitter(MOCK_GMS_ENDPOINT, timeout_sec=2, read_timeout_sec=4)
-    assert emitter._connect_timeout_sec == 2
-    assert emitter._read_timeout_sec == 4
+    assert emitter._session_config.timeout == (2, 4)
 
 
-def test_datahub_rest_emitter_retry_construction():
+def test_datahub_rest_emitter_retry_construction() -> None:
     emitter = DatahubRestEmitter(
         MOCK_GMS_ENDPOINT,
         retry_status_codes=[418],
         retry_max_times=42,
     )
-    assert emitter._retry_status_codes == [418]
-    assert emitter._retry_max_times == 42
+    assert emitter._session_config.retry_status_codes == [418]
+    assert emitter._session_config.retry_max_times == 42
 
 
-def test_datahub_rest_emitter_extra_params():
+def test_datahub_rest_emitter_extra_params() -> None:
     emitter = DatahubRestEmitter(
         MOCK_GMS_ENDPOINT, extra_headers={"key1": "value1", "key2": "value2"}
     )

From cbb36bbe590812b525e6f92608279c624123333c Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Tue, 7 Jan 2025 19:23:58 -0500
Subject: [PATCH 035/249] feat(ingest): configurable query generation in
 combined sources (#12284)

---
 .../src/datahub/ingestion/source/bigquery_v2/bigquery.py  | 2 ++
 .../ingestion/source/bigquery_v2/bigquery_config.py       | 8 ++++++++
 .../ingestion/source/snowflake/snowflake_config.py        | 8 ++++++++
 .../datahub/ingestion/source/snowflake/snowflake_v2.py    | 2 ++
 4 files changed, 20 insertions(+)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py
index 38eab3606b7e95..db7b0540e49e71 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py
@@ -281,6 +281,8 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                     include_lineage=self.config.include_table_lineage,
                     include_usage_statistics=self.config.include_usage_statistics,
                     include_operations=self.config.usage.include_operational_stats,
+                    include_queries=self.config.include_queries,
+                    include_query_usage_statistics=self.config.include_query_usage_statistics,
                     top_n_queries=self.config.usage.top_n_queries,
                     region_qualifiers=self.config.region_qualifiers,
                 ),
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_config.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_config.py
index ef323260b014e6..afbe919df4dcae 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_config.py
@@ -447,6 +447,14 @@ class BigQueryV2Config(
         default=False,
         description="If enabled, uses the new queries extractor to extract queries from bigquery.",
     )
+    include_queries: bool = Field(
+        default=True,
+        description="If enabled, generate query entities associated with lineage edges. Only applicable if `use_queries_v2` is enabled.",
+    )
+    include_query_usage_statistics: bool = Field(
+        default=True,
+        description="If enabled, generate query popularity statistics. Only applicable if `use_queries_v2` is enabled.",
+    )
 
     @property
     def have_table_data_read_permission(self) -> bool:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
index 12e5fb72b00de8..2d61ce59857778 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
@@ -221,6 +221,14 @@ class SnowflakeV2Config(
         default=False,
         description="If enabled, uses the new queries extractor to extract queries from snowflake.",
     )
+    include_queries: bool = Field(
+        default=True,
+        description="If enabled, generate query entities associated with lineage edges. Only applicable if `use_queries_v2` is enabled.",
+    )
+    include_query_usage_statistics: bool = Field(
+        default=True,
+        description="If enabled, generate query popularity statistics. Only applicable if `use_queries_v2` is enabled.",
+    )
 
     lazy_schema_resolver: bool = Field(
         default=True,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
index 954e8a29c1a1bd..aede3d056709a2 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
@@ -528,6 +528,8 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                     include_lineage=self.config.include_table_lineage,
                     include_usage_statistics=self.config.include_usage_stats,
                     include_operations=self.config.include_operational_stats,
+                    include_queries=self.config.include_queries,
+                    include_query_usage_statistics=self.config.include_query_usage_statistics,
                     user_email_pattern=self.config.user_email_pattern,
                 ),
                 structured_report=self.report,

From 98a5a2c086df1667a1b669410efaeafbeb5e3d8b Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Wed, 8 Jan 2025 06:34:10 -0600
Subject: [PATCH 036/249] fix(javaEntityClient): correct config parameter
 (#12287)

---
 .../java/com/linkedin/metadata/client/JavaEntityClient.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/metadata-io/src/main/java/com/linkedin/metadata/client/JavaEntityClient.java b/metadata-io/src/main/java/com/linkedin/metadata/client/JavaEntityClient.java
index 3d35f5956b0f4f..35d133c74c0692 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/client/JavaEntityClient.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/client/JavaEntityClient.java
@@ -775,7 +775,8 @@ public List<String> batchIngestProposals(
 
     List<String> updatedUrns = new ArrayList<>();
     Iterators.partition(
-            metadataChangeProposals.iterator(), Math.max(1, entityClientConfig.getBatchGetV2Size()))
+            metadataChangeProposals.iterator(),
+            Math.max(1, entityClientConfig.getBatchIngestSize()))
         .forEachRemaining(
             batch -> {
               AspectsBatch aspectsBatch =

From c0b13f087aaff9898ab8377259fb0b691b128ca0 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Wed, 8 Jan 2025 18:40:19 +0530
Subject: [PATCH 037/249] ci: upload test coverage to codecov (#12291)

---
 .github/workflows/airflow-plugin.yml     | 5 +++++
 .github/workflows/build-and-test.yml     | 5 +++++
 .github/workflows/dagster-plugin.yml     | 5 +++++
 .github/workflows/gx-plugin.yml          | 5 +++++
 .github/workflows/metadata-ingestion.yml | 5 +++++
 .github/workflows/metadata-io.yml        | 5 +++++
 .github/workflows/prefect-plugin.yml     | 5 +++++
 7 files changed, 35 insertions(+)

diff --git a/.github/workflows/airflow-plugin.yml b/.github/workflows/airflow-plugin.yml
index b824a21be63f8f..89e0c9e2513d8b 100644
--- a/.github/workflows/airflow-plugin.yml
+++ b/.github/workflows/airflow-plugin.yml
@@ -87,6 +87,11 @@ jobs:
           flags: airflow-${{ matrix.python-version }}-${{ matrix.extra_pip_extras }}
           name: pytest-airflow
           verbose: true
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   event-file:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 0cca80c8fdf982..058ac4a5c9b1e5 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -134,6 +134,11 @@ jobs:
           flags: ${{ matrix.timezone }}
           name: ${{ matrix.command }}
           verbose: true
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   quickstart-compose-validation:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/dagster-plugin.yml b/.github/workflows/dagster-plugin.yml
index ae9a0b1605cdf3..c29e72367c53c5 100644
--- a/.github/workflows/dagster-plugin.yml
+++ b/.github/workflows/dagster-plugin.yml
@@ -74,6 +74,11 @@ jobs:
           flags: dagster-${{ matrix.python-version }}-${{ matrix.extraPythonRequirement }}
           name: pytest-dagster
           verbose: true
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   event-file:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/gx-plugin.yml b/.github/workflows/gx-plugin.yml
index 2fd814a0764858..825f8beda2f561 100644
--- a/.github/workflows/gx-plugin.yml
+++ b/.github/workflows/gx-plugin.yml
@@ -78,6 +78,11 @@ jobs:
           flags: gx-${{ matrix.python-version }}-${{ matrix.extraPythonRequirement }}
           name: pytest-gx
           verbose: true
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   event-file:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/metadata-ingestion.yml b/.github/workflows/metadata-ingestion.yml
index f4d87b361b5edc..aa404c4c35c505 100644
--- a/.github/workflows/metadata-ingestion.yml
+++ b/.github/workflows/metadata-ingestion.yml
@@ -98,6 +98,11 @@ jobs:
           flags: ingestion-${{ matrix.python-version }}-${{ matrix.command }}
           name: pytest-ingestion
           verbose: true
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   event-file:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/metadata-io.yml b/.github/workflows/metadata-io.yml
index aedcd9257d83ba..bcadc641ee2f7c 100644
--- a/.github/workflows/metadata-io.yml
+++ b/.github/workflows/metadata-io.yml
@@ -90,6 +90,11 @@ jobs:
           fail_ci_if_error: false
           name: metadata-io-test
           verbose: true
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   event-file:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/prefect-plugin.yml b/.github/workflows/prefect-plugin.yml
index 879df032409f28..0bce4d5ef19f31 100644
--- a/.github/workflows/prefect-plugin.yml
+++ b/.github/workflows/prefect-plugin.yml
@@ -70,6 +70,11 @@ jobs:
           flags: prefect-${{ matrix.python-version }}
           name: pytest-prefect
           verbose: true
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   event-file:
     runs-on: ubuntu-latest

From 333445326a627a28353f1def04955f5812dc17bb Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Wed, 8 Jan 2025 18:50:07 +0530
Subject: [PATCH 038/249] log(elastic/index builder): add est time remaining
 (#12280)

---
 .../indexbuilder/ESIndexBuilder.java          | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/indexbuilder/ESIndexBuilder.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/indexbuilder/ESIndexBuilder.java
index 6de79b6c4b181e..792e67e69f2da6 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/indexbuilder/ESIndexBuilder.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/indexbuilder/ESIndexBuilder.java
@@ -411,6 +411,8 @@ private void reindex(ReindexConfig indexState) throws Throwable {
       boolean reindexTaskCompleted = false;
       Pair<Long, Long> documentCounts = getDocumentCounts(indexState.name(), tempIndexName);
       long documentCountsLastUpdated = System.currentTimeMillis();
+      long previousDocCount = documentCounts.getSecond();
+      long estimatedMinutesRemaining = 0;
 
       while (System.currentTimeMillis() < timeoutAt) {
         log.info(
@@ -421,8 +423,22 @@ private void reindex(ReindexConfig indexState) throws Throwable {
 
         Pair<Long, Long> tempDocumentsCount = getDocumentCounts(indexState.name(), tempIndexName);
         if (!tempDocumentsCount.equals(documentCounts)) {
-          documentCountsLastUpdated = System.currentTimeMillis();
+          long currentTime = System.currentTimeMillis();
+          long timeElapsed = currentTime - documentCountsLastUpdated;
+          long docsIndexed = tempDocumentsCount.getSecond() - previousDocCount;
+
+          // Calculate indexing rate (docs per millisecond)
+          double indexingRate = timeElapsed > 0 ? (double) docsIndexed / timeElapsed : 0;
+
+          // Calculate remaining docs and estimated time
+          long remainingDocs = tempDocumentsCount.getFirst() - tempDocumentsCount.getSecond();
+          long estimatedMillisRemaining =
+              indexingRate > 0 ? (long) (remainingDocs / indexingRate) : 0;
+          estimatedMinutesRemaining = estimatedMillisRemaining / (1000 * 60);
+
+          documentCountsLastUpdated = currentTime;
           documentCounts = tempDocumentsCount;
+          previousDocCount = documentCounts.getSecond();
         }
 
         if (documentCounts.getFirst().equals(documentCounts.getSecond())) {
@@ -435,12 +451,15 @@ private void reindex(ReindexConfig indexState) throws Throwable {
           break;
 
         } else {
+          float progressPercentage =
+              100 * (1.0f * documentCounts.getSecond()) / documentCounts.getFirst();
           log.warn(
-              "Task: {} - Document counts do not match {} != {}. Complete: {}%",
+              "Task: {} - Document counts do not match {} != {}. Complete: {}%. Estimated time remaining: {} minutes",
               parentTaskId,
               documentCounts.getFirst(),
               documentCounts.getSecond(),
-              100 * (1.0f * documentCounts.getSecond()) / documentCounts.getFirst());
+              progressPercentage,
+              estimatedMinutesRemaining);
 
           long lastUpdateDelta = System.currentTimeMillis() - documentCountsLastUpdated;
           if (lastUpdateDelta > (300 * 1000)) {

From 99c30f2b3c80ed55a7c39448ffc8fad3bfc010f3 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Wed, 8 Jan 2025 19:04:19 +0530
Subject: [PATCH 039/249] fix(ingest/glue): don't fail on profile (#12288)

---
 .../src/datahub/ingestion/source/aws/glue.py  | 87 +++++++++++--------
 1 file changed, 52 insertions(+), 35 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py b/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
index 7a5ed154d40bc7..a0bed4ae9a7581 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
@@ -1054,49 +1054,66 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
             yield from self.gen_database_containers(database)
 
         for table in tables:
-            database_name = table["DatabaseName"]
             table_name = table["Name"]
-            full_table_name = f"{database_name}.{table_name}"
-            self.report.report_table_scanned()
-            if not self.source_config.database_pattern.allowed(
-                database_name
-            ) or not self.source_config.table_pattern.allowed(full_table_name):
-                self.report.report_table_dropped(full_table_name)
-                continue
+            try:
+                yield from self._gen_table_wu(table=table)
+            except KeyError as e:
+                self.report.report_failure(
+                    message="Failed to extract workunit for table",
+                    context=f"Table: {table_name}",
+                    exc=e,
+                )
+        if self.extract_transforms:
+            yield from self._transform_extraction()
 
-            dataset_urn = make_dataset_urn_with_platform_instance(
-                platform=self.platform,
-                name=full_table_name,
-                env=self.env,
-                platform_instance=self.source_config.platform_instance,
-            )
+    def _gen_table_wu(self, table: Dict) -> Iterable[MetadataWorkUnit]:
+        database_name = table["DatabaseName"]
+        table_name = table["Name"]
+        full_table_name = f"{database_name}.{table_name}"
+        self.report.report_table_scanned()
+        if not self.source_config.database_pattern.allowed(
+            database_name
+        ) or not self.source_config.table_pattern.allowed(full_table_name):
+            self.report.report_table_dropped(full_table_name)
+            return
+
+        dataset_urn = make_dataset_urn_with_platform_instance(
+            platform=self.platform,
+            name=full_table_name,
+            env=self.env,
+            platform_instance=self.source_config.platform_instance,
+        )
 
-            mce = self._extract_record(dataset_urn, table, full_table_name)
-            yield MetadataWorkUnit(full_table_name, mce=mce)
+        mce = self._extract_record(dataset_urn, table, full_table_name)
+        yield MetadataWorkUnit(full_table_name, mce=mce)
 
-            # We also want to assign "table" subType to the dataset representing glue table - unfortunately it is not
-            # possible via Dataset snapshot embedded in a mce, so we have to generate a mcp.
-            yield MetadataChangeProposalWrapper(
-                entityUrn=dataset_urn,
-                aspect=SubTypes(typeNames=[DatasetSubTypes.TABLE]),
-            ).as_workunit()
+        # We also want to assign "table" subType to the dataset representing glue table - unfortunately it is not
+        # possible via Dataset snapshot embedded in a mce, so we have to generate a mcp.
+        yield MetadataChangeProposalWrapper(
+            entityUrn=dataset_urn,
+            aspect=SubTypes(typeNames=[DatasetSubTypes.TABLE]),
+        ).as_workunit()
 
-            yield from self._get_domain_wu(
-                dataset_name=full_table_name,
-                entity_urn=dataset_urn,
-            )
-            yield from self.add_table_to_database_container(
-                dataset_urn=dataset_urn, db_name=database_name
-            )
+        yield from self._get_domain_wu(
+            dataset_name=full_table_name,
+            entity_urn=dataset_urn,
+        )
+        yield from self.add_table_to_database_container(
+            dataset_urn=dataset_urn, db_name=database_name
+        )
 
-            wu = self.get_lineage_if_enabled(mce)
-            if wu:
-                yield wu
+        wu = self.get_lineage_if_enabled(mce)
+        if wu:
+            yield wu
 
+        try:
             yield from self.get_profile_if_enabled(mce, database_name, table_name)
-
-        if self.extract_transforms:
-            yield from self._transform_extraction()
+        except KeyError as e:
+            self.report.report_failure(
+                message="Failed to extract profile for table",
+                context=f"Table: {dataset_urn}",
+                exc=e,
+            )
 
     def _transform_extraction(self) -> Iterable[MetadataWorkUnit]:
         dags: Dict[str, Optional[Dict[str, Any]]] = {}

From 0fe4163332eec5cf527ee0a0110507eb8934c4c9 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Wed, 8 Jan 2025 19:13:31 +0530
Subject: [PATCH 040/249] fix(ingest/gc): also query data process instance
 (#12292)

---
 .../source/gc/soft_deleted_entity_cleanup.py   | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py b/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
index 32243106bb53f6..0a52b7e17bf714 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
@@ -19,8 +19,8 @@
 
 logger = logging.getLogger(__name__)
 
-QUERY_QUERY_ENTITY = """
-query listQueries($input: ScrollAcrossEntitiesInput!) {
+QUERY_ENTITIES = """
+query listEntities($input: ScrollAcrossEntitiesInput!) {
   scrollAcrossEntities(input: $input) {
     nextScrollId
     count
@@ -29,6 +29,9 @@
         ... on QueryEntity {
           urn
         }
+        ... on DataProcessInstance {
+          urn
+        }
       }
     }
   }
@@ -225,16 +228,16 @@ def _process_futures(self, futures: Dict[Future, str]) -> Dict[Future, str]:
                     time.sleep(self.config.delay)
         return futures
 
-    def _get_soft_deleted_queries(self) -> Iterable[str]:
+    def _get_soft_deleted(self, graphql_query: str, entity_type: str) -> Iterable[str]:
         assert self.ctx.graph
         scroll_id: Optional[str] = None
         while True:
             try:
                 result = self.ctx.graph.execute_graphql(
-                    QUERY_QUERY_ENTITY,
+                    graphql_query,
                     {
                         "input": {
-                            "types": ["QUERY"],
+                            "types": [entity_type],
                             "query": "*",
                             "scrollId": scroll_id if scroll_id else None,
                             "count": self.config.batch_size,
@@ -254,7 +257,7 @@ def _get_soft_deleted_queries(self) -> Iterable[str]:
                 )
             except Exception as e:
                 self.report.failure(
-                    f"While trying to get queries with {scroll_id}", exc=e
+                    f"While trying to get {entity_type} with {scroll_id}", exc=e
                 )
                 break
             scroll_across_entities = result.get("scrollAcrossEntities")
@@ -275,7 +278,8 @@ def _get_urns(self) -> Iterable[str]:
             status=RemovedStatusFilter.ONLY_SOFT_DELETED,
             batch_size=self.config.batch_size,
         )
-        yield from self._get_soft_deleted_queries()
+        yield from self._get_soft_deleted(QUERY_ENTITIES, "QUERY")
+        yield from self._get_soft_deleted(QUERY_ENTITIES, "DATA_PROCESS_INSTANCE")
 
     def _times_up(self) -> bool:
         if (

From a4c47fa343cec4e6bc7addc11c553bace0a852a9 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Wed, 8 Jan 2025 19:46:57 +0530
Subject: [PATCH 041/249] fix(cli): correct url ending with acryl.io:8080
 (#12289)

---
 metadata-ingestion/src/datahub/cli/cli_utils.py     | 2 ++
 metadata-ingestion/tests/unit/cli/test_cli_utils.py | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/metadata-ingestion/src/datahub/cli/cli_utils.py b/metadata-ingestion/src/datahub/cli/cli_utils.py
index ca4a11b41925e5..f6b5ba6176c59d 100644
--- a/metadata-ingestion/src/datahub/cli/cli_utils.py
+++ b/metadata-ingestion/src/datahub/cli/cli_utils.py
@@ -330,6 +330,8 @@ def get_frontend_session_login_as(
 def _ensure_valid_gms_url_acryl_cloud(url: str) -> str:
     if "acryl.io" not in url:
         return url
+    if url.endswith(":8080"):
+        url = url.replace(":8080", "")
     if url.startswith("http://"):
         url = url.replace("http://", "https://")
     if url.endswith("acryl.io"):
diff --git a/metadata-ingestion/tests/unit/cli/test_cli_utils.py b/metadata-ingestion/tests/unit/cli/test_cli_utils.py
index c9693c75d96fe9..c430f585200e5a 100644
--- a/metadata-ingestion/tests/unit/cli/test_cli_utils.py
+++ b/metadata-ingestion/tests/unit/cli/test_cli_utils.py
@@ -70,6 +70,10 @@ def test_fixup_gms_url():
         cli_utils.fixup_gms_url("http://abc.acryl.io/api/gms")
         == "https://abc.acryl.io/gms"
     )
+    assert (
+        cli_utils.fixup_gms_url("http://abcd.acryl.io:8080")
+        == "https://abcd.acryl.io/gms"
+    )
 
 
 def test_guess_frontend_url_from_gms_url():

From 58b6a5bee54f23a6ea1801d9f1f92d3f3600b763 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Wed, 8 Jan 2025 21:57:55 +0530
Subject: [PATCH 042/249] dev: add pre-commit hooks installed by default
 (#12293)

---
 .github/scripts/generate_pre_commit.py   | 265 +++++++++++++++
 .github/scripts/pre-commit-override.yaml |   8 +
 .pre-commit-config.yaml                  | 402 +++++++++++++++++++++--
 build.gradle                             |   4 -
 settings.gradle                          |  49 +++
 5 files changed, 700 insertions(+), 28 deletions(-)
 create mode 100755 .github/scripts/generate_pre_commit.py
 create mode 100644 .github/scripts/pre-commit-override.yaml

diff --git a/.github/scripts/generate_pre_commit.py b/.github/scripts/generate_pre_commit.py
new file mode 100755
index 00000000000000..740d3c20d263b0
--- /dev/null
+++ b/.github/scripts/generate_pre_commit.py
@@ -0,0 +1,265 @@
+"""Generate pre-commit hooks for Java and Python projects.
+
+This script scans a repository for Java and Python projects and generates appropriate
+pre-commit hooks for linting and formatting. It also merges in additional hooks from
+an override file.
+"""
+
+import os
+from dataclasses import dataclass
+from enum import Enum, auto
+from pathlib import Path
+
+import yaml
+
+
+class ProjectType(Enum):
+    """Types of projects supported for hook generation."""
+
+    JAVA = auto()
+    PYTHON = auto()
+
+
+@dataclass
+class Project:
+    """Represents a project found in the repository."""
+
+    path: str
+    type: ProjectType
+
+    @property
+    def gradle_path(self) -> str:
+        """Convert path to Gradle task format."""
+        return ":" + self.path.replace("/", ":")
+
+    @property
+    def project_id(self) -> str:
+        """Generate a unique identifier for the project."""
+        return self.path.replace("/", "-").replace(".", "-")
+
+
+class ProjectFinder:
+    """Find Java and Python projects in a repository."""
+
+    JAVA_PATTERNS = [
+        "plugins.hasPlugin('java')",
+        "apply plugin: 'java'",
+        "id 'java'",
+        "id 'java-library'",
+        "plugins.hasPlugin('java-library')",
+        "apply plugin: 'java-library'",
+        "plugins.hasPlugin('pegasus')",
+        "org.springframework.boot",
+    ]
+
+    EXCLUDED_DIRS = {".git", "build", "node_modules", ".tox", "venv"}
+    SOURCE_EXTENSIONS = {".java", ".kt", ".groovy"}
+
+    def __init__(self, root_dir: str):
+        self.root_path = Path(root_dir)
+
+    def find_all_projects(self) -> list[Project]:
+        """Find all Java and Python projects in the repository."""
+        java_projects = self._find_java_projects()
+        python_projects = self._find_python_projects()
+
+        all_projects = []
+        all_projects.extend(
+            Project(path=p, type=ProjectType.JAVA) for p in java_projects
+        )
+        all_projects.extend(
+            Project(path=p, type=ProjectType.PYTHON) for p in python_projects
+        )
+
+        return sorted(all_projects, key=lambda p: p.path)
+
+    def _find_java_projects(self) -> set[str]:
+        """Find all Java projects by checking build.gradle files."""
+        java_projects = set()
+
+        # Search both build.gradle and build.gradle.kts
+        for pattern in ["build.gradle", "build.gradle.kts"]:
+            for gradle_file in self.root_path.rglob(pattern):
+                if self._should_skip_directory(gradle_file.parent):
+                    continue
+
+                if self._is_java_project(gradle_file):
+                    java_projects.add(self._get_relative_path(gradle_file.parent))
+
+        return {
+            p
+            for p in java_projects
+            if "buildSrc" not in p and "spark-smoke-test" not in p and p != "."
+        }
+
+    def _find_python_projects(self) -> set[str]:
+        """Find all Python projects by checking for setup.py or pyproject.toml."""
+        python_projects = set()
+
+        for file_name in ["setup.py", "pyproject.toml"]:
+            for path in self.root_path.rglob(file_name):
+                if self._should_skip_directory(path.parent):
+                    continue
+
+                rel_path = self._get_relative_path(path.parent)
+                if "examples" not in rel_path:
+                    python_projects.add(rel_path)
+
+        return python_projects
+
+    def _should_skip_directory(self, path: Path) -> bool:
+        """Check if directory should be skipped."""
+        return any(
+            part in self.EXCLUDED_DIRS or part.startswith(".") for part in path.parts
+        )
+
+    def _is_java_project(self, gradle_file: Path) -> bool:
+        """Check if a Gradle file represents a Java project."""
+        try:
+            content = gradle_file.read_text()
+            has_java_plugin = any(pattern in content for pattern in self.JAVA_PATTERNS)
+
+            if has_java_plugin:
+                # Verify presence of source files
+                return any(
+                    list(gradle_file.parent.rglob(f"*{ext}"))
+                    for ext in self.SOURCE_EXTENSIONS
+                )
+            return False
+
+        except Exception as e:
+            print(f"Warning: Error reading {gradle_file}: {e}")
+            return False
+
+    def _get_relative_path(self, path: Path) -> str:
+        """Get relative path from root, normalized with forward slashes."""
+        return str(path.relative_to(self.root_path)).replace("\\", "/")
+
+
+class HookGenerator:
+    """Generate pre-commit hooks for projects."""
+
+    def __init__(self, projects: list[Project], override_file: str = None):
+        self.projects = projects
+        self.override_file = override_file
+
+    def generate_config(self) -> dict:
+        """Generate the complete pre-commit config."""
+        hooks = []
+
+        for project in self.projects:
+            if project.type == ProjectType.PYTHON:
+                hooks.append(self._generate_lint_fix_hook(project))
+            else:  # ProjectType.JAVA
+                hooks.append(self._generate_spotless_hook(project))
+
+        config = {"repos": [{"repo": "local", "hooks": hooks}]}
+        
+        # Merge override hooks if they exist
+        if self.override_file and os.path.exists(self.override_file):
+            try:
+                with open(self.override_file, 'r') as f:
+                    override_config = yaml.safe_load(f)
+                
+                if override_config and 'repos' in override_config:
+                    for override_repo in override_config['repos']:
+                        matching_repo = next(
+                            (repo for repo in config['repos'] 
+                             if repo['repo'] == override_repo['repo']),
+                            None
+                        )
+                        
+                        if matching_repo:
+                            matching_repo['hooks'].extend(override_repo.get('hooks', []))
+                        else:
+                            config['repos'].append(override_repo)
+                
+                print(f"Merged additional hooks from {self.override_file}")
+            except Exception as e:
+                print(f"Warning: Error reading override file {self.override_file}: {e}")
+
+        return config
+
+    def _generate_lint_fix_hook(self, project: Project) -> dict:
+        """Generate a lint-fix hook for Python projects."""
+        return {
+            "id": f"{project.project_id}-lint-fix",
+            "name": f"{project.path} Lint Fix",
+            "entry": f"./gradlew {project.gradle_path}:lintFix",
+            "language": "system",
+            "files": f"^{project.path}/.*\\.py$",
+        }
+
+    def _generate_spotless_hook(self, project: Project) -> dict:
+        """Generate a spotless hook for Java projects."""
+        return {
+            "id": f"{project.project_id}-spotless",
+            "name": f"{project.path} Spotless Apply",
+            "entry": f"./gradlew {project.gradle_path}:spotlessApply",
+            "language": "system",
+            "files": f"^{project.path}/.*\\.java$",
+        }
+
+
+class PrecommitDumper(yaml.Dumper):
+    """Custom YAML dumper that maintains proper indentation."""
+
+    def increase_indent(self, flow=False, *args, **kwargs):
+        return super().increase_indent(flow=flow, indentless=False)
+
+
+def write_yaml_with_spaces(file_path: str, data: dict):
+    """Write YAML file with extra spacing between hooks."""
+    with open(file_path, "w") as f:
+        yaml_str = yaml.dump(
+            data, Dumper=PrecommitDumper, sort_keys=False, default_flow_style=False
+        )
+
+        # Add extra newline between hooks
+        lines = yaml_str.split("\n")
+        result = []
+        in_hook = False
+
+        for line in lines:
+            if line.strip().startswith("- id:"):
+                if in_hook:  # If we were already in a hook, add extra newline
+                    result.append("")
+                in_hook = True
+            elif not line.strip() and in_hook:
+                in_hook = False
+
+            result.append(line)
+
+        f.write("\n".join(result))
+
+
+def main():
+    root_dir = os.path.abspath(os.curdir)
+    override_file = ".github/scripts/pre-commit-override.yaml"
+
+    # Find projects
+    finder = ProjectFinder(root_dir)
+    projects = finder.find_all_projects()
+
+    # Print summary
+    print("Found projects:")
+    print("\nJava projects:")
+    for project in projects:
+        if project.type == ProjectType.JAVA:
+            print(f"  - {project.path}")
+
+    print("\nPython projects:")
+    for project in projects:
+        if project.type == ProjectType.PYTHON:
+            print(f"  - {project.path}")
+
+    # Generate and write config
+    generator = HookGenerator(projects, override_file)
+    config = generator.generate_config()
+    write_yaml_with_spaces(".pre-commit-config.yaml", config)
+
+    print("\nGenerated .pre-commit-config.yaml")
+
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file
diff --git a/.github/scripts/pre-commit-override.yaml b/.github/scripts/pre-commit-override.yaml
new file mode 100644
index 00000000000000..a085d9ea3ee93b
--- /dev/null
+++ b/.github/scripts/pre-commit-override.yaml
@@ -0,0 +1,8 @@
+repos:
+  - repo: local
+    hooks:
+      - id: smoke-test-cypress-lint-fix
+        name: smoke-test cypress Lint Fix
+        entry: ./gradlew :smoke-test:cypressLintFix
+        language: system
+        files: ^smoke-test/tests/cypress/.*$
\ No newline at end of file
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 898e3d262b3941..c4edc2cc176355 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,26 +1,380 @@
-exclude: ^$
-files: ^(docs/|docs-website/|metadata-ingestion/)
 repos:
-  - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v5.10.1
+  - repo: local
     hooks:
-      - id: isort
-  - repo: https://github.com/ambv/black
-    rev: 23.1.0
-    hooks:
-      - id: black
-  - repo: https://github.com/myint/autoflake
-    rev: v1.4
-    hooks:
-      - id: autoflake
-        args:
-          - --in-place
-          - --remove-unused-variables
-          - --remove-all-unused-imports
-          - --expand-star-imports
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v3.0.0-alpha.6" # Use the sha or tag you want to point at
-    hooks:
-      - id: prettier
-        args:
-          - --write
\ No newline at end of file
+      - id: datahub-graphql-core-spotless
+        name: datahub-graphql-core Spotless Apply
+        entry: ./gradlew :datahub-graphql-core:spotlessApply
+        language: system
+        files: ^datahub-graphql-core/.*\.java$
+
+      - id: datahub-upgrade-spotless
+        name: datahub-upgrade Spotless Apply
+        entry: ./gradlew :datahub-upgrade:spotlessApply
+        language: system
+        files: ^datahub-upgrade/.*\.java$
+
+      - id: entity-registry-spotless
+        name: entity-registry Spotless Apply
+        entry: ./gradlew :entity-registry:spotlessApply
+        language: system
+        files: ^entity-registry/.*\.java$
+
+      - id: ingestion-scheduler-spotless
+        name: ingestion-scheduler Spotless Apply
+        entry: ./gradlew :ingestion-scheduler:spotlessApply
+        language: system
+        files: ^ingestion-scheduler/.*\.java$
+
+      - id: li-utils-spotless
+        name: li-utils Spotless Apply
+        entry: ./gradlew :li-utils:spotlessApply
+        language: system
+        files: ^li-utils/.*\.java$
+
+      - id: metadata-auth-auth-api-spotless
+        name: metadata-auth/auth-api Spotless Apply
+        entry: ./gradlew :metadata-auth:auth-api:spotlessApply
+        language: system
+        files: ^metadata-auth/auth-api/.*\.java$
+
+      - id: metadata-dao-impl-kafka-producer-spotless
+        name: metadata-dao-impl/kafka-producer Spotless Apply
+        entry: ./gradlew :metadata-dao-impl:kafka-producer:spotlessApply
+        language: system
+        files: ^metadata-dao-impl/kafka-producer/.*\.java$
+
+      - id: metadata-events-mxe-avro-spotless
+        name: metadata-events/mxe-avro Spotless Apply
+        entry: ./gradlew :metadata-events:mxe-avro:spotlessApply
+        language: system
+        files: ^metadata-events/mxe-avro/.*\.java$
+
+      - id: metadata-events-mxe-registration-spotless
+        name: metadata-events/mxe-registration Spotless Apply
+        entry: ./gradlew :metadata-events:mxe-registration:spotlessApply
+        language: system
+        files: ^metadata-events/mxe-registration/.*\.java$
+
+      - id: metadata-events-mxe-schemas-spotless
+        name: metadata-events/mxe-schemas Spotless Apply
+        entry: ./gradlew :metadata-events:mxe-schemas:spotlessApply
+        language: system
+        files: ^metadata-events/mxe-schemas/.*\.java$
+
+      - id: metadata-events-mxe-utils-avro-spotless
+        name: metadata-events/mxe-utils-avro Spotless Apply
+        entry: ./gradlew :metadata-events:mxe-utils-avro:spotlessApply
+        language: system
+        files: ^metadata-events/mxe-utils-avro/.*\.java$
+
+      - id: metadata-ingestion-lint-fix
+        name: metadata-ingestion Lint Fix
+        entry: ./gradlew :metadata-ingestion:lintFix
+        language: system
+        files: ^metadata-ingestion/.*\.py$
+
+      - id: metadata-ingestion-modules-airflow-plugin-lint-fix
+        name: metadata-ingestion-modules/airflow-plugin Lint Fix
+        entry: ./gradlew :metadata-ingestion-modules:airflow-plugin:lintFix
+        language: system
+        files: ^metadata-ingestion-modules/airflow-plugin/.*\.py$
+
+      - id: metadata-ingestion-modules-dagster-plugin-lint-fix
+        name: metadata-ingestion-modules/dagster-plugin Lint Fix
+        entry: ./gradlew :metadata-ingestion-modules:dagster-plugin:lintFix
+        language: system
+        files: ^metadata-ingestion-modules/dagster-plugin/.*\.py$
+
+      - id: metadata-ingestion-modules-gx-plugin-lint-fix
+        name: metadata-ingestion-modules/gx-plugin Lint Fix
+        entry: ./gradlew :metadata-ingestion-modules:gx-plugin:lintFix
+        language: system
+        files: ^metadata-ingestion-modules/gx-plugin/.*\.py$
+
+      - id: metadata-ingestion-modules-prefect-plugin-lint-fix
+        name: metadata-ingestion-modules/prefect-plugin Lint Fix
+        entry: ./gradlew :metadata-ingestion-modules:prefect-plugin:lintFix
+        language: system
+        files: ^metadata-ingestion-modules/prefect-plugin/.*\.py$
+
+      - id: metadata-integration-java-acryl-spark-lineage-spotless
+        name: metadata-integration/java/acryl-spark-lineage Spotless Apply
+        entry: ./gradlew :metadata-integration:java:acryl-spark-lineage:spotlessApply
+        language: system
+        files: ^metadata-integration/java/acryl-spark-lineage/.*\.java$
+
+      - id: metadata-integration-java-datahub-client-spotless
+        name: metadata-integration/java/datahub-client Spotless Apply
+        entry: ./gradlew :metadata-integration:java:datahub-client:spotlessApply
+        language: system
+        files: ^metadata-integration/java/datahub-client/.*\.java$
+
+      - id: metadata-integration-java-datahub-event-spotless
+        name: metadata-integration/java/datahub-event Spotless Apply
+        entry: ./gradlew :metadata-integration:java:datahub-event:spotlessApply
+        language: system
+        files: ^metadata-integration/java/datahub-event/.*\.java$
+
+      - id: metadata-integration-java-datahub-protobuf-spotless
+        name: metadata-integration/java/datahub-protobuf Spotless Apply
+        entry: ./gradlew :metadata-integration:java:datahub-protobuf:spotlessApply
+        language: system
+        files: ^metadata-integration/java/datahub-protobuf/.*\.java$
+
+      - id: metadata-integration-java-datahub-schematron-cli-spotless
+        name: metadata-integration/java/datahub-schematron/cli Spotless Apply
+        entry: ./gradlew :metadata-integration:java:datahub-schematron:cli:spotlessApply
+        language: system
+        files: ^metadata-integration/java/datahub-schematron/cli/.*\.java$
+
+      - id: metadata-integration-java-datahub-schematron-lib-spotless
+        name: metadata-integration/java/datahub-schematron/lib Spotless Apply
+        entry: ./gradlew :metadata-integration:java:datahub-schematron:lib:spotlessApply
+        language: system
+        files: ^metadata-integration/java/datahub-schematron/lib/.*\.java$
+
+      - id: metadata-integration-java-examples-spotless
+        name: metadata-integration/java/examples Spotless Apply
+        entry: ./gradlew :metadata-integration:java:examples:spotlessApply
+        language: system
+        files: ^metadata-integration/java/examples/.*\.java$
+
+      - id: metadata-integration-java-openlineage-converter-spotless
+        name: metadata-integration/java/openlineage-converter Spotless Apply
+        entry: ./gradlew :metadata-integration:java:openlineage-converter:spotlessApply
+        language: system
+        files: ^metadata-integration/java/openlineage-converter/.*\.java$
+
+      - id: metadata-integration-java-spark-lineage-legacy-spotless
+        name: metadata-integration/java/spark-lineage-legacy Spotless Apply
+        entry: ./gradlew :metadata-integration:java:spark-lineage-legacy:spotlessApply
+        language: system
+        files: ^metadata-integration/java/spark-lineage-legacy/.*\.java$
+
+      - id: metadata-io-spotless
+        name: metadata-io Spotless Apply
+        entry: ./gradlew :metadata-io:spotlessApply
+        language: system
+        files: ^metadata-io/.*\.java$
+
+      - id: metadata-io-metadata-io-api-spotless
+        name: metadata-io/metadata-io-api Spotless Apply
+        entry: ./gradlew :metadata-io:metadata-io-api:spotlessApply
+        language: system
+        files: ^metadata-io/metadata-io-api/.*\.java$
+
+      - id: metadata-jobs-common-spotless
+        name: metadata-jobs/common Spotless Apply
+        entry: ./gradlew :metadata-jobs:common:spotlessApply
+        language: system
+        files: ^metadata-jobs/common/.*\.java$
+
+      - id: metadata-jobs-mae-consumer-spotless
+        name: metadata-jobs/mae-consumer Spotless Apply
+        entry: ./gradlew :metadata-jobs:mae-consumer:spotlessApply
+        language: system
+        files: ^metadata-jobs/mae-consumer/.*\.java$
+
+      - id: metadata-jobs-mae-consumer-job-spotless
+        name: metadata-jobs/mae-consumer-job Spotless Apply
+        entry: ./gradlew :metadata-jobs:mae-consumer-job:spotlessApply
+        language: system
+        files: ^metadata-jobs/mae-consumer-job/.*\.java$
+
+      - id: metadata-jobs-mce-consumer-spotless
+        name: metadata-jobs/mce-consumer Spotless Apply
+        entry: ./gradlew :metadata-jobs:mce-consumer:spotlessApply
+        language: system
+        files: ^metadata-jobs/mce-consumer/.*\.java$
+
+      - id: metadata-jobs-mce-consumer-job-spotless
+        name: metadata-jobs/mce-consumer-job Spotless Apply
+        entry: ./gradlew :metadata-jobs:mce-consumer-job:spotlessApply
+        language: system
+        files: ^metadata-jobs/mce-consumer-job/.*\.java$
+
+      - id: metadata-jobs-pe-consumer-spotless
+        name: metadata-jobs/pe-consumer Spotless Apply
+        entry: ./gradlew :metadata-jobs:pe-consumer:spotlessApply
+        language: system
+        files: ^metadata-jobs/pe-consumer/.*\.java$
+
+      - id: metadata-models-spotless
+        name: metadata-models Spotless Apply
+        entry: ./gradlew :metadata-models:spotlessApply
+        language: system
+        files: ^metadata-models/.*\.java$
+
+      - id: metadata-models-custom-spotless
+        name: metadata-models-custom Spotless Apply
+        entry: ./gradlew :metadata-models-custom:spotlessApply
+        language: system
+        files: ^metadata-models-custom/.*\.java$
+
+      - id: metadata-models-validator-spotless
+        name: metadata-models-validator Spotless Apply
+        entry: ./gradlew :metadata-models-validator:spotlessApply
+        language: system
+        files: ^metadata-models-validator/.*\.java$
+
+      - id: metadata-operation-context-spotless
+        name: metadata-operation-context Spotless Apply
+        entry: ./gradlew :metadata-operation-context:spotlessApply
+        language: system
+        files: ^metadata-operation-context/.*\.java$
+
+      - id: metadata-service-auth-config-spotless
+        name: metadata-service/auth-config Spotless Apply
+        entry: ./gradlew :metadata-service:auth-config:spotlessApply
+        language: system
+        files: ^metadata-service/auth-config/.*\.java$
+
+      - id: metadata-service-auth-filter-spotless
+        name: metadata-service/auth-filter Spotless Apply
+        entry: ./gradlew :metadata-service:auth-filter:spotlessApply
+        language: system
+        files: ^metadata-service/auth-filter/.*\.java$
+
+      - id: metadata-service-auth-impl-spotless
+        name: metadata-service/auth-impl Spotless Apply
+        entry: ./gradlew :metadata-service:auth-impl:spotlessApply
+        language: system
+        files: ^metadata-service/auth-impl/.*\.java$
+
+      - id: metadata-service-auth-servlet-impl-spotless
+        name: metadata-service/auth-servlet-impl Spotless Apply
+        entry: ./gradlew :metadata-service:auth-servlet-impl:spotlessApply
+        language: system
+        files: ^metadata-service/auth-servlet-impl/.*\.java$
+
+      - id: metadata-service-configuration-spotless
+        name: metadata-service/configuration Spotless Apply
+        entry: ./gradlew :metadata-service:configuration:spotlessApply
+        language: system
+        files: ^metadata-service/configuration/.*\.java$
+
+      - id: metadata-service-factories-spotless
+        name: metadata-service/factories Spotless Apply
+        entry: ./gradlew :metadata-service:factories:spotlessApply
+        language: system
+        files: ^metadata-service/factories/.*\.java$
+
+      - id: metadata-service-graphql-servlet-impl-spotless
+        name: metadata-service/graphql-servlet-impl Spotless Apply
+        entry: ./gradlew :metadata-service:graphql-servlet-impl:spotlessApply
+        language: system
+        files: ^metadata-service/graphql-servlet-impl/.*\.java$
+
+      - id: metadata-service-openapi-analytics-servlet-spotless
+        name: metadata-service/openapi-analytics-servlet Spotless Apply
+        entry: ./gradlew :metadata-service:openapi-analytics-servlet:spotlessApply
+        language: system
+        files: ^metadata-service/openapi-analytics-servlet/.*\.java$
+
+      - id: metadata-service-openapi-entity-servlet-spotless
+        name: metadata-service/openapi-entity-servlet Spotless Apply
+        entry: ./gradlew :metadata-service:openapi-entity-servlet:spotlessApply
+        language: system
+        files: ^metadata-service/openapi-entity-servlet/.*\.java$
+
+      - id: metadata-service-openapi-entity-servlet-generators-spotless
+        name: metadata-service/openapi-entity-servlet/generators Spotless Apply
+        entry: ./gradlew :metadata-service:openapi-entity-servlet:generators:spotlessApply
+        language: system
+        files: ^metadata-service/openapi-entity-servlet/generators/.*\.java$
+
+      - id: metadata-service-openapi-servlet-spotless
+        name: metadata-service/openapi-servlet Spotless Apply
+        entry: ./gradlew :metadata-service:openapi-servlet:spotlessApply
+        language: system
+        files: ^metadata-service/openapi-servlet/.*\.java$
+
+      - id: metadata-service-openapi-servlet-models-spotless
+        name: metadata-service/openapi-servlet/models Spotless Apply
+        entry: ./gradlew :metadata-service:openapi-servlet:models:spotlessApply
+        language: system
+        files: ^metadata-service/openapi-servlet/models/.*\.java$
+
+      - id: metadata-service-plugin-spotless
+        name: metadata-service/plugin Spotless Apply
+        entry: ./gradlew :metadata-service:plugin:spotlessApply
+        language: system
+        files: ^metadata-service/plugin/.*\.java$
+
+      - id: metadata-service-plugin-src-test-sample-test-plugins-spotless
+        name: metadata-service/plugin/src/test/sample-test-plugins Spotless Apply
+        entry: ./gradlew :metadata-service:plugin:src:test:sample-test-plugins:spotlessApply
+        language: system
+        files: ^metadata-service/plugin/src/test/sample-test-plugins/.*\.java$
+
+      - id: metadata-service-restli-client-spotless
+        name: metadata-service/restli-client Spotless Apply
+        entry: ./gradlew :metadata-service:restli-client:spotlessApply
+        language: system
+        files: ^metadata-service/restli-client/.*\.java$
+
+      - id: metadata-service-restli-client-api-spotless
+        name: metadata-service/restli-client-api Spotless Apply
+        entry: ./gradlew :metadata-service:restli-client-api:spotlessApply
+        language: system
+        files: ^metadata-service/restli-client-api/.*\.java$
+
+      - id: metadata-service-restli-servlet-impl-spotless
+        name: metadata-service/restli-servlet-impl Spotless Apply
+        entry: ./gradlew :metadata-service:restli-servlet-impl:spotlessApply
+        language: system
+        files: ^metadata-service/restli-servlet-impl/.*\.java$
+
+      - id: metadata-service-schema-registry-api-spotless
+        name: metadata-service/schema-registry-api Spotless Apply
+        entry: ./gradlew :metadata-service:schema-registry-api:spotlessApply
+        language: system
+        files: ^metadata-service/schema-registry-api/.*\.java$
+
+      - id: metadata-service-schema-registry-servlet-spotless
+        name: metadata-service/schema-registry-servlet Spotless Apply
+        entry: ./gradlew :metadata-service:schema-registry-servlet:spotlessApply
+        language: system
+        files: ^metadata-service/schema-registry-servlet/.*\.java$
+
+      - id: metadata-service-services-spotless
+        name: metadata-service/services Spotless Apply
+        entry: ./gradlew :metadata-service:services:spotlessApply
+        language: system
+        files: ^metadata-service/services/.*\.java$
+
+      - id: metadata-service-servlet-spotless
+        name: metadata-service/servlet Spotless Apply
+        entry: ./gradlew :metadata-service:servlet:spotlessApply
+        language: system
+        files: ^metadata-service/servlet/.*\.java$
+
+      - id: metadata-utils-spotless
+        name: metadata-utils Spotless Apply
+        entry: ./gradlew :metadata-utils:spotlessApply
+        language: system
+        files: ^metadata-utils/.*\.java$
+
+      - id: mock-entity-registry-spotless
+        name: mock-entity-registry Spotless Apply
+        entry: ./gradlew :mock-entity-registry:spotlessApply
+        language: system
+        files: ^mock-entity-registry/.*\.java$
+
+      - id: smoke-test-lint-fix
+        name: smoke-test Lint Fix
+        entry: ./gradlew :smoke-test:lintFix
+        language: system
+        files: ^smoke-test/.*\.py$
+
+      - id: test-models-spotless
+        name: test-models Spotless Apply
+        entry: ./gradlew :test-models:spotlessApply
+        language: system
+        files: ^test-models/.*\.java$
+
+      - id: smoke-test-cypress-lint-fix
+        name: smoke-test cypress Lint Fix
+        entry: ./gradlew :smoke-test:cypressLintFix
+        language: system
+        files: ^smoke-test/tests/cypress/.*$
diff --git a/build.gradle b/build.gradle
index 8929b4e644972c..3c36feadc5f4bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -474,10 +474,6 @@ subprojects {
       if (compileJavaTask != null) {
         spotlessJavaTask.dependsOn compileJavaTask
       }
-      // TODO - Do not run this in CI. How?
-      // tasks.withType(JavaCompile) {
-      //   finalizedBy(tasks.findByName('spotlessApply'))
-      // }
     }
   }
 
diff --git a/settings.gradle b/settings.gradle
index b0c2c707d566c0..77d0706549a439 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -78,3 +78,52 @@ include ':metadata-operation-context'
 include ':metadata-service:openapi-servlet:models'
 include ':metadata-integration:java:datahub-schematron:lib'
 include ':metadata-integration:java:datahub-schematron:cli'
+
+def installPreCommitHooks() {
+    def preCommitInstalled = false
+    try {
+        def process = ["which", "pre-commit"].execute()
+        def stdout = new StringBuilder()
+        def stderr = new StringBuilder()
+        process.waitForProcessOutput(stdout, stderr)
+        preCommitInstalled = (process.exitValue() == 0)
+        println "Pre-commit check: ${stdout}"
+    } catch (Exception e) {
+        println "Error checking pre-commit: ${e.message}"
+        return
+    }
+
+    if (!preCommitInstalled) {
+        try {
+            def installProcess = ["python", "-m", "pip", "install", "pre-commit"].execute()
+            def stdout = new StringBuilder()
+            def stderr = new StringBuilder()
+            installProcess.waitForProcessOutput(stdout, stderr)
+            if (installProcess.exitValue() != 0) {
+                println "Failed to install pre-commit: ${stderr}"
+                return
+            }
+            println "Install output: ${stdout}"
+        } catch (Exception e) {
+            println "Error installing pre-commit: ${e.message}"
+            return 
+        }
+    }
+
+    try {
+        def installHooksProcess = ["python", "-m", "pre_commit", "install"].execute()
+        def stdout = new StringBuilder()
+        def stderr = new StringBuilder()
+        installHooksProcess.waitForProcessOutput(stdout, stderr)
+        if (installHooksProcess.exitValue() != 0) {
+            println "Failed to install hooks: ${stderr}"
+            return
+        }
+        println "Hooks output: ${stdout}"
+    } catch (Exception e) {
+        println "Error installing hooks: ${e.message}"
+        return
+    }
+}
+
+installPreCommitHooks()
\ No newline at end of file

From 92f013e6e179a63b8877ad7344f428a9869ae1d7 Mon Sep 17 00:00:00 2001
From: Andrew Sikowitz <andrew.sikowitz@acryl.io>
Date: Wed, 8 Jan 2025 11:40:02 -0800
Subject: [PATCH 043/249] fix(ingest/file-backed-collections): Properly set
 _use_sqlite_on_conflict (#12297)

---
 .../utilities/file_backed_collections.py      |  2 +-
 .../utilities/test_file_backed_collections.py | 31 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/metadata-ingestion/src/datahub/utilities/file_backed_collections.py b/metadata-ingestion/src/datahub/utilities/file_backed_collections.py
index b8c27666d7f538..fb028605c35b77 100644
--- a/metadata-ingestion/src/datahub/utilities/file_backed_collections.py
+++ b/metadata-ingestion/src/datahub/utilities/file_backed_collections.py
@@ -243,7 +243,7 @@ def __post_init__(self) -> None:
             # This was added in 3.24.0 from 2018-06-04.
             # See https://www.sqlite.org/lang_conflict.html
             if OVERRIDE_SQLITE_VERSION_REQUIREMENT:
-                self.use_sqlite_on_conflict = False
+                self._use_sqlite_on_conflict = False
             else:
                 raise RuntimeError("SQLite version 3.24.0 or later is required")
 
diff --git a/metadata-ingestion/tests/unit/utilities/test_file_backed_collections.py b/metadata-ingestion/tests/unit/utilities/test_file_backed_collections.py
index 6230c2e37edc6a..7e1627151c6ebf 100644
--- a/metadata-ingestion/tests/unit/utilities/test_file_backed_collections.py
+++ b/metadata-ingestion/tests/unit/utilities/test_file_backed_collections.py
@@ -5,6 +5,7 @@
 import sqlite3
 from dataclasses import dataclass
 from typing import Counter, Dict
+from unittest.mock import patch
 
 import pytest
 
@@ -15,6 +16,36 @@
 )
 
 
+def test_set_use_sqlite_on_conflict():
+    with patch("sqlite3.sqlite_version_info", (3, 24, 0)):
+        cache = FileBackedDict[int](
+            tablename="cache",
+            cache_max_size=10,
+            cache_eviction_batch_size=10,
+        )
+        assert cache._use_sqlite_on_conflict is True
+
+    with pytest.raises(RuntimeError):
+        with patch("sqlite3.sqlite_version_info", (3, 23, 1)):
+            cache = FileBackedDict[int](
+                tablename="cache",
+                cache_max_size=10,
+                cache_eviction_batch_size=10,
+            )
+            assert cache._use_sqlite_on_conflict is False
+
+    with patch("sqlite3.sqlite_version_info", (3, 23, 1)), patch(
+        "datahub.utilities.file_backed_collections.OVERRIDE_SQLITE_VERSION_REQUIREMENT",
+        True,
+    ):
+        cache = FileBackedDict[int](
+            tablename="cache",
+            cache_max_size=10,
+            cache_eviction_batch_size=10,
+        )
+        assert cache._use_sqlite_on_conflict is False
+
+
 @pytest.mark.parametrize("use_sqlite_on_conflict", [True, False])
 def test_file_dict(use_sqlite_on_conflict: bool) -> None:
     cache = FileBackedDict[int](

From ea4d40e5353f4061fa02c4af229fdfc5a58af9d3 Mon Sep 17 00:00:00 2001
From: kevinkarchacryl <kevin.karch@acryl.io>
Date: Wed, 8 Jan 2025 17:51:51 -0500
Subject: [PATCH 044/249] fix(doc): make folder_path_pattern usage more clear
 (#12298)

---
 .../datahub/ingestion/source/looker/looker_config.py  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_config.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_config.py
index bfae3060013d59..4e9d0f68928a45 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_config.py
@@ -300,11 +300,16 @@ class LookerDashboardSourceConfig(
 
     folder_path_pattern: AllowDenyPattern = Field(
         default=AllowDenyPattern.allow_all(),
-        description="Allow or deny dashboards from specific folders. "
+        description="Allow or deny dashboards from specific folders using their fully qualified paths. "
         "For example: \n"
         "deny: \n"
-        " - sales/deprecated \n"
-        "This pattern will deny the ingestion of all dashboards and looks within the sales/deprecated folder. \n"
+        " - Shared/deprecated \n"
+        "This pattern will deny the ingestion of all dashboards and looks within the Shared/deprecated folder. \n"
+        "allow: \n"
+        " - Shared/sales \n"
+        "This pattern will allow only the ingestion of dashboards within the Shared/sales folder. \n"
+        "To get the correct path from Looker, take the folder hierarchy shown in the UI and join it with slashes. "
+        "For example, Shared -> Customer Reports -> Sales becomes Shared/Customer Reports/Sales. "
         "Dashboards will only be ingested if they're allowed by both this config and dashboard_pattern.",
     )
 

From 42b2cd3e7d95a84cbd1b078e2fa81a5ecc8b9fa8 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Thu, 9 Jan 2025 18:28:19 +0530
Subject: [PATCH 045/249] dev: fix pre-commit passing filenames incorrectly
 (#12304)

---
 .github/scripts/generate_pre_commit.py   | 16 +++++-
 .github/scripts/pre-commit-override.yaml |  3 +-
 .pre-commit-config.yaml                  | 65 ++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/.github/scripts/generate_pre_commit.py b/.github/scripts/generate_pre_commit.py
index 740d3c20d263b0..2db73fd357ff5f 100755
--- a/.github/scripts/generate_pre_commit.py
+++ b/.github/scripts/generate_pre_commit.py
@@ -9,6 +9,7 @@
 from dataclasses import dataclass
 from enum import Enum, auto
 from pathlib import Path
+import datetime
 
 import yaml
 
@@ -188,6 +189,7 @@ def _generate_lint_fix_hook(self, project: Project) -> dict:
             "entry": f"./gradlew {project.gradle_path}:lintFix",
             "language": "system",
             "files": f"^{project.path}/.*\\.py$",
+            "pass_filenames": False,
         }
 
     def _generate_spotless_hook(self, project: Project) -> dict:
@@ -198,6 +200,7 @@ def _generate_spotless_hook(self, project: Project) -> dict:
             "entry": f"./gradlew {project.gradle_path}:spotlessApply",
             "language": "system",
             "files": f"^{project.path}/.*\\.java$",
+            "pass_filenames": False,
         }
 
 
@@ -209,8 +212,19 @@ def increase_indent(self, flow=False, *args, **kwargs):
 
 
 def write_yaml_with_spaces(file_path: str, data: dict):
-    """Write YAML file with extra spacing between hooks."""
+    """Write YAML file with extra spacing between hooks and a timestamp header."""
     with open(file_path, "w") as f:
+        # Add timestamp header
+        current_time = datetime.datetime.now(datetime.timezone.utc)
+        formatted_time = current_time.strftime("%Y-%m-%d %H:%M:%S %Z")
+        header = f"# Auto-generated by .github/scripts/generate_pre_commit.py at {formatted_time}\n"
+        f.write(header)
+        header = f"# Do not edit this file directly. Run the script to regenerate.\n"
+        f.write(header)
+        header = f"# Add additional hooks in .github/scripts/pre-commit-override.yaml\n"
+        f.write(header)
+
+        # Write the YAML content
         yaml_str = yaml.dump(
             data, Dumper=PrecommitDumper, sort_keys=False, default_flow_style=False
         )
diff --git a/.github/scripts/pre-commit-override.yaml b/.github/scripts/pre-commit-override.yaml
index a085d9ea3ee93b..961134bebe2c98 100644
--- a/.github/scripts/pre-commit-override.yaml
+++ b/.github/scripts/pre-commit-override.yaml
@@ -5,4 +5,5 @@ repos:
         name: smoke-test cypress Lint Fix
         entry: ./gradlew :smoke-test:cypressLintFix
         language: system
-        files: ^smoke-test/tests/cypress/.*$
\ No newline at end of file
+        files: ^smoke-test/tests/cypress/.*$
+        pass_filenames: false
\ No newline at end of file
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c4edc2cc176355..3697efa37770e7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,3 +1,6 @@
+# Auto-generated by .github/scripts/generate_pre_commit.py at 2025-01-09 10:08:09 UTC
+# Do not edit this file directly. Run the script to regenerate.
+# Add additional hooks in .github/scripts/pre-commit-override.yaml
 repos:
   - repo: local
     hooks:
@@ -6,372 +9,434 @@ repos:
         entry: ./gradlew :datahub-graphql-core:spotlessApply
         language: system
         files: ^datahub-graphql-core/.*\.java$
+        pass_filenames: false
 
       - id: datahub-upgrade-spotless
         name: datahub-upgrade Spotless Apply
         entry: ./gradlew :datahub-upgrade:spotlessApply
         language: system
         files: ^datahub-upgrade/.*\.java$
+        pass_filenames: false
 
       - id: entity-registry-spotless
         name: entity-registry Spotless Apply
         entry: ./gradlew :entity-registry:spotlessApply
         language: system
         files: ^entity-registry/.*\.java$
+        pass_filenames: false
 
       - id: ingestion-scheduler-spotless
         name: ingestion-scheduler Spotless Apply
         entry: ./gradlew :ingestion-scheduler:spotlessApply
         language: system
         files: ^ingestion-scheduler/.*\.java$
+        pass_filenames: false
 
       - id: li-utils-spotless
         name: li-utils Spotless Apply
         entry: ./gradlew :li-utils:spotlessApply
         language: system
         files: ^li-utils/.*\.java$
+        pass_filenames: false
 
       - id: metadata-auth-auth-api-spotless
         name: metadata-auth/auth-api Spotless Apply
         entry: ./gradlew :metadata-auth:auth-api:spotlessApply
         language: system
         files: ^metadata-auth/auth-api/.*\.java$
+        pass_filenames: false
 
       - id: metadata-dao-impl-kafka-producer-spotless
         name: metadata-dao-impl/kafka-producer Spotless Apply
         entry: ./gradlew :metadata-dao-impl:kafka-producer:spotlessApply
         language: system
         files: ^metadata-dao-impl/kafka-producer/.*\.java$
+        pass_filenames: false
 
       - id: metadata-events-mxe-avro-spotless
         name: metadata-events/mxe-avro Spotless Apply
         entry: ./gradlew :metadata-events:mxe-avro:spotlessApply
         language: system
         files: ^metadata-events/mxe-avro/.*\.java$
+        pass_filenames: false
 
       - id: metadata-events-mxe-registration-spotless
         name: metadata-events/mxe-registration Spotless Apply
         entry: ./gradlew :metadata-events:mxe-registration:spotlessApply
         language: system
         files: ^metadata-events/mxe-registration/.*\.java$
+        pass_filenames: false
 
       - id: metadata-events-mxe-schemas-spotless
         name: metadata-events/mxe-schemas Spotless Apply
         entry: ./gradlew :metadata-events:mxe-schemas:spotlessApply
         language: system
         files: ^metadata-events/mxe-schemas/.*\.java$
+        pass_filenames: false
 
       - id: metadata-events-mxe-utils-avro-spotless
         name: metadata-events/mxe-utils-avro Spotless Apply
         entry: ./gradlew :metadata-events:mxe-utils-avro:spotlessApply
         language: system
         files: ^metadata-events/mxe-utils-avro/.*\.java$
+        pass_filenames: false
 
       - id: metadata-ingestion-lint-fix
         name: metadata-ingestion Lint Fix
         entry: ./gradlew :metadata-ingestion:lintFix
         language: system
         files: ^metadata-ingestion/.*\.py$
+        pass_filenames: false
 
       - id: metadata-ingestion-modules-airflow-plugin-lint-fix
         name: metadata-ingestion-modules/airflow-plugin Lint Fix
         entry: ./gradlew :metadata-ingestion-modules:airflow-plugin:lintFix
         language: system
         files: ^metadata-ingestion-modules/airflow-plugin/.*\.py$
+        pass_filenames: false
 
       - id: metadata-ingestion-modules-dagster-plugin-lint-fix
         name: metadata-ingestion-modules/dagster-plugin Lint Fix
         entry: ./gradlew :metadata-ingestion-modules:dagster-plugin:lintFix
         language: system
         files: ^metadata-ingestion-modules/dagster-plugin/.*\.py$
+        pass_filenames: false
 
       - id: metadata-ingestion-modules-gx-plugin-lint-fix
         name: metadata-ingestion-modules/gx-plugin Lint Fix
         entry: ./gradlew :metadata-ingestion-modules:gx-plugin:lintFix
         language: system
         files: ^metadata-ingestion-modules/gx-plugin/.*\.py$
+        pass_filenames: false
 
       - id: metadata-ingestion-modules-prefect-plugin-lint-fix
         name: metadata-ingestion-modules/prefect-plugin Lint Fix
         entry: ./gradlew :metadata-ingestion-modules:prefect-plugin:lintFix
         language: system
         files: ^metadata-ingestion-modules/prefect-plugin/.*\.py$
+        pass_filenames: false
 
       - id: metadata-integration-java-acryl-spark-lineage-spotless
         name: metadata-integration/java/acryl-spark-lineage Spotless Apply
         entry: ./gradlew :metadata-integration:java:acryl-spark-lineage:spotlessApply
         language: system
         files: ^metadata-integration/java/acryl-spark-lineage/.*\.java$
+        pass_filenames: false
 
       - id: metadata-integration-java-datahub-client-spotless
         name: metadata-integration/java/datahub-client Spotless Apply
         entry: ./gradlew :metadata-integration:java:datahub-client:spotlessApply
         language: system
         files: ^metadata-integration/java/datahub-client/.*\.java$
+        pass_filenames: false
 
       - id: metadata-integration-java-datahub-event-spotless
         name: metadata-integration/java/datahub-event Spotless Apply
         entry: ./gradlew :metadata-integration:java:datahub-event:spotlessApply
         language: system
         files: ^metadata-integration/java/datahub-event/.*\.java$
+        pass_filenames: false
 
       - id: metadata-integration-java-datahub-protobuf-spotless
         name: metadata-integration/java/datahub-protobuf Spotless Apply
         entry: ./gradlew :metadata-integration:java:datahub-protobuf:spotlessApply
         language: system
         files: ^metadata-integration/java/datahub-protobuf/.*\.java$
+        pass_filenames: false
 
       - id: metadata-integration-java-datahub-schematron-cli-spotless
         name: metadata-integration/java/datahub-schematron/cli Spotless Apply
         entry: ./gradlew :metadata-integration:java:datahub-schematron:cli:spotlessApply
         language: system
         files: ^metadata-integration/java/datahub-schematron/cli/.*\.java$
+        pass_filenames: false
 
       - id: metadata-integration-java-datahub-schematron-lib-spotless
         name: metadata-integration/java/datahub-schematron/lib Spotless Apply
         entry: ./gradlew :metadata-integration:java:datahub-schematron:lib:spotlessApply
         language: system
         files: ^metadata-integration/java/datahub-schematron/lib/.*\.java$
+        pass_filenames: false
 
       - id: metadata-integration-java-examples-spotless
         name: metadata-integration/java/examples Spotless Apply
         entry: ./gradlew :metadata-integration:java:examples:spotlessApply
         language: system
         files: ^metadata-integration/java/examples/.*\.java$
+        pass_filenames: false
 
       - id: metadata-integration-java-openlineage-converter-spotless
         name: metadata-integration/java/openlineage-converter Spotless Apply
         entry: ./gradlew :metadata-integration:java:openlineage-converter:spotlessApply
         language: system
         files: ^metadata-integration/java/openlineage-converter/.*\.java$
+        pass_filenames: false
 
       - id: metadata-integration-java-spark-lineage-legacy-spotless
         name: metadata-integration/java/spark-lineage-legacy Spotless Apply
         entry: ./gradlew :metadata-integration:java:spark-lineage-legacy:spotlessApply
         language: system
         files: ^metadata-integration/java/spark-lineage-legacy/.*\.java$
+        pass_filenames: false
 
       - id: metadata-io-spotless
         name: metadata-io Spotless Apply
         entry: ./gradlew :metadata-io:spotlessApply
         language: system
         files: ^metadata-io/.*\.java$
+        pass_filenames: false
 
       - id: metadata-io-metadata-io-api-spotless
         name: metadata-io/metadata-io-api Spotless Apply
         entry: ./gradlew :metadata-io:metadata-io-api:spotlessApply
         language: system
         files: ^metadata-io/metadata-io-api/.*\.java$
+        pass_filenames: false
 
       - id: metadata-jobs-common-spotless
         name: metadata-jobs/common Spotless Apply
         entry: ./gradlew :metadata-jobs:common:spotlessApply
         language: system
         files: ^metadata-jobs/common/.*\.java$
+        pass_filenames: false
 
       - id: metadata-jobs-mae-consumer-spotless
         name: metadata-jobs/mae-consumer Spotless Apply
         entry: ./gradlew :metadata-jobs:mae-consumer:spotlessApply
         language: system
         files: ^metadata-jobs/mae-consumer/.*\.java$
+        pass_filenames: false
 
       - id: metadata-jobs-mae-consumer-job-spotless
         name: metadata-jobs/mae-consumer-job Spotless Apply
         entry: ./gradlew :metadata-jobs:mae-consumer-job:spotlessApply
         language: system
         files: ^metadata-jobs/mae-consumer-job/.*\.java$
+        pass_filenames: false
 
       - id: metadata-jobs-mce-consumer-spotless
         name: metadata-jobs/mce-consumer Spotless Apply
         entry: ./gradlew :metadata-jobs:mce-consumer:spotlessApply
         language: system
         files: ^metadata-jobs/mce-consumer/.*\.java$
+        pass_filenames: false
 
       - id: metadata-jobs-mce-consumer-job-spotless
         name: metadata-jobs/mce-consumer-job Spotless Apply
         entry: ./gradlew :metadata-jobs:mce-consumer-job:spotlessApply
         language: system
         files: ^metadata-jobs/mce-consumer-job/.*\.java$
+        pass_filenames: false
 
       - id: metadata-jobs-pe-consumer-spotless
         name: metadata-jobs/pe-consumer Spotless Apply
         entry: ./gradlew :metadata-jobs:pe-consumer:spotlessApply
         language: system
         files: ^metadata-jobs/pe-consumer/.*\.java$
+        pass_filenames: false
 
       - id: metadata-models-spotless
         name: metadata-models Spotless Apply
         entry: ./gradlew :metadata-models:spotlessApply
         language: system
         files: ^metadata-models/.*\.java$
+        pass_filenames: false
 
       - id: metadata-models-custom-spotless
         name: metadata-models-custom Spotless Apply
         entry: ./gradlew :metadata-models-custom:spotlessApply
         language: system
         files: ^metadata-models-custom/.*\.java$
+        pass_filenames: false
 
       - id: metadata-models-validator-spotless
         name: metadata-models-validator Spotless Apply
         entry: ./gradlew :metadata-models-validator:spotlessApply
         language: system
         files: ^metadata-models-validator/.*\.java$
+        pass_filenames: false
 
       - id: metadata-operation-context-spotless
         name: metadata-operation-context Spotless Apply
         entry: ./gradlew :metadata-operation-context:spotlessApply
         language: system
         files: ^metadata-operation-context/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-auth-config-spotless
         name: metadata-service/auth-config Spotless Apply
         entry: ./gradlew :metadata-service:auth-config:spotlessApply
         language: system
         files: ^metadata-service/auth-config/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-auth-filter-spotless
         name: metadata-service/auth-filter Spotless Apply
         entry: ./gradlew :metadata-service:auth-filter:spotlessApply
         language: system
         files: ^metadata-service/auth-filter/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-auth-impl-spotless
         name: metadata-service/auth-impl Spotless Apply
         entry: ./gradlew :metadata-service:auth-impl:spotlessApply
         language: system
         files: ^metadata-service/auth-impl/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-auth-servlet-impl-spotless
         name: metadata-service/auth-servlet-impl Spotless Apply
         entry: ./gradlew :metadata-service:auth-servlet-impl:spotlessApply
         language: system
         files: ^metadata-service/auth-servlet-impl/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-configuration-spotless
         name: metadata-service/configuration Spotless Apply
         entry: ./gradlew :metadata-service:configuration:spotlessApply
         language: system
         files: ^metadata-service/configuration/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-factories-spotless
         name: metadata-service/factories Spotless Apply
         entry: ./gradlew :metadata-service:factories:spotlessApply
         language: system
         files: ^metadata-service/factories/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-graphql-servlet-impl-spotless
         name: metadata-service/graphql-servlet-impl Spotless Apply
         entry: ./gradlew :metadata-service:graphql-servlet-impl:spotlessApply
         language: system
         files: ^metadata-service/graphql-servlet-impl/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-openapi-analytics-servlet-spotless
         name: metadata-service/openapi-analytics-servlet Spotless Apply
         entry: ./gradlew :metadata-service:openapi-analytics-servlet:spotlessApply
         language: system
         files: ^metadata-service/openapi-analytics-servlet/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-openapi-entity-servlet-spotless
         name: metadata-service/openapi-entity-servlet Spotless Apply
         entry: ./gradlew :metadata-service:openapi-entity-servlet:spotlessApply
         language: system
         files: ^metadata-service/openapi-entity-servlet/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-openapi-entity-servlet-generators-spotless
         name: metadata-service/openapi-entity-servlet/generators Spotless Apply
         entry: ./gradlew :metadata-service:openapi-entity-servlet:generators:spotlessApply
         language: system
         files: ^metadata-service/openapi-entity-servlet/generators/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-openapi-servlet-spotless
         name: metadata-service/openapi-servlet Spotless Apply
         entry: ./gradlew :metadata-service:openapi-servlet:spotlessApply
         language: system
         files: ^metadata-service/openapi-servlet/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-openapi-servlet-models-spotless
         name: metadata-service/openapi-servlet/models Spotless Apply
         entry: ./gradlew :metadata-service:openapi-servlet:models:spotlessApply
         language: system
         files: ^metadata-service/openapi-servlet/models/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-plugin-spotless
         name: metadata-service/plugin Spotless Apply
         entry: ./gradlew :metadata-service:plugin:spotlessApply
         language: system
         files: ^metadata-service/plugin/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-plugin-src-test-sample-test-plugins-spotless
         name: metadata-service/plugin/src/test/sample-test-plugins Spotless Apply
         entry: ./gradlew :metadata-service:plugin:src:test:sample-test-plugins:spotlessApply
         language: system
         files: ^metadata-service/plugin/src/test/sample-test-plugins/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-restli-client-spotless
         name: metadata-service/restli-client Spotless Apply
         entry: ./gradlew :metadata-service:restli-client:spotlessApply
         language: system
         files: ^metadata-service/restli-client/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-restli-client-api-spotless
         name: metadata-service/restli-client-api Spotless Apply
         entry: ./gradlew :metadata-service:restli-client-api:spotlessApply
         language: system
         files: ^metadata-service/restli-client-api/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-restli-servlet-impl-spotless
         name: metadata-service/restli-servlet-impl Spotless Apply
         entry: ./gradlew :metadata-service:restli-servlet-impl:spotlessApply
         language: system
         files: ^metadata-service/restli-servlet-impl/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-schema-registry-api-spotless
         name: metadata-service/schema-registry-api Spotless Apply
         entry: ./gradlew :metadata-service:schema-registry-api:spotlessApply
         language: system
         files: ^metadata-service/schema-registry-api/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-schema-registry-servlet-spotless
         name: metadata-service/schema-registry-servlet Spotless Apply
         entry: ./gradlew :metadata-service:schema-registry-servlet:spotlessApply
         language: system
         files: ^metadata-service/schema-registry-servlet/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-services-spotless
         name: metadata-service/services Spotless Apply
         entry: ./gradlew :metadata-service:services:spotlessApply
         language: system
         files: ^metadata-service/services/.*\.java$
+        pass_filenames: false
 
       - id: metadata-service-servlet-spotless
         name: metadata-service/servlet Spotless Apply
         entry: ./gradlew :metadata-service:servlet:spotlessApply
         language: system
         files: ^metadata-service/servlet/.*\.java$
+        pass_filenames: false
 
       - id: metadata-utils-spotless
         name: metadata-utils Spotless Apply
         entry: ./gradlew :metadata-utils:spotlessApply
         language: system
         files: ^metadata-utils/.*\.java$
+        pass_filenames: false
 
       - id: mock-entity-registry-spotless
         name: mock-entity-registry Spotless Apply
         entry: ./gradlew :mock-entity-registry:spotlessApply
         language: system
         files: ^mock-entity-registry/.*\.java$
+        pass_filenames: false
 
       - id: smoke-test-lint-fix
         name: smoke-test Lint Fix
         entry: ./gradlew :smoke-test:lintFix
         language: system
         files: ^smoke-test/.*\.py$
+        pass_filenames: false
 
       - id: test-models-spotless
         name: test-models Spotless Apply
         entry: ./gradlew :test-models:spotlessApply
         language: system
         files: ^test-models/.*\.java$
+        pass_filenames: false
 
       - id: smoke-test-cypress-lint-fix
         name: smoke-test cypress Lint Fix

From 45450f19a02e38f5dd155c10635520d29fd1a91f Mon Sep 17 00:00:00 2001
From: Shirshanka Das <shirshanka@apache.org>
Date: Thu, 9 Jan 2025 07:32:22 -0800
Subject: [PATCH 046/249] feat(sdk): structured properties - add support for
 listing (#12283)

---
 docs/api/tutorials/structured-properties.md   | 329 ++++++++++++++++--
 .../list_structured_properties.py             |  12 +
 .../structuredproperties.py                   |  13 +-
 .../cli/specific/structuredproperties_cli.py  |  84 +++++
 .../test_structured_properties.py             | 213 ++++++++++++
 .../test_structured_properties.py             |  46 +++
 6 files changed, 663 insertions(+), 34 deletions(-)
 create mode 100644 metadata-ingestion/examples/structured_properties/list_structured_properties.py
 create mode 100644 metadata-ingestion/tests/unit/structured_properties/test_structured_properties.py

diff --git a/docs/api/tutorials/structured-properties.md b/docs/api/tutorials/structured-properties.md
index 2caa015e206595..ed270811b82e92 100644
--- a/docs/api/tutorials/structured-properties.md
+++ b/docs/api/tutorials/structured-properties.md
@@ -6,7 +6,7 @@ import TabItem from '@theme/TabItem';
 ## Why Would You Use Structured Properties?
 
  Structured properties are a structured, named set of properties that can be attached to logical entities like Datasets, DataJobs, etc.
-Structured properties have values that are types. Conceptually, they are like “field definitions”.
+Structured properties have values that are typed and support constraints.
 
 Learn more about structured properties in the [Structured Properties Feature Guide](../../../docs/features/feature-guides/properties/overview.md).
 
@@ -15,6 +15,7 @@ Learn more about structured properties in the [Structured Properties Feature Gui
 
 This guide will show you how to execute the following actions with structured properties.
 - Create structured properties
+- List structured properties
 - Read structured properties
 - Delete structured properties
 - Add structured properties to a dataset
@@ -32,7 +33,8 @@ Additionally, you need to have the following tools installed according to the me
 <Tabs>
 <TabItem value="CLI" label="CLI" default>
 
-Install the relevant CLI version. Forms are available as of CLI version `0.13.1`. The corresponding DataHub Cloud release version is `v0.2.16.5`
+Install the relevant CLI version. 
+Structured Properties were introduced in version `0.13.1`, but we continuously improve and add new functionality, so you should always [upgrade](https://datahubproject.io/docs/cli/#installation) to the latest cli for best results.
 Connect to your instance via [init](https://datahubproject.io/docs/cli/#init):
 
 - Run `datahub init` to update the instance you want to load into.
@@ -56,33 +58,8 @@ Requirements for OpenAPI are:
 The following code will create a structured property `io.acryl.privacy.retentionTime`. 
 
 <Tabs>
-<TabItem value="graphql" label="graphQL" default>
 
-```graphql
-mutation createStructuredProperty {
-  createStructuredProperty(
-    input: {
-      id: "retentionTime",
-      qualifiedName:"retentionTime",
-      displayName: "Retention Time",
-      description: "Retention Time is used to figure out how long to retain records in a dataset",
-      valueType: "urn:li:dataType:datahub.number",
-      allowedValues: [
-        {numberValue: 30, description: "30 days, usually reserved for datasets that are ephemeral and contain pii"},
-        {numberValue: 90, description:"description: Use this for datasets that drive monthly reporting but contain pii"},
-        {numberValue: 365, description:"Use this for non-sensitive data that can be retained for longer"}
-      ],
-      cardinality: SINGLE,
-      entityTypes: ["urn:li:entityType:datahub.dataset", "urn:li:entityType:datahub.dataFlow"],
-    }
-  ) {
-    urn
-  }
-}
-```
-
-</TabItem>
-<TabItem value="CLI" label="CLI">
+<TabItem value="CLI" label="CLI" default>
 
 Create a yaml file representing the properties you’d like to load. 
 For example, below file represents a property `io.acryl.privacy.retentionTime`. You can see the full example [here](https://github.com/datahub-project/datahub/blob/example-yaml-sp/metadata-ingestion/examples/structured_properties/struct_props.yaml).
@@ -108,13 +85,41 @@ For example, below file represents a property `io.acryl.privacy.retentionTime`.
 ```
 
 Use the CLI to create your properties:
-```commandline
+```shell
 datahub properties upsert -f {properties_yaml}
 ```
 
 If successful, you should see `Created structured property urn:li:structuredProperty:...`
 
 </TabItem>
+
+<TabItem value="Graphql" label="GraphQL" default>
+
+```graphql
+mutation createStructuredProperty {
+  createStructuredProperty(
+    input: {
+      id: "retentionTime",
+      qualifiedName:"retentionTime",
+      displayName: "Retention Time",
+      description: "Retention Time is used to figure out how long to retain records in a dataset",
+      valueType: "urn:li:dataType:datahub.number",
+      allowedValues: [
+        {numberValue: 30, description: "30 days, usually reserved for datasets that are ephemeral and contain pii"},
+        {numberValue: 90, description:"description: Use this for datasets that drive monthly reporting but contain pii"},
+        {numberValue: 365, description:"Use this for non-sensitive data that can be retained for longer"}
+      ],
+      cardinality: SINGLE,
+      entityTypes: ["urn:li:entityType:datahub.dataset", "urn:li:entityType:datahub.dataFlow"],
+    }
+  ) {
+    urn
+  }
+}
+```
+
+</TabItem>
+
 <TabItem value="OpenAPI v2" label="OpenAPI v2">
 
 ```shell
@@ -236,9 +241,182 @@ Example Response:
 </TabItem>
 </Tabs>
 
-## Read Structured Properties
+## List Structured Properties
+
+You can list all structured properties in your DataHub instance using the following methods:
+
+<Tabs>
+<TabItem value="CLI" label="CLI" default>
+
+```shell
+datahub properties list
+```
+
+This will show all properties with their full details. 
+
+Example Response:
+```json
+{
+  "urn": "urn:li:structuredProperty:clusterName",
+  "qualified_name": "clusterName",
+  "type": "urn:li:dataType:datahub.string",
+  "description": "Test Cluster Name Property",
+  "display_name": "Cluster's name",
+  "entity_types": [
+    "urn:li:entityType:datahub.dataset"
+  ],
+  "cardinality": "SINGLE"
+}
+{
+  "urn": "urn:li:structuredProperty:projectNames",
+  "qualified_name": "projectNames",
+  "type": "urn:li:dataType:datahub.string",
+  "description": "Test property for project name",
+  "display_name": "Project Name",
+  "entity_types": [
+    "urn:li:entityType:datahub.dataset",
+    "urn:li:entityType:datahub.dataFlow"
+  ],
+  "cardinality": "MULTIPLE",
+  "allowed_values": [
+    {
+      "value": "Tracking",
+      "description": "test value 1 for project"
+    },
+    {
+      "value": "DataHub",
+      "description": "test value 2 for project"
+    }
+  ]
+}
+```
+
+
+If you only want to see the URNs, you can use:
+
+```shell
+datahub properties list --no-details
+```
+
+Example Response:
+```
+[2025-01-08 22:23:00,625] INFO     {datahub.cli.specific.structuredproperties_cli:134} - Listing structured property urns only, use --details for more information
+urn:li:structuredProperty:clusterName
+urn:li:structuredProperty:clusterType
+urn:li:structuredProperty:io.acryl.dataManagement.deprecationDate
+urn:li:structuredProperty:projectNames
+```
+
+To download all the structured property definitions into a single file that you can use with the `upsert` command as described in the [create section](#create-structured-properties), you can run the list command with the `--to-file` option.
+
+```shell
+datahub properties list --to-file structured_properties.yaml
+```
+
+Example Response:
+```yaml
+  - urn: urn:li:structuredProperty:clusterName
+    qualified_name: clusterName
+    type: urn:li:dataType:datahub.string
+    description: Test Cluster Name Property
+    display_name: Cluster's name
+    entity_types:
+      - urn:li:entityType:datahub.dataset
+    cardinality: SINGLE
+  - urn: urn:li:structuredProperty:clusterType
+    qualified_name: clusterType
+    type: urn:li:dataType:datahub.string
+    description: Test Cluster Type Property
+    display_name: Cluster's type
+    entity_types:
+      - urn:li:entityType:datahub.dataset
+    cardinality: SINGLE
+  - urn: urn:li:structuredProperty:io.acryl.dataManagement.deprecationDate
+    qualified_name: io.acryl.dataManagement.deprecationDate
+    type: urn:li:dataType:datahub.date
+    display_name: Deprecation Date
+    entity_types:
+      - urn:li:entityType:datahub.dataset
+      - urn:li:entityType:datahub.dataFlow
+      - urn:li:entityType:datahub.dataJob
+      - urn:li:entityType:datahub.schemaField
+    cardinality: SINGLE
+  - urn: urn:li:structuredProperty:io.acryl.privacy.enumProperty5712
+    qualified_name: io.acryl.privacy.enumProperty5712
+    type: urn:li:dataType:datahub.string
+    description: The retention policy for the dataset
+    entity_types:
+      - urn:li:entityType:datahub.dataset
+    cardinality: MULTIPLE
+    allowed_values:
+      - value: foo
+      - value: bar
+... etc.
+```
+
+</TabItem>
+
+<TabItem value="OpenAPI v3" label="OpenAPI v3">
+
+Example Request:
+```bash
+curl -X 'GET' \
+  'http://localhost:9002/openapi/v3/entity/structuredproperty?systemMetadata=false&includeSoftDelete=false&skipCache=false&aspects=structuredPropertySettings&aspects=propertyDefinition&aspects=institutionalMemory&aspects=structuredPropertyKey&aspects=status&count=10&sortCriteria=urn&sortOrder=ASCENDING&query=*' \
+  -H 'accept: application/json'
+```
+
+Example Response:
+```json
+{
+  "scrollId": "...",
+  "entities": [
+    {
+      "urn": "urn:li:structuredProperty:clusterName",
+      "propertyDefinition": {
+        "value": {
+          "immutable": false,
+          "qualifiedName": "clusterName",
+          "displayName": "Cluster's name",
+          "valueType": "urn:li:dataType:datahub.string",
+          "description": "Test Cluster Name Property",
+          "entityTypes": [
+            "urn:li:entityType:datahub.dataset"
+          ],
+          "cardinality": "SINGLE"
+        }
+      },
+      "structuredPropertyKey": {
+        "value": {
+          "id": "clusterName"
+        }
+      }
+    }
+  ]
+}
+```
+
+Key Query Parameters:
+- `count`: Number of results to return per page (default: 10)
+- `sortCriteria`: Field to sort by (default: urn)
+- `sortOrder`: Sort order (ASCENDING or DESCENDING)
+- `query`: Search query to filter properties (* for all)
+
+</TabItem>
+</Tabs>
+
+The list endpoint returns all structured properties in your DataHub instance. Each property includes:
+- URN: Unique identifier for the property
+- Qualified Name: The property's qualified name
+- Type: The data type of the property (string, number, date, etc.)
+- Description: A description of the property's purpose
+- Display Name: Human-readable name for the property
+- Entity Types: The types of entities this property can be applied to
+- Cardinality: Whether the property accepts single (SINGLE) or multiple (MULTIPLE) values
+- Allowed Values: If specified, the list of allowed values for this property
 
-You can see the properties you created by running the following command:
+## Read a single Structured Property
+
+You can read an individual property you created by running the following command:
 
 <Tabs>
 <TabItem value="CLI" label="CLI" default>
@@ -279,6 +457,91 @@ If successful, you should see metadata about your properties returned.
 }
 ```
 
+</TabItem>
+<TabItem value="GraphQL" label="GraphQL">
+
+Example Request:
+```graphql
+query {
+  structuredProperty(urn: "urn:li:structuredProperty:projectNames") {
+    urn
+    type
+    definition {
+      qualifiedName
+      displayName
+      description
+      cardinality
+      allowedValues {
+        value {
+          ... on StringValue {
+            stringValue
+          }
+          ... on NumberValue {
+            numberValue
+          }
+        }
+        description
+      }
+      entityTypes {
+        urn
+        info {
+          type
+          qualifiedName
+        }
+      }
+    }
+  }
+}
+```
+
+Example Response:
+```json
+{
+  "data": {
+    "structuredProperty": {
+      "urn": "urn:li:structuredProperty:projectNames",
+      "type": "STRUCTURED_PROPERTY",
+      "definition": {
+        "qualifiedName": "projectNames",
+        "displayName": "Project Name",
+        "description": "Test property for project name",
+        "cardinality": "MULTIPLE",
+        "allowedValues": [
+          {
+            "value": {
+              "stringValue": "Tracking"
+            },
+            "description": "test value 1 for project"
+          },
+          {
+            "value": {
+              "stringValue": "DataHub"
+            },
+            "description": "test value 2 for project"
+          }
+        ],
+        "entityTypes": [
+          {
+            "urn": "urn:li:entityType:datahub.dataset",
+            "info": {
+              "type": "DATASET",
+              "qualifiedName": "datahub.dataset"
+            }
+          },
+          {
+            "urn": "urn:li:entityType:datahub.dataFlow",
+            "info": {
+              "type": "DATA_FLOW",
+              "qualifiedName": "datahub.dataFlow"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "extensions": {}
+}
+```
 </TabItem>
 
 <TabItem value="OpenAPI v2" label="OpenAPI v2">
@@ -389,7 +652,7 @@ Example Response:
 This action will set/replace all structured properties on the entity. See PATCH operations to add/remove a single property.
 
 <Tabs>
-<TabItem value="graphQL" label="GraphQL" default>
+<TabItem value="GraphQL" label="GraphQL" default>
 
 ```graphql
 mutation upsertStructuredProperties {
@@ -537,7 +800,7 @@ datahub dataset get --urn {urn}
 For reading all structured properties from a dataset:
 
 <Tabs>
-<TabItem value="graphql" label="GraphQL" default>
+<TabItem value="Graphql" label="GraphQL" default>
 
 ```graphql
 query getDataset {
diff --git a/metadata-ingestion/examples/structured_properties/list_structured_properties.py b/metadata-ingestion/examples/structured_properties/list_structured_properties.py
new file mode 100644
index 00000000000000..66ac90c1228a37
--- /dev/null
+++ b/metadata-ingestion/examples/structured_properties/list_structured_properties.py
@@ -0,0 +1,12 @@
+# Usage: python3 list_structured_properties.py
+# Expected Output: List of structured properties
+# This script lists all structured properties in DataHub
+from datahub.api.entities.structuredproperties.structuredproperties import (
+    StructuredProperties,
+)
+from datahub.ingestion.graph.client import get_default_graph
+
+with get_default_graph() as graph:
+    structuredproperties = StructuredProperties.list(graph)
+    for structuredproperty in structuredproperties:
+        print(structuredproperty.dict())
diff --git a/metadata-ingestion/src/datahub/api/entities/structuredproperties/structuredproperties.py b/metadata-ingestion/src/datahub/api/entities/structuredproperties/structuredproperties.py
index 619f69b016262d..179dbdb231c912 100644
--- a/metadata-ingestion/src/datahub/api/entities/structuredproperties/structuredproperties.py
+++ b/metadata-ingestion/src/datahub/api/entities/structuredproperties/structuredproperties.py
@@ -1,7 +1,7 @@
 import logging
 from enum import Enum
 from pathlib import Path
-from typing import List, Optional
+from typing import Iterable, List, Optional
 
 import yaml
 from pydantic import validator
@@ -226,3 +226,14 @@ def to_yaml(
             yaml.indent(mapping=2, sequence=4, offset=2)
             yaml.default_flow_style = False
             yaml.dump(self.dict(), fp)
+
+    @staticmethod
+    def list_urns(graph: DataHubGraph) -> Iterable[str]:
+        return graph.get_urns_by_filter(
+            entity_types=["structuredProperty"],
+        )
+
+    @staticmethod
+    def list(graph: DataHubGraph) -> Iterable["StructuredProperties"]:
+        for urn in StructuredProperties.list_urns(graph):
+            yield StructuredProperties.from_datahub(graph, urn)
diff --git a/metadata-ingestion/src/datahub/cli/specific/structuredproperties_cli.py b/metadata-ingestion/src/datahub/cli/specific/structuredproperties_cli.py
index 42285cf13a5ddc..5cd28516a076d9 100644
--- a/metadata-ingestion/src/datahub/cli/specific/structuredproperties_cli.py
+++ b/metadata-ingestion/src/datahub/cli/specific/structuredproperties_cli.py
@@ -1,9 +1,11 @@
 import json
 import logging
 from pathlib import Path
+from typing import Iterable
 
 import click
 from click_default_group import DefaultGroup
+from ruamel.yaml import YAML
 
 from datahub.api.entities.structuredproperties.structuredproperties import (
     StructuredProperties,
@@ -61,3 +63,85 @@ def get(urn: str, to_file: str) -> None:
                 )
         else:
             click.secho(f"Structured property {urn} does not exist")
+
+
+@properties.command(
+    name="list",
+)
+@click.option("--details/--no-details", is_flag=True, default=True)
+@click.option("--to-file", required=False, type=str)
+@telemetry.with_telemetry()
+def list(details: bool, to_file: str) -> None:
+    """List structured properties in DataHub"""
+
+    def to_yaml_list(
+        objects: Iterable[StructuredProperties],  # iterable of objects to dump
+        file: Path,
+    ) -> None:
+        # if file exists, first we read it
+        yaml = YAML(typ="rt")  # default, if not specfied, is 'rt' (round-trip)
+        yaml.indent(mapping=2, sequence=4, offset=2)
+        yaml.default_flow_style = False
+        serialized_objects = []
+        if file.exists():
+            with open(file, "r") as fp:
+                existing_objects = yaml.load(fp)  # this is a list of dicts
+                existing_objects = [
+                    StructuredProperties.parse_obj(obj) for obj in existing_objects
+                ]
+                objects = [obj for obj in objects]
+                # do a positional update of the existing objects
+                existing_urns = {obj.urn for obj in existing_objects}
+                # existing_urns = {obj["urn"] if "urn" in obj else f"urn:li:structuredProperty:{obj['id']}" for obj in existing_objects}
+                for i, obj in enumerate(existing_objects):
+                    # existing_urn = obj["urn"] if "urn" in obj else f"urn:li:structuredProperty:{obj['id']}"
+                    existing_urn = obj.urn
+                    # breakpoint()
+                    if existing_urn in {obj.urn for obj in objects}:
+                        existing_objects[i] = next(
+                            obj.dict(exclude_unset=True, exclude_none=True)
+                            for obj in objects
+                            if obj.urn == existing_urn
+                        )
+                new_objects = [
+                    obj.dict(exclude_unset=True, exclude_none=True)
+                    for obj in objects
+                    if obj.urn not in existing_urns
+                ]
+                serialized_objects = existing_objects + new_objects
+        else:
+            serialized_objects = [
+                obj.dict(exclude_unset=True, exclude_none=True) for obj in objects
+            ]
+
+        with open(file, "w") as fp:
+            yaml.dump(serialized_objects, fp)
+
+    with get_default_graph() as graph:
+        if details:
+            logger.info(
+                "Listing structured properties with details. Use --no-details for urns only"
+            )
+            structuredproperties = StructuredProperties.list(graph)
+            if to_file:
+                to_yaml_list(structuredproperties, Path(to_file))
+            else:
+                for structuredproperty in structuredproperties:
+                    click.secho(
+                        f"{json.dumps(structuredproperty.dict(exclude_unset=True, exclude_none=True), indent=2)}"
+                    )
+        else:
+            logger.info(
+                "Listing structured property urns only, use --details for more information"
+            )
+            structured_property_urns = StructuredProperties.list_urns(graph)
+            if to_file:
+                with open(to_file, "w") as f:
+                    for urn in structured_property_urns:
+                        f.write(f"{urn}\n")
+                click.secho(
+                    f"Structured property urns written to {to_file}", fg="green"
+                )
+            else:
+                for urn in structured_property_urns:
+                    click.secho(f"{urn}")
diff --git a/metadata-ingestion/tests/unit/structured_properties/test_structured_properties.py b/metadata-ingestion/tests/unit/structured_properties/test_structured_properties.py
new file mode 100644
index 00000000000000..d03b08b77d5a96
--- /dev/null
+++ b/metadata-ingestion/tests/unit/structured_properties/test_structured_properties.py
@@ -0,0 +1,213 @@
+from unittest.mock import Mock
+
+import pytest
+import yaml
+
+from datahub.api.entities.structuredproperties.structuredproperties import (
+    AllowedValue,
+    StructuredProperties,
+    TypeQualifierAllowedTypes,
+)
+from datahub.ingestion.graph.client import DataHubGraph
+from datahub.metadata.schema_classes import (
+    PropertyValueClass,
+    StructuredPropertyDefinitionClass,
+)
+
+
+@pytest.fixture
+def sample_yaml_content():
+    return """
+- id: test_property
+  type: string
+  description: Test description
+  display_name: Test Property
+  entity_types:
+    - dataset
+  cardinality: SINGLE
+  allowed_values:
+    - value: test_value
+      description: Test value description
+"""
+
+
+@pytest.fixture
+def sample_yaml_file(tmp_path, sample_yaml_content):
+    yaml_file = tmp_path / "test_properties.yaml"
+    yaml_file.write_text(sample_yaml_content)
+    return str(yaml_file)
+
+
+@pytest.fixture
+def mock_graph():
+    return Mock(spec=DataHubGraph)
+
+
+def test_structured_properties_basic_creation():
+    props = StructuredProperties(
+        id="test_prop", type="string", description="Test description"
+    )
+    assert props.id == "test_prop"
+    assert props.type == "urn:li:dataType:datahub.string"
+    assert props.description == "Test description"
+    assert props.urn == "urn:li:structuredProperty:test_prop"
+
+
+def test_structured_properties_validate_type():
+    # Test valid types
+    props = StructuredProperties(id="test", type="string")
+    assert props.type == "urn:li:dataType:datahub.string"
+
+    # Test invalid type
+    with pytest.raises(ValueError, match="Type .* is not allowed"):
+        StructuredProperties(id="test", type="invalid_type")
+
+
+def test_structured_properties_validate_entity_types():
+    # Test valid entity type
+    props = StructuredProperties(id="test", type="string", entity_types=["dataset"])
+    assert props.entity_types
+    assert "urn:li:entityType:datahub.dataset" in props.entity_types
+
+    # Test invalid entity type
+    with pytest.raises(ValueError, match="not a valid entity type"):
+        StructuredProperties(id="test", type="string", entity_types=["invalid_entity"])
+
+
+def test_structured_properties_from_yaml(sample_yaml_file):
+    props = StructuredProperties.from_yaml(sample_yaml_file)
+    assert len(props) == 1
+    assert props[0].id == "test_property"
+    assert props[0].type == "urn:li:dataType:datahub.string"
+    assert props[0].description == "Test description"
+    assert props[0].display_name
+    assert props[0].display_name == "Test Property"
+    assert props[0].allowed_values
+    assert len(props[0].allowed_values) == 1
+    assert props[0].allowed_values[0].value == "test_value"
+
+
+def test_structured_properties_generate_mcps():
+    props = StructuredProperties(
+        id="test_prop",
+        type="string",
+        description="Test description",
+        display_name="Test Property",
+        entity_types=["dataset"],
+        allowed_values=[
+            AllowedValue(value="test_value", description="Test value description")
+        ],
+    )
+
+    mcps = props.generate_mcps()
+    assert len(mcps) == 1
+    mcp = mcps[0]
+
+    assert mcp.entityUrn == "urn:li:structuredProperty:test_prop"
+    assert isinstance(mcp.aspect, StructuredPropertyDefinitionClass)
+    assert mcp.aspect.valueType == "urn:li:dataType:datahub.string"
+    assert mcp.aspect.description == "Test description"
+    assert mcp.aspect.allowedValues
+    assert len(mcp.aspect.allowedValues) == 1
+    assert mcp.aspect.allowedValues[0].value == "test_value"
+
+
+def test_structured_properties_from_datahub(mock_graph):
+    mock_aspect = StructuredPropertyDefinitionClass(
+        qualifiedName="test_prop",
+        valueType="urn:li:dataType:datahub.string",
+        displayName="Test Property",
+        description="Test description",
+        entityTypes=["urn:li:entityType:datahub.dataset"],
+        cardinality="SINGLE",
+        allowedValues=[
+            PropertyValueClass(value="test_value", description="Test description")
+        ],
+    )
+
+    mock_graph.get_aspect.return_value = mock_aspect
+
+    props = StructuredProperties.from_datahub(
+        mock_graph, "urn:li:structuredProperty:test_prop"
+    )
+
+    assert props.qualified_name == "test_prop"
+    assert props.type == "urn:li:dataType:datahub.string"
+    assert props.display_name == "Test Property"
+    assert props.allowed_values
+    assert len(props.allowed_values) == 1
+    assert props.allowed_values[0].value == "test_value"
+
+
+def test_structured_properties_to_yaml(tmp_path):
+    props = StructuredProperties(
+        id="test_prop",
+        type="string",
+        description="Test description",
+        allowed_values=[
+            AllowedValue(value="test_value", description="Test value description")
+        ],
+    )
+
+    yaml_file = tmp_path / "output.yaml"
+    props.to_yaml(yaml_file)
+
+    # Verify the yaml file was created and contains expected content
+    assert yaml_file.exists()
+    with open(yaml_file) as f:
+        content = yaml.safe_load(f)
+        assert content["id"] == "test_prop"
+        assert content["type"] == "urn:li:dataType:datahub.string"
+        assert content["description"] == "Test description"
+
+
+@pytest.mark.parametrize(
+    "input_type,expected_type",
+    [
+        ("string", "urn:li:dataType:datahub.string"),
+        ("STRING", "urn:li:dataType:datahub.string"),
+        ("number", "urn:li:dataType:datahub.number"),
+        ("date", "urn:li:dataType:datahub.date"),
+    ],
+)
+def test_structured_properties_type_normalization(input_type, expected_type):
+    props = StructuredProperties(id="test_prop", type=input_type)
+    assert props.type == expected_type
+
+
+def test_structured_properties_type_qualifier():
+    props = StructuredProperties(
+        id="test_prop",
+        type="urn",
+        type_qualifier=TypeQualifierAllowedTypes(allowed_types=["dataset"]),
+    )
+
+    mcps = props.generate_mcps()
+    assert mcps[0].aspect
+    assert mcps[0].aspect.typeQualifier["allowedTypes"] == [  # type: ignore
+        "urn:li:entityType:datahub.dataset"
+    ]
+
+
+def test_structured_properties_list(mock_graph):
+    mock_graph.get_urns_by_filter.return_value = [
+        "urn:li:structuredProperty:prop1",
+        "urn:li:structuredProperty:prop2",
+    ]
+
+    mock_aspect = StructuredPropertyDefinitionClass(
+        qualifiedName="test_prop",
+        valueType="urn:li:dataType:string",
+        entityTypes=["urn:li:entityType:datahub.dataset"],
+    )
+    mock_graph.get_aspect.return_value = mock_aspect
+
+    props = list(StructuredProperties.list(mock_graph))
+
+    # Verify get_urns_by_filter was called with correct arguments
+    mock_graph.get_urns_by_filter.assert_called_once_with(
+        entity_types=["structuredProperty"]
+    )
+
+    assert len(props) == 2
+    assert all(isinstance(prop, StructuredProperties) for prop in props)
diff --git a/smoke-test/tests/structured_properties/test_structured_properties.py b/smoke-test/tests/structured_properties/test_structured_properties.py
index 533a03a55735a1..e3c33aa406efc4 100644
--- a/smoke-test/tests/structured_properties/test_structured_properties.py
+++ b/smoke-test/tests/structured_properties/test_structured_properties.py
@@ -839,3 +839,49 @@ def validate_search(qualified_name, expected):
     # Validate search works for property #1 & #2
     validate_search(property1.qualified_name, expected=[])
     validate_search(property2.qualified_name, expected=[dataset_urns[0]])
+
+
+def test_structured_properties_list(ingest_cleanup_data, graph_client, caplog):
+    # Create property, assign value to target dataset urn
+    def create_property():
+        property_name = f"listTest{randint(10, 10000)}Property"
+        value_type = "string"
+        property_urn = f"urn:li:structuredProperty:{default_namespace}.{property_name}"
+
+        create_property_definition(
+            property_name=property_name,
+            graph=graph_client,
+            value_type=value_type,
+            cardinality="SINGLE",
+        )
+
+        test_property = StructuredProperties.from_datahub(
+            graph=graph_client, urn=property_urn
+        )
+        assert test_property is not None
+
+        return test_property
+
+    # create 2 structured properties
+    property1 = create_property()
+    property2 = create_property()
+    wait_for_writes_to_sync()
+
+    # validate that urns are in the list
+    structured_properties_urns = [
+        u for u in StructuredProperties.list_urns(graph_client)
+    ]
+    assert property1.urn in structured_properties_urns
+    assert property2.urn in structured_properties_urns
+
+    # list structured properties (full)
+    structured_properties = StructuredProperties.list(graph_client)
+    matched_properties = [
+        p for p in structured_properties if p.urn in [property1.urn, property2.urn]
+    ]
+    assert len(matched_properties) == 2
+    retrieved_property1 = next(p for p in matched_properties if p.urn == property1.urn)
+    retrieved_property2 = next(p for p in matched_properties if p.urn == property2.urn)
+
+    assert property1.dict() == retrieved_property1.dict()
+    assert property2.dict() == retrieved_property2.dict()

From 9d9a368deaf14410c8d56f36e878d137f9088932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20G=C3=B3mez=20Villamor?= <sgomezvillamor@gmail.com>
Date: Thu, 9 Jan 2025 19:04:37 +0100
Subject: [PATCH 047/249] chore(tableau): set ingestion stage report and
 perftimers (#12234)

---
 .../src/datahub/ingestion/api/source.py       |   2 +
 .../ingestion/source/bigquery_v2/bigquery.py  |  64 ++++----
 .../source/bigquery_v2/bigquery_report.py     |   3 -
 .../source/bigquery_v2/bigquery_schema_gen.py |  22 +--
 .../ingestion/source/bigquery_v2/lineage.py   |  14 +-
 .../ingestion/source/bigquery_v2/usage.py     | 114 ++++++-------
 .../source/cassandra/cassandra_profiling.py   |  48 +++---
 .../source/cassandra/cassandra_utils.py       |   3 -
 .../source/dremio/dremio_reporting.py         |   3 -
 .../ingestion/source/dremio/dremio_source.py  |   4 +-
 .../datahub/ingestion/source/gc/datahub_gc.py |  24 ++-
 .../ingestion/source/redshift/redshift.py     |  66 ++++----
 .../ingestion/source/redshift/usage.py        |  58 +++----
 .../source/snowflake/snowflake_report.py      |   3 -
 .../source/snowflake/snowflake_schema_gen.py  |  34 ++--
 .../source/snowflake/snowflake_usage_v2.py    |  93 ++++++-----
 .../source/snowflake/snowflake_v2.py          |  77 +++++----
 .../datahub/ingestion/source/sql/teradata.py  |   4 +-
 .../ingestion/source/tableau/tableau.py       | 150 ++++++++++++++----
 .../datahub/ingestion/source/unity/source.py  | 142 ++++++++---------
 .../source_report/ingestion_stage.py          |  44 ++---
 .../src/datahub/utilities/perf_timer.py       |  17 +-
 .../bigquery/test_bigquery_usage.py           |  83 +++++-----
 .../performance/databricks/test_unity.py      |   2 +-
 .../performance/snowflake/test_snowflake.py   |   2 +-
 .../performance/sql/test_sql_formatter.py     |   6 +-
 .../unit/reporting/test_ingestion_stage.py    |  42 +++++
 27 files changed, 625 insertions(+), 499 deletions(-)
 create mode 100644 metadata-ingestion/tests/unit/reporting/test_ingestion_stage.py

diff --git a/metadata-ingestion/src/datahub/ingestion/api/source.py b/metadata-ingestion/src/datahub/ingestion/api/source.py
index 75dc980e234ac8..53cb1b0ecad4ee 100644
--- a/metadata-ingestion/src/datahub/ingestion/api/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/api/source.py
@@ -334,6 +334,8 @@ def as_obj(self) -> dict:
         }
 
     def compute_stats(self) -> None:
+        super().compute_stats()
+
         duration = datetime.datetime.now() - self.start_time
         workunits_produced = self.events_produced
         if duration.total_seconds() > 0:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py
index db7b0540e49e71..508b4bbaa277dc 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py
@@ -253,14 +253,14 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
         for project in projects:
             yield from self.bq_schema_extractor.get_project_workunits(project)
 
-        self.report.set_ingestion_stage("*", "View and Snapshot Lineage")
-        yield from self.lineage_extractor.get_lineage_workunits_for_views_and_snapshots(
-            [p.id for p in projects],
-            self.bq_schema_extractor.view_refs_by_project,
-            self.bq_schema_extractor.view_definitions,
-            self.bq_schema_extractor.snapshot_refs_by_project,
-            self.bq_schema_extractor.snapshots_by_ref,
-        )
+        with self.report.new_stage("*: View and Snapshot Lineage"):
+            yield from self.lineage_extractor.get_lineage_workunits_for_views_and_snapshots(
+                [p.id for p in projects],
+                self.bq_schema_extractor.view_refs_by_project,
+                self.bq_schema_extractor.view_definitions,
+                self.bq_schema_extractor.snapshot_refs_by_project,
+                self.bq_schema_extractor.snapshots_by_ref,
+            )
 
         if self.config.use_queries_v2:
             # if both usage and lineage are disabled then skip queries extractor piece
@@ -270,31 +270,29 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
             ):
                 return
 
-            self.report.set_ingestion_stage("*", QUERIES_EXTRACTION)
-
-            with BigQueryQueriesExtractor(
-                connection=self.config.get_bigquery_client(),
-                schema_api=self.bq_schema_extractor.schema_api,
-                config=BigQueryQueriesExtractorConfig(
-                    window=self.config,
-                    user_email_pattern=self.config.usage.user_email_pattern,
-                    include_lineage=self.config.include_table_lineage,
-                    include_usage_statistics=self.config.include_usage_statistics,
-                    include_operations=self.config.usage.include_operational_stats,
-                    include_queries=self.config.include_queries,
-                    include_query_usage_statistics=self.config.include_query_usage_statistics,
-                    top_n_queries=self.config.usage.top_n_queries,
-                    region_qualifiers=self.config.region_qualifiers,
-                ),
-                structured_report=self.report,
-                filters=self.filters,
-                identifiers=self.identifiers,
-                schema_resolver=self.sql_parser_schema_resolver,
-                discovered_tables=self.bq_schema_extractor.table_refs,
-            ) as queries_extractor:
-                self.report.queries_extractor = queries_extractor.report
-                yield from queries_extractor.get_workunits_internal()
-
+            with self.report.new_stage(f"*: {QUERIES_EXTRACTION}"):
+                with BigQueryQueriesExtractor(
+                    connection=self.config.get_bigquery_client(),
+                    schema_api=self.bq_schema_extractor.schema_api,
+                    config=BigQueryQueriesExtractorConfig(
+                        window=self.config,
+                        user_email_pattern=self.config.usage.user_email_pattern,
+                        include_lineage=self.config.include_table_lineage,
+                        include_usage_statistics=self.config.include_usage_statistics,
+                        include_operations=self.config.usage.include_operational_stats,
+                        include_queries=self.config.include_queries,
+                        include_query_usage_statistics=self.config.include_query_usage_statistics,
+                        top_n_queries=self.config.usage.top_n_queries,
+                        region_qualifiers=self.config.region_qualifiers,
+                    ),
+                    structured_report=self.report,
+                    filters=self.filters,
+                    identifiers=self.identifiers,
+                    schema_resolver=self.sql_parser_schema_resolver,
+                    discovered_tables=self.bq_schema_extractor.table_refs,
+                ) as queries_extractor:
+                    self.report.queries_extractor = queries_extractor.report
+                    yield from queries_extractor.get_workunits_internal()
         else:
             if self.config.include_usage_statistics:
                 yield from self.usage_extractor.get_usage_workunits(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_report.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_report.py
index 06842da67f76ca..8e55d81aac5fe3 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_report.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_report.py
@@ -190,6 +190,3 @@ class BigQueryV2Report(
     num_skipped_external_table_lineage: int = 0
 
     queries_extractor: Optional[BigQueryQueriesExtractorReport] = None
-
-    def set_ingestion_stage(self, project_id: str, stage: str) -> None:
-        self.report_ingestion_stage_start(f"{project_id}: {stage}")
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py
index bc2688e6b481ab..56e930dfb811f1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py
@@ -248,9 +248,9 @@ def modified_base32decode(self, text_to_decode: str) -> str:
     def get_project_workunits(
         self, project: BigqueryProject
     ) -> Iterable[MetadataWorkUnit]:
-        self.report.set_ingestion_stage(project.id, METADATA_EXTRACTION)
-        logger.info(f"Processing project: {project.id}")
-        yield from self._process_project(project)
+        with self.report.new_stage(f"{project.id}: {METADATA_EXTRACTION}"):
+            logger.info(f"Processing project: {project.id}")
+            yield from self._process_project(project)
 
     def get_dataplatform_instance_aspect(
         self, dataset_urn: str, project_id: str
@@ -405,11 +405,11 @@ def _process_project(
 
         if self.config.is_profiling_enabled():
             logger.info(f"Starting profiling project {project_id}")
-            self.report.set_ingestion_stage(project_id, PROFILING)
-            yield from self.profiler.get_workunits(
-                project_id=project_id,
-                tables=db_tables,
-            )
+            with self.report.new_stage(f"{project_id}: {PROFILING}"):
+                yield from self.profiler.get_workunits(
+                    project_id=project_id,
+                    tables=db_tables,
+                )
 
     def _process_project_datasets(
         self,
@@ -1203,9 +1203,9 @@ def get_tables_for_dataset(
                     report=self.report,
                 )
 
-        self.report.metadata_extraction_sec[f"{project_id}.{dataset.name}"] = round(
-            timer.elapsed_seconds(), 2
-        )
+        self.report.metadata_extraction_sec[
+            f"{project_id}.{dataset.name}"
+        ] = timer.elapsed_seconds(digits=2)
 
     def get_core_table_details(
         self, dataset_name: str, project_id: str, temp_table_dataset_prefix: str
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/lineage.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/lineage.py
index ba3357aa8ca20c..433282a21fdb66 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/lineage.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/lineage.py
@@ -330,11 +330,11 @@ def get_lineage_workunits(
             projects = ["*"]  # project_id not used when using exported metadata
 
         for project in projects:
-            self.report.set_ingestion_stage(project, LINEAGE_EXTRACTION)
-            yield from self.generate_lineage(
-                project,
-                table_refs,
-            )
+            with self.report.new_stage(f"{project}: {LINEAGE_EXTRACTION}"):
+                yield from self.generate_lineage(
+                    project,
+                    table_refs,
+                )
 
         if self.redundant_run_skip_handler:
             # Update the checkpoint state for this run.
@@ -368,8 +368,8 @@ def generate_lineage(
             self.report.lineage_metadata_entries[project_id] = len(lineage)
             logger.info(f"Built lineage map containing {len(lineage)} entries.")
             logger.debug(f"lineage metadata is {lineage}")
-            self.report.lineage_extraction_sec[project_id] = round(
-                timer.elapsed_seconds(), 2
+            self.report.lineage_extraction_sec[project_id] = timer.elapsed_seconds(
+                digits=2
             )
             self.report.lineage_mem_size[project_id] = humanfriendly.format_size(
                 memory_footprint.total_size(lineage)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/usage.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/usage.py
index 876ffab85ba311..f2f6cc731858d1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/usage.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/usage.py
@@ -495,62 +495,62 @@ def _ingest_events(
     def _generate_operational_workunits(
         self, usage_state: BigQueryUsageState, table_refs: Collection[str]
     ) -> Iterable[MetadataWorkUnit]:
-        self.report.set_ingestion_stage("*", USAGE_EXTRACTION_OPERATIONAL_STATS)
-        for audit_event in usage_state.standalone_events():
-            try:
-                operational_wu = self._create_operation_workunit(
-                    audit_event, table_refs
-                )
-                if operational_wu:
-                    yield operational_wu
-                    self.report.num_operational_stats_workunits_emitted += 1
-            except Exception as e:
-                self.report.warning(
-                    message="Unable to generate operation workunit",
-                    context=f"{audit_event}",
-                    exc=e,
-                )
+        with self.report.new_stage(f"*: {USAGE_EXTRACTION_OPERATIONAL_STATS}"):
+            for audit_event in usage_state.standalone_events():
+                try:
+                    operational_wu = self._create_operation_workunit(
+                        audit_event, table_refs
+                    )
+                    if operational_wu:
+                        yield operational_wu
+                        self.report.num_operational_stats_workunits_emitted += 1
+                except Exception as e:
+                    self.report.warning(
+                        message="Unable to generate operation workunit",
+                        context=f"{audit_event}",
+                        exc=e,
+                    )
 
     def _generate_usage_workunits(
         self, usage_state: BigQueryUsageState
     ) -> Iterable[MetadataWorkUnit]:
-        self.report.set_ingestion_stage("*", USAGE_EXTRACTION_USAGE_AGGREGATION)
-        top_n = (
-            self.config.usage.top_n_queries
-            if self.config.usage.include_top_n_queries
-            else 0
-        )
-        for entry in usage_state.usage_statistics(top_n=top_n):
-            try:
-                query_freq = [
-                    (
-                        self.uuid_to_query.get(
-                            query_hash, usage_state.queries[query_hash]
-                        ),
-                        count,
+        with self.report.new_stage(f"*: {USAGE_EXTRACTION_USAGE_AGGREGATION}"):
+            top_n = (
+                self.config.usage.top_n_queries
+                if self.config.usage.include_top_n_queries
+                else 0
+            )
+            for entry in usage_state.usage_statistics(top_n=top_n):
+                try:
+                    query_freq = [
+                        (
+                            self.uuid_to_query.get(
+                                query_hash, usage_state.queries[query_hash]
+                            ),
+                            count,
+                        )
+                        for query_hash, count in entry.query_freq
+                    ]
+                    yield make_usage_workunit(
+                        bucket_start_time=datetime.fromisoformat(entry.timestamp),
+                        resource=BigQueryTableRef.from_string_name(entry.resource),
+                        query_count=entry.query_count,
+                        query_freq=query_freq,
+                        user_freq=entry.user_freq,
+                        column_freq=entry.column_freq,
+                        bucket_duration=self.config.bucket_duration,
+                        resource_urn_builder=self.identifiers.gen_dataset_urn_from_raw_ref,
+                        top_n_queries=self.config.usage.top_n_queries,
+                        format_sql_queries=self.config.usage.format_sql_queries,
+                        queries_character_limit=self.config.usage.queries_character_limit,
+                    )
+                    self.report.num_usage_workunits_emitted += 1
+                except Exception as e:
+                    self.report.warning(
+                        message="Unable to generate usage statistics workunit",
+                        context=f"{entry.timestamp}, {entry.resource}",
+                        exc=e,
                     )
-                    for query_hash, count in entry.query_freq
-                ]
-                yield make_usage_workunit(
-                    bucket_start_time=datetime.fromisoformat(entry.timestamp),
-                    resource=BigQueryTableRef.from_string_name(entry.resource),
-                    query_count=entry.query_count,
-                    query_freq=query_freq,
-                    user_freq=entry.user_freq,
-                    column_freq=entry.column_freq,
-                    bucket_duration=self.config.bucket_duration,
-                    resource_urn_builder=self.identifiers.gen_dataset_urn_from_raw_ref,
-                    top_n_queries=self.config.usage.top_n_queries,
-                    format_sql_queries=self.config.usage.format_sql_queries,
-                    queries_character_limit=self.config.usage.queries_character_limit,
-                )
-                self.report.num_usage_workunits_emitted += 1
-            except Exception as e:
-                self.report.warning(
-                    message="Unable to generate usage statistics workunit",
-                    context=f"{entry.timestamp}, {entry.resource}",
-                    exc=e,
-                )
 
     def _get_usage_events(self, projects: Iterable[str]) -> Iterable[AuditEvent]:
         if self.config.use_exported_bigquery_audit_metadata:
@@ -559,10 +559,10 @@ def _get_usage_events(self, projects: Iterable[str]) -> Iterable[AuditEvent]:
         for project_id in projects:
             with PerfTimer() as timer:
                 try:
-                    self.report.set_ingestion_stage(
-                        project_id, USAGE_EXTRACTION_INGESTION
-                    )
-                    yield from self._get_parsed_bigquery_log_events(project_id)
+                    with self.report.new_stage(
+                        f"{project_id}: {USAGE_EXTRACTION_INGESTION}"
+                    ):
+                        yield from self._get_parsed_bigquery_log_events(project_id)
                 except Exception as e:
                     self.report.usage_failed_extraction.append(project_id)
                     self.report.warning(
@@ -572,8 +572,8 @@ def _get_usage_events(self, projects: Iterable[str]) -> Iterable[AuditEvent]:
                     )
                     self.report_status(f"usage-extraction-{project_id}", False)
 
-                self.report.usage_extraction_sec[project_id] = round(
-                    timer.elapsed_seconds(), 2
+                self.report.usage_extraction_sec[project_id] = timer.elapsed_seconds(
+                    digits=2
                 )
 
     def _store_usage_event(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/cassandra/cassandra_profiling.py b/metadata-ingestion/src/datahub/ingestion/source/cassandra/cassandra_profiling.py
index d8ab62f1d6d91f..7bf1d66f618a4b 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/cassandra/cassandra_profiling.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/cassandra/cassandra_profiling.py
@@ -70,30 +70,30 @@ def get_workunits(
     ) -> Iterable[MetadataWorkUnit]:
         for keyspace_name in cassandra_data.keyspaces:
             tables = cassandra_data.tables.get(keyspace_name, [])
-            self.report.set_ingestion_stage(keyspace_name, PROFILING)
-            with ThreadPoolExecutor(
-                max_workers=self.config.profiling.max_workers
-            ) as executor:
-                future_to_dataset = {
-                    executor.submit(
-                        self.generate_profile,
-                        keyspace_name,
-                        table_name,
-                        cassandra_data.columns.get(table_name, []),
-                    ): table_name
-                    for table_name in tables
-                }
-                for future in as_completed(future_to_dataset):
-                    table_name = future_to_dataset[future]
-                    try:
-                        yield from future.result()
-                    except Exception as exc:
-                        self.report.profiling_skipped_other[table_name] += 1
-                        self.report.failure(
-                            message="Failed to profile for table",
-                            context=f"{keyspace_name}.{table_name}",
-                            exc=exc,
-                        )
+            with self.report.new_stage(f"{keyspace_name}: {PROFILING}"):
+                with ThreadPoolExecutor(
+                    max_workers=self.config.profiling.max_workers
+                ) as executor:
+                    future_to_dataset = {
+                        executor.submit(
+                            self.generate_profile,
+                            keyspace_name,
+                            table_name,
+                            cassandra_data.columns.get(table_name, []),
+                        ): table_name
+                        for table_name in tables
+                    }
+                    for future in as_completed(future_to_dataset):
+                        table_name = future_to_dataset[future]
+                        try:
+                            yield from future.result()
+                        except Exception as exc:
+                            self.report.profiling_skipped_other[table_name] += 1
+                            self.report.failure(
+                                message="Failed to profile for table",
+                                context=f"{keyspace_name}.{table_name}",
+                                exc=exc,
+                            )
 
     def generate_profile(
         self,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/cassandra/cassandra_utils.py b/metadata-ingestion/src/datahub/ingestion/source/cassandra/cassandra_utils.py
index 41d4ac7ced6035..75a0ba0c617734 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/cassandra/cassandra_utils.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/cassandra/cassandra_utils.py
@@ -54,9 +54,6 @@ def report_entity_scanned(self, name: str, ent_type: str = "View") -> None:
         else:
             raise KeyError(f"Unknown entity {ent_type}.")
 
-    def set_ingestion_stage(self, keyspace: str, stage: str) -> None:
-        self.report_ingestion_stage_start(f"{keyspace}: {stage}")
-
     # TODO Need to create seperate common config for profiling report
     profiling_skipped_other: TopKDict[str, int] = field(default_factory=int_top_k_dict)
     profiling_skipped_table_profile_pattern: TopKDict[str, int] = field(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_reporting.py b/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_reporting.py
index c8eb035461ca16..9712d4ddc67998 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_reporting.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_reporting.py
@@ -45,6 +45,3 @@ def report_entity_scanned(self, name: str, ent_type: str = "View") -> None:
             self.views_scanned += 1
         else:
             raise KeyError(f"Unknown entity {ent_type}.")
-
-    def set_ingestion_stage(self, dataset: str, stage: str) -> None:
-        self.report_ingestion_stage_start(f"{dataset}: {stage}")
diff --git a/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_source.py b/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_source.py
index 319290d25169af..6d34e86be6282e 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_source.py
@@ -472,8 +472,8 @@ def generate_profiles(
             env=self.config.env,
             platform_instance=self.config.platform_instance,
         )
-        self.report.set_ingestion_stage(dataset_info.resource_name, PROFILING)
-        yield from self.profiler.get_workunits(dataset_info, dataset_urn)
+        with self.report.new_stage(f"{dataset_info.resource_name}: {PROFILING}"):
+            yield from self.profiler.get_workunits(dataset_info, dataset_urn)
 
     def generate_view_lineage(
         self, dataset_urn: str, parents: List[str]
diff --git a/metadata-ingestion/src/datahub/ingestion/source/gc/datahub_gc.py b/metadata-ingestion/src/datahub/ingestion/source/gc/datahub_gc.py
index 443368e6d8b4fb..b4cc5423277c5a 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/gc/datahub_gc.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/gc/datahub_gc.py
@@ -141,40 +141,36 @@ def get_workunits_internal(
     ) -> Iterable[MetadataWorkUnit]:
         if self.config.cleanup_expired_tokens:
             try:
-                self.report.report_ingestion_stage_start("Expired Token Cleanup")
-                self.revoke_expired_tokens()
+                with self.report.new_stage("Expired Token Cleanup"):
+                    self.revoke_expired_tokens()
             except Exception as e:
                 self.report.failure("While trying to cleanup expired token ", exc=e)
         if self.config.truncate_indices:
             try:
-                self.report.report_ingestion_stage_start("Truncate Indices")
-                self.truncate_indices()
+                with self.report.new_stage("Truncate Indices"):
+                    self.truncate_indices()
             except Exception as e:
                 self.report.failure("While trying to truncate indices ", exc=e)
         if self.config.soft_deleted_entities_cleanup.enabled:
             try:
-                self.report.report_ingestion_stage_start(
-                    "Soft Deleted Entities Cleanup"
-                )
-                self.soft_deleted_entities_cleanup.cleanup_soft_deleted_entities()
+                with self.report.new_stage("Soft Deleted Entities Cleanup"):
+                    self.soft_deleted_entities_cleanup.cleanup_soft_deleted_entities()
             except Exception as e:
                 self.report.failure(
                     "While trying to cleanup soft deleted entities ", exc=e
                 )
         if self.config.dataprocess_cleanup.enabled:
             try:
-                self.report.report_ingestion_stage_start("Data Process Cleanup")
-                yield from self.dataprocess_cleanup.get_workunits_internal()
+                with self.report.new_stage("Data Process Cleanup"):
+                    yield from self.dataprocess_cleanup.get_workunits_internal()
             except Exception as e:
                 self.report.failure("While trying to cleanup data process ", exc=e)
         if self.config.execution_request_cleanup.enabled:
             try:
-                self.report.report_ingestion_stage_start("Execution request Cleanup")
-                self.execution_request_cleanup.run()
+                with self.report.new_stage("Execution request Cleanup"):
+                    self.execution_request_cleanup.run()
             except Exception as e:
                 self.report.failure("While trying to cleanup execution request ", exc=e)
-        # Otherwise last stage's duration does not get calculated.
-        self.report.report_ingestion_stage_start("End")
         yield from []
 
     def truncate_indices(self) -> None:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift.py b/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift.py
index 49f7941563c1a7..5371017a2a3212 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift.py
@@ -423,10 +423,10 @@ def get_workunits_internal(self) -> Iterable[Union[MetadataWorkUnit, SqlWorkUnit
 
         database = self.config.database
         logger.info(f"Processing db {database}")
-        self.report.report_ingestion_stage_start(METADATA_EXTRACTION)
-        self.db_tables[database] = defaultdict()
-        self.db_views[database] = defaultdict()
-        self.db_schemas.setdefault(database, {})
+        with self.report.new_stage(METADATA_EXTRACTION):
+            self.db_tables[database] = defaultdict()
+            self.db_views[database] = defaultdict()
+            self.db_schemas.setdefault(database, {})
 
         # TODO: Ideally, we'd push down exception handling to the place where the connection is used, as opposed to keeping
         # this fallback. For now, this gets us broad coverage quickly.
@@ -462,12 +462,12 @@ def _extract_metadata(
                     self.process_schemas(connection, database)
                 )
 
-                self.report.report_ingestion_stage_start(LINEAGE_EXTRACTION)
-                yield from self.extract_lineage_v2(
-                    connection=connection,
-                    database=database,
-                    lineage_extractor=lineage_extractor,
-                )
+                with self.report.new_stage(LINEAGE_EXTRACTION):
+                    yield from self.extract_lineage_v2(
+                        connection=connection,
+                        database=database,
+                        lineage_extractor=lineage_extractor,
+                    )
 
             all_tables = self.get_all_tables()
         else:
@@ -480,25 +480,25 @@ def _extract_metadata(
                 or self.config.include_view_lineage
                 or self.config.include_copy_lineage
             ):
-                self.report.report_ingestion_stage_start(LINEAGE_EXTRACTION)
-                yield from self.extract_lineage(
-                    connection=connection, all_tables=all_tables, database=database
-                )
+                with self.report.new_stage(LINEAGE_EXTRACTION):
+                    yield from self.extract_lineage(
+                        connection=connection, all_tables=all_tables, database=database
+                    )
 
-        self.report.report_ingestion_stage_start(USAGE_EXTRACTION_INGESTION)
         if self.config.include_usage_statistics:
-            yield from self.extract_usage(
-                connection=connection, all_tables=all_tables, database=database
-            )
+            with self.report.new_stage(USAGE_EXTRACTION_INGESTION):
+                yield from self.extract_usage(
+                    connection=connection, all_tables=all_tables, database=database
+                )
 
         if self.config.is_profiling_enabled():
-            self.report.report_ingestion_stage_start(PROFILING)
-            profiler = RedshiftProfiler(
-                config=self.config,
-                report=self.report,
-                state_handler=self.profiling_state_handler,
-            )
-            yield from profiler.get_workunits(self.db_tables)
+            with self.report.new_stage(PROFILING):
+                profiler = RedshiftProfiler(
+                    config=self.config,
+                    report=self.report,
+                    state_handler=self.profiling_state_handler,
+                )
+                yield from profiler.get_workunits(self.db_tables)
 
     def process_schemas(self, connection, database):
         for schema in self.data_dictionary.get_schemas(
@@ -633,8 +633,8 @@ def process_schema(
             else:
                 logger.info("View processing disabled, skipping")
 
-            self.report.metadata_extraction_sec[report_key] = round(
-                timer.elapsed_seconds(), 2
+            self.report.metadata_extraction_sec[report_key] = timer.elapsed_seconds(
+                digits=2
             )
 
     def _process_table(
@@ -986,9 +986,7 @@ def extract_usage(
 
             yield from usage_extractor.get_usage_workunits(all_tables=all_tables)
 
-            self.report.usage_extraction_sec[database] = round(
-                timer.elapsed_seconds(), 2
-            )
+            self.report.usage_extraction_sec[database] = timer.elapsed_seconds(digits=2)
 
     def extract_lineage(
         self,
@@ -1011,8 +1009,8 @@ def extract_lineage(
                 database=database, connection=connection, all_tables=all_tables
             )
 
-            self.report.lineage_extraction_sec[f"{database}"] = round(
-                timer.elapsed_seconds(), 2
+            self.report.lineage_extraction_sec[f"{database}"] = timer.elapsed_seconds(
+                digits=2
             )
             yield from self.generate_lineage(
                 database, lineage_extractor=lineage_extractor
@@ -1042,8 +1040,8 @@ def extract_lineage_v2(
 
             yield from lineage_extractor.generate()
 
-            self.report.lineage_extraction_sec[f"{database}"] = round(
-                timer.elapsed_seconds(), 2
+            self.report.lineage_extraction_sec[f"{database}"] = timer.elapsed_seconds(
+                digits=2
             )
 
         if self.redundant_lineage_run_skip_handler:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/redshift/usage.py b/metadata-ingestion/src/datahub/ingestion/source/redshift/usage.py
index e0bf8b23dd0f7d..d66a1ee18be40f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/redshift/usage.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/redshift/usage.py
@@ -182,38 +182,38 @@ def _get_workunits_internal(
         self.report.num_operational_stats_filtered = 0
 
         if self.config.include_operational_stats:
-            self.report.report_ingestion_stage_start(USAGE_EXTRACTION_OPERATIONAL_STATS)
-            with PerfTimer() as timer:
-                # Generate operation aspect workunits
-                yield from self._gen_operation_aspect_workunits(
-                    self.connection, all_tables
-                )
-                self.report.operational_metadata_extraction_sec[
-                    self.config.database
-                ] = round(timer.elapsed_seconds(), 2)
+            with self.report.new_stage(USAGE_EXTRACTION_OPERATIONAL_STATS):
+                with PerfTimer() as timer:
+                    # Generate operation aspect workunits
+                    yield from self._gen_operation_aspect_workunits(
+                        self.connection, all_tables
+                    )
+                    self.report.operational_metadata_extraction_sec[
+                        self.config.database
+                    ] = timer.elapsed_seconds(digits=2)
 
         # Generate aggregate events
-        self.report.report_ingestion_stage_start(USAGE_EXTRACTION_USAGE_AGGREGATION)
-        query: str = self.queries.usage_query(
-            start_time=self.start_time.strftime(REDSHIFT_DATETIME_FORMAT),
-            end_time=self.end_time.strftime(REDSHIFT_DATETIME_FORMAT),
-            database=self.config.database,
-        )
-        access_events_iterable: Iterable[
-            RedshiftAccessEvent
-        ] = self._gen_access_events_from_history_query(
-            query, connection=self.connection, all_tables=all_tables
-        )
+        with self.report.new_stage(USAGE_EXTRACTION_USAGE_AGGREGATION):
+            query: str = self.queries.usage_query(
+                start_time=self.start_time.strftime(REDSHIFT_DATETIME_FORMAT),
+                end_time=self.end_time.strftime(REDSHIFT_DATETIME_FORMAT),
+                database=self.config.database,
+            )
+            access_events_iterable: Iterable[
+                RedshiftAccessEvent
+            ] = self._gen_access_events_from_history_query(
+                query, connection=self.connection, all_tables=all_tables
+            )
 
-        aggregated_events: AggregatedAccessEvents = self._aggregate_access_events(
-            access_events_iterable
-        )
-        # Generate usage workunits from aggregated events.
-        for time_bucket in aggregated_events.values():
-            for aggregate in time_bucket.values():
-                wu: MetadataWorkUnit = self._make_usage_stat(aggregate)
-                self.report.num_usage_workunits_emitted += 1
-                yield wu
+            aggregated_events: AggregatedAccessEvents = self._aggregate_access_events(
+                access_events_iterable
+            )
+            # Generate usage workunits from aggregated events.
+            for time_bucket in aggregated_events.values():
+                for aggregate in time_bucket.values():
+                    wu: MetadataWorkUnit = self._make_usage_stat(aggregate)
+                    self.report.num_usage_workunits_emitted += 1
+                    yield wu
 
     def _gen_operation_aspect_workunits(
         self,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_report.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_report.py
index 030b2d43be81f9..b24471f8666afa 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_report.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_report.py
@@ -166,6 +166,3 @@ def _is_tag_scanned(self, tag_name: str) -> bool:
 
     def report_tag_processed(self, tag_name: str) -> None:
         self._processed_tags.add(tag_name)
-
-    def set_ingestion_stage(self, database: str, stage: str) -> None:
-        self.report_ingestion_stage_start(f"{database}: {stage}")
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
index 8a1bf15b7a7bc4..6f09c26b08da2d 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
@@ -216,21 +216,23 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
 
         try:
             for snowflake_db in self.databases:
-                self.report.set_ingestion_stage(snowflake_db.name, METADATA_EXTRACTION)
-                yield from self._process_database(snowflake_db)
+                with self.report.new_stage(
+                    f"{snowflake_db.name}: {METADATA_EXTRACTION}"
+                ):
+                    yield from self._process_database(snowflake_db)
 
-            self.report.set_ingestion_stage("*", EXTERNAL_TABLE_DDL_LINEAGE)
-            discovered_tables: List[str] = [
-                self.identifiers.get_dataset_identifier(
-                    table_name, schema.name, db.name
-                )
-                for db in self.databases
-                for schema in db.schemas
-                for table_name in schema.tables
-            ]
-            if self.aggregator:
-                for entry in self._external_tables_ddl_lineage(discovered_tables):
-                    self.aggregator.add(entry)
+            with self.report.new_stage(f"*: {EXTERNAL_TABLE_DDL_LINEAGE}"):
+                discovered_tables: List[str] = [
+                    self.identifiers.get_dataset_identifier(
+                        table_name, schema.name, db.name
+                    )
+                    for db in self.databases
+                    for schema in db.schemas
+                    for table_name in schema.tables
+                ]
+                if self.aggregator:
+                    for entry in self._external_tables_ddl_lineage(discovered_tables):
+                        self.aggregator.add(entry)
 
         except SnowflakePermissionError as e:
             self.structured_reporter.failure(
@@ -332,8 +334,8 @@ def _process_database(
         yield from self._process_db_schemas(snowflake_db, db_tables)
 
         if self.profiler and db_tables:
-            self.report.set_ingestion_stage(snowflake_db.name, PROFILING)
-            yield from self.profiler.get_workunits(snowflake_db, db_tables)
+            with self.report.new_stage(f"{snowflake_db.name}: {PROFILING}"):
+                yield from self.profiler.get_workunits(snowflake_db, db_tables)
 
     def _process_db_schemas(
         self,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_usage_v2.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_usage_v2.py
index 4bdf559f293b51..85e4071aec07df 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_usage_v2.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_usage_v2.py
@@ -146,59 +146,58 @@ def get_usage_workunits(
         if not self._should_ingest_usage():
             return
 
-        self.report.set_ingestion_stage("*", USAGE_EXTRACTION_USAGE_AGGREGATION)
-        if self.report.edition == SnowflakeEdition.STANDARD.value:
-            logger.info(
-                "Snowflake Account is Standard Edition. Usage and Operation History Feature is not supported."
-            )
-            return
+        with self.report.new_stage(f"*: {USAGE_EXTRACTION_USAGE_AGGREGATION}"):
+            if self.report.edition == SnowflakeEdition.STANDARD.value:
+                logger.info(
+                    "Snowflake Account is Standard Edition. Usage and Operation History Feature is not supported."
+                )
+                return
 
-        logger.info("Checking usage date ranges")
+            logger.info("Checking usage date ranges")
 
-        self._check_usage_date_ranges()
+            self._check_usage_date_ranges()
 
-        # If permission error, execution returns from here
-        if (
-            self.report.min_access_history_time is None
-            or self.report.max_access_history_time is None
-        ):
-            return
+            # If permission error, execution returns from here
+            if (
+                self.report.min_access_history_time is None
+                or self.report.max_access_history_time is None
+            ):
+                return
 
-        # NOTE: In earlier `snowflake-usage` connector, users with no email were not considered in usage counts as well as in operation
-        # Now, we report the usage as well as operation metadata even if user email is absent
+            # NOTE: In earlier `snowflake-usage` connector, users with no email were not considered in usage counts as well as in operation
+            # Now, we report the usage as well as operation metadata even if user email is absent
 
-        if self.config.include_usage_stats:
-            yield from auto_empty_dataset_usage_statistics(
-                self._get_workunits_internal(discovered_datasets),
-                config=BaseTimeWindowConfig(
-                    start_time=self.start_time,
-                    end_time=self.end_time,
-                    bucket_duration=self.config.bucket_duration,
-                ),
-                dataset_urns={
-                    self.identifiers.gen_dataset_urn(dataset_identifier)
-                    for dataset_identifier in discovered_datasets
-                },
-            )
+            if self.config.include_usage_stats:
+                yield from auto_empty_dataset_usage_statistics(
+                    self._get_workunits_internal(discovered_datasets),
+                    config=BaseTimeWindowConfig(
+                        start_time=self.start_time,
+                        end_time=self.end_time,
+                        bucket_duration=self.config.bucket_duration,
+                    ),
+                    dataset_urns={
+                        self.identifiers.gen_dataset_urn(dataset_identifier)
+                        for dataset_identifier in discovered_datasets
+                    },
+                )
 
-        self.report.set_ingestion_stage("*", USAGE_EXTRACTION_OPERATIONAL_STATS)
+        with self.report.new_stage(f"*: {USAGE_EXTRACTION_OPERATIONAL_STATS}"):
+            if self.config.include_operational_stats:
+                # Generate the operation workunits.
+                access_events = self._get_snowflake_history()
+                for event in access_events:
+                    yield from self._get_operation_aspect_work_unit(
+                        event, discovered_datasets
+                    )
 
-        if self.config.include_operational_stats:
-            # Generate the operation workunits.
-            access_events = self._get_snowflake_history()
-            for event in access_events:
-                yield from self._get_operation_aspect_work_unit(
-                    event, discovered_datasets
+            if self.redundant_run_skip_handler:
+                # Update the checkpoint state for this run.
+                self.redundant_run_skip_handler.update_state(
+                    self.config.start_time,
+                    self.config.end_time,
+                    self.config.bucket_duration,
                 )
 
-        if self.redundant_run_skip_handler:
-            # Update the checkpoint state for this run.
-            self.redundant_run_skip_handler.update_state(
-                self.config.start_time,
-                self.config.end_time,
-                self.config.bucket_duration,
-            )
-
     def _get_workunits_internal(
         self, discovered_datasets: List[str]
     ) -> Iterable[MetadataWorkUnit]:
@@ -386,7 +385,7 @@ def _get_snowflake_history(self) -> Iterable[SnowflakeJoinedAccessEvent]:
                 )
                 self.report_status(USAGE_EXTRACTION_OPERATIONAL_STATS, False)
                 return
-            self.report.access_history_query_secs = round(timer.elapsed_seconds(), 2)
+            self.report.access_history_query_secs = timer.elapsed_seconds(digits=2)
 
         for row in results:
             yield from self._process_snowflake_history_row(row)
@@ -434,8 +433,8 @@ def _check_usage_date_ranges(self) -> None:
                     self.report.max_access_history_time = db_row["MAX_TIME"].astimezone(
                         tz=timezone.utc
                     )
-                    self.report.access_history_range_query_secs = round(
-                        timer.elapsed_seconds(), 2
+                    self.report.access_history_range_query_secs = timer.elapsed_seconds(
+                        digits=2
                     )
 
     def _get_operation_aspect_work_unit(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
index aede3d056709a2..c0385a8d5af30a 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
@@ -480,8 +480,8 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
             identifiers=self.identifiers,
         )
 
-        self.report.set_ingestion_stage("*", METADATA_EXTRACTION)
-        yield from schema_extractor.get_workunits_internal()
+        with self.report.new_stage(f"*: {METADATA_EXTRACTION}"):
+            yield from schema_extractor.get_workunits_internal()
 
         databases = schema_extractor.databases
 
@@ -513,47 +513,46 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
         discovered_datasets = discovered_tables + discovered_views
 
         if self.config.use_queries_v2:
-            self.report.set_ingestion_stage("*", VIEW_PARSING)
-            yield from auto_workunit(self.aggregator.gen_metadata())
-
-            self.report.set_ingestion_stage("*", QUERIES_EXTRACTION)
-
-            schema_resolver = self.aggregator._schema_resolver
-
-            queries_extractor = SnowflakeQueriesExtractor(
-                connection=self.connection,
-                config=SnowflakeQueriesExtractorConfig(
-                    window=self.config,
-                    temporary_tables_pattern=self.config.temporary_tables_pattern,
-                    include_lineage=self.config.include_table_lineage,
-                    include_usage_statistics=self.config.include_usage_stats,
-                    include_operations=self.config.include_operational_stats,
-                    include_queries=self.config.include_queries,
-                    include_query_usage_statistics=self.config.include_query_usage_statistics,
-                    user_email_pattern=self.config.user_email_pattern,
-                ),
-                structured_report=self.report,
-                filters=self.filters,
-                identifiers=self.identifiers,
-                schema_resolver=schema_resolver,
-                discovered_tables=discovered_datasets,
-                graph=self.ctx.graph,
-            )
+            with self.report.new_stage(f"*: {VIEW_PARSING}"):
+                yield from auto_workunit(self.aggregator.gen_metadata())
 
-            # TODO: This is slightly suboptimal because we create two SqlParsingAggregator instances with different configs
-            # but a shared schema resolver. That's fine for now though - once we remove the old lineage/usage extractors,
-            # it should be pretty straightforward to refactor this and only initialize the aggregator once.
-            self.report.queries_extractor = queries_extractor.report
-            yield from queries_extractor.get_workunits_internal()
-            queries_extractor.close()
+            with self.report.new_stage(f"*: {QUERIES_EXTRACTION}"):
+                schema_resolver = self.aggregator._schema_resolver
+
+                queries_extractor = SnowflakeQueriesExtractor(
+                    connection=self.connection,
+                    config=SnowflakeQueriesExtractorConfig(
+                        window=self.config,
+                        temporary_tables_pattern=self.config.temporary_tables_pattern,
+                        include_lineage=self.config.include_table_lineage,
+                        include_usage_statistics=self.config.include_usage_stats,
+                        include_operations=self.config.include_operational_stats,
+                        include_queries=self.config.include_queries,
+                        include_query_usage_statistics=self.config.include_query_usage_statistics,
+                        user_email_pattern=self.config.user_email_pattern,
+                    ),
+                    structured_report=self.report,
+                    filters=self.filters,
+                    identifiers=self.identifiers,
+                    schema_resolver=schema_resolver,
+                    discovered_tables=discovered_datasets,
+                    graph=self.ctx.graph,
+                )
+
+                # TODO: This is slightly suboptimal because we create two SqlParsingAggregator instances with different configs
+                # but a shared schema resolver. That's fine for now though - once we remove the old lineage/usage extractors,
+                # it should be pretty straightforward to refactor this and only initialize the aggregator once.
+                self.report.queries_extractor = queries_extractor.report
+                yield from queries_extractor.get_workunits_internal()
+                queries_extractor.close()
 
         else:
             if self.lineage_extractor:
-                self.report.set_ingestion_stage("*", LINEAGE_EXTRACTION)
-                self.lineage_extractor.add_time_based_lineage_to_aggregator(
-                    discovered_tables=discovered_tables,
-                    discovered_views=discovered_views,
-                )
+                with self.report.new_stage(f"*: {LINEAGE_EXTRACTION}"):
+                    self.lineage_extractor.add_time_based_lineage_to_aggregator(
+                        discovered_tables=discovered_tables,
+                        discovered_views=discovered_views,
+                    )
 
             # This would emit view and external table ddl lineage
             # as well as query lineage via lineage_extractor
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/teradata.py b/metadata-ingestion/src/datahub/ingestion/source/sql/teradata.py
index e42564975c3d19..5b76fe41d92e97 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/teradata.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/teradata.py
@@ -878,7 +878,7 @@ def get_workunits_internal(self) -> Iterable[Union[MetadataWorkUnit, SqlWorkUnit
 
         urns = self.schema_resolver.get_urns()
         if self.config.include_table_lineage or self.config.include_usage_statistics:
-            self.report.report_ingestion_stage_start("audit log extraction")
-            yield from self.get_audit_log_mcps(urns=urns)
+            with self.report.new_stage("Audit log extraction"):
+                yield from self.get_audit_log_mcps(urns=urns)
 
         yield from self.builder.gen_workunits()
diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
index d149402741e82f..2543cbe653ba72 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
@@ -118,6 +118,7 @@
 )
 from datahub.ingestion.source.tableau.tableau_server_wrapper import UserInfo
 from datahub.ingestion.source.tableau.tableau_validation import check_user_role
+from datahub.ingestion.source_report.ingestion_stage import IngestionStageReport
 from datahub.metadata.com.linkedin.pegasus2avro.common import (
     AuditStamp,
     ChangeAuditStamps,
@@ -170,6 +171,8 @@
     create_lineage_sql_parsed_result,
 )
 from datahub.utilities import config_clean
+from datahub.utilities.perf_timer import PerfTimer
+from datahub.utilities.stats_collections import TopKDict
 from datahub.utilities.urns.dataset_urn import DatasetUrn
 
 try:
@@ -643,12 +646,41 @@ class SiteIdContentUrl:
 
 
 @dataclass
-class TableauSourceReport(StaleEntityRemovalSourceReport):
+class TableauSourceReport(
+    StaleEntityRemovalSourceReport,
+    IngestionStageReport,
+):
     get_all_datasources_query_failed: bool = False
     num_get_datasource_query_failures: int = 0
     num_datasource_field_skipped_no_name: int = 0
     num_csql_field_skipped_no_name: int = 0
     num_table_field_skipped_no_name: int = 0
+    # timers
+    extract_usage_stats_timer: Dict[str, float] = dataclass_field(
+        default_factory=TopKDict
+    )
+    fetch_groups_timer: Dict[str, float] = dataclass_field(default_factory=TopKDict)
+    populate_database_server_hostname_map_timer: Dict[str, float] = dataclass_field(
+        default_factory=TopKDict
+    )
+    populate_projects_registry_timer: Dict[str, float] = dataclass_field(
+        default_factory=TopKDict
+    )
+    emit_workbooks_timer: Dict[str, float] = dataclass_field(default_factory=TopKDict)
+    emit_sheets_timer: Dict[str, float] = dataclass_field(default_factory=TopKDict)
+    emit_dashboards_timer: Dict[str, float] = dataclass_field(default_factory=TopKDict)
+    emit_embedded_datasources_timer: Dict[str, float] = dataclass_field(
+        default_factory=TopKDict
+    )
+    emit_published_datasources_timer: Dict[str, float] = dataclass_field(
+        default_factory=TopKDict
+    )
+    emit_custom_sql_datasources_timer: Dict[str, float] = dataclass_field(
+        default_factory=TopKDict
+    )
+    emit_upstream_tables_timer: Dict[str, float] = dataclass_field(
+        default_factory=TopKDict
+    )
     # lineage
     num_tables_with_upstream_lineage: int = 0
     num_upstream_table_lineage: int = 0
@@ -660,6 +692,7 @@ class TableauSourceReport(StaleEntityRemovalSourceReport):
     num_upstream_fine_grained_lineage_failed_parse_sql: int = 0
     num_hidden_assets_skipped: int = 0
     logged_in_user: List[UserInfo] = dataclass_field(default_factory=list)
+
     last_authenticated_at: Optional[datetime] = None
 
     num_expected_tableau_metadata_queries: int = 0
@@ -834,6 +867,7 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                     platform=self.platform,
                 )
                 yield from site_source.ingest_tableau_site()
+
         except MetadataQueryException as md_exception:
             self.report.failure(
                 title="Failed to Retrieve Tableau Metadata",
@@ -3489,33 +3523,87 @@ def _create_workbook_properties(
         return {"permissions": json.dumps(groups)} if len(groups) > 0 else None
 
     def ingest_tableau_site(self):
-        # Initialise the dictionary to later look-up for chart and dashboard stat
-        if self.config.extract_usage_stats:
-            self._populate_usage_stat_registry()
-
-        if self.config.permission_ingestion:
-            self._fetch_groups()
-
-        # Populate the map of database names and database hostnames to be used later to map
-        # databases to platform instances.
-        if self.config.database_hostname_to_platform_instance_map:
-            self._populate_database_server_hostname_map()
-
-        self._populate_projects_registry()
-
-        if self.config.add_site_container:
-            yield from self.emit_site_container()
-        yield from self.emit_project_containers()
-        yield from self.emit_workbooks()
-        if self.sheet_ids:
-            yield from self.emit_sheets()
-        if self.dashboard_ids:
-            yield from self.emit_dashboards()
-        if self.embedded_datasource_ids_being_used:
-            yield from self.emit_embedded_datasources()
-        if self.datasource_ids_being_used:
-            yield from self.emit_published_datasources()
-        if self.custom_sql_ids_being_used:
-            yield from self.emit_custom_sql_datasources()
-        if self.database_tables:
-            yield from self.emit_upstream_tables()
+        with self.report.new_stage(
+            f"Ingesting Tableau Site: {self.site_id} {self.site_content_url}"
+        ):
+            # Initialise the dictionary to later look-up for chart and dashboard stat
+            if self.config.extract_usage_stats:
+                with PerfTimer() as timer:
+                    self._populate_usage_stat_registry()
+                    self.report.extract_usage_stats_timer[
+                        self.site_content_url
+                    ] = timer.elapsed_seconds(digits=2)
+
+            if self.config.permission_ingestion:
+                with PerfTimer() as timer:
+                    self._fetch_groups()
+                    self.report.fetch_groups_timer[
+                        self.site_content_url
+                    ] = timer.elapsed_seconds(digits=2)
+
+            # Populate the map of database names and database hostnames to be used later to map
+            # databases to platform instances.
+            if self.config.database_hostname_to_platform_instance_map:
+                with PerfTimer() as timer:
+                    self._populate_database_server_hostname_map()
+                    self.report.populate_database_server_hostname_map_timer[
+                        self.site_content_url
+                    ] = timer.elapsed_seconds(digits=2)
+
+            with PerfTimer() as timer:
+                self._populate_projects_registry()
+                self.report.populate_projects_registry_timer[
+                    self.site_content_url
+                ] = timer.elapsed_seconds(digits=2)
+
+            if self.config.add_site_container:
+                yield from self.emit_site_container()
+            yield from self.emit_project_containers()
+
+            with PerfTimer() as timer:
+                yield from self.emit_workbooks()
+                self.report.emit_workbooks_timer[
+                    self.site_content_url
+                ] = timer.elapsed_seconds(digits=2)
+
+            if self.sheet_ids:
+                with PerfTimer() as timer:
+                    yield from self.emit_sheets()
+                    self.report.emit_sheets_timer[
+                        self.site_content_url
+                    ] = timer.elapsed_seconds(digits=2)
+
+            if self.dashboard_ids:
+                with PerfTimer() as timer:
+                    yield from self.emit_dashboards()
+                    self.report.emit_dashboards_timer[
+                        self.site_content_url
+                    ] = timer.elapsed_seconds(digits=2)
+
+            if self.embedded_datasource_ids_being_used:
+                with PerfTimer() as timer:
+                    yield from self.emit_embedded_datasources()
+                    self.report.emit_embedded_datasources_timer[
+                        self.site_content_url
+                    ] = timer.elapsed_seconds(digits=2)
+
+            if self.datasource_ids_being_used:
+                with PerfTimer() as timer:
+                    yield from self.emit_published_datasources()
+                    self.report.emit_published_datasources_timer[
+                        self.site_content_url
+                    ] = timer.elapsed_seconds(digits=2)
+
+            if self.custom_sql_ids_being_used:
+                with PerfTimer() as timer:
+                    yield from self.emit_custom_sql_datasources()
+                    self.report.emit_custom_sql_datasources_timer[
+                        self.site_content_url
+                    ] = timer.elapsed_seconds(digits=2)
+
+            if self.database_tables:
+                with PerfTimer() as timer:
+                    yield from self.emit_upstream_tables()
+                    self.report.emit_upstream_tables_timer[
+                        self.site_content_url
+                    ] = timer.elapsed_seconds(digits=2)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/unity/source.py b/metadata-ingestion/src/datahub/ingestion/source/unity/source.py
index 9d9a746580f939..43bd788f809c3e 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/unity/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/unity/source.py
@@ -263,86 +263,86 @@ def get_workunit_processors(self) -> List[Optional[MetadataWorkUnitProcessor]]:
         ]
 
     def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
-        self.report.report_ingestion_stage_start("Ingestion Setup")
-        wait_on_warehouse = None
-        if self.config.include_hive_metastore:
-            self.report.report_ingestion_stage_start("Start warehouse")
-            # Can take several minutes, so start now and wait later
-            wait_on_warehouse = self.unity_catalog_api_proxy.start_warehouse()
-            if wait_on_warehouse is None:
-                self.report.report_failure(
-                    "initialization",
-                    f"SQL warehouse {self.config.profiling.warehouse_id} not found",
-                )
-                return
-            else:
-                # wait until warehouse is started
-                wait_on_warehouse.result()
+        with self.report.new_stage("Ingestion Setup"):
+            wait_on_warehouse = None
+            if self.config.include_hive_metastore:
+                with self.report.new_stage("Start warehouse"):
+                    # Can take several minutes, so start now and wait later
+                    wait_on_warehouse = self.unity_catalog_api_proxy.start_warehouse()
+                    if wait_on_warehouse is None:
+                        self.report.report_failure(
+                            "initialization",
+                            f"SQL warehouse {self.config.profiling.warehouse_id} not found",
+                        )
+                        return
+                    else:
+                        # wait until warehouse is started
+                        wait_on_warehouse.result()
 
         if self.config.include_ownership:
-            self.report.report_ingestion_stage_start("Ingest service principals")
-            self.build_service_principal_map()
-            self.build_groups_map()
+            with self.report.new_stage("Ingest service principals"):
+                self.build_service_principal_map()
+                self.build_groups_map()
         if self.config.include_notebooks:
-            self.report.report_ingestion_stage_start("Ingest notebooks")
-            yield from self.process_notebooks()
+            with self.report.new_stage("Ingest notebooks"):
+                yield from self.process_notebooks()
 
         yield from self.process_metastores()
 
         yield from self.get_view_lineage()
 
         if self.config.include_notebooks:
-            self.report.report_ingestion_stage_start("Notebook lineage")
-            for notebook in self.notebooks.values():
-                wu = self._gen_notebook_lineage(notebook)
-                if wu:
-                    yield wu
+            with self.report.new_stage("Notebook lineage"):
+                for notebook in self.notebooks.values():
+                    wu = self._gen_notebook_lineage(notebook)
+                    if wu:
+                        yield wu
 
         if self.config.include_usage_statistics:
-            self.report.report_ingestion_stage_start("Ingest usage")
-            usage_extractor = UnityCatalogUsageExtractor(
-                config=self.config,
-                report=self.report,
-                proxy=self.unity_catalog_api_proxy,
-                table_urn_builder=self.gen_dataset_urn,
-                user_urn_builder=self.gen_user_urn,
-            )
-            yield from usage_extractor.get_usage_workunits(
-                self.table_refs | self.view_refs
-            )
-
-        if self.config.is_profiling_enabled():
-            self.report.report_ingestion_stage_start("Start warehouse")
-            # Need to start the warehouse again for profiling,
-            # as it may have been stopped after ingestion might take
-            # longer time to complete
-            wait_on_warehouse = self.unity_catalog_api_proxy.start_warehouse()
-            if wait_on_warehouse is None:
-                self.report.report_failure(
-                    "initialization",
-                    f"SQL warehouse {self.config.profiling.warehouse_id} not found",
+            with self.report.new_stage("Ingest usage"):
+                usage_extractor = UnityCatalogUsageExtractor(
+                    config=self.config,
+                    report=self.report,
+                    proxy=self.unity_catalog_api_proxy,
+                    table_urn_builder=self.gen_dataset_urn,
+                    user_urn_builder=self.gen_user_urn,
+                )
+                yield from usage_extractor.get_usage_workunits(
+                    self.table_refs | self.view_refs
                 )
-                return
-            else:
-                # wait until warehouse is started
-                wait_on_warehouse.result()
 
-            self.report.report_ingestion_stage_start("Profiling")
-            if isinstance(self.config.profiling, UnityCatalogAnalyzeProfilerConfig):
-                yield from UnityCatalogAnalyzeProfiler(
-                    self.config.profiling,
-                    self.report,
-                    self.unity_catalog_api_proxy,
-                    self.gen_dataset_urn,
-                ).get_workunits(self.table_refs)
-            elif isinstance(self.config.profiling, UnityCatalogGEProfilerConfig):
-                yield from UnityCatalogGEProfiler(
-                    sql_common_config=self.config,
-                    profiling_config=self.config.profiling,
-                    report=self.report,
-                ).get_workunits(list(self.tables.values()))
-            else:
-                raise ValueError("Unknown profiling config method")
+        if self.config.is_profiling_enabled():
+            with self.report.new_stage("Start warehouse"):
+                # Need to start the warehouse again for profiling,
+                # as it may have been stopped after ingestion might take
+                # longer time to complete
+                wait_on_warehouse = self.unity_catalog_api_proxy.start_warehouse()
+                if wait_on_warehouse is None:
+                    self.report.report_failure(
+                        "initialization",
+                        f"SQL warehouse {self.config.profiling.warehouse_id} not found",
+                    )
+                    return
+                else:
+                    # wait until warehouse is started
+                    wait_on_warehouse.result()
+
+            with self.report.new_stage("Profiling"):
+                if isinstance(self.config.profiling, UnityCatalogAnalyzeProfilerConfig):
+                    yield from UnityCatalogAnalyzeProfiler(
+                        self.config.profiling,
+                        self.report,
+                        self.unity_catalog_api_proxy,
+                        self.gen_dataset_urn,
+                    ).get_workunits(self.table_refs)
+                elif isinstance(self.config.profiling, UnityCatalogGEProfilerConfig):
+                    yield from UnityCatalogGEProfiler(
+                        sql_common_config=self.config,
+                        profiling_config=self.config.profiling,
+                        report=self.report,
+                    ).get_workunits(list(self.tables.values()))
+                else:
+                    raise ValueError("Unknown profiling config method")
 
     def build_service_principal_map(self) -> None:
         try:
@@ -462,11 +462,11 @@ def process_schemas(self, catalog: Catalog) -> Iterable[MetadataWorkUnit]:
                 self.report.schemas.dropped(schema.id)
                 continue
 
-            self.report.report_ingestion_stage_start(f"Ingest schema {schema.id}")
-            yield from self.gen_schema_containers(schema)
-            yield from self.process_tables(schema)
+            with self.report.new_stage(f"Ingest schema {schema.id}"):
+                yield from self.gen_schema_containers(schema)
+                yield from self.process_tables(schema)
 
-            self.report.schemas.processed(schema.id)
+                self.report.schemas.processed(schema.id)
 
     def process_tables(self, schema: Schema) -> Iterable[MetadataWorkUnit]:
         for table in self.unity_catalog_api_proxy.tables(schema=schema):
diff --git a/metadata-ingestion/src/datahub/ingestion/source_report/ingestion_stage.py b/metadata-ingestion/src/datahub/ingestion/source_report/ingestion_stage.py
index ce683e64b3f468..130a36e254fefd 100644
--- a/metadata-ingestion/src/datahub/ingestion/source_report/ingestion_stage.py
+++ b/metadata-ingestion/src/datahub/ingestion/source_report/ingestion_stage.py
@@ -1,7 +1,7 @@
 import logging
+from contextlib import AbstractContextManager
 from dataclasses import dataclass, field
 from datetime import datetime, timezone
-from typing import Optional
 
 from datahub.utilities.perf_timer import PerfTimer
 from datahub.utilities.stats_collections import TopKDict
@@ -22,25 +22,29 @@
 
 @dataclass
 class IngestionStageReport:
-    ingestion_stage: Optional[str] = None
     ingestion_stage_durations: TopKDict[str, float] = field(default_factory=TopKDict)
 
-    _timer: Optional[PerfTimer] = field(
-        default=None, init=False, repr=False, compare=False
-    )
-
-    def report_ingestion_stage_start(self, stage: str) -> None:
-        if self._timer:
-            elapsed = round(self._timer.elapsed_seconds(), 2)
-            logger.info(
-                f"Time spent in stage <{self.ingestion_stage}>: {elapsed} seconds",
-                stacklevel=2,
-            )
-            if self.ingestion_stage:
-                self.ingestion_stage_durations[self.ingestion_stage] = elapsed
-        else:
-            self._timer = PerfTimer()
-
-        self.ingestion_stage = f"{stage} at {datetime.now(timezone.utc)}"
-        logger.info(f"Stage started: {self.ingestion_stage}")
+    def new_stage(self, stage: str) -> "IngestionStageContext":
+        return IngestionStageContext(stage, self)
+
+
+@dataclass
+class IngestionStageContext(AbstractContextManager):
+    def __init__(self, stage: str, report: IngestionStageReport):
+        self._ingestion_stage = f"{stage} at {datetime.now(timezone.utc)}"
+        self._timer: PerfTimer = PerfTimer()
+        self._report = report
+
+    def __enter__(self) -> "IngestionStageContext":
+        logger.info(f"Stage started: {self._ingestion_stage}")
         self._timer.start()
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        elapsed = self._timer.elapsed_seconds(digits=2)
+        logger.info(
+            f"Time spent in stage <{self._ingestion_stage}>: {elapsed} seconds",
+            stacklevel=2,
+        )
+        self._report.ingestion_stage_durations[self._ingestion_stage] = elapsed
+        return None
diff --git a/metadata-ingestion/src/datahub/utilities/perf_timer.py b/metadata-ingestion/src/datahub/utilities/perf_timer.py
index 9488683d6d8cac..fc1b1ed58244c3 100644
--- a/metadata-ingestion/src/datahub/utilities/perf_timer.py
+++ b/metadata-ingestion/src/datahub/utilities/perf_timer.py
@@ -57,7 +57,7 @@ def __exit__(
             self.finish()
         return None
 
-    def elapsed_seconds(self) -> float:
+    def elapsed_seconds(self, digits: int = 4) -> float:
         """
         Returns the elapsed time in seconds.
         """
@@ -65,11 +65,18 @@ def elapsed_seconds(self) -> float:
             return self._past_active_time
 
         if self.end_time is None:
-            return (time.perf_counter() - self.start_time) + (self._past_active_time)
+            elapsed = (time.perf_counter() - self.start_time) + (self._past_active_time)
         else:
-            return (self.end_time - self.start_time) + self._past_active_time
+            elapsed = (self.end_time - self.start_time) + self._past_active_time
+
+        return round(elapsed, digits)
 
     def assert_timer_is_running(self) -> None:
+        if not self.is_running():
+            self._error_state = True
+            logger.warning("Did you forget to start the timer ?")
+
+    def is_running(self) -> bool:
         """
         Returns true if timer is in running state.
         Timer is in NOT in running state if
@@ -77,9 +84,7 @@ def assert_timer_is_running(self) -> None:
         2. it is in paused state.
         3. it had been started and finished in the past but not started again.
         """
-        if self.start_time is None or self.paused or self.end_time:
-            self._error_state = True
-            logger.warning("Did you forget to start the timer ?")
+        return self.start_time is not None and not self.paused and self.end_time is None
 
     def __repr__(self) -> str:
         return repr(self.as_obj())
diff --git a/metadata-ingestion/tests/performance/bigquery/test_bigquery_usage.py b/metadata-ingestion/tests/performance/bigquery/test_bigquery_usage.py
index 9cb80ff02657bb..24460f38298069 100644
--- a/metadata-ingestion/tests/performance/bigquery/test_bigquery_usage.py
+++ b/metadata-ingestion/tests/performance/bigquery/test_bigquery_usage.py
@@ -26,14 +26,14 @@
 
 def run_test():
     report = BigQueryV2Report()
-    report.set_ingestion_stage("All", "Seed Data Generation")
-    seed_metadata = generate_data(
-        num_containers=2000,
-        num_tables=20000,
-        num_views=2000,
-        time_range=timedelta(days=7),
-    )
-    all_tables = seed_metadata.all_tables
+    with report.new_stage("All: Seed Data Generation"):
+        seed_metadata = generate_data(
+            num_containers=2000,
+            num_tables=20000,
+            num_views=2000,
+            time_range=timedelta(days=7),
+        )
+        all_tables = seed_metadata.all_tables
 
     config = BigQueryV2Config(
         start_time=seed_metadata.start_time,
@@ -51,42 +51,45 @@ def run_test():
         schema_resolver=SchemaResolver(platform="bigquery"),
         identifiers=BigQueryIdentifierBuilder(config, report),
     )
-    report.set_ingestion_stage("All", "Event Generation")
-
-    num_projects = 100
-    projects = [f"project-{i}" for i in range(num_projects)]
-    table_to_project = {table.name: random.choice(projects) for table in all_tables}
-    table_refs = {str(ref_from_table(table, table_to_project)) for table in all_tables}
+    with report.new_stage("All: Event Generation"):
+        num_projects = 100
+        projects = [f"project-{i}" for i in range(num_projects)]
+        table_to_project = {table.name: random.choice(projects) for table in all_tables}
+        table_refs = {
+            str(ref_from_table(table, table_to_project)) for table in all_tables
+        }
 
-    queries = list(
-        generate_queries(
-            seed_metadata,
-            num_selects=240_000,
-            num_operations=800_000,
-            num_unique_queries=50_000,
-            num_users=2000,
-            query_length=NormalDistribution(2000, 500),
+        queries = list(
+            generate_queries(
+                seed_metadata,
+                num_selects=240_000,
+                num_operations=800_000,
+                num_unique_queries=50_000,
+                num_users=2000,
+                query_length=NormalDistribution(2000, 500),
+            )
         )
-    )
-    queries.sort(key=lambda q: q.timestamp)
-    events = list(generate_events(queries, projects, table_to_project, config=config))
-    print(f"Events generated: {len(events)}")
-    pre_mem_usage = psutil.Process(os.getpid()).memory_info().rss
-    print(f"Test data size: {humanfriendly.format_size(pre_mem_usage)}")
+        queries.sort(key=lambda q: q.timestamp)
+        events = list(
+            generate_events(queries, projects, table_to_project, config=config)
+        )
+        print(f"Events generated: {len(events)}")
+        pre_mem_usage = psutil.Process(os.getpid()).memory_info().rss
+        print(f"Test data size: {humanfriendly.format_size(pre_mem_usage)}")
 
-    report.set_ingestion_stage("All", "Event Ingestion")
-    with PerfTimer() as timer:
-        workunits = usage_extractor._get_workunits_internal(events, table_refs)
-        num_workunits, peak_memory_usage = workunit_sink(workunits)
-        report.set_ingestion_stage("All", "Done")
-        print(f"Workunits Generated: {num_workunits}")
-        print(f"Seconds Elapsed: {timer.elapsed_seconds():.2f} seconds")
+        with report.new_stage("All: Event Ingestion"):
+            with PerfTimer() as timer:
+                workunits = usage_extractor._get_workunits_internal(events, table_refs)
+                num_workunits, peak_memory_usage = workunit_sink(workunits)
+                with report.new_stage("All: Done"):
+                    print(f"Workunits Generated: {num_workunits}")
+                    print(f"Seconds Elapsed: {timer.elapsed_seconds(digits=2)} seconds")
 
-    print(
-        f"Peak Memory Used: {humanfriendly.format_size(peak_memory_usage - pre_mem_usage)}"
-    )
-    print(f"Disk Used: {report.processing_perf.usage_state_size}")
-    print(f"Hash collisions: {report.num_usage_query_hash_collisions}")
+            print(
+                f"Peak Memory Used: {humanfriendly.format_size(peak_memory_usage - pre_mem_usage)}"
+            )
+            print(f"Disk Used: {report.processing_perf.usage_state_size}")
+            print(f"Hash collisions: {report.num_usage_query_hash_collisions}")
 
 
 if __name__ == "__main__":
diff --git a/metadata-ingestion/tests/performance/databricks/test_unity.py b/metadata-ingestion/tests/performance/databricks/test_unity.py
index ddd19804ba1841..71192dc5b509bc 100644
--- a/metadata-ingestion/tests/performance/databricks/test_unity.py
+++ b/metadata-ingestion/tests/performance/databricks/test_unity.py
@@ -59,7 +59,7 @@ def run_test():
         workunits = source.get_workunits()
         num_workunits, peak_memory_usage = workunit_sink(workunits)
         print(f"Workunits Generated: {num_workunits}")
-        print(f"Seconds Elapsed: {timer.elapsed_seconds():.2f} seconds")
+        print(f"Seconds Elapsed: {timer.elapsed_seconds(digits=2)} seconds")
 
     print(
         f"Peak Memory Used: {humanfriendly.format_size(peak_memory_usage - pre_mem_usage)}"
diff --git a/metadata-ingestion/tests/performance/snowflake/test_snowflake.py b/metadata-ingestion/tests/performance/snowflake/test_snowflake.py
index 984d9e42957452..a940cce46a8f74 100644
--- a/metadata-ingestion/tests/performance/snowflake/test_snowflake.py
+++ b/metadata-ingestion/tests/performance/snowflake/test_snowflake.py
@@ -53,7 +53,7 @@ def run_test():
             workunits = source.get_workunits()
             num_workunits, peak_memory_usage = workunit_sink(workunits)
             logging.info(f"Workunits Generated: {num_workunits}")
-            logging.info(f"Seconds Elapsed: {timer.elapsed_seconds():.2f} seconds")
+            logging.info(f"Seconds Elapsed: {timer.elapsed_seconds(digits=2)} seconds")
             logging.info(source.get_report().as_string())
 
         logging.info(
diff --git a/metadata-ingestion/tests/performance/sql/test_sql_formatter.py b/metadata-ingestion/tests/performance/sql/test_sql_formatter.py
index 5f783efc559bc9..f09047c0ec4a4f 100644
--- a/metadata-ingestion/tests/performance/sql/test_sql_formatter.py
+++ b/metadata-ingestion/tests/performance/sql/test_sql_formatter.py
@@ -12,12 +12,14 @@ def run_test() -> None:
         for i in range(N):
             if i % 50 == 0:
                 print(
-                    f"Running iteration {i}, elapsed time: {timer.elapsed_seconds():.2f} seconds"
+                    f"Running iteration {i}, elapsed time: {timer.elapsed_seconds(digits=2)} seconds"
                 )
 
             try_format_query.__wrapped__(large_sql_query, platform="snowflake")
 
-    print(f"Total time taken for {N} iterations: {timer.elapsed_seconds():.2f} seconds")
+    print(
+        f"Total time taken for {N} iterations: {timer.elapsed_seconds(digits=2)} seconds"
+    )
 
 
 if __name__ == "__main__":
diff --git a/metadata-ingestion/tests/unit/reporting/test_ingestion_stage.py b/metadata-ingestion/tests/unit/reporting/test_ingestion_stage.py
new file mode 100644
index 00000000000000..8bae38eaa74446
--- /dev/null
+++ b/metadata-ingestion/tests/unit/reporting/test_ingestion_stage.py
@@ -0,0 +1,42 @@
+import time
+
+from datahub.ingestion.source_report.ingestion_stage import IngestionStageReport
+
+
+def test_ingestion_stage_context_records_duration():
+    report = IngestionStageReport()
+    with report.new_stage(stage="Test Stage"):
+        pass
+    assert len(report.ingestion_stage_durations) == 1
+    assert "Test Stage" in next(iter(report.ingestion_stage_durations.keys()))
+
+
+def test_ingestion_stage_context_handles_exceptions():
+    report = IngestionStageReport()
+    try:
+        with report.new_stage(stage="Test Stage"):
+            raise ValueError("Test Exception")
+    except ValueError:
+        pass
+    assert len(report.ingestion_stage_durations) == 1
+    assert "Test Stage" in next(iter(report.ingestion_stage_durations))
+
+
+def test_ingestion_stage_context_report_handles_multiple_stages():
+    report = IngestionStageReport()
+    with report.new_stage(stage="Test Stage 1"):
+        time.sleep(0.1)
+    with report.new_stage(stage="Test Stage 2"):
+        time.sleep(0.1)
+    with report.new_stage(stage="Test Stage 3"):
+        time.sleep(0.1)
+    assert len(report.ingestion_stage_durations) == 3
+    assert all(
+        isinstance(duration, float) and duration > 0.0
+        for duration in report.ingestion_stage_durations.values()
+    )
+
+    sorted_stages = list(sorted(report.ingestion_stage_durations.keys()))
+    assert "Test Stage 1" in sorted_stages[0]
+    assert "Test Stage 2" in sorted_stages[1]
+    assert "Test Stage 3" in sorted_stages[2]

From 0d328f77ab2d1f3f73640d69782253c5eb2c3747 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Thu, 9 Jan 2025 12:08:30 -0600
Subject: [PATCH 048/249] chore(version): bump jdbc drivers (#12301)

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3c36feadc5f4bb..eff36ee3a79775 100644
--- a/build.gradle
+++ b/build.gradle
@@ -211,7 +211,7 @@ project.ext.externalDependency = [
     'mockitoInline': 'org.mockito:mockito-inline:4.11.0',
     'mockServer': 'org.mock-server:mockserver-netty:5.11.2',
     'mockServerClient': 'org.mock-server:mockserver-client-java:5.11.2',
-    'mysqlConnector': 'mysql:mysql-connector-java:8.0.28',
+    'mysqlConnector': 'com.mysql:mysql-connector-j:8.4.0',
     'neo4jHarness': 'org.neo4j.test:neo4j-harness:' + neo4jTestVersion,
     'neo4jJavaDriver': 'org.neo4j.driver:neo4j-java-driver:' + neo4jVersion,
     'neo4jTestJavaDriver': 'org.neo4j.driver:neo4j-java-driver:' + neo4jTestVersion,
@@ -235,7 +235,7 @@ project.ext.externalDependency = [
     'playFilters': "com.typesafe.play:filters-helpers_$playScalaVersion:$playVersion",
     'pac4j': 'org.pac4j:pac4j-oidc:6.0.6',
     'playPac4j': "org.pac4j:play-pac4j_$playScalaVersion:12.0.0-PLAY2.8",
-    'postgresql': 'org.postgresql:postgresql:42.3.9',
+    'postgresql': 'org.postgresql:postgresql:42.7.4',
     'protobuf': 'com.google.protobuf:protobuf-java:3.25.5',
     'grpcProtobuf': 'io.grpc:grpc-protobuf:1.53.0',
     'rangerCommons': 'org.apache.ranger:ranger-plugins-common:2.3.0',

From d3ac112d2851e4a17074cffff6aec08706e798ee Mon Sep 17 00:00:00 2001
From: Chakru <161002324+chakru-r@users.noreply.github.com>
Date: Fri, 10 Jan 2025 00:17:35 +0530
Subject: [PATCH 049/249] build(coverage): fix carry-forward coverage (#12306)

---
 .github/.codecov.yml                     | 65 ++++++++++++++++++++++++
 .github/workflows/airflow-plugin.yml     |  8 +--
 .github/workflows/build-and-test.yml     | 26 ++++++++--
 .github/workflows/dagster-plugin.yml     |  6 +--
 .github/workflows/gx-plugin.yml          |  6 +--
 .github/workflows/metadata-ingestion.yml | 10 ++--
 .github/workflows/metadata-io.yml        |  3 +-
 .github/workflows/prefect-plugin.yml     |  8 +--
 gradle/coverage/java-coverage.gradle     |  2 +-
 gradle/coverage/python-coverage.gradle   |  2 +-
 10 files changed, 110 insertions(+), 26 deletions(-)
 create mode 100644 .github/.codecov.yml

diff --git a/.github/.codecov.yml b/.github/.codecov.yml
new file mode 100644
index 00000000000000..1faf5a6bab4644
--- /dev/null
+++ b/.github/.codecov.yml
@@ -0,0 +1,65 @@
+comment:
+  layout: "header, files, footer" # remove "new" from "header" and "footer"
+  hide_project_coverage: true # set to false
+  require_changes: false  # if true: only post the comment if coverage changes
+
+codecov:
+  #due to ci-optimization, reports for modules that have not changed may be quite old
+  max_report_age: off
+
+flag_management:
+  default_rules: # the rules that will be followed for any flag added, generally
+    carryforward: true
+    statuses:
+      - type: project
+        target: auto
+        threshold: 0%  #Not enforcing project coverage yet.
+      - type: patch
+        target: 90%
+  individual_flags: # exceptions to the default rules above, stated flag by flag
+    - name: frontend
+      paths:
+        - "datahub-frontend/**"
+        - "datahub-web-react/**"
+    - name: backend
+      paths:
+        - "metadata-models/**"
+        - "datahub-upgrade/**"
+        - "entity-registry/**"
+        - "li-utils/**"
+        - "metadata-auth/**"
+        - "metadata-dao-impl/**"
+        - "metadata-events/**"
+        - "metadata-jobs/**"
+        - "metadata-service/**"
+        - "metadata-utils/**"
+        - "metadata-operation-context/**"
+        - "datahub-graphql-core/**"
+    - name: metadata-io
+      paths:
+        - "metadata-io/**"
+    - name: ingestion
+      paths:
+        - "metadata-ingestion/**"
+    - name: ingestion-airflow
+      paths:
+        - "metadata-ingestion-modules/airflow-plugin/**"
+    - name: ingestion-dagster
+      paths:
+        - "metadata-ingestion-modules/dagster-plugin/**"
+    - name: ingestion-gx-plugin
+      paths:
+        - "metadata-ingestion-modules/gx-plugin/**"
+    - name: ingestion-prefect
+      paths:
+        - "metadata-ingestion-modules/prefect-plugin/**"
+coverage:
+  status:
+    project:
+      default:
+        target: 0% # no threshold enforcement yet
+        only_pulls: true
+    patch:
+      default:
+        target: 90% # for new code added in the patch
+        only_pulls: true
diff --git a/.github/workflows/airflow-plugin.yml b/.github/workflows/airflow-plugin.yml
index 89e0c9e2513d8b..c1eba45609fd52 100644
--- a/.github/workflows/airflow-plugin.yml
+++ b/.github/workflows/airflow-plugin.yml
@@ -77,15 +77,15 @@ jobs:
             **/build/test-results/test/**
             **/junit.*.xml
             !**/binary/**
-      - name: Upload coverage to Codecov
+      - name: Upload coverage to Codecov with ingestion flag
         if: always()
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          directory: ./build/coverage-reports/
+          directory: ./build/coverage-reports/metadata-ingestion-modules/airflow-plugin/
           fail_ci_if_error: false
-          flags: airflow-${{ matrix.python-version }}-${{ matrix.extra_pip_extras }}
-          name: pytest-airflow
+          flags: ingestion-airflow
+          name: pytest-airflow-${{ matrix.python-version }}-${{ matrix.extra_pip_requirements }}
           verbose: true
       - name: Upload test results to Codecov
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 058ac4a5c9b1e5..923abac5ef34af 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -113,6 +113,10 @@ jobs:
         if: ${{  matrix.command == 'except_metadata_ingestion' && needs.setup.outputs.backend_change == 'true' }}
         run: |
           ./gradlew -PjavaClassVersionDefault=8 :metadata-integration:java:spark-lineage:compileJava
+      - name: Gather coverage files
+        run: |
+          echo "BACKEND_FILES=`find ./build/coverage-reports/ -type f | grep -E '(metadata-models|entity-registry|datahuyb-graphql-core|metadata-io|metadata-jobs|metadata-utils|metadata-service|medata-dao-impl|metadata-operation|li-utils|metadata-integration|metadata-events|metadata-auth|ingestion-scheduler|notifications|datahub-upgrade)' | xargs | sed 's/ /,/g'`" >> $GITHUB_ENV
+          echo "FRONTEND_FILES=`find ./build/coverage-reports/ -type f | grep -E '(datahub-frontend|datahub-web-react).*\.(xml|json)$' | xargs | sed 's/ /,/g'`" >> $GITHUB_ENV
       - uses: actions/upload-artifact@v4
         if: always()
         with:
@@ -124,14 +128,28 @@ jobs:
             !**/binary/**
       - name: Ensure codegen is updated
         uses: ./.github/actions/ensure-codegen-updated
-      - name: Upload coverage to Codecov
-        if: always()
+      - name: Upload backend coverage to Codecov
+        if: ${{  matrix.command == 'except_metadata_ingestion' && needs.setup.outputs.backend_change == 'true' }}
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ${{ env.BACKEND_FILES }}
+          disable_search: true
+          #handle_no_reports_found: true
+          fail_ci_if_error: false
+          flags: backend
+          name: ${{ matrix.command }}
+          verbose: true
+      - name: Upload frontend coverage to Codecov
+        if: ${{  matrix.command == 'frontend' && needs.setup.outputs.frontend_change == 'true' }}
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          directory: ./build/coverage-reports/
+          files: ${{ env.FRONTEND_FILES }}
+          disable_search: true
+          #handle_no_reports_found: true
           fail_ci_if_error: false
-          flags: ${{ matrix.timezone }}
+          flags: frontend
           name: ${{ matrix.command }}
           verbose: true
       - name: Upload test results to Codecov
diff --git a/.github/workflows/dagster-plugin.yml b/.github/workflows/dagster-plugin.yml
index c29e72367c53c5..fa15a280c9d39f 100644
--- a/.github/workflows/dagster-plugin.yml
+++ b/.github/workflows/dagster-plugin.yml
@@ -64,14 +64,14 @@ jobs:
             **/build/reports/tests/test/**
             **/build/test-results/test/**
             **/junit.*.xml
-      - name: Upload coverage to Codecov
+      - name: Upload coverage to Codecov with ingestion flag
         if: always()
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          directory: ./build/coverage-reports/
+          directory: ./build/coverage-reports/metadata-ingestion-modules/dagster-plugin/
           fail_ci_if_error: false
-          flags: dagster-${{ matrix.python-version }}-${{ matrix.extraPythonRequirement }}
+          flags: ingestion-dagster-plugin
           name: pytest-dagster
           verbose: true
       - name: Upload test results to Codecov
diff --git a/.github/workflows/gx-plugin.yml b/.github/workflows/gx-plugin.yml
index 825f8beda2f561..eb0ca9a7dbbb97 100644
--- a/.github/workflows/gx-plugin.yml
+++ b/.github/workflows/gx-plugin.yml
@@ -68,14 +68,14 @@ jobs:
             **/build/reports/tests/test/**
             **/build/test-results/test/**
             **/junit.*.xml
-      - name: Upload coverage to Codecov
+      - name: Upload coverage to Codecov with ingestion flag
         if: always()
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          directory: ./build/coverage-reports/
+          directory: ./build/coverage-reports/metadata-ingestion-modules/gx-plugin/
           fail_ci_if_error: false
-          flags: gx-${{ matrix.python-version }}-${{ matrix.extraPythonRequirement }}
+          flags: ingestion-gx-plugin
           name: pytest-gx
           verbose: true
       - name: Upload test results to Codecov
diff --git a/.github/workflows/metadata-ingestion.yml b/.github/workflows/metadata-ingestion.yml
index aa404c4c35c505..8cfc2d396badd2 100644
--- a/.github/workflows/metadata-ingestion.yml
+++ b/.github/workflows/metadata-ingestion.yml
@@ -88,15 +88,15 @@ jobs:
             **/build/test-results/test/**
             **/junit.*.xml
             !**/binary/**
-      - name: Upload coverage to Codecov
-        if: ${{ always() }}
+      - name: Upload coverage to Codecov with ingestion flag
+        if: ${{ always() && matrix.python-version == '3.11' }}
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          directory: ./build/coverage-reports/
+          directory: ./build/coverage-reports/metadata-ingestion/
           fail_ci_if_error: false
-          flags: ingestion-${{ matrix.python-version }}-${{ matrix.command }}
-          name: pytest-ingestion
+          flags: ingestion
+          name: pytest-${{ matrix.python-version }}-${{ matrix.command }}
           verbose: true
       - name: Upload test results to Codecov
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/metadata-io.yml b/.github/workflows/metadata-io.yml
index bcadc641ee2f7c..6efcf58c700b1f 100644
--- a/.github/workflows/metadata-io.yml
+++ b/.github/workflows/metadata-io.yml
@@ -86,8 +86,9 @@ jobs:
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          directory: ./build/coverage-reports/
+          directory: ./build/coverage-reports/metadata-io/
           fail_ci_if_error: false
+          flags: metadata-io
           name: metadata-io-test
           verbose: true
       - name: Upload test results to Codecov
diff --git a/.github/workflows/prefect-plugin.yml b/.github/workflows/prefect-plugin.yml
index 0bce4d5ef19f31..68736f9fd10156 100644
--- a/.github/workflows/prefect-plugin.yml
+++ b/.github/workflows/prefect-plugin.yml
@@ -60,15 +60,15 @@ jobs:
             **/build/test-results/test/**
             **/junit.*.xml
             !**/binary/**
-      - name: Upload coverage to Codecov
+      - name: Upload coverage to Codecov with ingestion flag
         if: always()
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          directory: ./build/coverage-reports/
+          directory: ./build/coverage-reports/metadata-ingestion-modules/prefect-plugin/
           fail_ci_if_error: false
-          flags: prefect-${{ matrix.python-version }}
-          name: pytest-prefect
+          flags: ingestion-prefect-plugin
+          name: pytest-prefect-${{ matrix.python-version }}
           verbose: true
       - name: Upload test results to Codecov
         if: ${{ !cancelled() }}
diff --git a/gradle/coverage/java-coverage.gradle b/gradle/coverage/java-coverage.gradle
index 17260c1a309788..fe8bc65336a983 100644
--- a/gradle/coverage/java-coverage.gradle
+++ b/gradle/coverage/java-coverage.gradle
@@ -22,7 +22,7 @@ afterEvaluate {
         Tools that aggregate and analyse coverage tools search for the coverage result files. Keeping them under one
         folder will minimize the time spent searching through the full source tree.
         */
-        outputLocation = rootProject.layout.buildDirectory.file("coverage-reports/jacoco-${project.name}.xml")
+        outputLocation = rootProject.layout.buildDirectory.file("coverage-reports/${rootProject.relativePath(project.projectDir)}/jacoco-${project.name}.xml")
       }
       csv.required = false
       html.required = false
diff --git a/gradle/coverage/python-coverage.gradle b/gradle/coverage/python-coverage.gradle
index 23d6e37387ed83..05eb79cf5659e2 100644
--- a/gradle/coverage/python-coverage.gradle
+++ b/gradle/coverage/python-coverage.gradle
@@ -7,7 +7,7 @@ ext.get_coverage_args = { test_name = "" ->
   Tools that aggregate and analyse coverage tools search for the coverage result files. Keeping them under one folder
   will minimize the time spent searching through the full source tree.
   */
-  def base_path = "${rootProject.buildDir}/coverage-reports"
+  def base_path = "${rootProject.buildDir}/coverage-reports/${rootProject.relativePath(project.projectDir)}/"
 
   /*
   --cov=src was added via setup.cfg in many of the python projects but for some reason, was not getting picked up

From f6c86df1f5ad310698ca13e4e5b5833af08c96eb Mon Sep 17 00:00:00 2001
From: pankajmahato-visa <154867659+pankajmahato-visa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 00:45:09 +0530
Subject: [PATCH 050/249] chore(deps): Migrate EOL vulnerability of javax.mail
 to jakarta.mail (#12282)

---
 build.gradle                                                  | 4 +++-
 .../java/com/linkedin/entity/client/RestliEntityClient.java   | 4 ++--
 metadata-utils/build.gradle                                   | 4 ++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index eff36ee3a79775..5b6613d3057f3e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -286,7 +286,8 @@ project.ext.externalDependency = [
     'annotationApi': 'javax.annotation:javax.annotation-api:1.3.2',
     'jakartaAnnotationApi': 'jakarta.annotation:jakarta.annotation-api:3.0.0',
     'classGraph': 'io.github.classgraph:classgraph:4.8.172',
-    'mustache': 'com.github.spullara.mustache.java:compiler:0.9.14'
+    'mustache': 'com.github.spullara.mustache.java:compiler:0.9.14',
+    'javaxMail': 'com.sun.mail:jakarta.mail:1.6.7'
 ]
 
 allprojects {
@@ -374,6 +375,7 @@ configure(subprojects.findAll {! it.name.startsWith('spark-lineage')}) {
     exclude group: "org.slf4j", module: "slf4j-nop"
     exclude group: "org.slf4j", module: "slf4j-ext"
     exclude group: "org.codehaus.jackson", module: "jackson-mapper-asl"
+    exclude group: "javax.mail", module: "mail"
 
     resolutionStrategy.force externalDependency.antlr4Runtime
     resolutionStrategy.force externalDependency.antlr4
diff --git a/metadata-service/restli-client/src/main/java/com/linkedin/entity/client/RestliEntityClient.java b/metadata-service/restli-client/src/main/java/com/linkedin/entity/client/RestliEntityClient.java
index 8d4c5e9228a71c..ca775619220831 100644
--- a/metadata-service/restli-client/src/main/java/com/linkedin/entity/client/RestliEntityClient.java
+++ b/metadata-service/restli-client/src/main/java/com/linkedin/entity/client/RestliEntityClient.java
@@ -103,10 +103,10 @@
 import java.util.stream.StreamSupport;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.mail.MethodNotSupportedException;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.NotImplementedException;
+import org.apache.http.MethodNotSupportedException;
 import org.opensearch.core.common.util.CollectionUtils;
 
 @Slf4j
@@ -1195,7 +1195,7 @@ public DataMap getRawAspect(
       @Nonnull String aspect,
       @Nonnull Long version)
       throws RemoteInvocationException {
-    throw new MethodNotSupportedException();
+    throw new MethodNotSupportedException("Method not supported");
   }
 
   @Override
diff --git a/metadata-utils/build.gradle b/metadata-utils/build.gradle
index 07ce50993655d2..4b24eeac50b0b7 100644
--- a/metadata-utils/build.gradle
+++ b/metadata-utils/build.gradle
@@ -26,6 +26,7 @@ dependencies {
 
   implementation externalDependency.slf4jApi
   compileOnly externalDependency.lombok
+  runtimeOnly externalDependency.javaxMail
 
   annotationProcessor externalDependency.lombok
 
@@ -40,6 +41,9 @@ dependencies {
       implementation(externalDependency.log4jApi) {
         because("previous versions are vulnerable to CVE-2021-45105")
     }
+    implementation(externalDependency.javaxMail) {
+      because("previous versions are vulnerable")
+    }
   }
   implementation externalDependency.logbackClassic
 

From 210e2c1fa206ed3901edebf9e654d21c90583149 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Thu, 9 Jan 2025 14:32:18 -0600
Subject: [PATCH 051/249] chore(alpine): bump alpine images 3.21 (#12302)

---
 docker/datahub-frontend/Dockerfile     | 2 +-
 docker/datahub-gms/Dockerfile          | 2 +-
 docker/datahub-mae-consumer/Dockerfile | 2 +-
 docker/datahub-mce-consumer/Dockerfile | 2 +-
 docker/datahub-upgrade/Dockerfile      | 2 +-
 docker/elasticsearch-setup/Dockerfile  | 2 +-
 docker/mysql-setup/Dockerfile          | 2 +-
 docker/mysql-setup/init.sh             | 3 ++-
 docker/postgres-setup/Dockerfile       | 2 +-
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/docker/datahub-frontend/Dockerfile b/docker/datahub-frontend/Dockerfile
index 89974e56575b07..16e6477c37ce69 100644
--- a/docker/datahub-frontend/Dockerfile
+++ b/docker/datahub-frontend/Dockerfile
@@ -1,7 +1,7 @@
 # Defining environment
 ARG APP_ENV=prod
 
-FROM alpine:3.20 AS base
+FROM alpine:3.21 AS base
 
 # Configurable repositories
 ARG ALPINE_REPO_URL=http://dl-cdn.alpinelinux.org/alpine
diff --git a/docker/datahub-gms/Dockerfile b/docker/datahub-gms/Dockerfile
index 47b10535f8deea..52cc507f9268d1 100644
--- a/docker/datahub-gms/Dockerfile
+++ b/docker/datahub-gms/Dockerfile
@@ -23,7 +23,7 @@ WORKDIR /go/src/github.com/jwilder/dockerize
 
 RUN go install github.com/jwilder/dockerize@$DOCKERIZE_VERSION
 
-FROM alpine:3.20 AS base
+FROM alpine:3.21 AS base
 
 ENV JMX_VERSION=0.18.0
 ENV JETTY_VERSION=11.0.21
diff --git a/docker/datahub-mae-consumer/Dockerfile b/docker/datahub-mae-consumer/Dockerfile
index 74375072761d89..4ddec56311fb96 100644
--- a/docker/datahub-mae-consumer/Dockerfile
+++ b/docker/datahub-mae-consumer/Dockerfile
@@ -23,7 +23,7 @@ WORKDIR /go/src/github.com/jwilder/dockerize
 
 RUN go install github.com/jwilder/dockerize@$DOCKERIZE_VERSION
 
-FROM alpine:3.20 AS base
+FROM alpine:3.21 AS base
 
 # Re-declaring args from above to make them available in this stage (will inherit default values)
 ARG ALPINE_REPO_URL
diff --git a/docker/datahub-mce-consumer/Dockerfile b/docker/datahub-mce-consumer/Dockerfile
index 3adef53cd06068..42e40cd5942144 100644
--- a/docker/datahub-mce-consumer/Dockerfile
+++ b/docker/datahub-mce-consumer/Dockerfile
@@ -23,7 +23,7 @@ WORKDIR /go/src/github.com/jwilder/dockerize
 
 RUN go install github.com/jwilder/dockerize@$DOCKERIZE_VERSION
 
-FROM alpine:3.20 AS base
+FROM alpine:3.21 AS base
 
 # Re-declaring args from above to make them available in this stage (will inherit default values)
 ARG ALPINE_REPO_URL
diff --git a/docker/datahub-upgrade/Dockerfile b/docker/datahub-upgrade/Dockerfile
index a8ef4e8034fdd5..488cb46c94cf28 100644
--- a/docker/datahub-upgrade/Dockerfile
+++ b/docker/datahub-upgrade/Dockerfile
@@ -23,7 +23,7 @@ WORKDIR /go/src/github.com/jwilder/dockerize
 
 RUN go install github.com/jwilder/dockerize@$DOCKERIZE_VERSION
 
-FROM alpine:3.20 AS base
+FROM alpine:3.21 AS base
 
 # Re-declaring args from above to make them available in this stage (will inherit default values)
 ARG ALPINE_REPO_URL
diff --git a/docker/elasticsearch-setup/Dockerfile b/docker/elasticsearch-setup/Dockerfile
index 1a6fe5bee6c840..584007a5fb0a9c 100644
--- a/docker/elasticsearch-setup/Dockerfile
+++ b/docker/elasticsearch-setup/Dockerfile
@@ -23,7 +23,7 @@ WORKDIR /go/src/github.com/jwilder/dockerize
 
 RUN go install github.com/jwilder/dockerize@$DOCKERIZE_VERSION
 
-FROM alpine:3.20 AS base
+FROM alpine:3.21 AS base
 
 ARG ALPINE_REPO_URL
 
diff --git a/docker/mysql-setup/Dockerfile b/docker/mysql-setup/Dockerfile
index 8a2d42bc233180..21b696a1b906fe 100644
--- a/docker/mysql-setup/Dockerfile
+++ b/docker/mysql-setup/Dockerfile
@@ -17,7 +17,7 @@ WORKDIR /go/src/github.com/jwilder/dockerize
 
 RUN go install github.com/jwilder/dockerize@$DOCKERIZE_VERSION
 
-FROM alpine:3.20
+FROM alpine:3.21
 COPY --from=binary /go/bin/dockerize /usr/local/bin
 
 ARG ALPINE_REPO_URL
diff --git a/docker/mysql-setup/init.sh b/docker/mysql-setup/init.sh
index b5ee294ddd6559..2760da86a9a33f 100755
--- a/docker/mysql-setup/init.sh
+++ b/docker/mysql-setup/init.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 : ${MYSQL_PORT:=3306}
+: ${MYSQL_ARGS:=--ssl=0}
 
 sed -e "s/DATAHUB_DB_NAME/${DATAHUB_DB_NAME}/g" /init.sql | tee -a /tmp/init-final.sql
-mysql -u $MYSQL_USERNAME -p"$MYSQL_PASSWORD" -h $MYSQL_HOST -P $MYSQL_PORT < /tmp/init-final.sql
\ No newline at end of file
+mariadb -u $MYSQL_USERNAME -p"$MYSQL_PASSWORD" -h $MYSQL_HOST -P $MYSQL_PORT $MYSQL_ARGS < /tmp/init-final.sql
\ No newline at end of file
diff --git a/docker/postgres-setup/Dockerfile b/docker/postgres-setup/Dockerfile
index 31e9687cea15e8..5362e0d787c15d 100644
--- a/docker/postgres-setup/Dockerfile
+++ b/docker/postgres-setup/Dockerfile
@@ -17,7 +17,7 @@ WORKDIR /go/src/github.com/jwilder/dockerize
 
 RUN go install github.com/jwilder/dockerize@$DOCKERIZE_VERSION
 
-FROM alpine:3.20
+FROM alpine:3.21
 COPY --from=binary /go/bin/dockerize /usr/local/bin
 
 ARG ALPINE_REPO_URL

From 0c31d9ae0d39ed652a296b8292ebcdf366c2a353 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Thu, 9 Jan 2025 15:55:56 -0800
Subject: [PATCH 052/249] feat(ingest/datahub): support dropping duplicate
 schema fields (#12308)

---
 .../src/datahub/ingestion/source/datahub/config.py |  6 ++++++
 .../ingestion/source/datahub/datahub_source.py     | 14 ++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/datahub/config.py b/metadata-ingestion/src/datahub/ingestion/source/datahub/config.py
index 09f38913f11b19..8622e221940317 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/datahub/config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/datahub/config.py
@@ -108,6 +108,12 @@ class DataHubSourceConfig(StatefulIngestionConfigBase):
 
     urn_pattern: AllowDenyPattern = Field(default=AllowDenyPattern())
 
+    drop_duplicate_schema_fields: bool = Field(
+        default=False,
+        description="Whether to drop duplicate schema fields in the schemaMetadata aspect. "
+        "Useful if the source system has duplicate field paths in the db, but we're pushing to a system with server-side duplicate checking.",
+    )
+
     @root_validator(skip_on_failure=True)
     def check_ingesting_data(cls, values):
         if (
diff --git a/metadata-ingestion/src/datahub/ingestion/source/datahub/datahub_source.py b/metadata-ingestion/src/datahub/ingestion/source/datahub/datahub_source.py
index 12daba298a2014..472abd0a97ec70 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/datahub/datahub_source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/datahub/datahub_source.py
@@ -12,7 +12,10 @@
     support_status,
 )
 from datahub.ingestion.api.source import MetadataWorkUnitProcessor, SourceReport
-from datahub.ingestion.api.source_helpers import auto_workunit_reporter
+from datahub.ingestion.api.source_helpers import (
+    auto_fix_duplicate_schema_field_paths,
+    auto_workunit_reporter,
+)
 from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.ingestion.source.datahub.config import DataHubSourceConfig
 from datahub.ingestion.source.datahub.datahub_api_reader import DataHubApiReader
@@ -57,7 +60,14 @@ def get_report(self) -> SourceReport:
 
     def get_workunit_processors(self) -> List[Optional[MetadataWorkUnitProcessor]]:
         # Exactly replicate data from DataHub source
-        return [partial(auto_workunit_reporter, self.get_report())]
+        return [
+            (
+                auto_fix_duplicate_schema_field_paths
+                if self.config.drop_duplicate_schema_fields
+                else None
+            ),
+            partial(auto_workunit_reporter, self.get_report()),
+        ]
 
     def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
         self.report.stop_time = datetime.now(tz=timezone.utc)

From 6dbabb2161bc16145eb6b170b34495a9066eae9d Mon Sep 17 00:00:00 2001
From: Chakru <161002324+chakru-r@users.noreply.github.com>
Date: Fri, 10 Jan 2025 10:44:23 +0530
Subject: [PATCH 053/249] feat(ci): add manual trigger for full build (#12307)

---
 .github/actions/ci-optimization/action.yml | 15 ++++++++++++---
 .github/workflows/airflow-plugin.yml       |  1 +
 .github/workflows/build-and-test.yml       |  1 +
 .github/workflows/dagster-plugin.yml       |  1 +
 .github/workflows/gx-plugin.yml            |  1 +
 .github/workflows/metadata-ingestion.yml   |  1 +
 .github/workflows/metadata-io.yml          |  1 +
 .github/workflows/prefect-plugin.yml       |  1 +
 8 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/.github/actions/ci-optimization/action.yml b/.github/actions/ci-optimization/action.yml
index 0d435963382675..8a81859ae903a8 100644
--- a/.github/actions/ci-optimization/action.yml
+++ b/.github/actions/ci-optimization/action.yml
@@ -13,16 +13,16 @@ outputs:
     value: ${{ steps.filter.outputs.frontend == 'false' && steps.filter.outputs.ingestion == 'false' && steps.filter.outputs.backend == 'true' }}
   backend-change:
     description: "Backend code has changed"
-    value: ${{ steps.filter.outputs.backend == 'true' }}
+    value: ${{ steps.filter.outputs.backend == 'true' ||  steps.trigger.outputs.trigger == 'manual' }}
   ingestion-change:
     description: "Ingestion code has changed"
-    value: ${{ steps.filter.outputs.ingestion == 'true' }}
+    value: ${{ steps.filter.outputs.ingestion == 'true' || steps.trigger.outputs.trigger == 'manual' }}
   ingestion-base-change:
     description: "Ingestion base image docker image has changed"
     value: ${{ steps.filter.outputs.ingestion-base == 'true' }}
   frontend-change:
     description: "Frontend code has changed"
-    value: ${{ steps.filter.outputs.frontend == 'true' }}
+    value: ${{ steps.filter.outputs.frontend == 'true' || steps.trigger.outputs.trigger == 'manual' }}
   docker-change:
     description: "Docker code has changed"
     value: ${{ steps.filter.outputs.docker == 'true' }}
@@ -44,6 +44,15 @@ outputs:
 runs:
   using: "composite"
   steps:
+    - name: Check trigger type
+      id: trigger  # Add an ID to reference this step
+      shell: bash
+      run: |
+        if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+          echo "trigger=manual" >> $GITHUB_OUTPUT
+        else
+          echo "trigger=pr" >> $GITHUB_OUTPUT
+        fi
     - uses: dorny/paths-filter@v3
       id: filter
       with:
diff --git a/.github/workflows/airflow-plugin.yml b/.github/workflows/airflow-plugin.yml
index c1eba45609fd52..e1e0fb0a85e977 100644
--- a/.github/workflows/airflow-plugin.yml
+++ b/.github/workflows/airflow-plugin.yml
@@ -18,6 +18,7 @@ on:
       - "metadata-models/**"
   release:
     types: [published]
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 923abac5ef34af..624e5d5df32178 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -12,6 +12,7 @@ on:
     paths-ignore:
       - "docs/**"
       - "**.md"
+  workflow_dispatch:
   release:
     types: [published]
 
diff --git a/.github/workflows/dagster-plugin.yml b/.github/workflows/dagster-plugin.yml
index fa15a280c9d39f..a2ac59d6989a9f 100644
--- a/.github/workflows/dagster-plugin.yml
+++ b/.github/workflows/dagster-plugin.yml
@@ -18,6 +18,7 @@ on:
       - "metadata-models/**"
   release:
     types: [published]
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
diff --git a/.github/workflows/gx-plugin.yml b/.github/workflows/gx-plugin.yml
index eb0ca9a7dbbb97..c28bdbb30eb36d 100644
--- a/.github/workflows/gx-plugin.yml
+++ b/.github/workflows/gx-plugin.yml
@@ -18,6 +18,7 @@ on:
       - "metadata-models/**"
   release:
     types: [published]
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
diff --git a/.github/workflows/metadata-ingestion.yml b/.github/workflows/metadata-ingestion.yml
index 8cfc2d396badd2..be6026098ce420 100644
--- a/.github/workflows/metadata-ingestion.yml
+++ b/.github/workflows/metadata-ingestion.yml
@@ -18,6 +18,7 @@ on:
       - "metadata-models/**"
   release:
     types: [published]
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
diff --git a/.github/workflows/metadata-io.yml b/.github/workflows/metadata-io.yml
index 6efcf58c700b1f..80af03e77eef82 100644
--- a/.github/workflows/metadata-io.yml
+++ b/.github/workflows/metadata-io.yml
@@ -20,6 +20,7 @@ on:
       - ".github/workflows/metadata-io.yml"
   release:
     types: [published]
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
diff --git a/.github/workflows/prefect-plugin.yml b/.github/workflows/prefect-plugin.yml
index 68736f9fd10156..401efa340ae8ca 100644
--- a/.github/workflows/prefect-plugin.yml
+++ b/.github/workflows/prefect-plugin.yml
@@ -18,6 +18,7 @@ on:
       - "metadata-models/**"
   release:
     types: [published]
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

From 3b827f356a9b1b8e511f1b39c7ddfe3e6a6afa01 Mon Sep 17 00:00:00 2001
From: Chakru <161002324+chakru-r@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:34:59 +0530
Subject: [PATCH 054/249] fix(ci): make upload-artifact name unique (#12312)

---
 .github/workflows/build-and-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 624e5d5df32178..9a940ef8040d17 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -121,7 +121,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: Test Results (build)
+          name: Test Results (build) - ${{ matrix.command}}-${{ matrix.timezone }}
           path: |
             **/build/reports/tests/test/**
             **/build/test-results/test/**

From d8e7cb25e014b73a579412e11435b08f2049de6f Mon Sep 17 00:00:00 2001
From: Austin SeungJun Park <110667795+eagle-25@users.noreply.github.com>
Date: Fri, 10 Jan 2025 17:41:28 +0900
Subject: [PATCH 055/249] fix(ingestion/s3): groupby group-splitting issue
 (#12254)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sergio Gómez Villamor <sgomezvillamor@gmail.com>
---
 .../datahub/ingestion/source/aws/s3_util.py   | 25 ++++++-
 .../src/datahub/ingestion/source/s3/source.py | 24 +++----
 .../tests/unit/s3/test_s3_source.py           | 65 ++++++++++++++++++-
 .../tests/unit/s3/test_s3_util.py             | 29 +++++++++
 4 files changed, 127 insertions(+), 16 deletions(-)
 create mode 100644 metadata-ingestion/tests/unit/s3/test_s3_util.py

diff --git a/metadata-ingestion/src/datahub/ingestion/source/aws/s3_util.py b/metadata-ingestion/src/datahub/ingestion/source/aws/s3_util.py
index 878b8dd1bb9a51..360f18aa448f27 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/aws/s3_util.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/aws/s3_util.py
@@ -1,6 +1,11 @@
 import logging
 import os
-from typing import Optional
+from collections import defaultdict
+from typing import TYPE_CHECKING, Dict, Iterable, List, Optional
+
+if TYPE_CHECKING:
+    from mypy_boto3_s3.service_resource import ObjectSummary
+
 
 S3_PREFIXES = ["s3://", "s3n://", "s3a://"]
 
@@ -68,3 +73,21 @@ def get_key_prefix(s3_uri: str) -> str:
             f"Not an S3 URI. Must start with one of the following prefixes: {str(S3_PREFIXES)}"
         )
     return strip_s3_prefix(s3_uri).split("/", maxsplit=1)[1]
+
+
+def group_s3_objects_by_dirname(
+    s3_objects: Iterable["ObjectSummary"],
+) -> Dict[str, List["ObjectSummary"]]:
+    """
+    Groups S3 objects by their directory name.
+
+    If a s3_object in the root directory (i.e., s3://bucket/file.txt), it is grouped under '/'.
+    """
+    grouped_s3_objs = defaultdict(list)
+    for obj in s3_objects:
+        if "/" in obj.key:
+            dirname = obj.key.rsplit("/", 1)[0]
+        else:
+            dirname = "/"
+        grouped_s3_objs[dirname].append(obj)
+    return grouped_s3_objs
diff --git a/metadata-ingestion/src/datahub/ingestion/source/s3/source.py b/metadata-ingestion/src/datahub/ingestion/source/s3/source.py
index ceac9e96d1ddd0..989d0d734352a2 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/s3/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/s3/source.py
@@ -6,9 +6,8 @@
 import re
 import time
 from datetime import datetime
-from itertools import groupby
 from pathlib import PurePath
-from typing import Any, Dict, Iterable, List, Optional, Tuple
+from typing import TYPE_CHECKING, Dict, Iterable, List, Optional, Tuple
 from urllib.parse import urlparse
 
 import smart_open.compression as so_compression
@@ -41,6 +40,7 @@
     get_bucket_name,
     get_bucket_relative_path,
     get_key_prefix,
+    group_s3_objects_by_dirname,
     strip_s3_prefix,
 )
 from datahub.ingestion.source.data_lake_common.data_lake_utils import ContainerWUCreator
@@ -75,6 +75,9 @@
 from datahub.telemetry import stats, telemetry
 from datahub.utilities.perf_timer import PerfTimer
 
+if TYPE_CHECKING:
+    from mypy_boto3_s3.service_resource import Bucket
+
 # hide annoying debug errors from py4j
 logging.getLogger("py4j").setLevel(logging.ERROR)
 logger: logging.Logger = logging.getLogger(__name__)
@@ -842,7 +845,7 @@ def get_dir_to_process(
     def get_folder_info(
         self,
         path_spec: PathSpec,
-        bucket: Any,  # Todo: proper type
+        bucket: "Bucket",
         prefix: str,
     ) -> List[Folder]:
         """
@@ -857,22 +860,15 @@ def get_folder_info(
 
         Parameters:
         path_spec (PathSpec): The path specification used to determine partitioning.
-        bucket (Any): The S3 bucket object.
+        bucket (Bucket): The S3 bucket object.
         prefix (str): The prefix path in the S3 bucket to list objects from.
 
         Returns:
         List[Folder]: A list of Folder objects representing the partitions found.
         """
-
-        prefix_to_list = prefix
-        files = list(
-            bucket.objects.filter(Prefix=f"{prefix_to_list}").page_size(PAGE_SIZE)
-        )
-        files = sorted(files, key=lambda a: a.last_modified)
-        grouped_files = groupby(files, lambda x: x.key.rsplit("/", 1)[0])
-
         partitions: List[Folder] = []
-        for key, group in grouped_files:
+        s3_objects = bucket.objects.filter(Prefix=prefix).page_size(PAGE_SIZE)
+        for key, group in group_s3_objects_by_dirname(s3_objects).items():
             file_size = 0
             creation_time = None
             modification_time = None
@@ -904,7 +900,7 @@ def get_folder_info(
                 Folder(
                     partition_id=id,
                     is_partition=bool(id),
-                    creation_time=creation_time if creation_time else None,
+                    creation_time=creation_time if creation_time else None,  # type: ignore[arg-type]
                     modification_time=modification_time,
                     sample_file=self.create_s3_path(max_file.bucket_name, max_file.key),
                     size=file_size,
diff --git a/metadata-ingestion/tests/unit/s3/test_s3_source.py b/metadata-ingestion/tests/unit/s3/test_s3_source.py
index f826cf0179e221..902987213e122f 100644
--- a/metadata-ingestion/tests/unit/s3/test_s3_source.py
+++ b/metadata-ingestion/tests/unit/s3/test_s3_source.py
@@ -1,12 +1,15 @@
+from datetime import datetime
 from typing import List, Tuple
+from unittest.mock import Mock
 
 import pytest
 
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.ingestion.api.common import PipelineContext
 from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.ingestion.source.data_lake_common.data_lake_utils import ContainerWUCreator
 from datahub.ingestion.source.data_lake_common.path_spec import PathSpec
-from datahub.ingestion.source.s3.source import partitioned_folder_comparator
+from datahub.ingestion.source.s3.source import S3Source, partitioned_folder_comparator
 
 
 def test_partition_comparator_numeric_folder_name():
@@ -240,3 +243,63 @@ def container_properties_filter(x: MetadataWorkUnit) -> bool:
         "folder_abs_path": "my-bucket/my-dir/my-dir2",
         "platform": "s3",
     }
+
+
+def test_get_folder_info():
+    """
+    Test S3Source.get_folder_info returns the latest file in each folder
+    """
+
+    def _get_s3_source(path_spec_: PathSpec) -> S3Source:
+        return S3Source.create(
+            config_dict={
+                "path_spec": {
+                    "include": path_spec_.include,
+                    "table_name": path_spec_.table_name,
+                },
+            },
+            ctx=PipelineContext(run_id="test-s3"),
+        )
+
+    # arrange
+    path_spec = PathSpec(
+        include="s3://my-bucket/{table}/{partition0}/*.csv",
+        table_name="{table}",
+    )
+
+    bucket = Mock()
+    bucket.objects.filter().page_size = Mock(
+        return_value=[
+            Mock(
+                bucket_name="my-bucket",
+                key="my-folder/dir1/0001.csv",
+                creation_time=datetime(2025, 1, 1, 1),
+                last_modified=datetime(2025, 1, 1, 1),
+                size=100,
+            ),
+            Mock(
+                bucket_name="my-bucket",
+                key="my-folder/dir2/0001.csv",
+                creation_time=datetime(2025, 1, 1, 2),
+                last_modified=datetime(2025, 1, 1, 2),
+                size=100,
+            ),
+            Mock(
+                bucket_name="my-bucket",
+                key="my-folder/dir1/0002.csv",
+                creation_time=datetime(2025, 1, 1, 2),
+                last_modified=datetime(2025, 1, 1, 2),
+                size=100,
+            ),
+        ]
+    )
+
+    # act
+    res = _get_s3_source(path_spec).get_folder_info(
+        path_spec, bucket, prefix="/my-folder"
+    )
+
+    # assert
+    assert len(res) == 2
+    assert res[0].sample_file == "s3://my-bucket/my-folder/dir1/0002.csv"
+    assert res[1].sample_file == "s3://my-bucket/my-folder/dir2/0001.csv"
diff --git a/metadata-ingestion/tests/unit/s3/test_s3_util.py b/metadata-ingestion/tests/unit/s3/test_s3_util.py
new file mode 100644
index 00000000000000..7850d65ca8b01f
--- /dev/null
+++ b/metadata-ingestion/tests/unit/s3/test_s3_util.py
@@ -0,0 +1,29 @@
+from unittest.mock import Mock
+
+from datahub.ingestion.source.aws.s3_util import group_s3_objects_by_dirname
+
+
+def test_group_s3_objects_by_dirname():
+    s3_objects = [
+        Mock(key="/dir1/file1.txt"),
+        Mock(key="/dir2/file2.txt"),
+        Mock(key="/dir1/file3.txt"),
+    ]
+
+    grouped_objects = group_s3_objects_by_dirname(s3_objects)
+
+    assert len(grouped_objects) == 2
+    assert grouped_objects["/dir1"] == [s3_objects[0], s3_objects[2]]
+    assert grouped_objects["/dir2"] == [s3_objects[1]]
+
+
+def test_group_s3_objects_by_dirname_files_in_root_directory():
+    s3_objects = [
+        Mock(key="file1.txt"),
+        Mock(key="file2.txt"),
+    ]
+
+    grouped_objects = group_s3_objects_by_dirname(s3_objects)
+
+    assert len(grouped_objects) == 1
+    assert grouped_objects["/"] == s3_objects

From efc5d31f0388f74529abaf89458c3ce1f9163a86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20G=C3=B3mez=20Villamor?= <sgomezvillamor@gmail.com>
Date: Fri, 10 Jan 2025 10:52:57 +0100
Subject: [PATCH 056/249] feat(graphql): adds container aspect for dataflow and
 datajob entities (#12236)

Co-authored-by: Chris Collins <chriscollins3456@gmail.com>
---
 .../datahub/graphql/GmsGraphQLEngine.java     | 22 ++++++++++
 .../graphql/types/dataflow/DataFlowType.java  |  1 +
 .../dataflow/mappers/DataFlowMapper.java      | 13 ++++++
 .../graphql/types/datajob/DataJobType.java    |  1 +
 .../types/datajob/mappers/DataJobMapper.java  |  9 ++++
 .../src/main/resources/entity.graphql         | 20 +++++++++
 .../dataflow/mappers/DataFlowMapperTest.java  | 42 +++++++++++++++++++
 .../datajob/mappers/DataJobMapperTest.java    | 42 +++++++++++++++++++
 .../app/entity/dataFlow/DataFlowEntity.tsx    |  1 +
 .../app/entity/dataFlow/preview/Preview.tsx   |  4 ++
 .../src/app/entity/dataJob/DataJobEntity.tsx  |  1 +
 .../app/entity/dataJob/preview/Preview.tsx    |  4 ++
 .../src/graphql/dataFlow.graphql              |  3 ++
 .../src/graphql/fragments.graphql             |  3 ++
 datahub-web-react/src/graphql/search.graphql  | 12 ++++++
 docs/how/updating-datahub.md                  |  1 +
 .../src/main/resources/entity-registry.yml    |  2 +
 17 files changed, 181 insertions(+)
 create mode 100644 datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowMapperTest.java
 create mode 100644 datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobMapperTest.java

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
index 94f0e8a055b701..59335ba605a741 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
@@ -2377,6 +2377,17 @@ private void configureDataJobResolvers(final RuntimeWiring.Builder builder) {
                                   ? dataJob.getDataPlatformInstance().getUrn()
                                   : null;
                             }))
+                    .dataFetcher(
+                        "container",
+                        new LoadableTypeResolver<>(
+                            containerType,
+                            (env) -> {
+                              final DataJob dataJob = env.getSource();
+                              return dataJob.getContainer() != null
+                                  ? dataJob.getContainer().getUrn()
+                                  : null;
+                            }))
+                    .dataFetcher("parentContainers", new ParentContainersResolver(entityClient))
                     .dataFetcher("runs", new DataJobRunsResolver(entityClient))
                     .dataFetcher("privileges", new EntityPrivilegesResolver(entityClient))
                     .dataFetcher("exists", new EntityExistsResolver(entityService))
@@ -2454,6 +2465,17 @@ private void configureDataFlowResolvers(final RuntimeWiring.Builder builder) {
                               ? dataFlow.getDataPlatformInstance().getUrn()
                               : null;
                         }))
+                .dataFetcher(
+                    "container",
+                    new LoadableTypeResolver<>(
+                        containerType,
+                        (env) -> {
+                          final DataFlow dataFlow = env.getSource();
+                          return dataFlow.getContainer() != null
+                              ? dataFlow.getContainer().getUrn()
+                              : null;
+                        }))
+                .dataFetcher("parentContainers", new ParentContainersResolver(entityClient))
                 .dataFetcher(
                     "health",
                     new EntityHealthResolver(
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/DataFlowType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/DataFlowType.java
index 3a697517bdecee..f2d38aadf49656 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/DataFlowType.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/DataFlowType.java
@@ -74,6 +74,7 @@ public class DataFlowType
           DOMAINS_ASPECT_NAME,
           DEPRECATION_ASPECT_NAME,
           DATA_PLATFORM_INSTANCE_ASPECT_NAME,
+          CONTAINER_ASPECT_NAME,
           DATA_PRODUCTS_ASPECT_NAME,
           BROWSE_PATHS_V2_ASPECT_NAME,
           STRUCTURED_PROPERTIES_ASPECT_NAME,
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowMapper.java
index 44bc6a99eae4bb..0902d6f2080b8f 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowMapper.java
@@ -16,6 +16,7 @@
 import com.linkedin.data.DataMap;
 import com.linkedin.datahub.graphql.QueryContext;
 import com.linkedin.datahub.graphql.authorization.AuthorizationUtils;
+import com.linkedin.datahub.graphql.generated.Container;
 import com.linkedin.datahub.graphql.generated.DataFlow;
 import com.linkedin.datahub.graphql.generated.DataFlowEditableProperties;
 import com.linkedin.datahub.graphql.generated.DataFlowInfo;
@@ -106,6 +107,7 @@ public DataFlow apply(
         (dataset, dataMap) ->
             dataset.setDataPlatformInstance(
                 DataPlatformInstanceAspectMapper.map(context, new DataPlatformInstance(dataMap))));
+    mappingHelper.mapToResult(context, CONTAINER_ASPECT_NAME, DataFlowMapper::mapContainers);
     mappingHelper.mapToResult(
         BROWSE_PATHS_V2_ASPECT_NAME,
         (dataFlow, dataMap) ->
@@ -206,6 +208,17 @@ private static void mapGlobalTags(
     dataFlow.setTags(globalTags);
   }
 
+  private static void mapContainers(
+      @Nullable final QueryContext context, @Nonnull DataFlow dataFlow, @Nonnull DataMap dataMap) {
+    final com.linkedin.container.Container gmsContainer =
+        new com.linkedin.container.Container(dataMap);
+    dataFlow.setContainer(
+        Container.builder()
+            .setType(EntityType.CONTAINER)
+            .setUrn(gmsContainer.getContainer().toString())
+            .build());
+  }
+
   private static void mapDomains(
       @Nullable final QueryContext context, @Nonnull DataFlow dataFlow, @Nonnull DataMap dataMap) {
     final Domains domains = new Domains(dataMap);
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/DataJobType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/DataJobType.java
index 8d55ca6dbf7ac9..317ee39ea565e5 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/DataJobType.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/DataJobType.java
@@ -75,6 +75,7 @@ public class DataJobType
           DOMAINS_ASPECT_NAME,
           DEPRECATION_ASPECT_NAME,
           DATA_PLATFORM_INSTANCE_ASPECT_NAME,
+          CONTAINER_ASPECT_NAME,
           DATA_PRODUCTS_ASPECT_NAME,
           BROWSE_PATHS_V2_ASPECT_NAME,
           SUB_TYPES_ASPECT_NAME,
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobMapper.java
index ec57c95ce151e2..3403d1f8f7b7f2 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobMapper.java
@@ -9,6 +9,7 @@
 import com.linkedin.data.DataMap;
 import com.linkedin.datahub.graphql.QueryContext;
 import com.linkedin.datahub.graphql.authorization.AuthorizationUtils;
+import com.linkedin.datahub.graphql.generated.Container;
 import com.linkedin.datahub.graphql.generated.DataFlow;
 import com.linkedin.datahub.graphql.generated.DataJob;
 import com.linkedin.datahub.graphql.generated.DataJobEditableProperties;
@@ -112,6 +113,14 @@ public DataJob apply(
               } else if (DATA_PLATFORM_INSTANCE_ASPECT_NAME.equals(name)) {
                 result.setDataPlatformInstance(
                     DataPlatformInstanceAspectMapper.map(context, new DataPlatformInstance(data)));
+              } else if (CONTAINER_ASPECT_NAME.equals(name)) {
+                final com.linkedin.container.Container gmsContainer =
+                    new com.linkedin.container.Container(data);
+                result.setContainer(
+                    Container.builder()
+                        .setType(EntityType.CONTAINER)
+                        .setUrn(gmsContainer.getContainer().toString())
+                        .build());
               } else if (BROWSE_PATHS_V2_ASPECT_NAME.equals(name)) {
                 result.setBrowsePathV2(BrowsePathsV2Mapper.map(context, new BrowsePathsV2(data)));
               } else if (SUB_TYPES_ASPECT_NAME.equals(name)) {
diff --git a/datahub-graphql-core/src/main/resources/entity.graphql b/datahub-graphql-core/src/main/resources/entity.graphql
index a5cb0893a64fae..adb24d92587b58 100644
--- a/datahub-graphql-core/src/main/resources/entity.graphql
+++ b/datahub-graphql-core/src/main/resources/entity.graphql
@@ -6275,6 +6275,16 @@ type DataFlow implements EntityWithRelationships & Entity & BrowsableEntity {
     """
     dataPlatformInstance: DataPlatformInstance
 
+    """
+    The parent container in which the entity resides
+    """
+    container: Container
+
+    """
+    Recursively get the lineage of containers for this entity
+    """
+    parentContainers: ParentContainersResult
+
     """
     Granular API for querying edges extending from this entity
     """
@@ -6457,6 +6467,16 @@ type DataJob implements EntityWithRelationships & Entity & BrowsableEntity {
     """
     dataPlatformInstance: DataPlatformInstance
 
+    """
+    The parent container in which the entity resides
+    """
+    container: Container
+
+    """
+    Recursively get the lineage of containers for this entity
+    """
+    parentContainers: ParentContainersResult
+
     """
     Additional read write properties associated with the Data Job
     """
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowMapperTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowMapperTest.java
new file mode 100644
index 00000000000000..a49f063f94d336
--- /dev/null
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowMapperTest.java
@@ -0,0 +1,42 @@
+package com.linkedin.datahub.graphql.types.dataflow.mappers;
+
+import com.linkedin.common.urn.Urn;
+import com.linkedin.datahub.graphql.generated.DataFlow;
+import com.linkedin.entity.Aspect;
+import com.linkedin.entity.EntityResponse;
+import com.linkedin.entity.EnvelopedAspect;
+import com.linkedin.entity.EnvelopedAspectMap;
+import com.linkedin.metadata.Constants;
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class DataFlowMapperTest {
+  private static final Urn TEST_DATA_FLOW_URN =
+      Urn.createFromTuple(Constants.DATA_FLOW_ENTITY_NAME, "dataflow1");
+  private static final Urn TEST_CONTAINER_URN =
+      Urn.createFromTuple(Constants.CONTAINER_ENTITY_NAME, "container1");
+
+  @Test
+  public void testMapDataFlowContainer() throws URISyntaxException {
+    com.linkedin.container.Container input = new com.linkedin.container.Container();
+    input.setContainer(TEST_CONTAINER_URN);
+
+    final Map<String, EnvelopedAspect> containerAspect = new HashMap<>();
+    containerAspect.put(
+        Constants.CONTAINER_ASPECT_NAME,
+        new com.linkedin.entity.EnvelopedAspect().setValue(new Aspect(input.data())));
+    final EntityResponse response =
+        new EntityResponse()
+            .setEntityName(Constants.DATA_FLOW_ENTITY_NAME)
+            .setUrn(TEST_DATA_FLOW_URN)
+            .setAspects(new EnvelopedAspectMap(containerAspect));
+
+    final DataFlow actual = DataFlowMapper.map(null, response);
+
+    Assert.assertEquals(actual.getUrn(), TEST_DATA_FLOW_URN.toString());
+    Assert.assertEquals(actual.getContainer().getUrn(), TEST_CONTAINER_URN.toString());
+  }
+}
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobMapperTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobMapperTest.java
new file mode 100644
index 00000000000000..d7fc0f198977eb
--- /dev/null
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobMapperTest.java
@@ -0,0 +1,42 @@
+package com.linkedin.datahub.graphql.types.datajob.mappers;
+
+import com.linkedin.common.urn.Urn;
+import com.linkedin.datahub.graphql.generated.DataJob;
+import com.linkedin.entity.Aspect;
+import com.linkedin.entity.EntityResponse;
+import com.linkedin.entity.EnvelopedAspect;
+import com.linkedin.entity.EnvelopedAspectMap;
+import com.linkedin.metadata.Constants;
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class DataJobMapperTest {
+  private static final Urn TEST_DATA_JOB_URN =
+      Urn.createFromTuple(Constants.DATA_JOB_ENTITY_NAME, "datajob1");
+  private static final Urn TEST_CONTAINER_URN =
+      Urn.createFromTuple(Constants.CONTAINER_ENTITY_NAME, "container1");
+
+  @Test
+  public void testMapDataJobContainer() throws URISyntaxException {
+    com.linkedin.container.Container input = new com.linkedin.container.Container();
+    input.setContainer(TEST_CONTAINER_URN);
+
+    final Map<String, EnvelopedAspect> containerAspect = new HashMap<>();
+    containerAspect.put(
+        Constants.CONTAINER_ASPECT_NAME,
+        new com.linkedin.entity.EnvelopedAspect().setValue(new Aspect(input.data())));
+    final EntityResponse response =
+        new EntityResponse()
+            .setEntityName(Constants.DATA_JOB_ENTITY_NAME)
+            .setUrn(TEST_DATA_JOB_URN)
+            .setAspects(new EnvelopedAspectMap(containerAspect));
+
+    final DataJob actual = DataJobMapper.map(null, response);
+
+    Assert.assertEquals(actual.getUrn(), TEST_DATA_JOB_URN.toString());
+    Assert.assertEquals(actual.getContainer().getUrn(), TEST_CONTAINER_URN.toString());
+  }
+}
diff --git a/datahub-web-react/src/app/entity/dataFlow/DataFlowEntity.tsx b/datahub-web-react/src/app/entity/dataFlow/DataFlowEntity.tsx
index 3c03dfb65ccbcd..9e26bbadaca070 100644
--- a/datahub-web-react/src/app/entity/dataFlow/DataFlowEntity.tsx
+++ b/datahub-web-react/src/app/entity/dataFlow/DataFlowEntity.tsx
@@ -184,6 +184,7 @@ export class DataFlowEntity implements Entity<DataFlow> {
                 degree={(result as any).degree}
                 paths={(result as any).paths}
                 health={data.health}
+                parentContainers={data.parentContainers}
             />
         );
     };
diff --git a/datahub-web-react/src/app/entity/dataFlow/preview/Preview.tsx b/datahub-web-react/src/app/entity/dataFlow/preview/Preview.tsx
index f210f7c985ebf7..0c86e745eba29f 100644
--- a/datahub-web-react/src/app/entity/dataFlow/preview/Preview.tsx
+++ b/datahub-web-react/src/app/entity/dataFlow/preview/Preview.tsx
@@ -10,6 +10,7 @@ import {
     GlobalTags,
     Health,
     Owner,
+    ParentContainersResult,
     SearchInsight,
 } from '../../../../types.generated';
 import DefaultPreviewCard from '../../../preview/DefaultPreviewCard';
@@ -40,6 +41,7 @@ export const Preview = ({
     degree,
     paths,
     health,
+    parentContainers,
 }: {
     urn: string;
     name: string;
@@ -59,6 +61,7 @@ export const Preview = ({
     degree?: number;
     paths?: EntityPath[];
     health?: Health[] | null;
+    parentContainers?: ParentContainersResult | null;
 }): JSX.Element => {
     const entityRegistry = useEntityRegistry();
     return (
@@ -91,6 +94,7 @@ export const Preview = ({
             degree={degree}
             paths={paths}
             health={health || undefined}
+            parentContainers={parentContainers}
         />
     );
 };
diff --git a/datahub-web-react/src/app/entity/dataJob/DataJobEntity.tsx b/datahub-web-react/src/app/entity/dataJob/DataJobEntity.tsx
index 5b1aaeaef76d5b..ff6490ebc91b0c 100644
--- a/datahub-web-react/src/app/entity/dataJob/DataJobEntity.tsx
+++ b/datahub-web-react/src/app/entity/dataJob/DataJobEntity.tsx
@@ -205,6 +205,7 @@ export class DataJobEntity implements Entity<DataJob> {
                 degree={(result as any).degree}
                 paths={(result as any).paths}
                 health={data.health}
+                parentContainers={data.parentContainers}
             />
         );
     };
diff --git a/datahub-web-react/src/app/entity/dataJob/preview/Preview.tsx b/datahub-web-react/src/app/entity/dataJob/preview/Preview.tsx
index b163722b5151c7..07ff81effbbc65 100644
--- a/datahub-web-react/src/app/entity/dataJob/preview/Preview.tsx
+++ b/datahub-web-react/src/app/entity/dataJob/preview/Preview.tsx
@@ -12,6 +12,7 @@ import {
     GlobalTags,
     Health,
     Owner,
+    ParentContainersResult,
     SearchInsight,
 } from '../../../../types.generated';
 import DefaultPreviewCard from '../../../preview/DefaultPreviewCard';
@@ -44,6 +45,7 @@ export const Preview = ({
     degree,
     paths,
     health,
+    parentContainers,
 }: {
     urn: string;
     name: string;
@@ -64,6 +66,7 @@ export const Preview = ({
     degree?: number;
     paths?: EntityPath[];
     health?: Health[] | null;
+    parentContainers?: ParentContainersResult | null;
 }): JSX.Element => {
     const entityRegistry = useEntityRegistry();
     return (
@@ -98,6 +101,7 @@ export const Preview = ({
             degree={degree}
             paths={paths}
             health={health || undefined}
+            parentContainers={parentContainers}
         />
     );
 };
diff --git a/datahub-web-react/src/graphql/dataFlow.graphql b/datahub-web-react/src/graphql/dataFlow.graphql
index 2441ce600c3c55..199c47811ce08e 100644
--- a/datahub-web-react/src/graphql/dataFlow.graphql
+++ b/datahub-web-react/src/graphql/dataFlow.graphql
@@ -50,6 +50,9 @@ fragment dataFlowFields on DataFlow {
     dataPlatformInstance {
         ...dataPlatformInstanceFields
     }
+    parentContainers {
+        ...parentContainersFields
+    }
     browsePathV2 {
         ...browsePathV2Fields
     }
diff --git a/datahub-web-react/src/graphql/fragments.graphql b/datahub-web-react/src/graphql/fragments.graphql
index 788c68349b4268..68c57c5cb5db55 100644
--- a/datahub-web-react/src/graphql/fragments.graphql
+++ b/datahub-web-react/src/graphql/fragments.graphql
@@ -403,6 +403,9 @@ fragment dataJobFields on DataJob {
     dataPlatformInstance {
         ...dataPlatformInstanceFields
     }
+    parentContainers {
+        ...parentContainersFields
+    }
     privileges {
         canEditLineage
     }
diff --git a/datahub-web-react/src/graphql/search.graphql b/datahub-web-react/src/graphql/search.graphql
index 58c9a51f3d7e90..72e7d347187828 100644
--- a/datahub-web-react/src/graphql/search.graphql
+++ b/datahub-web-react/src/graphql/search.graphql
@@ -128,6 +128,9 @@ fragment autoCompleteFields on Entity {
         dataPlatformInstance {
             ...dataPlatformInstanceFields
         }
+        parentContainers {
+            ...parentContainersFields
+        }
     }
     ... on DataJob {
         dataFlow {
@@ -146,6 +149,9 @@ fragment autoCompleteFields on Entity {
         dataPlatformInstance {
             ...dataPlatformInstanceFields
         }
+        parentContainers {
+            ...parentContainersFields
+        }
     }
     ... on GlossaryTerm {
         name
@@ -626,6 +632,9 @@ fragment searchResultsWithoutSchemaField on Entity {
         dataPlatformInstance {
             ...dataPlatformInstanceFields
         }
+        parentContainers {
+            ...parentContainersFields
+        }
         domain {
             ...entityDomain
         }
@@ -677,6 +686,9 @@ fragment searchResultsWithoutSchemaField on Entity {
         dataPlatformInstance {
             ...dataPlatformInstanceFields
         }
+        parentContainers {
+            ...parentContainersFields
+        }
         subTypes {
             typeNames
         }
diff --git a/docs/how/updating-datahub.md b/docs/how/updating-datahub.md
index 07577079d66d12..68b41c907c6ad6 100644
--- a/docs/how/updating-datahub.md
+++ b/docs/how/updating-datahub.md
@@ -44,6 +44,7 @@ This file documents any backwards-incompatible changes in DataHub and assists pe
 - OpenAPI Update: PIT Keep Alive parameter added to scroll. NOTE: This parameter requires the `pointInTimeCreationEnabled` feature flag to be enabled and the `elasticSearch.implementation` configuration to be `elasticsearch`. This feature is not supported for OpenSearch at this time and the parameter will not be respected without both of these set.
 - OpenAPI Update 2: Previously there was an incorrectly marked parameter named `sort` on the generic list entities endpoint for v3. This parameter is deprecated and only supports a single string value while the documentation indicates it supports a list of strings. This documentation error has been fixed and the correct field, `sortCriteria`, is now documented which supports a list of strings. 
 - #12223: For dbt Cloud ingestion, the "View in dbt" link will point at the "Explore" page in the dbt Cloud UI. You can revert to the old behavior of linking to the dbt Cloud IDE by setting `external_url_mode: ide".
+- #12236: Data flow and data job entities may additionally produce container aspect that will require a corresponding upgrade of server. Otherwise server can reject the aspect.
 
 ### Breaking Changes
 
diff --git a/metadata-models/src/main/resources/entity-registry.yml b/metadata-models/src/main/resources/entity-registry.yml
index 0193e5e2c5c6c3..1556b72e4aefb1 100644
--- a/metadata-models/src/main/resources/entity-registry.yml
+++ b/metadata-models/src/main/resources/entity-registry.yml
@@ -70,6 +70,7 @@ entities:
       - glossaryTerms
       - institutionalMemory
       - dataPlatformInstance
+      - container
       - browsePathsV2
       - structuredProperties
       - forms
@@ -93,6 +94,7 @@ entities:
       - glossaryTerms
       - institutionalMemory
       - dataPlatformInstance
+      - container
       - browsePathsV2
       - structuredProperties
       - incidentsSummary

From a92a10770ec06e67e5bc750d2319da06ebef3f15 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Fri, 10 Jan 2025 16:24:29 +0530
Subject: [PATCH 057/249] docs(ingest/glue): add permissions for glue (#12290)

---
 .../src/datahub/ingestion/source/aws/glue.py      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py b/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
index a0bed4ae9a7581..30e81643837375 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
@@ -248,6 +248,9 @@ def report_table_dropped(self, table: str) -> None:
     "Enabled by default when stateful ingestion is turned on.",
 )
 @capability(SourceCapability.LINEAGE_COARSE, "Enabled by default")
+@capability(
+    SourceCapability.LINEAGE_FINE, "Support via the `emit_s3_lineage` config field"
+)
 class GlueSource(StatefulIngestionSourceBase):
     """
     Note: if you also have files in S3 that you'd like to ingest, we recommend you use Glue's built-in data catalog. See [here](../../../../docs/generated/ingestion/sources/s3.md) for a quick guide on how to set up a crawler on Glue and ingest the outputs with DataHub.
@@ -284,12 +287,22 @@ class GlueSource(StatefulIngestionSourceBase):
         "Action": [
             "glue:GetDataflowGraph",
             "glue:GetJobs",
+            "s3:GetObject",
         ],
         "Resource": "*"
     }
     ```
 
-    plus `s3:GetObject` for the job script locations.
+    For profiling datasets, the following additional permissions are required:
+    ```json
+        {
+        "Effect": "Allow",
+        "Action": [
+            "glue:GetPartitions",
+        ],
+        "Resource": "*"
+    }
+    ```
 
     """
 

From a4f5ab4443cc669f24b60ef6b2a66bbb1117394b Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Fri, 10 Jan 2025 16:24:47 +0530
Subject: [PATCH 058/249] fix(ingest/gc): add delete limit execution request
 (#12313)

---
 .../source/gc/execution_request_cleanup.py    | 37 ++++++++++++++++---
 .../source/gc/soft_deleted_entity_cleanup.py  | 15 +++++++-
 .../bootstrap_mcps/ingestion-datahub-gc.yaml  | 19 ++++++++--
 3 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/gc/execution_request_cleanup.py b/metadata-ingestion/src/datahub/ingestion/source/gc/execution_request_cleanup.py
index f9a00d7f009058..c1763b16f3670f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/gc/execution_request_cleanup.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/gc/execution_request_cleanup.py
@@ -29,7 +29,7 @@ class DatahubExecutionRequestCleanupConfig(ConfigModel):
     )
 
     keep_history_max_days: int = Field(
-        30,
+        90,
         description="Maximum number of days to keep execution requests for, per ingestion source",
     )
 
@@ -48,6 +48,10 @@ class DatahubExecutionRequestCleanupConfig(ConfigModel):
         description="Maximum runtime in seconds for the cleanup task",
     )
 
+    limit_entities_delete: Optional[int] = Field(
+        10000, description="Max number of execution requests to hard delete."
+    )
+
     max_read_errors: int = Field(
         default=10,
         description="Maximum number of read errors before aborting",
@@ -65,6 +69,8 @@ class DatahubExecutionRequestCleanupReport(SourceReport):
     ergc_delete_errors: int = 0
     ergc_start_time: Optional[datetime.datetime] = None
     ergc_end_time: Optional[datetime.datetime] = None
+    ergc_delete_limit_reached: bool = False
+    ergc_runtime_limit_reached: bool = False
 
 
 class CleanupRecord(BaseModel):
@@ -85,12 +91,20 @@ def __init__(
         self.graph = graph
         self.report = report
         self.instance_id = int(time.time())
+        self.last_print_time = 0.0
 
         if config is not None:
             self.config = config
         else:
             self.config = DatahubExecutionRequestCleanupConfig()
 
+    def _print_report(self) -> None:
+        time_taken = round(time.time() - self.last_print_time, 1)
+        # Print report every 2 minutes
+        if time_taken > 120:
+            self.last_print_time = time.time()
+            logger.info(f"\n{self.report.as_string()}")
+
     def _to_cleanup_record(self, entry: Dict) -> CleanupRecord:
         input_aspect = (
             entry.get("aspects", {})
@@ -175,6 +189,7 @@ def _scroll_garbage_records(self):
         running_guard_timeout = now_ms - 30 * 24 * 3600 * 1000
 
         for entry in self._scroll_execution_requests():
+            self._print_report()
             self.report.ergc_records_read += 1
             key = entry.ingestion_source
 
@@ -225,15 +240,12 @@ def _scroll_garbage_records(self):
                     f"record timestamp: {entry.requested_at}."
                 )
             )
-            self.report.ergc_records_deleted += 1
             yield entry
 
     def _delete_entry(self, entry: CleanupRecord) -> None:
         try:
-            logger.info(
-                f"ergc({self.instance_id}): going to delete ExecutionRequest {entry.request_id}"
-            )
             self.graph.delete_entity(entry.urn, True)
+            self.report.ergc_records_deleted += 1
         except Exception as e:
             self.report.ergc_delete_errors += 1
             self.report.failure(
@@ -252,10 +264,23 @@ def _reached_runtime_limit(self) -> bool:
                 >= datetime.timedelta(seconds=self.config.runtime_limit_seconds)
             )
         ):
+            self.report.ergc_runtime_limit_reached = True
             logger.info(f"ergc({self.instance_id}): max runtime reached.")
             return True
         return False
 
+    def _reached_delete_limit(self) -> bool:
+        if (
+            self.config.limit_entities_delete
+            and self.report.ergc_records_deleted >= self.config.limit_entities_delete
+        ):
+            logger.info(
+                f"ergc({self.instance_id}): max delete limit reached: {self.config.limit_entities_delete}."
+            )
+            self.report.ergc_delete_limit_reached = True
+            return True
+        return False
+
     def run(self) -> None:
         if not self.config.enabled:
             logger.info(
@@ -274,7 +299,7 @@ def run(self) -> None:
         )
 
         for entry in self._scroll_garbage_records():
-            if self._reached_runtime_limit():
+            if self._reached_runtime_limit() or self._reached_delete_limit():
                 break
             self._delete_entry(entry)
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py b/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
index 0a52b7e17bf714..471eeff0224ed1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
@@ -231,6 +231,15 @@ def _process_futures(self, futures: Dict[Future, str]) -> Dict[Future, str]:
     def _get_soft_deleted(self, graphql_query: str, entity_type: str) -> Iterable[str]:
         assert self.ctx.graph
         scroll_id: Optional[str] = None
+
+        batch_size = self.config.batch_size
+        if entity_type == "DATA_PROCESS_INSTANCE":
+            # Due to a bug in Data process instance querying this is a temp workaround
+            # to avoid a giant stacktrace by having a smaller batch size in first call
+            # This will be remove in future version after server with fix has been
+            # around for a while
+            batch_size = 10
+
         while True:
             try:
                 result = self.ctx.graph.execute_graphql(
@@ -240,7 +249,7 @@ def _get_soft_deleted(self, graphql_query: str, entity_type: str) -> Iterable[st
                             "types": [entity_type],
                             "query": "*",
                             "scrollId": scroll_id if scroll_id else None,
-                            "count": self.config.batch_size,
+                            "count": batch_size,
                             "orFilters": [
                                 {
                                     "and": [
@@ -263,6 +272,10 @@ def _get_soft_deleted(self, graphql_query: str, entity_type: str) -> Iterable[st
             scroll_across_entities = result.get("scrollAcrossEntities")
             if not scroll_across_entities or not scroll_across_entities.get("count"):
                 break
+            if entity_type == "DATA_PROCESS_INSTANCE":
+                # Temp workaround. See note in beginning of the function
+                # We make the batch size = config after call has succeeded once
+                batch_size = self.config.batch_size
             scroll_id = scroll_across_entities.get("nextScrollId")
             self.report.num_queries_found += scroll_across_entities.get("count")
             for query in scroll_across_entities.get("searchResults"):
diff --git a/metadata-service/configuration/src/main/resources/bootstrap_mcps/ingestion-datahub-gc.yaml b/metadata-service/configuration/src/main/resources/bootstrap_mcps/ingestion-datahub-gc.yaml
index c0c5be85b16b1d..8879a2f6549945 100644
--- a/metadata-service/configuration/src/main/resources/bootstrap_mcps/ingestion-datahub-gc.yaml
+++ b/metadata-service/configuration/src/main/resources/bootstrap_mcps/ingestion-datahub-gc.yaml
@@ -21,19 +21,30 @@
             truncate_indices: {{truncate_indices}}{{^truncate_indices}}true{{/truncate_indices}}
             truncate_index_older_than_days: {{truncate_indices_retention_days}}{{^truncate_indices_retention_days}}30{{/truncate_indices_retention_days}}
             dataprocess_cleanup:
+              enabled: {{dataprocess_cleanup.enabled}}{{^dataprocess_cleanup.enabled}}false{{/dataprocess_cleanup.enabled}}
               retention_days: {{dataprocess_cleanup.retention_days}}{{^dataprocess_cleanup.retention_days}}10{{/dataprocess_cleanup.retention_days}}
-              delete_empty_data_jobs: {{dataprocess_cleanup.delete_empty_data_jobs}}{{^dataprocess_cleanup.delete_empty_data_jobs}}true{{/dataprocess_cleanup.delete_empty_data_jobs}}
-              delete_empty_data_flows: {{dataprocess_cleanup.delete_empty_data_flows}}{{^dataprocess_cleanup.delete_empty_data_flows}}true{{/dataprocess_cleanup.delete_empty_data_flows}}
+              delete_empty_data_jobs: {{dataprocess_cleanup.delete_empty_data_jobs}}{{^dataprocess_cleanup.delete_empty_data_jobs}}false{{/dataprocess_cleanup.delete_empty_data_jobs}}
+              delete_empty_data_flows: {{dataprocess_cleanup.delete_empty_data_flows}}{{^dataprocess_cleanup.delete_empty_data_flows}}false{{/dataprocess_cleanup.delete_empty_data_flows}}
               hard_delete_entities: {{dataprocess_cleanup.hard_delete_entities}}{{^dataprocess_cleanup.hard_delete_entities}}false{{/dataprocess_cleanup.hard_delete_entities}}
               keep_last_n: {{dataprocess_cleanup.keep_last_n}}{{^dataprocess_cleanup.keep_last_n}}5{{/dataprocess_cleanup.keep_last_n}}
+              batch_size: {{dataprocess_cleanup.batch_size}}{{^dataprocess_cleanup.batch_size}}500{{/dataprocess_cleanup.batch_size}}
+              max_workers: {{dataprocess_cleanup.max_workers}}{{^dataprocess_cleanup.max_workers}}10{{/dataprocess_cleanup.max_workers}}
             soft_deleted_entities_cleanup:
               retention_days: {{soft_deleted_entities_cleanup.retention_days}}{{^soft_deleted_entities_cleanup.retention_days}}10{{/soft_deleted_entities_cleanup.retention_days}}
+              enabled: {{soft_deleted_entities_cleanup.enabled}}{{^soft_deleted_entities_cleanup.enabled}}true{{/soft_deleted_entities_cleanup.enabled}}
+              batch_size: {{soft_deleted_entities_cleanup.batch_size}}{{^soft_deleted_entities_cleanup.batch_size}}500{{/soft_deleted_entities_cleanup.batch_size}}
+              max_workers: {{soft_deleted_entities_cleanup.max_workers}}{{^soft_deleted_entities_cleanup.max_workers}}10{{/soft_deleted_entities_cleanup.max_workers}}
+              limit_entities_delete: {{soft_deleted_entities_cleanup.limit_entities_delete}}{{^soft_deleted_entities_cleanup.limit_entities_delete}}25000{{/soft_deleted_entities_cleanup.limit_entities_delete}}
+              runtime_limit_seconds: {{soft_deleted_entities_cleanup.runtime_limit_seconds}}{{^soft_deleted_entities_cleanup.runtime_limit_seconds}}7200{{/soft_deleted_entities_cleanup.runtime_limit_seconds}}
             execution_request_cleanup:
               keep_history_min_count: {{execution_request_cleanup.keep_history_min_count}}{{^execution_request_cleanup.keep_history_min_count}}10{{/execution_request_cleanup.keep_history_min_count}}
               keep_history_max_count: {{execution_request_cleanup.keep_history_max_count}}{{^execution_request_cleanup.keep_history_max_count}}1000{{/execution_request_cleanup.keep_history_max_count}}
-              keep_history_max_days: {{execution_request_cleanup.keep_history_max_days}}{{^execution_request_cleanup.keep_history_max_days}}30{{/execution_request_cleanup.keep_history_max_days}}
+              keep_history_max_days: {{execution_request_cleanup.keep_history_max_days}}{{^execution_request_cleanup.keep_history_max_days}}90{{/execution_request_cleanup.keep_history_max_days}}
               batch_read_size: {{execution_request_cleanup.batch_read_size}}{{^execution_request_cleanup.batch_read_size}}100{{/execution_request_cleanup.batch_read_size}}
-              enabled: {{execution_request_cleanup.enabled}}{{^execution_request_cleanup.enabled}}false{{/execution_request_cleanup.enabled}}
+              enabled: {{execution_request_cleanup.enabled}}{{^execution_request_cleanup.enabled}}true{{/execution_request_cleanup.enabled}}
+              runtime_limit_seconds: {{execution_request_cleanup.runtime_limit_seconds}}{{^execution_request_cleanup.runtime_limit_seconds}}3600{{/execution_request_cleanup.runtime_limit_seconds}}
+              limit_entities_delete: {{execution_request_cleanup.limit_entities_delete}}{{^execution_request_cleanup.limit_entities_delete}}10000{{/execution_request_cleanup.limit_entities_delete}}
+              max_read_errors: {{execution_request_cleanup.max_read_errors}}{{^execution_request_cleanup.max_read_errors}}10{{/execution_request_cleanup.max_read_errors}}
       extraArgs: {}
       debugMode: false
       executorId: default

From c6bb65fc8d3cbd10e52e2f64ee808fa6e0265360 Mon Sep 17 00:00:00 2001
From: pankajmahato-visa <154867659+pankajmahato-visa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 20:46:45 +0530
Subject: [PATCH 059/249] chore(deps): Migrate CVE-2024-52046 with severity >=
 9 (severity = 9.3) vulnerability of org.apache.mina:mina-core:2.2.3 (#12305)

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index 5b6613d3057f3e..284092e2b14f49 100644
--- a/build.gradle
+++ b/build.gradle
@@ -379,6 +379,7 @@ configure(subprojects.findAll {! it.name.startsWith('spark-lineage')}) {
 
     resolutionStrategy.force externalDependency.antlr4Runtime
     resolutionStrategy.force externalDependency.antlr4
+    resolutionStrategy.force 'org.apache.mina:mina-core:2.2.4'
   }
 }
 

From 208447d20e74e35b6cd6a755ead64a4a11a1f6c6 Mon Sep 17 00:00:00 2001
From: Chakru <161002324+chakru-r@users.noreply.github.com>
Date: Fri, 10 Jan 2025 22:27:10 +0530
Subject: [PATCH 060/249] fix(ci): fix artifact upload name (#12319)

---
 .github/workflows/build-and-test.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 9a940ef8040d17..86545946d6afea 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -118,10 +118,12 @@ jobs:
         run: |
           echo "BACKEND_FILES=`find ./build/coverage-reports/ -type f | grep -E '(metadata-models|entity-registry|datahuyb-graphql-core|metadata-io|metadata-jobs|metadata-utils|metadata-service|medata-dao-impl|metadata-operation|li-utils|metadata-integration|metadata-events|metadata-auth|ingestion-scheduler|notifications|datahub-upgrade)' | xargs | sed 's/ /,/g'`" >> $GITHUB_ENV
           echo "FRONTEND_FILES=`find ./build/coverage-reports/ -type f | grep -E '(datahub-frontend|datahub-web-react).*\.(xml|json)$' | xargs | sed 's/ /,/g'`" >> $GITHUB_ENV
+      - name: Generate tz artifact name
+        run: echo "NAME_TZ=$(echo ${{ matrix.timezone }} | tr '/' '-')" >> $GITHUB_ENV
       - uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: Test Results (build) - ${{ matrix.command}}-${{ matrix.timezone }}
+          name: Test Results (build) - ${{ matrix.command}}-${{ env.NAME_TZ }}
           path: |
             **/build/reports/tests/test/**
             **/build/test-results/test/**

From 5f63f3fba96aeab06767cde495d709ef2e5ed5a5 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Fri, 10 Jan 2025 09:45:31 -0800
Subject: [PATCH 061/249] feat(sdk): support urns in other urn constructors
 (#12311)

---
 metadata-ingestion/scripts/avro_codegen.py    | 38 ++++++++++++-------
 .../tests/unit/urns/test_urn.py               | 22 ++++++++++-
 2 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/metadata-ingestion/scripts/avro_codegen.py b/metadata-ingestion/scripts/avro_codegen.py
index 2841985ad07808..0fe79a2c6a8e47 100644
--- a/metadata-ingestion/scripts/avro_codegen.py
+++ b/metadata-ingestion/scripts/avro_codegen.py
@@ -346,7 +346,7 @@ def write_urn_classes(key_aspects: List[dict], urn_dir: Path) -> None:
     code = """
 # This file contains classes corresponding to entity URNs.
 
-from typing import ClassVar, List, Optional, Type, TYPE_CHECKING
+from typing import ClassVar, List, Optional, Type, TYPE_CHECKING, Union
 
 import functools
 from deprecated.sphinx import deprecated as _sphinx_deprecated
@@ -547,10 +547,31 @@ def generate_urn_class(entity_type: str, key_aspect: dict) -> str:
         assert fields[0]["type"] == ["null", "string"]
         fields[0]["type"] = "string"
 
+    field_urn_type_classes = {}
+    for field in fields:
+        # Figure out if urn types are valid for each field.
+        field_urn_type_class = None
+        if field_name(field) == "platform":
+            field_urn_type_class = "DataPlatformUrn"
+        elif field.get("Urn"):
+            if len(field.get("entityTypes", [])) == 1:
+                field_entity_type = field["entityTypes"][0]
+                field_urn_type_class = f"{capitalize_entity_name(field_entity_type)}Urn"
+            else:
+                field_urn_type_class = "Urn"
+
+        field_urn_type_classes[field_name(field)] = field_urn_type_class
+
     _init_arg_parts: List[str] = []
     for field in fields:
+        field_urn_type_class = field_urn_type_classes[field_name(field)]
+
         default = '"PROD"' if field_name(field) == "env" else None
-        _arg_part = f"{field_name(field)}: {field_type(field)}"
+
+        type_hint = field_type(field)
+        if field_urn_type_class:
+            type_hint = f'Union["{field_urn_type_class}", str]'
+        _arg_part = f"{field_name(field)}: {type_hint}"
         if default:
             _arg_part += f" = {default}"
         _init_arg_parts.append(_arg_part)
@@ -579,16 +600,7 @@ def generate_urn_class(entity_type: str, key_aspect: dict) -> str:
         init_validation += f'if not {field_name(field)}:\n    raise InvalidUrnError("{class_name} {field_name(field)} cannot be empty")\n'
 
         # Generalized mechanism for validating embedded urns.
-        field_urn_type_class = None
-        if field_name(field) == "platform":
-            field_urn_type_class = "DataPlatformUrn"
-        elif field.get("Urn"):
-            if len(field.get("entityTypes", [])) == 1:
-                field_entity_type = field["entityTypes"][0]
-                field_urn_type_class = f"{capitalize_entity_name(field_entity_type)}Urn"
-            else:
-                field_urn_type_class = "Urn"
-
+        field_urn_type_class = field_urn_type_classes[field_name(field)]
         if field_urn_type_class:
             init_validation += f"{field_name(field)} = str({field_name(field)})\n"
             init_validation += (
@@ -608,7 +620,7 @@ def generate_urn_class(entity_type: str, key_aspect: dict) -> str:
             init_coercion += "    platform_name = DataPlatformUrn.from_string(platform_name).platform_name\n"
 
         if field_name(field) == "platform":
-            init_coercion += "platform = DataPlatformUrn(platform).urn()\n"
+            init_coercion += "platform = platform.urn() if isinstance(platform, DataPlatformUrn) else DataPlatformUrn(platform).urn()\n"
         elif field_urn_type_class is None:
             # For all non-urns, run the value through the UrnEncoder.
             init_coercion += (
diff --git a/metadata-ingestion/tests/unit/urns/test_urn.py b/metadata-ingestion/tests/unit/urns/test_urn.py
index 0c362473c0cf18..bee80ec33148e9 100644
--- a/metadata-ingestion/tests/unit/urns/test_urn.py
+++ b/metadata-ingestion/tests/unit/urns/test_urn.py
@@ -4,7 +4,13 @@
 
 import pytest
 
-from datahub.metadata.urns import CorpUserUrn, DatasetUrn, Urn
+from datahub.metadata.urns import (
+    CorpUserUrn,
+    DataPlatformUrn,
+    DatasetUrn,
+    SchemaFieldUrn,
+    Urn,
+)
 from datahub.utilities.urns.error import InvalidUrnError
 
 pytestmark = pytest.mark.filterwarnings("ignore::DeprecationWarning")
@@ -60,6 +66,20 @@ def test_urn_coercion() -> None:
     assert urn == Urn.from_string(urn.urn())
 
 
+def test_urns_in_init() -> None:
+    platform = DataPlatformUrn("abc")
+    assert platform.urn() == "urn:li:dataPlatform:abc"
+
+    dataset_urn = DatasetUrn(platform, "def", "PROD")
+    assert dataset_urn.urn() == "urn:li:dataset:(urn:li:dataPlatform:abc,def,PROD)"
+
+    schema_field = SchemaFieldUrn(dataset_urn, "foo")
+    assert (
+        schema_field.urn()
+        == "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:abc,def,PROD),foo)"
+    )
+
+
 def test_urn_type_dispatch_1() -> None:
     urn = Urn.from_string("urn:li:dataset:(urn:li:dataPlatform:abc,def,PROD)")
     assert isinstance(urn, DatasetUrn)

From cf35dcca4f2e0b43c215f421aef6a17dbbf186e4 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Fri, 10 Jan 2025 09:49:23 -0800
Subject: [PATCH 062/249] fix(ingest): improve error reporting in `emit_all`
 (#12309)

---
 metadata-ingestion/src/datahub/ingestion/graph/client.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/graph/client.py b/metadata-ingestion/src/datahub/ingestion/graph/client.py
index 7de6e8130a7ab6..8c5f894a072d93 100644
--- a/metadata-ingestion/src/datahub/ingestion/graph/client.py
+++ b/metadata-ingestion/src/datahub/ingestion/graph/client.py
@@ -248,9 +248,11 @@ def make_rest_sink(
         with DatahubRestSink(PipelineContext(run_id=run_id), sink_config) as sink:
             yield sink
         if sink.report.failures:
+            logger.error(
+                f"Failed to emit {len(sink.report.failures)} records\n{sink.report.as_string()}"
+            )
             raise OperationalError(
-                f"Failed to emit {len(sink.report.failures)} records",
-                info=sink.report.as_obj(),
+                f"Failed to emit {len(sink.report.failures)} records"
             )
 
     def emit_all(

From a6cd995df62b304f69853350214da004422a0fbb Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Fri, 10 Jan 2025 10:35:13 -0800
Subject: [PATCH 063/249] docs(ingest): refactor docgen process (#12300)

---
 docs-website/README.md                        |  24 +-
 docs-website/generateDocsDir.ts               |  37 +
 ...tadata-file_recipe.yml => file_recipe.yml} |   0
 .../powerbi-report-server_pre.md              |  16 +
 .../powerbi-report-server_recipe.yml          |   0
 .../powerbi/powerbi-report-server_pre.md      |  13 -
 metadata-ingestion/scripts/docgen.py          | 908 +++++-------------
 metadata-ingestion/scripts/docgen_types.py    |  45 +
 .../scripts/docs_config_table.py              | 376 ++++++++
 .../powerbi_report_server/report_server.py    |   2 +-
 10 files changed, 748 insertions(+), 673 deletions(-)
 rename metadata-ingestion/docs/sources/metadata-file/{metadata-file_recipe.yml => file_recipe.yml} (100%)
 create mode 100644 metadata-ingestion/docs/sources/powerbi-report-server/powerbi-report-server_pre.md
 rename metadata-ingestion/docs/sources/{powerbi => powerbi-report-server}/powerbi-report-server_recipe.yml (100%)
 delete mode 100644 metadata-ingestion/docs/sources/powerbi/powerbi-report-server_pre.md
 create mode 100644 metadata-ingestion/scripts/docgen_types.py
 create mode 100644 metadata-ingestion/scripts/docs_config_table.py

diff --git a/docs-website/README.md b/docs-website/README.md
index 3b24cb869a444d..b40e4636422781 100644
--- a/docs-website/README.md
+++ b/docs-website/README.md
@@ -130,7 +130,6 @@ The purpose of this section is to provide developers & technical users with conc
 
 This section aims to provide plain-language feature overviews for both technical and non-technical readers alike.
 
-
 ## Docs Generation Features
 
 **Includes all markdown files**
@@ -145,16 +144,33 @@ You can suppress this check by adding the path to the file in a comment in `side
 
 Use an "inline" directive to include code snippets from other files. The `show_path_as_comment` option will include the path to the file as a comment at the top of the snippet.
 
-  ```python
-  {{ inline /metadata-ingestion/examples/library/data_quality_mcpw_rest.py show_path_as_comment }}
-  ```
+    ```python
+    {{ inline /metadata-ingestion/examples/library/data_quality_mcpw_rest.py show_path_as_comment }}
+    ```
+
+**Command Output**
+
+Use the `{{ command-output cmd }}` directive to run subprocesses and inject the outputs into the final markdown.
+
+    {{ command-output python -c 'print("Hello world")' }}
 
+This also works for multi-line scripts.
+
+    {{ command-output
+    source metadata-ingestion/venv/bin/activate
+    python -m <something>
+    }}
+
+Regardless of the location of the markdown file, the subcommands will be executed with working directory set to the repo root.
+
+Only the stdout of the subprocess will be outputted. The stderr, if any, will be included as a comment in the markdown.
 
 ## Docs site generation process
 
 This process is orchestrated by a combination of Gradle and Yarn tasks. The main entrypoint is via the `docs-website:yarnGenerate` task, which in turn eventually runs `yarn run generate`.
 
 Steps:
+
 1. Generate the GraphQL combined schema using the gradle's `docs-website:generateGraphQLSchema` task. This generates `./graphql/combined.graphql`.
 2. Generate docs for ingestion sources using the `:metadata-ingestion:docGen` gradle task.
 3. Generate docs for our metadata model using the `:metadata-ingestion:modelDocGen` gradle task.
diff --git a/docs-website/generateDocsDir.ts b/docs-website/generateDocsDir.ts
index ad82a85f9e5672..3a14baee073c2a 100644
--- a/docs-website/generateDocsDir.ts
+++ b/docs-website/generateDocsDir.ts
@@ -439,6 +439,42 @@ function markdown_process_inline_directives(
   contents.content = new_content;
 }
 
+function markdown_process_command_output(
+  contents: matter.GrayMatterFile<string>,
+  filepath: string
+): void {
+  const new_content = contents.content.replace(
+    /^{{\s*command-output\s*([\s\S]*?)\s*}}$/gm,
+    (_, command: string) => {
+      try {
+        // Change to repo root directory before executing command
+        const repoRoot = path.resolve(__dirname, "..");
+
+        console.log(`Executing command: ${command}`);
+
+        // Execute the command and capture output
+        const output = execSync(command, {
+          cwd: repoRoot,
+          encoding: "utf8",
+          stdio: ["pipe", "pipe", "pipe"],
+        });
+
+        // Return the command output
+        return output.trim();
+      } catch (error: any) {
+        // If there's an error, include it as a comment
+        const errorMessage = error.stderr
+          ? error.stderr.toString()
+          : error.message;
+        return `${
+          error.stdout ? error.stdout.toString().trim() : ""
+        }\n<!-- Error: ${errorMessage.trim()} -->`;
+      }
+    }
+  );
+  contents.content = new_content;
+}
+
 function markdown_sanitize_and_linkify(content: string): string {
   // MDX escaping
   content = content.replace(/</g, "&lt;");
@@ -602,6 +638,7 @@ function copy_python_wheels(): void {
     markdown_rewrite_urls(contents, filepath);
     markdown_enable_specials(contents, filepath);
     markdown_process_inline_directives(contents, filepath);
+    markdown_process_command_output(contents, filepath);
     //copy_platform_logos();
     // console.log(contents);
 
diff --git a/metadata-ingestion/docs/sources/metadata-file/metadata-file_recipe.yml b/metadata-ingestion/docs/sources/metadata-file/file_recipe.yml
similarity index 100%
rename from metadata-ingestion/docs/sources/metadata-file/metadata-file_recipe.yml
rename to metadata-ingestion/docs/sources/metadata-file/file_recipe.yml
diff --git a/metadata-ingestion/docs/sources/powerbi-report-server/powerbi-report-server_pre.md b/metadata-ingestion/docs/sources/powerbi-report-server/powerbi-report-server_pre.md
new file mode 100644
index 00000000000000..ae9812b2a48ad3
--- /dev/null
+++ b/metadata-ingestion/docs/sources/powerbi-report-server/powerbi-report-server_pre.md
@@ -0,0 +1,16 @@
+### Configuration Notes
+
+See the
+
+1. [Microsoft Grant user access to a Report Server doc](https://docs.microsoft.com/en-us/sql/reporting-services/security/grant-user-access-to-a-report-server?view=sql-server-ver16)
+2. Use your user credentials from previous step in yaml file
+
+### Concept mapping
+
+| Power BI Report Server | Datahub     |
+| ---------------------- | ----------- |
+| `Paginated Report`     | `Dashboard` |
+| `Power BI Report`      | `Dashboard` |
+| `Mobile Report`        | `Dashboard` |
+| `Linked Report`        | `Dashboard` |
+| `Dataset, Datasource`  | `N/A`       |
diff --git a/metadata-ingestion/docs/sources/powerbi/powerbi-report-server_recipe.yml b/metadata-ingestion/docs/sources/powerbi-report-server/powerbi-report-server_recipe.yml
similarity index 100%
rename from metadata-ingestion/docs/sources/powerbi/powerbi-report-server_recipe.yml
rename to metadata-ingestion/docs/sources/powerbi-report-server/powerbi-report-server_recipe.yml
diff --git a/metadata-ingestion/docs/sources/powerbi/powerbi-report-server_pre.md b/metadata-ingestion/docs/sources/powerbi/powerbi-report-server_pre.md
deleted file mode 100644
index ca600f10786758..00000000000000
--- a/metadata-ingestion/docs/sources/powerbi/powerbi-report-server_pre.md
+++ /dev/null
@@ -1,13 +0,0 @@
-## Configuration Notes
-See the 
-1. [Microsoft Grant user access to a Report Server doc](https://docs.microsoft.com/en-us/sql/reporting-services/security/grant-user-access-to-a-report-server?view=sql-server-ver16)
-2. Use your user credentials from previous step in yaml file
-## Concept mapping 
-
-| Power BI Report Server    | Datahub             |                                                                                               
-| ------------------------- | ------------------- |
-| `Paginated Report`        | `Dashboard`         |
-| `Power BI Report`         | `Dashboard`         |
-| `Mobile Report`           | `Dashboard`         |
-| `Linked Report`           | `Dashboard`         |
-| `Dataset, Datasource`     | `N/A`               |
diff --git a/metadata-ingestion/scripts/docgen.py b/metadata-ingestion/scripts/docgen.py
index 402cd8a8141990..71eef96f5b9262 100644
--- a/metadata-ingestion/scripts/docgen.py
+++ b/metadata-ingestion/scripts/docgen.py
@@ -1,381 +1,25 @@
+import dataclasses
 import glob
-import html
 import json
 import logging
 import os
+import pathlib
 import re
 import sys
 import textwrap
 from importlib.metadata import metadata, requires
-from typing import Any, Dict, Iterable, List, Optional
+from typing import Dict, List, Optional
 
 import click
-from pydantic import BaseModel, Field
+from docgen_types import Platform, Plugin
+from docs_config_table import gen_md_table_from_json_schema
 
 from datahub.configuration.common import ConfigModel
-from datahub.ingestion.api.decorators import (
-    CapabilitySetting,
-    SourceCapability,
-    SupportStatus,
-)
+from datahub.ingestion.api.decorators import SourceCapability, SupportStatus
 from datahub.ingestion.source.source_registry import source_registry
-from datahub.metadata.schema_classes import SchemaFieldClass
 
 logger = logging.getLogger(__name__)
 
-DEFAULT_VALUE_MAX_LENGTH = 50
-DEFAULT_VALUE_TRUNCATION_MESSAGE = "..."
-
-
-def _truncate_default_value(value: str) -> str:
-    if len(value) > DEFAULT_VALUE_MAX_LENGTH:
-        return value[:DEFAULT_VALUE_MAX_LENGTH] + DEFAULT_VALUE_TRUNCATION_MESSAGE
-    return value
-
-
-def _format_path_component(path: str) -> str:
-    """
-    Given a path like 'a.b.c', adds css tags to the components.
-    """
-    path_components = path.rsplit(".", maxsplit=1)
-    if len(path_components) == 1:
-        return f'<span className="path-main">{path_components[0]}</span>'
-
-    return (
-        f'<span className="path-prefix">{path_components[0]}.</span>'
-        f'<span className="path-main">{path_components[1]}</span>'
-    )
-
-
-def _format_type_name(type_name: str) -> str:
-    return f'<span className="type-name">{type_name}</span>'
-
-
-def _format_default_line(default_value: str, has_desc_above: bool) -> str:
-    default_value = _truncate_default_value(default_value)
-    escaped_value = (
-        html.escape(default_value)
-        # Replace curly braces to avoid JSX issues.
-        .replace("{", "&#123;")
-        .replace("}", "&#125;")
-        # We also need to replace markdown special characters.
-        .replace("*", "&#42;")
-        .replace("_", "&#95;")
-        .replace("[", "&#91;")
-        .replace("]", "&#93;")
-        .replace("|", "&#124;")
-        .replace("`", "&#96;")
-    )
-    value_elem = f'<span className="default-value">{escaped_value}</span>'
-    return f'<div className="default-line {"default-line-with-docs" if has_desc_above else ""}">Default: {value_elem}</div>'
-
-
-class FieldRow(BaseModel):
-    path: str
-    parent: Optional[str]
-    type_name: str
-    required: bool
-    has_default: bool
-    default: str
-    description: str
-    inner_fields: List["FieldRow"] = Field(default_factory=list)
-    discriminated_type: Optional[str] = None
-
-    class Component(BaseModel):
-        type: str
-        field_name: Optional[str]
-
-    # matches any [...] style section inside a field path
-    _V2_FIELD_PATH_TOKEN_MATCHER = r"\[[\w.]*[=]*[\w\(\-\ \_\).]*\][\.]*"
-    # matches a .?[...] style section inside a field path anchored to the beginning
-    _V2_FIELD_PATH_TOKEN_MATCHER_PREFIX = rf"^[\.]*{_V2_FIELD_PATH_TOKEN_MATCHER}"
-    _V2_FIELD_PATH_FIELD_NAME_MATCHER = r"^\w+"
-
-    @staticmethod
-    def map_field_path_to_components(field_path: str) -> List[Component]:
-        m = re.match(FieldRow._V2_FIELD_PATH_TOKEN_MATCHER_PREFIX, field_path)
-        v = re.match(FieldRow._V2_FIELD_PATH_FIELD_NAME_MATCHER, field_path)
-        components: List[FieldRow.Component] = []
-        while m or v:
-            token = m.group() if m else v.group()  # type: ignore
-            if v:
-                if components:
-                    if components[-1].field_name is None:
-                        components[-1].field_name = token
-                    else:
-                        components.append(
-                            FieldRow.Component(type="non_map_type", field_name=token)
-                        )
-                else:
-                    components.append(
-                        FieldRow.Component(type="non_map_type", field_name=token)
-                    )
-
-            if m:
-                if token.startswith("[version="):
-                    pass
-                elif "[type=" in token:
-                    type_match = re.match(r"[\.]*\[type=(.*)\]", token)
-                    if type_match:
-                        type_string = type_match.group(1)
-                        if components and components[-1].type == "map":
-                            if components[-1].field_name is None:
-                                pass
-                            else:
-                                new_component = FieldRow.Component(
-                                    type="map_key", field_name="`key`"
-                                )
-                                components.append(new_component)
-                                new_component = FieldRow.Component(
-                                    type=type_string, field_name=None
-                                )
-                                components.append(new_component)
-                        if type_string == "map":
-                            new_component = FieldRow.Component(
-                                type=type_string, field_name=None
-                            )
-                            components.append(new_component)
-
-            field_path = field_path[m.span()[1] :] if m else field_path[v.span()[1] :]  # type: ignore
-            m = re.match(FieldRow._V2_FIELD_PATH_TOKEN_MATCHER_PREFIX, field_path)
-            v = re.match(FieldRow._V2_FIELD_PATH_FIELD_NAME_MATCHER, field_path)
-
-        return components
-
-    @staticmethod
-    def field_path_to_components(field_path: str) -> List[str]:
-        """
-        Inverts the field_path v2 format to get the canonical field path
-        [version=2.0].[type=x].foo.[type=string(format=uri)].bar => ["foo","bar"]
-        """
-        if "type=map" not in field_path:
-            return re.sub(FieldRow._V2_FIELD_PATH_TOKEN_MATCHER, "", field_path).split(
-                "."
-            )
-        else:
-            # fields with maps in them need special handling to insert the `key` fragment
-            return [
-                c.field_name
-                for c in FieldRow.map_field_path_to_components(field_path)
-                if c.field_name
-            ]
-
-    @classmethod
-    def from_schema_field(cls, schema_field: SchemaFieldClass) -> "FieldRow":
-        path_components = FieldRow.field_path_to_components(schema_field.fieldPath)
-
-        parent = path_components[-2] if len(path_components) >= 2 else None
-        if parent == "`key`":
-            # the real parent node is one index above
-            parent = path_components[-3]
-        json_props = (
-            json.loads(schema_field.jsonProps) if schema_field.jsonProps else {}
-        )
-
-        required = json_props.get("required", True)
-        has_default = "default" in json_props
-        default_value = str(json_props.get("default"))
-
-        field_path = ".".join(path_components)
-
-        return FieldRow(
-            path=field_path,
-            parent=parent,
-            type_name=str(schema_field.nativeDataType),
-            required=required,
-            has_default=has_default,
-            default=default_value,
-            description=schema_field.description,
-            inner_fields=[],
-            discriminated_type=schema_field.nativeDataType,
-        )
-
-    def get_checkbox(self) -> str:
-        if self.required and not self.has_default:
-            # Using a non-breaking space to prevent the checkbox from being
-            # broken into a new line.
-            if not self.parent:  # None and empty string both count
-                return '&nbsp;<abbr title="Required">✅</abbr>'
-            else:
-                return f'&nbsp;<abbr title="Required if {self.parent} is set">❓</abbr>'
-        else:
-            return ""
-
-    def to_md_line(self) -> str:
-        if self.inner_fields:
-            if len(self.inner_fields) == 1:
-                type_name = self.inner_fields[0].type_name or self.type_name
-            else:
-                # To deal with unions that have essentially the same simple field path,
-                # we combine the type names into a single string.
-                type_name = "One of " + ", ".join(
-                    [x.type_name for x in self.inner_fields if x.discriminated_type]
-                )
-        else:
-            type_name = self.type_name
-
-        description = self.description.strip()
-        description = self.description.replace(
-            "\n", " <br /> "
-        )  # descriptions with newlines in them break markdown rendering
-
-        md_line = (
-            f'| <div className="path-line">{_format_path_component(self.path)}'
-            f"{self.get_checkbox()}</div>"
-            f' <div className="type-name-line">{_format_type_name(type_name)}</div> '
-            f"| {description} "
-            f"{_format_default_line(self.default, bool(description)) if self.has_default else ''} |\n"
-        )
-        return md_line
-
-
-class FieldHeader(FieldRow):
-    def to_md_line(self) -> str:
-        return "\n".join(
-            [
-                "| Field | Description |",
-                "|:--- |:--- |",
-                "",
-            ]
-        )
-
-    def __init__(self):
-        pass
-
-
-def get_prefixed_name(field_prefix: Optional[str], field_name: Optional[str]) -> str:
-    assert (
-        field_prefix or field_name
-    ), "One of field_prefix or field_name should be present"
-    return (
-        f"{field_prefix}.{field_name}"  # type: ignore
-        if field_prefix and field_name
-        else field_name
-        if not field_prefix
-        else field_prefix
-    )
-
-
-def custom_comparator(path: str) -> str:
-    """
-    Projects a string onto a separate space
-    Low_prio string will start with Z else start with A
-    Number of field paths will add the second set of letters: 00 - 99
-
-    """
-    opt1 = path
-    prio_value = priority_value(opt1)
-    projection = f"{prio_value}"
-    projection = f"{projection}{opt1}"
-    return projection
-
-
-class FieldTree:
-    """
-    A helper class that re-constructs the tree hierarchy of schema fields
-    to help sort fields by importance while keeping nesting intact
-    """
-
-    def __init__(self, field: Optional[FieldRow] = None):
-        self.field = field
-        self.fields: Dict[str, "FieldTree"] = {}
-
-    def add_field(self, row: FieldRow, path: Optional[str] = None) -> "FieldTree":
-        # logger.warn(f"Add field: path:{path}, row:{row}")
-        if self.field and self.field.path == row.path:
-            # we have an incoming field with the same path as us, this is probably a union variant
-            # attach to existing field
-            self.field.inner_fields.append(row)
-        else:
-            path = path if path is not None else row.path
-            top_level_field = path.split(".")[0]
-            if top_level_field in self.fields:
-                self.fields[top_level_field].add_field(
-                    row, ".".join(path.split(".")[1:])
-                )
-            else:
-                self.fields[top_level_field] = FieldTree(field=row)
-        # logger.warn(f"{self}")
-        return self
-
-    def sort(self):
-        # Required fields before optionals
-        required_fields = {
-            k: v for k, v in self.fields.items() if v.field and v.field.required
-        }
-        optional_fields = {
-            k: v for k, v in self.fields.items() if v.field and not v.field.required
-        }
-
-        self.sorted_fields = []
-        for field_map in [required_fields, optional_fields]:
-            # Top-level fields before fields with nesting
-            self.sorted_fields.extend(
-                sorted(
-                    [f for f, val in field_map.items() if val.fields == {}],
-                    key=custom_comparator,
-                )
-            )
-            self.sorted_fields.extend(
-                sorted(
-                    [f for f, val in field_map.items() if val.fields != {}],
-                    key=custom_comparator,
-                )
-            )
-
-        for field_tree in self.fields.values():
-            field_tree.sort()
-
-    def get_fields(self) -> Iterable[FieldRow]:
-        if self.field:
-            yield self.field
-        for key in self.sorted_fields:
-            yield from self.fields[key].get_fields()
-
-    def __repr__(self) -> str:
-        result = {}
-        if self.field:
-            result["_self"] = json.loads(json.dumps(self.field.dict()))
-        for f in self.fields:
-            result[f] = json.loads(str(self.fields[f]))
-        return json.dumps(result, indent=2)
-
-
-def priority_value(path: str) -> str:
-    # A map of low value tokens to their relative importance
-    low_value_token_map = {"env": "X", "profiling": "Y", "stateful_ingestion": "Z"}
-    tokens = path.split(".")
-    for low_value_token in low_value_token_map:
-        if low_value_token in tokens:
-            return low_value_token_map[low_value_token]
-
-    # everything else high-prio
-    return "A"
-
-
-def gen_md_table_from_struct(schema_dict: Dict[str, Any]) -> List[str]:
-    from datahub.ingestion.extractor.json_schema_util import JsonSchemaTranslator
-
-    # we don't want default field values to be injected into the description of the field
-    JsonSchemaTranslator._INJECT_DEFAULTS_INTO_DESCRIPTION = False
-    schema_fields = list(JsonSchemaTranslator.get_fields_from_schema(schema_dict))
-    result: List[str] = [FieldHeader().to_md_line()]
-
-    field_tree = FieldTree(field=None)
-    for field in schema_fields:
-        row: FieldRow = FieldRow.from_schema_field(field)
-        field_tree.add_field(row)
-
-    field_tree.sort()
-
-    for row in field_tree.get_fields():
-        result.append(row.to_md_line())
-
-    # Wrap with a .config-table div.
-    result = ["\n<div className='config-table'>\n\n", *result, "\n</div>\n"]
-
-    return result
-
 
 def get_snippet(long_string: str, max_length: int = 100) -> str:
     snippet = ""
@@ -424,19 +68,6 @@ def get_capability_text(src_capability: SourceCapability) -> str:
     )
 
 
-def create_or_update(
-    something: Dict[Any, Any], path: List[str], value: Any
-) -> Dict[Any, Any]:
-    dict_under_operation = something
-    for p in path[:-1]:
-        if p not in dict_under_operation:
-            dict_under_operation[p] = {}
-        dict_under_operation = dict_under_operation[p]
-
-    dict_under_operation[path[-1]] = value
-    return something
-
-
 def does_extra_exist(extra_name: str) -> bool:
     for key, value in metadata("acryl-datahub").items():
         if key == "Provides-Extra" and value == extra_name:
@@ -498,6 +129,102 @@ def new_url(original_url: str, file_path: str) -> str:
     return new_content
 
 
+def load_plugin(plugin_name: str, out_dir: str) -> Plugin:
+    logger.debug(f"Loading {plugin_name}")
+    class_or_exception = source_registry._ensure_not_lazy(plugin_name)
+    if isinstance(class_or_exception, Exception):
+        raise class_or_exception
+    source_type = source_registry.get(plugin_name)
+    logger.debug(f"Source class is {source_type}")
+
+    if hasattr(source_type, "get_platform_name"):
+        platform_name = source_type.get_platform_name()
+    else:
+        platform_name = (
+            plugin_name.title()
+        )  # we like platform names to be human readable
+
+    platform_id = None
+    if hasattr(source_type, "get_platform_id"):
+        platform_id = source_type.get_platform_id()
+    if platform_id is None:
+        raise ValueError(f"Platform ID not found for {plugin_name}")
+
+    plugin = Plugin(
+        name=plugin_name,
+        platform_id=platform_id,
+        platform_name=platform_name,
+        classname=".".join([source_type.__module__, source_type.__name__]),
+    )
+
+    if hasattr(source_type, "get_platform_doc_order"):
+        platform_doc_order = source_type.get_platform_doc_order()
+        plugin.doc_order = platform_doc_order
+
+    plugin_file_name = "src/" + "/".join(source_type.__module__.split("."))
+    if os.path.exists(plugin_file_name) and os.path.isdir(plugin_file_name):
+        plugin_file_name = plugin_file_name + "/__init__.py"
+    else:
+        plugin_file_name = plugin_file_name + ".py"
+    if os.path.exists(plugin_file_name):
+        plugin.filename = plugin_file_name
+    else:
+        logger.info(
+            f"Failed to locate filename for {plugin_name}. Guessed {plugin_file_name}, but that doesn't exist"
+        )
+
+    if hasattr(source_type, "__doc__"):
+        plugin.source_docstring = textwrap.dedent(source_type.__doc__ or "")
+
+    if hasattr(source_type, "get_support_status"):
+        plugin.support_status = source_type.get_support_status()
+
+    if hasattr(source_type, "get_capabilities"):
+        capabilities = list(source_type.get_capabilities())
+        capabilities.sort(key=lambda x: x.capability.value)
+        plugin.capabilities = capabilities
+
+    try:
+        extra_plugin = plugin_name if does_extra_exist(plugin_name) else None
+        plugin.extra_deps = (
+            get_additional_deps_for_extra(extra_plugin) if extra_plugin else []
+        )
+    except Exception as e:
+        logger.info(
+            f"Failed to load extras for {plugin_name} due to exception {e}", exc_info=e
+        )
+
+    if hasattr(source_type, "get_config_class"):
+        source_config_class: ConfigModel = source_type.get_config_class()
+
+        plugin.config_json_schema = source_config_class.schema_json(indent=2)
+        plugin.config_md = gen_md_table_from_json_schema(source_config_class.schema())
+
+        # Write the config json schema to the out_dir.
+        config_dir = pathlib.Path(out_dir) / "config_schemas"
+        config_dir.mkdir(parents=True, exist_ok=True)
+        (config_dir / f"{plugin_name}_config.json").write_text(
+            plugin.config_json_schema
+        )
+
+    return plugin
+
+
+@dataclasses.dataclass
+class PluginMetrics:
+    discovered: int = 0
+    loaded: int = 0
+    generated: int = 0
+    failed: int = 0
+
+
+@dataclasses.dataclass
+class PlatformMetrics:
+    discovered: int = 0
+    generated: int = 0
+    warnings: List[str] = dataclasses.field(default_factory=list)
+
+
 @click.command()
 @click.option("--out-dir", type=str, required=True)
 @click.option("--extra-docs", type=str, required=False)
@@ -505,239 +232,111 @@ def new_url(original_url: str, file_path: str) -> str:
 def generate(
     out_dir: str, extra_docs: Optional[str] = None, source: Optional[str] = None
 ) -> None:  # noqa: C901
-    source_documentation: Dict[str, Any] = {}
-    metrics = {}
-    metrics["source_platforms"] = {"discovered": 0, "generated": 0, "warnings": []}
-    metrics["plugins"] = {"discovered": 0, "generated": 0, "failed": 0}
-
-    if extra_docs:
-        for path in glob.glob(f"{extra_docs}/**/*[.md|.yaml|.yml]", recursive=True):
-            m = re.search("/docs/sources/(.*)/(.*).md", path)
-            if m:
-                platform_name = m.group(1).lower()
-                file_name = m.group(2)
-                destination_md: str = (
-                    f"../docs/generated/ingestion/sources/{platform_name}.md"
-                )
-
-                with open(path, "r") as doc_file:
-                    file_contents = doc_file.read()
-                    final_markdown = rewrite_markdown(
-                        file_contents, path, destination_md
-                    )
-
-                    if file_name == "README":
-                        # README goes as platform level docs
-                        # all other docs are assumed to be plugin level
-                        create_or_update(
-                            source_documentation,
-                            [platform_name, "custom_docs"],
-                            final_markdown,
-                        )
-                    else:
-                        if "_" in file_name:
-                            plugin_doc_parts = file_name.split("_")
-                            if len(plugin_doc_parts) != 2 or plugin_doc_parts[
-                                1
-                            ] not in ["pre", "post"]:
-                                raise Exception(
-                                    f"{file_name} needs to be of the form <plugin>_pre.md or <plugin>_post.md"
-                                )
-
-                            docs_key_name = f"custom_docs_{plugin_doc_parts[1]}"
-                            create_or_update(
-                                source_documentation,
-                                [
-                                    platform_name,
-                                    "plugins",
-                                    plugin_doc_parts[0],
-                                    docs_key_name,
-                                ],
-                                final_markdown,
-                            )
-                        else:
-                            create_or_update(
-                                source_documentation,
-                                [
-                                    platform_name,
-                                    "plugins",
-                                    file_name,
-                                    "custom_docs_post",
-                                ],
-                                final_markdown,
-                            )
-            else:
-                yml_match = re.search("/docs/sources/(.*)/(.*)_recipe.yml", path)
-                if yml_match:
-                    platform_name = yml_match.group(1).lower()
-                    plugin_name = yml_match.group(2)
-                    with open(path, "r") as doc_file:
-                        file_contents = doc_file.read()
-                        create_or_update(
-                            source_documentation,
-                            [platform_name, "plugins", plugin_name, "recipe"],
-                            file_contents,
-                        )
+    plugin_metrics = PluginMetrics()
+    platform_metrics = PlatformMetrics()
 
+    platforms: Dict[str, Platform] = {}
     for plugin_name in sorted(source_registry.mapping.keys()):
         if source and source != plugin_name:
             continue
 
         if plugin_name in {
             "snowflake-summary",
+            "snowflake-queries",
+            "bigquery-queries",
         }:
             logger.info(f"Skipping {plugin_name} as it is on the deny list")
             continue
 
-        metrics["plugins"]["discovered"] = metrics["plugins"]["discovered"] + 1  # type: ignore
-        # We want to attempt to load all plugins before printing a summary.
-        source_type = None
+        plugin_metrics.discovered += 1
         try:
-            # output = subprocess.check_output(
-            #    ["/bin/bash", "-c", f"pip install -e '.[{key}]'"]
-            # )
-            class_or_exception = source_registry._ensure_not_lazy(plugin_name)
-            if isinstance(class_or_exception, Exception):
-                raise class_or_exception
-            logger.debug(f"Processing {plugin_name}")
-            source_type = source_registry.get(plugin_name)
-            logger.debug(f"Source class is {source_type}")
-            extra_plugin = plugin_name if does_extra_exist(plugin_name) else None
-            extra_deps = (
-                get_additional_deps_for_extra(extra_plugin) if extra_plugin else []
-            )
+            plugin = load_plugin(plugin_name, out_dir=out_dir)
         except Exception as e:
-            logger.warning(
-                f"Failed to process {plugin_name} due to exception {e}", exc_info=e
+            logger.error(
+                f"Failed to load {plugin_name} due to exception {e}", exc_info=e
             )
-            metrics["plugins"]["failed"] = metrics["plugins"].get("failed", 0) + 1  # type: ignore
-
-        if source_type and hasattr(source_type, "get_config_class"):
-            try:
-                source_config_class: ConfigModel = source_type.get_config_class()
-                support_status = SupportStatus.UNKNOWN
-                capabilities = []
-                if hasattr(source_type, "__doc__"):
-                    source_doc = textwrap.dedent(source_type.__doc__ or "")
-                if hasattr(source_type, "get_platform_name"):
-                    platform_name = source_type.get_platform_name()
-                else:
-                    platform_name = (
-                        plugin_name.title()
-                    )  # we like platform names to be human readable
-
-                if hasattr(source_type, "get_platform_id"):
-                    platform_id = source_type.get_platform_id()
-
-                if hasattr(source_type, "get_platform_doc_order"):
-                    platform_doc_order = source_type.get_platform_doc_order()
-                    create_or_update(
-                        source_documentation,
-                        [platform_id, "plugins", plugin_name, "doc_order"],
-                        platform_doc_order,
-                    )
-
-                source_documentation[platform_id] = (
-                    source_documentation.get(platform_id) or {}
-                )
-
-                create_or_update(
-                    source_documentation,
-                    [platform_id, "plugins", plugin_name, "classname"],
-                    ".".join([source_type.__module__, source_type.__name__]),
-                )
-                plugin_file_name = "src/" + "/".join(source_type.__module__.split("."))
-                if os.path.exists(plugin_file_name) and os.path.isdir(plugin_file_name):
-                    plugin_file_name = plugin_file_name + "/__init__.py"
-                else:
-                    plugin_file_name = plugin_file_name + ".py"
-                if os.path.exists(plugin_file_name):
-                    create_or_update(
-                        source_documentation,
-                        [platform_id, "plugins", plugin_name, "filename"],
-                        plugin_file_name,
-                    )
-                else:
-                    logger.info(
-                        f"Failed to locate filename for {plugin_name}. Guessed {plugin_file_name}"
-                    )
-
-                if hasattr(source_type, "get_support_status"):
-                    support_status = source_type.get_support_status()
-
-                if hasattr(source_type, "get_capabilities"):
-                    capabilities = list(source_type.get_capabilities())
-                    capabilities.sort(key=lambda x: x.capability.value)
-
-                create_or_update(
-                    source_documentation,
-                    [platform_id, "plugins", plugin_name, "capabilities"],
-                    capabilities,
-                )
-
-                create_or_update(
-                    source_documentation, [platform_id, "name"], platform_name
-                )
-
-                create_or_update(
-                    source_documentation,
-                    [platform_id, "plugins", plugin_name, "extra_deps"],
-                    extra_deps,
-                )
+            plugin_metrics.failed += 1
+            continue
+        else:
+            plugin_metrics.loaded += 1
 
-                config_dir = f"{out_dir}/config_schemas"
-                os.makedirs(config_dir, exist_ok=True)
-                with open(f"{config_dir}/{plugin_name}_config.json", "w") as f:
-                    f.write(source_config_class.schema_json(indent=2))
+            # Add to the platform list if not already present.
+            platforms.setdefault(
+                plugin.platform_id,
+                Platform(
+                    id=plugin.platform_id,
+                    name=plugin.platform_name,
+                ),
+            ).add_plugin(plugin_name=plugin.name, plugin=plugin)
 
-                create_or_update(
-                    source_documentation,
-                    [platform_id, "plugins", plugin_name, "config_schema"],
-                    source_config_class.schema_json(indent=2) or "",
+    if extra_docs:
+        for path in glob.glob(f"{extra_docs}/**/*[.md|.yaml|.yml]", recursive=True):
+            if m := re.search("/docs/sources/(.*)/(.*).md", path):
+                platform_name = m.group(1).lower()  # TODO: rename this to platform_id
+                file_name = m.group(2)
+                destination_md: str = (
+                    f"../docs/generated/ingestion/sources/{platform_name}.md"
                 )
 
-                table_md = gen_md_table_from_struct(source_config_class.schema())
-                create_or_update(
-                    source_documentation,
-                    [platform_id, "plugins", plugin_name, "source_doc"],
-                    source_doc or "",
-                )
-                create_or_update(
-                    source_documentation,
-                    [platform_id, "plugins", plugin_name, "config"],
-                    table_md,
-                )
-                create_or_update(
-                    source_documentation,
-                    [platform_id, "plugins", plugin_name, "support_status"],
-                    support_status,
-                )
+                with open(path, "r") as doc_file:
+                    file_contents = doc_file.read()
+                final_markdown = rewrite_markdown(file_contents, path, destination_md)
+
+                if file_name == "README":
+                    # README goes as platform level docs
+                    # all other docs are assumed to be plugin level
+                    platforms[platform_name].custom_docs_pre = final_markdown
+
+                elif "_" in file_name:
+                    plugin_doc_parts = file_name.split("_")
+                    if len(plugin_doc_parts) != 2:
+                        raise ValueError(
+                            f"{file_name} needs to be of the form <plugin>_pre.md or <plugin>_post.md"
+                        )
+                    plugin_name, suffix = plugin_doc_parts
+                    if suffix == "pre":
+                        platforms[platform_name].plugins[
+                            plugin_name
+                        ].custom_docs_pre = final_markdown
+                    elif suffix == "post":
+                        platforms[platform_name].plugins[
+                            plugin_name
+                        ].custom_docs_post = final_markdown
+                    else:
+                        raise ValueError(
+                            f"{file_name} needs to be of the form <plugin>_pre.md or <plugin>_post.md"
+                        )
 
-            except Exception as e:
-                raise e
+                else:  # assume this is the platform post.
+                    # TODO: Probably need better error checking here.
+                    platforms[platform_name].plugins[
+                        file_name
+                    ].custom_docs_post = final_markdown
+            elif yml_match := re.search("/docs/sources/(.*)/(.*)_recipe.yml", path):
+                platform_name = yml_match.group(1).lower()
+                plugin_name = yml_match.group(2)
+                platforms[platform_name].plugins[
+                    plugin_name
+                ].starter_recipe = pathlib.Path(path).read_text()
 
     sources_dir = f"{out_dir}/sources"
     os.makedirs(sources_dir, exist_ok=True)
 
+    # Sort platforms by platform name.
+    platforms = dict(sorted(platforms.items(), key=lambda x: x[1].name.casefold()))
+
     i = 0
-    for platform_id, platform_docs in sorted(
-        source_documentation.items(),
-        key=lambda x: (x[1]["name"].casefold(), x[1]["name"])
-        if "name" in x[1]
-        else (x[0].casefold(), x[0]),
-    ):
+    for platform_id, platform in platforms.items():
         if source and platform_id != source:
             continue
-        metrics["source_platforms"]["discovered"] = (
-            metrics["source_platforms"]["discovered"] + 1  # type: ignore
-        )
+        platform_metrics.discovered += 1
         platform_doc_file = f"{sources_dir}/{platform_id}.md"
-        if "name" not in platform_docs:
-            # We seem to have discovered written docs that corresponds to a platform, but haven't found linkage to it from the source classes
-            warning_msg = f"Failed to find source classes for platform {platform_id}. Did you remember to annotate your source class with @platform_name({platform_id})?"
-            logger.error(warning_msg)
-            metrics["source_platforms"]["warnings"].append(warning_msg)  # type: ignore
-            continue
+        # if "name" not in platform_docs:
+        #     # We seem to have discovered written docs that corresponds to a platform, but haven't found linkage to it from the source classes
+        #     warning_msg = f"Failed to find source classes for platform {platform_id}. Did you remember to annotate your source class with @platform_name({platform_id})?"
+        #     logger.error(warning_msg)
+        #     metrics["source_platforms"]["warnings"].append(warning_msg)  # type: ignore
+        #     continue
 
         with open(platform_doc_file, "w") as f:
             i += 1
@@ -745,12 +344,12 @@ def generate(
             f.write(
                 "import Tabs from '@theme/Tabs';\nimport TabItem from '@theme/TabItem';\n\n"
             )
-            f.write(f"# {platform_docs['name']}\n")
+            f.write(f"# {platform.name}\n")
 
-            if len(platform_docs["plugins"].keys()) > 1:
+            if len(platform.plugins) > 1:
                 # More than one plugin used to provide integration with this platform
                 f.write(
-                    f"There are {len(platform_docs['plugins'].keys())} sources that provide integration with {platform_docs['name']}\n"
+                    f"There are {len(platform.plugins)} sources that provide integration with {platform.name}\n"
                 )
                 f.write("\n")
                 f.write("<table>\n")
@@ -759,18 +358,22 @@ def generate(
                     f.write(f"<td>{col_header}</td>")
                 f.write("</tr>")
 
+                # Sort plugins in the platform.
+                # It's a dict, so we need to recreate it.
+                platform.plugins = dict(
+                    sorted(
+                        platform.plugins.items(),
+                        key=lambda x: str(x[1].doc_order) if x[1].doc_order else x[0],
+                    )
+                )
+
                 #                f.write("| Source Module | Documentation |\n")
                 #                f.write("| ------ | ---- |\n")
-                for plugin, plugin_docs in sorted(
-                    platform_docs["plugins"].items(),
-                    key=lambda x: str(x[1].get("doc_order"))
-                    if x[1].get("doc_order")
-                    else x[0],
-                ):
+                for plugin_name, plugin in platform.plugins.items():
                     f.write("<tr>\n")
-                    f.write(f"<td>\n\n`{plugin}`\n\n</td>\n")
+                    f.write(f"<td>\n\n`{plugin_name}`\n\n</td>\n")
                     f.write(
-                        f"<td>\n\n\n{platform_docs['plugins'][plugin].get('source_doc') or ''} [Read more...](#module-{plugin})\n\n\n</td>\n"
+                        f"<td>\n\n\n{plugin.source_docstring or ''} [Read more...](#module-{plugin_name})\n\n\n</td>\n"
                     )
                     f.write("</tr>\n")
                 #                    f.write(
@@ -778,43 +381,33 @@ def generate(
                 #                    )
                 f.write("</table>\n\n")
             # insert platform level custom docs before plugin section
-            f.write(platform_docs.get("custom_docs") or "")
+            f.write(platform.custom_docs_pre or "")
             # all_plugins = platform_docs["plugins"].keys()
 
-            for plugin, plugin_docs in sorted(
-                platform_docs["plugins"].items(),
-                key=lambda x: str(x[1].get("doc_order"))
-                if x[1].get("doc_order")
-                else x[0],
-            ):
-                if len(platform_docs["plugins"].keys()) > 1:
+            for plugin_name, plugin in platform.plugins.items():
+                if len(platform.plugins) > 1:
                     # We only need to show this if there are multiple modules.
-                    f.write(f"\n\n## Module `{plugin}`\n")
+                    f.write(f"\n\n## Module `{plugin_name}`\n")
 
-                if "support_status" in plugin_docs:
-                    f.write(
-                        get_support_status_badge(plugin_docs["support_status"]) + "\n\n"
-                    )
-                if "capabilities" in plugin_docs and len(plugin_docs["capabilities"]):
+                if plugin.support_status != SupportStatus.UNKNOWN:
+                    f.write(get_support_status_badge(plugin.support_status) + "\n\n")
+                if plugin.capabilities and len(plugin.capabilities):
                     f.write("\n### Important Capabilities\n")
                     f.write("| Capability | Status | Notes |\n")
                     f.write("| ---------- | ------ | ----- |\n")
-                    plugin_capabilities: List[CapabilitySetting] = plugin_docs[
-                        "capabilities"
-                    ]
-                    for cap_setting in plugin_capabilities:
+                    for cap_setting in plugin.capabilities:
                         f.write(
                             f"| {get_capability_text(cap_setting.capability)} | {get_capability_supported_badge(cap_setting.supported)} | {cap_setting.description} |\n"
                         )
                     f.write("\n")
 
-                f.write(f"{plugin_docs.get('source_doc') or ''}\n")
+                f.write(f"{plugin.source_docstring or ''}\n")
                 # Insert custom pre section
-                f.write(plugin_docs.get("custom_docs_pre", ""))
+                f.write(plugin.custom_docs_pre or "")
                 f.write("\n### CLI based Ingestion\n")
-                if "extra_deps" in plugin_docs:
+                if plugin.extra_deps and len(plugin.extra_deps):
                     f.write("\n#### Install the Plugin\n")
-                    if plugin_docs["extra_deps"] != []:
+                    if plugin.extra_deps != []:
                         f.write("```shell\n")
                         f.write(f"pip install 'acryl-datahub[{plugin}]'\n")
                         f.write("```\n")
@@ -822,7 +415,7 @@ def generate(
                         f.write(
                             f"The `{plugin}` source works out of the box with `acryl-datahub`.\n"
                         )
-                if "recipe" in plugin_docs:
+                if plugin.starter_recipe:
                     f.write("\n### Starter Recipe\n")
                     f.write(
                         "Check out the following recipe to get started with ingestion! See [below](#config-details) for full configuration options.\n\n\n"
@@ -831,9 +424,10 @@ def generate(
                         "For general pointers on writing and running a recipe, see our [main recipe guide](../../../../metadata-ingestion/README.md#recipes).\n"
                     )
                     f.write("```yaml\n")
-                    f.write(plugin_docs["recipe"])
+                    f.write(plugin.starter_recipe)
                     f.write("\n```\n")
-                if "config" in plugin_docs:
+                if plugin.config_json_schema:
+                    assert plugin.config_md is not None
                     f.write("\n### Config Details\n")
                     f.write(
                         """<Tabs>
@@ -845,8 +439,8 @@ def generate(
                     # f.write(
                     #     "\n<details open>\n<summary>View All Configuration Options</summary>\n\n"
                     # )
-                    for doc in plugin_docs["config"]:
-                        f.write(doc)
+                    f.write(plugin.config_md)
+                    f.write("\n\n")
                     # f.write("\n</details>\n\n")
                     f.write(
                         f"""</TabItem>
@@ -854,39 +448,49 @@ def generate(
 
 The [JSONSchema](https://json-schema.org/) for this configuration is inlined below.\n\n
 ```javascript
-{plugin_docs['config_schema']}
+{plugin.config_json_schema}
 ```\n\n
 </TabItem>
 </Tabs>\n\n"""
                     )
+
                 # insert custom plugin docs after config details
-                f.write(plugin_docs.get("custom_docs_post", ""))
-                if "classname" in plugin_docs:
+                f.write(plugin.custom_docs_post or "")
+                if plugin.classname:
                     f.write("\n### Code Coordinates\n")
-                    f.write(f"- Class Name: `{plugin_docs['classname']}`\n")
-                    if "filename" in plugin_docs:
+                    f.write(f"- Class Name: `{plugin.classname}`\n")
+                    if plugin.filename:
                         f.write(
-                            f"- Browse on [GitHub](../../../../metadata-ingestion/{plugin_docs['filename']})\n\n"
+                            f"- Browse on [GitHub](../../../../metadata-ingestion/{plugin.filename})\n\n"
                         )
-                metrics["plugins"]["generated"] = metrics["plugins"]["generated"] + 1  # type: ignore
+                plugin_metrics.generated += 1
 
             # Using an h2 tag to prevent this from showing up in page's TOC sidebar.
             f.write("\n<h2>Questions</h2>\n\n")
             f.write(
-                f"If you've got any questions on configuring ingestion for {platform_docs.get('name',platform_id)}, feel free to ping us on [our Slack](https://slack.datahubproject.io).\n"
-            )
-            metrics["source_platforms"]["generated"] = (
-                metrics["source_platforms"]["generated"] + 1  # type: ignore
+                f"If you've got any questions on configuring ingestion for {platform.name}, feel free to ping us on [our Slack](https://slack.datahubproject.io).\n"
             )
+            platform_metrics.generated += 1
     print("Ingestion Documentation Generation Complete")
     print("############################################")
-    print(json.dumps(metrics, indent=2))
+    print(
+        json.dumps(
+            {
+                "plugin_metrics": dataclasses.asdict(plugin_metrics),
+                "platform_metrics": dataclasses.asdict(platform_metrics),
+            },
+            indent=2,
+        )
+    )
     print("############################################")
-    if metrics["plugins"].get("failed", 0) > 0:  # type: ignore
+    if plugin_metrics.failed > 0:
         sys.exit(1)
 
-    ### Create Lineage doc
+    # Create Lineage doc
+    generate_lineage_doc(platforms)
+
 
+def generate_lineage_doc(platforms: Dict[str, Platform]) -> None:
     source_dir = "../docs/generated/lineage"
     os.makedirs(source_dir, exist_ok=True)
     doc_file = f"{source_dir}/lineage-feature-guide.md"
@@ -894,7 +498,7 @@ def generate(
         f.write(
             "import FeatureAvailability from '@site/src/components/FeatureAvailability';\n\n"
         )
-        f.write(f"# About DataHub Lineage\n\n")
+        f.write("# About DataHub Lineage\n\n")
         f.write("<FeatureAvailability/>\n")
 
         f.write(
@@ -996,30 +600,24 @@ def generate(
         )
         f.write("| ---------- | ------ | ----- |----- |\n")
 
-        for platform_id, platform_docs in sorted(
-            source_documentation.items(),
-            key=lambda x: (x[1]["name"].casefold(), x[1]["name"])
-            if "name" in x[1]
-            else (x[0].casefold(), x[0]),
-        ):
-            for plugin, plugin_docs in sorted(
-                platform_docs["plugins"].items(),
-                key=lambda x: str(x[1].get("doc_order"))
-                if x[1].get("doc_order")
-                else x[0],
+        for platform_id, platform in platforms.items():
+            for plugin in sorted(
+                platform.plugins.values(),
+                key=lambda x: str(x.doc_order) if x.doc_order else x.name,
             ):
-                platform_name = platform_docs["name"]
-                if len(platform_docs["plugins"].keys()) > 1:
+                if len(platform.plugins) > 1:
                     # We only need to show this if there are multiple modules.
-                    platform_name = f"{platform_name} `{plugin}`"
+                    platform_plugin_name = f"{platform.name} `{plugin.name}`"
+                else:
+                    platform_plugin_name = platform.name
 
                 # Initialize variables
                 table_level_supported = "❌"
                 column_level_supported = "❌"
                 config_names = ""
 
-                if "capabilities" in plugin_docs:
-                    plugin_capabilities = plugin_docs["capabilities"]
+                if plugin.capabilities and len(plugin.capabilities):
+                    plugin_capabilities = plugin.capabilities
 
                     for cap_setting in plugin_capabilities:
                         capability_text = get_capability_text(cap_setting.capability)
@@ -1040,10 +638,10 @@ def generate(
                             column_level_supported = "✅"
 
                 if not (table_level_supported == "❌" and column_level_supported == "❌"):
-                    if "config_schema" in plugin_docs:
-                        config_properties = json.loads(
-                            plugin_docs["config_schema"]
-                        ).get("properties", {})
+                    if plugin.config_json_schema:
+                        config_properties = json.loads(plugin.config_json_schema).get(
+                            "properties", {}
+                        )
                         config_names = "<br />".join(
                             [
                                 f"- {property_name}"
@@ -1065,7 +663,7 @@ def generate(
                 ]
                 if platform_id not in lineage_not_applicable_sources:
                     f.write(
-                        f"| [{platform_name}](../../generated/ingestion/sources/{platform_id}.md) | {table_level_supported} | {column_level_supported} | {config_names}|\n"
+                        f"| [{platform_plugin_name}](../../generated/ingestion/sources/{platform_id}.md) | {table_level_supported} | {column_level_supported} | {config_names}|\n"
                     )
 
         f.write(
diff --git a/metadata-ingestion/scripts/docgen_types.py b/metadata-ingestion/scripts/docgen_types.py
new file mode 100644
index 00000000000000..c96ab955e8cce2
--- /dev/null
+++ b/metadata-ingestion/scripts/docgen_types.py
@@ -0,0 +1,45 @@
+from dataclasses import dataclass, field
+from typing import Dict, List, Optional
+
+from datahub.ingestion.api.decorators import CapabilitySetting, SupportStatus
+
+
+@dataclass
+class Plugin:
+    # Required fields
+    name: str
+    platform_id: str
+    platform_name: str
+    classname: str
+
+    # Optional documentation fields
+    source_docstring: Optional[str] = None
+    config_json_schema: Optional[str] = None
+    config_md: Optional[str] = None
+    custom_docs_pre: Optional[str] = None
+    custom_docs_post: Optional[str] = None
+    starter_recipe: Optional[str] = None
+
+    # Optional metadata fields
+    support_status: SupportStatus = SupportStatus.UNKNOWN
+    filename: Optional[str] = None
+    doc_order: Optional[int] = None
+
+    # Lists with empty defaults
+    capabilities: List[CapabilitySetting] = field(default_factory=list)
+    extra_deps: List[str] = field(default_factory=list)
+
+
+@dataclass
+class Platform:
+    # Required fields
+    id: str
+    name: str
+
+    # Optional fields
+    custom_docs_pre: Optional[str] = None
+    plugins: Dict[str, Plugin] = field(default_factory=dict)
+
+    def add_plugin(self, plugin_name: str, plugin: Plugin) -> None:
+        """Helper method to add a plugin to the platform"""
+        self.plugins[plugin_name] = plugin
diff --git a/metadata-ingestion/scripts/docs_config_table.py b/metadata-ingestion/scripts/docs_config_table.py
new file mode 100644
index 00000000000000..3c5d9d0b0a2ba5
--- /dev/null
+++ b/metadata-ingestion/scripts/docs_config_table.py
@@ -0,0 +1,376 @@
+import html
+import json
+import re
+from typing import Any, Dict, Iterable, List, Optional, Type
+
+from pydantic import BaseModel, Field
+
+from datahub.ingestion.extractor.json_schema_util import JsonSchemaTranslator
+from datahub.metadata.schema_classes import SchemaFieldClass
+
+DEFAULT_VALUE_MAX_LENGTH = 50
+DEFAULT_VALUE_TRUNCATION_MESSAGE = "..."
+
+
+def _truncate_default_value(value: str) -> str:
+    if len(value) > DEFAULT_VALUE_MAX_LENGTH:
+        return value[:DEFAULT_VALUE_MAX_LENGTH] + DEFAULT_VALUE_TRUNCATION_MESSAGE
+    return value
+
+
+def _format_path_component(path: str) -> str:
+    """
+    Given a path like 'a.b.c', adds css tags to the components.
+    """
+    path_components = path.rsplit(".", maxsplit=1)
+    if len(path_components) == 1:
+        return f'<span className="path-main">{path_components[0]}</span>'
+
+    return (
+        f'<span className="path-prefix">{path_components[0]}.</span>'
+        f'<span className="path-main">{path_components[1]}</span>'
+    )
+
+
+def _format_type_name(type_name: str) -> str:
+    return f'<span className="type-name">{type_name}</span>'
+
+
+def _format_default_line(default_value: str, has_desc_above: bool) -> str:
+    default_value = _truncate_default_value(default_value)
+    escaped_value = (
+        html.escape(default_value)
+        # Replace curly braces to avoid JSX issues.
+        .replace("{", "&#123;")
+        .replace("}", "&#125;")
+        # We also need to replace markdown special characters.
+        .replace("*", "&#42;")
+        .replace("_", "&#95;")
+        .replace("[", "&#91;")
+        .replace("]", "&#93;")
+        .replace("|", "&#124;")
+        .replace("`", "&#96;")
+    )
+    value_elem = f'<span className="default-value">{escaped_value}</span>'
+    return f'<div className="default-line {"default-line-with-docs" if has_desc_above else ""}">Default: {value_elem}</div>'
+
+
+class FieldRow(BaseModel):
+    path: str
+    parent: Optional[str]
+    type_name: str
+    required: bool
+    has_default: bool
+    default: str
+    description: str
+    inner_fields: List["FieldRow"] = Field(default_factory=list)
+    discriminated_type: Optional[str] = None
+
+    class Component(BaseModel):
+        type: str
+        field_name: Optional[str]
+
+    # matches any [...] style section inside a field path
+    _V2_FIELD_PATH_TOKEN_MATCHER = r"\[[\w.]*[=]*[\w\(\-\ \_\).]*\][\.]*"
+    # matches a .?[...] style section inside a field path anchored to the beginning
+    _V2_FIELD_PATH_TOKEN_MATCHER_PREFIX = rf"^[\.]*{_V2_FIELD_PATH_TOKEN_MATCHER}"
+    _V2_FIELD_PATH_FIELD_NAME_MATCHER = r"^\w+"
+
+    @staticmethod
+    def map_field_path_to_components(field_path: str) -> List[Component]:
+        m = re.match(FieldRow._V2_FIELD_PATH_TOKEN_MATCHER_PREFIX, field_path)
+        v = re.match(FieldRow._V2_FIELD_PATH_FIELD_NAME_MATCHER, field_path)
+        components: List[FieldRow.Component] = []
+        while m or v:
+            token = m.group() if m else v.group()  # type: ignore
+            if v:
+                if components:
+                    if components[-1].field_name is None:
+                        components[-1].field_name = token
+                    else:
+                        components.append(
+                            FieldRow.Component(type="non_map_type", field_name=token)
+                        )
+                else:
+                    components.append(
+                        FieldRow.Component(type="non_map_type", field_name=token)
+                    )
+
+            if m:
+                if token.startswith("[version="):
+                    pass
+                elif "[type=" in token:
+                    type_match = re.match(r"[\.]*\[type=(.*)\]", token)
+                    if type_match:
+                        type_string = type_match.group(1)
+                        if components and components[-1].type == "map":
+                            if components[-1].field_name is None:
+                                pass
+                            else:
+                                new_component = FieldRow.Component(
+                                    type="map_key", field_name="`key`"
+                                )
+                                components.append(new_component)
+                                new_component = FieldRow.Component(
+                                    type=type_string, field_name=None
+                                )
+                                components.append(new_component)
+                        if type_string == "map":
+                            new_component = FieldRow.Component(
+                                type=type_string, field_name=None
+                            )
+                            components.append(new_component)
+
+            field_path = field_path[m.span()[1] :] if m else field_path[v.span()[1] :]  # type: ignore
+            m = re.match(FieldRow._V2_FIELD_PATH_TOKEN_MATCHER_PREFIX, field_path)
+            v = re.match(FieldRow._V2_FIELD_PATH_FIELD_NAME_MATCHER, field_path)
+
+        return components
+
+    @staticmethod
+    def field_path_to_components(field_path: str) -> List[str]:
+        """
+        Inverts the field_path v2 format to get the canonical field path
+        [version=2.0].[type=x].foo.[type=string(format=uri)].bar => ["foo","bar"]
+        """
+        if "type=map" not in field_path:
+            return re.sub(FieldRow._V2_FIELD_PATH_TOKEN_MATCHER, "", field_path).split(
+                "."
+            )
+        else:
+            # fields with maps in them need special handling to insert the `key` fragment
+            return [
+                c.field_name
+                for c in FieldRow.map_field_path_to_components(field_path)
+                if c.field_name
+            ]
+
+    @classmethod
+    def from_schema_field(cls, schema_field: SchemaFieldClass) -> "FieldRow":
+        path_components = FieldRow.field_path_to_components(schema_field.fieldPath)
+
+        parent = path_components[-2] if len(path_components) >= 2 else None
+        if parent == "`key`":
+            # the real parent node is one index above
+            parent = path_components[-3]
+        json_props = (
+            json.loads(schema_field.jsonProps) if schema_field.jsonProps else {}
+        )
+
+        required = json_props.get("required", True)
+        has_default = "default" in json_props
+        default_value = str(json_props.get("default"))
+
+        field_path = ".".join(path_components)
+
+        return FieldRow(
+            path=field_path,
+            parent=parent,
+            type_name=str(schema_field.nativeDataType),
+            required=required,
+            has_default=has_default,
+            default=default_value,
+            description=schema_field.description,
+            inner_fields=[],
+            discriminated_type=schema_field.nativeDataType,
+        )
+
+    def get_checkbox(self) -> str:
+        if self.required and not self.has_default:
+            # Using a non-breaking space to prevent the checkbox from being
+            # broken into a new line.
+            if not self.parent:  # None and empty string both count
+                return '&nbsp;<abbr title="Required">✅</abbr>'
+            else:
+                return f'&nbsp;<abbr title="Required if {self.parent} is set">❓</abbr>'
+        else:
+            return ""
+
+    def to_md_line(self) -> str:
+        if self.inner_fields:
+            if len(self.inner_fields) == 1:
+                type_name = self.inner_fields[0].type_name or self.type_name
+            else:
+                # To deal with unions that have essentially the same simple field path,
+                # we combine the type names into a single string.
+                type_name = "One of " + ", ".join(
+                    [x.type_name for x in self.inner_fields if x.discriminated_type]
+                )
+        else:
+            type_name = self.type_name
+
+        description = self.description.strip()
+        description = self.description.replace(
+            "\n", " <br /> "
+        )  # descriptions with newlines in them break markdown rendering
+
+        md_line = (
+            f'| <div className="path-line">{_format_path_component(self.path)}'
+            f"{self.get_checkbox()}</div>"
+            f' <div className="type-name-line">{_format_type_name(type_name)}</div> '
+            f"| {description} "
+            f"{_format_default_line(self.default, bool(description)) if self.has_default else ''} |\n"
+        )
+        return md_line
+
+
+class FieldHeader(FieldRow):
+    def to_md_line(self) -> str:
+        return "\n".join(
+            [
+                "| Field | Description |",
+                "|:--- |:--- |",
+                "",
+            ]
+        )
+
+    def __init__(self):
+        pass
+
+
+def get_prefixed_name(field_prefix: Optional[str], field_name: Optional[str]) -> str:
+    assert (
+        field_prefix or field_name
+    ), "One of field_prefix or field_name should be present"
+    return (
+        f"{field_prefix}.{field_name}"  # type: ignore
+        if field_prefix and field_name
+        else field_name
+        if not field_prefix
+        else field_prefix
+    )
+
+
+def custom_comparator(path: str) -> str:
+    """
+    Projects a string onto a separate space
+    Low_prio string will start with Z else start with A
+    Number of field paths will add the second set of letters: 00 - 99
+
+    """
+    opt1 = path
+    prio_value = priority_value(opt1)
+    projection = f"{prio_value}"
+    projection = f"{projection}{opt1}"
+    return projection
+
+
+class FieldTree:
+    """
+    A helper class that re-constructs the tree hierarchy of schema fields
+    to help sort fields by importance while keeping nesting intact
+    """
+
+    def __init__(self, field: Optional[FieldRow] = None):
+        self.field = field
+        self.fields: Dict[str, "FieldTree"] = {}
+
+    def add_field(self, row: FieldRow, path: Optional[str] = None) -> "FieldTree":
+        # logger.warn(f"Add field: path:{path}, row:{row}")
+        if self.field and self.field.path == row.path:
+            # we have an incoming field with the same path as us, this is probably a union variant
+            # attach to existing field
+            self.field.inner_fields.append(row)
+        else:
+            path = path if path is not None else row.path
+            top_level_field = path.split(".")[0]
+            if top_level_field in self.fields:
+                self.fields[top_level_field].add_field(
+                    row, ".".join(path.split(".")[1:])
+                )
+            else:
+                self.fields[top_level_field] = FieldTree(field=row)
+        # logger.warn(f"{self}")
+        return self
+
+    def sort(self):
+        # Required fields before optionals
+        required_fields = {
+            k: v for k, v in self.fields.items() if v.field and v.field.required
+        }
+        optional_fields = {
+            k: v for k, v in self.fields.items() if v.field and not v.field.required
+        }
+
+        self.sorted_fields = []
+        for field_map in [required_fields, optional_fields]:
+            # Top-level fields before fields with nesting
+            self.sorted_fields.extend(
+                sorted(
+                    [f for f, val in field_map.items() if val.fields == {}],
+                    key=custom_comparator,
+                )
+            )
+            self.sorted_fields.extend(
+                sorted(
+                    [f for f, val in field_map.items() if val.fields != {}],
+                    key=custom_comparator,
+                )
+            )
+
+        for field_tree in self.fields.values():
+            field_tree.sort()
+
+    def get_fields(self) -> Iterable[FieldRow]:
+        if self.field:
+            yield self.field
+        for key in self.sorted_fields:
+            yield from self.fields[key].get_fields()
+
+    def __repr__(self) -> str:
+        result = {}
+        if self.field:
+            result["_self"] = json.loads(json.dumps(self.field.dict()))
+        for f in self.fields:
+            result[f] = json.loads(str(self.fields[f]))
+        return json.dumps(result, indent=2)
+
+
+def priority_value(path: str) -> str:
+    # A map of low value tokens to their relative importance
+    low_value_token_map = {
+        "env": "X",
+        "classification": "Y",
+        "profiling": "Y",
+        "stateful_ingestion": "Z",
+    }
+    tokens = path.split(".")
+    for low_value_token in low_value_token_map:
+        if low_value_token in tokens:
+            return low_value_token_map[low_value_token]
+
+    # everything else high-prio
+    return "A"
+
+
+def gen_md_table_from_json_schema(schema_dict: Dict[str, Any]) -> str:
+    # we don't want default field values to be injected into the description of the field
+    JsonSchemaTranslator._INJECT_DEFAULTS_INTO_DESCRIPTION = False
+    schema_fields = list(JsonSchemaTranslator.get_fields_from_schema(schema_dict))
+    result: List[str] = [FieldHeader().to_md_line()]
+
+    field_tree = FieldTree(field=None)
+    for field in schema_fields:
+        row: FieldRow = FieldRow.from_schema_field(field)
+        field_tree.add_field(row)
+
+    field_tree.sort()
+
+    for row in field_tree.get_fields():
+        result.append(row.to_md_line())
+
+    # Wrap with a .config-table div.
+    result = ["\n<div className='config-table'>\n\n", *result, "\n</div>\n"]
+
+    return "".join(result)
+
+
+def gen_md_table_from_pydantic(model: Type[BaseModel]) -> str:
+    return gen_md_table_from_json_schema(model.schema())
+
+
+if __name__ == "__main__":
+    # Simple test code.
+    from datahub.ingestion.source.snowflake.snowflake_config import SnowflakeV2Config
+
+    print("".join(gen_md_table_from_pydantic(SnowflakeV2Config)))
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi_report_server/report_server.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi_report_server/report_server.py
index 2a247d0c63957a..4764400215e12a 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi_report_server/report_server.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi_report_server/report_server.py
@@ -485,7 +485,7 @@ def report_dropped(self, view: str) -> None:
         self.filtered_reports.append(view)
 
 
-@platform_name("PowerBI")
+@platform_name("PowerBI Report Server")
 @config_class(PowerBiReportServerDashboardSourceConfig)
 @support_status(SupportStatus.INCUBATING)
 @capability(SourceCapability.OWNERSHIP, "Enabled by default")

From 8a944752779e31044bf979e386b4127aa6b8f92b Mon Sep 17 00:00:00 2001
From: ryota-cloud <ryota.egashira@acryl.io>
Date: Fri, 10 Jan 2025 11:34:36 -0800
Subject: [PATCH 064/249] fix(dockerfile) Remove all references to jetty from
 the docker file (#12310)

Co-authored-by: Ryota Egashira <egashira@Ryotas-MacBook-Pro-2.local>
---
 docker/datahub-upgrade/Dockerfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docker/datahub-upgrade/Dockerfile b/docker/datahub-upgrade/Dockerfile
index 488cb46c94cf28..d63ceb83dc5295 100644
--- a/docker/datahub-upgrade/Dockerfile
+++ b/docker/datahub-upgrade/Dockerfile
@@ -34,16 +34,12 @@ ARG MAVEN_CENTRAL_REPO_URL
 RUN if [ "${ALPINE_REPO_URL}" != "http://dl-cdn.alpinelinux.org/alpine" ] ; then sed -i "s#http.*://dl-cdn.alpinelinux.org/alpine#${ALPINE_REPO_URL}#g" /etc/apk/repositories ; fi
 
 ENV JMX_VERSION=0.18.0
-ENV JETTY_VERSION=11.0.21
 
 # Upgrade Alpine and base packages
 # PFP-260: Upgrade Sqlite to >=3.28.0-r0 to fix https://security.snyk.io/vuln/SNYK-ALPINE39-SQLITE-449762
 RUN apk --no-cache --update-cache --available upgrade \
     && apk --no-cache add curl bash coreutils gcompat sqlite libc6-compat snappy \
     && apk --no-cache add openjdk17-jre-headless --repository=${ALPINE_REPO_URL}/edge/community \
-    && curl -sS ${MAVEN_CENTRAL_REPO_URL}/org/eclipse/jetty/jetty-runner/${JETTY_VERSION}/jetty-runner-${JETTY_VERSION}.jar --output jetty-runner.jar \
-    && curl -sS ${MAVEN_CENTRAL_REPO_URL}/org/eclipse/jetty/jetty-jmx/${JETTY_VERSION}/jetty-jmx-${JETTY_VERSION}.jar --output jetty-jmx.jar \
-    && curl -sS ${MAVEN_CENTRAL_REPO_URL}/org/eclipse/jetty/jetty-util/${JETTY_VERSION}/jetty-util-${JETTY_VERSION}.jar --output jetty-util.jar \
     && wget --no-verbose ${GITHUB_REPO_URL}/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.24.0/opentelemetry-javaagent.jar \
     && wget --no-verbose ${MAVEN_CENTRAL_REPO_URL}/io/prometheus/jmx/jmx_prometheus_javaagent/${JMX_VERSION}/jmx_prometheus_javaagent-${JMX_VERSION}.jar -O jmx_prometheus_javaagent.jar \
     && cp /usr/lib/jvm/java-17-openjdk/jre/lib/security/cacerts /tmp/kafka.client.truststore.jks

From 9897804e2ab2baa4539a11dfdb4ef3104e7f9ecc Mon Sep 17 00:00:00 2001
From: ethan-cartwright <ethan.cartwright.m@gmail.com>
Date: Fri, 10 Jan 2025 14:36:47 -0500
Subject: [PATCH 065/249] docs(notification): docs on platform notifications
 and multiple channels (#10801)

Co-authored-by: Jay <159848059+jayacryl@users.noreply.github.com>
---
 .../subscription-and-notification.md          | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/docs/managed-datahub/subscription-and-notification.md b/docs/managed-datahub/subscription-and-notification.md
index c3c31d5fed7e61..c27754a6371265 100644
--- a/docs/managed-datahub/subscription-and-notification.md
+++ b/docs/managed-datahub/subscription-and-notification.md
@@ -17,9 +17,30 @@ Email will work out of box. For installing the DataHub Slack App, see:
 This feature is especially useful in helping you stay on top of any upstream changes that could impact the assets you or your stakeholders rely on. It eliminates the need for you and your team to manually check for upstream changes, or for upstream stakeholders to identify and notify impacted users.
 As a user, you can subscribe to and receive notifications about changes such as deprecations, schema changes, changes in ownership, assertions, or incidents. You’ll always been in the know about potential data quality issues so you can proactively manage your data resources.
 
+
+## Platform Admin Notifications
+
+Datahub provides three levels of notifications:
+
+- **Platform-level**
+- **Group-level** (described in other sections)
+- **User-level** (described in other sections)
+
+**Setting Platform-Level Notifications:**
+This requires appropriate permissions. Go to `Settings` > `Notifications` (under the `Platform` section, not `My Notifications`).
+
+**Platform-level Notifications:**
+Platform-level notifications are applied to all assets within Datahub.
+Example: If "An owner is added or removed from a data asset" is ticked, the designated Slack channel or email will receive notifications for any such changes across all assets.
+
+**Our Recommendations:**
+
+Notifying on tag changes for every asset in the platform would be noisy, and so we recommend to use these platform-level notifications only where appropriate. For example, we recommend notifications for ingestion failures routed to a central Slack channel or email. This will help you proactively ensure your Datahub metadata stays fresh.
+
 ## Prerequisites
 
 Once you have [configured Slack within your DataHub instance](slack/saas-slack-setup.md), you will be able to subscribe to any Entity in DataHub and begin recieving notifications via DM.
+
 To begin receiving personal notifications, go to Settings > "My Notifications". From here, toggle on Slack Notifications and input your Slack Member ID.
 
 If you want to create and manage group-level Subscriptions for your team, you will need [the following privileges](../../docs/authorization/roles.md#role-privileges):
@@ -162,6 +183,21 @@ You can unsubscribe from any asset to stop receiving notifications about it. On
 What if I want to be notified about different changes?
 </summary>
 To modify your subscription, use the dropdown menu next to the Subscribe button to modify the changes you want to be notified about.
+</details>
+<details>
+<summary>
+I want to configure multiple channels. How many Slack channels or emails can I configure to get notified? 
+</summary>
+At the platform-level, you can configure one email and one Slack channel.
+
+At the user and group -levels, you can configure one default email and Slack channel as well as overwrite that email/channel when you
+go to a specific asset to subscribe to. 
+
+To configure multiple channels, as a prereq, ensure you have the appropriate privileges. And then:
+1. Create a datahub group for each channel you want notifications for. 
+2. Add yourself as a member to each of the groups.
+3. Now, when you visit an asset and go to subscribe, you'll see the option "Manage Group Subscriptions".
+
 </details>
 
 ## Reference

From 8d48622c0ff79b50d29694785df23610d15570c7 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Sun, 12 Jan 2025 22:09:34 -0800
Subject: [PATCH 066/249] fix(cli/delete): prevent duplicates in delete message
 (#12323)

---
 metadata-ingestion/src/datahub/cli/delete_cli.py | 6 +++---
 metadata-ingestion/src/datahub/cli/migrate.py    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/metadata-ingestion/src/datahub/cli/delete_cli.py b/metadata-ingestion/src/datahub/cli/delete_cli.py
index 1a75459a92c5cf..8501cf71f0d544 100644
--- a/metadata-ingestion/src/datahub/cli/delete_cli.py
+++ b/metadata-ingestion/src/datahub/cli/delete_cli.py
@@ -1,8 +1,8 @@
 import logging
+import random
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from dataclasses import dataclass
 from datetime import datetime
-from random import choices
 from typing import Dict, List, Optional
 
 import click
@@ -457,11 +457,11 @@ def by_filter(
             click.echo("Found urns of multiple entity types")
             for entity_type, entity_urns in urns_by_type.items():
                 click.echo(
-                    f"- {len(entity_urns)} {entity_type} urn(s). Sample: {choices(entity_urns, k=min(5, len(entity_urns)))}"
+                    f"- {len(entity_urns)} {entity_type} urn(s). Sample: {random.sample(entity_urns, k=min(5, len(entity_urns)))}"
                 )
         else:
             click.echo(
-                f"Found {len(urns)} {entity_type} urn(s). Sample: {choices(urns, k=min(5, len(urns)))}"
+                f"Found {len(urns)} {entity_type} urn(s). Sample: {random.sample(urns, k=min(5, len(urns)))}"
             )
 
         if not force and not dry_run:
diff --git a/metadata-ingestion/src/datahub/cli/migrate.py b/metadata-ingestion/src/datahub/cli/migrate.py
index ea5375c9471283..1bf1211674f596 100644
--- a/metadata-ingestion/src/datahub/cli/migrate.py
+++ b/metadata-ingestion/src/datahub/cli/migrate.py
@@ -179,7 +179,7 @@ def dataplatform2instance_func(
 
     if not force and not dry_run:
         # get a confirmation from the operator before proceeding if this is not a dry run
-        sampled_urns_to_migrate = random.choices(
+        sampled_urns_to_migrate = random.sample(
             urns_to_migrate, k=min(10, len(urns_to_migrate))
         )
         sampled_new_urns: List[str] = [
@@ -193,7 +193,7 @@ def dataplatform2instance_func(
             if key
         ]
         click.echo(
-            f"Will migrate {len(urns_to_migrate)} urns such as {random.choices(urns_to_migrate, k=min(10, len(urns_to_migrate)))}"
+            f"Will migrate {len(urns_to_migrate)} urns such as {random.sample(urns_to_migrate, k=min(10, len(urns_to_migrate)))}"
         )
         click.echo(f"New urns will look like {sampled_new_urns}")
         click.confirm("Ok to proceed?", abort=True)

From 457f96e8c5f00cc8525bb7afe90f00f86c6b093c Mon Sep 17 00:00:00 2001
From: skrydal <piotr.skrydalewicz@acryl.io>
Date: Mon, 13 Jan 2025 14:37:09 +0100
Subject: [PATCH 067/249] feat(ingestion/iceberg): Improve iceberg connector
 logging (#12317)

---
 .../ingestion/source/iceberg/iceberg.py       | 13 ++++-
 .../source/iceberg/iceberg_common.py          | 58 ++++++++++++++++---
 .../source/iceberg/iceberg_profiler.py        |  4 +-
 3 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg.py b/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg.py
index 76f24bfd63d476..8101f0110509e3 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg.py
@@ -203,7 +203,9 @@ def _process_dataset(dataset_path: Identifier) -> Iterable[MetadataWorkUnit]:
                 with PerfTimer() as timer:
                     table = thread_local.local_catalog.load_table(dataset_path)
                     time_taken = timer.elapsed_seconds()
-                    self.report.report_table_load_time(time_taken)
+                    self.report.report_table_load_time(
+                        time_taken, dataset_name, table.metadata_location
+                    )
                 LOGGER.debug(f"Loaded table: {table.name()}, time taken: {time_taken}")
                 yield from self._create_iceberg_workunit(dataset_name, table)
             except NoSuchPropertyException as e:
@@ -247,7 +249,10 @@ def _process_dataset(dataset_path: Identifier) -> Iterable[MetadataWorkUnit]:
                     f"Iceberg Rest Catalog server error (500 status) encountered when processing table {dataset_path}, skipping it."
                 )
             except Exception as e:
-                self.report.report_failure("general", f"Failed to create workunit: {e}")
+                self.report.report_failure(
+                    "general",
+                    f"Failed to create workunit for dataset {dataset_name}: {e}",
+                )
                 LOGGER.exception(
                     f"Exception while processing table {dataset_path}, skipping it.",
                 )
@@ -312,7 +317,9 @@ def _create_iceberg_workunit(
             dataset_snapshot.aspects.append(schema_metadata)
 
             mce = MetadataChangeEvent(proposedSnapshot=dataset_snapshot)
-        self.report.report_table_processing_time(timer.elapsed_seconds())
+        self.report.report_table_processing_time(
+            timer.elapsed_seconds(), dataset_name, table.metadata_location
+        )
         yield MetadataWorkUnit(id=dataset_name, mce=mce)
 
         dpi_aspect = self._get_dataplatform_instance_aspect(dataset_urn=dataset_urn)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg_common.py b/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg_common.py
index 4a7f6bf4d60c1d..83fe3d1c079f17 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg_common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg_common.py
@@ -5,6 +5,7 @@
 from humanfriendly import format_timespan
 from pydantic import Field, validator
 from pyiceberg.catalog import Catalog, load_catalog
+from sortedcontainers import SortedList
 
 from datahub.configuration.common import AllowDenyPattern, ConfigModel
 from datahub.configuration.source_common import DatasetSourceConfigMixin
@@ -146,19 +147,40 @@ def get_catalog(self) -> Catalog:
         return load_catalog(name=catalog_name, **catalog_config)
 
 
+class TopTableTimings:
+    _VALUE_FIELD: str = "timing"
+    top_entites: SortedList
+    _size: int
+
+    def __init__(self, size: int = 10):
+        self._size = size
+        self.top_entites = SortedList(key=lambda x: -x.get(self._VALUE_FIELD, 0))
+
+    def add(self, entity: Dict[str, Any]) -> None:
+        if self._VALUE_FIELD not in entity:
+            return
+        self.top_entites.add(entity)
+        if len(self.top_entites) > self._size:
+            self.top_entites.pop()
+
+    def __str__(self) -> str:
+        if len(self.top_entites) == 0:
+            return "no timings reported"
+        return str(list(self.top_entites))
+
+
 class TimingClass:
-    times: List[int]
+    times: SortedList
 
     def __init__(self):
-        self.times = []
+        self.times = SortedList()
 
-    def add_timing(self, t):
-        self.times.append(t)
+    def add_timing(self, t: float) -> None:
+        self.times.add(t)
 
-    def __str__(self):
+    def __str__(self) -> str:
         if len(self.times) == 0:
             return "no timings reported"
-        self.times.sort()
         total = sum(self.times)
         avg = total / len(self.times)
         return str(
@@ -180,6 +202,9 @@ class IcebergSourceReport(StaleEntityRemovalSourceReport):
     load_table_timings: TimingClass = field(default_factory=TimingClass)
     processing_table_timings: TimingClass = field(default_factory=TimingClass)
     profiling_table_timings: TimingClass = field(default_factory=TimingClass)
+    tables_load_timings: TopTableTimings = field(default_factory=TopTableTimings)
+    tables_profile_timings: TopTableTimings = field(default_factory=TopTableTimings)
+    tables_process_timings: TopTableTimings = field(default_factory=TopTableTimings)
     listed_namespaces: int = 0
     total_listed_tables: int = 0
     tables_listed_per_namespace: TopKDict[str, int] = field(
@@ -201,11 +226,26 @@ def report_table_scanned(self, name: str) -> None:
     def report_dropped(self, ent_name: str) -> None:
         self.filtered.append(ent_name)
 
-    def report_table_load_time(self, t: float) -> None:
+    def report_table_load_time(
+        self, t: float, table_name: str, table_metadata_location: str
+    ) -> None:
         self.load_table_timings.add_timing(t)
+        self.tables_load_timings.add(
+            {"table": table_name, "timing": t, "metadata_file": table_metadata_location}
+        )
 
-    def report_table_processing_time(self, t: float) -> None:
+    def report_table_processing_time(
+        self, t: float, table_name: str, table_metadata_location: str
+    ) -> None:
         self.processing_table_timings.add_timing(t)
+        self.tables_process_timings.add(
+            {"table": table_name, "timing": t, "metadata_file": table_metadata_location}
+        )
 
-    def report_table_profiling_time(self, t: float) -> None:
+    def report_table_profiling_time(
+        self, t: float, table_name: str, table_metadata_location: str
+    ) -> None:
         self.profiling_table_timings.add_timing(t)
+        self.tables_profile_timings.add(
+            {"table": table_name, "timing": t, "metadata_file": table_metadata_location}
+        )
diff --git a/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg_profiler.py b/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg_profiler.py
index 9cc6dd08544e4e..7642cabbd1404c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg_profiler.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg_profiler.py
@@ -204,7 +204,9 @@ def profile_table(
                         )
                     dataset_profile.fieldProfiles.append(column_profile)
             time_taken = timer.elapsed_seconds()
-            self.report.report_table_profiling_time(time_taken)
+            self.report.report_table_profiling_time(
+                time_taken, dataset_name, table.metadata_location
+            )
             LOGGER.debug(
                 f"Finished profiling of dataset: {dataset_name} in {time_taken}"
             )

From fa1faf429b91d8dd1ab0376855ff732851639c39 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Mon, 13 Jan 2025 13:38:04 -0600
Subject: [PATCH 068/249] fix(header): prevent clickjack/iframing (#12328)

---
 docs-website/docusaurus.config.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs-website/docusaurus.config.js b/docs-website/docusaurus.config.js
index 31644f459ed731..350521ea8ee643 100644
--- a/docs-website/docusaurus.config.js
+++ b/docs-website/docusaurus.config.js
@@ -13,6 +13,15 @@ module.exports = {
   projectName: "datahub", // Usually your repo name.
   staticDirectories: ["static", "genStatic"],
   stylesheets: ["https://fonts.googleapis.com/css2?family=Manrope:wght@400;500;700&display=swap"],
+  headTags: [
+    {
+      tagName: 'meta',
+      attributes: {
+        httpEquiv: 'Content-Security-Policy',
+        content: "frame-ancestors 'self' https://*.acryl.io https://acryldata.io http://localhost:*"
+      }
+    },
+  ],
   scripts: [
     {
       src: "https://tools.luckyorange.com/core/lo.js?site-id=28ea8a38",

From 244f35de5c3381a33b35628967d9e78d33bfb66d Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Mon, 13 Jan 2025 12:55:57 -0800
Subject: [PATCH 069/249] fix(ingest): tighten Source.create type annotations
 (#12325)

---
 metadata-ingestion/src/datahub/ingestion/api/source.py     | 4 ++--
 .../src/datahub/ingestion/source/delta_lake/source.py      | 5 -----
 .../src/datahub/ingestion/source/demo_data.py              | 2 +-
 .../src/datahub/ingestion/source/fivetran/fivetran.py      | 7 +------
 .../ingestion/source/kafka_connect/kafka_connect.py        | 7 +------
 .../src/datahub/ingestion/source/metabase.py               | 7 +------
 metadata-ingestion/src/datahub/ingestion/source/mlflow.py  | 5 -----
 metadata-ingestion/src/datahub/ingestion/source/nifi.py    | 5 -----
 metadata-ingestion/src/datahub/ingestion/source/redash.py  | 5 -----
 .../src/datahub/ingestion/source/snowflake/snowflake_v2.py | 6 ------
 .../src/datahub/ingestion/source/superset.py               | 7 +------
 .../src/datahub/ingestion/source/tableau/tableau.py        | 6 ------
 metadata-ingestion/tests/unit/api/test_pipeline.py         | 3 ++-
 13 files changed, 9 insertions(+), 60 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/api/source.py b/metadata-ingestion/src/datahub/ingestion/api/source.py
index 53cb1b0ecad4ee..b04ffdb3258934 100644
--- a/metadata-ingestion/src/datahub/ingestion/api/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/api/source.py
@@ -23,7 +23,7 @@
 )
 
 from pydantic import BaseModel
-from typing_extensions import LiteralString
+from typing_extensions import LiteralString, Self
 
 from datahub.configuration.common import ConfigModel
 from datahub.configuration.source_common import PlatformInstanceConfigMixin
@@ -400,7 +400,7 @@ class Source(Closeable, metaclass=ABCMeta):
     ctx: PipelineContext
 
     @classmethod
-    def create(cls, config_dict: dict, ctx: PipelineContext) -> "Source":
+    def create(cls, config_dict: dict, ctx: PipelineContext) -> Self:
         # Technically, this method should be abstract. However, the @config_class
         # decorator automatically generates a create method at runtime if one is
         # not defined. Python still treats the class as abstract because it thinks
diff --git a/metadata-ingestion/src/datahub/ingestion/source/delta_lake/source.py b/metadata-ingestion/src/datahub/ingestion/source/delta_lake/source.py
index 98133ca69011e7..9df3905437b3b2 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/delta_lake/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/delta_lake/source.py
@@ -122,11 +122,6 @@ def __init__(self, config: DeltaLakeSourceConfig, ctx: PipelineContext):
             config_report,
         )
 
-    @classmethod
-    def create(cls, config_dict: dict, ctx: PipelineContext) -> "Source":
-        config = DeltaLakeSourceConfig.parse_obj(config_dict)
-        return cls(config, ctx)
-
     def _parse_datatype(self, raw_field_json_str: str) -> List[SchemaFieldClass]:
         raw_field_json = json.loads(raw_field_json_str)
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/demo_data.py b/metadata-ingestion/src/datahub/ingestion/source/demo_data.py
index 79831c016e2d5d..1d7aedb151864f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/demo_data.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/demo_data.py
@@ -29,7 +29,7 @@ class DemoDataSource(Source):
 
     def __init__(self, ctx: PipelineContext, config: DemoDataConfig):
         file_config = FileSourceConfig(path=str(download_sample_data()))
-        self.file_source = GenericFileSource(ctx, file_config)
+        self.file_source: GenericFileSource = GenericFileSource(ctx, file_config)
 
     def get_workunits(self) -> Iterable[MetadataWorkUnit]:
         yield from self.file_source.get_workunits()
diff --git a/metadata-ingestion/src/datahub/ingestion/source/fivetran/fivetran.py b/metadata-ingestion/src/datahub/ingestion/source/fivetran/fivetran.py
index adbfc48692db93..d8ebbe5b63d1ae 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/fivetran/fivetran.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/fivetran/fivetran.py
@@ -16,7 +16,7 @@
     platform_name,
     support_status,
 )
-from datahub.ingestion.api.source import MetadataWorkUnitProcessor, Source, SourceReport
+from datahub.ingestion.api.source import MetadataWorkUnitProcessor, SourceReport
 from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.ingestion.source.fivetran.config import (
     KNOWN_DATA_PLATFORM_MAPPING,
@@ -291,11 +291,6 @@ def _get_connector_workunits(
             dpi = self._generate_dpi_from_job(job, datajob)
             yield from self._get_dpi_workunits(job, dpi)
 
-    @classmethod
-    def create(cls, config_dict: dict, ctx: PipelineContext) -> Source:
-        config = FivetranSourceConfig.parse_obj(config_dict)
-        return cls(config, ctx)
-
     def get_workunit_processors(self) -> List[Optional[MetadataWorkUnitProcessor]]:
         return [
             *super().get_workunit_processors(),
diff --git a/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/kafka_connect.py b/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/kafka_connect.py
index fa6b614c4b52a6..72be864fc30a1c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/kafka_connect.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/kafka_connect.py
@@ -17,7 +17,7 @@
     platform_name,
     support_status,
 )
-from datahub.ingestion.api.source import MetadataWorkUnitProcessor, Source
+from datahub.ingestion.api.source import MetadataWorkUnitProcessor
 from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.ingestion.source.kafka_connect.common import (
     CONNECTOR_CLASS,
@@ -94,11 +94,6 @@ def __init__(self, config: KafkaConnectSourceConfig, ctx: PipelineContext):
         if not jpype.isJVMStarted():
             jpype.startJVM()
 
-    @classmethod
-    def create(cls, config_dict: dict, ctx: PipelineContext) -> Source:
-        config = KafkaConnectSourceConfig.parse_obj(config_dict)
-        return cls(config, ctx)
-
     def get_connectors_manifest(self) -> Iterable[ConnectorManifest]:
         """Get Kafka Connect connectors manifest using REST API.
         Enrich with lineages metadata.
diff --git a/metadata-ingestion/src/datahub/ingestion/source/metabase.py b/metadata-ingestion/src/datahub/ingestion/source/metabase.py
index 828bbd213a796f..ef16dc0a49a223 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/metabase.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/metabase.py
@@ -23,7 +23,7 @@
     platform_name,
     support_status,
 )
-from datahub.ingestion.api.source import MetadataWorkUnitProcessor, Source, SourceReport
+from datahub.ingestion.api.source import MetadataWorkUnitProcessor, SourceReport
 from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.ingestion.source.state.stale_entity_removal_handler import (
     StaleEntityRemovalHandler,
@@ -789,11 +789,6 @@ def get_datasource_from_id(
 
         return platform, dbname, schema, platform_instance
 
-    @classmethod
-    def create(cls, config_dict: dict, ctx: PipelineContext) -> Source:
-        config = MetabaseConfig.parse_obj(config_dict)
-        return cls(ctx, config)
-
     def get_workunit_processors(self) -> List[Optional[MetadataWorkUnitProcessor]]:
         return [
             *super().get_workunit_processors(),
diff --git a/metadata-ingestion/src/datahub/ingestion/source/mlflow.py b/metadata-ingestion/src/datahub/ingestion/source/mlflow.py
index 26d160acf330cf..b0b04dff20bffc 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/mlflow.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/mlflow.py
@@ -333,8 +333,3 @@ def _get_global_tags_workunit(
             aspect=global_tags,
         )
         return wu
-
-    @classmethod
-    def create(cls, config_dict: dict, ctx: PipelineContext) -> Source:
-        config = MLflowConfig.parse_obj(config_dict)
-        return cls(ctx, config)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/nifi.py b/metadata-ingestion/src/datahub/ingestion/source/nifi.py
index f55d7a883edefe..7f446f6d1c2718 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/nifi.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/nifi.py
@@ -484,11 +484,6 @@ def __init__(self, config: NifiSourceConfig, ctx: PipelineContext) -> None:
     def rest_api_base_url(self):
         return self.config.site_url[: -len("nifi/")] + "nifi-api/"
 
-    @classmethod
-    def create(cls, config_dict: dict, ctx: PipelineContext) -> "Source":
-        config = NifiSourceConfig.parse_obj(config_dict)
-        return cls(config, ctx)
-
     def get_report(self) -> SourceReport:
         return self.report
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/redash.py b/metadata-ingestion/src/datahub/ingestion/source/redash.py
index f11d1944029ebb..666cc8c63aa9ed 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/redash.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/redash.py
@@ -369,11 +369,6 @@ def validate_connection(self) -> None:
         else:
             raise ValueError(f"Failed to connect to {self.config.connect_uri}/api")
 
-    @classmethod
-    def create(cls, config_dict: dict, ctx: PipelineContext) -> Source:
-        config = RedashConfig.parse_obj(config_dict)
-        return cls(ctx, config)
-
     def _get_chart_data_source(self, data_source_id: Optional[int] = None) -> Dict:
         url = f"/api/data_sources/{data_source_id}"
         resp = self.client._get(url).json()
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
index c0385a8d5af30a..b8afd145727400 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
@@ -23,7 +23,6 @@
 from datahub.ingestion.api.source import (
     CapabilityReport,
     MetadataWorkUnitProcessor,
-    Source,
     SourceCapability,
     SourceReport,
     TestableSource,
@@ -251,11 +250,6 @@ def __init__(self, ctx: PipelineContext, config: SnowflakeV2Config):
 
         self.add_config_to_report()
 
-    @classmethod
-    def create(cls, config_dict: dict, ctx: PipelineContext) -> "Source":
-        config = SnowflakeV2Config.parse_obj(config_dict)
-        return cls(ctx, config)
-
     @staticmethod
     def test_connection(config_dict: dict) -> TestConnectionReport:
         test_report = TestConnectionReport()
diff --git a/metadata-ingestion/src/datahub/ingestion/source/superset.py b/metadata-ingestion/src/datahub/ingestion/source/superset.py
index 1da233bf0b22ab..a8b328f6e17739 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/superset.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/superset.py
@@ -33,7 +33,7 @@
     platform_name,
     support_status,
 )
-from datahub.ingestion.api.source import MetadataWorkUnitProcessor, Source
+from datahub.ingestion.api.source import MetadataWorkUnitProcessor
 from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.ingestion.source.sql.sql_types import resolve_sql_type
 from datahub.ingestion.source.sql.sqlalchemy_uri_mapper import (
@@ -265,11 +265,6 @@ def login(self) -> requests.Session:
             # TODO(Gabe): how should we message about this error?
         return requests_session
 
-    @classmethod
-    def create(cls, config_dict: dict, ctx: PipelineContext) -> Source:
-        config = SupersetConfig.parse_obj(config_dict)
-        return cls(ctx, config)
-
     def paginate_entity_api_results(self, entity_type, page_size=100):
         current_page = 0
         total_items = page_size
diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
index 2543cbe653ba72..ea3fb6c979a19c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
@@ -71,7 +71,6 @@
 from datahub.ingestion.api.source import (
     CapabilityReport,
     MetadataWorkUnitProcessor,
-    Source,
     StructuredLogLevel,
     TestableSource,
     TestConnectionReport,
@@ -804,11 +803,6 @@ def test_connection(config_dict: dict) -> TestConnectionReport:
     def get_report(self) -> TableauSourceReport:
         return self.report
 
-    @classmethod
-    def create(cls, config_dict: dict, ctx: PipelineContext) -> Source:
-        config = TableauConfig.parse_obj(config_dict)
-        return cls(config, ctx)
-
     def get_workunit_processors(self) -> List[Optional[MetadataWorkUnitProcessor]]:
         return [
             *super().get_workunit_processors(),
diff --git a/metadata-ingestion/tests/unit/api/test_pipeline.py b/metadata-ingestion/tests/unit/api/test_pipeline.py
index fe3d3160b729a1..324e4ed0f6e853 100644
--- a/metadata-ingestion/tests/unit/api/test_pipeline.py
+++ b/metadata-ingestion/tests/unit/api/test_pipeline.py
@@ -4,6 +4,7 @@
 
 import pytest
 from freezegun import freeze_time
+from typing_extensions import Self
 
 from datahub.configuration.common import DynamicTypedConfig
 from datahub.ingestion.api.committable import CommitPolicy, Committable
@@ -440,7 +441,7 @@ def __init__(self, ctx: PipelineContext):
         ]
 
     @classmethod
-    def create(cls, config_dict: dict, ctx: PipelineContext) -> "Source":
+    def create(cls, config_dict: dict, ctx: PipelineContext) -> Self:
         assert not config_dict
         return cls(ctx)
 

From e34b2e453c5ba0d4d13f0a6bbc993acbff2576aa Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Mon, 13 Jan 2025 12:56:25 -0800
Subject: [PATCH 070/249] fix(ci): only upload metadata model on root repo
 (#12324)

---
 .github/workflows/metadata-model.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/metadata-model.yml b/.github/workflows/metadata-model.yml
index 632e6ac35d673e..6f62284afcc172 100644
--- a/.github/workflows/metadata-model.yml
+++ b/.github/workflows/metadata-model.yml
@@ -20,11 +20,9 @@ jobs:
     steps:
       - name: Check whether upload to datahub is enabled
         id: publish
-        env:
-          ENABLE_PUBLISH: ${{ secrets.DataHubToken }}
         run: |
-          echo "Enable publish: ${{ env.ENABLE_PUBLISH != '' }}"
-          echo "publish=${{ env.ENABLE_PUBLISH != '' }}" >> $GITHUB_OUTPUT
+          echo "Enable publish: ${{ github.repository == 'datahub-project/datahub' }}"
+          echo "publish=${{ github.repository == 'datahub-project/datahub' }}" >> $GITHUB_OUTPUT
   metadata-ingestion-docgen:
     runs-on: ubuntu-latest
     needs: setup

From ddd0d21bf9e2a084dea3dfc6f4e000a322c56e7b Mon Sep 17 00:00:00 2001
From: Hyejin Yoon <0327jane@gmail.com>
Date: Tue, 14 Jan 2025 07:57:10 +0900
Subject: [PATCH 071/249] feat(models): update mlflow-related mappers (#12263)

Co-authored-by: Shirshanka Das <shirshanka@apache.org>
Co-authored-by: RyanHolstien <RyanHolstien@users.noreply.github.com>
---
 .../datahub/graphql/GmsGraphQLEngine.java     |  37 ++-
 .../DataPlatformInstanceAspectMapper.java     |   6 +
 .../mappers/TimeStampToAuditStampMapper.java  |  24 ++
 .../common/mappers/UrnToEntityMapper.java     |   6 +
 .../DataProcessInstanceType.java              | 102 ++++++
 .../mappers/DataProcessInstanceMapper.java    | 109 ++++++-
 .../types/entitytype/EntityTypeUrnMapper.java |   3 +
 .../mappers/MLModelPropertiesMapper.java      |  10 +
 .../src/main/resources/entity.graphql         |   2 +-
 .../TimeStampToAuditStampMapperTest.java      |  46 +++
 .../DataPlatformInstanceAspectMapperTest.java |  75 +++++
 .../DataProcessInstanceTypeTest.java          | 246 +++++++++++++++
 .../DataProcessInstanceMapperTest.java        | 127 ++++++++
 .../src/app/buildEntityRegistry.ts            |   2 +
 .../DataProcessInstanceEntity.tsx             | 264 ++++++++++++++++
 .../dataProcessInstance/preview/Preview.tsx   | 103 ++++++
 .../src/graphql/dataProcessInstance.graphql   | 181 +++++++++++
 .../src/graphql/fragments.graphql             |  14 +
 datahub-web-react/src/graphql/lineage.graphql |  19 ++
 .../src/graphql/mlModelGroup.graphql          |  12 +
 .../java/com/linkedin/metadata/Constants.java |   4 +
 .../request/SearchRequestHandlerTest.java     |   5 +
 .../ml/metadata/MLModelGroupProperties.pdl    |  14 +-
 .../ml/metadata/MLModelLineageInfo.pdl        |  35 +++
 .../ml/metadata/MLModelProperties.pdl         |  27 +-
 .../graphql/featureflags/FeatureFlags.java    |   1 +
 .../com.linkedin.entity.aspects.snapshot.json |  71 +++--
 ...com.linkedin.entity.entities.snapshot.json |  88 +++---
 .../com.linkedin.entity.runs.snapshot.json    |  71 +++--
 ...nkedin.operations.operations.snapshot.json |  71 +++--
 ...m.linkedin.platform.platform.snapshot.json |  88 +++---
 .../tests/data_process_instance/__init__.py   |   0
 .../test_data_process_instance.py             | 293 ++++++++++++++++++
 smoke-test/tests/ml_models/__init__.py        |   0
 smoke-test/tests/ml_models/test_ml_models.py  | 133 ++++++++
 35 files changed, 2046 insertions(+), 243 deletions(-)
 create mode 100644 datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/TimeStampToAuditStampMapper.java
 create mode 100644 datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/DataProcessInstanceType.java
 create mode 100644 datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/common/mappers/TimeStampToAuditStampMapperTest.java
 create mode 100644 datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataplatforminstance/mapper/DataPlatformInstanceAspectMapperTest.java
 create mode 100644 datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/DataProcessInstanceTypeTest.java
 create mode 100644 datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapperTest.java
 create mode 100644 datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx
 create mode 100644 datahub-web-react/src/app/entity/dataProcessInstance/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/graphql/dataProcessInstance.graphql
 create mode 100644 metadata-models/src/main/pegasus/com/linkedin/ml/metadata/MLModelLineageInfo.pdl
 create mode 100644 smoke-test/tests/data_process_instance/__init__.py
 create mode 100644 smoke-test/tests/data_process_instance/test_data_process_instance.py
 create mode 100644 smoke-test/tests/ml_models/__init__.py
 create mode 100644 smoke-test/tests/ml_models/test_ml_models.py

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
index 59335ba605a741..3c46c1a8dce35c 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
@@ -56,6 +56,7 @@
 import com.linkedin.datahub.graphql.generated.DataJobInputOutput;
 import com.linkedin.datahub.graphql.generated.DataPlatform;
 import com.linkedin.datahub.graphql.generated.DataPlatformInstance;
+import com.linkedin.datahub.graphql.generated.DataProcessInstance;
 import com.linkedin.datahub.graphql.generated.DataQualityContract;
 import com.linkedin.datahub.graphql.generated.Dataset;
 import com.linkedin.datahub.graphql.generated.DatasetStatsSummary;
@@ -346,6 +347,7 @@
 import com.linkedin.datahub.graphql.types.datajob.DataJobType;
 import com.linkedin.datahub.graphql.types.dataplatform.DataPlatformType;
 import com.linkedin.datahub.graphql.types.dataplatforminstance.DataPlatformInstanceType;
+import com.linkedin.datahub.graphql.types.dataprocessinst.DataProcessInstanceType;
 import com.linkedin.datahub.graphql.types.dataprocessinst.mappers.DataProcessInstanceRunEventMapper;
 import com.linkedin.datahub.graphql.types.dataproduct.DataProductType;
 import com.linkedin.datahub.graphql.types.dataset.DatasetType;
@@ -530,6 +532,7 @@ public class GmsGraphQLEngine {
   private final FormType formType;
   private final IncidentType incidentType;
   private final RestrictedType restrictedType;
+  private final DataProcessInstanceType dataProcessInstanceType;
 
   private final int graphQLQueryComplexityLimit;
   private final int graphQLQueryDepthLimit;
@@ -649,6 +652,7 @@ public GmsGraphQLEngine(final GmsGraphQLEngineArgs args) {
     this.formType = new FormType(entityClient);
     this.incidentType = new IncidentType(entityClient);
     this.restrictedType = new RestrictedType(entityClient, restrictedService);
+    this.dataProcessInstanceType = new DataProcessInstanceType(entityClient, featureFlags);
 
     this.graphQLQueryComplexityLimit = args.graphQLQueryComplexityLimit;
     this.graphQLQueryDepthLimit = args.graphQLQueryDepthLimit;
@@ -699,7 +703,8 @@ public GmsGraphQLEngine(final GmsGraphQLEngineArgs args) {
                 formType,
                 incidentType,
                 restrictedType,
-                businessAttributeType));
+                businessAttributeType,
+                dataProcessInstanceType));
     this.loadableTypes = new ArrayList<>(entityTypes);
     // Extend loadable types with types from the plugins
     // This allows us to offer search and browse capabilities out of the box for
@@ -1024,6 +1029,7 @@ private void configureQueryResolvers(final RuntimeWiring.Builder builder) {
                 .dataFetcher("tag", getResolver(tagType))
                 .dataFetcher("dataFlow", getResolver(dataFlowType))
                 .dataFetcher("dataJob", getResolver(dataJobType))
+                .dataFetcher("dataProcessInstance", getResolver(dataProcessInstanceType))
                 .dataFetcher("glossaryTerm", getResolver(glossaryTermType))
                 .dataFetcher("glossaryNode", getResolver(glossaryNodeType))
                 .dataFetcher("domain", getResolver((domainType)))
@@ -3058,6 +3064,35 @@ private void configureDataProcessInstanceResolvers(final RuntimeWiring.Builder b
         "DataProcessInstance",
         typeWiring ->
             typeWiring
+                .dataFetcher(
+                    "dataPlatformInstance",
+                    new LoadableTypeResolver<>(
+                        dataPlatformInstanceType,
+                        (env) -> {
+                          final DataProcessInstance dataProcessInstance = env.getSource();
+                          return dataProcessInstance.getDataPlatformInstance() != null
+                              ? dataProcessInstance.getDataPlatformInstance().getUrn()
+                              : null;
+                        }))
+                .dataFetcher(
+                    "platform",
+                    new LoadableTypeResolver<>(
+                        dataPlatformType,
+                        (env) -> {
+                          final DataProcessInstance dataProcessInstance = env.getSource();
+                          return dataProcessInstance.getPlatform() != null
+                              ? dataProcessInstance.getPlatform().getUrn()
+                              : null;
+                        }))
+                .dataFetcher("parentContainers", new ParentContainersResolver(entityClient))
+                .dataFetcher(
+                    "container",
+                    new LoadableTypeResolver<>(
+                        containerType,
+                        (env) -> {
+                          final DataProcessInstance dpi = env.getSource();
+                          return dpi.getContainer() != null ? dpi.getContainer().getUrn() : null;
+                        }))
                 .dataFetcher("relationships", new EntityRelationshipsResultResolver(graphClient))
                 .dataFetcher(
                     "lineage",
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DataPlatformInstanceAspectMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DataPlatformInstanceAspectMapper.java
index 4345819867617b..ab3127a3ae232b 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DataPlatformInstanceAspectMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DataPlatformInstanceAspectMapper.java
@@ -1,6 +1,7 @@
 package com.linkedin.datahub.graphql.types.common.mappers;
 
 import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.generated.DataPlatform;
 import com.linkedin.datahub.graphql.generated.DataPlatformInstance;
 import com.linkedin.datahub.graphql.generated.EntityType;
 import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
@@ -28,6 +29,11 @@ public DataPlatformInstance apply(
       result.setType(EntityType.DATA_PLATFORM_INSTANCE);
       result.setUrn(input.getInstance().toString());
     }
+    result.setPlatform(
+        DataPlatform.builder()
+            .setUrn(input.getPlatform().toString())
+            .setType(EntityType.DATA_PLATFORM)
+            .build());
     return result;
   }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/TimeStampToAuditStampMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/TimeStampToAuditStampMapper.java
new file mode 100644
index 00000000000000..58f78b146b406c
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/TimeStampToAuditStampMapper.java
@@ -0,0 +1,24 @@
+package com.linkedin.datahub.graphql.types.common.mappers;
+
+import com.linkedin.common.TimeStamp;
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.generated.AuditStamp;
+import javax.annotation.Nullable;
+
+public class TimeStampToAuditStampMapper {
+
+  public static final TimeStampToAuditStampMapper INSTANCE = new TimeStampToAuditStampMapper();
+
+  public static AuditStamp map(
+      @Nullable final QueryContext context, @Nullable final TimeStamp input) {
+    if (input == null) {
+      return null;
+    }
+    final AuditStamp result = new AuditStamp();
+    result.setTime(input.getTime());
+    if (input.hasActor()) {
+      result.setActor(input.getActor().toString());
+    }
+    return result;
+  }
+}
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/UrnToEntityMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/UrnToEntityMapper.java
index 1988cafc486c18..eae33e6da2e56d 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/UrnToEntityMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/UrnToEntityMapper.java
@@ -18,6 +18,7 @@
 import com.linkedin.datahub.graphql.generated.DataJob;
 import com.linkedin.datahub.graphql.generated.DataPlatform;
 import com.linkedin.datahub.graphql.generated.DataPlatformInstance;
+import com.linkedin.datahub.graphql.generated.DataProcessInstance;
 import com.linkedin.datahub.graphql.generated.DataProduct;
 import com.linkedin.datahub.graphql.generated.Dataset;
 import com.linkedin.datahub.graphql.generated.Domain;
@@ -225,6 +226,11 @@ public Entity apply(@Nullable QueryContext context, Urn input) {
       ((BusinessAttribute) partialEntity).setUrn(input.toString());
       ((BusinessAttribute) partialEntity).setType(EntityType.BUSINESS_ATTRIBUTE);
     }
+    if (input.getEntityType().equals(DATA_PROCESS_INSTANCE_ENTITY_NAME)) {
+      partialEntity = new DataProcessInstance();
+      ((DataProcessInstance) partialEntity).setUrn(input.toString());
+      ((DataProcessInstance) partialEntity).setType(EntityType.DATA_PROCESS_INSTANCE);
+    }
     return partialEntity;
   }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/DataProcessInstanceType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/DataProcessInstanceType.java
new file mode 100644
index 00000000000000..eeaaaa96f51704
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/DataProcessInstanceType.java
@@ -0,0 +1,102 @@
+package com.linkedin.datahub.graphql.types.dataprocessinst;
+
+import static com.linkedin.metadata.Constants.*;
+
+import com.google.common.collect.ImmutableSet;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.featureflags.FeatureFlags;
+import com.linkedin.datahub.graphql.generated.DataProcessInstance;
+import com.linkedin.datahub.graphql.generated.Entity;
+import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.datahub.graphql.types.dataprocessinst.mappers.DataProcessInstanceMapper;
+import com.linkedin.entity.EntityResponse;
+import com.linkedin.entity.client.EntityClient;
+import graphql.execution.DataFetcherResult;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class DataProcessInstanceType
+    implements com.linkedin.datahub.graphql.types.EntityType<DataProcessInstance, String> {
+
+  public static final Set<String> ASPECTS_TO_FETCH =
+      ImmutableSet.of(
+          DATA_PROCESS_INSTANCE_KEY_ASPECT_NAME,
+          DATA_PLATFORM_INSTANCE_ASPECT_NAME,
+          DATA_PROCESS_INSTANCE_PROPERTIES_ASPECT_NAME,
+          DATA_PROCESS_INSTANCE_INPUT_ASPECT_NAME,
+          DATA_PROCESS_INSTANCE_OUTPUT_ASPECT_NAME,
+          DATA_PROCESS_INSTANCE_RUN_EVENT_ASPECT_NAME,
+          TEST_RESULTS_ASPECT_NAME,
+          DATA_PROCESS_INSTANCE_RELATIONSHIPS_ASPECT_NAME,
+          ML_TRAINING_RUN_PROPERTIES_ASPECT_NAME,
+          SUB_TYPES_ASPECT_NAME,
+          CONTAINER_ASPECT_NAME);
+
+  private final EntityClient _entityClient;
+  private final FeatureFlags _featureFlags;
+
+  @Override
+  public EntityType type() {
+    return EntityType.DATA_PROCESS_INSTANCE;
+  }
+
+  @Override
+  public Function<Entity, String> getKeyProvider() {
+    return Entity::getUrn;
+  }
+
+  @Override
+  public Class<DataProcessInstance> objectClass() {
+    return DataProcessInstance.class;
+  }
+
+  @Override
+  public List<DataFetcherResult<DataProcessInstance>> batchLoad(
+      @Nonnull List<String> urns, @Nonnull QueryContext context) throws Exception {
+    final List<Urn> dataProcessInstanceUrns =
+        urns.stream().map(UrnUtils::getUrn).collect(Collectors.toList());
+
+    try {
+      Map<Urn, EntityResponse> entities = new HashMap<>();
+      if (_featureFlags.isDataProcessInstanceEntityEnabled()) {
+        entities =
+            _entityClient.batchGetV2(
+                context.getOperationContext(),
+                DATA_PROCESS_INSTANCE_ENTITY_NAME,
+                new HashSet<>(dataProcessInstanceUrns),
+                ASPECTS_TO_FETCH);
+      }
+
+      final List<EntityResponse> gmsResults = new ArrayList<>();
+      for (Urn urn : dataProcessInstanceUrns) {
+        if (_featureFlags.isDataProcessInstanceEntityEnabled()) {
+          gmsResults.add(entities.getOrDefault(urn, null));
+        }
+      }
+
+      return gmsResults.stream()
+          .map(
+              gmsResult ->
+                  gmsResult == null
+                      ? null
+                      : DataFetcherResult.<DataProcessInstance>newResult()
+                          .data(DataProcessInstanceMapper.map(context, gmsResult))
+                          .build())
+          .collect(Collectors.toList());
+
+    } catch (Exception e) {
+      throw new RuntimeException("Failed to load Data Process Instance entity", e);
+    }
+  }
+}
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapper.java
index 7a4d342281fe54..28c9c8936fdbfb 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapper.java
@@ -2,25 +2,38 @@
 
 import static com.linkedin.metadata.Constants.*;
 
+import com.linkedin.common.DataPlatformInstance;
+import com.linkedin.common.SubTypes;
+import com.linkedin.common.urn.Urn;
 import com.linkedin.data.DataMap;
 import com.linkedin.data.template.RecordTemplate;
 import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.generated.DataPlatform;
 import com.linkedin.datahub.graphql.generated.DataProcessInstance;
 import com.linkedin.datahub.graphql.generated.EntityType;
 import com.linkedin.datahub.graphql.types.common.mappers.AuditStampMapper;
+import com.linkedin.datahub.graphql.types.common.mappers.CustomPropertiesMapper;
+import com.linkedin.datahub.graphql.types.common.mappers.DataPlatformInstanceAspectMapper;
+import com.linkedin.datahub.graphql.types.common.mappers.SubTypesMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.util.MappingHelper;
 import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
+import com.linkedin.datahub.graphql.types.mlmodel.mappers.MLHyperParamMapper;
+import com.linkedin.datahub.graphql.types.mlmodel.mappers.MLMetricMapper;
 import com.linkedin.dataprocess.DataProcessInstanceProperties;
 import com.linkedin.entity.EntityResponse;
 import com.linkedin.entity.EnvelopedAspectMap;
+import com.linkedin.ml.metadata.MLTrainingRunProperties;
+import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Maps Pegasus {@link RecordTemplate} objects to objects conforming to the GQL schema.
  *
  * <p>To be replaced by auto-generated mappers implementations
  */
+@Slf4j
 public class DataProcessInstanceMapper implements ModelMapper<EntityResponse, DataProcessInstance> {
 
   public static final DataProcessInstanceMapper INSTANCE = new DataProcessInstanceMapper();
@@ -30,6 +43,19 @@ public static DataProcessInstance map(
     return INSTANCE.apply(context, entityResponse);
   }
 
+  private void mapContainers(
+      @Nullable final QueryContext context,
+      @Nonnull DataProcessInstance dataProcessInstance,
+      @Nonnull DataMap dataMap) {
+    final com.linkedin.container.Container gmsContainer =
+        new com.linkedin.container.Container(dataMap);
+    dataProcessInstance.setContainer(
+        com.linkedin.datahub.graphql.generated.Container.builder()
+            .setType(EntityType.CONTAINER)
+            .setUrn(gmsContainer.getContainer().toString())
+            .build());
+  }
+
   @Override
   public DataProcessInstance apply(
       @Nullable QueryContext context, @Nonnull final EntityResponse entityResponse) {
@@ -37,24 +63,97 @@ public DataProcessInstance apply(
     result.setUrn(entityResponse.getUrn().toString());
     result.setType(EntityType.DATA_PROCESS_INSTANCE);
 
+    Urn entityUrn = entityResponse.getUrn();
     EnvelopedAspectMap aspectMap = entityResponse.getAspects();
     MappingHelper<DataProcessInstance> mappingHelper = new MappingHelper<>(aspectMap, result);
     mappingHelper.mapToResult(
-        context, DATA_PROCESS_INSTANCE_PROPERTIES_ASPECT_NAME, this::mapDataProcessProperties);
+        DATA_PROCESS_INSTANCE_PROPERTIES_ASPECT_NAME,
+        (dataProcessInstance, dataMap) ->
+            mapDataProcessProperties(context, dataProcessInstance, dataMap, entityUrn));
+    mappingHelper.mapToResult(
+        ML_TRAINING_RUN_PROPERTIES_ASPECT_NAME,
+        (dataProcessInstance, dataMap) ->
+            mapTrainingRunProperties(context, dataProcessInstance, dataMap));
+    mappingHelper.mapToResult(
+        DATA_PLATFORM_INSTANCE_ASPECT_NAME,
+        (dataProcessInstance, dataMap) -> {
+          DataPlatformInstance dataPlatformInstance = new DataPlatformInstance(dataMap);
+          dataProcessInstance.setDataPlatformInstance(
+              DataPlatformInstanceAspectMapper.map(context, dataPlatformInstance));
+          DataPlatform dataPlatform = new DataPlatform();
+          dataPlatform.setUrn(dataPlatformInstance.getPlatform().toString());
+          dataPlatform.setType(EntityType.DATA_PLATFORM);
+          dataProcessInstance.setPlatform(dataPlatform);
+        });
+    mappingHelper.mapToResult(
+        SUB_TYPES_ASPECT_NAME,
+        (dataProcessInstance, dataMap) ->
+            dataProcessInstance.setSubTypes(SubTypesMapper.map(context, new SubTypes(dataMap))));
+    mappingHelper.mapToResult(
+        CONTAINER_ASPECT_NAME,
+        (dataProcessInstance, dataMap) -> mapContainers(context, dataProcessInstance, dataMap));
 
     return mappingHelper.getResult();
   }
 
-  private void mapDataProcessProperties(
+  private void mapTrainingRunProperties(
       @Nonnull QueryContext context, @Nonnull DataProcessInstance dpi, @Nonnull DataMap dataMap) {
+    MLTrainingRunProperties trainingProperties = new MLTrainingRunProperties(dataMap);
+
+    com.linkedin.datahub.graphql.generated.MLTrainingRunProperties properties =
+        new com.linkedin.datahub.graphql.generated.MLTrainingRunProperties();
+    if (trainingProperties.hasId()) {
+      properties.setId(trainingProperties.getId());
+    }
+    if (trainingProperties.hasOutputUrls()) {
+      properties.setOutputUrls(
+          trainingProperties.getOutputUrls().stream()
+              .map(url -> url.toString())
+              .collect(Collectors.toList()));
+    }
+    if (trainingProperties.getHyperParams() != null) {
+      properties.setHyperParams(
+          trainingProperties.getHyperParams().stream()
+              .map(param -> MLHyperParamMapper.map(context, param))
+              .collect(Collectors.toList()));
+    }
+    if (trainingProperties.getTrainingMetrics() != null) {
+      properties.setTrainingMetrics(
+          trainingProperties.getTrainingMetrics().stream()
+              .map(metric -> MLMetricMapper.map(context, metric))
+              .collect(Collectors.toList()));
+    }
+    if (trainingProperties.hasId()) {
+      properties.setId(trainingProperties.getId());
+    }
+    dpi.setMlTrainingRunProperties(properties);
+  }
+
+  private void mapDataProcessProperties(
+      @Nonnull QueryContext context,
+      @Nonnull DataProcessInstance dpi,
+      @Nonnull DataMap dataMap,
+      @Nonnull Urn entityUrn) {
     DataProcessInstanceProperties dataProcessInstanceProperties =
         new DataProcessInstanceProperties(dataMap);
+
+    com.linkedin.datahub.graphql.generated.DataProcessInstanceProperties properties =
+        new com.linkedin.datahub.graphql.generated.DataProcessInstanceProperties();
+
     dpi.setName(dataProcessInstanceProperties.getName());
-    if (dataProcessInstanceProperties.hasCreated()) {
-      dpi.setCreated(AuditStampMapper.map(context, dataProcessInstanceProperties.getCreated()));
-    }
+    properties.setName(dataProcessInstanceProperties.getName());
     if (dataProcessInstanceProperties.hasExternalUrl()) {
       dpi.setExternalUrl(dataProcessInstanceProperties.getExternalUrl().toString());
+      properties.setExternalUrl(dataProcessInstanceProperties.getExternalUrl().toString());
+    }
+    if (dataProcessInstanceProperties.hasCustomProperties()) {
+      properties.setCustomProperties(
+          CustomPropertiesMapper.map(
+              dataProcessInstanceProperties.getCustomProperties(), entityUrn));
+    }
+    if (dataProcessInstanceProperties.hasCreated()) {
+      dpi.setCreated(AuditStampMapper.map(context, dataProcessInstanceProperties.getCreated()));
     }
+    dpi.setProperties(properties);
   }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapper.java
index 334faf753cb8b5..5b72c2b3c11c5e 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapper.java
@@ -77,6 +77,9 @@ public class EntityTypeUrnMapper {
           .put(
               Constants.BUSINESS_ATTRIBUTE_ENTITY_NAME,
               "urn:li:entityType:datahub.businessAttribute")
+          .put(
+              Constants.DATA_PROCESS_INSTANCE_ENTITY_NAME,
+              "urn:li:entityType:datahub.dataProcessInstance")
           .build();
 
   private static final Map<String, String> ENTITY_TYPE_URN_TO_NAME =
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelPropertiesMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelPropertiesMapper.java
index 265005c2caa9ee..7b00fe88f2d683 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelPropertiesMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelPropertiesMapper.java
@@ -7,6 +7,7 @@
 import com.linkedin.datahub.graphql.generated.MLModelGroup;
 import com.linkedin.datahub.graphql.generated.MLModelProperties;
 import com.linkedin.datahub.graphql.types.common.mappers.CustomPropertiesMapper;
+import com.linkedin.datahub.graphql.types.common.mappers.TimeStampToAuditStampMapper;
 import com.linkedin.datahub.graphql.types.mappers.EmbeddedModelMapper;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
@@ -31,6 +32,15 @@ public MLModelProperties apply(
     final MLModelProperties result = new MLModelProperties();
 
     result.setDate(mlModelProperties.getDate());
+    if (mlModelProperties.getName() != null) {
+      result.setName(mlModelProperties.getName());
+    } else {
+      // backfill name from URN for backwards compatibility
+      result.setName(entityUrn.getEntityKey().get(1)); // indexed access is safe here
+    }
+    result.setCreated(TimeStampToAuditStampMapper.map(context, mlModelProperties.getCreated()));
+    result.setLastModified(
+        TimeStampToAuditStampMapper.map(context, mlModelProperties.getLastModified()));
     result.setDescription(mlModelProperties.getDescription());
     if (mlModelProperties.getExternalUrl() != null) {
       result.setExternalUrl(mlModelProperties.getExternalUrl().toString());
diff --git a/datahub-graphql-core/src/main/resources/entity.graphql b/datahub-graphql-core/src/main/resources/entity.graphql
index adb24d92587b58..9dd1948e18e042 100644
--- a/datahub-graphql-core/src/main/resources/entity.graphql
+++ b/datahub-graphql-core/src/main/resources/entity.graphql
@@ -10098,7 +10098,7 @@ type MLModelProperties {
     """
     The display name of the model used in the UI
     """
-    name: String!
+    name: String
 
     """
     Detailed description of the model's purpose and characteristics
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/common/mappers/TimeStampToAuditStampMapperTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/common/mappers/TimeStampToAuditStampMapperTest.java
new file mode 100644
index 00000000000000..4e0dbd7b1733b4
--- /dev/null
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/common/mappers/TimeStampToAuditStampMapperTest.java
@@ -0,0 +1,46 @@
+package com.linkedin.datahub.graphql.types.common.mappers;
+
+import static org.testng.Assert.*;
+
+import com.linkedin.common.TimeStamp;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.datahub.graphql.generated.AuditStamp;
+import org.testng.annotations.Test;
+
+public class TimeStampToAuditStampMapperTest {
+
+  private static final String TEST_ACTOR_URN = "urn:li:corpuser:testUser";
+  private static final long TEST_TIME = 1234567890L;
+
+  @Test
+  public void testMapWithActor() throws Exception {
+    TimeStamp input = new TimeStamp();
+    input.setTime(TEST_TIME);
+    input.setActor(Urn.createFromString(TEST_ACTOR_URN));
+
+    AuditStamp result = TimeStampToAuditStampMapper.map(null, input);
+
+    assertNotNull(result);
+    assertEquals(result.getTime().longValue(), TEST_TIME);
+    assertEquals(result.getActor(), TEST_ACTOR_URN);
+  }
+
+  @Test
+  public void testMapWithoutActor() {
+    TimeStamp input = new TimeStamp();
+    input.setTime(TEST_TIME);
+
+    AuditStamp result = TimeStampToAuditStampMapper.map(null, input);
+
+    assertNotNull(result);
+    assertEquals(result.getTime().longValue(), TEST_TIME);
+    assertNull(result.getActor());
+  }
+
+  @Test
+  public void testMapNull() {
+    AuditStamp result = TimeStampToAuditStampMapper.map(null, null);
+
+    assertNull(result);
+  }
+}
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataplatforminstance/mapper/DataPlatformInstanceAspectMapperTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataplatforminstance/mapper/DataPlatformInstanceAspectMapperTest.java
new file mode 100644
index 00000000000000..479d7340fef945
--- /dev/null
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataplatforminstance/mapper/DataPlatformInstanceAspectMapperTest.java
@@ -0,0 +1,75 @@
+package com.linkedin.datahub.graphql.types.dataplatforminstance.mapper;
+
+import static org.testng.Assert.*;
+
+import com.linkedin.common.urn.DataPlatformUrn;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.datahub.graphql.generated.DataPlatformInstance;
+import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.datahub.graphql.types.common.mappers.DataPlatformInstanceAspectMapper;
+import org.testng.annotations.Test;
+
+public class DataPlatformInstanceAspectMapperTest {
+
+  private static final String TEST_PLATFORM = "hive";
+  private static final String TEST_INSTANCE = "prod";
+  private static final String TEST_PLATFORM_URN = "urn:li:dataPlatform:" + TEST_PLATFORM;
+  private static final String TEST_INSTANCE_URN =
+      String.format(
+          "urn:li:dataPlatformInstance:(urn:li:dataPlatform:%s,%s)", TEST_PLATFORM, TEST_INSTANCE);
+
+  @Test
+  public void testMapWithInstance() throws Exception {
+    // Create test input
+    com.linkedin.common.DataPlatformInstance input = new com.linkedin.common.DataPlatformInstance();
+    DataPlatformUrn platformUrn = new DataPlatformUrn(TEST_PLATFORM);
+    Urn instanceUrn = Urn.createFromString(TEST_INSTANCE_URN);
+
+    input.setPlatform(platformUrn);
+    input.setInstance(instanceUrn);
+
+    // Map and verify
+    DataPlatformInstance result = DataPlatformInstanceAspectMapper.map(null, input);
+
+    assertNotNull(result);
+    assertEquals(result.getType(), EntityType.DATA_PLATFORM_INSTANCE);
+    assertEquals(result.getUrn(), TEST_INSTANCE_URN);
+
+    // Verify platform mapping
+    assertNotNull(result.getPlatform());
+    assertEquals(result.getPlatform().getType(), EntityType.DATA_PLATFORM);
+    assertEquals(result.getPlatform().getUrn(), TEST_PLATFORM_URN);
+  }
+
+  @Test
+  public void testMapWithoutInstance() throws Exception {
+    // Create test input with only platform
+    com.linkedin.common.DataPlatformInstance input = new com.linkedin.common.DataPlatformInstance();
+    DataPlatformUrn platformUrn = new DataPlatformUrn(TEST_PLATFORM);
+    input.setPlatform(platformUrn);
+
+    // Map and verify
+    DataPlatformInstance result = DataPlatformInstanceAspectMapper.map(null, input);
+
+    assertNotNull(result);
+    assertNull(result.getType()); // Type should be null when no instance
+    assertNull(result.getUrn()); // URN should be null when no instance
+
+    // Verify platform is still mapped correctly
+    assertNotNull(result.getPlatform());
+    assertEquals(result.getPlatform().getType(), EntityType.DATA_PLATFORM);
+    assertEquals(result.getPlatform().getUrn(), TEST_PLATFORM_URN);
+  }
+
+  @Test(expectedExceptions = NullPointerException.class)
+  public void testMapNull() {
+    DataPlatformInstanceAspectMapper.map(null, null);
+  }
+
+  @Test
+  public void testSingleton() {
+    assertNotNull(DataPlatformInstanceAspectMapper.INSTANCE);
+    assertSame(
+        DataPlatformInstanceAspectMapper.INSTANCE, DataPlatformInstanceAspectMapper.INSTANCE);
+  }
+}
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/DataProcessInstanceTypeTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/DataProcessInstanceTypeTest.java
new file mode 100644
index 00000000000000..437c74ab669146
--- /dev/null
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/DataProcessInstanceTypeTest.java
@@ -0,0 +1,246 @@
+package com.linkedin.datahub.graphql.types.dataprocessinst;
+
+import static com.linkedin.datahub.graphql.TestUtils.getMockAllowContext;
+import static org.mockito.ArgumentMatchers.any;
+import static org.testng.Assert.*;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.linkedin.common.DataPlatformInstance;
+import com.linkedin.common.FabricType;
+import com.linkedin.common.Status;
+import com.linkedin.common.SubTypes;
+import com.linkedin.common.UrnArray;
+import com.linkedin.common.urn.DataPlatformUrn;
+import com.linkedin.common.urn.DatasetUrn;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.container.Container;
+import com.linkedin.data.template.StringArray;
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.featureflags.FeatureFlags;
+import com.linkedin.datahub.graphql.generated.DataProcessInstance;
+import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.dataprocess.DataProcessInstanceInput;
+import com.linkedin.dataprocess.DataProcessInstanceOutput;
+import com.linkedin.dataprocess.DataProcessInstanceProperties;
+import com.linkedin.dataprocess.DataProcessInstanceRelationships;
+import com.linkedin.dataprocess.DataProcessInstanceRunEvent;
+import com.linkedin.dataprocess.DataProcessRunStatus;
+import com.linkedin.dataprocess.DataProcessType;
+import com.linkedin.entity.Aspect;
+import com.linkedin.entity.EntityResponse;
+import com.linkedin.entity.EnvelopedAspect;
+import com.linkedin.entity.EnvelopedAspectMap;
+import com.linkedin.entity.client.EntityClient;
+import com.linkedin.metadata.Constants;
+import com.linkedin.metadata.key.DataProcessInstanceKey;
+import com.linkedin.ml.metadata.MLTrainingRunProperties;
+import com.linkedin.r2.RemoteInvocationException;
+import com.linkedin.test.TestResult;
+import com.linkedin.test.TestResultArray;
+import com.linkedin.test.TestResultType;
+import com.linkedin.test.TestResults;
+import graphql.execution.DataFetcherResult;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import org.mockito.Mockito;
+import org.testng.annotations.Test;
+
+public class DataProcessInstanceTypeTest {
+
+  private static final String TEST_INSTANCE_URN =
+      "urn:li:dataProcessInstance:(test-workflow,test-instance-1)";
+  private static final String TEST_DPI_1_URN = "urn:li:dataProcessInstance:id-1";
+  private static final DatasetUrn DATASET_URN =
+      new DatasetUrn(new DataPlatformUrn("kafka"), "dataset1", FabricType.TEST);
+  private static final Urn DPI_URN_REL = UrnUtils.getUrn("urn:li:dataProcessInstance:id-2");
+  private static final DataProcessInstanceKey TEST_DPI_1_KEY =
+      new DataProcessInstanceKey().setId("id-1");
+  private static final DataProcessInstanceProperties TEST_DPI_1_PROPERTIES =
+      new DataProcessInstanceProperties().setName("Test DPI").setType(DataProcessType.STREAMING);
+  private static final DataProcessInstanceInput TEST_DPI_1_DPI_INPUT =
+      new DataProcessInstanceInput().setInputs(new UrnArray(ImmutableList.of(DATASET_URN)));
+  private static final DataProcessInstanceOutput TEST_DPI_1_DPI_OUTPUT =
+      new DataProcessInstanceOutput().setOutputs(new UrnArray(ImmutableList.of(DATASET_URN)));
+  private static final DataProcessInstanceRelationships TEST_DPI_1_DPI_RELATIONSHIPS =
+      new DataProcessInstanceRelationships()
+          .setParentInstance(DPI_URN_REL)
+          .setUpstreamInstances(new UrnArray(ImmutableList.of(DPI_URN_REL)))
+          .setParentTemplate(DPI_URN_REL);
+  private static final DataProcessInstanceRunEvent TEST_DPI_1_DPI_RUN_EVENT =
+      new DataProcessInstanceRunEvent().setStatus(DataProcessRunStatus.COMPLETE);
+  private static final DataPlatformInstance TEST_DPI_1_DATA_PLATFORM_INSTANCE =
+      new DataPlatformInstance().setPlatform(new DataPlatformUrn("kafka"));
+  private static final Status TEST_DPI_1_STATUS = new Status().setRemoved(false);
+  private static final TestResults TEST_DPI_1_TEST_RESULTS =
+      new TestResults()
+          .setPassing(
+              new TestResultArray(
+                  ImmutableList.of(
+                      new TestResult()
+                          .setTest(UrnUtils.getUrn("urn:li:test:123"))
+                          .setType(TestResultType.SUCCESS))))
+          .setFailing(new TestResultArray());
+  private static final SubTypes TEST_DPI_1_SUB_TYPES =
+      new SubTypes().setTypeNames(new StringArray("subtype1"));
+  private static final Container TEST_DPI_1_CONTAINER =
+      new Container().setContainer(UrnUtils.getUrn("urn:li:container:123"));
+  private static final MLTrainingRunProperties ML_TRAINING_RUN_PROPERTIES =
+      new MLTrainingRunProperties().setId("mytrainingrun");
+
+  private static final String TEST_DPI_2_URN = "urn:li:dataProcessInstance:id-2";
+
+  @Test
+  public void testBatchLoadFull() throws Exception {
+    EntityClient client = Mockito.mock(EntityClient.class);
+
+    Urn dpiUrn1 = Urn.createFromString(TEST_DPI_1_URN);
+    Urn dpiUrn2 = Urn.createFromString(TEST_DPI_2_URN);
+
+    Map<String, EnvelopedAspect> aspectMap = new HashMap<>();
+    aspectMap.put(
+        Constants.DATA_PROCESS_INSTANCE_KEY_ASPECT_NAME,
+        new EnvelopedAspect().setValue(new Aspect(TEST_DPI_1_KEY.data())));
+    aspectMap.put(
+        Constants.DATA_PROCESS_INSTANCE_PROPERTIES_ASPECT_NAME,
+        new EnvelopedAspect().setValue(new Aspect(TEST_DPI_1_PROPERTIES.data())));
+    aspectMap.put(
+        Constants.DATA_PROCESS_INSTANCE_INPUT_ASPECT_NAME,
+        new EnvelopedAspect().setValue(new Aspect(TEST_DPI_1_DPI_INPUT.data())));
+    aspectMap.put(
+        Constants.DATA_PROCESS_INSTANCE_OUTPUT_ASPECT_NAME,
+        new EnvelopedAspect().setValue(new Aspect(TEST_DPI_1_DPI_OUTPUT.data())));
+    aspectMap.put(
+        Constants.DATA_PROCESS_INSTANCE_RELATIONSHIPS_ASPECT_NAME,
+        new EnvelopedAspect().setValue(new Aspect(TEST_DPI_1_DPI_RELATIONSHIPS.data())));
+    aspectMap.put(
+        Constants.DATA_PROCESS_INSTANCE_RUN_EVENT_ASPECT_NAME,
+        new EnvelopedAspect().setValue(new Aspect(TEST_DPI_1_DPI_RUN_EVENT.data())));
+    aspectMap.put(
+        Constants.DATA_PLATFORM_INSTANCE_ASPECT_NAME,
+        new EnvelopedAspect().setValue(new Aspect(TEST_DPI_1_DATA_PLATFORM_INSTANCE.data())));
+    aspectMap.put(
+        Constants.STATUS_ASPECT_NAME,
+        new EnvelopedAspect().setValue(new Aspect(TEST_DPI_1_STATUS.data())));
+    aspectMap.put(
+        Constants.TEST_RESULTS_ASPECT_NAME,
+        new EnvelopedAspect().setValue(new Aspect(TEST_DPI_1_TEST_RESULTS.data())));
+    aspectMap.put(
+        Constants.SUB_TYPES_ASPECT_NAME,
+        new EnvelopedAspect().setValue(new Aspect(TEST_DPI_1_SUB_TYPES.data())));
+    aspectMap.put(
+        Constants.CONTAINER_ASPECT_NAME,
+        new EnvelopedAspect().setValue(new Aspect(TEST_DPI_1_CONTAINER.data())));
+    aspectMap.put(
+        Constants.ML_TRAINING_RUN_PROPERTIES_ASPECT_NAME,
+        new EnvelopedAspect().setValue(new Aspect(ML_TRAINING_RUN_PROPERTIES.data())));
+
+    Mockito.when(
+            client.batchGetV2(
+                any(),
+                Mockito.eq(Constants.DATA_PROCESS_INSTANCE_ENTITY_NAME),
+                Mockito.eq(new HashSet<>(ImmutableSet.of(dpiUrn1, dpiUrn2))),
+                Mockito.eq(DataProcessInstanceType.ASPECTS_TO_FETCH)))
+        .thenReturn(
+            ImmutableMap.of(
+                dpiUrn1,
+                new EntityResponse()
+                    .setEntityName(Constants.DATA_PROCESS_INSTANCE_ENTITY_NAME)
+                    .setUrn(dpiUrn1)
+                    .setAspects(new EnvelopedAspectMap(aspectMap))));
+
+    FeatureFlags mockFeatureFlags = Mockito.mock(FeatureFlags.class);
+    Mockito.when(mockFeatureFlags.isDataProcessInstanceEntityEnabled()).thenReturn(true);
+
+    DataProcessInstanceType type = new DataProcessInstanceType(client, mockFeatureFlags);
+
+    QueryContext mockContext = getMockAllowContext();
+    List<DataFetcherResult<DataProcessInstance>> result =
+        type.batchLoad(ImmutableList.of(TEST_DPI_1_URN, TEST_DPI_2_URN), mockContext);
+
+    // Verify response
+    Mockito.verify(client, Mockito.times(1))
+        .batchGetV2(
+            any(),
+            Mockito.eq(Constants.DATA_PROCESS_INSTANCE_ENTITY_NAME),
+            Mockito.eq(ImmutableSet.of(dpiUrn1, dpiUrn2)),
+            Mockito.eq(DataProcessInstanceType.ASPECTS_TO_FETCH));
+
+    assertEquals(result.size(), 2);
+
+    DataProcessInstance dpi1 = result.get(0).getData();
+    assertEquals(dpi1.getUrn(), TEST_DPI_1_URN);
+    assertEquals(dpi1.getName(), "Test DPI");
+    assertEquals(dpi1.getType(), EntityType.DATA_PROCESS_INSTANCE);
+
+    // Assert second element is null
+    assertNull(result.get(1));
+  }
+
+  @Test
+  public void testBatchLoad() throws Exception {
+    EntityClient mockClient = Mockito.mock(EntityClient.class);
+    FeatureFlags mockFeatureFlags = Mockito.mock(FeatureFlags.class);
+    Mockito.when(mockFeatureFlags.isDataProcessInstanceEntityEnabled()).thenReturn(true);
+
+    DataProcessInstanceType type = new DataProcessInstanceType(mockClient, mockFeatureFlags);
+
+    List<DataFetcherResult<DataProcessInstance>> result =
+        type.batchLoad(ImmutableList.of(TEST_INSTANCE_URN), getMockAllowContext());
+
+    assertEquals(result.size(), 1);
+  }
+
+  @Test
+  public void testBatchLoadFeatureFlagDisabled() throws Exception {
+    EntityClient mockClient = Mockito.mock(EntityClient.class);
+    FeatureFlags mockFeatureFlags = Mockito.mock(FeatureFlags.class);
+    Mockito.when(mockFeatureFlags.isDataProcessInstanceEntityEnabled()).thenReturn(false);
+
+    DataProcessInstanceType type = new DataProcessInstanceType(mockClient, mockFeatureFlags);
+
+    List<DataFetcherResult<DataProcessInstance>> result =
+        type.batchLoad(ImmutableList.of(TEST_INSTANCE_URN), getMockAllowContext());
+
+    assertEquals(result.size(), 0);
+
+    Mockito.verify(mockClient, Mockito.never())
+        .batchGetV2(any(), Mockito.anyString(), Mockito.anySet(), Mockito.anySet());
+  }
+
+  @Test(expectedExceptions = RuntimeException.class)
+  public void testBatchLoadClientException() throws Exception {
+    EntityClient mockClient = Mockito.mock(EntityClient.class);
+    FeatureFlags mockFeatureFlags = Mockito.mock(FeatureFlags.class);
+    Mockito.when(mockFeatureFlags.isDataProcessInstanceEntityEnabled()).thenReturn(true);
+
+    Mockito.doThrow(RemoteInvocationException.class)
+        .when(mockClient)
+        .batchGetV2(any(), Mockito.anyString(), Mockito.anySet(), Mockito.anySet());
+
+    DataProcessInstanceType type = new DataProcessInstanceType(mockClient, mockFeatureFlags);
+    type.batchLoad(ImmutableList.of(TEST_INSTANCE_URN), getMockAllowContext());
+  }
+
+  @Test
+  public void testGetType() {
+    EntityClient mockClient = Mockito.mock(EntityClient.class);
+    FeatureFlags mockFeatureFlags = Mockito.mock(FeatureFlags.class);
+    DataProcessInstanceType type = new DataProcessInstanceType(mockClient, mockFeatureFlags);
+
+    assertEquals(type.type(), EntityType.DATA_PROCESS_INSTANCE);
+  }
+
+  @Test
+  public void testObjectClass() {
+    EntityClient mockClient = Mockito.mock(EntityClient.class);
+    FeatureFlags mockFeatureFlags = Mockito.mock(FeatureFlags.class);
+    DataProcessInstanceType type = new DataProcessInstanceType(mockClient, mockFeatureFlags);
+
+    assertEquals(type.objectClass(), DataProcessInstance.class);
+  }
+}
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapperTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapperTest.java
new file mode 100644
index 00000000000000..dc1ce935ad5ecd
--- /dev/null
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapperTest.java
@@ -0,0 +1,127 @@
+package com.linkedin.datahub.graphql.types.dataprocessinst.mappers;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
+import com.linkedin.common.DataPlatformInstance;
+import com.linkedin.common.url.Url;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.container.Container;
+import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.data.template.StringArray;
+import com.linkedin.datahub.graphql.generated.DataProcessInstance;
+import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.dataprocess.DataProcessInstanceProperties;
+import com.linkedin.entity.Aspect;
+import com.linkedin.entity.EntityResponse;
+import com.linkedin.entity.EnvelopedAspect;
+import com.linkedin.entity.EnvelopedAspectMap;
+import com.linkedin.metadata.Constants;
+import com.linkedin.ml.metadata.MLTrainingRunProperties;
+import java.util.HashMap;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class DataProcessInstanceMapperTest {
+
+  private static final String TEST_PLATFORM_URN = "urn:li:dataPlatform:kafka";
+  private static final String TEST_INSTANCE_URN =
+      "urn:li:dataProcessInstance:(test-workflow,test-instance)";
+  private static final String TEST_CONTAINER_URN = "urn:li:container:testContainer";
+  private static final String TEST_EXTERNAL_URL = "https://example.com/process";
+  private static final String TEST_NAME = "Test Process Instance";
+
+  private EntityResponse entityResponse;
+  private Urn urn;
+
+  @BeforeMethod
+  public void setup() throws Exception {
+    urn = Urn.createFromString(TEST_INSTANCE_URN);
+    entityResponse = new EntityResponse();
+    entityResponse.setUrn(urn);
+    entityResponse.setAspects(new EnvelopedAspectMap(new HashMap<>()));
+  }
+
+  @Test
+  public void testMapBasicFields() throws Exception {
+    DataProcessInstance instance = DataProcessInstanceMapper.map(null, entityResponse);
+
+    assertNotNull(instance);
+    assertEquals(instance.getUrn(), urn.toString());
+    assertEquals(instance.getType(), EntityType.DATA_PROCESS_INSTANCE);
+  }
+
+  @Test
+  public void testMapDataProcessProperties() throws Exception {
+    // Create DataProcessInstanceProperties
+    DataProcessInstanceProperties properties = new DataProcessInstanceProperties();
+    properties.setName(TEST_NAME);
+    properties.setExternalUrl(new Url(TEST_EXTERNAL_URL));
+
+    // Add properties aspect
+    addAspect(Constants.DATA_PROCESS_INSTANCE_PROPERTIES_ASPECT_NAME, properties);
+
+    DataProcessInstance instance = DataProcessInstanceMapper.map(null, entityResponse);
+
+    assertNotNull(instance.getProperties());
+    assertEquals(instance.getName(), TEST_NAME);
+    assertEquals(instance.getExternalUrl(), TEST_EXTERNAL_URL);
+  }
+
+  @Test
+  public void testMapPlatformInstance() throws Exception {
+    // Create DataPlatformInstance
+    DataPlatformInstance platformInstance = new DataPlatformInstance();
+    platformInstance.setPlatform(Urn.createFromString(TEST_PLATFORM_URN));
+
+    // Add platform instance aspect
+    addAspect(Constants.DATA_PLATFORM_INSTANCE_ASPECT_NAME, platformInstance);
+
+    DataProcessInstance instance = DataProcessInstanceMapper.map(null, entityResponse);
+
+    assertNotNull(instance.getDataPlatformInstance());
+    assertNotNull(instance.getPlatform());
+    assertEquals(instance.getPlatform().getUrn(), TEST_PLATFORM_URN);
+    assertEquals(instance.getPlatform().getType(), EntityType.DATA_PLATFORM);
+  }
+
+  @Test
+  public void testMapContainer() throws Exception {
+    // Create Container aspect
+    Container container = new Container();
+    container.setContainer(Urn.createFromString(TEST_CONTAINER_URN));
+
+    // Add container aspect
+    addAspect(Constants.CONTAINER_ASPECT_NAME, container);
+
+    DataProcessInstance instance = DataProcessInstanceMapper.map(null, entityResponse);
+
+    assertNotNull(instance.getContainer());
+    assertEquals(instance.getContainer().getUrn(), TEST_CONTAINER_URN);
+    assertEquals(instance.getContainer().getType(), EntityType.CONTAINER);
+  }
+
+  @Test
+  public void testMapMLTrainingProperties() throws Exception {
+    // Create MLTrainingRunProperties
+    MLTrainingRunProperties trainingProperties = new MLTrainingRunProperties();
+    trainingProperties.setId("test-run-id");
+    trainingProperties.setOutputUrls(new StringArray("s3://test-bucket/model"));
+
+    // Add ML training properties aspect
+    addAspect(Constants.ML_TRAINING_RUN_PROPERTIES_ASPECT_NAME, trainingProperties);
+
+    DataProcessInstance instance = DataProcessInstanceMapper.map(null, entityResponse);
+
+    assertNotNull(instance);
+    assertEquals(instance.getMlTrainingRunProperties().getId(), "test-run-id");
+    assertEquals(
+        instance.getMlTrainingRunProperties().getOutputUrls().get(0), "s3://test-bucket/model");
+  }
+
+  private void addAspect(String aspectName, RecordTemplate aspect) {
+    EnvelopedAspect envelopedAspect = new EnvelopedAspect();
+    envelopedAspect.setValue(new Aspect(aspect.data()));
+    entityResponse.getAspects().put(aspectName, envelopedAspect);
+  }
+}
diff --git a/datahub-web-react/src/app/buildEntityRegistry.ts b/datahub-web-react/src/app/buildEntityRegistry.ts
index 181ec7d328a587..b7ff97b3a07469 100644
--- a/datahub-web-react/src/app/buildEntityRegistry.ts
+++ b/datahub-web-react/src/app/buildEntityRegistry.ts
@@ -25,6 +25,7 @@ import { RestrictedEntity } from './entity/restricted/RestrictedEntity';
 import { BusinessAttributeEntity } from './entity/businessAttribute/BusinessAttributeEntity';
 import { SchemaFieldPropertiesEntity } from './entity/schemaField/SchemaFieldPropertiesEntity';
 import { StructuredPropertyEntity } from './entity/structuredProperty/StructuredPropertyEntity';
+import { DataProcessInstanceEntity } from './entity/dataProcessInstance/DataProcessInstanceEntity';
 
 export default function buildEntityRegistry() {
     const registry = new EntityRegistry();
@@ -54,5 +55,6 @@ export default function buildEntityRegistry() {
     registry.register(new BusinessAttributeEntity());
     registry.register(new SchemaFieldPropertiesEntity());
     registry.register(new StructuredPropertyEntity());
+    registry.register(new DataProcessInstanceEntity());
     return registry;
 }
diff --git a/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx b/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx
new file mode 100644
index 00000000000000..4834a026ad94a3
--- /dev/null
+++ b/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx
@@ -0,0 +1,264 @@
+import React from 'react';
+import { ApiOutlined } from '@ant-design/icons';
+import {
+    DataProcessInstance,
+    Entity as GeneratedEntity,
+    EntityType,
+    OwnershipType,
+    SearchResult,
+} from '../../../types.generated';
+import { Preview } from './preview/Preview';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { useGetDataProcessInstanceQuery } from '../../../graphql/dataProcessInstance.generated';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+import { LineageTab } from '../shared/tabs/Lineage/LineageTab';
+import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
+import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection';
+import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
+import { GenericEntityProperties } from '../shared/types';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection';
+import { EntityMenuItems } from '../shared/EntityDropdown/EntityDropdown';
+import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
+import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection';
+import { getDataProduct } from '../shared/utils';
+// import SummaryTab from './profile/DataProcessInstaceSummary';
+
+// const getProcessPlatformName = (data?: DataProcessInstance): string => {
+//     return (
+//         data?.dataPlatformInstance?.platform?.properties?.displayName ||
+//         capitalizeFirstLetterOnly(data?.dataPlatformInstance?.platform?.name) ||
+//         ''
+//     );
+// };
+
+const getParentEntities = (data: DataProcessInstance): GeneratedEntity[] => {
+    const parentEntity = data?.relationships?.relationships?.find(
+        (rel) => rel.type === 'InstanceOf' && rel.entity?.type === EntityType.DataJob,
+    );
+
+    if (!parentEntity?.entity) return [];
+
+    // Convert to GeneratedEntity
+    return [
+        {
+            type: parentEntity.entity.type,
+            urn: (parentEntity.entity as any).urn, // Make sure urn exists
+            relationships: (parentEntity.entity as any).relationships,
+        },
+    ];
+};
+/**
+ * Definition of the DataHub DataProcessInstance entity.
+ */
+export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
+    type: EntityType = EntityType.DataProcessInstance;
+
+    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <ApiOutlined style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return <ApiOutlined style={{ fontSize, color: color || '#B37FEB' }} />;
+        }
+
+        return (
+            <ApiOutlined
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => true;
+
+    isLineageEnabled = () => true;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getPathName = () => 'dataProcessInstance';
+
+    getEntityName = () => 'Process Instance';
+
+    getGraphName = () => 'dataProcessInstance';
+
+    getCollectionName = () => 'Process Instances';
+
+    useEntityQuery = useGetDataProcessInstanceQuery;
+
+    renderProfile = (urn: string) => (
+        <EntityProfile
+            urn={urn}
+            entityType={EntityType.DataProcessInstance}
+            useEntityQuery={this.useEntityQuery}
+            // useUpdateQuery={useUpdateDataProcessInstanceMutation}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+            headerDropdownItems={new Set([EntityMenuItems.UPDATE_DEPRECATION, EntityMenuItems.RAISE_INCIDENT])}
+            tabs={[
+                // {
+                //     name: 'Documentation',
+                //     component: DocumentationTab,
+                // },
+                // {
+                //     name: 'Summary',
+                //     component: SummaryTab,
+                // },
+                {
+                    name: 'Lineage',
+                    component: LineageTab,
+                },
+                {
+                    name: 'Properties',
+                    component: PropertiesTab,
+                },
+                // {
+                //     name: 'Incidents',
+                //     component: IncidentTab,
+                //     getDynamicName: (_, processInstance) => {
+                //         const activeIncidentCount = processInstance?.dataProcessInstance?.activeIncidents.total;
+                //         return `Incidents${(activeIncidentCount && ` (${activeIncidentCount})`) || ''}`;
+                //     },
+                // },
+            ]}
+            sidebarSections={this.getSidebarSections()}
+        />
+    );
+
+    getSidebarSections = () => [
+        {
+            component: SidebarAboutSection,
+        },
+        {
+            component: SidebarOwnerSection,
+            properties: {
+                defaultOwnerType: OwnershipType.TechnicalOwner,
+            },
+        },
+        {
+            component: SidebarTagsSection,
+            properties: {
+                hasTags: true,
+                hasTerms: true,
+            },
+        },
+        {
+            component: SidebarDomainSection,
+        },
+        {
+            component: DataProductSection,
+        },
+    ];
+
+    getOverridePropertiesFromEntity = (processInstance?: DataProcessInstance | null): GenericEntityProperties => {
+        const name = processInstance?.name;
+        const externalUrl = processInstance?.externalUrl;
+        return {
+            name,
+            externalUrl,
+        };
+    };
+
+    renderPreview = (_: PreviewType, data: DataProcessInstance) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        const parentEntities = getParentEntities(data);
+        return (
+            <Preview
+                urn={data.urn}
+                name={data.properties?.name || data.name || ''}
+                subType={data.subTypes?.typeNames?.[0]}
+                description=""
+                platformName={
+                    data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)
+                }
+                platformLogo={data.platform.properties?.logoUrl}
+                owners={null}
+                globalTags={null}
+                // domain={data.domain?.domain}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                externalUrl={data.properties?.externalUrl}
+                parentContainers={data.parentContainers}
+                parentEntities={parentEntities}
+                container={data.container || undefined}
+                // health={data.health}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        const data = result.entity as DataProcessInstance;
+        const genericProperties = this.getGenericEntityProperties(data);
+        const parentEntities = getParentEntities(data);
+        return (
+            <Preview
+                urn={data.urn}
+                name={data.properties?.name || data.name || ''}
+                subType={data.subTypes?.typeNames?.[0]}
+                description=""
+                platformName={
+                    data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)
+                }
+                platformLogo={data.platform.properties?.logoUrl}
+                platformInstanceId={data.dataPlatformInstance?.instanceId}
+                owners={null}
+                globalTags={null}
+                //                domain={data.domain?.domain}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                //                deprecation={data.deprecation}
+                insights={result.insights}
+                externalUrl={data.properties?.externalUrl}
+                degree={(result as any).degree}
+                paths={(result as any).paths}
+                parentContainers={data.parentContainers}
+                parentEntities={parentEntities}
+                container={data.container || undefined}
+                // duration={data?.state?.[0]?.durationMillis}
+                // status={data?.state?.[0]?.result?.resultType}
+                // startTime={data?.state?.[0]?.timestampMillis}
+                //                health={data.health}
+            />
+        );
+    };
+
+    getLineageVizConfig = (entity: DataProcessInstance) => {
+        return {
+            urn: entity?.urn,
+            name: this.displayName(entity),
+            type: EntityType.DataProcessInstance,
+            subtype: entity?.subTypes?.typeNames?.[0],
+            icon: entity?.platform?.properties?.logoUrl || undefined,
+            platform: entity?.platform,
+            container: entity?.container,
+            //            health: entity?.health || undefined,
+        };
+    };
+
+    displayName = (data: DataProcessInstance) => {
+        return data.properties?.name || data.urn;
+    };
+
+    getGenericEntityProperties = (data: DataProcessInstance) => {
+        return getDataForEntityType({
+            data,
+            entityType: this.type,
+            getOverrideProperties: this.getOverridePropertiesFromEntity,
+        });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([
+            EntityCapabilityType.OWNERS,
+            EntityCapabilityType.GLOSSARY_TERMS,
+            EntityCapabilityType.TAGS,
+            EntityCapabilityType.DOMAINS,
+            EntityCapabilityType.DEPRECATION,
+            EntityCapabilityType.SOFT_DELETE,
+            EntityCapabilityType.DATA_PRODUCTS,
+        ]);
+    };
+}
diff --git a/datahub-web-react/src/app/entity/dataProcessInstance/preview/Preview.tsx b/datahub-web-react/src/app/entity/dataProcessInstance/preview/Preview.tsx
new file mode 100644
index 00000000000000..3a3b0340695d96
--- /dev/null
+++ b/datahub-web-react/src/app/entity/dataProcessInstance/preview/Preview.tsx
@@ -0,0 +1,103 @@
+import React from 'react';
+import {
+    DataProduct,
+    Deprecation,
+    Domain,
+    Entity as GeneratedEntity,
+    EntityPath,
+    EntityType,
+    GlobalTags,
+    Health,
+    Owner,
+    SearchInsight,
+    Container,
+    ParentContainersResult,
+} from '../../../../types.generated';
+import DefaultPreviewCard from '../../../preview/DefaultPreviewCard';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { IconStyleType } from '../../Entity';
+
+export const Preview = ({
+    urn,
+    name,
+    subType,
+    description,
+    platformName,
+    platformLogo,
+    platformInstanceId,
+    container,
+    owners,
+    domain,
+    dataProduct,
+    deprecation,
+    globalTags,
+    snippet,
+    insights,
+    externalUrl,
+    degree,
+    paths,
+    health,
+    parentEntities,
+    parentContainers,
+}: // duration,
+// status,
+// startTime,
+{
+    urn: string;
+    name: string;
+    subType?: string | null;
+    description?: string | null;
+    platformName?: string;
+    platformLogo?: string | null;
+    platformInstanceId?: string;
+    container?: Container;
+    owners?: Array<Owner> | null;
+    domain?: Domain | null;
+    dataProduct?: DataProduct | null;
+    deprecation?: Deprecation | null;
+    globalTags?: GlobalTags | null;
+    snippet?: React.ReactNode | null;
+    insights?: Array<SearchInsight> | null;
+    externalUrl?: string | null;
+    degree?: number;
+    paths?: EntityPath[];
+    health?: Health[] | null;
+    parentEntities?: Array<GeneratedEntity> | null;
+    parentContainers?: ParentContainersResult | null;
+    // duration?: number | null;
+    // status?: string | null;
+    // startTime?: number | null;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    return (
+        <DefaultPreviewCard
+            url={entityRegistry.getEntityUrl(EntityType.DataProcessInstance, urn)}
+            name={name}
+            urn={urn}
+            description={description || ''}
+            type={subType || 'Process Instance'}
+            typeIcon={entityRegistry.getIcon(EntityType.DataProcessInstance, 14, IconStyleType.ACCENT)}
+            platform={platformName || undefined}
+            logoUrl={platformLogo || undefined}
+            platformInstanceId={platformInstanceId}
+            container={container}
+            parentContainers={parentContainers}
+            owners={owners}
+            tags={globalTags || undefined}
+            domain={domain}
+            dataProduct={dataProduct}
+            snippet={snippet}
+            deprecation={deprecation}
+            dataTestID="process-instance-item-preview"
+            insights={insights}
+            externalUrl={externalUrl}
+            degree={degree}
+            paths={paths}
+            health={health || undefined}
+            parentEntities={parentEntities}
+            // duration={duration}
+            // status={status}
+            // startTime={startTime}
+        />
+    );
+};
diff --git a/datahub-web-react/src/graphql/dataProcessInstance.graphql b/datahub-web-react/src/graphql/dataProcessInstance.graphql
new file mode 100644
index 00000000000000..8f55ca4903d527
--- /dev/null
+++ b/datahub-web-react/src/graphql/dataProcessInstance.graphql
@@ -0,0 +1,181 @@
+fragment processInstanceRelationshipResults on EntityRelationshipsResult {
+    start
+    count
+    total
+    relationships {
+        type
+        direction
+        entity {
+            urn
+            type
+            ... on Dataset {
+                name
+                properties {
+                    name
+                    description
+                    qualifiedName
+                }
+                editableProperties {
+                    description
+                }
+                platform {
+                    ...platformFields
+                }
+                subTypes {
+                    typeNames
+                }
+                status {
+                    removed
+                }
+            }
+            ... on DataJob {
+                urn
+                type
+                dataFlow {
+                    ...nonRecursiveDataFlowFields
+                }
+                jobId
+                properties {
+                    name
+                    description
+                    externalUrl
+                    customProperties {
+                        key
+                        value
+                    }
+                }
+                deprecation {
+                    ...deprecationFields
+                }
+                dataPlatformInstance {
+                    ...dataPlatformInstanceFields
+                }
+                subTypes {
+                    typeNames
+                }
+                editableProperties {
+                    description
+                }
+                status {
+                    removed
+                }
+            }
+        }
+    }
+}
+
+fragment dataProcessInstanceFields on DataProcessInstance {
+    urn
+    type
+    platform {
+        ...platformFields
+    }
+    parentContainers {
+        ...parentContainersFields
+    }
+    container {
+        ...entityContainer
+    }
+    subTypes {
+        typeNames
+    }
+    properties {
+        name
+        createdTS: created {
+            time
+            actor
+        }
+        customProperties {
+            key
+            value
+        }
+    }
+    mlTrainingRunProperties {
+        outputUrls
+        trainingMetrics {
+            name
+            description
+            value
+        }
+        hyperParams {
+            name
+            description
+            value
+        }
+    }
+    dataPlatformInstance {
+        ...dataPlatformInstanceFields
+    }
+    state(startTimeMillis: null, endTimeMillis: null, limit: 1) {
+        status
+        attempt
+        result {
+            resultType
+            nativeResultType
+        }
+        timestampMillis
+        durationMillis
+    }
+    relationships(input: { types: ["InstanceOf", "Consumes", "Produces"], direction: OUTGOING, start: 0, count: 50 }) {
+        ...processInstanceRelationshipResults
+    }
+}
+
+query getDataProcessInstance($urn: String!) {
+    dataProcessInstance(urn: $urn) {
+        urn
+        type
+        platform {
+            ...platformFields
+        }
+        parentContainers {
+            ...parentContainersFields
+        }
+        subTypes {
+            typeNames
+        }
+        container {
+            ...entityContainer
+        }
+        name
+        properties {
+            name
+            created {
+                time
+                actor
+            }
+        }
+        mlTrainingRunProperties {
+            id
+            outputUrls
+            trainingMetrics {
+                name
+                description
+                value
+            }
+            hyperParams {
+                name
+                description
+                value
+            }
+        }
+        relationships(
+            input: { types: ["InstanceOf", "Consumes", "Produces"], direction: OUTGOING, start: 0, count: 50 }
+        ) {
+            ...processInstanceRelationshipResults
+        }
+        dataPlatformInstance {
+            ...dataPlatformInstanceFields
+        }
+        state(startTimeMillis: null, endTimeMillis: null, limit: 1) {
+            status
+            attempt
+            result {
+                resultType
+                nativeResultType
+            }
+            timestampMillis
+            durationMillis
+        }
+    }
+}
diff --git a/datahub-web-react/src/graphql/fragments.graphql b/datahub-web-react/src/graphql/fragments.graphql
index 68c57c5cb5db55..ecac2997489354 100644
--- a/datahub-web-react/src/graphql/fragments.graphql
+++ b/datahub-web-react/src/graphql/fragments.graphql
@@ -863,8 +863,17 @@ fragment nonRecursiveMLModel on MLModel {
         ...ownershipFields
     }
     properties {
+        name
         description
         date
+        created {
+            time
+            actor
+        }
+        lastModified {
+            time
+            actor
+        }
         externalUrl
         version
         type
@@ -956,7 +965,12 @@ fragment nonRecursiveMLModelGroupFields on MLModelGroup {
         ...deprecationFields
     }
     properties {
+        name
         description
+        created {
+            time
+            actor
+        }
     }
     browsePathV2 {
         ...browsePathV2Fields
diff --git a/datahub-web-react/src/graphql/lineage.graphql b/datahub-web-react/src/graphql/lineage.graphql
index ee05811cbb72de..457936ed62cd2e 100644
--- a/datahub-web-react/src/graphql/lineage.graphql
+++ b/datahub-web-react/src/graphql/lineage.graphql
@@ -259,6 +259,9 @@ fragment lineageNodeProperties on EntityWithRelationships {
         name
         description
         origin
+        tags {
+            ...globalTagsFields
+        }
         platform {
             ...platformFields
         }
@@ -268,6 +271,19 @@ fragment lineageNodeProperties on EntityWithRelationships {
         status {
             removed
         }
+        properties {
+            createdTS: created {
+                time
+                actor
+            }
+            customProperties {
+                key
+                value
+            }
+        }
+        editableProperties {
+            description
+        }
         structuredProperties {
             properties {
                 ...structuredPropertiesFields
@@ -328,6 +344,9 @@ fragment lineageNodeProperties on EntityWithRelationships {
         urn
         type
     }
+    ... on DataProcessInstance {
+        ...dataProcessInstanceFields
+    }
 }
 
 fragment lineageFields on EntityWithRelationships {
diff --git a/datahub-web-react/src/graphql/mlModelGroup.graphql b/datahub-web-react/src/graphql/mlModelGroup.graphql
index 81ab65d0b9a08d..4f11ed4984d37a 100644
--- a/datahub-web-react/src/graphql/mlModelGroup.graphql
+++ b/datahub-web-react/src/graphql/mlModelGroup.graphql
@@ -2,6 +2,18 @@ query getMLModelGroup($urn: String!) {
     mlModelGroup(urn: $urn) {
         urn
         type
+        properties {
+            name
+            description
+            created {
+                time
+                actor
+            }
+            lastModified {
+                time
+                actor
+            }
+        }
         ...nonRecursiveMLModelGroupFields
         incoming: relationships(
             input: {
diff --git a/li-utils/src/main/java/com/linkedin/metadata/Constants.java b/li-utils/src/main/java/com/linkedin/metadata/Constants.java
index 42080e4e17596e..01c33a2530efb5 100644
--- a/li-utils/src/main/java/com/linkedin/metadata/Constants.java
+++ b/li-utils/src/main/java/com/linkedin/metadata/Constants.java
@@ -421,6 +421,10 @@ public class Constants {
       "dataProcessInstanceRunEvent";
   public static final String DATA_PROCESS_INSTANCE_RELATIONSHIPS_ASPECT_NAME =
       "dataProcessInstanceRelationships";
+  public static final String DATA_PROCESS_INSTANCE_INPUT_ASPECT_NAME = "dataProcessInstanceInput";
+  public static final String DATA_PROCESS_INSTANCE_OUTPUT_ASPECT_NAME = "dataProcessInstanceOutput";
+  public static final String DATA_PROCESS_INSTANCE_KEY_ASPECT_NAME = "dataProcessInstanceKey";
+  public static final String ML_TRAINING_RUN_PROPERTIES_ASPECT_NAME = "mlTrainingRunProperties";
 
   // Business Attribute
   public static final String BUSINESS_ATTRIBUTE_KEY_ASPECT_NAME = "businessAttributeKey";
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
index e51511699e345a..1a91ae35c6595b 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
@@ -772,6 +772,11 @@ public void testQueryByDefault() {
                 EntityType.SCHEMA_FIELD,
                 Stream.concat(COMMON.stream(), Stream.of("schemaFieldAliases", "parent"))
                     .collect(Collectors.toSet()))
+            .put(
+                EntityType.DATA_PROCESS_INSTANCE,
+                Stream.concat(
+                        COMMON.stream(), Stream.of("parentInstance", "parentTemplate", "status"))
+                    .collect(Collectors.toSet()))
             .build();
 
     for (EntityType entityType : SEARCHABLE_ENTITY_TYPES) {
diff --git a/metadata-models/src/main/pegasus/com/linkedin/ml/metadata/MLModelGroupProperties.pdl b/metadata-models/src/main/pegasus/com/linkedin/ml/metadata/MLModelGroupProperties.pdl
index 81c5e7a240f618..b9e364bee8c65a 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/ml/metadata/MLModelGroupProperties.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/ml/metadata/MLModelGroupProperties.pdl
@@ -12,7 +12,7 @@ import com.linkedin.common.TimeStamp
 @Aspect = {
   "name": "mlModelGroupProperties"
 }
-record MLModelGroupProperties includes CustomProperties {
+record MLModelGroupProperties includes CustomProperties, MLModelLineageInfo {
 
   /**
    * Display name of the MLModelGroup
@@ -50,18 +50,6 @@ record MLModelGroupProperties includes CustomProperties {
    */
   lastModified: optional TimeStamp
 
-  /**
-   * List of jobs (if any) used to train the model group. Visible in Lineage.
-   */
-  @Relationship = {
-    "/*": {
-      "name": "TrainedBy",
-      "entityTypes": [ "dataJob" ],
-      "isLineage": true
-    }
-  }
-  trainingJobs: optional array[Urn]
-
   /**
    * Version of the MLModelGroup
    */
diff --git a/metadata-models/src/main/pegasus/com/linkedin/ml/metadata/MLModelLineageInfo.pdl b/metadata-models/src/main/pegasus/com/linkedin/ml/metadata/MLModelLineageInfo.pdl
new file mode 100644
index 00000000000000..4c17d6e6ab1a00
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/ml/metadata/MLModelLineageInfo.pdl
@@ -0,0 +1,35 @@
+namespace com.linkedin.ml.metadata
+import com.linkedin.common.Urn
+
+
+/**
+* A set of re-usable fields used to capture lineage information for ML Models and ML Model Groups
+*/
+record MLModelLineageInfo {
+
+    /**
+    * List of jobs or process instances (if any) used to train the model or group. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.
+    */
+    @Relationship = {
+        "/*": {
+        "name": "TrainedBy",
+        "entityTypes": [ "dataJob", "dataProcessInstance" ],
+        "isLineage": true
+        }
+    }
+    trainingJobs: optional array[Urn]
+
+    /**
+    * List of jobs or process instances (if any) that use the model or group.
+    */
+    @Relationship = {
+        "/*": {
+        "name": "UsedBy",
+        "entityTypes": [ "dataJob", "dataProcessInstance" ],
+        "isLineage": true,
+        "isUpstream": false
+        }
+    }
+    downstreamJobs: optional array[Urn]
+
+}
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/ml/metadata/MLModelProperties.pdl b/metadata-models/src/main/pegasus/com/linkedin/ml/metadata/MLModelProperties.pdl
index d89d07384bba1d..ac10e0add13a1c 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/ml/metadata/MLModelProperties.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/ml/metadata/MLModelProperties.pdl
@@ -14,7 +14,7 @@ import com.linkedin.common.TimeStamp
 @Aspect = {
   "name": "mlModelProperties"
 }
-record MLModelProperties includes CustomProperties, ExternalReference {
+record MLModelProperties includes CustomProperties, ExternalReference, MLModelLineageInfo {
 
   /**
    * Display name of the MLModel
@@ -116,31 +116,6 @@ record MLModelProperties includes CustomProperties, ExternalReference {
   }
   deployments: optional array[Urn]
 
-  /**
-   * List of jobs (if any) used to train the model. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.
-   */
-  @Relationship = {
-    "/*": {
-      "name": "TrainedBy",
-      "entityTypes": [ "dataJob", "dataProcessInstance" ],
-      "isLineage": true
-    }
-  }
-  trainingJobs: optional array[Urn]
-
-  /**
-   * List of jobs (if any) that use the model
-   */
-  @Relationship = {
-    "/*": {
-      "name": "UsedBy",
-      "entityTypes": [ "dataJob" ],
-      "isLineage": true,
-      "isUpstream": false
-    }
-  }
-  downstreamJobs: optional array[Urn]
-
   /**
    * Groups the model belongs to
    */
diff --git a/metadata-service/configuration/src/main/java/com/linkedin/datahub/graphql/featureflags/FeatureFlags.java b/metadata-service/configuration/src/main/java/com/linkedin/datahub/graphql/featureflags/FeatureFlags.java
index 28abb26be1f524..97ca0dcabea9f3 100644
--- a/metadata-service/configuration/src/main/java/com/linkedin/datahub/graphql/featureflags/FeatureFlags.java
+++ b/metadata-service/configuration/src/main/java/com/linkedin/datahub/graphql/featureflags/FeatureFlags.java
@@ -25,4 +25,5 @@ public class FeatureFlags {
   private boolean showSeparateSiblings = false;
   private boolean alternateMCPValidation = false;
   private boolean showManageStructuredProperties = false;
+  private boolean dataProcessInstanceEntityEnabled = true;
 }
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json
index 1c713fd33884b5..432c4a9ddcb73f 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json
@@ -3827,7 +3827,43 @@
       "name" : "MLModelProperties",
       "namespace" : "com.linkedin.ml.metadata",
       "doc" : "Properties associated with a ML Model\r",
-      "include" : [ "com.linkedin.common.CustomProperties", "com.linkedin.common.ExternalReference" ],
+      "include" : [ "com.linkedin.common.CustomProperties", "com.linkedin.common.ExternalReference", {
+        "type" : "record",
+        "name" : "MLModelLineageInfo",
+        "doc" : "A set of re-usable fields used to capture lineage information for ML Models and ML Model Groups\r",
+        "fields" : [ {
+          "name" : "trainingJobs",
+          "type" : {
+            "type" : "array",
+            "items" : "com.linkedin.common.Urn"
+          },
+          "doc" : "List of jobs or process instances (if any) used to train the model or group. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.\r",
+          "optional" : true,
+          "Relationship" : {
+            "/*" : {
+              "entityTypes" : [ "dataJob", "dataProcessInstance" ],
+              "isLineage" : true,
+              "name" : "TrainedBy"
+            }
+          }
+        }, {
+          "name" : "downstreamJobs",
+          "type" : {
+            "type" : "array",
+            "items" : "com.linkedin.common.Urn"
+          },
+          "doc" : "List of jobs or process instances (if any) that use the model or group.\r",
+          "optional" : true,
+          "Relationship" : {
+            "/*" : {
+              "entityTypes" : [ "dataJob", "dataProcessInstance" ],
+              "isLineage" : true,
+              "isUpstream" : false,
+              "name" : "UsedBy"
+            }
+          }
+        } ]
+      } ],
       "fields" : [ {
         "name" : "name",
         "type" : "string",
@@ -4005,37 +4041,6 @@
             "name" : "DeployedTo"
           }
         }
-      }, {
-        "name" : "trainingJobs",
-        "type" : {
-          "type" : "array",
-          "items" : "com.linkedin.common.Urn"
-        },
-        "doc" : "List of jobs (if any) used to train the model. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.\r",
-        "optional" : true,
-        "Relationship" : {
-          "/*" : {
-            "entityTypes" : [ "dataJob", "dataProcessInstance" ],
-            "isLineage" : true,
-            "name" : "TrainedBy"
-          }
-        }
-      }, {
-        "name" : "downstreamJobs",
-        "type" : {
-          "type" : "array",
-          "items" : "com.linkedin.common.Urn"
-        },
-        "doc" : "List of jobs (if any) that use the model\r",
-        "optional" : true,
-        "Relationship" : {
-          "/*" : {
-            "entityTypes" : [ "dataJob" ],
-            "isLineage" : true,
-            "isUpstream" : false,
-            "name" : "UsedBy"
-          }
-        }
       }, {
         "name" : "groups",
         "type" : {
@@ -4213,7 +4218,7 @@
       },
       "doc" : "The order to sort the results i.e. ASCENDING or DESCENDING"
     } ]
-  }, "com.linkedin.metadata.query.filter.SortOrder", "com.linkedin.ml.metadata.BaseData", "com.linkedin.ml.metadata.CaveatDetails", "com.linkedin.ml.metadata.CaveatsAndRecommendations", "com.linkedin.ml.metadata.EthicalConsiderations", "com.linkedin.ml.metadata.EvaluationData", "com.linkedin.ml.metadata.HyperParameterValueType", "com.linkedin.ml.metadata.IntendedUse", "com.linkedin.ml.metadata.IntendedUserType", "com.linkedin.ml.metadata.MLFeatureProperties", "com.linkedin.ml.metadata.MLHyperParam", "com.linkedin.ml.metadata.MLMetric", "com.linkedin.ml.metadata.MLModelFactorPrompts", "com.linkedin.ml.metadata.MLModelFactors", "com.linkedin.ml.metadata.MLModelProperties", "com.linkedin.ml.metadata.Metrics", "com.linkedin.ml.metadata.QuantitativeAnalyses", "com.linkedin.ml.metadata.ResultsType", "com.linkedin.ml.metadata.SourceCode", "com.linkedin.ml.metadata.SourceCodeUrl", "com.linkedin.ml.metadata.SourceCodeUrlType", "com.linkedin.ml.metadata.TrainingData", "com.linkedin.mxe.GenericAspect", {
+  }, "com.linkedin.metadata.query.filter.SortOrder", "com.linkedin.ml.metadata.BaseData", "com.linkedin.ml.metadata.CaveatDetails", "com.linkedin.ml.metadata.CaveatsAndRecommendations", "com.linkedin.ml.metadata.EthicalConsiderations", "com.linkedin.ml.metadata.EvaluationData", "com.linkedin.ml.metadata.HyperParameterValueType", "com.linkedin.ml.metadata.IntendedUse", "com.linkedin.ml.metadata.IntendedUserType", "com.linkedin.ml.metadata.MLFeatureProperties", "com.linkedin.ml.metadata.MLHyperParam", "com.linkedin.ml.metadata.MLMetric", "com.linkedin.ml.metadata.MLModelFactorPrompts", "com.linkedin.ml.metadata.MLModelFactors", "com.linkedin.ml.metadata.MLModelLineageInfo", "com.linkedin.ml.metadata.MLModelProperties", "com.linkedin.ml.metadata.Metrics", "com.linkedin.ml.metadata.QuantitativeAnalyses", "com.linkedin.ml.metadata.ResultsType", "com.linkedin.ml.metadata.SourceCode", "com.linkedin.ml.metadata.SourceCodeUrl", "com.linkedin.ml.metadata.SourceCodeUrlType", "com.linkedin.ml.metadata.TrainingData", "com.linkedin.mxe.GenericAspect", {
     "type" : "record",
     "name" : "MetadataChangeProposal",
     "namespace" : "com.linkedin.mxe",
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
index 77d4644f3c121a..45e91873de10ff 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
@@ -3985,7 +3985,43 @@
                   "name" : "MLModelProperties",
                   "namespace" : "com.linkedin.ml.metadata",
                   "doc" : "Properties associated with a ML Model\r",
-                  "include" : [ "com.linkedin.common.CustomProperties", "com.linkedin.common.ExternalReference" ],
+                  "include" : [ "com.linkedin.common.CustomProperties", "com.linkedin.common.ExternalReference", {
+                    "type" : "record",
+                    "name" : "MLModelLineageInfo",
+                    "doc" : "A set of re-usable fields used to capture lineage information for ML Models and ML Model Groups\r",
+                    "fields" : [ {
+                      "name" : "trainingJobs",
+                      "type" : {
+                        "type" : "array",
+                        "items" : "com.linkedin.common.Urn"
+                      },
+                      "doc" : "List of jobs or process instances (if any) used to train the model or group. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.\r",
+                      "optional" : true,
+                      "Relationship" : {
+                        "/*" : {
+                          "entityTypes" : [ "dataJob", "dataProcessInstance" ],
+                          "isLineage" : true,
+                          "name" : "TrainedBy"
+                        }
+                      }
+                    }, {
+                      "name" : "downstreamJobs",
+                      "type" : {
+                        "type" : "array",
+                        "items" : "com.linkedin.common.Urn"
+                      },
+                      "doc" : "List of jobs or process instances (if any) that use the model or group.\r",
+                      "optional" : true,
+                      "Relationship" : {
+                        "/*" : {
+                          "entityTypes" : [ "dataJob", "dataProcessInstance" ],
+                          "isLineage" : true,
+                          "isUpstream" : false,
+                          "name" : "UsedBy"
+                        }
+                      }
+                    } ]
+                  } ],
                   "fields" : [ {
                     "name" : "name",
                     "type" : "string",
@@ -4163,37 +4199,6 @@
                         "name" : "DeployedTo"
                       }
                     }
-                  }, {
-                    "name" : "trainingJobs",
-                    "type" : {
-                      "type" : "array",
-                      "items" : "com.linkedin.common.Urn"
-                    },
-                    "doc" : "List of jobs (if any) used to train the model. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.\r",
-                    "optional" : true,
-                    "Relationship" : {
-                      "/*" : {
-                        "entityTypes" : [ "dataJob", "dataProcessInstance" ],
-                        "isLineage" : true,
-                        "name" : "TrainedBy"
-                      }
-                    }
-                  }, {
-                    "name" : "downstreamJobs",
-                    "type" : {
-                      "type" : "array",
-                      "items" : "com.linkedin.common.Urn"
-                    },
-                    "doc" : "List of jobs (if any) that use the model\r",
-                    "optional" : true,
-                    "Relationship" : {
-                      "/*" : {
-                        "entityTypes" : [ "dataJob" ],
-                        "isLineage" : true,
-                        "isUpstream" : false,
-                        "name" : "UsedBy"
-                      }
-                    }
                   }, {
                     "name" : "groups",
                     "type" : {
@@ -5004,7 +5009,7 @@
                   "name" : "MLModelGroupProperties",
                   "namespace" : "com.linkedin.ml.metadata",
                   "doc" : "Properties associated with an ML Model Group\r",
-                  "include" : [ "com.linkedin.common.CustomProperties" ],
+                  "include" : [ "com.linkedin.common.CustomProperties", "MLModelLineageInfo" ],
                   "fields" : [ {
                     "name" : "name",
                     "type" : "string",
@@ -5041,21 +5046,6 @@
                     "type" : "com.linkedin.common.TimeStamp",
                     "doc" : "Date when the MLModelGroup was last modified\r",
                     "optional" : true
-                  }, {
-                    "name" : "trainingJobs",
-                    "type" : {
-                      "type" : "array",
-                      "items" : "com.linkedin.common.Urn"
-                    },
-                    "doc" : "List of jobs (if any) used to train the model group. Visible in Lineage.\r",
-                    "optional" : true,
-                    "Relationship" : {
-                      "/*" : {
-                        "entityTypes" : [ "dataJob" ],
-                        "isLineage" : true,
-                        "name" : "TrainedBy"
-                      }
-                    }
                   }, {
                     "name" : "version",
                     "type" : "com.linkedin.common.VersionTag",
@@ -6700,7 +6690,7 @@
       "type" : "int",
       "doc" : "The total number of entities directly under searched path"
     } ]
-  }, "com.linkedin.metadata.search.SearchResultMetadata", "com.linkedin.metadata.search.SearchSuggestion", "com.linkedin.metadata.snapshot.ChartSnapshot", "com.linkedin.metadata.snapshot.CorpGroupSnapshot", "com.linkedin.metadata.snapshot.CorpUserSnapshot", "com.linkedin.metadata.snapshot.DashboardSnapshot", "com.linkedin.metadata.snapshot.DataFlowSnapshot", "com.linkedin.metadata.snapshot.DataHubPolicySnapshot", "com.linkedin.metadata.snapshot.DataHubRetentionSnapshot", "com.linkedin.metadata.snapshot.DataJobSnapshot", "com.linkedin.metadata.snapshot.DataPlatformSnapshot", "com.linkedin.metadata.snapshot.DataProcessSnapshot", "com.linkedin.metadata.snapshot.DatasetSnapshot", "com.linkedin.metadata.snapshot.GlossaryNodeSnapshot", "com.linkedin.metadata.snapshot.GlossaryTermSnapshot", "com.linkedin.metadata.snapshot.MLFeatureSnapshot", "com.linkedin.metadata.snapshot.MLFeatureTableSnapshot", "com.linkedin.metadata.snapshot.MLModelDeploymentSnapshot", "com.linkedin.metadata.snapshot.MLModelGroupSnapshot", "com.linkedin.metadata.snapshot.MLModelSnapshot", "com.linkedin.metadata.snapshot.MLPrimaryKeySnapshot", "com.linkedin.metadata.snapshot.SchemaFieldSnapshot", "com.linkedin.metadata.snapshot.Snapshot", "com.linkedin.metadata.snapshot.TagSnapshot", "com.linkedin.ml.metadata.BaseData", "com.linkedin.ml.metadata.CaveatDetails", "com.linkedin.ml.metadata.CaveatsAndRecommendations", "com.linkedin.ml.metadata.DeploymentStatus", "com.linkedin.ml.metadata.EthicalConsiderations", "com.linkedin.ml.metadata.EvaluationData", "com.linkedin.ml.metadata.HyperParameterValueType", "com.linkedin.ml.metadata.IntendedUse", "com.linkedin.ml.metadata.IntendedUserType", "com.linkedin.ml.metadata.MLFeatureProperties", "com.linkedin.ml.metadata.MLFeatureTableProperties", "com.linkedin.ml.metadata.MLHyperParam", "com.linkedin.ml.metadata.MLMetric", "com.linkedin.ml.metadata.MLModelDeploymentProperties", "com.linkedin.ml.metadata.MLModelFactorPrompts", "com.linkedin.ml.metadata.MLModelFactors", "com.linkedin.ml.metadata.MLModelGroupProperties", "com.linkedin.ml.metadata.MLModelProperties", "com.linkedin.ml.metadata.MLPrimaryKeyProperties", "com.linkedin.ml.metadata.Metrics", "com.linkedin.ml.metadata.QuantitativeAnalyses", "com.linkedin.ml.metadata.ResultsType", "com.linkedin.ml.metadata.SourceCode", "com.linkedin.ml.metadata.SourceCodeUrl", "com.linkedin.ml.metadata.SourceCodeUrlType", "com.linkedin.ml.metadata.TrainingData", {
+  }, "com.linkedin.metadata.search.SearchResultMetadata", "com.linkedin.metadata.search.SearchSuggestion", "com.linkedin.metadata.snapshot.ChartSnapshot", "com.linkedin.metadata.snapshot.CorpGroupSnapshot", "com.linkedin.metadata.snapshot.CorpUserSnapshot", "com.linkedin.metadata.snapshot.DashboardSnapshot", "com.linkedin.metadata.snapshot.DataFlowSnapshot", "com.linkedin.metadata.snapshot.DataHubPolicySnapshot", "com.linkedin.metadata.snapshot.DataHubRetentionSnapshot", "com.linkedin.metadata.snapshot.DataJobSnapshot", "com.linkedin.metadata.snapshot.DataPlatformSnapshot", "com.linkedin.metadata.snapshot.DataProcessSnapshot", "com.linkedin.metadata.snapshot.DatasetSnapshot", "com.linkedin.metadata.snapshot.GlossaryNodeSnapshot", "com.linkedin.metadata.snapshot.GlossaryTermSnapshot", "com.linkedin.metadata.snapshot.MLFeatureSnapshot", "com.linkedin.metadata.snapshot.MLFeatureTableSnapshot", "com.linkedin.metadata.snapshot.MLModelDeploymentSnapshot", "com.linkedin.metadata.snapshot.MLModelGroupSnapshot", "com.linkedin.metadata.snapshot.MLModelSnapshot", "com.linkedin.metadata.snapshot.MLPrimaryKeySnapshot", "com.linkedin.metadata.snapshot.SchemaFieldSnapshot", "com.linkedin.metadata.snapshot.Snapshot", "com.linkedin.metadata.snapshot.TagSnapshot", "com.linkedin.ml.metadata.BaseData", "com.linkedin.ml.metadata.CaveatDetails", "com.linkedin.ml.metadata.CaveatsAndRecommendations", "com.linkedin.ml.metadata.DeploymentStatus", "com.linkedin.ml.metadata.EthicalConsiderations", "com.linkedin.ml.metadata.EvaluationData", "com.linkedin.ml.metadata.HyperParameterValueType", "com.linkedin.ml.metadata.IntendedUse", "com.linkedin.ml.metadata.IntendedUserType", "com.linkedin.ml.metadata.MLFeatureProperties", "com.linkedin.ml.metadata.MLFeatureTableProperties", "com.linkedin.ml.metadata.MLHyperParam", "com.linkedin.ml.metadata.MLMetric", "com.linkedin.ml.metadata.MLModelDeploymentProperties", "com.linkedin.ml.metadata.MLModelFactorPrompts", "com.linkedin.ml.metadata.MLModelFactors", "com.linkedin.ml.metadata.MLModelGroupProperties", "com.linkedin.ml.metadata.MLModelLineageInfo", "com.linkedin.ml.metadata.MLModelProperties", "com.linkedin.ml.metadata.MLPrimaryKeyProperties", "com.linkedin.ml.metadata.Metrics", "com.linkedin.ml.metadata.QuantitativeAnalyses", "com.linkedin.ml.metadata.ResultsType", "com.linkedin.ml.metadata.SourceCode", "com.linkedin.ml.metadata.SourceCodeUrl", "com.linkedin.ml.metadata.SourceCodeUrlType", "com.linkedin.ml.metadata.TrainingData", {
     "type" : "record",
     "name" : "SystemMetadata",
     "namespace" : "com.linkedin.mxe",
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json
index 8b6def75f7a665..9061cbff188135 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json
@@ -3551,7 +3551,43 @@
       "name" : "MLModelProperties",
       "namespace" : "com.linkedin.ml.metadata",
       "doc" : "Properties associated with a ML Model\r",
-      "include" : [ "com.linkedin.common.CustomProperties", "com.linkedin.common.ExternalReference" ],
+      "include" : [ "com.linkedin.common.CustomProperties", "com.linkedin.common.ExternalReference", {
+        "type" : "record",
+        "name" : "MLModelLineageInfo",
+        "doc" : "A set of re-usable fields used to capture lineage information for ML Models and ML Model Groups\r",
+        "fields" : [ {
+          "name" : "trainingJobs",
+          "type" : {
+            "type" : "array",
+            "items" : "com.linkedin.common.Urn"
+          },
+          "doc" : "List of jobs or process instances (if any) used to train the model or group. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.\r",
+          "optional" : true,
+          "Relationship" : {
+            "/*" : {
+              "entityTypes" : [ "dataJob", "dataProcessInstance" ],
+              "isLineage" : true,
+              "name" : "TrainedBy"
+            }
+          }
+        }, {
+          "name" : "downstreamJobs",
+          "type" : {
+            "type" : "array",
+            "items" : "com.linkedin.common.Urn"
+          },
+          "doc" : "List of jobs or process instances (if any) that use the model or group.\r",
+          "optional" : true,
+          "Relationship" : {
+            "/*" : {
+              "entityTypes" : [ "dataJob", "dataProcessInstance" ],
+              "isLineage" : true,
+              "isUpstream" : false,
+              "name" : "UsedBy"
+            }
+          }
+        } ]
+      } ],
       "fields" : [ {
         "name" : "name",
         "type" : "string",
@@ -3729,37 +3765,6 @@
             "name" : "DeployedTo"
           }
         }
-      }, {
-        "name" : "trainingJobs",
-        "type" : {
-          "type" : "array",
-          "items" : "com.linkedin.common.Urn"
-        },
-        "doc" : "List of jobs (if any) used to train the model. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.\r",
-        "optional" : true,
-        "Relationship" : {
-          "/*" : {
-            "entityTypes" : [ "dataJob", "dataProcessInstance" ],
-            "isLineage" : true,
-            "name" : "TrainedBy"
-          }
-        }
-      }, {
-        "name" : "downstreamJobs",
-        "type" : {
-          "type" : "array",
-          "items" : "com.linkedin.common.Urn"
-        },
-        "doc" : "List of jobs (if any) that use the model\r",
-        "optional" : true,
-        "Relationship" : {
-          "/*" : {
-            "entityTypes" : [ "dataJob" ],
-            "isLineage" : true,
-            "isUpstream" : false,
-            "name" : "UsedBy"
-          }
-        }
       }, {
         "name" : "groups",
         "type" : {
@@ -4002,7 +4007,7 @@
         }
       }
     } ]
-  }, "com.linkedin.metadata.run.UnsafeEntityInfo", "com.linkedin.ml.metadata.BaseData", "com.linkedin.ml.metadata.CaveatDetails", "com.linkedin.ml.metadata.CaveatsAndRecommendations", "com.linkedin.ml.metadata.EthicalConsiderations", "com.linkedin.ml.metadata.EvaluationData", "com.linkedin.ml.metadata.HyperParameterValueType", "com.linkedin.ml.metadata.IntendedUse", "com.linkedin.ml.metadata.IntendedUserType", "com.linkedin.ml.metadata.MLFeatureProperties", "com.linkedin.ml.metadata.MLHyperParam", "com.linkedin.ml.metadata.MLMetric", "com.linkedin.ml.metadata.MLModelFactorPrompts", "com.linkedin.ml.metadata.MLModelFactors", "com.linkedin.ml.metadata.MLModelProperties", "com.linkedin.ml.metadata.Metrics", "com.linkedin.ml.metadata.QuantitativeAnalyses", "com.linkedin.ml.metadata.ResultsType", "com.linkedin.ml.metadata.SourceCode", "com.linkedin.ml.metadata.SourceCodeUrl", "com.linkedin.ml.metadata.SourceCodeUrlType", "com.linkedin.ml.metadata.TrainingData", "com.linkedin.schema.ArrayType", "com.linkedin.schema.BinaryJsonSchema", "com.linkedin.schema.BooleanType", "com.linkedin.schema.BytesType", "com.linkedin.schema.DatasetFieldForeignKey", "com.linkedin.schema.DateType", "com.linkedin.schema.EditableSchemaFieldInfo", "com.linkedin.schema.EditableSchemaMetadata", "com.linkedin.schema.EnumType", "com.linkedin.schema.EspressoSchema", "com.linkedin.schema.FixedType", "com.linkedin.schema.ForeignKeyConstraint", "com.linkedin.schema.ForeignKeySpec", "com.linkedin.schema.KafkaSchema", "com.linkedin.schema.KeyValueSchema", "com.linkedin.schema.MapType", "com.linkedin.schema.MySqlDDL", "com.linkedin.schema.NullType", "com.linkedin.schema.NumberType", "com.linkedin.schema.OracleDDL", "com.linkedin.schema.OrcSchema", "com.linkedin.schema.OtherSchema", "com.linkedin.schema.PrestoDDL", "com.linkedin.schema.RecordType", "com.linkedin.schema.SchemaField", "com.linkedin.schema.SchemaFieldDataType", "com.linkedin.schema.SchemaMetadata", "com.linkedin.schema.SchemaMetadataKey", "com.linkedin.schema.Schemaless", "com.linkedin.schema.StringType", "com.linkedin.schema.TimeType", "com.linkedin.schema.UnionType", "com.linkedin.schema.UrnForeignKey", "com.linkedin.tag.TagProperties" ],
+  }, "com.linkedin.metadata.run.UnsafeEntityInfo", "com.linkedin.ml.metadata.BaseData", "com.linkedin.ml.metadata.CaveatDetails", "com.linkedin.ml.metadata.CaveatsAndRecommendations", "com.linkedin.ml.metadata.EthicalConsiderations", "com.linkedin.ml.metadata.EvaluationData", "com.linkedin.ml.metadata.HyperParameterValueType", "com.linkedin.ml.metadata.IntendedUse", "com.linkedin.ml.metadata.IntendedUserType", "com.linkedin.ml.metadata.MLFeatureProperties", "com.linkedin.ml.metadata.MLHyperParam", "com.linkedin.ml.metadata.MLMetric", "com.linkedin.ml.metadata.MLModelFactorPrompts", "com.linkedin.ml.metadata.MLModelFactors", "com.linkedin.ml.metadata.MLModelLineageInfo", "com.linkedin.ml.metadata.MLModelProperties", "com.linkedin.ml.metadata.Metrics", "com.linkedin.ml.metadata.QuantitativeAnalyses", "com.linkedin.ml.metadata.ResultsType", "com.linkedin.ml.metadata.SourceCode", "com.linkedin.ml.metadata.SourceCodeUrl", "com.linkedin.ml.metadata.SourceCodeUrlType", "com.linkedin.ml.metadata.TrainingData", "com.linkedin.schema.ArrayType", "com.linkedin.schema.BinaryJsonSchema", "com.linkedin.schema.BooleanType", "com.linkedin.schema.BytesType", "com.linkedin.schema.DatasetFieldForeignKey", "com.linkedin.schema.DateType", "com.linkedin.schema.EditableSchemaFieldInfo", "com.linkedin.schema.EditableSchemaMetadata", "com.linkedin.schema.EnumType", "com.linkedin.schema.EspressoSchema", "com.linkedin.schema.FixedType", "com.linkedin.schema.ForeignKeyConstraint", "com.linkedin.schema.ForeignKeySpec", "com.linkedin.schema.KafkaSchema", "com.linkedin.schema.KeyValueSchema", "com.linkedin.schema.MapType", "com.linkedin.schema.MySqlDDL", "com.linkedin.schema.NullType", "com.linkedin.schema.NumberType", "com.linkedin.schema.OracleDDL", "com.linkedin.schema.OrcSchema", "com.linkedin.schema.OtherSchema", "com.linkedin.schema.PrestoDDL", "com.linkedin.schema.RecordType", "com.linkedin.schema.SchemaField", "com.linkedin.schema.SchemaFieldDataType", "com.linkedin.schema.SchemaMetadata", "com.linkedin.schema.SchemaMetadataKey", "com.linkedin.schema.Schemaless", "com.linkedin.schema.StringType", "com.linkedin.schema.TimeType", "com.linkedin.schema.UnionType", "com.linkedin.schema.UrnForeignKey", "com.linkedin.tag.TagProperties" ],
   "schema" : {
     "name" : "runs",
     "namespace" : "com.linkedin.entity",
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json
index e4cc5c42303ee2..e6be4e828c976f 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json
@@ -3545,7 +3545,43 @@
       "name" : "MLModelProperties",
       "namespace" : "com.linkedin.ml.metadata",
       "doc" : "Properties associated with a ML Model\r",
-      "include" : [ "com.linkedin.common.CustomProperties", "com.linkedin.common.ExternalReference" ],
+      "include" : [ "com.linkedin.common.CustomProperties", "com.linkedin.common.ExternalReference", {
+        "type" : "record",
+        "name" : "MLModelLineageInfo",
+        "doc" : "A set of re-usable fields used to capture lineage information for ML Models and ML Model Groups\r",
+        "fields" : [ {
+          "name" : "trainingJobs",
+          "type" : {
+            "type" : "array",
+            "items" : "com.linkedin.common.Urn"
+          },
+          "doc" : "List of jobs or process instances (if any) used to train the model or group. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.\r",
+          "optional" : true,
+          "Relationship" : {
+            "/*" : {
+              "entityTypes" : [ "dataJob", "dataProcessInstance" ],
+              "isLineage" : true,
+              "name" : "TrainedBy"
+            }
+          }
+        }, {
+          "name" : "downstreamJobs",
+          "type" : {
+            "type" : "array",
+            "items" : "com.linkedin.common.Urn"
+          },
+          "doc" : "List of jobs or process instances (if any) that use the model or group.\r",
+          "optional" : true,
+          "Relationship" : {
+            "/*" : {
+              "entityTypes" : [ "dataJob", "dataProcessInstance" ],
+              "isLineage" : true,
+              "isUpstream" : false,
+              "name" : "UsedBy"
+            }
+          }
+        } ]
+      } ],
       "fields" : [ {
         "name" : "name",
         "type" : "string",
@@ -3723,37 +3759,6 @@
             "name" : "DeployedTo"
           }
         }
-      }, {
-        "name" : "trainingJobs",
-        "type" : {
-          "type" : "array",
-          "items" : "com.linkedin.common.Urn"
-        },
-        "doc" : "List of jobs (if any) used to train the model. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.\r",
-        "optional" : true,
-        "Relationship" : {
-          "/*" : {
-            "entityTypes" : [ "dataJob", "dataProcessInstance" ],
-            "isLineage" : true,
-            "name" : "TrainedBy"
-          }
-        }
-      }, {
-        "name" : "downstreamJobs",
-        "type" : {
-          "type" : "array",
-          "items" : "com.linkedin.common.Urn"
-        },
-        "doc" : "List of jobs (if any) that use the model\r",
-        "optional" : true,
-        "Relationship" : {
-          "/*" : {
-            "entityTypes" : [ "dataJob" ],
-            "isLineage" : true,
-            "isUpstream" : false,
-            "name" : "UsedBy"
-          }
-        }
       }, {
         "name" : "groups",
         "type" : {
@@ -3908,7 +3913,7 @@
       "name" : "version",
       "type" : "long"
     } ]
-  }, "com.linkedin.metadata.key.ChartKey", "com.linkedin.metadata.key.CorpGroupKey", "com.linkedin.metadata.key.CorpUserKey", "com.linkedin.metadata.key.DashboardKey", "com.linkedin.metadata.key.DataFlowKey", "com.linkedin.metadata.key.DataJobKey", "com.linkedin.metadata.key.GlossaryNodeKey", "com.linkedin.metadata.key.GlossaryTermKey", "com.linkedin.metadata.key.MLFeatureKey", "com.linkedin.metadata.key.MLModelKey", "com.linkedin.metadata.key.TagKey", "com.linkedin.ml.metadata.BaseData", "com.linkedin.ml.metadata.CaveatDetails", "com.linkedin.ml.metadata.CaveatsAndRecommendations", "com.linkedin.ml.metadata.EthicalConsiderations", "com.linkedin.ml.metadata.EvaluationData", "com.linkedin.ml.metadata.HyperParameterValueType", "com.linkedin.ml.metadata.IntendedUse", "com.linkedin.ml.metadata.IntendedUserType", "com.linkedin.ml.metadata.MLFeatureProperties", "com.linkedin.ml.metadata.MLHyperParam", "com.linkedin.ml.metadata.MLMetric", "com.linkedin.ml.metadata.MLModelFactorPrompts", "com.linkedin.ml.metadata.MLModelFactors", "com.linkedin.ml.metadata.MLModelProperties", "com.linkedin.ml.metadata.Metrics", "com.linkedin.ml.metadata.QuantitativeAnalyses", "com.linkedin.ml.metadata.ResultsType", "com.linkedin.ml.metadata.SourceCode", "com.linkedin.ml.metadata.SourceCodeUrl", "com.linkedin.ml.metadata.SourceCodeUrlType", "com.linkedin.ml.metadata.TrainingData", "com.linkedin.schema.ArrayType", "com.linkedin.schema.BinaryJsonSchema", "com.linkedin.schema.BooleanType", "com.linkedin.schema.BytesType", "com.linkedin.schema.DatasetFieldForeignKey", "com.linkedin.schema.DateType", "com.linkedin.schema.EditableSchemaFieldInfo", "com.linkedin.schema.EditableSchemaMetadata", "com.linkedin.schema.EnumType", "com.linkedin.schema.EspressoSchema", "com.linkedin.schema.FixedType", "com.linkedin.schema.ForeignKeyConstraint", "com.linkedin.schema.ForeignKeySpec", "com.linkedin.schema.KafkaSchema", "com.linkedin.schema.KeyValueSchema", "com.linkedin.schema.MapType", "com.linkedin.schema.MySqlDDL", "com.linkedin.schema.NullType", "com.linkedin.schema.NumberType", "com.linkedin.schema.OracleDDL", "com.linkedin.schema.OrcSchema", "com.linkedin.schema.OtherSchema", "com.linkedin.schema.PrestoDDL", "com.linkedin.schema.RecordType", "com.linkedin.schema.SchemaField", "com.linkedin.schema.SchemaFieldDataType", "com.linkedin.schema.SchemaMetadata", "com.linkedin.schema.SchemaMetadataKey", "com.linkedin.schema.Schemaless", "com.linkedin.schema.StringType", "com.linkedin.schema.TimeType", "com.linkedin.schema.UnionType", "com.linkedin.schema.UrnForeignKey", "com.linkedin.tag.TagProperties", {
+  }, "com.linkedin.metadata.key.ChartKey", "com.linkedin.metadata.key.CorpGroupKey", "com.linkedin.metadata.key.CorpUserKey", "com.linkedin.metadata.key.DashboardKey", "com.linkedin.metadata.key.DataFlowKey", "com.linkedin.metadata.key.DataJobKey", "com.linkedin.metadata.key.GlossaryNodeKey", "com.linkedin.metadata.key.GlossaryTermKey", "com.linkedin.metadata.key.MLFeatureKey", "com.linkedin.metadata.key.MLModelKey", "com.linkedin.metadata.key.TagKey", "com.linkedin.ml.metadata.BaseData", "com.linkedin.ml.metadata.CaveatDetails", "com.linkedin.ml.metadata.CaveatsAndRecommendations", "com.linkedin.ml.metadata.EthicalConsiderations", "com.linkedin.ml.metadata.EvaluationData", "com.linkedin.ml.metadata.HyperParameterValueType", "com.linkedin.ml.metadata.IntendedUse", "com.linkedin.ml.metadata.IntendedUserType", "com.linkedin.ml.metadata.MLFeatureProperties", "com.linkedin.ml.metadata.MLHyperParam", "com.linkedin.ml.metadata.MLMetric", "com.linkedin.ml.metadata.MLModelFactorPrompts", "com.linkedin.ml.metadata.MLModelFactors", "com.linkedin.ml.metadata.MLModelLineageInfo", "com.linkedin.ml.metadata.MLModelProperties", "com.linkedin.ml.metadata.Metrics", "com.linkedin.ml.metadata.QuantitativeAnalyses", "com.linkedin.ml.metadata.ResultsType", "com.linkedin.ml.metadata.SourceCode", "com.linkedin.ml.metadata.SourceCodeUrl", "com.linkedin.ml.metadata.SourceCodeUrlType", "com.linkedin.ml.metadata.TrainingData", "com.linkedin.schema.ArrayType", "com.linkedin.schema.BinaryJsonSchema", "com.linkedin.schema.BooleanType", "com.linkedin.schema.BytesType", "com.linkedin.schema.DatasetFieldForeignKey", "com.linkedin.schema.DateType", "com.linkedin.schema.EditableSchemaFieldInfo", "com.linkedin.schema.EditableSchemaMetadata", "com.linkedin.schema.EnumType", "com.linkedin.schema.EspressoSchema", "com.linkedin.schema.FixedType", "com.linkedin.schema.ForeignKeyConstraint", "com.linkedin.schema.ForeignKeySpec", "com.linkedin.schema.KafkaSchema", "com.linkedin.schema.KeyValueSchema", "com.linkedin.schema.MapType", "com.linkedin.schema.MySqlDDL", "com.linkedin.schema.NullType", "com.linkedin.schema.NumberType", "com.linkedin.schema.OracleDDL", "com.linkedin.schema.OrcSchema", "com.linkedin.schema.OtherSchema", "com.linkedin.schema.PrestoDDL", "com.linkedin.schema.RecordType", "com.linkedin.schema.SchemaField", "com.linkedin.schema.SchemaFieldDataType", "com.linkedin.schema.SchemaMetadata", "com.linkedin.schema.SchemaMetadataKey", "com.linkedin.schema.Schemaless", "com.linkedin.schema.StringType", "com.linkedin.schema.TimeType", "com.linkedin.schema.UnionType", "com.linkedin.schema.UrnForeignKey", "com.linkedin.tag.TagProperties", {
     "type" : "record",
     "name" : "TimeseriesIndexSizeResult",
     "namespace" : "com.linkedin.timeseries",
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json
index e375ac698ab516..10f3218d469757 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json
@@ -3979,7 +3979,43 @@
                   "name" : "MLModelProperties",
                   "namespace" : "com.linkedin.ml.metadata",
                   "doc" : "Properties associated with a ML Model\r",
-                  "include" : [ "com.linkedin.common.CustomProperties", "com.linkedin.common.ExternalReference" ],
+                  "include" : [ "com.linkedin.common.CustomProperties", "com.linkedin.common.ExternalReference", {
+                    "type" : "record",
+                    "name" : "MLModelLineageInfo",
+                    "doc" : "A set of re-usable fields used to capture lineage information for ML Models and ML Model Groups\r",
+                    "fields" : [ {
+                      "name" : "trainingJobs",
+                      "type" : {
+                        "type" : "array",
+                        "items" : "com.linkedin.common.Urn"
+                      },
+                      "doc" : "List of jobs or process instances (if any) used to train the model or group. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.\r",
+                      "optional" : true,
+                      "Relationship" : {
+                        "/*" : {
+                          "entityTypes" : [ "dataJob", "dataProcessInstance" ],
+                          "isLineage" : true,
+                          "name" : "TrainedBy"
+                        }
+                      }
+                    }, {
+                      "name" : "downstreamJobs",
+                      "type" : {
+                        "type" : "array",
+                        "items" : "com.linkedin.common.Urn"
+                      },
+                      "doc" : "List of jobs or process instances (if any) that use the model or group.\r",
+                      "optional" : true,
+                      "Relationship" : {
+                        "/*" : {
+                          "entityTypes" : [ "dataJob", "dataProcessInstance" ],
+                          "isLineage" : true,
+                          "isUpstream" : false,
+                          "name" : "UsedBy"
+                        }
+                      }
+                    } ]
+                  } ],
                   "fields" : [ {
                     "name" : "name",
                     "type" : "string",
@@ -4157,37 +4193,6 @@
                         "name" : "DeployedTo"
                       }
                     }
-                  }, {
-                    "name" : "trainingJobs",
-                    "type" : {
-                      "type" : "array",
-                      "items" : "com.linkedin.common.Urn"
-                    },
-                    "doc" : "List of jobs (if any) used to train the model. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.\r",
-                    "optional" : true,
-                    "Relationship" : {
-                      "/*" : {
-                        "entityTypes" : [ "dataJob", "dataProcessInstance" ],
-                        "isLineage" : true,
-                        "name" : "TrainedBy"
-                      }
-                    }
-                  }, {
-                    "name" : "downstreamJobs",
-                    "type" : {
-                      "type" : "array",
-                      "items" : "com.linkedin.common.Urn"
-                    },
-                    "doc" : "List of jobs (if any) that use the model\r",
-                    "optional" : true,
-                    "Relationship" : {
-                      "/*" : {
-                        "entityTypes" : [ "dataJob" ],
-                        "isLineage" : true,
-                        "isUpstream" : false,
-                        "name" : "UsedBy"
-                      }
-                    }
                   }, {
                     "name" : "groups",
                     "type" : {
@@ -4998,7 +5003,7 @@
                   "name" : "MLModelGroupProperties",
                   "namespace" : "com.linkedin.ml.metadata",
                   "doc" : "Properties associated with an ML Model Group\r",
-                  "include" : [ "com.linkedin.common.CustomProperties" ],
+                  "include" : [ "com.linkedin.common.CustomProperties", "MLModelLineageInfo" ],
                   "fields" : [ {
                     "name" : "name",
                     "type" : "string",
@@ -5035,21 +5040,6 @@
                     "type" : "com.linkedin.common.TimeStamp",
                     "doc" : "Date when the MLModelGroup was last modified\r",
                     "optional" : true
-                  }, {
-                    "name" : "trainingJobs",
-                    "type" : {
-                      "type" : "array",
-                      "items" : "com.linkedin.common.Urn"
-                    },
-                    "doc" : "List of jobs (if any) used to train the model group. Visible in Lineage.\r",
-                    "optional" : true,
-                    "Relationship" : {
-                      "/*" : {
-                        "entityTypes" : [ "dataJob" ],
-                        "isLineage" : true,
-                        "name" : "TrainedBy"
-                      }
-                    }
                   }, {
                     "name" : "version",
                     "type" : "com.linkedin.common.VersionTag",
@@ -5844,7 +5834,7 @@
         } ]
       }
     } ]
-  }, "com.linkedin.glossary.GlossaryNodeInfo", "com.linkedin.glossary.GlossaryRelatedTerms", "com.linkedin.glossary.GlossaryTermInfo", "com.linkedin.identity.CorpGroupInfo", "com.linkedin.identity.CorpUserEditableInfo", "com.linkedin.identity.CorpUserInfo", "com.linkedin.identity.CorpUserStatus", "com.linkedin.identity.GroupMembership", "com.linkedin.metadata.aspect.ChartAspect", "com.linkedin.metadata.aspect.CorpGroupAspect", "com.linkedin.metadata.aspect.CorpUserAspect", "com.linkedin.metadata.aspect.DashboardAspect", "com.linkedin.metadata.aspect.DataFlowAspect", "com.linkedin.metadata.aspect.DataHubPolicyAspect", "com.linkedin.metadata.aspect.DataHubRetentionAspect", "com.linkedin.metadata.aspect.DataJobAspect", "com.linkedin.metadata.aspect.DataPlatformAspect", "com.linkedin.metadata.aspect.DataProcessAspect", "com.linkedin.metadata.aspect.DatasetAspect", "com.linkedin.metadata.aspect.GlossaryNodeAspect", "com.linkedin.metadata.aspect.GlossaryTermAspect", "com.linkedin.metadata.aspect.MLFeatureAspect", "com.linkedin.metadata.aspect.MLFeatureTableAspect", "com.linkedin.metadata.aspect.MLModelAspect", "com.linkedin.metadata.aspect.MLModelDeploymentAspect", "com.linkedin.metadata.aspect.MLModelGroupAspect", "com.linkedin.metadata.aspect.MLPrimaryKeyAspect", "com.linkedin.metadata.aspect.SchemaFieldAspect", "com.linkedin.metadata.aspect.TagAspect", "com.linkedin.metadata.key.ChartKey", "com.linkedin.metadata.key.CorpGroupKey", "com.linkedin.metadata.key.CorpUserKey", "com.linkedin.metadata.key.DashboardKey", "com.linkedin.metadata.key.DataFlowKey", "com.linkedin.metadata.key.DataHubPolicyKey", "com.linkedin.metadata.key.DataHubRetentionKey", "com.linkedin.metadata.key.DataJobKey", "com.linkedin.metadata.key.DataPlatformKey", "com.linkedin.metadata.key.DataProcessKey", "com.linkedin.metadata.key.DatasetKey", "com.linkedin.metadata.key.GlossaryNodeKey", "com.linkedin.metadata.key.GlossaryTermKey", "com.linkedin.metadata.key.MLFeatureKey", "com.linkedin.metadata.key.MLFeatureTableKey", "com.linkedin.metadata.key.MLModelDeploymentKey", "com.linkedin.metadata.key.MLModelGroupKey", "com.linkedin.metadata.key.MLModelKey", "com.linkedin.metadata.key.MLPrimaryKeyKey", "com.linkedin.metadata.key.SchemaFieldKey", "com.linkedin.metadata.key.TagKey", "com.linkedin.metadata.snapshot.ChartSnapshot", "com.linkedin.metadata.snapshot.CorpGroupSnapshot", "com.linkedin.metadata.snapshot.CorpUserSnapshot", "com.linkedin.metadata.snapshot.DashboardSnapshot", "com.linkedin.metadata.snapshot.DataFlowSnapshot", "com.linkedin.metadata.snapshot.DataHubPolicySnapshot", "com.linkedin.metadata.snapshot.DataHubRetentionSnapshot", "com.linkedin.metadata.snapshot.DataJobSnapshot", "com.linkedin.metadata.snapshot.DataPlatformSnapshot", "com.linkedin.metadata.snapshot.DataProcessSnapshot", "com.linkedin.metadata.snapshot.DatasetSnapshot", "com.linkedin.metadata.snapshot.GlossaryNodeSnapshot", "com.linkedin.metadata.snapshot.GlossaryTermSnapshot", "com.linkedin.metadata.snapshot.MLFeatureSnapshot", "com.linkedin.metadata.snapshot.MLFeatureTableSnapshot", "com.linkedin.metadata.snapshot.MLModelDeploymentSnapshot", "com.linkedin.metadata.snapshot.MLModelGroupSnapshot", "com.linkedin.metadata.snapshot.MLModelSnapshot", "com.linkedin.metadata.snapshot.MLPrimaryKeySnapshot", "com.linkedin.metadata.snapshot.SchemaFieldSnapshot", "com.linkedin.metadata.snapshot.Snapshot", "com.linkedin.metadata.snapshot.TagSnapshot", "com.linkedin.ml.metadata.BaseData", "com.linkedin.ml.metadata.CaveatDetails", "com.linkedin.ml.metadata.CaveatsAndRecommendations", "com.linkedin.ml.metadata.DeploymentStatus", "com.linkedin.ml.metadata.EthicalConsiderations", "com.linkedin.ml.metadata.EvaluationData", "com.linkedin.ml.metadata.HyperParameterValueType", "com.linkedin.ml.metadata.IntendedUse", "com.linkedin.ml.metadata.IntendedUserType", "com.linkedin.ml.metadata.MLFeatureProperties", "com.linkedin.ml.metadata.MLFeatureTableProperties", "com.linkedin.ml.metadata.MLHyperParam", "com.linkedin.ml.metadata.MLMetric", "com.linkedin.ml.metadata.MLModelDeploymentProperties", "com.linkedin.ml.metadata.MLModelFactorPrompts", "com.linkedin.ml.metadata.MLModelFactors", "com.linkedin.ml.metadata.MLModelGroupProperties", "com.linkedin.ml.metadata.MLModelProperties", "com.linkedin.ml.metadata.MLPrimaryKeyProperties", "com.linkedin.ml.metadata.Metrics", "com.linkedin.ml.metadata.QuantitativeAnalyses", "com.linkedin.ml.metadata.ResultsType", "com.linkedin.ml.metadata.SourceCode", "com.linkedin.ml.metadata.SourceCodeUrl", "com.linkedin.ml.metadata.SourceCodeUrlType", "com.linkedin.ml.metadata.TrainingData", {
+  }, "com.linkedin.glossary.GlossaryNodeInfo", "com.linkedin.glossary.GlossaryRelatedTerms", "com.linkedin.glossary.GlossaryTermInfo", "com.linkedin.identity.CorpGroupInfo", "com.linkedin.identity.CorpUserEditableInfo", "com.linkedin.identity.CorpUserInfo", "com.linkedin.identity.CorpUserStatus", "com.linkedin.identity.GroupMembership", "com.linkedin.metadata.aspect.ChartAspect", "com.linkedin.metadata.aspect.CorpGroupAspect", "com.linkedin.metadata.aspect.CorpUserAspect", "com.linkedin.metadata.aspect.DashboardAspect", "com.linkedin.metadata.aspect.DataFlowAspect", "com.linkedin.metadata.aspect.DataHubPolicyAspect", "com.linkedin.metadata.aspect.DataHubRetentionAspect", "com.linkedin.metadata.aspect.DataJobAspect", "com.linkedin.metadata.aspect.DataPlatformAspect", "com.linkedin.metadata.aspect.DataProcessAspect", "com.linkedin.metadata.aspect.DatasetAspect", "com.linkedin.metadata.aspect.GlossaryNodeAspect", "com.linkedin.metadata.aspect.GlossaryTermAspect", "com.linkedin.metadata.aspect.MLFeatureAspect", "com.linkedin.metadata.aspect.MLFeatureTableAspect", "com.linkedin.metadata.aspect.MLModelAspect", "com.linkedin.metadata.aspect.MLModelDeploymentAspect", "com.linkedin.metadata.aspect.MLModelGroupAspect", "com.linkedin.metadata.aspect.MLPrimaryKeyAspect", "com.linkedin.metadata.aspect.SchemaFieldAspect", "com.linkedin.metadata.aspect.TagAspect", "com.linkedin.metadata.key.ChartKey", "com.linkedin.metadata.key.CorpGroupKey", "com.linkedin.metadata.key.CorpUserKey", "com.linkedin.metadata.key.DashboardKey", "com.linkedin.metadata.key.DataFlowKey", "com.linkedin.metadata.key.DataHubPolicyKey", "com.linkedin.metadata.key.DataHubRetentionKey", "com.linkedin.metadata.key.DataJobKey", "com.linkedin.metadata.key.DataPlatformKey", "com.linkedin.metadata.key.DataProcessKey", "com.linkedin.metadata.key.DatasetKey", "com.linkedin.metadata.key.GlossaryNodeKey", "com.linkedin.metadata.key.GlossaryTermKey", "com.linkedin.metadata.key.MLFeatureKey", "com.linkedin.metadata.key.MLFeatureTableKey", "com.linkedin.metadata.key.MLModelDeploymentKey", "com.linkedin.metadata.key.MLModelGroupKey", "com.linkedin.metadata.key.MLModelKey", "com.linkedin.metadata.key.MLPrimaryKeyKey", "com.linkedin.metadata.key.SchemaFieldKey", "com.linkedin.metadata.key.TagKey", "com.linkedin.metadata.snapshot.ChartSnapshot", "com.linkedin.metadata.snapshot.CorpGroupSnapshot", "com.linkedin.metadata.snapshot.CorpUserSnapshot", "com.linkedin.metadata.snapshot.DashboardSnapshot", "com.linkedin.metadata.snapshot.DataFlowSnapshot", "com.linkedin.metadata.snapshot.DataHubPolicySnapshot", "com.linkedin.metadata.snapshot.DataHubRetentionSnapshot", "com.linkedin.metadata.snapshot.DataJobSnapshot", "com.linkedin.metadata.snapshot.DataPlatformSnapshot", "com.linkedin.metadata.snapshot.DataProcessSnapshot", "com.linkedin.metadata.snapshot.DatasetSnapshot", "com.linkedin.metadata.snapshot.GlossaryNodeSnapshot", "com.linkedin.metadata.snapshot.GlossaryTermSnapshot", "com.linkedin.metadata.snapshot.MLFeatureSnapshot", "com.linkedin.metadata.snapshot.MLFeatureTableSnapshot", "com.linkedin.metadata.snapshot.MLModelDeploymentSnapshot", "com.linkedin.metadata.snapshot.MLModelGroupSnapshot", "com.linkedin.metadata.snapshot.MLModelSnapshot", "com.linkedin.metadata.snapshot.MLPrimaryKeySnapshot", "com.linkedin.metadata.snapshot.SchemaFieldSnapshot", "com.linkedin.metadata.snapshot.Snapshot", "com.linkedin.metadata.snapshot.TagSnapshot", "com.linkedin.ml.metadata.BaseData", "com.linkedin.ml.metadata.CaveatDetails", "com.linkedin.ml.metadata.CaveatsAndRecommendations", "com.linkedin.ml.metadata.DeploymentStatus", "com.linkedin.ml.metadata.EthicalConsiderations", "com.linkedin.ml.metadata.EvaluationData", "com.linkedin.ml.metadata.HyperParameterValueType", "com.linkedin.ml.metadata.IntendedUse", "com.linkedin.ml.metadata.IntendedUserType", "com.linkedin.ml.metadata.MLFeatureProperties", "com.linkedin.ml.metadata.MLFeatureTableProperties", "com.linkedin.ml.metadata.MLHyperParam", "com.linkedin.ml.metadata.MLMetric", "com.linkedin.ml.metadata.MLModelDeploymentProperties", "com.linkedin.ml.metadata.MLModelFactorPrompts", "com.linkedin.ml.metadata.MLModelFactors", "com.linkedin.ml.metadata.MLModelGroupProperties", "com.linkedin.ml.metadata.MLModelLineageInfo", "com.linkedin.ml.metadata.MLModelProperties", "com.linkedin.ml.metadata.MLPrimaryKeyProperties", "com.linkedin.ml.metadata.Metrics", "com.linkedin.ml.metadata.QuantitativeAnalyses", "com.linkedin.ml.metadata.ResultsType", "com.linkedin.ml.metadata.SourceCode", "com.linkedin.ml.metadata.SourceCodeUrl", "com.linkedin.ml.metadata.SourceCodeUrlType", "com.linkedin.ml.metadata.TrainingData", {
     "type" : "record",
     "name" : "GenericPayload",
     "namespace" : "com.linkedin.mxe",
diff --git a/smoke-test/tests/data_process_instance/__init__.py b/smoke-test/tests/data_process_instance/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/smoke-test/tests/data_process_instance/test_data_process_instance.py b/smoke-test/tests/data_process_instance/test_data_process_instance.py
new file mode 100644
index 00000000000000..a8aca6034d5be1
--- /dev/null
+++ b/smoke-test/tests/data_process_instance/test_data_process_instance.py
@@ -0,0 +1,293 @@
+import logging
+import os
+import tempfile
+from random import randint
+
+import pytest
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.ingestion.api.common import PipelineContext, RecordEnvelope
+from datahub.ingestion.api.sink import NoopWriteCallback
+from datahub.ingestion.sink.file import FileSink, FileSinkConfig
+from datahub.metadata.schema_classes import (
+    AuditStampClass,
+    ContainerClass,
+    ContainerPropertiesClass,
+    DataPlatformInstanceClass,
+    DataPlatformInstancePropertiesClass,
+    DataProcessInstanceKeyClass,
+    DataProcessInstancePropertiesClass,
+    DataProcessInstanceRunEventClass,
+    MLHyperParamClass,
+    MLMetricClass,
+    MLTrainingRunPropertiesClass,
+    SubTypesClass,
+    TimeWindowSizeClass,
+)
+
+from tests.utils import (
+    delete_urns_from_file,
+    ingest_file_via_rest,
+    wait_for_writes_to_sync,
+)
+
+logger = logging.getLogger(__name__)
+
+# Generate unique DPI ID
+dpi_id = f"test-pipeline-run-{randint(1000, 9999)}"
+dpi_urn = f"urn:li:dataProcessInstance:{dpi_id}"
+
+
+class FileEmitter:
+    def __init__(self, filename: str) -> None:
+        self.sink: FileSink = FileSink(
+            ctx=PipelineContext(run_id="create_test_data"),
+            config=FileSinkConfig(filename=filename),
+        )
+
+    def emit(self, event):
+        self.sink.write_record_async(
+            record_envelope=RecordEnvelope(record=event, metadata={}),
+            write_callback=NoopWriteCallback(),
+        )
+
+    def close(self):
+        self.sink.close()
+
+
+def create_test_data(filename: str):
+    mcps = [
+        # Key aspect
+        MetadataChangeProposalWrapper(
+            entityType="dataProcessInstance",
+            entityUrn=dpi_urn,
+            aspectName="dataProcessInstanceKey",
+            aspect=DataProcessInstanceKeyClass(id=dpi_id),
+        ),
+        # Properties aspect
+        MetadataChangeProposalWrapper(
+            entityType="dataProcessInstance",
+            entityUrn=dpi_urn,
+            aspectName="dataProcessInstanceProperties",
+            aspect=DataProcessInstancePropertiesClass(
+                name="Test Pipeline Run",
+                type="BATCH_SCHEDULED",
+                created=AuditStampClass(
+                    time=1640692800000, actor="urn:li:corpuser:datahub"
+                ),
+            ),
+        ),
+        # Run Event aspect
+        MetadataChangeProposalWrapper(
+            entityType="dataProcessInstance",
+            entityUrn=dpi_urn,
+            aspectName="dataProcessInstanceRunEvent",
+            aspect=DataProcessInstanceRunEventClass(
+                timestampMillis=1704067200000,
+                eventGranularity=TimeWindowSizeClass(unit="WEEK", multiple=1),
+                status="COMPLETE",
+            ),
+        ),
+        # Platform Instance aspect
+        MetadataChangeProposalWrapper(
+            entityType="dataProcessInstance",
+            entityUrn=dpi_urn,
+            aspectName="dataPlatformInstance",
+            aspect=DataPlatformInstanceClass(
+                platform="urn:li:dataPlatform:airflow",
+                instance="urn:li:dataPlatformInstance:(urn:li:dataPlatform:airflow,1234567890)",
+            ),
+        ),
+        MetadataChangeProposalWrapper(
+            entityType="dataPlatformInstance",
+            entityUrn="urn:li:dataPlatformInstance:(urn:li:dataPlatform:airflow,1234567890)",
+            aspectName="dataPlatformInstanceProperties",
+            aspect=DataPlatformInstancePropertiesClass(
+                name="my process instance",
+            ),
+        ),
+        # SubTypes aspect
+        MetadataChangeProposalWrapper(
+            entityType="dataProcessInstance",
+            entityUrn=dpi_urn,
+            aspectName="subTypes",
+            aspect=SubTypesClass(typeNames=["TEST", "BATCH_JOB"]),
+        ),
+        # Container aspect
+        MetadataChangeProposalWrapper(
+            entityType="dataProcessInstance",
+            entityUrn=dpi_urn,
+            aspectName="container",
+            aspect=ContainerClass(container="urn:li:container:testGroup1"),
+        ),
+        MetadataChangeProposalWrapper(
+            entityType="container",
+            entityUrn="urn:li:container:testGroup1",
+            aspectName="containerProperties",
+            aspect=ContainerPropertiesClass(name="testGroup1"),
+        ),
+        # ML Training Run Properties aspect
+        MetadataChangeProposalWrapper(
+            entityType="dataProcessInstance",
+            entityUrn=dpi_urn,
+            aspectName="mlTrainingRunProperties",
+            aspect=MLTrainingRunPropertiesClass(
+                id="test-training-run-123",
+                trainingMetrics=[
+                    MLMetricClass(
+                        name="accuracy",
+                        description="accuracy of the model",
+                        value="0.95",
+                    ),
+                    MLMetricClass(
+                        name="loss",
+                        description="accuracy loss of the model",
+                        value="0.05",
+                    ),
+                ],
+                hyperParams=[
+                    MLHyperParamClass(
+                        name="learningRate",
+                        description="rate of learning",
+                        value="0.001",
+                    ),
+                    MLHyperParamClass(
+                        name="batchSize", description="size of the batch", value="32"
+                    ),
+                ],
+                outputUrls=["s3://my-bucket/ml/output"],
+            ),
+        ),
+    ]
+
+    file_emitter = FileEmitter(filename)
+    for mcp in mcps:
+        file_emitter.emit(mcp)
+    file_emitter.close()
+
+
+@pytest.fixture(scope="module", autouse=False)
+def ingest_cleanup_data(auth_session, graph_client, request):
+    new_file, filename = tempfile.mkstemp(suffix=".json")
+    try:
+        create_test_data(filename)
+        print("ingesting data process instance test data")
+        ingest_file_via_rest(auth_session, filename)
+        wait_for_writes_to_sync()
+        yield
+        print("removing data process instance test data")
+        delete_urns_from_file(graph_client, filename)
+        wait_for_writes_to_sync()
+    finally:
+        os.remove(filename)
+
+
+@pytest.mark.integration
+def test_search_dpi(auth_session, ingest_cleanup_data):
+    """Test DPI search and validation of returned fields using GraphQL."""
+
+    json = {
+        "query": """query scrollAcrossEntities($input: ScrollAcrossEntitiesInput!) {
+            scrollAcrossEntities(input: $input) {
+                nextScrollId
+                count
+                total
+                searchResults {
+                    entity {
+                        ... on DataProcessInstance {
+                            urn
+                            properties {
+                                name
+                                externalUrl
+                            }
+                            dataPlatformInstance {
+                                platform {
+                                    urn
+                                    name
+                                }
+                            }
+                            subTypes {
+                                typeNames
+                            }
+                            container {
+                                urn
+                            }
+                            platform {
+                                urn
+                                name
+                                properties {
+                                    type
+                                }
+                            }
+                            mlTrainingRunProperties {
+                                id
+                                trainingMetrics {
+                                  name
+                                  value
+                                }
+                                hyperParams {
+                                  name
+                                  value
+                                }
+                                outputUrls
+                            }
+                        }
+                    }
+                }
+            }
+        }""",
+        "variables": {
+            "input": {"types": ["DATA_PROCESS_INSTANCE"], "query": dpi_id, "count": 10}
+        },
+    }
+
+    response = auth_session.post(
+        f"{auth_session.frontend_url()}/api/v2/graphql", json=json
+    )
+    response.raise_for_status()
+    res_data = response.json()
+
+    # Basic response structure validation
+    assert res_data, "Response should not be empty"
+    assert "data" in res_data, "Response should contain 'data' field"
+    print("RESPONSE DATA:" + str(res_data))
+    assert (
+        "scrollAcrossEntities" in res_data["data"]
+    ), "Response should contain 'scrollAcrossEntities' field"
+
+    search_results = res_data["data"]["scrollAcrossEntities"]
+    assert (
+        "searchResults" in search_results
+    ), "Response should contain 'searchResults' field"
+
+    results = search_results["searchResults"]
+    assert len(results) > 0, "Should find at least one result"
+
+    # Find our test entity
+    test_entity = None
+    for result in results:
+        if result["entity"]["urn"] == dpi_urn:
+            test_entity = result["entity"]
+            break
+
+    assert test_entity is not None, f"Should find test entity with URN {dpi_urn}"
+
+    # Validate fields
+    props = test_entity["properties"]
+    assert props["name"] == "Test Pipeline Run"
+
+    platform_instance = test_entity["dataPlatformInstance"]
+    assert platform_instance["platform"]["urn"] == "urn:li:dataPlatform:airflow"
+
+    sub_types = test_entity["subTypes"]
+    assert set(sub_types["typeNames"]) == {"TEST", "BATCH_JOB"}
+
+    container = test_entity["container"]
+    assert container["urn"] == "urn:li:container:testGroup1"
+
+    ml_props = test_entity["mlTrainingRunProperties"]
+    assert ml_props["id"] == "test-training-run-123"
+    assert ml_props["trainingMetrics"][0] == {"name": "accuracy", "value": "0.95"}
+    assert ml_props["trainingMetrics"][1] == {"name": "loss", "value": "0.05"}
+    assert ml_props["hyperParams"][0] == {"name": "learningRate", "value": "0.001"}
+    assert ml_props["hyperParams"][1] == {"name": "batchSize", "value": "32"}
+    assert ml_props["outputUrls"][0] == "s3://my-bucket/ml/output"
diff --git a/smoke-test/tests/ml_models/__init__.py b/smoke-test/tests/ml_models/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/smoke-test/tests/ml_models/test_ml_models.py b/smoke-test/tests/ml_models/test_ml_models.py
new file mode 100644
index 00000000000000..59821ab3e3cc41
--- /dev/null
+++ b/smoke-test/tests/ml_models/test_ml_models.py
@@ -0,0 +1,133 @@
+import logging
+import os
+import tempfile
+from random import randint
+
+import pytest
+from datahub.emitter.mce_builder import make_ml_model_group_urn, make_ml_model_urn
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.ingestion.api.common import PipelineContext, RecordEnvelope
+from datahub.ingestion.api.sink import NoopWriteCallback
+from datahub.ingestion.graph.client import DataHubGraph
+from datahub.ingestion.sink.file import FileSink, FileSinkConfig
+from datahub.metadata.schema_classes import (
+    MLModelGroupPropertiesClass,
+    MLModelPropertiesClass,
+)
+
+from tests.utils import (
+    delete_urns_from_file,
+    get_sleep_info,
+    ingest_file_via_rest,
+    wait_for_writes_to_sync,
+)
+
+logger = logging.getLogger(__name__)
+
+# Generate unique model names for testing
+start_index = randint(10, 10000)
+model_names = [f"test_model_{i}" for i in range(start_index, start_index + 3)]
+model_group_urn = make_ml_model_group_urn("workbench", "test_group", "DEV")
+model_urns = [make_ml_model_urn("workbench", name, "DEV") for name in model_names]
+
+
+class FileEmitter:
+    def __init__(self, filename: str) -> None:
+        self.sink: FileSink = FileSink(
+            ctx=PipelineContext(run_id="create_test_data"),
+            config=FileSinkConfig(filename=filename),
+        )
+
+    def emit(self, event):
+        self.sink.write_record_async(
+            record_envelope=RecordEnvelope(record=event, metadata={}),
+            write_callback=NoopWriteCallback(),
+        )
+
+    def close(self):
+        self.sink.close()
+
+
+def create_test_data(filename: str):
+    # Create model group
+    model_group_mcp = MetadataChangeProposalWrapper(
+        entityUrn=str(model_group_urn),
+        aspect=MLModelGroupPropertiesClass(
+            description="Test model group for integration testing",
+            trainingJobs=["urn:li:dataProcessInstance:test_job"],
+        ),
+    )
+
+    # Create models that belong to the group
+    model_mcps = [
+        MetadataChangeProposalWrapper(
+            entityUrn=model_urn,
+            aspect=MLModelPropertiesClass(
+                name=f"Test Model ({model_urn})",
+                description=f"Test model {model_urn}",
+                groups=[str(model_group_urn)],
+                trainingJobs=["urn:li:dataProcessInstance:test_job"],
+            ),
+        )
+        for model_urn in model_urns
+    ]
+
+    file_emitter = FileEmitter(filename)
+    for mcps in [model_group_mcp] + model_mcps:
+        file_emitter.emit(mcps)
+
+    file_emitter.close()
+
+
+sleep_sec, sleep_times = get_sleep_info()
+
+
+@pytest.fixture(scope="module", autouse=False)
+def ingest_cleanup_data(auth_session, graph_client, request):
+    new_file, filename = tempfile.mkstemp(suffix=".json")
+    try:
+        create_test_data(filename)
+        print("ingesting ml model test data")
+        ingest_file_via_rest(auth_session, filename)
+        wait_for_writes_to_sync()
+        yield
+        print("removing ml model test data")
+        delete_urns_from_file(graph_client, filename)
+        wait_for_writes_to_sync()
+    finally:
+        os.remove(filename)
+
+
+@pytest.mark.integration
+def test_create_ml_models(graph_client: DataHubGraph, ingest_cleanup_data):
+    """Test creation and validation of ML models and model groups."""
+
+    # Validate model group properties
+    fetched_group_props = graph_client.get_aspect(
+        str(model_group_urn), MLModelGroupPropertiesClass
+    )
+    assert fetched_group_props is not None
+    assert fetched_group_props.description == "Test model group for integration testing"
+    assert fetched_group_props.trainingJobs == ["urn:li:dataProcessInstance:test_job"]
+
+    # Validate individual models
+    for model_urn in model_urns:
+        fetched_model_props = graph_client.get_aspect(model_urn, MLModelPropertiesClass)
+        assert fetched_model_props is not None
+        assert fetched_model_props.name == f"Test Model ({model_urn})"
+        assert fetched_model_props.description == f"Test model {model_urn}"
+        assert str(model_group_urn) in (fetched_model_props.groups or [])
+        assert fetched_model_props.trainingJobs == [
+            "urn:li:dataProcessInstance:test_job"
+        ]
+
+    # Validate relationships between models and group
+    related_models = set()
+    for e in graph_client.get_related_entities(
+        str(model_group_urn),
+        relationship_types=["MemberOf"],
+        direction=DataHubGraph.RelationshipDirection.INCOMING,
+    ):
+        related_models.add(e.urn)
+
+    assert set(model_urns) == related_models

From e1532a7f516c80906b74c53a89d3fd895c7dcf1d Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Mon, 13 Jan 2025 21:41:51 -0800
Subject: [PATCH 072/249] fix(ingest): support async_flag properly in
 ingestProposalBatch (#12332)

---
 metadata-ingestion/src/datahub/emitter/rest_emitter.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata-ingestion/src/datahub/emitter/rest_emitter.py b/metadata-ingestion/src/datahub/emitter/rest_emitter.py
index 74b8ade7da445b..7271f784bf881e 100644
--- a/metadata-ingestion/src/datahub/emitter/rest_emitter.py
+++ b/metadata-ingestion/src/datahub/emitter/rest_emitter.py
@@ -374,7 +374,7 @@ def emit_mcps(
             # the size when chunking, and again for the actual request.
             payload_dict: dict = {"proposals": mcp_obj_chunk}
             if async_flag is not None:
-                payload_dict["async"] = True if async_flag else False
+                payload_dict["async"] = "true" if async_flag else "false"
 
             payload = json.dumps(payload_dict)
             self._emit_generic(url, payload)

From ebbadf65ad836e550af52566d7036a791ceafbfa Mon Sep 17 00:00:00 2001
From: Andrew Sikowitz <andrew.sikowitz@acryl.io>
Date: Tue, 14 Jan 2025 01:50:14 -0800
Subject: [PATCH 073/249] feat(ingest/snowflake): Support ingesting snowflake
 tags as structured properties (#12285)

---
 .../create_structured_property.py             |    6 +-
 .../update_structured_property.py             |    2 +-
 .../src/datahub/emitter/mcp_builder.py        |   27 +
 .../source/snowflake/snowflake_config.py      |   13 +
 .../source/snowflake/snowflake_schema.py      |    7 +-
 .../source/snowflake/snowflake_schema_gen.py  |  132 +-
 .../source/snowflake/snowflake_tag.py         |   18 +-
 .../datahub/ingestion/source/sql/sql_utils.py |    5 +
 ...nowflake_structured_properties_golden.json | 4418 +++++++++++++++++
 .../integration/snowflake/test_snowflake.py   |   62 +
 .../snowflake/test_snowflake_tag.py           |   48 +
 11 files changed, 4708 insertions(+), 30 deletions(-)
 create mode 100644 metadata-ingestion/tests/integration/snowflake/snowflake_structured_properties_golden.json

diff --git a/metadata-ingestion/examples/structured_properties/create_structured_property.py b/metadata-ingestion/examples/structured_properties/create_structured_property.py
index e66ac3aec41221..64bc0a67812775 100644
--- a/metadata-ingestion/examples/structured_properties/create_structured_property.py
+++ b/metadata-ingestion/examples/structured_properties/create_structured_property.py
@@ -17,7 +17,7 @@
 rest_emitter = DatahubRestEmitter(gms_server="http://localhost:8080")
 
 # first, let's make an open ended structured property that allows one text value
-text_property_urn = StructuredPropertyUrn("openTextProperty")
+text_property_urn = StructuredPropertyUrn("io.acryl.openTextProperty")
 text_property_definition = StructuredPropertyDefinitionClass(
     qualifiedName="io.acryl.openTextProperty",
     displayName="Open Text Property",
@@ -39,7 +39,7 @@
 
 # next, let's make a property that allows for multiple datahub entity urns as values
 # This example property could be used to reference other users or groups in datahub
-urn_property_urn = StructuredPropertyUrn("dataSteward")
+urn_property_urn = StructuredPropertyUrn("io.acryl.dataManagement.dataSteward")
 urn_property_definition = StructuredPropertyDefinitionClass(
     qualifiedName="io.acryl.dataManagement.dataSteward",
     displayName="Data Steward",
@@ -63,7 +63,7 @@
 rest_emitter.emit(event_prop_2)
 
 # finally, let's make a single select number property with a few allowed options
-number_property_urn = StructuredPropertyUrn("replicationSLA")
+number_property_urn = StructuredPropertyUrn("io.acryl.dataManagement.replicationSLA")
 number_property_definition = StructuredPropertyDefinitionClass(
     qualifiedName="io.acryl.dataManagement.replicationSLA",
     displayName="Retention Time",
diff --git a/metadata-ingestion/examples/structured_properties/update_structured_property.py b/metadata-ingestion/examples/structured_properties/update_structured_property.py
index 9b80ebc236d8b6..6f4b8b3be20d15 100644
--- a/metadata-ingestion/examples/structured_properties/update_structured_property.py
+++ b/metadata-ingestion/examples/structured_properties/update_structured_property.py
@@ -30,7 +30,7 @@ def get_emitter() -> Union[DataHubRestEmitter, DatahubKafkaEmitter]:
 
 
 # input your unique structured property ID
-property_urn = StructuredPropertyUrn("dataSteward")
+property_urn = StructuredPropertyUrn("io.acryl.dataManagement.dataSteward")
 
 with get_emitter() as emitter:
     for patch_mcp in (
diff --git a/metadata-ingestion/src/datahub/emitter/mcp_builder.py b/metadata-ingestion/src/datahub/emitter/mcp_builder.py
index c8eb62a2e1de23..581f903d0eef0d 100644
--- a/metadata-ingestion/src/datahub/emitter/mcp_builder.py
+++ b/metadata-ingestion/src/datahub/emitter/mcp_builder.py
@@ -31,9 +31,12 @@
     OwnershipClass,
     OwnershipTypeClass,
     StatusClass,
+    StructuredPropertiesClass,
+    StructuredPropertyValueAssignmentClass,
     SubTypesClass,
     TagAssociationClass,
 )
+from datahub.metadata.urns import StructuredPropertyUrn
 
 # In https://github.com/datahub-project/datahub/pull/11214, we added a
 # new env field to container properties. However, populating this field
@@ -187,12 +190,31 @@ def add_tags_to_entity_wu(
     ).as_workunit()
 
 
+def add_structured_properties_to_entity_wu(
+    entity_urn: str, structured_properties: Dict[StructuredPropertyUrn, str]
+) -> Iterable[MetadataWorkUnit]:
+    aspect = StructuredPropertiesClass(
+        properties=[
+            StructuredPropertyValueAssignmentClass(
+                propertyUrn=urn.urn(),
+                values=[value],
+            )
+            for urn, value in structured_properties.items()
+        ]
+    )
+    yield MetadataChangeProposalWrapper(
+        entityUrn=entity_urn,
+        aspect=aspect,
+    ).as_workunit()
+
+
 def gen_containers(
     container_key: KeyType,
     name: str,
     sub_types: List[str],
     parent_container_key: Optional[ContainerKey] = None,
     extra_properties: Optional[Dict[str, str]] = None,
+    structured_properties: Optional[Dict[StructuredPropertyUrn, str]] = None,
     domain_urn: Optional[str] = None,
     description: Optional[str] = None,
     owner_urn: Optional[str] = None,
@@ -282,6 +304,11 @@ def gen_containers(
             tags=sorted(tags),
         )
 
+    if structured_properties:
+        yield from add_structured_properties_to_entity_wu(
+            entity_urn=container_urn, structured_properties=structured_properties
+        )
+
 
 def add_dataset_to_container(
     container_key: KeyType, dataset_urn: str
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
index 2d61ce59857778..b14e51a982082c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
@@ -244,6 +244,11 @@ class SnowflakeV2Config(
         description="""Optional. Allowed values are `without_lineage`, `with_lineage`, and `skip` (default). `without_lineage` only extracts tags that have been applied directly to the given entity. `with_lineage` extracts both directly applied and propagated tags, but will be significantly slower. See the [Snowflake documentation](https://docs.snowflake.com/en/user-guide/object-tagging.html#tag-lineage) for information about tag lineage/propagation. """,
     )
 
+    extract_tags_as_structured_properties: bool = Field(
+        default=False,
+        description="If enabled along with `extract_tags`, extracts snowflake's key-value tags as DataHub structured properties instead of DataHub tags.",
+    )
+
     include_external_url: bool = Field(
         default=True,
         description="Whether to populate Snowsight url for Snowflake Objects",
@@ -263,6 +268,14 @@ class SnowflakeV2Config(
         description="List of regex patterns for tags to include in ingestion. Only used if `extract_tags` is enabled.",
     )
 
+    structured_property_pattern: AllowDenyPattern = Field(
+        default=AllowDenyPattern.allow_all(),
+        description=(
+            "List of regex patterns for structured properties to include in ingestion."
+            " Only used if `extract_tags` and `extract_tags_as_structured_properties` are enabled."
+        ),
+    )
+
     # This is required since access_history table does not capture whether the table was temporary table.
     temporary_tables_pattern: List[str] = Field(
         default=DEFAULT_TEMP_TABLES_PATTERNS,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py
index 780effc82b0163..d165be3f3cc656 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py
@@ -45,15 +45,18 @@ class SnowflakeTag:
     name: str
     value: str
 
-    def display_name(self) -> str:
+    def tag_display_name(self) -> str:
         return f"{self.name}: {self.value}"
 
-    def identifier(self) -> str:
+    def tag_identifier(self) -> str:
         return f"{self._id_prefix_as_str()}:{self.value}"
 
     def _id_prefix_as_str(self) -> str:
         return f"{self.database}.{self.schema}.{self.name}"
 
+    def structured_property_identifier(self) -> str:
+        return f"snowflake.{self.database}.{self.schema}.{self.name}"
+
 
 @dataclass
 class SnowflakeColumn(BaseColumn):
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
index 6f09c26b08da2d..393e4d3c96d51f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
@@ -4,12 +4,14 @@
 
 from datahub.configuration.pattern_utils import is_schema_allowed
 from datahub.emitter.mce_builder import (
+    get_sys_time,
     make_data_platform_urn,
     make_dataset_urn_with_platform_instance,
     make_schema_field_urn,
     make_tag_urn,
 )
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.emitter.mcp_builder import add_structured_properties_to_entity_wu
 from datahub.ingestion.api.source import SourceReport
 from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.ingestion.glossary.classification_mixin import (
@@ -72,6 +74,7 @@
     PROFILING,
 )
 from datahub.metadata.com.linkedin.pegasus2avro.common import (
+    AuditStamp,
     GlobalTags,
     Status,
     SubTypes,
@@ -98,7 +101,18 @@
     StringType,
     TimeType,
 )
+from datahub.metadata.com.linkedin.pegasus2avro.structured import (
+    StructuredPropertyDefinition,
+)
 from datahub.metadata.com.linkedin.pegasus2avro.tag import TagProperties
+from datahub.metadata.urns import (
+    ContainerUrn,
+    DatasetUrn,
+    DataTypeUrn,
+    EntityTypeUrn,
+    SchemaFieldUrn,
+    StructuredPropertyUrn,
+)
 from datahub.sql_parsing.sql_parsing_aggregator import (
     KnownLineageMapping,
     SqlParsingAggregator,
@@ -673,14 +687,31 @@ def _process_view(
             yield from self.gen_dataset_workunits(view, schema_name, db_name)
 
     def _process_tag(self, tag: SnowflakeTag) -> Iterable[MetadataWorkUnit]:
-        tag_identifier = tag.identifier()
+        use_sp = self.config.extract_tags_as_structured_properties
+        identifier = (
+            self.snowflake_identifier(tag.structured_property_identifier())
+            if use_sp
+            else tag.tag_identifier()
+        )
 
-        if self.report.is_tag_processed(tag_identifier):
+        if self.report.is_tag_processed(identifier):
             return
 
-        self.report.report_tag_processed(tag_identifier)
-
-        yield from self.gen_tag_workunits(tag)
+        self.report.report_tag_processed(identifier)
+        if use_sp:
+            yield from self.gen_tag_as_structured_property_workunits(tag)
+        else:
+            yield from self.gen_tag_workunits(tag)
+
+    def _format_tags_as_structured_properties(
+        self, tags: List[SnowflakeTag]
+    ) -> Dict[StructuredPropertyUrn, str]:
+        return {
+            StructuredPropertyUrn(
+                self.snowflake_identifier(tag.structured_property_identifier())
+            ): tag.value
+            for tag in tags
+        }
 
     def gen_dataset_workunits(
         self,
@@ -725,6 +756,9 @@ def gen_dataset_workunits(
             env=self.config.env,
         )
 
+        if self.config.extract_tags_as_structured_properties:
+            yield from self.gen_column_tags_as_structured_properties(dataset_urn, table)
+
         yield from add_table_to_schema_container(
             dataset_urn=dataset_urn,
             parent_container_key=schema_container_key,
@@ -758,16 +792,24 @@ def gen_dataset_workunits(
             )
 
         if table.tags:
-            tag_associations = [
-                TagAssociation(
-                    tag=make_tag_urn(self.snowflake_identifier(tag.identifier()))
+            if self.config.extract_tags_as_structured_properties:
+                yield from add_structured_properties_to_entity_wu(
+                    dataset_urn,
+                    self._format_tags_as_structured_properties(table.tags),
                 )
-                for tag in table.tags
-            ]
-            global_tags = GlobalTags(tag_associations)
-            yield MetadataChangeProposalWrapper(
-                entityUrn=dataset_urn, aspect=global_tags
-            ).as_workunit()
+            else:
+                tag_associations = [
+                    TagAssociation(
+                        tag=make_tag_urn(
+                            self.snowflake_identifier(tag.tag_identifier())
+                        )
+                    )
+                    for tag in table.tags
+                ]
+                global_tags = GlobalTags(tag_associations)
+                yield MetadataChangeProposalWrapper(
+                    entityUrn=dataset_urn, aspect=global_tags
+                ).as_workunit()
 
         if isinstance(table, SnowflakeView) and table.view_definition is not None:
             view_properties_aspect = ViewProperties(
@@ -840,10 +882,10 @@ def get_dataset_properties(
         )
 
     def gen_tag_workunits(self, tag: SnowflakeTag) -> Iterable[MetadataWorkUnit]:
-        tag_urn = make_tag_urn(self.snowflake_identifier(tag.identifier()))
+        tag_urn = make_tag_urn(self.snowflake_identifier(tag.tag_identifier()))
 
         tag_properties_aspect = TagProperties(
-            name=tag.display_name(),
+            name=tag.tag_display_name(),
             description=f"Represents the Snowflake tag `{tag._id_prefix_as_str()}` with value `{tag.value}`.",
         )
 
@@ -851,6 +893,41 @@ def gen_tag_workunits(self, tag: SnowflakeTag) -> Iterable[MetadataWorkUnit]:
             entityUrn=tag_urn, aspect=tag_properties_aspect
         ).as_workunit()
 
+    def gen_tag_as_structured_property_workunits(
+        self, tag: SnowflakeTag
+    ) -> Iterable[MetadataWorkUnit]:
+        identifier = self.snowflake_identifier(tag.structured_property_identifier())
+        urn = StructuredPropertyUrn(identifier).urn()
+        aspect = StructuredPropertyDefinition(
+            qualifiedName=identifier,
+            displayName=tag.name,
+            valueType=DataTypeUrn("datahub.string").urn(),
+            entityTypes=[
+                EntityTypeUrn(f"datahub.{ContainerUrn.ENTITY_TYPE}").urn(),
+                EntityTypeUrn(f"datahub.{DatasetUrn.ENTITY_TYPE}").urn(),
+                EntityTypeUrn(f"datahub.{SchemaFieldUrn.ENTITY_TYPE}").urn(),
+            ],
+            lastModified=AuditStamp(
+                time=get_sys_time(), actor="urn:li:corpuser:datahub"
+            ),
+        )
+        yield MetadataChangeProposalWrapper(
+            entityUrn=urn,
+            aspect=aspect,
+        ).as_workunit()
+
+    def gen_column_tags_as_structured_properties(
+        self, dataset_urn: str, table: Union[SnowflakeTable, SnowflakeView]
+    ) -> Iterable[MetadataWorkUnit]:
+        for column_name in table.column_tags:
+            schema_field_urn = SchemaFieldUrn(dataset_urn, column_name).urn()
+            yield from add_structured_properties_to_entity_wu(
+                schema_field_urn,
+                self._format_tags_as_structured_properties(
+                    table.column_tags[column_name]
+                ),
+            )
+
     def gen_schema_metadata(
         self,
         table: Union[SnowflakeTable, SnowflakeView],
@@ -892,13 +969,14 @@ def gen_schema_metadata(
                             [
                                 TagAssociation(
                                     make_tag_urn(
-                                        self.snowflake_identifier(tag.identifier())
+                                        self.snowflake_identifier(tag.tag_identifier())
                                     )
                                 )
                                 for tag in table.column_tags[col.name]
                             ]
                         )
                         if col.name in table.column_tags
+                        and not self.config.extract_tags_as_structured_properties
                         else None
                     ),
                 )
@@ -985,8 +1063,17 @@ def gen_database_containers(
                 )
             ),
             tags=(
-                [self.snowflake_identifier(tag.identifier()) for tag in database.tags]
+                [
+                    self.snowflake_identifier(tag.tag_identifier())
+                    for tag in database.tags
+                ]
                 if database.tags
+                and not self.config.extract_tags_as_structured_properties
+                else None
+            ),
+            structured_properties=(
+                self._format_tags_as_structured_properties(database.tags)
+                if database.tags and self.config.extract_tags_as_structured_properties
                 else None
             ),
         )
@@ -1038,8 +1125,13 @@ def gen_schema_containers(
                 else None
             ),
             tags=(
-                [self.snowflake_identifier(tag.identifier()) for tag in schema.tags]
-                if schema.tags
+                [self.snowflake_identifier(tag.tag_identifier()) for tag in schema.tags]
+                if schema.tags and not self.config.extract_tags_as_structured_properties
+                else None
+            ),
+            structured_properties=(
+                self._format_tags_as_structured_properties(schema.tags)
+                if schema.tags and self.config.extract_tags_as_structured_properties
                 else None
             ),
         )
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_tag.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_tag.py
index be449e963d270b..75567cc3da8830 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_tag.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_tag.py
@@ -165,10 +165,20 @@ def _filter_tags(
 
         allowed_tags = []
         for tag in tags:
-            tag_identifier = tag.identifier()
-            self.report.report_entity_scanned(tag_identifier, "tag")
-            if not self.config.tag_pattern.allowed(tag_identifier):
-                self.report.report_dropped(tag_identifier)
+            identifier = (
+                tag._id_prefix_as_str()
+                if self.config.extract_tags_as_structured_properties
+                else tag.tag_identifier()
+            )
+            self.report.report_entity_scanned(identifier, "tag")
+
+            pattern = (
+                self.config.structured_property_pattern
+                if self.config.extract_tags_as_structured_properties
+                else self.config.tag_pattern
+            )
+            if not pattern.allowed(identifier):
+                self.report.report_dropped(identifier)
             else:
                 allowed_tags.append(tag)
         return allowed_tags
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/sql_utils.py b/metadata-ingestion/src/datahub/ingestion/source/sql/sql_utils.py
index f45147223b8881..1545de0fff796f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/sql_utils.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/sql_utils.py
@@ -20,6 +20,7 @@
 from datahub.metadata.com.linkedin.pegasus2avro.dataset import UpstreamLineage
 from datahub.metadata.com.linkedin.pegasus2avro.schema import SchemaField
 from datahub.metadata.schema_classes import DataPlatformInstanceClass
+from datahub.metadata.urns import StructuredPropertyUrn
 from datahub.utilities.registries.domain_registry import DomainRegistry
 from datahub.utilities.urns.dataset_urn import DatasetUrn
 
@@ -75,6 +76,7 @@ def gen_schema_container(
     created: Optional[int] = None,
     last_modified: Optional[int] = None,
     extra_properties: Optional[Dict[str, str]] = None,
+    structured_properties: Optional[Dict[StructuredPropertyUrn, str]] = None,
 ) -> Iterable[MetadataWorkUnit]:
     domain_urn: Optional[str] = None
     if domain_registry:
@@ -99,6 +101,7 @@ def gen_schema_container(
         owner_urn=owner_urn,
         qualified_name=qualified_name,
         extra_properties=extra_properties,
+        structured_properties=structured_properties,
     )
 
 
@@ -133,6 +136,7 @@ def gen_database_container(
     created: Optional[int] = None,
     last_modified: Optional[int] = None,
     extra_properties: Optional[Dict[str, str]] = None,
+    structured_properties: Optional[Dict[StructuredPropertyUrn, str]] = None,
 ) -> Iterable[MetadataWorkUnit]:
     domain_urn: Optional[str] = None
     if domain_registry:
@@ -154,6 +158,7 @@ def gen_database_container(
         owner_urn=owner_urn,
         qualified_name=qualified_name,
         extra_properties=extra_properties,
+        structured_properties=structured_properties,
     )
 
 
diff --git a/metadata-ingestion/tests/integration/snowflake/snowflake_structured_properties_golden.json b/metadata-ingestion/tests/integration/snowflake/snowflake_structured_properties_golden.json
new file mode 100644
index 00000000000000..3adedd59070396
--- /dev/null
+++ b/metadata-ingestion/tests/integration/snowflake/snowflake_structured_properties_golden.json
@@ -0,0 +1,4418 @@
+[
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "snowflake",
+                "env": "PROD",
+                "database": "test_db"
+            },
+            "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/",
+            "name": "TEST_DB",
+            "description": "Comment for TEST_DB",
+            "env": "PROD",
+            "created": {
+                "time": 1623135600000
+            },
+            "lastModified": {
+                "time": 1623135600000
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Database"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+    "changeType": "UPSERT",
+    "aspectName": "structuredProperties",
+    "aspect": {
+        "json": {
+            "properties": [
+                {
+                    "propertyUrn": "urn:li:structuredProperty:snowflake.other_db.other_schema.my_other_tag",
+                    "values": [
+                        {
+                            "string": "other"
+                        }
+                    ]
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "structuredProperty",
+    "entityUrn": "urn:li:structuredProperty:snowflake.other_db.other_schema.my_other_tag",
+    "changeType": "UPSERT",
+    "aspectName": "propertyDefinition",
+    "aspect": {
+        "json": {
+            "qualifiedName": "snowflake.other_db.other_schema.my_other_tag",
+            "displayName": "my_other_tag",
+            "valueType": "urn:li:dataType:datahub.string",
+            "cardinality": "SINGLE",
+            "entityTypes": [
+                "urn:li:entityType:datahub.container",
+                "urn:li:entityType:datahub.dataset",
+                "urn:li:entityType:datahub.schemaField"
+            ],
+            "immutable": false,
+            "lastModified": {
+                "time": 1615443388097,
+                "actor": "urn:li:corpuser:datahub"
+            },
+            "filterStatus": "DISABLED"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "snowflake",
+                "env": "PROD",
+                "database": "test_db",
+                "schema": "test_schema"
+            },
+            "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/",
+            "name": "TEST_SCHEMA",
+            "description": "comment for TEST_DB.TEST_SCHEMA",
+            "env": "PROD",
+            "created": {
+                "time": 1623135600000
+            },
+            "lastModified": {
+                "time": 1623135600000
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Schema"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+    "changeType": "UPSERT",
+    "aspectName": "structuredProperties",
+    "aspect": {
+        "json": {
+            "properties": [
+                {
+                    "propertyUrn": "urn:li:structuredProperty:snowflake.other_db.other_schema.my_other_tag",
+                    "values": [
+                        {
+                            "string": "other"
+                        }
+                    ]
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+                    "urn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "test_db.test_schema.table_1",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "col_1",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_2",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_3",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_4",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_5",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_6",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_7",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_8",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_9",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_10",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "CLUSTERING_KEY": "LINEAR(COL_1)"
+            },
+            "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_1/",
+            "name": "TABLE_1",
+            "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_1",
+            "description": "Comment for Table",
+            "created": {
+                "time": 1623135600000
+            },
+            "lastModified": {
+                "time": 1623135600000
+            },
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+                    "urn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
+                },
+                {
+                    "id": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+                    "urn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "test_db.test_schema.table_2",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "col_1",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_2",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_3",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_4",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_5",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_6",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_7",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_8",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_9",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_10",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "CLUSTERING_KEY": "LINEAR(COL_1)"
+            },
+            "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_2/",
+            "name": "TABLE_2",
+            "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_2",
+            "description": "Comment for Table",
+            "created": {
+                "time": 1623135600000
+            },
+            "lastModified": {
+                "time": 1623135600000
+            },
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+                    "urn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
+                },
+                {
+                    "id": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+                    "urn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "test_db.test_schema.table_3",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "col_1",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_2",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_3",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_4",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_5",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_6",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_7",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_8",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_9",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_10",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "CLUSTERING_KEY": "LINEAR(COL_1)"
+            },
+            "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_3/",
+            "name": "TABLE_3",
+            "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_3",
+            "description": "Comment for Table",
+            "created": {
+                "time": 1623135600000
+            },
+            "lastModified": {
+                "time": 1623135600000
+            },
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+                    "urn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
+                },
+                {
+                    "id": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+                    "urn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "test_db.test_schema.table_4",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "col_1",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_2",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_3",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_4",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_5",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_6",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_7",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_8",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_9",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_10",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "CLUSTERING_KEY": "LINEAR(COL_1)"
+            },
+            "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_4/",
+            "name": "TABLE_4",
+            "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_4",
+            "description": "Comment for Table",
+            "created": {
+                "time": 1623135600000
+            },
+            "lastModified": {
+                "time": 1623135600000
+            },
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+                    "urn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
+                },
+                {
+                    "id": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+                    "urn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "test_db.test_schema.table_5",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "col_1",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_2",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_3",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_4",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_5",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_6",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_7",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_8",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_9",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_10",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "CLUSTERING_KEY": "LINEAR(COL_1)"
+            },
+            "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_5/",
+            "name": "TABLE_5",
+            "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_5",
+            "description": "Comment for Table",
+            "created": {
+                "time": 1623135600000
+            },
+            "lastModified": {
+                "time": 1623135600000
+            },
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+                    "urn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
+                },
+                {
+                    "id": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+                    "urn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "test_db.test_schema.table_6",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "col_1",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_2",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_3",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_4",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_5",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_6",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_7",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_8",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_9",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_10",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "CLUSTERING_KEY": "LINEAR(COL_1)"
+            },
+            "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_6/",
+            "name": "TABLE_6",
+            "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_6",
+            "description": "Comment for Table",
+            "created": {
+                "time": 1623135600000
+            },
+            "lastModified": {
+                "time": 1623135600000
+            },
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+                    "urn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
+                },
+                {
+                    "id": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+                    "urn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "test_db.test_schema.table_7",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "col_1",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_2",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_3",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_4",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_5",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_6",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_7",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_8",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_9",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_10",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "CLUSTERING_KEY": "LINEAR(COL_1)"
+            },
+            "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_7/",
+            "name": "TABLE_7",
+            "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_7",
+            "description": "Comment for Table",
+            "created": {
+                "time": 1623135600000
+            },
+            "lastModified": {
+                "time": 1623135600000
+            },
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+                    "urn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
+                },
+                {
+                    "id": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+                    "urn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "test_db.test_schema.table_8",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "col_1",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_2",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_3",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_4",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_5",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_6",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_7",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_8",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_9",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_10",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "CLUSTERING_KEY": "LINEAR(COL_1)"
+            },
+            "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_8/",
+            "name": "TABLE_8",
+            "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_8",
+            "description": "Comment for Table",
+            "created": {
+                "time": 1623135600000
+            },
+            "lastModified": {
+                "time": 1623135600000
+            },
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+                    "urn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
+                },
+                {
+                    "id": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+                    "urn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "test_db.test_schema.table_9",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "col_1",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_2",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_3",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_4",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_5",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_6",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_7",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_8",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_9",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_10",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "CLUSTERING_KEY": "LINEAR(COL_1)"
+            },
+            "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_9/",
+            "name": "TABLE_9",
+            "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_9",
+            "description": "Comment for Table",
+            "created": {
+                "time": 1623135600000
+            },
+            "lastModified": {
+                "time": 1623135600000
+            },
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+                    "urn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
+                },
+                {
+                    "id": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+                    "urn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "test_db.test_schema.table_10",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "col_1",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_2",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_3",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_4",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_5",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_6",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_7",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_8",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_9",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_10",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "CLUSTERING_KEY": "LINEAR(COL_1)"
+            },
+            "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/table/TABLE_10/",
+            "name": "TABLE_10",
+            "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_10",
+            "description": "Comment for Table",
+            "created": {
+                "time": 1623135600000
+            },
+            "lastModified": {
+                "time": 1623135600000
+            },
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+                    "urn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
+                },
+                {
+                    "id": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+                    "urn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "structuredProperty",
+    "entityUrn": "urn:li:structuredProperty:snowflake.test_db.test_schema.security",
+    "changeType": "UPSERT",
+    "aspectName": "propertyDefinition",
+    "aspect": {
+        "json": {
+            "qualifiedName": "snowflake.test_db.test_schema.security",
+            "displayName": "security",
+            "valueType": "urn:li:dataType:datahub.string",
+            "cardinality": "SINGLE",
+            "entityTypes": [
+                "urn:li:entityType:datahub.container",
+                "urn:li:entityType:datahub.dataset",
+                "urn:li:entityType:datahub.schemaField"
+            ],
+            "immutable": false,
+            "lastModified": {
+                "time": 1615443388097,
+                "actor": "urn:li:corpuser:datahub"
+            },
+            "filterStatus": "DISABLED"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "test_db.test_schema.view_1",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "col_1",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_2",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_3",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_4",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_5",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_6",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_7",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_8",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_9",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_10",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "IS_SECURE": "true"
+            },
+            "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/view/VIEW_1/",
+            "name": "VIEW_1",
+            "qualifiedName": "TEST_DB.TEST_SCHEMA.VIEW_1",
+            "description": "Comment for View",
+            "created": {
+                "time": 1623135600000
+            },
+            "lastModified": {
+                "time": 1623135600000
+            },
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "schemaField",
+    "entityUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),COL_1)",
+    "changeType": "UPSERT",
+    "aspectName": "structuredProperties",
+    "aspect": {
+        "json": {
+            "properties": [
+                {
+                    "propertyUrn": "urn:li:structuredProperty:snowflake.test_db.test_schema.security",
+                    "values": [
+                        {
+                            "string": "pii"
+                        }
+                    ]
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "create view view_1 as select * from table_1",
+            "viewLanguage": "SQL"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+                    "urn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
+                },
+                {
+                    "id": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+                    "urn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "structuredProperty",
+    "entityUrn": "urn:li:structuredProperty:snowflake.test_db.test_schema.my_tag_0",
+    "changeType": "UPSERT",
+    "aspectName": "propertyDefinition",
+    "aspect": {
+        "json": {
+            "qualifiedName": "snowflake.test_db.test_schema.my_tag_0",
+            "displayName": "my_tag_0",
+            "valueType": "urn:li:dataType:datahub.string",
+            "cardinality": "SINGLE",
+            "entityTypes": [
+                "urn:li:entityType:datahub.container",
+                "urn:li:entityType:datahub.dataset",
+                "urn:li:entityType:datahub.schemaField"
+            ],
+            "immutable": false,
+            "lastModified": {
+                "time": 1615443388097,
+                "actor": "urn:li:corpuser:datahub"
+            },
+            "filterStatus": "DISABLED"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "structuredProperty",
+    "entityUrn": "urn:li:structuredProperty:snowflake.test_db.test_schema.my_tag_1",
+    "changeType": "UPSERT",
+    "aspectName": "propertyDefinition",
+    "aspect": {
+        "json": {
+            "qualifiedName": "snowflake.test_db.test_schema.my_tag_1",
+            "displayName": "my_tag_1",
+            "valueType": "urn:li:dataType:datahub.string",
+            "cardinality": "SINGLE",
+            "entityTypes": [
+                "urn:li:entityType:datahub.container",
+                "urn:li:entityType:datahub.dataset",
+                "urn:li:entityType:datahub.schemaField"
+            ],
+            "immutable": false,
+            "lastModified": {
+                "time": 1615443388097,
+                "actor": "urn:li:corpuser:datahub"
+            },
+            "filterStatus": "DISABLED"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "structuredProperty",
+    "entityUrn": "urn:li:structuredProperty:snowflake.test_db.test_schema.my_tag_2",
+    "changeType": "UPSERT",
+    "aspectName": "propertyDefinition",
+    "aspect": {
+        "json": {
+            "qualifiedName": "snowflake.test_db.test_schema.my_tag_2",
+            "displayName": "my_tag_2",
+            "valueType": "urn:li:dataType:datahub.string",
+            "cardinality": "SINGLE",
+            "entityTypes": [
+                "urn:li:entityType:datahub.container",
+                "urn:li:entityType:datahub.dataset",
+                "urn:li:entityType:datahub.schemaField"
+            ],
+            "immutable": false,
+            "lastModified": {
+                "time": 1615443388097,
+                "actor": "urn:li:corpuser:datahub"
+            },
+            "filterStatus": "DISABLED"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "test_db.test_schema.view_2",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "col_1",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_2",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_3",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_4",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_5",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_6",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_7",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_8",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_9",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_10",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/view/VIEW_2/",
+            "name": "VIEW_2",
+            "qualifiedName": "TEST_DB.TEST_SCHEMA.VIEW_2",
+            "description": "Comment for View",
+            "created": {
+                "time": 1623135600000
+            },
+            "lastModified": {
+                "time": 1623135600000
+            },
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "structuredProperties",
+    "aspect": {
+        "json": {
+            "properties": [
+                {
+                    "propertyUrn": "urn:li:structuredProperty:snowflake.test_db.test_schema.my_tag_0",
+                    "values": [
+                        {
+                            "string": "my_value_0"
+                        }
+                    ]
+                },
+                {
+                    "propertyUrn": "urn:li:structuredProperty:snowflake.test_db.test_schema.my_tag_1",
+                    "values": [
+                        {
+                            "string": "my_value_1"
+                        }
+                    ]
+                },
+                {
+                    "propertyUrn": "urn:li:structuredProperty:snowflake.test_db.test_schema.my_tag_2",
+                    "values": [
+                        {
+                            "string": "my_value_2"
+                        }
+                    ]
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "create view view_2 as select * from table_2",
+            "viewLanguage": "SQL"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+                    "urn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
+                },
+                {
+                    "id": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+                    "urn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1615443388097,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+                    "type": "VIEW",
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                }
+            ],
+            "fineGrainedLineages": [
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_1)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_1)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_2)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_2)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_3)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_3)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_4)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_4)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_5)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_5)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_6)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_6)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_7)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_7)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_8)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_8)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_9)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_9)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_10)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_10)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "create view view_1 as select * from table_1",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:_ingestion"
+            },
+            "lastModified": {
+                "time": 1736285939366,
+                "actor": "urn:li:corpuser:_ingestion"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_1)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_10)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_2)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_3)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_4)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_5)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_6)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_7)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_8)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_9)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_1)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_2)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_3)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_4)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_5)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_6)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_7)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_8)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_9)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_10)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "upstreamLineage",
+    "aspect": {
+        "json": {
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1615443388097,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
+                    "type": "VIEW",
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                }
+            ],
+            "fineGrainedLineages": [
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_1)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_1)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_2)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_2)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_3)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_3)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_4)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_4)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_5)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_5)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_6)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_6)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_7)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_7)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_8)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_8)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_9)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_9)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_10)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_10)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "create view view_2 as select * from table_2",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:_ingestion"
+            },
+            "lastModified": {
+                "time": 1736285939376,
+                "actor": "urn:li:corpuser:_ingestion"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_1)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_10)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_2)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_3)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_4)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_5)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_6)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_7)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_8)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_9)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_1)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_2)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_3)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_4)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_5)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_6)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_7)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_8)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_9)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_10)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "schemaField",
+    "entityUrn": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),COL_1)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "structuredProperty",
+    "entityUrn": "urn:li:structuredProperty:snowflake.other_db.other_schema.my_other_tag",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "structuredProperty",
+    "entityUrn": "urn:li:structuredProperty:snowflake.test_db.test_schema.my_tag_0",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "structuredProperty",
+    "entityUrn": "urn:li:structuredProperty:snowflake.test_db.test_schema.my_tag_1",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "structuredProperty",
+    "entityUrn": "urn:li:structuredProperty:snowflake.test_db.test_schema.my_tag_2",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "structuredProperty",
+    "entityUrn": "urn:li:structuredProperty:snowflake.test_db.test_schema.security",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_07-13_38_56-3fo398",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/snowflake/test_snowflake.py b/metadata-ingestion/tests/integration/snowflake/test_snowflake.py
index ef4918a20e640c..d2e20e784282ee 100644
--- a/metadata-ingestion/tests/integration/snowflake/test_snowflake.py
+++ b/metadata-ingestion/tests/integration/snowflake/test_snowflake.py
@@ -185,6 +185,68 @@ def test_snowflake_basic(pytestconfig, tmp_path, mock_time, mock_datahub_graph):
         assert cache_info["get_fk_constraints_for_schema"]["misses"] == 1
 
 
+def test_snowflake_tags_as_structured_properties(
+    pytestconfig, tmp_path, mock_time, mock_datahub_graph
+):
+    test_resources_dir = pytestconfig.rootpath / "tests/integration/snowflake"
+
+    # Run the metadata ingestion pipeline.
+    output_file = tmp_path / "snowflake_structured_properties_test_events.json"
+    golden_file = test_resources_dir / "snowflake_structured_properties_golden.json"
+
+    with mock.patch("snowflake.connector.connect") as mock_connect:
+        sf_connection = mock.MagicMock()
+        sf_cursor = mock.MagicMock()
+        mock_connect.return_value = sf_connection
+        sf_connection.cursor.return_value = sf_cursor
+
+        sf_cursor.execute.side_effect = default_query_results
+
+        pipeline = Pipeline(
+            config=PipelineConfig(
+                source=SourceConfig(
+                    type="snowflake",
+                    config=SnowflakeV2Config(
+                        extract_tags_as_structured_properties=True,
+                        extract_tags=TagOption.without_lineage,
+                        account_id="ABC12345.ap-south-1.aws",
+                        username="TST_USR",
+                        password="TST_PWD",
+                        match_fully_qualified_names=True,
+                        schema_pattern=AllowDenyPattern(allow=["test_db.test_schema"]),
+                        include_technical_schema=True,
+                        include_table_lineage=False,
+                        include_column_lineage=False,
+                        include_usage_stats=False,
+                        include_operational_stats=False,
+                    ),
+                ),
+                sink=DynamicTypedConfig(
+                    type="file", config={"filename": str(output_file)}
+                ),
+            )
+        )
+        pipeline.run()
+        pipeline.pretty_print_summary()
+        pipeline.raise_from_status()
+        assert not pipeline.source.get_report().warnings
+
+        # Verify the output.
+
+        mce_helpers.check_golden_file(
+            pytestconfig,
+            output_path=output_file,
+            golden_path=golden_file,
+            ignore_paths=[
+                r"root\[\d+\]\['aspect'\]\['json'\]\['timestampMillis'\]",
+                r"root\[\d+\]\['aspect'\]\['json'\]\['created'\]",
+                r"root\[\d+\]\['aspect'\]\['json'\]\['lastModified'\]",
+                r"root\[\d+\]\['aspect'\]\['json'\]\['fields'\]\[\d+\]\['glossaryTerms'\]\['auditStamp'\]\['time'\]",
+                r"root\[\d+\]\['systemMetadata'\]",
+            ],
+        )
+
+
 @freeze_time(FROZEN_TIME)
 def test_snowflake_private_link_and_incremental_mcps(
     pytestconfig, tmp_path, mock_time, mock_datahub_graph
diff --git a/metadata-ingestion/tests/integration/snowflake/test_snowflake_tag.py b/metadata-ingestion/tests/integration/snowflake/test_snowflake_tag.py
index 9bb598cb0c1c7f..d4f6e92c93c1e0 100644
--- a/metadata-ingestion/tests/integration/snowflake/test_snowflake_tag.py
+++ b/metadata-ingestion/tests/integration/snowflake/test_snowflake_tag.py
@@ -98,3 +98,51 @@ def test_snowflake_tag_pattern_deny():
             "TEST_DB.TEST_SCHEMA.my_tag_1:my_value_1",
             "TEST_DB.TEST_SCHEMA.security:pii",
         }
+
+
+def test_snowflake_structured_property_pattern_deny():
+    with mock.patch("snowflake.connector.connect") as mock_connect:
+        sf_connection = mock.MagicMock()
+        sf_cursor = mock.MagicMock()
+        mock_connect.return_value = sf_connection
+        sf_connection.cursor.return_value = sf_cursor
+        sf_cursor.execute.side_effect = default_query_results
+
+        tag_config = SnowflakeV2Config(
+            account_id="ABC12345.ap-south-1.aws",
+            username="TST_USR",
+            password="TST_PWD",
+            match_fully_qualified_names=True,
+            schema_pattern=AllowDenyPattern(allow=["test_db.test_schema"]),
+            extract_tags_as_structured_properties=True,
+            tag_pattern=AllowDenyPattern(
+                deny=["TEST_DB.TEST_SCHEMA.my_tag_2:my_value_2"]
+            ),
+            structured_property_pattern=AllowDenyPattern(
+                deny=["TEST_DB.TEST_SCHEMA.my_tag_[0-9]"]
+            ),
+            include_technical_schema=True,
+            include_table_lineage=False,
+            include_column_lineage=False,
+            include_usage_stats=False,
+            include_operational_stats=False,
+            extract_tags=TagOption.without_lineage,
+        )
+
+        pipeline = Pipeline(
+            config=PipelineConfig(
+                source=SourceConfig(type="snowflake", config=tag_config),
+                sink=DynamicTypedConfig(type="blackhole", config={}),
+            )
+        )
+        pipeline.run()
+        pipeline.pretty_print_summary()
+        pipeline.raise_from_status()
+
+        source_report = pipeline.source.get_report()
+        assert isinstance(source_report, SnowflakeV2Report)
+        assert source_report.tags_scanned == 5
+        assert source_report._processed_tags == {
+            "snowflake.other_db.other_schema.my_other_tag",
+            "snowflake.test_db.test_schema.security",
+        }

From 4633fbfeca963aa7f2fdb49c879446170882c865 Mon Sep 17 00:00:00 2001
From: ryota-cloud <ryota.egashira@acryl.io>
Date: Tue, 14 Jan 2025 11:09:08 -0800
Subject: [PATCH 074/249] fix(ingestion) fix snappy inconsistent version in
 ingestion (#12321)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 284092e2b14f49..e4fd70a99e6434 100644
--- a/build.gradle
+++ b/build.gradle
@@ -195,7 +195,7 @@ project.ext.externalDependency = [
     'kafkaAvroSerde': "io.confluent:kafka-streams-avro-serde:$kafkaVersion",
     'kafkaAvroSerializer': 'io.confluent:kafka-avro-serializer:5.1.4',
     'kafkaClients': "org.apache.kafka:kafka-clients:$kafkaVersion-ccs",
-    'snappy': 'org.xerial.snappy:snappy-java:1.1.10.4',
+    'snappy': 'org.xerial.snappy:snappy-java:1.1.10.5',
     'logbackClassic': "ch.qos.logback:logback-classic:$logbackClassic",
     'logbackClassicJava8' : "ch.qos.logback:logback-classic:$logbackClassicJava8",
     'slf4jApi': "org.slf4j:slf4j-api:$slf4jVersion",

From e1d57e3f213bef8ba863426c0fbd2de098f6c6f6 Mon Sep 17 00:00:00 2001
From: kevinkarchacryl <kevin.karch@acryl.io>
Date: Tue, 14 Jan 2025 15:53:51 -0500
Subject: [PATCH 075/249] Super type dbt redshift (#12337)

---
 .../ingestion/source/redshift/redshift.py     |  1 +
 .../datahub/ingestion/source/sql/sql_types.py |  2 +-
 .../tests/unit/test_dbt_source.py             | 34 ++++++++++++++++++-
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift.py b/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift.py
index 5371017a2a3212..9bfca941ce48fb 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift.py
@@ -276,6 +276,7 @@ class RedshiftSource(StatefulIngestionSourceBase, TestableSource):
         "HLLSKETCH": NullType,
         "TIMETZ": TimeType,
         "VARBYTE": StringType,
+        "SUPER": NullType,
     }
 
     def get_platform_instance_id(self) -> str:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/sql_types.py b/metadata-ingestion/src/datahub/ingestion/source/sql/sql_types.py
index 9ec73a9af96dc5..1acf962d7c4750 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/sql_types.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/sql_types.py
@@ -93,7 +93,7 @@
     "regtype": None,
     "regrole": None,
     "regnamespace": None,
-    "super": None,
+    "super": NullType,
     "uuid": StringType,
     "pg_lsn": None,
     "tsvector": None,  # text search vector
diff --git a/metadata-ingestion/tests/unit/test_dbt_source.py b/metadata-ingestion/tests/unit/test_dbt_source.py
index 0a869297837014..ff22ffedc6228f 100644
--- a/metadata-ingestion/tests/unit/test_dbt_source.py
+++ b/metadata-ingestion/tests/unit/test_dbt_source.py
@@ -9,7 +9,12 @@
 from datahub.ingestion.api.common import PipelineContext
 from datahub.ingestion.source.dbt import dbt_cloud
 from datahub.ingestion.source.dbt.dbt_cloud import DBTCloudConfig
-from datahub.ingestion.source.dbt.dbt_common import DBTNode
+from datahub.ingestion.source.dbt.dbt_common import (
+    DBTNode,
+    DBTSourceReport,
+    NullTypeClass,
+    get_column_type,
+)
 from datahub.ingestion.source.dbt.dbt_core import (
     DBTCoreConfig,
     DBTCoreSource,
@@ -461,3 +466,30 @@ def test_dbt_time_parsing() -> None:
         assert timestamp.tzinfo is not None and timestamp.tzinfo.utcoffset(
             timestamp
         ) == timedelta(0)
+
+
+def test_get_column_type_redshift():
+    report = DBTSourceReport()
+    dataset_name = "test_dataset"
+
+    # Test 'super' type which should not show any warnings/errors
+    result_super = get_column_type(report, dataset_name, "super", "redshift")
+    assert isinstance(result_super.type, NullTypeClass)
+    assert (
+        len(report.infos) == 0
+    ), "No warnings should be generated for known SUPER type"
+
+    # Test unknown type, which generates a warning but resolves to NullTypeClass
+    unknown_type = "unknown_type"
+    result_unknown = get_column_type(report, dataset_name, unknown_type, "redshift")
+    assert isinstance(result_unknown.type, NullTypeClass)
+
+    # exact warning message for an unknown type
+    expected_context = f"{dataset_name} - {unknown_type}"
+    messages = [info for info in report.infos if expected_context in str(info.context)]
+    assert len(messages) == 1
+    assert messages[0].title == "Unable to map column types to DataHub types"
+    assert (
+        messages[0].message
+        == "Got an unexpected column type. The column's parsed field type will not be populated."
+    )

From 90fe5b6cb71a953042ebba33af6d6431e6ae0046 Mon Sep 17 00:00:00 2001
From: ryota-cloud <ryota.egashira@acryl.io>
Date: Tue, 14 Jan 2025 14:26:59 -0800
Subject: [PATCH 076/249]  fix(docker) add new gradle profile for consumer
 debug purpose (#12338)

---
 docker/build.gradle | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docker/build.gradle b/docker/build.gradle
index 7b36c0d9acdcf0..576e47a53e6ef5 100644
--- a/docker/build.gradle
+++ b/docker/build.gradle
@@ -42,6 +42,15 @@ ext {
                     modules: python_services_modules + backend_profile_modules + [':datahub-frontend'],
                     isDebug: true
             ],
+
+            'quickstartDebugConsumers': [
+                    profile: 'debug-consumers',
+                    modules: python_services_modules + backend_profile_modules + [':datahub-frontend',
+                                                                          ':metadata-jobs:mce-consumer-job',
+                                                                          ':metadata-jobs:mae-consumer-job'],
+                    isDebug: true
+            ],
+
             'quickstartPg': [
                     profile: 'quickstart-postgres',
                     modules: (backend_profile_modules - [':docker:mysql-setup']) + [

From 94b9da0bd8d9c04a5566a3c731f2f5418fc3eb0a Mon Sep 17 00:00:00 2001
From: RyanHolstien <RyanHolstien@users.noreply.github.com>
Date: Tue, 14 Jan 2025 17:28:34 -0600
Subject: [PATCH 077/249] feat(entityVersioning): initial implementation
 (#12166)

---
 .../datahub/graphql/GmsGraphQLEngine.java     |  15 +
 .../datahub/graphql/GmsGraphQLEngineArgs.java |   2 +
 .../versioning/LinkAssetVersionResolver.java  |  88 +++
 .../UnlinkAssetVersionResolver.java           |  67 ++
 .../src/main/resources/entity.graphql         |  60 ++
 .../LinkAssetVersionResolverTest.java         | 102 +++
 .../UnlinkAssetVersionResolverTest.java       | 123 ++++
 docker/profiles/docker-compose.gms.yml        |   8 +
 .../metadata/aspect/AspectRetriever.java      |  16 +-
 .../aspect/CachingAspectRetriever.java        |   6 +
 .../linkedin/metadata/aspect/ReadItem.java    |   1 +
 .../patch/template/AspectTemplateEngine.java  |  20 +-
 .../common/VersionPropertiesTemplate.java     |  44 ++
 .../metadata/entity/SearchRetriever.java      |  52 +-
 .../registry/SnapshotEntityRegistry.java      |   2 +
 .../metadata/aspect/MockAspectRetriever.java  |  19 +-
 .../java/com/linkedin/metadata/Constants.java |  13 +
 metadata-io/build.gradle                      |   1 +
 .../client/EntityClientAspectRetriever.java   |  19 +
 .../entity/EntityServiceAspectRetriever.java  |  12 +
 .../AlphanumericSortIdGenerator.java          |  70 ++
 .../EntityVersioningServiceImpl.java          | 356 +++++++++++
 .../sideeffects/VersionSetSideEffect.java     | 137 ++++
 .../VersionPropertiesValidator.java           | 158 +++++
 .../VersionSetPropertiesValidator.java        |  80 +++
 .../search/SearchServiceSearchRetriever.java  |  31 +-
 .../SearchDocumentTransformer.java            |   2 +-
 .../metadata/search/utils/ESUtils.java        |  36 ++
 .../service/UpdateIndicesService.java         |   3 +-
 .../AlphanumericSortIdGeneratorTest.java      |  62 ++
 .../EntityVersioningServiceTest.java          | 603 ++++++++++++++++++
 .../sideeffects/VersionSetSideEffectTest.java | 229 +++++++
 .../VersionPropertiesValidatorTest.java       | 165 +++++
 .../VersionSetPropertiesValidatorTest.java    | 139 ++++
 .../AutocompleteRequestHandlerTest.java       | 156 +++++
 .../request/SearchRequestHandlerTest.java     | 244 ++++++-
 .../SearchDocumentTransformerTest.java        |  19 +
 .../com/linkedin/common/VersionProperties.pdl |  77 +++
 .../com/linkedin/common/VersionTag.pdl        |   1 +
 .../linkedin/metadata/key/VersionSetKey.pdl   |  20 +
 .../linkedin/metadata/query/SearchFlags.pdl   |   5 +
 .../versionset/VersionSetProperties.pdl       |  24 +
 .../src/main/resources/entity-registry.yml    |   7 +
 .../graphql/featureflags/FeatureFlags.java    |   1 +
 .../src/main/resources/application.yaml       |   1 +
 .../EntityVersioningServiceFactory.java       |  21 +
 .../factory/graphql/GraphQLEngineFactory.java |   5 +-
 .../SpringStandardPluginConfiguration.java    |  67 ++
 .../delegates/DatahubUsageEventsImplTest.java |   4 +
 .../delegates/EntityApiDelegateImplTest.java  |   3 +
 .../GlobalControllerExceptionHandler.java     |  24 +
 .../openapi/config/SpringWebConfig.java       |   7 +-
 .../openapi/v3/OpenAPIV3Generator.java        | 243 +++++--
 .../v3/controller/EntityController.java       | 124 +++-
 .../openapi/v3/OpenAPIV3GeneratorTest.java    |   6 +-
 .../v3/controller/EntityControllerTest.java   | 218 ++++++-
 .../com.linkedin.entity.aspects.snapshot.json |   4 +
 ...com.linkedin.entity.entities.snapshot.json |  10 +
 .../com.linkedin.entity.runs.snapshot.json    |   4 +
 ...nkedin.operations.operations.snapshot.json |   4 +
 ...m.linkedin.platform.platform.snapshot.json |   4 +
 .../versioning/EntityVersioningService.java   |  36 ++
 .../versioning/VersionPropertiesInput.java    |  20 +
 .../metadata/search/utils/QueryUtils.java     |   8 +
 .../authorization/PoliciesConfig.java         |  11 +-
 .../tests/entity_versioning/__init__.py       |   0
 .../entity_versioning/test_versioning.py      |  64 ++
 test-models/build.gradle                      |   1 +
 68 files changed, 4063 insertions(+), 121 deletions(-)
 create mode 100644 datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/LinkAssetVersionResolver.java
 create mode 100644 datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/UnlinkAssetVersionResolver.java
 create mode 100644 datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/LinkAssetVersionResolverTest.java
 create mode 100644 datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/UnlinkAssetVersionResolverTest.java
 create mode 100644 entity-registry/src/main/java/com/linkedin/metadata/aspect/patch/template/common/VersionPropertiesTemplate.java
 create mode 100644 metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/AlphanumericSortIdGenerator.java
 create mode 100644 metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/EntityVersioningServiceImpl.java
 create mode 100644 metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/sideeffects/VersionSetSideEffect.java
 create mode 100644 metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/validation/VersionPropertiesValidator.java
 create mode 100644 metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/validation/VersionSetPropertiesValidator.java
 create mode 100644 metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/AlphanumericSortIdGeneratorTest.java
 create mode 100644 metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/EntityVersioningServiceTest.java
 create mode 100644 metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/sideeffects/VersionSetSideEffectTest.java
 create mode 100644 metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/validation/VersionPropertiesValidatorTest.java
 create mode 100644 metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/validation/VersionSetPropertiesValidatorTest.java
 create mode 100644 metadata-models/src/main/pegasus/com/linkedin/common/VersionProperties.pdl
 rename {li-utils => metadata-models}/src/main/pegasus/com/linkedin/common/VersionTag.pdl (78%)
 create mode 100644 metadata-models/src/main/pegasus/com/linkedin/metadata/key/VersionSetKey.pdl
 create mode 100644 metadata-models/src/main/pegasus/com/linkedin/versionset/VersionSetProperties.pdl
 create mode 100644 metadata-service/factories/src/main/java/com/linkedin/gms/factory/entity/versioning/EntityVersioningServiceFactory.java
 create mode 100644 metadata-service/services/src/main/java/com/linkedin/metadata/entity/versioning/EntityVersioningService.java
 create mode 100644 metadata-service/services/src/main/java/com/linkedin/metadata/entity/versioning/VersionPropertiesInput.java
 create mode 100644 smoke-test/tests/entity_versioning/__init__.py
 create mode 100644 smoke-test/tests/entity_versioning/test_versioning.py

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
index 3c46c1a8dce35c..b15db80a8487ae 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
@@ -174,6 +174,8 @@
 import com.linkedin.datahub.graphql.resolvers.embed.UpdateEmbedResolver;
 import com.linkedin.datahub.graphql.resolvers.entity.EntityExistsResolver;
 import com.linkedin.datahub.graphql.resolvers.entity.EntityPrivilegesResolver;
+import com.linkedin.datahub.graphql.resolvers.entity.versioning.LinkAssetVersionResolver;
+import com.linkedin.datahub.graphql.resolvers.entity.versioning.UnlinkAssetVersionResolver;
 import com.linkedin.datahub.graphql.resolvers.form.BatchAssignFormResolver;
 import com.linkedin.datahub.graphql.resolvers.form.BatchRemoveFormResolver;
 import com.linkedin.datahub.graphql.resolvers.form.CreateDynamicFormAssignmentResolver;
@@ -391,6 +393,7 @@
 import com.linkedin.metadata.config.telemetry.TelemetryConfiguration;
 import com.linkedin.metadata.connection.ConnectionService;
 import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.entity.versioning.EntityVersioningService;
 import com.linkedin.metadata.graph.GraphClient;
 import com.linkedin.metadata.graph.SiblingGraphService;
 import com.linkedin.metadata.models.registry.EntityRegistry;
@@ -476,6 +479,7 @@ public class GmsGraphQLEngine {
   private final RestrictedService restrictedService;
   private ConnectionService connectionService;
   private AssertionService assertionService;
+  private final EntityVersioningService entityVersioningService;
 
   private final BusinessAttributeService businessAttributeService;
   private final FeatureFlags featureFlags;
@@ -599,6 +603,7 @@ public GmsGraphQLEngine(final GmsGraphQLEngineArgs args) {
     this.restrictedService = args.restrictedService;
     this.connectionService = args.connectionService;
     this.assertionService = args.assertionService;
+    this.entityVersioningService = args.entityVersioningService;
 
     this.businessAttributeService = args.businessAttributeService;
     this.ingestionConfiguration = Objects.requireNonNull(args.ingestionConfiguration);
@@ -1392,6 +1397,16 @@ private void configureMutationResolvers(final RuntimeWiring.Builder builder) {
                     "removeBusinessAttribute",
                     new RemoveBusinessAttributeResolver(this.entityService));
           }
+          if (featureFlags.isEntityVersioning()) {
+            typeWiring
+                .dataFetcher(
+                    "linkAssetVersion",
+                    new LinkAssetVersionResolver(this.entityVersioningService, this.featureFlags))
+                .dataFetcher(
+                    "unlinkAssetVersion",
+                    new UnlinkAssetVersionResolver(
+                        this.entityVersioningService, this.featureFlags));
+          }
           return typeWiring;
         });
   }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngineArgs.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngineArgs.java
index f6ab3a603dbb7b..131f4e87637807 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngineArgs.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngineArgs.java
@@ -21,6 +21,7 @@
 import com.linkedin.metadata.config.telemetry.TelemetryConfiguration;
 import com.linkedin.metadata.connection.ConnectionService;
 import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.entity.versioning.EntityVersioningService;
 import com.linkedin.metadata.graph.GraphClient;
 import com.linkedin.metadata.graph.SiblingGraphService;
 import com.linkedin.metadata.models.registry.EntityRegistry;
@@ -88,6 +89,7 @@ public class GmsGraphQLEngineArgs {
   BusinessAttributeService businessAttributeService;
   ConnectionService connectionService;
   AssertionService assertionService;
+  EntityVersioningService entityVersioningService;
 
   // any fork specific args should go below this line
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/LinkAssetVersionResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/LinkAssetVersionResolver.java
new file mode 100644
index 00000000000000..69e049af1e87b7
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/LinkAssetVersionResolver.java
@@ -0,0 +1,88 @@
+package com.linkedin.datahub.graphql.resolvers.entity.versioning;
+
+import static com.linkedin.datahub.graphql.resolvers.ResolverUtils.bindArgument;
+import static com.linkedin.metadata.Constants.VERSION_SET_ENTITY_NAME;
+import static com.linkedin.metadata.authorization.ApiOperation.UPDATE;
+
+import com.datahub.authorization.AuthUtil;
+import com.google.common.collect.ImmutableSet;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.concurrency.GraphQLConcurrencyUtils;
+import com.linkedin.datahub.graphql.exception.AuthorizationException;
+import com.linkedin.datahub.graphql.featureflags.FeatureFlags;
+import com.linkedin.datahub.graphql.generated.LinkVersionInput;
+import com.linkedin.metadata.entity.IngestResult;
+import com.linkedin.metadata.entity.versioning.EntityVersioningService;
+import com.linkedin.metadata.entity.versioning.VersionPropertiesInput;
+import graphql.schema.DataFetcher;
+import graphql.schema.DataFetchingEnvironment;
+import io.datahubproject.metadata.context.OperationContext;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * Currently only supports linking the latest version, but may be modified later to support inserts
+ */
+public class LinkAssetVersionResolver implements DataFetcher<CompletableFuture<String>> {
+
+  private final EntityVersioningService entityVersioningService;
+  private final FeatureFlags featureFlags;
+
+  public LinkAssetVersionResolver(
+      EntityVersioningService entityVersioningService, FeatureFlags featureFlags) {
+    this.entityVersioningService = entityVersioningService;
+    this.featureFlags = featureFlags;
+  }
+
+  @Override
+  public CompletableFuture<String> get(DataFetchingEnvironment environment) throws Exception {
+    final QueryContext context = environment.getContext();
+    final LinkVersionInput input =
+        bindArgument(environment.getArgument("input"), LinkVersionInput.class);
+    if (!featureFlags.isEntityVersioning()) {
+      throw new IllegalAccessError(
+          "Entity Versioning is not configured, please enable before attempting to use this feature.");
+    }
+    Urn versionSetUrn = UrnUtils.getUrn(input.getVersionSet());
+    if (!VERSION_SET_ENTITY_NAME.equals(versionSetUrn.getEntityType())) {
+      throw new IllegalArgumentException(
+          String.format("Version Set urn %s must be of type Version Set.", input.getVersionSet()));
+    }
+    Urn entityUrn = UrnUtils.getUrn(input.getLinkedEntity());
+    OperationContext opContext = context.getOperationContext();
+    if (!AuthUtil.isAPIAuthorizedEntityUrns(
+        opContext, UPDATE, ImmutableSet.of(versionSetUrn, entityUrn))) {
+      throw new AuthorizationException(
+          String.format(
+              "%s is unauthorized to %s entities %s and %s",
+              opContext.getAuthentication().getActor().toUrnStr(),
+              UPDATE,
+              input.getVersionSet(),
+              input.getLinkedEntity()));
+    }
+    VersionPropertiesInput versionPropertiesInput =
+        new VersionPropertiesInput(
+            input.getComment(),
+            input.getVersion(),
+            input.getSourceTimestamp(),
+            input.getSourceCreator());
+    return GraphQLConcurrencyUtils.supplyAsync(
+        () -> {
+          List<IngestResult> linkResults =
+              entityVersioningService.linkLatestVersion(
+                  opContext, versionSetUrn, entityUrn, versionPropertiesInput);
+
+          return linkResults.stream()
+              .filter(
+                  ingestResult -> input.getLinkedEntity().equals(ingestResult.getUrn().toString()))
+              .map(ingestResult -> ingestResult.getUrn().toString())
+              .findAny()
+              .orElse(StringUtils.EMPTY);
+        },
+        this.getClass().getSimpleName(),
+        "get");
+  }
+}
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/UnlinkAssetVersionResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/UnlinkAssetVersionResolver.java
new file mode 100644
index 00000000000000..3d5027a0d668ac
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/UnlinkAssetVersionResolver.java
@@ -0,0 +1,67 @@
+package com.linkedin.datahub.graphql.resolvers.entity.versioning;
+
+import static com.linkedin.datahub.graphql.resolvers.ResolverUtils.bindArgument;
+import static com.linkedin.metadata.Constants.VERSION_SET_ENTITY_NAME;
+import static com.linkedin.metadata.authorization.ApiOperation.UPDATE;
+
+import com.datahub.authorization.AuthUtil;
+import com.google.common.collect.ImmutableSet;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.concurrency.GraphQLConcurrencyUtils;
+import com.linkedin.datahub.graphql.exception.AuthorizationException;
+import com.linkedin.datahub.graphql.featureflags.FeatureFlags;
+import com.linkedin.datahub.graphql.generated.UnlinkVersionInput;
+import com.linkedin.metadata.entity.versioning.EntityVersioningService;
+import graphql.schema.DataFetcher;
+import graphql.schema.DataFetchingEnvironment;
+import io.datahubproject.metadata.context.OperationContext;
+import java.util.concurrent.CompletableFuture;
+
+public class UnlinkAssetVersionResolver implements DataFetcher<CompletableFuture<Boolean>> {
+
+  private final EntityVersioningService entityVersioningService;
+  private final FeatureFlags featureFlags;
+
+  public UnlinkAssetVersionResolver(
+      EntityVersioningService entityVersioningService, FeatureFlags featureFlags) {
+    this.entityVersioningService = entityVersioningService;
+    this.featureFlags = featureFlags;
+  }
+
+  @Override
+  public CompletableFuture<Boolean> get(DataFetchingEnvironment environment) throws Exception {
+    if (!featureFlags.isEntityVersioning()) {
+      throw new IllegalAccessError(
+          "Entity Versioning is not configured, please enable before attempting to use this feature.");
+    }
+    final QueryContext context = environment.getContext();
+    final UnlinkVersionInput input =
+        bindArgument(environment.getArgument("input"), UnlinkVersionInput.class);
+    Urn versionSetUrn = UrnUtils.getUrn(input.getVersionSet());
+    if (!VERSION_SET_ENTITY_NAME.equals(versionSetUrn.getEntityType())) {
+      throw new IllegalArgumentException(
+          String.format("Version Set urn %s must be of type Version Set.", input.getVersionSet()));
+    }
+    Urn entityUrn = UrnUtils.getUrn(input.getUnlinkedEntity());
+    OperationContext opContext = context.getOperationContext();
+    if (!AuthUtil.isAPIAuthorizedEntityUrns(
+        opContext, UPDATE, ImmutableSet.of(versionSetUrn, entityUrn))) {
+      throw new AuthorizationException(
+          String.format(
+              "%s is unauthorized to %s entities %s and %s",
+              opContext.getAuthentication().getActor(),
+              UPDATE,
+              input.getVersionSet(),
+              input.getUnlinkedEntity()));
+    }
+    return GraphQLConcurrencyUtils.supplyAsync(
+        () -> {
+          entityVersioningService.unlinkVersion(opContext, versionSetUrn, entityUrn);
+          return true;
+        },
+        this.getClass().getSimpleName(),
+        "get");
+  }
+}
diff --git a/datahub-graphql-core/src/main/resources/entity.graphql b/datahub-graphql-core/src/main/resources/entity.graphql
index 9dd1948e18e042..b47be7ae32b2c4 100644
--- a/datahub-graphql-core/src/main/resources/entity.graphql
+++ b/datahub-graphql-core/src/main/resources/entity.graphql
@@ -956,6 +956,16 @@ type Mutation {
     Remove Business Attribute
     """
     removeBusinessAttribute(input: AddBusinessAttributeInput!): Boolean
+
+    """
+    Link the latest versioned entity to a Version Set
+    """
+    linkAssetVersion(input: LinkVersionInput!): String
+
+    """
+    Unlink a versioned entity from a Version Set
+    """
+    unlinkAssetVersion(input: UnlinkVersionInput!): Boolean
 }
 
 """
@@ -12911,6 +12921,56 @@ input ListBusinessAttributesInput {
     query: String
 }
 
+"""
+Input for linking a versioned entity to a Version Set
+"""
+input LinkVersionInput {
+    """
+    The target version set
+    """
+    versionSet: String!
+
+    """
+    The target versioned entity to link
+    """
+    linkedEntity: String!
+
+    """
+    Version Tag label for the version, should be unique within a Version Set
+    """
+    version: String!
+
+    """
+    Optional timestamp from the source system
+    """
+    sourceTimestamp: Long
+
+    """
+    Optional creator from the source system, will be converted to an Urn
+    """
+    sourceCreator: String
+
+    """
+    Optional comment about the version
+    """
+    comment: String
+}
+
+"""
+Input for unlinking a versioned entity from a Version Set
+"""
+input UnlinkVersionInput {
+    """
+    The target version set
+    """
+    versionSet: String
+
+    """
+    The target versioned entity to unlink
+    """
+    unlinkedEntity: String
+}
+
 """
 The result obtained when listing Business Attribute
 """
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/LinkAssetVersionResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/LinkAssetVersionResolverTest.java
new file mode 100644
index 00000000000000..690856263fccc5
--- /dev/null
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/LinkAssetVersionResolverTest.java
@@ -0,0 +1,102 @@
+package com.linkedin.datahub.graphql.resolvers.entity.versioning;
+
+import static com.linkedin.datahub.graphql.TestUtils.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.testng.Assert.*;
+
+import com.google.common.collect.ImmutableList;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.featureflags.FeatureFlags;
+import com.linkedin.datahub.graphql.generated.LinkVersionInput;
+import com.linkedin.metadata.entity.IngestResult;
+import com.linkedin.metadata.entity.versioning.EntityVersioningService;
+import com.linkedin.metadata.entity.versioning.VersionPropertiesInput;
+import graphql.schema.DataFetchingEnvironment;
+import org.mockito.Mockito;
+import org.testng.annotations.Test;
+
+public class LinkAssetVersionResolverTest {
+
+  private static final String TEST_VERSION_SET_URN = "urn:li:versionSet:test-version-set";
+  private static final String TEST_ENTITY_URN =
+      "urn:li:dataset:(urn:li:dataPlatform:mysql,my-test,PROD)";
+
+  @Test
+  public void testGetSuccessful() throws Exception {
+    EntityVersioningService mockService = Mockito.mock(EntityVersioningService.class);
+    FeatureFlags mockFlags = Mockito.mock(FeatureFlags.class);
+
+    Mockito.when(mockFlags.isEntityVersioning()).thenReturn(true);
+
+    IngestResult mockResult =
+        IngestResult.builder().urn(Urn.createFromString(TEST_ENTITY_URN)).build();
+
+    Mockito.when(
+            mockService.linkLatestVersion(
+                any(),
+                eq(UrnUtils.getUrn(TEST_VERSION_SET_URN)),
+                eq(UrnUtils.getUrn(TEST_ENTITY_URN)),
+                any(VersionPropertiesInput.class)))
+        .thenReturn(ImmutableList.of(mockResult));
+
+    LinkAssetVersionResolver resolver = new LinkAssetVersionResolver(mockService, mockFlags);
+
+    // Execute resolver
+    QueryContext mockContext = getMockAllowContext();
+    DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
+    LinkVersionInput input = new LinkVersionInput();
+    input.setVersionSet(TEST_VERSION_SET_URN);
+    input.setLinkedEntity(TEST_ENTITY_URN);
+    input.setComment("Test comment");
+    input.setVersion("v1");
+
+    Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
+    Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
+
+    String result = resolver.get(mockEnv).get();
+    assertEquals(result, TEST_ENTITY_URN);
+  }
+
+  @Test
+  public void testGetFeatureFlagDisabled() throws Exception {
+    EntityVersioningService mockService = Mockito.mock(EntityVersioningService.class);
+    FeatureFlags mockFlags = Mockito.mock(FeatureFlags.class);
+
+    Mockito.when(mockFlags.isEntityVersioning()).thenReturn(false);
+
+    LinkAssetVersionResolver resolver = new LinkAssetVersionResolver(mockService, mockFlags);
+
+    // Execute resolver
+    DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
+    LinkVersionInput input = new LinkVersionInput();
+    input.setVersionSet(TEST_VERSION_SET_URN);
+    input.setLinkedEntity(TEST_ENTITY_URN);
+
+    Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
+
+    assertThrows(IllegalAccessError.class, () -> resolver.get(mockEnv));
+  }
+
+  @Test
+  public void testGetInvalidVersionSetUrn() throws Exception {
+    EntityVersioningService mockService = Mockito.mock(EntityVersioningService.class);
+    FeatureFlags mockFlags = Mockito.mock(FeatureFlags.class);
+
+    Mockito.when(mockFlags.isEntityVersioning()).thenReturn(true);
+
+    LinkAssetVersionResolver resolver = new LinkAssetVersionResolver(mockService, mockFlags);
+
+    // Execute resolver
+    DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
+    LinkVersionInput input = new LinkVersionInput();
+    input.setVersionSet("urn:li:dataset:invalid-version-set"); // Invalid URN type
+    input.setLinkedEntity(TEST_ENTITY_URN);
+
+    Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
+
+    assertThrows(IllegalArgumentException.class, () -> resolver.get(mockEnv));
+  }
+}
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/UnlinkAssetVersionResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/UnlinkAssetVersionResolverTest.java
new file mode 100644
index 00000000000000..0000ad24a04537
--- /dev/null
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/UnlinkAssetVersionResolverTest.java
@@ -0,0 +1,123 @@
+package com.linkedin.datahub.graphql.resolvers.entity.versioning;
+
+import static com.linkedin.datahub.graphql.TestUtils.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.testng.Assert.*;
+
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.featureflags.FeatureFlags;
+import com.linkedin.datahub.graphql.generated.UnlinkVersionInput;
+import com.linkedin.metadata.entity.versioning.EntityVersioningService;
+import graphql.schema.DataFetchingEnvironment;
+import java.util.Collections;
+import java.util.concurrent.CompletionException;
+import org.mockito.Mockito;
+import org.testng.annotations.Test;
+
+public class UnlinkAssetVersionResolverTest {
+
+  private static final String TEST_VERSION_SET_URN = "urn:li:versionSet:test-version-set";
+  private static final String TEST_ENTITY_URN =
+      "urn:li:dataset:(urn:li:dataPlatform:mysql,my-test,PROD)";
+
+  @Test
+  public void testGetSuccessful() throws Exception {
+    EntityVersioningService mockService = Mockito.mock(EntityVersioningService.class);
+    FeatureFlags mockFlags = Mockito.mock(FeatureFlags.class);
+
+    Mockito.when(mockFlags.isEntityVersioning()).thenReturn(true);
+
+    Mockito.when(
+            mockService.unlinkVersion(
+                any(),
+                eq(UrnUtils.getUrn(TEST_VERSION_SET_URN)),
+                eq(UrnUtils.getUrn(TEST_ENTITY_URN))))
+        .thenReturn(Collections.emptyList());
+
+    UnlinkAssetVersionResolver resolver = new UnlinkAssetVersionResolver(mockService, mockFlags);
+
+    // Execute resolver
+    QueryContext mockContext = getMockAllowContext();
+    DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
+    UnlinkVersionInput input = new UnlinkVersionInput();
+    input.setVersionSet(TEST_VERSION_SET_URN);
+    input.setUnlinkedEntity(TEST_ENTITY_URN);
+
+    Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
+    Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
+
+    assertTrue(resolver.get(mockEnv).get());
+
+    Mockito.verify(mockService)
+        .unlinkVersion(
+            any(), eq(UrnUtils.getUrn(TEST_VERSION_SET_URN)), eq(UrnUtils.getUrn(TEST_ENTITY_URN)));
+  }
+
+  @Test
+  public void testGetFeatureFlagDisabled() throws Exception {
+    EntityVersioningService mockService = Mockito.mock(EntityVersioningService.class);
+    FeatureFlags mockFlags = Mockito.mock(FeatureFlags.class);
+
+    Mockito.when(mockFlags.isEntityVersioning()).thenReturn(false);
+
+    UnlinkAssetVersionResolver resolver = new UnlinkAssetVersionResolver(mockService, mockFlags);
+
+    // Execute resolver
+    DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
+    UnlinkVersionInput input = new UnlinkVersionInput();
+    input.setVersionSet(TEST_VERSION_SET_URN);
+    input.setUnlinkedEntity(TEST_ENTITY_URN);
+
+    Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
+
+    assertThrows(IllegalAccessError.class, () -> resolver.get(mockEnv));
+  }
+
+  @Test
+  public void testGetInvalidVersionSetUrn() throws Exception {
+    EntityVersioningService mockService = Mockito.mock(EntityVersioningService.class);
+    FeatureFlags mockFlags = Mockito.mock(FeatureFlags.class);
+
+    Mockito.when(mockFlags.isEntityVersioning()).thenReturn(true);
+
+    UnlinkAssetVersionResolver resolver = new UnlinkAssetVersionResolver(mockService, mockFlags);
+
+    // Execute resolver
+    DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
+    UnlinkVersionInput input = new UnlinkVersionInput();
+    input.setVersionSet("urn:li:dataset:invalid-version-set"); // Invalid URN type
+    input.setUnlinkedEntity(TEST_ENTITY_URN);
+
+    Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
+
+    assertThrows(IllegalArgumentException.class, () -> resolver.get(mockEnv));
+  }
+
+  @Test
+  public void testGetServiceException() throws Exception {
+    EntityVersioningService mockService = Mockito.mock(EntityVersioningService.class);
+    FeatureFlags mockFlags = Mockito.mock(FeatureFlags.class);
+
+    Mockito.when(mockFlags.isEntityVersioning()).thenReturn(true);
+
+    Mockito.doThrow(new RuntimeException("Service error"))
+        .when(mockService)
+        .unlinkVersion(any(), any(), any());
+
+    UnlinkAssetVersionResolver resolver = new UnlinkAssetVersionResolver(mockService, mockFlags);
+
+    // Execute resolver
+    QueryContext mockContext = getMockAllowContext();
+    DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
+    UnlinkVersionInput input = new UnlinkVersionInput();
+    input.setVersionSet(TEST_VERSION_SET_URN);
+    input.setUnlinkedEntity(TEST_ENTITY_URN);
+
+    Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
+    Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
+
+    assertThrows(CompletionException.class, () -> resolver.get(mockEnv).join());
+  }
+}
diff --git a/docker/profiles/docker-compose.gms.yml b/docker/profiles/docker-compose.gms.yml
index 64163ef970080a..ada7df51e20bef 100644
--- a/docker/profiles/docker-compose.gms.yml
+++ b/docker/profiles/docker-compose.gms.yml
@@ -67,6 +67,7 @@ x-datahub-system-update-service: &datahub-system-update-service
     SCHEMA_REGISTRY_SYSTEM_UPDATE: ${SCHEMA_REGISTRY_SYSTEM_UPDATE:-true}
     SPRING_KAFKA_PROPERTIES_AUTO_REGISTER_SCHEMAS: ${SPRING_KAFKA_PROPERTIES_AUTO_REGISTER_SCHEMAS:-true}
     SPRING_KAFKA_PROPERTIES_USE_LATEST_VERSION: ${SPRING_KAFKA_PROPERTIES_USE_LATEST_VERSION:-true}
+    ENTITY_VERSIONING_ENABLED: ${ENTITY_VERSIONING_ENABLED:-true}
   volumes:
     - ${HOME}/.datahub/plugins:/etc/datahub/plugins
 
@@ -80,6 +81,7 @@ x-datahub-system-update-service-dev: &datahub-system-update-service-dev
     SKIP_ELASTICSEARCH_CHECK: false
     REPROCESS_DEFAULT_BROWSE_PATHS_V2: ${REPROCESS_DEFAULT_BROWSE_PATHS_V2:-false}
     JAVA_TOOL_OPTIONS: '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5003'
+    ENTITY_VERSIONING_ENABLED: ${ENTITY_VERSIONING_ENABLED:-true}
   volumes:
     - ../../datahub-upgrade/build/libs/:/datahub/datahub-upgrade/bin/
     - ../../metadata-models/src/main/resources/:/datahub/datahub-gms/resources
@@ -101,6 +103,7 @@ x-datahub-gms-service: &datahub-gms-service
     <<: [*primary-datastore-mysql-env, *graph-datastore-search-env, *search-datastore-env, *datahub-quickstart-telemetry-env, *kafka-env]
     ALTERNATE_MCP_VALIDATION: ${ALTERNATE_MCP_VALIDATION:-true}
     STRICT_URN_VALIDATION_ENABLED: ${STRICT_URN_VALIDATION_ENABLED:-true}
+    ENTITY_VERSIONING_ENABLED: ${ENTITY_VERSIONING_ENABLED:-true}
   healthcheck:
     test: curl -sS --fail http://datahub-gms:${DATAHUB_GMS_PORT:-8080}/health
     start_period: 90s
@@ -131,6 +134,7 @@ x-datahub-gms-service-dev: &datahub-gms-service-dev
     SEARCH_SERVICE_ENABLE_CACHE: false
     LINEAGE_SEARCH_CACHE_ENABLED: false
     SHOW_BROWSE_V2: true
+    ENTITY_VERSIONING_ENABLED: ${ENTITY_VERSIONING_ENABLED:-true}
   volumes:
     - ./datahub-gms/start.sh:/datahub/datahub-gms/scripts/start.sh
     - ./datahub-gms/jetty.xml:/datahub/datahub-gms/scripts/jetty.xml
@@ -155,12 +159,14 @@ x-datahub-mae-consumer-service: &datahub-mae-consumer-service
     - ${DATAHUB_LOCAL_MAE_ENV:-empty2.env}
   environment: &datahub-mae-consumer-env
     <<: [*primary-datastore-mysql-env, *graph-datastore-search-env, *search-datastore-env, *kafka-env]
+    ENTITY_VERSIONING_ENABLED: ${ENTITY_VERSIONING_ENABLED:-true}
 
 x-datahub-mae-consumer-service-dev: &datahub-mae-consumer-service-dev
   <<: *datahub-mae-consumer-service
   image: ${DATAHUB_MAE_CONSUMER_IMAGE:-${DATAHUB_REPO:-acryldata}/datahub-mae-consumer}:${DATAHUB_VERSION:-debug}
   environment:
     <<: [*datahub-dev-telemetry-env, *datahub-mae-consumer-env]
+    ENTITY_VERSIONING_ENABLED: ${ENTITY_VERSIONING_ENABLED:-true}
   volumes:
     - ./datahub-mae-consumer/start.sh:/datahub/datahub-mae-consumer/scripts/start.sh
     - ../../metadata-models/src/main/resources/:/datahub/datahub-mae-consumer/resources
@@ -183,12 +189,14 @@ x-datahub-mce-consumer-service: &datahub-mce-consumer-service
     <<: [*primary-datastore-mysql-env, *graph-datastore-search-env, *search-datastore-env, *datahub-quickstart-telemetry-env, *kafka-env]
     ALTERNATE_MCP_VALIDATION: ${ALTERNATE_MCP_VALIDATION:-true}
     STRICT_URN_VALIDATION_ENABLED: ${STRICT_URN_VALIDATION_ENABLED:-true}
+    ENTITY_VERSIONING_ENABLED: ${ENTITY_VERSIONING_ENABLED:-true}
 
 x-datahub-mce-consumer-service-dev: &datahub-mce-consumer-service-dev
   <<: *datahub-mce-consumer-service
   image: ${DATAHUB_MCE_CONSUMER_IMAGE:-${DATAHUB_REPO:-acryldata}/datahub-mce-consumer}:${DATAHUB_VERSION:-debug}
   environment:
     <<: [*datahub-dev-telemetry-env, *datahub-mce-consumer-env]
+    ENTITY_VERSIONING_ENABLED: ${ENTITY_VERSIONING_ENABLED:-true}
   volumes:
     - ./datahub-mce-consumer/start.sh:/datahub/datahub-mce-consumer/scripts/start.sh
     - ../../metadata-jobs/mce-consumer-job/build/libs/:/datahub/datahub-mce-consumer/bin
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/aspect/AspectRetriever.java b/entity-registry/src/main/java/com/linkedin/metadata/aspect/AspectRetriever.java
index e34df7db481189..87939e14bfde68 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/aspect/AspectRetriever.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/aspect/AspectRetriever.java
@@ -5,11 +5,9 @@
 import com.linkedin.common.urn.Urn;
 import com.linkedin.entity.Aspect;
 import com.linkedin.metadata.models.registry.EntityRegistry;
-import com.linkedin.util.Pair;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -50,19 +48,7 @@ default SystemAspect getLatestSystemAspect(
   Map<Urn, Map<String, SystemAspect>> getLatestSystemAspects(Map<Urn, Set<String>> urnAspectNames);
 
   @Nonnull
-  default Map<Urn, Boolean> entityExists(Set<Urn> urns) {
-    Set<String> keyAspectNames =
-        urns.stream()
-            .map(Urn::getEntityType)
-            .distinct()
-            .map(entityType -> getEntityRegistry().getEntitySpec(entityType).getKeyAspectName())
-            .collect(Collectors.toSet());
-
-    Map<Urn, Map<String, Aspect>> latest = getLatestAspectObjects(urns, keyAspectNames);
-    return urns.stream()
-        .map(urn -> Pair.of(urn, latest.containsKey(urn)))
-        .collect(Collectors.toMap(Pair::getKey, Pair::getValue));
-  }
+  Map<Urn, Boolean> entityExists(Set<Urn> urns);
 
   @Nonnull
   EntityRegistry getEntityRegistry();
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/aspect/CachingAspectRetriever.java b/entity-registry/src/main/java/com/linkedin/metadata/aspect/CachingAspectRetriever.java
index 375dd8cf8911e1..7b3233921d039e 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/aspect/CachingAspectRetriever.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/aspect/CachingAspectRetriever.java
@@ -29,6 +29,12 @@ public Map<Urn, Map<String, SystemAspect>> getLatestSystemAspects(
       return Collections.emptyMap();
     }
 
+    @Nonnull
+    @Override
+    public Map<Urn, Boolean> entityExists(Set<Urn> urns) {
+      return Collections.emptyMap();
+    }
+
     @Nonnull
     @Override
     public EntityRegistry getEntityRegistry() {
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/aspect/ReadItem.java b/entity-registry/src/main/java/com/linkedin/metadata/aspect/ReadItem.java
index 106596bf80ccf0..341dec4d4741c7 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/aspect/ReadItem.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/aspect/ReadItem.java
@@ -36,6 +36,7 @@ default String getAspectName() {
   @Nullable
   RecordTemplate getRecordTemplate();
 
+  @Nullable
   default <T> T getAspect(Class<T> clazz) {
     return getAspect(clazz, getRecordTemplate());
   }
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/aspect/patch/template/AspectTemplateEngine.java b/entity-registry/src/main/java/com/linkedin/metadata/aspect/patch/template/AspectTemplateEngine.java
index ce36b7e77a2b16..821dad13aa0c3c 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/aspect/patch/template/AspectTemplateEngine.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/aspect/patch/template/AspectTemplateEngine.java
@@ -1,20 +1,6 @@
 package com.linkedin.metadata.aspect.patch.template;
 
-import static com.linkedin.metadata.Constants.CHART_INFO_ASPECT_NAME;
-import static com.linkedin.metadata.Constants.DASHBOARD_INFO_ASPECT_NAME;
-import static com.linkedin.metadata.Constants.DATASET_PROPERTIES_ASPECT_NAME;
-import static com.linkedin.metadata.Constants.DATA_FLOW_INFO_ASPECT_NAME;
-import static com.linkedin.metadata.Constants.DATA_JOB_INFO_ASPECT_NAME;
-import static com.linkedin.metadata.Constants.DATA_JOB_INPUT_OUTPUT_ASPECT_NAME;
-import static com.linkedin.metadata.Constants.DATA_PRODUCT_PROPERTIES_ASPECT_NAME;
-import static com.linkedin.metadata.Constants.EDITABLE_SCHEMA_METADATA_ASPECT_NAME;
-import static com.linkedin.metadata.Constants.FORM_INFO_ASPECT_NAME;
-import static com.linkedin.metadata.Constants.GLOBAL_TAGS_ASPECT_NAME;
-import static com.linkedin.metadata.Constants.GLOSSARY_TERMS_ASPECT_NAME;
-import static com.linkedin.metadata.Constants.OWNERSHIP_ASPECT_NAME;
-import static com.linkedin.metadata.Constants.STRUCTURED_PROPERTIES_ASPECT_NAME;
-import static com.linkedin.metadata.Constants.STRUCTURED_PROPERTY_DEFINITION_ASPECT_NAME;
-import static com.linkedin.metadata.Constants.UPSTREAM_LINEAGE_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.*;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.linkedin.data.template.RecordTemplate;
@@ -50,7 +36,9 @@ public class AspectTemplateEngine {
               DASHBOARD_INFO_ASPECT_NAME,
               STRUCTURED_PROPERTIES_ASPECT_NAME,
               STRUCTURED_PROPERTY_DEFINITION_ASPECT_NAME,
-              FORM_INFO_ASPECT_NAME)
+              FORM_INFO_ASPECT_NAME,
+              UPSTREAM_LINEAGE_ASPECT_NAME,
+              VERSION_PROPERTIES_ASPECT_NAME)
           .collect(Collectors.toSet());
 
   private final Map<String, Template<? extends RecordTemplate>> _aspectTemplateMap;
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/aspect/patch/template/common/VersionPropertiesTemplate.java b/entity-registry/src/main/java/com/linkedin/metadata/aspect/patch/template/common/VersionPropertiesTemplate.java
new file mode 100644
index 00000000000000..2f7d24e2cdb4b7
--- /dev/null
+++ b/entity-registry/src/main/java/com/linkedin/metadata/aspect/patch/template/common/VersionPropertiesTemplate.java
@@ -0,0 +1,44 @@
+package com.linkedin.metadata.aspect.patch.template.common;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.linkedin.common.VersionProperties;
+import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.metadata.aspect.patch.template.Template;
+import javax.annotation.Nonnull;
+
+public class VersionPropertiesTemplate implements Template<VersionProperties> {
+
+  public static final String IS_LATEST_FIELD = "isLatest";
+
+  @Override
+  public VersionProperties getSubtype(RecordTemplate recordTemplate) throws ClassCastException {
+    if (recordTemplate instanceof VersionProperties) {
+      return (VersionProperties) recordTemplate;
+    }
+    throw new ClassCastException("Unable to cast RecordTemplate to VersionProperties");
+  }
+
+  @Override
+  public Class<VersionProperties> getTemplateType() {
+    return VersionProperties.class;
+  }
+
+  @Nonnull
+  @Override
+  public VersionProperties getDefault() {
+    throw new UnsupportedOperationException(
+        "Unable to generate default version properties, no sensible default for " + "version set.");
+  }
+
+  @Nonnull
+  @Override
+  public JsonNode transformFields(JsonNode baseNode) {
+    return baseNode;
+  }
+
+  @Nonnull
+  @Override
+  public JsonNode rebaseFields(JsonNode patched) {
+    return patched;
+  }
+}
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/entity/SearchRetriever.java b/entity-registry/src/main/java/com/linkedin/metadata/entity/SearchRetriever.java
index d4894c97015f8f..19dc89d26cb1af 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/entity/SearchRetriever.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/entity/SearchRetriever.java
@@ -1,6 +1,10 @@
 package com.linkedin.metadata.entity;
 
+import com.google.common.collect.ImmutableList;
+import com.linkedin.metadata.query.SearchFlags;
 import com.linkedin.metadata.query.filter.Filter;
+import com.linkedin.metadata.query.filter.SortCriterion;
+import com.linkedin.metadata.query.filter.SortOrder;
 import com.linkedin.metadata.search.ScrollResult;
 import com.linkedin.metadata.search.SearchEntityArray;
 import java.util.List;
@@ -8,6 +12,40 @@
 import javax.annotation.Nullable;
 
 public interface SearchRetriever {
+
+  SearchFlags RETRIEVER_SEARCH_FLAGS =
+      new SearchFlags()
+          .setFulltext(false)
+          .setMaxAggValues(20)
+          .setSkipCache(false)
+          .setSkipAggregates(true)
+          .setSkipHighlighting(true)
+          .setIncludeSoftDeleted(false)
+          .setIncludeRestricted(false);
+
+  SearchFlags RETRIEVER_SEARCH_FLAGS_NO_CACHE_ALL_VERSIONS =
+      new SearchFlags()
+          .setFulltext(false)
+          .setMaxAggValues(20)
+          .setSkipCache(true)
+          .setSkipAggregates(true)
+          .setSkipHighlighting(true)
+          .setIncludeSoftDeleted(false)
+          .setIncludeRestricted(false)
+          .setFilterNonLatestVersions(false);
+
+  /**
+   * Allows for configuring the sort, should only be used when sort specified is unique. More often
+   * the default is desirable to just use the urnSort
+   */
+  ScrollResult scroll(
+      @Nonnull List<String> entities,
+      @Nullable Filter filters,
+      @Nullable String scrollId,
+      int count,
+      List<SortCriterion> sortCriteria,
+      @Nullable SearchFlags searchFlags);
+
   /**
    * Returns search results for the given entities, filtered and sorted.
    *
@@ -17,11 +55,17 @@ public interface SearchRetriever {
    * @param count size of a page
    * @return result of the search
    */
-  ScrollResult scroll(
+  default ScrollResult scroll(
       @Nonnull List<String> entities,
       @Nullable Filter filters,
       @Nullable String scrollId,
-      int count);
+      int count) {
+    SortCriterion urnSort = new SortCriterion();
+    urnSort.setField("urn");
+    urnSort.setOrder(SortOrder.ASCENDING);
+    return scroll(
+        entities, filters, scrollId, count, ImmutableList.of(urnSort), RETRIEVER_SEARCH_FLAGS);
+  }
 
   SearchRetriever EMPTY = new EmptySearchRetriever();
 
@@ -32,7 +76,9 @@ public ScrollResult scroll(
         @Nonnull List<String> entities,
         @Nullable Filter filters,
         @Nullable String scrollId,
-        int count) {
+        int count,
+        List<SortCriterion> sortCriteria,
+        @Nullable SearchFlags searchFlags) {
       ScrollResult empty = new ScrollResult();
       empty.setEntities(new SearchEntityArray());
       empty.setNumEntities(0);
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/models/registry/SnapshotEntityRegistry.java b/entity-registry/src/main/java/com/linkedin/metadata/models/registry/SnapshotEntityRegistry.java
index 16df2d452a619e..f4d6799bb476f5 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/models/registry/SnapshotEntityRegistry.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/models/registry/SnapshotEntityRegistry.java
@@ -12,6 +12,7 @@
 import com.linkedin.metadata.aspect.patch.template.common.GlossaryTermsTemplate;
 import com.linkedin.metadata.aspect.patch.template.common.OwnershipTemplate;
 import com.linkedin.metadata.aspect.patch.template.common.StructuredPropertiesTemplate;
+import com.linkedin.metadata.aspect.patch.template.common.VersionPropertiesTemplate;
 import com.linkedin.metadata.aspect.patch.template.dashboard.DashboardInfoTemplate;
 import com.linkedin.metadata.aspect.patch.template.dataflow.DataFlowInfoTemplate;
 import com.linkedin.metadata.aspect.patch.template.datajob.DataJobInfoTemplate;
@@ -113,6 +114,7 @@ private AspectTemplateEngine populateTemplateEngine(Map<String, AspectSpec> aspe
     aspectSpecTemplateMap.put(
         STRUCTURED_PROPERTY_DEFINITION_ASPECT_NAME, new StructuredPropertyDefinitionTemplate());
     aspectSpecTemplateMap.put(FORM_INFO_ASPECT_NAME, new FormInfoTemplate());
+    aspectSpecTemplateMap.put(VERSION_PROPERTIES_ASPECT_NAME, new VersionPropertiesTemplate());
     return new AspectTemplateEngine(aspectSpecTemplateMap);
   }
 
diff --git a/entity-registry/src/testFixtures/java/com/linkedin/test/metadata/aspect/MockAspectRetriever.java b/entity-registry/src/testFixtures/java/com/linkedin/test/metadata/aspect/MockAspectRetriever.java
index 98a6d59004a92a..15f168f74a32df 100644
--- a/entity-registry/src/testFixtures/java/com/linkedin/test/metadata/aspect/MockAspectRetriever.java
+++ b/entity-registry/src/testFixtures/java/com/linkedin/test/metadata/aspect/MockAspectRetriever.java
@@ -20,11 +20,14 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
+import lombok.Getter;
+import lombok.Setter;
 import org.mockito.Mockito;
 
 public class MockAspectRetriever implements CachingAspectRetriever {
   private final Map<Urn, Map<String, Aspect>> data;
   private final Map<Urn, Map<String, SystemAspect>> systemData = new HashMap<>();
+  @Getter @Setter private EntityRegistry entityRegistry;
 
   public MockAspectRetriever(@Nonnull Map<Urn, List<RecordTemplate>> data) {
     this.data =
@@ -60,6 +63,7 @@ public MockAspectRetriever(@Nonnull Map<Urn, List<RecordTemplate>> data) {
                         .build());
       }
     }
+    this.entityRegistry = Mockito.mock(EntityRegistry.class);
   }
 
   public MockAspectRetriever(
@@ -71,6 +75,15 @@ public MockAspectRetriever(Urn propertyUrn, StructuredPropertyDefinition definit
     this(Map.of(propertyUrn, List.of(definition)));
   }
 
+  @Nonnull
+  public Map<Urn, Boolean> entityExists(Set<Urn> urns) {
+    if (urns.isEmpty()) {
+      return Map.of();
+    } else {
+      return urns.stream().collect(Collectors.toMap(urn -> urn, data::containsKey));
+    }
+  }
+
   @Nonnull
   @Override
   public Map<Urn, Map<String, Aspect>> getLatestAspectObjects(
@@ -90,10 +103,4 @@ public Map<Urn, Map<String, SystemAspect>> getLatestSystemAspects(
         .map(urn -> Pair.of(urn, systemData.get(urn)))
         .collect(Collectors.toMap(Pair::getKey, Pair::getValue));
   }
-
-  @Nonnull
-  @Override
-  public EntityRegistry getEntityRegistry() {
-    return Mockito.mock(EntityRegistry.class);
-  }
 }
diff --git a/li-utils/src/main/java/com/linkedin/metadata/Constants.java b/li-utils/src/main/java/com/linkedin/metadata/Constants.java
index 01c33a2530efb5..463376edcdf259 100644
--- a/li-utils/src/main/java/com/linkedin/metadata/Constants.java
+++ b/li-utils/src/main/java/com/linkedin/metadata/Constants.java
@@ -128,6 +128,7 @@ public class Constants {
   public static final String INCIDENTS_SUMMARY_ASPECT_NAME = "incidentsSummary";
   public static final String DOCUMENTATION_ASPECT_NAME = "documentation";
   public static final String DATA_TRANSFORM_LOGIC_ASPECT_NAME = "dataTransformLogic";
+  public static final String VERSION_PROPERTIES_ASPECT_NAME = "versionProperties";
 
   // User
   public static final String CORP_USER_KEY_ASPECT_NAME = "corpUserKey";
@@ -464,6 +465,18 @@ public class Constants {
   // Incidents
   public static final String ENTITY_REF = "entities";
 
+  // Version Set
+  public static final String VERSION_SET_ENTITY_NAME = "versionSet";
+  public static final String VERSION_SET_KEY_ASPECT_NAME = "versionSetKey";
+  public static final String VERSION_SET_PROPERTIES_ASPECT_NAME = "versionSetProperties";
+
+  // Versioning related
+  public static final String INITIAL_VERSION_SORT_ID = "AAAAAAAA";
+  public static final String VERSION_SORT_ID_FIELD_NAME = "versionSortId";
+  public static final String IS_LATEST_FIELD_NAME = "isLatest";
+
+  public static final String DISPLAY_PROPERTIES_ASPECT_NAME = "displayProperties";
+
   // Config
   public static final String ELASTICSEARCH_IMPLEMENTATION_OPENSEARCH = "opensearch";
   public static final String ELASTICSEARCH_IMPLEMENTATION_ELASTICSEARCH = "elasticsearch";
diff --git a/metadata-io/build.gradle b/metadata-io/build.gradle
index 88bbfa2e10c4c1..aab29101b30f71 100644
--- a/metadata-io/build.gradle
+++ b/metadata-io/build.gradle
@@ -71,6 +71,7 @@ dependencies {
   testImplementation project(':datahub-graphql-core')
   testImplementation project(path: ':metadata-integration:java:datahub-client', configuration: 'shadow')
   testImplementation project(':metadata-service:auth-impl')
+  testImplementation project(':li-utils')
   testImplementation externalDependency.testng
   testImplementation externalDependency.h2
   testImplementation externalDependency.mysqlConnector
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/client/EntityClientAspectRetriever.java b/metadata-io/src/main/java/com/linkedin/metadata/client/EntityClientAspectRetriever.java
index 669ec751f87c69..bb9a5ad68c959b 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/client/EntityClientAspectRetriever.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/client/EntityClientAspectRetriever.java
@@ -56,6 +56,25 @@ public Map<Urn, Map<String, Aspect>> getLatestAspectObjects(
     }
   }
 
+  @Nonnull
+  public Map<Urn, Boolean> entityExists(Set<Urn> urns) {
+    if (urns.isEmpty()) {
+      return Map.of();
+    } else {
+      return urns.stream()
+          .collect(
+              Collectors.toMap(
+                  urn -> urn,
+                  urn -> {
+                    try {
+                      return entityClient.exists(systemOperationContext, urn);
+                    } catch (RemoteInvocationException e) {
+                      throw new RuntimeException(e);
+                    }
+                  }));
+    }
+  }
+
   @Nonnull
   @Override
   public Map<Urn, Map<String, SystemAspect>> getLatestSystemAspects(
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceAspectRetriever.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceAspectRetriever.java
index 50cf8af30d606a..6ecf83b874dea0 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceAspectRetriever.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceAspectRetriever.java
@@ -54,6 +54,18 @@ public Map<Urn, Map<String, com.linkedin.entity.Aspect>> getLatestAspectObjects(
     }
   }
 
+  @Nonnull
+  public Map<Urn, Boolean> entityExists(Set<Urn> urns) {
+    if (urns.isEmpty()) {
+      return Map.of();
+    } else {
+      return urns.stream()
+          .collect(
+              Collectors.toMap(
+                  urn -> urn, urn -> entityService.exists(systemOperationContext, urn)));
+    }
+  }
+
   @Nonnull
   @Override
   public Map<Urn, Map<String, SystemAspect>> getLatestSystemAspects(
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/AlphanumericSortIdGenerator.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/AlphanumericSortIdGenerator.java
new file mode 100644
index 00000000000000..40553b338741f8
--- /dev/null
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/AlphanumericSortIdGenerator.java
@@ -0,0 +1,70 @@
+package com.linkedin.metadata.entity.versioning;
+
+public class AlphanumericSortIdGenerator {
+
+  private AlphanumericSortIdGenerator() {}
+
+  private static final int STRING_LENGTH = 8;
+  private static final char[] ALLOWED_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".toCharArray();
+
+  /**
+   * Increments an 8-character alphanumeric string. For example: "AAAAAAAA" -> "AAAAAAAB" "AAAAAAAZ"
+   * -> "AAAAAABA"
+   *
+   * @param currentId The current 8-character string
+   * @return The next string in sequence
+   * @throws IllegalArgumentException if input string is not 8 characters or contains invalid
+   *     characters
+   */
+  public static String increment(String currentId) {
+    if (currentId == null || currentId.length() != STRING_LENGTH) {
+      throw new IllegalArgumentException("Input string must be exactly 8 characters long");
+    }
+
+    // Convert string to char array for manipulation
+    char[] currentIdChars = currentId.toCharArray();
+
+    // Validate input characters
+    for (char c : currentIdChars) {
+      if (getCharIndex(c) == -1) {
+        throw new IllegalArgumentException("Invalid character in input string: " + c);
+      }
+    }
+
+    // Start from rightmost position
+    for (int i = STRING_LENGTH - 1; i >= 0; i--) {
+      int currentCharIndex = getCharIndex(currentIdChars[i]);
+
+      // If current character is not the last allowed character,
+      // simply increment it and we're done
+      if (currentCharIndex < ALLOWED_CHARS.length - 1) {
+        currentIdChars[i] = ALLOWED_CHARS[currentCharIndex + 1];
+        return new String(currentIdChars);
+      }
+
+      // If we're here, we need to carry over to next position
+      currentIdChars[i] = ALLOWED_CHARS[0];
+
+      // If we're at the leftmost position and need to carry,
+      // we've reached maximum value and need to wrap around
+      if (i == 0) {
+        return "AAAAAAAA";
+      }
+    }
+
+    // Should never reach here
+    throw new RuntimeException("Unexpected error in increment operation");
+  }
+
+  /**
+   * Gets the index of a character in the ALLOWED_CHARS array. Returns -1 if character is not found.
+   */
+  private static int getCharIndex(char c) {
+    for (int i = 0; i < ALLOWED_CHARS.length; i++) {
+      if (ALLOWED_CHARS[i] == c) {
+        return i;
+      }
+    }
+    return -1;
+  }
+}
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/EntityVersioningServiceImpl.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/EntityVersioningServiceImpl.java
new file mode 100644
index 00000000000000..48f5a00e9e8d5a
--- /dev/null
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/EntityVersioningServiceImpl.java
@@ -0,0 +1,356 @@
+package com.linkedin.metadata.entity.versioning;
+
+import static com.linkedin.metadata.Constants.INITIAL_VERSION_SORT_ID;
+import static com.linkedin.metadata.Constants.VERSION_PROPERTIES_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.VERSION_SET_ENTITY_NAME;
+import static com.linkedin.metadata.Constants.VERSION_SET_KEY_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.VERSION_SET_PROPERTIES_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.VERSION_SORT_ID_FIELD_NAME;
+import static com.linkedin.metadata.aspect.validation.ConditionalWriteValidator.HTTP_HEADER_IF_VERSION_MATCH;
+
+import com.datahub.util.RecordUtils;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.linkedin.common.AuditStamp;
+import com.linkedin.common.MetadataAttribution;
+import com.linkedin.common.VersionProperties;
+import com.linkedin.common.VersionTag;
+import com.linkedin.common.urn.CorpuserUrn;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.data.template.SetMode;
+import com.linkedin.data.template.StringMap;
+import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.metadata.aspect.AspectRetriever;
+import com.linkedin.metadata.aspect.SystemAspect;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.entity.IngestResult;
+import com.linkedin.metadata.entity.RollbackResult;
+import com.linkedin.metadata.entity.RollbackRunResult;
+import com.linkedin.metadata.entity.SearchRetriever;
+import com.linkedin.metadata.entity.ebean.batch.AspectsBatchImpl;
+import com.linkedin.metadata.key.VersionSetKey;
+import com.linkedin.metadata.query.filter.Condition;
+import com.linkedin.metadata.query.filter.SortCriterion;
+import com.linkedin.metadata.query.filter.SortOrder;
+import com.linkedin.metadata.search.ScrollResult;
+import com.linkedin.metadata.search.SearchEntity;
+import com.linkedin.metadata.search.SearchEntityArray;
+import com.linkedin.metadata.search.utils.QueryUtils;
+import com.linkedin.metadata.utils.CriterionUtils;
+import com.linkedin.metadata.utils.EntityKeyUtils;
+import com.linkedin.metadata.utils.GenericRecordUtils;
+import com.linkedin.mxe.MetadataChangeProposal;
+import com.linkedin.versionset.VersionSetProperties;
+import com.linkedin.versionset.VersioningScheme;
+import io.datahubproject.metadata.context.OperationContext;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class EntityVersioningServiceImpl implements EntityVersioningService {
+
+  private final EntityService<?> entityService;
+
+  public EntityVersioningServiceImpl(EntityService<?> entityService) {
+    this.entityService = entityService;
+  }
+
+  /**
+   * Generates a new set of VersionProperties for the latest version and links it to the specified
+   * version set. If the specified version set does not yet exist, will create it. Order of
+   * operations here is important: 1. Create initial Version Set if necessary, do not generate
+   * Version Set Properties 2. Create Version Properties for specified entity. If this aspect
+   * already exists will fail. 3. Generate version properties with the properly set latest version
+   * Will eventually want to add in the scheme here as a parameter
+   *
+   * @return ingestResult -> the results of the ingested linked version
+   */
+  @Override
+  public List<IngestResult> linkLatestVersion(
+      OperationContext opContext,
+      Urn versionSet,
+      Urn newLatestVersion,
+      VersionPropertiesInput inputProperties) {
+    List<MetadataChangeProposal> proposals = new ArrayList<>();
+    AspectRetriever aspectRetriever = opContext.getAspectRetriever();
+    String sortId;
+    Long versionSetConstraint;
+    Long versionPropertiesConstraint;
+    VersionSetKey versionSetKey =
+        (VersionSetKey)
+            EntityKeyUtils.convertUrnToEntityKey(
+                versionSet, opContext.getEntityRegistryContext().getKeyAspectSpec(versionSet));
+    if (!versionSetKey.getEntityType().equals(newLatestVersion.getEntityType())) {
+      throw new IllegalArgumentException(
+          "Entity type must match Version Set's specified type: "
+              + versionSetKey.getEntityType()
+              + " invalid type: "
+              + newLatestVersion.getEntityType());
+    }
+    if (!aspectRetriever.entityExists(ImmutableSet.of(versionSet)).get(versionSet)) {
+      MetadataChangeProposal versionSetKeyProposal = new MetadataChangeProposal();
+      versionSetKeyProposal.setEntityUrn(versionSet);
+      versionSetKeyProposal.setEntityType(VERSION_SET_ENTITY_NAME);
+      versionSetKeyProposal.setAspectName(VERSION_SET_KEY_ASPECT_NAME);
+      versionSetKeyProposal.setAspect(GenericRecordUtils.serializeAspect(versionSetKey));
+      versionSetKeyProposal.setChangeType(ChangeType.CREATE_ENTITY);
+      entityService.ingestProposal(
+          opContext, versionSetKeyProposal, opContext.getAuditStamp(), false);
+
+      sortId = INITIAL_VERSION_SORT_ID;
+      versionSetConstraint = -1L;
+      versionPropertiesConstraint = -1L;
+    } else {
+      SystemAspect versionSetPropertiesAspect =
+          aspectRetriever.getLatestSystemAspect(versionSet, VERSION_SET_PROPERTIES_ASPECT_NAME);
+      VersionSetProperties versionSetProperties =
+          RecordUtils.toRecordTemplate(
+              VersionSetProperties.class, versionSetPropertiesAspect.getRecordTemplate().data());
+      versionSetConstraint =
+          versionSetPropertiesAspect
+              .getSystemMetadataVersion()
+              .orElse(versionSetPropertiesAspect.getVersion());
+      SystemAspect latestVersion =
+          aspectRetriever.getLatestSystemAspect(
+              versionSetProperties.getLatest(), VERSION_PROPERTIES_ASPECT_NAME);
+      VersionProperties latestVersionProperties =
+          RecordUtils.toRecordTemplate(
+              VersionProperties.class, latestVersion.getRecordTemplate().data());
+      versionPropertiesConstraint =
+          latestVersion.getSystemMetadataVersion().orElse(latestVersion.getVersion());
+      // When more impls for versioning scheme are set up, this will need to be resolved to the
+      // correct scheme generation strategy
+      sortId = AlphanumericSortIdGenerator.increment(latestVersionProperties.getSortId());
+    }
+
+    SystemAspect currentVersionPropertiesAspect =
+        aspectRetriever.getLatestSystemAspect(newLatestVersion, VERSION_PROPERTIES_ASPECT_NAME);
+    if (currentVersionPropertiesAspect != null) {
+      VersionProperties currentVersionProperties =
+          RecordUtils.toRecordTemplate(
+              VersionProperties.class, currentVersionPropertiesAspect.getRecordTemplate().data());
+      if (currentVersionProperties.getVersionSet().equals(versionSet)) {
+        return new ArrayList<>();
+      } else {
+        throw new IllegalStateException(
+            String.format(
+                "Version already exists for specified entity: %s for a different Version Set: %s",
+                newLatestVersion, currentVersionProperties.getVersionSet()));
+      }
+    }
+
+    VersionTag versionTag = new VersionTag();
+    versionTag.setVersionTag(inputProperties.getVersion());
+    MetadataAttribution metadataAttribution = new MetadataAttribution();
+    metadataAttribution.setActor(opContext.getActorContext().getActorUrn());
+    metadataAttribution.setTime(System.currentTimeMillis());
+    versionTag.setMetadataAttribution(metadataAttribution);
+    VersionProperties versionProperties =
+        new VersionProperties()
+            .setVersionSet(versionSet)
+            .setComment(inputProperties.getComment(), SetMode.IGNORE_NULL)
+            .setVersion(versionTag)
+            .setMetadataCreatedTimestamp(opContext.getAuditStamp())
+            .setSortId(sortId);
+    if (inputProperties.getSourceCreationTimestamp() != null) {
+
+      AuditStamp sourceCreatedAuditStamp =
+          new AuditStamp().setTime(inputProperties.getSourceCreationTimestamp());
+      Urn actor = null;
+      if (inputProperties.getSourceCreator() != null) {
+        actor = new CorpuserUrn(inputProperties.getSourceCreator());
+      }
+      sourceCreatedAuditStamp.setActor(UrnUtils.getActorOrDefault(actor));
+
+      versionProperties.setSourceCreatedTimestamp(sourceCreatedAuditStamp);
+    }
+    MetadataChangeProposal versionPropertiesProposal = new MetadataChangeProposal();
+    versionPropertiesProposal.setEntityUrn(newLatestVersion);
+    versionPropertiesProposal.setEntityType(newLatestVersion.getEntityType());
+    versionPropertiesProposal.setAspectName(VERSION_PROPERTIES_ASPECT_NAME);
+    versionPropertiesProposal.setAspect(GenericRecordUtils.serializeAspect(versionProperties));
+    versionPropertiesProposal.setChangeType(ChangeType.UPSERT);
+    StringMap headerMap = new StringMap();
+    headerMap.put(HTTP_HEADER_IF_VERSION_MATCH, versionPropertiesConstraint.toString());
+    versionPropertiesProposal.setChangeType(ChangeType.UPSERT);
+    proposals.add(versionPropertiesProposal);
+
+    // Might want to refactor this to a Patch w/ Create if not exists logic if more properties get
+    // added
+    // to Version Set Properties
+    VersionSetProperties versionSetProperties =
+        new VersionSetProperties()
+            .setVersioningScheme(
+                VersioningScheme
+                    .ALPHANUMERIC_GENERATED_BY_DATAHUB) // Only one available, will need to add to
+            // input properties once more are added.
+            .setLatest(newLatestVersion);
+    MetadataChangeProposal versionSetPropertiesProposal = new MetadataChangeProposal();
+    versionSetPropertiesProposal.setEntityUrn(versionSet);
+    versionSetPropertiesProposal.setEntityType(VERSION_SET_ENTITY_NAME);
+    versionSetPropertiesProposal.setAspectName(VERSION_SET_PROPERTIES_ASPECT_NAME);
+    versionSetPropertiesProposal.setAspect(
+        GenericRecordUtils.serializeAspect(versionSetProperties));
+    versionSetPropertiesProposal.setChangeType(ChangeType.UPSERT);
+    StringMap versionSetHeaderMap = new StringMap();
+    versionSetHeaderMap.put(HTTP_HEADER_IF_VERSION_MATCH, versionSetConstraint.toString());
+    versionSetPropertiesProposal.setHeaders(versionSetHeaderMap);
+    proposals.add(versionSetPropertiesProposal);
+
+    return entityService.ingestProposal(
+        opContext,
+        AspectsBatchImpl.builder()
+            .mcps(proposals, opContext.getAuditStamp(), opContext.getRetrieverContext())
+            .build(),
+        false);
+  }
+
+  /**
+   * Unlinks a version from a version set. Will attempt to set up the previous version as the new
+   * latest. This fully removes the version properties and unversions the specified entity.
+   *
+   * @param opContext operational context containing various information about the current execution
+   * @param linkedVersion the currently linked latest versioned entity urn
+   * @return the deletion result
+   */
+  @Override
+  public List<RollbackResult> unlinkVersion(
+      OperationContext opContext, Urn versionSet, Urn linkedVersion) {
+    List<RollbackResult> deletedAspects = new ArrayList<>();
+    AspectRetriever aspectRetriever = opContext.getAspectRetriever();
+    SystemAspect linkedVersionPropertiesAspect =
+        aspectRetriever.getLatestSystemAspect(linkedVersion, VERSION_PROPERTIES_ASPECT_NAME);
+    // Not currently versioned, do nothing
+    if (linkedVersionPropertiesAspect == null) {
+      return deletedAspects;
+    }
+    VersionProperties linkedVersionProperties =
+        RecordUtils.toRecordTemplate(
+            VersionProperties.class, linkedVersionPropertiesAspect.getRecordTemplate().data());
+    Urn versionSetUrn = linkedVersionProperties.getVersionSet();
+    if (!versionSet.equals(versionSetUrn)) {
+      throw new IllegalArgumentException(
+          String.format(
+              "Version is not linked to specified version set: %s but is linked to: %s",
+              versionSet, versionSetUrn));
+    }
+    // Delete latest version properties
+    entityService
+        .deleteAspect(
+            opContext,
+            linkedVersion.toString(),
+            VERSION_PROPERTIES_ASPECT_NAME,
+            Collections.emptyMap(),
+            true)
+        .ifPresent(deletedAspects::add);
+
+    // Get Version Set details
+    VersionSetKey versionSetKey =
+        (VersionSetKey)
+            EntityKeyUtils.convertUrnToEntityKey(
+                versionSetUrn,
+                opContext.getEntityRegistryContext().getKeyAspectSpec(versionSetUrn));
+    SearchRetriever searchRetriever = opContext.getRetrieverContext().getSearchRetriever();
+
+    // Find current latest version and previous
+    ScrollResult linkedVersions =
+        searchRetriever.scroll(
+            ImmutableList.of(versionSetKey.getEntityType()),
+            QueryUtils.newConjunctiveFilter(
+                CriterionUtils.buildCriterion(
+                    "versionSet", Condition.EQUAL, versionSetUrn.toString())),
+            null,
+            2,
+            ImmutableList.of(
+                new SortCriterion()
+                    .setField(VERSION_SORT_ID_FIELD_NAME)
+                    .setOrder(SortOrder.DESCENDING)),
+            SearchRetriever.RETRIEVER_SEARCH_FLAGS_NO_CACHE_ALL_VERSIONS);
+    String updatedLatestVersionUrn = null;
+
+    SearchEntityArray linkedEntities = linkedVersions.getEntities();
+    SystemAspect versionSetPropertiesAspect =
+        aspectRetriever.getLatestSystemAspect(versionSetUrn, VERSION_SET_PROPERTIES_ASPECT_NAME);
+    if (versionSetPropertiesAspect == null) {
+      throw new IllegalStateException(
+          String.format(
+              "Version Set Properties must exist if entity version exists: %s", versionSetUrn));
+    }
+    VersionSetProperties versionSetProperties =
+        RecordUtils.toRecordTemplate(
+            VersionSetProperties.class, versionSetPropertiesAspect.getRecordTemplate().data());
+    long versionConstraint =
+        versionSetPropertiesAspect
+            .getSystemMetadataVersion()
+            .orElse(versionSetPropertiesAspect.getVersion());
+    boolean isLatest = linkedVersion.equals(versionSetProperties.getLatest());
+
+    if (linkedEntities.size() == 2 && isLatest) {
+      // If the version to unlink is the same as the last search result and is currently the latest
+      // based on SQL, set to one immediately before.
+      // Otherwise set to most current one in search results assuming we have not gotten the index
+      // update for a recent update to latest.
+      // Does assume that there are not multiple index updates waiting in the queue so rapid fire
+      // updates intermixed with deletes should be avoided.
+      SearchEntity maybeLatestVersion = linkedEntities.get(0);
+      if (maybeLatestVersion.getEntity().equals(linkedVersion)) {
+        SearchEntity priorLatestVersion = linkedEntities.get(1);
+        updatedLatestVersionUrn = priorLatestVersion.getEntity().toString();
+      } else {
+        updatedLatestVersionUrn = maybeLatestVersion.getEntity().toString();
+      }
+
+    } else if (linkedEntities.size() == 1 && isLatest) {
+      // Missing a version, if that version is not the one being unlinked then set as latest
+      // version. Same reasoning as above
+      SearchEntity maybePriorLatestVersion = linkedEntities.get(0);
+      if (!linkedVersion.equals(maybePriorLatestVersion.getEntity())) {
+        updatedLatestVersionUrn = maybePriorLatestVersion.getEntity().toString();
+      } else {
+        // Delete Version Set if we are removing the last version
+        // TODO: Conditional deletes impl + only do the delete if version match
+        RollbackRunResult deleteResult = entityService.deleteUrn(opContext, versionSetUrn);
+        deletedAspects.addAll(deleteResult.getRollbackResults());
+      }
+    }
+
+    if (updatedLatestVersionUrn != null) {
+
+      // Might want to refactor this to a Patch w/ Create if not exists logic if more properties
+      // get added
+      // to Version Set Properties
+      VersionSetProperties newVersionSetProperties =
+          new VersionSetProperties()
+              .setVersioningScheme(
+                  VersioningScheme
+                      .ALPHANUMERIC_GENERATED_BY_DATAHUB) // Only one available, will need to add
+              // to input properties once more are
+              // added.
+              .setLatest(UrnUtils.getUrn(updatedLatestVersionUrn));
+      MetadataChangeProposal versionSetPropertiesProposal = new MetadataChangeProposal();
+      versionSetPropertiesProposal.setEntityUrn(versionSetUrn);
+      versionSetPropertiesProposal.setEntityType(VERSION_SET_ENTITY_NAME);
+      versionSetPropertiesProposal.setAspectName(VERSION_SET_PROPERTIES_ASPECT_NAME);
+      versionSetPropertiesProposal.setAspect(
+          GenericRecordUtils.serializeAspect(newVersionSetProperties));
+      versionSetPropertiesProposal.setChangeType(ChangeType.UPSERT);
+      StringMap headerMap = new StringMap();
+      headerMap.put(HTTP_HEADER_IF_VERSION_MATCH, Long.toString(versionConstraint));
+      versionSetPropertiesProposal.setHeaders(headerMap);
+      entityService.ingestProposal(
+          opContext,
+          AspectsBatchImpl.builder()
+              .mcps(
+                  ImmutableList.of(versionSetPropertiesProposal),
+                  opContext.getAuditStamp(),
+                  opContext.getRetrieverContext())
+              .build(),
+          false);
+    }
+
+    return deletedAspects;
+  }
+}
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/sideeffects/VersionSetSideEffect.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/sideeffects/VersionSetSideEffect.java
new file mode 100644
index 00000000000000..7e9692841c79ae
--- /dev/null
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/sideeffects/VersionSetSideEffect.java
@@ -0,0 +1,137 @@
+package com.linkedin.metadata.entity.versioning.sideeffects;
+
+import static com.linkedin.metadata.Constants.VERSION_PROPERTIES_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.VERSION_SET_PROPERTIES_ASPECT_NAME;
+
+import com.linkedin.common.urn.Urn;
+import com.linkedin.metadata.aspect.RetrieverContext;
+import com.linkedin.metadata.aspect.batch.ChangeMCP;
+import com.linkedin.metadata.aspect.batch.MCLItem;
+import com.linkedin.metadata.aspect.batch.MCPItem;
+import com.linkedin.metadata.aspect.patch.GenericJsonPatch;
+import com.linkedin.metadata.aspect.patch.PatchOperationType;
+import com.linkedin.metadata.aspect.plugins.config.AspectPluginConfig;
+import com.linkedin.metadata.aspect.plugins.hooks.MCPSideEffect;
+import com.linkedin.metadata.entity.ebean.batch.PatchItemImpl;
+import com.linkedin.metadata.models.EntitySpec;
+import com.linkedin.versionset.VersionSetProperties;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Stream;
+import javax.annotation.Nonnull;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * Side effect that updates the isLatest property for the referenced versioned entity's Version
+ * Properties aspect.
+ */
+@Slf4j
+@Getter
+@Setter
+@Accessors(chain = true)
+public class VersionSetSideEffect extends MCPSideEffect {
+  @Nonnull private AspectPluginConfig config;
+
+  @Override
+  protected Stream<ChangeMCP> applyMCPSideEffect(
+      Collection<ChangeMCP> changeMCPS, @Nonnull RetrieverContext retrieverContext) {
+    return Stream.of();
+  }
+
+  @Override
+  protected Stream<MCPItem> postMCPSideEffect(
+      Collection<MCLItem> mclItems, @Nonnull RetrieverContext retrieverContext) {
+    return mclItems.stream().flatMap(item -> updateLatest(item, retrieverContext));
+  }
+
+  private static Stream<MCPItem> updateLatest(
+      MCLItem mclItem, @Nonnull RetrieverContext retrieverContext) {
+
+    if (VERSION_SET_PROPERTIES_ASPECT_NAME.equals(mclItem.getAspectName())) {
+      List<MCPItem> mcpItems = new ArrayList<>();
+      VersionSetProperties versionSetProperties = mclItem.getAspect(VersionSetProperties.class);
+      if (versionSetProperties == null) {
+        log.error("Unable to process version set properties for urn: {}", mclItem.getUrn());
+        return Stream.empty();
+      }
+      // Set old latest isLatest to false, set new latest isLatest to true
+      // This side effect assumes the entity is already versioned, if it is not yet versioned it
+      // will fail due
+      // to not having set default values for the aspect. This creates an implicit ordering of when
+      // aspects should be
+      // updated. Version Properties first, then Version Set Properties.
+      Urn newLatest = versionSetProperties.getLatest();
+
+      VersionSetProperties previousVersionSetProperties =
+          mclItem.getPreviousAspect(VersionSetProperties.class);
+      if (previousVersionSetProperties != null) {
+        Urn previousLatest = previousVersionSetProperties.getLatest();
+        if (!newLatest.equals(previousLatest)
+            && retrieverContext
+                .getAspectRetriever()
+                .entityExists(Collections.singleton(previousLatest))
+                .getOrDefault(previousLatest, false)) {
+          EntitySpec entitySpec =
+              retrieverContext
+                  .getAspectRetriever()
+                  .getEntityRegistry()
+                  .getEntitySpec(previousLatest.getEntityType());
+          GenericJsonPatch.PatchOp previousPatch = new GenericJsonPatch.PatchOp();
+          previousPatch.setOp(PatchOperationType.ADD.getValue());
+          previousPatch.setPath("/isLatest");
+          previousPatch.setValue(false);
+          mcpItems.add(
+              PatchItemImpl.builder()
+                  .urn(previousLatest)
+                  .entitySpec(entitySpec)
+                  .aspectName(VERSION_PROPERTIES_ASPECT_NAME)
+                  .aspectSpec(entitySpec.getAspectSpec(VERSION_PROPERTIES_ASPECT_NAME))
+                  .patch(
+                      GenericJsonPatch.builder()
+                          .patch(List.of(previousPatch))
+                          .build()
+                          .getJsonPatch())
+                  .auditStamp(mclItem.getAuditStamp())
+                  .systemMetadata(mclItem.getSystemMetadata())
+                  .build(retrieverContext.getAspectRetriever().getEntityRegistry()));
+        }
+      }
+
+      // Explicitly error here to avoid downstream patch error with less context
+      if (retrieverContext
+              .getAspectRetriever()
+              .getLatestAspectObject(newLatest, VERSION_PROPERTIES_ASPECT_NAME)
+          == null) {
+        throw new UnsupportedOperationException(
+            "Cannot set latest version to unversioned entity: " + newLatest);
+      }
+
+      EntitySpec entitySpec =
+          retrieverContext
+              .getAspectRetriever()
+              .getEntityRegistry()
+              .getEntitySpec(newLatest.getEntityType());
+      GenericJsonPatch.PatchOp currentPatch = new GenericJsonPatch.PatchOp();
+      currentPatch.setOp(PatchOperationType.ADD.getValue());
+      currentPatch.setPath("/isLatest");
+      currentPatch.setValue(true);
+      mcpItems.add(
+          PatchItemImpl.builder()
+              .urn(newLatest)
+              .entitySpec(entitySpec)
+              .aspectName(VERSION_PROPERTIES_ASPECT_NAME)
+              .aspectSpec(entitySpec.getAspectSpec(VERSION_PROPERTIES_ASPECT_NAME))
+              .patch(GenericJsonPatch.builder().patch(List.of(currentPatch)).build().getJsonPatch())
+              .auditStamp(mclItem.getAuditStamp())
+              .systemMetadata(mclItem.getSystemMetadata())
+              .build(retrieverContext.getAspectRetriever().getEntityRegistry()));
+      return mcpItems.stream();
+    }
+    return Stream.empty();
+  }
+}
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/validation/VersionPropertiesValidator.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/validation/VersionPropertiesValidator.java
new file mode 100644
index 00000000000000..4d29cc254c1ba6
--- /dev/null
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/validation/VersionPropertiesValidator.java
@@ -0,0 +1,158 @@
+package com.linkedin.metadata.entity.versioning.validation;
+
+import static com.linkedin.metadata.Constants.VERSION_PROPERTIES_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.VERSION_SET_KEY_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.VERSION_SET_PROPERTIES_ASPECT_NAME;
+
+import com.datahub.util.RecordUtils;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableSet;
+import com.linkedin.common.VersionProperties;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.entity.Aspect;
+import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.metadata.aspect.RetrieverContext;
+import com.linkedin.metadata.aspect.batch.BatchItem;
+import com.linkedin.metadata.aspect.batch.ChangeMCP;
+import com.linkedin.metadata.aspect.plugins.config.AspectPluginConfig;
+import com.linkedin.metadata.aspect.plugins.validation.AspectPayloadValidator;
+import com.linkedin.metadata.aspect.plugins.validation.AspectValidationException;
+import com.linkedin.metadata.aspect.plugins.validation.ValidationExceptionCollection;
+import com.linkedin.metadata.entity.ebean.batch.PatchItemImpl;
+import com.linkedin.metadata.key.VersionSetKey;
+import com.linkedin.versionset.VersionSetProperties;
+import com.linkedin.versionset.VersioningScheme;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.annotation.Nonnull;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+
+@Setter
+@Getter
+@Slf4j
+@Accessors(chain = true)
+public class VersionPropertiesValidator extends AspectPayloadValidator {
+
+  @Nonnull private AspectPluginConfig config;
+
+  private static final Set<ChangeType> SHOULD_VALIDATE_PROPOSED =
+      ImmutableSet.of(ChangeType.UPDATE, ChangeType.UPSERT, ChangeType.CREATE);
+
+  @Override
+  protected Stream<AspectValidationException> validateProposedAspects(
+      @Nonnull Collection<? extends BatchItem> mcpItems,
+      @Nonnull RetrieverContext retrieverContext) {
+    return validatePropertiesProposals(
+        mcpItems.stream()
+            .filter(mcpItem -> VERSION_PROPERTIES_ASPECT_NAME.equals(mcpItem.getAspectName()))
+            .filter(mcpItem -> SHOULD_VALIDATE_PROPOSED.contains(mcpItem.getChangeType()))
+            .collect(Collectors.toList()));
+  }
+
+  @Override
+  protected Stream<AspectValidationException> validatePreCommitAspects(
+      @Nonnull Collection<ChangeMCP> changeMCPs, @Nonnull RetrieverContext retrieverContext) {
+    return validatePropertiesUpserts(
+        changeMCPs.stream()
+            .filter(changeMCP -> VERSION_PROPERTIES_ASPECT_NAME.equals(changeMCP.getAspectName()))
+            .collect(Collectors.toList()),
+        retrieverContext);
+  }
+
+  @VisibleForTesting
+  public static Stream<AspectValidationException> validatePropertiesUpserts(
+      @Nonnull Collection<? extends BatchItem> mcpItems,
+      @Nonnull RetrieverContext retrieverContext) {
+    ValidationExceptionCollection exceptions = ValidationExceptionCollection.newCollection();
+    for (BatchItem mcpItem : mcpItems) {
+      VersionProperties versionProperties = mcpItem.getAspect(VersionProperties.class);
+      // Validate Version Set entity type
+      Urn versionSetUrn = versionProperties.getVersionSet();
+      Map<String, Aspect> aspects =
+          retrieverContext
+              .getAspectRetriever()
+              .getLatestAspectObjects(
+                  Collections.singleton(versionSetUrn),
+                  ImmutableSet.of(VERSION_SET_KEY_ASPECT_NAME, VERSION_SET_PROPERTIES_ASPECT_NAME))
+              .get(versionSetUrn);
+      if (aspects == null || aspects.isEmpty()) {
+        exceptions.addException(mcpItem, "Version Set specified does not exist: " + versionSetUrn);
+        continue;
+      }
+      Optional<Aspect> keyAspect = Optional.ofNullable(aspects.get(VERSION_SET_KEY_ASPECT_NAME));
+      if (keyAspect.isPresent()) {
+        VersionSetKey versionSetKey =
+            RecordUtils.toRecordTemplate(VersionSetKey.class, keyAspect.get().data());
+        if (!mcpItem.getEntitySpec().getName().equals(versionSetKey.getEntityType())) {
+          exceptions.addException(
+              mcpItem,
+              "Version Set specified entity type does not match, expected type: "
+                  + versionSetKey.getEntityType());
+        }
+
+        // Validate sort ID scheme
+        String sortId = versionProperties.getSortId();
+        Optional<Aspect> versionSetPropertiesAspect =
+            Optional.ofNullable(aspects.get(VERSION_SET_PROPERTIES_ASPECT_NAME));
+        // Validate sort id matches scheme if version set properties exist
+        if (versionSetPropertiesAspect.isPresent()) {
+          VersionSetProperties versionSetProperties =
+              RecordUtils.toRecordTemplate(
+                  VersionSetProperties.class, versionSetPropertiesAspect.get().data());
+          VersioningScheme versioningScheme = versionSetProperties.getVersioningScheme();
+          switch (versioningScheme) {
+            case ALPHANUMERIC_GENERATED_BY_DATAHUB:
+              validateDataHubGeneratedScheme(sortId, exceptions, mcpItem);
+              break;
+            default:
+              exceptions.addException(mcpItem, "Unsupported scheme type: " + versioningScheme);
+          }
+        }
+      } else {
+        exceptions.addException(mcpItem, "Version Set specified does not exist: " + versionSetUrn);
+      }
+    }
+    return exceptions.streamAllExceptions();
+  }
+
+  private static void validateDataHubGeneratedScheme(
+      String sortId, ValidationExceptionCollection exceptions, BatchItem mcpItem) {
+    if (!(sortId.length() == 8
+        && StringUtils.isAllUpperCase(sortId)
+        && StringUtils.isAlpha(sortId))) {
+      exceptions.addException(
+          mcpItem,
+          "Invalid sortID for Versioning Scheme. ID: "
+              + sortId
+              + " Scheme: "
+              + VersioningScheme.ALPHANUMERIC_GENERATED_BY_DATAHUB);
+    }
+  }
+
+  @VisibleForTesting
+  public static Stream<AspectValidationException> validatePropertiesProposals(
+      @Nonnull Collection<? extends BatchItem> mcpItems) {
+    ValidationExceptionCollection exceptions = ValidationExceptionCollection.newCollection();
+    for (BatchItem mcpItem : mcpItems) {
+      if (mcpItem instanceof PatchItemImpl) {
+        throw new IllegalStateException("Patch item must have change type of PATCH.");
+      }
+      VersionProperties versionProperties = mcpItem.getAspect(VersionProperties.class);
+      // Validate isLatest not set
+      if (versionProperties.hasIsLatest()) {
+        exceptions.addException(
+            mcpItem, "IsLatest should not be specified, this is a computed field.");
+      }
+    }
+    return exceptions.streamAllExceptions();
+  }
+}
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/validation/VersionSetPropertiesValidator.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/validation/VersionSetPropertiesValidator.java
new file mode 100644
index 00000000000000..8a7795f29ccfe0
--- /dev/null
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/validation/VersionSetPropertiesValidator.java
@@ -0,0 +1,80 @@
+package com.linkedin.metadata.entity.versioning.validation;
+
+import static com.linkedin.metadata.Constants.VERSION_SET_PROPERTIES_ASPECT_NAME;
+
+import com.datahub.util.RecordUtils;
+import com.google.common.annotations.VisibleForTesting;
+import com.linkedin.entity.Aspect;
+import com.linkedin.metadata.aspect.RetrieverContext;
+import com.linkedin.metadata.aspect.batch.BatchItem;
+import com.linkedin.metadata.aspect.batch.ChangeMCP;
+import com.linkedin.metadata.aspect.plugins.config.AspectPluginConfig;
+import com.linkedin.metadata.aspect.plugins.validation.AspectPayloadValidator;
+import com.linkedin.metadata.aspect.plugins.validation.AspectValidationException;
+import com.linkedin.metadata.aspect.plugins.validation.ValidationExceptionCollection;
+import com.linkedin.versionset.VersionSetProperties;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.annotation.Nonnull;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+
+@Setter
+@Getter
+@Slf4j
+@Accessors(chain = true)
+public class VersionSetPropertiesValidator extends AspectPayloadValidator {
+
+  @Nonnull private AspectPluginConfig config;
+
+  @Override
+  protected Stream<AspectValidationException> validateProposedAspects(
+      @Nonnull Collection<? extends BatchItem> mcpItems,
+      @Nonnull RetrieverContext retrieverContext) {
+    return validatePropertiesUpserts(
+        mcpItems.stream()
+            .filter(i -> VERSION_SET_PROPERTIES_ASPECT_NAME.equals(i.getAspectName()))
+            .collect(Collectors.toList()),
+        retrieverContext);
+  }
+
+  @Override
+  protected Stream<AspectValidationException> validatePreCommitAspects(
+      @Nonnull Collection<ChangeMCP> changeMCPs, @Nonnull RetrieverContext retrieverContext) {
+    return Stream.empty();
+  }
+
+  @VisibleForTesting
+  public static Stream<AspectValidationException> validatePropertiesUpserts(
+      @Nonnull Collection<? extends BatchItem> mcpItems,
+      @Nonnull RetrieverContext retrieverContext) {
+    ValidationExceptionCollection exceptions = ValidationExceptionCollection.newCollection();
+    for (BatchItem mcpItem : mcpItems) {
+      VersionSetProperties versionSetProperties = mcpItem.getAspect(VersionSetProperties.class);
+      Optional<Aspect> aspect =
+          Optional.ofNullable(
+              retrieverContext
+                  .getAspectRetriever()
+                  .getLatestAspectObject(mcpItem.getUrn(), VERSION_SET_PROPERTIES_ASPECT_NAME));
+      if (aspect.isPresent()) {
+        VersionSetProperties previousVersionSetProperties =
+            RecordUtils.toRecordTemplate(VersionSetProperties.class, aspect.get().data());
+        if (!previousVersionSetProperties
+            .getVersioningScheme()
+            .equals(versionSetProperties.getVersioningScheme())) {
+          exceptions.addException(
+              mcpItem,
+              "Versioning Scheme cannot change. Expected Scheme: "
+                  + previousVersionSetProperties.getVersioningScheme()
+                  + " Provided Scheme: "
+                  + versionSetProperties.getVersioningScheme());
+        }
+      }
+    }
+    return exceptions.streamAllExceptions();
+  }
+}
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/SearchServiceSearchRetriever.java b/metadata-io/src/main/java/com/linkedin/metadata/search/SearchServiceSearchRetriever.java
index 8d7548e0ba90a1..dae119beec4a7e 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/SearchServiceSearchRetriever.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/SearchServiceSearchRetriever.java
@@ -6,7 +6,9 @@
 import com.linkedin.metadata.query.filter.SortCriterion;
 import com.linkedin.metadata.query.filter.SortOrder;
 import io.datahubproject.metadata.context.OperationContext;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import lombok.Builder;
@@ -16,15 +18,6 @@
 @Getter
 @Builder
 public class SearchServiceSearchRetriever implements SearchRetriever {
-  private static final SearchFlags RETRIEVER_SEARCH_FLAGS =
-      new SearchFlags()
-          .setFulltext(false)
-          .setMaxAggValues(20)
-          .setSkipCache(false)
-          .setSkipAggregates(true)
-          .setSkipHighlighting(true)
-          .setIncludeSoftDeleted(false)
-          .setIncludeRestricted(false);
 
   @Setter private OperationContext systemOperationContext;
   private final SearchService searchService;
@@ -34,16 +27,24 @@ public ScrollResult scroll(
       @Nonnull List<String> entities,
       @Nullable Filter filters,
       @Nullable String scrollId,
-      int count) {
-    SortCriterion urnSort = new SortCriterion();
-    urnSort.setField("urn");
-    urnSort.setOrder(SortOrder.ASCENDING);
+      int count,
+      List<SortCriterion> sortCriteria,
+      @Nullable SearchFlags searchFlags) {
+    List<SortCriterion> finalCriteria = new ArrayList<>(sortCriteria);
+    if (sortCriteria.stream().noneMatch(sortCriterion -> "urn".equals(sortCriterion.getField()))) {
+      SortCriterion urnSort = new SortCriterion();
+      urnSort.setField("urn");
+      urnSort.setOrder(SortOrder.ASCENDING);
+      finalCriteria.add(urnSort);
+    }
+    final SearchFlags finalSearchFlags =
+        Optional.ofNullable(searchFlags).orElse(RETRIEVER_SEARCH_FLAGS);
     return searchService.scrollAcrossEntities(
-        systemOperationContext.withSearchFlags(flags -> RETRIEVER_SEARCH_FLAGS),
+        systemOperationContext.withSearchFlags(flags -> finalSearchFlags),
         entities,
         "*",
         filters,
-        List.of(urnSort),
+        finalCriteria,
         scrollId,
         null,
         count);
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/transformer/SearchDocumentTransformer.java b/metadata-io/src/main/java/com/linkedin/metadata/search/transformer/SearchDocumentTransformer.java
index b4ad847cb7afc2..7a60b89d0127cc 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/transformer/SearchDocumentTransformer.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/transformer/SearchDocumentTransformer.java
@@ -147,7 +147,7 @@ private static Set<String> objectFieldsFilter(Iterator<String> fieldNames) {
   public Optional<ObjectNode> transformAspect(
       @Nonnull OperationContext opContext,
       final @Nonnull Urn urn,
-      final @Nonnull RecordTemplate aspect,
+      final @Nullable RecordTemplate aspect,
       final @Nonnull AspectSpec aspectSpec,
       final Boolean forDelete)
       throws RemoteInvocationException, URISyntaxException {
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
index 17bbbaf059dec4..95fff81d13957c 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
@@ -20,10 +20,12 @@
 import com.linkedin.metadata.query.filter.Condition;
 import com.linkedin.metadata.query.filter.ConjunctiveCriterion;
 import com.linkedin.metadata.query.filter.Criterion;
+import com.linkedin.metadata.query.filter.CriterionArray;
 import com.linkedin.metadata.query.filter.Filter;
 import com.linkedin.metadata.query.filter.SortCriterion;
 import com.linkedin.metadata.search.elasticsearch.query.filter.QueryFilterRewriteChain;
 import com.linkedin.metadata.search.elasticsearch.query.filter.QueryFilterRewriterContext;
+import com.linkedin.metadata.utils.CriterionUtils;
 import io.datahubproject.metadata.context.OperationContext;
 import java.util.Collections;
 import java.util.HashMap;
@@ -188,6 +190,13 @@ public static BoolQueryBuilder buildFilterQuery(
               });
       finalQueryBuilder.should(andQueryBuilder);
     }
+    if (Boolean.TRUE.equals(
+        opContext.getSearchContext().getSearchFlags().isFilterNonLatestVersions())) {
+      BoolQueryBuilder filterNonLatestVersions =
+          ESUtils.buildFilterNonLatestEntities(
+              opContext, queryFilterRewriteChain, searchableFieldTypes);
+      finalQueryBuilder.must(filterNonLatestVersions);
+    }
     if (!finalQueryBuilder.should().isEmpty()) {
       finalQueryBuilder.minimumShouldMatch(1);
     }
@@ -869,4 +878,31 @@ private static void filterSoftDeletedByDefault(
       }
     }
   }
+
+  public static BoolQueryBuilder buildFilterNonLatestEntities(
+      OperationContext opContext,
+      QueryFilterRewriteChain queryFilterRewriteChain,
+      Map<String, Set<SearchableAnnotation.FieldType>> searchableFieldTypes) {
+    ConjunctiveCriterion isLatestCriterion = new ConjunctiveCriterion();
+    CriterionArray isLatestCriterionArray = new CriterionArray();
+    isLatestCriterionArray.add(
+        CriterionUtils.buildCriterion(IS_LATEST_FIELD_NAME, Condition.EQUAL, "true"));
+    isLatestCriterion.setAnd(isLatestCriterionArray);
+    BoolQueryBuilder isLatest =
+        ESUtils.buildConjunctiveFilterQuery(
+            isLatestCriterion, false, searchableFieldTypes, opContext, queryFilterRewriteChain);
+    ConjunctiveCriterion isNotVersionedCriterion = new ConjunctiveCriterion();
+    CriterionArray isNotVersionedCriterionArray = new CriterionArray();
+    isNotVersionedCriterionArray.add(
+        CriterionUtils.buildCriterion(IS_LATEST_FIELD_NAME, Condition.EXISTS, true));
+    isNotVersionedCriterion.setAnd(isNotVersionedCriterionArray);
+    BoolQueryBuilder isNotVersioned =
+        ESUtils.buildConjunctiveFilterQuery(
+            isNotVersionedCriterion,
+            false,
+            searchableFieldTypes,
+            opContext,
+            queryFilterRewriteChain);
+    return QueryBuilders.boolQuery().should(isLatest).should(isNotVersioned).minimumShouldMatch(1);
+  }
 }
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/service/UpdateIndicesService.java b/metadata-io/src/main/java/com/linkedin/metadata/service/UpdateIndicesService.java
index c5fc9ebdac9fa6..635d4472305c93 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/service/UpdateIndicesService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/service/UpdateIndicesService.java
@@ -42,6 +42,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
@@ -399,7 +400,7 @@ private void deleteSearchData(
       Urn urn,
       String entityName,
       AspectSpec aspectSpec,
-      RecordTemplate aspect,
+      @Nullable RecordTemplate aspect,
       Boolean isKeyAspect) {
     String docId;
     try {
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/AlphanumericSortIdGeneratorTest.java b/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/AlphanumericSortIdGeneratorTest.java
new file mode 100644
index 00000000000000..8021507231d3b9
--- /dev/null
+++ b/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/AlphanumericSortIdGeneratorTest.java
@@ -0,0 +1,62 @@
+package com.linkedin.metadata.entity.versioning;
+
+import static com.linkedin.metadata.Constants.INITIAL_VERSION_SORT_ID;
+import static org.testng.Assert.*;
+
+import org.testng.annotations.Test;
+
+public class AlphanumericSortIdGeneratorTest {
+
+  @Test
+  public void testBasicIncrement() {
+    assertEquals(AlphanumericSortIdGenerator.increment(INITIAL_VERSION_SORT_ID), "AAAAAAAB");
+    assertEquals(AlphanumericSortIdGenerator.increment("AAAAAAAB"), "AAAAAAAC");
+  }
+
+  @Test
+  public void testCarryOver() {
+    assertEquals(AlphanumericSortIdGenerator.increment("AAAAAAAZ"), "AAAAAABA");
+    assertEquals(AlphanumericSortIdGenerator.increment("AAAAAZZZ"), "AAAABAAA");
+  }
+
+  @Test
+  public void testWrapAround() {
+    assertEquals(AlphanumericSortIdGenerator.increment("ZZZZZZZZ"), INITIAL_VERSION_SORT_ID);
+  }
+
+  @Test(expectedExceptions = IllegalArgumentException.class)
+  public void testInvalidLength() {
+    AlphanumericSortIdGenerator.increment("AAA");
+  }
+
+  @Test(expectedExceptions = IllegalArgumentException.class)
+  public void testInvalidCharacters() {
+    AlphanumericSortIdGenerator.increment("AAAA$AAA");
+  }
+
+  @Test(expectedExceptions = IllegalArgumentException.class)
+  public void testNullInput() {
+    AlphanumericSortIdGenerator.increment(null);
+  }
+
+  @Test
+  public void testSequence() {
+    String id = "AAAAAAAA";
+    id = AlphanumericSortIdGenerator.increment(id);
+    assertEquals(id, "AAAAAAAB");
+    id = AlphanumericSortIdGenerator.increment(id);
+    assertEquals(id, "AAAAAAAC");
+    id = AlphanumericSortIdGenerator.increment(id);
+    assertEquals(id, "AAAAAAAD");
+  }
+
+  @Test
+  public void testLowerBoundary() {
+    assertEquals(AlphanumericSortIdGenerator.increment(INITIAL_VERSION_SORT_ID), "AAAAAAAB");
+  }
+
+  @Test
+  public void testUpperBoundary() {
+    assertEquals(AlphanumericSortIdGenerator.increment("ZZZZZZZZ"), "AAAAAAAA");
+  }
+}
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/EntityVersioningServiceTest.java b/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/EntityVersioningServiceTest.java
new file mode 100644
index 00000000000000..8c4d81af129428
--- /dev/null
+++ b/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/EntityVersioningServiceTest.java
@@ -0,0 +1,603 @@
+package com.linkedin.metadata.entity.versioning;
+
+import static com.linkedin.metadata.Constants.INITIAL_VERSION_SORT_ID;
+import static com.linkedin.metadata.Constants.VERSION_PROPERTIES_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.VERSION_SET_PROPERTIES_ASPECT_NAME;
+import static org.mockito.Mockito.*;
+import static org.testng.Assert.*;
+
+import com.linkedin.common.FabricType;
+import com.linkedin.common.VersionProperties;
+import com.linkedin.common.VersionTag;
+import com.linkedin.common.urn.DataPlatformUrn;
+import com.linkedin.common.urn.DatasetUrn;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.metadata.aspect.AspectRetriever;
+import com.linkedin.metadata.aspect.CachingAspectRetriever;
+import com.linkedin.metadata.aspect.GraphRetriever;
+import com.linkedin.metadata.aspect.SystemAspect;
+import com.linkedin.metadata.aspect.batch.AspectsBatch;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.entity.EntityServiceAspectRetriever;
+import com.linkedin.metadata.entity.RollbackResult;
+import com.linkedin.metadata.entity.RollbackRunResult;
+import com.linkedin.metadata.entity.SearchRetriever;
+import com.linkedin.metadata.entity.TestEntityRegistry;
+import com.linkedin.metadata.models.registry.ConfigEntityRegistry;
+import com.linkedin.metadata.models.registry.EntityRegistry;
+import com.linkedin.metadata.models.registry.EntityRegistryException;
+import com.linkedin.metadata.models.registry.MergedEntityRegistry;
+import com.linkedin.metadata.search.ScrollResult;
+import com.linkedin.metadata.search.SearchEntity;
+import com.linkedin.metadata.search.SearchEntityArray;
+import com.linkedin.metadata.search.SearchResultMetadata;
+import com.linkedin.metadata.snapshot.Snapshot;
+import com.linkedin.versionset.VersionSetProperties;
+import com.linkedin.versionset.VersioningScheme;
+import io.datahubproject.metadata.context.OperationContext;
+import io.datahubproject.metadata.context.RetrieverContext;
+import io.datahubproject.test.metadata.context.TestOperationContexts;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import org.mockito.ArgumentCaptor;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class EntityVersioningServiceTest {
+
+  private EntityVersioningServiceImpl versioningService;
+  private EntityService mockEntityService;
+  private OperationContext mockOpContext;
+  private AspectRetriever mockAspectRetriever;
+  private CachingAspectRetriever mockCachingAspectRetriever;
+  private SearchRetriever mockSearchRetriever;
+  private static Urn TEST_VERSION_SET_URN = UrnUtils.getUrn("urn:li:versionSet:(123456,dataset)");
+  private static Urn TEST_DATASET_URN =
+      new DatasetUrn(new DataPlatformUrn("kafka"), "myDataset", FabricType.PROD);
+  private static Urn TEST_DATASET_URN_2 =
+      new DatasetUrn(new DataPlatformUrn("hive"), "myHiveDataset", FabricType.PROD);
+  private static Urn TEST_DATASET_URN_3 =
+      new DatasetUrn(new DataPlatformUrn("hive"), "myHiveDataset2", FabricType.PROD);
+
+  @BeforeMethod
+  public void setup() throws EntityRegistryException {
+    mockEntityService = mock(EntityService.class);
+    final EntityRegistry snapshotEntityRegistry = new TestEntityRegistry();
+    final EntityRegistry configEntityRegistry =
+        new ConfigEntityRegistry(
+            Snapshot.class.getClassLoader().getResourceAsStream("entity-registry.yml"));
+    final EntityRegistry testEntityRegistry =
+        new MergedEntityRegistry(snapshotEntityRegistry).apply(configEntityRegistry);
+    mockAspectRetriever = mock(EntityServiceAspectRetriever.class);
+    mockCachingAspectRetriever = mock(CachingAspectRetriever.class);
+    mockSearchRetriever = mock(SearchRetriever.class);
+    when(mockAspectRetriever.getEntityRegistry()).thenReturn(testEntityRegistry);
+    mockOpContext =
+        TestOperationContexts.systemContext(
+            null,
+            null,
+            null,
+            () -> testEntityRegistry,
+            () ->
+                RetrieverContext.builder()
+                    .aspectRetriever(mockAspectRetriever)
+                    .graphRetriever(GraphRetriever.EMPTY)
+                    .searchRetriever(mockSearchRetriever)
+                    .cachingAspectRetriever(mockCachingAspectRetriever)
+                    .build(),
+            null,
+            opContext ->
+                ((EntityServiceAspectRetriever) opContext.getAspectRetriever())
+                    .setSystemOperationContext(opContext),
+            null);
+    versioningService = new EntityVersioningServiceImpl(mockEntityService);
+  }
+
+  @Test
+  public void testLinkLatestVersionNewVersionSet() throws Exception {
+
+    VersionPropertiesInput input =
+        new VersionPropertiesInput("Test comment", "Test label", 123456789L, "testCreator");
+    // Mock version set doesn't exist
+    when(mockAspectRetriever.entityExists(anySet()))
+        .thenReturn(Map.of(TEST_VERSION_SET_URN, false));
+
+    // Capture the proposals
+    ArgumentCaptor<AspectsBatch> aspectsCaptor = ArgumentCaptor.forClass(AspectsBatch.class);
+    when(mockEntityService.ingestProposal(eq(mockOpContext), aspectsCaptor.capture(), eq(false)))
+        .thenReturn(List.of());
+
+    // Execute
+    versioningService.linkLatestVersion(
+        mockOpContext, TEST_VERSION_SET_URN, TEST_DATASET_URN, input);
+
+    // Verify
+    List<AspectsBatch> capturedAspects = aspectsCaptor.getAllValues();
+    List<RecordTemplate> versionPropertiesAspect =
+        capturedAspects.get(0).getMCPItems().stream()
+            .filter(mcpItem -> VERSION_PROPERTIES_ASPECT_NAME.equals(mcpItem.getAspectName()))
+            .map(mcpItem -> mcpItem.getAspect(VersionProperties.class))
+            .collect(Collectors.toList());
+
+    // Verify VersionProperties has initial sort ID
+    VersionProperties versionProps =
+        (VersionProperties)
+            versionPropertiesAspect.stream()
+                .filter(a -> a instanceof VersionProperties)
+                .findFirst()
+                .orElseThrow(() -> new AssertionError("VersionProperties not found"));
+
+    assertEquals(versionProps.getSortId(), INITIAL_VERSION_SORT_ID);
+    assertEquals(versionProps.getComment(), "Test comment");
+    assertEquals(versionProps.getVersionSet(), TEST_VERSION_SET_URN);
+
+    List<RecordTemplate> versionSetPropertiesAspect =
+        capturedAspects.get(0).getMCPItems().stream()
+            .filter(mcpItem -> VERSION_SET_PROPERTIES_ASPECT_NAME.equals(mcpItem.getAspectName()))
+            .map(mcpItem -> mcpItem.getAspect(VersionSetProperties.class))
+            .collect(Collectors.toList());
+    VersionSetProperties versionSetProperties =
+        (VersionSetProperties)
+            versionSetPropertiesAspect.stream()
+                .filter(aspect -> aspect instanceof VersionSetProperties)
+                .findFirst()
+                .orElseThrow(() -> new AssertionError("Version Set Properties not found"));
+    assertEquals(versionSetProperties.getLatest(), TEST_DATASET_URN);
+    assertEquals(
+        versionSetProperties.getVersioningScheme(),
+        VersioningScheme.ALPHANUMERIC_GENERATED_BY_DATAHUB);
+  }
+
+  @Test
+  public void testLinkLatestVersionExistingVersionSet() throws Exception {
+
+    VersionPropertiesInput input =
+        new VersionPropertiesInput("Test comment", "Label2", 123456789L, "testCreator");
+
+    // Mock version set exists
+    when(mockAspectRetriever.entityExists(anySet())).thenReturn(Map.of(TEST_VERSION_SET_URN, true));
+
+    // Mock existing version set properties
+    VersionSetProperties existingVersionSetProps =
+        new VersionSetProperties()
+            .setVersioningScheme(VersioningScheme.ALPHANUMERIC_GENERATED_BY_DATAHUB)
+            .setLatest(TEST_DATASET_URN);
+    SystemAspect mockVersionSetPropertiesAspect = mock(SystemAspect.class);
+    when(mockVersionSetPropertiesAspect.getRecordTemplate()).thenReturn(existingVersionSetProps);
+    when(mockVersionSetPropertiesAspect.getSystemMetadataVersion()).thenReturn(Optional.of(1L));
+    when(mockAspectRetriever.getLatestSystemAspect(eq(TEST_VERSION_SET_URN), anyString()))
+        .thenReturn(mockVersionSetPropertiesAspect);
+
+    // Mock existing version properties with a sort ID
+    VersionProperties existingVersionProps =
+        new VersionProperties()
+            .setSortId("AAAAAAAA")
+            .setVersion(new VersionTag().setVersionTag("Label1"))
+            .setVersionSet(TEST_VERSION_SET_URN);
+    SystemAspect mockVersionPropertiesAspect = mock(SystemAspect.class);
+    when(mockVersionPropertiesAspect.getRecordTemplate()).thenReturn(existingVersionProps);
+    when(mockVersionPropertiesAspect.getSystemMetadataVersion()).thenReturn(Optional.of(1L));
+    when(mockAspectRetriever.getLatestSystemAspect(eq(TEST_DATASET_URN), anyString()))
+        .thenReturn(mockVersionPropertiesAspect);
+
+    // Capture the proposals
+    ArgumentCaptor<AspectsBatch> aspectsCaptor = ArgumentCaptor.forClass(AspectsBatch.class);
+    when(mockEntityService.ingestProposal(eq(mockOpContext), aspectsCaptor.capture(), eq(false)))
+        .thenReturn(List.of());
+
+    // Execute
+    versioningService.linkLatestVersion(
+        mockOpContext, TEST_VERSION_SET_URN, TEST_DATASET_URN_2, input);
+
+    // Verify
+    List<AspectsBatch> capturedAspects = aspectsCaptor.getAllValues();
+    List<RecordTemplate> aspects =
+        capturedAspects.get(0).getMCPItems().stream()
+            .filter(mcpItem -> VERSION_PROPERTIES_ASPECT_NAME.equals(mcpItem.getAspectName()))
+            .map(mcpItem -> mcpItem.getAspect(VersionProperties.class))
+            .collect(Collectors.toList());
+
+    // Verify VersionProperties has incremented sort ID
+    VersionProperties versionProps =
+        (VersionProperties)
+            aspects.stream()
+                .filter(a -> a instanceof VersionProperties)
+                .findFirst()
+                .orElseThrow(() -> new AssertionError("VersionProperties not found"));
+
+    assertEquals(versionProps.getSortId(), "AAAAAAAB");
+    assertEquals(versionProps.getComment(), "Test comment");
+    assertEquals(versionProps.getVersionSet(), TEST_VERSION_SET_URN);
+  }
+
+  @Test
+  public void testUnlinkInitialVersion() throws Exception {
+
+    // Mock version properties aspect
+    VersionProperties versionProps =
+        new VersionProperties()
+            .setVersionSet(TEST_VERSION_SET_URN)
+            .setSortId(INITIAL_VERSION_SORT_ID);
+    SystemAspect mockVersionPropsAspect = mock(SystemAspect.class);
+    when(mockVersionPropsAspect.getRecordTemplate()).thenReturn(versionProps);
+    when(mockVersionPropsAspect.getSystemMetadataVersion()).thenReturn(Optional.of(1L));
+    when(mockAspectRetriever.getLatestSystemAspect(
+            eq(TEST_DATASET_URN), eq(VERSION_PROPERTIES_ASPECT_NAME)))
+        .thenReturn(mockVersionPropsAspect);
+    VersionSetProperties versionSetProps =
+        new VersionSetProperties()
+            .setVersioningScheme(VersioningScheme.ALPHANUMERIC_GENERATED_BY_DATAHUB)
+            .setLatest(TEST_DATASET_URN);
+    SystemAspect mockVersionSetPropsAspect = mock(SystemAspect.class);
+    when(mockVersionSetPropsAspect.getRecordTemplate()).thenReturn(versionSetProps);
+    when(mockVersionSetPropsAspect.getSystemMetadataVersion()).thenReturn(Optional.of(1L));
+    when(mockAspectRetriever.getLatestSystemAspect(
+            eq(TEST_VERSION_SET_URN), eq(VERSION_SET_PROPERTIES_ASPECT_NAME)))
+        .thenReturn(mockVersionSetPropsAspect);
+
+    // Mock delete aspect responses
+    RollbackResult versionSetDeleteResult =
+        new RollbackResult(
+            TEST_VERSION_SET_URN,
+            "versionSet",
+            VERSION_SET_PROPERTIES_ASPECT_NAME,
+            null,
+            null,
+            null,
+            null,
+            null,
+            false,
+            0);
+    RollbackRunResult rollbackRunResult =
+        new RollbackRunResult(new ArrayList<>(), 1, List.of(versionSetDeleteResult));
+    RollbackResult versionPropsDeleteResult =
+        new RollbackResult(
+            TEST_DATASET_URN,
+            "dataset",
+            VERSION_PROPERTIES_ASPECT_NAME,
+            null,
+            null,
+            null,
+            null,
+            null,
+            false,
+            0);
+
+    when(mockEntityService.deleteUrn(eq(mockOpContext), eq(TEST_VERSION_SET_URN)))
+        .thenReturn(rollbackRunResult);
+    when(mockEntityService.deleteAspect(
+            eq(mockOpContext), anyString(), eq(VERSION_PROPERTIES_ASPECT_NAME), anyMap(), eq(true)))
+        .thenReturn(Optional.of(versionPropsDeleteResult));
+
+    // Mock graph retriever response
+    SearchEntityArray relatedEntities = new SearchEntityArray();
+    relatedEntities.add(new SearchEntity().setEntity(TEST_DATASET_URN));
+
+    ScrollResult scrollResult =
+        new ScrollResult().setEntities(relatedEntities).setMetadata(new SearchResultMetadata());
+    when(mockSearchRetriever.scroll(any(), any(), any(), eq(2), any(), any()))
+        .thenReturn(scrollResult);
+
+    // Execute
+    List<RollbackResult> results =
+        versioningService.unlinkVersion(mockOpContext, TEST_VERSION_SET_URN, TEST_DATASET_URN);
+
+    // Verify
+    assertEquals(results.size(), 2);
+    verify(mockEntityService).deleteUrn(eq(mockOpContext), eq(TEST_VERSION_SET_URN));
+    verify(mockEntityService)
+        .deleteAspect(
+            eq(mockOpContext),
+            eq(TEST_DATASET_URN.toString()),
+            eq(VERSION_PROPERTIES_ASPECT_NAME),
+            anyMap(),
+            eq(true));
+    verify(mockSearchRetriever, never()).scroll(any(), any(), anyString(), anyInt(), any(), any());
+  }
+
+  @Test
+  public void testUnlinkLatestVersionWithPriorVersion() throws Exception {
+
+    // Mock version properties aspect
+    VersionProperties versionProps =
+        new VersionProperties()
+            .setVersionSet(TEST_VERSION_SET_URN)
+            .setSortId("AAAAAAAB"); // Not initial version
+    SystemAspect mockVersionPropsAspect = mock(SystemAspect.class);
+    when(mockVersionPropsAspect.getRecordTemplate()).thenReturn(versionProps);
+    when(mockVersionPropsAspect.getSystemMetadataVersion()).thenReturn(Optional.of(1L));
+    when(mockAspectRetriever.getLatestSystemAspect(
+            eq(TEST_DATASET_URN), eq(VERSION_PROPERTIES_ASPECT_NAME)))
+        .thenReturn(mockVersionPropsAspect);
+
+    VersionSetProperties versionSetProps =
+        new VersionSetProperties()
+            .setVersioningScheme(VersioningScheme.ALPHANUMERIC_GENERATED_BY_DATAHUB)
+            .setLatest(TEST_DATASET_URN);
+    SystemAspect mockVersionSetPropsAspect = mock(SystemAspect.class);
+    when(mockVersionSetPropsAspect.getRecordTemplate()).thenReturn(versionSetProps);
+    when(mockVersionSetPropsAspect.getSystemMetadataVersion()).thenReturn(Optional.of(1L));
+    when(mockAspectRetriever.getLatestSystemAspect(
+            eq(TEST_VERSION_SET_URN), eq(VERSION_SET_PROPERTIES_ASPECT_NAME)))
+        .thenReturn(mockVersionSetPropsAspect);
+
+    // Mock graph retriever response
+    SearchEntityArray relatedEntities = new SearchEntityArray();
+    relatedEntities.add(new SearchEntity().setEntity(TEST_DATASET_URN));
+    relatedEntities.add(new SearchEntity().setEntity(TEST_DATASET_URN_2));
+
+    ScrollResult scrollResult =
+        new ScrollResult().setEntities(relatedEntities).setMetadata(new SearchResultMetadata());
+    when(mockSearchRetriever.scroll(any(), any(), any(), eq(2), any(), any()))
+        .thenReturn(scrollResult);
+
+    // Mock delete aspect response
+    RollbackResult versionPropsDeleteResult =
+        new RollbackResult(
+            TEST_DATASET_URN,
+            "dataset",
+            VERSION_PROPERTIES_ASPECT_NAME,
+            null,
+            null,
+            null,
+            null,
+            null,
+            false,
+            0);
+    when(mockEntityService.deleteAspect(
+            eq(mockOpContext), anyString(), eq(VERSION_PROPERTIES_ASPECT_NAME), anyMap(), eq(true)))
+        .thenReturn(Optional.of(versionPropsDeleteResult));
+
+    // Execute
+    List<RollbackResult> results =
+        versioningService.unlinkVersion(mockOpContext, TEST_VERSION_SET_URN, TEST_DATASET_URN);
+
+    // Verify
+    assertEquals(results.size(), 1);
+    verify(mockEntityService)
+        .deleteAspect(
+            eq(mockOpContext),
+            eq(TEST_DATASET_URN.toString()),
+            eq(VERSION_PROPERTIES_ASPECT_NAME),
+            anyMap(),
+            eq(true));
+    verify(mockEntityService).ingestProposal(eq(mockOpContext), any(), eq(false));
+    verify(mockEntityService, never()).deleteUrn(eq(mockOpContext), eq(TEST_VERSION_SET_URN));
+  }
+
+  @Test
+  public void testUnlinkNotLatestVersionWithPriorVersion() throws Exception {
+
+    // Mock version properties aspect
+    VersionProperties versionProps =
+        new VersionProperties()
+            .setVersionSet(TEST_VERSION_SET_URN)
+            .setSortId("AAAAAAAB"); // Not initial version
+    SystemAspect mockVersionPropsAspect = mock(SystemAspect.class);
+    when(mockVersionPropsAspect.getRecordTemplate()).thenReturn(versionProps);
+    when(mockVersionPropsAspect.getSystemMetadataVersion()).thenReturn(Optional.of(1L));
+    when(mockAspectRetriever.getLatestSystemAspect(
+            eq(TEST_DATASET_URN_2), eq(VERSION_PROPERTIES_ASPECT_NAME)))
+        .thenReturn(mockVersionPropsAspect);
+
+    VersionSetProperties versionSetProps =
+        new VersionSetProperties()
+            .setVersioningScheme(VersioningScheme.ALPHANUMERIC_GENERATED_BY_DATAHUB)
+            .setLatest(TEST_DATASET_URN);
+    SystemAspect mockVersionSetPropsAspect = mock(SystemAspect.class);
+    when(mockVersionSetPropsAspect.getRecordTemplate()).thenReturn(versionSetProps);
+    when(mockVersionSetPropsAspect.getSystemMetadataVersion()).thenReturn(Optional.of(1L));
+    when(mockAspectRetriever.getLatestSystemAspect(
+            eq(TEST_VERSION_SET_URN), eq(VERSION_SET_PROPERTIES_ASPECT_NAME)))
+        .thenReturn(mockVersionSetPropsAspect);
+
+    // Mock graph retriever response
+    SearchEntityArray relatedEntities = new SearchEntityArray();
+    relatedEntities.add(new SearchEntity().setEntity(TEST_DATASET_URN));
+    relatedEntities.add(new SearchEntity().setEntity(TEST_DATASET_URN_2));
+
+    ScrollResult scrollResult =
+        new ScrollResult().setEntities(relatedEntities).setMetadata(new SearchResultMetadata());
+    when(mockSearchRetriever.scroll(any(), any(), any(), eq(2), any(), any()))
+        .thenReturn(scrollResult);
+
+    // Mock delete aspect response
+    RollbackResult versionPropsDeleteResult =
+        new RollbackResult(
+            TEST_DATASET_URN_2,
+            "dataset",
+            VERSION_PROPERTIES_ASPECT_NAME,
+            null,
+            null,
+            null,
+            null,
+            null,
+            false,
+            0);
+    when(mockEntityService.deleteAspect(
+            eq(mockOpContext),
+            eq(TEST_DATASET_URN_2.toString()),
+            eq(VERSION_PROPERTIES_ASPECT_NAME),
+            anyMap(),
+            eq(true)))
+        .thenReturn(Optional.of(versionPropsDeleteResult));
+
+    // Execute
+    List<RollbackResult> results =
+        versioningService.unlinkVersion(mockOpContext, TEST_VERSION_SET_URN, TEST_DATASET_URN_2);
+
+    // Verify
+    assertEquals(results.size(), 1);
+    verify(mockEntityService)
+        .deleteAspect(
+            eq(mockOpContext),
+            eq(TEST_DATASET_URN_2.toString()),
+            eq(VERSION_PROPERTIES_ASPECT_NAME),
+            anyMap(),
+            eq(true));
+    verify(mockEntityService, never()).deleteUrn(eq(mockOpContext), eq(TEST_VERSION_SET_URN));
+  }
+
+  @Test
+  public void testUnlinkNotReturnedSingleVersionWithPriorVersion() throws Exception {
+
+    // Mock version properties aspect
+    VersionProperties versionProps =
+        new VersionProperties()
+            .setVersionSet(TEST_VERSION_SET_URN)
+            .setSortId("AAAAAAAB"); // Not initial version
+    SystemAspect mockVersionPropsAspect = mock(SystemAspect.class);
+    when(mockVersionPropsAspect.getRecordTemplate()).thenReturn(versionProps);
+    when(mockVersionPropsAspect.getSystemMetadataVersion()).thenReturn(Optional.of(1L));
+    when(mockAspectRetriever.getLatestSystemAspect(
+            eq(TEST_DATASET_URN_2), eq(VERSION_PROPERTIES_ASPECT_NAME)))
+        .thenReturn(mockVersionPropsAspect);
+
+    VersionSetProperties versionSetProps =
+        new VersionSetProperties()
+            .setVersioningScheme(VersioningScheme.ALPHANUMERIC_GENERATED_BY_DATAHUB)
+            .setLatest(TEST_DATASET_URN_2);
+    SystemAspect mockVersionSetPropsAspect = mock(SystemAspect.class);
+    when(mockVersionSetPropsAspect.getRecordTemplate()).thenReturn(versionSetProps);
+    when(mockVersionSetPropsAspect.getSystemMetadataVersion()).thenReturn(Optional.of(1L));
+    when(mockAspectRetriever.getLatestSystemAspect(
+            eq(TEST_VERSION_SET_URN), eq(VERSION_SET_PROPERTIES_ASPECT_NAME)))
+        .thenReturn(mockVersionSetPropsAspect);
+
+    // Mock graph retriever response
+    SearchEntityArray relatedEntities = new SearchEntityArray();
+    relatedEntities.add(new SearchEntity().setEntity(TEST_DATASET_URN));
+
+    ScrollResult scrollResult =
+        new ScrollResult().setEntities(relatedEntities).setMetadata(new SearchResultMetadata());
+    when(mockSearchRetriever.scroll(any(), any(), any(), eq(2), any(), any()))
+        .thenReturn(scrollResult);
+
+    // Mock delete aspect response
+    RollbackResult versionPropsDeleteResult =
+        new RollbackResult(
+            TEST_DATASET_URN_2,
+            "dataset",
+            VERSION_PROPERTIES_ASPECT_NAME,
+            null,
+            null,
+            null,
+            null,
+            null,
+            false,
+            0);
+    when(mockEntityService.deleteAspect(
+            eq(mockOpContext), anyString(), eq(VERSION_PROPERTIES_ASPECT_NAME), anyMap(), eq(true)))
+        .thenReturn(Optional.of(versionPropsDeleteResult));
+
+    // Execute
+    List<RollbackResult> results =
+        versioningService.unlinkVersion(mockOpContext, TEST_VERSION_SET_URN, TEST_DATASET_URN_2);
+
+    // Verify
+    assertEquals(results.size(), 1);
+    verify(mockEntityService)
+        .deleteAspect(
+            eq(mockOpContext),
+            eq(TEST_DATASET_URN_2.toString()),
+            eq(VERSION_PROPERTIES_ASPECT_NAME),
+            anyMap(),
+            eq(true));
+    verify(mockEntityService).ingestProposal(eq(mockOpContext), any(), eq(false));
+    verify(mockEntityService, never()).deleteUrn(eq(mockOpContext), eq(TEST_VERSION_SET_URN));
+  }
+
+  @Test
+  public void testUnlinkNotReturnedDoubleVersionWithPriorVersion() throws Exception {
+
+    // Mock version properties aspect
+    VersionProperties versionProps =
+        new VersionProperties()
+            .setVersionSet(TEST_VERSION_SET_URN)
+            .setSortId("AAAAAAAB"); // Not initial version
+    SystemAspect mockVersionPropsAspect = mock(SystemAspect.class);
+    when(mockVersionPropsAspect.getRecordTemplate()).thenReturn(versionProps);
+    when(mockVersionPropsAspect.getSystemMetadataVersion()).thenReturn(Optional.of(1L));
+    when(mockAspectRetriever.getLatestSystemAspect(
+            eq(TEST_DATASET_URN_3), eq(VERSION_PROPERTIES_ASPECT_NAME)))
+        .thenReturn(mockVersionPropsAspect);
+
+    VersionSetProperties versionSetProps =
+        new VersionSetProperties()
+            .setVersioningScheme(VersioningScheme.ALPHANUMERIC_GENERATED_BY_DATAHUB)
+            .setLatest(TEST_DATASET_URN_3);
+    SystemAspect mockVersionSetPropsAspect = mock(SystemAspect.class);
+    when(mockVersionSetPropsAspect.getRecordTemplate()).thenReturn(versionSetProps);
+    when(mockVersionSetPropsAspect.getSystemMetadataVersion()).thenReturn(Optional.of(1L));
+    when(mockAspectRetriever.getLatestSystemAspect(
+            eq(TEST_VERSION_SET_URN), eq(VERSION_SET_PROPERTIES_ASPECT_NAME)))
+        .thenReturn(mockVersionSetPropsAspect);
+
+    // Mock graph retriever response
+    SearchEntityArray relatedEntities = new SearchEntityArray();
+    relatedEntities.add(new SearchEntity().setEntity(TEST_DATASET_URN));
+    relatedEntities.add(new SearchEntity().setEntity(TEST_DATASET_URN_2));
+
+    ScrollResult scrollResult =
+        new ScrollResult().setEntities(relatedEntities).setMetadata(new SearchResultMetadata());
+    when(mockSearchRetriever.scroll(any(), any(), any(), eq(2), any(), any()))
+        .thenReturn(scrollResult);
+
+    // Mock delete aspect response
+    RollbackResult versionPropsDeleteResult =
+        new RollbackResult(
+            TEST_DATASET_URN_3,
+            "dataset",
+            VERSION_PROPERTIES_ASPECT_NAME,
+            null,
+            null,
+            null,
+            null,
+            null,
+            false,
+            0);
+    when(mockEntityService.deleteAspect(
+            eq(mockOpContext), anyString(), eq(VERSION_PROPERTIES_ASPECT_NAME), anyMap(), eq(true)))
+        .thenReturn(Optional.of(versionPropsDeleteResult));
+
+    // Execute
+    List<RollbackResult> results =
+        versioningService.unlinkVersion(mockOpContext, TEST_VERSION_SET_URN, TEST_DATASET_URN_3);
+
+    // Verify
+    assertEquals(results.size(), 1);
+    verify(mockEntityService)
+        .deleteAspect(
+            eq(mockOpContext),
+            eq(TEST_DATASET_URN_3.toString()),
+            eq(VERSION_PROPERTIES_ASPECT_NAME),
+            anyMap(),
+            eq(true));
+    verify(mockEntityService).ingestProposal(eq(mockOpContext), any(), eq(false));
+    verify(mockEntityService, never()).deleteUrn(eq(mockOpContext), eq(TEST_VERSION_SET_URN));
+  }
+
+  @Test
+  public void testUnlinkNonVersionedEntity() throws Exception {
+
+    // Mock no version properties aspect
+    when(mockAspectRetriever.getLatestSystemAspect(
+            eq(TEST_DATASET_URN), eq(VERSION_PROPERTIES_ASPECT_NAME)))
+        .thenReturn(null);
+
+    // Execute
+    List<RollbackResult> results =
+        versioningService.unlinkVersion(mockOpContext, TEST_VERSION_SET_URN, TEST_DATASET_URN);
+
+    // Verify
+    assertTrue(results.isEmpty());
+    verify(mockEntityService, never()).deleteAspect(any(), any(), any(), any(), anyBoolean());
+    verify(mockEntityService, never()).deleteUrn(any(), any());
+    verify(mockSearchRetriever, never()).scroll(any(), any(), anyString(), anyInt(), any(), any());
+  }
+}
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/sideeffects/VersionSetSideEffectTest.java b/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/sideeffects/VersionSetSideEffectTest.java
new file mode 100644
index 00000000000000..35445efaedc607
--- /dev/null
+++ b/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/sideeffects/VersionSetSideEffectTest.java
@@ -0,0 +1,229 @@
+package com.linkedin.metadata.entity.versioning.sideeffects;
+
+import static com.linkedin.metadata.Constants.DATASET_ENTITY_NAME;
+import static com.linkedin.metadata.Constants.GLOBAL_TAGS_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.VERSION_SET_ENTITY_NAME;
+import static com.linkedin.metadata.Constants.VERSION_SET_PROPERTIES_ASPECT_NAME;
+import static org.mockito.Mockito.mock;
+import static org.testng.Assert.assertEquals;
+
+import com.linkedin.common.GlobalTags;
+import com.linkedin.common.TagAssociationArray;
+import com.linkedin.common.VersionProperties;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.metadata.aspect.GraphRetriever;
+import com.linkedin.metadata.aspect.batch.MCPItem;
+import com.linkedin.metadata.aspect.plugins.config.AspectPluginConfig;
+import com.linkedin.metadata.entity.SearchRetriever;
+import com.linkedin.metadata.entity.ebean.batch.ChangeItemImpl;
+import com.linkedin.metadata.entity.ebean.batch.MCLItemImpl;
+import com.linkedin.metadata.entity.ebean.batch.PatchItemImpl;
+import com.linkedin.metadata.models.EntitySpec;
+import com.linkedin.metadata.utils.AuditStampUtils;
+import com.linkedin.test.metadata.aspect.MockAspectRetriever;
+import com.linkedin.test.metadata.aspect.TestEntityRegistry;
+import com.linkedin.versionset.VersionSetProperties;
+import com.linkedin.versionset.VersioningScheme;
+import io.datahubproject.metadata.context.RetrieverContext;
+import jakarta.json.JsonObject;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class VersionSetSideEffectTest {
+  private static final TestEntityRegistry TEST_REGISTRY = new TestEntityRegistry();
+  private static final Urn TEST_VERSION_SET_URN =
+      UrnUtils.getUrn("urn:li:versionSet:(123456,dataset)");
+  private static final Urn PREVIOUS_LATEST_URN =
+      UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD)");
+  private static final Urn NEW_LATEST_URN =
+      UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDatasetV2,PROD)");
+
+  private static final AspectPluginConfig TEST_PLUGIN_CONFIG =
+      AspectPluginConfig.builder()
+          .className(VersionSetSideEffect.class.getName())
+          .enabled(true)
+          .supportedOperations(
+              List.of("CREATE", "PATCH", "CREATE_ENTITY", "UPSERT", "DELETE", "RESTATE"))
+          .supportedEntityAspectNames(
+              List.of(
+                  AspectPluginConfig.EntityAspectName.builder()
+                      .aspectName(VERSION_SET_PROPERTIES_ASPECT_NAME)
+                      .entityName(VERSION_SET_ENTITY_NAME)
+                      .build()))
+          .build();
+
+  private MockAspectRetriever mockAspectRetriever;
+  private RetrieverContext retrieverContext;
+  private VersionSetSideEffect sideEffect;
+
+  @BeforeMethod
+  public void setup() {
+    GraphRetriever graphRetriever = mock(GraphRetriever.class);
+    VersionProperties existingProperties =
+        new VersionProperties()
+            .setVersionSet(TEST_VERSION_SET_URN)
+            .setIsLatest(false)
+            .setSortId("AAAAAAAA");
+    VersionProperties previousLatestProperties =
+        new VersionProperties()
+            .setVersionSet(TEST_VERSION_SET_URN)
+            .setIsLatest(true)
+            .setSortId("AAAAAAAB");
+    Map<Urn, List<RecordTemplate>> data = new HashMap<>();
+    data.put(NEW_LATEST_URN, Collections.singletonList(existingProperties));
+    data.put(PREVIOUS_LATEST_URN, Collections.singletonList(previousLatestProperties));
+    mockAspectRetriever = new MockAspectRetriever(data);
+    mockAspectRetriever.setEntityRegistry(TEST_REGISTRY);
+
+    retrieverContext =
+        RetrieverContext.builder()
+            .searchRetriever(mock(SearchRetriever.class))
+            .aspectRetriever(mockAspectRetriever)
+            .graphRetriever(graphRetriever)
+            .build();
+
+    sideEffect = new VersionSetSideEffect();
+    sideEffect.setConfig(TEST_PLUGIN_CONFIG);
+  }
+
+  @Test
+  public void testUpdateLatestVersion() {
+    // Create previous version set properties with different latest
+    VersionSetProperties previousProperties = new VersionSetProperties();
+    previousProperties.setLatest(PREVIOUS_LATEST_URN);
+    previousProperties.setVersioningScheme(VersioningScheme.ALPHANUMERIC_GENERATED_BY_DATAHUB);
+
+    // Create new version set properties
+    VersionSetProperties newProperties = new VersionSetProperties();
+    newProperties.setLatest(NEW_LATEST_URN);
+    newProperties.setVersioningScheme(VersioningScheme.ALPHANUMERIC_GENERATED_BY_DATAHUB);
+
+    EntitySpec entitySpec = TEST_REGISTRY.getEntitySpec(VERSION_SET_ENTITY_NAME);
+
+    // Create change item
+    ChangeItemImpl changeItem =
+        ChangeItemImpl.builder()
+            .urn(TEST_VERSION_SET_URN)
+            .aspectName(VERSION_SET_PROPERTIES_ASPECT_NAME)
+            .entitySpec(entitySpec)
+            .aspectSpec(entitySpec.getAspectSpec(VERSION_SET_PROPERTIES_ASPECT_NAME))
+            .recordTemplate(newProperties)
+            .auditStamp(AuditStampUtils.createDefaultAuditStamp())
+            .build(mockAspectRetriever);
+
+    // Create MCL item with previous aspect
+    MCLItemImpl mclItem =
+        MCLItemImpl.builder()
+            .previousRecordTemplate(previousProperties)
+            .build(changeItem, previousProperties, null, retrieverContext.getAspectRetriever());
+
+    // Run side effect
+    List<MCPItem> sideEffectResults =
+        sideEffect
+            .postMCPSideEffect(Collections.singletonList(mclItem), retrieverContext)
+            .collect(Collectors.toList());
+
+    // Verify results
+    assertEquals(sideEffectResults.size(), 2, "Expected two patch operations");
+
+    // Verify patch for previous latest version
+    MCPItem previousPatch = sideEffectResults.get(0);
+    assertEquals(previousPatch.getUrn(), PREVIOUS_LATEST_URN);
+    JsonObject previousPatchOp =
+        ((PatchItemImpl) previousPatch).getPatch().toJsonArray().getJsonObject(0);
+    assertEquals(previousPatchOp.getString("op"), "add");
+    assertEquals(previousPatchOp.getString("path"), "/isLatest");
+    assertEquals(previousPatchOp.getBoolean("value"), false);
+
+    // Verify patch for new latest version
+    MCPItem newPatch = sideEffectResults.get(1);
+    assertEquals(newPatch.getUrn(), NEW_LATEST_URN);
+    JsonObject newPatchOp = ((PatchItemImpl) newPatch).getPatch().toJsonArray().getJsonObject(0);
+    assertEquals(newPatchOp.getString("op"), "add");
+    assertEquals(newPatchOp.getString("path"), "/isLatest");
+    assertEquals(newPatchOp.getBoolean("value"), true);
+  }
+
+  @Test
+  public void testNoChangesWhenLatestRemainsSame() {
+    // Create version set properties with same latest
+    VersionSetProperties previousProperties = new VersionSetProperties();
+    previousProperties.setLatest(NEW_LATEST_URN);
+    previousProperties.setVersioningScheme(VersioningScheme.ALPHANUMERIC_GENERATED_BY_DATAHUB);
+
+    VersionSetProperties newProperties = new VersionSetProperties();
+    newProperties.setLatest(NEW_LATEST_URN);
+    newProperties.setVersioningScheme(VersioningScheme.ALPHANUMERIC_GENERATED_BY_DATAHUB);
+
+    EntitySpec entitySpec = TEST_REGISTRY.getEntitySpec(VERSION_SET_ENTITY_NAME);
+
+    // Create change item
+    ChangeItemImpl changeItem =
+        ChangeItemImpl.builder()
+            .urn(TEST_VERSION_SET_URN)
+            .aspectName(VERSION_SET_PROPERTIES_ASPECT_NAME)
+            .entitySpec(entitySpec)
+            .aspectSpec(entitySpec.getAspectSpec(VERSION_SET_PROPERTIES_ASPECT_NAME))
+            .recordTemplate(newProperties)
+            .auditStamp(AuditStampUtils.createDefaultAuditStamp())
+            .build(mockAspectRetriever);
+
+    // Create MCL item with previous aspect
+    MCLItemImpl mclItem =
+        MCLItemImpl.builder()
+            .previousRecordTemplate(previousProperties)
+            .build(changeItem, null, null, retrieverContext.getAspectRetriever());
+
+    // Run side effect
+    List<MCPItem> sideEffectResults =
+        sideEffect
+            .postMCPSideEffect(Collections.singletonList(mclItem), retrieverContext)
+            .collect(Collectors.toList());
+
+    // Verify results - should still get one patch to set isLatest=true on current latest
+    assertEquals(sideEffectResults.size(), 1, "Expected one patch operation");
+
+    // Verify patch operation
+    MCPItem patch = sideEffectResults.get(0);
+    assertEquals(patch.getUrn(), NEW_LATEST_URN);
+    JsonObject patchOp = ((PatchItemImpl) patch).getPatch().toJsonArray().getJsonObject(0);
+    assertEquals(patchOp.getString("op"), "add");
+    assertEquals(patchOp.getString("path"), "/isLatest");
+    assertEquals(patchOp.getBoolean("value"), true);
+  }
+
+  @Test
+  public void testNoChangesForNonVersionSetProperties() {
+    // Create some other type of aspect change
+    EntitySpec entitySpec = TEST_REGISTRY.getEntitySpec(DATASET_ENTITY_NAME);
+    ChangeItemImpl changeItem =
+        ChangeItemImpl.builder()
+            .urn(PREVIOUS_LATEST_URN)
+            .aspectName(GLOBAL_TAGS_ASPECT_NAME)
+            .entitySpec(entitySpec)
+            .aspectSpec(entitySpec.getAspectSpec(GLOBAL_TAGS_ASPECT_NAME))
+            .recordTemplate(new GlobalTags().setTags(new TagAssociationArray()))
+            .auditStamp(AuditStampUtils.createDefaultAuditStamp())
+            .build(mockAspectRetriever);
+
+    MCLItemImpl mclItem =
+        MCLItemImpl.builder().build(changeItem, null, null, retrieverContext.getAspectRetriever());
+
+    // Run side effect
+    List<MCPItem> sideEffectResults =
+        sideEffect
+            .postMCPSideEffect(Collections.singletonList(mclItem), retrieverContext)
+            .collect(Collectors.toList());
+
+    // Verify no changes for non-version set properties aspects
+    assertEquals(
+        sideEffectResults.size(), 0, "Expected no changes for non-version set properties aspect");
+  }
+}
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/validation/VersionPropertiesValidatorTest.java b/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/validation/VersionPropertiesValidatorTest.java
new file mode 100644
index 00000000000000..4afd05c98a9312
--- /dev/null
+++ b/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/validation/VersionPropertiesValidatorTest.java
@@ -0,0 +1,165 @@
+package com.linkedin.metadata.entity.versioning.validation;
+
+import static com.linkedin.metadata.Constants.CHART_ENTITY_NAME;
+
+import com.linkedin.common.VersionProperties;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.metadata.aspect.GraphRetriever;
+import com.linkedin.metadata.aspect.RetrieverContext;
+import com.linkedin.metadata.aspect.plugins.validation.AspectValidationException;
+import com.linkedin.metadata.entity.SearchRetriever;
+import com.linkedin.metadata.key.VersionSetKey;
+import com.linkedin.test.metadata.aspect.MockAspectRetriever;
+import com.linkedin.test.metadata.aspect.TestEntityRegistry;
+import com.linkedin.test.metadata.aspect.batch.TestMCP;
+import com.linkedin.versionset.VersionSetProperties;
+import com.linkedin.versionset.VersioningScheme;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+import org.mockito.Mockito;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class VersionPropertiesValidatorTest {
+
+  private static final String ENTITY_TYPE = "dataset";
+  private static final Urn TEST_VERSION_SET_URN =
+      UrnUtils.getUrn("urn:li:versionSet:(12356,dataset)");
+  private static final Urn TEST_ENTITY_URN =
+      UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD)");
+
+  private SearchRetriever mockSearchRetriever;
+  private MockAspectRetriever mockAspectRetriever;
+  private GraphRetriever mockGraphRetriever;
+  private RetrieverContext retrieverContext;
+
+  @BeforeMethod
+  public void setup() {
+    mockSearchRetriever = Mockito.mock(SearchRetriever.class);
+    mockGraphRetriever = Mockito.mock(GraphRetriever.class);
+
+    // Create version set key and properties
+    VersionSetKey versionSetKey = new VersionSetKey();
+    versionSetKey.setEntityType(ENTITY_TYPE);
+
+    VersionSetProperties versionSetProperties = new VersionSetProperties();
+    versionSetProperties.setVersioningScheme(VersioningScheme.ALPHANUMERIC_GENERATED_BY_DATAHUB);
+
+    // Initialize mock aspect retriever with version set data
+    Map<Urn, List<RecordTemplate>> data = new HashMap<>();
+    data.put(TEST_VERSION_SET_URN, Arrays.asList(versionSetKey, versionSetProperties));
+    mockAspectRetriever = new MockAspectRetriever(data);
+
+    retrieverContext =
+        io.datahubproject.metadata.context.RetrieverContext.builder()
+            .aspectRetriever(mockAspectRetriever)
+            .searchRetriever(mockSearchRetriever)
+            .graphRetriever(mockGraphRetriever)
+            .build();
+  }
+
+  @Test
+  public void testValidVersionProperties() {
+    VersionProperties properties = new VersionProperties();
+    properties.setVersionSet(TEST_VERSION_SET_URN);
+    properties.setSortId("ABCDEFGH"); // Valid 8-char uppercase alpha
+
+    Stream<AspectValidationException> validationResult =
+        VersionPropertiesValidator.validatePropertiesUpserts(
+            TestMCP.ofOneUpsertItem(TEST_ENTITY_URN, properties, new TestEntityRegistry()),
+            retrieverContext);
+
+    Assert.assertTrue(validationResult.findAny().isEmpty());
+  }
+
+  @Test
+  public void testInvalidSortId() {
+    VersionProperties properties = new VersionProperties();
+    properties.setVersionSet(TEST_VERSION_SET_URN);
+    properties.setSortId("123"); // Invalid - not 8 chars, not alpha
+
+    Stream<AspectValidationException> validationResult =
+        VersionPropertiesValidator.validatePropertiesUpserts(
+            TestMCP.ofOneUpsertItem(TEST_ENTITY_URN, properties, new TestEntityRegistry()),
+            retrieverContext);
+
+    AspectValidationException exception = validationResult.findAny().get();
+    Assert.assertNotNull(exception);
+    Assert.assertTrue(exception.getMessage().contains("Invalid sortID for Versioning Scheme"));
+  }
+
+  @Test
+  public void testNonexistentVersionSet() {
+    Urn nonexistentUrn = UrnUtils.getUrn("urn:li:versionSet:(nonexistent,dataset)");
+
+    VersionProperties properties = new VersionProperties();
+    properties.setVersionSet(nonexistentUrn);
+    properties.setSortId("ABCDEFGH");
+
+    Stream<AspectValidationException> validationResult =
+        VersionPropertiesValidator.validatePropertiesUpserts(
+            TestMCP.ofOneUpsertItem(TEST_ENTITY_URN, properties, new TestEntityRegistry()),
+            retrieverContext);
+
+    AspectValidationException exception = validationResult.findAny().get();
+    Assert.assertNotNull(exception);
+    Assert.assertTrue(exception.getMessage().contains("Version Set specified does not exist"));
+  }
+
+  @Test
+  public void testEntityTypeMismatch() {
+    // Create version set with different entity type
+    VersionSetKey wrongTypeKey = new VersionSetKey();
+    wrongTypeKey.setEntityType(CHART_ENTITY_NAME);
+
+    VersionSetProperties versionSetProperties = new VersionSetProperties();
+    versionSetProperties.setVersioningScheme(VersioningScheme.ALPHANUMERIC_GENERATED_BY_DATAHUB);
+
+    Map<Urn, List<RecordTemplate>> data = new HashMap<>();
+    data.put(TEST_VERSION_SET_URN, Arrays.asList(wrongTypeKey, versionSetProperties));
+    mockAspectRetriever = new MockAspectRetriever(data);
+
+    retrieverContext =
+        io.datahubproject.metadata.context.RetrieverContext.builder()
+            .aspectRetriever(mockAspectRetriever)
+            .searchRetriever(mockSearchRetriever)
+            .graphRetriever(mockGraphRetriever)
+            .build();
+
+    VersionProperties properties = new VersionProperties();
+    properties.setVersionSet(TEST_VERSION_SET_URN);
+    properties.setSortId("ABCDEFGH");
+
+    Stream<AspectValidationException> validationResult =
+        VersionPropertiesValidator.validatePropertiesUpserts(
+            TestMCP.ofOneUpsertItem(TEST_ENTITY_URN, properties, new TestEntityRegistry()),
+            retrieverContext);
+
+    AspectValidationException exception = validationResult.findAny().get();
+    Assert.assertNotNull(exception);
+    Assert.assertTrue(
+        exception.getMessage().contains("Version Set specified entity type does not match"));
+  }
+
+  @Test
+  public void testIsLatestFieldSpecified() {
+    VersionProperties properties = new VersionProperties();
+    properties.setVersionSet(TEST_VERSION_SET_URN);
+    properties.setSortId("ABCDEFGH");
+    properties.setIsLatest(true); // Should not be specified
+
+    Stream<AspectValidationException> validationResult =
+        VersionPropertiesValidator.validatePropertiesProposals(
+            TestMCP.ofOneUpsertItem(TEST_ENTITY_URN, properties, new TestEntityRegistry()));
+
+    AspectValidationException exception = validationResult.findAny().get();
+    Assert.assertNotNull(exception);
+    Assert.assertTrue(exception.getMessage().contains("IsLatest should not be specified"));
+  }
+}
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/validation/VersionSetPropertiesValidatorTest.java b/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/validation/VersionSetPropertiesValidatorTest.java
new file mode 100644
index 00000000000000..c91495271f6149
--- /dev/null
+++ b/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/validation/VersionSetPropertiesValidatorTest.java
@@ -0,0 +1,139 @@
+package com.linkedin.metadata.entity.versioning.validation;
+
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.metadata.aspect.GraphRetriever;
+import com.linkedin.metadata.aspect.RetrieverContext;
+import com.linkedin.metadata.aspect.plugins.validation.AspectValidationException;
+import com.linkedin.metadata.entity.SearchRetriever;
+import com.linkedin.test.metadata.aspect.MockAspectRetriever;
+import com.linkedin.test.metadata.aspect.TestEntityRegistry;
+import com.linkedin.test.metadata.aspect.batch.TestMCP;
+import com.linkedin.versionset.VersionSetProperties;
+import com.linkedin.versionset.VersioningScheme;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+import org.mockito.Mockito;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class VersionSetPropertiesValidatorTest {
+
+  private static final Urn TEST_VERSION_SET_URN =
+      UrnUtils.getUrn("urn:li:versionSet:(123456,dataset)");
+
+  private SearchRetriever mockSearchRetriever;
+  private MockAspectRetriever mockAspectRetriever;
+  private GraphRetriever mockGraphRetriever;
+  private RetrieverContext retrieverContext;
+
+  @BeforeMethod
+  public void setup() {
+    mockSearchRetriever = Mockito.mock(SearchRetriever.class);
+    mockGraphRetriever = Mockito.mock(GraphRetriever.class);
+
+    Map<Urn, List<RecordTemplate>> emptyData = new HashMap<>();
+    mockAspectRetriever = new MockAspectRetriever(emptyData);
+
+    retrieverContext =
+        io.datahubproject.metadata.context.RetrieverContext.builder()
+            .aspectRetriever(mockAspectRetriever)
+            .searchRetriever(mockSearchRetriever)
+            .graphRetriever(mockGraphRetriever)
+            .build();
+  }
+
+  @Test
+  public void testValidUpsertWithNoExistingProperties() {
+    // Create version set properties
+    VersionSetProperties properties =
+        new VersionSetProperties()
+            .setVersioningScheme(VersioningScheme.ALPHANUMERIC_GENERATED_BY_DATAHUB);
+
+    // Test validation with no existing properties
+    Stream<AspectValidationException> validationResult =
+        VersionSetPropertiesValidator.validatePropertiesUpserts(
+            TestMCP.ofOneUpsertItem(TEST_VERSION_SET_URN, properties, new TestEntityRegistry()),
+            retrieverContext);
+
+    // Assert no validation exceptions
+    Assert.assertTrue(validationResult.findAny().isEmpty());
+  }
+
+  @Test
+  public void testValidUpsertWithSameVersioningScheme() {
+    // Create existing properties with semantic versioning
+    VersionSetProperties existingProperties =
+        new VersionSetProperties()
+            .setVersioningScheme(VersioningScheme.ALPHANUMERIC_GENERATED_BY_DATAHUB);
+
+    // Set up mock retriever with existing properties
+    Map<Urn, List<RecordTemplate>> data = new HashMap<>();
+    data.put(TEST_VERSION_SET_URN, Collections.singletonList(existingProperties));
+    mockAspectRetriever = new MockAspectRetriever(data);
+
+    retrieverContext =
+        io.datahubproject.metadata.context.RetrieverContext.builder()
+            .aspectRetriever(mockAspectRetriever)
+            .searchRetriever(mockSearchRetriever)
+            .graphRetriever(mockGraphRetriever)
+            .build();
+
+    // Create new properties with same versioning scheme
+    VersionSetProperties newProperties =
+        new VersionSetProperties()
+            .setVersioningScheme(VersioningScheme.ALPHANUMERIC_GENERATED_BY_DATAHUB);
+
+    // Test validation
+    Stream<AspectValidationException> validationResult =
+        VersionSetPropertiesValidator.validatePropertiesUpserts(
+            TestMCP.ofOneUpsertItem(TEST_VERSION_SET_URN, newProperties, new TestEntityRegistry()),
+            retrieverContext);
+
+    // Assert no validation exceptions
+    Assert.assertTrue(validationResult.findAny().isEmpty());
+  }
+
+  @Test
+  public void testInvalidUpsertWithDifferentVersioningScheme() {
+    // Create existing properties with semantic versioning
+    VersionSetProperties existingProperties =
+        new VersionSetProperties()
+            .setVersioningScheme(VersioningScheme.ALPHANUMERIC_GENERATED_BY_DATAHUB);
+
+    // Set up mock retriever with existing properties
+    Map<Urn, List<RecordTemplate>> data = new HashMap<>();
+    data.put(TEST_VERSION_SET_URN, Collections.singletonList(existingProperties));
+    mockAspectRetriever = new MockAspectRetriever(data);
+
+    retrieverContext =
+        io.datahubproject.metadata.context.RetrieverContext.builder()
+            .aspectRetriever(mockAspectRetriever)
+            .searchRetriever(mockSearchRetriever)
+            .graphRetriever(mockGraphRetriever)
+            .build();
+
+    // Create new properties with different versioning scheme
+    VersionSetProperties newProperties =
+        new VersionSetProperties().setVersioningScheme(VersioningScheme.$UNKNOWN);
+
+    // Test validation
+    Stream<AspectValidationException> validationResult =
+        VersionSetPropertiesValidator.validatePropertiesUpserts(
+            TestMCP.ofOneUpsertItem(TEST_VERSION_SET_URN, newProperties, new TestEntityRegistry()),
+            retrieverContext);
+
+    // Assert validation exception exists
+    AspectValidationException exception = validationResult.findAny().get();
+    Assert.assertNotNull(exception);
+    Assert.assertTrue(exception.getMessage().contains("Versioning Scheme cannot change"));
+    Assert.assertTrue(
+        exception.getMessage().contains("Expected Scheme: ALPHANUMERIC_GENERATED_BY_DATAHUB"));
+    Assert.assertTrue(exception.getMessage().contains("Provided Scheme: $UNKNOWN"));
+  }
+}
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AutocompleteRequestHandlerTest.java b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AutocompleteRequestHandlerTest.java
index c5205906e9d373..23d493b7287f78 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AutocompleteRequestHandlerTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AutocompleteRequestHandlerTest.java
@@ -1,9 +1,12 @@
 package com.linkedin.metadata.search.query.request;
 
+import static com.linkedin.metadata.Constants.DATASET_ENTITY_NAME;
+import static com.linkedin.metadata.utils.CriterionUtils.buildCriterion;
 import static org.mockito.Mockito.mock;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
+import com.google.common.collect.ImmutableList;
 import com.linkedin.metadata.TestEntitySpecBuilder;
 import com.linkedin.metadata.config.search.ExactMatchConfiguration;
 import com.linkedin.metadata.config.search.PartialConfiguration;
@@ -13,22 +16,35 @@
 import com.linkedin.metadata.config.search.custom.BoolQueryConfiguration;
 import com.linkedin.metadata.config.search.custom.CustomSearchConfiguration;
 import com.linkedin.metadata.config.search.custom.QueryConfiguration;
+import com.linkedin.metadata.models.EntitySpec;
 import com.linkedin.metadata.models.registry.EntityRegistry;
+import com.linkedin.metadata.query.filter.Condition;
+import com.linkedin.metadata.query.filter.ConjunctiveCriterion;
+import com.linkedin.metadata.query.filter.ConjunctiveCriterionArray;
+import com.linkedin.metadata.query.filter.Criterion;
+import com.linkedin.metadata.query.filter.CriterionArray;
+import com.linkedin.metadata.query.filter.Filter;
 import com.linkedin.metadata.search.elasticsearch.query.filter.QueryFilterRewriteChain;
 import com.linkedin.metadata.search.elasticsearch.query.request.AutocompleteRequestHandler;
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.test.metadata.context.TestOperationContexts;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.common.lucene.search.function.FieldValueFactorFunction;
 import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
 import org.opensearch.index.query.MatchAllQueryBuilder;
 import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
 import org.opensearch.index.query.MatchQueryBuilder;
 import org.opensearch.index.query.MultiMatchQueryBuilder;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.TermQueryBuilder;
 import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
 import org.opensearch.index.query.functionscore.ScoreFunctionBuilders;
 import org.opensearch.search.builder.SearchSourceBuilder;
@@ -40,6 +56,8 @@ public class AutocompleteRequestHandlerTest {
   private static AutocompleteRequestHandler handler;
   private OperationContext mockOpContext =
       TestOperationContexts.systemContextNoSearchAuthorization(mock(EntityRegistry.class));
+  private OperationContext nonMockOpContext =
+      TestOperationContexts.systemContextNoSearchAuthorization();
 
   static {
     testQueryConfig = new SearchConfiguration();
@@ -465,10 +483,148 @@ public void testCustomConfigWithFunctionScores() {
     assertEquals(wrapper.filterFunctionBuilders(), expectedCustomScoreFunctions);
   }
 
+  @Test
+  public void testFilterLatestVersions() {
+    final Criterion filterCriterion =
+        buildCriterion("platform", Condition.EQUAL, "mysql", "bigquery");
+
+    final BoolQueryBuilder testQuery =
+        getQuery(
+            filterCriterion,
+            nonMockOpContext.getEntityRegistry().getEntitySpec(DATASET_ENTITY_NAME),
+            true);
+
+    List<QueryBuilder> isLatestQueries =
+        testQuery.filter().stream()
+            .filter(filter -> filter instanceof BoolQueryBuilder)
+            .flatMap(filter -> ((BoolQueryBuilder) filter).must().stream())
+            .filter(must -> must instanceof BoolQueryBuilder)
+            .flatMap(must -> ((BoolQueryBuilder) must).should().stream())
+            .filter(should -> should instanceof BoolQueryBuilder)
+            .flatMap(
+                should -> {
+                  BoolQueryBuilder boolShould = (BoolQueryBuilder) should;
+
+                  // Get isLatest: true term queries
+                  Stream<QueryBuilder> filterQueries =
+                      boolShould.filter().stream()
+                          .filter(
+                              f ->
+                                  f instanceof TermQueryBuilder
+                                      && ((TermQueryBuilder) f).fieldName().equals("isLatest"));
+
+                  // Get isLatest exists queries
+                  Stream<QueryBuilder> existsQueries =
+                      boolShould.mustNot().stream()
+                          .filter(mn -> mn instanceof BoolQueryBuilder)
+                          .flatMap(mn -> ((BoolQueryBuilder) mn).must().stream())
+                          .filter(
+                              mq ->
+                                  mq instanceof ExistsQueryBuilder
+                                      && ((ExistsQueryBuilder) mq).fieldName().equals("isLatest"));
+
+                  return Stream.concat(filterQueries, existsQueries);
+                })
+            .collect(Collectors.toList());
+
+    assertTrue(isLatestQueries.size() == 2, "Expected to find two queries");
+    final TermQueryBuilder termQueryBuilder = (TermQueryBuilder) isLatestQueries.get(0);
+    assertEquals(termQueryBuilder.fieldName(), "isLatest");
+    Set<Boolean> values = new HashSet<>();
+    values.add((Boolean) termQueryBuilder.value());
+
+    assertEquals(values.size(), 1, "Expected only true value.");
+    assertTrue(values.contains(true));
+    final ExistsQueryBuilder existsQueryBuilder = (ExistsQueryBuilder) isLatestQueries.get(1);
+    assertEquals(existsQueryBuilder.fieldName(), "isLatest");
+  }
+
+  @Test
+  public void testNoFilterLatestVersions() {
+    final Criterion filterCriterion =
+        buildCriterion("platform", Condition.EQUAL, "mysql", "bigquery");
+
+    final BoolQueryBuilder testQuery =
+        getQuery(
+            filterCriterion,
+            nonMockOpContext.getEntityRegistry().getEntitySpec(DATASET_ENTITY_NAME),
+            false);
+
+    // bool -> filter -> [bool] -> must -> [bool]
+    List<QueryBuilder> isLatestQueries =
+        testQuery.filter().stream()
+            .filter(filter -> filter instanceof BoolQueryBuilder)
+            .flatMap(filter -> ((BoolQueryBuilder) filter).must().stream())
+            .filter(must -> must instanceof BoolQueryBuilder)
+            .flatMap(must -> ((BoolQueryBuilder) must).should().stream())
+            .filter(should -> should instanceof BoolQueryBuilder)
+            .flatMap(
+                should -> {
+                  BoolQueryBuilder boolShould = (BoolQueryBuilder) should;
+
+                  // Get isLatest: true term queries
+                  Stream<QueryBuilder> filterQueries =
+                      boolShould.filter().stream()
+                          .filter(
+                              f ->
+                                  f instanceof TermQueryBuilder
+                                      && ((TermQueryBuilder) f).fieldName().equals("isLatest"));
+
+                  // Get isLatest exists queries
+                  Stream<QueryBuilder> existsQueries =
+                      boolShould.mustNot().stream()
+                          .filter(mn -> mn instanceof BoolQueryBuilder)
+                          .flatMap(mn -> ((BoolQueryBuilder) mn).must().stream())
+                          .filter(
+                              mq ->
+                                  mq instanceof ExistsQueryBuilder
+                                      && ((ExistsQueryBuilder) mq).fieldName().equals("isLatest"));
+
+                  return Stream.concat(filterQueries, existsQueries);
+                })
+            .collect(Collectors.toList());
+
+    assertTrue(isLatestQueries.isEmpty(), "Expected to find no queries");
+  }
+
   private static QueryBuilder extractNestedQuery(BoolQueryBuilder nested) {
     assertEquals(nested.should().size(), 1);
     BoolQueryBuilder firstLevel = (BoolQueryBuilder) nested.should().get(0);
     assertEquals(firstLevel.should().size(), 1);
     return firstLevel.should().get(0);
   }
+
+  private BoolQueryBuilder getQuery(
+      final Criterion filterCriterion, final EntitySpec entitySpec, boolean filterNonLatest) {
+    final Filter filter =
+        new Filter()
+            .setOr(
+                new ConjunctiveCriterionArray(
+                    new ConjunctiveCriterion()
+                        .setAnd(new CriterionArray(ImmutableList.of(filterCriterion)))));
+
+    AutocompleteRequestHandler requestHandler =
+        AutocompleteRequestHandler.getBuilder(
+            entitySpec,
+            CustomSearchConfiguration.builder().build(),
+            QueryFilterRewriteChain.EMPTY,
+            testQueryConfig);
+
+    return (BoolQueryBuilder)
+        ((FunctionScoreQueryBuilder)
+                requestHandler
+                    .getSearchRequest(
+                        mockOpContext.withSearchFlags(
+                            flags ->
+                                flags
+                                    .setFulltext(false)
+                                    .setFilterNonLatestVersions(filterNonLatest)),
+                        "",
+                        "platform",
+                        filter,
+                        3)
+                    .source()
+                    .query())
+            .query();
+  }
 }
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
index 1a91ae35c6595b..1fea4476d75abb 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
@@ -1,6 +1,7 @@
 package com.linkedin.metadata.search.query.request;
 
 import static com.linkedin.datahub.graphql.resolvers.search.SearchUtils.SEARCHABLE_ENTITY_TYPES;
+import static com.linkedin.metadata.Constants.DATASET_ENTITY_NAME;
 import static com.linkedin.metadata.Constants.STATUS_ASPECT_NAME;
 import static com.linkedin.metadata.utils.CriterionUtils.buildCriterion;
 import static com.linkedin.metadata.utils.CriterionUtils.buildExistsCriterion;
@@ -56,6 +57,8 @@
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.ExistsQueryBuilder;
 import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
 import org.opensearch.index.query.TermsQueryBuilder;
 import org.opensearch.search.aggregations.AggregationBuilder;
 import org.opensearch.search.aggregations.AggregationBuilders;
@@ -805,7 +808,214 @@ public void testQueryByDefault() {
     }
   }
 
+  @Test
+  public void testFilterLatestVersions() {
+    final Criterion filterCriterion =
+        buildCriterion("platform", Condition.EQUAL, "mysql", "bigquery");
+
+    final BoolQueryBuilder testQuery =
+        getQuery(
+            filterCriterion,
+            operationContext.getEntityRegistry().getEntitySpec(DATASET_ENTITY_NAME),
+            true);
+
+    List<QueryBuilder> isLatestQueries =
+        testQuery.filter().stream()
+            .filter(filter -> filter instanceof BoolQueryBuilder)
+            .flatMap(filter -> ((BoolQueryBuilder) filter).must().stream())
+            .filter(must -> must instanceof BoolQueryBuilder)
+            .flatMap(must -> ((BoolQueryBuilder) must).should().stream())
+            .filter(should -> should instanceof BoolQueryBuilder)
+            .flatMap(
+                should -> {
+                  BoolQueryBuilder boolShould = (BoolQueryBuilder) should;
+
+                  // Get isLatest: true term queries
+                  Stream<QueryBuilder> filterQueries =
+                      boolShould.filter().stream()
+                          .filter(
+                              f ->
+                                  f instanceof TermQueryBuilder
+                                      && ((TermQueryBuilder) f).fieldName().equals("isLatest"));
+
+                  // Get isLatest exists queries
+                  Stream<QueryBuilder> existsQueries =
+                      boolShould.mustNot().stream()
+                          .filter(mn -> mn instanceof BoolQueryBuilder)
+                          .flatMap(mn -> ((BoolQueryBuilder) mn).must().stream())
+                          .filter(
+                              mq ->
+                                  mq instanceof ExistsQueryBuilder
+                                      && ((ExistsQueryBuilder) mq).fieldName().equals("isLatest"));
+
+                  return Stream.concat(filterQueries, existsQueries);
+                })
+            .collect(Collectors.toList());
+
+    assertEquals(isLatestQueries.size(), 2, "Expected to find two queries");
+    final TermQueryBuilder termQueryBuilder = (TermQueryBuilder) isLatestQueries.get(0);
+    assertEquals(termQueryBuilder.fieldName(), "isLatest");
+    Set<Boolean> values = new HashSet<>();
+    values.add((Boolean) termQueryBuilder.value());
+
+    assertEquals(values.size(), 1, "Expected only true value.");
+    assertTrue(values.contains(true));
+    final ExistsQueryBuilder existsQueryBuilder = (ExistsQueryBuilder) isLatestQueries.get(1);
+    assertEquals(existsQueryBuilder.fieldName(), "isLatest");
+  }
+
+  @Test
+  public void testNoFilterLatestVersions() {
+    final Criterion filterCriterion =
+        buildCriterion("platform", Condition.EQUAL, "mysql", "bigquery");
+
+    final BoolQueryBuilder testQuery =
+        getQuery(
+            filterCriterion,
+            operationContext.getEntityRegistry().getEntitySpec(DATASET_ENTITY_NAME),
+            false);
+
+    List<QueryBuilder> isLatestQueries =
+        testQuery.filter().stream()
+            .filter(filter -> filter instanceof BoolQueryBuilder)
+            .flatMap(filter -> ((BoolQueryBuilder) filter).must().stream())
+            .filter(must -> must instanceof BoolQueryBuilder)
+            .flatMap(must -> ((BoolQueryBuilder) must).should().stream())
+            .filter(should -> should instanceof BoolQueryBuilder)
+            .flatMap(
+                should -> {
+                  BoolQueryBuilder boolShould = (BoolQueryBuilder) should;
+
+                  // Get isLatest: true term queries
+                  Stream<QueryBuilder> filterQueries =
+                      boolShould.filter().stream()
+                          .filter(
+                              f ->
+                                  f instanceof TermQueryBuilder
+                                      && ((TermQueryBuilder) f).fieldName().equals("isLatest"));
+
+                  // Get isLatest exists queries
+                  Stream<QueryBuilder> existsQueries =
+                      boolShould.mustNot().stream()
+                          .filter(mn -> mn instanceof BoolQueryBuilder)
+                          .flatMap(mn -> ((BoolQueryBuilder) mn).must().stream())
+                          .filter(
+                              mq ->
+                                  mq instanceof ExistsQueryBuilder
+                                      && ((ExistsQueryBuilder) mq).fieldName().equals("isLatest"));
+
+                  return Stream.concat(filterQueries, existsQueries);
+                })
+            .collect(Collectors.toList());
+
+    assertTrue(isLatestQueries.isEmpty(), "Expected to find no queries");
+  }
+
+  @Test
+  public void testAggregationFilterLatestVersions() {
+    final Criterion filterCriterion =
+        buildCriterion("platform", Condition.EQUAL, "mysql", "bigquery");
+
+    final BoolQueryBuilder testQuery =
+        getAggregationQuery(
+            filterCriterion,
+            operationContext.getEntityRegistry().getEntitySpec(DATASET_ENTITY_NAME),
+            true);
+
+    List<QueryBuilder> isLatestQueries =
+        testQuery.must().stream()
+            .filter(must -> must instanceof BoolQueryBuilder)
+            .flatMap(must -> ((BoolQueryBuilder) must).should().stream())
+            .filter(should -> should instanceof BoolQueryBuilder)
+            .flatMap(
+                should -> {
+                  BoolQueryBuilder boolShould = (BoolQueryBuilder) should;
+
+                  // Get isLatest: true term queries
+                  Stream<QueryBuilder> filterQueries =
+                      boolShould.filter().stream()
+                          .filter(
+                              f ->
+                                  f instanceof TermQueryBuilder
+                                      && ((TermQueryBuilder) f).fieldName().equals("isLatest"));
+
+                  // Get isLatest exists queries
+                  Stream<QueryBuilder> existsQueries =
+                      boolShould.mustNot().stream()
+                          .filter(mn -> mn instanceof BoolQueryBuilder)
+                          .flatMap(mn -> ((BoolQueryBuilder) mn).must().stream())
+                          .filter(
+                              mq ->
+                                  mq instanceof ExistsQueryBuilder
+                                      && ((ExistsQueryBuilder) mq).fieldName().equals("isLatest"));
+
+                  return Stream.concat(filterQueries, existsQueries);
+                })
+            .collect(Collectors.toList());
+
+    assertEquals(isLatestQueries.size(), 2, "Expected to find two queries");
+    final TermQueryBuilder termQueryBuilder = (TermQueryBuilder) isLatestQueries.get(0);
+    assertEquals(termQueryBuilder.fieldName(), "isLatest");
+    Set<Boolean> values = new HashSet<>();
+    values.add((Boolean) termQueryBuilder.value());
+
+    assertEquals(values.size(), 1, "Expected only true value.");
+    assertTrue(values.contains(true));
+    final ExistsQueryBuilder existsQueryBuilder = (ExistsQueryBuilder) isLatestQueries.get(1);
+    assertEquals(existsQueryBuilder.fieldName(), "isLatest");
+  }
+
+  @Test
+  public void testAggregationNoFilterLatestVersions() {
+    final Criterion filterCriterion =
+        buildCriterion("platform", Condition.EQUAL, "mysql", "bigquery");
+
+    final BoolQueryBuilder testQuery =
+        getAggregationQuery(
+            filterCriterion,
+            operationContext.getEntityRegistry().getEntitySpec(DATASET_ENTITY_NAME),
+            false);
+
+    List<QueryBuilder> isLatestQueries =
+        testQuery.must().stream()
+            .filter(must -> must instanceof BoolQueryBuilder)
+            .flatMap(must -> ((BoolQueryBuilder) must).should().stream())
+            .filter(should -> should instanceof BoolQueryBuilder)
+            .flatMap(
+                should -> {
+                  BoolQueryBuilder boolShould = (BoolQueryBuilder) should;
+
+                  // Get isLatest: true term queries
+                  Stream<QueryBuilder> filterQueries =
+                      boolShould.filter().stream()
+                          .filter(
+                              f ->
+                                  f instanceof TermQueryBuilder
+                                      && ((TermQueryBuilder) f).fieldName().equals("isLatest"));
+
+                  // Get isLatest exists queries
+                  Stream<QueryBuilder> existsQueries =
+                      boolShould.mustNot().stream()
+                          .filter(mn -> mn instanceof BoolQueryBuilder)
+                          .flatMap(mn -> ((BoolQueryBuilder) mn).must().stream())
+                          .filter(
+                              mq ->
+                                  mq instanceof ExistsQueryBuilder
+                                      && ((ExistsQueryBuilder) mq).fieldName().equals("isLatest"));
+
+                  return Stream.concat(filterQueries, existsQueries);
+                })
+            .collect(Collectors.toList());
+
+    assertTrue(isLatestQueries.isEmpty(), "Expected to find no queries");
+  }
+
   private BoolQueryBuilder getQuery(final Criterion filterCriterion) {
+    return getQuery(filterCriterion, TestEntitySpecBuilder.getSpec(), true);
+  }
+
+  private BoolQueryBuilder getQuery(
+      final Criterion filterCriterion, final EntitySpec entitySpec, boolean filterNonLatest) {
     final Filter filter =
         new Filter()
             .setOr(
@@ -816,7 +1026,7 @@ private BoolQueryBuilder getQuery(final Criterion filterCriterion) {
     final SearchRequestHandler requestHandler =
         SearchRequestHandler.getBuilder(
             operationContext.getEntityRegistry(),
-            TestEntitySpecBuilder.getSpec(),
+            entitySpec,
             testQueryConfig,
             null,
             QueryFilterRewriteChain.EMPTY);
@@ -824,7 +1034,8 @@ private BoolQueryBuilder getQuery(final Criterion filterCriterion) {
     return (BoolQueryBuilder)
         requestHandler
             .getSearchRequest(
-                operationContext.withSearchFlags(flags -> flags.setFulltext(false)),
+                operationContext.withSearchFlags(
+                    flags -> flags.setFulltext(false).setFilterNonLatestVersions(filterNonLatest)),
                 "",
                 filter,
                 null,
@@ -834,4 +1045,33 @@ private BoolQueryBuilder getQuery(final Criterion filterCriterion) {
             .source()
             .query();
   }
+
+  private BoolQueryBuilder getAggregationQuery(
+      final Criterion filterCriterion, final EntitySpec entitySpec, boolean filterNonLatest) {
+    final Filter filter =
+        new Filter()
+            .setOr(
+                new ConjunctiveCriterionArray(
+                    new ConjunctiveCriterion()
+                        .setAnd(new CriterionArray(ImmutableList.of(filterCriterion)))));
+
+    final SearchRequestHandler requestHandler =
+        SearchRequestHandler.getBuilder(
+            operationContext.getEntityRegistry(),
+            entitySpec,
+            testQueryConfig,
+            null,
+            QueryFilterRewriteChain.EMPTY);
+
+    return (BoolQueryBuilder)
+        requestHandler
+            .getAggregationRequest(
+                operationContext.withSearchFlags(
+                    flags -> flags.setFulltext(false).setFilterNonLatestVersions(filterNonLatest)),
+                "platform",
+                filter,
+                10)
+            .source()
+            .query();
+  }
 }
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/transformer/SearchDocumentTransformerTest.java b/metadata-io/src/test/java/com/linkedin/metadata/search/transformer/SearchDocumentTransformerTest.java
index 65b73b7425b743..5a4fb39bd50e96 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/transformer/SearchDocumentTransformerTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/transformer/SearchDocumentTransformerTest.java
@@ -430,4 +430,23 @@ public void testEmptyDescription() throws RemoteInvocationException, URISyntaxEx
     assertTrue(transformed.get().get("description").isNull());
     assertFalse(transformed.get().get("hasDescription").asBoolean());
   }
+
+  @Test
+  public void testHandleRemoveFieldsWithStructuredProperties() throws IOException {
+    ObjectNode previousDoc = JsonNodeFactory.instance.objectNode();
+    previousDoc.put("structuredProperties.prop1", "value1");
+    previousDoc.put("structuredProperties.prop2", "value2");
+    previousDoc.put("otherField", "value3");
+
+    ObjectNode newDoc = JsonNodeFactory.instance.objectNode();
+    newDoc.put("structuredProperties.prop1", "updatedValue1");
+    newDoc.put("otherField", "updatedValue3");
+
+    ObjectNode result = SearchDocumentTransformer.handleRemoveFields(newDoc, previousDoc);
+
+    assertEquals(result.get("structuredProperties.prop1").asText(), "updatedValue1");
+    assertTrue(result.has("structuredProperties.prop2"));
+    assertTrue(result.get("structuredProperties.prop2").isNull());
+    assertEquals(result.get("otherField").asText(), "updatedValue3");
+  }
 }
diff --git a/metadata-models/src/main/pegasus/com/linkedin/common/VersionProperties.pdl b/metadata-models/src/main/pegasus/com/linkedin/common/VersionProperties.pdl
new file mode 100644
index 00000000000000..af4d48debe0217
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/common/VersionProperties.pdl
@@ -0,0 +1,77 @@
+namespace com.linkedin.common
+
+/**
+ * Properties about a versioned asset i.e. dataset, ML Model, etc.
+ */
+@Aspect = {
+  "name": "versionProperties"
+}
+record VersionProperties {
+  /**
+   * The linked Version Set entity that ties multiple versioned assets together
+   */
+  @Searchable = {
+    "queryByDefault": false
+  }
+  @Relationship = {
+    "name": "VersionOf",
+    "entityTypes": [ "versionSet" ]
+  }
+  versionSet: Urn
+
+  /**
+   * Label for this versioned asset, is unique within a version set
+   */
+  @Searchable = {
+    "/versionTag": {
+      "fieldName": "version",
+      "queryByDefault": false
+    }
+  }
+  version: VersionTag
+
+  /**
+   * Associated aliases for this versioned asset
+   */
+  @Searchable = {
+    "/*/versionTag": {
+      "fieldName": "aliases",
+      "queryByDefault": false
+    }
+  }
+  aliases: array[VersionTag] = []
+
+  /**
+   * Comment documenting what this version was created for, changes, or represents
+   */
+  comment: optional string
+
+  /**
+   * Sort identifier that determines where a version lives in the order of the Version Set.
+   * What this looks like depends on the Version Scheme. For sort ids generated by DataHub we use an 8 character string representation.
+   */
+  @Searchable = {
+    "queryByDefault": false,
+    "fieldName": "versionSortId"
+  }
+  sortId: string
+
+  /**
+   * Timestamp reflecting when this asset version was created in the source system.
+   */
+  sourceCreatedTimestamp: optional AuditStamp
+
+  /**
+   * Timestamp reflecting when the metadata for this version was created in DataHub
+   */
+  metadataCreatedTimestamp: optional AuditStamp
+
+  /**
+   * Marks whether this version is currently the latest. Set by a side effect and should not be modified by API.
+   */
+   @Searchable = {
+       "queryByDefault": false,
+       "fieldType": "BOOLEAN"
+   }
+  isLatest: optional boolean
+}
\ No newline at end of file
diff --git a/li-utils/src/main/pegasus/com/linkedin/common/VersionTag.pdl b/metadata-models/src/main/pegasus/com/linkedin/common/VersionTag.pdl
similarity index 78%
rename from li-utils/src/main/pegasus/com/linkedin/common/VersionTag.pdl
rename to metadata-models/src/main/pegasus/com/linkedin/common/VersionTag.pdl
index f26a1b0140b793..82f2193747c5d3 100644
--- a/li-utils/src/main/pegasus/com/linkedin/common/VersionTag.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/common/VersionTag.pdl
@@ -5,4 +5,5 @@ namespace com.linkedin.common
  */
 record VersionTag {
   versionTag: optional string
+  metadataAttribution: optional MetadataAttribution
 }
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/metadata/key/VersionSetKey.pdl b/metadata-models/src/main/pegasus/com/linkedin/metadata/key/VersionSetKey.pdl
new file mode 100644
index 00000000000000..edbddc29e2023f
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/metadata/key/VersionSetKey.pdl
@@ -0,0 +1,20 @@
+namespace com.linkedin.metadata.key
+
+
+/**
+ * Key for a Version Set entity
+ */
+@Aspect = {
+	"name": "versionSetKey"
+}
+record VersionSetKey {
+  /**
+   * ID of the Version Set, generated from platform + asset id / name
+   */
+	id: string
+
+	/**
+	 * Type of entities included in version set, limits to a single entity type between linked versioned entities
+	 */
+	entityType: string
+}
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/metadata/query/SearchFlags.pdl b/metadata-models/src/main/pegasus/com/linkedin/metadata/query/SearchFlags.pdl
index a3a7a8cda58a8d..ab5873452641ed 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/metadata/query/SearchFlags.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/metadata/query/SearchFlags.pdl
@@ -64,4 +64,9 @@ record SearchFlags {
     * By default we include these, but custom aggregation requests don't need them.
     */
   includeDefaultFacets: optional boolean = true
+
+  /**
+   * Include only latest versions in version sets, default true
+   */
+   filterNonLatestVersions: optional boolean = true
 }
diff --git a/metadata-models/src/main/pegasus/com/linkedin/versionset/VersionSetProperties.pdl b/metadata-models/src/main/pegasus/com/linkedin/versionset/VersionSetProperties.pdl
new file mode 100644
index 00000000000000..0e50c33aa2b7d4
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/versionset/VersionSetProperties.pdl
@@ -0,0 +1,24 @@
+namespace com.linkedin.versionset
+
+import com.linkedin.common.CustomProperties
+import com.linkedin.common.Urn
+
+@Aspect = {
+  "name": "versionSetProperties"
+}
+record VersionSetProperties includes CustomProperties {
+  /**
+   * The latest versioned entity linked to in this version set
+   */
+  @Searchable = {
+    "queryByDefault": "false"
+  }
+  latest: Urn
+
+  /**
+   * What versioning scheme is being utilized for the versioned entities sort criterion. Static once set
+   */
+  versioningScheme: enum VersioningScheme {
+    ALPHANUMERIC_GENERATED_BY_DATAHUB
+  }
+}
\ No newline at end of file
diff --git a/metadata-models/src/main/resources/entity-registry.yml b/metadata-models/src/main/resources/entity-registry.yml
index 1556b72e4aefb1..32f9d1b98db5df 100644
--- a/metadata-models/src/main/resources/entity-registry.yml
+++ b/metadata-models/src/main/resources/entity-registry.yml
@@ -46,6 +46,7 @@ entities:
       - structuredProperties
       - forms
       - partitionsSummary
+      - versionProperties
   - name: dataHubPolicy
     doc: DataHub Policies represent access policies granted to users or groups on metadata operations like edit, view etc.
     category: internal
@@ -365,6 +366,7 @@ entities:
       - structuredProperties
       - forms
       - testResults
+      - versionProperties
   - name: mlModelGroup
     category: core
     keyAspect: mlModelGroupKey
@@ -494,6 +496,11 @@ entities:
     keyAspect: globalSettingsKey
     aspects:
       - globalSettingsInfo
+  - name: versionSet
+    category: core
+    keyAspect: versionSetKey
+    aspects:
+      - versionSetProperties
   - name: incident
     doc: An incident for an asset.
     category: core
diff --git a/metadata-service/configuration/src/main/java/com/linkedin/datahub/graphql/featureflags/FeatureFlags.java b/metadata-service/configuration/src/main/java/com/linkedin/datahub/graphql/featureflags/FeatureFlags.java
index 97ca0dcabea9f3..eeb90d09204bb9 100644
--- a/metadata-service/configuration/src/main/java/com/linkedin/datahub/graphql/featureflags/FeatureFlags.java
+++ b/metadata-service/configuration/src/main/java/com/linkedin/datahub/graphql/featureflags/FeatureFlags.java
@@ -26,4 +26,5 @@ public class FeatureFlags {
   private boolean alternateMCPValidation = false;
   private boolean showManageStructuredProperties = false;
   private boolean dataProcessInstanceEntityEnabled = true;
+  private boolean entityVersioning = false;
 }
diff --git a/metadata-service/configuration/src/main/resources/application.yaml b/metadata-service/configuration/src/main/resources/application.yaml
index c029cb4648d012..69b86962442b91 100644
--- a/metadata-service/configuration/src/main/resources/application.yaml
+++ b/metadata-service/configuration/src/main/resources/application.yaml
@@ -466,6 +466,7 @@ featureFlags:
   showSeparateSiblings: ${SHOW_SEPARATE_SIBLINGS:false} # If turned on, all siblings will be separated with no way to get to a "combined" sibling view
   editableDatasetNameEnabled: ${EDITABLE_DATASET_NAME_ENABLED:false} # Enables the ability to edit the dataset name in the UI
   showManageStructuredProperties: ${SHOW_MANAGE_STRUCTURED_PROPERTIES:true} # If turned on, show the manage structured properties button on the govern dropdown
+  entityVersioning: ${ENTITY_VERSIONING_ENABLED:false} # Enables entity versioning APIs, validators, and side effects
 
 entityChangeEvents:
   enabled: ${ENABLE_ENTITY_CHANGE_EVENTS_HOOK:true}
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/entity/versioning/EntityVersioningServiceFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/entity/versioning/EntityVersioningServiceFactory.java
new file mode 100644
index 00000000000000..4d03860cccb5ca
--- /dev/null
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/entity/versioning/EntityVersioningServiceFactory.java
@@ -0,0 +1,21 @@
+package com.linkedin.gms.factory.entity.versioning;
+
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.entity.versioning.EntityVersioningService;
+import com.linkedin.metadata.entity.versioning.EntityVersioningServiceImpl;
+import javax.annotation.Nonnull;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Slf4j
+@Configuration
+public class EntityVersioningServiceFactory {
+
+  @Bean(name = "entityVersioningService")
+  @Nonnull
+  protected EntityVersioningService createInstance(EntityService<?> entityService) {
+
+    return new EntityVersioningServiceImpl(entityService);
+  }
+}
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/graphql/GraphQLEngineFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/graphql/GraphQLEngineFactory.java
index 3229f12f9021d0..8f389eccc4cf8f 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/graphql/GraphQLEngineFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/graphql/GraphQLEngineFactory.java
@@ -27,6 +27,7 @@
 import com.linkedin.metadata.config.GraphQLConcurrencyConfiguration;
 import com.linkedin.metadata.connection.ConnectionService;
 import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.entity.versioning.EntityVersioningService;
 import com.linkedin.metadata.graph.GraphClient;
 import com.linkedin.metadata.graph.GraphService;
 import com.linkedin.metadata.graph.SiblingGraphService;
@@ -205,7 +206,8 @@ public class GraphQLEngineFactory {
   @Nonnull
   protected GraphQLEngine graphQLEngine(
       @Qualifier("entityClient") final EntityClient entityClient,
-      @Qualifier("systemEntityClient") final SystemEntityClient systemEntityClient) {
+      @Qualifier("systemEntityClient") final SystemEntityClient systemEntityClient,
+      final EntityVersioningService entityVersioningService) {
     GmsGraphQLEngineArgs args = new GmsGraphQLEngineArgs();
     args.setEntityClient(entityClient);
     args.setSystemEntityClient(systemEntityClient);
@@ -255,6 +257,7 @@ protected GraphQLEngine graphQLEngine(
         configProvider.getGraphQL().getQuery().isIntrospectionEnabled());
     args.setGraphQLQueryDepthLimit(configProvider.getGraphQL().getQuery().getDepthLimit());
     args.setBusinessAttributeService(businessAttributeService);
+    args.setEntityVersioningService(entityVersioningService);
     args.setConnectionService(_connectionService);
     args.setAssertionService(assertionService);
     return new GmsGraphQLEngine(args).builder().build();
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/plugins/SpringStandardPluginConfiguration.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/plugins/SpringStandardPluginConfiguration.java
index 2349dbd169f1d9..7d0937663fecb0 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/plugins/SpringStandardPluginConfiguration.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/plugins/SpringStandardPluginConfiguration.java
@@ -6,6 +6,9 @@
 import static com.linkedin.metadata.Constants.SCHEMA_METADATA_ASPECT_NAME;
 import static com.linkedin.metadata.Constants.STRUCTURED_PROPERTY_ENTITY_NAME;
 import static com.linkedin.metadata.Constants.STRUCTURED_PROPERTY_SETTINGS_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.VERSION_PROPERTIES_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.VERSION_SET_ENTITY_NAME;
+import static com.linkedin.metadata.Constants.VERSION_SET_PROPERTIES_ASPECT_NAME;
 
 import com.linkedin.metadata.Constants;
 import com.linkedin.metadata.aspect.hooks.IgnoreUnknownMutator;
@@ -16,6 +19,9 @@
 import com.linkedin.metadata.aspect.validation.ExecutionRequestResultValidator;
 import com.linkedin.metadata.aspect.validation.FieldPathValidator;
 import com.linkedin.metadata.dataproducts.sideeffects.DataProductUnsetSideEffect;
+import com.linkedin.metadata.entity.versioning.sideeffects.VersionSetSideEffect;
+import com.linkedin.metadata.entity.versioning.validation.VersionPropertiesValidator;
+import com.linkedin.metadata.entity.versioning.validation.VersionSetPropertiesValidator;
 import com.linkedin.metadata.schemafields.sideeffects.SchemaFieldSideEffect;
 import com.linkedin.metadata.structuredproperties.validation.HidePropertyValidator;
 import com.linkedin.metadata.structuredproperties.validation.ShowPropertyAsBadgeValidator;
@@ -32,6 +38,13 @@
 @Slf4j
 public class SpringStandardPluginConfiguration {
   private static final String ALL = "*";
+  private static final String UPSERT = "UPSERT";
+  private static final String UPDATE = "UPDATE";
+  private static final String CREATE = "CREATE";
+  private static final String CREATE_ENTITY = "CREATE_ENTITY";
+  private static final String PATCH = "PATCH";
+  private static final String DELETE = "DELETE";
+  private static final String RESTATE = "RESTATE";
 
   @Value("${metadataChangeProposal.validation.ignoreUnknown}")
   private boolean ignoreUnknownEnabled;
@@ -189,4 +202,58 @@ public AspectPayloadValidator showPropertyAsAssetBadgeValidator() {
                             .build()))
                 .build());
   }
+
+  @Bean
+  @ConditionalOnProperty(name = "featureFlags.entityVersioning", havingValue = "true")
+  public AspectPayloadValidator versionPropertiesValidator() {
+    return new VersionPropertiesValidator()
+        .setConfig(
+            AspectPluginConfig.builder()
+                .className(VersionPropertiesValidator.class.getName())
+                .enabled(true)
+                .supportedOperations(List.of(UPSERT, UPDATE, PATCH, CREATE, CREATE_ENTITY))
+                .supportedEntityAspectNames(
+                    List.of(
+                        AspectPluginConfig.EntityAspectName.builder()
+                            .entityName(ALL)
+                            .aspectName(VERSION_PROPERTIES_ASPECT_NAME)
+                            .build()))
+                .build());
+  }
+
+  @Bean
+  @ConditionalOnProperty(name = "featureFlags.entityVersioning", havingValue = "true")
+  public AspectPayloadValidator versionSetPropertiesValidator() {
+    return new VersionSetPropertiesValidator()
+        .setConfig(
+            AspectPluginConfig.builder()
+                .className(VersionSetPropertiesValidator.class.getName())
+                .enabled(true)
+                .supportedOperations(List.of(UPSERT, UPDATE, PATCH, CREATE, CREATE_ENTITY))
+                .supportedEntityAspectNames(
+                    List.of(
+                        AspectPluginConfig.EntityAspectName.builder()
+                            .entityName(VERSION_SET_ENTITY_NAME)
+                            .aspectName(VERSION_SET_PROPERTIES_ASPECT_NAME)
+                            .build()))
+                .build());
+  }
+
+  @Bean
+  @ConditionalOnProperty(name = "featureFlags.entityVersioning", havingValue = "true")
+  public MCPSideEffect versionSetSideEffect() {
+    return new VersionSetSideEffect()
+        .setConfig(
+            AspectPluginConfig.builder()
+                .className(VersionSetSideEffect.class.getName())
+                .enabled(true)
+                .supportedOperations(List.of(UPSERT, UPDATE, PATCH, CREATE, CREATE_ENTITY))
+                .supportedEntityAspectNames(
+                    List.of(
+                        AspectPluginConfig.EntityAspectName.builder()
+                            .entityName(VERSION_SET_ENTITY_NAME)
+                            .aspectName(VERSION_SET_PROPERTIES_ASPECT_NAME)
+                            .build()))
+                .build());
+  }
 }
diff --git a/metadata-service/openapi-analytics-servlet/src/test/java/io/datahubproject/openapi/delegates/DatahubUsageEventsImplTest.java b/metadata-service/openapi-analytics-servlet/src/test/java/io/datahubproject/openapi/delegates/DatahubUsageEventsImplTest.java
index 68b13bd5fb4ee8..07557ece381a0a 100644
--- a/metadata-service/openapi-analytics-servlet/src/test/java/io/datahubproject/openapi/delegates/DatahubUsageEventsImplTest.java
+++ b/metadata-service/openapi-analytics-servlet/src/test/java/io/datahubproject/openapi/delegates/DatahubUsageEventsImplTest.java
@@ -3,11 +3,13 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
+import com.linkedin.gms.factory.config.ConfigurationProvider;
 import io.datahubproject.openapi.config.OpenAPIAnalyticsTestConfiguration;
 import io.datahubproject.openapi.config.SpringWebConfig;
 import io.datahubproject.openapi.v2.generated.controller.DatahubUsageEventsApiController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
@@ -22,6 +24,8 @@ public class DatahubUsageEventsImplTest extends AbstractTestNGSpringContextTests
 
   @Autowired private DatahubUsageEventsApiController analyticsController;
 
+  @MockBean private ConfigurationProvider configurationProvider;
+
   @Test
   public void initTest() {
     assertNotNull(analyticsController);
diff --git a/metadata-service/openapi-entity-servlet/src/test/java/io/datahubproject/openapi/v2/delegates/EntityApiDelegateImplTest.java b/metadata-service/openapi-entity-servlet/src/test/java/io/datahubproject/openapi/v2/delegates/EntityApiDelegateImplTest.java
index 2beb210e5bc4ff..31b35b65ea1a8c 100644
--- a/metadata-service/openapi-entity-servlet/src/test/java/io/datahubproject/openapi/v2/delegates/EntityApiDelegateImplTest.java
+++ b/metadata-service/openapi-entity-servlet/src/test/java/io/datahubproject/openapi/v2/delegates/EntityApiDelegateImplTest.java
@@ -4,6 +4,7 @@
 import static org.testng.Assert.*;
 
 import com.linkedin.data.schema.annotation.PathSpecBasedSchemaAnnotationVisitor;
+import com.linkedin.gms.factory.config.ConfigurationProvider;
 import com.linkedin.metadata.models.registry.EntityRegistry;
 import io.datahubproject.openapi.config.OpenAPIEntityTestConfiguration;
 import io.datahubproject.openapi.config.SpringWebConfig;
@@ -38,6 +39,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
@@ -68,6 +70,7 @@ public void disableAssert() {
   @Autowired private DatasetApiController datasetApiController;
   @Autowired private EntityRegistry entityRegistry;
   @Autowired private MockMvc mockMvc;
+  @MockBean private ConfigurationProvider configurationProvider;
 
   @Test
   public void initTest() {
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/GlobalControllerExceptionHandler.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/GlobalControllerExceptionHandler.java
index c756827cad56ba..01493d71643481 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/GlobalControllerExceptionHandler.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/GlobalControllerExceptionHandler.java
@@ -4,6 +4,9 @@
 import io.datahubproject.metadata.exception.ActorAccessException;
 import io.datahubproject.openapi.exception.InvalidUrnException;
 import io.datahubproject.openapi.exception.UnauthorizedException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.Map;
 import javax.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
@@ -64,4 +67,25 @@ public static ResponseEntity<Map<String, String>> handleUnauthorizedException(
   public static ResponseEntity<Map<String, String>> actorAccessException(ActorAccessException e) {
     return new ResponseEntity<>(Map.of("error", e.getMessage()), HttpStatus.FORBIDDEN);
   }
+
+  @Override
+  protected void logException(Exception ex, HttpServletRequest request) {
+    log.error("Error while resolving request: " + request.getRequestURI(), ex);
+  }
+
+  @Override
+  protected void sendServerError(
+      Exception ex, HttpServletRequest request, HttpServletResponse response) throws IOException {
+    log.error("Error while resolving request: " + request.getRequestURI(), ex);
+    request.setAttribute("jakarta.servlet.error.exception", ex);
+    response.sendError(500);
+  }
+
+  @ExceptionHandler(Exception.class)
+  public ResponseEntity<Map<String, String>> handleGenericException(
+      Exception e, HttpServletRequest request) {
+    log.error("Unhandled exception occurred for request: " + request.getRequestURI(), e);
+    return new ResponseEntity<>(
+        Map.of("error", "Internal server error occurred"), HttpStatus.INTERNAL_SERVER_ERROR);
+  }
 }
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java
index 622cf20af9ff57..c4b4431e77c4ef 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.core.StreamReadConstraints;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.linkedin.gms.factory.config.ConfigurationProvider;
 import com.linkedin.metadata.models.registry.EntityRegistry;
 import io.datahubproject.openapi.converter.StringToChangeCategoryConverter;
 import io.datahubproject.openapi.v3.OpenAPIV3Generator;
@@ -81,13 +82,15 @@ public void addFormatters(FormatterRegistry registry) {
   }
 
   @Bean
-  public GroupedOpenApi v3OpenApiGroup(final EntityRegistry entityRegistry) {
+  public GroupedOpenApi v3OpenApiGroup(
+      final EntityRegistry entityRegistry, final ConfigurationProvider configurationProvider) {
     return GroupedOpenApi.builder()
         .group("10-openapi-v3")
         .displayName("DataHub v3 (OpenAPI)")
         .addOpenApiCustomizer(
             openApi -> {
-              OpenAPI v3OpenApi = OpenAPIV3Generator.generateOpenApiSpec(entityRegistry);
+              OpenAPI v3OpenApi =
+                  OpenAPIV3Generator.generateOpenApiSpec(entityRegistry, configurationProvider);
               openApi.setInfo(v3OpenApi.getInfo());
               openApi.setTags(Collections.emptyList());
               openApi.getPaths().putAll(v3OpenApi.getPaths());
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java
index c6b8d579d879e0..f7764f2ddb39a1 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java
@@ -1,11 +1,14 @@
 package io.datahubproject.openapi.v3;
 
+import static com.linkedin.metadata.Constants.VERSION_PROPERTIES_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.VERSION_SET_ENTITY_NAME;
 import static io.datahubproject.openapi.util.ReflectionCache.toUpperFirst;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.fge.processing.ProcessingUtil;
 import com.google.common.collect.ImmutableMap;
 import com.linkedin.data.avro.SchemaTranslator;
+import com.linkedin.gms.factory.config.ConfigurationProvider;
 import com.linkedin.metadata.models.AspectSpec;
 import com.linkedin.metadata.models.EntitySpec;
 import com.linkedin.metadata.models.registry.EntityRegistry;
@@ -64,7 +67,8 @@ public class OpenAPIV3Generator {
   private static final String ASPECTS = "Aspects";
   private static final String ENTITIES = "Entities";
 
-  public static OpenAPI generateOpenApiSpec(EntityRegistry entityRegistry) {
+  public static OpenAPI generateOpenApiSpec(
+      EntityRegistry entityRegistry, ConfigurationProvider configurationProvider) {
     final Set<String> aspectNames = entityRegistry.getAspectSpecs().keySet();
     final Set<String> entityNames =
         entityRegistry.getEntitySpecs().values().stream()
@@ -125,22 +129,25 @@ public static OpenAPI generateOpenApiSpec(EntityRegistry entityRegistry) {
                   buildAspectRefResponseSchema(upperAspectName));
             });
 
+    List<EntitySpec> definedEntitySpecs =
+        entityRegistry.getEntitySpecs().values().stream()
+            .filter(entitySpec -> definitionNames.contains(entitySpec.getName()))
+            .sorted(Comparator.comparing(EntitySpec::getName))
+            .collect(Collectors.toList());
     // --> Entity components
-    entityRegistry.getEntitySpecs().values().stream()
-        .filter(e -> aspectNames.contains(e.getKeyAspectName()))
-        .forEach(
-            e -> {
-              final String entityName = toUpperFirst(e.getName());
-              components.addSchemas(
-                  entityName + ENTITY_REQUEST_SUFFIX, buildEntitySchema(e, aspectNames, false));
-              components.addSchemas(
-                  entityName + ENTITY_RESPONSE_SUFFIX, buildEntitySchema(e, aspectNames, true));
-              components.addSchemas(
-                  "Scroll" + entityName + ENTITY_RESPONSE_SUFFIX, buildEntityScrollSchema(e));
-              components.addSchemas(
-                  "BatchGet" + entityName + ENTITY_REQUEST_SUFFIX,
-                  buildEntityBatchGetRequestSchema(e, aspectNames));
-            });
+    definedEntitySpecs.forEach(
+        e -> {
+          final String entityName = toUpperFirst(e.getName());
+          components.addSchemas(
+              entityName + ENTITY_REQUEST_SUFFIX, buildEntitySchema(e, aspectNames, false));
+          components.addSchemas(
+              entityName + ENTITY_RESPONSE_SUFFIX, buildEntitySchema(e, aspectNames, true));
+          components.addSchemas(
+              "Scroll" + entityName + ENTITY_RESPONSE_SUFFIX, buildEntityScrollSchema(e));
+          components.addSchemas(
+              "BatchGet" + entityName + ENTITY_REQUEST_SUFFIX,
+              buildEntityBatchGetRequestSchema(e, aspectNames));
+        });
 
     components.addSchemas("SortOrder", new Schema()._enum(List.of("ASCENDING", "DESCENDING")));
     // TODO: Correct handling of SystemMetadata and AuditStamp
@@ -151,14 +158,12 @@ public static OpenAPI generateOpenApiSpec(EntityRegistry entityRegistry) {
     // Parameters
 
     // --> Entity Parameters
-    entityRegistry.getEntitySpecs().values().stream()
-        .filter(e -> definitionNames.contains(e.getKeyAspectName()))
-        .forEach(
-            e -> {
-              final String parameterName = toUpperFirst(e.getName()) + ASPECTS;
-              components.addParameters(
-                  parameterName + MODEL_VERSION, buildParameterSchema(e, definitionNames));
-            });
+    definedEntitySpecs.forEach(
+        e -> {
+          final String parameterName = toUpperFirst(e.getName()) + ASPECTS;
+          components.addParameters(
+              parameterName + MODEL_VERSION, buildParameterSchema(e, definitionNames));
+        });
 
     addExtraParameters(components);
 
@@ -169,39 +174,56 @@ public static OpenAPI generateOpenApiSpec(EntityRegistry entityRegistry) {
     paths.addPathItem("/v3/entity/scroll", buildGenericListEntitiesPath());
 
     // --> Entity Paths
-    entityRegistry.getEntitySpecs().values().stream()
-        .filter(e -> definitionNames.contains(e.getName()))
-        .sorted(Comparator.comparing(EntitySpec::getName))
-        .forEach(
-            e -> {
-              paths.addPathItem(
-                  String.format("/v3/entity/%s", e.getName().toLowerCase()),
-                  buildListEntityPath(e));
-              paths.addPathItem(
-                  String.format("/v3/entity/%s/batchGet", e.getName().toLowerCase()),
-                  buildBatchGetEntityPath(e));
-              paths.addPathItem(
-                  String.format("/v3/entity/%s/{urn}", e.getName().toLowerCase()),
-                  buildSingleEntityPath(e));
-            });
+    definedEntitySpecs.forEach(
+        e -> {
+          paths.addPathItem(
+              String.format("/v3/entity/%s", e.getName().toLowerCase()), buildListEntityPath(e));
+          paths.addPathItem(
+              String.format("/v3/entity/%s/batchGet", e.getName().toLowerCase()),
+              buildBatchGetEntityPath(e));
+          paths.addPathItem(
+              String.format("/v3/entity/%s/{urn}", e.getName().toLowerCase()),
+              buildSingleEntityPath(e));
+        });
 
     // --> Aspect Paths
-    entityRegistry.getEntitySpecs().values().stream()
-        .filter(e -> definitionNames.contains(e.getName()))
-        .sorted(Comparator.comparing(EntitySpec::getName))
-        .forEach(
-            e -> {
-              e.getAspectSpecs().stream()
-                  .filter(a -> definitionNames.contains(a.getName()))
-                  .sorted(Comparator.comparing(AspectSpec::getName))
-                  .forEach(
-                      a ->
-                          paths.addPathItem(
-                              String.format(
-                                  "/v3/entity/%s/{urn}/%s",
-                                  e.getName().toLowerCase(), a.getName().toLowerCase()),
-                              buildSingleEntityAspectPath(e, a)));
-            });
+    definedEntitySpecs.forEach(
+        e ->
+            e.getAspectSpecs().stream()
+                .filter(a -> definitionNames.contains(a.getName()))
+                .sorted(Comparator.comparing(AspectSpec::getName))
+                .forEach(
+                    a ->
+                        paths.addPathItem(
+                            String.format(
+                                "/v3/entity/%s/{urn}/%s",
+                                e.getName().toLowerCase(), a.getName().toLowerCase()),
+                            buildSingleEntityAspectPath(e, a))));
+    definedEntitySpecs.forEach(
+        e ->
+            e.getAspectSpecs().stream()
+                .filter(a -> definitionNames.contains(a.getName()))
+                .sorted(Comparator.comparing(AspectSpec::getName))
+                .forEach(
+                    a ->
+                        paths.addPathItem(
+                            String.format(
+                                "/v3/entity/%s/{urn}/%s",
+                                e.getName().toLowerCase(), a.getName().toLowerCase()),
+                            buildSingleEntityAspectPath(e, a))));
+
+    // --> Link & Unlink APIs
+    if (configurationProvider.getFeatureFlags().isEntityVersioning()) {
+      definedEntitySpecs.stream()
+          .filter(entitySpec -> VERSION_SET_ENTITY_NAME.equals(entitySpec.getName()))
+          .forEach(
+              entitySpec -> {
+                paths.addPathItem(
+                    "/v3/entity/versioning/{versionSetUrn}/relationship/versionOf/{entityUrn}",
+                    buildVersioningRelationshipPath());
+              });
+    }
+
     return new OpenAPI().openapi("3.0.1").info(info).paths(paths).components(components);
   }
 
@@ -1198,4 +1220,115 @@ private static PathItem buildSingleEntityAspectPath(
         .post(postOperation)
         .patch(patchOperation);
   }
+
+  private static Schema buildVersionPropertiesRequestSchema() {
+    return new Schema<>()
+        .type(TYPE_OBJECT)
+        .description("Properties for creating a version relationship")
+        .properties(
+            Map.of(
+                "comment",
+                    new Schema<>()
+                        .type(TYPE_STRING)
+                        .description("Comment about the version")
+                        .nullable(true),
+                "label",
+                    new Schema<>()
+                        .type(TYPE_STRING)
+                        .description("Label for the version")
+                        .nullable(true),
+                "sourceCreationTimestamp",
+                    new Schema<>()
+                        .type(TYPE_INTEGER)
+                        .description("Timestamp when version was created in source system")
+                        .nullable(true),
+                "sourceCreator",
+                    new Schema<>()
+                        .type(TYPE_STRING)
+                        .description("Creator of version in source system")
+                        .nullable(true)));
+  }
+
+  private static PathItem buildVersioningRelationshipPath() {
+    final PathItem result = new PathItem();
+
+    // Common parameters for path
+    final List<Parameter> parameters =
+        List.of(
+            new Parameter()
+                .in(NAME_PATH)
+                .name("versionSetUrn")
+                .description("The Version Set URN to unlink from")
+                .required(true)
+                .schema(new Schema().type(TYPE_STRING)),
+            new Parameter()
+                .in(NAME_PATH)
+                .name("entityUrn")
+                .description("The Entity URN to be unlinked")
+                .required(true)
+                .schema(new Schema().type(TYPE_STRING)));
+
+    // Success response for DELETE
+    final ApiResponse successDeleteResponse =
+        new ApiResponse()
+            .description("Successfully unlinked entity from version set")
+            .content(new Content().addMediaType("application/json", new MediaType()));
+
+    // DELETE operation
+    final Operation deleteOperation =
+        new Operation()
+            .summary("Unlink an entity from a version set")
+            .description("Removes the version relationship between an entity and a version set")
+            .tags(List.of("Version Relationships"))
+            .parameters(parameters)
+            .responses(
+                new ApiResponses()
+                    .addApiResponse("200", successDeleteResponse)
+                    .addApiResponse(
+                        "404", new ApiResponse().description("Version Set or Entity not found")));
+
+    // Success response for POST
+    final ApiResponse successPostResponse =
+        new ApiResponse()
+            .description("Successfully linked entity to version set")
+            .content(
+                new Content()
+                    .addMediaType(
+                        "application/json",
+                        new MediaType()
+                            .schema(
+                                new Schema<>()
+                                    .$ref(
+                                        String.format(
+                                            "#/components/schemas/%s%s",
+                                            toUpperFirst(VERSION_PROPERTIES_ASPECT_NAME),
+                                            ASPECT_RESPONSE_SUFFIX)))));
+
+    // Request body for POST
+    final RequestBody requestBody =
+        new RequestBody()
+            .description("Version properties for the link operation")
+            .required(true)
+            .content(
+                new Content()
+                    .addMediaType(
+                        "application/json",
+                        new MediaType().schema(buildVersionPropertiesRequestSchema())));
+
+    // POST operation
+    final Operation postOperation =
+        new Operation()
+            .summary("Link an entity to a version set")
+            .description("Creates a version relationship between an entity and a version set")
+            .tags(List.of("Version Relationships"))
+            .parameters(parameters)
+            .requestBody(requestBody)
+            .responses(
+                new ApiResponses()
+                    .addApiResponse("201", successPostResponse)
+                    .addApiResponse(
+                        "404", new ApiResponse().description("Version Set or Entity not found")));
+
+    return result.delete(deleteOperation).post(postOperation);
+  }
 }
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java
index af13cd3aab0510..a4583082d57c7f 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java
@@ -1,7 +1,9 @@
 package io.datahubproject.openapi.v3.controller;
 
+import static com.linkedin.metadata.Constants.VERSION_SET_ENTITY_NAME;
 import static com.linkedin.metadata.aspect.validation.ConditionalWriteValidator.HTTP_HEADER_IF_VERSION_MATCH;
 import static com.linkedin.metadata.authorization.ApiOperation.READ;
+import static com.linkedin.metadata.authorization.ApiOperation.UPDATE;
 
 import com.datahub.authentication.Actor;
 import com.datahub.authentication.Authentication;
@@ -11,22 +13,28 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.ImmutableSet;
 import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.data.ByteString;
 import com.linkedin.data.template.SetMode;
 import com.linkedin.data.template.StringMap;
 import com.linkedin.entity.EnvelopedAspect;
 import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.gms.factory.config.ConfigurationProvider;
 import com.linkedin.metadata.aspect.AspectRetriever;
 import com.linkedin.metadata.aspect.batch.AspectsBatch;
 import com.linkedin.metadata.aspect.batch.BatchItem;
 import com.linkedin.metadata.aspect.batch.ChangeMCP;
 import com.linkedin.metadata.entity.EntityApiUtils;
 import com.linkedin.metadata.entity.IngestResult;
+import com.linkedin.metadata.entity.RollbackResult;
 import com.linkedin.metadata.entity.UpdateAspectResult;
 import com.linkedin.metadata.entity.ebean.batch.AspectsBatchImpl;
 import com.linkedin.metadata.entity.ebean.batch.ChangeItemImpl;
 import com.linkedin.metadata.entity.ebean.batch.ProposedItem;
+import com.linkedin.metadata.entity.versioning.EntityVersioningService;
+import com.linkedin.metadata.entity.versioning.VersionPropertiesInput;
 import com.linkedin.metadata.models.AspectSpec;
 import com.linkedin.metadata.models.EntitySpec;
 import com.linkedin.metadata.query.filter.SortCriterion;
@@ -71,9 +79,12 @@
 import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -89,6 +100,9 @@ public class EntityController
     extends GenericEntitiesController<
         GenericAspectV3, GenericEntityV3, GenericEntityScrollResultV3> {
 
+  @Autowired private final EntityVersioningService entityVersioningService;
+  @Autowired private final ConfigurationProvider configurationProvider;
+
   @Tag(name = "Generic Entities")
   @PostMapping(value = "/{entityName}/batchGet", produces = MediaType.APPLICATION_JSON_VALUE)
   @Operation(summary = "Get a batch of entities")
@@ -222,6 +236,111 @@ public ResponseEntity<GenericEntityScrollResultV3> scrollEntities(
             entityAspectsBody.getAspects() != null));
   }
 
+  @Tag(name = "EntityVersioning")
+  @PostMapping(
+      value = "/versioning/{versionSetUrn}/relationship/versionOf/{entityUrn}",
+      produces = MediaType.APPLICATION_JSON_VALUE)
+  @Operation(summary = "Link an Entity to a Version Set as the latest version")
+  public ResponseEntity<List<GenericEntityV3>> linkLatestVersion(
+      HttpServletRequest request,
+      @PathVariable("versionSetUrn") String versionSetUrnString,
+      @PathVariable("entityUrn") String entityUrnString,
+      @RequestParam(value = "systemMetadata", required = false, defaultValue = "false")
+          Boolean withSystemMetadata,
+      @RequestBody @Nonnull VersionPropertiesInput versionPropertiesInput)
+      throws URISyntaxException, JsonProcessingException {
+
+    if (!configurationProvider.getFeatureFlags().isEntityVersioning()) {
+      throw new IllegalAccessError(
+          "Entity Versioning is not configured, please enable before attempting to use this feature.");
+    }
+    Authentication authentication = AuthenticationContext.getAuthentication();
+    Urn versionSetUrn = UrnUtils.getUrn(versionSetUrnString);
+    if (!VERSION_SET_ENTITY_NAME.equals(versionSetUrn.getEntityType())) {
+      throw new IllegalArgumentException(
+          String.format("Version Set urn %s must be of type Version Set.", versionSetUrnString));
+    }
+    Urn entityUrn = UrnUtils.getUrn(entityUrnString);
+    OperationContext opContext =
+        OperationContext.asSession(
+            systemOperationContext,
+            RequestContext.builder()
+                .buildOpenapi(
+                    authentication.getActor().toUrnStr(),
+                    request,
+                    "linkLatestVersion",
+                    ImmutableSet.of(entityUrn.getEntityType(), versionSetUrn.getEntityType())),
+            authorizationChain,
+            authentication,
+            true);
+    if (!AuthUtil.isAPIAuthorizedEntityUrns(
+        opContext, UPDATE, ImmutableSet.of(versionSetUrn, entityUrn))) {
+      throw new UnauthorizedException(
+          String.format(
+              "%s is unauthorized to %s entities %s and %s",
+              authentication.getActor().toUrnStr(), UPDATE, versionSetUrnString, entityUrnString));
+    }
+
+    return ResponseEntity.ok(
+        buildEntityList(
+            opContext,
+            entityVersioningService.linkLatestVersion(
+                opContext, versionSetUrn, entityUrn, versionPropertiesInput),
+            false));
+  }
+
+  @Tag(name = "EntityVersioning")
+  @DeleteMapping(
+      value = "/versioning/{versionSetUrn}/relationship/versionOf/{entityUrn}",
+      produces = MediaType.APPLICATION_JSON_VALUE)
+  @Operation(summary = "Unlink the latest linked version of an entity")
+  public ResponseEntity<List<String>> unlinkVersion(
+      HttpServletRequest request,
+      @PathVariable("versionSetUrn") String versionSetUrnString,
+      @PathVariable("entityUrn") String entityUrnString,
+      @RequestParam(value = "systemMetadata", required = false, defaultValue = "false")
+          Boolean withSystemMetadata)
+      throws URISyntaxException, JsonProcessingException {
+
+    if (!configurationProvider.getFeatureFlags().isEntityVersioning()) {
+      throw new IllegalAccessError(
+          "Entity Versioning is not configured, please enable before attempting to use this feature.");
+    }
+    Authentication authentication = AuthenticationContext.getAuthentication();
+    Urn versionSetUrn = UrnUtils.getUrn(versionSetUrnString);
+    if (!VERSION_SET_ENTITY_NAME.equals(versionSetUrn.getEntityType())) {
+      throw new IllegalArgumentException(
+          String.format("Version Set urn %s must be of type Version Set.", versionSetUrnString));
+    }
+    Urn entityUrn = UrnUtils.getUrn(entityUrnString);
+    OperationContext opContext =
+        OperationContext.asSession(
+            systemOperationContext,
+            RequestContext.builder()
+                .buildOpenapi(
+                    authentication.getActor().toUrnStr(),
+                    request,
+                    "unlinkVersion",
+                    ImmutableSet.of(entityUrn.getEntityType(), versionSetUrn.getEntityType())),
+            authorizationChain,
+            authentication,
+            true);
+    if (!AuthUtil.isAPIAuthorizedEntityUrns(
+        opContext, UPDATE, ImmutableSet.of(versionSetUrn, entityUrn))) {
+      throw new UnauthorizedException(
+          String.format(
+              "%s is unauthorized to %s entities %s and %s",
+              authentication.getActor().toUrnStr(), UPDATE, versionSetUrnString, entityUrnString));
+    }
+    List<RollbackResult> rollbackResults =
+        entityVersioningService.unlinkVersion(opContext, versionSetUrn, entityUrn);
+
+    return ResponseEntity.ok(
+        rollbackResults.stream()
+            .map(rollbackResult -> rollbackResult.getUrn().toString())
+            .collect(Collectors.toList()));
+  }
+
   @Override
   public GenericEntityScrollResultV3 buildScrollResult(
       @Nonnull OperationContext opContext,
@@ -361,7 +480,10 @@ protected List<GenericEntityV3> buildEntityList(
                               .auditStamp(
                                   withSystemMetadata ? ingest.getRequest().getAuditStamp() : null)
                               .build()))
-              .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+              // Map merge strategy, just take latest one
+              .collect(
+                  Collectors.toMap(
+                      Map.Entry::getKey, Map.Entry::getValue, (value1, value2) -> value2));
       responseList.add(
           GenericEntityV3.builder().build(objectMapper, urnAspects.getKey(), aspectsMap));
     }
diff --git a/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/OpenAPIV3GeneratorTest.java b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/OpenAPIV3GeneratorTest.java
index e1568017156d9b..d8f04b60455abb 100644
--- a/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/OpenAPIV3GeneratorTest.java
+++ b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/OpenAPIV3GeneratorTest.java
@@ -6,6 +6,8 @@
 import static org.testng.Assert.assertTrue;
 
 import com.linkedin.data.schema.annotation.PathSpecBasedSchemaAnnotationVisitor;
+import com.linkedin.datahub.graphql.featureflags.FeatureFlags;
+import com.linkedin.gms.factory.config.ConfigurationProvider;
 import com.linkedin.metadata.models.registry.ConfigEntityRegistry;
 import io.swagger.v3.core.util.Yaml;
 import io.swagger.v3.oas.models.OpenAPI;
@@ -36,8 +38,10 @@ public void testOpenApiSpecBuilder() throws Exception {
             OpenAPIV3GeneratorTest.class
                 .getClassLoader()
                 .getResourceAsStream("entity-registry.yml"));
+    ConfigurationProvider configurationProvider = new ConfigurationProvider();
+    configurationProvider.setFeatureFlags(new FeatureFlags());
 
-    OpenAPI openAPI = OpenAPIV3Generator.generateOpenApiSpec(er);
+    OpenAPI openAPI = OpenAPIV3Generator.generateOpenApiSpec(er, configurationProvider);
     String openapiYaml = Yaml.pretty(openAPI);
     Files.write(
         Path.of(getClass().getResource("/").getPath(), "open-api.yaml"),
diff --git a/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/controller/EntityControllerTest.java b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/controller/EntityControllerTest.java
index 952dc31c5ba386..e82ab50a0defeb 100644
--- a/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/controller/EntityControllerTest.java
+++ b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/controller/EntityControllerTest.java
@@ -33,9 +33,12 @@
 import com.linkedin.common.urn.Urn;
 import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.datahub.graphql.featureflags.FeatureFlags;
 import com.linkedin.dataset.DatasetProfile;
 import com.linkedin.entity.Aspect;
 import com.linkedin.entity.EnvelopedAspect;
+import com.linkedin.gms.factory.config.ConfigurationProvider;
+import com.linkedin.gms.factory.entity.versioning.EntityVersioningServiceFactory;
 import com.linkedin.metadata.aspect.batch.AspectsBatch;
 import com.linkedin.metadata.entity.EntityService;
 import com.linkedin.metadata.entity.EntityServiceImpl;
@@ -57,6 +60,7 @@
 import io.datahubproject.openapi.config.SpringWebConfig;
 import io.datahubproject.openapi.exception.InvalidUrnException;
 import io.datahubproject.test.metadata.context.TestOperationContexts;
+import jakarta.servlet.ServletException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -81,7 +85,11 @@
 
 @SpringBootTest(classes = {SpringWebConfig.class})
 @ComponentScan(basePackages = {"io.datahubproject.openapi.v3.controller"})
-@Import({SpringWebConfig.class, EntityControllerTest.EntityControllerTestConfig.class})
+@Import({
+  SpringWebConfig.class,
+  EntityControllerTest.EntityControllerTestConfig.class,
+  EntityVersioningServiceFactory.class
+})
 @AutoConfigureWebMvc
 @AutoConfigureMockMvc
 public class EntityControllerTest extends AbstractTestNGSpringContextTests {
@@ -92,6 +100,7 @@ public class EntityControllerTest extends AbstractTestNGSpringContextTests {
   @Autowired private TimeseriesAspectService mockTimeseriesAspectService;
   @Autowired private EntityRegistry entityRegistry;
   @Autowired private OperationContext opContext;
+  @MockBean private ConfigurationProvider configurationProvider;
 
   @Test
   public void initTest() {
@@ -431,4 +440,211 @@ public TimeseriesAspectService timeseriesAspectService() {
       return timeseriesAspectService;
     }
   }
+
+  @Test
+  public void testGetEntityBatchWithMultipleEntities() throws Exception {
+    List<Urn> TEST_URNS =
+        List.of(
+            UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:testPlatform,1,PROD)"),
+            UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:testPlatform,2,PROD)"));
+
+    // Mock entity aspect response
+    when(mockEntityService.getEnvelopedVersionedAspects(
+            any(OperationContext.class), anyMap(), eq(false)))
+        .thenReturn(
+            Map.of(
+                TEST_URNS.get(0),
+                List.of(
+                    new EnvelopedAspect()
+                        .setName("status")
+                        .setValue(new Aspect(new Status().data()))),
+                TEST_URNS.get(1),
+                List.of(
+                    new EnvelopedAspect()
+                        .setName("status")
+                        .setValue(new Aspect(new Status().data())))));
+
+    String requestBody =
+        String.format(
+            "[{\"urn\": \"%s\"}, {\"urn\": \"%s\"}]",
+            TEST_URNS.get(0).toString(), TEST_URNS.get(1).toString());
+
+    mockMvc
+        .perform(
+            MockMvcRequestBuilders.post("/v3/entity/dataset/batchGet")
+                .content(requestBody)
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+        .andExpect(status().is2xxSuccessful())
+        .andExpect(MockMvcResultMatchers.jsonPath("$[0].urn").value(TEST_URNS.get(0).toString()))
+        .andExpect(MockMvcResultMatchers.jsonPath("$[1].urn").value(TEST_URNS.get(1).toString()));
+  }
+
+  @Test(expectedExceptions = ServletException.class)
+  public void testGetEntityBatchWithInvalidUrn() throws Exception {
+    String requestBody = "[{\"urn\": \"invalid:urn\"}]";
+
+    mockMvc
+        .perform(
+            MockMvcRequestBuilders.post("/v3/entity/dataset/batchGet")
+                .content(requestBody)
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+        .andExpect(status().is4xxClientError());
+  }
+
+  @Test
+  public void testScrollEntitiesWithMultipleSortFields() throws Exception {
+    List<Urn> TEST_URNS =
+        List.of(
+            UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:testPlatform,1,PROD)"),
+            UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:testPlatform,2,PROD)"));
+
+    ScrollResult expectedResult =
+        new ScrollResult()
+            .setEntities(
+                new SearchEntityArray(
+                    List.of(
+                        new SearchEntity().setEntity(TEST_URNS.get(0)),
+                        new SearchEntity().setEntity(TEST_URNS.get(1)))));
+
+    when(mockSearchService.scrollAcrossEntities(
+            any(OperationContext.class),
+            eq(List.of("dataset")),
+            anyString(),
+            nullable(Filter.class),
+            any(),
+            nullable(String.class),
+            nullable(String.class),
+            anyInt()))
+        .thenReturn(expectedResult);
+
+    when(mockEntityService.getEnvelopedVersionedAspects(
+            any(OperationContext.class), anyMap(), eq(false)))
+        .thenReturn(
+            Map.of(
+                TEST_URNS.get(0),
+                List.of(
+                    new EnvelopedAspect()
+                        .setName("status")
+                        .setValue(new Aspect(new Status().data())))));
+
+    mockMvc
+        .perform(
+            MockMvcRequestBuilders.post("/v3/entity/scroll")
+                .content("{\"entities\":[\"dataset\"]}")
+                .param("sortCriteria", "name", "urn")
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+        .andExpect(status().is2xxSuccessful())
+        .andExpect(
+            MockMvcResultMatchers.jsonPath("$.entities[0].urn").value(TEST_URNS.get(0).toString()));
+  }
+
+  @Test
+  public void testScrollEntitiesWithPitKeepAlive() throws Exception {
+    List<Urn> TEST_URNS =
+        List.of(UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:testPlatform,1,PROD)"));
+
+    ScrollResult expectedResult =
+        new ScrollResult()
+            .setEntities(
+                new SearchEntityArray(List.of(new SearchEntity().setEntity(TEST_URNS.get(0)))))
+            .setScrollId("test-scroll-id");
+
+    when(mockSearchService.scrollAcrossEntities(
+            any(OperationContext.class),
+            eq(List.of("dataset")),
+            anyString(),
+            nullable(Filter.class),
+            any(),
+            nullable(String.class),
+            eq("10m"),
+            anyInt()))
+        .thenReturn(expectedResult);
+
+    when(mockEntityService.getEnvelopedVersionedAspects(
+            any(OperationContext.class), anyMap(), eq(false)))
+        .thenReturn(
+            Map.of(
+                TEST_URNS.get(0),
+                List.of(
+                    new EnvelopedAspect()
+                        .setName("status")
+                        .setValue(new Aspect(new Status().data())))));
+
+    mockMvc
+        .perform(
+            MockMvcRequestBuilders.post("/v3/entity/scroll")
+                .content("{\"entities\":[\"dataset\"]}")
+                .param("pitKeepAlive", "10m")
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+        .andExpect(status().is2xxSuccessful())
+        .andExpect(MockMvcResultMatchers.jsonPath("$.scrollId").value("test-scroll-id"));
+  }
+
+  @Test(expectedExceptions = ServletException.class)
+  public void testEntityVersioningFeatureFlagDisabled() throws Exception {
+    Urn TEST_URN = UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:testPlatform,1,PROD)");
+    Urn VERSION_SET_URN = UrnUtils.getUrn("urn:li:versionSet:test-version-set");
+
+    FeatureFlags mockFeatureFlags = mock(FeatureFlags.class);
+    when(configurationProvider.getFeatureFlags()).thenReturn(mockFeatureFlags);
+    when(mockFeatureFlags.isEntityVersioning()).thenReturn(false);
+
+    // Test linking version with disabled flag
+    mockMvc
+        .perform(
+            MockMvcRequestBuilders.post(
+                    String.format(
+                        "/v3/entity/versioning/%s/relationship/versionOf/%s",
+                        VERSION_SET_URN, TEST_URN))
+                .content("{}")
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+        .andExpect(status().is4xxClientError());
+
+    // Test unlinking version with disabled flag
+    mockMvc
+        .perform(
+            MockMvcRequestBuilders.delete(
+                    String.format(
+                        "/v3/entity/versioning/%s/relationship/versionOf/%s",
+                        VERSION_SET_URN, TEST_URN))
+                .accept(MediaType.APPLICATION_JSON))
+        .andExpect(status().is4xxClientError());
+  }
+
+  @Test(expectedExceptions = ServletException.class)
+  public void testInvalidVersionSetUrn() throws Exception {
+    Urn TEST_URN = UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:testPlatform,1,PROD)");
+    String INVALID_VERSION_SET_URN = "urn:li:dataset:invalid-version-set";
+
+    FeatureFlags mockFeatureFlags = mock(FeatureFlags.class);
+    when(configurationProvider.getFeatureFlags()).thenReturn(mockFeatureFlags);
+    when(mockFeatureFlags.isEntityVersioning()).thenReturn(true);
+
+    // Test linking with invalid version set URN
+    mockMvc
+        .perform(
+            MockMvcRequestBuilders.post(
+                    String.format(
+                        "/v3/entity/versioning/%s/relationship/versionOf/%s",
+                        INVALID_VERSION_SET_URN, TEST_URN))
+                .content("{}")
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+        .andExpect(status().is4xxClientError());
+
+    // Test unlinking with invalid version set URN
+    mockMvc
+        .perform(
+            MockMvcRequestBuilders.delete(
+                    String.format(
+                        "/v3/entity/versioning/%s/relationship/versionOf/%s",
+                        INVALID_VERSION_SET_URN, TEST_URN))
+                .accept(MediaType.APPLICATION_JSON))
+        .andExpect(status().is4xxClientError());
+  }
 }
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json
index 432c4a9ddcb73f..af11532ccf4ece 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json
@@ -1382,6 +1382,10 @@
       "name" : "versionTag",
       "type" : "string",
       "optional" : true
+    }, {
+      "name" : "metadataAttribution",
+      "type" : "MetadataAttribution",
+      "optional" : true
     } ]
   }, {
     "type" : "record",
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
index 45e91873de10ff..f58d83dd1e5cb7 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
@@ -1409,6 +1409,10 @@
       "name" : "versionTag",
       "type" : "string",
       "optional" : true
+    }, {
+      "name" : "metadataAttribution",
+      "type" : "MetadataAttribution",
+      "optional" : true
     } ]
   }, "com.linkedin.common.fieldtransformer.TransformationType", "com.linkedin.common.fieldtransformer.UDFTransformer", {
     "type" : "record",
@@ -6139,6 +6143,12 @@
       "doc" : "Include default facets when getting facets to aggregate on in search requests.\nBy default we include these, but custom aggregation requests don't need them.",
       "default" : true,
       "optional" : true
+    }, {
+      "name" : "filterNonLatestVersions",
+      "type" : "boolean",
+      "doc" : "Include only latest versions in version sets, default true",
+      "default" : true,
+      "optional" : true
     } ]
   }, {
     "type" : "enum",
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json
index 9061cbff188135..61c31f93987b88 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json
@@ -1115,6 +1115,10 @@
       "name" : "versionTag",
       "type" : "string",
       "optional" : true
+    }, {
+      "name" : "metadataAttribution",
+      "type" : "MetadataAttribution",
+      "optional" : true
     } ]
   }, {
     "type" : "record",
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json
index e6be4e828c976f..75793be7331da4 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json
@@ -1115,6 +1115,10 @@
       "name" : "versionTag",
       "type" : "string",
       "optional" : true
+    }, {
+      "name" : "metadataAttribution",
+      "type" : "MetadataAttribution",
+      "optional" : true
     } ]
   }, {
     "type" : "record",
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json
index 10f3218d469757..58ba2ad05dfe74 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json
@@ -1409,6 +1409,10 @@
       "name" : "versionTag",
       "type" : "string",
       "optional" : true
+    }, {
+      "name" : "metadataAttribution",
+      "type" : "MetadataAttribution",
+      "optional" : true
     } ]
   }, "com.linkedin.common.fieldtransformer.TransformationType", "com.linkedin.common.fieldtransformer.UDFTransformer", {
     "type" : "record",
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/entity/versioning/EntityVersioningService.java b/metadata-service/services/src/main/java/com/linkedin/metadata/entity/versioning/EntityVersioningService.java
new file mode 100644
index 00000000000000..9e82efa913a98d
--- /dev/null
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/entity/versioning/EntityVersioningService.java
@@ -0,0 +1,36 @@
+package com.linkedin.metadata.entity.versioning;
+
+import com.linkedin.common.urn.Urn;
+import com.linkedin.metadata.entity.IngestResult;
+import com.linkedin.metadata.entity.RollbackResult;
+import io.datahubproject.metadata.context.OperationContext;
+import java.util.List;
+
+public interface EntityVersioningService {
+
+  /**
+   * Generates a new set of VersionProperties for the latest version and links it to the specified
+   * version set. If the specified version set does not yet exist, will create it. Order of
+   * operations here is important: 1. Create initial Version Set if necessary, do not generate
+   * Version Set Properties 2. Create Version Properties for specified entity. 3. Generate version
+   * properties with the properly set latest version Will eventually want to add in the scheme here
+   * as a parameter
+   *
+   * @return ingestResult -> the results of the ingested linked version
+   */
+  List<IngestResult> linkLatestVersion(
+      OperationContext opContext,
+      Urn versionSet,
+      Urn newLatestVersion,
+      VersionPropertiesInput inputProperties);
+
+  /**
+   * Unlinks the latest version from a version set. Will attempt to set up the previous version as
+   * the new latest. This fully removes the version properties and unversions the specified entity.
+   *
+   * @param opContext operational context containing various information about the current execution
+   * @param currentLatest the currently linked latest versioned entity urn
+   * @return the deletion result
+   */
+  List<RollbackResult> unlinkVersion(OperationContext opContext, Urn versionSet, Urn currentLatest);
+}
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/entity/versioning/VersionPropertiesInput.java b/metadata-service/services/src/main/java/com/linkedin/metadata/entity/versioning/VersionPropertiesInput.java
new file mode 100644
index 00000000000000..28c320ec717201
--- /dev/null
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/entity/versioning/VersionPropertiesInput.java
@@ -0,0 +1,20 @@
+package com.linkedin.metadata.entity.versioning;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
+@AllArgsConstructor
+public class VersionPropertiesInput {
+  private String comment;
+  private String version;
+  private Long sourceCreationTimestamp;
+  private String sourceCreator;
+}
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/search/utils/QueryUtils.java b/metadata-service/services/src/main/java/com/linkedin/metadata/search/utils/QueryUtils.java
index 7e9d1701bf79a9..4cd9ec6c75b786 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/search/utils/QueryUtils.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/search/utils/QueryUtils.java
@@ -87,6 +87,14 @@ public static Filter newDisjunctiveFilter(@Nonnull Criterion... orCriterion) {
                 .collect(Collectors.toCollection(ConjunctiveCriterionArray::new)));
   }
 
+  @Nonnull
+  public static Filter newConjunctiveFilter(@Nonnull Criterion... andCriterion) {
+    ConjunctiveCriterionArray orCriteria = new ConjunctiveCriterionArray();
+    orCriteria.add(
+        new ConjunctiveCriterion().setAnd(new CriterionArray(Arrays.asList(andCriterion))));
+    return new Filter().setOr(orCriteria);
+  }
+
   @Nonnull
   public static ConjunctiveCriterion add(
       @Nonnull ConjunctiveCriterion conjunctiveCriterion, @Nonnull Criterion element) {
diff --git a/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java b/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java
index 80a11ab98bbf4a..3c623f8df7c1bf 100644
--- a/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java
+++ b/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java
@@ -749,6 +749,14 @@ public class PoliciesConfig {
               EDIT_ENTITY_TAGS_PRIVILEGE,
               EDIT_ENTITY_GLOSSARY_TERMS_PRIVILEGE));
 
+  // Version Set privileges
+  public static final ResourcePrivileges VERSION_SET_PRIVILEGES =
+      ResourcePrivileges.of(
+          "versionSet",
+          "Version Set",
+          "A logical collection of versioned entities.",
+          COMMON_ENTITY_PRIVILEGES);
+
   public static final List<ResourcePrivileges> ENTITY_RESOURCE_PRIVILEGES =
       ImmutableList.of(
           DATASET_PRIVILEGES,
@@ -767,7 +775,8 @@ public class PoliciesConfig {
           DATA_PRODUCT_PRIVILEGES,
           ER_MODEL_RELATIONSHIP_PRIVILEGES,
           BUSINESS_ATTRIBUTE_PRIVILEGES,
-          STRUCTURED_PROPERTIES_PRIVILEGES);
+          STRUCTURED_PROPERTIES_PRIVILEGES,
+          VERSION_SET_PRIVILEGES);
 
   // Merge all entity specific resource privileges to create a superset of all resource privileges
   public static final ResourcePrivileges ALL_RESOURCE_PRIVILEGES =
diff --git a/smoke-test/tests/entity_versioning/__init__.py b/smoke-test/tests/entity_versioning/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/smoke-test/tests/entity_versioning/test_versioning.py b/smoke-test/tests/entity_versioning/test_versioning.py
new file mode 100644
index 00000000000000..c331cc5305a336
--- /dev/null
+++ b/smoke-test/tests/entity_versioning/test_versioning.py
@@ -0,0 +1,64 @@
+import pytest
+
+
+@pytest.fixture(scope="module", autouse=True)
+def test_link_unlink_version(auth_session):
+    """Fixture to execute setup before and tear down after all tests are run"""
+    res_data = link_version(auth_session)
+
+    assert res_data
+    assert res_data["data"]
+    assert res_data["data"]["linkAssetVersion"]
+    assert (
+        res_data["data"]["linkAssetVersion"]
+        == "urn:li:dataset:(urn:li:dataPlatform:kafka,SampleKafkaDataset,PROD)"
+    )
+
+    res_data = unlink_version(auth_session)
+
+    assert res_data
+    assert res_data["data"]
+    assert res_data["data"]["unlinkAssetVersion"]
+
+
+def link_version(auth_session):
+    json = {
+        "mutation": """mutation linkAssetVersion($input: LinkVersionInput!) {\n
+            linkAssetVersion(input: $input)
+            }\n
+        }""",
+        "variables": {
+            "input": {
+                "version": "1233456",
+                "versionSet": "urn:li:versionSet:(12345678910,dataset)",
+                "linkedEntity": "urn:li:dataset:(urn:li:dataPlatform:kafka,SampleKafkaDataset,PROD)",
+            }
+        },
+    }
+    response = auth_session.post(
+        f"{auth_session.frontend_url()}/api/v2/graphql", json=json
+    )
+    response.raise_for_status()
+
+    return response.json()
+
+
+def unlink_version(auth_session):
+    json = {
+        "mutation": """mutation unlinkAssetVersion($input: UnlinkVersionInput!) {\n
+            unlinkAssetVersion(input: $input)
+            }\n
+        }""",
+        "variables": {
+            "input": {
+                "versionSet": "urn:li:versionSet:(12345678910,dataset)",
+                "unlinkedEntity": "urn:li:dataset:(urn:li:dataPlatform:kafka,SampleKafkaDataset,PROD)",
+            }
+        },
+    }
+    response = auth_session.post(
+        f"{auth_session.frontend_url()}/api/v2/graphql", json=json
+    )
+    response.raise_for_status()
+
+    return response.json()
diff --git a/test-models/build.gradle b/test-models/build.gradle
index e8733f0525870b..89bf4ec445440d 100644
--- a/test-models/build.gradle
+++ b/test-models/build.gradle
@@ -18,3 +18,4 @@ idea {
 }
 
 sourceSets.mainGeneratedDataTemplate.java.srcDirs('src/main/javaPegasus/')
+spotlessJava.dependsOn generateTestDataTemplate
\ No newline at end of file

From b252f782c56327175a1a0bddc95b5c417db285a1 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Tue, 14 Jan 2025 17:04:49 -0800
Subject: [PATCH 078/249] feat(build): use remote gradle cache (#12344)

---
 settings.gradle | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 77d0706549a439..437a353f210ac4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -79,6 +79,20 @@ include ':metadata-service:openapi-servlet:models'
 include ':metadata-integration:java:datahub-schematron:lib'
 include ':metadata-integration:java:datahub-schematron:cli'
 
+buildCache {
+    def depotSecret = System.getenv('DEPOT_TOKEN');
+
+    remote(HttpBuildCache) {
+        url = 'https://cache.depot.dev'
+        enabled = depotSecret != null
+        push = true
+        credentials {
+            username = ''
+            password = depotSecret
+        }
+    }
+}
+
 def installPreCommitHooks() {
     def preCommitInstalled = false
     try {
@@ -116,7 +130,7 @@ def installPreCommitHooks() {
         def stderr = new StringBuilder()
         installHooksProcess.waitForProcessOutput(stdout, stderr)
         if (installHooksProcess.exitValue() != 0) {
-            println "Failed to install hooks: ${stderr}"
+            println "Failed to install hooks: ${stdout}"
             return
         }
         println "Hooks output: ${stdout}"

From a0575329848d65eafb455a3f400e8f47bc7e9bb7 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Tue, 14 Jan 2025 19:35:36 -0600
Subject: [PATCH 079/249] feat(docker-profiles): version mixing & docs (#12342)

---
 docker/build.gradle                    |  6 +-----
 docker/profiles/README.md              | 28 +++++++++++++++++++++++++-
 docker/profiles/docker-compose.gms.yml | 16 +++++++--------
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/docker/build.gradle b/docker/build.gradle
index 576e47a53e6ef5..0070d814286cf0 100644
--- a/docker/build.gradle
+++ b/docker/build.gradle
@@ -42,7 +42,6 @@ ext {
                     modules: python_services_modules + backend_profile_modules + [':datahub-frontend'],
                     isDebug: true
             ],
-
             'quickstartDebugConsumers': [
                     profile: 'debug-consumers',
                     modules: python_services_modules + backend_profile_modules + [':datahub-frontend',
@@ -50,7 +49,6 @@ ext {
                                                                           ':metadata-jobs:mae-consumer-job'],
                     isDebug: true
             ],
-
             'quickstartPg': [
                     profile: 'quickstart-postgres',
                     modules: (backend_profile_modules - [':docker:mysql-setup']) + [
@@ -108,9 +106,7 @@ dockerCompose {
             }
 
             // Common environment variables
-            environment.put 'DATAHUB_VERSION', config.isDebug ?
-                    System.getenv("DATAHUB_VERSION") ?: "v${version}" :
-                    "v${version}"
+            environment.put 'DATAHUB_VERSION', System.getenv("DATAHUB_VERSION") ?: "v${version}"
             environment.put 'DATAHUB_TELEMETRY_ENABLED', 'false'
             environment.put "METADATA_TESTS_ENABLED", "true"
             environment.put "DATAHUB_REPO", "${docker_registry}"
diff --git a/docker/profiles/README.md b/docker/profiles/README.md
index fb3c9e3c84a7a2..192fde3130a895 100644
--- a/docker/profiles/README.md
+++ b/docker/profiles/README.md
@@ -101,4 +101,30 @@ Runs everything except for the GMS. Useful for running just a local (non-docker)
 | debug-cassandra     |       |          | X         |       | X        | X   | X       | X            |     |     | X     | X          |               |
 | debug-consumers     | X     |          |           |       | X        | X   | X       | X            | X   | X   | X     | X          |               |
 | debug-neo4j         | X     |          |           | X     | X        | X   | X       | X            |     |     | X     | X          |               |
-| debug-elasticsearch | X     |          |           |       | X        | X   | X       | X            |     |     | X     |            | X             |
\ No newline at end of file
+| debug-elasticsearch | X     |          |           |       | X        | X   | X       | X            |     |     | X     |            | X             |
+
+## Advanced Setups
+
+### Version Mixing
+
+In some cases, it might be useful to debug upgrade scenarios where there are intentional version miss-matches. It is possible
+to override individual component versions.
+
+Note: This only works for `non-debug` profiles because of the file mounts when in `debug` which would run older containers
+but still pickup the latest application jars.
+
+In this example we are interested in upgrading two components (the `mae-consumer` and the `mce-consumer`) to a fresh build `v0.15.1-SNAPSHOT`
+while maintaining older components on `v0.14.1` (especially the `system-update` container).
+
+This configuration reproduces the situation where the consumers were upgraded prior to running the latest version of `system-update`. In this
+scenario we expect the consumers to block their startup waiting for the successful completion of a newer `system-update`.
+
+`DATAHUB_VERSION` - specifies the default component version of `v0.14.1`
+`DATAHUB_MAE_VERSION` - specifies an override of just the `mae-consumer` to version `v0.15.1-SNAPSHOT`[1]
+`DATAHUB_MCE_VERSION` - specifies an override of just the `mce-consumer` to version `v0.15.1-SNAPSHOT`[1]
+
+```shell
+ DATAHUB_MAE_VERSION="v0.15.1-SNAPSHOT" DATAHUB_MCE_VERSION="v0.15.1-SNAPSHOT" DATAHUB_VERSION="v0.14.1" ./gradlew quickstart
+```
+
+[1] Image versions were `v0.15.1-SNAPSHOT` built locally prior to running the command.
diff --git a/docker/profiles/docker-compose.gms.yml b/docker/profiles/docker-compose.gms.yml
index ada7df51e20bef..2147d6b5a0247f 100644
--- a/docker/profiles/docker-compose.gms.yml
+++ b/docker/profiles/docker-compose.gms.yml
@@ -54,7 +54,7 @@ x-datahub-dev-telemetry-env: &datahub-dev-telemetry-env
 #################################
 x-datahub-system-update-service: &datahub-system-update-service
   hostname: datahub-system-update
-  image: ${DATAHUB_UPGRADE_IMAGE:-${DATAHUB_REPO:-acryldata}/datahub-upgrade}:${DATAHUB_VERSION:-head}
+  image: ${DATAHUB_UPGRADE_IMAGE:-${DATAHUB_REPO:-acryldata}/datahub-upgrade}:${DATAHUB_UPDATE_VERSION:-${DATAHUB_VERSION:-head}}
   command:
     - -u
     - SystemUpdate
@@ -73,7 +73,7 @@ x-datahub-system-update-service: &datahub-system-update-service
 
 x-datahub-system-update-service-dev: &datahub-system-update-service-dev
   <<: *datahub-system-update-service
-  image: ${DATAHUB_UPGRADE_IMAGE:-${DATAHUB_REPO:-acryldata}/datahub-upgrade}:${DATAHUB_VERSION:-debug}
+  image: ${DATAHUB_UPGRADE_IMAGE:-${DATAHUB_REPO:-acryldata}/datahub-upgrade}:${DATAHUB_UPDATE_VERSION:-${DATAHUB_VERSION:-debug}}
   ports:
     - ${DATAHUB_MAPPED_UPGRADE_DEBUG_PORT:-5003}:5003
   environment: &datahub-system-update-dev-env
@@ -92,7 +92,7 @@ x-datahub-system-update-service-dev: &datahub-system-update-service-dev
 #################################
 x-datahub-gms-service: &datahub-gms-service
   hostname: datahub-gms
-  image: ${DATAHUB_GMS_IMAGE:-${DATAHUB_REPO:-acryldata}/datahub-gms}:${DATAHUB_VERSION:-head}
+  image: ${DATAHUB_GMS_IMAGE:-${DATAHUB_REPO:-acryldata}/datahub-gms}:${DATAHUB_GMS_VERSION:-${DATAHUB_VERSION:-head}}
   ports:
     - ${DATAHUB_MAPPED_GMS_PORT:-8080}:8080
   env_file:
@@ -118,7 +118,7 @@ x-datahub-gms-service: &datahub-gms-service
 
 x-datahub-gms-service-dev: &datahub-gms-service-dev
   <<: *datahub-gms-service
-  image: ${DATAHUB_GMS_IMAGE:-${DATAHUB_REPO:-acryldata}/datahub-gms}:${DATAHUB_VERSION:-debug}
+  image: ${DATAHUB_GMS_IMAGE:-${DATAHUB_REPO:-acryldata}/datahub-gms}:${DATAHUB_GMS_VERSION:-${DATAHUB_VERSION:-debug}}
   ports:
     - ${DATAHUB_MAPPED_GMS_DEBUG_PORT:-5001}:5001
     - ${DATAHUB_MAPPED_GMS_PORT:-8080}:8080
@@ -150,7 +150,7 @@ x-datahub-gms-service-dev: &datahub-gms-service-dev
 #################################
 x-datahub-mae-consumer-service: &datahub-mae-consumer-service
   hostname: datahub-mae-consumer
-  image: ${DATAHUB_MAE_CONSUMER_IMAGE:-${DATAHUB_REPO:-acryldata}/datahub-mae-consumer}:${DATAHUB_VERSION:-head}
+  image: ${DATAHUB_MAE_CONSUMER_IMAGE:-${DATAHUB_REPO:-acryldata}/datahub-mae-consumer}:${DATAHUB_MAE_VERSION:-${DATAHUB_VERSION:-head}}
   ports:
     - 9091:9091
   env_file:
@@ -163,7 +163,7 @@ x-datahub-mae-consumer-service: &datahub-mae-consumer-service
 
 x-datahub-mae-consumer-service-dev: &datahub-mae-consumer-service-dev
   <<: *datahub-mae-consumer-service
-  image: ${DATAHUB_MAE_CONSUMER_IMAGE:-${DATAHUB_REPO:-acryldata}/datahub-mae-consumer}:${DATAHUB_VERSION:-debug}
+  image: ${DATAHUB_MAE_CONSUMER_IMAGE:-${DATAHUB_REPO:-acryldata}/datahub-mae-consumer}:${DATAHUB_MAE_VERSION:-${DATAHUB_VERSION:-debug}}
   environment:
     <<: [*datahub-dev-telemetry-env, *datahub-mae-consumer-env]
     ENTITY_VERSIONING_ENABLED: ${ENTITY_VERSIONING_ENABLED:-true}
@@ -178,7 +178,7 @@ x-datahub-mae-consumer-service-dev: &datahub-mae-consumer-service-dev
 #################################
 x-datahub-mce-consumer-service: &datahub-mce-consumer-service
   hostname: datahub-mce-consumer
-  image: ${DATAHUB_MCE_CONSUMER_IMAGE:-${DATAHUB_REPO:-acryldata}/datahub-mce-consumer}:${DATAHUB_VERSION:-head}
+  image: ${DATAHUB_MCE_CONSUMER_IMAGE:-${DATAHUB_REPO:-acryldata}/datahub-mce-consumer}:${DATAHUB_MCE_VERSION:-${DATAHUB_VERSION:-head}}
   ports:
     - 9090:9090
   env_file:
@@ -193,7 +193,7 @@ x-datahub-mce-consumer-service: &datahub-mce-consumer-service
 
 x-datahub-mce-consumer-service-dev: &datahub-mce-consumer-service-dev
   <<: *datahub-mce-consumer-service
-  image: ${DATAHUB_MCE_CONSUMER_IMAGE:-${DATAHUB_REPO:-acryldata}/datahub-mce-consumer}:${DATAHUB_VERSION:-debug}
+  image: ${DATAHUB_MCE_CONSUMER_IMAGE:-${DATAHUB_REPO:-acryldata}/datahub-mce-consumer}:${DATAHUB_MCE_VERSION:-${DATAHUB_VERSION:-debug}}
   environment:
     <<: [*datahub-dev-telemetry-env, *datahub-mce-consumer-env]
     ENTITY_VERSIONING_ENABLED: ${ENTITY_VERSIONING_ENABLED:-true}

From 3905c8ee4146c93a06653dbcd690775ae36bef0f Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Tue, 14 Jan 2025 19:36:02 -0600
Subject: [PATCH 080/249] docs(async-api): addition to known issues (#12339)

---
 docs/how/updating-datahub.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/how/updating-datahub.md b/docs/how/updating-datahub.md
index 68b41c907c6ad6..eb5a792216d981 100644
--- a/docs/how/updating-datahub.md
+++ b/docs/how/updating-datahub.md
@@ -1,3 +1,8 @@
+# Known Issues
+
+- Async APIs - DataHub's asynchronous APIs perform only basic schema validation when receiving MCP requests, similar to direct production to MCP Kafka topics. While requests must conform to the MCP schema to be accepted, actual processing happens later in the pipeline. Any processing failures that occur after the initial acceptance are captured in the Failed MCP topic, but these failures are not immediately surfaced to the API caller since they happen asynchronously.
+
+
 # Updating DataHub
 
 <!--

From b015fd2024735ea9590c820267a5f020955ca67d Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Wed, 15 Jan 2025 18:20:46 +0530
Subject: [PATCH 081/249] fix(ingest/gc): fix logging (#12348)

---
 .../ingestion/source/gc/soft_deleted_entity_cleanup.py    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py b/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
index 471eeff0224ed1..b3d6e8514c02f2 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
@@ -99,7 +99,7 @@ class SoftDeletedEntitiesCleanupConfig(ConfigModel):
 
 @dataclass
 class SoftDeletedEntitiesReport(SourceReport):
-    num_queries_found: int = 0
+    num_entities_found: Dict[str, int] = field(default_factory=dict)
     num_soft_deleted_entity_processed: int = 0
     num_soft_deleted_retained_due_to_age: int = 0
     num_soft_deleted_entity_removal_started: int = 0
@@ -277,7 +277,11 @@ def _get_soft_deleted(self, graphql_query: str, entity_type: str) -> Iterable[st
                 # We make the batch size = config after call has succeeded once
                 batch_size = self.config.batch_size
             scroll_id = scroll_across_entities.get("nextScrollId")
-            self.report.num_queries_found += scroll_across_entities.get("count")
+            if entity_type not in self.report.num_entities_found:
+                self.report.num_entities_found[entity_type] = 0
+            self.report.num_entities_found[entity_type] += scroll_across_entities.get(
+                "count"
+            )
             for query in scroll_across_entities.get("searchResults"):
                 yield query["entity"]["urn"]
 

From 3108b539d0365cfa1477e89e04447430983434d2 Mon Sep 17 00:00:00 2001
From: Hyejin Yoon <0327jane@gmail.com>
Date: Thu, 16 Jan 2025 01:11:55 +0900
Subject: [PATCH 082/249] design: revamp navbar dropdown (#11864)

Co-authored-by: Jay <159848059+jayacryl@users.noreply.github.com>
---
 docs-website/docusaurus.config.js             |   1 +
 .../components/CardDropdown/CardDropdown.tsx  | 183 ++++++++++++++++++
 .../CardDropdown/styles.module.scss           |  67 +++++++
 .../SolutionsDropdown/SolutionsDropdown.tsx   | 178 +++++++++++++++++
 .../SolutionsDropdownContent/index.js         |  67 +++++++
 .../solutionsDropdownContent.js               |  38 ++++
 .../styles.module.scss                        | 137 +++++++++++++
 .../SolutionsDropdown/styles.module.css       |  22 +++
 .../src/theme/Navbar/Content/index.tsx        | 119 ++++++++++++
 .../theme/Navbar/Content/styles.module.css    |   8 +
 .../Navbar/communityCardDropdownContent.js    |  29 +++
 .../theme/Navbar/learnCardDropdownContent.js  |  29 +++
 docs-website/static/img/icon-champions.png    | Bin 0 -> 5820 bytes
 docs-website/static/img/icon-events.png       | Bin 0 -> 14473 bytes
 docs-website/static/img/icon-forum.png        | Bin 0 -> 14297 bytes
 docs-website/static/img/icon-join-slack.png   | Bin 0 -> 2154 bytes
 .../static/img/icon-share-your-journey.png    | Bin 0 -> 5495 bytes
 .../img/solutions/icon-dropdown-cloud.png     | Bin 0 -> 13406 bytes
 .../img/solutions/icon-dropdown-core.png      | Bin 0 -> 14825 bytes
 .../img/solutions/icon-dropdown-discovery.png | Bin 0 -> 14282 bytes
 .../solutions/icon-dropdown-governance.png    | Bin 0 -> 12311 bytes
 .../img/solutions/icon-dropdown-observe.png   | Bin 0 -> 14081 bytes
 22 files changed, 878 insertions(+)
 create mode 100644 docs-website/src/components/CardDropdown/CardDropdown.tsx
 create mode 100644 docs-website/src/components/CardDropdown/styles.module.scss
 create mode 100644 docs-website/src/components/SolutionsDropdown/SolutionsDropdown.tsx
 create mode 100644 docs-website/src/components/SolutionsDropdown/SolutionsDropdownContent/index.js
 create mode 100644 docs-website/src/components/SolutionsDropdown/SolutionsDropdownContent/solutionsDropdownContent.js
 create mode 100644 docs-website/src/components/SolutionsDropdown/SolutionsDropdownContent/styles.module.scss
 create mode 100644 docs-website/src/components/SolutionsDropdown/styles.module.css
 create mode 100644 docs-website/src/theme/Navbar/Content/index.tsx
 create mode 100644 docs-website/src/theme/Navbar/Content/styles.module.css
 create mode 100644 docs-website/src/theme/Navbar/communityCardDropdownContent.js
 create mode 100644 docs-website/src/theme/Navbar/learnCardDropdownContent.js
 create mode 100644 docs-website/static/img/icon-champions.png
 create mode 100644 docs-website/static/img/icon-events.png
 create mode 100644 docs-website/static/img/icon-forum.png
 create mode 100644 docs-website/static/img/icon-join-slack.png
 create mode 100644 docs-website/static/img/icon-share-your-journey.png
 create mode 100644 docs-website/static/img/solutions/icon-dropdown-cloud.png
 create mode 100644 docs-website/static/img/solutions/icon-dropdown-core.png
 create mode 100644 docs-website/static/img/solutions/icon-dropdown-discovery.png
 create mode 100644 docs-website/static/img/solutions/icon-dropdown-governance.png
 create mode 100644 docs-website/static/img/solutions/icon-dropdown-observe.png

diff --git a/docs-website/docusaurus.config.js b/docs-website/docusaurus.config.js
index 350521ea8ee643..fb2f418e37c044 100644
--- a/docs-website/docusaurus.config.js
+++ b/docs-website/docusaurus.config.js
@@ -336,6 +336,7 @@ module.exports = {
             require.resolve("./src/styles/sphinx.scss"),
             require.resolve("./src/styles/config-table.scss"),
             require.resolve("./src/components/SecondNavbar/styles.module.scss"),
+            require.resolve("./src/components/SolutionsDropdown/styles.module.css"),
           ],
         },
         pages: {
diff --git a/docs-website/src/components/CardDropdown/CardDropdown.tsx b/docs-website/src/components/CardDropdown/CardDropdown.tsx
new file mode 100644
index 00000000000000..5f896e1ecd8c04
--- /dev/null
+++ b/docs-website/src/components/CardDropdown/CardDropdown.tsx
@@ -0,0 +1,183 @@
+import React, {useState, useRef, useEffect} from 'react';
+import clsx from 'clsx';
+import {
+  isRegexpStringMatch,
+  useCollapsible,
+  Collapsible,
+} from '@docusaurus/theme-common';
+import {isSamePath, useLocalPathname} from '@docusaurus/theme-common/internal';
+import NavbarNavLink from '@theme/NavbarItem/NavbarNavLink';
+import NavbarItem, {type LinkLikeNavbarItemProps} from '@theme/NavbarItem';
+import type {
+  DesktopOrMobileNavBarItemProps,
+  Props,
+} from '@theme/NavbarItem/DropdownNavbarItem';
+import styles from './styles.module.scss';
+import Link from '@docusaurus/Link';
+
+function isItemActive(
+  item: LinkLikeNavbarItemProps,
+  localPathname: string,
+): boolean {
+  if (isSamePath(item.to, localPathname)) {
+    return true;
+  }
+  if (isRegexpStringMatch(item.activeBaseRegex, localPathname)) {
+    return true;
+  }
+  if (item.activeBasePath && localPathname.startsWith(item.activeBasePath)) {
+    return true;
+  }
+  return false;
+}
+
+function containsActiveItems(
+  items: readonly LinkLikeNavbarItemProps[],
+  localPathname: string,
+): boolean {
+  return items.some((item) => isItemActive(item, localPathname));
+}
+
+function DropdownNavbarItemDesktop({
+  label,
+  items,
+  position,
+  className,
+  onClick,
+  ...props
+}: DesktopOrMobileNavBarItemProps) {
+  const dropdownRef = useRef<HTMLDivElement>(null);
+  const [showDropdown, setShowDropdown] = useState(false); 
+
+  useEffect(() => {
+    const handleClickOutside = (
+      event: MouseEvent | TouchEvent | FocusEvent,
+    ) => {
+      if (
+        !dropdownRef.current ||
+        dropdownRef.current.contains(event.target as Node)
+      ) {
+        return;
+      }
+      setShowDropdown(false);
+    };
+
+    document.addEventListener('mousedown', handleClickOutside);
+    document.addEventListener('touchstart', handleClickOutside);
+    document.addEventListener('focusin', handleClickOutside);
+
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
+      document.removeEventListener('touchstart', handleClickOutside);
+      document.removeEventListener('focusin', handleClickOutside);
+    };
+  }, [dropdownRef]);
+
+  return (
+    <div
+      ref={dropdownRef}
+      className={clsx('navbar__item', 'dropdown', 'dropdown--hoverable', {
+        'dropdown--right': position === 'right',
+        'dropdown--show': showDropdown,
+      })}>
+      <NavbarNavLink
+        aria-haspopup="true"
+        aria-expanded={showDropdown}
+        role="button"
+        label={label}
+        // # hash permits to make the <a> tag focusable in case no link target
+        // See https://github.com/facebook/docusaurus/pull/6003
+        // There's probably a better solution though...
+        href={props.to ? undefined : '#'}
+        className={clsx('navbar__link', className)}
+        {...props}
+        onClick={props.to ? undefined : (e) => e.preventDefault()}
+        onKeyDown={(e) => {
+          if (e.key === 'Enter') {
+            e.preventDefault();
+            setShowDropdown(!showDropdown);
+          }
+        }}>
+        {props.children ?? props.label}
+      </NavbarNavLink>
+      <ul className={clsx("dropdown__menu", styles.dropdown__menu)}>
+        <></>
+        {/* {items.map((childItemProps, i) => (
+          <NavbarItem
+            isDropdownItem
+            activeClassName="dropdown__link--active"
+            {...childItemProps}
+            key={i}
+          />
+        ))} */}
+        <div className={clsx(styles.col, styles.wrapper)}>
+          {items.map((item, index) => (
+            <div key={`${index}`} className={clsx(styles.cardWrapper)}>
+              <Link className={clsx(styles.card)} to={item.href}>
+                <div className={clsx(styles.icon)}>
+                  <img src={item.iconImage} alt={item.title} />
+                </div>
+                <div className={clsx(styles.title)}>{item.title}</div>
+              </Link>
+            </div>
+          ))}
+        </div>
+      </ul>
+    </div>
+  );
+}
+
+function DropdownNavbarItemMobile({
+  items,
+  className,
+  position, // Need to destructure position from props so that it doesn't get passed on.
+  onClick,
+  ...props
+}: DesktopOrMobileNavBarItemProps) {
+  const localPathname = useLocalPathname();
+  const containsActive = containsActiveItems(items, localPathname);
+
+  const {collapsed, toggleCollapsed, setCollapsed} = useCollapsible({
+    initialState: () => !containsActive,
+  });
+
+  // Expand/collapse if any item active after a navigation
+  useEffect(() => {
+    if (containsActive) {
+      setCollapsed(!containsActive);
+    }
+  }, [localPathname, containsActive, setCollapsed]);
+
+  return (
+    <li
+      className={clsx('menu__list-item', {
+        'menu__list-item--collapsed': collapsed,
+      })}>
+      <NavbarNavLink
+        role="button"
+        className={clsx(
+          styles.dropdownNavbarItemMobile,
+          'menu__link menu__link--sublist menu__link--sublist-caret',
+          className,
+        )}
+        {...props}
+        onClick={(e) => {
+          e.preventDefault();
+          toggleCollapsed();
+        }}>
+        {props.children ?? props.label}
+      </NavbarNavLink>
+      <Collapsible lazy as="ul" className="menu__list" collapsed={collapsed}>
+        <></>
+      </Collapsible>
+    </li>
+  );
+}
+
+export default function DropdownNavbarItem({
+  mobile = false,
+  ...props
+}: Props): JSX.Element {
+  const Comp = mobile ? DropdownNavbarItemMobile : DropdownNavbarItemDesktop;
+  return <Comp {...props} />;
+}
\ No newline at end of file
diff --git a/docs-website/src/components/CardDropdown/styles.module.scss b/docs-website/src/components/CardDropdown/styles.module.scss
new file mode 100644
index 00000000000000..9b5fff816e5752
--- /dev/null
+++ b/docs-website/src/components/CardDropdown/styles.module.scss
@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+.dropdownNavbarItemMobile {
+  cursor: pointer;
+}
+
+.dropdown__menu {
+  display: flex;
+  width: 13.875rem;
+  padding: 0.875rem 1.63694rem;
+  justify-content: center;
+  align-items: flex-start;
+  gap: 0.98219rem;
+  border-radius: var(--number-scales-2s-20, 1.25rem);
+  background: #FFF;
+  box-shadow: 0px 16px 16px 0px rgba(0, 0, 0, 0.25);
+}
+
+
+.wrapper {
+  display: flex;
+  flex-direction: column;
+  gap: 0.6rem; 
+}
+
+.card {
+  display: flex;
+  align-items: center; 
+  padding: 1rem 0.8rem;
+  text-align: left;
+  gap: 0.5rem; 
+  border-radius: 0.72681rem;
+  background: #F7F7F7;
+  width: 12rem;
+  transition: transform 0.2s, box-shadow 0.2s;
+
+  &:hover {
+        transform: translateY(-5px);
+        box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.1);
+        text-decoration: none;
+        color: inherit;
+    }
+}
+
+.icon {
+    flex-shrink: 0;
+    width: 1.3rem;
+    height: 1.3rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.title {
+    flex-grow: 1;
+    color: #1E1E1E;
+    font-family: Manrope, sans-serif;
+    font-size: 0.9rem;
+    font-weight: 600;
+    line-height: 1.5rem;
+    letter-spacing: -0.011rem;
+}
diff --git a/docs-website/src/components/SolutionsDropdown/SolutionsDropdown.tsx b/docs-website/src/components/SolutionsDropdown/SolutionsDropdown.tsx
new file mode 100644
index 00000000000000..bbb38355ec0594
--- /dev/null
+++ b/docs-website/src/components/SolutionsDropdown/SolutionsDropdown.tsx
@@ -0,0 +1,178 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import React, {useState, useRef, useEffect} from 'react';
+import clsx from 'clsx';
+import {
+  isRegexpStringMatch,
+  useCollapsible,
+  Collapsible,
+} from '@docusaurus/theme-common';
+import {isSamePath, useLocalPathname} from '@docusaurus/theme-common/internal';
+import NavbarNavLink from '@theme/NavbarItem/NavbarNavLink';
+import NavbarItem, {type LinkLikeNavbarItemProps} from '@theme/NavbarItem';
+import type {
+  DesktopOrMobileNavBarItemProps,
+  Props,
+} from '@theme/NavbarItem/DropdownNavbarItem';
+import styles from './styles.module.css';
+import SolutionsDropdownContent from './SolutionsDropdownContent';
+
+function isItemActive(
+  item: LinkLikeNavbarItemProps,
+  localPathname: string,
+): boolean {
+  if (isSamePath(item.to, localPathname)) {
+    return true;
+  }
+  if (isRegexpStringMatch(item.activeBaseRegex, localPathname)) {
+    return true;
+  }
+  if (item.activeBasePath && localPathname.startsWith(item.activeBasePath)) {
+    return true;
+  }
+  return false;
+}
+
+function containsActiveItems(
+  items: readonly LinkLikeNavbarItemProps[],
+  localPathname: string,
+): boolean {
+  return items.some((item) => isItemActive(item, localPathname));
+}
+
+function DropdownNavbarItemDesktop({
+  items,
+  position,
+  className,
+  onClick,
+  ...props
+}: DesktopOrMobileNavBarItemProps) {
+  const dropdownRef = useRef<HTMLDivElement>(null);
+  const [showDropdown, setShowDropdown] = useState(false); 
+
+  useEffect(() => {
+    const handleClickOutside = (
+      event: MouseEvent | TouchEvent | FocusEvent,
+    ) => {
+      if (
+        !dropdownRef.current ||
+        dropdownRef.current.contains(event.target as Node)
+      ) {
+        return;
+      }
+      setShowDropdown(false);
+    };
+
+    document.addEventListener('mousedown', handleClickOutside);
+    document.addEventListener('touchstart', handleClickOutside);
+    document.addEventListener('focusin', handleClickOutside);
+
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
+      document.removeEventListener('touchstart', handleClickOutside);
+      document.removeEventListener('focusin', handleClickOutside);
+    };
+  }, [dropdownRef]);
+
+  return (
+    <div
+      ref={dropdownRef}
+      className={clsx('navbar__item', 'dropdown', 'dropdown--hoverable', {
+        'dropdown--right': position === 'right',
+        'dropdown--show': showDropdown,
+      })}>
+      <NavbarNavLink
+        aria-haspopup="true"
+        aria-expanded={showDropdown}
+        role="button"
+        label="Solutions"
+        // # hash permits to make the <a> tag focusable in case no link target
+        // See https://github.com/facebook/docusaurus/pull/6003
+        // There's probably a better solution though...
+        href={props.to ? undefined : '#'}
+        className={clsx('navbar__link', className)}
+        {...props}
+        onClick={props.to ? undefined : (e) => e.preventDefault()}
+        onKeyDown={(e) => {
+          if (e.key === 'Enter') {
+            e.preventDefault();
+            setShowDropdown(!showDropdown);
+          }
+        }}>
+        {props.children ?? props.label}
+      </NavbarNavLink>
+      <ul className={clsx("dropdown__menu", styles.dropdown__menu)}>
+        <></>
+        {/* {items.map((childItemProps, i) => (
+          <NavbarItem
+            isDropdownItem
+            activeClassName="dropdown__link--active"
+            {...childItemProps}
+            key={i}
+          />
+        ))} */}
+        <SolutionsDropdownContent />
+      </ul>
+    </div>
+  );
+}
+
+function DropdownNavbarItemMobile({
+  items,
+  className,
+  position, // Need to destructure position from props so that it doesn't get passed on.
+  onClick,
+  ...props
+}: DesktopOrMobileNavBarItemProps) {
+  const localPathname = useLocalPathname();
+  const containsActive = containsActiveItems(items, localPathname);
+
+  const {collapsed, toggleCollapsed, setCollapsed} = useCollapsible({
+    initialState: () => !containsActive,
+  });
+
+  // Expand/collapse if any item active after a navigation
+  useEffect(() => {
+    if (containsActive) {
+      setCollapsed(!containsActive);
+    }
+  }, [localPathname, containsActive, setCollapsed]);
+
+  return (
+    <li
+      className={clsx('menu__list-item', {
+        'menu__list-item--collapsed': collapsed,
+      })}>
+      <NavbarNavLink
+        role="button"
+        className={clsx(
+          styles.dropdownNavbarItemMobile,
+          'menu__link menu__link--sublist menu__link--sublist-caret',
+          className,
+        )}
+        {...props}
+        onClick={(e) => {
+          e.preventDefault();
+          toggleCollapsed();
+        }}>
+        {props.children ?? props.label}
+      </NavbarNavLink>
+      <Collapsible lazy as="ul" className="menu__list" collapsed={collapsed}>
+        <></>
+      </Collapsible>
+    </li>
+  );
+}
+
+export default function DropdownNavbarItem({
+  mobile = false,
+  ...props
+}: Props): JSX.Element {
+  const Comp = mobile ? DropdownNavbarItemMobile : DropdownNavbarItemDesktop;
+  return <Comp {...props} />;
+}
\ No newline at end of file
diff --git a/docs-website/src/components/SolutionsDropdown/SolutionsDropdownContent/index.js b/docs-website/src/components/SolutionsDropdown/SolutionsDropdownContent/index.js
new file mode 100644
index 00000000000000..79481c52f279e6
--- /dev/null
+++ b/docs-website/src/components/SolutionsDropdown/SolutionsDropdownContent/index.js
@@ -0,0 +1,67 @@
+import React from 'react';
+import styles from './styles.module.scss';
+import clsx from 'clsx';
+import Link from '@docusaurus/Link';
+import solutionsDropdownContent from './solutionsDropdownContent'; 
+
+function SolutionsDropdownContent() {
+  const { fullSizeCards, halfSizeCards } = solutionsDropdownContent;
+
+  return (
+    <div className={clsx(styles.container)}>
+      <div className={clsx(styles.row)}>
+        {/* Full-size cards */}
+        {fullSizeCards.map((item, index) => (
+          <div key={`full-${index}`} className={clsx(styles.col)}>
+            <Link
+              className={clsx(styles.card, styles.fullSizeCard)}
+              to={item.href}
+            >
+              <div className={clsx(styles.cardContent)}>
+                <div className={clsx(styles.cardText)}>
+                  <img
+                      src={item.iconImage}
+                      alt={item.title}
+                      className={clsx(styles.icon)}
+                  />
+                  <div className={clsx(styles.header)}>
+                    <div className={clsx(styles.title)}>{item.title}</div>
+                  </div>
+                  <div className={clsx(styles.description)}>{item.description}</div>
+                </div>
+              </div>
+            </Link>
+          </div>
+        ))}
+
+        {/* Half-size cards */}
+        <div className={clsx(styles.col, styles.halfSizeWrapper)}>
+          {halfSizeCards.map((item, index) => (
+            <div key={`half-${index}`} className={clsx(styles.halfSizeCardWrapper)}>
+              <Link
+                className={clsx(styles.card, styles.halfSizeCard)}
+                to={item.href}
+              >
+                <div className={clsx(styles.cardContent)}>
+                  <div className={clsx(styles.cardText)}>
+                    <div className={clsx(styles.header)}>
+                      <img
+                        src={item.iconImage}
+                        alt={item.title}
+                        className={clsx(styles.icon)}
+                      />
+                      <div className={clsx(styles.title)}>{item.title}</div>
+                    </div>
+                    <div className={clsx(styles.description)}>{item.description}</div>
+                  </div>
+                </div>
+              </Link>
+            </div>
+          ))}
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export default SolutionsDropdownContent;
diff --git a/docs-website/src/components/SolutionsDropdown/SolutionsDropdownContent/solutionsDropdownContent.js b/docs-website/src/components/SolutionsDropdown/SolutionsDropdownContent/solutionsDropdownContent.js
new file mode 100644
index 00000000000000..abede0f11735d4
--- /dev/null
+++ b/docs-website/src/components/SolutionsDropdown/SolutionsDropdownContent/solutionsDropdownContent.js
@@ -0,0 +1,38 @@
+const solutionsDropdownContent = {
+    fullSizeCards: [
+        {
+            title: "Data Discovery",
+            description: "Search, Browse, Lineage, and more.",
+            iconImage: "/img/solutions/icon-dropdown-discovery.png",
+            href: "/solutions/discovery",
+        },
+        {
+            title: "Data Observability",
+            description: "Detect and Resolve Data Quality issues",
+            iconImage: "/img/solutions/icon-dropdown-observe.png",
+            href: "/solutions/observability",
+        },    
+        {
+            title: "Data Governance",
+            description: "Automate Classifying and Governing data.",
+            iconImage: "/img/solutions/icon-dropdown-governance.png",
+            href: "/solutions/governance",
+        },
+    ],    
+    halfSizeCards: [
+        {
+            title: "DataHub Core",
+            description: "Get started with the Open Source platform.",
+            iconImage: "/img/solutions/icon-dropdown-core.png",
+            href: "/",
+        },
+        {
+            title: "Cloud vs Core",
+            description: "Understand the differences.",
+            iconImage: "/img/solutions/icon-dropdown-cloud.png",
+            href: "/cloud",
+        },
+    ],
+};
+    
+export default solutionsDropdownContent
\ No newline at end of file
diff --git a/docs-website/src/components/SolutionsDropdown/SolutionsDropdownContent/styles.module.scss b/docs-website/src/components/SolutionsDropdown/SolutionsDropdownContent/styles.module.scss
new file mode 100644
index 00000000000000..b156c3342f24ab
--- /dev/null
+++ b/docs-website/src/components/SolutionsDropdown/SolutionsDropdownContent/styles.module.scss
@@ -0,0 +1,137 @@
+.container {
+    display: flex;
+  }
+  
+  .row {
+    display: flex;
+    gap: 1rem;
+  }
+  
+  .card {
+    display: flex;
+    width: 12.4375rem;
+    height: 12.5rem;
+    padding: 0;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    flex-shrink: 0;
+    border-radius: 0.72681rem;
+    background: #F7F7F7;
+    text-align: left;
+    text-decoration: none;
+    transition: transform 0.3s ease, box-shadow 0.3s ease;
+  }
+
+  .header { 
+    display: inline-flex;
+  }
+
+  .title {
+    color: #1E1E1E;
+    font-family: Manrope;
+    font-style: normal;
+    font-weight: 600;
+  }
+
+  .description {
+    color: #757575;
+    font-family: Manrope;
+    font-style: normal;
+    font-weight: 300;
+  }
+
+  .fullSizeCard {
+    background-repeat: no-repeat;  
+    background-size: contain;
+    background-position: bottom right;
+    height: 100%;
+    padding: 1.4rem;
+
+    .icon {
+        width: 1.7rem;
+        height: 1.7rem;
+        display: block;
+    }
+
+    .title {
+        font-size: 1.1rem;
+        font-weight: 600;
+        line-height: 150%; /* 1.6875rem */
+        letter-spacing: -0.01238rem;
+        margin-top: 0.5rem;
+    }
+
+    .description {
+        font-size: 0.95rem;
+        line-height: 150%; /* 1.5rem */
+        letter-spacing: -0.011rem;
+    };
+  }
+  
+  .halfSizeWrapper {
+    display: flex;
+    flex-direction: column;
+    gap: 0.98rem; 
+  }
+
+  .halfSizeCard {
+    display: flex;
+    height: 5.75rem;
+    padding: 1.4rem;
+    flex-direction: column;
+    align-items: center;
+    flex-shrink: 0;
+    align-self: stretch;
+
+    .icon {
+        display: flex;
+        width: 1.26806rem;
+        height: 1.26806rem;
+        padding: 0.13206rem 0.13725rem 0.13213rem 0.13213rem;
+        justify-content: center;
+        align-items: center;
+        flex-shrink: 0;
+        margin-right: 0.65rem;
+    }
+
+    .title {
+        color: #1E1E1E;
+        font-family: Manrope;
+        font-size: 0.95rem;
+        font-style: normal;
+        font-weight: 600;
+        line-height: 150%; /* 1.5rem */
+        letter-spacing: -0.011rem;
+    }
+
+    .description {
+        font-size: 0.75rem;
+        line-height: 150%; /* 1.125rem */
+        letter-spacing: -0.00825rem;
+        margin-left: 2rem;
+    }
+  }
+  
+  .card:hover {
+    transform: translateY(-5px);
+    box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.1);
+    text-decoration: none;
+    color: inherit;
+  }
+  
+  
+  @media (max-width: 768px) {
+    .col {
+      flex: 1 1 48%;
+      max-width: 48%;
+    }
+  }
+  
+  @media (max-width: 480px) {
+    .col {
+      flex: 1 1 100%;
+      max-width: 100%;
+    }
+  }
+  
\ No newline at end of file
diff --git a/docs-website/src/components/SolutionsDropdown/styles.module.css b/docs-website/src/components/SolutionsDropdown/styles.module.css
new file mode 100644
index 00000000000000..09c71edf0b1850
--- /dev/null
+++ b/docs-website/src/components/SolutionsDropdown/styles.module.css
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+ .dropdownNavbarItemMobile {
+  cursor: pointer;
+}
+
+.dropdown__menu {
+  width: fit-content;
+  height: fit-content;
+  padding: 1rem;
+  justify-content: center;
+  align-items: flex-start;
+  gap: 0.98219rem;
+  border-radius: var(--number-scales-2s-20, 1.25rem);
+  background: #FFF;
+  box-shadow: 0px 16px 16px 0px rgba(0, 0, 0, 0.25);
+}
\ No newline at end of file
diff --git a/docs-website/src/theme/Navbar/Content/index.tsx b/docs-website/src/theme/Navbar/Content/index.tsx
new file mode 100644
index 00000000000000..934ea023dd5930
--- /dev/null
+++ b/docs-website/src/theme/Navbar/Content/index.tsx
@@ -0,0 +1,119 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import React, {type ReactNode} from 'react';
+import {useThemeConfig, ErrorCauseBoundary} from '@docusaurus/theme-common';
+import {
+  splitNavbarItems,
+  useNavbarMobileSidebar,
+} from '@docusaurus/theme-common/internal';
+import NavbarItem, {type Props as NavbarItemConfig} from '@theme/NavbarItem';
+import NavbarColorModeToggle from '@theme/Navbar/ColorModeToggle';
+import SearchBar from '@theme/SearchBar';
+import NavbarMobileSidebarToggle from '@theme/Navbar/MobileSidebar/Toggle';
+import NavbarLogo from '@theme/Navbar/Logo';
+import NavbarSearch from '@theme/Navbar/Search';
+import SolutionsDropdown from '../../../components/SolutionsDropdown/SolutionsDropdown';
+import CardDropdown from '../../../components/CardDropdown/CardDropdown';
+import learnCardDropdownContent from '../learnCardDropdownContent';
+import communityCardDropdownContent from '../communityCardDropdownContent';
+
+import styles from './styles.module.css';
+
+function useNavbarItems() {
+  // TODO temporary casting until ThemeConfig type is improved
+  return useThemeConfig().navbar.items as NavbarItemConfig[];
+}
+
+function NavbarItems({items}: {items: NavbarItemConfig[]}): JSX.Element {
+  return (
+    <>
+      {items.map((item, i) => (
+        <ErrorCauseBoundary
+          key={i}
+          onError={(error) =>
+            new Error(
+              `A theme navbar item failed to render.
+Please double-check the following navbar item (themeConfig.navbar.items) of your Docusaurus config:
+${JSON.stringify(item, null, 2)}`,
+              {cause: error},
+            )
+          }>
+          <NavbarItem {...item} />
+        </ErrorCauseBoundary>
+      ))}
+    </>
+  );
+}
+
+function NavbarContentLayout({
+  left,
+  right,
+}: {
+  left: ReactNode;
+  right: ReactNode;
+}) {
+  return (
+    <div className="navbar__inner">
+      <div className="navbar__items">{left}</div>
+      <div className="navbar__items navbar__items--right">{right}</div>
+    </div>
+  );
+}
+
+export default function NavbarContent(): JSX.Element {
+  const mobileSidebar = useNavbarMobileSidebar();
+
+  const items = useNavbarItems();
+  const [leftItems, rightItems] = splitNavbarItems(items);
+
+  // among the right items, pick items except "Solution", "Learn", "Community"
+  const rightItemsDropdown = rightItems.filter(
+    (item) =>
+      item.label == 'Cloud' ||
+      item.label == 'Docs' ||
+      item.label == 'Integrations'
+  );
+
+  // pick items without labels 
+  const rightItemsCTA = rightItems.filter(
+    (item) =>
+      item.label == undefined
+  );
+
+  const searchBarItem = items.find((item) => item.type === 'search');
+
+  return (
+    <NavbarContentLayout
+      left={
+        // TODO stop hardcoding items?
+        <>
+          {!mobileSidebar.disabled && <NavbarMobileSidebarToggle />}
+          <NavbarLogo />
+          <NavbarItems items={leftItems} />
+        </>
+      }
+      right={
+        // TODO stop hardcoding items?
+        // Ask the user to add the respective navbar items => more flexible
+        <>
+          <SolutionsDropdown />
+          <NavbarItems items={rightItemsDropdown} />
+          <CardDropdown label="Learn" items={learnCardDropdownContent} />
+          <CardDropdown label= "Community" items={communityCardDropdownContent} />
+          <NavbarItems items={rightItemsCTA} />
+          <NavbarColorModeToggle className={styles.colorModeToggle} />
+          {!searchBarItem && (
+            <NavbarSearch>
+              <SearchBar />
+            </NavbarSearch>
+          )}
+        </>
+      }
+    />
+  );
+}
\ No newline at end of file
diff --git a/docs-website/src/theme/Navbar/Content/styles.module.css b/docs-website/src/theme/Navbar/Content/styles.module.css
new file mode 100644
index 00000000000000..e5d6fde1107cae
--- /dev/null
+++ b/docs-website/src/theme/Navbar/Content/styles.module.css
@@ -0,0 +1,8 @@
+/*
+Hide color mode toggle in small viewports
+ */
+ @media (max-width: 996px) {
+    .colorModeToggle {
+      display: none;
+    }
+  }
\ No newline at end of file
diff --git a/docs-website/src/theme/Navbar/communityCardDropdownContent.js b/docs-website/src/theme/Navbar/communityCardDropdownContent.js
new file mode 100644
index 00000000000000..a2d0496959ca7a
--- /dev/null
+++ b/docs-website/src/theme/Navbar/communityCardDropdownContent.js
@@ -0,0 +1,29 @@
+const learCardDropdownContent = [
+        {
+            title: "Join Slack",
+            iconImage: "/img/icon-join-slack.png",
+            href: "/slack",
+        },
+        {
+            title: "Forum",
+            iconImage: "/img/icon-forum.png",
+            href: "https://forum.datahubproject.io/",
+        },    
+        {
+            title: "Events",
+            iconImage: "/img/icon-events.png",
+            href: "/events",
+        },
+        {
+            title: "Champions",
+            iconImage: "/img/icon-champions.png",
+            href: "/champions",
+        },
+        {
+            title: "Share Your Journey",
+            iconImage: "/img/icon-share-your-journey.png",
+            href: "/customer-stories-survey",
+        }
+    ]
+
+export default learCardDropdownContent
\ No newline at end of file
diff --git a/docs-website/src/theme/Navbar/learnCardDropdownContent.js b/docs-website/src/theme/Navbar/learnCardDropdownContent.js
new file mode 100644
index 00000000000000..cf60e21c5530fa
--- /dev/null
+++ b/docs-website/src/theme/Navbar/learnCardDropdownContent.js
@@ -0,0 +1,29 @@
+const learCardDropdownContent = [
+        {
+            title: "Weekly Demo",
+            iconImage: "/img/icon-join-slack.png",
+            href: "https://www.acryldata.io/webinars/weekly-live-demo",
+        },
+        {
+            title: "Use Cases",
+            iconImage: "/img/icon-forum.png",
+            href: "/learn",
+        },    
+        {
+            title: "Adoption Stories",
+            iconImage: "/img/icon-events.png",
+            href: "/adoption-stories",
+        },
+        {
+            title: "Blog",
+            iconImage: "/img/icon-champions.png",
+            href: "https://blog.datahubproject.io/",
+        },
+        {
+            title: "Youtube",
+            iconImage: "/img/icon-share-your-journey.png",
+            href: "https://www.youtube.com/channel/UC3qFQC5IiwR5fvWEqi_tJ5w",
+        }
+    ]
+
+export default learCardDropdownContent
\ No newline at end of file
diff --git a/docs-website/static/img/icon-champions.png b/docs-website/static/img/icon-champions.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ac2cd895db7153cf8e6cfd64d128b71e24f99d9
GIT binary patch
literal 5820
zcmeHLXH*o~w%*k=HXuPj(vTd%0NOOBQDUQ#K|w&kR-hduDJEbDf^@4F15rkzzyK-&
zBLXH=6ln($B_kOmN|PiuNa|3xfHmvA`~JK?@BVme-CC<wovO3XIaOzWd++b7Th@n7
zM1+140ss*+Q$rg79M;5vz#8l_8`!jjT?8+f9`glQE4h3ka5q&Jdx-ejm>huoT7?np
z2Jf-|(0+g?F>5&|`2nPlm>KT33q;1d4&6S{{2O7)_YGmK{Z{MgFIU@Cov%0<X{FFz
zvvDc-6S==isanLh$sc6AUng>9SkM~ZcFQdJXsYA-YkNPhnW|K_;~($0c8d&<cKPP?
z>-GpKQ_K09ak*r%V>uoV-(<5(*zBVv6Mua4PY%+X<V<Q!mPBK(^Y1*UIyMZgyZ0;R
z3@2RfBz%zyTIXO~`KHRm&1%ua;loD{cdLalXuPQILm^fq%h;ON4ZUpr<5sHGFEv-F
zMG7CbweGIah;rhlRGRcPG8?CISuK0q*lAPkFzB&~)qCY8$NX8y2Ewks4KA5a|0>lV
z%1W^%y|WH|yE8<TUOsExF1nX6pU-bQ#BjNFq#>rM$H9LwXV^u0POo0{QI`CLgClEF
z>qU|@j55kvI@vO$E@$WNBSlqZyfqzOdoGP6_y`1Nz8)fl(bbNu)An?IQR+tvT3mek
z1DC<|!#%Ww;dNok!>^k6?c!Jp-#~}duY4x*KhB=wi*J*Bvovosix$20|F!oYen9c&
zUgAEV9cQtu4)hUD#}d-Fi;?#VB}IxFtSy-wcz5umGOl@~M_TLMPsJeFfOsZ98|Trs
zk;vk6%GTMo7u^>=%Zj3{uc6c9N1Md=M?8zlv2EEpWubhdMLHVhd*cr?0xG}nFC-3r
zBo^v_FAW^2$Xe);3MVsi&>*Mwrb595Ch=8SjP7q|ycSWbprE6ki+tXuBcncsewL~9
z<^kLpr65*A>ddgA3|p|5%Njmzb_X<(FgN6EH9PU0lYTGlNaz>=hB_3B?@5Y-boJ6(
zvc^)(r^OD<dkEDSPv`fU`>0ReT0)!&1@}rJ-~DeLIB8=9#+V?iHJBz)vjxHT;R2tg
z7>=RvIDNbTYZ7n_U8kqB1<dJhnG1Y{Wq7)lmlAKH=S{6LJxCk|d#CPidub$mIi3W*
zDlk^qU`7j)oe%35V<-rM4v~1dR5x^YH5W-zL8yeNcVD-p&Jq~7b>MI6#dT5E>Jq1*
zupJO;_Jbc5JPjdm1RO)uv2?)dyE2`BBUHD2Y-Nj1ian-*^v!#_eYr(0td~E<rdyTF
z-btM~{owug9XDNKy3Z$w4dk4dnW{X_9O+L=x43&PxJPvG-W<0SP@bg$BxMc`SN_Nv
zDJ69Tye$2eD`Pd(*PHxlaZi|1Mlha!%)H^AB+APDG%~GlZHvu-gIL%7VLrcP&{U~u
z*fO7x-4hW;o<4tnsv^11)$IlPsI2A+WU#S;W?p`S=&xv~Z=?{~XS2}bxjvNsrvU6K
z)Mv-M+9~b-Bi*6uPt<~0?pu?|ErSeg4ZhT<f)DrpSlCPXk*?${pWPbTwtey_2T{-B
z({%gZ%FTYICA||KyzwQy3tFh>?FZ{U2z69?wirz<J)!i@ccE9mTp8Q2QJZ27>9fy&
z|MrnZ8#AHsfOFj!9(w+4#p`rjBxf)1O@-nZcFcwsXv8jdU6~5A&+%E_xEO;VhgjN%
zlOv1-kKTXA^)2w4=z1d!7eo=Nd2JC&iU{*WhnfRD7O29{Fee5HLgVk(Y0lDUL<6s`
zO#a(FPL+Fm7Z>)C5h}$8EjA4jKg>IRtBLkP>s4#wB1~oC>1u7S7Oi-8)t7nX;_}I<
zOjh0xF$Vu@A?i<;xQ|@LLld>gN8QB>5?V@|$snT&mIrI^OTtj;QVi$Rhx$!4h;+ki
zN|hWTP-|yUzqi#qmtAZEbr+tV`^h0@0#TTWBbZe4khbjz^*~Lm>-~Q6<ahKj_CNxm
z+LUB<?eI{`if5gg6JtCSggc}0bF{<0dWdHBi$vo9R1n%!9S}?PA-x@~b2R6ulatvs
zdKz3l>I|N4#_X>6^<CvCId6F~6}nkgo8rtE4Co4hJqq5pKr=U0BWic)QpyrnMrD&C
zK#?IN*;V?E!+;~(XaqM5P`C-l7#Iwe=-tpQ3~d{cjBy)Uvj`p9)Ey8o2*U&9+{V(m
zlmtM=0jxCHnF7#-1OcpnMgY`R;Xg+Iw_A{aqkg<Q*p~I=5zY3&!naQ)Rz{T$2`>W@
ziSgrh?V*&SR#(}&kIC<8Mgw;a`EH=MivvB`D_W^jvZ0i0vvgo_`l+lGC$5eg6Lpp0
z(fZOkWQWE?O!slGX#HseL0rM^DuNH#df>sb%d@;kmo?C;LM%BEj=IFZ)QE{{=DCkY
zHIa|-*kZfI3LJA7!UDjsdt9(Ya$dSP;OAi3?e@07o0NEtF`0;VJ;n=Ag%L=)TNac5
z)!u%b6qo2w-eS*@d7ACV$J4pQeIu&JIz^`E)>HU47lr=bvx&=QX--78D>(QkM*r1n
zYp#4oDX{;F?BL#1Re?JV2yEWTOhCh!A;BRJ&;w)U#yCw3W^F}sFE|xDB<O0II4JTa
zP<Y>D1sPZkq!Zg463~6dxWcnIDD?6@y%^)F3Y}CuM7{tbdNC4DjlitdQgT+Uyl_~+
zOFw6lqhrDQsyIv?r_{5QD@@^IJp%d}M^}dQ9ux$|8%oDYM{St^3?HbXDX1X(Zis?i
zzU``w6AtY1o^vLLsVjW~Dv<MqP2ssjXv+y&>nTD`wH6UA#@ag&Q2)~KjI+f})gV3+
zGH_C<OtP8^^5=a%P;_WM#=EmqB4Z;C{E`yTB3VIe{zu601|oV(POv^m8|rsZc($ih
z4Q>cR{m&HMu9K<;TaGCj5Ih&_Qez<vn}e9mEWH+qA6|z*N1lvJ1FPraWHkOj@4fPn
zz|5NK(@|8V784voe8~4df_QL4dU)JKZ5gMTwG`DLkBn`_Hu_}H9@dnY>q0GA@m)ZV
zYb>EPVgB$x)`5;WfdAp>if^-19sAN~-P@HNNej%NJ>5zn4>?nH%!>V>^OqZ)Au9WV
z6KvuWeqKrcIr=g@q){R8neOGsixpd3NL9Zd6dz$-aN$c*Qv~YA?p7B1<~ZrqU*{*f
z=3m9a*fNmPW}dG&I_)GLsu^L&R~$WtF<jfC#T6H7>fk_AuhVnI(a$g|%lD^N9leA(
zTJTW8if=7r0K9vIS8?Jei$JGl=jw1RZ0QL9{8a>`V^-Y?t5$QERf=ZMDo%dW28L`z
z;|c<Pu>#QliYr=qubLe=sC9j^`d)#Ul~%{9m3}I~+w8DaaBw1l?isuSjD@q>U|lk?
z`c?A+VEybQ$D(z0$u-NMF|I0oJ>PQPFf0;pKmhew=PI(ghpIsh9&*eGb*%KbSa`7$
zM_2b_Z%55AJgF$c@Y_qZD;;~pfx6Mnt>jY}hR`a?ZVAV+I;FLB0<bwY_)#p&#I>)Z
zoWi@~S#G+a{B(OA4mvRuNXl`xOP`Z^$Rrcj>PdW>wi!@`<?yjoRg7sE_md7wK%0o8
zrW>;S-g-yOwBP?N5~vc{gu0LA+&jz*x<fnY3FvlWzv+f_XSTEOv&%I_Bf!A_B6QIC
z)@y&{IVYeJ7lpU)SHY}jWD2o3u~ZjRCdHiDAx7cpocq}r7j!|D)e)la>vtVMl0p&?
z?+I5VuDPE;E7qC+l7{h)^NxZOc}IqZrrwvhY$Gn{RJ{vS@qa3R`-Vy7Y@gJX7&Af8
z6ggj@XBS;v@F99Vj))pPnNhj&bkg=x;W6I5X0oItP=#9R_&;5fcXt+e&XK9Djl#EF
z>k(o4`fsKR;UVew9|!8?zuJg4kt&)FVjr|Ig=?Cz9_^k=7#@<ms@%8{80+`UD+K1|
z)${y{)397plvHEdJ61`%?XoqURGyxTZGEM28hx<$9eL{wly=jsK(wB9UXh(%v<|4o
zcbO$(M$T-*0nX%;to93D^D&~Fps8CnWFF@4v@x1=nhx@pa9WAsR6)vMo6~Zx58}Rl
z>LjU_A8Go=m3z+TI{^#K(Q;OZZmn>-hEdreXYF1-Hu^iy!&P>#iMd<P(3#47G_4R#
zRzbj@(SH1Meri`vbvqXwYZsBma@&6@_5Z^ypa|_V@ttk^;}iGH7n|aZV*Qn-K>>yx
zw!8)@Hw(8;-#IyYf&{4ltzpgeP``Hl<Kf(R=6F}u+icy)XKv1q3Bx}j89U|q$@!my
zMh2TANO3QX`BCq%I>bN`PdAS%;{AwSVw*o!mf}{~Jk2BIBt!kl?~k|<iRVb9$*rBt
z%tSH9F`NP6Y~Ebr1c^je&Yy)|T|8a%$igy<&EQ)f3PtANSvr~6kD6po@fGsp4A@S}
zP-tWy^}iCsjHtt5lbY!_<q@P_U(McvD+8N10MzSiIjgH-+J}zusqYWsq7$=EF6Sk9
ze8;NbGU<BII`0&$r!((^$<mgTYr)sXvELz{iMso2lv=Ld5&(E^qLk2|?(CH?uY+7z
zrmDnP2bC;B$~AT#FWUg4ul(lIm?Ws2Nv5h}v{w3r8n2{}$Xqn^twSE8YFNZLQav1a
z*K9b6Qm7Zp31Is}g_w$wz84p@(G%0@`WSzfHr1EX(v#W|nD;jHh1P?qx^Mu7LX=Qw
zo^iNL)y(w1T_M^&`t7?3SKB2()?+s6cwM&hl3DG2iwkQCDmH}bU2?Gy%_zY`?NH!o
zd1KJNz=x{St?Mt*C&XdjnadM%fzj_JbE~^VUpKAEXvEV;&#vd~3<%E4o1^{K_EjW9
z2xm}ZoY<Bsr=$^vifs7`O-5J^8UFaw$bZvp=kRtZ0q66c%$2zZ74(Z)t0~g|{8xdN
zA+1Gwts8=6*vsK$z!^ySe08)($zNE6-o2@O^}oq)Lx<MWpxX+DpX%z`C`Iq7>fk}h
zZE*vKsM@)@l83JYCMj6)!_yB}KANtbdN1o<u1ueifa0xU=OZInq!hP+dA?o_o<4Ex
zU$xd@xvu_z1?!-eB|`62JYD1SV(!h^)6d@aj4IRDN`UtLJe~^q*e{73L^A>E<wgRN
zxux!yGIAFHr`W$`REGSD;K6`sW4?{~c}$spND{O+{Fh)tGJdd53kQ?WicU202-L<9
zc`7@;ndZplE8L_FXA@_(!b%%wP?Z&mmYbRpFe)hy6pe}wlDQ04hnMd<&aFGY2E1dT
z-aof=bd3Rc$3I#YLE11rZ$C3-4&IHqpS<?igzm_i4G9e%$MpHBMg@UlBEO_s`TS#+
z-$n4NFdul&C%zc(zDO5$HIYN$LVii?(w2=xJ!@$#?Q%s-ME|S^8Q<(J_V!-?BC;=2
zzMiNJaN^S+Uqlx6&ytFZf@a@HM=5Ru(5(GKb`Xtxuj8=CBt{TX{29}3a`I{PfJ>#F
zyDP5FVbRc*r-xM%mlHm*l6*QC;;Az}@AR&pQQj-$Nk*`58tst|%2j@T7sG7JgI9Z6
zt|#iqWOQM%P;@%rMBKS>r^`-s>E(Hf*SE$W67kxhBSwF0F)}IvsRC`kYA}KN-DgZL
zi=Oeq4>OAH>SLdx99orwl2zHpVu-a&#k&Ma*c>1Hs4oU`4uv<Hwm&H-$J1|#gi7PU
zIz@qGbU6AlaWhzMS0ss*L5`{UNMO4Hn_>w`O(XB0Z4ycsc7lwJi?bc`tmBiyS6d`t
zbJK1@_ja1lw#>EA<hn`!3;9?yZGSMP^l#sYNvwDQIs26qZoM5$YW2Y})?@O<*Z~*v
z$h+gD!AoXe?9EwotqHl{qEyf%E^`LnPG`X(9Hhms<OU{*!VRE<=BDpMxPkW~OtAq&
z0mNV^u0Q?8-negHlQSf--vbn7{@FDz<H&J|2L&*M{!J4oXjfl^f_sM6C2y+-Jh94x
z`9G(0)=<XBD#`27{3EIEIa<X&E{h_{LN0HFpC7@<b9L{90nT*`Ua<)zJ^69YV0JPl
zZZ1)ojTF`||IEp~`QDZJ<B>hLYZHv!eyHW|H8$E~=Ny{v-5S@!iD$M>vY%hkl9%E%
v$gn>|Fc$+;<@BBGIp<gywg0ys%Ka#ksg6H;aRBXEUdYVouwniI>eYV&tP4*Y

literal 0
HcmV?d00001

diff --git a/docs-website/static/img/icon-events.png b/docs-website/static/img/icon-events.png
new file mode 100644
index 0000000000000000000000000000000000000000..d40d939800e54e59798fc01e3c84726f49861d71
GIT binary patch
literal 14473
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

literal 0
HcmV?d00001

diff --git a/docs-website/static/img/icon-forum.png b/docs-website/static/img/icon-forum.png
new file mode 100644
index 0000000000000000000000000000000000000000..d405b9224cd080cbe24887848f9656a6baba6fa5
GIT binary patch
literal 14297
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

literal 0
HcmV?d00001

diff --git a/docs-website/static/img/icon-join-slack.png b/docs-website/static/img/icon-join-slack.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed4eac95fd316096d5b9ac59f3b78e6f91f90469
GIT binary patch
literal 2154
zcmV-w2$lDVP)<h;3K|Lk000e1NJLTq002+`002-31^@s6juG;$00009a7bBm001mY
z001mY0i`{bsQ>@~0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH2meV#K~#7F?VMXo
z6jvC>4@gvQb*Zh|`Z6fKGzFKW(byOrQpM#-P?K6AWlT(cC=H~hmWQ^x+xEfsK{3(?
zTN9T=+dh!8KDjNXtO=>rG+~8DsIG}9c%^~mVpaP6hnZy-!JT25OV{&D*17Clod2Bj
z-OgDU<8U|}4#$a%kB`@nj*dRWXKZZD%PhjK`z|Q4Sgi7Tw10BvyN&V(>%+stA~PAQ
z@0-cY!yRhB%mxM@$RDg{W@d`ad@Q}MnF78LZ~;>!ix~v=Br7Y+J2^S&&dA7c89A4_
zlGhHSuJgWO`UJAGvs;(}GK?HNF)`u2b^D(0$kDT`@9%y#5*uUb!sboItnT10wrb_e
zJ`&Nd_dMMKj*N^*cklgk`oM?Zrj>A7@^Z7;sqYT6SC+q2mY<&=)^m<-8@OoEqT1$@
zzoe~r0MCZr1rw$B93wVR?7Y+y-w2;Sp7eykne!}gHYBf0)gC6*R4^-;&wa&;dU*-c
zM7G_{bYj?vXdzoMrwO2d)<=tkH~IAGQ-5x5u8*0>eC|sQW>Q^8D<lW0+d1+uCPlb_
zDPo#{6nlj|+czRCkUv-_<J`qe#_Ic~WCNcE*~c*17XMGDzo=Js`IjtNa*mmd)%P_`
zKtK=UqlJ%IjFtE0HZVoFfGNTSOc5?%ia1ul|I4_BBL&2`#_fUoP4Dgh(uEI|=6zO-
zr_2XO3P{0lJqiNqxJKaYc|#QvD{-8F)LjJ<O$=SQ65rSPM-P&G@zJA4x~n8s;Wz=Q
za^mZ})Sa*o6_VDrFnj#?vBVsPqXb0jqgvd~*5JiwzQev)Y`oS;smTf)CE$}MPsCp@
zT!GV&w^0m0nH``NQp<FaS8iYq!chX!uz|Pr+;r=csw>!@%B}Hj*hM;~o;e7|2#7(e
zNO!M*lDdk!q=@aQ6638f(%r|puJ*c|6w=r(AnYDK2wg($)1KF}eFIy$qTn2f7sk3u
zYcMQ_G$gp&3HH#`auyzt#Hpp#Lh5?Uu&q3_fF%az2L|uU$M#+8XWGyO-Ir`)6NyD*
zwk4wKSTL|fEmb68yH>4Qju(LY4AHfQ=<6tsp_dUQk9~ud*J<-2mA9hIBuo<!t%}mI
z4sr^D91!1mK;3jqb_Up1*JlG=mmEkG#ZhdN<A~5cH@Yxr__R6UcoNf<mzV9La|CS5
z)#w%Rigc6&E>#3xa7+^r9<}}Vzl0-4e`H4SY}*KD;nVDDp%&?G=sq#)@puvHi<t#s
z$F>a;Et{ALm?j`~AD5nq4{#9Fdg39AyJQ{gUv%-}#ql{R6B82wYJv52AM6r3|C|c4
zleOY$49#9KjA;Vmp-G5(dQbtmtd_4oKfsFCu9ij9+Al0A6S=`=w3dQ`f*~>qWxFf4
zH0-I`x?b5Gx1$g-^xI|D{C!)(ePBoNGH5l(Ou{q))rXd9JRQ`+1WXH2`RuDxtnOeH
z#dsn_E7N1-m17cuXxLd=bcEV33tI8ek}*-JqI_e7M6NQ^iI^J3;6F}|q;&VrEyqta
zAC_C3O7qD!R9OUC?U+xIK#2uA=*0-QmJ06C^vy@C{GGR2Xf&?OO!0u}aUfb^PEJk(
zby+_iOe<pGOo%+{38DYi-7X_38j7vs6aRMLTy5SAvw(Z7DSQo6IV7_@uNKP!X$&>4
zc-2+)L-Qv?+Vl*e2?@al?>s!F#Ej1c84HT7m}aMjH2|Lb*pa#+dO`cmo`0jo(oBRN
zESR5{Q%d$J3IneKj|v+JdzI`Om}ZA5Xxfkk*J?bpFN$l^iwZCcu{@PiY*JZm^^S<P
zB_fp31H3eXWEEV4990z8G~3?IhAp`;9u)Qo>6?nXcpY-wwq)nhdB{rQ+sZYfc8CY;
zEGCFED=)-V{G;U1US&k?x^`5K1PmhBR#7KJ+ErLEwU{s$B#1}_fp`|7%%np05kYuD
zUiLIfTZru_+i*$M9v__}(V>_C-a^8{S;&P~TmvPpH{TEt3Wb@)*dic)A~Cb|p-YoU
z9T-r8lhArt<kM7z5y<%jAU^GixQmO#(BM?{rtjKKw!V0+Edtuog)#0C>6sP?_HTG(
z)J=i4xL5Kgh^K-w7QQ2IEkR_h9mMgtCbI$CTA)@W)CBj|`kyHbP^w2=cr>9-h`<?Q
zdbUj$Srq|o8S=DTKy*R!oGz_c>Wq37v@WW=AhQUgYfCj1mB^pfZa+2HK79_Z)!TPd
zF7@mEeaAv!xqx!(yV^VJcW@>s0&Lz?9Hq_uYC#nagmP&wmHg$(&TMtRNKY?YyXJMv
z?V#m0aHjnOsGcC3K$=J5`IjzTTB?c%kX_KHkV;d2{E|qU#i%GIL1Y$VhkywQKDw(c
zN{uJ1q+-6giU9bI#4db)UwO;V0dImGL?%P$En^mAM;AU$-L$f3&1$*&Oaexkrn@FX
z$vC7~EEa4$RDEpo+a<!lzyszf-+(H3@}EyFFqR9b%%Z1Ov_qoJ2yM@+T8zR3ErPI*
zlpmuy9i;kSgjtL&VT{s>d~5-*y81E`KE*dhxPU3b1xyhxV2W@7Q-lkcBD%vE%pkxd
z9&Hgo`%CW^72N`2EP|>dqFRPh|HeSNfj@u33=|}cbYXwv$JO!KqUne_C4`1f1A5QV
zEg(`bDmTg15alhU4O6qirivOg`0v-w3`>ULxnIiQ4rUODEKN{mh#`;m>n&<<I2;a#
g!{Kl^9FBeb2PBITA>D-l=l}o!07*qoM6N<$f)M@!DgXcg

literal 0
HcmV?d00001

diff --git a/docs-website/static/img/icon-share-your-journey.png b/docs-website/static/img/icon-share-your-journey.png
new file mode 100644
index 0000000000000000000000000000000000000000..80d61e50d96d7e700ea52e9030ad2311ea78a315
GIT binary patch
literal 5495
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
RTNKX#ObpEp=*OIH{0Eb;6BPge

literal 0
HcmV?d00001

diff --git a/docs-website/static/img/solutions/icon-dropdown-cloud.png b/docs-website/static/img/solutions/icon-dropdown-cloud.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe2f25fc6b6a0423350a196db3996229786c347a
GIT binary patch
literal 13406
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

literal 0
HcmV?d00001

diff --git a/docs-website/static/img/solutions/icon-dropdown-core.png b/docs-website/static/img/solutions/icon-dropdown-core.png
new file mode 100644
index 0000000000000000000000000000000000000000..d87017ab6833f9c6a9c92d2f114a3439b8b5f3f4
GIT binary patch
literal 14825
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
S=!fcCftrfe?ZTV5u>S|agbT?4

literal 0
HcmV?d00001

diff --git a/docs-website/static/img/solutions/icon-dropdown-discovery.png b/docs-website/static/img/solutions/icon-dropdown-discovery.png
new file mode 100644
index 0000000000000000000000000000000000000000..5eaff83ea3a3e526e48e7b35ba2b6679278bab55
GIT binary patch
literal 14282
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

literal 0
HcmV?d00001

diff --git a/docs-website/static/img/solutions/icon-dropdown-governance.png b/docs-website/static/img/solutions/icon-dropdown-governance.png
new file mode 100644
index 0000000000000000000000000000000000000000..e31d518450d49b219eee4895b1aee58a1fc1d955
GIT binary patch
literal 12311
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
Q9RPk#>7UWd(;-FtA7xC`nE(I)

literal 0
HcmV?d00001

diff --git a/docs-website/static/img/solutions/icon-dropdown-observe.png b/docs-website/static/img/solutions/icon-dropdown-observe.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5ca916240ddb68211ffa35e73c33f38cb9a0d98
GIT binary patch
literal 14081
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
Wqz+Saw|~#Uw6E%4DOI-&`F{Wp*_l%S

literal 0
HcmV?d00001


From cfe65ccb3c740d0a7496566cf48a965b8ac7a456 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Wed, 15 Jan 2025 10:59:20 -0800
Subject: [PATCH 083/249] chore(ingest): speed up lintFix command (#12346)

---
 metadata-ingestion/build.gradle  | 9 +--------
 metadata-ingestion/developing.md | 5 +++++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/metadata-ingestion/build.gradle b/metadata-ingestion/build.gradle
index ac8658bd869272..6629a0b9ef022e 100644
--- a/metadata-ingestion/build.gradle
+++ b/metadata-ingestion/build.gradle
@@ -106,12 +106,7 @@ task modelDocUpload(type: Exec, dependsOn: [modelDocGen]) {
 
 
 task lint(type: Exec, dependsOn: installDev) {
-  /*
-    The find/sed combo below is a temporary work-around for the following mypy issue with airflow 2.2.0:
-   "venv/lib/python3.8/site-packages/airflow/_vendor/connexion/spec.py:169: error: invalid syntax".
-   */
   commandLine 'bash', '-c',
-    "find ${venv_name}/lib -path *airflow/_vendor/connexion/spec.py -exec sed -i.bak -e '169,169s/  # type: List\\[str\\]//g' {} \\; && " +
     "source ${venv_name}/bin/activate && set -x && " +
     "black --check --diff src/ tests/ examples/ && " +
     "isort --check --diff src/ tests/ examples/ && " +
@@ -122,9 +117,7 @@ task lintFix(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
     "black src/ tests/ examples/ && " +
-    "isort src/ tests/ examples/ && " +
-    "flake8 src/ tests/ examples/ && " +
-    "mypy --show-traceback --show-error-codes src/ tests/ examples/"
+    "isort src/ tests/ examples/"
 }
 
 def pytest_default_env = "PYTHONDEVMODE=1"
diff --git a/metadata-ingestion/developing.md b/metadata-ingestion/developing.md
index b713997d8286fe..5e4bc2d4d71158 100644
--- a/metadata-ingestion/developing.md
+++ b/metadata-ingestion/developing.md
@@ -89,6 +89,7 @@ cd metadata-ingestion-modules/gx-plugin
 source venv/bin/activate
 datahub version  # should print "DataHub CLI version: unavailable (installed in develop mode)"
 ```
+
 ### (Optional) Set up your Python environment for developing on Dagster Plugin
 
 From the repository root:
@@ -99,6 +100,7 @@ cd metadata-ingestion-modules/dagster-plugin
 source venv/bin/activate
 datahub version  # should print "DataHub CLI version: unavailable (installed in develop mode)"
 ```
+
 ### Common setup issues
 
 Common issues (click to expand):
@@ -188,6 +190,9 @@ mypy src/ tests/
 or you can run from root of the repository
 
 ```shell
+./gradlew :metadata-ingestion:lint
+
+# This will auto-fix some linting issues.
 ./gradlew :metadata-ingestion:lintFix
 ```
 

From 32cbc7dd80daa8295313b8acc8b39d475592cfd8 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Wed, 15 Jan 2025 10:59:35 -0800
Subject: [PATCH 084/249] feat(sdk): support urn types in Urn.from_string
 (#12347)

---
 .../src/datahub/utilities/urns/_urn_base.py   | 33 ++++++++++++---
 .../tests/unit/urns/test_urn.py               | 41 +++++++++++++++++++
 2 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/metadata-ingestion/src/datahub/utilities/urns/_urn_base.py b/metadata-ingestion/src/datahub/utilities/urns/_urn_base.py
index 7996fe0d7b89b7..e8e22cd85ac9ff 100644
--- a/metadata-ingestion/src/datahub/utilities/urns/_urn_base.py
+++ b/metadata-ingestion/src/datahub/utilities/urns/_urn_base.py
@@ -1,7 +1,7 @@
 import functools
 import urllib.parse
 from abc import abstractmethod
-from typing import ClassVar, Dict, List, Optional, Type
+from typing import ClassVar, Dict, List, Optional, Type, Union
 
 from deprecated import deprecated
 from typing_extensions import Self
@@ -86,12 +86,24 @@ def entity_ids(self) -> List[str]:
         return self._entity_ids
 
     @classmethod
-    def from_string(cls, urn_str: str) -> Self:
-        """
-        Creates an Urn from its string representation.
+    def from_string(cls, urn_str: Union[str, "Urn"], /) -> Self:
+        """Create an Urn from its string representation.
+
+        When called against the base Urn class, this method will return a more specific Urn type where possible.
+
+        >>> from datahub.metadata.urns import DatasetUrn, Urn
+        >>> urn_str = 'urn:li:dataset:(urn:li:dataPlatform:snowflake,my_db.my_schema.my_table,PROD)'
+        >>> urn = Urn.from_string(urn_str)
+        >>> assert isinstance(urn, DatasetUrn)
+
+        When called against a specific Urn type (e.g. DatasetUrn.from_string), this method can
+        also be used for type narrowing.
+
+        >>> urn_str = 'urn:li:dataset:(urn:li:dataPlatform:snowflake,my_db.my_schema.my_table,PROD)'
+        >>> assert DatasetUrn.from_string(urn_str)
 
         Args:
-            urn_str: The string representation of the Urn.
+            urn_str: The string representation of the urn. Also accepts an existing Urn instance.
 
         Returns:
             Urn of the given string representation.
@@ -100,6 +112,17 @@ def from_string(cls, urn_str: str) -> Self:
             InvalidUrnError: If the string representation is in invalid format.
         """
 
+        if isinstance(urn_str, Urn):
+            if issubclass(cls, _SpecificUrn) and isinstance(urn_str, cls):
+                # Fast path - we're already the right type.
+
+                # I'm not really sure why we need a type ignore here, but mypy doesn't really
+                # understand the isinstance check above.
+                return urn_str  # type: ignore
+
+            # Fall through, so that we can convert a generic Urn to a specific Urn type.
+            urn_str = urn_str.urn()
+
         # TODO: Add handling for url encoded urns e.g. urn%3A ...
 
         if not urn_str.startswith("urn:li:"):
diff --git a/metadata-ingestion/tests/unit/urns/test_urn.py b/metadata-ingestion/tests/unit/urns/test_urn.py
index bee80ec33148e9..8490364326d940 100644
--- a/metadata-ingestion/tests/unit/urns/test_urn.py
+++ b/metadata-ingestion/tests/unit/urns/test_urn.py
@@ -4,6 +4,7 @@
 
 import pytest
 
+import datahub.utilities.urns._urn_base
 from datahub.metadata.urns import (
     CorpUserUrn,
     DataPlatformUrn,
@@ -11,6 +12,7 @@
     SchemaFieldUrn,
     Urn,
 )
+from datahub.testing.doctest import assert_doctest
 from datahub.utilities.urns.error import InvalidUrnError
 
 pytestmark = pytest.mark.filterwarnings("ignore::DeprecationWarning")
@@ -87,6 +89,10 @@ def test_urn_type_dispatch_1() -> None:
     with pytest.raises(InvalidUrnError, match="Passed an urn of type corpuser"):
         DatasetUrn.from_string("urn:li:corpuser:foo")
 
+    urn2 = DatasetUrn.from_string(urn)
+    assert isinstance(urn2, DatasetUrn)
+    assert urn2 == urn
+
 
 def test_urn_type_dispatch_2() -> None:
     urn = "urn:li:dataJob:(urn:li:dataFlow:(airflow,flow_id,prod),job_id)"
@@ -96,6 +102,41 @@ def test_urn_type_dispatch_2() -> None:
         CorpUserUrn.from_string(urn)
 
 
+def test_urn_type_dispatch_3() -> None:
+    # Creating a "generic" Urn.
+    urn = Urn("dataset", ["urn:li:dataPlatform:abc", "def", "PROD"])
+    assert isinstance(urn, Urn)
+
+    urn2 = DatasetUrn.from_string(urn)
+    assert isinstance(urn2, DatasetUrn)
+    assert urn2 == urn
+
+    with pytest.raises(
+        InvalidUrnError,
+        match="Passed an urn of type dataset to the from_string method of CorpUserUrn",
+    ):
+        CorpUserUrn.from_string(urn)
+
+
+def test_urn_type_dispatch_4() -> None:
+    # A generic urn of a new entity type.
+    urn_str = "urn:li:new_entity_type:(abc,def)"
+
+    urn = Urn.from_string(urn_str)
+    assert type(urn) is Urn
+    assert urn == Urn("new_entity_type", ["abc", "def"])
+    assert urn.urn() == urn_str
+
+    urn2 = Urn.from_string(urn)
+    assert type(urn2) is Urn
+    assert urn2 == urn
+    assert urn2.urn() == urn_str
+
+
+def test_urn_doctest() -> None:
+    assert_doctest(datahub.utilities.urns._urn_base)
+
+
 def _load_urns(file_name: pathlib.Path) -> List[str]:
     urns = [
         line.strip()

From a3c7a336fa03e45a9322db6212bc79cb3dd420c1 Mon Sep 17 00:00:00 2001
From: Gabe Lyons <gabe.lyons@acryl.io>
Date: Wed, 15 Jan 2025 11:50:27 -0800
Subject: [PATCH 085/249] =?UTF-8?q?docs(ingest/mssql):=20update=20mssql=5F?=
 =?UTF-8?q?recipe.yml=20to=20include=20convert=5Furn=5Fto=5Flowerc?=
 =?UTF-8?q?=E2=80=A6=20(#12355)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 metadata-ingestion/docs/sources/mssql/mssql_recipe.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/metadata-ingestion/docs/sources/mssql/mssql_recipe.yml b/metadata-ingestion/docs/sources/mssql/mssql_recipe.yml
index 5cfc0867560908..948e33273b54f5 100644
--- a/metadata-ingestion/docs/sources/mssql/mssql_recipe.yml
+++ b/metadata-ingestion/docs/sources/mssql/mssql_recipe.yml
@@ -9,6 +9,9 @@ source:
     username: user
     password: pass
 
+    # This is recommended to improve lineage quality. Ignores case-sensitivity when constructing internal identifiers.
+    convert_urns_to_lowercase: True
+
     # Options
     # Uncomment if you need to use encryption with pytds
     # See https://python-tds.readthedocs.io/en/latest/pytds.html#pytds.connect

From 96cfa4662d270e02699e9852eb1aaf0f26aaa328 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Wed, 15 Jan 2025 14:58:47 -0800
Subject: [PATCH 086/249] feat(ingest): add `num_queries_used_in_lineage`
 counter (#12336)

---
 .gitignore                                                      | 1 +
 .../src/datahub/sql_parsing/sql_parsing_aggregator.py           | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 43c627f9ed244f..19909b25fefe7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,6 +85,7 @@ metadata-service/plugin/src/test/resources/sample-plugins/**
 smoke-test/rollback-reports
 coverage*.xml
 .vercel
+.envrc
 
 # A long series of binary directories we should ignore
 datahub-frontend/bin/main/
diff --git a/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py b/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py
index 25b63ffac45f96..e1deeaec5ba826 100644
--- a/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py
+++ b/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py
@@ -284,6 +284,7 @@ class SqlAggregatorReport(Report):
 
     # Queries.
     num_queries_entities_generated: int = 0
+    num_queries_used_in_lineage: Optional[int] = None
     num_queries_skipped_due_to_filters: int = 0
 
     # Usage-related.
@@ -1200,6 +1201,7 @@ def gen_metadata(self) -> Iterable[MetadataChangeProposalWrapper]:
         queries_generated: Set[QueryId] = set()
 
         yield from self._gen_lineage_mcps(queries_generated)
+        self.report.num_queries_used_in_lineage = len(queries_generated)
         yield from self._gen_usage_statistics_mcps()
         yield from self._gen_operation_mcps(queries_generated)
         yield from self._gen_remaining_queries(queries_generated)

From 4cde4aafa1beaf2ce704d48ad642dd824290f74b Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Wed, 15 Jan 2025 15:17:15 -0800
Subject: [PATCH 087/249] chore(ci): truncate gh-pages branch history (#12360)

---
 .github/workflows/documentation.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index e6044badb1b41c..f38133b1c0ad26 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - "**"
     paths:
+      - ".github/workflows/documentation.yml"
       - "metadata-ingestion/**"
       - "metadata-models/**"
       - "docs/**"
@@ -13,6 +14,7 @@ on:
     branches:
       - master
     paths:
+      - ".github/workflows/documentation.yml"
       - "metadata-ingestion/**"
       - "metadata-models/**"
       - "docs/**"
@@ -57,8 +59,12 @@ jobs:
 
       - name: Deploy
         if: github.event_name == 'push' && github.repository == 'datahub-project/datahub'
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./docs-website/build
           cname: datahubproject.io
+          # The gh-pages branch stores the built docs site. We don't need to preserve
+          # the full history of the .html files, since they're generated from our
+          # source files. Doing so significantly reduces the size of the repo's .git dir.
+          force_orphan: true

From 2226820ad199dee4fe21e81853303591554b1d4d Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Thu, 16 Jan 2025 08:19:07 +0530
Subject: [PATCH 088/249] dev(ingest): use ruff instead of flake8 (#12359)

---
 metadata-ingestion/build.gradle               |  6 +-
 metadata-ingestion/developing.md              |  2 +-
 metadata-ingestion/pyproject.toml             | 50 ++++++++++++++++-
 metadata-ingestion/setup.cfg                  | 36 ------------
 metadata-ingestion/setup.py                   |  4 +-
 .../ingestion/source/ge_data_profiler.py      |  1 -
 .../src/datahub/ingestion/source/mode.py      | 10 ++--
 .../powerbi/rest_api_wrapper/powerbi_api.py   | 14 ++---
 .../datahub/ingestion/source/sql/sql_types.py |  1 -
 .../src/datahub/utilities/memory_footprint.py |  5 +-
 .../tests/unit/utilities/test_cli_logging.py  |  2 +-
 .../unit/utilities/test_lossy_collections.py  | 55 ++++++++++---------
 12 files changed, 99 insertions(+), 87 deletions(-)

diff --git a/metadata-ingestion/build.gradle b/metadata-ingestion/build.gradle
index 6629a0b9ef022e..577a270f954799 100644
--- a/metadata-ingestion/build.gradle
+++ b/metadata-ingestion/build.gradle
@@ -110,14 +110,16 @@ task lint(type: Exec, dependsOn: installDev) {
     "source ${venv_name}/bin/activate && set -x && " +
     "black --check --diff src/ tests/ examples/ && " +
     "isort --check --diff src/ tests/ examples/ && " +
-    "flake8 --count --statistics src/ tests/ examples/ && " +
+    "ruff check src/ tests/ examples/ && " +
     "mypy --show-traceback --show-error-codes src/ tests/ examples/"
 }
+
 task lintFix(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
     "black src/ tests/ examples/ && " +
-    "isort src/ tests/ examples/"
+    "isort src/ tests/ examples/ && " +
+    "ruff check --fix src/ tests/ examples/"
 }
 
 def pytest_default_env = "PYTHONDEVMODE=1"
diff --git a/metadata-ingestion/developing.md b/metadata-ingestion/developing.md
index 5e4bc2d4d71158..1cbb665f56b26c 100644
--- a/metadata-ingestion/developing.md
+++ b/metadata-ingestion/developing.md
@@ -183,7 +183,7 @@ We use black, isort, flake8, and mypy to ensure consistent code style and qualit
 # Assumes: pip install -e '.[dev]' and venv is activated
 black src/ tests/
 isort src/ tests/
-flake8 src/ tests/
+ruff check src/ tests/
 mypy src/ tests/
 ```
 
diff --git a/metadata-ingestion/pyproject.toml b/metadata-ingestion/pyproject.toml
index 94e06fd53a70ec..3b725f6d3ae9aa 100644
--- a/metadata-ingestion/pyproject.toml
+++ b/metadata-ingestion/pyproject.toml
@@ -9,7 +9,7 @@ extend-exclude = '''
 ^/tmp
 '''
 include = '\.pyi?$'
-target-version = ['py37', 'py38', 'py39', 'py310']
+target-version = ['py38', 'py39', 'py310', 'py311']
 
 [tool.isort]
 combine_as_imports = true
@@ -26,6 +26,52 @@ extraPaths = ['tests']
 exclude = ["src/datahub/metadata/"]
 ignore_decorators = ["@click.*", "@validator", "@root_validator", "@pydantic.validator", "@pydantic.root_validator", "@pytest.fixture"]
 ignore_names = ["*Source", "*Sink", "*Report"]
-# min_confidence = 80
 paths = ["src"]
 sort_by_size = true
+
+[tool.ruff]
+# Same as Black.
+line-length = 88
+# Exclude directories matching these patterns.
+exclude = [
+    ".git",
+    "src/datahub/metadata",
+    "venv",
+    ".tox",
+    "__pycache__",
+]
+
+[tool.ruff.lint]
+select = [
+    "B",
+    "C90",
+    "E",
+    "F",
+    "TID",
+]
+ignore = [
+    # Ignore line length violations (handled by Black)
+    "E501",
+    # Ignore whitespace before ':' (matches Black)
+    "E203",
+    # Allow usages of functools.lru_cache
+    "B019",
+    # Allow function call in argument defaults
+    "B008",
+    # TODO: Enable these later
+    "B006",  # Mutable args
+    "B007",  # Unused loop control variable
+    "B017",  # Do not assert blind exception
+    "B904",  # Checks for raise statements in exception handlers that lack a from clause
+]
+
+[tool.ruff.lint.mccabe]
+max-complexity = 20
+
+[tool.ruff.lint.flake8-tidy-imports]
+# Disallow all relative imports.
+ban-relative-imports = "all"
+
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["F401"]
\ No newline at end of file
diff --git a/metadata-ingestion/setup.cfg b/metadata-ingestion/setup.cfg
index 057779bc87c622..b7cf43b80b149e 100644
--- a/metadata-ingestion/setup.cfg
+++ b/metadata-ingestion/setup.cfg
@@ -1,39 +1,3 @@
-[flake8]
-max-complexity = 20
-ignore =
-    # Ignore: line length issues, since black's formatter will take care of them.
-    E501,
-    # Ignore compound statements, since they're used for ellipsis by black
-    # See https://github.com/psf/black/issues/3887
-    E704,
-    # Ignore: 1 blank line required before class docstring.
-    D203,
-    # See https://stackoverflow.com/a/57074416.
-    W503,
-    # See https://github.com/psf/black/issues/315.
-    E203,
-    # Allow usages of functools.lru_cache.
-    B019,
-    # This rule flags the use of function calls in argument defaults.
-    # There's some good reasons to do this, so we're ok with it.
-    B008,
-    # TODO: However, we should enable B006 to catch issues with mutable args.
-    B006,
-    # TODO: Enable B007 - unused loop control variable.
-    B007
-    # TODO: Enable B902 - require self/cls naming.
-    # TODO: Enable B904 - use raise from in except clauses.
-exclude =
-    .git,
-    src/datahub/metadata,
-    venv,
-    .tox,
-    __pycache__
-per-file-ignores =
-    # imported but unused
-    __init__.py: F401, I250
-ban-relative-imports = true
-
 [mypy]
 plugins =
     ./tests/test_helpers/sqlalchemy_mypy_plugin.py,
diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py
index d5dbb98d3cb17b..be2ee8b0f1b01a 100644
--- a/metadata-ingestion/setup.py
+++ b/metadata-ingestion/setup.py
@@ -593,9 +593,7 @@
     # This is pinned only to avoid spurious errors in CI.
     # We should make an effort to keep it up to date.
     "black==23.3.0",
-    "flake8>=6.0.0",
-    "flake8-tidy-imports>=4.3.0",
-    "flake8-bugbear==23.3.12",
+    "ruff==0.9.1",
     "isort>=5.7.0",
     "mypy==1.10.1",
 }
diff --git a/metadata-ingestion/src/datahub/ingestion/source/ge_data_profiler.py b/metadata-ingestion/src/datahub/ingestion/source/ge_data_profiler.py
index c2c43a0e805b24..aba0deebd356c5 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/ge_data_profiler.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/ge_data_profiler.py
@@ -267,7 +267,6 @@ def _is_single_row_query_method(query: Any) -> bool:
         "get_column_max",
         "get_column_mean",
         "get_column_stdev",
-        "get_column_stdev",
         "get_column_nonnull_count",
         "get_column_unique_count",
     }
diff --git a/metadata-ingestion/src/datahub/ingestion/source/mode.py b/metadata-ingestion/src/datahub/ingestion/source/mode.py
index 68ecc5d8694ac5..bf0a33e423446a 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/mode.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/mode.py
@@ -893,11 +893,11 @@ def normalize_mode_query(self, query: str) -> str:
                         jinja_params[key] = parameters[key].get("default", "")
 
                 normalized_query = re.sub(
-                    r"{% form %}(.*){% endform %}",
-                    "",
-                    query,
-                    0,
-                    re.MULTILINE | re.DOTALL,
+                    pattern=r"{% form %}(.*){% endform %}",
+                    repl="",
+                    string=query,
+                    count=0,
+                    flags=re.MULTILINE | re.DOTALL,
                 )
 
             # Wherever we don't resolve the jinja params, we replace it with NULL
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/powerbi_api.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/powerbi_api.py
index 5ae333430a78bc..b41be19d0de53e 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/powerbi_api.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/powerbi_api.py
@@ -96,7 +96,7 @@ def log_http_error(self, message: str) -> Any:
             url: str = e.request.url if e.request else "URL not available"
             self.reporter.warning(
                 title="Metadata API Timeout",
-                message=f"Metadata endpoints are not reachable. Check network connectivity to PowerBI Service.",
+                message="Metadata endpoints are not reachable. Check network connectivity to PowerBI Service.",
                 context=f"url={url}",
             )
 
@@ -173,7 +173,7 @@ def _get_entity_users(
                 entity=entity_name,
                 entity_id=entity_id,
             )
-        except:  # It will catch all type of exception
+        except Exception:
             e = self.log_http_error(
                 message=f"Unable to fetch users for {entity_name}({entity_id})."
             )
@@ -210,7 +210,7 @@ def get_reports(self, workspace: Workspace) -> List[Report]:
                             message="A cross-workspace reference that failed to be resolved. Please ensure that no global workspace is being filtered out due to the workspace_id_pattern.",
                             context=f"report-name: {report.name} and dataset-id: {report.dataset_id}",
                         )
-        except:
+        except Exception:
             self.log_http_error(
                 message=f"Unable to fetch reports for workspace {workspace.name}"
             )
@@ -260,7 +260,7 @@ def get_workspaces(self) -> List[Workspace]:
 
             groups = self._get_resolver().get_groups(filter_=filter_)
 
-        except:
+        except Exception:
             self.log_http_error(message="Unable to fetch list of workspaces")
             # raise  # we want this exception to bubble up
 
@@ -292,7 +292,7 @@ def get_modified_workspaces(self) -> List[str]:
             modified_workspace_ids = self.__admin_api_resolver.get_modified_workspaces(
                 self.__config.modified_since
             )
-        except:
+        except Exception:
             self.log_http_error(message="Unable to fetch list of modified workspaces.")
 
         return modified_workspace_ids
@@ -303,8 +303,8 @@ def _get_scan_result(self, workspace_ids: List[str]) -> Any:
             scan_id = self.__admin_api_resolver.create_scan_job(
                 workspace_ids=workspace_ids
             )
-        except:
-            e = self.log_http_error(message=f"Unable to fetch get scan result.")
+        except Exception:
+            e = self.log_http_error(message="Unable to fetch get scan result.")
             if data_resolver.is_permission_error(cast(Exception, e)):
                 logger.warning(
                     "Dataset lineage can not be ingestion because this user does not have access to the PowerBI Admin "
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/sql_types.py b/metadata-ingestion/src/datahub/ingestion/source/sql/sql_types.py
index 1acf962d7c4750..6b9b8bdeb39e97 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/sql_types.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/sql_types.py
@@ -384,7 +384,6 @@ def resolve_snowflake_modified_type(type_string: str) -> Any:
     "varchar": StringType,
     "char": StringType,
     "varbinary": BytesType,
-    "json": RecordType,
     "date": DateType,
     "time": TimeType,
     "timestamp": TimeType,
diff --git a/metadata-ingestion/src/datahub/utilities/memory_footprint.py b/metadata-ingestion/src/datahub/utilities/memory_footprint.py
index fa9e64cbf47380..f5f5fdf54ff9b7 100644
--- a/metadata-ingestion/src/datahub/utilities/memory_footprint.py
+++ b/metadata-ingestion/src/datahub/utilities/memory_footprint.py
@@ -1,7 +1,7 @@
 from collections import deque
 from itertools import chain
 from sys import getsizeof
-from typing import Any, Callable
+from typing import Any, Iterator
 
 
 def total_size(o: Any, handlers: Any = {}) -> int:
@@ -15,7 +15,8 @@ def total_size(o: Any, handlers: Any = {}) -> int:
     Based on https://github.com/ActiveState/recipe-577504-compute-mem-footprint/blob/master/recipe.py
     """
 
-    dict_handler: Callable[[Any], chain[Any]] = lambda d: chain.from_iterable(d.items())
+    def dict_handler(d: dict) -> Iterator[Any]:
+        return chain.from_iterable(d.items())
 
     all_handlers = {
         tuple: iter,
diff --git a/metadata-ingestion/tests/unit/utilities/test_cli_logging.py b/metadata-ingestion/tests/unit/utilities/test_cli_logging.py
index 5acb5f3e3608be..aa22a3b5e7ceba 100644
--- a/metadata-ingestion/tests/unit/utilities/test_cli_logging.py
+++ b/metadata-ingestion/tests/unit/utilities/test_cli_logging.py
@@ -36,7 +36,7 @@ def my_logging_fn():
     logger.warning("This is a warning message")
     logger.error("this is an error with no stack trace")
     try:
-        1 / 0
+        _ = 1 / 0
     except ZeroDivisionError:
         logger.exception("failed to divide by zero")
 
diff --git a/metadata-ingestion/tests/unit/utilities/test_lossy_collections.py b/metadata-ingestion/tests/unit/utilities/test_lossy_collections.py
index c5663f4a678198..43967367dff389 100644
--- a/metadata-ingestion/tests/unit/utilities/test_lossy_collections.py
+++ b/metadata-ingestion/tests/unit/utilities/test_lossy_collections.py
@@ -9,36 +9,38 @@
 
 @pytest.mark.parametrize("length, sampling", [(10, False), (100, True)])
 def test_lossylist_sampling(length, sampling):
-    l: LossyList[str] = LossyList()
+    l_dict: LossyList[str] = LossyList()
     for i in range(0, length):
-        l.append(f"{i} Hello World")
+        l_dict.append(f"{i} Hello World")
 
-    assert len(l) == length
-    assert l.sampled is sampling
+    assert len(l_dict) == length
+    assert l_dict.sampled is sampling
     if sampling:
-        assert f"... sampled of {length} total elements" in str(l)
+        assert f"... sampled of {length} total elements" in str(l_dict)
     else:
-        assert "sampled" not in str(l)
+        assert "sampled" not in str(l_dict)
 
-    list_version = [int(i.split(" ")[0]) for i in l]
+    list_version = [int(i.split(" ")[0]) for i in l_dict]
     print(list_version)
     assert sorted(list_version) == list_version
 
 
 @pytest.mark.parametrize("length, sampling", [(10, False), (100, True)])
 def test_lossyset_sampling(length, sampling):
-    l: LossySet[str] = LossySet()
+    lossy_set: LossySet[str] = LossySet()
     for i in range(0, length):
-        l.add(f"{i} Hello World")
+        lossy_set.add(f"{i} Hello World")
 
-    assert len(l) == min(10, length)
-    assert l.sampled is sampling
+    assert len(lossy_set) == min(10, length)
+    assert lossy_set.sampled is sampling
     if sampling:
-        assert f"... sampled with at most {length-10} elements missing" in str(l)
+        assert f"... sampled with at most {length-10} elements missing" in str(
+            lossy_set
+        )
     else:
-        assert "sampled" not in str(l)
+        assert "sampled" not in str(lossy_set)
 
-    list_version = [int(i.split(" ")[0]) for i in l]
+    list_version = [int(i.split(" ")[0]) for i in lossy_set]
     set_version = set(list_version)
 
     assert len(list_version) == len(set_version)
@@ -49,35 +51,36 @@ def test_lossyset_sampling(length, sampling):
     "length, sampling, sub_length", [(4, False, 4), (10, False, 14), (100, True, 1000)]
 )
 def test_lossydict_sampling(length, sampling, sub_length):
-    l: LossyDict[int, LossyList[str]] = LossyDict()
+    lossy_dict: LossyDict[int, LossyList[str]] = LossyDict()
     elements_added = 0
     element_length_map = {}
     for i in range(0, length):
         list_length = random.choice(range(1, sub_length))
         element_length_map[i] = 0
         for _num_elements in range(0, list_length):
-            if not l.get(i):
+            if not lossy_dict.get(i):
                 elements_added += 1
                 # reset to 0 until we get it back
                 element_length_map[i] = 0
             else:
-                element_length_map[i] = len(l[i])
+                element_length_map[i] = len(lossy_dict[i])
 
-            current_list = l.get(i, LossyList())
+            current_list = lossy_dict.get(i, LossyList())
             current_list.append(f"{i}:{round(time.time(),2)} Hello World")
-            l[i] = current_list
+            lossy_dict[i] = current_list
             element_length_map[i] += 1
 
-    assert len(l) == min(l.max_elements, length)
-    assert l.sampled is sampling
+    assert len(lossy_dict) == min(lossy_dict.max_elements, length)
+    assert lossy_dict.sampled is sampling
     if sampling:
-        assert re.search("sampled of at most .* entries.", str(l))
-        assert f"{l.max_elements} sampled of at most {elements_added} entries." in str(
-            l
+        assert re.search("sampled of at most .* entries.", str(lossy_dict))
+        assert (
+            f"{lossy_dict.max_elements} sampled of at most {elements_added} entries."
+            in str(lossy_dict)
         )
     else:
         # cheap way to determine that the dict isn't reporting sampled keys
-        assert not re.search("sampled of at most .* entries.", str(l))
+        assert not re.search("sampled of at most .* entries.", str(lossy_dict))
 
-    for k, v in l.items():
+    for k, v in lossy_dict.items():
         assert len(v) == element_length_map[k]

From d99b97a413468513ced07975eb0fb0aef1cf9dbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20G=C3=B3mez=20Villamor?= <sgomezvillamor@gmail.com>
Date: Thu, 16 Jan 2025 10:14:33 +0100
Subject: [PATCH 089/249] chore(tableau): metrics to understand pagination in
 get_connection_objects queries (#12329)

---
 .../ingestion/source/tableau/tableau.py       | 46 +++++++++++++++++--
 .../tableau/test_tableau_ingest.py            |  2 +
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
index ea3fb6c979a19c..0424a0e692de2c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
@@ -419,6 +419,17 @@ class TableauConfig(
         description="[advanced] Number of workbooks to query at a time using the Tableau API.",
     )
 
+    # Since the field upstream query was separated from the embedded datasource queries into an independent query,
+    # the number of queries increased significantly and so the execution time.
+    # To increase the batching and so reduce the number of queries, we can increase the page size for that
+    # particular case.
+    #
+    # `num_(filter_|paginated_)?queries_by_connection_type` metrics in the report will help to understand the impact of this change.
+    embedded_datasource_field_upstream_page_size: int = Field(
+        default=100,
+        description="[advanced] Number of upstream fields to query at a time for embedded datasources using the Tableau API.",
+    )
+
     env: str = Field(
         default=builder.DEFAULT_ENV,
         description="Environment to use in namespace when constructing URNs.",
@@ -700,6 +711,23 @@ class TableauSourceReport(
         default_factory=(lambda: defaultdict(int))
     )
 
+    # Counters for tracking the number of queries made to get_connection_objects method
+    # by connection type (static and short set of keys):
+    # - num_queries_by_connection_type: total number of queries
+    # - num_filter_queries_by_connection_type: number of paginated queries due to splitting query filters
+    # - num_paginated_queries_by_connection_type: total number of queries due to Tableau pagination
+    # These counters are useful to understand the impact of changing the page size.
+
+    num_queries_by_connection_type: Dict[str, int] = dataclass_field(
+        default_factory=(lambda: defaultdict(int))
+    )
+    num_filter_queries_by_connection_type: Dict[str, int] = dataclass_field(
+        default_factory=(lambda: defaultdict(int))
+    )
+    num_paginated_queries_by_connection_type: Dict[str, int] = dataclass_field(
+        default_factory=(lambda: defaultdict(int))
+    )
+
 
 def report_user_role(report: TableauSourceReport, server: Server) -> None:
     title: str = "Insufficient Permissions"
@@ -1430,12 +1458,21 @@ def get_connection_objects(
         page_size = page_size_override or self.config.page_size
 
         filter_pages = get_filter_pages(query_filter, page_size)
+        self.report.num_queries_by_connection_type[connection_type] += 1
+        self.report.num_filter_queries_by_connection_type[connection_type] += len(
+            filter_pages
+        )
+
         for filter_page in filter_pages:
             has_next_page = 1
             current_cursor: Optional[str] = None
             while has_next_page:
                 filter_: str = make_filter(filter_page)
 
+                self.report.num_paginated_queries_by_connection_type[
+                    connection_type
+                ] += 1
+
                 self.report.num_expected_tableau_metadata_queries += 1
                 (
                     connection_objects,
@@ -2632,6 +2669,7 @@ def update_datasource_for_field_upstream(
         self,
         datasource: dict,
         field_upstream_query: str,
+        page_size_override: Optional[int] = None,
     ) -> dict:
         # Collect field ids to fetch field upstreams
         field_ids: List[str] = []
@@ -2642,9 +2680,10 @@ def update_datasource_for_field_upstream(
         # Fetch field upstreams and arrange them in map
         field_vs_upstream: Dict[str, dict] = {}
         for field_upstream in self.get_connection_objects(
-            field_upstream_query,
-            c.FIELDS_CONNECTION,
-            {c.ID_WITH_IN: field_ids},
+            query=field_upstream_query,
+            connection_type=c.FIELDS_CONNECTION,
+            query_filter={c.ID_WITH_IN: field_ids},
+            page_size_override=page_size_override,
         ):
             if field_upstream.get(c.ID):
                 field_id = field_upstream[c.ID]
@@ -3356,6 +3395,7 @@ def emit_embedded_datasources(self) -> Iterable[MetadataWorkUnit]:
             datasource = self.update_datasource_for_field_upstream(
                 datasource=datasource,
                 field_upstream_query=datasource_upstream_fields_graphql_query,
+                page_size_override=self.config.embedded_datasource_field_upstream_page_size,
             )
             yield from self.emit_datasource(
                 datasource,
diff --git a/metadata-ingestion/tests/integration/tableau/test_tableau_ingest.py b/metadata-ingestion/tests/integration/tableau/test_tableau_ingest.py
index d7868038a40aa1..417496c559c436 100644
--- a/metadata-ingestion/tests/integration/tableau/test_tableau_ingest.py
+++ b/metadata-ingestion/tests/integration/tableau/test_tableau_ingest.py
@@ -70,6 +70,7 @@
     "extract_project_hierarchy": False,
     "page_size": 1000,
     "workbook_page_size": 1000,
+    "embedded_datasource_field_upstream_page_size": 1000,
     "ingest_tags": True,
     "ingest_owner": True,
     "ingest_tables_external": True,
@@ -646,6 +647,7 @@ def test_tableau_ingest_with_platform_instance(
         "projects": ["default", "Project 2"],
         "page_size": 1000,
         "workbook_page_size": 1000,
+        "embedded_datasource_field_upstream_page_size": 1000,
         "ingest_tags": True,
         "ingest_owner": True,
         "ingest_tables_external": True,

From 765bf802828920dbe431817ac4272aa6caa3437b Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Thu, 16 Jan 2025 16:48:21 +0530
Subject: [PATCH 090/249] dev(ingest): move from isort to ruff (#12364)

---
 metadata-ingestion/build.gradle               |  2 --
 metadata-ingestion/developing.md              |  3 +--
 metadata-ingestion/pyproject.toml             | 24 +++++++++++++------
 metadata-ingestion/setup.py                   |  1 -
 .../ingestion/source/ge_data_profiler.py      |  3 +--
 .../datahub/sql_parsing/sqlglot_lineage.py    |  3 +--
 .../src/datahub/sql_parsing/sqlglot_utils.py  |  3 +--
 .../unit/sql_parsing/test_sqlglot_patch.py    |  3 +--
 8 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/metadata-ingestion/build.gradle b/metadata-ingestion/build.gradle
index 577a270f954799..14e467e27316e3 100644
--- a/metadata-ingestion/build.gradle
+++ b/metadata-ingestion/build.gradle
@@ -109,7 +109,6 @@ task lint(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
     "black --check --diff src/ tests/ examples/ && " +
-    "isort --check --diff src/ tests/ examples/ && " +
     "ruff check src/ tests/ examples/ && " +
     "mypy --show-traceback --show-error-codes src/ tests/ examples/"
 }
@@ -118,7 +117,6 @@ task lintFix(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
     "black src/ tests/ examples/ && " +
-    "isort src/ tests/ examples/ && " +
     "ruff check --fix src/ tests/ examples/"
 }
 
diff --git a/metadata-ingestion/developing.md b/metadata-ingestion/developing.md
index 1cbb665f56b26c..ebe1cd3df81990 100644
--- a/metadata-ingestion/developing.md
+++ b/metadata-ingestion/developing.md
@@ -177,12 +177,11 @@ The architecture of this metadata ingestion framework is heavily inspired by [Ap
 
 ## Code style
 
-We use black, isort, flake8, and mypy to ensure consistent code style and quality.
+We use black, ruff, and mypy to ensure consistent code style and quality.
 
 ```shell
 # Assumes: pip install -e '.[dev]' and venv is activated
 black src/ tests/
-isort src/ tests/
 ruff check src/ tests/
 mypy src/ tests/
 ```
diff --git a/metadata-ingestion/pyproject.toml b/metadata-ingestion/pyproject.toml
index 3b725f6d3ae9aa..f3a51e135082ee 100644
--- a/metadata-ingestion/pyproject.toml
+++ b/metadata-ingestion/pyproject.toml
@@ -11,13 +11,22 @@ extend-exclude = '''
 include = '\.pyi?$'
 target-version = ['py38', 'py39', 'py310', 'py311']
 
-[tool.isort]
-combine_as_imports = true
-indent = '    '
-known_future_library = ['__future__', 'datahub.utilities._markupsafe_compat', 'datahub.sql_parsing._sqlglot_patch']
-profile = 'black'
-sections = 'FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER'
-skip_glob = 'src/datahub/metadata'
+[tool.ruff.lint.isort]
+combine-as-imports = true
+known-first-party = ["datahub"]
+extra-standard-library = ["__future__", "datahub.utilities._markupsafe_compat", "datahub.sql_parsing._sqlglot_patch"]
+section-order = ["future", "standard-library", "third-party", "first-party", "local-folder"]
+force-sort-within-sections = false
+force-wrap-aliases = false
+split-on-trailing-comma = false
+order-by-type = true
+relative-imports-order = "closest-to-furthest"
+force-single-line = false
+single-line-exclusions = ["typing"]
+length-sort = false
+from-first = false
+required-imports = []
+classes = ["typing"]
 
 [tool.pyright]
 extraPaths = ['tests']
@@ -47,6 +56,7 @@ select = [
     "C90",
     "E",
     "F",
+    "I", # For isort
     "TID",
 ]
 ignore = [
diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py
index be2ee8b0f1b01a..4c88db36019eb3 100644
--- a/metadata-ingestion/setup.py
+++ b/metadata-ingestion/setup.py
@@ -594,7 +594,6 @@
     # We should make an effort to keep it up to date.
     "black==23.3.0",
     "ruff==0.9.1",
-    "isort>=5.7.0",
     "mypy==1.10.1",
 }
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/ge_data_profiler.py b/metadata-ingestion/src/datahub/ingestion/source/ge_data_profiler.py
index aba0deebd356c5..be182c70eafec1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/ge_data_profiler.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/ge_data_profiler.py
@@ -1,5 +1,3 @@
-from datahub.utilities._markupsafe_compat import MARKUPSAFE_PATCHED
-
 import collections
 import concurrent.futures
 import contextlib
@@ -12,6 +10,7 @@
 import traceback
 import unittest.mock
 import uuid
+from datahub.utilities._markupsafe_compat import MARKUPSAFE_PATCHED
 from functools import lru_cache
 from typing import (
     TYPE_CHECKING,
diff --git a/metadata-ingestion/src/datahub/sql_parsing/sqlglot_lineage.py b/metadata-ingestion/src/datahub/sql_parsing/sqlglot_lineage.py
index bf28ab0e7b229b..d3149fec970b59 100644
--- a/metadata-ingestion/src/datahub/sql_parsing/sqlglot_lineage.py
+++ b/metadata-ingestion/src/datahub/sql_parsing/sqlglot_lineage.py
@@ -1,10 +1,9 @@
-from datahub.sql_parsing._sqlglot_patch import SQLGLOT_PATCHED
-
 import dataclasses
 import functools
 import logging
 import traceback
 from collections import defaultdict
+from datahub.sql_parsing._sqlglot_patch import SQLGLOT_PATCHED
 from typing import Any, Dict, List, Optional, Set, Tuple, TypeVar, Union
 
 import pydantic.dataclasses
diff --git a/metadata-ingestion/src/datahub/sql_parsing/sqlglot_utils.py b/metadata-ingestion/src/datahub/sql_parsing/sqlglot_utils.py
index 57a5cc3c9a6574..fd2c68266624f9 100644
--- a/metadata-ingestion/src/datahub/sql_parsing/sqlglot_utils.py
+++ b/metadata-ingestion/src/datahub/sql_parsing/sqlglot_utils.py
@@ -1,9 +1,8 @@
-from datahub.sql_parsing._sqlglot_patch import SQLGLOT_PATCHED
-
 import functools
 import hashlib
 import logging
 import re
+from datahub.sql_parsing._sqlglot_patch import SQLGLOT_PATCHED
 from typing import Dict, Iterable, Optional, Tuple, Union
 
 import sqlglot
diff --git a/metadata-ingestion/tests/unit/sql_parsing/test_sqlglot_patch.py b/metadata-ingestion/tests/unit/sql_parsing/test_sqlglot_patch.py
index dee6d9630c12eb..31f87b8a150eb2 100644
--- a/metadata-ingestion/tests/unit/sql_parsing/test_sqlglot_patch.py
+++ b/metadata-ingestion/tests/unit/sql_parsing/test_sqlglot_patch.py
@@ -1,6 +1,5 @@
-from datahub.sql_parsing._sqlglot_patch import SQLGLOT_PATCHED
-
 import time
+from datahub.sql_parsing._sqlglot_patch import SQLGLOT_PATCHED
 
 import pytest
 import sqlglot

From 35e8d310baae8b3c7f77a6727c8dd54279f032b1 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Thu, 16 Jan 2025 16:48:54 +0530
Subject: [PATCH 091/249] fix(ingest/datahub): dataHubExecutionRequest default
 exclude (#12365)

---
 .../src/datahub/ingestion/source/datahub/config.py            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/datahub/config.py b/metadata-ingestion/src/datahub/ingestion/source/datahub/config.py
index 8622e221940317..37ccce8f8b9657 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/datahub/config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/datahub/config.py
@@ -25,6 +25,10 @@
     "globalSettingsKey",
     "globalSettingsInfo",
     "testResults",
+    "dataHubExecutionRequestKey",
+    "dataHubExecutionRequestInput",
+    "dataHubExecutionRequestSignal",
+    "dataHubExecutionRequestResult",
 }
 
 

From ad0fbd78355f4caf1899e6a9c2d6a1ab96e80214 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Thu, 16 Jan 2025 16:49:23 +0530
Subject: [PATCH 092/249] fix(ingest/gc): infinite loop in getting soft deleted
 counts (#12363)

---
 .../datahub/ingestion/source/gc/datahub_gc.py    |  1 +
 .../source/gc/soft_deleted_entity_cleanup.py     | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/gc/datahub_gc.py b/metadata-ingestion/src/datahub/ingestion/source/gc/datahub_gc.py
index b4cc5423277c5a..5c03b873c5505e 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/gc/datahub_gc.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/gc/datahub_gc.py
@@ -292,6 +292,7 @@ def revoke_expired_tokens(self) -> None:
             tokens = list_access_tokens.get("tokens", [])
             total = list_access_tokens.get("total", 0)
             if tokens == []:
+                # Due to a server bug we cannot rely on just total
                 break
             for token in tokens:
                 self.report.expired_tokens_revoked += 1
diff --git a/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py b/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
index b3d6e8514c02f2..02b29051dd2ebe 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
@@ -99,6 +99,7 @@ class SoftDeletedEntitiesCleanupConfig(ConfigModel):
 
 @dataclass
 class SoftDeletedEntitiesReport(SourceReport):
+    num_calls_made: Dict[str, int] = field(default_factory=dict)
     num_entities_found: Dict[str, int] = field(default_factory=dict)
     num_soft_deleted_entity_processed: int = 0
     num_soft_deleted_retained_due_to_age: int = 0
@@ -242,6 +243,11 @@ def _get_soft_deleted(self, graphql_query: str, entity_type: str) -> Iterable[st
 
         while True:
             try:
+                if entity_type not in self.report.num_calls_made:
+                    self.report.num_calls_made[entity_type] = 1
+                else:
+                    self.report.num_calls_made[entity_type] += 1
+                self._print_report()
                 result = self.ctx.graph.execute_graphql(
                     graphql_query,
                     {
@@ -270,7 +276,13 @@ def _get_soft_deleted(self, graphql_query: str, entity_type: str) -> Iterable[st
                 )
                 break
             scroll_across_entities = result.get("scrollAcrossEntities")
-            if not scroll_across_entities or not scroll_across_entities.get("count"):
+            if not scroll_across_entities:
+                break
+            search_results = scroll_across_entities.get("searchResults")
+            count = scroll_across_entities.get("count")
+            if not count or not search_results:
+                # Due to a server bug we cannot rely on just count as it was returning response like this
+                # {'count': 1, 'nextScrollId': None, 'searchResults': []}
                 break
             if entity_type == "DATA_PROCESS_INSTANCE":
                 # Temp workaround. See note in beginning of the function
@@ -282,7 +294,7 @@ def _get_soft_deleted(self, graphql_query: str, entity_type: str) -> Iterable[st
             self.report.num_entities_found[entity_type] += scroll_across_entities.get(
                 "count"
             )
-            for query in scroll_across_entities.get("searchResults"):
+            for query in search_results:
                 yield query["entity"]["urn"]
 
     def _get_urns(self) -> Iterable[str]:

From 18701b742ca451e8d795f3262a50441938b916bc Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Thu, 16 Jan 2025 17:15:02 +0530
Subject: [PATCH 093/249] feat(cli): for python > 3.11 log a warning (#12366)

---
 metadata-ingestion/src/datahub/entrypoints.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/metadata-ingestion/src/datahub/entrypoints.py b/metadata-ingestion/src/datahub/entrypoints.py
index 85968f050a3716..0162b476a21931 100644
--- a/metadata-ingestion/src/datahub/entrypoints.py
+++ b/metadata-ingestion/src/datahub/entrypoints.py
@@ -45,6 +45,12 @@
 
 MAX_CONTENT_WIDTH = 120
 
+if sys.version_info >= (3, 12):
+    click.secho(
+        "Python versions above 3.11 are not tested with. Please use Python 3.11.",
+        fg="red",
+    )
+
 
 @click.group(
     context_settings=dict(

From 0392a22d9d09ff7990e08c5326a853ec30a8f3f8 Mon Sep 17 00:00:00 2001
From: Tamas Nemeth <treff7es@gmail.com>
Date: Thu, 16 Jan 2025 14:14:24 +0100
Subject: [PATCH 094/249] fix(ingest/tableau): Fix TableauUpstream create check
 (#12320)

---
 .../ingestion/source/tableau/tableau.py       |  2 +-
 .../source/tableau/tableau_common.py          |  7 +++--
 .../tests/unit/test_tableau_source.py         | 29 +++++++++++++++++++
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
index 0424a0e692de2c..3de51fcc5b6789 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
@@ -2728,7 +2728,7 @@ def emit_upstream_tables(self) -> Iterable[MetadataWorkUnit]:
             c.ID_WITH_IN: list(tableau_database_table_id_to_urn_map.keys())
         }
 
-        # Emmitting tables that came from Tableau metadata
+        # Emitting tables that came from Tableau metadata
         for tableau_table in self.get_connection_objects(
             database_tables_graphql_query,
             c.DATABASE_TABLES_CONNECTION,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau_common.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau_common.py
index 8f9d81eb9a18c1..5d5103330fe302 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau_common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau_common.py
@@ -642,8 +642,11 @@ class TableauUpstreamReference:
 
     @classmethod
     def create(
-        cls, d: dict, default_schema_map: Optional[Dict[str, str]] = None
+        cls, d: Dict, default_schema_map: Optional[Dict[str, str]] = None
     ) -> "TableauUpstreamReference":
+        if d is None:
+            raise ValueError("TableauUpstreamReference.create: d is None")
+
         # Values directly from `table` object from Tableau
         database_dict = (
             d.get(c.DATABASE) or {}
@@ -717,7 +720,7 @@ def parse_full_name(full_name: Optional[str]) -> Optional[List[str]]:
         #  schema
 
         # TODO: Validate the startswith check. Currently required for our integration tests
-        if full_name is None or not full_name.startswith("["):
+        if full_name is None:
             return None
 
         return full_name.replace("[", "").replace("]", "").split(".")
diff --git a/metadata-ingestion/tests/unit/test_tableau_source.py b/metadata-ingestion/tests/unit/test_tableau_source.py
index 227519fdb464a8..6763b80b28b04c 100644
--- a/metadata-ingestion/tests/unit/test_tableau_source.py
+++ b/metadata-ingestion/tests/unit/test_tableau_source.py
@@ -5,6 +5,7 @@
 import datahub.ingestion.source.tableau.tableau_constant as c
 from datahub.ingestion.source.tableau.tableau import TableauSiteSource
 from datahub.ingestion.source.tableau.tableau_common import (
+    TableauUpstreamReference,
     get_filter_pages,
     make_filter,
     optimize_query_filter,
@@ -247,3 +248,31 @@ def test_optimize_query_filter_handles_no_duplicates():
     assert len(result) == 2
     assert result[c.ID_WITH_IN] == ["id1", "id2"]
     assert result[c.PROJECT_NAME_WITH_IN] == ["project1", "project2"]
+
+
+def test_tableau_upstream_reference():
+    d = {
+        "id": "7127b695-3df5-4a3a-4837-eb0f4b572337",
+        "name": "TABLE1",
+        "database": None,
+        "schema": "SCHEMA1",
+        "fullName": "DB1.SCHEMA1.TABLE1",
+        "connectionType": "snowflake",
+        "description": "",
+        "columnsConnection": {"totalCount": 0},
+    }
+    ref = TableauUpstreamReference.create(d)
+    assert ref
+
+    assert ref.database == "DB1"
+    assert ref.schema == "SCHEMA1"
+    assert ref.table == "TABLE1"
+    assert ref.connection_type == "snowflake"
+
+    try:
+        ref = TableauUpstreamReference.create(None)  # type: ignore[arg-type]
+        raise AssertionError(
+            "TableauUpstreamReference.create with None should have raised exception"
+        )
+    except ValueError:
+        assert True

From b7b541ca7d7ec4fe44eb0283fbb9ed86331e71d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20G=C3=B3mez=20Villamor?= <sgomezvillamor@gmail.com>
Date: Thu, 16 Jan 2025 16:43:46 +0100
Subject: [PATCH 095/249] feat(tableau): fine-grained page size (#12354)

---
 .../ingestion/source/tableau/tableau.py       | 229 +++++++++++++-----
 .../tableau/test_tableau_ingest.py            |   6 +-
 .../tests/unit/test_tableau_source.py         | 103 +++++++-
 3 files changed, 271 insertions(+), 67 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
index 3de51fcc5b6789..ee841a2a201863 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
@@ -174,6 +174,8 @@
 from datahub.utilities.stats_collections import TopKDict
 from datahub.utilities.urns.dataset_urn import DatasetUrn
 
+DEFAULT_PAGE_SIZE = 10
+
 try:
     # On earlier versions of the tableauserverclient, the NonXMLResponseError
     # was thrown when reauthentication was necessary. We'll keep both exceptions
@@ -342,11 +344,140 @@ class PermissionIngestionConfig(ConfigModel):
     )
 
 
+class TableauPageSizeConfig(ConfigModel):
+    """
+    Configuration for setting page sizes for different Tableau metadata objects.
+
+    Some considerations:
+    - All have default values, so no setting is mandatory.
+    - In general, with the `effective_` methods, if not specifically set fine-grained metrics fallback to `page_size`
+    or correlate with `page_size`.
+
+    Measuring the impact of changing these values can be done by looking at the
+    `num_(filter_|paginated_)?queries_by_connection_type` metrics in the report.
+    """
+
+    page_size: int = Field(
+        default=DEFAULT_PAGE_SIZE,
+        description="[advanced] Number of metadata objects (e.g. CustomSQLTable, PublishedDatasource, etc) to query at a time using the Tableau API.",
+    )
+
+    database_server_page_size: Optional[int] = Field(
+        default=None,
+        description="[advanced] Number of database servers to query at a time using the Tableau API; fallbacks to `page_size` if not set.",
+    )
+
+    @property
+    def effective_database_server_page_size(self) -> int:
+        return self.database_server_page_size or self.page_size
+
+    # We've found that even with a small workbook page size (e.g. 10), the Tableau API often
+    # returns warnings like this:
+    # {
+    # 	'message': 'Showing partial results. The request exceeded the 20000 node limit. Use pagination, additional filtering, or both in the query to adjust results.',
+    # 	'extensions': {
+    # 		'severity': 'WARNING',
+    # 		'code': 'NODE_LIMIT_EXCEEDED',
+    # 		'properties': {
+    # 			'nodeLimit': 20000
+    # 		}
+    # 	}
+    # }
+    # Reducing the page size for the workbook queries helps to avoid this.
+    workbook_page_size: Optional[int] = Field(
+        default=1,
+        description="[advanced] Number of workbooks to query at a time using the Tableau API; defaults to `1` and fallbacks to `page_size` if not set.",
+    )
+
+    @property
+    def effective_workbook_page_size(self) -> int:
+        return self.workbook_page_size or self.page_size
+
+    sheet_page_size: Optional[int] = Field(
+        default=None,
+        description="[advanced] Number of sheets to query at a time using the Tableau API; fallbacks to `page_size` if not set.",
+    )
+
+    @property
+    def effective_sheet_page_size(self) -> int:
+        return self.sheet_page_size or self.page_size
+
+    dashboard_page_size: Optional[int] = Field(
+        default=None,
+        description="[advanced] Number of dashboards to query at a time using the Tableau API; fallbacks to `page_size` if not set.",
+    )
+
+    @property
+    def effective_dashboard_page_size(self) -> int:
+        return self.dashboard_page_size or self.page_size
+
+    embedded_datasource_page_size: Optional[int] = Field(
+        default=None,
+        description="[advanced] Number of embedded datasources to query at a time using the Tableau API; fallbacks to `page_size` if not set.",
+    )
+
+    @property
+    def effective_embedded_datasource_page_size(self) -> int:
+        return self.embedded_datasource_page_size or self.page_size
+
+    # Since the field upstream query was separated from the embedded datasource queries into an independent query,
+    # the number of queries increased significantly and so the execution time.
+    # To increase the batching and so reduce the number of queries, we can increase the page size for that
+    # particular case.
+    #
+    # That's why unless specifically set, we will effectively use 10 times the page size as the default page size.
+    embedded_datasource_field_upstream_page_size: Optional[int] = Field(
+        default=None,
+        description="[advanced] Number of upstream fields to query at a time for embedded datasources using the Tableau API; fallbacks to `page_size` * 10 if not set.",
+    )
+
+    @property
+    def effective_embedded_datasource_field_upstream_page_size(self) -> int:
+        return self.embedded_datasource_field_upstream_page_size or self.page_size * 10
+
+    published_datasource_page_size: Optional[int] = Field(
+        default=None,
+        description="[advanced] Number of published datasources to query at a time using the Tableau API; fallbacks to `page_size` if not set.",
+    )
+
+    @property
+    def effective_published_datasource_page_size(self) -> int:
+        return self.published_datasource_page_size or self.page_size
+
+    published_datasource_field_upstream_page_size: Optional[int] = Field(
+        default=None,
+        description="[advanced] Number of upstream fields to query at a time for published datasources using the Tableau API; fallbacks to `page_size` * 10 if not set.",
+    )
+
+    @property
+    def effective_published_datasource_field_upstream_page_size(self) -> int:
+        return self.published_datasource_field_upstream_page_size or self.page_size * 10
+
+    custom_sql_table_page_size: Optional[int] = Field(
+        default=None,
+        description="[advanced] Number of custom sql datasources to query at a time using the Tableau API; fallbacks to `page_size` if not set.",
+    )
+
+    @property
+    def effective_custom_sql_table_page_size(self) -> int:
+        return self.custom_sql_table_page_size or self.page_size
+
+    database_table_page_size: Optional[int] = Field(
+        default=None,
+        description="[advanced] Number of database tables to query at a time using the Tableau API; fallbacks to `page_size` if not set.",
+    )
+
+    @property
+    def effective_database_table_page_size(self) -> int:
+        return self.database_table_page_size or self.page_size
+
+
 class TableauConfig(
     DatasetLineageProviderConfigBase,
     StatefulIngestionConfigBase,
     DatasetSourceConfigMixin,
     TableauConnectionConfig,
+    TableauPageSizeConfig,
 ):
     projects: Optional[List[str]] = Field(
         default=["default"],
@@ -396,40 +527,6 @@ class TableauConfig(
         description="Ingest details for tables external to (not embedded in) tableau as entities.",
     )
 
-    page_size: int = Field(
-        default=10,
-        description="[advanced] Number of metadata objects (e.g. CustomSQLTable, PublishedDatasource, etc) to query at a time using the Tableau API.",
-    )
-
-    # We've found that even with a small workbook page size (e.g. 10), the Tableau API often
-    # returns warnings like this:
-    # {
-    # 	'message': 'Showing partial results. The request exceeded the 20000 node limit. Use pagination, additional filtering, or both in the query to adjust results.',
-    # 	'extensions': {
-    # 		'severity': 'WARNING',
-    # 		'code': 'NODE_LIMIT_EXCEEDED',
-    # 		'properties': {
-    # 			'nodeLimit': 20000
-    # 		}
-    # 	}
-    # }
-    # Reducing the page size for the workbook queries helps to avoid this.
-    workbook_page_size: int = Field(
-        default=1,
-        description="[advanced] Number of workbooks to query at a time using the Tableau API.",
-    )
-
-    # Since the field upstream query was separated from the embedded datasource queries into an independent query,
-    # the number of queries increased significantly and so the execution time.
-    # To increase the batching and so reduce the number of queries, we can increase the page size for that
-    # particular case.
-    #
-    # `num_(filter_|paginated_)?queries_by_connection_type` metrics in the report will help to understand the impact of this change.
-    embedded_datasource_field_upstream_page_size: int = Field(
-        default=100,
-        description="[advanced] Number of upstream fields to query at a time for embedded datasources using the Tableau API.",
-    )
-
     env: str = Field(
         default=builder.DEFAULT_ENV,
         description="Environment to use in namespace when constructing URNs.",
@@ -1022,7 +1119,9 @@ def maybe_parse_hostname():
             return server_connection
 
         for database_server in self.get_connection_objects(
-            database_servers_graphql_query, c.DATABASE_SERVERS_CONNECTION
+            query=database_servers_graphql_query,
+            connection_type=c.DATABASE_SERVERS_CONNECTION,
+            page_size=self.config.effective_database_server_page_size,
         ):
             database_server_id = database_server.get(c.ID)
             server_connection = database_server.get(c.HOST_NAME)
@@ -1448,14 +1547,13 @@ def get_connection_objects(
         self,
         query: str,
         connection_type: str,
+        page_size: int,
         query_filter: dict = {},
-        page_size_override: Optional[int] = None,
     ) -> Iterable[dict]:
         query_filter = optimize_query_filter(query_filter)
 
         # Calls the get_connection_object_page function to get the objects,
         # and automatically handles pagination.
-        page_size = page_size_override or self.config.page_size
 
         filter_pages = get_filter_pages(query_filter, page_size)
         self.report.num_queries_by_connection_type[connection_type] += 1
@@ -1500,10 +1598,10 @@ def emit_workbooks(self) -> Iterable[MetadataWorkUnit]:
             projects = {c.PROJECT_NAME_WITH_IN: project_names}
 
             for workbook in self.get_connection_objects(
-                workbook_graphql_query,
-                c.WORKBOOKS_CONNECTION,
-                projects,
-                page_size_override=self.config.workbook_page_size,
+                query=workbook_graphql_query,
+                connection_type=c.WORKBOOKS_CONNECTION,
+                query_filter=projects,
+                page_size=self.config.effective_workbook_page_size,
             ):
                 # This check is needed as we are using projectNameWithin which return project as per project name so if
                 # user want to ingest only nested project C from A->B->C then tableau might return more than one Project
@@ -1958,9 +2056,10 @@ def emit_custom_sql_datasources(self) -> Iterable[MetadataWorkUnit]:
 
         custom_sql_connection = list(
             self.get_connection_objects(
-                custom_sql_graphql_query,
-                c.CUSTOM_SQL_TABLE_CONNECTION,
-                custom_sql_filter,
+                query=custom_sql_graphql_query,
+                connection_type=c.CUSTOM_SQL_TABLE_CONNECTION,
+                query_filter=custom_sql_filter,
+                page_size=self.config.effective_custom_sql_table_page_size,
             )
         )
 
@@ -2669,7 +2768,7 @@ def update_datasource_for_field_upstream(
         self,
         datasource: dict,
         field_upstream_query: str,
-        page_size_override: Optional[int] = None,
+        page_size: int,
     ) -> dict:
         # Collect field ids to fetch field upstreams
         field_ids: List[str] = []
@@ -2683,7 +2782,7 @@ def update_datasource_for_field_upstream(
             query=field_upstream_query,
             connection_type=c.FIELDS_CONNECTION,
             query_filter={c.ID_WITH_IN: field_ids},
-            page_size_override=page_size_override,
+            page_size=page_size,
         ):
             if field_upstream.get(c.ID):
                 field_id = field_upstream[c.ID]
@@ -2706,13 +2805,15 @@ def emit_published_datasources(self) -> Iterable[MetadataWorkUnit]:
         datasource_filter = {c.ID_WITH_IN: self.datasource_ids_being_used}
 
         for datasource in self.get_connection_objects(
-            published_datasource_graphql_query,
-            c.PUBLISHED_DATA_SOURCES_CONNECTION,
-            datasource_filter,
+            query=published_datasource_graphql_query,
+            connection_type=c.PUBLISHED_DATA_SOURCES_CONNECTION,
+            query_filter=datasource_filter,
+            page_size=self.config.effective_published_datasource_page_size,
         ):
             datasource = self.update_datasource_for_field_upstream(
                 datasource=datasource,
                 field_upstream_query=datasource_upstream_fields_graphql_query,
+                page_size=self.config.effective_published_datasource_field_upstream_page_size,
             )
 
             yield from self.emit_datasource(datasource)
@@ -2730,9 +2831,10 @@ def emit_upstream_tables(self) -> Iterable[MetadataWorkUnit]:
 
         # Emitting tables that came from Tableau metadata
         for tableau_table in self.get_connection_objects(
-            database_tables_graphql_query,
-            c.DATABASE_TABLES_CONNECTION,
-            tables_filter,
+            query=database_tables_graphql_query,
+            connection_type=c.DATABASE_TABLES_CONNECTION,
+            query_filter=tables_filter,
+            page_size=self.config.effective_database_table_page_size,
         ):
             database_table = self.database_tables[
                 tableau_database_table_id_to_urn_map[tableau_table[c.ID]]
@@ -2921,9 +3023,10 @@ def emit_sheets(self) -> Iterable[MetadataWorkUnit]:
         sheets_filter = {c.ID_WITH_IN: self.sheet_ids}
 
         for sheet in self.get_connection_objects(
-            sheet_graphql_query,
-            c.SHEETS_CONNECTION,
-            sheets_filter,
+            query=sheet_graphql_query,
+            connection_type=c.SHEETS_CONNECTION,
+            query_filter=sheets_filter,
+            page_size=self.config.effective_sheet_page_size,
         ):
             if self.config.ingest_hidden_assets or not self._is_hidden_view(sheet):
                 yield from self.emit_sheets_as_charts(sheet, sheet.get(c.WORKBOOK))
@@ -3241,9 +3344,10 @@ def emit_dashboards(self) -> Iterable[MetadataWorkUnit]:
         dashboards_filter = {c.ID_WITH_IN: self.dashboard_ids}
 
         for dashboard in self.get_connection_objects(
-            dashboard_graphql_query,
-            c.DASHBOARDS_CONNECTION,
-            dashboards_filter,
+            query=dashboard_graphql_query,
+            connection_type=c.DASHBOARDS_CONNECTION,
+            query_filter=dashboards_filter,
+            page_size=self.config.effective_dashboard_page_size,
         ):
             if self.config.ingest_hidden_assets or not self._is_hidden_view(dashboard):
                 yield from self.emit_dashboard(dashboard, dashboard.get(c.WORKBOOK))
@@ -3388,14 +3492,15 @@ def emit_embedded_datasources(self) -> Iterable[MetadataWorkUnit]:
         datasource_filter = {c.ID_WITH_IN: self.embedded_datasource_ids_being_used}
 
         for datasource in self.get_connection_objects(
-            embedded_datasource_graphql_query,
-            c.EMBEDDED_DATA_SOURCES_CONNECTION,
-            datasource_filter,
+            query=embedded_datasource_graphql_query,
+            connection_type=c.EMBEDDED_DATA_SOURCES_CONNECTION,
+            query_filter=datasource_filter,
+            page_size=self.config.effective_embedded_datasource_page_size,
         ):
             datasource = self.update_datasource_for_field_upstream(
                 datasource=datasource,
                 field_upstream_query=datasource_upstream_fields_graphql_query,
-                page_size_override=self.config.embedded_datasource_field_upstream_page_size,
+                page_size=self.config.effective_embedded_datasource_field_upstream_page_size,
             )
             yield from self.emit_datasource(
                 datasource,
diff --git a/metadata-ingestion/tests/integration/tableau/test_tableau_ingest.py b/metadata-ingestion/tests/integration/tableau/test_tableau_ingest.py
index 417496c559c436..32b1ef2ed1f835 100644
--- a/metadata-ingestion/tests/integration/tableau/test_tableau_ingest.py
+++ b/metadata-ingestion/tests/integration/tableau/test_tableau_ingest.py
@@ -69,8 +69,7 @@
     "projects": ["default", "Project 2", "Samples"],
     "extract_project_hierarchy": False,
     "page_size": 1000,
-    "workbook_page_size": 1000,
-    "embedded_datasource_field_upstream_page_size": 1000,
+    "workbook_page_size": None,
     "ingest_tags": True,
     "ingest_owner": True,
     "ingest_tables_external": True,
@@ -646,8 +645,7 @@ def test_tableau_ingest_with_platform_instance(
         "platform_instance": "acryl_site1",
         "projects": ["default", "Project 2"],
         "page_size": 1000,
-        "workbook_page_size": 1000,
-        "embedded_datasource_field_upstream_page_size": 1000,
+        "workbook_page_size": None,
         "ingest_tags": True,
         "ingest_owner": True,
         "ingest_tables_external": True,
diff --git a/metadata-ingestion/tests/unit/test_tableau_source.py b/metadata-ingestion/tests/unit/test_tableau_source.py
index 6763b80b28b04c..ba5e5a9832a62f 100644
--- a/metadata-ingestion/tests/unit/test_tableau_source.py
+++ b/metadata-ingestion/tests/unit/test_tableau_source.py
@@ -3,7 +3,11 @@
 import pytest
 
 import datahub.ingestion.source.tableau.tableau_constant as c
-from datahub.ingestion.source.tableau.tableau import TableauSiteSource
+from datahub.ingestion.source.tableau.tableau import (
+    DEFAULT_PAGE_SIZE,
+    TableauPageSizeConfig,
+    TableauSiteSource,
+)
 from datahub.ingestion.source.tableau.tableau_common import (
     TableauUpstreamReference,
     get_filter_pages,
@@ -276,3 +280,100 @@ def test_tableau_upstream_reference():
         )
     except ValueError:
         assert True
+
+
+class TestTableauPageSizeConfig:
+    def test_defaults(self):
+        config = TableauPageSizeConfig()
+        assert config.effective_database_server_page_size == DEFAULT_PAGE_SIZE
+        assert config.effective_workbook_page_size == 1
+        assert config.effective_sheet_page_size == DEFAULT_PAGE_SIZE
+        assert config.effective_dashboard_page_size == DEFAULT_PAGE_SIZE
+        assert config.effective_embedded_datasource_page_size == DEFAULT_PAGE_SIZE
+        assert (
+            config.effective_embedded_datasource_field_upstream_page_size
+            == DEFAULT_PAGE_SIZE * 10
+        )
+        assert config.effective_published_datasource_page_size == DEFAULT_PAGE_SIZE
+        assert (
+            config.effective_published_datasource_field_upstream_page_size
+            == DEFAULT_PAGE_SIZE * 10
+        )
+        assert config.effective_custom_sql_table_page_size == DEFAULT_PAGE_SIZE
+        assert config.effective_database_table_page_size == DEFAULT_PAGE_SIZE
+
+    def test_page_size_fallbacks(self):
+        page_size = 33
+        config = TableauPageSizeConfig(page_size=page_size)
+        assert config.effective_database_server_page_size == page_size
+        assert config.effective_workbook_page_size == 1
+        assert config.effective_sheet_page_size == page_size
+        assert config.effective_dashboard_page_size == page_size
+        assert config.effective_embedded_datasource_page_size == page_size
+        assert (
+            config.effective_embedded_datasource_field_upstream_page_size
+            == page_size * 10
+        )
+        assert config.effective_published_datasource_page_size == page_size
+        assert (
+            config.effective_published_datasource_field_upstream_page_size
+            == page_size * 10
+        )
+        assert config.effective_custom_sql_table_page_size == page_size
+        assert config.effective_database_table_page_size == page_size
+
+    def test_fine_grained(self):
+        any_page_size = 55
+        config = TableauPageSizeConfig(database_server_page_size=any_page_size)
+        assert config.page_size == DEFAULT_PAGE_SIZE
+        assert config.effective_database_server_page_size == any_page_size
+
+        config = TableauPageSizeConfig(workbook_page_size=any_page_size)
+        assert config.page_size == DEFAULT_PAGE_SIZE
+        assert config.effective_workbook_page_size == any_page_size
+
+        config = TableauPageSizeConfig(workbook_page_size=None)
+        assert config.page_size == DEFAULT_PAGE_SIZE
+        assert config.effective_workbook_page_size == DEFAULT_PAGE_SIZE
+
+        config = TableauPageSizeConfig(sheet_page_size=any_page_size)
+        assert config.page_size == DEFAULT_PAGE_SIZE
+        assert config.effective_sheet_page_size == any_page_size
+
+        config = TableauPageSizeConfig(dashboard_page_size=any_page_size)
+        assert config.page_size == DEFAULT_PAGE_SIZE
+        assert config.effective_dashboard_page_size == any_page_size
+
+        config = TableauPageSizeConfig(embedded_datasource_page_size=any_page_size)
+        assert config.page_size == DEFAULT_PAGE_SIZE
+        assert config.effective_embedded_datasource_page_size == any_page_size
+
+        config = TableauPageSizeConfig(
+            embedded_datasource_field_upstream_page_size=any_page_size
+        )
+        assert config.page_size == DEFAULT_PAGE_SIZE
+        assert (
+            config.effective_embedded_datasource_field_upstream_page_size
+            == any_page_size
+        )
+
+        config = TableauPageSizeConfig(published_datasource_page_size=any_page_size)
+        assert config.page_size == DEFAULT_PAGE_SIZE
+        assert config.effective_published_datasource_page_size == any_page_size
+
+        config = TableauPageSizeConfig(
+            published_datasource_field_upstream_page_size=any_page_size
+        )
+        assert config.page_size == DEFAULT_PAGE_SIZE
+        assert (
+            config.effective_published_datasource_field_upstream_page_size
+            == any_page_size
+        )
+
+        config = TableauPageSizeConfig(custom_sql_table_page_size=any_page_size)
+        assert config.page_size == DEFAULT_PAGE_SIZE
+        assert config.effective_custom_sql_table_page_size == any_page_size
+
+        config = TableauPageSizeConfig(database_table_page_size=any_page_size)
+        assert config.page_size == DEFAULT_PAGE_SIZE
+        assert config.effective_database_table_page_size == any_page_size

From 7eaadb03b6da03c4e48d9f61340c579d7354205a Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Thu, 16 Jan 2025 23:26:21 +0530
Subject: [PATCH 096/249] fix(sdk): cleanup empty secret names (#12367)

---
 .../datahub/secret/datahub_secrets_client.py  | 33 +++++++------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/metadata-ingestion/src/datahub/secret/datahub_secrets_client.py b/metadata-ingestion/src/datahub/secret/datahub_secrets_client.py
index c60aeff5db2f3f..6cd542c03a4260 100644
--- a/metadata-ingestion/src/datahub/secret/datahub_secrets_client.py
+++ b/metadata-ingestion/src/datahub/secret/datahub_secrets_client.py
@@ -11,34 +11,25 @@ class DataHubSecretsClient:
     def __init__(self, graph: DataHubGraph):
         self.graph = graph
 
+    def _cleanup_secret_name(self, secret_names: List[str]) -> List[str]:
+        """Remove empty strings from the list of secret names."""
+        return [secret_name for secret_name in secret_names if secret_name]
+
     def get_secret_values(self, secret_names: List[str]) -> Dict[str, Optional[str]]:
         if len(secret_names) == 0:
             return {}
 
-        request_json = {
-            "query": """query getSecretValues($input: GetSecretValuesInput!) {\n
-                getSecretValues(input: $input) {\n
-                    name\n
-                    value\n
-                }\n
+        res_data = self.graph.execute_graphql(
+            query="""query getSecretValues($input: GetSecretValuesInput!) {
+                getSecretValues(input: $input) {
+                    name
+                    value
+                }
             }""",
-            "variables": {"input": {"secrets": secret_names}},
-        }
-        # TODO: Use graph.execute_graphql() instead.
-
-        # Fetch secrets using GraphQL API f
-        response = self.graph._session.post(
-            f"{self.graph.config.server}/api/graphql", json=request_json
+            variables={"input": {"secrets": self._cleanup_secret_name(secret_names)}},
         )
-        response.raise_for_status()
-
-        # Verify response
-        res_data = response.json()
-        if "errors" in res_data:
-            raise Exception("Failed to retrieve secrets from DataHub.")
-
         # Convert list of name, value secret pairs into a dict and return
-        secret_value_list = res_data["data"]["getSecretValues"]
+        secret_value_list = res_data["getSecretValues"]
         secret_value_dict = dict()
         for secret_value in secret_value_list:
             secret_value_dict[secret_value["name"]] = secret_value["value"]

From 0ddf88651d4bdc0753fb2f53e7fb78359fdaad3e Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Thu, 16 Jan 2025 13:48:48 -0600
Subject: [PATCH 097/249] chore(bump): bump/align avro-serializer (#12368)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e4fd70a99e6434..e3259a8df342e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -193,7 +193,7 @@ project.ext.externalDependency = [
     'junitJupiterEngine': "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion",
     // avro-serde includes dependencies for `kafka-avro-serializer` `kafka-schema-registry-client` and `avro`
     'kafkaAvroSerde': "io.confluent:kafka-streams-avro-serde:$kafkaVersion",
-    'kafkaAvroSerializer': 'io.confluent:kafka-avro-serializer:5.1.4',
+    'kafkaAvroSerializer': "io.confluent:kafka-avro-serializer:$kafkaVersion",
     'kafkaClients': "org.apache.kafka:kafka-clients:$kafkaVersion-ccs",
     'snappy': 'org.xerial.snappy:snappy-java:1.1.10.5',
     'logbackClassic': "ch.qos.logback:logback-classic:$logbackClassic",

From bfe975874d954b8b9061f2c9c9c63397a50d3f1a Mon Sep 17 00:00:00 2001
From: kevinkarchacryl <kevin.karch@acryl.io>
Date: Thu, 16 Jan 2025 15:28:42 -0500
Subject: [PATCH 098/249] fix(cli): list-source-runs added null checking
 (#12369)

---
 docs/cli.md                                   |  8 ++--
 .../src/datahub/cli/ingest_cli.py             | 40 ++++++++++++-------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/docs/cli.md b/docs/cli.md
index 1c38077d0d12ef..06dca46269c4bf 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -115,17 +115,17 @@ datahub ingest -c ./examples/recipes/example_to_datahub_rest.dhub.yaml --dry-run
 datahub ingest -c ./examples/recipes/example_to_datahub_rest.dhub.yaml -n
 ```
 
-#### ingest --list-source-runs
+#### ingest list-source-runs
 
-The `--list-source-runs` option of the `ingest` command lists the previous runs, displaying their run ID, source name, 
+The `list-source-runs` option of the `ingest` command lists the previous runs, displaying their run ID, source name, 
 start time, status, and source URN. This command allows you to filter results using the --urn option for URN-based 
 filtering or the --source option to filter by source name (partial or complete matches are supported).
 
 ```shell
 # List all ingestion runs
-datahub ingest --list-source-runs
+datahub ingest list-source-runs
 # Filter runs by a source name containing "demo"
-datahub ingest --list-source-runs --source "demo"
+datahub ingest list-source-runs --source "demo"
 ```
 
 #### ingest --preview
diff --git a/metadata-ingestion/src/datahub/cli/ingest_cli.py b/metadata-ingestion/src/datahub/cli/ingest_cli.py
index fcab07a1c2aaf6..c9eaccbc65ee21 100644
--- a/metadata-ingestion/src/datahub/cli/ingest_cli.py
+++ b/metadata-ingestion/src/datahub/cli/ingest_cli.py
@@ -507,15 +507,11 @@ def list_source_runs(page_offset: int, page_size: int, urn: str, source: str) ->
         click.echo("No response received from the server.")
         return
 
-    # when urn or source filter does not match, exit gracefully
-    if (
-        not isinstance(data.get("data"), dict)
-        or "listIngestionSources" not in data["data"]
-    ):
-        click.echo("No matching ingestion sources found. Please check your filters.")
-        return
+    # a lot of responses can be null if there's errors in the run
+    ingestion_sources = (
+        data.get("data", {}).get("listIngestionSources", {}).get("ingestionSources", [])
+    )
 
-    ingestion_sources = data["data"]["listIngestionSources"]["ingestionSources"]
     if not ingestion_sources:
         click.echo("No ingestion sources or executions found.")
         return
@@ -526,18 +522,32 @@ def list_source_runs(page_offset: int, page_size: int, urn: str, source: str) ->
         name = ingestion_source.get("name", "N/A")
 
         executions = ingestion_source.get("executions", {}).get("executionRequests", [])
+
         for execution in executions:
+            if execution is None:
+                continue
+
             execution_id = execution.get("id", "N/A")
-            start_time = execution.get("result", {}).get("startTimeMs", "N/A")
-            start_time = (
-                datetime.fromtimestamp(start_time / 1000).strftime("%Y-%m-%d %H:%M:%S")
-                if start_time != "N/A"
-                else "N/A"
-            )
-            status = execution.get("result", {}).get("status", "N/A")
+            result = execution.get("result") or {}
+            status = result.get("status", "N/A")
+
+            try:
+                start_time = (
+                    datetime.fromtimestamp(
+                        result.get("startTimeMs", 0) / 1000
+                    ).strftime("%Y-%m-%d %H:%M:%S")
+                    if status != "DUPLICATE" and result.get("startTimeMs") is not None
+                    else "N/A"
+                )
+            except (TypeError, ValueError):
+                start_time = "N/A"
 
             rows.append([execution_id, name, start_time, status, urn])
 
+    if not rows:
+        click.echo("No execution data found.")
+        return
+
     click.echo(
         tabulate(
             rows,

From 440ba81631ac1ee4bd4dabb19dda795c8e70eac0 Mon Sep 17 00:00:00 2001
From: Hyejin Yoon <0327jane@gmail.com>
Date: Fri, 17 Jan 2025 08:15:54 +0900
Subject: [PATCH 099/249] docs: modify banner for dh v1 & update core dropdown
 link (#12362)

---
 docs-website/docusaurus.config.js                               | 2 +-
 .../SolutionsDropdownContent/solutionsDropdownContent.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs-website/docusaurus.config.js b/docs-website/docusaurus.config.js
index fb2f418e37c044..686c28fa3d1b93 100644
--- a/docs-website/docusaurus.config.js
+++ b/docs-website/docusaurus.config.js
@@ -77,7 +77,7 @@ module.exports = {
     announcementBar: {
           id: "announcement-3",
           content:
-            '<div style="display: flex; justify-content: center; align-items: center;width: 100%;"><!--img src="/img/acryl-logo-white-mark.svg" / --><!--div style="font-size: .8rem; font-weight: 600; background-color: white; color: #111; padding: 0px 8px; border-radius: 4px; margin-right:12px;">NEW</div--><p>Watch Metadata & AI Summit sessions on-demand.</p><a href="https://www.youtube.com/@DataHubProject/videos" target="_blank" class="button">Watch Now<span> →</span></a></div>',
+            '<div style="display: flex; justify-content: center; align-items: center;width: 100%;"><!--img src="/img/acryl-logo-white-mark.svg" / --><!--div style="font-size: .8rem; font-weight: 600; background-color: white; color: #111; padding: 0px 8px; border-radius: 4px; margin-right:12px;">NEW</div--><p>Learn about DataHub 1.0 launching at our 5th birthday party!</p><a href="https://lu.ma/0j5jcocn" target="_blank" class="button">Register<span> →</span></a></div>',
           backgroundColor: "#111",
           textColor: "#ffffff",
           isCloseable: false,
diff --git a/docs-website/src/components/SolutionsDropdown/SolutionsDropdownContent/solutionsDropdownContent.js b/docs-website/src/components/SolutionsDropdown/SolutionsDropdownContent/solutionsDropdownContent.js
index abede0f11735d4..ad7278a438cf81 100644
--- a/docs-website/src/components/SolutionsDropdown/SolutionsDropdownContent/solutionsDropdownContent.js
+++ b/docs-website/src/components/SolutionsDropdown/SolutionsDropdownContent/solutionsDropdownContent.js
@@ -24,7 +24,7 @@ const solutionsDropdownContent = {
             title: "DataHub Core",
             description: "Get started with the Open Source platform.",
             iconImage: "/img/solutions/icon-dropdown-core.png",
-            href: "/",
+            href: "/docs/quickstart",
         },
         {
             title: "Cloud vs Core",

From 3084147df9fe21cbab3d80eb029a14c45376925e Mon Sep 17 00:00:00 2001
From: rharisi <siddartha430@gmail.com>
Date: Fri, 17 Jan 2025 06:28:06 +0530
Subject: [PATCH 100/249] fix(pdl): Add Dataplatform Instance urn pdl file
 (#11754)

Co-authored-by: John Joyce <john@acryl.io>
---
 .../common/urn/DataPlatformInstanceUrn.java   | 79 +++++++++++++++++++
 .../common/DataPlatformInstanceUrn.pdl        | 27 +++++++
 2 files changed, 106 insertions(+)
 create mode 100644 li-utils/src/main/javaPegasus/com/linkedin/common/urn/DataPlatformInstanceUrn.java
 create mode 100644 li-utils/src/main/pegasus/com/linkedin/common/DataPlatformInstanceUrn.pdl

diff --git a/li-utils/src/main/javaPegasus/com/linkedin/common/urn/DataPlatformInstanceUrn.java b/li-utils/src/main/javaPegasus/com/linkedin/common/urn/DataPlatformInstanceUrn.java
new file mode 100644
index 00000000000000..dfce6dc1e51085
--- /dev/null
+++ b/li-utils/src/main/javaPegasus/com/linkedin/common/urn/DataPlatformInstanceUrn.java
@@ -0,0 +1,79 @@
+package com.linkedin.common.urn;
+
+import com.linkedin.data.template.Custom;
+import com.linkedin.data.template.DirectCoercer;
+import com.linkedin.data.template.TemplateOutputCastException;
+import java.net.URISyntaxException;
+
+public final class DataPlatformInstanceUrn extends Urn {
+
+  public static final String ENTITY_TYPE = "dataPlatformInstance";
+
+  private final DataPlatformUrn _platform;
+  private final String _instanceId;
+
+  public DataPlatformInstanceUrn(DataPlatformUrn platform, String instanceId) {
+    super(ENTITY_TYPE, TupleKey.create(platform, instanceId));
+    this._platform = platform;
+    this._instanceId = instanceId;
+  }
+
+  public DataPlatformUrn getPlatformEntity() {
+    return _platform;
+  }
+
+  public String getInstance() {
+    return _instanceId;
+  }
+
+  public static DataPlatformInstanceUrn createFromString(String rawUrn) throws URISyntaxException {
+    return createFromUrn(Urn.createFromString(rawUrn));
+  }
+
+  public static DataPlatformInstanceUrn createFromUrn(Urn urn) throws URISyntaxException {
+    if (!"li".equals(urn.getNamespace())) {
+      throw new URISyntaxException(urn.toString(), "Urn namespace type should be 'li'.");
+    } else if (!ENTITY_TYPE.equals(urn.getEntityType())) {
+      throw new URISyntaxException(
+          urn.toString(), "Urn entity type should be 'dataPlatformInstance'.");
+    } else {
+      TupleKey key = urn.getEntityKey();
+      if (key.size() != 2) {
+        throw new URISyntaxException(urn.toString(), "Invalid number of keys.");
+      } else {
+        try {
+          return new DataPlatformInstanceUrn(
+              (DataPlatformUrn) key.getAs(0, DataPlatformUrn.class),
+              (String) key.getAs(1, String.class));
+        } catch (Exception e) {
+          throw new URISyntaxException(urn.toString(), "Invalid URN Parameter: '" + e.getMessage());
+        }
+      }
+    }
+  }
+
+  public static DataPlatformInstanceUrn deserialize(String rawUrn) throws URISyntaxException {
+    return createFromString(rawUrn);
+  }
+
+  static {
+    Custom.initializeCustomClass(DataPlatformUrn.class);
+    Custom.initializeCustomClass(DataPlatformInstanceUrn.class);
+    Custom.registerCoercer(
+        new DirectCoercer<DataPlatformInstanceUrn>() {
+          public Object coerceInput(DataPlatformInstanceUrn object) throws ClassCastException {
+            return object.toString();
+          }
+
+          public DataPlatformInstanceUrn coerceOutput(Object object)
+              throws TemplateOutputCastException {
+            try {
+              return DataPlatformInstanceUrn.createFromString((String) object);
+            } catch (URISyntaxException e) {
+              throw new TemplateOutputCastException("Invalid URN syntax: " + e.getMessage(), e);
+            }
+          }
+        },
+        DataPlatformInstanceUrn.class);
+  }
+}
diff --git a/li-utils/src/main/pegasus/com/linkedin/common/DataPlatformInstanceUrn.pdl b/li-utils/src/main/pegasus/com/linkedin/common/DataPlatformInstanceUrn.pdl
new file mode 100644
index 00000000000000..168e0ee7611d31
--- /dev/null
+++ b/li-utils/src/main/pegasus/com/linkedin/common/DataPlatformInstanceUrn.pdl
@@ -0,0 +1,27 @@
+namespace com.linkedin.common
+
+/**
+ * Standardized dataset identifier.
+ */
+@java.class = "com.linkedin.common.urn.DataPlatformInstanceUrn"
+@validate.`com.linkedin.common.validator.TypedUrnValidator` = {
+  "accessible" : true,
+  "owningTeam" : "urn:li:internalTeam:datahub",
+  "entityType" : "dataPlatformInstance",
+  "constructable" : true,
+  "namespace" : "li",
+  "name" : "DataPlatformInstance",
+  "doc" : "Standardized data platform instance identifier.",
+  "owners" : [ "urn:li:corpuser:fbar", "urn:li:corpuser:bfoo" ],
+  "fields" : [ {
+    "type" : "com.linkedin.common.urn.DataPlatformUrn",
+    "name" : "platform",
+    "doc" : "Standardized platform urn."
+  }, {
+    "name" : "instance",
+    "doc" : "Instance of the data platform (e.g. db instance)",
+    "type" : "string",
+  } ],
+  "maxLength" : 100
+}
+typeref DataPlatformInstanceUrn = string

From 4a1fff56c695400f1ed57caf8f1d4a4c7ea2809c Mon Sep 17 00:00:00 2001
From: Meenakshi Kamalaseshan Radha
 <62914384+mkamalas@users.noreply.github.com>
Date: Fri, 17 Jan 2025 06:28:43 +0530
Subject: [PATCH 101/249] feat(ui-plugin) - Allow custom userContext states to
 be added (#12057)

---
 datahub-web-react/src/app/context/CustomUserContext.tsx | 7 +++++++
 datahub-web-react/src/app/context/userContext.tsx       | 3 +++
 2 files changed, 10 insertions(+)
 create mode 100644 datahub-web-react/src/app/context/CustomUserContext.tsx

diff --git a/datahub-web-react/src/app/context/CustomUserContext.tsx b/datahub-web-react/src/app/context/CustomUserContext.tsx
new file mode 100644
index 00000000000000..016bbe29684ea5
--- /dev/null
+++ b/datahub-web-react/src/app/context/CustomUserContext.tsx
@@ -0,0 +1,7 @@
+/**
+ * Custom User Context State - This is a custom user context state and can be overriden in specific fork of DataHub.
+ * The below type can be customized with specific object properties as well if needed.
+ */
+export type CustomUserContextState = Record<string, any>;
+
+export const DEFAULT_CUSTOM_STATE: CustomUserContextState = {};
diff --git a/datahub-web-react/src/app/context/userContext.tsx b/datahub-web-react/src/app/context/userContext.tsx
index c9b8adafd9722f..a728e01ddc29ae 100644
--- a/datahub-web-react/src/app/context/userContext.tsx
+++ b/datahub-web-react/src/app/context/userContext.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { CorpUser, PlatformPrivileges } from '../../types.generated';
+import { CustomUserContextState, DEFAULT_CUSTOM_STATE } from './CustomUserContext';
 
 /**
  * Local State is persisted to local storage.
@@ -22,6 +23,7 @@ export type State = {
         loadedPersonalDefaultViewUrn: boolean;
         hasSetDefaultView: boolean;
     };
+    customState?: CustomUserContextState;
 };
 
 /**
@@ -51,6 +53,7 @@ export const DEFAULT_STATE: State = {
         loadedPersonalDefaultViewUrn: false,
         hasSetDefaultView: false,
     },
+    customState: DEFAULT_CUSTOM_STATE,
 };
 
 export const DEFAULT_CONTEXT = {

From fb08919f0457f45c8654c5882a6e5079bed9dac7 Mon Sep 17 00:00:00 2001
From: Deepali Jain <70557997+Deepalijain13@users.noreply.github.com>
Date: Fri, 17 Jan 2025 06:30:59 +0530
Subject: [PATCH 102/249] feat(ui): Enhancements to the user pic list selection
 within entities (#11803)

---
 .../sidebar/Ownership/EditOwnersModal.tsx     | 21 +++++++++++++++++--
 .../src/app/shared/OwnerLabel.tsx             | 12 +++++++++--
 datahub-web-react/src/graphql/search.graphql  |  4 ++++
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx
index 62b967e8f7b30d..e57666471df1a6 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx
@@ -78,10 +78,26 @@ export const EditOwnersModal = ({
     const renderSearchResult = (entity: Entity) => {
         const avatarUrl =
             (entity.type === EntityType.CorpUser && (entity as CorpUser).editableProperties?.pictureLink) || undefined;
+        const corpUserDepartmentName =
+            (entity.type === EntityType.CorpUser && (entity as CorpUser).properties?.departmentName) || '';
+        const corpUserId = (entity.type === EntityType.CorpUser && (entity as CorpUser).username) || '';
+        const corpUserTitle = (entity.type === EntityType.CorpUser && (entity as CorpUser).properties?.title) || '';
         const displayName = entityRegistry.getDisplayName(entity.type, entity);
+
         return (
-            <Select.Option value={entity.urn} key={entity.urn}>
-                <OwnerLabel name={displayName} avatarUrl={avatarUrl} type={entity.type} />
+            <Select.Option
+                key={entity.urn}
+                value={entity.urn}
+                label={<OwnerLabel name={displayName} avatarUrl={avatarUrl} type={entity.type} />}
+            >
+                <OwnerLabel
+                    name={displayName}
+                    avatarUrl={avatarUrl}
+                    type={entity.type}
+                    corpUserId={corpUserId}
+                    corpUserTitle={corpUserTitle}
+                    corpUserDepartmentName={corpUserDepartmentName}
+                />
             </Select.Option>
         );
     };
@@ -381,6 +397,7 @@ export const EditOwnersModal = ({
                                 value: owner.value.ownerUrn,
                                 label: owner.label,
                             }))}
+                            optionLabelProp="label"
                         >
                             {ownerSearchOptions}
                         </SelectInput>
diff --git a/datahub-web-react/src/app/shared/OwnerLabel.tsx b/datahub-web-react/src/app/shared/OwnerLabel.tsx
index de3c03dea2ba4a..fb670aa56d7881 100644
--- a/datahub-web-react/src/app/shared/OwnerLabel.tsx
+++ b/datahub-web-react/src/app/shared/OwnerLabel.tsx
@@ -20,14 +20,22 @@ type Props = {
     name: string;
     avatarUrl: string | undefined;
     type: EntityType;
+    corpUserId?: string;
+    corpUserTitle?: string;
+    corpUserDepartmentName?: string;
 };
 
-export const OwnerLabel = ({ name, avatarUrl, type }: Props) => {
+export const OwnerLabel = ({ name, avatarUrl, type, corpUserId, corpUserTitle, corpUserDepartmentName }: Props) => {
+    const subHeader = [corpUserId, corpUserTitle, corpUserDepartmentName].filter(Boolean).join(' - ');
+
     return (
         <OwnerContainerWrapper>
             <OwnerContentWrapper>
                 <CustomAvatar size={24} name={name} photoUrl={avatarUrl} isGroup={type === EntityType.CorpGroup} />
-                <div>{name}</div>
+                <div>
+                    <div>{name}</div>
+                    {subHeader && <div style={{ color: 'gray' }}>{subHeader}</div>}
+                </div>
             </OwnerContentWrapper>
         </OwnerContainerWrapper>
     );
diff --git a/datahub-web-react/src/graphql/search.graphql b/datahub-web-react/src/graphql/search.graphql
index 72e7d347187828..de7d1befd39b08 100644
--- a/datahub-web-react/src/graphql/search.graphql
+++ b/datahub-web-react/src/graphql/search.graphql
@@ -433,6 +433,8 @@ fragment searchResultsWithoutSchemaField on Entity {
             lastName
             fullName
             email
+            departmentName
+            title
         }
         info {
             active
@@ -442,6 +444,8 @@ fragment searchResultsWithoutSchemaField on Entity {
             lastName
             fullName
             email
+            departmentName
+            title
         }
         editableProperties {
             displayName

From 825309ef5d172e38f69c382b712b5122c8d97656 Mon Sep 17 00:00:00 2001
From: BHADHRINATH U <91546378+Bhadhri03@users.noreply.github.com>
Date: Fri, 17 Jan 2025 06:38:55 +0530
Subject: [PATCH 103/249] Fix(UI): Move setUpdatedName call inside updateName
 promise in Dataset name edit (#12232)

Co-authored-by: Raj Tekal <varadaraj_tekal@optum.com>
---
 .../app/entity/shared/containers/profile/header/EntityName.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityName.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityName.tsx
index 8976629d9ef0b1..549724bd1945d9 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityName.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityName.tsx
@@ -48,9 +48,9 @@ function EntityName(props: Props) {
             setIsEditing(false);
             return;
         }
-        setUpdatedName(name);
         updateName({ variables: { input: { name, urn } } })
             .then(() => {
+                setUpdatedName(name);
                 setIsEditing(false);
                 message.success({ content: 'Name Updated', duration: 2 });
                 refetch();

From 99ce309b3780ca2c767c9a1e5e498b58d4e9c89e Mon Sep 17 00:00:00 2001
From: Dmitry Bryazgin <58312247+bda618@users.noreply.github.com>
Date: Thu, 16 Jan 2025 20:10:03 -0500
Subject: [PATCH 104/249] feat(datahub) Remove serialVersionUID from
 constructor (#12150)

---
 .../datahub/graphql/authorization/AuthorizationUtils.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/authorization/AuthorizationUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/authorization/AuthorizationUtils.java
index c25d6af75fe76d..29d1c02dacb416 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/authorization/AuthorizationUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/authorization/AuthorizationUtils.java
@@ -232,6 +232,10 @@ public static <T> T restrictEntity(@Nonnull Object entity, Class<T> clazz) {
     try {
       Object[] args =
           allFields.stream()
+              // New versions of graphql.codegen generate serialVersionUID
+              // We need to filter serialVersionUID out because serialVersionUID is
+              // never part of the entity type constructor
+              .filter(field -> !field.getName().contains("serialVersionUID"))
               .map(
                   field -> {
                     // properties are often not required but only because

From 05ed277f5e3abd72d21dd836808c762b5c852ebe Mon Sep 17 00:00:00 2001
From: Andrew Sikowitz <andrew.sikowitz@acryl.io>
Date: Thu, 16 Jan 2025 22:56:36 -0800
Subject: [PATCH 105/249] feat(graphql/versioning): Add versioning support to
 graphql; mutations return version set (#12358)

Co-authored-by: RyanHolstien <RyanHolstien@users.noreply.github.com>
---
 .../linkedin/datahub/graphql/Constants.java   |   1 +
 .../datahub/graphql/GmsGraphQLEngine.java     |  53 +++-
 .../resolvers/config/AppConfigResolver.java   |   1 +
 .../versioning/LinkAssetVersionResolver.java  |  38 ++-
 .../UnlinkAssetVersionResolver.java           |  19 +-
 .../graphql/resolvers/search/SearchUtils.java | 107 +++++++
 .../versioning/VersionsSearchResolver.java    |  87 ++++++
 .../mappers/SearchFlagsInputMapper.java       |   3 +
 .../common/mappers/UrnToEntityMapper.java     |   6 +
 .../graphql/types/dataset/DatasetType.java    |   3 +-
 .../types/dataset/mappers/DatasetMapper.java  |   7 +
 .../types/mlmodel/mappers/MLModelMapper.java  |   7 +
 .../versioning/VersionPropertiesMapper.java   |  53 ++++
 .../types/versioning/VersionSetMapper.java    |  47 +++
 .../types/versioning/VersionSetType.java      |  79 +++++
 .../src/main/resources/app.graphql            |   7 +-
 .../src/main/resources/entity.graphql         |  65 +---
 .../src/main/resources/search.graphql         |   7 +-
 .../src/main/resources/versioning.graphql     | 148 +++++++++
 .../LinkAssetVersionResolverTest.java         |   3 +-
 .../UnlinkAssetVersionResolverTest.java       |   2 +-
 .../VersionsSearchResolverTest.java           | 294 ++++++++++++++++++
 datahub-web-react/src/Mocks.tsx               |   1 +
 datahub-web-react/src/appConfigContext.tsx    |   1 +
 datahub-web-react/src/graphql/app.graphql     |   1 +
 datahub-web-react/src/graphql/dataset.graphql |   1 +
 datahub-web-react/src/graphql/mlModel.graphql |   1 +
 datahub-web-react/src/graphql/preview.graphql |   5 +
 datahub-web-react/src/graphql/search.graphql  |   5 +
 .../src/graphql/versioning.graphql            |  89 ++++++
 30 files changed, 1055 insertions(+), 86 deletions(-)
 create mode 100644 datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/versioning/VersionsSearchResolver.java
 create mode 100644 datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/versioning/VersionPropertiesMapper.java
 create mode 100644 datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/versioning/VersionSetMapper.java
 create mode 100644 datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/versioning/VersionSetType.java
 create mode 100644 datahub-graphql-core/src/main/resources/versioning.graphql
 create mode 100644 datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/versioning/VersionsSearchResolverTest.java
 create mode 100644 datahub-web-react/src/graphql/versioning.graphql

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/Constants.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/Constants.java
index 69306862a46ef7..aec5352dec1a64 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/Constants.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/Constants.java
@@ -28,6 +28,7 @@ private Constants() {}
   public static final String INCIDENTS_SCHEMA_FILE = "incident.graphql";
   public static final String CONTRACTS_SCHEMA_FILE = "contract.graphql";
   public static final String CONNECTIONS_SCHEMA_FILE = "connection.graphql";
+  public static final String VERSION_SCHEMA_FILE = "versioning.graphql";
   public static final String BROWSE_PATH_DELIMITER = "/";
   public static final String BROWSE_PATH_V2_DELIMITER = "␟";
   public static final String VERSION_STAMP_FIELD_NAME = "versionStamp";
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
index b15db80a8487ae..403e80a71380be 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
@@ -124,6 +124,8 @@
 import com.linkedin.datahub.graphql.generated.TestResult;
 import com.linkedin.datahub.graphql.generated.TypeQualifier;
 import com.linkedin.datahub.graphql.generated.UserUsageCounts;
+import com.linkedin.datahub.graphql.generated.VersionProperties;
+import com.linkedin.datahub.graphql.generated.VersionSet;
 import com.linkedin.datahub.graphql.resolvers.MeResolver;
 import com.linkedin.datahub.graphql.resolvers.assertion.AssertionRunEventResolver;
 import com.linkedin.datahub.graphql.resolvers.assertion.DeleteAssertionResolver;
@@ -324,6 +326,7 @@
 import com.linkedin.datahub.graphql.resolvers.user.ListUsersResolver;
 import com.linkedin.datahub.graphql.resolvers.user.RemoveUserResolver;
 import com.linkedin.datahub.graphql.resolvers.user.UpdateUserStatusResolver;
+import com.linkedin.datahub.graphql.resolvers.versioning.VersionsSearchResolver;
 import com.linkedin.datahub.graphql.resolvers.view.CreateViewResolver;
 import com.linkedin.datahub.graphql.resolvers.view.DeleteViewResolver;
 import com.linkedin.datahub.graphql.resolvers.view.ListGlobalViewsResolver;
@@ -381,6 +384,7 @@
 import com.linkedin.datahub.graphql.types.structuredproperty.StructuredPropertyType;
 import com.linkedin.datahub.graphql.types.tag.TagType;
 import com.linkedin.datahub.graphql.types.test.TestType;
+import com.linkedin.datahub.graphql.types.versioning.VersionSetType;
 import com.linkedin.datahub.graphql.types.view.DataHubViewType;
 import com.linkedin.entity.client.EntityClient;
 import com.linkedin.entity.client.SystemEntityClient;
@@ -537,6 +541,7 @@ public class GmsGraphQLEngine {
   private final IncidentType incidentType;
   private final RestrictedType restrictedType;
   private final DataProcessInstanceType dataProcessInstanceType;
+  private final VersionSetType versionSetType;
 
   private final int graphQLQueryComplexityLimit;
   private final int graphQLQueryDepthLimit;
@@ -658,6 +663,7 @@ public GmsGraphQLEngine(final GmsGraphQLEngineArgs args) {
     this.incidentType = new IncidentType(entityClient);
     this.restrictedType = new RestrictedType(entityClient, restrictedService);
     this.dataProcessInstanceType = new DataProcessInstanceType(entityClient, featureFlags);
+    this.versionSetType = new VersionSetType(entityClient);
 
     this.graphQLQueryComplexityLimit = args.graphQLQueryComplexityLimit;
     this.graphQLQueryDepthLimit = args.graphQLQueryDepthLimit;
@@ -707,6 +713,7 @@ public GmsGraphQLEngine(final GmsGraphQLEngineArgs args) {
                 entityTypeType,
                 formType,
                 incidentType,
+                versionSetType,
                 restrictedType,
                 businessAttributeType,
                 dataProcessInstanceType));
@@ -809,6 +816,8 @@ public void configureRuntimeWiring(final RuntimeWiring.Builder builder) {
     configureConnectionResolvers(builder);
     configureDeprecationResolvers(builder);
     configureMetadataAttributionResolver(builder);
+    configureVersionPropertiesResolvers(builder);
+    configureVersionSetResolvers(builder);
   }
 
   private void configureOrganisationRoleResolvers(RuntimeWiring.Builder builder) {
@@ -863,7 +872,8 @@ public GraphQLEngine.Builder builder() {
         .addSchema(fileBasedSchema(ASSERTIONS_SCHEMA_FILE))
         .addSchema(fileBasedSchema(INCIDENTS_SCHEMA_FILE))
         .addSchema(fileBasedSchema(CONTRACTS_SCHEMA_FILE))
-        .addSchema(fileBasedSchema(COMMON_SCHEMA_FILE));
+        .addSchema(fileBasedSchema(COMMON_SCHEMA_FILE))
+        .addSchema(fileBasedSchema(VERSION_SCHEMA_FILE));
 
     for (GmsGraphQLPlugin plugin : this.graphQLPlugins) {
       List<String> pluginSchemaFiles = plugin.getSchemaFiles();
@@ -1050,6 +1060,7 @@ private void configureQueryResolvers(final RuntimeWiring.Builder builder) {
                 .dataFetcher("form", getResolver(formType))
                 .dataFetcher("view", getResolver(dataHubViewType))
                 .dataFetcher("structuredProperty", getResolver(structuredPropertyType))
+                .dataFetcher("versionSet", getResolver(versionSetType))
                 .dataFetcher("listPolicies", new ListPoliciesResolver(this.entityClient))
                 .dataFetcher("getGrantedPrivileges", new GetGrantedPrivilegesResolver())
                 .dataFetcher("listUsers", new ListUsersResolver(this.entityClient))
@@ -2295,7 +2306,15 @@ private void configureTypeResolvers(final RuntimeWiring.Builder builder) {
         .type(
             "TimeSeriesAspect",
             typeWiring -> typeWiring.typeResolver(new TimeSeriesAspectInterfaceTypeResolver()))
-        .type("ResultsType", typeWiring -> typeWiring.typeResolver(new ResultsTypeResolver()));
+        .type("ResultsType", typeWiring -> typeWiring.typeResolver(new ResultsTypeResolver()))
+        .type(
+            "SupportsVersions",
+            typeWiring ->
+                typeWiring.typeResolver(
+                    new EntityInterfaceTypeResolver(
+                        loadableTypes.stream()
+                            .map(graphType -> (EntityType<?, ?>) graphType)
+                            .collect(Collectors.toList()))));
   }
 
   /** Configures custom type extensions leveraged within our GraphQL schema. */
@@ -3322,4 +3341,34 @@ private void configureMetadataAttributionResolver(final RuntimeWiring.Builder bu
                         entityTypes,
                         (env) -> ((MetadataAttribution) env.getSource()).getSource())));
   }
+
+  private void configureVersionPropertiesResolvers(final RuntimeWiring.Builder builder) {
+    builder.type(
+        "VersionProperties",
+        typeWiring ->
+            typeWiring.dataFetcher(
+                "versionSet",
+                new LoadableTypeResolver<>(
+                    versionSetType,
+                    (env) -> {
+                      final VersionProperties versionProperties = env.getSource();
+                      return versionProperties != null
+                          ? versionProperties.getVersionSet().getUrn()
+                          : null;
+                    })));
+  }
+
+  private void configureVersionSetResolvers(final RuntimeWiring.Builder builder) {
+    builder.type(
+        "VersionSet",
+        typeWiring ->
+            typeWiring
+                .dataFetcher(
+                    "latestVersion",
+                    new EntityTypeResolver(
+                        entityTypes, (env) -> ((VersionSet) env.getSource()).getLatestVersion()))
+                .dataFetcher(
+                    "versionsSearch",
+                    new VersionsSearchResolver(this.entityClient, this.viewService)));
+  }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/config/AppConfigResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/config/AppConfigResolver.java
index 3647eb55b2583a..8cdc13a14be87c 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/config/AppConfigResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/config/AppConfigResolver.java
@@ -189,6 +189,7 @@ public CompletableFuture<AppConfig> get(final DataFetchingEnvironment environmen
             .setEditableDatasetNameEnabled(_featureFlags.isEditableDatasetNameEnabled())
             .setShowSeparateSiblings(_featureFlags.isShowSeparateSiblings())
             .setShowManageStructuredProperties(_featureFlags.isShowManageStructuredProperties())
+            .setEntityVersioningEnabled(_featureFlags.isEntityVersioning())
             .build();
 
     appConfig.setFeatureFlags(featureFlagsConfig);
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/LinkAssetVersionResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/LinkAssetVersionResolver.java
index 69e049af1e87b7..f32fd03a384005 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/LinkAssetVersionResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/LinkAssetVersionResolver.java
@@ -12,7 +12,9 @@
 import com.linkedin.datahub.graphql.concurrency.GraphQLConcurrencyUtils;
 import com.linkedin.datahub.graphql.exception.AuthorizationException;
 import com.linkedin.datahub.graphql.featureflags.FeatureFlags;
+import com.linkedin.datahub.graphql.generated.EntityType;
 import com.linkedin.datahub.graphql.generated.LinkVersionInput;
+import com.linkedin.datahub.graphql.generated.VersionSet;
 import com.linkedin.metadata.entity.IngestResult;
 import com.linkedin.metadata.entity.versioning.EntityVersioningService;
 import com.linkedin.metadata.entity.versioning.VersionPropertiesInput;
@@ -21,24 +23,22 @@
 import io.datahubproject.metadata.context.OperationContext;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 
 /**
  * Currently only supports linking the latest version, but may be modified later to support inserts
  */
-public class LinkAssetVersionResolver implements DataFetcher<CompletableFuture<String>> {
+@Slf4j
+@RequiredArgsConstructor
+public class LinkAssetVersionResolver implements DataFetcher<CompletableFuture<VersionSet>> {
 
   private final EntityVersioningService entityVersioningService;
   private final FeatureFlags featureFlags;
 
-  public LinkAssetVersionResolver(
-      EntityVersioningService entityVersioningService, FeatureFlags featureFlags) {
-    this.entityVersioningService = entityVersioningService;
-    this.featureFlags = featureFlags;
-  }
-
   @Override
-  public CompletableFuture<String> get(DataFetchingEnvironment environment) throws Exception {
+  public CompletableFuture<VersionSet> get(DataFetchingEnvironment environment) throws Exception {
     final QueryContext context = environment.getContext();
     final LinkVersionInput input =
         bindArgument(environment.getArgument("input"), LinkVersionInput.class);
@@ -75,12 +75,22 @@ public CompletableFuture<String> get(DataFetchingEnvironment environment) throws
               entityVersioningService.linkLatestVersion(
                   opContext, versionSetUrn, entityUrn, versionPropertiesInput);
 
-          return linkResults.stream()
-              .filter(
-                  ingestResult -> input.getLinkedEntity().equals(ingestResult.getUrn().toString()))
-              .map(ingestResult -> ingestResult.getUrn().toString())
-              .findAny()
-              .orElse(StringUtils.EMPTY);
+          String successVersionSetUrn =
+              linkResults.stream()
+                  .filter(
+                      ingestResult ->
+                          input.getLinkedEntity().equals(ingestResult.getUrn().toString()))
+                  .map(ingestResult -> ingestResult.getUrn().toString())
+                  .findAny()
+                  .orElse(StringUtils.EMPTY);
+
+          if (StringUtils.isEmpty(successVersionSetUrn)) {
+            return null;
+          }
+          VersionSet versionSet = new VersionSet();
+          versionSet.setUrn(versionSetUrn.toString());
+          versionSet.setType(EntityType.VERSION_SET);
+          return versionSet;
         },
         this.getClass().getSimpleName(),
         "get");
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/UnlinkAssetVersionResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/UnlinkAssetVersionResolver.java
index 3d5027a0d668ac..33ab83a59c6771 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/UnlinkAssetVersionResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/UnlinkAssetVersionResolver.java
@@ -12,14 +12,18 @@
 import com.linkedin.datahub.graphql.concurrency.GraphQLConcurrencyUtils;
 import com.linkedin.datahub.graphql.exception.AuthorizationException;
 import com.linkedin.datahub.graphql.featureflags.FeatureFlags;
+import com.linkedin.datahub.graphql.generated.EntityType;
 import com.linkedin.datahub.graphql.generated.UnlinkVersionInput;
+import com.linkedin.datahub.graphql.generated.VersionSet;
+import com.linkedin.metadata.entity.RollbackResult;
 import com.linkedin.metadata.entity.versioning.EntityVersioningService;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import io.datahubproject.metadata.context.OperationContext;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-public class UnlinkAssetVersionResolver implements DataFetcher<CompletableFuture<Boolean>> {
+public class UnlinkAssetVersionResolver implements DataFetcher<CompletableFuture<VersionSet>> {
 
   private final EntityVersioningService entityVersioningService;
   private final FeatureFlags featureFlags;
@@ -31,7 +35,7 @@ public UnlinkAssetVersionResolver(
   }
 
   @Override
-  public CompletableFuture<Boolean> get(DataFetchingEnvironment environment) throws Exception {
+  public CompletableFuture<VersionSet> get(DataFetchingEnvironment environment) throws Exception {
     if (!featureFlags.isEntityVersioning()) {
       throw new IllegalAccessError(
           "Entity Versioning is not configured, please enable before attempting to use this feature.");
@@ -58,8 +62,15 @@ public CompletableFuture<Boolean> get(DataFetchingEnvironment environment) throw
     }
     return GraphQLConcurrencyUtils.supplyAsync(
         () -> {
-          entityVersioningService.unlinkVersion(opContext, versionSetUrn, entityUrn);
-          return true;
+          List<RollbackResult> results =
+              entityVersioningService.unlinkVersion(opContext, versionSetUrn, entityUrn);
+          if (results.isEmpty() || results.stream().allMatch(RollbackResult::isNoOp)) {
+            return null;
+          }
+          VersionSet versionSet = new VersionSet();
+          versionSet.setUrn(versionSetUrn.toString());
+          versionSet.setType(EntityType.VERSION_SET);
+          return versionSet;
         },
         this.getClass().getSimpleName(),
         "get");
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java
index a01b3aaec9c982..f105a72a1273ee 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java
@@ -18,13 +18,18 @@
 
 import com.google.common.collect.ImmutableList;
 import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.concurrency.GraphQLConcurrencyUtils;
 import com.linkedin.datahub.graphql.generated.EntityType;
 import com.linkedin.datahub.graphql.generated.FacetFilterInput;
 import com.linkedin.datahub.graphql.generated.SearchResults;
 import com.linkedin.datahub.graphql.generated.SearchSortInput;
+import com.linkedin.datahub.graphql.resolvers.ResolverUtils;
 import com.linkedin.datahub.graphql.types.common.mappers.SearchFlagsInputMapper;
 import com.linkedin.datahub.graphql.types.entitytype.EntityTypeMapper;
+import com.linkedin.datahub.graphql.types.mappers.UrnSearchResultsMapper;
+import com.linkedin.entity.client.EntityClient;
 import com.linkedin.metadata.query.SearchFlags;
 import com.linkedin.metadata.query.filter.ConjunctiveCriterion;
 import com.linkedin.metadata.query.filter.ConjunctiveCriterionArray;
@@ -33,24 +38,32 @@
 import com.linkedin.metadata.query.filter.Filter;
 import com.linkedin.metadata.query.filter.SortCriterion;
 import com.linkedin.metadata.query.filter.SortOrder;
+import com.linkedin.metadata.search.SearchResult;
 import com.linkedin.metadata.service.ViewService;
 import com.linkedin.view.DataHubViewInfo;
 import io.datahubproject.metadata.context.OperationContext;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.codehaus.plexus.util.CollectionUtils;
 
 @Slf4j
 public class SearchUtils {
   private SearchUtils() {}
 
+  private static final int DEFAULT_SEARCH_COUNT = 10;
+  private static final int DEFAULT_SCROLL_COUNT = 10;
+  private static final String DEFAULT_SCROLL_KEEP_ALIVE = "5m";
+
   /** Entities that are searched by default in Search Across Entities */
   public static final List<EntityType> SEARCHABLE_ENTITY_TYPES =
       ImmutableList.of(
@@ -348,4 +361,98 @@ public static List<SortCriterion> getSortCriteria(@Nullable final SearchSortInpu
 
     return sortCriteria;
   }
+
+  public static CompletableFuture<SearchResults> searchAcrossEntities(
+      QueryContext inputContext,
+      final EntityClient _entityClient,
+      final ViewService _viewService,
+      List<EntityType> inputEntityTypes,
+      String inputQuery,
+      Filter baseFilter,
+      String viewUrn,
+      List<SortCriterion> sortCriteria,
+      com.linkedin.datahub.graphql.generated.SearchFlags inputSearchFlags,
+      Integer inputCount,
+      Integer inputStart,
+      String className) {
+
+    final List<EntityType> entityTypes =
+        (inputEntityTypes == null || inputEntityTypes.isEmpty())
+            ? SEARCHABLE_ENTITY_TYPES
+            : inputEntityTypes;
+    final List<String> entityNames =
+        entityTypes.stream().map(EntityTypeMapper::getName).collect(Collectors.toList());
+
+    // escape forward slash since it is a reserved character in Elasticsearch, default to * if
+    // blank/empty
+    final String query =
+        StringUtils.isNotBlank(inputQuery) ? ResolverUtils.escapeForwardSlash(inputQuery) : "*";
+
+    final Optional<SearchFlags> searchFlags =
+        Optional.ofNullable(inputSearchFlags)
+            .map((flags) -> SearchFlagsInputMapper.map(inputContext, flags));
+    final OperationContext context =
+        inputContext.getOperationContext().withSearchFlags(searchFlags::orElse);
+
+    final int count = Optional.ofNullable(inputCount).orElse(DEFAULT_SEARCH_COUNT);
+    final int start = Optional.ofNullable(inputStart).orElse(0);
+
+    return GraphQLConcurrencyUtils.supplyAsync(
+        () -> {
+          final OperationContext baseContext = inputContext.getOperationContext();
+          final Optional<DataHubViewInfo> maybeResolvedView =
+              Optional.ofNullable(viewUrn)
+                  .map((urn) -> resolveView(baseContext, _viewService, UrnUtils.getUrn(urn)));
+
+          final List<String> finalEntityNames =
+              maybeResolvedView
+                  .map(
+                      (view) ->
+                          intersectEntityTypes(entityNames, view.getDefinition().getEntityTypes()))
+                  .orElse(entityNames);
+
+          final Filter finalFilters =
+              maybeResolvedView
+                  .map((view) -> combineFilters(baseFilter, view.getDefinition().getFilter()))
+                  .orElse(baseFilter);
+
+          log.debug(
+              "Executing search for multiple entities: entity types {}, query {}, filters: {}, start: {}, count: {}",
+              finalEntityNames,
+              query,
+              finalFilters,
+              start,
+              count);
+
+          try {
+            final SearchResult searchResult =
+                _entityClient.searchAcrossEntities(
+                    context,
+                    finalEntityNames,
+                    query,
+                    finalFilters,
+                    start,
+                    count,
+                    sortCriteria,
+                    null);
+            return UrnSearchResultsMapper.map(inputContext, searchResult);
+          } catch (Exception e) {
+            log.warn(
+                "Failed to execute search for multiple entities: entity types {}, query {}, filters: {}, start: {}, count: {}",
+                finalEntityNames,
+                query,
+                finalFilters,
+                start,
+                count);
+            throw new RuntimeException(
+                "Failed to execute search: "
+                    + String.format(
+                        "entity types %s, query %s, filters: %s, start: %s, count: %s",
+                        finalEntityNames, query, finalFilters, start, count),
+                e);
+          }
+        },
+        className,
+        "searchAcrossEntities");
+  }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/versioning/VersionsSearchResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/versioning/VersionsSearchResolver.java
new file mode 100644
index 00000000000000..915e1cf00ebc6b
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/versioning/VersionsSearchResolver.java
@@ -0,0 +1,87 @@
+package com.linkedin.datahub.graphql.resolvers.versioning;
+
+import static com.linkedin.datahub.graphql.resolvers.ResolverUtils.bindArgument;
+import static com.linkedin.metadata.Constants.*;
+
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.generated.Entity;
+import com.linkedin.datahub.graphql.generated.SearchAcrossEntitiesInput;
+import com.linkedin.datahub.graphql.generated.SearchFlags;
+import com.linkedin.datahub.graphql.generated.SearchResults;
+import com.linkedin.datahub.graphql.resolvers.ResolverUtils;
+import com.linkedin.datahub.graphql.resolvers.search.SearchUtils;
+import com.linkedin.entity.client.EntityClient;
+import com.linkedin.metadata.query.filter.Condition;
+import com.linkedin.metadata.query.filter.ConjunctiveCriterion;
+import com.linkedin.metadata.query.filter.ConjunctiveCriterionArray;
+import com.linkedin.metadata.query.filter.Criterion;
+import com.linkedin.metadata.query.filter.CriterionArray;
+import com.linkedin.metadata.query.filter.Filter;
+import com.linkedin.metadata.query.filter.SortCriterion;
+import com.linkedin.metadata.query.filter.SortOrder;
+import com.linkedin.metadata.service.ViewService;
+import com.linkedin.metadata.utils.CriterionUtils;
+import graphql.schema.DataFetcher;
+import graphql.schema.DataFetchingEnvironment;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Stream;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/** Resolver that executes a searchAcrossEntities only on a version set's versioned entities */
+@Slf4j
+@RequiredArgsConstructor
+public class VersionsSearchResolver implements DataFetcher<CompletableFuture<SearchResults>> {
+
+  private static final String VERSION_SET_FIELD_NAME = "versionSet";
+
+  private final EntityClient _entityClient;
+  private final ViewService _viewService;
+
+  @Override
+  public CompletableFuture<SearchResults> get(DataFetchingEnvironment environment) {
+    final Entity entity = environment.getSource();
+    final QueryContext context = environment.getContext();
+    final SearchAcrossEntitiesInput input =
+        bindArgument(environment.getArgument("input"), SearchAcrossEntitiesInput.class);
+
+    final Criterion versionSetFilter =
+        CriterionUtils.buildCriterion(VERSION_SET_FIELD_NAME, Condition.EQUAL, entity.getUrn());
+    final Filter baseFilter =
+        new Filter()
+            .setOr(
+                new ConjunctiveCriterionArray(
+                    new ConjunctiveCriterion().setAnd(new CriterionArray(versionSetFilter))));
+    final Filter inputFilter = ResolverUtils.buildFilter(null, input.getOrFilters());
+
+    final List<SortCriterion> initialSortCriteria =
+        SearchUtils.getSortCriteria(input.getSortInput());
+    final List<SortCriterion> sortCriteria =
+        Stream.concat(
+                initialSortCriteria.stream(),
+                Stream.of(
+                    new SortCriterion()
+                        .setField(VERSION_SORT_ID_FIELD_NAME)
+                        .setOrder(SortOrder.DESCENDING)))
+            .toList();
+
+    SearchFlags searchFlags = Optional.ofNullable(input.getSearchFlags()).orElse(new SearchFlags());
+    searchFlags.setFilterNonLatestVersions(false);
+
+    return SearchUtils.searchAcrossEntities(
+        context,
+        _entityClient,
+        _viewService,
+        input.getTypes(),
+        input.getQuery(),
+        SearchUtils.combineFilters(inputFilter, baseFilter),
+        input.getViewUrn(),
+        sortCriteria,
+        searchFlags,
+        input.getCount(),
+        input.getStart(),
+        this.getClass().getSimpleName());
+  }
+}
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/SearchFlagsInputMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/SearchFlagsInputMapper.java
index 9f5025ccf303a2..0b3a445175c4c1 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/SearchFlagsInputMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/SearchFlagsInputMapper.java
@@ -69,6 +69,9 @@ public com.linkedin.metadata.query.SearchFlags apply(
       result.setCustomHighlightingFields(
           new StringArray(searchFlags.getCustomHighlightingFields()));
     }
+    if (searchFlags.getFilterNonLatestVersions() != null) {
+      result.setFilterNonLatestVersions(searchFlags.getFilterNonLatestVersions());
+    }
     return result;
   }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/UrnToEntityMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/UrnToEntityMapper.java
index eae33e6da2e56d..b815c1b1c1dd9f 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/UrnToEntityMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/UrnToEntityMapper.java
@@ -41,6 +41,7 @@
 import com.linkedin.datahub.graphql.generated.StructuredPropertyEntity;
 import com.linkedin.datahub.graphql.generated.Tag;
 import com.linkedin.datahub.graphql.generated.Test;
+import com.linkedin.datahub.graphql.generated.VersionSet;
 import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -231,6 +232,11 @@ public Entity apply(@Nullable QueryContext context, Urn input) {
       ((DataProcessInstance) partialEntity).setUrn(input.toString());
       ((DataProcessInstance) partialEntity).setType(EntityType.DATA_PROCESS_INSTANCE);
     }
+    if (input.getEntityType().equals(VERSION_SET_ENTITY_NAME)) {
+      partialEntity = new VersionSet();
+      ((VersionSet) partialEntity).setUrn(input.toString());
+      ((VersionSet) partialEntity).setType(EntityType.VERSION_SET);
+    }
     return partialEntity;
   }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/DatasetType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/DatasetType.java
index 6a3f9cb9b21f38..74ef4cf125cd24 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/DatasetType.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/DatasetType.java
@@ -89,7 +89,8 @@ public class DatasetType
           ACCESS_ASPECT_NAME,
           STRUCTURED_PROPERTIES_ASPECT_NAME,
           FORMS_ASPECT_NAME,
-          SUB_TYPES_ASPECT_NAME);
+          SUB_TYPES_ASPECT_NAME,
+          VERSION_PROPERTIES_ASPECT_NAME);
 
   private static final Set<String> FACET_FIELDS = ImmutableSet.of("origin", "platform");
   private static final String ENTITY_NAME = "dataset";
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetMapper.java
index e411014c23c89b..aa7033b180e80e 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetMapper.java
@@ -17,6 +17,7 @@
 import com.linkedin.common.Status;
 import com.linkedin.common.SubTypes;
 import com.linkedin.common.TimeStamp;
+import com.linkedin.common.VersionProperties;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.data.DataMap;
 import com.linkedin.datahub.graphql.QueryContext;
@@ -48,6 +49,7 @@
 import com.linkedin.datahub.graphql.types.rolemetadata.mappers.AccessMapper;
 import com.linkedin.datahub.graphql.types.structuredproperty.StructuredPropertiesMapper;
 import com.linkedin.datahub.graphql.types.tag.mappers.GlobalTagsMapper;
+import com.linkedin.datahub.graphql.types.versioning.VersionPropertiesMapper;
 import com.linkedin.dataset.DatasetDeprecation;
 import com.linkedin.dataset.DatasetProperties;
 import com.linkedin.dataset.EditableDatasetProperties;
@@ -183,6 +185,11 @@ public Dataset apply(
         SUB_TYPES_ASPECT_NAME,
         (dashboard, dataMap) ->
             dashboard.setSubTypes(SubTypesMapper.map(context, new SubTypes(dataMap))));
+    mappingHelper.mapToResult(
+        VERSION_PROPERTIES_ASPECT_NAME,
+        (entity, dataMap) ->
+            entity.setVersionProperties(
+                VersionPropertiesMapper.map(context, new VersionProperties(dataMap))));
 
     if (context != null && !canView(context.getOperationContext(), entityUrn)) {
       return AuthorizationUtils.restrictEntity(mappingHelper.getResult(), Dataset.class);
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelMapper.java
index 7102fd4aed9743..11e6b5180f8c1c 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelMapper.java
@@ -13,6 +13,7 @@
 import com.linkedin.common.InstitutionalMemory;
 import com.linkedin.common.Ownership;
 import com.linkedin.common.Status;
+import com.linkedin.common.VersionProperties;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.data.DataMap;
 import com.linkedin.data.template.RecordTemplate;
@@ -38,6 +39,7 @@
 import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
 import com.linkedin.datahub.graphql.types.structuredproperty.StructuredPropertiesMapper;
 import com.linkedin.datahub.graphql.types.tag.mappers.GlobalTagsMapper;
+import com.linkedin.datahub.graphql.types.versioning.VersionPropertiesMapper;
 import com.linkedin.domain.Domains;
 import com.linkedin.entity.EntityResponse;
 import com.linkedin.entity.EnvelopedAspectMap;
@@ -180,6 +182,11 @@ public MLModel apply(
         FORMS_ASPECT_NAME,
         ((entity, dataMap) ->
             entity.setForms(FormsMapper.map(new Forms(dataMap), entityUrn.toString()))));
+    mappingHelper.mapToResult(
+        VERSION_PROPERTIES_ASPECT_NAME,
+        (entity, dataMap) ->
+            entity.setVersionProperties(
+                VersionPropertiesMapper.map(context, new VersionProperties(dataMap))));
 
     if (context != null && !canView(context.getOperationContext(), entityUrn)) {
       return AuthorizationUtils.restrictEntity(mappingHelper.getResult(), MLModel.class);
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/versioning/VersionPropertiesMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/versioning/VersionPropertiesMapper.java
new file mode 100644
index 00000000000000..f89ebdc9f2b043
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/versioning/VersionPropertiesMapper.java
@@ -0,0 +1,53 @@
+package com.linkedin.datahub.graphql.types.versioning;
+
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.datahub.graphql.generated.VersionProperties;
+import com.linkedin.datahub.graphql.generated.VersionSet;
+import com.linkedin.datahub.graphql.types.mappers.MapperUtils;
+import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
+import com.linkedin.datahub.graphql.types.mlmodel.mappers.VersionTagMapper;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class VersionPropertiesMapper
+    implements ModelMapper<com.linkedin.common.VersionProperties, VersionProperties> {
+  public static final VersionPropertiesMapper INSTANCE = new VersionPropertiesMapper();
+
+  public static VersionProperties map(
+      @Nullable QueryContext context,
+      @Nonnull final com.linkedin.common.VersionProperties versionProperties) {
+    return INSTANCE.apply(context, versionProperties);
+  }
+
+  @Override
+  public VersionProperties apply(
+      @Nullable QueryContext context, @Nonnull com.linkedin.common.VersionProperties input) {
+    final VersionProperties result = new VersionProperties();
+
+    result.setVersionSet(
+        VersionSet.builder()
+            .setUrn(input.getVersionSet().toString())
+            .setType(EntityType.VERSION_SET)
+            .build());
+
+    result.setVersion(VersionTagMapper.map(context, input.getVersion()));
+    result.setAliases(
+        input.getAliases().stream()
+            .map(alias -> VersionTagMapper.map(context, alias))
+            .collect(Collectors.toList()));
+    result.setComment(input.getComment());
+    result.setIsLatest(Boolean.TRUE.equals(input.isIsLatest()));
+
+    if (input.getMetadataCreatedTimestamp() != null) {
+      result.setCreated(MapperUtils.createResolvedAuditStamp(input.getMetadataCreatedTimestamp()));
+    }
+    if (input.getSourceCreatedTimestamp() != null) {
+      result.setCreatedInSource(
+          MapperUtils.createResolvedAuditStamp(input.getSourceCreatedTimestamp()));
+    }
+
+    return result;
+  }
+}
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/versioning/VersionSetMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/versioning/VersionSetMapper.java
new file mode 100644
index 00000000000000..3a07115ece5f6e
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/versioning/VersionSetMapper.java
@@ -0,0 +1,47 @@
+package com.linkedin.datahub.graphql.types.versioning;
+
+import static com.linkedin.metadata.Constants.VERSION_SET_PROPERTIES_ASPECT_NAME;
+
+import com.linkedin.data.DataMap;
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.datahub.graphql.generated.VersionSet;
+import com.linkedin.datahub.graphql.types.common.mappers.UrnToEntityMapper;
+import com.linkedin.datahub.graphql.types.common.mappers.util.MappingHelper;
+import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
+import com.linkedin.entity.EntityResponse;
+import com.linkedin.entity.EnvelopedAspectMap;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class VersionSetMapper implements ModelMapper<EntityResponse, VersionSet> {
+
+  public static final VersionSetMapper INSTANCE = new VersionSetMapper();
+
+  public static VersionSet map(
+      @Nullable QueryContext context, @Nonnull final EntityResponse entityResponse) {
+    return INSTANCE.apply(context, entityResponse);
+  }
+
+  @Override
+  public VersionSet apply(@Nullable QueryContext context, @Nonnull EntityResponse entityResponse) {
+    final VersionSet result = new VersionSet();
+    result.setUrn(entityResponse.getUrn().toString());
+    result.setType(EntityType.VERSION_SET);
+
+    EnvelopedAspectMap aspectMap = entityResponse.getAspects();
+    MappingHelper<VersionSet> mappingHelper = new MappingHelper<>(aspectMap, result);
+    mappingHelper.mapToResult(
+        VERSION_SET_PROPERTIES_ASPECT_NAME,
+        (versionSet, dataMap) -> mapVersionSetProperties(context, versionSet, dataMap));
+
+    return result;
+  }
+
+  private void mapVersionSetProperties(
+      @Nullable QueryContext context, @Nonnull VersionSet versionSet, @Nonnull DataMap dataMap) {
+    com.linkedin.versionset.VersionSetProperties versionProperties =
+        new com.linkedin.versionset.VersionSetProperties(dataMap);
+    versionSet.setLatestVersion(UrnToEntityMapper.map(context, versionProperties.getLatest()));
+  }
+}
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/versioning/VersionSetType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/versioning/VersionSetType.java
new file mode 100644
index 00000000000000..ed2beff4530949
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/versioning/VersionSetType.java
@@ -0,0 +1,79 @@
+package com.linkedin.datahub.graphql.types.versioning;
+
+import static com.linkedin.metadata.Constants.*;
+
+import com.google.common.collect.ImmutableSet;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.generated.Entity;
+import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.datahub.graphql.generated.VersionSet;
+import com.linkedin.entity.EntityResponse;
+import com.linkedin.entity.client.EntityClient;
+import graphql.execution.DataFetcherResult;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class VersionSetType
+    implements com.linkedin.datahub.graphql.types.EntityType<VersionSet, String> {
+
+  public static final Set<String> ASPECTS_TO_FETCH =
+      ImmutableSet.of(VERSION_SET_PROPERTIES_ASPECT_NAME);
+  private final EntityClient _entityClient;
+
+  @Override
+  public EntityType type() {
+    return EntityType.VERSION_SET;
+  }
+
+  @Override
+  public Function<Entity, String> getKeyProvider() {
+    return Entity::getUrn;
+  }
+
+  @Override
+  public Class<VersionSet> objectClass() {
+    return VersionSet.class;
+  }
+
+  @Override
+  public List<DataFetcherResult<VersionSet>> batchLoad(
+      @Nonnull List<String> urns, @Nonnull QueryContext context) throws Exception {
+    final List<Urn> versionSetUrns =
+        urns.stream().map(UrnUtils::getUrn).collect(Collectors.toList());
+
+    try {
+      final Map<Urn, EntityResponse> entities =
+          _entityClient.batchGetV2(
+              context.getOperationContext(),
+              VERSION_SET_ENTITY_NAME,
+              new HashSet<>(versionSetUrns),
+              ASPECTS_TO_FETCH);
+
+      final List<EntityResponse> gmsResults = new ArrayList<>();
+      for (Urn urn : versionSetUrns) {
+        gmsResults.add(entities.getOrDefault(urn, null));
+      }
+      return gmsResults.stream()
+          .map(
+              gmsResult ->
+                  gmsResult == null
+                      ? null
+                      : DataFetcherResult.<VersionSet>newResult()
+                          .data(VersionSetMapper.map(context, gmsResult))
+                          .build())
+          .collect(Collectors.toList());
+    } catch (Exception e) {
+      throw new RuntimeException("Failed to batch load Queries", e);
+    }
+  }
+}
diff --git a/datahub-graphql-core/src/main/resources/app.graphql b/datahub-graphql-core/src/main/resources/app.graphql
index 28688903687235..ca7f89415f6b87 100644
--- a/datahub-graphql-core/src/main/resources/app.graphql
+++ b/datahub-graphql-core/src/main/resources/app.graphql
@@ -531,6 +531,11 @@ type FeatureFlagsConfig {
   If turned on, show the manage structured properties tab in the govern dropdown
   """
   showManageStructuredProperties: Boolean!
+
+  """
+  If turned on, exposes the versioning feature by allowing users to link entities in the UI.
+  """
+  entityVersioningEnabled: Boolean!
 }
 
 """
@@ -573,4 +578,4 @@ type DocPropagationSettings {
   The default doc propagation setting for the platform.
   """
   docColumnPropagation: Boolean
-}
\ No newline at end of file
+}
diff --git a/datahub-graphql-core/src/main/resources/entity.graphql b/datahub-graphql-core/src/main/resources/entity.graphql
index b47be7ae32b2c4..51909ae72c56b0 100644
--- a/datahub-graphql-core/src/main/resources/entity.graphql
+++ b/datahub-graphql-core/src/main/resources/entity.graphql
@@ -956,16 +956,6 @@ type Mutation {
     Remove Business Attribute
     """
     removeBusinessAttribute(input: AddBusinessAttributeInput!): Boolean
-
-    """
-    Link the latest versioned entity to a Version Set
-    """
-    linkAssetVersion(input: LinkVersionInput!): String
-
-    """
-    Unlink a versioned entity from a Version Set
-    """
-    unlinkAssetVersion(input: UnlinkVersionInput!): Boolean
 }
 
 """
@@ -1231,6 +1221,11 @@ enum EntityType {
     A Business Attribute
     """
     BUSINESS_ATTRIBUTE
+
+    """
+    A set of versioned entities, representing a single source / logical entity over time
+    """
+    VERSION_SET
 }
 
 """
@@ -12921,56 +12916,6 @@ input ListBusinessAttributesInput {
     query: String
 }
 
-"""
-Input for linking a versioned entity to a Version Set
-"""
-input LinkVersionInput {
-    """
-    The target version set
-    """
-    versionSet: String!
-
-    """
-    The target versioned entity to link
-    """
-    linkedEntity: String!
-
-    """
-    Version Tag label for the version, should be unique within a Version Set
-    """
-    version: String!
-
-    """
-    Optional timestamp from the source system
-    """
-    sourceTimestamp: Long
-
-    """
-    Optional creator from the source system, will be converted to an Urn
-    """
-    sourceCreator: String
-
-    """
-    Optional comment about the version
-    """
-    comment: String
-}
-
-"""
-Input for unlinking a versioned entity from a Version Set
-"""
-input UnlinkVersionInput {
-    """
-    The target version set
-    """
-    versionSet: String
-
-    """
-    The target versioned entity to unlink
-    """
-    unlinkedEntity: String
-}
-
 """
 The result obtained when listing Business Attribute
 """
diff --git a/datahub-graphql-core/src/main/resources/search.graphql b/datahub-graphql-core/src/main/resources/search.graphql
index 82bfb9ee26fc42..d8f17faa3d11c2 100644
--- a/datahub-graphql-core/src/main/resources/search.graphql
+++ b/datahub-graphql-core/src/main/resources/search.graphql
@@ -172,6 +172,11 @@ input  SearchFlags {
   Whether or not to fetch and request for structured property facets when doing a search
   """
   includeStructuredPropertyFacets: Boolean
+
+  """
+  Determines whether to filter out any non-latest entity version if entity is part of a Version Set, default true
+  """
+  filterNonLatestVersions: Boolean
 }
 
 """
@@ -1497,4 +1502,4 @@ input GroupingCriterion {
   """
   groupingEntityType: EntityType!
 
-}
\ No newline at end of file
+}
diff --git a/datahub-graphql-core/src/main/resources/versioning.graphql b/datahub-graphql-core/src/main/resources/versioning.graphql
new file mode 100644
index 00000000000000..4a63463509c84d
--- /dev/null
+++ b/datahub-graphql-core/src/main/resources/versioning.graphql
@@ -0,0 +1,148 @@
+type VersionSet implements Entity {
+    """
+    The primary key of the VersionSet
+    """
+    urn: String!
+
+    """
+    The standard Entity Type
+    """
+    type: EntityType!
+
+    """
+    Granular API for querying edges extending from this entity
+    """
+    relationships(input: RelationshipsInput!): EntityRelationshipsResult
+
+    """
+    The latest versioned entity linked to in this version set
+    """
+    latestVersion: Entity
+
+    """
+    Executes a search on all versioned entities linked to this version set
+    By default sorts by sortId in descending order
+    """
+    versionsSearch(input: SearchAcrossEntitiesInput!): SearchResults
+}
+
+type VersionProperties {
+    """
+    The linked Version Set entity that ties multiple versioned assets together
+    """
+    versionSet: VersionSet!
+
+    """
+    Label for this versioned asset, should be unique within a version set (not enforced)
+    """
+    version: VersionTag!
+
+    """
+    Additional version identifiers for this versioned asset.
+    """
+    aliases: [VersionTag!]!
+
+    """
+    Comment documenting what this version was created for, changes, or represents
+    """
+    comment: String
+
+    """
+    Whether this version is currently the latest in its verison set
+    """
+    isLatest: Boolean!
+
+    """
+    Timestamp reflecting when the metadata for this version was created in DataHub
+    """
+    created: ResolvedAuditStamp
+
+    """
+    Timestamp reflecting when the metadata for this version was created in DataHub
+    """
+    createdInSource: ResolvedAuditStamp
+}
+
+interface SupportsVersions {
+    """
+    Indicates that this entity is versioned and provides information about the version.
+    """
+    versionProperties: VersionProperties
+}
+
+extend type Dataset implements SupportsVersions {
+    versionProperties: VersionProperties
+}
+
+extend type MLModel implements SupportsVersions {
+    versionProperties: VersionProperties
+}
+
+extend type Query {
+    """
+    Fetch a Version Set by its URN
+    """
+    versionSet(urn: String!): VersionSet
+}
+
+"""
+Input for linking a versioned entity to a Version Set
+"""
+input LinkVersionInput {
+    """
+    The target version set
+    """
+    versionSet: String!
+
+    """
+    The target versioned entity to link
+    """
+    linkedEntity: String!
+
+    """
+    Version Tag label for the version, should be unique within a version set (not enforced)
+    """
+    version: String!
+
+    """
+    Optional timestamp from the source system
+    """
+    sourceTimestamp: Long
+
+    """
+    Optional creator from the source system, will be converted to an Urn
+    """
+    sourceCreator: String
+
+    """
+    Optional comment about the version
+    """
+    comment: String
+}
+
+"""
+Input for unlinking a versioned entity from a Version Set
+"""
+input UnlinkVersionInput {
+    """
+    The target version set
+    """
+    versionSet: String
+
+    """
+    The target versioned entity to unlink
+    """
+    unlinkedEntity: String
+}
+
+extend type Mutation {
+    """
+    Link the latest versioned entity to a Version Set
+    """
+    linkAssetVersion(input: LinkVersionInput!): VersionSet
+
+    """
+    Unlink a versioned entity from a Version Set
+    """
+    unlinkAssetVersion(input: UnlinkVersionInput!): VersionSet
+}
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/LinkAssetVersionResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/LinkAssetVersionResolverTest.java
index 690856263fccc5..c2eb92f4d1cd4c 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/LinkAssetVersionResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/LinkAssetVersionResolverTest.java
@@ -56,8 +56,7 @@ public void testGetSuccessful() throws Exception {
     Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
     Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
 
-    String result = resolver.get(mockEnv).get();
-    assertEquals(result, TEST_ENTITY_URN);
+    assertEquals(resolver.get(mockEnv).get().getUrn(), TEST_VERSION_SET_URN);
   }
 
   @Test
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/UnlinkAssetVersionResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/UnlinkAssetVersionResolverTest.java
index 0000ad24a04537..e162ce96e627c6 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/UnlinkAssetVersionResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/entity/versioning/UnlinkAssetVersionResolverTest.java
@@ -48,7 +48,7 @@ public void testGetSuccessful() throws Exception {
     Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
     Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
 
-    assertTrue(resolver.get(mockEnv).get());
+    assertEquals(resolver.get(mockEnv).get(), null);
 
     Mockito.verify(mockService)
         .unlinkVersion(
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/versioning/VersionsSearchResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/versioning/VersionsSearchResolverTest.java
new file mode 100644
index 00000000000000..3554df074df698
--- /dev/null
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/versioning/VersionsSearchResolverTest.java
@@ -0,0 +1,294 @@
+package com.linkedin.datahub.graphql.resolvers.versioning;
+
+import static com.linkedin.datahub.graphql.TestUtils.getMockAllowContext;
+import static com.linkedin.metadata.Constants.*;
+import static com.linkedin.metadata.utils.CriterionUtils.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
+
+import com.linkedin.common.AuditStamp;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.data.template.StringArray;
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.generated.AndFilterInput;
+import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.datahub.graphql.generated.FacetFilterInput;
+import com.linkedin.datahub.graphql.generated.SearchAcrossEntitiesInput;
+import com.linkedin.datahub.graphql.generated.SearchFlags;
+import com.linkedin.datahub.graphql.generated.SearchResults;
+import com.linkedin.datahub.graphql.generated.SearchSortInput;
+import com.linkedin.datahub.graphql.generated.SortCriterion;
+import com.linkedin.datahub.graphql.generated.SortOrder;
+import com.linkedin.datahub.graphql.generated.VersionSet;
+import com.linkedin.entity.client.EntityClient;
+import com.linkedin.metadata.Constants;
+import com.linkedin.metadata.query.filter.Condition;
+import com.linkedin.metadata.query.filter.ConjunctiveCriterion;
+import com.linkedin.metadata.query.filter.ConjunctiveCriterionArray;
+import com.linkedin.metadata.query.filter.CriterionArray;
+import com.linkedin.metadata.query.filter.Filter;
+import com.linkedin.metadata.search.SearchEntityArray;
+import com.linkedin.metadata.search.SearchResult;
+import com.linkedin.metadata.search.SearchResultMetadata;
+import com.linkedin.metadata.service.ViewService;
+import com.linkedin.metadata.utils.CriterionUtils;
+import com.linkedin.r2.RemoteInvocationException;
+import com.linkedin.view.DataHubViewDefinition;
+import com.linkedin.view.DataHubViewInfo;
+import com.linkedin.view.DataHubViewType;
+import graphql.schema.DataFetchingEnvironment;
+import java.util.List;
+import java.util.concurrent.CompletionException;
+import org.mockito.Mockito;
+import org.testng.annotations.Test;
+
+public class VersionsSearchResolverTest {
+
+  private static final String VERSION_SET_URN = "urn:li:versionSet:(my_version_set,dataset)";
+  private static final Urn TEST_VIEW_URN = UrnUtils.getUrn("urn:li:dataHubView:test");
+  private static final Urn TEST_USER_URN = UrnUtils.getUrn("urn:li:corpuser:test");
+
+  private static final SearchAcrossEntitiesInput BASIC_INPUT =
+      new SearchAcrossEntitiesInput(
+          List.of(EntityType.DATASET), "", 0, 10, null, null, null, null, null);
+
+  private static final SearchAcrossEntitiesInput COMPLEX_INPUT =
+      new SearchAcrossEntitiesInput(
+          List.of(EntityType.CHART, EntityType.DATASET),
+          "query",
+          2,
+          5,
+          null,
+          List.of(
+              AndFilterInput.builder()
+                  .setAnd(
+                      List.of(
+                          FacetFilterInput.builder()
+                              .setField("field1")
+                              .setValues(List.of("1", "2"))
+                              .build(),
+                          FacetFilterInput.builder()
+                              .setField("field2")
+                              .setValues(List.of("a"))
+                              .build()))
+                  .build(),
+              AndFilterInput.builder()
+                  .setAnd(
+                      List.of(
+                          FacetFilterInput.builder()
+                              .setField("field3")
+                              .setValues(List.of("3", "4"))
+                              .build(),
+                          FacetFilterInput.builder()
+                              .setField("field4")
+                              .setValues(List.of("b"))
+                              .build()))
+                  .build()),
+          TEST_VIEW_URN.toString(),
+          SearchFlags.builder().setSkipCache(true).build(),
+          SearchSortInput.builder()
+              .setSortCriteria(
+                  List.of(
+                      SortCriterion.builder()
+                          .setField("sortField1")
+                          .setSortOrder(SortOrder.DESCENDING)
+                          .build(),
+                      SortCriterion.builder()
+                          .setField("sortField2")
+                          .setSortOrder(SortOrder.ASCENDING)
+                          .build()))
+              .build());
+
+  @Test
+  public void testGetSuccessBasic() throws Exception {
+    EntityClient mockEntityClient = initMockEntityClient();
+    ViewService mockViewService = Mockito.mock(ViewService.class);
+    VersionsSearchResolver resolver = new VersionsSearchResolver(mockEntityClient, mockViewService);
+
+    // Execute resolver
+    QueryContext mockContext = getMockAllowContext();
+    DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
+    Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(BASIC_INPUT);
+    Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
+    VersionSet versionSet = new VersionSet();
+    versionSet.setUrn(VERSION_SET_URN);
+    Mockito.when(mockEnv.getSource()).thenReturn(versionSet);
+
+    SearchResults result = resolver.get(mockEnv).get();
+
+    // Validate the result
+    assertEquals(result.getSearchResults().size(), 0);
+
+    // Validate that we called the search service correctly
+    Mockito.verify(mockEntityClient, Mockito.times(1))
+        .searchAcrossEntities(
+            Mockito.argThat(
+                context ->
+                    !context.getSearchContext().getSearchFlags().isFilterNonLatestVersions()),
+            Mockito.eq(List.of(Constants.DATASET_ENTITY_NAME)),
+            Mockito.eq("*"),
+            Mockito.eq(
+                new Filter()
+                    .setOr(
+                        new ConjunctiveCriterionArray(
+                            new ConjunctiveCriterion()
+                                .setAnd(
+                                    new CriterionArray(
+                                        CriterionUtils.buildCriterion(
+                                            "versionSet", Condition.EQUAL, VERSION_SET_URN)))))),
+            Mockito.eq(0),
+            Mockito.eq(10),
+            Mockito.eq(
+                List.of(
+                    new com.linkedin.metadata.query.filter.SortCriterion()
+                        .setField(VERSION_SORT_ID_FIELD_NAME)
+                        .setOrder(com.linkedin.metadata.query.filter.SortOrder.DESCENDING))),
+            any());
+  }
+
+  @Test
+  public void testGetSuccessComplex() throws Exception {
+    EntityClient mockEntityClient = initMockEntityClient();
+
+    Filter viewFilter =
+        new Filter()
+            .setOr(
+                new ConjunctiveCriterionArray(
+                    new ConjunctiveCriterion()
+                        .setAnd(
+                            new CriterionArray(
+                                List.of(buildCriterion("viewField", Condition.EQUAL, "test"))))));
+    DataHubViewInfo viewInfo =
+        new DataHubViewInfo()
+            .setName("test")
+            .setType(DataHubViewType.GLOBAL)
+            .setCreated(new AuditStamp().setTime(0L).setActor(TEST_USER_URN))
+            .setLastModified(new AuditStamp().setTime(0L).setActor(TEST_USER_URN))
+            .setDefinition(
+                new DataHubViewDefinition()
+                    .setEntityTypes(
+                        new StringArray(
+                            List.of(
+                                Constants.DATASET_ENTITY_NAME, Constants.DASHBOARD_ENTITY_NAME)))
+                    .setFilter(viewFilter));
+    ViewService mockViewService = Mockito.mock(ViewService.class);
+    Mockito.when(mockViewService.getViewInfo(any(), Mockito.eq(TEST_VIEW_URN)))
+        .thenReturn(viewInfo);
+
+    VersionsSearchResolver resolver = new VersionsSearchResolver(mockEntityClient, mockViewService);
+
+    // Execute resolver
+    QueryContext mockContext = getMockAllowContext();
+    DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
+    Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(COMPLEX_INPUT);
+    Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
+    VersionSet versionSet = new VersionSet();
+    versionSet.setUrn(VERSION_SET_URN);
+    Mockito.when(mockEnv.getSource()).thenReturn(versionSet);
+
+    SearchResults result = resolver.get(mockEnv).get();
+
+    // Validate the result
+    assertEquals(result.getSearchResults().size(), 0);
+
+    // Validate that we called the search service correctly
+    Mockito.verify(mockEntityClient, Mockito.times(1))
+        .searchAcrossEntities(
+            Mockito.argThat(
+                context ->
+                    !context.getSearchContext().getSearchFlags().isFilterNonLatestVersions()
+                        && context.getSearchContext().getSearchFlags().isSkipCache()),
+            Mockito.eq(List.of(Constants.DATASET_ENTITY_NAME)),
+            Mockito.eq("query"),
+            Mockito.eq(
+                new Filter()
+                    .setOr(
+                        new ConjunctiveCriterionArray(
+                            new ConjunctiveCriterion()
+                                .setAnd(
+                                    new CriterionArray(
+                                        CriterionUtils.buildCriterion(
+                                            "field1", Condition.EQUAL, "1", "2"),
+                                        CriterionUtils.buildCriterion(
+                                            "field2", Condition.EQUAL, "a"),
+                                        CriterionUtils.buildCriterion(
+                                            "versionSet", Condition.EQUAL, VERSION_SET_URN),
+                                        CriterionUtils.buildCriterion(
+                                            "viewField", Condition.EQUAL, "test"))),
+                            new ConjunctiveCriterion()
+                                .setAnd(
+                                    new CriterionArray(
+                                        CriterionUtils.buildCriterion(
+                                            "field3", Condition.EQUAL, "3", "4"),
+                                        CriterionUtils.buildCriterion(
+                                            "field4", Condition.EQUAL, "b"),
+                                        CriterionUtils.buildCriterion(
+                                            "versionSet", Condition.EQUAL, VERSION_SET_URN),
+                                        CriterionUtils.buildCriterion(
+                                            "viewField", Condition.EQUAL, "test")))))),
+            Mockito.eq(2),
+            Mockito.eq(5),
+            Mockito.eq(
+                List.of(
+                    new com.linkedin.metadata.query.filter.SortCriterion()
+                        .setField("sortField1")
+                        .setOrder(com.linkedin.metadata.query.filter.SortOrder.DESCENDING),
+                    new com.linkedin.metadata.query.filter.SortCriterion()
+                        .setField("sortField2")
+                        .setOrder(com.linkedin.metadata.query.filter.SortOrder.ASCENDING),
+                    new com.linkedin.metadata.query.filter.SortCriterion()
+                        .setField(VERSION_SORT_ID_FIELD_NAME)
+                        .setOrder(com.linkedin.metadata.query.filter.SortOrder.DESCENDING))),
+            any());
+  }
+
+  @Test
+  public void testThrowsError() throws Exception {
+    EntityClient mockEntityClient = initMockEntityClient();
+    ViewService mockViewService = Mockito.mock(ViewService.class);
+
+    Mockito.when(
+            mockEntityClient.searchAcrossEntities(
+                any(), any(), any(), any(), Mockito.anyInt(), Mockito.anyInt(), any(), any()))
+        .thenThrow(new RemoteInvocationException());
+
+    VersionsSearchResolver resolver = new VersionsSearchResolver(mockEntityClient, mockViewService);
+
+    // Execute resolver
+    QueryContext mockContext = getMockAllowContext();
+    DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
+    Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(BASIC_INPUT);
+    Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
+    VersionSet versionSet = new VersionSet();
+    versionSet.setUrn(VERSION_SET_URN);
+    Mockito.when(mockEnv.getSource()).thenReturn(versionSet);
+
+    assertThrows(CompletionException.class, () -> resolver.get(mockEnv).join());
+  }
+
+  private EntityClient initMockEntityClient() throws Exception {
+    EntityClient client = Mockito.mock(EntityClient.class);
+
+    Mockito.when(
+            client.searchAcrossEntities(
+                any(),
+                any(),
+                Mockito.anyString(),
+                any(),
+                Mockito.anyInt(),
+                Mockito.anyInt(),
+                any(),
+                Mockito.eq(null)))
+        .thenReturn(
+            new SearchResult()
+                .setEntities(new SearchEntityArray())
+                .setNumEntities(0)
+                .setFrom(0)
+                .setPageSize(0)
+                .setMetadata(new SearchResultMetadata()));
+
+    return client;
+  }
+}
diff --git a/datahub-web-react/src/Mocks.tsx b/datahub-web-react/src/Mocks.tsx
index 2da9e733eb4072..063b784920e234 100644
--- a/datahub-web-react/src/Mocks.tsx
+++ b/datahub-web-react/src/Mocks.tsx
@@ -645,6 +645,7 @@ export const dataset3 = {
     structuredProperties: null,
     forms: null,
     activeIncidents: null,
+    versionProperties: null,
 } as Dataset;
 
 export const dataset3WithSchema = {
diff --git a/datahub-web-react/src/appConfigContext.tsx b/datahub-web-react/src/appConfigContext.tsx
index d7fef85db4b625..8ac18d0142b4e9 100644
--- a/datahub-web-react/src/appConfigContext.tsx
+++ b/datahub-web-react/src/appConfigContext.tsx
@@ -57,6 +57,7 @@ export const DEFAULT_APP_CONFIG = {
         editableDatasetNameEnabled: false,
         showSeparateSiblings: false,
         showManageStructuredProperties: false,
+        entityVersioningEnabled: false,
     },
 };
 
diff --git a/datahub-web-react/src/graphql/app.graphql b/datahub-web-react/src/graphql/app.graphql
index 0d1999f82f77cd..c1fe50d7620a3c 100644
--- a/datahub-web-react/src/graphql/app.graphql
+++ b/datahub-web-react/src/graphql/app.graphql
@@ -72,6 +72,7 @@ query appConfig {
             editableDatasetNameEnabled
             showSeparateSiblings
             showManageStructuredProperties
+            entityVersioningEnabled
         }
     }
 }
diff --git a/datahub-web-react/src/graphql/dataset.graphql b/datahub-web-react/src/graphql/dataset.graphql
index fcca919f614235..8bbeb304aae2cc 100644
--- a/datahub-web-react/src/graphql/dataset.graphql
+++ b/datahub-web-react/src/graphql/dataset.graphql
@@ -172,6 +172,7 @@ fragment nonSiblingDatasetFields on Dataset {
     forms {
         ...formsFields
     }
+    ...entityProfileVersionProperties
 }
 
 query getRecentQueries($urn: String!) {
diff --git a/datahub-web-react/src/graphql/mlModel.graphql b/datahub-web-react/src/graphql/mlModel.graphql
index 2192888caef701..ad97c7c6f530a1 100644
--- a/datahub-web-react/src/graphql/mlModel.graphql
+++ b/datahub-web-react/src/graphql/mlModel.graphql
@@ -34,5 +34,6 @@ query getMLModel($urn: String!) {
         forms {
             ...formsFields
         }
+        ...entityProfileVersionProperties
     }
 }
diff --git a/datahub-web-react/src/graphql/preview.graphql b/datahub-web-react/src/graphql/preview.graphql
index 1bee614dd7adbe..8000f59f2bf258 100644
--- a/datahub-web-react/src/graphql/preview.graphql
+++ b/datahub-web-react/src/graphql/preview.graphql
@@ -346,4 +346,9 @@ fragment entityPreview on Entity {
     ... on Container {
         ...entityContainer
     }
+    ... on SupportsVersions {
+        versionProperties {
+            ...versionProperties
+        }
+    }
 }
diff --git a/datahub-web-react/src/graphql/search.graphql b/datahub-web-react/src/graphql/search.graphql
index de7d1befd39b08..9edd6754022866 100644
--- a/datahub-web-react/src/graphql/search.graphql
+++ b/datahub-web-react/src/graphql/search.graphql
@@ -949,6 +949,11 @@ fragment searchResultsWithoutSchemaField on Entity {
     ... on StructuredPropertyEntity {
         ...structuredPropertyFields
     }
+    ... on SupportsVersions {
+        versionProperties {
+            ...versionProperties
+        }
+    }
 }
 
 fragment searchResultFields on Entity {
diff --git a/datahub-web-react/src/graphql/versioning.graphql b/datahub-web-react/src/graphql/versioning.graphql
new file mode 100644
index 00000000000000..e9b6b82494b6ed
--- /dev/null
+++ b/datahub-web-react/src/graphql/versioning.graphql
@@ -0,0 +1,89 @@
+fragment versionProperties on VersionProperties {
+    versionSet {
+        urn
+        type
+    }
+    isLatest
+    version {
+        versionTag
+    }
+    aliases {
+        versionTag
+    }
+    comment
+    created {
+        time
+        actor {
+            urn
+            ...entityDisplayNameFields
+            editableProperties {
+                displayName
+                pictureLink
+            }
+        }
+    }
+    createdInSource {
+        time
+        actor {
+            urn
+            ...entityDisplayNameFields
+            editableProperties {
+                displayName
+                pictureLink
+            }
+        }
+    }
+}
+
+fragment versionsSearchResults on SearchResults {
+    count
+    total
+    searchResults {
+        entity {
+            urn
+            type
+            ... on SupportsVersions {
+                versionProperties {
+                    ...versionProperties
+                }
+            }
+        }
+    }
+}
+
+fragment entityProfileVersionProperties on SupportsVersions {
+    versionProperties {
+        ...versionProperties
+        versionSet {
+            urn
+            type
+            versionsSearch(input: { query: "*", count: 5, searchFlags: { skipCache: true } }) {
+                ...versionsSearchResults
+            }
+        }
+    }
+}
+
+query searchAcrossVersions($versionSetUrn: String!, $input: SearchAcrossEntitiesInput!) {
+    versionSet(urn: $versionSetUrn) {
+        versionsSearch(input: $input) {
+            ...versionsSearchResults
+        }
+    }
+}
+
+mutation linkAssetVersion($input: LinkVersionInput!) {
+    linkAssetVersion(input: $input) {
+        versionsSearch(input: { query: "*", count: 5, searchFlags: { skipCache: true } }) {
+            ...versionsSearchResults
+        }
+    }
+}
+
+mutation unlinkAssetVersion($input: UnlinkVersionInput!) {
+    unlinkAssetVersion(input: $input) {
+        versionsSearch(input: { query: "*", count: 5, searchFlags: { skipCache: true } }) {
+            ...versionsSearchResults
+        }
+    }
+}

From 4de7f61d0924dd66e86c8a31686fdf4e84a474da Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Fri, 17 Jan 2025 21:38:16 +0530
Subject: [PATCH 106/249] fix(ingest): log exception properly (#12372)

---
 metadata-ingestion/src/datahub/ingestion/run/pipeline.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/run/pipeline.py b/metadata-ingestion/src/datahub/ingestion/run/pipeline.py
index ee1c1608cd48c6..ef59ba7a3b58b4 100644
--- a/metadata-ingestion/src/datahub/ingestion/run/pipeline.py
+++ b/metadata-ingestion/src/datahub/ingestion/run/pipeline.py
@@ -76,8 +76,9 @@ def on_failure(
         failure_metadata: dict,
     ) -> None:
         logger.error(
-            f"{self.name} failed to write record with workunit {record_envelope.metadata['workunit_id']}"
-            f" with {failure_exception} and info {failure_metadata}"
+            f"{self.name} failed to write record with workunit {record_envelope.metadata['workunit_id']}",
+            extra={"failure_metadata": failure_metadata},
+            exc_info=failure_exception,
         )
 
 

From 76e46b89dbcb0dc12e3524bbbfdf177d5db93473 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Fri, 17 Jan 2025 21:38:29 +0530
Subject: [PATCH 107/249] dev(ingest): move modules from isort,flake8 to ruff
 (#12373)

---
 .../airflow-plugin/build.gradle               |  6 +--
 .../airflow-plugin/pyproject.toml             | 53 ++++++++++++++++---
 .../airflow-plugin/setup.cfg                  | 21 --------
 .../airflow-plugin/setup.py                   |  4 +-
 .../src/datahub_airflow_plugin/_config.py     |  5 +-
 .../_datahub_ol_adapter.py                    |  3 +-
 .../src/datahub_airflow_plugin/_extractors.py | 23 ++++----
 .../client/airflow_generator.py               |  2 +-
 .../datahub_listener.py                       | 10 ++--
 .../datahub_airflow_plugin/datahub_plugin.py  |  6 +--
 .../datahub_plugin_v22.py                     |  2 +-
 .../src/datahub_airflow_plugin/entities.py    |  1 +
 .../example_dags/generic_recipe_sample_dag.py |  1 +
 .../example_dags/graph_usage_sample_dag.py    |  2 +-
 .../example_dags/lineage_emission_dag.py      |  2 +-
 .../datahub_airflow_plugin/hooks/datahub.py   |  2 +
 .../lineage/_lineage_core.py                  |  1 -
 .../operators/datahub.py                      |  2 +-
 .../operators/datahub_assertion_operator.py   |  2 +-
 .../operators/datahub_assertion_sensor.py     |  2 +-
 .../operators/datahub_operation_operator.py   |  2 +-
 .../operators/datahub_operation_sensor.py     |  2 +-
 ...hub_emitter_operator_jinja_template_dag.py |  2 +-
 .../tests/integration/test_plugin.py          |  2 +-
 .../airflow-plugin/tests/unit/test_airflow.py |  2 +-
 .../tests/unit/test_packaging.py              |  2 +-
 .../dagster-plugin/build.gradle               |  6 +--
 .../dagster-plugin/pyproject.toml             | 52 +++++++++++++++---
 .../dagster-plugin/setup.cfg                  | 21 --------
 .../dagster-plugin/setup.py                   |  5 +-
 .../client/dagster_generator.py               |  2 +
 .../sensors/datahub_sensors.py                |  6 ++-
 .../dagster-plugin/tests/unit/test_dagster.py |  4 +-
 .../gx-plugin/pyproject.toml                  |  3 --
 .../prefect-plugin/pyproject.toml             |  3 --
 metadata-ingestion/pyproject.toml             | 12 +----
 .../api/entities/dataproduct/dataproduct.py   |  2 +-
 .../datahub/ingestion/source/abs/source.py    |  2 +-
 .../ingestion/source/dremio/dremio_api.py     |  2 +-
 .../ingestion/source/neo4j/neo4j_source.py    |  2 +-
 .../src/datahub/ingestion/source/s3/source.py |  2 +-
 .../ingestion/source/schema/json_schema.py    |  2 +-
 .../ingestion/source/sql/clickhouse.py        |  2 +-
 .../ingestion/source/tableau/tableau.py       |  2 +-
 .../src/datahub/testing/mcp_diff.py           |  2 +-
 .../src/datahub/utilities/sqllineage_patch.py |  2 +-
 .../integration/powerbi/test_m_parser.py      |  4 +-
 .../tests/integration/powerbi/test_powerbi.py |  4 +-
 .../tests/performance/data_generation.py      |  4 +-
 smoke-test/pyproject.toml                     |  2 -
 50 files changed, 166 insertions(+), 144 deletions(-)

diff --git a/metadata-ingestion-modules/airflow-plugin/build.gradle b/metadata-ingestion-modules/airflow-plugin/build.gradle
index 68a35c0dfc417b..1bcb58e6b7c543 100644
--- a/metadata-ingestion-modules/airflow-plugin/build.gradle
+++ b/metadata-ingestion-modules/airflow-plugin/build.gradle
@@ -74,16 +74,14 @@ task lint(type: Exec, dependsOn: installDev) {
     "find ${venv_name}/lib -path *airflow/_vendor/connexion/spec.py -exec sed -i.bak -e '169,169s/  # type: List\\[str\\]//g' {} \\; && " +
     "source ${venv_name}/bin/activate && set -x && " +
     "black --check --diff src/ tests/ && " +
-    "isort --check --diff src/ tests/ && " +
-    "flake8 --count --statistics src/ tests/ && " +
+    "ruff check src/ tests/ && " +
     "mypy --show-traceback --show-error-codes src/ tests/"
 }
 task lintFix(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
     "black src/ tests/ && " +
-    "isort src/ tests/ && " +
-    "flake8 src/ tests/ && " +
+    "ruff check --fix src/ tests/"
     "mypy src/ tests/ "
 }
 
diff --git a/metadata-ingestion-modules/airflow-plugin/pyproject.toml b/metadata-ingestion-modules/airflow-plugin/pyproject.toml
index 648040c1951db8..7d03c2a14bf078 100644
--- a/metadata-ingestion-modules/airflow-plugin/pyproject.toml
+++ b/metadata-ingestion-modules/airflow-plugin/pyproject.toml
@@ -10,11 +10,50 @@ extend-exclude = '''
 '''
 include = '\.pyi?$'
 
-[tool.isort]
-indent = '    '
-known_future_library = ['__future__', 'datahub.utilities._markupsafe_compat', 'datahub_provider._airflow_compat']
-profile = 'black'
-sections = 'FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER'
+[tool.ruff.lint.isort]
+combine-as-imports = true
+known-first-party = ["datahub"]
+extra-standard-library = ["__future__", "datahub.utilities._markupsafe_compat", "datahub.sql_parsing._sqlglot_patch"]
+section-order = ["future", "standard-library", "third-party", "first-party", "local-folder"]
+force-sort-within-sections = false
+force-wrap-aliases = false
+split-on-trailing-comma = false
+order-by-type = true
+relative-imports-order = "closest-to-furthest"
+force-single-line = false
+single-line-exclusions = ["typing"]
+length-sort = false
+from-first = false
+required-imports = []
+classes = ["typing"]
 
-[tool.pyright]
-extraPaths = ['tests']
\ No newline at end of file
+[tool.ruff.lint]
+select = [
+    "B",
+    "C90",
+    "E",
+    "F",
+    "I", # For isort
+    "TID",
+]
+ignore = [
+    # Ignore line length violations (handled by Black)
+    "E501",
+    # Ignore whitespace before ':' (matches Black)
+    "E203",
+    "E203",
+    # Allow usages of functools.lru_cache
+    "B019",
+    # Allow function call in argument defaults
+    "B008",
+]
+
+[tool.ruff.lint.mccabe]
+max-complexity = 15
+
+[tool.ruff.lint.flake8-tidy-imports]
+# Disallow all relative imports.
+ban-relative-imports = "all"
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["F401"]
\ No newline at end of file
diff --git a/metadata-ingestion-modules/airflow-plugin/setup.cfg b/metadata-ingestion-modules/airflow-plugin/setup.cfg
index c25256c5751b8d..abb9040ab3535a 100644
--- a/metadata-ingestion-modules/airflow-plugin/setup.cfg
+++ b/metadata-ingestion-modules/airflow-plugin/setup.cfg
@@ -1,24 +1,3 @@
-[flake8]
-max-complexity = 15
-ignore =
-    # Ignore: line length issues, since black's formatter will take care of them.
-    E501,
-    # Ignore: 1 blank line required before class docstring.
-    D203,
-    # See https://stackoverflow.com/a/57074416.
-    W503,
-    # See https://github.com/psf/black/issues/315.
-    E203
-exclude =
-    .git,
-    venv,
-    .tox,
-    __pycache__
-per-file-ignores =
-    # imported but unused
-    __init__.py: F401
-ban-relative-imports = true
-
 [mypy]
 plugins =
     sqlmypy,
diff --git a/metadata-ingestion-modules/airflow-plugin/setup.py b/metadata-ingestion-modules/airflow-plugin/setup.py
index d07063dbffc5c4..2fd74b37e89c05 100644
--- a/metadata-ingestion-modules/airflow-plugin/setup.py
+++ b/metadata-ingestion-modules/airflow-plugin/setup.py
@@ -73,9 +73,7 @@ def get_long_description():
     *mypy_stubs,
     "black==22.12.0",
     "coverage>=5.1",
-    "flake8>=3.8.3",
-    "flake8-tidy-imports>=4.3.0",
-    "isort>=5.7.0",
+    "ruff==0.9.1",
     "mypy==1.10.1",
     # pydantic 1.8.2 is incompatible with mypy 0.910.
     # See https://github.com/samuelcolvin/pydantic/pull/3175#issuecomment-995382910.
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_config.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_config.py
index c4964712cf9f7d..6d6ba601556788 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_config.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_config.py
@@ -1,11 +1,12 @@
 from enum import Enum
 from typing import TYPE_CHECKING, Optional
 
-import datahub.emitter.mce_builder as builder
 from airflow.configuration import conf
-from datahub.configuration.common import AllowDenyPattern, ConfigModel
 from pydantic.fields import Field
 
+import datahub.emitter.mce_builder as builder
+from datahub.configuration.common import AllowDenyPattern, ConfigModel
+
 if TYPE_CHECKING:
     from datahub_airflow_plugin.hooks.datahub import DatahubGenericHook
 
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_datahub_ol_adapter.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_datahub_ol_adapter.py
index 69de61aced0a59..72cdcd8813252a 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_datahub_ol_adapter.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_datahub_ol_adapter.py
@@ -1,8 +1,9 @@
 import logging
 
-import datahub.emitter.mce_builder as builder
 from openlineage.client.run import Dataset as OpenLineageDataset
 
+import datahub.emitter.mce_builder as builder
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_extractors.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_extractors.py
index 28d5775f61f542..fd01ac10f98de9 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_extractors.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_extractors.py
@@ -3,17 +3,11 @@
 import unittest.mock
 from typing import TYPE_CHECKING, Optional
 
-import datahub.emitter.mce_builder as builder
-from datahub.ingestion.source.sql.sqlalchemy_uri_mapper import (
-    get_platform_from_sqlalchemy_uri,
-)
-from datahub.sql_parsing.sqlglot_lineage import (
-    SqlParsingResult,
-    create_lineage_sql_parsed_result,
+from openlineage.airflow.extractors import (
+    BaseExtractor,
+    ExtractorManager as OLExtractorManager,
+    TaskMetadata,
 )
-from openlineage.airflow.extractors import BaseExtractor
-from openlineage.airflow.extractors import ExtractorManager as OLExtractorManager
-from openlineage.airflow.extractors import TaskMetadata
 from openlineage.airflow.extractors.snowflake_extractor import SnowflakeExtractor
 from openlineage.airflow.extractors.sql_extractor import SqlExtractor
 from openlineage.airflow.utils import get_operator_class, try_import_from_string
@@ -23,11 +17,20 @@
     SqlJobFacet,
 )
 
+import datahub.emitter.mce_builder as builder
+from datahub.ingestion.source.sql.sqlalchemy_uri_mapper import (
+    get_platform_from_sqlalchemy_uri,
+)
+from datahub.sql_parsing.sqlglot_lineage import (
+    SqlParsingResult,
+    create_lineage_sql_parsed_result,
+)
 from datahub_airflow_plugin._airflow_shims import Operator
 from datahub_airflow_plugin._datahub_ol_adapter import OL_SCHEME_TWEAKS
 
 if TYPE_CHECKING:
     from airflow.models import DagRun, TaskInstance
+
     from datahub.ingestion.graph.client import DataHubGraph
 
 logger = logging.getLogger(__name__)
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/client/airflow_generator.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/client/airflow_generator.py
index e9f93c0c1eab0a..c1ccdaeb0a1fbd 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/client/airflow_generator.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/client/airflow_generator.py
@@ -2,6 +2,7 @@
 from typing import TYPE_CHECKING, Dict, List, Optional, Set, Tuple, Union, cast
 
 from airflow.configuration import conf
+
 from datahub.api.entities.datajob import DataFlow, DataJob
 from datahub.api.entities.dataprocess.dataprocess_instance import (
     DataProcessInstance,
@@ -11,7 +12,6 @@
 from datahub.metadata.schema_classes import DataProcessTypeClass
 from datahub.utilities.urns.data_flow_urn import DataFlowUrn
 from datahub.utilities.urns.data_job_urn import DataJobUrn
-
 from datahub_airflow_plugin._airflow_compat import AIRFLOW_PATCHED
 from datahub_airflow_plugin._config import DatahubLineageConfig, DatajobUrl
 
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_listener.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_listener.py
index 640991a90a1d28..9de44811f60a48 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_listener.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_listener.py
@@ -8,9 +8,13 @@
 from typing import TYPE_CHECKING, Callable, Dict, List, Optional, TypeVar, cast
 
 import airflow
-import datahub.emitter.mce_builder as builder
 from airflow.models import Variable
 from airflow.models.serialized_dag import SerializedDagModel
+from openlineage.airflow.listener import TaskHolder
+from openlineage.airflow.utils import redact_with_exclusions
+from openlineage.client.serde import Serde
+
+import datahub.emitter.mce_builder as builder
 from datahub.api.entities.datajob import DataJob
 from datahub.api.entities.dataprocess.dataprocess_instance import InstanceRunResult
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
@@ -30,10 +34,6 @@
 )
 from datahub.sql_parsing.sqlglot_lineage import SqlParsingResult
 from datahub.telemetry import telemetry
-from openlineage.airflow.listener import TaskHolder
-from openlineage.airflow.utils import redact_with_exclusions
-from openlineage.client.serde import Serde
-
 from datahub_airflow_plugin._airflow_shims import (
     HAS_AIRFLOW_DAG_LISTENER_API,
     HAS_AIRFLOW_DATASET_LISTENER_API,
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin.py
index 137cf97f69280a..7638720db023ac 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin.py
@@ -15,9 +15,9 @@
 logger = logging.getLogger(__name__)
 
 
-_USE_AIRFLOW_LISTENER_INTERFACE = HAS_AIRFLOW_LISTENER_API and not os.getenv(
+_USE_AIRFLOW_LISTENER_INTERFACE = HAS_AIRFLOW_LISTENER_API and os.getenv(
     "DATAHUB_AIRFLOW_PLUGIN_USE_V1_PLUGIN", "false"
-).lower() in ("true", "1")
+).lower() not in ("true", "1")
 
 if _USE_AIRFLOW_LISTENER_INTERFACE:
     try:
@@ -32,7 +32,7 @@
 
 
 with contextlib.suppress(Exception):
-    if not os.getenv("DATAHUB_AIRFLOW_PLUGIN_SKIP_FORK_PATCH", "false").lower() in (
+    if os.getenv("DATAHUB_AIRFLOW_PLUGIN_SKIP_FORK_PATCH", "false").lower() not in (
         "true",
         "1",
     ):
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin_v22.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin_v22.py
index db47f37bed562e..4bf050d41473e4 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin_v22.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin_v22.py
@@ -7,9 +7,9 @@
 from airflow.lineage import PIPELINE_OUTLETS
 from airflow.models.baseoperator import BaseOperator
 from airflow.utils.module_loading import import_string
+
 from datahub.api.entities.dataprocess.dataprocess_instance import InstanceRunResult
 from datahub.telemetry import telemetry
-
 from datahub_airflow_plugin._airflow_shims import (
     MappedOperator,
     get_task_inlets,
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/entities.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/entities.py
index 30b35ac6d6198b..f3fd17259c9f63 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/entities.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/entities.py
@@ -2,6 +2,7 @@
 from typing import List, Optional
 
 import attr
+
 import datahub.emitter.mce_builder as builder
 from datahub.utilities.urns.data_job_urn import DataJobUrn
 from datahub.utilities.urns.dataset_urn import DatasetUrn
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/example_dags/generic_recipe_sample_dag.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/example_dags/generic_recipe_sample_dag.py
index ff8dba457066fd..ac620852c6f288 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/example_dags/generic_recipe_sample_dag.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/example_dags/generic_recipe_sample_dag.py
@@ -9,6 +9,7 @@
 from airflow import DAG
 from airflow.operators.python import PythonOperator
 from airflow.utils.dates import days_ago
+
 from datahub.configuration.config_loader import load_config_file
 from datahub.ingestion.run.pipeline import Pipeline
 
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/example_dags/graph_usage_sample_dag.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/example_dags/graph_usage_sample_dag.py
index d72ba67c23cd72..7951d6f7fd21ef 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/example_dags/graph_usage_sample_dag.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/example_dags/graph_usage_sample_dag.py
@@ -4,8 +4,8 @@
 
 import pendulum
 from airflow.decorators import dag, task
-from datahub.ingestion.graph.client import DataHubGraph, RemovedStatusFilter
 
+from datahub.ingestion.graph.client import DataHubGraph, RemovedStatusFilter
 from datahub_airflow_plugin.hooks.datahub import DatahubRestHook
 
 
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/example_dags/lineage_emission_dag.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/example_dags/lineage_emission_dag.py
index 0d7cdb6b6e90a5..4351f40fe7e3ad 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/example_dags/lineage_emission_dag.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/example_dags/lineage_emission_dag.py
@@ -4,11 +4,11 @@
 """
 from datetime import timedelta
 
-import datahub.emitter.mce_builder as builder
 from airflow import DAG
 from airflow.operators.bash import BashOperator
 from airflow.utils.dates import days_ago
 
+import datahub.emitter.mce_builder as builder
 from datahub_airflow_plugin.operators.datahub import DatahubEmitterOperator
 
 default_args = {
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/hooks/datahub.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/hooks/datahub.py
index 5f4d787fb893d3..26c5026c075bd7 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/hooks/datahub.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/hooks/datahub.py
@@ -2,6 +2,7 @@
 
 from airflow.exceptions import AirflowException
 from airflow.hooks.base import BaseHook
+
 from datahub.emitter.generic_emitter import Emitter
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.metadata.com.linkedin.pegasus2avro.mxe import (
@@ -11,6 +12,7 @@
 
 if TYPE_CHECKING:
     from airflow.models.connection import Connection
+
     from datahub.emitter.kafka_emitter import DatahubKafkaEmitter
     from datahub.emitter.rest_emitter import DataHubRestEmitter
     from datahub.emitter.synchronized_file_emitter import SynchronizedFileEmitter
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/lineage/_lineage_core.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/lineage/_lineage_core.py
index 638458b0efd6ab..db50c48dfaf08a 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/lineage/_lineage_core.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/lineage/_lineage_core.py
@@ -2,7 +2,6 @@
 from typing import TYPE_CHECKING, Dict, List
 
 from datahub.api.entities.dataprocess.dataprocess_instance import InstanceRunResult
-
 from datahub_airflow_plugin._config import DatahubLineageConfig
 from datahub_airflow_plugin.client.airflow_generator import AirflowGenerator
 from datahub_airflow_plugin.entities import (
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub.py
index 41d855512aa066..817db6b7480c4b 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub.py
@@ -3,9 +3,9 @@
 from airflow.models import BaseOperator
 from airflow.utils.decorators import apply_defaults
 from avrogen.dict_wrapper import DictWrapper
+
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.metadata.com.linkedin.pegasus2avro.mxe import MetadataChangeEvent
-
 from datahub_airflow_plugin.hooks.datahub import (
     DatahubGenericHook,
     DatahubKafkaHook,
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub_assertion_operator.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub_assertion_operator.py
index 6f93c09a9e2872..3a440b0ec14e07 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub_assertion_operator.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub_assertion_operator.py
@@ -2,11 +2,11 @@
 from typing import Any, List, Optional, Sequence, Union
 
 from airflow.models import BaseOperator
+
 from datahub.api.circuit_breaker import (
     AssertionCircuitBreaker,
     AssertionCircuitBreakerConfig,
 )
-
 from datahub_airflow_plugin.hooks.datahub import DatahubRestHook
 
 
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub_assertion_sensor.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub_assertion_sensor.py
index 16e5d1cbe8b1f4..6a446ba1f3b55e 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub_assertion_sensor.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub_assertion_sensor.py
@@ -2,11 +2,11 @@
 from typing import Any, List, Optional, Sequence, Union
 
 from airflow.sensors.base import BaseSensorOperator
+
 from datahub.api.circuit_breaker import (
     AssertionCircuitBreaker,
     AssertionCircuitBreakerConfig,
 )
-
 from datahub_airflow_plugin.hooks.datahub import DatahubRestHook
 
 
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub_operation_operator.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub_operation_operator.py
index 94e105309537b6..eb5fe8168bccf8 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub_operation_operator.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub_operation_operator.py
@@ -2,11 +2,11 @@
 from typing import Any, List, Optional, Sequence, Union
 
 from airflow.sensors.base import BaseSensorOperator
+
 from datahub.api.circuit_breaker import (
     OperationCircuitBreaker,
     OperationCircuitBreakerConfig,
 )
-
 from datahub_airflow_plugin.hooks.datahub import DatahubRestHook
 
 
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub_operation_sensor.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub_operation_sensor.py
index 434c60754064d0..89e20e46a0074a 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub_operation_sensor.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/operators/datahub_operation_sensor.py
@@ -2,11 +2,11 @@
 from typing import Any, List, Optional, Sequence, Union
 
 from airflow.sensors.base import BaseSensorOperator
+
 from datahub.api.circuit_breaker import (
     OperationCircuitBreaker,
     OperationCircuitBreakerConfig,
 )
-
 from datahub_airflow_plugin.hooks.datahub import DatahubRestHook
 
 
diff --git a/metadata-ingestion-modules/airflow-plugin/tests/integration/dags/datahub_emitter_operator_jinja_template_dag.py b/metadata-ingestion-modules/airflow-plugin/tests/integration/dags/datahub_emitter_operator_jinja_template_dag.py
index c1b4aa4d7b94f4..04845e601d674d 100644
--- a/metadata-ingestion-modules/airflow-plugin/tests/integration/dags/datahub_emitter_operator_jinja_template_dag.py
+++ b/metadata-ingestion-modules/airflow-plugin/tests/integration/dags/datahub_emitter_operator_jinja_template_dag.py
@@ -1,6 +1,7 @@
 from datetime import datetime, timedelta
 
 from airflow import DAG
+
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.metadata.com.linkedin.pegasus2avro.mxe import MetadataChangeEvent
 from datahub.metadata.schema_classes import (
@@ -9,7 +10,6 @@
     DatasetPropertiesClass,
     DatasetSnapshotClass,
 )
-
 from datahub_airflow_plugin.operators.datahub import DatahubEmitterOperator
 
 default_args = {
diff --git a/metadata-ingestion-modules/airflow-plugin/tests/integration/test_plugin.py b/metadata-ingestion-modules/airflow-plugin/tests/integration/test_plugin.py
index 3b2c9140e4632f..d2c9821295419c 100644
--- a/metadata-ingestion-modules/airflow-plugin/tests/integration/test_plugin.py
+++ b/metadata-ingestion-modules/airflow-plugin/tests/integration/test_plugin.py
@@ -17,9 +17,9 @@
 import requests
 import tenacity
 from airflow.models.connection import Connection
+
 from datahub.ingestion.sink.file import write_metadata_file
 from datahub.testing.compare_metadata_json import assert_metadata_files_equal
-
 from datahub_airflow_plugin._airflow_shims import (
     AIRFLOW_VERSION,
     HAS_AIRFLOW_DAG_LISTENER_API,
diff --git a/metadata-ingestion-modules/airflow-plugin/tests/unit/test_airflow.py b/metadata-ingestion-modules/airflow-plugin/tests/unit/test_airflow.py
index 79620f81a437b0..1dc8e14a425dfc 100644
--- a/metadata-ingestion-modules/airflow-plugin/tests/unit/test_airflow.py
+++ b/metadata-ingestion-modules/airflow-plugin/tests/unit/test_airflow.py
@@ -8,12 +8,12 @@
 
 import airflow.configuration
 import airflow.version
-import datahub.emitter.mce_builder as builder
 import packaging.version
 import pytest
 from airflow.lineage import apply_lineage, prepare_lineage
 from airflow.models import DAG, Connection, DagBag, DagRun, TaskInstance
 
+import datahub.emitter.mce_builder as builder
 from datahub_airflow_plugin import get_provider_info
 from datahub_airflow_plugin._airflow_shims import (
     AIRFLOW_PATCHED,
diff --git a/metadata-ingestion-modules/airflow-plugin/tests/unit/test_packaging.py b/metadata-ingestion-modules/airflow-plugin/tests/unit/test_packaging.py
index a9c8b7ec65fa3c..a822527582c2cd 100644
--- a/metadata-ingestion-modules/airflow-plugin/tests/unit/test_packaging.py
+++ b/metadata-ingestion-modules/airflow-plugin/tests/unit/test_packaging.py
@@ -1,6 +1,6 @@
 import setuptools
-from datahub.testing.check_imports import ensure_no_indirect_model_imports
 
+from datahub.testing.check_imports import ensure_no_indirect_model_imports
 from tests.utils import PytestConfig
 
 
diff --git a/metadata-ingestion-modules/dagster-plugin/build.gradle b/metadata-ingestion-modules/dagster-plugin/build.gradle
index 0d57bb5bfdff70..503b3556a41bfe 100644
--- a/metadata-ingestion-modules/dagster-plugin/build.gradle
+++ b/metadata-ingestion-modules/dagster-plugin/build.gradle
@@ -55,16 +55,14 @@ task lint(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
     "black --check --diff src/ tests/ examples/ && " +
-    "isort --check --diff src/ tests/ examples/ && " +
-    "flake8 --count --statistics src/ tests/ examples/ && " +
+    "ruff check src/ tests/ && " +
     "mypy --show-traceback --show-error-codes src/ tests/ examples/"
 }
 task lintFix(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-x', '-c',
     "source ${venv_name}/bin/activate && " +
     "black src/ tests/ examples/ && " +
-    "isort src/ tests/ examples/ && " +
-    "flake8 src/ tests/ examples/ && " +
+    "ruff check --fix src/ tests/"
     "mypy src/ tests/ examples/"
 }
 
diff --git a/metadata-ingestion-modules/dagster-plugin/pyproject.toml b/metadata-ingestion-modules/dagster-plugin/pyproject.toml
index fba81486b9f677..7d03c2a14bf078 100644
--- a/metadata-ingestion-modules/dagster-plugin/pyproject.toml
+++ b/metadata-ingestion-modules/dagster-plugin/pyproject.toml
@@ -10,10 +10,50 @@ extend-exclude = '''
 '''
 include = '\.pyi?$'
 
-[tool.isort]
-indent = '    '
-profile = 'black'
-sections = 'FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER'
+[tool.ruff.lint.isort]
+combine-as-imports = true
+known-first-party = ["datahub"]
+extra-standard-library = ["__future__", "datahub.utilities._markupsafe_compat", "datahub.sql_parsing._sqlglot_patch"]
+section-order = ["future", "standard-library", "third-party", "first-party", "local-folder"]
+force-sort-within-sections = false
+force-wrap-aliases = false
+split-on-trailing-comma = false
+order-by-type = true
+relative-imports-order = "closest-to-furthest"
+force-single-line = false
+single-line-exclusions = ["typing"]
+length-sort = false
+from-first = false
+required-imports = []
+classes = ["typing"]
 
-[tool.pyright]
-extraPaths = ['tests']
\ No newline at end of file
+[tool.ruff.lint]
+select = [
+    "B",
+    "C90",
+    "E",
+    "F",
+    "I", # For isort
+    "TID",
+]
+ignore = [
+    # Ignore line length violations (handled by Black)
+    "E501",
+    # Ignore whitespace before ':' (matches Black)
+    "E203",
+    "E203",
+    # Allow usages of functools.lru_cache
+    "B019",
+    # Allow function call in argument defaults
+    "B008",
+]
+
+[tool.ruff.lint.mccabe]
+max-complexity = 15
+
+[tool.ruff.lint.flake8-tidy-imports]
+# Disallow all relative imports.
+ban-relative-imports = "all"
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["F401"]
\ No newline at end of file
diff --git a/metadata-ingestion-modules/dagster-plugin/setup.cfg b/metadata-ingestion-modules/dagster-plugin/setup.cfg
index 20a903914332aa..89b28ae45f9648 100644
--- a/metadata-ingestion-modules/dagster-plugin/setup.cfg
+++ b/metadata-ingestion-modules/dagster-plugin/setup.cfg
@@ -1,24 +1,3 @@
-[flake8]
-max-complexity = 15
-ignore =
-    # Ignore: line length issues, since black's formatter will take care of them.
-    E501,
-    # Ignore: 1 blank line required before class docstring.
-    D203,
-    # See https://stackoverflow.com/a/57074416.
-    W503,
-    # See https://github.com/psf/black/issues/315.
-    E203
-exclude =
-    .git,
-    venv,
-    .tox,
-    __pycache__
-per-file-ignores =
-    # imported but unused
-    __init__.py: F401
-ban-relative-imports = true
-
 [mypy]
 plugins =
     pydantic.mypy
diff --git a/metadata-ingestion-modules/dagster-plugin/setup.py b/metadata-ingestion-modules/dagster-plugin/setup.py
index 22c15497bd8070..f2e90c14833f78 100644
--- a/metadata-ingestion-modules/dagster-plugin/setup.py
+++ b/metadata-ingestion-modules/dagster-plugin/setup.py
@@ -53,10 +53,7 @@ def get_long_description():
     "dagster-snowflake-pandas >= 0.11.0",
     "black==22.12.0",
     "coverage>=5.1",
-    "flake8>=6.0.0",
-    "flake8-tidy-imports>=4.3.0",
-    "flake8-bugbear==23.3.12",
-    "isort>=5.7.0",
+    "ruff==0.9.1",
     "mypy>=1.4.0",
     # pydantic 1.8.2 is incompatible with mypy 0.910.
     # See https://github.com/samuelcolvin/pydantic/pull/3175#issuecomment-995382910.
diff --git a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/client/dagster_generator.py b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/client/dagster_generator.py
index a87f490f2d947e..9a0a9a1b3a75ed 100644
--- a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/client/dagster_generator.py
+++ b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/client/dagster_generator.py
@@ -13,6 +13,7 @@
     TableSchemaMetadataValue,
 )
 from dagster._core.execution.stats import RunStepKeyStatsSnapshot, StepEventStatus
+
 from datahub.sql_parsing.sqlglot_utils import get_query_fingerprint
 
 try:
@@ -23,6 +24,7 @@
 
 from dagster._core.snap.node import OpDefSnap
 from dagster._core.storage.dagster_run import DagsterRun, DagsterRunStatsSnapshot
+
 from datahub.api.entities.datajob import DataFlow, DataJob
 from datahub.api.entities.dataprocess.dataprocess_instance import (
     DataProcessInstance,
diff --git a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/sensors/datahub_sensors.py b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/sensors/datahub_sensors.py
index bccdb4ac7922a5..b91a9cfa56d398 100644
--- a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/sensors/datahub_sensors.py
+++ b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/sensors/datahub_sensors.py
@@ -35,7 +35,9 @@
 try:
     from dagster._core.definitions.sensor_definition import SensorReturnTypesUnion
 except ImportError:
-    from dagster._core.definitions.sensor_definition import RawSensorEvaluationFunctionReturn as SensorReturnTypesUnion  # type: ignore
+    from dagster._core.definitions.sensor_definition import (  # type: ignore
+        RawSensorEvaluationFunctionReturn as SensorReturnTypesUnion,
+    )
 
 from dagster._core.definitions.target import ExecutableDefinition
 from dagster._core.definitions.unresolved_asset_job_definition import (
@@ -43,6 +45,7 @@
 )
 from dagster._core.events import DagsterEventType, HandledOutputData, LoadedInputData
 from dagster._core.execution.stats import RunStepKeyStatsSnapshot
+
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.graph.client import DatahubClientConfig, DataHubGraph
 from datahub.metadata.schema_classes import SubTypesClass
@@ -52,7 +55,6 @@
 )
 from datahub.utilities.urns.dataset_urn import DatasetUrn
 from datahub.utilities.urns.error import InvalidUrnError
-
 from datahub_dagster_plugin.client.dagster_generator import (
     DATAHUB_ASSET_GROUP_NAME_CACHE,
     Constant,
diff --git a/metadata-ingestion-modules/dagster-plugin/tests/unit/test_dagster.py b/metadata-ingestion-modules/dagster-plugin/tests/unit/test_dagster.py
index c951b959f85d43..9a69822984bb80 100644
--- a/metadata-ingestion-modules/dagster-plugin/tests/unit/test_dagster.py
+++ b/metadata-ingestion-modules/dagster-plugin/tests/unit/test_dagster.py
@@ -22,11 +22,11 @@
     RepositoryDefinition,
 )
 from dagster._core.definitions.resource_definition import ResourceDefinition
-from datahub.emitter.mcp import MetadataChangeProposalWrapper
-from datahub.ingestion.graph.client import DatahubClientConfig
 from freezegun import freeze_time
 from utils.utils import PytestConfig, check_golden_file
 
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.ingestion.graph.client import DatahubClientConfig
 from datahub_dagster_plugin.client.dagster_generator import DatahubDagsterSourceConfig
 from datahub_dagster_plugin.sensors.datahub_sensors import (
     DatahubSensors,
diff --git a/metadata-ingestion-modules/gx-plugin/pyproject.toml b/metadata-ingestion-modules/gx-plugin/pyproject.toml
index fba81486b9f677..bc951452175268 100644
--- a/metadata-ingestion-modules/gx-plugin/pyproject.toml
+++ b/metadata-ingestion-modules/gx-plugin/pyproject.toml
@@ -14,6 +14,3 @@ include = '\.pyi?$'
 indent = '    '
 profile = 'black'
 sections = 'FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER'
-
-[tool.pyright]
-extraPaths = ['tests']
\ No newline at end of file
diff --git a/metadata-ingestion-modules/prefect-plugin/pyproject.toml b/metadata-ingestion-modules/prefect-plugin/pyproject.toml
index fba81486b9f677..bc951452175268 100644
--- a/metadata-ingestion-modules/prefect-plugin/pyproject.toml
+++ b/metadata-ingestion-modules/prefect-plugin/pyproject.toml
@@ -14,6 +14,3 @@ include = '\.pyi?$'
 indent = '    '
 profile = 'black'
 sections = 'FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER'
-
-[tool.pyright]
-extraPaths = ['tests']
\ No newline at end of file
diff --git a/metadata-ingestion/pyproject.toml b/metadata-ingestion/pyproject.toml
index f3a51e135082ee..745547f88bcb93 100644
--- a/metadata-ingestion/pyproject.toml
+++ b/metadata-ingestion/pyproject.toml
@@ -11,6 +11,7 @@ extend-exclude = '''
 include = '\.pyi?$'
 target-version = ['py38', 'py39', 'py310', 'py311']
 
+
 [tool.ruff.lint.isort]
 combine-as-imports = true
 known-first-party = ["datahub"]
@@ -28,16 +29,6 @@ from-first = false
 required-imports = []
 classes = ["typing"]
 
-[tool.pyright]
-extraPaths = ['tests']
-
-[tool.vulture]
-exclude = ["src/datahub/metadata/"]
-ignore_decorators = ["@click.*", "@validator", "@root_validator", "@pydantic.validator", "@pydantic.root_validator", "@pytest.fixture"]
-ignore_names = ["*Source", "*Sink", "*Report"]
-paths = ["src"]
-sort_by_size = true
-
 [tool.ruff]
 # Same as Black.
 line-length = 88
@@ -70,7 +61,6 @@ ignore = [
     "B008",
     # TODO: Enable these later
     "B006",  # Mutable args
-    "B007",  # Unused loop control variable
     "B017",  # Do not assert blind exception
     "B904",  # Checks for raise statements in exception handlers that lack a from clause
 ]
diff --git a/metadata-ingestion/src/datahub/api/entities/dataproduct/dataproduct.py b/metadata-ingestion/src/datahub/api/entities/dataproduct/dataproduct.py
index 2097922c151366..39de4d7f80558e 100644
--- a/metadata-ingestion/src/datahub/api/entities/dataproduct/dataproduct.py
+++ b/metadata-ingestion/src/datahub/api/entities/dataproduct/dataproduct.py
@@ -438,7 +438,7 @@ def _patch_ownership(
             for replace_index, replace_value in patches_replace.items():
                 list_to_manipulate[replace_index] = replace_value
 
-            for drop_index, drop_value in patches_drop.items():
+            for drop_value in patches_drop.values():
                 list_to_manipulate.remove(drop_value)
 
             for add_value in patches_add:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/abs/source.py b/metadata-ingestion/src/datahub/ingestion/source/abs/source.py
index ad2bc36cf558b5..e4f9cd0ee7e018 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/abs/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/abs/source.py
@@ -613,7 +613,7 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                                 table_data.table_path
                             ].timestamp = table_data.timestamp
 
-                for guid, table_data in table_dict.items():
+                for _, table_data in table_dict.items():
                     yield from self.ingest_table(table_data, path_spec)
 
     def get_workunit_processors(self) -> List[Optional[MetadataWorkUnitProcessor]]:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_api.py b/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_api.py
index d913b7e42065d2..072995c10ebcef 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_api.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_api.py
@@ -181,7 +181,7 @@ def authenticate(self, connection_args: "DremioSourceConfig") -> None:
             return
 
         # On-prem Dremio authentication (PAT or Basic Auth)
-        for retry in range(1, self._retry_count + 1):
+        for _ in range(1, self._retry_count + 1):
             try:
                 if connection_args.authentication_method == "PAT":
                     self.session.headers.update(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/neo4j/neo4j_source.py b/metadata-ingestion/src/datahub/ingestion/source/neo4j/neo4j_source.py
index 2c9107b967e4f8..8cdd4b17733e01 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/neo4j/neo4j_source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/neo4j/neo4j_source.py
@@ -286,7 +286,7 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
         df = self.get_neo4j_metadata(
             "CALL apoc.meta.schema() YIELD value UNWIND keys(value) AS key RETURN key, value[key] AS value;"
         )
-        for index, row in df.iterrows():
+        for _, row in df.iterrows():
             try:
                 yield MetadataWorkUnit(
                     id=row["key"],
diff --git a/metadata-ingestion/src/datahub/ingestion/source/s3/source.py b/metadata-ingestion/src/datahub/ingestion/source/s3/source.py
index 989d0d734352a2..3173423f86a2ea 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/s3/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/s3/source.py
@@ -1124,7 +1124,7 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                                 table_data.table_path
                             ].timestamp = table_data.timestamp
 
-                for guid, table_data in table_dict.items():
+                for _, table_data in table_dict.items():
                     yield from self.ingest_table(table_data, path_spec)
 
             if not self.source_config.is_profiling_enabled():
diff --git a/metadata-ingestion/src/datahub/ingestion/source/schema/json_schema.py b/metadata-ingestion/src/datahub/ingestion/source/schema/json_schema.py
index 635e894d18c7e5..a50e99393fdc27 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/schema/json_schema.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/schema/json_schema.py
@@ -354,7 +354,7 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
             browse_prefix = f"/{self.config.env.lower()}/{self.config.platform}/{self.config.platform_instance}"
 
         if os.path.isdir(self.config.path):
-            for root, dirs, files in os.walk(self.config.path, topdown=False):
+            for root, _, files in os.walk(self.config.path, topdown=False):
                 for file_name in [f for f in files if f.endswith(".json")]:
                     try:
                         yield from self._load_one_file(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/clickhouse.py b/metadata-ingestion/src/datahub/ingestion/source/sql/clickhouse.py
index aeb21e88d04437..2899bcc2de37b0 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/clickhouse.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/clickhouse.py
@@ -268,7 +268,7 @@ def _get_table_or_view_names(self, relkind, connection, schema=None, **kw):
     info_cache = kw.get("info_cache")
     all_relations = self._get_all_relation_info(connection, info_cache=info_cache)
     relation_names = []
-    for key, relation in all_relations.items():
+    for _, relation in all_relations.items():
         if relation.database == schema and relation.relkind == relkind:
             relation_names.append(relation.relname)
     return relation_names
diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
index ee841a2a201863..8187fff559208e 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
@@ -3605,7 +3605,7 @@ def emit_project_in_topological_order(
                 parent_container_key=parent_project_key,
             )
 
-        for id_, project in self.tableau_project_registry.items():
+        for project in self.tableau_project_registry.values():
             logger.debug(
                 f"project {project.name} and it's parent {project.parent_name} and parent id {project.parent_id}"
             )
diff --git a/metadata-ingestion/src/datahub/testing/mcp_diff.py b/metadata-ingestion/src/datahub/testing/mcp_diff.py
index 5e669a718e9ad3..b58afc10148edc 100644
--- a/metadata-ingestion/src/datahub/testing/mcp_diff.py
+++ b/metadata-ingestion/src/datahub/testing/mcp_diff.py
@@ -246,7 +246,7 @@ def pretty(self, verbose: bool = False) -> str:
         for urn in self.aspect_changes.keys() - self.urns_added - self.urns_removed:
             aspect_map = self.aspect_changes[urn]
             s.append(f"Urn changed, {urn}:")
-            for aspect_name, aspect_diffs in aspect_map.items():
+            for aspect_diffs in aspect_map.values():
                 for i, ga in aspect_diffs.aspects_added.items():
                     s.append(self.report_aspect(ga, i, "added"))
                     if verbose:
diff --git a/metadata-ingestion/src/datahub/utilities/sqllineage_patch.py b/metadata-ingestion/src/datahub/utilities/sqllineage_patch.py
index afcd02478ae687..4c237d02727f72 100644
--- a/metadata-ingestion/src/datahub/utilities/sqllineage_patch.py
+++ b/metadata-ingestion/src/datahub/utilities/sqllineage_patch.py
@@ -8,7 +8,7 @@
 
 # Patch based on sqllineage v1.3.3
 def end_of_query_cleanup_patch(self, holder: SubQueryLineageHolder) -> None:  # type: ignore
-    for i, tbl in enumerate(self.tables):
+    for tbl in self.tables:
         holder.add_read(tbl)
     self.union_barriers.append((len(self.columns), len(self.tables)))
 
diff --git a/metadata-ingestion/tests/integration/powerbi/test_m_parser.py b/metadata-ingestion/tests/integration/powerbi/test_m_parser.py
index 832d00d9c54702..6f7a9c7833ba1a 100644
--- a/metadata-ingestion/tests/integration/powerbi/test_m_parser.py
+++ b/metadata-ingestion/tests/integration/powerbi/test_m_parser.py
@@ -1070,7 +1070,7 @@ def test_unsupported_data_platform():
     )  # type :ignore
 
     is_entry_present: bool = False
-    for key, entry in info_entries.items():
+    for entry in info_entries.values():
         if entry.title == "Non-Data Platform Expression":
             is_entry_present = True
             break
@@ -1163,7 +1163,7 @@ def test_m_query_timeout(mock_get_lark_parser):
     )  # type :ignore
 
     is_entry_present: bool = False
-    for key, entry in warn_entries.items():
+    for entry in warn_entries.values():
         if entry.title == "M-Query Parsing Timeout":
             is_entry_present = True
             break
diff --git a/metadata-ingestion/tests/integration/powerbi/test_powerbi.py b/metadata-ingestion/tests/integration/powerbi/test_powerbi.py
index 739be7cc8408dd..911d8a9f35139f 100644
--- a/metadata-ingestion/tests/integration/powerbi/test_powerbi.py
+++ b/metadata-ingestion/tests/integration/powerbi/test_powerbi.py
@@ -1438,7 +1438,7 @@ def test_powerbi_cross_workspace_reference_info_message(
 
     is_entry_present: bool = False
     # Printing INFO entries
-    for key, entry in info_entries.items():
+    for entry in info_entries.values():
         if entry.title == "Missing Lineage For Tile":
             is_entry_present = True
             break
@@ -1563,7 +1563,7 @@ def test_powerbi_app_ingest_info_message(
 
     is_entry_present: bool = False
     # Printing INFO entries
-    for key, entry in info_entries.items():
+    for entry in info_entries.values():
         if entry.title == "App Ingestion Is Disabled":
             is_entry_present = True
             break
diff --git a/metadata-ingestion/tests/performance/data_generation.py b/metadata-ingestion/tests/performance/data_generation.py
index fcff13edf59363..266c0d9af03224 100644
--- a/metadata-ingestion/tests/performance/data_generation.py
+++ b/metadata-ingestion/tests/performance/data_generation.py
@@ -198,7 +198,7 @@ def generate_queries(
 
     all_tables = seed_metadata.tables + seed_metadata.views
     users = [f"user_{i}@xyz.com" for i in range(num_users)]
-    for i in range(num_selects):  # Pure SELECT statements
+    for _ in range(num_selects):  # Pure SELECT statements
         tables = _sample_list(all_tables, tables_per_select)
         all_columns = [
             FieldAccess(column, table) for table in tables for column in table.columns
@@ -213,7 +213,7 @@ def generate_queries(
             fields_accessed=_sample_list(all_columns, columns_per_select),
         )
 
-    for i in range(num_operations):
+    for _ in range(num_operations):
         modified_table = random.choice(seed_metadata.tables)
         n_col = len(modified_table.columns)
         num_columns_modified = NormalDistribution(n_col / 2, n_col / 2)
diff --git a/smoke-test/pyproject.toml b/smoke-test/pyproject.toml
index c7745d0e9a3640..aeb3c03b6466dd 100644
--- a/smoke-test/pyproject.toml
+++ b/smoke-test/pyproject.toml
@@ -42,5 +42,3 @@ warn_unused_configs = true
 disallow_incomplete_defs = false
 disallow_untyped_defs = false
 
-[tool.pyright]
-extraPaths = ['tests']

From 0c597d35af83e09b3ca4f310bbe2cbab0c44eda3 Mon Sep 17 00:00:00 2001
From: Pedro Silva <pedro@acryl.io>
Date: Fri, 17 Jan 2025 18:15:56 +0000
Subject: [PATCH 108/249] feat(docs): Add release docs for 0.15.0 (#12374)

---
 .../ingest/source/builder/NameSourceStep.tsx  |  2 +-
 docs/api/datahub-apis.md                      |  4 ++
 docs/how/updating-datahub.md                  | 60 ++++++++++---------
 gradle/versioning/versioning.gradle           |  2 +-
 4 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/datahub-web-react/src/app/ingest/source/builder/NameSourceStep.tsx b/datahub-web-react/src/app/ingest/source/builder/NameSourceStep.tsx
index 898fbd6a6d9268..68e6c8d3436fb9 100644
--- a/datahub-web-react/src/app/ingest/source/builder/NameSourceStep.tsx
+++ b/datahub-web-react/src/app/ingest/source/builder/NameSourceStep.tsx
@@ -200,7 +200,7 @@ export const NameSourceStep = ({ state, updateState, prev, submit }: StepProps)
                             <Input
                                 data-testid="cli-version-input"
                                 className="cli-version-input"
-                                placeholder="(e.g. 0.12.0)"
+                                placeholder="(e.g. 0.15.0)"
                                 value={state.config?.version || ''}
                                 onChange={(event) => setVersion(event.target.value)}
                                 onBlur={(event) => handleBlur(event, setVersion)}
diff --git a/docs/api/datahub-apis.md b/docs/api/datahub-apis.md
index c46aacde3a0cb5..62136406e6ff66 100644
--- a/docs/api/datahub-apis.md
+++ b/docs/api/datahub-apis.md
@@ -12,6 +12,10 @@ DataHub has several APIs to manipulate metadata on the platform. Here's the list
 In general, **Python and Java SDKs** are our most recommended tools for extending and customizing the behavior of your DataHub instance.
 We don't recommend using the **OpenAPI** directly, as it's more complex and less user-friendly than the other APIs.
 
+:::warning
+About async usage of APIs - DataHub's asynchronous APIs perform only basic schema validation when receiving MCP requests, similar to direct production to MCP Kafka topics. While requests must conform to the MCP schema to be accepted, actual processing happens later in the pipeline. Any processing failures that occur after the initial acceptance are captured in the Failed MCP topic, but these failures are not immediately surfaced to the API caller since they happen asynchronously.
+:::
+
 ## Python and Java SDK
 
 We offer an SDK for both Python and Java that provide full functionality when it comes to CRUD operations and any complex functionality you may want to build into DataHub. We recommend using the SDKs for most use cases. Here are the examples of how to use the SDKs:
diff --git a/docs/how/updating-datahub.md b/docs/how/updating-datahub.md
index eb5a792216d981..b887ca999c4046 100644
--- a/docs/how/updating-datahub.md
+++ b/docs/how/updating-datahub.md
@@ -1,8 +1,3 @@
-# Known Issues
-
-- Async APIs - DataHub's asynchronous APIs perform only basic schema validation when receiving MCP requests, similar to direct production to MCP Kafka topics. While requests must conform to the MCP schema to be accepted, actual processing happens later in the pipeline. Any processing failures that occur after the initial acceptance are captured in the Failed MCP topic, but these failures are not immediately surfaced to the API caller since they happen asynchronously.
-
-
 # Updating DataHub
 
 <!--
@@ -22,37 +17,26 @@
 This file documents any backwards-incompatible changes in DataHub and assists people when migrating to a new version.
 
 ## Next
-- #12191 - Configs `include_view_lineage` and `include_view_column_lineage` are removed from snowflake ingestion source. View and External Table DDL lineage will always be ingested when definitions are available.
-- #12181 - Configs `include_view_lineage`, `include_view_column_lineage` and `lineage_parse_view_ddl` are removed from bigquery ingestion source. View and Snapshot lineage will always be ingested when definitions are available.
-- #11560 - The PowerBI ingestion source configuration option include_workspace_name_in_dataset_urn determines whether the workspace name is included in the PowerBI dataset's URN.<br/> PowerBI allows to have identical name of semantic model and their tables across the workspace, It will overwrite the semantic model in-case of multi-workspace ingestion.<br/>
-  Entity urn with `include_workspace_name_in_dataset_urn: false`
 
-  ```
-   urn:li:dataset:(urn:li:dataPlatform:powerbi,[<PlatformInstance>.]<SemanticModelName>.<TableName>,<ENV>)
-  ```
+### Breaking Changes
 
-  Entity urn with `include_workspace_name_in_dataset_urn: true`
+### Potential Downtime
 
-  ```
-   urn:li:dataset:(urn:li:dataPlatform:powerbi,[<PlatformInstance>.].<WorkspaceName>.<SemanticModelName>.<TableName>,<ENV>)
-  ```
+### Deprecations
 
-  The config `include_workspace_name_in_dataset_urn` is default to `false` for backward compatibility, However, we recommend enabling this flag after performing the necessary cleanup.
-  If stateful ingestion is enabled, running ingestion with the latest CLI version will handle the cleanup automatically. Otherwise, we recommend soft deleting all powerbi data via the DataHub CLI:
-  `datahub delete --platform powerbi --soft` and then re-ingest with the latest CLI version, ensuring the `include_workspace_name_in_dataset_urn` configuration is set to true.
+### Other Notable Changes
 
-- #11701: The Fivetran `sources_to_database` field is deprecated in favor of setting directly within `sources_to_platform_instance.<key>.database`.
-- #11742: For PowerBi ingestion, `use_powerbi_email` is now enabled by default when extracting ownership information.
-- #12056: The DataHub Airflow plugin no longer supports Airflow 2.1 and Airflow 2.2.
-- #12056: The DataHub Airflow plugin now defaults to the v2 plugin implementation.
-- #12077: `Kafka` source no longer ingests schemas from schema registry as separate entities by default, set `ingest_schemas_as_entities` to `true` to ingest them
-- OpenAPI Update: PIT Keep Alive parameter added to scroll. NOTE: This parameter requires the `pointInTimeCreationEnabled` feature flag to be enabled and the `elasticSearch.implementation` configuration to be `elasticsearch`. This feature is not supported for OpenSearch at this time and the parameter will not be respected without both of these set.
+## 0.15.0
+
+- OpenAPI Update: PIT Keep Alive parameter added to scroll endpoints. NOTE: This parameter requires the `pointInTimeCreationEnabled` feature flag to be enabled and the `elasticSearch.implementation` configuration to be `elasticsearch`. This feature is not supported for OpenSearch at this time and the parameter will not be respected without both of these set.
 - OpenAPI Update 2: Previously there was an incorrectly marked parameter named `sort` on the generic list entities endpoint for v3. This parameter is deprecated and only supports a single string value while the documentation indicates it supports a list of strings. This documentation error has been fixed and the correct field, `sortCriteria`, is now documented which supports a list of strings. 
-- #12223: For dbt Cloud ingestion, the "View in dbt" link will point at the "Explore" page in the dbt Cloud UI. You can revert to the old behavior of linking to the dbt Cloud IDE by setting `external_url_mode: ide".
-- #12236: Data flow and data job entities may additionally produce container aspect that will require a corresponding upgrade of server. Otherwise server can reject the aspect.
 
 ### Breaking Changes
 
+- #12223: For dbt Cloud ingestion, the "View in dbt" link will point at the "Explore" page in the dbt Cloud UI. You can revert to the old behavior of linking to the dbt Cloud IDE by setting `external_url_mode: ide".
+- #12191 - Configs `include_view_lineage` and `include_view_column_lineage` are removed from snowflake ingestion source. View and External Table DDL lineage will always be ingested when definitions are available.
+- #12181 - Configs `include_view_lineage`, `include_view_column_lineage` and `lineage_parse_view_ddl` are removed from bigquery ingestion source. View and Snapshot lineage will always be ingested when definitions are available.
+- #12077: `Kafka` source no longer ingests schemas from schema registry as separate entities by default, set `ingest_schemas_as_entities` to `true` to ingest them
 - #11486 - Criterion's `value` parameter has been previously deprecated. Use of `value` instead of `values` is no longer supported and will be completely removed on the next major version.
 - #11484 - Metadata service authentication enabled by default
 - #11484 - Rest API authorization enabled by default
@@ -78,8 +62,30 @@ This file documents any backwards-incompatible changes in DataHub and assists pe
 
 ### Deprecations
 
+- #12056: The DataHub Airflow plugin no longer supports Airflow 2.1 and Airflow 2.2.
+- #11701: The Fivetran `sources_to_database` field is deprecated in favor of setting directly within `sources_to_platform_instance.<key>.database`.
+- #11560 - The PowerBI ingestion source configuration option include_workspace_name_in_dataset_urn determines whether the workspace name is included in the PowerBI dataset's URN.<br/> PowerBI allows to have identical name of semantic model and their tables across the workspace, It will overwrite the semantic model in-case of multi-workspace ingestion.<br/>
+  Entity urn with `include_workspace_name_in_dataset_urn: false`
+
+  ```
+   urn:li:dataset:(urn:li:dataPlatform:powerbi,[<PlatformInstance>.]<SemanticModelName>.<TableName>,<ENV>)
+  ```
+
+  Entity urn with `include_workspace_name_in_dataset_urn: true`
+
+  ```
+   urn:li:dataset:(urn:li:dataPlatform:powerbi,[<PlatformInstance>.].<WorkspaceName>.<SemanticModelName>.<TableName>,<ENV>)
+  ```
+
+  The config `include_workspace_name_in_dataset_urn` is default to `false` for backward compatibility, However, we recommend enabling this flag after performing the necessary cleanup.
+  If stateful ingestion is enabled, running ingestion with the latest CLI version will handle the cleanup automatically. Otherwise, we recommend soft deleting all powerbi data via the DataHub CLI:
+  `datahub delete --platform powerbi --soft` and then re-ingest with the latest CLI version, ensuring the `include_workspace_name_in_dataset_urn` configuration is set to true.
+
 ### Other Notable Changes
 
+- #12236: Data flow and data job entities may additionally produce container aspect that will require a corresponding upgrade of server. Otherwise server can reject the aspect.
+- #12056: The DataHub Airflow plugin now defaults to the v2 plugin implementation.
+- #11742: For PowerBi ingestion, `use_powerbi_email` is now enabled by default when extracting ownership information.
 - #11549 - Manage Operations Privilege is extended from throttle control to all system management and operations APIs.
 
 ## 0.14.1
diff --git a/gradle/versioning/versioning.gradle b/gradle/versioning/versioning.gradle
index 39a8a3faf80117..2ffb085869f7b2 100644
--- a/gradle/versioning/versioning.gradle
+++ b/gradle/versioning/versioning.gradle
@@ -21,7 +21,7 @@ Produces the following variables and supports token replacement
 import org.apache.tools.ant.filters.ReplaceTokens
 
 def detailedVersionString = "0.0.0-unknown-SNAPSHOT"
-def cliMajorVersion = "0.12.0" // base default cli major version
+def cliMajorVersion = "0.15.0" // base default cli major version
 def snapshotVersion = false
 if (project.hasProperty("releaseVersion")) {
   version = releaseVersion

From 436b74cd3a6b2e2032a084816df70db08d878adb Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Fri, 17 Jan 2025 23:50:13 +0530
Subject: [PATCH 109/249] dev: move from flake8,isort to ruff (#12375)

---
 .github/scripts/pre-commit-override.yaml      |  2 +-
 .pre-commit-config.yaml                       |  5 +-
 .../airflow-plugin/setup.py                   |  2 +-
 .../dagster-plugin/setup.py                   |  2 +-
 .../gx-plugin/build.gradle                    |  6 +--
 .../gx-plugin/pyproject.toml                  | 51 +++++++++++++++++--
 .../gx-plugin/setup.cfg                       | 21 --------
 metadata-ingestion-modules/gx-plugin/setup.py |  5 +-
 .../gx-plugin/src/datahub_gx_plugin/action.py | 51 ++++++++++---------
 .../integration/test_great_expectations.py    |  5 +-
 .../unit/test_great_expectations_action.py    | 32 ++++++------
 .../prefect-plugin/build.gradle               |  6 +--
 .../prefect-plugin/pyproject.toml             | 51 +++++++++++++++++--
 .../prefect-plugin/setup.cfg                  | 21 --------
 .../prefect-plugin/setup.py                   |  4 +-
 .../src/prefect_datahub/datahub_emitter.py    | 18 +++----
 .../src/prefect_datahub/entities.py           |  1 +
 .../tests/unit/test_datahub_emitter.py        |  4 +-
 metadata-ingestion/setup.py                   |  2 +-
 smoke-test/build.gradle                       |  7 ++-
 smoke-test/pyproject.toml                     | 40 +++++++++++++--
 smoke-test/requirements.txt                   |  3 +-
 .../timeseries/dataset_profile_gen.py         |  1 -
 .../tests/assertions/assertions_test.py       |  2 +-
 .../assertions/custom_assertions_test.py      |  2 +-
 smoke-test/tests/cli/datahub_cli.py           |  2 +-
 smoke-test/tests/cli/datahub_graph_test.py    |  2 +-
 .../cli/delete_cmd/test_timeseries_delete.py  |  4 +-
 .../ingest_cmd/test_timeseries_rollback.py    |  4 +-
 .../cli/user_groups_cmd/test_group_cmd.py     |  2 +-
 .../cli/user_groups_cmd/test_user_cmd.py      |  1 +
 smoke-test/tests/cypress/integration_test.py  |  2 +-
 .../test_data_process_instance.py             |  2 +-
 smoke-test/tests/database/test_database.py    |  2 +-
 .../tests/dataproduct/test_dataproduct.py     |  2 +-
 smoke-test/tests/delete/delete_test.py        |  2 +-
 smoke-test/tests/lineage/test_lineage.py      | 14 ++---
 smoke-test/tests/ml_models/test_ml_models.py  |  2 +-
 .../tests/patch/test_datajob_patches.py       |  1 -
 .../tests/patch/test_dataset_patches.py       |  1 -
 .../test_platform_resource.py                 |  2 +-
 smoke-test/tests/restli/restli_test.py        |  2 +-
 .../tests/schema_fields/schema_evolution.py   |  8 +--
 .../tests/schema_fields/test_schemafields.py  |  4 +-
 .../setup/lineage/ingest_data_job_change.py   |  1 -
 .../lineage/ingest_dataset_join_change.py     |  1 -
 .../lineage/ingest_input_datasets_change.py   |  1 -
 .../setup/lineage/ingest_time_lineage.py      |  1 -
 smoke-test/tests/setup/lineage/utils.py       |  1 -
 .../test_structured_properties.py             |  1 -
 smoke-test/tests/test_stateful_ingestion.py   |  8 +--
 smoke-test/tests/timeline/timeline_test.py    |  2 +-
 .../tokens/revokable_access_token_test.py     |  4 +-
 .../tests/tokens/session_access_token_test.py |  4 +-
 smoke-test/tests/utils.py                     |  4 +-
 55 files changed, 244 insertions(+), 187 deletions(-)

diff --git a/.github/scripts/pre-commit-override.yaml b/.github/scripts/pre-commit-override.yaml
index 961134bebe2c98..ecd3c97ad61efa 100644
--- a/.github/scripts/pre-commit-override.yaml
+++ b/.github/scripts/pre-commit-override.yaml
@@ -5,5 +5,5 @@ repos:
         name: smoke-test cypress Lint Fix
         entry: ./gradlew :smoke-test:cypressLintFix
         language: system
-        files: ^smoke-test/tests/cypress/.*$
+        files: ^smoke-test/tests/cypress/.*\.tsx$
         pass_filenames: false
\ No newline at end of file
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3697efa37770e7..103e1680b8d105 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,4 +1,4 @@
-# Auto-generated by .github/scripts/generate_pre_commit.py at 2025-01-09 10:08:09 UTC
+# Auto-generated by .github/scripts/generate_pre_commit.py at 2025-01-17 16:43:31 UTC
 # Do not edit this file directly. Run the script to regenerate.
 # Add additional hooks in .github/scripts/pre-commit-override.yaml
 repos:
@@ -442,4 +442,5 @@ repos:
         name: smoke-test cypress Lint Fix
         entry: ./gradlew :smoke-test:cypressLintFix
         language: system
-        files: ^smoke-test/tests/cypress/.*$
+        files: ^smoke-test/tests/cypress/.*\.tsx$
+        pass_filenames: false
diff --git a/metadata-ingestion-modules/airflow-plugin/setup.py b/metadata-ingestion-modules/airflow-plugin/setup.py
index 2fd74b37e89c05..79c18a5188dd84 100644
--- a/metadata-ingestion-modules/airflow-plugin/setup.py
+++ b/metadata-ingestion-modules/airflow-plugin/setup.py
@@ -73,7 +73,7 @@ def get_long_description():
     *mypy_stubs,
     "black==22.12.0",
     "coverage>=5.1",
-    "ruff==0.9.1",
+    "ruff==0.9.2",
     "mypy==1.10.1",
     # pydantic 1.8.2 is incompatible with mypy 0.910.
     # See https://github.com/samuelcolvin/pydantic/pull/3175#issuecomment-995382910.
diff --git a/metadata-ingestion-modules/dagster-plugin/setup.py b/metadata-ingestion-modules/dagster-plugin/setup.py
index f2e90c14833f78..b15f3716b28d0a 100644
--- a/metadata-ingestion-modules/dagster-plugin/setup.py
+++ b/metadata-ingestion-modules/dagster-plugin/setup.py
@@ -53,7 +53,7 @@ def get_long_description():
     "dagster-snowflake-pandas >= 0.11.0",
     "black==22.12.0",
     "coverage>=5.1",
-    "ruff==0.9.1",
+    "ruff==0.9.2",
     "mypy>=1.4.0",
     # pydantic 1.8.2 is incompatible with mypy 0.910.
     # See https://github.com/samuelcolvin/pydantic/pull/3175#issuecomment-995382910.
diff --git a/metadata-ingestion-modules/gx-plugin/build.gradle b/metadata-ingestion-modules/gx-plugin/build.gradle
index 70bc3e0360a3a4..a0604215426bf7 100644
--- a/metadata-ingestion-modules/gx-plugin/build.gradle
+++ b/metadata-ingestion-modules/gx-plugin/build.gradle
@@ -55,16 +55,14 @@ task lint(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
     "black --check --diff src/ tests/ && " +
-    "isort --check --diff src/ tests/ && " +
-    "flake8 --count --statistics src/ tests/ && " +
+    "ruff check src/ tests/ && " +
     "mypy --show-traceback --show-error-codes src/ tests/"
 }
 task lintFix(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-x', '-c',
     "source ${venv_name}/bin/activate && " +
     "black src/ tests/ && " +
-    "isort src/ tests/ && " +
-    "flake8 src/ tests/ && " +
+    "ruff check --fix src/ tests/"
     "mypy src/ tests/"
 }
 
diff --git a/metadata-ingestion-modules/gx-plugin/pyproject.toml b/metadata-ingestion-modules/gx-plugin/pyproject.toml
index bc951452175268..7d03c2a14bf078 100644
--- a/metadata-ingestion-modules/gx-plugin/pyproject.toml
+++ b/metadata-ingestion-modules/gx-plugin/pyproject.toml
@@ -10,7 +10,50 @@ extend-exclude = '''
 '''
 include = '\.pyi?$'
 
-[tool.isort]
-indent = '    '
-profile = 'black'
-sections = 'FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER'
+[tool.ruff.lint.isort]
+combine-as-imports = true
+known-first-party = ["datahub"]
+extra-standard-library = ["__future__", "datahub.utilities._markupsafe_compat", "datahub.sql_parsing._sqlglot_patch"]
+section-order = ["future", "standard-library", "third-party", "first-party", "local-folder"]
+force-sort-within-sections = false
+force-wrap-aliases = false
+split-on-trailing-comma = false
+order-by-type = true
+relative-imports-order = "closest-to-furthest"
+force-single-line = false
+single-line-exclusions = ["typing"]
+length-sort = false
+from-first = false
+required-imports = []
+classes = ["typing"]
+
+[tool.ruff.lint]
+select = [
+    "B",
+    "C90",
+    "E",
+    "F",
+    "I", # For isort
+    "TID",
+]
+ignore = [
+    # Ignore line length violations (handled by Black)
+    "E501",
+    # Ignore whitespace before ':' (matches Black)
+    "E203",
+    "E203",
+    # Allow usages of functools.lru_cache
+    "B019",
+    # Allow function call in argument defaults
+    "B008",
+]
+
+[tool.ruff.lint.mccabe]
+max-complexity = 15
+
+[tool.ruff.lint.flake8-tidy-imports]
+# Disallow all relative imports.
+ban-relative-imports = "all"
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["F401"]
\ No newline at end of file
diff --git a/metadata-ingestion-modules/gx-plugin/setup.cfg b/metadata-ingestion-modules/gx-plugin/setup.cfg
index bbdd85f0fdc4ed..de78d3597e74d2 100644
--- a/metadata-ingestion-modules/gx-plugin/setup.cfg
+++ b/metadata-ingestion-modules/gx-plugin/setup.cfg
@@ -1,24 +1,3 @@
-[flake8]
-max-complexity = 15
-ignore =
-    # Ignore: line length issues, since black's formatter will take care of them.
-    E501,
-    # Ignore: 1 blank line required before class docstring.
-    D203,
-    # See https://stackoverflow.com/a/57074416.
-    W503,
-    # See https://github.com/psf/black/issues/315.
-    E203
-exclude =
-    .git,
-    venv,
-    .tox,
-    __pycache__
-per-file-ignores =
-    # imported but unused
-    __init__.py: F401
-ban-relative-imports = true
-
 [mypy]
 plugins =
     pydantic.mypy
diff --git a/metadata-ingestion-modules/gx-plugin/setup.py b/metadata-ingestion-modules/gx-plugin/setup.py
index 40afc81a98f9c8..d114a4130ca4f2 100644
--- a/metadata-ingestion-modules/gx-plugin/setup.py
+++ b/metadata-ingestion-modules/gx-plugin/setup.py
@@ -60,10 +60,7 @@ def get_long_description():
     *mypy_stubs,
     "black==22.12.0",
     "coverage>=5.1",
-    "flake8>=6.0.0",
-    "flake8-tidy-imports>=4.3.0",
-    "flake8-bugbear==23.3.12",
-    "isort>=5.7.0",
+    "ruff==0.9.2",
     "mypy>=1.4.0",
     # pydantic 1.8.2 is incompatible with mypy 0.910.
     # See https://github.com/samuelcolvin/pydantic/pull/3175#issuecomment-995382910.
diff --git a/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/action.py b/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/action.py
index 2d89d26997d1f3..4f2aee52c3319f 100644
--- a/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/action.py
+++ b/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/action.py
@@ -3,12 +3,37 @@
 import sys
 import time
 from dataclasses import dataclass
+from datahub.utilities._markupsafe_compat import MARKUPSAFE_PATCHED
 from datetime import timezone
 from decimal import Decimal
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
 
-import datahub.emitter.mce_builder as builder
 import packaging.version
+from great_expectations.checkpoint.actions import ValidationAction
+from great_expectations.core.batch import Batch
+from great_expectations.core.batch_spec import (
+    RuntimeDataBatchSpec,
+    RuntimeQueryBatchSpec,
+    SqlAlchemyDatasourceBatchSpec,
+)
+from great_expectations.core.expectation_validation_result import (
+    ExpectationSuiteValidationResult,
+)
+from great_expectations.data_asset.data_asset import DataAsset
+from great_expectations.data_context import AbstractDataContext
+from great_expectations.data_context.types.resource_identifiers import (
+    ExpectationSuiteIdentifier,
+    ValidationResultIdentifier,
+)
+from great_expectations.execution_engine import PandasExecutionEngine
+from great_expectations.execution_engine.sqlalchemy_execution_engine import (
+    SqlAlchemyExecutionEngine,
+)
+from great_expectations.validator.validator import Validator
+from sqlalchemy.engine.base import Connection, Engine
+from sqlalchemy.engine.url import make_url
+
+import datahub.emitter.mce_builder as builder
 from datahub.cli.env_utils import get_boolean_env_variable
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.emitter.rest_emitter import DatahubRestEmitter
@@ -35,31 +60,7 @@
 from datahub.metadata.com.linkedin.pegasus2avro.common import DataPlatformInstance
 from datahub.metadata.schema_classes import PartitionSpecClass, PartitionTypeClass
 from datahub.sql_parsing.sqlglot_lineage import create_lineage_sql_parsed_result
-from datahub.utilities._markupsafe_compat import MARKUPSAFE_PATCHED
 from datahub.utilities.urns.dataset_urn import DatasetUrn
-from great_expectations.checkpoint.actions import ValidationAction
-from great_expectations.core.batch import Batch
-from great_expectations.core.batch_spec import (
-    RuntimeDataBatchSpec,
-    RuntimeQueryBatchSpec,
-    SqlAlchemyDatasourceBatchSpec,
-)
-from great_expectations.core.expectation_validation_result import (
-    ExpectationSuiteValidationResult,
-)
-from great_expectations.data_asset.data_asset import DataAsset
-from great_expectations.data_context import AbstractDataContext
-from great_expectations.data_context.types.resource_identifiers import (
-    ExpectationSuiteIdentifier,
-    ValidationResultIdentifier,
-)
-from great_expectations.execution_engine import PandasExecutionEngine
-from great_expectations.execution_engine.sqlalchemy_execution_engine import (
-    SqlAlchemyExecutionEngine,
-)
-from great_expectations.validator.validator import Validator
-from sqlalchemy.engine.base import Connection, Engine
-from sqlalchemy.engine.url import make_url
 
 # TODO: move this and version check used in tests to some common module
 try:
diff --git a/metadata-ingestion-modules/gx-plugin/tests/integration/test_great_expectations.py b/metadata-ingestion-modules/gx-plugin/tests/integration/test_great_expectations.py
index b03681dc780584..9919c1db25508c 100644
--- a/metadata-ingestion-modules/gx-plugin/tests/integration/test_great_expectations.py
+++ b/metadata-ingestion-modules/gx-plugin/tests/integration/test_great_expectations.py
@@ -5,12 +5,13 @@
 
 import packaging.version
 import pytest
+from freezegun import freeze_time
+from great_expectations.data_context import FileDataContext
+
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.sink.file import write_metadata_file
 from datahub.testing.compare_metadata_json import assert_metadata_files_equal
 from datahub.testing.docker_utils import wait_for_port
-from freezegun import freeze_time
-from great_expectations.data_context import FileDataContext
 
 try:
     from great_expectations import __version__ as GX_VERSION  # type: ignore
diff --git a/metadata-ingestion-modules/gx-plugin/tests/unit/test_great_expectations_action.py b/metadata-ingestion-modules/gx-plugin/tests/unit/test_great_expectations_action.py
index fcad17fa4b71dd..3eb3e5af6e16bd 100644
--- a/metadata-ingestion-modules/gx-plugin/tests/unit/test_great_expectations_action.py
+++ b/metadata-ingestion-modules/gx-plugin/tests/unit/test_great_expectations_action.py
@@ -4,22 +4,6 @@
 
 import pandas as pd
 import pytest
-from datahub.emitter.mcp import MetadataChangeProposalWrapper
-from datahub.metadata.schema_classes import (
-    AssertionInfoClass,
-    AssertionResultClass,
-    AssertionResultTypeClass,
-    AssertionRunEventClass,
-    AssertionRunStatusClass,
-    AssertionStdParameterClass,
-    AssertionStdParametersClass,
-    AssertionTypeClass,
-    BatchSpecClass,
-    DataPlatformInstanceClass,
-    DatasetAssertionInfoClass,
-    DatasetAssertionScopeClass,
-    PartitionSpecClass,
-)
 from great_expectations.core.batch import Batch, BatchDefinition, BatchRequest
 from great_expectations.core.batch_spec import (
     RuntimeDataBatchSpec,
@@ -46,6 +30,22 @@
 )
 from great_expectations.validator.validator import Validator
 
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.metadata.schema_classes import (
+    AssertionInfoClass,
+    AssertionResultClass,
+    AssertionResultTypeClass,
+    AssertionRunEventClass,
+    AssertionRunStatusClass,
+    AssertionStdParameterClass,
+    AssertionStdParametersClass,
+    AssertionTypeClass,
+    BatchSpecClass,
+    DataPlatformInstanceClass,
+    DatasetAssertionInfoClass,
+    DatasetAssertionScopeClass,
+    PartitionSpecClass,
+)
 from datahub_gx_plugin.action import DataHubValidationAction
 
 logger = logging.getLogger(__name__)
diff --git a/metadata-ingestion-modules/prefect-plugin/build.gradle b/metadata-ingestion-modules/prefect-plugin/build.gradle
index a2b240cc8bf708..d16201834a0ff0 100644
--- a/metadata-ingestion-modules/prefect-plugin/build.gradle
+++ b/metadata-ingestion-modules/prefect-plugin/build.gradle
@@ -55,16 +55,14 @@ task lint(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
     "black --check --diff src/ tests/ && " +
-    "isort --check --diff src/ tests/ && " +
-    "flake8 --count --statistics src/ tests/ && " +
+    "ruff check src/ tests/ && " +
     "mypy --show-traceback --show-error-codes src/ tests/"
 }
 task lintFix(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-x', '-c',
     "source ${venv_name}/bin/activate && " +
     "black src/ tests/ && " +
-    "isort src/ tests/ && " +
-    "flake8 src/ tests/ && " +
+    "ruff check --fix src/ tests/"
     "mypy src/ tests/ "
 }
 
diff --git a/metadata-ingestion-modules/prefect-plugin/pyproject.toml b/metadata-ingestion-modules/prefect-plugin/pyproject.toml
index bc951452175268..7d03c2a14bf078 100644
--- a/metadata-ingestion-modules/prefect-plugin/pyproject.toml
+++ b/metadata-ingestion-modules/prefect-plugin/pyproject.toml
@@ -10,7 +10,50 @@ extend-exclude = '''
 '''
 include = '\.pyi?$'
 
-[tool.isort]
-indent = '    '
-profile = 'black'
-sections = 'FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER'
+[tool.ruff.lint.isort]
+combine-as-imports = true
+known-first-party = ["datahub"]
+extra-standard-library = ["__future__", "datahub.utilities._markupsafe_compat", "datahub.sql_parsing._sqlglot_patch"]
+section-order = ["future", "standard-library", "third-party", "first-party", "local-folder"]
+force-sort-within-sections = false
+force-wrap-aliases = false
+split-on-trailing-comma = false
+order-by-type = true
+relative-imports-order = "closest-to-furthest"
+force-single-line = false
+single-line-exclusions = ["typing"]
+length-sort = false
+from-first = false
+required-imports = []
+classes = ["typing"]
+
+[tool.ruff.lint]
+select = [
+    "B",
+    "C90",
+    "E",
+    "F",
+    "I", # For isort
+    "TID",
+]
+ignore = [
+    # Ignore line length violations (handled by Black)
+    "E501",
+    # Ignore whitespace before ':' (matches Black)
+    "E203",
+    "E203",
+    # Allow usages of functools.lru_cache
+    "B019",
+    # Allow function call in argument defaults
+    "B008",
+]
+
+[tool.ruff.lint.mccabe]
+max-complexity = 15
+
+[tool.ruff.lint.flake8-tidy-imports]
+# Disallow all relative imports.
+ban-relative-imports = "all"
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["F401"]
\ No newline at end of file
diff --git a/metadata-ingestion-modules/prefect-plugin/setup.cfg b/metadata-ingestion-modules/prefect-plugin/setup.cfg
index c59a99fa8aec0a..828597e6a812b0 100644
--- a/metadata-ingestion-modules/prefect-plugin/setup.cfg
+++ b/metadata-ingestion-modules/prefect-plugin/setup.cfg
@@ -1,24 +1,3 @@
-[flake8]
-max-complexity = 15
-ignore =
-    # Ignore: line length issues, since black's formatter will take care of them.
-    E501,
-    # Ignore: 1 blank line required before class docstring.
-    D203,
-    # See https://stackoverflow.com/a/57074416.
-    W503,
-    # See https://github.com/psf/black/issues/315.
-    E203
-exclude =
-    .git,
-    venv,
-    .tox,
-    __pycache__
-per-file-ignores =
-    # imported but unused
-    __init__.py: F401
-ban-relative-imports = true
-
 [mypy]
 plugins =
     sqlmypy,
diff --git a/metadata-ingestion-modules/prefect-plugin/setup.py b/metadata-ingestion-modules/prefect-plugin/setup.py
index 70b0e958195645..9587f0ed73780b 100644
--- a/metadata-ingestion-modules/prefect-plugin/setup.py
+++ b/metadata-ingestion-modules/prefect-plugin/setup.py
@@ -59,9 +59,7 @@ def get_long_description():
     *mypy_stubs,
     "black==22.12.0",
     "coverage>=5.1",
-    "flake8>=3.8.3",
-    "flake8-tidy-imports>=4.3.0",
-    "isort>=5.7.0",
+    "ruff==0.9.1",
     "mypy>=1.4.0",
     # pydantic 1.8.2 is incompatible with mypy 0.910.
     # See https://github.com/samuelcolvin/pydantic/pull/3175#issuecomment-995382910.
diff --git a/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/datahub_emitter.py b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/datahub_emitter.py
index 8617381cf16139..fcab6b6fd91430 100644
--- a/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/datahub_emitter.py
+++ b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/datahub_emitter.py
@@ -5,6 +5,15 @@
 from typing import Any, Dict, List, Optional, cast
 from uuid import UUID
 
+from prefect import get_run_logger
+from prefect.blocks.core import Block
+from prefect.client import cloud, orchestration
+from prefect.client.schemas import FlowRun, TaskRun, Workspace
+from prefect.client.schemas.objects import Flow
+from prefect.context import FlowRunContext, TaskRunContext
+from prefect.settings import PREFECT_API_URL
+from pydantic.v1 import SecretStr
+
 import datahub.emitter.mce_builder as builder
 from datahub.api.entities.datajob import DataFlow, DataJob
 from datahub.api.entities.dataprocess.dataprocess_instance import (
@@ -17,15 +26,6 @@
 from datahub.utilities.urns.data_flow_urn import DataFlowUrn
 from datahub.utilities.urns.data_job_urn import DataJobUrn
 from datahub.utilities.urns.dataset_urn import DatasetUrn
-from prefect import get_run_logger
-from prefect.blocks.core import Block
-from prefect.client import cloud, orchestration
-from prefect.client.schemas import FlowRun, TaskRun, Workspace
-from prefect.client.schemas.objects import Flow
-from prefect.context import FlowRunContext, TaskRunContext
-from prefect.settings import PREFECT_API_URL
-from pydantic.v1 import SecretStr
-
 from prefect_datahub.entities import _Entity
 
 ORCHESTRATOR = "prefect"
diff --git a/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/entities.py b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/entities.py
index e2711d0925d977..c8f858b8e59c19 100644
--- a/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/entities.py
+++ b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/entities.py
@@ -2,6 +2,7 @@
 from typing import Optional
 
 import attr
+
 import datahub.emitter.mce_builder as builder
 from datahub.utilities.urns.urn import guess_entity_type
 
diff --git a/metadata-ingestion-modules/prefect-plugin/tests/unit/test_datahub_emitter.py b/metadata-ingestion-modules/prefect-plugin/tests/unit/test_datahub_emitter.py
index ba50cddc986b66..71555f76e04f71 100644
--- a/metadata-ingestion-modules/prefect-plugin/tests/unit/test_datahub_emitter.py
+++ b/metadata-ingestion-modules/prefect-plugin/tests/unit/test_datahub_emitter.py
@@ -6,14 +6,14 @@
 from uuid import UUID
 
 import pytest
-from datahub.api.entities.datajob import DataJob
-from datahub.utilities.urns.dataset_urn import DatasetUrn
 from prefect.client.schemas import FlowRun, TaskRun, Workspace
 from prefect.futures import PrefectFuture
 from prefect.server.schemas.core import Flow
 from prefect.task_runners import SequentialTaskRunner
 from requests.models import Response
 
+from datahub.api.entities.datajob import DataJob
+from datahub.utilities.urns.dataset_urn import DatasetUrn
 from prefect_datahub.datahub_emitter import DatahubEmitter
 from prefect_datahub.entities import Dataset, _Entity
 
diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py
index 4c88db36019eb3..ea1b0ad1582576 100644
--- a/metadata-ingestion/setup.py
+++ b/metadata-ingestion/setup.py
@@ -593,7 +593,7 @@
     # This is pinned only to avoid spurious errors in CI.
     # We should make an effort to keep it up to date.
     "black==23.3.0",
-    "ruff==0.9.1",
+    "ruff==0.9.2",
     "mypy==1.10.1",
 }
 
diff --git a/smoke-test/build.gradle b/smoke-test/build.gradle
index 60d08e0206cdab..f3dc1de830ccef 100644
--- a/smoke-test/build.gradle
+++ b/smoke-test/build.gradle
@@ -74,16 +74,15 @@ task pythonLint(type: Exec, dependsOn: installDev) {
     commandLine 'bash', '-c',
         "source ${venv_name}/bin/activate && set -x && " +
         "black --check --diff tests/ && " +
-        "isort --check --diff tests/ && " +
-        "ruff --statistics tests/ && " +
+        "ruff check tests/ && " +
         "mypy tests/"
 }
+
 task pythonLintFix(type: Exec, dependsOn: installDev) {
     commandLine 'bash', '-c',
         "source ${venv_name}/bin/activate && set -x && " +
         "black tests/ && " +
-        "isort tests/ && " +
-        "ruff --fix tests/ && " +
+        "ruff check --fix tests/ && " +
         "mypy tests/"
 }
 
diff --git a/smoke-test/pyproject.toml b/smoke-test/pyproject.toml
index aeb3c03b6466dd..55f037db2effea 100644
--- a/smoke-test/pyproject.toml
+++ b/smoke-test/pyproject.toml
@@ -22,15 +22,49 @@ venv
 include = '\.pyi?$'
 target-version = ['py310']
 
-[tool.isort]
-profile = 'black'
+[tool.ruff.lint.isort]
+combine-as-imports = true
+known-first-party = ["datahub"]
+extra-standard-library = ["__future__", "datahub.utilities._markupsafe_compat", "datahub.sql_parsing._sqlglot_patch"]
+section-order = ["future", "standard-library", "third-party", "first-party", "local-folder"]
+force-sort-within-sections = false
+force-wrap-aliases = false
+split-on-trailing-comma = false
+order-by-type = true
+relative-imports-order = "closest-to-furthest"
+force-single-line = false
+single-line-exclusions = ["typing"]
+length-sort = false
+from-first = false
+required-imports = []
+classes = ["typing"]
 
-[tool.ruff]
+[tool.ruff.lint]
+select = [
+    "B",
+    "C90",
+    "E",
+    "F",
+    "I", # For isort
+    "TID",
+]
 ignore = [
 	'E501', # Ignore line length, since black handles that.
 	'D203', # Ignore 1 blank line required before class docstring.
+	'B904', # exception with `raise ... from err` or `raise ... from None` to distinguish
+	'TID252', # Prefer absolute imports over relative imports
 ]
 
+[tool.ruff.lint.mccabe]
+max-complexity = 15
+
+[tool.ruff.lint.flake8-tidy-imports]
+# Disallow all relative imports.
+ban-relative-imports = "all"
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["F401"]
+
 [tool.mypy]
 exclude = "^(venv/|build/|dist/)"
 ignore_missing_imports = true
diff --git a/smoke-test/requirements.txt b/smoke-test/requirements.txt
index c5294d95177cb9..6779733a850bad 100644
--- a/smoke-test/requirements.txt
+++ b/smoke-test/requirements.txt
@@ -10,9 +10,8 @@ pytest-xdist
 networkx
 # libaries for linting below this
 black==23.7.0
-isort==5.12.0
 mypy==1.5.1
-ruff==0.0.287
+ruff==0.9.2
 # stub version are copied from metadata-ingestion/setup.py and that should be the source of truth
 types-requests>=2.28.11.6,<=2.31.0.3
 types-PyYAML
diff --git a/smoke-test/tests/aspect_generators/timeseries/dataset_profile_gen.py b/smoke-test/tests/aspect_generators/timeseries/dataset_profile_gen.py
index f808e7a58a3292..d97f119ea55a0c 100644
--- a/smoke-test/tests/aspect_generators/timeseries/dataset_profile_gen.py
+++ b/smoke-test/tests/aspect_generators/timeseries/dataset_profile_gen.py
@@ -5,7 +5,6 @@
     DatasetProfileClass,
     TimeWindowSizeClass,
 )
-
 from tests.utils import get_timestampmillis_at_start_of_day
 
 
diff --git a/smoke-test/tests/assertions/assertions_test.py b/smoke-test/tests/assertions/assertions_test.py
index 8615a55d7289f0..53d1362fbeef91 100644
--- a/smoke-test/tests/assertions/assertions_test.py
+++ b/smoke-test/tests/assertions/assertions_test.py
@@ -3,6 +3,7 @@
 
 import pytest
 import tenacity
+
 from datahub.emitter.mce_builder import make_dataset_urn, make_schema_field_urn
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.api.common import PipelineContext, RecordEnvelope
@@ -22,7 +23,6 @@
     PartitionSpecClass,
     PartitionTypeClass,
 )
-
 from tests.utils import delete_urns_from_file, get_sleep_info, ingest_file_via_rest
 
 restli_default_headers = {
diff --git a/smoke-test/tests/assertions/custom_assertions_test.py b/smoke-test/tests/assertions/custom_assertions_test.py
index 25336185185645..78e06dfe1be2fa 100644
--- a/smoke-test/tests/assertions/custom_assertions_test.py
+++ b/smoke-test/tests/assertions/custom_assertions_test.py
@@ -2,11 +2,11 @@
 from typing import Any
 
 import pytest
+
 from datahub.emitter.mce_builder import make_dataset_urn
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.graph.client import DataHubGraph
 from datahub.metadata.schema_classes import StatusClass
-
 from tests.consistency_utils import wait_for_writes_to_sync
 from tests.utils import delete_urn
 
diff --git a/smoke-test/tests/cli/datahub_cli.py b/smoke-test/tests/cli/datahub_cli.py
index 099002195aa51a..51a43f47fd9e2f 100644
--- a/smoke-test/tests/cli/datahub_cli.py
+++ b/smoke-test/tests/cli/datahub_cli.py
@@ -1,11 +1,11 @@
 import json
 
 import pytest
+
 from datahub.metadata.schema_classes import (
     BrowsePathsV2Class,
     EditableDatasetPropertiesClass,
 )
-
 from tests.utils import ingest_file_via_rest, wait_for_writes_to_sync
 
 ingested_dataset_run_id = ""
diff --git a/smoke-test/tests/cli/datahub_graph_test.py b/smoke-test/tests/cli/datahub_graph_test.py
index e29492c0d3f9d9..0285f7d83b8272 100644
--- a/smoke-test/tests/cli/datahub_graph_test.py
+++ b/smoke-test/tests/cli/datahub_graph_test.py
@@ -2,9 +2,9 @@
 
 import pytest
 import tenacity
+
 from datahub.ingestion.graph.client import DataHubGraph
 from datahub.metadata.schema_classes import KafkaSchemaClass, SchemaMetadataClass
-
 from tests.utils import delete_urns_from_file, get_sleep_info, ingest_file_via_rest
 
 sleep_sec, sleep_times = get_sleep_info()
diff --git a/smoke-test/tests/cli/delete_cmd/test_timeseries_delete.py b/smoke-test/tests/cli/delete_cmd/test_timeseries_delete.py
index 8c526e32c70536..99ed790f25ffd7 100644
--- a/smoke-test/tests/cli/delete_cmd/test_timeseries_delete.py
+++ b/smoke-test/tests/cli/delete_cmd/test_timeseries_delete.py
@@ -5,12 +5,12 @@
 from json import JSONDecodeError
 from typing import Any, Dict, List, Optional
 
-import datahub.emitter.mce_builder as builder
 from click.testing import CliRunner, Result
+
+import datahub.emitter.mce_builder as builder
 from datahub.emitter.serialization_helper import pre_json_transform
 from datahub.entrypoints import datahub
 from datahub.metadata.schema_classes import DatasetProfileClass
-
 from tests.aspect_generators.timeseries.dataset_profile_gen import gen_dataset_profiles
 from tests.utils import get_strftime_from_timestamp_millis, wait_for_writes_to_sync
 
diff --git a/smoke-test/tests/cli/ingest_cmd/test_timeseries_rollback.py b/smoke-test/tests/cli/ingest_cmd/test_timeseries_rollback.py
index 4d148041e1a0be..f78ae89d7feca2 100644
--- a/smoke-test/tests/cli/ingest_cmd/test_timeseries_rollback.py
+++ b/smoke-test/tests/cli/ingest_cmd/test_timeseries_rollback.py
@@ -1,12 +1,12 @@
 import json
 from typing import Dict, List, Optional
 
-import datahub.emitter.mce_builder as builder
 from click.testing import CliRunner, Result
+
+import datahub.emitter.mce_builder as builder
 from datahub.emitter.serialization_helper import post_json_transform
 from datahub.entrypoints import datahub
 from datahub.metadata.schema_classes import DatasetProfileClass
-
 from tests.utils import ingest_file_via_rest, wait_for_writes_to_sync
 
 runner = CliRunner(mix_stderr=False)
diff --git a/smoke-test/tests/cli/user_groups_cmd/test_group_cmd.py b/smoke-test/tests/cli/user_groups_cmd/test_group_cmd.py
index 502848a722902e..5c5e0c62f6b10e 100644
--- a/smoke-test/tests/cli/user_groups_cmd/test_group_cmd.py
+++ b/smoke-test/tests/cli/user_groups_cmd/test_group_cmd.py
@@ -5,10 +5,10 @@
 
 import yaml
 from click.testing import CliRunner, Result
+
 from datahub.api.entities.corpgroup.corpgroup import CorpGroup
 from datahub.entrypoints import datahub
 from datahub.ingestion.graph.client import DataHubGraph
-
 from tests.utils import wait_for_writes_to_sync
 
 runner = CliRunner(mix_stderr=False)
diff --git a/smoke-test/tests/cli/user_groups_cmd/test_user_cmd.py b/smoke-test/tests/cli/user_groups_cmd/test_user_cmd.py
index 3d0902451ebfcd..12f349bed38055 100644
--- a/smoke-test/tests/cli/user_groups_cmd/test_user_cmd.py
+++ b/smoke-test/tests/cli/user_groups_cmd/test_user_cmd.py
@@ -5,6 +5,7 @@
 
 import yaml
 from click.testing import CliRunner, Result
+
 from datahub.api.entities.corpuser.corpuser import CorpUser
 from datahub.entrypoints import datahub
 
diff --git a/smoke-test/tests/cypress/integration_test.py b/smoke-test/tests/cypress/integration_test.py
index fa7274158f9e23..36fdd53a30c361 100644
--- a/smoke-test/tests/cypress/integration_test.py
+++ b/smoke-test/tests/cypress/integration_test.py
@@ -172,7 +172,7 @@ def ingest_cleanup_data(auth_session, graph_client):
 
 def _get_js_files(base_path: str):
     file_paths = []
-    for root, dirs, files in os.walk(base_path):
+    for root, _, files in os.walk(base_path):
         for file in files:
             if file.endswith(".js"):
                 file_paths.append(os.path.relpath(os.path.join(root, file), base_path))
diff --git a/smoke-test/tests/data_process_instance/test_data_process_instance.py b/smoke-test/tests/data_process_instance/test_data_process_instance.py
index a8aca6034d5be1..f1c532af515cfa 100644
--- a/smoke-test/tests/data_process_instance/test_data_process_instance.py
+++ b/smoke-test/tests/data_process_instance/test_data_process_instance.py
@@ -4,6 +4,7 @@
 from random import randint
 
 import pytest
+
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.api.common import PipelineContext, RecordEnvelope
 from datahub.ingestion.api.sink import NoopWriteCallback
@@ -23,7 +24,6 @@
     SubTypesClass,
     TimeWindowSizeClass,
 )
-
 from tests.utils import (
     delete_urns_from_file,
     ingest_file_via_rest,
diff --git a/smoke-test/tests/database/test_database.py b/smoke-test/tests/database/test_database.py
index 656c9e98887bf0..df7dc797cfdbad 100644
--- a/smoke-test/tests/database/test_database.py
+++ b/smoke-test/tests/database/test_database.py
@@ -1,8 +1,8 @@
 import logging
 
 import pytest
-from datahub.emitter.mce_builder import make_dataset_urn
 
+from datahub.emitter.mce_builder import make_dataset_urn
 from tests.utilities.concurrent_openapi import run_tests
 from tests.utils import delete_urns, wait_for_writes_to_sync
 
diff --git a/smoke-test/tests/dataproduct/test_dataproduct.py b/smoke-test/tests/dataproduct/test_dataproduct.py
index c26b443dd34a72..0aa66984b394c8 100644
--- a/smoke-test/tests/dataproduct/test_dataproduct.py
+++ b/smoke-test/tests/dataproduct/test_dataproduct.py
@@ -6,6 +6,7 @@
 
 import pytest
 import tenacity
+
 from datahub.emitter.mce_builder import datahub_guid, make_dataset_urn
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.api.common import PipelineContext, RecordEnvelope
@@ -19,7 +20,6 @@
     DomainsClass,
 )
 from datahub.utilities.urns.urn import Urn
-
 from tests.utils import (
     delete_urns_from_file,
     get_sleep_info,
diff --git a/smoke-test/tests/delete/delete_test.py b/smoke-test/tests/delete/delete_test.py
index a13fc883b4055d..e7fc5c793dc7d8 100644
--- a/smoke-test/tests/delete/delete_test.py
+++ b/smoke-test/tests/delete/delete_test.py
@@ -2,8 +2,8 @@
 import os
 
 import pytest
-from datahub.cli.cli_utils import get_aspects_for_entity
 
+from datahub.cli.cli_utils import get_aspects_for_entity
 from tests.utils import (
     delete_urns_from_file,
     ingest_file_via_rest,
diff --git a/smoke-test/tests/lineage/test_lineage.py b/smoke-test/tests/lineage/test_lineage.py
index 4a43fd591ae2e1..771085043926dd 100644
--- a/smoke-test/tests/lineage/test_lineage.py
+++ b/smoke-test/tests/lineage/test_lineage.py
@@ -3,9 +3,11 @@
 from enum import Enum
 from typing import Any, Dict, Iterable, List, Optional, Set, Tuple, Union
 
-import datahub.emitter.mce_builder as builder
 import networkx as nx
 import pytest
+from pydantic import BaseModel, validator
+
+import datahub.emitter.mce_builder as builder
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.graph.client import DataHubGraph
 from datahub.metadata.schema_classes import (
@@ -18,17 +20,9 @@
     DatasetLineageTypeClass,
     DatasetPropertiesClass,
     EdgeClass,
-)
-from datahub.metadata.schema_classes import (
     FineGrainedLineageClass as FineGrainedLineage,
-)
-from datahub.metadata.schema_classes import (
     FineGrainedLineageDownstreamTypeClass as FineGrainedLineageDownstreamType,
-)
-from datahub.metadata.schema_classes import (
     FineGrainedLineageUpstreamTypeClass as FineGrainedLineageUpstreamType,
-)
-from datahub.metadata.schema_classes import (
     OtherSchemaClass,
     QueryLanguageClass,
     QueryPropertiesClass,
@@ -43,8 +37,6 @@
 )
 from datahub.utilities.urns.dataset_urn import DatasetUrn
 from datahub.utilities.urns.urn import Urn
-from pydantic import BaseModel, validator
-
 from tests.utils import ingest_file_via_rest, wait_for_writes_to_sync
 
 logger = logging.getLogger(__name__)
diff --git a/smoke-test/tests/ml_models/test_ml_models.py b/smoke-test/tests/ml_models/test_ml_models.py
index 59821ab3e3cc41..534f40035083f2 100644
--- a/smoke-test/tests/ml_models/test_ml_models.py
+++ b/smoke-test/tests/ml_models/test_ml_models.py
@@ -4,6 +4,7 @@
 from random import randint
 
 import pytest
+
 from datahub.emitter.mce_builder import make_ml_model_group_urn, make_ml_model_urn
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.api.common import PipelineContext, RecordEnvelope
@@ -14,7 +15,6 @@
     MLModelGroupPropertiesClass,
     MLModelPropertiesClass,
 )
-
 from tests.utils import (
     delete_urns_from_file,
     get_sleep_info,
diff --git a/smoke-test/tests/patch/test_datajob_patches.py b/smoke-test/tests/patch/test_datajob_patches.py
index e025c8a2aebeb5..68b08f2b1ade72 100644
--- a/smoke-test/tests/patch/test_datajob_patches.py
+++ b/smoke-test/tests/patch/test_datajob_patches.py
@@ -10,7 +10,6 @@
     EdgeClass,
 )
 from datahub.specific.datajob import DataJobPatchBuilder
-
 from tests.patch.common_patch_tests import (
     helper_test_custom_properties_patch,
     helper_test_dataset_tags_patch,
diff --git a/smoke-test/tests/patch/test_dataset_patches.py b/smoke-test/tests/patch/test_dataset_patches.py
index bafacbc8d2b0b4..cb131f4356f429 100644
--- a/smoke-test/tests/patch/test_dataset_patches.py
+++ b/smoke-test/tests/patch/test_dataset_patches.py
@@ -15,7 +15,6 @@
     UpstreamLineageClass,
 )
 from datahub.specific.dataset import DatasetPatchBuilder
-
 from tests.patch.common_patch_tests import (
     helper_test_custom_properties_patch,
     helper_test_dataset_tags_patch,
diff --git a/smoke-test/tests/platform_resources/test_platform_resource.py b/smoke-test/tests/platform_resources/test_platform_resource.py
index 23a147bda695b3..191f8c44694985 100644
--- a/smoke-test/tests/platform_resources/test_platform_resource.py
+++ b/smoke-test/tests/platform_resources/test_platform_resource.py
@@ -4,13 +4,13 @@
 from typing import List
 
 import pytest
+
 from datahub.api.entities.platformresource.platform_resource import (
     ElasticPlatformResourceQuery,
     PlatformResource,
     PlatformResourceKey,
     PlatformResourceSearchFields,
 )
-
 from tests.utils import wait_for_writes_to_sync
 
 logger = logging.getLogger(__name__)
diff --git a/smoke-test/tests/restli/restli_test.py b/smoke-test/tests/restli/restli_test.py
index 7e9cf6aa76235c..a0c9a26750c0b0 100644
--- a/smoke-test/tests/restli/restli_test.py
+++ b/smoke-test/tests/restli/restli_test.py
@@ -4,6 +4,7 @@
 from typing import List
 
 import pytest
+
 from datahub.emitter.aspect import JSON_CONTENT_TYPE
 from datahub.emitter.mce_builder import make_dashboard_urn
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
@@ -16,7 +17,6 @@
     MetadataChangeProposalClass,
 )
 from datahub.utilities.urns.urn import guess_entity_type
-
 from tests.utils import delete_urns
 
 generated_urns: List[str] = []
diff --git a/smoke-test/tests/schema_fields/schema_evolution.py b/smoke-test/tests/schema_fields/schema_evolution.py
index 5481742969f5d1..962b71058150fd 100644
--- a/smoke-test/tests/schema_fields/schema_evolution.py
+++ b/smoke-test/tests/schema_fields/schema_evolution.py
@@ -1,14 +1,14 @@
 import time
 from enum import Enum
 
-import datahub.metadata.schema_classes as models
 import pytest
+from tenacity import retry, stop_after_delay, wait_fixed
+
+import datahub.metadata.schema_classes as models
 from datahub.cli.cli_utils import get_aspects_for_entity
 from datahub.emitter.mce_builder import make_dataset_urn, make_schema_field_urn
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.graph.client import DataHubGraph
-from tenacity import retry, stop_after_delay, wait_fixed
-
 from tests.utils import ingest_file_via_rest, wait_for_writes_to_sync
 
 _MAX_DELAY_UNTIL_WRITES_VISIBLE_SECS = 30
@@ -70,7 +70,7 @@ def test_setup(auth_session, graph_client):
 
     ingest_file_via_rest(
         auth_session, "tests/schema_fields/schema_field_side_effect_data.json"
-    ).config.run_id
+    )
 
     assert "schemaMetadata" in get_aspects_for_entity(
         session,
diff --git a/smoke-test/tests/schema_fields/test_schemafields.py b/smoke-test/tests/schema_fields/test_schemafields.py
index 30d705ef2b4e70..329a120a2f8587 100644
--- a/smoke-test/tests/schema_fields/test_schemafields.py
+++ b/smoke-test/tests/schema_fields/test_schemafields.py
@@ -4,15 +4,15 @@
 import time
 from random import randint
 
-import datahub.metadata.schema_classes as models
 import pytest
+
+import datahub.metadata.schema_classes as models
 from datahub.emitter.mce_builder import make_dataset_urn, make_schema_field_urn
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.api.common import PipelineContext, RecordEnvelope
 from datahub.ingestion.api.sink import NoopWriteCallback
 from datahub.ingestion.graph.client import DataHubGraph
 from datahub.ingestion.sink.file import FileSink, FileSinkConfig
-
 from tests.utils import (
     delete_urns_from_file,
     get_sleep_info,
diff --git a/smoke-test/tests/setup/lineage/ingest_data_job_change.py b/smoke-test/tests/setup/lineage/ingest_data_job_change.py
index 85924569ba9f0b..8143bd0b519df5 100644
--- a/smoke-test/tests/setup/lineage/ingest_data_job_change.py
+++ b/smoke-test/tests/setup/lineage/ingest_data_job_change.py
@@ -12,7 +12,6 @@
     SchemaFieldDataTypeClass,
     StringTypeClass,
 )
-
 from tests.setup.lineage.constants import (
     AIRFLOW_DATA_PLATFORM,
     SNOWFLAKE_DATA_PLATFORM,
diff --git a/smoke-test/tests/setup/lineage/ingest_dataset_join_change.py b/smoke-test/tests/setup/lineage/ingest_dataset_join_change.py
index 36fe3d19eff41d..aea5318eeba4ff 100644
--- a/smoke-test/tests/setup/lineage/ingest_dataset_join_change.py
+++ b/smoke-test/tests/setup/lineage/ingest_dataset_join_change.py
@@ -8,7 +8,6 @@
     StringTypeClass,
     UpstreamClass,
 )
-
 from tests.setup.lineage.constants import (
     DATASET_ENTITY_TYPE,
     SNOWFLAKE_DATA_PLATFORM,
diff --git a/smoke-test/tests/setup/lineage/ingest_input_datasets_change.py b/smoke-test/tests/setup/lineage/ingest_input_datasets_change.py
index 9ff0cfcc1182fa..623cb9665a3528 100644
--- a/smoke-test/tests/setup/lineage/ingest_input_datasets_change.py
+++ b/smoke-test/tests/setup/lineage/ingest_input_datasets_change.py
@@ -11,7 +11,6 @@
     SchemaFieldDataTypeClass,
     StringTypeClass,
 )
-
 from tests.setup.lineage.constants import (
     AIRFLOW_DATA_PLATFORM,
     BQ_DATA_PLATFORM,
diff --git a/smoke-test/tests/setup/lineage/ingest_time_lineage.py b/smoke-test/tests/setup/lineage/ingest_time_lineage.py
index 3d34ea5426c58c..3597ac5ff738bd 100644
--- a/smoke-test/tests/setup/lineage/ingest_time_lineage.py
+++ b/smoke-test/tests/setup/lineage/ingest_time_lineage.py
@@ -1,7 +1,6 @@
 from typing import List
 
 from datahub.ingestion.graph.client import DataHubGraph
-
 from tests.setup.lineage.ingest_data_job_change import (
     get_data_job_change_urns,
     ingest_data_job_change,
diff --git a/smoke-test/tests/setup/lineage/utils.py b/smoke-test/tests/setup/lineage/utils.py
index a58e73cb927987..6d21337c669f4b 100644
--- a/smoke-test/tests/setup/lineage/utils.py
+++ b/smoke-test/tests/setup/lineage/utils.py
@@ -24,7 +24,6 @@
     SchemaMetadataClass,
     UpstreamClass,
 )
-
 from tests.setup.lineage.constants import (
     DATA_FLOW_ENTITY_TYPE,
     DATA_FLOW_INFO_ASPECT_NAME,
diff --git a/smoke-test/tests/structured_properties/test_structured_properties.py b/smoke-test/tests/structured_properties/test_structured_properties.py
index e3c33aa406efc4..103d4e79bad3b0 100644
--- a/smoke-test/tests/structured_properties/test_structured_properties.py
+++ b/smoke-test/tests/structured_properties/test_structured_properties.py
@@ -24,7 +24,6 @@
 from datahub.specific.dataset import DatasetPatchBuilder
 from datahub.utilities.urns.structured_properties_urn import StructuredPropertyUrn
 from datahub.utilities.urns.urn import Urn
-
 from tests.consistency_utils import wait_for_writes_to_sync
 from tests.utilities.file_emitter import FileEmitter
 from tests.utils import (
diff --git a/smoke-test/tests/test_stateful_ingestion.py b/smoke-test/tests/test_stateful_ingestion.py
index 4436cf26c2fd78..819715013ab48f 100644
--- a/smoke-test/tests/test_stateful_ingestion.py
+++ b/smoke-test/tests/test_stateful_ingestion.py
@@ -1,5 +1,8 @@
 from typing import Any, Dict, Optional, cast
 
+from sqlalchemy import create_engine
+from sqlalchemy.sql import text
+
 from datahub.ingestion.api.committable import StatefulCommittable
 from datahub.ingestion.run.pipeline import Pipeline
 from datahub.ingestion.source.sql.mysql import MySQLConfig, MySQLSource
@@ -8,9 +11,6 @@
 from datahub.ingestion.source.state.stale_entity_removal_handler import (
     StaleEntityRemovalHandler,
 )
-from sqlalchemy import create_engine
-from sqlalchemy.sql import text
-
 from tests.utils import get_mysql_password, get_mysql_url, get_mysql_username
 
 
@@ -36,7 +36,7 @@ def run_and_get_pipeline(pipeline_config_dict: Dict[str, Any]) -> Pipeline:
 
     def validate_all_providers_have_committed_successfully(pipeline: Pipeline) -> None:
         provider_count: int = 0
-        for name, provider in pipeline.ctx.get_committables():
+        for _, provider in pipeline.ctx.get_committables():
             provider_count += 1
             assert isinstance(provider, StatefulCommittable)
             stateful_committable = cast(StatefulCommittable, provider)
diff --git a/smoke-test/tests/timeline/timeline_test.py b/smoke-test/tests/timeline/timeline_test.py
index d33ad3b24ceb5c..ddb5f8faf4a9b2 100644
--- a/smoke-test/tests/timeline/timeline_test.py
+++ b/smoke-test/tests/timeline/timeline_test.py
@@ -1,9 +1,9 @@
 import json
 
 import pytest
+
 from datahub.cli import timeline_cli
 from datahub.cli.cli_utils import guess_entity_type, post_entity
-
 from tests.utils import ingest_file_via_rest, wait_for_writes_to_sync
 
 pytestmark = pytest.mark.no_cypress_suite1
diff --git a/smoke-test/tests/tokens/revokable_access_token_test.py b/smoke-test/tests/tokens/revokable_access_token_test.py
index 006daae39333ed..30022345f15b45 100644
--- a/smoke-test/tests/tokens/revokable_access_token_test.py
+++ b/smoke-test/tests/tokens/revokable_access_token_test.py
@@ -432,7 +432,9 @@ def generateAccessToken_v2(session, actorUrn):
     return response.json()
 
 
-def listAccessTokens(session, filters=[]):
+def listAccessTokens(session, filters):
+    if filters is None:
+        filters = []
     # Get count of existing tokens
     input = {"start": 0, "count": 20}
 
diff --git a/smoke-test/tests/tokens/session_access_token_test.py b/smoke-test/tests/tokens/session_access_token_test.py
index a16abc44453036..5328fd4237f688 100644
--- a/smoke-test/tests/tokens/session_access_token_test.py
+++ b/smoke-test/tests/tokens/session_access_token_test.py
@@ -2,10 +2,10 @@
 import time
 
 import pytest
-from datahub.emitter.mcp import MetadataChangeProposalWrapper
-from datahub.metadata.schema_classes import AuditStampClass, CorpUserStatusClass
 from requests.exceptions import HTTPError
 
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.metadata.schema_classes import AuditStampClass, CorpUserStatusClass
 from tests.utils import (
     get_admin_credentials,
     get_frontend_url,
diff --git a/smoke-test/tests/utils.py b/smoke-test/tests/utils.py
index 2ddf233f5029ac..64121b9fa1ef5e 100644
--- a/smoke-test/tests/utils.py
+++ b/smoke-test/tests/utils.py
@@ -5,11 +5,11 @@
 from typing import Any, Dict, List, Tuple
 
 import requests
-from datahub.cli import cli_utils, env_utils
-from datahub.ingestion.run.pipeline import Pipeline
 from joblib import Parallel, delayed
 from requests.structures import CaseInsensitiveDict
 
+from datahub.cli import cli_utils, env_utils
+from datahub.ingestion.run.pipeline import Pipeline
 from tests.consistency_utils import wait_for_writes_to_sync
 
 TIME: int = 1581407189000

From 3d64cea6010fce76ed23fa292963b0fbc0e0113a Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Sat, 18 Jan 2025 03:31:32 +0530
Subject: [PATCH 110/249] build: create dependabot.yml to update github actions
 (#12376)

---
 .github/dependabot.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000000000..0d08e261a2ae9d
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

From d397b1368b9edc7f63204ea68cc467c970de5cf6 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Fri, 17 Jan 2025 14:26:00 -0800
Subject: [PATCH 111/249] feat(ingest): add strict_env_syntax mode to config
 loader (#12380)

---
 .../datahub/configuration/config_loader.py    | 123 +++++++++++-------
 .../src/datahub/secret/secret_common.py       |  22 ++--
 .../tests/unit/config/test_config_loader.py   |  23 ++++
 3 files changed, 110 insertions(+), 58 deletions(-)

diff --git a/metadata-ingestion/src/datahub/configuration/config_loader.py b/metadata-ingestion/src/datahub/configuration/config_loader.py
index c64e81e7c714c9..16105f69d584de 100644
--- a/metadata-ingestion/src/datahub/configuration/config_loader.py
+++ b/metadata-ingestion/src/datahub/configuration/config_loader.py
@@ -19,64 +19,87 @@
 Environ = Mapping[str, str]
 
 
-def _resolve_element(element: str, environ: Environ) -> str:
-    if re.search(r"(\$\{).+(\})", element):
-        return expand(element, nounset=True, environ=environ)
-    elif element.startswith("$"):
-        try:
-            return expand(element, nounset=True, environ=environ)
-        except UnboundVariable:
-            return element
-    else:
-        return element
-
-
-def _resolve_list(ele_list: list, environ: Environ) -> list:
-    new_v: list = []
-    for ele in ele_list:
-        if isinstance(ele, str):
-            new_v.append(_resolve_element(ele, environ=environ))
-        elif isinstance(ele, list):
-            new_v.append(_resolve_list(ele, environ=environ))
-        elif isinstance(ele, dict):
-            new_v.append(resolve_env_variables(ele, environ=environ))
-        else:
-            new_v.append(ele)
-    return new_v
-
-
 def resolve_env_variables(config: dict, environ: Environ) -> dict:
-    new_dict: Dict[Any, Any] = {}
-    for k, v in config.items():
-        if isinstance(v, dict):
-            new_dict[k] = resolve_env_variables(v, environ=environ)
-        elif isinstance(v, list):
-            new_dict[k] = _resolve_list(v, environ=environ)
-        elif isinstance(v, str):
-            new_dict[k] = _resolve_element(v, environ=environ)
-        else:
-            new_dict[k] = v
-    return new_dict
+    # TODO: This is kept around for backwards compatibility.
+    return EnvResolver(environ).resolve(config)
 
 
 def list_referenced_env_variables(config: dict) -> Set[str]:
-    # This is a bit of a hack, but expandvars does a bunch of escaping
-    # and other logic that we don't want to duplicate here.
+    # TODO: This is kept around for backwards compatibility.
+    return EnvResolver(environ=os.environ).list_referenced_variables(config)
+
+
+class EnvResolver:
+    def __init__(self, environ: Environ, strict_env_syntax: bool = False):
+        self.environ = environ
+        self.strict_env_syntax = strict_env_syntax
 
-    vars = set()
+    def resolve(self, config: dict) -> dict:
+        return self._resolve_dict(config)
 
-    def mock_get_env(key: str, default: Optional[str] = None) -> str:
-        vars.add(key)
-        if default is not None:
-            return default
-        return "mocked_value"
+    @classmethod
+    def list_referenced_variables(
+        cls,
+        config: dict,
+        strict_env_syntax: bool = False,
+    ) -> Set[str]:
+        # This is a bit of a hack, but expandvars does a bunch of escaping
+        # and other logic that we don't want to duplicate here.
 
-    mock = unittest.mock.MagicMock()
-    mock.get.side_effect = mock_get_env
+        vars = set()
 
-    resolve_env_variables(config, environ=mock)
+        def mock_get_env(key: str, default: Optional[str] = None) -> str:
+            vars.add(key)
+            if default is not None:
+                return default
+            return "mocked_value"
+
+        mock = unittest.mock.MagicMock()
+        mock.get.side_effect = mock_get_env
+
+        resolver = EnvResolver(environ=mock, strict_env_syntax=strict_env_syntax)
+        resolver._resolve_dict(config)
+
+        return vars
+
+    def _resolve_element(self, element: str) -> str:
+        if re.search(r"(\$\{).+(\})", element):
+            return expand(element, nounset=True, environ=self.environ)
+        elif not self.strict_env_syntax and element.startswith("$"):
+            try:
+                return expand(element, nounset=True, environ=self.environ)
+            except UnboundVariable:
+                # TODO: This fallback is kept around for backwards compatibility, but
+                # doesn't make a ton of sense from first principles.
+                return element
+        else:
+            return element
 
-    return vars
+    def _resolve_list(self, ele_list: list) -> list:
+        new_v: list = []
+        for ele in ele_list:
+            if isinstance(ele, str):
+                new_v.append(self._resolve_element(ele))
+            elif isinstance(ele, list):
+                new_v.append(self._resolve_list(ele))
+            elif isinstance(ele, dict):
+                new_v.append(self._resolve_dict(ele))
+            else:
+                new_v.append(ele)
+        return new_v
+
+    def _resolve_dict(self, config: dict) -> dict:
+        new_dict: Dict[Any, Any] = {}
+        for k, v in config.items():
+            if isinstance(v, dict):
+                new_dict[k] = self._resolve_dict(v)
+            elif isinstance(v, list):
+                new_dict[k] = self._resolve_list(v)
+            elif isinstance(v, str):
+                new_dict[k] = self._resolve_element(v)
+            else:
+                new_dict[k] = v
+        return new_dict
 
 
 WRITE_TO_FILE_DIRECTIVE_PREFIX = "__DATAHUB_TO_FILE_"
@@ -159,7 +182,7 @@ def load_config_file(
 
     config = raw_config.copy()
     if resolve_env_vars:
-        config = resolve_env_variables(config, environ=os.environ)
+        config = EnvResolver(environ=os.environ).resolve(config)
     if process_directives:
         config = _process_directives(config)
 
diff --git a/metadata-ingestion/src/datahub/secret/secret_common.py b/metadata-ingestion/src/datahub/secret/secret_common.py
index 2f7a584d875380..a116c70407af23 100644
--- a/metadata-ingestion/src/datahub/secret/secret_common.py
+++ b/metadata-ingestion/src/datahub/secret/secret_common.py
@@ -2,10 +2,7 @@
 import logging
 from typing import List
 
-from datahub.configuration.config_loader import (
-    list_referenced_env_variables,
-    resolve_env_variables,
-)
+from datahub.configuration.config_loader import EnvResolver
 from datahub.secret.secret_store import SecretStore
 
 logger = logging.getLogger(__name__)
@@ -42,18 +39,27 @@ def resolve_secrets(secret_names: List[str], secret_stores: List[SecretStore]) -
     return final_secret_values
 
 
-def resolve_recipe(recipe: str, secret_stores: List[SecretStore]) -> dict:
+def resolve_recipe(
+    recipe: str, secret_stores: List[SecretStore], strict_env_syntax: bool = True
+) -> dict:
+    # Note: the default for `strict_env_syntax` is normally False, but here we override
+    # it to be true. Particularly when fetching secrets from external secret stores, we
+    # want to be more careful about not over-fetching secrets.
+
     json_recipe_raw = json.loads(recipe)
 
     # 1. Extract all secrets needing resolved.
-    secrets_to_resolve = list_referenced_env_variables(json_recipe_raw)
+    secrets_to_resolve = EnvResolver.list_referenced_variables(
+        json_recipe_raw, strict_env_syntax=strict_env_syntax
+    )
 
     # 2. Resolve secret values
     secret_values_dict = resolve_secrets(list(secrets_to_resolve), secret_stores)
 
     # 3. Substitute secrets into recipe file
-    json_recipe_resolved = resolve_env_variables(
-        json_recipe_raw, environ=secret_values_dict
+    resolver = EnvResolver(
+        environ=secret_values_dict, strict_env_syntax=strict_env_syntax
     )
+    json_recipe_resolved = resolver.resolve(json_recipe_raw)
 
     return json_recipe_resolved
diff --git a/metadata-ingestion/tests/unit/config/test_config_loader.py b/metadata-ingestion/tests/unit/config/test_config_loader.py
index 25ee289ec4e4e7..43781acd7f80c0 100644
--- a/metadata-ingestion/tests/unit/config/test_config_loader.py
+++ b/metadata-ingestion/tests/unit/config/test_config_loader.py
@@ -10,6 +10,7 @@
 
 from datahub.configuration.common import ConfigurationError
 from datahub.configuration.config_loader import (
+    EnvResolver,
     list_referenced_env_variables,
     load_config_file,
 )
@@ -138,6 +139,28 @@ def test_load_success(pytestconfig, filename, golden_config, env, referenced_env
         # TODO check referenced env vars
 
 
+def test_load_strict_env_syntax() -> None:
+    config = {
+        "foo": "${BAR}",
+        "baz": "$BAZ",
+        "qux": "qux$QUX",
+    }
+    assert EnvResolver.list_referenced_variables(
+        config,
+        strict_env_syntax=True,
+    ) == {"BAR"}
+
+    assert EnvResolver(
+        environ={
+            "BAR": "bar",
+        }
+    ).resolve(config) == {
+        "foo": "bar",
+        "baz": "$BAZ",
+        "qux": "qux$QUX",
+    }
+
+
 @pytest.mark.parametrize(
     "filename,env,error_type",
     [

From 2d044e928e405302d28138b72a28c36ca6518956 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Jan 2025 05:55:29 +0530
Subject: [PATCH 112/249] build(deps): bump actions-ecosystem/action-add-labels
 from 1.1.0 to 1.1.3 (#12386)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/pr-labeler.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
index de7ad21b3e67bb..bbcc7db57d0a21 100644
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -14,7 +14,7 @@ jobs:
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           configuration-path: ".github/pr-labeler-config.yml"
-      - uses: actions-ecosystem/action-add-labels@v1.1.0
+      - uses: actions-ecosystem/action-add-labels@v1.1.3
         # only add names of Acryl Data team members here
         if: 
           ${{ 
@@ -55,7 +55,7 @@ jobs:
           github_token: ${{ github.token }}
           labels: |
             community-contribution
-      - uses: actions-ecosystem/action-add-labels@v1.1.0
+      - uses: actions-ecosystem/action-add-labels@v1.1.3
         # only add names of champions here. Confirm with DevRel Team
         if: 
           ${{ 

From 652e5df1339c38883fc290a7c13ea9617f4d2a73 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Jan 2025 05:56:08 +0530
Subject: [PATCH 113/249] build(deps): bump actions/labeler from 4 to 5
 (#12385)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/pr-labeler.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
index bbcc7db57d0a21..f519db20a73e10 100644
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -10,7 +10,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v4
+      - uses: actions/labeler@v5
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           configuration-path: ".github/pr-labeler-config.yml"

From 94e966506d7343b90c42ef626da9987bd7ba7d21 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Jan 2025 05:56:24 +0530
Subject: [PATCH 114/249] build(deps): bump github/codeql-action from 2 to 3
 (#12383)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/docker-unified.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker-unified.yml b/.github/workflows/docker-unified.yml
index e44e6b11c6d057..a751d24dc18310 100644
--- a/.github/workflows/docker-unified.yml
+++ b/.github/workflows/docker-unified.yml
@@ -205,7 +205,7 @@ jobs:
           ignore-unfixed: true
           vuln-type: "os,library"
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: "trivy-results.sarif"
 
@@ -276,7 +276,7 @@ jobs:
           ignore-unfixed: true
           vuln-type: "os,library"
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: "trivy-results.sarif"
 
@@ -347,7 +347,7 @@ jobs:
           ignore-unfixed: true
           vuln-type: "os,library"
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: "trivy-results.sarif"
 
@@ -418,7 +418,7 @@ jobs:
           ignore-unfixed: true
           vuln-type: "os,library"
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: "trivy-results.sarif"
 
@@ -489,7 +489,7 @@ jobs:
           ignore-unfixed: true
           vuln-type: "os,library"
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: "trivy-results.sarif"
 
@@ -550,7 +550,7 @@ jobs:
           ignore-unfixed: true
           vuln-type: "os,library"
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: "trivy-results.sarif"
 
@@ -611,7 +611,7 @@ jobs:
           ignore-unfixed: true
           vuln-type: "os,library"
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: "trivy-results.sarif"
 
@@ -672,7 +672,7 @@ jobs:
           ignore-unfixed: true
           vuln-type: "os,library"
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: "trivy-results.sarif"
 
@@ -901,7 +901,7 @@ jobs:
           vuln-type: "os,library"
           timeout: 15m
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: "trivy-results.sarif"
 
@@ -1000,7 +1000,7 @@ jobs:
           vuln-type: "os,library"
           timeout: 15m
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: "trivy-results.sarif"
 

From f06ad1a1d58d77e61408b41af88b9066e3424e97 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Fri, 17 Jan 2025 16:28:12 -0800
Subject: [PATCH 115/249] fix(ingest): simplify + fix ruff config (#12382)

---
 metadata-ingestion/build.gradle               |  6 ++--
 metadata-ingestion/pyproject.toml             | 31 ++++++-------------
 .../api/entities/corpgroup/corpgroup.py       |  2 +-
 .../ingestion/source/aws/s3_boto_utils.py     |  6 ++--
 .../ingestion/source/ge_data_profiler.py      |  3 +-
 .../ingestion/source/usage/usage_common.py    |  2 +-
 .../datahub/sql_parsing/sqlglot_lineage.py    |  3 +-
 .../src/datahub/sql_parsing/sqlglot_utils.py  |  3 +-
 .../unit/sql_parsing/test_sqlglot_patch.py    |  3 +-
 9 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/metadata-ingestion/build.gradle b/metadata-ingestion/build.gradle
index 14e467e27316e3..16a6704949c875 100644
--- a/metadata-ingestion/build.gradle
+++ b/metadata-ingestion/build.gradle
@@ -23,8 +23,10 @@ task environmentSetup(type: Exec, dependsOn: checkPythonVersion) {
   inputs.file file('setup.py')
   outputs.file(sentinel_file)
   commandLine 'bash', '-c',
-    "${python_executable} -m venv ${venv_name} && set -x && " +
-    "${venv_name}/bin/python -m pip install --upgrade uv && " +
+    "if [ ! -d ${venv_name} ] || [ ! -f ${venv_name}/bin/python ]; then ${python_executable} -m venv ${venv_name}; fi && " +
+    "set -x && " +
+    // If we already have uv available, use it to upgrade uv. Otherwise, install it with pip.
+    "if [ ! -f ${venv_name}/bin/uv ]; then ${venv_name}/bin/python -m pip install --upgrade uv; else ${venv_name}/bin/python -m uv pip install --upgrade uv; fi && " +
     "touch ${sentinel_file}"
 }
 
diff --git a/metadata-ingestion/pyproject.toml b/metadata-ingestion/pyproject.toml
index 745547f88bcb93..07f2010fde25f0 100644
--- a/metadata-ingestion/pyproject.toml
+++ b/metadata-ingestion/pyproject.toml
@@ -11,25 +11,13 @@ extend-exclude = '''
 include = '\.pyi?$'
 target-version = ['py38', 'py39', 'py310', 'py311']
 
-
 [tool.ruff.lint.isort]
+section-order = ["future", "patch", "standard-library", "third-party", "first-party", "local-folder"]
+sections = { "patch" = ["datahub.utilities._markupsafe_compat", "datahub.sql_parsing._sqlglot_patch"] }
 combine-as-imports = true
-known-first-party = ["datahub"]
-extra-standard-library = ["__future__", "datahub.utilities._markupsafe_compat", "datahub.sql_parsing._sqlglot_patch"]
-section-order = ["future", "standard-library", "third-party", "first-party", "local-folder"]
-force-sort-within-sections = false
-force-wrap-aliases = false
-split-on-trailing-comma = false
-order-by-type = true
-relative-imports-order = "closest-to-furthest"
-force-single-line = false
-single-line-exclusions = ["typing"]
-length-sort = false
-from-first = false
-required-imports = []
-classes = ["typing"]
 
 [tool.ruff]
+target-version = "py38"
 # Same as Black.
 line-length = 88
 # Exclude directories matching these patterns.
@@ -42,15 +30,16 @@ exclude = [
 ]
 
 [tool.ruff.lint]
-select = [
-    "B",
+extend-select = [
+    "B",  # Bugbear
     "C90",
     "E",
     "F",
-    "I", # For isort
-    "TID",
+    "G010",  # logging.warn -> logging.warning
+    "I",  # Import sorting
+    "TID",  # Tidy imports
 ]
-ignore = [
+extend-ignore = [
     # Ignore line length violations (handled by Black)
     "E501",
     # Ignore whitespace before ':' (matches Black)
@@ -69,9 +58,7 @@ ignore = [
 max-complexity = 20
 
 [tool.ruff.lint.flake8-tidy-imports]
-# Disallow all relative imports.
 ban-relative-imports = "all"
 
-
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]
\ No newline at end of file
diff --git a/metadata-ingestion/src/datahub/api/entities/corpgroup/corpgroup.py b/metadata-ingestion/src/datahub/api/entities/corpgroup/corpgroup.py
index a898e35bb810ec..bf58d2fbbda913 100644
--- a/metadata-ingestion/src/datahub/api/entities/corpgroup/corpgroup.py
+++ b/metadata-ingestion/src/datahub/api/entities/corpgroup/corpgroup.py
@@ -114,7 +114,7 @@ def generate_mcp(
                 )
                 urns_created.add(m.urn)
             else:
-                logger.warn(
+                logger.warning(
                     f"Suppressing emission of member {m.urn} before we already emitted metadata for it"
                 )
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/aws/s3_boto_utils.py b/metadata-ingestion/src/datahub/ingestion/source/aws/s3_boto_utils.py
index 682cddca8f4154..87a6f8a5baf2e3 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/aws/s3_boto_utils.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/aws/s3_boto_utils.py
@@ -40,7 +40,7 @@ def get_s3_tags(
                 ]
             )
         except s3.meta.client.exceptions.ClientError:
-            logger.warn(f"No tags found for bucket={bucket_name}")
+            logger.warning(f"No tags found for bucket={bucket_name}")
 
     if use_s3_object_tags and key_name is not None:
         s3_client = aws_config.get_s3_client()
@@ -53,7 +53,7 @@ def get_s3_tags(
         else:
             # Unlike bucket tags, if an object does not have tags, it will just return an empty array
             # as opposed to an exception.
-            logger.warn(f"No tags found for bucket={bucket_name} key={key_name}")
+            logger.warning(f"No tags found for bucket={bucket_name} key={key_name}")
     if len(tags_to_add) == 0:
         return None
     if ctx.graph is not None:
@@ -65,7 +65,7 @@ def get_s3_tags(
         if current_tags:
             tags_to_add.extend([current_tag.tag for current_tag in current_tags.tags])
     else:
-        logger.warn("Could not connect to DatahubApi. No current tags to maintain")
+        logger.warning("Could not connect to DatahubApi. No current tags to maintain")
     # Remove duplicate tags
     tags_to_add = sorted(list(set(tags_to_add)))
     new_tags = GlobalTagsClass(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/ge_data_profiler.py b/metadata-ingestion/src/datahub/ingestion/source/ge_data_profiler.py
index be182c70eafec1..aba0deebd356c5 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/ge_data_profiler.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/ge_data_profiler.py
@@ -1,3 +1,5 @@
+from datahub.utilities._markupsafe_compat import MARKUPSAFE_PATCHED
+
 import collections
 import concurrent.futures
 import contextlib
@@ -10,7 +12,6 @@
 import traceback
 import unittest.mock
 import uuid
-from datahub.utilities._markupsafe_compat import MARKUPSAFE_PATCHED
 from functools import lru_cache
 from typing import (
     TYPE_CHECKING,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/usage/usage_common.py b/metadata-ingestion/src/datahub/ingestion/source/usage/usage_common.py
index 95c2345232a1ee..73e7e415e2b9eb 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/usage/usage_common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/usage/usage_common.py
@@ -89,7 +89,7 @@ def make_usage_workunit(
     top_sql_queries: Optional[List[str]] = None
     if query_freq is not None:
         if top_n_queries < len(query_freq):
-            logger.warn(
+            logger.warning(
                 f"Top N query limit exceeded on {str(resource)}.  Max number of queries {top_n_queries} <  {len(query_freq)}. Truncating top queries to {top_n_queries}."
             )
             query_freq = query_freq[0:top_n_queries]
diff --git a/metadata-ingestion/src/datahub/sql_parsing/sqlglot_lineage.py b/metadata-ingestion/src/datahub/sql_parsing/sqlglot_lineage.py
index d3149fec970b59..bf28ab0e7b229b 100644
--- a/metadata-ingestion/src/datahub/sql_parsing/sqlglot_lineage.py
+++ b/metadata-ingestion/src/datahub/sql_parsing/sqlglot_lineage.py
@@ -1,9 +1,10 @@
+from datahub.sql_parsing._sqlglot_patch import SQLGLOT_PATCHED
+
 import dataclasses
 import functools
 import logging
 import traceback
 from collections import defaultdict
-from datahub.sql_parsing._sqlglot_patch import SQLGLOT_PATCHED
 from typing import Any, Dict, List, Optional, Set, Tuple, TypeVar, Union
 
 import pydantic.dataclasses
diff --git a/metadata-ingestion/src/datahub/sql_parsing/sqlglot_utils.py b/metadata-ingestion/src/datahub/sql_parsing/sqlglot_utils.py
index fd2c68266624f9..57a5cc3c9a6574 100644
--- a/metadata-ingestion/src/datahub/sql_parsing/sqlglot_utils.py
+++ b/metadata-ingestion/src/datahub/sql_parsing/sqlglot_utils.py
@@ -1,8 +1,9 @@
+from datahub.sql_parsing._sqlglot_patch import SQLGLOT_PATCHED
+
 import functools
 import hashlib
 import logging
 import re
-from datahub.sql_parsing._sqlglot_patch import SQLGLOT_PATCHED
 from typing import Dict, Iterable, Optional, Tuple, Union
 
 import sqlglot
diff --git a/metadata-ingestion/tests/unit/sql_parsing/test_sqlglot_patch.py b/metadata-ingestion/tests/unit/sql_parsing/test_sqlglot_patch.py
index 31f87b8a150eb2..dee6d9630c12eb 100644
--- a/metadata-ingestion/tests/unit/sql_parsing/test_sqlglot_patch.py
+++ b/metadata-ingestion/tests/unit/sql_parsing/test_sqlglot_patch.py
@@ -1,6 +1,7 @@
-import time
 from datahub.sql_parsing._sqlglot_patch import SQLGLOT_PATCHED
 
+import time
+
 import pytest
 import sqlglot
 import sqlglot.errors

From e5d61698c64512ca4c044cc465c814ff03866f76 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Jan 2025 07:22:39 +0530
Subject: [PATCH 116/249] build(deps): bump aquasecurity/trivy-action from
 0.26.0 to 0.29.0 (#12384)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/docker-unified.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker-unified.yml b/.github/workflows/docker-unified.yml
index a751d24dc18310..66cba0f7a8aaef 100644
--- a/.github/workflows/docker-unified.yml
+++ b/.github/workflows/docker-unified.yml
@@ -191,7 +191,7 @@ jobs:
         with:
           image: ${{ env.DATAHUB_GMS_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.26.0
+        uses: aquasecurity/trivy-action@0.29.0
         env:
           TRIVY_OFFLINE_SCAN: true
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2,ghcr.io/aquasecurity/trivy-db:2
@@ -262,7 +262,7 @@ jobs:
         with:
           image: ${{ env.DATAHUB_MAE_CONSUMER_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.26.0
+        uses: aquasecurity/trivy-action@0.29.0
         env:
           TRIVY_OFFLINE_SCAN: true
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2,ghcr.io/aquasecurity/trivy-db:2
@@ -333,7 +333,7 @@ jobs:
         with:
           image: ${{ env.DATAHUB_MCE_CONSUMER_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.26.0
+        uses: aquasecurity/trivy-action@0.29.0
         env:
           TRIVY_OFFLINE_SCAN: true
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2,ghcr.io/aquasecurity/trivy-db:2
@@ -404,7 +404,7 @@ jobs:
         with:
           image: ${{ env.DATAHUB_UPGRADE_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.26.0
+        uses: aquasecurity/trivy-action@0.29.0
         env:
           TRIVY_OFFLINE_SCAN: true
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2,ghcr.io/aquasecurity/trivy-db:2
@@ -475,7 +475,7 @@ jobs:
         with:
           image: ${{ env.DATAHUB_FRONTEND_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.26.0
+        uses: aquasecurity/trivy-action@0.29.0
         env:
           TRIVY_OFFLINE_SCAN: true
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2,ghcr.io/aquasecurity/trivy-db:2
@@ -536,7 +536,7 @@ jobs:
         with:
           image: ${{ env.DATAHUB_KAFKA_SETUP_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.26.0
+        uses: aquasecurity/trivy-action@0.29.0
         env:
           TRIVY_OFFLINE_SCAN: true
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2,ghcr.io/aquasecurity/trivy-db:2
@@ -597,7 +597,7 @@ jobs:
         with:
           image: ${{ env.DATAHUB_MYSQL_SETUP_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.26.0
+        uses: aquasecurity/trivy-action@0.29.0
         env:
           TRIVY_OFFLINE_SCAN: true
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2,ghcr.io/aquasecurity/trivy-db:2
@@ -658,7 +658,7 @@ jobs:
         with:
           image: ${{ env.DATAHUB_ELASTIC_SETUP_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.26.0
+        uses: aquasecurity/trivy-action@0.29.0
         env:
           TRIVY_OFFLINE_SCAN: true
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2,ghcr.io/aquasecurity/trivy-db:2
@@ -886,7 +886,7 @@ jobs:
         with:
           image: ${{ env.DATAHUB_INGESTION_IMAGE }}:${{ needs.datahub_ingestion_slim_build.outputs.tag }}
       - name: Run Trivy vulnerability scanner Slim Image
-        uses: aquasecurity/trivy-action@0.26.0
+        uses: aquasecurity/trivy-action@0.29.0
         env:
           TRIVY_OFFLINE_SCAN: true
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2,ghcr.io/aquasecurity/trivy-db:2
@@ -985,7 +985,7 @@ jobs:
         with:
           image: ${{ env.DATAHUB_INGESTION_IMAGE }}:${{ needs.datahub_ingestion_full_build.outputs.tag }}
       - name: Run Trivy vulnerability scanner Full Image
-        uses: aquasecurity/trivy-action@0.26.0
+        uses: aquasecurity/trivy-action@0.29.0
         env:
           TRIVY_OFFLINE_SCAN: true
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2,ghcr.io/aquasecurity/trivy-db:2

From 654728eec67025077b0da9f1e5b7ec8f2df18624 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Jan 2025 08:19:15 +0530
Subject: [PATCH 117/249] build(deps): bump gradle/actions from 3 to 4 (#12387)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aseem Bansal <asmbansal2@gmail.com>
---
 .github/workflows/airflow-plugin.yml       |  2 +-
 .github/workflows/build-and-test.yml       |  2 +-
 .github/workflows/check-datahub-jars.yml   |  2 +-
 .github/workflows/dagster-plugin.yml       |  2 +-
 .github/workflows/docker-unified.yml       | 18 +++++++++---------
 .github/workflows/documentation.yml        |  2 +-
 .github/workflows/gx-plugin.yml            |  2 +-
 .github/workflows/metadata-ingestion.yml   |  2 +-
 .github/workflows/metadata-io.yml          |  2 +-
 .github/workflows/metadata-model.yml       |  2 +-
 .github/workflows/prefect-plugin.yml       |  2 +-
 .github/workflows/publish-datahub-jars.yml |  4 ++--
 .github/workflows/spark-smoke-test.yml     |  2 +-
 13 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/airflow-plugin.yml b/.github/workflows/airflow-plugin.yml
index e1e0fb0a85e977..31c77d754dc69d 100644
--- a/.github/workflows/airflow-plugin.yml
+++ b/.github/workflows/airflow-plugin.yml
@@ -56,7 +56,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - uses: acryldata/sane-checkout-action@v3
       - uses: actions/setup-python@v5
         with:
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 86545946d6afea..65d85b9d89e2b3 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -83,7 +83,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - name: Gradle build (and test) for NOT metadata ingestion
         if: ${{  matrix.command == 'except_metadata_ingestion' && needs.setup.outputs.backend_change == 'true' }}
         # datahub-schematron:cli excluded due to dependency on metadata-ingestion
diff --git a/.github/workflows/check-datahub-jars.yml b/.github/workflows/check-datahub-jars.yml
index dc770f7fc83a61..1b284578483f30 100644
--- a/.github/workflows/check-datahub-jars.yml
+++ b/.github/workflows/check-datahub-jars.yml
@@ -43,7 +43,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - name: check ${{ matrix.command }} jar
         run: |
           ./gradlew :metadata-integration:java:${{ matrix.command }}:build --info
diff --git a/.github/workflows/dagster-plugin.yml b/.github/workflows/dagster-plugin.yml
index a2ac59d6989a9f..61fddaeb7770bb 100644
--- a/.github/workflows/dagster-plugin.yml
+++ b/.github/workflows/dagster-plugin.yml
@@ -44,7 +44,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - uses: acryldata/sane-checkout-action@v3
       - uses: actions/setup-python@v5
         with:
diff --git a/.github/workflows/docker-unified.yml b/.github/workflows/docker-unified.yml
index 66cba0f7a8aaef..53946ab8b1018c 100644
--- a/.github/workflows/docker-unified.yml
+++ b/.github/workflows/docker-unified.yml
@@ -130,7 +130,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - name: Run lint on smoke test
         if: ${{ steps.ci-optimize.outputs.smoke-test-change == 'true' }}
         run: |
@@ -154,7 +154,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - name: Check out the repo
         uses: acryldata/sane-checkout-action@v3
       - name: Pre-build artifacts for docker image
@@ -225,7 +225,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - name: Check out the repo
         uses: acryldata/sane-checkout-action@v3
       - name: Pre-build artifacts for docker image
@@ -296,7 +296,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - name: Check out the repo
         uses: acryldata/sane-checkout-action@v3
       - name: Pre-build artifacts for docker image
@@ -367,7 +367,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - name: Check out the repo
         uses: acryldata/sane-checkout-action@v3
       - name: Pre-build artifacts for docker image
@@ -438,7 +438,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - name: Check out the repo
         uses: acryldata/sane-checkout-action@v3
       - name: Pre-build artifacts for docker image
@@ -829,7 +829,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - name: Build codegen
         if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish =='true' }}
         run: ./gradlew :metadata-ingestion:codegen
@@ -930,7 +930,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - name: Build codegen
         if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
         run: ./gradlew :metadata-ingestion:codegen
@@ -1083,7 +1083,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - name: Login to DockerHub
         uses: docker/login-action@v3
         if: ${{ needs.setup.outputs.docker-login == 'true' }}
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index f38133b1c0ad26..f9d459652086fb 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -42,7 +42,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
diff --git a/.github/workflows/gx-plugin.yml b/.github/workflows/gx-plugin.yml
index c28bdbb30eb36d..68d7934d1d6e6f 100644
--- a/.github/workflows/gx-plugin.yml
+++ b/.github/workflows/gx-plugin.yml
@@ -48,7 +48,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - uses: acryldata/sane-checkout-action@v3
       - uses: actions/setup-python@v5
         with:
diff --git a/.github/workflows/metadata-ingestion.yml b/.github/workflows/metadata-ingestion.yml
index be6026098ce420..ff4531ab0b25c1 100644
--- a/.github/workflows/metadata-ingestion.yml
+++ b/.github/workflows/metadata-ingestion.yml
@@ -54,7 +54,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - uses: acryldata/sane-checkout-action@v3
       - uses: actions/setup-python@v5
         with:
diff --git a/.github/workflows/metadata-io.yml b/.github/workflows/metadata-io.yml
index 80af03e77eef82..6514b9e7226b60 100644
--- a/.github/workflows/metadata-io.yml
+++ b/.github/workflows/metadata-io.yml
@@ -67,7 +67,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - name: Gradle build (and test)
         run: |
           ./gradlew :metadata-io:test
diff --git a/.github/workflows/metadata-model.yml b/.github/workflows/metadata-model.yml
index 6f62284afcc172..f9262d89f9ef00 100644
--- a/.github/workflows/metadata-model.yml
+++ b/.github/workflows/metadata-model.yml
@@ -32,7 +32,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - uses: acryldata/sane-checkout-action@v3
       - uses: actions/setup-python@v5
         with:
diff --git a/.github/workflows/prefect-plugin.yml b/.github/workflows/prefect-plugin.yml
index 401efa340ae8ca..f1b06f31a05224 100644
--- a/.github/workflows/prefect-plugin.yml
+++ b/.github/workflows/prefect-plugin.yml
@@ -39,7 +39,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - uses: acryldata/sane-checkout-action@v3
       - uses: actions/setup-python@v5
         with:
diff --git a/.github/workflows/publish-datahub-jars.yml b/.github/workflows/publish-datahub-jars.yml
index 393f9d993e2a2f..fa3554c05d374c 100644
--- a/.github/workflows/publish-datahub-jars.yml
+++ b/.github/workflows/publish-datahub-jars.yml
@@ -57,7 +57,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
@@ -210,7 +210,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
diff --git a/.github/workflows/spark-smoke-test.yml b/.github/workflows/spark-smoke-test.yml
index e6a6705a72879c..7a2080b7a9ddf3 100644
--- a/.github/workflows/spark-smoke-test.yml
+++ b/.github/workflows/spark-smoke-test.yml
@@ -35,7 +35,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - uses: actions/setup-python@v5
         with:
           python-version: "3.10"

From 262dd76518049c25c977b97e7144fcae6c270a80 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Sat, 18 Jan 2025 15:06:20 +0530
Subject: [PATCH 118/249] dev: remove black in favor of ruff for formatting
 (#12378)

---
 .../airflow-plugin/build.gradle               |  10 +-
 .../airflow-plugin/pyproject.toml             |  48 ++++-----
 .../airflow-plugin/setup.py                   |   1 -
 .../src/datahub_airflow_plugin/_extractors.py |   6 +-
 .../datahub_listener.py                       |   6 +-
 .../datahub_plugin_v22.py                     |   8 +-
 .../example_dags/lineage_emission_dag.py      |   1 +
 .../tests/integration/test_plugin.py          |  22 ++--
 .../airflow-plugin/tests/unit/test_airflow.py |   9 +-
 .../dagster-plugin/build.gradle               |  12 ++-
 .../examples/advanced_ops_jobs.py             |   2 +-
 .../dagster-plugin/examples/assets_job.py     |   2 +-
 .../dagster-plugin/examples/basic_setup.py    |   2 +-
 .../dagster-plugin/examples/ops_job.py        |   2 +-
 .../dagster-plugin/pyproject.toml             |  48 ++++-----
 .../dagster-plugin/setup.py                   |   1 -
 .../client/dagster_generator.py               |   8 +-
 .../sensors/datahub_sensors.py                |   1 -
 .../gx-plugin/build.gradle                    |  12 ++-
 .../gx-plugin/pyproject.toml                  |  48 ++++-----
 metadata-ingestion-modules/gx-plugin/setup.py |   3 +-
 .../gx-plugin/src/datahub_gx_plugin/action.py |   5 +-
 .../prefect-plugin/build.gradle               |  10 +-
 .../prefect-plugin/pyproject.toml             |  48 ++++-----
 .../prefect-plugin/setup.py                   |   3 +-
 .../src/prefect_datahub/datahub_emitter.py    |   6 +-
 metadata-ingestion/build.gradle               |   7 +-
 metadata-ingestion/developing.md              |   3 +-
 .../examples/library/run_assertion.py         |   2 +-
 metadata-ingestion/pyproject.toml             |  40 +++----
 metadata-ingestion/setup.py                   |   1 -
 .../entities/assertion/assertion_operator.py  |   8 +-
 .../datacontract/assertion_operator.py        |   8 +-
 .../api/entities/dataproduct/dataproduct.py   |   6 +-
 .../datahub/api/entities/dataset/dataset.py   |   3 +-
 .../structuredproperties.py                   |  12 +--
 .../src/datahub/cli/cli_utils.py              |   2 +-
 .../src/datahub/cli/docker_cli.py             |  12 +--
 .../src/datahub/cli/lite_cli.py               |   4 +-
 metadata-ingestion/src/datahub/cli/migrate.py |   6 +-
 .../datahub/cli/specific/assertions_cli.py    |   6 +-
 .../src/datahub/cli/timeline_cli.py           |   2 +-
 .../src/datahub/configuration/common.py       |   3 +-
 .../src/datahub/configuration/git.py          |   4 +-
 .../configuration/time_window_config.py       |  15 ++-
 .../src/datahub/emitter/mce_builder.py        |  12 +--
 .../src/datahub/emitter/mcp_patch_builder.py  |   3 +-
 .../api/incremental_lineage_helper.py         |  10 +-
 .../src/datahub/ingestion/api/report.py       |   3 +-
 .../datahub/ingestion/api/source_helpers.py   |   2 +-
 .../ingestion/extractor/json_schema_util.py   |   6 +-
 .../ingestion/extractor/schema_util.py        |   8 +-
 .../src/datahub/ingestion/fs/s3_fs.py         |   6 +-
 .../ingestion/glossary/datahub_classifier.py  |  10 +-
 .../src/datahub/ingestion/graph/client.py     |  10 +-
 .../src/datahub/ingestion/run/pipeline.py     |  10 +-
 .../datahub/ingestion/run/pipeline_config.py  |   6 +-
 .../source/abs/datalake_profiler_config.py    |   6 +-
 .../datahub/ingestion/source/abs/source.py    |  25 +++--
 .../src/datahub/ingestion/source/aws/glue.py  |  22 ++--
 .../sagemaker_processors/feature_groups.py    |   2 +-
 .../source/aws/sagemaker_processors/models.py |   4 +-
 .../ingestion/source/bigquery_v2/bigquery.py  |   6 +-
 .../source/bigquery_v2/bigquery_audit.py      |   6 +-
 .../source/bigquery_v2/bigquery_config.py     |  12 +--
 .../bigquery_platform_resource_helper.py      |  12 ++-
 .../source/bigquery_v2/bigquery_schema_gen.py |  24 +++--
 .../ingestion/source/bigquery_v2/lineage.py   |  18 ++--
 .../ingestion/source/bigquery_v2/queries.py   |   4 +-
 .../source/bigquery_v2/queries_extractor.py   |   6 +-
 .../ingestion/source/bigquery_v2/usage.py     |   6 +-
 .../ingestion/source/cassandra/cassandra.py   |   1 -
 .../source/cassandra/cassandra_utils.py       |   8 +-
 .../source/confluent_schema_registry.py       |  12 +--
 .../datahub/ingestion/source/csv_enricher.py  |  58 +++++-----
 .../source/datahub/datahub_database_reader.py |   6 +-
 .../datahub/ingestion/source/dbt/dbt_cloud.py |  26 ++---
 .../ingestion/source/dbt/dbt_common.py        |  16 +--
 .../ingestion/source/dremio/dremio_api.py     |   6 +-
 .../dremio/dremio_datahub_source_mapping.py   |   6 +-
 .../ingestion/source/elastic_search.py        |   8 +-
 .../source/gc/soft_deleted_entity_cleanup.py  |   6 +-
 .../ingestion/source/gcs/gcs_source.py        |   5 +-
 .../ingestion/source/ge_data_profiler.py      |   6 +-
 .../ingestion/source/ge_profiling_config.py   |   6 +-
 .../ingestion/source/iceberg/iceberg.py       |   6 +-
 .../ingestion/source/identity/azure_ad.py     |   6 +-
 .../datahub/ingestion/source/identity/okta.py |   6 +-
 .../datahub/ingestion/source/kafka/kafka.py   |  20 ++--
 .../source/kafka_connect/kafka_connect.py     |   5 +-
 .../source/kafka_connect/sink_connectors.py   |   6 +-
 .../source/kafka_connect/source_connectors.py |   6 +-
 .../ingestion/source/looker/looker_common.py  |  38 +++----
 .../ingestion/source/looker/looker_config.py  |   6 +-
 .../ingestion/source/looker/looker_source.py  |  50 ++++-----
 .../source/looker/looker_template_language.py |   6 +-
 .../ingestion/source/looker/looker_usage.py   |  12 +--
 .../source/looker/lookml_concept_context.py   |  12 +--
 .../ingestion/source/looker/lookml_source.py  |  28 +++--
 .../ingestion/source/looker/view_upstream.py  |  10 +-
 .../src/datahub/ingestion/source/mlflow.py    |   8 +-
 .../src/datahub/ingestion/source/mongodb.py   |  10 +-
 .../src/datahub/ingestion/source/nifi.py      |  50 +++++----
 .../src/datahub/ingestion/source/openapi.py   |  18 ++--
 .../ingestion/source/powerbi/config.py        |  24 ++---
 .../source/powerbi/m_query/parser.py          |  22 ++--
 .../source/powerbi/m_query/pattern_handler.py |  50 ++++-----
 .../source/powerbi/m_query/resolver.py        |  26 ++---
 .../ingestion/source/powerbi/powerbi.py       |  12 +--
 .../powerbi/rest_api_wrapper/data_resolver.py |  18 ++--
 .../ingestion/source/qlik_sense/qlik_api.py   |   2 +-
 .../ingestion/source/redshift/config.py       |   6 +-
 .../ingestion/source/redshift/redshift.py     |  24 ++---
 .../ingestion/source/redshift/usage.py        |  16 +--
 .../source/s3/datalake_profiler_config.py     |   6 +-
 .../datahub/ingestion/source/salesforce.py    |  51 ++++-----
 .../datahub/ingestion/source/sigma/sigma.py   |   6 +-
 .../ingestion/source/sigma/sigma_api.py       |  22 ++--
 .../source/snowflake/snowflake_config.py      |  16 +--
 .../source/snowflake/snowflake_connection.py  |  12 +--
 .../source/snowflake/snowflake_queries.py     |   4 +-
 .../source/snowflake/snowflake_schema.py      |   6 +-
 .../source/snowflake/snowflake_schema_gen.py  |  12 +--
 .../source/snowflake/snowflake_tag.py         |  14 +--
 .../source/snowflake/snowflake_usage_v2.py    |   6 +-
 .../source/snowflake/snowflake_utils.py       |   3 +-
 .../source/snowflake/snowflake_v2.py          |  17 ++-
 .../datahub/ingestion/source/sql/athena.py    |   4 +-
 .../ingestion/source/sql/clickhouse.py        |  20 ++--
 .../datahub/ingestion/source/sql/oracle.py    |   4 +-
 .../source/sql/sql_generic_profiler.py        |   3 +-
 .../datahub/ingestion/source/sql/teradata.py  |  19 +++-
 .../source/state/profiling_state_handler.py   |   6 +-
 .../state/redundant_run_skip_handler.py       |  12 +--
 .../state/stale_entity_removal_handler.py     |   6 +-
 ...atahub_ingestion_checkpointing_provider.py |  18 ++--
 .../file_ingestion_checkpointing_provider.py  |   2 +-
 .../ingestion/source/tableau/tableau.py       |  95 ++++++++--------
 .../datahub/ingestion/source/unity/config.py  |   4 +-
 .../datahub/ingestion/source/unity/proxy.py   |   2 +-
 .../datahub/ingestion/source/unity/source.py  |   6 +-
 .../datahub/ingestion/source/unity/usage.py   |   4 +-
 .../source/usage/clickhouse_usage.py          |   8 +-
 .../source/usage/starburst_trino_usage.py     |   6 +-
 .../transformer/add_dataset_dataproduct.py    |   8 +-
 .../transformer/add_dataset_properties.py     |   6 +-
 .../transformer/add_dataset_schema_tags.py    |   6 +-
 .../transformer/add_dataset_schema_terms.py   |   6 +-
 .../dataset_domain_based_on_tags.py           |   8 +-
 .../extract_ownership_from_tags.py            |   6 +-
 .../ingestion/transformer/tags_to_terms.py    |  14 +--
 .../assertion/snowflake/compiler.py           |  20 ++--
 .../src/datahub/lite/duckdb_lite.py           |  22 ++--
 .../aspect_helpers/custom_properties.py       |   3 +-
 .../datahub/sql_parsing/schema_resolver.py    |  15 +--
 .../sql_parsing/sql_parsing_aggregator.py     |  32 +++---
 .../datahub/sql_parsing/sqlglot_lineage.py    |   6 +-
 .../src/datahub/sql_parsing/sqlglot_utils.py  |   2 +-
 .../src/datahub/telemetry/stats.py            |   3 +-
 .../utilities/file_backed_collections.py      |  20 ++--
 .../datahub/utilities/hive_schema_to_avro.py  |   4 +-
 .../src/datahub/utilities/logging_manager.py  |   4 +-
 .../datahub/utilities/lossy_collections.py    |   6 +-
 .../src/datahub/utilities/mapping.py          |   6 +-
 .../datahub/utilities/serialized_lru_cache.py |   4 +-
 .../utilities/sqlalchemy_query_combiner.py    |  12 +--
 .../datahub/utilities/stats_collections.py    |   4 +-
 .../src/datahub/utilities/urns/urn_iter.py    |   4 +-
 .../integration/azure_ad/test_azure_ad.py     |   4 +-
 .../tests/integration/dremio/test_dremio.py   |  18 ++--
 .../tests/integration/grafana/test_grafana.py |  16 +--
 .../kafka-connect/test_kafka_connect.py       |  16 +--
 .../tests/integration/looker/test_looker.py   |   6 +-
 .../tests/integration/lookml/test_lookml.py   |  12 +--
 .../tests/integration/nifi/test_nifi.py       |   4 +-
 .../integration/powerbi/test_m_parser.py      |  92 ++++++++--------
 .../tests/integration/powerbi/test_powerbi.py |  18 ++--
 .../integration/salesforce/test_salesforce.py |  30 +++---
 .../integration/sql_server/test_sql_server.py |   2 +-
 .../unity/test_unity_catalog_ingest.py        | 102 +++++++++---------
 .../tests/performance/databricks/generator.py |   2 +-
 .../tests/test_helpers/mce_helpers.py         |  12 +--
 .../tests/test_helpers/state_helpers.py       |   2 +-
 .../entities/dataproducts/test_dataproduct.py |   2 +-
 .../source_helpers/test_ensure_aspect_size.py |  24 ++---
 .../unit/bigquery/test_bigquery_lineage.py    |  12 +--
 .../tests/unit/cli/assertion/test_compile.py  |   6 +-
 .../unit/redshift/test_redshift_lineage.py    |  12 +--
 .../tests/unit/serde/test_codegen.py          |   6 +-
 .../state/test_stateful_ingestion.py          |  32 +++---
 .../unit/test_confluent_schema_registry.py    |  44 ++++----
 .../tests/unit/test_dbt_source.py             |   6 +-
 metadata-ingestion/tests/unit/test_iceberg.py |  48 ++++-----
 .../tests/unit/test_postgres_source.py        |  12 +--
 .../tests/unit/test_rest_sink.py              |   6 +-
 .../unit/utilities/test_lossy_collections.py  |   4 +-
 .../unit/utilities/test_partition_executor.py |   6 +-
 .../test_threaded_iterator_executor.py        |   2 +-
 smoke-test/build.gradle                       |  20 +++-
 smoke-test/pyproject.toml                     |  46 ++++----
 smoke-test/requirements.txt                   |   1 -
 .../test_data_process_instance.py             |  12 +--
 .../tests/dataproduct/test_dataproduct.py     |  18 ++--
 smoke-test/tests/lineage/test_lineage.py      |  22 ++--
 .../managed_ingestion_test.py                 |   6 +-
 smoke-test/tests/read_only/test_search.py     |   6 +-
 .../tests/read_only/test_services_up.py       |   6 +-
 smoke-test/tests/utilities/file_emitter.py    |   2 +-
 208 files changed, 1366 insertions(+), 1326 deletions(-)

diff --git a/metadata-ingestion-modules/airflow-plugin/build.gradle b/metadata-ingestion-modules/airflow-plugin/build.gradle
index 1bcb58e6b7c543..95b4ee3118f03e 100644
--- a/metadata-ingestion-modules/airflow-plugin/build.gradle
+++ b/metadata-ingestion-modules/airflow-plugin/build.gradle
@@ -73,16 +73,15 @@ task lint(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-c',
     "find ${venv_name}/lib -path *airflow/_vendor/connexion/spec.py -exec sed -i.bak -e '169,169s/  # type: List\\[str\\]//g' {} \\; && " +
     "source ${venv_name}/bin/activate && set -x && " +
-    "black --check --diff src/ tests/ && " +
     "ruff check src/ tests/ && " +
+    "ruff format --check src/ tests/ && " +
     "mypy --show-traceback --show-error-codes src/ tests/"
 }
 task lintFix(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
-    "black src/ tests/ && " +
-    "ruff check --fix src/ tests/"
-    "mypy src/ tests/ "
+    "ruff check --fix src/ tests/ && " +
+    "ruff format src/ tests/ "
 }
 
 // HACK: Some of the Airflow constraint files conflict with packages that we install (e.g. black).
@@ -119,5 +118,8 @@ clean {
   delete venv_name
   delete 'build'
   delete 'dist'
+  delete '.ruff_cache'
+  delete '.mypy_cache'
+  delete '.pytest_cache'
 }
 clean.dependsOn cleanPythonCache
diff --git a/metadata-ingestion-modules/airflow-plugin/pyproject.toml b/metadata-ingestion-modules/airflow-plugin/pyproject.toml
index 7d03c2a14bf078..d1e1d0ad479442 100644
--- a/metadata-ingestion-modules/airflow-plugin/pyproject.toml
+++ b/metadata-ingestion-modules/airflow-plugin/pyproject.toml
@@ -2,13 +2,21 @@
 build-backend = "setuptools.build_meta"
 requires = ["setuptools>=54.0.0", "wheel", "pip>=21.0.0"]
 
-[tool.black]
-extend-exclude = '''
-# A regex preceded with ^/ will apply only to files and directories
-# in the root of the project.
-^/tmp
-'''
-include = '\.pyi?$'
+[tool.ruff]
+line-length = 88
+target-version = "py38"
+exclude = [
+    ".git",
+    "venv",
+    ".tox",
+    "__pycache__",
+]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+skip-magic-trailing-comma = false
+line-ending = "auto"
 
 [tool.ruff.lint.isort]
 combine-as-imports = true
@@ -28,31 +36,23 @@ required-imports = []
 classes = ["typing"]
 
 [tool.ruff.lint]
-select = [
-    "B",
-    "C90",
-    "E",
-    "F",
-    "I", # For isort
-    "TID",
+extend-select = [
+    "B",    # flake8-bugbear
+    "C90",  # mccabe complexity
+    "E",    # pycodestyle errors
+    "F",    # pyflakes
+    "G010", # logging.warn -> logging.warning
+    "I",    # isort
+    "TID",  # flake8-tidy-imports
 ]
 ignore = [
-    # Ignore line length violations (handled by Black)
-    "E501",
-    # Ignore whitespace before ':' (matches Black)
-    "E203",
-    "E203",
-    # Allow usages of functools.lru_cache
-    "B019",
-    # Allow function call in argument defaults
-    "B008",
+    "E501",  # Line length violations (handled by formatter)
 ]
 
 [tool.ruff.lint.mccabe]
 max-complexity = 15
 
 [tool.ruff.lint.flake8-tidy-imports]
-# Disallow all relative imports.
 ban-relative-imports = "all"
 
 [tool.ruff.lint.per-file-ignores]
diff --git a/metadata-ingestion-modules/airflow-plugin/setup.py b/metadata-ingestion-modules/airflow-plugin/setup.py
index 79c18a5188dd84..58c04158957ccd 100644
--- a/metadata-ingestion-modules/airflow-plugin/setup.py
+++ b/metadata-ingestion-modules/airflow-plugin/setup.py
@@ -71,7 +71,6 @@ def get_long_description():
 dev_requirements = {
     *base_requirements,
     *mypy_stubs,
-    "black==22.12.0",
     "coverage>=5.1",
     "ruff==0.9.2",
     "mypy==1.10.1",
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_extractors.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_extractors.py
index fd01ac10f98de9..5904ce1e9e978c 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_extractors.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_extractors.py
@@ -63,9 +63,9 @@ def __init__(self):
 
         self.task_to_extractor.extractors["AthenaOperator"] = AthenaOperatorExtractor
 
-        self.task_to_extractor.extractors[
-            "BigQueryInsertJobOperator"
-        ] = BigQueryInsertJobOperatorExtractor
+        self.task_to_extractor.extractors["BigQueryInsertJobOperator"] = (
+            BigQueryInsertJobOperatorExtractor
+        )
 
         self._graph: Optional["DataHubGraph"] = None
 
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_listener.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_listener.py
index 9de44811f60a48..b2ca61e3de3bf5 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_listener.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_listener.py
@@ -286,9 +286,9 @@ def _extract_lineage(
         if sql_parsing_result:
             if error := sql_parsing_result.debug_info.error:
                 logger.info(f"SQL parsing error: {error}", exc_info=error)
-                datajob.properties[
-                    "datahub_sql_parser_error"
-                ] = f"{type(error).__name__}: {error}"
+                datajob.properties["datahub_sql_parser_error"] = (
+                    f"{type(error).__name__}: {error}"
+                )
             if not sql_parsing_result.debug_info.table_error:
                 input_urns.extend(sql_parsing_result.in_tables)
                 output_urns.extend(sql_parsing_result.out_tables)
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin_v22.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin_v22.py
index 4bf050d41473e4..99b0a40fd3c13e 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin_v22.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin_v22.py
@@ -44,11 +44,9 @@ def get_task_inlets_advanced(task: BaseOperator, context: Any) -> Iterable[Any]:
 
     if task_inlets and isinstance(task_inlets, list):
         inlets = []
-        task_ids = (
-            {o for o in task_inlets if isinstance(o, str)}
-            .union(op.task_id for op in task_inlets if isinstance(op, BaseOperator))
-            .intersection(task.get_flat_relative_ids(upstream=True))
-        )
+        task_ids = {o for o in task_inlets if isinstance(o, str)}.union(
+            op.task_id for op in task_inlets if isinstance(op, BaseOperator)
+        ).intersection(task.get_flat_relative_ids(upstream=True))
 
         from airflow.lineage import AUTO
         from cattr import structure
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/example_dags/lineage_emission_dag.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/example_dags/lineage_emission_dag.py
index 4351f40fe7e3ad..24e89211dd3c5b 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/example_dags/lineage_emission_dag.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/example_dags/lineage_emission_dag.py
@@ -2,6 +2,7 @@
 
 This example demonstrates how to emit lineage to DataHub within an Airflow DAG.
 """
+
 from datetime import timedelta
 
 from airflow import DAG
diff --git a/metadata-ingestion-modules/airflow-plugin/tests/integration/test_plugin.py b/metadata-ingestion-modules/airflow-plugin/tests/integration/test_plugin.py
index d2c9821295419c..2744c26021cde3 100644
--- a/metadata-ingestion-modules/airflow-plugin/tests/integration/test_plugin.py
+++ b/metadata-ingestion-modules/airflow-plugin/tests/integration/test_plugin.py
@@ -273,13 +273,21 @@ def _run_airflow(
             subprocess.check_call(
                 [
                     # fmt: off
-                    "airflow", "users", "create",
-                    "--username", "airflow",
-                    "--password", "airflow",
-                    "--firstname", "admin",
-                    "--lastname", "admin",
-                    "--role", "Admin",
-                    "--email", "airflow@example.com",
+                    "airflow",
+                    "users",
+                    "create",
+                    "--username",
+                    "airflow",
+                    "--password",
+                    "airflow",
+                    "--firstname",
+                    "admin",
+                    "--lastname",
+                    "admin",
+                    "--role",
+                    "Admin",
+                    "--email",
+                    "airflow@example.com",
                     # fmt: on
                 ],
                 env=environment,
diff --git a/metadata-ingestion-modules/airflow-plugin/tests/unit/test_airflow.py b/metadata-ingestion-modules/airflow-plugin/tests/unit/test_airflow.py
index 1dc8e14a425dfc..4219c5fb9cefb3 100644
--- a/metadata-ingestion-modules/airflow-plugin/tests/unit/test_airflow.py
+++ b/metadata-ingestion-modules/airflow-plugin/tests/unit/test_airflow.py
@@ -242,9 +242,7 @@ def test_lineage_backend(mock_emit, inlets, outlets, capture_executions):
         },
     ), mock.patch("airflow.models.BaseOperator.xcom_pull"), mock.patch(
         "airflow.models.BaseOperator.xcom_push"
-    ), patch_airflow_connection(
-        datahub_rest_connection_config
-    ):
+    ), patch_airflow_connection(datahub_rest_connection_config):
         func = mock.Mock()
         func.__name__ = "foo"
 
@@ -275,7 +273,10 @@ def test_lineage_backend(mock_emit, inlets, outlets, capture_executions):
         if AIRFLOW_VERSION < packaging.version.parse("2.2.0"):
             ti = TaskInstance(task=op2, execution_date=DEFAULT_DATE)
             # Ignoring type here because DagRun state is just a sring at Airflow 1
-            dag_run = DagRun(state="success", run_id=f"scheduled_{DEFAULT_DATE.isoformat()}")  # type: ignore
+            dag_run = DagRun(
+                state="success",  # type: ignore[arg-type]
+                run_id=f"scheduled_{DEFAULT_DATE.isoformat()}",
+            )
         else:
             from airflow.utils.state import DagRunState
 
diff --git a/metadata-ingestion-modules/dagster-plugin/build.gradle b/metadata-ingestion-modules/dagster-plugin/build.gradle
index 503b3556a41bfe..7dd7036e276151 100644
--- a/metadata-ingestion-modules/dagster-plugin/build.gradle
+++ b/metadata-ingestion-modules/dagster-plugin/build.gradle
@@ -54,16 +54,15 @@ task installDev(type: Exec, dependsOn: [install]) {
 task lint(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
-    "black --check --diff src/ tests/ examples/ && " +
-    "ruff check src/ tests/ && " +
+    "ruff check src/ tests/ examples/ && " +
+    "ruff format --check src/ tests/ && " +
     "mypy --show-traceback --show-error-codes src/ tests/ examples/"
 }
 task lintFix(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-x', '-c',
     "source ${venv_name}/bin/activate && " +
-    "black src/ tests/ examples/ && " +
-    "ruff check --fix src/ tests/"
-    "mypy src/ tests/ examples/"
+    "ruff check --fix src/ tests/ examples/ && " +
+    "ruff format src/ tests/ examples/ "
 }
 
 task installDevTest(type: Exec, dependsOn: [installDev]) {
@@ -105,5 +104,8 @@ clean {
   delete venv_name
   delete 'build'
   delete 'dist'
+  delete '.ruff_cache'
+  delete '.mypy_cache'
+  delete '.pytest_cache'
 }
 clean.dependsOn cleanPythonCache
diff --git a/metadata-ingestion-modules/dagster-plugin/examples/advanced_ops_jobs.py b/metadata-ingestion-modules/dagster-plugin/examples/advanced_ops_jobs.py
index 7b7616b1ec11de..75cab237b05a3e 100644
--- a/metadata-ingestion-modules/dagster-plugin/examples/advanced_ops_jobs.py
+++ b/metadata-ingestion-modules/dagster-plugin/examples/advanced_ops_jobs.py
@@ -9,9 +9,9 @@
     job,
     op,
 )
+
 from datahub.ingestion.graph.client import DatahubClientConfig, DataHubGraph
 from datahub.utilities.urns.dataset_urn import DatasetUrn
-
 from datahub_dagster_plugin.client.dagster_generator import (
     DagsterGenerator,
     DatasetLineage,
diff --git a/metadata-ingestion-modules/dagster-plugin/examples/assets_job.py b/metadata-ingestion-modules/dagster-plugin/examples/assets_job.py
index 1ed3f2f915061b..9b26b502d770f2 100644
--- a/metadata-ingestion-modules/dagster-plugin/examples/assets_job.py
+++ b/metadata-ingestion-modules/dagster-plugin/examples/assets_job.py
@@ -7,9 +7,9 @@
     define_asset_job,
     multi_asset,
 )
+
 from datahub.ingestion.graph.config import DatahubClientConfig
 from datahub.utilities.urns.dataset_urn import DatasetUrn
-
 from datahub_dagster_plugin.sensors.datahub_sensors import (
     DatahubDagsterSourceConfig,
     make_datahub_sensor,
diff --git a/metadata-ingestion-modules/dagster-plugin/examples/basic_setup.py b/metadata-ingestion-modules/dagster-plugin/examples/basic_setup.py
index 300cf9df022c66..2eeff225697261 100644
--- a/metadata-ingestion-modules/dagster-plugin/examples/basic_setup.py
+++ b/metadata-ingestion-modules/dagster-plugin/examples/basic_setup.py
@@ -1,6 +1,6 @@
 from dagster import Definitions
-from datahub.ingestion.graph.client import DatahubClientConfig
 
+from datahub.ingestion.graph.client import DatahubClientConfig
 from datahub_dagster_plugin.sensors.datahub_sensors import (
     DatahubDagsterSourceConfig,
     make_datahub_sensor,
diff --git a/metadata-ingestion-modules/dagster-plugin/examples/ops_job.py b/metadata-ingestion-modules/dagster-plugin/examples/ops_job.py
index a17fc89e6922df..aa2902ee5c708b 100644
--- a/metadata-ingestion-modules/dagster-plugin/examples/ops_job.py
+++ b/metadata-ingestion-modules/dagster-plugin/examples/ops_job.py
@@ -1,7 +1,7 @@
 from dagster import Definitions, In, Out, PythonObjectDagsterType, job, op
+
 from datahub.ingestion.graph.config import DatahubClientConfig
 from datahub.utilities.urns.dataset_urn import DatasetUrn
-
 from datahub_dagster_plugin.sensors.datahub_sensors import (
     DatahubDagsterSourceConfig,
     make_datahub_sensor,
diff --git a/metadata-ingestion-modules/dagster-plugin/pyproject.toml b/metadata-ingestion-modules/dagster-plugin/pyproject.toml
index 7d03c2a14bf078..d1e1d0ad479442 100644
--- a/metadata-ingestion-modules/dagster-plugin/pyproject.toml
+++ b/metadata-ingestion-modules/dagster-plugin/pyproject.toml
@@ -2,13 +2,21 @@
 build-backend = "setuptools.build_meta"
 requires = ["setuptools>=54.0.0", "wheel", "pip>=21.0.0"]
 
-[tool.black]
-extend-exclude = '''
-# A regex preceded with ^/ will apply only to files and directories
-# in the root of the project.
-^/tmp
-'''
-include = '\.pyi?$'
+[tool.ruff]
+line-length = 88
+target-version = "py38"
+exclude = [
+    ".git",
+    "venv",
+    ".tox",
+    "__pycache__",
+]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+skip-magic-trailing-comma = false
+line-ending = "auto"
 
 [tool.ruff.lint.isort]
 combine-as-imports = true
@@ -28,31 +36,23 @@ required-imports = []
 classes = ["typing"]
 
 [tool.ruff.lint]
-select = [
-    "B",
-    "C90",
-    "E",
-    "F",
-    "I", # For isort
-    "TID",
+extend-select = [
+    "B",    # flake8-bugbear
+    "C90",  # mccabe complexity
+    "E",    # pycodestyle errors
+    "F",    # pyflakes
+    "G010", # logging.warn -> logging.warning
+    "I",    # isort
+    "TID",  # flake8-tidy-imports
 ]
 ignore = [
-    # Ignore line length violations (handled by Black)
-    "E501",
-    # Ignore whitespace before ':' (matches Black)
-    "E203",
-    "E203",
-    # Allow usages of functools.lru_cache
-    "B019",
-    # Allow function call in argument defaults
-    "B008",
+    "E501",  # Line length violations (handled by formatter)
 ]
 
 [tool.ruff.lint.mccabe]
 max-complexity = 15
 
 [tool.ruff.lint.flake8-tidy-imports]
-# Disallow all relative imports.
 ban-relative-imports = "all"
 
 [tool.ruff.lint.per-file-ignores]
diff --git a/metadata-ingestion-modules/dagster-plugin/setup.py b/metadata-ingestion-modules/dagster-plugin/setup.py
index b15f3716b28d0a..09859b6c4344e3 100644
--- a/metadata-ingestion-modules/dagster-plugin/setup.py
+++ b/metadata-ingestion-modules/dagster-plugin/setup.py
@@ -51,7 +51,6 @@ def get_long_description():
     "dagster-aws >= 0.11.0",
     "dagster-snowflake >= 0.11.0",
     "dagster-snowflake-pandas >= 0.11.0",
-    "black==22.12.0",
     "coverage>=5.1",
     "ruff==0.9.2",
     "mypy>=1.4.0",
diff --git a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/client/dagster_generator.py b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/client/dagster_generator.py
index 9a0a9a1b3a75ed..033d3967145017 100644
--- a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/client/dagster_generator.py
+++ b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/client/dagster_generator.py
@@ -507,7 +507,7 @@ def generate_datajob(
         job_property_bag: Dict[str, str] = {}
         if input_datasets:
             self.logger.info(
-                f"Input datasets for {op_def_snap.name} are { list(input_datasets.get(op_def_snap.name, []))}"
+                f"Input datasets for {op_def_snap.name} are {list(input_datasets.get(op_def_snap.name, []))}"
             )
             inlets.update(input_datasets.get(op_def_snap.name, []))
 
@@ -515,7 +515,7 @@ def generate_datajob(
 
         if output_datasets:
             self.logger.info(
-                f"Output datasets for {op_def_snap.name} are { list(output_datasets.get(op_def_snap.name, []))}"
+                f"Output datasets for {op_def_snap.name} are {list(output_datasets.get(op_def_snap.name, []))}"
             )
             datajob.outlets = list(output_datasets.get(op_def_snap.name, []))
 
@@ -606,7 +606,7 @@ def emit_job_run(
         if run.status not in status_result_map:
             raise Exception(
                 f"Job run status should be either complete, failed or cancelled and it was "
-                f"{run.status }"
+                f"{run.status}"
             )
 
         if run_stats.start_time is not None:
@@ -673,7 +673,7 @@ def emit_op_run(
         if run_step_stats.status not in status_result_map:
             raise Exception(
                 f"Step run status should be either complete, failed or cancelled and it was "
-                f"{run_step_stats.status }"
+                f"{run_step_stats.status}"
             )
 
         if run_step_stats.start_time is not None:
diff --git a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/sensors/datahub_sensors.py b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/sensors/datahub_sensors.py
index b91a9cfa56d398..5f049d55c16a12 100644
--- a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/sensors/datahub_sensors.py
+++ b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/sensors/datahub_sensors.py
@@ -262,7 +262,6 @@ def get_dagster_environment(
             and context.dagster_run.job_code_origin.repository_origin
             and context.dagster_run.job_code_origin.repository_origin.code_pointer
         ):
-
             code_pointer = (
                 context.dagster_run.job_code_origin.repository_origin.code_pointer
             )
diff --git a/metadata-ingestion-modules/gx-plugin/build.gradle b/metadata-ingestion-modules/gx-plugin/build.gradle
index a0604215426bf7..57a1ed0b2169d3 100644
--- a/metadata-ingestion-modules/gx-plugin/build.gradle
+++ b/metadata-ingestion-modules/gx-plugin/build.gradle
@@ -25,7 +25,7 @@ task environmentSetup(type: Exec, dependsOn: checkPythonVersion) {
   outputs.file(sentinel_file)
   commandLine 'bash', '-c',
       "${python_executable} -m venv ${venv_name} && " +
-      "${venv_name}/bin/python -m pip install --upgrade uv && " +
+      "${venv_name}/bin/pip install --upgrade uv && " +
       "touch ${sentinel_file}"
 }
 
@@ -54,16 +54,15 @@ task installDev(type: Exec, dependsOn: [install]) {
 task lint(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
-    "black --check --diff src/ tests/ && " +
     "ruff check src/ tests/ && " +
+    "ruff format --check src/ tests/ && " +
     "mypy --show-traceback --show-error-codes src/ tests/"
 }
 task lintFix(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-x', '-c',
     "source ${venv_name}/bin/activate && " +
-    "black src/ tests/ && " +
-    "ruff check --fix src/ tests/"
-    "mypy src/ tests/"
+    "ruff check --fix src/ tests/ && " +
+    "ruff format src/ tests/ "
 }
 
 task installDevTest(type: Exec, dependsOn: [installDev]) {
@@ -105,5 +104,8 @@ clean {
   delete venv_name
   delete 'build'
   delete 'dist'
+  delete '.ruff_cache'
+  delete '.mypy_cache'
+  delete '.pytest_cache'
 }
 clean.dependsOn cleanPythonCache
diff --git a/metadata-ingestion-modules/gx-plugin/pyproject.toml b/metadata-ingestion-modules/gx-plugin/pyproject.toml
index 7d03c2a14bf078..d1e1d0ad479442 100644
--- a/metadata-ingestion-modules/gx-plugin/pyproject.toml
+++ b/metadata-ingestion-modules/gx-plugin/pyproject.toml
@@ -2,13 +2,21 @@
 build-backend = "setuptools.build_meta"
 requires = ["setuptools>=54.0.0", "wheel", "pip>=21.0.0"]
 
-[tool.black]
-extend-exclude = '''
-# A regex preceded with ^/ will apply only to files and directories
-# in the root of the project.
-^/tmp
-'''
-include = '\.pyi?$'
+[tool.ruff]
+line-length = 88
+target-version = "py38"
+exclude = [
+    ".git",
+    "venv",
+    ".tox",
+    "__pycache__",
+]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+skip-magic-trailing-comma = false
+line-ending = "auto"
 
 [tool.ruff.lint.isort]
 combine-as-imports = true
@@ -28,31 +36,23 @@ required-imports = []
 classes = ["typing"]
 
 [tool.ruff.lint]
-select = [
-    "B",
-    "C90",
-    "E",
-    "F",
-    "I", # For isort
-    "TID",
+extend-select = [
+    "B",    # flake8-bugbear
+    "C90",  # mccabe complexity
+    "E",    # pycodestyle errors
+    "F",    # pyflakes
+    "G010", # logging.warn -> logging.warning
+    "I",    # isort
+    "TID",  # flake8-tidy-imports
 ]
 ignore = [
-    # Ignore line length violations (handled by Black)
-    "E501",
-    # Ignore whitespace before ':' (matches Black)
-    "E203",
-    "E203",
-    # Allow usages of functools.lru_cache
-    "B019",
-    # Allow function call in argument defaults
-    "B008",
+    "E501",  # Line length violations (handled by formatter)
 ]
 
 [tool.ruff.lint.mccabe]
 max-complexity = 15
 
 [tool.ruff.lint.flake8-tidy-imports]
-# Disallow all relative imports.
 ban-relative-imports = "all"
 
 [tool.ruff.lint.per-file-ignores]
diff --git a/metadata-ingestion-modules/gx-plugin/setup.py b/metadata-ingestion-modules/gx-plugin/setup.py
index d114a4130ca4f2..fbc4097388993f 100644
--- a/metadata-ingestion-modules/gx-plugin/setup.py
+++ b/metadata-ingestion-modules/gx-plugin/setup.py
@@ -58,9 +58,8 @@ def get_long_description():
 base_dev_requirements = {
     *base_requirements,
     *mypy_stubs,
-    "black==22.12.0",
     "coverage>=5.1",
-    "ruff==0.9.2",
+    "ruff==0.9.1",
     "mypy>=1.4.0",
     # pydantic 1.8.2 is incompatible with mypy 0.910.
     # See https://github.com/samuelcolvin/pydantic/pull/3175#issuecomment-995382910.
diff --git a/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/action.py b/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/action.py
index 4f2aee52c3319f..1070d4d3d5d66d 100644
--- a/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/action.py
+++ b/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/action.py
@@ -108,7 +108,6 @@ def __init__(
         convert_urns_to_lowercase: bool = False,
         name: str = "DataHubValidationAction",
     ):
-
         if has_name_positional_arg:
             if len(args) >= 1 and isinstance(args[0], str):
                 name = args[0]
@@ -164,9 +163,7 @@ def _run(
             if isinstance(
                 validation_result_suite_identifier, ValidationResultIdentifier
             ):
-                expectation_suite_name = (
-                    validation_result_suite_identifier.expectation_suite_identifier.expectation_suite_name
-                )
+                expectation_suite_name = validation_result_suite_identifier.expectation_suite_identifier.expectation_suite_name
                 run_id = validation_result_suite_identifier.run_id
                 batch_identifier = validation_result_suite_identifier.batch_identifier
 
diff --git a/metadata-ingestion-modules/prefect-plugin/build.gradle b/metadata-ingestion-modules/prefect-plugin/build.gradle
index d16201834a0ff0..d13c9fe3c9abe7 100644
--- a/metadata-ingestion-modules/prefect-plugin/build.gradle
+++ b/metadata-ingestion-modules/prefect-plugin/build.gradle
@@ -54,16 +54,15 @@ task installDev(type: Exec, dependsOn: [install]) {
 task lint(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
-    "black --check --diff src/ tests/ && " +
     "ruff check src/ tests/ && " +
+    "ruff format --check src/ tests/ && " +
     "mypy --show-traceback --show-error-codes src/ tests/"
 }
 task lintFix(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-x', '-c',
     "source ${venv_name}/bin/activate && " +
-    "black src/ tests/ && " +
-    "ruff check --fix src/ tests/"
-    "mypy src/ tests/ "
+    "ruff check --fix src/ tests/ && " +
+    "ruff format src/ tests/ "
 }
 
 task installDevTest(type: Exec, dependsOn: [installDev]) {
@@ -111,5 +110,8 @@ clean {
   delete venv_name
   delete 'build'
   delete 'dist'
+  delete '.ruff_cache'
+  delete '.mypy_cache'
+  delete '.pytest_cache'
 }
 clean.dependsOn cleanPythonCache
diff --git a/metadata-ingestion-modules/prefect-plugin/pyproject.toml b/metadata-ingestion-modules/prefect-plugin/pyproject.toml
index 7d03c2a14bf078..d1e1d0ad479442 100644
--- a/metadata-ingestion-modules/prefect-plugin/pyproject.toml
+++ b/metadata-ingestion-modules/prefect-plugin/pyproject.toml
@@ -2,13 +2,21 @@
 build-backend = "setuptools.build_meta"
 requires = ["setuptools>=54.0.0", "wheel", "pip>=21.0.0"]
 
-[tool.black]
-extend-exclude = '''
-# A regex preceded with ^/ will apply only to files and directories
-# in the root of the project.
-^/tmp
-'''
-include = '\.pyi?$'
+[tool.ruff]
+line-length = 88
+target-version = "py38"
+exclude = [
+    ".git",
+    "venv",
+    ".tox",
+    "__pycache__",
+]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+skip-magic-trailing-comma = false
+line-ending = "auto"
 
 [tool.ruff.lint.isort]
 combine-as-imports = true
@@ -28,31 +36,23 @@ required-imports = []
 classes = ["typing"]
 
 [tool.ruff.lint]
-select = [
-    "B",
-    "C90",
-    "E",
-    "F",
-    "I", # For isort
-    "TID",
+extend-select = [
+    "B",    # flake8-bugbear
+    "C90",  # mccabe complexity
+    "E",    # pycodestyle errors
+    "F",    # pyflakes
+    "G010", # logging.warn -> logging.warning
+    "I",    # isort
+    "TID",  # flake8-tidy-imports
 ]
 ignore = [
-    # Ignore line length violations (handled by Black)
-    "E501",
-    # Ignore whitespace before ':' (matches Black)
-    "E203",
-    "E203",
-    # Allow usages of functools.lru_cache
-    "B019",
-    # Allow function call in argument defaults
-    "B008",
+    "E501",  # Line length violations (handled by formatter)
 ]
 
 [tool.ruff.lint.mccabe]
 max-complexity = 15
 
 [tool.ruff.lint.flake8-tidy-imports]
-# Disallow all relative imports.
 ban-relative-imports = "all"
 
 [tool.ruff.lint.per-file-ignores]
diff --git a/metadata-ingestion-modules/prefect-plugin/setup.py b/metadata-ingestion-modules/prefect-plugin/setup.py
index 9587f0ed73780b..1d56cae8d938a2 100644
--- a/metadata-ingestion-modules/prefect-plugin/setup.py
+++ b/metadata-ingestion-modules/prefect-plugin/setup.py
@@ -57,9 +57,8 @@ def get_long_description():
 dev_requirements = {
     *base_requirements,
     *mypy_stubs,
-    "black==22.12.0",
     "coverage>=5.1",
-    "ruff==0.9.1",
+    "ruff==0.9.2",
     "mypy>=1.4.0",
     # pydantic 1.8.2 is incompatible with mypy 0.910.
     # See https://github.com/samuelcolvin/pydantic/pull/3175#issuecomment-995382910.
diff --git a/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/datahub_emitter.py b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/datahub_emitter.py
index fcab6b6fd91430..190a249a912d1a 100644
--- a/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/datahub_emitter.py
+++ b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/datahub_emitter.py
@@ -351,9 +351,9 @@ def _emit_tasks(
 
             for prefect_future in flow_run_ctx.task_run_futures:
                 if prefect_future.task_run is not None:
-                    task_run_key_map[
-                        str(prefect_future.task_run.id)
-                    ] = prefect_future.task_run.task_key
+                    task_run_key_map[str(prefect_future.task_run.id)] = (
+                        prefect_future.task_run.task_key
+                    )
 
             for node in graph_json:
                 datajob_urn = DataJobUrn.create_from_ids(
diff --git a/metadata-ingestion/build.gradle b/metadata-ingestion/build.gradle
index 16a6704949c875..be9d69a2f0e4b6 100644
--- a/metadata-ingestion/build.gradle
+++ b/metadata-ingestion/build.gradle
@@ -110,16 +110,16 @@ task modelDocUpload(type: Exec, dependsOn: [modelDocGen]) {
 task lint(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
-    "black --check --diff src/ tests/ examples/ && " +
     "ruff check src/ tests/ examples/ && " +
+    "ruff format --check src/ tests/ examples/ && " +
     "mypy --show-traceback --show-error-codes src/ tests/ examples/"
 }
 
 task lintFix(type: Exec, dependsOn: installDev) {
   commandLine 'bash', '-c',
     "source ${venv_name}/bin/activate && set -x && " +
-    "black src/ tests/ examples/ && " +
-    "ruff check --fix src/ tests/ examples/"
+    "ruff check --fix src/ tests/ examples/ && " +
+    "ruff format src/ tests/ examples/ "
 }
 
 def pytest_default_env = "PYTHONDEVMODE=1"
@@ -216,6 +216,7 @@ clean {
   delete 'src/datahub/metadata'
   delete '../docs/generated'
   delete 'generated'
+  delete '.ruff_cache'
   delete '.mypy_cache'
   delete '.pytest_cache'
   delete '.preflight_sentinel'
diff --git a/metadata-ingestion/developing.md b/metadata-ingestion/developing.md
index ebe1cd3df81990..005b0427a5e6ad 100644
--- a/metadata-ingestion/developing.md
+++ b/metadata-ingestion/developing.md
@@ -177,11 +177,10 @@ The architecture of this metadata ingestion framework is heavily inspired by [Ap
 
 ## Code style
 
-We use black, ruff, and mypy to ensure consistent code style and quality.
+We use ruff, and mypy to ensure consistent code style and quality.
 
 ```shell
 # Assumes: pip install -e '.[dev]' and venv is activated
-black src/ tests/
 ruff check src/ tests/
 mypy src/ tests/
 ```
diff --git a/metadata-ingestion/examples/library/run_assertion.py b/metadata-ingestion/examples/library/run_assertion.py
index 414e5f46cc7f91..e7c717837eed3c 100644
--- a/metadata-ingestion/examples/library/run_assertion.py
+++ b/metadata-ingestion/examples/library/run_assertion.py
@@ -16,5 +16,5 @@
 assertion_result = graph.run_assertion(urn=assertion_urn, save_result=True)
 
 log.info(
-    f'Assertion result (SUCCESS / FAILURE / ERROR): {assertion_result.get("type")}'
+    f"Assertion result (SUCCESS / FAILURE / ERROR): {assertion_result.get('type')}"
 )
diff --git a/metadata-ingestion/pyproject.toml b/metadata-ingestion/pyproject.toml
index 07f2010fde25f0..1d434eb8c3a94f 100644
--- a/metadata-ingestion/pyproject.toml
+++ b/metadata-ingestion/pyproject.toml
@@ -2,15 +2,6 @@
 build-backend = "setuptools.build_meta"
 requires = ["setuptools>=63.0.0", "wheel"]
 
-[tool.black]
-extend-exclude = '''
-# A regex preceded with ^/ will apply only to files and directories
-# in the root of the project.
-^/tmp
-'''
-include = '\.pyi?$'
-target-version = ['py38', 'py39', 'py310', 'py311']
-
 [tool.ruff.lint.isort]
 section-order = ["future", "patch", "standard-library", "third-party", "first-party", "local-folder"]
 sections = { "patch" = ["datahub.utilities._markupsafe_compat", "datahub.sql_parsing._sqlglot_patch"] }
@@ -31,23 +22,22 @@ exclude = [
 
 [tool.ruff.lint]
 extend-select = [
-    "B",  # Bugbear
-    "C90",
-    "E",
-    "F",
-    "G010",  # logging.warn -> logging.warning
-    "I",  # Import sorting
-    "TID",  # Tidy imports
+    "B",    # flake8-bugbear
+    "C90",  # mccabe complexity
+    "E",    # pycodestyle errors
+    "F",    # pyflakes
+    "G010", # logging.warn -> logging.warning
+    "I",    # isort
+    "TID",  # flake8-tidy-imports
 ]
 extend-ignore = [
-    # Ignore line length violations (handled by Black)
-    "E501",
-    # Ignore whitespace before ':' (matches Black)
-    "E203",
-    # Allow usages of functools.lru_cache
-    "B019",
-    # Allow function call in argument defaults
-    "B008",
+    "E501",  # Handled by formatter
+    "E111",  # Handled by formatter
+    "E114",  # Handled by formatter
+    "E117",  # Handled by formatter
+    "E203",  # Ignore whitespace before ':' (matches Black)
+    "B019",  # Allow usages of functools.lru_cache
+    "B008",  # Allow function call in argument defaults
     # TODO: Enable these later
     "B006",  # Mutable args
     "B017",  # Do not assert blind exception
@@ -61,4 +51,4 @@ max-complexity = 20
 ban-relative-imports = "all"
 
 [tool.ruff.lint.per-file-ignores]
-"__init__.py" = ["F401"]
\ No newline at end of file
+"__init__.py" = ["F401"]
diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py
index ea1b0ad1582576..2cfdf9837f45ad 100644
--- a/metadata-ingestion/setup.py
+++ b/metadata-ingestion/setup.py
@@ -592,7 +592,6 @@
 lint_requirements = {
     # This is pinned only to avoid spurious errors in CI.
     # We should make an effort to keep it up to date.
-    "black==23.3.0",
     "ruff==0.9.2",
     "mypy==1.10.1",
 }
diff --git a/metadata-ingestion/src/datahub/api/entities/assertion/assertion_operator.py b/metadata-ingestion/src/datahub/api/entities/assertion/assertion_operator.py
index 8704ed13cb6c30..a05386798495de 100644
--- a/metadata-ingestion/src/datahub/api/entities/assertion/assertion_operator.py
+++ b/metadata-ingestion/src/datahub/api/entities/assertion/assertion_operator.py
@@ -20,15 +20,13 @@ class Operator(Protocol):
 
     operator: str
 
-    def id(self) -> str:
-        ...
+    def id(self) -> str: ...
 
-    def generate_parameters(self) -> AssertionStdParametersClass:
-        ...
+    def generate_parameters(self) -> AssertionStdParametersClass: ...
 
 
 def _generate_assertion_std_parameter(
-    value: Union[str, int, float, list]
+    value: Union[str, int, float, list],
 ) -> AssertionStdParameterClass:
     if isinstance(value, str):
         return AssertionStdParameterClass(
diff --git a/metadata-ingestion/src/datahub/api/entities/datacontract/assertion_operator.py b/metadata-ingestion/src/datahub/api/entities/datacontract/assertion_operator.py
index dc0c97d1c74e56..145a6097d7336c 100644
--- a/metadata-ingestion/src/datahub/api/entities/datacontract/assertion_operator.py
+++ b/metadata-ingestion/src/datahub/api/entities/datacontract/assertion_operator.py
@@ -19,15 +19,13 @@ class Operator(Protocol):
 
     operator: str
 
-    def id(self) -> str:
-        ...
+    def id(self) -> str: ...
 
-    def generate_parameters(self) -> AssertionStdParametersClass:
-        ...
+    def generate_parameters(self) -> AssertionStdParametersClass: ...
 
 
 def _generate_assertion_std_parameter(
-    value: Union[str, int, float]
+    value: Union[str, int, float],
 ) -> AssertionStdParameterClass:
     if isinstance(value, str):
         return AssertionStdParameterClass(
diff --git a/metadata-ingestion/src/datahub/api/entities/dataproduct/dataproduct.py b/metadata-ingestion/src/datahub/api/entities/dataproduct/dataproduct.py
index 39de4d7f80558e..d2035d560716ae 100644
--- a/metadata-ingestion/src/datahub/api/entities/dataproduct/dataproduct.py
+++ b/metadata-ingestion/src/datahub/api/entities/dataproduct/dataproduct.py
@@ -321,9 +321,9 @@ def from_yaml(
 
     @classmethod
     def from_datahub(cls, graph: DataHubGraph, id: str) -> DataProduct:
-        data_product_properties: Optional[
-            DataProductPropertiesClass
-        ] = graph.get_aspect(id, DataProductPropertiesClass)
+        data_product_properties: Optional[DataProductPropertiesClass] = (
+            graph.get_aspect(id, DataProductPropertiesClass)
+        )
         domains: Optional[DomainsClass] = graph.get_aspect(id, DomainsClass)
         assert domains, "Data Product must have an associated domain. Found none."
         owners: Optional[OwnershipClass] = graph.get_aspect(id, OwnershipClass)
diff --git a/metadata-ingestion/src/datahub/api/entities/dataset/dataset.py b/metadata-ingestion/src/datahub/api/entities/dataset/dataset.py
index 315f2249d2e5cd..bf824a11a77b5d 100644
--- a/metadata-ingestion/src/datahub/api/entities/dataset/dataset.py
+++ b/metadata-ingestion/src/datahub/api/entities/dataset/dataset.py
@@ -266,7 +266,8 @@ def generate_mcp(
             if self.schema_metadata.fields:
                 for field in self.schema_metadata.fields:
                     field_urn = field.urn or make_schema_field_urn(
-                        self.urn, field.id  # type: ignore[arg-type]
+                        self.urn,  # type: ignore[arg-type]
+                        field.id,  # type: ignore[arg-type]
                     )
                     assert field_urn.startswith("urn:li:schemaField:")
 
diff --git a/metadata-ingestion/src/datahub/api/entities/structuredproperties/structuredproperties.py b/metadata-ingestion/src/datahub/api/entities/structuredproperties/structuredproperties.py
index 179dbdb231c912..b0b434751ad2cc 100644
--- a/metadata-ingestion/src/datahub/api/entities/structuredproperties/structuredproperties.py
+++ b/metadata-ingestion/src/datahub/api/entities/structuredproperties/structuredproperties.py
@@ -118,9 +118,9 @@ def fqn(self) -> str:
         id = StructuredPropertyUrn.from_string(self.urn).id
         if self.qualified_name is not None:
             # ensure that qualified name and ID match
-            assert (
-                self.qualified_name == id
-            ), "ID in the urn and the qualified_name must match"
+            assert self.qualified_name == id, (
+                "ID in the urn and the qualified_name must match"
+            )
         return id
 
     @validator("urn", pre=True, always=True)
@@ -184,9 +184,9 @@ def create(file: str, graph: DataHubGraph) -> None:
 
     @classmethod
     def from_datahub(cls, graph: DataHubGraph, urn: str) -> "StructuredProperties":
-        structured_property: Optional[
-            StructuredPropertyDefinitionClass
-        ] = graph.get_aspect(urn, StructuredPropertyDefinitionClass)
+        structured_property: Optional[StructuredPropertyDefinitionClass] = (
+            graph.get_aspect(urn, StructuredPropertyDefinitionClass)
+        )
         if structured_property is None:
             raise Exception(
                 "StructuredPropertyDefinition aspect is None. Unable to create structured property."
diff --git a/metadata-ingestion/src/datahub/cli/cli_utils.py b/metadata-ingestion/src/datahub/cli/cli_utils.py
index f6b5ba6176c59d..1f13391644c6c8 100644
--- a/metadata-ingestion/src/datahub/cli/cli_utils.py
+++ b/metadata-ingestion/src/datahub/cli/cli_utils.py
@@ -412,7 +412,7 @@ def generate_access_token(
 def ensure_has_system_metadata(
     event: Union[
         MetadataChangeProposal, MetadataChangeProposalWrapper, MetadataChangeEvent
-    ]
+    ],
 ) -> None:
     if event.systemMetadata is None:
         event.systemMetadata = SystemMetadataClass()
diff --git a/metadata-ingestion/src/datahub/cli/docker_cli.py b/metadata-ingestion/src/datahub/cli/docker_cli.py
index 86bcd7eff1cbfc..b744ac573aed6e 100644
--- a/metadata-ingestion/src/datahub/cli/docker_cli.py
+++ b/metadata-ingestion/src/datahub/cli/docker_cli.py
@@ -296,9 +296,9 @@ def _restore(
     restore_indices: Optional[bool],
     primary_restore_file: Optional[str],
 ) -> int:
-    assert (
-        restore_primary or restore_indices
-    ), "Either restore_primary or restore_indices must be set"
+    assert restore_primary or restore_indices, (
+        "Either restore_primary or restore_indices must be set"
+    )
     msg = "datahub> "
     if restore_primary:
         msg += f"Will restore primary database from {primary_restore_file}. "
@@ -314,9 +314,9 @@ def _restore(
         assert primary_restore_file
         resolved_restore_file = os.path.expanduser(primary_restore_file)
         logger.info(f"Restoring primary db from backup at {resolved_restore_file}")
-        assert os.path.exists(
-            resolved_restore_file
-        ), f"File {resolved_restore_file} does not exist"
+        assert os.path.exists(resolved_restore_file), (
+            f"File {resolved_restore_file} does not exist"
+        )
         with open(resolved_restore_file) as fp:
             result = subprocess.run(
                 [
diff --git a/metadata-ingestion/src/datahub/cli/lite_cli.py b/metadata-ingestion/src/datahub/cli/lite_cli.py
index 957ee16245dd81..90bbb353deab18 100644
--- a/metadata-ingestion/src/datahub/cli/lite_cli.py
+++ b/metadata-ingestion/src/datahub/cli/lite_cli.py
@@ -176,7 +176,7 @@ def get(
             )
         )
     end_time = time.time()
-    logger.debug(f"Time taken: {int((end_time - start_time)*1000.0)} millis")
+    logger.debug(f"Time taken: {int((end_time - start_time) * 1000.0)} millis")
 
 
 @lite.command()
@@ -228,7 +228,7 @@ def ls(path: Optional[str]) -> None:
     try:
         browseables = lite.ls(path)
         end_time = time.time()
-        logger.debug(f"Time taken: {int((end_time - start_time)*1000.0)} millis")
+        logger.debug(f"Time taken: {int((end_time - start_time) * 1000.0)} millis")
         auto_complete: List[AutoComplete] = [
             b.auto_complete for b in browseables if b.auto_complete is not None
         ]
diff --git a/metadata-ingestion/src/datahub/cli/migrate.py b/metadata-ingestion/src/datahub/cli/migrate.py
index 1bf1211674f596..3bd1b6fc4dc124 100644
--- a/metadata-ingestion/src/datahub/cli/migrate.py
+++ b/metadata-ingestion/src/datahub/cli/migrate.py
@@ -426,9 +426,9 @@ def batch_get_ids(
             entities_yielded += 1
             log.debug(f"yielding {x}")
             yield x
-        assert (
-            entities_yielded == num_entities
-        ), "Did not delete all entities, try running this command again!"
+        assert entities_yielded == num_entities, (
+            "Did not delete all entities, try running this command again!"
+        )
     else:
         log.error(f"Failed to execute batch get with {str(response.content)}")
         response.raise_for_status()
diff --git a/metadata-ingestion/src/datahub/cli/specific/assertions_cli.py b/metadata-ingestion/src/datahub/cli/specific/assertions_cli.py
index dad724bfe11157..c0d93af90ada00 100644
--- a/metadata-ingestion/src/datahub/cli/specific/assertions_cli.py
+++ b/metadata-ingestion/src/datahub/cli/specific/assertions_cli.py
@@ -136,9 +136,9 @@ def extras_list_to_dict(extras: List[str]) -> Dict[str, str]:
     extra_properties: Dict[str, str] = dict()
     for x in extras:
         parts = x.split("=")
-        assert (
-            len(parts) == 2
-        ), f"Invalid value for extras {x}, should be in format key=value"
+        assert len(parts) == 2, (
+            f"Invalid value for extras {x}, should be in format key=value"
+        )
         extra_properties[parts[0]] = parts[1]
     return extra_properties
 
diff --git a/metadata-ingestion/src/datahub/cli/timeline_cli.py b/metadata-ingestion/src/datahub/cli/timeline_cli.py
index 37089e6f051f0d..174ce63e84ef4c 100644
--- a/metadata-ingestion/src/datahub/cli/timeline_cli.py
+++ b/metadata-ingestion/src/datahub/cli/timeline_cli.py
@@ -50,7 +50,7 @@ def pretty_id(id: Optional[str]) -> str:
     if id.startswith("urn:li:dataset"):
         dataset_key = dataset_urn_to_key(id)
         if dataset_key:
-            return f"{click.style('dataset', fg='cyan')}:{click.style(dataset_key.platform[len('urn:li:dataPlatform:'):], fg='white')}:{click.style(dataset_key.name, fg='white')}"
+            return f"{click.style('dataset', fg='cyan')}:{click.style(dataset_key.platform[len('urn:li:dataPlatform:') :], fg='white')}:{click.style(dataset_key.name, fg='white')}"
     # failed to prettify, return original
     return id
 
diff --git a/metadata-ingestion/src/datahub/configuration/common.py b/metadata-ingestion/src/datahub/configuration/common.py
index 08817d9d5fdb93..8052de1b0669c4 100644
--- a/metadata-ingestion/src/datahub/configuration/common.py
+++ b/metadata-ingestion/src/datahub/configuration/common.py
@@ -200,8 +200,7 @@ class IgnorableError(MetaError):
 
 @runtime_checkable
 class ExceptionWithProps(Protocol):
-    def get_telemetry_props(self) -> Dict[str, Any]:
-        ...
+    def get_telemetry_props(self) -> Dict[str, Any]: ...
 
 
 def should_show_stack_trace(exc: Exception) -> bool:
diff --git a/metadata-ingestion/src/datahub/configuration/git.py b/metadata-ingestion/src/datahub/configuration/git.py
index e7e9bfd43adca5..7e68e9f80da4ff 100644
--- a/metadata-ingestion/src/datahub/configuration/git.py
+++ b/metadata-ingestion/src/datahub/configuration/git.py
@@ -121,9 +121,9 @@ def infer_repo_ssh_locator(
 
         repo: str = values["repo"]
         if repo.startswith(_GITHUB_PREFIX):
-            return f"git@github.com:{repo[len(_GITHUB_PREFIX):]}.git"
+            return f"git@github.com:{repo[len(_GITHUB_PREFIX) :]}.git"
         elif repo.startswith(_GITLAB_PREFIX):
-            return f"git@gitlab.com:{repo[len(_GITLAB_PREFIX):]}.git"
+            return f"git@gitlab.com:{repo[len(_GITLAB_PREFIX) :]}.git"
         else:
             raise ValueError(
                 "Unable to infer repo_ssh_locator from repo. Please set repo_ssh_locator manually."
diff --git a/metadata-ingestion/src/datahub/configuration/time_window_config.py b/metadata-ingestion/src/datahub/configuration/time_window_config.py
index b3cc0316091173..5fabcf904d3219 100644
--- a/metadata-ingestion/src/datahub/configuration/time_window_config.py
+++ b/metadata-ingestion/src/datahub/configuration/time_window_config.py
@@ -47,7 +47,10 @@ class BaseTimeWindowConfig(ConfigModel):
         default_factory=lambda: datetime.now(tz=timezone.utc),
         description="Latest date of lineage/usage to consider. Default: Current time in UTC",
     )
-    start_time: datetime = Field(default=None, description="Earliest date of lineage/usage to consider. Default: Last full day in UTC (or hour, depending on `bucket_duration`). You can also specify relative time with respect to end_time such as '-7 days' Or '-7d'.")  # type: ignore
+    start_time: datetime = Field(
+        default=None,
+        description="Earliest date of lineage/usage to consider. Default: Last full day in UTC (or hour, depending on `bucket_duration`). You can also specify relative time with respect to end_time such as '-7 days' Or '-7d'.",
+    )  # type: ignore
 
     @pydantic.validator("start_time", pre=True, always=True)
     def default_start_time(
@@ -63,12 +66,14 @@ def default_start_time(
             # This is where start_time str is resolved to datetime
             try:
                 delta = parse_relative_timespan(v)
-                assert delta < timedelta(
-                    0
-                ), "Relative start time should start with minus sign (-) e.g. '-2 days'."
+                assert delta < timedelta(0), (
+                    "Relative start time should start with minus sign (-) e.g. '-2 days'."
+                )
                 assert abs(delta) >= get_bucket_duration_delta(
                     values["bucket_duration"]
-                ), "Relative start time should be in terms of configured bucket duration. e.g '-2 days' or '-2 hours'."
+                ), (
+                    "Relative start time should be in terms of configured bucket duration. e.g '-2 days' or '-2 hours'."
+                )
 
                 # The end_time's default value is not yet populated, in which case
                 # we can just manually generate it here.
diff --git a/metadata-ingestion/src/datahub/emitter/mce_builder.py b/metadata-ingestion/src/datahub/emitter/mce_builder.py
index f095fffbaea6b4..f5da90a86c9ef6 100644
--- a/metadata-ingestion/src/datahub/emitter/mce_builder.py
+++ b/metadata-ingestion/src/datahub/emitter/mce_builder.py
@@ -88,13 +88,11 @@ def get_sys_time() -> int:
 
 
 @overload
-def make_ts_millis(ts: None) -> None:
-    ...
+def make_ts_millis(ts: None) -> None: ...
 
 
 @overload
-def make_ts_millis(ts: datetime) -> int:
-    ...
+def make_ts_millis(ts: datetime) -> int: ...
 
 
 def make_ts_millis(ts: Optional[datetime]) -> Optional[int]:
@@ -105,13 +103,11 @@ def make_ts_millis(ts: Optional[datetime]) -> Optional[int]:
 
 
 @overload
-def parse_ts_millis(ts: float) -> datetime:
-    ...
+def parse_ts_millis(ts: float) -> datetime: ...
 
 
 @overload
-def parse_ts_millis(ts: None) -> None:
-    ...
+def parse_ts_millis(ts: None) -> None: ...
 
 
 def parse_ts_millis(ts: Optional[float]) -> Optional[datetime]:
diff --git a/metadata-ingestion/src/datahub/emitter/mcp_patch_builder.py b/metadata-ingestion/src/datahub/emitter/mcp_patch_builder.py
index 17026a4114c128..e51c37d96e90f0 100644
--- a/metadata-ingestion/src/datahub/emitter/mcp_patch_builder.py
+++ b/metadata-ingestion/src/datahub/emitter/mcp_patch_builder.py
@@ -33,8 +33,7 @@
 
 @runtime_checkable
 class SupportsToObj(Protocol):
-    def to_obj(self) -> Any:
-        ...
+    def to_obj(self) -> Any: ...
 
 
 def _recursive_to_obj(obj: Any) -> Any:
diff --git a/metadata-ingestion/src/datahub/ingestion/api/incremental_lineage_helper.py b/metadata-ingestion/src/datahub/ingestion/api/incremental_lineage_helper.py
index 78a091f1ffe689..92ee158661d3d4 100644
--- a/metadata-ingestion/src/datahub/ingestion/api/incremental_lineage_helper.py
+++ b/metadata-ingestion/src/datahub/ingestion/api/incremental_lineage_helper.py
@@ -55,15 +55,9 @@ def convert_chart_info_to_patch(
         aspect.externalUrl
     ).set_type(aspect.type).set_title(aspect.title).set_access(
         aspect.access
-    ).set_last_modified(
-        aspect.lastModified
-    ).set_last_refreshed(
+    ).set_last_modified(aspect.lastModified).set_last_refreshed(
         aspect.lastRefreshed
-    ).set_description(
-        aspect.description
-    ).add_inputs(
-        aspect.inputs
-    )
+    ).set_description(aspect.description).add_inputs(aspect.inputs)
 
     values = patch_builder.build()
     if values:
diff --git a/metadata-ingestion/src/datahub/ingestion/api/report.py b/metadata-ingestion/src/datahub/ingestion/api/report.py
index 32810189acd00b..8cfca5782bee40 100644
--- a/metadata-ingestion/src/datahub/ingestion/api/report.py
+++ b/metadata-ingestion/src/datahub/ingestion/api/report.py
@@ -21,8 +21,7 @@
 
 @runtime_checkable
 class SupportsAsObj(Protocol):
-    def as_obj(self) -> dict:
-        ...
+    def as_obj(self) -> dict: ...
 
 
 @dataclass
diff --git a/metadata-ingestion/src/datahub/ingestion/api/source_helpers.py b/metadata-ingestion/src/datahub/ingestion/api/source_helpers.py
index f3e5b1db6a1c85..08af39cd24982a 100644
--- a/metadata-ingestion/src/datahub/ingestion/api/source_helpers.py
+++ b/metadata-ingestion/src/datahub/ingestion/api/source_helpers.py
@@ -48,7 +48,7 @@
 
 
 def auto_workunit(
-    stream: Iterable[Union[MetadataChangeEventClass, MetadataChangeProposalWrapper]]
+    stream: Iterable[Union[MetadataChangeEventClass, MetadataChangeProposalWrapper]],
 ) -> Iterable[MetadataWorkUnit]:
     """Convert a stream of MCEs and MCPs to a stream of :class:`MetadataWorkUnit`s."""
 
diff --git a/metadata-ingestion/src/datahub/ingestion/extractor/json_schema_util.py b/metadata-ingestion/src/datahub/ingestion/extractor/json_schema_util.py
index 88d1fcc52e2196..1c440642e06d8b 100644
--- a/metadata-ingestion/src/datahub/ingestion/extractor/json_schema_util.py
+++ b/metadata-ingestion/src/datahub/ingestion/extractor/json_schema_util.py
@@ -131,9 +131,9 @@ def get_recursive(self, schema: Dict) -> Optional[str]:
             for i, schema_type in enumerate(p.schema_types):
                 if schema_type == schema_str:
                     # return the corresponding type for the schema that's a match
-                    assert (
-                        len(p.type) > i
-                    ), f"p.type({len(p.type)})) and p.schema_types({len(p.schema_types)}) should have the same length"
+                    assert len(p.type) > i, (
+                        f"p.type({len(p.type)})) and p.schema_types({len(p.schema_types)}) should have the same length"
+                    )
                     return p.type[i]
         return None
 
diff --git a/metadata-ingestion/src/datahub/ingestion/extractor/schema_util.py b/metadata-ingestion/src/datahub/ingestion/extractor/schema_util.py
index d5af4f7a2389c0..dbb851c74e7e34 100644
--- a/metadata-ingestion/src/datahub/ingestion/extractor/schema_util.py
+++ b/metadata-ingestion/src/datahub/ingestion/extractor/schema_util.py
@@ -263,15 +263,13 @@ def _get_type_annotation(schema: SchemaOrField) -> str:
     @overload
     def _get_underlying_type_if_option_as_union(
         schema: SchemaOrField, default: SchemaOrField
-    ) -> SchemaOrField:
-        ...
+    ) -> SchemaOrField: ...
 
     @staticmethod
     @overload
     def _get_underlying_type_if_option_as_union(
         schema: SchemaOrField, default: Optional[SchemaOrField] = None
-    ) -> Optional[SchemaOrField]:
-        ...
+    ) -> Optional[SchemaOrField]: ...
 
     @staticmethod
     def _get_underlying_type_if_option_as_union(
@@ -386,7 +384,7 @@ def emit(self) -> Iterable[SchemaField]:
 
                 if "deprecated" in merged_props:
                     description = (
-                        f"<span style=\"color:red\">DEPRECATED: {merged_props['deprecated']}</span>\n"
+                        f'<span style="color:red">DEPRECATED: {merged_props["deprecated"]}</span>\n'
                         + description
                         if description
                         else ""
diff --git a/metadata-ingestion/src/datahub/ingestion/fs/s3_fs.py b/metadata-ingestion/src/datahub/ingestion/fs/s3_fs.py
index 9c34c4f83b0a93..beec42724529e6 100644
--- a/metadata-ingestion/src/datahub/ingestion/fs/s3_fs.py
+++ b/metadata-ingestion/src/datahub/ingestion/fs/s3_fs.py
@@ -17,9 +17,9 @@ def parse_s3_path(path: str) -> "S3Path":
 
 def assert_ok_status(s3_response):
     is_ok = s3_response["ResponseMetadata"]["HTTPStatusCode"] == 200
-    assert (
-        is_ok
-    ), f"Failed to fetch S3 object, error message: {s3_response['Error']['Message']}"
+    assert is_ok, (
+        f"Failed to fetch S3 object, error message: {s3_response['Error']['Message']}"
+    )
 
 
 @dataclass
diff --git a/metadata-ingestion/src/datahub/ingestion/glossary/datahub_classifier.py b/metadata-ingestion/src/datahub/ingestion/glossary/datahub_classifier.py
index 50268768d0ce9f..ba03083854e785 100644
--- a/metadata-ingestion/src/datahub/ingestion/glossary/datahub_classifier.py
+++ b/metadata-ingestion/src/datahub/ingestion/glossary/datahub_classifier.py
@@ -148,9 +148,9 @@ def input_config_selectively_overrides_default_config(cls, info_types_config):
                 weight,
             ) in custom_infotype_config.Prediction_Factors_and_Weights.dict().items():
                 if weight > 0:
-                    assert (
-                        getattr(custom_infotype_config, factor) is not None
-                    ), f"Missing Configuration for Prediction Factor {factor} for Custom Info Type {custom_infotype}"
+                    assert getattr(custom_infotype_config, factor) is not None, (
+                        f"Missing Configuration for Prediction Factor {factor} for Custom Info Type {custom_infotype}"
+                    )
 
             # Custom infotype supports only regex based prediction for column values
             if custom_infotype_config.Prediction_Factors_and_Weights.Values > 0:
@@ -158,7 +158,9 @@ def input_config_selectively_overrides_default_config(cls, info_types_config):
                 assert (
                     custom_infotype_config.Values.prediction_type
                     == ValuePredictionType.REGEX
-                ), f"Invalid Prediction Type for Values for Custom Info Type {custom_infotype}. Only `regex` is supported."
+                ), (
+                    f"Invalid Prediction Type for Values for Custom Info Type {custom_infotype}. Only `regex` is supported."
+                )
 
         return info_types_config
 
diff --git a/metadata-ingestion/src/datahub/ingestion/graph/client.py b/metadata-ingestion/src/datahub/ingestion/graph/client.py
index 8c5f894a072d93..48a008536ed1ed 100644
--- a/metadata-ingestion/src/datahub/ingestion/graph/client.py
+++ b/metadata-ingestion/src/datahub/ingestion/graph/client.py
@@ -519,9 +519,9 @@ def get_aspects_for_entity(
         :return: Optionally, a map of aspect_name to aspect_value as a dictionary if present, aspect_value will be set to None if that aspect was not found. Returns None on HTTP status 404.
         :raises HttpError: if the HTTP response is not a 200
         """
-        assert len(aspects) == len(
-            aspect_types
-        ), f"number of aspects requested ({len(aspects)}) should be the same as number of aspect types provided ({len(aspect_types)})"
+        assert len(aspects) == len(aspect_types), (
+            f"number of aspects requested ({len(aspects)}) should be the same as number of aspect types provided ({len(aspect_types)})"
+        )
 
         # TODO: generate aspects list from type classes
         response_json = self.get_entity_raw(entity_urn, aspects)
@@ -1576,9 +1576,7 @@ def run_assertion(
                     ... assertionResult
                 }
             }
-        """ % (
-            self._assertion_result_shared()
-        )
+        """ % (self._assertion_result_shared())
 
         variables = {
             "assertionUrn": urn,
diff --git a/metadata-ingestion/src/datahub/ingestion/run/pipeline.py b/metadata-ingestion/src/datahub/ingestion/run/pipeline.py
index ef59ba7a3b58b4..25cbd340c9674b 100644
--- a/metadata-ingestion/src/datahub/ingestion/run/pipeline.py
+++ b/metadata-ingestion/src/datahub/ingestion/run/pipeline.py
@@ -109,9 +109,9 @@ def on_failure(
                         mcp.systemMetadata.properties = {}
                     if "workunit_id" not in mcp.systemMetadata.properties:
                         # update the workunit id
-                        mcp.systemMetadata.properties[
-                            "workunit_id"
-                        ] = record_envelope.metadata["workunit_id"]
+                        mcp.systemMetadata.properties["workunit_id"] = (
+                            record_envelope.metadata["workunit_id"]
+                        )
                 record_envelope.record = mcp
         self.file_sink.write_record_async(record_envelope, self.logging_callback)
 
@@ -701,7 +701,7 @@ def pretty_print_summary(
             num_failures_sink = len(self.sink.get_report().failures)
             click.secho(
                 message_template.format(
-                    status=f"with at least {num_failures_source+num_failures_sink} failures"
+                    status=f"with at least {num_failures_source + num_failures_sink} failures"
                 ),
                 fg=self._get_text_color(
                     running=currently_running, failures=True, warnings=False
@@ -719,7 +719,7 @@ def pretty_print_summary(
             num_warn_global = len(global_warnings)
             click.secho(
                 message_template.format(
-                    status=f"with at least {num_warn_source+num_warn_sink+num_warn_global} warnings"
+                    status=f"with at least {num_warn_source + num_warn_sink + num_warn_global} warnings"
                 ),
                 fg=self._get_text_color(
                     running=currently_running, failures=False, warnings=True
diff --git a/metadata-ingestion/src/datahub/ingestion/run/pipeline_config.py b/metadata-ingestion/src/datahub/ingestion/run/pipeline_config.py
index 7a4e7ec52a8e96..53e31aa2ea96e1 100644
--- a/metadata-ingestion/src/datahub/ingestion/run/pipeline_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/run/pipeline_config.py
@@ -92,9 +92,9 @@ class PipelineConfig(ConfigModel):
     pipeline_name: Optional[str] = None
     failure_log: FailureLoggingConfig = FailureLoggingConfig()
 
-    _raw_dict: Optional[
-        dict
-    ] = None  # the raw dict that was parsed to construct this config
+    _raw_dict: Optional[dict] = (
+        None  # the raw dict that was parsed to construct this config
+    )
 
     @validator("run_id", pre=True, always=True)
     def run_id_should_be_semantic(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/abs/datalake_profiler_config.py b/metadata-ingestion/src/datahub/ingestion/source/abs/datalake_profiler_config.py
index 9f6d13a08b182e..d12ff7415faefc 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/abs/datalake_profiler_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/abs/datalake_profiler_config.py
@@ -85,8 +85,8 @@ def ensure_field_level_settings_are_normalized(
                 if field_level_metric.startswith("include_field_"):
                     values.setdefault(field_level_metric, False)
 
-            assert (
-                max_num_fields_to_profile is None
-            ), f"{max_num_fields_to_profile_key} should be set to None"
+            assert max_num_fields_to_profile is None, (
+                f"{max_num_fields_to_profile_key} should be set to None"
+            )
 
         return values
diff --git a/metadata-ingestion/src/datahub/ingestion/source/abs/source.py b/metadata-ingestion/src/datahub/ingestion/source/abs/source.py
index e4f9cd0ee7e018..586e7a3af3bcd1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/abs/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/abs/source.py
@@ -508,7 +508,12 @@ def abs_browser(
                         ):
                             abs_path = self.create_abs_path(obj.name)
                             logger.debug(f"Sampling file: {abs_path}")
-                            yield abs_path, obj.name, obj.last_modified, obj.size,
+                            yield (
+                                abs_path,
+                                obj.name,
+                                obj.last_modified,
+                                obj.size,
+                            )
                 except Exception as e:
                     # This odd check if being done because boto does not have a proper exception to catch
                     # The exception that appears in stacktrace cannot actually be caught without a lot more work
@@ -552,9 +557,12 @@ def local_browser(
         if os.path.isfile(prefix):
             logger.debug(f"Scanning single local file: {prefix}")
             file_name = prefix
-            yield prefix, file_name, datetime.utcfromtimestamp(
-                os.path.getmtime(prefix)
-            ), os.path.getsize(prefix)
+            yield (
+                prefix,
+                file_name,
+                datetime.utcfromtimestamp(os.path.getmtime(prefix)),
+                os.path.getsize(prefix),
+            )
         else:
             logger.debug(f"Scanning files under local folder: {prefix}")
             for root, dirs, files in os.walk(prefix):
@@ -565,9 +573,12 @@ def local_browser(
                     full_path = PurePath(
                         os.path.normpath(os.path.join(root, file))
                     ).as_posix()
-                    yield full_path, file, datetime.utcfromtimestamp(
-                        os.path.getmtime(full_path)
-                    ), os.path.getsize(full_path)
+                    yield (
+                        full_path,
+                        file,
+                        datetime.utcfromtimestamp(os.path.getmtime(full_path)),
+                        os.path.getsize(full_path),
+                    )
 
     def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
         self.container_WU_creator = ContainerWUCreator(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py b/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
index 30e81643837375..2509927854d4a0 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
@@ -521,7 +521,7 @@ def process_dataflow_node(
         # otherwise, a node represents a transformation
         else:
             node_urn = mce_builder.make_data_job_urn_with_flow(
-                flow_urn, job_id=f'{node["NodeType"]}-{node["Id"]}'
+                flow_urn, job_id=f"{node['NodeType']}-{node['Id']}"
             )
 
         return {
@@ -679,7 +679,7 @@ def get_datajob_wu(self, node: Dict[str, Any], job_name: str) -> MetadataWorkUni
             )
         )
 
-        return MetadataWorkUnit(id=f'{job_name}-{node["Id"]}', mce=mce)
+        return MetadataWorkUnit(id=f"{job_name}-{node['Id']}", mce=mce)
 
     def get_all_databases(self) -> Iterable[Mapping[str, Any]]:
         logger.debug("Getting all databases")
@@ -750,13 +750,13 @@ def get_lineage_if_enabled(
     ) -> Optional[MetadataWorkUnit]:
         if self.source_config.emit_s3_lineage:
             # extract dataset properties aspect
-            dataset_properties: Optional[
-                DatasetPropertiesClass
-            ] = mce_builder.get_aspect_if_available(mce, DatasetPropertiesClass)
+            dataset_properties: Optional[DatasetPropertiesClass] = (
+                mce_builder.get_aspect_if_available(mce, DatasetPropertiesClass)
+            )
             # extract dataset schema aspect
-            schema_metadata: Optional[
-                SchemaMetadataClass
-            ] = mce_builder.get_aspect_if_available(mce, SchemaMetadataClass)
+            schema_metadata: Optional[SchemaMetadataClass] = (
+                mce_builder.get_aspect_if_available(mce, SchemaMetadataClass)
+            )
 
             if dataset_properties and "Location" in dataset_properties.customProperties:
                 location = dataset_properties.customProperties["Location"]
@@ -765,9 +765,9 @@ def get_lineage_if_enabled(
                         location, self.source_config.env
                     )
                     assert self.ctx.graph
-                    schema_metadata_for_s3: Optional[
-                        SchemaMetadataClass
-                    ] = self.ctx.graph.get_schema_metadata(s3_dataset_urn)
+                    schema_metadata_for_s3: Optional[SchemaMetadataClass] = (
+                        self.ctx.graph.get_schema_metadata(s3_dataset_urn)
+                    )
 
                     if self.source_config.glue_s3_lineage_direction == "upstream":
                         fine_grained_lineages = None
diff --git a/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker_processors/feature_groups.py b/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker_processors/feature_groups.py
index c4561b9d9e676a..d46d1c099383fe 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker_processors/feature_groups.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker_processors/feature_groups.py
@@ -257,7 +257,7 @@ def get_feature_wu(
             mce = MetadataChangeEvent(proposedSnapshot=feature_snapshot)
 
         return MetadataWorkUnit(
-            id=f'{feature_group_details["FeatureGroupName"]}-{feature["FeatureName"]}',
+            id=f"{feature_group_details['FeatureGroupName']}-{feature['FeatureName']}",
             mce=mce,
         )
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker_processors/models.py b/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker_processors/models.py
index 0f433aaecf2d96..f1374117af775f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker_processors/models.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker_processors/models.py
@@ -212,7 +212,7 @@ def get_endpoint_wu(
         mce = MetadataChangeEvent(proposedSnapshot=endpoint_snapshot)
 
         return MetadataWorkUnit(
-            id=f'{endpoint_details["EndpointName"]}',
+            id=f"{endpoint_details['EndpointName']}",
             mce=mce,
         )
 
@@ -503,7 +503,7 @@ def get_model_wu(
         mce = MetadataChangeEvent(proposedSnapshot=model_snapshot)
 
         return MetadataWorkUnit(
-            id=f'{model_details["ModelName"]}',
+            id=f"{model_details['ModelName']}",
             mce=mce,
         )
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py
index 508b4bbaa277dc..ceb010a7f0675f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py
@@ -132,9 +132,9 @@ def __init__(self, ctx: PipelineContext, config: BigQueryV2Config):
         self.filters = BigQueryFilter(self.config, self.report)
         self.identifiers = BigQueryIdentifierBuilder(self.config, self.report)
 
-        redundant_lineage_run_skip_handler: Optional[
-            RedundantLineageRunSkipHandler
-        ] = None
+        redundant_lineage_run_skip_handler: Optional[RedundantLineageRunSkipHandler] = (
+            None
+        )
         if self.config.enable_stateful_lineage_ingestion:
             redundant_lineage_run_skip_handler = RedundantLineageRunSkipHandler(
                 source=self,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_audit.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_audit.py
index 42f82704c81b99..d35c5265878c03 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_audit.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_audit.py
@@ -37,9 +37,9 @@ class BigqueryTableIdentifier:
 
     # Note: this regex may get overwritten by the sharded_table_pattern config.
     # The class-level constant, however, will not be overwritten.
-    _BIGQUERY_DEFAULT_SHARDED_TABLE_REGEX: ClassVar[
-        str
-    ] = _BIGQUERY_DEFAULT_SHARDED_TABLE_REGEX
+    _BIGQUERY_DEFAULT_SHARDED_TABLE_REGEX: ClassVar[str] = (
+        _BIGQUERY_DEFAULT_SHARDED_TABLE_REGEX
+    )
     _BIGQUERY_WILDCARD_REGEX: ClassVar[str] = "((_(\\d+)?)\\*$)|\\*$"
     _BQ_SHARDED_TABLE_SUFFIX: str = "_yyyymmdd"
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_config.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_config.py
index afbe919df4dcae..57bfa2e3090d31 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_config.py
@@ -137,9 +137,9 @@ class BigQueryCredential(ConfigModel):
     @root_validator(skip_on_failure=True)
     def validate_config(cls, values: Dict[str, Any]) -> Dict[str, Any]:
         if values.get("client_x509_cert_url") is None:
-            values[
-                "client_x509_cert_url"
-            ] = f'https://www.googleapis.com/robot/v1/metadata/x509/{values["client_email"]}'
+            values["client_x509_cert_url"] = (
+                f"https://www.googleapis.com/robot/v1/metadata/x509/{values['client_email']}"
+            )
         return values
 
     def create_credential_temp_file(self) -> str:
@@ -611,9 +611,9 @@ def validate_bigquery_audit_metadata_datasets(
         cls, v: Optional[List[str]], values: Dict
     ) -> Optional[List[str]]:
         if values.get("use_exported_bigquery_audit_metadata"):
-            assert (
-                v and len(v) > 0
-            ), "`bigquery_audit_metadata_datasets` should be set if using `use_exported_bigquery_audit_metadata: True`."
+            assert v and len(v) > 0, (
+                "`bigquery_audit_metadata_datasets` should be set if using `use_exported_bigquery_audit_metadata: True`."
+            )
 
         return v
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_platform_resource_helper.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_platform_resource_helper.py
index 9da2aceb19220a..7dc0e4195d5dc9 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_platform_resource_helper.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_platform_resource_helper.py
@@ -87,9 +87,9 @@ def get_platform_resource(
             key=platform_resource_key, graph_client=self.graph
         )
         if platform_resource:
-            self.platform_resource_cache[
-                platform_resource_key.primary_key
-            ] = platform_resource
+            self.platform_resource_cache[platform_resource_key.primary_key] = (
+                platform_resource
+            )
             return platform_resource
         return None
 
@@ -115,7 +115,11 @@ def generate_label_platform_resource(
                 and platform_resource.resource_info.value
             ):
                 try:
-                    existing_info: Optional[BigQueryLabelInfo] = platform_resource.resource_info.value.as_pydantic_object(BigQueryLabelInfo)  # type: ignore
+                    existing_info: Optional[BigQueryLabelInfo] = (
+                        platform_resource.resource_info.value.as_pydantic_object(  # type: ignore
+                            BigQueryLabelInfo
+                        )
+                    )
                 except ValidationError as e:
                     logger.error(
                         f"Error converting existing value to BigQueryLabelInfo: {e}. Creating new one. Maybe this is because of a non backward compatible schema change."
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py
index 56e930dfb811f1..ebfbbf0639c38c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py
@@ -311,8 +311,10 @@ def gen_dataset_containers(
                         platform_resource: PlatformResource = self.platform_resource_helper.generate_label_platform_resource(
                             label, tag_urn, managed_by_datahub=False
                         )
-                        label_info: BigQueryLabelInfo = platform_resource.resource_info.value.as_pydantic_object(  # type: ignore
-                            BigQueryLabelInfo
+                        label_info: BigQueryLabelInfo = (
+                            platform_resource.resource_info.value.as_pydantic_object(  # type: ignore
+                                BigQueryLabelInfo
+                            )
                         )
                         tag_urn = TagUrn.from_string(label_info.datahub_urn)
 
@@ -820,8 +822,10 @@ def gen_table_dataset_workunits(
                         platform_resource: PlatformResource = self.platform_resource_helper.generate_label_platform_resource(
                             label, tag_urn, managed_by_datahub=False
                         )
-                        label_info: BigQueryLabelInfo = platform_resource.resource_info.value.as_pydantic_object(  # type: ignore
-                            BigQueryLabelInfo
+                        label_info: BigQueryLabelInfo = (
+                            platform_resource.resource_info.value.as_pydantic_object(  # type: ignore
+                                BigQueryLabelInfo
+                            )
                         )
                         tag_urn = TagUrn.from_string(label_info.datahub_urn)
 
@@ -860,8 +864,10 @@ def gen_view_dataset_workunits(
                         platform_resource: PlatformResource = self.platform_resource_helper.generate_label_platform_resource(
                             label, tag_urn, managed_by_datahub=False
                         )
-                        label_info: BigQueryLabelInfo = platform_resource.resource_info.value.as_pydantic_object(  # type: ignore
-                            BigQueryLabelInfo
+                        label_info: BigQueryLabelInfo = (
+                            platform_resource.resource_info.value.as_pydantic_object(  # type: ignore
+                                BigQueryLabelInfo
+                            )
                         )
                         tag_urn = TagUrn.from_string(label_info.datahub_urn)
 
@@ -1203,9 +1209,9 @@ def get_tables_for_dataset(
                     report=self.report,
                 )
 
-        self.report.metadata_extraction_sec[
-            f"{project_id}.{dataset.name}"
-        ] = timer.elapsed_seconds(digits=2)
+        self.report.metadata_extraction_sec[f"{project_id}.{dataset.name}"] = (
+            timer.elapsed_seconds(digits=2)
+        )
 
     def get_core_table_details(
         self, dataset_name: str, project_id: str, temp_table_dataset_prefix: str
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/lineage.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/lineage.py
index 433282a21fdb66..da82c6a06f0395 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/lineage.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/lineage.py
@@ -697,7 +697,7 @@ def _create_lineage_map(
                         if parsed_queries[-1]:
                             query = f"""create table `{destination_table.get_sanitized_table_ref().table_identifier.get_table_name()}` AS
                             (
-                                {parsed_queries[-1].sql(dialect='bigquery')}
+                                {parsed_queries[-1].sql(dialect="bigquery")}
                             )"""
                         else:
                             query = e.query
@@ -809,11 +809,11 @@ def get_upstream_tables(
                             upstream_lineage, temp_table_upstream
                         )
 
-                        upstreams[
-                            ref_temp_table_upstream
-                        ] = _merge_lineage_edge_columns(
-                            upstreams.get(ref_temp_table_upstream),
-                            collapsed_lineage,
+                        upstreams[ref_temp_table_upstream] = (
+                            _merge_lineage_edge_columns(
+                                upstreams.get(ref_temp_table_upstream),
+                                collapsed_lineage,
+                            )
                         )
             else:
                 upstreams[upstream_table_ref] = _merge_lineage_edge_columns(
@@ -1004,9 +1004,9 @@ def get_lineage_for_external_table(
                 dataset_urn
             )
             for gcs_dataset_urn in gcs_urns:
-                schema_metadata_for_gcs: Optional[
-                    SchemaMetadataClass
-                ] = graph.get_schema_metadata(gcs_dataset_urn)
+                schema_metadata_for_gcs: Optional[SchemaMetadataClass] = (
+                    graph.get_schema_metadata(gcs_dataset_urn)
+                )
                 if schema_metadata and schema_metadata_for_gcs:
                     fine_grained_lineage = self.get_fine_grained_lineages_with_gcs(
                         dataset_urn,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/queries.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/queries.py
index 2ac40a48de4cc7..8a558d7736a389 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/queries.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/queries.py
@@ -387,9 +387,7 @@ class BigqueryQuery:
     OR
     protoPayload.metadata.tableDataRead.reason = "JOB"
 )
-""".strip(
-    "\t \n"
-)
+""".strip("\t \n")
 
 
 def bigquery_audit_metadata_query_template_lineage(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/queries_extractor.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/queries_extractor.py
index 08c9beaa73c53b..0f9471219c6590 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/queries_extractor.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/queries_extractor.py
@@ -271,9 +271,9 @@ def get_workunits_internal(
             # Preprocessing stage that deduplicates the queries using query hash per usage bucket
             # Note: FileBackedDict is an ordered dictionary, so the order of execution of
             # queries is inherently maintained
-            queries_deduped: FileBackedDict[
-                Dict[int, ObservedQuery]
-            ] = self.deduplicate_queries(queries)
+            queries_deduped: FileBackedDict[Dict[int, ObservedQuery]] = (
+                self.deduplicate_queries(queries)
+            )
             self.report.num_unique_queries = len(queries_deduped)
             logger.info(f"Found {self.report.num_unique_queries} unique queries")
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/usage.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/usage.py
index f2f6cc731858d1..c2b849e58fc6dc 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/usage.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/usage.py
@@ -763,9 +763,9 @@ def _create_operational_custom_properties(
                     )
 
                 if event.query_event.default_dataset:
-                    custom_properties[
-                        "defaultDatabase"
-                    ] = event.query_event.default_dataset
+                    custom_properties["defaultDatabase"] = (
+                        event.query_event.default_dataset
+                    )
             if event.read_event:
                 if event.read_event.readReason:
                     custom_properties["readReason"] = event.read_event.readReason
diff --git a/metadata-ingestion/src/datahub/ingestion/source/cassandra/cassandra.py b/metadata-ingestion/src/datahub/ingestion/source/cassandra/cassandra.py
index dcdccc08ce0483..062c64d45767fc 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/cassandra/cassandra.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/cassandra/cassandra.py
@@ -91,7 +91,6 @@ class KeyspaceKey(ContainerKey):
     supported=True,
 )
 class CassandraSource(StatefulIngestionSourceBase):
-
     """
     This plugin extracts the following:
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/cassandra/cassandra_utils.py b/metadata-ingestion/src/datahub/ingestion/source/cassandra/cassandra_utils.py
index 75a0ba0c617734..b467ca0aca6be4 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/cassandra/cassandra_utils.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/cassandra/cassandra_utils.py
@@ -107,10 +107,10 @@ class CassandraToSchemaFieldConverter:
 
     @staticmethod
     def get_column_type(cassandra_column_type: str) -> SchemaFieldDataType:
-        type_class: Optional[
-            Type
-        ] = CassandraToSchemaFieldConverter._field_type_to_schema_field_type.get(
-            cassandra_column_type
+        type_class: Optional[Type] = (
+            CassandraToSchemaFieldConverter._field_type_to_schema_field_type.get(
+                cassandra_column_type
+            )
         )
         if type_class is None:
             logger.warning(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/confluent_schema_registry.py b/metadata-ingestion/src/datahub/ingestion/source/confluent_schema_registry.py
index 2b75d0dca53cb7..5ba4dd13fb2ac9 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/confluent_schema_registry.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/confluent_schema_registry.py
@@ -293,9 +293,9 @@ def _get_schema_and_fields(
     def _load_json_schema_with_resolved_references(
         self, schema: Schema, name: str, subject: str
     ) -> dict:
-        imported_json_schemas: List[
-            JsonSchemaWrapper
-        ] = self.get_schemas_from_confluent_ref_json(schema, name=name, subject=subject)
+        imported_json_schemas: List[JsonSchemaWrapper] = (
+            self.get_schemas_from_confluent_ref_json(schema, name=name, subject=subject)
+        )
         schema_dict = json.loads(schema.schema_str)
         reference_map = {}
         for imported_schema in imported_json_schemas:
@@ -332,9 +332,9 @@ def _get_schema_fields(
             )
 
         elif schema.schema_type == "PROTOBUF":
-            imported_schemas: List[
-                ProtobufSchema
-            ] = self.get_schemas_from_confluent_ref_protobuf(schema)
+            imported_schemas: List[ProtobufSchema] = (
+                self.get_schemas_from_confluent_ref_protobuf(schema)
+            )
             base_name: str = topic.replace(".", "_")
             fields = protobuf_util.protobuf_schema_to_mce_fields(
                 ProtobufSchema(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/csv_enricher.py b/metadata-ingestion/src/datahub/ingestion/source/csv_enricher.py
index 42e025073b534e..8ebb7b9ef7fbdf 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/csv_enricher.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/csv_enricher.py
@@ -371,11 +371,11 @@ def get_resource_workunits(
         domain: Optional[str],
         description: Optional[str],
     ) -> Iterable[MetadataWorkUnit]:
-        maybe_terms_wu: Optional[
-            MetadataWorkUnit
-        ] = self.get_resource_glossary_terms_work_unit(
-            entity_urn=entity_urn,
-            term_associations=term_associations,
+        maybe_terms_wu: Optional[MetadataWorkUnit] = (
+            self.get_resource_glossary_terms_work_unit(
+                entity_urn=entity_urn,
+                term_associations=term_associations,
+            )
         )
         if maybe_terms_wu:
             self.report.num_glossary_term_workunits_produced += 1
@@ -389,31 +389,31 @@ def get_resource_workunits(
             self.report.num_tag_workunits_produced += 1
             yield maybe_tags_wu
 
-        maybe_owners_wu: Optional[
-            MetadataWorkUnit
-        ] = self.get_resource_owners_work_unit(
-            entity_urn=entity_urn,
-            owners=owners,
+        maybe_owners_wu: Optional[MetadataWorkUnit] = (
+            self.get_resource_owners_work_unit(
+                entity_urn=entity_urn,
+                owners=owners,
+            )
         )
         if maybe_owners_wu:
             self.report.num_owners_workunits_produced += 1
             yield maybe_owners_wu
 
-        maybe_domain_wu: Optional[
-            MetadataWorkUnit
-        ] = self.get_resource_domain_work_unit(
-            entity_urn=entity_urn,
-            domain=domain,
+        maybe_domain_wu: Optional[MetadataWorkUnit] = (
+            self.get_resource_domain_work_unit(
+                entity_urn=entity_urn,
+                domain=domain,
+            )
         )
         if maybe_domain_wu:
             self.report.num_domain_workunits_produced += 1
             yield maybe_domain_wu
 
-        maybe_description_wu: Optional[
-            MetadataWorkUnit
-        ] = self.get_resource_description_work_unit(
-            entity_urn=entity_urn,
-            description=description,
+        maybe_description_wu: Optional[MetadataWorkUnit] = (
+            self.get_resource_description_work_unit(
+                entity_urn=entity_urn,
+                description=description,
+            )
         )
         if maybe_description_wu:
             self.report.num_description_workunits_produced += 1
@@ -426,9 +426,9 @@ def process_sub_resource_row(
         needs_write: bool,
     ) -> Tuple[EditableSchemaMetadataClass, bool]:
         field_path: str = sub_resource_row.field_path
-        term_associations: List[
-            GlossaryTermAssociationClass
-        ] = sub_resource_row.term_associations
+        term_associations: List[GlossaryTermAssociationClass] = (
+            sub_resource_row.term_associations
+        )
         tag_associations: List[TagAssociationClass] = sub_resource_row.tag_associations
         description: Optional[str] = sub_resource_row.description
         has_terms: bool = len(term_associations) > 0
@@ -517,9 +517,9 @@ def get_sub_resource_work_units(self) -> Iterable[MetadataWorkUnit]:
             # Boolean field to tell whether we need to write an MCPW.
             needs_write = False
 
-            current_editable_schema_metadata: Optional[
-                EditableSchemaMetadataClass
-            ] = None
+            current_editable_schema_metadata: Optional[EditableSchemaMetadataClass] = (
+                None
+            )
             if self.ctx.graph and not self.should_overwrite:
                 # Fetch the current editable schema metadata
                 current_editable_schema_metadata = self.ctx.graph.get_aspect(
@@ -655,9 +655,9 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
             entity_urn = row["resource"]
             entity_type = Urn.from_string(row["resource"]).get_type()
 
-            term_associations: List[
-                GlossaryTermAssociationClass
-            ] = self.maybe_extract_glossary_terms(row)
+            term_associations: List[GlossaryTermAssociationClass] = (
+                self.maybe_extract_glossary_terms(row)
+            )
             tag_associations: List[TagAssociationClass] = self.maybe_extract_tags(row)
             owners: List[OwnerClass] = self.maybe_extract_owners(row, is_resource_row)
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/datahub/datahub_database_reader.py b/metadata-ingestion/src/datahub/ingestion/source/datahub/datahub_database_reader.py
index ee105f4862caba..51a25829d21dba 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/datahub/datahub_database_reader.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/datahub/datahub_database_reader.py
@@ -152,7 +152,9 @@ def execute_server_cursor(
     ) -> Iterable[Dict[str, Any]]:
         with self.engine.connect() as conn:
             if self.engine.dialect.name in ["postgresql", "mysql", "mariadb"]:
-                with conn.begin():  # Transaction required for PostgreSQL server-side cursor
+                with (
+                    conn.begin()
+                ):  # Transaction required for PostgreSQL server-side cursor
                     # Note that stream_results=True is mainly supported by PostgreSQL and MySQL-based dialects.
                     # https://docs.sqlalchemy.org/en/14/core/connections.html#sqlalchemy.engine.Connection.execution_options.params.stream_results
                     conn = conn.execution_options(
@@ -222,7 +224,7 @@ def _parse_row(
             )
         except Exception as e:
             logger.warning(
-                f'Failed to parse metadata for {row["urn"]}: {e}', exc_info=True
+                f"Failed to parse metadata for {row['urn']}: {e}", exc_info=True
             )
             self.report.num_database_parse_errors += 1
             self.report.database_parse_errors.setdefault(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_cloud.py b/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_cloud.py
index 5042f6d69b261a..41b59a9c8b892c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_cloud.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_cloud.py
@@ -194,20 +194,20 @@ def infer_metadata_endpoint(access_url: str) -> Optional[str]:
 
 _DBT_FIELDS_BY_TYPE = {
     "models": f"""
-    { _DBT_GRAPHQL_COMMON_FIELDS }
-    { _DBT_GRAPHQL_NODE_COMMON_FIELDS }
-    { _DBT_GRAPHQL_MODEL_SEED_SNAPSHOT_FIELDS }
+    {_DBT_GRAPHQL_COMMON_FIELDS}
+    {_DBT_GRAPHQL_NODE_COMMON_FIELDS}
+    {_DBT_GRAPHQL_MODEL_SEED_SNAPSHOT_FIELDS}
     dependsOn
     materializedType
 """,
     "seeds": f"""
-    { _DBT_GRAPHQL_COMMON_FIELDS }
-    { _DBT_GRAPHQL_NODE_COMMON_FIELDS }
-    { _DBT_GRAPHQL_MODEL_SEED_SNAPSHOT_FIELDS }
+    {_DBT_GRAPHQL_COMMON_FIELDS}
+    {_DBT_GRAPHQL_NODE_COMMON_FIELDS}
+    {_DBT_GRAPHQL_MODEL_SEED_SNAPSHOT_FIELDS}
 """,
     "sources": f"""
-    { _DBT_GRAPHQL_COMMON_FIELDS }
-    { _DBT_GRAPHQL_NODE_COMMON_FIELDS }
+    {_DBT_GRAPHQL_COMMON_FIELDS}
+    {_DBT_GRAPHQL_NODE_COMMON_FIELDS}
     identifier
     sourceName
     sourceDescription
@@ -218,9 +218,9 @@ def infer_metadata_endpoint(access_url: str) -> Optional[str]:
     loader
 """,
     "snapshots": f"""
-    { _DBT_GRAPHQL_COMMON_FIELDS }
-    { _DBT_GRAPHQL_NODE_COMMON_FIELDS }
-    { _DBT_GRAPHQL_MODEL_SEED_SNAPSHOT_FIELDS }
+    {_DBT_GRAPHQL_COMMON_FIELDS}
+    {_DBT_GRAPHQL_NODE_COMMON_FIELDS}
+    {_DBT_GRAPHQL_MODEL_SEED_SNAPSHOT_FIELDS}
     parentsSources {{
       uniqueId
     }}
@@ -229,7 +229,7 @@ def infer_metadata_endpoint(access_url: str) -> Optional[str]:
     }}
 """,
     "tests": f"""
-    { _DBT_GRAPHQL_COMMON_FIELDS }
+    {_DBT_GRAPHQL_COMMON_FIELDS}
     state
     columnName
     status
@@ -315,7 +315,7 @@ def _send_graphql_query(
             res = response.json()
             if "errors" in res:
                 raise ValueError(
-                    f'Unable to fetch metadata from dbt Cloud: {res["errors"]}'
+                    f"Unable to fetch metadata from dbt Cloud: {res['errors']}"
                 )
             data = res["data"]
         except JSONDecodeError as e:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_common.py b/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_common.py
index 499e7e1231d050..fa85308b325979 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_common.py
@@ -506,16 +506,18 @@ class DBTNode:
     materialization: Optional[str]  # table, view, ephemeral, incremental, snapshot
     # see https://docs.getdbt.com/reference/artifacts/manifest-json
     catalog_type: Optional[str]
-    missing_from_catalog: bool  # indicates if the node was missing from the catalog.json
+    missing_from_catalog: (
+        bool  # indicates if the node was missing from the catalog.json
+    )
 
     owner: Optional[str]
 
     columns: List[DBTColumn] = field(default_factory=list)
     upstream_nodes: List[str] = field(default_factory=list)  # list of upstream dbt_name
     upstream_cll: List[DBTColumnLineageInfo] = field(default_factory=list)
-    raw_sql_parsing_result: Optional[
-        SqlParsingResult
-    ] = None  # only set for nodes that don't depend on ephemeral models
+    raw_sql_parsing_result: Optional[SqlParsingResult] = (
+        None  # only set for nodes that don't depend on ephemeral models
+    )
     cll_debug_info: Optional[SqlParsingDebugInfo] = None
 
     meta: Dict[str, Any] = field(default_factory=dict)
@@ -869,10 +871,10 @@ def create_test_entity_mcps(
                                 "platform": DBT_PLATFORM,
                                 "name": node.dbt_name,
                                 "instance": self.config.platform_instance,
+                                # Ideally we'd include the env unconditionally. However, we started out
+                                # not including env in the guid, so we need to maintain backwards compatibility
+                                # with existing PROD assertions.
                                 **(
-                                    # Ideally we'd include the env unconditionally. However, we started out
-                                    # not including env in the guid, so we need to maintain backwards compatibility
-                                    # with existing PROD assertions.
                                     {"env": self.config.env}
                                     if self.config.env != mce_builder.DEFAULT_ENV
                                     and self.config.include_env_in_assertion_guid
diff --git a/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_api.py b/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_api.py
index 072995c10ebcef..cf2d9670400ca5 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_api.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_api.py
@@ -191,9 +191,9 @@ def authenticate(self, connection_args: "DremioSourceConfig") -> None:
                     )
                     return
                 else:
-                    assert (
-                        connection_args.username and connection_args.password
-                    ), "Username and password are required for authentication"
+                    assert connection_args.username and connection_args.password, (
+                        "Username and password are required for authentication"
+                    )
                     host = connection_args.hostname
                     port = connection_args.port
                     protocol = "https" if connection_args.tls else "http"
diff --git a/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_datahub_source_mapping.py b/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_datahub_source_mapping.py
index e5d6b8e40fb3d8..482647f8d77da1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_datahub_source_mapping.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/dremio/dremio_datahub_source_mapping.py
@@ -101,9 +101,9 @@ def add_mapping(
         Add a new source type if not in the map (e.g., Dremio ARP).
         """
         dremio_source_type = dremio_source_type.upper()
-        DremioToDataHubSourceTypeMapping.SOURCE_TYPE_MAPPING[
-            dremio_source_type
-        ] = datahub_source_type
+        DremioToDataHubSourceTypeMapping.SOURCE_TYPE_MAPPING[dremio_source_type] = (
+            datahub_source_type
+        )
 
         if category:
             if category.lower() == "file_object_storage":
diff --git a/metadata-ingestion/src/datahub/ingestion/source/elastic_search.py b/metadata-ingestion/src/datahub/ingestion/source/elastic_search.py
index 99aa5f54f6a576..ce1c60dcafdd46 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/elastic_search.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/elastic_search.py
@@ -111,10 +111,10 @@ class ElasticToSchemaFieldConverter:
 
     @staticmethod
     def get_column_type(elastic_column_type: str) -> SchemaFieldDataType:
-        type_class: Optional[
-            Type
-        ] = ElasticToSchemaFieldConverter._field_type_to_schema_field_type.get(
-            elastic_column_type
+        type_class: Optional[Type] = (
+            ElasticToSchemaFieldConverter._field_type_to_schema_field_type.get(
+                elastic_column_type
+            )
         )
         if type_class is None:
             logger.warning(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py b/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
index 02b29051dd2ebe..ffcd9218a2103c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/gc/soft_deleted_entity_cleanup.py
@@ -155,9 +155,9 @@ def _update_report(self, urn: str, entity_type: str) -> None:
             current_count = self.report.num_hard_deleted_by_type.get(entity_type, 0)
             self.report.num_hard_deleted_by_type[entity_type] = current_count + 1
             if entity_type not in self.report.sample_hard_deleted_aspects_by_type:
-                self.report.sample_hard_deleted_aspects_by_type[
-                    entity_type
-                ] = LossyList()
+                self.report.sample_hard_deleted_aspects_by_type[entity_type] = (
+                    LossyList()
+                )
             self.report.sample_hard_deleted_aspects_by_type[entity_type].append(urn)
 
     def delete_entity(self, urn: str) -> None:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/gcs/gcs_source.py b/metadata-ingestion/src/datahub/ingestion/source/gcs/gcs_source.py
index 18838af9bdf85f..5196c8ec5b998b 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/gcs/gcs_source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/gcs/gcs_source.py
@@ -141,8 +141,9 @@ def s3_source_overrides(self, source: S3Source) -> S3Source:
         source.source_config.platform = PLATFORM_GCS
 
         source.is_s3_platform = lambda: True  # type: ignore
-        source.create_s3_path = lambda bucket_name, key: unquote(f"s3://{bucket_name}/{key}")  # type: ignore
-
+        source.create_s3_path = lambda bucket_name, key: unquote(  # type: ignore
+            f"s3://{bucket_name}/{key}"
+        )
         return source
 
     def get_workunit_processors(self) -> List[Optional[MetadataWorkUnitProcessor]]:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/ge_data_profiler.py b/metadata-ingestion/src/datahub/ingestion/source/ge_data_profiler.py
index aba0deebd356c5..bde26f97bf271f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/ge_data_profiler.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/ge_data_profiler.py
@@ -327,7 +327,7 @@ def _is_single_row_query_method(query: Any) -> bool:
 
 
 def _run_with_query_combiner(
-    method: Callable[Concatenate["_SingleDatasetProfiler", P], None]
+    method: Callable[Concatenate["_SingleDatasetProfiler", P], None],
 ) -> Callable[Concatenate["_SingleDatasetProfiler", P], None]:
     @functools.wraps(method)
     def inner(
@@ -1537,9 +1537,7 @@ def create_bigquery_temp_table(
         query_job: Optional["google.cloud.bigquery.job.query.QueryJob"] = (
             # In google-cloud-bigquery 3.15.0, the _query_job attribute was
             # made public and renamed to query_job.
-            cursor.query_job
-            if hasattr(cursor, "query_job")
-            else cursor._query_job  # type: ignore[attr-defined]
+            cursor.query_job if hasattr(cursor, "query_job") else cursor._query_job  # type: ignore[attr-defined]
         )
         assert query_job
         temp_destination_table = query_job.destination
diff --git a/metadata-ingestion/src/datahub/ingestion/source/ge_profiling_config.py b/metadata-ingestion/src/datahub/ingestion/source/ge_profiling_config.py
index 42d0def0a46e7d..93142a347ca0e6 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/ge_profiling_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/ge_profiling_config.py
@@ -220,9 +220,9 @@ def ensure_field_level_settings_are_normalized(
                         )
                     values[field_level_metric] = False
 
-            assert (
-                max_num_fields_to_profile is None
-            ), f"{max_num_fields_to_profile_key} should be set to None"
+            assert max_num_fields_to_profile is None, (
+                f"{max_num_fields_to_profile_key} should be set to None"
+            )
 
         # Disable expensive queries.
         if values.get("turn_off_expensive_profiling_metrics"):
diff --git a/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg.py b/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg.py
index 8101f0110509e3..9a62ee2dab52f4 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg.py
@@ -296,9 +296,9 @@ def _create_iceberg_workunit(
                 custom_properties["snapshot-id"] = str(
                     table.current_snapshot().snapshot_id
                 )
-                custom_properties[
-                    "manifest-list"
-                ] = table.current_snapshot().manifest_list
+                custom_properties["manifest-list"] = (
+                    table.current_snapshot().manifest_list
+                )
             dataset_properties = DatasetPropertiesClass(
                 name=table.name()[-1],
                 description=table.metadata.properties.get("comment", None),
diff --git a/metadata-ingestion/src/datahub/ingestion/source/identity/azure_ad.py b/metadata-ingestion/src/datahub/ingestion/source/identity/azure_ad.py
index 885b6514779cc4..edb9b7b8bd5264 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/identity/azure_ad.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/identity/azure_ad.py
@@ -354,9 +354,9 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                     yield MetadataWorkUnit(id=group_status_wu_id, mcp=group_status_mcp)
 
         # Populate GroupMembership Aspects for CorpUsers
-        datahub_corp_user_urn_to_group_membership: Dict[
-            str, GroupMembershipClass
-        ] = defaultdict(lambda: GroupMembershipClass(groups=[]))
+        datahub_corp_user_urn_to_group_membership: Dict[str, GroupMembershipClass] = (
+            defaultdict(lambda: GroupMembershipClass(groups=[]))
+        )
         if (
             self.config.ingest_group_membership
             and len(self.selected_azure_ad_groups) > 0
diff --git a/metadata-ingestion/src/datahub/ingestion/source/identity/okta.py b/metadata-ingestion/src/datahub/ingestion/source/identity/okta.py
index dda81b0e34a8d2..5452fbcd3f053b 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/identity/okta.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/identity/okta.py
@@ -344,9 +344,9 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                 ).as_workunit()
 
         # Step 2: Populate GroupMembership Aspects for CorpUsers
-        datahub_corp_user_urn_to_group_membership: Dict[
-            str, GroupMembershipClass
-        ] = defaultdict(lambda: GroupMembershipClass(groups=[]))
+        datahub_corp_user_urn_to_group_membership: Dict[str, GroupMembershipClass] = (
+            defaultdict(lambda: GroupMembershipClass(groups=[]))
+        )
         if self.config.ingest_group_membership and okta_groups is not None:
             # Fetch membership for each group.
             for okta_group in okta_groups:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/kafka/kafka.py b/metadata-ingestion/src/datahub/ingestion/source/kafka/kafka.py
index fa842a15ba7328..9f15eda1501f11 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/kafka/kafka.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/kafka/kafka.py
@@ -419,10 +419,10 @@ def _extract_record(
             custom_props = self.build_custom_properties(
                 topic, topic_detail, extra_topic_config
             )
-            schema_name: Optional[
-                str
-            ] = self.schema_registry_client._get_subject_for_topic(
-                topic, is_key_schema=False
+            schema_name: Optional[str] = (
+                self.schema_registry_client._get_subject_for_topic(
+                    topic, is_key_schema=False
+                )
             )
             if schema_name is not None:
                 custom_props["Schema Name"] = schema_name
@@ -610,11 +610,13 @@ def fetch_extra_topic_details(self, topics: List[str]) -> Dict[str, dict]:
 
     def fetch_topic_configurations(self, topics: List[str]) -> Dict[str, dict]:
         logger.info("Fetching config details for all topics")
-        configs: Dict[
-            ConfigResource, concurrent.futures.Future
-        ] = self.admin_client.describe_configs(
-            resources=[ConfigResource(ConfigResource.Type.TOPIC, t) for t in topics],
-            request_timeout=self.source_config.connection.client_timeout_seconds,
+        configs: Dict[ConfigResource, concurrent.futures.Future] = (
+            self.admin_client.describe_configs(
+                resources=[
+                    ConfigResource(ConfigResource.Type.TOPIC, t) for t in topics
+                ],
+                request_timeout=self.source_config.connection.client_timeout_seconds,
+            )
         )
         logger.debug("Waiting for config details futures to complete")
         concurrent.futures.wait(configs.values())
diff --git a/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/kafka_connect.py b/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/kafka_connect.py
index 72be864fc30a1c..9edfce5855f430 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/kafka_connect.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/kafka_connect.py
@@ -110,9 +110,8 @@ def get_connectors_manifest(self) -> Iterable[ConnectorManifest]:
             connector_manifest = self._get_connector_manifest(
                 connector_name, connector_url
             )
-            if (
-                connector_manifest is None
-                or not self.config.connector_patterns.allowed(connector_manifest.name)
+            if connector_manifest is None or not self.config.connector_patterns.allowed(
+                connector_manifest.name
             ):
                 self.report.report_dropped(connector_name)
                 continue
diff --git a/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/sink_connectors.py b/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/sink_connectors.py
index 2790460c8e6019..10255ed544b812 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/sink_connectors.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/sink_connectors.py
@@ -199,9 +199,9 @@ def get_parser(
             transforms.append(transform)
             for key in self.connector_manifest.config.keys():
                 if key.startswith(f"transforms.{name}."):
-                    transform[
-                        key.replace(f"transforms.{name}.", "")
-                    ] = self.connector_manifest.config[key]
+                    transform[key.replace(f"transforms.{name}.", "")] = (
+                        self.connector_manifest.config[key]
+                    )
 
         if "defaultDataset" in connector_manifest.config:
             defaultDataset = connector_manifest.config["defaultDataset"]
diff --git a/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/source_connectors.py b/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/source_connectors.py
index 7b3b6e551a0a1f..5e64d4e161e3ea 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/source_connectors.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/source_connectors.py
@@ -123,9 +123,9 @@ def get_parser(
             transforms.append(transform)
             for key in self.connector_manifest.config.keys():
                 if key.startswith(f"transforms.{name}."):
-                    transform[
-                        key.replace(f"transforms.{name}.", "")
-                    ] = self.connector_manifest.config[key]
+                    transform[key.replace(f"transforms.{name}.", "")] = (
+                        self.connector_manifest.config[key]
+                    )
 
         return self.JdbcParser(
             db_connection_url,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_common.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_common.py
index 1183916e9b3fef..abe9b5684f8f1f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_common.py
@@ -596,9 +596,9 @@ class LookerUtil:
 
     @staticmethod
     def _extract_view_from_field(field: str) -> str:
-        assert (
-            field.count(".") == 1
-        ), f"Error: A field must be prefixed by a view name, field is: {field}"
+        assert field.count(".") == 1, (
+            f"Error: A field must be prefixed by a view name, field is: {field}"
+        )
         return field.split(".")[0]
 
     @staticmethod
@@ -815,9 +815,9 @@ class LookerExplore:
     project_name: Optional[str] = None
     label: Optional[str] = None
     description: Optional[str] = None
-    upstream_views: Optional[
-        List[ProjectInclude]
-    ] = None  # captures the view name(s) this explore is derived from
+    upstream_views: Optional[List[ProjectInclude]] = (
+        None  # captures the view name(s) this explore is derived from
+    )
     upstream_views_file_path: Dict[str, Optional[str]] = dataclasses_field(
         default_factory=dict
     )  # view_name is key and file_path is value. A single file may contains multiple views
@@ -889,7 +889,7 @@ def from_dict(
                     upstream_views.extend(parsed_explore.upstream_views or [])
                 else:
                     logger.warning(
-                        f'Could not find extended explore {extended_explore} for explore {dict["name"]} in model {model_name}'
+                        f"Could not find extended explore {extended_explore} for explore {dict['name']} in model {model_name}"
                     )
         else:
             # we only fallback to the view_names list if this is not an extended explore
@@ -903,7 +903,7 @@ def from_dict(
                 )
                 if not info:
                     logger.warning(
-                        f'Could not resolve view {view_name} for explore {dict["name"]} in model {model_name}'
+                        f"Could not resolve view {view_name} for explore {dict['name']} in model {model_name}"
                     )
                 else:
                     upstream_views.append(
@@ -935,9 +935,9 @@ def from_api(  # noqa: C901
         try:
             explore = client.lookml_model_explore(model, explore_name)
             views: Set[str] = set()
-            lkml_fields: List[
-                LookmlModelExploreField
-            ] = explore_field_set_to_lkml_fields(explore)
+            lkml_fields: List[LookmlModelExploreField] = (
+                explore_field_set_to_lkml_fields(explore)
+            )
 
             if explore.view_name is not None and explore.view_name != explore.name:
                 # explore is not named after a view and is instead using a from field, which is modeled as view_name.
@@ -1034,9 +1034,9 @@ def from_api(  # noqa: C901
                         if measure_field.name is None:
                             continue
                         else:
-                            field_name_vs_raw_explore_field[
-                                measure_field.name
-                            ] = measure_field
+                            field_name_vs_raw_explore_field[measure_field.name] = (
+                                measure_field
+                            )
 
                             view_fields.append(
                                 ViewField(
@@ -1072,11 +1072,11 @@ def from_api(  # noqa: C901
             if view_project_map:
                 logger.debug(f"views and their projects: {view_project_map}")
 
-            upstream_views_file_path: Dict[
-                str, Optional[str]
-            ] = create_upstream_views_file_path_map(
-                lkml_fields=lkml_fields,
-                view_names=views,
+            upstream_views_file_path: Dict[str, Optional[str]] = (
+                create_upstream_views_file_path_map(
+                    lkml_fields=lkml_fields,
+                    view_names=views,
+                )
             )
             if upstream_views_file_path:
                 logger.debug(f"views and their file-paths: {upstream_views_file_path}")
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_config.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_config.py
index 4e9d0f68928a45..3ed3186399588e 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_config.py
@@ -166,9 +166,9 @@ def _get_generic_definition(
         # e.g. spark1 or hive2 or druid_18
         platform = re.sub(r"[0-9]+", "", dialect_name.split("_")[0])
 
-    assert (
-        platform is not None
-    ), f"Failed to extract a valid platform from connection {looker_connection}"
+    assert platform is not None, (
+        f"Failed to extract a valid platform from connection {looker_connection}"
+    )
     db = looker_connection.database
     schema = looker_connection.schema  # ok for this to be None
     return platform, db, schema
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_source.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_source.py
index 8487d5113bc1d3..2f1fcd378d40fb 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_source.py
@@ -250,9 +250,9 @@ def _set_test_connection_capability(
 
     @staticmethod
     def _extract_view_from_field(field: str) -> str:
-        assert (
-            field.count(".") == 1
-        ), f"Error: A field must be prefixed by a view name, field is: {field}"
+        assert field.count(".") == 1, (
+            f"Error: A field must be prefixed by a view name, field is: {field}"
+        )
         return field.split(".")[0]
 
     def _get_views_from_fields(self, fields: List[str]) -> List[str]:
@@ -610,12 +610,12 @@ def _get_folder_browse_path_v2_entries(
     def _create_platform_instance_aspect(
         self,
     ) -> DataPlatformInstance:
-        assert (
-            self.source_config.platform_name
-        ), "Platform name is not set in the configuration."
-        assert (
-            self.source_config.platform_instance
-        ), "Platform instance is not set in the configuration."
+        assert self.source_config.platform_name, (
+            "Platform name is not set in the configuration."
+        )
+        assert self.source_config.platform_instance, (
+            "Platform instance is not set in the configuration."
+        )
 
         return DataPlatformInstance(
             platform=builder.make_data_platform_urn(self.source_config.platform_name),
@@ -1016,9 +1016,9 @@ def _make_dashboard_and_chart_mces(
         yield from chart_events
 
         # Step 2: Emit metadata events for the Dashboard itself.
-        chart_urns: Set[
-            str
-        ] = set()  # Collect the unique child chart urns for dashboard input lineage.
+        chart_urns: Set[str] = (
+            set()
+        )  # Collect the unique child chart urns for dashboard input lineage.
         for chart_event in chart_events:
             chart_event_urn = self._extract_event_urn(chart_event)
             if chart_event_urn:
@@ -1538,20 +1538,20 @@ def extract_independent_looks(self) -> Iterable[MetadataWorkUnit]:
                     }
                 )
 
-            dashboard_element: Optional[
-                LookerDashboardElement
-            ] = self._get_looker_dashboard_element(
-                DashboardElement(
-                    id=f"looks_{look.id}",  # to avoid conflict with non-standalone looks (element.id prefixes),
-                    # we add the "looks_" prefix to look.id.
-                    title=look.title,
-                    subtitle_text=look.description,
-                    look_id=look.id,
-                    dashboard_id=None,  # As this is an independent look
-                    look=LookWithQuery(
-                        query=query, folder=look.folder, user_id=look.user_id
+            dashboard_element: Optional[LookerDashboardElement] = (
+                self._get_looker_dashboard_element(
+                    DashboardElement(
+                        id=f"looks_{look.id}",  # to avoid conflict with non-standalone looks (element.id prefixes),
+                        # we add the "looks_" prefix to look.id.
+                        title=look.title,
+                        subtitle_text=look.description,
+                        look_id=look.id,
+                        dashboard_id=None,  # As this is an independent look
+                        look=LookWithQuery(
+                            query=query, folder=look.folder, user_id=look.user_id
+                        ),
                     ),
-                ),
+                )
             )
 
             if dashboard_element is not None:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_template_language.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_template_language.py
index 6d49d57e077435..2bcae4d46b8d52 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_template_language.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_template_language.py
@@ -33,9 +33,9 @@
 
 
 class SpecialVariable:
-    SPECIAL_VARIABLE_PATTERN: ClassVar[
-        str
-    ] = r"\b\w+(\.\w+)*\._(is_selected|in_query|is_filtered)\b"
+    SPECIAL_VARIABLE_PATTERN: ClassVar[str] = (
+        r"\b\w+(\.\w+)*\._(is_selected|in_query|is_filtered)\b"
+    )
     liquid_variable: dict
 
     def __init__(self, liquid_variable):
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_usage.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_usage.py
index 098d7d73a3da84..05806840b5c954 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_usage.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_usage.py
@@ -257,9 +257,9 @@ def _process_entity_timeseries_rows(
 
         for row in rows:
             logger.debug(row)
-            entity_stat_aspect[
-                self.get_entity_stat_key(row)
-            ] = self.to_entity_timeseries_stat_aspect(row)
+            entity_stat_aspect[self.get_entity_stat_key(row)] = (
+                self.to_entity_timeseries_stat_aspect(row)
+            )
 
         return entity_stat_aspect
 
@@ -385,10 +385,8 @@ def generate_usage_stat_mcps(self) -> Iterable[MetadataChangeProposalWrapper]:
         entity_rows: List[Dict] = self._execute_query(
             entity_query_with_filters, "entity_query"
         )
-        entity_usage_stat: Dict[
-            Tuple[str, str], Any
-        ] = self._process_entity_timeseries_rows(
-            entity_rows
+        entity_usage_stat: Dict[Tuple[str, str], Any] = (
+            self._process_entity_timeseries_rows(entity_rows)
         )  # Any type to pass mypy unbound Aspect type error
 
         user_wise_query_with_filters: LookerQuery = self._append_filters(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_concept_context.py b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_concept_context.py
index 103f4175a9ccff..4e38165bb56286 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_concept_context.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_concept_context.py
@@ -38,16 +38,16 @@ def merge_parent_and_child_fields(
     # Create a map field-name vs field
     child_field_map: dict = {}
     for field in child_fields:
-        assert (
-            NAME in field
-        ), "A lookml view must have a name field"  # name is required field of lookml field array
+        assert NAME in field, (
+            "A lookml view must have a name field"
+        )  # name is required field of lookml field array
 
         child_field_map[field[NAME]] = field
 
     for field in parent_fields:
-        assert (
-            NAME in field
-        ), "A lookml view must have a name field"  # name is required field of lookml field array
+        assert NAME in field, (
+            "A lookml view must have a name field"
+        )  # name is required field of lookml field array
 
         if field[NAME] in child_field_map:
             # Fields defined in the child view take higher precedence.
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py
index c7d3724472d3c8..a8575c84b510d5 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py
@@ -482,14 +482,14 @@ def get_project_name(self, model_name: str) -> str:
         if self.source_config.project_name is not None:
             return self.source_config.project_name
 
-        assert (
-            self.looker_client is not None
-        ), "Failed to find a configured Looker API client"
+        assert self.looker_client is not None, (
+            "Failed to find a configured Looker API client"
+        )
         try:
             model = self.looker_client.lookml_model(model_name, fields="project_name")
-            assert (
-                model.project_name is not None
-            ), f"Failed to find a project name for model {model_name}"
+            assert model.project_name is not None, (
+                f"Failed to find a project name for model {model_name}"
+            )
             return model.project_name
         except SDKError:
             raise ValueError(
@@ -541,9 +541,9 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                 self.reporter.git_clone_latency = datetime.now() - start_time
                 self.source_config.base_folder = checkout_dir.resolve()
 
-            self.base_projects_folder[
-                BASE_PROJECT_NAME
-            ] = self.source_config.base_folder
+            self.base_projects_folder[BASE_PROJECT_NAME] = (
+                self.source_config.base_folder
+            )
 
             visited_projects: Set[str] = set()
 
@@ -641,9 +641,9 @@ def _recursively_check_manifests(
                     repo_url=remote_project.url,
                 )
 
-                self.base_projects_folder[
-                    remote_project.name
-                ] = p_checkout_dir.resolve()
+                self.base_projects_folder[remote_project.name] = (
+                    p_checkout_dir.resolve()
+                )
                 repo = p_cloner.get_last_repo_cloned()
                 assert repo
                 remote_git_info = GitInfo(
@@ -930,9 +930,7 @@ def get_internal_workunits(self) -> Iterable[MetadataWorkUnit]:  # noqa: C901
                                         logger.warning(
                                             f"view {maybe_looker_view.id.view_name} from model {model_name}, connection {model.connection} was previously processed via model {prev_model_name}, connection {prev_model_connection} and will likely lead to incorrect lineage to the underlying tables"
                                         )
-                                        if (
-                                            not self.source_config.emit_reachable_views_only
-                                        ):
+                                        if not self.source_config.emit_reachable_views_only:
                                             logger.warning(
                                                 "Consider enabling the `emit_reachable_views_only` flag to handle this case."
                                             )
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/view_upstream.py b/metadata-ingestion/src/datahub/ingestion/source/looker/view_upstream.py
index 971181e4300d69..f77eebb3cdd8cb 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/view_upstream.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/view_upstream.py
@@ -484,11 +484,11 @@ def __init__(
         )
 
     def __get_upstream_dataset_urn(self) -> List[str]:
-        current_view_id: Optional[
-            LookerViewId
-        ] = self.looker_view_id_cache.get_looker_view_id(
-            view_name=self.view_context.name(),
-            base_folder_path=self.view_context.base_folder_path,
+        current_view_id: Optional[LookerViewId] = (
+            self.looker_view_id_cache.get_looker_view_id(
+                view_name=self.view_context.name(),
+                base_folder_path=self.view_context.base_folder_path,
+            )
         )
 
         # Current view will always be present in cache. assert  will silence the lint
diff --git a/metadata-ingestion/src/datahub/ingestion/source/mlflow.py b/metadata-ingestion/src/datahub/ingestion/source/mlflow.py
index b0b04dff20bffc..02125db83d2582 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/mlflow.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/mlflow.py
@@ -172,10 +172,10 @@ def _get_mlflow_registered_models(self) -> Iterable[RegisteredModel]:
         """
         Get all Registered Models in MLflow Model Registry.
         """
-        registered_models: Iterable[
-            RegisteredModel
-        ] = self._traverse_mlflow_search_func(
-            search_func=self.client.search_registered_models,
+        registered_models: Iterable[RegisteredModel] = (
+            self._traverse_mlflow_search_func(
+                search_func=self.client.search_registered_models,
+            )
         )
         return registered_models
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/mongodb.py b/metadata-ingestion/src/datahub/ingestion/source/mongodb.py
index bbc4897d227bac..ad8487c1a759ec 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/mongodb.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/mongodb.py
@@ -288,7 +288,9 @@ def __init__(self, ctx: PipelineContext, config: MongoDBConfig):
 
         # See https://pymongo.readthedocs.io/en/stable/examples/datetimes.html#handling-out-of-range-datetimes
         self.mongo_client = MongoClient(
-            self.config.connect_uri, datetime_conversion="DATETIME_AUTO", **options  # type: ignore
+            self.config.connect_uri,
+            datetime_conversion="DATETIME_AUTO",
+            **options,  # type: ignore
         )
 
         # This cheaply tests the connection. For details, see
@@ -470,9 +472,9 @@ def _infer_schema_metadata(
             )
             # Add this information to the custom properties so user can know they are looking at downsampled schema
             dataset_properties.customProperties["schema.downsampled"] = "True"
-            dataset_properties.customProperties[
-                "schema.totalFields"
-            ] = f"{collection_schema_size}"
+            dataset_properties.customProperties["schema.totalFields"] = (
+                f"{collection_schema_size}"
+            )
 
         logger.debug(f"Size of collection fields = {len(collection_fields)}")
         # append each schema field (sort so output is consistent)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/nifi.py b/metadata-ingestion/src/datahub/ingestion/source/nifi.py
index 7f446f6d1c2718..52b1386e21d85a 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/nifi.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/nifi.py
@@ -184,9 +184,9 @@ def validator_site_url_to_site_name(cls, values):
 
     @validator("site_url")
     def validator_site_url(cls, site_url: str) -> str:
-        assert site_url.startswith(
-            ("http://", "https://")
-        ), "site_url must start with http:// or https://"
+        assert site_url.startswith(("http://", "https://")), (
+            "site_url must start with http:// or https://"
+        )
 
         if not site_url.endswith("/"):
             site_url = site_url + "/"
@@ -487,9 +487,7 @@ def rest_api_base_url(self):
     def get_report(self) -> SourceReport:
         return self.report
 
-    def update_flow(
-        self, pg_flow_dto: Dict, recursion_level: int = 0
-    ) -> None:  # noqa: C901
+    def update_flow(self, pg_flow_dto: Dict, recursion_level: int = 0) -> None:  # noqa: C901
         """
         Update self.nifi_flow with contents of the input process group `pg_flow_dto`
         """
@@ -548,16 +546,16 @@ def update_flow(
         for inputPort in flow_dto.get("inputPorts", []):
             component = inputPort.get("component")
             if inputPort.get("allowRemoteAccess"):
-                self.nifi_flow.remotely_accessible_ports[
-                    component.get("id")
-                ] = NifiComponent(
-                    component.get("id"),
-                    component.get("name"),
-                    component.get("type"),
-                    component.get("parentGroupId"),
-                    NifiType.INPUT_PORT,
-                    comments=component.get("comments"),
-                    status=component.get("status", {}).get("runStatus"),
+                self.nifi_flow.remotely_accessible_ports[component.get("id")] = (
+                    NifiComponent(
+                        component.get("id"),
+                        component.get("name"),
+                        component.get("type"),
+                        component.get("parentGroupId"),
+                        NifiType.INPUT_PORT,
+                        comments=component.get("comments"),
+                        status=component.get("status", {}).get("runStatus"),
+                    )
                 )
                 logger.debug(f"Adding remotely accessible port {component.get('id')}")
             else:
@@ -576,16 +574,16 @@ def update_flow(
         for outputPort in flow_dto.get("outputPorts", []):
             component = outputPort.get("component")
             if outputPort.get("allowRemoteAccess"):
-                self.nifi_flow.remotely_accessible_ports[
-                    component.get("id")
-                ] = NifiComponent(
-                    component.get("id"),
-                    component.get("name"),
-                    component.get("type"),
-                    component.get("parentGroupId"),
-                    NifiType.OUTPUT_PORT,
-                    comments=component.get("comments"),
-                    status=component.get("status", {}).get("runStatus"),
+                self.nifi_flow.remotely_accessible_ports[component.get("id")] = (
+                    NifiComponent(
+                        component.get("id"),
+                        component.get("name"),
+                        component.get("type"),
+                        component.get("parentGroupId"),
+                        NifiType.OUTPUT_PORT,
+                        comments=component.get("comments"),
+                        status=component.get("status", {}).get("runStatus"),
+                    )
                 )
                 logger.debug(f"Adding remotely accessible port {component.get('id')}")
             else:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/openapi.py b/metadata-ingestion/src/datahub/ingestion/source/openapi.py
index 8289265483d598..2075e999ea1d0e 100755
--- a/metadata-ingestion/src/datahub/ingestion/source/openapi.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/openapi.py
@@ -101,16 +101,16 @@ def get_swagger(self) -> Dict:
                 # details there once, and then use that session for all requests.
                 self.token = f"Bearer {self.bearer_token}"
             else:
-                assert (
-                    "url_complement" in self.get_token.keys()
-                ), "When 'request_type' is set to 'get', an url_complement is needed for the request."
+                assert "url_complement" in self.get_token.keys(), (
+                    "When 'request_type' is set to 'get', an url_complement is needed for the request."
+                )
                 if self.get_token["request_type"] == "get":
-                    assert (
-                        "{username}" in self.get_token["url_complement"]
-                    ), "we expect the keyword {username} to be present in the url"
-                    assert (
-                        "{password}" in self.get_token["url_complement"]
-                    ), "we expect the keyword {password} to be present in the url"
+                    assert "{username}" in self.get_token["url_complement"], (
+                        "we expect the keyword {username} to be present in the url"
+                    )
+                    assert "{password}" in self.get_token["url_complement"], (
+                        "we expect the keyword {password} to be present in the url"
+                    )
                     url4req = self.get_token["url_complement"].replace(
                         "{username}", self.username
                     )
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py
index b49d40a0c7eb6a..14beab6bc9391e 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py
@@ -225,9 +225,9 @@ def report_charts_dropped(self, view: str) -> None:
 def default_for_dataset_type_mapping() -> Dict[str, str]:
     dict_: dict = {}
     for item in SupportedDataPlatform:
-        dict_[
-            item.value.powerbi_data_platform_name
-        ] = item.value.datahub_data_platform_name
+        dict_[item.value.powerbi_data_platform_name] = (
+            item.value.datahub_data_platform_name
+        )
 
     return dict_
 
@@ -303,15 +303,15 @@ class PowerBiDashboardSourceConfig(
     # Dataset type mapping PowerBI support many type of data-sources. Here user needs to define what type of PowerBI
     # DataSource needs to be mapped to corresponding DataHub Platform DataSource. For example, PowerBI `Snowflake` is
     # mapped to DataHub `snowflake` PowerBI `PostgreSQL` is mapped to DataHub `postgres` and so on.
-    dataset_type_mapping: Union[
-        Dict[str, str], Dict[str, PlatformDetail]
-    ] = pydantic.Field(
-        default_factory=default_for_dataset_type_mapping,
-        description="[deprecated] Use server_to_platform_instance instead. Mapping of PowerBI datasource type to "
-        "DataHub supported datasources."
-        "You can configured platform instance for dataset lineage. "
-        "See Quickstart Recipe for mapping",
-        hidden_from_docs=True,
+    dataset_type_mapping: Union[Dict[str, str], Dict[str, PlatformDetail]] = (
+        pydantic.Field(
+            default_factory=default_for_dataset_type_mapping,
+            description="[deprecated] Use server_to_platform_instance instead. Mapping of PowerBI datasource type to "
+            "DataHub supported datasources."
+            "You can configured platform instance for dataset lineage. "
+            "See Quickstart Recipe for mapping",
+            hidden_from_docs=True,
+        )
     )
     # PowerBI datasource's server to platform instance mapping
     server_to_platform_instance: Dict[
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/m_query/parser.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/m_query/parser.py
index 2a5de7494920b2..759fc6d7dadfba 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/m_query/parser.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/m_query/parser.py
@@ -128,17 +128,17 @@ def get_upstream_tables(
     reporter.m_query_parse_successes += 1
 
     try:
-        lineage: List[
-            datahub.ingestion.source.powerbi.m_query.data_classes.Lineage
-        ] = resolver.MQueryResolver(
-            table=table,
-            parse_tree=parse_tree,
-            reporter=reporter,
-            parameters=parameters,
-        ).resolve_to_lineage(
-            ctx=ctx,
-            config=config,
-            platform_instance_resolver=platform_instance_resolver,
+        lineage: List[datahub.ingestion.source.powerbi.m_query.data_classes.Lineage] = (
+            resolver.MQueryResolver(
+                table=table,
+                parse_tree=parse_tree,
+                reporter=reporter,
+                parameters=parameters,
+            ).resolve_to_lineage(
+                ctx=ctx,
+                config=config,
+                platform_instance_resolver=platform_instance_resolver,
+            )
         )
 
         if lineage:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/m_query/pattern_handler.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/m_query/pattern_handler.py
index 63520bd731de86..54b810650f5854 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/m_query/pattern_handler.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/m_query/pattern_handler.py
@@ -170,8 +170,7 @@ def create_reference_table(
         logger.debug(f"Processing arguments {arguments}")
 
         if (
-            len(arguments)
-            >= 4  # [0] is warehouse FQDN.
+            len(arguments) >= 4  # [0] is warehouse FQDN.
             # [1] is endpoint, we are not using it.
             # [2] is "Catalog" key
             # [3] is catalog's value
@@ -215,16 +214,16 @@ def parse_custom_sql(
             native_sql_parser.remove_special_characters(query)
         )
 
-        parsed_result: Optional[
-            "SqlParsingResult"
-        ] = native_sql_parser.parse_custom_sql(
-            ctx=self.ctx,
-            query=query,
-            platform=self.get_platform_pair().datahub_data_platform_name,
-            platform_instance=platform_detail.platform_instance,
-            env=platform_detail.env,
-            database=database,
-            schema=schema,
+        parsed_result: Optional["SqlParsingResult"] = (
+            native_sql_parser.parse_custom_sql(
+                ctx=self.ctx,
+                query=query,
+                platform=self.get_platform_pair().datahub_data_platform_name,
+                platform_instance=platform_detail.platform_instance,
+                env=platform_detail.env,
+                database=database,
+                schema=schema,
+            )
         )
 
         if parsed_result is None:
@@ -410,9 +409,9 @@ def create_lineage(
             f"Processing Databrick data-access function detail {data_access_func_detail}"
         )
         table_detail: Dict[str, str] = {}
-        temp_accessor: Optional[
-            IdentifierAccessor
-        ] = data_access_func_detail.identifier_accessor
+        temp_accessor: Optional[IdentifierAccessor] = (
+            data_access_func_detail.identifier_accessor
+        )
 
         while temp_accessor:
             # Condition to handle databricks M-query pattern where table, schema and database all are present in
@@ -647,11 +646,13 @@ def create_lineage(
         db_name: str = data_access_func_detail.identifier_accessor.items["Name"]  # type: ignore
         # Second is schema name
         schema_name: str = cast(
-            IdentifierAccessor, data_access_func_detail.identifier_accessor.next  # type: ignore
+            IdentifierAccessor,
+            data_access_func_detail.identifier_accessor.next,  # type: ignore
         ).items["Name"]
         # Third is table name
         table_name: str = cast(
-            IdentifierAccessor, data_access_func_detail.identifier_accessor.next.next  # type: ignore
+            IdentifierAccessor,
+            data_access_func_detail.identifier_accessor.next.next,  # type: ignore
         ).items["Name"]
 
         qualified_table_name: str = f"{db_name}.{schema_name}.{table_name}"
@@ -768,10 +769,13 @@ def get_db_name(self, data_access_tokens: List[str]) -> Optional[str]:
         ):  # database name is explicitly set
             return database
 
-        return get_next_item(  # database name is set in Name argument
-            data_access_tokens, "Name"
-        ) or get_next_item(  # If both above arguments are not available, then try Catalog
-            data_access_tokens, "Catalog"
+        return (
+            get_next_item(  # database name is set in Name argument
+                data_access_tokens, "Name"
+            )
+            or get_next_item(  # If both above arguments are not available, then try Catalog
+                data_access_tokens, "Catalog"
+            )
         )
 
     def create_lineage(
@@ -819,9 +823,7 @@ def create_lineage(
             values=tree_function.remove_whitespaces_from_list(
                 tree_function.token_values(flat_argument_list[1])
             ),
-        )[
-            0
-        ]  # Remove any whitespaces and double quotes character
+        )[0]  # Remove any whitespaces and double quotes character
 
         server = tree_function.strip_char_from_list([data_access_tokens[2]])[0]
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/m_query/resolver.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/m_query/resolver.py
index 2756a113d1ef0c..42963c08d992d1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/m_query/resolver.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/m_query/resolver.py
@@ -188,9 +188,9 @@ def _process_invoke_expression(
         # - The inner function Table.TransformColumnTypes takes #"Removed Columns1"
         #   (a table reference) as its first argument
         # - Its result is then passed as the first argument to Table.SplitColumn
-        second_invoke_expression: Optional[
-            Tree
-        ] = tree_function.first_invoke_expression_func(first_argument)
+        second_invoke_expression: Optional[Tree] = (
+            tree_function.first_invoke_expression_func(first_argument)
+        )
         if second_invoke_expression:
             # 1. The First argument is function call
             # 2. That function's first argument references next table variable
@@ -304,14 +304,14 @@ def internal(
                 logger.debug(v_statement.pretty())
                 return None
 
-            invoke_expression: Optional[
-                Tree
-            ] = tree_function.first_invoke_expression_func(rh_tree)
+            invoke_expression: Optional[Tree] = (
+                tree_function.first_invoke_expression_func(rh_tree)
+            )
 
             if invoke_expression is not None:
-                result: Union[
-                    DataAccessFunctionDetail, List[str], None
-                ] = self._process_invoke_expression(invoke_expression)
+                result: Union[DataAccessFunctionDetail, List[str], None] = (
+                    self._process_invoke_expression(invoke_expression)
+                )
                 if result is None:
                     return None  # No need to process some un-expected grammar found while processing invoke_expression
                 if isinstance(result, DataAccessFunctionDetail):
@@ -368,9 +368,9 @@ def resolve_to_lineage(
             return lineage
 
         # Parse M-Query and use output_variable as root of tree and create instance of DataAccessFunctionDetail
-        table_links: List[
-            DataAccessFunctionDetail
-        ] = self.create_data_access_functional_detail(output_variable)
+        table_links: List[DataAccessFunctionDetail] = (
+            self.create_data_access_functional_detail(output_variable)
+        )
 
         # Each item is data-access function
         for f_detail in table_links:
@@ -390,7 +390,7 @@ def resolve_to_lineage(
 
             # From supported_resolver enum get respective handler like AmazonRedshift or Snowflake or Oracle or NativeQuery and create instance of it
             # & also pass additional information that will be need to generate lineage
-            pattern_handler: (AbstractLineage) = supported_resolver.handler()(
+            pattern_handler: AbstractLineage = supported_resolver.handler()(
                 ctx=ctx,
                 table=self.table,
                 config=config,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py
index 044946a5d308d1..5e5636f2d50fe3 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py
@@ -945,9 +945,9 @@ def to_datahub_work_units(
         # Convert tiles to charts
         ds_mcps, chart_mcps = self.to_datahub_chart(dashboard.tiles, workspace)
         # Lets convert dashboard to datahub dashboard
-        dashboard_mcps: List[
-            MetadataChangeProposalWrapper
-        ] = self.to_datahub_dashboard_mcp(dashboard, workspace, chart_mcps, user_mcps)
+        dashboard_mcps: List[MetadataChangeProposalWrapper] = (
+            self.to_datahub_dashboard_mcp(dashboard, workspace, chart_mcps, user_mcps)
+        )
 
         # Now add MCPs in sequence
         mcps.extend(ds_mcps)
@@ -1472,9 +1472,9 @@ def get_workspace_workunit(
     def _get_dashboard_patch_work_unit(
         self, work_unit: MetadataWorkUnit
     ) -> Optional[MetadataWorkUnit]:
-        dashboard_info_aspect: Optional[
-            DashboardInfoClass
-        ] = work_unit.get_aspect_of_type(DashboardInfoClass)
+        dashboard_info_aspect: Optional[DashboardInfoClass] = (
+            work_unit.get_aspect_of_type(DashboardInfoClass)
+        )
 
         if dashboard_info_aspect and self.source_config.patch_metadata:
             return convert_dashboard_info_to_patch(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/data_resolver.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/data_resolver.py
index 161975fa635fdb..927840c44bf0b0 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/data_resolver.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/data_resolver.py
@@ -425,9 +425,9 @@ def itr_pages(
 
             response.raise_for_status()
 
-            assert (
-                Constant.VALUE in response.json()
-            ), "'value' key is not present in paginated response"
+            assert Constant.VALUE in response.json(), (
+                "'value' key is not present in paginated response"
+            )
 
             if not response.json()[Constant.VALUE]:  # if it is an empty list then break
                 break
@@ -447,13 +447,13 @@ def get_app(
         if raw_app is None:
             return None
 
-        assert (
-            Constant.ID in raw_app
-        ), f"{Constant.ID} is required field not present in server response"
+        assert Constant.ID in raw_app, (
+            f"{Constant.ID} is required field not present in server response"
+        )
 
-        assert (
-            Constant.NAME in raw_app
-        ), f"{Constant.NAME} is required field not present in server response"
+        assert Constant.NAME in raw_app, (
+            f"{Constant.NAME} is required field not present in server response"
+        )
 
         return App(
             id=raw_app[Constant.ID],
diff --git a/metadata-ingestion/src/datahub/ingestion/source/qlik_sense/qlik_api.py b/metadata-ingestion/src/datahub/ingestion/source/qlik_sense/qlik_api.py
index 31b0731aaa751c..10b062c98c147f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/qlik_sense/qlik_api.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/qlik_sense/qlik_api.py
@@ -156,7 +156,7 @@ def _get_sheet(
                 )
                 if chart:
                     if not chart.title:
-                        chart.title = f"Object {i+1} of Sheet '{sheet.title}'"
+                        chart.title = f"Object {i + 1} of Sheet '{sheet.title}'"
                     sheet.charts.append(chart)
                 websocket_connection.handle.pop()
             return sheet
diff --git a/metadata-ingestion/src/datahub/ingestion/source/redshift/config.py b/metadata-ingestion/src/datahub/ingestion/source/redshift/config.py
index cad48eaf1c2375..932ada0a908b28 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/redshift/config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/redshift/config.py
@@ -178,9 +178,9 @@ class RedshiftConfig(
     @root_validator(pre=True)
     def check_email_is_set_on_usage(cls, values):
         if values.get("include_usage_statistics"):
-            assert (
-                "email_domain" in values and values["email_domain"]
-            ), "email_domain needs to be set if usage is enabled"
+            assert "email_domain" in values and values["email_domain"], (
+                "email_domain needs to be set if usage is enabled"
+            )
         return values
 
     @root_validator(skip_on_failure=True)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift.py b/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift.py
index 9bfca941ce48fb..cce282c71056a2 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/redshift/redshift.py
@@ -305,13 +305,13 @@ def test_connection(config_dict: dict) -> TestConnectionReport:
             test_report.capability_report = {}
             try:
                 RedshiftDataDictionary.get_schemas(connection, database=config.database)
-                test_report.capability_report[
-                    SourceCapability.SCHEMA_METADATA
-                ] = CapabilityReport(capable=True)
+                test_report.capability_report[SourceCapability.SCHEMA_METADATA] = (
+                    CapabilityReport(capable=True)
+                )
             except Exception as e:
-                test_report.capability_report[
-                    SourceCapability.SCHEMA_METADATA
-                ] = CapabilityReport(capable=False, failure_reason=str(e))
+                test_report.capability_report[SourceCapability.SCHEMA_METADATA] = (
+                    CapabilityReport(capable=False, failure_reason=str(e))
+                )
 
         except Exception as e:
             test_report.basic_connectivity = CapabilityReport(
@@ -947,9 +947,9 @@ def cache_tables_and_views(self, connection, database):
     def get_all_tables(
         self,
     ) -> Dict[str, Dict[str, List[Union[RedshiftView, RedshiftTable]]]]:
-        all_tables: Dict[
-            str, Dict[str, List[Union[RedshiftView, RedshiftTable]]]
-        ] = defaultdict(dict)
+        all_tables: Dict[str, Dict[str, List[Union[RedshiftView, RedshiftTable]]]] = (
+            defaultdict(dict)
+        )
         for db in set().union(self.db_tables, self.db_views):
             tables = self.db_tables.get(db, {})
             views = self.db_views.get(db, {})
@@ -967,9 +967,9 @@ def extract_usage(
         all_tables: Dict[str, Dict[str, List[Union[RedshiftView, RedshiftTable]]]],
     ) -> Iterable[MetadataWorkUnit]:
         with PerfTimer() as timer:
-            redundant_usage_run_skip_handler: Optional[
-                RedundantUsageRunSkipHandler
-            ] = None
+            redundant_usage_run_skip_handler: Optional[RedundantUsageRunSkipHandler] = (
+                None
+            )
             if self.config.enable_stateful_usage_ingestion:
                 redundant_usage_run_skip_handler = RedundantUsageRunSkipHandler(
                     source=self,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/redshift/usage.py b/metadata-ingestion/src/datahub/ingestion/source/redshift/usage.py
index d66a1ee18be40f..a5758bdd825702 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/redshift/usage.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/redshift/usage.py
@@ -199,10 +199,10 @@ def _get_workunits_internal(
                 end_time=self.end_time.strftime(REDSHIFT_DATETIME_FORMAT),
                 database=self.config.database,
             )
-            access_events_iterable: Iterable[
-                RedshiftAccessEvent
-            ] = self._gen_access_events_from_history_query(
-                query, connection=self.connection, all_tables=all_tables
+            access_events_iterable: Iterable[RedshiftAccessEvent] = (
+                self._gen_access_events_from_history_query(
+                    query, connection=self.connection, all_tables=all_tables
+                )
             )
 
             aggregated_events: AggregatedAccessEvents = self._aggregate_access_events(
@@ -225,10 +225,10 @@ def _gen_operation_aspect_workunits(
             start_time=self.start_time.strftime(REDSHIFT_DATETIME_FORMAT),
             end_time=self.end_time.strftime(REDSHIFT_DATETIME_FORMAT),
         )
-        access_events_iterable: Iterable[
-            RedshiftAccessEvent
-        ] = self._gen_access_events_from_history_query(
-            query, connection, all_tables=all_tables
+        access_events_iterable: Iterable[RedshiftAccessEvent] = (
+            self._gen_access_events_from_history_query(
+                query, connection, all_tables=all_tables
+            )
         )
 
         # Generate operation aspect work units from the access events
diff --git a/metadata-ingestion/src/datahub/ingestion/source/s3/datalake_profiler_config.py b/metadata-ingestion/src/datahub/ingestion/source/s3/datalake_profiler_config.py
index 89c092875e4490..58e930eb6e809c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/s3/datalake_profiler_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/s3/datalake_profiler_config.py
@@ -85,8 +85,8 @@ def ensure_field_level_settings_are_normalized(
                 if field_level_metric.startswith("include_field_"):
                     values.setdefault(field_level_metric, False)
 
-            assert (
-                max_num_fields_to_profile is None
-            ), f"{max_num_fields_to_profile_key} should be set to None"
+            assert max_num_fields_to_profile is None, (
+                f"{max_num_fields_to_profile_key} should be set to None"
+            )
 
         return values
diff --git a/metadata-ingestion/src/datahub/ingestion/source/salesforce.py b/metadata-ingestion/src/datahub/ingestion/source/salesforce.py
index 88679efdf5fc31..66e0e6b741d1ff 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/salesforce.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/salesforce.py
@@ -236,12 +236,12 @@ def __init__(self, config: SalesforceConfig, ctx: PipelineContext) -> None:
         try:
             if self.config.auth is SalesforceAuthType.DIRECT_ACCESS_TOKEN:
                 logger.debug("Access Token Provided in Config")
-                assert (
-                    self.config.access_token is not None
-                ), "Config access_token is required for DIRECT_ACCESS_TOKEN auth"
-                assert (
-                    self.config.instance_url is not None
-                ), "Config instance_url is required for DIRECT_ACCESS_TOKEN auth"
+                assert self.config.access_token is not None, (
+                    "Config access_token is required for DIRECT_ACCESS_TOKEN auth"
+                )
+                assert self.config.instance_url is not None, (
+                    "Config instance_url is required for DIRECT_ACCESS_TOKEN auth"
+                )
 
                 self.sf = Salesforce(
                     instance_url=self.config.instance_url,
@@ -250,15 +250,15 @@ def __init__(self, config: SalesforceConfig, ctx: PipelineContext) -> None:
                 )
             elif self.config.auth is SalesforceAuthType.USERNAME_PASSWORD:
                 logger.debug("Username/Password Provided in Config")
-                assert (
-                    self.config.username is not None
-                ), "Config username is required for USERNAME_PASSWORD auth"
-                assert (
-                    self.config.password is not None
-                ), "Config password is required for USERNAME_PASSWORD auth"
-                assert (
-                    self.config.security_token is not None
-                ), "Config security_token is required for USERNAME_PASSWORD auth"
+                assert self.config.username is not None, (
+                    "Config username is required for USERNAME_PASSWORD auth"
+                )
+                assert self.config.password is not None, (
+                    "Config password is required for USERNAME_PASSWORD auth"
+                )
+                assert self.config.security_token is not None, (
+                    "Config security_token is required for USERNAME_PASSWORD auth"
+                )
 
                 self.sf = Salesforce(
                     username=self.config.username,
@@ -269,15 +269,15 @@ def __init__(self, config: SalesforceConfig, ctx: PipelineContext) -> None:
 
             elif self.config.auth is SalesforceAuthType.JSON_WEB_TOKEN:
                 logger.debug("Json Web Token provided in the config")
-                assert (
-                    self.config.username is not None
-                ), "Config username is required for JSON_WEB_TOKEN auth"
-                assert (
-                    self.config.consumer_key is not None
-                ), "Config consumer_key is required for JSON_WEB_TOKEN auth"
-                assert (
-                    self.config.private_key is not None
-                ), "Config private_key is required for JSON_WEB_TOKEN auth"
+                assert self.config.username is not None, (
+                    "Config username is required for JSON_WEB_TOKEN auth"
+                )
+                assert self.config.consumer_key is not None, (
+                    "Config consumer_key is required for JSON_WEB_TOKEN auth"
+                )
+                assert self.config.private_key is not None, (
+                    "Config private_key is required for JSON_WEB_TOKEN auth"
+                )
 
                 self.sf = Salesforce(
                     username=self.config.username,
@@ -439,7 +439,8 @@ def get_platform_instance_workunit(self, datasetUrn: str) -> MetadataWorkUnit:
         dataPlatformInstance = DataPlatformInstanceClass(
             builder.make_data_platform_urn(self.platform),
             instance=builder.make_dataplatform_instance_urn(
-                self.platform, self.config.platform_instance  # type:ignore
+                self.platform,
+                self.config.platform_instance,  # type:ignore
             ),
         )
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sigma/sigma.py b/metadata-ingestion/src/datahub/ingestion/source/sigma/sigma.py
index e96eeb58d96efe..0468792f44aabb 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sigma/sigma.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sigma/sigma.py
@@ -477,9 +477,9 @@ def _gen_elements_workunit(
                     upstream_dataset_urns
                     and dataset_urn not in self.dataset_upstream_urn_mapping
                 ):
-                    self.dataset_upstream_urn_mapping[
-                        dataset_urn
-                    ] = upstream_dataset_urns
+                    self.dataset_upstream_urn_mapping[dataset_urn] = (
+                        upstream_dataset_urns
+                    )
 
             element_input_fields = [
                 InputFieldClass(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sigma/sigma_api.py b/metadata-ingestion/src/datahub/ingestion/source/sigma/sigma_api.py
index 3e88f43142ede6..6762302ebe57c7 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sigma/sigma_api.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sigma/sigma_api.py
@@ -126,9 +126,9 @@ def fill_workspaces(self) -> None:
                 response.raise_for_status()
                 response_dict = response.json()
                 for workspace_dict in response_dict[Constant.ENTRIES]:
-                    self.workspaces[
-                        workspace_dict[Constant.WORKSPACEID]
-                    ] = Workspace.parse_obj(workspace_dict)
+                    self.workspaces[workspace_dict[Constant.WORKSPACEID]] = (
+                        Workspace.parse_obj(workspace_dict)
+                    )
                 if response_dict[Constant.NEXTPAGE]:
                     url = f"{workspace_url}&page={response_dict[Constant.NEXTPAGE]}"
                 else:
@@ -147,9 +147,9 @@ def _get_users(self) -> Dict[str, str]:
                 response.raise_for_status()
                 response_dict = response.json()
                 for user_dict in response_dict[Constant.ENTRIES]:
-                    users[
-                        user_dict[Constant.MEMBERID]
-                    ] = f"{user_dict[Constant.FIRSTNAME]}_{user_dict[Constant.LASTNAME]}"
+                    users[user_dict[Constant.MEMBERID]] = (
+                        f"{user_dict[Constant.FIRSTNAME]}_{user_dict[Constant.LASTNAME]}"
+                    )
                 if response_dict[Constant.NEXTPAGE]:
                     url = f"{members_url}&page={response_dict[Constant.NEXTPAGE]}"
                 else:
@@ -327,10 +327,12 @@ def get_page_elements(self, workbook: Workbook, page: Page) -> List[Element]:
             response.raise_for_status()
             for i, element_dict in enumerate(response.json()[Constant.ENTRIES]):
                 if not element_dict.get(Constant.NAME):
-                    element_dict[Constant.NAME] = f"Element {i+1} of Page '{page.name}'"
-                element_dict[
-                    Constant.URL
-                ] = f"{workbook.url}?:nodeId={element_dict[Constant.ELEMENTID]}&:fullScreen=true"
+                    element_dict[Constant.NAME] = (
+                        f"Element {i + 1} of Page '{page.name}'"
+                    )
+                element_dict[Constant.URL] = (
+                    f"{workbook.url}?:nodeId={element_dict[Constant.ELEMENTID]}&:fullScreen=true"
+                )
                 element = Element.parse_obj(element_dict)
                 if (
                     self.config.extract_lineage
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
index b14e51a982082c..5f732e2621656f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
@@ -384,18 +384,20 @@ def validate_shares(
                     assert all(
                         consumer.platform_instance != share_details.platform_instance
                         for consumer in share_details.consumers
-                    ), "Share's platform_instance can not be same as consumer's platform instance. Self-sharing not supported in Snowflake."
+                    ), (
+                        "Share's platform_instance can not be same as consumer's platform instance. Self-sharing not supported in Snowflake."
+                    )
 
                 databases_included_in_share.append(shared_db)
                 databases_created_from_share.extend(share_details.consumers)
 
             for db_from_share in databases_created_from_share:
-                assert (
-                    db_from_share not in databases_included_in_share
-                ), "Database included in a share can not be present as consumer in any share."
-                assert (
-                    databases_created_from_share.count(db_from_share) == 1
-                ), "Same database can not be present as consumer in more than one share."
+                assert db_from_share not in databases_included_in_share, (
+                    "Database included in a share can not be present as consumer in any share."
+                )
+                assert databases_created_from_share.count(db_from_share) == 1, (
+                    "Same database can not be present as consumer in more than one share."
+                )
 
         return shares
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_connection.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_connection.py
index 2239338972d9be..2854a99198d62b 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_connection.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_connection.py
@@ -250,9 +250,9 @@ def get_connect_args(self) -> dict:
             if self.private_key is not None:
                 pkey_bytes = self.private_key.replace("\\n", "\n").encode()
             else:
-                assert (
-                    self.private_key_path
-                ), "missing required private key path to read key from"
+                assert self.private_key_path, (
+                    "missing required private key path to read key from"
+                )
                 with open(self.private_key_path, "rb") as key:
                     pkey_bytes = key.read()
 
@@ -284,9 +284,9 @@ def get_options(self) -> dict:
         return self.options
 
     def get_oauth_connection(self) -> NativeSnowflakeConnection:
-        assert (
-            self.oauth_config
-        ), "oauth_config should be provided if using oauth based authentication"
+        assert self.oauth_config, (
+            "oauth_config should be provided if using oauth based authentication"
+        )
         generator = OAuthTokenGenerator(
             client_id=self.oauth_config.client_id,
             authority_url=self.oauth_config.authority_url,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_queries.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_queries.py
index b82734cbbe84ea..69d0b62a8edfdf 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_queries.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_queries.py
@@ -623,7 +623,7 @@ def _build_enriched_query_log_query(
         query_history.start_time >= to_timestamp_ltz({start_time_millis}, 3)
         AND query_history.start_time < to_timestamp_ltz({end_time_millis}, 3)
         AND execution_status = 'SUCCESS'
-        AND {users_filter or 'TRUE'}
+        AND {users_filter or "TRUE"}
 )
 , deduplicated_queries as (
     SELECT
@@ -651,7 +651,7 @@ def _build_enriched_query_log_query(
     WHERE
         query_start_time >= to_timestamp_ltz({start_time_millis}, 3)
         AND query_start_time < to_timestamp_ltz({end_time_millis}, 3)
-        AND {users_filter or 'TRUE'}
+        AND {users_filter or "TRUE"}
         AND query_id IN (
             SELECT query_id FROM deduplicated_queries
         )
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py
index d165be3f3cc656..173024aec0cf38 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py
@@ -142,9 +142,9 @@ def __init__(self) -> None:
         )
 
         # self._table_tags[<database_name>][<schema_name>][<table_name>] = list of tags applied to table
-        self._table_tags: Dict[
-            str, Dict[str, Dict[str, List[SnowflakeTag]]]
-        ] = defaultdict(lambda: defaultdict(lambda: defaultdict(list)))
+        self._table_tags: Dict[str, Dict[str, Dict[str, List[SnowflakeTag]]]] = (
+            defaultdict(lambda: defaultdict(lambda: defaultdict(list)))
+        )
 
         # self._column_tags[<database_name>][<schema_name>][<table_name>][<column_name>] = list of tags applied to column
         self._column_tags: Dict[
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
index 393e4d3c96d51f..a2d69d9e552916 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
@@ -194,9 +194,9 @@ def __init__(
             config, self.data_dictionary, self.report
         )
         self.profiler: Optional[SnowflakeProfiler] = profiler
-        self.snowsight_url_builder: Optional[
-            SnowsightUrlBuilder
-        ] = snowsight_url_builder
+        self.snowsight_url_builder: Optional[SnowsightUrlBuilder] = (
+            snowsight_url_builder
+        )
 
         # These are populated as side-effects of get_workunits_internal.
         self.databases: List[SnowflakeDatabase] = []
@@ -267,9 +267,9 @@ def get_databases(self) -> Optional[List[SnowflakeDatabase]]:
             )
             return None
         else:
-            ischema_databases: List[
-                SnowflakeDatabase
-            ] = self.get_databases_from_ischema(databases)
+            ischema_databases: List[SnowflakeDatabase] = (
+                self.get_databases_from_ischema(databases)
+            )
 
             if len(ischema_databases) == 0:
                 self.structured_reporter.failure(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_tag.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_tag.py
index 75567cc3da8830..597e7bee4d4cc0 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_tag.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_tag.py
@@ -38,9 +38,9 @@ def _get_tags_on_object_without_propagation(
         table_name: Optional[str],
     ) -> List[SnowflakeTag]:
         if db_name not in self.tag_cache:
-            self.tag_cache[
-                db_name
-            ] = self.data_dictionary.get_tags_for_database_without_propagation(db_name)
+            self.tag_cache[db_name] = (
+                self.data_dictionary.get_tags_for_database_without_propagation(db_name)
+            )
 
         if domain == SnowflakeObjectDomain.DATABASE:
             return self.tag_cache[db_name].get_database_tags(db_name)
@@ -130,10 +130,10 @@ def get_column_tags_for_table(
         temp_column_tags: Dict[str, List[SnowflakeTag]] = {}
         if self.config.extract_tags == TagOption.without_lineage:
             if db_name not in self.tag_cache:
-                self.tag_cache[
-                    db_name
-                ] = self.data_dictionary.get_tags_for_database_without_propagation(
-                    db_name
+                self.tag_cache[db_name] = (
+                    self.data_dictionary.get_tags_for_database_without_propagation(
+                        db_name
+                    )
                 )
             temp_column_tags = self.tag_cache[db_name].get_column_tags_for_table(
                 table_name, schema_name, db_name
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_usage_v2.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_usage_v2.py
index 85e4071aec07df..edd13ee48326bb 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_usage_v2.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_usage_v2.py
@@ -549,9 +549,9 @@ def parse_event_objects(self, event_dict: Dict) -> None:
         ):
             # NOTE: Generated emails may be incorrect, as email may be different than
             # username@email_domain
-            event_dict[
-                "EMAIL"
-            ] = f'{event_dict["USER_NAME"]}@{self.config.email_domain}'.lower()
+            event_dict["EMAIL"] = (
+                f"{event_dict['USER_NAME']}@{self.config.email_domain}".lower()
+            )
 
         if not event_dict["EMAIL"]:
             self.report.rows_missing_email += 1
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_utils.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_utils.py
index 885bee1ccdb908..030edfde4ca1da 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_utils.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_utils.py
@@ -21,8 +21,7 @@
 class SnowflakeStructuredReportMixin(abc.ABC):
     @property
     @abc.abstractmethod
-    def structured_reporter(self) -> SourceReport:
-        ...
+    def structured_reporter(self) -> SourceReport: ...
 
 
 class SnowsightUrlBuilder:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
index b8afd145727400..b4ef2180d71d45 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
@@ -211,9 +211,9 @@ def __init__(self, ctx: PipelineContext, config: SnowflakeV2Config):
 
         self.usage_extractor: Optional[SnowflakeUsageExtractor] = None
         if self.config.include_usage_stats or self.config.include_operational_stats:
-            redundant_usage_run_skip_handler: Optional[
-                RedundantUsageRunSkipHandler
-            ] = None
+            redundant_usage_run_skip_handler: Optional[RedundantUsageRunSkipHandler] = (
+                None
+            )
             if self.config.enable_stateful_usage_ingestion:
                 redundant_usage_run_skip_handler = RedundantUsageRunSkipHandler(
                     source=self,
@@ -296,7 +296,16 @@ class SnowflakePrivilege:
 
         _report: Dict[Union[SourceCapability, str], CapabilityReport] = dict()
         privileges: List[SnowflakePrivilege] = []
-        capabilities: List[SourceCapability] = [c.capability for c in SnowflakeV2Source.get_capabilities() if c.capability not in (SourceCapability.PLATFORM_INSTANCE, SourceCapability.DOMAINS, SourceCapability.DELETION_DETECTION)]  # type: ignore
+        capabilities: List[SourceCapability] = [
+            c.capability
+            for c in SnowflakeV2Source.get_capabilities()  # type: ignore
+            if c.capability
+            not in (
+                SourceCapability.PLATFORM_INSTANCE,
+                SourceCapability.DOMAINS,
+                SourceCapability.DELETION_DETECTION,
+            )
+        ]
 
         cur = conn.query("select current_role()")
         current_role = [row["CURRENT_ROLE()"] for row in cur][0]
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py b/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py
index 6f7decc79b1df2..cfc43454b51fad 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py
@@ -104,9 +104,7 @@ def get_view_definition(self, connection, view_name, schema=None, **kw):
             return "\n".join([r for r in res])
 
     @typing.no_type_check
-    def _get_column_type(
-        self, type_: Union[str, Dict[str, Any]]
-    ) -> TypeEngine:  # noqa: C901
+    def _get_column_type(self, type_: Union[str, Dict[str, Any]]) -> TypeEngine:  # noqa: C901
         """Derives the data type of the Athena column.
 
         This method is overwritten to extend the behavior of PyAthena.
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/clickhouse.py b/metadata-ingestion/src/datahub/ingestion/source/sql/clickhouse.py
index 2899bcc2de37b0..a8208ca807ed02 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/clickhouse.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/clickhouse.py
@@ -218,9 +218,7 @@ def _get_all_table_comments_and_properties(self, connection, **kw):
              , comment
              , {properties_clause} AS properties
           FROM system.tables
-         WHERE name NOT LIKE '.inner%'""".format(
-            properties_clause=properties_clause
-        )
+         WHERE name NOT LIKE '.inner%'""".format(properties_clause=properties_clause)
     )
 
     all_table_comments: Dict[Tuple[str, str], Dict[str, Any]] = {}
@@ -301,9 +299,7 @@ def _get_schema_column_info(self, connection, schema=None, **kw):
              , comment
           FROM system.columns
          WHERE {schema_clause}
-         ORDER BY database, table, position""".format(
-                    schema_clause=schema_clause
-                )
+         ORDER BY database, table, position""".format(schema_clause=schema_clause)
             )
         )
     )
@@ -474,7 +470,7 @@ def _get_all_tables(self) -> Set[str]:
         logger.debug(f"sql_alchemy_url={url}")
         engine = create_engine(url, **self.config.options)
         for db_row in engine.execute(text(all_tables_query)):
-            all_tables_set.add(f'{db_row["database"]}.{db_row["table_name"]}')
+            all_tables_set.add(f"{db_row['database']}.{db_row['table_name']}")
 
         return all_tables_set
 
@@ -503,7 +499,7 @@ def _populate_lineage_map(
 
         try:
             for db_row in engine.execute(text(query)):
-                dataset_name = f'{db_row["target_schema"]}.{db_row["target_table"]}'
+                dataset_name = f"{db_row['target_schema']}.{db_row['target_table']}"
                 if not self.config.database_pattern.allowed(
                     db_row["target_schema"]
                 ) or not self.config.table_pattern.allowed(dataset_name):
@@ -512,7 +508,7 @@ def _populate_lineage_map(
 
                 # Target
                 target_path = (
-                    f'{self.config.platform_instance+"." if self.config.platform_instance else ""}'
+                    f"{self.config.platform_instance + '.' if self.config.platform_instance else ''}"
                     f"{dataset_name}"
                 )
                 target = LineageItem(
@@ -525,7 +521,7 @@ def _populate_lineage_map(
 
                 # Source
                 platform = LineageDatasetPlatform.CLICKHOUSE
-                path = f'{db_row["source_schema"]}.{db_row["source_table"]}'
+                path = f"{db_row['source_schema']}.{db_row['source_table']}"
 
                 sources = [
                     LineageDataset(
@@ -552,9 +548,7 @@ def _populate_lineage_map(
                         target.dataset.path
                     ].upstreams = self._lineage_map[
                         target.dataset.path
-                    ].upstreams.union(
-                        target.upstreams
-                    )
+                    ].upstreams.union(target.upstreams)
 
                 else:
                     self._lineage_map[target.dataset.path] = target
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/oracle.py b/metadata-ingestion/src/datahub/ingestion/source/sql/oracle.py
index 52db3cd11a759d..ac568c58af6c68 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/oracle.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/oracle.py
@@ -234,9 +234,7 @@ def get_columns(
                     WHERE col.table_name = id.table_name
                     AND col.column_name = id.column_name
                     AND col.owner = id.owner
-                ) AS identity_options""".format(
-                dblink=dblink
-            )
+                ) AS identity_options""".format(dblink=dblink)
         else:
             identity_cols = "NULL as default_on_null, NULL as identity_options"
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/sql_generic_profiler.py b/metadata-ingestion/src/datahub/ingestion/source/sql/sql_generic_profiler.py
index c91be9b494c006..664735053f1852 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/sql_generic_profiler.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/sql_generic_profiler.py
@@ -278,8 +278,7 @@ def is_dataset_eligible_for_profiling(
 
         if self.config.profiling.profile_table_size_limit is not None and (
             size_in_bytes is not None
-            and size_in_bytes / (2**30)
-            > self.config.profiling.profile_table_size_limit
+            and size_in_bytes / (2**30) > self.config.profiling.profile_table_size_limit
         ):
             self.report.profiling_skipped_size_limit[schema_name] += 1
             logger.debug(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/teradata.py b/metadata-ingestion/src/datahub/ingestion/source/sql/teradata.py
index 5b76fe41d92e97..84b65d6635e9d4 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/teradata.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/teradata.py
@@ -599,7 +599,12 @@ def __init__(self, config: TeradataConfig, ctx: PipelineContext):
             setattr(  # noqa: B010
                 TeradataDialect,
                 "get_columns",
-                lambda self, connection, table_name, schema=None, use_qvci=self.config.use_qvci, **kw: optimized_get_columns(
+                lambda self,
+                connection,
+                table_name,
+                schema=None,
+                use_qvci=self.config.use_qvci,
+                **kw: optimized_get_columns(
                     self,
                     connection,
                     table_name,
@@ -613,7 +618,11 @@ def __init__(self, config: TeradataConfig, ctx: PipelineContext):
             setattr(  # noqa: B010
                 TeradataDialect,
                 "get_pk_constraint",
-                lambda self, connection, table_name, schema=None, **kw: optimized_get_pk_constraint(
+                lambda self,
+                connection,
+                table_name,
+                schema=None,
+                **kw: optimized_get_pk_constraint(
                     self, connection, table_name, schema, **kw
                 ),
             )
@@ -621,7 +630,11 @@ def __init__(self, config: TeradataConfig, ctx: PipelineContext):
             setattr(  # noqa: B010
                 TeradataDialect,
                 "get_foreign_keys",
-                lambda self, connection, table_name, schema=None, **kw: optimized_get_foreign_keys(
+                lambda self,
+                connection,
+                table_name,
+                schema=None,
+                **kw: optimized_get_foreign_keys(
                     self, connection, table_name, schema, **kw
                 ),
             )
diff --git a/metadata-ingestion/src/datahub/ingestion/source/state/profiling_state_handler.py b/metadata-ingestion/src/datahub/ingestion/source/state/profiling_state_handler.py
index 9883bc2b8e9b0b..6080ddadb65e40 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/state/profiling_state_handler.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/state/profiling_state_handler.py
@@ -41,9 +41,9 @@ def __init__(
         run_id: str,
     ):
         self.state_provider = source.state_provider
-        self.stateful_ingestion_config: Optional[
-            ProfilingStatefulIngestionConfig
-        ] = config.stateful_ingestion
+        self.stateful_ingestion_config: Optional[ProfilingStatefulIngestionConfig] = (
+            config.stateful_ingestion
+        )
         self.pipeline_name = pipeline_name
         self.run_id = run_id
         self.checkpointing_enabled: bool = (
diff --git a/metadata-ingestion/src/datahub/ingestion/source/state/redundant_run_skip_handler.py b/metadata-ingestion/src/datahub/ingestion/source/state/redundant_run_skip_handler.py
index 8630a959d3f6a3..e4a2646f6ccd3c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/state/redundant_run_skip_handler.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/state/redundant_run_skip_handler.py
@@ -48,9 +48,9 @@ def __init__(
     ):
         self.source = source
         self.state_provider = source.state_provider
-        self.stateful_ingestion_config: Optional[
-            StatefulIngestionConfig
-        ] = config.stateful_ingestion
+        self.stateful_ingestion_config: Optional[StatefulIngestionConfig] = (
+            config.stateful_ingestion
+        )
         self.pipeline_name = pipeline_name
         self.run_id = run_id
         self._job_id = self._init_job_id()
@@ -145,8 +145,7 @@ def should_skip_this_run(
             )
 
             logger.debug(
-                f"{self.job_id} : Last run start, end times:"
-                f"({last_run_time_window})"
+                f"{self.job_id} : Last run start, end times:({last_run_time_window})"
             )
 
             # If current run's time window is subset of last run's time window, then skip.
@@ -212,8 +211,7 @@ def suggest_run_time_window(
             )
 
         self.log(
-            "Adjusted start, end times: "
-            f"({suggested_start_time}, {suggested_end_time})"
+            f"Adjusted start, end times: ({suggested_start_time}, {suggested_end_time})"
         )
         return (suggested_start_time, suggested_end_time)
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/state/stale_entity_removal_handler.py b/metadata-ingestion/src/datahub/ingestion/source/state/stale_entity_removal_handler.py
index d4fcbf09924e9e..017d78bc1abf8d 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/state/stale_entity_removal_handler.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/state/stale_entity_removal_handler.py
@@ -111,9 +111,9 @@ def __init__(
         self.state_type_class = state_type_class
         self.pipeline_name = pipeline_name
         self.run_id = run_id
-        self.stateful_ingestion_config: Optional[
-            StatefulStaleMetadataRemovalConfig
-        ] = config.stateful_ingestion
+        self.stateful_ingestion_config: Optional[StatefulStaleMetadataRemovalConfig] = (
+            config.stateful_ingestion
+        )
         self.checkpointing_enabled: bool = (
             True
             if (
diff --git a/metadata-ingestion/src/datahub/ingestion/source/state_provider/datahub_ingestion_checkpointing_provider.py b/metadata-ingestion/src/datahub/ingestion/source/state_provider/datahub_ingestion_checkpointing_provider.py
index 8f4a53ffc3ed58..1f5a651fc64a79 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/state_provider/datahub_ingestion_checkpointing_provider.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/state_provider/datahub_ingestion_checkpointing_provider.py
@@ -70,20 +70,20 @@ def get_latest_checkpoint(
             self.orchestrator_name, pipeline_name, job_name
         )
 
-        latest_checkpoint: Optional[
-            DatahubIngestionCheckpointClass
-        ] = self.graph.get_latest_timeseries_value(
-            entity_urn=data_job_urn,
-            aspect_type=DatahubIngestionCheckpointClass,
-            filter_criteria_map={
-                "pipelineName": pipeline_name,
-            },
+        latest_checkpoint: Optional[DatahubIngestionCheckpointClass] = (
+            self.graph.get_latest_timeseries_value(
+                entity_urn=data_job_urn,
+                aspect_type=DatahubIngestionCheckpointClass,
+                filter_criteria_map={
+                    "pipelineName": pipeline_name,
+                },
+            )
         )
         if latest_checkpoint:
             logger.debug(
                 f"The last committed ingestion checkpoint for pipelineName:'{pipeline_name}',"
                 f" job_name:'{job_name}' found with start_time:"
-                f" {datetime.utcfromtimestamp(latest_checkpoint.timestampMillis/1000)}"
+                f" {datetime.utcfromtimestamp(latest_checkpoint.timestampMillis / 1000)}"
             )
             return latest_checkpoint
         else:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/state_provider/file_ingestion_checkpointing_provider.py b/metadata-ingestion/src/datahub/ingestion/source/state_provider/file_ingestion_checkpointing_provider.py
index a37774773b84d7..55f0903b9c91c7 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/state_provider/file_ingestion_checkpointing_provider.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/state_provider/file_ingestion_checkpointing_provider.py
@@ -67,7 +67,7 @@ def get_latest_checkpoint(
             logger.debug(
                 f"The last committed ingestion checkpoint for pipelineName:'{pipeline_name}',"
                 f" job_name:'{job_name}' found with start_time:"
-                f" {datetime.utcfromtimestamp(latest_checkpoint.timestampMillis/1000)}"
+                f" {datetime.utcfromtimestamp(latest_checkpoint.timestampMillis / 1000)}"
             )
             return latest_checkpoint
         else:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
index 8187fff559208e..f961bd8ecba604 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
@@ -281,9 +281,9 @@ def get_tableau_auth(
         return authentication
 
     def make_tableau_client(self, site: str) -> Server:
-        authentication: Union[
-            TableauAuth, PersonalAccessTokenAuth
-        ] = self.get_tableau_auth(site)
+        authentication: Union[TableauAuth, PersonalAccessTokenAuth] = (
+            self.get_tableau_auth(site)
+        )
         try:
             server = Server(
                 self.connect_uri,
@@ -635,7 +635,7 @@ def projects_backward_compatibility(cls, values: Dict) -> Dict:
         project_path_pattern = values.get("project_path_pattern")
         if project_pattern is None and project_path_pattern is None and projects:
             logger.warning(
-                "projects is deprecated, please use " "project_path_pattern instead."
+                "projects is deprecated, please use project_path_pattern instead."
             )
             logger.info("Initializing project_pattern from projects")
             values["project_pattern"] = AllowDenyPattern(
@@ -708,18 +708,18 @@ class DatabaseTable:
     """
 
     urn: str
-    id: Optional[
-        str
-    ] = None  # is not None only for tables that came from Tableau metadata
+    id: Optional[str] = (
+        None  # is not None only for tables that came from Tableau metadata
+    )
     num_cols: Optional[int] = None
 
-    paths: Optional[
-        Set[str]
-    ] = None  # maintains all browse paths encountered for this table
+    paths: Optional[Set[str]] = (
+        None  # maintains all browse paths encountered for this table
+    )
 
-    parsed_columns: Optional[
-        Set[str]
-    ] = None  # maintains all columns encountered for this table during parsing SQL queries
+    parsed_columns: Optional[Set[str]] = (
+        None  # maintains all columns encountered for this table during parsing SQL queries
+    )
 
     def update_table(
         self,
@@ -2310,8 +2310,7 @@ def _get_datasource_project_luid(self, ds: dict) -> Optional[str]:
             c.EMBEDDED_DATA_SOURCE,
         ):
             logger.debug(
-                f"datasource {ds.get(c.NAME)} type {ds.get(c.TYPE_NAME)} is "
-                f"unsupported"
+                f"datasource {ds.get(c.NAME)} type {ds.get(c.TYPE_NAME)} is unsupported"
             )
             return None
 
@@ -2493,9 +2492,9 @@ def parse_custom_sql(
     def _enrich_database_tables_with_parsed_schemas(
         self, parsing_result: SqlParsingResult
     ) -> None:
-        in_tables_schemas: Dict[
-            str, Set[str]
-        ] = transform_parsing_result_to_in_tables_schemas(parsing_result)
+        in_tables_schemas: Dict[str, Set[str]] = (
+            transform_parsing_result_to_in_tables_schemas(parsing_result)
+        )
 
         if not in_tables_schemas:
             logger.info("Unable to extract table schema from parsing result")
@@ -3559,25 +3558,25 @@ def emit_project_in_topological_order(
 
             generated_project_keys.add(project_key.guid())
 
-            parent_project_key: Optional[
-                Union[ProjectKey, SiteKey]
-            ] = None  # It is going
+            parent_project_key: Optional[Union[ProjectKey, SiteKey]] = (
+                None  # It is going
+            )
             # to be used as a parent container key for the current tableau project
 
             if project_.parent_id is not None:
                 # Go to the parent project as we need to generate container first for parent
                 parent_project_key = self.gen_project_key(project_.parent_id)
 
-                parent_tableau_project: Optional[
-                    TableauProject
-                ] = self.tableau_project_registry.get(project_.parent_id)
+                parent_tableau_project: Optional[TableauProject] = (
+                    self.tableau_project_registry.get(project_.parent_id)
+                )
 
                 if (
                     parent_tableau_project is None
                 ):  # It is not in project registry because of project_pattern
-                    assert (
-                        project_.parent_name
-                    ), f"project {project_.name} should not be null"
+                    assert project_.parent_name, (
+                        f"project {project_.name} should not be null"
+                    )
                     parent_tableau_project = TableauProject(
                         id=project_.parent_id,
                         name=project_.parent_name,
@@ -3669,16 +3668,16 @@ def ingest_tableau_site(self):
             if self.config.extract_usage_stats:
                 with PerfTimer() as timer:
                     self._populate_usage_stat_registry()
-                    self.report.extract_usage_stats_timer[
-                        self.site_content_url
-                    ] = timer.elapsed_seconds(digits=2)
+                    self.report.extract_usage_stats_timer[self.site_content_url] = (
+                        timer.elapsed_seconds(digits=2)
+                    )
 
             if self.config.permission_ingestion:
                 with PerfTimer() as timer:
                     self._fetch_groups()
-                    self.report.fetch_groups_timer[
-                        self.site_content_url
-                    ] = timer.elapsed_seconds(digits=2)
+                    self.report.fetch_groups_timer[self.site_content_url] = (
+                        timer.elapsed_seconds(digits=2)
+                    )
 
             # Populate the map of database names and database hostnames to be used later to map
             # databases to platform instances.
@@ -3691,9 +3690,9 @@ def ingest_tableau_site(self):
 
             with PerfTimer() as timer:
                 self._populate_projects_registry()
-                self.report.populate_projects_registry_timer[
-                    self.site_content_url
-                ] = timer.elapsed_seconds(digits=2)
+                self.report.populate_projects_registry_timer[self.site_content_url] = (
+                    timer.elapsed_seconds(digits=2)
+                )
 
             if self.config.add_site_container:
                 yield from self.emit_site_container()
@@ -3701,23 +3700,23 @@ def ingest_tableau_site(self):
 
             with PerfTimer() as timer:
                 yield from self.emit_workbooks()
-                self.report.emit_workbooks_timer[
-                    self.site_content_url
-                ] = timer.elapsed_seconds(digits=2)
+                self.report.emit_workbooks_timer[self.site_content_url] = (
+                    timer.elapsed_seconds(digits=2)
+                )
 
             if self.sheet_ids:
                 with PerfTimer() as timer:
                     yield from self.emit_sheets()
-                    self.report.emit_sheets_timer[
-                        self.site_content_url
-                    ] = timer.elapsed_seconds(digits=2)
+                    self.report.emit_sheets_timer[self.site_content_url] = (
+                        timer.elapsed_seconds(digits=2)
+                    )
 
             if self.dashboard_ids:
                 with PerfTimer() as timer:
                     yield from self.emit_dashboards()
-                    self.report.emit_dashboards_timer[
-                        self.site_content_url
-                    ] = timer.elapsed_seconds(digits=2)
+                    self.report.emit_dashboards_timer[self.site_content_url] = (
+                        timer.elapsed_seconds(digits=2)
+                    )
 
             if self.embedded_datasource_ids_being_used:
                 with PerfTimer() as timer:
@@ -3743,6 +3742,6 @@ def ingest_tableau_site(self):
             if self.database_tables:
                 with PerfTimer() as timer:
                     yield from self.emit_upstream_tables()
-                    self.report.emit_upstream_tables_timer[
-                        self.site_content_url
-                    ] = timer.elapsed_seconds(digits=2)
+                    self.report.emit_upstream_tables_timer[self.site_content_url] = (
+                        timer.elapsed_seconds(digits=2)
+                    )
diff --git a/metadata-ingestion/src/datahub/ingestion/source/unity/config.py b/metadata-ingestion/src/datahub/ingestion/source/unity/config.py
index 1fdce3aa1e2d34..6c3f7a51294797 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/unity/config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/unity/config.py
@@ -254,7 +254,9 @@ class UnityCatalogSourceConfig(
     )
 
     # TODO: Remove `type:ignore` by refactoring config
-    profiling: Union[UnityCatalogGEProfilerConfig, UnityCatalogAnalyzeProfilerConfig] = Field(  # type: ignore
+    profiling: Union[
+        UnityCatalogGEProfilerConfig, UnityCatalogAnalyzeProfilerConfig
+    ] = Field(  # type: ignore
         default=UnityCatalogGEProfilerConfig(),
         description="Data profiling configuration",
         discriminator="method",
diff --git a/metadata-ingestion/src/datahub/ingestion/source/unity/proxy.py b/metadata-ingestion/src/datahub/ingestion/source/unity/proxy.py
index 9b96953794dcd5..fd6fa8a50f707b 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/unity/proxy.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/unity/proxy.py
@@ -363,7 +363,7 @@ def _escape_sequence(value: str) -> str:
 
     @staticmethod
     def _create_metastore(
-        obj: Union[GetMetastoreSummaryResponse, MetastoreInfo]
+        obj: Union[GetMetastoreSummaryResponse, MetastoreInfo],
     ) -> Optional[Metastore]:
         if not obj.name:
             return None
diff --git a/metadata-ingestion/src/datahub/ingestion/source/unity/source.py b/metadata-ingestion/src/datahub/ingestion/source/unity/source.py
index 43bd788f809c3e..29562eaf3ce5b1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/unity/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/unity/source.py
@@ -205,9 +205,9 @@ def __init__(self, ctx: PipelineContext, config: UnityCatalogSourceConfig):
         self.table_refs: Set[TableReference] = set()
         self.view_refs: Set[TableReference] = set()
         self.notebooks: FileBackedDict[Notebook] = FileBackedDict()
-        self.view_definitions: FileBackedDict[
-            Tuple[TableReference, str]
-        ] = FileBackedDict()
+        self.view_definitions: FileBackedDict[Tuple[TableReference, str]] = (
+            FileBackedDict()
+        )
 
         # Global map of tables, for profiling
         self.tables: FileBackedDict[Table] = FileBackedDict()
diff --git a/metadata-ingestion/src/datahub/ingestion/source/unity/usage.py b/metadata-ingestion/src/datahub/ingestion/source/unity/usage.py
index 718818d9b347bf..2e9f7fc00c8784 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/unity/usage.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/unity/usage.py
@@ -103,7 +103,9 @@ def _get_workunits_internal(
                                 query, table_info
                             )
                         for source_table in table_info.source_tables:
-                            with self.report.usage_perf_report.aggregator_add_event_timer:
+                            with (
+                                self.report.usage_perf_report.aggregator_add_event_timer
+                            ):
                                 self.usage_aggregator.aggregate_event(
                                     resource=source_table,
                                     start_time=query.start_time,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/usage/clickhouse_usage.py b/metadata-ingestion/src/datahub/ingestion/source/usage/clickhouse_usage.py
index 4c2e4d42c440e8..2e1e315c4df956 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/usage/clickhouse_usage.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/usage/clickhouse_usage.py
@@ -213,15 +213,15 @@ def _get_joined_access_event(self, events):
     def _aggregate_access_events(
         self, events: List[ClickHouseJoinedAccessEvent]
     ) -> Dict[datetime, Dict[ClickHouseTableRef, AggregatedDataset]]:
-        datasets: Dict[
-            datetime, Dict[ClickHouseTableRef, AggregatedDataset]
-        ] = collections.defaultdict(dict)
+        datasets: Dict[datetime, Dict[ClickHouseTableRef, AggregatedDataset]] = (
+            collections.defaultdict(dict)
+        )
 
         for event in events:
             floored_ts = get_time_bucket(event.starttime, self.config.bucket_duration)
 
             resource = (
-                f'{self.config.platform_instance+"." if self.config.platform_instance else ""}'
+                f"{self.config.platform_instance + '.' if self.config.platform_instance else ''}"
                 f"{event.database}.{event.table}"
             )
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/usage/starburst_trino_usage.py b/metadata-ingestion/src/datahub/ingestion/source/usage/starburst_trino_usage.py
index 6ded11027c83a8..e4138696186416 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/usage/starburst_trino_usage.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/usage/starburst_trino_usage.py
@@ -235,9 +235,9 @@ def _get_joined_access_event(self, events):
     def _aggregate_access_events(
         self, events: List[TrinoJoinedAccessEvent]
     ) -> Dict[datetime, Dict[TrinoTableRef, AggregatedDataset]]:
-        datasets: Dict[
-            datetime, Dict[TrinoTableRef, AggregatedDataset]
-        ] = collections.defaultdict(dict)
+        datasets: Dict[datetime, Dict[TrinoTableRef, AggregatedDataset]] = (
+            collections.defaultdict(dict)
+        )
 
         for event in events:
             floored_ts = get_time_bucket(event.starttime, self.config.bucket_duration)
diff --git a/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_dataproduct.py b/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_dataproduct.py
index bb1c297513de10..b4dc8835f9fba9 100644
--- a/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_dataproduct.py
+++ b/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_dataproduct.py
@@ -80,10 +80,10 @@ def handle_end_of_stream(
                         ).add_asset(container_urn)
                         data_products_container[data_product_urn] = container_product
                     else:
-                        data_products_container[
-                            data_product_urn
-                        ] = data_products_container[data_product_urn].add_asset(
-                            container_urn
+                        data_products_container[data_product_urn] = (
+                            data_products_container[data_product_urn].add_asset(
+                                container_urn
+                            )
                         )
 
         mcps: List[
diff --git a/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_properties.py b/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_properties.py
index 668f6ed7abe074..4b9b4c9e6f5da6 100644
--- a/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_properties.py
+++ b/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_properties.py
@@ -61,9 +61,9 @@ def _merge_with_server_properties(
     ) -> Optional[DatasetPropertiesClass]:
         assert dataset_properties_aspect
 
-        server_dataset_properties_aspect: Optional[
-            DatasetPropertiesClass
-        ] = graph.get_dataset_properties(entity_urn)
+        server_dataset_properties_aspect: Optional[DatasetPropertiesClass] = (
+            graph.get_dataset_properties(entity_urn)
+        )
         # No need to take any action if server properties is None or there is not customProperties in server properties
         if (
             server_dataset_properties_aspect is None
diff --git a/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_schema_tags.py b/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_schema_tags.py
index ba3b6508daaecd..d2687ebc5e76f6 100644
--- a/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_schema_tags.py
+++ b/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_schema_tags.py
@@ -89,9 +89,9 @@ def transform_aspect(
         server_field_map: dict = {}
         if self.config.semantics == TransformerSemantics.PATCH:
             assert self.ctx.graph
-            server_schema_metadata_aspect: Optional[
-                SchemaMetadataClass
-            ] = self.ctx.graph.get_schema_metadata(entity_urn=entity_urn)
+            server_schema_metadata_aspect: Optional[SchemaMetadataClass] = (
+                self.ctx.graph.get_schema_metadata(entity_urn=entity_urn)
+            )
             if server_schema_metadata_aspect is not None:
                 if not schema_metadata_aspect:
                     schema_metadata_aspect = server_schema_metadata_aspect
diff --git a/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_schema_terms.py b/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_schema_terms.py
index a7e92d4bd7edbd..d17a39bee6cfbf 100644
--- a/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_schema_terms.py
+++ b/metadata-ingestion/src/datahub/ingestion/transformer/add_dataset_schema_terms.py
@@ -108,9 +108,9 @@ def transform_aspect(
         ] = {}  # Map to cache server field objects, where fieldPath is key
         if self.config.semantics == TransformerSemantics.PATCH:
             assert self.ctx.graph
-            server_schema_metadata_aspect: Optional[
-                SchemaMetadataClass
-            ] = self.ctx.graph.get_schema_metadata(entity_urn=entity_urn)
+            server_schema_metadata_aspect: Optional[SchemaMetadataClass] = (
+                self.ctx.graph.get_schema_metadata(entity_urn=entity_urn)
+            )
             if server_schema_metadata_aspect is not None:
                 if not schema_metadata_aspect:
                     schema_metadata_aspect = server_schema_metadata_aspect
diff --git a/metadata-ingestion/src/datahub/ingestion/transformer/dataset_domain_based_on_tags.py b/metadata-ingestion/src/datahub/ingestion/transformer/dataset_domain_based_on_tags.py
index 7be8069e1b0852..bb2f318dcac8b8 100644
--- a/metadata-ingestion/src/datahub/ingestion/transformer/dataset_domain_based_on_tags.py
+++ b/metadata-ingestion/src/datahub/ingestion/transformer/dataset_domain_based_on_tags.py
@@ -60,10 +60,10 @@ def transform_aspect(
                 domain_aspect.domains.extend(mapped_domains.domains)
                 if self.config.semantics == TransformerSemantics.PATCH:
                     # Try merging with server-side domains
-                    patch_domain_aspect: Optional[
-                        DomainsClass
-                    ] = AddDatasetDomain._merge_with_server_domains(
-                        self.ctx.graph, entity_urn, domain_aspect
+                    patch_domain_aspect: Optional[DomainsClass] = (
+                        AddDatasetDomain._merge_with_server_domains(
+                            self.ctx.graph, entity_urn, domain_aspect
+                        )
                     )
                     return cast(Optional[Aspect], patch_domain_aspect)
                 return cast(Optional[Aspect], domain_aspect)
diff --git a/metadata-ingestion/src/datahub/ingestion/transformer/extract_ownership_from_tags.py b/metadata-ingestion/src/datahub/ingestion/transformer/extract_ownership_from_tags.py
index 212e018dd64fb7..32707dcd3a372f 100644
--- a/metadata-ingestion/src/datahub/ingestion/transformer/extract_ownership_from_tags.py
+++ b/metadata-ingestion/src/datahub/ingestion/transformer/extract_ownership_from_tags.py
@@ -141,9 +141,9 @@ def transform_aspect(
                 else:
                     owner_type = get_owner_type(self.config.owner_type)
                     if owner_type == OwnershipTypeClass.CUSTOM:
-                        assert (
-                            self.config.owner_type_urn is not None
-                        ), "owner_type_urn must be set if owner_type is CUSTOM"
+                        assert self.config.owner_type_urn is not None, (
+                            "owner_type_urn must be set if owner_type is CUSTOM"
+                        )
 
                     owners.append(
                         OwnerClass(
diff --git a/metadata-ingestion/src/datahub/ingestion/transformer/tags_to_terms.py b/metadata-ingestion/src/datahub/ingestion/transformer/tags_to_terms.py
index 7e6125079f16e3..65cf2ac3614ae0 100644
--- a/metadata-ingestion/src/datahub/ingestion/transformer/tags_to_terms.py
+++ b/metadata-ingestion/src/datahub/ingestion/transformer/tags_to_terms.py
@@ -92,9 +92,9 @@ def transform_aspect(
         in_global_tags_aspect: Optional[GlobalTagsClass] = self.ctx.graph.get_tags(
             entity_urn
         )
-        in_schema_metadata_aspect: Optional[
-            SchemaMetadataClass
-        ] = self.ctx.graph.get_schema_metadata(entity_urn)
+        in_schema_metadata_aspect: Optional[SchemaMetadataClass] = (
+            self.ctx.graph.get_schema_metadata(entity_urn)
+        )
 
         if in_global_tags_aspect is None and in_schema_metadata_aspect is None:
             return cast(Aspect, in_glossary_terms)
@@ -134,10 +134,10 @@ def transform_aspect(
         )
 
         if self.config.semantics == TransformerSemantics.PATCH:
-            patch_glossary_terms: Optional[
-                GlossaryTermsClass
-            ] = TagsToTermMapper._merge_with_server_glossary_terms(
-                self.ctx.graph, entity_urn, out_glossary_terms
+            patch_glossary_terms: Optional[GlossaryTermsClass] = (
+                TagsToTermMapper._merge_with_server_glossary_terms(
+                    self.ctx.graph, entity_urn, out_glossary_terms
+                )
             )
             return cast(Optional[Aspect], patch_glossary_terms)
         else:
diff --git a/metadata-ingestion/src/datahub/integrations/assertion/snowflake/compiler.py b/metadata-ingestion/src/datahub/integrations/assertion/snowflake/compiler.py
index 8d2ae2960ebd05..e32f1ddc3943ae 100644
--- a/metadata-ingestion/src/datahub/integrations/assertion/snowflake/compiler.py
+++ b/metadata-ingestion/src/datahub/integrations/assertion/snowflake/compiler.py
@@ -61,17 +61,17 @@ def __init__(self, output_dir: str, extras: Dict[str, str]) -> None:
     def create(
         cls, output_dir: str, extras: Dict[str, str]
     ) -> "SnowflakeAssertionCompiler":
-        assert os.path.exists(
-            output_dir
-        ), f"Specified location {output_dir} does not exist."
+        assert os.path.exists(output_dir), (
+            f"Specified location {output_dir} does not exist."
+        )
 
-        assert os.path.isdir(
-            output_dir
-        ), f"Specified location {output_dir} is not a folder."
+        assert os.path.isdir(output_dir), (
+            f"Specified location {output_dir} is not a folder."
+        )
 
-        assert any(
-            x.upper() == DMF_SCHEMA_PROPERTY_KEY for x in extras
-        ), "Must specify value for DMF schema using -x DMF_SCHEMA=<db.schema>"
+        assert any(x.upper() == DMF_SCHEMA_PROPERTY_KEY for x in extras), (
+            "Must specify value for DMF schema using -x DMF_SCHEMA=<db.schema>"
+        )
 
         return SnowflakeAssertionCompiler(output_dir, extras)
 
@@ -232,6 +232,6 @@ def get_dmf_schedule(trigger: AssertionTrigger) -> str:
     elif isinstance(trigger.trigger, CronTrigger):
         return f"USING CRON {trigger.trigger.cron} {trigger.trigger.timezone}"
     elif isinstance(trigger.trigger, IntervalTrigger):
-        return f"{trigger.trigger.interval.seconds/60} MIN"
+        return f"{trigger.trigger.interval.seconds / 60} MIN"
     else:
         raise ValueError(f"Unsupported trigger type {type(trigger.trigger)}")
diff --git a/metadata-ingestion/src/datahub/lite/duckdb_lite.py b/metadata-ingestion/src/datahub/lite/duckdb_lite.py
index 89317383520923..fe025842822b13 100644
--- a/metadata-ingestion/src/datahub/lite/duckdb_lite.py
+++ b/metadata-ingestion/src/datahub/lite/duckdb_lite.py
@@ -163,9 +163,9 @@ def write(
 
                 if "properties" not in writeable_dict["systemMetadata"]:
                     writeable_dict["systemMetadata"]["properties"] = {}
-                writeable_dict["systemMetadata"]["properties"][
-                    "sysVersion"
-                ] = new_version
+                writeable_dict["systemMetadata"]["properties"]["sysVersion"] = (
+                    new_version
+                )
                 if needs_write:
                     self.duckdb_client.execute(
                         query="INSERT INTO metadata_aspect_v2 VALUES (?, ?, ?, ?, ?, ?)",
@@ -208,9 +208,9 @@ def write(
                             "lastObserved": writeable.systemMetadata.lastObserved
                         }
                     else:
-                        system_metadata[
-                            "lastObserved"
-                        ] = writeable.systemMetadata.lastObserved
+                        system_metadata["lastObserved"] = (
+                            writeable.systemMetadata.lastObserved
+                        )
                     self.duckdb_client.execute(
                         query="UPDATE metadata_aspect_v2 SET system_metadata = ? WHERE urn = ? AND aspect_name = ? AND version = 0",
                         parameters=[
@@ -497,9 +497,9 @@ def get_all_entities(
             aspect_name = r[1]
             aspect_payload = json.loads(r[2])
             if typed:
-                assert (
-                    aspect_name in ASPECT_MAP
-                ), f"Missing aspect name {aspect_name} in the registry"
+                assert aspect_name in ASPECT_MAP, (
+                    f"Missing aspect name {aspect_name} in the registry"
+                )
                 try:
                     aspect_payload = ASPECT_MAP[aspect_name].from_obj(
                         post_json_transform(aspect_payload)
@@ -531,7 +531,9 @@ def get_all_aspects(self) -> Iterable[MetadataChangeProposalWrapper]:
         for r in results.fetchall():
             urn = r[0]
             aspect_name = r[1]
-            aspect_metadata = ASPECT_MAP[aspect_name].from_obj(post_json_transform(json.loads(r[2])))  # type: ignore
+            aspect_metadata = ASPECT_MAP[aspect_name].from_obj(
+                post_json_transform(json.loads(r[2]))
+            )  # type: ignore
             system_metadata = SystemMetadataClass.from_obj(json.loads(r[3]))
             mcp = MetadataChangeProposalWrapper(
                 entityUrn=urn,
diff --git a/metadata-ingestion/src/datahub/specific/aspect_helpers/custom_properties.py b/metadata-ingestion/src/datahub/specific/aspect_helpers/custom_properties.py
index 1fd1585a913581..4b8b4d0bc99bc0 100644
--- a/metadata-ingestion/src/datahub/specific/aspect_helpers/custom_properties.py
+++ b/metadata-ingestion/src/datahub/specific/aspect_helpers/custom_properties.py
@@ -9,8 +9,7 @@
 class HasCustomPropertiesPatch(MetadataPatchProposal):
     @classmethod
     @abstractmethod
-    def _custom_properties_location(self) -> Tuple[str, PatchPath]:
-        ...
+    def _custom_properties_location(self) -> Tuple[str, PatchPath]: ...
 
     def add_custom_property(self, key: str, value: str) -> Self:
         """Add a custom property to the entity.
diff --git a/metadata-ingestion/src/datahub/sql_parsing/schema_resolver.py b/metadata-ingestion/src/datahub/sql_parsing/schema_resolver.py
index 6aa10381a883ef..55b026a144c6d5 100644
--- a/metadata-ingestion/src/datahub/sql_parsing/schema_resolver.py
+++ b/metadata-ingestion/src/datahub/sql_parsing/schema_resolver.py
@@ -33,14 +33,11 @@ class GraphQLSchemaMetadata(TypedDict):
 
 class SchemaResolverInterface(Protocol):
     @property
-    def platform(self) -> str:
-        ...
+    def platform(self) -> str: ...
 
-    def includes_temp_tables(self) -> bool:
-        ...
+    def includes_temp_tables(self) -> bool: ...
 
-    def resolve_table(self, table: _TableName) -> Tuple[str, Optional[SchemaInfo]]:
-        ...
+    def resolve_table(self, table: _TableName) -> Tuple[str, Optional[SchemaInfo]]: ...
 
     def __hash__(self) -> int:
         # Mainly to make lru_cache happy in methods that accept a schema resolver.
@@ -232,8 +229,7 @@ def convert_graphql_schema_metadata_to_info(
         return {
             get_simple_field_path_from_v2_field_path(field["fieldPath"]): (
                 # The actual types are more of a "nice to have".
-                field["nativeDataType"]
-                or "str"
+                field["nativeDataType"] or "str"
             )
             for field in schema["fields"]
             # TODO: We can't generate lineage to columns nested within structs yet.
@@ -289,8 +285,7 @@ def _convert_schema_field_list_to_info(
     return {
         get_simple_field_path_from_v2_field_path(col.fieldPath): (
             # The actual types are more of a "nice to have".
-            col.nativeDataType
-            or "str"
+            col.nativeDataType or "str"
         )
         for col in schema_fields
         # TODO: We can't generate lineage to columns nested within structs yet.
diff --git a/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py b/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py
index e1deeaec5ba826..8637802f6b9fee 100644
--- a/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py
+++ b/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py
@@ -682,10 +682,10 @@ def add_known_lineage_mapping(
         query_id = self._known_lineage_query_id()
 
         # Generate CLL if schema of downstream is known
-        column_lineage: List[
-            ColumnLineageInfo
-        ] = self._generate_identity_column_lineage(
-            upstream_urn=upstream_urn, downstream_urn=downstream_urn
+        column_lineage: List[ColumnLineageInfo] = (
+            self._generate_identity_column_lineage(
+                upstream_urn=upstream_urn, downstream_urn=downstream_urn
+            )
         )
 
         # Register the query.
@@ -1044,9 +1044,9 @@ def _make_schema_resolver_for_session(
             temp_table_schemas: Dict[str, Optional[List[models.SchemaFieldClass]]] = {}
             for temp_table_urn, query_ids in self._temp_lineage_map[session_id].items():
                 for query_id in query_ids:
-                    temp_table_schemas[
-                        temp_table_urn
-                    ] = self._inferred_temp_schemas.get(query_id)
+                    temp_table_schemas[temp_table_urn] = (
+                        self._inferred_temp_schemas.get(query_id)
+                    )
                     if temp_table_schemas:
                         break
 
@@ -1073,9 +1073,9 @@ def _process_view_definition(
             schema_resolver=self._schema_resolver,
         )
         if parsed.debug_info.error:
-            self.report.views_parse_failures[
-                view_urn
-            ] = f"{parsed.debug_info.error} on query: {view_definition.view_definition[:100]}"
+            self.report.views_parse_failures[view_urn] = (
+                f"{parsed.debug_info.error} on query: {view_definition.view_definition[:100]}"
+            )
         if parsed.debug_info.table_error:
             self.report.num_views_failed += 1
             return  # we can't do anything with this query
@@ -1583,9 +1583,9 @@ def _recurse_into_query(
                                     temp_query_lineage_info
                                 )
                             else:
-                                temp_upstream_queries[
-                                    upstream
-                                ] = temp_query_lineage_info
+                                temp_upstream_queries[upstream] = (
+                                    temp_query_lineage_info
+                                )
 
             # Compute merged upstreams.
             new_upstreams = OrderedSet[UrnStr]()
@@ -1665,9 +1665,9 @@ def _recurse_into_query(
         composed_of_queries_truncated: LossyList[str] = LossyList()
         for query_id in composed_of_queries:
             composed_of_queries_truncated.append(query_id)
-        self.report.queries_with_temp_upstreams[
-            composite_query_id
-        ] = composed_of_queries_truncated
+        self.report.queries_with_temp_upstreams[composite_query_id] = (
+            composed_of_queries_truncated
+        )
 
         merged_query_text = ";\n\n".join(
             [q.formatted_query_string for q in ordered_queries]
diff --git a/metadata-ingestion/src/datahub/sql_parsing/sqlglot_lineage.py b/metadata-ingestion/src/datahub/sql_parsing/sqlglot_lineage.py
index bf28ab0e7b229b..c825deeccd9592 100644
--- a/metadata-ingestion/src/datahub/sql_parsing/sqlglot_lineage.py
+++ b/metadata-ingestion/src/datahub/sql_parsing/sqlglot_lineage.py
@@ -442,9 +442,9 @@ def _create_table_ddl_cll(
 ) -> List[_ColumnLineageInfo]:
     column_lineage: List[_ColumnLineageInfo] = []
 
-    assert (
-        output_table is not None
-    ), "output_table must be set for create DDL statements"
+    assert output_table is not None, (
+        "output_table must be set for create DDL statements"
+    )
 
     create_schema: sqlglot.exp.Schema = statement.this
     sqlglot_columns = create_schema.expressions
diff --git a/metadata-ingestion/src/datahub/sql_parsing/sqlglot_utils.py b/metadata-ingestion/src/datahub/sql_parsing/sqlglot_utils.py
index 57a5cc3c9a6574..5b12c64a831666 100644
--- a/metadata-ingestion/src/datahub/sql_parsing/sqlglot_utils.py
+++ b/metadata-ingestion/src/datahub/sql_parsing/sqlglot_utils.py
@@ -404,7 +404,7 @@ def replace_cte_refs(node: sqlglot.exp.Expression) -> sqlglot.exp.Expression:
         if new_statement == statement:
             if iteration > 1:
                 logger.debug(
-                    f"Required {iteration+1} iterations to detach and eliminate all CTEs"
+                    f"Required {iteration + 1} iterations to detach and eliminate all CTEs"
                 )
             break
         statement = new_statement
diff --git a/metadata-ingestion/src/datahub/telemetry/stats.py b/metadata-ingestion/src/datahub/telemetry/stats.py
index bf98bd72b574ce..d6835e49de56aa 100644
--- a/metadata-ingestion/src/datahub/telemetry/stats.py
+++ b/metadata-ingestion/src/datahub/telemetry/stats.py
@@ -5,8 +5,7 @@
 
 
 class SupportsLT(Protocol):
-    def __lt__(self, __other: Any) -> Any:
-        ...
+    def __lt__(self, __other: Any) -> Any: ...
 
 
 _SupportsComparisonT = TypeVar("_SupportsComparisonT", bound=SupportsLT)
diff --git a/metadata-ingestion/src/datahub/utilities/file_backed_collections.py b/metadata-ingestion/src/datahub/utilities/file_backed_collections.py
index fb028605c35b77..79da90ba20ea9f 100644
--- a/metadata-ingestion/src/datahub/utilities/file_backed_collections.py
+++ b/metadata-ingestion/src/datahub/utilities/file_backed_collections.py
@@ -224,9 +224,9 @@ class FileBackedDict(MutableMapping[str, _VT], Closeable, Generic[_VT]):
     _use_sqlite_on_conflict: bool = field(repr=False, default=True)
 
     def __post_init__(self) -> None:
-        assert (
-            self.cache_eviction_batch_size > 0
-        ), "cache_eviction_batch_size must be positive"
+        assert self.cache_eviction_batch_size > 0, (
+            "cache_eviction_batch_size must be positive"
+        )
 
         for reserved_column in ("key", "value", "rowid"):
             if reserved_column in self.extra_columns:
@@ -261,7 +261,7 @@ def __post_init__(self) -> None:
                 rowid INTEGER PRIMARY KEY AUTOINCREMENT,
                 key TEXT UNIQUE,
                 value BLOB
-                {''.join(f', {column_name} BLOB' for column_name in self.extra_columns.keys())}
+                {"".join(f", {column_name} BLOB" for column_name in self.extra_columns.keys())}
             )"""
         )
 
@@ -316,12 +316,12 @@ def _prune_cache(self, num_items_to_prune: int) -> None:
                 f"""INSERT INTO {self.tablename} (
                     key,
                     value
-                    {''.join(f', {column_name}' for column_name in self.extra_columns.keys())}
+                    {"".join(f", {column_name}" for column_name in self.extra_columns.keys())}
                 )
-                VALUES ({', '.join(['?'] *(2 + len(self.extra_columns)))})
+                VALUES ({", ".join(["?"] * (2 + len(self.extra_columns)))})
                 ON CONFLICT (key) DO UPDATE SET
                     value = excluded.value
-                    {''.join(f', {column_name} = excluded.{column_name}' for column_name in self.extra_columns.keys())}
+                    {"".join(f", {column_name} = excluded.{column_name}" for column_name in self.extra_columns.keys())}
                 """,
                 items_to_write,
             )
@@ -332,16 +332,16 @@ def _prune_cache(self, num_items_to_prune: int) -> None:
                         f"""INSERT INTO {self.tablename} (
                             key,
                             value
-                            {''.join(f', {column_name}' for column_name in self.extra_columns.keys())}
+                            {"".join(f", {column_name}" for column_name in self.extra_columns.keys())}
                         )
-                        VALUES ({', '.join(['?'] *(2 + len(self.extra_columns)))})""",
+                        VALUES ({", ".join(["?"] * (2 + len(self.extra_columns)))})""",
                         item,
                     )
                 except sqlite3.IntegrityError:
                     self._conn.execute(
                         f"""UPDATE {self.tablename} SET
                             value = ?
-                            {''.join(f', {column_name} = ?' for column_name in self.extra_columns.keys())}
+                            {"".join(f", {column_name} = ?" for column_name in self.extra_columns.keys())}
                         WHERE key = ?""",
                         (*item[1:], item[0]),
                     )
diff --git a/metadata-ingestion/src/datahub/utilities/hive_schema_to_avro.py b/metadata-ingestion/src/datahub/utilities/hive_schema_to_avro.py
index e98fe42c1d56ce..fccd8dd8a60c35 100644
--- a/metadata-ingestion/src/datahub/utilities/hive_schema_to_avro.py
+++ b/metadata-ingestion/src/datahub/utilities/hive_schema_to_avro.py
@@ -142,10 +142,10 @@ def _parse_struct_fields_string(s: str, **kwargs: Any) -> Dict[str, object]:
                 fields.append({"name": field_name, "type": field_type})
 
         if kwargs.get("ustruct_seqn") is not None:
-            struct_name = f'__structn_{kwargs["ustruct_seqn"]}_{str(uuid.uuid4()).replace("-", "")}'
+            struct_name = f"__structn_{kwargs['ustruct_seqn']}_{str(uuid.uuid4()).replace('-', '')}"
 
         else:
-            struct_name = f'__struct_{str(uuid.uuid4()).replace("-", "")}'
+            struct_name = f"__struct_{str(uuid.uuid4()).replace('-', '')}"
         return {
             "type": "record",
             "name": struct_name,
diff --git a/metadata-ingestion/src/datahub/utilities/logging_manager.py b/metadata-ingestion/src/datahub/utilities/logging_manager.py
index 926b8782fbf119..a5fd20fef307d0 100644
--- a/metadata-ingestion/src/datahub/utilities/logging_manager.py
+++ b/metadata-ingestion/src/datahub/utilities/logging_manager.py
@@ -130,9 +130,9 @@ def _formatMessageColor(self, record: logging.LogRecord) -> str:
         # Mimic our default format, but with color.
         message_fg = self.MESSAGE_COLORS.get(record.levelname)
         return (
-            f'{click.style(f"[{self.formatTime(record, self.datefmt)}]", fg="green", dim=True)} '
+            f"{click.style(f'[{self.formatTime(record, self.datefmt)}]', fg='green', dim=True)} "
             f"{click.style(f'{record.levelname:8}', fg=message_fg)} "
-            f'{click.style(f"{{{record.name}:{record.lineno}}}", fg="blue", dim=True)} - '
+            f"{click.style(f'{{{record.name}:{record.lineno}}}', fg='blue', dim=True)} - "
             f"{click.style(record.getMessage(), fg=message_fg)}"
         )
 
diff --git a/metadata-ingestion/src/datahub/utilities/lossy_collections.py b/metadata-ingestion/src/datahub/utilities/lossy_collections.py
index f71aad51ab0b6b..31d6d0eb842d04 100644
--- a/metadata-ingestion/src/datahub/utilities/lossy_collections.py
+++ b/metadata-ingestion/src/datahub/utilities/lossy_collections.py
@@ -151,9 +151,9 @@ def __str__(self) -> str:
     def as_obj(self) -> Dict[Union[_KT, str], Union[_VT, str]]:
         base_dict: Dict[Union[_KT, str], Union[_VT, str]] = super().copy()  # type: ignore
         if self.sampled:
-            base_dict[
-                "sampled"
-            ] = f"{len(self.keys())} sampled of at most {self.total_key_count()} entries."
+            base_dict["sampled"] = (
+                f"{len(self.keys())} sampled of at most {self.total_key_count()} entries."
+            )
         return base_dict
 
     def total_key_count(self) -> int:
diff --git a/metadata-ingestion/src/datahub/utilities/mapping.py b/metadata-ingestion/src/datahub/utilities/mapping.py
index 17023c7b388e76..96870fc6fcd378 100644
--- a/metadata-ingestion/src/datahub/utilities/mapping.py
+++ b/metadata-ingestion/src/datahub/utilities/mapping.py
@@ -349,9 +349,9 @@ def convert_to_aspects(self, operation_map: Dict[str, list]) -> Dict[str, Any]:
                         elements=[institutional_memory_element]
                     )
 
-                    aspect_map[
-                        Constants.ADD_DOC_LINK_OPERATION
-                    ] = institutional_memory_aspect
+                    aspect_map[Constants.ADD_DOC_LINK_OPERATION] = (
+                        institutional_memory_aspect
+                    )
                 else:
                     raise Exception(
                         f"Expected 1 item of type list for the documentation_link meta_mapping config,"
diff --git a/metadata-ingestion/src/datahub/utilities/serialized_lru_cache.py b/metadata-ingestion/src/datahub/utilities/serialized_lru_cache.py
index b5f490720340ce..bdfe4285065522 100644
--- a/metadata-ingestion/src/datahub/utilities/serialized_lru_cache.py
+++ b/metadata-ingestion/src/datahub/utilities/serialized_lru_cache.py
@@ -41,7 +41,9 @@ def decorator(func: Callable[_F, _T]) -> Callable[_F, _T]:
         def wrapper(*args: _F.args, **kwargs: _F.kwargs) -> _T:
             # We need a type ignore here because there's no way for us to require that
             # the args and kwargs are hashable while using ParamSpec.
-            key: _Key = cachetools.keys.hashkey(*args, **{k: v for k, v in kwargs.items() if "cache_exclude" not in k})  # type: ignore
+            key: _Key = cachetools.keys.hashkey(
+                *args, **{k: v for k, v in kwargs.items() if "cache_exclude" not in k}
+            )  # type: ignore
 
             with cache_lock:
                 if key in cache:
diff --git a/metadata-ingestion/src/datahub/utilities/sqlalchemy_query_combiner.py b/metadata-ingestion/src/datahub/utilities/sqlalchemy_query_combiner.py
index 11c04082ee7ad5..cf92336c68cdf6 100644
--- a/metadata-ingestion/src/datahub/utilities/sqlalchemy_query_combiner.py
+++ b/metadata-ingestion/src/datahub/utilities/sqlalchemy_query_combiner.py
@@ -160,12 +160,12 @@ class SQLAlchemyQueryCombiner:
     _greenlets_by_thread_lock: threading.Lock = dataclasses.field(
         default_factory=lambda: threading.Lock()
     )
-    _queries_by_thread: Dict[
-        greenlet.greenlet, Dict[str, _QueryFuture]
-    ] = dataclasses.field(default_factory=lambda: collections.defaultdict(dict))
-    _greenlets_by_thread: Dict[
-        greenlet.greenlet, Set[greenlet.greenlet]
-    ] = dataclasses.field(default_factory=lambda: collections.defaultdict(set))
+    _queries_by_thread: Dict[greenlet.greenlet, Dict[str, _QueryFuture]] = (
+        dataclasses.field(default_factory=lambda: collections.defaultdict(dict))
+    )
+    _greenlets_by_thread: Dict[greenlet.greenlet, Set[greenlet.greenlet]] = (
+        dataclasses.field(default_factory=lambda: collections.defaultdict(set))
+    )
 
     @staticmethod
     def _generate_sql_safe_identifier() -> str:
diff --git a/metadata-ingestion/src/datahub/utilities/stats_collections.py b/metadata-ingestion/src/datahub/utilities/stats_collections.py
index 09a9490abc0fbe..c0bd9d058e5d37 100644
--- a/metadata-ingestion/src/datahub/utilities/stats_collections.py
+++ b/metadata-ingestion/src/datahub/utilities/stats_collections.py
@@ -48,7 +48,9 @@ def as_obj(self) -> Dict[_KT, _VT]:
                 total_value: Union[_VT, str] = sum(trimmed_dict.values())  # type: ignore
             except Exception:
                 total_value = ""
-            trimmed_dict[f"... top {self.top_k} of total {len(self)} entries"] = total_value  # type: ignore
+            trimmed_dict[f"... top {self.top_k} of total {len(self)} entries"] = (  # type: ignore
+                total_value  # type: ignore
+            )
             return trimmed_dict
 
 
diff --git a/metadata-ingestion/src/datahub/utilities/urns/urn_iter.py b/metadata-ingestion/src/datahub/utilities/urns/urn_iter.py
index f0e4c6f5ee14a1..d792e0bba649dd 100644
--- a/metadata-ingestion/src/datahub/utilities/urns/urn_iter.py
+++ b/metadata-ingestion/src/datahub/utilities/urns/urn_iter.py
@@ -21,7 +21,7 @@ def _add_prefix_to_paths(
 
 
 def list_urns_with_path(
-    model: Union[DictWrapper, MetadataChangeProposalWrapper]
+    model: Union[DictWrapper, MetadataChangeProposalWrapper],
 ) -> List[Tuple[str, _Path]]:
     """List urns in the given model with their paths.
 
@@ -145,7 +145,7 @@ def lowercase_dataset_urns(
         MetadataChangeEventClass,
         MetadataChangeProposalClass,
         MetadataChangeProposalWrapper,
-    ]
+    ],
 ) -> None:
     def modify_urn(urn: str) -> str:
         if guess_entity_type(urn) == "dataset":
diff --git a/metadata-ingestion/tests/integration/azure_ad/test_azure_ad.py b/metadata-ingestion/tests/integration/azure_ad/test_azure_ad.py
index 024bb62bbe9ce9..5bb078a368dd50 100644
--- a/metadata-ingestion/tests/integration/azure_ad/test_azure_ad.py
+++ b/metadata-ingestion/tests/integration/azure_ad/test_azure_ad.py
@@ -98,7 +98,9 @@ def load_test_resources(test_resources_dir):
     with azure_ad_nested_group_json_file.open() as azure_ad_nested_group_json:
         reference_nested_group = json.loads(azure_ad_nested_group_json.read())
 
-    with azure_ad_nested_groups_members_json_file.open() as azure_ad_nested_groups_users_json:
+    with (
+        azure_ad_nested_groups_members_json_file.open()
+    ) as azure_ad_nested_groups_users_json:
         reference_nested_groups_users = json.loads(
             azure_ad_nested_groups_users_json.read()
         )
diff --git a/metadata-ingestion/tests/integration/dremio/test_dremio.py b/metadata-ingestion/tests/integration/dremio/test_dremio.py
index 401f487d8a14b8..c286746c68b79d 100644
--- a/metadata-ingestion/tests/integration/dremio/test_dremio.py
+++ b/metadata-ingestion/tests/integration/dremio/test_dremio.py
@@ -190,9 +190,9 @@ def create_mysql_source(headers):
         "type": "MYSQL",
     }
     response = requests.post(url, headers=headers, data=json.dumps(payload))
-    assert (
-        response.status_code == 200
-    ), f"Failed to add mysql datasource: {response.text}"
+    assert response.status_code == 200, (
+        f"Failed to add mysql datasource: {response.text}"
+    )
 
 
 def upload_dataset(headers):
@@ -537,9 +537,9 @@ def test_dremio_platform_instance_urns(
 
         # Check dataset URN structure
         if mce["entityType"] == "dataset" and "entityUrn" in mce:
-            assert (
-                "test-platform.dremio" in mce["entityUrn"]
-            ), f"Platform instance missing in dataset URN: {mce['entityUrn']}"
+            assert "test-platform.dremio" in mce["entityUrn"], (
+                f"Platform instance missing in dataset URN: {mce['entityUrn']}"
+            )
 
         # Check aspects for both datasets and containers
         if "aspectName" in mce:
@@ -558,9 +558,9 @@ def test_dremio_platform_instance_urns(
 
                 instance = aspect_json["instance"]
                 expected_instance = "urn:li:dataPlatformInstance:(urn:li:dataPlatform:dremio,test-platform)"
-                assert (
-                    instance == expected_instance
-                ), f"Invalid platform instance format: {instance}"
+                assert instance == expected_instance, (
+                    f"Invalid platform instance format: {instance}"
+                )
 
     # Verify against golden file
     mce_helpers.check_golden_file(
diff --git a/metadata-ingestion/tests/integration/grafana/test_grafana.py b/metadata-ingestion/tests/integration/grafana/test_grafana.py
index 6eb6b0b8509263..cbac965884365d 100644
--- a/metadata-ingestion/tests/integration/grafana/test_grafana.py
+++ b/metadata-ingestion/tests/integration/grafana/test_grafana.py
@@ -120,7 +120,7 @@ def test_grafana_dashboard(loaded_grafana, pytestconfig, tmp_path, test_resource
         time.sleep(5)
         resp = requests.get(url)
         if resp.status_code == 200:
-            logging.info(f"Grafana started after waiting {i*5} seconds")
+            logging.info(f"Grafana started after waiting {i * 5} seconds")
             break
     else:
         pytest.fail("Grafana did not start in time")
@@ -131,12 +131,12 @@ def test_grafana_dashboard(loaded_grafana, pytestconfig, tmp_path, test_resource
     assert resp.status_code == 200, "Failed to load default dashboard"
     dashboard = resp.json()
 
-    assert (
-        dashboard["dashboard"]["title"] == "Default Dashboard"
-    ), "Default dashboard title mismatch"
-    assert any(
-        panel["type"] == "text" for panel in dashboard["dashboard"]["panels"]
-    ), "Default dashboard missing text panel"
+    assert dashboard["dashboard"]["title"] == "Default Dashboard", (
+        "Default dashboard title mismatch"
+    )
+    assert any(panel["type"] == "text" for panel in dashboard["dashboard"]["panels"]), (
+        "Default dashboard missing text panel"
+    )
 
     # Verify the output. (You can add further checks here if needed)
     logging.info("Default dashboard verified successfully")
@@ -153,7 +153,7 @@ def test_grafana_ingest(
         time.sleep(5)
         resp = requests.get(url)
         if resp.status_code == 200:
-            logging.info(f"Grafana started after waiting {i*5} seconds")
+            logging.info(f"Grafana started after waiting {i * 5} seconds")
             break
     else:
         pytest.fail("Grafana did not start in time")
diff --git a/metadata-ingestion/tests/integration/kafka-connect/test_kafka_connect.py b/metadata-ingestion/tests/integration/kafka-connect/test_kafka_connect.py
index d0f4fc35fc03eb..d8c98b12951f5d 100644
--- a/metadata-ingestion/tests/integration/kafka-connect/test_kafka_connect.py
+++ b/metadata-ingestion/tests/integration/kafka-connect/test_kafka_connect.py
@@ -482,9 +482,9 @@ def test_kafka_connect_ingest_stateful(
             "mysql_source1",
             "mysql_source2",
         ]
-        pipeline_run1_config["sink"]["config"][
-            "filename"
-        ] = f"{tmp_path}/{output_file_name}"
+        pipeline_run1_config["sink"]["config"]["filename"] = (
+            f"{tmp_path}/{output_file_name}"
+        )
         pipeline_run1 = Pipeline.create(pipeline_run1_config)
         pipeline_run1.run()
         pipeline_run1.raise_from_status()
@@ -506,14 +506,16 @@ def test_kafka_connect_ingest_stateful(
         mock_datahub_graph,
     ) as mock_checkpoint:
         mock_checkpoint.return_value = mock_datahub_graph
-        pipeline_run2_config: Dict[str, Dict[str, Dict[str, Any]]] = dict(base_pipeline_config)  # type: ignore
+        pipeline_run2_config: Dict[str, Dict[str, Dict[str, Any]]] = dict(
+            base_pipeline_config  # type: ignore
+        )
         # Set the special properties for this run
         pipeline_run1_config["source"]["config"]["connector_patterns"]["allow"] = [
             "mysql_source1",
         ]
-        pipeline_run2_config["sink"]["config"][
-            "filename"
-        ] = f"{tmp_path}/{output_file_deleted_name}"
+        pipeline_run2_config["sink"]["config"]["filename"] = (
+            f"{tmp_path}/{output_file_deleted_name}"
+        )
         pipeline_run2 = Pipeline.create(pipeline_run2_config)
         pipeline_run2.run()
         pipeline_run2.raise_from_status()
diff --git a/metadata-ingestion/tests/integration/looker/test_looker.py b/metadata-ingestion/tests/integration/looker/test_looker.py
index c96bcc729a95da..bbcc6332539c02 100644
--- a/metadata-ingestion/tests/integration/looker/test_looker.py
+++ b/metadata-ingestion/tests/integration/looker/test_looker.py
@@ -1096,9 +1096,9 @@ def test_file_path_in_view_naming_pattern(
 ):
     mocked_client = mock.MagicMock()
     new_recipe = get_default_recipe(output_file_path=f"{tmp_path}/looker_mces.json")
-    new_recipe["source"]["config"][
-        "view_naming_pattern"
-    ] = "{project}.{file_path}.view.{name}"
+    new_recipe["source"]["config"]["view_naming_pattern"] = (
+        "{project}.{file_path}.view.{name}"
+    )
 
     with mock.patch(
         "datahub.ingestion.source.state_provider.datahub_ingestion_checkpointing_provider.DataHubGraph",
diff --git a/metadata-ingestion/tests/integration/lookml/test_lookml.py b/metadata-ingestion/tests/integration/lookml/test_lookml.py
index 940e7f36675f79..d803b8498104fd 100644
--- a/metadata-ingestion/tests/integration/lookml/test_lookml.py
+++ b/metadata-ingestion/tests/integration/lookml/test_lookml.py
@@ -101,13 +101,13 @@ def test_lookml_refinement_ingest(pytestconfig, tmp_path, mock_time):
     )
     new_recipe["source"]["config"]["process_refinements"] = True
 
-    new_recipe["source"]["config"][
-        "view_naming_pattern"
-    ] = "{project}.{file_path}.view.{name}"
+    new_recipe["source"]["config"]["view_naming_pattern"] = (
+        "{project}.{file_path}.view.{name}"
+    )
 
-    new_recipe["source"]["config"][
-        "view_browse_pattern"
-    ] = "/{env}/{platform}/{project}/{file_path}/views"
+    new_recipe["source"]["config"]["view_browse_pattern"] = (
+        "/{env}/{platform}/{project}/{file_path}/views"
+    )
 
     pipeline = Pipeline.create(new_recipe)
     pipeline.run()
diff --git a/metadata-ingestion/tests/integration/nifi/test_nifi.py b/metadata-ingestion/tests/integration/nifi/test_nifi.py
index b992de058879ef..924e854a47e4eb 100644
--- a/metadata-ingestion/tests/integration/nifi/test_nifi.py
+++ b/metadata-ingestion/tests/integration/nifi/test_nifi.py
@@ -72,7 +72,7 @@ def test_nifi_ingest_standalone(
             status = next(s for s in statuses if s["name"] == "FetchS3Object")
 
             if status["aggregateSnapshot"]["flowFilesOut"] >= 1:
-                logging.info(f"Waited for time {i*5} seconds")
+                logging.info(f"Waited for time {i * 5} seconds")
                 break
 
     # Run the metadata ingestion pipeline.
@@ -124,7 +124,7 @@ def test_nifi_ingest_cluster(loaded_nifi, pytestconfig, tmp_path, test_resources
             statuses = [pg["status"] for pg in pgs]
             status = next(s for s in statuses if s["name"] == "Cluster_Site_S3_to_S3")
             if status["aggregateSnapshot"]["flowFilesSent"] >= 1:
-                logging.info(f"Waited for time {i*5} seconds")
+                logging.info(f"Waited for time {i * 5} seconds")
                 break
     test_resources_dir = pytestconfig.rootpath / "tests/integration/nifi"
     # Run the metadata ingestion pipeline.
diff --git a/metadata-ingestion/tests/integration/powerbi/test_m_parser.py b/metadata-ingestion/tests/integration/powerbi/test_m_parser.py
index 6f7a9c7833ba1a..0d85d370265cae 100644
--- a/metadata-ingestion/tests/integration/powerbi/test_m_parser.py
+++ b/metadata-ingestion/tests/integration/powerbi/test_m_parser.py
@@ -765,14 +765,14 @@ def test_sqlglot_parser():
         }
     )
 
-    lineage: List[
-        datahub.ingestion.source.powerbi.m_query.data_classes.Lineage
-    ] = parser.get_upstream_tables(
-        table,
-        reporter,
-        ctx=ctx,
-        config=config,
-        platform_instance_resolver=platform_instance_resolver,
+    lineage: List[datahub.ingestion.source.powerbi.m_query.data_classes.Lineage] = (
+        parser.get_upstream_tables(
+            table,
+            reporter,
+            ctx=ctx,
+            config=config,
+            platform_instance_resolver=platform_instance_resolver,
+        )
     )
 
     data_platform_tables: List[DataPlatformTable] = lineage[0].upstreams
@@ -814,9 +814,9 @@ def test_sqlglot_parser():
 def test_databricks_multi_cloud():
     q = M_QUERIES[25]
 
-    lineage: List[
-        datahub.ingestion.source.powerbi.m_query.data_classes.Lineage
-    ] = get_data_platform_tables_with_dummy_table(q=q)
+    lineage: List[datahub.ingestion.source.powerbi.m_query.data_classes.Lineage] = (
+        get_data_platform_tables_with_dummy_table(q=q)
+    )
 
     assert len(lineage) == 1
 
@@ -833,9 +833,9 @@ def test_databricks_multi_cloud():
 def test_databricks_catalog_pattern_1():
     q = M_QUERIES[26]
 
-    lineage: List[
-        datahub.ingestion.source.powerbi.m_query.data_classes.Lineage
-    ] = get_data_platform_tables_with_dummy_table(q=q)
+    lineage: List[datahub.ingestion.source.powerbi.m_query.data_classes.Lineage] = (
+        get_data_platform_tables_with_dummy_table(q=q)
+    )
 
     assert len(lineage) == 1
 
@@ -904,14 +904,14 @@ def test_sqlglot_parser_2():
         }
     )
 
-    lineage: List[
-        datahub.ingestion.source.powerbi.m_query.data_classes.Lineage
-    ] = parser.get_upstream_tables(
-        table,
-        reporter,
-        ctx=ctx,
-        config=config,
-        platform_instance_resolver=platform_instance_resolver,
+    lineage: List[datahub.ingestion.source.powerbi.m_query.data_classes.Lineage] = (
+        parser.get_upstream_tables(
+            table,
+            reporter,
+            ctx=ctx,
+            config=config,
+            platform_instance_resolver=platform_instance_resolver,
+        )
     )
 
     data_platform_tables: List[DataPlatformTable] = lineage[0].upstreams
@@ -965,9 +965,9 @@ def test_databricks_regular_case_with_view():
 def test_snowflake_double_double_quotes():
     q = M_QUERIES[30]
 
-    lineage: List[
-        datahub.ingestion.source.powerbi.m_query.data_classes.Lineage
-    ] = get_data_platform_tables_with_dummy_table(q=q)
+    lineage: List[datahub.ingestion.source.powerbi.m_query.data_classes.Lineage] = (
+        get_data_platform_tables_with_dummy_table(q=q)
+    )
 
     assert len(lineage) == 1
 
@@ -984,9 +984,9 @@ def test_snowflake_double_double_quotes():
 def test_databricks_multicloud():
     q = M_QUERIES[31]
 
-    lineage: List[
-        datahub.ingestion.source.powerbi.m_query.data_classes.Lineage
-    ] = get_data_platform_tables_with_dummy_table(q=q)
+    lineage: List[datahub.ingestion.source.powerbi.m_query.data_classes.Lineage] = (
+        get_data_platform_tables_with_dummy_table(q=q)
+    )
 
     assert len(lineage) == 1
 
@@ -1003,9 +1003,9 @@ def test_databricks_multicloud():
 def test_snowflake_multi_function_call():
     q = M_QUERIES[32]
 
-    lineage: List[
-        datahub.ingestion.source.powerbi.m_query.data_classes.Lineage
-    ] = get_data_platform_tables_with_dummy_table(q=q)
+    lineage: List[datahub.ingestion.source.powerbi.m_query.data_classes.Lineage] = (
+        get_data_platform_tables_with_dummy_table(q=q)
+    )
 
     assert len(lineage) == 1
 
@@ -1022,9 +1022,9 @@ def test_snowflake_multi_function_call():
 def test_mssql_drop_with_select():
     q = M_QUERIES[33]
 
-    lineage: List[
-        datahub.ingestion.source.powerbi.m_query.data_classes.Lineage
-    ] = get_data_platform_tables_with_dummy_table(q=q)
+    lineage: List[datahub.ingestion.source.powerbi.m_query.data_classes.Lineage] = (
+        get_data_platform_tables_with_dummy_table(q=q)
+    )
 
     assert len(lineage) == 1
 
@@ -1075,18 +1075,18 @@ def test_unsupported_data_platform():
             is_entry_present = True
             break
 
-    assert (
-        is_entry_present
-    ), 'Info message "Non-Data Platform Expression" should be present in reporter'
+    assert is_entry_present, (
+        'Info message "Non-Data Platform Expression" should be present in reporter'
+    )
 
 
 def test_empty_string_in_m_query():
     # TRIM(TRIM(TRIM(AGENT_NAME, '\"\"'), '+'), '\\'') is in Query
     q = "let\n  Source = Value.NativeQuery(Snowflake.Databases(\"bu10758.ap-unknown-2.fakecomputing.com\",\"operations_analytics_warehouse_prod\",[Role=\"OPERATIONS_ANALYTICS_MEMBER\"]){[Name=\"OPERATIONS_ANALYTICS\"]}[Data], \"select #(lf)UPPER(REPLACE(AGENT_NAME,'-','')) AS CLIENT_DIRECTOR,#(lf)TRIM(TRIM(TRIM(AGENT_NAME, '\"\"'), '+'), '\\'') AS TRIM_AGENT_NAME,#(lf)TIER,#(lf)UPPER(MANAGER),#(lf)TEAM_TYPE,#(lf)DATE_TARGET,#(lf)MONTHID,#(lf)TARGET_TEAM,#(lf)SELLER_EMAIL,#(lf)concat((UPPER(REPLACE(AGENT_NAME,'-',''))), MONTHID) as AGENT_KEY,#(lf)UNIT_TARGET AS SME_Quota,#(lf)AMV_TARGET AS Revenue_Quota,#(lf)SERVICE_QUOTA,#(lf)BL_TARGET,#(lf)SOFTWARE_QUOTA as Software_Quota#(lf)#(lf)from OPERATIONS_ANALYTICS.TRANSFORMED_PROD.V_SME_UNIT_TARGETS inner join OPERATIONS_ANALYTICS.TRANSFORMED_PROD.V_SME_UNIT #(lf)#(lf)where YEAR_TARGET >= 2022#(lf)and TEAM_TYPE = 'Accounting'#(lf)and TARGET_TEAM = 'Enterprise'#(lf)AND TIER = 'Client Director'\", null, [EnableFolding=true])\nin\n    Source"
 
-    lineage: List[
-        datahub.ingestion.source.powerbi.m_query.data_classes.Lineage
-    ] = get_data_platform_tables_with_dummy_table(q=q)
+    lineage: List[datahub.ingestion.source.powerbi.m_query.data_classes.Lineage] = (
+        get_data_platform_tables_with_dummy_table(q=q)
+    )
 
     assert len(lineage) == 1
 
@@ -1108,9 +1108,9 @@ def test_double_quotes_in_alias():
     # SELECT CAST(sales_date AS DATE) AS \"\"Date\"\" in query
     q = 'let \n Source = Sql.Database("abc.com", "DB", [Query="SELECT CAST(sales_date AS DATE) AS ""Date"",#(lf) SUM(cshintrpret) / 60.0      AS ""Total Order All Items"",#(lf)#(tab)#(tab)#(tab)  SUM(cshintrpret) / 60.0 - LAG(SUM(cshintrpret) / 60.0, 1) OVER (ORDER BY CAST(sales_date AS DATE)) AS ""Total minute difference"",#(lf)#(tab)#(tab)#(tab)  SUM(sale_price)  / 60.0 - LAG(SUM(sale_price)  / 60.0, 1) OVER (ORDER BY CAST(sales_date AS DATE)) AS ""Normal minute difference""#(lf)        FROM   [DB].[dbo].[sales_t]#(lf)        WHERE  sales_date >= GETDATE() - 365#(lf)        GROUP  BY CAST(sales_date AS DATE),#(lf)#(tab)#(tab)CAST(sales_date AS TIME);"]) \n in \n Source'
 
-    lineage: List[
-        datahub.ingestion.source.powerbi.m_query.data_classes.Lineage
-    ] = get_data_platform_tables_with_dummy_table(q=q)
+    lineage: List[datahub.ingestion.source.powerbi.m_query.data_classes.Lineage] = (
+        get_data_platform_tables_with_dummy_table(q=q)
+    )
 
     assert len(lineage) == 1
 
@@ -1168,9 +1168,9 @@ def test_m_query_timeout(mock_get_lark_parser):
             is_entry_present = True
             break
 
-    assert (
-        is_entry_present
-    ), 'Warning message "M-Query Parsing Timeout" should be present in reporter'
+    assert is_entry_present, (
+        'Warning message "M-Query Parsing Timeout" should be present in reporter'
+    )
 
 
 def test_comments_in_m_query():
diff --git a/metadata-ingestion/tests/integration/powerbi/test_powerbi.py b/metadata-ingestion/tests/integration/powerbi/test_powerbi.py
index 911d8a9f35139f..7f62e433bc8014 100644
--- a/metadata-ingestion/tests/integration/powerbi/test_powerbi.py
+++ b/metadata-ingestion/tests/integration/powerbi/test_powerbi.py
@@ -828,9 +828,9 @@ def dataset_type_mapping_set_to_all_platform(pipeline: Pipeline) -> None:
     # Generate default dataset_type_mapping and compare it with source_config.dataset_type_mapping
     default_dataset_type_mapping: dict = {}
     for item in SupportedDataPlatform:
-        default_dataset_type_mapping[
-            item.value.powerbi_data_platform_name
-        ] = item.value.datahub_data_platform_name
+        default_dataset_type_mapping[item.value.powerbi_data_platform_name] = (
+            item.value.datahub_data_platform_name
+        )
 
     assert default_dataset_type_mapping == source_config.dataset_type_mapping
 
@@ -1443,9 +1443,9 @@ def test_powerbi_cross_workspace_reference_info_message(
             is_entry_present = True
             break
 
-    assert (
-        is_entry_present
-    ), 'Info message "Missing Lineage For Tile" should be present in reporter'
+    assert is_entry_present, (
+        'Info message "Missing Lineage For Tile" should be present in reporter'
+    )
 
     test_resources_dir = pytestconfig.rootpath / "tests/integration/powerbi"
 
@@ -1568,6 +1568,6 @@ def test_powerbi_app_ingest_info_message(
             is_entry_present = True
             break
 
-    assert (
-        is_entry_present
-    ), "The extract_app flag should be set to false by default. We need to keep this flag as false until all GMS instances are updated to the latest release."
+    assert is_entry_present, (
+        "The extract_app flag should be set to false by default. We need to keep this flag as false until all GMS instances are updated to the latest release."
+    )
diff --git a/metadata-ingestion/tests/integration/salesforce/test_salesforce.py b/metadata-ingestion/tests/integration/salesforce/test_salesforce.py
index 89a37a372df843..9e68ff22a767e2 100644
--- a/metadata-ingestion/tests/integration/salesforce/test_salesforce.py
+++ b/metadata-ingestion/tests/integration/salesforce/test_salesforce.py
@@ -89,15 +89,15 @@ def test_latest_version(mock_sdk):
     )
     SalesforceSource(config=config, ctx=Mock())
     calls = mock_sf._call_salesforce.mock_calls
-    assert (
-        len(calls) == 1
-    ), "We didn't specify version but source didn't call SF API to get the latest one"
-    assert calls[0].ends_with(
-        "/services/data"
-    ), "Source didn't call proper SF API endpoint to get all versions"
-    assert (
-        mock_sf.sf_version == "54.0"
-    ), "API version was not correctly set (see versions_responses.json)"
+    assert len(calls) == 1, (
+        "We didn't specify version but source didn't call SF API to get the latest one"
+    )
+    assert calls[0].ends_with("/services/data"), (
+        "Source didn't call proper SF API endpoint to get all versions"
+    )
+    assert mock_sf.sf_version == "54.0", (
+        "API version was not correctly set (see versions_responses.json)"
+    )
 
 
 @mock.patch("datahub.ingestion.source.salesforce.Salesforce")
@@ -133,12 +133,12 @@ def test_custom_version(mock_sdk):
     SalesforceSource(config=config, ctx=Mock())
 
     calls = mock_sf._call_salesforce.mock_calls
-    assert (
-        len(calls) == 0
-    ), "Source called API to get all versions even though we specified proper version"
-    assert (
-        mock_sdk.call_args.kwargs["version"] == "46.0"
-    ), "API client object was not correctly initialized with the custom version"
+    assert len(calls) == 0, (
+        "Source called API to get all versions even though we specified proper version"
+    )
+    assert mock_sdk.call_args.kwargs["version"] == "46.0", (
+        "API client object was not correctly initialized with the custom version"
+    )
 
 
 @freeze_time(FROZEN_TIME)
diff --git a/metadata-ingestion/tests/integration/sql_server/test_sql_server.py b/metadata-ingestion/tests/integration/sql_server/test_sql_server.py
index b969f77b4c3c18..7fab5fc7dae1ba 100644
--- a/metadata-ingestion/tests/integration/sql_server/test_sql_server.py
+++ b/metadata-ingestion/tests/integration/sql_server/test_sql_server.py
@@ -57,7 +57,7 @@ def test_mssql_ingest(mssql_runner, pytestconfig, tmp_path, mock_time, config_fi
         pytestconfig,
         output_path=tmp_path / "mssql_mces.json",
         golden_path=test_resources_dir
-        / f"golden_files/golden_mces_{config_file.replace('yml','json')}",
+        / f"golden_files/golden_mces_{config_file.replace('yml', 'json')}",
         ignore_paths=[
             r"root\[\d+\]\['aspect'\]\['json'\]\['customProperties'\]\['job_id'\]",
             r"root\[\d+\]\['aspect'\]\['json'\]\['customProperties'\]\['date_created'\]",
diff --git a/metadata-ingestion/tests/integration/unity/test_unity_catalog_ingest.py b/metadata-ingestion/tests/integration/unity/test_unity_catalog_ingest.py
index b8b0563a1d24e5..9c7b86a275f6d0 100644
--- a/metadata-ingestion/tests/integration/unity/test_unity_catalog_ingest.py
+++ b/metadata-ingestion/tests/integration/unity/test_unity_catalog_ingest.py
@@ -205,55 +205,57 @@ def register_mock_data(workspace_client):
         ),
     ]
 
-    workspace_client.tables.get = lambda *args, **kwargs: databricks.sdk.service.catalog.TableInfo.from_dict(
-        {
-            "name": "quickstart_table",
-            "catalog_name": "quickstart_catalog",
-            "schema_name": "quickstart_schema",
-            "table_type": "MANAGED",
-            "data_source_format": "DELTA",
-            "columns": [
-                {
-                    "name": "columnA",
-                    "type_text": "int",
-                    "type_json": '{"name":"columnA","type":"integer","nullable":true,"metadata":{}}',
-                    "type_name": "INT",
-                    "type_precision": 0,
-                    "type_scale": 0,
-                    "position": 0,
-                    "nullable": True,
-                },
-                {
-                    "name": "columnB",
-                    "type_text": "string",
-                    "type_json": '{"name":"columnB","type":"string","nullable":true,"metadata":{}}',
-                    "type_name": "STRING",
-                    "type_precision": 0,
-                    "type_scale": 0,
-                    "position": 1,
-                    "nullable": True,
+    workspace_client.tables.get = (
+        lambda *args, **kwargs: databricks.sdk.service.catalog.TableInfo.from_dict(
+            {
+                "name": "quickstart_table",
+                "catalog_name": "quickstart_catalog",
+                "schema_name": "quickstart_schema",
+                "table_type": "MANAGED",
+                "data_source_format": "DELTA",
+                "columns": [
+                    {
+                        "name": "columnA",
+                        "type_text": "int",
+                        "type_json": '{"name":"columnA","type":"integer","nullable":true,"metadata":{}}',
+                        "type_name": "INT",
+                        "type_precision": 0,
+                        "type_scale": 0,
+                        "position": 0,
+                        "nullable": True,
+                    },
+                    {
+                        "name": "columnB",
+                        "type_text": "string",
+                        "type_json": '{"name":"columnB","type":"string","nullable":true,"metadata":{}}',
+                        "type_name": "STRING",
+                        "type_precision": 0,
+                        "type_scale": 0,
+                        "position": 1,
+                        "nullable": True,
+                    },
+                ],
+                "storage_location": "s3://db-02eec1f70bfe4115445be9fdb1aac6ac-s3-root-bucket/metastore/2c983545-d403-4f87-9063-5b7e3b6d3736/tables/cff27aa1-1c6a-4d78-b713-562c660c2896",
+                "owner": "account users",
+                "properties": {
+                    "delta.lastCommitTimestamp": "1666185711000",
+                    "delta.lastUpdateVersion": "1",
+                    "delta.minReaderVersion": "1",
+                    "delta.minWriterVersion": "2",
+                    "spark.sql.statistics.numRows": "10",
+                    "spark.sql.statistics.totalSize": "512",
                 },
-            ],
-            "storage_location": "s3://db-02eec1f70bfe4115445be9fdb1aac6ac-s3-root-bucket/metastore/2c983545-d403-4f87-9063-5b7e3b6d3736/tables/cff27aa1-1c6a-4d78-b713-562c660c2896",
-            "owner": "account users",
-            "properties": {
-                "delta.lastCommitTimestamp": "1666185711000",
-                "delta.lastUpdateVersion": "1",
-                "delta.minReaderVersion": "1",
-                "delta.minWriterVersion": "2",
-                "spark.sql.statistics.numRows": "10",
-                "spark.sql.statistics.totalSize": "512",
-            },
-            "generation": 2,
-            "metastore_id": "2c983545-d403-4f87-9063-5b7e3b6d3736",
-            "full_name": "quickstart_catalog.quickstart_schema.quickstart_table",
-            "data_access_configuration_id": "00000000-0000-0000-0000-000000000000",
-            "created_at": 1666185698688,
-            "created_by": "abc@acryl.io",
-            "updated_at": 1666186049633,
-            "updated_by": "abc@acryl.io",
-            "table_id": "cff27aa1-1c6a-4d78-b713-562c660c2896",
-        }
+                "generation": 2,
+                "metastore_id": "2c983545-d403-4f87-9063-5b7e3b6d3736",
+                "full_name": "quickstart_catalog.quickstart_schema.quickstart_table",
+                "data_access_configuration_id": "00000000-0000-0000-0000-000000000000",
+                "created_at": 1666185698688,
+                "created_by": "abc@acryl.io",
+                "updated_at": 1666186049633,
+                "updated_by": "abc@acryl.io",
+                "table_id": "cff27aa1-1c6a-4d78-b713-562c660c2896",
+            }
+        )
     )
 
     workspace_client.service_principals.list.return_value = [
@@ -437,9 +439,7 @@ def test_ingestion(pytestconfig, tmp_path, requests_mock):
         "datahub.ingestion.source.unity.proxy.WorkspaceClient"
     ) as mock_client, patch.object(
         HiveMetastoreProxy, "get_inspector"
-    ) as get_inspector, patch.object(
-        HiveMetastoreProxy, "_execute_sql"
-    ) as execute_sql:
+    ) as get_inspector, patch.object(HiveMetastoreProxy, "_execute_sql") as execute_sql:
         workspace_client: mock.MagicMock = mock.MagicMock()
         mock_client.return_value = workspace_client
         register_mock_data(workspace_client)
diff --git a/metadata-ingestion/tests/performance/databricks/generator.py b/metadata-ingestion/tests/performance/databricks/generator.py
index 29df325d856a1a..b11771e55b2c9e 100644
--- a/metadata-ingestion/tests/performance/databricks/generator.py
+++ b/metadata-ingestion/tests/performance/databricks/generator.py
@@ -167,7 +167,7 @@ def _generate_insert_lineage(table: Table, upstream: Table) -> str:
 def _generate_view_definition(view: View) -> str:
     from_statement = f"FROM {_quote_table(view.upstreams[0])} t0"
     join_statement = " ".join(
-        f"JOIN {_quote_table(upstream)} t{i+1} ON t0.id = t{i+1}.id"
+        f"JOIN {_quote_table(upstream)} t{i + 1} ON t0.id = t{i + 1}.id"
         for i, upstream in enumerate(view.upstreams[1:])
     )
     return f"CREATE VIEW {_quote_table(view)} AS SELECT * {from_statement} {join_statement} {view.definition}"
diff --git a/metadata-ingestion/tests/test_helpers/mce_helpers.py b/metadata-ingestion/tests/test_helpers/mce_helpers.py
index 0105e6d596970b..d70a440dab0657 100644
--- a/metadata-ingestion/tests/test_helpers/mce_helpers.py
+++ b/metadata-ingestion/tests/test_helpers/mce_helpers.py
@@ -300,9 +300,9 @@ def assert_for_each_entity(
     for urn, aspect_val in aspect_map.items():
         if aspect_val is not None:
             for f in aspect_field_matcher:
-                assert aspect_field_matcher[f] == _get_element(
-                    aspect_val, [f]
-                ), f"urn: {urn} -> Field {f} must match value {aspect_field_matcher[f]}, found {_get_element(aspect_val, [f])}"
+                assert aspect_field_matcher[f] == _get_element(aspect_val, [f]), (
+                    f"urn: {urn} -> Field {f} must match value {aspect_field_matcher[f]}, found {_get_element(aspect_val, [f])}"
+                )
             success.append(urn)
         elif urn not in exception_urns:
             print(f"Adding {urn} to failures")
@@ -361,9 +361,9 @@ def assert_entity_mcp_aspect(
             assert mcp.aspect
             aspect_val = mcp.aspect.to_obj()
             for f in aspect_field_matcher:
-                assert aspect_field_matcher[f] == _get_element(
-                    aspect_val, [f]
-                ), f"urn: {mcp.entityUrn} -> Field {f} must match value {aspect_field_matcher[f]}, found {_get_element(aspect_val, [f])}"
+                assert aspect_field_matcher[f] == _get_element(aspect_val, [f]), (
+                    f"urn: {mcp.entityUrn} -> Field {f} must match value {aspect_field_matcher[f]}, found {_get_element(aspect_val, [f])}"
+                )
                 matches = matches + 1
     return matches
 
diff --git a/metadata-ingestion/tests/test_helpers/state_helpers.py b/metadata-ingestion/tests/test_helpers/state_helpers.py
index f68aef742fc730..c469db6ce8cf80 100644
--- a/metadata-ingestion/tests/test_helpers/state_helpers.py
+++ b/metadata-ingestion/tests/test_helpers/state_helpers.py
@@ -104,7 +104,7 @@ def monkey_patch_get_latest_timeseries_value(
 
 @pytest.fixture
 def mock_datahub_graph_instance(
-    mock_datahub_graph: Callable[[DatahubClientConfig], DataHubGraph]
+    mock_datahub_graph: Callable[[DatahubClientConfig], DataHubGraph],
 ) -> DataHubGraph:
     return mock_datahub_graph(DatahubClientConfig(server="http://fake.domain.local"))
 
diff --git a/metadata-ingestion/tests/unit/api/entities/dataproducts/test_dataproduct.py b/metadata-ingestion/tests/unit/api/entities/dataproducts/test_dataproduct.py
index e796f0b3f37219..dad7662d9ad00b 100644
--- a/metadata-ingestion/tests/unit/api/entities/dataproducts/test_dataproduct.py
+++ b/metadata-ingestion/tests/unit/api/entities/dataproducts/test_dataproduct.py
@@ -26,7 +26,7 @@ def base_entity_metadata():
 
 @pytest.fixture
 def base_mock_graph(
-    base_entity_metadata: Dict[str, Dict[str, Any]]
+    base_entity_metadata: Dict[str, Dict[str, Any]],
 ) -> MockDataHubGraph:
     return MockDataHubGraph(entity_graph=base_entity_metadata)
 
diff --git a/metadata-ingestion/tests/unit/api/source_helpers/test_ensure_aspect_size.py b/metadata-ingestion/tests/unit/api/source_helpers/test_ensure_aspect_size.py
index bdf1e0a2e0e860..8a45efb46893ae 100644
--- a/metadata-ingestion/tests/unit/api/source_helpers/test_ensure_aspect_size.py
+++ b/metadata-ingestion/tests/unit/api/source_helpers/test_ensure_aspect_size.py
@@ -159,9 +159,9 @@ def test_ensure_size_of_proper_dataset_profile(processor):
     processor.ensure_dataset_profile_size(
         "urn:li:dataset:(s3, dummy_dataset, DEV)", profile
     )
-    assert orig_repr == json.dumps(
-        profile.to_obj()
-    ), "Aspect was modified in case where workunit processor should have been no-op"
+    assert orig_repr == json.dumps(profile.to_obj()), (
+        "Aspect was modified in case where workunit processor should have been no-op"
+    )
 
 
 @freeze_time("2023-01-02 00:00:00")
@@ -177,9 +177,9 @@ def test_ensure_size_of_too_big_schema_metadata(processor):
     # +100kb is completely arbitrary, but we are truncating the aspect based on schema fields size only, not total taken
     # by other parameters of the aspect - it is reasonable approach though - schema fields is the only field in schema
     # metadata which can be expected to grow out of control
-    assert (
-        len(json.dumps(schema.to_obj())) < INGEST_MAX_PAYLOAD_BYTES + 100000
-    ), "Aspect exceeded acceptable size"
+    assert len(json.dumps(schema.to_obj())) < INGEST_MAX_PAYLOAD_BYTES + 100000, (
+        "Aspect exceeded acceptable size"
+    )
 
 
 @freeze_time("2023-01-02 00:00:00")
@@ -189,9 +189,9 @@ def test_ensure_size_of_proper_schema_metadata(processor):
     processor.ensure_schema_metadata_size(
         "urn:li:dataset:(s3, dummy_dataset, DEV)", schema
     )
-    assert orig_repr == json.dumps(
-        schema.to_obj()
-    ), "Aspect was modified in case where workunit processor should have been no-op"
+    assert orig_repr == json.dumps(schema.to_obj()), (
+        "Aspect was modified in case where workunit processor should have been no-op"
+    )
 
 
 @freeze_time("2023-01-02 00:00:00")
@@ -214,9 +214,9 @@ def test_ensure_size_of_too_big_dataset_profile(processor):
     )
     assert expected_profile.fieldProfiles
     expected_profile.fieldProfiles.insert(4, reduced_field)
-    assert json.dumps(profile.to_obj()) == json.dumps(
-        expected_profile.to_obj()
-    ), "Field 'big' was not properly removed from aspect due to its size"
+    assert json.dumps(profile.to_obj()) == json.dumps(expected_profile.to_obj()), (
+        "Field 'big' was not properly removed from aspect due to its size"
+    )
 
 
 @freeze_time("2023-01-02 00:00:00")
diff --git a/metadata-ingestion/tests/unit/bigquery/test_bigquery_lineage.py b/metadata-ingestion/tests/unit/bigquery/test_bigquery_lineage.py
index a1981ccf767916..f494ed78211dcf 100644
--- a/metadata-ingestion/tests/unit/bigquery/test_bigquery_lineage.py
+++ b/metadata-ingestion/tests/unit/bigquery/test_bigquery_lineage.py
@@ -232,9 +232,9 @@ def fake_schema_metadata(entity_urn: str) -> models.SchemaMetadataClass:
         else []
         for fine_grained_lineage in upstream_lineage.fineGrainedLineages
     ]
-    assert all(
-        urn in expected_schema_field_urns for urn in actual_schema_field_urns
-    ), "Some expected column URNs are missing from fine grained lineage."
+    assert all(urn in expected_schema_field_urns for urn in actual_schema_field_urns), (
+        "Some expected column URNs are missing from fine grained lineage."
+    )
 
 
 def test_lineage_for_external_bq_table_no_column_lineage(mock_datahub_graph_instance):
@@ -286,9 +286,9 @@ def fake_schema_metadata(entity_urn: str) -> Optional[models.SchemaMetadataClass
     assert len(upstream_lineage.upstreams) == 3
     # Extracting dataset URNs from upstream_lineage.upstreams
     actual_dataset_urns = [upstream.dataset for upstream in upstream_lineage.upstreams]
-    assert all(
-        urn in actual_dataset_urns for urn in expected_dataset_urns
-    ), "Some expected dataset URNs are missing from upstream lineage."
+    assert all(urn in actual_dataset_urns for urn in expected_dataset_urns), (
+        "Some expected dataset URNs are missing from upstream lineage."
+    )
     assert upstream_lineage.fineGrainedLineages is None
 
 
diff --git a/metadata-ingestion/tests/unit/cli/assertion/test_compile.py b/metadata-ingestion/tests/unit/cli/assertion/test_compile.py
index 47253b5b0d71ea..0a1870d83212e8 100644
--- a/metadata-ingestion/tests/unit/cli/assertion/test_compile.py
+++ b/metadata-ingestion/tests/unit/cli/assertion/test_compile.py
@@ -37,6 +37,6 @@ def test_compile_assertion_config_spec_for_snowflake(pytestconfig, tmp_path):
 
     for file_name in output_file_names:
         assert os.path.exists(tmp_path / file_name)
-        assert filecmp.cmp(
-            golden_file_path / file_name, tmp_path / file_name
-        ), f"{file_name} is not as expected"
+        assert filecmp.cmp(golden_file_path / file_name, tmp_path / file_name), (
+            f"{file_name} is not as expected"
+        )
diff --git a/metadata-ingestion/tests/unit/redshift/test_redshift_lineage.py b/metadata-ingestion/tests/unit/redshift/test_redshift_lineage.py
index 941d13be0a6139..27045dfc656cbe 100644
--- a/metadata-ingestion/tests/unit/redshift/test_redshift_lineage.py
+++ b/metadata-ingestion/tests/unit/redshift/test_redshift_lineage.py
@@ -262,8 +262,7 @@ def test_collapse_temp_lineage():
     lineage_item: LineageItem = lineage_extractor._lineage_map[target_urn]
 
     assert list(lineage_item.upstreams)[0].urn == (
-        "urn:li:dataset:(urn:li:dataPlatform:redshift,"
-        "test.public.player_activity,PROD)"
+        "urn:li:dataset:(urn:li:dataPlatform:redshift,test.public.player_activity,PROD)"
     )
 
     assert lineage_item.cll is not None
@@ -276,8 +275,7 @@ def test_collapse_temp_lineage():
     assert lineage_item.cll[0].downstream.column == "price"
 
     assert lineage_item.cll[0].upstreams[0].table == (
-        "urn:li:dataset:(urn:li:dataPlatform:redshift,"
-        "test.public.player_activity,PROD)"
+        "urn:li:dataset:(urn:li:dataPlatform:redshift,test.public.player_activity,PROD)"
     )
 
     assert lineage_item.cll[0].upstreams[0].column == "price"
@@ -441,8 +439,7 @@ def test_collapse_temp_recursive_cll_lineage():
     )
 
     assert target_dataset_cll[0].upstreams[0].table == (
-        "urn:li:dataset:(urn:li:dataPlatform:redshift,"
-        "dev.public.player_activity,PROD)"
+        "urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.player_activity,PROD)"
     )
     assert target_dataset_cll[0].upstreams[0].column == "price"
 
@@ -638,8 +635,7 @@ def test_collapse_temp_recursive_with_compex_column_cll_lineage():
     )
 
     assert target_dataset_cll[0].upstreams[0].table == (
-        "urn:li:dataset:(urn:li:dataPlatform:redshift,"
-        "dev.public.player_activity,PROD)"
+        "urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.player_activity,PROD)"
     )
     assert target_dataset_cll[0].upstreams[0].column == "price"
     assert target_dataset_cll[0].upstreams[1].column == "tax"
diff --git a/metadata-ingestion/tests/unit/serde/test_codegen.py b/metadata-ingestion/tests/unit/serde/test_codegen.py
index b49f7153129136..13fcf3d919cc03 100644
--- a/metadata-ingestion/tests/unit/serde/test_codegen.py
+++ b/metadata-ingestion/tests/unit/serde/test_codegen.py
@@ -156,9 +156,9 @@ def _err(msg: str) -> None:
                         f"entity {entity_type}: aspect {aspect_name} is missing from the entity registry"
                     )
 
-    assert (
-        not errors
-    ), f'To fix these errors, run "UPDATE_ENTITY_REGISTRY=true pytest {__file__}"'
+    assert not errors, (
+        f'To fix these errors, run "UPDATE_ENTITY_REGISTRY=true pytest {__file__}"'
+    )
 
 
 def test_enum_options():
diff --git a/metadata-ingestion/tests/unit/stateful_ingestion/state/test_stateful_ingestion.py b/metadata-ingestion/tests/unit/stateful_ingestion/state/test_stateful_ingestion.py
index 96ab8f7a01a386..e69727f73b6bf4 100644
--- a/metadata-ingestion/tests/unit/stateful_ingestion/state/test_stateful_ingestion.py
+++ b/metadata-ingestion/tests/unit/stateful_ingestion/state/test_stateful_ingestion.py
@@ -226,9 +226,9 @@ def test_stateful_ingestion(pytestconfig, tmp_path, mock_time):
         pipeline_run1_config: Dict[str, Dict[str, Dict[str, Any]]] = dict(  # type: ignore
             base_pipeline_config  # type: ignore
         )
-        pipeline_run1_config["sink"]["config"][
-            "filename"
-        ] = f"{tmp_path}/{output_file_name}"
+        pipeline_run1_config["sink"]["config"]["filename"] = (
+            f"{tmp_path}/{output_file_name}"
+        )
         pipeline_run1 = Pipeline.create(pipeline_run1_config)
         pipeline_run1.run()
         pipeline_run1.raise_from_status()
@@ -254,16 +254,18 @@ def test_stateful_ingestion(pytestconfig, tmp_path, mock_time):
     ) as mock_state:
         mock_state.return_value = GenericCheckpointState(serde="utf-8")
         pipeline_run2 = None
-        pipeline_run2_config: Dict[str, Dict[str, Dict[str, Any]]] = dict(base_pipeline_config)  # type: ignore
+        pipeline_run2_config: Dict[str, Dict[str, Dict[str, Any]]] = dict(
+            base_pipeline_config  # type: ignore
+        )
         pipeline_run2_config["source"]["config"]["dataset_patterns"] = {
             "allow": ["dummy_dataset1", "dummy_dataset2"],
         }
         pipeline_run2_config["source"]["config"]["dpi_id_to_ingest"] = "job2"
         pipeline_run2_config["source"]["config"]["query_id_to_ingest"] = "query2"
 
-        pipeline_run2_config["sink"]["config"][
-            "filename"
-        ] = f"{tmp_path}/{output_file_name_after_deleted}"
+        pipeline_run2_config["sink"]["config"]["filename"] = (
+            f"{tmp_path}/{output_file_name_after_deleted}"
+        )
         pipeline_run2 = Pipeline.create(pipeline_run2_config)
         pipeline_run2.run()
         pipeline_run2.raise_from_status()
@@ -370,9 +372,9 @@ def test_stateful_ingestion_failure(pytestconfig, tmp_path, mock_time):
         pipeline_run1_config: Dict[str, Dict[str, Dict[str, Any]]] = dict(  # type: ignore
             base_pipeline_config  # type: ignore
         )
-        pipeline_run1_config["sink"]["config"][
-            "filename"
-        ] = f"{tmp_path}/{output_file_name}"
+        pipeline_run1_config["sink"]["config"]["filename"] = (
+            f"{tmp_path}/{output_file_name}"
+        )
         pipeline_run1 = Pipeline.create(pipeline_run1_config)
         pipeline_run1.run()
         pipeline_run1.raise_from_status()
@@ -398,14 +400,16 @@ def test_stateful_ingestion_failure(pytestconfig, tmp_path, mock_time):
     ) as mock_state:
         mock_state.return_value = GenericCheckpointState(serde="utf-8")
         pipeline_run2 = None
-        pipeline_run2_config: Dict[str, Dict[str, Dict[str, Any]]] = dict(base_pipeline_config)  # type: ignore
+        pipeline_run2_config: Dict[str, Dict[str, Dict[str, Any]]] = dict(
+            base_pipeline_config  # type: ignore
+        )
         pipeline_run2_config["source"]["config"]["dataset_patterns"] = {
             "allow": ["dummy_dataset1", "dummy_dataset2"],
         }
         pipeline_run2_config["source"]["config"]["report_failure"] = True
-        pipeline_run2_config["sink"]["config"][
-            "filename"
-        ] = f"{tmp_path}/{output_file_name_after_deleted}"
+        pipeline_run2_config["sink"]["config"]["filename"] = (
+            f"{tmp_path}/{output_file_name_after_deleted}"
+        )
         pipeline_run2 = Pipeline.create(pipeline_run2_config)
         pipeline_run2.run()
         pipeline_run2.pretty_print_summary()
diff --git a/metadata-ingestion/tests/unit/test_confluent_schema_registry.py b/metadata-ingestion/tests/unit/test_confluent_schema_registry.py
index 3500636f00eddf..effa6ba85acaeb 100644
--- a/metadata-ingestion/tests/unit/test_confluent_schema_registry.py
+++ b/metadata-ingestion/tests/unit/test_confluent_schema_registry.py
@@ -85,16 +85,18 @@ def new_get_latest_version(subject_name: str) -> RegisteredSchema:
             "get_latest_version",
             new_get_latest_version,
         ):
-            schema_str = confluent_schema_registry.get_schema_str_replace_confluent_ref_avro(
-                # The external reference would match by name.
-                schema=Schema(
-                    schema_str=schema_str_orig,
-                    schema_type="AVRO",
-                    references=[
-                        SchemaReference(
-                            name="TestTopic1", subject="schema_subject_1", version=1
-                        )
-                    ],
+            schema_str = (
+                confluent_schema_registry.get_schema_str_replace_confluent_ref_avro(
+                    # The external reference would match by name.
+                    schema=Schema(
+                        schema_str=schema_str_orig,
+                        schema_type="AVRO",
+                        references=[
+                            SchemaReference(
+                                name="TestTopic1", subject="schema_subject_1", version=1
+                            )
+                        ],
+                    )
                 )
             )
             assert schema_str == ConfluentSchemaRegistry._compact_schema(
@@ -106,16 +108,18 @@ def new_get_latest_version(subject_name: str) -> RegisteredSchema:
             "get_latest_version",
             new_get_latest_version,
         ):
-            schema_str = confluent_schema_registry.get_schema_str_replace_confluent_ref_avro(
-                # The external reference would match by subject.
-                schema=Schema(
-                    schema_str=schema_str_orig,
-                    schema_type="AVRO",
-                    references=[
-                        SchemaReference(
-                            name="schema_subject_1", subject="TestTopic1", version=1
-                        )
-                    ],
+            schema_str = (
+                confluent_schema_registry.get_schema_str_replace_confluent_ref_avro(
+                    # The external reference would match by subject.
+                    schema=Schema(
+                        schema_str=schema_str_orig,
+                        schema_type="AVRO",
+                        references=[
+                            SchemaReference(
+                                name="schema_subject_1", subject="TestTopic1", version=1
+                            )
+                        ],
+                    )
                 )
             )
             assert schema_str == ConfluentSchemaRegistry._compact_schema(
diff --git a/metadata-ingestion/tests/unit/test_dbt_source.py b/metadata-ingestion/tests/unit/test_dbt_source.py
index ff22ffedc6228f..d7899af69f8405 100644
--- a/metadata-ingestion/tests/unit/test_dbt_source.py
+++ b/metadata-ingestion/tests/unit/test_dbt_source.py
@@ -475,9 +475,9 @@ def test_get_column_type_redshift():
     # Test 'super' type which should not show any warnings/errors
     result_super = get_column_type(report, dataset_name, "super", "redshift")
     assert isinstance(result_super.type, NullTypeClass)
-    assert (
-        len(report.infos) == 0
-    ), "No warnings should be generated for known SUPER type"
+    assert len(report.infos) == 0, (
+        "No warnings should be generated for known SUPER type"
+    )
 
     # Test unknown type, which generates a warning but resolves to NullTypeClass
     unknown_type = "unknown_type"
diff --git a/metadata-ingestion/tests/unit/test_iceberg.py b/metadata-ingestion/tests/unit/test_iceberg.py
index 3afa26b35dfe9f..48524450caf36e 100644
--- a/metadata-ingestion/tests/unit/test_iceberg.py
+++ b/metadata-ingestion/tests/unit/test_iceberg.py
@@ -88,15 +88,15 @@ def assert_field(
     expected_nullable: bool,
     expected_type: Any,
 ) -> None:
-    assert (
-        schema_field.description == expected_description
-    ), f"Field description '{schema_field.description}' is different from expected description '{expected_description}'"
-    assert (
-        schema_field.nullable == expected_nullable
-    ), f"Field nullable '{schema_field.nullable}' is different from expected nullable '{expected_nullable}'"
-    assert isinstance(
-        schema_field.type.type, expected_type
-    ), f"Field type {schema_field.type.type} is different from expected type {expected_type}"
+    assert schema_field.description == expected_description, (
+        f"Field description '{schema_field.description}' is different from expected description '{expected_description}'"
+    )
+    assert schema_field.nullable == expected_nullable, (
+        f"Field nullable '{schema_field.nullable}' is different from expected nullable '{expected_nullable}'"
+    )
+    assert isinstance(schema_field.type.type, expected_type), (
+        f"Field type {schema_field.type.type} is different from expected type {expected_type}"
+    )
 
 
 def test_config_no_catalog():
@@ -219,9 +219,9 @@ def test_iceberg_primitive_type_to_schema_field(
     ]:
         schema = Schema(column)
         schema_fields = iceberg_source_instance._get_schema_fields_for_schema(schema)
-        assert (
-            len(schema_fields) == 1
-        ), f"Expected 1 field, but got {len(schema_fields)}"
+        assert len(schema_fields) == 1, (
+            f"Expected 1 field, but got {len(schema_fields)}"
+        )
         assert_field(
             schema_fields[0],
             column.doc,
@@ -300,19 +300,19 @@ def test_iceberg_list_to_schema_field(
         iceberg_source_instance = with_iceberg_source()
         schema = Schema(list_column)
         schema_fields = iceberg_source_instance._get_schema_fields_for_schema(schema)
-        assert (
-            len(schema_fields) == 1
-        ), f"Expected 1 field, but got {len(schema_fields)}"
+        assert len(schema_fields) == 1, (
+            f"Expected 1 field, but got {len(schema_fields)}"
+        )
         assert_field(
             schema_fields[0], list_column.doc, list_column.optional, ArrayTypeClass
         )
-        assert isinstance(
-            schema_fields[0].type.type, ArrayType
-        ), f"Field type {schema_fields[0].type.type} was expected to be {ArrayType}"
+        assert isinstance(schema_fields[0].type.type, ArrayType), (
+            f"Field type {schema_fields[0].type.type} was expected to be {ArrayType}"
+        )
         arrayType: ArrayType = schema_fields[0].type.type
-        assert arrayType.nestedType == [
-            expected_array_nested_type
-        ], f"List Field nested type {arrayType.nestedType} was expected to be {expected_array_nested_type}"
+        assert arrayType.nestedType == [expected_array_nested_type], (
+            f"List Field nested type {arrayType.nestedType} was expected to be {expected_array_nested_type}"
+        )
 
 
 @pytest.mark.parametrize(
@@ -387,9 +387,9 @@ def test_iceberg_map_to_schema_field(
         schema_fields = iceberg_source_instance._get_schema_fields_for_schema(schema)
         # Converting an Iceberg Map type will be done by creating an array of struct(key, value) records.
         # The first field will be the array.
-        assert (
-            len(schema_fields) == 3
-        ), f"Expected 3 fields, but got {len(schema_fields)}"
+        assert len(schema_fields) == 3, (
+            f"Expected 3 fields, but got {len(schema_fields)}"
+        )
         assert_field(
             schema_fields[0], map_column.doc, map_column.optional, ArrayTypeClass
         )
diff --git a/metadata-ingestion/tests/unit/test_postgres_source.py b/metadata-ingestion/tests/unit/test_postgres_source.py
index 91a62b603bb584..25140cf1b997f8 100644
--- a/metadata-ingestion/tests/unit/test_postgres_source.py
+++ b/metadata-ingestion/tests/unit/test_postgres_source.py
@@ -21,9 +21,7 @@ def test_initial_database(create_engine_mock):
 
 @patch("datahub.ingestion.source.sql.postgres.create_engine")
 def test_get_inspectors_multiple_databases(create_engine_mock):
-    execute_mock = (
-        create_engine_mock.return_value.connect.return_value.__enter__.return_value.execute
-    )
+    execute_mock = create_engine_mock.return_value.connect.return_value.__enter__.return_value.execute
     execute_mock.return_value = [{"datname": "db1"}, {"datname": "db2"}]
 
     config = PostgresConfig.parse_obj({**_base_config(), "initial_database": "db0"})
@@ -37,9 +35,7 @@ def test_get_inspectors_multiple_databases(create_engine_mock):
 
 @patch("datahub.ingestion.source.sql.postgres.create_engine")
 def tests_get_inspectors_with_database_provided(create_engine_mock):
-    execute_mock = (
-        create_engine_mock.return_value.connect.return_value.__enter__.return_value.execute
-    )
+    execute_mock = create_engine_mock.return_value.connect.return_value.__enter__.return_value.execute
     execute_mock.return_value = [{"datname": "db1"}, {"datname": "db2"}]
 
     config = PostgresConfig.parse_obj({**_base_config(), "database": "custom_db"})
@@ -51,9 +47,7 @@ def tests_get_inspectors_with_database_provided(create_engine_mock):
 
 @patch("datahub.ingestion.source.sql.postgres.create_engine")
 def tests_get_inspectors_with_sqlalchemy_uri_provided(create_engine_mock):
-    execute_mock = (
-        create_engine_mock.return_value.connect.return_value.__enter__.return_value.execute
-    )
+    execute_mock = create_engine_mock.return_value.connect.return_value.__enter__.return_value.execute
     execute_mock.return_value = [{"datname": "db1"}, {"datname": "db2"}]
 
     config = PostgresConfig.parse_obj(
diff --git a/metadata-ingestion/tests/unit/test_rest_sink.py b/metadata-ingestion/tests/unit/test_rest_sink.py
index a76f96039c2c71..564cf613c04464 100644
--- a/metadata-ingestion/tests/unit/test_rest_sink.py
+++ b/metadata-ingestion/tests/unit/test_rest_sink.py
@@ -283,9 +283,9 @@
 def test_datahub_rest_emitter(requests_mock, record, path, snapshot):
     def match_request_text(request: requests.Request) -> bool:
         requested_snapshot = request.json()
-        assert (
-            requested_snapshot == snapshot
-        ), f"Expected snapshot to be {json.dumps(snapshot)}, got {json.dumps(requested_snapshot)}"
+        assert requested_snapshot == snapshot, (
+            f"Expected snapshot to be {json.dumps(snapshot)}, got {json.dumps(requested_snapshot)}"
+        )
         return True
 
     requests_mock.post(
diff --git a/metadata-ingestion/tests/unit/utilities/test_lossy_collections.py b/metadata-ingestion/tests/unit/utilities/test_lossy_collections.py
index 43967367dff389..e137d671e95d71 100644
--- a/metadata-ingestion/tests/unit/utilities/test_lossy_collections.py
+++ b/metadata-ingestion/tests/unit/utilities/test_lossy_collections.py
@@ -34,7 +34,7 @@ def test_lossyset_sampling(length, sampling):
     assert len(lossy_set) == min(10, length)
     assert lossy_set.sampled is sampling
     if sampling:
-        assert f"... sampled with at most {length-10} elements missing" in str(
+        assert f"... sampled with at most {length - 10} elements missing" in str(
             lossy_set
         )
     else:
@@ -66,7 +66,7 @@ def test_lossydict_sampling(length, sampling, sub_length):
                 element_length_map[i] = len(lossy_dict[i])
 
             current_list = lossy_dict.get(i, LossyList())
-            current_list.append(f"{i}:{round(time.time(),2)} Hello World")
+            current_list.append(f"{i}:{round(time.time(), 2)} Hello World")
             lossy_dict[i] = current_list
             element_length_map[i] += 1
 
diff --git a/metadata-ingestion/tests/unit/utilities/test_partition_executor.py b/metadata-ingestion/tests/unit/utilities/test_partition_executor.py
index ce211c2d618062..89e95d185e8028 100644
--- a/metadata-ingestion/tests/unit/utilities/test_partition_executor.py
+++ b/metadata-ingestion/tests/unit/utilities/test_partition_executor.py
@@ -37,9 +37,9 @@ def task(key: str, id: str) -> None:
         saw_keys_in_parallel = False
         while executing_tasks or not done_tasks:
             keys_executing = [key for key, _ in executing_tasks]
-            assert list(sorted(keys_executing)) == list(
-                sorted(set(keys_executing))
-            ), "partitioning not working"
+            assert list(sorted(keys_executing)) == list(sorted(set(keys_executing))), (
+                "partitioning not working"
+            )
 
             if len(keys_executing) == 2:
                 saw_keys_in_parallel = True
diff --git a/metadata-ingestion/tests/unit/utilities/test_threaded_iterator_executor.py b/metadata-ingestion/tests/unit/utilities/test_threaded_iterator_executor.py
index 35c44c7b4a8479..fb7e2266e1c9d3 100644
--- a/metadata-ingestion/tests/unit/utilities/test_threaded_iterator_executor.py
+++ b/metadata-ingestion/tests/unit/utilities/test_threaded_iterator_executor.py
@@ -4,7 +4,7 @@
 def test_threaded_iterator_executor():
     def table_of(i):
         for j in range(1, 11):
-            yield f"{i}x{j}={i*j}"
+            yield f"{i}x{j}={i * j}"
 
     assert {
         res
diff --git a/smoke-test/build.gradle b/smoke-test/build.gradle
index f3dc1de830ccef..c38468ca8cd8b0 100644
--- a/smoke-test/build.gradle
+++ b/smoke-test/build.gradle
@@ -73,16 +73,16 @@ task installDev(type: Exec) {
 task pythonLint(type: Exec, dependsOn: installDev) {
     commandLine 'bash', '-c',
         "source ${venv_name}/bin/activate && set -x && " +
-        "black --check --diff tests/ && " +
         "ruff check tests/ && " +
+        "ruff format --check tests/ && " +
         "mypy tests/"
 }
 
 task pythonLintFix(type: Exec, dependsOn: installDev) {
     commandLine 'bash', '-c',
         "source ${venv_name}/bin/activate && set -x && " +
-        "black tests/ && " +
         "ruff check --fix tests/ && " +
+        "ruff format tests/ && " +
         "mypy tests/"
 }
 
@@ -154,3 +154,19 @@ task lint {
 task lintFix {
     dependsOn pythonLintFix
 }
+
+task cleanPythonCache(type: Exec) {
+  commandLine 'bash', '-c',
+    "find . -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete -o -type d -empty -delete"
+}
+
+
+clean {
+  delete venv_name
+  delete 'build'
+  delete 'dist'
+  delete '.ruff_cache'
+  delete '.mypy_cache'
+  delete '.pytest_cache'
+}
+clean.dependsOn cleanPythonCache
\ No newline at end of file
diff --git a/smoke-test/pyproject.toml b/smoke-test/pyproject.toml
index 55f037db2effea..55e286c73c01b9 100644
--- a/smoke-test/pyproject.toml
+++ b/smoke-test/pyproject.toml
@@ -7,20 +7,21 @@ name = "smoke-test"
 version = "0.0.0"
 description = ""
 authors = [
-	{ name="Acryl Data", email="eng@acryl.io" },
+    { name="Acryl Data", email="eng@acryl.io" },
 ]
 requires-python = ">=3.9"
 
+[tool.ruff]
+# Enable ruff format
+target-version = "py310"
+line-length = 88
+extend-exclude = ["tmp", "venv"]
 
-[tool.black]
-extend-exclude = '''
-# A regex preceded with ^/ will apply only to files and directories
-# in the root of the project.
-tmp
-venv
-'''
-include = '\.pyi?$'
-target-version = ['py310']
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+skip-magic-trailing-comma = false
+line-ending = "auto"
 
 [tool.ruff.lint.isort]
 combine-as-imports = true
@@ -40,19 +41,19 @@ required-imports = []
 classes = ["typing"]
 
 [tool.ruff.lint]
-select = [
-    "B",
-    "C90",
-    "E",
-    "F",
-    "I", # For isort
-    "TID",
+extend-select = [
+    "B",    # flake8-bugbear
+    "C90",  # mccabe complexity
+    "E",    # pycodestyle errors
+    "F",    # pyflakes
+    "G010", # logging.warn -> logging.warning
+    "I",    # isort
+    "TID",  # flake8-tidy-imports
 ]
 ignore = [
-	'E501', # Ignore line length, since black handles that.
-	'D203', # Ignore 1 blank line required before class docstring.
-	'B904', # exception with `raise ... from err` or `raise ... from None` to distinguish
-	'TID252', # Prefer absolute imports over relative imports
+    "E501",  # Line length violations (handled by formatter)
+    "B904",  # exception with `raise ... from err` or `raise ... from None` to distinguish
+    "TID252",# Prefer absolute imports over relative imports
 ]
 
 [tool.ruff.lint.mccabe]
@@ -74,5 +75,4 @@ disallow_untyped_decorators = true
 warn_unused_configs = true
 # eventually we'd like to enable these
 disallow_incomplete_defs = false
-disallow_untyped_defs = false
-
+disallow_untyped_defs = false
\ No newline at end of file
diff --git a/smoke-test/requirements.txt b/smoke-test/requirements.txt
index 6779733a850bad..fadc3dbec1f2b5 100644
--- a/smoke-test/requirements.txt
+++ b/smoke-test/requirements.txt
@@ -9,7 +9,6 @@ joblib
 pytest-xdist
 networkx
 # libaries for linting below this
-black==23.7.0
 mypy==1.5.1
 ruff==0.9.2
 # stub version are copied from metadata-ingestion/setup.py and that should be the source of truth
diff --git a/smoke-test/tests/data_process_instance/test_data_process_instance.py b/smoke-test/tests/data_process_instance/test_data_process_instance.py
index f1c532af515cfa..a68db03cf8cf16 100644
--- a/smoke-test/tests/data_process_instance/test_data_process_instance.py
+++ b/smoke-test/tests/data_process_instance/test_data_process_instance.py
@@ -250,14 +250,14 @@ def test_search_dpi(auth_session, ingest_cleanup_data):
     assert res_data, "Response should not be empty"
     assert "data" in res_data, "Response should contain 'data' field"
     print("RESPONSE DATA:" + str(res_data))
-    assert (
-        "scrollAcrossEntities" in res_data["data"]
-    ), "Response should contain 'scrollAcrossEntities' field"
+    assert "scrollAcrossEntities" in res_data["data"], (
+        "Response should contain 'scrollAcrossEntities' field"
+    )
 
     search_results = res_data["data"]["scrollAcrossEntities"]
-    assert (
-        "searchResults" in search_results
-    ), "Response should contain 'searchResults' field"
+    assert "searchResults" in search_results, (
+        "Response should contain 'searchResults' field"
+    )
 
     results = search_results["searchResults"]
     assert len(results) > 0, "Should find at least one result"
diff --git a/smoke-test/tests/dataproduct/test_dataproduct.py b/smoke-test/tests/dataproduct/test_dataproduct.py
index 0aa66984b394c8..8d484820d1ed45 100644
--- a/smoke-test/tests/dataproduct/test_dataproduct.py
+++ b/smoke-test/tests/dataproduct/test_dataproduct.py
@@ -135,9 +135,9 @@ def validate_relationships(
                 urn_match[dataset_urn] = True
 
     urns_missing = [k for k in urn_match if urn_match[k] is False]
-    assert (
-        urns_missing == []
-    ), "All dataset urns should have a DataProductContains relationship to the data product"
+    assert urns_missing == [], (
+        "All dataset urns should have a DataProductContains relationship to the data product"
+    )
 
     dataset_urns_matched = set()
     for e in graph_client.get_related_entities(
@@ -147,9 +147,9 @@ def validate_relationships(
     ):
         dataset_urns_matched.add(e.urn)
 
-    assert (
-        set(dataset_urns) == dataset_urns_matched
-    ), "All dataset urns should be navigable from the data product"
+    assert set(dataset_urns) == dataset_urns_matched, (
+        "All dataset urns should be navigable from the data product"
+    )
 
 
 @tenacity.retry(
@@ -247,6 +247,6 @@ def test_create_data_product(graph_client, ingest_cleanup_data):
                 urn_match[dataset_urn] = True
 
     urns_missing = [k for k in urn_match if urn_match[k] is False]
-    assert set(urns_missing) == set(
-        dataset_urns
-    ), f"All dataset urns should no longer have a DataProductContains relationship to the data product {data_product_urn}"
+    assert set(urns_missing) == set(dataset_urns), (
+        f"All dataset urns should no longer have a DataProductContains relationship to the data product {data_product_urn}"
+    )
diff --git a/smoke-test/tests/lineage/test_lineage.py b/smoke-test/tests/lineage/test_lineage.py
index 771085043926dd..dd5309667806c5 100644
--- a/smoke-test/tests/lineage/test_lineage.py
+++ b/smoke-test/tests/lineage/test_lineage.py
@@ -92,7 +92,7 @@ def _explain_sal_result(result: dict) -> str:
         explain += "Entities: "
         try:
             for e in entities:
-                explain += f"\t{e.replace('urn:li:','')}\n"
+                explain += f"\t{e.replace('urn:li:', '')}\n"
             for entity in entities:
                 paths = [
                     x["paths"][0]["path"]
@@ -349,9 +349,9 @@ def get_expectation_for_query(self, query: ImpactQuery) -> LineageExpectation:
                             lineage_expectation.impacted_entities[impacted_entity]
                         )
                     else:
-                        entries_to_add[
-                            impacted_dataset_entity
-                        ] = lineage_expectation.impacted_entities[impacted_entity]
+                        entries_to_add[impacted_dataset_entity] = (
+                            lineage_expectation.impacted_entities[impacted_entity]
+                        )
                     entries_to_remove.append(impacted_entity)
             for impacted_entity in entries_to_remove:
                 del lineage_expectation.impacted_entities[impacted_entity]
@@ -756,9 +756,9 @@ def test_expectation(self, graph: DataHubGraph) -> bool:
                     ]
                 )
                 try:
-                    assert (
-                        impacted_entities == impacted_entities_expectation
-                    ), f"Expected impacted entities to be {impacted_entities_expectation}, found {impacted_entities}"
+                    assert impacted_entities == impacted_entities_expectation, (
+                        f"Expected impacted entities to be {impacted_entities_expectation}, found {impacted_entities}"
+                    )
                 except Exception:
                     # breakpoint()
                     raise
@@ -783,10 +783,14 @@ def test_expectation(self, graph: DataHubGraph) -> bool:
                     try:
                         assert len(impacted_entity_paths) == len(
                             expectation.impacted_entities[impacted_entity]
-                        ), f"Expected length of impacted entity paths to be {len(expectation.impacted_entities[impacted_entity])}, found {len(impacted_entity_paths)}"
+                        ), (
+                            f"Expected length of impacted entity paths to be {len(expectation.impacted_entities[impacted_entity])}, found {len(impacted_entity_paths)}"
+                        )
                         assert set(impacted_entity_paths) == set(
                             expectation.impacted_entities[impacted_entity]
-                        ), f"Expected impacted entity paths to be {expectation.impacted_entities[impacted_entity]}, found {impacted_entity_paths}"
+                        ), (
+                            f"Expected impacted entity paths to be {expectation.impacted_entities[impacted_entity]}, found {impacted_entity_paths}"
+                        )
                     except Exception:
                         # breakpoint()
                         raise
diff --git a/smoke-test/tests/managed_ingestion/managed_ingestion_test.py b/smoke-test/tests/managed_ingestion/managed_ingestion_test.py
index 5d6179de6be644..7fe9421af85b1a 100644
--- a/smoke-test/tests/managed_ingestion/managed_ingestion_test.py
+++ b/smoke-test/tests/managed_ingestion/managed_ingestion_test.py
@@ -489,9 +489,9 @@ def test_create_list_get_ingestion_execution_request(auth_session):
 
     assert res_data
     assert res_data["data"]
-    assert (
-        res_data["data"]["createIngestionExecutionRequest"] is not None
-    ), f"res_data was {res_data}"
+    assert res_data["data"]["createIngestionExecutionRequest"] is not None, (
+        f"res_data was {res_data}"
+    )
     assert "errors" not in res_data
 
     execution_request_urn = res_data["data"]["createIngestionExecutionRequest"]
diff --git a/smoke-test/tests/read_only/test_search.py b/smoke-test/tests/read_only/test_search.py
index 36ecf68395f919..66bbeb408d0529 100644
--- a/smoke-test/tests/read_only/test_search.py
+++ b/smoke-test/tests/read_only/test_search.py
@@ -153,6 +153,6 @@ def test_openapi_v3_entity(auth_session, entity_type):
 
     expected_data = {"urn": first_urn}
 
-    assert (
-        actual_data["urn"] == expected_data["urn"]
-    ), f"Mismatch: expected {expected_data}, got {actual_data}"
+    assert actual_data["urn"] == expected_data["urn"], (
+        f"Mismatch: expected {expected_data}, got {actual_data}"
+    )
diff --git a/smoke-test/tests/read_only/test_services_up.py b/smoke-test/tests/read_only/test_services_up.py
index 12ff04965548f0..79812b46476fa8 100644
--- a/smoke-test/tests/read_only/test_services_up.py
+++ b/smoke-test/tests/read_only/test_services_up.py
@@ -27,6 +27,6 @@ def test_gms_config_accessible(auth_session) -> None:
     default_cli_version: str = gms_config["managedIngestion"]["defaultCliVersion"]
     print(f"Default CLI version: {default_cli_version}")
     assert not default_cli_version.startswith("@")
-    assert "." in default_cli_version or looks_like_a_short_sha(
-        default_cli_version
-    ), "Default CLI version does not look like a version string"
+    assert "." in default_cli_version or looks_like_a_short_sha(default_cli_version), (
+        "Default CLI version does not look like a version string"
+    )
diff --git a/smoke-test/tests/utilities/file_emitter.py b/smoke-test/tests/utilities/file_emitter.py
index ddbcff8db31d8b..d5539d143af737 100644
--- a/smoke-test/tests/utilities/file_emitter.py
+++ b/smoke-test/tests/utilities/file_emitter.py
@@ -7,7 +7,7 @@
 
 class FileEmitter:
     def __init__(
-        self, filename: str, run_id: str = f"test_{int(time.time()*1000.0)}"
+        self, filename: str, run_id: str = f"test_{int(time.time() * 1000.0)}"
     ) -> None:
         self.sink: FileSink = FileSink(
             ctx=PipelineContext(run_id=run_id),

From aff5e1640f5990414940c55ec2bdf800d26dfbcd Mon Sep 17 00:00:00 2001
From: Shirshanka Das <shirshanka@apache.org>
Date: Sun, 19 Jan 2025 20:40:41 -0800
Subject: [PATCH 119/249] =?UTF-8?q?models(data-platform-instance):=20linea?=
 =?UTF-8?q?ge=20for=20models=20and=20datasets=20to=20da=E2=80=A6=20(#12391?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataprocess/DataProcessInstanceInput.pdl  |   5 +-
 .../dataprocess/DataProcessInstanceOutput.pdl |   4 +-
 .../test_data_process_instance.py             | 213 +++++++++---------
 3 files changed, 115 insertions(+), 107 deletions(-)

diff --git a/metadata-models/src/main/pegasus/com/linkedin/dataprocess/DataProcessInstanceInput.pdl b/metadata-models/src/main/pegasus/com/linkedin/dataprocess/DataProcessInstanceInput.pdl
index d005cd557cf77e..3e5192267c8c2e 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/dataprocess/DataProcessInstanceInput.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/dataprocess/DataProcessInstanceInput.pdl
@@ -10,12 +10,13 @@ import com.linkedin.common.Urn
 }
 record DataProcessInstanceInput {
   /**
-   * Input datasets to be consumed
+   * Input assets consumed
    */
   @Relationship = {
     "/*": {
       "name": "Consumes",
-      "entityTypes": [ "dataset" ]
+      "entityTypes": [ "dataset", "mlModel"],
+      "isLineage": true
     }
   }
   @Searchable = {
diff --git a/metadata-models/src/main/pegasus/com/linkedin/dataprocess/DataProcessInstanceOutput.pdl b/metadata-models/src/main/pegasus/com/linkedin/dataprocess/DataProcessInstanceOutput.pdl
index fe782dbe01ca9b..6b41cf9ba63417 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/dataprocess/DataProcessInstanceOutput.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/dataprocess/DataProcessInstanceOutput.pdl
@@ -15,7 +15,9 @@ record DataProcessInstanceOutput {
   @Relationship = {
     "/*": {
       "name": "Produces",
-      "entityTypes": [ "dataset", "mlModel" ]
+      "entityTypes": [ "dataset", "mlModel" ],
+      "isLineage": true,
+      "isUpstream": false
     }
   }
   @Searchable = {
diff --git a/smoke-test/tests/data_process_instance/test_data_process_instance.py b/smoke-test/tests/data_process_instance/test_data_process_instance.py
index a68db03cf8cf16..bad945f878562b 100644
--- a/smoke-test/tests/data_process_instance/test_data_process_instance.py
+++ b/smoke-test/tests/data_process_instance/test_data_process_instance.py
@@ -5,6 +5,7 @@
 
 import pytest
 
+import datahub.metadata.schema_classes as models
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.api.common import PipelineContext, RecordEnvelope
 from datahub.ingestion.api.sink import NoopWriteCallback
@@ -15,7 +16,6 @@
     ContainerPropertiesClass,
     DataPlatformInstanceClass,
     DataPlatformInstancePropertiesClass,
-    DataProcessInstanceKeyClass,
     DataProcessInstancePropertiesClass,
     DataProcessInstanceRunEventClass,
     MLHyperParamClass,
@@ -54,109 +54,114 @@ def close(self):
         self.sink.close()
 
 
+def create_status_mcp(entity_urn: str):
+    return MetadataChangeProposalWrapper(
+        entityUrn=entity_urn,
+        aspect=models.StatusClass(removed=False),
+    )
+
+
 def create_test_data(filename: str):
+    input_dataset_urn = (
+        "urn:li:dataset:(urn:li:dataPlatform:kafka,my_input_dataset,PROD)"
+    )
+    input_model_urn = "urn:li:mlModel:(urn:li:dataPlatform:mlflow,my_input_model,PROD)"
+    output_dataset_urn = (
+        "urn:li:dataset:(urn:li:dataPlatform:kafka,my_output_dataset,PROD)"
+    )
+    output_model_urn = (
+        "urn:li:mlModel:(urn:li:dataPlatform:mlflow,my_output_model,PROD)"
+    )
+    data_platform_instance_urn = (
+        "urn:li:dataPlatformInstance:(urn:li:dataPlatform:airflow,1234567890)"
+    )
+    container_urn = "urn:li:container:testGroup1"
     mcps = [
-        # Key aspect
-        MetadataChangeProposalWrapper(
-            entityType="dataProcessInstance",
-            entityUrn=dpi_urn,
-            aspectName="dataProcessInstanceKey",
-            aspect=DataProcessInstanceKeyClass(id=dpi_id),
-        ),
-        # Properties aspect
-        MetadataChangeProposalWrapper(
-            entityType="dataProcessInstance",
-            entityUrn=dpi_urn,
-            aspectName="dataProcessInstanceProperties",
-            aspect=DataProcessInstancePropertiesClass(
-                name="Test Pipeline Run",
-                type="BATCH_SCHEDULED",
-                created=AuditStampClass(
-                    time=1640692800000, actor="urn:li:corpuser:datahub"
-                ),
-            ),
-        ),
-        # Run Event aspect
-        MetadataChangeProposalWrapper(
-            entityType="dataProcessInstance",
-            entityUrn=dpi_urn,
-            aspectName="dataProcessInstanceRunEvent",
-            aspect=DataProcessInstanceRunEventClass(
-                timestampMillis=1704067200000,
-                eventGranularity=TimeWindowSizeClass(unit="WEEK", multiple=1),
-                status="COMPLETE",
-            ),
-        ),
-        # Platform Instance aspect
-        MetadataChangeProposalWrapper(
-            entityType="dataProcessInstance",
-            entityUrn=dpi_urn,
-            aspectName="dataPlatformInstance",
-            aspect=DataPlatformInstanceClass(
-                platform="urn:li:dataPlatform:airflow",
-                instance="urn:li:dataPlatformInstance:(urn:li:dataPlatform:airflow,1234567890)",
-            ),
-        ),
-        MetadataChangeProposalWrapper(
-            entityType="dataPlatformInstance",
-            entityUrn="urn:li:dataPlatformInstance:(urn:li:dataPlatform:airflow,1234567890)",
-            aspectName="dataPlatformInstanceProperties",
-            aspect=DataPlatformInstancePropertiesClass(
-                name="my process instance",
-            ),
-        ),
-        # SubTypes aspect
-        MetadataChangeProposalWrapper(
-            entityType="dataProcessInstance",
-            entityUrn=dpi_urn,
-            aspectName="subTypes",
-            aspect=SubTypesClass(typeNames=["TEST", "BATCH_JOB"]),
-        ),
-        # Container aspect
-        MetadataChangeProposalWrapper(
-            entityType="dataProcessInstance",
-            entityUrn=dpi_urn,
-            aspectName="container",
-            aspect=ContainerClass(container="urn:li:container:testGroup1"),
-        ),
+        create_status_mcp(urn)
+        for urn in [
+            input_dataset_urn,
+            input_model_urn,
+            output_dataset_urn,
+            output_model_urn,
+            data_platform_instance_urn,
+        ]
+    ]
+    mcps += [
         MetadataChangeProposalWrapper(
-            entityType="container",
-            entityUrn="urn:li:container:testGroup1",
-            aspectName="containerProperties",
+            entityUrn=container_urn,
             aspect=ContainerPropertiesClass(name="testGroup1"),
-        ),
-        # ML Training Run Properties aspect
+        )
+    ]
+    mcps += [
         MetadataChangeProposalWrapper(
-            entityType="dataProcessInstance",
+            entityUrn=data_platform_instance_urn,
+            aspect=DataPlatformInstancePropertiesClass(name="my process instance"),
+        )
+    ]
+    mcps += [
+        e
+        for e in MetadataChangeProposalWrapper.construct_many(
             entityUrn=dpi_urn,
-            aspectName="mlTrainingRunProperties",
-            aspect=MLTrainingRunPropertiesClass(
-                id="test-training-run-123",
-                trainingMetrics=[
-                    MLMetricClass(
-                        name="accuracy",
-                        description="accuracy of the model",
-                        value="0.95",
-                    ),
-                    MLMetricClass(
-                        name="loss",
-                        description="accuracy loss of the model",
-                        value="0.05",
+            aspects=[
+                # Properties aspect
+                DataProcessInstancePropertiesClass(
+                    name="Test Pipeline Run",
+                    type="BATCH_SCHEDULED",
+                    created=AuditStampClass(
+                        time=1640692800000, actor="urn:li:corpuser:datahub"
                     ),
-                ],
-                hyperParams=[
-                    MLHyperParamClass(
-                        name="learningRate",
-                        description="rate of learning",
-                        value="0.001",
-                    ),
-                    MLHyperParamClass(
-                        name="batchSize", description="size of the batch", value="32"
-                    ),
-                ],
-                outputUrls=["s3://my-bucket/ml/output"],
-            ),
-        ),
+                ),
+                # # Run Event aspect
+                DataProcessInstanceRunEventClass(
+                    timestampMillis=1704067200000,
+                    eventGranularity=TimeWindowSizeClass(unit="WEEK", multiple=1),
+                    status="COMPLETE",
+                ),
+                # Platform Instance aspect
+                DataPlatformInstanceClass(
+                    platform="urn:li:dataPlatform:airflow",
+                    instance="urn:li:dataPlatformInstance:(urn:li:dataPlatform:airflow,1234567890)",
+                ),
+                # SubTypes aspect
+                SubTypesClass(typeNames=["TEST", "BATCH_JOB"]),
+                ContainerClass(container="urn:li:container:testGroup1"),
+                # ML Training Run Properties aspect
+                MLTrainingRunPropertiesClass(
+                    id="test-training-run-123",
+                    trainingMetrics=[
+                        MLMetricClass(
+                            name="accuracy",
+                            description="accuracy of the model",
+                            value="0.95",
+                        ),
+                        MLMetricClass(
+                            name="loss",
+                            description="accuracy loss of the model",
+                            value="0.05",
+                        ),
+                    ],
+                    hyperParams=[
+                        MLHyperParamClass(
+                            name="learningRate",
+                            description="rate of learning",
+                            value="0.001",
+                        ),
+                        MLHyperParamClass(
+                            name="batchSize",
+                            description="size of the batch",
+                            value="32",
+                        ),
+                    ],
+                    outputUrls=["s3://my-bucket/ml/output"],
+                ),
+                models.DataProcessInstanceInputClass(
+                    inputs=[input_dataset_urn, input_model_urn]
+                ),
+                models.DataProcessInstanceOutputClass(
+                    outputs=[output_dataset_urn, output_model_urn]
+                ),
+            ],
+        )
     ]
 
     file_emitter = FileEmitter(filename)
@@ -181,7 +186,7 @@ def ingest_cleanup_data(auth_session, graph_client, request):
         os.remove(filename)
 
 
-@pytest.mark.integration
+# @pytest.mark.integration
 def test_search_dpi(auth_session, ingest_cleanup_data):
     """Test DPI search and validation of returned fields using GraphQL."""
 
@@ -205,12 +210,6 @@ def test_search_dpi(auth_session, ingest_cleanup_data):
                                     name
                                 }
                             }
-                            subTypes {
-                                typeNames
-                            }
-                            container {
-                                urn
-                            }
                             platform {
                                 urn
                                 name
@@ -218,6 +217,12 @@ def test_search_dpi(auth_session, ingest_cleanup_data):
                                     type
                                 }
                             }
+                            subTypes {
+                                typeNames
+                            }
+                            container {
+                                urn
+                            }
                             mlTrainingRunProperties {
                                 id
                                 trainingMetrics {

From 247636f27bf45c532009501ab5867f73fa13f16b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 13:19:03 +0530
Subject: [PATCH 120/249] build(deps): bump szenius/set-timezone from 1.2 to
 2.0 (#12394)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/build-and-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 65d85b9d89e2b3..7f7dcb9c1f7548 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -63,7 +63,7 @@ jobs:
           sudo apt-get remove 'dotnet-*' azure-cli || true
           sudo rm -rf /usr/local/lib/android/ || true
           sudo docker image prune -a -f || true
-      - uses: szenius/set-timezone@v1.2
+      - uses: szenius/set-timezone@v2.0
         with:
           timezoneLinux: ${{ matrix.timezone }}
       - name: Check out the repo

From dd01c827bf5d674437855b9b3ab0a27c9c137554 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Mon, 20 Jan 2025 13:32:18 +0530
Subject: [PATCH 121/249] ci: fix labeler config after upgrade (#12396)

---
 .github/pr-labeler-config.yml    | 36 ++++++++++++++++++++------------
 .github/workflows/pr-labeler.yml |  9 ++++++--
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/.github/pr-labeler-config.yml b/.github/pr-labeler-config.yml
index 2625cb1cfdff68..e3fcc15b637e22 100644
--- a/.github/pr-labeler-config.yml
+++ b/.github/pr-labeler-config.yml
@@ -1,22 +1,32 @@
 ingestion:
-  - "metadata-ingestion/**/*"
-  - "metadata-ingestion-modules/**/*"
-  - "metadata-integration/**/*"
+- changed-files:
+  - any-glob-to-any-file:
+    - "metadata-ingestion/**/*"
+    - "metadata-ingestion-modules/**/*"
+    - "metadata-integration/**/*"
 
 devops:
-  - "docker/**/*"
-  - ".github/**/*"
-  - "perf-test/**/*"
-  - "metadata-service/**/*"
+- changed-files:
+  - any-glob-to-any-file:
+    - "docker/**/*"
+    - ".github/**/*"
+    - "perf-test/**/*"
+    - "metadata-service/**/*"
 
 product:
-  - "datahub-web-react/**/*"
-  - "datahub-frontend/**/*"
-  - "datahub-graphql-core/**/*"
-  - "metadata-io/**/*"
+- changed-files:
+  - any-glob-to-any-file:
+    - "datahub-web-react/**/*"
+    - "datahub-frontend/**/*"
+    - "datahub-graphql-core/**/*"
+    - "metadata-io/**/*"
 
 docs:
-  - "docs/**/*"
+- changed-files:
+  - any-glob-to-any-file:
+    - "docs/**/*"
 
 smoke_test:
-  - "smoke-test/**/*"
+- changed-files:
+  - any-glob-to-any-file:
+    - "smoke-test/**/*"
diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
index f519db20a73e10..55f7fea875388a 100644
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -3,6 +3,10 @@ on:
   pull_request_target:
     types: [opened, reopened]
 
+permissions:
+    contents: read
+    pull-requests: write
+    
 jobs:
   triage:
     permissions:
@@ -25,7 +29,6 @@ jobs:
                 "chriscollins3456",
                 "david-leifker",
                 "shirshanka",
-                "sid-acryl",
                 "swaroopjagadish",
                 "treff7es",
                 "yoonhyejin",
@@ -46,7 +49,9 @@ jobs:
                 "kevinkarchacryl",
                 "sgomezvillamor",
                 "acrylJonny",
-                "chakru-r"
+                "chakru-r",
+                "brock-acryl",
+                "mminichino"
               ]'), 
               github.actor
             ) 

From ef36837ba00b1fc719b38c22c711193e6e3dee56 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 14:08:30 +0530
Subject: [PATCH 122/249] build(deps): bump gradle/actions from 3 to 4 (#12393)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aseem Bansal <asmbansal2@gmail.com>
---
 .github/workflows/python-build-pages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-build-pages.yml b/.github/workflows/python-build-pages.yml
index 8971722c374fb7..9e1a2563478039 100644
--- a/.github/workflows/python-build-pages.yml
+++ b/.github/workflows/python-build-pages.yml
@@ -37,7 +37,7 @@ jobs:
         with:
           distribution: "zulu"
           java-version: 17
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - uses: acryldata/sane-checkout-action@v3
       - uses: actions/setup-python@v5
         with:

From 7eab2eb8d98824e1f580ac80e604f1a8e92cac44 Mon Sep 17 00:00:00 2001
From: Tamas Nemeth <treff7es@gmail.com>
Date: Mon, 20 Jan 2025 13:38:12 +0100
Subject: [PATCH 123/249] fix(ingest/fivetran): Add way to not add schema to
 the destination/source urn. (#12314)

---
 .../ingestion/source/fivetran/config.py       |   4 +
 .../ingestion/source/fivetran/fivetran.py     |  20 +-
 ...nowflake_empty_connection_user_golden.json | 317 +++++++++++++++++
 .../fivetran/fivetran_snowflake_golden.json   | 325 ++++++++++++++++++
 .../integration/fivetran/test_fivetran.py     |  73 +++-
 5 files changed, 725 insertions(+), 14 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/fivetran/config.py b/metadata-ingestion/src/datahub/ingestion/source/fivetran/config.py
index 86826ae7bedc09..b048b6157fbb9f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/fivetran/config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/fivetran/config.py
@@ -167,6 +167,10 @@ class PlatformDetail(ConfigModel):
         description="The database that all assets produced by this connector belong to. "
         "For destinations, this defaults to the fivetran log config's database.",
     )
+    include_schema_in_urn: bool = pydantic.Field(
+        default=True,
+        description="Include schema in the dataset URN. In some cases, the schema is not relevant to the dataset URN and Fivetran sets it to the source and destination table names in the connector.",
+    )
 
 
 class FivetranSourceConfig(StatefulIngestionConfigBase, DatasetSourceConfigMixin):
diff --git a/metadata-ingestion/src/datahub/ingestion/source/fivetran/fivetran.py b/metadata-ingestion/src/datahub/ingestion/source/fivetran/fivetran.py
index d8ebbe5b63d1ae..a3469696699f17 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/fivetran/fivetran.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/fivetran/fivetran.py
@@ -119,21 +119,31 @@ def _extend_lineage(self, connector: Connector, datajob: DataJob) -> Dict[str, s
             )
 
         for lineage in connector.lineage:
+            source_table = (
+                lineage.source_table
+                if source_details.include_schema_in_urn
+                else lineage.source_table.split(".", 1)[1]
+            )
             input_dataset_urn = DatasetUrn.create_from_ids(
                 platform_id=source_details.platform,
                 table_name=(
-                    f"{source_details.database.lower()}.{lineage.source_table}"
+                    f"{source_details.database.lower()}.{source_table}"
                     if source_details.database
-                    else lineage.source_table
+                    else source_table
                 ),
                 env=source_details.env,
                 platform_instance=source_details.platform_instance,
             )
             input_dataset_urn_list.append(input_dataset_urn)
 
+            destination_table = (
+                lineage.destination_table
+                if destination_details.include_schema_in_urn
+                else lineage.destination_table.split(".", 1)[1]
+            )
             output_dataset_urn = DatasetUrn.create_from_ids(
                 platform_id=destination_details.platform,
-                table_name=f"{destination_details.database.lower()}.{lineage.destination_table}",
+                table_name=f"{destination_details.database.lower()}.{destination_table}",
                 env=destination_details.env,
                 platform_instance=destination_details.platform_instance,
             )
@@ -176,12 +186,12 @@ def _extend_lineage(self, connector: Connector, datajob: DataJob) -> Dict[str, s
             **{
                 f"source.{k}": str(v)
                 for k, v in source_details.dict().items()
-                if v is not None
+                if v is not None and not isinstance(v, bool)
             },
             **{
                 f"destination.{k}": str(v)
                 for k, v in destination_details.dict().items()
-                if v is not None
+                if v is not None and not isinstance(v, bool)
             },
         )
 
diff --git a/metadata-ingestion/tests/integration/fivetran/fivetran_snowflake_empty_connection_user_golden.json b/metadata-ingestion/tests/integration/fivetran/fivetran_snowflake_empty_connection_user_golden.json
index 7934153051c60b..cf77ab39cbcbe7 100644
--- a/metadata-ingestion/tests/integration/fivetran/fivetran_snowflake_empty_connection_user_golden.json
+++ b/metadata-ingestion/tests/integration/fivetran/fivetran_snowflake_empty_connection_user_golden.json
@@ -595,6 +595,323 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataFlowInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "name": "confluent_cloud",
+            "env": "PROD"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "ownership",
+    "aspect": {
+        "json": {
+            "owners": [],
+            "ownerTypes": {},
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:fivetran"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "globalTags",
+    "aspect": {
+        "json": {
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD),my_confluent_cloud_connector_id)",
+    "changeType": "UPSERT",
+    "aspectName": "dataJobInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "connector_id": "my_confluent_cloud_connector_id",
+                "connector_type": "confluent_cloud",
+                "paused": "False",
+                "sync_frequency": "1440",
+                "destination_id": "interval_unconstitutional",
+                "source.platform": "kafka",
+                "source.env": "PROD",
+                "source.database": "kafka_prod",
+                "destination.platform": "snowflake",
+                "destination.env": "PROD",
+                "destination.database": "test_database"
+            },
+            "name": "confluent_cloud",
+            "type": {
+                "string": "COMMAND"
+            },
+            "env": "PROD"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD),my_confluent_cloud_connector_id)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD),my_confluent_cloud_connector_id)",
+    "changeType": "UPSERT",
+    "aspectName": "dataJobInputOutput",
+    "aspect": {
+        "json": {
+            "inputDatasets": [
+                "urn:li:dataset:(urn:li:dataPlatform:kafka,kafka_prod.my-source-topic,PROD)"
+            ],
+            "outputDatasets": [
+                "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_database.confluent_cloud.my-destination-topic,PROD)"
+            ],
+            "inputDatajobs": [],
+            "fineGrainedLineages": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD),my_confluent_cloud_connector_id)",
+    "changeType": "UPSERT",
+    "aspectName": "ownership",
+    "aspect": {
+        "json": {
+            "owners": [],
+            "ownerTypes": {},
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:fivetran"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD),my_confluent_cloud_connector_id)",
+    "changeType": "UPSERT",
+    "aspectName": "globalTags",
+    "aspect": {
+        "json": {
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:08bddbc8007d76bfbbb8e231d1c65290",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "name": "d9a03d6-eded-4422-a46a-163266e58244",
+            "type": "BATCH_SCHEDULED",
+            "created": {
+                "time": 1695191853000,
+                "actor": "urn:li:corpuser:datahub"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:08bddbc8007d76bfbbb8e231d1c65290",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRelationships",
+    "aspect": {
+        "json": {
+            "parentTemplate": "urn:li:dataJob:(urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD),my_confluent_cloud_connector_id)",
+            "upstreamInstances": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:08bddbc8007d76bfbbb8e231d1c65290",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceInput",
+    "aspect": {
+        "json": {
+            "inputs": [
+                "urn:li:dataset:(urn:li:dataPlatform:kafka,kafka_prod.my-source-topic,PROD)"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:08bddbc8007d76bfbbb8e231d1c65290",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceOutput",
+    "aspect": {
+        "json": {
+            "outputs": [
+                "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_database.confluent_cloud.my-destination-topic,PROD)"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:08bddbc8007d76bfbbb8e231d1c65290",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1695191853000,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "status": "STARTED"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:08bddbc8007d76bfbbb8e231d1c65290",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1695191885000,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "status": "COMPLETE",
+            "result": {
+                "type": "SUCCESS",
+                "nativeResultType": "fivetran"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:08bddbc8007d76bfbbb8e231d1c65290",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataProcessInstance",
     "entityUrn": "urn:li:dataProcessInstance:be36f55c13ec4e313c7510770e50784a",
diff --git a/metadata-ingestion/tests/integration/fivetran/fivetran_snowflake_golden.json b/metadata-ingestion/tests/integration/fivetran/fivetran_snowflake_golden.json
index c46bd8fb65d876..cec1ef1b6221d3 100644
--- a/metadata-ingestion/tests/integration/fivetran/fivetran_snowflake_golden.json
+++ b/metadata-ingestion/tests/integration/fivetran/fivetran_snowflake_golden.json
@@ -603,6 +603,331 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataFlowInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "name": "confluent_cloud",
+            "env": "PROD"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "ownership",
+    "aspect": {
+        "json": {
+            "owners": [],
+            "ownerTypes": {},
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:fivetran"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "globalTags",
+    "aspect": {
+        "json": {
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD),my_confluent_cloud_connector_id)",
+    "changeType": "UPSERT",
+    "aspectName": "dataJobInfo",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "connector_id": "my_confluent_cloud_connector_id",
+                "connector_type": "confluent_cloud",
+                "paused": "False",
+                "sync_frequency": "1440",
+                "destination_id": "my_confluent_cloud_connector_id",
+                "source.platform": "kafka",
+                "source.env": "PROD",
+                "source.database": "kafka_prod",
+                "destination.platform": "kafka",
+                "destination.env": "PROD",
+                "destination.database": "kafka_prod"
+            },
+            "name": "confluent_cloud",
+            "type": {
+                "string": "COMMAND"
+            },
+            "env": "PROD"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD),my_confluent_cloud_connector_id)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD),my_confluent_cloud_connector_id)",
+    "changeType": "UPSERT",
+    "aspectName": "dataJobInputOutput",
+    "aspect": {
+        "json": {
+            "inputDatasets": [
+                "urn:li:dataset:(urn:li:dataPlatform:kafka,kafka_prod.my-source-topic,PROD)"
+            ],
+            "outputDatasets": [
+                "urn:li:dataset:(urn:li:dataPlatform:kafka,kafka_prod.my-destination-topic,PROD)"
+            ],
+            "inputDatajobs": [],
+            "fineGrainedLineages": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD),my_confluent_cloud_connector_id)",
+    "changeType": "UPSERT",
+    "aspectName": "ownership",
+    "aspect": {
+        "json": {
+            "owners": [
+                {
+                    "owner": "urn:li:corpuser:abc.xyz@email.com",
+                    "type": "DEVELOPER",
+                    "source": {
+                        "type": "SERVICE"
+                    }
+                }
+            ],
+            "ownerTypes": {},
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:fivetran"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD),my_confluent_cloud_connector_id)",
+    "changeType": "UPSERT",
+    "aspectName": "globalTags",
+    "aspect": {
+        "json": {
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:08bddbc8007d76bfbbb8e231d1c65290",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "name": "d9a03d6-eded-4422-a46a-163266e58244",
+            "type": "BATCH_SCHEDULED",
+            "created": {
+                "time": 1695191853000,
+                "actor": "urn:li:corpuser:datahub"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:08bddbc8007d76bfbbb8e231d1c65290",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRelationships",
+    "aspect": {
+        "json": {
+            "parentTemplate": "urn:li:dataJob:(urn:li:dataFlow:(fivetran,my_confluent_cloud_connector_id,PROD),my_confluent_cloud_connector_id)",
+            "upstreamInstances": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:08bddbc8007d76bfbbb8e231d1c65290",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceInput",
+    "aspect": {
+        "json": {
+            "inputs": [
+                "urn:li:dataset:(urn:li:dataPlatform:kafka,kafka_prod.my-source-topic,PROD)"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:08bddbc8007d76bfbbb8e231d1c65290",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceOutput",
+    "aspect": {
+        "json": {
+            "outputs": [
+                "urn:li:dataset:(urn:li:dataPlatform:kafka,kafka_prod.my-destination-topic,PROD)"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:08bddbc8007d76bfbbb8e231d1c65290",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1695191853000,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "status": "STARTED"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:08bddbc8007d76bfbbb8e231d1c65290",
+    "changeType": "UPSERT",
+    "aspectName": "dataProcessInstanceRunEvent",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1695191885000,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "status": "COMPLETE",
+            "result": {
+                "type": "SUCCESS",
+                "nativeResultType": "fivetran"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataProcessInstance",
+    "entityUrn": "urn:li:dataProcessInstance:08bddbc8007d76bfbbb8e231d1c65290",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "powerbi-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataProcessInstance",
     "entityUrn": "urn:li:dataProcessInstance:be36f55c13ec4e313c7510770e50784a",
diff --git a/metadata-ingestion/tests/integration/fivetran/test_fivetran.py b/metadata-ingestion/tests/integration/fivetran/test_fivetran.py
index 2e6c2b1370d166..9f53ae2382d406 100644
--- a/metadata-ingestion/tests/integration/fivetran/test_fivetran.py
+++ b/metadata-ingestion/tests/integration/fivetran/test_fivetran.py
@@ -32,6 +32,15 @@
         "sync_frequency": 1440,
         "destination_id": "interval_unconstitutional",
     },
+    {
+        "connector_id": "my_confluent_cloud_connector_id",
+        "connecting_user_id": "reapply_phone",
+        "connector_type_id": "confluent_cloud",
+        "connector_name": "confluent_cloud",
+        "paused": False,
+        "sync_frequency": 1440,
+        "destination_id": "my_confluent_cloud_connector_id",
+    },
 ]
 
 
@@ -45,7 +54,7 @@ def default_query_results(
     elif query == fivetran_log_query.get_connectors_query():
         return connector_query_results
     elif query == fivetran_log_query.get_table_lineage_query(
-        connector_ids=["calendar_elected"]
+        connector_ids=["calendar_elected", "my_confluent_cloud_connector_id"]
     ):
         return [
             {
@@ -66,9 +75,18 @@ def default_query_results(
                 "destination_table_name": "company",
                 "destination_schema_name": "postgres_public",
             },
+            {
+                "connector_id": "my_confluent_cloud_connector_id",
+                "source_table_id": "10042",
+                "source_table_name": "my-source-topic",
+                "source_schema_name": "confluent_cloud",
+                "destination_table_id": "7781",
+                "destination_table_name": "my-destination-topic",
+                "destination_schema_name": "confluent_cloud",
+            },
         ]
     elif query == fivetran_log_query.get_column_lineage_query(
-        connector_ids=["calendar_elected"]
+        connector_ids=["calendar_elected", "my_confluent_cloud_connector_id"]
     ):
         return [
             {
@@ -107,7 +125,7 @@ def default_query_results(
         ]
     elif query == fivetran_log_query.get_sync_logs_query(
         syncs_interval=7,
-        connector_ids=["calendar_elected"],
+        connector_ids=["calendar_elected", "my_confluent_cloud_connector_id"],
     ):
         return [
             {
@@ -131,6 +149,13 @@ def default_query_results(
                 "end_time": datetime.datetime(2023, 10, 3, 14, 36, 29, 678000),
                 "end_message_data": '"{\\"reason\\":\\"java.lang.RuntimeException: FATAL: too many connections for role \\\\\\"hxwraqld\\\\\\"\\",\\"taskType\\":\\"reconnect\\",\\"status\\":\\"FAILURE_WITH_TASK\\"}"',
             },
+            {
+                "connector_id": "my_confluent_cloud_connector_id",
+                "sync_id": "d9a03d6-eded-4422-a46a-163266e58244",
+                "start_time": datetime.datetime(2023, 9, 20, 6, 37, 32, 606000),
+                "end_time": datetime.datetime(2023, 9, 20, 6, 38, 5, 56000),
+                "end_message_data": '"{\\"status\\":\\"SUCCESSFUL\\"}"',
+            },
         ]
     # Unreachable code
     raise Exception(f"Unknown query {query}")
@@ -172,19 +197,30 @@ def test_fivetran_with_snowflake_dest(pytestconfig, tmp_path):
                             },
                         },
                         "connector_patterns": {
-                            "allow": [
-                                "postgres",
-                            ]
+                            "allow": ["postgres", "confluent_cloud"]
                         },
                         "destination_patterns": {
                             "allow": [
                                 "interval_unconstitutional",
+                                "my_confluent_cloud_connector_id",
                             ]
                         },
                         "sources_to_platform_instance": {
                             "calendar_elected": {
                                 "database": "postgres_db",
                                 "env": "DEV",
+                            },
+                            "my_confluent_cloud_connector_id": {
+                                "platform": "kafka",
+                                "include_schema_in_urn": False,
+                                "database": "kafka_prod",
+                            },
+                        },
+                        "destination_to_platform_instance": {
+                            "my_confluent_cloud_connector_id": {
+                                "platform": "kafka",
+                                "include_schema_in_urn": False,
+                                "database": "kafka_prod",
                             }
                         },
                     },
@@ -234,6 +270,15 @@ def test_fivetran_with_snowflake_dest_and_null_connector_user(pytestconfig, tmp_
                 "sync_frequency": 1440,
                 "destination_id": "interval_unconstitutional",
             },
+            {
+                "connector_id": "my_confluent_cloud_connector_id",
+                "connecting_user_id": None,
+                "connector_type_id": "confluent_cloud",
+                "connector_name": "confluent_cloud",
+                "paused": False,
+                "sync_frequency": 1440,
+                "destination_id": "interval_unconstitutional",
+            },
         ]
 
         connection_magic_mock.execute.side_effect = partial(
@@ -261,9 +306,7 @@ def test_fivetran_with_snowflake_dest_and_null_connector_user(pytestconfig, tmp_
                             },
                         },
                         "connector_patterns": {
-                            "allow": [
-                                "postgres",
-                            ]
+                            "allow": ["postgres", "confluent_cloud"]
                         },
                         "destination_patterns": {
                             "allow": [
@@ -275,6 +318,18 @@ def test_fivetran_with_snowflake_dest_and_null_connector_user(pytestconfig, tmp_
                                 "platform": "postgres",
                                 "env": "DEV",
                                 "database": "postgres_db",
+                            },
+                            "my_confluent_cloud_connector_id": {
+                                "platform": "kafka",
+                                "database": "kafka_prod",
+                                "include_schema_in_urn": False,
+                            },
+                        },
+                        "destination_to_platform_instance": {
+                            "my_confluent_cloud_connector_id": {
+                                "platform": "kafka",
+                                "database": "kafka_prod",
+                                "include_schema_in_urn": False,
                             }
                         },
                     },

From 68218768d3295b3c406bc8b5804dd646f9cc7a44 Mon Sep 17 00:00:00 2001
From: skrydal <piotr.skrydalewicz@acryl.io>
Date: Mon, 20 Jan 2025 14:43:12 +0100
Subject: [PATCH 124/249] fix(ingest/redshift): Fix query sequence duplication
 for serverless mode (#12353)

---
 .../ingestion/source/redshift/query.py        | 124 +++++++++++-------
 1 file changed, 77 insertions(+), 47 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/redshift/query.py b/metadata-ingestion/src/datahub/ingestion/source/redshift/query.py
index 71a20890d35e88..62f7d0a3901c7a 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/redshift/query.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/redshift/query.py
@@ -797,61 +797,91 @@ def stl_scan_based_lineage_query(
         db_name: str, start_time: datetime, end_time: datetime
     ) -> str:
         return """
-            SELECT
-                distinct cluster,
-                target_schema,
-                target_table,
-                username,
-                source_schema,
-                source_table,
-                query_text AS ddl,
-                start_time AS timestamp
-            FROM
-            (
-                SELECT
-                    sti.schema AS target_schema,
-                    sti.table AS target_table,
-                    sti.database AS cluster,
-                    qi.table_id AS target_table_id,
-                    qi.query_id AS query_id,
-                    qi.start_time AS start_time
-                FROM
-                    SYS_QUERY_DETAIL qi
-                    JOIN
-                    SVV_TABLE_INFO sti on sti.table_id = qi.table_id
-                WHERE
-                    start_time >= '{start_time}' and
-                    start_time < '{end_time}' and
-                    cluster = '{db_name}' and
-                    step_name = 'insert'
-            ) AS target_tables
-            JOIN
-            (
+            WITH queries AS (
                 SELECT
-                    sti.schema AS source_schema,
-                    sti.table AS source_table,
-                    qs.table_id AS source_table_id,
-                    qs.query_id AS query_id,
-                    sui.user_name AS username,
-                    LISTAGG(qt."text") WITHIN GROUP (ORDER BY sequence) AS query_text
+                    sti.database as cluster,
+                    sti.schema AS "schema",
+                    sti.table AS "table",
+                    qs.table_id AS table_id,
+                    qs.query_id as query_id,
+                    qs.step_name as step_name,
+                    sui.user_name as username,
+                    source,
+                    MIN(qs.start_time) as "timestamp" -- multiple duplicate records with start_time increasing slightly by miliseconds
                 FROM
                     SYS_QUERY_DETAIL qs
                     JOIN
                     SVV_TABLE_INFO sti ON sti.table_id = qs.table_id
                     LEFT JOIN
-                    SYS_QUERY_TEXT qt ON qt.query_id = qs.query_id
-                    LEFT JOIN
                     SVV_USER_INFO sui ON qs.user_id = sui.user_id
                 WHERE
-                    qs.step_name = 'scan' AND
-                    qs.source = 'Redshift(local)' AND
-                    qt.sequence < 16 AND -- See https://stackoverflow.com/questions/72770890/redshift-result-size-exceeds-listagg-limit-on-svl-statementtext
-                    sti.database = '{db_name}' AND -- this was required to not retrieve some internal redshift tables, try removing to see what happens
-                    sui.user_name <> 'rdsdb' -- not entirely sure about this filter
-                GROUP BY sti.schema, sti.table, qs.table_id, qs.query_id, sui.user_name
-            ) AS source_tables ON target_tables.query_id = source_tables.query_id
-            WHERE source_tables.source_table_id <> target_tables.target_table_id
-            ORDER BY cluster, target_schema, target_table, start_time ASC
+                    cluster = '{db_name}' AND
+                    qs.user_id <> 1 AND -- this is user 'rdsdb'
+                    qs.start_time >= '{start_time}' AND
+                    qs.start_time < '{end_time}'
+                GROUP BY cluster, "schema", "table", qs.table_id, query_id, step_name, username, source -- to be sure we are not making duplicates ourselves the list of group by must match whatever we use in "group by" and "where" of subsequent queries ("cluster" is already set to single value in this query)
+            ),
+            unique_query_text AS (
+                SELECT
+                    query_id,
+                    sequence,
+                    text
+                FROM (
+                    SELECT
+                        query_id,
+                        "sequence",
+                        text,
+                        ROW_NUMBER() OVER (
+                        PARTITION BY query_id, sequence
+                        ) as rn
+                    FROM SYS_QUERY_TEXT
+                    )
+                WHERE rn = 1
+            ),
+            scan_queries AS (
+                SELECT
+                    "schema" as source_schema,
+                    "table" as source_table,
+                    table_id as source_table_id,
+                    queries.query_id as query_id,
+                    username,
+                    LISTAGG(qt."text") WITHIN GROUP (ORDER BY sequence) AS query_text
+                FROM
+                    "queries" LEFT JOIN
+                    unique_query_text qt ON qt.query_id = queries.query_id
+                WHERE
+                    source = 'Redshift(local)' AND
+                    step_name = 'scan' AND
+                    qt.sequence < 16 -- truncating query to not exceed Redshift limit on LISTAGG function (each sequence has at most 4k characters, limit is 64k, divided by 4k gives 16, starts count from 0)
+                GROUP BY source_schema, source_table, source_table_id, queries.query_id, username
+            ),
+            insert_queries AS (
+                SELECT
+                    "schema" as target_schema,
+                    "table" as target_table,
+                    table_id as target_table_id,
+                    query_id,
+                    cluster,
+                    min("timestamp") as "timestamp"
+                FROM
+                    queries
+                WHERE
+                    step_name = 'insert'
+                GROUP BY cluster, target_schema, target_table, target_table_id, query_id
+            )
+            SELECT
+                cluster,
+                target_schema,
+                target_table,
+                username,
+                source_schema,
+                source_table,
+                query_text AS ddl,
+                "timestamp"
+            FROM scan_queries
+                JOIN insert_queries on insert_queries.query_id = scan_queries.query_id
+            WHERE source_table_id <> target_table_id
+            ORDER BY cluster, target_schema, target_table, "timestamp" ASC;
                     """.format(
             # We need the original database name for filtering
             db_name=db_name,

From 7ac6523b2de6f46edadd83d834f694c892a4c761 Mon Sep 17 00:00:00 2001
From: josges <josges@hotmail.com>
Date: Mon, 20 Jan 2025 15:07:12 +0100
Subject: [PATCH 125/249] fix(ingestion): fix stateful ingestion for GCS source
 (#11879)

---
 .../src/datahub/ingestion/source/gcs/gcs_source.py         | 3 ++-
 metadata-ingestion/tests/unit/test_gcs_source.py           | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/gcs/gcs_source.py b/metadata-ingestion/src/datahub/ingestion/source/gcs/gcs_source.py
index 5196c8ec5b998b..95490147d48204 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/gcs/gcs_source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/gcs/gcs_source.py
@@ -88,6 +88,7 @@ def __init__(self, config: GCSSourceConfig, ctx: PipelineContext):
         super().__init__(config, ctx)
         self.config = config
         self.report = GCSSourceReport()
+        self.platform: str = PLATFORM_GCS
         self.s3_source = self.create_equivalent_s3_source(ctx)
 
     @classmethod
@@ -135,7 +136,7 @@ def create_equivalent_s3_path_specs(self):
 
     def create_equivalent_s3_source(self, ctx: PipelineContext) -> S3Source:
         config = self.create_equivalent_s3_config()
-        return self.s3_source_overrides(S3Source(config, ctx))
+        return self.s3_source_overrides(S3Source(config, PipelineContext(ctx.run_id)))
 
     def s3_source_overrides(self, source: S3Source) -> S3Source:
         source.source_config.platform = PLATFORM_GCS
diff --git a/metadata-ingestion/tests/unit/test_gcs_source.py b/metadata-ingestion/tests/unit/test_gcs_source.py
index 9d5f4e915b18cf..5b99862c92a04b 100644
--- a/metadata-ingestion/tests/unit/test_gcs_source.py
+++ b/metadata-ingestion/tests/unit/test_gcs_source.py
@@ -1,13 +1,17 @@
+from unittest import mock
+
 import pytest
 from pydantic import ValidationError
 
 from datahub.ingestion.api.common import PipelineContext
+from datahub.ingestion.graph.client import DataHubGraph
 from datahub.ingestion.source.data_lake_common.data_lake_utils import PLATFORM_GCS
 from datahub.ingestion.source.gcs.gcs_source import GCSSource
 
 
 def test_gcs_source_setup():
-    ctx = PipelineContext(run_id="test-gcs")
+    graph = mock.MagicMock(spec=DataHubGraph)
+    ctx = PipelineContext(run_id="test-gcs", graph=graph, pipeline_name="test-gcs")
 
     # Baseline: valid config
     source: dict = {
@@ -18,6 +22,7 @@ def test_gcs_source_setup():
             }
         ],
         "credential": {"hmac_access_id": "id", "hmac_access_secret": "secret"},
+        "stateful_ingestion": {"enabled": "true"},
     }
     gcs = GCSSource.create(source, ctx)
     assert gcs.s3_source.source_config.platform == PLATFORM_GCS

From 2109abdc1a1de5fe711900ee47e5f5891d2c59dc Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Mon, 20 Jan 2025 22:32:43 +0530
Subject: [PATCH 126/249] feat(cli/delete): add --urn-file option (#12247)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sergio Gómez Villamor <sgomezvillamor@gmail.com>
---
 .../src/datahub/cli/delete_cli.py              | 18 ++++++++++++++++--
 .../cli/delete_cmd/test_timeseries_delete.py   |  1 +
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/metadata-ingestion/src/datahub/cli/delete_cli.py b/metadata-ingestion/src/datahub/cli/delete_cli.py
index 8501cf71f0d544..f77156b4bd7544 100644
--- a/metadata-ingestion/src/datahub/cli/delete_cli.py
+++ b/metadata-ingestion/src/datahub/cli/delete_cli.py
@@ -265,6 +265,11 @@ def undo_by_filter(
     type=str,
     help="Urn of the entity to delete, for single entity deletion",
 )
+@click.option(
+    "--urn-file",
+    required=False,
+    help="Path of file with urns (one per line) to be deleted",
+)
 @click.option(
     "-a",
     "--aspect",
@@ -353,6 +358,7 @@ def undo_by_filter(
 @telemetry.with_telemetry()
 def by_filter(
     urn: Optional[str],
+    urn_file: Optional[str],
     aspect: Optional[str],
     force: bool,
     soft: bool,
@@ -373,6 +379,7 @@ def by_filter(
     # Validate the cli arguments.
     _validate_user_urn_and_filters(
         urn=urn,
+        urn_file=urn_file,
         entity_type=entity_type,
         platform=platform,
         env=env,
@@ -429,6 +436,12 @@ def by_filter(
                         batch_size=batch_size,
                     )
                 )
+    elif urn_file:
+        with open(urn_file, "r") as r:
+            urns = []
+            for line in r.readlines():
+                urn = line.strip().strip('"')
+                urns.append(urn)
     else:
         urns = list(
             graph.get_urns_by_filter(
@@ -537,6 +550,7 @@ def process_urn(urn):
 
 def _validate_user_urn_and_filters(
     urn: Optional[str],
+    urn_file: Optional[str],
     entity_type: Optional[str],
     platform: Optional[str],
     env: Optional[str],
@@ -549,9 +563,9 @@ def _validate_user_urn_and_filters(
             raise click.UsageError(
                 "You cannot provide both an urn and a filter rule (entity-type / platform / env / query)."
             )
-    elif not urn and not (entity_type or platform or env or query):
+    elif not urn and not urn_file and not (entity_type or platform or env or query):
         raise click.UsageError(
-            "You must provide either an urn or at least one filter (entity-type / platform / env / query) in order to delete entities."
+            "You must provide either an urn or urn_file or at least one filter (entity-type / platform / env / query) in order to delete entities."
         )
     elif query:
         logger.warning(
diff --git a/smoke-test/tests/cli/delete_cmd/test_timeseries_delete.py b/smoke-test/tests/cli/delete_cmd/test_timeseries_delete.py
index 99ed790f25ffd7..745224a099fc53 100644
--- a/smoke-test/tests/cli/delete_cmd/test_timeseries_delete.py
+++ b/smoke-test/tests/cli/delete_cmd/test_timeseries_delete.py
@@ -97,6 +97,7 @@ def datahub_delete(auth_session, params: List[str]) -> None:
     args: List[str] = ["delete"]
     args.extend(params)
     args.append("--hard")
+    logger.info(f"Running delete command with args: {args}")
     delete_result: Result = runner.invoke(
         datahub,
         args,

From a20f660ac109ed0d989893de26ad0902acf5b1d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20L=C3=BCdin?=
 <13187726+Masterchen09@users.noreply.github.com>
Date: Mon, 20 Jan 2025 23:57:22 +0100
Subject: [PATCH 127/249] fix(graphql): removed duplicated entity in
 EntityTypeUrnMapper (#12406)

---
 .../types/entitytype/EntityTypeUrnMapper.java |  3 --
 .../entitytype/EntityTypeMapperTest.java      | 20 +++++++++++++
 .../entitytype/EntityTypeUrnMapperTest.java   | 30 +++++++++++++++++++
 3 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeMapperTest.java
 create mode 100644 datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapperTest.java

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapper.java
index 5b72c2b3c11c5e..334faf753cb8b5 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapper.java
@@ -77,9 +77,6 @@ public class EntityTypeUrnMapper {
           .put(
               Constants.BUSINESS_ATTRIBUTE_ENTITY_NAME,
               "urn:li:entityType:datahub.businessAttribute")
-          .put(
-              Constants.DATA_PROCESS_INSTANCE_ENTITY_NAME,
-              "urn:li:entityType:datahub.dataProcessInstance")
           .build();
 
   private static final Map<String, String> ENTITY_TYPE_URN_TO_NAME =
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeMapperTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeMapperTest.java
new file mode 100644
index 00000000000000..79cc7725b1fc7f
--- /dev/null
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeMapperTest.java
@@ -0,0 +1,20 @@
+package com.linkedin.datahub.graphql.types.entitytype;
+
+import static org.testng.Assert.*;
+
+import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.metadata.Constants;
+import org.testng.annotations.Test;
+
+public class EntityTypeMapperTest {
+
+  @Test
+  public void testGetType() throws Exception {
+    assertEquals(EntityTypeMapper.getType(Constants.DATASET_ENTITY_NAME), EntityType.DATASET);
+  }
+
+  @Test
+  public void testGetName() throws Exception {
+    assertEquals(EntityTypeMapper.getName(EntityType.DATASET), Constants.DATASET_ENTITY_NAME);
+  }
+}
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapperTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapperTest.java
new file mode 100644
index 00000000000000..ed16226d0685ee
--- /dev/null
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapperTest.java
@@ -0,0 +1,30 @@
+package com.linkedin.datahub.graphql.types.entitytype;
+
+import static org.testng.Assert.*;
+
+import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.metadata.Constants;
+import org.testng.annotations.Test;
+
+public class EntityTypeUrnMapperTest {
+
+  @Test
+  public void testGetName() throws Exception {
+    assertEquals(
+        EntityTypeUrnMapper.getName("urn:li:entityType:datahub.dataset"),
+        Constants.DATASET_ENTITY_NAME);
+  }
+
+  @Test
+  public void testGetEntityType() throws Exception {
+    assertEquals(
+        EntityTypeUrnMapper.getEntityType("urn:li:entityType:datahub.dataset"), EntityType.DATASET);
+  }
+
+  @Test
+  public void testGetEntityTypeUrn() throws Exception {
+    assertEquals(
+        EntityTypeUrnMapper.getEntityTypeUrn(Constants.DATASET_ENTITY_NAME),
+        "urn:li:entityType:datahub.dataset");
+  }
+}

From 4b79e7525f53e3b70fc9397418404ad7fd96de8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20G=C3=B3mez=20Villamor?= <sgomezvillamor@gmail.com>
Date: Tue, 21 Jan 2025 09:44:19 +0100
Subject: [PATCH 128/249] fix(ingestion): groupby_unsorted (#12403)

---
 .../source/bigquery_v2/bigquery_schema_gen.py   |  4 ++--
 .../datahub/ingestion/source/dbt/dbt_common.py  |  4 ++--
 .../ingestion/source/sql/hive_metastore.py      |  6 +++---
 .../datahub/ingestion/source/sql/teradata.py    |  4 ++--
 .../sql_parsing/sql_parsing_aggregator.py       |  6 +++---
 .../src/datahub/utilities/groupby.py            | 17 +++++++++++++++++
 .../test_overlapping_inserts.json               |  8 ++++----
 ...st_overlapping_inserts_from_temp_tables.json | 16 ++++++++--------
 .../tests/unit/utilities/test_utilities.py      | 11 +++++++++++
 9 files changed, 52 insertions(+), 24 deletions(-)
 create mode 100644 metadata-ingestion/src/datahub/utilities/groupby.py

diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py
index ebfbbf0639c38c..1cace31a5e4c49 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_schema_gen.py
@@ -2,7 +2,6 @@
 import re
 from base64 import b32decode
 from collections import defaultdict
-from itertools import groupby
 from typing import Dict, Iterable, List, Optional, Set, Type, Union, cast
 
 from google.cloud.bigquery.table import TableListItem
@@ -101,6 +100,7 @@
 from datahub.metadata.urns import TagUrn
 from datahub.sql_parsing.schema_resolver import SchemaResolver
 from datahub.utilities.file_backed_collections import FileBackedDict
+from datahub.utilities.groupby import groupby_unsorted
 from datahub.utilities.hive_schema_to_avro import (
     HiveColumnToAvroConverter,
     get_schema_fields_for_hive_column,
@@ -730,7 +730,7 @@ def gen_foreign_keys(
         foreign_keys: List[BigqueryTableConstraint] = list(
             filter(lambda x: x.type == "FOREIGN KEY", table.constraints)
         )
-        for key, group in groupby(
+        for key, group in groupby_unsorted(
             foreign_keys,
             lambda x: f"{x.referenced_project_id}.{x.referenced_dataset}.{x.referenced_table_name}",
         ):
diff --git a/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_common.py b/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_common.py
index fa85308b325979..99fa09b8b20b9b 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_common.py
@@ -1,4 +1,3 @@
-import itertools
 import logging
 import re
 from abc import abstractmethod
@@ -111,6 +110,7 @@
     parse_statements_and_pick,
     try_format_query,
 )
+from datahub.utilities.groupby import groupby_unsorted
 from datahub.utilities.lossy_collections import LossyList
 from datahub.utilities.mapping import Constants, OperationProcessor
 from datahub.utilities.time import datetime_to_ts_millis
@@ -1929,7 +1929,7 @@ def _translate_dbt_name_to_upstream_urn(dbt_name: str) -> str:
                             else None
                         ),
                     )
-                    for downstream, upstreams in itertools.groupby(
+                    for downstream, upstreams in groupby_unsorted(
                         node.upstream_cll, lambda x: x.downstream_col
                     )
                 ]
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/hive_metastore.py b/metadata-ingestion/src/datahub/ingestion/source/sql/hive_metastore.py
index 60ecbaf38838a6..82b22d896698a8 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/hive_metastore.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/hive_metastore.py
@@ -2,7 +2,6 @@
 import json
 import logging
 from collections import namedtuple
-from itertools import groupby
 from typing import Any, Dict, Iterable, List, Optional, Tuple, Union
 
 from pydantic.dataclasses import dataclass
@@ -58,6 +57,7 @@
     SubTypesClass,
     ViewPropertiesClass,
 )
+from datahub.utilities.groupby import groupby_unsorted
 from datahub.utilities.hive_schema_to_avro import get_schema_fields_for_hive_column
 from datahub.utilities.str_enum import StrEnum
 
@@ -490,7 +490,7 @@ def loop_tables(
 
         iter_res = self._alchemy_client.execute_query(statement)
 
-        for key, group in groupby(iter_res, self._get_table_key):
+        for key, group in groupby_unsorted(iter_res, self._get_table_key):
             schema_name = (
                 f"{db_name}.{key.schema}"
                 if self.config.include_catalog_name_in_ids
@@ -647,7 +647,7 @@ def get_hive_view_columns(self, inspector: Inspector) -> Iterable[ViewDataset]:
         )
 
         iter_res = self._alchemy_client.execute_query(statement)
-        for key, group in groupby(iter_res, self._get_table_key):
+        for key, group in groupby_unsorted(iter_res, self._get_table_key):
             db_name = self.get_db_name(inspector)
 
             schema_name = (
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/teradata.py b/metadata-ingestion/src/datahub/ingestion/source/sql/teradata.py
index 84b65d6635e9d4..e6319f668ecb8c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/teradata.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/teradata.py
@@ -3,7 +3,6 @@
 from dataclasses import dataclass
 from datetime import datetime
 from functools import lru_cache
-from itertools import groupby
 from typing import (
     Any,
     Dict,
@@ -59,6 +58,7 @@
 from datahub.metadata.schema_classes import SchemaMetadataClass
 from datahub.sql_parsing.schema_resolver import SchemaResolver
 from datahub.sql_parsing.sqlglot_lineage import sqlglot_lineage
+from datahub.utilities.groupby import groupby_unsorted
 
 logger: logging.Logger = logging.getLogger(__name__)
 
@@ -286,7 +286,7 @@ def grouper(fk_row):
 
     # TODO: Check if there's a better way
     fk_dicts = list()
-    for constraint_info, constraint_cols in groupby(res, grouper):
+    for constraint_info, constraint_cols in groupby_unsorted(res, grouper):
         fk_dict = {
             "name": str(constraint_info["name"]),
             "constrained_columns": list(),
diff --git a/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py b/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py
index 8637802f6b9fee..893e89f177094f 100644
--- a/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py
+++ b/metadata-ingestion/src/datahub/sql_parsing/sql_parsing_aggregator.py
@@ -2,7 +2,6 @@
 import dataclasses
 import enum
 import functools
-import itertools
 import json
 import logging
 import os
@@ -63,6 +62,7 @@
     FileBackedDict,
     FileBackedList,
 )
+from datahub.utilities.groupby import groupby_unsorted
 from datahub.utilities.lossy_collections import LossyDict, LossyList
 from datahub.utilities.ordered_set import OrderedSet
 from datahub.utilities.perf_timer import PerfTimer
@@ -1314,8 +1314,8 @@ def _gen_lineage_for_downstream(
         upstream_aspect.fineGrainedLineages = []
         for downstream_column, all_upstream_columns in cll.items():
             # Group by query ID.
-            for query_id, upstream_columns_for_query in itertools.groupby(
-                sorted(all_upstream_columns.items(), key=lambda x: x[1]),
+            for query_id, upstream_columns_for_query in groupby_unsorted(
+                all_upstream_columns.items(),
                 key=lambda x: x[1],
             ):
                 upstream_columns = [x[0] for x in upstream_columns_for_query]
diff --git a/metadata-ingestion/src/datahub/utilities/groupby.py b/metadata-ingestion/src/datahub/utilities/groupby.py
new file mode 100644
index 00000000000000..463bca44c1e49c
--- /dev/null
+++ b/metadata-ingestion/src/datahub/utilities/groupby.py
@@ -0,0 +1,17 @@
+import collections
+from typing import Callable, Iterable, Tuple, TypeVar
+
+T = TypeVar("T")
+K = TypeVar("K")
+
+
+def groupby_unsorted(
+    iterable: Iterable[T], key: Callable[[T], K]
+) -> Iterable[Tuple[K, Iterable[T]]]:
+    """The default itertools.groupby() requires that the iterable is already sorted by the key.
+    This method is similar to groupby() but without the pre-sorted requirement."""
+
+    values = collections.defaultdict(list)
+    for v in iterable:
+        values[key(v)].append(v)
+    return values.items()
diff --git a/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_overlapping_inserts.json b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_overlapping_inserts.json
index fcbe0ec5aeb839..fa693381854972 100644
--- a/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_overlapping_inserts.json
+++ b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_overlapping_inserts.json
@@ -38,26 +38,26 @@
                 {
                     "upstreamType": "FIELD_SET",
                     "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.upstream1,PROD),a)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.upstream2,PROD),a)"
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.downstream,PROD),a)"
                     ],
                     "confidenceScore": 0.2,
-                    "query": "urn:li:query:377a73bbf094c8b176b15157c24242cdfc7a0f407d78e52e63ded08c913468f1"
+                    "query": "urn:li:query:c4b3a21ef8c262ebbe99a5bdb6c29cb0be646392bb4af10b6f4a758af881470e"
                 },
                 {
                     "upstreamType": "FIELD_SET",
                     "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.upstream2,PROD),a)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.upstream1,PROD),a)"
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.downstream,PROD),a)"
                     ],
                     "confidenceScore": 0.2,
-                    "query": "urn:li:query:c4b3a21ef8c262ebbe99a5bdb6c29cb0be646392bb4af10b6f4a758af881470e"
+                    "query": "urn:li:query:377a73bbf094c8b176b15157c24242cdfc7a0f407d78e52e63ded08c913468f1"
                 },
                 {
                     "upstreamType": "FIELD_SET",
diff --git a/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_overlapping_inserts_from_temp_tables.json b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_overlapping_inserts_from_temp_tables.json
index ed8009477bf4db..0f9870cda322c2 100644
--- a/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_overlapping_inserts_from_temp_tables.json
+++ b/metadata-ingestion/tests/unit/sql_parsing/aggregator_goldens/test_overlapping_inserts_from_temp_tables.json
@@ -64,26 +64,26 @@
                 {
                     "upstreamType": "FIELD_SET",
                     "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.in_person_returns,PROD),customer_id)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.online_returns,PROD),customer_id)"
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.all_returns,PROD),customer_id)"
                     ],
                     "confidenceScore": 0.2,
-                    "query": "urn:li:query:composite_6b5a11e96e3d2b742e4e4ec3310bb538d0f5c0c6496b84e4bfe0e8014d5f5b45"
+                    "query": "urn:li:query:composite_adc1c41c0ad37c643776d9d93d524e6c435a7e70633da1ce7e3222dda4bb9fb8"
                 },
                 {
                     "upstreamType": "FIELD_SET",
                     "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.online_returns,PROD),customer_id)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.in_person_returns,PROD),customer_id)"
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.all_returns,PROD),customer_id)"
                     ],
                     "confidenceScore": 0.2,
-                    "query": "urn:li:query:composite_adc1c41c0ad37c643776d9d93d524e6c435a7e70633da1ce7e3222dda4bb9fb8"
+                    "query": "urn:li:query:composite_6b5a11e96e3d2b742e4e4ec3310bb538d0f5c0c6496b84e4bfe0e8014d5f5b45"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -100,26 +100,26 @@
                 {
                     "upstreamType": "FIELD_SET",
                     "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.in_person_returns,PROD),return_date)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.online_returns,PROD),return_date)"
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.all_returns,PROD),return_date)"
                     ],
                     "confidenceScore": 0.2,
-                    "query": "urn:li:query:composite_6b5a11e96e3d2b742e4e4ec3310bb538d0f5c0c6496b84e4bfe0e8014d5f5b45"
+                    "query": "urn:li:query:composite_adc1c41c0ad37c643776d9d93d524e6c435a7e70633da1ce7e3222dda4bb9fb8"
                 },
                 {
                     "upstreamType": "FIELD_SET",
                     "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.online_returns,PROD),return_date)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.in_person_returns,PROD),return_date)"
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
                         "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:redshift,dev.public.all_returns,PROD),return_date)"
                     ],
                     "confidenceScore": 0.2,
-                    "query": "urn:li:query:composite_adc1c41c0ad37c643776d9d93d524e6c435a7e70633da1ce7e3222dda4bb9fb8"
+                    "query": "urn:li:query:composite_6b5a11e96e3d2b742e4e4ec3310bb538d0f5c0c6496b84e4bfe0e8014d5f5b45"
                 },
                 {
                     "upstreamType": "FIELD_SET",
diff --git a/metadata-ingestion/tests/unit/utilities/test_utilities.py b/metadata-ingestion/tests/unit/utilities/test_utilities.py
index c333ceb136fffc..52406d37de46a6 100644
--- a/metadata-ingestion/tests/unit/utilities/test_utilities.py
+++ b/metadata-ingestion/tests/unit/utilities/test_utilities.py
@@ -6,6 +6,7 @@
 from datahub.sql_parsing.sqlglot_lineage import sqlglot_lineage
 from datahub.testing.doctest import assert_doctest
 from datahub.utilities.delayed_iter import delayed_iter
+from datahub.utilities.groupby import groupby_unsorted
 from datahub.utilities.is_pytest import is_pytest_running
 from datahub.utilities.urns.dataset_urn import DatasetUrn
 
@@ -335,3 +336,13 @@ def test_logging_name_extraction() -> None:
 
 def test_is_pytest_running() -> None:
     assert is_pytest_running()
+
+
+def test_groupby_unsorted():
+    grouped = groupby_unsorted("ABCAC", key=lambda x: x)
+
+    assert list(grouped) == [
+        ("A", ["A", "A"]),
+        ("B", ["B"]),
+        ("C", ["C", "C"]),
+    ]

From 8ac35fa9ee6229ab7b8c0f4b2a0e669113574cd1 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Tue, 21 Jan 2025 20:03:55 +0530
Subject: [PATCH 129/249] fix(ingest/redshift): example recipe fix (#12413)

---
 metadata-ingestion/docs/sources/redshift/redshift_recipe.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metadata-ingestion/docs/sources/redshift/redshift_recipe.yml b/metadata-ingestion/docs/sources/redshift/redshift_recipe.yml
index a561405d3de47e..e6d2dc3de551d6 100644
--- a/metadata-ingestion/docs/sources/redshift/redshift_recipe.yml
+++ b/metadata-ingestion/docs/sources/redshift/redshift_recipe.yml
@@ -1,3 +1,4 @@
+source:
   type: redshift
   config:
     # Coordinates

From 1f4e14006a424a5938bd5c51217236fd3734aa47 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Tue, 21 Jan 2025 09:19:48 -0800
Subject: [PATCH 130/249] refactor(smoke): use pytest.raises instead of custom
 solution (#12333)

---
 .../test_structured_properties.py             | 145 ++++--------------
 1 file changed, 34 insertions(+), 111 deletions(-)

diff --git a/smoke-test/tests/structured_properties/test_structured_properties.py b/smoke-test/tests/structured_properties/test_structured_properties.py
index 103d4e79bad3b0..9b05b99950fac2 100644
--- a/smoke-test/tests/structured_properties/test_structured_properties.py
+++ b/smoke-test/tests/structured_properties/test_structured_properties.py
@@ -1,16 +1,17 @@
 import logging
 import os
+import re
 import tempfile
 from random import randint
 from typing import Iterable, List, Optional, Union
 
+import pydantic
 import pytest
-
-# import tenacity
 from datahub.api.entities.dataset.dataset import Dataset
 from datahub.api.entities.structuredproperties.structuredproperties import (
     StructuredProperties,
 )
+from datahub.configuration.common import GraphError, OperationalError
 from datahub.emitter.mce_builder import make_dataset_urn, make_schema_field_urn
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.graph.client import DataHubGraph
@@ -173,10 +174,6 @@ def to_es_filter_name(
         return f"structuredProperties.{qualified_name}"
 
 
-# @tenacity.retry(
-#     stop=tenacity.stop_after_attempt(sleep_times),
-#     wait=tenacity.wait_fixed(sleep_sec),
-# )
 def test_structured_property_string(ingest_cleanup_data, graph_client):
     property_name = f"retention{randint(10, 10000)}Policy"
 
@@ -186,24 +183,13 @@ def test_structured_property_string(ingest_cleanup_data, graph_client):
         dataset_urns[0], property_name, ["30d"], graph=graph_client
     )
 
-    try:
+    with pytest.raises(OperationalError):
+        # Cannot add a number to a string property.
         attach_property_to_entity(
             dataset_urns[0], property_name, 200030, graph=graph_client
         )
-        raise AssertionError(
-            "Should not be able to attach a number to a string property"
-        )
-    except Exception as e:
-        if not isinstance(e, AssertionError):
-            pass
-        else:
-            raise e
 
 
-# @tenacity.retry(
-#     stop=tenacity.stop_after_attempt(sleep_times),
-#     wait=tenacity.wait_fixed(sleep_sec),
-# )
 def test_structured_property_double(ingest_cleanup_data, graph_client):
     property_name = f"expiryTime{randint(10, 10000)}"
 
@@ -213,35 +199,19 @@ def test_structured_property_double(ingest_cleanup_data, graph_client):
         dataset_urns[0], property_name, 2000034, graph=graph_client
     )
 
-    try:
+    with pytest.raises(OperationalError):
+        # Cannot add a string to a number property.
         attach_property_to_entity(
             dataset_urns[0], property_name, "30 days", graph=graph_client
         )
-        raise AssertionError(
-            "Should not be able to attach a string to a number property"
-        )
-    except Exception as e:
-        if not isinstance(e, AssertionError):
-            pass
-        else:
-            raise e
 
-    try:
+    with pytest.raises(OperationalError):
+        # Cannot add a list to a number property.
         attach_property_to_entity(
             dataset_urns[0], property_name, [2000034, 2000035], graph=graph_client
         )
-        raise AssertionError("Should not be able to attach a list to a number property")
-    except Exception as e:
-        if not isinstance(e, AssertionError):
-            pass
-        else:
-            raise e
-
-
-# @tenacity.retry(
-#     stop=tenacity.stop_after_attempt(sleep_times),
-#     wait=tenacity.wait_fixed(sleep_sec),
-# )
+
+
 def test_structured_property_double_multiple(ingest_cleanup_data, graph_client):
     property_name = f"versions{randint(10, 10000)}"
 
@@ -254,10 +224,6 @@ def test_structured_property_double_multiple(ingest_cleanup_data, graph_client):
     )
 
 
-# @tenacity.retry(
-#     stop=tenacity.stop_after_attempt(sleep_times),
-#     wait=tenacity.wait_fixed(sleep_sec),
-# )
 def test_structured_property_string_allowed_values(ingest_cleanup_data, graph_client):
     property_name = f"enumProperty{randint(10, 10000)}"
 
@@ -276,18 +242,13 @@ def test_structured_property_string_allowed_values(ingest_cleanup_data, graph_cl
         dataset_urns[0], property_name, ["foo", "bar"], graph=graph_client
     )
 
-    try:
+    with pytest.raises(
+        OperationalError, match=re.escape("value: {string=baz} should be one of [")
+    ):
+        # Cannot add a value that isn't in the allowed values list.
         attach_property_to_entity(
             dataset_urns[0], property_name, ["foo", "baz"], graph=graph_client
         )
-        raise AssertionError(
-            "Should not be able to attach a value not in allowed values"
-        )
-    except Exception as e:
-        if "value: {string=baz} should be one of [" in str(e):
-            pass
-        else:
-            raise e
 
 
 def test_structured_property_definition_evolution(ingest_cleanup_data, graph_client):
@@ -304,7 +265,8 @@ def test_structured_property_definition_evolution(ingest_cleanup_data, graph_cli
         ],
     )
 
-    try:
+    with pytest.raises(OperationalError):
+        # Cannot change cardinality from MULTIPLE to SINGLE.
         create_property_definition(
             property_name,
             graph_client,
@@ -315,20 +277,8 @@ def test_structured_property_definition_evolution(ingest_cleanup_data, graph_cli
                 PropertyValueClass(value="bar"),
             ],
         )
-        raise AssertionError(
-            "Should not be able to change cardinality from MULTIPLE to SINGLE"
-        )
-    except Exception as e:
-        if isinstance(e, AssertionError):
-            raise e
-        else:
-            pass
 
 
-# @tenacity.retry(
-#     stop=tenacity.stop_after_attempt(sleep_times),
-#     wait=tenacity.wait_fixed(sleep_sec),
-# )
 def test_structured_property_schema_field(ingest_cleanup_data, graph_client):
     property_name = f"deprecationDate{randint(10, 10000)}"
 
@@ -354,7 +304,8 @@ def test_structured_property_schema_field(ingest_cleanup_data, graph_client):
         graph=graph_client,
     ) == ["2020-10-01"]
 
-    try:
+    with pytest.raises(OperationalError):
+        # Cannot add a number to a date property.
         attach_property_to_entity(
             schema_field_urns[0],
             property_name,
@@ -362,30 +313,19 @@ def test_structured_property_schema_field(ingest_cleanup_data, graph_client):
             graph=graph_client,
             namespace="io.datahubproject.test",
         )
-        raise AssertionError("Should not be able to attach a number to a DATE property")
-    except Exception as e:
-        if not isinstance(e, AssertionError):
-            pass
-        else:
-            raise e
 
 
 def test_structured_properties_yaml_load_with_bad_entity_type(
     ingest_cleanup_data, graph_client
 ):
-    try:
+    with pytest.raises(
+        pydantic.ValidationError,
+        match="urn:li:entityType:dataset is not a valid entity type urn",
+    ):
         StructuredProperties.create(
             "tests/structured_properties/bad_entity_type.yaml",
             graph=graph_client,
         )
-        raise AssertionError(
-            "Should not be able to create structured properties with bad entity type"
-        )
-    except Exception as e:
-        if "urn:li:entityType:dataset is not a valid entity type urn" in str(e):
-            pass
-        else:
-            raise e
 
 
 def test_dataset_yaml_loader(ingest_cleanup_data, graph_client):
@@ -617,35 +557,24 @@ def test_dataset_structured_property_soft_delete_validation(
     graph_client.soft_delete_entity(urn=property_urn)
 
     # Attempt to modify soft deleted definition
-    try:
+    with pytest.raises(
+        OperationalError,
+        match="Cannot mutate a soft deleted Structured Property Definition",
+    ):
         create_property_definition(
             property_name=property_name,
             graph=graph_client,
             value_type=value_type,
             cardinality="SINGLE",
         )
-        raise AssertionError(
-            "Should not be able to modify soft deleted structured property"
-        )
-    except Exception as e:
-        if "Cannot mutate a soft deleted Structured Property Definition" in str(e):
-            pass
-        else:
-            raise e
 
     # Attempt to add soft deleted structured property to entity
-    try:
+    with pytest.raises(
+        OperationalError, match="Cannot apply a soft deleted Structured Property value"
+    ):
         attach_property_to_entity(
             dataset_urns[0], property_name, "test string", graph=graph_client
         )
-        raise AssertionError(
-            "Should not be able to apply a soft deleted structured property to another entity"
-        )
-    except Exception as e:
-        if "Cannot apply a soft deleted Structured Property value" in str(e):
-            pass
-        else:
-            raise e
 
 
 def test_dataset_structured_property_soft_delete_read_mutation(
@@ -685,7 +614,7 @@ def test_dataset_structured_property_soft_delete_read_mutation(
 
 
 def test_dataset_structured_property_soft_delete_search_filter_validation(
-    ingest_cleanup_data, graph_client, caplog
+    ingest_cleanup_data, graph_client: DataHubGraph, caplog: pytest.LogCaptureFixture
 ):
     # Create a test structured property
     dataset_property_name = f"softDeleteSearchFilter{randint(10, 10000)}"
@@ -722,7 +651,9 @@ def test_dataset_structured_property_soft_delete_search_filter_validation(
     wait_for_writes_to_sync()
 
     # Perform search, make sure it validates filter and rejects as invalid request
-    try:
+    with pytest.raises(
+        GraphError, match="Cannot filter on deleted Structured Property"
+    ):
         list(
             graph_client.get_urns_by_filter(
                 extraFilters=[
@@ -734,14 +665,6 @@ def test_dataset_structured_property_soft_delete_search_filter_validation(
                 ]
             )
         )
-        raise AssertionError(
-            "Should not be able to filter by soft deleted structured property"
-        )
-    except Exception as e:
-        if "Cannot filter on deleted Structured Property" in str(e):
-            pass
-        else:
-            raise e
 
 
 def test_dataset_structured_property_delete(ingest_cleanup_data, graph_client, caplog):

From c2a071bbd045c7050c1a04c3d1409b3be7b05050 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Tue, 21 Jan 2025 12:54:10 -0800
Subject: [PATCH 131/249] fix(smoke): fix lint failure (#12419)

---
 .../tests/structured_properties/test_structured_properties.py    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/smoke-test/tests/structured_properties/test_structured_properties.py b/smoke-test/tests/structured_properties/test_structured_properties.py
index 9b05b99950fac2..8b0f61d8a5ea26 100644
--- a/smoke-test/tests/structured_properties/test_structured_properties.py
+++ b/smoke-test/tests/structured_properties/test_structured_properties.py
@@ -7,6 +7,7 @@
 
 import pydantic
 import pytest
+
 from datahub.api.entities.dataset.dataset import Dataset
 from datahub.api.entities.structuredproperties.structuredproperties import (
     StructuredProperties,

From 995857c8bb0fbab90967f989ebfa981bb86bbe2a Mon Sep 17 00:00:00 2001
From: Shirshanka Das <shirshanka@apache.org>
Date: Tue, 21 Jan 2025 13:58:31 -0800
Subject: [PATCH 132/249] fix(ci): remove platform from dataprocessinstance gql
 (#12408)

---
 .../com/linkedin/datahub/graphql/GmsGraphQLEngine.java | 10 ----------
 .../mappers/DataProcessInstanceMapper.java             |  5 -----
 datahub-graphql-core/src/main/resources/entity.graphql |  5 -----
 .../mappers/DataProcessInstanceMapperTest.java         |  7 ++++---
 .../dataProcessInstance/DataProcessInstanceEntity.tsx  | 10 ++++++----
 .../src/graphql/dataProcessInstance.graphql            |  6 ------
 docs/how/updating-datahub.md                           |  2 ++
 .../test_data_process_instance.py                      |  7 -------
 8 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
index 403e80a71380be..2c5e841322f45f 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
@@ -3108,16 +3108,6 @@ private void configureDataProcessInstanceResolvers(final RuntimeWiring.Builder b
                               ? dataProcessInstance.getDataPlatformInstance().getUrn()
                               : null;
                         }))
-                .dataFetcher(
-                    "platform",
-                    new LoadableTypeResolver<>(
-                        dataPlatformType,
-                        (env) -> {
-                          final DataProcessInstance dataProcessInstance = env.getSource();
-                          return dataProcessInstance.getPlatform() != null
-                              ? dataProcessInstance.getPlatform().getUrn()
-                              : null;
-                        }))
                 .dataFetcher("parentContainers", new ParentContainersResolver(entityClient))
                 .dataFetcher(
                     "container",
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapper.java
index 28c9c8936fdbfb..d721f5a5fb522d 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapper.java
@@ -8,7 +8,6 @@
 import com.linkedin.data.DataMap;
 import com.linkedin.data.template.RecordTemplate;
 import com.linkedin.datahub.graphql.QueryContext;
-import com.linkedin.datahub.graphql.generated.DataPlatform;
 import com.linkedin.datahub.graphql.generated.DataProcessInstance;
 import com.linkedin.datahub.graphql.generated.EntityType;
 import com.linkedin.datahub.graphql.types.common.mappers.AuditStampMapper;
@@ -80,10 +79,6 @@ public DataProcessInstance apply(
           DataPlatformInstance dataPlatformInstance = new DataPlatformInstance(dataMap);
           dataProcessInstance.setDataPlatformInstance(
               DataPlatformInstanceAspectMapper.map(context, dataPlatformInstance));
-          DataPlatform dataPlatform = new DataPlatform();
-          dataPlatform.setUrn(dataPlatformInstance.getPlatform().toString());
-          dataPlatform.setType(EntityType.DATA_PLATFORM);
-          dataProcessInstance.setPlatform(dataPlatform);
         });
     mappingHelper.mapToResult(
         SUB_TYPES_ASPECT_NAME,
diff --git a/datahub-graphql-core/src/main/resources/entity.graphql b/datahub-graphql-core/src/main/resources/entity.graphql
index 51909ae72c56b0..64c79b05745ded 100644
--- a/datahub-graphql-core/src/main/resources/entity.graphql
+++ b/datahub-graphql-core/src/main/resources/entity.graphql
@@ -13029,11 +13029,6 @@ extend type DataProcessInstance {
     """
     container: Container
 
-    """
-    Standardized platform urn where the data process instance is defined
-    """
-    platform: DataPlatform!
-
     """
     Recursively get the lineage of containers for this entity
     """
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapperTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapperTest.java
index dc1ce935ad5ecd..cd9d58b54e6b3a 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapperTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapperTest.java
@@ -80,9 +80,10 @@ public void testMapPlatformInstance() throws Exception {
     DataProcessInstance instance = DataProcessInstanceMapper.map(null, entityResponse);
 
     assertNotNull(instance.getDataPlatformInstance());
-    assertNotNull(instance.getPlatform());
-    assertEquals(instance.getPlatform().getUrn(), TEST_PLATFORM_URN);
-    assertEquals(instance.getPlatform().getType(), EntityType.DATA_PLATFORM);
+    assertNotNull(instance.getDataPlatformInstance().getPlatform());
+    assertEquals(instance.getDataPlatformInstance().getPlatform().getUrn(), TEST_PLATFORM_URN);
+    assertEquals(
+        instance.getDataPlatformInstance().getPlatform().getType(), EntityType.DATA_PLATFORM);
   }
 
   @Test
diff --git a/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx b/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx
index 4834a026ad94a3..d58c8ed537f612 100644
--- a/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx
+++ b/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx
@@ -161,6 +161,7 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
         return {
             name,
             externalUrl,
+            platform: processInstance?.dataPlatformInstance?.platform,
         };
     };
 
@@ -201,9 +202,10 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
                 subType={data.subTypes?.typeNames?.[0]}
                 description=""
                 platformName={
-                    data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)
+                    data?.dataPlatformInstance?.platform?.properties?.displayName ||
+                    capitalizeFirstLetterOnly(data?.dataPlatformInstance?.platform?.name)
                 }
-                platformLogo={data.platform.properties?.logoUrl}
+                platformLogo={data.dataPlatformInstance?.platform?.properties?.logoUrl}
                 platformInstanceId={data.dataPlatformInstance?.instanceId}
                 owners={null}
                 globalTags={null}
@@ -231,8 +233,8 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
             name: this.displayName(entity),
             type: EntityType.DataProcessInstance,
             subtype: entity?.subTypes?.typeNames?.[0],
-            icon: entity?.platform?.properties?.logoUrl || undefined,
-            platform: entity?.platform,
+            icon: entity?.dataPlatformInstance?.platform?.properties?.logoUrl || undefined,
+            platform: entity?.dataPlatformInstance?.platform,
             container: entity?.container,
             //            health: entity?.health || undefined,
         };
diff --git a/datahub-web-react/src/graphql/dataProcessInstance.graphql b/datahub-web-react/src/graphql/dataProcessInstance.graphql
index 8f55ca4903d527..442f8db0a933b2 100644
--- a/datahub-web-react/src/graphql/dataProcessInstance.graphql
+++ b/datahub-web-react/src/graphql/dataProcessInstance.graphql
@@ -67,9 +67,6 @@ fragment processInstanceRelationshipResults on EntityRelationshipsResult {
 fragment dataProcessInstanceFields on DataProcessInstance {
     urn
     type
-    platform {
-        ...platformFields
-    }
     parentContainers {
         ...parentContainersFields
     }
@@ -125,9 +122,6 @@ query getDataProcessInstance($urn: String!) {
     dataProcessInstance(urn: $urn) {
         urn
         type
-        platform {
-            ...platformFields
-        }
         parentContainers {
             ...parentContainersFields
         }
diff --git a/docs/how/updating-datahub.md b/docs/how/updating-datahub.md
index b887ca999c4046..945a00088f1f74 100644
--- a/docs/how/updating-datahub.md
+++ b/docs/how/updating-datahub.md
@@ -20,6 +20,8 @@ This file documents any backwards-incompatible changes in DataHub and assists pe
 
 ### Breaking Changes
 
+- #12408: The `platform` field in the DataPlatformInstance GraphQL type is removed. Clients need to retrieve the platform via the optional `dataPlatformInstance` field.
+
 ### Potential Downtime
 
 ### Deprecations
diff --git a/smoke-test/tests/data_process_instance/test_data_process_instance.py b/smoke-test/tests/data_process_instance/test_data_process_instance.py
index bad945f878562b..c0d2c62ba404a9 100644
--- a/smoke-test/tests/data_process_instance/test_data_process_instance.py
+++ b/smoke-test/tests/data_process_instance/test_data_process_instance.py
@@ -210,13 +210,6 @@ def test_search_dpi(auth_session, ingest_cleanup_data):
                                     name
                                 }
                             }
-                            platform {
-                                urn
-                                name
-                                properties {
-                                    type
-                                }
-                            }
                             subTypes {
                                 typeNames
                             }

From e1dfe42c1068be8d2eadcfb1f7c0c3bebd2b3cef Mon Sep 17 00:00:00 2001
From: Shirshanka Das <shirshanka@apache.org>
Date: Tue, 21 Jan 2025 17:58:04 -0800
Subject: [PATCH 133/249] fix(frontend): fix frontend build (#12425)

---
 .../entity/dataProcessInstance/DataProcessInstanceEntity.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx b/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx
index d58c8ed537f612..9bb9bd745d1ee6 100644
--- a/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx
+++ b/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx
@@ -175,9 +175,10 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
                 subType={data.subTypes?.typeNames?.[0]}
                 description=""
                 platformName={
-                    data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)
+                    data?.dataPlatformInstance?.platform?.properties?.displayName ||
+                    capitalizeFirstLetterOnly(data?.dataPlatformInstance?.platform?.name)
                 }
-                platformLogo={data.platform.properties?.logoUrl}
+                platformLogo={data?.dataPlatformInstance?.platform?.properties?.logoUrl}
                 owners={null}
                 globalTags={null}
                 // domain={data.domain?.domain}

From 0283a8ce474dcee9ee0cc3287c87b12616964195 Mon Sep 17 00:00:00 2001
From: Hyejin Yoon <0327jane@gmail.com>
Date: Wed, 22 Jan 2025 12:26:41 +0900
Subject: [PATCH 134/249] docs: add versioned docs for 0.15.0 (#12414)

---
 .../NavbarItem/DocsVersionDropdownNavbarItem.js  | 16 ++++++++++++++++
 docs-website/versions.json                       |  4 ++--
 docs/automations/bigquery-metadata-sync.md       |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/docs-website/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.js b/docs-website/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.js
index ed083e4e0c3987..c9e5098a016c2d 100644
--- a/docs-website/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.js
+++ b/docs-website/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.js
@@ -42,6 +42,22 @@ export default function DocsVersionDropdownNavbarItem({
       type: 'html',
       value: '<div class="dropdown__link"><b>Archived versions</b></div>',
     },
+    {
+      value: `
+         <a class="dropdown__link" href="https://docs-website-eue2qafvn-acryldata.vercel.app//docs/features">0.14.0
+         <svg width="12" height="12" aria-hidden="true" viewBox="0 0 24 24"><path fill="currentColor" d="M21 13v10h-21v-19h12v2h-10v15h17v-8h2zm3-12h-10.988l4.035 4-6.977 7.07 2.828 2.828 6.977-7.07 4.125 4.172v-11z"></path></svg>
+         </a>
+      `,
+      type: "html",
+    },
+    {
+      value: `
+         <a class="dropdown__link" href="https://docs-website-psat3nzgi-acryldata.vercel.app/docs/features">0.13.1
+         <svg width="12" height="12" aria-hidden="true" viewBox="0 0 24 24"><path fill="currentColor" d="M21 13v10h-21v-19h12v2h-10v15h17v-8h2zm3-12h-10.988l4.035 4-6.977 7.07 2.828 2.828 6.977-7.07 4.125 4.172v-11z"></path></svg>
+         </a>
+      `,
+      type: "html",
+    },
     {
       value: `
          <a class="dropdown__link" href="https://docs-website-lzxh86531-acryldata.vercel.app/docs/features">0.13.0
diff --git a/docs-website/versions.json b/docs-website/versions.json
index 5288c42437c779..ab242fa47dce5b 100644
--- a/docs-website/versions.json
+++ b/docs-website/versions.json
@@ -1,4 +1,4 @@
 [
-  "0.14.0",
-  "0.13.1"
+  "0.15.0",
+  "0.14.1"
 ]
diff --git a/docs/automations/bigquery-metadata-sync.md b/docs/automations/bigquery-metadata-sync.md
index 3d896f57d341a4..78bdbdd453e9f7 100644
--- a/docs/automations/bigquery-metadata-sync.md
+++ b/docs/automations/bigquery-metadata-sync.md
@@ -67,7 +67,7 @@ Ensure your service account has the following permissions:
     | Propagation Type | DataHub Entity | BigQuery Entity | Note |
     | -------- | ------- | ------- | ------- |
     | Table Tags as Labels | [Table Tag](https://datahubproject.io/docs/tags/) | [BigQuery Label](https://cloud.google.com/bigquery/docs/labels-intro) | - |
-    | Column Glossary Terms as Policy Tags | [Glossary Term on Table Column](https://datahubproject.io/docs/0.14.0/glossary/business-glossary/) | [Policy Tag](https://cloud.google.com/bigquery/docs/best-practices-policy-tags) | <ul><li>Assigned Policy tags are created under DataHub taxonomy.</li></ul><ul><li>Only the latest assigned glossary term set as policy tag. BigQuery only supports one assigned policy tag.</li></ul> <ul><li>Policy Tags are not synced to DataHub as glossary term from BigQuery.</li></ul>
+    | Column Glossary Terms as Policy Tags | [Glossary Term on Table Column](https://datahubproject.io/docs/glossary/business-glossary/) | [Policy Tag](https://cloud.google.com/bigquery/docs/best-practices-policy-tags) | <ul><li>Assigned Policy tags are created under DataHub taxonomy.</li></ul><ul><li>Only the latest assigned glossary term set as policy tag. BigQuery only supports one assigned policy tag.</li></ul> <ul><li>Policy Tags are not synced to DataHub as glossary term from BigQuery.</li></ul>
     | Table Descriptions | [Table Description](https://datahubproject.io/docs/api/tutorials/descriptions/) | Table Description | - |
     | Column Descriptions | [Column Description](https://datahubproject.io/docs/api/tutorials/descriptions/) | Column Description | - |
 

From 3668dfc22c6d9171a07ad8670ad81c5bb80721c3 Mon Sep 17 00:00:00 2001
From: Austin SeungJun Park <110667795+eagle-25@users.noreply.github.com>
Date: Wed, 22 Jan 2025 14:53:09 +0900
Subject: [PATCH 135/249] refactor(ingest/s3): use groupby_unsorted (#12412)

---
 .../datahub/ingestion/source/aws/s3_util.py   | 25 +---------------
 .../src/datahub/ingestion/source/s3/source.py |  8 +++--
 .../tests/unit/s3/test_s3_util.py             | 29 -------------------
 3 files changed, 7 insertions(+), 55 deletions(-)
 delete mode 100644 metadata-ingestion/tests/unit/s3/test_s3_util.py

diff --git a/metadata-ingestion/src/datahub/ingestion/source/aws/s3_util.py b/metadata-ingestion/src/datahub/ingestion/source/aws/s3_util.py
index 360f18aa448f27..878b8dd1bb9a51 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/aws/s3_util.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/aws/s3_util.py
@@ -1,11 +1,6 @@
 import logging
 import os
-from collections import defaultdict
-from typing import TYPE_CHECKING, Dict, Iterable, List, Optional
-
-if TYPE_CHECKING:
-    from mypy_boto3_s3.service_resource import ObjectSummary
-
+from typing import Optional
 
 S3_PREFIXES = ["s3://", "s3n://", "s3a://"]
 
@@ -73,21 +68,3 @@ def get_key_prefix(s3_uri: str) -> str:
             f"Not an S3 URI. Must start with one of the following prefixes: {str(S3_PREFIXES)}"
         )
     return strip_s3_prefix(s3_uri).split("/", maxsplit=1)[1]
-
-
-def group_s3_objects_by_dirname(
-    s3_objects: Iterable["ObjectSummary"],
-) -> Dict[str, List["ObjectSummary"]]:
-    """
-    Groups S3 objects by their directory name.
-
-    If a s3_object in the root directory (i.e., s3://bucket/file.txt), it is grouped under '/'.
-    """
-    grouped_s3_objs = defaultdict(list)
-    for obj in s3_objects:
-        if "/" in obj.key:
-            dirname = obj.key.rsplit("/", 1)[0]
-        else:
-            dirname = "/"
-        grouped_s3_objs[dirname].append(obj)
-    return grouped_s3_objs
diff --git a/metadata-ingestion/src/datahub/ingestion/source/s3/source.py b/metadata-ingestion/src/datahub/ingestion/source/s3/source.py
index 3173423f86a2ea..b5bc08912ee946 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/s3/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/s3/source.py
@@ -40,7 +40,6 @@
     get_bucket_name,
     get_bucket_relative_path,
     get_key_prefix,
-    group_s3_objects_by_dirname,
     strip_s3_prefix,
 )
 from datahub.ingestion.source.data_lake_common.data_lake_utils import ContainerWUCreator
@@ -73,6 +72,7 @@
     _Aspect,
 )
 from datahub.telemetry import stats, telemetry
+from datahub.utilities.groupby import groupby_unsorted
 from datahub.utilities.perf_timer import PerfTimer
 
 if TYPE_CHECKING:
@@ -868,7 +868,11 @@ def get_folder_info(
         """
         partitions: List[Folder] = []
         s3_objects = bucket.objects.filter(Prefix=prefix).page_size(PAGE_SIZE)
-        for key, group in group_s3_objects_by_dirname(s3_objects).items():
+        grouped_s3_objects_by_dirname = groupby_unsorted(
+            s3_objects,
+            key=lambda obj: obj.key.rsplit("/", 1)[0],
+        )
+        for key, group in grouped_s3_objects_by_dirname:
             file_size = 0
             creation_time = None
             modification_time = None
diff --git a/metadata-ingestion/tests/unit/s3/test_s3_util.py b/metadata-ingestion/tests/unit/s3/test_s3_util.py
deleted file mode 100644
index 7850d65ca8b01f..00000000000000
--- a/metadata-ingestion/tests/unit/s3/test_s3_util.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from unittest.mock import Mock
-
-from datahub.ingestion.source.aws.s3_util import group_s3_objects_by_dirname
-
-
-def test_group_s3_objects_by_dirname():
-    s3_objects = [
-        Mock(key="/dir1/file1.txt"),
-        Mock(key="/dir2/file2.txt"),
-        Mock(key="/dir1/file3.txt"),
-    ]
-
-    grouped_objects = group_s3_objects_by_dirname(s3_objects)
-
-    assert len(grouped_objects) == 2
-    assert grouped_objects["/dir1"] == [s3_objects[0], s3_objects[2]]
-    assert grouped_objects["/dir2"] == [s3_objects[1]]
-
-
-def test_group_s3_objects_by_dirname_files_in_root_directory():
-    s3_objects = [
-        Mock(key="file1.txt"),
-        Mock(key="file2.txt"),
-    ]
-
-    grouped_objects = group_s3_objects_by_dirname(s3_objects)
-
-    assert len(grouped_objects) == 1
-    assert grouped_objects["/"] == s3_objects

From fbfa4872bb3d536a33c9e166d691c59d41badaa7 Mon Sep 17 00:00:00 2001
From: Davide Briscese <davide.briscese@eternedile.it>
Date: Wed, 22 Jan 2025 06:53:30 +0100
Subject: [PATCH 136/249] docs(docker): fix typo in docker hub url (#12402)

---
 docker/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/README.md b/docker/README.md
index ad847dc70cf3c0..b756ae3eaed752 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -16,7 +16,7 @@ area.
 ## Quickstart
 
 The easiest way to bring up and test DataHub is using DataHub [Docker](https://www.docker.com) images 
-which are continuously deployed to [Docker Hub](https://hub.docker.com/u/linkedin) with every commit to repository.
+which are continuously deployed to [Docker Hub](https://hub.docker.com/u/acryldata) with every commit to repository.
 
 You can easily download and run all these images and their dependencies with our
 [quick start guide](../docs/quickstart.md).

From 96758e2eb6a73ffe6eebf61ce97444c911dc555e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20G=C3=B3mez=20Villamor?= <sgomezvillamor@gmail.com>
Date: Wed, 22 Jan 2025 08:34:35 +0100
Subject: [PATCH 137/249] fix(tableau): assert error on parent name (#12392)

Co-authored-by: Mayuri Nehate <33225191+mayurinehate@users.noreply.github.com>
Co-authored-by: Harshal Sheth <hsheth2@gmail.com>
---
 .../ingestion/source/tableau/tableau.py       | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
index f961bd8ecba604..36e62c928744ef 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
@@ -1147,23 +1147,36 @@ def fetch_projects():
                 )
             # Set parent project name
             for _project_id, project in all_project_map.items():
-                if (
-                    project.parent_id is not None
-                    and project.parent_id in all_project_map
-                ):
+                if project.parent_id is None:
+                    continue
+
+                if project.parent_id in all_project_map:
                     project.parent_name = all_project_map[project.parent_id].name
+                else:
+                    self.report.warning(
+                        title="Incomplete project hierarchy",
+                        message="Project details missing. Child projects will be ingested without reference to their parent project. We generally need Site Administrator Explorer permissions to extract the complete project hierarchy.",
+                        context=f"Missing {project.parent_id}, referenced by {project.id} {project.project_name}",
+                    )
+                    project.parent_id = None
+
+            # Post-condition
+            assert all(
+                [
+                    ((project.parent_id is None) == (project.parent_name is None))
+                    and (
+                        project.parent_id is None
+                        or project.parent_id in all_project_map
+                    )
+                    for project in all_project_map.values()
+                ]
+            ), "Parent project id and name should be consistent"
 
         def set_project_path():
             def form_path(project_id: str) -> List[str]:
                 cur_proj = all_project_map[project_id]
                 ancestors = [cur_proj.name]
                 while cur_proj.parent_id is not None:
-                    if cur_proj.parent_id not in all_project_map:
-                        self.report.warning(
-                            "project-issue",
-                            f"Parent project {cur_proj.parent_id} not found. We need Site Administrator Explorer permissions.",
-                        )
-                        break
                     cur_proj = all_project_map[cur_proj.parent_id]
                     ancestors = [cur_proj.name, *ancestors]
                 return ancestors

From b75d3ed5dc94b86aff46784bc048b2c954d43b26 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Wed, 22 Jan 2025 20:41:00 +0530
Subject: [PATCH 138/249] feat(cli): add container CLI to apply patches for
 tag, term, owner (#12418)

---
 docs/cli.md                                   | 52 +++++++----
 .../src/datahub/cli/container_cli.py          | 89 +++++++++++++++++++
 metadata-ingestion/src/datahub/entrypoints.py |  2 +
 3 files changed, 125 insertions(+), 18 deletions(-)
 create mode 100644 metadata-ingestion/src/datahub/cli/container_cli.py

diff --git a/docs/cli.md b/docs/cli.md
index 06dca46269c4bf..360dc9a1823ce1 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -57,24 +57,30 @@ Options:
   --help                          Show this message and exit.
 
 Commands:
-  actions      <disabled due to missing dependencies>
-  check        Helper commands for checking various aspects of DataHub.
-  dataproduct  A group of commands to interact with the DataProduct entity in DataHub.
-  delete       Delete metadata from datahub using a single urn or a combination of filters
-  docker       Helper commands for setting up and interacting with a local DataHub instance using Docker.
-  exists       A group of commands to check existence of entities in DataHub.
-  get          A group of commands to get metadata from DataHub.
-  group        A group of commands to interact with the Group entity in DataHub.
-  ingest       Ingest metadata into DataHub.
-  init         Configure which datahub instance to connect to
-  lite         A group of commands to work with a DataHub Lite instance
-  migrate      Helper commands for migrating metadata within DataHub.
-  put          A group of commands to put metadata in DataHub.
-  state        Managed state stored in DataHub by stateful ingestion.
-  telemetry    Toggle telemetry.
-  timeline     Get timeline for an entity based on certain categories
-  user         A group of commands to interact with the User entity in DataHub.
-  version      Print version number and exit.
+  actions       <disabled due to missing dependencies>
+  assertions    A group of commands to interact with the Assertion entity in DataHub.
+  check         Helper commands for checking various aspects of DataHub.
+  container     A group of commands to interact with containers in DataHub.
+  datacontract  A group of commands to interact with the DataContract entity in DataHub.
+  dataproduct   A group of commands to interact with the DataProduct entity in DataHub.
+  dataset       A group of commands to interact with the Dataset entity in DataHub.
+  delete        Delete metadata from DataHub.
+  docker        Helper commands for setting up and interacting with a local DataHub instance using Docker.
+  exists        A group of commands to check existence of entities in DataHub.
+  forms         A group of commands to interact with forms in DataHub.
+  get           A group of commands to get metadata from DataHub.
+  group         A group of commands to interact with the Group entity in DataHub.
+  ingest        Ingest metadata into DataHub.
+  init          Configure which datahub instance to connect to
+  lite          A group of commands to work with a DataHub Lite instance
+  migrate       Helper commands for migrating metadata within DataHub.
+  properties    A group of commands to interact with structured properties in DataHub.
+  put           A group of commands to put metadata in DataHub.
+  state         Managed state stored in DataHub by stateful ingestion.
+  telemetry     Toggle telemetry.
+  timeline      Get timeline for an entity based on certain categories
+  user          A group of commands to interact with the User entity in DataHub.
+  version       Print version number and exit.
 ```
 
 The following top-level commands listed below are here mainly to give the reader a high-level picture of what are the kinds of things you can accomplish with the cli.
@@ -274,6 +280,16 @@ DATAHUB_TELEMETRY_TIMEOUT=10
 DATAHUB_DEBUG=false
 ```
 
+### container
+
+A group of commands to interact with containers in DataHub.
+
+e.g. You can use this to apply a tag to all datasets recursively in this container.
+```shell
+datahub container tag --container-urn "urn:li:container:0e9e46bd6d5cf645f33d5a8f0254bc2d" --tag-urn "urn:li:tag:tag1"
+
+```
+
 ### check
 
 The datahub package is composed of different plugins that allow you to connect to different metadata sources and ingest metadata from them.
diff --git a/metadata-ingestion/src/datahub/cli/container_cli.py b/metadata-ingestion/src/datahub/cli/container_cli.py
new file mode 100644
index 00000000000000..ccd8ea779ecd19
--- /dev/null
+++ b/metadata-ingestion/src/datahub/cli/container_cli.py
@@ -0,0 +1,89 @@
+import logging
+from typing import List
+
+import click
+
+from datahub.ingestion.graph.client import get_default_graph
+from datahub.metadata.schema_classes import (
+    GlossaryTermAssociationClass,
+    OwnerClass,
+    OwnershipTypeClass,
+    TagAssociationClass,
+)
+from datahub.specific.dataset import DatasetPatchBuilder
+
+logger = logging.getLogger(__name__)
+
+
+@click.group()
+def container() -> None:
+    """A group of commands to interact with containers in DataHub."""
+    pass
+
+
+def apply_association_to_container(
+    container_urn: str,
+    association_urn: str,
+    association_type: str,
+) -> None:
+    """
+    Common function to add either tags, terms, or owners to child datasets (for now).
+
+    Args:
+        container_urn: The URN of the container
+        association_urn: The URN of the tag, term, or user to apply
+        association_type: One of 'tag', 'term', or 'owner'
+    """
+    urns: List[str] = []
+    graph = get_default_graph()
+    logger.info(f"Using {graph}")
+    urns.extend(
+        graph.get_urns_by_filter(
+            container=container_urn, batch_size=1000, entity_types=["dataset"]
+        )
+    )
+
+    for urn in urns:
+        logger.info(f"Adding {association_type} {association_urn} to {urn}")
+        builder = DatasetPatchBuilder(urn)
+
+        if association_type == "tag":
+            patches = builder.add_tag(TagAssociationClass(association_urn)).build()
+        elif association_type == "term":
+            patches = builder.add_term(
+                GlossaryTermAssociationClass(association_urn)
+            ).build()
+        elif association_type == "owner":
+            patches = builder.add_owner(
+                OwnerClass(
+                    owner=association_urn,
+                    type=OwnershipTypeClass.TECHNICAL_OWNER,
+                )
+            ).build()
+
+        for mcp in patches:
+            graph.emit(mcp)
+
+
+@container.command()
+@click.option("--container-urn", required=True, type=str)
+@click.option("--tag-urn", required=True, type=str)
+def tag(container_urn: str, tag_urn: str) -> None:
+    """Add patch to add a tag to all datasets in a container"""
+    apply_association_to_container(container_urn, tag_urn, "tag")
+
+
+@container.command()
+@click.option("--container-urn", required=True, type=str)
+@click.option("--term-urn", required=True, type=str)
+def term(container_urn: str, term_urn: str) -> None:
+    """Add patch to add a term to all datasets in a container"""
+    apply_association_to_container(container_urn, term_urn, "term")
+
+
+@container.command()
+@click.option("--container-urn", required=True, type=str)
+@click.option("--owner-id", required=True, type=str)
+def owner(container_urn: str, owner_id: str) -> None:
+    """Add patch to add a owner to all datasets in a container"""
+    apply_association_to_container(container_urn, owner_id, "owner")
diff --git a/metadata-ingestion/src/datahub/entrypoints.py b/metadata-ingestion/src/datahub/entrypoints.py
index 0162b476a21931..182084e4794259 100644
--- a/metadata-ingestion/src/datahub/entrypoints.py
+++ b/metadata-ingestion/src/datahub/entrypoints.py
@@ -14,6 +14,7 @@
     make_shim_command,
 )
 from datahub.cli.config_utils import DATAHUB_CONFIG_PATH, write_gms_config
+from datahub.cli.container_cli import container
 from datahub.cli.delete_cli import delete
 from datahub.cli.docker_cli import docker
 from datahub.cli.env_utils import get_boolean_env_variable
@@ -180,6 +181,7 @@ def init(use_password: bool = False) -> None:
 datahub.add_command(forms)
 datahub.add_command(datacontract)
 datahub.add_command(assertions)
+datahub.add_command(container)
 
 try:
     from datahub.cli.lite_cli import lite

From d3ff189dd09f5b9b600ee4b36f0826788eecd40b Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Wed, 22 Jan 2025 10:12:46 -0600
Subject: [PATCH 139/249] fix(search filter): termQuery is optimal (#12322)

---
 .../java/com/linkedin/metadata/search/utils/ESUtils.java    | 2 +-
 .../query/request/AutocompleteRequestHandlerTest.java       | 4 ++--
 .../search/query/request/SearchRequestHandlerTest.java      | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
index 95fff81d13957c..34894a584ce69f 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
@@ -874,7 +874,7 @@ private static void filterSoftDeletedByDefault(
                                         || criterion.getField().equals(REMOVED + KEYWORD_SUFFIX)));
       }
       if (!removedInOrFilter) {
-        filterQuery.mustNot(QueryBuilders.matchQuery(REMOVED, true));
+        filterQuery.mustNot(QueryBuilders.termQuery(REMOVED, true));
       }
     }
   }
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AutocompleteRequestHandlerTest.java b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AutocompleteRequestHandlerTest.java
index 23d493b7287f78..e91dc1e6a8b0b9 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AutocompleteRequestHandlerTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AutocompleteRequestHandlerTest.java
@@ -158,7 +158,7 @@ public void testDefaultAutocompleteRequest() {
     assertEquals("keyPart1.delimited", prefixQuery.fieldName());
 
     assertEquals(wrapper.mustNot().size(), 1);
-    MatchQueryBuilder removedFilter = (MatchQueryBuilder) wrapper.mustNot().get(0);
+    TermQueryBuilder removedFilter = (TermQueryBuilder) wrapper.mustNot().get(0);
     assertEquals(removedFilter.fieldName(), "removed");
     assertEquals(removedFilter.value(), true);
     HighlightBuilder highlightBuilder = sourceBuilder.highlighter();
@@ -203,7 +203,7 @@ public void testAutocompleteRequestWithField() {
         (MatchPhrasePrefixQueryBuilder) query.should().get(1);
     assertEquals("field.delimited", prefixQuery.fieldName());
 
-    MatchQueryBuilder removedFilter = (MatchQueryBuilder) wrapper.mustNot().get(0);
+    TermQueryBuilder removedFilter = (TermQueryBuilder) wrapper.mustNot().get(0);
     assertEquals(removedFilter.fieldName(), "removed");
     assertEquals(removedFilter.value(), true);
     HighlightBuilder highlightBuilder = sourceBuilder.highlighter();
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
index 1fea4476d75abb..d4d5b03ea5fec9 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
@@ -436,7 +436,7 @@ private BoolQueryBuilder constructFilterQuery(
   }
 
   private void testFilterQuery(BoolQueryBuilder testQuery) {
-    Optional<MatchQueryBuilder> mustNotHaveRemovedCondition =
+    Optional<TermQueryBuilder> mustNotHaveRemovedCondition =
         testQuery.filter().stream()
             .filter(or -> or instanceof BoolQueryBuilder)
             .map(or -> (BoolQueryBuilder) or)
@@ -445,8 +445,8 @@ private void testFilterQuery(BoolQueryBuilder testQuery) {
                   System.out.println("processing: " + or.mustNot());
                   return or.mustNot().stream();
                 })
-            .filter(and -> and instanceof MatchQueryBuilder)
-            .map(and -> (MatchQueryBuilder) and)
+            .filter(and -> and instanceof TermQueryBuilder)
+            .map(and -> (TermQueryBuilder) and)
             .filter(match -> match.fieldName().equals("removed"))
             .findAny();
 

From 7f17e53e89e5e1b80ae86636226462117bb2c44b Mon Sep 17 00:00:00 2001
From: John Joyce <john@acryl.io>
Date: Wed, 22 Jan 2025 10:25:23 -0800
Subject: [PATCH 140/249] docs(): Add docs for DataHub Cloud x DataHub Actions
 (#12437)

Co-authored-by: John Joyce <john@Mac-2693.lan>
---
 docs/actions/README.md                        |   5 +-
 .../sources/datahub-cloud-event-source.md     | 113 ++++++++++++++++++
 2 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 docs/actions/sources/datahub-cloud-event-source.md

diff --git a/docs/actions/README.md b/docs/actions/README.md
index 4fa44eec588bed..a906c3c78f119e 100644
--- a/docs/actions/README.md
+++ b/docs/actions/README.md
@@ -189,11 +189,10 @@ Two event types are currently supported. Read more about them below.
 
 ## Supported Event Sources
 
-Currently, the only event source that is officially supported is `kafka`, which polls for events
-via a Kafka Consumer. 
+Currently, the following event sources are supported:
 
 - [Kafka Event Source](sources/kafka-event-source.md)
-
+- [DataHub Cloud Event Source](sources/datahub-cloud-event-source.md)
 
 ## Supported Actions
 
diff --git a/docs/actions/sources/datahub-cloud-event-source.md b/docs/actions/sources/datahub-cloud-event-source.md
new file mode 100644
index 00000000000000..d1751ae2568676
--- /dev/null
+++ b/docs/actions/sources/datahub-cloud-event-source.md
@@ -0,0 +1,113 @@
+# DataHub Cloud Event Source
+
+## Prerequisites
+
+### Compatibility
+
+The **DataHub Cloud Event Source** is only compatible with versions of DataHub Cloud above  `v0.3.7`.
+
+### Privileges
+
+By default, users do not have access to the Events API of DataHub Cloud. In order to access the API, the user or service account
+associated with the access token used to configure this events source _must_ have the `Get Platform Events` platform privilege, which
+can be granted using an [Access Policy](https://datahubproject.io/docs/authorization/access-policies-guide/).
+
+## Overview
+
+The DataHub Cloud Event Source allows you to use DataHub Actions with an instance of DataHub Cloud hosted by [Acryl](https://acryl.io).
+
+Under the hood, the DataHub Cloud Event Source communicates with DataHub Cloud to extract change events in realtime.
+The state of progress is automatically saved to DataHub Cloud after messages are processed, allowing you to seamlessly pause and restart the consumer, using the provided `name` to uniquely identify the consumer state.
+
+On initial startup of a new consumer id, the DataHub event source will automatically begin the _latest_ events by default. Afterwards, the message stream processed offsets will be continually saved. However, the source can also optionally be configured to "look back" in time
+by a certain number of days on initial bootstrap using the `lookback_days` parameter. To reset all previously saved offsets for a consumer,
+you can set `reset_offsets` to `True`.
+
+### Processing Guarantees
+
+This event source implements an "ack" function which is invoked if and only if an event is successfully processed
+by the Actions framework, meaning that the event made it through the Transformers and into the Action without
+any errors. Under the hood, the "ack" method synchronously commits DataHub Cloud Consumer Offsets on behalf of the Action. This means that by default, the framework provides *at-least once* processing semantics. That is, in the unusual case that a failure occurs when attempting to commit offsets back to Kafka, that event may be replayed on restart of the Action.
+
+If you've configured your Action pipeline `failure_mode` to be `CONTINUE` (the default), then events which
+fail to be processed will simply be logged to a `failed_events.log` file for further investigation (dead letter queue). The DataHub Cloud Event Source will continue to make progress against the underlying topics and continue to commit offsets even in the case of failed messages.
+
+If you've configured your Action pipeline `failure_mode` to be `THROW`, then events which fail to be processed result in an Action Pipeline error. This in turn terminates the pipeline before committing offsets back to DataHub Cloud. Thus the message will not be marked as "processed" by the Action consumer.
+
+## Supported Events
+
+The DataHub Cloud Event Source produces
+
+- [Entity Change Event V1](../events/entity-change-event.md)
+
+Note that the DataHub Cloud Event Source does _not_ yet support the full [Metadata Change Log V1](../events/metadata-change-log-event.md) event stream.
+
+## Configure the Event Source
+
+Use the following config(s) to get started with the DataHub Cloud Event Source.
+
+### Quickstart
+
+To start listening for new events from now, you can use the following recipe:
+
+```yml
+name: "unique-action-name"
+datahub:
+  server: "https://<your-organization>.acryl.io"
+  token: "<your-datahub-cloud-token>"
+source:
+  type: "datahub-cloud"
+action:
+  # action configs
+```
+
+Note that the `datahub` configuration block is **required** to connect to your DataHub Cloud instance.
+
+### Advanced Configurations
+
+To reset the offsets for the action pipeline and start consuming events from 7 days ago, you can use the following recipe:
+
+```yml
+name: "unique-action-name"
+datahub:
+  server: "https://<your-organization>.acryl.io"
+  token: "<your-datahub-cloud-token>"
+source:
+  type: "datahub-cloud"
+  config:
+    lookback_days: 7                           # Look back 7 days for events
+    reset_offsets: true                        # Ignore stored offsets and start fresh
+    kill_after_idle_timeout: true              # Enable shutdown after idle period
+    idle_timeout_duration_seconds: 60          # Idle timeout set to 60 seconds
+    event_processing_time_max_duration_seconds: 45  # Max processing time of 45 seconds per batch
+action:
+  # action configs
+```
+
+Note that the `datahub` configuration block is **required** to connect to your DataHub Cloud instance.
+
+<details>
+  <summary>View All Configuration Options</summary>
+
+| Field                                 | Required | Default                       | Description                                                                               |
+  | ------------------------------------- | :------: | :---------------------------: | ----------------------------------------------------------------------------------------- |
+| `topic`                               |    ❌    | `PlatformEvent_v1`            | The name of the topic from which events will be consumed. Do not change this unless you know what you're doing!                                |
+| `lookback_days`                       |    ❌    | None                           | Optional number of days to look back when polling for events.                             |
+| `reset_offsets`                       |    ❌    | `False`                       | When set to `True`, the consumer will ignore any stored offsets and start fresh.          |
+| `kill_after_idle_timeout`             |    ❌    | `False`                       | If `True`, stops the consumer after being idle for the specified timeout duration.        |
+| `idle_timeout_duration_seconds`       |    ❌    | `30`                          | Duration in seconds after which, if no events are received, the consumer is considered idle. |
+| `event_processing_time_max_duration_seconds` | ❌  | `30`                          | Maximum allowed time in seconds for processing events before timing out.                  |
+</details>
+
+
+## FAQ
+
+1. Is there a way to always start processing from the end of the topics on Actions start?
+
+Yes, simply set `reset_offsets` to True for a single run of the action. Remember to disable this for subsequent runs if you don't want to miss any events!
+
+2. What happens if I have multiple actions with the same pipeline `name` running? Can I scale out horizontally?
+
+Today, there is undefined behavior deploying multiple actions with the same name using the DataHub Cloud Events Source.
+All events must be processed by a single running action
+

From bb4d6bcdef3eceb4ee96f39edd7e068459f1bf30 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Wed, 22 Jan 2025 13:22:11 -0600
Subject: [PATCH 141/249] misc(test): increase test memory slightly (#12439)

---
 .../java/io/datahubproject/test/search/SearchTestContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata-io/src/test/java/io/datahubproject/test/search/SearchTestContainer.java b/metadata-io/src/test/java/io/datahubproject/test/search/SearchTestContainer.java
index cda6a4c179f484..c82d1ca87b862c 100644
--- a/metadata-io/src/test/java/io/datahubproject/test/search/SearchTestContainer.java
+++ b/metadata-io/src/test/java/io/datahubproject/test/search/SearchTestContainer.java
@@ -5,7 +5,7 @@
 
 public interface SearchTestContainer {
 
-  String SEARCH_JAVA_OPTS = "-Xms446m -Xmx446m -XX:MaxDirectMemorySize=368435456";
+  String SEARCH_JAVA_OPTS = "-Xms512m -Xmx512m -XX:MaxDirectMemorySize=368435456";
 
   Duration STARTUP_TIMEOUT = Duration.ofMinutes(5); // usually < 1min
 

From ac44f4a0635ce0c6a4ed77188f3fc8f4c443613a Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Wed, 22 Jan 2025 12:29:09 -0800
Subject: [PATCH 142/249] feat(ingest/mssql): populate dataTransformLogic
 aspect for stored procs (#12244)

---
 .../ingestion/source/sql/mssql/job_models.py  |  4 +-
 .../ingestion/source/sql/mssql/source.py      | 37 +++++++---
 .../golden_mces_mssql_no_db_to_file.json      | 69 +++++++++++++++----
 .../golden_mces_mssql_no_db_with_filter.json  | 39 ++++++++---
 .../golden_mces_mssql_to_file.json            | 67 ++++++++++++++----
 ...golden_mces_mssql_with_lower_case_urn.json | 69 +++++++++++++++----
 6 files changed, 221 insertions(+), 64 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/mssql/job_models.py b/metadata-ingestion/src/datahub/ingestion/source/sql/mssql/job_models.py
index d3941e7add0fd0..9cd485f6d9a4b1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/mssql/job_models.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/mssql/job_models.py
@@ -156,7 +156,7 @@ class MSSQLDataJob:
     entity: Union[StoredProcedure, JobStep]
     type: str = "dataJob"
     source: str = "mssql"
-    external_url: str = ""
+    external_url: Optional[str] = None
     description: Optional[str] = None
     status: Optional[str] = None
     incoming: List[str] = field(default_factory=list)
@@ -228,7 +228,7 @@ class MSSQLDataFlow:
     entity: Union[MSSQLJob, MSSQLProceduresContainer]
     type: str = "dataFlow"
     source: str = "mssql"
-    external_url: str = ""
+    external_url: Optional[str] = None
     flow_properties: Dict[str, str] = field(default_factory=dict)
 
     def add_property(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/mssql/source.py b/metadata-ingestion/src/datahub/ingestion/source/sql/mssql/source.py
index a2338f14196d77..2d0c4dc9f6f6f9 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/mssql/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/mssql/source.py
@@ -11,6 +11,7 @@
 from sqlalchemy.engine.reflection import Inspector
 from sqlalchemy.exc import ProgrammingError, ResourceClosedError
 
+import datahub.metadata.schema_classes as models
 from datahub.configuration.common import AllowDenyPattern
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.api.common import PipelineContext
@@ -49,21 +50,15 @@
     make_sqlalchemy_uri,
 )
 from datahub.ingestion.source.sql.sql_report import SQLSourceReport
-from datahub.metadata.schema_classes import (
-    BooleanTypeClass,
-    NumberTypeClass,
-    StringTypeClass,
-    UnionTypeClass,
-)
 from datahub.utilities.file_backed_collections import FileBackedList
 
 logger: logging.Logger = logging.getLogger(__name__)
 
-register_custom_type(sqlalchemy.dialects.mssql.BIT, BooleanTypeClass)
-register_custom_type(sqlalchemy.dialects.mssql.MONEY, NumberTypeClass)
-register_custom_type(sqlalchemy.dialects.mssql.SMALLMONEY, NumberTypeClass)
-register_custom_type(sqlalchemy.dialects.mssql.SQL_VARIANT, UnionTypeClass)
-register_custom_type(sqlalchemy.dialects.mssql.UNIQUEIDENTIFIER, StringTypeClass)
+register_custom_type(sqlalchemy.dialects.mssql.BIT, models.BooleanTypeClass)
+register_custom_type(sqlalchemy.dialects.mssql.MONEY, models.NumberTypeClass)
+register_custom_type(sqlalchemy.dialects.mssql.SMALLMONEY, models.NumberTypeClass)
+register_custom_type(sqlalchemy.dialects.mssql.SQL_VARIANT, models.UnionTypeClass)
+register_custom_type(sqlalchemy.dialects.mssql.UNIQUEIDENTIFIER, models.StringTypeClass)
 
 
 class SQLServerConfig(BasicSQLAlchemyConfig):
@@ -651,6 +646,26 @@ def construct_job_workunits(
                 entityUrn=data_job.urn,
                 aspect=data_job.as_datajob_input_output_aspect,
             ).as_workunit()
+
+        if (
+            self.config.include_stored_procedures_code
+            and isinstance(data_job.entity, StoredProcedure)
+            and data_job.entity.code is not None
+        ):
+            yield MetadataChangeProposalWrapper(
+                entityUrn=data_job.urn,
+                aspect=models.DataTransformLogicClass(
+                    transforms=[
+                        models.DataTransformClass(
+                            queryStatement=models.QueryStatementClass(
+                                value=data_job.entity.code,
+                                language=models.QueryLanguageClass.SQL,
+                            ),
+                        )
+                    ]
+                ),
+            ).as_workunit()
+
         # TODO: Add SubType when it appear
 
     def construct_flow_workunits(
diff --git a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_to_file.json b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_to_file.json
index 0d9386dcda0cdb..0b478e13b86d2a 100644
--- a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_to_file.json
+++ b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_to_file.json
@@ -95,7 +95,6 @@
     "aspect": {
         "json": {
             "customProperties": {},
-            "externalUrl": "",
             "name": "Weekly Demo Data Backup"
         }
     },
@@ -113,17 +112,16 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "job_id": "a06cfdca-b65e-42de-8db2-8c21c183c5dd",
+                "job_id": "f5a6c120-500a-4300-9b21-0c3225af1f80",
                 "job_name": "Weekly Demo Data Backup",
                 "description": "No description available.",
-                "date_created": "2024-12-26 12:03:35.420000",
-                "date_modified": "2024-12-26 12:03:35.590000",
+                "date_created": "2024-12-30 19:59:24.690000",
+                "date_modified": "2024-12-30 19:59:24.690000",
                 "step_id": "1",
                 "step_name": "Set database to read only",
                 "subsystem": "TSQL",
                 "command": "ALTER DATABASE DemoData SET READ_ONLY"
             },
-            "externalUrl": "",
             "name": "Weekly Demo Data Backup",
             "type": {
                 "string": "MSSQL_JOB_STEP"
@@ -2259,7 +2257,6 @@
     "aspect": {
         "json": {
             "customProperties": {},
-            "externalUrl": "",
             "name": "DemoData.Foo.stored_procedures"
         }
     },
@@ -2282,10 +2279,9 @@
                 "code": "CREATE PROCEDURE [Foo].[Proc.With.SpecialChar] @ID INT\nAS\n    SELECT @ID AS ThatDB;\n",
                 "input parameters": "['@ID']",
                 "parameter @ID": "{'type': 'int'}",
-                "date_created": "2024-12-26 12:03:35.230000",
-                "date_modified": "2024-12-26 12:03:35.230000"
+                "date_created": "2024-12-30 19:59:24.690000",
+                "date_modified": "2024-12-30 19:59:24.690000"
             },
-            "externalUrl": "",
             "name": "DemoData.Foo.Proc.With.SpecialChar",
             "type": {
                 "string": "MSSQL_STORED_PROCEDURE"
@@ -2298,6 +2294,29 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
+    "changeType": "UPSERT",
+    "aspectName": "dataTransformLogic",
+    "aspect": {
+        "json": {
+            "transforms": [
+                {
+                    "queryStatement": {
+                        "value": "CREATE PROCEDURE [Foo].[Proc.With.SpecialChar] @ID INT\nAS\n    SELECT @ID AS ThatDB;\n",
+                        "language": "SQL"
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mssql-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataJob",
     "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),NewProc)",
@@ -2310,10 +2329,9 @@
                 "depending_on_procedure": "{}",
                 "code": "CREATE PROCEDURE [Foo].[NewProc]\n    AS\n    BEGIN\n        --insert into items table from salesreason table\n        insert into Foo.Items (ID, ItemName)\n        SELECT TempID, Name\n        FROM Foo.SalesReason;\n\n\n       IF OBJECT_ID('Foo.age_dist', 'U') IS NULL\n       BEGIN\n            -- Create and populate if table doesn't exist\n            SELECT Age, COUNT(*) as Count\n            INTO Foo.age_dist\n            FROM Foo.Persons\n            GROUP BY Age\n        END\n        ELSE\n        BEGIN\n            -- Update existing table\n            TRUNCATE TABLE Foo.age_dist;\n\n            INSERT INTO Foo.age_dist (Age, Count)\n            SELECT Age, COUNT(*) as Count\n            FROM Foo.Persons\n            GROUP BY Age\n        END\n\n        SELECT ID, Age INTO #TEMPTABLE FROM NewData.FooNew.PersonsNew\n        \n        UPDATE DemoData.Foo.Persons\n        SET Age = t.Age\n        FROM DemoData.Foo.Persons p\n        JOIN #TEMPTABLE t ON p.ID = t.ID\n\n    END\n",
                 "input parameters": "[]",
-                "date_created": "2024-12-26 12:03:35.237000",
-                "date_modified": "2024-12-26 12:03:35.237000"
+                "date_created": "2024-12-30 19:59:24.690000",
+                "date_modified": "2024-12-30 19:59:24.690000"
             },
-            "externalUrl": "",
             "name": "DemoData.Foo.NewProc",
             "type": {
                 "string": "MSSQL_STORED_PROCEDURE"
@@ -2326,6 +2344,29 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),NewProc)",
+    "changeType": "UPSERT",
+    "aspectName": "dataTransformLogic",
+    "aspect": {
+        "json": {
+            "transforms": [
+                {
+                    "queryStatement": {
+                        "value": "CREATE PROCEDURE [Foo].[NewProc]\n    AS\n    BEGIN\n        --insert into items table from salesreason table\n        insert into Foo.Items (ID, ItemName)\n        SELECT TempID, Name\n        FROM Foo.SalesReason;\n\n\n       IF OBJECT_ID('Foo.age_dist', 'U') IS NULL\n       BEGIN\n            -- Create and populate if table doesn't exist\n            SELECT Age, COUNT(*) as Count\n            INTO Foo.age_dist\n            FROM Foo.Persons\n            GROUP BY Age\n        END\n        ELSE\n        BEGIN\n            -- Update existing table\n            TRUNCATE TABLE Foo.age_dist;\n\n            INSERT INTO Foo.age_dist (Age, Count)\n            SELECT Age, COUNT(*) as Count\n            FROM Foo.Persons\n            GROUP BY Age\n        END\n\n        SELECT ID, Age INTO #TEMPTABLE FROM NewData.FooNew.PersonsNew\n        \n        UPDATE DemoData.Foo.Persons\n        SET Age = t.Age\n        FROM DemoData.Foo.Persons p\n        JOIN #TEMPTABLE t ON p.ID = t.ID\n\n    END\n",
+                        "language": "SQL"
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mssql-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
@@ -4928,7 +4969,7 @@
                 "actor": "urn:li:corpuser:_ingestion"
             },
             "lastModified": {
-                "time": 1735214618898,
+                "time": 1735588784503,
                 "actor": "urn:li:corpuser:_ingestion"
             }
         }
@@ -5051,7 +5092,7 @@
                 "actor": "urn:li:corpuser:_ingestion"
             },
             "lastModified": {
-                "time": 1735214618906,
+                "time": 1735588784511,
                 "actor": "urn:li:corpuser:_ingestion"
             }
         }
diff --git a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_with_filter.json b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_with_filter.json
index 07098f0161fc3d..c1748ff13ac93c 100644
--- a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_with_filter.json
+++ b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_with_filter.json
@@ -95,7 +95,6 @@
     "aspect": {
         "json": {
             "customProperties": {},
-            "externalUrl": "",
             "name": "Weekly Demo Data Backup"
         }
     },
@@ -113,17 +112,16 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "job_id": "a06cfdca-b65e-42de-8db2-8c21c183c5dd",
+                "job_id": "f5a6c120-500a-4300-9b21-0c3225af1f80",
                 "job_name": "Weekly Demo Data Backup",
                 "description": "No description available.",
-                "date_created": "2024-12-26 12:03:35.420000",
-                "date_modified": "2024-12-26 12:03:35.590000",
+                "date_created": "2024-12-30 19:59:24.690000",
+                "date_modified": "2024-12-30 19:59:24.690000",
                 "step_id": "1",
                 "step_name": "Set database to read only",
                 "subsystem": "TSQL",
                 "command": "ALTER DATABASE DemoData SET READ_ONLY"
             },
-            "externalUrl": "",
             "name": "Weekly Demo Data Backup",
             "type": {
                 "string": "MSSQL_JOB_STEP"
@@ -2259,7 +2257,6 @@
     "aspect": {
         "json": {
             "customProperties": {},
-            "externalUrl": "",
             "name": "DemoData.Foo.stored_procedures"
         }
     },
@@ -2282,10 +2279,9 @@
                 "code": "CREATE PROCEDURE [Foo].[Proc.With.SpecialChar] @ID INT\nAS\n    SELECT @ID AS ThatDB;\n",
                 "input parameters": "['@ID']",
                 "parameter @ID": "{'type': 'int'}",
-                "date_created": "2024-12-26 12:03:35.230000",
-                "date_modified": "2024-12-26 12:03:35.230000"
+                "date_created": "2024-12-30 19:59:24.690000",
+                "date_modified": "2024-12-30 19:59:24.690000"
             },
-            "externalUrl": "",
             "name": "DemoData.Foo.Proc.With.SpecialChar",
             "type": {
                 "string": "MSSQL_STORED_PROCEDURE"
@@ -2298,6 +2294,29 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
+    "changeType": "UPSERT",
+    "aspectName": "dataTransformLogic",
+    "aspect": {
+        "json": {
+            "transforms": [
+                {
+                    "queryStatement": {
+                        "value": "CREATE PROCEDURE [Foo].[Proc.With.SpecialChar] @ID INT\nAS\n    SELECT @ID AS ThatDB;\n",
+                        "language": "SQL"
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mssql-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
@@ -2675,7 +2694,7 @@
                 "actor": "urn:li:corpuser:_ingestion"
             },
             "lastModified": {
-                "time": 1735214621644,
+                "time": 1735588789629,
                 "actor": "urn:li:corpuser:_ingestion"
             }
         }
diff --git a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_to_file.json b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_to_file.json
index bf30448469c309..cbfc374decab2f 100644
--- a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_to_file.json
+++ b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_to_file.json
@@ -102,7 +102,6 @@
     "aspect": {
         "json": {
             "customProperties": {},
-            "externalUrl": "",
             "name": "Weekly Demo Data Backup"
         }
     },
@@ -137,17 +136,16 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "job_id": "a06cfdca-b65e-42de-8db2-8c21c183c5dd",
+                "job_id": "f5a6c120-500a-4300-9b21-0c3225af1f80",
                 "job_name": "Weekly Demo Data Backup",
                 "description": "No description available.",
-                "date_created": "2024-12-26 12:03:35.420000",
-                "date_modified": "2024-12-26 12:03:35.590000",
+                "date_created": "2024-12-30 19:59:24.690000",
+                "date_modified": "2024-12-30 19:59:24.690000",
                 "step_id": "1",
                 "step_name": "Set database to read only",
                 "subsystem": "TSQL",
                 "command": "ALTER DATABASE DemoData SET READ_ONLY"
             },
-            "externalUrl": "",
             "name": "Weekly Demo Data Backup",
             "type": {
                 "string": "MSSQL_JOB_STEP"
@@ -2492,7 +2490,6 @@
     "aspect": {
         "json": {
             "customProperties": {},
-            "externalUrl": "",
             "name": "DemoData.Foo.stored_procedures"
         }
     },
@@ -2532,10 +2529,9 @@
                 "code": "CREATE PROCEDURE [Foo].[Proc.With.SpecialChar] @ID INT\nAS\n    SELECT @ID AS ThatDB;\n",
                 "input parameters": "['@ID']",
                 "parameter @ID": "{'type': 'int'}",
-                "date_created": "2024-12-26 12:03:35.230000",
-                "date_modified": "2024-12-26 12:03:35.230000"
+                "date_created": "2024-12-30 19:59:24.690000",
+                "date_modified": "2024-12-30 19:59:24.690000"
             },
-            "externalUrl": "",
             "name": "DemoData.Foo.Proc.With.SpecialChar",
             "type": {
                 "string": "MSSQL_STORED_PROCEDURE"
@@ -2565,6 +2561,29 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,my-instance.DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
+    "changeType": "UPSERT",
+    "aspectName": "dataTransformLogic",
+    "aspect": {
+        "json": {
+            "transforms": [
+                {
+                    "queryStatement": {
+                        "value": "CREATE PROCEDURE [Foo].[Proc.With.SpecialChar] @ID INT\nAS\n    SELECT @ID AS ThatDB;\n",
+                        "language": "SQL"
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mssql-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataJob",
     "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,my-instance.DemoData.Foo.stored_procedures,PROD),NewProc)",
@@ -2577,10 +2596,9 @@
                 "depending_on_procedure": "{}",
                 "code": "CREATE PROCEDURE [Foo].[NewProc]\n    AS\n    BEGIN\n        --insert into items table from salesreason table\n        insert into Foo.Items (ID, ItemName)\n        SELECT TempID, Name\n        FROM Foo.SalesReason;\n\n\n       IF OBJECT_ID('Foo.age_dist', 'U') IS NULL\n       BEGIN\n            -- Create and populate if table doesn't exist\n            SELECT Age, COUNT(*) as Count\n            INTO Foo.age_dist\n            FROM Foo.Persons\n            GROUP BY Age\n        END\n        ELSE\n        BEGIN\n            -- Update existing table\n            TRUNCATE TABLE Foo.age_dist;\n\n            INSERT INTO Foo.age_dist (Age, Count)\n            SELECT Age, COUNT(*) as Count\n            FROM Foo.Persons\n            GROUP BY Age\n        END\n\n        SELECT ID, Age INTO #TEMPTABLE FROM NewData.FooNew.PersonsNew\n        \n        UPDATE DemoData.Foo.Persons\n        SET Age = t.Age\n        FROM DemoData.Foo.Persons p\n        JOIN #TEMPTABLE t ON p.ID = t.ID\n\n    END\n",
                 "input parameters": "[]",
-                "date_created": "2024-12-26 12:03:35.237000",
-                "date_modified": "2024-12-26 12:03:35.237000"
+                "date_created": "2024-12-30 19:59:24.690000",
+                "date_modified": "2024-12-30 19:59:24.690000"
             },
-            "externalUrl": "",
             "name": "DemoData.Foo.NewProc",
             "type": {
                 "string": "MSSQL_STORED_PROCEDURE"
@@ -2610,6 +2628,29 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,my-instance.DemoData.Foo.stored_procedures,PROD),NewProc)",
+    "changeType": "UPSERT",
+    "aspectName": "dataTransformLogic",
+    "aspect": {
+        "json": {
+            "transforms": [
+                {
+                    "queryStatement": {
+                        "value": "CREATE PROCEDURE [Foo].[NewProc]\n    AS\n    BEGIN\n        --insert into items table from salesreason table\n        insert into Foo.Items (ID, ItemName)\n        SELECT TempID, Name\n        FROM Foo.SalesReason;\n\n\n       IF OBJECT_ID('Foo.age_dist', 'U') IS NULL\n       BEGIN\n            -- Create and populate if table doesn't exist\n            SELECT Age, COUNT(*) as Count\n            INTO Foo.age_dist\n            FROM Foo.Persons\n            GROUP BY Age\n        END\n        ELSE\n        BEGIN\n            -- Update existing table\n            TRUNCATE TABLE Foo.age_dist;\n\n            INSERT INTO Foo.age_dist (Age, Count)\n            SELECT Age, COUNT(*) as Count\n            FROM Foo.Persons\n            GROUP BY Age\n        END\n\n        SELECT ID, Age INTO #TEMPTABLE FROM NewData.FooNew.PersonsNew\n        \n        UPDATE DemoData.Foo.Persons\n        SET Age = t.Age\n        FROM DemoData.Foo.Persons p\n        JOIN #TEMPTABLE t ON p.ID = t.ID\n\n    END\n",
+                        "language": "SQL"
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mssql-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:5631370915311469374ef3cb5f0ebbf0",
@@ -3005,7 +3046,7 @@
                 "actor": "urn:li:corpuser:_ingestion"
             },
             "lastModified": {
-                "time": 1735214620908,
+                "time": 1735588787786,
                 "actor": "urn:li:corpuser:_ingestion"
             }
         }
diff --git a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_with_lower_case_urn.json b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_with_lower_case_urn.json
index ff27989d71de1b..70f5784d6d0b18 100644
--- a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_with_lower_case_urn.json
+++ b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_with_lower_case_urn.json
@@ -95,7 +95,6 @@
     "aspect": {
         "json": {
             "customProperties": {},
-            "externalUrl": "",
             "name": "Weekly Demo Data Backup"
         }
     },
@@ -113,17 +112,16 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "job_id": "a06cfdca-b65e-42de-8db2-8c21c183c5dd",
+                "job_id": "f5a6c120-500a-4300-9b21-0c3225af1f80",
                 "job_name": "Weekly Demo Data Backup",
                 "description": "No description available.",
-                "date_created": "2024-12-26 12:03:35.420000",
-                "date_modified": "2024-12-26 12:03:35.590000",
+                "date_created": "2024-12-30 19:59:24.690000",
+                "date_modified": "2024-12-30 19:59:24.690000",
                 "step_id": "1",
                 "step_name": "Set database to read only",
                 "subsystem": "TSQL",
                 "command": "ALTER DATABASE DemoData SET READ_ONLY"
             },
-            "externalUrl": "",
             "name": "Weekly Demo Data Backup",
             "type": {
                 "string": "MSSQL_JOB_STEP"
@@ -2259,7 +2257,6 @@
     "aspect": {
         "json": {
             "customProperties": {},
-            "externalUrl": "",
             "name": "DemoData.Foo.stored_procedures"
         }
     },
@@ -2282,10 +2279,9 @@
                 "code": "CREATE PROCEDURE [Foo].[Proc.With.SpecialChar] @ID INT\nAS\n    SELECT @ID AS ThatDB;\n",
                 "input parameters": "['@ID']",
                 "parameter @ID": "{'type': 'int'}",
-                "date_created": "2024-12-26 12:03:35.230000",
-                "date_modified": "2024-12-26 12:03:35.230000"
+                "date_created": "2024-12-30 19:59:24.690000",
+                "date_modified": "2024-12-30 19:59:24.690000"
             },
-            "externalUrl": "",
             "name": "DemoData.Foo.Proc.With.SpecialChar",
             "type": {
                 "string": "MSSQL_STORED_PROCEDURE"
@@ -2298,6 +2294,29 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
+    "changeType": "UPSERT",
+    "aspectName": "dataTransformLogic",
+    "aspect": {
+        "json": {
+            "transforms": [
+                {
+                    "queryStatement": {
+                        "value": "CREATE PROCEDURE [Foo].[Proc.With.SpecialChar] @ID INT\nAS\n    SELECT @ID AS ThatDB;\n",
+                        "language": "SQL"
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mssql-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataJob",
     "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),NewProc)",
@@ -2310,10 +2329,9 @@
                 "depending_on_procedure": "{}",
                 "code": "CREATE PROCEDURE [Foo].[NewProc]\n    AS\n    BEGIN\n        --insert into items table from salesreason table\n        insert into Foo.Items (ID, ItemName)\n        SELECT TempID, Name\n        FROM Foo.SalesReason;\n\n\n       IF OBJECT_ID('Foo.age_dist', 'U') IS NULL\n       BEGIN\n            -- Create and populate if table doesn't exist\n            SELECT Age, COUNT(*) as Count\n            INTO Foo.age_dist\n            FROM Foo.Persons\n            GROUP BY Age\n        END\n        ELSE\n        BEGIN\n            -- Update existing table\n            TRUNCATE TABLE Foo.age_dist;\n\n            INSERT INTO Foo.age_dist (Age, Count)\n            SELECT Age, COUNT(*) as Count\n            FROM Foo.Persons\n            GROUP BY Age\n        END\n\n        SELECT ID, Age INTO #TEMPTABLE FROM NewData.FooNew.PersonsNew\n        \n        UPDATE DemoData.Foo.Persons\n        SET Age = t.Age\n        FROM DemoData.Foo.Persons p\n        JOIN #TEMPTABLE t ON p.ID = t.ID\n\n    END\n",
                 "input parameters": "[]",
-                "date_created": "2024-12-26 12:03:35.237000",
-                "date_modified": "2024-12-26 12:03:35.237000"
+                "date_created": "2024-12-30 19:59:24.690000",
+                "date_modified": "2024-12-30 19:59:24.690000"
             },
-            "externalUrl": "",
             "name": "DemoData.Foo.NewProc",
             "type": {
                 "string": "MSSQL_STORED_PROCEDURE"
@@ -2326,6 +2344,29 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,DemoData.Foo.stored_procedures,PROD),NewProc)",
+    "changeType": "UPSERT",
+    "aspectName": "dataTransformLogic",
+    "aspect": {
+        "json": {
+            "transforms": [
+                {
+                    "queryStatement": {
+                        "value": "CREATE PROCEDURE [Foo].[NewProc]\n    AS\n    BEGIN\n        --insert into items table from salesreason table\n        insert into Foo.Items (ID, ItemName)\n        SELECT TempID, Name\n        FROM Foo.SalesReason;\n\n\n       IF OBJECT_ID('Foo.age_dist', 'U') IS NULL\n       BEGIN\n            -- Create and populate if table doesn't exist\n            SELECT Age, COUNT(*) as Count\n            INTO Foo.age_dist\n            FROM Foo.Persons\n            GROUP BY Age\n        END\n        ELSE\n        BEGIN\n            -- Update existing table\n            TRUNCATE TABLE Foo.age_dist;\n\n            INSERT INTO Foo.age_dist (Age, Count)\n            SELECT Age, COUNT(*) as Count\n            FROM Foo.Persons\n            GROUP BY Age\n        END\n\n        SELECT ID, Age INTO #TEMPTABLE FROM NewData.FooNew.PersonsNew\n        \n        UPDATE DemoData.Foo.Persons\n        SET Age = t.Age\n        FROM DemoData.Foo.Persons p\n        JOIN #TEMPTABLE t ON p.ID = t.ID\n\n    END\n",
+                        "language": "SQL"
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mssql-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:250ce23f940485303fa5e5d4f5194975",
@@ -4978,7 +5019,7 @@
                 "actor": "urn:li:corpuser:_ingestion"
             },
             "lastModified": {
-                "time": 1735214622805,
+                "time": 1735588791954,
                 "actor": "urn:li:corpuser:_ingestion"
             }
         }
@@ -5125,7 +5166,7 @@
                 "actor": "urn:li:corpuser:_ingestion"
             },
             "lastModified": {
-                "time": 1735214622810,
+                "time": 1735588791966,
                 "actor": "urn:li:corpuser:_ingestion"
             }
         }

From aff3faed4fba49e69dcb38581172b96b13bc7ea0 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Wed, 22 Jan 2025 12:44:44 -0800
Subject: [PATCH 143/249] feat(sdk): add ContainerKey.parent_key method
 (#12423)

---
 .../src/datahub/emitter/mcp_builder.py        | 19 ++++++
 .../tests/unit/sdk/test_mcp_builder.py        | 64 +++++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git a/metadata-ingestion/src/datahub/emitter/mcp_builder.py b/metadata-ingestion/src/datahub/emitter/mcp_builder.py
index 581f903d0eef0d..7466504987e05d 100644
--- a/metadata-ingestion/src/datahub/emitter/mcp_builder.py
+++ b/metadata-ingestion/src/datahub/emitter/mcp_builder.py
@@ -90,6 +90,25 @@ def property_dict(self) -> Dict[str, str]:
     def as_urn(self) -> str:
         return make_container_urn(guid=self.guid())
 
+    def parent_key(self) -> Optional["ContainerKey"]:
+        # Find the immediate base class of self.
+        # This is a bit of a hack, but it works.
+        base_classes = self.__class__.__bases__
+        if len(base_classes) != 1:
+            # TODO: Raise a more specific error.
+            raise ValueError(
+                f"Unable to determine parent key for {self.__class__}: {self}"
+            )
+        base_class = base_classes[0]
+        if base_class is DatahubKey or base_class is ContainerKey:
+            return None
+
+        # We need to use `__dict__` instead of `pydantic.BaseModel.dict()`
+        # in order to include "excluded" fields e.g. `backcompat_env_as_instance`.
+        # Tricky: this only works because DatahubKey is a BaseModel and hence
+        # allows extra fields.
+        return base_class(**self.__dict__)
+
 
 # DEPRECATION: Keeping the `PlatformKey` name around for backwards compatibility.
 PlatformKey = ContainerKey
diff --git a/metadata-ingestion/tests/unit/sdk/test_mcp_builder.py b/metadata-ingestion/tests/unit/sdk/test_mcp_builder.py
index e304edb24789cd..8032df632c549e 100644
--- a/metadata-ingestion/tests/unit/sdk/test_mcp_builder.py
+++ b/metadata-ingestion/tests/unit/sdk/test_mcp_builder.py
@@ -86,6 +86,70 @@ def test_guid_generators():
     assert guid == guid_datahub
 
 
+def _assert_eq(a: builder.ContainerKey, b: builder.ContainerKey) -> None:
+    assert a == b
+    assert a.__class__ is b.__class__
+    assert a.guid() == b.guid()
+    assert a.property_dict() == b.property_dict()
+
+
+def test_parent_key() -> None:
+    schema_key = builder.SchemaKey(
+        database="test",
+        schema="Test",
+        platform="mysql",
+        instance="TestInstance",
+        env="DEV",
+    )
+    db_key = schema_key.parent_key()
+    assert db_key is not None
+    _assert_eq(
+        db_key,
+        builder.DatabaseKey(
+            database="test",
+            platform="mysql",
+            instance="TestInstance",
+            env="DEV",
+        ),
+    )
+
+    assert db_key.parent_key() is None
+
+
+def test_parent_key_with_backcompat_env_as_instance() -> None:
+    schema_key = builder.SchemaKey(
+        database="test",
+        schema="Test",
+        platform="mysql",
+        instance=None,
+        env="PROD",
+        backcompat_env_as_instance=True,
+    )
+    db_key = schema_key.parent_key()
+    assert db_key is not None
+    _assert_eq(
+        db_key,
+        builder.DatabaseKey(
+            database="test",
+            platform="mysql",
+            instance=None,
+            env="PROD",
+            backcompat_env_as_instance=True,
+        ),
+    )
+
+
+def test_parent_key_on_container_key() -> None:
+    # In general, people shouldn't be calling parent_key() on ContainerKey directly.
+    # But just in case, we should make sure it works.
+    container_key = builder.ContainerKey(
+        platform="bigquery",
+        name="test",
+        env="DEV",
+    )
+    assert container_key.parent_key() is None
+
+
 def test_entity_supports_aspect():
     assert builder.entity_supports_aspect("dataset", StatusClass)
     assert not builder.entity_supports_aspect("telemetry", StatusClass)

From 282395dc4ae26bcb69ab79098395ea8a01dbc41e Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Wed, 22 Jan 2025 13:46:24 -0800
Subject: [PATCH 144/249] feat(sdk): support qualified urn names in simple urn
 constructors (#12426)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sergio Gómez Villamor <sgomezvillamor@gmail.com>
---
 metadata-ingestion/scripts/avro_codegen.py    | 78 ++++++++++++++-----
 .../tests/unit/urns/test_urn.py               | 33 ++++++++
 2 files changed, 90 insertions(+), 21 deletions(-)

diff --git a/metadata-ingestion/scripts/avro_codegen.py b/metadata-ingestion/scripts/avro_codegen.py
index 0fe79a2c6a8e47..7e75cba9833810 100644
--- a/metadata-ingestion/scripts/avro_codegen.py
+++ b/metadata-ingestion/scripts/avro_codegen.py
@@ -277,7 +277,7 @@ def annotate_aspects(aspects: List[dict], schema_class_file: Path) -> None:
 """
 
     for aspect in aspects:
-        className = f'{aspect["name"]}Class'
+        className = f"{aspect['name']}Class"
         aspectName = aspect["Aspect"]["name"]
         class_def_original = f"class {className}(DictWrapper):"
 
@@ -299,9 +299,9 @@ def annotate_aspects(aspects: List[dict], schema_class_file: Path) -> None:
         schema_classes_lines[empty_line] = "\n"
         schema_classes_lines[empty_line] += f"\n    ASPECT_NAME = '{aspectName}'"
         if "type" in aspect["Aspect"]:
-            schema_classes_lines[
-                empty_line
-            ] += f"\n    ASPECT_TYPE = '{aspect['Aspect']['type']}'"
+            schema_classes_lines[empty_line] += (
+                f"\n    ASPECT_TYPE = '{aspect['Aspect']['type']}'"
+            )
 
         aspect_info = {
             k: v for k, v in aspect["Aspect"].items() if k not in {"name", "type"}
@@ -315,7 +315,7 @@ def annotate_aspects(aspects: List[dict], schema_class_file: Path) -> None:
     schema_classes_lines.append(
         f"""
 ASPECT_CLASSES: List[Type[_Aspect]] = [
-    {f',{newline}    '.join(f"{aspect['name']}Class" for aspect in aspects)}
+    {f",{newline}    ".join(f"{aspect['name']}Class" for aspect in aspects)}
 ]
 
 ASPECT_NAME_MAP: Dict[str, Type[_Aspect]] = {{
@@ -326,11 +326,11 @@ def annotate_aspects(aspects: List[dict], schema_class_file: Path) -> None:
 from typing_extensions import TypedDict
 
 class AspectBag(TypedDict, total=False):
-    {f'{newline}    '.join(f"{aspect['Aspect']['name']}: {aspect['name']}Class" for aspect in aspects)}
+    {f"{newline}    ".join(f"{aspect['Aspect']['name']}: {aspect['name']}Class" for aspect in aspects)}
 
 
 KEY_ASPECTS: Dict[str, Type[_Aspect]] = {{
-    {f',{newline}    '.join(f"'{aspect['Aspect']['keyForEntity']}': {aspect['name']}Class" for aspect in aspects if aspect['Aspect'].get('keyForEntity'))}
+    {f",{newline}    ".join(f"'{aspect['Aspect']['keyForEntity']}': {aspect['name']}Class" for aspect in aspects if aspect["Aspect"].get("keyForEntity"))}
 }}
 """
     )
@@ -546,6 +546,7 @@ def generate_urn_class(entity_type: str, key_aspect: dict) -> str:
         assert field_name(fields[0]) == "guid"
         assert fields[0]["type"] == ["null", "string"]
         fields[0]["type"] = "string"
+    arg_count = len(fields)
 
     field_urn_type_classes = {}
     for field in fields:
@@ -561,6 +562,12 @@ def generate_urn_class(entity_type: str, key_aspect: dict) -> str:
                 field_urn_type_class = "Urn"
 
         field_urn_type_classes[field_name(field)] = field_urn_type_class
+    if arg_count == 1:
+        field = fields[0]
+
+        if field_urn_type_classes[field_name(field)] is None:
+            # All single-arg urn types should accept themselves.
+            field_urn_type_classes[field_name(field)] = class_name
 
     _init_arg_parts: List[str] = []
     for field in fields:
@@ -579,7 +586,6 @@ def generate_urn_class(entity_type: str, key_aspect: dict) -> str:
 
     super_init_args = ", ".join(field_name(field) for field in fields)
 
-    arg_count = len(fields)
     parse_ids_mapping = ", ".join(
         f"{field_name(field)}=entity_ids[{i}]" for i, field in enumerate(fields)
     )
@@ -601,8 +607,26 @@ def generate_urn_class(entity_type: str, key_aspect: dict) -> str:
 
         # Generalized mechanism for validating embedded urns.
         field_urn_type_class = field_urn_type_classes[field_name(field)]
-        if field_urn_type_class:
-            init_validation += f"{field_name(field)} = str({field_name(field)})\n"
+        if field_urn_type_class and field_urn_type_class == class_name:
+            # First, we need to extract the main piece from the urn type.
+            init_validation += (
+                f"if isinstance({field_name(field)}, {field_urn_type_class}):\n"
+                f"    {field_name(field)} = {field_name(field)}.{field_name(field)}\n"
+            )
+
+            # If it's still an urn type, that's a problem.
+            init_validation += (
+                f"elif isinstance({field_name(field)}, Urn):\n"
+                f"    raise InvalidUrnError(f'Expecting a {field_urn_type_class} but got {{{field_name(field)}}}')\n"
+            )
+
+            # Then, we do character validation as normal.
+            init_validation += (
+                f"if UrnEncoder.contains_reserved_char({field_name(field)}):\n"
+                f"    raise InvalidUrnError(f'{class_name} {field_name(field)} contains reserved characters')\n"
+            )
+        elif field_urn_type_class:
+            init_validation += f"{field_name(field)} = str({field_name(field)})  # convert urn type to str\n"
             init_validation += (
                 f"assert {field_urn_type_class}.from_string({field_name(field)})\n"
             )
@@ -611,17 +635,29 @@ def generate_urn_class(entity_type: str, key_aspect: dict) -> str:
                 f"if UrnEncoder.contains_reserved_char({field_name(field)}):\n"
                 f"    raise InvalidUrnError(f'{class_name} {field_name(field)} contains reserved characters')\n"
             )
+        # TODO add ALL_ENV_TYPES validation
 
+        # Field coercion logic.
         if field_name(field) == "env":
             init_coercion += "env = env.upper()\n"
-        # TODO add ALL_ENV_TYPES validation
-        elif entity_type == "dataPlatform" and field_name(field) == "platform_name":
-            init_coercion += 'if platform_name.startswith("urn:li:dataPlatform:"):\n'
-            init_coercion += "    platform_name = DataPlatformUrn.from_string(platform_name).platform_name\n"
-
-        if field_name(field) == "platform":
-            init_coercion += "platform = platform.urn() if isinstance(platform, DataPlatformUrn) else DataPlatformUrn(platform).urn()\n"
-        elif field_urn_type_class is None:
+        elif field_name(field) == "platform":
+            # For platform names in particular, we also qualify them when they don't have the prefix.
+            # We can rely on the DataPlatformUrn constructor to do this prefixing.
+            init_coercion += "platform = DataPlatformUrn(platform).urn()\n"
+        elif field_urn_type_class is not None:
+            # For urn types, we need to parse them into urn types where appropriate.
+            # Otherwise, we just need to encode special characters.
+            init_coercion += (
+                f"if isinstance({field_name(field)}, str):\n"
+                f"    if {field_name(field)}.startswith('urn:li:'):\n"
+                f"        try:\n"
+                f"            {field_name(field)} = {field_urn_type_class}.from_string({field_name(field)})\n"
+                f"        except InvalidUrnError:\n"
+                f"            raise InvalidUrnError(f'Expecting a {field_urn_type_class} but got {{{field_name(field)}}}')\n"
+                f"    else:\n"
+                f"        {field_name(field)} = UrnEncoder.encode_string({field_name(field)})\n"
+            )
+        else:
             # For all non-urns, run the value through the UrnEncoder.
             init_coercion += (
                 f"{field_name(field)} = UrnEncoder.encode_string({field_name(field)})\n"
@@ -642,10 +678,10 @@ class {class_name}(_SpecificUrn):
     def __init__(self, {init_args}, *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-{textwrap.indent(init_coercion.strip(), prefix=" "*4*3)}
+{textwrap.indent(init_coercion.strip(), prefix=" " * 4 * 3)}
 
         # Validation logic.
-{textwrap.indent(init_validation.strip(), prefix=" "*4*2)}
+{textwrap.indent(init_validation.strip(), prefix=" " * 4 * 2)}
 
         super().__init__(self.ENTITY_TYPE, [{super_init_args}])
 
@@ -729,7 +765,7 @@ def generate(
             and aspect["Aspect"]["keyForEntity"] != entity.name
         ):
             raise ValueError(
-                f'Entity key {entity.keyAspect} is used by {aspect["Aspect"]["keyForEntity"]} and {entity.name}'
+                f"Entity key {entity.keyAspect} is used by {aspect['Aspect']['keyForEntity']} and {entity.name}"
             )
 
         # Also require that the aspect list is deduplicated.
diff --git a/metadata-ingestion/tests/unit/urns/test_urn.py b/metadata-ingestion/tests/unit/urns/test_urn.py
index 8490364326d940..f9ed2b387f0789 100644
--- a/metadata-ingestion/tests/unit/urns/test_urn.py
+++ b/metadata-ingestion/tests/unit/urns/test_urn.py
@@ -10,6 +10,7 @@
     DataPlatformUrn,
     DatasetUrn,
     SchemaFieldUrn,
+    TagUrn,
     Urn,
 )
 from datahub.testing.doctest import assert_doctest
@@ -71,9 +72,18 @@ def test_urn_coercion() -> None:
 def test_urns_in_init() -> None:
     platform = DataPlatformUrn("abc")
     assert platform.urn() == "urn:li:dataPlatform:abc"
+    assert platform == DataPlatformUrn(platform)
+    assert platform == DataPlatformUrn(platform.urn())
 
     dataset_urn = DatasetUrn(platform, "def", "PROD")
     assert dataset_urn.urn() == "urn:li:dataset:(urn:li:dataPlatform:abc,def,PROD)"
+    assert dataset_urn == DatasetUrn(platform.urn(), "def", "PROD")
+    assert dataset_urn == DatasetUrn(platform.platform_name, "def", "PROD")
+
+    with pytest.raises(
+        InvalidUrnError, match="Expecting a DataPlatformUrn but got .*dataset.*"
+    ):
+        assert dataset_urn == DatasetUrn(dataset_urn, "def", "PROD")  # type: ignore
 
     schema_field = SchemaFieldUrn(dataset_urn, "foo")
     assert (
@@ -101,6 +111,11 @@ def test_urn_type_dispatch_2() -> None:
     with pytest.raises(InvalidUrnError, match="Passed an urn of type dataJob"):
         CorpUserUrn.from_string(urn)
 
+    with pytest.raises(
+        InvalidUrnError, match="Expecting a CorpUserUrn but got .*dataJob.*"
+    ):
+        CorpUserUrn(urn)  # type: ignore
+
 
 def test_urn_type_dispatch_3() -> None:
     # Creating a "generic" Urn.
@@ -133,6 +148,24 @@ def test_urn_type_dispatch_4() -> None:
     assert urn2.urn() == urn_str
 
 
+def test_urn_from_urn_simple() -> None:
+    # This capability is also tested by a bunch of other tests above.
+
+    tag_str = "urn:li:tag:legacy"
+    tag = TagUrn.from_string(tag_str)
+    assert tag_str == tag.urn()
+    assert tag.name == "legacy"
+    assert tag == TagUrn(tag)
+    assert tag == TagUrn(tag.urn())
+
+
+def test_urn_from_urn_tricky() -> None:
+    tag_str = "urn:li:tag:urn:li:tag:legacy"
+    tag = TagUrn(tag_str)
+    assert tag.urn() == tag_str
+    assert tag.name == "urn:li:tag:legacy"
+
+
 def test_urn_doctest() -> None:
     assert_doctest(datahub.utilities.urns._urn_base)
 

From b4e23c5f82b56b46f4b731cea33c079330db8d96 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Wed, 22 Jan 2025 13:57:13 -0800
Subject: [PATCH 145/249] fix(ci): reduce parallelism (#12441)

Co-authored-by: Chakravarthy Racharla <chakru.racharla@acryl.io>
---
 .github/workflows/docker-unified.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-unified.yml b/.github/workflows/docker-unified.yml
index 53946ab8b1018c..5f944c8e28769f 100644
--- a/.github/workflows/docker-unified.yml
+++ b/.github/workflows/docker-unified.yml
@@ -1018,8 +1018,8 @@ jobs:
         # python_batch_count is used to split pytests in the smoke-test (batches of actual test functions)
         # cypress_batch_count is used to split the collection of cypress test specs into batches.
         run: |
-          echo "cypress_batch_count=11" >> "$GITHUB_OUTPUT"
-          echo "python_batch_count=5" >> "$GITHUB_OUTPUT"
+          echo "cypress_batch_count=5" >> "$GITHUB_OUTPUT"
+          echo "python_batch_count=3" >> "$GITHUB_OUTPUT"
 
       - id: set-matrix
         # For m batches for python and n batches for cypress, we need a test matrix of python x m + cypress x n.

From eca968455d92f1c16a45fe20a66cd9c810deaa52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Jan 2025 15:09:11 -0800
Subject: [PATCH 146/249] build(deps-dev): bump vite from 4.5.5 to 4.5.6 in
 /datahub-web-react (#12429)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 datahub-web-react/package.json | 2 +-
 datahub-web-react/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/datahub-web-react/package.json b/datahub-web-react/package.json
index a608698d7602c4..0ff68de2481ed0 100644
--- a/datahub-web-react/package.json
+++ b/datahub-web-react/package.json
@@ -152,7 +152,7 @@
         "prettier": "^2.8.8",
         "source-map-explorer": "^2.5.2",
         "storybook": "^8.1.11",
-        "vite": "^4.5.5",
+        "vite": "^4.5.6",
         "vite-plugin-babel-macros": "^1.0.6",
         "vite-plugin-static-copy": "^0.17.0",
         "vite-plugin-svgr": "^4.1.0",
diff --git a/datahub-web-react/yarn.lock b/datahub-web-react/yarn.lock
index f16e8aa506e2cc..6e946e584f18a5 100644
--- a/datahub-web-react/yarn.lock
+++ b/datahub-web-react/yarn.lock
@@ -12066,10 +12066,10 @@ vite-plugin-svgr@^4.1.0:
     "@svgr/core" "^8.1.0"
     "@svgr/plugin-jsx" "^8.1.0"
 
-"vite@^3.0.0 || ^4.0.0 || ^5.0.0-0", "vite@^3.1.0 || ^4.0.0 || ^5.0.0-0", vite@^4.5.5:
-  version "4.5.5"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.5.tgz#639b9feca5c0a3bfe3c60cb630ef28bf219d742e"
-  integrity sha512-ifW3Lb2sMdX+WU91s3R0FyQlAyLxOzCSCP37ujw0+r5POeHPwe6udWVIElKQq8gk3t7b8rkmvqC6IHBpCff4GQ==
+"vite@^3.0.0 || ^4.0.0 || ^5.0.0-0", "vite@^3.1.0 || ^4.0.0 || ^5.0.0-0", vite@^4.5.6:
+  version "4.5.6"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.6.tgz#48bbd97fe06e8241df2e625b31c581707e10b57d"
+  integrity sha512-ElBNuVvJKslxcfY2gMmae5IjaKGqCYGicCNZ+8R56sAznobeE3pI9ctzI17cBS/6OJh5YuQNMSN4BP4dRjugBg==
   dependencies:
     esbuild "^0.18.10"
     postcss "^8.4.27"

From 8195f8003ab67dfe0a03afcb9bcc19d85c6ff920 Mon Sep 17 00:00:00 2001
From: ryota-cloud <ryota.egashira@acryl.io>
Date: Wed, 22 Jan 2025 15:29:25 -0800
Subject: [PATCH 147/249] fix(smoke-test) add smoke test for restli
 ingestProposalBatch  (#12404)

---
 .../restli/test_restli_batch_ingestion.py     | 135 ++++++++++++++++++
 1 file changed, 135 insertions(+)
 create mode 100644 smoke-test/tests/restli/test_restli_batch_ingestion.py

diff --git a/smoke-test/tests/restli/test_restli_batch_ingestion.py b/smoke-test/tests/restli/test_restli_batch_ingestion.py
new file mode 100644
index 00000000000000..0e92988ed64703
--- /dev/null
+++ b/smoke-test/tests/restli/test_restli_batch_ingestion.py
@@ -0,0 +1,135 @@
+import time
+from typing import List
+
+import pytest
+
+from datahub.emitter.mce_builder import make_dashboard_urn
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.emitter.serialization_helper import pre_json_transform
+from datahub.metadata._schema_classes import MetadataChangeProposalClass
+from datahub.metadata.schema_classes import (
+    AuditStampClass,
+    ChangeAuditStampsClass,
+    DashboardInfoClass,
+)
+from tests.consistency_utils import wait_for_writes_to_sync
+from tests.restli.restli_test import MetadataChangeProposalInvalidWrapper
+from tests.utils import delete_urns
+
+generated_urns: List[str] = []
+
+
+@pytest.fixture(scope="module")
+def ingest_cleanup_data(auth_session, graph_client, request):
+    yield
+    delete_urns(graph_client, generated_urns)
+
+
+def _create_valid_dashboard_mcps() -> List[MetadataChangeProposalClass]:
+    mcps = []
+    num_valid_mcp = 5
+
+    audit_stamp = pre_json_transform(
+        ChangeAuditStampsClass(
+            created=AuditStampClass(
+                time=int(time.time() * 1000),
+                actor="urn:li:corpuser:datahub",
+            )
+        ).to_obj()
+    )
+
+    valid_dashboard_info = DashboardInfoClass(
+        title="Dummy Title For Testing",
+        description="Dummy Description For Testing",
+        lastModified=audit_stamp,
+    )
+
+    for i in range(num_valid_mcp):
+        mcp_valid = MetadataChangeProposalWrapper(
+            entityUrn=make_dashboard_urn(
+                platform="looker", name=f"dummy-test-invalid-{i}"
+            ),
+            aspectName="dashboardInfo",
+            aspect=valid_dashboard_info,
+        )
+        mcps.append(mcp_valid.make_mcp())
+    generated_urns.extend([mcp.entityUrn for mcp in mcps if mcp.entityUrn])
+
+    return mcps
+
+
+def _create_invalid_dashboard_mcp() -> MetadataChangeProposalClass:
+    audit_stamp = pre_json_transform(
+        ChangeAuditStampsClass(
+            created=AuditStampClass(
+                time=int(time.time() * 1000),
+                actor="urn:li:corpuser:datahub",
+            )
+        ).to_obj()
+    )
+
+    invalid_dashboard_info = {
+        "title": "Dummy Title For Testing",
+        "description": "Dummy Description For Testing",
+        "lastModified": audit_stamp,
+        "notValidField": "invalid field value",
+    }
+
+    mcp_invalid = MetadataChangeProposalInvalidWrapper(
+        entityUrn=make_dashboard_urn(platform="looker", name="dummy-test-valid"),
+        aspectName="dashboardInfo",
+        aspect=invalid_dashboard_info,
+    )
+    generated_urns.append(mcp_invalid.entityUrn) if mcp_invalid.entityUrn else None
+    return mcp_invalid.make_mcp()
+
+
+def test_restli_batch_ingestion_sync(graph_client):
+    # Positive Test (all valid MetadataChangeProposal)
+    mcps = _create_valid_dashboard_mcps()
+    ret = graph_client.emit_mcps(mcps, async_flag=False)
+    assert ret >= 0
+
+    # Negative Test (contains invalid MetadataChangeProposal)
+    invalid_mcp = _create_invalid_dashboard_mcp()
+    mcps.append(invalid_mcp)
+    ret = graph_client.emit_mcps(mcps, async_flag=False)
+    assert ret >= 0
+
+    # Expected that invalid field of MetadataChangeProposal is ignored,
+    # Rest Fields are persistd into DB
+    aspect = graph_client.get_aspect(
+        entity_urn=invalid_mcp.entityUrn, aspect_type=DashboardInfoClass
+    )
+
+    assert aspect is not None
+    assert isinstance(aspect, DashboardInfoClass)
+    assert aspect.title == "Dummy Title For Testing"
+    assert aspect.description == "Dummy Description For Testing"
+    assert aspect.lastModified is not None
+
+
+def test_restli_batch_ingestion_async(graph_client):
+    # Positive Test (all valid MetadataChangeProposal)
+    mcps = _create_valid_dashboard_mcps()
+    ret = graph_client.emit_mcps(mcps, async_flag=True)
+    assert ret >= 0
+
+    # Negative Test (contains invalid MetadataChangeProposal)
+    invalid_mcp = _create_invalid_dashboard_mcp()
+    mcps.append(invalid_mcp)
+    ret = graph_client.emit_mcps(mcps, async_flag=True)
+    assert ret >= 0
+
+    # Expected that invalid field of MetadataChangeProposal is ignored,
+    # Rest Fields are persistd into DB
+    wait_for_writes_to_sync()
+    aspect = graph_client.get_aspect(
+        entity_urn=invalid_mcp.entityUrn, aspect_type=DashboardInfoClass
+    )
+
+    assert aspect is not None
+    assert isinstance(aspect, DashboardInfoClass)
+    assert aspect.title == "Dummy Title For Testing"
+    assert aspect.description == "Dummy Description For Testing"
+    assert aspect.lastModified is not None

From 5309ae00141875cca6be64e587a94efa854f448e Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Wed, 22 Jan 2025 16:21:46 -0800
Subject: [PATCH 148/249] feat(sdk): improve docs + code clarity (#12422)

---
 .../src/datahub/emitter/enum_helpers.py              |  6 ++++--
 .../src/datahub/emitter/mce_builder.py               |  4 ++++
 .../src/datahub/ingestion/api/decorators.py          |  2 ++
 metadata-ingestion/src/datahub/ingestion/api/sink.py | 12 ++++++++++++
 .../src/datahub/ingestion/api/source.py              |  7 +++++--
 .../src/datahub/utilities/urns/_urn_base.py          |  8 ++++++--
 6 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/metadata-ingestion/src/datahub/emitter/enum_helpers.py b/metadata-ingestion/src/datahub/emitter/enum_helpers.py
index 89949ab3717ff3..89916ffd899c3f 100644
--- a/metadata-ingestion/src/datahub/emitter/enum_helpers.py
+++ b/metadata-ingestion/src/datahub/emitter/enum_helpers.py
@@ -1,11 +1,13 @@
 from typing import List, Type
 
+from typing_extensions import LiteralString
 
-def get_enum_options(_class: Type[object]) -> List[str]:
+
+def get_enum_options(class_: Type[object]) -> List[LiteralString]:
     """Get the valid values for an enum in the datahub.metadata.schema_classes module."""
 
     return [
         value
-        for name, value in vars(_class).items()
+        for name, value in vars(class_).items()
         if not callable(value) and not name.startswith("_")
     ]
diff --git a/metadata-ingestion/src/datahub/emitter/mce_builder.py b/metadata-ingestion/src/datahub/emitter/mce_builder.py
index f5da90a86c9ef6..9fa060266a7ab8 100644
--- a/metadata-ingestion/src/datahub/emitter/mce_builder.py
+++ b/metadata-ingestion/src/datahub/emitter/mce_builder.py
@@ -440,6 +440,10 @@ def can_add_aspect_to_snapshot(
 
 
 def can_add_aspect(mce: MetadataChangeEventClass, AspectType: Type[Aspect]) -> bool:
+    # TODO: This is specific to snapshot types. We have a more general method
+    # in `entity_supports_aspect`, which should be used instead. This method
+    # should be deprecated, and all usages should be replaced.
+
     SnapshotType = type(mce.proposedSnapshot)
 
     return can_add_aspect_to_snapshot(SnapshotType, AspectType)
diff --git a/metadata-ingestion/src/datahub/ingestion/api/decorators.py b/metadata-ingestion/src/datahub/ingestion/api/decorators.py
index d32c0b85ceef4c..b521dc5e9e7f5d 100644
--- a/metadata-ingestion/src/datahub/ingestion/api/decorators.py
+++ b/metadata-ingestion/src/datahub/ingestion/api/decorators.py
@@ -25,6 +25,8 @@ def wrapper(cls: Type) -> Type:
             # add the create method only if it has not been overridden from the base Source.create method
             cls.create = classmethod(default_create)
 
+            # TODO: Once we're on Python 3.10, we should call abc.update_abstractmethods here.
+
         return cls
 
     return wrapper
diff --git a/metadata-ingestion/src/datahub/ingestion/api/sink.py b/metadata-ingestion/src/datahub/ingestion/api/sink.py
index 655e6bb22fa8d1..44148c751df828 100644
--- a/metadata-ingestion/src/datahub/ingestion/api/sink.py
+++ b/metadata-ingestion/src/datahub/ingestion/api/sink.py
@@ -110,6 +110,10 @@ def __init__(self, ctx: PipelineContext, config: SinkConfig):
         self.__post_init__()
 
     def __post_init__(self) -> None:
+        """Hook called after the sink's main initialization is complete.
+
+        Sink subclasses can override this method to customize initialization.
+        """
         pass
 
     @classmethod
@@ -117,9 +121,17 @@ def create(cls, config_dict: dict, ctx: PipelineContext) -> "Self":
         return cls(ctx, cls.get_config_class().parse_obj(config_dict))
 
     def handle_work_unit_start(self, workunit: WorkUnit) -> None:
+        """Called at the start of each new workunit.
+
+        This method is deprecated and will be removed in a future release.
+        """
         pass
 
     def handle_work_unit_end(self, workunit: WorkUnit) -> None:
+        """Called at the end of each workunit.
+
+        This method is deprecated and will be removed in a future release.
+        """
         pass
 
     @abstractmethod
diff --git a/metadata-ingestion/src/datahub/ingestion/api/source.py b/metadata-ingestion/src/datahub/ingestion/api/source.py
index b04ffdb3258934..e401d6e976b6d0 100644
--- a/metadata-ingestion/src/datahub/ingestion/api/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/api/source.py
@@ -404,8 +404,11 @@ def create(cls, config_dict: dict, ctx: PipelineContext) -> Self:
         # Technically, this method should be abstract. However, the @config_class
         # decorator automatically generates a create method at runtime if one is
         # not defined. Python still treats the class as abstract because it thinks
-        # the create method is missing. To avoid the class becoming abstract, we
-        # can't make this method abstract.
+        # the create method is missing.
+        #
+        # Once we're on Python 3.10, we can use the abc.update_abstractmethods(cls)
+        # method in the config_class decorator. That would allow us to make this
+        # method abstract.
         raise NotImplementedError('sources must implement "create"')
 
     def get_workunit_processors(self) -> List[Optional[MetadataWorkUnitProcessor]]:
diff --git a/metadata-ingestion/src/datahub/utilities/urns/_urn_base.py b/metadata-ingestion/src/datahub/utilities/urns/_urn_base.py
index e8e22cd85ac9ff..55144ebf61b197 100644
--- a/metadata-ingestion/src/datahub/utilities/urns/_urn_base.py
+++ b/metadata-ingestion/src/datahub/utilities/urns/_urn_base.py
@@ -6,6 +6,7 @@
 from deprecated import deprecated
 from typing_extensions import Self
 
+from datahub._codegen.aspect import _Aspect
 from datahub.utilities.urns.error import InvalidUrnError
 
 URN_TYPES: Dict[str, Type["_SpecificUrn"]] = {}
@@ -270,7 +271,7 @@ def make_form_urn(form: str) -> str:
 
 
 class _SpecificUrn(Urn):
-    ENTITY_TYPE: str = ""
+    ENTITY_TYPE: ClassVar[str] = ""
 
     def __init_subclass__(cls) -> None:
         # Validate the subclass.
@@ -286,7 +287,10 @@ def __init_subclass__(cls) -> None:
         return super().__init_subclass__()
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type:
+    def underlying_key_aspect_type(cls) -> Type[_Aspect]:
+        raise NotImplementedError()
+
+    def to_key_aspect(self) -> _Aspect:
         raise NotImplementedError()
 
     @classmethod

From 34718578934a5a6dffca82e36ba84a70f12207ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20G=C3=B3mez=20Villamor?= <sgomezvillamor@gmail.com>
Date: Thu, 23 Jan 2025 08:41:46 +0100
Subject: [PATCH 149/249] refactor(powerbi): dashboards, reports and
 independent_datasets accessed by id (#12431)

---
 .../ingestion/source/powerbi/powerbi.py       |  8 ++--
 .../powerbi/rest_api_wrapper/data_classes.py  | 12 +++---
 .../powerbi/rest_api_wrapper/powerbi_api.py   | 42 +++++++++++--------
 .../tests/integration/powerbi/test_powerbi.py | 25 +++++------
 4 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py
index 5e5636f2d50fe3..89184d37569ffc 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py
@@ -1322,14 +1322,14 @@ def extract_independent_datasets(
                     context=",".join(
                         [
                             dataset.name
-                            for dataset in workspace.independent_datasets
+                            for dataset in workspace.independent_datasets.values()
                             if dataset.name
                         ]
                     ),
                 )
             return
 
-        for dataset in workspace.independent_datasets:
+        for dataset in workspace.independent_datasets.values():
             yield from auto_workunit(
                 stream=self.mapper.to_datahub_dataset(
                     dataset=dataset,
@@ -1440,7 +1440,7 @@ def get_workspace_workunit(
 
         yield from auto_workunit(self.emit_app(workspace=workspace))
 
-        for dashboard in workspace.dashboards:
+        for dashboard in workspace.dashboards.values():
             try:
                 # Fetch PowerBi users for dashboards
                 dashboard.users = self.powerbi_client.get_dashboard_users(dashboard)
@@ -1459,7 +1459,7 @@ def get_workspace_workunit(
                 if wu is not None:
                     yield wu
 
-        for report in workspace.reports:
+        for report in workspace.reports.values():
             for work_unit in self.mapper.report_to_datahub_work_units(
                 report, workspace
             ):
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/data_classes.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/data_classes.py
index 70e4ee68f53515..f3e968896b3c96 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/data_classes.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/data_classes.py
@@ -71,13 +71,13 @@ class Workspace:
     id: str
     name: str
     type: str  # This is used as a subtype of the Container entity.
-    dashboards: List["Dashboard"]
-    reports: List["Report"]
-    datasets: Dict[str, "PowerBIDataset"]
-    report_endorsements: Dict[str, List[str]]
-    dashboard_endorsements: Dict[str, List[str]]
+    dashboards: Dict[str, "Dashboard"]  # key = dashboard id
+    reports: Dict[str, "Report"]  # key = report id
+    datasets: Dict[str, "PowerBIDataset"]  # key = dataset id
+    report_endorsements: Dict[str, List[str]]  # key = report id
+    dashboard_endorsements: Dict[str, List[str]]  # key = dashboard id
     scan_result: dict
-    independent_datasets: List["PowerBIDataset"]
+    independent_datasets: Dict[str, "PowerBIDataset"]  # key = dataset id
     app: Optional["App"]
 
     def get_urn_part(self, workspace_id_as_urn_part: Optional[bool] = False) -> str:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/powerbi_api.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/powerbi_api.py
index b41be19d0de53e..93d734652f0ff1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/powerbi_api.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/powerbi_api.py
@@ -193,15 +193,18 @@ def get_dashboard_users(self, dashboard: Dashboard) -> List[User]:
     def get_report_users(self, workspace_id: str, report_id: str) -> List[User]:
         return self._get_entity_users(workspace_id, Constant.REPORTS, report_id)
 
-    def get_reports(self, workspace: Workspace) -> List[Report]:
+    def get_reports(self, workspace: Workspace) -> Dict[str, Report]:
         """
         Fetch the report from PowerBi for the given Workspace
         """
-        reports: List[Report] = []
+        reports: Dict[str, Report] = {}
         try:
-            reports = self._get_resolver().get_reports(workspace)
+            reports = {
+                report.id: report
+                for report in self._get_resolver().get_reports(workspace)
+            }
             # Fill Report dataset
-            for report in reports:
+            for report in reports.values():
                 if report.dataset_id:
                     report.dataset = self.dataset_registry.get(report.dataset_id)
                     if report.dataset is None:
@@ -222,7 +225,7 @@ def fill_ownership() -> None:
                 )
                 return
 
-            for report in reports:
+            for report in reports.values():
                 report.users = self.get_report_users(
                     workspace_id=workspace.id, report_id=report.id
                 )
@@ -234,7 +237,7 @@ def fill_tags() -> None:
                 )
                 return
 
-            for report in reports:
+            for report in reports.values():
                 report.tags = workspace.report_endorsements.get(report.id, [])
 
         fill_ownership()
@@ -270,12 +273,12 @@ def get_workspaces(self) -> List[Workspace]:
                 name=workspace[Constant.NAME],
                 type=workspace[Constant.TYPE],
                 datasets={},
-                dashboards=[],
-                reports=[],
+                dashboards={},
+                reports={},
                 report_endorsements={},
                 dashboard_endorsements={},
                 scan_result={},
-                independent_datasets=[],
+                independent_datasets={},
                 app=None,  # It will be populated in _fill_metadata_from_scan_result method
             )
             for workspace in groups
@@ -561,12 +564,12 @@ def _fill_metadata_from_scan_result(
                 name=workspace_metadata[Constant.NAME],
                 type=workspace_metadata[Constant.TYPE],
                 datasets={},
-                dashboards=[],
-                reports=[],
+                dashboards={},
+                reports={},
                 report_endorsements={},
                 dashboard_endorsements={},
                 scan_result={},
-                independent_datasets=[],
+                independent_datasets={},
                 app=None,  # It is getting set from scan-result
             )
             cur_workspace.scan_result = workspace_metadata
@@ -597,25 +600,28 @@ def _fill_metadata_from_scan_result(
     def _fill_independent_datasets(self, workspace: Workspace) -> None:
         reachable_datasets: List[str] = []
         # Find out reachable datasets
-        for dashboard in workspace.dashboards:
+        for dashboard in workspace.dashboards.values():
             for tile in dashboard.tiles:
                 if tile.dataset is not None:
                     reachable_datasets.append(tile.dataset.id)
 
-        for report in workspace.reports:
+        for report in workspace.reports.values():
             if report.dataset is not None:
                 reachable_datasets.append(report.dataset.id)
 
         # Set datasets not present in reachable_datasets
         for dataset in workspace.datasets.values():
             if dataset.id not in reachable_datasets:
-                workspace.independent_datasets.append(dataset)
+                workspace.independent_datasets[dataset.id] = dataset
 
     def _fill_regular_metadata_detail(self, workspace: Workspace) -> None:
         def fill_dashboards() -> None:
-            workspace.dashboards = self._get_resolver().get_dashboards(workspace)
+            workspace.dashboards = {
+                dashboard.id: dashboard
+                for dashboard in self._get_resolver().get_dashboards(workspace)
+            }
             # set tiles of Dashboard
-            for dashboard in workspace.dashboards:
+            for dashboard in workspace.dashboards.values():
                 dashboard.tiles = self._get_resolver().get_tiles(
                     workspace, dashboard=dashboard
                 )
@@ -644,7 +650,7 @@ def fill_dashboard_tags() -> None:
                     "Skipping tag retrieval for dashboard as extract_endorsements_to_tags is set to false"
                 )
                 return
-            for dashboard in workspace.dashboards:
+            for dashboard in workspace.dashboards.values():
                 dashboard.tags = workspace.dashboard_endorsements.get(dashboard.id, [])
 
         if self.__config.extract_dashboards:
diff --git a/metadata-ingestion/tests/integration/powerbi/test_powerbi.py b/metadata-ingestion/tests/integration/powerbi/test_powerbi.py
index 7f62e433bc8014..571c0092dcc8c1 100644
--- a/metadata-ingestion/tests/integration/powerbi/test_powerbi.py
+++ b/metadata-ingestion/tests/integration/powerbi/test_powerbi.py
@@ -978,16 +978,16 @@ def validate_pipeline(pipeline: Pipeline) -> None:
         name="demo-workspace",
         type="Workspace",
         datasets={},
-        dashboards=[],
-        reports=[],
+        dashboards={},
+        reports={},
         report_endorsements={},
         dashboard_endorsements={},
         scan_result={},
-        independent_datasets=[],
+        independent_datasets={},
         app=None,
     )
     # Fetch actual reports
-    reports: List[Report] = cast(
+    reports: Dict[str, Report] = cast(
         PowerBiDashboardSource, pipeline.source
     ).powerbi_client.get_reports(workspace=mock_workspace)
 
@@ -1020,8 +1020,8 @@ def validate_pipeline(pipeline: Pipeline) -> None:
             "pages": [],
         },
     ]
-    expected_reports: List[Report] = [
-        Report(
+    expected_reports: Dict[str, Report] = {
+        report[Constant.ID]: Report(
             id=report[Constant.ID],
             name=report[Constant.NAME],
             type=ReportType.PowerBIReport,
@@ -1045,14 +1045,15 @@ def validate_pipeline(pipeline: Pipeline) -> None:
             dataset=mock_workspace.datasets.get(report[Constant.DATASET_ID]),
         )
         for report in mock_reports
-    ]
+    }
     # Compare actual and expected reports
     for i in range(2):
-        assert reports[i].id == expected_reports[i].id
-        assert reports[i].name == expected_reports[i].name
-        assert reports[i].description == expected_reports[i].description
-        assert reports[i].dataset == expected_reports[i].dataset
-        assert reports[i].pages == expected_reports[i].pages
+        report_id = mock_reports[i][Constant.ID]
+        assert reports[report_id].id == expected_reports[report_id].id
+        assert reports[report_id].name == expected_reports[report_id].name
+        assert reports[report_id].description == expected_reports[report_id].description
+        assert reports[report_id].dataset == expected_reports[report_id].dataset
+        assert reports[report_id].pages == expected_reports[report_id].pages
 
 
 @freeze_time(FROZEN_TIME)

From 8eda51eff03257659164a45b4d5abb10c87dca7c Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Thu, 23 Jan 2025 14:29:25 +0530
Subject: [PATCH 150/249] feat(ingest(cli): add domain helper, add progressbar
 (#12436)

---
 docs/cli.md                                   |  4 +-
 .../src/datahub/cli/container_cli.py          | 41 ++++++++++++++-----
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/docs/cli.md b/docs/cli.md
index 360dc9a1823ce1..10f330a3ecfc6e 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -287,7 +287,9 @@ A group of commands to interact with containers in DataHub.
 e.g. You can use this to apply a tag to all datasets recursively in this container.
 ```shell
 datahub container tag --container-urn "urn:li:container:0e9e46bd6d5cf645f33d5a8f0254bc2d" --tag-urn "urn:li:tag:tag1"
-
+datahub container domain --container-urn "urn:li:container:3f2effd1fbe154a4d60b597263a41e41" --domain-urn  "urn:li:domain:ajsajo-b832-4ab3-8881-7ed5e991a44c"
+datahub container owner --container-urn "urn:li:container:3f2effd1fbe154a4d60b597263a41e41" --owner-urn  "urn:li:corpGroup:eng@example.com"
+datahub container term --container-urn "urn:li:container:3f2effd1fbe154a4d60b597263a41e41" --term-urn  "urn:li:term:PII"
 ```
 
 ### check
diff --git a/metadata-ingestion/src/datahub/cli/container_cli.py b/metadata-ingestion/src/datahub/cli/container_cli.py
index ccd8ea779ecd19..5f1dc35edd3ee1 100644
--- a/metadata-ingestion/src/datahub/cli/container_cli.py
+++ b/metadata-ingestion/src/datahub/cli/container_cli.py
@@ -1,10 +1,13 @@
 import logging
-from typing import List
+from typing import Any, List
 
 import click
+import progressbar
 
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.graph.client import get_default_graph
 from datahub.metadata.schema_classes import (
+    DomainsClass,
     GlossaryTermAssociationClass,
     OwnerClass,
     OwnershipTypeClass,
@@ -27,12 +30,12 @@ def apply_association_to_container(
     association_type: str,
 ) -> None:
     """
-    Common function to add either tags, terms, or owners to child datasets (for now).
+    Common function to add either tags, terms, domains, or owners to child datasets (for now).
 
     Args:
         container_urn: The URN of the container
         association_urn: The URN of the tag, term, or user to apply
-        association_type: One of 'tag', 'term', or 'owner'
+        association_type: One of 'tag', 'term', 'domain' or 'owner'
     """
     urns: List[str] = []
     graph = get_default_graph()
@@ -43,10 +46,10 @@ def apply_association_to_container(
         )
     )
 
+    all_patches: List[Any] = []
     for urn in urns:
-        logger.info(f"Adding {association_type} {association_urn} to {urn}")
         builder = DatasetPatchBuilder(urn)
-
+        patches: List[Any] = []
         if association_type == "tag":
             patches = builder.add_tag(TagAssociationClass(association_urn)).build()
         elif association_type == "term":
@@ -60,9 +63,17 @@ def apply_association_to_container(
                     type=OwnershipTypeClass.TECHNICAL_OWNER,
                 )
             ).build()
-
-        for mcp in patches:
-            graph.emit(mcp)
+        elif association_type == "domain":
+            patches = [
+                MetadataChangeProposalWrapper(
+                    entityUrn=urn,
+                    aspect=DomainsClass(domains=[association_urn]),
+                )
+            ]
+        all_patches.extend(patches)
+    mcps_iter = progressbar.progressbar(all_patches, redirect_stdout=True)
+    for mcp in mcps_iter:
+        graph.emit(mcp)
 
 
 @container.command()
@@ -83,7 +94,15 @@ def term(container_urn: str, term_urn: str) -> None:
 
 @container.command()
 @click.option("--container-urn", required=True, type=str)
-@click.option("--owner-id", required=True, type=str)
-def owner(container_urn: str, owner_id: str) -> None:
+@click.option("--owner-urn", required=True, type=str)
+def owner(container_urn: str, owner_urn: str) -> None:
     """Add patch to add a owner to all datasets in a container"""
-    apply_association_to_container(container_urn, owner_id, "owner")
+    apply_association_to_container(container_urn, owner_urn, "owner")
+
+
+@container.command()
+@click.option("--container-urn", required=True, type=str)
+@click.option("--domain-urn", required=True, type=str)
+def domain(container_urn: str, domain_urn: str) -> None:
+    """Add patch to add a domain to all datasets in a container"""
+    apply_association_to_container(container_urn, domain_urn, "domain")

From 61ed94823bc96bec255b0d7c49ff623bb31869f2 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Thu, 23 Jan 2025 01:15:32 -0800
Subject: [PATCH 151/249] fix(ingest): improve registry error message (#12440)

---
 metadata-ingestion/src/datahub/ingestion/api/registry.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/api/registry.py b/metadata-ingestion/src/datahub/ingestion/api/registry.py
index 6b50e0b8a8a5d4..5e372a964c7e6c 100644
--- a/metadata-ingestion/src/datahub/ingestion/api/registry.py
+++ b/metadata-ingestion/src/datahub/ingestion/api/registry.py
@@ -173,8 +173,10 @@ def get(self, key: str) -> Type[T]:
 
         tp = self._ensure_not_lazy(key)
         if isinstance(tp, ModuleNotFoundError):
+            # TODO: Once we're on Python 3.11 (with PEP 678), we can use .add_note()
+            # to enrich the error instead of wrapping it.
             raise ConfigurationError(
-                f"{key} is disabled; try running: pip install '{__package_name__}[{key}]'"
+                f"{key} is disabled due to a missing dependency: {tp.name}; try running `pip install '{__package_name__}[{key}]'`"
             ) from tp
         elif isinstance(tp, Exception):
             raise ConfigurationError(

From 3030f90aaf5d60fd5c3cac7c169fa665074e22f8 Mon Sep 17 00:00:00 2001
From: Pedro Silva <pedro@acryl.io>
Date: Thu, 23 Jan 2025 10:40:26 +0000
Subject: [PATCH 152/249] fix(ingest/slack): Add retries (#12401)

---
 metadata-ingestion/setup.py                                 | 2 +-
 .../src/datahub/ingestion/source/slack/slack.py             | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py
index 2cfdf9837f45ad..c91dbf709e6d86 100644
--- a/metadata-ingestion/setup.py
+++ b/metadata-ingestion/setup.py
@@ -312,7 +312,7 @@
 
 powerbi_report_server = {"requests", "requests_ntlm"}
 
-slack = {"slack-sdk==3.18.1"}
+slack = {"slack-sdk==3.18.1", "tenacity>=8.0.1",}
 
 databricks = {
     # 0.1.11 appears to have authentication issues with azure databricks
diff --git a/metadata-ingestion/src/datahub/ingestion/source/slack/slack.py b/metadata-ingestion/src/datahub/ingestion/source/slack/slack.py
index 00b783a89774cc..6d147e27405818 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/slack/slack.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/slack/slack.py
@@ -5,6 +5,8 @@
 
 from pydantic import Field, SecretStr
 from slack_sdk import WebClient
+from tenacity import retry, wait_exponential
+from tenacity.before_sleep import before_sleep_log
 
 import datahub.emitter.mce_builder as builder
 from datahub.configuration.common import ConfigModel
@@ -294,6 +296,10 @@ def populate_slack_id_from_email(self, user_obj: CorpUser) -> None:
                 return
             raise e
 
+    @retry(
+        wait=wait_exponential(multiplier=2, min=4, max=60),
+        before_sleep=before_sleep_log(logger, logging.ERROR, True),
+    )
     def get_user_to_be_updated(self) -> Iterable[CorpUser]:
         graphql_query = textwrap.dedent(
             """

From c4cc5148d8d466c5ad97cb5953216a039754597b Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Thu, 23 Jan 2025 17:46:47 +0530
Subject: [PATCH 153/249] fix(build): include LICENSE with package (#12447)

---
 metadata-ingestion/LICENSE | 202 +++++++++++++++++++++++++++++++++++++
 1 file changed, 202 insertions(+)
 create mode 100644 metadata-ingestion/LICENSE

diff --git a/metadata-ingestion/LICENSE b/metadata-ingestion/LICENSE
new file mode 100644
index 00000000000000..5e8a14cef59b4c
--- /dev/null
+++ b/metadata-ingestion/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2015 LinkedIn Corp. All rights reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file

From f4c0927d11658a08a01c35aca823a9d5abd09f5f Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Thu, 23 Jan 2025 18:21:08 +0530
Subject: [PATCH 154/249] fix(ingest/glue): add try catch (#12449)

---
 .../src/datahub/ingestion/source/aws/glue.py     | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py b/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
index 2509927854d4a0..2ace71b6ff6c1d 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
@@ -738,11 +738,17 @@ def get_all_databases_and_tables(
         self,
     ) -> Tuple[List[Mapping[str, Any]], List[Dict]]:
         all_databases = [*self.get_all_databases()]
-        all_tables = [
-            tables
-            for database in all_databases
-            for tables in self.get_tables_from_database(database)
-        ]
+        all_tables = []
+        for database in all_databases:
+            try:
+                for tables in self.get_tables_from_database(database):
+                    all_tables.append(tables)
+            except Exception as e:
+                self.report.failure(
+                    message="Failed to get tables from database",
+                    context=database["Name"],
+                    exc=e,
+                )
         return all_databases, all_tables
 
     def get_lineage_if_enabled(

From 462de489d8c82724dca8b00a038de69bcfc225d1 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Thu, 23 Jan 2025 10:45:40 -0600
Subject: [PATCH 155/249] refactor(GMS): migrate GMS to Spring boot (#12389)

---
 build.gradle                                  |  23 +-
 .../app/security/AuthenticationManager.java   |  65 +---
 datahub-frontend/play.gradle                  |   2 +-
 docker/datahub-gms/Dockerfile                 |   8 +-
 docker/datahub-gms/jetty-jmx.xml              |  31 --
 docker/datahub-gms/jetty.xml                  |  57 ---
 docker/datahub-gms/start.sh                   |   9 +-
 docker/docker-compose.dev.yml                 |   2 -
 docker/profiles/docker-compose.frontend.yml   |   1 +
 docker/profiles/docker-compose.gms.yml        |   4 +-
 .../java/acryl-spark-lineage/build.gradle     |   8 +-
 metadata-io/build.gradle                      |   1 +
 .../graph/neo4j/Neo4jTestServerBuilder.java   |   4 +-
 .../kafka/DataHubUsageEventsProcessor.java    |   3 +-
 .../kafka/MCLKafkaListenerRegistrar.java      |   4 +-
 .../kafka/MetadataChangeEventsProcessor.java  |   3 +-
 .../MetadataChangeProposalsProcessor.java     |   3 +-
 ...BatchMetadataChangeProposalsProcessor.java |   3 +-
 .../datahub/event/PlatformEventProcessor.java |   3 +-
 .../AuthenticationConfiguration.java          |   3 +
 .../filter/AuthenticationFilter.java          |  69 +++-
 .../AuthenticationFilterTest.java             |  56 ++-
 .../authentication/AuthServiceController.java |   2 +
 .../src/main/resources/application.yaml       |  25 +-
 .../kafka/KafkaEventConsumerFactory.java      |   2 +
 .../kafka/SimpleKafkaConsumerFactory.java     |   1 +
 .../common/KafkaInitializationManager.java    |  52 +++
 .../boot/OnBootApplicationListener.java       | 102 +-----
 .../IngestRetentionPoliciesStepFactory.java   |   4 +-
 .../kafka/DataHubUpgradeKafkaListener.java    |   3 +-
 .../IngestDefaultGlobalSettingsStep.java      |   2 +-
 .../boot/steps/IngestPoliciesStep.java        |   2 +-
 .../steps/IngestRetentionPoliciesStep.java    |  64 ++--
 .../http/server/AbstractJakartaR2Servlet.java | 331 +++++++-----------
 .../http/server/RAPJakartaServlet.java        |  58 +--
 .../restli/server/RAPServletFactory.java      |   6 +-
 .../restli/server/RestliHandlerServlet.java   |   7 +-
 .../KafkaInitializationManagerTest.java       | 165 +++++++++
 .../IngestRetentionPoliciesStepTest.java      | 257 ++++++++++++++
 .../http/server/RAPJakartaServletTest.java    | 303 ++++++++++++++++
 .../datahub/graphql/GraphQLController.java    |   2 +
 .../datahub/graphql/GraphiQLController.java   |   2 +-
 .../JavaSpring/apiController.mustache         |   2 +-
 .../JavaSpring/apiController.mustache         |   2 +-
 .../delegates/EntityApiDelegateImplTest.java  |   2 +-
 .../GlobalControllerExceptionHandler.java     |  10 +
 .../openapi/config/SpringWebConfig.java       |  65 +---
 .../elastic/OperationsController.java         |   2 +-
 .../openapi/operations/test/IdController.java |   2 +-
 .../throttle/ThrottleController.java          |   2 +-
 .../v1/entities/EntitiesController.java       |   2 +-
 .../RelationshipsController.java              |   2 +-
 .../v1/timeline/TimelineControllerV1.java     |   2 +-
 .../v2/controller/EntityController.java       |   2 +-
 .../PlatformEntitiesController.java           |   2 +-
 .../v2/controller/RelationshipController.java |   2 +-
 .../v2/controller/TimelineControllerV2.java   |   2 +-
 .../v2/controller/TimeseriesController.java   |   2 +-
 .../v3/controller/EntityController.java       |   2 +-
 .../v3/controller/RelationshipController.java |   2 +-
 .../openapi/config/SpringWebConfigTest.java   |  77 ++++
 .../v3/controller/EntityControllerTest.java   |  32 +-
 .../registry/SchemaRegistryController.java    |  16 +-
 .../config/SpringWebSchemaRegistryConfig.java |  27 ++
 .../test/SchemaRegistryControllerTest.java    |   2 +-
 metadata-service/war/build.gradle             |  47 ++-
 .../linkedin/gms/CommonApplicationConfig.java |  48 ++-
 .../java/com/linkedin/gms/GMSApplication.java |  21 ++
 .../java/com/linkedin/gms/ServletConfig.java  | 158 +++++++++
 .../gms/SpringApplicationInitializer.java     |  11 -
 .../gms/WebApplicationInitializer.java        | 166 ---------
 .../gms/servlet/AuthServletConfig.java        |   2 -
 .../gms/servlet/GraphQLServletConfig.java     |   2 -
 .../gms/servlet/OpenAPIServletConfig.java     |   2 -
 .../gms/servlet/RestliServletConfig.java      |  14 +-
 .../servlet/SchemaRegistryServletConfig.java  |  10 -
 .../java/com/linkedin/gms/SpringTest.java     |  31 +-
 77 files changed, 1626 insertions(+), 899 deletions(-)
 delete mode 100644 docker/datahub-gms/jetty-jmx.xml
 delete mode 100644 docker/datahub-gms/jetty.xml
 create mode 100644 metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/common/KafkaInitializationManager.java
 create mode 100644 metadata-service/factories/src/test/java/com/linkedin/gms/factory/kafka/common/KafkaInitializationManagerTest.java
 create mode 100644 metadata-service/factories/src/test/java/com/linkedin/metadata/boot/steps/IngestRetentionPoliciesStepTest.java
 create mode 100644 metadata-service/factories/src/test/java/com/linkedin/r2/transport/http/server/RAPJakartaServletTest.java
 create mode 100644 metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/config/SpringWebConfigTest.java
 create mode 100644 metadata-service/war/src/main/java/com/linkedin/gms/GMSApplication.java
 create mode 100644 metadata-service/war/src/main/java/com/linkedin/gms/ServletConfig.java
 delete mode 100644 metadata-service/war/src/main/java/com/linkedin/gms/SpringApplicationInitializer.java
 delete mode 100644 metadata-service/war/src/main/java/com/linkedin/gms/WebApplicationInitializer.java
 delete mode 100644 metadata-service/war/src/main/java/com/linkedin/gms/servlet/SchemaRegistryServletConfig.java

diff --git a/build.gradle b/build.gradle
index e3259a8df342e1..2984812bda13b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,13 +39,13 @@ buildscript {
   ext.springBootVersion = '3.2.9'
   ext.springKafkaVersion = '3.1.6'
   ext.openTelemetryVersion = '1.18.0'
-  ext.neo4jVersion = '5.14.0'
-  ext.neo4jTestVersion = '5.14.0'
-  ext.neo4jApocVersion = '5.14.0'
+  ext.neo4jVersion = '5.20.0'
+  ext.neo4jTestVersion = '5.20.0'
+  ext.neo4jApocVersion = '5.20.0'
   ext.testContainersVersion = '1.17.4'
   ext.elasticsearchVersion = '2.11.1' // ES 7.10, Opensearch 1.x, 2.x
   ext.jacksonVersion = '2.15.3'
-  ext.jettyVersion = '11.0.21'
+  ext.jettyVersion = '12.0.16'
   // see also datahub-frontend/play.gradle
   ext.playVersion = '2.8.22'
   ext.playScalaVersion = '2.13'
@@ -136,7 +136,8 @@ project.ext.externalDependency = [
     'datastaxOssNativeProtocol': 'com.datastax.oss:native-protocol:1.5.1',
     'datastaxOssCore': 'com.datastax.oss:java-driver-core:4.14.1',
     'datastaxOssQueryBuilder': 'com.datastax.oss:java-driver-query-builder:4.14.1',
-    'dgraph4j' : 'io.dgraph:dgraph4j:21.12.0',
+    'dgraph4j' : 'io.dgraph:dgraph4j:24.1.1',
+    'dgraphNetty': 'io.grpc:grpc-netty-shaded:1.69.0',
     'dropwizardMetricsCore': 'io.dropwizard.metrics:metrics-core:4.2.3',
     'dropwizardMetricsJmx': 'io.dropwizard.metrics:metrics-jmx:4.2.3',
     'ebean': 'io.ebean:ebean:' + ebeanVersion,
@@ -176,8 +177,9 @@ project.ext.externalDependency = [
     'jakartaValidation': 'jakarta.validation:jakarta.validation-api:3.1.0-M2',
     'jerseyCore': 'org.glassfish.jersey.core:jersey-client:2.41',
     'jerseyGuava': 'org.glassfish.jersey.bundles.repackaged:jersey-guava:2.25.1',
-    'jettyJaas': "org.eclipse.jetty:jetty-jaas:$jettyVersion",
+    'jettySecurity': "org.eclipse.jetty:jetty-security:$jettyVersion",
     'jettyClient': "org.eclipse.jetty:jetty-client:$jettyVersion",
+    'jettyJmx': "org.eclipse.jetty:jetty-jmx:$jettyVersion",
     'jettison': 'org.codehaus.jettison:jettison:1.5.4',
     'jgrapht': 'org.jgrapht:jgrapht-core:1.5.1',
     'jna': 'net.java.dev.jna:jna:5.12.1',
@@ -380,6 +382,13 @@ configure(subprojects.findAll {! it.name.startsWith('spark-lineage')}) {
     resolutionStrategy.force externalDependency.antlr4Runtime
     resolutionStrategy.force externalDependency.antlr4
     resolutionStrategy.force 'org.apache.mina:mina-core:2.2.4'
+    resolutionStrategy {
+      force "org.eclipse.jetty:jetty-security:${jettyVersion}"
+      force "org.eclipse.jetty:jetty-server:${jettyVersion}"
+      force "org.eclipse.jetty:jetty-ee10-servlet:${jettyVersion}"
+      force "org.eclipse.jetty:jetty-ee10-webapp:${jettyVersion}"
+      force "org.eclipse.jetty:jetty-xml:${jettyVersion}"
+    }
   }
 }
 
@@ -407,7 +416,7 @@ subprojects {
       implementation externalDependency.annotationApi
       constraints {
         implementation("com.google.googlejavaformat:google-java-format:$googleJavaFormatVersion")
-        implementation('io.netty:netty-all:4.1.115.Final')
+        implementation('io.netty:netty-all:4.1.116.Final')
         implementation('org.apache.commons:commons-compress:1.27.1')
         implementation('org.apache.velocity:velocity-engine-core:2.4')
         implementation('org.hibernate:hibernate-validator:6.0.20.Final')
diff --git a/datahub-frontend/app/security/AuthenticationManager.java b/datahub-frontend/app/security/AuthenticationManager.java
index f46dc57c232bd2..8e7d51a0776c23 100644
--- a/datahub-frontend/app/security/AuthenticationManager.java
+++ b/datahub-frontend/app/security/AuthenticationManager.java
@@ -1,68 +1,33 @@
 package security;
 
 import com.google.common.base.Preconditions;
-import java.util.Collections;
 import javax.annotation.Nonnull;
 import javax.naming.AuthenticationException;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.login.LoginContext;
-import javax.security.auth.login.LoginException;
 import org.apache.commons.lang3.StringUtils;
-import org.eclipse.jetty.jaas.JAASLoginService;
-import org.eclipse.jetty.jaas.PropertyUserStoreManager;
-import play.Logger;
+import org.eclipse.jetty.security.UserPrincipal;
+import org.eclipse.jetty.util.security.Credential;
 
 public class AuthenticationManager {
-
-  private AuthenticationManager(boolean verbose) {}
+  private AuthenticationManager() {} // Prevent instantiation
 
   public static void authenticateJaasUser(@Nonnull String userName, @Nonnull String password)
       throws Exception {
     Preconditions.checkArgument(!StringUtils.isAnyEmpty(userName), "Username cannot be empty");
-    JAASLoginService jaasLoginService = new JAASLoginService("WHZ-Authentication");
-    PropertyUserStoreManager propertyUserStoreManager = new PropertyUserStoreManager();
-    propertyUserStoreManager.start();
-    jaasLoginService.setBeans(Collections.singletonList(propertyUserStoreManager));
-    JAASLoginService.INSTANCE.set(jaasLoginService);
-    try {
-      LoginContext lc =
-          new LoginContext("WHZ-Authentication", new WHZCallbackHandler(userName, password));
-      lc.login();
-    } catch (LoginException le) {
-      AuthenticationException authenticationException =
-          new AuthenticationException(le.getMessage());
-      authenticationException.setRootCause(le);
-      throw authenticationException;
-    }
-  }
 
-  private static class WHZCallbackHandler implements CallbackHandler {
-    private String password;
-    private String username;
-
-    private WHZCallbackHandler(@Nonnull String username, @Nonnull String password) {
-      this.username = username;
-      this.password = password;
-    }
+    try {
+      // Create and configure credentials for authentication
+      UserPrincipal userPrincipal = new UserPrincipal(userName, Credential.getCredential(password));
 
-    @Override
-    public void handle(@Nonnull Callback[] callbacks) {
-      NameCallback nc = null;
-      PasswordCallback pc = null;
-      for (Callback callback : callbacks) {
-        Logger.debug(
-            "The submitted callback is of type: " + callback.getClass() + " : " + callback);
-        if (callback instanceof NameCallback) {
-          nc = (NameCallback) callback;
-          nc.setName(this.username);
-        } else if (callback instanceof PasswordCallback) {
-          pc = (PasswordCallback) callback;
-          pc.setPassword(this.password.toCharArray());
-        }
+      // Verify credentials
+      if (!userPrincipal.authenticate(password)) {
+        throw new AuthenticationException("Invalid credentials for user: " + userName);
       }
+
+    } catch (Exception e) {
+      AuthenticationException authenticationException =
+          new AuthenticationException("Authentication failed");
+      authenticationException.setRootCause(e);
+      throw authenticationException;
     }
   }
 }
diff --git a/datahub-frontend/play.gradle b/datahub-frontend/play.gradle
index d513c3c232d9a0..1a9ffeede56251 100644
--- a/datahub-frontend/play.gradle
+++ b/datahub-frontend/play.gradle
@@ -50,7 +50,7 @@ dependencies {
   implementation externalDependency.springBeans
   implementation externalDependency.springContext
   implementation externalDependency.springBootAutoconfigure
-  implementation externalDependency.jettyJaas
+  implementation externalDependency.jettySecurity
   implementation externalDependency.graphqlJava
   implementation externalDependency.antlr4Runtime
   implementation externalDependency.antlr4
diff --git a/docker/datahub-gms/Dockerfile b/docker/datahub-gms/Dockerfile
index 52cc507f9268d1..5462d4f70002c1 100644
--- a/docker/datahub-gms/Dockerfile
+++ b/docker/datahub-gms/Dockerfile
@@ -26,7 +26,6 @@ RUN go install github.com/jwilder/dockerize@$DOCKERIZE_VERSION
 FROM alpine:3.21 AS base
 
 ENV JMX_VERSION=0.18.0
-ENV JETTY_VERSION=11.0.21
 
 # Re-declaring args from above to make them available in this stage (will inherit default values)
 ARG ALPINE_REPO_URL
@@ -42,9 +41,6 @@ RUN apk --no-cache --update-cache --available upgrade \
     && apk --no-cache add curl bash coreutils gcompat sqlite libc6-compat snappy \
     && apk --no-cache add openjdk17-jre-headless --repository=${ALPINE_REPO_URL}/edge/community \
     && apk --no-cache add jattach --repository ${ALPINE_REPO_URL}/edge/community/ \
-    && curl -sS ${MAVEN_CENTRAL_REPO_URL}/org/eclipse/jetty/jetty-runner/${JETTY_VERSION}/jetty-runner-${JETTY_VERSION}.jar --output jetty-runner.jar \
-    && curl -sS ${MAVEN_CENTRAL_REPO_URL}/org/eclipse/jetty/jetty-jmx/${JETTY_VERSION}/jetty-jmx-${JETTY_VERSION}.jar --output jetty-jmx.jar \
-    && curl -sS ${MAVEN_CENTRAL_REPO_URL}/org/eclipse/jetty/jetty-util/${JETTY_VERSION}/jetty-util-${JETTY_VERSION}.jar --output jetty-util.jar \
     && wget --no-verbose ${GITHUB_REPO_URL}/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.24.0/opentelemetry-javaagent.jar \
     && wget --no-verbose ${MAVEN_CENTRAL_REPO_URL}/io/prometheus/jmx/jmx_prometheus_javaagent/${JMX_VERSION}/jmx_prometheus_javaagent-${JMX_VERSION}.jar -O jmx_prometheus_javaagent.jar \
     && cp /usr/lib/jvm/java-17-openjdk/jre/lib/security/cacerts /tmp/kafka.client.truststore.jks
@@ -56,8 +52,6 @@ FROM base AS prod-install
 COPY war.war /datahub/datahub-gms/bin/war.war
 COPY metadata-models/src/main/resources/entity-registry.yml /datahub/datahub-gms/resources/entity-registry.yml
 COPY docker/datahub-gms/start.sh /datahub/datahub-gms/scripts/start.sh
-COPY docker/datahub-gms/jetty.xml /datahub/datahub-gms/scripts/jetty.xml
-COPY docker/datahub-gms/jetty-jmx.xml /datahub/datahub-gms/scripts/jetty-jmx.xml
 COPY docker/monitoring/client-prometheus-config.yaml /datahub/datahub-gms/scripts/prometheus-config.yaml
 RUN chmod +x /datahub/datahub-gms/scripts/start.sh
 
@@ -70,7 +64,7 @@ FROM ${APP_ENV}-install AS final
 RUN mkdir -p /etc/datahub/plugins/auth/resources
 
 RUN addgroup -S datahub && adduser -S datahub -G datahub
-RUN chown -R datahub:datahub /etc/datahub
+RUN chown -R datahub:datahub /etc/datahub /datahub
 USER datahub
 
 ENV JMX_OPTS=""
diff --git a/docker/datahub-gms/jetty-jmx.xml b/docker/datahub-gms/jetty-jmx.xml
deleted file mode 100644
index 5aadbb66a70ed1..00000000000000
--- a/docker/datahub-gms/jetty-jmx.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
-
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-  <!-- =========================================================== -->
-  <!-- Get the platform MBeanServer                                -->
-  <!-- =========================================================== -->
-  <Call id="MBeanServer" class="java.lang.management.ManagementFactory"
-    name="getPlatformMBeanServer" />
-
-  <!-- =========================================================== -->
-  <!-- Initialize the Jetty MBeanContainer                         -->
-  <!-- =========================================================== -->
-  <Call name="addBean">
-    <Arg>
-      <New id="MBeanContainer" class="org.eclipse.jetty.jmx.MBeanContainer">
-        <Arg>
-          <Ref refid="MBeanServer" />
-        </Arg>
-        <Call name="beanAdded">
-          <Arg/>
-          <Arg>
-            <Get name="ILoggerFactory" class="org.slf4j.LoggerFactory"/>
-          </Arg>
-        </Call>
-      </New>
-    </Arg>
-  </Call>
-</Configure>
-
diff --git a/docker/datahub-gms/jetty.xml b/docker/datahub-gms/jetty.xml
deleted file mode 100644
index 3f04635d9498ca..00000000000000
--- a/docker/datahub-gms/jetty.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- =============================================================== -->
-<!-- Documentation of this file format can be found at:              -->
-<!-- https://www.eclipse.org/jetty/documentation/current/       -->
-<!--                                                                 -->
-<!-- Additional configuration files are available in $JETTY_HOME/etc -->
-<!-- and can be mixed in. See start.ini file for the default         -->
-<!-- configuration files.                                            -->
-<!--                                                                 -->
-<!-- For a description of the configuration mechanism, see the       -->
-<!-- output of:                                                      -->
-<!--   java -jar start.jar -?                                        -->
-<!-- =============================================================== -->
-
-<!-- =============================================================== -->
-<!-- Configure a Jetty Server instance with an ID "Server"           -->
-<!-- Other configuration files may also configure the "Server"       -->
-<!-- ID, in which case they are adding configuration to the same     -->
-<!-- instance.  If other configuration have a different ID, they     -->
-<!-- will create and configure another instance of Jetty.            -->
-<!-- Consult the javadoc of o.e.j.server.Server for all              -->
-<!-- configuration that may be set here.                             -->
-<!-- =============================================================== -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-    <!-- =========================================================== -->
-    <!-- Change requestHeaderSize 8k to 16k                          -->
-    <!-- Some large cookies will return 431.                         -->
-    <!-- <h1>Bad Message 431</h1>                                    -->
-    <!-- <pre>reason: Request Header Fields Too Large</pre>          -->
-    <!-- =========================================================== -->
-    <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-      <Set name="requestHeaderSize"><Property name="jetty.httpConfig.requestHeaderSize" deprecated="jetty.request.header.size" default="32768" /></Set>
-    </New>
-
-    <Call name="addConnector">
-        <Arg>
-            <New id="httpConnector" class="org.eclipse.jetty.server.ServerConnector">
-                <Arg name="server"><Ref refid="Server" /></Arg>
-                <Arg name="acceptors" type="int"><Property name="jetty.http.acceptors" deprecated="http.acceptors" default="-1"/></Arg>
-                <Arg name="selectors" type="int"><Property name="jetty.http.selectors" deprecated="http.selectors" default="-1"/></Arg>
-                <Arg name="factories">
-                    <Array type="org.eclipse.jetty.server.ConnectionFactory">
-                        <Item>
-                            <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-                                <Arg name="config"><Ref refid="httpConfig" /></Arg>
-                            </New>
-                        </Item>
-                    </Array>
-                </Arg>
-                <Set name="port"><Property name="jetty.http.port" deprecated="jetty.port" default="8080" /></Set>
-            </New>
-        </Arg>
-    </Call>
-
-</Configure>
diff --git a/docker/datahub-gms/start.sh b/docker/datahub-gms/start.sh
index c91580eed83cb9..cac36920022749 100755
--- a/docker/datahub-gms/start.sh
+++ b/docker/datahub-gms/start.sh
@@ -62,13 +62,8 @@ COMMON="
     java $JAVA_OPTS $JMX_OPTS \
     $OTEL_AGENT \
     $PROMETHEUS_AGENT \
-    -jar /jetty-runner.jar \
-    --stats unsecure \
-    --jar jetty-util.jar \
-    --jar jetty-jmx.jar \
-    --config /datahub/datahub-gms/scripts/jetty.xml \
-    --config /datahub/datahub-gms/scripts/jetty-jmx.xml \
-    /datahub/datahub-gms/bin/war.war"
+    -Dstats=unsecure \
+    -jar /datahub/datahub-gms/bin/war.war"
 
 if [[ $SKIP_ELASTICSEARCH_CHECK != true ]]; then
   exec dockerize \
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index c68a4c1f5a8fcf..0cbb2aee903c84 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -49,8 +49,6 @@ services:
     - KAFKA_CONSUMER_STOP_ON_DESERIALIZATION_ERROR=${KAFKA_CONSUMER_STOP_ON_DESERIALIZATION_ERROR:-true}
     volumes:
     - ./datahub-gms/start.sh:/datahub/datahub-gms/scripts/start.sh
-    - ./datahub-gms/jetty.xml:/datahub/datahub-gms/scripts/jetty.xml
-    - ./datahub-gms/jetty-jmx.xml:/datahub/datahub-gms/scripts/jetty-jmx.xml
     - ./monitoring/client-prometheus-config.yaml:/datahub/datahub-gms/scripts/prometheus-config.yaml
     - ../metadata-models/src/main/resources/:/datahub/datahub-gms/resources
     - ../metadata-service/war/build/libs/:/datahub/datahub-gms/bin
diff --git a/docker/profiles/docker-compose.frontend.yml b/docker/profiles/docker-compose.frontend.yml
index c6b15a7016670d..b278cd41b0b231 100644
--- a/docker/profiles/docker-compose.frontend.yml
+++ b/docker/profiles/docker-compose.frontend.yml
@@ -26,6 +26,7 @@ x-datahub-frontend-service-dev: &datahub-frontend-service-dev
     DATAHUB_ANALYTICS_ENABLED: ${DATAHUB_ANALYTICS_ENABLED:-true}
   volumes:
     - ../../datahub-frontend/build/stage/main:/datahub-frontend
+    - ./monitoring/client-prometheus-config.yaml:/datahub-frontend/client-prometheus-config.yaml
 
 services:
   frontend-quickstart:
diff --git a/docker/profiles/docker-compose.gms.yml b/docker/profiles/docker-compose.gms.yml
index 2147d6b5a0247f..d4ea7dde9f8481 100644
--- a/docker/profiles/docker-compose.gms.yml
+++ b/docker/profiles/docker-compose.gms.yml
@@ -130,15 +130,13 @@ x-datahub-gms-service-dev: &datahub-gms-service-dev
     <<: [*datahub-dev-telemetry-env, *datahub-gms-env]
     SKIP_ELASTICSEARCH_CHECK: false
     JAVA_TOOL_OPTIONS: '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5001'
-    BOOTSTRAP_SYSTEM_UPDATE_WAIT_FOR_SYSTEM_UPDATE: false
+    BOOTSTRAP_SYSTEM_UPDATE_WAIT_FOR_SYSTEM_UPDATE: ${BOOTSTRAP_SYSTEM_UPDATE_WAIT_FOR_SYSTEM_UPDATE:-false}
     SEARCH_SERVICE_ENABLE_CACHE: false
     LINEAGE_SEARCH_CACHE_ENABLED: false
     SHOW_BROWSE_V2: true
     ENTITY_VERSIONING_ENABLED: ${ENTITY_VERSIONING_ENABLED:-true}
   volumes:
     - ./datahub-gms/start.sh:/datahub/datahub-gms/scripts/start.sh
-    - ./datahub-gms/jetty.xml:/datahub/datahub-gms/scripts/jetty.xml
-    - ./datahub-gms/jetty-jmx.xml:/datahub/datahub-gms/scripts/jetty-jmx.xml
     - ./monitoring/client-prometheus-config.yaml:/datahub/datahub-gms/scripts/prometheus-config.yaml
     - ../../metadata-models/src/main/resources/:/datahub/datahub-gms/resources
     - ../../metadata-service/war/build/libs/:/datahub/datahub-gms/bin
diff --git a/metadata-integration/java/acryl-spark-lineage/build.gradle b/metadata-integration/java/acryl-spark-lineage/build.gradle
index 8816264fbe50f7..c8b78f25d70992 100644
--- a/metadata-integration/java/acryl-spark-lineage/build.gradle
+++ b/metadata-integration/java/acryl-spark-lineage/build.gradle
@@ -57,7 +57,13 @@ dependencies {
   //implementation "io.acryl:datahub-client:0.10.2"
   implementation "io.openlineage:openlineage-spark_2.12:$openLineageVersion"
   compileOnly "org.apache.iceberg:iceberg-spark3-runtime:0.12.1"
-  compileOnly "org.apache.spark:spark-sql_2.12:3.1.3"
+  compileOnly("org.apache.spark:spark-sql_2.12:3.1.3") {
+    exclude group: 'org.eclipse.jetty', module: 'jetty-servlet'
+    exclude group: 'org.eclipse.jetty', module: 'jetty-server'
+    exclude group: 'org.eclipse.jetty', module: 'jetty-util'
+    exclude group: 'org.eclipse.jetty', module: 'jetty-webapp'
+    exclude group: 'org.eclipse.jetty', module: 'jetty-security'
+  }
   compileOnly "io.github.spark-redshift-community:spark-redshift_2.12:6.2.0-spark_3.5"
 
   testCompileOnly externalDependency.lombok
diff --git a/metadata-io/build.gradle b/metadata-io/build.gradle
index aab29101b30f71..b33f19bef95986 100644
--- a/metadata-io/build.gradle
+++ b/metadata-io/build.gradle
@@ -37,6 +37,7 @@ dependencies {
     exclude group: 'com.google.guava', module: 'guava'
     exclude group: 'io.grpc', module: 'grpc-protobuf'
   }
+  implementation externalDependency.dgraphNetty
   implementation externalDependency.slf4jApi
   runtimeOnly externalDependency.logbackClassic
   compileOnly externalDependency.lombok
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/graph/neo4j/Neo4jTestServerBuilder.java b/metadata-io/src/test/java/com/linkedin/metadata/graph/neo4j/Neo4jTestServerBuilder.java
index fa04de340e12f7..b34730f481c63b 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/graph/neo4j/Neo4jTestServerBuilder.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/graph/neo4j/Neo4jTestServerBuilder.java
@@ -18,11 +18,11 @@ private Neo4jTestServerBuilder(Neo4jBuilder builder) {
   }
 
   public Neo4jTestServerBuilder() {
-    this(new InProcessNeo4jBuilder().withProcedure(PathExplorer.class));
+    this(new InProcessNeo4jBuilder().withProcedure(PathExplorer.class).withDisabledServer());
   }
 
   public Neo4jTestServerBuilder(File workingDirectory) {
-    this(new InProcessNeo4jBuilder(workingDirectory.toPath()));
+    this(new InProcessNeo4jBuilder(workingDirectory.toPath()).withDisabledServer());
   }
 
   public Neo4j newServer() {
diff --git a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/DataHubUsageEventsProcessor.java b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/DataHubUsageEventsProcessor.java
index ce7376f1f8d662..d699f0bff68019 100644
--- a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/DataHubUsageEventsProcessor.java
+++ b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/DataHubUsageEventsProcessor.java
@@ -49,7 +49,8 @@ public DataHubUsageEventsProcessor(
   @KafkaListener(
       id = "${DATAHUB_USAGE_EVENT_KAFKA_CONSUMER_GROUP_ID:datahub-usage-event-consumer-job-client}",
       topics = "${DATAHUB_USAGE_EVENT_NAME:" + Topics.DATAHUB_USAGE_EVENT + "}",
-      containerFactory = "simpleKafkaConsumer")
+      containerFactory = "simpleKafkaConsumer",
+      autoStartup = "false")
   public void consume(final ConsumerRecord<String, String> consumerRecord) {
     try (Timer.Context i = MetricUtils.timer(this.getClass(), "consume").time()) {
       kafkaLagStats.update(System.currentTimeMillis() - consumerRecord.timestamp());
diff --git a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/MCLKafkaListenerRegistrar.java b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/MCLKafkaListenerRegistrar.java
index c909b0034a9125..20c044b42741e8 100644
--- a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/MCLKafkaListenerRegistrar.java
+++ b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/MCLKafkaListenerRegistrar.java
@@ -73,7 +73,7 @@ public void afterPropertiesSet() {
                   buildConsumerGroupName(key),
                   List.of(mclVersionedTopicName, mclTimeseriesTopicName),
                   hooks);
-          registerMCLKafkaListener(kafkaListenerEndpoint, true);
+          registerMCLKafkaListener(kafkaListenerEndpoint, false);
         });
   }
 
@@ -97,7 +97,7 @@ private KafkaListenerEndpoint createListenerEndpoint(
         new MethodKafkaListenerEndpoint<>();
     kafkaListenerEndpoint.setId(consumerGroupId);
     kafkaListenerEndpoint.setGroupId(consumerGroupId);
-    kafkaListenerEndpoint.setAutoStartup(true);
+    kafkaListenerEndpoint.setAutoStartup(false);
     kafkaListenerEndpoint.setTopics(topics.toArray(new String[topics.size()]));
     kafkaListenerEndpoint.setMessageHandlerMethodFactory(new DefaultMessageHandlerMethodFactory());
     kafkaListenerEndpoint.setBean(
diff --git a/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeEventsProcessor.java b/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeEventsProcessor.java
index 5d2f6452e69197..2152ed15cf0e93 100644
--- a/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeEventsProcessor.java
+++ b/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeEventsProcessor.java
@@ -62,7 +62,8 @@ public class MetadataChangeEventsProcessor {
           "${METADATA_CHANGE_EVENT_NAME:${KAFKA_MCE_TOPIC_NAME:"
               + Topics.METADATA_CHANGE_EVENT
               + "}}",
-      containerFactory = DEFAULT_EVENT_CONSUMER_NAME)
+      containerFactory = DEFAULT_EVENT_CONSUMER_NAME,
+      autoStartup = "false")
   @Deprecated
   public void consume(final ConsumerRecord<String, GenericRecord> consumerRecord) {
     try (Timer.Context i = MetricUtils.timer(this.getClass(), "consume").time()) {
diff --git a/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeProposalsProcessor.java b/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeProposalsProcessor.java
index 4e356f5fb3670a..d854a5517793ff 100644
--- a/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeProposalsProcessor.java
+++ b/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeProposalsProcessor.java
@@ -80,7 +80,8 @@ public void registerConsumerThrottle() {
   @KafkaListener(
       id = CONSUMER_GROUP_ID_VALUE,
       topics = "${METADATA_CHANGE_PROPOSAL_TOPIC_NAME:" + Topics.METADATA_CHANGE_PROPOSAL + "}",
-      containerFactory = MCP_EVENT_CONSUMER_NAME)
+      containerFactory = MCP_EVENT_CONSUMER_NAME,
+      autoStartup = "false")
   public void consume(final ConsumerRecord<String, GenericRecord> consumerRecord) {
     try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "consume").time()) {
       kafkaLagStats.update(System.currentTimeMillis() - consumerRecord.timestamp());
diff --git a/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/batch/BatchMetadataChangeProposalsProcessor.java b/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/batch/BatchMetadataChangeProposalsProcessor.java
index fed93628fe4d79..5ee9cd6ba94d2f 100644
--- a/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/batch/BatchMetadataChangeProposalsProcessor.java
+++ b/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/batch/BatchMetadataChangeProposalsProcessor.java
@@ -73,7 +73,8 @@ public void registerConsumerThrottle() {
       id = CONSUMER_GROUP_ID_VALUE,
       topics = "${METADATA_CHANGE_PROPOSAL_TOPIC_NAME:" + Topics.METADATA_CHANGE_PROPOSAL + "}",
       containerFactory = "kafkaEventConsumer",
-      batch = "true")
+      batch = "true",
+      autoStartup = "false")
   public void consume(final List<ConsumerRecord<String, GenericRecord>> consumerRecords) {
     try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "consume").time()) {
       List<MetadataChangeProposal> metadataChangeProposals =
diff --git a/metadata-jobs/pe-consumer/src/main/java/com/datahub/event/PlatformEventProcessor.java b/metadata-jobs/pe-consumer/src/main/java/com/datahub/event/PlatformEventProcessor.java
index 5d11697bed93d2..2befeccb951a38 100644
--- a/metadata-jobs/pe-consumer/src/main/java/com/datahub/event/PlatformEventProcessor.java
+++ b/metadata-jobs/pe-consumer/src/main/java/com/datahub/event/PlatformEventProcessor.java
@@ -58,7 +58,8 @@ public PlatformEventProcessor(
   @KafkaListener(
       id = "${PLATFORM_EVENT_KAFKA_CONSUMER_GROUP_ID:generic-platform-event-job-client}",
       topics = {"${PLATFORM_EVENT_TOPIC_NAME:" + Topics.PLATFORM_EVENT + "}"},
-      containerFactory = PE_EVENT_CONSUMER_NAME)
+      containerFactory = PE_EVENT_CONSUMER_NAME,
+      autoStartup = "false")
   public void consume(final ConsumerRecord<String, GenericRecord> consumerRecord) {
     try (Timer.Context i = MetricUtils.timer(this.getClass(), "consume").time()) {
 
diff --git a/metadata-service/auth-config/src/main/java/com/datahub/authentication/AuthenticationConfiguration.java b/metadata-service/auth-config/src/main/java/com/datahub/authentication/AuthenticationConfiguration.java
index 81cc5e60552a77..d258fcfeb65750 100644
--- a/metadata-service/auth-config/src/main/java/com/datahub/authentication/AuthenticationConfiguration.java
+++ b/metadata-service/auth-config/src/main/java/com/datahub/authentication/AuthenticationConfiguration.java
@@ -12,6 +12,9 @@ public class AuthenticationConfiguration {
   /** Whether user existence is enforced */
   private boolean enforceExistenceEnabled;
 
+  /** Paths to be excluded from filtering * */
+  private String excludedPaths;
+
   /**
    * List of configurations for {@link com.datahub.plugins.auth.authentication.Authenticator}s to be
    * registered
diff --git a/metadata-service/auth-filter/src/main/java/com/datahub/auth/authentication/filter/AuthenticationFilter.java b/metadata-service/auth-filter/src/main/java/com/datahub/auth/authentication/filter/AuthenticationFilter.java
index 30f98180f80180..492e165c0781a0 100644
--- a/metadata-service/auth-filter/src/main/java/com/datahub/auth/authentication/filter/AuthenticationFilter.java
+++ b/metadata-service/auth-filter/src/main/java/com/datahub/auth/authentication/filter/AuthenticationFilter.java
@@ -25,38 +25,43 @@
 import com.datahub.plugins.factory.PluginConfigFactory;
 import com.datahub.plugins.loader.IsolatedClassLoader;
 import com.datahub.plugins.loader.PluginPermissionManagerImpl;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import com.linkedin.gms.factory.config.ConfigurationProvider;
 import com.linkedin.metadata.entity.EntityService;
 import jakarta.inject.Named;
 import jakarta.servlet.Filter;
 import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
 import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
+import javax.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.context.support.SpringBeanAutowiringSupport;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+import org.springframework.web.filter.OncePerRequestFilter;
 
 /**
  * A servlet {@link Filter} for authenticating requests inbound to the Metadata Service. This filter
  * is applied to the GraphQL Servlet, the Rest.li Servlet, and the Auth (token) Servlet.
  */
+@Component
 @Slf4j
-public class AuthenticationFilter implements Filter {
+public class AuthenticationFilter extends OncePerRequestFilter {
 
   @Autowired private ConfigurationProvider configurationProvider;
 
@@ -72,18 +77,32 @@ public class AuthenticationFilter implements Filter {
   private boolean _logAuthenticatorExceptions;
 
   private AuthenticatorChain authenticatorChain;
+  private Set<String> excludedPathPatterns;
 
-  @Override
-  public void init(FilterConfig filterConfig) throws ServletException {
-    SpringBeanAutowiringSupport.processInjectionBasedOnCurrentContext(this);
+  @PostConstruct
+  public void init() {
     buildAuthenticatorChain();
+    initializeExcludedPaths();
     log.info("AuthenticationFilter initialized.");
   }
 
+  private void initializeExcludedPaths() {
+    excludedPathPatterns = new HashSet<>();
+    String excludedPaths = configurationProvider.getAuthentication().getExcludedPaths();
+    if (StringUtils.hasText(excludedPaths)) {
+      excludedPathPatterns.addAll(
+          Arrays.stream(excludedPaths.split(","))
+              .map(String::trim)
+              .filter(path -> !path.isBlank())
+              .toList());
+    }
+  }
+
   @Override
-  public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-      throws IOException, ServletException {
-    AuthenticationRequest context = buildAuthContext((HttpServletRequest) request);
+  protected void doFilterInternal(
+      HttpServletRequest request, HttpServletResponse response, FilterChain chain)
+      throws ServletException, IOException {
+    AuthenticationRequest context = buildAuthContext(request);
     Authentication authentication = null;
     try {
       authentication = this.authenticatorChain.authenticate(context, _logAuthenticatorExceptions);
@@ -119,6 +138,34 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
     AuthenticationContext.remove();
   }
 
+  @VisibleForTesting
+  @Override
+  public boolean shouldNotFilter(HttpServletRequest request) {
+    String path = request.getServletPath();
+    if (path == null) {
+      return false;
+    }
+
+    // Check if the path matches any of the excluded patterns
+    boolean shouldExclude =
+        excludedPathPatterns.stream()
+            .anyMatch(
+                pattern -> {
+                  if (pattern.endsWith("/*")) {
+                    // Handle wildcard patterns
+                    String basePattern = pattern.substring(0, pattern.length() - 2);
+                    return path.startsWith(basePattern);
+                  }
+                  return path.equals(pattern);
+                });
+
+    if (shouldExclude) {
+      log.debug("Skipping authentication for excluded path: {}", path);
+    }
+
+    return shouldExclude;
+  }
+
   @Override
   public void destroy() {
     // Nothing
diff --git a/metadata-service/auth-filter/src/test/java/com/datahub/auth/authentication/AuthenticationFilterTest.java b/metadata-service/auth-filter/src/test/java/com/datahub/auth/authentication/AuthenticationFilterTest.java
index 382e881542b0b8..0ffabb9db305dd 100644
--- a/metadata-service/auth-filter/src/test/java/com/datahub/auth/authentication/AuthenticationFilterTest.java
+++ b/metadata-service/auth-filter/src/test/java/com/datahub/auth/authentication/AuthenticationFilterTest.java
@@ -2,6 +2,8 @@
 
 import static com.datahub.authentication.AuthenticationConstants.*;
 import static org.mockito.Mockito.*;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
 
 import com.datahub.auth.authentication.filter.AuthenticationFilter;
 import com.datahub.authentication.Actor;
@@ -9,27 +11,34 @@
 import com.datahub.authentication.token.StatefulTokenService;
 import com.datahub.authentication.token.TokenException;
 import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.springframework.test.util.ReflectionTestUtils;
 import org.testng.annotations.Test;
 
 @ContextConfiguration(classes = {AuthTestConfiguration.class})
 public class AuthenticationFilterTest extends AbstractTestNGSpringContextTests {
 
-  @Autowired AuthenticationFilter _authenticationFilter;
+  @Autowired AuthenticationFilter authenticationFilter;
 
-  @Autowired StatefulTokenService _statefulTokenService;
+  @Autowired StatefulTokenService statefulTokenService;
 
   @Test
   public void testExpiredToken() throws ServletException, IOException, TokenException {
-    _authenticationFilter.init(null);
+    FilterConfig mockFilterConfig = mock(FilterConfig.class);
+    when(mockFilterConfig.getInitParameterNames()).thenReturn(Collections.emptyEnumeration());
+
+    authenticationFilter.init(mockFilterConfig);
     HttpServletRequest servletRequest = mock(HttpServletRequest.class);
     HttpServletResponse servletResponse = mock(HttpServletResponse.class);
     FilterChain filterChain = mock(FilterChain.class);
@@ -46,8 +55,47 @@ public void testExpiredToken() throws ServletException, IOException, TokenExcept
         .thenReturn(Collections.enumeration(List.of(AUTHORIZATION_HEADER_NAME)));
     when(servletRequest.getHeader(AUTHORIZATION_HEADER_NAME)).thenReturn("Bearer " + token);
 
-    _authenticationFilter.doFilter(servletRequest, servletResponse, filterChain);
+    authenticationFilter.doFilter(servletRequest, servletResponse, filterChain);
     verify(servletResponse, times(1))
         .sendError(eq(HttpServletResponse.SC_UNAUTHORIZED), anyString());
   }
+
+  @Test
+  public void testExcludedPaths() throws ServletException {
+    // Mock configuration setup
+    FilterConfig mockFilterConfig = mock(FilterConfig.class);
+    when(mockFilterConfig.getInitParameterNames()).thenReturn(Collections.emptyEnumeration());
+    authenticationFilter.init(mockFilterConfig);
+
+    // Test cases for different path patterns
+    HttpServletRequest exactPathRequest = mock(HttpServletRequest.class);
+    when(exactPathRequest.getServletPath()).thenReturn("/health");
+
+    HttpServletRequest wildcardPathRequest = mock(HttpServletRequest.class);
+    when(wildcardPathRequest.getServletPath()).thenReturn("/schema-registry/api/config");
+
+    HttpServletRequest nonExcludedRequest = mock(HttpServletRequest.class);
+    when(nonExcludedRequest.getServletPath()).thenReturn("/protected/resource");
+
+    // Set excluded paths in the filter
+    ReflectionTestUtils.setField(
+        authenticationFilter,
+        "excludedPathPatterns",
+        new HashSet<>(Arrays.asList("/health", "/schema-registry/*")));
+
+    // Verify exact path match
+    assertTrue(
+        authenticationFilter.shouldNotFilter(exactPathRequest),
+        "Exact path match should be excluded from filtering");
+
+    // Verify wildcard path match
+    assertTrue(
+        authenticationFilter.shouldNotFilter(wildcardPathRequest),
+        "Path matching wildcard pattern should be excluded from filtering");
+
+    // Verify non-excluded path
+    assertFalse(
+        authenticationFilter.shouldNotFilter(nonExcludedRequest),
+        "Non-excluded path should not be excluded from filtering");
+  }
 }
diff --git a/metadata-service/auth-servlet-impl/src/main/java/com/datahub/auth/authentication/AuthServiceController.java b/metadata-service/auth-servlet-impl/src/main/java/com/datahub/auth/authentication/AuthServiceController.java
index 5d4542cf0826e8..1f86c56049190d 100644
--- a/metadata-service/auth-servlet-impl/src/main/java/com/datahub/auth/authentication/AuthServiceController.java
+++ b/metadata-service/auth-servlet-impl/src/main/java/com/datahub/auth/authentication/AuthServiceController.java
@@ -35,11 +35,13 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.HttpClientErrorException;
 
 @Slf4j
 @RestController
+@RequestMapping("/auth")
 public class AuthServiceController {
 
   private static final String USER_ID_FIELD_NAME = "userId";
diff --git a/metadata-service/configuration/src/main/resources/application.yaml b/metadata-service/configuration/src/main/resources/application.yaml
index 69b86962442b91..04f7409d5c39a3 100644
--- a/metadata-service/configuration/src/main/resources/application.yaml
+++ b/metadata-service/configuration/src/main/resources/application.yaml
@@ -5,6 +5,7 @@ baseUrl: ${DATAHUB_BASE_URL:http://localhost:9002}
 authentication:
   # Enable if you want all requests to the Metadata Service to be authenticated.
   enabled: ${METADATA_SERVICE_AUTH_ENABLED:true}
+  excludedPaths: /schema-registry/*,/health,/config,/config/search/export
 
   # Disable if you want to skip validation of deleted user's tokens
   enforceExistenceEnabled: ${METADATA_SERVICE_AUTH_ENFORCE_EXISTENCE_ENABLED:true}
@@ -330,16 +331,34 @@ neo4j:
   connectionLivenessCheckTimeout: ${NEO4J_CONNECTION_LIVENESS_CHECK_TIMEOUT_IN_SECONDS:-1}
 
 spring:
+  error:
+    include-message: never
+    include-stacktrace: never
+    include-exception: false
+    whitelabel:
+      enabled: false
+  jmx:
+    enabled: true
+  web:
+    resources:
+      add-mappings: false # do not serve static files
   mvc:
     servlet:
-      path: /openapi
+      path: /
+    throw-exception-if-no-handler-found: true # throw exception on 404 to be handled
   kafka:
     security:
       protocol: ${KAFKA_PROPERTIES_SECURITY_PROTOCOL:PLAINTEXT}
 
 springdoc:
   cache:
-    disabled: true
+    disabled: false
+  swagger-ui:
+    path: /openapi/swagger-ui/index.html
+  api-docs:
+    path: /openapi/v3/api-docs
+  groups:
+    enabled: true
 
 metadataTests:
   enabled: ${METADATA_TESTS_ENABLED:false}
@@ -563,8 +582,6 @@ graphQL:
     depthLimit: ${GRAPHQL_QUERY_DEPTH_LIMIT:50}
     introspectionEnabled: ${GRAPHQL_QUERY_INTROSPECTION_ENABLED:true}
 
-springdoc.api-docs.groups.enabled: true
-
 forms:
   hook:
     enabled: ${FORMS_HOOK_ENABLED:true}
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/KafkaEventConsumerFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/KafkaEventConsumerFactory.java
index a1ee4df360b7ec..625623d008e127 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/KafkaEventConsumerFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/KafkaEventConsumerFactory.java
@@ -172,6 +172,7 @@ private KafkaListenerContainerFactory<?> buildDefaultKafkaListenerContainerFacto
     factory.setConsumerFactory(factoryWithOverrides);
     factory.setContainerCustomizer(new ThreadPoolContainerCustomizer());
     factory.setConcurrency(kafkaEventConsumerConcurrency);
+    factory.setAutoStartup(false);
 
     /* Sets up a delegating error handler for Deserialization errors, if disabled will
      use DefaultErrorHandler (does back-off retry and then logs) rather than stopping the container. Stopping the container
@@ -202,6 +203,7 @@ protected KafkaListenerContainerFactory<?> duheKafkaEventConsumer(
     factory.setConsumerFactory(kafkaConsumerFactory);
     factory.setContainerCustomizer(new ThreadPoolContainerCustomizer());
     factory.setConcurrency(1);
+    factory.setAutoStartup(false);
 
     log.info(
         "Event-based DUHE KafkaListenerContainerFactory built successfully. Consumer concurrency = 1");
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/SimpleKafkaConsumerFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/SimpleKafkaConsumerFactory.java
index 0193ded97f81b5..acab78dcfd5f52 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/SimpleKafkaConsumerFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/SimpleKafkaConsumerFactory.java
@@ -53,6 +53,7 @@ protected KafkaListenerContainerFactory<?> createInstance(
         new ConcurrentKafkaListenerContainerFactory<>();
     factory.setContainerCustomizer(new ThreadPoolContainerCustomizer());
     factory.setConsumerFactory(new DefaultKafkaConsumerFactory<>(customizedProperties));
+    factory.setAutoStartup(false);
 
     log.info("Simple KafkaListenerContainerFactory built successfully");
 
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/common/KafkaInitializationManager.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/common/KafkaInitializationManager.java
new file mode 100644
index 00000000000000..dcc818d82ee560
--- /dev/null
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/common/KafkaInitializationManager.java
@@ -0,0 +1,52 @@
+package com.linkedin.gms.factory.kafka.common;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.availability.AvailabilityChangeEvent;
+import org.springframework.boot.availability.ReadinessState;
+import org.springframework.context.event.EventListener;
+import org.springframework.kafka.config.KafkaListenerEndpointRegistry;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class KafkaInitializationManager {
+  private final AtomicBoolean isInitialized = new AtomicBoolean(false);
+  private final KafkaListenerEndpointRegistry registry;
+
+  @Autowired
+  public KafkaInitializationManager(KafkaListenerEndpointRegistry registry) {
+    this.registry = registry;
+    log.info(
+        "Created KafkaInitializationManager. Waiting for application to be ready to enable kafka consumers.");
+  }
+
+  @EventListener
+  public void onStateChange(AvailabilityChangeEvent<ReadinessState> event) {
+    if (event.getState() == ReadinessState.ACCEPTING_TRAFFIC) {
+      initialize(this.getClass().getSimpleName());
+    }
+  }
+
+  public void initialize(String initializerName) {
+    if (isInitialized.compareAndSet(false, true)) {
+      int containerCount = registry.getAllListenerContainers().size();
+      log.info("Starting {} kafka consumers. Initialized by {}", containerCount, initializerName);
+      registry
+          .getAllListenerContainers()
+          .forEach(
+              container -> {
+                if (!container.isRunning()) {
+                  container.start();
+                  log.info("Started container: {}", container.getListenerId());
+                }
+              });
+      log.info("All {} kafka containers started.", containerCount);
+    }
+  }
+
+  public boolean isInitialized() {
+    return isInitialized.get();
+  }
+}
diff --git a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/OnBootApplicationListener.java b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/OnBootApplicationListener.java
index 921246fa98f7a2..2d599f340f7588 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/OnBootApplicationListener.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/OnBootApplicationListener.java
@@ -1,22 +1,11 @@
 package com.linkedin.metadata.boot;
 
-import com.linkedin.gms.factory.config.ConfigurationProvider;
-import com.linkedin.gms.factory.kafka.schemaregistry.InternalSchemaRegistryFactory;
+import com.linkedin.gms.factory.kafka.common.KafkaInitializationManager;
 import io.datahubproject.metadata.context.OperationContext;
-import java.io.IOException;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import javax.annotation.Nonnull;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpStatus;
-import org.apache.http.StatusLine;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
@@ -27,98 +16,39 @@
 @Component
 public class OnBootApplicationListener {
 
-  public static final String SCHEMA_REGISTRY_SERVLET_NAME = "dispatcher-schema-registry";
-
-  private static final Set<Integer> ACCEPTED_HTTP_CODES =
-      Set.of(
-          HttpStatus.SC_OK,
-          HttpStatus.SC_MOVED_PERMANENTLY,
-          HttpStatus.SC_MOVED_TEMPORARILY,
-          HttpStatus.SC_FORBIDDEN,
-          HttpStatus.SC_UNAUTHORIZED);
-
-  private static final String ROOT_WEB_APPLICATION_CONTEXT_ID =
-      String.format("%s:", WebApplicationContext.class.getName());
-
-  private final CloseableHttpClient httpClient = HttpClients.createDefault();
-
-  private final ExecutorService executorService = Executors.newSingleThreadExecutor();
-
   @Autowired
   @Qualifier("bootstrapManager")
   private BootstrapManager _bootstrapManager;
 
-  @Autowired
-  @Qualifier("configurationProvider")
-  private ConfigurationProvider provider;
-
-  @Value("${bootstrap.servlets.waitTimeout}")
-  private int _servletsWaitTimeout;
-
   @Autowired
   @Qualifier("systemOperationContext")
   private OperationContext systemOperationContext;
 
+  @Autowired private KafkaInitializationManager kafkaInitializationManager;
+
   @EventListener(ContextRefreshedEvent.class)
   public void onApplicationEvent(@Nonnull ContextRefreshedEvent event) {
+    String contextId = event.getApplicationContext().getId();
+    log.info("Context refreshed for ID: {}", contextId);
 
-    if (SCHEMA_REGISTRY_SERVLET_NAME.equals(event.getApplicationContext().getId())) {
-      log.info("Loading servlet {} without interruption.", SCHEMA_REGISTRY_SERVLET_NAME);
-      return;
-    }
-
-    log.warn(
-        "OnBootApplicationListener context refreshed! {} event: {}",
-        ROOT_WEB_APPLICATION_CONTEXT_ID.equals(event.getApplicationContext().getId()),
-        event);
-    String schemaRegistryType = provider.getKafka().getSchemaRegistry().getType();
-    if (ROOT_WEB_APPLICATION_CONTEXT_ID.equals(event.getApplicationContext().getId())) {
+    // For the root application context
+    if (event.getApplicationContext() instanceof WebApplicationContext) {
+      log.info("Root WebApplicationContext initialized, starting bootstrap process");
 
-      // Handle race condition, if ebean code is executed while waiting/bootstrapping (i.e.
-      // AuthenticationFilter)
+      // Initialize Ebean first
       try {
         Class.forName("io.ebean.XServiceProvider");
       } catch (ClassNotFoundException e) {
-        log.error(
-            "Failure to initialize required class `io.ebean.XServiceProvider` during initialization.");
+        log.error("Failed to initialize io.ebean.XServiceProvider", e);
         throw new RuntimeException(e);
       }
 
-      if (InternalSchemaRegistryFactory.TYPE.equals(schemaRegistryType)) {
-        executorService.submit(isSchemaRegistryAPIServletReady());
-      } else {
-        _bootstrapManager.start(systemOperationContext);
-      }
-    }
-  }
+      // Initialize consumers
+      kafkaInitializationManager.initialize(this.getClass().getSimpleName());
 
-  public Runnable isSchemaRegistryAPIServletReady() {
-    return () -> {
-      final HttpGet request = new HttpGet(provider.getKafka().getSchemaRegistry().getUrl());
-      int timeouts = _servletsWaitTimeout;
-      boolean openAPIServletReady = false;
-      while (!openAPIServletReady && timeouts > 0) {
-        try {
-          log.info("Sleeping for 1 second");
-          Thread.sleep(1000);
-          StatusLine statusLine = httpClient.execute(request).getStatusLine();
-          if (ACCEPTED_HTTP_CODES.contains(statusLine.getStatusCode())) {
-            log.info("Connected! Authentication not tested.");
-            openAPIServletReady = true;
-          }
-        } catch (IOException | InterruptedException e) {
-          log.info("Failed to connect to open servlet: {}", e.getMessage());
-        }
-        timeouts--;
-      }
-      if (!openAPIServletReady) {
-        log.error(
-            "Failed to bootstrap DataHub, OpenAPI servlet was not ready after {} seconds",
-            timeouts);
-        System.exit(1);
-      } else {
-        _bootstrapManager.start(systemOperationContext);
-      }
-    };
+      _bootstrapManager.start(systemOperationContext);
+    } else {
+      log.debug("Ignoring non-web application context refresh");
+    }
   }
 }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/factories/IngestRetentionPoliciesStepFactory.java b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/factories/IngestRetentionPoliciesStepFactory.java
index 56a857ee45feb8..388f48650a20f0 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/factories/IngestRetentionPoliciesStepFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/factories/IngestRetentionPoliciesStepFactory.java
@@ -12,6 +12,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Scope;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 
 @Configuration
 @Import({RetentionServiceFactory.class})
@@ -43,6 +44,7 @@ protected IngestRetentionPoliciesStep createInstance() {
         _entityService,
         _enableRetention,
         _applyOnBootstrap,
-        _pluginRegistryPath);
+        _pluginRegistryPath,
+        new PathMatchingResourcePatternResolver());
   }
 }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/kafka/DataHubUpgradeKafkaListener.java b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/kafka/DataHubUpgradeKafkaListener.java
index e69ab342740e43..50be0149ce2d4e 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/kafka/DataHubUpgradeKafkaListener.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/kafka/DataHubUpgradeKafkaListener.java
@@ -97,7 +97,8 @@ public void onPartitionsAssigned(
       id = CONSUMER_GROUP,
       topics = {TOPIC_NAME},
       containerFactory = "duheKafkaEventConsumer",
-      concurrency = "1")
+      concurrency = "1",
+      autoStartup = "false")
   public void checkSystemVersion(final ConsumerRecord<String, GenericRecord> consumerRecord) {
     try (Timer.Context i = MetricUtils.timer(this.getClass(), "checkSystemVersion").time()) {
       final GenericRecord record = consumerRecord.value();
diff --git a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestDefaultGlobalSettingsStep.java b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestDefaultGlobalSettingsStep.java
index c63d71475c2fc8..a41553379b1faa 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestDefaultGlobalSettingsStep.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestDefaultGlobalSettingsStep.java
@@ -78,7 +78,7 @@ public void execute(@Nonnull OperationContext systemOperationContext)
     // 1. Read from the file into JSON.
     JsonNode defaultSettingsObj;
     try {
-      defaultSettingsObj = mapper.readTree(new ClassPathResource(_resourcePath).getFile());
+      defaultSettingsObj = mapper.readTree(new ClassPathResource(_resourcePath).getInputStream());
     } catch (Exception e) {
       throw new RuntimeException(
           String.format(
diff --git a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestPoliciesStep.java b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestPoliciesStep.java
index dac2879487469c..04d73895802a8d 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestPoliciesStep.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestPoliciesStep.java
@@ -74,7 +74,7 @@ public void execute(@Nonnull OperationContext systemOperationContext)
     log.info("Ingesting default access policies from: {}...", _policiesResource);
 
     // 1. Read from the file into JSON.
-    final JsonNode policiesObj = mapper.readTree(_policiesResource.getFile());
+    final JsonNode policiesObj = mapper.readTree(_policiesResource.getInputStream());
 
     if (!policiesObj.isArray()) {
       throw new RuntimeException(
diff --git a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestRetentionPoliciesStep.java b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestRetentionPoliciesStep.java
index b5ca0dee142df3..01e785d06cc7d8 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestRetentionPoliciesStep.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/IngestRetentionPoliciesStep.java
@@ -15,7 +15,6 @@
 import com.linkedin.retention.DataHubRetentionConfig;
 import io.datahubproject.metadata.context.OperationContext;
 import jakarta.annotation.Nonnull;
-import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Collections;
@@ -23,7 +22,8 @@
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.ResourcePatternResolver;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -34,6 +34,7 @@ public class IngestRetentionPoliciesStep implements BootstrapStep {
   private final boolean _enableRetention;
   private final boolean _applyOnBootstrap;
   private final String pluginPath;
+  private final ResourcePatternResolver resolver;
 
   private static final ObjectMapper YAML_MAPPER = new ObjectMapper(new YAMLFactory());
 
@@ -77,12 +78,19 @@ public void execute(@Nonnull OperationContext systemOperationContext)
       return;
     }
 
-    // 1. Read default retention config
-    final Map<DataHubRetentionKey, DataHubRetentionConfig> retentionPolicyMap =
-        parseFileOrDir(new ClassPathResource("./boot/retention.yaml").getFile());
-
-    // 2. Read plugin retention config files from input path and overlay
-    retentionPolicyMap.putAll(parseFileOrDir(new File(pluginPath)));
+    // 1. Read default retention config from classpath
+    Resource defaultResource = resolver.getResource("classpath:boot/retention.yaml");
+    Map<DataHubRetentionKey, DataHubRetentionConfig> retentionPolicyMap =
+        parseYamlRetentionConfig(defaultResource);
+
+    // 2. Read plugin retention config files from filesystem path
+    if (!pluginPath.isEmpty()) {
+      String pattern = "file:" + pluginPath + "/**/*.{yaml,yml}";
+      Resource[] resources = resolver.getResources(pattern);
+      for (Resource resource : resources) {
+        retentionPolicyMap.putAll(parseYamlRetentionConfig(resource));
+      }
+    }
 
     // 4. Set the specified retention policies
     log.info("Setting {} policies", retentionPolicyMap.size());
@@ -106,39 +114,6 @@ public void execute(@Nonnull OperationContext systemOperationContext)
     BootstrapStep.setUpgradeResult(systemOperationContext, UPGRADE_ID_URN, _entityService);
   }
 
-  // Parse input yaml file or yaml files in the input directory to generate a retention policy map
-  private Map<DataHubRetentionKey, DataHubRetentionConfig> parseFileOrDir(File retentionFileOrDir)
-      throws IOException {
-    // If path does not exist return empty
-    if (!retentionFileOrDir.exists()) {
-      return Collections.emptyMap();
-    }
-
-    // If directory, parse the yaml files under the directory
-    if (retentionFileOrDir.isDirectory()) {
-      Map<DataHubRetentionKey, DataHubRetentionConfig> result = new HashMap<>();
-
-      for (File retentionFile : retentionFileOrDir.listFiles()) {
-        if (!retentionFile.isFile()) {
-          log.info(
-              "Element {} in plugin directory {} is not a file. Skipping",
-              retentionFile.getPath(),
-              retentionFileOrDir.getPath());
-          continue;
-        }
-        result.putAll(parseFileOrDir(retentionFile));
-      }
-      return result;
-    }
-    // If file, parse the yaml file and return result;
-    if (!retentionFileOrDir.getPath().endsWith(".yaml")
-        && retentionFileOrDir.getPath().endsWith(".yml")) {
-      log.info("File {} is not a YAML file. Skipping", retentionFileOrDir.getPath());
-      return Collections.emptyMap();
-    }
-    return parseYamlRetentionConfig(retentionFileOrDir);
-  }
-
   /**
    * Parse yaml retention config
    *
@@ -147,8 +122,11 @@ private Map<DataHubRetentionKey, DataHubRetentionConfig> parseFileOrDir(File ret
    * converted into the {@link com.linkedin.retention.DataHubRetentionConfig} class.
    */
   private Map<DataHubRetentionKey, DataHubRetentionConfig> parseYamlRetentionConfig(
-      File retentionConfigFile) throws IOException {
-    final JsonNode retentionPolicies = YAML_MAPPER.readTree(retentionConfigFile);
+      Resource resource) throws IOException {
+    if (!resource.exists()) {
+      return Collections.emptyMap();
+    }
+    final JsonNode retentionPolicies = YAML_MAPPER.readTree(resource.getInputStream());
     if (!retentionPolicies.isArray()) {
       throw new IllegalArgumentException(
           "Retention config file must contain an array of retention policies");
diff --git a/metadata-service/factories/src/main/java/com/linkedin/r2/transport/http/server/AbstractJakartaR2Servlet.java b/metadata-service/factories/src/main/java/com/linkedin/r2/transport/http/server/AbstractJakartaR2Servlet.java
index 8d589c4ab2408b..9c4117202ed570 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/r2/transport/http/server/AbstractJakartaR2Servlet.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/r2/transport/http/server/AbstractJakartaR2Servlet.java
@@ -1,35 +1,9 @@
-/*
-   Copyright (c) 2012 LinkedIn Corp.
-   Copyright (c) 2023 Acryl Data, Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   MODIFICATIONS:
-   Changed javax packages to jakarta for Spring Boot 3 support
-*/
-
-/* $Id$ */
 package com.linkedin.r2.transport.http.server;
 
 import com.linkedin.data.ByteString;
 import com.linkedin.r2.message.RequestContext;
-import com.linkedin.r2.message.rest.RestException;
-import com.linkedin.r2.message.rest.RestRequest;
-import com.linkedin.r2.message.rest.RestRequestBuilder;
-import com.linkedin.r2.message.rest.RestResponse;
-import com.linkedin.r2.message.rest.RestStatus;
+import com.linkedin.r2.message.rest.*;
 import com.linkedin.r2.transport.common.WireAttributeHelper;
-import com.linkedin.r2.transport.common.bridge.common.TransportCallback;
 import com.linkedin.r2.transport.common.bridge.common.TransportResponse;
 import com.linkedin.r2.transport.common.bridge.common.TransportResponseImpl;
 import com.linkedin.r2.transport.http.common.HttpConstants;
@@ -40,210 +14,177 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
+import java.time.Duration;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author Steven Ihde
- * @author Chris Pettitt
- * @author Fatih Emekci
- * @version $Revision$
- */
+import java.util.concurrent.TimeoutException;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 public abstract class AbstractJakartaR2Servlet extends HttpServlet {
-  private static final Logger _log = LoggerFactory.getLogger(AbstractJakartaR2Servlet.class);
-  private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 1L;
 
-  // servlet timeout in ms.
-  protected final long _timeout;
+  private final Duration timeout;
 
   protected abstract HttpDispatcher getDispatcher();
 
-  public AbstractJakartaR2Servlet(long timeout) {
-    _timeout = timeout;
+  protected AbstractJakartaR2Servlet(Duration timeout) {
+    this.timeout = timeout;
   }
 
   @Override
-  protected void service(final HttpServletRequest req, final HttpServletResponse resp)
+  protected void service(HttpServletRequest req, HttpServletResponse resp)
       throws ServletException, IOException {
-    RequestContext requestContext = JakartaServletHelper.readRequestContext(req);
-
-    RestRequest restRequest;
-
     try {
-      restRequest = readFromServletRequest(req);
-    } catch (URISyntaxException e) {
-      writeToServletError(resp, RestStatus.BAD_REQUEST, e.toString());
-      return;
-    }
+      RequestContext requestContext = JakartaServletHelper.readRequestContext(req);
+      RestRequest restRequest = createRestRequest(req);
 
-    final AtomicReference<TransportResponse<RestResponse>> result = new AtomicReference<>();
-    final CountDownLatch latch = new CountDownLatch(1);
+      CompletableFuture<TransportResponse<RestResponse>> future = new CompletableFuture<>();
 
-    TransportCallback<RestResponse> callback =
-        new TransportCallback<RestResponse>() {
-          @Override
-          public void onResponse(TransportResponse<RestResponse> response) {
-            result.set(response);
-            latch.countDown();
-          }
-        };
+      getDispatcher().handleRequest(restRequest, requestContext, future::complete);
 
-    getDispatcher().handleRequest(restRequest, requestContext, callback);
+      TransportResponse<RestResponse> result =
+          future
+              .orTimeout(timeout.toMillis(), TimeUnit.MILLISECONDS)
+              .exceptionally(this::handleException)
+              .join();
 
-    try {
-      if (latch.await(_timeout, TimeUnit.MILLISECONDS)) {
-        writeToServletResponse(result.get(), resp);
-      } else {
-        writeToServletError(
-            resp, RestStatus.INTERNAL_SERVER_ERROR, "Server Timeout after " + _timeout + "ms.");
-      }
-    } catch (InterruptedException e) {
-      throw new ServletException("Interrupted!", e);
-    }
-  }
+      writeResponse(result, resp);
 
-  protected void writeToServletResponse(
-      TransportResponse<RestResponse> response, HttpServletResponse resp) throws IOException {
-    Map<String, String> wireAttrs = response.getWireAttributes();
-    for (Map.Entry<String, String> e : WireAttributeHelper.toWireAttributes(wireAttrs).entrySet()) {
-      resp.setHeader(e.getKey(), e.getValue());
-    }
-
-    RestResponse restResponse = null;
-    if (response.hasError()) {
-      Throwable e = response.getError();
-      if (e instanceof RestException) {
-        restResponse = ((RestException) e).getResponse();
-      }
-      if (restResponse == null) {
-        restResponse = RestStatus.responseForError(RestStatus.INTERNAL_SERVER_ERROR, e);
-      }
-    } else {
-      restResponse = response.getResponse();
-    }
-
-    resp.setStatus(restResponse.getStatus());
-    Map<String, String> headers = restResponse.getHeaders();
-    for (Map.Entry<String, String> e : headers.entrySet()) {
-      // TODO multi-valued headers
-      resp.setHeader(e.getKey(), e.getValue());
+    } catch (URISyntaxException e) {
+      writeError(resp, RestStatus.BAD_REQUEST, "Invalid URI: " + e.getMessage());
+    } catch (Exception e) {
+      log.error("Unexpected error processing request", e);
+      writeError(resp, RestStatus.INTERNAL_SERVER_ERROR, "Internal server error");
     }
+  }
 
-    for (String cookie : restResponse.getCookies()) {
-      resp.addHeader(HttpConstants.RESPONSE_COOKIE_HEADER_NAME, cookie);
+  private TransportResponse<RestResponse> handleException(Throwable ex) {
+    if (ex instanceof TimeoutException) {
+      RestResponse errorResponse =
+          RestStatus.responseForError(
+              RestStatus.INTERNAL_SERVER_ERROR,
+              new RuntimeException("Server timeout after " + timeout.toSeconds() + " seconds"));
+      return TransportResponseImpl.error(new RestException(errorResponse));
     }
+    return TransportResponseImpl.error(ex);
+  }
 
-    final ByteString entity = restResponse.getEntity();
-    entity.write(resp.getOutputStream());
-
-    resp.getOutputStream().close();
+  private RestRequest createRestRequest(HttpServletRequest req)
+      throws IOException, ServletException, URISyntaxException {
+    String pathInfo = extractPathInfo(req);
+    String queryString = Optional.ofNullable(req.getQueryString()).map(q -> "?" + q).orElse("");
+
+    URI uri = new URI(pathInfo + queryString);
+
+    RestRequestBuilder builder = new RestRequestBuilder(uri).setMethod(req.getMethod());
+
+    // Handle headers
+    Collections.list(req.getHeaderNames())
+        .forEach(
+            headerName -> {
+              if (headerName.equalsIgnoreCase(HttpConstants.REQUEST_COOKIE_HEADER_NAME)) {
+                Collections.list(req.getHeaders(headerName)).forEach(builder::addCookie);
+              } else {
+                Collections.list(req.getHeaders(headerName))
+                    .forEach(value -> builder.addHeaderValue(headerName, value));
+              }
+            });
+
+    // Handle request body
+    int contentLength = req.getContentLength();
+    ByteString entity =
+        (contentLength > 0)
+            ? ByteString.read(req.getInputStream(), contentLength)
+            : ByteString.read(req.getInputStream());
+
+    builder.setEntity(entity);
+
+    return builder.build();
   }
 
-  protected void writeToServletError(HttpServletResponse resp, int statusCode, String message)
+  private void writeResponse(TransportResponse<RestResponse> response, HttpServletResponse resp)
       throws IOException {
-    RestResponse restResponse = RestStatus.responseForStatus(statusCode, message);
-    writeToServletResponse(TransportResponseImpl.success(restResponse), resp);
-  }
+    // Write wire attributes
+    WireAttributeHelper.toWireAttributes(response.getWireAttributes()).forEach(resp::setHeader);
+
+    // Get response or create error response
+    RestResponse restResponse =
+        Optional.of(response)
+            .filter(TransportResponse::hasError)
+            .map(
+                r -> {
+                  Throwable error = r.getError();
+                  if (error instanceof RestException) {
+                    return ((RestException) error).getResponse();
+                  }
+                  return RestStatus.responseForError(RestStatus.INTERNAL_SERVER_ERROR, error);
+                })
+            .orElseGet(response::getResponse);
+
+    // Write status and headers
+    resp.setStatus(restResponse.getStatus());
+    restResponse.getHeaders().forEach(resp::setHeader);
 
-  protected RestRequest readFromServletRequest(HttpServletRequest req)
-      throws IOException, ServletException, URISyntaxException {
-    StringBuilder sb = new StringBuilder();
-    sb.append(extractPathInfo(req));
-    String query = req.getQueryString();
-    if (query != null) {
-      sb.append('?');
-      sb.append(query);
-    }
+    // Write cookies
+    restResponse
+        .getCookies()
+        .forEach(cookie -> resp.addHeader(HttpConstants.RESPONSE_COOKIE_HEADER_NAME, cookie));
 
-    URI uri = new URI(sb.toString());
-
-    RestRequestBuilder rb = new RestRequestBuilder(uri);
-    rb.setMethod(req.getMethod());
-
-    for (Enumeration<String> headerNames = req.getHeaderNames(); headerNames.hasMoreElements(); ) {
-      String headerName = headerNames.nextElement();
-      if (headerName.equalsIgnoreCase(HttpConstants.REQUEST_COOKIE_HEADER_NAME)) {
-        for (Enumeration<String> cookies = req.getHeaders(headerName);
-            cookies.hasMoreElements(); ) {
-          rb.addCookie(cookies.nextElement());
-        }
-      } else {
-        for (Enumeration<String> headerValues = req.getHeaders(headerName);
-            headerValues.hasMoreElements(); ) {
-          rb.addHeaderValue(headerName, headerValues.nextElement());
-        }
-      }
+    // Write response body
+    try (var outputStream = resp.getOutputStream()) {
+      restResponse.getEntity().write(outputStream);
     }
+  }
 
-    int length = req.getContentLength();
-    if (length > 0) {
-      rb.setEntity(ByteString.read(req.getInputStream(), length));
-    } else {
-      // Known cases for not sending a content-length header in a request
-      // 1. Chunked transfer encoding
-      // 2. HTTP/2
-      rb.setEntity(ByteString.read(req.getInputStream()));
-    }
-    return rb.build();
+  private void writeError(HttpServletResponse resp, int statusCode, String message)
+      throws IOException {
+    RestResponse errorResponse = RestStatus.responseForStatus(statusCode, message);
+    writeResponse(TransportResponseImpl.success(errorResponse), resp);
   }
 
-  /**
-   * Attempts to return a "non decoded" pathInfo by stripping off the contextPath and servletPath
-   * parts of the requestURI. As a defensive measure, this method will return the "decoded" pathInfo
-   * directly by calling req.getPathInfo() if it is unable to strip off the contextPath or
-   * servletPath.
-   *
-   * @throws javax.servlet.ServletException if resulting pathInfo is empty
-   */
   protected static String extractPathInfo(HttpServletRequest req) throws ServletException {
-    // For "http:hostname:8080/contextPath/servletPath/pathInfo" the RequestURI is
-    // "/contextPath/servletPath/pathInfo"
-    // where the contextPath, servletPath and pathInfo parts all contain their leading slash.
-
-    // stripping contextPath and servletPath this way is not fully compatible with the HTTP spec.
-    // If a
-    // request for, say "/%75scp-proxy/reso%75rces" is made (where %75 decodes to 'u')
-    // the stripping off of contextPath and servletPath will fail because the requestUri string will
-    // include the encoded char but the contextPath and servletPath strings will not.
     String requestUri = req.getRequestURI();
-    String contextPath = req.getContextPath();
-    StringBuilder builder = new StringBuilder();
-    if (contextPath != null) {
-      builder.append(contextPath);
-    }
+    String contextPath = Optional.ofNullable(req.getContextPath()).orElse("");
+    String servletPath = Optional.ofNullable(req.getServletPath()).orElse("");
 
-    String servletPath = req.getServletPath();
-    if (servletPath != null) {
-      builder.append(servletPath);
-    }
-    String prefix = builder.toString();
-    String pathInfo;
-    if (prefix.length() == 0) {
+    String prefix = contextPath + servletPath;
+    String pathInfo = null;
+
+    if (prefix.isEmpty()) {
       pathInfo = requestUri;
-    } else if (requestUri.startsWith(prefix)) {
+    } else if (servletPath.startsWith("/gms") && requestUri.startsWith(prefix)) {
       pathInfo = requestUri.substring(prefix.length());
-    } else {
-      _log.warn(
-          "Unable to extract 'non decoded' pathInfo, returning 'decoded' pathInfo instead.  This may cause issues processing request URIs containing special characters. requestUri="
-              + requestUri);
-      return req.getPathInfo();
     }
 
-    if (pathInfo.length() == 0) {
-      // We prefer to keep servlet mapping trivial with R2 and have R2
-      // TransportDispatchers make most of the routing decisions based on the 'pathInfo'
-      // and query parameters in the URI.
-      // If pathInfo is null, it's highly likely that the servlet was mapped to an exact
-      // path or to a file extension, making such R2-based services too reliant on the
-      // servlet container for routing
-      throw new ServletException(
-          "R2 servlet should only be mapped via wildcard path mapping e.g. /r2/*. "
-              + "Exact path matching (/r2) and file extension mappings (*.r2) are currently not supported");
+    if (pathInfo == null || pathInfo.isEmpty()) {
+      log.debug(
+          "Previously invalid servlet mapping detected. Request details: method='{}', requestUri='{}', contextPath='{}', "
+              + "servletPath='{}', prefix='{}', pathInfo='{}', queryString='{}', protocol='{}', remoteAddr='{}', "
+              + "serverName='{}', serverPort={}, contentType='{}', characterEncoding='{}'",
+          req.getMethod(),
+          requestUri,
+          contextPath,
+          servletPath,
+          prefix,
+          pathInfo,
+          req.getQueryString(),
+          req.getProtocol(),
+          req.getRemoteAddr(),
+          req.getServerName(),
+          req.getServerPort(),
+          req.getContentType(),
+          req.getCharacterEncoding());
+
+      /*  NOTE: Working around what was previously considered an error.
+       *       throw new ServletException(
+       *       "R2 servlet must be mapped using wildcard path mapping (e.g., /r2/*). " +
+       *               "Exact path matching (/r2) and file extension mappings (*.r2) are not supported.");
+       **/
+
+      pathInfo = requestUri;
     }
 
     return pathInfo;
diff --git a/metadata-service/factories/src/main/java/com/linkedin/r2/transport/http/server/RAPJakartaServlet.java b/metadata-service/factories/src/main/java/com/linkedin/r2/transport/http/server/RAPJakartaServlet.java
index 75e808d5245c83..f0db3cd01ffcf9 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/r2/transport/http/server/RAPJakartaServlet.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/r2/transport/http/server/RAPJakartaServlet.java
@@ -1,44 +1,21 @@
-/*
-   Copyright (c) 2012 LinkedIn Corp.
-   Copyright (c) 2023 Acryl Data, Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-   MODIFICATIONS:
-   Changed javax dependencies to jakarta for Spring Boot 3 support
-*/
-
-/** $Id: $ */
 package com.linkedin.r2.transport.http.server;
 
 import com.linkedin.r2.transport.common.bridge.server.TransportDispatcher;
+import java.time.Duration;
+import lombok.Getter;
 
-/**
- * @author Steven Ihde
- * @version $Revision: $
- */
 public class RAPJakartaServlet extends AbstractJakartaR2Servlet {
   private static final long serialVersionUID = 0L;
 
-  private final HttpDispatcher _dispatcher;
+  @Getter private final HttpDispatcher dispatcher;
 
-  public RAPJakartaServlet(HttpDispatcher dispatcher) {
-    super(Long.MAX_VALUE);
-    _dispatcher = dispatcher;
+  public RAPJakartaServlet(HttpDispatcher dispatcher, int timeoutSeconds) {
+    super(Duration.ofSeconds(timeoutSeconds));
+    this.dispatcher = dispatcher;
   }
 
-  public RAPJakartaServlet(TransportDispatcher dispatcher) {
-    this(HttpDispatcherFactory.create((dispatcher)));
+  public RAPJakartaServlet(TransportDispatcher dispatcher, int timeoutSeconds) {
+    this(HttpDispatcherFactory.create((dispatcher)), timeoutSeconds);
   }
 
   /**
@@ -48,22 +25,7 @@ public RAPJakartaServlet(TransportDispatcher dispatcher) {
    */
   public RAPJakartaServlet(
       HttpDispatcher dispatcher, boolean useContinuations, int timeOut, int timeOutDelta) {
-    super(timeOut);
-    _dispatcher = dispatcher;
-  }
-
-  /**
-   * Initialize the RAPJakartaServlet.
-   *
-   * @see #AbstractJakartaR2Servlet
-   */
-  public RAPJakartaServlet(
-      TransportDispatcher dispatcher, boolean useContinuations, int timeOut, int timeOutDelta) {
-    this(HttpDispatcherFactory.create((dispatcher)), useContinuations, timeOut, timeOutDelta);
-  }
-
-  @Override
-  protected HttpDispatcher getDispatcher() {
-    return _dispatcher;
+    super(Duration.ofSeconds(timeOut));
+    this.dispatcher = dispatcher;
   }
 }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/restli/server/RAPServletFactory.java b/metadata-service/factories/src/main/java/com/linkedin/restli/server/RAPServletFactory.java
index be060477aeb1f6..73db7ec73f4d7e 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/restli/server/RAPServletFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/restli/server/RAPServletFactory.java
@@ -26,6 +26,9 @@ public class RAPServletFactory {
   @Value("#{systemEnvironment['RESTLI_SERVLET_THREADS']}")
   private Integer environmentThreads;
 
+  @Value("${RESTLI_TIMEOUT_SECONDS:60}")
+  private int restliTimeoutSeconds;
+
   @Value("${" + INGESTION_MAX_SERIALIZED_STRING_LENGTH + ":16000000}")
   private int maxSerializedStringLength;
 
@@ -71,6 +74,7 @@ public RAPJakartaServlet rapServlet(
     RestLiServer restLiServer = new RestLiServer(config, springInjectResourceFactory, parseqEngine);
     return new RAPJakartaServlet(
         new FilterChainDispatcher(
-            new DelegatingTransportDispatcher(restLiServer, restLiServer), FilterChains.empty()));
+            new DelegatingTransportDispatcher(restLiServer, restLiServer), FilterChains.empty()),
+        restliTimeoutSeconds);
   }
 }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/restli/server/RestliHandlerServlet.java b/metadata-service/factories/src/main/java/com/linkedin/restli/server/RestliHandlerServlet.java
index bfc25b7ddaef50..4a38b331d95fed 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/restli/server/RestliHandlerServlet.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/restli/server/RestliHandlerServlet.java
@@ -8,26 +8,25 @@
 import java.io.IOException;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.HttpRequestHandler;
 import org.springframework.web.context.support.HttpRequestHandlerServlet;
 
 @Slf4j
 @AllArgsConstructor
 public class RestliHandlerServlet extends HttpRequestHandlerServlet implements HttpRequestHandler {
-  @Autowired private RAPJakartaServlet _r2Servlet;
+  private final RAPJakartaServlet r2Servlet;
 
   @Override
   public void init(ServletConfig config) throws ServletException {
     log.info("Initializing RestliHandlerServlet");
-    this._r2Servlet.init(config);
+    this.r2Servlet.init(config);
     log.info("Initialized RestliHandlerServlet");
   }
 
   @Override
   public void service(HttpServletRequest req, HttpServletResponse res)
       throws ServletException, IOException {
-    _r2Servlet.service(req, res);
+    r2Servlet.service(req, res);
   }
 
   @Override
diff --git a/metadata-service/factories/src/test/java/com/linkedin/gms/factory/kafka/common/KafkaInitializationManagerTest.java b/metadata-service/factories/src/test/java/com/linkedin/gms/factory/kafka/common/KafkaInitializationManagerTest.java
new file mode 100644
index 00000000000000..6404f238b5cf93
--- /dev/null
+++ b/metadata-service/factories/src/test/java/com/linkedin/gms/factory/kafka/common/KafkaInitializationManagerTest.java
@@ -0,0 +1,165 @@
+package com.linkedin.gms.factory.kafka.common;
+
+import static org.mockito.Mockito.*;
+import static org.testng.Assert.*;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.availability.AvailabilityChangeEvent;
+import org.springframework.boot.availability.ReadinessState;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.kafka.annotation.EnableKafka;
+import org.springframework.kafka.config.KafkaListenerEndpointRegistry;
+import org.springframework.kafka.listener.MessageListenerContainer;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+@SpringBootTest
+@ContextConfiguration(classes = {KafkaInitializationManager.class})
+@EnableKafka
+@DirtiesContext
+public class KafkaInitializationManagerTest extends AbstractTestNGSpringContextTests {
+
+  @Autowired private KafkaInitializationManager manager;
+
+  @MockBean private KafkaListenerEndpointRegistry registry;
+
+  private MessageListenerContainer container1;
+  private MessageListenerContainer container2;
+  private List<MessageListenerContainer> containers;
+
+  @BeforeMethod
+  public void setUp() {
+    // Reset the initialization state before each test
+    // This is necessary because Spring maintains the same instance across tests
+    try {
+      java.lang.reflect.Field field =
+          KafkaInitializationManager.class.getDeclaredField("isInitialized");
+      field.setAccessible(true);
+      ((java.util.concurrent.atomic.AtomicBoolean) field.get(manager)).set(false);
+    } catch (Exception e) {
+      throw new RuntimeException("Failed to reset initialization state", e);
+    }
+
+    // Create fresh mocks for each test
+    container1 = mock(MessageListenerContainer.class);
+    container2 = mock(MessageListenerContainer.class);
+    containers = Arrays.asList(container1, container2);
+
+    // Clear any previous mock interactions
+    reset(registry);
+  }
+
+  @Test
+  public void testInitialize_WhenNotInitialized() {
+    // Arrange
+    when(registry.getAllListenerContainers()).thenReturn(containers);
+    when(container1.isRunning()).thenReturn(false);
+    when(container2.isRunning()).thenReturn(false);
+    when(container1.getListenerId()).thenReturn("container1");
+    when(container2.getListenerId()).thenReturn("container2");
+
+    // Act
+    manager.initialize("TestInitializer");
+
+    // Assert
+    verify(container1, times(1)).start();
+    verify(container2, times(1)).start();
+    assertTrue(manager.isInitialized());
+  }
+
+  @Test
+  public void testInitialize_WhenAlreadyInitialized() {
+    // Arrange
+    when(registry.getAllListenerContainers()).thenReturn(containers);
+
+    // First initialization
+    manager.initialize("FirstInitializer");
+
+    // Clear previous interactions
+    clearInvocations(container1, container2);
+
+    // Act
+    manager.initialize("SecondInitializer");
+
+    // Assert
+    verify(container1, never()).start();
+    verify(container2, never()).start();
+    assertTrue(manager.isInitialized());
+  }
+
+  @Test
+  public void testInitialize_WithNoContainers() {
+    // Arrange
+    when(registry.getAllListenerContainers()).thenReturn(Collections.emptyList());
+
+    // Act
+    manager.initialize("TestInitializer");
+
+    // Assert
+    assertTrue(manager.isInitialized());
+  }
+
+  @Test
+  public void testInitialize_WithAlreadyRunningContainer() {
+    // Arrange
+    when(registry.getAllListenerContainers()).thenReturn(Collections.singletonList(container1));
+    when(container1.isRunning()).thenReturn(true);
+    when(container1.getListenerId()).thenReturn("container1");
+
+    // Act
+    manager.initialize("TestInitializer");
+
+    // Assert
+    verify(container1, never()).start();
+    assertTrue(manager.isInitialized());
+  }
+
+  @Test
+  public void testOnStateChange_WhenAcceptingTraffic() {
+    // Arrange
+    AvailabilityChangeEvent<ReadinessState> event =
+        new AvailabilityChangeEvent<>(this, ReadinessState.ACCEPTING_TRAFFIC);
+    when(registry.getAllListenerContainers()).thenReturn(containers);
+    when(container1.isRunning()).thenReturn(false);
+    when(container2.isRunning()).thenReturn(false);
+    when(container1.getListenerId()).thenReturn("container1");
+    when(container2.getListenerId()).thenReturn("container2");
+
+    // Act
+    manager.onStateChange(event);
+
+    // Assert
+    assertTrue(manager.isInitialized());
+    // The method is called twice in the implementation - once for size() and once for iteration
+    verify(registry, times(2)).getAllListenerContainers();
+    verify(container1).start();
+    verify(container2).start();
+  }
+
+  @Test
+  public void testOnStateChange_WhenNotAcceptingTraffic() {
+    // Arrange
+    AvailabilityChangeEvent<ReadinessState> event =
+        new AvailabilityChangeEvent<>(this, ReadinessState.REFUSING_TRAFFIC);
+
+    // Act
+    manager.onStateChange(event);
+
+    // Assert
+    assertFalse(manager.isInitialized());
+    verify(registry, never()).getAllListenerContainers();
+  }
+
+  @Test
+  public void testIsInitialized_DefaultState() {
+    // Assert
+    assertFalse(manager.isInitialized());
+  }
+}
diff --git a/metadata-service/factories/src/test/java/com/linkedin/metadata/boot/steps/IngestRetentionPoliciesStepTest.java b/metadata-service/factories/src/test/java/com/linkedin/metadata/boot/steps/IngestRetentionPoliciesStepTest.java
new file mode 100644
index 00000000000000..4f4c4b8bb68ae5
--- /dev/null
+++ b/metadata-service/factories/src/test/java/com/linkedin/metadata/boot/steps/IngestRetentionPoliciesStepTest.java
@@ -0,0 +1,257 @@
+package com.linkedin.metadata.boot.steps;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.linkedin.common.urn.Urn;
+import com.linkedin.metadata.boot.BootstrapStep;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.entity.RetentionService;
+import com.linkedin.retention.DataHubRetentionConfig;
+import io.datahubproject.metadata.context.OperationContext;
+import java.io.ByteArrayInputStream;
+import org.mockito.Mockito;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.testng.annotations.Test;
+
+public class IngestRetentionPoliciesStepTest {
+
+  private static final String UPGRADE_ID = "ingest-retention-policies";
+  private static final Urn UPGRADE_ID_URN = BootstrapStep.getUpgradeUrn(UPGRADE_ID);
+
+  private static final String DEFAULT_RETENTION_YAML =
+      "- entity: \"dataHubExecutionRequest\"\n"
+          + "  aspect: \"dataHubExecutionRequestResult\"\n"
+          + "  config:\n"
+          + "    retention:\n"
+          + "      version:\n"
+          + "        maxVersions: 1\n"
+          + "- entity: \"*\"\n"
+          + "  aspect: \"*\"\n"
+          + "  config:\n"
+          + "    retention:\n"
+          + "      version:\n"
+          + "        maxVersions: 20\n";
+
+  @Test
+  public void testExecuteWhenRetentionIsDisabled() throws Exception {
+    final EntityService<?> mockEntityService = Mockito.mock(EntityService.class);
+    final RetentionService<?> mockRetentionService = Mockito.mock(RetentionService.class);
+    final OperationContext mockContext = mock(OperationContext.class);
+    final PathMatchingResourcePatternResolver mockResolver =
+        mock(PathMatchingResourcePatternResolver.class);
+
+    final IngestRetentionPoliciesStep retentionStep =
+        new IngestRetentionPoliciesStep(
+            mockRetentionService, mockEntityService, false, false, "", mockResolver);
+
+    retentionStep.execute(mockContext);
+
+    // Verify that no interactions occur with retention service when retention is disabled
+    Mockito.verify(mockRetentionService, Mockito.times(0)).setRetention(any(), any(), any(), any());
+    Mockito.verify(mockRetentionService, Mockito.times(0)).batchApplyRetention(any(), any());
+  }
+
+  @Test
+  public void testExecuteWhenAlreadyApplied() throws Exception {
+    final EntityService<?> mockEntityService = Mockito.mock(EntityService.class);
+    final RetentionService<?> mockRetentionService = Mockito.mock(RetentionService.class);
+    final OperationContext mockContext = mock(OperationContext.class);
+    final PathMatchingResourcePatternResolver mockResolver =
+        mock(PathMatchingResourcePatternResolver.class);
+
+    when(mockEntityService.exists(mockContext, UPGRADE_ID_URN, true)).thenReturn(true);
+
+    final IngestRetentionPoliciesStep retentionStep =
+        new IngestRetentionPoliciesStep(
+            mockRetentionService, mockEntityService, true, true, "", mockResolver);
+
+    retentionStep.execute(mockContext);
+
+    Mockito.verify(mockRetentionService, Mockito.times(0)).setRetention(any(), any(), any(), any());
+    Mockito.verify(mockRetentionService, Mockito.times(0)).batchApplyRetention(any(), any());
+  }
+
+  @Test
+  public void testExecuteWithDefaultRetentionOnly() throws Exception {
+    final EntityService<?> mockEntityService = Mockito.mock(EntityService.class);
+    final RetentionService<?> mockRetentionService = Mockito.mock(RetentionService.class);
+    final OperationContext mockContext = mock(OperationContext.class);
+    final PathMatchingResourcePatternResolver mockResolver =
+        mock(PathMatchingResourcePatternResolver.class);
+    final Resource mockResource = mock(Resource.class);
+
+    when(mockEntityService.exists(mockContext, UPGRADE_ID_URN, true)).thenReturn(false);
+
+    // Mock resource loading
+    when(mockResolver.getResource("classpath:boot/retention.yaml")).thenReturn(mockResource);
+    when(mockResource.exists()).thenReturn(true);
+    when(mockResource.getInputStream())
+        .thenReturn(new ByteArrayInputStream(DEFAULT_RETENTION_YAML.getBytes()));
+
+    when(mockRetentionService.setRetention(
+            any(OperationContext.class),
+            eq("dataHubExecutionRequest"),
+            eq("dataHubExecutionRequestResult"),
+            any(DataHubRetentionConfig.class)))
+        .thenReturn(true);
+
+    when(mockRetentionService.setRetention(
+            any(OperationContext.class), eq("*"), eq("*"), any(DataHubRetentionConfig.class)))
+        .thenReturn(true);
+
+    final IngestRetentionPoliciesStep retentionStep =
+        new IngestRetentionPoliciesStep(
+            mockRetentionService, mockEntityService, true, true, "", mockResolver);
+
+    retentionStep.execute(mockContext);
+
+    Mockito.verify(mockRetentionService, Mockito.times(1))
+        .setRetention(
+            any(OperationContext.class),
+            eq("dataHubExecutionRequest"),
+            eq("dataHubExecutionRequestResult"),
+            any(DataHubRetentionConfig.class));
+
+    Mockito.verify(mockRetentionService, Mockito.times(1))
+        .setRetention(
+            any(OperationContext.class), eq("*"), eq("*"), any(DataHubRetentionConfig.class));
+
+    Mockito.verify(mockRetentionService, Mockito.times(1)).batchApplyRetention(null, null);
+
+    Mockito.verify(mockEntityService, Mockito.times(1))
+        .ingestProposal(any(), any(), any(), Mockito.eq(false));
+  }
+
+  @Test
+  public void testExecuteWithoutBatchApply() throws Exception {
+    final EntityService<?> mockEntityService = Mockito.mock(EntityService.class);
+    final RetentionService<?> mockRetentionService = Mockito.mock(RetentionService.class);
+    final OperationContext mockContext = mock(OperationContext.class);
+    final PathMatchingResourcePatternResolver mockResolver =
+        mock(PathMatchingResourcePatternResolver.class);
+    final Resource mockResource = mock(Resource.class);
+
+    when(mockEntityService.exists(mockContext, UPGRADE_ID_URN, true)).thenReturn(false);
+
+    // Mock resource loading
+    when(mockResolver.getResource("classpath:boot/retention.yaml")).thenReturn(mockResource);
+    when(mockResource.exists()).thenReturn(true);
+    when(mockResource.getInputStream())
+        .thenReturn(new ByteArrayInputStream(DEFAULT_RETENTION_YAML.getBytes()));
+
+    when(mockRetentionService.setRetention(
+            any(OperationContext.class),
+            eq("dataHubExecutionRequest"),
+            eq("dataHubExecutionRequestResult"),
+            any(DataHubRetentionConfig.class)))
+        .thenReturn(true);
+
+    when(mockRetentionService.setRetention(
+            any(OperationContext.class), eq("*"), eq("*"), any(DataHubRetentionConfig.class)))
+        .thenReturn(true);
+
+    final IngestRetentionPoliciesStep retentionStep =
+        new IngestRetentionPoliciesStep(
+            mockRetentionService, mockEntityService, true, false, "", mockResolver);
+
+    retentionStep.execute(mockContext);
+
+    Mockito.verify(mockRetentionService, Mockito.times(1))
+        .setRetention(
+            any(OperationContext.class),
+            eq("dataHubExecutionRequest"),
+            eq("dataHubExecutionRequestResult"),
+            any(DataHubRetentionConfig.class));
+
+    Mockito.verify(mockRetentionService, Mockito.times(1))
+        .setRetention(
+            any(OperationContext.class), eq("*"), eq("*"), any(DataHubRetentionConfig.class));
+
+    Mockito.verify(mockRetentionService, Mockito.times(0)).batchApplyRetention(any(), any());
+  }
+
+  @Test
+  public void testExecuteWithPluginPath() throws Exception {
+    final EntityService<?> mockEntityService = Mockito.mock(EntityService.class);
+    final RetentionService<?> mockRetentionService = Mockito.mock(RetentionService.class);
+    final OperationContext mockContext = mock(OperationContext.class);
+    final PathMatchingResourcePatternResolver mockResolver =
+        mock(PathMatchingResourcePatternResolver.class);
+    final Resource mockDefaultResource = mock(Resource.class);
+    final Resource mockPluginResource = mock(Resource.class);
+
+    when(mockEntityService.exists(mockContext, UPGRADE_ID_URN, true)).thenReturn(false);
+
+    // Mock resource loading
+    when(mockResolver.getResource("classpath:boot/retention.yaml")).thenReturn(mockDefaultResource);
+    when(mockResolver.getResources("file:/test/plugins/**/*.{yaml,yml}"))
+        .thenReturn(new Resource[] {mockPluginResource});
+
+    // Mock default resource loading
+    when(mockDefaultResource.exists()).thenReturn(true);
+    when(mockDefaultResource.getInputStream())
+        .thenReturn(new ByteArrayInputStream(DEFAULT_RETENTION_YAML.getBytes()));
+
+    // Mock plugin resource loading
+    String pluginYaml =
+        "- entity: \"container\"\n"
+            + "  aspect: \"containerProperties\"\n"
+            + "  config:\n"
+            + "    retention:\n"
+            + "      version:\n"
+            + "        maxVersions: 5\n";
+
+    when(mockPluginResource.exists()).thenReturn(true);
+    when(mockPluginResource.getInputStream())
+        .thenReturn(new ByteArrayInputStream(pluginYaml.getBytes()));
+
+    when(mockRetentionService.setRetention(
+            any(OperationContext.class),
+            eq("dataHubExecutionRequest"),
+            eq("dataHubExecutionRequestResult"),
+            any(DataHubRetentionConfig.class)))
+        .thenReturn(true);
+
+    when(mockRetentionService.setRetention(
+            any(OperationContext.class), eq("*"), eq("*"), any(DataHubRetentionConfig.class)))
+        .thenReturn(true);
+
+    when(mockRetentionService.setRetention(
+            any(OperationContext.class),
+            eq("container"),
+            eq("containerProperties"),
+            any(DataHubRetentionConfig.class)))
+        .thenReturn(true);
+
+    final IngestRetentionPoliciesStep retentionStep =
+        new IngestRetentionPoliciesStep(
+            mockRetentionService, mockEntityService, true, true, "/test/plugins", mockResolver);
+
+    retentionStep.execute(mockContext);
+
+    // Verify retention operations occur for both default and plugin configs
+    Mockito.verify(mockRetentionService, Mockito.times(1))
+        .setRetention(
+            any(OperationContext.class),
+            eq("dataHubExecutionRequest"),
+            eq("dataHubExecutionRequestResult"),
+            any(DataHubRetentionConfig.class));
+    Mockito.verify(mockRetentionService, Mockito.times(1))
+        .setRetention(
+            any(OperationContext.class), eq("*"), eq("*"), any(DataHubRetentionConfig.class));
+    Mockito.verify(mockRetentionService, Mockito.times(1))
+        .setRetention(
+            any(OperationContext.class),
+            eq("container"),
+            eq("containerProperties"),
+            any(DataHubRetentionConfig.class));
+
+    Mockito.verify(mockRetentionService, Mockito.times(1)).batchApplyRetention(null, null);
+    Mockito.verify(mockEntityService, Mockito.times(1))
+        .ingestProposal(any(), any(), any(), Mockito.eq(false));
+  }
+}
diff --git a/metadata-service/factories/src/test/java/com/linkedin/r2/transport/http/server/RAPJakartaServletTest.java b/metadata-service/factories/src/test/java/com/linkedin/r2/transport/http/server/RAPJakartaServletTest.java
new file mode 100644
index 00000000000000..09b582b7c7c179
--- /dev/null
+++ b/metadata-service/factories/src/test/java/com/linkedin/r2/transport/http/server/RAPJakartaServletTest.java
@@ -0,0 +1,303 @@
+package com.linkedin.r2.transport.http.server;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+import com.linkedin.r2.filter.R2Constants;
+import com.linkedin.r2.message.RequestContext;
+import com.linkedin.r2.message.rest.RestRequest;
+import com.linkedin.r2.message.rest.RestResponse;
+import com.linkedin.r2.message.rest.RestStatus;
+import com.linkedin.r2.transport.common.bridge.common.TransportCallback;
+import com.linkedin.r2.transport.common.bridge.common.TransportResponse;
+import com.linkedin.r2.transport.common.bridge.common.TransportResponseImpl;
+import com.linkedin.r2.transport.common.bridge.server.TransportDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.security.cert.X509Certificate;
+import java.util.Collections;
+import org.mockito.ArgumentCaptor;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class RAPJakartaServletTest {
+  private static final int TIMEOUT_SECONDS = 5;
+  private static final String REMOTE_ADDRESS = "192.168.1.1";
+  private static final int REMOTE_PORT = 12345;
+
+  private HttpDispatcher mockHttpDispatcher;
+  private TransportDispatcher mockTransportDispatcher;
+  private HttpServletRequest mockRequest;
+  private HttpServletResponse mockResponse;
+  private ServletOutputStream mockOutputStream;
+
+  @BeforeMethod
+  public void setUp() throws IOException {
+    mockHttpDispatcher = mock(HttpDispatcher.class);
+    mockTransportDispatcher = mock(TransportDispatcher.class);
+    mockRequest = mock(HttpServletRequest.class);
+    mockResponse = mock(HttpServletResponse.class);
+    mockOutputStream = mock(ServletOutputStream.class);
+
+    // Basic request setup
+    when(mockRequest.getMethod()).thenReturn("GET");
+    when(mockRequest.getRequestURI()).thenReturn("/test");
+    when(mockRequest.getContextPath()).thenReturn("");
+    when(mockRequest.getServletPath()).thenReturn("");
+    when(mockRequest.getPathInfo()).thenReturn("/test");
+
+    // Protocol and server info
+    when(mockRequest.getProtocol()).thenReturn("HTTP/1.1");
+    when(mockRequest.getScheme()).thenReturn("http");
+    when(mockRequest.getServerName()).thenReturn("localhost");
+    when(mockRequest.getServerPort()).thenReturn(8080);
+
+    // Remote client info
+    when(mockRequest.getRemoteAddr()).thenReturn(REMOTE_ADDRESS);
+    when(mockRequest.getRemotePort()).thenReturn(REMOTE_PORT);
+
+    // Security defaults (non-secure)
+    when(mockRequest.isSecure()).thenReturn(false);
+    when(mockRequest.getAttribute("javax.servlet.request.X509Certificate")).thenReturn(null);
+    when(mockRequest.getAttribute("javax.servlet.request.cipher_suite")).thenReturn(null);
+
+    // Headers and content
+    when(mockRequest.getHeaderNames()).thenReturn(Collections.enumeration(Collections.emptyList()));
+    when(mockRequest.getInputStream())
+        .thenReturn(new TestServletInputStream(new ByteArrayInputStream(new byte[0])));
+    when(mockResponse.getOutputStream()).thenReturn(mockOutputStream);
+  }
+
+  @Test
+  public void testConstructorWithHttpDispatcher() {
+    RAPJakartaServlet servlet = new RAPJakartaServlet(mockHttpDispatcher, TIMEOUT_SECONDS);
+    assertEquals(servlet.getDispatcher(), mockHttpDispatcher);
+  }
+
+  @Test
+  public void testConstructorWithTransportDispatcher() {
+    RAPJakartaServlet servlet = new RAPJakartaServlet(mockTransportDispatcher, TIMEOUT_SECONDS);
+    assertNotNull(servlet.getDispatcher());
+  }
+
+  @Test
+  public void testSuccessfulRequest() throws ServletException, IOException {
+    // Setup
+    RAPJakartaServlet servlet = new RAPJakartaServlet(mockHttpDispatcher, TIMEOUT_SECONDS);
+    RestResponse mockRestResponse = RestStatus.responseForStatus(200, "OK");
+    TransportResponse<RestResponse> transportResponse =
+        TransportResponseImpl.success(mockRestResponse);
+
+    doAnswer(
+            invocation -> {
+              TransportCallback<RestResponse> callback = invocation.getArgument(2);
+              callback.onResponse(transportResponse);
+              return null;
+            })
+        .when(mockHttpDispatcher)
+        .handleRequest(
+            any(RestRequest.class), any(RequestContext.class), any(TransportCallback.class));
+
+    // Execute
+    servlet.service(mockRequest, mockResponse);
+
+    // Verify status code
+    verify(mockResponse).setStatus(200);
+
+    // Capture and verify the output stream write
+    ArgumentCaptor<byte[]> dataCaptor = ArgumentCaptor.forClass(byte[].class);
+    ArgumentCaptor<Integer> offsetCaptor = ArgumentCaptor.forClass(Integer.class);
+    ArgumentCaptor<Integer> lengthCaptor = ArgumentCaptor.forClass(Integer.class);
+
+    verify(mockOutputStream)
+        .write(dataCaptor.capture(), offsetCaptor.capture(), lengthCaptor.capture());
+
+    // Convert captured bytes to string for readable verification
+    byte[] capturedData = dataCaptor.getValue();
+    int offset = offsetCaptor.getValue();
+    int length = lengthCaptor.getValue();
+
+    String responseBody = new String(capturedData, offset, length);
+    System.out.println("Actual success response body: " + responseBody); // For debugging
+
+    assertEquals(responseBody, "OK", "Expected response body to be 'OK' but got: " + responseBody);
+  }
+
+  @Test
+  public void testSecureRequest() throws ServletException, IOException {
+    // Setup secure request
+    X509Certificate[] certs = new X509Certificate[1];
+    certs[0] = mock(X509Certificate.class);
+    String cipherSuite = "TLS_AES_256_GCM_SHA384";
+
+    when(mockRequest.isSecure()).thenReturn(true);
+    when(mockRequest.getAttribute("javax.servlet.request.X509Certificate")).thenReturn(certs);
+    when(mockRequest.getAttribute("javax.servlet.request.cipher_suite")).thenReturn(cipherSuite);
+
+    RAPJakartaServlet servlet = new RAPJakartaServlet(mockHttpDispatcher, TIMEOUT_SECONDS);
+
+    ArgumentCaptor<RequestContext> contextCaptor = ArgumentCaptor.forClass(RequestContext.class);
+
+    // Execute
+    servlet.service(mockRequest, mockResponse);
+
+    // Verify
+    verify(mockHttpDispatcher)
+        .handleRequest(
+            any(RestRequest.class), contextCaptor.capture(), any(TransportCallback.class));
+
+    RequestContext capturedContext = contextCaptor.getValue();
+    assertTrue((Boolean) capturedContext.getLocalAttr(R2Constants.IS_SECURE));
+    assertEquals(capturedContext.getLocalAttr(R2Constants.CIPHER_SUITE), cipherSuite);
+    assertEquals(capturedContext.getLocalAttr(R2Constants.CLIENT_CERT), certs[0]);
+  }
+
+  @Test
+  public void testBadRequest() throws ServletException, IOException {
+    // Setup with invalid URI components that will cause URISyntaxException
+    when(mockRequest.getRequestURI()).thenReturn("/test");
+    when(mockRequest.getQueryString()).thenReturn("invalid=%%test"); // Invalid percent encoding
+    when(mockRequest.getContextPath()).thenReturn("");
+    when(mockRequest.getServletPath()).thenReturn("");
+
+    RAPJakartaServlet servlet = new RAPJakartaServlet(mockHttpDispatcher, TIMEOUT_SECONDS);
+
+    // Execute
+    servlet.service(mockRequest, mockResponse);
+
+    // Verify
+    verify(mockResponse).setStatus(400);
+
+    // Capture all write invocations to the output stream
+    ArgumentCaptor<byte[]> dataCaptor = ArgumentCaptor.forClass(byte[].class);
+    ArgumentCaptor<Integer> offsetCaptor = ArgumentCaptor.forClass(Integer.class);
+    ArgumentCaptor<Integer> lengthCaptor = ArgumentCaptor.forClass(Integer.class);
+
+    verify(mockOutputStream)
+        .write(dataCaptor.capture(), offsetCaptor.capture(), lengthCaptor.capture());
+
+    // Convert captured bytes to string for readable verification
+    byte[] capturedData = dataCaptor.getValue();
+    int offset = offsetCaptor.getValue();
+    int length = lengthCaptor.getValue();
+
+    String responseBody = new String(capturedData, offset, length);
+    System.out.println("Actual response body: " + responseBody); // For debugging
+
+    assertTrue(
+        responseBody.contains("Invalid URI"),
+        "Expected response to contain 'Invalid URI' but got: " + responseBody);
+  }
+
+  @Test
+  public void testRequestTimeout() throws ServletException, IOException {
+    // Setup with very short timeout
+    RAPJakartaServlet servlet = new RAPJakartaServlet(mockHttpDispatcher, 1);
+
+    doAnswer(
+            invocation -> {
+              Thread.sleep(2000);
+              return null;
+            })
+        .when(mockHttpDispatcher)
+        .handleRequest(
+            any(RestRequest.class), any(RequestContext.class), any(TransportCallback.class));
+
+    // Execute
+    servlet.service(mockRequest, mockResponse);
+
+    // Verify status code
+    verify(mockResponse).setStatus(500);
+
+    // Capture and verify the output stream write
+    ArgumentCaptor<byte[]> dataCaptor = ArgumentCaptor.forClass(byte[].class);
+    ArgumentCaptor<Integer> offsetCaptor = ArgumentCaptor.forClass(Integer.class);
+    ArgumentCaptor<Integer> lengthCaptor = ArgumentCaptor.forClass(Integer.class);
+
+    verify(mockOutputStream)
+        .write(dataCaptor.capture(), offsetCaptor.capture(), lengthCaptor.capture());
+
+    // Convert captured bytes to string for readable verification
+    byte[] capturedData = dataCaptor.getValue();
+    int offset = offsetCaptor.getValue();
+    int length = lengthCaptor.getValue();
+
+    String responseBody = new String(capturedData, offset, length);
+    System.out.println("Actual timeout response body: " + responseBody); // For debugging
+
+    assertTrue(
+        responseBody.contains("Server timeout after 1 seconds"),
+        "Expected response to contain timeout message but got: " + responseBody);
+  }
+
+  @DataProvider(name = "headerTestCases")
+  public Object[][] headerTestCases() {
+    return new Object[][] {
+      {"Content-Type", "application/json"},
+      {"Accept", "text/plain"},
+      {"X-Custom-Header", "custom-value"}
+    };
+  }
+
+  @Test(dataProvider = "headerTestCases")
+  public void testHeaderHandling(String headerName, String headerValue)
+      throws ServletException, IOException {
+    // Setup
+    RAPJakartaServlet servlet = new RAPJakartaServlet(mockHttpDispatcher, TIMEOUT_SECONDS);
+    when(mockRequest.getHeaderNames())
+        .thenReturn(Collections.enumeration(Collections.singletonList(headerName)));
+    when(mockRequest.getHeaders(headerName))
+        .thenReturn(Collections.enumeration(Collections.singletonList(headerValue)));
+
+    ArgumentCaptor<RestRequest> requestCaptor = ArgumentCaptor.forClass(RestRequest.class);
+
+    // Execute
+    servlet.service(mockRequest, mockResponse);
+
+    // Verify
+    verify(mockHttpDispatcher)
+        .handleRequest(
+            requestCaptor.capture(), any(RequestContext.class), any(TransportCallback.class));
+    RestRequest capturedRequest = requestCaptor.getValue();
+    assertEquals(capturedRequest.getHeader(headerName), headerValue);
+  }
+
+  private static class TestServletInputStream extends jakarta.servlet.ServletInputStream {
+    private final ByteArrayInputStream basis;
+
+    public TestServletInputStream(ByteArrayInputStream basis) {
+      this.basis = basis;
+    }
+
+    @Override
+    public int read() throws IOException {
+      return basis.read();
+    }
+
+    @Override
+    public boolean isFinished() {
+      return basis.available() == 0;
+    }
+
+    @Override
+    public boolean isReady() {
+      return true;
+    }
+
+    @Override
+    public void setReadListener(jakarta.servlet.ReadListener readListener) {
+      // Not implemented for test
+    }
+  }
+}
diff --git a/metadata-service/graphql-servlet-impl/src/main/java/com/datahub/graphql/GraphQLController.java b/metadata-service/graphql-servlet-impl/src/main/java/com/datahub/graphql/GraphQLController.java
index 2f66b30f55844c..6e02db6eb65239 100644
--- a/metadata-service/graphql-servlet-impl/src/main/java/com/datahub/graphql/GraphQLController.java
+++ b/metadata-service/graphql-servlet-impl/src/main/java/com/datahub/graphql/GraphQLController.java
@@ -37,10 +37,12 @@
 import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @RestController
+@RequestMapping("/api")
 public class GraphQLController {
 
   public GraphQLController() {
diff --git a/metadata-service/graphql-servlet-impl/src/main/java/com/datahub/graphql/GraphiQLController.java b/metadata-service/graphql-servlet-impl/src/main/java/com/datahub/graphql/GraphiQLController.java
index 61f2720c6cfca4..0461af4db11cc8 100644
--- a/metadata-service/graphql-servlet-impl/src/main/java/com/datahub/graphql/GraphiQLController.java
+++ b/metadata-service/graphql-servlet-impl/src/main/java/com/datahub/graphql/GraphiQLController.java
@@ -32,7 +32,7 @@ public GraphiQLController() {
     }
   }
 
-  @GetMapping(value = "/graphiql", produces = MediaType.TEXT_HTML_VALUE)
+  @GetMapping(value = "/api/graphiql", produces = MediaType.TEXT_HTML_VALUE)
   @ResponseBody
   CompletableFuture<String> graphiQL() {
     return GraphQLConcurrencyUtils.supplyAsync(
diff --git a/metadata-service/openapi-analytics-servlet/src/main/resources/JavaSpring/apiController.mustache b/metadata-service/openapi-analytics-servlet/src/main/resources/JavaSpring/apiController.mustache
index ddf1c130d7be69..fbeb0ba7454a8b 100644
--- a/metadata-service/openapi-analytics-servlet/src/main/resources/JavaSpring/apiController.mustache
+++ b/metadata-service/openapi-analytics-servlet/src/main/resources/JavaSpring/apiController.mustache
@@ -62,7 +62,7 @@ import java.util.concurrent.Callable;
 {{/isJava8or11}}
 {{>generatedAnnotation}}
 @Controller
-@RequestMapping("/v2/analytics")
+@RequestMapping("/openapi/v2/analytics")
 {{#operations}}
 public class {{classname}}Controller implements {{classname}} {
 
diff --git a/metadata-service/openapi-entity-servlet/src/main/resources/JavaSpring/apiController.mustache b/metadata-service/openapi-entity-servlet/src/main/resources/JavaSpring/apiController.mustache
index fbf354ff91688f..78bb061b5d50a4 100644
--- a/metadata-service/openapi-entity-servlet/src/main/resources/JavaSpring/apiController.mustache
+++ b/metadata-service/openapi-entity-servlet/src/main/resources/JavaSpring/apiController.mustache
@@ -80,7 +80,7 @@ import java.util.concurrent.Callable;
 {{/useOas2}}
 {{#operations}}
 @RestController
-@RequestMapping("/v2/entity")
+@RequestMapping("/openapi/v2/entity")
 public class {{classname}}Controller implements {{classname}} {
 
     private static final Logger log = LoggerFactory.getLogger({{classname}}Controller.class);
diff --git a/metadata-service/openapi-entity-servlet/src/test/java/io/datahubproject/openapi/v2/delegates/EntityApiDelegateImplTest.java b/metadata-service/openapi-entity-servlet/src/test/java/io/datahubproject/openapi/v2/delegates/EntityApiDelegateImplTest.java
index 31b35b65ea1a8c..fc91b0990a333a 100644
--- a/metadata-service/openapi-entity-servlet/src/test/java/io/datahubproject/openapi/v2/delegates/EntityApiDelegateImplTest.java
+++ b/metadata-service/openapi-entity-servlet/src/test/java/io/datahubproject/openapi/v2/delegates/EntityApiDelegateImplTest.java
@@ -301,7 +301,7 @@ public void customModelTest() throws Exception {
 
     mockMvc
         .perform(
-            MockMvcRequestBuilders.post("/v2/entity/dataset")
+            MockMvcRequestBuilders.post("/openapi/v2/entity/dataset")
                 .content(body)
                 .contentType(MediaType.APPLICATION_JSON)
                 .accept(MediaType.APPLICATION_JSON))
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/GlobalControllerExceptionHandler.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/GlobalControllerExceptionHandler.java
index 01493d71643481..b78121573811f6 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/GlobalControllerExceptionHandler.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/GlobalControllerExceptionHandler.java
@@ -18,6 +18,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.servlet.NoHandlerFoundException;
 import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver;
 
 @Slf4j
@@ -88,4 +89,13 @@ public ResponseEntity<Map<String, String>> handleGenericException(
     return new ResponseEntity<>(
         Map.of("error", "Internal server error occurred"), HttpStatus.INTERNAL_SERVER_ERROR);
   }
+
+  @ExceptionHandler(NoHandlerFoundException.class)
+  public static ResponseEntity<Map<String, String>> handleNoHandlerFoundException(
+      NoHandlerFoundException ex, HttpServletRequest request) {
+    String message = String.format("No endpoint %s %s.", ex.getHttpMethod(), ex.getRequestURL());
+
+    log.error("No handler found for request: " + request.getRequestURI());
+    return new ResponseEntity<>(Map.of("error", message), HttpStatus.NOT_FOUND);
+  }
 }
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java
index c4b4431e77c4ef..c6d5f1452fea91 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java
@@ -1,15 +1,7 @@
 package io.datahubproject.openapi.config;
 
-import static com.linkedin.metadata.Constants.INGESTION_MAX_SERIALIZED_STRING_LENGTH;
-import static com.linkedin.metadata.Constants.MAX_JACKSON_STRING_SIZE;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.core.StreamReadConstraints;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.linkedin.gms.factory.config.ConfigurationProvider;
 import com.linkedin.metadata.models.registry.EntityRegistry;
-import io.datahubproject.openapi.converter.StringToChangeCategoryConverter;
 import io.datahubproject.openapi.v3.OpenAPIV3Generator;
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.info.Info;
@@ -18,29 +10,24 @@
 import io.swagger.v3.oas.models.OpenAPI;
 import java.util.Collections;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.annotation.Nonnull;
 import org.springdoc.core.models.GroupedOpenApi;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.format.FormatterRegistry;
-import org.springframework.http.converter.ByteArrayHttpMessageConverter;
-import org.springframework.http.converter.FormHttpMessageConverter;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer;
+import org.springframework.core.annotation.Order;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+@EnableWebMvc
 @OpenAPIDefinition(
     info = @Info(title = "DataHub OpenAPI", version = "2.0.0"),
     servers = {@Server(url = "/openapi/", description = "Default Server URL")})
+@Order(2)
 @Configuration
 public class SpringWebConfig implements WebMvcConfigurer {
   private static final Set<String> OPERATIONS_PACKAGES =
@@ -52,35 +39,6 @@ public class SpringWebConfig implements WebMvcConfigurer {
   private static final Set<String> OPENLINEAGE_PACKAGES =
       Set.of("io.datahubproject.openapi.openlineage");
 
-  @Value("${datahub.gms.async.request-timeout-ms}")
-  private long asyncTimeoutMilliseconds;
-
-  @Override
-  public void configureMessageConverters(List<HttpMessageConverter<?>> messageConverters) {
-    messageConverters.add(new StringHttpMessageConverter());
-    messageConverters.add(new ByteArrayHttpMessageConverter());
-    messageConverters.add(new FormHttpMessageConverter());
-
-    ObjectMapper objectMapper = new ObjectMapper();
-    int maxSize =
-        Integer.parseInt(
-            System.getenv()
-                .getOrDefault(INGESTION_MAX_SERIALIZED_STRING_LENGTH, MAX_JACKSON_STRING_SIZE));
-    objectMapper
-        .getFactory()
-        .setStreamReadConstraints(StreamReadConstraints.builder().maxStringLength(maxSize).build());
-    objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-    objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-    MappingJackson2HttpMessageConverter jsonConverter =
-        new MappingJackson2HttpMessageConverter(objectMapper);
-    messageConverters.add(jsonConverter);
-  }
-
-  @Override
-  public void addFormatters(FormatterRegistry registry) {
-    registry.addConverter(new StringToChangeCategoryConverter());
-  }
-
   @Bean
   public GroupedOpenApi v3OpenApiGroup(
       final EntityRegistry entityRegistry, final ConfigurationProvider configurationProvider) {
@@ -153,6 +111,13 @@ public GroupedOpenApi openlineageOpenApiGroup() {
         .build();
   }
 
+  @Override
+  public void addResourceHandlers(ResourceHandlerRegistry registry) {
+    registry
+        .addResourceHandler("/swagger-ui/**")
+        .addResourceLocations("classpath:/META-INF/resources/webjars/swagger-ui/");
+  }
+
   /** Concatenates two maps. */
   private <K, V> Map<K, V> concat(Supplier<Map<K, V>> a, Supplier<Map<K, V>> b) {
     return a.get() == null
@@ -167,10 +132,4 @@ private <K, V> Map<K, V> concat(Supplier<Map<K, V>> a, Supplier<Map<K, V>> b) {
                         (v1, v2) -> v2,
                         LinkedHashMap::new));
   }
-
-  @Override
-  public void configureAsyncSupport(@Nonnull AsyncSupportConfigurer configurer) {
-    WebMvcConfigurer.super.configureAsyncSupport(configurer);
-    configurer.setDefaultTimeout(asyncTimeoutMilliseconds);
-  }
 }
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/elastic/OperationsController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/elastic/OperationsController.java
index 6151b866e5208b..64333009dda7a9 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/elastic/OperationsController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/elastic/OperationsController.java
@@ -60,7 +60,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/operations/elasticSearch")
+@RequestMapping("/openapi/operations/elasticSearch")
 @Slf4j
 @Tag(
     name = "ElasticSearchOperations",
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/test/IdController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/test/IdController.java
index 99d3879ab9a320..9be9526afac340 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/test/IdController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/test/IdController.java
@@ -19,7 +19,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/operations/identity")
+@RequestMapping("/openapi/operations/identity")
 @Slf4j
 @Tag(name = "Identity", description = "An API for checking identity")
 public class IdController {
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/throttle/ThrottleController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/throttle/ThrottleController.java
index 3c44d94428f428..5db2183d3acd62 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/throttle/ThrottleController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/throttle/ThrottleController.java
@@ -28,7 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/operations/throttle")
+@RequestMapping("/openapi/operations/throttle")
 @Slf4j
 @Tag(name = "GMS Throttle Control", description = "An API for GMS throttle control.")
 public class ThrottleController {
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/entities/EntitiesController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/entities/EntitiesController.java
index 03050868efdcab..dd359cbc464319 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/entities/EntitiesController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/entities/EntitiesController.java
@@ -61,7 +61,7 @@
 */
 @Deprecated
 @RestController
-@RequestMapping("/entities/v1")
+@RequestMapping("/openapi/entities/v1")
 @Slf4j
 @Tag(
     name = "Entities",
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/relationships/RelationshipsController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/relationships/RelationshipsController.java
index b2b7eb557ca32a..f778bf54aaeac7 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/relationships/RelationshipsController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/relationships/RelationshipsController.java
@@ -50,7 +50,7 @@
 @Deprecated
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/relationships/v1")
+@RequestMapping("/openapi/relationships/v1")
 @Slf4j
 @Tag(name = "Relationships", description = "APIs for accessing relationships of entities")
 public class RelationshipsController {
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/timeline/TimelineControllerV1.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/timeline/TimelineControllerV1.java
index 30cdb632d54773..47b558f6a9b3a3 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/timeline/TimelineControllerV1.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/timeline/TimelineControllerV1.java
@@ -38,7 +38,7 @@
 @Deprecated
 @RestController
 @AllArgsConstructor
-@RequestMapping("/timeline/v1")
+@RequestMapping("/openapi/timeline/v1")
 @Tag(
     name = "Timeline",
     description =
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/EntityController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/EntityController.java
index b1c5709ef01470..bafa8c43f60f55 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/EntityController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/EntityController.java
@@ -73,7 +73,7 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/v2/entity")
+@RequestMapping("/openapi/v2/entity")
 @Slf4j
 public class EntityController
     extends GenericEntitiesController<
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/PlatformEntitiesController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/PlatformEntitiesController.java
index 6c99d972dde03f..bfd1f952f95f74 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/PlatformEntitiesController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/PlatformEntitiesController.java
@@ -39,7 +39,7 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/v2/platform/entities/v1")
+@RequestMapping("/openapiv2/platform/entities/v1")
 @Slf4j
 @Tag(
     name = "Platform Entities",
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/RelationshipController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/RelationshipController.java
index a0412676b5cbce..1e431bd291ca17 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/RelationshipController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/RelationshipController.java
@@ -9,7 +9,7 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/v2/relationship")
+@RequestMapping("/openapi/v2/relationship")
 @Slf4j
 @Tag(
     name = "Generic Relationships",
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/TimelineControllerV2.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/TimelineControllerV2.java
index f3d0d5188b1e7e..0245ae289f07ee 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/TimelineControllerV2.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/TimelineControllerV2.java
@@ -34,7 +34,7 @@
 
 @RestController
 @AllArgsConstructor
-@RequestMapping("/v2/timeline/v1")
+@RequestMapping("/openapi/v2/timeline/v1")
 @Tag(
     name = "Timeline",
     description =
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/TimeseriesController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/TimeseriesController.java
index 3b896dc5000822..212084f25ddd5d 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/TimeseriesController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/TimeseriesController.java
@@ -38,7 +38,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/v2/timeseries")
+@RequestMapping("/openapi/v2/timeseries")
 @Slf4j
 @Tag(
     name = "Generic Timeseries Aspects",
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java
index a4583082d57c7f..573feec64d2283 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java
@@ -93,7 +93,7 @@
 
 @RestController("EntityControllerV3")
 @RequiredArgsConstructor
-@RequestMapping("/v3/entity")
+@RequestMapping("/openapi/v3/entity")
 @Slf4j
 @Hidden
 public class EntityController
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/RelationshipController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/RelationshipController.java
index 8f317e86227239..3b7b897b55d1c5 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/RelationshipController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/RelationshipController.java
@@ -9,7 +9,7 @@
 
 @RestController("RelationshipControllerV3")
 @RequiredArgsConstructor
-@RequestMapping("/v3/relationship")
+@RequestMapping("/openapi/v3/relationship")
 @Slf4j
 @Tag(
     name = "Generic Relationships",
diff --git a/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/config/SpringWebConfigTest.java b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/config/SpringWebConfigTest.java
new file mode 100644
index 00000000000000..c449ed20e47ba4
--- /dev/null
+++ b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/config/SpringWebConfigTest.java
@@ -0,0 +1,77 @@
+package io.datahubproject.openapi.config;
+
+import static org.mockito.Mockito.mock;
+import static org.testng.AssertJUnit.assertEquals;
+
+import com.linkedin.gms.factory.config.ConfigurationProvider;
+import com.linkedin.metadata.models.registry.EntityRegistry;
+import com.linkedin.metadata.spring.YamlPropertySourceFactory;
+import io.datahubproject.openapi.v3.OpenAPIV3Generator;
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Paths;
+import io.swagger.v3.oas.models.media.Schema;
+import java.util.HashMap;
+import java.util.Map;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.testng.annotations.Test;
+
+@Import(ConfigurationProvider.class)
+@PropertySource(value = "classpath:/application.yaml", factory = YamlPropertySourceFactory.class)
+public class SpringWebConfigTest extends AbstractTestNGSpringContextTests {
+  @Autowired private ConfigurationProvider configurationProvider;
+
+  @Test
+  void testComponentsMergeWithDuplicateKeys() {
+    // Setup
+    SpringWebConfig config = new SpringWebConfig();
+    EntityRegistry entityRegistry = mock(EntityRegistry.class);
+
+    // Create test schemas with duplicate keys
+    Map<String, Schema> schemas1 = new HashMap<>();
+    schemas1.put("TestSchema", new Schema().type("string").description("First schema"));
+
+    Map<String, Schema> schemas2 = new HashMap<>();
+    schemas2.put("TestSchema", new Schema().type("object").description("Second schema"));
+
+    // Create OpenAPI objects with proper initialization
+    OpenAPI openApi1 =
+        new OpenAPI().components(new Components().schemas(schemas1)).paths(new Paths());
+
+    OpenAPI openApi2 =
+        new OpenAPI().components(new Components().schemas(schemas2)).paths(new Paths());
+
+    // Mock OpenAPIV3Generator
+    try (MockedStatic<OpenAPIV3Generator> mockedGenerator =
+        Mockito.mockStatic(OpenAPIV3Generator.class)) {
+      mockedGenerator
+          .when(
+              () ->
+                  OpenAPIV3Generator.generateOpenApiSpec(
+                      Mockito.any(EntityRegistry.class), Mockito.any(ConfigurationProvider.class)))
+          .thenReturn(openApi2);
+
+      // Get the GroupedOpenApi
+      var groupedApi = config.v3OpenApiGroup(entityRegistry, configurationProvider);
+
+      // Execute the customizer
+      groupedApi.getOpenApiCustomizers().get(0).customise(openApi1);
+
+      // Verify the merged components
+      Map<String, Schema> mergedSchemas = openApi1.getComponents().getSchemas();
+
+      // Assert that we have the expected number of schemas
+      assertEquals(1, mergedSchemas.size());
+
+      // Assert that the duplicate key contains the second schema (v2 value)
+      Schema resultSchema = mergedSchemas.get("TestSchema");
+      assertEquals("object", resultSchema.getType());
+      assertEquals("Second schema", resultSchema.getDescription());
+    }
+  }
+}
diff --git a/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/controller/EntityControllerTest.java b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/controller/EntityControllerTest.java
index e82ab50a0defeb..5080f6a12cdd28 100644
--- a/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/controller/EntityControllerTest.java
+++ b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/controller/EntityControllerTest.java
@@ -178,7 +178,7 @@ public void testSearchOrderPreserved() throws Exception {
     // test ASCENDING
     mockMvc
         .perform(
-            MockMvcRequestBuilders.get("/v3/entity/dataset")
+            MockMvcRequestBuilders.get("/openapi/v3/entity/dataset")
                 .param("sortOrder", "ASCENDING")
                 .accept(MediaType.APPLICATION_JSON))
         .andExpect(status().is2xxSuccessful())
@@ -192,7 +192,7 @@ public void testSearchOrderPreserved() throws Exception {
     // test DESCENDING
     mockMvc
         .perform(
-            MockMvcRequestBuilders.get("/v3/entity/dataset")
+            MockMvcRequestBuilders.get("/openapi/v3/entity/dataset")
                 .accept(MediaType.APPLICATION_JSON)
                 .param("sortOrder", "DESCENDING"))
         .andExpect(status().is2xxSuccessful())
@@ -211,14 +211,14 @@ public void testDeleteEntity() throws Exception {
     // test delete entity
     mockMvc
         .perform(
-            MockMvcRequestBuilders.delete(String.format("/v3/entity/dataset/%s", TEST_URN))
+            MockMvcRequestBuilders.delete(String.format("/openapi/v3/entity/dataset/%s", TEST_URN))
                 .accept(MediaType.APPLICATION_JSON))
         .andExpect(status().is2xxSuccessful());
 
     // test delete entity by aspect key
     mockMvc
         .perform(
-            MockMvcRequestBuilders.delete(String.format("/v3/entity/dataset/%s", TEST_URN))
+            MockMvcRequestBuilders.delete(String.format("/openapi/v3/entity/dataset/%s", TEST_URN))
                 .param("aspects", "datasetKey")
                 .accept(MediaType.APPLICATION_JSON))
         .andExpect(status().is2xxSuccessful());
@@ -229,7 +229,7 @@ public void testDeleteEntity() throws Exception {
     reset(mockEntityService);
     mockMvc
         .perform(
-            MockMvcRequestBuilders.delete(String.format("/v3/entity/dataset/%s", TEST_URN))
+            MockMvcRequestBuilders.delete(String.format("/openapi/v3/entity/dataset/%s", TEST_URN))
                 .param("aspects", "status")
                 .accept(MediaType.APPLICATION_JSON))
         .andExpect(status().is2xxSuccessful());
@@ -240,7 +240,7 @@ public void testDeleteEntity() throws Exception {
     reset(mockEntityService);
     mockMvc
         .perform(
-            MockMvcRequestBuilders.delete(String.format("/v3/entity/dataset/%s", TEST_URN))
+            MockMvcRequestBuilders.delete(String.format("/openapi/v3/entity/dataset/%s", TEST_URN))
                 .param("clear", "true")
                 .accept(MediaType.APPLICATION_JSON))
         .andExpect(status().is2xxSuccessful());
@@ -374,7 +374,7 @@ public void testTimeseriesAspect() throws Exception {
     // test timeseries latest aspect
     mockMvc
         .perform(
-            MockMvcRequestBuilders.get("/v3/entity/dataset/{urn}/datasetprofile", TEST_URN)
+            MockMvcRequestBuilders.get("/openapi/v3/entity/dataset/{urn}/datasetprofile", TEST_URN)
                 .accept(MediaType.APPLICATION_JSON))
         .andExpect(status().is2xxSuccessful())
         .andExpect(MockMvcResultMatchers.jsonPath("$.value.rowCount").value(10))
@@ -384,7 +384,7 @@ public void testTimeseriesAspect() throws Exception {
     // test oldd aspect
     mockMvc
         .perform(
-            MockMvcRequestBuilders.get("/v3/entity/dataset/{urn}/datasetprofile", TEST_URN)
+            MockMvcRequestBuilders.get("/openapi/v3/entity/dataset/{urn}/datasetprofile", TEST_URN)
                 .param("version", "150")
                 .accept(MediaType.APPLICATION_JSON))
         .andExpect(status().is2xxSuccessful())
@@ -471,7 +471,7 @@ public void testGetEntityBatchWithMultipleEntities() throws Exception {
 
     mockMvc
         .perform(
-            MockMvcRequestBuilders.post("/v3/entity/dataset/batchGet")
+            MockMvcRequestBuilders.post("/openapi/v3/entity/dataset/batchGet")
                 .content(requestBody)
                 .contentType(MediaType.APPLICATION_JSON)
                 .accept(MediaType.APPLICATION_JSON))
@@ -486,7 +486,7 @@ public void testGetEntityBatchWithInvalidUrn() throws Exception {
 
     mockMvc
         .perform(
-            MockMvcRequestBuilders.post("/v3/entity/dataset/batchGet")
+            MockMvcRequestBuilders.post("/openapi/v3/entity/dataset/batchGet")
                 .content(requestBody)
                 .contentType(MediaType.APPLICATION_JSON)
                 .accept(MediaType.APPLICATION_JSON))
@@ -531,7 +531,7 @@ public void testScrollEntitiesWithMultipleSortFields() throws Exception {
 
     mockMvc
         .perform(
-            MockMvcRequestBuilders.post("/v3/entity/scroll")
+            MockMvcRequestBuilders.post("/openapi/v3/entity/scroll")
                 .content("{\"entities\":[\"dataset\"]}")
                 .param("sortCriteria", "name", "urn")
                 .contentType(MediaType.APPLICATION_JSON)
@@ -575,7 +575,7 @@ public void testScrollEntitiesWithPitKeepAlive() throws Exception {
 
     mockMvc
         .perform(
-            MockMvcRequestBuilders.post("/v3/entity/scroll")
+            MockMvcRequestBuilders.post("/openapi/v3/entity/scroll")
                 .content("{\"entities\":[\"dataset\"]}")
                 .param("pitKeepAlive", "10m")
                 .contentType(MediaType.APPLICATION_JSON)
@@ -598,7 +598,7 @@ public void testEntityVersioningFeatureFlagDisabled() throws Exception {
         .perform(
             MockMvcRequestBuilders.post(
                     String.format(
-                        "/v3/entity/versioning/%s/relationship/versionOf/%s",
+                        "/openapi/v3/entity/versioning/%s/relationship/versionOf/%s",
                         VERSION_SET_URN, TEST_URN))
                 .content("{}")
                 .contentType(MediaType.APPLICATION_JSON)
@@ -610,7 +610,7 @@ public void testEntityVersioningFeatureFlagDisabled() throws Exception {
         .perform(
             MockMvcRequestBuilders.delete(
                     String.format(
-                        "/v3/entity/versioning/%s/relationship/versionOf/%s",
+                        "/openapi/v3/entity/versioning/%s/relationship/versionOf/%s",
                         VERSION_SET_URN, TEST_URN))
                 .accept(MediaType.APPLICATION_JSON))
         .andExpect(status().is4xxClientError());
@@ -630,7 +630,7 @@ public void testInvalidVersionSetUrn() throws Exception {
         .perform(
             MockMvcRequestBuilders.post(
                     String.format(
-                        "/v3/entity/versioning/%s/relationship/versionOf/%s",
+                        "/openapi/v3/entity/versioning/%s/relationship/versionOf/%s",
                         INVALID_VERSION_SET_URN, TEST_URN))
                 .content("{}")
                 .contentType(MediaType.APPLICATION_JSON)
@@ -642,7 +642,7 @@ public void testInvalidVersionSetUrn() throws Exception {
         .perform(
             MockMvcRequestBuilders.delete(
                     String.format(
-                        "/v3/entity/versioning/%s/relationship/versionOf/%s",
+                        "/openapi/v3/entity/versioning/%s/relationship/versionOf/%s",
                         INVALID_VERSION_SET_URN, TEST_URN))
                 .accept(MediaType.APPLICATION_JSON))
         .andExpect(status().is4xxClientError());
diff --git a/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/SchemaRegistryController.java b/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/SchemaRegistryController.java
index 09043c6dd5e87e..145ecae92ff0b6 100644
--- a/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/SchemaRegistryController.java
+++ b/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/SchemaRegistryController.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableSet;
-import com.linkedin.gms.factory.kafka.schemaregistry.InternalSchemaRegistryFactory;
 import com.linkedin.metadata.registry.SchemaRegistryService;
 import io.datahubproject.schema_registry.openapi.generated.CompatibilityCheckResponse;
 import io.datahubproject.schema_registry.openapi.generated.Config;
@@ -29,10 +28,12 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import javax.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,11 +43,9 @@
 /** DataHub Rest Controller implementation for Confluent's Schema Registry OpenAPI spec. */
 @Slf4j
 @RestController
-@RequestMapping("/api")
+@RequestMapping("/schema-registry/api")
+@Order(Ordered.HIGHEST_PRECEDENCE)
 @RequiredArgsConstructor
-@ConditionalOnProperty(
-    name = "kafka.schemaRegistry.type",
-    havingValue = InternalSchemaRegistryFactory.TYPE)
 public class SchemaRegistryController
     implements CompatibilityApi,
         ConfigApi,
@@ -66,6 +65,11 @@ public class SchemaRegistryController
   @Qualifier("schemaRegistryService")
   private final SchemaRegistryService _schemaRegistryService;
 
+  @PostConstruct
+  public void init() {
+    log.info("SchemaRegistryController initialized with base path: /schema-registry/api");
+  }
+
   @Override
   public Optional<ObjectMapper> getObjectMapper() {
     return Optional.ofNullable(objectMapper);
diff --git a/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/config/SpringWebSchemaRegistryConfig.java b/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/config/SpringWebSchemaRegistryConfig.java
index 5f7d8d9604de6e..c2200eef6e60f5 100644
--- a/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/config/SpringWebSchemaRegistryConfig.java
+++ b/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/config/SpringWebSchemaRegistryConfig.java
@@ -1,23 +1,50 @@
 package io.datahubproject.openapi.schema.registry.config;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.linkedin.gms.factory.kafka.schemaregistry.InternalSchemaRegistryFactory;
+import com.linkedin.metadata.registry.SchemaRegistryService;
+import io.datahubproject.openapi.schema.registry.SchemaRegistryController;
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.info.Info;
 import io.swagger.v3.oas.annotations.servers.Server;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
 import org.springframework.http.converter.ByteArrayHttpMessageConverter;
 import org.springframework.http.converter.FormHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+@Slf4j
+@EnableWebMvc
 @OpenAPIDefinition(
     info = @Info(title = "DataHub OpenAPI", version = "1.0.0"),
     servers = {@Server(url = "/schema-registry/", description = "Schema Registry Server URL")})
+@Order(3)
+@ConditionalOnProperty(
+    name = "kafka.schemaRegistry.type",
+    havingValue = InternalSchemaRegistryFactory.TYPE)
 @Configuration
+@ComponentScan(basePackages = {"io.datahubproject.openapi.schema.registry"})
 public class SpringWebSchemaRegistryConfig implements WebMvcConfigurer {
 
+  @Bean
+  public SchemaRegistryController schemaRegistryController(
+      ObjectMapper objectMapper,
+      HttpServletRequest request,
+      @Qualifier("schemaRegistryService") SchemaRegistryService schemaRegistryService) {
+    return new SchemaRegistryController(objectMapper, request, schemaRegistryService);
+  }
+
   @Override
   public void configureMessageConverters(List<HttpMessageConverter<?>> messageConverters) {
     messageConverters.add(new StringHttpMessageConverter());
diff --git a/metadata-service/schema-registry-servlet/src/test/java/io/datahubproject/openapi/test/SchemaRegistryControllerTest.java b/metadata-service/schema-registry-servlet/src/test/java/io/datahubproject/openapi/test/SchemaRegistryControllerTest.java
index e8deed00672da7..fd862d65fb2ef4 100644
--- a/metadata-service/schema-registry-servlet/src/test/java/io/datahubproject/openapi/test/SchemaRegistryControllerTest.java
+++ b/metadata-service/schema-registry-servlet/src/test/java/io/datahubproject/openapi/test/SchemaRegistryControllerTest.java
@@ -74,7 +74,7 @@ static void kafkaProperties(DynamicPropertyRegistry registry) {
     kafka.start();
     registry.add("kafka.bootstrapServers", kafka::getBootstrapServers);
     registry.add("kafka.schemaRegistry.type", () -> "INTERNAL");
-    registry.add("kafka.schemaRegistry.url", () -> "http://localhost:53222/api/");
+    registry.add("kafka.schemaRegistry.url", () -> "http://localhost:53222/schema-registry/api/");
   }
 
   @Autowired EventProducer _producer;
diff --git a/metadata-service/war/build.gradle b/metadata-service/war/build.gradle
index 5e00207c1726ee..d83b29c4ad82bc 100644
--- a/metadata-service/war/build.gradle
+++ b/metadata-service/war/build.gradle
@@ -1,6 +1,7 @@
 plugins {
-  id 'war'
+  id 'org.springframework.boot'
   id 'com.palantir.docker'
+  id 'java'
 }
 
 apply from: '../../gradle/coverage/java-coverage.gradle'
@@ -31,6 +32,12 @@ dependencies {
   runtimeOnly externalDependency.mariadbConnector
   runtimeOnly externalDependency.mysqlConnector
   runtimeOnly externalDependency.postgresql
+
+  implementation(externalDependency.springBootStarterWeb) {
+    exclude module: "spring-boot-starter-tomcat"
+  }
+  implementation externalDependency.springBootStarterJetty
+  implementation externalDependency.jettyJmx
   implementation externalDependency.springWebMVC
   implementation externalDependency.springBootAutoconfigure
   implementation externalDependency.servletApi
@@ -38,6 +45,8 @@ dependencies {
   implementation spec.product.pegasus.restliDocgen
   implementation spec.product.pegasus.restliSpringBridge
 
+  compileOnly externalDependency.lombok
+  annotationProcessor externalDependency.lombok
   runtimeOnly externalDependency.log4jCore
   runtimeOnly externalDependency.log4j2Api
   runtimeOnly externalDependency.logbackClassic
@@ -51,31 +60,30 @@ dependencies {
 }
 configurations.all{
   exclude group: "com.charleskorn.kaml", module:"kaml"
-  
-}
-configurations {
-  jetty11
 }
 
-dependencies {
-  jetty11 "org.eclipse.jetty:jetty-runner:11.0.19"
+tasks.register('run') {
+  group = 'application'  // Add a group for better organization
+  description = 'Runs the application with Gretty'
+  dependsOn 'bootRun' // spring task
 }
 
-task run(type: JavaExec, dependsOn: build) {
-  main = "org.eclipse.jetty.runner.Runner"
-  args = ["${projectDir}/build/libs/war.war"]
-  classpath configurations.jetty11
+bootJar {
+  // backwards compatible with old war archive name
+  archiveFileName = 'war.war'
+  mainClass = 'com.linkedin.gms.GMSApplication'
 }
 
-war {
-  archiveFileName = "war.war"
+bootRun {
+  environment "SCHEMA_REGISTRY_TYPE", "INTERNAL"
+  environment "KAFKA_SCHEMAREGISTRY_URL", "http://localhost:8080/schema-registry/api"
 }
 
 docker {
   name "${docker_registry}/${docker_repo}:v${version}"
   version "v${version}"
   dockerfile file("${rootProject.projectDir}/docker/${docker_repo}/Dockerfile")
-  files war.outputs.files
+  files bootJar.outputs.files
   files fileTree(rootProject.projectDir) {
     include '.dockerignore'
     include 'docker/monitoring/*'
@@ -107,7 +115,7 @@ docker {
     buildArgs(dockerBuildArgs)
   }
 }
-tasks.getByPath(":metadata-service:war:docker").dependsOn([build, war])
+tasks.getByPath(":metadata-service:war:docker").dependsOn([bootJar])
 
 task cleanLocalDockerImages {
   doLast {
@@ -115,3 +123,12 @@ task cleanLocalDockerImages {
   }
 }
 dockerClean.finalizedBy(cleanLocalDockerImages)
+
+test {
+  jacoco {
+    // This contains quickstart tested code for jetty startup
+    excludes = ["com.linkedin.gms.CommonApplicationConfig",
+                "com.linkedin.gms.ServletConfig",
+                "com.linkedin.gms.GMSApplication"]
+  }
+}
\ No newline at end of file
diff --git a/metadata-service/war/src/main/java/com/linkedin/gms/CommonApplicationConfig.java b/metadata-service/war/src/main/java/com/linkedin/gms/CommonApplicationConfig.java
index 69fb9df2b04dbb..3f3ed9f75cceb3 100644
--- a/metadata-service/war/src/main/java/com/linkedin/gms/CommonApplicationConfig.java
+++ b/metadata-service/war/src/main/java/com/linkedin/gms/CommonApplicationConfig.java
@@ -1,11 +1,22 @@
 package com.linkedin.gms;
 
-import com.datahub.auth.authentication.filter.AuthenticationFilter;
 import com.linkedin.metadata.spring.YamlPropertySourceFactory;
+import java.lang.management.ManagementFactory;
+import javax.management.MBeanServer;
+import org.eclipse.jetty.jmx.MBeanContainer;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.HttpConnectionFactory;
+import org.eclipse.jetty.server.ServerConnector;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
 
 /**
  * Common configuration for all servlets. Generally this list also includes dependencies of the
@@ -43,12 +54,39 @@
       "com.linkedin.gms.factory.notifications",
       "com.linkedin.gms.factory.telemetry"
     })
-@PropertySource(value = "classpath:/application.yaml", factory = YamlPropertySourceFactory.class)
 @Configuration
+@PropertySource(value = "classpath:/application.yaml", factory = YamlPropertySourceFactory.class)
 public class CommonApplicationConfig {
 
-  @Bean("authenticationFilter")
-  public AuthenticationFilter authenticationFilter() {
-    return new AuthenticationFilter();
+  @Autowired private Environment environment;
+
+  @Bean
+  public WebServerFactoryCustomizer<JettyServletWebServerFactory> jettyCustomizer() {
+    return factory -> {
+      // Configure HTTP
+      factory.addServerCustomizers(
+          server -> {
+            // HTTP Configuration
+            HttpConfiguration httpConfig = new HttpConfiguration();
+            httpConfig.setRequestHeaderSize(32768);
+
+            // HTTP Connector
+            ServerConnector connector =
+                new ServerConnector(server, new HttpConnectionFactory(httpConfig));
+
+            // Get port from environment directly
+            int port = environment.getProperty("server.port", Integer.class, 8080);
+            connector.setPort(port);
+
+            // Set connectors
+            server.setConnectors(new Connector[] {connector});
+
+            // JMX Configuration
+            MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
+            MBeanContainer mBeanContainer = new MBeanContainer(mBeanServer);
+            mBeanContainer.beanAdded(null, LoggerFactory.getILoggerFactory());
+            server.addBean(mBeanContainer);
+          });
+    };
   }
 }
diff --git a/metadata-service/war/src/main/java/com/linkedin/gms/GMSApplication.java b/metadata-service/war/src/main/java/com/linkedin/gms/GMSApplication.java
new file mode 100644
index 00000000000000..ec8aaeffbba1d0
--- /dev/null
+++ b/metadata-service/war/src/main/java/com/linkedin/gms/GMSApplication.java
@@ -0,0 +1,21 @@
+package com.linkedin.gms;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.Import;
+
+@SpringBootApplication
+@Import({CommonApplicationConfig.class, ServletConfig.class})
+public class GMSApplication extends SpringBootServletInitializer {
+
+  @Override
+  protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+    return application.sources(GMSApplication.class);
+  }
+
+  public static void main(String[] args) {
+    SpringApplication.run(GMSApplication.class, args);
+  }
+}
diff --git a/metadata-service/war/src/main/java/com/linkedin/gms/ServletConfig.java b/metadata-service/war/src/main/java/com/linkedin/gms/ServletConfig.java
new file mode 100644
index 00000000000000..fbd8d72b76c8f2
--- /dev/null
+++ b/metadata-service/war/src/main/java/com/linkedin/gms/ServletConfig.java
@@ -0,0 +1,158 @@
+package com.linkedin.gms;
+
+import static com.linkedin.metadata.Constants.INGESTION_MAX_SERIALIZED_STRING_LENGTH;
+import static com.linkedin.metadata.Constants.MAX_JACKSON_STRING_SIZE;
+
+import com.datahub.auth.authentication.filter.AuthenticationFilter;
+import com.datahub.gms.servlet.Config;
+import com.datahub.gms.servlet.ConfigSearchExport;
+import com.datahub.gms.servlet.HealthCheck;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.StreamReadConstraints;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.linkedin.r2.transport.http.server.RAPJakartaServlet;
+import com.linkedin.restli.server.RestliHandlerServlet;
+import io.datahubproject.openapi.converter.StringToChangeCategoryConverter;
+import java.util.List;
+import javax.annotation.Nonnull;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.format.FormatterRegistry;
+import org.springframework.http.converter.ByteArrayHttpMessageConverter;
+import org.springframework.http.converter.FormHttpMessageConverter;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * Common configuration for all servlets. Generally this list also includes dependencies of the
+ * embedded MAE/MCE consumers.
+ */
+@Slf4j
+@Configuration
+@Order(1)
+@EnableWebMvc
+@ComponentScan(
+    basePackages = {"io.datahubproject.openapi.schema.registry.config", "com.linkedin.gms.servlet"})
+public class ServletConfig implements WebMvcConfigurer {
+
+  @Value("${datahub.gms.async.request-timeout-ms}")
+  private long asyncTimeoutMilliseconds;
+
+  @Bean
+  public FilterRegistrationBean<AuthenticationFilter> authFilter(AuthenticationFilter filter) {
+    FilterRegistrationBean<AuthenticationFilter> registration = new FilterRegistrationBean<>();
+    registration.setFilter(filter);
+    registration.setOrder(Ordered.HIGHEST_PRECEDENCE);
+    registration.setAsyncSupported(true);
+
+    // Register filter for all paths - exclusions are handled by shouldNotFilter()
+    registration.addUrlPatterns("/*");
+
+    return registration;
+  }
+
+  @Bean
+  public ServletRegistrationBean<HealthCheck> healthCheckServlet() {
+    ServletRegistrationBean<HealthCheck> registration =
+        new ServletRegistrationBean<>(new HealthCheck());
+    registration.setName("healthCheck");
+    registration.addUrlMappings("/health");
+    registration.setLoadOnStartup(15);
+    registration.setAsyncSupported(true);
+    return registration;
+  }
+
+  @Bean
+  public ServletRegistrationBean<Config> configServlet() {
+    ServletRegistrationBean<Config> registration = new ServletRegistrationBean<>(new Config());
+    registration.setName("config");
+    registration.addUrlMappings("/config");
+    registration.setLoadOnStartup(15);
+    registration.setAsyncSupported(true);
+    return registration;
+  }
+
+  @Bean
+  public ServletRegistrationBean<ConfigSearchExport> configSearchExportServlet() {
+    ServletRegistrationBean<ConfigSearchExport> registration =
+        new ServletRegistrationBean<>(new ConfigSearchExport());
+    registration.setName("config-search-export");
+    registration.addUrlMappings("/config/search/export");
+    registration.setLoadOnStartup(15);
+    registration.setAsyncSupported(true);
+    return registration;
+  }
+
+  /**
+   * SpringBoot is now the default, explicitly map these to legacy rest.li servlet. Additions are
+   * more likely to be built on the Spring side so we're preventing unexpected behavior for the most
+   * likely changes. Rest.li API is intended to be deprecated and removed.
+   *
+   * @param r2Servlet the restli servlet
+   * @return registration
+   */
+  @Bean
+  public ServletRegistrationBean<RestliHandlerServlet> restliServletRegistration(
+      RAPJakartaServlet r2Servlet) {
+    ServletRegistrationBean<RestliHandlerServlet> registration =
+        new ServletRegistrationBean<>(new RestliHandlerServlet(r2Servlet));
+    registration.addUrlMappings(
+        "/aspects/*",
+        "/entities/*",
+        "/entitiesV2/*",
+        "/entitiesVersionedV2/*",
+        "/usageStats/*",
+        "/platform/*",
+        "/relationships/*",
+        "/analytics/*",
+        "/operations/*",
+        "/runs/*");
+    registration.setLoadOnStartup(2);
+    registration.setOrder(Integer.MAX_VALUE); // lowest priority
+    return registration;
+  }
+
+  @Override
+  public void configureMessageConverters(List<HttpMessageConverter<?>> messageConverters) {
+    messageConverters.add(new StringHttpMessageConverter());
+    messageConverters.add(new ByteArrayHttpMessageConverter());
+    messageConverters.add(new FormHttpMessageConverter());
+
+    ObjectMapper objectMapper = new ObjectMapper();
+    int maxSize =
+        Integer.parseInt(
+            System.getenv()
+                .getOrDefault(INGESTION_MAX_SERIALIZED_STRING_LENGTH, MAX_JACKSON_STRING_SIZE));
+    objectMapper
+        .getFactory()
+        .setStreamReadConstraints(StreamReadConstraints.builder().maxStringLength(maxSize).build());
+    objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+    objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    MappingJackson2HttpMessageConverter jsonConverter =
+        new MappingJackson2HttpMessageConverter(objectMapper);
+    messageConverters.add(jsonConverter);
+  }
+
+  @Override
+  public void addFormatters(FormatterRegistry registry) {
+    registry.addConverter(new StringToChangeCategoryConverter());
+  }
+
+  @Override
+  public void configureAsyncSupport(@Nonnull AsyncSupportConfigurer configurer) {
+    WebMvcConfigurer.super.configureAsyncSupport(configurer);
+    configurer.setDefaultTimeout(asyncTimeoutMilliseconds);
+  }
+}
diff --git a/metadata-service/war/src/main/java/com/linkedin/gms/SpringApplicationInitializer.java b/metadata-service/war/src/main/java/com/linkedin/gms/SpringApplicationInitializer.java
deleted file mode 100644
index 821d1bf0ad6f8c..00000000000000
--- a/metadata-service/war/src/main/java/com/linkedin/gms/SpringApplicationInitializer.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.linkedin.gms;
-
-import javax.annotation.Nonnull;
-import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ConfigurableApplicationContext;
-
-public class SpringApplicationInitializer
-    implements ApplicationContextInitializer<ConfigurableApplicationContext> {
-  @Override
-  public void initialize(@Nonnull ConfigurableApplicationContext applicationContext) {}
-}
diff --git a/metadata-service/war/src/main/java/com/linkedin/gms/WebApplicationInitializer.java b/metadata-service/war/src/main/java/com/linkedin/gms/WebApplicationInitializer.java
deleted file mode 100644
index 4ed84e48a5049f..00000000000000
--- a/metadata-service/war/src/main/java/com/linkedin/gms/WebApplicationInitializer.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.linkedin.gms;
-
-import static com.linkedin.metadata.boot.OnBootApplicationListener.SCHEMA_REGISTRY_SERVLET_NAME;
-
-import com.datahub.auth.authentication.filter.AuthenticationFilter;
-import com.datahub.gms.servlet.Config;
-import com.datahub.gms.servlet.ConfigSearchExport;
-import com.datahub.gms.servlet.HealthCheck;
-import com.linkedin.gms.servlet.AuthServletConfig;
-import com.linkedin.gms.servlet.GraphQLServletConfig;
-import com.linkedin.gms.servlet.OpenAPIServletConfig;
-import com.linkedin.gms.servlet.RestliServletConfig;
-import com.linkedin.gms.servlet.SchemaRegistryServletConfig;
-import jakarta.servlet.DispatcherType;
-import jakarta.servlet.FilterRegistration;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletRegistration;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
-import org.springframework.web.context.ContextLoaderListener;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-import org.springframework.web.context.support.HttpRequestHandlerServlet;
-import org.springframework.web.servlet.DispatcherServlet;
-
-/** This class is before Spring Context is loaded, previously web.xml based */
-public class WebApplicationInitializer
-    implements org.springframework.web.WebApplicationInitializer {
-  @Override
-  public void onStartup(ServletContext container) {
-    AnnotationConfigWebApplicationContext rootContext = new AnnotationConfigWebApplicationContext();
-    rootContext.register(CommonApplicationConfig.class);
-
-    ContextLoaderListener contextLoaderListener = new ContextLoaderListener(rootContext);
-    container.addListener(contextLoaderListener);
-    container.setInitParameter(
-        "contextInitializerClasses", "com.linkedin.gms.SpringApplicationInitializer");
-
-    // Auth filter
-    List<String> servletNames = new ArrayList<>();
-
-    // Independent dispatcher
-    schemaRegistryServlet(container);
-
-    // Spring Dispatcher servlets
-    DispatcherServlet dispatcherServlet = new DispatcherServlet(rootContext);
-    servletNames.add(authServlet(rootContext, dispatcherServlet, container));
-    servletNames.add(graphQLServlet(rootContext, dispatcherServlet, container));
-    servletNames.add(openAPIServlet(rootContext, dispatcherServlet, container));
-    // Restli non-Dispatcher default
-    servletNames.add(restliServlet(rootContext, container));
-
-    FilterRegistration.Dynamic filterRegistration =
-        container.addFilter("authenticationFilter", AuthenticationFilter.class);
-    filterRegistration.setAsyncSupported(true);
-    filterRegistration.addMappingForServletNames(
-        EnumSet.of(DispatcherType.ASYNC, DispatcherType.REQUEST),
-        false,
-        servletNames.toArray(String[]::new));
-
-    // Non-Spring servlets
-    healthCheckServlet(container);
-    configServlet(container);
-  }
-
-  /*
-   * This is a servlet exclusive to DataHub's implementation of the Confluent OpenAPI spec which is not behind
-   * DataHub's authentication layer as it is not compatible with confluent consumers & producers.
-   */
-  private void schemaRegistryServlet(ServletContext container) {
-    AnnotationConfigWebApplicationContext webContext = new AnnotationConfigWebApplicationContext();
-    webContext.setId(SCHEMA_REGISTRY_SERVLET_NAME);
-    webContext.register(SchemaRegistryServletConfig.class);
-
-    DispatcherServlet dispatcherServlet = new DispatcherServlet(webContext);
-    ServletRegistration.Dynamic registration =
-        container.addServlet(SCHEMA_REGISTRY_SERVLET_NAME, dispatcherServlet);
-    registration.addMapping("/schema-registry/*");
-    registration.setLoadOnStartup(1);
-    registration.setAsyncSupported(true);
-  }
-
-  private String authServlet(
-      AnnotationConfigWebApplicationContext rootContext,
-      DispatcherServlet dispatcherServlet,
-      ServletContext container) {
-    final String servletName = "dispatcher-auth";
-    rootContext.register(AuthServletConfig.class);
-
-    ServletRegistration.Dynamic registration = container.addServlet(servletName, dispatcherServlet);
-    registration.addMapping("/auth/*");
-    registration.setLoadOnStartup(5);
-    registration.setAsyncSupported(true);
-
-    return servletName;
-  }
-
-  private String graphQLServlet(
-      AnnotationConfigWebApplicationContext rootContext,
-      DispatcherServlet dispatcherServlet,
-      ServletContext container) {
-    final String servletName = "dispatcher-graphql";
-    rootContext.register(GraphQLServletConfig.class);
-
-    ServletRegistration.Dynamic registration = container.addServlet(servletName, dispatcherServlet);
-    registration.addMapping("/api/*");
-    registration.setLoadOnStartup(5);
-    registration.setAsyncSupported(true);
-
-    return servletName;
-  }
-
-  private String openAPIServlet(
-      AnnotationConfigWebApplicationContext rootContext,
-      DispatcherServlet dispatcherServlet,
-      ServletContext container) {
-    final String servletName = "dispatcher-openapi";
-    rootContext.register(OpenAPIServletConfig.class);
-
-    ServletRegistration.Dynamic registration = container.addServlet(servletName, dispatcherServlet);
-    registration.addMapping("/openapi/*");
-    registration.setLoadOnStartup(5);
-    registration.setAsyncSupported(true);
-
-    return servletName;
-  }
-
-  private String restliServlet(
-      AnnotationConfigWebApplicationContext rootContext, ServletContext container) {
-    final String servletName = "restliRequestHandler";
-
-    rootContext.register(RestliServletConfig.class);
-
-    ServletRegistration.Dynamic registration =
-        container.addServlet(servletName, HttpRequestHandlerServlet.class);
-    registration.addMapping("/*");
-    registration.setLoadOnStartup(10);
-    registration.setAsyncSupported(true);
-    registration.setInitParameter(
-        "org.springframework.web.servlet.FrameworkServlet.ORDER",
-        String.valueOf(Integer.MAX_VALUE - 1));
-
-    return servletName;
-  }
-
-  private void healthCheckServlet(ServletContext container) {
-    ServletRegistration.Dynamic registration =
-        container.addServlet("healthCheck", new HealthCheck());
-    registration.addMapping("/health");
-    registration.setLoadOnStartup(15);
-    registration.setAsyncSupported(true);
-  }
-
-  private void configServlet(ServletContext container) {
-    ServletRegistration.Dynamic registration = container.addServlet("config", new Config());
-    registration.addMapping("/config");
-    registration.setLoadOnStartup(15);
-    registration.setAsyncSupported(true);
-
-    ServletRegistration.Dynamic registration2 =
-        container.addServlet("config-search-export", new ConfigSearchExport());
-    registration2.addMapping("/config/search/export");
-    registration2.setLoadOnStartup(15);
-    registration2.setAsyncSupported(true);
-  }
-}
diff --git a/metadata-service/war/src/main/java/com/linkedin/gms/servlet/AuthServletConfig.java b/metadata-service/war/src/main/java/com/linkedin/gms/servlet/AuthServletConfig.java
index 437c8722a747f5..08074c26d44c55 100644
--- a/metadata-service/war/src/main/java/com/linkedin/gms/servlet/AuthServletConfig.java
+++ b/metadata-service/war/src/main/java/com/linkedin/gms/servlet/AuthServletConfig.java
@@ -2,9 +2,7 @@
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
-@EnableWebMvc
 @ComponentScan(basePackages = {"com.datahub.auth.authentication"})
 @Configuration
 public class AuthServletConfig {}
diff --git a/metadata-service/war/src/main/java/com/linkedin/gms/servlet/GraphQLServletConfig.java b/metadata-service/war/src/main/java/com/linkedin/gms/servlet/GraphQLServletConfig.java
index 42413df0757e64..9f08306518482a 100644
--- a/metadata-service/war/src/main/java/com/linkedin/gms/servlet/GraphQLServletConfig.java
+++ b/metadata-service/war/src/main/java/com/linkedin/gms/servlet/GraphQLServletConfig.java
@@ -2,9 +2,7 @@
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
-@EnableWebMvc
 @ComponentScan(
     basePackages = {
       "com.datahub.graphql",
diff --git a/metadata-service/war/src/main/java/com/linkedin/gms/servlet/OpenAPIServletConfig.java b/metadata-service/war/src/main/java/com/linkedin/gms/servlet/OpenAPIServletConfig.java
index d259f763d3d440..ebab789b058799 100644
--- a/metadata-service/war/src/main/java/com/linkedin/gms/servlet/OpenAPIServletConfig.java
+++ b/metadata-service/war/src/main/java/com/linkedin/gms/servlet/OpenAPIServletConfig.java
@@ -2,9 +2,7 @@
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
-@EnableWebMvc
 @ComponentScan(
     basePackages = {
       "io.datahubproject.openapi.config",
diff --git a/metadata-service/war/src/main/java/com/linkedin/gms/servlet/RestliServletConfig.java b/metadata-service/war/src/main/java/com/linkedin/gms/servlet/RestliServletConfig.java
index 222e2356dfb1ca..b079efac4a8c5b 100644
--- a/metadata-service/war/src/main/java/com/linkedin/gms/servlet/RestliServletConfig.java
+++ b/metadata-service/war/src/main/java/com/linkedin/gms/servlet/RestliServletConfig.java
@@ -1,20 +1,8 @@
 package com.linkedin.gms.servlet;
 
-import com.linkedin.metadata.spring.YamlPropertySourceFactory;
-import com.linkedin.r2.transport.http.server.RAPJakartaServlet;
-import com.linkedin.restli.server.RestliHandlerServlet;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.web.context.support.HttpRequestHandlerServlet;
 
 @ComponentScan(basePackages = {"com.linkedin.restli.server"})
-@PropertySource(value = "classpath:/application.yaml", factory = YamlPropertySourceFactory.class)
 @Configuration
-public class RestliServletConfig {
-  @Bean("restliRequestHandler")
-  public HttpRequestHandlerServlet restliHandlerServlet(final RAPJakartaServlet r2Servlet) {
-    return new RestliHandlerServlet(r2Servlet);
-  }
-}
+public class RestliServletConfig {}
diff --git a/metadata-service/war/src/main/java/com/linkedin/gms/servlet/SchemaRegistryServletConfig.java b/metadata-service/war/src/main/java/com/linkedin/gms/servlet/SchemaRegistryServletConfig.java
deleted file mode 100644
index beb633888bd349..00000000000000
--- a/metadata-service/war/src/main/java/com/linkedin/gms/servlet/SchemaRegistryServletConfig.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.linkedin.gms.servlet;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-
-@EnableWebMvc
-@ComponentScan(basePackages = {"io.datahubproject.openapi.schema.registry"})
-@Configuration
-public class SchemaRegistryServletConfig {}
diff --git a/metadata-service/war/src/test/java/com/linkedin/gms/SpringTest.java b/metadata-service/war/src/test/java/com/linkedin/gms/SpringTest.java
index 27dabf1e33ddd8..74d2f2c8107148 100644
--- a/metadata-service/war/src/test/java/com/linkedin/gms/SpringTest.java
+++ b/metadata-service/war/src/test/java/com/linkedin/gms/SpringTest.java
@@ -3,30 +3,51 @@
 import static org.testng.AssertJUnit.assertNotNull;
 
 import com.linkedin.gms.factory.telemetry.DailyReport;
-import com.linkedin.metadata.models.registry.ConfigEntityRegistry;
+import com.linkedin.metadata.boot.BootstrapManager;
 import com.linkedin.metadata.models.registry.EntityRegistry;
+import io.datahubproject.metadata.context.OperationContext;
+import io.datahubproject.test.metadata.context.TestOperationContexts;
 import io.ebean.Database;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
 import org.testng.annotations.Test;
 
 @SpringBootTest(
     webEnvironment = SpringBootTest.WebEnvironment.MOCK,
-    properties = {"telemetry.enabledServer=true"})
-@ContextConfiguration(classes = CommonApplicationConfig.class)
+    properties = {
+      "telemetry.enabledServer=true",
+      "spring.main.allow-bean-definition-overriding=true"
+    })
+@ContextConfiguration(classes = {CommonApplicationConfig.class, SpringTest.TestBeans.class})
 public class SpringTest extends AbstractTestNGSpringContextTests {
 
   // Mock Beans take precedence, we add these to avoid needing to configure data sources etc. while
   // still testing prod config
   @MockBean private Database database;
-  @MockBean private ConfigEntityRegistry configEntityRegistry;
-  @MockBean private EntityRegistry entityRegistry;
+  @MockBean private BootstrapManager bootstrapManager;
 
   @Test
   public void testTelemetry() {
     DailyReport dailyReport = this.applicationContext.getBean(DailyReport.class);
     assertNotNull(dailyReport);
   }
+
+  @TestConfiguration
+  public static class TestBeans {
+    @Bean
+    public OperationContext systemOperationContext() {
+      return TestOperationContexts.systemContextNoSearchAuthorization();
+    }
+
+    @Primary
+    @Bean
+    public EntityRegistry entityRegistry(OperationContext systemOperationContext) {
+      return systemOperationContext.getEntityRegistry();
+    }
+  }
 }

From f97880d8dd127f785ebb07b8d2cc09a6b00e632c Mon Sep 17 00:00:00 2001
From: Chris Collins <chriscollins3456@gmail.com>
Date: Thu, 23 Jan 2025 12:38:24 -0500
Subject: [PATCH 156/249] DataHub Cloud release notes v0.3.8 (#12271)

Co-authored-by: Jay <159848059+jayacryl@users.noreply.github.com>
Co-authored-by: RyanHolstien <RyanHolstien@users.noreply.github.com>
Co-authored-by: Andrew Sikowitz <andrew.sikowitz@acryl.io>
Co-authored-by: david-leifker <114954101+david-leifker@users.noreply.github.com>
Co-authored-by: Harshal Sheth <hsheth2@gmail.com>
Co-authored-by: John Joyce <john@acryl.io>
Co-authored-by: Anton Kuraev <anton.kuraev@acryl.io>
---
 docs-website/sidebars.js                      |  1 +
 docs/managed-datahub/release-notes/v_0_3_8.md | 81 +++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 docs/managed-datahub/release-notes/v_0_3_8.md

diff --git a/docs-website/sidebars.js b/docs-website/sidebars.js
index bcb06affedcff0..fbd35b60aedba9 100644
--- a/docs-website/sidebars.js
+++ b/docs-website/sidebars.js
@@ -368,6 +368,7 @@ module.exports = {
         },
         {
           "DataHub Cloud Release History": [
+            "docs/managed-datahub/release-notes/v_0_3_8",
             "docs/managed-datahub/release-notes/v_0_3_7",
             "docs/managed-datahub/release-notes/v_0_3_6",
             "docs/managed-datahub/release-notes/v_0_3_5",
diff --git a/docs/managed-datahub/release-notes/v_0_3_8.md b/docs/managed-datahub/release-notes/v_0_3_8.md
new file mode 100644
index 00000000000000..75bba525688d89
--- /dev/null
+++ b/docs/managed-datahub/release-notes/v_0_3_8.md
@@ -0,0 +1,81 @@
+# v0.3.8
+---
+
+Release Availability Date
+---
+21-Jan-2025
+
+Recommended CLI/SDK
+---
+0.15.0.1
+
+## Known Issues
+
+- Async APIs - DataHub's asynchronous APIs perform only basic schema validation when receiving MCP requests, similar to direct production to MCP Kafka topics. While requests must conform to the MCP schema to be accepted, actual processing happens later in the pipeline. Any processing failures that occur after the initial acceptance are captured in the Failed MCP topic, but these failures are not immediately surfaced to the API caller since they happen asynchronously.
+
+## Release Changelog
+---
+
+### v0.3.8
+
+- All changes in https://github.com/datahub-project/datahub/releases/tag/v0.14.1
+    - Note Breaking Changes: https://datahubproject.io/docs/how/updating-datahub/#0141
+
+- Breaking Changes
+    - Soft-deleted and SCIM suspended users are no longer able to access the UI/APIs with a pre-existing valid token
+
+- Bug Fixes
+  - Ingestion page sorts across all sources rather than just the ones loaded on the page.
+  - Data Products Preview cards now render correctly in scenarios where there are several fully filled out products in a list
+  - Snowflake tag propagation looks for case-insensitive table match on tables with special characters
+  - Lineage patch properly encodes special characters
+  - Fixed multiple bugs around lineage visualization's handling of graph cycles
+  - Fixed lineage filter node search on schema field level lineage
+  - Search csv export properly includes data products
+  - Properly show lineage to an upstream dbt source that has no further upstreams
+  - Soft-deleted & suspended users with valid tokens are rejected
+  - Fixes scroll behavior on quality tab with small screens
+  - Add backwards compatibility to the UI for old policy filters in the UI
+  - Fixes nesting logic in Properties tab for structured properties that prefix matched each other's qualified names
+  - Show error when editing help link if there is an error
+  - Fix UI bug on schema table when clicking hides part of table
+  - Fix rendering schema field references as structured property values to show field name, not urn
+  - Partially fix a bug where dbt sync back would generate invalid YAML. This won't happen anymore, but we might miss some changes because of it
+  - Stability and error message improvements for AI docs generation
+  - Various quality and performance improvements to AI classification
+  - Fix searching for nested columns in the Columns tab of Dataset profile page
+  - Remote Executor: make cron schedules in ingestions/assertions scheduler POSIX-compliant.
+  - Remote Executor: limit the number of automated restarts of aborted tasks.
+  - Remote Executor: always update task status synchronously.
+
+
+- Product
+    - [BETA] Introducing the new Navigation Bar / App redesign! Starting with this release, you can try out a new look and feel to your DataHub app. To enable this BETA feature, reach out to your Acryl representative.
+    - [BETA] Add ability to create tag propagation automations to downstream and sibling assets via the UI in the Automations tab
+    - Support the Notes feature for all entity types with profile pages
+    - Test notifications button is now easier to discover.
+    - UX polishes to the Assertions Assertions tab
+    - UX polishes to the Column sidebar
+    - UX polishes to column and table deprecation, including deprecation visible in lineage graph
+    - Add the ability to do AND for filters of a given type. For example, we now allow you to filter for assets that have tag1 AND tag2
+    - Combine sibling entities on home page insights
+    - Hardened structured properties feature by supporting broken references and adding better validation to the ID/qualified name
+    - Hardened forms feature by supporting invalid / unresolvable references
+    - Recurrent metadata sharing: Any assets shared between DataHub assets will be re-shared automatically once per day. 
+  
+
+- Platform
+    - Optional config to reduce Slack app permissions
+    - Support batch processing for MCP consumption to increase throughput of the Kafka consumer significantly
+    - Resumability for DataHub Upgrade jobs
+    - Async actions for Metadata Tests corner case where some actions could be missed has been fixed
+    - Structured Properties now have a stricter validation for no spaces in the qualified name
+    - Urn Validation logic has been improved to reduce delayed error conditions
+    - Database transaction and locking updates to fix conditions where retryable persistence exceptions would cause ingestion batches to fail
+    - Fix for Metadata Tests to support primitive PDL Typeref fields like timestamps
+    - Entity Versioning initial feature support, disabled by default and can be turned on via feature flag
+    - OpenAPI fixes for some faulty parameters
+    - Improved memory performance of the search ranking system ingestion source
+    - Remote Executor: Added registration/discovery mechanism.
+    - Remote Executor: Added weight-based task scheduling to allow variable concurrency for memory-greedy tasks.
+

From cb47577ac58f658189b24407c26a770685ca7c21 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Thu, 23 Jan 2025 11:45:22 -0800
Subject: [PATCH 157/249] docs(ingest/tableau): clarify impact of lower
 permissions (#12452)

---
 metadata-ingestion/docs/sources/tableau/tableau_pre.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/metadata-ingestion/docs/sources/tableau/tableau_pre.md b/metadata-ingestion/docs/sources/tableau/tableau_pre.md
index 65ff08367fdc8f..a3ac85818a51aa 100644
--- a/metadata-ingestion/docs/sources/tableau/tableau_pre.md
+++ b/metadata-ingestion/docs/sources/tableau/tableau_pre.md
@@ -16,9 +16,12 @@ Either way, the user/token must have the **Site Administrator Explorer** site ro
 
 :::info
 
-We need the `Site Administrator Explorer` site role in order to get complete metadata from Tableau.
+We need the **Site Administrator Explorer** site role in order to get complete metadata from Tableau.
 
-With any lower role, the Tableau Metadata API returns missing/partial metadata. This particularly affects data source fields and definitions, which impacts our ability to extract columns and generate column lineage. As such, other site roles like `Viewer` are insufficient with the current Tableau Metadata API.
+With any lower role, the Tableau Metadata API returns missing/partial metadata.
+This particularly affects data source fields and definitions, which impacts our ability to extract most columns and generate column lineage. Some table-level lineage is also impacted.
+
+Other site roles, including Site Administrator Creator and Viewer, are insufficient due to these limitations in the current Tableau Metadata API.
 
 :::
 

From 7ac0dc65e15a9ef7c8280bce63f344e799346ca3 Mon Sep 17 00:00:00 2001
From: ryota-cloud <ryota.egashira@acryl.io>
Date: Thu, 23 Jan 2025 17:58:06 -0800
Subject: [PATCH 158/249] Adding smoke test for batch ingestion throwing
 exception  (#12453)

---
 smoke-test/tests/restli/restli_test.py        |  2 +-
 .../restli/test_restli_batch_ingestion.py     | 54 ++++++++++++++++++-
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/smoke-test/tests/restli/restli_test.py b/smoke-test/tests/restli/restli_test.py
index a0c9a26750c0b0..c10ae3fe584f08 100644
--- a/smoke-test/tests/restli/restli_test.py
+++ b/smoke-test/tests/restli/restli_test.py
@@ -51,7 +51,7 @@ def make_mcp(self) -> MetadataChangeProposalClass:
         return mcp
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture(scope="module", autouse=True)
 def ingest_cleanup_data(auth_session, graph_client, request):
     yield
     delete_urns(graph_client, generated_urns)
diff --git a/smoke-test/tests/restli/test_restli_batch_ingestion.py b/smoke-test/tests/restli/test_restli_batch_ingestion.py
index 0e92988ed64703..ab33a2b26605db 100644
--- a/smoke-test/tests/restli/test_restli_batch_ingestion.py
+++ b/smoke-test/tests/restli/test_restli_batch_ingestion.py
@@ -3,6 +3,7 @@
 
 import pytest
 
+import datahub.metadata.schema_classes as models
 from datahub.emitter.mce_builder import make_dashboard_urn
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.emitter.serialization_helper import pre_json_transform
@@ -12,6 +13,7 @@
     ChangeAuditStampsClass,
     DashboardInfoClass,
 )
+from datahub.metadata.urns import MlModelUrn
 from tests.consistency_utils import wait_for_writes_to_sync
 from tests.restli.restli_test import MetadataChangeProposalInvalidWrapper
 from tests.utils import delete_urns
@@ -19,7 +21,7 @@
 generated_urns: List[str] = []
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture(scope="module", autouse=True)
 def ingest_cleanup_data(auth_session, graph_client, request):
     yield
     delete_urns(graph_client, generated_urns)
@@ -84,6 +86,29 @@ def _create_invalid_dashboard_mcp() -> MetadataChangeProposalClass:
     return mcp_invalid.make_mcp()
 
 
+def _create_invalid_dataset_mcps() -> List[MetadataChangeProposalWrapper]:
+    dataset_urn = "urn:li:dataset:(urn:li:dataPlatform:kafka,my_dataset,PROD)"
+    model_urn = MlModelUrn("mlflow", "my_model", "PROD").urn()
+    bad_mcps = [
+        MetadataChangeProposalWrapper(
+            entityUrn=dataset_urn,
+            aspect=models.StatusClass(removed=False),
+        ),
+        MetadataChangeProposalWrapper(
+            entityUrn=dataset_urn,
+            aspect=models.UpstreamLineageClass(
+                upstreams=[
+                    models.UpstreamClass(
+                        dataset=model_urn,
+                        type=models.DatasetLineageTypeClass.TRANSFORMED,
+                    )
+                ]
+            ),
+        ),
+    ]
+    return bad_mcps
+
+
 def test_restli_batch_ingestion_sync(graph_client):
     # Positive Test (all valid MetadataChangeProposal)
     mcps = _create_valid_dashboard_mcps()
@@ -133,3 +158,30 @@ def test_restli_batch_ingestion_async(graph_client):
     assert aspect.title == "Dummy Title For Testing"
     assert aspect.description == "Dummy Description For Testing"
     assert aspect.lastModified is not None
+
+
+def test_restli_batch_ingestion_exception_sync(graph_client):
+    """
+    Test Batch ingestion when an exception occurs in sync mode
+    """
+    bad_mcps = _create_invalid_dataset_mcps()
+    generated_urns.extend([mcp.entityUrn for mcp in bad_mcps if mcp.entityUrn])
+
+    try:
+        graph_client.emit_mcps(bad_mcps, async_flag=False)
+        raise AssertionError("should have thrown an exception")
+    except Exception as e:
+        if isinstance(e, AssertionError):
+            raise e
+        print(f"Error emitting MCPs due to {e}")
+
+
+def test_restli_batch_ingestion_exception_async(graph_client):
+    """
+    Test Batch ingestion when an exception occurs in async mode
+    """
+    bad_mcps = _create_invalid_dataset_mcps()
+    generated_urns.extend([mcp.entityUrn for mcp in bad_mcps if mcp.entityUrn])
+    # TODO expectation is that it throws exception, but it doesn't currently.this test case need to change after fix.
+    ret = graph_client.emit_mcps(bad_mcps, async_flag=True)
+    assert ret >= 0

From 86ed40c9041133e5da18655d76b8b2127d94bc4e Mon Sep 17 00:00:00 2001
From: Pedro Silva <pedro@acryl.io>
Date: Fri, 24 Jan 2025 07:27:32 +0000
Subject: [PATCH 159/249] fix(docs): Add links to new datahub cloud event
 source (#12450)

---
 docs/actions/sources/datahub-cloud-event-source.md    | 2 +-
 docs/managed-datahub/datahub-api/entity-events-api.md | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/actions/sources/datahub-cloud-event-source.md b/docs/actions/sources/datahub-cloud-event-source.md
index d1751ae2568676..656fe4a3a6329f 100644
--- a/docs/actions/sources/datahub-cloud-event-source.md
+++ b/docs/actions/sources/datahub-cloud-event-source.md
@@ -38,7 +38,7 @@ If you've configured your Action pipeline `failure_mode` to be `THROW`, then eve
 
 The DataHub Cloud Event Source produces
 
-- [Entity Change Event V1](../events/entity-change-event.md)
+- [Entity Change Event V1](../../managed-datahub/datahub-api/entity-events-api.md)
 
 Note that the DataHub Cloud Event Source does _not_ yet support the full [Metadata Change Log V1](../events/metadata-change-log-event.md) event stream.
 
diff --git a/docs/managed-datahub/datahub-api/entity-events-api.md b/docs/managed-datahub/datahub-api/entity-events-api.md
index e59f1650c7d766..377f2fd01e813b 100644
--- a/docs/managed-datahub/datahub-api/entity-events-api.md
+++ b/docs/managed-datahub/datahub-api/entity-events-api.md
@@ -15,6 +15,7 @@ The Events API allows you to integrate changes happening on the DataHub Metadata
 ### Supported Integrations
 
 * [AWS EventBridge](docs/managed-datahub/operator-guide/setting-up-events-api-on-aws-eventbridge.md)
+* [DataHub Cloud Event Source](docs/actions/sources/datahub-cloud-event-source.md)
 
 ### Use Cases
 

From f80d58d297653bb628f5b6e6cb4969b691af44eb Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Fri, 24 Jan 2025 00:42:33 -0800
Subject: [PATCH 160/249] fix(cli): ignore prereleases when suggesting upgrades
 (#12424)

---
 metadata-ingestion/src/datahub/upgrade/upgrade.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/metadata-ingestion/src/datahub/upgrade/upgrade.py b/metadata-ingestion/src/datahub/upgrade/upgrade.py
index fb14514588e5fc..7872681797d6fe 100644
--- a/metadata-ingestion/src/datahub/upgrade/upgrade.py
+++ b/metadata-ingestion/src/datahub/upgrade/upgrade.py
@@ -93,11 +93,11 @@ async def get_github_stats():
     async with aiohttp.ClientSession(
         headers={"Accept": "application/vnd.github.v3+json"}
     ) as session:
-        gh_url = "https://api.github.com/repos/datahub-project/datahub/releases"
+        gh_url = "https://api.github.com/repos/datahub-project/datahub/releases/latest"
         async with session.get(gh_url) as gh_response:
             gh_response_json = await gh_response.json()
-            latest_server_version = Version(gh_response_json[0].get("tag_name"))
-            latest_server_date = gh_response_json[0].get("published_at")
+            latest_server_version = Version(gh_response_json.get("tag_name"))
+            latest_server_date = gh_response_json.get("published_at")
             return (latest_server_version, latest_server_date)
 
 

From b701e0714ed4b08646d877dce4c0b3e430e0c257 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Fri, 24 Jan 2025 00:42:48 -0800
Subject: [PATCH 161/249] fix(ingest/clickhouse): remove unused
 lineage_properties code path (#12442)

---
 .../ingestion/source/sql/clickhouse.py        | 48 ++-----------------
 1 file changed, 5 insertions(+), 43 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/clickhouse.py b/metadata-ingestion/src/datahub/ingestion/source/sql/clickhouse.py
index a8208ca807ed02..a2db116cf20912 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/clickhouse.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/clickhouse.py
@@ -53,7 +53,6 @@
 )
 from datahub.metadata.schema_classes import (
     DatasetLineageTypeClass,
-    DatasetPropertiesClass,
     DatasetSnapshotClass,
     UpstreamClass,
 )
@@ -418,41 +417,11 @@ def get_workunits_internal(self) -> Iterable[Union[MetadataWorkUnit, SqlWorkUnit
                 dataset_snapshot: DatasetSnapshotClass = wu.metadata.proposedSnapshot
                 assert dataset_snapshot
 
-                lineage_mcp, lineage_properties_aspect = self.get_lineage_mcp(
-                    wu.metadata.proposedSnapshot.urn
-                )
+                lineage_mcp = self.get_lineage_mcp(wu.metadata.proposedSnapshot.urn)
 
                 if lineage_mcp is not None:
                     yield lineage_mcp.as_workunit()
 
-                if lineage_properties_aspect:
-                    aspects = dataset_snapshot.aspects
-                    if aspects is None:
-                        aspects = []
-
-                    dataset_properties_aspect: Optional[DatasetPropertiesClass] = None
-
-                    for aspect in aspects:
-                        if isinstance(aspect, DatasetPropertiesClass):
-                            dataset_properties_aspect = aspect
-
-                    if dataset_properties_aspect is None:
-                        dataset_properties_aspect = DatasetPropertiesClass()
-                        aspects.append(dataset_properties_aspect)
-
-                    custom_properties = (
-                        {
-                            **dataset_properties_aspect.customProperties,
-                            **lineage_properties_aspect.customProperties,
-                        }
-                        if dataset_properties_aspect.customProperties
-                        else lineage_properties_aspect.customProperties
-                    )
-                    dataset_properties_aspect.customProperties = custom_properties
-                    dataset_snapshot.aspects = aspects
-
-                    dataset_snapshot.aspects.append(dataset_properties_aspect)
-
             # Emit the work unit from super.
             yield wu
 
@@ -656,19 +625,16 @@ def _populate_lineage(self) -> None:
 
     def get_lineage_mcp(
         self, dataset_urn: str
-    ) -> Tuple[
-        Optional[MetadataChangeProposalWrapper], Optional[DatasetPropertiesClass]
-    ]:
+    ) -> Optional[MetadataChangeProposalWrapper]:
         dataset_key = mce_builder.dataset_urn_to_key(dataset_urn)
         if dataset_key is None:
-            return None, None
+            return None
 
         if not self._lineage_map:
             self._populate_lineage()
         assert self._lineage_map is not None
 
         upstream_lineage: List[UpstreamClass] = []
-        custom_properties: Dict[str, str] = {}
 
         if dataset_key.name in self._lineage_map:
             item = self._lineage_map[dataset_key.name]
@@ -684,16 +650,12 @@ def get_lineage_mcp(
                 )
                 upstream_lineage.append(upstream_table)
 
-        properties = None
-        if custom_properties:
-            properties = DatasetPropertiesClass(customProperties=custom_properties)
-
         if not upstream_lineage:
-            return None, properties
+            return None
 
         mcp = MetadataChangeProposalWrapper(
             entityUrn=dataset_urn,
             aspect=UpstreamLineage(upstreams=upstream_lineage),
         )
 
-        return mcp, properties
+        return mcp

From f8149084a1826bfd67c5708372ce5e64eaa0c05d Mon Sep 17 00:00:00 2001
From: Saketh Varma <sakethvarma397@gmail.com>
Date: Fri, 24 Jan 2025 14:14:34 +0530
Subject: [PATCH 162/249] fix(ui): fetch Data Products always from the network
 (#11165)

Co-authored-by: Aseem Bansal <asmbansal2@gmail.com>
---
 .../src/app/entity/domain/DataProductsTab/DataProductsTab.tsx    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductsTab.tsx b/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductsTab.tsx
index 15cc99127f3500..39f89979dd95a0 100644
--- a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductsTab.tsx
+++ b/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductsTab.tsx
@@ -68,6 +68,7 @@ export default function DataProductsTab() {
                 searchFlags: { skipCache: true },
             },
         },
+        fetchPolicy: 'no-cache',
     });
     const totalResults = data?.searchAcrossEntities?.total || 0;
     const searchResults = data?.searchAcrossEntities?.searchResults?.map((r) => r.entity) || [];

From 0f538d8df2ce26bdc7f46757e95c2c9735d40182 Mon Sep 17 00:00:00 2001
From: Mayuri Nehate <33225191+mayurinehate@users.noreply.github.com>
Date: Fri, 24 Jan 2025 14:51:52 +0530
Subject: [PATCH 163/249] fix(ingest): fix reporting for missing secure view
 lineage (#12430)

Co-authored-by: Harshal Sheth <hsheth2@gmail.com>
---
 .../source/snowflake/snowflake_schema_gen.py  | 24 +++++---
 .../snowflake/test_snowflake_failures.py      | 60 +++++++++++++++++++
 2 files changed, 77 insertions(+), 7 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
index a2d69d9e552916..04bc51f1ebd3f5 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
@@ -491,15 +491,25 @@ def fetch_secure_view_definition(
         try:
             view_definitions = self.data_dictionary.get_secure_view_definitions()
             return view_definitions[db_name][schema_name][table_name]
+        except KeyError:
+            # Received secure view definitions but the view is not present in results
+            self.structured_reporter.info(
+                title="Secure view definition not found",
+                message="Lineage will be missing for the view.",
+                context=f"{db_name}.{schema_name}.{table_name}",
+            )
+            return None
         except Exception as e:
-            if isinstance(e, SnowflakePermissionError):
-                error_msg = (
-                    "Failed to get secure views definitions. Please check permissions."
-                )
-            else:
-                error_msg = "Failed to get secure views definitions"
+            action_msg = (
+                "Please check permissions."
+                if isinstance(e, SnowflakePermissionError)
+                else ""
+            )
+
             self.structured_reporter.warning(
-                error_msg,
+                title="Failed to get secure views definitions",
+                message=f"Lineage will be missing for the view. {action_msg}",
+                context=f"{db_name}.{schema_name}.{table_name}",
                 exc=e,
             )
             return None
diff --git a/metadata-ingestion/tests/integration/snowflake/test_snowflake_failures.py b/metadata-ingestion/tests/integration/snowflake/test_snowflake_failures.py
index de6e996a52642b..4cb6cec4906efa 100644
--- a/metadata-ingestion/tests/integration/snowflake/test_snowflake_failures.py
+++ b/metadata-ingestion/tests/integration/snowflake/test_snowflake_failures.py
@@ -260,3 +260,63 @@ def test_snowflake_missing_snowflake_operations_permission_causes_pipeline_failu
         assert "usage-permission-error" in [
             failure.message for failure in pipeline.source.get_report().failures
         ]
+
+
+@freeze_time(FROZEN_TIME)
+def test_snowflake_missing_snowflake_secure_view_definitions_raises_pipeline_info(
+    pytestconfig,
+    snowflake_pipeline_config,
+):
+    with mock.patch("snowflake.connector.connect") as mock_connect:
+        sf_connection = mock.MagicMock()
+        sf_cursor = mock.MagicMock()
+        mock_connect.return_value = sf_connection
+        sf_connection.cursor.return_value = sf_cursor
+
+        # Empty secure view definitions
+        sf_cursor.execute.side_effect = query_permission_response_override(
+            default_query_results,
+            [snowflake_query.SnowflakeQuery.get_secure_view_definitions()],
+            [],
+        )
+        pipeline = Pipeline(snowflake_pipeline_config)
+        pipeline.run()
+
+        pipeline.raise_from_status(raise_warnings=True)
+        assert pipeline.source.get_report().infos.as_obj() == [
+            {
+                "title": "Secure view definition not found",
+                "message": "Lineage will be missing for the view.",
+                "context": ["TEST_DB.TEST_SCHEMA.VIEW_1"],
+            }
+        ]
+
+
+@freeze_time(FROZEN_TIME)
+def test_snowflake_failed_secure_view_definitions_query_raises_pipeline_warning(
+    pytestconfig,
+    snowflake_pipeline_config,
+):
+    with mock.patch("snowflake.connector.connect") as mock_connect:
+        sf_connection = mock.MagicMock()
+        sf_cursor = mock.MagicMock()
+        mock_connect.return_value = sf_connection
+        sf_connection.cursor.return_value = sf_cursor
+
+        # Error in getting secure view definitions
+        sf_cursor.execute.side_effect = query_permission_error_override(
+            default_query_results,
+            [snowflake_query.SnowflakeQuery.get_secure_view_definitions()],
+            "Database 'SNOWFLAKE' does not exist or not authorized.",
+        )
+        pipeline = Pipeline(snowflake_pipeline_config)
+        pipeline.run()
+        assert pipeline.source.get_report().warnings.as_obj() == [
+            {
+                "title": "Failed to get secure views definitions",
+                "message": "Lineage will be missing for the view. Please check permissions.",
+                "context": [
+                    "TEST_DB.TEST_SCHEMA.VIEW_1 <class 'datahub.ingestion.source.snowflake.snowflake_connection.SnowflakePermissionError'>: Database 'SNOWFLAKE' does not exist or not authorized."
+                ],
+            }
+        ]

From a8d6c54965006462cf5f2fc5f9029ff517fb5a40 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Fri, 24 Jan 2025 11:35:39 -0800
Subject: [PATCH 164/249] feat(sdk): move version info to dedicated file
 (#12456)

---
 .../datahub-ingestion-base/smoke.Dockerfile   |  6 +-
 docker/datahub-ingestion/Dockerfile           |  8 +-
 docker/datahub-ingestion/Dockerfile-slim-only |  4 +-
 .../airflow-plugin/.gitignore                 |  1 -
 .../airflow-plugin/scripts/release.sh         | 25 +++---
 .../airflow-plugin/setup.py                   |  2 +-
 .../src/datahub_airflow_plugin/__init__.py    | 19 +----
 .../src/datahub_airflow_plugin/_version.py    |  3 +
 .../datahub_airflow_plugin/datahub_plugin.py  |  2 +-
 .../dagster-plugin/.gitignore                 |  1 -
 .../dagster-plugin/scripts/release.sh         | 25 +++---
 .../dagster-plugin/setup.py                   |  2 +-
 .../src/datahub_dagster_plugin/__init__.py    | 22 +----
 .../src/datahub_dagster_plugin/_version.py    |  3 +
 .../gx-plugin/.gitignore                      |  1 -
 .../gx-plugin/scripts/release.sh              | 25 +++---
 metadata-ingestion-modules/gx-plugin/setup.py |  2 +-
 .../src/datahub_gx_plugin/__init__.py         | 22 +----
 .../src/datahub_gx_plugin/_version.py         |  3 +
 .../prefect-plugin/.gitignore                 |  1 -
 .../prefect-plugin/scripts/release.sh         | 25 +++---
 .../prefect-plugin/setup.py                   |  6 +-
 .../src/prefect_datahub/__init__.py           | 22 +----
 .../src/prefect_datahub/_version.py           |  3 +
 metadata-ingestion/.gitignore                 |  1 -
 metadata-ingestion/scripts/release.sh         | 25 +++---
 metadata-ingestion/setup.py                   | 17 ++--
 metadata-ingestion/src/datahub/__init__.py    | 26 +-----
 metadata-ingestion/src/datahub/_version.py    | 13 +++
 .../src/datahub/cli/check_cli.py              |  2 +-
 .../src/datahub/cli/cli_utils.py              |  6 +-
 .../src/datahub/cli/ingest_cli.py             |  4 +-
 .../src/datahub/emitter/rest_emitter.py       |  2 +-
 metadata-ingestion/src/datahub/entrypoints.py | 10 +--
 .../src/datahub/ingestion/api/registry.py     |  2 +-
 .../datahub_ingestion_run_summary_provider.py |  2 +-
 .../src/datahub/ingestion/run/connection.py   |  2 +-
 .../src/datahub/ingestion/run/pipeline.py     |  6 +-
 .../datahub/ingestion/source/unity/proxy.py   |  4 +-
 .../src/datahub/telemetry/telemetry.py        |  8 +-
 .../src/datahub/testing/check_imports.py      | 28 ++++++
 .../src/datahub/upgrade/upgrade.py            |  2 +-
 .../tests/unit/test_packages.py               |  6 +-
 .../tests/unit/test_packaging.py              |  4 +-
 python-build/generate_release_scripts.py      | 85 +++++++++++++++++++
 45 files changed, 277 insertions(+), 211 deletions(-)
 create mode 100644 metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_version.py
 create mode 100644 metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/_version.py
 create mode 100644 metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/_version.py
 create mode 100644 metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/_version.py
 create mode 100644 metadata-ingestion/src/datahub/_version.py
 create mode 100644 python-build/generate_release_scripts.py

diff --git a/docker/datahub-ingestion-base/smoke.Dockerfile b/docker/datahub-ingestion-base/smoke.Dockerfile
index 34654faaad729d..81a6bd0e20cacc 100644
--- a/docker/datahub-ingestion-base/smoke.Dockerfile
+++ b/docker/datahub-ingestion-base/smoke.Dockerfile
@@ -20,9 +20,9 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
 COPY . /datahub-src
 ARG RELEASE_VERSION
 RUN cd /datahub-src && \
-    sed -i.bak "s/__version__ = \"1\!0.0.0.dev0\"/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" metadata-ingestion/src/datahub/__init__.py && \
-    sed -i.bak "s/__version__ = \"1\!0.0.0.dev0\"/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/__init__.py && \
-    cat metadata-ingestion/src/datahub/__init__.py && \
+    sed -i.bak "s/__version__ = .*$/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" metadata-ingestion/src/datahub/_version.py && \
+    sed -i.bak "s/__version__ = .*$/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_version.py && \
+    cat metadata-ingestion/src/datahub/_version.py && \
     ./gradlew :metadata-ingestion:codegen && \
     pip install file:metadata-ingestion-modules/airflow-plugin#egg=acryl-datahub-airflow-plugin file:metadata-ingestion#egg=acryl-datahub
 
diff --git a/docker/datahub-ingestion/Dockerfile b/docker/datahub-ingestion/Dockerfile
index ee0333e1cb1d1f..a9fd3a6662d1bb 100644
--- a/docker/datahub-ingestion/Dockerfile
+++ b/docker/datahub-ingestion/Dockerfile
@@ -26,10 +26,10 @@ COPY --chown=datahub ./metadata-ingestion-modules/airflow-plugin /metadata-inges
 
 ARG RELEASE_VERSION
 WORKDIR /metadata-ingestion
-RUN sed -i.bak "s/__version__ = \"1\!0.0.0.dev0\"/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" src/datahub/__init__.py && \
-    sed -i.bak "s/__version__ = \"1\!0.0.0.dev0\"/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" airflow-plugin/src/datahub_airflow_plugin/__init__.py && \
-    cat src/datahub/__init__.py | grep __version__ && \
-    cat airflow-plugin/src/datahub_airflow_plugin/__init__.py | grep __version__
+RUN sed -i.bak "s/__version__ = .*$/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" src/datahub/_version.py && \
+    sed -i.bak "s/__version__ = .*$/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" airflow-plugin/src/datahub_airflow_plugin/_version.py && \
+    cat src/datahub/_version.py | grep __version__ && \
+    cat airflow-plugin/src/datahub_airflow_plugin/_version.py | grep __version__
 
 FROM base AS slim-install
 
diff --git a/docker/datahub-ingestion/Dockerfile-slim-only b/docker/datahub-ingestion/Dockerfile-slim-only
index 6ade262f2feded..80abff204df9f2 100644
--- a/docker/datahub-ingestion/Dockerfile-slim-only
+++ b/docker/datahub-ingestion/Dockerfile-slim-only
@@ -15,8 +15,8 @@ COPY --chown=datahub ./metadata-ingestion /metadata-ingestion
 
 ARG RELEASE_VERSION
 WORKDIR /metadata-ingestion
-RUN sed -i.bak "s/__version__ = \"1\!0.0.0.dev0\"/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" src/datahub/__init__.py && \
-    cat src/datahub/__init__.py
+RUN sed -i.bak "s/__version__ = .*$/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" src/datahub/_version.py && \
+    cat src/datahub/_version.py
 
 FROM base as slim-install
 
diff --git a/metadata-ingestion-modules/airflow-plugin/.gitignore b/metadata-ingestion-modules/airflow-plugin/.gitignore
index d0108e8361a060..6801b785ea1e4b 100644
--- a/metadata-ingestion-modules/airflow-plugin/.gitignore
+++ b/metadata-ingestion-modules/airflow-plugin/.gitignore
@@ -1,5 +1,4 @@
 .envrc
-src/datahub_airflow_plugin/__init__.py.bak
 .vscode/
 output
 pvenv36/
diff --git a/metadata-ingestion-modules/airflow-plugin/scripts/release.sh b/metadata-ingestion-modules/airflow-plugin/scripts/release.sh
index 8f23f72082c2ca..994c1ae145ce55 100755
--- a/metadata-ingestion-modules/airflow-plugin/scripts/release.sh
+++ b/metadata-ingestion-modules/airflow-plugin/scripts/release.sh
@@ -1,26 +1,31 @@
 #!/bin/bash
+# Auto-generated by python-build/generate_release_scripts.py. Do not edit manually.
+
 set -euxo pipefail
 
+ROOT=../..
+MODULE=datahub_airflow_plugin
+
 if [[ ! ${RELEASE_SKIP_TEST:-} ]] && [[ ! ${RELEASE_SKIP_INSTALL:-} ]]; then
-	../../gradlew build  # also runs tests
+    ${ROOT}/gradlew build  # also runs tests
 elif [[ ! ${RELEASE_SKIP_INSTALL:-} ]]; then
-	../../gradlew install
+    ${ROOT}/gradlew install
 fi
 
-MODULE=datahub_airflow_plugin
-
 # Check packaging constraint.
 python -c 'import setuptools; where="./src"; assert setuptools.find_packages(where) == setuptools.find_namespace_packages(where), "you seem to be missing or have extra __init__.py files"'
-if [[ ${RELEASE_VERSION:-} ]]; then
-    # Replace version with RELEASE_VERSION env variable
-    sed -i.bak "s/__version__ = \"1\!0.0.0.dev0\"/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" src/${MODULE}/__init__.py
-else
-    vim src/${MODULE}/__init__.py
+
+# Update the release version.
+if [[ ! ${RELEASE_VERSION:-} ]]; then
+    echo "RELEASE_VERSION is not set"
+    exit 1
 fi
+sed -i.bak "s/__version__ = .*$/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" src/${MODULE}/_version.py
 
+# Build and upload the release.
 rm -rf build dist || true
 python -m build
 if [[ ! ${RELEASE_SKIP_UPLOAD:-} ]]; then
     python -m twine upload 'dist/*'
 fi
-mv src/${MODULE}/__init__.py.bak src/${MODULE}/__init__.py
+mv src/${MODULE}/_version.py.bak src/${MODULE}/_version.py
diff --git a/metadata-ingestion-modules/airflow-plugin/setup.py b/metadata-ingestion-modules/airflow-plugin/setup.py
index 58c04158957ccd..d03ed824c9a261 100644
--- a/metadata-ingestion-modules/airflow-plugin/setup.py
+++ b/metadata-ingestion-modules/airflow-plugin/setup.py
@@ -5,7 +5,7 @@
 import setuptools
 
 package_metadata: dict = {}
-with open("./src/datahub_airflow_plugin/__init__.py") as fp:
+with open("./src/datahub_airflow_plugin/_version.py") as fp:
     exec(fp.read(), package_metadata)
 
 
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/__init__.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/__init__.py
index e4040e3a17dfdc..7743c8ab2bab1a 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/__init__.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/__init__.py
@@ -1,23 +1,12 @@
-# Published at https://pypi.org/project/acryl-datahub/.
-__package_name__ = "acryl-datahub-airflow-plugin"
-__version__ = "1!0.0.0.dev0"
+from datahub_airflow_plugin._version import __package_name__, __version__
 
 
-def is_dev_mode() -> bool:
-    return __version__.endswith("dev0")
-
-
-def nice_version_name() -> str:
-    if is_dev_mode():
-        return "unavailable (installed in develop mode)"
-    return __version__
-
-
-def get_provider_info():
+def get_provider_info() -> dict:
+    # Register our hooks with Airflow.
     return {
         "package-name": f"{__package_name__}",
         "name": f"{__package_name__}",
-        "description": "Datahub metadata collector plugin",
+        "description": "DataHub metadata collector plugin",
         "connection-types": [
             {
                 "hook-class-name": "datahub_airflow_plugin.hooks.datahub.DatahubRestHook",
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_version.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_version.py
new file mode 100644
index 00000000000000..efda3f6bf31247
--- /dev/null
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_version.py
@@ -0,0 +1,3 @@
+# Published at https://pypi.org/project/acryl-datahub-airflow-plugin/.
+__package_name__ = "acryl-datahub-airflow-plugin"
+__version__ = "1!0.0.0.dev0"
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin.py
index 7638720db023ac..2aeaaee4a542d4 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin.py
@@ -4,12 +4,12 @@
 
 from airflow.plugins_manager import AirflowPlugin
 
-from datahub_airflow_plugin import __package_name__
 from datahub_airflow_plugin._airflow_compat import AIRFLOW_PATCHED
 from datahub_airflow_plugin._airflow_shims import (
     HAS_AIRFLOW_LISTENER_API,
     NEEDS_AIRFLOW_LISTENER_MODULE,
 )
+from datahub_airflow_plugin._version import __package_name__
 
 assert AIRFLOW_PATCHED
 logger = logging.getLogger(__name__)
diff --git a/metadata-ingestion-modules/dagster-plugin/.gitignore b/metadata-ingestion-modules/dagster-plugin/.gitignore
index 4ff42af3e16cff..6801b785ea1e4b 100644
--- a/metadata-ingestion-modules/dagster-plugin/.gitignore
+++ b/metadata-ingestion-modules/dagster-plugin/.gitignore
@@ -1,5 +1,4 @@
 .envrc
-src/datahub_dagster_plugin/__init__.py.bak
 .vscode/
 output
 pvenv36/
diff --git a/metadata-ingestion-modules/dagster-plugin/scripts/release.sh b/metadata-ingestion-modules/dagster-plugin/scripts/release.sh
index 10cb816d9ffc04..ffd5201574891c 100755
--- a/metadata-ingestion-modules/dagster-plugin/scripts/release.sh
+++ b/metadata-ingestion-modules/dagster-plugin/scripts/release.sh
@@ -1,26 +1,31 @@
 #!/bin/bash
+# Auto-generated by python-build/generate_release_scripts.py. Do not edit manually.
+
 set -euxo pipefail
 
+ROOT=../..
+MODULE=datahub_dagster_plugin
+
 if [[ ! ${RELEASE_SKIP_TEST:-} ]] && [[ ! ${RELEASE_SKIP_INSTALL:-} ]]; then
-	../../gradlew build  # also runs tests
+    ${ROOT}/gradlew build  # also runs tests
 elif [[ ! ${RELEASE_SKIP_INSTALL:-} ]]; then
-	../../gradlew install
+    ${ROOT}/gradlew install
 fi
 
-MODULE=datahub_dagster_plugin
-
 # Check packaging constraint.
 python -c 'import setuptools; where="./src"; assert setuptools.find_packages(where) == setuptools.find_namespace_packages(where), "you seem to be missing or have extra __init__.py files"'
-if [[ ${RELEASE_VERSION:-} ]]; then
-    # Replace version with RELEASE_VERSION env variable
-    sed -i.bak "s/__version__ = \"1\!0.0.0.dev0\"/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" src/${MODULE}/__init__.py
-else
-    vim src/${MODULE}/__init__.py
+
+# Update the release version.
+if [[ ! ${RELEASE_VERSION:-} ]]; then
+    echo "RELEASE_VERSION is not set"
+    exit 1
 fi
+sed -i.bak "s/__version__ = .*$/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" src/${MODULE}/_version.py
 
+# Build and upload the release.
 rm -rf build dist || true
 python -m build
 if [[ ! ${RELEASE_SKIP_UPLOAD:-} ]]; then
     python -m twine upload 'dist/*'
 fi
-mv src/${MODULE}/__init__.py.bak src/${MODULE}/__init__.py
+mv src/${MODULE}/_version.py.bak src/${MODULE}/_version.py
diff --git a/metadata-ingestion-modules/dagster-plugin/setup.py b/metadata-ingestion-modules/dagster-plugin/setup.py
index 09859b6c4344e3..6e2e013f719f51 100644
--- a/metadata-ingestion-modules/dagster-plugin/setup.py
+++ b/metadata-ingestion-modules/dagster-plugin/setup.py
@@ -4,7 +4,7 @@
 import setuptools
 
 package_metadata: dict = {}
-with open("./src/datahub_dagster_plugin/__init__.py") as fp:
+with open("./src/datahub_dagster_plugin/_version.py") as fp:
     exec(fp.read(), package_metadata)
 
 
diff --git a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/__init__.py b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/__init__.py
index 1c7d60666a085f..20baf254135355 100644
--- a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/__init__.py
+++ b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/__init__.py
@@ -1,21 +1 @@
-# Published at https://pypi.org/project/acryl-datahub/.
-__package_name__ = "acryl-datahub-dagster-plugin"
-__version__ = "1!0.0.0.dev0"
-
-
-def is_dev_mode() -> bool:
-    return __version__.endswith("dev0")
-
-
-def nice_version_name() -> str:
-    if is_dev_mode():
-        return "unavailable (installed in develop mode)"
-    return __version__
-
-
-def get_provider_info():
-    return {
-        "package-name": f"{__package_name__}",
-        "name": f"{__package_name__}",
-        "description": "Datahub metadata collector plugin",
-    }
+from datahub_dagster_plugin._version import __package_name__, __version__
diff --git a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/_version.py b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/_version.py
new file mode 100644
index 00000000000000..e287b6bf32f5dc
--- /dev/null
+++ b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/_version.py
@@ -0,0 +1,3 @@
+# Published at https://pypi.org/project/acryl-datahub-dagster-plugin/.
+__package_name__ = "acryl-datahub-dagster-plugin"
+__version__ = "1!0.0.0.dev0"
diff --git a/metadata-ingestion-modules/gx-plugin/.gitignore b/metadata-ingestion-modules/gx-plugin/.gitignore
index 8c01744589e35e..6801b785ea1e4b 100644
--- a/metadata-ingestion-modules/gx-plugin/.gitignore
+++ b/metadata-ingestion-modules/gx-plugin/.gitignore
@@ -1,5 +1,4 @@
 .envrc
-src/datahub_gx_plugin/__init__.py.bak
 .vscode/
 output
 pvenv36/
diff --git a/metadata-ingestion-modules/gx-plugin/scripts/release.sh b/metadata-ingestion-modules/gx-plugin/scripts/release.sh
index 058add495821cb..06605f03a78aa3 100755
--- a/metadata-ingestion-modules/gx-plugin/scripts/release.sh
+++ b/metadata-ingestion-modules/gx-plugin/scripts/release.sh
@@ -1,26 +1,31 @@
 #!/bin/bash
+# Auto-generated by python-build/generate_release_scripts.py. Do not edit manually.
+
 set -euxo pipefail
 
+ROOT=../..
+MODULE=datahub_gx_plugin
+
 if [[ ! ${RELEASE_SKIP_TEST:-} ]] && [[ ! ${RELEASE_SKIP_INSTALL:-} ]]; then
-	../../gradlew build  # also runs tests
+    ${ROOT}/gradlew build  # also runs tests
 elif [[ ! ${RELEASE_SKIP_INSTALL:-} ]]; then
-	../../gradlew install
+    ${ROOT}/gradlew install
 fi
 
-MODULE=datahub_gx_plugin
-
 # Check packaging constraint.
 python -c 'import setuptools; where="./src"; assert setuptools.find_packages(where) == setuptools.find_namespace_packages(where), "you seem to be missing or have extra __init__.py files"'
-if [[ ${RELEASE_VERSION:-} ]]; then
-    # Replace version with RELEASE_VERSION env variable
-    sed -i.bak "s/__version__ = \"1\!0.0.0.dev0\"/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" src/${MODULE}/__init__.py
-else
-    vim src/${MODULE}/__init__.py
+
+# Update the release version.
+if [[ ! ${RELEASE_VERSION:-} ]]; then
+    echo "RELEASE_VERSION is not set"
+    exit 1
 fi
+sed -i.bak "s/__version__ = .*$/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" src/${MODULE}/_version.py
 
+# Build and upload the release.
 rm -rf build dist || true
 python -m build
 if [[ ! ${RELEASE_SKIP_UPLOAD:-} ]]; then
     python -m twine upload 'dist/*'
 fi
-mv src/${MODULE}/__init__.py.bak src/${MODULE}/__init__.py
+mv src/${MODULE}/_version.py.bak src/${MODULE}/_version.py
diff --git a/metadata-ingestion-modules/gx-plugin/setup.py b/metadata-ingestion-modules/gx-plugin/setup.py
index fbc4097388993f..43495673a7ff12 100644
--- a/metadata-ingestion-modules/gx-plugin/setup.py
+++ b/metadata-ingestion-modules/gx-plugin/setup.py
@@ -4,7 +4,7 @@
 import setuptools
 
 package_metadata: dict = {}
-with open("./src/datahub_gx_plugin/__init__.py") as fp:
+with open("./src/datahub_gx_plugin/_version.py") as fp:
     exec(fp.read(), package_metadata)
 
 
diff --git a/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/__init__.py b/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/__init__.py
index a7689be82a5d99..b3f8638c28088d 100644
--- a/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/__init__.py
+++ b/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/__init__.py
@@ -1,21 +1 @@
-# Published at https://pypi.org/project/acryl-datahub/.
-__package_name__ = "acryl-datahub-gx-plugin"
-__version__ = "1!0.0.0.dev0"
-
-
-def is_dev_mode() -> bool:
-    return __version__.endswith("dev0")
-
-
-def nice_version_name() -> str:
-    if is_dev_mode():
-        return "unavailable (installed in develop mode)"
-    return __version__
-
-
-def get_provider_info():
-    return {
-        "package-name": f"{__package_name__}",
-        "name": f"{__package_name__}",
-        "description": "Datahub metadata collector plugin",
-    }
+from datahub_gx_plugin._version import __package_name__, __version__
diff --git a/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/_version.py b/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/_version.py
new file mode 100644
index 00000000000000..02dbb70a9b4833
--- /dev/null
+++ b/metadata-ingestion-modules/gx-plugin/src/datahub_gx_plugin/_version.py
@@ -0,0 +1,3 @@
+# Published at https://pypi.org/project/acryl-datahub-gx-plugin/.
+__package_name__ = "acryl-datahub-gx-plugin"
+__version__ = "1!0.0.0.dev0"
diff --git a/metadata-ingestion-modules/prefect-plugin/.gitignore b/metadata-ingestion-modules/prefect-plugin/.gitignore
index 1d2916d00eabde..6801b785ea1e4b 100644
--- a/metadata-ingestion-modules/prefect-plugin/.gitignore
+++ b/metadata-ingestion-modules/prefect-plugin/.gitignore
@@ -1,5 +1,4 @@
 .envrc
-src/prefect_datahub/__init__.py.bak
 .vscode/
 output
 pvenv36/
diff --git a/metadata-ingestion-modules/prefect-plugin/scripts/release.sh b/metadata-ingestion-modules/prefect-plugin/scripts/release.sh
index f398db98b60290..b3b99d61c904a3 100755
--- a/metadata-ingestion-modules/prefect-plugin/scripts/release.sh
+++ b/metadata-ingestion-modules/prefect-plugin/scripts/release.sh
@@ -1,26 +1,31 @@
 #!/bin/bash
+# Auto-generated by python-build/generate_release_scripts.py. Do not edit manually.
+
 set -euxo pipefail
 
+ROOT=../..
+MODULE=prefect_datahub
+
 if [[ ! ${RELEASE_SKIP_TEST:-} ]] && [[ ! ${RELEASE_SKIP_INSTALL:-} ]]; then
-	../../gradlew build  # also runs tests
+    ${ROOT}/gradlew build  # also runs tests
 elif [[ ! ${RELEASE_SKIP_INSTALL:-} ]]; then
-	../../gradlew install
+    ${ROOT}/gradlew install
 fi
 
-MODULE=prefect_datahub
-
 # Check packaging constraint.
 python -c 'import setuptools; where="./src"; assert setuptools.find_packages(where) == setuptools.find_namespace_packages(where), "you seem to be missing or have extra __init__.py files"'
-if [[ ${RELEASE_VERSION:-} ]]; then
-    # Replace version with RELEASE_VERSION env variable
-    sed -i.bak "s/__version__ = \"1\!0.0.0.dev0\"/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" src/${MODULE}/__init__.py
-else
-    vim src/${MODULE}/__init__.py
+
+# Update the release version.
+if [[ ! ${RELEASE_VERSION:-} ]]; then
+    echo "RELEASE_VERSION is not set"
+    exit 1
 fi
+sed -i.bak "s/__version__ = .*$/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" src/${MODULE}/_version.py
 
+# Build and upload the release.
 rm -rf build dist || true
 python -m build
 if [[ ! ${RELEASE_SKIP_UPLOAD:-} ]]; then
     python -m twine upload 'dist/*'
 fi
-mv src/${MODULE}/__init__.py.bak src/${MODULE}/__init__.py
\ No newline at end of file
+mv src/${MODULE}/_version.py.bak src/${MODULE}/_version.py
diff --git a/metadata-ingestion-modules/prefect-plugin/setup.py b/metadata-ingestion-modules/prefect-plugin/setup.py
index 1d56cae8d938a2..87feb810b8e5a6 100644
--- a/metadata-ingestion-modules/prefect-plugin/setup.py
+++ b/metadata-ingestion-modules/prefect-plugin/setup.py
@@ -4,7 +4,7 @@
 import setuptools
 
 package_metadata: dict = {}
-with open("./src/prefect_datahub/__init__.py") as fp:
+with open("./src/prefect_datahub/_version.py") as fp:
     exec(fp.read(), package_metadata)
 
 
@@ -30,9 +30,7 @@ def get_long_description():
     # Temporary pinning to 2.0.0 until we can upgrade to 3.0.0
     "prefect >= 2.0.0,<3.0.0",
     *rest_common,
-    # Ignoring the dependency below because it causes issues with the vercel built wheel install
-    # f"acryl-datahub[datahub-rest]{_self_pin}",
-    "acryl-datahub[datahub-rest]",
+    f"acryl-datahub[datahub-rest]{_self_pin}",
 }
 
 
diff --git a/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/__init__.py b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/__init__.py
index 8cc65f9010613d..f38863a1f31e28 100644
--- a/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/__init__.py
+++ b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/__init__.py
@@ -1,21 +1 @@
-# Published at https://pypi.org/project/acryl-datahub/.
-__package_name__ = "prefect-datahub"
-__version__ = "1!0.0.0.dev0"
-
-
-def is_dev_mode() -> bool:
-    return __version__.endswith("dev0")
-
-
-def nice_version_name() -> str:
-    if is_dev_mode():
-        return "unavailable (installed in develop mode)"
-    return __version__
-
-
-def get_provider_info():
-    return {
-        "package-name": f"{__package_name__}",
-        "name": f"{__package_name__}",
-        "description": "Datahub prefect block to capture executions and send to Datahub",
-    }
+from prefect_datahub._version import __package_name__, __version__
diff --git a/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/_version.py b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/_version.py
new file mode 100644
index 00000000000000..8c45e7d04b3679
--- /dev/null
+++ b/metadata-ingestion-modules/prefect-plugin/src/prefect_datahub/_version.py
@@ -0,0 +1,3 @@
+# Published at https://pypi.org/project/prefect-datahub/.
+__package_name__ = "prefect-datahub"
+__version__ = "1!0.0.0.dev0"
diff --git a/metadata-ingestion/.gitignore b/metadata-ingestion/.gitignore
index acc15c45988698..c7a781ded1d688 100644
--- a/metadata-ingestion/.gitignore
+++ b/metadata-ingestion/.gitignore
@@ -1,5 +1,4 @@
 .envrc
-src/datahub/__init__.py.bak
 .vscode/
 output
 pvenv36/
diff --git a/metadata-ingestion/scripts/release.sh b/metadata-ingestion/scripts/release.sh
index a18dd6f934b431..9b4e62aef581ae 100755
--- a/metadata-ingestion/scripts/release.sh
+++ b/metadata-ingestion/scripts/release.sh
@@ -1,26 +1,31 @@
 #!/bin/bash
+# Auto-generated by python-build/generate_release_scripts.py. Do not edit manually.
+
 set -euxo pipefail
 
+ROOT=..
+MODULE=datahub
+
 if [[ ! ${RELEASE_SKIP_TEST:-} ]] && [[ ! ${RELEASE_SKIP_INSTALL:-} ]]; then
-	../gradlew build  # also runs tests
+    ${ROOT}/gradlew build  # also runs tests
 elif [[ ! ${RELEASE_SKIP_INSTALL:-} ]]; then
-	../gradlew install
+    ${ROOT}/gradlew install
 fi
 
-MODULE=datahub
-
 # Check packaging constraint.
 python -c 'import setuptools; where="./src"; assert setuptools.find_packages(where) == setuptools.find_namespace_packages(where), "you seem to be missing or have extra __init__.py files"'
-if [[ ${RELEASE_VERSION:-} ]]; then
-    # Replace version with RELEASE_VERSION env variable
-    sed -i.bak "s/__version__ = \"1\!0.0.0.dev0\"/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" src/${MODULE}/__init__.py
-else
-    vim src/${MODULE}/__init__.py
+
+# Update the release version.
+if [[ ! ${RELEASE_VERSION:-} ]]; then
+    echo "RELEASE_VERSION is not set"
+    exit 1
 fi
+sed -i.bak "s/__version__ = .*$/__version__ = \"$(echo $RELEASE_VERSION|sed s/-/+/)\"/" src/${MODULE}/_version.py
 
+# Build and upload the release.
 rm -rf build dist || true
 python -m build
 if [[ ! ${RELEASE_SKIP_UPLOAD:-} ]]; then
     python -m twine upload 'dist/*'
 fi
-mv src/${MODULE}/__init__.py.bak src/${MODULE}/__init__.py
+mv src/${MODULE}/_version.py.bak src/${MODULE}/_version.py
diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py
index c91dbf709e6d86..b3175989309849 100644
--- a/metadata-ingestion/setup.py
+++ b/metadata-ingestion/setup.py
@@ -3,7 +3,7 @@
 import setuptools
 
 package_metadata: dict = {}
-with open("./src/datahub/__init__.py") as fp:
+with open("./src/datahub/_version.py") as fp:
     exec(fp.read(), package_metadata)
 
 _version: str = package_metadata["__version__"]
@@ -312,7 +312,10 @@
 
 powerbi_report_server = {"requests", "requests_ntlm"}
 
-slack = {"slack-sdk==3.18.1", "tenacity>=8.0.1",}
+slack = {
+    "slack-sdk==3.18.1",
+    "tenacity>=8.0.1",
+}
 
 databricks = {
     # 0.1.11 appears to have authentication issues with azure databricks
@@ -505,12 +508,10 @@
     "starburst-trino-usage": sql_common | usage_common | trino,
     "nifi": {"requests", "packaging", "requests-gssapi"},
     "powerbi": (
-        (
-            microsoft_common
-            | {"lark[regex]==1.1.4", "sqlparse", "more-itertools"}
-            | sqlglot_lib
-            | threading_timeout_common
-        )
+        microsoft_common
+        | {"lark[regex]==1.1.4", "sqlparse", "more-itertools"}
+        | sqlglot_lib
+        | threading_timeout_common
     ),
     "powerbi-report-server": powerbi_report_server,
     "vertica": sql_common | {"vertica-sqlalchemy-dialect[vertica-python]==0.0.8.2"},
diff --git a/metadata-ingestion/src/datahub/__init__.py b/metadata-ingestion/src/datahub/__init__.py
index b254deb7fa30e5..8b8ef52d27bb92 100644
--- a/metadata-ingestion/src/datahub/__init__.py
+++ b/metadata-ingestion/src/datahub/__init__.py
@@ -1,25 +1 @@
-import sys
-import warnings
-
-# Published at https://pypi.org/project/acryl-datahub/.
-__package_name__ = "acryl-datahub"
-__version__ = "1!0.0.0.dev0"
-
-
-def is_dev_mode() -> bool:
-    return __version__.endswith("dev0")
-
-
-def nice_version_name() -> str:
-    if is_dev_mode():
-        return "unavailable (installed in develop mode)"
-    return __version__
-
-
-if sys.version_info < (3, 8):
-    warnings.warn(
-        "DataHub requires Python 3.8 or newer. "
-        "Please upgrade your Python version to continue using DataHub.",
-        FutureWarning,
-        stacklevel=2,
-    )
+from datahub._version import __package_name__, __version__
diff --git a/metadata-ingestion/src/datahub/_version.py b/metadata-ingestion/src/datahub/_version.py
new file mode 100644
index 00000000000000..a34748ac942a17
--- /dev/null
+++ b/metadata-ingestion/src/datahub/_version.py
@@ -0,0 +1,13 @@
+# Published at https://pypi.org/project/acryl-datahub/.
+__package_name__ = "acryl-datahub"
+__version__ = "1!0.0.0.dev0"
+
+
+def is_dev_mode() -> bool:
+    return __version__.endswith("dev0")
+
+
+def nice_version_name() -> str:
+    if is_dev_mode():
+        return "unavailable (installed in develop mode)"
+    return __version__
diff --git a/metadata-ingestion/src/datahub/cli/check_cli.py b/metadata-ingestion/src/datahub/cli/check_cli.py
index fbe07b64f0e154..6b3124fc37393a 100644
--- a/metadata-ingestion/src/datahub/cli/check_cli.py
+++ b/metadata-ingestion/src/datahub/cli/check_cli.py
@@ -9,7 +9,7 @@
 
 import click
 
-from datahub import __package_name__
+from datahub._version import __package_name__
 from datahub.cli.json_file import check_mce_file
 from datahub.configuration import config_loader
 from datahub.configuration.common import AllowDenyPattern
diff --git a/metadata-ingestion/src/datahub/cli/cli_utils.py b/metadata-ingestion/src/datahub/cli/cli_utils.py
index 1f13391644c6c8..26f4117e151f9e 100644
--- a/metadata-ingestion/src/datahub/cli/cli_utils.py
+++ b/metadata-ingestion/src/datahub/cli/cli_utils.py
@@ -9,7 +9,7 @@
 import requests
 from requests.sessions import Session
 
-import datahub
+import datahub._version as datahub_version
 from datahub.cli import config_utils
 from datahub.emitter.aspect import ASPECT_MAP, TIMESERIES_ASPECT_MAP
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
@@ -422,5 +422,5 @@ def ensure_has_system_metadata(
     if metadata.properties is None:
         metadata.properties = {}
     props = metadata.properties
-    props["clientId"] = datahub.__package_name__
-    props["clientVersion"] = datahub.__version__
+    props["clientId"] = datahub_version.__package_name__
+    props["clientVersion"] = datahub_version.__version__
diff --git a/metadata-ingestion/src/datahub/cli/ingest_cli.py b/metadata-ingestion/src/datahub/cli/ingest_cli.py
index c9eaccbc65ee21..e2a2f35a36631b 100644
--- a/metadata-ingestion/src/datahub/cli/ingest_cli.py
+++ b/metadata-ingestion/src/datahub/cli/ingest_cli.py
@@ -12,7 +12,7 @@
 from click_default_group import DefaultGroup
 from tabulate import tabulate
 
-import datahub as datahub_package
+from datahub._version import nice_version_name
 from datahub.cli import cli_utils
 from datahub.cli.config_utils import CONDENSED_DATAHUB_CONFIG_PATH
 from datahub.configuration.common import ConfigModel, GraphError
@@ -147,7 +147,7 @@ def run_pipeline_to_completion(pipeline: Pipeline) -> int:
                 return ret
 
     # main function begins
-    logger.info("DataHub CLI version: %s", datahub_package.nice_version_name())
+    logger.info("DataHub CLI version: %s", nice_version_name())
 
     pipeline_config = load_config_file(
         config,
diff --git a/metadata-ingestion/src/datahub/emitter/rest_emitter.py b/metadata-ingestion/src/datahub/emitter/rest_emitter.py
index 7271f784bf881e..4e7a152204da89 100644
--- a/metadata-ingestion/src/datahub/emitter/rest_emitter.py
+++ b/metadata-ingestion/src/datahub/emitter/rest_emitter.py
@@ -22,7 +22,7 @@
 from requests.adapters import HTTPAdapter, Retry
 from requests.exceptions import HTTPError, RequestException
 
-from datahub import nice_version_name
+from datahub._version import nice_version_name
 from datahub.cli import config_utils
 from datahub.cli.cli_utils import ensure_has_system_metadata, fixup_gms_url, get_or_else
 from datahub.cli.env_utils import get_boolean_env_variable
diff --git a/metadata-ingestion/src/datahub/entrypoints.py b/metadata-ingestion/src/datahub/entrypoints.py
index 182084e4794259..73d35381d5df29 100644
--- a/metadata-ingestion/src/datahub/entrypoints.py
+++ b/metadata-ingestion/src/datahub/entrypoints.py
@@ -6,7 +6,7 @@
 
 import click
 
-import datahub as datahub_package
+import datahub._version as datahub_version
 from datahub.cli.check_cli import check
 from datahub.cli.cli_utils import (
     fixup_gms_url,
@@ -74,8 +74,8 @@
     help="Write debug-level logs to a file.",
 )
 @click.version_option(
-    version=datahub_package.nice_version_name(),
-    prog_name=datahub_package.__package_name__,
+    version=datahub_version.nice_version_name(),
+    prog_name=datahub_version.__package_name__,
 )
 def datahub(
     debug: bool,
@@ -112,7 +112,7 @@ def datahub(
 def version(include_server: bool = False) -> None:
     """Print version number and exit."""
 
-    click.echo(f"DataHub CLI version: {datahub_package.nice_version_name()}")
+    click.echo(f"DataHub CLI version: {datahub_version.nice_version_name()}")
     click.echo(f"Models: {model_version_name()}")
     click.echo(f"Python version: {sys.version}")
     if include_server:
@@ -223,7 +223,7 @@ def main(**kwargs):
             logger.exception(f"Command failed: {exc}")
 
         logger.debug(
-            f"DataHub CLI version: {datahub_package.__version__} at {datahub_package.__file__}"
+            f"DataHub CLI version: {datahub_version.__version__} at {__file__}"
         )
         logger.debug(
             f"Python version: {sys.version} at {sys.executable} on {platform.platform()}"
diff --git a/metadata-ingestion/src/datahub/ingestion/api/registry.py b/metadata-ingestion/src/datahub/ingestion/api/registry.py
index 5e372a964c7e6c..91ee98865e78e4 100644
--- a/metadata-ingestion/src/datahub/ingestion/api/registry.py
+++ b/metadata-ingestion/src/datahub/ingestion/api/registry.py
@@ -17,7 +17,7 @@
 
 import typing_inspect
 
-from datahub import __package_name__
+from datahub._version import __package_name__
 from datahub.configuration.common import ConfigurationError
 
 if sys.version_info < (3, 10):
diff --git a/metadata-ingestion/src/datahub/ingestion/reporting/datahub_ingestion_run_summary_provider.py b/metadata-ingestion/src/datahub/ingestion/reporting/datahub_ingestion_run_summary_provider.py
index c143a8b49f4b7c..fc790535cfe03d 100644
--- a/metadata-ingestion/src/datahub/ingestion/reporting/datahub_ingestion_run_summary_provider.py
+++ b/metadata-ingestion/src/datahub/ingestion/reporting/datahub_ingestion_run_summary_provider.py
@@ -3,7 +3,7 @@
 import time
 from typing import Any, Dict, Optional
 
-from datahub import nice_version_name
+from datahub._version import nice_version_name
 from datahub.configuration.common import (
     ConfigModel,
     DynamicTypedConfig,
diff --git a/metadata-ingestion/src/datahub/ingestion/run/connection.py b/metadata-ingestion/src/datahub/ingestion/run/connection.py
index 54b0ab9f22c65e..d42a1ba8767f96 100644
--- a/metadata-ingestion/src/datahub/ingestion/run/connection.py
+++ b/metadata-ingestion/src/datahub/ingestion/run/connection.py
@@ -1,6 +1,6 @@
 import logging
 
-from datahub import __version__
+from datahub._version import __version__
 from datahub.ingestion.api.source import TestableSource, TestConnectionReport
 from datahub.ingestion.source.source_registry import source_registry
 
diff --git a/metadata-ingestion/src/datahub/ingestion/run/pipeline.py b/metadata-ingestion/src/datahub/ingestion/run/pipeline.py
index 25cbd340c9674b..120cf6a79bc02c 100644
--- a/metadata-ingestion/src/datahub/ingestion/run/pipeline.py
+++ b/metadata-ingestion/src/datahub/ingestion/run/pipeline.py
@@ -15,7 +15,7 @@
 import humanfriendly
 import psutil
 
-import datahub
+from datahub._version import nice_version_name
 from datahub.configuration.common import (
     ConfigModel,
     IgnorableError,
@@ -144,8 +144,8 @@ def _add_init_error_context(step: str) -> Iterator[None]:
 
 @dataclass
 class CliReport(Report):
-    cli_version: str = datahub.nice_version_name()
-    cli_entry_location: str = datahub.__file__
+    cli_version: str = nice_version_name()
+    cli_entry_location: str = __file__
     models_version: str = model_version_name()
     py_version: str = sys.version
     py_exec_path: str = sys.executable
diff --git a/metadata-ingestion/src/datahub/ingestion/source/unity/proxy.py b/metadata-ingestion/src/datahub/ingestion/source/unity/proxy.py
index fd6fa8a50f707b..86e577febf454c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/unity/proxy.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/unity/proxy.py
@@ -26,7 +26,7 @@
 )
 from databricks.sdk.service.workspace import ObjectType
 
-import datahub
+from datahub._version import nice_version_name
 from datahub.emitter.mce_builder import parse_ts_millis
 from datahub.ingestion.source.unity.hive_metastore_proxy import HiveMetastoreProxy
 from datahub.ingestion.source.unity.proxy_profiling import (
@@ -103,7 +103,7 @@ def __init__(
             host=workspace_url,
             token=personal_access_token,
             product="datahub",
-            product_version=datahub.nice_version_name(),
+            product_version=nice_version_name(),
         )
         self.warehouse_id = warehouse_id or ""
         self.report = report
diff --git a/metadata-ingestion/src/datahub/telemetry/telemetry.py b/metadata-ingestion/src/datahub/telemetry/telemetry.py
index 22b2cb6a101af9..c64c133fbf456f 100644
--- a/metadata-ingestion/src/datahub/telemetry/telemetry.py
+++ b/metadata-ingestion/src/datahub/telemetry/telemetry.py
@@ -12,7 +12,7 @@
 from mixpanel import Consumer, Mixpanel
 from typing_extensions import ParamSpec
 
-import datahub as datahub_package
+from datahub._version import __version__, nice_version_name
 from datahub.cli.config_utils import DATAHUB_ROOT_FOLDER
 from datahub.cli.env_utils import get_boolean_env_variable
 from datahub.configuration.common import ExceptionWithProps
@@ -106,7 +106,7 @@
 
 def _default_telemetry_properties() -> Dict[str, Any]:
     return {
-        "datahub_version": datahub_package.nice_version_name(),
+        "datahub_version": nice_version_name(),
         "python_version": platform.python_version(),
         "os": platform.system(),
         "arch": platform.machine(),
@@ -132,7 +132,7 @@ def __init__(self):
                 sentry_sdk.init(
                     dsn=SENTRY_DSN,
                     environment=SENTRY_ENVIRONMENT,
-                    release=datahub_package.__version__,
+                    release=__version__,
                 )
             except Exception as e:
                 # We need to print initialization errors to stderr, since logger is not initialized yet
@@ -277,7 +277,7 @@ def init_capture_exception(self) -> None:
                 "environment",
                 {
                     "environment": SENTRY_ENVIRONMENT,
-                    "datahub_version": datahub_package.nice_version_name(),
+                    "datahub_version": nice_version_name(),
                     "os": platform.system(),
                     "python_version": platform.python_version(),
                 },
diff --git a/metadata-ingestion/src/datahub/testing/check_imports.py b/metadata-ingestion/src/datahub/testing/check_imports.py
index e4bf07882b36ae..b65b3aa90dca35 100644
--- a/metadata-ingestion/src/datahub/testing/check_imports.py
+++ b/metadata-ingestion/src/datahub/testing/check_imports.py
@@ -1,4 +1,5 @@
 import pathlib
+import re
 from typing import List
 
 
@@ -32,3 +33,30 @@ def ensure_no_indirect_model_imports(dirs: List[pathlib.Path]) -> None:
                                 f"Disallowed import found in {file}: `{line.rstrip()}`. "
                                 f"Import from {replacement} instead."
                             )
+
+
+def ban_direct_datahub_imports(dirs: List[pathlib.Path]) -> None:
+    # We also want to ban all direct imports of datahub.
+    # The base `datahub` package is used to export public-facing classes.
+    # If we import it directly, we'll likely end up with circular imports.
+
+    banned_strings = [
+        r"^import datahub[\s$]",
+        r"^from datahub import",
+    ]
+    ignored_files = {
+        __file__,
+    }
+    for dir in dirs:
+        for file in dir.rglob("*.py"):
+            if str(file) in ignored_files:
+                continue
+
+            file_contents = file.read_text()
+
+            for banned_string in banned_strings:
+                if re.search(banned_string, file_contents, re.MULTILINE):
+                    raise ValueError(
+                        f"Disallowed bare datahub import found in {file}. "
+                        f"Do not import datahub directly; instead import from the underlying file."
+                    )
diff --git a/metadata-ingestion/src/datahub/upgrade/upgrade.py b/metadata-ingestion/src/datahub/upgrade/upgrade.py
index 7872681797d6fe..276f4ccd54a4a1 100644
--- a/metadata-ingestion/src/datahub/upgrade/upgrade.py
+++ b/metadata-ingestion/src/datahub/upgrade/upgrade.py
@@ -10,7 +10,7 @@
 from packaging.version import Version
 from pydantic import BaseModel
 
-from datahub import __version__
+from datahub._version import __version__
 from datahub.cli.config_utils import load_client_config
 from datahub.ingestion.graph.client import DataHubGraph
 from datahub.utilities.perf_timer import PerfTimer
diff --git a/metadata-ingestion/tests/unit/test_packages.py b/metadata-ingestion/tests/unit/test_packages.py
index f4045bac6e6ef4..ab538cf0c1ed09 100644
--- a/metadata-ingestion/tests/unit/test_packages.py
+++ b/metadata-ingestion/tests/unit/test_packages.py
@@ -1,7 +1,10 @@
 import pytest
 import setuptools
 
-from datahub.testing.check_imports import ensure_no_indirect_model_imports
+from datahub.testing.check_imports import (
+    ban_direct_datahub_imports,
+    ensure_no_indirect_model_imports,
+)
 from datahub.testing.check_str_enum import ensure_no_enum_mixin
 
 
@@ -16,6 +19,7 @@ def test_check_import_paths(pytestconfig: pytest.Config) -> None:
     root = pytestconfig.rootpath
 
     ensure_no_indirect_model_imports([root / "src", root / "tests"])
+    ban_direct_datahub_imports([root / "src", root / "tests"])
 
 
 def test_check_str_enum_usage(pytestconfig: pytest.Config) -> None:
diff --git a/metadata-ingestion/tests/unit/test_packaging.py b/metadata-ingestion/tests/unit/test_packaging.py
index 4b99be750a4da7..f9a3ae9562d3eb 100644
--- a/metadata-ingestion/tests/unit/test_packaging.py
+++ b/metadata-ingestion/tests/unit/test_packaging.py
@@ -1,6 +1,6 @@
 import pytest
 
-import datahub as datahub_metadata
+import datahub._version as datahub_version
 
 
 @pytest.mark.filterwarnings(
@@ -10,4 +10,4 @@ def test_datahub_version():
     # Simply importing pkg_resources checks for unsatisfied dependencies.
     import pkg_resources
 
-    assert pkg_resources.get_distribution(datahub_metadata.__package_name__).version
+    assert pkg_resources.get_distribution(datahub_version.__package_name__).version
diff --git a/python-build/generate_release_scripts.py b/python-build/generate_release_scripts.py
new file mode 100644
index 00000000000000..36253a24cfa3b0
--- /dev/null
+++ b/python-build/generate_release_scripts.py
@@ -0,0 +1,85 @@
+import dataclasses
+import pathlib
+
+REPO_ROOT = pathlib.Path(__file__).parent.parent
+
+
+@dataclasses.dataclass
+class Package:
+    # TODO: This doesn't have the actual package names.
+    directory: str
+    main_module_name: str
+
+    def root_from_directory(self) -> str:
+        ups = self.directory.count("/") + 1
+
+        return "/".join([".."] * ups)
+
+
+packages = [
+    Package(directory="metadata-ingestion", main_module_name="datahub"),
+    Package(
+        directory="metadata-ingestion-modules/airflow-plugin",
+        main_module_name="datahub_airflow_plugin",
+    ),
+    Package(
+        directory="metadata-ingestion-modules/dagster-plugin",
+        main_module_name="datahub_dagster_plugin",
+    ),
+    Package(
+        directory="metadata-ingestion-modules/gx-plugin",
+        main_module_name="datahub_gx_plugin",
+    ),
+    Package(
+        directory="metadata-ingestion-modules/prefect-plugin",
+        main_module_name="prefect_datahub",
+    ),
+]
+
+generation_header = f"# Auto-generated by {pathlib.Path(__file__).relative_to(REPO_ROOT)}. Do not edit manually."
+
+template = """\
+#!/bin/bash
+%s
+
+set -euxo pipefail
+
+ROOT=%s
+MODULE=%s
+
+if [[ ! ${RELEASE_SKIP_TEST:-} ]] && [[ ! ${RELEASE_SKIP_INSTALL:-} ]]; then
+    ${ROOT}/gradlew build  # also runs tests
+elif [[ ! ${RELEASE_SKIP_INSTALL:-} ]]; then
+    ${ROOT}/gradlew install
+fi
+
+# Check packaging constraint.
+python -c 'import setuptools; where="./src"; assert setuptools.find_packages(where) == setuptools.find_namespace_packages(where), "you seem to be missing or have extra __init__.py files"'
+
+# Update the release version.
+if [[ ! ${RELEASE_VERSION:-} ]]; then
+    echo "RELEASE_VERSION is not set"
+    exit 1
+fi
+sed -i.bak "s/__version__ = .*$/__version__ = \\"$(echo $RELEASE_VERSION|sed s/-/+/)\\"/" src/${MODULE}/_version.py
+
+# Build and upload the release.
+rm -rf build dist || true
+python -m build
+if [[ ! ${RELEASE_SKIP_UPLOAD:-} ]]; then
+    python -m twine upload 'dist/*'
+fi
+mv src/${MODULE}/_version.py.bak src/${MODULE}/_version.py
+"""
+
+for package in packages:
+    script_path = REPO_ROOT / package.directory / "scripts/release.sh"
+
+    script_path.write_text(
+        template
+        % (
+            generation_header,
+            package.root_from_directory(),
+            package.main_module_name,
+        )
+    )

From a4f8d170f9c232989edd5e6235b6b062b7b326db Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Sat, 25 Jan 2025 10:25:43 -0600
Subject: [PATCH 165/249] misc(search-explain): set default value (#12463)

---
 .../operations/elastic/OperationsController.java       | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/elastic/OperationsController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/elastic/OperationsController.java
index 64333009dda7a9..ea437f4cf35114 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/elastic/OperationsController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/elastic/OperationsController.java
@@ -231,7 +231,10 @@ public ResponseEntity<ExplainResponse> explainSearchQuery(
           @Nullable
           List<SortCriterion> sortCriteria,
       @Parameter(name = "searchFlags", description = "Optional configuration flags.")
-          @RequestParam(value = "searchFlags", required = false)
+          @RequestParam(
+              value = "searchFlags",
+              required = false,
+              defaultValue = "{\"fulltext\":true}")
           @Nullable
           String searchFlags)
       throws JsonProcessingException {
@@ -338,7 +341,10 @@ public ResponseEntity<String> explainSearchQueryDiff(
           @Nullable
           List<SortCriterion> sortCriteria,
       @Parameter(name = "searchFlags", description = "Optional configuration flags.")
-          @RequestParam(value = "searchFlags", required = false)
+          @RequestParam(
+              value = "searchFlags",
+              required = false,
+              defaultValue = "{\"fulltext\":true}")
           @Nullable
           String searchFlags)
       throws JsonProcessingException {

From 3e9e6e4fe07d68d3926f73080f4898d142720a58 Mon Sep 17 00:00:00 2001
From: sagar-salvi-apptware
 <159135491+sagar-salvi-apptware@users.noreply.github.com>
Date: Mon, 27 Jan 2025 15:37:31 +0530
Subject: [PATCH 166/249] fix(lookml/ingestion): Skip unreferenced or
 improperly loaded Lookml view files (#12351)

---
 .../ingestion/source/looker/lookml_config.py  |  5 +-
 .../ingestion/source/looker/lookml_source.py  | 56 ++++++++++++++++
 .../lkml_unreachable_views/data.model.lkml    | 10 +++
 .../employee_income_source.view.lkml          | 40 ++++++++++++
 .../employee_total_income.view.lkml           | 18 ++++++
 .../unreachable_view.view.lkml                | 18 ++++++
 .../tests/integration/lookml/test_lookml.py   | 64 ++++++++++++++++---
 7 files changed, 201 insertions(+), 10 deletions(-)
 create mode 100644 metadata-ingestion/tests/integration/lookml/lkml_unreachable_views/data.model.lkml
 create mode 100644 metadata-ingestion/tests/integration/lookml/lkml_unreachable_views/employee_income_source.view.lkml
 create mode 100644 metadata-ingestion/tests/integration/lookml/lkml_unreachable_views/employee_total_income.view.lkml
 create mode 100644 metadata-ingestion/tests/integration/lookml/lkml_unreachable_views/unreachable_view.view.lkml

diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_config.py b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_config.py
index 7ffb895349ed29..4d3255c3c0715b 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_config.py
@@ -139,7 +139,10 @@ class LookMLSourceConfig(
     )
     emit_reachable_views_only: bool = Field(
         True,
-        description="When enabled, only views that are reachable from explores defined in the model files are emitted",
+        description=(
+            "When enabled, only views that are reachable from explores defined in the model files are emitted. "
+            "If set to False, all views imported in model files are emitted. Views that are unreachable i.e. not explicitly defined in the model files are currently not emitted however reported as warning for debugging purposes."
+        ),
     )
     populate_sql_logic_for_missing_descriptions: bool = Field(
         False,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py
index a8575c84b510d5..9a937840a5012f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py
@@ -59,6 +59,7 @@
 from datahub.ingestion.source.looker.lookml_config import (
     BASE_PROJECT_NAME,
     MODEL_FILE_EXTENSION,
+    VIEW_FILE_EXTENSION,
     LookerConnectionDefinition,
     LookMLSourceConfig,
     LookMLSourceReport,
@@ -884,6 +885,7 @@ def get_internal_workunits(self) -> Iterable[MetadataWorkUnit]:  # noqa: C901
                                 view_urn = maybe_looker_view.id.get_urn(
                                     self.source_config
                                 )
+
                                 view_connection_mapping = view_connection_map.get(
                                     view_urn
                                 )
@@ -939,6 +941,9 @@ def get_internal_workunits(self) -> Iterable[MetadataWorkUnit]:  # noqa: C901
                                     str(maybe_looker_view.id)
                                 )
 
+        if not self.source_config.emit_reachable_views_only:
+            self.report_skipped_unreachable_views(viewfile_loader, processed_view_map)
+
         if (
             self.source_config.tag_measures_and_dimensions
             and self.reporter.events_produced != 0
@@ -966,5 +971,56 @@ def gen_project_workunits(self, project_name: str) -> Iterable[MetadataWorkUnit]
             ),
         ).as_workunit()
 
+    def report_skipped_unreachable_views(
+        self,
+        viewfile_loader: LookerViewFileLoader,
+        processed_view_map: Dict[str, Set[str]] = {},
+    ) -> None:
+        view_files: Dict[str, List[pathlib.Path]] = {}
+        for project, folder_path in self.base_projects_folder.items():
+            folder = pathlib.Path(folder_path)
+            view_files[project] = list(folder.glob(f"**/*{VIEW_FILE_EXTENSION}"))
+
+        skipped_view_paths: Dict[str, List[str]] = {}
+        for project, views in view_files.items():
+            skipped_paths: Set[str] = set()
+
+            for view_path in views:
+                # Check if the view is already in processed_view_map
+                if not any(
+                    str(view_path) in view_set
+                    for view_set in processed_view_map.values()
+                ):
+                    looker_viewfile = viewfile_loader.load_viewfile(
+                        path=str(view_path),
+                        project_name=project,
+                        connection=None,
+                        reporter=self.reporter,
+                    )
+
+                    if looker_viewfile is not None:
+                        for raw_view in looker_viewfile.views:
+                            raw_view_name = raw_view.get("name", "")
+
+                            if (
+                                raw_view_name
+                                and self.source_config.view_pattern.allowed(
+                                    raw_view_name
+                                )
+                            ):
+                                skipped_paths.add(str(view_path))
+
+            skipped_view_paths[project] = list(skipped_paths)
+
+        for project, view_paths in skipped_view_paths.items():
+            for path in view_paths:
+                self.reporter.report_warning(
+                    title="Skipped View File",
+                    message=(
+                        "The Looker view file was skipped because it may not be referenced by any models."
+                    ),
+                    context=(f"Project: {project}, View File Path: {path}"),
+                )
+
     def get_report(self):
         return self.reporter
diff --git a/metadata-ingestion/tests/integration/lookml/lkml_unreachable_views/data.model.lkml b/metadata-ingestion/tests/integration/lookml/lkml_unreachable_views/data.model.lkml
new file mode 100644
index 00000000000000..b19135659b07a1
--- /dev/null
+++ b/metadata-ingestion/tests/integration/lookml/lkml_unreachable_views/data.model.lkml
@@ -0,0 +1,10 @@
+connection: "my_connection"
+
+include: "employee_income_source.view.lkml"
+include: "employee_total_income.view.lkml"
+
+explore: employee_income_source {
+}
+
+explore: employee_total_income {
+}
diff --git a/metadata-ingestion/tests/integration/lookml/lkml_unreachable_views/employee_income_source.view.lkml b/metadata-ingestion/tests/integration/lookml/lkml_unreachable_views/employee_income_source.view.lkml
new file mode 100644
index 00000000000000..f4a443ab115374
--- /dev/null
+++ b/metadata-ingestion/tests/integration/lookml/lkml_unreachable_views/employee_income_source.view.lkml
@@ -0,0 +1,40 @@
+view: employee_income_source {
+  derived_table: {
+    sql: SELECT
+      employee_id,
+      employee_name,
+      {% if dw_eff_dt_date._is_selected or finance_dw_eff_dt_date._is_selected %}
+        prod_core.data.r_metric_summary_v2
+      {% elsif dw_eff_dt_week._is_selected or finance_dw_eff_dt_week._is_selected %}
+        prod_core.data.r_metric_summary_v3
+      {% else %}
+        'default_table' as source
+      {% endif %},
+      employee_income
+    FROM source_table
+    WHERE
+        {% condition source_region %} source_table.region {% endcondition %}
+  ;;
+  }
+
+  dimension: id {
+    type: number
+    sql: ${TABLE}.employee_id;;
+  }
+
+  dimension: name {
+    type: string
+    sql: ${TABLE}.employee_name;;
+  }
+
+  dimension: source {
+    type: string
+    sql: ${TABLE}.source ;;
+  }
+
+  dimension: income {
+    type: number
+    sql: ${TABLE}.employee_income ;;
+  }
+
+}
diff --git a/metadata-ingestion/tests/integration/lookml/lkml_unreachable_views/employee_total_income.view.lkml b/metadata-ingestion/tests/integration/lookml/lkml_unreachable_views/employee_total_income.view.lkml
new file mode 100644
index 00000000000000..18a1ab660b3a1b
--- /dev/null
+++ b/metadata-ingestion/tests/integration/lookml/lkml_unreachable_views/employee_total_income.view.lkml
@@ -0,0 +1,18 @@
+view: employee_total_income {
+  sql_table_name: ${employee_income_source.SQL_TABLE_NAME} ;;
+
+  dimension: id {
+    type: number
+    sql: ${TABLE}.id;;
+  }
+
+  dimension: name {
+    type: string
+    sql: ${TABLE}.name;;
+  }
+
+  measure: total_income {
+    type: sum
+    sql: ${TABLE}.income;;
+  }
+}
diff --git a/metadata-ingestion/tests/integration/lookml/lkml_unreachable_views/unreachable_view.view.lkml b/metadata-ingestion/tests/integration/lookml/lkml_unreachable_views/unreachable_view.view.lkml
new file mode 100644
index 00000000000000..5c75abe41cfce0
--- /dev/null
+++ b/metadata-ingestion/tests/integration/lookml/lkml_unreachable_views/unreachable_view.view.lkml
@@ -0,0 +1,18 @@
+view: employee_unreachable {
+  sql_table_name: ${employee_income_source.SQL_TABLE_NAME} ;;
+
+  dimension: id {
+    type: number
+    sql: ${TABLE}.id;;
+  }
+
+  dimension: name {
+    type: string
+    sql: ${TABLE}.name;;
+  }
+
+  measure: total_income {
+    type: sum
+    sql: ${TABLE}.income;;
+  }
+}
diff --git a/metadata-ingestion/tests/integration/lookml/test_lookml.py b/metadata-ingestion/tests/integration/lookml/test_lookml.py
index d803b8498104fd..ac011324684189 100644
--- a/metadata-ingestion/tests/integration/lookml/test_lookml.py
+++ b/metadata-ingestion/tests/integration/lookml/test_lookml.py
@@ -10,6 +10,8 @@
 from freezegun import freeze_time
 from looker_sdk.sdk.api40.models import DBConnection
 
+from datahub.ingestion.api.common import PipelineContext
+from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.ingestion.run.pipeline import Pipeline
 from datahub.ingestion.source.file import read_metadata_file
 from datahub.ingestion.source.looker.looker_dataclasses import LookerModel
@@ -20,6 +22,7 @@
 )
 from datahub.ingestion.source.looker.lookml_config import LookMLSourceConfig
 from datahub.ingestion.source.looker.lookml_refinement import LookerRefinementResolver
+from datahub.ingestion.source.looker.lookml_source import LookMLSource
 from datahub.metadata.schema_classes import (
     DatasetSnapshotClass,
     MetadataChangeEventClass,
@@ -78,7 +81,8 @@ def test_lookml_ingest(pytestconfig, tmp_path, mock_time):
     )
     pipeline.run()
     pipeline.pretty_print_summary()
-    pipeline.raise_from_status(raise_warnings=True)
+    pipeline.raise_from_status(raise_warnings=False)
+    assert pipeline.source.get_report().warnings.total_elements == 1
 
     mce_helpers.check_golden_file(
         pytestconfig,
@@ -112,7 +116,8 @@ def test_lookml_refinement_ingest(pytestconfig, tmp_path, mock_time):
     pipeline = Pipeline.create(new_recipe)
     pipeline.run()
     pipeline.pretty_print_summary()
-    pipeline.raise_from_status(raise_warnings=True)
+    pipeline.raise_from_status(raise_warnings=False)
+    assert pipeline.source.get_report().warnings.total_elements == 1
 
     golden_path = test_resources_dir / "refinements_ingestion_golden.json"
     mce_helpers.check_golden_file(
@@ -142,7 +147,8 @@ def test_lookml_refinement_include_order(pytestconfig, tmp_path, mock_time):
     pipeline = Pipeline.create(new_recipe)
     pipeline.run()
     pipeline.pretty_print_summary()
-    pipeline.raise_from_status(raise_warnings=True)
+    pipeline.raise_from_status(raise_warnings=False)
+    assert pipeline.source.get_report().warnings.total_elements == 1
 
     golden_path = test_resources_dir / "refinement_include_order_golden.json"
     mce_helpers.check_golden_file(
@@ -332,7 +338,8 @@ def test_lookml_ingest_offline(pytestconfig, tmp_path, mock_time):
     )
     pipeline.run()
     pipeline.pretty_print_summary()
-    pipeline.raise_from_status(raise_warnings=True)
+    pipeline.raise_from_status(raise_warnings=False)
+    assert pipeline.source.get_report().warnings.total_elements == 1
 
     mce_helpers.check_golden_file(
         pytestconfig,
@@ -377,7 +384,8 @@ def test_lookml_ingest_offline_with_model_deny(pytestconfig, tmp_path, mock_time
     )
     pipeline.run()
     pipeline.pretty_print_summary()
-    pipeline.raise_from_status(raise_warnings=True)
+    pipeline.raise_from_status(raise_warnings=False)
+    assert pipeline.source.get_report().warnings.total_elements == 1
 
     mce_helpers.check_golden_file(
         pytestconfig,
@@ -424,7 +432,8 @@ def test_lookml_ingest_offline_platform_instance(pytestconfig, tmp_path, mock_ti
     )
     pipeline.run()
     pipeline.pretty_print_summary()
-    pipeline.raise_from_status(raise_warnings=True)
+    pipeline.raise_from_status(raise_warnings=False)
+    assert pipeline.source.get_report().warnings.total_elements == 1
 
     mce_helpers.check_golden_file(
         pytestconfig,
@@ -507,7 +516,8 @@ def ingestion_test(
         )
         pipeline.run()
         pipeline.pretty_print_summary()
-        pipeline.raise_from_status(raise_warnings=True)
+        pipeline.raise_from_status(raise_warnings=False)
+        assert pipeline.source.get_report().warnings.total_elements == 1
 
         mce_helpers.check_golden_file(
             pytestconfig,
@@ -553,7 +563,8 @@ def test_lookml_git_info(pytestconfig, tmp_path, mock_time):
     )
     pipeline.run()
     pipeline.pretty_print_summary()
-    pipeline.raise_from_status(raise_warnings=True)
+    pipeline.raise_from_status(raise_warnings=False)
+    assert pipeline.source.get_report().warnings.total_elements == 1
 
     mce_helpers.check_golden_file(
         pytestconfig,
@@ -668,7 +679,8 @@ def test_hive_platform_drops_ids(pytestconfig, tmp_path, mock_time):
     )
     pipeline.run()
     pipeline.pretty_print_summary()
-    pipeline.raise_from_status(raise_warnings=True)
+    pipeline.raise_from_status(raise_warnings=False)
+    assert pipeline.source.get_report().warnings.total_elements == 1
 
     events = read_metadata_file(tmp_path / mce_out)
     for mce in events:
@@ -1051,3 +1063,37 @@ def test_gms_schema_resolution(pytestconfig, tmp_path, mock_time):
         output_path=tmp_path / mce_out_file,
         golden_path=golden_path,
     )
+
+
+@freeze_time(FROZEN_TIME)
+def test_unreachable_views(pytestconfig):
+    test_resources_dir = pytestconfig.rootpath / "tests/integration/lookml"
+
+    config = {
+        "base_folder": f"{test_resources_dir}/lkml_unreachable_views",
+        "connection_to_platform_map": {"my_connection": "postgres"},
+        "parse_table_names_from_sql": True,
+        "tag_measures_and_dimensions": False,
+        "project_name": "lkml_samples",
+        "model_pattern": {"deny": ["data2"]},
+        "emit_reachable_views_only": False,
+        "liquid_variable": {
+            "order_region": "ap-south-1",
+            "source_region": "ap-south-1",
+            "dw_eff_dt_date": {
+                "_is_selected": True,
+            },
+        },
+    }
+
+    source = LookMLSource(
+        LookMLSourceConfig.parse_obj(config),
+        ctx=PipelineContext(run_id="lookml-source-test"),
+    )
+    wu: List[MetadataWorkUnit] = [*source.get_workunits_internal()]
+    assert len(wu) == 15
+    assert source.reporter.warnings.total_elements == 1
+    assert (
+        "The Looker view file was skipped because it may not be referenced by any models."
+        in [failure.message for failure in source.get_report().warnings]
+    )

From 6ab2c702b7a7b9b829a2093827244970e2ee50f9 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Mon, 27 Jan 2025 16:13:13 +0530
Subject: [PATCH 167/249] docs: add beta labels for Automation (#12459)

---
 docs/automations/bigquery-metadata-sync.md    | 6 ++++++
 docs/automations/docs-propagation.md          | 6 ++++++
 docs/automations/glossary-term-propagation.md | 6 ++++++
 docs/automations/snowflake-tag-propagation.md | 7 ++++++-
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/docs/automations/bigquery-metadata-sync.md b/docs/automations/bigquery-metadata-sync.md
index 78bdbdd453e9f7..705c3951c060da 100644
--- a/docs/automations/bigquery-metadata-sync.md
+++ b/docs/automations/bigquery-metadata-sync.md
@@ -4,6 +4,12 @@ import FeatureAvailability from '@site/src/components/FeatureAvailability';
 
 <FeatureAvailability saasOnly />
 
+:::info
+
+This feature is currently in open beta in Acryl Cloud. Reach out to your Acryl representative to get access.
+
+:::
+
 ## Introduction
 
 BigQuery Metadata Sync is an automation that synchronizes DataHub Tags, Table and Column descriptions, and Column Glossary Terms with
diff --git a/docs/automations/docs-propagation.md b/docs/automations/docs-propagation.md
index 9f389028941919..af553b9b84a7eb 100644
--- a/docs/automations/docs-propagation.md
+++ b/docs/automations/docs-propagation.md
@@ -1,5 +1,11 @@
 # Documentation Propagation Automation
 
+:::info
+
+This feature is currently in open beta in Acryl Cloud. Reach out to your Acryl representative to get access.
+
+:::
+
 ## Introduction
 
 Documentation Propagation is an automation automatically propagates column and asset (coming soon) descriptions based on downstream column-level lineage and sibling relationships. 
diff --git a/docs/automations/glossary-term-propagation.md b/docs/automations/glossary-term-propagation.md
index 90e8e75ea44ef6..5a0f20eb79db21 100644
--- a/docs/automations/glossary-term-propagation.md
+++ b/docs/automations/glossary-term-propagation.md
@@ -2,6 +2,12 @@
 
 <FeatureAvailability saasOnly />
 
+:::info
+
+This feature is currently in open beta in Acryl Cloud. Reach out to your Acryl representative to get access.
+
+:::
+
 ## Introduction
 
 Glossary Term Propagation is an automation feature that propagates classification labels (Glossary Terms) across column and assets based on downstream lineage and sibling relationships.
diff --git a/docs/automations/snowflake-tag-propagation.md b/docs/automations/snowflake-tag-propagation.md
index 8eded451644cce..dd920c247bbfc7 100644
--- a/docs/automations/snowflake-tag-propagation.md
+++ b/docs/automations/snowflake-tag-propagation.md
@@ -4,7 +4,12 @@ import FeatureAvailability from '@site/src/components/FeatureAvailability';
 
 <FeatureAvailability saasOnly />
 
-> Note that this Automation in currently in open **Beta**. With any questions or issues, please reach out to your Acryl representative. 
+:::info
+
+This feature is currently in open beta in Acryl Cloud. Reach out to your Acryl representative to get access.
+
+:::
+
 
 ## Introduction
 

From 0c98cdce2e017a2066d72cdc64c641aebd97d214 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Mon, 27 Jan 2025 17:24:11 +0530
Subject: [PATCH 168/249] fix(ingest/glue): add info in report (#12470)

---
 metadata-ingestion/src/datahub/ingestion/source/aws/glue.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py b/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
index 2ace71b6ff6c1d..214b14a2b6c100 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
@@ -218,6 +218,7 @@ def platform_validator(cls, v: str) -> str:
 
 @dataclass
 class GlueSourceReport(StaleEntityRemovalSourceReport):
+    catalog_id: Optional[str] = None
     tables_scanned = 0
     filtered: List[str] = dataclass_field(default_factory=list)
     databases: EntityFilterReport = EntityFilterReport.field(type="database")
@@ -315,6 +316,7 @@ def __init__(self, config: GlueSourceConfig, ctx: PipelineContext):
         self.extract_owners = config.extract_owners
         self.source_config = config
         self.report = GlueSourceReport()
+        self.report.catalog_id = self.source_config.catalog_id
         self.glue_client = config.glue_client
         self.s3_client = config.s3_client
         self.extract_transforms = config.extract_transforms

From 1ca95cc2abe3de16d9c9bdf29a5c1adf58bd0d6e Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Mon, 27 Jan 2025 08:55:23 -0800
Subject: [PATCH 169/249] docs(ingest/tableau): tweak permissions docs (#12460)

---
 metadata-ingestion/docs/sources/tableau/tableau_pre.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/metadata-ingestion/docs/sources/tableau/tableau_pre.md b/metadata-ingestion/docs/sources/tableau/tableau_pre.md
index a3ac85818a51aa..2cc9ed23513222 100644
--- a/metadata-ingestion/docs/sources/tableau/tableau_pre.md
+++ b/metadata-ingestion/docs/sources/tableau/tableau_pre.md
@@ -12,16 +12,15 @@ DataHub supports two authentication methods:
 1. Username/Password
 2. [Personal Access Token](https://help.tableau.com/current/pro/desktop/en-us/useracct.htm#create-and-revoke-personal-access-tokens)
 
-Either way, the user/token must have the **Site Administrator Explorer** site role.
+Either way, the user/token must have at least the **Site Administrator Explorer** site role.
 
 :::info
 
-We need the **Site Administrator Explorer** site role in order to get complete metadata from Tableau.
+We need at least the **Site Administrator Explorer** site role in order to get complete metadata from Tableau. Roles with higher privileges, like **Site Administrator Creator** or **Server Admin** also work.
 
 With any lower role, the Tableau Metadata API returns missing/partial metadata.
 This particularly affects data source fields and definitions, which impacts our ability to extract most columns and generate column lineage. Some table-level lineage is also impacted.
-
-Other site roles, including Site Administrator Creator and Viewer, are insufficient due to these limitations in the current Tableau Metadata API.
+Other site roles, like Viewer or Explorer, are insufficient due to these limitations in the current Tableau Metadata API.
 
 :::
 

From d8ac6cd2586e041a0cb7b18a6c1f04207932dbe2 Mon Sep 17 00:00:00 2001
From: Shirshanka Das <shirshanka@apache.org>
Date: Mon, 27 Jan 2025 19:49:12 -0800
Subject: [PATCH 170/249] gql: add data platform instance to search fragment
 (#12472)

---
 datahub-web-react/src/graphql/search.graphql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/datahub-web-react/src/graphql/search.graphql b/datahub-web-react/src/graphql/search.graphql
index 9edd6754022866..d12193b471d469 100644
--- a/datahub-web-react/src/graphql/search.graphql
+++ b/datahub-web-react/src/graphql/search.graphql
@@ -954,6 +954,9 @@ fragment searchResultsWithoutSchemaField on Entity {
             ...versionProperties
         }
     }
+    ... on DataPlatformInstance {
+        ...dataPlatformInstanceFields
+    }
 }
 
 fragment searchResultFields on Entity {

From 563656c4d52ee8ab2ee373b78c4f896c643e8def Mon Sep 17 00:00:00 2001
From: sagar-salvi-apptware
 <159135491+sagar-salvi-apptware@users.noreply.github.com>
Date: Tue, 28 Jan 2025 12:25:45 +0530
Subject: [PATCH 171/249] feat(ingestion/lookml): resolve access notation for
 LookML Constant (#12277)

Co-authored-by: Siddique Bagwan <siddique.bagwan@acryl.io>
Co-authored-by: Mayuri Nehate <33225191+mayurinehate@users.noreply.github.com>
---
 .../docs/sources/looker/looker_recipe.yml     |  14 +
 .../docs/sources/looker/lookml_post.md        |  54 +-
 .../source/looker/looker_dataclasses.py       |   8 +
 .../source/looker/looker_file_loader.py       |  13 +-
 .../source/looker/looker_template_language.py | 118 +++-
 .../ingestion/source/looker/lookml_config.py  |  18 +-
 .../ingestion/source/looker/lookml_source.py  |  76 ++-
 .../tests/integration/lookml/test_lookml.py   | 143 ++++-
 .../data.model.lkml                           |   2 +-
 .../data.model.lkml                           |  10 +
 .../manifest.lkml                             |  15 +
 .../star_award_winner.view.lkml               |  12 +
 .../star_award_winner_dev.view.lkml           |  17 +
 .../vv_lineage_lookml_constant_golden.json    | 514 ++++++++++++++++++
 14 files changed, 962 insertions(+), 52 deletions(-)
 create mode 100644 metadata-ingestion/tests/integration/lookml/vv-lineage-and-lookml-constant/data.model.lkml
 create mode 100644 metadata-ingestion/tests/integration/lookml/vv-lineage-and-lookml-constant/manifest.lkml
 create mode 100644 metadata-ingestion/tests/integration/lookml/vv-lineage-and-lookml-constant/star_award_winner.view.lkml
 create mode 100644 metadata-ingestion/tests/integration/lookml/vv-lineage-and-lookml-constant/star_award_winner_dev.view.lkml
 create mode 100644 metadata-ingestion/tests/integration/lookml/vv_lineage_lookml_constant_golden.json

diff --git a/metadata-ingestion/docs/sources/looker/looker_recipe.yml b/metadata-ingestion/docs/sources/looker/looker_recipe.yml
index 42209f8cc68092..0939b6546411d2 100644
--- a/metadata-ingestion/docs/sources/looker/looker_recipe.yml
+++ b/metadata-ingestion/docs/sources/looker/looker_recipe.yml
@@ -8,4 +8,18 @@ source:
     client_id: ${LOOKER_CLIENT_ID}
     client_secret: ${LOOKER_CLIENT_SECRET}
 
+    # Liquid variables
+    # liquid_variables:
+    #   _user_attributes:
+    #     looker_env: "dev"
+    #     dev_database_prefix: "employee"
+    #     dev_schema_prefix: "public"
+    #   dw_eff_dt_date:
+    #     _is_selected: true
+    #   source_region: "ap-south-1"
+    #   db: "test-db"
+
+    # LookML Constants
+    # lookml_constants:
+    #   star_award_winner_year: "public.winner_2025"
 # sink configs
diff --git a/metadata-ingestion/docs/sources/looker/lookml_post.md b/metadata-ingestion/docs/sources/looker/lookml_post.md
index 8a4bf823ffc27d..fdbe7f3e1217d4 100644
--- a/metadata-ingestion/docs/sources/looker/lookml_post.md
+++ b/metadata-ingestion/docs/sources/looker/lookml_post.md
@@ -1,11 +1,49 @@
-#### Configuration Notes
-
-1. If a view contains a liquid template (e.g. `sql_table_name: {{ user_attributes['db']}}.kafka_streaming.events }}`, with `db=ANALYTICS_PROD`), then you will need to specify the values of those variables in the `liquid_variable` config as shown below:
-    ```yml
-      liquid_variable:
-        user_attributes:
-          db: ANALYTICS_PROD
-    ```
+### Configuration Notes
+
+1. Handling Liquid Templates
+
+   If a view contains a liquid template, for example:
+
+   ```
+   sql_table_name: {{ user_attributes['db'] }}.kafka_streaming.events
+   ```
+
+   where `db=ANALYTICS_PROD`, you need to specify the values of those variables in the liquid_variables configuration as shown below:
+
+   ```yml
+   liquid_variables:
+     user_attributes:
+       db: ANALYTICS_PROD
+   ```
+
+2. Resolving LookML Constants
+
+   If a view contains a LookML constant, for example:
+
+   ```
+   sql_table_name: @{db}.kafka_streaming.events;
+   ```
+
+   Ingestion attempts to resolve it's value by looking at project manifest files
+
+     ```yml
+     manifest.lkml
+       constant: db {
+           value: "ANALYTICS_PROD"
+       }
+     ```
+
+   - If the constant's value is not resolved or incorrectly resolved, you can specify `lookml_constants` configuration in ingestion recipe as shown below. The constant value in recipe takes precedence over constant values resolved from manifest.
+
+     ```yml
+     lookml_constants:
+       db: ANALYTICS_PROD
+     ```
+
+
+**Additional Notes**
+
+Although liquid variables and LookML constants can be used anywhere in LookML code, their values are currently resolved only for LookML views by DataHub LookML ingestion. This behavior is sufficient since LookML ingestion processes only views and their upstream dependencies.
 
 ### Multi-Project LookML (Advanced)
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_dataclasses.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_dataclasses.py
index d771821a14d88d..e928c25e22fbd0 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_dataclasses.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_dataclasses.py
@@ -32,6 +32,12 @@ class LookerField:
     sql: Optional[str]
 
 
+@dataclass
+class LookerConstant:
+    name: str
+    value: str
+
+
 @dataclass
 class LookerModel:
     connection: str
@@ -75,6 +81,7 @@ def from_looker_dict(
             try:
                 parsed = load_and_preprocess_file(
                     path=included_file,
+                    reporter=reporter,
                     source_config=source_config,
                 )
                 included_explores = parsed.get("explores", [])
@@ -217,6 +224,7 @@ def resolve_includes(
                 try:
                     parsed = load_and_preprocess_file(
                         path=included_file,
+                        reporter=reporter,
                         source_config=source_config,
                     )
                     seen_so_far.add(included_file)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_file_loader.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_file_loader.py
index 9fac0b52fde0dd..bd6a37fe4b4e24 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_file_loader.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_file_loader.py
@@ -4,7 +4,10 @@
 from typing import Dict, Optional
 
 from datahub.ingestion.source.looker.looker_config import LookerConnectionDefinition
-from datahub.ingestion.source.looker.looker_dataclasses import LookerViewFile
+from datahub.ingestion.source.looker.looker_dataclasses import (
+    LookerConstant,
+    LookerViewFile,
+)
 from datahub.ingestion.source.looker.looker_template_language import (
     load_and_preprocess_file,
 )
@@ -30,12 +33,14 @@ def __init__(
         base_projects_folder: Dict[str, pathlib.Path],
         reporter: LookMLSourceReport,
         source_config: LookMLSourceConfig,
+        manifest_constants: Dict[str, LookerConstant] = {},
     ) -> None:
         self.viewfile_cache: Dict[str, Optional[LookerViewFile]] = {}
         self._root_project_name = root_project_name
         self._base_projects_folder = base_projects_folder
         self.reporter = reporter
         self.source_config = source_config
+        self.manifest_constants = manifest_constants
 
     def _load_viewfile(
         self, project_name: str, path: str, reporter: LookMLSourceReport
@@ -71,9 +76,15 @@ def _load_viewfile(
         try:
             logger.debug(f"Loading viewfile {path}")
 
+            # load_and preprocess_file is called multiple times for loading view file from multiple flows.
+            # Flag resolve_constants is a hack to avoid passing around manifest_constants from all of the flows.
+            # This is fine as rest of flows do not need resolution of constants.
             parsed = load_and_preprocess_file(
                 path=path,
+                reporter=self.reporter,
                 source_config=self.source_config,
+                resolve_constants=True,
+                manifest_constants=self.manifest_constants,
             )
 
             looker_viewfile = LookerViewFile.from_looker_dict(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_template_language.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_template_language.py
index 2bcae4d46b8d52..60983f04bafa05 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_template_language.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_template_language.py
@@ -2,7 +2,7 @@
 import pathlib
 import re
 from abc import ABC, abstractmethod
-from typing import Any, ClassVar, Dict, List, Optional, Set, Union
+from typing import TYPE_CHECKING, Any, ClassVar, Dict, List, Optional, Set, Union
 
 from deepmerge import always_merger
 from liquid import Undefined
@@ -27,8 +27,12 @@
 from datahub.ingestion.source.looker.lookml_config import (
     DERIVED_VIEW_PATTERN,
     LookMLSourceConfig,
+    LookMLSourceReport,
 )
 
+if TYPE_CHECKING:
+    from datahub.ingestion.source.looker.looker_dataclasses import LookerConstant
+
 logger = logging.getLogger(__name__)
 
 
@@ -82,7 +86,12 @@ def liquid_variable_with_default(self, text: str) -> dict:
         return self._create_new_liquid_variables_with_default(variables=variables)
 
 
-def resolve_liquid_variable(text: str, liquid_variable: Dict[Any, Any]) -> str:
+def resolve_liquid_variable(
+    text: str,
+    view_name: str,
+    liquid_variable: Dict[Any, Any],
+    report: LookMLSourceReport,
+) -> str:
     # Set variable value to NULL if not present in liquid_variable dictionary
     Undefined.__str__ = lambda instance: "NULL"  # type: ignore
     try:
@@ -96,6 +105,7 @@ def resolve_liquid_variable(text: str, liquid_variable: Dict[Any, Any]) -> str:
         # Resolve liquid template
         return create_template(text).render(liquid_variable)
     except LiquidSyntaxError as e:
+        # TODO: Will add warning once we get rid of duplcate warning message for same view
         logger.warning(f"Unsupported liquid template encountered. error [{e.message}]")
         # TODO: There are some tag specific to looker and python-liquid library does not understand them. currently
         #  we are not parsing such liquid template.
@@ -103,6 +113,7 @@ def resolve_liquid_variable(text: str, liquid_variable: Dict[Any, Any]) -> str:
         # See doc: https://cloud.google.com/looker/docs/templated-filters and look for { % condition region %}
         # order.region { % endcondition %}
     except CustomTagException as e:
+        # TODO: Will add warning once we get rid of duplcate warning message for same view
         logger.warning(e)
         logger.debug(e, exc_info=e)
 
@@ -192,15 +203,20 @@ class LookMLViewTransformer(ABC):
 
     source_config: LookMLSourceConfig
 
-    def __init__(self, source_config: LookMLSourceConfig):
+    def __init__(
+        self,
+        source_config: LookMLSourceConfig,
+        reporter: LookMLSourceReport,
+    ):
         self.source_config = source_config
+        self.reporter = reporter
 
     def transform(self, view: dict) -> dict:
         value_to_transform: Optional[str] = None
 
-        # is_attribute_supported check is required because not all transformer works on all attributes in current
-        # case mostly all transformer works on sql_table_name and derived.sql attributes,
-        # however IncompleteSqlTransformer only transform the derived.sql attribute
+        # is_attribute_supported check is required because not all transformers work on all attributes in the current
+        #  case, mostly all transformers work on sql_table_name and derived.sql attributes;
+        # however, IncompleteSqlTransformer only transform the derived.sql attribute
         if SQL_TABLE_NAME in view and self.is_attribute_supported(SQL_TABLE_NAME):
             # Give precedence to already processed transformed view.sql_table_name to apply more transformation
             value_to_transform = view.get(
@@ -252,7 +268,9 @@ class LiquidVariableTransformer(LookMLViewTransformer):
     def _apply_transformation(self, value: str, view: dict) -> str:
         return resolve_liquid_variable(
             text=value,
-            liquid_variable=self.source_config.liquid_variable,
+            liquid_variable=self.source_config.liquid_variables,
+            view_name=view["name"],
+            report=self.reporter,
         )
 
 
@@ -287,7 +305,7 @@ def _apply_transformation(self, value: str, view: dict) -> str:
 
 class DropDerivedViewPatternTransformer(LookMLViewTransformer):
     """
-    drop ${} from datahub_transformed_sql_table_name and  view["derived_table"]["datahub_transformed_sql_table_name"] values.
+    drop ${} from datahub_transformed_sql_table_name and view["derived_table"]["datahub_transformed_sql_table_name"] values.
 
     Example: transform ${employee_income_source.SQL_TABLE_NAME} to employee_income_source.SQL_TABLE_NAME
     """
@@ -308,8 +326,8 @@ class LookMlIfCommentTransformer(LookMLViewTransformer):
     evaluate_to_true_regx: str
     remove_if_comment_line_regx: str
 
-    def __init__(self, source_config: LookMLSourceConfig):
-        super().__init__(source_config=source_config)
+    def __init__(self, source_config: LookMLSourceConfig, reporter: LookMLSourceReport):
+        super().__init__(source_config=source_config, reporter=reporter)
 
         # This regx will keep whatever after -- if looker_environment --
         self.evaluate_to_true_regx = r"-- if {} --".format(
@@ -335,6 +353,61 @@ def _apply_transformation(self, value: str, view: dict) -> str:
         return self._apply_regx(value)
 
 
+class LookmlConstantTransformer(LookMLViewTransformer):
+    """
+    Replace LookML constants @{constant} from the manifest/configuration.
+    """
+
+    CONSTANT_PATTERN = r"@{(\w+)}"  # Matches @{constant}
+
+    def __init__(
+        self,
+        source_config: LookMLSourceConfig,
+        reporter: LookMLSourceReport,
+        manifest_constants: Dict[str, "LookerConstant"],
+    ):
+        super().__init__(source_config=source_config, reporter=reporter)
+        self.manifest_constants = manifest_constants
+
+    def resolve_lookml_constant(self, text: str, view_name: Optional[str]) -> str:
+        """
+        Resolves LookML constants (@{ }) from manifest or config.
+        Logs warnings for misplaced or missing variables.
+        """
+
+        def replace_constants(match):
+            key = match.group(1)
+            # Resolve constant from config
+            if key in self.source_config.lookml_constants:
+                return str(self.source_config.lookml_constants.get(key))
+
+            # Resolve constant from manifest
+            if key in self.manifest_constants:
+                return self.manifest_constants[key].value
+
+            # Check if it's a misplaced lookml constant
+            if key in self.source_config.liquid_variables:
+                self.reporter.warning(
+                    title="Misplaced lookml constant",
+                    message="Use 'lookml_constants' instead of 'liquid_variables'.",
+                    context=f"Key {key}",
+                )
+                return f"@{{{key}}}"
+
+            self.reporter.warning(
+                title="LookML constant not found",
+                message="The constant is missing. Either add it under 'lookml_constants' in the config or define it in `manifest.lkml`.",
+                context=f"view-name: {view_name}, constant: {key}",
+            )
+            return f"@{{{key}}}"
+
+        # Resolve @{} (constant)
+        return re.sub(self.CONSTANT_PATTERN, replace_constants, text)
+
+    def _apply_transformation(self, value: str, view: dict) -> str:
+        return self.resolve_lookml_constant(text=value, view_name=view.get("name"))
+
+
 class TransformedLookMlView:
     """
     TransformedLookMlView is collecting output of LookMLViewTransformer and creating a new transformed LookML view.
@@ -390,24 +463,35 @@ def view(self) -> dict:
 def process_lookml_template_language(
     source_config: LookMLSourceConfig,
     view_lkml_file_dict: dict,
+    reporter: LookMLSourceReport,
+    manifest_constants: Dict[str, "LookerConstant"] = {},
+    resolve_constants: bool = False,
 ) -> None:
     if "views" not in view_lkml_file_dict:
         return
 
     transformers: List[LookMLViewTransformer] = [
         LookMlIfCommentTransformer(
-            source_config=source_config
+            source_config=source_config, reporter=reporter
         ),  # First evaluate the -- if -- comments. Looker does the same
         LiquidVariableTransformer(
-            source_config=source_config
+            source_config=source_config, reporter=reporter
         ),  # Now resolve liquid variables
         DropDerivedViewPatternTransformer(
-            source_config=source_config
+            source_config=source_config, reporter=reporter
         ),  # Remove any ${} symbol
         IncompleteSqlTransformer(
-            source_config=source_config
+            source_config=source_config, reporter=reporter
         ),  # complete any incomplete sql
     ]
+    if resolve_constants:
+        transformers.append(
+            LookmlConstantTransformer(
+                source_config=source_config,
+                manifest_constants=manifest_constants,
+                reporter=reporter,
+            ),  # Resolve @{} constant with its corresponding value
+        )
 
     transformed_views: List[dict] = []
 
@@ -422,12 +506,18 @@ def process_lookml_template_language(
 def load_and_preprocess_file(
     path: Union[str, pathlib.Path],
     source_config: LookMLSourceConfig,
+    reporter: LookMLSourceReport,
+    manifest_constants: Dict[str, "LookerConstant"] = {},
+    resolve_constants: bool = False,
 ) -> dict:
     parsed = load_lkml(path)
 
     process_lookml_template_language(
         view_lkml_file_dict=parsed,
+        reporter=reporter,
         source_config=source_config,
+        manifest_constants=manifest_constants,
+        resolve_constants=resolve_constants,
     )
 
     return parsed
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_config.py b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_config.py
index 4d3255c3c0715b..75de6f1fe3c6e1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_config.py
@@ -161,13 +161,27 @@ class LookMLSourceConfig(
         description="When enabled, looker refinement will be processed to adapt an existing view.",
     )
 
-    liquid_variable: Dict[Any, Any] = Field(
+    liquid_variables: Dict[Any, Any] = Field(
         {},
-        description="A dictionary containing Liquid variables and their corresponding values, utilized in SQL-defined "
+        description="A dictionary containing Liquid variables with their corresponding values, utilized in SQL-defined "
         "derived views. The Liquid template will be resolved in view.derived_table.sql and "
         "view.sql_table_name. Defaults to an empty dictionary.",
     )
 
+    _liquid_variable_deprecated = pydantic_renamed_field(
+        old_name="liquid_variable", new_name="liquid_variables", print_warning=True
+    )
+
+    lookml_constants: Dict[str, str] = Field(
+        {},
+        description=(
+            "A dictionary containing LookML constants (`@{constant_name}`) and their values. "
+            "If a constant is defined in the `manifest.lkml` file, its value will be used. "
+            "If not found in the manifest, the value from this config will be used instead. "
+            "Defaults to an empty dictionary."
+        ),
+    )
+
     looker_environment: Literal["prod", "dev"] = Field(
         "prod",
         description="A looker prod or dev environment. "
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py
index 9a937840a5012f..5f39821ee6c2e3 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py
@@ -43,6 +43,7 @@
 from datahub.ingestion.source.looker.looker_connection import (
     get_connection_def_based_on_connection_string,
 )
+from datahub.ingestion.source.looker.looker_dataclasses import LookerConstant
 from datahub.ingestion.source.looker.looker_lib_wrapper import LookerAPI
 from datahub.ingestion.source.looker.looker_template_language import (
     load_and_preprocess_file,
@@ -254,6 +255,7 @@ class LookerManifest:
     # This must be set if the manifest has local_dependency entries.
     # See https://cloud.google.com/looker/docs/reference/param-manifest-project-name
     project_name: Optional[str]
+    constants: Optional[List[Dict[str, str]]]
 
     local_dependencies: List[str]
     remote_dependencies: List[LookerRemoteDependency]
@@ -310,11 +312,14 @@ def __init__(self, config: LookMLSourceConfig, ctx: PipelineContext):
                     "manage_models permission enabled on this API key."
                 ) from err
 
+        self.manifest_constants: Dict[str, "LookerConstant"] = {}
+
     def _load_model(self, path: str) -> LookerModel:
         logger.debug(f"Loading model from file {path}")
 
         parsed = load_and_preprocess_file(
             path=path,
+            reporter=self.reporter,
             source_config=self.source_config,
         )
 
@@ -500,27 +505,33 @@ def get_project_name(self, model_name: str) -> str:
 
     def get_manifest_if_present(self, folder: pathlib.Path) -> Optional[LookerManifest]:
         manifest_file = folder / "manifest.lkml"
-        if manifest_file.exists():
-            manifest_dict = load_and_preprocess_file(
-                path=manifest_file, source_config=self.source_config
-            )
 
-            manifest = LookerManifest(
-                project_name=manifest_dict.get("project_name"),
-                local_dependencies=[
-                    x["project"] for x in manifest_dict.get("local_dependencys", [])
-                ],
-                remote_dependencies=[
-                    LookerRemoteDependency(
-                        name=x["name"], url=x["url"], ref=x.get("ref")
-                    )
-                    for x in manifest_dict.get("remote_dependencys", [])
-                ],
+        if not manifest_file.exists():
+            self.reporter.info(
+                message="manifest.lkml file missing from project",
+                context=str(manifest_file),
             )
-            return manifest
-        else:
             return None
 
+        manifest_dict = load_and_preprocess_file(
+            path=manifest_file,
+            source_config=self.source_config,
+            reporter=self.reporter,
+        )
+
+        manifest = LookerManifest(
+            project_name=manifest_dict.get("project_name"),
+            constants=manifest_dict.get("constants", []),
+            local_dependencies=[
+                x["project"] for x in manifest_dict.get("local_dependencys", [])
+            ],
+            remote_dependencies=[
+                LookerRemoteDependency(name=x["name"], url=x["url"], ref=x.get("ref"))
+                for x in manifest_dict.get("remote_dependencys", [])
+            ],
+        )
+        return manifest
+
     def get_workunit_processors(self) -> List[Optional[MetadataWorkUnitProcessor]]:
         return [
             *super().get_workunit_processors(),
@@ -575,7 +586,10 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                 self.base_projects_folder[project] = p_ref
 
             self._recursively_check_manifests(
-                tmp_dir, BASE_PROJECT_NAME, visited_projects
+                tmp_dir,
+                BASE_PROJECT_NAME,
+                visited_projects,
+                self.manifest_constants,
             )
 
             yield from self.get_internal_workunits()
@@ -588,7 +602,11 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                 )
 
     def _recursively_check_manifests(
-        self, tmp_dir: str, project_name: str, project_visited: Set[str]
+        self,
+        tmp_dir: str,
+        project_name: str,
+        project_visited: Set[str],
+        manifest_constants: Dict[str, "LookerConstant"],
     ) -> None:
         if project_name in project_visited:
             return
@@ -605,6 +623,14 @@ def _recursively_check_manifests(
         if not manifest:
             return
 
+        if manifest.constants:
+            for constant in manifest.constants:
+                if constant.get("name") and constant.get("value"):
+                    manifest_constants[constant["name"]] = LookerConstant(
+                        name=constant["name"],
+                        value=constant["value"],
+                    )
+
         # Special case handling if the root project has a name in the manifest file.
         if project_name == BASE_PROJECT_NAME and manifest.project_name:
             if (
@@ -664,21 +690,27 @@ def _recursively_check_manifests(
                 project_visited.add(project_name)
             else:
                 self._recursively_check_manifests(
-                    tmp_dir, remote_project.name, project_visited
+                    tmp_dir,
+                    remote_project.name,
+                    project_visited,
+                    manifest_constants,
                 )
 
         for project in manifest.local_dependencies:
-            self._recursively_check_manifests(tmp_dir, project, project_visited)
+            self._recursively_check_manifests(
+                tmp_dir, project, project_visited, manifest_constants
+            )
 
     def get_internal_workunits(self) -> Iterable[MetadataWorkUnit]:  # noqa: C901
         assert self.source_config.base_folder
-
         viewfile_loader = LookerViewFileLoader(
             self.source_config.project_name,
             self.base_projects_folder,
             self.reporter,
             self.source_config,
+            self.manifest_constants,
         )
+        logger.debug(f"LookML Constants : {', '.join(self.manifest_constants.keys())}")
 
         # Some views can be mentioned by multiple 'include' statements and can be included via different connections.
 
diff --git a/metadata-ingestion/tests/integration/lookml/test_lookml.py b/metadata-ingestion/tests/integration/lookml/test_lookml.py
index ac011324684189..7baaccbbaa664b 100644
--- a/metadata-ingestion/tests/integration/lookml/test_lookml.py
+++ b/metadata-ingestion/tests/integration/lookml/test_lookml.py
@@ -14,13 +14,20 @@
 from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.ingestion.run.pipeline import Pipeline
 from datahub.ingestion.source.file import read_metadata_file
-from datahub.ingestion.source.looker.looker_dataclasses import LookerModel
+from datahub.ingestion.source.looker.looker_dataclasses import (
+    LookerConstant,
+    LookerModel,
+)
 from datahub.ingestion.source.looker.looker_template_language import (
+    LookmlConstantTransformer,
     SpecialVariable,
     load_and_preprocess_file,
     resolve_liquid_variable,
 )
-from datahub.ingestion.source.looker.lookml_config import LookMLSourceConfig
+from datahub.ingestion.source.looker.lookml_config import (
+    LookMLSourceConfig,
+    LookMLSourceReport,
+)
 from datahub.ingestion.source.looker.lookml_refinement import LookerRefinementResolver
 from datahub.ingestion.source.looker.lookml_source import LookMLSource
 from datahub.metadata.schema_classes import (
@@ -835,8 +842,7 @@ def test_manifest_parser(pytestconfig: pytest.Config) -> None:
     manifest_file = test_resources_dir / "lkml_manifest_samples/complex-manifest.lkml"
 
     manifest = load_and_preprocess_file(
-        path=manifest_file,
-        source_config=MagicMock(),
+        path=manifest_file, source_config=MagicMock(), reporter=LookMLSourceReport()
     )
 
     assert manifest
@@ -900,6 +906,31 @@ def test_view_to_view_lineage_and_liquid_template(pytestconfig, tmp_path, mock_t
     )
 
 
+@freeze_time(FROZEN_TIME)
+def test_view_to_view_lineage_and_lookml_constant(pytestconfig, tmp_path, mock_time):
+    test_resources_dir = pytestconfig.rootpath / "tests/integration/lookml"
+    mce_out_file = "vv_lineage_lookml_constant_golden.json"
+
+    new_recipe = get_default_recipe(
+        f"{tmp_path}/{mce_out_file}",
+        f"{test_resources_dir}/vv-lineage-and-lookml-constant",
+    )
+
+    new_recipe["source"]["config"]["lookml_constants"] = {"winner_table": "dev"}
+
+    pipeline = Pipeline.create(new_recipe)
+    pipeline.run()
+    pipeline.pretty_print_summary()
+    assert pipeline.source.get_report().warnings.total_elements == 1
+
+    golden_path = test_resources_dir / "vv_lineage_lookml_constant_golden.json"
+    mce_helpers.check_golden_file(
+        pytestconfig,
+        output_path=tmp_path / mce_out_file,
+        golden_path=golden_path,
+    )
+
+
 @freeze_time(FROZEN_TIME)
 def test_special_liquid_variables():
     text: str = """{% assign source_table_variable = "source_table" | sql_quote | non_existing_filter_where_it_should_not_fail %}
@@ -966,6 +997,8 @@ def test_special_liquid_variables():
     actual_text = resolve_liquid_variable(
         text=text,
         liquid_variable=input_liquid_variable,
+        report=LookMLSourceReport(),
+        view_name="test",
     )
 
     expected_text: str = (
@@ -976,6 +1009,108 @@ def test_special_liquid_variables():
     assert actual_text == expected_text
 
 
+@pytest.mark.parametrize(
+    "view, expected_result, warning_expected",
+    [
+        # Case 1: Single constant replacement in sql_table_name
+        (
+            {"sql_table_name": "@{constant1}.kafka_streaming.events"},
+            {"datahub_transformed_sql_table_name": "value1.kafka_streaming.events"},
+            False,
+        ),
+        # Case 2: Single constant replacement with config-defined constant
+        (
+            {"sql_table_name": "SELECT * FROM @{constant2}"},
+            {"datahub_transformed_sql_table_name": "SELECT * FROM value2"},
+            False,
+        ),
+        # Case 3: Multiple constants in a derived_table SQL query
+        (
+            {"derived_table": {"sql": "SELECT @{constant1}, @{constant3}"}},
+            {
+                "derived_table": {
+                    "datahub_transformed_sql": "SELECT value1, manifest_value3"
+                }
+            },
+            False,
+        ),
+        # Case 4: Non-existent constant in sql_table_name
+        (
+            {"sql_table_name": "SELECT * FROM @{nonexistent}"},
+            {"datahub_transformed_sql_table_name": "SELECT * FROM @{nonexistent}"},
+            False,
+        ),
+        # Case 5: View with unsupported attribute
+        ({"unsupported_attribute": "SELECT * FROM @{constant1}"}, {}, False),
+        # Case 6: View with no transformable attributes
+        (
+            {"sql_table_name": "SELECT * FROM table_name"},
+            {"datahub_transformed_sql_table_name": "SELECT * FROM table_name"},
+            False,
+        ),
+        # Case 7: Constants only in manifest_constants
+        (
+            {"sql_table_name": "SELECT @{constant3}"},
+            {"datahub_transformed_sql_table_name": "SELECT manifest_value3"},
+            False,
+        ),
+        # Case 8: Constants only in lookml_constants
+        (
+            {"sql_table_name": "SELECT @{constant2}"},
+            {"datahub_transformed_sql_table_name": "SELECT value2"},
+            False,
+        ),
+        # Case 9: Multiple unsupported attributes
+        (
+            {
+                "unsupported_attribute": "SELECT @{constant1}",
+                "another_unsupported_attribute": "SELECT @{constant2}",
+            },
+            {},
+            False,
+        ),
+        # Case 10: Misplaced lookml constant
+        (
+            {"sql_table_name": "@{constant1}.@{constant2}.@{constant4}"},
+            {"datahub_transformed_sql_table_name": "value1.value2.@{constant4}"},
+            True,
+        ),
+    ],
+)
+@freeze_time(FROZEN_TIME)
+def test_lookml_constant_transformer(view, expected_result, warning_expected):
+    """
+    Test LookmlConstantTransformer with various view structures.
+    """
+    config = MagicMock()
+    report = MagicMock()
+    config.lookml_constants = {
+        "constant1": "value1",
+        "constant2": "value2",
+    }
+    config.liquid_variables = {
+        "constant4": "liquid_value1",
+    }
+
+    transformer = LookmlConstantTransformer(
+        source_config=config,
+        reporter=report,
+        manifest_constants={
+            "constant1": LookerConstant(name="constant1", value="manifest_value1"),
+            "constant3": LookerConstant(name="constant3", value="manifest_value3"),
+        },
+    )
+
+    result = transformer.transform(view)
+    assert result == expected_result
+    if warning_expected:
+        report.warning.assert_called_once_with(
+            title="Misplaced lookml constant",
+            message="Use 'lookml_constants' instead of 'liquid_variables'.",
+            context="Key constant4",
+        )
+
+
 @freeze_time(FROZEN_TIME)
 def test_field_tag_ingest(pytestconfig, tmp_path, mock_time):
     test_resources_dir = pytestconfig.rootpath / "tests/integration/lookml"
diff --git a/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/data.model.lkml b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/data.model.lkml
index d570e0ecdb5b22..4de4df34e15d1e 100644
--- a/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/data.model.lkml
+++ b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-liquid-templates/data.model.lkml
@@ -39,4 +39,4 @@ explore: rent_as_employee_income_source {
 }
 
 explore: child_view {
-}
\ No newline at end of file
+}
diff --git a/metadata-ingestion/tests/integration/lookml/vv-lineage-and-lookml-constant/data.model.lkml b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-lookml-constant/data.model.lkml
new file mode 100644
index 00000000000000..6f425c469c9546
--- /dev/null
+++ b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-lookml-constant/data.model.lkml
@@ -0,0 +1,10 @@
+connection: "my_connection"
+
+include: "star_award_winner.view.lkml"
+include: "star_award_winner_dev.view.lkml"
+
+explore: star_award_winner {
+}
+
+explore: star_award_winner_dev {
+}
diff --git a/metadata-ingestion/tests/integration/lookml/vv-lineage-and-lookml-constant/manifest.lkml b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-lookml-constant/manifest.lkml
new file mode 100644
index 00000000000000..fcdd71a6262945
--- /dev/null
+++ b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-lookml-constant/manifest.lkml
@@ -0,0 +1,15 @@
+constant: customer_support_db {
+  value: "star_award_winner_year"
+  export: none
+}
+
+constant: customer_support_schema {
+  value: "public"
+  export: none
+}
+
+constant: customer_support_table {
+  value: "winner"
+  export: none
+}
+
diff --git a/metadata-ingestion/tests/integration/lookml/vv-lineage-and-lookml-constant/star_award_winner.view.lkml b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-lookml-constant/star_award_winner.view.lkml
new file mode 100644
index 00000000000000..fd0fcf33c376e7
--- /dev/null
+++ b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-lookml-constant/star_award_winner.view.lkml
@@ -0,0 +1,12 @@
+view: star_award_winner {
+  sql_table_name: @{customer_support_db}.@{customer_support_schema}.@{invalid_constant};;
+
+
+  dimension: id {
+    label: "id"
+    primary_key: yes
+    type: number
+    sql: ${TABLE}.id ;;
+  }
+
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/lookml/vv-lineage-and-lookml-constant/star_award_winner_dev.view.lkml b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-lookml-constant/star_award_winner_dev.view.lkml
new file mode 100644
index 00000000000000..0c2417251fc15c
--- /dev/null
+++ b/metadata-ingestion/tests/integration/lookml/vv-lineage-and-lookml-constant/star_award_winner_dev.view.lkml
@@ -0,0 +1,17 @@
+view: star_award_winner_dev {
+  sql_table_name: @{customer_support_db}.@{customer_support_schema}.@{winner_table};;
+
+
+  dimension: id {
+    label: "id"
+    primary_key: yes
+    type: number
+    sql: ${TABLE}.id ;;
+  }
+
+  dimension: name {
+    type: string
+    sql: ${TABLE}.name;;
+  }
+
+}
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/lookml/vv_lineage_lookml_constant_golden.json b/metadata-ingestion/tests/integration/lookml/vv_lineage_lookml_constant_golden.json
new file mode 100644
index 00000000000000..296f09b697ee4d
--- /dev/null
+++ b/metadata-ingestion/tests/integration/lookml/vv_lineage_lookml_constant_golden.json
@@ -0,0 +1,514 @@
+[
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "looker",
+                "env": "PROD",
+                "project_name": "lkml_samples"
+            },
+            "name": "lkml_samples",
+            "env": "PROD"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:looker"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "LookML Project"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Folders"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.star_award_winner,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.star_award_winner,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "view: star_award_winner {\n  sql_table_name: @{customer_support_db}.@{customer_support_schema}.@{invalid_constant};;\n\n\n  dimension: id {\n    label: \"id\"\n    primary_key: yes\n    type: number\n    sql: ${TABLE}.id ;;\n  }\n\n}",
+            "viewLanguage": "lookml"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.star_award_winner,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:78f22c19304954b15e8adb1d9809975e"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.star_award_winner,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.common.BrowsePaths": {
+                        "paths": [
+                            "/Develop/lkml_samples/"
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1586847600000,
+                                    "actor": "urn:li:corpuser:datahub"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,star_award_winner_year.public.@{invalid_constant},PROD)",
+                                "type": "VIEW"
+                            }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,star_award_winner_year.public.@{invalid_constant},PROD),id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.star_award_winner,PROD),id)"
+                                ],
+                                "confidenceScore": 1.0
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "star_award_winner",
+                        "platform": "urn:li:dataPlatform:looker",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.OtherSchema": {
+                                "rawSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "id",
+                                "nullable": false,
+                                "description": "",
+                                "label": "id",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "number",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": true
+                            }
+                        ],
+                        "primaryKeys": [
+                            "id"
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "looker.file.path": "star_award_winner.view.lkml",
+                            "looker.model": "data"
+                        },
+                        "name": "star_award_winner",
+                        "tags": []
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.star_award_winner,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Develop"
+                },
+                {
+                    "id": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+                    "urn": "urn:li:container:78f22c19304954b15e8adb1d9809975e"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.star_award_winner_dev,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "View"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.star_award_winner_dev,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "viewProperties",
+    "aspect": {
+        "json": {
+            "materialized": false,
+            "viewLogic": "view: star_award_winner_dev {\n  sql_table_name: @{customer_support_db}.@{customer_support_schema}.@{winner_table};;\n\n\n  dimension: id {\n    label: \"id\"\n    primary_key: yes\n    type: number\n    sql: ${TABLE}.id ;;\n  }\n\n  dimension: name {\n    type: string\n    sql: ${TABLE}.name;;\n  }\n\n}",
+            "viewLanguage": "lookml"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.star_award_winner_dev,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:78f22c19304954b15e8adb1d9809975e"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "proposedSnapshot": {
+        "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.star_award_winner_dev,PROD)",
+            "aspects": [
+                {
+                    "com.linkedin.pegasus2avro.common.BrowsePaths": {
+                        "paths": [
+                            "/Develop/lkml_samples/"
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.common.Status": {
+                        "removed": false
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+                        "upstreams": [
+                            {
+                                "auditStamp": {
+                                    "time": 1586847600000,
+                                    "actor": "urn:li:corpuser:datahub"
+                                },
+                                "dataset": "urn:li:dataset:(urn:li:dataPlatform:postgres,star_award_winner_year.public.dev,PROD)",
+                                "type": "VIEW"
+                            }
+                        ],
+                        "fineGrainedLineages": [
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,star_award_winner_year.public.dev,PROD),id)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.star_award_winner_dev,PROD),id)"
+                                ],
+                                "confidenceScore": 1.0
+                            },
+                            {
+                                "upstreamType": "FIELD_SET",
+                                "upstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:postgres,star_award_winner_year.public.dev,PROD),name)"
+                                ],
+                                "downstreamType": "FIELD",
+                                "downstreams": [
+                                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.star_award_winner_dev,PROD),name)"
+                                ],
+                                "confidenceScore": 1.0
+                            }
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+                        "schemaName": "star_award_winner_dev",
+                        "platform": "urn:li:dataPlatform:looker",
+                        "version": 0,
+                        "created": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "lastModified": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:unknown"
+                        },
+                        "hash": "",
+                        "platformSchema": {
+                            "com.linkedin.pegasus2avro.schema.OtherSchema": {
+                                "rawSchema": ""
+                            }
+                        },
+                        "fields": [
+                            {
+                                "fieldPath": "id",
+                                "nullable": false,
+                                "description": "",
+                                "label": "id",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.NumberType": {}
+                                    }
+                                },
+                                "nativeDataType": "number",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": true
+                            },
+                            {
+                                "fieldPath": "name",
+                                "nullable": false,
+                                "description": "",
+                                "label": "",
+                                "type": {
+                                    "type": {
+                                        "com.linkedin.pegasus2avro.schema.StringType": {}
+                                    }
+                                },
+                                "nativeDataType": "string",
+                                "recursive": false,
+                                "globalTags": {
+                                    "tags": [
+                                        {
+                                            "tag": "urn:li:tag:Dimension"
+                                        }
+                                    ]
+                                },
+                                "isPartOfKey": false
+                            }
+                        ],
+                        "primaryKeys": [
+                            "id"
+                        ]
+                    }
+                },
+                {
+                    "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+                        "customProperties": {
+                            "looker.file.path": "star_award_winner_dev.view.lkml",
+                            "looker.model": "data"
+                        },
+                        "name": "star_award_winner_dev",
+                        "tags": []
+                    }
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:looker,lkml_samples.view.star_award_winner_dev,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "Develop"
+                },
+                {
+                    "id": "urn:li:container:78f22c19304954b15e8adb1d9809975e",
+                    "urn": "urn:li:container:78f22c19304954b15e8adb1d9809975e"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "tag",
+    "entityUrn": "urn:li:tag:Dimension",
+    "changeType": "UPSERT",
+    "aspectName": "tagKey",
+    "aspect": {
+        "json": {
+            "name": "Dimension"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1586847600000,
+        "runId": "lookml-test",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file

From 7870b13490e684e1179c8df7f95ec52c8ea3b090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20G=C3=B3mez=20Villamor?= <sgomezvillamor@gmail.com>
Date: Tue, 28 Jan 2025 10:26:19 +0100
Subject: [PATCH 172/249] feat(snowflake): set is_temp_table and
 is_allowed_table function for SqlParsingAggregator in SnowflakeV2Source
 (#12438)

---
 .../source/snowflake/snowflake_v2.py          | 45 +++++++++++++++++--
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
index b4ef2180d71d45..7d63f41f4bcf03 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
@@ -5,6 +5,7 @@
 import os
 import os.path
 import platform
+import re
 from dataclasses import dataclass
 from typing import Dict, Iterable, List, Optional, Union
 
@@ -33,6 +34,7 @@
 from datahub.ingestion.source.snowflake.constants import (
     GENERIC_PERMISSION_ERROR_KEY,
     SnowflakeEdition,
+    SnowflakeObjectDomain,
 )
 from datahub.ingestion.source.snowflake.snowflake_assertion import (
     SnowflakeAssertionsHandler,
@@ -162,6 +164,8 @@ def __init__(self, ctx: PipelineContext, config: SnowflakeV2Config):
         self.data_dictionary = SnowflakeDataDictionary(connection=self.connection)
         self.lineage_extractor: Optional[SnowflakeLineageExtractor] = None
 
+        self.discovered_datasets: Optional[List[str]] = None
+
         self.aggregator: SqlParsingAggregator = self._exit_stack.enter_context(
             SqlParsingAggregator(
                 platform=self.identifiers.platform,
@@ -182,6 +186,8 @@ def __init__(self, ctx: PipelineContext, config: SnowflakeV2Config):
                 generate_usage_statistics=False,
                 generate_operations=False,
                 format_queries=self.config.format_sql_queries,
+                is_temp_table=self._is_temp_table,
+                is_allowed_table=self._is_allowed_table,
             )
         )
         self.report.sql_aggregator = self.aggregator.report
@@ -444,6 +450,34 @@ class SnowflakePrivilege:
 
         return _report
 
+    def _is_temp_table(self, name: str) -> bool:
+        if any(
+            re.match(pattern, name, flags=re.IGNORECASE)
+            for pattern in self.config.temporary_tables_pattern
+        ):
+            return True
+
+        # This is also a temp table if
+        #   1. this name would be allowed by the dataset patterns, and
+        #   2. we have a list of discovered tables, and
+        #   3. it's not in the discovered tables list
+        if (
+            self.filters.is_dataset_pattern_allowed(name, SnowflakeObjectDomain.TABLE)
+            and self.discovered_datasets
+            and name not in self.discovered_datasets
+        ):
+            return True
+
+        return False
+
+    def _is_allowed_table(self, name: str) -> bool:
+        if self.discovered_datasets and name not in self.discovered_datasets:
+            return False
+
+        return self.filters.is_dataset_pattern_allowed(
+            name, SnowflakeObjectDomain.TABLE
+        )
+
     def get_workunit_processors(self) -> List[Optional[MetadataWorkUnitProcessor]]:
         return [
             *super().get_workunit_processors(),
@@ -513,7 +547,7 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
             )
             return
 
-        discovered_datasets = discovered_tables + discovered_views
+        self.discovered_datasets = discovered_tables + discovered_views
 
         if self.config.use_queries_v2:
             with self.report.new_stage(f"*: {VIEW_PARSING}"):
@@ -538,13 +572,14 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                     filters=self.filters,
                     identifiers=self.identifiers,
                     schema_resolver=schema_resolver,
-                    discovered_tables=discovered_datasets,
+                    discovered_tables=self.discovered_datasets,
                     graph=self.ctx.graph,
                 )
 
                 # TODO: This is slightly suboptimal because we create two SqlParsingAggregator instances with different configs
                 # but a shared schema resolver. That's fine for now though - once we remove the old lineage/usage extractors,
                 # it should be pretty straightforward to refactor this and only initialize the aggregator once.
+                # This also applies for the _is_temp_table and _is_allowed_table methods above, duplicated from SnowflakeQueriesExtractor.
                 self.report.queries_extractor = queries_extractor.report
                 yield from queries_extractor.get_workunits_internal()
                 queries_extractor.close()
@@ -568,12 +603,14 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
             if (
                 self.config.include_usage_stats or self.config.include_operational_stats
             ) and self.usage_extractor:
-                yield from self.usage_extractor.get_usage_workunits(discovered_datasets)
+                yield from self.usage_extractor.get_usage_workunits(
+                    self.discovered_datasets
+                )
 
         if self.config.include_assertion_results:
             yield from SnowflakeAssertionsHandler(
                 self.config, self.report, self.connection, self.identifiers
-            ).get_assertion_workunits(discovered_datasets)
+            ).get_assertion_workunits(self.discovered_datasets)
 
         self.connection.close()
 

From 79aa40f1e69632ab6e0d63c1c9554a682a99424c Mon Sep 17 00:00:00 2001
From: skrydal <piotr.skrydalewicz@acryl.io>
Date: Tue, 28 Jan 2025 13:06:24 +0100
Subject: [PATCH 173/249] log(ingest/lookml): view file missing/parsing as
 warnings (#12448)

---
 .../src/datahub/ingestion/source/looker/looker_config.py      | 4 +++-
 .../src/datahub/ingestion/source/looker/looker_file_loader.py | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_config.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_config.py
index 3ed3186399588e..0f8d86a2cbd295 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_config.py
@@ -177,7 +177,9 @@ def _get_generic_definition(
 class LookerConnectionDefinition(ConfigModel):
     platform: str
     default_db: str
-    default_schema: Optional[str]  # Optional since some sources are two-level only
+    default_schema: Optional[str] = (
+        None  # Optional since some sources are two-level only
+    )
     platform_instance: Optional[str] = None
     platform_env: Optional[str] = Field(
         default=None,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_file_loader.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_file_loader.py
index bd6a37fe4b4e24..ba7b62a1281c02 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_file_loader.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_file_loader.py
@@ -65,7 +65,7 @@ def _load_viewfile(
             with open(path) as file:
                 raw_file_content = file.read()
         except Exception as e:
-            self.reporter.failure(
+            self.reporter.report_warning(
                 title="LKML File Loading Error",
                 message="A lookml file is not present on local storage or GitHub",
                 context=f"file path: {path}",
@@ -101,7 +101,7 @@ def _load_viewfile(
             self.viewfile_cache[path] = looker_viewfile
             return looker_viewfile
         except Exception as e:
-            self.reporter.failure(
+            self.reporter.report_warning(
                 title="LKML File Parsing Error",
                 message="The input file is not lookml file",
                 context=f"file path: {path}",

From 15c3783532ceb489f783baf1f7a43d3b98a362a8 Mon Sep 17 00:00:00 2001
From: Gabe Lyons <gabe.lyons@acryl.io>
Date: Tue, 28 Jan 2025 13:57:42 -0800
Subject: [PATCH 174/249] docs(entity-change-events): include add/remove/update
 examples (#12388)

---
 docs/actions/events/entity-change-event.md | 69 +++++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

diff --git a/docs/actions/events/entity-change-event.md b/docs/actions/events/entity-change-event.md
index 27277a97ad1994..4a7264c20bcc62 100644
--- a/docs/actions/events/entity-change-event.md
+++ b/docs/actions/events/entity-change-event.md
@@ -219,6 +219,73 @@ This event is emitted when an existing owner has been removed from an entity on
 }
 ```
 
+### Add Structured Property Event
+
+This event is emitted when a Structured Property has been added to an entity on DataHub.
+
+#### Sample Event
+```json
+{
+  "entityUrn": "urn:li:dataset:abc",
+  "entityType": "dataset",
+  "category": "STRUCTURED_PROPERTY",
+  "operation": "ADD",
+  "modifier": "urn:li:structuredProperty:prop1",
+  "parameters": {
+    "propertyUrn": "urn:li:structuredProperty:prop1",
+    "propertyValues": "[\"value1\"]"
+  },
+  "version": 0,
+  "auditStamp": {
+    "actor": "urn:li:corpuser:jdoe",
+    "time": 1649953100653   
+  }
+}
+```
+
+### Remove Structured Property Event
+
+This event is emitted when a Structured Property has been removed from an entity on DataHub.
+
+#### Sample Event
+```json
+{
+  "entityUrn": "urn:li:dataset:abc",
+  "entityType": "dataset",
+  "category": "STRUCTURED_PROPERTY",
+  "operation": "REMOVE",
+  "modifier": "urn:li:structuredProperty:prop1",
+  "version": 0,
+  "auditStamp": {
+    "actor": "urn:li:corpuser:jdoe",
+    "time": 1649953100653   
+  }
+}
+```
+
+### Modify Structured Property Event
+
+This event is emitted when a Structured Property's values have been modified on an entity in DataHub.
+
+#### Sample Event
+```json
+{
+  "entityUrn": "urn:li:dataset:abc",
+  "entityType": "dataset",
+  "category": "STRUCTURED_PROPERTY",
+  "operation": "MODIFY",
+  "modifier": "urn:li:structuredProperty:prop1",
+  "parameters": {
+    "propertyUrn": "urn:li:structuredProperty:prop1",
+    "propertyValues": "[\"value1\",\"value2\"]"
+  },
+  "version": 0,
+  "auditStamp": {
+    "actor": "urn:li:corpuser:jdoe",
+    "time": 1649953100653   
+  }
+}
+```
 
 ### Modify Deprecation Event
 
@@ -349,4 +416,4 @@ This event is emitted when a new entity has been hard-deleted on DataHub.
     "time": 1649953100653   
   }
 }
-```
\ No newline at end of file
+```

From dbd57c972f79ae1469adc0c8bde77fd6821fb819 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Tue, 28 Jan 2025 15:59:01 -0600
Subject: [PATCH 175/249] fix(ci): fix datahub-ingestion release/tag publishing
 (#12466)

---
 .github/workflows/docker-unified.yml       | 14 +++++++-------
 docker/datahub-ingestion-base/build.gradle |  2 +-
 docker/datahub-ingestion/build.gradle      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker-unified.yml b/.github/workflows/docker-unified.yml
index 5f944c8e28769f..a756b27a38e848 100644
--- a/.github/workflows/docker-unified.yml
+++ b/.github/workflows/docker-unified.yml
@@ -44,6 +44,7 @@ jobs:
       tag: ${{ steps.tag.outputs.tag }}
       slim_tag: ${{ steps.tag.outputs.slim_tag }}
       full_tag: ${{ steps.tag.outputs.full_tag }}
+      short_sha: ${{ steps.tag.outputs.short_sha }} # needed for auto-deploy
       unique_tag: ${{ steps.tag.outputs.unique_tag }}
       unique_slim_tag: ${{ steps.tag.outputs.unique_slim_tag }}
       unique_full_tag: ${{ steps.tag.outputs.unique_full_tag }}
@@ -65,6 +66,8 @@ jobs:
       postgres_setup_change: ${{ steps.ci-optimize.outputs.postgres-setup-change == 'true' }}
       elasticsearch_setup_change: ${{ steps.ci-optimize.outputs.elasticsearch-setup-change == 'true' }}
       smoke_test_change: ${{ steps.ci-optimize.outputs.smoke-test-change == 'true' }}
+      integrations_service_change: "false"
+      datahub_executor_change: "false"
     steps:
       - name: Check out the repo
         uses: acryldata/sane-checkout-action@v3
@@ -864,7 +867,8 @@ jobs:
           context: .
           file: ./docker/datahub-ingestion/Dockerfile
           platforms: linux/amd64,linux/arm64/v8
-          depot-project: ${{ vars.DEPOT_PROJECT_ID }}
+          # Workaround 2025-01-25 - Depot publishing errors
+          depot-project: ${{ (startsWith(github.ref, 'refs/tags/') || github.event_name == 'release') && '' || vars.DEPOT_PROJECT_ID }}
       - name: Compute Tag
         id: tag
         run: echo "tag=${{ needs.setup.outputs.ingestion_change == 'true' && needs.setup.outputs.unique_slim_tag || 'head-slim' }}" >> "$GITHUB_OUTPUT"
@@ -963,7 +967,8 @@ jobs:
           context: .
           file: ./docker/datahub-ingestion/Dockerfile
           platforms: linux/amd64,linux/arm64/v8
-          depot-project: ${{ vars.DEPOT_PROJECT_ID }}
+          # Workaround 2025-01-25 - Depot publishing errors
+          depot-project: ${{ (startsWith(github.ref, 'refs/tags/') || github.event_name == 'release') && '' || vars.DEPOT_PROJECT_ID }}
       - name: Compute Tag (Full)
         id: tag
         run: echo "tag=${{ needs.setup.outputs.ingestion_change == 'true' && needs.setup.outputs.unique_tag || 'head' }}" >> "$GITHUB_OUTPUT"
@@ -1178,11 +1183,6 @@ jobs:
             docker pull '${{ env.DATAHUB_ELASTIC_SETUP_IMAGE }}:head'
             docker tag '${{ env.DATAHUB_ELASTIC_SETUP_IMAGE }}:head' '${{ env.DATAHUB_ELASTIC_SETUP_IMAGE }}:${{ needs.setup.outputs.unique_tag }}'
           fi
-          if [ '${{ needs.setup.outputs.integrations_service_change }}' == 'false' ]; then
-            echo 'datahub-integration-service head images'
-            docker pull '${{ env.DATAHUB_INTEGRATIONS_IMAGE }}:head'
-            docker tag '${{ env.DATAHUB_INTEGRATIONS_IMAGE }}:head' '${{ env.DATAHUB_INTEGRATIONS_IMAGE }}:${{ needs.setup.outputs.unique_tag }}'
-          fi
       - name: CI Slim Head Images
         run: |
           if [ '${{ needs.setup.outputs.ingestion_change }}' == 'false' ]; then
diff --git a/docker/datahub-ingestion-base/build.gradle b/docker/datahub-ingestion-base/build.gradle
index f19faa227ca612..b3ed6463b9f6c8 100644
--- a/docker/datahub-ingestion-base/build.gradle
+++ b/docker/datahub-ingestion-base/build.gradle
@@ -12,7 +12,7 @@ ext {
     docker_target = project.getProperties().getOrDefault("dockerTarget", "slim")
     docker_version = "${version}${docker_target == 'slim' ? '-slim' : ''}"
 
-    revision = 8 // increment to trigger rebuild
+    revision = 10 // increment to trigger rebuild
 }
 
 docker {
diff --git a/docker/datahub-ingestion/build.gradle b/docker/datahub-ingestion/build.gradle
index b236a53c288f7f..b0b666f75eb5a6 100644
--- a/docker/datahub-ingestion/build.gradle
+++ b/docker/datahub-ingestion/build.gradle
@@ -12,7 +12,7 @@ ext {
     docker_target = project.getProperties().getOrDefault("dockerTarget", "slim")
     docker_version = "${version}${docker_target == 'slim' ? '-slim' : ''}"
 
-    revision = 9 // increment to trigger rebuild
+    revision = 10 // increment to trigger rebuild
 }
 
 dependencies {

From 47134c272bd82ff8d00b6a30c725fbde4165335c Mon Sep 17 00:00:00 2001
From: Hyejin Yoon <0327jane@gmail.com>
Date: Wed, 29 Jan 2025 11:41:56 +0900
Subject: [PATCH 176/249] feat: update ml system UI (#12334)

Co-authored-by: Andrew Sikowitz <andrew.sikowitz@acryl.io>
Co-authored-by: RyanHolstien <RyanHolstien@users.noreply.github.com>
Co-authored-by: Shirshanka Das <shirshanka@apache.org>
Co-authored-by: ryota-cloud <ryota.egashira@acryl.io>
---
 .../mappers/MLModelGroupPropertiesMapper.java |  33 +++
 .../mappers/MLModelPropertiesMapper.java      |  15 ++
 .../src/main/resources/lineage.graphql        |  29 +++
 .../MLModelGroupPropertiesMapperTest.java     |  68 ++++++
 .../mappers/MLModelPropertiesMapperTest.java  | 187 ++++++++++++++++
 .../src/app/entity/EntityPage.tsx             |   1 +
 .../DataProcessInstanceEntity.tsx             |  72 ++----
 .../dataProcessInstance/preview/Preview.tsx   |  20 +-
 .../profile/DataProcessInstanceSummary.tsx    | 102 +++++++++
 .../src/app/entity/mlModel/MLModelEntity.tsx  |   2 +-
 .../app/entity/mlModel/preview/Preview.tsx    |   3 +-
 .../entity/mlModel/profile/MLModelSummary.tsx |  96 +++++++-
 .../mlModelGroup/MLModelGroupEntity.tsx       |   2 +-
 .../entity/mlModelGroup/preview/Preview.tsx   |   3 +-
 .../mlModelGroup/profile/ModelGroupModels.tsx | 208 ++++++++++++++++--
 .../search/EmbeddedListSearchSection.tsx      |  27 ++-
 .../src/app/entity/shared/constants.ts        |   4 +
 .../DataProcessInstanceRightColumn.tsx        |  87 ++++++++
 .../src/app/preview/DefaultPreviewCard.tsx    |  12 +-
 .../src/app/shared/time/timeUtils.tsx         |  38 ++++
 .../src/graphql/fragments.graphql             |  12 +
 datahub-web-react/src/graphql/lineage.graphql |  32 +++
 datahub-web-react/src/graphql/mlModel.graphql |  17 ++
 datahub-web-react/src/graphql/search.graphql  |   9 +
 24 files changed, 989 insertions(+), 90 deletions(-)
 create mode 100644 datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelGroupPropertiesMapperTest.java
 create mode 100644 datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelPropertiesMapperTest.java
 create mode 100644 datahub-web-react/src/app/entity/dataProcessInstance/profile/DataProcessInstanceSummary.tsx
 create mode 100644 datahub-web-react/src/app/preview/DataProcessInstanceRightColumn.tsx

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelGroupPropertiesMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelGroupPropertiesMapper.java
index a6cfded9865d90..2da2fa2a58a6af 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelGroupPropertiesMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelGroupPropertiesMapper.java
@@ -3,8 +3,11 @@
 import com.linkedin.common.urn.Urn;
 import com.linkedin.datahub.graphql.QueryContext;
 import com.linkedin.datahub.graphql.generated.MLModelGroupProperties;
+import com.linkedin.datahub.graphql.generated.MLModelLineageInfo;
 import com.linkedin.datahub.graphql.types.common.mappers.CustomPropertiesMapper;
+import com.linkedin.datahub.graphql.types.common.mappers.TimeStampToAuditStampMapper;
 import com.linkedin.datahub.graphql.types.mappers.EmbeddedModelMapper;
+import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -33,10 +36,40 @@ public MLModelGroupProperties apply(
       result.setVersion(VersionTagMapper.map(context, mlModelGroupProperties.getVersion()));
     }
     result.setCreatedAt(mlModelGroupProperties.getCreatedAt());
+    if (mlModelGroupProperties.hasCreated()) {
+      result.setCreated(
+          TimeStampToAuditStampMapper.map(context, mlModelGroupProperties.getCreated()));
+    }
+    if (mlModelGroupProperties.getName() != null) {
+      result.setName(mlModelGroupProperties.getName());
+    } else {
+      // backfill name from URN for backwards compatibility
+      result.setName(entityUrn.getEntityKey().get(1)); // indexed access is safe here
+    }
+
+    if (mlModelGroupProperties.hasLastModified()) {
+      result.setLastModified(
+          TimeStampToAuditStampMapper.map(context, mlModelGroupProperties.getLastModified()));
+    }
 
     result.setCustomProperties(
         CustomPropertiesMapper.map(mlModelGroupProperties.getCustomProperties(), entityUrn));
 
+    final MLModelLineageInfo lineageInfo = new MLModelLineageInfo();
+    if (mlModelGroupProperties.hasTrainingJobs()) {
+      lineageInfo.setTrainingJobs(
+          mlModelGroupProperties.getTrainingJobs().stream()
+              .map(urn -> urn.toString())
+              .collect(Collectors.toList()));
+    }
+    if (mlModelGroupProperties.hasDownstreamJobs()) {
+      lineageInfo.setDownstreamJobs(
+          mlModelGroupProperties.getDownstreamJobs().stream()
+              .map(urn -> urn.toString())
+              .collect(Collectors.toList()));
+    }
+    result.setMlModelLineageInfo(lineageInfo);
+
     return result;
   }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelPropertiesMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelPropertiesMapper.java
index 7b00fe88f2d683..1f1003dea720c3 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelPropertiesMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelPropertiesMapper.java
@@ -5,6 +5,7 @@
 import com.linkedin.common.urn.Urn;
 import com.linkedin.datahub.graphql.QueryContext;
 import com.linkedin.datahub.graphql.generated.MLModelGroup;
+import com.linkedin.datahub.graphql.generated.MLModelLineageInfo;
 import com.linkedin.datahub.graphql.generated.MLModelProperties;
 import com.linkedin.datahub.graphql.types.common.mappers.CustomPropertiesMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.TimeStampToAuditStampMapper;
@@ -87,6 +88,20 @@ public MLModelProperties apply(
               .collect(Collectors.toList()));
     }
     result.setTags(mlModelProperties.getTags());
+    final MLModelLineageInfo lineageInfo = new MLModelLineageInfo();
+    if (mlModelProperties.hasTrainingJobs()) {
+      lineageInfo.setTrainingJobs(
+          mlModelProperties.getTrainingJobs().stream()
+              .map(urn -> urn.toString())
+              .collect(Collectors.toList()));
+    }
+    if (mlModelProperties.hasDownstreamJobs()) {
+      lineageInfo.setDownstreamJobs(
+          mlModelProperties.getDownstreamJobs().stream()
+              .map(urn -> urn.toString())
+              .collect(Collectors.toList()));
+    }
+    result.setMlModelLineageInfo(lineageInfo);
 
     return result;
   }
diff --git a/datahub-graphql-core/src/main/resources/lineage.graphql b/datahub-graphql-core/src/main/resources/lineage.graphql
index 975d013a448058..abb1446421858f 100644
--- a/datahub-graphql-core/src/main/resources/lineage.graphql
+++ b/datahub-graphql-core/src/main/resources/lineage.graphql
@@ -25,3 +25,32 @@ input LineageEdge {
     """
     upstreamUrn: String!
 }
+
+"""
+Represents lineage information for ML entities.
+"""
+type MLModelLineageInfo {
+   """
+   List of jobs or processes used to train the model.
+   """
+   trainingJobs: [String!]
+
+   """
+   List of jobs or processes that use this model.
+   """
+   downstreamJobs: [String!]
+}
+
+extend type MLModelProperties {
+    """
+    Information related to lineage to this model group
+    """
+    mlModelLineageInfo: MLModelLineageInfo
+}
+
+extend type MLModelGroupProperties {
+    """
+    Information related to lineage to this model group
+    """
+    mlModelLineageInfo: MLModelLineageInfo
+}
\ No newline at end of file
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelGroupPropertiesMapperTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelGroupPropertiesMapperTest.java
new file mode 100644
index 00000000000000..fc738837c09d17
--- /dev/null
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelGroupPropertiesMapperTest.java
@@ -0,0 +1,68 @@
+package com.linkedin.datahub.graphql.types.mlmodel.mappers;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+
+import com.linkedin.common.urn.Urn;
+import com.linkedin.ml.metadata.MLModelGroupProperties;
+import java.net.URISyntaxException;
+import org.testng.annotations.Test;
+
+public class MLModelGroupPropertiesMapperTest {
+
+  @Test
+  public void testMapMLModelGroupProperties() throws URISyntaxException {
+    // Create backend ML Model Group Properties
+    MLModelGroupProperties input = new MLModelGroupProperties();
+
+    // Set description
+    input.setDescription("a ml trust model group");
+
+    // Set Name
+    input.setName("ML trust model group");
+
+    // Create URN
+    Urn groupUrn =
+        Urn.createFromString(
+            "urn:li:mlModelGroup:(urn:li:dataPlatform:sagemaker,another-group,PROD)");
+
+    // Map the properties
+    com.linkedin.datahub.graphql.generated.MLModelGroupProperties result =
+        MLModelGroupPropertiesMapper.map(null, input, groupUrn);
+
+    // Verify mapped properties
+    assertNotNull(result);
+    assertEquals(result.getDescription(), "a ml trust model group");
+    assertEquals(result.getName(), "ML trust model group");
+
+    // Verify lineage info is null as in the mock data
+    assertNotNull(result.getMlModelLineageInfo());
+    assertNull(result.getMlModelLineageInfo().getTrainingJobs());
+    assertNull(result.getMlModelLineageInfo().getDownstreamJobs());
+  }
+
+  @Test
+  public void testMapWithMinimalProperties() throws URISyntaxException {
+    // Create backend ML Model Group Properties with minimal information
+    MLModelGroupProperties input = new MLModelGroupProperties();
+
+    // Create URN
+    Urn groupUrn =
+        Urn.createFromString(
+            "urn:li:mlModelGroup:(urn:li:dataPlatform:sagemaker,another-group,PROD)");
+
+    // Map the properties
+    com.linkedin.datahub.graphql.generated.MLModelGroupProperties result =
+        MLModelGroupPropertiesMapper.map(null, input, groupUrn);
+
+    // Verify basic mapping with minimal properties
+    assertNotNull(result);
+    assertNull(result.getDescription());
+
+    // Verify lineage info is null
+    assertNotNull(result.getMlModelLineageInfo());
+    assertNull(result.getMlModelLineageInfo().getTrainingJobs());
+    assertNull(result.getMlModelLineageInfo().getDownstreamJobs());
+  }
+}
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelPropertiesMapperTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelPropertiesMapperTest.java
new file mode 100644
index 00000000000000..17fa7a0abe1396
--- /dev/null
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelPropertiesMapperTest.java
@@ -0,0 +1,187 @@
+package com.linkedin.datahub.graphql.types.mlmodel.mappers;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+
+import com.linkedin.common.MLFeatureUrnArray;
+import com.linkedin.common.TimeStamp;
+import com.linkedin.common.VersionTag;
+import com.linkedin.common.url.Url;
+import com.linkedin.common.urn.MLFeatureUrn;
+import com.linkedin.common.urn.MLModelUrn;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.data.template.StringArray;
+import com.linkedin.data.template.StringMap;
+import com.linkedin.ml.metadata.MLHyperParam;
+import com.linkedin.ml.metadata.MLHyperParamArray;
+import com.linkedin.ml.metadata.MLMetric;
+import com.linkedin.ml.metadata.MLMetricArray;
+import com.linkedin.ml.metadata.MLModelProperties;
+import java.net.URISyntaxException;
+import org.testng.annotations.Test;
+
+public class MLModelPropertiesMapperTest {
+
+  @Test
+  public void testMapMLModelProperties() throws URISyntaxException {
+    MLModelProperties input = new MLModelProperties();
+
+    // Set basic properties
+    input.setName("TestModel");
+    input.setDescription("A test ML model");
+    input.setType("Classification");
+
+    // Set version
+    VersionTag versionTag = new VersionTag();
+    versionTag.setVersionTag("1.0.0");
+    input.setVersion(versionTag);
+
+    // Set external URL
+    Url externalUrl = new Url("https://example.com/model");
+    input.setExternalUrl(externalUrl);
+
+    // Set created and last modified timestamps
+    TimeStamp createdTimeStamp = new TimeStamp();
+    createdTimeStamp.setTime(1000L);
+    Urn userUrn = Urn.createFromString("urn:li:corpuser:test");
+    createdTimeStamp.setActor(userUrn);
+    input.setCreated(createdTimeStamp);
+
+    TimeStamp lastModifiedTimeStamp = new TimeStamp();
+    lastModifiedTimeStamp.setTime(2000L);
+    lastModifiedTimeStamp.setActor(userUrn);
+    input.setLastModified(lastModifiedTimeStamp);
+
+    // Set custom properties
+    StringMap customProps = new StringMap();
+    customProps.put("key1", "value1");
+    customProps.put("key2", "value2");
+    input.setCustomProperties(customProps);
+
+    // Set hyper parameters
+    MLHyperParamArray hyperParams = new MLHyperParamArray();
+    MLHyperParam hyperParam1 = new MLHyperParam();
+    hyperParam1.setName("learning_rate");
+    hyperParam1.setValue("0.01");
+    hyperParams.add(hyperParam1);
+    input.setHyperParams(hyperParams);
+
+    // Set training metrics
+    MLMetricArray trainingMetrics = new MLMetricArray();
+    MLMetric metric1 = new MLMetric();
+    metric1.setName("accuracy");
+    metric1.setValue("0.95");
+    trainingMetrics.add(metric1);
+    input.setTrainingMetrics(trainingMetrics);
+
+    // Set ML features
+    MLFeatureUrnArray mlFeatures = new MLFeatureUrnArray();
+    MLFeatureUrn featureUrn = MLFeatureUrn.createFromString("urn:li:mlFeature:(dataset,feature)");
+    mlFeatures.add(featureUrn);
+    input.setMlFeatures(mlFeatures);
+
+    // Set tags
+    StringArray tags = new StringArray();
+    tags.add("tag1");
+    tags.add("tag2");
+    input.setTags(tags);
+
+    // Set training and downstream jobs
+    input.setTrainingJobs(
+        new com.linkedin.common.UrnArray(Urn.createFromString("urn:li:dataJob:train")));
+    input.setDownstreamJobs(
+        new com.linkedin.common.UrnArray(Urn.createFromString("urn:li:dataJob:predict")));
+
+    // Create ML Model URN
+    MLModelUrn modelUrn =
+        MLModelUrn.createFromString(
+            "urn:li:mlModel:(urn:li:dataPlatform:sagemaker,unittestmodel,PROD)");
+
+    // Map the properties
+    com.linkedin.datahub.graphql.generated.MLModelProperties result =
+        MLModelPropertiesMapper.map(null, input, modelUrn);
+
+    // Verify mapped properties
+    assertNotNull(result);
+    assertEquals(result.getName(), "TestModel");
+    assertEquals(result.getDescription(), "A test ML model");
+    assertEquals(result.getType(), "Classification");
+    assertEquals(result.getVersion(), "1.0.0");
+    assertEquals(result.getExternalUrl(), "https://example.com/model");
+
+    // Verify audit stamps
+    assertNotNull(result.getCreated());
+    assertEquals(result.getCreated().getTime().longValue(), 1000L);
+    assertEquals(result.getCreated().getActor(), userUrn.toString());
+
+    assertNotNull(result.getLastModified());
+    assertEquals(result.getLastModified().getTime().longValue(), 2000L);
+    assertEquals(result.getLastModified().getActor(), userUrn.toString());
+
+    // Verify custom properties
+    assertNotNull(result.getCustomProperties());
+
+    // Verify hyper parameters
+    assertNotNull(result.getHyperParams());
+    assertEquals(result.getHyperParams().size(), 1);
+    assertEquals(result.getHyperParams().get(0).getName(), "learning_rate");
+    assertEquals(result.getHyperParams().get(0).getValue(), "0.01");
+
+    // Verify training metrics
+    assertNotNull(result.getTrainingMetrics());
+    assertEquals(result.getTrainingMetrics().size(), 1);
+    assertEquals(result.getTrainingMetrics().get(0).getName(), "accuracy");
+    assertEquals(result.getTrainingMetrics().get(0).getValue(), "0.95");
+
+    // Verify ML features
+    assertNotNull(result.getMlFeatures());
+    assertEquals(result.getMlFeatures().size(), 1);
+    assertEquals(result.getMlFeatures().get(0), featureUrn.toString());
+
+    // Verify tags
+    assertNotNull(result.getTags());
+    assertEquals(result.getTags().get(0), "tag1");
+    assertEquals(result.getTags().get(1), "tag2");
+
+    // Verify lineage info
+    assertNotNull(result.getMlModelLineageInfo());
+    assertEquals(result.getMlModelLineageInfo().getTrainingJobs().size(), 1);
+    assertEquals(result.getMlModelLineageInfo().getTrainingJobs().get(0), "urn:li:dataJob:train");
+    assertEquals(result.getMlModelLineageInfo().getDownstreamJobs().size(), 1);
+    assertEquals(
+        result.getMlModelLineageInfo().getDownstreamJobs().get(0), "urn:li:dataJob:predict");
+  }
+
+  @Test
+  public void testMapWithMissingName() throws URISyntaxException {
+    MLModelProperties input = new MLModelProperties();
+    MLModelUrn modelUrn =
+        MLModelUrn.createFromString(
+            "urn:li:mlModel:(urn:li:dataPlatform:sagemaker,missingnamemodel,PROD)");
+
+    com.linkedin.datahub.graphql.generated.MLModelProperties result =
+        MLModelPropertiesMapper.map(null, input, modelUrn);
+
+    // Verify that name is extracted from URN when not present in input
+    assertEquals(result.getName(), "missingnamemodel");
+  }
+
+  @Test
+  public void testMapWithMinimalProperties() throws URISyntaxException {
+    MLModelProperties input = new MLModelProperties();
+    MLModelUrn modelUrn =
+        MLModelUrn.createFromString(
+            "urn:li:mlModel:(urn:li:dataPlatform:sagemaker,minimalmodel,PROD)");
+
+    com.linkedin.datahub.graphql.generated.MLModelProperties result =
+        MLModelPropertiesMapper.map(null, input, modelUrn);
+
+    // Verify basic mapping with minimal properties
+    assertNotNull(result);
+    assertEquals(result.getName(), "minimalmodel");
+    assertNull(result.getDescription());
+    assertNull(result.getType());
+    assertNull(result.getVersion());
+  }
+}
diff --git a/datahub-web-react/src/app/entity/EntityPage.tsx b/datahub-web-react/src/app/entity/EntityPage.tsx
index 916fa417954126..d05f75694ab94e 100644
--- a/datahub-web-react/src/app/entity/EntityPage.tsx
+++ b/datahub-web-react/src/app/entity/EntityPage.tsx
@@ -66,6 +66,7 @@ export const EntityPage = ({ entityType }: Props) => {
         entityType === EntityType.MlfeatureTable ||
         entityType === EntityType.MlmodelGroup ||
         entityType === EntityType.GlossaryTerm ||
+        entityType === EntityType.DataProcessInstance ||
         entityType === EntityType.GlossaryNode;
 
     return (
diff --git a/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx b/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx
index 9bb9bd745d1ee6..bdf77959e97c7f 100644
--- a/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx
+++ b/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx
@@ -1,12 +1,7 @@
 import React from 'react';
 import { ApiOutlined } from '@ant-design/icons';
-import {
-    DataProcessInstance,
-    Entity as GeneratedEntity,
-    EntityType,
-    OwnershipType,
-    SearchResult,
-} from '../../../types.generated';
+import { Entity as GraphQLEntity } from '@types';
+import { DataProcessInstance, EntityType, OwnershipType, SearchResult } from '../../../types.generated';
 import { Preview } from './preview/Preview';
 import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
 import { EntityProfile } from '../shared/containers/profile/EntityProfile';
@@ -23,32 +18,21 @@ import { EntityMenuItems } from '../shared/EntityDropdown/EntityDropdown';
 import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
 import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection';
 import { getDataProduct } from '../shared/utils';
-// import SummaryTab from './profile/DataProcessInstaceSummary';
+import SummaryTab from './profile/DataProcessInstanceSummary';
 
-// const getProcessPlatformName = (data?: DataProcessInstance): string => {
-//     return (
-//         data?.dataPlatformInstance?.platform?.properties?.displayName ||
-//         capitalizeFirstLetterOnly(data?.dataPlatformInstance?.platform?.name) ||
-//         ''
-//     );
-// };
-
-const getParentEntities = (data: DataProcessInstance): GeneratedEntity[] => {
+const getParentEntities = (data: DataProcessInstance): GraphQLEntity[] => {
     const parentEntity = data?.relationships?.relationships?.find(
         (rel) => rel.type === 'InstanceOf' && rel.entity?.type === EntityType.DataJob,
     );
 
-    if (!parentEntity?.entity) return [];
+    if (!parentEntity || !parentEntity.entity) {
+        return [];
+    }
 
-    // Convert to GeneratedEntity
-    return [
-        {
-            type: parentEntity.entity.type,
-            urn: (parentEntity.entity as any).urn, // Make sure urn exists
-            relationships: (parentEntity.entity as any).relationships,
-        },
-    ];
+    // First cast to unknown, then to Entity with proper type
+    return [parentEntity.entity];
 };
+
 /**
  * Definition of the DataHub DataProcessInstance entity.
  */
@@ -97,18 +81,13 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
             urn={urn}
             entityType={EntityType.DataProcessInstance}
             useEntityQuery={this.useEntityQuery}
-            // useUpdateQuery={useUpdateDataProcessInstanceMutation}
             getOverrideProperties={this.getOverridePropertiesFromEntity}
             headerDropdownItems={new Set([EntityMenuItems.UPDATE_DEPRECATION, EntityMenuItems.RAISE_INCIDENT])}
             tabs={[
-                // {
-                //     name: 'Documentation',
-                //     component: DocumentationTab,
-                // },
-                // {
-                //     name: 'Summary',
-                //     component: SummaryTab,
-                // },
+                {
+                    name: 'Summary',
+                    component: SummaryTab,
+                },
                 {
                     name: 'Lineage',
                     component: LineageTab,
@@ -117,14 +96,6 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
                     name: 'Properties',
                     component: PropertiesTab,
                 },
-                // {
-                //     name: 'Incidents',
-                //     component: IncidentTab,
-                //     getDynamicName: (_, processInstance) => {
-                //         const activeIncidentCount = processInstance?.dataProcessInstance?.activeIncidents.total;
-                //         return `Incidents${(activeIncidentCount && ` (${activeIncidentCount})`) || ''}`;
-                //     },
-                // },
             ]}
             sidebarSections={this.getSidebarSections()}
         />
@@ -181,13 +152,11 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
                 platformLogo={data?.dataPlatformInstance?.platform?.properties?.logoUrl}
                 owners={null}
                 globalTags={null}
-                // domain={data.domain?.domain}
                 dataProduct={getDataProduct(genericProperties?.dataProduct)}
                 externalUrl={data.properties?.externalUrl}
                 parentContainers={data.parentContainers}
                 parentEntities={parentEntities}
                 container={data.container || undefined}
-                // health={data.health}
             />
         );
     };
@@ -196,6 +165,9 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
         const data = result.entity as DataProcessInstance;
         const genericProperties = this.getGenericEntityProperties(data);
         const parentEntities = getParentEntities(data);
+
+        const firstState = data?.state && data.state.length > 0 ? data.state[0] : undefined;
+
         return (
             <Preview
                 urn={data.urn}
@@ -210,9 +182,7 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
                 platformInstanceId={data.dataPlatformInstance?.instanceId}
                 owners={null}
                 globalTags={null}
-                //                domain={data.domain?.domain}
                 dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                //                deprecation={data.deprecation}
                 insights={result.insights}
                 externalUrl={data.properties?.externalUrl}
                 degree={(result as any).degree}
@@ -220,10 +190,9 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
                 parentContainers={data.parentContainers}
                 parentEntities={parentEntities}
                 container={data.container || undefined}
-                // duration={data?.state?.[0]?.durationMillis}
-                // status={data?.state?.[0]?.result?.resultType}
-                // startTime={data?.state?.[0]?.timestampMillis}
-                //                health={data.health}
+                duration={firstState?.durationMillis}
+                status={firstState?.result?.resultType}
+                startTime={firstState?.timestampMillis}
             />
         );
     };
@@ -237,7 +206,6 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
             icon: entity?.dataPlatformInstance?.platform?.properties?.logoUrl || undefined,
             platform: entity?.dataPlatformInstance?.platform,
             container: entity?.container,
-            //            health: entity?.health || undefined,
         };
     };
 
diff --git a/datahub-web-react/src/app/entity/dataProcessInstance/preview/Preview.tsx b/datahub-web-react/src/app/entity/dataProcessInstance/preview/Preview.tsx
index 3a3b0340695d96..9a2acbe11c0845 100644
--- a/datahub-web-react/src/app/entity/dataProcessInstance/preview/Preview.tsx
+++ b/datahub-web-react/src/app/entity/dataProcessInstance/preview/Preview.tsx
@@ -39,10 +39,10 @@ export const Preview = ({
     health,
     parentEntities,
     parentContainers,
-}: // duration,
-// status,
-// startTime,
-{
+    duration,
+    status,
+    startTime,
+}: {
     urn: string;
     name: string;
     subType?: string | null;
@@ -64,9 +64,9 @@ export const Preview = ({
     health?: Health[] | null;
     parentEntities?: Array<GeneratedEntity> | null;
     parentContainers?: ParentContainersResult | null;
-    // duration?: number | null;
-    // status?: string | null;
-    // startTime?: number | null;
+    duration?: number | null;
+    status?: string | null;
+    startTime?: number | null;
 }): JSX.Element => {
     const entityRegistry = useEntityRegistry();
     return (
@@ -95,9 +95,9 @@ export const Preview = ({
             paths={paths}
             health={health || undefined}
             parentEntities={parentEntities}
-            // duration={duration}
-            // status={status}
-            // startTime={startTime}
+            duration={duration}
+            status={status}
+            startTime={startTime}
         />
     );
 };
diff --git a/datahub-web-react/src/app/entity/dataProcessInstance/profile/DataProcessInstanceSummary.tsx b/datahub-web-react/src/app/entity/dataProcessInstance/profile/DataProcessInstanceSummary.tsx
new file mode 100644
index 00000000000000..c6591d4f5faa1d
--- /dev/null
+++ b/datahub-web-react/src/app/entity/dataProcessInstance/profile/DataProcessInstanceSummary.tsx
@@ -0,0 +1,102 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Space, Table, Typography } from 'antd';
+import { formatDetailedDuration } from '@src/app/shared/time/timeUtils';
+import { capitalize } from 'lodash';
+import moment from 'moment';
+import { MlHyperParam, MlMetric, DataProcessInstanceRunResultType } from '../../../../types.generated';
+import { useBaseEntity } from '../../shared/EntityContext';
+import { InfoItem } from '../../shared/components/styled/InfoItem';
+import { GetDataProcessInstanceQuery } from '../../../../graphql/dataProcessInstance.generated';
+import { Pill } from '../../../../alchemy-components/components/Pills';
+
+const TabContent = styled.div`
+    padding: 16px;
+`;
+
+const InfoItemContainer = styled.div<{ justifyContent }>`
+    display: flex;
+    position: relative;
+    justify-content: ${(props) => props.justifyContent};
+    padding: 0px 2px;
+`;
+
+const InfoItemContent = styled.div`
+    padding-top: 8px;
+    width: 100px;
+`;
+
+const propertyTableColumns = [
+    {
+        title: 'Name',
+        dataIndex: 'name',
+        width: 450,
+    },
+    {
+        title: 'Value',
+        dataIndex: 'value',
+    },
+];
+
+export default function MLModelSummary() {
+    const baseEntity = useBaseEntity<GetDataProcessInstanceQuery>();
+    const dpi = baseEntity?.dataProcessInstance;
+
+    const formatStatus = (state) => {
+        if (!state || state.length === 0) return '-';
+        const result = state[0]?.result?.resultType;
+        const statusColor = result === DataProcessInstanceRunResultType.Success ? 'green' : 'red';
+        return <Pill label={capitalize(result)} colorScheme={statusColor} clickable={false} />;
+    };
+
+    const formatDuration = (state) => {
+        if (!state || state.length === 0) return '-';
+        return formatDetailedDuration(state[0]?.durationMillis);
+    };
+
+    return (
+        <TabContent>
+            <Space direction="vertical" style={{ width: '100%' }} size="large">
+                <Typography.Title level={3}>Details</Typography.Title>
+                <InfoItemContainer justifyContent="left">
+                    <InfoItem title="Created At">
+                        <InfoItemContent>
+                            {dpi?.properties?.created?.time
+                                ? moment(dpi.properties.created.time).format('YYYY-MM-DD HH:mm:ss')
+                                : '-'}
+                        </InfoItemContent>
+                    </InfoItem>
+                    <InfoItem title="Status">
+                        <InfoItemContent>{formatStatus(dpi?.state)}</InfoItemContent>
+                    </InfoItem>
+                    <InfoItem title="Duration">
+                        <InfoItemContent>{formatDuration(dpi?.state)}</InfoItemContent>
+                    </InfoItem>
+                    <InfoItem title="Run ID">
+                        <InfoItemContent>{dpi?.mlTrainingRunProperties?.id}</InfoItemContent>
+                    </InfoItem>
+                    <InfoItem title="Created By">
+                        <InfoItemContent>{dpi?.properties?.created?.actor}</InfoItemContent>
+                    </InfoItem>
+                </InfoItemContainer>
+                <InfoItemContainer justifyContent="left">
+                    <InfoItem title="Artifacts Location">
+                        <InfoItemContent>{dpi?.mlTrainingRunProperties?.outputUrls}</InfoItemContent>
+                    </InfoItem>
+                </InfoItemContainer>
+                <Typography.Title level={3}>Training Metrics</Typography.Title>
+                <Table
+                    pagination={false}
+                    columns={propertyTableColumns}
+                    dataSource={dpi?.mlTrainingRunProperties?.trainingMetrics as MlMetric[]}
+                />
+                <Typography.Title level={3}>Hyper Parameters</Typography.Title>
+                <Table
+                    pagination={false}
+                    columns={propertyTableColumns}
+                    dataSource={dpi?.mlTrainingRunProperties?.hyperParams as MlHyperParam[]}
+                />
+            </Space>
+        </TabContent>
+    );
+}
diff --git a/datahub-web-react/src/app/entity/mlModel/MLModelEntity.tsx b/datahub-web-react/src/app/entity/mlModel/MLModelEntity.tsx
index b77f6a19436a51..5e75b4680e427f 100644
--- a/datahub-web-react/src/app/entity/mlModel/MLModelEntity.tsx
+++ b/datahub-web-react/src/app/entity/mlModel/MLModelEntity.tsx
@@ -151,7 +151,7 @@ export class MLModelEntity implements Entity<MlModel> {
     };
 
     displayName = (data: MlModel) => {
-        return data.name || data.urn;
+        return data.properties?.name || data.name || data.urn;
     };
 
     getGenericEntityProperties = (mlModel: MlModel) => {
diff --git a/datahub-web-react/src/app/entity/mlModel/preview/Preview.tsx b/datahub-web-react/src/app/entity/mlModel/preview/Preview.tsx
index 4b57976dfe1a27..7ea33ba4c15f6f 100644
--- a/datahub-web-react/src/app/entity/mlModel/preview/Preview.tsx
+++ b/datahub-web-react/src/app/entity/mlModel/preview/Preview.tsx
@@ -21,7 +21,8 @@ export const Preview = ({
     return (
         <DefaultPreviewCard
             url={entityRegistry.getEntityUrl(EntityType.Mlmodel, model.urn)}
-            name={model.name || ''}
+            // eslint-disable-next-line @typescript-eslint/dot-notation
+            name={model.properties?.['propertiesName'] || model.name || ''}
             urn={model.urn}
             description={model.description || ''}
             platformInstanceId={model.dataPlatformInstance?.instanceId}
diff --git a/datahub-web-react/src/app/entity/mlModel/profile/MLModelSummary.tsx b/datahub-web-react/src/app/entity/mlModel/profile/MLModelSummary.tsx
index 925642311c505e..e637c6d299d8d3 100644
--- a/datahub-web-react/src/app/entity/mlModel/profile/MLModelSummary.tsx
+++ b/datahub-web-react/src/app/entity/mlModel/profile/MLModelSummary.tsx
@@ -1,18 +1,47 @@
 import React from 'react';
 import styled from 'styled-components';
 import { Space, Table, Typography } from 'antd';
-
-import { MlHyperParam, MlMetric } from '../../../../types.generated';
+import { Link } from 'react-router-dom';
+import { colors } from '@src/alchemy-components/theme';
+import moment from 'moment';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { MlHyperParam, MlMetric, EntityType } from '../../../../types.generated';
 import { useBaseEntity } from '../../shared/EntityContext';
 import { GetMlModelQuery } from '../../../../graphql/mlModel.generated';
+import { InfoItem } from '../../shared/components/styled/InfoItem';
+import { notEmpty } from '../../shared/utils';
+import { Pill } from '../../../../alchemy-components/components/Pills';
 
 const TabContent = styled.div`
     padding: 16px;
 `;
 
+const InfoItemContainer = styled.div<{ justifyContent }>`
+    display: flex;
+    position: relative;
+    justify-content: ${(props) => props.justifyContent};
+    padding: 0px 2px;
+`;
+
+const InfoItemContent = styled.div`
+    padding-top: 8px;
+    width: 100px;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 5px;
+`;
+
+const JobLink = styled(Link)`
+    color: ${colors.blue[700]};
+    &:hover {
+        text-decoration: underline;
+    }
+`;
+
 export default function MLModelSummary() {
     const baseEntity = useBaseEntity<GetMlModelQuery>();
     const model = baseEntity?.mlModel;
+    const entityRegistry = useEntityRegistry();
 
     const propertyTableColumns = [
         {
@@ -26,9 +55,72 @@ export default function MLModelSummary() {
         },
     ];
 
+    const renderTrainingJobs = () => {
+        const trainingJobs =
+            model?.trainedBy?.relationships?.map((relationship) => relationship.entity).filter(notEmpty) || [];
+
+        if (trainingJobs.length === 0) return '-';
+
+        return (
+            <div>
+                {trainingJobs.map((job, index) => {
+                    const { urn, name } = job as { urn: string; name?: string };
+                    return (
+                        <span key={urn}>
+                            <JobLink to={entityRegistry.getEntityUrl(EntityType.DataProcessInstance, urn)}>
+                                {name || urn}
+                            </JobLink>
+                            {index < trainingJobs.length - 1 && ', '}
+                        </span>
+                    );
+                })}
+            </div>
+        );
+    };
+
     return (
         <TabContent>
             <Space direction="vertical" style={{ width: '100%' }} size="large">
+                <Typography.Title level={3}>Model Details</Typography.Title>
+                <InfoItemContainer justifyContent="left">
+                    <InfoItem title="Version">
+                        <InfoItemContent>{model?.versionProperties?.version?.versionTag}</InfoItemContent>
+                    </InfoItem>
+                    <InfoItem title="Registered At">
+                        <InfoItemContent>
+                            {model?.properties?.created?.time
+                                ? moment(model.properties.created.time).format('YYYY-MM-DD HH:mm:ss')
+                                : '-'}
+                        </InfoItemContent>
+                    </InfoItem>
+                    <InfoItem title="Last Modified At">
+                        <InfoItemContent>
+                            {model?.properties?.lastModified?.time
+                                ? moment(model.properties.lastModified.time).format('YYYY-MM-DD HH:mm:ss')
+                                : '-'}
+                        </InfoItemContent>
+                    </InfoItem>
+                    <InfoItem title="Created By">
+                        <InfoItemContent>{model?.properties?.created?.actor}</InfoItemContent>
+                    </InfoItem>
+                </InfoItemContainer>
+                <InfoItemContainer justifyContent="left">
+                    <InfoItem title="Aliases">
+                        <InfoItemContent>
+                            {model?.versionProperties?.aliases?.map((alias) => (
+                                <Pill
+                                    label={alias.versionTag ?? '-'}
+                                    key={alias.versionTag}
+                                    colorScheme="blue"
+                                    clickable={false}
+                                />
+                            ))}
+                        </InfoItemContent>
+                    </InfoItem>
+                    <InfoItem title="Source Run">
+                        <InfoItemContent>{renderTrainingJobs()}</InfoItemContent>
+                    </InfoItem>
+                </InfoItemContainer>
                 <Typography.Title level={3}>Training Metrics</Typography.Title>
                 <Table
                     pagination={false}
diff --git a/datahub-web-react/src/app/entity/mlModelGroup/MLModelGroupEntity.tsx b/datahub-web-react/src/app/entity/mlModelGroup/MLModelGroupEntity.tsx
index 5c820007fd1e28..1217200ea46f8e 100644
--- a/datahub-web-react/src/app/entity/mlModelGroup/MLModelGroupEntity.tsx
+++ b/datahub-web-react/src/app/entity/mlModelGroup/MLModelGroupEntity.tsx
@@ -139,7 +139,7 @@ export class MLModelGroupEntity implements Entity<MlModelGroup> {
     };
 
     displayName = (data: MlModelGroup) => {
-        return data.name || data.urn;
+        return data.properties?.name || data.name || data.urn;
     };
 
     getGenericEntityProperties = (mlModelGroup: MlModelGroup) => {
diff --git a/datahub-web-react/src/app/entity/mlModelGroup/preview/Preview.tsx b/datahub-web-react/src/app/entity/mlModelGroup/preview/Preview.tsx
index 910397af899f57..76ad9c06daece3 100644
--- a/datahub-web-react/src/app/entity/mlModelGroup/preview/Preview.tsx
+++ b/datahub-web-react/src/app/entity/mlModelGroup/preview/Preview.tsx
@@ -19,7 +19,8 @@ export const Preview = ({
     return (
         <DefaultPreviewCard
             url={entityRegistry.getEntityUrl(EntityType.MlmodelGroup, group.urn)}
-            name={group?.name || ''}
+            // eslint-disable-next-line @typescript-eslint/dot-notation
+            name={group?.properties?.['propertiesName'] || group?.name || ''}
             urn={group.urn}
             platformInstanceId={group.dataPlatformInstance?.instanceId}
             description={group?.description || ''}
diff --git a/datahub-web-react/src/app/entity/mlModelGroup/profile/ModelGroupModels.tsx b/datahub-web-react/src/app/entity/mlModelGroup/profile/ModelGroupModels.tsx
index abd90d24c7ebf2..e06b2fc932c6dd 100644
--- a/datahub-web-react/src/app/entity/mlModelGroup/profile/ModelGroupModels.tsx
+++ b/datahub-web-react/src/app/entity/mlModelGroup/profile/ModelGroupModels.tsx
@@ -1,32 +1,202 @@
-import { List, Space, Typography } from 'antd';
+import { Typography, Table } from 'antd';
 import React from 'react';
+import styled from 'styled-components';
+import { colors } from '@src/alchemy-components/theme';
+import { Pill } from '@src/alchemy-components/components/Pills';
+import moment from 'moment';
 import { GetMlModelGroupQuery } from '../../../../graphql/mlModelGroup.generated';
 import { EntityType } from '../../../../types.generated';
 import { useEntityRegistry } from '../../../useEntityRegistry';
-import { PreviewType } from '../../Entity';
 import { useBaseEntity } from '../../shared/EntityContext';
+import { notEmpty } from '../../shared/utils';
+import { EmptyTab } from '../../shared/components/styled/EmptyTab';
+import { InfoItem } from '../../shared/components/styled/InfoItem';
+
+const InfoItemContainer = styled.div<{ justifyContent }>`
+    display: flex;
+    position: relative;
+    justify-content: ${(props) => props.justifyContent};
+    padding: 12px 2px 20px 2px;
+`;
+
+const InfoItemContent = styled.div`
+    padding-top: 8px;
+    width: 100px;
+`;
+
+const NameContainer = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const NameLink = styled.a`
+    font-weight: 700;
+    color: inherit;
+    font-size: 0.9rem;
+    &:hover {
+        color: ${colors.blue[400]} !important;
+    }
+`;
+
+const TagContainer = styled.div`
+    display: inline-flex;
+    margin-left: 0px;
+    margin-top: 3px;
+    flex-wrap: wrap;
+    margin-right: 8px;
+    backgroundcolor: white;
+    gap: 5px;
+`;
+
+const StyledTable = styled(Table)`
+    &&& .ant-table-cell {
+        padding: 16px;
+    }
+` as typeof Table;
+
+const ModelsContainer = styled.div`
+    width: 100%;
+    padding: 20px;
+`;
+
+const VersionContainer = styled.div`
+    display: flex;
+    align-items: center;
+`;
 
 export default function MLGroupModels() {
     const baseEntity = useBaseEntity<GetMlModelGroupQuery>();
-    const models = baseEntity?.mlModelGroup?.incoming?.relationships?.map((relationship) => relationship.entity) || [];
-
     const entityRegistry = useEntityRegistry();
+    const modelGroup = baseEntity?.mlModelGroup;
+
+    const models =
+        baseEntity?.mlModelGroup?.incoming?.relationships
+            ?.map((relationship) => relationship.entity)
+            .filter(notEmpty) || [];
+
+    const columns = [
+        {
+            title: 'Name',
+            dataIndex: 'name',
+            key: 'name',
+            width: 300,
+            render: (_: any, record) => (
+                <NameContainer>
+                    <NameLink href={entityRegistry.getEntityUrl(EntityType.Mlmodel, record.urn)}>
+                        {record?.properties?.propertiesName || record?.name}
+                    </NameLink>
+                </NameContainer>
+            ),
+        },
+        {
+            title: 'Version',
+            key: 'version',
+            width: 70,
+            render: (_: any, record: any) => (
+                <VersionContainer>{record.versionProperties?.version?.versionTag || '-'}</VersionContainer>
+            ),
+        },
+        {
+            title: 'Created At',
+            key: 'createdAt',
+            width: 150,
+            render: (_: any, record: any) => (
+                <Typography.Text>
+                    {record.properties?.createdTS?.time
+                        ? moment(record.properties.createdTS.time).format('YYYY-MM-DD HH:mm:ss')
+                        : '-'}
+                </Typography.Text>
+            ),
+        },
+        {
+            title: 'Aliases',
+            key: 'aliases',
+            width: 200,
+            render: (_: any, record: any) => {
+                const aliases = record.versionProperties?.aliases || [];
+
+                return (
+                    <TagContainer>
+                        {aliases.map((alias) => (
+                            <Pill
+                                key={alias.versionTag}
+                                label={alias.versionTag}
+                                colorScheme="blue"
+                                clickable={false}
+                            />
+                        ))}
+                    </TagContainer>
+                );
+            },
+        },
+        {
+            title: 'Tags',
+            key: 'tags',
+            width: 200,
+            render: (_: any, record: any) => {
+                const tags = record.properties?.tags || [];
+
+                return (
+                    <TagContainer>
+                        {tags.map((tag) => (
+                            <Pill key={tag} label={tag} clickable={false} />
+                        ))}
+                    </TagContainer>
+                );
+            },
+        },
+        {
+            title: 'Description',
+            dataIndex: 'description',
+            key: 'description',
+            width: 300,
+            render: (_: any, record: any) => {
+                const editableDesc = record.editableProperties?.description;
+                const originalDesc = record.description;
+
+                return <Typography.Text>{editableDesc || originalDesc || '-'}</Typography.Text>;
+            },
+        },
+    ];
 
     return (
-        <>
-            <Space direction="vertical" style={{ width: '100%' }} size="large">
-                <List
-                    style={{ padding: '16px 16px' }}
-                    bordered
-                    dataSource={models}
-                    header={<Typography.Title level={3}>Models</Typography.Title>}
-                    renderItem={(item) => (
-                        <List.Item style={{ paddingTop: '20px' }}>
-                            {entityRegistry.renderPreview(EntityType.Mlmodel, PreviewType.PREVIEW, item)}
-                        </List.Item>
-                    )}
-                />
-            </Space>
-        </>
+        <ModelsContainer>
+            <Typography.Title level={3}>Model Group Details</Typography.Title>
+            <InfoItemContainer justifyContent="left">
+                <InfoItem title="Created At">
+                    <InfoItemContent>
+                        {modelGroup?.properties?.created?.time
+                            ? moment(modelGroup.properties.created.time).format('YYYY-MM-DD HH:mm:ss')
+                            : '-'}
+                    </InfoItemContent>
+                </InfoItem>
+                <InfoItem title="Last Modified At">
+                    <InfoItemContent>
+                        {modelGroup?.properties?.lastModified?.time
+                            ? moment(modelGroup.properties.lastModified.time).format('YYYY-MM-DD HH:mm:ss')
+                            : '-'}
+                    </InfoItemContent>
+                </InfoItem>
+                {modelGroup?.properties?.created?.actor && (
+                    <InfoItem title="Created By">
+                        <InfoItemContent>{modelGroup.properties.created?.actor}</InfoItemContent>
+                    </InfoItem>
+                )}
+            </InfoItemContainer>
+            <Typography.Title level={3}>Models</Typography.Title>
+            <StyledTable
+                columns={columns}
+                dataSource={models}
+                pagination={false}
+                rowKey="urn"
+                expandable={{
+                    defaultExpandAllRows: true,
+                    expandRowByClick: true,
+                }}
+                locale={{
+                    emptyText: <EmptyTab tab="mlModel" />,
+                }}
+            />
+        </ModelsContainer>
     );
 }
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchSection.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchSection.tsx
index 9648aaf852bbe3..9da7b5d0ffb0c9 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchSection.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchSection.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import * as QueryString from 'query-string';
 import { useHistory, useLocation } from 'react-router';
 import { ApolloError } from '@apollo/client';
-import { FacetFilterInput } from '../../../../../../types.generated';
+import { EntityType, FacetFilterInput } from '../../../../../../types.generated';
 import useFilters from '../../../../../search/utils/useFilters';
 import { navigateToEntitySearchUrl } from './navigateToEntitySearchUrl';
 import { FilterSet, GetSearchResultsParams, SearchResultsInterface } from './types';
@@ -16,6 +16,30 @@ import {
 } from '../../../../../search/utils/types';
 
 const FILTER = 'filter';
+const SEARCH_ENTITY_TYPES = [
+    EntityType.Dataset,
+    EntityType.Dashboard,
+    EntityType.Chart,
+    EntityType.Mlmodel,
+    EntityType.MlmodelGroup,
+    EntityType.MlfeatureTable,
+    EntityType.Mlfeature,
+    EntityType.MlprimaryKey,
+    EntityType.DataFlow,
+    EntityType.DataJob,
+    EntityType.GlossaryTerm,
+    EntityType.GlossaryNode,
+    EntityType.Tag,
+    EntityType.Role,
+    EntityType.CorpUser,
+    EntityType.CorpGroup,
+    EntityType.Container,
+    EntityType.Domain,
+    EntityType.DataProduct,
+    EntityType.Notebook,
+    EntityType.BusinessAttribute,
+    EntityType.DataProcessInstance,
+];
 
 function getParamsWithoutFilters(params: QueryString.ParsedQuery<string>) {
     const paramsCopy = { ...params };
@@ -137,6 +161,7 @@ export const EmbeddedListSearchSection = ({
 
     return (
         <EmbeddedListSearch
+            entityTypes={SEARCH_ENTITY_TYPES}
             query={query || ''}
             page={page}
             unionType={unionType}
diff --git a/datahub-web-react/src/app/entity/shared/constants.ts b/datahub-web-react/src/app/entity/shared/constants.ts
index edf71aa608a16a..e4bca0e5adcd7b 100644
--- a/datahub-web-react/src/app/entity/shared/constants.ts
+++ b/datahub-web-react/src/app/entity/shared/constants.ts
@@ -82,6 +82,10 @@ export const EMPTY_MESSAGES = {
         title: 'No business attributes added yet',
         description: 'Add business attributes to entities to classify their data.',
     },
+    mlModel: {
+        title: 'No ML models',
+        description: 'ML models will appear here if they are associated with this ML model group.',
+    },
 };
 
 export const ELASTIC_MAX_COUNT = 10000;
diff --git a/datahub-web-react/src/app/preview/DataProcessInstanceRightColumn.tsx b/datahub-web-react/src/app/preview/DataProcessInstanceRightColumn.tsx
new file mode 100644
index 00000000000000..015761f247dd77
--- /dev/null
+++ b/datahub-web-react/src/app/preview/DataProcessInstanceRightColumn.tsx
@@ -0,0 +1,87 @@
+import {
+    formatDetailedDuration,
+    formatDuration,
+    toLocalDateTimeString,
+    toRelativeTimeString,
+} from '@app/shared/time/timeUtils';
+import { Pill, Popover } from '@components';
+import { Maybe } from 'graphql/jsutils/Maybe';
+import { capitalize } from 'lodash';
+import React from 'react';
+import styled from 'styled-components';
+import colors from '@src/alchemy-components/theme/foundations/colors';
+import { DataProcessInstanceRunResultType } from '../../types.generated';
+
+const StatContainer = styled.div`
+    display: flex;
+    margin-top: 40px;
+    height: 25px;
+    padding-left: 20px;
+    color: ${colors.gray[500]};
+    width: 150px;
+`;
+
+const PopoverContent = styled.div`
+    color: ${colors.gray[500]};
+    font-size: 0.8rem;
+`;
+
+const Title = styled.div`
+    color: ${colors.gray[500]};
+    border-bottom: none;
+    font-size: 0.8rem;
+    font-weight: 600;
+`;
+
+const popoverStyles = {
+    overlayInnerStyle: {
+        borderRadius: '10px',
+    },
+    overlayStyle: {
+        margin: '5px',
+    },
+};
+
+interface Props {
+    startTime: Maybe<number>;
+    duration: Maybe<number>;
+    status: Maybe<string>;
+}
+
+export default function DataProcessInstanceRightColumn({ startTime, duration, status }: Props) {
+    const statusPillColor = status === DataProcessInstanceRunResultType.Success ? 'green' : 'red';
+
+    return (
+        <>
+            {startTime && (
+                <Popover
+                    content={<PopoverContent>{toLocalDateTimeString(startTime)}</PopoverContent>}
+                    title={<Title>Start Time</Title>}
+                    trigger="hover"
+                    overlayInnerStyle={popoverStyles.overlayInnerStyle}
+                    overlayStyle={popoverStyles.overlayStyle}
+                >
+                    <StatContainer>{toRelativeTimeString(startTime)}</StatContainer>
+                </Popover>
+            )}
+            {duration && (
+                <Popover
+                    content={<PopoverContent>{formatDetailedDuration(duration)}</PopoverContent>}
+                    title={<Title>Duration</Title>}
+                    trigger="hover"
+                    overlayInnerStyle={popoverStyles.overlayInnerStyle}
+                    overlayStyle={popoverStyles.overlayStyle}
+                >
+                    <StatContainer>{formatDuration(duration)}</StatContainer>
+                </Popover>
+            )}
+            {status && (
+                <>
+                    <StatContainer>
+                        <Pill label={capitalize(status)} colorScheme={statusPillColor} clickable={false} />
+                    </StatContainer>
+                </>
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/preview/DefaultPreviewCard.tsx b/datahub-web-react/src/app/preview/DefaultPreviewCard.tsx
index a19862e83ae510..42a32a5a1951ff 100644
--- a/datahub-web-react/src/app/preview/DefaultPreviewCard.tsx
+++ b/datahub-web-react/src/app/preview/DefaultPreviewCard.tsx
@@ -1,8 +1,8 @@
+import DataProcessInstanceRightColumn from '@app/preview/DataProcessInstanceRightColumn';
 import React, { ReactNode, useState } from 'react';
 import { Divider, Tooltip, Typography } from 'antd';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
-
 import {
     GlobalTags,
     Owner,
@@ -200,6 +200,9 @@ interface Props {
     paths?: EntityPath[];
     health?: Health[];
     parentDataset?: Dataset;
+    startTime?: number | null;
+    duration?: number | null;
+    status?: string | null;
 }
 
 export default function DefaultPreviewCard({
@@ -243,6 +246,9 @@ export default function DefaultPreviewCard({
     paths,
     health,
     parentDataset,
+    startTime,
+    duration,
+    status,
 }: Props) {
     // sometimes these lists will be rendered inside an entity container (for example, in the case of impact analysis)
     // in those cases, we may want to enrich the preview w/ context about the container entity
@@ -270,7 +276,8 @@ export default function DefaultPreviewCard({
         event.stopPropagation();
     };
 
-    const shouldShowRightColumn = (topUsers && topUsers.length > 0) || (owners && owners.length > 0);
+    const shouldShowRightColumn =
+        (topUsers && topUsers.length > 0) || (owners && owners.length > 0) || startTime || duration || status;
     const uniqueOwners = getUniqueOwners(owners);
 
     return (
@@ -380,6 +387,7 @@ export default function DefaultPreviewCard({
             </LeftColumn>
             {shouldShowRightColumn && (
                 <RightColumn key="right-column">
+                    <DataProcessInstanceRightColumn startTime={startTime} duration={duration} status={status} />
                     {topUsers && topUsers?.length > 0 && (
                         <>
                             <UserListContainer>
diff --git a/datahub-web-react/src/app/shared/time/timeUtils.tsx b/datahub-web-react/src/app/shared/time/timeUtils.tsx
index 26d768a204be6f..4ff6ffedf65337 100644
--- a/datahub-web-react/src/app/shared/time/timeUtils.tsx
+++ b/datahub-web-react/src/app/shared/time/timeUtils.tsx
@@ -206,3 +206,41 @@ export function getTimeRangeDescription(startDate: moment.Moment | null, endDate
 
     return 'Unknown time range';
 }
+
+export function formatDuration(durationMs: number): string {
+    const duration = moment.duration(durationMs);
+    const hours = Math.floor(duration.asHours());
+    const minutes = duration.minutes();
+    const seconds = duration.seconds();
+
+    if (hours === 0 && minutes === 0) {
+        return `${seconds} secs`;
+    }
+
+    if (hours === 0) {
+        return minutes === 1 ? `${minutes} min` : `${minutes} mins`;
+    }
+
+    const minuteStr = minutes > 0 ? ` ${minutes} mins` : '';
+    return hours === 1 ? `${hours} hr${minuteStr}` : `${hours} hrs${minuteStr}`;
+}
+
+export function formatDetailedDuration(durationMs: number): string {
+    const duration = moment.duration(durationMs);
+    const hours = Math.floor(duration.asHours());
+    const minutes = duration.minutes();
+    const seconds = duration.seconds();
+
+    const parts: string[] = [];
+
+    if (hours > 0) {
+        parts.push(hours === 1 ? `${hours} hr` : `${hours} hrs`);
+    }
+    if (minutes > 0) {
+        parts.push(minutes === 1 ? `${minutes} min` : `${minutes} mins`);
+    }
+    if (seconds > 0) {
+        parts.push(`${seconds} secs`);
+    }
+    return parts.join(' ');
+}
diff --git a/datahub-web-react/src/graphql/fragments.graphql b/datahub-web-react/src/graphql/fragments.graphql
index ecac2997489354..e94fc207fefd97 100644
--- a/datahub-web-react/src/graphql/fragments.graphql
+++ b/datahub-web-react/src/graphql/fragments.graphql
@@ -897,6 +897,10 @@ fragment nonRecursiveMLModel on MLModel {
             key
             value
         }
+        mlModelLineageInfo {
+            trainingJobs
+            downstreamJobs
+        }
     }
     globalTags {
         ...globalTagsFields
@@ -971,6 +975,14 @@ fragment nonRecursiveMLModelGroupFields on MLModelGroup {
             time
             actor
         }
+        lastModified {
+            time
+            actor
+        }
+        mlModelLineageInfo {
+            trainingJobs
+            downstreamJobs
+        }
     }
     browsePathV2 {
         ...browsePathV2Fields
diff --git a/datahub-web-react/src/graphql/lineage.graphql b/datahub-web-react/src/graphql/lineage.graphql
index 457936ed62cd2e..f387c0c050668f 100644
--- a/datahub-web-react/src/graphql/lineage.graphql
+++ b/datahub-web-react/src/graphql/lineage.graphql
@@ -272,6 +272,7 @@ fragment lineageNodeProperties on EntityWithRelationships {
             removed
         }
         properties {
+            propertiesName: name
             createdTS: created {
                 time
                 actor
@@ -296,6 +297,9 @@ fragment lineageNodeProperties on EntityWithRelationships {
         name
         description
         origin
+        tags {
+            ...globalTagsFields
+        }
         platform {
             ...platformFields
         }
@@ -305,6 +309,34 @@ fragment lineageNodeProperties on EntityWithRelationships {
         status {
             removed
         }
+        versionProperties {
+            versionSet {
+                urn
+                type
+            }
+            version {
+                versionTag
+            }
+            aliases {
+                versionTag
+            }
+            comment
+        }
+        properties {
+            propertiesName: name
+            createdTS: created {
+                time
+                actor
+            }
+            tags
+            customProperties {
+                key
+                value
+            }
+        }
+        editableProperties {
+            description
+        }
         structuredProperties {
             properties {
                 ...structuredPropertiesFields
diff --git a/datahub-web-react/src/graphql/mlModel.graphql b/datahub-web-react/src/graphql/mlModel.graphql
index ad97c7c6f530a1..ba10a243e6f9b3 100644
--- a/datahub-web-react/src/graphql/mlModel.graphql
+++ b/datahub-web-react/src/graphql/mlModel.graphql
@@ -20,6 +20,23 @@ query getMLModel($urn: String!) {
                 }
             }
         }
+        trainedBy: relationships(input: { types: ["TrainedBy"], direction: OUTGOING, start: 0, count: 100 }) {
+            start
+            count
+            total
+            relationships {
+                type
+                direction
+                entity {
+                    ... on DataProcessInstance {
+                        urn
+                        name
+                        type
+                        ...dataProcessInstanceFields
+                    }
+                }
+            }
+        }
         privileges {
             ...entityPrivileges
         }
diff --git a/datahub-web-react/src/graphql/search.graphql b/datahub-web-react/src/graphql/search.graphql
index d12193b471d469..be72ff31a4f264 100644
--- a/datahub-web-react/src/graphql/search.graphql
+++ b/datahub-web-react/src/graphql/search.graphql
@@ -886,6 +886,9 @@ fragment searchResultsWithoutSchemaField on Entity {
                 ...structuredPropertiesFields
             }
         }
+        properties {
+            propertiesName: name
+        }
     }
     ... on MLModelGroup {
         name
@@ -908,6 +911,9 @@ fragment searchResultsWithoutSchemaField on Entity {
                 ...structuredPropertiesFields
             }
         }
+        properties {
+            propertiesName: name
+        }
     }
     ... on Tag {
         name
@@ -954,6 +960,9 @@ fragment searchResultsWithoutSchemaField on Entity {
             ...versionProperties
         }
     }
+    ... on DataProcessInstance {
+        ...dataProcessInstanceFields
+    }
     ... on DataPlatformInstance {
         ...dataPlatformInstanceFields
     }

From 22e012a2093e336d27e37ad55789c2f05744c0b7 Mon Sep 17 00:00:00 2001
From: Tamas Nemeth <treff7es@gmail.com>
Date: Wed, 29 Jan 2025 16:44:31 +0100
Subject: [PATCH 177/249] feat(ingestion/airflow): Add support for mutiple
 datahub emitter (#12398)

---
 .../src/datahub_airflow_plugin/_config.py     | 32 ++++++++++---
 .../datahub_plugin_v22.py                     | 20 +++++----
 .../datahub_airflow_plugin/hooks/datahub.py   | 45 ++++++++++++++++++-
 .../tests/integration/test_plugin.py          | 40 +++++++++++++++--
 .../src/datahub/emitter/composite_emitter.py  | 36 +++++++++++++++
 .../datahub/emitter/test_composite_emitter.py | 42 +++++++++++++++++
 6 files changed, 197 insertions(+), 18 deletions(-)
 create mode 100644 metadata-ingestion/src/datahub/emitter/composite_emitter.py
 create mode 100644 metadata-ingestion/tests/unit/datahub/emitter/test_composite_emitter.py

diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_config.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_config.py
index 6d6ba601556788..473cf9f907ba84 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_config.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_config.py
@@ -1,14 +1,18 @@
 from enum import Enum
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING, Dict, List, Optional, Union
 
 from airflow.configuration import conf
+from pydantic import root_validator
 from pydantic.fields import Field
 
 import datahub.emitter.mce_builder as builder
 from datahub.configuration.common import AllowDenyPattern, ConfigModel
 
 if TYPE_CHECKING:
-    from datahub_airflow_plugin.hooks.datahub import DatahubGenericHook
+    from datahub_airflow_plugin.hooks.datahub import (
+        DatahubCompositeHook,
+        DatahubGenericHook,
+    )
 
 
 class DatajobUrl(Enum):
@@ -27,6 +31,8 @@ class DatahubLineageConfig(ConfigModel):
     # DataHub hook connection ID.
     datahub_conn_id: str
 
+    _datahub_connection_ids: List[str]
+
     # Cluster to associate with the pipelines and tasks. Defaults to "prod".
     cluster: str = builder.DEFAULT_FLOW_CLUSTER
 
@@ -68,11 +74,25 @@ class DatahubLineageConfig(ConfigModel):
 
     disable_openlineage_plugin: bool = True
 
-    def make_emitter_hook(self) -> "DatahubGenericHook":
+    def make_emitter_hook(self) -> Union["DatahubGenericHook", "DatahubCompositeHook"]:
         # This is necessary to avoid issues with circular imports.
-        from datahub_airflow_plugin.hooks.datahub import DatahubGenericHook
-
-        return DatahubGenericHook(self.datahub_conn_id)
+        from datahub_airflow_plugin.hooks.datahub import (
+            DatahubCompositeHook,
+            DatahubGenericHook,
+        )
+
+        if len(self._datahub_connection_ids) == 1:
+            return DatahubGenericHook(self._datahub_connection_ids[0])
+        else:
+            return DatahubCompositeHook(self._datahub_connection_ids)
+
+    @root_validator(skip_on_failure=True)
+    def split_conn_ids(cls, values: Dict) -> Dict:
+        if not values.get("datahub_conn_id"):
+            raise ValueError("datahub_conn_id is required")
+        conn_ids = values.get("datahub_conn_id", "").split(",")
+        cls._datahub_connection_ids = [conn_id.strip() for conn_id in conn_ids]
+        return values
 
 
 def get_lineage_config() -> DatahubLineageConfig:
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin_v22.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin_v22.py
index 99b0a40fd3c13e..b7e6e109e8567c 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin_v22.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_plugin_v22.py
@@ -29,6 +29,11 @@
 TASK_ON_RETRY_CALLBACK = "on_retry_callback"
 
 
+def load_config_v22():
+    plugin_config = get_lineage_config()
+    return plugin_config
+
+
 def get_task_inlets_advanced(task: BaseOperator, context: Any) -> Iterable[Any]:
     # TODO: Fix for https://github.com/apache/airflow/commit/1b1f3fabc5909a447a6277cafef3a0d4ef1f01ae
     # in Airflow 2.4.
@@ -99,9 +104,7 @@ def datahub_task_status_callback(context, status):
     task_inlets = get_task_inlets_advanced(task, context)
     task_outlets = get_task_outlets(task)
 
-    emitter = (
-        DatahubGenericHook(config.datahub_conn_id).get_underlying_hook().make_emitter()
-    )
+    emitter = config.make_emitter_hook().make_emitter()
 
     dataflow = AirflowGenerator.generate_dataflow(
         config=config,
@@ -217,7 +220,7 @@ def datahub_pre_execution(context):
 
 def _wrap_pre_execution(pre_execution):
     def custom_pre_execution(context):
-        config = get_lineage_config()
+        config = load_config_v22()
         if config.enabled:
             context["_datahub_config"] = config
             datahub_pre_execution(context)
@@ -231,7 +234,7 @@ def custom_pre_execution(context):
 
 def _wrap_on_failure_callback(on_failure_callback):
     def custom_on_failure_callback(context):
-        config = get_lineage_config()
+        config = load_config_v22()
         if config.enabled:
             context["_datahub_config"] = config
             try:
@@ -251,7 +254,7 @@ def custom_on_failure_callback(context):
 
 def _wrap_on_success_callback(on_success_callback):
     def custom_on_success_callback(context):
-        config = get_lineage_config()
+        config = load_config_v22()
         if config.enabled:
             context["_datahub_config"] = config
             try:
@@ -271,7 +274,8 @@ def custom_on_success_callback(context):
 
 def _wrap_on_retry_callback(on_retry_callback):
     def custom_on_retry_callback(context):
-        config = get_lineage_config()
+        config = load_config_v22()
+
         if config.enabled:
             context["_datahub_config"] = config
             try:
@@ -363,7 +367,7 @@ def _patch_datahub_policy():
 
     _patch_policy(settings)
 
-    plugin_config = get_lineage_config()
+    plugin_config = load_config_v22()
     telemetry.telemetry_instance.ping(
         "airflow-plugin-init",
         {
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/hooks/datahub.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/hooks/datahub.py
index 26c5026c075bd7..e2e4c9fef6f16e 100644
--- a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/hooks/datahub.py
+++ b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/hooks/datahub.py
@@ -1,8 +1,9 @@
-from typing import TYPE_CHECKING, Any, Dict, Optional, Sequence, Tuple, Union
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Sequence, Tuple, Union
 
 from airflow.exceptions import AirflowException
 from airflow.hooks.base import BaseHook
 
+from datahub.emitter.composite_emitter import CompositeEmitter
 from datahub.emitter.generic_emitter import Emitter
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.metadata.com.linkedin.pegasus2avro.mxe import (
@@ -303,3 +304,45 @@ def emit(
 
     # Retained for backwards compatibility.
     emit_mces = emit
+
+
+class DatahubCompositeHook(BaseHook):
+    """
+    A hook that can emit metadata to multiple DataHub instances.
+
+    :param datahub_conn_ids: References to the DataHub connections.
+    :type datahub_conn_ids: List[str]
+    """
+
+    hooks: List[DatahubGenericHook] = []
+
+    def __init__(self, datahub_conn_ids: List[str]) -> None:
+        self.datahub_conn_ids = datahub_conn_ids
+
+    def make_emitter(self) -> CompositeEmitter:
+        print(f"Create emitters for {self.datahub_conn_ids}")
+        return CompositeEmitter(
+            [
+                self._get_underlying_hook(conn_id).make_emitter()
+                for conn_id in self.datahub_conn_ids
+            ]
+        )
+
+    def emit(
+        self,
+        items: Sequence[
+            Union[
+                MetadataChangeEvent,
+                MetadataChangeProposal,
+                MetadataChangeProposalWrapper,
+            ]
+        ],
+    ) -> None:
+        emitter = self.make_emitter()
+
+        for item in items:
+            print(f"emitting item {item}")
+            emitter.emit(item)
+
+    def _get_underlying_hook(self, conn_id: str) -> DatahubGenericHook:
+        return DatahubGenericHook(conn_id)
diff --git a/metadata-ingestion-modules/airflow-plugin/tests/integration/test_plugin.py b/metadata-ingestion-modules/airflow-plugin/tests/integration/test_plugin.py
index 2744c26021cde3..8d0bc9748ff5fd 100644
--- a/metadata-ingestion-modules/airflow-plugin/tests/integration/test_plugin.py
+++ b/metadata-ingestion-modules/airflow-plugin/tests/integration/test_plugin.py
@@ -50,6 +50,7 @@ class AirflowInstance:
     password: str
 
     metadata_file: pathlib.Path
+    metadata_file2: pathlib.Path
 
     @property
     def airflow_url(self) -> str:
@@ -178,6 +179,7 @@ def _run_airflow(
     tmp_path: pathlib.Path,
     dags_folder: pathlib.Path,
     is_v1: bool,
+    multiple_connections: bool,
 ) -> Iterator[AirflowInstance]:
     airflow_home = tmp_path / "airflow_home"
     print(f"Using airflow home: {airflow_home}")
@@ -189,7 +191,9 @@ def _run_airflow(
     print(f"Using airflow port: {airflow_port}")
 
     datahub_connection_name = "datahub_file_default"
+    datahub_connection_name_2 = "datahub_file_default_2"
     meta_file = tmp_path / "datahub_metadata.json"
+    meta_file2 = tmp_path / "datahub_metadata_2.json"
 
     environment = {
         **os.environ,
@@ -204,7 +208,9 @@ def _run_airflow(
         "AIRFLOW__API__AUTH_BACKEND": "airflow.api.auth.backend.basic_auth",
         # Configure the datahub plugin and have it write the MCPs to a file.
         "AIRFLOW__CORE__LAZY_LOAD_PLUGINS": "False" if is_v1 else "True",
-        "AIRFLOW__DATAHUB__CONN_ID": datahub_connection_name,
+        "AIRFLOW__DATAHUB__CONN_ID": f"{datahub_connection_name}, {datahub_connection_name_2}"
+        if multiple_connections
+        else datahub_connection_name,
         "AIRFLOW__DATAHUB__DAG_FILTER_STR": f'{{ "deny": ["{DAG_TO_SKIP_INGESTION}"] }}',
         f"AIRFLOW_CONN_{datahub_connection_name.upper()}": Connection(
             conn_id="datahub_file_default",
@@ -251,6 +257,13 @@ def _run_airflow(
         "SQLALCHEMY_SILENCE_UBER_WARNING": "1",
     }
 
+    if multiple_connections:
+        environment[f"AIRFLOW_CONN_{datahub_connection_name_2.upper()}"] = Connection(
+            conn_id="datahub_file_default2",
+            conn_type="datahub-file",
+            host=str(meta_file2),
+        ).get_uri()
+
     if not HAS_AIRFLOW_STANDALONE_CMD:
         raise pytest.skip("Airflow standalone command is not available")
 
@@ -315,6 +328,7 @@ def _run_airflow(
             username=airflow_username,
             password=airflow_password,
             metadata_file=meta_file,
+            metadata_file2=meta_file2,
         )
 
         yield airflow_instance
@@ -355,10 +369,11 @@ class DagTestCase:
     success: bool = True
 
     v2_only: bool = False
+    multiple_connections: bool = False
 
 
 test_cases = [
-    DagTestCase("simple_dag"),
+    DagTestCase("simple_dag", multiple_connections=True),
     DagTestCase("basic_iolets"),
     DagTestCase("dag_to_skip", v2_only=True),
     DagTestCase("snowflake_operator", success=False, v2_only=True),
@@ -441,7 +456,10 @@ def test_airflow_plugin(
     dag_id = test_case.dag_id
 
     with _run_airflow(
-        tmp_path, dags_folder=DAGS_FOLDER, is_v1=is_v1
+        tmp_path,
+        dags_folder=DAGS_FOLDER,
+        is_v1=is_v1,
+        multiple_connections=test_case.multiple_connections,
     ) as airflow_instance:
         print(f"Running DAG {dag_id}...")
         _wait_for_dag_to_load(airflow_instance, dag_id)
@@ -491,6 +509,21 @@ def test_airflow_plugin(
             ],
         )
 
+        if test_case.multiple_connections:
+            _sanitize_output_file(airflow_instance.metadata_file2)
+            check_golden_file(
+                pytestconfig=pytestconfig,
+                output_path=airflow_instance.metadata_file2,
+                golden_path=golden_path,
+                ignore_paths=[
+                    # TODO: If we switched to Git urls, maybe we could get this to work consistently.
+                    r"root\[\d+\]\['aspect'\]\['json'\]\['customProperties'\]\['datahub_sql_parser_error'\]",
+                    r"root\[\d+\]\['aspect'\]\['json'\]\['customProperties'\]\['openlineage_.*'\]",
+                    r"root\[\d+\]\['aspect'\]\['json'\]\['customProperties'\]\['log_url'\]",
+                    r"root\[\d+\]\['aspect'\]\['json'\]\['externalUrl'\]",
+                ],
+            )
+
 
 def _sanitize_output_file(output_path: pathlib.Path) -> None:
     # Overwrite some custom properties in the output file to make it easier to compare.
@@ -534,6 +567,7 @@ def _sanitize(obj: Any) -> None:
         tmp_path=pathlib.Path(tempfile.mkdtemp("airflow-plugin-test")),
         dags_folder=DAGS_FOLDER,
         is_v1=not HAS_AIRFLOW_LISTENER_API,
+        multiple_connections=False,
     ) as airflow_instance:
         # input("Press enter to exit...")
         breakpoint()
diff --git a/metadata-ingestion/src/datahub/emitter/composite_emitter.py b/metadata-ingestion/src/datahub/emitter/composite_emitter.py
new file mode 100644
index 00000000000000..fe35f74be11cb3
--- /dev/null
+++ b/metadata-ingestion/src/datahub/emitter/composite_emitter.py
@@ -0,0 +1,36 @@
+from typing import Callable, List, Optional, Union
+
+from datahub.emitter.generic_emitter import Emitter
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.metadata.com.linkedin.pegasus2avro.mxe import (
+    MetadataChangeEvent,
+    MetadataChangeProposal,
+)
+
+
+# Experimental composite emitter that allows multiple emitters to be used in a single ingestion job
+class CompositeEmitter(Emitter):
+    def __init__(self, emitters: List[Emitter]) -> None:
+        self.emitters = emitters
+
+    def emit(
+        self,
+        item: Union[
+            MetadataChangeEvent,
+            MetadataChangeProposal,
+            MetadataChangeProposalWrapper,
+        ],
+        callback: Optional[Callable[[Exception, str], None]] = None,
+    ) -> None:
+        callback_called = False
+        for emitter in self.emitters:
+            if not callback_called:
+                # We want to ensure that the callback is only called once and we tie it to the first emitter
+                emitter.emit(item, callback)
+                callback_called = True
+            else:
+                emitter.emit(item)
+
+    def flush(self) -> None:
+        for emitter in self.emitters:
+            emitter.flush()
diff --git a/metadata-ingestion/tests/unit/datahub/emitter/test_composite_emitter.py b/metadata-ingestion/tests/unit/datahub/emitter/test_composite_emitter.py
new file mode 100644
index 00000000000000..fdab1224d77d4a
--- /dev/null
+++ b/metadata-ingestion/tests/unit/datahub/emitter/test_composite_emitter.py
@@ -0,0 +1,42 @@
+from unittest.mock import MagicMock
+
+import pytest
+
+from datahub.emitter.composite_emitter import CompositeEmitter
+from datahub.emitter.generic_emitter import Emitter
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.metadata.com.linkedin.pegasus2avro.dataset import DatasetProfile
+
+
+@pytest.fixture
+def mock_emitters():
+    return [MagicMock(spec=Emitter), MagicMock(spec=Emitter)]
+
+
+def test_composite_emitter_emit(mock_emitters):
+    composite_emitter = CompositeEmitter(mock_emitters)
+    item = MetadataChangeProposalWrapper(
+        entityUrn="urn:li:dataset:(urn:li:dataPlatform:mysql,User.UserAccount,PROD)",
+        aspect=DatasetProfile(
+            rowCount=2000,
+            columnCount=15,
+            timestampMillis=1626995099686,
+        ),
+    )
+    callback = MagicMock()
+
+    composite_emitter.emit(item, callback)
+
+    mock_emitters[0].emit.assert_called_once_with(item, callback)
+    mock_emitters[1].emit.assert_called_once_with(item)
+    assert mock_emitters[0].emit.call_count == 1
+    assert mock_emitters[1].emit.call_count == 1
+
+
+def test_composite_emitter_flush(mock_emitters):
+    composite_emitter = CompositeEmitter(mock_emitters)
+
+    composite_emitter.flush()
+
+    for emitter in mock_emitters:
+        emitter.flush.assert_called_once()

From cc0d43f5a82d9e4bf78a50d7af26f8dee66dfe86 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Wed, 29 Jan 2025 21:37:17 +0530
Subject: [PATCH 178/249] feat(ingest): add datahub apply source (#12482)

---
 metadata-ingestion/setup.py                   |   1 +
 .../src/datahub/cli/container_cli.py          |  65 +----
 .../ingestion/source/apply/__init__.py        |   0
 .../ingestion/source/apply/datahub_apply.py   | 223 ++++++++++++++++++
 4 files changed, 225 insertions(+), 64 deletions(-)
 create mode 100644 metadata-ingestion/src/datahub/ingestion/source/apply/__init__.py
 create mode 100644 metadata-ingestion/src/datahub/ingestion/source/apply/datahub_apply.py

diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py
index b3175989309849..e603b5f6ac1d30 100644
--- a/metadata-ingestion/setup.py
+++ b/metadata-ingestion/setup.py
@@ -743,6 +743,7 @@
         "looker = datahub.ingestion.source.looker.looker_source:LookerDashboardSource",
         "lookml = datahub.ingestion.source.looker.lookml_source:LookMLSource",
         "datahub-gc = datahub.ingestion.source.gc.datahub_gc:DataHubGcSource",
+        "datahub-apply = datahub.ingestion.source.apply.datahub_apply:DataHubApplySource",
         "datahub-lineage-file = datahub.ingestion.source.metadata.lineage:LineageFileSource",
         "datahub-business-glossary = datahub.ingestion.source.metadata.business_glossary:BusinessGlossaryFileSource",
         "mlflow = datahub.ingestion.source.mlflow:MLflowSource",
diff --git a/metadata-ingestion/src/datahub/cli/container_cli.py b/metadata-ingestion/src/datahub/cli/container_cli.py
index 5f1dc35edd3ee1..d44eda15c6f8c8 100644
--- a/metadata-ingestion/src/datahub/cli/container_cli.py
+++ b/metadata-ingestion/src/datahub/cli/container_cli.py
@@ -1,19 +1,8 @@
 import logging
-from typing import Any, List
 
 import click
-import progressbar
 
-from datahub.emitter.mcp import MetadataChangeProposalWrapper
-from datahub.ingestion.graph.client import get_default_graph
-from datahub.metadata.schema_classes import (
-    DomainsClass,
-    GlossaryTermAssociationClass,
-    OwnerClass,
-    OwnershipTypeClass,
-    TagAssociationClass,
-)
-from datahub.specific.dataset import DatasetPatchBuilder
+from datahub.ingestion.source.apply.datahub_apply import apply_association_to_container
 
 logger = logging.getLogger(__name__)
 
@@ -24,58 +13,6 @@ def container() -> None:
     pass
 
 
-def apply_association_to_container(
-    container_urn: str,
-    association_urn: str,
-    association_type: str,
-) -> None:
-    """
-    Common function to add either tags, terms, domains, or owners to child datasets (for now).
-
-    Args:
-        container_urn: The URN of the container
-        association_urn: The URN of the tag, term, or user to apply
-        association_type: One of 'tag', 'term', 'domain' or 'owner'
-    """
-    urns: List[str] = []
-    graph = get_default_graph()
-    logger.info(f"Using {graph}")
-    urns.extend(
-        graph.get_urns_by_filter(
-            container=container_urn, batch_size=1000, entity_types=["dataset"]
-        )
-    )
-
-    all_patches: List[Any] = []
-    for urn in urns:
-        builder = DatasetPatchBuilder(urn)
-        patches: List[Any] = []
-        if association_type == "tag":
-            patches = builder.add_tag(TagAssociationClass(association_urn)).build()
-        elif association_type == "term":
-            patches = builder.add_term(
-                GlossaryTermAssociationClass(association_urn)
-            ).build()
-        elif association_type == "owner":
-            patches = builder.add_owner(
-                OwnerClass(
-                    owner=association_urn,
-                    type=OwnershipTypeClass.TECHNICAL_OWNER,
-                )
-            ).build()
-        elif association_type == "domain":
-            patches = [
-                MetadataChangeProposalWrapper(
-                    entityUrn=urn,
-                    aspect=DomainsClass(domains=[association_urn]),
-                )
-            ]
-        all_patches.extend(patches)
-    mcps_iter = progressbar.progressbar(all_patches, redirect_stdout=True)
-    for mcp in mcps_iter:
-        graph.emit(mcp)
-
-
 @container.command()
 @click.option("--container-urn", required=True, type=str)
 @click.option("--tag-urn", required=True, type=str)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/apply/__init__.py b/metadata-ingestion/src/datahub/ingestion/source/apply/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/metadata-ingestion/src/datahub/ingestion/source/apply/datahub_apply.py b/metadata-ingestion/src/datahub/ingestion/source/apply/datahub_apply.py
new file mode 100644
index 00000000000000..6e80fa5972bc56
--- /dev/null
+++ b/metadata-ingestion/src/datahub/ingestion/source/apply/datahub_apply.py
@@ -0,0 +1,223 @@
+import logging
+from functools import partial
+from typing import Any, Iterable, List, Optional, Union
+
+import progressbar
+from pydantic import Field
+
+from datahub.configuration.common import ConfigModel
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.ingestion.api.common import PipelineContext
+from datahub.ingestion.api.decorators import (
+    SupportStatus,
+    config_class,
+    platform_name,
+    support_status,
+)
+from datahub.ingestion.api.source import MetadataWorkUnitProcessor, Source, SourceReport
+from datahub.ingestion.api.source_helpers import auto_workunit_reporter
+from datahub.ingestion.api.workunit import MetadataWorkUnit
+from datahub.ingestion.graph.client import DataHubGraph, get_default_graph
+from datahub.metadata.schema_classes import (
+    DomainsClass,
+    GlossaryTermAssociationClass,
+    MetadataChangeProposalClass,
+    OwnerClass,
+    OwnershipTypeClass,
+    TagAssociationClass,
+)
+from datahub.specific.dataset import DatasetPatchBuilder
+
+logger = logging.getLogger(__name__)
+
+
+def apply_association_to_container(
+    container_urn: str,
+    association_urn: str,
+    association_type: str,
+    emit: bool = True,
+    graph: Optional[DataHubGraph] = None,
+) -> Optional[List[Union[MetadataChangeProposalWrapper, MetadataChangeProposalClass]]]:
+    """
+    Common function to add either tags, terms, domains, or owners to child datasets (for now).
+
+    Args:
+        container_urn: The URN of the container
+        association_urn: The URN of the tag, term, or user to apply
+        association_type: One of 'tag', 'term', 'domain' or 'owner'
+    """
+    urns: List[str] = [container_urn]
+    if not graph:
+        graph = get_default_graph()
+    logger.info(f"Using {graph}")
+    urns.extend(
+        graph.get_urns_by_filter(
+            container=container_urn,
+            batch_size=1000,
+            entity_types=["dataset", "container"],
+        )
+    )
+
+    all_patches: List[Any] = []
+    for urn in urns:
+        builder = DatasetPatchBuilder(urn)
+        patches: List[Any] = []
+        if association_type == "tag":
+            patches = builder.add_tag(TagAssociationClass(association_urn)).build()
+        elif association_type == "term":
+            patches = builder.add_term(
+                GlossaryTermAssociationClass(association_urn)
+            ).build()
+        elif association_type == "owner":
+            patches = builder.add_owner(
+                OwnerClass(
+                    owner=association_urn,
+                    type=OwnershipTypeClass.TECHNICAL_OWNER,
+                )
+            ).build()
+        elif association_type == "domain":
+            patches = [
+                MetadataChangeProposalWrapper(
+                    entityUrn=urn,
+                    aspect=DomainsClass(domains=[association_urn]),
+                )
+            ]
+        all_patches.extend(patches)
+    if emit:
+        mcps_iter = progressbar.progressbar(all_patches, redirect_stdout=True)
+        for mcp in mcps_iter:
+            graph.emit(mcp)
+        return None
+    else:
+        return all_patches
+
+
+class DomainApplyConfig(ConfigModel):
+    assets: List[str] = Field(
+        default_factory=list,
+        description="List of assets to apply domain hierarchichaly. Currently only containers and datasets are supported",
+    )
+    domain_urn: str = Field(default="")
+
+
+class TagApplyConfig(ConfigModel):
+    assets: List[str] = Field(
+        default_factory=list,
+        description="List of assets to apply tag hierarchichaly. Currently only containers and datasets are supported",
+    )
+    tag_urn: str = Field(default="")
+
+
+class TermApplyConfig(ConfigModel):
+    assets: List[str] = Field(
+        default_factory=list,
+        description="List of assets to apply term hierarchichaly. Currently only containers and datasets are supported",
+    )
+    term_urn: str = Field(default="")
+
+
+class OwnerApplyConfig(ConfigModel):
+    assets: List[str] = Field(
+        default_factory=list,
+        description="List of assets to apply owner hierarchichaly. Currently only containers and datasets are supported",
+    )
+    owner_urn: str = Field(default="")
+
+
+class DataHubApplyConfig(ConfigModel):
+    domain_apply: Optional[List[DomainApplyConfig]] = Field(
+        default=None,
+        description="List to apply domains to assets",
+    )
+    tag_apply: Optional[List[TagApplyConfig]] = Field(
+        default=None,
+        description="List to apply tags to assets",
+    )
+    term_apply: Optional[List[TermApplyConfig]] = Field(
+        default=None,
+        description="List to apply terms to assets",
+    )
+    owner_apply: Optional[List[OwnerApplyConfig]] = Field(
+        default=None,
+        description="List to apply owners to assets",
+    )
+
+
+@platform_name("DataHubApply")
+@config_class(DataHubApplyConfig)
+@support_status(SupportStatus.TESTING)
+class DataHubApplySource(Source):
+    """
+    This source is a helper over CLI
+    so people can use the helper to apply various metadata changes to DataHub
+    via Managed Ingestion
+    """
+
+    def __init__(self, ctx: PipelineContext, config: DataHubApplyConfig):
+        self.ctx = ctx
+        self.config = config
+        self.report = SourceReport()
+        self.graph = ctx.require_graph()
+
+    def _yield_workunits(
+        self,
+        proposals: List[
+            Union[MetadataChangeProposalWrapper, MetadataChangeProposalClass]
+        ],
+    ) -> Iterable[MetadataWorkUnit]:
+        for proposal in proposals:
+            if isinstance(proposal, MetadataChangeProposalWrapper):
+                yield proposal.as_workunit()
+            else:
+                yield MetadataWorkUnit(
+                    id=MetadataWorkUnit.generate_workunit_id(proposal),
+                    mcp_raw=proposal,
+                )
+
+    def _handle_assets(
+        self, assets: List[str], apply_urn: str, apply_type: str
+    ) -> Iterable[MetadataWorkUnit]:
+        for asset in assets:
+            change_proposals = apply_association_to_container(
+                asset, apply_urn, apply_type, emit=False, graph=self.graph
+            )
+            assert change_proposals is not None
+            yield from self._yield_workunits(change_proposals)
+
+    def _yield_domain(self) -> Iterable[MetadataWorkUnit]:
+        if not self.config.domain_apply:
+            return
+        for apply in self.config.domain_apply:
+            yield from self._handle_assets(apply.assets, apply.domain_urn, "domain")
+
+    def _yield_tag(self) -> Iterable[MetadataWorkUnit]:
+        if not self.config.tag_apply:
+            return
+        for apply in self.config.tag_apply:
+            yield from self._handle_assets(apply.assets, apply.tag_urn, "tag")
+
+    def _yield_term(self) -> Iterable[MetadataWorkUnit]:
+        if not self.config.term_apply:
+            return
+        for apply in self.config.term_apply:
+            yield from self._handle_assets(apply.assets, apply.term_urn, "term")
+
+    def _yield_owner(self) -> Iterable[MetadataWorkUnit]:
+        if not self.config.owner_apply:
+            return
+        for apply in self.config.owner_apply:
+            yield from self._handle_assets(apply.assets, apply.owner_urn, "owner")
+
+    def get_workunits_internal(
+        self,
+    ) -> Iterable[MetadataWorkUnit]:
+        yield from self._yield_domain()
+        yield from self._yield_tag()
+        yield from self._yield_term()
+        yield from self._yield_owner()
+
+    def get_workunit_processors(self) -> List[Optional[MetadataWorkUnitProcessor]]:
+        return [partial(auto_workunit_reporter, self.get_report())]
+
+    def get_report(self) -> SourceReport:
+        return self.report

From 412600a163df1eac3bd3b364a16aaedc40f8bb70 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Wed, 29 Jan 2025 11:30:44 -0600
Subject: [PATCH 179/249] feat(telemetry): cross-component async write tracing
 (#12405)

---
 build.gradle                                  |   7 +-
 .../resolvers/group/EntityCountsResolver.java |   2 +-
 .../mutate/MutableTypeBatchResolver.java      |  41 +-
 .../ListRecommendationsResolver.java          |   2 +-
 .../resolvers/search/SearchResolver.java      |   2 +-
 .../upgrade/UpgradeCliApplication.java        |   6 +-
 .../upgrade/config/SystemUpdateConfig.java    |   1 +
 .../upgrade/impl/DefaultUpgradeManager.java   |  93 +-
 docs-website/sidebars.js                      |   1 +
 docs/advanced/api-tracing.md                  | 332 +++++++
 .../linkedin/metadata/aspect/ReadItem.java    |   7 +
 .../metadata/aspect/SystemAspect.java         |   6 +
 .../metadata/aspect/batch/MCLItem.java        |   5 +
 .../test/metadata/aspect/batch/TestMCP.java   |   2 +-
 .../dao/producer/KafkaEventProducer.java      |  72 +-
 .../java/com/linkedin/mxe/ConsumerGroups.java |   8 +
 .../com/linkedin/metadata/EventUtils.java     |  24 +-
 metadata-io/build.gradle                      |   1 +
 .../entity/ebean/batch/AspectsBatchImpl.java  |   8 +-
 .../entity/ebean/batch/ChangeItemImpl.java    |  28 +-
 .../entity/ebean/batch/DeleteItemImpl.java    |   6 +
 .../entity/ebean/batch/PatchItemImpl.java     |  10 +-
 .../entity/ebean/batch/ProposedItem.java      |   5 +
 .../aspect/utils/DefaultAspectsUtil.java      |  14 +-
 .../metadata/client/JavaEntityClient.java     |   2 +-
 .../metadata/entity/EntityServiceImpl.java    | 904 ++++++++++--------
 .../cassandra/CassandraRetentionService.java  |   2 +-
 .../entity/ebean/EbeanRetentionService.java   |   2 +-
 .../entity/validation/ValidationUtils.java    | 237 ++---
 .../metadata/event/EventProducer.java         |  88 +-
 .../graph/elastic/ESGraphQueryDAO.java        |  81 +-
 .../elastic/ElasticSearchGraphService.java    |   2 +-
 .../graph/neo4j/Neo4jGraphService.java        |  39 +-
 .../candidatesource/MostPopularSource.java    |  42 +-
 .../candidatesource/RecentlyEditedSource.java |  42 +-
 .../candidatesource/RecentlyViewedSource.java |  42 +-
 .../metadata/search/LineageSearchService.java |   2 +-
 .../metadata/search/SearchService.java        |  15 +-
 .../search/cache/CacheableSearcher.java       | 138 +--
 .../search/cache/EntityDocCountCache.java     |   2 +-
 .../client/CachingEntitySearchService.java    | 250 ++---
 .../elasticsearch/query/ESBrowseDAO.java      |  96 +-
 .../elasticsearch/query/ESSearchDAO.java      | 214 +++--
 .../request/AggregationQueryBuilder.java      |   2 +-
 .../query/request/SearchRequestHandler.java   |   2 +-
 .../service/UpdateIndicesService.java         | 132 ++-
 .../systemmetadata/ESSystemMetadataDAO.java   |  48 +-
 .../ElasticSearchSystemMetadataService.java   |  79 +-
 .../SystemMetadataMappingsBuilder.java        |   3 +
 .../ElasticSearchTimeseriesAspectService.java |  69 +-
 .../timeseries/elastic/UsageServiceUtil.java  |  28 +-
 .../metadata/trace/KafkaTraceReader.java      | 460 +++++++++
 .../metadata/trace/MCLTraceReader.java        |  43 +
 .../metadata/trace/MCPFailedTraceReader.java  |  45 +
 .../metadata/trace/MCPTraceReader.java        |  43 +
 .../metadata/trace/TraceServiceImpl.java      | 484 ++++++++++
 .../metadata/entity/EntityServiceTest.java    | 194 +++-
 .../graph/neo4j/Neo4jGraphServiceTest.java    |   3 +-
 .../TimeseriesAspectServiceUnitTest.java      |  93 +-
 .../trace/BaseKafkaTraceReaderTest.java       | 239 +++++
 .../metadata/trace/MCLTraceReaderTest.java    |  93 ++
 .../trace/MCPFailedTraceReaderTest.java       |  98 ++
 .../metadata/trace/MCPTraceReaderTest.java    |  93 ++
 .../metadata/trace/TraceServiceImplTest.java  | 350 +++++++
 .../kafka/MAEOpenTelemetryConfig.java         |  21 +
 metadata-jobs/mae-consumer/build.gradle       |   1 +
 .../kafka/DataHubUsageEventsProcessor.java    |  59 +-
 .../metadata/kafka/MCLKafkaListener.java      |  92 +-
 .../MCLSpringCommonTestConfiguration.java     |   1 +
 .../kafka/MCEOpenTelemetryConfig.java         |  21 +
 metadata-jobs/mce-consumer/build.gradle       |   1 +
 .../kafka/MetadataChangeEventsProcessor.java  |  55 +-
 .../MetadataChangeProposalsProcessor.java     |  81 +-
 ...BatchMetadataChangeProposalsProcessor.java | 107 ++-
 .../kafka/util/KafkaListenerUtil.java         |  42 -
 .../datahub/event/PlatformEventProcessor.java | 100 +-
 .../metadata/run/AspectRowSummary.pdl         |   1 +
 metadata-operation-context/build.gradle       |   4 +-
 .../metadata/context/OperationContext.java    |  95 +-
 .../metadata/context/RequestContext.java      |   8 +
 .../metadata/context/TraceContext.java        | 414 ++++++++
 .../metadata/context/TraceIdGenerator.java    |  48 +
 .../metadata/exception/TraceException.java    |  40 +
 .../context/TestOperationContexts.java        |  58 +-
 .../context/OperationContextTest.java         | 183 ++++
 .../metadata/context/TraceContextTest.java    | 293 ++++++
 .../authorization/DataHubAuthorizerTest.java  |   1 +
 .../src/main/resources/application.yaml       |   3 +
 metadata-service/factories/build.gradle       |   5 +
 .../common/Neo4jGraphServiceFactory.java      |  10 +-
 .../SystemOperationContextFactory.java        |   9 +-
 .../kafka/common/AdminClientFactory.java      |  30 +
 .../kafka/throttle/KafkaThrottleFactory.java  |  25 +-
 .../kafka/trace/KafkaTraceReaderFactory.java  | 196 ++++
 .../OpenTelemetryBaseFactory.java             |  81 ++
 .../factory/trace/TraceServiceFactory.java    |  37 +
 .../kafka/DataHubUpgradeKafkaListener.java    |  85 +-
 .../OpenAPIAnalyticsTestConfiguration.java    |   2 +
 .../OpenAPIEntityTestConfiguration.java       |   8 +
 metadata-service/openapi-servlet/build.gradle |   4 +
 .../openapi-servlet/models/build.gradle       |   1 +
 .../openapi/v1/models/TraceRequestV1.java     |  17 +
 .../openapi/v1/models/TraceResponseV1.java    |  22 +
 .../openapi/config/SpringWebConfig.java       |   9 +
 .../openapi/config/TracingInterceptor.java    |  93 ++
 .../controller/GenericEntitiesController.java |  98 +-
 .../operations/v1/TraceController.java        | 149 +++
 .../openapi/util/MappingUtil.java             |   3 -
 .../openapi/util/RequestInputUtil.java        | 136 +++
 .../v1/entities/EntitiesController.java       |   6 +-
 .../RelationshipsController.java              |   4 +-
 .../v3/controller/EntityController.java       |  13 +
 .../java/entities/EntitiesControllerTest.java |   3 +-
 .../operations/v1/TraceControllerTest.java    | 275 ++++++
 .../v3/controller/EntityControllerTest.java   |  82 ++
 .../com.linkedin.entity.aspects.snapshot.json |  38 +-
 ...com.linkedin.entity.entities.snapshot.json |  56 +-
 .../com.linkedin.entity.runs.snapshot.json    |  42 +-
 ...nkedin.operations.operations.snapshot.json |  38 +-
 ...m.linkedin.platform.platform.snapshot.json |  52 +-
 .../resources/entity/AspectResource.java      |  12 +-
 .../entity/BatchIngestionRunResource.java     |   8 +-
 .../resources/entity/EntityResource.java      |  40 +-
 .../resources/entity/EntityV2Resource.java    |   6 +-
 .../entity/EntityVersionedV2Resource.java     |   4 +-
 .../resources/lineage/Relationships.java      |   6 +-
 .../operations/OperationsResource.java        |  10 +-
 .../resources/platform/PlatformResource.java  |   2 +-
 .../resources/restli/RestliUtils.java         |  30 +-
 .../metadata/resources/usage/UsageStats.java  |   8 +-
 .../resources/entity/AspectResourceTest.java  |  75 +-
 .../metadata/entity/IngestAspectsResult.java  |  62 ++
 .../metadata/entity/IngestProposalResult.java |  11 -
 .../RecommendationsService.java               |   2 +-
 .../EntitySearchAggregationSource.java        |   2 +-
 .../RecentlySearchedSource.java               |  38 +-
 .../candidatesource/RecommendationSource.java |   2 +-
 .../systemmetadata/SystemMetadataService.java |   4 +
 .../metadata/systemmetadata/TraceService.java |  38 +
 .../metadata/systemmetadata/TraceStatus.java  |  16 +
 .../systemmetadata/TraceStorageStatus.java    |  52 +
 .../systemmetadata/TraceWriteStatus.java      |  18 +
 .../linkedin/gms/CommonApplicationConfig.java |   4 +-
 .../config/GMSOpenTelemetryConfig.java        |  21 +
 metadata-utils/build.gradle                   |   1 +
 .../utils/metrics/MetricSpanExporter.java     |  58 ++
 .../metadata/utils/metrics/MetricUtils.java   |  21 +-
 smoke-test/requirements.txt                   |   3 +-
 smoke-test/tests/trace/__init__.py            |   0
 smoke-test/tests/trace/test_api_trace.py      | 486 ++++++++++
 150 files changed, 8050 insertions(+), 1832 deletions(-)
 create mode 100644 docs/advanced/api-tracing.md
 create mode 100644 metadata-events/mxe-registration/src/main/java/com/linkedin/mxe/ConsumerGroups.java
 create mode 100644 metadata-io/src/main/java/com/linkedin/metadata/trace/KafkaTraceReader.java
 create mode 100644 metadata-io/src/main/java/com/linkedin/metadata/trace/MCLTraceReader.java
 create mode 100644 metadata-io/src/main/java/com/linkedin/metadata/trace/MCPFailedTraceReader.java
 create mode 100644 metadata-io/src/main/java/com/linkedin/metadata/trace/MCPTraceReader.java
 create mode 100644 metadata-io/src/main/java/com/linkedin/metadata/trace/TraceServiceImpl.java
 create mode 100644 metadata-io/src/test/java/com/linkedin/metadata/trace/BaseKafkaTraceReaderTest.java
 create mode 100644 metadata-io/src/test/java/com/linkedin/metadata/trace/MCLTraceReaderTest.java
 create mode 100644 metadata-io/src/test/java/com/linkedin/metadata/trace/MCPFailedTraceReaderTest.java
 create mode 100644 metadata-io/src/test/java/com/linkedin/metadata/trace/MCPTraceReaderTest.java
 create mode 100644 metadata-io/src/test/java/com/linkedin/metadata/trace/TraceServiceImplTest.java
 create mode 100644 metadata-jobs/mae-consumer-job/src/main/java/com/linkedin/metadata/kafka/MAEOpenTelemetryConfig.java
 create mode 100644 metadata-jobs/mce-consumer-job/src/main/java/com/linkedin/metadata/kafka/MCEOpenTelemetryConfig.java
 create mode 100644 metadata-operation-context/src/main/java/io/datahubproject/metadata/context/TraceContext.java
 create mode 100644 metadata-operation-context/src/main/java/io/datahubproject/metadata/context/TraceIdGenerator.java
 create mode 100644 metadata-operation-context/src/main/java/io/datahubproject/metadata/exception/TraceException.java
 create mode 100644 metadata-operation-context/src/test/java/io/datahubproject/metadata/context/TraceContextTest.java
 create mode 100644 metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/common/AdminClientFactory.java
 create mode 100644 metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/trace/KafkaTraceReaderFactory.java
 create mode 100644 metadata-service/factories/src/main/java/com/linkedin/gms/factory/system_telemetry/OpenTelemetryBaseFactory.java
 create mode 100644 metadata-service/factories/src/main/java/com/linkedin/gms/factory/trace/TraceServiceFactory.java
 create mode 100644 metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceRequestV1.java
 create mode 100644 metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceResponseV1.java
 create mode 100644 metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/TracingInterceptor.java
 create mode 100644 metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/v1/TraceController.java
 create mode 100644 metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/util/RequestInputUtil.java
 create mode 100644 metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/operations/v1/TraceControllerTest.java
 create mode 100644 metadata-service/services/src/main/java/com/linkedin/metadata/entity/IngestAspectsResult.java
 delete mode 100644 metadata-service/services/src/main/java/com/linkedin/metadata/entity/IngestProposalResult.java
 create mode 100644 metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceService.java
 create mode 100644 metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStatus.java
 create mode 100644 metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStorageStatus.java
 create mode 100644 metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceWriteStatus.java
 create mode 100644 metadata-service/war/src/main/java/com/linkedin/gms/factory/config/GMSOpenTelemetryConfig.java
 create mode 100644 metadata-utils/src/main/java/com/linkedin/metadata/utils/metrics/MetricSpanExporter.java
 create mode 100644 smoke-test/tests/trace/__init__.py
 create mode 100644 smoke-test/tests/trace/test_api_trace.py

diff --git a/build.gradle b/build.gradle
index 2984812bda13b8..73555a72dd26da 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,7 +38,7 @@ buildscript {
   ext.springVersion = '6.1.14'
   ext.springBootVersion = '3.2.9'
   ext.springKafkaVersion = '3.1.6'
-  ext.openTelemetryVersion = '1.18.0'
+  ext.openTelemetryVersion = '1.45.0'
   ext.neo4jVersion = '5.20.0'
   ext.neo4jTestVersion = '5.20.0'
   ext.neo4jApocVersion = '5.20.0'
@@ -220,7 +220,10 @@ project.ext.externalDependency = [
     'neo4jApocCore': 'org.neo4j.procedure:apoc-core:' + neo4jApocVersion,
     'neo4jApocCommon': 'org.neo4j.procedure:apoc-common:' + neo4jApocVersion,
     'opentelemetryApi': 'io.opentelemetry:opentelemetry-api:' + openTelemetryVersion,
-    'opentelemetryAnnotations': 'io.opentelemetry:opentelemetry-extension-annotations:' + openTelemetryVersion,
+    'opentelemetrySdk': 'io.opentelemetry:opentelemetry-sdk:' + openTelemetryVersion,
+    'opentelemetrySdkTrace': 'io.opentelemetry:opentelemetry-sdk-trace:' + openTelemetryVersion,
+    'opentelemetryAutoConfig': 'io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:' + openTelemetryVersion,
+    'opentelemetryAnnotations': 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.11.0',
     'opentracingJdbc':'io.opentracing.contrib:opentracing-jdbc:0.2.15',
     'parquet': 'org.apache.parquet:parquet-avro:1.12.3',
     'parquetHadoop': 'org.apache.parquet:parquet-hadoop:1.13.1',
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/group/EntityCountsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/group/EntityCountsResolver.java
index ac195ca5d82520..d97141b84588c6 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/group/EntityCountsResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/group/EntityCountsResolver.java
@@ -12,7 +12,7 @@
 import com.linkedin.metadata.service.ViewService;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/MutableTypeBatchResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/MutableTypeBatchResolver.java
index d647374b8e1efc..b343a78412ccc6 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/MutableTypeBatchResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/MutableTypeBatchResolver.java
@@ -2,13 +2,14 @@
 
 import static com.linkedin.datahub.graphql.resolvers.ResolverUtils.*;
 
-import com.codahale.metrics.Timer;
+import com.linkedin.datahub.graphql.QueryContext;
 import com.linkedin.datahub.graphql.concurrency.GraphQLConcurrencyUtils;
 import com.linkedin.datahub.graphql.exception.AuthorizationException;
 import com.linkedin.datahub.graphql.types.BatchMutableType;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import io.datahubproject.metadata.context.OperationContext;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import org.slf4j.Logger;
@@ -33,25 +34,29 @@ public MutableTypeBatchResolver(final BatchMutableType<I, B, T> batchMutableType
 
   @Override
   public CompletableFuture<List<T>> get(DataFetchingEnvironment environment) throws Exception {
+    final QueryContext context = environment.getContext();
+    final OperationContext opContext = context.getOperationContext();
+
     final B[] input =
         bindArgument(environment.getArgument("input"), _batchMutableType.batchInputClass());
 
-    return GraphQLConcurrencyUtils.supplyAsync(
-        () -> {
-          Timer.Context timer = MetricUtils.timer(this.getClass(), "batchMutate").time();
-
-          try {
-            return _batchMutableType.batchUpdate(input, environment.getContext());
-          } catch (AuthorizationException e) {
-            throw e;
-          } catch (Exception e) {
-            _logger.error("Failed to perform batchUpdate", e);
-            throw new IllegalArgumentException(e);
-          } finally {
-            timer.stop();
-          }
-        },
-        this.getClass().getSimpleName(),
-        "get");
+    return opContext.withSpan(
+        "batchMutate",
+        () ->
+            GraphQLConcurrencyUtils.supplyAsync(
+                () -> {
+                  try {
+                    return _batchMutableType.batchUpdate(input, environment.getContext());
+                  } catch (AuthorizationException e) {
+                    throw e;
+                  } catch (Exception e) {
+                    _logger.error("Failed to perform batchUpdate", e);
+                    throw new IllegalArgumentException(e);
+                  }
+                },
+                this.getClass().getSimpleName(),
+                "get"),
+        MetricUtils.DROPWIZARD_METRIC,
+        "true");
   }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/recommendation/ListRecommendationsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/recommendation/ListRecommendationsResolver.java
index 77f6eb285ecc5b..e613f4fc5849e7 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/recommendation/ListRecommendationsResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/recommendation/ListRecommendationsResolver.java
@@ -27,7 +27,7 @@
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import io.datahubproject.metadata.context.OperationContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.net.URISyntaxException;
 import java.util.Collections;
 import java.util.List;
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchResolver.java
index 45751fc6eb8cb2..bbf59234247e95 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchResolver.java
@@ -19,7 +19,7 @@
 import com.linkedin.metadata.query.SearchFlags;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
 import lombok.RequiredArgsConstructor;
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeCliApplication.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeCliApplication.java
index e17ac6be79face..b1f601761212a4 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeCliApplication.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeCliApplication.java
@@ -5,7 +5,9 @@
 import com.linkedin.gms.factory.graphql.GraphQLEngineFactory;
 import com.linkedin.gms.factory.kafka.KafkaEventConsumerFactory;
 import com.linkedin.gms.factory.kafka.SimpleKafkaConsumerFactory;
+import com.linkedin.gms.factory.kafka.trace.KafkaTraceReaderFactory;
 import com.linkedin.gms.factory.telemetry.ScheduledAnalyticsFactory;
+import com.linkedin.gms.factory.trace.TraceServiceFactory;
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
@@ -30,7 +32,9 @@
             DataHubAuthorizerFactory.class,
             SimpleKafkaConsumerFactory.class,
             KafkaEventConsumerFactory.class,
-            GraphQLEngineFactory.class
+            GraphQLEngineFactory.class,
+            KafkaTraceReaderFactory.class,
+            TraceServiceFactory.class
           })
     })
 public class UpgradeCliApplication {
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/SystemUpdateConfig.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/SystemUpdateConfig.java
index d0493019a40af2..2600ea2300dc9c 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/SystemUpdateConfig.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/SystemUpdateConfig.java
@@ -195,6 +195,7 @@ protected OperationContext javaSystemOperationContext(
                 .alternateValidation(
                     configurationProvider.getFeatureFlags().isAlternateMCPValidation())
                 .build(),
+            null,
             true);
 
     entityServiceAspectRetriever.setSystemOperationContext(systemOperationContext);
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/impl/DefaultUpgradeManager.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/impl/DefaultUpgradeManager.java
index 443042049e8856..8142c04ddf600d 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/impl/DefaultUpgradeManager.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/impl/DefaultUpgradeManager.java
@@ -1,7 +1,6 @@
 package com.linkedin.datahub.upgrade.impl;
 
 import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
 import com.linkedin.datahub.upgrade.Upgrade;
 import com.linkedin.datahub.upgrade.UpgradeCleanupStep;
 import com.linkedin.datahub.upgrade.UpgradeContext;
@@ -119,44 +118,60 @@ private UpgradeResult executeInternal(UpgradeContext context) {
   }
 
   private UpgradeStepResult executeStepInternal(UpgradeContext context, UpgradeStep step) {
-    int retryCount = step.retryCount();
-    UpgradeStepResult result = null;
-    int maxAttempts = retryCount + 1;
-    for (int i = 0; i < maxAttempts; i++) {
-      try (Timer.Context completionTimer =
-          MetricUtils.timer(MetricRegistry.name(step.id(), "completionTime")).time()) {
-        try (Timer.Context executionTimer =
-            MetricUtils.timer(MetricRegistry.name(step.id(), "executionTime")).time()) {
-          result = step.executable().apply(context);
-        }
-
-        if (result == null) {
-          // Failed to even retrieve a result. Create a default failure result.
-          result = new DefaultUpgradeStepResult(step.id(), DataHubUpgradeState.FAILED);
-          context
-              .report()
-              .addLine(String.format("Retrying %s more times...", maxAttempts - (i + 1)));
-          MetricUtils.counter(MetricRegistry.name(step.id(), "retry")).inc();
-        }
-
-        if (DataHubUpgradeState.SUCCEEDED.equals(result.result())) {
-          MetricUtils.counter(MetricRegistry.name(step.id(), "succeeded")).inc();
-          break;
-        }
-      } catch (Exception e) {
-        log.error("Caught exception during attempt {} of Step with id {}", i, step.id(), e);
-        context
-            .report()
-            .addLine(
-                String.format(
-                    "Caught exception during attempt %s of Step with id %s: %s", i, step.id(), e));
-        MetricUtils.counter(MetricRegistry.name(step.id(), "failed")).inc();
-        result = new DefaultUpgradeStepResult(step.id(), DataHubUpgradeState.FAILED);
-        context.report().addLine(String.format("Retrying %s more times...", maxAttempts - (i + 1)));
-      }
-    }
-
-    return result;
+    return context
+        .opContext()
+        .withSpan(
+            "completionTime",
+            () -> {
+              int retryCount = step.retryCount();
+              UpgradeStepResult result = null;
+              int maxAttempts = retryCount + 1;
+              for (int i = 0; i < maxAttempts; i++) {
+                try {
+                  result =
+                      context
+                          .opContext()
+                          .withSpan(
+                              "executionTime",
+                              () -> step.executable().apply(context),
+                              "step.id",
+                              step.id(),
+                              MetricUtils.DROPWIZARD_NAME,
+                              MetricUtils.name(step.id(), "executionTime"));
+
+                  if (result == null) {
+                    // Failed to even retrieve a result. Create a default failure result.
+                    result = new DefaultUpgradeStepResult(step.id(), DataHubUpgradeState.FAILED);
+                    context
+                        .report()
+                        .addLine(String.format("Retrying %s more times...", maxAttempts - (i + 1)));
+                    MetricUtils.counter(MetricRegistry.name(step.id(), "retry")).inc();
+                  }
+
+                  if (DataHubUpgradeState.SUCCEEDED.equals(result.result())) {
+                    MetricUtils.counter(MetricRegistry.name(step.id(), "succeeded")).inc();
+                    break;
+                  }
+                } catch (Exception e) {
+                  log.error(
+                      "Caught exception during attempt {} of Step with id {}", i, step.id(), e);
+                  context
+                      .report()
+                      .addLine(
+                          String.format(
+                              "Caught exception during attempt %s of Step with id %s: %s",
+                              i, step.id(), e));
+                  MetricUtils.counter(MetricRegistry.name(step.id(), "failed")).inc();
+                  result = new DefaultUpgradeStepResult(step.id(), DataHubUpgradeState.FAILED);
+                  context
+                      .report()
+                      .addLine(String.format("Retrying %s more times...", maxAttempts - (i + 1)));
+                }
+              }
+              return result;
+            },
+            MetricUtils.DROPWIZARD_METRIC,
+            "true");
   }
 
   private void executeCleanupInternal(UpgradeContext context, UpgradeResult result) {
diff --git a/docs-website/sidebars.js b/docs-website/sidebars.js
index fbd35b60aedba9..b53a7a4f2be56a 100644
--- a/docs-website/sidebars.js
+++ b/docs-website/sidebars.js
@@ -702,6 +702,7 @@ module.exports = {
         "docs/browseV2/browse-paths-v2",
         "docs/plugins",
         "docs/advanced/bootstrap-mcps",
+        "docs/advanced/api-tracing",
       ],
     },
     {
diff --git a/docs/advanced/api-tracing.md b/docs/advanced/api-tracing.md
new file mode 100644
index 00000000000000..589693209359b1
--- /dev/null
+++ b/docs/advanced/api-tracing.md
@@ -0,0 +1,332 @@
+# API Tracing
+
+## Introduction
+
+DataHub's asynchronous APIs enable high-volume data operations, particularly for bulk ingestion processes. While these 
+APIs optimize throughput, they previously lacked built-in validation mechanisms for operation status. Consequently, 
+detecting processing issues required direct monitoring of backend system metrics and logs.
+
+To address this limitation, DataHub implemented a trace/request ID system that enables end-to-end tracking of write 
+operations. This tracing mechanism is particularly crucial given DataHub's multi-stage write architecture, where data 
+propagates through multiple components and persists across distinct storage systems. The trace ID maintains continuity 
+throughout this complex processing pipeline, providing visibility into the operation's status at each stage of execution.
+
+The system effectively balances the performance benefits of asynchronous processing with the operational necessity of 
+request tracking and validation. This enhancement significantly improves observability without compromising the 
+throughput advantages of bulk operations.
+
+## Architecture Overview
+
+Shown below is the write path for an asynchronous write within DataHub. For more information about MCPs please see
+the documentation on [MetadataChangeProposal & MetadataChangeLog Events](/docs/advanced/mcp-mcl.md).
+
+<p align="center">
+  <img width="90%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/advanced/mcp-mcl/async-ingestion.svg"/>
+</p>
+
+A successful write operation requires data persistence in at least one storage system, though typically both primary and 
+search storage systems must be updated. The storage architecture consists of two main components:
+
+* Primary Storage: Comprises MySQL, Postgres, or Cassandra, serving as the persistent store for all non-Timeseries aspects.
+* Search Storage: Utilizes either Elasticsearch or OpenSearch systems.
+
+In most operational scenarios, write operations must successfully complete across both storage layers to maintain system 
+consistency and ensure complete data availability.
+
+## Trace API
+
+The trace API's status retrieval functionality requires three key identifiers to locate specific write operations: 
+the trace ID (unique to the request), the URN, and the aspect name. This combination of identifiers ensures precise 
+operation tracking within the system.
+
+For batch operations involving multiple URNs and aspects, a single trace ID is assigned to monitor the entire request. 
+In asynchronous mode, the system maintains independent status tracking for each aspect within the batch, allowing for 
+granular operation monitoring.
+
+The API returns a comprehensive status report that includes:
+
+* Per-aspect success/failure status
+* Detailed status breakdowns for each storage system
+* Write states as defined in the [Write States](#Write-States) documentation
+* Error information from MCP processing, when applicable, to facilitate debugging
+
+This structured approach to status reporting enables precise monitoring of complex write operations across the system's 
+various components.
+
+### Retrieving the `trace id`
+
+DataHub's asynchronous APIs provide trace ID information through two distinct mechanisms:
+
+* HTTP Response Header: A W3C-compliant `traceparent` header is included in all API responses
+The complete header value serves as a valid trace ID
+* System Metadata: For OpenAPI v3 APIs and those returning systemMetadata, the trace ID is accessible via the 
+`telemetryTraceId` property within systemMetadata
+
+While these two trace ID formats differ structurally—with the `traceparent` adhering to W3C's Trace Context
+specification—both formats are fully compatible with the Trace API for operation tracking purposes.
+
+Header Example:
+```text
+traceparent: 00-00062c53a468cbd8077e7dd079846870-9199effb49910b4e-01
+```
+
+`SystemMetadata` Example:
+```json
+[
+  {
+    "urn": "urn:li:dataset:(urn:li:dataPlatform:hive,fct_users_created,PROD)",
+    "status": {
+      "value": {
+        "removed": false
+      },
+      "systemMetadata": {
+        "properties": {
+          "telemetryLog": "false",
+          "telemetryQueueSpanId": "ee9e40edcb66ce4f",
+          "telemetryTraceId": "00062c53a468cbd8077e7dd079846870",
+          "telemetryEnqueuedAt": "1737587612508"
+        }
+      }
+    }
+  }
+]
+```
+
+### Write States
+
+As mentioned earlier, there are multiple states for an aspect write both storage systems. These states are as follows:
+
+| Write State              | Description                                                                                            |
+|--------------------------|--------------------------------------------------------------------------------------------------------|
+| `ERROR`                  | This state indicates an error occurred when processing the write request.                              |
+| `PENDING`                | A pending state indicates that the write is queued and the consumer has not yet processed the message. |
+| `ACTIVE_STATE`           | The write was successful and is the current value.                                                     |
+| `HISTORIC_STATE`         | The write was successful, however it has been overwritten by a newer value.                            |
+| `NO_OP`                  | The write is not applicable for a given storage system.                                                |
+| `UNKNOWN`                | We are unable to determine the state of the write and no record of its failure exists either.          |
+| `TRACE_NOT_IMPLEMENTED`  | We have not yet implemented tracing a particular aspect type. This applies to Timeseries aspects.      |
+
+### Using the Trace API
+
+The Trace API is implemented as an OpenAPI endpoint and can be used both programmatically and through the Swagger UI.
+
+Required Values:
+* `traceId` - The `trace id` associated with the write request. See the previous [Retrieving the `trace id`](#retrieving-the-trace-id) section for how to find this id.
+* URN/Aspect names - These are passed as a POST body and should represent at least a subset of the URN/aspects from the initial request.
+    An example is shown here for a single URN and 2 aspects [`datasetInfo`, `status`].
+    ```json
+    {
+       "urn:li:dataset:(urn:li:dataPlatform:bigquery,transactions.user_profile,PROD)": ["datasetInfo", "status"]
+    }
+    ```
+* Authorization token
+
+Optional Parameters:
+* `onlyIncludeErrors` (default: `true`) - If this parameter is set to `true`, the response will only include status information on the failed aspects.
+* `detailed` (default: `false`) - If set to `true`, will include detailed information from exceptions for failed MCPs.
+* `skipCache` (default: `false`) - If set to `true`, will bypass a short-lived cache of the kafka consumer group offsets.
+
+The following shows a few examples of requests/response pairs.
+* Successful Write
+  * Request for URN `urn:li:dataset:(urn:li:dataPlatform:bigquery,transactions.user_profile,PROD)` and aspect `status`
+      ```shell
+      curl -v 'http://localhost:8080/openapi/v1/trace/write/00062c2b698bcb28e92508f8f311802d?onlyIncludeErrors=false&detailed=true&skipCache=false' \
+        -H 'accept: application/json' \
+        -H 'Content-Type: application/json' \
+        -H 'Authorization: Bearer <TOKEN>' \
+        -d '{
+        "urn:li:dataset:(urn:li:dataPlatform:bigquery,transactions.user_profile,PROD)": [
+          "status"
+        ]
+      }' | jq
+      ```
+  * Example response
+      ```json
+      {
+        "urn:li:dataset:(urn:li:dataPlatform:bigquery,transactions.user_profile,PROD)": {
+          "status": {
+            "success": true,
+            "primaryStorage": {
+              "writeStatus": "ACTIVE_STATE"
+            },
+            "searchStorage": {
+              "writeStatus": "ACTIVE_STATE"
+            }
+          }
+        }
+      }
+      ```
+* Error with exception details
+  * Example request
+    ```shell
+    curl -v 'http://localhost:8080/openapi/v1/trace/write/00062c543e4550c8400e6f6864471a20?onlyIncludeErrors=true&detailed=true&skipCache=false' \
+      -H 'accept: application/json' \
+      -H 'Content-Type: application/json' \
+      -H 'Authorization: Bearer <TOKEN>' \
+      -d '{"urn:li:dataset:(urn:li:dataPlatform:bigquery,transactions.user_profile,PROD)": ["status"]}'
+    ```
+  * Example response
+    ```json
+        {
+            "urn:li:dataset:(urn:li:dataPlatform:bigquery,transactions.user_profile,PROD)": {
+                "status": {
+                    "success": false,
+                    "primaryStorage": {
+                        "writeStatus": "ERROR",
+                        "writeExceptions": [
+                            {
+                                "message": "Expected version -100000, actual version -1",
+                                "exceptionClass": "com.linkedin.metadata.aspect.plugins.validation.AspectValidationException",
+                                "stackTrace": [
+                                    "com.linkedin.metadata.aspect.plugins.validation.AspectValidationException.forPrecondition(AspectValidationException.java:33)",
+                                    "com.linkedin.metadata.aspect.plugins.validation.AspectValidationException.forPrecondition(AspectValidationException.java:25)",
+                                    "com.linkedin.metadata.aspect.validation.ConditionalWriteValidator.validateVersionPrecondition(ConditionalWriteValidator.java:152)",
+                                    "com.linkedin.metadata.aspect.validation.ConditionalWriteValidator.lambda$validatePreCommitAspects$2(ConditionalWriteValidator.java:100)",
+                                    "java.base/java.util.Optional.flatMap(Optional.java:289)",
+                                    "com.linkedin.metadata.aspect.validation.ConditionalWriteValidator.validatePreCommitAspects(ConditionalWriteValidator.java:98)",
+                                    "com.linkedin.metadata.aspect.plugins.validation.AspectPayloadValidator.validatePreCommit(AspectPayloadValidator.java:38)",
+                                    "com.linkedin.metadata.aspect.batch.AspectsBatch.lambda$validatePreCommit$4(AspectsBatch.java:129)",
+                                    "java.base/java.util.stream.ReferencePipeline$7$1.accept(ReferencePipeline.java:273)",
+                                    "java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1625)",
+                                    "java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509)",
+                                    "java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499)",
+                                    "java.base/java.util.stream.ForEachOps$ForEachOp.evaluateSequential(ForEachOps.java:150)",
+                                    "java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.evaluateSequential(ForEachOps.java:173)",
+                                    "java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)",
+                                    "java.base/java.util.stream.ReferencePipeline.forEach(ReferencePipeline.java:596)",
+                                    "com.linkedin.metadata.aspect.batch.AspectsBatch.validatePreCommit(AspectsBatch.java:130)"
+                                ]
+                            }
+                        ]
+                    },
+                    "searchStorage": {
+                        "writeStatus": "ERROR",
+                        "writeMessage": "Primary storage write failed."
+                    }
+                }
+            }
+        }
+    ```
+
+## Trace Performance
+
+The Trace API's performance profile varies based on operation status:
+
+Successful Operations:
+  * Optimal performance through direct storage access
+  * Requires single lookup operations from SQL and Elasticsearch
+  * Bypasses Kafka interaction entirely
+
+Error State Operations:
+* Performance impact due to required Kafka topic inspection
+  * Optimization mechanisms implemented:
+    * Timestamp-based offset seeking for efficient topic traversal
+    * Parallel trace processing with controlled concurrency
+    * Offset caching system to enhance response times 
+      * Cache bypass available via skipCache parameter when data currency is critical
+
+The performance differential between success and error states stems primarily from the additional overhead of Kafka 
+topic inspection required for error tracking and diagnosis.
+
+For more detail, please see the [Design Notes](#design-notes) section.
+
+## Trace Exporters
+
+At the foundation of the trace instrumentation is OpenTelemetry which has been a part of DataHub for quite some time. As
+documented in the [Monitoring](/docs/advanced/monitoring.md) section, OpenTelemetry can be configured to export traces
+to external systems. For the Trace API to function, this external system is NOT required.
+
+### Trace Log Export
+
+A special log-based OpenTelemetry exporter was implemented for debugging purposes. When selectively activated for a given
+request it will print `trace id`s and detailed timing information as the request traverses the different components of DataHub.
+The output of these logs is also not required for the Trace API to function, however it leverages the same underlying OpenTelemetry
+foundation.
+
+Activating a trace log is done using one of these methods:
+* HTTP Header: `X-Enable-Trace-Log: true`
+* Cookie: `enable-trace-log: true`
+  * javascript: `document.cookie = "enable-trace-log=true";`
+
+Example logs for a single request with tracing logging enabled:
+* GMS
+```text
+i.d.metadata.context.RequestContext:53 - RequestContext{actorUrn='urn:li:corpuser:datahub', sourceIP='172.18.0.5', requestAPI=OPENAPI, requestID='createAspect([dataset])', userAgent='Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36'}
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: a2898a18f9f0c4f1, ParentId: dd746f079d1232ba, Name: ingestTimeseriesProposal, Duration: 0.03 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={async=true, batch.size=1}, capacity=128, totalAddedValues=2}
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: 02e058ff616e4c99, ParentId: 7ed88659811a8fdb, Name: produceMetadataChangeProposal, Duration: 0.03 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={messaging.destination_kind=topic, messaging.system=kafka, messaging.destination=MetadataChangeProposal_v1, messaging.operation=publish, queue.enqueued_at=1737418391958}, capacity=128, totalAddedValues=5}
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: 7ed88659811a8fdb, ParentId: dd746f079d1232ba, Name: ingestProposalAsync, Duration: 2.57 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={batch.size=1}, capacity=128, totalAddedValues=1}
+```
+* MCE Consumer
+```text
+c.l.m.k.MetadataChangeProposalsProcessor:89 - Got MCP event key: urn:li:dataset:(urn:li:dataPlatform:snowflake,climate.daily_temperature,PROD), topic: MetadataChangeProposal_v1, partition: 0, offset: 75, value size: 412, timestamp: 1737418391959
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: a65075fe0982d873, ParentId: 02e058ff616e4c99, Name: consume, Duration: 0.01 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={messaging.destination_kind=topic, queue.duration_ms=4, messaging.system=kafka, messaging.destination=MetadataChangeProposal_v1, messaging.operation=receive, queue.enqueued_at=1737418391958}, capacity=128, totalAddedValues=6}
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: dd746f079d1232ba, ParentId: 0000000000000000, Name: POST /openapi/v3/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Cclimate.daily_temperature%2CPROD%29/status, Duration: 16.18 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={request.api=OPENAPI, http.status_code=202, user.id=urn:li:corpuser:datahub, http.url=/openapi/v3/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Cclimate.daily_temperature%2CPROD%29/status, request.id=createAspect([dataset]), http.method=POST}, capacity=128, totalAddedValues=6}
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: 94a019b95154c0e7, ParentId: 0cb378fe4f5ad185, Name: ingestProposalSync, Duration: 0.01 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={batch.size=0}, capacity=128, totalAddedValues=1}
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: 0cb378fe4f5ad185, ParentId: 68df6bc4729dc0a2, Name: ingestTimeseriesProposal, Duration: 0.25 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={async=false, batch.size=1}, capacity=128, totalAddedValues=2}
+c.l.m.entity.EntityServiceImpl:988 - Ingesting aspects batch to database: AspectsBatchImpl{items=[ChangeMCP{changeType=UPSERT, urn=urn:li:dataset:(urn:li:dataPlatform:snowflake,climate.daily_temperature,PROD), aspectName='status', recordTemplate={removed=false}, systemMetadata={lastObserved=1737418391954, version=1, properties={telemetryLog=true, telemetryQueueSpanId=02e058ff616e4c99, telemetryEnqueu...}]}
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: 4754a1c02dadec4c, ParentId: ef383b26f0040fc5, Name: retentionService, Duration: 0.09 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={batch.size=1}, capacity=128, totalAddedValues=1}
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: ef383b26f0040fc5, ParentId: 7ae629151400fc18, Name: ingestAspectsToLocalDB, Duration: 18.64 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={batch.size=1, dwizName=com.linkedin.metadata.entity.EntityServiceImpl.ingestAspectsToLocalDB}, capacity=128, totalAddedValues=2}
+c.l.m.entity.EntityServiceImpl:1900 - Producing MCL for ingested aspect status, urn urn:li:dataset:(urn:li:dataPlatform:snowflake,climate.daily_temperature,PROD)
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: f1a8a1da99f1ae23, ParentId: c5f8b3884060722c, Name: produceMetadataChangeLog, Duration: 0.10 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={messaging.destination_kind=topic, messaging.system=kafka, messaging.destination=MetadataChangeLog_Versioned_v1, messaging.operation=publish, queue.enqueued_at=1737418391982}, capacity=128, totalAddedValues=5}
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: c5f8b3884060722c, ParentId: 7ae629151400fc18, Name: emitMCL, Duration: 14.32 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={batch.size=1}, capacity=128, totalAddedValues=1}
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: 7ae629151400fc18, ParentId: 68df6bc4729dc0a2, Name: ingestProposalSync, Duration: 37.90 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={batch.size=1}, capacity=128, totalAddedValues=1}
+c.l.m.k.MetadataChangeProposalsProcessor:128 - Successfully processed MCP event urn: urn:li:dataset:(urn:li:dataPlatform:snowflake,climate.daily_temperature,PROD)
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: 68df6bc4729dc0a2, ParentId: 02e058ff616e4c99, Name: consume, Duration: 39.11 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={batch.size=1, dwizName=com.linkedin.metadata.kafka.MetadataChangeProposalsProcessor.consume}, capacity=128, totalAddedValues=2}
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: 04dc44653b634df2, ParentId: 02e058ff616e4c99, Name: consume, Duration: 0.03 ms
+```
+* MAE Consumer
+```text
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={messaging.destination_kind=topic, queue.duration_ms=22, messaging.system=kafka, messaging.destination=MetadataChangeLog_Versioned_v1, messaging.operation=receive, queue.enqueued_at=1737418391982}, capacity=128, totalAddedValues=6}
+c.l.metadata.kafka.MCLKafkaListener:96 - Invoking MCL hooks for consumer: generic-mae-consumer-job-client urn: urn:li:dataset:(urn:li:dataPlatform:snowflake,climate.daily_temperature,PROD), aspect name: status, entity type: dataset, change type: UPSERT
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: 3c3c055c360dc8e4, ParentId: 1de99215a0e82697, Name: FormAssignmentHook, Duration: 0.06 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={dwizName=com.linkedin.metadata.kafka.MCLKafkaListener.FormAssignmentHook_latency}, capacity=128, totalAddedValues=1}
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: 8e238d0156baacc4, ParentId: 1de99215a0e82697, Name: IngestionSchedulerHook, Duration: 0.05 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={dwizName=com.linkedin.metadata.kafka.MCLKafkaListener.IngestionSchedulerHook_latency}, capacity=128, totalAddedValues=1}
+c.l.m.s.e.update.ESBulkProcessor:85 - Added request id: urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Cclimate.daily_temperature%2CPROD%29, operation type: UPDATE, index: datasetindex_v2
+c.l.m.s.e.update.ESBulkProcessor:85 - Added request id: SIHRXj1ktF7qkwPBZO8w0A==, operation type: UPDATE, index: system_metadata_service_v1
+c.l.m.s.e.update.ESBulkProcessor:85 - Added request id: 2p3742l4sFS3wcL82Qh2lQ==, operation type: UPDATE, index: system_metadata_service_v1
+c.l.m.s.e.update.ESBulkProcessor:85 - Added request id: CfZKRLsf25/e3p3mURzlnA==, operation type: UPDATE, index: system_metadata_service_v1
+c.l.m.s.e.update.ESBulkProcessor:85 - Added request id: 8tvhG5ARd5BOdEbqaZkE0g==, operation type: UPDATE, index: system_metadata_service_v1
+c.l.m.s.e.update.ESBulkProcessor:85 - Added request id: rAvQOOBItiKAym622S4dcQ==, operation type: UPDATE, index: system_metadata_service_v1
+c.l.m.s.e.update.ESBulkProcessor:85 - Added request id: YqT6TNy7MAMOAyVXh6abMA==, operation type: UPDATE, index: system_metadata_service_v1
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: 054ac726204b449c, ParentId: 1de99215a0e82697, Name: UpdateIndicesHook, Duration: 47.31 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={dwizName=com.linkedin.metadata.kafka.MCLKafkaListener.UpdateIndicesHook_latency}, capacity=128, totalAddedValues=1}
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: 14d9ded49a94c7b8, ParentId: 1de99215a0e82697, Name: IncidentsSummaryHook, Duration: 0.09 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={dwizName=com.linkedin.metadata.kafka.MCLKafkaListener.IncidentsSummaryHook_latency}, capacity=128, totalAddedValues=1}
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: a92d9e54ade6073b, ParentId: 1de99215a0e82697, Name: EntityChangeEventGeneratorHook, Duration: 9.10 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={dwizName=com.linkedin.metadata.kafka.MCLKafkaListener.EntityChangeEventGeneratorHook_latency}, capacity=128, totalAddedValues=1}
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: c06dc7f131e57fca, ParentId: 1de99215a0e82697, Name: SiblingAssociationHook, Duration: 0.07 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={dwizName=com.linkedin.metadata.kafka.MCLKafkaListener.SiblingAssociationHook_latency}, capacity=128, totalAddedValues=1}
+c.l.metadata.kafka.MCLKafkaListener:139 - Successfully completed MCL hooks for consumer: generic-mae-consumer-job-client urn: urn:li:dataset:(urn:li:dataPlatform:snowflake,climate.daily_temperature,PROD)
+i.d.metadata.context.TraceContext:366 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, SpanId: 1de99215a0e82697, ParentId: 02e058ff616e4c99, Name: consume, Duration: 58.67 ms
+i.d.metadata.context.TraceContext:376 - Trace: 00062c2c3e1403109bbaf3d2e39adcd0, Attributes: AttributesMap{data={batch.size=1, dwizName=com.linkedin.metadata.kafka.MCLKafkaListener.consume}, capacity=128, totalAddedValues=2}
+```
+
+## Design Notes
+
+For the initial implementation no specific OpenTelemetry infrastructure is required, however existing environment variables
+for OpenTelemetry can continue to be used and will export the new spans if configured.
+
+The Trace API implementation does not rely on any additional external systems or infrastructure. Due to this design
+choice, the trace is determined by inspecting the 3 storage systems (Primary Storage (SQL/Cassandra), Elasticsearch/Opensearch,
+Kafka topics) for the `trace id` or related timestamps.
+
+The `trace id` is stored in systemMetadata in both SQL and ES. For ES specifically, the presence of the `trace id` in
+the system metadata index is used as a proxy to determine a successful write to ES. 
+
+The tracing feature will additionally fetch messages from the kafka topics (including the failed MCP topic) for 
+more detailed error information. Pending states are derived from offsets of the message vs the current offsets of the 
+consumer groups.
\ No newline at end of file
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/aspect/ReadItem.java b/entity-registry/src/main/java/com/linkedin/metadata/aspect/ReadItem.java
index 341dec4d4741c7..46e6bf45d654e5 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/aspect/ReadItem.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/aspect/ReadItem.java
@@ -64,6 +64,13 @@ static <T> T getAspect(Class<T> clazz, @Nullable RecordTemplate recordTemplate)
   @Nullable
   SystemMetadata getSystemMetadata();
 
+  /**
+   * Set system metadata on the item
+   *
+   * @param systemMetadata
+   */
+  void setSystemMetadata(@Nonnull SystemMetadata systemMetadata);
+
   /**
    * The entity's schema
    *
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/aspect/SystemAspect.java b/entity-registry/src/main/java/com/linkedin/metadata/aspect/SystemAspect.java
index 4c9bf3d4fdbc78..abbc82833c55f8 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/aspect/SystemAspect.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/aspect/SystemAspect.java
@@ -6,6 +6,7 @@
 import java.sql.Timestamp;
 import java.util.Optional;
 import javax.annotation.Nonnull;
+import org.apache.commons.lang3.NotImplementedException;
 
 /**
  * An aspect along with system metadata and creation timestamp. Represents an aspect as stored in
@@ -36,4 +37,9 @@ default Optional<Long> getSystemMetadataVersion() {
         .map(SystemMetadata::getVersion)
         .map(Long::parseLong);
   }
+
+  @Override
+  default void setSystemMetadata(@Nonnull SystemMetadata systemMetadata) {
+    throw new NotImplementedException();
+  }
 }
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/aspect/batch/MCLItem.java b/entity-registry/src/main/java/com/linkedin/metadata/aspect/batch/MCLItem.java
index 09da0a52ff0c30..1a9d66581ad523 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/aspect/batch/MCLItem.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/aspect/batch/MCLItem.java
@@ -37,6 +37,11 @@ default SystemMetadata getSystemMetadata() {
     return getMetadataChangeLog().getSystemMetadata();
   }
 
+  @Override
+  default void setSystemMetadata(@Nonnull SystemMetadata systemMetadata) {
+    getMetadataChangeLog().setSystemMetadata(systemMetadata);
+  }
+
   default SystemMetadata getPreviousSystemMetadata() {
     return getMetadataChangeLog().getPreviousSystemMetadata();
   }
diff --git a/entity-registry/src/testFixtures/java/com/linkedin/test/metadata/aspect/batch/TestMCP.java b/entity-registry/src/testFixtures/java/com/linkedin/test/metadata/aspect/batch/TestMCP.java
index d7dd1fab2b6acf..aacd09adc4036a 100644
--- a/entity-registry/src/testFixtures/java/com/linkedin/test/metadata/aspect/batch/TestMCP.java
+++ b/entity-registry/src/testFixtures/java/com/linkedin/test/metadata/aspect/batch/TestMCP.java
@@ -116,7 +116,7 @@ public static <T extends RecordTemplate> Set<ChangeMCP> ofOneMCP(
 
   private Urn urn;
   private RecordTemplate recordTemplate;
-  private SystemMetadata systemMetadata;
+  @Setter private SystemMetadata systemMetadata;
   private AuditStamp auditStamp;
   private ChangeType changeType;
   @Nonnull private final EntitySpec entitySpec;
diff --git a/metadata-dao-impl/kafka-producer/src/main/java/com/linkedin/metadata/dao/producer/KafkaEventProducer.java b/metadata-dao-impl/kafka-producer/src/main/java/com/linkedin/metadata/dao/producer/KafkaEventProducer.java
index 26b48449c1c2ff..f2434f07dd11c8 100644
--- a/metadata-dao-impl/kafka-producer/src/main/java/com/linkedin/metadata/dao/producer/KafkaEventProducer.java
+++ b/metadata-dao-impl/kafka-producer/src/main/java/com/linkedin/metadata/dao/producer/KafkaEventProducer.java
@@ -6,13 +6,17 @@
 import com.linkedin.metadata.event.EventProducer;
 import com.linkedin.metadata.models.AspectSpec;
 import com.linkedin.mxe.DataHubUpgradeHistoryEvent;
+import com.linkedin.mxe.FailedMetadataChangeProposal;
 import com.linkedin.mxe.MetadataChangeLog;
 import com.linkedin.mxe.MetadataChangeProposal;
 import com.linkedin.mxe.PlatformEvent;
 import com.linkedin.mxe.TopicConvention;
 import com.linkedin.mxe.TopicConventionImpl;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.datahubproject.metadata.context.OperationContext;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.io.IOException;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -29,7 +33,7 @@
  * delimiter of an underscore (_).
  */
 @Slf4j
-public class KafkaEventProducer implements EventProducer {
+public class KafkaEventProducer extends EventProducer {
 
   private final Producer<String, ? extends IndexedRecord> _producer;
   private final TopicConvention _topicConvention;
@@ -69,13 +73,19 @@ record = EventUtils.pegasusToAvroMCL(metadataChangeLog);
       throw new ModelConversionException("Failed to convert Pegasus MAE to Avro", e);
     }
 
+    String topic = getMetadataChangeLogTopicName(aspectSpec);
+    return _producer.send(
+        new ProducerRecord(topic, urn.toString(), record),
+        _kafkaHealthChecker.getKafkaCallBack("MCL", urn.toString()));
+  }
+
+  @Override
+  public String getMetadataChangeLogTopicName(@Nonnull AspectSpec aspectSpec) {
     String topic = _topicConvention.getMetadataChangeLogVersionedTopicName();
     if (aspectSpec.isTimeseries()) {
       topic = _topicConvention.getMetadataChangeLogTimeseriesTopicName();
     }
-    return _producer.send(
-        new ProducerRecord(topic, urn.toString(), record),
-        _kafkaHealthChecker.getKafkaCallBack("MCL", urn.toString()));
+    return topic;
   }
 
   @Override
@@ -102,6 +112,42 @@ record = EventUtils.pegasusToAvroMCP(metadataChangeProposal);
         _kafkaHealthChecker.getKafkaCallBack("MCP", urn.toString()));
   }
 
+  @Override
+  public String getMetadataChangeProposalTopicName() {
+    return _topicConvention.getMetadataChangeProposalTopicName();
+  }
+
+  @Override
+  public Future<?> produceFailedMetadataChangeProposalAsync(
+      @Nonnull OperationContext opContext,
+      @Nonnull MetadataChangeProposal mcp,
+      @Nonnull Set<Throwable> throwables) {
+
+    try {
+      String topic = _topicConvention.getFailedMetadataChangeProposalTopicName();
+      final FailedMetadataChangeProposal failedMetadataChangeProposal =
+          createFailedMCPEvent(opContext, mcp, throwables);
+
+      final GenericRecord record = EventUtils.pegasusToAvroFailedMCP(failedMetadataChangeProposal);
+      log.debug(
+          "Sending FailedMessages to topic - {}",
+          _topicConvention.getFailedMetadataChangeProposalTopicName());
+      log.info(
+          "Error while processing FMCP: FailedMetadataChangeProposal - {}",
+          failedMetadataChangeProposal);
+
+      return _producer.send(
+          new ProducerRecord(topic, mcp.getEntityUrn().toString(), record),
+          _kafkaHealthChecker.getKafkaCallBack("FMCP", mcp.getEntityUrn().toString()));
+    } catch (IOException e) {
+      log.error(
+          "Error while sending FailedMetadataChangeProposal: Exception  - {}, FailedMetadataChangeProposal - {}",
+          e.getStackTrace(),
+          mcp);
+      return CompletableFuture.failedFuture(e);
+    }
+  }
+
   @Override
   public Future<?> producePlatformEvent(
       @Nonnull String name, @Nullable String key, @Nonnull PlatformEvent event) {
@@ -121,6 +167,11 @@ record = EventUtils.pegasusToAvroPE(event);
         _kafkaHealthChecker.getKafkaCallBack("Platform Event", name));
   }
 
+  @Override
+  public String getPlatformEventTopicName() {
+    return _topicConvention.getPlatformEventTopicName();
+  }
+
   @Override
   public void produceDataHubUpgradeHistoryEvent(@Nonnull DataHubUpgradeHistoryEvent event) {
     GenericRecord record;
@@ -141,4 +192,15 @@ record = EventUtils.pegasusToAvroDUHE(event);
         _kafkaHealthChecker.getKafkaCallBack(
             "History Event", "Event Version: " + event.getVersion()));
   }
+
+  @Nonnull
+  private static FailedMetadataChangeProposal createFailedMCPEvent(
+      @Nonnull OperationContext opContext,
+      @Nonnull MetadataChangeProposal event,
+      @Nonnull Set<Throwable> throwables) {
+    final FailedMetadataChangeProposal fmcp = new FailedMetadataChangeProposal();
+    fmcp.setError(opContext.traceException(throwables));
+    fmcp.setMetadataChangeProposal(event);
+    return fmcp;
+  }
 }
diff --git a/metadata-events/mxe-registration/src/main/java/com/linkedin/mxe/ConsumerGroups.java b/metadata-events/mxe-registration/src/main/java/com/linkedin/mxe/ConsumerGroups.java
new file mode 100644
index 00000000000000..565be1d56e5fd4
--- /dev/null
+++ b/metadata-events/mxe-registration/src/main/java/com/linkedin/mxe/ConsumerGroups.java
@@ -0,0 +1,8 @@
+package com.linkedin.mxe;
+
+public class ConsumerGroups {
+  private ConsumerGroups() {}
+
+  public static final String MCP_CONSUMER_GROUP_ID_VALUE =
+      "${METADATA_CHANGE_PROPOSAL_KAFKA_CONSUMER_GROUP_ID:generic-mce-consumer-job-client}";
+}
diff --git a/metadata-events/mxe-utils-avro/src/main/java/com/linkedin/metadata/EventUtils.java b/metadata-events/mxe-utils-avro/src/main/java/com/linkedin/metadata/EventUtils.java
index 18005dfb7b2a5d..e40124b6abba82 100644
--- a/metadata-events/mxe-utils-avro/src/main/java/com/linkedin/metadata/EventUtils.java
+++ b/metadata-events/mxe-utils-avro/src/main/java/com/linkedin/metadata/EventUtils.java
@@ -38,6 +38,9 @@ public class EventUtils {
 
   private static final RecordDataSchema MCP_PEGASUS_SCHEMA = new MetadataChangeProposal().schema();
 
+  private static final RecordDataSchema FMCP_PEGASUS_SCHEMA =
+      new FailedMetadataChangeProposal().schema();
+
   private static final RecordDataSchema MCL_PEGASUS_SCHEMA = new MetadataChangeLog().schema();
 
   private static final RecordDataSchema PE_PEGASUS_SCHEMA = new PlatformEvent().schema();
@@ -60,7 +63,7 @@ public class EventUtils {
   private static final Schema ORIGINAL_MCL_AVRO_SCHEMA =
       getAvroSchemaFromResource("avro/com/linkedin/mxe/MetadataChangeLog.avsc");
 
-  private static final Schema ORIGINAL_FMCL_AVRO_SCHEMA =
+  private static final Schema ORIGINAL_FMCP_AVRO_SCHEMA =
       getAvroSchemaFromResource("avro/com/linkedin/mxe/FailedMetadataChangeProposal.avsc");
 
   private static final Schema ORIGINAL_PE_AVRO_SCHEMA =
@@ -175,6 +178,23 @@ public static MetadataChangeProposal avroToPegasusMCP(@Nonnull GenericRecord rec
             ORIGINAL_MCP_AVRO_SCHEMA));
   }
 
+  /**
+   * Converts a {@link GenericRecord} Failed MCP into the equivalent Pegasus model.
+   *
+   * @param record the {@link GenericRecord} that contains the MCP in com.linkedin.pegasus2avro
+   *     namespace
+   * @return the Pegasus {@link FailedMetadataChangeProposal} model
+   */
+  @Nonnull
+  public static FailedMetadataChangeProposal avroToPegasusFailedMCP(@Nonnull GenericRecord record)
+      throws IOException {
+    return new FailedMetadataChangeProposal(
+        DataTranslator.genericRecordToDataMap(
+            renameSchemaNamespace(record, RENAMED_FMCP_AVRO_SCHEMA, ORIGINAL_FMCP_AVRO_SCHEMA),
+            FMCP_PEGASUS_SCHEMA,
+            ORIGINAL_FMCP_AVRO_SCHEMA));
+  }
+
   /**
    * Converts a {@link GenericRecord} PE into the equivalent Pegasus model.
    *
@@ -323,7 +343,7 @@ public static GenericRecord pegasusToAvroFailedMCP(
         DataTranslator.dataMapToGenericRecord(
             failedMetadataChangeProposal.data(),
             failedMetadataChangeProposal.schema(),
-            ORIGINAL_FMCL_AVRO_SCHEMA);
+            ORIGINAL_FMCP_AVRO_SCHEMA);
     return renameSchemaNamespace(original, RENAMED_FMCP_AVRO_SCHEMA);
   }
 
diff --git a/metadata-io/build.gradle b/metadata-io/build.gradle
index b33f19bef95986..8efb96d7238456 100644
--- a/metadata-io/build.gradle
+++ b/metadata-io/build.gradle
@@ -58,6 +58,7 @@ dependencies {
   implementation externalDependency.ebeanDdl
   implementation externalDependency.ebeanAgent
   implementation externalDependency.opentelemetryAnnotations
+  implementation externalDependency.opentelemetrySdkTrace
   implementation externalDependency.resilience4j
   // Newer Spring libraries require JDK17 classes, allow for JDK11
   compileOnly externalDependency.springBootAutoconfigureJdk11
diff --git a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/AspectsBatchImpl.java b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/AspectsBatchImpl.java
index 1af9fc1565a456..9b993ab5fc4abb 100644
--- a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/AspectsBatchImpl.java
+++ b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/AspectsBatchImpl.java
@@ -154,8 +154,8 @@ private static BatchItem patchDiscriminator(MCPItem mcpItem, AspectRetriever asp
           mcpItem.getAuditStamp(),
           aspectRetriever.getEntityRegistry());
     }
-    return ChangeItemImpl.ChangeItemImplBuilder.build(
-        mcpItem.getMetadataChangeProposal(), mcpItem.getAuditStamp(), aspectRetriever);
+    return ChangeItemImpl.builder()
+        .build(mcpItem.getMetadataChangeProposal(), mcpItem.getAuditStamp(), aspectRetriever);
   }
 
   public static class AspectsBatchImplBuilder {
@@ -208,8 +208,8 @@ public AspectsBatchImplBuilder mcps(
                             auditStamp,
                             retrieverContext.getAspectRetriever().getEntityRegistry());
                       } else {
-                        return ChangeItemImpl.ChangeItemImplBuilder.build(
-                            mcp, auditStamp, retrieverContext.getAspectRetriever());
+                        return ChangeItemImpl.builder()
+                            .build(mcp, auditStamp, retrieverContext.getAspectRetriever());
                       }
                     } catch (IllegalArgumentException e) {
                       log.error("Invalid proposal, skipping and proceeding with batch: {}", mcp, e);
diff --git a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/ChangeItemImpl.java b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/ChangeItemImpl.java
index 64263859e4aadb..94f71ff0897c63 100644
--- a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/ChangeItemImpl.java
+++ b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/ChangeItemImpl.java
@@ -150,6 +150,14 @@ public MetadataChangeProposal getMetadataChangeProposal() {
     }
   }
 
+  @Override
+  public void setSystemMetadata(@Nonnull SystemMetadata systemMetadata) {
+    this.systemMetadata = systemMetadata;
+    if (this.metadataChangeProposal != null) {
+      this.metadataChangeProposal.setSystemMetadata(systemMetadata);
+    }
+  }
+
   @Override
   public Map<String, String> getHeaders() {
     return Optional.ofNullable(metadataChangeProposal)
@@ -183,6 +191,10 @@ public ChangeItemImpl build(AspectRetriever aspectRetriever) {
         this.headers = Map.of();
       }
 
+      if (this.urn == null && this.metadataChangeProposal != null) {
+        this.urn = this.metadataChangeProposal.getEntityUrn();
+      }
+
       ValidationApiUtils.validateUrn(aspectRetriever.getEntityRegistry(), this.urn);
       log.debug("entity type = {}", this.urn.getEntityType());
 
@@ -210,7 +222,7 @@ public ChangeItemImpl build(AspectRetriever aspectRetriever) {
           this.headers);
     }
 
-    public static ChangeItemImpl build(
+    public ChangeItemImpl build(
         MetadataChangeProposal mcp, AuditStamp auditStamp, AspectRetriever aspectRetriever) {
 
       log.debug("entity type = {}", mcp.getEntityType());
@@ -303,15 +315,17 @@ public String toString() {
     return "ChangeItemImpl{"
         + "changeType="
         + changeType
-        + ", urn="
-        + urn
+        + ", auditStamp="
+        + auditStamp
+        + ", systemMetadata="
+        + systemMetadata
+        + ", recordTemplate="
+        + recordTemplate
         + ", aspectName='"
         + aspectName
         + '\''
-        + ", recordTemplate="
-        + recordTemplate
-        + ", systemMetadata="
-        + systemMetadata
+        + ", urn="
+        + urn
         + '}';
   }
 }
diff --git a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/DeleteItemImpl.java b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/DeleteItemImpl.java
index 40bcb0fa8ed2d1..935227e55b6638 100644
--- a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/DeleteItemImpl.java
+++ b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/DeleteItemImpl.java
@@ -23,6 +23,7 @@
 import lombok.Setter;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.NotImplementedException;
 
 @Slf4j
 @Getter
@@ -61,6 +62,11 @@ public SystemMetadata getSystemMetadata() {
     return null;
   }
 
+  @Override
+  public void setSystemMetadata(@Nonnull SystemMetadata systemMetadata) {
+    throw new NotImplementedException();
+  }
+
   @Nullable
   @Override
   public MetadataChangeProposal getMetadataChangeProposal() {
diff --git a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/PatchItemImpl.java b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/PatchItemImpl.java
index 2543d99ac6af37..5e4e36cfe6fbd8 100644
--- a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/PatchItemImpl.java
+++ b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/PatchItemImpl.java
@@ -59,7 +59,7 @@ public class PatchItemImpl implements PatchMCP {
   private final Urn urn;
   // aspectName name of the aspect being inserted
   private final String aspectName;
-  private final SystemMetadata systemMetadata;
+  private SystemMetadata systemMetadata;
   private final AuditStamp auditStamp;
 
   private final JsonPatch patch;
@@ -105,6 +105,14 @@ public MetadataChangeProposal getMetadataChangeProposal() {
     }
   }
 
+  @Override
+  public void setSystemMetadata(@Nonnull SystemMetadata systemMetadata) {
+    this.systemMetadata = systemMetadata;
+    if (this.metadataChangeProposal != null) {
+      this.metadataChangeProposal.setSystemMetadata(systemMetadata);
+    }
+  }
+
   public ChangeItemImpl applyPatch(RecordTemplate recordTemplate, AspectRetriever aspectRetriever) {
     ChangeItemImpl.ChangeItemImplBuilder builder =
         ChangeItemImpl.builder()
diff --git a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/ProposedItem.java b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/ProposedItem.java
index 370f1f6f073e65..b5dec0bb06d0e2 100644
--- a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/ProposedItem.java
+++ b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/ebean/batch/ProposedItem.java
@@ -81,6 +81,11 @@ public SystemMetadata getSystemMetadata() {
     return metadataChangeProposal.getSystemMetadata();
   }
 
+  @Override
+  public void setSystemMetadata(@Nonnull SystemMetadata systemMetadata) {
+    metadataChangeProposal.setSystemMetadata(systemMetadata);
+  }
+
   @Nonnull
   @Override
   public ChangeType getChangeType() {
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/aspect/utils/DefaultAspectsUtil.java b/metadata-io/src/main/java/com/linkedin/metadata/aspect/utils/DefaultAspectsUtil.java
index 82bc0ae1409c52..b98e2465e971a8 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/aspect/utils/DefaultAspectsUtil.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/aspect/utils/DefaultAspectsUtil.java
@@ -133,11 +133,15 @@ public static List<MCPItem> getAdditionalChanges(
               return defaultAspects.stream()
                   .map(
                       entry ->
-                          ChangeItemImpl.ChangeItemImplBuilder.build(
-                              getProposalFromAspectForDefault(
-                                  entry.getKey(), entry.getValue(), entityKeyAspect, templateItem),
-                              templateItem.getAuditStamp(),
-                              opContext.getAspectRetriever()))
+                          ChangeItemImpl.builder()
+                              .build(
+                                  getProposalFromAspectForDefault(
+                                      entry.getKey(),
+                                      entry.getValue(),
+                                      entityKeyAspect,
+                                      templateItem),
+                                  templateItem.getAuditStamp(),
+                                  opContext.getAspectRetriever()))
                   .filter(Objects::nonNull);
             })
         .collect(Collectors.toList());
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/client/JavaEntityClient.java b/metadata-io/src/main/java/com/linkedin/metadata/client/JavaEntityClient.java
index 35d133c74c0692..71e1aea59c711a 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/client/JavaEntityClient.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/client/JavaEntityClient.java
@@ -58,7 +58,7 @@
 import com.linkedin.r2.RemoteInvocationException;
 import com.linkedin.util.Pair;
 import io.datahubproject.metadata.context.OperationContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.net.URISyntaxException;
 import java.time.Clock;
 import java.util.ArrayList;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
index 75f16ae4d981d2..153aa0685f9b26 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
@@ -12,8 +12,8 @@
 import static com.linkedin.metadata.utils.PegasusUtils.urnToEntityName;
 import static com.linkedin.metadata.utils.SystemMetadataUtils.createDefaultSystemMetadata;
 import static com.linkedin.metadata.utils.metrics.ExceptionUtils.collectMetrics;
+import static com.linkedin.metadata.utils.metrics.MetricUtils.BATCH_SIZE_ATTR;
 
-import com.codahale.metrics.Timer;
 import com.datahub.util.RecordUtils;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
@@ -48,6 +48,7 @@
 import com.linkedin.metadata.aspect.batch.ChangeMCP;
 import com.linkedin.metadata.aspect.batch.MCLItem;
 import com.linkedin.metadata.aspect.batch.MCPItem;
+import com.linkedin.metadata.aspect.plugins.validation.AspectValidationException;
 import com.linkedin.metadata.aspect.plugins.validation.ValidationExceptionCollection;
 import com.linkedin.metadata.aspect.utils.DefaultAspectsUtil;
 import com.linkedin.metadata.config.PreProcessHooks;
@@ -84,7 +85,9 @@
 import com.linkedin.r2.RemoteInvocationException;
 import com.linkedin.util.Pair;
 import io.datahubproject.metadata.context.OperationContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.StatusCode;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import jakarta.persistence.EntityNotFoundException;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
@@ -792,14 +795,17 @@ public List<UpdateAspectResult> ingestAspects(
     // Handle throttling
     APIThrottle.evaluate(opContext, new HashSet<>(throttleEvents.values()), false);
 
-    List<UpdateAspectResult> ingestResults =
-        ingestAspectsToLocalDB(opContext, aspectsBatch, overwrite);
-
-    List<UpdateAspectResult> mclResults = emitMCL(opContext, ingestResults, emitMCL);
+    IngestAspectsResult ingestResults = ingestAspectsToLocalDB(opContext, aspectsBatch, overwrite);
 
+    // Produce MCLs & run side effects
+    List<UpdateAspectResult> mclResults =
+        emitMCL(opContext, ingestResults.getUpdateAspectResults(), emitMCL);
     processPostCommitMCLSideEffects(
         opContext, mclResults.stream().map(UpdateAspectResult::toMCL).collect(Collectors.toList()));
 
+    // Produce FailedMCPs for tracing
+    produceFailedMCPs(opContext, ingestResults);
+
     return mclResults;
   }
 
@@ -827,6 +833,7 @@ private void processPostCommitMCLSideEffects(
             sideEffects -> {
               long count =
                   ingestProposalAsync(
+                          opContext,
                           AspectsBatchImpl.builder()
                               .items(sideEffects)
                               .retrieverContext(opContext.getRetrieverContext())
@@ -847,254 +854,299 @@ private void processPostCommitMCLSideEffects(
    * @return Details about the new and old version of the aspect
    */
   @Nonnull
-  private List<UpdateAspectResult> ingestAspectsToLocalDB(
+  private IngestAspectsResult ingestAspectsToLocalDB(
       @Nonnull OperationContext opContext,
       @Nonnull final AspectsBatch inputBatch,
       boolean overwrite) {
 
-    if (inputBatch.containsDuplicateAspects()) {
-      log.warn("Batch contains duplicates: {}", inputBatch.duplicateAspects());
-      MetricUtils.counter(EntityServiceImpl.class, "batch_with_duplicate").inc();
-    }
-
-    return aspectDao
-        .runInTransactionWithRetry(
-            (txContext) -> {
-              // Generate default aspects within the transaction (they are re-calculated on retry)
-              AspectsBatch batchWithDefaults =
-                  DefaultAspectsUtil.withAdditionalChanges(
-                      opContext, inputBatch, this, enableBrowseV2);
-
-              // Read before write is unfortunate, however batch it
-              final Map<String, Set<String>> urnAspects = batchWithDefaults.getUrnAspectsMap();
-
-              // read #1
-              // READ COMMITED is used in conjunction with SELECT FOR UPDATE (read lock) in order
-              // to ensure that the aspect's version is not modified outside the transaction.
-              // We rely on the retry mechanism if the row is modified and will re-read (require the
-              // lock)
-              Map<String, Map<String, EntityAspect>> databaseAspects =
-                  aspectDao.getLatestAspects(urnAspects, true);
-
-              final Map<String, Map<String, SystemAspect>> batchAspects =
-                  EntityUtils.toSystemAspects(opContext.getRetrieverContext(), databaseAspects);
-
-              // read #2 (potentially)
-              final Map<String, Map<String, Long>> nextVersions =
-                  EntityUtils.calculateNextVersions(txContext, aspectDao, batchAspects, urnAspects);
-
-              // 1. Convert patches to full upserts
-              // 2. Run any entity/aspect level hooks
-              Pair<Map<String, Set<String>>, List<ChangeMCP>> updatedItems =
-                  batchWithDefaults.toUpsertBatchItems(batchAspects, nextVersions);
-
-              // Fetch additional information if needed
-              final List<ChangeMCP> changeMCPs;
-
-              if (!updatedItems.getFirst().isEmpty()) {
-                // These items are new items from side effects
-                Map<String, Set<String>> sideEffects = updatedItems.getFirst();
-
-                final Map<String, Map<String, SystemAspect>> updatedLatestAspects;
-                final Map<String, Map<String, Long>> updatedNextVersions;
-
-                Map<String, Map<String, SystemAspect>> newLatestAspects =
-                    EntityUtils.toSystemAspects(
-                        opContext.getRetrieverContext(),
-                        aspectDao.getLatestAspects(updatedItems.getFirst(), true));
-                // merge
-                updatedLatestAspects = AspectsBatch.merge(batchAspects, newLatestAspects);
-
-                Map<String, Map<String, Long>> newNextVersions =
-                    EntityUtils.calculateNextVersions(
-                        txContext, aspectDao, updatedLatestAspects, updatedItems.getFirst());
-                // merge
-                updatedNextVersions = AspectsBatch.merge(nextVersions, newNextVersions);
-
-                changeMCPs =
-                    updatedItems.getSecond().stream()
-                        .peek(
-                            changeMCP -> {
-                              // Add previous version to each side-effect
-                              if (sideEffects
-                                  .getOrDefault(
-                                      changeMCP.getUrn().toString(), Collections.emptySet())
-                                  .contains(changeMCP.getAspectName())) {
-
-                                AspectsBatch.incrementBatchVersion(
-                                    changeMCP, updatedLatestAspects, updatedNextVersions);
-                              }
-                            })
-                        .collect(Collectors.toList());
-              } else {
-                changeMCPs = updatedItems.getSecond();
-              }
-
-              // No changes, return
-              if (changeMCPs.isEmpty()) {
-                MetricUtils.counter(EntityServiceImpl.class, "batch_empty").inc();
-                return Collections.<UpdateAspectResult>emptyList();
-              }
-
-              // do final pre-commit checks with previous aspect value
-              ValidationExceptionCollection exceptions =
-                  AspectsBatch.validatePreCommit(changeMCPs, opContext.getRetrieverContext());
-
-              if (exceptions.hasFatalExceptions()) {
-                // IF this is a client request/API request we fail the `transaction batch`
-                if (opContext.getRequestContext() != null) {
-                  MetricUtils.counter(EntityServiceImpl.class, "batch_request_validation_exception")
-                      .inc();
-                  throw new ValidationException(collectMetrics(exceptions).toString());
-                }
+    return opContext.withSpan(
+        "ingestAspectsToLocalDB",
+        () -> {
+          if (inputBatch.containsDuplicateAspects()) {
+            log.warn("Batch contains duplicates: {}", inputBatch.duplicateAspects());
+            MetricUtils.counter(EntityServiceImpl.class, "batch_with_duplicate").inc();
+          }
 
-                MetricUtils.counter(EntityServiceImpl.class, "batch_consumer_validation_exception")
-                    .inc();
-                log.error("mce-consumer batch exceptions: {}", collectMetrics(exceptions));
-              }
+          return aspectDao
+              .runInTransactionWithRetry(
+                  (txContext) -> {
+                    // Generate default aspects within the transaction (they are re-calculated on
+                    // retry)
+                    AspectsBatch batchWithDefaults =
+                        DefaultAspectsUtil.withAdditionalChanges(
+                            opContext, inputBatch, this, enableBrowseV2);
+
+                    // Read before write is unfortunate, however batch it
+                    final Map<String, Set<String>> urnAspects =
+                        batchWithDefaults.getUrnAspectsMap();
+
+                    // read #1
+                    // READ COMMITED is used in conjunction with SELECT FOR UPDATE (read lock) in
+                    // order
+                    // to ensure that the aspect's version is not modified outside the transaction.
+                    // We rely on the retry mechanism if the row is modified and will re-read
+                    // (require the
+                    // lock)
+                    Map<String, Map<String, EntityAspect>> databaseAspects =
+                        aspectDao.getLatestAspects(urnAspects, true);
+
+                    final Map<String, Map<String, SystemAspect>> batchAspects =
+                        EntityUtils.toSystemAspects(
+                            opContext.getRetrieverContext(), databaseAspects);
+
+                    // read #2 (potentially)
+                    final Map<String, Map<String, Long>> nextVersions =
+                        EntityUtils.calculateNextVersions(
+                            txContext, aspectDao, batchAspects, urnAspects);
+
+                    // 1. Convert patches to full upserts
+                    // 2. Run any entity/aspect level hooks
+                    Pair<Map<String, Set<String>>, List<ChangeMCP>> updatedItems =
+                        batchWithDefaults.toUpsertBatchItems(batchAspects, nextVersions);
+
+                    // Fetch additional information if needed
+                    final List<ChangeMCP> changeMCPs;
+
+                    if (!updatedItems.getFirst().isEmpty()) {
+                      // These items are new items from side effects
+                      Map<String, Set<String>> sideEffects = updatedItems.getFirst();
+
+                      final Map<String, Map<String, SystemAspect>> updatedLatestAspects;
+                      final Map<String, Map<String, Long>> updatedNextVersions;
+
+                      Map<String, Map<String, SystemAspect>> newLatestAspects =
+                          EntityUtils.toSystemAspects(
+                              opContext.getRetrieverContext(),
+                              aspectDao.getLatestAspects(updatedItems.getFirst(), true));
+                      // merge
+                      updatedLatestAspects = AspectsBatch.merge(batchAspects, newLatestAspects);
+
+                      Map<String, Map<String, Long>> newNextVersions =
+                          EntityUtils.calculateNextVersions(
+                              txContext, aspectDao, updatedLatestAspects, updatedItems.getFirst());
+                      // merge
+                      updatedNextVersions = AspectsBatch.merge(nextVersions, newNextVersions);
+
+                      changeMCPs =
+                          updatedItems.getSecond().stream()
+                              .peek(
+                                  changeMCP -> {
+                                    // Add previous version to each side-effect
+                                    if (sideEffects
+                                        .getOrDefault(
+                                            changeMCP.getUrn().toString(), Collections.emptySet())
+                                        .contains(changeMCP.getAspectName())) {
+
+                                      AspectsBatch.incrementBatchVersion(
+                                          changeMCP, updatedLatestAspects, updatedNextVersions);
+                                    }
+                                  })
+                              .collect(Collectors.toList());
+                    } else {
+                      changeMCPs = updatedItems.getSecond();
+                    }
 
-              // Database Upsert successfully validated results
-              log.info(
-                  "Ingesting aspects batch to database: {}",
-                  AspectsBatch.toAbbreviatedString(changeMCPs, 2048));
-              Timer.Context ingestToLocalDBTimer =
-                  MetricUtils.timer(this.getClass(), "ingestAspectsToLocalDB").time();
-              List<UpdateAspectResult> upsertResults =
-                  exceptions
-                      .streamSuccessful(changeMCPs.stream())
-                      .map(
-                          writeItem -> {
-
-                            /*
-                              database*Aspect - should be used for comparisons of before batch operation information
-                            */
-                            final EntityAspect databaseAspect =
-                                databaseAspects
-                                    .getOrDefault(writeItem.getUrn().toString(), Map.of())
-                                    .get(writeItem.getAspectName());
-                            final EntityAspect.EntitySystemAspect databaseSystemAspect =
-                                databaseAspect == null
-                                    ? null
-                                    : EntityAspect.EntitySystemAspect.builder()
-                                        .build(
-                                            writeItem.getEntitySpec(),
-                                            writeItem.getAspectSpec(),
-                                            databaseAspect);
-
-                            /*
-                              This condition is specifically for an older conditional write ingestAspectIfNotPresent()
-                              overwrite is always true otherwise
-                            */
-                            if (overwrite || databaseAspect == null) {
-                              return Optional.ofNullable(
-                                      ingestAspectToLocalDB(
-                                          txContext, writeItem, databaseSystemAspect))
-                                  .map(
-                                      optResult -> optResult.toBuilder().request(writeItem).build())
-                                  .orElse(null);
-                            }
+                    // No changes, return
+                    if (changeMCPs.isEmpty()) {
+                      MetricUtils.counter(EntityServiceImpl.class, "batch_empty").inc();
+                      return IngestAspectsResult.EMPTY;
+                    }
 
-                            return null;
-                          })
-                      .filter(Objects::nonNull)
-                      .collect(Collectors.toList());
+                    // do final pre-commit checks with previous aspect value
+                    ValidationExceptionCollection exceptions =
+                        AspectsBatch.validatePreCommit(changeMCPs, opContext.getRetrieverContext());
+
+                    List<Pair<ChangeMCP, Set<AspectValidationException>>> failedUpsertResults =
+                        new ArrayList<>();
+                    if (exceptions.hasFatalExceptions()) {
+                      // IF this is a client request/API request we fail the `transaction batch`
+                      if (opContext.getRequestContext() != null) {
+                        MetricUtils.counter(
+                                EntityServiceImpl.class, "batch_request_validation_exception")
+                            .inc();
+                        throw new ValidationException(collectMetrics(exceptions).toString());
+                      }
+
+                      MetricUtils.counter(
+                              EntityServiceImpl.class, "batch_consumer_validation_exception")
+                          .inc();
+                      log.error("mce-consumer batch exceptions: {}", collectMetrics(exceptions));
+                      failedUpsertResults =
+                          exceptions
+                              .streamExceptions(changeMCPs.stream())
+                              .map(
+                                  writeItem ->
+                                      Pair.of(
+                                          writeItem,
+                                          exceptions.get(
+                                              Pair.of(
+                                                  writeItem.getUrn(), writeItem.getAspectName()))))
+                              .collect(Collectors.toList());
+                    }
 
-              if (!upsertResults.isEmpty()) {
-                // commit upserts prior to retention or kafka send, if supported by impl
-                if (txContext != null) {
-                  txContext.commitAndContinue();
-                }
-                long took = TimeUnit.NANOSECONDS.toMillis(ingestToLocalDBTimer.stop());
-                if (took > DB_TIMER_LOG_THRESHOLD_MS) {
-                  log.info("Ingestion of aspects batch to database took {} ms", took);
-                }
+                    // Database Upsert successfully validated results
+                    log.info(
+                        "Ingesting aspects batch to database: {}",
+                        AspectsBatch.toAbbreviatedString(changeMCPs, 2048));
 
-                // Retention optimization and tx
-                if (retentionService != null) {
-                  List<RetentionService.RetentionContext> retentionBatch =
-                      upsertResults.stream()
-                          // Only consider retention when there was a previous version
-                          .filter(
-                              result ->
-                                  batchAspects.containsKey(result.getUrn().toString())
-                                      && batchAspects
-                                          .get(result.getUrn().toString())
-                                          .containsKey(result.getRequest().getAspectName()))
-                          .filter(
-                              result -> {
-                                RecordTemplate oldAspect = result.getOldValue();
-                                RecordTemplate newAspect = result.getNewValue();
-                                // Apply retention policies if there was an update to existing
-                                // aspect
-                                // value
-                                return oldAspect != newAspect
-                                    && oldAspect != null
-                                    && retentionService != null;
-                              })
-                          .map(
-                              result ->
-                                  RetentionService.RetentionContext.builder()
-                                      .urn(result.getUrn())
-                                      .aspectName(result.getRequest().getAspectName())
-                                      .maxVersion(Optional.of(result.getMaxVersion()))
-                                      .build())
-                          .collect(Collectors.toList());
-                  retentionService.applyRetentionWithPolicyDefaults(opContext, retentionBatch);
-                } else {
-                  log.warn("Retention service is missing!");
-                }
-              } else {
-                MetricUtils.counter(EntityServiceImpl.class, "batch_empty_transaction").inc();
-                // This includes no-op batches. i.e. patch removing non-existent items
-                log.debug("Empty transaction detected");
-              }
+                    List<UpdateAspectResult> upsertResults =
+                        exceptions
+                            .streamSuccessful(changeMCPs.stream())
+                            .map(
+                                writeItem -> {
+
+                                  /*
+                                    database*Aspect - should be used for comparisons of before batch operation information
+                                  */
+                                  final EntityAspect databaseAspect =
+                                      databaseAspects
+                                          .getOrDefault(writeItem.getUrn().toString(), Map.of())
+                                          .get(writeItem.getAspectName());
+                                  final EntityAspect.EntitySystemAspect databaseSystemAspect =
+                                      databaseAspect == null
+                                          ? null
+                                          : EntityAspect.EntitySystemAspect.builder()
+                                              .build(
+                                                  writeItem.getEntitySpec(),
+                                                  writeItem.getAspectSpec(),
+                                                  databaseAspect);
+
+                                  /*
+                                    This condition is specifically for an older conditional write ingestAspectIfNotPresent()
+                                    overwrite is always true otherwise
+                                  */
+                                  if (overwrite || databaseAspect == null) {
+                                    return Optional.ofNullable(
+                                            ingestAspectToLocalDB(
+                                                opContext,
+                                                txContext,
+                                                writeItem,
+                                                databaseSystemAspect))
+                                        .map(
+                                            optResult ->
+                                                optResult.toBuilder().request(writeItem).build())
+                                        .orElse(null);
+                                  }
+
+                                  return null;
+                                })
+                            .filter(Objects::nonNull)
+                            .collect(Collectors.toList());
+
+                    if (!upsertResults.isEmpty()) {
+                      // commit upserts prior to retention or kafka send, if supported by impl
+                      if (txContext != null) {
+                        txContext.commitAndContinue();
+                      }
+
+                      // Retention optimization and tx
+                      if (retentionService != null) {
+                        opContext.withSpan(
+                            "retentionService",
+                            () -> {
+                              List<RetentionService.RetentionContext> retentionBatch =
+                                  upsertResults.stream()
+                                      // Only consider retention when there was a previous version
+                                      .filter(
+                                          result ->
+                                              batchAspects.containsKey(result.getUrn().toString())
+                                                  && batchAspects
+                                                      .get(result.getUrn().toString())
+                                                      .containsKey(
+                                                          result.getRequest().getAspectName()))
+                                      .filter(
+                                          result -> {
+                                            RecordTemplate oldAspect = result.getOldValue();
+                                            RecordTemplate newAspect = result.getNewValue();
+                                            // Apply retention policies if there was an update to
+                                            // existing
+                                            // aspect
+                                            // value
+                                            return oldAspect != newAspect
+                                                && oldAspect != null
+                                                && retentionService != null;
+                                          })
+                                      .map(
+                                          result ->
+                                              RetentionService.RetentionContext.builder()
+                                                  .urn(result.getUrn())
+                                                  .aspectName(result.getRequest().getAspectName())
+                                                  .maxVersion(Optional.of(result.getMaxVersion()))
+                                                  .build())
+                                      .collect(Collectors.toList());
+                              retentionService.applyRetentionWithPolicyDefaults(
+                                  opContext, retentionBatch);
+                            },
+                            BATCH_SIZE_ATTR,
+                            String.valueOf(upsertResults.size()));
+                      } else {
+                        log.warn("Retention service is missing!");
+                      }
+                    } else {
+                      MetricUtils.counter(EntityServiceImpl.class, "batch_empty_transaction").inc();
+                      // This includes no-op batches. i.e. patch removing non-existent items
+                      log.debug("Empty transaction detected");
+                    }
 
-              return upsertResults;
-            },
-            inputBatch,
-            DEFAULT_MAX_TRANSACTION_RETRY)
-        .stream()
-        .filter(Objects::nonNull)
-        .flatMap(List::stream)
-        .collect(Collectors.toList());
+                    return IngestAspectsResult.builder()
+                        .updateAspectResults(upsertResults)
+                        .failedUpdateAspectResults(failedUpsertResults)
+                        .build();
+                  },
+                  inputBatch,
+                  DEFAULT_MAX_TRANSACTION_RETRY)
+              .stream()
+              .reduce(IngestAspectsResult.EMPTY, IngestAspectsResult::combine);
+        },
+        BATCH_SIZE_ATTR,
+        String.valueOf(inputBatch.getItems().size()),
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "ingestAspectsToLocalDB"));
   }
 
   @Nonnull
   private List<UpdateAspectResult> emitMCL(
       @Nonnull OperationContext opContext, List<UpdateAspectResult> sqlResults, boolean emitMCL) {
-    List<UpdateAspectResult> withEmitMCL =
-        sqlResults.stream()
-            .map(result -> emitMCL ? conditionallyProduceMCLAsync(opContext, result) : result)
-            .collect(Collectors.toList());
-
-    // join futures messages, capture error state
-    List<Pair<Boolean, UpdateAspectResult>> statusPairs =
-        withEmitMCL.stream()
-            .filter(result -> result.getMclFuture() != null)
-            .map(
-                result -> {
-                  try {
-                    result.getMclFuture().get();
-                    return Pair.of(true, result);
-                  } catch (InterruptedException | ExecutionException e) {
-                    return Pair.of(false, result);
-                  }
-                })
-            .collect(Collectors.toList());
 
-    if (statusPairs.stream().anyMatch(p -> !p.getFirst())) {
-      log.error(
-          "Failed to produce MCLs: {}",
-          statusPairs.stream()
-              .filter(p -> !p.getFirst())
-              .map(Pair::getValue)
-              .map(v -> v.getRequest().toString())
-              .collect(Collectors.toList()));
-      // TODO restoreIndices?
-      throw new RuntimeException("Failed to produce MCLs");
-    }
+    return opContext.withSpan(
+        "emitMCL",
+        () -> {
+          List<UpdateAspectResult> withEmitMCL =
+              sqlResults.stream()
+                  .map(result -> emitMCL ? conditionallyProduceMCLAsync(opContext, result) : result)
+                  .collect(Collectors.toList());
+
+          // join futures messages, capture error state
+          List<Pair<Boolean, UpdateAspectResult>> statusPairs =
+              withEmitMCL.stream()
+                  .filter(result -> result.getMclFuture() != null)
+                  .map(
+                      result -> {
+                        try {
+                          result.getMclFuture().get();
+                          return Pair.of(true, result);
+                        } catch (InterruptedException | ExecutionException e) {
+                          return Pair.of(false, result);
+                        }
+                      })
+                  .collect(Collectors.toList());
+
+          if (statusPairs.stream().anyMatch(p -> !p.getFirst())) {
+            log.error(
+                "Failed to produce MCLs: {}",
+                statusPairs.stream()
+                    .filter(p -> !p.getFirst())
+                    .map(Pair::getValue)
+                    .map(v -> v.getRequest().toString())
+                    .collect(Collectors.toList()));
+            // TODO restoreIndices?
+            throw new RuntimeException("Failed to produce MCLs");
+          }
 
-    return withEmitMCL;
+          return withEmitMCL;
+        },
+        BATCH_SIZE_ATTR,
+        String.valueOf(sqlResults.size()));
   }
 
   /**
@@ -1193,7 +1245,9 @@ public List<IngestResult> ingestProposal(
     Stream<IngestResult> timeseriesIngestResults =
         ingestTimeseriesProposal(opContext, aspectsBatch, async);
     Stream<IngestResult> nonTimeseriesIngestResults =
-        async ? ingestProposalAsync(aspectsBatch) : ingestProposalSync(opContext, aspectsBatch);
+        async
+            ? ingestProposalAsync(opContext, aspectsBatch)
+            : ingestProposalSync(opContext, aspectsBatch);
 
     return Stream.concat(nonTimeseriesIngestResults, timeseriesIngestResults)
         .collect(Collectors.toList());
@@ -1222,89 +1276,99 @@ private Stream<IngestResult> ingestTimeseriesProposal(
               + unsupported.stream().map(BatchItem::getChangeType).collect(Collectors.toSet()));
     }
 
-    if (!async) {
-      // Handle throttling
-      APIThrottle.evaluate(opContext, new HashSet<>(throttleEvents.values()), true);
+    return opContext.withSpan(
+        "ingestTimeseriesProposal",
+        () -> {
+          if (!async) {
+            // Handle throttling
+            APIThrottle.evaluate(opContext, new HashSet<>(throttleEvents.values()), true);
+
+            // Create default non-timeseries aspects for timeseries aspects
+            List<MCPItem> timeseriesKeyAspects =
+                aspectsBatch.getMCPItems().stream()
+                    .filter(
+                        item -> item.getAspectSpec() != null && item.getAspectSpec().isTimeseries())
+                    .map(
+                        item ->
+                            ChangeItemImpl.builder()
+                                .urn(item.getUrn())
+                                .aspectName(item.getEntitySpec().getKeyAspectName())
+                                .changeType(ChangeType.UPSERT)
+                                .entitySpec(item.getEntitySpec())
+                                .aspectSpec(item.getEntitySpec().getKeyAspectSpec())
+                                .auditStamp(item.getAuditStamp())
+                                .systemMetadata(item.getSystemMetadata())
+                                .recordTemplate(
+                                    EntityApiUtils.buildKeyAspect(
+                                        opContext.getEntityRegistry(), item.getUrn()))
+                                .build(opContext.getAspectRetriever()))
+                    .collect(Collectors.toList());
+
+            ingestProposalSync(
+                opContext,
+                AspectsBatchImpl.builder()
+                    .retrieverContext(aspectsBatch.getRetrieverContext())
+                    .items(timeseriesKeyAspects)
+                    .build());
+          }
 
-      // Create default non-timeseries aspects for timeseries aspects
-      List<MCPItem> timeseriesKeyAspects =
-          aspectsBatch.getMCPItems().stream()
-              .filter(item -> item.getAspectSpec() != null && item.getAspectSpec().isTimeseries())
+          // Emit timeseries MCLs
+          List<Pair<MCPItem, Optional<Pair<Future<?>, Boolean>>>> timeseriesResults =
+              aspectsBatch.getItems().stream()
+                  .filter(
+                      item -> item.getAspectSpec() != null && item.getAspectSpec().isTimeseries())
+                  .map(item -> (MCPItem) item)
+                  .map(
+                      item ->
+                          Pair.of(
+                              item,
+                              conditionallyProduceMCLAsync(
+                                  opContext,
+                                  null,
+                                  null,
+                                  item.getRecordTemplate(),
+                                  item.getSystemMetadata(),
+                                  item.getMetadataChangeProposal(),
+                                  item.getUrn(),
+                                  item.getAuditStamp(),
+                                  item.getAspectSpec())))
+                  .collect(Collectors.toList());
+
+          return timeseriesResults.stream()
               .map(
-                  item ->
-                      ChangeItemImpl.builder()
-                          .urn(item.getUrn())
-                          .aspectName(item.getEntitySpec().getKeyAspectName())
-                          .changeType(ChangeType.UPSERT)
-                          .entitySpec(item.getEntitySpec())
-                          .aspectSpec(item.getEntitySpec().getKeyAspectSpec())
-                          .auditStamp(item.getAuditStamp())
-                          .systemMetadata(item.getSystemMetadata())
-                          .recordTemplate(
-                              EntityApiUtils.buildKeyAspect(
-                                  opContext.getEntityRegistry(), item.getUrn()))
-                          .build(opContext.getAspectRetriever()))
-              .collect(Collectors.toList());
-
-      ingestProposalSync(
-          opContext,
-          AspectsBatchImpl.builder()
-              .retrieverContext(aspectsBatch.getRetrieverContext())
-              .items(timeseriesKeyAspects)
-              .build());
-    }
-
-    // Emit timeseries MCLs
-    List<Pair<MCPItem, Optional<Pair<Future<?>, Boolean>>>> timeseriesResults =
-        aspectsBatch.getItems().stream()
-            .filter(item -> item.getAspectSpec() != null && item.getAspectSpec().isTimeseries())
-            .map(item -> (MCPItem) item)
-            .map(
-                item ->
-                    Pair.of(
-                        item,
-                        conditionallyProduceMCLAsync(
-                            opContext,
-                            null,
-                            null,
-                            item.getRecordTemplate(),
-                            item.getSystemMetadata(),
-                            item.getMetadataChangeProposal(),
-                            item.getUrn(),
-                            item.getAuditStamp(),
-                            item.getAspectSpec())))
-            .collect(Collectors.toList());
-
-    return timeseriesResults.stream()
-        .map(
-            result -> {
-              MCPItem item = result.getFirst();
-              Optional<Pair<Future<?>, Boolean>> emissionStatus = result.getSecond();
-
-              emissionStatus.ifPresent(
-                  status -> {
-                    try {
-                      status.getFirst().get();
-                    } catch (InterruptedException | ExecutionException e) {
-                      throw new RuntimeException(e);
-                    }
+                  result -> {
+                    MCPItem item = result.getFirst();
+                    Optional<Pair<Future<?>, Boolean>> emissionStatus = result.getSecond();
+
+                    emissionStatus.ifPresent(
+                        status -> {
+                          try {
+                            status.getFirst().get();
+                          } catch (InterruptedException | ExecutionException e) {
+                            throw new RuntimeException(e);
+                          }
+                        });
+
+                    return IngestResult.builder()
+                        .urn(item.getUrn())
+                        .request(item)
+                        .result(
+                            UpdateAspectResult.builder()
+                                .urn(item.getUrn())
+                                .newValue(item.getRecordTemplate())
+                                .auditStamp(item.getAuditStamp())
+                                .newSystemMetadata(item.getSystemMetadata())
+                                .build())
+                        .publishedMCL(
+                            emissionStatus.map(status -> status.getFirst() != null).orElse(false))
+                        .processedMCL(emissionStatus.map(Pair::getSecond).orElse(false))
+                        .build();
                   });
-
-              return IngestResult.builder()
-                  .urn(item.getUrn())
-                  .request(item)
-                  .result(
-                      UpdateAspectResult.builder()
-                          .urn(item.getUrn())
-                          .newValue(item.getRecordTemplate())
-                          .auditStamp(item.getAuditStamp())
-                          .newSystemMetadata(item.getSystemMetadata())
-                          .build())
-                  .publishedMCL(
-                      emissionStatus.map(status -> status.getFirst() != null).orElse(false))
-                  .processedMCL(emissionStatus.map(Pair::getSecond).orElse(false))
-                  .build();
-            });
+        },
+        "async",
+        String.valueOf(async),
+        BATCH_SIZE_ATTR,
+        String.valueOf(aspectsBatch.getItems().size()));
   }
 
   /**
@@ -1313,81 +1377,100 @@ private Stream<IngestResult> ingestTimeseriesProposal(
    * @param aspectsBatch non-timeseries ingest aspects
    * @return produced items to the MCP topic
    */
-  private Stream<IngestResult> ingestProposalAsync(AspectsBatch aspectsBatch) {
-    List<? extends MCPItem> nonTimeseries =
-        aspectsBatch.getMCPItems().stream()
-            .filter(item -> item.getAspectSpec() == null || !item.getAspectSpec().isTimeseries())
-            .collect(Collectors.toList());
-
-    List<Future<?>> futures =
-        nonTimeseries.stream()
-            .map(
-                item ->
-                    // When async is turned on, we write to proposal log and return without waiting
-                    producer.produceMetadataChangeProposal(
-                        item.getUrn(), item.getMetadataChangeProposal()))
-            .filter(Objects::nonNull)
-            .collect(Collectors.toList());
+  private Stream<IngestResult> ingestProposalAsync(
+      OperationContext opContext, AspectsBatch aspectsBatch) {
+    return opContext.withSpan(
+        "ingestProposalAsync",
+        () -> {
+          List<? extends MCPItem> nonTimeseries =
+              aspectsBatch.getMCPItems().stream()
+                  .filter(
+                      item -> item.getAspectSpec() == null || !item.getAspectSpec().isTimeseries())
+                  .collect(Collectors.toList());
+
+          List<Future<?>> futures =
+              nonTimeseries.stream()
+                  .map(
+                      item -> {
+                        // When async is turned on, we write to proposal log and return without
+                        // waiting
+                        return producer.produceMetadataChangeProposal(
+                            opContext, item.getUrn(), item);
+                      })
+                  .filter(Objects::nonNull)
+                  .collect(Collectors.toList());
+
+          futures.forEach(
+              f -> {
+                try {
+                  f.get();
+                } catch (InterruptedException | ExecutionException e) {
+                  throw new RuntimeException(e);
+                }
+              });
 
-    try {
-      return nonTimeseries.stream()
-          .map(
-              item ->
-                  IngestResult.<MCPItem>builder()
-                      .urn(item.getUrn())
-                      .request(item)
-                      .publishedMCP(true)
-                      .build());
-    } finally {
-      futures.forEach(
-          f -> {
-            try {
-              f.get();
-            } catch (InterruptedException | ExecutionException e) {
-              throw new RuntimeException(e);
-            }
-          });
-    }
+          return nonTimeseries.stream()
+              .map(
+                  item ->
+                      IngestResult.<MCPItem>builder()
+                          .urn(item.getUrn())
+                          .request(item)
+                          .publishedMCP(true)
+                          .build());
+        },
+        BATCH_SIZE_ATTR,
+        String.valueOf(aspectsBatch.getItems().size()));
   }
 
   private Stream<IngestResult> ingestProposalSync(
       @Nonnull OperationContext opContext, AspectsBatch aspectsBatch) {
 
-    AspectsBatchImpl nonTimeseries =
-        AspectsBatchImpl.builder()
-            .retrieverContext(aspectsBatch.getRetrieverContext())
-            .items(
-                aspectsBatch.getItems().stream()
-                    .filter(item -> !item.getAspectSpec().isTimeseries())
-                    .collect(Collectors.toList()))
-            .build();
+    return opContext.withSpan(
+        "ingestProposalSync",
+        () -> {
+          AspectsBatchImpl nonTimeseries =
+              AspectsBatchImpl.builder()
+                  .retrieverContext(aspectsBatch.getRetrieverContext())
+                  .items(
+                      aspectsBatch.getItems().stream()
+                          .filter(item -> !item.getAspectSpec().isTimeseries())
+                          .collect(Collectors.toList()))
+                  .build();
 
-    List<? extends MCPItem> unsupported =
-        nonTimeseries.getMCPItems().stream()
-            .filter(item -> !MCPItem.isValidChangeType(item.getChangeType(), item.getAspectSpec()))
-            .collect(Collectors.toList());
-    if (!unsupported.isEmpty()) {
-      throw new UnsupportedOperationException(
-          "ChangeType not supported: "
-              + unsupported.stream().map(item -> item.getChangeType()).collect(Collectors.toSet()));
-    }
+          List<? extends MCPItem> unsupported =
+              nonTimeseries.getMCPItems().stream()
+                  .filter(
+                      item ->
+                          !MCPItem.isValidChangeType(item.getChangeType(), item.getAspectSpec()))
+                  .collect(Collectors.toList());
+          if (!unsupported.isEmpty()) {
+            throw new UnsupportedOperationException(
+                "ChangeType not supported: "
+                    + unsupported.stream()
+                        .map(item -> item.getChangeType())
+                        .collect(Collectors.toSet()));
+          }
 
-    List<UpdateAspectResult> upsertResults = ingestAspects(opContext, nonTimeseries, true, true);
+          List<UpdateAspectResult> upsertResults =
+              ingestAspects(opContext, nonTimeseries, true, true);
 
-    return upsertResults.stream()
-        .map(
-            result -> {
-              ChangeMCP item = result.getRequest();
-
-              return IngestResult.builder()
-                  .urn(item.getUrn())
-                  .request(item)
-                  .result(result)
-                  .publishedMCL(result.getMclFuture() != null)
-                  .sqlCommitted(true)
-                  .isUpdate(result.getOldValue() != null)
-                  .build();
-            });
+          return upsertResults.stream()
+              .map(
+                  result -> {
+                    ChangeMCP item = result.getRequest();
+
+                    return IngestResult.builder()
+                        .urn(item.getUrn())
+                        .request(item)
+                        .result(result)
+                        .publishedMCL(result.getMclFuture() != null)
+                        .sqlCommitted(true)
+                        .isUpdate(result.getOldValue() != null)
+                        .build();
+                  });
+        },
+        BATCH_SIZE_ATTR,
+        String.valueOf(aspectsBatch.getItems().size()));
   }
 
   @Override
@@ -1768,8 +1851,10 @@ public Pair<Future<?>, Boolean> alwaysProduceMCLAsync(
       @Nonnull final Urn urn,
       @Nonnull final AspectSpec aspectSpec,
       @Nonnull final MetadataChangeLog metadataChangeLog) {
-    Future<?> future = producer.produceMetadataChangeLog(urn, aspectSpec, metadataChangeLog);
-    return Pair.of(future, preprocessEvent(opContext, metadataChangeLog));
+    boolean preprocessed = preprocessEvent(opContext, metadataChangeLog);
+    Future<?> future =
+        producer.produceMetadataChangeLog(opContext, urn, aspectSpec, metadataChangeLog);
+    return Pair.of(future, preprocessed);
   }
 
   @Override
@@ -1830,6 +1915,19 @@ public Optional<Pair<Future<?>, Boolean>> conditionallyProduceMCLAsync(
       log.debug("Serialized MCL event: {}", metadataChangeLog);
       Pair<Future<?>, Boolean> emissionStatus =
           alwaysProduceMCLAsync(opContext, entityUrn, aspectSpec, metadataChangeLog);
+
+      // for tracing propagate properties to system meta
+      if (newSystemMetadata != null && metadataChangeLog.getSystemMetadata().hasProperties()) {
+        if (!newSystemMetadata.hasProperties()) {
+          newSystemMetadata.setProperties(
+              metadataChangeLog.getSystemMetadata().getProperties(), SetMode.IGNORE_NULL);
+        } else {
+          newSystemMetadata
+              .getProperties()
+              .putAll(metadataChangeLog.getSystemMetadata().getProperties());
+        }
+      }
+
       return emissionStatus.getFirst() != null ? Optional.of(emissionStatus) : Optional.empty();
     } else {
       log.info(
@@ -1865,6 +1963,35 @@ private UpdateAspectResult conditionallyProduceMCLAsync(
         .orElse(result);
   }
 
+  public void produceFailedMCPs(
+      @Nonnull OperationContext opContext, @Nonnull IngestAspectsResult ingestAspectsResult) {
+
+    if (!ingestAspectsResult.getFailedUpdateAspectResults().isEmpty()) {
+      Span currentSpan = Span.current();
+      currentSpan.recordException(
+          new IllegalStateException("Batch contains failed aspect validations."));
+      currentSpan.setStatus(StatusCode.ERROR, "Batch contains failed aspect validations.");
+      currentSpan.setAttribute(MetricUtils.ERROR_TYPE, IllegalStateException.class.getName());
+
+      List<Future<?>> futures =
+          ingestAspectsResult.getFailedUpdateAspectResults().stream()
+              .map(
+                  failedItem ->
+                      producer.produceFailedMetadataChangeProposalAsync(
+                          opContext, failedItem.getFirst(), new HashSet<>(failedItem.getSecond())))
+              .collect(Collectors.toList());
+
+      futures.forEach(
+          f -> {
+            try {
+              f.get();
+            } catch (InterruptedException | ExecutionException e) {
+              throw new RuntimeException(e);
+            }
+          });
+    }
+  }
+
   @Override
   public void ingestEntities(
       @Nonnull OperationContext opContext,
@@ -2528,6 +2655,7 @@ private Map<EntityAspectIdentifier, EnvelopedAspect> getEnvelopedAspects(
    */
   @Nullable
   private UpdateAspectResult ingestAspectToLocalDB(
+      @Nonnull OperationContext opContext,
       @Nullable TransactionContext txContext,
       @Nonnull final ChangeMCP writeItem,
       @Nullable final EntityAspect.EntitySystemAspect databaseAspect) {
@@ -2597,7 +2725,7 @@ private UpdateAspectResult ingestAspectToLocalDB(
             previousBatchAspect.getCreatedBy(),
             null,
             previousBatchAspect.getCreatedOn(),
-            RecordUtils.toJsonString(latestSystemMetadataDiff.get()),
+            RecordUtils.toJsonString(opContext.withTraceId(latestSystemMetadataDiff.get())),
             previousBatchAspect.getVersion(),
             false);
 
@@ -2663,7 +2791,7 @@ private UpdateAspectResult ingestAspectToLocalDB(
                   ? writeItem.getAuditStamp().getImpersonator().toString()
                   : null,
               new Timestamp(writeItem.getAuditStamp().getTime()),
-              EntityApiUtils.toJsonAspect(writeItem.getSystemMetadata()),
+              EntityApiUtils.toJsonAspect(opContext.withTraceId(writeItem.getSystemMetadata())),
               writeItem.getNextAspectVersion());
 
       // metrics
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/cassandra/CassandraRetentionService.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/cassandra/CassandraRetentionService.java
index c595e3e07b8342..eb3c5b9cca0671 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/cassandra/CassandraRetentionService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/cassandra/CassandraRetentionService.java
@@ -31,7 +31,7 @@
 import com.linkedin.retention.TimeBasedRetention;
 import com.linkedin.retention.VersionBasedRetention;
 import io.datahubproject.metadata.context.OperationContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.sql.Timestamp;
 import java.time.Clock;
 import java.util.List;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/ebean/EbeanRetentionService.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/ebean/EbeanRetentionService.java
index 74d0d8b0964de0..5fbac036bd05e6 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/ebean/EbeanRetentionService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/ebean/EbeanRetentionService.java
@@ -26,7 +26,7 @@
 import io.ebean.TxScope;
 import io.ebeaninternal.server.expression.Op;
 import io.ebeaninternal.server.expression.SimpleExpression;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.sql.Timestamp;
 import java.time.Clock;
 import java.util.List;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/validation/ValidationUtils.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/validation/ValidationUtils.java
index 6ecac70e13c7e5..7a792efd2984d2 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/validation/ValidationUtils.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/validation/ValidationUtils.java
@@ -1,6 +1,5 @@
 package com.linkedin.metadata.entity.validation;
 
-import com.codahale.metrics.Timer;
 import com.linkedin.common.UrnArray;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.data.template.AbstractArrayTemplate;
@@ -38,33 +37,36 @@ public static SearchResult validateSearchResult(
       @Nonnull OperationContext opContext,
       final SearchResult searchResult,
       @Nonnull final EntityService<?> entityService) {
-    try (Timer.Context ignored =
-        MetricUtils.timer(ValidationUtils.class, "validateSearchResult").time()) {
-      if (searchResult == null) {
-        return null;
-      }
-      Objects.requireNonNull(entityService, "entityService must not be null");
-
-      SearchResult validatedSearchResult =
-          new SearchResult()
-              .setFrom(searchResult.getFrom())
-              .setMetadata(searchResult.getMetadata())
-              .setPageSize(searchResult.getPageSize())
-              .setNumEntities(searchResult.getNumEntities());
-
-      SearchEntityArray validatedEntities =
-          validateSearchUrns(
-                  opContext,
-                  searchResult.getEntities(),
-                  SearchEntity::getEntity,
-                  entityService,
-                  true,
-                  true)
-              .collect(Collectors.toCollection(SearchEntityArray::new));
-      validatedSearchResult.setEntities(validatedEntities);
-
-      return validatedSearchResult;
-    }
+    return opContext.withSpan(
+        "validateSearchResult",
+        () -> {
+          if (searchResult == null) {
+            return null;
+          }
+          Objects.requireNonNull(entityService, "entityService must not be null");
+
+          SearchResult validatedSearchResult =
+              new SearchResult()
+                  .setFrom(searchResult.getFrom())
+                  .setMetadata(searchResult.getMetadata())
+                  .setPageSize(searchResult.getPageSize())
+                  .setNumEntities(searchResult.getNumEntities());
+
+          SearchEntityArray validatedEntities =
+              validateSearchUrns(
+                      opContext,
+                      searchResult.getEntities(),
+                      SearchEntity::getEntity,
+                      entityService,
+                      true,
+                      true)
+                  .collect(Collectors.toCollection(SearchEntityArray::new));
+          validatedSearchResult.setEntities(validatedEntities);
+
+          return validatedSearchResult;
+        },
+        MetricUtils.DROPWIZARD_METRIC,
+        MetricUtils.name(ValidationUtils.class, "validateSearchResult"));
   }
 
   public static ScrollResult validateScrollResult(
@@ -104,102 +106,113 @@ public static BrowseResult validateBrowseResult(
       @Nonnull OperationContext opContext,
       final BrowseResult browseResult,
       @Nonnull final EntityService<?> entityService) {
-    try (Timer.Context ignored =
-        MetricUtils.timer(ValidationUtils.class, "validateBrowseResult").time()) {
-      if (browseResult == null) {
-        return null;
-      }
-      Objects.requireNonNull(entityService, "entityService must not be null");
-
-      BrowseResult validatedBrowseResult =
-          new BrowseResult()
-              .setGroups(browseResult.getGroups())
-              .setMetadata(browseResult.getMetadata())
-              .setFrom(browseResult.getFrom())
-              .setPageSize(browseResult.getPageSize())
-              .setNumGroups(browseResult.getNumGroups())
-              .setNumEntities(browseResult.getNumEntities())
-              .setNumElements(browseResult.getNumElements());
-
-      BrowseResultEntityArray validatedEntities =
-          validateSearchUrns(
-                  opContext,
-                  browseResult.getEntities(),
-                  BrowseResultEntity::getUrn,
-                  entityService,
-                  true,
-                  true)
-              .collect(Collectors.toCollection(BrowseResultEntityArray::new));
-      validatedBrowseResult.setEntities(validatedEntities);
-
-      return validatedBrowseResult;
-    }
+    return opContext.withSpan(
+        "validateBrowseResult",
+        () -> {
+          if (browseResult == null) {
+            return null;
+          }
+          Objects.requireNonNull(entityService, "entityService must not be null");
+
+          BrowseResult validatedBrowseResult =
+              new BrowseResult()
+                  .setGroups(browseResult.getGroups())
+                  .setMetadata(browseResult.getMetadata())
+                  .setFrom(browseResult.getFrom())
+                  .setPageSize(browseResult.getPageSize())
+                  .setNumGroups(browseResult.getNumGroups())
+                  .setNumEntities(browseResult.getNumEntities())
+                  .setNumElements(browseResult.getNumElements());
+
+          BrowseResultEntityArray validatedEntities =
+              validateSearchUrns(
+                      opContext,
+                      browseResult.getEntities(),
+                      BrowseResultEntity::getUrn,
+                      entityService,
+                      true,
+                      true)
+                  .collect(Collectors.toCollection(BrowseResultEntityArray::new));
+          validatedBrowseResult.setEntities(validatedEntities);
+
+          return validatedBrowseResult;
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(ValidationUtils.class, "validateBrowseResult"));
   }
 
   public static ListResult validateListResult(
       @Nonnull OperationContext opContext,
       final ListResult listResult,
       @Nonnull final EntityService<?> entityService) {
-    try (Timer.Context ignored =
-        MetricUtils.timer(ValidationUtils.class, "validateListResult").time()) {
-      if (listResult == null) {
-        return null;
-      }
-      Objects.requireNonNull(entityService, "entityService must not be null");
-
-      ListResult validatedListResult =
-          new ListResult()
-              .setStart(listResult.getStart())
-              .setCount(listResult.getCount())
-              .setTotal(listResult.getTotal());
-
-      UrnArray validatedEntities =
-          validateSearchUrns(
-                  opContext,
-                  listResult.getEntities(),
-                  Function.identity(),
-                  entityService,
-                  true,
-                  true)
-              .collect(Collectors.toCollection(UrnArray::new));
-      validatedListResult.setEntities(validatedEntities);
-
-      return validatedListResult;
-    }
+
+    return opContext.withSpan(
+        "validateListResult",
+        () -> {
+          if (listResult == null) {
+            return null;
+          }
+          Objects.requireNonNull(entityService, "entityService must not be null");
+
+          ListResult validatedListResult =
+              new ListResult()
+                  .setStart(listResult.getStart())
+                  .setCount(listResult.getCount())
+                  .setTotal(listResult.getTotal());
+
+          UrnArray validatedEntities =
+              validateSearchUrns(
+                      opContext,
+                      listResult.getEntities(),
+                      Function.identity(),
+                      entityService,
+                      true,
+                      true)
+                  .collect(Collectors.toCollection(UrnArray::new));
+          validatedListResult.setEntities(validatedEntities);
+
+          return validatedListResult;
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(ValidationUtils.class, "validateListResult"));
   }
 
   public static LineageSearchResult validateLineageSearchResult(
       @Nonnull OperationContext opContext,
       final LineageSearchResult lineageSearchResult,
       @Nonnull final EntityService<?> entityService) {
-    try (Timer.Context ignored =
-        MetricUtils.timer(ValidationUtils.class, "validateLineageResult").time()) {
-      if (lineageSearchResult == null) {
-        return null;
-      }
-      Objects.requireNonNull(entityService, "entityService must not be null");
-
-      LineageSearchResult validatedLineageSearchResult =
-          new LineageSearchResult()
-              .setMetadata(lineageSearchResult.getMetadata())
-              .setFrom(lineageSearchResult.getFrom())
-              .setPageSize(lineageSearchResult.getPageSize())
-              .setNumEntities(lineageSearchResult.getNumEntities());
-
-      LineageSearchEntityArray validatedEntities =
-          validateSearchUrns(
-                  opContext,
-                  lineageSearchResult.getEntities(),
-                  LineageSearchEntity::getEntity,
-                  entityService,
-                  true,
-                  true)
-              .collect(Collectors.toCollection(LineageSearchEntityArray::new));
-      validatedLineageSearchResult.setEntities(validatedEntities);
-
-      log.debug("Returning validated lineage search results");
-      return validatedLineageSearchResult;
-    }
+
+    return opContext.withSpan(
+        "validateLineageResult",
+        () -> {
+          if (lineageSearchResult == null) {
+            return null;
+          }
+          Objects.requireNonNull(entityService, "entityService must not be null");
+
+          LineageSearchResult validatedLineageSearchResult =
+              new LineageSearchResult()
+                  .setMetadata(lineageSearchResult.getMetadata())
+                  .setFrom(lineageSearchResult.getFrom())
+                  .setPageSize(lineageSearchResult.getPageSize())
+                  .setNumEntities(lineageSearchResult.getNumEntities());
+
+          LineageSearchEntityArray validatedEntities =
+              validateSearchUrns(
+                      opContext,
+                      lineageSearchResult.getEntities(),
+                      LineageSearchEntity::getEntity,
+                      entityService,
+                      true,
+                      true)
+                  .collect(Collectors.toCollection(LineageSearchEntityArray::new));
+          validatedLineageSearchResult.setEntities(validatedEntities);
+
+          log.debug("Returning validated lineage search results");
+          return validatedLineageSearchResult;
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(ValidationUtils.class, "validateLineageResult"));
   }
 
   public static EntityLineageResult validateEntityLineageResult(
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/event/EventProducer.java b/metadata-io/src/main/java/com/linkedin/metadata/event/EventProducer.java
index a809c7f9a3e31b..15017231eee907 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/event/EventProducer.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/event/EventProducer.java
@@ -1,19 +1,28 @@
 package com.linkedin.metadata.event;
 
 import com.linkedin.common.urn.Urn;
+import com.linkedin.data.template.SetMode;
+import com.linkedin.metadata.aspect.batch.MCPItem;
 import com.linkedin.metadata.models.AspectSpec;
 import com.linkedin.metadata.models.registry.EntityRegistry;
 import com.linkedin.mxe.DataHubUpgradeHistoryEvent;
 import com.linkedin.mxe.MetadataChangeLog;
 import com.linkedin.mxe.MetadataChangeProposal;
 import com.linkedin.mxe.PlatformEvent;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.datahubproject.metadata.context.OperationContext;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import lombok.extern.slf4j.Slf4j;
 
 /** Interface implemented by producers of {@link com.linkedin.mxe.MetadataAuditEvent}s. */
-public interface EventProducer {
+@Slf4j
+public abstract class EventProducer {
 
   /**
    * Produces a {@link com.linkedin.mxe.MetadataChangeLog} from a new & previous aspect.
@@ -23,22 +32,85 @@ public interface EventProducer {
    * @param metadataChangeLog metadata change log to push into MCL kafka topic
    * @return A {@link Future} object that reports when the message has been produced.
    */
-  Future<?> produceMetadataChangeLog(
+  public Future<?> produceMetadataChangeLog(
+      @Nonnull OperationContext opContext,
+      @Nonnull final Urn urn,
+      @Nonnull AspectSpec aspectSpec,
+      @Nonnull final MetadataChangeLog metadataChangeLog) {
+    metadataChangeLog.setSystemMetadata(
+        opContext.withProducerTrace(
+            "produceMetadataChangeLog",
+            metadataChangeLog.getSystemMetadata(),
+            getMetadataChangeLogTopicName(aspectSpec)),
+        SetMode.IGNORE_NULL);
+    return produceMetadataChangeLog(urn, aspectSpec, metadataChangeLog);
+  }
+
+  public abstract Future<?> produceMetadataChangeLog(
       @Nonnull final Urn urn,
       @Nonnull AspectSpec aspectSpec,
       @Nonnull final MetadataChangeLog metadataChangeLog);
 
+  public abstract String getMetadataChangeLogTopicName(@Nonnull AspectSpec aspectSpec);
+
   /**
    * Produces a {@link com.linkedin.mxe.MetadataChangeProposal} as an async update to an entity
    *
    * @param urn the urn associated with the change proposal.
-   * @param metadataChangeProposal metadata change proposal to push into MCP kafka topic.
+   * @param item Item which includes the metadata change proposal to push into MCP kafka topic.
    * @return A {@link Future} object that reports when the message has been produced.
    */
+  public Future<?> produceMetadataChangeProposal(
+      @Nonnull OperationContext opContext, @Nonnull final Urn urn, @Nonnull MCPItem item) {
+    item.setSystemMetadata(
+        opContext.withProducerTrace(
+            "produceMetadataChangeProposal",
+            item.getSystemMetadata(),
+            getMetadataChangeProposalTopicName()));
+    return produceMetadataChangeProposal(urn, item.getMetadataChangeProposal());
+  }
+
   @WithSpan
-  Future<?> produceMetadataChangeProposal(
+  public abstract Future<?> produceMetadataChangeProposal(
       @Nonnull final Urn urn, @Nonnull MetadataChangeProposal metadataChangeProposal);
 
+  public abstract String getMetadataChangeProposalTopicName();
+
+  public Future<?> produceFailedMetadataChangeProposalAsync(
+      @Nonnull OperationContext opContext,
+      @Nonnull MCPItem item,
+      @Nonnull Set<Throwable> throwables) {
+    return produceFailedMetadataChangeProposalAsync(
+        opContext, item.getMetadataChangeProposal(), throwables);
+  }
+
+  public void produceFailedMetadataChangeProposal(
+      @Nonnull OperationContext opContext,
+      @Nonnull List<MetadataChangeProposal> mcps,
+      @Nonnull Throwable throwable) {
+    List<? extends Future<?>> futures =
+        mcps.stream()
+            .map(
+                event ->
+                    produceFailedMetadataChangeProposalAsync(opContext, event, Set.of(throwable)))
+            .collect(Collectors.toList());
+
+    futures.forEach(
+        f -> {
+          try {
+            f.get();
+          } catch (InterruptedException | ExecutionException e) {
+            throw new RuntimeException(e);
+          }
+        });
+  }
+
+  @WithSpan
+  public abstract Future<?> produceFailedMetadataChangeProposalAsync(
+      @Nonnull OperationContext opContext,
+      @Nonnull MetadataChangeProposal mcp,
+      @Nonnull Set<Throwable> throwables);
+
   /**
    * Produces a generic platform "event".
    *
@@ -50,14 +122,16 @@ Future<?> produceMetadataChangeProposal(
    *     system event.
    * @return A {@link Future} object that reports when the message has been produced.
    */
-  Future<?> producePlatformEvent(
+  public abstract Future<?> producePlatformEvent(
       @Nonnull String name, @Nullable String key, @Nonnull PlatformEvent payload);
 
+  public abstract String getPlatformEventTopicName();
+
   /**
    * Creates an entry on the history log of when the indices were last rebuilt with the latest
    * configuration.
    *
    * @param event the history event to send to the DataHub Upgrade history topic
    */
-  void produceDataHubUpgradeHistoryEvent(@Nonnull DataHubUpgradeHistoryEvent event);
+  public abstract void produceDataHubUpgradeHistoryEvent(@Nonnull DataHubUpgradeHistoryEvent event);
 }
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ESGraphQueryDAO.java b/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ESGraphQueryDAO.java
index a801cab81c952f..30a4a1d878995c 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ESGraphQueryDAO.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ESGraphQueryDAO.java
@@ -3,7 +3,6 @@
 import static com.linkedin.metadata.aspect.models.graph.Edge.*;
 import static com.linkedin.metadata.graph.elastic.ElasticSearchGraphService.*;
 
-import com.codahale.metrics.Timer;
 import com.datahub.util.exception.ESQueryException;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
@@ -36,7 +35,7 @@
 import com.linkedin.metadata.utils.elasticsearch.IndexConvention;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
 import io.datahubproject.metadata.context.OperationContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -135,7 +134,10 @@ private static void addFilterToQueryBuilder(
   }
 
   private SearchResponse executeLineageSearchQuery(
-      @Nonnull final QueryBuilder query, final int offset, final int count) {
+      @Nonnull OperationContext opContext,
+      @Nonnull final QueryBuilder query,
+      final int offset,
+      final int count) {
     SearchRequest searchRequest = new SearchRequest();
 
     SearchSourceBuilder searchSourceBuilder = sharedSourceBuilder(query, offset, count);
@@ -144,13 +146,19 @@ private SearchResponse executeLineageSearchQuery(
 
     searchRequest.indices(indexConvention.getIndexName(INDEX_NAME));
 
-    try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "esQuery").time()) {
-      MetricUtils.counter(this.getClass(), SEARCH_EXECUTIONS_METRIC).inc();
-      return client.search(searchRequest, RequestOptions.DEFAULT);
-    } catch (Exception e) {
-      log.error("Search query failed", e);
-      throw new ESQueryException("Search query failed:", e);
-    }
+    return opContext.withSpan(
+        "esQuery",
+        () -> {
+          try {
+            MetricUtils.counter(this.getClass(), SEARCH_EXECUTIONS_METRIC).inc();
+            return client.search(searchRequest, RequestOptions.DEFAULT);
+          } catch (Exception e) {
+            log.error("Search query failed", e);
+            throw new ESQueryException("Search query failed:", e);
+          }
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "esQuery"));
   }
 
   private SearchSourceBuilder sharedSourceBuilder(
@@ -168,6 +176,7 @@ private SearchSourceBuilder sharedSourceBuilder(
   }
 
   private SearchResponse executeGroupByLineageSearchQuery(
+      @Nonnull final OperationContext opContext,
       @Nonnull final QueryBuilder query,
       final int offset,
       final int count,
@@ -232,14 +241,19 @@ private SearchResponse executeGroupByLineageSearchQuery(
     searchRequest.source(searchSourceBuilder);
     searchRequest.indices(indexConvention.getIndexName(INDEX_NAME));
 
-    try (Timer.Context ignored =
-        MetricUtils.timer(this.getClass(), "esLineageGroupByQuery").time()) {
-      MetricUtils.counter(this.getClass(), SEARCH_EXECUTIONS_METRIC).inc();
-      return client.search(searchRequest, RequestOptions.DEFAULT);
-    } catch (Exception e) {
-      log.error("Search query failed", e);
-      throw new ESQueryException("Search query failed:", e);
-    }
+    return opContext.withSpan(
+        "esLineageGroupByQuery",
+        () -> {
+          try {
+            MetricUtils.counter(this.getClass(), SEARCH_EXECUTIONS_METRIC).inc();
+            return client.search(searchRequest, RequestOptions.DEFAULT);
+          } catch (Exception e) {
+            log.error("Search query failed", e);
+            throw new ESQueryException("Search query failed:", e);
+          }
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "esLineageGroupByQuery"));
   }
 
   private static BoolQueryBuilder getAggregationFilter(
@@ -289,7 +303,7 @@ public SearchResponse getSearchResponse(
             relationshipTypes,
             relationshipFilter);
 
-    return executeLineageSearchQuery(finalQuery, offset, count);
+    return executeLineageSearchQuery(opContext, finalQuery, offset, count);
   }
 
   public static BoolQueryBuilder buildQuery(
@@ -664,7 +678,7 @@ private List<LineageRelationship> getLineageRelationships(
     if (lineageFlags != null && lineageFlags.getEntitiesExploredPerHopLimit() != null) {
       response =
           executeGroupByLineageSearchQuery(
-              finalQuery, 0, lineageFlags.getEntitiesExploredPerHopLimit(), validEdges);
+              opContext, finalQuery, 0, lineageFlags.getEntitiesExploredPerHopLimit(), validEdges);
       return extractRelationshipsGroupByQuery(
           entityUrnSet,
           response,
@@ -676,7 +690,9 @@ private List<LineageRelationship> getLineageRelationships(
           existingPaths,
           exploreMultiplePaths);
     } else {
-      response = executeLineageSearchQuery(finalQuery, 0, graphQueryConfiguration.getMaxResult());
+      response =
+          executeLineageSearchQuery(
+              opContext, finalQuery, 0, graphQueryConfiguration.getMaxResult());
       return extractRelationships(
           entityUrnSet,
           response,
@@ -1378,10 +1394,11 @@ public SearchResponse getSearchResponse(
             relationshipTypes,
             relationshipFilter);
 
-    return executeScrollSearchQuery(finalQuery, sortCriteria, scrollId, count);
+    return executeScrollSearchQuery(opContext, finalQuery, sortCriteria, scrollId, count);
   }
 
   private SearchResponse executeScrollSearchQuery(
+      @Nonnull final OperationContext opContext,
       @Nonnull final QueryBuilder query,
       @Nonnull List<SortCriterion> sortCriteria,
       @Nullable String scrollId,
@@ -1405,13 +1422,19 @@ private SearchResponse executeScrollSearchQuery(
 
     searchRequest.indices(indexConvention.getIndexName(INDEX_NAME));
 
-    try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "esQuery").time()) {
-      MetricUtils.counter(this.getClass(), SEARCH_EXECUTIONS_METRIC).inc();
-      return client.search(searchRequest, RequestOptions.DEFAULT);
-    } catch (Exception e) {
-      log.error("Search query failed", e);
-      throw new ESQueryException("Search query failed:", e);
-    }
+    return opContext.withSpan(
+        "esQuery",
+        () -> {
+          try {
+            MetricUtils.counter(this.getClass(), SEARCH_EXECUTIONS_METRIC).inc();
+            return client.search(searchRequest, RequestOptions.DEFAULT);
+          } catch (Exception e) {
+            log.error("Search query failed", e);
+            throw new ESQueryException("Search query failed:", e);
+          }
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "esQuery"));
   }
 
   private static void applyExcludeSoftDelete(
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ElasticSearchGraphService.java b/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ElasticSearchGraphService.java
index 1068fae9478e1b..6fd741d30062c5 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ElasticSearchGraphService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ElasticSearchGraphService.java
@@ -39,7 +39,7 @@
 import com.linkedin.structured.StructuredPropertyDefinition;
 import com.linkedin.util.Pair;
 import io.datahubproject.metadata.context.OperationContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/graph/neo4j/Neo4jGraphService.java b/metadata-io/src/main/java/com/linkedin/metadata/graph/neo4j/Neo4jGraphService.java
index ef748ebd232789..42f241186d2a34 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/graph/neo4j/Neo4jGraphService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/graph/neo4j/Neo4jGraphService.java
@@ -1,6 +1,5 @@
 package com.linkedin.metadata.graph.neo4j;
 
-import com.codahale.metrics.Timer;
 import com.datahub.util.Statement;
 import com.datahub.util.exception.RetryLimitReached;
 import com.google.common.annotations.VisibleForTesting;
@@ -66,26 +65,32 @@
 public class Neo4jGraphService implements GraphService {
 
   private static final int MAX_TRANSACTION_RETRY = 3;
-  private final LineageRegistry _lineageRegistry;
-  private final Driver _driver;
-  private SessionConfig _sessionConfig;
+  private final LineageRegistry lineageRegistry;
+  private final Driver driver;
+  private final OperationContext systemOperationContext;
+  private SessionConfig sessionConfig;
 
-  public Neo4jGraphService(@Nonnull LineageRegistry lineageRegistry, @Nonnull Driver driver) {
-    this(lineageRegistry, driver, SessionConfig.defaultConfig());
+  public Neo4jGraphService(
+      @Nonnull final OperationContext systemOperationContext,
+      @Nonnull LineageRegistry lineageRegistry,
+      @Nonnull Driver driver) {
+    this(systemOperationContext, lineageRegistry, driver, SessionConfig.defaultConfig());
   }
 
   public Neo4jGraphService(
+      @Nonnull final OperationContext systemOperationContext,
       @Nonnull LineageRegistry lineageRegistry,
       @Nonnull Driver driver,
       @Nonnull SessionConfig sessionConfig) {
-    this._lineageRegistry = lineageRegistry;
-    this._driver = driver;
-    this._sessionConfig = sessionConfig;
+    this.systemOperationContext = systemOperationContext;
+    this.lineageRegistry = lineageRegistry;
+    this.driver = driver;
+    this.sessionConfig = sessionConfig;
   }
 
   @Override
   public LineageRegistry getLineageRegistry() {
-    return _lineageRegistry;
+    return lineageRegistry;
   }
 
   @Override
@@ -329,7 +334,7 @@ private String getPathFindingRelationshipFilter(
     final var filterComponents = new HashSet<String>();
     for (final var entityName : entityNames) {
       if (direction != null) {
-        for (final var edgeInfo : _lineageRegistry.getLineageRelationships(entityName, direction)) {
+        for (final var edgeInfo : lineageRegistry.getLineageRelationships(entityName, direction)) {
           final var type = edgeInfo.getType();
           if (edgeInfo.getDirection() == RelationshipDirection.INCOMING) {
             filterComponents.add("<" + type);
@@ -342,7 +347,7 @@ private String getPathFindingRelationshipFilter(
         for (final var direction1 :
             List.of(LineageDirection.UPSTREAM, LineageDirection.DOWNSTREAM)) {
           for (final var edgeInfo :
-              _lineageRegistry.getLineageRelationships(entityName, direction1)) {
+              lineageRegistry.getLineageRelationships(entityName, direction1)) {
             filterComponents.add(edgeInfo.getType());
           }
         }
@@ -736,7 +741,7 @@ private ExecutionResult executeStatements(@Nonnull List<Statement> statements) {
     final StopWatch stopWatch = new StopWatch();
     stopWatch.start();
     int retry = 0;
-    try (final Session session = _driver.session(_sessionConfig)) {
+    try (final Session session = driver.session(sessionConfig)) {
       for (retry = 0; retry <= MAX_TRANSACTION_RETRY; retry++) {
         try {
           session.executeWrite(
@@ -773,9 +778,11 @@ private ExecutionResult executeStatements(@Nonnull List<Statement> statements) {
   @Nonnull
   private Result runQuery(@Nonnull Statement statement) {
     log.debug(String.format("Running Neo4j query %s", statement.toString()));
-    try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "runQuery").time()) {
-      return _driver.session(_sessionConfig).run(statement.getCommandText(), statement.getParams());
-    }
+    return systemOperationContext.withSpan(
+        "runQuery",
+        () -> driver.session(sessionConfig).run(statement.getCommandText(), statement.getParams()),
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "runQuery"));
   }
 
   // Returns "key:value" String, if value is not primitive, then use toString() and double quote it
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/recommendation/candidatesource/MostPopularSource.java b/metadata-io/src/main/java/com/linkedin/metadata/recommendation/candidatesource/MostPopularSource.java
index fea3fafdc845ad..565de23aafb92c 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/recommendation/candidatesource/MostPopularSource.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/recommendation/candidatesource/MostPopularSource.java
@@ -1,6 +1,5 @@
 package com.linkedin.metadata.recommendation.candidatesource;
 
-import com.codahale.metrics.Timer;
 import com.datahub.authorization.config.ViewAuthorizationConfiguration;
 import com.datahub.util.exception.ESQueryException;
 import com.google.common.collect.ImmutableSet;
@@ -17,7 +16,7 @@
 import com.linkedin.metadata.utils.elasticsearch.IndexConvention;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
 import io.datahubproject.metadata.context.OperationContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
@@ -105,22 +104,29 @@ public List<RecommendationContent> getRecommendations(
       @Nonnull RecommendationRequestContext requestContext,
       @Nullable Filter filter) {
     SearchRequest searchRequest = buildSearchRequest(opContext);
-    try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "getMostPopular").time()) {
-      final SearchResponse searchResponse =
-          _searchClient.search(searchRequest, RequestOptions.DEFAULT);
-      // extract results
-      ParsedTerms parsedTerms = searchResponse.getAggregations().get(ENTITY_AGG_NAME);
-      List<String> bucketUrns =
-          parsedTerms.getBuckets().stream()
-              .map(MultiBucketsAggregation.Bucket::getKeyAsString)
-              .collect(Collectors.toList());
-      return buildContent(opContext, bucketUrns, _entityService)
-          .limit(MAX_CONTENT)
-          .collect(Collectors.toList());
-    } catch (Exception e) {
-      log.error("Search query to get most popular entities failed", e);
-      throw new ESQueryException("Search query failed:", e);
-    }
+
+    return opContext.withSpan(
+        "getMostPopular",
+        () -> {
+          try {
+            final SearchResponse searchResponse =
+                _searchClient.search(searchRequest, RequestOptions.DEFAULT);
+            // extract results
+            ParsedTerms parsedTerms = searchResponse.getAggregations().get(ENTITY_AGG_NAME);
+            List<String> bucketUrns =
+                parsedTerms.getBuckets().stream()
+                    .map(MultiBucketsAggregation.Bucket::getKeyAsString)
+                    .collect(Collectors.toList());
+            return buildContent(opContext, bucketUrns, _entityService)
+                .limit(MAX_CONTENT)
+                .collect(Collectors.toList());
+          } catch (Exception e) {
+            log.error("Search query to get most popular entities failed", e);
+            throw new ESQueryException("Search query failed:", e);
+          }
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "getMostPopular"));
   }
 
   @Override
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/recommendation/candidatesource/RecentlyEditedSource.java b/metadata-io/src/main/java/com/linkedin/metadata/recommendation/candidatesource/RecentlyEditedSource.java
index afdce0d7145133..e03293c11b36c2 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/recommendation/candidatesource/RecentlyEditedSource.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/recommendation/candidatesource/RecentlyEditedSource.java
@@ -1,6 +1,5 @@
 package com.linkedin.metadata.recommendation.candidatesource;
 
-import com.codahale.metrics.Timer;
 import com.datahub.util.exception.ESQueryException;
 import com.google.common.collect.ImmutableSet;
 import com.linkedin.common.urn.Urn;
@@ -18,7 +17,7 @@
 import com.linkedin.metadata.utils.elasticsearch.IndexConvention;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
 import io.datahubproject.metadata.context.OperationContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.io.IOException;
 import java.util.List;
 import java.util.Set;
@@ -107,22 +106,29 @@ public List<RecommendationContent> getRecommendations(
     SearchRequest searchRequest =
         buildSearchRequest(
             opContext.getSessionActorContext().getActorUrn(), opContext.getAspectRetriever());
-    try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "getRecentlyEdited").time()) {
-      final SearchResponse searchResponse =
-          _searchClient.search(searchRequest, RequestOptions.DEFAULT);
-      // extract results
-      ParsedTerms parsedTerms = searchResponse.getAggregations().get(ENTITY_AGG_NAME);
-      List<String> bucketUrns =
-          parsedTerms.getBuckets().stream()
-              .map(MultiBucketsAggregation.Bucket::getKeyAsString)
-              .collect(Collectors.toList());
-      return buildContent(opContext, bucketUrns, _entityService)
-          .limit(MAX_CONTENT)
-          .collect(Collectors.toList());
-    } catch (Exception e) {
-      log.error("Search query to get most recently edited entities failed", e);
-      throw new ESQueryException("Search query failed:", e);
-    }
+
+    return opContext.withSpan(
+        "getRecentlyEdited",
+        () -> {
+          try {
+            final SearchResponse searchResponse =
+                _searchClient.search(searchRequest, RequestOptions.DEFAULT);
+            // extract results
+            ParsedTerms parsedTerms = searchResponse.getAggregations().get(ENTITY_AGG_NAME);
+            List<String> bucketUrns =
+                parsedTerms.getBuckets().stream()
+                    .map(MultiBucketsAggregation.Bucket::getKeyAsString)
+                    .collect(Collectors.toList());
+            return buildContent(opContext, bucketUrns, _entityService)
+                .limit(MAX_CONTENT)
+                .collect(Collectors.toList());
+          } catch (Exception e) {
+            log.error("Search query to get most recently edited entities failed", e);
+            throw new ESQueryException("Search query failed:", e);
+          }
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "getRecentlyEdited"));
   }
 
   @Override
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/recommendation/candidatesource/RecentlyViewedSource.java b/metadata-io/src/main/java/com/linkedin/metadata/recommendation/candidatesource/RecentlyViewedSource.java
index f282470193ae5e..ea3a80c5f60381 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/recommendation/candidatesource/RecentlyViewedSource.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/recommendation/candidatesource/RecentlyViewedSource.java
@@ -1,6 +1,5 @@
 package com.linkedin.metadata.recommendation.candidatesource;
 
-import com.codahale.metrics.Timer;
 import com.datahub.util.exception.ESQueryException;
 import com.google.common.collect.ImmutableSet;
 import com.linkedin.common.urn.Urn;
@@ -18,7 +17,7 @@
 import com.linkedin.metadata.utils.elasticsearch.IndexConvention;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
 import io.datahubproject.metadata.context.OperationContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.io.IOException;
 import java.util.List;
 import java.util.Set;
@@ -107,22 +106,29 @@ public List<RecommendationContent> getRecommendations(
     SearchRequest searchRequest =
         buildSearchRequest(
             opContext.getSessionActorContext().getActorUrn(), opContext.getAspectRetriever());
-    try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "getRecentlyViewed").time()) {
-      final SearchResponse searchResponse =
-          _searchClient.search(searchRequest, RequestOptions.DEFAULT);
-      // extract results
-      ParsedTerms parsedTerms = searchResponse.getAggregations().get(ENTITY_AGG_NAME);
-      List<String> bucketUrns =
-          parsedTerms.getBuckets().stream()
-              .map(MultiBucketsAggregation.Bucket::getKeyAsString)
-              .collect(Collectors.toList());
-      return buildContent(opContext, bucketUrns, _entityService)
-          .limit(MAX_CONTENT)
-          .collect(Collectors.toList());
-    } catch (Exception e) {
-      log.error("Search query to get most recently viewed entities failed", e);
-      throw new ESQueryException("Search query failed:", e);
-    }
+
+    return opContext.withSpan(
+        "getRecentlyViewed",
+        () -> {
+          try {
+            final SearchResponse searchResponse =
+                _searchClient.search(searchRequest, RequestOptions.DEFAULT);
+            // extract results
+            ParsedTerms parsedTerms = searchResponse.getAggregations().get(ENTITY_AGG_NAME);
+            List<String> bucketUrns =
+                parsedTerms.getBuckets().stream()
+                    .map(MultiBucketsAggregation.Bucket::getKeyAsString)
+                    .collect(Collectors.toList());
+            return buildContent(opContext, bucketUrns, _entityService)
+                .limit(MAX_CONTENT)
+                .collect(Collectors.toList());
+          } catch (Exception e) {
+            log.error("Search query to get most recently viewed entities failed", e);
+            throw new ESQueryException("Search query failed:", e);
+          }
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "getRecentlyViewed"));
   }
 
   @Override
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/LineageSearchService.java b/metadata-io/src/main/java/com/linkedin/metadata/search/LineageSearchService.java
index 67ebdf8882b80c..f77b5097db80c9 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/LineageSearchService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/LineageSearchService.java
@@ -33,7 +33,7 @@
 import com.linkedin.metadata.search.utils.FilterUtils;
 import com.linkedin.metadata.search.utils.SearchUtils;
 import io.datahubproject.metadata.context.OperationContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.net.URISyntaxException;
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/SearchService.java b/metadata-io/src/main/java/com/linkedin/metadata/search/SearchService.java
index ecded1bb9c3846..731517ba3290f1 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/SearchService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/SearchService.java
@@ -2,7 +2,6 @@
 
 import static com.linkedin.metadata.utils.SearchUtil.*;
 
-import com.codahale.metrics.Timer;
 import com.linkedin.data.template.LongMap;
 import com.linkedin.metadata.query.filter.Filter;
 import com.linkedin.metadata.query.filter.SortCriterion;
@@ -215,20 +214,18 @@ public SearchResult searchAcrossEntities(
    */
   public List<String> getEntitiesToSearch(
       @Nonnull OperationContext opContext, @Nonnull Collection<String> inputEntities, int size) {
-    List<String> nonEmptyEntities;
     List<String> lowercaseEntities =
         inputEntities.stream().map(String::toLowerCase).collect(Collectors.toList());
 
     if (lowercaseEntities.isEmpty()) {
-      try (Timer.Context ignored =
-          MetricUtils.timer(this.getClass(), "getNonEmptyEntities").time()) {
-        nonEmptyEntities = _entityDocCountCache.getNonEmptyEntities(opContext);
-      }
-    } else {
-      nonEmptyEntities = lowercaseEntities;
+      return opContext.withSpan(
+          "getNonEmptyEntities",
+          () -> _entityDocCountCache.getNonEmptyEntities(opContext),
+          MetricUtils.DROPWIZARD_NAME,
+          MetricUtils.name(this.getClass(), "getNonEmptyEntities"));
     }
 
-    return nonEmptyEntities;
+    return lowercaseEntities;
   }
 
   /**
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/cache/CacheableSearcher.java b/metadata-io/src/main/java/com/linkedin/metadata/search/cache/CacheableSearcher.java
index 28efa29c9fffa2..28a308c7f16d23 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/cache/CacheableSearcher.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/cache/CacheableSearcher.java
@@ -1,13 +1,14 @@
 package com.linkedin.metadata.search.cache;
 
 import static com.datahub.util.RecordUtils.*;
+import static com.linkedin.metadata.utils.metrics.MetricUtils.CACHE_HIT_ATTR;
 
-import com.codahale.metrics.Timer;
 import com.linkedin.metadata.search.SearchEntity;
 import com.linkedin.metadata.search.SearchEntityArray;
 import com.linkedin.metadata.search.SearchResult;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
 import io.datahubproject.metadata.context.OperationContext;
+import io.opentelemetry.api.trace.Span;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -42,41 +43,46 @@ public static class QueryPagination implements Serializable {
    * corresponds to)
    */
   public SearchResult getSearchResults(@Nonnull OperationContext opContext, int from, int size) {
-    try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "getSearchResults").time()) {
-      int resultsSoFar = 0;
-      int batchId = 0;
-      boolean foundStart = false;
-      List<SearchEntity> resultEntities = new ArrayList<>();
-      SearchResult batchedResult;
-      // Use do-while to make sure we run at least one batch to fetch metadata
-      do {
-        batchedResult = getBatch(opContext, batchId);
-        int currentBatchSize = batchedResult.getEntities().size();
-        // If the number of results in this batch is 0, no need to continue
-        if (currentBatchSize == 0) {
-          break;
-        }
-        if (resultsSoFar + currentBatchSize > from) {
-          int startInBatch = foundStart ? 0 : from - resultsSoFar;
-          int endInBatch = Math.min(currentBatchSize, startInBatch + size - resultEntities.size());
-          resultEntities.addAll(batchedResult.getEntities().subList(startInBatch, endInBatch));
-          foundStart = true;
-        }
-        // If current batch is smaller than the requested batch size, the next batch will return
-        // empty.
-        if (currentBatchSize < batchSize) {
-          break;
-        }
-        resultsSoFar += currentBatchSize;
-        batchId++;
-      } while (resultsSoFar < from + size);
-      return new SearchResult()
-          .setEntities(new SearchEntityArray(resultEntities))
-          .setMetadata(batchedResult.getMetadata())
-          .setFrom(from)
-          .setPageSize(size)
-          .setNumEntities(batchedResult.getNumEntities());
-    }
+    return opContext.withSpan(
+        "getSearchResults",
+        () -> {
+          int resultsSoFar = 0;
+          int batchId = 0;
+          boolean foundStart = false;
+          List<SearchEntity> resultEntities = new ArrayList<>();
+          SearchResult batchedResult;
+          // Use do-while to make sure we run at least one batch to fetch metadata
+          do {
+            batchedResult = getBatch(opContext, batchId);
+            int currentBatchSize = batchedResult.getEntities().size();
+            // If the number of results in this batch is 0, no need to continue
+            if (currentBatchSize == 0) {
+              break;
+            }
+            if (resultsSoFar + currentBatchSize > from) {
+              int startInBatch = foundStart ? 0 : from - resultsSoFar;
+              int endInBatch =
+                  Math.min(currentBatchSize, startInBatch + size - resultEntities.size());
+              resultEntities.addAll(batchedResult.getEntities().subList(startInBatch, endInBatch));
+              foundStart = true;
+            }
+            // If current batch is smaller than the requested batch size, the next batch will return
+            // empty.
+            if (currentBatchSize < batchSize) {
+              break;
+            }
+            resultsSoFar += currentBatchSize;
+            batchId++;
+          } while (resultsSoFar < from + size);
+          return new SearchResult()
+              .setEntities(new SearchEntityArray(resultEntities))
+              .setMetadata(batchedResult.getMetadata())
+              .setFrom(from)
+              .setPageSize(size)
+              .setNumEntities(batchedResult.getNumEntities());
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "getSearchResults"));
   }
 
   private QueryPagination getBatchQuerySize(int batchId) {
@@ -84,37 +90,41 @@ private QueryPagination getBatchQuerySize(int batchId) {
   }
 
   private SearchResult getBatch(@Nonnull OperationContext opContext, int batchId) {
-    try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "getBatch").time()) {
-      QueryPagination batch = getBatchQuerySize(batchId);
-      SearchResult result;
-      if (enableCache) {
-        K cacheKey = cacheKeyGenerator.apply(batch);
-        if ((opContext.getSearchContext().getSearchFlags().isSkipCache() == null
-            || !opContext.getSearchContext().getSearchFlags().isSkipCache())) {
-          try (Timer.Context ignored2 =
-              MetricUtils.timer(this.getClass(), "getBatch_cache").time()) {
-            Timer.Context cacheAccess =
-                MetricUtils.timer(this.getClass(), "getBatch_cache_access").time();
-            String json = cache.get(cacheKey, String.class);
-            result = json != null ? toRecordTemplate(SearchResult.class, json) : null;
-            cacheAccess.stop();
-            if (result == null) {
-              Timer.Context cacheMiss =
-                  MetricUtils.timer(this.getClass(), "getBatch_cache_miss").time();
+
+    return opContext.withSpan(
+        "getBatch",
+        () -> {
+          QueryPagination batch = getBatchQuerySize(batchId);
+          SearchResult result;
+          if (enableCache) {
+            K cacheKey = cacheKeyGenerator.apply(batch);
+            if ((opContext.getSearchContext().getSearchFlags().isSkipCache() == null
+                || !opContext.getSearchContext().getSearchFlags().isSkipCache())) {
+
+              String json = cache.get(cacheKey, String.class);
+              result = json != null ? toRecordTemplate(SearchResult.class, json) : null;
+
+              if (result == null) {
+                Span.current().setAttribute(CACHE_HIT_ATTR, false);
+                result = searcher.apply(batch);
+                cache.put(cacheKey, toJsonString(result));
+                MetricUtils.counter(this.getClass(), "getBatch_cache_miss_count").inc();
+              } else {
+                Span.current().setAttribute(CACHE_HIT_ATTR, true);
+              }
+
+            } else {
+              Span.current().setAttribute(CACHE_HIT_ATTR, false);
               result = searcher.apply(batch);
               cache.put(cacheKey, toJsonString(result));
-              cacheMiss.stop();
-              MetricUtils.counter(this.getClass(), "getBatch_cache_miss_count").inc();
             }
+          } else {
+            Span.current().setAttribute(CACHE_HIT_ATTR, false);
+            result = searcher.apply(batch);
           }
-        } else {
-          result = searcher.apply(batch);
-          cache.put(cacheKey, toJsonString(result));
-        }
-      } else {
-        result = searcher.apply(batch);
-      }
-      return result;
-    }
+          return result;
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "getBatch"));
   }
 }
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/cache/EntityDocCountCache.java b/metadata-io/src/main/java/com/linkedin/metadata/search/cache/EntityDocCountCache.java
index 1efaeb2b12f45f..7cea787583b54d 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/cache/EntityDocCountCache.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/cache/EntityDocCountCache.java
@@ -7,7 +7,7 @@
 import com.linkedin.metadata.search.EntitySearchService;
 import com.linkedin.metadata.utils.ConcurrencyUtils;
 import io.datahubproject.metadata.context.OperationContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/client/CachingEntitySearchService.java b/metadata-io/src/main/java/com/linkedin/metadata/search/client/CachingEntitySearchService.java
index cb062e0e3f4483..7272809bb1221a 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/client/CachingEntitySearchService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/client/CachingEntitySearchService.java
@@ -2,8 +2,8 @@
 
 import static com.datahub.util.RecordUtils.toJsonString;
 import static com.datahub.util.RecordUtils.toRecordTemplate;
+import static com.linkedin.metadata.utils.metrics.MetricUtils.CACHE_HIT_ATTR;
 
-import com.codahale.metrics.Timer;
 import com.linkedin.metadata.browse.BrowseResult;
 import com.linkedin.metadata.query.AutoCompleteResult;
 import com.linkedin.metadata.query.SearchFlags;
@@ -15,6 +15,7 @@
 import com.linkedin.metadata.search.cache.CacheableSearcher;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
 import io.datahubproject.metadata.context.OperationContext;
+import io.opentelemetry.api.trace.Span;
 import java.util.List;
 import java.util.Optional;
 import javax.annotation.Nonnull;
@@ -184,40 +185,42 @@ public AutoCompleteResult getCachedAutoCompleteResults(
       @Nullable String field,
       @Nullable Filter filters,
       int limit) {
-    try (Timer.Context ignored =
-        MetricUtils.timer(this.getClass(), "getCachedAutoCompleteResults").time()) {
-      Cache cache = cacheManager.getCache(ENTITY_SEARCH_SERVICE_AUTOCOMPLETE_CACHE_NAME);
-      AutoCompleteResult result;
-      if (enableCache(opContext.getSearchContext().getSearchFlags())) {
-        try (Timer.Context ignored2 =
-            MetricUtils.timer(this.getClass(), "getCachedAutoCompleteResults_cache").time()) {
-          Timer.Context cacheAccess =
-              MetricUtils.timer(this.getClass(), "autocomplete_cache_access").time();
-          Object cacheKey =
-              Sextet.with(
-                  opContext.getSearchContextId(),
-                  entityName,
-                  input,
-                  field,
-                  filters != null ? toJsonString(filters) : null,
-                  limit);
-          String json = cache.get(cacheKey, String.class);
-          result = json != null ? toRecordTemplate(AutoCompleteResult.class, json) : null;
-          cacheAccess.stop();
-          if (result == null) {
-            Timer.Context cacheMiss =
-                MetricUtils.timer(this.getClass(), "autocomplete_cache_miss").time();
+
+    return opContext.withSpan(
+        "getAutoCompleteResults",
+        () -> {
+          Cache cache = cacheManager.getCache(ENTITY_SEARCH_SERVICE_AUTOCOMPLETE_CACHE_NAME);
+          AutoCompleteResult result;
+          if (enableCache(opContext.getSearchContext().getSearchFlags())) {
+
+            Object cacheKey =
+                Sextet.with(
+                    opContext.getSearchContextId(),
+                    entityName,
+                    input,
+                    field,
+                    filters != null ? toJsonString(filters) : null,
+                    limit);
+            String json = cache.get(cacheKey, String.class);
+            result = json != null ? toRecordTemplate(AutoCompleteResult.class, json) : null;
+
+            if (result == null) {
+              result =
+                  getRawAutoCompleteResults(opContext, entityName, input, field, filters, limit);
+              cache.put(cacheKey, toJsonString(result));
+              Span.current().setAttribute(CACHE_HIT_ATTR, false);
+              MetricUtils.counter(this.getClass(), "autocomplete_cache_miss_count").inc();
+            } else {
+              Span.current().setAttribute(CACHE_HIT_ATTR, true);
+            }
+          } else {
+            Span.current().setAttribute(CACHE_HIT_ATTR, false);
             result = getRawAutoCompleteResults(opContext, entityName, input, field, filters, limit);
-            cache.put(cacheKey, toJsonString(result));
-            cacheMiss.stop();
-            MetricUtils.counter(this.getClass(), "autocomplete_cache_miss_count").inc();
           }
-        }
-      } else {
-        result = getRawAutoCompleteResults(opContext, entityName, input, field, filters, limit);
-      }
-      return result;
-    }
+          return result;
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "getCachedAutoCompleteResults"));
   }
 
   /** Returns cached browse results. */
@@ -228,40 +231,40 @@ public BrowseResult getCachedBrowseResults(
       @Nullable Filter filters,
       int from,
       int size) {
-    try (Timer.Context ignored =
-        MetricUtils.timer(this.getClass(), "getCachedBrowseResults").time()) {
-      Cache cache = cacheManager.getCache(ENTITY_SEARCH_SERVICE_BROWSE_CACHE_NAME);
-      BrowseResult result;
-      if (enableCache(opContext.getSearchContext().getSearchFlags())) {
-        try (Timer.Context ignored2 =
-            MetricUtils.timer(this.getClass(), "getCachedBrowseResults_cache").time()) {
-          Timer.Context cacheAccess =
-              MetricUtils.timer(this.getClass(), "browse_cache_access").time();
-          Object cacheKey =
-              Sextet.with(
-                  opContext.getSearchContextId(),
-                  entityName,
-                  path,
-                  filters != null ? toJsonString(filters) : null,
-                  from,
-                  size);
-          String json = cache.get(cacheKey, String.class);
-          result = json != null ? toRecordTemplate(BrowseResult.class, json) : null;
-          cacheAccess.stop();
-          if (result == null) {
-            Timer.Context cacheMiss =
-                MetricUtils.timer(this.getClass(), "browse_cache_miss").time();
+
+    return opContext.withSpan(
+        "getBrowseResults",
+        () -> {
+          Cache cache = cacheManager.getCache(ENTITY_SEARCH_SERVICE_BROWSE_CACHE_NAME);
+          BrowseResult result;
+          if (enableCache(opContext.getSearchContext().getSearchFlags())) {
+            Object cacheKey =
+                Sextet.with(
+                    opContext.getSearchContextId(),
+                    entityName,
+                    path,
+                    filters != null ? toJsonString(filters) : null,
+                    from,
+                    size);
+            String json = cache.get(cacheKey, String.class);
+            result = json != null ? toRecordTemplate(BrowseResult.class, json) : null;
+
+            if (result == null) {
+              result = getRawBrowseResults(opContext, entityName, path, filters, from, size);
+              cache.put(cacheKey, toJsonString(result));
+              Span.current().setAttribute(CACHE_HIT_ATTR, false);
+              MetricUtils.counter(this.getClass(), "browse_cache_miss_count").inc();
+            } else {
+              Span.current().setAttribute(CACHE_HIT_ATTR, true);
+            }
+          } else {
+            Span.current().setAttribute(CACHE_HIT_ATTR, false);
             result = getRawBrowseResults(opContext, entityName, path, filters, from, size);
-            cache.put(cacheKey, toJsonString(result));
-            cacheMiss.stop();
-            MetricUtils.counter(this.getClass(), "browse_cache_miss_count").inc();
           }
-        }
-      } else {
-        result = getRawBrowseResults(opContext, entityName, path, filters, from, size);
-      }
-      return result;
-    }
+          return result;
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "getCachedBrowseResults"));
   }
 
   /** Returns cached scroll results. */
@@ -274,62 +277,67 @@ public ScrollResult getCachedScrollResults(
       @Nullable String scrollId,
       @Nullable String keepAlive,
       int size) {
-    try (Timer.Context ignored =
-        MetricUtils.timer(this.getClass(), "getCachedScrollResults").time()) {
-      boolean isFullText =
-          Boolean.TRUE.equals(
-              Optional.ofNullable(opContext.getSearchContext().getSearchFlags())
-                  .orElse(new SearchFlags())
-                  .isFulltext());
-      Cache cache = cacheManager.getCache(ENTITY_SEARCH_SERVICE_SCROLL_CACHE_NAME);
-      ScrollResult result;
-      if (enableCache(opContext.getSearchContext().getSearchFlags())) {
-        Timer.Context cacheAccess =
-            MetricUtils.timer(this.getClass(), "scroll_cache_access").time();
-        Object cacheKey =
-            Septet.with(
-                opContext.getSearchContextId(),
-                entities,
-                query,
-                filters != null ? toJsonString(filters) : null,
-                CollectionUtils.isNotEmpty(sortCriteria) ? toJsonString(sortCriteria) : null,
-                scrollId,
-                size);
-        String json = cache.get(cacheKey, String.class);
-        result = json != null ? toRecordTemplate(ScrollResult.class, json) : null;
-        cacheAccess.stop();
-        if (result == null) {
-          Timer.Context cacheMiss = MetricUtils.timer(this.getClass(), "scroll_cache_miss").time();
-          result =
-              getRawScrollResults(
-                  opContext,
-                  entities,
-                  query,
-                  filters,
-                  sortCriteria,
-                  scrollId,
-                  keepAlive,
-                  size,
-                  isFullText);
-          cache.put(cacheKey, toJsonString(result));
-          cacheMiss.stop();
-          MetricUtils.counter(this.getClass(), "scroll_cache_miss_count").inc();
-        }
-      } else {
-        result =
-            getRawScrollResults(
-                opContext,
-                entities,
-                query,
-                filters,
-                sortCriteria,
-                scrollId,
-                keepAlive,
-                size,
-                isFullText);
-      }
-      return result;
-    }
+
+    return opContext.withSpan(
+        "getScrollResults",
+        () -> {
+          boolean isFullText =
+              Boolean.TRUE.equals(
+                  Optional.ofNullable(opContext.getSearchContext().getSearchFlags())
+                      .orElse(new SearchFlags())
+                      .isFulltext());
+          Cache cache = cacheManager.getCache(ENTITY_SEARCH_SERVICE_SCROLL_CACHE_NAME);
+          ScrollResult result;
+          if (enableCache(opContext.getSearchContext().getSearchFlags())) {
+
+            Object cacheKey =
+                Septet.with(
+                    opContext.getSearchContextId(),
+                    entities,
+                    query,
+                    filters != null ? toJsonString(filters) : null,
+                    CollectionUtils.isNotEmpty(sortCriteria) ? toJsonString(sortCriteria) : null,
+                    scrollId,
+                    size);
+            String json = cache.get(cacheKey, String.class);
+            result = json != null ? toRecordTemplate(ScrollResult.class, json) : null;
+
+            if (result == null) {
+              result =
+                  getRawScrollResults(
+                      opContext,
+                      entities,
+                      query,
+                      filters,
+                      sortCriteria,
+                      scrollId,
+                      keepAlive,
+                      size,
+                      isFullText);
+              cache.put(cacheKey, toJsonString(result));
+              Span.current().setAttribute(CACHE_HIT_ATTR, false);
+              MetricUtils.counter(this.getClass(), "scroll_cache_miss_count").inc();
+            } else {
+              Span.current().setAttribute(CACHE_HIT_ATTR, true);
+            }
+          } else {
+            Span.current().setAttribute(CACHE_HIT_ATTR, false);
+            result =
+                getRawScrollResults(
+                    opContext,
+                    entities,
+                    query,
+                    filters,
+                    sortCriteria,
+                    scrollId,
+                    keepAlive,
+                    size,
+                    isFullText);
+          }
+          return result;
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "getCachedScrollResults"));
   }
 
   /** Executes the expensive search query using the {@link EntitySearchService} */
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESBrowseDAO.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESBrowseDAO.java
index 35f133cc794f2a..3a84d1cb2de489 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESBrowseDAO.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESBrowseDAO.java
@@ -3,7 +3,6 @@
 import static com.linkedin.metadata.search.utils.ESUtils.applyDefaultSearchFilters;
 import static com.linkedin.metadata.search.utils.SearchUtils.applyDefaultSearchFlags;
 
-import com.codahale.metrics.Timer;
 import com.datahub.util.exception.ESQueryException;
 import com.google.common.annotations.VisibleForTesting;
 import com.linkedin.common.urn.Urn;
@@ -30,6 +29,7 @@
 import com.linkedin.metadata.utils.SearchUtil;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
 import io.datahubproject.metadata.context.OperationContext;
+import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -139,13 +139,21 @@ public BrowseResult browse(
               .getIndexConvention()
               .getIndexName(opContext.getEntityRegistry().getEntitySpec(entityName));
 
-      final SearchResponse groupsResponse;
-      try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "esGroupSearch").time()) {
-        groupsResponse =
-            client.search(
-                constructGroupsSearchRequest(finalOpContext, indexName, path, requestMap),
-                RequestOptions.DEFAULT);
-      }
+      final SearchResponse groupsResponse =
+          opContext.withSpan(
+              "esGroupSearch",
+              () -> {
+                try {
+                  return client.search(
+                      constructGroupsSearchRequest(finalOpContext, indexName, path, requestMap),
+                      RequestOptions.DEFAULT);
+                } catch (IOException e) {
+                  throw new RuntimeException(e);
+                }
+              },
+              MetricUtils.DROPWIZARD_NAME,
+              MetricUtils.name(this.getClass(), "esGroupSearch"));
+
       final BrowseGroupsResult browseGroupsResult =
           extractGroupsResponse(groupsResponse, path, from, size);
       final int numGroups = browseGroupsResult.getTotalGroups();
@@ -156,14 +164,22 @@ public BrowseResult browse(
       // if numGroups <= from, we should only return entities
       int entityFrom = Math.max(from - numGroups, 0);
       int entitySize = Math.min(Math.max(from + size - numGroups, 0), size);
-      final SearchResponse entitiesResponse;
-      try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "esEntitiesSearch").time()) {
-        entitiesResponse =
-            client.search(
-                constructEntitiesSearchRequest(
-                    finalOpContext, indexName, path, requestMap, entityFrom, entitySize),
-                RequestOptions.DEFAULT);
-      }
+      final SearchResponse entitiesResponse =
+          opContext.withSpan(
+              "esEntitiesSearch",
+              () -> {
+                try {
+                  return client.search(
+                      constructEntitiesSearchRequest(
+                          finalOpContext, indexName, path, requestMap, entityFrom, entitySize),
+                      RequestOptions.DEFAULT);
+                } catch (IOException e) {
+                  throw new RuntimeException(e);
+                }
+              },
+              MetricUtils.DROPWIZARD_NAME,
+              MetricUtils.name(this.getClass(), "esEntitiesSearch"));
+
       final int numEntities = (int) entitiesResponse.getHits().getTotalHits().value;
       final List<BrowseResultEntity> browseResultEntityList =
           extractEntitiesResponse(entitiesResponse, path);
@@ -441,19 +457,25 @@ public BrowseResultV2 browseV2(
       int start,
       int count) {
     try {
-      final SearchResponse groupsResponse;
       final OperationContext finalOpContext =
           opContext.withSearchFlags(
               flags -> applyDefaultSearchFlags(flags, path, DEFAULT_BROWSE_SEARCH_FLAGS));
 
-      try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "esGroupSearch").time()) {
-        final String finalInput = input.isEmpty() ? "*" : input;
-        groupsResponse =
-            client.search(
-                constructGroupsSearchRequestV2(
-                    finalOpContext, entityName, path, filter, finalInput),
-                RequestOptions.DEFAULT);
-      }
+      final SearchResponse groupsResponse =
+          opContext.withSpan(
+              "esGroupSearch",
+              () -> {
+                try {
+                  return client.search(
+                      constructGroupsSearchRequestV2(
+                          finalOpContext, entityName, path, filter, input.isEmpty() ? "*" : input),
+                      RequestOptions.DEFAULT);
+                } catch (IOException e) {
+                  throw new RuntimeException(e);
+                }
+              },
+              MetricUtils.DROPWIZARD_NAME,
+              MetricUtils.name(this.getClass(), "esGroupSearch"));
 
       final BrowseGroupsResultV2 browseGroupsResult =
           extractGroupsResponseV2(groupsResponse, path, start, count);
@@ -483,19 +505,25 @@ public BrowseResultV2 browseV2(
       int start,
       int count) {
     try {
-      final SearchResponse groupsResponse;
       final OperationContext finalOpContext =
           opContext.withSearchFlags(
               flags -> applyDefaultSearchFlags(flags, path, DEFAULT_BROWSE_SEARCH_FLAGS));
 
-      try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "esGroupSearch").time()) {
-        final String finalInput = input.isEmpty() ? "*" : input;
-        groupsResponse =
-            client.search(
-                constructGroupsSearchRequestBrowseAcrossEntities(
-                    finalOpContext, entities, path, filter, finalInput),
-                RequestOptions.DEFAULT);
-      }
+      final SearchResponse groupsResponse =
+          opContext.withSpan(
+              "esGroupSearch",
+              () -> {
+                try {
+                  return client.search(
+                      constructGroupsSearchRequestBrowseAcrossEntities(
+                          finalOpContext, entities, path, filter, input.isEmpty() ? "*" : input),
+                      RequestOptions.DEFAULT);
+                } catch (IOException e) {
+                  throw new RuntimeException(e);
+                }
+              },
+              MetricUtils.DROPWIZARD_NAME,
+              MetricUtils.name(this.getClass(), "esGroupSearch"));
 
       final BrowseGroupsResultV2 browseGroupsResult =
           extractGroupsResponseV2(groupsResponse, path, start, count);
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESSearchDAO.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESSearchDAO.java
index 2d7db075e676ff..a720e0bf815c26 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESSearchDAO.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESSearchDAO.java
@@ -4,7 +4,6 @@
 import static com.linkedin.metadata.aspect.patch.template.TemplateUtil.*;
 import static com.linkedin.metadata.utils.SearchUtil.*;
 
-import com.codahale.metrics.Timer;
 import com.datahub.util.exception.ESQueryException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -31,7 +30,7 @@
 import com.linkedin.metadata.utils.elasticsearch.IndexConvention;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
 import io.datahubproject.metadata.context.OperationContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -114,12 +113,19 @@ public long docCount(
                     filter,
                     entitySpec.getSearchableFieldTypes(),
                     queryFilterRewriteChain));
-    try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "docCount").time()) {
-      return client.count(countRequest, RequestOptions.DEFAULT).getCount();
-    } catch (IOException e) {
-      log.error("Count query failed:" + e.getMessage());
-      throw new ESQueryException("Count query failed:", e);
-    }
+
+    return opContext.withSpan(
+        "docCount",
+        () -> {
+          try {
+            return client.count(countRequest, RequestOptions.DEFAULT).getCount();
+          } catch (IOException e) {
+            log.error("Count query failed:" + e.getMessage());
+            throw new ESQueryException("Count query failed:", e);
+          }
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "docCount"));
   }
 
   @Nonnull
@@ -132,26 +138,33 @@ private SearchResult executeAndExtract(
       int from,
       int size) {
     long id = System.currentTimeMillis();
-    try (Timer.Context ignored =
-        MetricUtils.timer(this.getClass(), "executeAndExtract_search").time()) {
-      log.debug("Executing request {}: {}", id, searchRequest);
-      final SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT);
-      // extract results, validated against document model as well
-      return transformIndexIntoEntityName(
-          opContext.getSearchContext().getIndexConvention(),
-          SearchRequestHandler.getBuilder(
-                  opContext.getEntityRegistry(),
-                  entitySpec,
-                  searchConfiguration,
-                  customSearchConfiguration,
-                  queryFilterRewriteChain)
-              .extractResult(opContext, searchResponse, filter, from, size));
-    } catch (Exception e) {
-      log.error("Search query failed", e);
-      throw new ESQueryException("Search query failed:", e);
-    } finally {
-      log.debug("Returning from request {}.", id);
-    }
+
+    return opContext.withSpan(
+        "executeAndExtract_search",
+        () -> {
+          try {
+            log.debug("Executing request {}: {}", id, searchRequest);
+            final SearchResponse searchResponse =
+                client.search(searchRequest, RequestOptions.DEFAULT);
+            // extract results, validated against document model as well
+            return transformIndexIntoEntityName(
+                opContext.getSearchContext().getIndexConvention(),
+                SearchRequestHandler.getBuilder(
+                        opContext.getEntityRegistry(),
+                        entitySpec,
+                        searchConfiguration,
+                        customSearchConfiguration,
+                        queryFilterRewriteChain)
+                    .extractResult(opContext, searchResponse, filter, from, size));
+          } catch (Exception e) {
+            log.error("Search query failed", e);
+            throw new ESQueryException("Search query failed:", e);
+          } finally {
+            log.debug("Returning from request {}.", id);
+          }
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "executeAndExtract_search"));
   }
 
   private String transformIndexToken(
@@ -234,24 +247,30 @@ private ScrollResult executeAndExtract(
       @Nullable Filter filter,
       @Nullable String keepAlive,
       int size) {
-    try (Timer.Context ignored =
-        MetricUtils.timer(this.getClass(), "executeAndExtract_scroll").time()) {
-      final SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT);
-      // extract results, validated against document model as well
-      return transformIndexIntoEntityName(
-          opContext.getSearchContext().getIndexConvention(),
-          SearchRequestHandler.getBuilder(
-                  opContext.getEntityRegistry(),
-                  entitySpecs,
-                  searchConfiguration,
-                  customSearchConfiguration,
-                  queryFilterRewriteChain)
-              .extractScrollResult(
-                  opContext, searchResponse, filter, keepAlive, size, supportsPointInTime()));
-    } catch (Exception e) {
-      log.error("Search query failed: {}", searchRequest, e);
-      throw new ESQueryException("Search query failed:", e);
-    }
+    return opContext.withSpan(
+        "executeAndExtract_scroll",
+        () -> {
+          try {
+            final SearchResponse searchResponse =
+                client.search(searchRequest, RequestOptions.DEFAULT);
+            // extract results, validated against document model as well
+            return transformIndexIntoEntityName(
+                opContext.getSearchContext().getIndexConvention(),
+                SearchRequestHandler.getBuilder(
+                        opContext.getEntityRegistry(),
+                        entitySpecs,
+                        searchConfiguration,
+                        customSearchConfiguration,
+                        queryFilterRewriteChain)
+                    .extractScrollResult(
+                        opContext, searchResponse, filter, keepAlive, size, supportsPointInTime()));
+          } catch (Exception e) {
+            log.error("Search query failed: {}", searchRequest, e);
+            throw new ESQueryException("Search query failed:", e);
+          }
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "executeAndExtract_scroll"));
   }
 
   /**
@@ -279,26 +298,32 @@ public SearchResult search(
       int size,
       @Nullable List<String> facets) {
     final String finalInput = input.isEmpty() ? "*" : input;
-    Timer.Context searchRequestTimer = MetricUtils.timer(this.getClass(), "searchRequest").time();
     List<EntitySpec> entitySpecs =
         entityNames.stream()
             .map(name -> opContext.getEntityRegistry().getEntitySpec(name))
             .collect(Collectors.toList());
     IndexConvention indexConvention = opContext.getSearchContext().getIndexConvention();
     Filter transformedFilters = transformFilterForEntities(postFilters, indexConvention);
+
     // Step 1: construct the query
     final SearchRequest searchRequest =
-        SearchRequestHandler.getBuilder(
-                opContext.getEntityRegistry(),
-                entitySpecs,
-                searchConfiguration,
-                customSearchConfiguration,
-                queryFilterRewriteChain)
-            .getSearchRequest(
-                opContext, finalInput, transformedFilters, sortCriteria, from, size, facets);
-    searchRequest.indices(
-        entityNames.stream().map(indexConvention::getEntityIndexName).toArray(String[]::new));
-    searchRequestTimer.stop();
+        opContext.withSpan(
+            "searchRequest",
+            () ->
+                SearchRequestHandler.getBuilder(
+                        opContext.getEntityRegistry(),
+                        entitySpecs,
+                        searchConfiguration,
+                        customSearchConfiguration,
+                        queryFilterRewriteChain)
+                    .getSearchRequest(
+                        opContext, finalInput, transformedFilters, sortCriteria, from, size, facets)
+                    .indices(
+                        entityNames.stream()
+                            .map(indexConvention::getEntityIndexName)
+                            .toArray(String[]::new)),
+            MetricUtils.DROPWIZARD_NAME,
+            MetricUtils.name(this.getClass(), "searchRequest"));
 
     if (testLoggingEnabled) {
       testLog(opContext.getObjectMapper(), searchRequest);
@@ -437,15 +462,21 @@ public Map<String, Long> aggregateByValue(
       searchRequest.indices(stream.toArray(String[]::new));
     }
 
-    try (Timer.Context ignored =
-        MetricUtils.timer(this.getClass(), "aggregateByValue_search").time()) {
-      final SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT);
-      // extract results, validated against document model as well
-      return AggregationQueryBuilder.extractAggregationsFromResponse(searchResponse, field);
-    } catch (Exception e) {
-      log.error("Aggregation query failed", e);
-      throw new ESQueryException("Aggregation query failed:", e);
-    }
+    return opContext.withSpan(
+        "aggregateByValue_search",
+        () -> {
+          try {
+            final SearchResponse searchResponse =
+                client.search(searchRequest, RequestOptions.DEFAULT);
+            // extract results, validated against document model as well
+            return AggregationQueryBuilder.extractAggregationsFromResponse(searchResponse, field);
+          } catch (Exception e) {
+            log.error("Aggregation query failed", e);
+            throw new ESQueryException("Aggregation query failed:", e);
+          }
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "aggregateByValue_search"));
   }
 
   /**
@@ -476,33 +507,40 @@ public ScrollResult scroll(
     IndexConvention indexConvention = opContext.getSearchContext().getIndexConvention();
     String[] indexArray =
         entities.stream().map(indexConvention::getEntityIndexName).toArray(String[]::new);
-    Timer.Context scrollRequestTimer = MetricUtils.timer(this.getClass(), "scrollRequest").time();
     List<EntitySpec> entitySpecs =
         entities.stream()
             .map(name -> opContext.getEntityRegistry().getEntitySpec(name))
             .collect(Collectors.toList());
     Filter transformedFilters = transformFilterForEntities(postFilters, indexConvention);
-    // TODO: Align scroll and search using facets
-    final SearchRequest searchRequest =
-        getScrollRequest(
-            opContext,
-            scrollId,
-            keepAlive,
-            indexArray,
-            size,
-            transformedFilters,
-            entitySpecs,
-            finalInput,
-            sortCriteria,
-            null);
 
-    // PIT specifies indices in creation so it doesn't support specifying indices on the request, so
-    // we only specify if not using PIT
-    if (!supportsPointInTime()) {
-      searchRequest.indices(indexArray);
-    }
-
-    scrollRequestTimer.stop();
+    final SearchRequest searchRequest =
+        opContext.withSpan(
+            "scrollRequest",
+            () -> {
+              // TODO: Align scroll and search using facets
+              final SearchRequest req =
+                  getScrollRequest(
+                      opContext,
+                      scrollId,
+                      keepAlive,
+                      indexArray,
+                      size,
+                      transformedFilters,
+                      entitySpecs,
+                      finalInput,
+                      sortCriteria,
+                      null);
+
+              // PIT specifies indices in creation so it doesn't support specifying indices on the
+              // request, so
+              // we only specify if not using PIT
+              if (!supportsPointInTime()) {
+                req.indices(indexArray);
+              }
+              return req;
+            },
+            MetricUtils.DROPWIZARD_NAME,
+            MetricUtils.name(this.getClass(), "scrollRequest"));
 
     if (testLoggingEnabled) {
       testLog(opContext.getObjectMapper(), searchRequest);
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/AggregationQueryBuilder.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/AggregationQueryBuilder.java
index 8b83439a3008c1..8ff0759b2e41a5 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/AggregationQueryBuilder.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/AggregationQueryBuilder.java
@@ -22,7 +22,7 @@
 import com.linkedin.metadata.utils.SearchUtil;
 import com.linkedin.util.Pair;
 import io.datahubproject.metadata.context.OperationContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchRequestHandler.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchRequestHandler.java
index 01a1e9cb159844..0ecf1a932e4bfd 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchRequestHandler.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchRequestHandler.java
@@ -43,7 +43,7 @@
 import com.linkedin.metadata.search.utils.ESUtils;
 import com.linkedin.util.Pair;
 import io.datahubproject.metadata.context.OperationContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/service/UpdateIndicesService.java b/metadata-io/src/main/java/com/linkedin/metadata/service/UpdateIndicesService.java
index 635d4472305c93..c410d2ccefdf24 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/service/UpdateIndicesService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/service/UpdateIndicesService.java
@@ -30,6 +30,7 @@
 import com.linkedin.mxe.MetadataChangeLog;
 import com.linkedin.mxe.SystemMetadata;
 import com.linkedin.structured.StructuredPropertyDefinition;
+import com.linkedin.util.Pair;
 import io.datahubproject.metadata.context.OperationContext;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -131,13 +132,23 @@ public void handleChangeEvent(
           Stream.concat(Stream.of(batch), sideEffects).collect(Collectors.toList())) {
         MetadataChangeLog hookEvent = mclItem.getMetadataChangeLog();
         if (UPDATE_CHANGE_TYPES.contains(hookEvent.getChangeType())) {
-          handleUpdateChangeEvent(opContext, mclItem);
+          // non-system metadata
+          handleUpdateChangeEvent(opContext, mclItem, false);
+          // graph update
+          updateGraphIndicesService.handleChangeEvent(opContext, event);
+          // system metadata is last for tracing
+          handleUpdateChangeEvent(opContext, mclItem, true);
         } else if (hookEvent.getChangeType() == ChangeType.DELETE) {
-          handleDeleteChangeEvent(opContext, mclItem);
+          Pair<EntitySpec, AspectSpec> specPair = extractSpecPair(mclItem);
+          boolean isDeletingKey = isDeletingKey(specPair);
+
+          // non-system metadata
+          handleNonSystemMetadataDeleteChangeEvent(opContext, specPair, mclItem, isDeletingKey);
+          // graph update
+          updateGraphIndicesService.handleChangeEvent(opContext, event);
+          // system metadata is last for tracing
+          handleSystemMetadataDeleteChangeEvent(mclItem.getUrn(), specPair, isDeletingKey);
         }
-
-        // graph update
-        updateGraphIndicesService.handleChangeEvent(opContext, event);
       }
     } catch (IOException e) {
       throw new RuntimeException(e);
@@ -154,7 +165,8 @@ public void handleChangeEvent(
    * @param event the change event to be processed.
    */
   private void handleUpdateChangeEvent(
-      @Nonnull OperationContext opContext, @Nonnull final MCLItem event) throws IOException {
+      @Nonnull OperationContext opContext, @Nonnull final MCLItem event, boolean forSystemMetadata)
+      throws IOException {
 
     final EntitySpec entitySpec = event.getEntitySpec();
     final AspectSpec aspectSpec = event.getAspectSpec();
@@ -163,32 +175,34 @@ private void handleUpdateChangeEvent(
     RecordTemplate aspect = event.getRecordTemplate();
     RecordTemplate previousAspect = event.getPreviousRecordTemplate();
 
-    // Step 0. If the aspect is timeseries, add to its timeseries index.
-    if (aspectSpec.isTimeseries()) {
-      updateTimeseriesFields(
-          opContext,
-          urn.getEntityType(),
-          event.getAspectName(),
-          urn,
-          aspect,
-          aspectSpec,
-          event.getSystemMetadata());
-    } else {
+    if (!forSystemMetadata) {
+      // Step 0. If the aspect is timeseries, add to its timeseries index.
+      if (aspectSpec.isTimeseries()) {
+        updateTimeseriesFields(
+            opContext,
+            urn.getEntityType(),
+            event.getAspectName(),
+            urn,
+            aspect,
+            aspectSpec,
+            event.getSystemMetadata());
+      }
+
+      try {
+        // Step 1. Handle StructuredProperties Index Mapping changes
+        updateIndexMappings(urn, entitySpec, aspectSpec, aspect, previousAspect);
+      } catch (Exception e) {
+        log.error("Issue with updating index mappings for structured property change", e);
+      }
+
+      // Step 2. For all aspects, attempt to update Search
+      updateSearchService(opContext, event);
+    } else if (forSystemMetadata && !aspectSpec.isTimeseries()) {
       // Inject into the System Metadata Index when an aspect is non-timeseries only.
       // TODO: Verify whether timeseries aspects can be dropped into System Metadata as well
       // without impacting rollbacks.
       updateSystemMetadata(event.getSystemMetadata(), urn, aspectSpec, aspect);
     }
-
-    try {
-      // Step 1. Handle StructuredProperties Index Mapping changes
-      updateIndexMappings(urn, entitySpec, aspectSpec, aspect, previousAspect);
-    } catch (Exception e) {
-      log.error("Issue with updating index mappings for structured property change", e);
-    }
-
-    // Step 2. For all aspects, attempt to update Search
-    updateSearchService(opContext, event);
   }
 
   public void updateIndexMappings(
@@ -232,6 +246,25 @@ public void updateIndexMappings(
     }
   }
 
+  private static Pair<EntitySpec, AspectSpec> extractSpecPair(@Nonnull final MCLItem event) {
+    final EntitySpec entitySpec = event.getEntitySpec();
+    final Urn urn = event.getUrn();
+
+    AspectSpec aspectSpec = entitySpec.getAspectSpec(event.getAspectName());
+    if (aspectSpec == null) {
+      throw new RuntimeException(
+          String.format(
+              "Failed to retrieve Aspect Spec for entity with name %s, aspect with name %s. Cannot update indices for MCL.",
+              urn.getEntityType(), event.getAspectName()));
+    }
+
+    return Pair.of(entitySpec, aspectSpec);
+  }
+
+  private static boolean isDeletingKey(Pair<EntitySpec, AspectSpec> specPair) {
+    return specPair.getSecond().getName().equals(specPair.getFirst().getKeyAspectName());
+  }
+
   /**
    * This very important method processes {@link MetadataChangeLog} deletion events to cleanup the
    * Metadata Graph when an aspect or entity is removed.
@@ -242,28 +275,39 @@ public void updateIndexMappings(
    * <p>Note that if an entity's key aspect is deleted, the entire entity will be purged from
    * search, graph, timeseries, etc.
    *
+   * @param opContext operation's context
+   * @param specPair entity & aspect spec
    * @param event the change event to be processed.
+   * @param isDeletingKey whether the key aspect is being deleted
    */
-  private void handleDeleteChangeEvent(
-      @Nonnull OperationContext opContext, @Nonnull final MCLItem event) {
-
-    final EntitySpec entitySpec = event.getEntitySpec();
-    final Urn urn = event.getUrn();
+  private void handleNonSystemMetadataDeleteChangeEvent(
+      @Nonnull OperationContext opContext,
+      Pair<EntitySpec, AspectSpec> specPair,
+      @Nonnull final MCLItem event,
+      boolean isDeletingKey) {
 
-    AspectSpec aspectSpec = entitySpec.getAspectSpec(event.getAspectName());
-    if (aspectSpec == null) {
-      throw new RuntimeException(
-          String.format(
-              "Failed to retrieve Aspect Spec for entity with name %s, aspect with name %s. Cannot update indices for MCL.",
-              urn.getEntityType(), event.getAspectName()));
+    if (!specPair.getSecond().isTimeseries()) {
+      deleteSearchData(
+          opContext,
+          event.getUrn(),
+          specPair.getFirst().getName(),
+          specPair.getSecond(),
+          event.getRecordTemplate(),
+          isDeletingKey);
     }
+  }
 
-    RecordTemplate aspect = event.getRecordTemplate();
-    Boolean isDeletingKey = event.getAspectName().equals(entitySpec.getKeyAspectName());
-
-    if (!aspectSpec.isTimeseries()) {
-      deleteSystemMetadata(urn, aspectSpec, isDeletingKey);
-      deleteSearchData(opContext, urn, entitySpec.getName(), aspectSpec, aspect, isDeletingKey);
+  /**
+   * Handle the system metadata separately for tracing
+   *
+   * @param urn delete urn
+   * @param specPair entity & aspect spec
+   * @param isDeletingKey whether the key aspect is being deleted
+   */
+  private void handleSystemMetadataDeleteChangeEvent(
+      @Nonnull Urn urn, Pair<EntitySpec, AspectSpec> specPair, boolean isDeletingKey) {
+    if (!specPair.getSecond().isTimeseries()) {
+      deleteSystemMetadata(urn, specPair.getSecond(), isDeletingKey);
     }
   }
 
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ESSystemMetadataDAO.java b/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ESSystemMetadataDAO.java
index a5c2fb04b5ce39..594b1852740c7d 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ESSystemMetadataDAO.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ESSystemMetadataDAO.java
@@ -1,8 +1,11 @@
 package com.linkedin.metadata.systemmetadata;
 
+import static com.linkedin.metadata.systemmetadata.ElasticSearchSystemMetadataService.FIELD_ASPECT;
+import static com.linkedin.metadata.systemmetadata.ElasticSearchSystemMetadataService.FIELD_URN;
 import static com.linkedin.metadata.systemmetadata.ElasticSearchSystemMetadataService.INDEX_NAME;
 
 import com.google.common.collect.ImmutableList;
+import com.linkedin.metadata.search.elasticsearch.query.request.SearchAfterWrapper;
 import com.linkedin.metadata.search.elasticsearch.update.ESBulkProcessor;
 import com.linkedin.metadata.search.utils.ESUtils;
 import com.linkedin.metadata.utils.elasticsearch.IndexConvention;
@@ -103,8 +106,8 @@ public BulkByScrollResponse deleteByUrn(@Nonnull final String urn) {
   public BulkByScrollResponse deleteByUrnAspect(
       @Nonnull final String urn, @Nonnull final String aspect) {
     BoolQueryBuilder finalQuery = QueryBuilders.boolQuery();
-    finalQuery.must(QueryBuilders.termQuery("urn", urn));
-    finalQuery.must(QueryBuilders.termQuery("aspect", aspect));
+    finalQuery.filter(QueryBuilders.termQuery("urn", urn));
+    finalQuery.filter(QueryBuilders.termQuery("aspect", aspect));
 
     final Optional<BulkByScrollResponse> deleteResponse =
         bulkProcessor.deleteByQuery(finalQuery, indexConvention.getIndexName(INDEX_NAME));
@@ -121,7 +124,7 @@ public SearchResponse findByParams(
     BoolQueryBuilder finalQuery = QueryBuilders.boolQuery();
 
     for (String key : searchParams.keySet()) {
-      finalQuery.must(QueryBuilders.termQuery(key, searchParams.get(key)));
+      finalQuery.filter(QueryBuilders.termQuery(key, searchParams.get(key)));
     }
 
     if (!includeSoftDeleted) {
@@ -161,7 +164,7 @@ public SearchResponse findByParams(
     BoolQueryBuilder finalQuery = QueryBuilders.boolQuery();
 
     for (String key : searchParams.keySet()) {
-      finalQuery.must(QueryBuilders.termQuery(key, searchParams.get(key)));
+      finalQuery.filter(QueryBuilders.termQuery(key, searchParams.get(key)));
     }
 
     if (!includeSoftDeleted) {
@@ -186,6 +189,43 @@ public SearchResponse findByParams(
     return null;
   }
 
+  public SearchResponse scroll(
+      BoolQueryBuilder queryBuilder,
+      boolean includeSoftDeleted,
+      @Nullable String scrollId,
+      @Nullable String pitId,
+      @Nullable String keepAlive,
+      int size) {
+    SearchRequest searchRequest = new SearchRequest();
+
+    SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+
+    if (!includeSoftDeleted) {
+      queryBuilder.mustNot(QueryBuilders.termQuery("removed", "true"));
+    }
+
+    Object[] sort = null;
+    if (scrollId != null) {
+      SearchAfterWrapper searchAfterWrapper = SearchAfterWrapper.fromScrollId(scrollId);
+      sort = searchAfterWrapper.getSort();
+    }
+
+    searchSourceBuilder.query(queryBuilder);
+    ESUtils.setSearchAfter(searchSourceBuilder, sort, pitId, keepAlive);
+    searchSourceBuilder.size(size);
+    searchSourceBuilder.sort(FIELD_URN).sort(FIELD_ASPECT);
+
+    searchRequest.source(searchSourceBuilder);
+    searchRequest.indices(indexConvention.getIndexName(INDEX_NAME));
+
+    try {
+      return client.search(searchRequest, RequestOptions.DEFAULT);
+    } catch (IOException e) {
+      log.error("Error while searching by params.", e);
+    }
+    return null;
+  }
+
   public SearchResponse findByRegistry(
       String registryName, String registryVersion, boolean includeSoftDeleted, int from, int size) {
     Map<String, String> params = new HashMap<>();
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ElasticSearchSystemMetadataService.java b/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ElasticSearchSystemMetadataService.java
index fe79ba75cb1d14..dfef592b7be943 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ElasticSearchSystemMetadataService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ElasticSearchSystemMetadataService.java
@@ -1,9 +1,12 @@
 package com.linkedin.metadata.systemmetadata;
 
+import static io.datahubproject.metadata.context.TraceContext.TELEMETRY_TRACE_KEY;
+
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.ImmutableMap;
 import com.linkedin.common.urn.Urn;
+import com.linkedin.data.template.SetMode;
 import com.linkedin.metadata.run.AspectRowSummary;
 import com.linkedin.metadata.run.IngestionRunSummary;
 import com.linkedin.metadata.search.elasticsearch.indexbuilder.ESIndexBuilder;
@@ -36,6 +39,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.client.tasks.GetTaskResponse;
+import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.search.SearchHits;
 import org.opensearch.search.aggregations.bucket.filter.ParsedFilter;
@@ -56,10 +60,10 @@ public class ElasticSearchSystemMetadataService
 
   private static final String DOC_DELIMETER = "--";
   public static final String INDEX_NAME = "system_metadata_service_v1";
-  private static final String FIELD_URN = "urn";
-  private static final String FIELD_ASPECT = "aspect";
+  public static final String FIELD_URN = "urn";
+  public static final String FIELD_ASPECT = "aspect";
   private static final String FIELD_RUNID = "runId";
-  private static final String FIELD_LAST_UPDATED = "lastUpdated";
+  public static final String FIELD_LAST_UPDATED = "lastUpdated";
   private static final String FIELD_REGISTRY_NAME = "registryName";
   private static final String FIELD_REGISTRY_VERSION = "registryVersion";
   private static final Set<String> INDEX_FIELD_SET =
@@ -82,6 +86,10 @@ private String toDocument(SystemMetadata systemMetadata, String urn, String aspe
     document.put("registryName", systemMetadata.getRegistryName());
     document.put("registryVersion", systemMetadata.getRegistryVersion());
     document.put("removed", false);
+    if (systemMetadata.getProperties() != null
+        && systemMetadata.getProperties().containsKey(TELEMETRY_TRACE_KEY)) {
+      document.put(TELEMETRY_TRACE_KEY, systemMetadata.getProperties().get(TELEMETRY_TRACE_KEY));
+    }
     return document.toString();
   }
 
@@ -160,31 +168,18 @@ public List<AspectRowSummary> findByParams(
       Map<String, String> systemMetaParams, boolean includeSoftDeleted, int from, int size) {
     SearchResponse searchResponse =
         _esDAO.findByParams(systemMetaParams, includeSoftDeleted, from, size);
-    if (searchResponse != null) {
-      SearchHits hits = searchResponse.getHits();
-      List<AspectRowSummary> summaries =
-          Arrays.stream(hits.getHits())
-              .map(
-                  hit -> {
-                    Map<String, Object> values = hit.getSourceAsMap();
-                    AspectRowSummary summary = new AspectRowSummary();
-                    summary.setRunId((String) values.get(FIELD_RUNID));
-                    summary.setAspectName((String) values.get(FIELD_ASPECT));
-                    summary.setUrn((String) values.get(FIELD_URN));
-                    Object timestamp = values.get(FIELD_LAST_UPDATED);
-                    if (timestamp instanceof Long) {
-                      summary.setTimestamp((Long) timestamp);
-                    } else if (timestamp instanceof Integer) {
-                      summary.setTimestamp(Long.valueOf((Integer) timestamp));
-                    }
-                    summary.setKeyAspect(((String) values.get(FIELD_ASPECT)).endsWith("Key"));
-                    return summary;
-                  })
-              .collect(Collectors.toList());
-      return summaries;
-    } else {
-      return Collections.emptyList();
-    }
+    return toAspectRowSummary(searchResponse);
+  }
+
+  @Override
+  public List<AspectRowSummary> findAspectsByUrn(
+      @Nonnull Urn urn, @Nonnull List<String> aspects, boolean includeSoftDeleted) {
+    BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
+    boolQueryBuilder.filter(QueryBuilders.termQuery(FIELD_URN, urn.toString()));
+    boolQueryBuilder.filter(QueryBuilders.termsQuery(FIELD_ASPECT, aspects));
+    SearchResponse searchResponse =
+        _esDAO.scroll(boolQueryBuilder, includeSoftDeleted, null, null, null, aspects.size());
+    return toAspectRowSummary(searchResponse);
   }
 
   @Override
@@ -254,4 +249,32 @@ public void clear() {
     _esBulkProcessor.deleteByQuery(
         QueryBuilders.matchAllQuery(), true, _indexConvention.getIndexName(INDEX_NAME));
   }
+
+  private static List<AspectRowSummary> toAspectRowSummary(SearchResponse searchResponse) {
+    if (searchResponse != null) {
+      SearchHits hits = searchResponse.getHits();
+      return Arrays.stream(hits.getHits())
+          .map(
+              hit -> {
+                Map<String, Object> values = hit.getSourceAsMap();
+                AspectRowSummary summary = new AspectRowSummary();
+                summary.setRunId((String) values.get(FIELD_RUNID));
+                summary.setAspectName((String) values.get(FIELD_ASPECT));
+                summary.setUrn((String) values.get(FIELD_URN));
+                Object timestamp = values.get(FIELD_LAST_UPDATED);
+                if (timestamp instanceof Long) {
+                  summary.setTimestamp((Long) timestamp);
+                } else if (timestamp instanceof Integer) {
+                  summary.setTimestamp(Long.valueOf((Integer) timestamp));
+                }
+                summary.setKeyAspect(((String) values.get(FIELD_ASPECT)).endsWith("Key"));
+                summary.setTelemetryTraceId(
+                    (String) values.get(TELEMETRY_TRACE_KEY), SetMode.IGNORE_NULL);
+                return summary;
+              })
+          .collect(Collectors.toList());
+    } else {
+      return Collections.emptyList();
+    }
+  }
 }
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/SystemMetadataMappingsBuilder.java b/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/SystemMetadataMappingsBuilder.java
index 6623580548706b..9b8c50a81f8510 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/SystemMetadataMappingsBuilder.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/SystemMetadataMappingsBuilder.java
@@ -1,5 +1,7 @@
 package com.linkedin.metadata.systemmetadata;
 
+import static io.datahubproject.metadata.context.TraceContext.TELEMETRY_TRACE_KEY;
+
 import com.google.common.collect.ImmutableMap;
 import java.util.HashMap;
 import java.util.Map;
@@ -19,6 +21,7 @@ public static Map<String, Object> getMappings() {
     mappings.put("registryVersion", getMappingsForKeyword());
     mappings.put("registryName", getMappingsForKeyword());
     mappings.put("removed", getMappingsForRemoved());
+    mappings.put(TELEMETRY_TRACE_KEY, getMappingsForKeyword());
     return ImmutableMap.of("properties", mappings);
   }
 
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/timeseries/elastic/ElasticSearchTimeseriesAspectService.java b/metadata-io/src/main/java/com/linkedin/metadata/timeseries/elastic/ElasticSearchTimeseriesAspectService.java
index 4d940c229dc9af..0862077f4d1fa7 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/timeseries/elastic/ElasticSearchTimeseriesAspectService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/timeseries/elastic/ElasticSearchTimeseriesAspectService.java
@@ -3,7 +3,6 @@
 import static com.linkedin.metadata.Constants.*;
 import static com.linkedin.metadata.utils.CriterionUtils.buildCriterion;
 
-import com.codahale.metrics.Timer;
 import com.datahub.util.RecordUtils;
 import com.datahub.util.exception.ESQueryException;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -46,7 +45,6 @@
 import com.linkedin.timeseries.TimeseriesIndexSizeResult;
 import com.linkedin.util.Pair;
 import io.datahubproject.metadata.context.OperationContext;
-import io.datahubproject.metadata.context.SearchContext;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -404,19 +402,24 @@ public List<EnvelopedAspect> getAspectValues(
     searchRequest.indices(indexName);
 
     log.debug("Search request is: " + searchRequest);
-    SearchHits hits;
-    try (Timer.Context ignored =
-        MetricUtils.timer(this.getClass(), "searchAspectValues_search").time()) {
-      final SearchResponse searchResponse =
-          searchClient.search(searchRequest, RequestOptions.DEFAULT);
-      hits = searchResponse.getHits();
-    } catch (Exception e) {
-      log.error("Search query failed:", e);
-      throw new ESQueryException("Search query failed:", e);
-    }
-    return Arrays.stream(hits.getHits())
-        .map(ElasticSearchTimeseriesAspectService::parseDocument)
-        .collect(Collectors.toList());
+    return opContext.withSpan(
+        "searchAspectValues_search",
+        () -> {
+          SearchHits hits;
+          try {
+            final SearchResponse searchResponse =
+                searchClient.search(searchRequest, RequestOptions.DEFAULT);
+            hits = searchResponse.getHits();
+          } catch (Exception e) {
+            log.error("Search query failed:", e);
+            throw new ESQueryException("Search query failed:", e);
+          }
+          return Arrays.stream(hits.getHits())
+              .map(ElasticSearchTimeseriesAspectService::parseDocument)
+              .collect(Collectors.toList());
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "searchAspectValues_search"));
   }
 
   @Nonnull
@@ -681,13 +684,7 @@ public TimeseriesScrollResult scrollAspects(
 
     SearchResponse response =
         executeScrollSearchQuery(
-            opContext.getSearchContext(),
-            entityName,
-            aspectName,
-            filterQueryBuilder,
-            sortCriteria,
-            scrollId,
-            count);
+            opContext, entityName, aspectName, filterQueryBuilder, sortCriteria, scrollId, count);
     int totalCount = (int) response.getHits().getTotalHits().value;
 
     List<Pair<EnvelopedAspect, GenericTimeseriesDocument>> resultPairs =
@@ -704,7 +701,7 @@ public TimeseriesScrollResult scrollAspects(
   }
 
   private SearchResponse executeScrollSearchQuery(
-      @Nonnull SearchContext searchContext,
+      @Nonnull OperationContext opContext,
       @Nonnull final String entityName,
       @Nonnull final String aspectName,
       @Nonnull final QueryBuilder query,
@@ -729,14 +726,22 @@ private SearchResponse executeScrollSearchQuery(
     ESUtils.setSearchAfter(searchSourceBuilder, sort, null, null);
 
     searchRequest.indices(
-        searchContext.getIndexConvention().getTimeseriesAspectIndexName(entityName, aspectName));
-
-    try (Timer.Context ignored =
-        MetricUtils.timer(this.getClass(), "scrollAspects_search").time()) {
-      return searchClient.search(searchRequest, RequestOptions.DEFAULT);
-    } catch (Exception e) {
-      log.error("Search query failed", e);
-      throw new ESQueryException("Search query failed:", e);
-    }
+        opContext
+            .getSearchContext()
+            .getIndexConvention()
+            .getTimeseriesAspectIndexName(entityName, aspectName));
+
+    return opContext.withSpan(
+        "scrollAspects_search",
+        () -> {
+          try {
+            return searchClient.search(searchRequest, RequestOptions.DEFAULT);
+          } catch (Exception e) {
+            log.error("Search query failed", e);
+            throw new ESQueryException("Search query failed:", e);
+          }
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "scrollAspects_search"));
   }
 }
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/timeseries/elastic/UsageServiceUtil.java b/metadata-io/src/main/java/com/linkedin/metadata/timeseries/elastic/UsageServiceUtil.java
index 54f97f45219ac5..671b142b13150f 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/timeseries/elastic/UsageServiceUtil.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/timeseries/elastic/UsageServiceUtil.java
@@ -41,7 +41,6 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
@@ -122,25 +121,22 @@ public static UsageQueryResult query(
     long took;
 
     // 2. Get buckets.
-    timer = MetricUtils.timer(UsageServiceUtil.class, "getBuckets").time();
     UsageAggregationArray buckets =
-        getBuckets(opContext, timeseriesAspectService, filter, resource, duration);
-    took = timer.stop();
-    log.info(
-        "Usage stats for resource {} returned {} buckets in {} ms",
-        resource,
-        buckets.size(),
-        TimeUnit.NANOSECONDS.toMillis(took));
+        opContext.withSpan(
+            "getBuckets",
+            () -> getBuckets(opContext, timeseriesAspectService, filter, resource, duration),
+            MetricUtils.DROPWIZARD_NAME,
+            MetricUtils.name(UsageServiceUtil.class, "getBuckets"));
+    log.info("Usage stats for resource {} returned {} buckets", resource, buckets.size());
 
     // 3. Get aggregations.
-    timer = MetricUtils.timer(UsageServiceUtil.class, "getAggregations").time();
     UsageQueryResultAggregations aggregations =
-        getAggregations(opContext, timeseriesAspectService, filter);
-    took = timer.stop();
-    log.info(
-        "Usage stats aggregation for resource {} took {} ms",
-        resource,
-        TimeUnit.NANOSECONDS.toMillis(took));
+        opContext.withSpan(
+            "getAggregations",
+            () -> getAggregations(opContext, timeseriesAspectService, filter),
+            MetricUtils.DROPWIZARD_NAME,
+            MetricUtils.name(UsageServiceUtil.class, "getAggregations"));
+    log.info("Usage stats aggregation for resource {}", resource);
 
     // 4. Compute totalSqlQuery count from the buckets itself.
     // We want to avoid issuing an additional query with a sum aggregation.
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/trace/KafkaTraceReader.java b/metadata-io/src/main/java/com/linkedin/metadata/trace/KafkaTraceReader.java
new file mode 100644
index 00000000000000..9ce8a1b91e66c7
--- /dev/null
+++ b/metadata-io/src/main/java/com/linkedin/metadata/trace/KafkaTraceReader.java
@@ -0,0 +1,460 @@
+package com.linkedin.metadata.trace;
+
+import static io.datahubproject.metadata.context.TraceContext.TELEMETRY_TRACE_KEY;
+
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.metadata.systemmetadata.TraceStorageStatus;
+import com.linkedin.metadata.systemmetadata.TraceWriteStatus;
+import com.linkedin.mxe.SystemMetadata;
+import com.linkedin.util.Pair;
+import java.time.Duration;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import lombok.experimental.SuperBuilder;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.ListConsumerGroupOffsetsResult;
+import org.apache.kafka.clients.admin.TopicDescription;
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.OffsetAndMetadata;
+import org.apache.kafka.clients.consumer.OffsetAndTimestamp;
+import org.apache.kafka.clients.producer.internals.DefaultPartitioner;
+import org.apache.kafka.common.Cluster;
+import org.apache.kafka.common.Node;
+import org.apache.kafka.common.PartitionInfo;
+import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.protocol.types.SchemaException;
+
+@Slf4j
+@SuperBuilder
+public abstract class KafkaTraceReader<T extends RecordTemplate> {
+  private final AdminClient adminClient;
+  private final Supplier<Consumer<String, GenericRecord>> consumerSupplier;
+  private final int pollDurationMs;
+  private final int pollMaxAttempts;
+
+  @Nonnull private final ExecutorService executorService;
+  private final long timeoutSeconds;
+
+  private final Cache<String, TopicPartition> topicPartitionCache =
+      Caffeine.newBuilder()
+          .maximumSize(1_000) // Maximum number of entries
+          .expireAfterWrite(Duration.ofHours(1)) // expire entries after 1 hour
+          .build();
+  private final Cache<TopicPartition, OffsetAndMetadata> offsetCache =
+      Caffeine.newBuilder()
+          .maximumSize(100) // unlikely to have more than 100 partitions
+          .expireAfterWrite(Duration.ofMinutes(5)) // Shorter expiry for offsets
+          .build();
+
+  public KafkaTraceReader(
+      AdminClient adminClient,
+      Supplier<Consumer<String, GenericRecord>> consumerSupplier,
+      int pollDurationMillis,
+      int pollMaxAttempts,
+      ExecutorService executorService,
+      long timeoutSeconds) {
+    this.adminClient = adminClient;
+    this.consumerSupplier = consumerSupplier;
+    this.pollDurationMs = pollDurationMillis;
+    this.pollMaxAttempts = pollMaxAttempts;
+    this.executorService = executorService;
+    this.timeoutSeconds = timeoutSeconds;
+  }
+
+  @Nonnull
+  protected abstract String getTopicName();
+
+  @Nullable
+  protected abstract String getConsumerGroupId();
+
+  public abstract Optional<T> read(@Nullable GenericRecord genericRecord);
+
+  protected abstract Optional<Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>>
+      matchConsumerRecord(
+          ConsumerRecord<String, GenericRecord> consumerRecord, String traceId, String aspectName);
+
+  /**
+   * Determines the write status of a trace by comparing consumer offset with message offset.
+   *
+   * @return PENDING if the message exists but hasn't been consumed yet, UNKNOWN if no consumer
+   *     offset exists, ERROR in other cases
+   */
+  public Map<Urn, Map<String, TraceStorageStatus>> tracePendingStatuses(
+      Map<Urn, List<String>> urnAspectPairs, String traceId, Long traceTimestampMillis) {
+    return tracePendingStatuses(urnAspectPairs, traceId, traceTimestampMillis, false);
+  }
+
+  public Map<Urn, Map<String, TraceStorageStatus>> tracePendingStatuses(
+      Map<Urn, List<String>> urnAspectPairs,
+      String traceId,
+      Long traceTimestampMillis,
+      boolean skipCache) {
+
+    List<CompletableFuture<Map.Entry<Urn, Map<String, TraceStorageStatus>>>> futures =
+        urnAspectPairs.entrySet().stream()
+            .map(
+                entry ->
+                    CompletableFuture.supplyAsync(
+                        () -> {
+                          try {
+                            Map<String, TraceStorageStatus> result =
+                                tracePendingStatuses(
+                                    entry.getKey(),
+                                    entry.getValue(),
+                                    traceId,
+                                    traceTimestampMillis,
+                                    skipCache);
+                            return Map.entry(entry.getKey(), result);
+                          } catch (Exception e) {
+                            log.error(
+                                "Error processing trace status for URN: {}", entry.getKey(), e);
+                            return Map.entry(
+                                entry.getKey(), Collections.<String, TraceStorageStatus>emptyMap());
+                          }
+                        },
+                        executorService))
+            .collect(Collectors.toList());
+
+    try {
+      List<Map.Entry<Urn, Map<String, TraceStorageStatus>>> results =
+          CompletableFuture.allOf(futures.toArray(new CompletableFuture[futures.size()]))
+              .thenApply(
+                  v -> futures.stream().map(CompletableFuture::join).collect(Collectors.toList()))
+              .get(timeoutSeconds, TimeUnit.SECONDS);
+
+      return results.stream()
+          .collect(
+              Collectors.toMap(
+                  Map.Entry::getKey, Map.Entry::getValue, (existing, replacement) -> existing));
+    } catch (Exception e) {
+      log.error("Error processing parallel trace status requests", e);
+      throw new RuntimeException("Failed to process parallel trace status requests", e);
+    }
+  }
+
+  /**
+   * Find messages in the kafka topic by urn, aspect names, and trace id using the timestamp to seek
+   * to the expected location.
+   *
+   * @return Map of aspect name to matching record pair, containing only the aspects that were found
+   */
+  public Map<Urn, Map<String, Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>>>
+      findMessages(
+          Map<Urn, List<String>> urnAspectPairs, String traceId, Long traceTimestampMillis) {
+
+    List<
+            CompletableFuture<
+                Map.Entry<
+                    Urn, Map<String, Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>>>>>
+        futures =
+            urnAspectPairs.entrySet().stream()
+                .map(
+                    entry ->
+                        CompletableFuture.supplyAsync(
+                            () -> {
+                              try {
+                                Map<
+                                        String,
+                                        Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>>
+                                    result =
+                                        findMessages(
+                                            entry.getKey(),
+                                            entry.getValue(),
+                                            traceId,
+                                            traceTimestampMillis);
+                                return Map.entry(entry.getKey(), result);
+                              } catch (Exception e) {
+                                log.error("Error processing trace for URN: {}", entry.getKey(), e);
+                                return Map.entry(
+                                    entry.getKey(),
+                                    Collections
+                                        .<String,
+                                            Pair<
+                                                ConsumerRecord<String, GenericRecord>,
+                                                SystemMetadata>>
+                                            emptyMap());
+                              }
+                            },
+                            executorService))
+                .collect(Collectors.toList());
+
+    try {
+      List<Map.Entry<Urn, Map<String, Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>>>>
+          results =
+              CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
+                  .thenApply(
+                      v ->
+                          futures.stream()
+                              .map(CompletableFuture::join)
+                              .collect(Collectors.toList()))
+                  .get(timeoutSeconds, TimeUnit.SECONDS);
+
+      return results.stream()
+          .collect(
+              Collectors.toMap(
+                  Map.Entry::getKey, Map.Entry::getValue, (existing, replacement) -> existing));
+    } catch (Exception e) {
+      log.error("Error processing parallel trace requests", e);
+      throw new RuntimeException("Failed to process parallel trace requests", e);
+    }
+  }
+
+  private Map<String, TraceStorageStatus> tracePendingStatuses(
+      Urn urn,
+      Collection<String> aspectNames,
+      String traceId,
+      Long traceTimestampMillis,
+      boolean skipCache) {
+    try {
+      TopicPartition topicPartition = getTopicPartition(urn);
+      Optional<OffsetAndMetadata> offsetMetadata = getOffsetAndMetadata(topicPartition, skipCache);
+      if (offsetMetadata.isEmpty()) {
+        log.warn("No consumer offset to compare with.");
+        return aspectNames.stream()
+            .collect(
+                Collectors.toMap(
+                    aspectName -> aspectName,
+                    aspectName ->
+                        TraceStorageStatus.ok(
+                            TraceWriteStatus.UNKNOWN, "Missing consumer offsets.")));
+      }
+
+      Map<String, Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>> messages =
+          findMessages(urn, aspectNames, traceId, traceTimestampMillis);
+
+      return aspectNames.stream()
+          .collect(
+              Collectors.toMap(
+                  aspectName -> aspectName,
+                  aspectName -> {
+                    Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata> message =
+                        messages.get(aspectName);
+                    if (message != null
+                        && offsetMetadata.get().offset() < message.getFirst().offset()) {
+                      return TraceStorageStatus.ok(
+                          TraceWriteStatus.PENDING, "Consumer has not processed offset.");
+                    }
+                    return TraceStorageStatus.fail(
+                        TraceWriteStatus.ERROR, "Consumer has processed past the offset.");
+                  }));
+    } catch (ExecutionException | InterruptedException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * Get the offset metadata for a specific TopicPartition from the consumer group. This method is
+   * now the primary interface for offset lookup and uses caching.
+   */
+  private Optional<OffsetAndMetadata> getOffsetAndMetadata(
+      TopicPartition topicPartition, boolean skipCache) {
+    if (skipCache) {
+      offsetCache.invalidate(topicPartition);
+    }
+
+    return Optional.ofNullable(
+        offsetCache.get(
+            topicPartition,
+            tp -> {
+              final String consumerGroupId = Objects.requireNonNull(getConsumerGroupId());
+
+              try {
+                ListConsumerGroupOffsetsResult offsetsResult =
+                    adminClient.listConsumerGroupOffsets(consumerGroupId);
+
+                if (offsetsResult == null) {
+                  log.error("Failed to get consumer group offsets for group: {}", consumerGroupId);
+                  return null;
+                }
+
+                Map<TopicPartition, OffsetAndMetadata> offsets =
+                    offsetsResult.partitionsToOffsetAndMetadata().get();
+
+                if (offsets == null) {
+                  log.error("Null offsets returned for consumer group: {}", consumerGroupId);
+                  return null;
+                }
+
+                OffsetAndMetadata offsetAndMetadata = offsets.get(tp);
+                if (offsetAndMetadata == null) {
+                  log.warn(
+                      "No committed offset found for Topic: {}, Partition: {}, Group: {}",
+                      tp.topic(),
+                      tp.partition(),
+                      consumerGroupId);
+                  return null;
+                }
+
+                log.debug(
+                    "Found offset metadata {} for Topic: {}, Partition: {}, Group: {}",
+                    offsetAndMetadata,
+                    tp.topic(),
+                    tp.partition(),
+                    consumerGroupId);
+
+                return offsetAndMetadata;
+              } catch (SchemaException e) {
+                log.error("Schema error when fetching consumer group offsets", e);
+                return null;
+              } catch (Exception e) {
+                log.error("Error fetching consumer group offsets", e);
+                return null;
+              }
+            }));
+  }
+
+  private Map<String, Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>> findMessages(
+      Urn urn, Collection<String> aspectNames, String traceId, Long traceTimestampMillis)
+      throws ExecutionException, InterruptedException {
+
+    TopicPartition topicPartition = getTopicPartition(urn);
+
+    try (Consumer<String, GenericRecord> consumer = consumerSupplier.get()) {
+      // Assign the partition we want to read from
+      consumer.assign(Collections.singleton(topicPartition));
+
+      // Get offset for timestamp
+      OffsetAndTimestamp offsetAndTimestamp =
+          getOffsetByTime(consumer, topicPartition, traceTimestampMillis);
+
+      if (offsetAndTimestamp == null) {
+        log.debug(
+            "No offset found for timestamp {} in partition {}",
+            traceTimestampMillis,
+            topicPartition);
+        return Collections.emptyMap();
+      }
+
+      // Seek to the offset for the timestamp
+      consumer.seek(topicPartition, offsetAndTimestamp.offset());
+      log.debug(
+          "Seeking to timestamp-based offset {} for partition {}",
+          offsetAndTimestamp.offset(),
+          topicPartition);
+
+      // Poll with a maximum number of attempts
+      int attempts = 0;
+      long lastProcessedOffset = -1;
+      Map<String, Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>> results =
+          new HashMap<>();
+
+      while (attempts < pollMaxAttempts && results.size() < aspectNames.size()) {
+        var records = consumer.poll(java.time.Duration.ofMillis(pollDurationMs));
+        attempts++;
+
+        if (records.isEmpty()) {
+          break;
+        }
+
+        // Check if we're making progress
+        long currentOffset = consumer.position(topicPartition);
+        if (currentOffset == lastProcessedOffset) {
+          break;
+        }
+        lastProcessedOffset = currentOffset;
+
+        // Process records for each aspect name we haven't found yet
+        for (String aspectName : aspectNames) {
+          if (!results.containsKey(aspectName)) {
+            var matchingRecord =
+                records.records(topicPartition).stream()
+                    .filter(record -> record.key().equals(urn.toString()))
+                    .flatMap(record -> matchConsumerRecord(record, traceId, aspectName).stream())
+                    .findFirst();
+
+            matchingRecord.ifPresent(pair -> results.put(aspectName, pair));
+          }
+        }
+      }
+
+      return results;
+    }
+  }
+
+  protected static boolean traceIdMatch(@Nullable SystemMetadata systemMetadata, String traceId) {
+    return systemMetadata != null
+        && systemMetadata.getProperties() != null
+        && traceId.equals(systemMetadata.getProperties().get(TELEMETRY_TRACE_KEY));
+  }
+
+  private TopicPartition getTopicPartition(Urn urn) {
+    return topicPartitionCache.get(
+        urn.toString(),
+        key -> {
+          try {
+            DefaultPartitioner partitioner = new DefaultPartitioner();
+
+            TopicDescription topicDescription =
+                adminClient
+                    .describeTopics(Collections.singletonList(getTopicName()))
+                    .all()
+                    .get()
+                    .get(getTopicName());
+
+            if (topicDescription == null) {
+              throw new IllegalStateException("Topic " + getTopicName() + " not found");
+            }
+
+            List<PartitionInfo> partitions =
+                topicDescription.partitions().stream()
+                    .map(
+                        p ->
+                            new PartitionInfo(
+                                getTopicName(),
+                                p.partition(),
+                                p.leader(),
+                                p.replicas().toArray(new Node[0]),
+                                p.isr().toArray(new Node[0]),
+                                p.replicas().toArray(new Node[0])))
+                    .collect(Collectors.toList());
+
+            List<Node> nodes =
+                partitions.stream()
+                    .map(PartitionInfo::leader)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList());
+
+            Cluster cluster =
+                new Cluster(
+                    null, nodes, partitions, Collections.emptySet(), Collections.emptySet());
+
+            int partition =
+                partitioner.partition(getTopicName(), key, key.getBytes(), null, null, cluster);
+
+            return new TopicPartition(getTopicName(), partition);
+          } catch (InterruptedException | ExecutionException e) {
+            throw new RuntimeException("Failed to get topic partition for " + key, e);
+          }
+        });
+  }
+
+  private static OffsetAndTimestamp getOffsetByTime(
+      Consumer<String, GenericRecord> consumer,
+      TopicPartition topicPartition,
+      Long traceTimestampMillis) {
+    // If we have a timestamp, first seek to that approximate location
+    Map<TopicPartition, Long> timestampsToSearch =
+        Collections.singletonMap(topicPartition, traceTimestampMillis);
+
+    return consumer.offsetsForTimes(timestampsToSearch).get(topicPartition);
+  }
+}
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/trace/MCLTraceReader.java b/metadata-io/src/main/java/com/linkedin/metadata/trace/MCLTraceReader.java
new file mode 100644
index 00000000000000..98da8f87d3b5ad
--- /dev/null
+++ b/metadata-io/src/main/java/com/linkedin/metadata/trace/MCLTraceReader.java
@@ -0,0 +1,43 @@
+package com.linkedin.metadata.trace;
+
+import com.linkedin.metadata.EventUtils;
+import com.linkedin.mxe.MetadataChangeLog;
+import com.linkedin.mxe.SystemMetadata;
+import com.linkedin.util.Pair;
+import java.io.IOException;
+import java.util.Optional;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import lombok.Getter;
+import lombok.experimental.SuperBuilder;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+
+@Getter
+@SuperBuilder
+public class MCLTraceReader extends KafkaTraceReader<MetadataChangeLog> {
+  @Nonnull private final String topicName;
+  @Nullable private final String consumerGroupId;
+
+  @Override
+  public Optional<MetadataChangeLog> read(@Nullable GenericRecord genericRecord) {
+    try {
+      return Optional.ofNullable(
+          genericRecord == null ? null : EventUtils.avroToPegasusMCL(genericRecord));
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Override
+  protected Optional<Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>>
+      matchConsumerRecord(
+          ConsumerRecord<String, GenericRecord> consumerRecord, String traceId, String aspectName) {
+    return read(consumerRecord.value())
+        .filter(
+            event ->
+                traceIdMatch(event.getSystemMetadata(), traceId)
+                    && aspectName.equals(event.getAspectName()))
+        .map(event -> Pair.of(consumerRecord, event.getSystemMetadata()));
+  }
+}
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/trace/MCPFailedTraceReader.java b/metadata-io/src/main/java/com/linkedin/metadata/trace/MCPFailedTraceReader.java
new file mode 100644
index 00000000000000..bb3520d6630d84
--- /dev/null
+++ b/metadata-io/src/main/java/com/linkedin/metadata/trace/MCPFailedTraceReader.java
@@ -0,0 +1,45 @@
+package com.linkedin.metadata.trace;
+
+import com.linkedin.metadata.EventUtils;
+import com.linkedin.mxe.FailedMetadataChangeProposal;
+import com.linkedin.mxe.SystemMetadata;
+import com.linkedin.util.Pair;
+import java.io.IOException;
+import java.util.Optional;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import lombok.Getter;
+import lombok.experimental.SuperBuilder;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+
+@Getter
+@SuperBuilder
+public class MCPFailedTraceReader extends KafkaTraceReader<FailedMetadataChangeProposal> {
+  @Nonnull private final String topicName;
+  @Nullable private final String consumerGroupId;
+
+  @Override
+  public Optional<FailedMetadataChangeProposal> read(@Nullable GenericRecord genericRecord) {
+    try {
+      return Optional.ofNullable(
+          genericRecord == null ? null : EventUtils.avroToPegasusFailedMCP(genericRecord));
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Override
+  protected Optional<Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>>
+      matchConsumerRecord(
+          ConsumerRecord<String, GenericRecord> consumerRecord, String traceId, String aspectName) {
+    return read(consumerRecord.value())
+        .filter(
+            event ->
+                traceIdMatch(event.getMetadataChangeProposal().getSystemMetadata(), traceId)
+                    && aspectName.equals(event.getMetadataChangeProposal().getAspectName()))
+        .map(
+            event ->
+                Pair.of(consumerRecord, event.getMetadataChangeProposal().getSystemMetadata()));
+  }
+}
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/trace/MCPTraceReader.java b/metadata-io/src/main/java/com/linkedin/metadata/trace/MCPTraceReader.java
new file mode 100644
index 00000000000000..99781e80416de9
--- /dev/null
+++ b/metadata-io/src/main/java/com/linkedin/metadata/trace/MCPTraceReader.java
@@ -0,0 +1,43 @@
+package com.linkedin.metadata.trace;
+
+import com.linkedin.metadata.EventUtils;
+import com.linkedin.mxe.MetadataChangeProposal;
+import com.linkedin.mxe.SystemMetadata;
+import com.linkedin.util.Pair;
+import java.io.IOException;
+import java.util.Optional;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import lombok.Getter;
+import lombok.experimental.SuperBuilder;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+
+@Getter
+@SuperBuilder
+public class MCPTraceReader extends KafkaTraceReader<MetadataChangeProposal> {
+  @Nonnull private final String topicName;
+  @Nullable private final String consumerGroupId;
+
+  @Override
+  public Optional<MetadataChangeProposal> read(@Nullable GenericRecord genericRecord) {
+    try {
+      return Optional.ofNullable(
+          genericRecord == null ? null : EventUtils.avroToPegasusMCP(genericRecord));
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Override
+  protected Optional<Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>>
+      matchConsumerRecord(
+          ConsumerRecord<String, GenericRecord> consumerRecord, String traceId, String aspectName) {
+    return read(consumerRecord.value())
+        .filter(
+            event ->
+                traceIdMatch(event.getSystemMetadata(), traceId)
+                    && aspectName.equals(event.getAspectName()))
+        .map(event -> Pair.of(consumerRecord, event.getSystemMetadata()));
+  }
+}
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/trace/TraceServiceImpl.java b/metadata-io/src/main/java/com/linkedin/metadata/trace/TraceServiceImpl.java
new file mode 100644
index 00000000000000..51e30bd6f6658d
--- /dev/null
+++ b/metadata-io/src/main/java/com/linkedin/metadata/trace/TraceServiceImpl.java
@@ -0,0 +1,484 @@
+package com.linkedin.metadata.trace;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.entity.EntityResponse;
+import com.linkedin.entity.EnvelopedAspect;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.models.EntitySpec;
+import com.linkedin.metadata.models.registry.EntityRegistry;
+import com.linkedin.metadata.run.AspectRowSummary;
+import com.linkedin.metadata.systemmetadata.SystemMetadataService;
+import com.linkedin.metadata.systemmetadata.TraceService;
+import com.linkedin.metadata.systemmetadata.TraceStatus;
+import com.linkedin.metadata.systemmetadata.TraceStorageStatus;
+import com.linkedin.metadata.systemmetadata.TraceWriteStatus;
+import com.linkedin.mxe.FailedMetadataChangeProposal;
+import com.linkedin.mxe.SystemMetadata;
+import com.linkedin.util.Pair;
+import io.datahubproject.metadata.context.OperationContext;
+import io.datahubproject.metadata.context.TraceContext;
+import io.datahubproject.metadata.context.TraceIdGenerator;
+import io.datahubproject.metadata.exception.TraceException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import lombok.Builder;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+
+@Builder
+@Slf4j
+public class TraceServiceImpl implements TraceService {
+  private final EntityRegistry entityRegistry;
+  private final SystemMetadataService systemMetadataService;
+  private final EntityService<?> entityService;
+  private final MCPTraceReader mcpTraceReader;
+  private final MCPFailedTraceReader mcpFailedTraceReader;
+  private final MCLTraceReader mclVersionedTraceReader;
+  private final MCLTraceReader mclTimeseriesTraceReader;
+
+  public TraceServiceImpl(
+      EntityRegistry entityRegistry,
+      SystemMetadataService systemMetadataService,
+      EntityService<?> entityService,
+      MCPTraceReader mcpTraceReader,
+      MCPFailedTraceReader mcpFailedTraceReader,
+      MCLTraceReader mclVersionedTraceReader,
+      MCLTraceReader mclTimeseriesTraceReader) {
+    this.entityRegistry = entityRegistry;
+    this.systemMetadataService = systemMetadataService;
+    this.entityService = entityService;
+    this.mcpTraceReader = mcpTraceReader;
+    this.mcpFailedTraceReader = mcpFailedTraceReader;
+    this.mclVersionedTraceReader = mclVersionedTraceReader;
+    this.mclTimeseriesTraceReader = mclTimeseriesTraceReader;
+  }
+
+  @Nonnull
+  @Override
+  public Map<Urn, Map<String, TraceStatus>> trace(
+      @Nonnull OperationContext opContext,
+      @Nonnull String traceId,
+      @Nonnull Map<Urn, List<String>> aspectNames,
+      boolean onlyIncludeErrors,
+      boolean detailed,
+      boolean skipCache) {
+
+    long traceTimestampMillis = TraceIdGenerator.getTimestampMillis(traceId);
+
+    // Get primary status for all URNs
+    Map<Urn, LinkedHashMap<String, TraceStorageStatus>> primaryStatuses =
+        tracePrimaryInParallel(
+            opContext, traceId, traceTimestampMillis, aspectNames, detailed, skipCache);
+
+    // Get search status for all URNs using primary results
+    Map<Urn, LinkedHashMap<String, TraceStorageStatus>> searchStatuses =
+        traceSearchInParallel(
+            opContext, traceId, traceTimestampMillis, aspectNames, primaryStatuses, skipCache);
+
+    // Merge and filter results for each URN
+    Map<Urn, Map<String, TraceStatus>> mergedResults =
+        aspectNames.keySet().stream()
+            .collect(
+                Collectors.toMap(
+                    urn -> urn,
+                    urn ->
+                        mergeStatus(
+                            primaryStatuses.getOrDefault(urn, new LinkedHashMap<>()),
+                            searchStatuses.getOrDefault(urn, new LinkedHashMap<>()),
+                            onlyIncludeErrors)));
+
+    // Remove URNs with empty aspect maps (when filtering for errors)
+    return mergedResults.entrySet().stream()
+        .filter(entry -> !entry.getValue().isEmpty())
+        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+  }
+
+  private Map<Urn, LinkedHashMap<String, TraceStorageStatus>> tracePrimaryInParallel(
+      @Nonnull OperationContext opContext,
+      @Nonnull String traceId,
+      long traceTimestampMillis,
+      @Nonnull Map<Urn, List<String>> aspectNames,
+      boolean detailed,
+      boolean skipCache) {
+
+    // Group aspects by whether they are timeseries
+    Map<Urn, Map<String, TraceStorageStatus>> timeseriesResults = new HashMap<>();
+    Map<Urn, Set<String>> nonTimeseriesAspects = new HashMap<>();
+
+    for (Map.Entry<Urn, List<String>> entry : aspectNames.entrySet()) {
+      Urn urn = entry.getKey();
+      EntitySpec entitySpec = entityRegistry.getEntitySpec(urn.getEntityType());
+
+      Map<String, TraceStorageStatus> timeseriesStatuses = new LinkedHashMap<>();
+      Set<String> remainingAspects = new HashSet<>();
+
+      for (String aspectName : entry.getValue()) {
+        if (entitySpec.getAspectSpec(aspectName).isTimeseries()) {
+          timeseriesStatuses.put(aspectName, TraceStorageStatus.NO_OP);
+        } else {
+          remainingAspects.add(aspectName);
+        }
+      }
+
+      if (!timeseriesStatuses.isEmpty()) {
+        timeseriesResults.put(urn, timeseriesStatuses);
+      }
+      if (!remainingAspects.isEmpty()) {
+        nonTimeseriesAspects.put(urn, remainingAspects);
+      }
+    }
+
+    // Process non-timeseries aspects using SQL
+    Map<Urn, Map<String, TraceStorageStatus>> sqlResults = new HashMap<>();
+    if (!nonTimeseriesAspects.isEmpty()) {
+      try {
+        Map<Urn, EntityResponse> responses =
+            entityService.getEntitiesV2(
+                opContext,
+                nonTimeseriesAspects.keySet().iterator().next().getEntityType(),
+                nonTimeseriesAspects.keySet(),
+                nonTimeseriesAspects.values().stream()
+                    .flatMap(Collection::stream)
+                    .collect(Collectors.toSet()),
+                false);
+
+        for (Map.Entry<Urn, EntityResponse> entry : responses.entrySet()) {
+          Map<String, TraceStorageStatus> aspectStatuses = new LinkedHashMap<>();
+          for (Map.Entry<String, EnvelopedAspect> aspectEntry :
+              entry.getValue().getAspects().entrySet()) {
+            long createdOnMillis = aspectEntry.getValue().getCreated().getTime();
+            SystemMetadata systemMetadata = aspectEntry.getValue().getSystemMetadata();
+            String systemTraceId = extractTraceId(systemMetadata);
+            Optional<Long> aspectLastUpdated = extractLastUpdated(systemMetadata);
+            String aspectName = aspectEntry.getKey();
+
+            if (traceId.equals(systemTraceId)) {
+              aspectStatuses.put(aspectName, TraceStorageStatus.ok(TraceWriteStatus.ACTIVE_STATE));
+            } else if (traceTimestampMillis <= extractTimestamp(systemTraceId, createdOnMillis)) {
+              aspectStatuses.put(
+                  aspectName, TraceStorageStatus.ok(TraceWriteStatus.HISTORIC_STATE));
+            } else if (createdOnMillis < traceTimestampMillis
+                && traceTimestampMillis < aspectLastUpdated.orElse(traceTimestampMillis)) {
+              aspectStatuses.put(aspectName, TraceStorageStatus.ok(TraceWriteStatus.NO_OP));
+            }
+          }
+          sqlResults.put(entry.getKey(), aspectStatuses);
+        }
+      } catch (Exception e) {
+        log.error("Error getting entities", e);
+      }
+    }
+
+    // Account for sql results
+    Map<Urn, List<String>> remainingAspects = new HashMap<>();
+    for (Map.Entry<Urn, Set<String>> entry : nonTimeseriesAspects.entrySet()) {
+      Set<String> foundAspects =
+          sqlResults.getOrDefault(entry.getKey(), Collections.emptyMap()).keySet();
+      Set<String> remaining = new HashSet<>(entry.getValue());
+      remaining.removeAll(foundAspects);
+      if (!remaining.isEmpty()) {
+        remainingAspects.put(entry.getKey(), new ArrayList<>(remaining));
+      }
+    }
+
+    // Get remaining aspects from Kafka
+    Map<Urn, Map<String, TraceStorageStatus>> kafkaResults =
+        mcpTraceReader.tracePendingStatuses(
+            remainingAspects, traceId, traceTimestampMillis, skipCache);
+
+    // Merge all results
+    Map<Urn, LinkedHashMap<String, TraceStorageStatus>> finalResults = new HashMap<>();
+    for (Urn urn : aspectNames.keySet()) {
+      LinkedHashMap<String, TraceStorageStatus> merged = new LinkedHashMap<>();
+      merged.putAll(timeseriesResults.getOrDefault(urn, Collections.emptyMap()));
+      merged.putAll(sqlResults.getOrDefault(urn, Collections.emptyMap()));
+      merged.putAll(kafkaResults.getOrDefault(urn, Collections.emptyMap()));
+      finalResults.put(urn, merged);
+    }
+
+    if (detailed) {
+      handleFailedMCP(opContext, finalResults, traceId, traceTimestampMillis);
+    }
+
+    return finalResults;
+  }
+
+  private Optional<Long> extractLastUpdated(@Nullable SystemMetadata systemMetadata) {
+    return Optional.ofNullable(systemMetadata)
+        .flatMap(sysMeta -> Optional.ofNullable(sysMeta.getLastObserved()));
+  }
+
+  private void handleFailedMCP(
+      @Nonnull OperationContext opContext,
+      Map<Urn, LinkedHashMap<String, TraceStorageStatus>> finalResults,
+      @Nonnull String traceId,
+      long traceTimestampMillis) {
+    // Create a map of URNs and aspects that need to be checked in the failed topic
+    Map<Urn, List<String>> aspectsToCheck = new HashMap<>();
+
+    // Filter for aspects with ERROR, NO_OP, or UNKNOWN status that might be in the failed topic
+    for (Map.Entry<Urn, LinkedHashMap<String, TraceStorageStatus>> entry :
+        finalResults.entrySet()) {
+      Urn urn = entry.getKey();
+      EntitySpec entitySpec = entityRegistry.getEntitySpec(urn.getEntityType());
+
+      /*
+       * ERROR - to fetch exception
+       * NO_OP - to validate there wasn't a failure during an expected NO_OP
+       * UNKNOWN - ambiguous case resolution
+       */
+      List<String> aspectsToVerify =
+          entry.getValue().entrySet().stream()
+              .filter(aspect -> !entitySpec.getAspectSpec(aspect.getKey()).isTimeseries())
+              .filter(
+                  aspect ->
+                      Set.of(
+                              TraceWriteStatus.ERROR,
+                              TraceWriteStatus.NO_OP,
+                              TraceWriteStatus.UNKNOWN)
+                          .contains(aspect.getValue().getWriteStatus()))
+              .map(Map.Entry::getKey)
+              .collect(Collectors.toList());
+
+      if (!aspectsToVerify.isEmpty()) {
+        aspectsToCheck.put(entry.getKey(), aspectsToVerify);
+      }
+    }
+
+    // If there are no aspects to check, return early
+    if (aspectsToCheck.isEmpty()) {
+      return;
+    }
+
+    try {
+      // Find messages in the failed topic for these URNs and aspects
+      Map<Urn, Map<String, Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>>>
+          failedMessages =
+              mcpFailedTraceReader.findMessages(aspectsToCheck, traceId, traceTimestampMillis);
+
+      // Update the status for any aspects found in the failed topic
+      for (Map.Entry<Urn, Map<String, Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>>>
+          entry : failedMessages.entrySet()) {
+        Urn urn = entry.getKey();
+        LinkedHashMap<String, TraceStorageStatus> urnStatuses = finalResults.get(urn);
+
+        if (urnStatuses != null) {
+          for (Map.Entry<String, Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>>
+              aspectEntry : entry.getValue().entrySet()) {
+            String aspectName = aspectEntry.getKey();
+
+            // If we found the message in the failed topic, update its status (possible transition
+            // from UNKNOWN)
+            TraceStorageStatus.TraceStorageStatusBuilder builder =
+                TraceStorageStatus.builder().writeStatus(TraceWriteStatus.ERROR);
+
+            // Populate the exception if possible
+            mcpFailedTraceReader
+                .read(aspectEntry.getValue().getFirst().value())
+                .ifPresent(
+                    failedMCP ->
+                        builder.writeExceptions(extractTraceExceptions(opContext, failedMCP)));
+
+            urnStatuses.put(aspectName, builder.build());
+          }
+        }
+      }
+    } catch (Exception e) {
+      log.error("Error processing failed MCP messages", e);
+    }
+  }
+
+  private Map<Urn, LinkedHashMap<String, TraceStorageStatus>> traceSearchInParallel(
+      @Nonnull OperationContext opContext,
+      @Nonnull String traceId,
+      long traceTimestampMillis,
+      @Nonnull Map<Urn, List<String>> aspectNames,
+      @Nonnull Map<Urn, LinkedHashMap<String, TraceStorageStatus>> primaryStatuses,
+      boolean skipCache) {
+
+    Map<Urn, List<String>> aspectsToResolve = new HashMap<>();
+    Map<Urn, LinkedHashMap<String, TraceStorageStatus>> finalResults = new HashMap<>();
+
+    // 1. Consider status of primary storage write
+    for (Map.Entry<Urn, List<String>> entry : aspectNames.entrySet()) {
+      Urn urn = entry.getKey();
+      EntitySpec entitySpec = entityRegistry.getEntitySpec(urn.getEntityType());
+      LinkedHashMap<String, TraceStorageStatus> finalResponse = new LinkedHashMap<>();
+      List<String> remaining = new ArrayList<>();
+
+      Map<String, TraceStorageStatus> primaryStatus =
+          primaryStatuses.getOrDefault(urn, new LinkedHashMap<>());
+
+      for (String aspectName : entry.getValue()) {
+        TraceWriteStatus status = primaryStatus.get(aspectName).getWriteStatus();
+        if (status == TraceWriteStatus.PENDING) {
+          finalResponse.put(
+              aspectName,
+              TraceStorageStatus.ok(TraceWriteStatus.PENDING, "Pending primary storage write."));
+        } else if (status == TraceWriteStatus.NO_OP) {
+          if (entitySpec.getAspectSpec(aspectName).isTimeseries()) {
+            finalResponse.put(
+                aspectName, TraceStorageStatus.ok(TraceWriteStatus.TRACE_NOT_IMPLEMENTED));
+          } else {
+            finalResponse.put(aspectName, TraceStorageStatus.NO_OP);
+          }
+        } else if (status == TraceWriteStatus.ERROR) {
+          finalResponse.put(
+              aspectName,
+              TraceStorageStatus.fail(TraceWriteStatus.ERROR, "Primary storage write failed."));
+        } else if (status == TraceWriteStatus.TRACE_NOT_IMPLEMENTED
+            || status == TraceWriteStatus.UNKNOWN) {
+          finalResponse.put(
+              aspectName,
+              TraceStorageStatus.ok(
+                  TraceWriteStatus.UNKNOWN, "Primary storage write indeterminate."));
+        } else {
+          remaining.add(aspectName);
+        }
+      }
+
+      if (!remaining.isEmpty()) {
+        aspectsToResolve.put(urn, remaining);
+      }
+      if (!finalResponse.isEmpty()) {
+        finalResults.put(urn, finalResponse);
+      }
+    }
+
+    // 2. Check implied search write using system metadata
+    if (!aspectsToResolve.isEmpty()) {
+      // Get system metadata & group by URN
+      Map<Urn, List<AspectRowSummary>> summariesByUrn =
+          aspectsToResolve.entrySet().stream()
+              .flatMap(
+                  entry ->
+                      systemMetadataService
+                          .findAspectsByUrn(entry.getKey(), entry.getValue(), true)
+                          .stream())
+              .collect(Collectors.groupingBy(summary -> UrnUtils.getUrn(summary.getUrn())));
+
+      // Process each URN's summaries
+      for (Map.Entry<Urn, List<String>> entry : aspectsToResolve.entrySet()) {
+        Urn urn = entry.getKey();
+        List<String> remaining = new ArrayList<>(entry.getValue());
+        LinkedHashMap<String, TraceStorageStatus> response =
+            finalResults.computeIfAbsent(urn, k -> new LinkedHashMap<>());
+
+        for (AspectRowSummary summary : summariesByUrn.getOrDefault(urn, Collections.emptyList())) {
+          if (traceId.equals(summary.getTelemetryTraceId())) {
+            response.put(
+                summary.getAspectName(), TraceStorageStatus.ok(TraceWriteStatus.ACTIVE_STATE));
+            remaining.remove(summary.getAspectName());
+          } else if (summary.hasTimestamp()
+              && summary.getTimestamp() > 0
+              && traceTimestampMillis <= summary.getTimestamp()) {
+            response.put(
+                summary.getAspectName(), TraceStorageStatus.ok(TraceWriteStatus.HISTORIC_STATE));
+            remaining.remove(summary.getAspectName());
+          }
+        }
+
+        // update remaining
+        aspectsToResolve.put(urn, remaining);
+      }
+
+      // Get remaining from Kafka
+      Map<Urn, Map<String, TraceStorageStatus>> kafkaResults =
+          mcpTraceReader.tracePendingStatuses(
+              aspectsToResolve, traceId, traceTimestampMillis, skipCache);
+
+      // Merge Kafka results
+      kafkaResults.forEach(
+          (urn, statuses) ->
+              finalResults.computeIfAbsent(urn, k -> new LinkedHashMap<>()).putAll(statuses));
+    }
+
+    return finalResults;
+  }
+
+  private static Map<String, TraceStatus> mergeStatus(
+      LinkedHashMap<String, TraceStorageStatus> primaryAspectStatus,
+      LinkedHashMap<String, TraceStorageStatus> searchAspectStatus,
+      boolean onlyIncludeErrors) {
+
+    return primaryAspectStatus.entrySet().stream()
+        .map(
+            storageEntry -> {
+              String aspectName = storageEntry.getKey();
+              TraceStorageStatus primaryStatus = storageEntry.getValue();
+              TraceStorageStatus searchStatus = searchAspectStatus.get(aspectName);
+              TraceStatus traceStatus =
+                  TraceStatus.builder()
+                      .primaryStorage(primaryStatus)
+                      .searchStorage(searchStatus)
+                      .success(isSuccess(primaryStatus, searchStatus))
+                      .build();
+
+              // Only include this aspect if we're not filtering for errors
+              // or if either storage has an ERROR status
+              if (!onlyIncludeErrors
+                  || TraceWriteStatus.ERROR.equals(primaryStatus.getWriteStatus())
+                  || TraceWriteStatus.ERROR.equals(searchStatus.getWriteStatus())) {
+                return Map.entry(aspectName, traceStatus);
+              }
+              return null;
+            })
+        .filter(Objects::nonNull)
+        .collect(
+            Collectors.toMap(
+                Map.Entry::getKey,
+                Map.Entry::getValue,
+                (existing, replacement) -> existing,
+                LinkedHashMap::new));
+  }
+
+  private static boolean isSuccess(
+      TraceStorageStatus primaryStatus, TraceStorageStatus searchStatus) {
+    return !TraceWriteStatus.ERROR.equals(primaryStatus.getWriteStatus())
+        && !TraceWriteStatus.ERROR.equals(searchStatus.getWriteStatus());
+  }
+
+  @Nullable
+  private static String extractTraceId(@Nullable SystemMetadata systemMetadata) {
+    if (systemMetadata != null && systemMetadata.getProperties() != null) {
+      return systemMetadata.getProperties().get(TraceContext.TELEMETRY_TRACE_KEY);
+    }
+    return null;
+  }
+
+  private static long extractTimestamp(@Nullable String traceId, long createOnMillis) {
+    return Optional.ofNullable(traceId)
+        .map(TraceIdGenerator::getTimestampMillis)
+        .orElse(createOnMillis);
+  }
+
+  private List<TraceException> extractTraceExceptions(
+      @Nonnull OperationContext opContext, FailedMetadataChangeProposal fmcp) {
+    if (!fmcp.getError().isEmpty()) {
+      try {
+        if (fmcp.getError().startsWith("[") && fmcp.getError().endsWith("]")) {
+          return opContext.getObjectMapper().readValue(fmcp.getError(), new TypeReference<>() {});
+        }
+      } catch (Exception e) {
+        log.warn("Failed to deserialize: {}", fmcp.getError());
+      }
+      return List.of(new TraceException(fmcp.getError()));
+    }
+    return List.of(new TraceException("Unable to extract trace exception"));
+  }
+}
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/entity/EntityServiceTest.java b/metadata-io/src/test/java/com/linkedin/metadata/entity/EntityServiceTest.java
index 6eda210baf7d4a..dabdf493fa1f99 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/entity/EntityServiceTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/entity/EntityServiceTest.java
@@ -46,6 +46,7 @@
 import com.linkedin.metadata.aspect.CorpUserAspect;
 import com.linkedin.metadata.aspect.CorpUserAspectArray;
 import com.linkedin.metadata.aspect.VersionedAspect;
+import com.linkedin.metadata.aspect.batch.MCPItem;
 import com.linkedin.metadata.aspect.patch.GenericJsonPatch;
 import com.linkedin.metadata.aspect.patch.PatchOperationType;
 import com.linkedin.metadata.entity.ebean.batch.AspectsBatchImpl;
@@ -67,6 +68,7 @@
 import com.linkedin.metadata.utils.AuditStampUtils;
 import com.linkedin.metadata.utils.EntityKeyUtils;
 import com.linkedin.metadata.utils.GenericRecordUtils;
+import com.linkedin.metadata.utils.metrics.MetricUtils;
 import com.linkedin.mxe.GenericAspect;
 import com.linkedin.mxe.MetadataChangeLog;
 import com.linkedin.mxe.MetadataChangeProposal;
@@ -83,6 +85,8 @@
 import com.linkedin.util.Pair;
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.test.metadata.context.TestOperationContexts;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.StatusCode;
 import jakarta.annotation.Nonnull;
 import java.sql.Timestamp;
 import java.time.Instant;
@@ -94,10 +98,12 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.junit.Assert;
 import org.mockito.ArgumentCaptor;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.testng.annotations.Test;
 
@@ -190,7 +196,8 @@ public void testIngestGetEntity() throws Exception {
 
     ArgumentCaptor<MetadataChangeLog> mclCaptor = ArgumentCaptor.forClass(MetadataChangeLog.class);
     verify(_mockProducer, times(2))
-        .produceMetadataChangeLog(Mockito.eq(entityUrn), Mockito.any(), mclCaptor.capture());
+        .produceMetadataChangeLog(
+            any(OperationContext.class), Mockito.eq(entityUrn), Mockito.any(), mclCaptor.capture());
     MetadataChangeLog mcl = mclCaptor.getValue();
     assertEquals(mcl.getEntityType(), "corpuser");
     assertNull(mcl.getPreviousAspectValue());
@@ -236,7 +243,8 @@ public void testAddKey() throws Exception {
 
     ArgumentCaptor<MetadataChangeLog> mclCaptor = ArgumentCaptor.forClass(MetadataChangeLog.class);
     verify(_mockProducer, times(2))
-        .produceMetadataChangeLog(Mockito.eq(entityUrn), Mockito.any(), mclCaptor.capture());
+        .produceMetadataChangeLog(
+            any(OperationContext.class), Mockito.eq(entityUrn), Mockito.any(), mclCaptor.capture());
     MetadataChangeLog mcl = mclCaptor.getValue();
     assertEquals(mcl.getEntityType(), "corpuser");
     assertNull(mcl.getPreviousAspectValue());
@@ -324,7 +332,11 @@ public void testIngestGetEntities() throws Exception {
 
     ArgumentCaptor<MetadataChangeLog> mclCaptor = ArgumentCaptor.forClass(MetadataChangeLog.class);
     verify(_mockProducer, times(2))
-        .produceMetadataChangeLog(Mockito.eq(entityUrn1), Mockito.any(), mclCaptor.capture());
+        .produceMetadataChangeLog(
+            any(OperationContext.class),
+            Mockito.eq(entityUrn1),
+            Mockito.any(),
+            mclCaptor.capture());
     MetadataChangeLog mcl = mclCaptor.getValue();
     assertEquals(mcl.getEntityType(), "corpuser");
     assertNull(mcl.getPreviousAspectValue());
@@ -332,7 +344,11 @@ public void testIngestGetEntities() throws Exception {
     assertEquals(mcl.getChangeType(), ChangeType.UPSERT);
 
     verify(_mockProducer, times(2))
-        .produceMetadataChangeLog(Mockito.eq(entityUrn2), Mockito.any(), mclCaptor.capture());
+        .produceMetadataChangeLog(
+            any(OperationContext.class),
+            Mockito.eq(entityUrn2),
+            Mockito.any(),
+            mclCaptor.capture());
     mcl = mclCaptor.getValue();
     assertEquals(mcl.getEntityType(), "corpuser");
     assertNull(mcl.getPreviousAspectValue());
@@ -405,10 +421,12 @@ public void testIngestGetEntitiesV2() throws Exception {
         DataTemplateUtil.areEqual(expectedKey2, new CorpUserKey(envelopedKey2.getValue().data())));
 
     verify(_mockProducer, times(2))
-        .produceMetadataChangeLog(Mockito.eq(entityUrn1), Mockito.any(), Mockito.any());
+        .produceMetadataChangeLog(
+            any(OperationContext.class), Mockito.eq(entityUrn1), Mockito.any(), Mockito.any());
 
     verify(_mockProducer, times(2))
-        .produceMetadataChangeLog(Mockito.eq(entityUrn2), Mockito.any(), Mockito.any());
+        .produceMetadataChangeLog(
+            any(OperationContext.class), Mockito.eq(entityUrn2), Mockito.any(), Mockito.any());
 
     verifyNoMoreInteractions(_mockProducer);
   }
@@ -476,10 +494,12 @@ public void testIngestGetEntitiesVersionedV2() throws Exception {
         DataTemplateUtil.areEqual(expectedKey2, new CorpUserKey(envelopedKey2.getValue().data())));
 
     verify(_mockProducer, times(2))
-        .produceMetadataChangeLog(Mockito.eq(entityUrn1), Mockito.any(), Mockito.any());
+        .produceMetadataChangeLog(
+            any(OperationContext.class), Mockito.eq(entityUrn1), Mockito.any(), Mockito.any());
 
     verify(_mockProducer, times(2))
-        .produceMetadataChangeLog(Mockito.eq(entityUrn2), Mockito.any(), Mockito.any());
+        .produceMetadataChangeLog(
+            any(OperationContext.class), Mockito.eq(entityUrn2), Mockito.any(), Mockito.any());
 
     verifyNoMoreInteractions(_mockProducer);
   }
@@ -510,7 +530,8 @@ public void testIngestAspectsGetLatestAspects() throws Exception {
     assertTrue(DataTemplateUtil.areEqual(writeAspect2, latestAspects.get(aspectName2)));
 
     verify(_mockProducer, times(3))
-        .produceMetadataChangeLog(Mockito.eq(entityUrn), Mockito.any(), Mockito.any());
+        .produceMetadataChangeLog(
+            any(OperationContext.class), Mockito.eq(entityUrn), Mockito.any(), Mockito.any());
 
     verifyNoMoreInteractions(_mockProducer);
   }
@@ -566,7 +587,10 @@ public void testReingestAspectsGetLatestAspects() throws Exception {
 
     verify(_mockProducer, times(1))
         .produceMetadataChangeLog(
-            Mockito.eq(entityUrn), Mockito.any(), Mockito.eq(initialChangeLog));
+            any(OperationContext.class),
+            Mockito.eq(entityUrn),
+            Mockito.any(),
+            Mockito.eq(initialChangeLog));
 
     // Mockito detects the previous invocation and throws an error in verifying the second call
     // unless invocations are cleared
@@ -576,7 +600,8 @@ public void testReingestAspectsGetLatestAspects() throws Exception {
         opContext, entityUrn, pairToIngest, TEST_AUDIT_STAMP, metadata1);
 
     verify(_mockProducer, times(0))
-        .produceMetadataChangeLog(Mockito.any(), Mockito.any(), Mockito.any());
+        .produceMetadataChangeLog(
+            any(OperationContext.class), Mockito.any(), Mockito.any(), Mockito.any());
 
     verifyNoMoreInteractions(_mockProducer);
   }
@@ -645,7 +670,10 @@ public void testReingestLineageAspect() throws Exception {
 
     verify(_mockProducer, times(1))
         .produceMetadataChangeLog(
-            Mockito.eq(entityUrn), Mockito.any(), Mockito.eq(initialChangeLog));
+            any(OperationContext.class),
+            Mockito.eq(entityUrn),
+            Mockito.any(),
+            Mockito.eq(initialChangeLog));
 
     // Mockito detects the previous invocation and throws an error in verifying the second call
     // unless invocations are cleared
@@ -656,7 +684,10 @@ public void testReingestLineageAspect() throws Exception {
 
     verify(_mockProducer, times(1))
         .produceMetadataChangeLog(
-            Mockito.eq(entityUrn), Mockito.any(), Mockito.eq(restateChangeLog));
+            any(OperationContext.class),
+            Mockito.eq(entityUrn),
+            Mockito.any(),
+            Mockito.eq(restateChangeLog));
 
     verifyNoMoreInteractions(_mockProducer);
   }
@@ -718,7 +749,10 @@ public void testReingestLineageProposal() throws Exception {
 
     verify(_mockProducer, times(1))
         .produceMetadataChangeLog(
-            Mockito.eq(entityUrn), Mockito.any(), Mockito.eq(initialChangeLog));
+            any(OperationContext.class),
+            Mockito.eq(entityUrn),
+            Mockito.any(),
+            Mockito.eq(initialChangeLog));
 
     // Mockito detects the previous invocation and throws an error in verifying the second call
     // unless invocations are cleared
@@ -728,7 +762,10 @@ public void testReingestLineageProposal() throws Exception {
 
     verify(_mockProducer, times(1))
         .produceMetadataChangeLog(
-            Mockito.eq(entityUrn), Mockito.any(), Mockito.eq(restateChangeLog));
+            any(OperationContext.class),
+            Mockito.eq(entityUrn),
+            Mockito.any(),
+            Mockito.eq(restateChangeLog));
 
     verifyNoMoreInteractions(_mockProducer);
   }
@@ -773,9 +810,15 @@ public void testAsyncProposalVersioned() throws Exception {
     gmce.setAspect(genericAspect);
     _entityServiceImpl.ingestProposal(opContext, gmce, TEST_AUDIT_STAMP, true);
     verify(_mockProducer, times(0))
-        .produceMetadataChangeLog(Mockito.eq(entityUrn), Mockito.any(), Mockito.any());
+        .produceMetadataChangeLog(
+            any(OperationContext.class), Mockito.eq(entityUrn), Mockito.any(), Mockito.any());
+
+    ChangeItemImpl item =
+        ChangeItemImpl.builder().build(gmce, TEST_AUDIT_STAMP, opContext.getAspectRetriever());
+
     verify(_mockProducer, times(1))
-        .produceMetadataChangeProposal(Mockito.eq(entityUrn), Mockito.eq(gmce));
+        .produceMetadataChangeProposal(
+            any(OperationContext.class), Mockito.eq(entityUrn), Mockito.eq(item));
   }
 
   @Test
@@ -798,7 +841,8 @@ public void testAsyncProposalTimeseries() throws Exception {
     gmce.setAspect(genericAspect);
     _entityServiceImpl.ingestProposal(opContext, gmce, TEST_AUDIT_STAMP, true);
     verify(_mockProducer, times(1))
-        .produceMetadataChangeLog(Mockito.eq(entityUrn), Mockito.any(), Mockito.any());
+        .produceMetadataChangeLog(
+            any(OperationContext.class), Mockito.eq(entityUrn), Mockito.any(), Mockito.any());
     verify(_mockProducer, times(0))
         .produceMetadataChangeProposal(Mockito.eq(entityUrn), Mockito.eq(gmce));
   }
@@ -823,7 +867,10 @@ public void testUpdateGetAspect() throws AssertionError {
     assertTrue(DataTemplateUtil.areEqual(writeAspect, readAspect1));
     verify(_mockProducer, times(1))
         .produceMetadataChangeLog(
-            Mockito.eq(entityUrn), Mockito.eq(corpUserInfoSpec), Mockito.any());
+            any(OperationContext.class),
+            Mockito.eq(entityUrn),
+            Mockito.eq(corpUserInfoSpec),
+            Mockito.any());
 
     // Ingest CorpUserInfo Aspect #2
     writeAspect.setEmail("newemail@test.com");
@@ -836,10 +883,14 @@ public void testUpdateGetAspect() throws AssertionError {
     assertTrue(DataTemplateUtil.areEqual(writeAspect, readAspect2));
     verify(_mockProducer, times(2))
         .produceMetadataChangeLog(
-            Mockito.eq(entityUrn), Mockito.eq(corpUserInfoSpec), Mockito.any());
+            any(OperationContext.class),
+            Mockito.eq(entityUrn),
+            Mockito.eq(corpUserInfoSpec),
+            Mockito.any());
 
     verify(_mockProducer, times(1))
         .produceMetadataChangeLog(
+            any(OperationContext.class),
             Mockito.eq(entityUrn),
             Mockito.eq(
                 opContext
@@ -877,7 +928,10 @@ public void testGetAspectAtVersion() throws AssertionError {
     assertTrue(DataTemplateUtil.areEqual(writtenVersionedAspect1, readAspect1));
     verify(_mockProducer, times(1))
         .produceMetadataChangeLog(
-            Mockito.eq(entityUrn), Mockito.eq(corpUserInfoSpec), Mockito.any());
+            any(OperationContext.class),
+            Mockito.eq(entityUrn),
+            Mockito.eq(corpUserInfoSpec),
+            Mockito.any());
 
     readAspect1 = _entityServiceImpl.getVersionedAspect(opContext, entityUrn, aspectName, -1);
     assertTrue(DataTemplateUtil.areEqual(writtenVersionedAspect1, readAspect1));
@@ -896,7 +950,10 @@ public void testGetAspectAtVersion() throws AssertionError {
     assertTrue(DataTemplateUtil.areEqual(writtenVersionedAspect2, readAspectVersion2));
     verify(_mockProducer, times(2))
         .produceMetadataChangeLog(
-            Mockito.eq(entityUrn), Mockito.eq(corpUserInfoSpec), Mockito.any());
+            any(OperationContext.class),
+            Mockito.eq(entityUrn),
+            Mockito.eq(corpUserInfoSpec),
+            Mockito.any());
 
     readAspect1 = _entityServiceImpl.getVersionedAspect(opContext, entityUrn, aspectName, -1);
     assertFalse(DataTemplateUtil.areEqual(writtenVersionedAspect1, readAspect1));
@@ -904,6 +961,7 @@ public void testGetAspectAtVersion() throws AssertionError {
     // check key aspect
     verify(_mockProducer, times(1))
         .produceMetadataChangeLog(
+            any(OperationContext.class),
             Mockito.eq(entityUrn),
             Mockito.eq(
                 opContext
@@ -1228,6 +1286,7 @@ public void testIngestGetLatestAspect() throws AssertionError {
     ArgumentCaptor<MetadataChangeLog> mclCaptor = ArgumentCaptor.forClass(MetadataChangeLog.class);
     verify(_mockProducer, times(1))
         .produceMetadataChangeLog(
+            any(OperationContext.class),
             Mockito.eq(entityUrn),
             Mockito.eq(
                 opContext
@@ -1243,6 +1302,7 @@ public void testIngestGetLatestAspect() throws AssertionError {
 
     verify(_mockProducer, times(1))
         .produceMetadataChangeLog(
+            any(OperationContext.class),
             Mockito.eq(entityUrn),
             Mockito.eq(
                 opContext
@@ -1291,7 +1351,8 @@ public void testIngestGetLatestAspect() throws AssertionError {
             EntityApiUtils.parseSystemMetadata(readAspectDao1.getSystemMetadata()), metadata1));
 
     verify(_mockProducer, times(1))
-        .produceMetadataChangeLog(Mockito.eq(entityUrn), Mockito.any(), mclCaptor.capture());
+        .produceMetadataChangeLog(
+            any(OperationContext.class), Mockito.eq(entityUrn), Mockito.any(), mclCaptor.capture());
     mcl = mclCaptor.getValue();
     assertEquals(mcl.getEntityType(), "corpuser");
     assertNotNull(mcl.getPreviousAspectValue());
@@ -1376,6 +1437,7 @@ public void testIngestGetLatestEnvelopedAspect() throws Exception {
 
     verify(_mockProducer, times(2))
         .produceMetadataChangeLog(
+            any(OperationContext.class),
             Mockito.eq(entityUrn),
             Mockito.eq(
                 opContext
@@ -1386,6 +1448,7 @@ public void testIngestGetLatestEnvelopedAspect() throws Exception {
 
     verify(_mockProducer, times(1))
         .produceMetadataChangeLog(
+            any(OperationContext.class),
             Mockito.eq(entityUrn),
             Mockito.eq(
                 opContext
@@ -1435,6 +1498,7 @@ public void testIngestSameAspect() throws AssertionError {
 
     verify(_mockProducer, times(1))
         .produceMetadataChangeLog(
+            any(OperationContext.class),
             Mockito.eq(entityUrn),
             Mockito.eq(
                 opContext
@@ -1446,6 +1510,7 @@ public void testIngestSameAspect() throws AssertionError {
     ArgumentCaptor<MetadataChangeLog> mclCaptor = ArgumentCaptor.forClass(MetadataChangeLog.class);
     verify(_mockProducer, times(1))
         .produceMetadataChangeLog(
+            any(OperationContext.class),
             Mockito.eq(entityUrn),
             Mockito.eq(
                 opContext
@@ -1506,7 +1571,8 @@ public void testIngestSameAspect() throws AssertionError {
             EntityApiUtils.parseSystemMetadata(readAspectDao2.getSystemMetadata()), metadata3));
 
     verify(_mockProducer, times(0))
-        .produceMetadataChangeLog(Mockito.any(), Mockito.any(), Mockito.any());
+        .produceMetadataChangeLog(
+            any(OperationContext.class), Mockito.any(), Mockito.any(), Mockito.any());
 
     verifyNoMoreInteractions(_mockProducer);
   }
@@ -1781,7 +1847,11 @@ public void testRestoreIndices() throws Exception {
       ArgumentCaptor<MetadataChangeLog> mclCaptor =
           ArgumentCaptor.forClass(MetadataChangeLog.class);
       verify(_mockProducer, times(1))
-          .produceMetadataChangeLog(Mockito.eq(entityUrn), Mockito.any(), mclCaptor.capture());
+          .produceMetadataChangeLog(
+              any(OperationContext.class),
+              Mockito.eq(entityUrn),
+              Mockito.any(),
+              mclCaptor.capture());
       MetadataChangeLog mcl = mclCaptor.getValue();
       assertEquals(mcl.getEntityType(), "dataset");
       assertNull(mcl.getPreviousAspectValue());
@@ -1919,7 +1989,10 @@ public void testUIPreProcessedProposal() throws Exception {
     ArgumentCaptor<AspectSpec> aspectSpecCaptor = ArgumentCaptor.forClass(AspectSpec.class);
     verify(_mockProducer, times(4))
         .produceMetadataChangeLog(
-            Mockito.eq(entityUrn), aspectSpecCaptor.capture(), captor.capture());
+            any(OperationContext.class),
+            Mockito.eq(entityUrn),
+            aspectSpecCaptor.capture(),
+            captor.capture());
     assertEquals(UI_SOURCE, captor.getValue().getSystemMetadata().getProperties().get(APP_SOURCE));
     assertEquals(
         aspectSpecCaptor.getAllValues().stream()
@@ -1963,6 +2036,7 @@ public void testStructuredPropertyIngestProposal() throws Exception {
     ArgumentCaptor<MetadataChangeLog> captor = ArgumentCaptor.forClass(MetadataChangeLog.class);
     verify(_mockProducer, times(1))
         .produceMetadataChangeLog(
+            any(OperationContext.class),
             Mockito.eq(firstPropertyUrn),
             Mockito.eq(structuredPropertiesDefinitionAspect),
             captor.capture());
@@ -2050,6 +2124,7 @@ public void testStructuredPropertyIngestProposal() throws Exception {
         ArgumentCaptor.forClass(MetadataChangeLog.class);
     verify(_mockProducer, times(1))
         .produceMetadataChangeLog(
+            any(OperationContext.class),
             Mockito.eq(secondPropertyUrn),
             Mockito.eq(structuredPropertiesDefinitionAspect),
             secondCaptor.capture());
@@ -2775,6 +2850,73 @@ public void testDeleteUrnWithRunIdFilterNonMatchVersionGap() throws Exception {
     assertEquals(result.getAspectName(), aspectName);
   }
 
+  @Test
+  public void testFailedAspectValidation() throws Exception {
+    try (MockedStatic<Span> mockedStatic = Mockito.mockStatic(Span.class)) {
+      Urn entityUrn = UrnUtils.getUrn("urn:li:corpuser:testFailedAspectValidation");
+
+      // Create an aspect that will trigger validation failure
+      CorpUserInfo invalidAspect = new CorpUserInfo().setActive(true);
+
+      String aspectName = AspectGenerationUtils.getAspectName(invalidAspect);
+
+      // Mock the span recording behavior
+      Span mockSpan = Mockito.mock(Span.class);
+      when(mockSpan.recordException(any(IllegalStateException.class))).thenReturn(mockSpan);
+      when(mockSpan.setStatus(any(StatusCode.class), anyString())).thenReturn(mockSpan);
+      when(mockSpan.setAttribute(anyString(), anyString())).thenReturn(mockSpan);
+
+      // Configure the static Span.current() to return our mock
+      mockedStatic.when(Span::current).thenReturn(mockSpan);
+
+      // Create test items that will fail validation
+      List<ChangeItemImpl> items =
+          List.of(
+              ChangeItemImpl.builder()
+                  .urn(entityUrn)
+                  .aspectName(aspectName)
+                  .recordTemplate(invalidAspect)
+                  .systemMetadata(AspectGenerationUtils.createSystemMetadata())
+                  .auditStamp(TEST_AUDIT_STAMP)
+                  // Set invalid version to trigger validation failure
+                  .headers(Map.of("If-Version-Match", "-10000"))
+                  .build(opContext.getAspectRetriever()));
+
+      // Create a mock Future that completes successfully
+      @SuppressWarnings("unchecked")
+      Future<Void> mockFuture = Mockito.mock(Future.class);
+      when(mockFuture.get()).thenReturn(null);
+
+      // Make producer return our mock Future
+      when(_mockProducer.produceFailedMetadataChangeProposalAsync(
+              any(OperationContext.class), any(MCPItem.class), any(Set.class)))
+          .thenReturn(mockFuture);
+
+      // Execute the ingest which should trigger validation failures
+      _entityServiceImpl.ingestAspects(
+          opContext,
+          AspectsBatchImpl.builder()
+              .retrieverContext(opContext.getRetrieverContext())
+              .items(items)
+              .build(),
+          true,
+          true);
+
+      // Verify span error recording
+      verify(mockSpan).recordException(any(IllegalStateException.class));
+      verify(mockSpan).setStatus(StatusCode.ERROR, "Batch contains failed aspect validations.");
+      verify(mockSpan).setAttribute(MetricUtils.ERROR_TYPE, IllegalStateException.class.getName());
+
+      // Verify failed MCP production
+      verify(_mockProducer, times(1))
+          .produceFailedMetadataChangeProposalAsync(
+              eq(opContext), any(MCPItem.class), any(Set.class));
+
+      // Verify Future.get() was called
+      verify(mockFuture, times(1)).get();
+    }
+  }
+
   @Nonnull
   protected com.linkedin.entity.Entity createCorpUserEntity(Urn entityUrn, String email)
       throws Exception {
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/graph/neo4j/Neo4jGraphServiceTest.java b/metadata-io/src/test/java/com/linkedin/metadata/graph/neo4j/Neo4jGraphServiceTest.java
index d47652e2dbca55..f2d3446392bf10 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/graph/neo4j/Neo4jGraphServiceTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/graph/neo4j/Neo4jGraphServiceTest.java
@@ -56,7 +56,8 @@ public void init() {
     _serverBuilder.newServer();
     _driver = GraphDatabase.driver(_serverBuilder.boltURI());
     _client =
-        new Neo4jGraphService(new LineageRegistry(SnapshotEntityRegistry.getInstance()), _driver);
+        new Neo4jGraphService(
+            operationContext, new LineageRegistry(SnapshotEntityRegistry.getInstance()), _driver);
     _client.clear();
   }
 
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/timeseries/search/TimeseriesAspectServiceUnitTest.java b/metadata-io/src/test/java/com/linkedin/metadata/timeseries/search/TimeseriesAspectServiceUnitTest.java
index 9a21c5337db864..b4d52aceeaa17f 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/timeseries/search/TimeseriesAspectServiceUnitTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/timeseries/search/TimeseriesAspectServiceUnitTest.java
@@ -2,12 +2,18 @@
 
 import static org.mockito.Mockito.*;
 
+import com.datahub.util.exception.ESQueryException;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.NumericNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.metadata.config.TimeseriesAspectServiceConfig;
+import com.linkedin.metadata.query.filter.Filter;
+import com.linkedin.metadata.query.filter.SortCriterion;
+import com.linkedin.metadata.query.filter.SortOrder;
 import com.linkedin.metadata.search.elasticsearch.query.filter.QueryFilterRewriteChain;
 import com.linkedin.metadata.search.elasticsearch.update.ESBulkProcessor;
+import com.linkedin.metadata.search.utils.QueryUtils;
 import com.linkedin.metadata.timeseries.TimeseriesAspectService;
 import com.linkedin.metadata.timeseries.elastic.ElasticSearchTimeseriesAspectService;
 import com.linkedin.metadata.timeseries.elastic.indexbuilder.TimeseriesAspectIndexBuilders;
@@ -17,6 +23,7 @@
 import io.datahubproject.test.metadata.context.TestOperationContexts;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.List;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpEntity;
@@ -25,6 +32,7 @@
 import org.opensearch.client.RestClient;
 import org.opensearch.client.RestHighLevelClient;
 import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 /**
@@ -33,29 +41,34 @@
  */
 public class TimeseriesAspectServiceUnitTest {
 
-  private final RestHighLevelClient _searchClient = mock(RestHighLevelClient.class);
-  private final IndexConvention _indexConvention = mock(IndexConvention.class);
-  private final TimeseriesAspectIndexBuilders _timeseriesAspectIndexBuilders =
+  private final RestHighLevelClient searchClient = mock(RestHighLevelClient.class);
+  private final IndexConvention indexConvention = mock(IndexConvention.class);
+  private final TimeseriesAspectIndexBuilders timeseriesAspectIndexBuilders =
       mock(TimeseriesAspectIndexBuilders.class);
-  private final ESBulkProcessor _bulkProcessor = mock(ESBulkProcessor.class);
-  private final RestClient _restClient = mock(RestClient.class);
+  private final ESBulkProcessor bulkProcessor = mock(ESBulkProcessor.class);
+  private final RestClient restClient = mock(RestClient.class);
   private final TimeseriesAspectService _timeseriesAspectService =
       new ElasticSearchTimeseriesAspectService(
-          _searchClient,
-          _timeseriesAspectIndexBuilders,
-          _bulkProcessor,
+          searchClient,
+          timeseriesAspectIndexBuilders,
+          bulkProcessor,
           0,
           QueryFilterRewriteChain.EMPTY,
           TimeseriesAspectServiceConfig.builder().build());
   private final OperationContext opContext =
-      TestOperationContexts.systemContextNoSearchAuthorization(_indexConvention);
+      TestOperationContexts.systemContextNoSearchAuthorization(indexConvention);
 
   private static final String INDEX_PATTERN = "indexPattern";
 
+  @BeforeMethod
+  public void resetMocks() {
+    reset(searchClient, indexConvention, timeseriesAspectIndexBuilders, bulkProcessor, restClient);
+  }
+
   @Test
   public void testGetIndicesIntegerWrap() throws IOException {
-    when(_indexConvention.getAllTimeseriesAspectIndicesPattern()).thenReturn(INDEX_PATTERN);
-    when(_searchClient.getLowLevelClient()).thenReturn(_restClient);
+    when(indexConvention.getAllTimeseriesAspectIndicesPattern()).thenReturn(INDEX_PATTERN);
+    when(searchClient.getLowLevelClient()).thenReturn(restClient);
     ObjectNode jsonNode = JsonNodeFactory.instance.objectNode();
     ObjectNode indicesNode = JsonNodeFactory.instance.objectNode();
     ObjectNode indexNode = JsonNodeFactory.instance.objectNode();
@@ -73,10 +86,66 @@ public void testGetIndicesIntegerWrap() throws IOException {
     when(response.getEntity()).thenReturn(responseEntity);
     when(responseEntity.getContent())
         .thenReturn(IOUtils.toInputStream(jsonNode.toString(), StandardCharsets.UTF_8));
-    when(_restClient.performRequest(any(Request.class))).thenReturn(response);
+    when(restClient.performRequest(any(Request.class))).thenReturn(response);
 
     List<TimeseriesIndexSizeResult> results = _timeseriesAspectService.getIndexSizes(opContext);
 
     Assert.assertEquals(results.get(0).getSizeInMb(), 8078.398031);
   }
+
+  @Test
+  public void testSearchQueryFailure() throws IOException {
+    // setup mock
+    when(indexConvention.getTimeseriesAspectIndexName(eq("dataset"), eq("testAspect")))
+        .thenReturn("dataset_testAspect_index_v1");
+
+    // Setup search request that will fail
+    when(searchClient.search(any(), any())).thenThrow(new IOException("Search failed"));
+
+    Filter filter = QueryUtils.newFilter("field", "value");
+
+    // Verify that ESQueryException is thrown with correct message
+    try {
+      _timeseriesAspectService.getAspectValues(
+          opContext,
+          UrnUtils.getUrn("urn:li:dataset:123"),
+          "dataset",
+          "testAspect",
+          null,
+          null,
+          10,
+          filter,
+          null);
+      Assert.fail("Expected ESQueryException to be thrown");
+    } catch (ESQueryException e) {
+      Assert.assertEquals(e.getMessage(), "Search query failed:");
+      Assert.assertTrue(e.getCause() instanceof IOException);
+      Assert.assertEquals(e.getCause().getMessage(), "Search failed");
+    }
+  }
+
+  @Test
+  public void testScrollSearchQueryFailure() throws IOException {
+    // setup mock
+    when(indexConvention.getTimeseriesAspectIndexName(eq("dataset"), eq("testAspect")))
+        .thenReturn("dataset_testAspect_index_v1");
+
+    // Setup search request that will fail
+    when(searchClient.search(any(), any())).thenThrow(new IOException("Scroll search failed"));
+
+    Filter filter = QueryUtils.newFilter("field", "value");
+    List<SortCriterion> sortCriteria =
+        Arrays.asList(new SortCriterion().setField("timestamp").setOrder(SortOrder.DESCENDING));
+
+    // Verify that ESQueryException is thrown with correct message
+    try {
+      _timeseriesAspectService.scrollAspects(
+          opContext, "dataset", "testAspect", filter, sortCriteria, null, 10, null, null);
+      Assert.fail("Expected ESQueryException to be thrown");
+    } catch (ESQueryException e) {
+      Assert.assertEquals(e.getMessage(), "Search query failed:");
+      Assert.assertTrue(e.getCause() instanceof IOException);
+      Assert.assertEquals(e.getCause().getMessage(), "Scroll search failed");
+    }
+  }
 }
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/trace/BaseKafkaTraceReaderTest.java b/metadata-io/src/test/java/com/linkedin/metadata/trace/BaseKafkaTraceReaderTest.java
new file mode 100644
index 00000000000000..c5217475362295
--- /dev/null
+++ b/metadata-io/src/test/java/com/linkedin/metadata/trace/BaseKafkaTraceReaderTest.java
@@ -0,0 +1,239 @@
+package com.linkedin.metadata.trace;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyCollection;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.data.template.StringMap;
+import com.linkedin.metadata.systemmetadata.TraceStorageStatus;
+import com.linkedin.metadata.systemmetadata.TraceWriteStatus;
+import com.linkedin.mxe.SystemMetadata;
+import com.linkedin.util.Pair;
+import io.datahubproject.metadata.context.TraceContext;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import javax.annotation.Nullable;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.DescribeTopicsResult;
+import org.apache.kafka.clients.admin.ListConsumerGroupOffsetsResult;
+import org.apache.kafka.clients.admin.TopicDescription;
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.OffsetAndMetadata;
+import org.apache.kafka.clients.consumer.OffsetAndTimestamp;
+import org.apache.kafka.common.KafkaFuture;
+import org.apache.kafka.common.Node;
+import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.TopicPartitionInfo;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public abstract class BaseKafkaTraceReaderTest<M extends RecordTemplate> {
+  protected static final String TOPIC_NAME = "test-topic";
+  protected static final String CONSUMER_GROUP = "test-group";
+  protected static final String TRACE_ID = "test-trace-id";
+  protected static final String ASPECT_NAME = "status";
+  protected static final Urn TEST_URN = UrnUtils.getUrn("urn:li:container:123");
+
+  @Mock protected AdminClient adminClient;
+  @Mock protected Consumer<String, GenericRecord> consumer;
+  protected ExecutorService executorService;
+  protected KafkaTraceReader<M> traceReader;
+
+  abstract KafkaTraceReader<M> buildTraceReader();
+
+  abstract M buildMessage(@Nullable SystemMetadata systemMetadata);
+
+  abstract GenericRecord toGenericRecord(M message) throws IOException;
+
+  abstract M fromGenericRecord(GenericRecord genericRecord) throws IOException;
+
+  @BeforeMethod(alwaysRun = true)
+  public void setup() {
+    MockitoAnnotations.openMocks(this);
+    executorService = Executors.newSingleThreadExecutor();
+    traceReader = buildTraceReader();
+    setupDefaultMocks();
+  }
+
+  protected void setupDefaultMocks() {
+    // Mock topic description
+    Node mockNode = new Node(0, "localhost", 9092);
+    TopicPartitionInfo partitionInfo =
+        new TopicPartitionInfo(
+            0, mockNode, Collections.singletonList(mockNode), Collections.singletonList(mockNode));
+    TopicDescription topicDescription =
+        new TopicDescription(TOPIC_NAME, false, Collections.singletonList(partitionInfo));
+
+    DescribeTopicsResult mockDescribeTopicsResult = mock(DescribeTopicsResult.class);
+    when(mockDescribeTopicsResult.all())
+        .thenReturn(
+            KafkaFuture.completedFuture(Collections.singletonMap(TOPIC_NAME, topicDescription)));
+    when(adminClient.describeTopics(anyCollection())).thenReturn(mockDescribeTopicsResult);
+
+    // Mock consumer group offset lookup
+    ListConsumerGroupOffsetsResult mockOffsetResult = mock(ListConsumerGroupOffsetsResult.class);
+    when(adminClient.listConsumerGroupOffsets(CONSUMER_GROUP)).thenReturn(mockOffsetResult);
+    when(mockOffsetResult.partitionsToOffsetAndMetadata())
+        .thenReturn(
+            KafkaFuture.completedFuture(
+                Collections.singletonMap(
+                    new TopicPartition(TOPIC_NAME, 0), new OffsetAndMetadata(100L))));
+
+    // Mock consumer behavior
+    when(consumer.poll(any(Duration.class))).thenReturn(mock(ConsumerRecords.class));
+  }
+
+  @Test
+  public void testRead_WithValidGenericRecord() throws Exception {
+    // Arrange
+    M expectedMessage = buildMessage(null);
+    GenericRecord genericRecord = toGenericRecord(expectedMessage);
+
+    // Act
+    Optional<M> result = traceReader.read(genericRecord);
+
+    // Assert
+    assertTrue(result.isPresent());
+    assertEquals(result.get(), expectedMessage);
+  }
+
+  @Test
+  public void testRead_WithNullGenericRecord() {
+    Optional<M> result = traceReader.read(null);
+    assertFalse(result.isPresent());
+  }
+
+  @Test
+  public void testMatchConsumerRecord_WithMatchingTraceAndAspect() throws IOException {
+    // Arrange
+    ConsumerRecord<String, GenericRecord> mockConsumerRecord = mock(ConsumerRecord.class);
+
+    SystemMetadata systemMetadata = new SystemMetadata();
+    Map<String, String> properties = new HashMap<>();
+    properties.put(TraceContext.TELEMETRY_TRACE_KEY, TRACE_ID);
+    systemMetadata.setProperties(new StringMap(properties));
+
+    GenericRecord genericRecord = toGenericRecord(buildMessage(systemMetadata));
+    when(mockConsumerRecord.value()).thenReturn(genericRecord);
+
+    // Act
+    Optional<Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>> result =
+        traceReader.matchConsumerRecord(mockConsumerRecord, TRACE_ID, ASPECT_NAME);
+
+    // Assert
+    assertTrue(result.isPresent());
+    assertEquals(result.get().getFirst(), mockConsumerRecord);
+    assertEquals(result.get().getSecond(), systemMetadata);
+  }
+
+  @Test
+  public void testTracePendingStatuses() throws IOException {
+    // Arrange
+    List<String> aspectNames = Collections.singletonList(ASPECT_NAME);
+    Map<Urn, List<String>> urnAspectPairs = Collections.singletonMap(TEST_URN, aspectNames);
+    long timestamp = System.currentTimeMillis();
+
+    // Mock topic partition
+    TopicPartition topicPartition = new TopicPartition(TOPIC_NAME, 0);
+
+    // Mock consumer group offset lookup (lower offset)
+    OffsetAndMetadata offsetAndMetadata = new OffsetAndMetadata(100L);
+    ListConsumerGroupOffsetsResult mockOffsetResult = mock(ListConsumerGroupOffsetsResult.class);
+    when(adminClient.listConsumerGroupOffsets(CONSUMER_GROUP)).thenReturn(mockOffsetResult);
+    when(mockOffsetResult.partitionsToOffsetAndMetadata())
+        .thenReturn(
+            KafkaFuture.completedFuture(
+                Collections.singletonMap(topicPartition, offsetAndMetadata)));
+
+    // Mock offset lookup by timestamp
+    when(consumer.offsetsForTimes(any()))
+        .thenReturn(
+            Collections.singletonMap(topicPartition, new OffsetAndTimestamp(150L, timestamp)));
+
+    // Create system metadata with trace ID
+    SystemMetadata systemMetadata = new SystemMetadata();
+    Map<String, String> properties = new HashMap<>();
+    properties.put(TraceContext.TELEMETRY_TRACE_KEY, TRACE_ID);
+    systemMetadata.setProperties(new StringMap(properties));
+
+    // Build message with metadata
+    M message = buildMessage(systemMetadata);
+    GenericRecord genericRecord = toGenericRecord(message);
+
+    // Mock consumer record fetch with higher offset than consumer offset
+    ConsumerRecord<String, GenericRecord> mockRecord =
+        new ConsumerRecord<>(TOPIC_NAME, 0, 150L, TEST_URN.toString(), genericRecord);
+    ConsumerRecords<String, GenericRecord> mockRecords = mock(ConsumerRecords.class);
+    when(mockRecords.isEmpty()).thenReturn(false);
+    when(mockRecords.records(any(TopicPartition.class)))
+        .thenReturn(Collections.singletonList(mockRecord));
+    when(consumer.poll(any(Duration.class))).thenReturn(mockRecords);
+
+    // Act
+    Map<Urn, Map<String, TraceStorageStatus>> result =
+        traceReader.tracePendingStatuses(urnAspectPairs, TRACE_ID, timestamp);
+
+    // Assert
+    assertTrue(result.containsKey(TEST_URN));
+    assertTrue(result.get(TEST_URN).containsKey(ASPECT_NAME));
+    assertEquals(result.get(TEST_URN).get(ASPECT_NAME).getWriteStatus(), TraceWriteStatus.PENDING);
+  }
+
+  @Test
+  public void testFindMessages() throws Exception {
+    // Arrange
+    List<String> aspectNames = Collections.singletonList(ASPECT_NAME);
+    Map<Urn, List<String>> urnAspectPairs = Collections.singletonMap(TEST_URN, aspectNames);
+    long timestamp = System.currentTimeMillis();
+
+    // Mock topic partition assignment and offsets
+    TopicPartition topicPartition = new TopicPartition(TOPIC_NAME, 0);
+    OffsetAndTimestamp offsetAndTimestamp = new OffsetAndTimestamp(100L, timestamp);
+    when(consumer.offsetsForTimes(any()))
+        .thenReturn(Collections.singletonMap(topicPartition, offsetAndTimestamp));
+
+    // Mock system metadata
+    SystemMetadata systemMetadata = new SystemMetadata();
+    Map<String, String> properties = new HashMap<>();
+    properties.put(TraceContext.TELEMETRY_TRACE_KEY, TRACE_ID);
+    systemMetadata.setProperties(new StringMap(properties));
+    M message = buildMessage(systemMetadata);
+
+    // Mock consumer record fetch
+    ConsumerRecord<String, GenericRecord> mockRecord =
+        new ConsumerRecord<>(TOPIC_NAME, 0, 100L, TEST_URN.toString(), toGenericRecord(message));
+    ConsumerRecords<String, GenericRecord> mockRecords = mock(ConsumerRecords.class);
+    when(mockRecords.records(any(TopicPartition.class)))
+        .thenReturn(Collections.singletonList(mockRecord));
+    when(consumer.poll(any(Duration.class))).thenReturn(mockRecords);
+
+    // Act
+    Map<Urn, Map<String, Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>>> result =
+        traceReader.findMessages(urnAspectPairs, TRACE_ID, timestamp);
+
+    // Assert
+    assertTrue(result.containsKey(TEST_URN));
+    assertTrue(result.get(TEST_URN).containsKey(ASPECT_NAME));
+    assertEquals(result.get(TEST_URN).get(ASPECT_NAME).getFirst(), mockRecord);
+    assertEquals(result.get(TEST_URN).get(ASPECT_NAME).getSecond(), systemMetadata);
+  }
+}
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/trace/MCLTraceReaderTest.java b/metadata-io/src/test/java/com/linkedin/metadata/trace/MCLTraceReaderTest.java
new file mode 100644
index 00000000000000..9a4afd74917d4b
--- /dev/null
+++ b/metadata-io/src/test/java/com/linkedin/metadata/trace/MCLTraceReaderTest.java
@@ -0,0 +1,93 @@
+package com.linkedin.metadata.trace;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import com.linkedin.data.template.SetMode;
+import com.linkedin.data.template.StringMap;
+import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.metadata.EventUtils;
+import com.linkedin.mxe.MetadataChangeLog;
+import com.linkedin.mxe.SystemMetadata;
+import com.linkedin.util.Pair;
+import io.datahubproject.metadata.context.TraceContext;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.jetbrains.annotations.Nullable;
+import org.testng.annotations.Test;
+
+public class MCLTraceReaderTest extends BaseKafkaTraceReaderTest<MetadataChangeLog> {
+  @Override
+  KafkaTraceReader<MetadataChangeLog> buildTraceReader() {
+    return MCLTraceReader.builder()
+        .adminClient(adminClient)
+        .consumerSupplier(() -> consumer)
+        .pollDurationMs(100)
+        .pollMaxAttempts(3)
+        .executorService(executorService)
+        .timeoutSeconds(5)
+        .topicName(TOPIC_NAME)
+        .consumerGroupId(CONSUMER_GROUP)
+        .build();
+  }
+
+  @Override
+  MetadataChangeLog buildMessage(@Nullable SystemMetadata systemMetadata) {
+    return new MetadataChangeLog()
+        .setAspectName(ASPECT_NAME)
+        .setEntityType(TEST_URN.getEntityType())
+        .setChangeType(ChangeType.UPSERT)
+        .setEntityUrn(TEST_URN)
+        .setSystemMetadata(systemMetadata, SetMode.IGNORE_NULL);
+  }
+
+  @Override
+  GenericRecord toGenericRecord(MetadataChangeLog message) throws IOException {
+    return EventUtils.pegasusToAvroMCL(message);
+  }
+
+  @Override
+  MetadataChangeLog fromGenericRecord(GenericRecord genericRecord) throws IOException {
+    return EventUtils.avroToPegasusMCL(genericRecord);
+  }
+
+  @Test
+  public void testMCLRead() throws Exception {
+    MetadataChangeLog expectedMCL = buildMessage(null);
+
+    GenericRecord genericRecord = toGenericRecord(expectedMCL);
+
+    Optional<MetadataChangeLog> result = traceReader.read(genericRecord);
+
+    assertTrue(result.isPresent());
+    assertEquals(result.get().getAspectName(), ASPECT_NAME);
+  }
+
+  @Test
+  public void testMCLMatchConsumerRecord() throws Exception {
+    ConsumerRecord<String, GenericRecord> mockConsumerRecord = mock(ConsumerRecord.class);
+
+    SystemMetadata systemMetadata = new SystemMetadata();
+    Map<String, String> properties = new HashMap<>();
+    properties.put(TraceContext.TELEMETRY_TRACE_KEY, TRACE_ID);
+    systemMetadata.setProperties(new StringMap(properties));
+
+    MetadataChangeLog mcl = buildMessage(systemMetadata);
+
+    GenericRecord genericRecord = toGenericRecord(mcl);
+    when(mockConsumerRecord.value()).thenReturn(genericRecord);
+
+    Optional<Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>> result =
+        traceReader.matchConsumerRecord(mockConsumerRecord, TRACE_ID, ASPECT_NAME);
+
+    assertTrue(result.isPresent());
+    assertEquals(result.get().getFirst(), mockConsumerRecord);
+    assertEquals(result.get().getSecond(), systemMetadata);
+  }
+}
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/trace/MCPFailedTraceReaderTest.java b/metadata-io/src/test/java/com/linkedin/metadata/trace/MCPFailedTraceReaderTest.java
new file mode 100644
index 00000000000000..8d8fedfc98c2b3
--- /dev/null
+++ b/metadata-io/src/test/java/com/linkedin/metadata/trace/MCPFailedTraceReaderTest.java
@@ -0,0 +1,98 @@
+package com.linkedin.metadata.trace;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import com.linkedin.data.template.SetMode;
+import com.linkedin.data.template.StringMap;
+import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.metadata.EventUtils;
+import com.linkedin.mxe.FailedMetadataChangeProposal;
+import com.linkedin.mxe.MetadataChangeProposal;
+import com.linkedin.mxe.SystemMetadata;
+import com.linkedin.util.Pair;
+import io.datahubproject.metadata.context.TraceContext;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.jetbrains.annotations.Nullable;
+import org.testng.annotations.Test;
+
+public class MCPFailedTraceReaderTest
+    extends BaseKafkaTraceReaderTest<FailedMetadataChangeProposal> {
+  @Override
+  KafkaTraceReader<FailedMetadataChangeProposal> buildTraceReader() {
+    return MCPFailedTraceReader.builder()
+        .adminClient(adminClient)
+        .consumerSupplier(() -> consumer)
+        .pollDurationMs(100)
+        .pollMaxAttempts(3)
+        .executorService(executorService)
+        .timeoutSeconds(5)
+        .topicName(TOPIC_NAME)
+        .consumerGroupId(CONSUMER_GROUP)
+        .build();
+  }
+
+  @Override
+  FailedMetadataChangeProposal buildMessage(@Nullable SystemMetadata systemMetadata) {
+    return new FailedMetadataChangeProposal()
+        .setError("Test failure error")
+        .setMetadataChangeProposal(
+            new MetadataChangeProposal()
+                .setAspectName(ASPECT_NAME)
+                .setEntityType(TEST_URN.getEntityType())
+                .setChangeType(ChangeType.UPSERT)
+                .setEntityUrn(TEST_URN)
+                .setSystemMetadata(systemMetadata, SetMode.IGNORE_NULL));
+  }
+
+  @Override
+  GenericRecord toGenericRecord(FailedMetadataChangeProposal message) throws IOException {
+    return EventUtils.pegasusToAvroFailedMCP(message);
+  }
+
+  @Override
+  FailedMetadataChangeProposal fromGenericRecord(GenericRecord genericRecord) throws IOException {
+    return EventUtils.avroToPegasusFailedMCP(genericRecord);
+  }
+
+  @Test
+  public void testFailedMCPRead() throws Exception {
+    FailedMetadataChangeProposal expectedMCP = buildMessage(null);
+
+    GenericRecord genericRecord = toGenericRecord(expectedMCP);
+
+    Optional<FailedMetadataChangeProposal> result = traceReader.read(genericRecord);
+
+    assertTrue(result.isPresent());
+    assertEquals(result.get().getMetadataChangeProposal().getAspectName(), ASPECT_NAME);
+  }
+
+  @Test
+  public void testFailedMCPMatchConsumerRecord() throws Exception {
+    ConsumerRecord<String, GenericRecord> mockConsumerRecord = mock(ConsumerRecord.class);
+
+    SystemMetadata systemMetadata = new SystemMetadata();
+    Map<String, String> properties = new HashMap<>();
+    properties.put(TraceContext.TELEMETRY_TRACE_KEY, TRACE_ID);
+    systemMetadata.setProperties(new StringMap(properties));
+
+    FailedMetadataChangeProposal fmcp = buildMessage(systemMetadata);
+
+    GenericRecord genericRecord = toGenericRecord(fmcp);
+    when(mockConsumerRecord.value()).thenReturn(genericRecord);
+
+    Optional<Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>> result =
+        traceReader.matchConsumerRecord(mockConsumerRecord, TRACE_ID, ASPECT_NAME);
+
+    assertTrue(result.isPresent());
+    assertEquals(result.get().getFirst(), mockConsumerRecord);
+    assertEquals(result.get().getSecond(), systemMetadata);
+  }
+}
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/trace/MCPTraceReaderTest.java b/metadata-io/src/test/java/com/linkedin/metadata/trace/MCPTraceReaderTest.java
new file mode 100644
index 00000000000000..e2aa9730267ddf
--- /dev/null
+++ b/metadata-io/src/test/java/com/linkedin/metadata/trace/MCPTraceReaderTest.java
@@ -0,0 +1,93 @@
+package com.linkedin.metadata.trace;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import com.linkedin.data.template.SetMode;
+import com.linkedin.data.template.StringMap;
+import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.metadata.EventUtils;
+import com.linkedin.mxe.MetadataChangeProposal;
+import com.linkedin.mxe.SystemMetadata;
+import com.linkedin.util.Pair;
+import io.datahubproject.metadata.context.TraceContext;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.jetbrains.annotations.Nullable;
+import org.testng.annotations.Test;
+
+public final class MCPTraceReaderTest extends BaseKafkaTraceReaderTest<MetadataChangeProposal> {
+  @Override
+  KafkaTraceReader<MetadataChangeProposal> buildTraceReader() {
+    return MCPTraceReader.builder()
+        .adminClient(adminClient)
+        .consumerSupplier(() -> consumer)
+        .pollDurationMs(100)
+        .pollMaxAttempts(3)
+        .executorService(executorService)
+        .timeoutSeconds(5)
+        .topicName(TOPIC_NAME)
+        .consumerGroupId(CONSUMER_GROUP)
+        .build();
+  }
+
+  @Override
+  MetadataChangeProposal buildMessage(@Nullable SystemMetadata systemMetadata) {
+    return new MetadataChangeProposal()
+        .setAspectName(ASPECT_NAME)
+        .setEntityType(TEST_URN.getEntityType())
+        .setChangeType(ChangeType.UPSERT)
+        .setEntityUrn(TEST_URN)
+        .setSystemMetadata(systemMetadata, SetMode.IGNORE_NULL);
+  }
+
+  @Override
+  GenericRecord toGenericRecord(MetadataChangeProposal message) throws IOException {
+    return EventUtils.pegasusToAvroMCP(message);
+  }
+
+  @Override
+  MetadataChangeProposal fromGenericRecord(GenericRecord genericRecord) throws IOException {
+    return EventUtils.avroToPegasusMCP(genericRecord);
+  }
+
+  @Test
+  public void testMCPRead() throws Exception {
+    MetadataChangeProposal expectedMCP = buildMessage(null);
+
+    GenericRecord genericRecord = toGenericRecord(expectedMCP);
+
+    Optional<MetadataChangeProposal> result = traceReader.read(genericRecord);
+
+    assertTrue(result.isPresent());
+    assertEquals(result.get().getAspectName(), ASPECT_NAME);
+  }
+
+  @Test
+  public void testMCPMatchConsumerRecord() throws Exception {
+    ConsumerRecord<String, GenericRecord> mockConsumerRecord = mock(ConsumerRecord.class);
+
+    SystemMetadata systemMetadata = new SystemMetadata();
+    Map<String, String> properties = new HashMap<>();
+    properties.put(TraceContext.TELEMETRY_TRACE_KEY, TRACE_ID);
+    systemMetadata.setProperties(new StringMap(properties));
+
+    MetadataChangeProposal mcp = buildMessage(systemMetadata);
+
+    GenericRecord genericRecord = toGenericRecord(mcp);
+    when(mockConsumerRecord.value()).thenReturn(genericRecord);
+
+    Optional<Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>> result =
+        traceReader.matchConsumerRecord(mockConsumerRecord, TRACE_ID, ASPECT_NAME);
+
+    assertTrue(result.isPresent());
+    assertEquals(result.get().getFirst(), mockConsumerRecord);
+    assertEquals(result.get().getSecond(), systemMetadata);
+  }
+}
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/trace/TraceServiceImplTest.java b/metadata-io/src/test/java/com/linkedin/metadata/trace/TraceServiceImplTest.java
new file mode 100644
index 00000000000000..abe65d48b3410a
--- /dev/null
+++ b/metadata-io/src/test/java/com/linkedin/metadata/trace/TraceServiceImplTest.java
@@ -0,0 +1,350 @@
+package com.linkedin.metadata.trace;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anySet;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+import com.linkedin.common.AuditStamp;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.data.template.StringMap;
+import com.linkedin.entity.EntityResponse;
+import com.linkedin.entity.EnvelopedAspect;
+import com.linkedin.entity.EnvelopedAspectMap;
+import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.metadata.EventUtils;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.run.AspectRowSummary;
+import com.linkedin.metadata.systemmetadata.SystemMetadataService;
+import com.linkedin.metadata.systemmetadata.TraceStatus;
+import com.linkedin.metadata.systemmetadata.TraceStorageStatus;
+import com.linkedin.metadata.systemmetadata.TraceWriteStatus;
+import com.linkedin.mxe.FailedMetadataChangeProposal;
+import com.linkedin.mxe.MetadataChangeProposal;
+import com.linkedin.mxe.SystemMetadata;
+import com.linkedin.util.Pair;
+import io.datahubproject.metadata.context.OperationContext;
+import io.datahubproject.metadata.context.TraceContext;
+import io.datahubproject.metadata.context.TraceIdGenerator;
+import io.datahubproject.test.metadata.context.TestOperationContexts;
+import java.time.Instant;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class TraceServiceImplTest {
+  private static final String TEST_TRACE_ID_FUTURE =
+      TraceContext.TRACE_ID_GENERATOR.generateTraceId(Instant.now().toEpochMilli() + 1000);
+  private static final String TEST_TRACE_ID = TraceContext.TRACE_ID_GENERATOR.generateTraceId();
+  protected static final String ASPECT_NAME = "status";
+  protected static final String TIMESERIES_ASPECT_NAME = "datasetProfile";
+  protected static final Urn TEST_URN =
+      UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:kafka,PageViewEvent,PROD)");
+
+  @Mock private SystemMetadataService systemMetadataService;
+  @Mock private EntityService<?> entityService;
+  @Mock private MCPTraceReader mcpTraceReader;
+  @Mock private MCPFailedTraceReader mcpFailedTraceReader;
+  @Mock private MCLTraceReader mclVersionedTraceReader;
+  @Mock private MCLTraceReader mclTimeseriesTraceReader;
+
+  private TraceServiceImpl traceService;
+  private static final OperationContext operationContext =
+      TestOperationContexts.systemContextNoSearchAuthorization();
+
+  @BeforeMethod
+  public void setup() throws Exception {
+    MockitoAnnotations.openMocks(this);
+
+    traceService =
+        TraceServiceImpl.builder()
+            .entityRegistry(operationContext.getEntityRegistry())
+            .systemMetadataService(systemMetadataService)
+            .entityService(entityService)
+            .mcpTraceReader(mcpTraceReader)
+            .mcpFailedTraceReader(mcpFailedTraceReader)
+            .mclVersionedTraceReader(mclVersionedTraceReader)
+            .mclTimeseriesTraceReader(mclTimeseriesTraceReader)
+            .build();
+  }
+
+  @Test
+  public void testTraceWithActiveState() throws Exception {
+    // Arrange
+    Map<Urn, List<String>> aspectNames =
+        Collections.singletonMap(TEST_URN, Collections.singletonList(ASPECT_NAME));
+
+    // Mock entityService response for primary storage
+    SystemMetadata systemMetadata = new SystemMetadata();
+    Map<String, String> properties = new HashMap<>();
+    properties.put(TraceContext.TELEMETRY_TRACE_KEY, TEST_TRACE_ID);
+    systemMetadata.setProperties(new StringMap(properties));
+
+    EnvelopedAspect envelopedAspect = new EnvelopedAspect();
+    envelopedAspect.setCreated(new AuditStamp().setTime(Instant.now().toEpochMilli()));
+    envelopedAspect.setSystemMetadata(systemMetadata);
+
+    EntityResponse entityResponse = new EntityResponse();
+    entityResponse.setAspects(
+        new EnvelopedAspectMap(Collections.singletonMap(ASPECT_NAME, envelopedAspect)));
+    entityResponse.setEntityName(TEST_URN.getEntityType());
+    entityResponse.setUrn(TEST_URN);
+
+    when(entityService.getEntitiesV2(any(), anyString(), anySet(), anySet(), anyBoolean()))
+        .thenReturn(Collections.singletonMap(TEST_URN, entityResponse));
+
+    // Mock search storage response
+    AspectRowSummary summary = mock(AspectRowSummary.class);
+    when(summary.getUrn()).thenReturn(TEST_URN.toString());
+    when(summary.getAspectName()).thenReturn(ASPECT_NAME);
+    when(summary.getTelemetryTraceId()).thenReturn(TEST_TRACE_ID);
+    when(systemMetadataService.findAspectsByUrn(eq(TEST_URN), anyList(), eq(true)))
+        .thenReturn(Collections.singletonList(summary));
+
+    // Act
+    Map<Urn, Map<String, TraceStatus>> result =
+        traceService.trace(operationContext, TEST_TRACE_ID, aspectNames, false, false);
+
+    // Assert
+    assertNotNull(result);
+    assertTrue(result.containsKey(TEST_URN));
+    Map<String, TraceStatus> urnStatus = result.get(TEST_URN);
+    assertTrue(urnStatus.containsKey(ASPECT_NAME));
+
+    TraceStatus status = urnStatus.get(ASPECT_NAME);
+    assertEquals(status.getPrimaryStorage().getWriteStatus(), TraceWriteStatus.ACTIVE_STATE);
+    assertEquals(status.getSearchStorage().getWriteStatus(), TraceWriteStatus.ACTIVE_STATE);
+    assertTrue(status.isSuccess());
+  }
+
+  @Test
+  public void testTraceWithPendingStatus() throws Exception {
+    // Arrange
+    Map<Urn, List<String>> aspectNames =
+        Collections.singletonMap(TEST_URN, Collections.singletonList(ASPECT_NAME));
+
+    // Mock empty entity response (not in SQL)
+    when(entityService.getEntitiesV2(any(), anyString(), anySet(), anySet(), anyBoolean()))
+        .thenReturn(Collections.emptyMap());
+
+    // Mock pending status from Kafka
+    Map<String, TraceStorageStatus> pendingStatus = new LinkedHashMap<>();
+    pendingStatus.put(
+        ASPECT_NAME,
+        TraceStorageStatus.ok(TraceWriteStatus.PENDING, "Consumer has not processed offset."));
+
+    when(mcpTraceReader.tracePendingStatuses(any(), eq(TEST_TRACE_ID), any(), anyBoolean()))
+        .thenReturn(Collections.singletonMap(TEST_URN, pendingStatus));
+
+    // Act
+    Map<Urn, Map<String, TraceStatus>> result =
+        traceService.trace(operationContext, TEST_TRACE_ID, aspectNames, false, false);
+
+    // Assert
+    assertNotNull(result);
+    assertTrue(result.containsKey(TEST_URN));
+    Map<String, TraceStatus> urnStatus = result.get(TEST_URN);
+    assertTrue(urnStatus.containsKey(ASPECT_NAME));
+
+    TraceStatus status = urnStatus.get(ASPECT_NAME);
+    assertEquals(status.getPrimaryStorage().getWriteStatus(), TraceWriteStatus.PENDING);
+    assertTrue(status.isSuccess());
+  }
+
+  @Test
+  public void testTraceWithErrorStatus() throws Exception {
+    // Arrange
+    Map<Urn, List<String>> aspectNames =
+        Collections.singletonMap(TEST_URN, Collections.singletonList(ASPECT_NAME));
+
+    // Mock empty entity response
+    when(entityService.getEntitiesV2(any(), anyString(), anySet(), anySet(), anyBoolean()))
+        .thenReturn(Collections.emptyMap());
+
+    // Mock error status from Kafka
+    Map<String, TraceStorageStatus> errorStatus = new LinkedHashMap<>();
+    errorStatus.put(
+        ASPECT_NAME, TraceStorageStatus.fail(TraceWriteStatus.ERROR, "Failed to process message."));
+
+    when(mcpTraceReader.tracePendingStatuses(any(), eq(TEST_TRACE_ID), any(), anyBoolean()))
+        .thenReturn(Collections.singletonMap(TEST_URN, errorStatus));
+
+    // Act
+    Map<Urn, Map<String, TraceStatus>> result =
+        traceService.trace(operationContext, TEST_TRACE_ID, aspectNames, true, true);
+
+    // Assert
+    assertNotNull(result);
+    assertTrue(result.containsKey(TEST_URN));
+    Map<String, TraceStatus> urnStatus = result.get(TEST_URN);
+    assertTrue(urnStatus.containsKey(ASPECT_NAME));
+
+    TraceStatus status = urnStatus.get(ASPECT_NAME);
+    assertEquals(status.getPrimaryStorage().getWriteStatus(), TraceWriteStatus.ERROR);
+    assertFalse(status.isSuccess());
+  }
+
+  @Test
+  public void testTraceWithTimeseriesAspect() throws Exception {
+    // Arrange
+    Map<Urn, List<String>> aspectNames =
+        Collections.singletonMap(TEST_URN, Collections.singletonList(TIMESERIES_ASPECT_NAME));
+
+    // Act
+    Map<Urn, Map<String, TraceStatus>> result =
+        traceService.trace(operationContext, TEST_TRACE_ID, aspectNames, false, false);
+
+    // Assert
+    assertNotNull(result);
+    assertTrue(result.containsKey(TEST_URN));
+    Map<String, TraceStatus> urnStatus = result.get(TEST_URN);
+    assertTrue(urnStatus.containsKey(TIMESERIES_ASPECT_NAME));
+
+    TraceStatus status = urnStatus.get(TIMESERIES_ASPECT_NAME);
+    assertEquals(status.getPrimaryStorage().getWriteStatus(), TraceWriteStatus.NO_OP);
+    assertEquals(
+        status.getSearchStorage().getWriteStatus(), TraceWriteStatus.TRACE_NOT_IMPLEMENTED);
+    assertTrue(status.isSuccess());
+  }
+
+  @Test
+  public void testTraceWithHistoricState() throws Exception {
+    // Arrange
+    Map<Urn, List<String>> aspectNames =
+        Collections.singletonMap(TEST_URN, Collections.singletonList(ASPECT_NAME));
+
+    // Mock primary storage with historic state
+    SystemMetadata systemMetadata = new SystemMetadata();
+    Map<String, String> properties = new HashMap<>();
+    properties.put(TraceContext.TELEMETRY_TRACE_KEY, TEST_TRACE_ID_FUTURE);
+    systemMetadata.setProperties(new StringMap(properties));
+
+    EnvelopedAspect envelopedAspect = new EnvelopedAspect();
+    envelopedAspect.setCreated(
+        new AuditStamp()
+            .setTime(
+                TraceIdGenerator.getTimestampMillis(TEST_TRACE_ID_FUTURE))); // Future timestamp
+    envelopedAspect.setSystemMetadata(systemMetadata);
+
+    EntityResponse entityResponse = new EntityResponse();
+    entityResponse.setAspects(
+        new EnvelopedAspectMap(Collections.singletonMap(ASPECT_NAME, envelopedAspect)));
+    entityResponse.setEntityName(TEST_URN.getEntityType());
+    entityResponse.setUrn(TEST_URN);
+
+    when(entityService.getEntitiesV2(any(), anyString(), anySet(), anySet(), anyBoolean()))
+        .thenReturn(Collections.singletonMap(TEST_URN, entityResponse));
+
+    // Mock search storage with historic state
+    AspectRowSummary summary = mock(AspectRowSummary.class);
+    when(summary.getUrn()).thenReturn(TEST_URN.toString());
+    when(summary.getAspectName()).thenReturn(ASPECT_NAME);
+    when(summary.hasTimestamp()).thenReturn(true);
+    when(summary.getTimestamp())
+        .thenReturn(TraceIdGenerator.getTimestampMillis(TEST_TRACE_ID_FUTURE)); // Future timestamp
+    when(summary.getTelemetryTraceId()).thenReturn(TEST_TRACE_ID_FUTURE);
+
+    when(systemMetadataService.findAspectsByUrn(eq(TEST_URN), anyList(), eq(true)))
+        .thenReturn(Collections.singletonList(summary));
+
+    // Act
+    Map<Urn, Map<String, TraceStatus>> result =
+        traceService.trace(operationContext, TEST_TRACE_ID, aspectNames, false, false);
+
+    // Assert
+    assertNotNull(result);
+    assertTrue(result.containsKey(TEST_URN));
+    Map<String, TraceStatus> urnStatus = result.get(TEST_URN);
+    assertTrue(urnStatus.containsKey(ASPECT_NAME));
+
+    TraceStatus status = urnStatus.get(ASPECT_NAME);
+    assertEquals(status.getPrimaryStorage().getWriteStatus(), TraceWriteStatus.HISTORIC_STATE);
+    assertEquals(status.getSearchStorage().getWriteStatus(), TraceWriteStatus.HISTORIC_STATE);
+    assertTrue(status.isSuccess());
+  }
+
+  @Test
+  public void testTraceWithFailedMessage() throws Exception {
+    // Arrange
+    Map<Urn, List<String>> aspectNames =
+        Collections.singletonMap(TEST_URN, Collections.singletonList(ASPECT_NAME));
+
+    // Mock primary storage with ERROR status
+    Map<String, TraceStorageStatus> errorStatus = new LinkedHashMap<>();
+    errorStatus.put(ASPECT_NAME, TraceStorageStatus.fail(TraceWriteStatus.ERROR, "Initial error"));
+
+    when(mcpTraceReader.tracePendingStatuses(any(), eq(TEST_TRACE_ID), any(), anyBoolean()))
+        .thenReturn(Collections.singletonMap(TEST_URN, errorStatus));
+
+    // Mock the failed message in MCPFailedTraceReader
+    SystemMetadata failedMetadata = new SystemMetadata();
+    Map<String, String> properties = new HashMap<>();
+    properties.put(TraceContext.TELEMETRY_TRACE_KEY, TEST_TRACE_ID);
+    failedMetadata.setProperties(new StringMap(properties));
+
+    FailedMetadataChangeProposal failedMCP =
+        new FailedMetadataChangeProposal()
+            .setError(
+                "[{\"message\":\"Processing failed: Test error message\",\"exceptionClass\":\"java.lang.IllegalArgumentException\"}]")
+            .setMetadataChangeProposal(
+                new MetadataChangeProposal()
+                    .setEntityUrn(TEST_URN)
+                    .setChangeType(ChangeType.UPSERT)
+                    .setAspectName(ASPECT_NAME)
+                    .setEntityType(TEST_URN.getEntityType())
+                    .setSystemMetadata(failedMetadata));
+
+    GenericRecord genericRecord = EventUtils.pegasusToAvroFailedMCP(failedMCP);
+    ConsumerRecord<String, GenericRecord> failedRecord = mock(ConsumerRecord.class);
+    when(failedRecord.value()).thenReturn(genericRecord);
+
+    Map<String, Pair<ConsumerRecord<String, GenericRecord>, SystemMetadata>> failedMessages =
+        Collections.singletonMap(ASPECT_NAME, Pair.of(failedRecord, failedMetadata));
+
+    when(mcpFailedTraceReader.findMessages(any(), eq(TEST_TRACE_ID), any()))
+        .thenReturn(Collections.singletonMap(TEST_URN, failedMessages));
+
+    // Mock failed record read with error message
+    when(mcpFailedTraceReader.read(eq(genericRecord))).thenReturn(Optional.of(failedMCP));
+
+    // Act
+    Map<Urn, Map<String, TraceStatus>> result =
+        traceService.trace(operationContext, TEST_TRACE_ID, aspectNames, true, true);
+
+    // Assert
+    assertNotNull(result);
+    assertTrue(result.containsKey(TEST_URN));
+    Map<String, TraceStatus> urnStatus = result.get(TEST_URN);
+    assertTrue(urnStatus.containsKey(ASPECT_NAME));
+
+    TraceStatus status = urnStatus.get(ASPECT_NAME);
+    assertEquals(status.getPrimaryStorage().getWriteStatus(), TraceWriteStatus.ERROR);
+    assertNotNull(status.getPrimaryStorage().getWriteExceptions());
+    assertEquals(status.getPrimaryStorage().getWriteExceptions().size(), 1);
+    assertEquals(
+        status.getPrimaryStorage().getWriteExceptions().get(0).getMessage(),
+        "Processing failed: Test error message");
+    assertEquals(
+        status.getPrimaryStorage().getWriteExceptions().get(0).getExceptionClass(),
+        "java.lang.IllegalArgumentException");
+    assertFalse(status.isSuccess());
+  }
+}
diff --git a/metadata-jobs/mae-consumer-job/src/main/java/com/linkedin/metadata/kafka/MAEOpenTelemetryConfig.java b/metadata-jobs/mae-consumer-job/src/main/java/com/linkedin/metadata/kafka/MAEOpenTelemetryConfig.java
new file mode 100644
index 00000000000000..e1761755fd3adc
--- /dev/null
+++ b/metadata-jobs/mae-consumer-job/src/main/java/com/linkedin/metadata/kafka/MAEOpenTelemetryConfig.java
@@ -0,0 +1,21 @@
+package com.linkedin.metadata.kafka;
+
+import com.linkedin.gms.factory.system_telemetry.OpenTelemetryBaseFactory;
+import io.datahubproject.metadata.context.TraceContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MAEOpenTelemetryConfig extends OpenTelemetryBaseFactory {
+
+  @Override
+  protected String getApplicationComponent() {
+    return "datahub-mae-consumer";
+  }
+
+  @Bean
+  @Override
+  protected TraceContext traceContext() {
+    return super.traceContext();
+  }
+}
diff --git a/metadata-jobs/mae-consumer/build.gradle b/metadata-jobs/mae-consumer/build.gradle
index b4990e289b10df..08c712f6167b40 100644
--- a/metadata-jobs/mae-consumer/build.gradle
+++ b/metadata-jobs/mae-consumer/build.gradle
@@ -33,6 +33,7 @@ dependencies {
 
     implementation externalDependency.springKafka
     implementation externalDependency.annotationApi
+    implementation externalDependency.opentelemetrySdkTrace
 
     implementation externalDependency.slf4jApi
     compileOnly externalDependency.lombok
diff --git a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/DataHubUsageEventsProcessor.java b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/DataHubUsageEventsProcessor.java
index d699f0bff68019..29a3ffa0a340d6 100644
--- a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/DataHubUsageEventsProcessor.java
+++ b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/DataHubUsageEventsProcessor.java
@@ -2,7 +2,6 @@
 
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
 import com.linkedin.events.metadata.ChangeType;
 import com.linkedin.gms.factory.kafka.SimpleKafkaConsumerFactory;
 import com.linkedin.metadata.kafka.config.DataHubUsageEventsProcessorCondition;
@@ -12,11 +11,13 @@
 import com.linkedin.metadata.utils.elasticsearch.IndexConvention;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
 import com.linkedin.mxe.Topics;
+import io.datahubproject.metadata.context.OperationContext;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Import;
 import org.springframework.kafka.annotation.EnableKafka;
@@ -33,6 +34,7 @@ public class DataHubUsageEventsProcessor {
   private final ElasticsearchConnector elasticSearchConnector;
   private final DataHubUsageEventTransformer dataHubUsageEventTransformer;
   private final String indexName;
+  private final OperationContext systemOperationContext;
 
   private final Histogram kafkaLagStats =
       MetricUtils.get().histogram(MetricRegistry.name(this.getClass(), "kafkaLag"));
@@ -40,10 +42,12 @@ public class DataHubUsageEventsProcessor {
   public DataHubUsageEventsProcessor(
       ElasticsearchConnector elasticSearchConnector,
       DataHubUsageEventTransformer dataHubUsageEventTransformer,
-      IndexConvention indexConvention) {
+      IndexConvention indexConvention,
+      @Qualifier("systemOperationContext") OperationContext systemOperationContext) {
     this.elasticSearchConnector = elasticSearchConnector;
     this.dataHubUsageEventTransformer = dataHubUsageEventTransformer;
     this.indexName = indexConvention.getIndexName("datahub_usage_event");
+    this.systemOperationContext = systemOperationContext;
   }
 
   @KafkaListener(
@@ -52,31 +56,36 @@ public DataHubUsageEventsProcessor(
       containerFactory = "simpleKafkaConsumer",
       autoStartup = "false")
   public void consume(final ConsumerRecord<String, String> consumerRecord) {
-    try (Timer.Context i = MetricUtils.timer(this.getClass(), "consume").time()) {
-      kafkaLagStats.update(System.currentTimeMillis() - consumerRecord.timestamp());
-      final String record = consumerRecord.value();
+    systemOperationContext.withSpan(
+        "consume",
+        () -> {
+          kafkaLagStats.update(System.currentTimeMillis() - consumerRecord.timestamp());
+          final String record = consumerRecord.value();
 
-      log.info(
-          "Got DHUE event key: {}, topic: {}, partition: {}, offset: {}, value size: {}, timestamp: {}",
-          consumerRecord.key(),
-          consumerRecord.topic(),
-          consumerRecord.partition(),
-          consumerRecord.offset(),
-          consumerRecord.serializedValueSize(),
-          consumerRecord.timestamp());
+          log.info(
+              "Got DHUE event key: {}, topic: {}, partition: {}, offset: {}, value size: {}, timestamp: {}",
+              consumerRecord.key(),
+              consumerRecord.topic(),
+              consumerRecord.partition(),
+              consumerRecord.offset(),
+              consumerRecord.serializedValueSize(),
+              consumerRecord.timestamp());
 
-      Optional<DataHubUsageEventTransformer.TransformedDocument> eventDocument =
-          dataHubUsageEventTransformer.transformDataHubUsageEvent(record);
-      if (eventDocument.isEmpty()) {
-        log.warn("Failed to apply usage events transform to record: {}", record);
-        return;
-      }
-      JsonElasticEvent elasticEvent = new JsonElasticEvent(eventDocument.get().getDocument());
-      elasticEvent.setId(generateDocumentId(eventDocument.get().getId(), consumerRecord.offset()));
-      elasticEvent.setIndex(indexName);
-      elasticEvent.setActionType(ChangeType.CREATE);
-      elasticSearchConnector.feedElasticEvent(elasticEvent);
-    }
+          Optional<DataHubUsageEventTransformer.TransformedDocument> eventDocument =
+              dataHubUsageEventTransformer.transformDataHubUsageEvent(record);
+          if (eventDocument.isEmpty()) {
+            log.warn("Failed to apply usage events transform to record: {}", record);
+            return;
+          }
+          JsonElasticEvent elasticEvent = new JsonElasticEvent(eventDocument.get().getDocument());
+          elasticEvent.setId(
+              generateDocumentId(eventDocument.get().getId(), consumerRecord.offset()));
+          elasticEvent.setIndex(indexName);
+          elasticEvent.setActionType(ChangeType.CREATE);
+          elasticSearchConnector.feedElasticEvent(elasticEvent);
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "consume"));
   }
 
   /**
diff --git a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/MCLKafkaListener.java b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/MCLKafkaListener.java
index a2d59023ba5ce2..ec33ea12209310 100644
--- a/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/MCLKafkaListener.java
+++ b/metadata-jobs/mae-consumer/src/main/java/com/linkedin/metadata/kafka/MCLKafkaListener.java
@@ -7,7 +7,6 @@
 
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.events.metadata.ChangeType;
 import com.linkedin.metadata.EventUtils;
@@ -15,6 +14,8 @@
 import com.linkedin.metadata.utils.metrics.MetricUtils;
 import com.linkedin.mxe.MetadataChangeLog;
 import io.datahubproject.metadata.context.OperationContext;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.StatusCode;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -33,11 +34,13 @@ public class MCLKafkaListener {
 
   private final String consumerGroupId;
   private final List<MetadataChangeLogHook> hooks;
+  private final OperationContext systemOperationContext;
 
   public MCLKafkaListener(
       OperationContext systemOperationContext,
       String consumerGroup,
       List<MetadataChangeLogHook> hooks) {
+    this.systemOperationContext = systemOperationContext;
     this.consumerGroupId = consumerGroup;
     this.hooks = hooks;
     this.hooks.forEach(hook -> hook.init(systemOperationContext));
@@ -49,7 +52,7 @@ public MCLKafkaListener(
   }
 
   public void consume(final ConsumerRecord<String, GenericRecord> consumerRecord) {
-    try (Timer.Context i = MetricUtils.timer(this.getClass(), "consume").time()) {
+    try {
       kafkaLagStats.update(System.currentTimeMillis() - consumerRecord.timestamp());
       final GenericRecord record = consumerRecord.value();
       log.debug(
@@ -85,38 +88,61 @@ public void consume(final ConsumerRecord<String, GenericRecord> consumerRecord)
       MDC.put(
           MDC_CHANGE_TYPE, Optional.ofNullable(changeType).map(ChangeType::toString).orElse(""));
 
-      log.info(
-          "Invoking MCL hooks for consumer: {} urn: {}, aspect name: {}, entity type: {}, change type: {}",
-          consumerGroupId,
-          entityUrn,
-          aspectName,
-          entityType,
-          changeType);
+      systemOperationContext.withQueueSpan(
+          "consume",
+          event.getSystemMetadata(),
+          consumerRecord.topic(),
+          () -> {
+            log.info(
+                "Invoking MCL hooks for consumer: {} urn: {}, aspect name: {}, entity type: {}, change type: {}",
+                consumerGroupId,
+                entityUrn,
+                aspectName,
+                entityType,
+                changeType);
 
-      // Here - plug in additional "custom processor hooks"
-      for (MetadataChangeLogHook hook : this.hooks) {
-        log.debug(
-            "Invoking MCL hook {} for urn: {}",
-            hook.getClass().getSimpleName(),
-            event.getEntityUrn());
-        try (Timer.Context ignored =
-            MetricUtils.timer(this.getClass(), hook.getClass().getSimpleName() + "_latency")
-                .time()) {
-          hook.invoke(event);
-        } catch (Exception e) {
-          // Just skip this hook and continue. - Note that this represents "at most once"//
-          // processing.
-          MetricUtils.counter(this.getClass(), hook.getClass().getSimpleName() + "_failure").inc();
-          log.error(
-              "Failed to execute MCL hook with name {}", hook.getClass().getCanonicalName(), e);
-        }
-      }
-      // TODO: Manually commit kafka offsets after full processing.
-      MetricUtils.counter(this.getClass(), consumerGroupId + "_consumed_mcl_count").inc();
-      log.info(
-          "Successfully completed MCL hooks for consumer: {} urn: {}",
-          consumerGroupId,
-          event.getEntityUrn());
+            // Here - plug in additional "custom processor hooks"
+            for (MetadataChangeLogHook hook : this.hooks) {
+              systemOperationContext.withSpan(
+                  hook.getClass().getSimpleName(),
+                  () -> {
+                    log.debug(
+                        "Invoking MCL hook {} for urn: {}",
+                        hook.getClass().getSimpleName(),
+                        event.getEntityUrn());
+                    try {
+                      hook.invoke(event);
+                    } catch (Exception e) {
+                      // Just skip this hook and continue. - Note that this represents "at most
+                      // once"//
+                      // processing.
+                      MetricUtils.counter(
+                              this.getClass(), hook.getClass().getSimpleName() + "_failure")
+                          .inc();
+                      log.error(
+                          "Failed to execute MCL hook with name {}",
+                          hook.getClass().getCanonicalName(),
+                          e);
+
+                      Span currentSpan = Span.current();
+                      currentSpan.recordException(e);
+                      currentSpan.setStatus(StatusCode.ERROR, e.getMessage());
+                      currentSpan.setAttribute(MetricUtils.ERROR_TYPE, e.getClass().getName());
+                    }
+                  },
+                  MetricUtils.DROPWIZARD_NAME,
+                  MetricUtils.name(this.getClass(), hook.getClass().getSimpleName() + "_latency"));
+            }
+
+            // TODO: Manually commit kafka offsets after full processing.
+            MetricUtils.counter(this.getClass(), consumerGroupId + "_consumed_mcl_count").inc();
+            log.info(
+                "Successfully completed MCL hooks for consumer: {} urn: {}",
+                consumerGroupId,
+                event.getEntityUrn());
+          },
+          MetricUtils.DROPWIZARD_NAME,
+          MetricUtils.name(this.getClass(), "consume"));
     } finally {
       MDC.clear();
     }
diff --git a/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLSpringCommonTestConfiguration.java b/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLSpringCommonTestConfiguration.java
index c92749385145de..017570cfcf7afb 100644
--- a/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLSpringCommonTestConfiguration.java
+++ b/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLSpringCommonTestConfiguration.java
@@ -96,6 +96,7 @@ public OperationContext operationContext(
         indexConvention,
         TestOperationContexts.emptyActiveUsersRetrieverContext(() -> entityRegistry),
         mock(ValidationContext.class),
+        null,
         true);
   }
 
diff --git a/metadata-jobs/mce-consumer-job/src/main/java/com/linkedin/metadata/kafka/MCEOpenTelemetryConfig.java b/metadata-jobs/mce-consumer-job/src/main/java/com/linkedin/metadata/kafka/MCEOpenTelemetryConfig.java
new file mode 100644
index 00000000000000..9ae6aa5f50c1f4
--- /dev/null
+++ b/metadata-jobs/mce-consumer-job/src/main/java/com/linkedin/metadata/kafka/MCEOpenTelemetryConfig.java
@@ -0,0 +1,21 @@
+package com.linkedin.metadata.kafka;
+
+import com.linkedin.gms.factory.system_telemetry.OpenTelemetryBaseFactory;
+import io.datahubproject.metadata.context.TraceContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MCEOpenTelemetryConfig extends OpenTelemetryBaseFactory {
+
+  @Override
+  protected String getApplicationComponent() {
+    return "datahub-mce-consumer";
+  }
+
+  @Bean
+  @Override
+  protected TraceContext traceContext() {
+    return super.traceContext();
+  }
+}
diff --git a/metadata-jobs/mce-consumer/build.gradle b/metadata-jobs/mce-consumer/build.gradle
index 2da3957c4bb218..21951106ca6b24 100644
--- a/metadata-jobs/mce-consumer/build.gradle
+++ b/metadata-jobs/mce-consumer/build.gradle
@@ -30,6 +30,7 @@ dependencies {
     implementation externalDependency.protobuf
 
     implementation externalDependency.springKafka
+    implementation externalDependency.opentelemetrySdkTrace
 
     implementation externalDependency.slf4jApi
     compileOnly externalDependency.lombok
diff --git a/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeEventsProcessor.java b/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeEventsProcessor.java
index 2152ed15cf0e93..b5d721589aeef3 100644
--- a/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeEventsProcessor.java
+++ b/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeEventsProcessor.java
@@ -4,7 +4,6 @@
 
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
 import com.linkedin.entity.Entity;
 import com.linkedin.entity.client.SystemEntityClient;
 import com.linkedin.gms.factory.entityclient.RestliEntityClientFactory;
@@ -66,35 +65,39 @@ public class MetadataChangeEventsProcessor {
       autoStartup = "false")
   @Deprecated
   public void consume(final ConsumerRecord<String, GenericRecord> consumerRecord) {
-    try (Timer.Context i = MetricUtils.timer(this.getClass(), "consume").time()) {
-      kafkaLagStats.update(System.currentTimeMillis() - consumerRecord.timestamp());
-      final GenericRecord record = consumerRecord.value();
+    systemOperationContext.withSpan(
+        "consume",
+        () -> {
+          kafkaLagStats.update(System.currentTimeMillis() - consumerRecord.timestamp());
+          final GenericRecord record = consumerRecord.value();
 
-      log.info(
-          "Got MCE event key: {}, topic: {}, partition: {}, offset: {}, value size: {}, timestamp: {}",
-          consumerRecord.key(),
-          consumerRecord.topic(),
-          consumerRecord.partition(),
-          consumerRecord.offset(),
-          consumerRecord.serializedValueSize(),
-          consumerRecord.timestamp());
+          log.info(
+              "Got MCE event key: {}, topic: {}, partition: {}, offset: {}, value size: {}, timestamp: {}",
+              consumerRecord.key(),
+              consumerRecord.topic(),
+              consumerRecord.partition(),
+              consumerRecord.offset(),
+              consumerRecord.serializedValueSize(),
+              consumerRecord.timestamp());
 
-      log.debug("Record {}", record);
+          log.debug("Record {}", record);
 
-      MetadataChangeEvent event = new MetadataChangeEvent();
+          MetadataChangeEvent event = new MetadataChangeEvent();
 
-      try {
-        event = EventUtils.avroToPegasusMCE(record);
-        log.debug("MetadataChangeEvent {}", event);
-        if (event.hasProposedSnapshot()) {
-          processProposedSnapshot(event);
-        }
-      } catch (Throwable throwable) {
-        log.error("MCE Processor Error", throwable);
-        log.error("Message: {}", record);
-        sendFailedMCE(event, throwable);
-      }
-    }
+          try {
+            event = EventUtils.avroToPegasusMCE(record);
+            log.debug("MetadataChangeEvent {}", event);
+            if (event.hasProposedSnapshot()) {
+              processProposedSnapshot(event);
+            }
+          } catch (Throwable throwable) {
+            log.error("MCE Processor Error", throwable);
+            log.error("Message: {}", record);
+            sendFailedMCE(event, throwable);
+          }
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "consume"));
   }
 
   private void sendFailedMCE(@Nonnull MetadataChangeEvent event, @Nonnull Throwable throwable) {
diff --git a/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeProposalsProcessor.java b/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeProposalsProcessor.java
index d854a5517793ff..98195f57526824 100644
--- a/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeProposalsProcessor.java
+++ b/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/MetadataChangeProposalsProcessor.java
@@ -5,10 +5,10 @@
 import static com.linkedin.metadata.Constants.MDC_ENTITY_TYPE;
 import static com.linkedin.metadata.Constants.MDC_ENTITY_URN;
 import static com.linkedin.metadata.config.kafka.KafkaConfiguration.MCP_EVENT_CONSUMER_NAME;
+import static com.linkedin.mxe.ConsumerGroups.MCP_CONSUMER_GROUP_ID_VALUE;
 
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.entity.client.SystemEntityClient;
 import com.linkedin.events.metadata.ChangeType;
@@ -16,20 +16,23 @@
 import com.linkedin.gms.factory.entityclient.RestliEntityClientFactory;
 import com.linkedin.metadata.EventUtils;
 import com.linkedin.metadata.dao.throttle.ThrottleSensor;
+import com.linkedin.metadata.event.EventProducer;
 import com.linkedin.metadata.kafka.config.MetadataChangeProposalProcessorCondition;
 import com.linkedin.metadata.kafka.util.KafkaListenerUtil;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
 import com.linkedin.mxe.MetadataChangeProposal;
 import com.linkedin.mxe.Topics;
 import io.datahubproject.metadata.context.OperationContext;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.StatusCode;
+import java.io.IOException;
+import java.util.List;
 import java.util.Optional;
 import javax.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.generic.IndexedRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.producer.Producer;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -47,12 +50,9 @@
 @EnableKafka
 @RequiredArgsConstructor
 public class MetadataChangeProposalsProcessor {
-  private static final String CONSUMER_GROUP_ID_VALUE =
-      "${METADATA_CHANGE_PROPOSAL_KAFKA_CONSUMER_GROUP_ID:generic-mce-consumer-job-client}";
-
   private final OperationContext systemOperationContext;
   private final SystemEntityClient entityClient;
-  private final Producer<String, IndexedRecord> kafkaProducer;
+  private final EventProducer kafkaProducer;
 
   @Qualifier("kafkaThrottle")
   private final ThrottleSensor kafkaThrottle;
@@ -69,7 +69,7 @@ public class MetadataChangeProposalsProcessor {
           + "}")
   private String fmcpTopicName;
 
-  @Value(CONSUMER_GROUP_ID_VALUE)
+  @Value(MCP_CONSUMER_GROUP_ID_VALUE)
   private String mceConsumerGroupId;
 
   @PostConstruct
@@ -78,12 +78,12 @@ public void registerConsumerThrottle() {
   }
 
   @KafkaListener(
-      id = CONSUMER_GROUP_ID_VALUE,
+      id = MCP_CONSUMER_GROUP_ID_VALUE,
       topics = "${METADATA_CHANGE_PROPOSAL_TOPIC_NAME:" + Topics.METADATA_CHANGE_PROPOSAL + "}",
       containerFactory = MCP_EVENT_CONSUMER_NAME,
       autoStartup = "false")
   public void consume(final ConsumerRecord<String, GenericRecord> consumerRecord) {
-    try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "consume").time()) {
+    try {
       kafkaLagStats.update(System.currentTimeMillis() - consumerRecord.timestamp());
       final GenericRecord record = consumerRecord.value();
 
@@ -100,29 +100,50 @@ public void consume(final ConsumerRecord<String, GenericRecord> consumerRecord)
         log.debug("Record {}", record);
       }
 
-      MetadataChangeProposal event = new MetadataChangeProposal();
+      final MetadataChangeProposal event;
       try {
         event = EventUtils.avroToPegasusMCP(record);
 
-        Urn entityUrn = event.getEntityUrn();
-        String aspectName = event.hasAspectName() ? event.getAspectName() : null;
-        String entityType = event.hasEntityType() ? event.getEntityType() : null;
-        ChangeType changeType = event.hasChangeType() ? event.getChangeType() : null;
-        MDC.put(MDC_ENTITY_URN, Optional.ofNullable(entityUrn).map(Urn::toString).orElse(""));
-        MDC.put(MDC_ASPECT_NAME, aspectName);
-        MDC.put(MDC_ENTITY_TYPE, entityType);
-        MDC.put(
-            MDC_CHANGE_TYPE, Optional.ofNullable(changeType).map(ChangeType::toString).orElse(""));
-
-        if (log.isDebugEnabled()) {
-          log.debug("MetadataChangeProposal {}", event);
-        }
-        String urn = entityClient.ingestProposal(systemOperationContext, event, false);
-        log.info("Successfully processed MCP event urn: {}", urn);
-      } catch (Throwable throwable) {
-        log.error("MCP Processor Error", throwable);
-        log.error("Message: {}", record);
-        KafkaListenerUtil.sendFailedMCP(event, throwable, fmcpTopicName, kafkaProducer);
+        systemOperationContext.withQueueSpan(
+            "consume",
+            event.getSystemMetadata(),
+            consumerRecord.topic(),
+            () -> {
+              try {
+                Urn entityUrn = event.getEntityUrn();
+                String aspectName = event.hasAspectName() ? event.getAspectName() : null;
+                String entityType = event.hasEntityType() ? event.getEntityType() : null;
+                ChangeType changeType = event.hasChangeType() ? event.getChangeType() : null;
+                MDC.put(
+                    MDC_ENTITY_URN, Optional.ofNullable(entityUrn).map(Urn::toString).orElse(""));
+                MDC.put(MDC_ASPECT_NAME, aspectName);
+                MDC.put(MDC_ENTITY_TYPE, entityType);
+                MDC.put(
+                    MDC_CHANGE_TYPE,
+                    Optional.ofNullable(changeType).map(ChangeType::toString).orElse(""));
+
+                if (log.isDebugEnabled()) {
+                  log.debug("MetadataChangeProposal {}", event);
+                }
+                String urn = entityClient.ingestProposal(systemOperationContext, event, false);
+                log.info("Successfully processed MCP event urn: {}", urn);
+              } catch (Throwable throwable) {
+                log.error("MCP Processor Error", throwable);
+                log.error("Message: {}", record);
+                Span currentSpan = Span.current();
+                currentSpan.recordException(throwable);
+                currentSpan.setStatus(StatusCode.ERROR, throwable.getMessage());
+                currentSpan.setAttribute(MetricUtils.ERROR_TYPE, throwable.getClass().getName());
+
+                kafkaProducer.produceFailedMetadataChangeProposal(
+                    systemOperationContext, List.of(event), throwable);
+              }
+            },
+            MetricUtils.DROPWIZARD_NAME,
+            MetricUtils.name(this.getClass(), "consume"));
+      } catch (IOException e) {
+        log.error(
+            "Unrecoverable message deserialization error. Cannot forward to failure topic.", e);
       }
     } finally {
       MDC.clear();
diff --git a/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/batch/BatchMetadataChangeProposalsProcessor.java b/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/batch/BatchMetadataChangeProposalsProcessor.java
index 5ee9cd6ba94d2f..6f9798aa1da2c4 100644
--- a/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/batch/BatchMetadataChangeProposalsProcessor.java
+++ b/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/batch/BatchMetadataChangeProposalsProcessor.java
@@ -1,28 +1,34 @@
 package com.linkedin.metadata.kafka.batch;
 
+import static com.linkedin.metadata.config.kafka.KafkaConfiguration.MCP_EVENT_CONSUMER_NAME;
+import static com.linkedin.metadata.utils.metrics.MetricUtils.BATCH_SIZE_ATTR;
+import static com.linkedin.mxe.ConsumerGroups.MCP_CONSUMER_GROUP_ID_VALUE;
+
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
 import com.linkedin.entity.client.SystemEntityClient;
 import com.linkedin.gms.factory.config.ConfigurationProvider;
 import com.linkedin.gms.factory.entityclient.RestliEntityClientFactory;
 import com.linkedin.metadata.EventUtils;
 import com.linkedin.metadata.dao.throttle.ThrottleSensor;
+import com.linkedin.metadata.event.EventProducer;
 import com.linkedin.metadata.kafka.config.batch.BatchMetadataChangeProposalProcessorCondition;
 import com.linkedin.metadata.kafka.util.KafkaListenerUtil;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
 import com.linkedin.mxe.MetadataChangeProposal;
+import com.linkedin.mxe.SystemMetadata;
 import com.linkedin.mxe.Topics;
 import io.datahubproject.metadata.context.OperationContext;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.StatusCode;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.generic.IndexedRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.producer.Producer;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Conditional;
@@ -39,12 +45,9 @@
 @EnableKafka
 @RequiredArgsConstructor
 public class BatchMetadataChangeProposalsProcessor {
-  private static final String CONSUMER_GROUP_ID_VALUE =
-      "${METADATA_CHANGE_PROPOSAL_KAFKA_CONSUMER_GROUP_ID:generic-mce-consumer-job-client}";
-
   private final OperationContext systemOperationContext;
   private final SystemEntityClient entityClient;
-  private final Producer<String, IndexedRecord> kafkaProducer;
+  private final EventProducer kafkaProducer;
 
   @Qualifier("kafkaThrottle")
   private final ThrottleSensor kafkaThrottle;
@@ -61,7 +64,7 @@ public class BatchMetadataChangeProposalsProcessor {
           + "}")
   private String fmcpTopicName;
 
-  @Value(CONSUMER_GROUP_ID_VALUE)
+  @Value(MCP_CONSUMER_GROUP_ID_VALUE)
   private String mceConsumerGroupId;
 
   @PostConstruct
@@ -70,48 +73,68 @@ public void registerConsumerThrottle() {
   }
 
   @KafkaListener(
-      id = CONSUMER_GROUP_ID_VALUE,
+      id = MCP_CONSUMER_GROUP_ID_VALUE,
       topics = "${METADATA_CHANGE_PROPOSAL_TOPIC_NAME:" + Topics.METADATA_CHANGE_PROPOSAL + "}",
-      containerFactory = "kafkaEventConsumer",
+      containerFactory = MCP_EVENT_CONSUMER_NAME,
       batch = "true",
       autoStartup = "false")
   public void consume(final List<ConsumerRecord<String, GenericRecord>> consumerRecords) {
-    try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "consume").time()) {
-      List<MetadataChangeProposal> metadataChangeProposals =
-          new ArrayList<>(consumerRecords.size());
-      for (ConsumerRecord<String, GenericRecord> consumerRecord : consumerRecords) {
-        kafkaLagStats.update(System.currentTimeMillis() - consumerRecord.timestamp());
-        final GenericRecord record = consumerRecord.value();
-
-        log.info(
-            "Got MCP event key: {}, topic: {}, partition: {}, offset: {}, value size: {}, timestamp: {}",
-            consumerRecord.key(),
-            consumerRecord.topic(),
-            consumerRecord.partition(),
-            consumerRecord.offset(),
-            consumerRecord.serializedValueSize(),
-            consumerRecord.timestamp());
-
-        MetadataChangeProposal event = new MetadataChangeProposal();
-        try {
-          event = EventUtils.avroToPegasusMCP(record);
-        } catch (Throwable throwable) {
-          log.error("MCP Processor Error", throwable);
-          log.error("Message: {}", record);
-          KafkaListenerUtil.sendFailedMCP(event, throwable, fmcpTopicName, kafkaProducer);
-        }
-        metadataChangeProposals.add(event);
+    List<MetadataChangeProposal> metadataChangeProposals = new ArrayList<>(consumerRecords.size());
+    String topicName = null;
+
+    for (ConsumerRecord<String, GenericRecord> consumerRecord : consumerRecords) {
+      kafkaLagStats.update(System.currentTimeMillis() - consumerRecord.timestamp());
+      final GenericRecord record = consumerRecord.value();
+
+      log.info(
+          "Got MCP event key: {}, topic: {}, partition: {}, offset: {}, value size: {}, timestamp: {}",
+          consumerRecord.key(),
+          consumerRecord.topic(),
+          consumerRecord.partition(),
+          consumerRecord.offset(),
+          consumerRecord.serializedValueSize(),
+          consumerRecord.timestamp());
+
+      if (topicName == null) {
+        topicName = consumerRecord.topic();
       }
 
+      final MetadataChangeProposal event;
       try {
-        List<String> urns =
-            entityClient.batchIngestProposals(
-                systemOperationContext, metadataChangeProposals, false);
-        log.info("Successfully processed MCP event urns: {}", urns);
-      } catch (Exception e) {
-        // Java client should never throw this
-        log.error("Exception in batch ingest", e);
+        event = EventUtils.avroToPegasusMCP(record);
+        metadataChangeProposals.add(event);
+      } catch (IOException e) {
+        log.error(
+            "Unrecoverable message deserialization error. Cannot forward to failure topic.", e);
       }
     }
+
+    List<SystemMetadata> systemMetadataList =
+        metadataChangeProposals.stream().map(MetadataChangeProposal::getSystemMetadata).toList();
+    systemOperationContext.withQueueSpan(
+        "consume",
+        systemMetadataList,
+        topicName,
+        () -> {
+          try {
+            List<String> urns =
+                entityClient.batchIngestProposals(
+                    systemOperationContext, metadataChangeProposals, false);
+            log.info("Successfully processed MCP event urns: {}", urns);
+          } catch (Throwable throwable) {
+            log.error("MCP Processor Error", throwable);
+            Span currentSpan = Span.current();
+            currentSpan.recordException(throwable);
+            currentSpan.setStatus(StatusCode.ERROR, throwable.getMessage());
+            currentSpan.setAttribute(MetricUtils.ERROR_TYPE, throwable.getClass().getName());
+
+            kafkaProducer.produceFailedMetadataChangeProposal(
+                systemOperationContext, metadataChangeProposals, throwable);
+          }
+        },
+        BATCH_SIZE_ATTR,
+        String.valueOf(metadataChangeProposals.size()),
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "consume"));
   }
 }
diff --git a/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/util/KafkaListenerUtil.java b/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/util/KafkaListenerUtil.java
index 874a45c995e911..c9dcb55d8e3d33 100644
--- a/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/util/KafkaListenerUtil.java
+++ b/metadata-jobs/mce-consumer/src/main/java/com/linkedin/metadata/kafka/util/KafkaListenerUtil.java
@@ -1,20 +1,10 @@
 package com.linkedin.metadata.kafka.util;
 
 import com.linkedin.gms.factory.config.ConfigurationProvider;
-import com.linkedin.metadata.EventUtils;
 import com.linkedin.metadata.dao.throttle.ThrottleControl;
 import com.linkedin.metadata.dao.throttle.ThrottleSensor;
-import com.linkedin.mxe.FailedMetadataChangeProposal;
-import com.linkedin.mxe.MetadataChangeProposal;
-import java.io.IOException;
 import java.util.Optional;
-import javax.annotation.Nonnull;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.generic.IndexedRecord;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.kafka.clients.producer.Producer;
-import org.apache.kafka.clients.producer.ProducerRecord;
 import org.springframework.kafka.config.KafkaListenerEndpointRegistry;
 import org.springframework.kafka.listener.MessageListenerContainer;
 
@@ -61,36 +51,4 @@ public static void registerThrottle(
       log.info("MCE Consumer Throttle Disabled");
     }
   }
-
-  public static void sendFailedMCP(
-      @Nonnull MetadataChangeProposal event,
-      @Nonnull Throwable throwable,
-      String fmcpTopicName,
-      Producer<String, IndexedRecord> kafkaProducer) {
-    final FailedMetadataChangeProposal failedMetadataChangeProposal =
-        createFailedMCPEvent(event, throwable);
-    try {
-      final GenericRecord genericFailedMCERecord =
-          EventUtils.pegasusToAvroFailedMCP(failedMetadataChangeProposal);
-      log.debug("Sending FailedMessages to topic - {}", fmcpTopicName);
-      log.info(
-          "Error while processing FMCP: FailedMetadataChangeProposal - {}",
-          failedMetadataChangeProposal);
-      kafkaProducer.send(new ProducerRecord<>(fmcpTopicName, genericFailedMCERecord));
-    } catch (IOException e) {
-      log.error(
-          "Error while sending FailedMetadataChangeProposal: Exception  - {}, FailedMetadataChangeProposal - {}",
-          e.getStackTrace(),
-          failedMetadataChangeProposal);
-    }
-  }
-
-  @Nonnull
-  public static FailedMetadataChangeProposal createFailedMCPEvent(
-      @Nonnull MetadataChangeProposal event, @Nonnull Throwable throwable) {
-    final FailedMetadataChangeProposal fmcp = new FailedMetadataChangeProposal();
-    fmcp.setError(ExceptionUtils.getStackTrace(throwable));
-    fmcp.setMetadataChangeProposal(event);
-    return fmcp;
-  }
 }
diff --git a/metadata-jobs/pe-consumer/src/main/java/com/datahub/event/PlatformEventProcessor.java b/metadata-jobs/pe-consumer/src/main/java/com/datahub/event/PlatformEventProcessor.java
index 2befeccb951a38..dadede7fe20bf5 100644
--- a/metadata-jobs/pe-consumer/src/main/java/com/datahub/event/PlatformEventProcessor.java
+++ b/metadata-jobs/pe-consumer/src/main/java/com/datahub/event/PlatformEventProcessor.java
@@ -4,7 +4,6 @@
 
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
 import com.datahub.event.hook.PlatformEventHook;
 import com.linkedin.metadata.EventUtils;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
@@ -61,53 +60,66 @@ public PlatformEventProcessor(
       containerFactory = PE_EVENT_CONSUMER_NAME,
       autoStartup = "false")
   public void consume(final ConsumerRecord<String, GenericRecord> consumerRecord) {
-    try (Timer.Context i = MetricUtils.timer(this.getClass(), "consume").time()) {
 
-      log.debug("Consuming a Platform Event");
+    systemOperationContext.withSpan(
+        "consume",
+        () -> {
+          log.debug("Consuming a Platform Event");
 
-      kafkaLagStats.update(System.currentTimeMillis() - consumerRecord.timestamp());
-      final GenericRecord record = consumerRecord.value();
-      log.info(
-          "Got PE event key: {}, topic: {}, partition: {}, offset: {}, value size: {}, timestamp: {}",
-          consumerRecord.key(),
-          consumerRecord.topic(),
-          consumerRecord.partition(),
-          consumerRecord.offset(),
-          consumerRecord.serializedValueSize(),
-          consumerRecord.timestamp());
-      MetricUtils.counter(this.getClass(), "received_pe_count").inc();
+          kafkaLagStats.update(System.currentTimeMillis() - consumerRecord.timestamp());
+          final GenericRecord record = consumerRecord.value();
+          log.info(
+              "Got PE event key: {}, topic: {}, partition: {}, offset: {}, value size: {}, timestamp: {}",
+              consumerRecord.key(),
+              consumerRecord.topic(),
+              consumerRecord.partition(),
+              consumerRecord.offset(),
+              consumerRecord.serializedValueSize(),
+              consumerRecord.timestamp());
+          MetricUtils.counter(this.getClass(), "received_pe_count").inc();
 
-      PlatformEvent event;
-      try {
-        event = EventUtils.avroToPegasusPE(record);
-        log.debug("Successfully converted Avro PE to Pegasus PE. name: {}", event.getName());
-      } catch (Exception e) {
-        MetricUtils.counter(this.getClass(), "avro_to_pegasus_conversion_failure").inc();
-        log.error("Error deserializing message due to: ", e);
-        log.error("Message: {}", record.toString());
-        return;
-      }
+          PlatformEvent event;
+          try {
+            event = EventUtils.avroToPegasusPE(record);
+            log.debug("Successfully converted Avro PE to Pegasus PE. name: {}", event.getName());
+          } catch (Exception e) {
+            MetricUtils.counter(this.getClass(), "avro_to_pegasus_conversion_failure").inc();
+            log.error("Error deserializing message due to: ", e);
+            log.error("Message: {}", record.toString());
+            return;
+          }
 
-      log.info("Invoking PE hooks for event name {}", event.getName());
+          log.info("Invoking PE hooks for event name {}", event.getName());
 
-      for (PlatformEventHook hook : this.hooks) {
-        log.info(
-            "Invoking PE hook {} for event name {}",
-            hook.getClass().getSimpleName(),
-            event.getName());
-        try (Timer.Context ignored =
-            MetricUtils.timer(this.getClass(), hook.getClass().getSimpleName() + "_latency")
-                .time()) {
-          hook.invoke(systemOperationContext, event);
-        } catch (Exception e) {
-          // Just skip this hook and continue.
-          MetricUtils.counter(this.getClass(), hook.getClass().getSimpleName() + "_failure").inc();
-          log.error(
-              "Failed to execute PE hook with name {}", hook.getClass().getCanonicalName(), e);
-        }
-      }
-      MetricUtils.counter(this.getClass(), "consumed_pe_count").inc();
-      log.info("Successfully completed PE hooks for event with name {}", event.getName());
-    }
+          for (PlatformEventHook hook : this.hooks) {
+            log.info(
+                "Invoking PE hook {} for event name {}",
+                hook.getClass().getSimpleName(),
+                event.getName());
+
+            systemOperationContext.withSpan(
+                hook.getClass().getSimpleName(),
+                () -> {
+                  try {
+                    hook.invoke(systemOperationContext, event);
+                  } catch (Exception e) {
+                    // Just skip this hook and continue.
+                    MetricUtils.counter(
+                            this.getClass(), hook.getClass().getSimpleName() + "_failure")
+                        .inc();
+                    log.error(
+                        "Failed to execute PE hook with name {}",
+                        hook.getClass().getCanonicalName(),
+                        e);
+                  }
+                },
+                MetricUtils.DROPWIZARD_NAME,
+                MetricUtils.name(this.getClass(), hook.getClass().getSimpleName() + "_latency"));
+          }
+          MetricUtils.counter(this.getClass(), "consumed_pe_count").inc();
+          log.info("Successfully completed PE hooks for event with name {}", event.getName());
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "consume"));
   }
 }
diff --git a/metadata-models/src/main/pegasus/com/linkedin/metadata/run/AspectRowSummary.pdl b/metadata-models/src/main/pegasus/com/linkedin/metadata/run/AspectRowSummary.pdl
index 7ebc97e73877b2..ad7015afdf827d 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/metadata/run/AspectRowSummary.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/metadata/run/AspectRowSummary.pdl
@@ -11,4 +11,5 @@ record AspectRowSummary {
     version: long
     keyAspect: boolean
     aspect: optional Aspect
+    telemetryTraceId: optional string
 }
diff --git a/metadata-operation-context/build.gradle b/metadata-operation-context/build.gradle
index 71b61528d187bd..a02d47790f2ed6 100644
--- a/metadata-operation-context/build.gradle
+++ b/metadata-operation-context/build.gradle
@@ -10,9 +10,11 @@ dependencies {
   implementation externalDependency.slf4jApi
   implementation externalDependency.servletApi
   implementation spec.product.pegasus.restliServer
+  implementation externalDependency.opentelemetryApi
+  implementation externalDependency.opentelemetrySdkTrace
   compileOnly externalDependency.lombok
 
   annotationProcessor externalDependency.lombok
   testImplementation externalDependency.testng
-  testImplementation externalDependency.mockito
+  testImplementation externalDependency.mockitoInline
 }
\ No newline at end of file
diff --git a/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/OperationContext.java b/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/OperationContext.java
index 30255f7ebcac36..dd8769ba427325 100644
--- a/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/OperationContext.java
+++ b/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/OperationContext.java
@@ -5,6 +5,7 @@
 import com.datahub.authorization.AuthorizationSession;
 import com.datahub.authorization.EntitySpec;
 import com.datahub.plugins.auth.authorization.Authorizer;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableSet;
 import com.linkedin.common.AuditStamp;
@@ -16,17 +17,23 @@
 import com.linkedin.metadata.query.SearchFlags;
 import com.linkedin.metadata.utils.AuditStampUtils;
 import com.linkedin.metadata.utils.elasticsearch.IndexConvention;
+import com.linkedin.mxe.SystemMetadata;
 import io.datahubproject.metadata.exception.ActorAccessException;
 import io.datahubproject.metadata.exception.OperationContextException;
+import io.datahubproject.metadata.exception.TraceException;
 import java.util.Collection;
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * These contexts define a read/write context which allows more flexibility when reading and writing
@@ -41,6 +48,7 @@
  */
 @Builder(toBuilder = true)
 @Getter
+@Slf4j
 public class OperationContext implements AuthorizationSession {
 
   /**
@@ -153,6 +161,7 @@ public static OperationContext asSystem(
       @Nullable IndexConvention indexConvention,
       @Nullable RetrieverContext retrieverContext,
       @Nonnull ValidationContext validationContext,
+      @Nullable TraceContext traceContext,
       boolean enforceExistenceEnabled) {
     return asSystem(
         config,
@@ -163,6 +172,7 @@ public static OperationContext asSystem(
         retrieverContext,
         validationContext,
         ObjectMapperContext.DEFAULT,
+        traceContext,
         enforceExistenceEnabled);
   }
 
@@ -175,6 +185,7 @@ public static OperationContext asSystem(
       @Nullable RetrieverContext retrieverContext,
       @Nonnull ValidationContext validationContext,
       @Nonnull ObjectMapperContext objectMapperContext,
+      @Nullable TraceContext traceContext,
       boolean enforceExistenceEnabled) {
 
     ActorContext systemActorContext =
@@ -202,6 +213,7 @@ public static OperationContext asSystem(
           .retrieverContext(retrieverContext)
           .objectMapperContext(objectMapperContext)
           .validationContext(validationContext)
+          .traceContext(traceContext)
           .build(systemAuthentication, false);
     } catch (OperationContextException e) {
       throw new RuntimeException(e);
@@ -219,6 +231,7 @@ public static OperationContext asSystem(
   @Nonnull private final RetrieverContext retrieverContext;
   @Nonnull private final ObjectMapperContext objectMapperContext;
   @Nonnull private final ValidationContext validationContext;
+  @Nullable private final TraceContext traceContext;
 
   public OperationContext withSearchFlags(
       @Nonnull Function<SearchFlags, SearchFlags> flagDefaults) {
@@ -343,6 +356,84 @@ public AuthorizationResult authorize(
     return authorizationContext.authorize(getSessionActorContext(), privilege, resourceSpec);
   }
 
+  @Nullable
+  public SystemMetadata withTraceId(@Nullable SystemMetadata systemMetadata) {
+    if (systemMetadata != null && traceContext != null) {
+      return traceContext.withTraceId(systemMetadata);
+    }
+    return systemMetadata;
+  }
+
+  public SystemMetadata withProducerTrace(
+      String operationName, @Nullable SystemMetadata systemMetadata, String topicName) {
+    if (systemMetadata != null && traceContext != null) {
+      return traceContext.withProducerTrace(operationName, systemMetadata, topicName);
+    }
+    return systemMetadata;
+  }
+
+  /**
+   * Generic method to capture spans
+   *
+   * @param name name of the span
+   * @param operation the actual logic
+   * @param attributes additional attributes
+   * @return the output from the logic
+   * @param <T> generic
+   */
+  public <T> T withSpan(String name, Supplier<T> operation, String... attributes) {
+    if (traceContext != null) {
+      return traceContext.withSpan(name, operation, attributes);
+    } else {
+      return operation.get();
+    }
+  }
+
+  public void withSpan(String name, Runnable operation, String... attributes) {
+    if (traceContext != null) {
+      traceContext.withSpan(name, operation, attributes);
+    } else {
+      operation.run();
+    }
+  }
+
+  public void withQueueSpan(
+      String name,
+      SystemMetadata systemMetadata,
+      String topicName,
+      Runnable operation,
+      String... attributes) {
+    if (systemMetadata != null) {
+      withQueueSpan(name, List.of(systemMetadata), topicName, operation, attributes);
+    } else {
+      operation.run();
+    }
+  }
+
+  public void withQueueSpan(
+      String name,
+      List<SystemMetadata> systemMetadata,
+      String topicName,
+      Runnable operation,
+      String... attributes) {
+    if (traceContext != null) {
+      traceContext.withQueueSpan(name, systemMetadata, topicName, operation, attributes);
+    } else {
+      operation.run();
+    }
+  }
+
+  public String traceException(Set<Throwable> throwables) {
+    try {
+      return getObjectMapper()
+          .writeValueAsString(
+              throwables.stream().map(TraceException::new).collect(Collectors.toList()));
+    } catch (JsonProcessingException e) {
+      log.error("Error creating trace.", e);
+    }
+    return throwables.stream().map(Throwable::getMessage).collect(Collectors.joining("\n"));
+  }
+
   /**
    * Return a unique id for this context. Typically useful for building cache keys. We combine the
    * different context components to create a single string representation of the hashcode across
@@ -371,6 +462,7 @@ public String getGlobalContextId() {
             .add(getRequestContext() == null ? EmptyContext.EMPTY : getRequestContext())
             .add(getRetrieverContext())
             .add(getObjectMapperContext())
+            .add(getTraceContext() == null ? EmptyContext.EMPTY : getTraceContext())
             .build()
             .stream()
             .map(ContextInterface::getCacheKeyComponent)
@@ -513,7 +605,8 @@ public OperationContext build(@Nonnull ActorContext sessionActor, boolean skipCa
           this.requestContext,
           this.retrieverContext,
           this.objectMapperContext != null ? this.objectMapperContext : ObjectMapperContext.DEFAULT,
-          this.validationContext);
+          this.validationContext,
+          this.traceContext);
     }
 
     private OperationContext build() {
diff --git a/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/RequestContext.java b/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/RequestContext.java
index 779c418a56142f..022a75945b5049 100644
--- a/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/RequestContext.java
+++ b/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/RequestContext.java
@@ -2,6 +2,7 @@
 
 import com.google.common.net.HttpHeaders;
 import com.linkedin.restli.server.ResourceContext;
+import io.opentelemetry.api.trace.Span;
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 import java.util.Collection;
@@ -59,6 +60,13 @@ public Optional<Integer> getCacheKeyComponent() {
 
   public static class RequestContextBuilder {
     private RequestContext build() {
+
+      // Add context for tracing
+      Span.current()
+          .setAttribute("user.id", this.actorUrn)
+          .setAttribute("request.api", this.requestAPI.toString())
+          .setAttribute("request.id", this.requestID);
+
       return new RequestContext(
           this.actorUrn, this.sourceIP, this.requestAPI, this.requestID, this.userAgent);
     }
diff --git a/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/TraceContext.java b/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/TraceContext.java
new file mode 100644
index 00000000000000..d881020aed0528
--- /dev/null
+++ b/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/TraceContext.java
@@ -0,0 +1,414 @@
+package io.datahubproject.metadata.context;
+
+import static com.linkedin.metadata.utils.metrics.MetricUtils.BATCH_SIZE_ATTR;
+import static com.linkedin.metadata.utils.metrics.MetricUtils.QUEUE_DURATION_MS_ATTR;
+import static com.linkedin.metadata.utils.metrics.MetricUtils.QUEUE_ENQUEUED_AT_ATTR;
+
+import com.linkedin.data.template.StringMap;
+import com.linkedin.metadata.utils.GenericRecordUtils;
+import com.linkedin.metadata.utils.metrics.MetricUtils;
+import com.linkedin.mxe.SystemMetadata;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanBuilder;
+import io.opentelemetry.api.trace.SpanContext;
+import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.api.trace.StatusCode;
+import io.opentelemetry.api.trace.TraceFlags;
+import io.opentelemetry.api.trace.TraceState;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.sdk.common.CompletableResultCode;
+import io.opentelemetry.sdk.trace.data.SpanData;
+import io.opentelemetry.sdk.trace.export.SpanExporter;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import java.time.Instant;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Getter
+@Builder
+public class TraceContext implements ContextInterface {
+  // trace logging
+  public static final String TRACE_HEADER = "X-Enable-Trace-Log";
+  public static final String TRACE_COOKIE = "enable-trace-log";
+  // system metadata properties
+  public static final String TELEMETRY_TRACE_KEY = "telemetryTraceId";
+  public static final String TELEMETRY_QUEUE_SPAN_KEY = "telemetryQueueSpanId";
+  public static final String TELEMETRY_LOG_KEY = "telemetryLog";
+  public static final String TELEMETRY_ENQUEUED_AT = "telemetryEnqueuedAt";
+
+  public static final TraceIdGenerator TRACE_ID_GENERATOR = new TraceIdGenerator();
+  public static final SpanExporter LOG_SPAN_EXPORTER = new ConditionalLogSpanExporter();
+
+  private static final ThreadLocal<Boolean> logTracingEnabled = new ThreadLocal<>();
+
+  public static boolean isLogTracingEnabled() {
+    Boolean enabled = logTracingEnabled.get();
+    return enabled != null && enabled;
+  }
+
+  public static void clear() {
+    logTracingEnabled.remove();
+  }
+
+  public static void enableLogTracing(HttpServletRequest request) {
+    // Check header
+    String headerValue = request.getHeader(TRACE_HEADER);
+    if ("true".equalsIgnoreCase(headerValue)) {
+      logTracingEnabled.set(true);
+      return;
+    }
+
+    // Check cookie
+    Cookie[] cookies = request.getCookies();
+    if (cookies != null) {
+      for (Cookie cookie : cookies) {
+        if (TRACE_COOKIE.equals(cookie.getName()) && "true".equalsIgnoreCase(cookie.getValue())) {
+          logTracingEnabled.set(true);
+          return;
+        }
+      }
+    }
+
+    logTracingEnabled.set(false);
+  }
+
+  @Getter @Nonnull private final Tracer tracer;
+
+  @Override
+  public Optional<Integer> getCacheKeyComponent() {
+    return Optional.empty();
+  }
+
+  /**
+   * Generic method to capture spans
+   *
+   * @param name name of the span
+   * @param operation the actual logic
+   * @param attributes additional attributes
+   * @return the output from the logic
+   * @param <T> generic
+   */
+  public <T> T withSpan(String name, Supplier<T> operation, String... attributes) {
+    Span span = tracer.spanBuilder(name).startSpan();
+    try (var scope = span.makeCurrent()) {
+      for (int i = 0; i < attributes.length; i += 2) {
+        span.setAttribute(attributes[i], attributes[i + 1]);
+      }
+      return operation.get();
+    } catch (Exception e) {
+      span.setStatus(StatusCode.ERROR, e.getMessage());
+      span.recordException(e);
+      span.setAttribute(MetricUtils.ERROR_TYPE, e.getClass().getName());
+      throw e;
+    } finally {
+      span.end();
+    }
+  }
+
+  protected void withSpan(String name, Runnable operation, String... attributes) {
+    Span span = tracer.spanBuilder(name).startSpan();
+    try (var scope = span.makeCurrent()) {
+      for (int i = 0; i < attributes.length; i += 2) {
+        span.setAttribute(attributes[i], attributes[i + 1]);
+      }
+      operation.run();
+    } catch (Exception e) {
+      span.setStatus(StatusCode.ERROR, e.getMessage());
+      span.recordException(e);
+      span.setAttribute(MetricUtils.ERROR_TYPE, e.getClass().getName());
+      throw e;
+    } finally {
+      span.end();
+    }
+  }
+
+  /**
+   * Handle multiple messages with different trace ids processed from a queue
+   *
+   * @param name name of the processing of the queue
+   * @param batchSystemMetadata batch of system metadata
+   * @param operation actual processing logic
+   * @param attributes span attributes
+   */
+  protected void withQueueSpan(
+      String name,
+      List<SystemMetadata> batchSystemMetadata,
+      String topicName,
+      Runnable operation,
+      String... attributes) {
+
+    List<SystemMetadata> tracingEnabledSystemMetadata =
+        batchSystemMetadata.stream()
+            .filter(
+                sysMeta ->
+                    Objects.nonNull(sysMeta)
+                        && sysMeta.getProperties() != null
+                        && sysMeta.getProperties().get(TELEMETRY_TRACE_KEY) != null
+                        && sysMeta.getProperties().get(TELEMETRY_QUEUE_SPAN_KEY) != null)
+            .collect(Collectors.toList());
+
+    // resume log tracing
+    logTracingEnabled.set(
+        tracingEnabledSystemMetadata.stream()
+            .anyMatch(
+                sysMeta ->
+                    Boolean.parseBoolean(
+                        sysMeta.getProperties().getOrDefault(TELEMETRY_LOG_KEY, "false"))));
+
+    // Create the span builder, close queue span and add links
+    SpanBuilder spanBuilder =
+        tracer.spanBuilder(name).setAttribute(BATCH_SIZE_ATTR, batchSystemMetadata.size());
+
+    List<SpanContext> originalSpanContexts =
+        tracingEnabledSystemMetadata.stream()
+            .map(sysMeta -> closeQueueSpan(name, sysMeta, topicName))
+            .filter(Objects::nonNull)
+            .distinct()
+            .collect(Collectors.toList());
+
+    Span span;
+    if (originalSpanContexts.size() == 1) {
+      // set parent if there is only a single original trace in the batch
+      spanBuilder.setParent(Context.current().with(Span.wrap(originalSpanContexts.get(0))));
+      span = spanBuilder.startSpan();
+    } else {
+      // otherwise link the current trace to all original traces
+      originalSpanContexts.forEach(spanBuilder::addLink);
+      span = spanBuilder.startSpan();
+
+      // log linked traces
+      if (isLogTracingEnabled()) {
+        log.info(
+            "Trace: {}, Linked Traces: {}",
+            span.getSpanContext().getTraceId(),
+            originalSpanContexts.stream().map(SpanContext::getTraceId));
+      }
+    }
+
+    try (var scope = span.makeCurrent()) {
+      // Set additional attributes
+      for (int i = 0; i < attributes.length; i += 2) {
+        span.setAttribute(attributes[i], attributes[i + 1]);
+      }
+
+      operation.run();
+    } catch (Exception e) {
+      span.setStatus(StatusCode.ERROR, e.getMessage());
+      span.recordException(e);
+      span.setAttribute(MetricUtils.ERROR_TYPE, e.getClass().getName());
+      throw e;
+    } finally {
+      span.end();
+    }
+  }
+
+  public SystemMetadata withTraceId(@Nonnull SystemMetadata systemMetadata) {
+    if (systemMetadata.getProperties() == null
+        || !systemMetadata.getProperties().containsKey(TELEMETRY_TRACE_KEY)) {
+      SpanContext currentSpanContext = Span.current().getSpanContext();
+
+      if (currentSpanContext.isValid()) {
+        SystemMetadata copy = GenericRecordUtils.copy(systemMetadata, SystemMetadata.class);
+
+        if (!copy.hasProperties() || copy.getProperties() == null) {
+          copy.setProperties(new StringMap());
+        }
+
+        copy.getProperties().putAll(Map.of(TELEMETRY_TRACE_KEY, currentSpanContext.getTraceId()));
+
+        return copy;
+      }
+    }
+
+    return systemMetadata;
+  }
+
+  /** Method to capture the current trace and span ids in systemMetadata */
+  public SystemMetadata withProducerTrace(
+      String operationName, @Nonnull SystemMetadata systemMetadata, String topicName) {
+    SpanContext currentSpanContext = Span.current().getSpanContext();
+
+    if (currentSpanContext.isValid()) {
+      SystemMetadata copy = GenericRecordUtils.copy(systemMetadata, SystemMetadata.class);
+
+      if (!copy.hasProperties() || copy.getProperties() == null) {
+        copy.setProperties(new StringMap());
+      }
+
+      // Create the queue span that will be closed by consumer
+      Span queueSpan =
+          tracer
+              .spanBuilder(operationName)
+              .setParent(Context.current())
+              .setSpanKind(SpanKind.PRODUCER)
+              .setAttribute(MetricUtils.MESSAGING_SYSTEM, "kafka")
+              .setAttribute(MetricUtils.MESSAGING_DESTINATION, topicName)
+              .setAttribute(MetricUtils.MESSAGING_DESTINATION_KIND, "topic")
+              .setAttribute(MetricUtils.MESSAGING_OPERATION, "publish")
+              .startSpan();
+
+      long enqueuedAt = Instant.now().toEpochMilli();
+      if (!copy.getProperties().containsKey(TELEMETRY_TRACE_KEY)) {
+        copy.getProperties()
+            .putAll(
+                Map.of(
+                    TELEMETRY_TRACE_KEY, currentSpanContext.getTraceId(),
+                    TELEMETRY_QUEUE_SPAN_KEY, queueSpan.getSpanContext().getSpanId()));
+      }
+
+      copy.getProperties()
+          .putAll(
+              Map.of(
+                  TELEMETRY_LOG_KEY, String.valueOf(isLogTracingEnabled()),
+                  TELEMETRY_ENQUEUED_AT, String.valueOf(enqueuedAt)));
+
+      // It will be mirrored by consumer with enqueued time
+      queueSpan.setAttribute(QUEUE_ENQUEUED_AT_ATTR, enqueuedAt).end();
+
+      return copy;
+    }
+
+    return systemMetadata;
+  }
+
+  /**
+   * When processing from queue - create new span with stored parent context
+   *
+   * @param systemMetadata systemMetadata with trace/span ids to restore
+   */
+  @Nullable
+  private Span queueConsumerTrace(
+      String operationName, @Nonnull SystemMetadata systemMetadata, String topicName) {
+
+    SpanContext queueSpanContext = closeQueueSpan(operationName, systemMetadata, topicName);
+
+    if (queueSpanContext != null) {
+      // Create the processing span with the queue span as parent
+      return tracer
+          .spanBuilder(operationName)
+          .setParent(
+              Context.current()
+                  .with(Span.wrap(queueSpanContext))) // Use queue span context as parent
+          .startSpan();
+    }
+
+    return null;
+  }
+
+  @Nullable
+  private SpanContext closeQueueSpan(
+      String operationName, SystemMetadata metadata, String topicName) {
+    if (metadata != null && metadata.getProperties() != null) {
+      // resume log tracing
+      logTracingEnabled.set(
+          Boolean.parseBoolean(metadata.getProperties().getOrDefault(TELEMETRY_LOG_KEY, "false")));
+
+      String traceId = metadata.getProperties().get(TELEMETRY_TRACE_KEY);
+      String queueSpanId = metadata.getProperties().get(TELEMETRY_QUEUE_SPAN_KEY);
+
+      if (traceId != null && queueSpanId != null) {
+
+        SpanContext queueSpanContext =
+            SpanContext.createFromRemoteParent(
+                traceId, queueSpanId, TraceFlags.getSampled(), TraceState.getDefault());
+
+        // Get the span and end it with duration
+        SpanBuilder queueSpanBuilder =
+            tracer
+                .spanBuilder(operationName)
+                .setParent(Context.current().with(Span.wrap(queueSpanContext)))
+                .setSpanKind(SpanKind.CONSUMER);
+
+        Span queueSpan =
+            queueSpanBuilder
+                .startSpan()
+                .setAttribute(MetricUtils.MESSAGING_SYSTEM, "kafka")
+                .setAttribute(MetricUtils.MESSAGING_DESTINATION, topicName)
+                .setAttribute(MetricUtils.MESSAGING_DESTINATION_KIND, "topic")
+                .setAttribute(MetricUtils.MESSAGING_OPERATION, "receive");
+
+        // calculate duration
+        if (metadata.getProperties().containsKey(TELEMETRY_ENQUEUED_AT)) {
+          long enqueuedAt = Long.parseLong(metadata.getProperties().get(TELEMETRY_ENQUEUED_AT));
+          long queueTimeMillis = Instant.now().toEpochMilli() - enqueuedAt;
+          queueSpan
+              .setAttribute(QUEUE_ENQUEUED_AT_ATTR, enqueuedAt)
+              .setAttribute(QUEUE_DURATION_MS_ATTR, queueTimeMillis);
+        }
+
+        queueSpan.end();
+
+        return queueSpanContext;
+      }
+    }
+
+    return null;
+  }
+
+  private static class ConditionalLogSpanExporter implements SpanExporter {
+
+    @Override
+    public CompletableResultCode export(Collection<SpanData> spans) {
+      if (isLogTracingEnabled()) {
+        spans.forEach(
+            span -> {
+              log.info(
+                  "Trace: {}, SpanId: {}, ParentId: {}, Name: {}, Duration: {} ms",
+                  span.getTraceId(),
+                  span.getSpanId(),
+                  span.getParentSpanId(),
+                  span.getName(),
+                  String.format(
+                      "%.2f", (span.getEndEpochNanos() - span.getStartEpochNanos()) / 1_000_000.0));
+
+              if (!span.getAttributes().isEmpty()) {
+                log.info("Trace: {}, Attributes: {}", span.getTraceId(), span.getAttributes());
+              }
+
+              if (!span.getEvents().isEmpty()) {
+                log.info("Trace: {}, Events: {}", span.getTraceId(), span.getEvents());
+              }
+
+              // Add logging for links
+              if (!span.getLinks().isEmpty()) {
+                span.getLinks()
+                    .forEach(
+                        link -> {
+                          log.info(
+                              "Trace: {}, Linked TraceId: {}, Linked SpanId: {}, Link Attributes: {}",
+                              span.getTraceId(),
+                              link.getSpanContext().getTraceId(),
+                              link.getSpanContext().getSpanId(),
+                              link.getAttributes());
+                        });
+              }
+            });
+      }
+
+      return CompletableResultCode.ofSuccess();
+    }
+
+    @Override
+    public CompletableResultCode flush() {
+      return CompletableResultCode.ofSuccess();
+    }
+
+    @Override
+    public CompletableResultCode shutdown() {
+      return CompletableResultCode.ofSuccess();
+    }
+  }
+}
diff --git a/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/TraceIdGenerator.java b/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/TraceIdGenerator.java
new file mode 100644
index 00000000000000..9011a0e28d38a6
--- /dev/null
+++ b/metadata-operation-context/src/main/java/io/datahubproject/metadata/context/TraceIdGenerator.java
@@ -0,0 +1,48 @@
+package io.datahubproject.metadata.context;
+
+import com.google.common.annotations.VisibleForTesting;
+import io.opentelemetry.sdk.trace.IdGenerator;
+import java.time.Instant;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class TraceIdGenerator implements IdGenerator {
+  private final IdGenerator defaultGenerator;
+
+  public TraceIdGenerator() {
+    this.defaultGenerator = IdGenerator.random();
+  }
+
+  @VisibleForTesting
+  public String generateTraceId(long epochMillis) {
+    // First 8 bytes (16 hex chars) as timestamp in micros
+    long timestampMicros = epochMillis * 1000;
+    // Last 8 bytes as random to ensure uniqueness
+    long randomBits = ThreadLocalRandom.current().nextLong();
+
+    return String.format("%016x%016x", timestampMicros, randomBits);
+  }
+
+  @Override
+  public String generateTraceId() {
+    return generateTraceId(Instant.now().toEpochMilli());
+  }
+
+  @Override
+  public String generateSpanId() {
+    // Use default random generation for span IDs
+    return defaultGenerator.generateSpanId();
+  }
+
+  // Utility method to extract timestamp
+  private static long getTimestampMicros(String traceId) {
+    if (traceId == null || traceId.length() < 16) {
+      throw new IllegalArgumentException("Invalid trace ID format");
+    }
+    return Long.parseUnsignedLong(traceId.substring(0, 16), 16);
+  }
+
+  // Convert to milliseconds for easier comparison
+  public static long getTimestampMillis(String traceId) {
+    return getTimestampMicros(traceId) / 1000;
+  }
+}
diff --git a/metadata-operation-context/src/main/java/io/datahubproject/metadata/exception/TraceException.java b/metadata-operation-context/src/main/java/io/datahubproject/metadata/exception/TraceException.java
new file mode 100644
index 00000000000000..85b32d6ca06d16
--- /dev/null
+++ b/metadata-operation-context/src/main/java/io/datahubproject/metadata/exception/TraceException.java
@@ -0,0 +1,40 @@
+package io.datahubproject.metadata.exception;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import java.util.Arrays;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Value;
+import lombok.extern.jackson.Jacksonized;
+
+@Value
+@Builder
+@Jacksonized
+@AllArgsConstructor
+@JsonInclude(Include.NON_NULL)
+public class TraceException {
+  String message;
+  String exceptionClass;
+  String[] stackTrace;
+  TraceException cause;
+
+  public TraceException(Throwable throwable) {
+    this.message = throwable.getMessage();
+    this.exceptionClass = throwable.getClass().getName();
+    this.stackTrace =
+        Arrays.stream(throwable.getStackTrace())
+            .map(StackTraceElement::toString)
+            .toArray(String[]::new);
+
+    // Handle nested cause
+    this.cause = throwable.getCause() != null ? new TraceException(throwable.getCause()) : null;
+  }
+
+  public TraceException(String message) {
+    this.message = message;
+    this.exceptionClass = null;
+    this.stackTrace = null;
+    this.cause = null;
+  }
+}
diff --git a/metadata-operation-context/src/main/java/io/datahubproject/test/metadata/context/TestOperationContexts.java b/metadata-operation-context/src/main/java/io/datahubproject/test/metadata/context/TestOperationContexts.java
index 92d62d42295b92..7e9f081a11e383 100644
--- a/metadata-operation-context/src/main/java/io/datahubproject/test/metadata/context/TestOperationContexts.java
+++ b/metadata-operation-context/src/main/java/io/datahubproject/test/metadata/context/TestOperationContexts.java
@@ -22,11 +22,13 @@
 import com.linkedin.metadata.snapshot.Snapshot;
 import com.linkedin.metadata.utils.elasticsearch.IndexConvention;
 import com.linkedin.metadata.utils.elasticsearch.IndexConventionImpl;
+import io.datahubproject.metadata.context.ObjectMapperContext;
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.metadata.context.OperationContextConfig;
 import io.datahubproject.metadata.context.RequestContext;
 import io.datahubproject.metadata.context.RetrieverContext;
 import io.datahubproject.metadata.context.ServicesRegistryContext;
+import io.datahubproject.metadata.context.TraceContext;
 import io.datahubproject.metadata.context.ValidationContext;
 import java.util.Map;
 import java.util.Optional;
@@ -193,6 +195,8 @@ public static OperationContext systemContextNoSearchAuthorization(
         retrieverContextSupplier,
         indexConventionSupplier,
         null,
+        null,
+        null,
         null);
   }
 
@@ -210,7 +214,26 @@ public static OperationContext systemContextNoSearchAuthorization(
         retrieverContextSupplier,
         indexConventionSupplier,
         null,
-        environmentContextSupplier);
+        environmentContextSupplier,
+        null,
+        null);
+  }
+
+  public static OperationContext systemContextTraceNoSearchAuthorization(
+      @Nullable Supplier<ObjectMapperContext> objectMapperContextSupplier,
+      @Nullable Supplier<TraceContext> traceContextSupplier) {
+
+    return systemContext(
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        objectMapperContextSupplier,
+        traceContextSupplier);
   }
 
   public static OperationContext systemContext(
@@ -222,6 +245,30 @@ public static OperationContext systemContext(
       @Nullable Supplier<IndexConvention> indexConventionSupplier,
       @Nullable Consumer<OperationContext> postConstruct,
       @Nullable Supplier<ValidationContext> environmentContextSupplier) {
+    return systemContext(
+        configSupplier,
+        systemAuthSupplier,
+        servicesRegistrySupplier,
+        entityRegistrySupplier,
+        retrieverContextSupplier,
+        indexConventionSupplier,
+        postConstruct,
+        environmentContextSupplier,
+        null,
+        null);
+  }
+
+  public static OperationContext systemContext(
+      @Nullable Supplier<OperationContextConfig> configSupplier,
+      @Nullable Supplier<Authentication> systemAuthSupplier,
+      @Nullable Supplier<ServicesRegistryContext> servicesRegistrySupplier,
+      @Nullable Supplier<EntityRegistry> entityRegistrySupplier,
+      @Nullable Supplier<RetrieverContext> retrieverContextSupplier,
+      @Nullable Supplier<IndexConvention> indexConventionSupplier,
+      @Nullable Consumer<OperationContext> postConstruct,
+      @Nullable Supplier<ValidationContext> environmentContextSupplier,
+      @Nullable Supplier<ObjectMapperContext> objectMapperContextSupplier,
+      @Nullable Supplier<TraceContext> traceContextSupplier) {
 
     OperationContextConfig config =
         Optional.ofNullable(configSupplier).map(Supplier::get).orElse(DEFAULT_OPCONTEXT_CONFIG);
@@ -252,6 +299,13 @@ public static OperationContext systemContext(
             .map(Supplier::get)
             .orElse(defaultValidationContext);
 
+    ObjectMapperContext objectMapperContext =
+        objectMapperContextSupplier == null
+            ? ObjectMapperContext.DEFAULT
+            : objectMapperContextSupplier.get();
+
+    TraceContext traceContext = traceContextSupplier != null ? traceContextSupplier.get() : null;
+
     OperationContext operationContext =
         OperationContext.asSystem(
             config,
@@ -261,6 +315,8 @@ public static OperationContext systemContext(
             indexConvention,
             retrieverContext,
             validationContext,
+            objectMapperContext,
+            traceContext,
             true);
 
     if (postConstruct != null) {
diff --git a/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/OperationContextTest.java b/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/OperationContextTest.java
index a2575c1c562209..df6bcaa848c5f0 100644
--- a/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/OperationContextTest.java
+++ b/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/OperationContextTest.java
@@ -1,17 +1,44 @@
 package io.datahubproject.metadata.context;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
 
 import com.datahub.authentication.Actor;
 import com.datahub.authentication.ActorType;
 import com.datahub.authentication.Authentication;
 import com.datahub.plugins.auth.authorization.Authorizer;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.linkedin.metadata.models.registry.EntityRegistry;
+import com.linkedin.mxe.SystemMetadata;
 import io.datahubproject.test.metadata.context.TestOperationContexts;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Supplier;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class OperationContextTest {
+  private TraceContext mockTraceContext;
+  private SystemMetadata mockSystemMetadata;
+  private ObjectMapper mockObjectMapper;
+
+  @BeforeMethod
+  public void setUp() {
+    mockTraceContext = mock(TraceContext.class);
+    mockSystemMetadata = mock(SystemMetadata.class);
+    mockObjectMapper = mock(ObjectMapper.class);
+  }
 
   @Test
   public void testSystemPrivilegeEscalation() {
@@ -28,6 +55,7 @@ public void testSystemPrivilegeEscalation() {
             null,
             TestOperationContexts.emptyActiveUsersRetrieverContext(null),
             mock(ValidationContext.class),
+            null,
             true);
 
     OperationContext opContext =
@@ -69,4 +97,159 @@ public void testSystemPrivilegeEscalation() {
     assertEquals(opContextNoSystem.getSystemActorContext().getAuthentication(), systemAuth);
     assertEquals(opContextNoSystem.getSessionAuthentication(), userAuth);
   }
+
+  @Test
+  public void testWithTraceId_WithTraceContextAndSystemMetadata() {
+    when(mockTraceContext.withTraceId(mockSystemMetadata)).thenReturn(mockSystemMetadata);
+
+    SystemMetadata result = buildTraceMock().withTraceId(mockSystemMetadata);
+
+    verify(mockTraceContext).withTraceId(mockSystemMetadata);
+    assertEquals(result, mockSystemMetadata);
+  }
+
+  @Test
+  public void testWithTraceId_NullSystemMetadata() {
+    SystemMetadata result = buildTraceMock().withTraceId(null);
+
+    verifyNoInteractions(mockTraceContext);
+    assertNull(result);
+  }
+
+  @Test
+  public void testWithTraceId_NullTraceContext() {
+    OperationContext operationContext = buildTraceMock(() -> null);
+
+    SystemMetadata result = operationContext.withTraceId(mockSystemMetadata);
+
+    assertEquals(result, mockSystemMetadata);
+  }
+
+  @Test
+  public void testWithSpan_WithTraceContext() {
+    String spanName = "testSpan";
+    String[] attributes = {"attr1", "attr2"};
+    final boolean[] operationExecuted = {false};
+    Supplier<String> operation =
+        () -> {
+          operationExecuted[0] = true;
+          return "result";
+        };
+
+    // Capture the supplier passed to withSpan to verify it's executed
+    doAnswer(
+            invocation -> {
+              Supplier<?> capturedSupplier = invocation.getArgument(1);
+              return capturedSupplier.get();
+            })
+        .when(mockTraceContext)
+        .withSpan(eq(spanName), any(Supplier.class), eq(attributes));
+
+    String result = buildTraceMock().withSpan(spanName, operation, attributes);
+
+    verify(mockTraceContext).withSpan(eq(spanName), any(Supplier.class), eq(attributes));
+    assertTrue(operationExecuted[0], "The operation supplier should have been executed");
+    assertEquals(result, "result", "The result should match the operation's return value");
+  }
+
+  @Test
+  public void testWithSpan_NullTraceContext() {
+    OperationContext operationContext = buildTraceMock(() -> null);
+
+    String spanName = "testSpan";
+    String[] attributes = {"attr1", "attr2"};
+    Supplier<String> operation = () -> "result";
+
+    String result = operationContext.withSpan(spanName, operation, attributes);
+
+    assertEquals(result, "result");
+  }
+
+  @Test
+  public void testWithSpan_RunnableWithTraceContext() {
+    String spanName = "testSpan";
+    String[] attributes = {"attr1", "attr2"};
+    Runnable operation = mock(Runnable.class);
+
+    buildTraceMock().withSpan(spanName, operation, attributes);
+
+    verify(mockTraceContext).withSpan(eq(spanName), eq(operation), eq(attributes));
+    verifyNoMoreInteractions(operation);
+  }
+
+  @Test
+  public void testWithQueueSpan_SingleSystemMetadata() {
+    String spanName = "testQueueSpan";
+    String topicName = "testTopic";
+    String[] attributes = {"attr1", "attr2"};
+    Runnable operation = mock(Runnable.class);
+
+    buildTraceMock().withQueueSpan(spanName, mockSystemMetadata, topicName, operation, attributes);
+
+    verify(mockTraceContext)
+        .withQueueSpan(
+            eq(spanName),
+            eq(List.of(mockSystemMetadata)),
+            eq(topicName),
+            eq(operation),
+            eq(attributes));
+  }
+
+  @Test
+  public void testWithQueueSpan_MultipleSystemMetadata() {
+    String spanName = "testQueueSpan";
+    String topicName = "testTopic";
+    String[] attributes = {"attr1", "attr2"};
+    Runnable operation = mock(Runnable.class);
+    List<SystemMetadata> systemMetadataList = Arrays.asList(mockSystemMetadata, mockSystemMetadata);
+
+    buildTraceMock().withQueueSpan(spanName, systemMetadataList, topicName, operation, attributes);
+
+    verify(mockTraceContext)
+        .withQueueSpan(
+            eq(spanName), eq(systemMetadataList), eq(topicName), eq(operation), eq(attributes));
+  }
+
+  @Test
+  public void testTraceException() throws Exception {
+    Set<Throwable> throwables = new HashSet<>();
+    throwables.add(new RuntimeException("test exception 1"));
+    throwables.add(new IllegalArgumentException("test exception 2"));
+
+    String expectedJson = "[{\"message\":\"test exception 1\"},{\"message\":\"test exception 2\"}]";
+    when(mockObjectMapper.writeValueAsString(any())).thenReturn(expectedJson);
+
+    String result = buildTraceMock().traceException(throwables);
+
+    verify(mockObjectMapper).writeValueAsString(any());
+    assertEquals(result, expectedJson);
+  }
+
+  @Test
+  public void testTraceException_JsonProcessingError() throws Exception {
+    Set<Throwable> throwables = new HashSet<>();
+    RuntimeException ex1 = new RuntimeException("test exception 1");
+    IllegalArgumentException ex2 = new IllegalArgumentException("test exception 2");
+    throwables.add(ex1);
+    throwables.add(ex2);
+
+    when(mockObjectMapper.writeValueAsString(any()))
+        .thenThrow(new com.fasterxml.jackson.core.JsonProcessingException("") {});
+
+    String result = buildTraceMock().traceException(throwables);
+
+    verify(mockObjectMapper).writeValueAsString(any());
+    assertTrue(result.contains("test exception 1"));
+    assertTrue(result.contains("test exception 2"));
+  }
+
+  private OperationContext buildTraceMock() {
+    return buildTraceMock(null);
+  }
+
+  private OperationContext buildTraceMock(Supplier<TraceContext> traceContextSupplier) {
+    return TestOperationContexts.systemContextTraceNoSearchAuthorization(
+        () -> ObjectMapperContext.builder().objectMapper(mockObjectMapper).build(),
+        traceContextSupplier == null ? () -> mockTraceContext : traceContextSupplier);
+  }
 }
diff --git a/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/TraceContextTest.java b/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/TraceContextTest.java
new file mode 100644
index 00000000000000..8adf540c570b17
--- /dev/null
+++ b/metadata-operation-context/src/test/java/io/datahubproject/metadata/context/TraceContextTest.java
@@ -0,0 +1,293 @@
+package io.datahubproject.metadata.context;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertSame;
+import static org.testng.Assert.assertTrue;
+
+import com.linkedin.data.template.StringMap;
+import com.linkedin.mxe.SystemMetadata;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanBuilder;
+import io.opentelemetry.api.trace.SpanContext;
+import io.opentelemetry.api.trace.StatusCode;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.context.Scope;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class TraceContextTest {
+  @Mock private Tracer tracer;
+  @Mock private HttpServletRequest request;
+  @Mock private Span span;
+  @Mock private SpanContext spanContext;
+
+  private TraceContext traceContext;
+
+  @BeforeMethod
+  public void setup() {
+    MockitoAnnotations.openMocks(this);
+    traceContext = TraceContext.builder().tracer(tracer).build();
+
+    // Clear any existing thread local state
+    TraceContext.clear();
+  }
+
+  @Test
+  public void testEnableLogTracingWithHeader() {
+    when(request.getHeader(TraceContext.TRACE_HEADER)).thenReturn("true");
+    TraceContext.enableLogTracing(request);
+    assertTrue(TraceContext.isLogTracingEnabled());
+  }
+
+  @Test
+  public void testEnableLogTracingWithCookie() {
+    when(request.getHeader(TraceContext.TRACE_HEADER)).thenReturn(null);
+    Cookie cookie = new Cookie(TraceContext.TRACE_COOKIE, "true");
+    when(request.getCookies()).thenReturn(new Cookie[] {cookie});
+    TraceContext.enableLogTracing(request);
+    assertTrue(TraceContext.isLogTracingEnabled());
+  }
+
+  @Test
+  public void testEnableLogTracingDisabled() {
+    when(request.getHeader(TraceContext.TRACE_HEADER)).thenReturn("false");
+    when(request.getCookies()).thenReturn(null);
+    TraceContext.enableLogTracing(request);
+    assertFalse(TraceContext.isLogTracingEnabled());
+  }
+
+  @Test
+  public void testWithTraceIdValidSpanContext() {
+    SystemMetadata systemMetadata = new SystemMetadata();
+    when(span.getSpanContext()).thenReturn(spanContext);
+    when(spanContext.isValid()).thenReturn(true);
+    when(spanContext.getTraceId()).thenReturn("test-trace-id");
+
+    try (var mockedStatic = mockStatic(Span.class)) {
+      mockedStatic.when(Span::current).thenReturn(span);
+      SystemMetadata result = traceContext.withTraceId(systemMetadata);
+      assertNotNull(result.getProperties());
+      assertEquals(result.getProperties().get(TraceContext.TELEMETRY_TRACE_KEY), "test-trace-id");
+    }
+  }
+
+  @Test
+  public void testWithTraceIdInvalidSpanContext() {
+    SystemMetadata systemMetadata = new SystemMetadata();
+    when(span.getSpanContext()).thenReturn(spanContext);
+    when(spanContext.isValid()).thenReturn(false);
+
+    try (var mockedStatic = mockStatic(Span.class)) {
+      mockedStatic.when(Span::current).thenReturn(span);
+      SystemMetadata result = traceContext.withTraceId(systemMetadata);
+      assertSame(result, systemMetadata);
+    }
+  }
+
+  @Test
+  public void testWithQueueSpanBatch() {
+    // Setup
+    List<SystemMetadata> batchMetadata = new ArrayList<>();
+    SystemMetadata metadata1 = new SystemMetadata();
+    metadata1.setProperties(new StringMap());
+    metadata1.getProperties().put(TraceContext.TELEMETRY_TRACE_KEY, "trace-1");
+    metadata1.getProperties().put(TraceContext.TELEMETRY_QUEUE_SPAN_KEY, "span-1");
+    metadata1.getProperties().put(TraceContext.TELEMETRY_LOG_KEY, "true");
+    metadata1
+        .getProperties()
+        .put(TraceContext.TELEMETRY_ENQUEUED_AT, String.valueOf(System.currentTimeMillis()));
+
+    SystemMetadata metadata2 = new SystemMetadata();
+    metadata2.setProperties(new StringMap());
+    metadata2.getProperties().put(TraceContext.TELEMETRY_TRACE_KEY, "trace-2");
+    metadata2.getProperties().put(TraceContext.TELEMETRY_QUEUE_SPAN_KEY, "span-2");
+    metadata2.getProperties().put(TraceContext.TELEMETRY_LOG_KEY, "false");
+    metadata2
+        .getProperties()
+        .put(TraceContext.TELEMETRY_ENQUEUED_AT, String.valueOf(System.currentTimeMillis()));
+
+    batchMetadata.add(metadata1);
+    batchMetadata.add(metadata2);
+
+    // Mock span builder chain for both consumer and processing spans
+    io.opentelemetry.api.trace.SpanBuilder mockSpanBuilder =
+        mock(io.opentelemetry.api.trace.SpanBuilder.class);
+    when(mockSpanBuilder.setParent(any(Context.class))).thenReturn(mockSpanBuilder);
+    when(mockSpanBuilder.setSpanKind(any())).thenReturn(mockSpanBuilder);
+    when(mockSpanBuilder.setAttribute(anyString(), anyString())).thenReturn(mockSpanBuilder);
+    when(mockSpanBuilder.setAttribute(anyString(), anyLong())).thenReturn(mockSpanBuilder);
+    when(mockSpanBuilder.addLink(any())).thenReturn(mockSpanBuilder);
+    when(mockSpanBuilder.startSpan()).thenReturn(span);
+
+    when(tracer.spanBuilder(anyString())).thenReturn(mockSpanBuilder);
+    when(span.setAttribute(anyString(), anyString())).thenReturn(span);
+    when(span.setAttribute(anyString(), anyLong())).thenReturn(span);
+    when(span.getSpanContext()).thenReturn(spanContext);
+
+    // Execute & Verify - mainly checking that no exceptions are thrown
+    traceContext.withQueueSpan(
+        "test-operation",
+        batchMetadata,
+        "test-topic",
+        () -> {
+          // Do nothing
+        });
+  }
+
+  @Test
+  public void testWithSpanSupplier() {
+    SpanBuilder mockSpanBuilder = mock(SpanBuilder.class);
+    when(mockSpanBuilder.setAttribute(anyString(), anyString())).thenReturn(mockSpanBuilder);
+    when(mockSpanBuilder.startSpan()).thenReturn(span);
+    when(tracer.spanBuilder(anyString())).thenReturn(mockSpanBuilder);
+
+    when(span.setAttribute(anyString(), anyString())).thenReturn(span);
+    when(span.setStatus(any())).thenReturn(span);
+    when(span.makeCurrent()).thenReturn(mock(Scope.class));
+
+    // Execute
+    String result = traceContext.withSpan("test-operation", () -> "test-result", "attr1", "value1");
+
+    // Verify
+    assertEquals(result, "test-result");
+    verify(mockSpanBuilder).startSpan();
+    verify(span).end();
+  }
+
+  @Test(expectedExceptions = RuntimeException.class)
+  public void testWithSpanSupplierException() {
+    io.opentelemetry.api.trace.SpanBuilder mockSpanBuilder =
+        mock(io.opentelemetry.api.trace.SpanBuilder.class);
+    when(mockSpanBuilder.setAttribute(anyString(), anyString())).thenReturn(mockSpanBuilder);
+    when(mockSpanBuilder.startSpan()).thenReturn(span);
+    when(tracer.spanBuilder(anyString())).thenReturn(mockSpanBuilder);
+
+    when(span.setAttribute(anyString(), anyString())).thenReturn(span);
+    when(span.setStatus(any(), anyString())).thenReturn(span);
+    when(span.recordException(any(RuntimeException.class))).thenReturn(span);
+    when(span.makeCurrent()).thenReturn(mock(Scope.class));
+
+    try {
+      traceContext.withSpan(
+          "test-operation",
+          () -> {
+            throw new RuntimeException("test-exception");
+          },
+          "attr1",
+          "value1");
+    } finally {
+      verify(mockSpanBuilder).startSpan();
+      verify(span).setStatus(StatusCode.ERROR, "test-exception");
+      verify(span).recordException(any(RuntimeException.class));
+      verify(span).end();
+    }
+  }
+
+  @Test
+  public void testWithSpanRunnable() {
+    SpanBuilder mockSpanBuilder = mock(SpanBuilder.class);
+    when(mockSpanBuilder.setAttribute(anyString(), anyString())).thenReturn(mockSpanBuilder);
+    when(mockSpanBuilder.startSpan()).thenReturn(span);
+    when(tracer.spanBuilder(anyString())).thenReturn(mockSpanBuilder);
+
+    when(span.setAttribute(anyString(), anyString())).thenReturn(span);
+    when(span.setStatus(any())).thenReturn(span);
+    when(span.makeCurrent()).thenReturn(mock(Scope.class));
+
+    AtomicBoolean executed = new AtomicBoolean(false);
+
+    traceContext.withSpan("test-operation", () -> executed.set(true), "attr1", "value1");
+
+    assertTrue(executed.get());
+    verify(mockSpanBuilder).startSpan();
+    verify(span).end();
+  }
+
+  @Test
+  public void testWithSingleQueueSpan() {
+    SystemMetadata metadata = new SystemMetadata();
+    metadata.setProperties(new StringMap());
+    metadata.getProperties().put(TraceContext.TELEMETRY_TRACE_KEY, "trace-1");
+    metadata.getProperties().put(TraceContext.TELEMETRY_QUEUE_SPAN_KEY, "span-1");
+    metadata.getProperties().put(TraceContext.TELEMETRY_LOG_KEY, "true");
+    metadata
+        .getProperties()
+        .put(TraceContext.TELEMETRY_ENQUEUED_AT, String.valueOf(System.currentTimeMillis()));
+
+    io.opentelemetry.api.trace.SpanBuilder mockSpanBuilder =
+        mock(io.opentelemetry.api.trace.SpanBuilder.class);
+    when(mockSpanBuilder.setParent(any(Context.class))).thenReturn(mockSpanBuilder);
+    when(mockSpanBuilder.setSpanKind(any())).thenReturn(mockSpanBuilder);
+    when(mockSpanBuilder.setAttribute(anyString(), anyString())).thenReturn(mockSpanBuilder);
+    when(mockSpanBuilder.setAttribute(anyString(), anyLong())).thenReturn(mockSpanBuilder);
+    when(mockSpanBuilder.startSpan()).thenReturn(span);
+
+    when(tracer.spanBuilder(anyString())).thenReturn(mockSpanBuilder);
+    when(span.setAttribute(anyString(), anyString())).thenReturn(span);
+    when(span.setAttribute(anyString(), anyLong())).thenReturn(span);
+    when(span.makeCurrent()).thenReturn(mock(Scope.class));
+
+    AtomicBoolean executed = new AtomicBoolean(false);
+
+    traceContext.withQueueSpan(
+        "test-operation", List.of(metadata), "test-topic", () -> executed.set(true));
+
+    assertTrue(executed.get());
+    verify(mockSpanBuilder, atLeast(1)).startSpan();
+    verify(span, atLeast(1)).end();
+  }
+
+  @Test
+  public void testWithProducerTrace() {
+    SystemMetadata systemMetadata = new SystemMetadata();
+
+    io.opentelemetry.api.trace.SpanBuilder mockSpanBuilder =
+        mock(io.opentelemetry.api.trace.SpanBuilder.class);
+    when(mockSpanBuilder.setParent(any(Context.class))).thenReturn(mockSpanBuilder);
+    when(mockSpanBuilder.setSpanKind(any())).thenReturn(mockSpanBuilder);
+    when(mockSpanBuilder.setAttribute(anyString(), anyString())).thenReturn(mockSpanBuilder);
+    when(mockSpanBuilder.setAttribute(anyString(), anyLong())).thenReturn(mockSpanBuilder);
+    when(mockSpanBuilder.startSpan()).thenReturn(span);
+
+    when(tracer.spanBuilder(anyString())).thenReturn(mockSpanBuilder);
+    when(span.setAttribute(anyString(), anyString())).thenReturn(span);
+    when(span.setAttribute(anyString(), anyLong())).thenReturn(span);
+    when(span.getSpanContext()).thenReturn(spanContext);
+    when(spanContext.getSpanId()).thenReturn("test-span-id");
+    when(spanContext.getTraceId()).thenReturn("test-trace-id");
+    when(spanContext.isValid()).thenReturn(true);
+
+    try (var mockedStatic = mockStatic(Span.class)) {
+      mockedStatic.when(Span::current).thenReturn(span);
+
+      SystemMetadata result =
+          traceContext.withProducerTrace("test-operation", systemMetadata, "test-topic");
+
+      assertNotNull(result.getProperties());
+      assertTrue(result.getProperties().containsKey(TraceContext.TELEMETRY_TRACE_KEY));
+      assertTrue(result.getProperties().containsKey(TraceContext.TELEMETRY_QUEUE_SPAN_KEY));
+      assertTrue(result.getProperties().containsKey(TraceContext.TELEMETRY_LOG_KEY));
+      assertTrue(result.getProperties().containsKey(TraceContext.TELEMETRY_ENQUEUED_AT));
+      verify(mockSpanBuilder).startSpan();
+      verify(span).end();
+    }
+  }
+}
diff --git a/metadata-service/auth-impl/src/test/java/com/datahub/authorization/DataHubAuthorizerTest.java b/metadata-service/auth-impl/src/test/java/com/datahub/authorization/DataHubAuthorizerTest.java
index ce9c636be16ac7..74232efc84d9c6 100644
--- a/metadata-service/auth-impl/src/test/java/com/datahub/authorization/DataHubAuthorizerTest.java
+++ b/metadata-service/auth-impl/src/test/java/com/datahub/authorization/DataHubAuthorizerTest.java
@@ -321,6 +321,7 @@ public void setupTest() throws Exception {
             mock(IndexConvention.class),
             mock(RetrieverContext.class),
             mock(ValidationContext.class),
+            null,
             true);
 
     _dataHubAuthorizer =
diff --git a/metadata-service/configuration/src/main/resources/application.yaml b/metadata-service/configuration/src/main/resources/application.yaml
index 04f7409d5c39a3..59c57d575d801d 100644
--- a/metadata-service/configuration/src/main/resources/application.yaml
+++ b/metadata-service/configuration/src/main/resources/application.yaml
@@ -1,3 +1,6 @@
+# Name of the data hub component or container (used for tracing)
+spring.application.name: ${APPLICATION_NAME:datahub-gms}
+
 # The base URL where DataHub is accessible to users.
 baseUrl: ${DATAHUB_BASE_URL:http://localhost:9002}
 
diff --git a/metadata-service/factories/build.gradle b/metadata-service/factories/build.gradle
index 501c46d64d6f9c..3fbbcebdae7b04 100644
--- a/metadata-service/factories/build.gradle
+++ b/metadata-service/factories/build.gradle
@@ -51,6 +51,11 @@ dependencies {
   implementation externalDependency.jline
   implementation externalDependency.commonsIo
 
+  implementation externalDependency.opentelemetryApi
+  implementation externalDependency.opentelemetrySdk
+  implementation externalDependency.opentelemetrySdkTrace
+  implementation externalDependency.opentelemetryAutoConfig
+
   testImplementation externalDependency.springBootTest
   testImplementation externalDependency.mockito
   testImplementation externalDependency.testng
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/Neo4jGraphServiceFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/Neo4jGraphServiceFactory.java
index 136c31aa0693da..0de389834927c7 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/Neo4jGraphServiceFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/Neo4jGraphServiceFactory.java
@@ -4,6 +4,7 @@
 import com.linkedin.metadata.graph.neo4j.Neo4jGraphService;
 import com.linkedin.metadata.models.registry.EntityRegistry;
 import com.linkedin.metadata.models.registry.LineageRegistry;
+import io.datahubproject.metadata.context.OperationContext;
 import javax.annotation.Nonnull;
 import org.neo4j.driver.Driver;
 import org.neo4j.driver.SessionConfig;
@@ -28,9 +29,14 @@ public class Neo4jGraphServiceFactory {
 
   @Bean(name = "graphService")
   @Nonnull
-  protected GraphService getInstance(final EntityRegistry entityRegistry) {
+  protected GraphService getInstance(
+      @Qualifier("systemOperationContext") OperationContext systemOperationContext,
+      final EntityRegistry entityRegistry) {
     LineageRegistry lineageRegistry = new LineageRegistry(entityRegistry);
     return new Neo4jGraphService(
-        lineageRegistry, neo4jDriver, SessionConfig.forDatabase(neo4jDatabase));
+        systemOperationContext,
+        lineageRegistry,
+        neo4jDriver,
+        SessionConfig.forDatabase(neo4jDatabase));
   }
 }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/context/SystemOperationContextFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/context/SystemOperationContextFactory.java
index 78107cc0ecc900..f5e26714a7f6aa 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/context/SystemOperationContextFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/context/SystemOperationContextFactory.java
@@ -16,6 +16,7 @@
 import io.datahubproject.metadata.context.OperationContextConfig;
 import io.datahubproject.metadata.context.RetrieverContext;
 import io.datahubproject.metadata.context.ServicesRegistryContext;
+import io.datahubproject.metadata.context.TraceContext;
 import io.datahubproject.metadata.context.ValidationContext;
 import io.datahubproject.metadata.services.RestrictedService;
 import javax.annotation.Nonnull;
@@ -46,7 +47,8 @@ protected OperationContext javaSystemOperationContext(
       @Qualifier("baseElasticSearchComponents")
           BaseElasticSearchComponentsFactory.BaseElasticSearchComponents components,
       @Nonnull final ConfigurationProvider configurationProvider,
-      @Qualifier("systemEntityClient") @Nonnull final SystemEntityClient systemEntityClient) {
+      @Qualifier("systemEntityClient") @Nonnull final SystemEntityClient systemEntityClient,
+      @Nonnull final TraceContext traceContext) {
 
     EntityServiceAspectRetriever entityServiceAspectRetriever =
         EntityServiceAspectRetriever.builder()
@@ -80,6 +82,7 @@ protected OperationContext javaSystemOperationContext(
                 .alternateValidation(
                     configurationProvider.getFeatureFlags().isAlternateMCPValidation())
                 .build(),
+            traceContext,
             configurationProvider.getAuthentication().isEnforceExistenceEnabled());
 
     entityClientAspectRetriever.setSystemOperationContext(systemOperationContext);
@@ -109,7 +112,8 @@ protected OperationContext restliSystemOperationContext(
       @Nonnull final SearchService searchService,
       @Qualifier("baseElasticSearchComponents")
           BaseElasticSearchComponentsFactory.BaseElasticSearchComponents components,
-      @Nonnull final ConfigurationProvider configurationProvider) {
+      @Nonnull final ConfigurationProvider configurationProvider,
+      @Nonnull final TraceContext traceContext) {
 
     EntityClientAspectRetriever entityClientAspectRetriever =
         EntityClientAspectRetriever.builder().entityClient(systemEntityClient).build();
@@ -136,6 +140,7 @@ protected OperationContext restliSystemOperationContext(
                 .alternateValidation(
                     configurationProvider.getFeatureFlags().isAlternateMCPValidation())
                 .build(),
+            traceContext,
             configurationProvider.getAuthentication().isEnforceExistenceEnabled());
 
     entityClientAspectRetriever.setSystemOperationContext(systemOperationContext);
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/common/AdminClientFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/common/AdminClientFactory.java
new file mode 100644
index 00000000000000..53b3a86011e7e0
--- /dev/null
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/common/AdminClientFactory.java
@@ -0,0 +1,30 @@
+package com.linkedin.gms.factory.kafka.common;
+
+import com.linkedin.metadata.config.kafka.KafkaConfiguration;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.AdminClientConfig;
+import org.apache.kafka.clients.admin.KafkaAdminClient;
+import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
+
+public class AdminClientFactory {
+  public static AdminClient buildKafkaAdminClient(
+      KafkaConfiguration kafkaConfiguration,
+      final KafkaProperties kafkaProperties,
+      String clientId) {
+    Map<String, Object> adminProperties = new HashMap<>(kafkaProperties.buildAdminProperties(null));
+    adminProperties.put(AdminClientConfig.CLIENT_ID_CONFIG, clientId);
+
+    // KAFKA_BOOTSTRAP_SERVER has precedence over SPRING_KAFKA_BOOTSTRAP_SERVERS
+    if (kafkaConfiguration.getBootstrapServers() != null
+        && !kafkaConfiguration.getBootstrapServers().isEmpty()) {
+      adminProperties.put(
+          AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG,
+          Arrays.asList(kafkaConfiguration.getBootstrapServers().split(",")));
+    } // else we rely on KafkaProperties which defaults to localhost:9092 or environment variables
+
+    return KafkaAdminClient.create(adminProperties);
+  }
+}
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/throttle/KafkaThrottleFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/throttle/KafkaThrottleFactory.java
index e2cdca8a065c03..f6d9fcefe46461 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/throttle/KafkaThrottleFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/throttle/KafkaThrottleFactory.java
@@ -1,5 +1,7 @@
 package com.linkedin.gms.factory.kafka.throttle;
 
+import static com.linkedin.gms.factory.kafka.common.AdminClientFactory.buildKafkaAdminClient;
+
 import com.datahub.metadata.dao.throttle.KafkaThrottleSensor;
 import com.linkedin.gms.factory.config.ConfigurationProvider;
 import com.linkedin.metadata.config.MetadataChangeProposalConfig;
@@ -8,13 +10,7 @@
 import com.linkedin.metadata.dao.throttle.ThrottleSensor;
 import com.linkedin.metadata.models.registry.EntityRegistry;
 import com.linkedin.mxe.Topics;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.admin.AdminClient;
-import org.apache.kafka.clients.admin.AdminClientConfig;
-import org.apache.kafka.clients.admin.KafkaAdminClient;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
@@ -47,7 +43,7 @@ public ThrottleSensor kafkaThrottle(
     if (mcpConfig.getThrottle().getUpdateIntervalMs() > 0) {
       return KafkaThrottleSensor.builder()
           .entityRegistry(entityRegistry)
-          .kafkaAdmin(kafkaAdmin(kafkaConfiguration, kafkaProperties))
+          .kafkaAdmin(buildKafkaAdminClient(kafkaConfiguration, kafkaProperties, "throttle-sensor"))
           .config(mcpConfig.getThrottle())
           .mclConsumerGroupId(maeConsumerGroupId)
           .timeseriesTopicName(timeseriesTopicName)
@@ -58,19 +54,4 @@ public ThrottleSensor kafkaThrottle(
       return new NoOpSensor();
     }
   }
-
-  private static AdminClient kafkaAdmin(
-      KafkaConfiguration kafkaConfiguration, final KafkaProperties kafkaProperties) {
-    Map<String, Object> adminProperties = new HashMap<>(kafkaProperties.buildAdminProperties(null));
-
-    // KAFKA_BOOTSTRAP_SERVER has precedence over SPRING_KAFKA_BOOTSTRAP_SERVERS
-    if (kafkaConfiguration.getBootstrapServers() != null
-        && !kafkaConfiguration.getBootstrapServers().isEmpty()) {
-      adminProperties.put(
-          AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG,
-          Arrays.asList(kafkaConfiguration.getBootstrapServers().split(",")));
-    } // else we rely on KafkaProperties which defaults to localhost:9092 or environment variables
-
-    return KafkaAdminClient.create(adminProperties);
-  }
 }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/trace/KafkaTraceReaderFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/trace/KafkaTraceReaderFactory.java
new file mode 100644
index 00000000000000..6ba7dedce8ff50
--- /dev/null
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/kafka/trace/KafkaTraceReaderFactory.java
@@ -0,0 +1,196 @@
+package com.linkedin.gms.factory.kafka.trace;
+
+import static com.linkedin.gms.factory.kafka.common.AdminClientFactory.buildKafkaAdminClient;
+import static com.linkedin.mxe.ConsumerGroups.MCP_CONSUMER_GROUP_ID_VALUE;
+
+import com.linkedin.gms.factory.config.ConfigurationProvider;
+import com.linkedin.metadata.trace.MCLTraceReader;
+import com.linkedin.metadata.trace.MCPFailedTraceReader;
+import com.linkedin.metadata.trace.MCPTraceReader;
+import com.linkedin.mxe.Topics;
+import jakarta.annotation.PreDestroy;
+import java.util.Properties;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
+
+@Configuration
+public class KafkaTraceReaderFactory {
+  private static final Properties TRACE_CONSUMER_PROPERTIES = new Properties();
+
+  static {
+    TRACE_CONSUMER_PROPERTIES.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "false");
+  }
+
+  @Value("${trace.pollMaxAttempts:5}")
+  private int pollMaxAttempts;
+
+  @Value("${trace.pollDurationMs:1000}")
+  private int pollDurationMs;
+
+  @Value(MCP_CONSUMER_GROUP_ID_VALUE)
+  private String mceConsumerGroupId;
+
+  @Value("${METADATA_CHANGE_PROPOSAL_TOPIC_NAME:" + Topics.METADATA_CHANGE_PROPOSAL + "}")
+  private String mcpTopicName;
+
+  @Value(
+      "${FAILED_METADATA_CHANGE_PROPOSAL_TOPIC_NAME:"
+          + Topics.FAILED_METADATA_CHANGE_PROPOSAL
+          + "}")
+  private String mcpFailedTopicName;
+
+  @Value("${METADATA_CHANGE_LOG_KAFKA_CONSUMER_GROUP_ID:generic-mae-consumer-job-client}")
+  private String maeConsumerGroupId;
+
+  @Value("${METADATA_CHANGE_LOG_VERSIONED_TOPIC_NAME:" + Topics.METADATA_CHANGE_LOG_VERSIONED + "}")
+  private String mclVersionedTopicName;
+
+  @Value(
+      "${METADATA_CHANGE_LOG_TIMESERIES_TOPIC_NAME:" + Topics.METADATA_CHANGE_LOG_TIMESERIES + "}")
+  private String mclTimeseriesTopicName;
+
+  @Value("${trace.executor.thread-pool-size:10}")
+  private int threadPoolSize;
+
+  @Value("${trace.executor.shutdown-timeout-seconds:60}")
+  private int shutdownTimeoutSeconds;
+
+  @Value("${trace.timeout-seconds:30}")
+  private long traceTimeoutSeconds;
+
+  @Bean("traceAdminClient")
+  public AdminClient traceAdminClient(
+      @Qualifier("configurationProvider") ConfigurationProvider provider,
+      final KafkaProperties kafkaProperties) {
+    return buildKafkaAdminClient(provider.getKafka(), kafkaProperties, "trace-reader");
+  }
+
+  private ExecutorService traceExecutorService;
+
+  @Bean("traceExecutorService")
+  public ExecutorService traceExecutorService() {
+    traceExecutorService = Executors.newFixedThreadPool(threadPoolSize);
+    return traceExecutorService;
+  }
+
+  @Bean("mcpTraceReader")
+  public MCPTraceReader mcpTraceReader(
+      @Qualifier("traceAdminClient") AdminClient adminClient,
+      @Qualifier("kafkaConsumerFactory")
+          DefaultKafkaConsumerFactory<String, GenericRecord> kafkaConsumerFactory,
+      @Qualifier("traceExecutorService") ExecutorService traceExecutorService) {
+    return MCPTraceReader.builder()
+        .adminClient(adminClient)
+        .topicName(mcpTopicName)
+        .consumerGroupId(mceConsumerGroupId)
+        .consumerSupplier(
+            () -> createConsumerWithUniqueId(kafkaConsumerFactory, "trace-reader-mcp"))
+        .pollDurationMs(pollDurationMs)
+        .pollMaxAttempts(pollMaxAttempts)
+        .timeoutSeconds(traceTimeoutSeconds)
+        .executorService(traceExecutorService)
+        .build();
+  }
+
+  @Bean("mcpFailedTraceReader")
+  public MCPFailedTraceReader mcpFailedTraceReader(
+      @Qualifier("traceAdminClient") AdminClient adminClient,
+      @Qualifier("kafkaConsumerFactory")
+          DefaultKafkaConsumerFactory<String, GenericRecord> kafkaConsumerFactory,
+      @Qualifier("traceExecutorService") ExecutorService traceExecutorService) {
+    return MCPFailedTraceReader.builder()
+        .adminClient(adminClient)
+        .topicName(mcpFailedTopicName)
+        .consumerSupplier(
+            () -> createConsumerWithUniqueId(kafkaConsumerFactory, "trace-reader-mcp-failed"))
+        .pollDurationMs(pollDurationMs)
+        .pollMaxAttempts(pollMaxAttempts)
+        .timeoutSeconds(traceTimeoutSeconds)
+        .executorService(traceExecutorService)
+        .build();
+  }
+
+  @Bean("mclVersionedTraceReader")
+  public MCLTraceReader mclVersionedTraceReader(
+      @Qualifier("traceAdminClient") AdminClient adminClient,
+      @Qualifier("kafkaConsumerFactory")
+          DefaultKafkaConsumerFactory<String, GenericRecord> kafkaConsumerFactory,
+      @Qualifier("traceExecutorService") ExecutorService traceExecutorService) {
+    return MCLTraceReader.builder()
+        .adminClient(adminClient)
+        .topicName(mclVersionedTopicName)
+        .consumerGroupId(maeConsumerGroupId)
+        .consumerSupplier(
+            () -> createConsumerWithUniqueId(kafkaConsumerFactory, "trace-reader-mcl-versioned"))
+        .pollDurationMs(pollDurationMs)
+        .pollMaxAttempts(pollMaxAttempts)
+        .timeoutSeconds(traceTimeoutSeconds)
+        .executorService(traceExecutorService)
+        .build();
+  }
+
+  @Bean("mclTimeseriesTraceReader")
+  public MCLTraceReader mclTimeseriesTraceReader(
+      @Qualifier("traceAdminClient") AdminClient adminClient,
+      @Qualifier("kafkaConsumerFactory")
+          DefaultKafkaConsumerFactory<String, GenericRecord> kafkaConsumerFactory,
+      @Qualifier("traceExecutorService") ExecutorService traceExecutorService) {
+    return MCLTraceReader.builder()
+        .adminClient(adminClient)
+        .topicName(mclTimeseriesTopicName)
+        .consumerGroupId(maeConsumerGroupId)
+        .consumerSupplier(
+            () -> createConsumerWithUniqueId(kafkaConsumerFactory, "trace-reader-mcl-timeseries"))
+        .pollDurationMs(pollDurationMs)
+        .pollMaxAttempts(pollMaxAttempts)
+        .timeoutSeconds(traceTimeoutSeconds)
+        .executorService(traceExecutorService)
+        .build();
+  }
+
+  private Consumer<String, GenericRecord> createConsumerWithUniqueId(
+      DefaultKafkaConsumerFactory<String, GenericRecord> kafkaConsumerFactory,
+      String baseClientId) {
+    Properties consumerProps = new Properties();
+    consumerProps.putAll(TRACE_CONSUMER_PROPERTIES);
+    // Add a unique suffix to the client.id
+    consumerProps.put(
+        ConsumerConfig.CLIENT_ID_CONFIG,
+        baseClientId + "-" + Thread.currentThread().getId() + "-" + System.nanoTime());
+
+    return kafkaConsumerFactory.createConsumer(
+        baseClientId, // groupId prefix
+        null, // groupId suffix (using default)
+        null, // assignor
+        consumerProps);
+  }
+
+  @PreDestroy
+  public void shutdown() {
+    if (traceExecutorService != null) {
+      traceExecutorService.shutdown();
+      try {
+        if (!traceExecutorService.awaitTermination(shutdownTimeoutSeconds, TimeUnit.SECONDS)) {
+          traceExecutorService.shutdownNow();
+          if (!traceExecutorService.awaitTermination(shutdownTimeoutSeconds, TimeUnit.SECONDS)) {
+            System.err.println("ExecutorService did not terminate");
+          }
+        }
+      } catch (InterruptedException e) {
+        traceExecutorService.shutdownNow();
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+}
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/system_telemetry/OpenTelemetryBaseFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/system_telemetry/OpenTelemetryBaseFactory.java
new file mode 100644
index 00000000000000..c6b3219a623e9c
--- /dev/null
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/system_telemetry/OpenTelemetryBaseFactory.java
@@ -0,0 +1,81 @@
+package com.linkedin.gms.factory.system_telemetry;
+
+import com.linkedin.metadata.utils.metrics.MetricSpanExporter;
+import io.datahubproject.metadata.context.TraceContext;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
+import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
+import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
+import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
+import java.util.HashMap;
+import java.util.Map;
+
+/** Common System OpenTelemetry */
+public abstract class OpenTelemetryBaseFactory {
+  private static final AttributeKey<String> SERVICE_NAME = AttributeKey.stringKey("service.name");
+
+  protected abstract String getApplicationComponent();
+
+  protected TraceContext traceContext() {
+    return TraceContext.builder().tracer(tracer(openTelemetry())).build();
+  }
+
+  private Tracer tracer(OpenTelemetry openTelemetry) {
+    return openTelemetry.getTracer(getApplicationComponent());
+  }
+
+  private OpenTelemetry openTelemetry() {
+    return AutoConfiguredOpenTelemetrySdk.builder()
+        .addPropertiesCustomizer(
+            (configProperties) -> {
+              Map<String, String> props = new HashMap<>();
+              // override exporters to "none" if not specified
+              Map.of(
+                      "OTEL_METRICS_EXPORTER", "otel.metrics.exporter",
+                      "OTEL_TRACES_EXPORTER", "otel.traces.exporter",
+                      "OTEL_LOGS_EXPORTER", "otel.logs.exporter")
+                  .forEach(
+                      (envVar, propKey) -> {
+                        String value = System.getenv(envVar);
+                        if (value == null || value.trim().isEmpty()) {
+                          props.put(propKey, "none");
+                        }
+                      });
+
+              return props;
+            })
+        .addTracerProviderCustomizer(
+            (sdkTracerProviderBuilder, configProperties) ->
+                sdkTracerProviderBuilder
+                    .addSpanProcessor(SimpleSpanProcessor.create(TraceContext.LOG_SPAN_EXPORTER))
+                    .addSpanProcessor(BatchSpanProcessor.builder(new MetricSpanExporter()).build())
+                    .setIdGenerator(TraceContext.TRACE_ID_GENERATOR)
+                    .setResource(
+                        Resource.getDefault()
+                            .merge(
+                                Resource.create(
+                                    Attributes.of(SERVICE_NAME, getApplicationComponent())))))
+        .addPropagatorCustomizer(
+            (existingPropagator, configProperties) -> {
+              // If OTEL_PROPAGATORS is not set or doesn't include tracecontext,
+              // return W3C propagator, otherwise keep existing
+              String propagators = configProperties.getString("OTEL_PROPAGATORS");
+              return (propagators == null || !propagators.contains("tracecontext"))
+                  ? W3CTraceContextPropagator.getInstance()
+                  : existingPropagator;
+            })
+        .addMetricExporterCustomizer(
+            (metricExporter, configProperties) -> {
+              String metricsExporter = configProperties.getString("OTEL_METRICS_EXPORTER");
+              return (metricsExporter == null || metricsExporter.trim().isEmpty())
+                  ? null // Return null to disable the exporter
+                  : metricExporter;
+            })
+        .build()
+        .getOpenTelemetrySdk();
+  }
+}
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/trace/TraceServiceFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/trace/TraceServiceFactory.java
new file mode 100644
index 00000000000000..aadce86036f6b2
--- /dev/null
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/trace/TraceServiceFactory.java
@@ -0,0 +1,37 @@
+package com.linkedin.gms.factory.trace;
+
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.models.registry.EntityRegistry;
+import com.linkedin.metadata.systemmetadata.SystemMetadataService;
+import com.linkedin.metadata.systemmetadata.TraceService;
+import com.linkedin.metadata.trace.MCLTraceReader;
+import com.linkedin.metadata.trace.MCPFailedTraceReader;
+import com.linkedin.metadata.trace.MCPTraceReader;
+import com.linkedin.metadata.trace.TraceServiceImpl;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class TraceServiceFactory {
+
+  @Bean
+  public TraceService traceService(
+      @Qualifier("entityRegistry") EntityRegistry entityRegistry,
+      @Qualifier("entityService") EntityService<?> entityService,
+      @Qualifier("systemMetadataService") SystemMetadataService systemMetadataService,
+      @Qualifier("mcpTraceReader") MCPTraceReader mcpTraceReader,
+      @Qualifier("mcpFailedTraceReader") MCPFailedTraceReader mcpFailedTraceReader,
+      @Qualifier("mclVersionedTraceReader") MCLTraceReader mclVersionedTraceReader,
+      @Qualifier("mclTimeseriesTraceReader") MCLTraceReader mclTimeseriesTraceReader) {
+    return TraceServiceImpl.builder()
+        .entityRegistry(entityRegistry)
+        .entityService(entityService)
+        .systemMetadataService(systemMetadataService)
+        .mcpTraceReader(mcpTraceReader)
+        .mcpFailedTraceReader(mcpFailedTraceReader)
+        .mclVersionedTraceReader(mclVersionedTraceReader)
+        .mclTimeseriesTraceReader(mclTimeseriesTraceReader)
+        .build();
+  }
+}
diff --git a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/kafka/DataHubUpgradeKafkaListener.java b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/kafka/DataHubUpgradeKafkaListener.java
index 50be0149ce2d4e..a3f3f9edc24ec2 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/kafka/DataHubUpgradeKafkaListener.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/kafka/DataHubUpgradeKafkaListener.java
@@ -1,6 +1,5 @@
 package com.linkedin.metadata.boot.kafka;
 
-import com.codahale.metrics.Timer;
 import com.linkedin.gms.factory.config.ConfigurationProvider;
 import com.linkedin.metadata.EventUtils;
 import com.linkedin.metadata.boot.dependencies.BootstrapDependency;
@@ -8,6 +7,7 @@
 import com.linkedin.metadata.version.GitVersion;
 import com.linkedin.mxe.DataHubUpgradeHistoryEvent;
 import com.linkedin.mxe.Topics;
+import io.datahubproject.metadata.context.OperationContext;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
@@ -42,13 +42,13 @@ public class DataHubUpgradeKafkaListener implements ConsumerSeekAware, Bootstrap
   public static final String TOPIC_NAME =
       "${DATAHUB_UPGRADE_HISTORY_TOPIC_NAME:" + Topics.DATAHUB_UPGRADE_HISTORY_TOPIC_NAME + "}";
 
-  private final DefaultKafkaConsumerFactory<String, GenericRecord> _defaultKafkaConsumerFactory;
+  private final DefaultKafkaConsumerFactory<String, GenericRecord> defaultKafkaConsumerFactory;
 
   @Value("#{systemEnvironment['DATAHUB_REVISION'] ?: '0'}")
   private String revision;
 
-  private final GitVersion _gitVersion;
-  private final ConfigurationProvider _configurationProvider;
+  private final GitVersion gitVersion;
+  private final ConfigurationProvider configurationProvider;
 
   @Value(CONSUMER_GROUP)
   private String consumerGroup;
@@ -56,6 +56,8 @@ public class DataHubUpgradeKafkaListener implements ConsumerSeekAware, Bootstrap
   @Value(TOPIC_NAME)
   private String topicName;
 
+  private final OperationContext systemOperationContext;
+
   private static final AtomicBoolean IS_UPDATED = new AtomicBoolean(false);
 
   public DataHubUpgradeKafkaListener(
@@ -63,11 +65,13 @@ public DataHubUpgradeKafkaListener(
       @Qualifier("duheKafkaConsumerFactory")
           DefaultKafkaConsumerFactory<String, GenericRecord> defaultKafkaConsumerFactory,
       GitVersion gitVersion,
-      ConfigurationProvider configurationProvider) {
+      ConfigurationProvider configurationProvider,
+      @Qualifier("systemOperationContext") OperationContext operationContext) {
     this.registry = registry;
-    this._defaultKafkaConsumerFactory = defaultKafkaConsumerFactory;
-    this._gitVersion = gitVersion;
-    this._configurationProvider = configurationProvider;
+    this.defaultKafkaConsumerFactory = defaultKafkaConsumerFactory;
+    this.gitVersion = gitVersion;
+    this.configurationProvider = configurationProvider;
+    this.systemOperationContext = operationContext;
   }
 
   // Constructs a consumer to read determine final offset to assign, prevents re-reading whole topic
@@ -76,7 +80,7 @@ public DataHubUpgradeKafkaListener(
   public void onPartitionsAssigned(
       Map<TopicPartition, Long> assignments, ConsumerSeekCallback callback) {
     try (Consumer<String, GenericRecord> kafkaConsumer =
-        _defaultKafkaConsumerFactory.createConsumer(consumerGroup, SUFFIX)) {
+        defaultKafkaConsumerFactory.createConsumer(consumerGroup, SUFFIX)) {
       final Map<TopicPartition, Long> offsetMap = kafkaConsumer.endOffsets(assignments.keySet());
       assignments.entrySet().stream()
           .filter(entry -> topicName.equals(entry.getKey().topic()))
@@ -100,44 +104,49 @@ public void onPartitionsAssigned(
       concurrency = "1",
       autoStartup = "false")
   public void checkSystemVersion(final ConsumerRecord<String, GenericRecord> consumerRecord) {
-    try (Timer.Context i = MetricUtils.timer(this.getClass(), "checkSystemVersion").time()) {
-      final GenericRecord record = consumerRecord.value();
-      final String expectedVersion = String.format("%s-%s", _gitVersion.getVersion(), revision);
-
-      DataHubUpgradeHistoryEvent event;
-      try {
-        event = EventUtils.avroToPegasusDUHE(record);
-        log.info("Latest system update version: {}", event.getVersion());
-        if (expectedVersion.equals(event.getVersion())) {
-          IS_UPDATED.getAndSet(true);
-        } else if (!_configurationProvider.getSystemUpdate().isWaitForSystemUpdate()) {
-          log.warn("Wait for system update is disabled. Proceeding with startup.");
-          IS_UPDATED.getAndSet(true);
-        } else {
-          log.warn(
-              "System version is not up to date: {}. Waiting for datahub-upgrade to complete...",
-              expectedVersion);
-        }
 
-      } catch (Exception e) {
-        MetricUtils.counter(this.getClass(), "avro_to_pegasus_conversion_failure").inc();
-        log.error("Error deserializing message due to: ", e);
-        log.error("Message: {}", record.toString());
-        return;
-      }
-    }
+    systemOperationContext.withSpan(
+        "checkSystemVersion",
+        () -> {
+          final GenericRecord record = consumerRecord.value();
+          final String expectedVersion = String.format("%s-%s", gitVersion.getVersion(), revision);
+
+          DataHubUpgradeHistoryEvent event;
+          try {
+            event = EventUtils.avroToPegasusDUHE(record);
+            log.info("Latest system update version: {}", event.getVersion());
+            if (expectedVersion.equals(event.getVersion())) {
+              IS_UPDATED.getAndSet(true);
+            } else if (!configurationProvider.getSystemUpdate().isWaitForSystemUpdate()) {
+              log.warn("Wait for system update is disabled. Proceeding with startup.");
+              IS_UPDATED.getAndSet(true);
+            } else {
+              log.warn(
+                  "System version is not up to date: {}. Waiting for datahub-upgrade to complete...",
+                  expectedVersion);
+            }
+
+          } catch (Exception e) {
+            MetricUtils.counter(this.getClass(), "avro_to_pegasus_conversion_failure").inc();
+            log.error("Error deserializing message due to: ", e);
+            log.error("Message: {}", record.toString());
+            return;
+          }
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "checkSystemVersion"));
   }
 
   public void waitForUpdate() {
-    if (!_configurationProvider.getSystemUpdate().isWaitForSystemUpdate()) {
+    if (!configurationProvider.getSystemUpdate().isWaitForSystemUpdate()) {
       log.warn("Wait for system update is disabled. Proceeding with startup.");
       IS_UPDATED.getAndSet(true);
     }
-    int maxBackOffs = Integer.parseInt(_configurationProvider.getSystemUpdate().getMaxBackOffs());
+    int maxBackOffs = Integer.parseInt(configurationProvider.getSystemUpdate().getMaxBackOffs());
     long initialBackOffMs =
-        Long.parseLong(_configurationProvider.getSystemUpdate().getInitialBackOffMs());
+        Long.parseLong(configurationProvider.getSystemUpdate().getInitialBackOffMs());
     int backOffFactor =
-        Integer.parseInt(_configurationProvider.getSystemUpdate().getBackOffFactor());
+        Integer.parseInt(configurationProvider.getSystemUpdate().getBackOffFactor());
 
     long backOffMs = initialBackOffMs;
     for (int i = 0; i < maxBackOffs; i++) {
diff --git a/metadata-service/openapi-analytics-servlet/src/test/java/io/datahubproject/openapi/config/OpenAPIAnalyticsTestConfiguration.java b/metadata-service/openapi-analytics-servlet/src/test/java/io/datahubproject/openapi/config/OpenAPIAnalyticsTestConfiguration.java
index 615ef985ca05d7..ebd622a1f0cce1 100644
--- a/metadata-service/openapi-analytics-servlet/src/test/java/io/datahubproject/openapi/config/OpenAPIAnalyticsTestConfiguration.java
+++ b/metadata-service/openapi-analytics-servlet/src/test/java/io/datahubproject/openapi/config/OpenAPIAnalyticsTestConfiguration.java
@@ -20,11 +20,13 @@
 import org.mockito.Mockito;
 import org.opensearch.action.search.SearchResponse;
 import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 
 @TestConfiguration
 public class OpenAPIAnalyticsTestConfiguration {
+  @MockBean TracingInterceptor tracingInterceptor;
 
   @Bean(name = "systemOperationContext")
   public OperationContext systemOperationContext() {
diff --git a/metadata-service/openapi-entity-servlet/src/test/java/io/datahubproject/openapi/config/OpenAPIEntityTestConfiguration.java b/metadata-service/openapi-entity-servlet/src/test/java/io/datahubproject/openapi/config/OpenAPIEntityTestConfiguration.java
index 075501c1a10711..305a91072c683d 100644
--- a/metadata-service/openapi-entity-servlet/src/test/java/io/datahubproject/openapi/config/OpenAPIEntityTestConfiguration.java
+++ b/metadata-service/openapi-entity-servlet/src/test/java/io/datahubproject/openapi/config/OpenAPIEntityTestConfiguration.java
@@ -28,6 +28,7 @@
 import com.linkedin.metadata.systemmetadata.SystemMetadataService;
 import com.linkedin.metadata.timeline.TimelineService;
 import io.datahubproject.metadata.context.OperationContext;
+import io.datahubproject.metadata.context.TraceContext;
 import io.datahubproject.openapi.dto.UrnResponseMap;
 import io.datahubproject.openapi.generated.EntityResponse;
 import io.datahubproject.openapi.v1.entities.EntitiesController;
@@ -47,6 +48,13 @@
 
 @TestConfiguration
 public class OpenAPIEntityTestConfiguration {
+  @MockBean TraceContext traceContext;
+
+  @Bean
+  public TracingInterceptor tracingInterceptor(final TraceContext traceContext) {
+    return new TracingInterceptor(traceContext);
+  }
+
   @Bean
   public ObjectMapper objectMapper() {
     return new ObjectMapper(new YAMLFactory());
diff --git a/metadata-service/openapi-servlet/build.gradle b/metadata-service/openapi-servlet/build.gradle
index 77679790f25dea..59dbd2408ccdd9 100644
--- a/metadata-service/openapi-servlet/build.gradle
+++ b/metadata-service/openapi-servlet/build.gradle
@@ -36,6 +36,10 @@ dependencies {
 
   annotationProcessor externalDependency.lombok
 
+  implementation externalDependency.opentelemetryApi
+  implementation externalDependency.opentelemetrySdk
+  implementation externalDependency.opentelemetrySdkTrace
+
   testImplementation externalDependency.springBootTest
   testImplementation project(':mock-entity-registry')
   testImplementation externalDependency.springBoot
diff --git a/metadata-service/openapi-servlet/models/build.gradle b/metadata-service/openapi-servlet/models/build.gradle
index d75e656e5ecd6c..dbc51ca17e3388 100644
--- a/metadata-service/openapi-servlet/models/build.gradle
+++ b/metadata-service/openapi-servlet/models/build.gradle
@@ -6,6 +6,7 @@ dependencies {
   implementation project(':entity-registry')
   implementation project(':metadata-operation-context')
   implementation project(':metadata-auth:auth-api')
+  implementation project(':metadata-service:services')
 
   implementation externalDependency.jacksonDataBind
   implementation externalDependency.httpClient
diff --git a/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceRequestV1.java b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceRequestV1.java
new file mode 100644
index 00000000000000..8fe811f23d958b
--- /dev/null
+++ b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceRequestV1.java
@@ -0,0 +1,17 @@
+package io.datahubproject.openapi.v1.models;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.linkedin.common.urn.Urn;
+import java.util.LinkedHashMap;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@AllArgsConstructor
+public class TraceRequestV1 extends LinkedHashMap<Urn, List<String>> {}
diff --git a/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceResponseV1.java b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceResponseV1.java
new file mode 100644
index 00000000000000..5fc721c2812d41
--- /dev/null
+++ b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceResponseV1.java
@@ -0,0 +1,22 @@
+package io.datahubproject.openapi.v1.models;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.metadata.systemmetadata.TraceStatus;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@AllArgsConstructor
+public class TraceResponseV1 extends LinkedHashMap<Urn, Map<String, TraceStatus>> {
+  public TraceResponseV1(Map<? extends Urn, ? extends Map<String, TraceStatus>> m) {
+    super(m);
+  }
+}
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java
index c6d5f1452fea91..fb2dba8103d59e 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java
@@ -16,10 +16,12 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.springdoc.core.models.GroupedOpenApi;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -39,6 +41,8 @@ public class SpringWebConfig implements WebMvcConfigurer {
   private static final Set<String> OPENLINEAGE_PACKAGES =
       Set.of("io.datahubproject.openapi.openlineage");
 
+  @Autowired private TracingInterceptor tracingInterceptor;
+
   @Bean
   public GroupedOpenApi v3OpenApiGroup(
       final EntityRegistry entityRegistry, final ConfigurationProvider configurationProvider) {
@@ -132,4 +136,9 @@ private <K, V> Map<K, V> concat(Supplier<Map<K, V>> a, Supplier<Map<K, V>> b) {
                         (v1, v2) -> v2,
                         LinkedHashMap::new));
   }
+
+  @Override
+  public void addInterceptors(InterceptorRegistry registry) {
+    registry.addInterceptor(tracingInterceptor).addPathPatterns("/**");
+  }
 }
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/TracingInterceptor.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/TracingInterceptor.java
new file mode 100644
index 00000000000000..0ca913b7c65cfc
--- /dev/null
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/TracingInterceptor.java
@@ -0,0 +1,93 @@
+package io.datahubproject.openapi.config;
+
+import io.datahubproject.metadata.context.TraceContext;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanContext;
+import io.opentelemetry.api.trace.StatusCode;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import javax.annotation.Nullable;
+import org.slf4j.MDC;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+@Component
+public class TracingInterceptor implements HandlerInterceptor {
+  @Nullable private final Tracer tracer;
+
+  public TracingInterceptor(final TraceContext traceContext) {
+    this.tracer = traceContext.getTracer();
+  }
+
+  @Override
+  public boolean preHandle(
+      HttpServletRequest request, HttpServletResponse response, Object handler) {
+
+    if (tracer != null) {
+      String spanName = request.getMethod() + " " + request.getRequestURI();
+      Span span =
+          tracer
+              .spanBuilder(spanName)
+              .setAttribute("http.method", request.getMethod())
+              .setAttribute("http.url", request.getRequestURI())
+              .setParent(Context.root())
+              .startSpan();
+
+      request.setAttribute("span", span);
+      span.makeCurrent();
+
+      TraceContext.enableLogTracing(request);
+
+      if (span.getSpanContext().isValid()) {
+        SpanContext spanContext = span.getSpanContext();
+        String traceId = spanContext.getTraceId();
+        String spanId = spanContext.getSpanId();
+
+        // W3C Trace Context format
+        String flags = spanContext.getTraceFlags().isSampled() ? "01" : "00";
+        response.setHeader("traceparent", String.format("00-%s-%s-%s", traceId, spanId, flags));
+
+        if (TraceContext.isLogTracingEnabled()) {
+          // Add trace context to MDC for logging
+          MDC.put("telemetryId", String.format("[%s-%s] ", traceId, spanId));
+        }
+      }
+    }
+
+    return true;
+  }
+
+  @Override
+  public void afterCompletion(
+      HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) {
+
+    if (tracer != null) {
+      Span span = (Span) request.getAttribute("span");
+      if (span != null) {
+        try {
+          span.setAttribute("http.status_code", response.getStatus());
+
+          if (ex != null) {
+            span.setStatus(StatusCode.ERROR);
+            span.recordException(ex);
+          } else {
+            if (response.getStatus() >= 400) {
+              span.setStatus(StatusCode.ERROR);
+            } else {
+              span.setStatus(StatusCode.OK);
+            }
+          }
+        } finally {
+          span.end();
+        }
+      }
+
+      if (TraceContext.isLogTracingEnabled()) {
+        TraceContext.clear();
+        MDC.clear();
+      }
+    }
+  }
+}
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/controller/GenericEntitiesController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/controller/GenericEntitiesController.java
index 592d7bba4211fe..d3c67355d0f85d 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/controller/GenericEntitiesController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/controller/GenericEntitiesController.java
@@ -55,6 +55,7 @@
 import io.datahubproject.openapi.models.GenericAspect;
 import io.datahubproject.openapi.models.GenericEntity;
 import io.datahubproject.openapi.models.GenericEntityScrollResult;
+import io.datahubproject.openapi.util.RequestInputUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
@@ -128,7 +129,8 @@ protected List<E> buildEntityList(
       throws URISyntaxException {
 
     LinkedHashMap<Urn, Map<AspectSpec, Long>> aspectSpecMap =
-        resolveAspectSpecs(
+        RequestInputUtil.resolveAspectSpecs(
+            entityRegistry,
             urns.stream()
                 .map(
                     urn ->
@@ -398,8 +400,11 @@ public ResponseEntity<A> getAspect(
           buildEntityVersionedAspectList(
               opContext,
               List.of(urn),
-              resolveAspectSpecs(
-                  new LinkedHashMap<>(Map.of(urn, Map.of(aspectName, version))), 0L, true),
+              RequestInputUtil.resolveAspectSpecs(
+                  entityRegistry,
+                  new LinkedHashMap<>(Map.of(urn, Map.of(aspectName, version))),
+                  0L,
+                  true),
               withSystemMetadata,
               true);
     }
@@ -634,7 +639,7 @@ public ResponseEntity<E> createAspect(
           authentication.getActor().toUrnStr() + " is unauthorized to " + CREATE + " entities.");
     }
 
-    AspectSpec aspectSpec = lookupAspectSpec(entitySpec, aspectName).get();
+    AspectSpec aspectSpec = RequestInputUtil.lookupAspectSpec(entitySpec, aspectName).get();
     ChangeMCP upsert =
         toUpsertItem(
             opContext.getRetrieverContext().getAspectRetriever(),
@@ -713,7 +718,7 @@ public ResponseEntity<E> patchAspect(
           authentication.getActor().toUrnStr() + " is unauthorized to " + UPDATE + " entities.");
     }
 
-    AspectSpec aspectSpec = lookupAspectSpec(entitySpec, aspectName).get();
+    AspectSpec aspectSpec = RequestInputUtil.lookupAspectSpec(entitySpec, aspectName).get();
     RecordTemplate currentValue = entityService.getAspect(opContext, urn, aspectSpec.getName(), 0);
 
     GenericPatchTemplate<? extends RecordTemplate> genericPatchTemplate =
@@ -761,69 +766,6 @@ protected Boolean exists(
             opContext, urn, aspect, includeSoftDelete != null ? includeSoftDelete : false);
   }
 
-  /**
-   * Given a map with aspect names from the API, normalized them into actual aspect names (casing
-   * fixes)
-   *
-   * @param requestedAspectNames requested aspects
-   * @param <T> map values
-   * @param expandEmpty whether to expand empty aspect names to all aspect names
-   * @return updated map
-   */
-  protected <T> LinkedHashMap<Urn, Map<AspectSpec, T>> resolveAspectSpecs(
-      LinkedHashMap<Urn, Map<String, T>> requestedAspectNames,
-      @Nonnull T defaultValue,
-      boolean expandEmpty) {
-    return requestedAspectNames.entrySet().stream()
-        .map(
-            entry -> {
-              final Urn urn = entry.getKey();
-              if (expandEmpty && (entry.getValue().isEmpty() || entry.getValue().containsKey(""))) {
-                // All aspects specified
-                Set<AspectSpec> allNames =
-                    new HashSet<>(
-                        entityRegistry.getEntitySpec(urn.getEntityType()).getAspectSpecs());
-                return Map.entry(
-                    urn,
-                    allNames.stream()
-                        .map(
-                            aspectName ->
-                                Map.entry(
-                                    aspectName, entry.getValue().getOrDefault("", defaultValue)))
-                        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
-              } else if (!entry.getValue().keySet().isEmpty()) {
-                final Map<String, AspectSpec> normalizedNames =
-                    entry.getValue().keySet().stream()
-                        .map(
-                            requestAspectName ->
-                                Map.entry(
-                                    requestAspectName, lookupAspectSpec(urn, requestAspectName)))
-                        .filter(aspectSpecEntry -> aspectSpecEntry.getValue().isPresent())
-                        .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().get()));
-                return Map.entry(
-                    urn,
-                    entry.getValue().entrySet().stream()
-                        .filter(reqEntry -> normalizedNames.containsKey(reqEntry.getKey()))
-                        .map(
-                            reqEntry ->
-                                Map.entry(
-                                    normalizedNames.get(reqEntry.getKey()), reqEntry.getValue()))
-                        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
-              } else {
-                return (Map.Entry<Urn, Map<AspectSpec, T>>) null;
-              }
-            })
-        .filter(Objects::nonNull)
-        .collect(
-            Collectors.toMap(
-                Map.Entry::getKey,
-                Map.Entry::getValue,
-                (a, b) -> {
-                  throw new IllegalStateException("Duplicate key");
-                },
-                LinkedHashMap::new));
-  }
-
   protected static <T> LinkedHashMap<Urn, Map<String, T>> aspectSpecsToAspectNames(
       LinkedHashMap<Urn, Map<AspectSpec, T>> urnAspectSpecsMap, boolean timeseries) {
     return urnAspectSpecsMap.entrySet().stream()
@@ -859,7 +801,8 @@ protected Map<String, Pair<RecordTemplate, SystemMetadata>> toAspectMap(
   }
 
   protected Optional<AspectSpec> lookupAspectSpec(Urn urn, String aspectName) {
-    return lookupAspectSpec(entityRegistry.getEntitySpec(urn.getEntityType()), aspectName);
+    return RequestInputUtil.lookupAspectSpec(
+        entityRegistry.getEntitySpec(urn.getEntityType()), aspectName);
   }
 
   protected RecordTemplate toRecordTemplate(
@@ -902,23 +845,6 @@ protected ChangeMCP toUpsertItem(
         aspectRetriever);
   }
 
-  /**
-   * Case-insensitive fallback
-   *
-   * @return
-   */
-  protected static Optional<AspectSpec> lookupAspectSpec(EntitySpec entitySpec, String aspectName) {
-    if (entitySpec == null) {
-      return Optional.empty();
-    }
-
-    return entitySpec.getAspectSpec(aspectName) != null
-        ? Optional.of(entitySpec.getAspectSpec(aspectName))
-        : entitySpec.getAspectSpecs().stream()
-            .filter(aspec -> aspec.getName().toLowerCase().equals(aspectName))
-            .findFirst();
-  }
-
   protected static Urn validatedUrn(String urn) throws InvalidUrnException {
     try {
       return Urn.createFromString(urn);
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/v1/TraceController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/v1/TraceController.java
new file mode 100644
index 00000000000000..d7e7b2dce1189a
--- /dev/null
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/operations/v1/TraceController.java
@@ -0,0 +1,149 @@
+package io.datahubproject.openapi.operations.v1;
+
+import static com.linkedin.metadata.authorization.ApiOperation.READ;
+
+import com.datahub.authentication.Authentication;
+import com.datahub.authentication.AuthenticationContext;
+import com.datahub.authorization.AuthUtil;
+import com.datahub.authorization.AuthorizerChain;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.metadata.systemmetadata.TraceService;
+import io.datahubproject.metadata.context.OperationContext;
+import io.datahubproject.metadata.context.RequestContext;
+import io.datahubproject.openapi.exception.UnauthorizedException;
+import io.datahubproject.openapi.util.RequestInputUtil;
+import io.datahubproject.openapi.v1.models.TraceRequestV1;
+import io.datahubproject.openapi.v1.models.TraceResponseV1;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.ExampleObject;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/openapi/v1/trace")
+@Slf4j
+@Tag(name = "Tracing", description = "An API for tracing async operations.")
+public class TraceController {
+  private final TraceService traceService;
+  private final AuthorizerChain authorizerChain;
+  private final OperationContext systemOperationContext;
+
+  public TraceController(
+      TraceService traceService,
+      OperationContext systemOperationContext,
+      AuthorizerChain authorizerChain) {
+    this.traceService = traceService;
+    this.systemOperationContext = systemOperationContext;
+    this.authorizerChain = authorizerChain;
+  }
+
+  @Tag(name = "Async Write Tracing")
+  @PostMapping(path = "/write/{traceId}", produces = MediaType.APPLICATION_JSON_VALUE)
+  @Operation(
+      summary = "Trace an async write to the underlying storage.",
+      requestBody =
+          @io.swagger.v3.oas.annotations.parameters.RequestBody(
+              required = true,
+              content =
+                  @Content(
+                      mediaType = MediaType.APPLICATION_JSON_VALUE,
+                      examples = {
+                        @ExampleObject(
+                            name = "Default",
+                            value =
+                                """
+                    {
+                      "urn:li:dataset:(urn:li:dataPlatform:hdfs,/path/to/data,PROD)": ["status", "datasetProperties"],
+                      "urn:li:dataset:(urn:li:dataPlatform:snowflake,long_tail_companions.adoption.pet_profiles,PROD)": ["datasetProperties"]
+                    }
+                    """)
+                      })))
+  public ResponseEntity<TraceResponseV1> getTrace(
+      HttpServletRequest request,
+      @PathVariable("traceId") String traceId,
+      @RequestParam(value = "onlyIncludeErrors", defaultValue = "true") boolean onlyIncludeErrors,
+      @RequestParam(value = "detailed", defaultValue = "false") boolean detailed,
+      @RequestParam(value = "skipCache", defaultValue = "false") boolean skipCache,
+      @RequestBody @Nonnull TraceRequestV1 traceRequestV1) {
+    Authentication authentication = AuthenticationContext.getAuthentication();
+    String actorUrnStr = authentication.getActor().toUrnStr();
+
+    OperationContext opContext =
+        OperationContext.asSession(
+            systemOperationContext,
+            RequestContext.builder().buildOpenapi(actorUrnStr, request, "getTrace", List.of()),
+            authorizerChain,
+            authentication,
+            true);
+
+    if (!AuthUtil.isAPIAuthorizedEntityUrns(opContext, READ, traceRequestV1.keySet())) {
+      throw new UnauthorizedException(
+          authentication.getActor().toUrnStr()
+              + " is unauthorized to "
+              + READ
+              + " as least one of the requested URNs.");
+    }
+
+    LinkedHashMap<Urn, List<String>> normalizedInput =
+        traceRequestV1.entrySet().stream()
+            .collect(
+                Collectors.toMap(
+                    Map.Entry::getKey,
+                    e ->
+                        RequestInputUtil.resolveAspectNames(
+                            opContext.getEntityRegistry(), e.getKey(), e.getValue(), true),
+                    (v1, v2) -> v1,
+                    LinkedHashMap::new));
+
+    return ResponseEntity.ok(
+        new TraceResponseV1(
+            traceService.trace(
+                opContext,
+                extractTraceId(traceId),
+                normalizedInput,
+                onlyIncludeErrors,
+                detailed,
+                skipCache)));
+  }
+
+  private static String extractTraceId(String input) {
+    if (input == null || input.trim().isEmpty()) {
+      return null;
+    }
+
+    // Clean the input
+    input = input.trim();
+
+    // Case 1: If it's a full traceparent header (containing hyphens)
+    if (input.contains("-")) {
+      String[] parts = input.split("-");
+      if (parts.length >= 2) {
+        // The trace ID is the second part (index 1)
+        return parts[1];
+      }
+      return null;
+    }
+
+    // Case 2: If it's just the trace ID (32 hex characters)
+    if (input.length() == 32 && input.matches("[0-9a-fA-F]+")) {
+      return input;
+    }
+
+    return null;
+  }
+}
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/util/MappingUtil.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/util/MappingUtil.java
index ca425810c87a09..72c39c792b355e 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/util/MappingUtil.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/util/MappingUtil.java
@@ -5,7 +5,6 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -480,7 +479,6 @@ public static List<Pair<String, Boolean>> ingestBatchProposal(
       boolean async) {
 
     // TODO: Use the actor present in the IC.
-    Timer.Context context = MetricUtils.timer("postEntity").time();
     final com.linkedin.common.AuditStamp auditStamp =
         new com.linkedin.common.AuditStamp()
             .setTime(System.currentTimeMillis())
@@ -519,7 +517,6 @@ public static List<Pair<String, Boolean>> ingestBatchProposal(
       } else {
         MetricUtils.counter(MetricRegistry.name("postEntity", "success")).inc();
       }
-      context.stop();
     }
   }
 
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/util/RequestInputUtil.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/util/RequestInputUtil.java
new file mode 100644
index 00000000000000..fe1f217c0d8448
--- /dev/null
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/util/RequestInputUtil.java
@@ -0,0 +1,136 @@
+package io.datahubproject.openapi.util;
+
+import com.linkedin.common.urn.Urn;
+import com.linkedin.metadata.models.AspectSpec;
+import com.linkedin.metadata.models.EntitySpec;
+import com.linkedin.metadata.models.registry.EntityRegistry;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+
+public class RequestInputUtil {
+  private RequestInputUtil() {}
+
+  public static List<String> resolveAspectNames(
+      EntityRegistry entityRegistry, Urn urn, List<String> inputAspectNames, boolean expandEmpty) {
+    return resolveAspectSpecs(entityRegistry, urn, inputAspectNames, expandEmpty).stream()
+        .map(AspectSpec::getName)
+        .toList();
+  }
+
+  /**
+   * For a given urn and list of aspect names, resolve AspectSpecs
+   *
+   * @param entityRegistry
+   * @param urn
+   * @param inputAspectNames
+   * @param expandEmpty if empty return all AspectSpecs
+   * @return
+   */
+  public static List<AspectSpec> resolveAspectSpecs(
+      EntityRegistry entityRegistry, Urn urn, List<String> inputAspectNames, boolean expandEmpty) {
+    LinkedHashMap<String, Long> intermediateReq =
+        inputAspectNames.stream()
+            .map(name -> Map.entry(name, 0L))
+            .collect(
+                Collectors.toMap(
+                    Map.Entry::getKey,
+                    Map.Entry::getValue,
+                    (existing, replacement) -> existing,
+                    LinkedHashMap::new));
+    Map<Urn, Map<AspectSpec, Long>> intermediate =
+        resolveAspectSpecs(
+            entityRegistry, new LinkedHashMap<>(Map.of(urn, intermediateReq)), 0L, expandEmpty);
+    return new ArrayList<>(intermediate.getOrDefault(urn, Map.of()).keySet());
+  }
+
+  /**
+   * Given a map with aspect names from the API, normalized them into actual aspect names (casing
+   * fixes)
+   *
+   * @param requestedAspectNames requested aspects
+   * @param <T> map values
+   * @param expandEmpty whether to expand empty aspect names to all aspect names
+   * @return updated map
+   */
+  public static <T> LinkedHashMap<Urn, Map<AspectSpec, T>> resolveAspectSpecs(
+      EntityRegistry entityRegistry,
+      LinkedHashMap<Urn, Map<String, T>> requestedAspectNames,
+      @Nonnull T defaultValue,
+      boolean expandEmpty) {
+    return requestedAspectNames.entrySet().stream()
+        .map(
+            entry -> {
+              final Urn urn = entry.getKey();
+              if (expandEmpty && (entry.getValue().isEmpty() || entry.getValue().containsKey(""))) {
+                // All aspects specified
+                Set<AspectSpec> allNames =
+                    new HashSet<>(
+                        entityRegistry.getEntitySpec(urn.getEntityType()).getAspectSpecs());
+                return Map.entry(
+                    urn,
+                    allNames.stream()
+                        .map(
+                            aspectName ->
+                                Map.entry(
+                                    aspectName, entry.getValue().getOrDefault("", defaultValue)))
+                        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
+              } else if (!entry.getValue().keySet().isEmpty()) {
+                final Map<String, AspectSpec> normalizedNames =
+                    entry.getValue().keySet().stream()
+                        .map(
+                            requestAspectName ->
+                                Map.entry(
+                                    requestAspectName,
+                                    lookupAspectSpec(entityRegistry, urn, requestAspectName)))
+                        .filter(aspectSpecEntry -> aspectSpecEntry.getValue().isPresent())
+                        .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().get()));
+                return Map.entry(
+                    urn,
+                    entry.getValue().entrySet().stream()
+                        .filter(reqEntry -> normalizedNames.containsKey(reqEntry.getKey()))
+                        .map(
+                            reqEntry ->
+                                Map.entry(
+                                    normalizedNames.get(reqEntry.getKey()), reqEntry.getValue()))
+                        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
+              } else {
+                return (Map.Entry<Urn, Map<AspectSpec, T>>) null;
+              }
+            })
+        .filter(Objects::nonNull)
+        .collect(
+            Collectors.toMap(
+                Map.Entry::getKey,
+                Map.Entry::getValue,
+                (a, b) -> {
+                  throw new IllegalStateException("Duplicate key");
+                },
+                LinkedHashMap::new));
+  }
+
+  private static Optional<AspectSpec> lookupAspectSpec(
+      EntityRegistry entityRegistry, Urn urn, String aspectName) {
+    return lookupAspectSpec(entityRegistry.getEntitySpec(urn.getEntityType()), aspectName);
+  }
+
+  /** Case-insensitive fallback */
+  public static Optional<AspectSpec> lookupAspectSpec(EntitySpec entitySpec, String aspectName) {
+    if (entitySpec == null) {
+      return Optional.empty();
+    }
+
+    return entitySpec.getAspectSpec(aspectName) != null
+        ? Optional.of(entitySpec.getAspectSpec(aspectName))
+        : entitySpec.getAspectSpecs().stream()
+            .filter(aspec -> aspec.getName().toLowerCase().equals(aspectName))
+            .findFirst();
+  }
+}
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/entities/EntitiesController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/entities/EntitiesController.java
index dd359cbc464319..7b1a4ec49f77c4 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/entities/EntitiesController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/entities/EntitiesController.java
@@ -7,7 +7,6 @@
 import static com.linkedin.metadata.utils.PegasusUtils.urnToEntityName;
 
 import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
 import com.datahub.authentication.Authentication;
 import com.datahub.authentication.AuthenticationContext;
 import com.datahub.authorization.AuthUtil;
@@ -104,7 +103,7 @@ public ResponseEntity<UrnResponseMap> getEntities(
           @RequestParam(name = "aspectNames", required = false)
           @Nullable
           String[] aspectNames) {
-    Timer.Context context = MetricUtils.timer("getEntities").time();
+
     final Set<Urn> entityUrns =
         Arrays.stream(urns)
             // Have to decode here because of frontend routing, does No-op for already unencoded
@@ -167,7 +166,6 @@ public ResponseEntity<UrnResponseMap> getEntities(
       } else {
         MetricUtils.counter(MetricRegistry.name("getEntities", "success")).inc();
       }
-      context.stop();
     }
   }
 
@@ -263,7 +261,7 @@ public ResponseEntity<List<RollbackRunResultDto>> deleteEntities(
           boolean soft,
       @RequestParam(required = false, name = "async") Boolean async) {
     Throwable exceptionally = null;
-    try (Timer.Context context = MetricUtils.timer("deleteEntities").time()) {
+    try {
       Authentication authentication = AuthenticationContext.getAuthentication();
       String actorUrnStr = authentication.getActor().toUrnStr();
 
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/relationships/RelationshipsController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/relationships/RelationshipsController.java
index f778bf54aaeac7..3dcce394e35e98 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/relationships/RelationshipsController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v1/relationships/RelationshipsController.java
@@ -5,7 +5,6 @@
 import static com.linkedin.metadata.search.utils.QueryUtils.*;
 
 import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
 import com.datahub.authentication.Authentication;
 import com.datahub.authentication.AuthenticationContext;
 import com.datahub.authorization.AuthUtil;
@@ -157,7 +156,7 @@ public ResponseEntity<RelatedEntitiesResult> getRelationships(
           @RequestParam(name = "count", defaultValue = "200")
           @Nullable
           Integer count) {
-    Timer.Context context = MetricUtils.timer("getRelationships").time();
+
     // Have to decode here because of frontend routing, does No-op for already unencoded through
     // direct API access
     final Urn entityUrn = UrnUtils.getUrn(URLDecoder.decode(urn, Charset.forName("UTF-8")));
@@ -201,7 +200,6 @@ public ResponseEntity<RelatedEntitiesResult> getRelationships(
       } else {
         MetricUtils.counter(MetricRegistry.name("getRelationships", "success")).inc();
       }
-      context.stop();
     }
   }
 }
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java
index 573feec64d2283..9bf7851653d920 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java
@@ -709,6 +709,17 @@ protected ChangeMCP toUpsertItem(
       changeType = ChangeType.UPSERT;
     }
 
+    SystemMetadata systemMetadata = null;
+    if (jsonNode.has("systemMetadata")) {
+      systemMetadata =
+          EntityApiUtils.parseSystemMetadata(
+              objectMapper.writeValueAsString(jsonNode.get("systemMetadata")));
+    }
+    Map<String, String> headers = null;
+    if (jsonNode.has("headers")) {
+      headers = objectMapper.convertValue(jsonNode.get("headers"), new TypeReference<>() {});
+    }
+
     return ChangeItemImpl.builder()
         .urn(entityUrn)
         .aspectName(aspectSpec.getName())
@@ -719,6 +730,8 @@ protected ChangeMCP toUpsertItem(
                 ByteString.copyString(aspectJson, StandardCharsets.UTF_8),
                 GenericRecordUtils.JSON,
                 aspectSpec))
+        .systemMetadata(systemMetadata)
+        .headers(headers)
         .build(aspectRetriever);
   }
 }
diff --git a/metadata-service/openapi-servlet/src/test/java/entities/EntitiesControllerTest.java b/metadata-service/openapi-servlet/src/test/java/entities/EntitiesControllerTest.java
index 8b530b218532d0..a5cff75c0c91a2 100644
--- a/metadata-service/openapi-servlet/src/test/java/entities/EntitiesControllerTest.java
+++ b/metadata-service/openapi-servlet/src/test/java/entities/EntitiesControllerTest.java
@@ -14,6 +14,7 @@
 import com.linkedin.metadata.aspect.batch.AspectsBatch;
 import com.linkedin.metadata.config.PreProcessHooks;
 import com.linkedin.metadata.entity.AspectDao;
+import com.linkedin.metadata.entity.IngestAspectsResult;
 import com.linkedin.metadata.entity.TransactionContext;
 import com.linkedin.metadata.entity.UpdateAspectResult;
 import com.linkedin.metadata.event.EventProducer;
@@ -76,7 +77,7 @@ public void setup()
         .thenAnswer(
             i ->
                 List.of(
-                    ((Function<TransactionContext, List<UpdateAspectResult>>) i.getArgument(0))
+                    ((Function<TransactionContext, IngestAspectsResult>) i.getArgument(0))
                         .apply(TransactionContext.empty(Mockito.mock(Transaction.class), 0))));
 
     EventProducer mockEntityEventProducer = Mockito.mock(EventProducer.class);
diff --git a/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/operations/v1/TraceControllerTest.java b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/operations/v1/TraceControllerTest.java
new file mode 100644
index 00000000000000..ca26ba42832009
--- /dev/null
+++ b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/operations/v1/TraceControllerTest.java
@@ -0,0 +1,275 @@
+package io.datahubproject.openapi.operations.v1;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.testng.Assert.assertNotNull;
+
+import com.datahub.authentication.Actor;
+import com.datahub.authentication.ActorType;
+import com.datahub.authentication.Authentication;
+import com.datahub.authentication.AuthenticationContext;
+import com.datahub.authorization.AuthorizationResult;
+import com.datahub.authorization.AuthorizerChain;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.metadata.models.registry.EntityRegistry;
+import com.linkedin.metadata.systemmetadata.TraceService;
+import com.linkedin.metadata.systemmetadata.TraceStatus;
+import com.linkedin.metadata.systemmetadata.TraceStorageStatus;
+import com.linkedin.metadata.systemmetadata.TraceWriteStatus;
+import io.datahubproject.metadata.context.ObjectMapperContext;
+import io.datahubproject.metadata.context.OperationContext;
+import io.datahubproject.metadata.context.TraceContext;
+import io.datahubproject.openapi.config.TracingInterceptor;
+import io.datahubproject.openapi.v1.models.TraceRequestV1;
+import io.datahubproject.openapi.v1.models.TraceResponseV1;
+import io.datahubproject.test.metadata.context.TestOperationContexts;
+import java.util.List;
+import java.util.Map;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Primary;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+import org.testng.annotations.Test;
+
+@SpringBootTest(classes = TraceControllerTest.TestConfig.class)
+@AutoConfigureWebMvc
+@AutoConfigureMockMvc
+public class TraceControllerTest extends AbstractTestNGSpringContextTests {
+  public static final TraceStatus OK =
+      TraceStatus.builder()
+          .success(true)
+          .primaryStorage(TraceStorageStatus.ok(TraceWriteStatus.ACTIVE_STATE))
+          .searchStorage(TraceStorageStatus.ok(TraceWriteStatus.ACTIVE_STATE))
+          .build();
+
+  @Autowired private TraceController traceController;
+
+  @Autowired private MockMvc mockMvc;
+
+  @Autowired private TraceService mockTraceService;
+
+  @Test
+  public void initTest() {
+    assertNotNull(traceController);
+  }
+
+  @Test
+  public void testGetTrace() throws Exception {
+    // Test URNs
+    Urn TEST_URN_1 =
+        UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:hdfs,/path/to/data,PROD)");
+    Urn TEST_URN_2 =
+        UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:snowflake,test.table,PROD)");
+
+    // Mock trace service response
+    TraceResponseV1 mockTraceResult =
+        new TraceResponseV1(
+            Map.of(
+                TEST_URN_1, Map.of("status", OK, "datasetProperties", OK),
+                TEST_URN_2, Map.of("datasetProperties", OK)));
+
+    when(mockTraceService.trace(
+            any(OperationContext.class), eq("trace123"), any(), eq(false), eq(false), eq(false)))
+        .thenReturn(mockTraceResult);
+
+    // Create test request body
+    TraceRequestV1 requestBody = new TraceRequestV1();
+    requestBody.put(TEST_URN_1, List.of("status", "datasetProperties"));
+    requestBody.put(TEST_URN_2, List.of("datasetProperties"));
+
+    // Test the trace endpoint
+    mockMvc
+        .perform(
+            MockMvcRequestBuilders.post("/openapi/v1/trace/write/test-trace123-id")
+                .param("onlyIncludeErrors", "false")
+                .content(new ObjectMapper().writeValueAsString(requestBody))
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+        .andExpect(status().isOk())
+        .andDo(
+            result -> {
+              String responseContent = result.getResponse().getContentAsString();
+              System.out.println("Response content: " + responseContent);
+            })
+        .andExpect(
+            MockMvcResultMatchers.jsonPath(
+                    "$['urn:li:dataset:(urn:li:dataPlatform:hdfs,/path/to/data,PROD)'].datasetProperties.success")
+                .value(true))
+        .andExpect(
+            MockMvcResultMatchers.jsonPath(
+                    "$['urn:li:dataset:(urn:li:dataPlatform:snowflake,test.table,PROD)'].datasetProperties.success")
+                .value(true))
+        .andExpect(
+            MockMvcResultMatchers.jsonPath(
+                    "$['urn:li:dataset:(urn:li:dataPlatform:hdfs,/path/to/data,PROD)'].status.success")
+                .value(true))
+        .andExpect(
+            MockMvcResultMatchers.jsonPath(
+                    "$['urn:li:dataset:(urn:li:dataPlatform:hdfs,/path/to/data,PROD)'].datasetProperties.primaryStorage.writeStatus")
+                .value("ACTIVE_STATE"))
+        .andExpect(
+            MockMvcResultMatchers.jsonPath(
+                    "$['urn:li:dataset:(urn:li:dataPlatform:hdfs,/path/to/data,PROD)'].datasetProperties.searchStorage.writeStatus")
+                .value("ACTIVE_STATE"));
+  }
+
+  @Test
+  public void testGetTraceWithCustomParameters() throws Exception {
+    // Test URN
+    Urn TEST_URN = UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:hdfs,/path/to/data,PROD)");
+
+    // Mock trace service response
+    TraceResponseV1 mockTraceResult =
+        new TraceResponseV1(
+            Map.of(
+                TEST_URN,
+                Map.of(
+                    "status",
+                    TraceStatus.builder()
+                        .success(false)
+                        .primaryStorage(
+                            TraceStorageStatus.fail(TraceWriteStatus.ERROR, "Mock test error"))
+                        .searchStorage(
+                            TraceStorageStatus.fail(
+                                TraceWriteStatus.ERROR, "Failed to write to primary storage"))
+                        .build(),
+                    "datasetProfile",
+                    TraceStatus.builder()
+                        .success(true)
+                        .primaryStorage(TraceStorageStatus.ok(TraceWriteStatus.NO_OP))
+                        .searchStorage(
+                            TraceStorageStatus.ok(TraceWriteStatus.TRACE_NOT_IMPLEMENTED))
+                        .build())));
+
+    when(mockTraceService.trace(
+            any(OperationContext.class),
+            eq("trace123"),
+            any(),
+            eq(false), // onlyIncludeErrors = false
+            eq(true), // detailed = true
+            eq(true) // skipCache = true
+            ))
+        .thenReturn(mockTraceResult);
+
+    // Create test request body
+    TraceRequestV1 requestBody = new TraceRequestV1();
+    requestBody.put(TEST_URN, List.of("status", "datasetProfile"));
+
+    // Test the trace endpoint with custom parameters
+    mockMvc
+        .perform(
+            MockMvcRequestBuilders.post("/openapi/v1/trace/write/test-trace123-id")
+                .param("onlyIncludeErrors", "false")
+                .param("detailed", "true")
+                .param("skipCache", "true")
+                .content(new ObjectMapper().writeValueAsString(requestBody))
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+        .andExpect(status().isOk())
+        .andDo(
+            result -> {
+              String responseContent = result.getResponse().getContentAsString();
+              System.out.println("Response content: " + responseContent);
+            })
+        .andExpect(
+            MockMvcResultMatchers.jsonPath(
+                    "$['urn:li:dataset:(urn:li:dataPlatform:hdfs,/path/to/data,PROD)'].status.success")
+                .value(false))
+        .andExpect(
+            MockMvcResultMatchers.jsonPath(
+                    "$['urn:li:dataset:(urn:li:dataPlatform:hdfs,/path/to/data,PROD)'].datasetProfile.success")
+                .value(true))
+        .andExpect(
+            MockMvcResultMatchers.jsonPath(
+                    "$['urn:li:dataset:(urn:li:dataPlatform:hdfs,/path/to/data,PROD)'].status.primaryStorage.writeStatus")
+                .value("ERROR"))
+        .andExpect(
+            MockMvcResultMatchers.jsonPath(
+                    "$['urn:li:dataset:(urn:li:dataPlatform:hdfs,/path/to/data,PROD)'].status.primaryStorage.writeMessage")
+                .value("Mock test error"))
+        .andExpect(
+            MockMvcResultMatchers.jsonPath(
+                    "$['urn:li:dataset:(urn:li:dataPlatform:hdfs,/path/to/data,PROD)'].status.searchStorage.writeStatus")
+                .value("ERROR"))
+        .andExpect(
+            MockMvcResultMatchers.jsonPath(
+                    "$['urn:li:dataset:(urn:li:dataPlatform:hdfs,/path/to/data,PROD)'].status.searchStorage.writeMessage")
+                .value("Failed to write to primary storage"))
+        .andExpect(
+            MockMvcResultMatchers.jsonPath(
+                    "$['urn:li:dataset:(urn:li:dataPlatform:hdfs,/path/to/data,PROD)'].datasetProfile.primaryStorage.writeStatus")
+                .value("NO_OP"))
+        .andExpect(
+            MockMvcResultMatchers.jsonPath(
+                    "$['urn:li:dataset:(urn:li:dataPlatform:hdfs,/path/to/data,PROD)'].datasetProfile.searchStorage.writeStatus")
+                .value("TRACE_NOT_IMPLEMENTED"));
+  }
+
+  @SpringBootConfiguration
+  @Import({TraceControllerTestConfig.class, TracingInterceptor.class})
+  @ComponentScan(basePackages = {"io.datahubproject.openapi.operations.v1"})
+  static class TestConfig {}
+
+  @TestConfiguration
+  public static class TraceControllerTestConfig {
+    @MockBean public TraceService traceService;
+
+    @Bean
+    public ObjectMapper objectMapper() {
+      return new ObjectMapper();
+    }
+
+    @Bean(name = "systemOperationContext")
+    public OperationContext systemOperationContext(ObjectMapper objectMapper) {
+      TraceContext traceContext = mock(TraceContext.class);
+      return TestOperationContexts.systemContextTraceNoSearchAuthorization(
+          () -> ObjectMapperContext.builder().objectMapper(objectMapper).build(),
+          () -> traceContext);
+    }
+
+    @Bean
+    public EntityRegistry entityRegistry(
+        @Qualifier("systemOperationContext") OperationContext systemOperationContext) {
+      return systemOperationContext.getEntityRegistry();
+    }
+
+    @Bean
+    @Primary
+    public TraceContext traceContext(
+        @Qualifier("systemOperationContext") OperationContext systemOperationContext) {
+      return systemOperationContext.getTraceContext();
+    }
+
+    @Bean
+    @Primary
+    public AuthorizerChain authorizerChain() {
+      AuthorizerChain authorizerChain = mock(AuthorizerChain.class);
+
+      Authentication authentication = mock(Authentication.class);
+      when(authentication.getActor()).thenReturn(new Actor(ActorType.USER, "datahub"));
+      when(authorizerChain.authorize(any()))
+          .thenReturn(new AuthorizationResult(null, AuthorizationResult.Type.ALLOW, ""));
+      AuthenticationContext.setAuthentication(authentication);
+
+      return authorizerChain;
+    }
+  }
+}
diff --git a/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/controller/EntityControllerTest.java b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/controller/EntityControllerTest.java
index 5080f6a12cdd28..ced9fea1ae83ee 100644
--- a/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/controller/EntityControllerTest.java
+++ b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/controller/EntityControllerTest.java
@@ -20,6 +20,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
 
 import com.datahub.authentication.Actor;
 import com.datahub.authentication.ActorType;
@@ -55,9 +56,12 @@
 import com.linkedin.metadata.utils.GenericRecordUtils;
 import com.linkedin.metadata.utils.SearchUtil;
 import com.linkedin.mxe.GenericAspect;
+import com.linkedin.mxe.SystemMetadata;
 import io.datahubproject.metadata.context.OperationContext;
+import io.datahubproject.metadata.context.TraceContext;
 import io.datahubproject.metadata.context.ValidationContext;
 import io.datahubproject.openapi.config.SpringWebConfig;
+import io.datahubproject.openapi.config.TracingInterceptor;
 import io.datahubproject.openapi.exception.InvalidUrnException;
 import io.datahubproject.test.metadata.context.TestOperationContexts;
 import jakarta.servlet.ServletException;
@@ -87,6 +91,7 @@
 @ComponentScan(basePackages = {"io.datahubproject.openapi.v3.controller"})
 @Import({
   SpringWebConfig.class,
+  TracingInterceptor.class,
   EntityControllerTest.EntityControllerTestConfig.class,
   EntityVersioningServiceFactory.class
 })
@@ -398,6 +403,7 @@ public static class EntityControllerTestConfig {
     @MockBean public EntityServiceImpl entityService;
     @MockBean public SearchService searchService;
     @MockBean public TimeseriesAspectService timeseriesAspectService;
+    @MockBean public TraceContext traceContext;
 
     @Bean
     public ObjectMapper objectMapper() {
@@ -647,4 +653,80 @@ public void testInvalidVersionSetUrn() throws Exception {
                 .accept(MediaType.APPLICATION_JSON))
         .andExpect(status().is4xxClientError());
   }
+
+  @Test
+  public void testSystemMetadataAndHeadersParsing() throws Exception {
+    // Test JSON with both systemMetadata and headers
+    final String testBodyWithMetadataAndHeaders =
+        "[\n"
+            + "    {\n"
+            + "      \"urn\": \"urn:li:dataset:(urn:li:dataPlatform:testPlatform,1,PROD)\",\n"
+            + "      \"status\": {\n"
+            + "        \"value\": {\n"
+            + "          \"removed\": false\n"
+            + "        },\n"
+            + "        \"systemMetadata\": {\n"
+            + "          \"lastObserved\": 1234567890,\n"
+            + "          \"runId\": \"test-run-id\"\n"
+            + "        },\n"
+            + "        \"headers\": {\n"
+            + "          \"X-Custom-Header\": \"test-value\",\n"
+            + "          \"X-Another-Header\": \"another-value\"\n"
+            + "        }\n"
+            + "      }\n"
+            + "    }\n"
+            + "]";
+
+    // Test JSON without systemMetadata and headers
+    final String testBodyWithoutMetadataAndHeaders =
+        "[\n"
+            + "    {\n"
+            + "      \"urn\": \"urn:li:dataset:(urn:li:dataPlatform:testPlatform,1,PROD)\",\n"
+            + "      \"status\": {\n"
+            + "        \"value\": {\n"
+            + "          \"removed\": false\n"
+            + "        }\n"
+            + "      }\n"
+            + "    }\n"
+            + "]";
+
+    // Test with metadata and headers
+    AspectsBatch batchWithMetadata =
+        entityController.toMCPBatch(
+            opContext,
+            testBodyWithMetadataAndHeaders,
+            opContext.getSessionActorContext().getAuthentication().getActor());
+
+    // Verify systemMetadata is correctly parsed
+    SystemMetadata systemMetadata =
+        batchWithMetadata.getMCPItems().get(0).getMetadataChangeProposal().getSystemMetadata();
+    assertNotNull(systemMetadata);
+    assertEquals(1234567890L, systemMetadata.getLastObserved().longValue());
+    assertEquals("test-run-id", systemMetadata.getRunId());
+
+    // Verify headers are correctly parsed
+    Map<String, String> headers =
+        batchWithMetadata.getMCPItems().get(0).getMetadataChangeProposal().getHeaders();
+    assertNotNull(headers);
+    assertEquals("test-value", headers.get("X-Custom-Header"));
+    assertEquals("another-value", headers.get("X-Another-Header"));
+
+    // Test without metadata and headers
+    AspectsBatch batchWithoutMetadata =
+        entityController.toMCPBatch(
+            opContext,
+            testBodyWithoutMetadataAndHeaders,
+            opContext.getSessionActorContext().getAuthentication().getActor());
+
+    // Verify systemMetadata has lastObserved even when not in input
+    SystemMetadata metadataWithoutInput =
+        batchWithoutMetadata.getMCPItems().get(0).getMetadataChangeProposal().getSystemMetadata();
+    assertNotNull(metadataWithoutInput);
+    assertNotNull(metadataWithoutInput.getLastObserved());
+    assertEquals(
+        metadataWithoutInput.getRunId(), "no-run-id-provided"); // Should be null since not provided
+
+    // Verify headers are null when not present
+    assertNull(batchWithoutMetadata.getMCPItems().get(0).getMetadataChangeProposal().getHeaders());
+  }
 }
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json
index af11532ccf4ece..3a5e907c1c0ea7 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json
@@ -3830,18 +3830,18 @@
       "type" : "record",
       "name" : "MLModelProperties",
       "namespace" : "com.linkedin.ml.metadata",
-      "doc" : "Properties associated with a ML Model\r",
+      "doc" : "Properties associated with a ML Model",
       "include" : [ "com.linkedin.common.CustomProperties", "com.linkedin.common.ExternalReference", {
         "type" : "record",
         "name" : "MLModelLineageInfo",
-        "doc" : "A set of re-usable fields used to capture lineage information for ML Models and ML Model Groups\r",
+        "doc" : "A set of re-usable fields used to capture lineage information for ML Models and ML Model Groups",
         "fields" : [ {
           "name" : "trainingJobs",
           "type" : {
             "type" : "array",
             "items" : "com.linkedin.common.Urn"
           },
-          "doc" : "List of jobs or process instances (if any) used to train the model or group. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.\r",
+          "doc" : "List of jobs or process instances (if any) used to train the model or group. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.",
           "optional" : true,
           "Relationship" : {
             "/*" : {
@@ -3856,7 +3856,7 @@
             "type" : "array",
             "items" : "com.linkedin.common.Urn"
           },
-          "doc" : "List of jobs or process instances (if any) that use the model or group.\r",
+          "doc" : "List of jobs or process instances (if any) that use the model or group.",
           "optional" : true,
           "Relationship" : {
             "/*" : {
@@ -3871,7 +3871,7 @@
       "fields" : [ {
         "name" : "name",
         "type" : "string",
-        "doc" : "Display name of the MLModel\r",
+        "doc" : "Display name of the MLModel",
         "optional" : true,
         "Searchable" : {
           "boostScore" : 10.0,
@@ -3882,7 +3882,7 @@
       }, {
         "name" : "description",
         "type" : "string",
-        "doc" : "Documentation of the MLModel\r",
+        "doc" : "Documentation of the MLModel",
         "optional" : true,
         "Searchable" : {
           "fieldType" : "TEXT",
@@ -3891,28 +3891,28 @@
       }, {
         "name" : "date",
         "type" : "com.linkedin.common.Time",
-        "doc" : "Date when the MLModel was developed\r",
+        "doc" : "Date when the MLModel was developed",
         "optional" : true,
         "deprecated" : true
       }, {
         "name" : "created",
         "type" : "com.linkedin.common.TimeStamp",
-        "doc" : "Audit stamp containing who created this and when\r",
+        "doc" : "Audit stamp containing who created this and when",
         "optional" : true
       }, {
         "name" : "lastModified",
         "type" : "com.linkedin.common.TimeStamp",
-        "doc" : "Date when the MLModel was last modified\r",
+        "doc" : "Date when the MLModel was last modified",
         "optional" : true
       }, {
         "name" : "version",
         "type" : "com.linkedin.common.VersionTag",
-        "doc" : "Version of the MLModel\r",
+        "doc" : "Version of the MLModel",
         "optional" : true
       }, {
         "name" : "type",
         "type" : "string",
-        "doc" : "Type of Algorithm or MLModel such as whether it is a Naive Bayes classifier, Convolutional Neural Network, etc\r",
+        "doc" : "Type of Algorithm or MLModel such as whether it is a Naive Bayes classifier, Convolutional Neural Network, etc",
         "optional" : true,
         "Searchable" : {
           "fieldType" : "TEXT_PARTIAL"
@@ -3928,7 +3928,7 @@
             "ref" : [ "string", "int", "float", "double", "boolean" ]
           }
         },
-        "doc" : "Hyper Parameters of the MLModel\r\n\r\nNOTE: these are deprecated in favor of hyperParams\r",
+        "doc" : "Hyper Parameters of the MLModel\n\nNOTE: these are deprecated in favor of hyperParams",
         "optional" : true
       }, {
         "name" : "hyperParams",
@@ -3963,7 +3963,7 @@
             }
           }
         },
-        "doc" : "Hyperparameters of the MLModel\r",
+        "doc" : "Hyperparameters of the MLModel",
         "optional" : true
       }, {
         "name" : "trainingMetrics",
@@ -3998,7 +3998,7 @@
             }
           }
         },
-        "doc" : "Metrics of the MLModel used in training\r",
+        "doc" : "Metrics of the MLModel used in training",
         "optional" : true
       }, {
         "name" : "onlineMetrics",
@@ -4006,7 +4006,7 @@
           "type" : "array",
           "items" : "MLMetric"
         },
-        "doc" : "Metrics of the MLModel used in production\r",
+        "doc" : "Metrics of the MLModel used in production",
         "optional" : true
       }, {
         "name" : "mlFeatures",
@@ -4014,7 +4014,7 @@
           "type" : "array",
           "items" : "com.linkedin.common.MLFeatureUrn"
         },
-        "doc" : "List of features used for MLModel training\r",
+        "doc" : "List of features used for MLModel training",
         "optional" : true,
         "Relationship" : {
           "/*" : {
@@ -4029,7 +4029,7 @@
           "type" : "array",
           "items" : "string"
         },
-        "doc" : "Tags for the MLModel\r",
+        "doc" : "Tags for the MLModel",
         "default" : [ ]
       }, {
         "name" : "deployments",
@@ -4037,7 +4037,7 @@
           "type" : "array",
           "items" : "com.linkedin.common.Urn"
         },
-        "doc" : "Deployments for the MLModel\r",
+        "doc" : "Deployments for the MLModel",
         "optional" : true,
         "Relationship" : {
           "/*" : {
@@ -4051,7 +4051,7 @@
           "type" : "array",
           "items" : "com.linkedin.common.Urn"
         },
-        "doc" : "Groups the model belongs to\r",
+        "doc" : "Groups the model belongs to",
         "optional" : true,
         "Relationship" : {
           "/*" : {
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
index f58d83dd1e5cb7..bde79e4d475cc2 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
@@ -3988,18 +3988,18 @@
                   "type" : "record",
                   "name" : "MLModelProperties",
                   "namespace" : "com.linkedin.ml.metadata",
-                  "doc" : "Properties associated with a ML Model\r",
+                  "doc" : "Properties associated with a ML Model",
                   "include" : [ "com.linkedin.common.CustomProperties", "com.linkedin.common.ExternalReference", {
                     "type" : "record",
                     "name" : "MLModelLineageInfo",
-                    "doc" : "A set of re-usable fields used to capture lineage information for ML Models and ML Model Groups\r",
+                    "doc" : "A set of re-usable fields used to capture lineage information for ML Models and ML Model Groups",
                     "fields" : [ {
                       "name" : "trainingJobs",
                       "type" : {
                         "type" : "array",
                         "items" : "com.linkedin.common.Urn"
                       },
-                      "doc" : "List of jobs or process instances (if any) used to train the model or group. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.\r",
+                      "doc" : "List of jobs or process instances (if any) used to train the model or group. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.",
                       "optional" : true,
                       "Relationship" : {
                         "/*" : {
@@ -4014,7 +4014,7 @@
                         "type" : "array",
                         "items" : "com.linkedin.common.Urn"
                       },
-                      "doc" : "List of jobs or process instances (if any) that use the model or group.\r",
+                      "doc" : "List of jobs or process instances (if any) that use the model or group.",
                       "optional" : true,
                       "Relationship" : {
                         "/*" : {
@@ -4029,7 +4029,7 @@
                   "fields" : [ {
                     "name" : "name",
                     "type" : "string",
-                    "doc" : "Display name of the MLModel\r",
+                    "doc" : "Display name of the MLModel",
                     "optional" : true,
                     "Searchable" : {
                       "boostScore" : 10.0,
@@ -4040,7 +4040,7 @@
                   }, {
                     "name" : "description",
                     "type" : "string",
-                    "doc" : "Documentation of the MLModel\r",
+                    "doc" : "Documentation of the MLModel",
                     "optional" : true,
                     "Searchable" : {
                       "fieldType" : "TEXT",
@@ -4049,28 +4049,28 @@
                   }, {
                     "name" : "date",
                     "type" : "com.linkedin.common.Time",
-                    "doc" : "Date when the MLModel was developed\r",
+                    "doc" : "Date when the MLModel was developed",
                     "optional" : true,
                     "deprecated" : true
                   }, {
                     "name" : "created",
                     "type" : "com.linkedin.common.TimeStamp",
-                    "doc" : "Audit stamp containing who created this and when\r",
+                    "doc" : "Audit stamp containing who created this and when",
                     "optional" : true
                   }, {
                     "name" : "lastModified",
                     "type" : "com.linkedin.common.TimeStamp",
-                    "doc" : "Date when the MLModel was last modified\r",
+                    "doc" : "Date when the MLModel was last modified",
                     "optional" : true
                   }, {
                     "name" : "version",
                     "type" : "com.linkedin.common.VersionTag",
-                    "doc" : "Version of the MLModel\r",
+                    "doc" : "Version of the MLModel",
                     "optional" : true
                   }, {
                     "name" : "type",
                     "type" : "string",
-                    "doc" : "Type of Algorithm or MLModel such as whether it is a Naive Bayes classifier, Convolutional Neural Network, etc\r",
+                    "doc" : "Type of Algorithm or MLModel such as whether it is a Naive Bayes classifier, Convolutional Neural Network, etc",
                     "optional" : true,
                     "Searchable" : {
                       "fieldType" : "TEXT_PARTIAL"
@@ -4086,7 +4086,7 @@
                         "ref" : [ "string", "int", "float", "double", "boolean" ]
                       }
                     },
-                    "doc" : "Hyper Parameters of the MLModel\r\n\r\nNOTE: these are deprecated in favor of hyperParams\r",
+                    "doc" : "Hyper Parameters of the MLModel\n\nNOTE: these are deprecated in favor of hyperParams",
                     "optional" : true
                   }, {
                     "name" : "hyperParams",
@@ -4121,7 +4121,7 @@
                         }
                       }
                     },
-                    "doc" : "Hyperparameters of the MLModel\r",
+                    "doc" : "Hyperparameters of the MLModel",
                     "optional" : true
                   }, {
                     "name" : "trainingMetrics",
@@ -4156,7 +4156,7 @@
                         }
                       }
                     },
-                    "doc" : "Metrics of the MLModel used in training\r",
+                    "doc" : "Metrics of the MLModel used in training",
                     "optional" : true
                   }, {
                     "name" : "onlineMetrics",
@@ -4164,7 +4164,7 @@
                       "type" : "array",
                       "items" : "MLMetric"
                     },
-                    "doc" : "Metrics of the MLModel used in production\r",
+                    "doc" : "Metrics of the MLModel used in production",
                     "optional" : true
                   }, {
                     "name" : "mlFeatures",
@@ -4172,7 +4172,7 @@
                       "type" : "array",
                       "items" : "com.linkedin.common.MLFeatureUrn"
                     },
-                    "doc" : "List of features used for MLModel training\r",
+                    "doc" : "List of features used for MLModel training",
                     "optional" : true,
                     "Relationship" : {
                       "/*" : {
@@ -4187,7 +4187,7 @@
                       "type" : "array",
                       "items" : "string"
                     },
-                    "doc" : "Tags for the MLModel\r",
+                    "doc" : "Tags for the MLModel",
                     "default" : [ ]
                   }, {
                     "name" : "deployments",
@@ -4195,7 +4195,7 @@
                       "type" : "array",
                       "items" : "com.linkedin.common.Urn"
                     },
-                    "doc" : "Deployments for the MLModel\r",
+                    "doc" : "Deployments for the MLModel",
                     "optional" : true,
                     "Relationship" : {
                       "/*" : {
@@ -4209,7 +4209,7 @@
                       "type" : "array",
                       "items" : "com.linkedin.common.Urn"
                     },
-                    "doc" : "Groups the model belongs to\r",
+                    "doc" : "Groups the model belongs to",
                     "optional" : true,
                     "Relationship" : {
                       "/*" : {
@@ -5012,12 +5012,12 @@
                   "type" : "record",
                   "name" : "MLModelGroupProperties",
                   "namespace" : "com.linkedin.ml.metadata",
-                  "doc" : "Properties associated with an ML Model Group\r",
+                  "doc" : "Properties associated with an ML Model Group",
                   "include" : [ "com.linkedin.common.CustomProperties", "MLModelLineageInfo" ],
                   "fields" : [ {
                     "name" : "name",
                     "type" : "string",
-                    "doc" : "Display name of the MLModelGroup\r",
+                    "doc" : "Display name of the MLModelGroup",
                     "optional" : true,
                     "Searchable" : {
                       "boostScore" : 10.0,
@@ -5028,7 +5028,7 @@
                   }, {
                     "name" : "description",
                     "type" : "string",
-                    "doc" : "Documentation of the MLModelGroup\r",
+                    "doc" : "Documentation of the MLModelGroup",
                     "optional" : true,
                     "Searchable" : {
                       "fieldType" : "TEXT",
@@ -5037,23 +5037,23 @@
                   }, {
                     "name" : "createdAt",
                     "type" : "com.linkedin.common.Time",
-                    "doc" : "Date when the MLModelGroup was developed\r",
+                    "doc" : "Date when the MLModelGroup was developed",
                     "optional" : true,
                     "deprecated" : true
                   }, {
                     "name" : "created",
                     "type" : "com.linkedin.common.TimeStamp",
-                    "doc" : "Time and Actor who created the MLModelGroup\r",
+                    "doc" : "Time and Actor who created the MLModelGroup",
                     "optional" : true
                   }, {
                     "name" : "lastModified",
                     "type" : "com.linkedin.common.TimeStamp",
-                    "doc" : "Date when the MLModelGroup was last modified\r",
+                    "doc" : "Date when the MLModelGroup was last modified",
                     "optional" : true
                   }, {
                     "name" : "version",
                     "type" : "com.linkedin.common.VersionTag",
-                    "doc" : "Version of the MLModelGroup\r",
+                    "doc" : "Version of the MLModelGroup",
                     "optional" : true
                   } ],
                   "Aspect" : {
@@ -6291,6 +6291,10 @@
       "name" : "aspect",
       "type" : "com.linkedin.entity.Aspect",
       "optional" : true
+    }, {
+      "name" : "telemetryTraceId",
+      "type" : "string",
+      "optional" : true
     } ]
   }, {
     "type" : "record",
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json
index 61c31f93987b88..a252d5c73591d4 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json
@@ -3554,18 +3554,18 @@
       "type" : "record",
       "name" : "MLModelProperties",
       "namespace" : "com.linkedin.ml.metadata",
-      "doc" : "Properties associated with a ML Model\r",
+      "doc" : "Properties associated with a ML Model",
       "include" : [ "com.linkedin.common.CustomProperties", "com.linkedin.common.ExternalReference", {
         "type" : "record",
         "name" : "MLModelLineageInfo",
-        "doc" : "A set of re-usable fields used to capture lineage information for ML Models and ML Model Groups\r",
+        "doc" : "A set of re-usable fields used to capture lineage information for ML Models and ML Model Groups",
         "fields" : [ {
           "name" : "trainingJobs",
           "type" : {
             "type" : "array",
             "items" : "com.linkedin.common.Urn"
           },
-          "doc" : "List of jobs or process instances (if any) used to train the model or group. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.\r",
+          "doc" : "List of jobs or process instances (if any) used to train the model or group. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.",
           "optional" : true,
           "Relationship" : {
             "/*" : {
@@ -3580,7 +3580,7 @@
             "type" : "array",
             "items" : "com.linkedin.common.Urn"
           },
-          "doc" : "List of jobs or process instances (if any) that use the model or group.\r",
+          "doc" : "List of jobs or process instances (if any) that use the model or group.",
           "optional" : true,
           "Relationship" : {
             "/*" : {
@@ -3595,7 +3595,7 @@
       "fields" : [ {
         "name" : "name",
         "type" : "string",
-        "doc" : "Display name of the MLModel\r",
+        "doc" : "Display name of the MLModel",
         "optional" : true,
         "Searchable" : {
           "boostScore" : 10.0,
@@ -3606,7 +3606,7 @@
       }, {
         "name" : "description",
         "type" : "string",
-        "doc" : "Documentation of the MLModel\r",
+        "doc" : "Documentation of the MLModel",
         "optional" : true,
         "Searchable" : {
           "fieldType" : "TEXT",
@@ -3615,28 +3615,28 @@
       }, {
         "name" : "date",
         "type" : "com.linkedin.common.Time",
-        "doc" : "Date when the MLModel was developed\r",
+        "doc" : "Date when the MLModel was developed",
         "optional" : true,
         "deprecated" : true
       }, {
         "name" : "created",
         "type" : "com.linkedin.common.TimeStamp",
-        "doc" : "Audit stamp containing who created this and when\r",
+        "doc" : "Audit stamp containing who created this and when",
         "optional" : true
       }, {
         "name" : "lastModified",
         "type" : "com.linkedin.common.TimeStamp",
-        "doc" : "Date when the MLModel was last modified\r",
+        "doc" : "Date when the MLModel was last modified",
         "optional" : true
       }, {
         "name" : "version",
         "type" : "com.linkedin.common.VersionTag",
-        "doc" : "Version of the MLModel\r",
+        "doc" : "Version of the MLModel",
         "optional" : true
       }, {
         "name" : "type",
         "type" : "string",
-        "doc" : "Type of Algorithm or MLModel such as whether it is a Naive Bayes classifier, Convolutional Neural Network, etc\r",
+        "doc" : "Type of Algorithm or MLModel such as whether it is a Naive Bayes classifier, Convolutional Neural Network, etc",
         "optional" : true,
         "Searchable" : {
           "fieldType" : "TEXT_PARTIAL"
@@ -3652,7 +3652,7 @@
             "ref" : [ "string", "int", "float", "double", "boolean" ]
           }
         },
-        "doc" : "Hyper Parameters of the MLModel\r\n\r\nNOTE: these are deprecated in favor of hyperParams\r",
+        "doc" : "Hyper Parameters of the MLModel\n\nNOTE: these are deprecated in favor of hyperParams",
         "optional" : true
       }, {
         "name" : "hyperParams",
@@ -3687,7 +3687,7 @@
             }
           }
         },
-        "doc" : "Hyperparameters of the MLModel\r",
+        "doc" : "Hyperparameters of the MLModel",
         "optional" : true
       }, {
         "name" : "trainingMetrics",
@@ -3722,7 +3722,7 @@
             }
           }
         },
-        "doc" : "Metrics of the MLModel used in training\r",
+        "doc" : "Metrics of the MLModel used in training",
         "optional" : true
       }, {
         "name" : "onlineMetrics",
@@ -3730,7 +3730,7 @@
           "type" : "array",
           "items" : "MLMetric"
         },
-        "doc" : "Metrics of the MLModel used in production\r",
+        "doc" : "Metrics of the MLModel used in production",
         "optional" : true
       }, {
         "name" : "mlFeatures",
@@ -3738,7 +3738,7 @@
           "type" : "array",
           "items" : "com.linkedin.common.MLFeatureUrn"
         },
-        "doc" : "List of features used for MLModel training\r",
+        "doc" : "List of features used for MLModel training",
         "optional" : true,
         "Relationship" : {
           "/*" : {
@@ -3753,7 +3753,7 @@
           "type" : "array",
           "items" : "string"
         },
-        "doc" : "Tags for the MLModel\r",
+        "doc" : "Tags for the MLModel",
         "default" : [ ]
       }, {
         "name" : "deployments",
@@ -3761,7 +3761,7 @@
           "type" : "array",
           "items" : "com.linkedin.common.Urn"
         },
-        "doc" : "Deployments for the MLModel\r",
+        "doc" : "Deployments for the MLModel",
         "optional" : true,
         "Relationship" : {
           "/*" : {
@@ -3775,7 +3775,7 @@
           "type" : "array",
           "items" : "com.linkedin.common.Urn"
         },
-        "doc" : "Groups the model belongs to\r",
+        "doc" : "Groups the model belongs to",
         "optional" : true,
         "Relationship" : {
           "/*" : {
@@ -3952,6 +3952,10 @@
       "name" : "aspect",
       "type" : "com.linkedin.entity.Aspect",
       "optional" : true
+    }, {
+      "name" : "telemetryTraceId",
+      "type" : "string",
+      "optional" : true
     } ]
   }, {
     "type" : "record",
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json
index 75793be7331da4..29d72cd00e9c99 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json
@@ -3548,18 +3548,18 @@
       "type" : "record",
       "name" : "MLModelProperties",
       "namespace" : "com.linkedin.ml.metadata",
-      "doc" : "Properties associated with a ML Model\r",
+      "doc" : "Properties associated with a ML Model",
       "include" : [ "com.linkedin.common.CustomProperties", "com.linkedin.common.ExternalReference", {
         "type" : "record",
         "name" : "MLModelLineageInfo",
-        "doc" : "A set of re-usable fields used to capture lineage information for ML Models and ML Model Groups\r",
+        "doc" : "A set of re-usable fields used to capture lineage information for ML Models and ML Model Groups",
         "fields" : [ {
           "name" : "trainingJobs",
           "type" : {
             "type" : "array",
             "items" : "com.linkedin.common.Urn"
           },
-          "doc" : "List of jobs or process instances (if any) used to train the model or group. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.\r",
+          "doc" : "List of jobs or process instances (if any) used to train the model or group. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.",
           "optional" : true,
           "Relationship" : {
             "/*" : {
@@ -3574,7 +3574,7 @@
             "type" : "array",
             "items" : "com.linkedin.common.Urn"
           },
-          "doc" : "List of jobs or process instances (if any) that use the model or group.\r",
+          "doc" : "List of jobs or process instances (if any) that use the model or group.",
           "optional" : true,
           "Relationship" : {
             "/*" : {
@@ -3589,7 +3589,7 @@
       "fields" : [ {
         "name" : "name",
         "type" : "string",
-        "doc" : "Display name of the MLModel\r",
+        "doc" : "Display name of the MLModel",
         "optional" : true,
         "Searchable" : {
           "boostScore" : 10.0,
@@ -3600,7 +3600,7 @@
       }, {
         "name" : "description",
         "type" : "string",
-        "doc" : "Documentation of the MLModel\r",
+        "doc" : "Documentation of the MLModel",
         "optional" : true,
         "Searchable" : {
           "fieldType" : "TEXT",
@@ -3609,28 +3609,28 @@
       }, {
         "name" : "date",
         "type" : "com.linkedin.common.Time",
-        "doc" : "Date when the MLModel was developed\r",
+        "doc" : "Date when the MLModel was developed",
         "optional" : true,
         "deprecated" : true
       }, {
         "name" : "created",
         "type" : "com.linkedin.common.TimeStamp",
-        "doc" : "Audit stamp containing who created this and when\r",
+        "doc" : "Audit stamp containing who created this and when",
         "optional" : true
       }, {
         "name" : "lastModified",
         "type" : "com.linkedin.common.TimeStamp",
-        "doc" : "Date when the MLModel was last modified\r",
+        "doc" : "Date when the MLModel was last modified",
         "optional" : true
       }, {
         "name" : "version",
         "type" : "com.linkedin.common.VersionTag",
-        "doc" : "Version of the MLModel\r",
+        "doc" : "Version of the MLModel",
         "optional" : true
       }, {
         "name" : "type",
         "type" : "string",
-        "doc" : "Type of Algorithm or MLModel such as whether it is a Naive Bayes classifier, Convolutional Neural Network, etc\r",
+        "doc" : "Type of Algorithm or MLModel such as whether it is a Naive Bayes classifier, Convolutional Neural Network, etc",
         "optional" : true,
         "Searchable" : {
           "fieldType" : "TEXT_PARTIAL"
@@ -3646,7 +3646,7 @@
             "ref" : [ "string", "int", "float", "double", "boolean" ]
           }
         },
-        "doc" : "Hyper Parameters of the MLModel\r\n\r\nNOTE: these are deprecated in favor of hyperParams\r",
+        "doc" : "Hyper Parameters of the MLModel\n\nNOTE: these are deprecated in favor of hyperParams",
         "optional" : true
       }, {
         "name" : "hyperParams",
@@ -3681,7 +3681,7 @@
             }
           }
         },
-        "doc" : "Hyperparameters of the MLModel\r",
+        "doc" : "Hyperparameters of the MLModel",
         "optional" : true
       }, {
         "name" : "trainingMetrics",
@@ -3716,7 +3716,7 @@
             }
           }
         },
-        "doc" : "Metrics of the MLModel used in training\r",
+        "doc" : "Metrics of the MLModel used in training",
         "optional" : true
       }, {
         "name" : "onlineMetrics",
@@ -3724,7 +3724,7 @@
           "type" : "array",
           "items" : "MLMetric"
         },
-        "doc" : "Metrics of the MLModel used in production\r",
+        "doc" : "Metrics of the MLModel used in production",
         "optional" : true
       }, {
         "name" : "mlFeatures",
@@ -3732,7 +3732,7 @@
           "type" : "array",
           "items" : "com.linkedin.common.MLFeatureUrn"
         },
-        "doc" : "List of features used for MLModel training\r",
+        "doc" : "List of features used for MLModel training",
         "optional" : true,
         "Relationship" : {
           "/*" : {
@@ -3747,7 +3747,7 @@
           "type" : "array",
           "items" : "string"
         },
-        "doc" : "Tags for the MLModel\r",
+        "doc" : "Tags for the MLModel",
         "default" : [ ]
       }, {
         "name" : "deployments",
@@ -3755,7 +3755,7 @@
           "type" : "array",
           "items" : "com.linkedin.common.Urn"
         },
-        "doc" : "Deployments for the MLModel\r",
+        "doc" : "Deployments for the MLModel",
         "optional" : true,
         "Relationship" : {
           "/*" : {
@@ -3769,7 +3769,7 @@
           "type" : "array",
           "items" : "com.linkedin.common.Urn"
         },
-        "doc" : "Groups the model belongs to\r",
+        "doc" : "Groups the model belongs to",
         "optional" : true,
         "Relationship" : {
           "/*" : {
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json
index 58ba2ad05dfe74..b4ede3617cacfb 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json
@@ -3982,18 +3982,18 @@
                   "type" : "record",
                   "name" : "MLModelProperties",
                   "namespace" : "com.linkedin.ml.metadata",
-                  "doc" : "Properties associated with a ML Model\r",
+                  "doc" : "Properties associated with a ML Model",
                   "include" : [ "com.linkedin.common.CustomProperties", "com.linkedin.common.ExternalReference", {
                     "type" : "record",
                     "name" : "MLModelLineageInfo",
-                    "doc" : "A set of re-usable fields used to capture lineage information for ML Models and ML Model Groups\r",
+                    "doc" : "A set of re-usable fields used to capture lineage information for ML Models and ML Model Groups",
                     "fields" : [ {
                       "name" : "trainingJobs",
                       "type" : {
                         "type" : "array",
                         "items" : "com.linkedin.common.Urn"
                       },
-                      "doc" : "List of jobs or process instances (if any) used to train the model or group. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.\r",
+                      "doc" : "List of jobs or process instances (if any) used to train the model or group. Visible in Lineage. Note that ML Models can also be specified as the output of a specific Data Process Instances (runs) via the DataProcessInstanceOutputs aspect.",
                       "optional" : true,
                       "Relationship" : {
                         "/*" : {
@@ -4008,7 +4008,7 @@
                         "type" : "array",
                         "items" : "com.linkedin.common.Urn"
                       },
-                      "doc" : "List of jobs or process instances (if any) that use the model or group.\r",
+                      "doc" : "List of jobs or process instances (if any) that use the model or group.",
                       "optional" : true,
                       "Relationship" : {
                         "/*" : {
@@ -4023,7 +4023,7 @@
                   "fields" : [ {
                     "name" : "name",
                     "type" : "string",
-                    "doc" : "Display name of the MLModel\r",
+                    "doc" : "Display name of the MLModel",
                     "optional" : true,
                     "Searchable" : {
                       "boostScore" : 10.0,
@@ -4034,7 +4034,7 @@
                   }, {
                     "name" : "description",
                     "type" : "string",
-                    "doc" : "Documentation of the MLModel\r",
+                    "doc" : "Documentation of the MLModel",
                     "optional" : true,
                     "Searchable" : {
                       "fieldType" : "TEXT",
@@ -4043,28 +4043,28 @@
                   }, {
                     "name" : "date",
                     "type" : "com.linkedin.common.Time",
-                    "doc" : "Date when the MLModel was developed\r",
+                    "doc" : "Date when the MLModel was developed",
                     "optional" : true,
                     "deprecated" : true
                   }, {
                     "name" : "created",
                     "type" : "com.linkedin.common.TimeStamp",
-                    "doc" : "Audit stamp containing who created this and when\r",
+                    "doc" : "Audit stamp containing who created this and when",
                     "optional" : true
                   }, {
                     "name" : "lastModified",
                     "type" : "com.linkedin.common.TimeStamp",
-                    "doc" : "Date when the MLModel was last modified\r",
+                    "doc" : "Date when the MLModel was last modified",
                     "optional" : true
                   }, {
                     "name" : "version",
                     "type" : "com.linkedin.common.VersionTag",
-                    "doc" : "Version of the MLModel\r",
+                    "doc" : "Version of the MLModel",
                     "optional" : true
                   }, {
                     "name" : "type",
                     "type" : "string",
-                    "doc" : "Type of Algorithm or MLModel such as whether it is a Naive Bayes classifier, Convolutional Neural Network, etc\r",
+                    "doc" : "Type of Algorithm or MLModel such as whether it is a Naive Bayes classifier, Convolutional Neural Network, etc",
                     "optional" : true,
                     "Searchable" : {
                       "fieldType" : "TEXT_PARTIAL"
@@ -4080,7 +4080,7 @@
                         "ref" : [ "string", "int", "float", "double", "boolean" ]
                       }
                     },
-                    "doc" : "Hyper Parameters of the MLModel\r\n\r\nNOTE: these are deprecated in favor of hyperParams\r",
+                    "doc" : "Hyper Parameters of the MLModel\n\nNOTE: these are deprecated in favor of hyperParams",
                     "optional" : true
                   }, {
                     "name" : "hyperParams",
@@ -4115,7 +4115,7 @@
                         }
                       }
                     },
-                    "doc" : "Hyperparameters of the MLModel\r",
+                    "doc" : "Hyperparameters of the MLModel",
                     "optional" : true
                   }, {
                     "name" : "trainingMetrics",
@@ -4150,7 +4150,7 @@
                         }
                       }
                     },
-                    "doc" : "Metrics of the MLModel used in training\r",
+                    "doc" : "Metrics of the MLModel used in training",
                     "optional" : true
                   }, {
                     "name" : "onlineMetrics",
@@ -4158,7 +4158,7 @@
                       "type" : "array",
                       "items" : "MLMetric"
                     },
-                    "doc" : "Metrics of the MLModel used in production\r",
+                    "doc" : "Metrics of the MLModel used in production",
                     "optional" : true
                   }, {
                     "name" : "mlFeatures",
@@ -4166,7 +4166,7 @@
                       "type" : "array",
                       "items" : "com.linkedin.common.MLFeatureUrn"
                     },
-                    "doc" : "List of features used for MLModel training\r",
+                    "doc" : "List of features used for MLModel training",
                     "optional" : true,
                     "Relationship" : {
                       "/*" : {
@@ -4181,7 +4181,7 @@
                       "type" : "array",
                       "items" : "string"
                     },
-                    "doc" : "Tags for the MLModel\r",
+                    "doc" : "Tags for the MLModel",
                     "default" : [ ]
                   }, {
                     "name" : "deployments",
@@ -4189,7 +4189,7 @@
                       "type" : "array",
                       "items" : "com.linkedin.common.Urn"
                     },
-                    "doc" : "Deployments for the MLModel\r",
+                    "doc" : "Deployments for the MLModel",
                     "optional" : true,
                     "Relationship" : {
                       "/*" : {
@@ -4203,7 +4203,7 @@
                       "type" : "array",
                       "items" : "com.linkedin.common.Urn"
                     },
-                    "doc" : "Groups the model belongs to\r",
+                    "doc" : "Groups the model belongs to",
                     "optional" : true,
                     "Relationship" : {
                       "/*" : {
@@ -5006,12 +5006,12 @@
                   "type" : "record",
                   "name" : "MLModelGroupProperties",
                   "namespace" : "com.linkedin.ml.metadata",
-                  "doc" : "Properties associated with an ML Model Group\r",
+                  "doc" : "Properties associated with an ML Model Group",
                   "include" : [ "com.linkedin.common.CustomProperties", "MLModelLineageInfo" ],
                   "fields" : [ {
                     "name" : "name",
                     "type" : "string",
-                    "doc" : "Display name of the MLModelGroup\r",
+                    "doc" : "Display name of the MLModelGroup",
                     "optional" : true,
                     "Searchable" : {
                       "boostScore" : 10.0,
@@ -5022,7 +5022,7 @@
                   }, {
                     "name" : "description",
                     "type" : "string",
-                    "doc" : "Documentation of the MLModelGroup\r",
+                    "doc" : "Documentation of the MLModelGroup",
                     "optional" : true,
                     "Searchable" : {
                       "fieldType" : "TEXT",
@@ -5031,23 +5031,23 @@
                   }, {
                     "name" : "createdAt",
                     "type" : "com.linkedin.common.Time",
-                    "doc" : "Date when the MLModelGroup was developed\r",
+                    "doc" : "Date when the MLModelGroup was developed",
                     "optional" : true,
                     "deprecated" : true
                   }, {
                     "name" : "created",
                     "type" : "com.linkedin.common.TimeStamp",
-                    "doc" : "Time and Actor who created the MLModelGroup\r",
+                    "doc" : "Time and Actor who created the MLModelGroup",
                     "optional" : true
                   }, {
                     "name" : "lastModified",
                     "type" : "com.linkedin.common.TimeStamp",
-                    "doc" : "Date when the MLModelGroup was last modified\r",
+                    "doc" : "Date when the MLModelGroup was last modified",
                     "optional" : true
                   }, {
                     "name" : "version",
                     "type" : "com.linkedin.common.VersionTag",
-                    "doc" : "Version of the MLModelGroup\r",
+                    "doc" : "Version of the MLModelGroup",
                     "optional" : true
                   } ],
                   "Aspect" : {
diff --git a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/AspectResource.java b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/AspectResource.java
index 30b187da00e91a..ecb37a8c80bb29 100644
--- a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/AspectResource.java
+++ b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/AspectResource.java
@@ -51,7 +51,7 @@
 import com.linkedin.util.Pair;
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.metadata.context.RequestContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.time.Clock;
@@ -145,7 +145,7 @@ public Task<AnyRecord> get(
       throws URISyntaxException {
     log.info("GET ASPECT urn: {} aspect: {} version: {}", urnStr, aspectName, version);
     final Urn urn = Urn.createFromString(urnStr);
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
 
             Authentication auth = AuthenticationContext.getAuthentication();
@@ -195,7 +195,7 @@ public Task<GetTimeseriesAspectValuesResponse> getTimeseriesAspectValues(
         endTimeMillis,
         limit);
     final Urn urn = Urn.createFromString(urnStr);
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
 
             Authentication auth = AuthenticationContext.getAuthentication();
@@ -305,7 +305,7 @@ private Task<String> ingestProposals(
     final AuditStamp auditStamp =
         new AuditStamp().setTime(_clock.millis()).setActor(Urn.createFromString(actorUrnStr));
 
-    return RestliUtils.toTask(() -> {
+    return RestliUtils.toTask(systemOperationContext, () -> {
       log.debug("Proposals: {}", metadataChangeProposals);
       try {
         final AspectsBatch batch = AspectsBatchImpl.builder()
@@ -342,7 +342,7 @@ private Task<String> ingestProposals(
   public Task<Integer> getCount(
       @ActionParam(PARAM_ASPECT) @Nonnull String aspectName,
       @ActionParam(PARAM_URN_LIKE) @Optional @Nullable String urnLike) {
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
 
             Authentication authentication = AuthenticationContext.getAuthentication();
@@ -374,7 +374,7 @@ public Task<String> restoreIndices(
       @ActionParam("limit") @Optional @Nullable Integer limit,
       @ActionParam("gePitEpochMs") @Optional @Nullable Long gePitEpochMs,
       @ActionParam("lePitEpochMs") @Optional @Nullable Long lePitEpochMs) {
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
 
             Authentication authentication = AuthenticationContext.getAuthentication();
diff --git a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/BatchIngestionRunResource.java b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/BatchIngestionRunResource.java
index ebbfc6bb6c2983..3539a19ffd4702 100644
--- a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/BatchIngestionRunResource.java
+++ b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/BatchIngestionRunResource.java
@@ -36,7 +36,7 @@
 import com.linkedin.restli.server.resources.CollectionResourceTaskTemplate;
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.metadata.context.RequestContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -108,7 +108,7 @@ public Task<RollbackResponse> rollback(
           "Both Safe & hardDelete flags were defined, honouring safe flag as hardDelete is deprecated");
     }
     try {
-      return RestliUtils.toTask(
+      return RestliUtils.toTask(systemOperationContext,
           () -> {
 
               try {
@@ -136,7 +136,7 @@ public Task<IngestionRunSummaryArray> list(
       @ActionParam("includeSoft") @Optional @Nullable Boolean includeSoft) {
     log.info("LIST RUNS offset: {} size: {}", pageOffset, pageSize);
 
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
           List<IngestionRunSummary> summaries =
               systemMetadataService.listRuns(
@@ -160,7 +160,7 @@ public Task<AspectRowSummaryArray> describe(
       @ActionParam("includeAspect") @Optional @Nullable Boolean includeAspect) {
     log.info("DESCRIBE RUN runId: {}, start: {}, count: {}", runId, start, count);
 
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
 
             Authentication auth = AuthenticationContext.getAuthentication();
diff --git a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityResource.java b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityResource.java
index 0c374c29cf958a..d05bf4a4598473 100644
--- a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityResource.java
+++ b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityResource.java
@@ -84,7 +84,7 @@
 import com.linkedin.restli.server.annotations.RestMethod;
 import com.linkedin.restli.server.resources.CollectionResourceTaskTemplate;
 import com.linkedin.timeseries.DeleteAspectValuesResult;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.net.URISyntaxException;
 import java.time.Clock;
 import java.util.ArrayList;
@@ -207,7 +207,7 @@ public Task<AnyRecord> get(
               HttpStatus.S_403_FORBIDDEN, "User is unauthorized to get entity " + urn);
     }
 
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
           final Set<String> projectedAspects =
               aspectNames == null
@@ -248,7 +248,7 @@ public Task<Map<String, AnyRecord>> batchGet(
           HttpStatus.S_403_FORBIDDEN, "User is unauthorized to get entities: " + urnStrs);
     }
 
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
           final Set<String> projectedAspects =
               aspectNames == null
@@ -298,7 +298,7 @@ public Task<Void> ingest(
 
     // variables referenced in lambdas are required to be final
     final SystemMetadata finalSystemMetadata = systemMetadata;
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
           entityService.ingestEntity(opContext, entity, auditStamp, finalSystemMetadata);
           return null;
@@ -355,7 +355,7 @@ public Task<Void> batchIngest(
             .map(SystemMetadataUtils::generateSystemMetadataIfEmpty)
             .collect(Collectors.toList());
 
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
           entityService.ingestEntities(opContext,
               Arrays.asList(entities), auditStamp, finalSystemMetadataList);
@@ -396,7 +396,7 @@ public Task<SearchResult> search(
 
     log.info("GET SEARCH RESULTS for {} with query {}", entityName, input);
     // TODO - change it to use _searchService once we are confident on it's latency
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
           final SearchResult result;
           // This API is not used by the frontend for search bars so we default to structured
@@ -509,7 +509,7 @@ public Task<ScrollResult> scrollAcrossEntities(
         input,
         scrollId);
 
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
           ScrollResult result = searchService.scrollAcrossEntities(
                   opContext,
@@ -576,7 +576,7 @@ public Task<LineageSearchResult> searchAcrossLineage(
         direction,
         entityList,
         input);
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> validateLineageSearchResult(opContext, lineageSearchService.searchAcrossLineage(
                   opContext,
                   urn,
@@ -639,7 +639,7 @@ public Task<LineageScrollResult> scrollAcrossLineage(
 
     List<SortCriterion> sortCriterionList = getSortCriteria(sortCriteria, sortCriterion);
 
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () ->
             validateLineageScrollResult(opContext,
                 lineageSearchService.scrollAcrossLineage(
@@ -686,7 +686,7 @@ public Task<ListResult> list(
 
     final Filter finalFilter = validateAndConvert(filter);
     log.info("GET LIST RESULTS for {} with filter {}", entityName, finalFilter);
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
             SearchResult result = entitySearchService.filter(opContext, entityName, finalFilter, sortCriterionList, start, count);
           if (!AuthUtil.isAPIAuthorizedResult(
@@ -725,7 +725,7 @@ public Task<AutoCompleteResult> autocomplete(
               HttpStatus.S_403_FORBIDDEN, "User is unauthorized to search.");
     }
 
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
           AutoCompleteResult result = entitySearchService.autoComplete(opContext, entityName, query, field, filter, limit);
           if (!isAPIAuthorizedResult(
@@ -763,7 +763,7 @@ public Task<BrowseResult> browse(
     }
 
     log.info("GET BROWSE RESULTS for {} at path {}", entityName, path);
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
           BrowseResult result = entitySearchService.browse(opContext, entityName, path, filter, start, limit);
           if (!isAPIAuthorizedResult(
@@ -799,7 +799,7 @@ public Task<StringArray> getBrowsePaths(
     }
     log.info("GET BROWSE PATHS for {}", urn);
 
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> new StringArray(entitySearchService.getBrowsePaths(opContext, urnToEntityName(urn), urn)),
         MetricRegistry.name(this.getClass(), "getBrowsePaths"));
   }
@@ -839,7 +839,7 @@ public Task<RollbackResponse> deleteEntities(
     ComparableVersion finalRegistryVersion = registryVersion;
     String finalRegistryName1 = registryName;
     ComparableVersion finalRegistryVersion1 = registryVersion;
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
           RollbackResponse response = new RollbackResponse();
           List<AspectRowSummary> aspectRowsToDelete =
@@ -921,7 +921,7 @@ public Task<DeleteEntityResponse> deleteEntity(
               HttpStatus.S_403_FORBIDDEN, "User is unauthorized to delete entity: " + urnStr);
     }
 
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
           // Find the timeseries aspects to delete. If aspectName is null, delete all.
           List<String> timeseriesAspectNames =
@@ -1041,7 +1041,7 @@ public Task<DeleteReferencesResponse> deleteReferencesTo(
           HttpStatus.S_403_FORBIDDEN, "User is unauthorized to delete entity " + urnStr);
     }
 
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> deleteEntityService.deleteReferencesTo(opContext, urn, dryRun),
         MetricRegistry.name(this.getClass(), "deleteReferences"));
   }
@@ -1137,7 +1137,7 @@ public Task<ListUrnsResult> listUrns(
     }
 
     log.info("LIST URNS for {} with start {} and count {}", entityName, start, count);
-    return RestliUtils.toTask(() -> {
+    return RestliUtils.toTask(systemOperationContext, () -> {
       ListUrnsResult result = entityService.listUrns(opContext, entityName, start, count);
       if (!isAPIAuthorizedEntityUrns(
               opContext,
@@ -1178,7 +1178,7 @@ public Task<String> applyRetention(
           HttpStatus.S_403_FORBIDDEN, "User is unauthorized to apply retention.");
     }
 
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> entityService.batchApplyRetention(opContext, start, count, attemptWithVersion, aspectName, urn),
         ACTION_APPLY_RETENTION);
   }
@@ -1208,7 +1208,7 @@ public Task<SearchResult> filter(
 
     List<SortCriterion> sortCriterionList = getSortCriteria(sortCriteria, sortCriterion);
     log.info("FILTER RESULTS for {} with filter {}", entityName, filter);
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
           SearchResult result = entitySearchService.filter(opContext.withSearchFlags(flags -> flags.setFulltext(true)),
                   entityName, filter, sortCriterionList, start, count);
@@ -1245,7 +1245,7 @@ public Task<Boolean> exists(@ActionParam(PARAM_URN) @Nonnull String urnStr, @Act
 
     log.info("EXISTS for {}", urnStr);
     final boolean includeRemoved = includeSoftDelete == null || includeSoftDelete;
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> entityService.exists(opContext, urn, includeRemoved), MetricRegistry.name(this.getClass(), "exists"));
   }
 }
diff --git a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityV2Resource.java b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityV2Resource.java
index 896d81d3cbecc3..6e05ce2ac82768 100644
--- a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityV2Resource.java
+++ b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityV2Resource.java
@@ -27,7 +27,7 @@
 import com.linkedin.restli.server.resources.CollectionResourceTaskTemplate;
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.metadata.context.RequestContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.net.URISyntaxException;
 import java.util.Arrays;
 import java.util.Collections;
@@ -83,7 +83,7 @@ public Task<EntityResponse> get(
           HttpStatus.S_403_FORBIDDEN, "User is unauthorized to get entity " + urn);
     }
 
-      return RestliUtils.toTask(
+      return RestliUtils.toTask(systemOperationContext,
         () -> {
           final String entityName = urnToEntityName(urn);
           final Set<String> projectedAspects =
@@ -133,7 +133,7 @@ public Task<Map<Urn, EntityResponse>> batchGet(
       return Task.value(Collections.emptyMap());
     }
     final String entityName = urnToEntityName(urns.iterator().next());
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
           final Set<String> projectedAspects =
               aspectNames == null
diff --git a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityVersionedV2Resource.java b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityVersionedV2Resource.java
index 73b2d1a6c5cb87..1ce250300745fd 100644
--- a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityVersionedV2Resource.java
+++ b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityVersionedV2Resource.java
@@ -29,7 +29,7 @@
 import com.linkedin.restli.server.resources.CollectionResourceTaskTemplate;
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.metadata.context.RequestContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -96,7 +96,7 @@ public Task<Map<Urn, EntityResponse>> batchGetVersioned(
     if (versionedUrnStrs.size() <= 0) {
       return Task.value(Collections.emptyMap());
     }
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
           final Set<String> projectedAspects =
               aspectNames == null
diff --git a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/lineage/Relationships.java b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/lineage/Relationships.java
index 16d5868443955a..fe3defe9658ca0 100644
--- a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/lineage/Relationships.java
+++ b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/lineage/Relationships.java
@@ -40,7 +40,7 @@
 import com.linkedin.restli.server.resources.SimpleResourceTemplate;
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.metadata.context.RequestContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.net.URISyntaxException;
 import java.util.Arrays;
 import java.util.List;
@@ -133,7 +133,7 @@ public Task<EntityRelationships> get(
     }
     RelationshipDirection direction = RelationshipDirection.valueOf(rawDirection);
     final List<String> relationshipTypes = Arrays.asList(relationshipTypesParam);
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
           final RelatedEntitiesResult relatedEntitiesResult =
               getRelatedEntities(rawUrn, relationshipTypes, direction, start, count);
@@ -210,7 +210,7 @@ public Task<EntityLineageResult> getLineage(
       throw new RestLiServiceException(
           HttpStatus.S_403_FORBIDDEN, "User is unauthorized to get entity lineage: " + urnStr);
     }
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () ->
             _graphService.getLineage(systemOperationContext,
                 urn,
diff --git a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/operations/OperationsResource.java b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/operations/OperationsResource.java
index 705089baed8f5e..efb20bdee44099 100644
--- a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/operations/OperationsResource.java
+++ b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/operations/OperationsResource.java
@@ -33,7 +33,7 @@
 import com.linkedin.timeseries.TimeseriesIndicesSizesResult;
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.metadata.context.RequestContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nonnull;
@@ -104,7 +104,7 @@ public Task<String> restoreIndices(
       @ActionParam("limit") @Optional @Nullable Integer limit,
       @ActionParam("gePitEpochMs") @Optional @Nullable Long gePitEpochMs,
       @ActionParam("lePitEpochMs") @Optional @Nullable Long lePitEpochMs) {
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
       () ->  Utils.restoreIndices(systemOperationContext, getContext(),
                   aspectName, urn, urnLike, start, batchSize, limit, gePitEpochMs, lePitEpochMs, _authorizer, _entityService),
         MetricRegistry.name(this.getClass(), "restoreIndices"));
@@ -129,7 +129,7 @@ public Task<String> getTaskStatus(
       @ActionParam(PARAM_NODE_ID) @Optional String nodeId,
       @ActionParam(PARAM_TASK_ID) @Optional("0") long taskId,
       @ActionParam(PARAM_TASK) @Optional String task) {
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
 
           final Authentication auth = AuthenticationContext.getAuthentication();
@@ -192,7 +192,7 @@ public Task<String> getTaskStatus(
   @Nonnull
   @WithSpan
   public Task<TimeseriesIndicesSizesResult> getIndexSizes() {
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
 
             final Authentication auth = AuthenticationContext.getAuthentication();
@@ -317,7 +317,7 @@ public Task<String> truncateTimeseriesAspect(
       @ActionParam(PARAM_TIMEOUT_SECONDS) @Optional @Nullable Long timeoutSeconds,
       @ActionParam(PARAM_FORCE_DELETE_BY_QUERY) @Optional @Nullable Boolean forceDeleteByQuery,
       @ActionParam(PARAM_FORCE_REINDEX) @Optional @Nullable Boolean forceReindex) {
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () ->
             executeTruncateTimeseriesAspect(
                 entityType,
diff --git a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/platform/PlatformResource.java b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/platform/PlatformResource.java
index 4fea3b0a1aca68..7054da41173e59 100644
--- a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/platform/PlatformResource.java
+++ b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/platform/PlatformResource.java
@@ -23,7 +23,7 @@
 import com.linkedin.restli.server.resources.CollectionResourceTaskTemplate;
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.metadata.context.RequestContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/restli/RestliUtils.java b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/restli/RestliUtils.java
index a2092405da3ff6..eec83b37e07d96 100644
--- a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/restli/RestliUtils.java
+++ b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/restli/RestliUtils.java
@@ -1,13 +1,13 @@
 package com.linkedin.metadata.resources.restli;
 
 import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
 import com.linkedin.metadata.dao.throttle.APIThrottleException;
 import com.linkedin.metadata.restli.NonExceptionHttpErrorResponse;
 import com.linkedin.metadata.utils.metrics.MetricUtils;
 import com.linkedin.parseq.Task;
 import com.linkedin.restli.common.HttpStatus;
 import com.linkedin.restli.server.RestLiServiceException;
+import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.metadata.exception.ActorAccessException;
 import java.util.Optional;
 import java.util.function.Supplier;
@@ -54,20 +54,20 @@ public static <T> Task<T> toTask(@Nonnull Supplier<T> supplier) {
   }
 
   @Nonnull
-  public static <T> Task<T> toTask(@Nonnull Supplier<T> supplier, String metricName) {
-    Timer.Context context = MetricUtils.timer(metricName).time();
-    // Stop timer on success and failure
-    return toTask(supplier)
-            .transform(
-                    orig -> {
-                      context.stop();
-                      if (orig.isFailed()) {
-                        MetricUtils.counter(MetricRegistry.name(metricName, "failed")).inc();
-                      } else {
-                        MetricUtils.counter(MetricRegistry.name(metricName, "success")).inc();
-                      }
-                      return orig;
-                    });
+  public static <T> Task<T> toTask(@Nonnull OperationContext opContext, @Nonnull Supplier<T> supplier, String metricName) {
+    return opContext.withSpan(metricName, () -> {
+      // Stop timer on success and failure
+      return toTask(supplier)
+              .transform(
+                      orig -> {
+                        if (orig.isFailed()) {
+                          MetricUtils.counter(MetricRegistry.name(metricName, "failed")).inc();
+                        } else {
+                          MetricUtils.counter(MetricRegistry.name(metricName, "success")).inc();
+                        }
+                        return orig;
+                      });
+    }, MetricUtils.DROPWIZARD_METRIC, "true");
   }
 
   /**
diff --git a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/usage/UsageStats.java b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/usage/UsageStats.java
index 426eff20c9c6eb..cc5c1b1059b1f7 100644
--- a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/usage/UsageStats.java
+++ b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/usage/UsageStats.java
@@ -44,7 +44,7 @@
 import com.linkedin.usage.UserUsageCounts;
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.metadata.context.RequestContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Set;
@@ -100,7 +100,7 @@ public class UsageStats extends SimpleResourceTemplate<UsageAggregation> {
   @WithSpan
   public Task<Void> batchIngest(@ActionParam(PARAM_BUCKETS) @Nonnull UsageAggregation[] buckets) {
     log.info("Ingesting {} usage stats aggregations", buckets.length);
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
 
           final Authentication auth = AuthenticationContext.getAuthentication();
@@ -141,7 +141,7 @@ public Task<UsageQueryResult> query(
     log.info(
         "Querying usage stats for resource: {}, duration: {}, start time: {}, end time: {}, max buckets: {}",
         resource, duration, startTime, endTime, maxBuckets);
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
         () -> {
 
           Urn resourceUrn = UrnUtils.getUrn(resource);
@@ -186,7 +186,7 @@ public Task<UsageQueryResult> queryRange(
           HttpStatus.S_403_FORBIDDEN, "User is unauthorized to query usage.");
     }
 
-    return RestliUtils.toTask(
+    return RestliUtils.toTask(systemOperationContext,
             () -> UsageServiceUtil.queryRange(opContext, _timeseriesAspectService, resource, duration, range), MetricRegistry.name(this.getClass(), "queryRange"));
   }
 
diff --git a/metadata-service/restli-servlet-impl/src/test/java/com/linkedin/metadata/resources/entity/AspectResourceTest.java b/metadata-service/restli-servlet-impl/src/test/java/com/linkedin/metadata/resources/entity/AspectResourceTest.java
index 037b5b81fd4df0..265b8a35e840c8 100644
--- a/metadata-service/restli-servlet-impl/src/test/java/com/linkedin/metadata/resources/entity/AspectResourceTest.java
+++ b/metadata-service/restli-servlet-impl/src/test/java/com/linkedin/metadata/resources/entity/AspectResourceTest.java
@@ -20,6 +20,7 @@
 import com.linkedin.metadata.entity.AspectDao;
 import com.linkedin.metadata.entity.EntityService;
 import com.linkedin.metadata.entity.EntityServiceImpl;
+import com.linkedin.metadata.entity.IngestAspectsResult;
 import com.linkedin.metadata.entity.UpdateAspectResult;
 import com.linkedin.metadata.entity.ebean.batch.ChangeItemImpl;
 import com.linkedin.metadata.event.EventProducer;
@@ -88,7 +89,8 @@ public void testAsyncDefaultAspects() throws URISyntaxException {
     Actor actor = new Actor(ActorType.USER, "user");
     when(mockAuthentication.getActor()).thenReturn(actor);
     aspectResource.ingestProposal(mcp, "true");
-    verify(producer, times(1)).produceMetadataChangeProposal(urn, mcp);
+    verify(producer, times(1)).produceMetadataChangeProposal(any(OperationContext.class), eq(urn),
+            argThat(arg -> arg.getMetadataChangeProposal().equals(mcp)));
     verifyNoMoreInteractions(producer);
     verifyNoMoreInteractions(aspectDao);
 
@@ -101,42 +103,43 @@ public void testAsyncDefaultAspects() throws URISyntaxException {
             .auditStamp(new AuditStamp())
             .metadataChangeProposal(mcp)
             .build(opContext.getAspectRetriever());
-    when(aspectDao.runInTransactionWithRetry(any(), any(), anyInt()))
-        .thenReturn(
-            List.of(List.of(
-                UpdateAspectResult.builder()
-                    .urn(urn)
-                    .newValue(new DatasetProperties().setName("name1"))
-                    .auditStamp(new AuditStamp())
-                    .request(req)
-                    .build(),
-                UpdateAspectResult.builder()
-                    .urn(urn)
-                    .newValue(new DatasetProperties().setName("name2"))
-                    .auditStamp(new AuditStamp())
-                    .request(req)
-                    .build(),
-                UpdateAspectResult.builder()
-                    .urn(urn)
-                    .newValue(new DatasetProperties().setName("name3"))
-                    .auditStamp(new AuditStamp())
-                    .request(req)
-                    .build(),
-                UpdateAspectResult.builder()
-                    .urn(urn)
-                    .newValue(new DatasetProperties().setName("name4"))
-                    .auditStamp(new AuditStamp())
-                    .request(req)
-                    .build(),
-                UpdateAspectResult.builder()
-                    .urn(urn)
-                    .newValue(new DatasetProperties().setName("name5"))
-                    .auditStamp(new AuditStamp())
-                    .request(req)
-                    .build())));
+    IngestAspectsResult txResult = IngestAspectsResult.builder()
+            .updateAspectResults(List.of(
+                    UpdateAspectResult.builder()
+                            .urn(urn)
+                            .newValue(new DatasetProperties().setName("name1"))
+                            .auditStamp(new AuditStamp())
+                            .request(req)
+                            .build(),
+                    UpdateAspectResult.builder()
+                            .urn(urn)
+                            .newValue(new DatasetProperties().setName("name2"))
+                            .auditStamp(new AuditStamp())
+                            .request(req)
+                            .build(),
+                    UpdateAspectResult.builder()
+                            .urn(urn)
+                            .newValue(new DatasetProperties().setName("name3"))
+                            .auditStamp(new AuditStamp())
+                            .request(req)
+                            .build(),
+                    UpdateAspectResult.builder()
+                            .urn(urn)
+                            .newValue(new DatasetProperties().setName("name4"))
+                            .auditStamp(new AuditStamp())
+                            .request(req)
+                            .build(),
+                    UpdateAspectResult.builder()
+                            .urn(urn)
+                            .newValue(new DatasetProperties().setName("name5"))
+                            .auditStamp(new AuditStamp())
+                            .request(req)
+                            .build()))
+            .build();
+    when(aspectDao.runInTransactionWithRetry(any(), any(), anyInt())).thenReturn(List.of(txResult));
     aspectResource.ingestProposal(mcp, "false");
     verify(producer, times(5))
-        .produceMetadataChangeLog(eq(urn), any(AspectSpec.class), any(MetadataChangeLog.class));
+        .produceMetadataChangeLog(any(OperationContext.class), eq(urn), any(AspectSpec.class), any(MetadataChangeLog.class));
     verifyNoMoreInteractions(producer);
   }
 
@@ -160,7 +163,7 @@ public void testNoValidateAsync() throws URISyntaxException {
     Actor actor = new Actor(ActorType.USER, "user");
     when(mockAuthentication.getActor()).thenReturn(actor);
     aspectResource.ingestProposal(mcp, "true");
-    verify(producer, times(1)).produceMetadataChangeProposal(urn, mcp);
+    verify(producer, times(1)).produceMetadataChangeProposal(any(OperationContext.class), eq(urn), argThat(arg -> arg.getMetadataChangeProposal().equals(mcp)));
     verifyNoMoreInteractions(producer);
     verifyNoMoreInteractions(aspectDao);
     reset(producer, aspectDao);
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/entity/IngestAspectsResult.java b/metadata-service/services/src/main/java/com/linkedin/metadata/entity/IngestAspectsResult.java
new file mode 100644
index 00000000000000..d9b7091ac44b0f
--- /dev/null
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/entity/IngestAspectsResult.java
@@ -0,0 +1,62 @@
+package com.linkedin.metadata.entity;
+
+import com.linkedin.metadata.aspect.batch.ChangeMCP;
+import com.linkedin.metadata.aspect.plugins.validation.AspectValidationException;
+import com.linkedin.util.Pair;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import lombok.Builder;
+import lombok.Value;
+
+@Builder(toBuilder = true)
+@Value
+public class IngestAspectsResult {
+  public static final IngestAspectsResult EMPTY = IngestAspectsResult.builder().build();
+
+  List<UpdateAspectResult> updateAspectResults;
+  List<Pair<ChangeMCP, Set<AspectValidationException>>> failedUpdateAspectResults;
+
+  public static IngestAspectsResult combine(IngestAspectsResult first, IngestAspectsResult second) {
+    if (first == null) {
+      return second != null ? second : IngestAspectsResult.builder().build();
+    }
+    if (second == null) {
+      return first;
+    }
+
+    List<UpdateAspectResult> combinedResults =
+        Stream.concat(
+                first.getUpdateAspectResults().stream(), second.getUpdateAspectResults().stream())
+            .collect(Collectors.toList());
+
+    List<Pair<ChangeMCP, Set<AspectValidationException>>> combinedFailedResults =
+        Stream.concat(
+                first.getFailedUpdateAspectResults().stream(),
+                second.getFailedUpdateAspectResults().stream())
+            .collect(Collectors.toList());
+
+    return IngestAspectsResult.builder()
+        .updateAspectResults(combinedResults)
+        .failedUpdateAspectResults(combinedFailedResults)
+        .build();
+  }
+
+  public static class IngestAspectsResultBuilder {
+    public IngestAspectsResult build() {
+      if (this.failedUpdateAspectResults == null) {
+        this.failedUpdateAspectResults = Collections.emptyList();
+      }
+      if (this.updateAspectResults == null) {
+        this.updateAspectResults = Collections.emptyList();
+      }
+
+      return new IngestAspectsResult(
+          this.updateAspectResults.stream().filter(Objects::nonNull).collect(Collectors.toList()),
+          this.failedUpdateAspectResults);
+    }
+  }
+}
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/entity/IngestProposalResult.java b/metadata-service/services/src/main/java/com/linkedin/metadata/entity/IngestProposalResult.java
deleted file mode 100644
index 1ef818559faaec..00000000000000
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/entity/IngestProposalResult.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.linkedin.metadata.entity;
-
-import com.linkedin.common.urn.Urn;
-import lombok.Value;
-
-@Value
-public class IngestProposalResult {
-  Urn urn;
-  boolean didUpdate;
-  boolean queued;
-}
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/recommendation/RecommendationsService.java b/metadata-service/services/src/main/java/com/linkedin/metadata/recommendation/RecommendationsService.java
index c554f2b919b063..8b0540a6e2d949 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/recommendation/RecommendationsService.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/recommendation/RecommendationsService.java
@@ -5,7 +5,7 @@
 import com.linkedin.metadata.recommendation.ranker.RecommendationModuleRanker;
 import com.linkedin.metadata.utils.ConcurrencyUtils;
 import io.datahubproject.metadata.context.OperationContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/recommendation/candidatesource/EntitySearchAggregationSource.java b/metadata-service/services/src/main/java/com/linkedin/metadata/recommendation/candidatesource/EntitySearchAggregationSource.java
index c1593088a2dd71..03dbe1af149fd0 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/recommendation/candidatesource/EntitySearchAggregationSource.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/recommendation/candidatesource/EntitySearchAggregationSource.java
@@ -17,7 +17,7 @@
 import com.linkedin.metadata.search.EntitySearchService;
 import com.linkedin.metadata.search.utils.QueryUtils;
 import io.datahubproject.metadata.context.OperationContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.net.URISyntaxException;
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/recommendation/candidatesource/RecentlySearchedSource.java b/metadata-service/services/src/main/java/com/linkedin/metadata/recommendation/candidatesource/RecentlySearchedSource.java
index ca3d43762e0738..0d9b3ced8d6f33 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/recommendation/candidatesource/RecentlySearchedSource.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/recommendation/candidatesource/RecentlySearchedSource.java
@@ -1,6 +1,5 @@
 package com.linkedin.metadata.recommendation.candidatesource;
 
-import com.codahale.metrics.Timer;
 import com.datahub.util.exception.ESQueryException;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.metadata.datahubusage.DataHubUsageEventConstants;
@@ -85,21 +84,28 @@ public List<RecommendationContent> getRecommendations(
       @Nullable Filter filter) {
     SearchRequest searchRequest =
         buildSearchRequest(opContext.getSessionActorContext().getActorUrn());
-    try (Timer.Context ignored = MetricUtils.timer(this.getClass(), "getRecentlySearched").time()) {
-      final SearchResponse searchResponse =
-          _searchClient.search(searchRequest, RequestOptions.DEFAULT);
-      // extract results
-      ParsedTerms parsedTerms = searchResponse.getAggregations().get(ENTITY_AGG_NAME);
-      return parsedTerms.getBuckets().stream()
-          .map(bucket -> buildContent(bucket.getKeyAsString()))
-          .filter(Optional::isPresent)
-          .map(Optional::get)
-          .limit(MAX_CONTENT)
-          .collect(Collectors.toList());
-    } catch (Exception e) {
-      log.error("Search query to get most recently viewed entities failed", e);
-      throw new ESQueryException("Search query failed:", e);
-    }
+
+    return opContext.withSpan(
+        "getRecentlySearched",
+        () -> {
+          try {
+            final SearchResponse searchResponse =
+                _searchClient.search(searchRequest, RequestOptions.DEFAULT);
+            // extract results
+            ParsedTerms parsedTerms = searchResponse.getAggregations().get(ENTITY_AGG_NAME);
+            return parsedTerms.getBuckets().stream()
+                .map(bucket -> buildContent(bucket.getKeyAsString()))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .limit(MAX_CONTENT)
+                .collect(Collectors.toList());
+          } catch (Exception e) {
+            log.error("Search query to get most recently viewed entities failed", e);
+            throw new ESQueryException("Search query failed:", e);
+          }
+        },
+        MetricUtils.DROPWIZARD_NAME,
+        MetricUtils.name(this.getClass(), "getRecentlySearched"));
   }
 
   private SearchRequest buildSearchRequest(@Nonnull Urn userUrn) {
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/recommendation/candidatesource/RecommendationSource.java b/metadata-service/services/src/main/java/com/linkedin/metadata/recommendation/candidatesource/RecommendationSource.java
index ddf203067f455e..5175177906e260 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/recommendation/candidatesource/RecommendationSource.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/recommendation/candidatesource/RecommendationSource.java
@@ -7,7 +7,7 @@
 import com.linkedin.metadata.recommendation.RecommendationRenderType;
 import com.linkedin.metadata.recommendation.RecommendationRequestContext;
 import io.datahubproject.metadata.context.OperationContext;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import java.util.List;
 import java.util.Optional;
 import javax.annotation.Nonnull;
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/SystemMetadataService.java b/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/SystemMetadataService.java
index 3880ad1d8da119..6d55ab1252b33d 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/SystemMetadataService.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/SystemMetadataService.java
@@ -1,5 +1,6 @@
 package com.linkedin.metadata.systemmetadata;
 
+import com.linkedin.common.urn.Urn;
 import com.linkedin.metadata.run.AspectRowSummary;
 import com.linkedin.metadata.run.IngestionRunSummary;
 import com.linkedin.mxe.SystemMetadata;
@@ -40,6 +41,9 @@ List<AspectRowSummary> findByRegistry(
   List<IngestionRunSummary> listRuns(
       Integer pageOffset, Integer pageSize, boolean includeSoftDeleted);
 
+  List<AspectRowSummary> findAspectsByUrn(
+      @Nonnull Urn urn, @Nonnull List<String> aspects, boolean includeSoftDeleted);
+
   default void configure() {}
 
   void clear();
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceService.java b/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceService.java
new file mode 100644
index 00000000000000..1b6f32da1162fb
--- /dev/null
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceService.java
@@ -0,0 +1,38 @@
+package com.linkedin.metadata.systemmetadata;
+
+import com.linkedin.common.urn.Urn;
+import io.datahubproject.metadata.context.OperationContext;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nonnull;
+
+public interface TraceService {
+
+  @Nonnull
+  Map<Urn, Map<String, TraceStatus>> trace(
+      @Nonnull OperationContext opContext,
+      @Nonnull String traceId,
+      @Nonnull Map<Urn, List<String>> aspects,
+      boolean onlyIncludeErrors,
+      boolean detailed,
+      boolean skipCache);
+
+  @Nonnull
+  default Map<Urn, Map<String, TraceStatus>> trace(
+      @Nonnull OperationContext opContext,
+      @Nonnull String traceId,
+      @Nonnull Map<Urn, List<String>> aspects,
+      boolean onlyIncludeErrors,
+      boolean detailed) {
+    return trace(opContext, traceId, aspects, onlyIncludeErrors, detailed, false);
+  }
+
+  @Nonnull
+  default Map<Urn, Map<String, TraceStatus>> traceDetailed(
+      @Nonnull OperationContext opContext,
+      @Nonnull String traceId,
+      @Nonnull Map<Urn, List<String>> aspects,
+      boolean skipCache) {
+    return trace(opContext, traceId, aspects, false, true, skipCache);
+  }
+}
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStatus.java b/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStatus.java
new file mode 100644
index 00000000000000..35bdecee459e1e
--- /dev/null
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStatus.java
@@ -0,0 +1,16 @@
+package com.linkedin.metadata.systemmetadata;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@AllArgsConstructor
+public class TraceStatus {
+  private boolean success;
+  private TraceStorageStatus primaryStorage;
+  private TraceStorageStatus searchStorage;
+}
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStorageStatus.java b/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStorageStatus.java
new file mode 100644
index 00000000000000..0def8785a6b823
--- /dev/null
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStorageStatus.java
@@ -0,0 +1,52 @@
+package com.linkedin.metadata.systemmetadata;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.datahubproject.metadata.exception.TraceException;
+import java.util.List;
+import javax.annotation.Nullable;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@AllArgsConstructor
+public class TraceStorageStatus {
+  public static final TraceStorageStatus NO_OP = TraceStorageStatus.ok(TraceWriteStatus.NO_OP);
+
+  public static TraceStorageStatus ok(TraceWriteStatus writeStatus) {
+    return TraceStorageStatus.builder().writeStatus(writeStatus).build();
+  }
+
+  public static TraceStorageStatus ok(TraceWriteStatus writeStatus, @Nullable String message) {
+    TraceStorageStatus.TraceStorageStatusBuilder builder =
+        TraceStorageStatus.builder().writeStatus(writeStatus);
+    if (message != null) {
+      builder.writeMessage(message);
+    }
+    return builder.build();
+  }
+
+  public static TraceStorageStatus fail(TraceWriteStatus writeStatus, @Nullable Throwable t) {
+    TraceStorageStatus.TraceStorageStatusBuilder builder =
+        TraceStorageStatus.builder().writeStatus(writeStatus);
+    if (t != null) {
+      builder.writeExceptions(List.of(new TraceException(t)));
+    }
+    return builder.build();
+  }
+
+  public static TraceStorageStatus fail(TraceWriteStatus writeStatus, @Nullable String message) {
+    TraceStorageStatus.TraceStorageStatusBuilder builder =
+        TraceStorageStatus.builder().writeStatus(writeStatus);
+    if (message != null) {
+      builder.writeMessage(message);
+    }
+    return builder.build();
+  }
+
+  private TraceWriteStatus writeStatus;
+  private String writeMessage;
+  @Nullable private List<TraceException> writeExceptions;
+}
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceWriteStatus.java b/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceWriteStatus.java
new file mode 100644
index 00000000000000..78bccd6bf1ccf7
--- /dev/null
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceWriteStatus.java
@@ -0,0 +1,18 @@
+package com.linkedin.metadata.systemmetadata;
+
+public enum TraceWriteStatus {
+  // error occurred during processing
+  ERROR,
+  // write is queued
+  PENDING,
+  // write is the active value in the datastore
+  ACTIVE_STATE,
+  // write has been overwritten with a newer value.
+  HISTORIC_STATE,
+  // write is not required
+  NO_OP,
+  // Unknown status due to the fact that tracing is lost or potentially well outside the expected
+  // tracing range (i.e. last year)
+  UNKNOWN,
+  TRACE_NOT_IMPLEMENTED
+}
diff --git a/metadata-service/war/src/main/java/com/linkedin/gms/CommonApplicationConfig.java b/metadata-service/war/src/main/java/com/linkedin/gms/CommonApplicationConfig.java
index 3f3ed9f75cceb3..face0cc859536d 100644
--- a/metadata-service/war/src/main/java/com/linkedin/gms/CommonApplicationConfig.java
+++ b/metadata-service/war/src/main/java/com/linkedin/gms/CommonApplicationConfig.java
@@ -52,7 +52,9 @@
       "com.linkedin.gms.factory.change",
       "com.datahub.event.hook",
       "com.linkedin.gms.factory.notifications",
-      "com.linkedin.gms.factory.telemetry"
+      "com.linkedin.gms.factory.telemetry",
+      "com.linkedin.gms.factory.trace",
+      "com.linkedin.gms.factory.kafka.trace",
     })
 @Configuration
 @PropertySource(value = "classpath:/application.yaml", factory = YamlPropertySourceFactory.class)
diff --git a/metadata-service/war/src/main/java/com/linkedin/gms/factory/config/GMSOpenTelemetryConfig.java b/metadata-service/war/src/main/java/com/linkedin/gms/factory/config/GMSOpenTelemetryConfig.java
new file mode 100644
index 00000000000000..b0eab226619709
--- /dev/null
+++ b/metadata-service/war/src/main/java/com/linkedin/gms/factory/config/GMSOpenTelemetryConfig.java
@@ -0,0 +1,21 @@
+package com.linkedin.gms.factory.config;
+
+import com.linkedin.gms.factory.system_telemetry.OpenTelemetryBaseFactory;
+import io.datahubproject.metadata.context.TraceContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class GMSOpenTelemetryConfig extends OpenTelemetryBaseFactory {
+
+  @Override
+  protected String getApplicationComponent() {
+    return "datahub-gms";
+  }
+
+  @Bean
+  @Override
+  protected TraceContext traceContext() {
+    return super.traceContext();
+  }
+}
diff --git a/metadata-utils/build.gradle b/metadata-utils/build.gradle
index 4b24eeac50b0b7..410641ef678e58 100644
--- a/metadata-utils/build.gradle
+++ b/metadata-utils/build.gradle
@@ -10,6 +10,7 @@ dependencies {
   implementation externalDependency.commonsLang
   api externalDependency.dropwizardMetricsCore
   implementation externalDependency.dropwizardMetricsJmx
+  implementation externalDependency.opentelemetrySdk
   api externalDependency.elasticSearchRest
   implementation externalDependency.httpClient
   api externalDependency.neo4jJavaDriver
diff --git a/metadata-utils/src/main/java/com/linkedin/metadata/utils/metrics/MetricSpanExporter.java b/metadata-utils/src/main/java/com/linkedin/metadata/utils/metrics/MetricSpanExporter.java
new file mode 100644
index 00000000000000..df2d164edc3c50
--- /dev/null
+++ b/metadata-utils/src/main/java/com/linkedin/metadata/utils/metrics/MetricSpanExporter.java
@@ -0,0 +1,58 @@
+package com.linkedin.metadata.utils.metrics;
+
+import static com.linkedin.metadata.utils.metrics.MetricUtils.DROPWIZARD_METRIC;
+import static com.linkedin.metadata.utils.metrics.MetricUtils.DROPWIZARD_NAME;
+
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.Timer;
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.sdk.common.CompletableResultCode;
+import io.opentelemetry.sdk.trace.data.SpanData;
+import io.opentelemetry.sdk.trace.export.SpanExporter;
+import java.util.Collection;
+import java.util.concurrent.TimeUnit;
+
+/** Created to forward opentelemetry spans to dropwizard for backwards compatibility */
+public class MetricSpanExporter implements SpanExporter {
+  private static final AttributeKey<String> DROPWIZARD_ATTR_KEY =
+      AttributeKey.stringKey(DROPWIZARD_METRIC);
+  private static final AttributeKey<String> DROPWIZARD_NAME_ATTR_KEY =
+      AttributeKey.stringKey(DROPWIZARD_NAME);
+
+  @Override
+  public CompletableResultCode export(Collection<SpanData> spans) {
+    spans.stream().filter(this::shouldRecordMetric).forEach(this::recordSpanMetric);
+
+    return CompletableResultCode.ofSuccess();
+  }
+
+  private boolean shouldRecordMetric(SpanData span) {
+    // Check for the recordMetric attribute
+    return Boolean.parseBoolean(span.getAttributes().get(DROPWIZARD_ATTR_KEY))
+        || span.getAttributes().get(DROPWIZARD_NAME_ATTR_KEY) != null;
+  }
+
+  private void recordSpanMetric(SpanData span) {
+    // Calculate duration in nanoseconds
+    long durationNanos = span.getEndEpochNanos() - span.getStartEpochNanos();
+    String dropWizardName = span.getAttributes().get(DROPWIZARD_NAME_ATTR_KEY);
+    String dropWizardMetricName =
+        dropWizardName == null
+            ? MetricRegistry.name(span.getName())
+            : MetricRegistry.name(dropWizardName);
+
+    // Update timer with the span duration
+    Timer timer = MetricUtils.get().timer(dropWizardMetricName);
+    timer.update(durationNanos, TimeUnit.NANOSECONDS);
+  }
+
+  @Override
+  public CompletableResultCode flush() {
+    return CompletableResultCode.ofSuccess();
+  }
+
+  @Override
+  public CompletableResultCode shutdown() {
+    return CompletableResultCode.ofSuccess();
+  }
+}
diff --git a/metadata-utils/src/main/java/com/linkedin/metadata/utils/metrics/MetricUtils.java b/metadata-utils/src/main/java/com/linkedin/metadata/utils/metrics/MetricUtils.java
index 3a47c11f8d7489..963015c111f600 100644
--- a/metadata-utils/src/main/java/com/linkedin/metadata/utils/metrics/MetricUtils.java
+++ b/metadata-utils/src/main/java/com/linkedin/metadata/utils/metrics/MetricUtils.java
@@ -4,10 +4,21 @@
 import com.codahale.metrics.Gauge;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.SharedMetricRegistries;
-import com.codahale.metrics.Timer;
 import com.codahale.metrics.jmx.JmxReporter;
 
 public class MetricUtils {
+  public static final String DROPWIZARD_METRIC = "dwizMetric";
+  public static final String DROPWIZARD_NAME = "dwizName";
+  public static final String CACHE_HIT_ATTR = "cache.hit";
+  public static final String BATCH_SIZE_ATTR = "batch.size";
+  public static final String QUEUE_ENQUEUED_AT_ATTR = "queue.enqueued_at";
+  public static final String QUEUE_DURATION_MS_ATTR = "queue.duration_ms";
+  public static final String MESSAGING_SYSTEM = "messaging.system";
+  public static final String MESSAGING_DESTINATION = "messaging.destination";
+  public static final String MESSAGING_DESTINATION_KIND = "messaging.destination_kind";
+  public static final String MESSAGING_OPERATION = "messaging.operation";
+  public static final String ERROR_TYPE = "error.type";
+
   private MetricUtils() {}
 
   public static final String DELIMITER = "_";
@@ -41,12 +52,12 @@ public static Counter counter(String metricName) {
     return REGISTRY.counter(MetricRegistry.name(metricName));
   }
 
-  public static Timer timer(Class<?> klass, String metricName) {
-    return REGISTRY.timer(MetricRegistry.name(klass, metricName));
+  public static String name(String name, String... names) {
+    return MetricRegistry.name(name, names);
   }
 
-  public static Timer timer(String metricName) {
-    return REGISTRY.timer(MetricRegistry.name(metricName));
+  public static String name(Class<?> clazz, String... names) {
+    return MetricRegistry.name(clazz.getName(), names);
   }
 
   public static <T extends Gauge<?>> T gauge(
diff --git a/smoke-test/requirements.txt b/smoke-test/requirements.txt
index fadc3dbec1f2b5..f1fbdac68f067a 100644
--- a/smoke-test/requirements.txt
+++ b/smoke-test/requirements.txt
@@ -17,4 +17,5 @@ types-PyYAML
 # https://github.com/docker/docker-py/issues/3256
 requests<=2.31.0
 # Missing numpy requirement in 8.0.0
-deepdiff!=8.0.0
\ No newline at end of file
+deepdiff!=8.0.0
+opensearch-py==2.6.0
\ No newline at end of file
diff --git a/smoke-test/tests/trace/__init__.py b/smoke-test/tests/trace/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/smoke-test/tests/trace/test_api_trace.py b/smoke-test/tests/trace/test_api_trace.py
new file mode 100644
index 00000000000000..4f8671decf8ae6
--- /dev/null
+++ b/smoke-test/tests/trace/test_api_trace.py
@@ -0,0 +1,486 @@
+import time
+
+import pytest
+from opensearchpy import OpenSearch
+
+from tests.utils import delete_urns, wait_for_writes_to_sync
+
+es = OpenSearch(["http://localhost:9200"])
+
+
+generated_urns = {
+    "apiTraceHappyPath": "urn:li:dataset:(urn:li:dataPlatform:test,apiTraceHappyPath,PROD)",
+    "apiTraceMCPFail": "urn:li:dataset:(urn:li:dataPlatform:test,apiTraceMCPFail,PROD)",
+    "apiTraceDroppedElasticsearch": "urn:li:dataset:(urn:li:dataPlatform:test,apiTraceDroppedElasticsearch,PROD)",
+    "apiTraceOverwritten": "urn:li:dataset:(urn:li:dataPlatform:test,apiTraceOverwritten,PROD)",
+    "apiTraceTimeseries": "urn:li:dataset:(urn:li:dataPlatform:test,apiTraceTimeseries,PROD)",
+    "apiTraceNoop": "urn:li:dataset:(urn:li:dataPlatform:test,apiTraceNoop,PROD)",
+    "apiTraceNoopWithFMCP": "urn:li:dataset:(urn:li:dataPlatform:test,apiTraceNoopWithFMCP,PROD)",
+}
+
+
+@pytest.fixture(scope="module", autouse=True)
+def test_setup(graph_client):
+    """Fixture to clean-up urns before and after a test is run"""
+    print("removing previous test data")
+    delete_urns(graph_client, list(generated_urns.values()))
+    wait_for_writes_to_sync()
+    yield
+    print("removing generated test data")
+    delete_urns(graph_client, list(generated_urns.values()))
+    wait_for_writes_to_sync()
+
+
+def test_successful_async_write(auth_session):
+    urn = generated_urns["apiTraceHappyPath"]
+    aspect_name = "status"
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v3/entity/dataset",
+        params={"async": "true", "systemMetadata": "true"},
+        json=[{"urn": urn, aspect_name: {"value": {"removed": False}}}],
+    )
+
+    trace_id = compare_trace_header_system_metadata(
+        resp, resp.json()[0][aspect_name]["systemMetadata"]
+    )
+    wait_for_writes_to_sync()
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v1/trace/write/{trace_id}",
+        params={"onlyIncludeErrors": "false", "detailed": "true"},
+        json={urn: [aspect_name]},
+    )
+    assert resp.json() == {
+        urn: {
+            aspect_name: {
+                "success": True,
+                "primaryStorage": {"writeStatus": "ACTIVE_STATE"},
+                "searchStorage": {"writeStatus": "ACTIVE_STATE"},
+            }
+        }
+    }
+
+
+def test_mcp_fail_aspect_async_write(auth_session):
+    urn = generated_urns["apiTraceMCPFail"]
+    aspect_name = "glossaryTerms"
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v3/entity/dataset/{urn}/{aspect_name}",
+        params={"async": "true", "systemMetadata": "true"},
+        json={
+            "value": {
+                "terms": [{"urn": "urn:li:glossaryTerm:someTerm"}],
+                "auditStamp": {"time": 0, "actor": "urn:li:corpuser:datahub"},
+            },
+            "headers": {"If-Version-Match": "-10000"},
+        },
+    )
+
+    trace_id = compare_trace_header_system_metadata(
+        resp, resp.json()[aspect_name]["systemMetadata"]
+    )
+    wait_for_writes_to_sync()
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v1/trace/write/{trace_id}",
+        params={"onlyIncludeErrors": "false", "detailed": "true", "skipCache": "true"},
+        json={urn: [aspect_name]},
+    )
+    assert resp.json()[urn][aspect_name]["success"] is False
+    assert resp.json()[urn][aspect_name]["primaryStorage"]["writeStatus"] == "ERROR"
+    assert (
+        resp.json()[urn][aspect_name]["primaryStorage"]["writeExceptions"][0]["message"]
+        == "Expected version -10000, actual version -1"
+    )
+    assert resp.json()[urn][aspect_name]["searchStorage"] == {
+        "writeStatus": "ERROR",
+        "writeMessage": "Primary storage write failed.",
+    }
+
+
+def test_overwritten_async_write(auth_session):
+    urn = generated_urns["apiTraceOverwritten"]
+    aspect_name = "datasetProperties"
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v3/entity/dataset",
+        params={"async": "true", "systemMetadata": "true"},
+        json=[
+            {
+                "urn": urn,
+                aspect_name: {
+                    "value": {"name": "original", "customProperties": {}, "tags": []}
+                },
+            }
+        ],
+    )
+
+    original_trace_id = compare_trace_header_system_metadata(
+        resp, resp.json()[0][aspect_name]["systemMetadata"]
+    )
+    wait_for_writes_to_sync()
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v1/trace/write/{original_trace_id}",
+        params={"onlyIncludeErrors": "false", "detailed": "true"},
+        json={urn: [aspect_name]},
+    )
+    assert resp.json() == {
+        urn: {
+            aspect_name: {
+                "success": True,
+                "primaryStorage": {"writeStatus": "ACTIVE_STATE"},
+                "searchStorage": {"writeStatus": "ACTIVE_STATE"},
+            }
+        }
+    }
+
+    # Perform 2nd write
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v3/entity/dataset",
+        params={"async": "true", "systemMetadata": "true"},
+        json=[
+            {
+                "urn": urn,
+                aspect_name: {
+                    "value": {"name": "updated", "customProperties": {}, "tags": []}
+                },
+            }
+        ],
+    )
+
+    second_trace_id = compare_trace_header_system_metadata(
+        resp, resp.json()[0][aspect_name]["systemMetadata"]
+    )
+    wait_for_writes_to_sync()
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v1/trace/write/{second_trace_id}",
+        params={"onlyIncludeErrors": "false", "detailed": "true", "skipCache": "true"},
+        json={urn: [aspect_name]},
+    )
+    assert resp.json() == {
+        urn: {
+            aspect_name: {
+                "success": True,
+                "primaryStorage": {"writeStatus": "ACTIVE_STATE"},
+                "searchStorage": {"writeStatus": "ACTIVE_STATE"},
+            }
+        }
+    }
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v1/trace/write/{original_trace_id}",
+        params={"onlyIncludeErrors": "false", "detailed": "true"},
+        json={urn: [aspect_name]},
+    )
+    assert resp.json() == {
+        urn: {
+            aspect_name: {
+                "success": True,
+                "primaryStorage": {"writeStatus": "HISTORIC_STATE"},
+                "searchStorage": {"writeStatus": "HISTORIC_STATE"},
+            }
+        }
+    }
+
+
+def test_missing_elasticsearch_async_write(auth_session):
+    urn = generated_urns["apiTraceDroppedElasticsearch"]
+    aspect_name = "status"
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v3/entity/dataset",
+        params={"async": "true", "systemMetadata": "true"},
+        json=[{"urn": urn, aspect_name: {"value": {"removed": False}}}],
+    )
+
+    trace_id = compare_trace_header_system_metadata(
+        resp, resp.json()[0][aspect_name]["systemMetadata"]
+    )
+    wait_for_writes_to_sync()
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v1/trace/write/{trace_id}",
+        params={"onlyIncludeErrors": "false", "detailed": "true"},
+        json={urn: [aspect_name]},
+    )
+    assert resp.json() == {
+        urn: {
+            aspect_name: {
+                "success": True,
+                "primaryStorage": {"writeStatus": "ACTIVE_STATE"},
+                "searchStorage": {"writeStatus": "ACTIVE_STATE"},
+            }
+        }
+    }
+
+    # Simulate overwrite
+    delete_elasticsearch_trace(trace_id)
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v1/trace/write/{trace_id}",
+        params={"onlyIncludeErrors": "false", "detailed": "true", "skipCache": "true"},
+        json={urn: [aspect_name]},
+    )
+    assert resp.json() == {
+        urn: {
+            aspect_name: {
+                "success": True,
+                "primaryStorage": {"writeStatus": "ACTIVE_STATE"},
+                "searchStorage": {"writeStatus": "HISTORIC_STATE"},
+            }
+        }
+    }
+
+    # Simulate dropped write
+    delete_elasticsearch_system_metadata(urn)
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v1/trace/write/{trace_id}",
+        params={"onlyIncludeErrors": "false", "detailed": "true", "skipCache": "true"},
+        json={urn: [aspect_name]},
+    )
+    assert resp.json() == {
+        urn: {
+            aspect_name: {
+                "success": False,
+                "primaryStorage": {"writeStatus": "ACTIVE_STATE"},
+                "searchStorage": {
+                    "writeStatus": "ERROR",
+                    "writeMessage": "Consumer has processed past the offset.",
+                },
+            }
+        }
+    }
+
+
+def test_timeseries_async_write(auth_session):
+    urn = generated_urns["apiTraceTimeseries"]
+    aspect_name = "datasetProfile"
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v3/entity/dataset",
+        params={"async": "true", "systemMetadata": "true"},
+        json=[
+            {
+                "urn": urn,
+                aspect_name: {
+                    "value": {
+                        "timestampMillis": time.time_ns() // 1_000_000,
+                        "messageId": "test timeseries",
+                        "rowCount": 1,
+                    }
+                },
+            }
+        ],
+    )
+
+    trace_id = compare_trace_header_system_metadata(
+        resp, resp.json()[0][aspect_name]["systemMetadata"]
+    )
+    wait_for_writes_to_sync()
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v1/trace/write/{trace_id}",
+        params={"onlyIncludeErrors": "false", "detailed": "true"},
+        json={urn: [aspect_name]},
+    )
+    assert resp.json() == {
+        urn: {
+            aspect_name: {
+                "success": True,
+                "primaryStorage": {"writeStatus": "NO_OP"},
+                "searchStorage": {"writeStatus": "TRACE_NOT_IMPLEMENTED"},
+            }
+        }
+    }
+
+
+def test_noop_async_write(auth_session):
+    urn = generated_urns["apiTraceNoop"]
+    aspect_name = "status"
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v3/entity/dataset",
+        params={"async": "true", "systemMetadata": "true"},
+        json=[{"urn": urn, aspect_name: {"value": {"removed": False}}}],
+    )
+
+    trace_id = compare_trace_header_system_metadata(
+        resp, resp.json()[0][aspect_name]["systemMetadata"]
+    )
+    wait_for_writes_to_sync()
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v1/trace/write/{trace_id}",
+        params={"onlyIncludeErrors": "false", "detailed": "true"},
+        json={urn: [aspect_name]},
+    )
+    assert resp.json() == {
+        urn: {
+            aspect_name: {
+                "success": True,
+                "primaryStorage": {"writeStatus": "ACTIVE_STATE"},
+                "searchStorage": {"writeStatus": "ACTIVE_STATE"},
+            }
+        }
+    }
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v3/entity/dataset",
+        params={"async": "true", "systemMetadata": "true"},
+        json=[{"urn": urn, aspect_name: {"value": {"removed": False}}}],
+    )
+
+    trace_id = compare_trace_header_system_metadata(
+        resp, resp.json()[0][aspect_name]["systemMetadata"]
+    )
+    wait_for_writes_to_sync()
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v1/trace/write/{trace_id}",
+        params={"onlyIncludeErrors": "false", "detailed": "true", "skipCache": "true"},
+        json={urn: [aspect_name]},
+    )
+    assert resp.json() == {
+        urn: {
+            aspect_name: {
+                "success": True,
+                "primaryStorage": {"writeStatus": "NO_OP"},
+                "searchStorage": {"writeStatus": "NO_OP"},
+            }
+        }
+    }
+
+
+def test_noop_with_fmcp_async_write(auth_session):
+    urn = generated_urns["apiTraceNoopWithFMCP"]
+    aspect_name = "status"
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v3/entity/dataset",
+        params={"async": "true", "systemMetadata": "true"},
+        json=[{"urn": urn, aspect_name: {"value": {"removed": False}}}],
+    )
+
+    trace_id = compare_trace_header_system_metadata(
+        resp, resp.json()[0][aspect_name]["systemMetadata"]
+    )
+    wait_for_writes_to_sync()
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v1/trace/write/{trace_id}",
+        params={"onlyIncludeErrors": "false", "detailed": "true"},
+        json={urn: [aspect_name]},
+    )
+    assert resp.json() == {
+        urn: {
+            aspect_name: {
+                "success": True,
+                "primaryStorage": {"writeStatus": "ACTIVE_STATE"},
+                "searchStorage": {"writeStatus": "ACTIVE_STATE"},
+            }
+        }
+    }
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v3/entity/dataset",
+        params={"async": "true", "systemMetadata": "true"},
+        json=[
+            {
+                "urn": urn,
+                aspect_name: {
+                    "value": {"removed": False},
+                    "headers": {"If-Version-Match": "-10000"},
+                },
+            }
+        ],
+    )
+
+    trace_id = compare_trace_header_system_metadata(
+        resp, resp.json()[0][aspect_name]["systemMetadata"]
+    )
+    wait_for_writes_to_sync()
+
+    resp = auth_session.post(
+        f"{auth_session.gms_url()}/openapi/v1/trace/write/{trace_id}",
+        params={"onlyIncludeErrors": "false", "detailed": "true", "skipCache": "true"},
+        json={urn: [aspect_name]},
+    )
+    assert resp.json()[urn][aspect_name]["success"] is False
+    assert resp.json()[urn][aspect_name]["primaryStorage"]["writeStatus"] == "ERROR"
+    assert (
+        resp.json()[urn][aspect_name]["primaryStorage"]["writeExceptions"][0]["message"]
+        == "Expected version -10000, actual version 1"
+    )
+    assert resp.json()[urn][aspect_name]["searchStorage"] == {
+        "writeStatus": "ERROR",
+        "writeMessage": "Primary storage write failed.",
+    }
+
+
+def compare_trace_header_system_metadata(resp, system_metadata):
+    header_trace_id = extract_trace_header(resp)
+    system_metadata_trace_id = extract_trace_system_metadata(system_metadata)
+    assert header_trace_id.startswith("00-" + system_metadata_trace_id)
+    return system_metadata_trace_id
+
+
+def extract_trace_header(resp):
+    assert "traceparent" in resp.headers
+    return resp.headers["traceparent"]
+
+
+def extract_trace_system_metadata(system_metadata):
+    assert "properties" in system_metadata
+    assert "telemetryTraceId" in system_metadata["properties"]
+    return system_metadata["properties"]["telemetryTraceId"]
+
+
+def delete_elasticsearch_trace(trace_id, timeout=10, refresh_interval=1):
+    field_name = "telemetryTraceId"
+    index_name = "system_metadata_service_v1"
+
+    update_body = {
+        "query": {"term": {field_name: trace_id}},
+        "script": {"source": f"ctx._source.remove('{field_name}')"},
+    }
+
+    response = es.update_by_query(
+        index=index_name,
+        body=update_body,
+        conflicts="proceed",
+        timeout=timeout,
+        wait_for_completion=True,
+    )
+
+    if response.get("failures"):
+        raise Exception(
+            f"Update by query operation had failures: {response['failures']}"
+        )
+
+    time.sleep(refresh_interval)
+
+
+def delete_elasticsearch_system_metadata(urn, timeout=10, refresh_interval=1):
+    index_name = "system_metadata_service_v1"
+
+    update_body = {"query": {"term": {"urn": urn}}}
+
+    response = es.delete_by_query(
+        index=index_name,
+        body=update_body,
+        conflicts="proceed",
+        timeout=timeout,
+        wait_for_completion=True,
+    )
+
+    if response.get("failures"):
+        raise Exception(
+            f"Update by query operation had failures: {response['failures']}"
+        )
+
+    time.sleep(refresh_interval)

From d0af9d59aab7cc7bee6774bd29d529bd009f1521 Mon Sep 17 00:00:00 2001
From: Maggie Hays <maggiem.hays@gmail.com>
Date: Wed, 29 Jan 2025 15:15:26 -0600
Subject: [PATCH 180/249] add datahub-v1.0-rc issue template

---
 .github/ISSUE_TEMPLATE/--bug-report.md        |  2 +-
 .../datahub-v1-0-rc-bug-report.md             | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 .github/ISSUE_TEMPLATE/datahub-v1-0-rc-bug-report.md

diff --git a/.github/ISSUE_TEMPLATE/--bug-report.md b/.github/ISSUE_TEMPLATE/--bug-report.md
index 8ef9b46b049a41..ed965c9c529385 100644
--- a/.github/ISSUE_TEMPLATE/--bug-report.md
+++ b/.github/ISSUE_TEMPLATE/--bug-report.md
@@ -29,4 +29,4 @@ If applicable, add screenshots to help explain your problem.
  - Version [e.g. 22]
 
 **Additional context**
-Add any other context about the problem here.
\ No newline at end of file
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/datahub-v1-0-rc-bug-report.md b/.github/ISSUE_TEMPLATE/datahub-v1-0-rc-bug-report.md
new file mode 100644
index 00000000000000..73da33b272e6f3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/datahub-v1-0-rc-bug-report.md
@@ -0,0 +1,32 @@
+---
+name: DataHub v1.0-rc Bug Report
+about: Report issues found in DataHub v1.0 Release Candidates
+title: "[v1.0-rc/bug] Description of Bug"
+labels: bug, datahub-v1.0-rc
+assignees: chriscollins3456, david-leifker, maggiehays
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots and/or Screen Recordings**
+If applicable, add screenshots and/or screen recordings to help explain the issue.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

From a35bfddba27e3eafbfba4a2db176c5625e97c2c4 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Wed, 29 Jan 2025 15:16:49 -0600
Subject: [PATCH 181/249] fix(nocode): fix no-code upgrade (#12494)

---
 datahub-upgrade/build.gradle                  | 12 +++++++++++
 .../upgrade/config/OpenTelemetryConfig.java   | 21 +++++++++++++++++++
 .../upgrade/UpgradeCliApplicationTest.java    |  8 +++++++
 3 files changed, 41 insertions(+)
 create mode 100644 datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/OpenTelemetryConfig.java

diff --git a/datahub-upgrade/build.gradle b/datahub-upgrade/build.gradle
index a3b2e9ad6b3e22..05c7d0c7e3f7d0 100644
--- a/datahub-upgrade/build.gradle
+++ b/datahub-upgrade/build.gradle
@@ -152,6 +152,18 @@ task runRestoreIndicesUrn(type: Exec) {
           bootJar.getArchiveFile().get(), "-u", "RestoreIndices", "-a", "batchSize=100", "-a", "urnBasedPagination=true"
 }
 
+task runNoCode(type: Exec) {
+  dependsOn bootJar
+  group = "Execution"
+  description = "Run the NoCodeDataMigration process locally."
+  environment "ENTITY_REGISTRY_CONFIG_PATH", "../metadata-models/src/main/resources/entity-registry.yml"
+  commandLine "java", "-agentlib:jdwp=transport=dt_socket,address=5003,server=y,suspend=n",
+          "-jar",
+          "-Dkafka.schemaRegistry.url=http://localhost:8080/schema-registry/api",
+          "-Dserver.port=8083",
+          bootJar.getArchiveFile().get(), "-u", "NoCodeDataMigration", "-a", "batchSize=100", "-a", "dbType=MYSQL"
+}
+
 docker {
   name "${docker_registry}/${docker_repo}:v${version}"
   version "v${version}"
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/OpenTelemetryConfig.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/OpenTelemetryConfig.java
new file mode 100644
index 00000000000000..3891c60dbfbd39
--- /dev/null
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/OpenTelemetryConfig.java
@@ -0,0 +1,21 @@
+package com.linkedin.datahub.upgrade.config;
+
+import com.linkedin.gms.factory.system_telemetry.OpenTelemetryBaseFactory;
+import io.datahubproject.metadata.context.TraceContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class OpenTelemetryConfig extends OpenTelemetryBaseFactory {
+
+  @Override
+  protected String getApplicationComponent() {
+    return "datahub-upgrade";
+  }
+
+  @Bean
+  @Override
+  protected TraceContext traceContext() {
+    return super.traceContext();
+  }
+}
diff --git a/datahub-upgrade/src/test/java/com/linkedin/datahub/upgrade/UpgradeCliApplicationTest.java b/datahub-upgrade/src/test/java/com/linkedin/datahub/upgrade/UpgradeCliApplicationTest.java
index 8b6899b4c78866..77aa6ecf8757cd 100644
--- a/datahub-upgrade/src/test/java/com/linkedin/datahub/upgrade/UpgradeCliApplicationTest.java
+++ b/datahub-upgrade/src/test/java/com/linkedin/datahub/upgrade/UpgradeCliApplicationTest.java
@@ -10,6 +10,7 @@
 import com.linkedin.metadata.dao.throttle.NoOpSensor;
 import com.linkedin.metadata.dao.throttle.ThrottleSensor;
 import com.linkedin.metadata.search.elasticsearch.indexbuilder.ESIndexBuilder;
+import io.datahubproject.metadata.context.TraceContext;
 import javax.inject.Named;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -38,6 +39,8 @@ public class UpgradeCliApplicationTest extends AbstractTestNGSpringContextTests
   @Autowired
   private ThrottleSensor kafkaThrottle;
 
+  @Autowired private TraceContext traceContext;
+
   @Test
   public void testRestoreIndicesInit() {
     /*
@@ -62,4 +65,9 @@ public void testNoThrottle() {
     assertEquals(
         new NoOpSensor(), kafkaThrottle, "No kafka throttle controls expected in datahub-upgrade");
   }
+
+  @Test
+  public void testTraceContext() {
+    assertNotNull(traceContext);
+  }
 }

From 280e82a11d87aac867cab5a0fa9e14cf0ed5da0e Mon Sep 17 00:00:00 2001
From: Maggie Hays <maggiem.hays@gmail.com>
Date: Wed, 29 Jan 2025 15:21:45 -0600
Subject: [PATCH 182/249] Updated DataHub v1.0-rc template

---
 .github/ISSUE_TEMPLATE/datahub-v1-0-rc-bug-report.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/datahub-v1-0-rc-bug-report.md b/.github/ISSUE_TEMPLATE/datahub-v1-0-rc-bug-report.md
index 73da33b272e6f3..c9943509fe6206 100644
--- a/.github/ISSUE_TEMPLATE/datahub-v1-0-rc-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/datahub-v1-0-rc-bug-report.md
@@ -23,10 +23,10 @@ A clear and concise description of what you expected to happen.
 **Screenshots and/or Screen Recordings**
 If applicable, add screenshots and/or screen recordings to help explain the issue.
 
-**Desktop (please complete the following information):**
+**System details (please complete the following information):**
+ - DataHub Version Tag [e.g. v1.0-rc1]
  - OS: [e.g. iOS]
  - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
 
 **Additional context**
 Add any other context about the problem here.

From c2a43589c79fe71f7651627ce21b5912093a00f1 Mon Sep 17 00:00:00 2001
From: Chris Collins <chriscollins3456@gmail.com>
Date: Wed, 29 Jan 2025 20:42:01 -0500
Subject: [PATCH 183/249] Bring Alchemy UI to OSS (#12481)

---
 .../linkedin/datahub/graphql/Constants.java   |   1 +
 .../datahub/graphql/GmsGraphQLEngine.java     |  75 +-
 .../datahub/graphql/GmsGraphQLEngineArgs.java |   2 +
 .../authorization/AuthorizationUtils.java     |  16 +
 .../resolvers/config/AppConfigResolver.java   |  21 +-
 .../UpdateDeprecationResolver.java            |   8 +
 .../entity/EntityPrivilegesResolver.java      |  34 +
 .../resolvers/incident/IncidentUtils.java     |  25 +
 .../BatchUpdateDeprecationResolver.java       |   9 +-
 .../UpdateDisplayPropertiesResolver.java      | 106 +++
 .../mutate/UpdateUserSettingResolver.java     |  24 +-
 .../mutate/util/DeprecationUtils.java         |  40 +-
 .../resolvers/mutate/util/OwnerUtils.java     |  11 +
 .../resolvers/post/ListPostsResolver.java     |  32 +-
 .../resolvers/query/ListQueriesResolver.java  |  23 +-
 .../graphql/resolvers/search/SearchUtils.java |  90 ++
 .../siblings/SiblingsSearchResolver.java      |  66 ++
 .../timeline/GetTimelineResolver.java         |  80 ++
 .../common/mappers/DeprecationMapper.java     |   3 +
 .../mappers/DisplayPropertiesMapper.java      |  47 +
 .../common/mappers/UrnToEntityMapper.java     |  12 +
 .../types/container/ContainerType.java        |   3 +-
 .../container/mappers/ContainerMapper.java    |   9 +
 .../corpuser/mappers/CorpUserMapper.java      |   1 +
 .../graphql/types/domain/DomainMapper.java    |  10 +
 .../glossary/mappers/GlossaryNodeMapper.java  |   7 +
 .../graphql/types/mappers/MapperUtils.java    |   3 +-
 .../graphql/types/post/PostMapper.java        |   5 +
 .../datahub/graphql/types/post/PostType.java  |  80 ++
 .../graphql/types/query/QueryMapper.java      |  24 +-
 .../types/schemafield/SchemaFieldMapper.java  |  13 +
 .../types/schemafield/SchemaFieldType.java    |   6 +-
 .../timeline/mappers/ChangeEventMapper.java   |  47 +
 .../mappers/ChangeTransactionMapper.java      |  37 +
 .../src/main/resources/app.graphql            |  72 ++
 .../src/main/resources/auth.graphql           |  80 ++
 .../src/main/resources/entity.graphql         | 188 +++-
 .../src/main/resources/query.graphql          |   6 +
 .../src/main/resources/search.graphql         |   7 +-
 .../src/main/resources/timeline.graphql       | 112 ++-
 .../BatchUpdateDeprecationResolverTest.java   |  15 +-
 .../UpdateDeprecationResolverTest.java        | 142 ++-
 .../query/ListQueriesResolverTest.java        |   9 +-
 datahub-web-react/.eslintrc.js                |   8 +
 datahub-web-react/package.json                |  11 +
 datahub-web-react/src/App.tsx                 |   1 +
 datahub-web-react/src/AppV2.less              |  57 ++
 datahub-web-react/src/Mocks.tsx               | 381 +++++++-
 .../components/Avatar/types.ts                |   2 +-
 .../components/Avatar/utils.ts                |   1 +
 .../AvatarStack/AvatarStack.stories.tsx       |  76 ++
 .../components/AvatarStack/AvatarStack.tsx    |  23 +
 .../components/AvatarStack/components.ts      |  14 +
 .../components/AvatarStack/types.ts           |  11 +
 .../components/Bar/Bar.stories.tsx            |  92 ++
 .../alchemy-components/components/Bar/Bar.tsx |  25 +
 .../components/Bar/components.ts              |  15 +
 .../components/Bar/constant.ts                |   5 +
 .../components/Bar/index.ts                   |   1 +
 .../components/Bar/types.ts                   |   5 +
 .../components/BarChart/BarChart.stories.tsx  |  45 +-
 .../components/BarChart/BarChart.tsx          | 124 ++-
 .../components/BarChart/components.tsx        |   9 +-
 .../hooks/useAdaptYAccessorToZeroValues.ts    |  18 +
 .../hooks/useAdaptYScaleToZeroValues.ts       |  23 +
 .../BarChart/hooks/useMaxDataValue.ts         |   6 +
 .../BarChart/hooks/useMergedProps.ts          |   8 +
 .../components/BarChart/types.ts              |  38 +-
 .../components/BarChart/utils.ts              |   3 +-
 .../components/Button/Button.stories.tsx      |  13 +
 .../components/Button/Button.tsx              |   5 +-
 .../components/Button/types.ts                |   3 +-
 .../CalendarChart/CalendarChart.stories.tsx   |  82 ++
 .../CalendarChart/CalendarChart.tsx           |  80 ++
 .../_tests_/getColorAccessors.test.ts         |  82 ++
 .../_tests_/prepareCalendarDate.test.ts       | 109 +++
 .../components/CalendarChart/components.tsx   |  30 +
 .../components/CalendarChart/constants.ts     |   1 +
 .../components/CalendarChart/index.ts         |   2 +
 .../private/components/AxisBottomMonths.tsx   |  34 +
 .../private/components/AxisLeftWeekdays.tsx   |  35 +
 .../private/components/Calendar.tsx           |  13 +
 .../private/components/CalendarContainer.tsx  |  31 +
 .../CalendarChart/private/components/Day.tsx  |  40 +
 .../private/components/Month.tsx              |  28 +
 .../private/components/TickLabel.tsx          |  13 +
 .../CalendarChart/private/components/Week.tsx |  21 +
 .../CalendarChart/private/constants.ts        |   4 +
 .../CalendarChart/private/context.tsx         | 109 +++
 .../components/CalendarChart/types.ts         |  81 ++
 .../components/CalendarChart/utils.ts         | 208 +++++
 .../components/Card/Card.stories.tsx          |  23 +-
 .../components/Card/Card.tsx                  |  61 +-
 .../components/Card/components.ts             |  47 +-
 .../components/Card/types.ts                  |   3 +
 .../components/Checkbox/Checkbox.tsx          |   9 +-
 .../components/Checkbox/components.ts         |   2 +-
 .../components/Checkbox/types.ts              |   2 +-
 .../DatePicker/DatePicker.stories.tsx         |  61 ++
 .../components/DatePicker/DatePicker.tsx      |  54 ++
 .../components/DatePicker/components.tsx      |  32 +
 .../components/DatePicker/constants.ts        |   4 +
 .../DatePicker/hooks/useVariantProps.ts       |  15 +
 .../components/DatePicker/index.ts            |   3 +
 .../components/DatePicker/styles.css          |  15 +
 .../components/DatePicker/types.ts            |  31 +
 .../DatePicker/variants/common/props.tsx      |   7 +
 .../variants/dateSwitcher/components.tsx      | 122 +++
 .../variants/dateSwitcher/props.tsx           |  14 +
 .../DatePicker/variants/dateSwitcher/types.ts |   4 +
 .../components/DatePicker/variants/index.ts   |   4 +
 .../components/Drawer/Drawer.stories.tsx      |  97 ++
 .../components/Drawer/Drawer.tsx              |  53 ++
 .../components/Drawer/components.tsx          |  19 +
 .../components/Drawer/constants.ts            |   3 +
 .../components/Drawer/index.ts                |   1 +
 .../components/Drawer/types.ts                |   8 +
 .../GraphCard/GraphCard.stories.tsx           |  91 ++
 .../components/GraphCard/GraphCard.tsx        |  90 ++
 .../components/GraphCard/MoreInfoModal.tsx    |  55 ++
 .../components/GraphCard/components.tsx       |  46 +
 .../components/GraphCard/index.ts             |   1 +
 .../components/GraphCard/types.ts             |  12 +
 .../IconLabel/IconLabel.stories.tsx           |  95 ++
 .../components/IconLabel/IconLabel.tsx        |  33 +
 .../components/IconLabel/component.ts         |  21 +
 .../components/IconLabel/index.ts             |   1 +
 .../components/IconLabel/types.ts             |  13 +
 .../components/IconLabel/utils.ts             |  10 +
 .../IncidentPriorityLabel.stories.tsx         |  85 ++
 .../IncidentPriorityLabel.tsx                 |  43 +
 .../IncidentPriorityLabel/constant.ts         |   7 +
 .../components/IncidentPriorityLabel/index.ts |   1 +
 .../components/IncidentPriorityLabel/types.ts |   5 +
 .../LineChart/LineChart.stories.tsx           |  37 +-
 .../components/LineChart/LineChart.tsx        | 180 ++--
 .../components/LineChart/components.tsx       |  28 +
 .../components/LineChart/constants.ts         |   5 +
 .../components/LineChart/types.ts             |  29 +-
 .../components/LineChart/utils.ts             |   4 +
 .../components/Loader/Loader.tsx              |  26 +
 .../components/Loader/Loading.stories.tsx     |  82 ++
 .../components/Loader/components.tsx          |  34 +
 .../components/Loader/constants.ts            |  16 +
 .../components/Loader/index.ts                |   1 +
 .../components/Loader/types.ts                |  11 +
 .../components/Pills/Pill.tsx                 |  12 +-
 .../components/Pills/components.ts            |   2 +
 .../components/Pills/types.ts                 |   2 +
 .../components/SearchBar/SearchBar.tsx        |   2 +-
 .../components/Select/BasicSelect.tsx         |  98 +-
 .../components/Select/Nested/NestedOption.tsx |  49 +-
 .../components/Select/Nested/NestedSelect.tsx |  55 +-
 .../components/Select/Select.stories.tsx      |  55 ++
 .../components/Select/Select.tsx              |   2 +
 .../components/Select/SimpleSelect.tsx        | 121 ++-
 .../components/Select/components.ts           | 117 ++-
 .../SelectLabelRenderer.tsx                   |  35 +
 .../variants/MultiSelectDefault.tsx           |  37 +
 .../variants/MultiSelectLabeled.tsx           |  14 +
 .../variants/SingleSelectDefault.tsx          |  34 +
 .../variants/SingleSelectLabeled.tsx          |  33 +
 .../components/Select/types.ts                |  23 +-
 .../components/Select/utils.ts                |  63 +-
 .../SelectItemCheckboxGroup.tsx               |  49 +
 .../SelectItemsPopover/SelectItemPopover.tsx  |  62 ++
 .../SelectItems.stories.tsx                   | 160 ++++
 .../SelectItemsPopover/SelectItems.tsx        | 217 +++++
 .../SelectItemsPopover/__mock.data.ts         | 359 ++++++++
 .../components/SelectItemsPopover/hooks.tsx   | 168 ++++
 .../components/SelectItemsPopover/index.ts    |   1 +
 .../select-items-popover.less                 |   3 +
 .../components/SelectItemsPopover/types.ts    |   0
 .../components/Table/Table.stories.tsx        | 209 ++++-
 .../components/Table/Table.tsx                | 129 ++-
 .../components/Table/components.ts            |  76 +-
 .../components/Table/types.ts                 |  23 +
 .../components/Table/utils.ts                 |   8 +-
 .../components/Timeline/Timeline.stories.tsx  |  69 ++
 .../components/Timeline/Timeline.tsx          |  20 +
 .../components/Timeline/components.tsx        |  14 +
 .../components/Timeline/index.ts              |   1 +
 .../components/Timeline/types.ts              |  17 +
 .../components/Tooltip2/Tooltip2.tsx          |  60 ++
 .../components/Tooltip2/TooltipHeader.tsx     |  77 ++
 .../components/Tooltip2/components.ts         |  41 +
 .../components/Tooltip2/index.ts              |   1 +
 .../components/Tooltip2/types.ts              |  20 +
 .../src/alchemy-components/index.ts           |   6 +
 .../alchemy-components/theme/config/types.ts  |   2 +-
 .../theme/foundations/colors.ts               |   1 +
 datahub-web-react/src/app/AppProviders.tsx    |   5 +-
 .../src/app/EntityRegistryProvider.tsx        |   6 +-
 datahub-web-react/src/app/ProtectedRoutes.tsx |  37 +-
 datahub-web-react/src/app/SearchRoutes.tsx    |  74 +-
 datahub-web-react/src/app/analytics/event.ts  | 116 ++-
 .../components/AnalyticsChart.tsx             |   2 +-
 .../components/AnalyticsPage.tsx              |  54 +-
 .../components/ChartCard.tsx                  |   4 +-
 .../src/app/auth/useGetLogoutHandler.ts       |  17 +
 .../src/app/buildEntityRegistryV2.ts          |  58 ++
 .../src/app/dataviz/ChartCard.tsx             |  55 ++
 .../src/app/dataviz/ChartLoading.tsx          |   3 +
 datahub-web-react/src/app/dataviz/Legend.tsx  |  31 +
 .../src/app/dataviz/bar/BarChart.tsx          | 108 +++
 .../app/dataviz/bar/HorizontalBarChart.tsx    | 157 ++++
 .../dataviz/bar/HorizontalFullBarChart.tsx    | 157 ++++
 .../src/app/dataviz/candle/CandleStick.tsx    |  79 ++
 .../src/app/dataviz/components.ts             |  24 +
 .../src/app/dataviz/constants.ts              |   5 +
 datahub-web-react/src/app/dataviz/index.ts    |   6 +
 .../src/app/dataviz/line/SimpleLineChart.tsx  |  69 ++
 .../src/app/dataviz/pie/PieChart.tsx          |  90 ++
 .../app/dataviz/pie/usePieDataAnnotation.ts   |  36 +
 .../src/app/dataviz/stat/SingleStat.tsx       |   5 +
 datahub-web-react/src/app/dataviz/utils.ts    | 130 +++
 .../src/app/domainV2/CreateDomainModal.tsx    | 231 +++++
 .../domainV2/DomainAutocompleteOptions.tsx    |  53 ++
 .../src/app/domainV2/DomainIcon.tsx           |  11 +
 .../src/app/domainV2/DomainItemMenu.tsx       |  65 ++
 .../src/app/domainV2/DomainListColumns.tsx    |  68 ++
 .../src/app/domainV2/DomainRoutes.tsx         |  58 ++
 .../src/app/domainV2/DomainSearch.tsx         | 123 +++
 .../app/domainV2/DomainSearchResultItem.tsx   |  68 ++
 .../src/app/domainV2/DomainsContext.tsx       |  17 +
 .../src/app/domainV2/DomainsList.tsx          | 208 +++++
 .../app/domainV2/EmptyDomainDescription.tsx   |  39 +
 .../src/app/domainV2/EmptyDomainsSection.tsx  |  69 ++
 .../src/app/domainV2/ManageDomainsPage.tsx    |  44 +
 .../src/app/domainV2/__tests__/utils.test.ts  | 179 ++++
 .../nestedDomains/DomainsSidebarHeader.tsx    |  56 ++
 .../nestedDomains/ManageDomainsPageV2.tsx     |  68 ++
 .../nestedDomains/ManageDomainsSidebar.tsx    | 123 +++
 .../domainV2/nestedDomains/RootDomains.tsx    |  57 ++
 .../domainNavigator/DomainNavigator.tsx       |  50 ++
 .../domainNavigator/DomainNode.tsx            | 234 +++++
 .../src/app/domainV2/useListDomains.tsx       |  27 +
 datahub-web-react/src/app/domainV2/utils.ts   | 146 +++
 datahub-web-react/src/app/entity/Entity.tsx   |  17 +-
 .../src/app/entity/EntityRegistry.tsx         |  10 +-
 .../src/app/entity/dataset/DatasetEntity.tsx  |   2 +-
 .../entity/dataset/profile/OperationsTab.tsx  |   5 +-
 .../dataset/profile/__tests__/Schema.test.tsx |   2 +-
 .../stats/historical/charts/StatChart.tsx     |   2 +-
 .../domain/preview/DomainEntitiesSnippet.tsx  |  12 +-
 .../app/entity/group/AddGroupMembersModal.tsx |   2 +-
 .../entity/group/GroupOwnerSideBarSection.tsx |  17 +-
 .../src/app/entity/query/QueryEntity.tsx      |  97 ++
 .../src/app/entity/shared/EntityContext.ts    |   9 +-
 .../shared/__tests__/siblingsUtils.test.ts    |  15 +
 .../styled/ExpandedOwner/ExpandedOwner.tsx    |   6 +-
 .../containers/profile/EntityProfile.tsx      |   2 +-
 .../DataProduct/DataProductSection.tsx        |   3 +-
 .../sidebar/Ownership/EditOwnersModal.tsx     |   8 +-
 .../sidebar/OwnershipTypeSection.tsx          |   1 +
 .../sidebar/SidebarSiblingsSection.tsx        |   2 +-
 .../entity/shared/containers/profile/utils.ts |   9 +-
 .../entity/shared/embed/EmbeddedProfile.tsx   |   2 +-
 .../entity/shared/entityForm/FormByEntity.tsx |  15 +-
 .../shared/entityForm/__tests__/Form.test.tsx |   2 +-
 .../src/app/entity/shared/siblingUtils.ts     | 277 +++++-
 .../Schema/components/PropertyTypeLabel.tsx   |  15 +-
 .../tabs/Dataset/Validations/acrylTypes.tsx   |  21 +
 .../__tests__/DocumentationTab.test.tsx       |   2 +-
 .../Entity/__tests__/DataJobFlowTab.test.tsx  |   2 +-
 .../shared/tabs/Incident/incidentUtils.ts     |   1 +
 .../tabs/Properties/AddPropertyButton.tsx     |  16 +-
 .../src/app/entity/shared/types.ts            |  23 +-
 .../src/app/entity/shared/useEntityState.ts   |   7 +
 .../src/app/entity/shared/utils.ts            |   6 +-
 .../src/app/entityV2/Access/RoleEntity.tsx    |  99 +++
 .../app/entityV2/Access/RoleEntityProfile.tsx |  75 ++
 .../src/app/entityV2/DefaultEntity.tsx        |  37 +
 datahub-web-react/src/app/entityV2/Entity.tsx | 240 +++++
 .../src/app/entityV2/EntityPage.tsx           | 124 +++
 .../src/app/entityV2/EntityRegistry.tsx       | 369 ++++++++
 .../BusinessAttributeEntity.tsx               | 157 ++++
 .../businessAttribute/preview/Preview.tsx     |  40 +
 .../preview/_tests_/Preview.test.tsx          |  26 +
 .../BusinessAttributeDataTypeSection.tsx      |  98 ++
 .../BusinessAttributeRelatedEntity.tsx        |  43 +
 .../src/app/entityV2/chart/ChartEntity.tsx    | 391 ++++++++
 .../entityV2/chart/preview/ChartPreview.tsx   | 137 +++
 .../stats/ChartStatsSummarySubHeader.tsx      |  26 +
 .../chart/shared/ChartStatsSummary.tsx        | 113 +++
 .../chart/summary/ChartFieldsTable.tsx        | 121 +++
 .../chart/summary/ChartSummaryOverview.tsx    | 118 +++
 .../chart/summary/ChartSummaryTab.tsx         |  67 ++
 .../entityV2/chart/summary/EmbedPreview.tsx   |  28 +
 .../chart/summary/FieldTableByTag.tsx         |  33 +
 .../chart/summary/SummaryQuerySection.tsx     |  75 ++
 .../entityV2/chart/summary/TableauEmbed.tsx   |  40 +
 .../chart/summary/styledComponents.ts         |  32 +
 .../entityV2/chart/summary/useGetTagFields.ts |  16 +
 .../container/ContainerEntitiesTab.tsx        |  25 +
 .../entityV2/container/ContainerEntity.tsx    | 279 ++++++
 .../container/ContainerSummaryTab.tsx         |  15 +
 .../entityV2/container/preview/Preview.tsx    | 110 +++
 .../tableau/TableauDataSourcesSection.tsx     |  56 ++
 .../container/tableau/TableauViewsSection.tsx |  55 ++
 .../tableau/TableauWorkbookSummaryTab.tsx     |  15 +
 .../entityV2/dashboard/DashboardEntity.tsx    | 404 +++++++++
 .../dashboard/preview/DashboardPreview.tsx    | 143 +++
 .../DashboardStatsSummarySubHeader.tsx        |  28 +
 .../shared/DashboardStatsSummary.tsx          | 117 +++
 .../summary/DashboardSummaryOverview.tsx      | 157 ++++
 .../dashboard/summary/DashboardSummaryTab.tsx |  33 +
 .../app/entityV2/dataFlow/DataFlowEntity.tsx  | 263 ++++++
 .../app/entityV2/dataFlow/preview/Preview.tsx | 110 +++
 .../app/entityV2/dataJob/DataJobEntity.tsx    | 329 +++++++
 .../app/entityV2/dataJob/preview/Preview.tsx  | 122 +++
 .../src/app/entityV2/dataJob/tabs/RunsTab.tsx | 168 ++++
 .../dataPlatform/DataPlatformEntity.tsx       |  77 ++
 .../DataPlatformInstanceEntity.tsx            |  65 ++
 .../DataProcessInstanceEntity.tsx             | 265 ++++++
 .../dataProcessInstance/preview/Preview.tsx   | 103 +++
 .../dataProduct/AddOutputPortCard.tsx         |  23 +
 .../entityV2/dataProduct/AssetsSections.tsx   |  95 ++
 .../dataProduct/DataProductEntitiesTab.tsx    |  23 +
 .../dataProduct/DataProductEntity.tsx         | 268 ++++++
 .../dataProduct/DataProductSummaryTab.tsx     |  15 +
 .../dataProduct/OutputPortsSection.tsx        | 112 +++
 .../src/app/entityV2/dataProduct/constants.ts |   1 +
 .../generateUseListDataProductAssets.ts       |  23 +
 .../generateUseListDataProductAssetsCount.ts  |  16 +
 .../entityV2/dataProduct/preview/Preview.tsx  |  70 ++
 .../app/entityV2/dataset/DatasetEntity.tsx    | 517 +++++++++++
 .../app/entityV2/dataset/preview/Preview.tsx  | 155 ++++
 .../app/entityV2/dataset/profile/Lineage.tsx  |  62 ++
 .../dataset/profile/OperationsTab.tsx         | 247 ++++++
 .../dataset/profile/UsageFacepile.tsx         |  42 +
 .../profile/__tests__/Lineage.test.tsx        |  22 +
 .../profile/__tests__/Properties.test.tsx     |  24 +
 .../dataset/profile/__tests__/Schema.test.tsx | 398 +++++++++
 .../__tests__/SchemaDescriptionField.test.tsx |  66 ++
 .../dataset/profile/__tests__/Stats.test.tsx  | 155 ++++
 .../schema/translateFieldPath.test.tsx        |  33 +
 .../schema/translateFieldPathSegment.test.tsx |  39 +
 .../profile/__tests__/schema/utils.test.tsx   |  49 +
 .../schema/components/CustomPagination.tsx    | 113 +++
 .../components/InteriorTitleContent.tsx       | 132 +++
 .../components/SchemaDescriptionField.tsx     | 255 ++++++
 .../components/SchemaFilterSelectContent.tsx  |  71 ++
 .../schema/components/SchemaHeader.tsx        | 210 +++++
 .../schema/components/SchemaRawView.tsx       |  36 +
 .../profile/schema/components/SchemaRow.tsx   |  13 +
 .../schema/components/SchemaSearchInput.tsx   | 175 ++++
 .../components/SchemaVersionSummary.tsx       |  52 ++
 .../components/StructuredPropValues.tsx       |  69 ++
 .../profile/schema/components/TypeIcon.tsx    | 113 +++
 .../schema/components/VersionSelector.tsx     | 153 ++++
 .../dataset/profile/schema/utils/constants.ts |   4 +
 .../schema/utils/schemaTitleRenderer.tsx      |  24 +
 .../schema/utils/schemaTypeRenderer.tsx       |  41 +
 .../schema/utils/translateFieldPath.tsx       |  24 +
 .../utils/translateFieldPathSegment.tsx       |  53 ++
 .../dataset/profile/schema/utils/types.ts     |  16 +
 .../dataset/profile/schema/utils/utils.ts     | 283 ++++++
 .../entityV2/dataset/profile/stats/Stats.tsx  |  40 +
 .../dataset/profile/stats/StatsSection.tsx    |  34 +
 .../stats/historical/HistoricalStatsView.tsx  | 230 +++++
 .../historical/charts/ProfilingRunsChart.tsx  |  91 ++
 .../stats/historical/charts/StatChart.tsx     |  96 ++
 .../stats/snapshot/LatestStatsView.tsx        |  36 +
 .../stats/snapshot/SnapshotStatsView.tsx      | 180 ++++
 .../stats/DatasetStatsSummarySubHeader.tsx    |  48 +
 .../dataset/profile/stories/documentation.ts  |  13 +
 .../profile/stories/lineageEntities.ts        | 101 +++
 .../dataset/profile/stories/properties.ts     |  10 +
 .../dataset/profile/stories/sampleSchema.ts   | 366 ++++++++
 .../entityV2/dataset/profile/stories/stats.ts |  73 ++
 .../dataset/shared/DatasetStatsSummary.tsx    | 122 +++
 .../entityV2/dataset/shared/ExpandingStat.tsx |  47 +
 .../dataset/shared/FormattedBytesStat.tsx     |  12 +
 .../CreateDataProductModal.tsx                |  80 ++
 .../DataProductBuilderForm.tsx                |  52 ++
 .../DataProductsTab/DataProductResult.tsx     |  91 ++
 .../DataProductsTab/DataProductsTab.tsx       | 171 ++++
 .../DataProductsTab/EditDataProductModal.tsx  |  69 ++
 .../entityV2/domain/DataProductsTab/types.ts  |   4 +
 .../app/entityV2/domain/DomainEntitiesTab.tsx |  36 +
 .../src/app/entityV2/domain/DomainEntity.tsx  | 236 +++++
 .../domain/preview/DomainEntitiesSnippet.tsx  |  45 +
 .../app/entityV2/domain/preview/Preview.tsx   |  66 ++
 .../domain/summary/ContentSectionLoading.tsx  |  24 +
 .../domain/summary/ContentsSection.tsx        | 102 +++
 .../domain/summary/DataProductsSection.tsx    |  93 ++
 .../domain/summary/DocumentationSection.tsx   |  98 ++
 .../domain/summary/DomainSummaryTab.tsx       |  17 +
 .../entityV2/domain/summary/OwnerDetail.tsx   |  56 ++
 .../entityV2/domain/summary/OwnersSection.tsx |  89 ++
 .../app/entityV2/glossaryNode/ChildrenTab.tsx |  39 +
 .../glossaryNode/GlossaryNodeEntity.tsx       | 202 +++++
 .../glossaryNode/_tests_/utils.test.ts        |  65 ++
 .../entityV2/glossaryNode/preview/Preview.tsx |  45 +
 .../src/app/entityV2/glossaryNode/utils.ts    |   8 +
 .../GlossaryRelatedAssetsTabHeader.tsx        |  54 ++
 .../glossaryTerm/GlossaryTermEntity.tsx       | 244 +++++
 .../glossaryTerm/_tests_/utils.test.ts        |  83 ++
 .../entityV2/glossaryTerm/preview/Preview.tsx |  57 ++
 .../preview/__tests__/Preview.test.tsx        |  27 +
 .../profile/AddRelatedTermsModal.tsx          | 218 +++++
 .../profile/GlossaryRelatedEntity.tsx         |  56 ++
 .../profile/GlossaryRelatedTerms.tsx          |  70 ++
 .../profile/GlossaryRelatedTermsResult.tsx    | 114 +++
 .../profile/GlossarySidebarAboutSection.tsx   |  53 ++
 .../profile/GlossaryTermHeader.tsx            |  31 +
 .../glossaryTerm/profile/RelatedTerm.tsx      |  83 ++
 .../glossaryTerm/profile/SchemaView.tsx       |  30 +
 .../__tests__/GlossaryRelatedTerms.test.tsx   |  20 +
 .../__tests__/GlossaryTermHeader.test.tsx     |  31 +
 .../profile/useRemoveRelatedTerms.tsx         |  60 ++
 .../src/app/entityV2/glossaryTerm/utils.ts    |  16 +
 .../entityV2/group/AddGroupMembersModal.tsx   | 213 +++++
 .../src/app/entityV2/group/Group.tsx          |  79 ++
 .../src/app/entityV2/group/GroupAssets.tsx    |  28 +
 .../entityV2/group/GroupBasicInfoSection.tsx  |  36 +
 .../src/app/entityV2/group/GroupEditModal.tsx | 153 ++++
 .../entityV2/group/GroupInfoHeaderSection.tsx |  62 ++
 .../app/entityV2/group/GroupMemberLink.tsx    |  37 +
 .../src/app/entityV2/group/GroupMembers.tsx   | 254 ++++++
 .../GroupMembersSidebarSectionContent.tsx     |  41 +
 .../group/GroupOwnerSidebarSectionContent.tsx |  63 ++
 .../src/app/entityV2/group/GroupProfile.tsx   | 224 +++++
 .../entityV2/group/GroupProfileInfoCard.tsx   | 144 +++
 .../src/app/entityV2/group/GroupSidebar.tsx   |  64 ++
 .../group/GroupSidebarMembersSection.tsx      |  20 +
 .../group/GroupSidebarOwnersSection.tsx       |  41 +
 .../app/entityV2/group/preview/Preview.tsx    | 111 +++
 .../entityV2/mlFeature/MLFeatureEntity.tsx    | 251 ++++++
 .../entityV2/mlFeature/preview/Preview.tsx    |  72 ++
 .../mlFeatureTable/MLFeatureTableEntity.tsx   | 229 +++++
 .../mlFeatureTable/preview/Preview.tsx        |  63 ++
 .../mlFeatureTable/profile/Sources.tsx        |  81 ++
 .../features/MlFeatureDataTypeIcon.tsx        |  95 ++
 .../features/MlFeatureTableFeatures.tsx       |  23 +
 .../profile/features/TableOfMlFeatures.tsx    | 160 ++++
 .../app/entityV2/mlModel/MLModelEntity.tsx    | 223 +++++
 .../app/entityV2/mlModel/preview/Preview.tsx  |  53 ++
 .../mlModel/profile/MLModelGroupsTab.tsx      |  48 +
 .../mlModel/profile/MLModelSummary.tsx        |  47 +
 .../mlModel/profile/MlModelFeaturesTab.tsx    |  17 +
 .../mlModelGroup/MLModelGroupEntity.tsx       | 210 +++++
 .../entityV2/mlModelGroup/preview/Preview.tsx |  51 ++
 .../mlModelGroup/profile/ModelGroupModels.tsx |  32 +
 .../mlPrimaryKey/MLPrimaryKeyEntity.tsx       | 235 +++++
 .../entityV2/mlPrimaryKey/preview/Preview.tsx |  61 ++
 .../entityV2/ownership/ManageOwnership.tsx    |  49 +
 .../ownership/OwnershipBuilderModal.tsx       | 225 +++++
 .../app/entityV2/ownership/OwnershipList.tsx  | 132 +++
 .../ownership/table/ActionsColumn.tsx         | 128 +++
 .../ownership/table/DescriptionColumn.tsx     |  19 +
 .../entityV2/ownership/table/NameColumn.tsx   |  19 +
 .../ownership/table/OwnershipTable.tsx        |  60 ++
 .../src/app/entityV2/ownership/table/types.ts |  14 +
 .../src/app/entityV2/query/QueryEntity.tsx    | 126 +++
 .../schemaField/SchemaFieldEntity.tsx         | 114 +++
 .../schemaField/__tests__/utils.test.ts       |  22 +
 .../entityV2/schemaField/preview/Preview.tsx  |  50 ++
 .../src/app/entityV2/schemaField/utils.ts     |  22 +
 .../src/app/entityV2/shared/ActorAvatar.tsx   | 112 +++
 .../CreateGlossaryEntityModal.tsx             | 243 +++++
 .../EntityDropdown/DeleteEntityMenuAction.tsx |  63 ++
 .../EntityDropdown/DomainParentSelect.tsx     | 107 +++
 .../shared/EntityDropdown/EntityDropdown.tsx  | 389 ++++++++
 .../EntityDropdown/EntityMenuActions.tsx      |  97 ++
 .../EntityDropdown/ExternalUrlMenuAction.tsx  |   9 +
 .../EntityDropdown/MoreOptionsMenuAction.tsx  |  43 +
 .../shared/EntityDropdown/MoveDomainModal.tsx | 105 +++
 .../EntityDropdown/MoveEntityMenuAction.tsx   |  49 +
 .../MoveGlossaryEntityModal.tsx               | 106 +++
 .../EntityDropdown/NodeParentSelect.tsx       |  86 ++
 .../RaiseIncidentMenuAction.tsx               |  50 ++
 .../UpdateDeprecationMenuAction.tsx           |  71 ++
 .../EntityDropdown/UpdateDeprecationModal.tsx | 188 ++++
 .../__tests__/NodeParentSelect.test.tsx       |  24 +
 .../entityV2/shared/EntityDropdown/index.tsx  |   3 +
 .../EntityDropdown/styledComponents.tsx       |  39 +
 .../shared/EntityDropdown/useDeleteEntity.tsx |  99 +++
 .../useDeleteGlossaryEntity.tsx               |  55 ++
 .../EntityDropdown/useHandleDeleteDomain.ts   |  27 +
 .../useHandleMoveDomainComplete.ts            |  36 +
 .../EntityDropdown/useParentSelector.ts       |  79 ++
 .../entityV2/shared/EntityDropdown/utils.ts   |  61 ++
 .../src/app/entityV2/shared/EntityGroups.tsx  |  55 ++
 .../EntitySearchInput/EntitySearchInput.tsx   | 179 ++++
 .../EntitySearchInputResult.tsx               |  31 +
 .../entityV2/shared/GlossaryEntityContext.tsx |  46 +
 .../app/entityV2/shared/PreviewContext.tsx    |   9 +
 .../app/entityV2/shared/SearchCardContext.tsx |  15 +
 .../shared/SidebarStyledComponents.tsx        | 400 +++++++++
 .../shared/StyledSyntaxHighlighter.tsx        |   8 +
 .../src/app/entityV2/shared/UrlButton.tsx     |  37 +
 .../shared/__tests__/DeprecationPill.test.tsx |  85 ++
 .../entityV2/shared/__tests__/utils.test.ts   | 173 ++++
 .../CreateEntityAnnouncementModal.tsx         | 261 ++++++
 .../components/ListSearch/AcrylListSearch.tsx | 118 +++
 .../components/legacy/DescriptionModal.tsx    |  85 ++
 .../shared/components/legacy/Properties.tsx   |  30 +
 .../shared/components/styled/AddLinkModal.tsx | 141 +++
 .../shared/components/styled/DemoButton.tsx   |  22 +
 .../components/styled/DeprecationIcon.tsx     | 224 +++++
 .../shared/components/styled/EmptyTab.tsx     |  48 +
 .../components/styled/ExpandedActor.tsx       |  50 ++
 .../components/styled/ExpandedActorGroup.tsx  |  57 ++
 .../styled/ExpandedOwner/ExpandedOwner.tsx    | 119 +++
 .../styled/ExpandedOwner/OwnerContent.tsx     | 143 +++
 .../shared/components/styled/InfoItem.tsx     |  37 +
 .../styled/MarkAsDeprecatedButton.tsx         |  61 ++
 .../shared/components/styled/SeeMore.tsx      |  12 +
 .../shared/components/styled/StatsSummary.tsx |  36 +
 .../components/styled/StripMarkdownText.tsx   |  59 ++
 .../shared/components/styled/StyledButton.tsx |  17 +
 .../components/styled/StyledMDEditor.tsx      |  37 +
 .../shared/components/styled/StyledTable.tsx  |  65 ++
 .../shared/components/styled/StyledTag.tsx    |  59 ++
 .../shared/components/styled/TabToolbar.tsx   |  14 +
 .../styled/search/DownloadAsCsvModal.tsx      | 196 ++++
 .../styled/search/EmbeddedListSearch.tsx      | 413 +++++++++
 .../styled/search/EmbeddedListSearchEmbed.tsx | 116 +++
 .../search/EmbeddedListSearchHeader.tsx       | 137 +++
 .../styled/search/EmbeddedListSearchModal.tsx | 123 +++
 .../search/EmbeddedListSearchResults.tsx      | 295 ++++++
 .../search/EmbeddedListSearchSection.tsx      | 176 ++++
 .../styled/search/EntitySearchResults.tsx     | 194 ++++
 .../styled/search/MatchingViewsLabel.tsx      |  34 +
 .../components/styled/search/SearchSelect.tsx | 212 +++++
 .../styled/search/SearchSelectActions.tsx     | 137 +++
 .../styled/search/SearchSelectBar.tsx         | 133 +++
 .../styled/search/SearchSelectModal.tsx       |  98 ++
 .../styled/search/action/ActionDropdown.tsx   |  75 ++
 .../search/action/DataProductsDropdown.tsx    |  89 ++
 .../styled/search/action/DeleteDropdown.tsx   |  70 ++
 .../search/action/DeprecationDropdown.tsx     |  86 ++
 .../styled/search/action/DomainsDropdown.tsx  |  85 ++
 .../search/action/GlossaryTermsDropdown.tsx   |  55 ++
 .../styled/search/action/OwnersDropdown.tsx   |  51 ++
 .../styled/search/action/TagsDropdown.tsx     |  55 ++
 .../styled/search/downloadAsCsvUtil.ts        | 103 +++
 .../search/navigateToEntitySearchUrl.ts       |  46 +
 .../shared/components/styled/search/types.ts  |  60 ++
 .../search/useInitializeColumnLineageCards.ts |  26 +
 .../search/useInitializeSearchResultCards.ts  |  35 +
 .../entityV2/shared/components/subtypes.tsx   |  66 ++
 .../src/app/entityV2/shared/constants.ts      | 231 +++++
 .../containers/profile/EntityProfile.tsx      | 422 +++++++++
 .../profile/__tests__/EntityHeader.test.tsx   |  95 ++
 .../profile/__tests__/EntityProfile.test.tsx  | 474 ++++++++++
 .../__tests__/PlatformContent.test.tsx        | 134 +++
 .../profile/header/DefaultEntityHeader.tsx    | 250 ++++++
 .../containers/profile/header/EntityCount.tsx |  36 +
 .../profile/header/EntityHeader.tsx           |  79 ++
 .../header/EntityHeaderLoadingSection.tsx     |  32 +
 .../profile/header/EntityHealthPopover.tsx    |  83 ++
 .../profile/header/EntityHealthStatus.tsx     |  49 +
 .../containers/profile/header/EntityName.tsx  | 123 +++
 .../header/EntityPlatformLoadingSection.tsx   |  20 +
 .../containers/profile/header/EntityTabs.tsx  | 127 +++
 .../header/GlossaryPreviewCardDecoration.tsx  |  36 +
 .../header/IconPicker/IconColorPicker.tsx     | 138 +++
 .../profile/header/IconPicker/IconPicker.tsx  | 115 +++
 .../header/PlatformContent/ContainerIcon.tsx  |  33 +
 .../header/PlatformContent/ContainerLink.tsx  |  49 +
 .../PlatformContent/ParentNodesView.tsx       |  96 ++
 .../ParentNodesViewForSearchRedesign.tsx      |  96 ++
 .../PlatformContentContainer.tsx              |  50 ++
 .../PlatformContent/PlatformContentView.tsx   | 157 ++++
 .../PlatformContent/PlatformHeaderIcons.tsx   |  53 ++
 .../PlatformContent/StackPlatformImages.tsx   |  76 ++
 .../header/PlatformContent/constants.ts       |   0
 .../profile/header/PlatformContent/index.ts   |   3 +
 .../header/StructuredPropertyBadge.tsx        |  93 ++
 .../shared/containers/profile/header/utils.ts |  29 +
 .../AboutSection/DescriptionSection.tsx       |  31 +
 .../AboutSection/EmptyContentSection.tsx      |  45 +
 .../sidebar/AboutSection/LinksSection.tsx     |  36 +
 .../AboutSection/SidebarAboutSection.tsx      | 104 +++
 .../sidebar/AboutSection/SourceRefSection.tsx |  37 +
 .../Header/SidebarChartHeaderSection.tsx      | 113 +++
 .../profile/sidebar/Chart/Header/utils.ts     |   8 +
 .../Container/ContainerSelectModal.tsx        | 190 ++++
 .../SidebarContentsLoadingSection.tsx         |   9 +
 .../Container/SidebarContentsSection.tsx      |  81 ++
 .../profile/sidebar/Container/utils.tsx       | 111 +++
 .../Header/SidebarDashboardHeaderSection.tsx  | 115 +++
 .../DataProduct/DataProductSection.tsx        | 117 +++
 .../DataProduct/SetDataProductModal.tsx       | 206 +++++
 .../Header/SidebarDatasetHeaderSection.tsx    | 158 ++++
 .../sidebar/Dataset/StatsSidebarSection.tsx   | 134 +++
 .../View/SidebarViewDefinitionSection.tsx     |  57 ++
 .../profile/sidebar/Domain/SetDomainModal.tsx | 210 +++++
 .../Domain/SidebarDataProductsSection.tsx     |  76 ++
 .../sidebar/Domain/SidebarDomainSection.tsx   | 125 +++
 .../Domain/SidebarEntitiesLoadingSection.tsx  |  10 +
 .../sidebar/Domain/SidebarEntitiesSection.tsx |  91 ++
 .../profile/sidebar/Domain/utils.tsx          | 137 +++
 .../profile/sidebar/EmptySectionText.tsx      |  21 +
 .../profile/sidebar/EntityBackButton.tsx      |  25 +
 .../profile/sidebar/EntityInfo/EntityInfo.tsx |  66 ++
 .../profile/sidebar/EntityProfileSidebar.tsx  | 176 ++++
 .../EntityProfileSidebarSearchHeader.tsx      |  54 ++
 .../profile/sidebar/EntitySidebar.tsx         |  65 ++
 .../sidebar/EntitySidebarSectionsTab.tsx      |  51 ++
 .../profile/sidebar/EntitySidebarTabs.tsx     | 115 +++
 .../profile/sidebar/ExploreLineageAction.tsx  |  62 ++
 .../sidebar/FormInfo/CompletedView.tsx        |  87 ++
 .../profile/sidebar/FormInfo/FormInfo.tsx     |  49 +
 .../sidebar/FormInfo/IncompleteView.tsx       | 108 +++
 .../FormInfo/SidebarFormInfoWrapper.tsx       |  62 ++
 .../profile/sidebar/FormInfo/components.ts    | 104 +++
 .../profile/sidebar/HeaderAndTabs.tsx         |  68 ++
 .../profile/sidebar/LastIngested.tsx          | 181 ++++
 .../Lineage/SidebarLineageLoadingSection.tsx  |  10 +
 .../sidebar/Lineage/SidebarLineageSection.tsx | 159 ++++
 .../profile/sidebar/Lineage/utils.tsx         | 126 +++
 .../containers/profile/sidebar/LinkButton.tsx |  38 +
 .../sidebar/Ownership/EditOwnersModal.tsx     | 431 +++++++++
 .../sidebar/Ownership/LdapFormItem.tsx        |  65 ++
 .../Ownership/OwnershipTypesSelect.tsx        |  43 +
 .../sidebar/Ownership/ownershipUtils.ts       |  46 +
 .../sidebar/OwnershipTypeSection.tsx          |  58 ++
 .../Ownership/sidebar/SidebarOwnerSection.tsx | 129 +++
 .../sidebar/Platform/SelectPlatformModal.tsx  | 187 ++++
 .../profile/sidebar/ProfileSidebarResizer.tsx |  56 ++
 .../Query/SidebarQueryCreatedAtSection.tsx    |  18 +
 .../Query/SidebarQueryDefinitionSection.tsx   |  55 ++
 .../Query/SidebarQueryDescriptionSection.tsx  |  31 +
 .../Query/SidebarQueryOperationsSection.tsx   | 120 +++
 .../Query/SidebarQueryUpdatedAtSection.tsx    |  18 +
 .../SidebarEntityRecommendations.tsx          |  62 ++
 .../SidebarRecommendationsSection.tsx         |  19 +
 .../profile/sidebar/SectionActionButton.tsx   |  53 ++
 .../profile/sidebar/SidebarCollapseIcon.tsx   |  59 ++
 .../sidebar/SidebarCollapsibleHeader.tsx      | 102 +++
 .../sidebar/SidebarCompactSchemaSection.tsx   |  13 +
 .../profile/sidebar/SidebarEntityHeader.tsx   | 106 +++
 .../sidebar/SidebarGlossaryTermsSection.tsx   |  79 ++
 .../profile/sidebar/SidebarHeader.tsx         |  30 +
 .../sidebar/SidebarHeaderSectionColumns.tsx   |  68 ++
 .../profile/sidebar/SidebarLogicSection.tsx   | 184 ++++
 .../profile/sidebar/SidebarSection.tsx        | 119 +++
 .../sidebar/SidebarSiblingsSection.tsx        | 114 +++
 .../profile/sidebar/SidebarTagsSection.tsx    |  83 ++
 .../profile/sidebar/TitleAction.tsx           |  12 +
 .../sidebar/__tests__/LastIngested.test.tsx   |  41 +
 .../__tests__/SidebarLogicSection.test.tsx    | 232 +++++
 .../profile/sidebar/shared/EntityProperty.tsx |  31 +
 .../shared/SidebarPopularityHeaderSection.tsx | 178 ++++
 .../shared/SidebarTopUsersHeaderSection.tsx   |  18 +
 .../profile/sidebar/shared/StatusSection.tsx  | 163 ++++
 .../profile/sidebar/shared/SyncedOrShared.tsx |  90 ++
 .../sidebar/shared/SyncedOrSharedTooltip.tsx  |  66 ++
 .../profile/sidebar/shared/TimeProperty.tsx   |  42 +
 .../sidebar/shared/TopUsersFacepile.tsx       |  38 +
 .../shared/popularity/PopularityIcon.tsx      |  24 +
 .../shared/popularity/PopularityIconBar.tsx   |  31 +
 .../sidebar/shared/styledComponents.ts        |  45 +
 .../profile/sidebar/shared/utils.tsx          | 132 +++
 .../profile/sidebar/tagRenderer.tsx           |  25 +
 .../profile/useGetDataForProfile.ts           |  58 ++
 .../shared/containers/profile/utils.tsx       | 298 +++++++
 .../entityV2/shared/embed/EmbeddedHeader.tsx  | 107 +++
 .../shared/embed/EmbeddedHealthIcon.tsx       |  64 ++
 .../entityV2/shared/embed/EmbeddedProfile.tsx |  96 ++
 .../embed/UpstreamHealth/ActiveIncidents.tsx  |  55 ++
 .../UpstreamHealth/FailingAssertions.tsx      |  82 ++
 .../embed/UpstreamHealth/FailingEntity.tsx    |  60 ++
 .../embed/UpstreamHealth/FailingInputs.tsx    | 111 +++
 .../UpstreamHealth/UpstreamEntitiesList.tsx   |  93 ++
 .../embed/UpstreamHealth/UpstreamHealth.tsx   | 220 +++++
 .../UpstreamHealth/__tests__/utils.test.tsx   |  75 ++
 .../shared/embed/UpstreamHealth/utils.ts      |  62 ++
 .../entityV2/shared/entity/EntityActions.tsx  | 336 +++++++
 .../shared/entity/NonExistentEntityPage.tsx   |   6 +
 .../entityV2/shared/entityForm/EntityForm.tsx |  15 +
 .../shared/entityForm/EntityFormModal.tsx     |  59 ++
 .../shared/externalUrl/ViewInPlatform.tsx     |  99 +++
 .../shared/links/DataProductMiniPreview.tsx   |  80 ++
 .../DataProductMiniPreviewAddDataProduct.tsx  |  62 ++
 .../shared/links/DomainColoredIcon.tsx        |  63 ++
 .../shared/links/DomainMiniPreview.tsx        |  69 ++
 .../shared/links/EntityExternalLink.tsx       |  14 +
 .../shared/links/GlossaryTermMiniPreview.tsx  |  77 ++
 .../links/__tests__/colorUtils.test.tsx       |  38 +
 .../entityV2/shared/notes/NotesSection.tsx    | 232 +++++
 .../sidebarSection/AboutSidebarSection.tsx    |  77 ++
 .../shared/sidebarSection/ShowMoreSection.tsx |  18 +
 .../sidebarSection/SidebarNotesSection.tsx    |  15 +
 .../SidebarStructuredProperties.tsx           | 158 ++++
 .../UserGroupSidebarSection.tsx               |  65 ++
 .../UserOwnershipSideBarSection.tsx           |  59 ++
 .../entityV2/shared/stats/PercentileLabel.tsx |  40 +
 .../stats/__tests__/statsUtils.test.tsx       |  36 +
 .../app/entityV2/shared/stats/statsUtils.ts   |  28 +
 .../shared/summary/HeaderComponents.tsx       |  67 ++
 .../shared/summary/IconComponents.tsx         |  19 +
 .../shared/summary/ListComponents.tsx         |  56 ++
 .../shared/summary/SummaryAboutSection.tsx    |  94 ++
 .../summary/SummaryCreatedBySection.tsx       |  60 ++
 .../AccessManagement/AccessManagement.tsx     | 117 +++
 .../AccessManagerDescription.tsx              |  38 +
 .../__tests__/AccessManagement.test.ts        | 279 ++++++
 .../tabs/Dataset/AccessManagement/utils.tsx   |  27 +
 .../tabs/Dataset/Governance/TestResults.tsx   |  30 +
 .../Dataset/Governance/TestResultsList.tsx    | 112 +++
 .../Dataset/Governance/TestResultsSummary.tsx |  87 ++
 .../tabs/Dataset/Governance/testUtils.tsx     |  49 +
 .../shared/tabs/Dataset/Queries/AddButton.tsx |  45 +
 .../shared/tabs/Dataset/Queries/CopyQuery.tsx |  28 +
 .../Dataset/Queries/EmptyQueriesSection.tsx   | 110 +++
 .../Dataset/Queries/QueriesListSection.tsx    | 263 ++++++
 .../tabs/Dataset/Queries/QueriesTab.tsx       | 207 +++++
 .../shared/tabs/Dataset/Queries/Query.tsx     |  81 ++
 .../tabs/Dataset/Queries/QueryBuilderForm.tsx |  94 ++
 .../Dataset/Queries/QueryBuilderModal.tsx     | 173 ++++
 .../shared/tabs/Dataset/Queries/QueryCard.tsx |  79 ++
 .../tabs/Dataset/Queries/QueryCardDetails.tsx | 133 +++
 .../Dataset/Queries/QueryCardDetailsMenu.tsx  |  65 ++
 .../Dataset/Queries/QueryCardEditButton.tsx   |  24 +
 .../tabs/Dataset/Queries/QueryCardHeader.tsx  |  41 +
 .../tabs/Dataset/Queries/QueryCardQuery.tsx   |  64 ++
 .../Queries/QueryFilters/QueryFilters.tsx     | 106 +++
 .../Queries/QueryFilters/useColumnsFilter.ts  |  83 ++
 .../Queries/QueryFilters/useUsersFilter.ts    |  56 ++
 .../tabs/Dataset/Queries/QueryModal.tsx       | 107 +++
 .../shared/tabs/Dataset/Queries/cacheUtils.ts | 139 +++
 .../tabs/Dataset/Queries/queryColumns.tsx     | 225 +++++
 .../shared/tabs/Dataset/Queries/types.ts      |  29 +
 .../Dataset/Queries/useDownstreamQueries.ts   |  79 ++
 .../Dataset/Queries/useHighlightedQueries.ts  |  50 ++
 .../tabs/Dataset/Queries/usePopularQueries.ts |  85 ++
 .../Dataset/Queries/useQueryTableColumns.tsx  | 228 +++++
 .../tabs/Dataset/Queries/useRecentQueries.ts  |  53 ++
 .../tabs/Dataset/Queries/utils/constants.ts   |  20 +
 .../Dataset/Queries/utils/filterQueries.ts    |  36 +
 .../Dataset/Queries/utils/getCurrentPage.ts   |   8 +
 .../Dataset/Queries/utils/getTopNQueries.ts   |  34 +
 .../tabs/Dataset/Queries/utils/mapQuery.ts    |  28 +
 .../Dataset/Schema/CompactSchemaTable.tsx     | 242 +++++
 .../tabs/Dataset/Schema/SchemaContext.tsx     |  13 +
 .../shared/tabs/Dataset/Schema/SchemaTab.tsx  | 277 ++++++
 .../tabs/Dataset/Schema/SchemaTable.tsx       | 536 +++++++++++
 .../Schema/__tests__/filterSchemaRows.test.ts | 286 ++++++
 .../Schema/components/ConstraintLabels.tsx    |  45 +
 .../Dataset/Schema/components/ExpandIcon.tsx  | 150 ++++
 .../Dataset/Schema/components/MenuColumn.tsx  |  78 ++
 .../Schema/components/NestedRowIcon.tsx       |  44 +
 .../SchemaFieldDrawer/AboutFieldTab.tsx       | 115 +++
 .../SchemaFieldDrawer/DrawerFooter.tsx        |  90 ++
 .../SchemaFieldDrawer/FieldDescription.tsx    | 181 ++++
 .../SchemaFieldDrawer/FieldDetails.tsx        | 169 ++++
 .../SchemaFieldDrawer/FieldHeader.tsx         | 139 +++
 .../SchemaFieldDrawer/FieldPath.tsx           | 112 +++
 .../SchemaFieldDrawer/FieldPopularity.tsx     |  48 +
 .../SchemaFieldDrawer/FieldTags.tsx           |  31 +
 .../SchemaFieldDrawer/FieldTerms.tsx          |  34 +
 .../SchemaFieldDrawer/FieldTitle.tsx          |  26 +
 .../SchemaFieldDrawer/FieldUsageStats.tsx     |  65 ++
 .../SchemaFieldDrawer/PopularityBars.tsx      |  45 +
 .../SchemaFieldDrawer/SampleValuesSection.tsx |  29 +
 .../SchemaFieldDrawer/SchemaFieldDrawer.tsx   | 307 +++++++
 .../SchemaFieldDrawerTabs.tsx                 |  76 ++
 .../SchemaFieldQueriesSidebarTab.tsx          | 200 +++++
 .../SchemaFieldDrawer/StatsSection.tsx        |  39 +
 .../StatsSidebarColumnTab.tsx                 | 158 ++++
 .../SchemaFieldDrawer/StatsSidebarContent.tsx | 195 ++++
 .../SchemaFieldDrawer/StatsSidebarHeader.tsx  | 110 +++
 .../SchemaFieldDrawer/StatsSidebarView.tsx    | 102 +++
 .../SchemaFieldDrawer/StatsSummaryRow.tsx     |  61 ++
 .../SchemaFieldDrawer/TrendDetail.tsx         |  83 ++
 .../SchemaFieldDrawer/components.ts           |  16 +
 .../Dataset/Schema/components/TypeLabel.tsx   |  48 +
 .../Dataset/Schema/history/ChangeEvent.tsx    |  51 ++
 .../Schema/history/ChangeTransactionView.tsx  | 117 +++
 .../Dataset/Schema/history/HistorySidebar.tsx | 139 +++
 .../__tests__/changeEventToString.test.ts     | 102 +++
 .../Schema/history/changeEventToString.ts     |  51 ++
 .../Dataset/Schema/history/historyUtils.ts    |  12 +
 .../Dataset/Schema/useGetEntitySchema.tsx     |  35 +
 .../Dataset/Schema/useKeyboardControls.ts     |  84 ++
 .../Dataset/Schema/useSchemaVersioning.tsx    |  68 ++
 .../useExtractDescriptionInfo.test.ts         |  46 +
 .../useExtractFieldGlossaryTermsInfo.test.ts  | 130 +++
 .../__tests__/useExtractFieldTagsInfo.test.ts | 117 +++
 .../Dataset/Schema/utils/filterSchemaRows.ts  | 136 +++
 .../utils/getExpandedDrawerFieldPath.ts       |  10 +
 .../utils/getFieldDescriptionDetails.ts       |  29 +
 .../utils/getSchemaFilterTypesFromUrl.ts      |  18 +
 .../Dataset/Schema/utils/queryStringUtils.ts  |  11 +
 .../tabs/Dataset/Schema/utils/statsUtil.ts    |   9 +
 .../utils/updateSchemaFilterQueryString.ts    |  32 +
 .../Schema/utils/useDescriptionRenderer.tsx   |  76 ++
 .../utils/useExtractFieldDescriptionInfo.ts   |  28 +
 .../utils/useExtractFieldGlossaryTermsInfo.ts |  18 +
 .../Schema/utils/useExtractFieldTagsInfo.ts   |  16 +
 .../utils/useGetStructuredPropColumns.tsx     |  22 +
 .../utils/useGetTableColumnProperties.ts      |  39 +
 .../Schema/utils/useTagsAndTermsRenderer.tsx  |  54 ++
 .../useTagsAndTermsRendererFeatureTable.tsx   |  42 +
 .../Schema/utils/useUsageStatsRenderer.tsx    |  69 ++
 .../shared/tabs/Dataset/Stats/StatsHeader.tsx |  68 ++
 .../tabs/Dataset/Stats/StatsSection.tsx       |  34 +
 .../shared/tabs/Dataset/Stats/StatsTab.tsx    | 107 +++
 .../shared/tabs/Dataset/Stats/constants.ts    |   1 +
 .../Stats/historical/HistoricalStats.tsx      | 236 +++++
 .../Stats/historical/LookbackWindowSelect.tsx |  33 +
 .../historical/charts/ProfilingRunsChart.tsx  | 111 +++
 .../Stats/historical/charts/StatChart.tsx     | 113 +++
 .../historical/shared/PrefixedSelect.tsx      |  33 +
 .../tabs/Dataset/Stats/lookbackWindows.ts     |  21 +
 .../Dataset/Stats/snapshot/ColumnStats.tsx    | 175 ++++
 .../Dataset/Stats/snapshot/SampleValueTag.tsx |  36 +
 .../Dataset/Stats/snapshot/TableStats.tsx     | 120 +++
 .../shared/tabs/Dataset/Stats/viewType.ts     |   4 +
 .../Timeline/SchemaTimelineSection.tsx        |  99 +++
 .../Validations/AcrylAssertionDetails.tsx     |  38 +
 .../AcrylAssertionDetailsHeader.tsx           | 103 +++
 .../AcrylAssertionResultsChart.tsx            |  62 ++
 .../AcrylAssertionResultsChartHeader.tsx      | 113 +++
 .../AcrylAssertionResultsChartTimeline.tsx    | 115 +++
 .../Validations/AcrylAssertionsList.tsx       |  41 +
 .../AcrylAssertionsSummaryLoading.tsx         |  60 ++
 .../Validations/AcrylAssertionsTable.tsx      | 216 +++++
 .../AcrylAssertionsTableColumns.tsx           | 135 +++
 .../Validations/AcrylValidationsTab.tsx       | 155 ++++
 .../Validations/AssertionGroupHeader.tsx      |  62 ++
 .../AssertionList/AcryAssertionTypeSelect.tsx |  39 +
 .../AssertionList/AcrylAssertionFilters.tsx   |  86 ++
 .../AssertionList/AcrylAssertionList.tsx      | 105 +++
 .../AcrylAssertionListConstants.tsx           |  68 ++
 .../AcrylAssertionListFilters.tsx             | 150 ++++
 .../AcrylAssertionListStatusDot.tsx           |  51 ++
 .../AssertionList/AcrylAssertionListTable.tsx | 152 ++++
 .../AcrylAssertionProgressBar.tsx             |  44 +
 .../AcrylAssertionRecommendedFilters.tsx      |  88 ++
 .../AssertionList/AssertionGroupHeader.tsx    |  54 ++
 .../AssertionListTitleContainer.tsx           |  34 +
 .../AssertionList/AssertionName.tsx           | 123 +++
 .../AssertionList/DataContractBadge.tsx       |  30 +
 .../AssertionList/GroupByTable.tsx            |  84 ++
 .../AssertionList/StyledComponents.tsx        |   9 +
 .../Summary/AcrylAssertionSummaryCard.tsx     | 155 ++++
 .../Summary/AcrylAssertionSummarySection.tsx  |  80 ++
 .../Summary/AcrylAssertionSummaryTab.tsx      |  60 ++
 .../Summary/AcrylAssertionsSummaryLoading.tsx |  32 +
 .../Tags/AcrylAssertionTagColumn.tsx          | 223 +++++
 .../Validations/AssertionList/constant.ts     |  43 +
 .../Validations/AssertionList/hooks.tsx       | 167 ++++
 .../Validations/AssertionList/types.ts        | 109 +++
 .../Validations/AssertionList/utils.tsx       | 496 +++++++++++
 .../Dataset/Validations/AssertionMenu.tsx     |  15 +
 .../Validations/AssertionPlatformAvatar.tsx   |  42 +
 .../Validations/AssertionResultTimeline.tsx   | 133 +++
 .../tabs/Dataset/Validations/Assertions.tsx   |  82 ++
 .../Dataset/Validations/BooleanTimeline.tsx   | 110 +++
 .../DatasetAssertionDescription.tsx           | 408 +++++++++
 .../Validations/DatasetAssertionDetails.tsx   | 259 ++++++
 .../DatasetAssertionLogicModal.tsx            |  24 +
 .../DatasetAssertionResultDetails.tsx         |  42 +
 .../Validations/DatasetAssertionsList.tsx     | 191 ++++
 .../Validations/DatasetAssertionsSummary.tsx  | 105 +++
 .../Validations/FieldAssertionDescription.tsx |  75 ++
 .../FreshnessAssertionDescription.tsx         |  78 ++
 .../SchemaAssertionDescription.tsx            |  28 +
 .../Dataset/Validations/SchemaSummary.tsx     |  71 ++
 .../Validations/SchemaSummaryModal.tsx        |  33 +
 .../Validations/SqlAssertionDescription.tsx   |  16 +
 .../Dataset/Validations/ValidationsTab.tsx    | 101 +++
 .../VolumeAssertionDescription.tsx            |  41 +
 .../__tests__/useGetValidationsTab.test.ts    |  38 +
 .../tabs/Dataset/Validations/acrylTypes.tsx   |  21 +
 .../tabs/Dataset/Validations/acrylUtils.tsx   | 391 ++++++++
 .../builder/details/PrimaryButton.tsx         |  58 ++
 .../Validations/assertion/builder/hooks.ts    | 139 +++
 .../assertion/profile/AssertionProfile.tsx    |  63 ++
 .../profile/AssertionProfileDrawer.tsx        |  21 +
 .../profile/AssertionProfileFooter.tsx        |  51 ++
 .../profile/AssertionProfileHeader.tsx        |  89 ++
 .../profile/AssertionProfileHeaderLoading.tsx |  29 +
 .../assertion/profile/AssertionTabs.tsx       |  77 ++
 .../assertion/profile/actions/ActionItem.tsx  |  60 ++
 .../assertion/profile/actions/Actions.tsx     |  41 +
 .../actions/AssertionListItemActions.tsx      |  75 ++
 .../profile/actions/ContractAction.tsx        | 107 +++
 .../profile/actions/CopyLinkAction.tsx        |  34 +
 .../profile/actions/CopyUrnAction.tsx         |  43 +
 .../profile/actions/ExternalUrlAction.tsx     |  58 ++
 .../profile/actions/styledComponents.tsx      |  37 +
 .../profile/actions/useIsContractsEnabled.tsx |   7 +
 .../profile/shared/AssertionResultDot.tsx     |  28 +
 .../assertion/profile/shared/CloseButton.tsx  |  16 +
 .../profile/shared/isExternalAssertion.tsx    |  15 +
 .../shared/result/AssertionResultPopover.tsx  |  48 +
 .../result/AssertionResultPopoverContent.tsx  | 229 +++++
 .../assertion/profile/shared/utils.ts         |  11 +
 .../profile/summary/AssertionDescription.tsx  |  34 +
 .../summary/AssertionSummaryContent.tsx       |  33 +
 .../summary/AssertionSummaryLoading.tsx       |  31 +
 .../summary/AssertionSummarySection.tsx       |  30 +
 .../profile/summary/AssertionSummaryTab.tsx   |  22 +
 .../profile/summary/NoResultsSummary.tsx      |  15 +
 .../profile/summary/result/popoverUtils.ts    |   0
 .../table/AssertionResultsLoadingItems.tsx    |  32 +
 .../result/table/AssertionResultsTable.tsx    |  93 ++
 .../table/AssertionResultsTableItem.tsx       |  87 ++
 .../timeline/AssertionResultsTimeline.tsx     | 111 +++
 .../timeline/AssertionResultsTimelineViz.tsx  |  88 ++
 .../timeline/AssertionTimelineSkeleton.tsx    |  94 ++
 .../ColumnMetricAssertionsResultsGraph.tsx    |   0
 .../ColumnValueAssertionsResultsGraph.tsx     |   0
 .../CustomSqlAssertionsResultsGraph.tsx       |   0
 .../FreshnessAssertionsResultsGraph.tsx       |   0
 .../summary/result/timeline/TimeSelect.tsx    |  43 +
 .../timeline/VolumeAssertionResultsGraph.tsx  |   0
 .../StatusOverTimeAssertionResultChart.tsx    | 132 +++
 .../summary/result/timeline/charts/types.ts   |  33 +
 .../summary/result/timeline/charts/utils.ts   | 148 ++++
 .../summary/result/timeline/transformers.ts   | 128 +++
 .../profile/summary/result/timeline/utils.ts  |  90 ++
 .../schedule/AssertionScheduleSummary.tsx     | 125 +++
 .../AssertionScheduleSummarySection.tsx       |  72 ++
 .../schedule/ProviderSummarySection.tsx       |  40 +
 .../summary/shared/AssertionResultPill.tsx    |  39 +
 .../summary/shared/DetailedErrorMessage.tsx   |  49 +
 .../shared/DetailedErrorMessageTooltip.tsx    |  34 +
 .../profile/summary/shared/SelectablePill.tsx |  37 +
 .../profile/summary/shared/assertionUtils.ts  |  87 ++
 .../profile/summary/shared/constants.ts       |  66 ++
 .../summary/shared/resultExtractionUtils.ts   | 367 ++++++++
 .../summary/shared/resultMessageUtils.ts      | 112 +++
 .../assertion/profile/summary/utils.tsx       | 537 +++++++++++
 .../Dataset/Validations/assertionUtils.tsx    | 194 ++++
 .../contract/DataContractAssertionStatus.tsx  |  44 +
 .../contract/DataContractSummary.tsx          | 106 +++
 .../contract/DataContractSummaryFooter.tsx    |  75 ++
 .../Validations/contract/DataContractTab.tsx  | 115 +++
 .../contract/DataQualityContractSummary.tsx   | 100 +++
 .../contract/FreshnessContractSummary.tsx     |  96 ++
 .../contract/FreshnessScheduleSummary.tsx     |  42 +
 .../contract/SchemaContractSummary.tsx        |  82 ++
 .../DataContractAssertionGroupSelect.tsx      |  54 ++
 .../contract/builder/DataContractBuilder.tsx  | 191 ++++
 .../builder/DataContractBuilderModal.tsx      |  67 ++
 .../Validations/contract/builder/types.ts     |  37 +
 .../Validations/contract/builder/utils.ts     | 120 +++
 .../Dataset/Validations/contract/utils.tsx    | 115 +++
 .../Validations/fieldDescriptionUtils.ts      | 163 ++++
 .../Dataset/Validations/shared/constant.tsx   |  13 +
 .../Validations/shared/styledComponents.tsx   |  32 +
 .../Validations/useGetValidationsTab.ts       |  35 +
 .../shared/tabs/Dataset/Validations/utils.tsx |  95 ++
 .../tabs/Dataset/View/ViewDefinitionTab.tsx   | 116 +++
 .../tabs/Documentation/DocumentationTab.tsx   | 163 ++++
 .../__tests__/DocumentationTab.test.tsx       |  99 +++
 .../editor/extensions/htmlToMarkdown.test.tsx |  69 ++
 .../editor/extensions/markdownToHtml.test.tsx |  21 +
 .../components/CompactMarkdownViewer.tsx      | 162 ++++
 .../components/DescriptionEditor.tsx          | 209 +++++
 .../components/DescriptionEditorToolbar.tsx   |  60 ++
 .../components/DescriptionPreview.tsx         |  25 +
 .../components/DescriptionPreviewModal.tsx    |  76 ++
 .../components/DescriptionPreviewToolbar.tsx  |  18 +
 .../components/DiscardDescriptionModal.tsx    |  29 +
 .../Documentation/components/LinkList.tsx     |  96 ++
 .../components/SourceDescription.tsx          |  33 +
 .../components/editor/Editor.tsx              | 115 +++
 .../components/editor/EditorTheme.tsx         | 133 +++
 .../components/editor/OnChangeMarkdown.tsx    |  24 +
 .../components/editor/__mocks__/Editor.tsx    |  24 +
 .../editor/__tests__/Editor.test.tsx          |  16 +
 .../editor/extensions/htmlToMarkdown.tsx      | 117 +++
 .../editor/extensions/markdownToHtml.tsx      |  27 +
 .../mentions/DataHubMentionsExtension.tsx     | 138 +++
 .../extensions/mentions/MentionsComponent.tsx |  68 ++
 .../extensions/mentions/MentionsDropdown.tsx  | 114 +++
 .../extensions/mentions/MentionsNodeView.tsx  |  69 ++
 .../extensions/mentions/useDataHubMentions.ts |  63 ++
 .../editor/toolbar/AddImageButton.tsx         |  56 ++
 .../editor/toolbar/AddLinkButton.tsx          |  30 +
 .../editor/toolbar/CodeBlockToolbar.tsx       |  85 ++
 .../editor/toolbar/CommandButton.tsx          |  28 +
 .../editor/toolbar/FloatingToolbar.tsx        | 118 +++
 .../components/editor/toolbar/HeadingMenu.tsx |  66 ++
 .../components/editor/toolbar/Icons.tsx       |  45 +
 .../components/editor/toolbar/LinkModal.tsx   |  82 ++
 .../editor/toolbar/TableCellMenu.tsx          |  71 ++
 .../components/editor/toolbar/Toolbar.tsx     | 133 +++
 .../Documentation/components/editor/utils.ts  |   7 +
 .../shared/tabs/Documentation/utils.ts        |  31 +
 .../entityV2/shared/tabs/Embed/EmbedTab.tsx   |  33 +
 .../shared/tabs/Entity/ChartDashboardsTab.tsx |  19 +
 .../tabs/Entity/ColumnTabNameHeader.tsx       |  12 +
 .../shared/tabs/Entity/DashboardChartsTab.tsx |  13 +
 .../tabs/Entity/DashboardDatasetsTab.tsx      |  19 +
 .../shared/tabs/Entity/DataFlowJobsTab.tsx    |  60 ++
 .../shared/tabs/Entity/DataJobFlowTab.tsx     |  14 +
 .../shared/tabs/Entity/InputFieldsTab.tsx     |  61 ++
 .../shared/tabs/Entity/TabNameWithCount.tsx   |  29 +
 .../Entity/__tests__/DataJobFlowTab.test.tsx  |  42 +
 .../tabs/Entity/components/EntityList.tsx     | 139 +++
 .../DynamicPropertiesTab.tsx                  |  49 +
 .../Entity/weaklyTypedAspects/DynamicTab.tsx  |  50 ++
 .../weaklyTypedAspects/DynamicTabularTab.tsx  |  29 +
 .../weaklyTypedAspects/TableValueElement.tsx  |  29 +
 .../shared/tabs/Incident/IncidentTab.tsx      | 157 ++++
 .../Incident/components/AddIncidentModal.tsx  | 202 +++++
 .../Incident/components/IncidentListItem.tsx  | 330 +++++++
 .../Incident/components/IncidentSummary.tsx   |  86 ++
 .../components/IncidentsLoadingSection.tsx    |  43 +
 .../components/ResolveIncidentModal.tsx       |  54 ++
 .../shared/tabs/Incident/incidentUtils.ts     | 143 +++
 .../tabs/Lineage/ColumnLineageSelect.tsx      | 113 +++
 .../shared/tabs/Lineage/CompactLineageTab.tsx | 253 ++++++
 .../shared/tabs/Lineage/ImpactAnalysis.tsx    |  86 ++
 .../shared/tabs/Lineage/LineageColumnView.tsx | 209 +++++
 .../shared/tabs/Lineage/LineageTab.tsx        |  96 ++
 .../shared/tabs/Lineage/LineageTabContext.tsx |  14 +
 .../tabs/Lineage/LineageTabTimeSelector.tsx   |  48 +
 .../shared/tabs/Lineage/LineageTable.tsx      |  72 ++
 ...oadScrollAcrossLineageSearchResultsHook.ts |  66 ++
 ...rateUseSearchResultsViaRelationshipHook.ts | 136 +++
 .../app/entityV2/shared/tabs/Lineage/hooks.ts |  42 +
 .../app/entityV2/shared/tabs/Lineage/utils.ts |   6 +
 .../tabs/ML/MlFeatureFeatureTableTab.tsx      |  17 +
 .../tabs/ML/MlPrimaryKeyFeatureTableTab.tsx   |  17 +
 .../tabs/Properties/CardinalityLabel.tsx      |  43 +
 .../shared/tabs/Properties/NameColumn.tsx     |  80 ++
 .../shared/tabs/Properties/PropertiesTab.tsx  | 140 +++
 .../Properties/StructuredPropertyTooltip.tsx  |  60 ++
 .../Properties/StructuredPropertyValue.tsx    | 126 +++
 .../shared/tabs/Properties/TabHeader.tsx      |  32 +
 .../shared/tabs/Properties/ValuesColumn.tsx   |  26 +
 .../__tests__/useStructuredProperties.test.ts |  87 ++
 .../tabs/Properties/__tests__/utils.test.ts   |  86 ++
 .../entityV2/shared/tabs/Properties/types.ts  |  25 +
 .../Properties/useStructuredProperties.tsx    | 252 ++++++
 .../useUpdateExpandedRowsFromFilter.ts        |  23 +
 .../entityV2/shared/tabs/Properties/utils.ts  |  67 ++
 .../shared/tabs/__tests__/utils.test.tsx      | 212 +++++
 .../src/app/entityV2/shared/types.ts          |  93 ++
 .../shared/useIsSeparateSiblingsMode.ts       |  28 +
 .../app/entityV2/shared/useQueryParamValue.ts |   9 +
 .../src/app/entityV2/shared/utils.ts          | 296 +++++++
 .../StructuredPropertyEntity.tsx              |  91 ++
 .../app/entityV2/tag/CompactTagProfile.tsx    |  70 ++
 .../src/app/entityV2/tag/Tag.tsx              |  92 ++
 .../src/app/entityV2/tag/TagProfile.tsx       |  40 +
 .../tag/__tests__/TagProfile.test.tsx         |  58 ++
 .../src/app/entityV2/user/User.tsx            |  85 ++
 .../src/app/entityV2/user/UserAssets.tsx      |  28 +
 .../entityV2/user/UserBasicInfoContainer.tsx  |  59 ++
 .../entityV2/user/UserEditProfileModal.tsx    | 277 ++++++
 .../src/app/entityV2/user/UserGroups.tsx      | 142 +++
 .../src/app/entityV2/user/UserHeader.tsx      | 100 +++
 .../src/app/entityV2/user/UserProfile.tsx     | 229 +++++
 .../app/entityV2/user/UserProfileInfoCard.tsx | 104 +++
 .../src/app/entityV2/user/UserSidebar.tsx     |  74 ++
 .../user/__tests__/UserHeader.test.tsx        |  24 +
 .../src/app/entityV2/user/preview/Preview.tsx |  89 ++
 .../src/app/entityV2/view/ManageViews.tsx     |  50 ++
 .../src/app/entityV2/view/ViewTypeLabel.tsx   |  56 ++
 .../src/app/entityV2/view/ViewsList.tsx       | 144 +++
 .../src/app/entityV2/view/ViewsTable.tsx      |  61 ++
 .../app/entityV2/view/__tests__/utils.test.ts |  25 +
 .../app/entityV2/view/builder/ViewBuilder.tsx | 127 +++
 .../entityV2/view/builder/ViewBuilderForm.tsx | 114 +++
 .../view/builder/ViewBuilderModal.tsx         | 103 +++
 .../view/builder/ViewDefinitionBuilder.tsx    | 117 +++
 .../view/builder/__tests__/utils.test.ts      |  23 +
 .../src/app/entityV2/view/builder/types.ts    |  10 +
 .../src/app/entityV2/view/builder/utils.ts    | 130 +++
 .../src/app/entityV2/view/cacheUtils.ts       | 250 ++++++
 .../entityV2/view/menu/ViewDropdownMenu.tsx   | 297 +++++++
 .../view/menu/item/DeleteViewItem.tsx         |  29 +
 .../entityV2/view/menu/item/EditViewItem.tsx  |  29 +
 .../entityV2/view/menu/item/IconItemTitle.tsx |  40 +
 .../view/menu/item/PreviewViewItem.tsx        |  17 +
 .../menu/item/RemoveGlobalDefaultItem.tsx     |  23 +
 .../view/menu/item/RemoveUserDefaultItem.tsx  |  24 +
 .../view/menu/item/SetGlobalDefaultItem.tsx   |  24 +
 .../view/menu/item/SetUserDefaultItem.tsx     |  33 +
 .../app/entityV2/view/menu/item/ViewItem.tsx  |  25 +
 .../app/entityV2/view/select/ViewOption.tsx   | 126 +++
 .../entityV2/view/select/ViewOptionName.tsx   | 213 +++++
 .../view/select/ViewOptionTooltipTitle.tsx    |  22 +
 .../app/entityV2/view/select/ViewSelect.tsx   | 372 ++++++++
 .../view/select/ViewSelectContent.tsx         |  94 ++
 .../view/select/ViewSelectDropdown.tsx        |  55 ++
 .../entityV2/view/select/ViewSelectHeader.tsx | 189 ++++
 .../view/select/ViewSelectPopoverContent.tsx  |  35 +
 .../view/select/ViewsTableColumns.tsx         |  92 ++
 .../view/select/renderSelectedView.tsx        | 139 +++
 .../view/select/renderViewOptionGroup.tsx     |  62 ++
 .../src/app/entityV2/view/select/style.css    |  10 +
 .../entityV2/view/select/styledComponents.tsx | 107 +++
 .../src/app/entityV2/view/select/utils.ts     |  14 +
 .../entityV2/view/shared/DefaultViewIcon.tsx  |  37 +
 .../view/shared/GlobalDefaultViewIcon.tsx     |  13 +
 .../view/shared/UserDefaultViewIcon.tsx       |  13 +
 .../src/app/entityV2/view/types.ts            |  52 ++
 .../src/app/entityV2/view/utils.ts            |  83 ++
 .../GlossaryBrowser/GlossaryBrowser.tsx       |  35 +-
 .../app/glossary/GlossaryBrowser/NodeItem.tsx |  25 +-
 .../app/glossary/GlossaryBrowser/TermItem.tsx |  16 +-
 .../src/app/glossary/GlossaryRoutes.tsx       |  31 +-
 .../app/glossaryV2/BusinessGlossaryPage.tsx   | 131 +++
 .../app/glossaryV2/EmptyGlossarySection.tsx   |  79 ++
 .../GlossaryBrowser/GlossaryBrowser.tsx       | 130 +++
 .../glossaryV2/GlossaryBrowser/NodeItem.tsx   | 270 ++++++
 .../glossaryV2/GlossaryBrowser/TermItem.tsx   | 113 +++
 .../glossaryV2/GlossaryContentProvider.tsx    |  93 ++
 .../app/glossaryV2/GlossaryEntitiesList.tsx   |  96 ++
 .../src/app/glossaryV2/GlossaryEntityItem.tsx | 114 +++
 .../src/app/glossaryV2/GlossaryListCard.tsx   | 238 +++++
 .../src/app/glossaryV2/GlossaryNodeCard.tsx   | 207 +++++
 .../src/app/glossaryV2/GlossaryRoutes.tsx     |  73 ++
 .../src/app/glossaryV2/GlossarySearch.tsx     | 124 +++
 .../src/app/glossaryV2/GlossarySidebar.tsx    |  96 ++
 .../app/glossaryV2/GlossaryStatsProvider.tsx  |  91 ++
 .../app/glossaryV2/__tests__/utils.test.ts    |  55 ++
 .../src/app/glossaryV2/cacheUtils.ts          |  36 +
 .../src/app/glossaryV2/colorUtils.ts          |  30 +
 datahub-web-react/src/app/glossaryV2/utils.ts |  27 +
 .../StructuredProperties.tsx                  |   4 +-
 .../src/app/home/HomePagePosts.tsx            |   2 +
 datahub-web-react/src/app/homeV2/HomePage.tsx |  73 ++
 .../action/announcement/Announcement.tsx      |  55 ++
 .../action/announcement/Announcements.tsx     | 130 +++
 .../useGetUnseenAnnouncements.tsx             |  32 +
 .../src/app/homeV2/action/learn/Resources.tsx | 198 +++++
 .../src/app/homeV2/action/nudge/Domains.tsx   |   0
 .../src/app/homeV2/action/nudge/Glossary.tsx  |   0
 .../src/app/homeV2/action/nudge/Ingestion.tsx |   0
 .../app/homeV2/action/nudge/MetadataTests.tsx |   0
 .../app/homeV2/action/nudge/UserProfile.tsx   |   0
 .../content/HorizontalListSkeletons.tsx       |  69 ++
 .../app/homeV2/content/recent/EntityCard.tsx  | 106 +++
 .../homeV2/content/recent/EntityCardList.tsx  |  67 ++
 .../homeV2/content/recent/RecentActions.tsx   |  51 ++
 .../content/recent/RecentlyEditedOrViewed.tsx |  20 +
 .../app/homeV2/content/recent/constants.ts    |  19 +
 .../content/recent/useGetRecentActions.tsx    |  46 +
 .../src/app/homeV2/content/tabs/CenterTab.tsx |  63 ++
 .../app/homeV2/content/tabs/CenterTabs.tsx    |  93 ++
 .../app/homeV2/content/tabs/CountBadge.tsx    |  31 +
 .../content/tabs/activity/ActivityTab.tsx     |   5 +
 .../tabs/activity/cards/AssertionResult.tsx   |   0
 .../tabs/activity/cards/DocumentationEdit.tsx |   0
 .../tabs/activity/cards/DomainCreate.tsx      |   0
 .../tabs/activity/cards/IncidentStatus.tsx    |   0
 .../tabs/announcements/AnnouncementCard.tsx   |  53 ++
 .../announcements/AnnouncementsSkeleton.tsx   |  46 +
 .../tabs/announcements/AnnouncementsTab.tsx   |  39 +
 .../tabs/announcements/EmptyAnnouncements.tsx |   6 +
 .../announcements/useGetAnnouncements.tsx     |  28 +
 .../content/tabs/discovery/DiscoveryTab.tsx   |  26 +
 .../tabs/discovery/sections/Section.tsx       |  61 ++
 .../sections/dataProducts/DataProductCard.tsx |  86 ++
 .../sections/dataProducts/DataProducts.tsx    |  43 +
 .../dataProducts/useGetDataProducts.tsx       |  46 +
 .../discovery/sections/domains/DomainCard.tsx |  90 ++
 .../discovery/sections/domains/Domains.tsx    |  50 ++
 .../sections/domains/useGetDomains.tsx        |  38 +
 .../insight/InsightStatusProvider.tsx         |  72 ++
 .../discovery/sections/insight/Insights.tsx   | 137 +++
 .../insight/cards/FoundationalAssetsCard.tsx  |  17 +
 .../insight/cards/InsightLoadingCard.tsx      |  21 +
 .../insight/cards/MostFrequentlyUpdated.tsx   |  19 +
 .../insight/cards/MostQueriedCard.tsx         |  19 +
 .../sections/insight/cards/MostRowsCard.tsx   |  18 +
 .../sections/insight/cards/MostUsersCard.tsx  |  19 +
 .../insight/cards/MostViewedDashboards.tsx    |  19 +
 .../insight/cards/NewAssetsGraphCard.tsx      |   6 +
 .../insight/cards/PopularGlossaryTerms.tsx    | 118 +++
 .../cards/RecentlyCreatedDatasetsCard.tsx     |  21 +
 .../cards/RecentlyUpdatedDatasetsCard.tsx     |  21 +
 .../insight/cards/SearchListInsightCard.tsx   | 118 +++
 .../cards/useGetFoundationalAssets.tsx        |  35 +
 .../insight/cards/useGetMostQueried.tsx       |  26 +
 .../sections/insight/cards/useGetMostRows.tsx |  26 +
 .../insight/cards/useGetMostUpdated.tsx       |  26 +
 .../insight/cards/useGetMostUsers.tsx         |  26 +
 .../cards/useGetMostViewedDashboards.tsx      |  26 +
 .../insight/cards/useGetSearchAssets.tsx      |  61 ++
 .../cards/useRecentlyCreatedDatasets.tsx      |  31 +
 .../cards/useRecentlyUpdatedDatasets.tsx      |  31 +
 .../sections/insight/shared/InsightCard.tsx   |  60 ++
 .../insight/shared/InsightCardSkeleton.tsx    |  92 ++
 .../sections/platform/PlatformCard.tsx        |  96 ++
 .../discovery/sections/platform/Platforms.tsx |  47 +
 .../sections/platform/useGetDataPlatforms.tsx |  30 +
 .../sections/platform/useGetPlatforms.tsx     |  41 +
 .../src/app/homeV2/content/tabs/tabs.tsx      |  52 ++
 .../src/app/homeV2/content/tabs/types.ts      |   3 +
 .../homeV2/content/tabs/useGetVisibleTabs.tsx |  83 ++
 .../homeV2/introduce/IntroduceYourself.tsx    |  26 +
 .../IntroduceYourselfLeftSidebar.tsx          |  53 ++
 .../IntroduceYourselfMainContent.tsx          | 553 ++++++++++++
 .../app/homeV2/introduce/PersonaSelector.tsx  |  79 ++
 .../useRedirectToIntroduceYourself.tsx        |  19 +
 .../src/app/homeV2/layout/CenterContent.tsx   |  68 ++
 .../src/app/homeV2/layout/CustomNavLink.tsx   |  90 ++
 .../src/app/homeV2/layout/LeftSidebar.tsx     | 127 +++
 .../src/app/homeV2/layout/NavLinks.tsx        |  17 +
 .../src/app/homeV2/layout/NavLinksMenu.tsx    | 295 ++++++
 .../src/app/homeV2/layout/NavSidebar.tsx      | 142 +++
 .../src/app/homeV2/layout/RightSidebar.tsx    |  55 ++
 .../layout/navBarRedesign/NavBarContext.tsx   | 111 +++
 .../layout/navBarRedesign/NavBarHeader.tsx    |  71 ++
 .../layout/navBarRedesign/NavBarMenu.tsx      |  77 ++
 .../layout/navBarRedesign/NavBarMenuItem.tsx  | 147 +++
 .../navBarRedesign/NavBarMenuItemDropdown.tsx |  90 ++
 .../navBarRedesign/NavBarMenuItemGroup.tsx    |  18 +
 .../layout/navBarRedesign/NavBarSkeleton.tsx  |  59 ++
 .../layout/navBarRedesign/NavBarToggler.tsx   |  37 +
 .../layout/navBarRedesign/NavSidebar.tsx      | 294 ++++++
 .../app/homeV2/layout/navBarRedesign/types.ts |  69 ++
 .../layout/navBarRedesign/useSelectedKey.ts   |  42 +
 .../homeV2/layout/shared/styledComponents.tsx |  25 +
 .../src/app/homeV2/layout/types.ts            |  30 +
 .../persona/PersonalizationLoadingModal.tsx   |  80 ++
 .../app/homeV2/persona/useLoadUserPersona.tsx |  16 +
 .../src/app/homeV2/persona/useUserPersona.ts  |  41 +
 .../homeV2/reference/header/GreetingText.tsx  |  45 +
 .../homeV2/reference/header/UserHeader.tsx    |  63 ++
 .../reference/header/UserHeaderImage.tsx      |  57 ++
 .../reference/header/getGreetingText.ts       |  10 +
 .../sections/DefaultEmptyEntityList.tsx       |  12 +
 .../homeV2/reference/sections/EntityLink.tsx  | 150 ++++
 .../reference/sections/EntityLinkList.tsx     | 108 +++
 .../sections/EntityLinkListSkeleton.tsx       |  50 ++
 .../sections/assets/AssetsYouOwn.tsx          |  63 ++
 .../sections/assets/EmptyAssetsYouOwn.tsx     |  25 +
 .../sections/assets/useGetAssetsYouOwn.tsx    |  41 +
 .../sections/domains/DataProductsYouOwn.tsx   |   0
 .../sections/domains/DomainsYouOwn.tsx        |  60 ++
 .../sections/domains/EmptyDomainsYouOwn.tsx   |  21 +
 .../sections/domains/useGetDomainsYouOwn.ts   |  40 +
 .../glossary/EmptyGlossaryNodesYouOwn.tsx     |  24 +
 .../sections/glossary/GlossaryNodesYouOwn.tsx |  60 ++
 .../glossary/useGetGlossaryNodesYouOwn.tsx    |  40 +
 .../sections/groups/EmptyGroupsYouAreIn.tsx   |  12 +
 .../sections/groups/GroupsYouAreIn.tsx        |  49 +
 .../sections/groups/useGetGroupsYouAreIn.ts   |  31 +
 .../reference/sections/pinned/PinnedLink.tsx  |  89 ++
 .../sections/pinned/PinnedLinkList.tsx        |  39 +
 .../sections/pinned/PinnedLinkLogo.tsx        |  47 +
 .../reference/sections/pinned/PinnedLinks.tsx |  28 +
 .../sections/pinned/useGetPinnedLinks.tsx     |  28 +
 .../sections/tags/EmptyTagsYouOwn.tsx         |  21 +
 .../reference/sections/tags/TagsYouOwn.tsx    |  65 ++
 .../sections/tags/useGetTagsYouOwn.tsx        |  37 +
 .../src/app/homeV2/reference/types.ts         |   3 +
 .../app/homeV2/shared/__tests__/utils.test.ts |  16 +
 .../src/app/homeV2/shared/types.ts            |  88 ++
 .../updateLastViewedAnnouncementTime.tsx      |  33 +
 .../useGetLastViewedAnnouncementTime.tsx      |  19 +
 .../src/app/homeV2/shared/utils.ts            |   8 +
 .../src/app/identity/user/UserUtils.tsx       |   4 +
 .../src/app/identity/user/useUserTitle.ts     |  30 +
 .../src/app/ingest/ManageIngestionPage.tsx    |  17 +-
 .../src/app/ingest/secret/SecretsList.tsx     |  16 +-
 .../app/ingest/source/IngestionSourceList.tsx |   4 +-
 .../ingest/source/IngestionSourceTable.tsx    |  21 +-
 .../source/IngestionSourceTableColumns.tsx    |  11 +-
 datahub-web-react/src/app/lineage/types.ts    |   6 +
 .../src/app/lineage/utils/constructTree.ts    |   2 +-
 .../app/lineage/utils/extendAsyncEntities.ts  |  10 +-
 .../lineage/utils/useGetLineageTimeParams.ts  |  21 +-
 .../src/app/lineageV2/LineageDisplay.tsx      | 127 +++
 .../LineageEdge/LineageTableEdge.tsx          |  80 ++
 .../lineageV2/LineageEdge/TentativeEdge.tsx   |  52 ++
 .../lineageV2/LineageEntityNode/Column.tsx    | 286 ++++++
 .../LineageEntityNode/ColumnSearch.tsx        |  39 +
 .../lineageV2/LineageEntityNode/Columns.tsx   | 235 +++++
 .../LineageEntityNode/ContainerPath.tsx       |  88 ++
 .../ContractLineageButton.tsx                 |  45 +
 .../LineageEntityNode/ExpandLineageButton.tsx |  86 ++
 .../LineageEntityNode/GhostEntityMenu.tsx     |  82 ++
 .../LineageEntityNode/LineageEntityNode.tsx   | 147 +++
 .../LineageEntityNode/ManageLineageMenu.tsx   | 174 ++++
 .../LineageEntityNode/NodeContents.tsx        | 511 +++++++++++
 .../LineageEntityNode/NodeSkeleton.tsx        |  37 +
 .../SchemaFieldNodeContents.tsx               | 394 +++++++++
 .../LineageEntityNode/components.tsx          |  42 +
 .../useAvoidIntersections.ts                  |  96 ++
 .../LineageEntityNode/useDisplayedColumns.ts  | 151 ++++
 .../useOnClickExpandLineage.ts                |  26 +
 .../src/app/lineageV2/LineageExplorer.tsx     | 137 +++
 .../LineageFilterNodeBasic.tsx                | 174 ++++
 .../LineageFilterNode/LineageFilterSearch.tsx | 118 +++
 .../LineageFilterNode/ShowMoreButton.tsx      | 138 +++
 .../LineageFilterNode/computeOrFilters.ts     |  43 +
 .../useFetchFilterNodeContents.ts             |  81 ++
 .../src/app/lineageV2/LineageGraph.tsx        |  27 +
 .../src/app/lineageV2/LineageSidebar.tsx      | 107 +++
 .../src/app/lineageV2/LineageTimeSelector.tsx | 148 ++++
 .../LineageTransformationNode.tsx             | 166 ++++
 .../app/lineageV2/LineageVisualization.tsx    | 127 +++
 .../lineageV2/LineageVisualizationContext.tsx |  21 +
 .../src/app/lineageV2/NodeBuilder.ts          | 494 +++++++++++
 datahub-web-react/src/app/lineageV2/common.ts | 355 ++++++++
 .../src/app/lineageV2/constants.ts            |   1 +
 .../DownloadLineageScreenshotButton.tsx       |  64 ++
 .../lineageV2/controls/LineageControls.tsx    | 140 +++
 .../controls/LineageSearchFilters.tsx         |  95 ++
 .../controls/LineageTimeRangeControls.tsx     |  15 +
 .../app/lineageV2/controls/SearchControl.tsx  | 197 +++++
 .../lineageV2/controls/StyledPanelButton.tsx  |  14 +
 .../app/lineageV2/controls/ZoomControls.tsx   |  40 +
 .../src/app/lineageV2/controls/common.tsx     |  32 +
 .../src/app/lineageV2/lineageUtils.ts         | 111 +++
 .../lineageV2/manualLineage/AddEntityEdge.tsx | 157 ++++
 .../lineageV2/manualLineage/EntityEdge.tsx    |  65 ++
 .../lineageV2/manualLineage/LineageEdges.tsx  |  86 ++
 .../manualLineage/LineageEntityView.tsx       |  67 ++
 .../manualLineage/ManageLineageModal.tsx      | 204 +++++
 .../lineageV2/manualLineage/UserAvatar.tsx    |  62 ++
 .../manualLineage/_test_/utils.test.ts        |  58 ++
 .../manualLineage/updateNodeContext.ts        |  52 ++
 .../src/app/lineageV2/manualLineage/utils.ts  |  34 +
 datahub-web-react/src/app/lineageV2/types.ts  |  76 ++
 .../app/lineageV2/useAvoidIntersections.ts    |  87 ++
 .../src/app/lineageV2/useBulkEntityLineage.ts | 188 ++++
 .../app/lineageV2/useColumnHighlighting.ts    | 312 +++++++
 .../lineageV2/useComputeGraph/filterNodes.ts  | 140 +++
 .../useComputeGraph/getDisplayedNodes.ts      | 268 ++++++
 .../useComputeGraph/getFineGrainedLineage.ts  | 171 ++++
 .../lineageV2/useComputeGraph/orderNodes.ts   |  41 +
 .../useComputeGraph/useComputeGraph.tsx       |  98 ++
 .../src/app/lineageV2/useLineageV2.ts         |   6 +
 .../src/app/lineageV2/useNodeHighlighting.ts  |  57 ++
 .../app/lineageV2/useSearchAcrossLineage.ts   | 333 +++++++
 .../lineageV2/useShouldHideTransformations.ts |  21 +
 .../src/app/onboarding/OnboardingConfig.tsx   |   2 +
 .../src/app/onboarding/OnboardingContext.tsx  |  21 +
 .../onboarding/OnboardingContextProvider.tsx  |  23 +
 .../src/app/onboarding/OnboardingTour.tsx     |  10 +-
 .../config/EntityProfileOnboardingConfig.tsx  |  15 +
 .../config/HomePageOnboardingConfig.tsx       |   2 +
 .../EntityProfileOnboardingConfig.tsx         | 175 ++++
 .../configV2/HomePageOnboardingConfig.tsx     | 158 ++++
 .../src/app/onboarding/configV2/index.ts      |   5 +
 .../app/onboarding/useHandleOnboardingTour.ts |  34 +
 .../onboarding/useShouldSkipOnboardingTour.ts |   8 +
 .../useUpdateEducationStepsAllowList.tsx      |  28 +-
 .../policy/PolicyPrivilegeForm.tsx            |  11 +-
 .../src/app/previewV2/BrowsePaths.tsx         | 113 +++
 .../src/app/previewV2/CardActionCircle.tsx    |  40 +
 .../ColoredBackgroundPlatformIconGroup.tsx    | 100 +++
 .../src/app/previewV2/CompactView.tsx         | 170 ++++
 .../src/app/previewV2/ContextPath.tsx         | 157 ++++
 .../app/previewV2/ContextPathEntityIcon.tsx   |  35 +
 .../app/previewV2/ContextPathEntityLink.tsx   |  80 ++
 .../app/previewV2/ContextPathSeparator.tsx    |  10 +
 .../src/app/previewV2/DefaultPreviewCard.tsx  | 412 +++++++++
 .../previewV2/DefaultPreviewCardFooter.tsx    | 146 +++
 .../src/app/previewV2/EntityHeader.tsx        | 126 +++
 .../previewV2/EntityPaths/ColumnPathsText.tsx |  70 ++
 .../EntityPaths/ColumnsRelationshipText.tsx   |  39 +
 .../EntityPaths/DisplayedColumns.tsx          |  37 +
 .../app/previewV2/EntityPaths/EntityPaths.tsx |  37 +
 .../EntityPaths/EntityPathsModal.tsx          | 103 +++
 .../src/app/previewV2/Freshness.tsx           |  94 ++
 .../src/app/previewV2/HealthIcon.tsx          |  47 +
 .../src/app/previewV2/HealthPopover.tsx       | 113 +++
 .../previewV2/ImageWIthColoredBackground.tsx  |  77 ++
 .../src/app/previewV2/LineageBadge.tsx        |  70 ++
 .../src/app/previewV2/NotesIcon.tsx           |  36 +
 datahub-web-react/src/app/previewV2/Pills.tsx | 119 +++
 .../PreviewCardFooterRightSection.tsx         | 103 +++
 .../src/app/previewV2/QueryStat.tsx           |  20 +
 .../src/app/previewV2/SearchPill.tsx          | 126 +++
 .../src/app/previewV2/SeeSummaryButton.tsx    |  42 +
 .../src/app/previewV2/__tests__/utils.test.ts |  33 +
 .../src/app/previewV2/shared.tsx              |  10 +
 datahub-web-react/src/app/previewV2/utils.ts  | 157 ++++
 .../HoverEntityTooltipContext.tsx             |  14 +
 .../component/CompactEntityNameList.tsx       |  54 +-
 .../renderer/component/EntityPreviewTag.tsx   |  41 +-
 .../renderer/component/HoverEntityTooltip.tsx |  48 +-
 .../src/app/search/context/SearchContext.tsx  |   6 +-
 .../search/context/SearchContextProvider.tsx  |  22 +-
 .../search/context/SearchResultContext.tsx    |   7 +-
 .../src/app/search/filters/utils.tsx          |  43 +-
 .../combineSiblingsInSearchResults.test.ts    | 120 ++-
 .../src/app/search/utils/constants.ts         |  12 +
 ...ncedSearchFilterOverallUnionTypeSelect.tsx |  46 +
 .../src/app/searchV2/AnalyticsLink.tsx        |  25 +
 .../src/app/searchV2/BrowseEntityCard.tsx     |  65 ++
 .../app/searchV2/ChooseEntityTypeModal.tsx    |  66 ++
 .../src/app/searchV2/CommandK.tsx             |  45 +
 .../src/app/searchV2/EditTextModal.tsx        |  37 +
 .../src/app/searchV2/EmbeddedSearchBar.tsx    |  68 ++
 .../src/app/searchV2/EmptySearchResults.tsx   |  90 ++
 .../src/app/searchV2/SaveAsViewButton.tsx     |  52 ++
 .../src/app/searchV2/SearchBar.tsx            | 531 +++++++++++
 .../searchV2/SearchEntitySidebarContainer.tsx |  43 +
 .../src/app/searchV2/SearchFilterLabel.tsx    | 226 +++++
 .../src/app/searchV2/SearchHeader.tsx         | 176 ++++
 .../src/app/searchV2/SearchPage.tsx           | 267 ++++++
 .../src/app/searchV2/SearchResultList.tsx     | 291 ++++++
 .../src/app/searchV2/SearchResults.tsx        | 418 +++++++++
 .../searchV2/SearchResultsLoadingSection.tsx  |  33 +
 .../searchV2/SearchResultsRecommendations.tsx |  75 ++
 .../src/app/searchV2/SearchablePage.tsx       | 174 ++++
 .../src/app/searchV2/SimpleSearchFilter.tsx   | 132 +++
 .../src/app/searchV2/SimpleSearchFilters.tsx  |  97 ++
 .../src/app/searchV2/ToggleSidebarButton.tsx  |  50 ++
 .../src/app/searchV2/ViewAllSearchItem.tsx    |  46 +
 .../searchV2/__tests__/SearchPage.test.tsx    |  62 ++
 .../app/searchV2/__tests__/constants.test.tsx |   7 +
 .../searchV2/__tests__/filterUtils.test.tsx   | 303 +++++++
 .../advanced/AdvancedFilterCloseButton.tsx    |  31 +
 .../EntitySubTypeAdvancedFilterLabel.tsx      | 105 +++
 .../src/app/searchV2/advanced/styles.ts       |  20 +
 .../autoComplete/AutoCompleteEntity.tsx       | 126 +++
 .../autoComplete/AutoCompleteEntityIcon.tsx   |  32 +
 .../autoComplete/AutoCompleteItem.tsx         |  59 ++
 .../AutoCompletePlatformNames.tsx             |  22 +
 .../searchV2/autoComplete/AutoCompleteTag.tsx |  18 +
 .../AutoCompleteTooltipContent.tsx            |  61 ++
 .../autoComplete/AutoCompleteUser.tsx         |  36 +
 .../autoComplete/ParentContainers.tsx         |  58 ++
 .../autoComplete/RecommendedOption.tsx        |  29 +
 .../searchV2/autoComplete/SectionHeader.tsx   |  39 +
 .../autoComplete/__tests__/utils.test.ts      |  27 +
 .../autoComplete/quickFilters/QuickFilter.tsx |  99 +++
 .../quickFilters/QuickFilters.tsx             |  32 +
 .../autoComplete/quickFilters/utils.tsx       |  35 +
 .../autoComplete/styledComponents.tsx         |  11 +
 .../src/app/searchV2/autoComplete/utils.ts    |  19 +
 .../src/app/searchV2/context/constants.ts     |  55 ++
 .../src/app/searchV2/filters/ActiveFilter.tsx | 103 +++
 .../searchV2/filters/AddFilterDropdown.tsx    | 160 ++++
 .../src/app/searchV2/filters/FilterOption.tsx | 218 +++++
 .../app/searchV2/filters/MoreFilterOption.tsx |  78 ++
 .../src/app/searchV2/filters/MoreFilters.tsx  |  82 ++
 .../app/searchV2/filters/OperatorSelector.tsx |  67 ++
 .../searchV2/filters/OptionsDropdownMenu.tsx  | 119 +++
 .../app/searchV2/filters/ParentEntities.tsx   |  84 ++
 .../app/searchV2/filters/SaveViewButton.tsx   |  69 ++
 .../src/app/searchV2/filters/SearchFilter.tsx |  43 +
 .../searchV2/filters/SearchFilterOptions.tsx  | 159 ++++
 .../app/searchV2/filters/SearchFilterView.tsx |  58 ++
 .../app/searchV2/filters/SearchFilters.tsx    | 108 +++
 .../searchV2/filters/SearchFiltersBuilder.tsx | 159 ++++
 .../filters/SearchFiltersLoadingSection.tsx   |  27 +
 .../searchV2/filters/SearchFiltersSection.tsx |  67 ++
 .../app/searchV2/filters/SelectedFilter.tsx   | 138 +++
 .../filters/SelectedSearchFilters.tsx         |  76 ++
 .../filters/__tests__/operator.test.tsx       |  79 ++
 .../searchV2/filters/__tests__/utils.test.tsx | 469 ++++++++++
 .../src/app/searchV2/filters/constants.ts     |  57 ++
 .../src/app/searchV2/filters/field/fields.tsx | 305 +++++++
 .../app/searchV2/filters/mapFilterOption.tsx  |  56 ++
 .../searchV2/filters/operator/operator.tsx    | 264 ++++++
 .../filters/render/FilterRenderer.tsx         |  29 +
 .../filters/render/FilterRendererRegistry.tsx |  42 +
 .../__tests__/FilterRendererRegistry.test.tsx |  80 ++
 .../searchV2/filters/render/acrylRenderers.ts |   5 +
 .../assertion/HasFailingAssertionsFilter.tsx  |  69 ++
 .../HasFailingAssertionsRenderer.tsx          |  20 +
 .../incident/HasActiveIncidentsFilter.tsx     |  69 ++
 .../incident/HasActiveIncidentsRenderer.tsx   |  20 +
 .../render/shared/BooleanMoreFilter.tsx       |  88 ++
 .../render/shared/BooleanMoreFilterMenu.tsx   |  50 ++
 .../render/shared/BooleanSearchFilter.tsx     |  77 ++
 .../shared/BooleanSimpleSearchFilter.tsx      |  75 ++
 .../render/shared/styledComponents.tsx        |  21 +
 .../src/app/searchV2/filters/render/types.ts  |  29 +
 .../filters/render/useFilterRenderer.tsx      |  16 +
 .../app/searchV2/filters/styledComponents.ts  |  57 ++
 .../src/app/searchV2/filters/types.ts         | 114 +++
 .../src/app/searchV2/filters/useFilterMode.ts |  16 +
 .../filters/useGetBrowseV2LabelOverride.ts    |  32 +
 .../searchV2/filters/useHydrateFilters.tsx    |  71 ++
 .../filters/useSearchFilterAnalytics.ts       |  23 +
 .../filters/useSearchFilterDropdown.tsx       |  73 ++
 .../src/app/searchV2/filters/utils.tsx        | 674 ++++++++++++++
 .../filters/value/BooleanValueMenu.tsx        |  62 ++
 .../searchV2/filters/value/DateRangeMenu.tsx  |  90 ++
 .../searchV2/filters/value/EntityTypeMenu.tsx |  96 ++
 .../filters/value/EntityValueMenu.tsx         |  85 ++
 .../searchV2/filters/value/EnumValueMenu.tsx  |  85 ++
 .../searchV2/filters/value/TextValueInput.tsx |  19 +
 .../searchV2/filters/value/TextValueMenu.tsx  |  46 +
 .../searchV2/filters/value/TimeBucketMenu.tsx |  72 ++
 .../app/searchV2/filters/value/ValueMenu.tsx  | 156 ++++
 .../app/searchV2/filters/value/ValueName.tsx  |  63 ++
 .../searchV2/filters/value/ValueSelector.tsx  |  61 ++
 .../filters/value/styledComponents.tsx        |  15 +
 .../filters/value/useDateRangeFilterValues.ts |  47 +
 .../src/app/searchV2/filters/value/utils.tsx  | 143 +++
 .../src/app/searchV2/matches/GroupedMatch.tsx |  75 ++
 .../matches/MatchContextContainer.tsx         | 127 +++
 .../app/searchV2/matches/MatchedFieldList.tsx | 137 +++
 .../matches/SearchTextHighlighter.tsx         |  42 +
 .../src/app/searchV2/matches/constants.ts     | 129 +++
 .../matches/matchedFieldPathsRenderer.tsx     |   8 +
 .../matches/matchedInputFieldRenderer.tsx     |  40 +
 .../src/app/searchV2/matches/utils.test.ts    | 234 +++++
 .../src/app/searchV2/matches/utils.ts         | 143 +++
 .../searchV2/recommendation/FilterPill.tsx    |  61 ++
 .../recommendation/RecommendedFilters.tsx     |  64 ++
 .../src/app/searchV2/recommendation/types.ts  |   6 +
 .../useGetRecommendedFilters.tsx              |  98 ++
 .../src/app/searchV2/recommendation/utils.ts  |  16 +
 .../SearchCardSlideoutContent.tsx             |  94 ++
 .../app/searchV2/sidebar/BrowseContext.tsx    | 247 ++++++
 .../src/app/searchV2/sidebar/BrowseNode.tsx   | 127 +++
 .../app/searchV2/sidebar/BrowseSidebar.tsx    | 189 ++++
 .../src/app/searchV2/sidebar/EntityBrowse.tsx |  29 +
 .../src/app/searchV2/sidebar/EntityLink.tsx   |  61 ++
 .../src/app/searchV2/sidebar/EntityNode.tsx   | 104 +++
 .../app/searchV2/sidebar/EnvironmentNode.tsx  |  85 ++
 .../app/searchV2/sidebar/ExpandableNode.tsx   | 187 ++++
 .../app/searchV2/sidebar/PlatformBrowse.tsx   |  64 ++
 .../src/app/searchV2/sidebar/PlatformNode.tsx | 178 ++++
 .../app/searchV2/sidebar/SidebarContext.tsx   |  63 ++
 .../searchV2/sidebar/SidebarLoadingError.tsx  |  30 +
 .../__tests__/browseContextUtils.test.ts      |  20 +
 .../searchV2/sidebar/browseContextUtils.ts    |   8 +
 .../src/app/searchV2/sidebar/constants.ts     |   4 +
 .../src/app/searchV2/sidebar/index.tsx        |   3 +
 .../src/app/searchV2/sidebar/types.ts         |  17 +
 .../searchV2/sidebar/useAggregationsQuery.ts  |  91 ++
 .../searchV2/sidebar/useBrowsePagination.tsx  | 107 +++
 .../searchV2/sidebar/useSidebarAnalytics.ts   |  70 ++
 .../searchV2/sidebar/useSidebarEntities.ts    |  34 +
 .../app/searchV2/sidebar/useSidebarFilters.ts |  51 ++
 .../searchV2/sidebar/useSidebarPlatforms.tsx  |  34 +
 .../app/searchV2/sorting/SearchSortSelect.tsx |  55 ++
 .../searchV2/sorting/useGetSortOptions.tsx    |   7 +
 .../src/app/searchV2/sorting/useSortInput.ts  |  13 +
 .../suggestions/SearchQuerySugggester.tsx     |  39 +
 .../useAdvancedSearchSelectFilters.tsx        |  29 +
 .../app/searchV2/useGetSearchQueryInputs.ts   |  40 +
 .../app/searchV2/useSearchAndBrowseVersion.ts |  34 +
 .../src/app/searchV2/useSearchViewAll.ts      |  16 +
 .../src/app/searchV2/useToggleSidebar.ts      |  23 +
 .../__tests__/applyFilterOverrides.test.ts    | 105 +++
 .../utils/__tests__/filterUtils.test.ts       |  45 +
 .../utils/__tests__/generateOrFilters.test.ts | 168 ++++
 .../searchV2/utils/applyFilterOverrides.ts    |  31 +
 .../utils/combineSiblingsInAutoComplete.ts    |  31 +
 .../combineSiblingsInSearchResults.test.ts    | 551 ++++++++++++
 .../utils/combineSiblingsInSearchResults.ts   |  34 +
 .../src/app/searchV2/utils/constants.ts       | 187 ++++
 .../src/app/searchV2/utils/csvUtils.ts        |  25 +
 .../app/searchV2/utils/filterSearchQuery.ts   |   5 +
 .../src/app/searchV2/utils/filterUtils.ts     | 215 +++++
 .../utils/filtersToQueryStringParams.ts       |  36 +
 .../app/searchV2/utils/generateOrFilters.ts   |  81 ++
 .../app/searchV2/utils/hasAdvancedFilters.ts  |  12 +
 .../app/searchV2/utils/navigateToSearchUrl.ts |  38 +
 .../src/app/searchV2/utils/types.ts           |  35 +
 ...wnloadScrollAcrossEntitiesSearchResults.ts |  51 ++
 .../src/app/searchV2/utils/useFilters.ts      |  45 +
 .../src/app/settings/Preferences.tsx          | 121 ++-
 .../src/app/settings/posts/PostsList.tsx      |   8 +-
 .../app/settings/posts/PostsListColumns.tsx   |   9 +-
 .../src/app/settingsV2/AccessTokenModal.tsx   | 106 +++
 .../src/app/settingsV2/AccessTokens.tsx       | 451 ++++++++++
 .../src/app/settingsV2/CreateTokenModal.tsx   | 217 +++++
 .../src/app/settingsV2/Preferences.tsx        | 156 ++++
 .../src/app/settingsV2/SettingsPage.tsx       | 278 ++++++
 .../src/app/settingsV2/features/Feature.tsx   | 184 ++++
 .../src/app/settingsV2/features/Features.tsx  | 116 +++
 .../features/useDocPropagationSettings.ts     |  50 ++
 .../src/app/settingsV2/personal/utils.tsx     |  19 +
 .../app/settingsV2/posts/CreatePostForm.tsx   | 134 +++
 .../app/settingsV2/posts/CreatePostModal.tsx  | 183 ++++
 .../src/app/settingsV2/posts/ManagePosts.tsx  |  46 +
 .../src/app/settingsV2/posts/PostItemMenu.tsx |  70 ++
 .../src/app/settingsV2/posts/PostsList.tsx    | 221 +++++
 .../app/settingsV2/posts/PostsListColumns.tsx |  32 +
 .../src/app/settingsV2/posts/constants.ts     |  13 +
 .../src/app/settingsV2/posts/utils.ts         |  77 ++
 .../src/app/settingsV2/settingsPaths.tsx      |  27 +
 datahub-web-react/src/app/settingsV2/utils.ts |  42 +
 .../src/app/shared/LastUpdated.tsx            | 107 +++
 .../src/app/shared/LinkWrapper.tsx            |  24 +
 .../src/app/shared/MatchesContext.tsx         |  21 +
 .../src/app/shared/ShowMoreSection.tsx        |   9 +-
 .../src/app/shared/TabFullsizedContext.tsx    |  13 +
 .../app/shared/TruncatedTextWithTooltip.tsx   |  31 +
 .../app/shared/__tests__/LinkWrapper.test.tsx |  37 +
 .../TruncatedTextWithTooltip.test.tsx         |  27 +
 .../app/shared/__tests__/pluralize.test.ts    |  34 +
 .../src/app/shared/avatar/getAvatarColor.ts   |   2 +-
 .../AddBusinessAttributeModal.tsx             |   2 +-
 .../src/app/shared/error/ErrorSection.tsx     |   1 +
 .../src/app/shared/recommendation.tsx         |  11 +-
 .../app/shared/share/v2/ShareButtonMenu.tsx   |  30 +
 .../app/shared/share/v2/ShareMenuAction.tsx   |  28 +
 .../share/v2/items/CopyLinkMenuItem.tsx       |  51 ++
 .../shared/share/v2/items/CopyUrnMenuItem.tsx |  40 +
 .../shared/share/v2/items/EmailMenuItem.tsx   |  52 ++
 .../app/shared/share/v2/styledComponents.tsx  | 144 +++
 .../src/app/shared/styleUtils.ts              |  17 +
 .../src/app/shared/subscribe/drawer/utils.tsx |  37 +
 .../src/app/shared/tags/AddTagsTermsModal.tsx | 137 ++-
 datahub-web-react/src/app/shared/textUtil.ts  |  17 +-
 .../src/app/shared/time/timeUtils.tsx         |   8 +-
 .../shared/useEmbeddedProfileLinkProps.tsx    |  14 +
 .../src/app/shared/usePrevious.ts             |   4 +-
 .../src/app/sharedV2/EntitySidebarContext.tsx |  28 +
 .../src/app/sharedV2/__tests__/utils.test.tsx |  50 ++
 .../src/app/sharedV2/ant/OptionalTooltip.tsx  |  16 +
 .../src/app/sharedV2/buttons/BackButton.tsx   |  48 +
 .../app/sharedV2/cards/EntityCountCard.tsx    |  94 ++
 .../app/sharedV2/cards/SummaryEntityCard.tsx  |  17 +
 .../src/app/sharedV2/cards/components.tsx     |  16 +
 .../src/app/sharedV2/cards/filterFromHex.ts   | 313 +++++++
 .../src/app/sharedV2/carousel/Carousel.tsx    | 157 ++++
 .../sharedV2/carousel/HorizontalScroller.tsx  | 160 ++++
 datahub-web-react/src/app/sharedV2/colors.ts  |  34 +
 .../src/app/sharedV2/colors/colorUtils.ts     |  34 +
 .../app/sharedV2/icons/CompactFieldIcon.tsx   |  53 ++
 .../sharedV2/icons/ImageColoredBackground.tsx |  62 ++
 .../src/app/sharedV2/icons/InfoPopover.tsx    |  26 +
 .../src/app/sharedV2/icons/InfoTooltip.tsx    |  33 +
 .../src/app/sharedV2/icons/PlatformIcon.tsx   |  96 ++
 .../src/app/sharedV2/icons/colorUtils.ts      |   7 +
 .../sharedV2/icons/customIcons/CustomIcon.tsx |  14 +
 .../sharedV2/icons/customIcons/add-term.svg   |   3 +
 .../src/app/sharedV2/icons/getTypeIcon.tsx    |  36 +
 .../app/sharedV2/pagination/usePagination.ts  |  19 +
 .../DocumentationPropagationDetails.tsx       | 109 +++
 .../propagation/LabelPropagationDetails.tsx   |  94 ++
 .../propagation/PropagationEntityLink.tsx     |  56 ++
 .../sharedV2/propagation/PropagationIcon.tsx  |  22 +
 .../src/app/sharedV2/propagation/utils.ts     |  30 +
 .../app/sharedV2/search/DownloadButton.tsx    |  42 +
 .../src/app/sharedV2/search/EditButton.tsx    |  35 +
 .../app/sharedV2/search/SearchMenuItems.tsx   |  50 ++
 .../src/app/sharedV2/sidebar/components.tsx   |  42 +
 .../app/sharedV2/sidebar/useSidebarWidth.ts   |  22 +
 .../src/app/sharedV2/sorting/useSorting.ts    |  29 +
 .../src/app/sharedV2/tags/AddTagTerm.tsx      |  50 ++
 .../src/app/sharedV2/tags/DataProductLink.tsx | 131 +++
 .../src/app/sharedV2/tags/DomainLink.tsx      | 117 +++
 .../src/app/sharedV2/tags/TagLink.tsx         |  69 ++
 .../src/app/sharedV2/tags/TagTermGroup.tsx    | 294 ++++++
 .../src/app/sharedV2/tags/tag/Tag.tsx         | 193 ++++
 .../src/app/sharedV2/tags/term/Term.tsx       |  74 ++
 .../app/sharedV2/tags/term/TermContent.tsx    | 211 +++++
 .../tags/usePropagationContextEntities.ts     |  25 +
 .../sharedV2/text/MatchTextSizeWrapper.tsx    |  32 +
 .../src/app/sharedV2/text/OverflowTitle.tsx   |  66 ++
 .../src/app/sharedV2/useGetEntities.ts        |  18 +
 datahub-web-react/src/app/sharedV2/utils.tsx  |  38 +
 .../src/app/useBuildEntityRegistry.ts         |   7 +-
 .../src/app/useEntityRegistry.ts              |   5 +
 datahub-web-react/src/app/useIsThemeV2.tsx    |  78 ++
 .../src/app/useShowNavBarRedesign.tsx         |  38 +
 .../src/app/utils/navigateToUrl.ts            |  22 +
 datahub-web-react/src/app/utils/queryUtils.ts |  15 +
 datahub-web-react/src/appConfigContext.tsx    |  13 +
 datahub-web-react/src/conf/Global.ts          |   8 +
 .../src/conf/theme/global-overrides-v2.less   |  51 ++
 .../src/conf/theme/global-overrides.less      |  29 +
 .../src/conf/theme/global-variables-v2.less   |   2 +
 .../src/conf/theme/theme_dark.config.json     |   4 +-
 .../src/conf/theme/theme_light.config.json    |   2 +
 .../src/conf/theme/theme_v2.config.json       |  57 ++
 datahub-web-react/src/conf/theme/types.ts     |   1 +
 .../src/entityRegistryContext.tsx             |   7 +-
 datahub-web-react/src/graphql/app.graphql     |  13 +
 .../src/graphql/assertion.graphql             |  98 +-
 datahub-web-react/src/graphql/chart.graphql   |   1 +
 .../src/graphql/container.graphql             |  20 +
 .../src/graphql/dashboard.graphql             |   1 +
 .../src/graphql/dataFlow.graphql              |   1 +
 datahub-web-react/src/graphql/dataJob.graphql |   4 +
 .../src/graphql/dataProduct.graphql           |  22 +
 datahub-web-react/src/graphql/dataset.graphql | 133 ++-
 datahub-web-react/src/graphql/domain.graphql  |  25 +
 .../src/graphql/fragments.graphql             | 316 ++++++-
 .../src/graphql/glossary.graphql              |   2 +-
 .../src/graphql/glossaryNode.graphql          |   2 +
 .../src/graphql/glossaryTerm.graphql          |   1 +
 .../src/graphql/incident.graphql              |  30 +
 datahub-web-react/src/graphql/lineage.graphql | 266 +++++-
 datahub-web-react/src/graphql/me.graphql      |   7 +
 .../src/graphql/mlFeature.graphql             |   1 +
 .../src/graphql/mlFeatureTable.graphql        |   1 +
 datahub-web-react/src/graphql/mlModel.graphql |   1 +
 .../src/graphql/mlModelGroup.graphql          |   1 +
 .../src/graphql/mlPrimaryKey.graphql          |   1 +
 .../src/graphql/mutations.graphql             |   4 +
 datahub-web-react/src/graphql/query.graphql   |  32 +
 .../src/graphql/relationships.graphql         |  21 +
 .../src/graphql/schemaField.graphql           |  61 ++
 datahub-web-react/src/graphql/search.graphql  | 135 ++-
 .../src/graphql/timeline.graphql              |  25 +
 datahub-web-react/src/graphql/user.graphql    |  43 +
 datahub-web-react/src/images/acryl_hero.svg   | 497 +++++++++++
 .../src/images/ambulance-icon.svg             |   8 +
 .../src/images/analyticsMenuIcon.svg          |   1 +
 .../src/images/assertion_error_dot.svg        |   8 +
 .../src/images/assertion_failure_dot.svg      |   5 +
 .../src/images/assertion_init_dot.svg         |   5 +
 .../src/images/assertion_no_results_dot.svg   |   5 +
 .../src/images/assertion_success_dot.svg      |   5 +
 .../src/images/assertion_v2_failure_dot.svg   |   3 +
 .../src/images/assertion_v2_success_dot.svg   |   3 +
 .../src/images/datahub-platforms.svg          | 317 +++++++
 .../src/images/deprecated-status.svg          |   3 +
 .../src/images/deprecation-icon.svg           |   4 +
 .../src/images/governMenuIcon.svg             |   1 +
 datahub-web-react/src/images/help-icon.svg    |   3 +
 .../src/images/ingestionMenuIcon.svg          |   1 +
 datahub-web-react/src/images/introduceBg.svg  |   1 +
 .../src/images/lineage-status.svg             |   6 +
 datahub-web-react/src/images/no-docs.svg      |  54 ++
 .../src/images/no-stats-available.svg         |  50 ++
 datahub-web-react/src/images/row-icon.svg     |   3 +
 .../src/images/settingsMenuIcon.svg           |   1 +
 datahub-web-react/src/images/shield-check.svg |   5 +
 .../src/images/shield-exclamation.svg         |   6 +
 .../src/images/sidebarBackArrow.svg           |   3 +
 .../images/tableau-embedded-data-source.svg   |   8 +
 .../images/tableau-published-data-source.svg  |   5 +
 datahub-web-react/src/images/tableau-view.svg |   6 +
 .../src/images/tableau-workbook.svg           |   7 +
 .../src/images/timeline-icon.svg              |   3 +
 .../src/images/trending-down-icon.svg         |   8 +
 .../src/images/trending-up-icon.svg           |   8 +
 datahub-web-react/src/setupTests.ts           |  14 +-
 .../utils/test-utils/TestPageContainer.tsx    |  95 +-
 datahub-web-react/yarn.lock                   | 836 +++++++++++++++++-
 docker/docker-compose.dev.yml                 |   4 +
 .../aspect/utils/DeprecationUtils.java        |  11 +-
 .../request/AggregationQueryBuilder.java      |   4 +
 .../request/AggregationQueryBuilderTest.java  |  34 +-
 .../linkedin/assertion/AssertionSource.pdl    |   2 +
 .../com/linkedin/common/Deprecation.pdl       |   3 +
 .../com/linkedin/common/DisplayProperties.pdl |  20 +
 .../com/linkedin/common/IconLibrary.pdl       |  12 +
 .../com/linkedin/common/IconProperties.pdl    |  22 +
 .../identity/CorpUserAppearanceSettings.pdl   |   5 +
 .../pegasus/com/linkedin/post/PostInfo.pdl    |   8 +-
 .../pegasus/com/linkedin/post/PostType.pdl    |   4 +
 .../src/main/resources/entity-registry.yml    |   1 +
 .../graphql/featureflags/FeatureFlags.java    |   9 +
 .../config/ChromeExtensionConfiguration.java  |  13 +
 .../config/DataHubAppConfiguration.java       |   3 +
 .../src/main/resources/application.yaml       |  15 +-
 .../factory/graphql/GraphQLEngineFactory.java |   1 +
 ...com.linkedin.entity.entities.snapshot.json |   4 +
 ...m.linkedin.platform.platform.snapshot.json |   4 +
 .../datahubusage/DataHubUsageEventType.java   |  14 +-
 .../war/src/main/resources/boot/policies.json |  10 +-
 .../authorization/PoliciesConfig.java         |   7 +
 .../e2e/auto_completeV2/v2_auto_complete.js   |  44 +
 .../cypress/e2e/containersV2/v2_containers.js |  16 +
 .../cypress/e2e/domains/nested_domains.js     |  52 +-
 .../cypress/e2e/domainsV2/v2_domains.js       |  15 +
 .../e2e/domainsV2/v2_nested_domains.js        | 266 ++++++
 .../cypress/e2e/glossaryV2/v2_glossary.js     |  73 ++
 .../cypress/e2e/glossaryV2/v2_glossaryTerm.js | 114 +++
 .../e2e/glossaryV2/v2_glossary_navigation.js  | 147 +++
 .../cypress/cypress/e2e/homeV2/v2_home.js     |  14 +
 .../cypress/e2e/incidentsV2/v2_incidents.js   |  35 +
 .../e2e/lineage/download_lineage_results.js   |   2 +-
 .../lineageV2/v2_download_lineage_results.js  |  92 ++
 .../e2e/lineageV2/v2_impact_analysis.js       | 161 ++++
 .../e2e/lineageV2/v2_lineage_column_level.js  |  58 ++
 .../e2e/lineageV2/v2_lineage_column_path.js   | 105 +++
 .../cypress/e2e/lineageV2/v2_lineage_graph.js | 129 +++
 .../cypress/cypress/e2e/loginV2/v2_login.js   |  14 +
 .../cypress/e2e/mutations/add_users.js        |   2 +-
 .../e2e/mutations/dataset_ownership.js        |  20 +-
 .../cypress/e2e/mutations/ingestion_source.js |   4 +-
 .../manage_ingestion_secret_privilege.js      |   6 +-
 .../e2e/mutationsV2/v2_ingestion_source.js    |  82 ++
 .../e2e/mutationsV2/v2_managed_ingestion.js   |  46 +
 .../e2e/mutationsV2/v2_managing_secrets.js    | 130 +++
 .../e2e/operrationsV2/v2_operations.js        |  15 +
 .../e2e/ownershipV2/v2_manage_ownership.js    |  45 +
 .../cypress/cypress/e2e/query/query_tab.js    |   3 +-
 .../e2e/schema_blameV2/v2_schema_blame.js     |  59 ++
 .../cypress/cypress/e2e/search/search.js      |   2 +-
 .../cypress/e2e/search/searchFilters.js       |   4 +-
 .../cypress/e2e/settings/homePagePost.js      |   2 +-
 .../cypress/e2e/settings/manage_policies.js   |   8 +-
 .../cypress/e2e/settings/managing_groups.js   |   2 +-
 .../cypress/e2e/settingsV2/v2_homePagePost.js | 107 +++
 .../e2e/settingsV2/v2_manage_access_tokens.js |  53 ++
 .../e2e/settingsV2/v2_manage_policies.js      | 143 +++
 .../e2e/settingsV2/v2_managing_groups.js      | 154 ++++
 .../cypress/e2e/siblingsV2/v2_siblings.js     | 153 ++++
 .../cypress/e2e/task_runV2/v2_task_runs.js    |  46 +
 .../cypress/e2e/viewV2/v2_manage_views.js     |  48 +
 .../cypress/e2e/viewV2/v2_view_select.js      |  96 ++
 .../cypress/cypress/e2e/views/view_select.js  |   4 +-
 .../tests/cypress/cypress/support/commands.js |  76 +-
 smoke-test/tests/cypress/data.json            | 366 ++++++++
 smoke-test/tests/cypress/incidents_test.json  | 155 ++++
 smoke-test/tests/cypress/integration_test.py  |   7 +
 1802 files changed, 135920 insertions(+), 1140 deletions(-)
 create mode 100644 datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/incident/IncidentUtils.java
 create mode 100644 datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/UpdateDisplayPropertiesResolver.java
 create mode 100644 datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/siblings/SiblingsSearchResolver.java
 create mode 100644 datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/timeline/GetTimelineResolver.java
 create mode 100644 datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DisplayPropertiesMapper.java
 create mode 100644 datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/post/PostType.java
 create mode 100644 datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/timeline/mappers/ChangeEventMapper.java
 create mode 100644 datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/timeline/mappers/ChangeTransactionMapper.java
 create mode 100644 datahub-graphql-core/src/main/resources/query.graphql
 create mode 100644 datahub-web-react/src/AppV2.less
 create mode 100644 datahub-web-react/src/alchemy-components/components/AvatarStack/AvatarStack.stories.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/AvatarStack/AvatarStack.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/AvatarStack/components.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/AvatarStack/types.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/Bar/Bar.stories.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Bar/Bar.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Bar/components.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/Bar/constant.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/Bar/index.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/Bar/types.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/BarChart/hooks/useAdaptYAccessorToZeroValues.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/BarChart/hooks/useAdaptYScaleToZeroValues.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/BarChart/hooks/useMaxDataValue.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/BarChart/hooks/useMergedProps.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/CalendarChart.stories.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/CalendarChart.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/_tests_/getColorAccessors.test.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/_tests_/prepareCalendarDate.test.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/components.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/constants.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/index.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/AxisBottomMonths.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/AxisLeftWeekdays.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Calendar.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/CalendarContainer.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Day.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Month.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/TickLabel.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Week.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/private/constants.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/private/context.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/types.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/CalendarChart/utils.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/DatePicker/DatePicker.stories.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/DatePicker/DatePicker.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/DatePicker/components.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/DatePicker/constants.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/DatePicker/hooks/useVariantProps.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/DatePicker/index.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/DatePicker/styles.css
 create mode 100644 datahub-web-react/src/alchemy-components/components/DatePicker/types.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/DatePicker/variants/common/props.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/components.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/props.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/types.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/DatePicker/variants/index.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/Drawer/Drawer.stories.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Drawer/Drawer.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Drawer/components.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Drawer/constants.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/Drawer/index.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/Drawer/types.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/GraphCard/GraphCard.stories.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/GraphCard/GraphCard.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/GraphCard/MoreInfoModal.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/GraphCard/components.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/GraphCard/index.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/GraphCard/types.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/IconLabel/IconLabel.stories.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/IconLabel/IconLabel.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/IconLabel/component.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/IconLabel/index.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/IconLabel/types.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/IconLabel/utils.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/IncidentPriorityLabel.stories.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/IncidentPriorityLabel.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/constant.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/index.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/types.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/LineChart/constants.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/LineChart/utils.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/Loader/Loader.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Loader/Loading.stories.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Loader/components.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Loader/constants.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/Loader/index.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/Loader/types.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/SelectLabelRenderer.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectDefault.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectLabeled.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectDefault.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectLabeled.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItemCheckboxGroup.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItemPopover.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItems.stories.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItems.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/SelectItemsPopover/__mock.data.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/SelectItemsPopover/hooks.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/SelectItemsPopover/index.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/SelectItemsPopover/select-items-popover.less
 create mode 100644 datahub-web-react/src/alchemy-components/components/SelectItemsPopover/types.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/Timeline/Timeline.stories.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Timeline/Timeline.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Timeline/components.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Timeline/index.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/Timeline/types.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/Tooltip2/Tooltip2.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Tooltip2/TooltipHeader.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Tooltip2/components.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/Tooltip2/index.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/Tooltip2/types.ts
 create mode 100644 datahub-web-react/src/app/auth/useGetLogoutHandler.ts
 create mode 100644 datahub-web-react/src/app/buildEntityRegistryV2.ts
 create mode 100644 datahub-web-react/src/app/dataviz/ChartCard.tsx
 create mode 100644 datahub-web-react/src/app/dataviz/ChartLoading.tsx
 create mode 100644 datahub-web-react/src/app/dataviz/Legend.tsx
 create mode 100644 datahub-web-react/src/app/dataviz/bar/BarChart.tsx
 create mode 100644 datahub-web-react/src/app/dataviz/bar/HorizontalBarChart.tsx
 create mode 100644 datahub-web-react/src/app/dataviz/bar/HorizontalFullBarChart.tsx
 create mode 100644 datahub-web-react/src/app/dataviz/candle/CandleStick.tsx
 create mode 100644 datahub-web-react/src/app/dataviz/components.ts
 create mode 100644 datahub-web-react/src/app/dataviz/constants.ts
 create mode 100644 datahub-web-react/src/app/dataviz/index.ts
 create mode 100644 datahub-web-react/src/app/dataviz/line/SimpleLineChart.tsx
 create mode 100644 datahub-web-react/src/app/dataviz/pie/PieChart.tsx
 create mode 100644 datahub-web-react/src/app/dataviz/pie/usePieDataAnnotation.ts
 create mode 100644 datahub-web-react/src/app/dataviz/stat/SingleStat.tsx
 create mode 100644 datahub-web-react/src/app/dataviz/utils.ts
 create mode 100644 datahub-web-react/src/app/domainV2/CreateDomainModal.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/DomainAutocompleteOptions.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/DomainIcon.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/DomainItemMenu.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/DomainListColumns.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/DomainRoutes.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/DomainSearch.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/DomainSearchResultItem.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/DomainsContext.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/DomainsList.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/EmptyDomainDescription.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/EmptyDomainsSection.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/ManageDomainsPage.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/__tests__/utils.test.ts
 create mode 100644 datahub-web-react/src/app/domainV2/nestedDomains/DomainsSidebarHeader.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/nestedDomains/ManageDomainsPageV2.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/nestedDomains/ManageDomainsSidebar.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/nestedDomains/RootDomains.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/nestedDomains/domainNavigator/DomainNavigator.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/nestedDomains/domainNavigator/DomainNode.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/useListDomains.tsx
 create mode 100644 datahub-web-react/src/app/domainV2/utils.ts
 create mode 100644 datahub-web-react/src/app/entity/query/QueryEntity.tsx
 create mode 100644 datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/acrylTypes.tsx
 create mode 100644 datahub-web-react/src/app/entity/shared/useEntityState.ts
 create mode 100644 datahub-web-react/src/app/entityV2/Access/RoleEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/Access/RoleEntityProfile.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/DefaultEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/Entity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/EntityPage.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/EntityRegistry.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/businessAttribute/BusinessAttributeEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/businessAttribute/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/businessAttribute/preview/_tests_/Preview.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/chart/ChartEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/chart/preview/ChartPreview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/chart/profile/stats/ChartStatsSummarySubHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/chart/shared/ChartStatsSummary.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/chart/summary/ChartFieldsTable.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/chart/summary/ChartSummaryOverview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/chart/summary/ChartSummaryTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/chart/summary/EmbedPreview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/chart/summary/FieldTableByTag.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/chart/summary/SummaryQuerySection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/chart/summary/TableauEmbed.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/chart/summary/styledComponents.ts
 create mode 100644 datahub-web-react/src/app/entityV2/chart/summary/useGetTagFields.ts
 create mode 100644 datahub-web-react/src/app/entityV2/container/ContainerEntitiesTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/container/ContainerEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/container/ContainerSummaryTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/container/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/container/tableau/TableauDataSourcesSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/container/tableau/TableauViewsSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/container/tableau/TableauWorkbookSummaryTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dashboard/DashboardEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dashboard/preview/DashboardPreview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dashboard/profile/DashboardStatsSummarySubHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dashboard/shared/DashboardStatsSummary.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dashboard/summary/DashboardSummaryOverview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dashboard/summary/DashboardSummaryTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataFlow/DataFlowEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataFlow/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataJob/DataJobEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataJob/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataJob/tabs/RunsTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataPlatform/DataPlatformEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataPlatformInstance/DataPlatformInstanceEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataProcessInstance/DataProcessInstanceEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataProcessInstance/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataProduct/AddOutputPortCard.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataProduct/AssetsSections.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataProduct/DataProductEntitiesTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataProduct/DataProductEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataProduct/DataProductSummaryTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataProduct/OutputPortsSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataProduct/constants.ts
 create mode 100644 datahub-web-react/src/app/entityV2/dataProduct/generateUseListDataProductAssets.ts
 create mode 100644 datahub-web-react/src/app/entityV2/dataProduct/generateUseListDataProductAssetsCount.ts
 create mode 100644 datahub-web-react/src/app/entityV2/dataProduct/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/DatasetEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/Lineage.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/OperationsTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/UsageFacepile.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Lineage.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Properties.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Schema.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/__tests__/SchemaDescriptionField.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Stats.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/translateFieldPath.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/translateFieldPathSegment.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/utils.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/components/CustomPagination.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/components/InteriorTitleContent.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaDescriptionField.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaFilterSelectContent.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaRawView.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaRow.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaSearchInput.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaVersionSummary.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/components/StructuredPropValues.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/components/TypeIcon.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/components/VersionSelector.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/constants.ts
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/schemaTitleRenderer.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/schemaTypeRenderer.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/translateFieldPath.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/translateFieldPathSegment.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/types.ts
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/stats/Stats.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/stats/StatsSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/HistoricalStatsView.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/StatChart.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/LatestStatsView.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/SnapshotStatsView.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/stats/stats/DatasetStatsSummarySubHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/stories/documentation.ts
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/stories/lineageEntities.ts
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/stories/properties.ts
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/stories/sampleSchema.ts
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/profile/stories/stats.ts
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/shared/DatasetStatsSummary.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/shared/ExpandingStat.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/dataset/shared/FormattedBytesStat.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/domain/DataProductsTab/CreateDataProductModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductBuilderForm.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductResult.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductsTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/domain/DataProductsTab/EditDataProductModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/domain/DataProductsTab/types.ts
 create mode 100644 datahub-web-react/src/app/entityV2/domain/DomainEntitiesTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/domain/DomainEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/domain/preview/DomainEntitiesSnippet.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/domain/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/domain/summary/ContentSectionLoading.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/domain/summary/ContentsSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/domain/summary/DataProductsSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/domain/summary/DocumentationSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/domain/summary/DomainSummaryTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/domain/summary/OwnerDetail.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/domain/summary/OwnersSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryNode/ChildrenTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryNode/GlossaryNodeEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryNode/_tests_/utils.test.ts
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryNode/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryNode/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryTerm/GlossaryRelatedAssetsTabHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryTerm/GlossaryTermEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryTerm/_tests_/utils.test.ts
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryTerm/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryTerm/preview/__tests__/Preview.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryTerm/profile/AddRelatedTermsModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTerms.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossarySidebarAboutSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryTermHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryTerm/profile/RelatedTerm.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryTerm/profile/SchemaView.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryTerm/profile/__tests__/GlossaryRelatedTerms.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryTerm/profile/useRemoveRelatedTerms.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/glossaryTerm/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/group/AddGroupMembersModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/group/Group.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/group/GroupAssets.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/group/GroupBasicInfoSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/group/GroupEditModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/group/GroupInfoHeaderSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/group/GroupMemberLink.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/group/GroupMembers.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/group/GroupMembersSidebarSectionContent.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/group/GroupOwnerSidebarSectionContent.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/group/GroupProfile.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/group/GroupProfileInfoCard.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/group/GroupSidebar.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/group/GroupSidebarMembersSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/group/GroupSidebarOwnersSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/group/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/mlFeature/MLFeatureEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/mlFeature/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/mlFeatureTable/MLFeatureTableEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/mlFeatureTable/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/mlFeatureTable/profile/Sources.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/MlFeatureDataTypeIcon.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/MlFeatureTableFeatures.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/TableOfMlFeatures.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/mlModel/MLModelEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/mlModel/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/mlModel/profile/MLModelGroupsTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/mlModel/profile/MLModelSummary.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/mlModel/profile/MlModelFeaturesTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/mlModelGroup/MLModelGroupEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/mlModelGroup/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/mlModelGroup/profile/ModelGroupModels.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/mlPrimaryKey/MLPrimaryKeyEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/mlPrimaryKey/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/ownership/ManageOwnership.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/ownership/OwnershipBuilderModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/ownership/OwnershipList.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/ownership/table/ActionsColumn.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/ownership/table/DescriptionColumn.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/ownership/table/NameColumn.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/ownership/table/OwnershipTable.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/ownership/table/types.ts
 create mode 100644 datahub-web-react/src/app/entityV2/query/QueryEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/schemaField/SchemaFieldEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/schemaField/__tests__/utils.test.ts
 create mode 100644 datahub-web-react/src/app/entityV2/schemaField/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/schemaField/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/ActorAvatar.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/CreateGlossaryEntityModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/DeleteEntityMenuAction.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/DomainParentSelect.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityDropdown.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/ExternalUrlMenuAction.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoreOptionsMenuAction.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveDomainModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveEntityMenuAction.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveGlossaryEntityModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/NodeParentSelect.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/RaiseIncidentMenuAction.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/UpdateDeprecationMenuAction.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/UpdateDeprecationModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/__tests__/NodeParentSelect.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/index.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/styledComponents.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteGlossaryEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/useHandleDeleteDomain.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/useHandleMoveDomainComplete.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/useParentSelector.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityGroups.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInput.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResult.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/GlossaryEntityContext.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/PreviewContext.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/SearchCardContext.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/SidebarStyledComponents.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/StyledSyntaxHighlighter.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/UrlButton.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/__tests__/DeprecationPill.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/__tests__/utils.test.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/announce/CreateEntityAnnouncementModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/ListSearch/AcrylListSearch.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/legacy/DescriptionModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/legacy/Properties.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/AddLinkModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/DemoButton.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/DeprecationIcon.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/EmptyTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedActor.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedActorGroup.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/ExpandedOwner.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/OwnerContent.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/InfoItem.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/MarkAsDeprecatedButton.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/SeeMore.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/StatsSummary.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/StripMarkdownText.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/StyledButton.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/StyledMDEditor.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/StyledTable.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/StyledTag.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/TabToolbar.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/DownloadAsCsvModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearch.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchEmbed.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchResults.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/EntitySearchResults.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/MatchingViewsLabel.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelect.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectActions.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectBar.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/action/ActionDropdown.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DataProductsDropdown.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DeleteDropdown.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DeprecationDropdown.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DomainsDropdown.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/action/GlossaryTermsDropdown.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/action/OwnersDropdown.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/action/TagsDropdown.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/downloadAsCsvUtil.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/navigateToEntitySearchUrl.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/types.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/useInitializeColumnLineageCards.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/styled/search/useInitializeSearchResultCards.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/components/subtypes.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/constants.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/EntityProfile.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityHeader.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityProfile.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/PlatformContent.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityCount.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeaderLoadingSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthPopover.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthStatus.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityName.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityPlatformLoadingSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityTabs.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/IconPicker/IconColorPicker.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/IconPicker/IconPicker.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerIcon.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerLink.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesViewForSearchRedesign.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentContainer.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformHeaderIcons.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/StackPlatformImages.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/constants.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/index.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/header/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/DescriptionSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/EmptyContentSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/LinksSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SourceRefSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/SidebarChartHeaderSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/SidebarContentsLoadingSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/SidebarContentsSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/utils.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dashboard/Header/SidebarDashboardHeaderSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/DataProduct/SetDataProductModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/Header/SidebarDatasetHeaderSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/StatsSidebarSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SetDomainModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDataProductsSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarEntitiesLoadingSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarEntitiesSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/utils.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EmptySectionText.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityBackButton.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityInfo/EntityInfo.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebar.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebarSearchHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebar.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarSectionsTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarTabs.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/ExploreLineageAction.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/CompletedView.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/FormInfo.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/IncompleteView.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/SidebarFormInfoWrapper.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/components.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/HeaderAndTabs.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LastIngested.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageLoadingSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/utils.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LinkButton.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/LdapFormItem.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/OwnershipTypesSelect.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/ProfileSidebarResizer.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryCreatedAtSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryDefinitionSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryDescriptionSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryOperationsSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryUpdatedAtSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarRecommendationsSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SectionActionButton.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapseIcon.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapsibleHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCompactSchemaSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarHeaderSectionColumns.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarLogicSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/TitleAction.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/__tests__/LastIngested.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/__tests__/SidebarLogicSection.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/EntityProperty.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SidebarPopularityHeaderSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SidebarTopUsersHeaderSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/StatusSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SyncedOrShared.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SyncedOrSharedTooltip.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TimeProperty.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TopUsersFacepile.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIcon.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIconBar.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/styledComponents.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/utils.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/tagRenderer.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/useGetDataForProfile.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/containers/profile/utils.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHealthIcon.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/embed/EmbeddedProfile.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/ActiveIncidents.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingAssertions.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingInputs.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamEntitiesList.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamHealth.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/__tests__/utils.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/entity/EntityActions.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/entity/NonExistentEntityPage.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/entityForm/EntityForm.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/entityForm/EntityFormModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/externalUrl/ViewInPlatform.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreviewAddDataProduct.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/links/DomainColoredIcon.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/links/DomainMiniPreview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/links/EntityExternalLink.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/links/GlossaryTermMiniPreview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/links/__tests__/colorUtils.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/notes/NotesSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/sidebarSection/AboutSidebarSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/sidebarSection/ShowMoreSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/sidebarSection/SidebarNotesSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/sidebarSection/SidebarStructuredProperties.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/sidebarSection/UserGroupSidebarSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/sidebarSection/UserOwnershipSideBarSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/stats/PercentileLabel.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/stats/__tests__/statsUtils.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/stats/statsUtils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/summary/HeaderComponents.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/summary/IconComponents.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/summary/ListComponents.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/summary/SummaryAboutSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/summary/SummaryCreatedBySection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagement.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/utils.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResults.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsList.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsSummary.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/testUtils.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/AddButton.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/CopyQuery.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/EmptyQueriesSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesListSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/Query.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderForm.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCard.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetails.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardQuery.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/QueryFilters.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/useColumnsFilter.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/useUsersFilter.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/cacheUtils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/queryColumns.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/types.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useDownstreamQueries.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useHighlightedQueries.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/usePopularQueries.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useQueryTableColumns.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useRecentQueries.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/constants.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/filterQueries.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/getCurrentPage.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/getTopNQueries.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/mapQuery.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/CompactSchemaTable.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaContext.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTable.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/__tests__/filterSchemaRows.test.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/ConstraintLabels.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/ExpandIcon.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/MenuColumn.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/NestedRowIcon.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/AboutFieldTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/DrawerFooter.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDetails.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPath.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPopularity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTags.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTerms.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTitle.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/PopularityBars.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SampleValuesSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawerTabs.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldQueriesSidebarTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarColumnTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarContent.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarView.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSummaryRow.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/TrendDetail.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/TypeLabel.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/ChangeEvent.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/ChangeTransactionView.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/HistorySidebar.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/__tests__/changeEventToString.test.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/changeEventToString.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/historyUtils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useGetEntitySchema.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useKeyboardControls.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useSchemaVersioning.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractDescriptionInfo.test.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractFieldGlossaryTermsInfo.test.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractFieldTagsInfo.test.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/filterSchemaRows.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getExpandedDrawerFieldPath.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getSchemaFilterTypesFromUrl.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/queryStringUtils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/statsUtil.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/updateSchemaFilterQueryString.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldDescriptionInfo.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldGlossaryTermsInfo.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldTagsInfo.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useGetStructuredPropColumns.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useGetTableColumnProperties.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/constants.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/ColumnStats.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/SampleValueTag.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/TableStats.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/viewType.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Timeline/SchemaTimelineSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetails.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetailsHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChart.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartTimeline.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsList.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsSummaryLoading.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTable.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTableColumns.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylValidationsTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionGroupHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcryAssertionTypeSelect.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionFilters.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionList.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListConstants.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListFilters.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListStatusDot.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListTable.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionProgressBar.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionRecommendedFilters.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionGroupHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionListTitleContainer.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionName.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/DataContractBadge.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/GroupByTable.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/StyledComponents.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummaryCard.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummarySection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummaryTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionsSummaryLoading.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Tags/AcrylAssertionTagColumn.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/constant.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/hooks.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/utils.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionMenu.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionPlatformAvatar.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionResultTimeline.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/Assertions.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/BooleanTimeline.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsSummary.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FieldAssertionDescription.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FreshnessAssertionDescription.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaAssertionDescription.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaSummary.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaSummaryModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SqlAssertionDescription.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/ValidationsTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/VolumeAssertionDescription.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylTypes.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylUtils.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/details/PrimaryButton.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/hooks.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfile.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileDrawer.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileFooter.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileHeaderLoading.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionTabs.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ActionItem.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/Actions.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/AssertionListItemActions.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ContractAction.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyLinkAction.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyUrnAction.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ExternalUrlAction.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/styledComponents.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/useIsContractsEnabled.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/AssertionResultDot.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/CloseButton.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/isExternalAssertion.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopover.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopoverContent.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionDescription.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryContent.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryLoading.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummarySection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/NoResultsSummary.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/popoverUtils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsLoadingItems.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsTable.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsTableItem.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionResultsTimeline.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionResultsTimelineViz.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionTimelineSkeleton.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/ColumnMetricAssertionsResultsGraph.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/ColumnValueAssertionsResultsGraph.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/CustomSqlAssertionsResultsGraph.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/FreshnessAssertionsResultsGraph.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/TimeSelect.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/VolumeAssertionResultsGraph.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/StatusOverTimeAssertionResultChart.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/types.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/transformers.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummary.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummarySection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/ProviderSummarySection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/AssertionResultPill.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessage.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessageTooltip.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/SelectablePill.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/assertionUtils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/constants.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultExtractionUtils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultMessageUtils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/utils.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertionUtils.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractAssertionStatus.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummary.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataQualityContractSummary.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/FreshnessContractSummary.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/SchemaContractSummary.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractAssertionGroupSelect.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilder.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/types.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/utils.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/fieldDescriptionUtils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/shared/constant.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/shared/styledComponents.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/useGetValidationsTab.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/utils.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Dataset/View/ViewDefinitionTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/DocumentationTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/components/editor/extensions/htmlToMarkdown.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/components/editor/extensions/markdownToHtml.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionEditor.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionEditorToolbar.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreviewToolbar.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/LinkList.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/SourceDescription.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/Editor.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/EditorTheme.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/OnChangeMarkdown.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/__mocks__/Editor.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/__tests__/Editor.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/htmlToMarkdown.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/markdownToHtml.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsComponent.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsDropdown.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsNodeView.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/useDataHubMentions.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/AddImageButton.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/AddLinkButton.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CodeBlockToolbar.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CommandButton.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/HeadingMenu.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/Icons.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/LinkModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/TableCellMenu.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/Toolbar.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Documentation/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Embed/EmbedTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Entity/ChartDashboardsTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Entity/ColumnTabNameHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Entity/DashboardChartsTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Entity/DashboardDatasetsTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Entity/DataFlowJobsTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Entity/DataJobFlowTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Entity/InputFieldsTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Entity/TabNameWithCount.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Entity/components/EntityList.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicTabularTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/TableValueElement.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/AddIncidentModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentListItem.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentSummary.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentsLoadingSection.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/ResolveIncidentModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Incident/incidentUtils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ColumnLineageSelect.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Lineage/CompactLineageTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ImpactAnalysis.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageColumnView.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTabContext.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTabTimeSelector.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTable.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Lineage/generateUseSearchResultsViaRelationshipHook.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Lineage/hooks.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Lineage/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/ML/MlFeatureFeatureTableTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Properties/CardinalityLabel.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Properties/NameColumn.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Properties/PropertiesTab.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Properties/StructuredPropertyTooltip.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Properties/StructuredPropertyValue.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Properties/TabHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Properties/ValuesColumn.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Properties/__tests__/useStructuredProperties.test.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Properties/__tests__/utils.test.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Properties/types.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Properties/useStructuredProperties.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Properties/useUpdateExpandedRowsFromFilter.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/Properties/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/tabs/__tests__/utils.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/types.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/useIsSeparateSiblingsMode.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/useQueryParamValue.ts
 create mode 100644 datahub-web-react/src/app/entityV2/shared/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/structuredProperty/StructuredPropertyEntity.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/tag/CompactTagProfile.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/tag/Tag.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/tag/TagProfile.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/tag/__tests__/TagProfile.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/user/User.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/user/UserAssets.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/user/UserBasicInfoContainer.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/user/UserEditProfileModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/user/UserGroups.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/user/UserHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/user/UserProfile.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/user/UserProfileInfoCard.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/user/UserSidebar.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/user/__tests__/UserHeader.test.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/user/preview/Preview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/ManageViews.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/ViewTypeLabel.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/ViewsList.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/ViewsTable.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/__tests__/utils.test.ts
 create mode 100644 datahub-web-react/src/app/entityV2/view/builder/ViewBuilder.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/builder/ViewBuilderForm.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/builder/ViewBuilderModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/builder/ViewDefinitionBuilder.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/builder/__tests__/utils.test.ts
 create mode 100644 datahub-web-react/src/app/entityV2/view/builder/types.ts
 create mode 100644 datahub-web-react/src/app/entityV2/view/builder/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/view/cacheUtils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/view/menu/ViewDropdownMenu.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/menu/item/DeleteViewItem.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/menu/item/EditViewItem.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/menu/item/IconItemTitle.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/menu/item/PreviewViewItem.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/menu/item/RemoveGlobalDefaultItem.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/menu/item/RemoveUserDefaultItem.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/menu/item/SetGlobalDefaultItem.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/menu/item/SetUserDefaultItem.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/menu/item/ViewItem.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/select/ViewOption.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/select/ViewOptionName.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/select/ViewOptionTooltipTitle.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/select/ViewSelect.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/select/ViewSelectContent.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/select/ViewSelectDropdown.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/select/ViewSelectHeader.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/select/ViewSelectPopoverContent.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/select/ViewsTableColumns.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/select/renderSelectedView.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/select/renderViewOptionGroup.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/select/style.css
 create mode 100644 datahub-web-react/src/app/entityV2/view/select/styledComponents.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/select/utils.ts
 create mode 100644 datahub-web-react/src/app/entityV2/view/shared/DefaultViewIcon.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/shared/GlobalDefaultViewIcon.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/shared/UserDefaultViewIcon.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/view/types.ts
 create mode 100644 datahub-web-react/src/app/entityV2/view/utils.ts
 create mode 100644 datahub-web-react/src/app/glossaryV2/BusinessGlossaryPage.tsx
 create mode 100644 datahub-web-react/src/app/glossaryV2/EmptyGlossarySection.tsx
 create mode 100644 datahub-web-react/src/app/glossaryV2/GlossaryBrowser/GlossaryBrowser.tsx
 create mode 100644 datahub-web-react/src/app/glossaryV2/GlossaryBrowser/NodeItem.tsx
 create mode 100644 datahub-web-react/src/app/glossaryV2/GlossaryBrowser/TermItem.tsx
 create mode 100644 datahub-web-react/src/app/glossaryV2/GlossaryContentProvider.tsx
 create mode 100644 datahub-web-react/src/app/glossaryV2/GlossaryEntitiesList.tsx
 create mode 100644 datahub-web-react/src/app/glossaryV2/GlossaryEntityItem.tsx
 create mode 100644 datahub-web-react/src/app/glossaryV2/GlossaryListCard.tsx
 create mode 100644 datahub-web-react/src/app/glossaryV2/GlossaryNodeCard.tsx
 create mode 100644 datahub-web-react/src/app/glossaryV2/GlossaryRoutes.tsx
 create mode 100644 datahub-web-react/src/app/glossaryV2/GlossarySearch.tsx
 create mode 100644 datahub-web-react/src/app/glossaryV2/GlossarySidebar.tsx
 create mode 100644 datahub-web-react/src/app/glossaryV2/GlossaryStatsProvider.tsx
 create mode 100644 datahub-web-react/src/app/glossaryV2/__tests__/utils.test.ts
 create mode 100644 datahub-web-react/src/app/glossaryV2/cacheUtils.ts
 create mode 100644 datahub-web-react/src/app/glossaryV2/colorUtils.ts
 create mode 100644 datahub-web-react/src/app/glossaryV2/utils.ts
 create mode 100644 datahub-web-react/src/app/homeV2/HomePage.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/action/announcement/Announcement.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/action/announcement/Announcements.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/action/announcement/useGetUnseenAnnouncements.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/action/learn/Resources.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/action/nudge/Domains.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/action/nudge/Glossary.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/action/nudge/Ingestion.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/action/nudge/MetadataTests.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/action/nudge/UserProfile.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/HorizontalListSkeletons.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/recent/EntityCard.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/recent/EntityCardList.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/recent/RecentActions.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/recent/RecentlyEditedOrViewed.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/recent/constants.ts
 create mode 100644 datahub-web-react/src/app/homeV2/content/recent/useGetRecentActions.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/CenterTab.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/CenterTabs.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/CountBadge.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/activity/ActivityTab.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/activity/cards/AssertionResult.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/activity/cards/DocumentationEdit.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/activity/cards/DomainCreate.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/activity/cards/IncidentStatus.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementCard.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementsSkeleton.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementsTab.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/announcements/EmptyAnnouncements.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/announcements/useGetAnnouncements.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/DiscoveryTab.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/Section.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/DataProductCard.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/DataProducts.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/useGetDataProducts.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/DomainCard.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/Domains.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/useGetDomains.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/InsightStatusProvider.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/Insights.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/FoundationalAssetsCard.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/InsightLoadingCard.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostFrequentlyUpdated.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostQueriedCard.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostRowsCard.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostUsersCard.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostViewedDashboards.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/NewAssetsGraphCard.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/PopularGlossaryTerms.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/RecentlyCreatedDatasetsCard.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/RecentlyUpdatedDatasetsCard.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/SearchListInsightCard.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetFoundationalAssets.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostQueried.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostRows.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostUpdated.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostUsers.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostViewedDashboards.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetSearchAssets.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useRecentlyCreatedDatasets.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useRecentlyUpdatedDatasets.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCard.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCardSkeleton.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/PlatformCard.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/Platforms.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetDataPlatforms.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetPlatforms.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/tabs.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/types.ts
 create mode 100644 datahub-web-react/src/app/homeV2/content/tabs/useGetVisibleTabs.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/introduce/IntroduceYourself.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/introduce/IntroduceYourselfLeftSidebar.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/introduce/IntroduceYourselfMainContent.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/introduce/PersonaSelector.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/introduce/useRedirectToIntroduceYourself.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/layout/CenterContent.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/layout/CustomNavLink.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/layout/LeftSidebar.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/layout/NavLinks.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/layout/NavLinksMenu.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/layout/NavSidebar.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/layout/RightSidebar.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarContext.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarHeader.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenu.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItem.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItemDropdown.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItemGroup.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarSkeleton.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarToggler.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavSidebar.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/layout/navBarRedesign/types.ts
 create mode 100644 datahub-web-react/src/app/homeV2/layout/navBarRedesign/useSelectedKey.ts
 create mode 100644 datahub-web-react/src/app/homeV2/layout/shared/styledComponents.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/layout/types.ts
 create mode 100644 datahub-web-react/src/app/homeV2/persona/PersonalizationLoadingModal.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/persona/useLoadUserPersona.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/persona/useUserPersona.ts
 create mode 100644 datahub-web-react/src/app/homeV2/reference/header/GreetingText.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/header/UserHeader.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/header/UserHeaderImage.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/header/getGreetingText.ts
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/DefaultEmptyEntityList.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/EntityLink.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/EntityLinkList.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/EntityLinkListSkeleton.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/assets/AssetsYouOwn.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/assets/EmptyAssetsYouOwn.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/assets/useGetAssetsYouOwn.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/domains/DataProductsYouOwn.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/domains/DomainsYouOwn.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/domains/EmptyDomainsYouOwn.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/domains/useGetDomainsYouOwn.ts
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/glossary/EmptyGlossaryNodesYouOwn.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/glossary/GlossaryNodesYouOwn.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/glossary/useGetGlossaryNodesYouOwn.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/groups/EmptyGroupsYouAreIn.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/groups/GroupsYouAreIn.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/groups/useGetGroupsYouAreIn.ts
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLink.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinkList.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinkLogo.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinks.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/pinned/useGetPinnedLinks.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/tags/EmptyTagsYouOwn.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/tags/TagsYouOwn.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/sections/tags/useGetTagsYouOwn.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/reference/types.ts
 create mode 100644 datahub-web-react/src/app/homeV2/shared/__tests__/utils.test.ts
 create mode 100644 datahub-web-react/src/app/homeV2/shared/types.ts
 create mode 100644 datahub-web-react/src/app/homeV2/shared/updateLastViewedAnnouncementTime.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/shared/useGetLastViewedAnnouncementTime.tsx
 create mode 100644 datahub-web-react/src/app/homeV2/shared/utils.ts
 create mode 100644 datahub-web-react/src/app/identity/user/useUserTitle.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageDisplay.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageEdge/LineageTableEdge.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageEdge/TentativeEdge.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageEntityNode/Column.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageEntityNode/ColumnSearch.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageEntityNode/Columns.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageEntityNode/ContainerPath.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageEntityNode/ContractLineageButton.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageEntityNode/ExpandLineageButton.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageEntityNode/GhostEntityMenu.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageEntityNode/LineageEntityNode.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageEntityNode/ManageLineageMenu.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageEntityNode/NodeContents.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageEntityNode/NodeSkeleton.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageEntityNode/SchemaFieldNodeContents.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageEntityNode/components.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageEntityNode/useAvoidIntersections.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageEntityNode/useDisplayedColumns.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageEntityNode/useOnClickExpandLineage.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageExplorer.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageFilterNode/LineageFilterNodeBasic.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageFilterNode/LineageFilterSearch.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageFilterNode/ShowMoreButton.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageFilterNode/computeOrFilters.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageFilterNode/useFetchFilterNodeContents.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageGraph.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageSidebar.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageTimeSelector.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageTransformationNode/LineageTransformationNode.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageVisualization.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/LineageVisualizationContext.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/NodeBuilder.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/common.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/constants.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/controls/DownloadLineageScreenshotButton.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/controls/LineageControls.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/controls/LineageSearchFilters.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/controls/LineageTimeRangeControls.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/controls/SearchControl.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/controls/StyledPanelButton.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/controls/ZoomControls.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/controls/common.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/lineageUtils.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/manualLineage/AddEntityEdge.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/manualLineage/EntityEdge.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/manualLineage/LineageEdges.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/manualLineage/LineageEntityView.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/manualLineage/ManageLineageModal.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/manualLineage/UserAvatar.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/manualLineage/_test_/utils.test.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/manualLineage/updateNodeContext.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/manualLineage/utils.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/types.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/useAvoidIntersections.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/useBulkEntityLineage.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/useColumnHighlighting.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/useComputeGraph/filterNodes.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/useComputeGraph/getDisplayedNodes.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/useComputeGraph/getFineGrainedLineage.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/useComputeGraph/orderNodes.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/useComputeGraph/useComputeGraph.tsx
 create mode 100644 datahub-web-react/src/app/lineageV2/useLineageV2.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/useNodeHighlighting.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/useSearchAcrossLineage.ts
 create mode 100644 datahub-web-react/src/app/lineageV2/useShouldHideTransformations.ts
 create mode 100644 datahub-web-react/src/app/onboarding/OnboardingContext.tsx
 create mode 100644 datahub-web-react/src/app/onboarding/OnboardingContextProvider.tsx
 create mode 100644 datahub-web-react/src/app/onboarding/configV2/EntityProfileOnboardingConfig.tsx
 create mode 100644 datahub-web-react/src/app/onboarding/configV2/HomePageOnboardingConfig.tsx
 create mode 100644 datahub-web-react/src/app/onboarding/configV2/index.ts
 create mode 100644 datahub-web-react/src/app/onboarding/useHandleOnboardingTour.ts
 create mode 100644 datahub-web-react/src/app/onboarding/useShouldSkipOnboardingTour.ts
 create mode 100644 datahub-web-react/src/app/previewV2/BrowsePaths.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/CardActionCircle.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/ColoredBackgroundPlatformIconGroup.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/CompactView.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/ContextPath.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/ContextPathEntityIcon.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/ContextPathEntityLink.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/ContextPathSeparator.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/DefaultPreviewCard.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/DefaultPreviewCardFooter.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/EntityHeader.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/EntityPaths/ColumnPathsText.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/EntityPaths/ColumnsRelationshipText.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/EntityPaths/DisplayedColumns.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/EntityPaths/EntityPaths.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/EntityPaths/EntityPathsModal.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/Freshness.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/HealthIcon.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/HealthPopover.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/ImageWIthColoredBackground.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/LineageBadge.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/NotesIcon.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/Pills.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/PreviewCardFooterRightSection.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/QueryStat.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/SearchPill.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/SeeSummaryButton.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/__tests__/utils.test.ts
 create mode 100644 datahub-web-react/src/app/previewV2/shared.tsx
 create mode 100644 datahub-web-react/src/app/previewV2/utils.ts
 create mode 100644 datahub-web-react/src/app/recommendations/HoverEntityTooltipContext.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/AdvancedSearchFilterOverallUnionTypeSelect.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/AnalyticsLink.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/BrowseEntityCard.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/ChooseEntityTypeModal.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/CommandK.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/EditTextModal.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/EmbeddedSearchBar.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/EmptySearchResults.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/SaveAsViewButton.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/SearchBar.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/SearchEntitySidebarContainer.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/SearchFilterLabel.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/SearchHeader.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/SearchPage.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/SearchResultList.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/SearchResults.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/SearchResultsLoadingSection.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/SearchResultsRecommendations.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/SearchablePage.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/SimpleSearchFilter.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/SimpleSearchFilters.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/ToggleSidebarButton.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/ViewAllSearchItem.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/__tests__/SearchPage.test.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/__tests__/constants.test.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/__tests__/filterUtils.test.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/advanced/AdvancedFilterCloseButton.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/advanced/EntitySubTypeAdvancedFilterLabel.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/advanced/styles.ts
 create mode 100644 datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteEntity.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteEntityIcon.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteItem.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/autoComplete/AutoCompletePlatformNames.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteTag.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteTooltipContent.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteUser.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/autoComplete/ParentContainers.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/autoComplete/RecommendedOption.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/autoComplete/SectionHeader.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/autoComplete/__tests__/utils.test.ts
 create mode 100644 datahub-web-react/src/app/searchV2/autoComplete/quickFilters/QuickFilter.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/autoComplete/quickFilters/QuickFilters.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/autoComplete/quickFilters/utils.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/autoComplete/styledComponents.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/autoComplete/utils.ts
 create mode 100644 datahub-web-react/src/app/searchV2/context/constants.ts
 create mode 100644 datahub-web-react/src/app/searchV2/filters/ActiveFilter.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/AddFilterDropdown.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/FilterOption.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/MoreFilterOption.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/MoreFilters.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/OperatorSelector.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/OptionsDropdownMenu.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/ParentEntities.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/SaveViewButton.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/SearchFilter.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/SearchFilterOptions.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/SearchFilterView.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/SearchFilters.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/SearchFiltersBuilder.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/SearchFiltersLoadingSection.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/SearchFiltersSection.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/SelectedFilter.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/SelectedSearchFilters.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/__tests__/operator.test.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/__tests__/utils.test.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/constants.ts
 create mode 100644 datahub-web-react/src/app/searchV2/filters/field/fields.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/mapFilterOption.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/operator/operator.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/render/FilterRenderer.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/render/FilterRendererRegistry.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/render/__tests__/FilterRendererRegistry.test.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/render/acrylRenderers.ts
 create mode 100644 datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsFilter.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsRenderer.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsFilter.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsRenderer.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilter.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilterMenu.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/render/shared/BooleanSearchFilter.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/render/shared/BooleanSimpleSearchFilter.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/render/shared/styledComponents.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/render/types.ts
 create mode 100644 datahub-web-react/src/app/searchV2/filters/render/useFilterRenderer.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/styledComponents.ts
 create mode 100644 datahub-web-react/src/app/searchV2/filters/types.ts
 create mode 100644 datahub-web-react/src/app/searchV2/filters/useFilterMode.ts
 create mode 100644 datahub-web-react/src/app/searchV2/filters/useGetBrowseV2LabelOverride.ts
 create mode 100644 datahub-web-react/src/app/searchV2/filters/useHydrateFilters.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/useSearchFilterAnalytics.ts
 create mode 100644 datahub-web-react/src/app/searchV2/filters/useSearchFilterDropdown.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/utils.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/value/BooleanValueMenu.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/value/DateRangeMenu.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/value/EntityTypeMenu.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/value/EntityValueMenu.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/value/EnumValueMenu.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/value/TextValueInput.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/value/TextValueMenu.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/value/TimeBucketMenu.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/value/ValueMenu.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/value/ValueName.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/value/ValueSelector.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/value/styledComponents.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/filters/value/useDateRangeFilterValues.ts
 create mode 100644 datahub-web-react/src/app/searchV2/filters/value/utils.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/matches/GroupedMatch.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/matches/MatchContextContainer.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/matches/MatchedFieldList.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/matches/SearchTextHighlighter.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/matches/constants.ts
 create mode 100644 datahub-web-react/src/app/searchV2/matches/matchedFieldPathsRenderer.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/matches/matchedInputFieldRenderer.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/matches/utils.test.ts
 create mode 100644 datahub-web-react/src/app/searchV2/matches/utils.ts
 create mode 100644 datahub-web-react/src/app/searchV2/recommendation/FilterPill.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/recommendation/RecommendedFilters.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/recommendation/types.ts
 create mode 100644 datahub-web-react/src/app/searchV2/recommendation/useGetRecommendedFilters.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/recommendation/utils.ts
 create mode 100644 datahub-web-react/src/app/searchV2/searchSlideout/SearchCardSlideoutContent.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/BrowseContext.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/BrowseNode.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/BrowseSidebar.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/EntityBrowse.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/EntityLink.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/EntityNode.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/EnvironmentNode.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/ExpandableNode.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/PlatformBrowse.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/PlatformNode.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/SidebarContext.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/SidebarLoadingError.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/__tests__/browseContextUtils.test.ts
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/browseContextUtils.ts
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/constants.ts
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/index.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/types.ts
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/useAggregationsQuery.ts
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/useBrowsePagination.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/useSidebarAnalytics.ts
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/useSidebarEntities.ts
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/useSidebarFilters.ts
 create mode 100644 datahub-web-react/src/app/searchV2/sidebar/useSidebarPlatforms.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/sorting/SearchSortSelect.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/sorting/useGetSortOptions.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/sorting/useSortInput.ts
 create mode 100644 datahub-web-react/src/app/searchV2/suggestions/SearchQuerySugggester.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/useAdvancedSearchSelectFilters.tsx
 create mode 100644 datahub-web-react/src/app/searchV2/useGetSearchQueryInputs.ts
 create mode 100644 datahub-web-react/src/app/searchV2/useSearchAndBrowseVersion.ts
 create mode 100644 datahub-web-react/src/app/searchV2/useSearchViewAll.ts
 create mode 100644 datahub-web-react/src/app/searchV2/useToggleSidebar.ts
 create mode 100644 datahub-web-react/src/app/searchV2/utils/__tests__/applyFilterOverrides.test.ts
 create mode 100644 datahub-web-react/src/app/searchV2/utils/__tests__/filterUtils.test.ts
 create mode 100644 datahub-web-react/src/app/searchV2/utils/__tests__/generateOrFilters.test.ts
 create mode 100644 datahub-web-react/src/app/searchV2/utils/applyFilterOverrides.ts
 create mode 100644 datahub-web-react/src/app/searchV2/utils/combineSiblingsInAutoComplete.ts
 create mode 100644 datahub-web-react/src/app/searchV2/utils/combineSiblingsInSearchResults.test.ts
 create mode 100644 datahub-web-react/src/app/searchV2/utils/combineSiblingsInSearchResults.ts
 create mode 100644 datahub-web-react/src/app/searchV2/utils/constants.ts
 create mode 100644 datahub-web-react/src/app/searchV2/utils/csvUtils.ts
 create mode 100644 datahub-web-react/src/app/searchV2/utils/filterSearchQuery.ts
 create mode 100644 datahub-web-react/src/app/searchV2/utils/filterUtils.ts
 create mode 100644 datahub-web-react/src/app/searchV2/utils/filtersToQueryStringParams.ts
 create mode 100644 datahub-web-react/src/app/searchV2/utils/generateOrFilters.ts
 create mode 100644 datahub-web-react/src/app/searchV2/utils/hasAdvancedFilters.ts
 create mode 100644 datahub-web-react/src/app/searchV2/utils/navigateToSearchUrl.ts
 create mode 100644 datahub-web-react/src/app/searchV2/utils/types.ts
 create mode 100644 datahub-web-react/src/app/searchV2/utils/useDownloadScrollAcrossEntitiesSearchResults.ts
 create mode 100644 datahub-web-react/src/app/searchV2/utils/useFilters.ts
 create mode 100644 datahub-web-react/src/app/settingsV2/AccessTokenModal.tsx
 create mode 100644 datahub-web-react/src/app/settingsV2/AccessTokens.tsx
 create mode 100644 datahub-web-react/src/app/settingsV2/CreateTokenModal.tsx
 create mode 100644 datahub-web-react/src/app/settingsV2/Preferences.tsx
 create mode 100644 datahub-web-react/src/app/settingsV2/SettingsPage.tsx
 create mode 100644 datahub-web-react/src/app/settingsV2/features/Feature.tsx
 create mode 100644 datahub-web-react/src/app/settingsV2/features/Features.tsx
 create mode 100644 datahub-web-react/src/app/settingsV2/features/useDocPropagationSettings.ts
 create mode 100644 datahub-web-react/src/app/settingsV2/personal/utils.tsx
 create mode 100644 datahub-web-react/src/app/settingsV2/posts/CreatePostForm.tsx
 create mode 100644 datahub-web-react/src/app/settingsV2/posts/CreatePostModal.tsx
 create mode 100644 datahub-web-react/src/app/settingsV2/posts/ManagePosts.tsx
 create mode 100644 datahub-web-react/src/app/settingsV2/posts/PostItemMenu.tsx
 create mode 100644 datahub-web-react/src/app/settingsV2/posts/PostsList.tsx
 create mode 100644 datahub-web-react/src/app/settingsV2/posts/PostsListColumns.tsx
 create mode 100644 datahub-web-react/src/app/settingsV2/posts/constants.ts
 create mode 100644 datahub-web-react/src/app/settingsV2/posts/utils.ts
 create mode 100644 datahub-web-react/src/app/settingsV2/settingsPaths.tsx
 create mode 100644 datahub-web-react/src/app/settingsV2/utils.ts
 create mode 100644 datahub-web-react/src/app/shared/LastUpdated.tsx
 create mode 100644 datahub-web-react/src/app/shared/LinkWrapper.tsx
 create mode 100644 datahub-web-react/src/app/shared/MatchesContext.tsx
 create mode 100644 datahub-web-react/src/app/shared/TabFullsizedContext.tsx
 create mode 100644 datahub-web-react/src/app/shared/TruncatedTextWithTooltip.tsx
 create mode 100644 datahub-web-react/src/app/shared/__tests__/LinkWrapper.test.tsx
 create mode 100644 datahub-web-react/src/app/shared/__tests__/TruncatedTextWithTooltip.test.tsx
 create mode 100644 datahub-web-react/src/app/shared/__tests__/pluralize.test.ts
 create mode 100644 datahub-web-react/src/app/shared/share/v2/ShareButtonMenu.tsx
 create mode 100644 datahub-web-react/src/app/shared/share/v2/ShareMenuAction.tsx
 create mode 100644 datahub-web-react/src/app/shared/share/v2/items/CopyLinkMenuItem.tsx
 create mode 100644 datahub-web-react/src/app/shared/share/v2/items/CopyUrnMenuItem.tsx
 create mode 100644 datahub-web-react/src/app/shared/share/v2/items/EmailMenuItem.tsx
 create mode 100644 datahub-web-react/src/app/shared/share/v2/styledComponents.tsx
 create mode 100644 datahub-web-react/src/app/shared/subscribe/drawer/utils.tsx
 create mode 100644 datahub-web-react/src/app/shared/useEmbeddedProfileLinkProps.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/EntitySidebarContext.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/__tests__/utils.test.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/ant/OptionalTooltip.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/buttons/BackButton.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/cards/EntityCountCard.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/cards/SummaryEntityCard.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/cards/components.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/cards/filterFromHex.ts
 create mode 100644 datahub-web-react/src/app/sharedV2/carousel/Carousel.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/carousel/HorizontalScroller.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/colors.ts
 create mode 100644 datahub-web-react/src/app/sharedV2/colors/colorUtils.ts
 create mode 100644 datahub-web-react/src/app/sharedV2/icons/CompactFieldIcon.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/icons/ImageColoredBackground.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/icons/InfoPopover.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/icons/InfoTooltip.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/icons/PlatformIcon.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/icons/colorUtils.ts
 create mode 100644 datahub-web-react/src/app/sharedV2/icons/customIcons/CustomIcon.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/icons/customIcons/add-term.svg
 create mode 100644 datahub-web-react/src/app/sharedV2/icons/getTypeIcon.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/pagination/usePagination.ts
 create mode 100644 datahub-web-react/src/app/sharedV2/propagation/DocumentationPropagationDetails.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/propagation/LabelPropagationDetails.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/propagation/PropagationEntityLink.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/propagation/PropagationIcon.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/propagation/utils.ts
 create mode 100644 datahub-web-react/src/app/sharedV2/search/DownloadButton.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/search/EditButton.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/search/SearchMenuItems.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/sidebar/components.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/sidebar/useSidebarWidth.ts
 create mode 100644 datahub-web-react/src/app/sharedV2/sorting/useSorting.ts
 create mode 100644 datahub-web-react/src/app/sharedV2/tags/AddTagTerm.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/tags/DataProductLink.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/tags/DomainLink.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/tags/TagLink.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/tags/TagTermGroup.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/tags/tag/Tag.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/tags/term/Term.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/tags/term/TermContent.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/tags/usePropagationContextEntities.ts
 create mode 100644 datahub-web-react/src/app/sharedV2/text/MatchTextSizeWrapper.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/text/OverflowTitle.tsx
 create mode 100644 datahub-web-react/src/app/sharedV2/useGetEntities.ts
 create mode 100644 datahub-web-react/src/app/sharedV2/utils.tsx
 create mode 100644 datahub-web-react/src/app/useIsThemeV2.tsx
 create mode 100644 datahub-web-react/src/app/useShowNavBarRedesign.tsx
 create mode 100644 datahub-web-react/src/app/utils/navigateToUrl.ts
 create mode 100644 datahub-web-react/src/app/utils/queryUtils.ts
 create mode 100644 datahub-web-react/src/conf/theme/global-overrides-v2.less
 create mode 100644 datahub-web-react/src/conf/theme/global-variables-v2.less
 create mode 100644 datahub-web-react/src/conf/theme/theme_v2.config.json
 create mode 100644 datahub-web-react/src/graphql/schemaField.graphql
 create mode 100644 datahub-web-react/src/graphql/timeline.graphql
 create mode 100644 datahub-web-react/src/images/acryl_hero.svg
 create mode 100644 datahub-web-react/src/images/ambulance-icon.svg
 create mode 100644 datahub-web-react/src/images/analyticsMenuIcon.svg
 create mode 100644 datahub-web-react/src/images/assertion_error_dot.svg
 create mode 100644 datahub-web-react/src/images/assertion_failure_dot.svg
 create mode 100644 datahub-web-react/src/images/assertion_init_dot.svg
 create mode 100644 datahub-web-react/src/images/assertion_no_results_dot.svg
 create mode 100644 datahub-web-react/src/images/assertion_success_dot.svg
 create mode 100644 datahub-web-react/src/images/assertion_v2_failure_dot.svg
 create mode 100644 datahub-web-react/src/images/assertion_v2_success_dot.svg
 create mode 100644 datahub-web-react/src/images/datahub-platforms.svg
 create mode 100644 datahub-web-react/src/images/deprecated-status.svg
 create mode 100644 datahub-web-react/src/images/deprecation-icon.svg
 create mode 100644 datahub-web-react/src/images/governMenuIcon.svg
 create mode 100644 datahub-web-react/src/images/help-icon.svg
 create mode 100644 datahub-web-react/src/images/ingestionMenuIcon.svg
 create mode 100644 datahub-web-react/src/images/introduceBg.svg
 create mode 100644 datahub-web-react/src/images/lineage-status.svg
 create mode 100644 datahub-web-react/src/images/no-docs.svg
 create mode 100644 datahub-web-react/src/images/no-stats-available.svg
 create mode 100644 datahub-web-react/src/images/row-icon.svg
 create mode 100644 datahub-web-react/src/images/settingsMenuIcon.svg
 create mode 100644 datahub-web-react/src/images/shield-check.svg
 create mode 100644 datahub-web-react/src/images/shield-exclamation.svg
 create mode 100644 datahub-web-react/src/images/sidebarBackArrow.svg
 create mode 100644 datahub-web-react/src/images/tableau-embedded-data-source.svg
 create mode 100644 datahub-web-react/src/images/tableau-published-data-source.svg
 create mode 100644 datahub-web-react/src/images/tableau-view.svg
 create mode 100644 datahub-web-react/src/images/tableau-workbook.svg
 create mode 100644 datahub-web-react/src/images/timeline-icon.svg
 create mode 100644 datahub-web-react/src/images/trending-down-icon.svg
 create mode 100644 datahub-web-react/src/images/trending-up-icon.svg
 create mode 100644 metadata-models/src/main/pegasus/com/linkedin/common/DisplayProperties.pdl
 create mode 100644 metadata-models/src/main/pegasus/com/linkedin/common/IconLibrary.pdl
 create mode 100644 metadata-models/src/main/pegasus/com/linkedin/common/IconProperties.pdl
 create mode 100644 metadata-service/configuration/src/main/java/com/linkedin/metadata/config/ChromeExtensionConfiguration.java
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/auto_completeV2/v2_auto_complete.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/containersV2/v2_containers.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/domainsV2/v2_domains.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/domainsV2/v2_nested_domains.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/glossaryV2/v2_glossary.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/glossaryV2/v2_glossaryTerm.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/glossaryV2/v2_glossary_navigation.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/homeV2/v2_home.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/incidentsV2/v2_incidents.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_download_lineage_results.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_impact_analysis.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_lineage_column_level.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_lineage_column_path.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_lineage_graph.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/loginV2/v2_login.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/mutationsV2/v2_ingestion_source.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/mutationsV2/v2_managed_ingestion.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/mutationsV2/v2_managing_secrets.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/operrationsV2/v2_operations.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/ownershipV2/v2_manage_ownership.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/schema_blameV2/v2_schema_blame.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/settingsV2/v2_homePagePost.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/settingsV2/v2_manage_access_tokens.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/settingsV2/v2_manage_policies.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/settingsV2/v2_managing_groups.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/siblingsV2/v2_siblings.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/task_runV2/v2_task_runs.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/viewV2/v2_manage_views.js
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/viewV2/v2_view_select.js
 create mode 100644 smoke-test/tests/cypress/incidents_test.json

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/Constants.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/Constants.java
index aec5352dec1a64..c514a7c3944528 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/Constants.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/Constants.java
@@ -29,6 +29,7 @@ private Constants() {}
   public static final String CONTRACTS_SCHEMA_FILE = "contract.graphql";
   public static final String CONNECTIONS_SCHEMA_FILE = "connection.graphql";
   public static final String VERSION_SCHEMA_FILE = "versioning.graphql";
+  public static final String QUERY_SCHEMA_FILE = "query.graphql";
   public static final String BROWSE_PATH_DELIMITER = "/";
   public static final String BROWSE_PATH_V2_DELIMITER = "␟";
   public static final String VERSION_STAMP_FIELD_NAME = "versionStamp";
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
index 2c5e841322f45f..68f1d851420258 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
@@ -257,6 +257,7 @@
 import com.linkedin.datahub.graphql.resolvers.mutate.RemoveTagResolver;
 import com.linkedin.datahub.graphql.resolvers.mutate.RemoveTermResolver;
 import com.linkedin.datahub.graphql.resolvers.mutate.UpdateDescriptionResolver;
+import com.linkedin.datahub.graphql.resolvers.mutate.UpdateDisplayPropertiesResolver;
 import com.linkedin.datahub.graphql.resolvers.mutate.UpdateNameResolver;
 import com.linkedin.datahub.graphql.resolvers.mutate.UpdateParentNodeResolver;
 import com.linkedin.datahub.graphql.resolvers.mutate.UpdateUserSettingResolver;
@@ -297,6 +298,7 @@
 import com.linkedin.datahub.graphql.resolvers.settings.user.UpdateCorpUserViewsSettingsResolver;
 import com.linkedin.datahub.graphql.resolvers.settings.view.GlobalViewsSettingsResolver;
 import com.linkedin.datahub.graphql.resolvers.settings.view.UpdateGlobalViewsSettingsResolver;
+import com.linkedin.datahub.graphql.resolvers.siblings.SiblingsSearchResolver;
 import com.linkedin.datahub.graphql.resolvers.step.BatchGetStepStatesResolver;
 import com.linkedin.datahub.graphql.resolvers.step.BatchUpdateStepStatesResolver;
 import com.linkedin.datahub.graphql.resolvers.structuredproperties.CreateStructuredPropertyResolver;
@@ -314,6 +316,7 @@
 import com.linkedin.datahub.graphql.resolvers.test.UpdateTestResolver;
 import com.linkedin.datahub.graphql.resolvers.timeline.GetSchemaBlameResolver;
 import com.linkedin.datahub.graphql.resolvers.timeline.GetSchemaVersionListResolver;
+import com.linkedin.datahub.graphql.resolvers.timeline.GetTimelineResolver;
 import com.linkedin.datahub.graphql.resolvers.type.AspectInterfaceTypeResolver;
 import com.linkedin.datahub.graphql.resolvers.type.EntityInterfaceTypeResolver;
 import com.linkedin.datahub.graphql.resolvers.type.HyperParameterValueTypeResolver;
@@ -376,6 +379,7 @@
 import com.linkedin.datahub.graphql.types.notebook.NotebookType;
 import com.linkedin.datahub.graphql.types.ownership.OwnershipType;
 import com.linkedin.datahub.graphql.types.policy.DataHubPolicyType;
+import com.linkedin.datahub.graphql.types.post.PostType;
 import com.linkedin.datahub.graphql.types.query.QueryType;
 import com.linkedin.datahub.graphql.types.restricted.RestrictedType;
 import com.linkedin.datahub.graphql.types.role.DataHubRoleType;
@@ -389,6 +393,7 @@
 import com.linkedin.entity.client.EntityClient;
 import com.linkedin.entity.client.SystemEntityClient;
 import com.linkedin.metadata.client.UsageStatsJavaClient;
+import com.linkedin.metadata.config.ChromeExtensionConfiguration;
 import com.linkedin.metadata.config.DataHubConfiguration;
 import com.linkedin.metadata.config.IngestionConfiguration;
 import com.linkedin.metadata.config.TestsConfiguration;
@@ -496,6 +501,7 @@ public class GmsGraphQLEngine {
   private final TestsConfiguration testsConfiguration;
   private final DataHubConfiguration datahubConfiguration;
   private final ViewsConfiguration viewsConfiguration;
+  private final ChromeExtensionConfiguration chromeExtensionConfiguration;
 
   private final DatasetType datasetType;
 
@@ -540,6 +546,7 @@ public class GmsGraphQLEngine {
   private final FormType formType;
   private final IncidentType incidentType;
   private final RestrictedType restrictedType;
+  private final PostType postType;
   private final DataProcessInstanceType dataProcessInstanceType;
   private final VersionSetType versionSetType;
 
@@ -620,6 +627,7 @@ public GmsGraphQLEngine(final GmsGraphQLEngineArgs args) {
     this.datahubConfiguration = args.datahubConfiguration;
     this.viewsConfiguration = args.viewsConfiguration;
     this.featureFlags = args.featureFlags;
+    this.chromeExtensionConfiguration = args.chromeExtensionConfiguration;
 
     this.datasetType = new DatasetType(entityClient);
     this.roleType = new RoleType(entityClient);
@@ -662,6 +670,7 @@ public GmsGraphQLEngine(final GmsGraphQLEngineArgs args) {
     this.formType = new FormType(entityClient);
     this.incidentType = new IncidentType(entityClient);
     this.restrictedType = new RestrictedType(entityClient, restrictedService);
+    this.postType = new PostType(entityClient);
     this.dataProcessInstanceType = new DataProcessInstanceType(entityClient, featureFlags);
     this.versionSetType = new VersionSetType(entityClient);
 
@@ -713,6 +722,7 @@ public GmsGraphQLEngine(final GmsGraphQLEngineArgs args) {
                 entityTypeType,
                 formType,
                 incidentType,
+                postType,
                 versionSetType,
                 restrictedType,
                 businessAttributeType,
@@ -873,7 +883,8 @@ public GraphQLEngine.Builder builder() {
         .addSchema(fileBasedSchema(INCIDENTS_SCHEMA_FILE))
         .addSchema(fileBasedSchema(CONTRACTS_SCHEMA_FILE))
         .addSchema(fileBasedSchema(COMMON_SCHEMA_FILE))
-        .addSchema(fileBasedSchema(VERSION_SCHEMA_FILE));
+        .addSchema(fileBasedSchema(VERSION_SCHEMA_FILE))
+        .addSchema(fileBasedSchema(QUERY_SCHEMA_FILE));
 
     for (GmsGraphQLPlugin plugin : this.graphQLPlugins) {
       List<String> pluginSchemaFiles = plugin.getSchemaFiles();
@@ -1002,7 +1013,8 @@ private void configureQueryResolvers(final RuntimeWiring.Builder builder) {
                         this.testsConfiguration,
                         this.datahubConfiguration,
                         this.viewsConfiguration,
-                        this.featureFlags))
+                        this.featureFlags,
+                        this.chromeExtensionConfiguration))
                 .dataFetcher("me", new MeResolver(this.entityClient, featureFlags))
                 .dataFetcher("search", new SearchResolver(this.entityClient))
                 .dataFetcher(
@@ -1088,6 +1100,7 @@ private void configureQueryResolvers(final RuntimeWiring.Builder builder) {
                 .dataFetcher(
                     "executionRequest", new GetIngestionExecutionRequestResolver(this.entityClient))
                 .dataFetcher("getSchemaBlame", new GetSchemaBlameResolver(this.timelineService))
+                .dataFetcher("getTimeline", new GetTimelineResolver(this.timelineService))
                 .dataFetcher(
                     "getSchemaVersionList", new GetSchemaVersionListResolver(this.timelineService))
                 .dataFetcher("test", getResolver(testType))
@@ -1352,6 +1365,9 @@ private void configureMutationResolvers(final RuntimeWiring.Builder builder) {
                   "createOwnershipType", new CreateOwnershipTypeResolver(this.ownershipTypeService))
               .dataFetcher(
                   "updateOwnershipType", new UpdateOwnershipTypeResolver(this.ownershipTypeService))
+              .dataFetcher(
+                  "updateDisplayProperties",
+                  new UpdateDisplayPropertiesResolver(this.entityService))
               .dataFetcher(
                   "deleteOwnershipType", new DeleteOwnershipTypeResolver(this.ownershipTypeService))
               .dataFetcher("submitFormPrompt", new SubmitFormPromptResolver(this.formService))
@@ -1735,7 +1751,10 @@ private void configureDatasetResolvers(final RuntimeWiring.Builder builder) {
                     .dataFetcher("exists", new EntityExistsResolver(entityService))
                     .dataFetcher("runs", new EntityRunsResolver(entityClient))
                     .dataFetcher("privileges", new EntityPrivilegesResolver(entityClient))
-                    .dataFetcher("parentContainers", new ParentContainersResolver(entityClient)))
+                    .dataFetcher("parentContainers", new ParentContainersResolver(entityClient))
+                    .dataFetcher(
+                        "siblingsSearch",
+                        new SiblingsSearchResolver(this.entityClient, this.viewService)))
         .type(
             "Owner",
             typeWiring ->
@@ -1768,6 +1787,13 @@ private void configureDatasetResolvers(final RuntimeWiring.Builder builder) {
                         datasetType,
                         (env) ->
                             ((ForeignKeyConstraint) env.getSource()).getForeignDataset().getUrn())))
+        .type(
+            "Deprecation",
+            typeWiring ->
+                typeWiring.dataFetcher(
+                    "replacement",
+                    new EntityTypeResolver(
+                        entityTypes, (env) -> ((Deprecation) env.getSource()).getReplacement())))
         .type(
             "SiblingProperties",
             typeWiring ->
@@ -1878,10 +1904,16 @@ private void configureSchemaFieldResolvers(final RuntimeWiring.Builder builder)
     builder.type(
         "SchemaFieldEntity",
         typeWiring ->
-            typeWiring.dataFetcher(
-                "parent",
-                new EntityTypeResolver(
-                    entityTypes, (env) -> ((SchemaFieldEntity) env.getSource()).getParent())));
+            typeWiring
+                .dataFetcher(
+                    "parent",
+                    new EntityTypeResolver(
+                        entityTypes, (env) -> ((SchemaFieldEntity) env.getSource()).getParent()))
+                .dataFetcher("relationships", new EntityRelationshipsResultResolver(graphClient))
+                .dataFetcher(
+                    "lineage",
+                    new EntityLineageResultResolver(
+                        siblingGraphService, restrictedService, this.authorizationConfiguration)));
   }
 
   private void configureEntityPathResolvers(final RuntimeWiring.Builder builder) {
@@ -1935,10 +1967,12 @@ private void configureCorpUserResolvers(final RuntimeWiring.Builder builder) {
                 new LoadableTypeBatchResolver<>(
                     dataPlatformType,
                     (env) ->
-                        ((CorpUserEditableProperties) env.getSource())
-                            .getPlatforms().stream()
-                                .map(DataPlatform::getUrn)
-                                .collect(Collectors.toList()))));
+                        ((CorpUserEditableProperties) env.getSource()).getPlatforms() != null
+                            ? ((CorpUserEditableProperties) env.getSource())
+                                .getPlatforms().stream()
+                                    .map(DataPlatform::getUrn)
+                                    .collect(Collectors.toList())
+                            : ImmutableList.of())));
   }
 
   /**
@@ -3065,11 +3099,20 @@ private void configureQueryEntityResolvers(final RuntimeWiring.Builder builder)
         .type(
             "QuerySubject",
             typeWiring ->
-                typeWiring.dataFetcher(
-                    "dataset",
-                    new LoadableTypeResolver<>(
-                        datasetType,
-                        (env) -> ((QuerySubject) env.getSource()).getDataset().getUrn())));
+                typeWiring
+                    .dataFetcher(
+                        "dataset",
+                        new LoadableTypeResolver<>(
+                            datasetType,
+                            (env) -> ((QuerySubject) env.getSource()).getDataset().getUrn()))
+                    .dataFetcher(
+                        "schemaField",
+                        new LoadableTypeResolver<>(
+                            schemaFieldType,
+                            (env) ->
+                                ((QuerySubject) env.getSource()).getSchemaField() != null
+                                    ? ((QuerySubject) env.getSource()).getSchemaField().getUrn()
+                                    : null)));
   }
 
   private void configureOwnershipTypeResolver(final RuntimeWiring.Builder builder) {
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngineArgs.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngineArgs.java
index 131f4e87637807..25fa43183126fe 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngineArgs.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngineArgs.java
@@ -13,6 +13,7 @@
 import com.linkedin.entity.client.EntityClient;
 import com.linkedin.entity.client.SystemEntityClient;
 import com.linkedin.metadata.client.UsageStatsJavaClient;
+import com.linkedin.metadata.config.ChromeExtensionConfiguration;
 import com.linkedin.metadata.config.DataHubConfiguration;
 import com.linkedin.metadata.config.IngestionConfiguration;
 import com.linkedin.metadata.config.TestsConfiguration;
@@ -87,6 +88,7 @@ public class GmsGraphQLEngineArgs {
   int graphQLQueryDepthLimit;
   boolean graphQLQueryIntrospectionEnabled;
   BusinessAttributeService businessAttributeService;
+  ChromeExtensionConfiguration chromeExtensionConfiguration;
   ConnectionService connectionService;
   AssertionService assertionService;
   EntityVersioningService entityVersioningService;
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/authorization/AuthorizationUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/authorization/AuthorizationUtils.java
index 29d1c02dacb416..082352dc1917a9 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/authorization/AuthorizationUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/authorization/AuthorizationUtils.java
@@ -375,5 +375,21 @@ public static boolean isViewDatasetUsageAuthorized(
         new EntitySpec(resourceUrn.getEntityType(), resourceUrn.toString()));
   }
 
+  public static boolean isViewDatasetProfileAuthorized(
+      final QueryContext context, final Urn resourceUrn) {
+    return AuthUtil.isAuthorized(
+        context.getOperationContext(),
+        PoliciesConfig.VIEW_DATASET_PROFILE_PRIVILEGE,
+        new EntitySpec(resourceUrn.getEntityType(), resourceUrn.toString()));
+  }
+
+  public static boolean isViewDatasetOperationsAuthorized(
+      final QueryContext context, final Urn resourceUrn) {
+    return AuthUtil.isAuthorized(
+        context.getOperationContext(),
+        PoliciesConfig.VIEW_DATASET_OPERATIONS_PRIVILEGE,
+        new EntitySpec(resourceUrn.getEntityType(), resourceUrn.toString()));
+  }
+
   private AuthorizationUtils() {}
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/config/AppConfigResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/config/AppConfigResolver.java
index 8cdc13a14be87c..3dbb5a5d8bc2bf 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/config/AppConfigResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/config/AppConfigResolver.java
@@ -7,6 +7,7 @@
 import com.linkedin.datahub.graphql.generated.AnalyticsConfig;
 import com.linkedin.datahub.graphql.generated.AppConfig;
 import com.linkedin.datahub.graphql.generated.AuthConfig;
+import com.linkedin.datahub.graphql.generated.ChromeExtensionConfig;
 import com.linkedin.datahub.graphql.generated.EntityProfileConfig;
 import com.linkedin.datahub.graphql.generated.EntityProfilesConfig;
 import com.linkedin.datahub.graphql.generated.EntityType;
@@ -23,6 +24,7 @@
 import com.linkedin.datahub.graphql.generated.TestsConfig;
 import com.linkedin.datahub.graphql.generated.ViewsConfig;
 import com.linkedin.datahub.graphql.generated.VisualConfig;
+import com.linkedin.metadata.config.ChromeExtensionConfiguration;
 import com.linkedin.metadata.config.DataHubConfiguration;
 import com.linkedin.metadata.config.IngestionConfiguration;
 import com.linkedin.metadata.config.TestsConfiguration;
@@ -50,6 +52,7 @@ public class AppConfigResolver implements DataFetcher<CompletableFuture<AppConfi
   private final DataHubConfiguration _datahubConfiguration;
   private final ViewsConfiguration _viewsConfiguration;
   private final FeatureFlags _featureFlags;
+  private final ChromeExtensionConfiguration _chromeExtensionConfiguration;
 
   public AppConfigResolver(
       final GitVersion gitVersion,
@@ -63,7 +66,8 @@ public AppConfigResolver(
       final TestsConfiguration testsConfiguration,
       final DataHubConfiguration datahubConfiguration,
       final ViewsConfiguration viewsConfiguration,
-      final FeatureFlags featureFlags) {
+      final FeatureFlags featureFlags,
+      final ChromeExtensionConfiguration chromeExtensionConfiguration) {
     _gitVersion = gitVersion;
     _isAnalyticsEnabled = isAnalyticsEnabled;
     _ingestionConfiguration = ingestionConfiguration;
@@ -76,6 +80,7 @@ public AppConfigResolver(
     _datahubConfiguration = datahubConfiguration;
     _viewsConfiguration = viewsConfiguration;
     _featureFlags = featureFlags;
+    _chromeExtensionConfiguration = chromeExtensionConfiguration;
   }
 
   @Override
@@ -187,13 +192,27 @@ public CompletableFuture<AppConfig> get(final DataFetchingEnvironment environmen
             .setPlatformBrowseV2(_featureFlags.isPlatformBrowseV2())
             .setDataContractsEnabled(_featureFlags.isDataContractsEnabled())
             .setEditableDatasetNameEnabled(_featureFlags.isEditableDatasetNameEnabled())
+            .setThemeV2Enabled(_featureFlags.isThemeV2Enabled())
+            .setThemeV2Default(_featureFlags.isThemeV2Default())
+            .setThemeV2Toggleable(_featureFlags.isThemeV2Toggleable())
+            .setLineageGraphV2(_featureFlags.isLineageGraphV2())
             .setShowSeparateSiblings(_featureFlags.isShowSeparateSiblings())
             .setShowManageStructuredProperties(_featureFlags.isShowManageStructuredProperties())
+            .setSchemaFieldCLLEnabled(_featureFlags.isSchemaFieldCLLEnabled())
+            .setHideDbtSourceInLineage(_featureFlags.isHideDbtSourceInLineage())
+            .setSchemaFieldLineageIgnoreStatus(_featureFlags.isSchemaFieldLineageIgnoreStatus())
+            .setShowNavBarRedesign(_featureFlags.isShowNavBarRedesign())
+            .setShowAutoCompleteResults(_featureFlags.isShowAutoCompleteResults())
             .setEntityVersioningEnabled(_featureFlags.isEntityVersioning())
             .build();
 
     appConfig.setFeatureFlags(featureFlagsConfig);
 
+    final ChromeExtensionConfig chromeExtensionConfig = new ChromeExtensionConfig();
+    chromeExtensionConfig.setEnabled(_chromeExtensionConfiguration.isEnabled());
+    chromeExtensionConfig.setLineageEnabled(_chromeExtensionConfiguration.isLineageEnabled());
+    appConfig.setChromeExtensionConfig(chromeExtensionConfig);
+
     return CompletableFuture.completedFuture(appConfig);
   }
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/deprecation/UpdateDeprecationResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/deprecation/UpdateDeprecationResolver.java
index a2230cf6b6e886..57d1a4439d260c 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/deprecation/UpdateDeprecationResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/deprecation/UpdateDeprecationResolver.java
@@ -125,6 +125,14 @@ private static void updateDeprecation(
       // Note is required field in GMS. Set to empty string if not provided.
       deprecation.setNote(EMPTY_STRING);
     }
+
+    try {
+      deprecation.setReplacement(
+          input.getReplacement() != null ? Urn.createFromString(input.getReplacement()) : null,
+          SetMode.REMOVE_IF_NULL);
+    } catch (URISyntaxException e) {
+      throw new RuntimeException(e);
+    }
     try {
       deprecation.setActor(Urn.createFromString(context.getActorUrn()));
     } catch (URISyntaxException e) {
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/EntityPrivilegesResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/EntityPrivilegesResolver.java
index 67ab9bb2878141..5aa7382a49e38b 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/EntityPrivilegesResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/entity/EntityPrivilegesResolver.java
@@ -12,8 +12,17 @@
 import com.linkedin.datahub.graphql.concurrency.GraphQLConcurrencyUtils;
 import com.linkedin.datahub.graphql.generated.Entity;
 import com.linkedin.datahub.graphql.generated.EntityPrivileges;
+import com.linkedin.datahub.graphql.resolvers.assertion.AssertionUtils;
+import com.linkedin.datahub.graphql.resolvers.dataproduct.DataProductAuthorizationUtils;
+import com.linkedin.datahub.graphql.resolvers.incident.IncidentUtils;
+import com.linkedin.datahub.graphql.resolvers.mutate.DescriptionUtils;
+import com.linkedin.datahub.graphql.resolvers.mutate.util.DeprecationUtils;
+import com.linkedin.datahub.graphql.resolvers.mutate.util.DomainUtils;
 import com.linkedin.datahub.graphql.resolvers.mutate.util.EmbedUtils;
 import com.linkedin.datahub.graphql.resolvers.mutate.util.GlossaryUtils;
+import com.linkedin.datahub.graphql.resolvers.mutate.util.LabelUtils;
+import com.linkedin.datahub.graphql.resolvers.mutate.util.LinkUtils;
+import com.linkedin.datahub.graphql.resolvers.mutate.util.OwnerUtils;
 import com.linkedin.entity.client.EntityClient;
 import com.linkedin.metadata.Constants;
 import graphql.schema.DataFetcher;
@@ -112,7 +121,18 @@ private boolean canEditEntityLineage(Urn urn, QueryContext context) {
   private EntityPrivileges getDatasetPrivileges(Urn urn, QueryContext context) {
     final EntityPrivileges result = new EntityPrivileges();
     result.setCanEditEmbed(EmbedUtils.isAuthorizedToUpdateEmbedForEntity(urn, context));
+    // Schema Field Edits are a bit of a hack.
     result.setCanEditQueries(AuthorizationUtils.canCreateQuery(ImmutableList.of(urn), context));
+    result.setCanEditSchemaFieldTags(LabelUtils.isAuthorizedToUpdateTags(context, urn, "ignored"));
+    result.setCanEditSchemaFieldGlossaryTerms(
+        LabelUtils.isAuthorizedToUpdateTerms(context, urn, "ignored"));
+    result.setCanEditSchemaFieldDescription(
+        DescriptionUtils.isAuthorizedToUpdateFieldDescription(context, urn));
+    result.setCanViewDatasetUsage(AuthorizationUtils.isViewDatasetUsageAuthorized(context, urn));
+    result.setCanViewDatasetProfile(
+        AuthorizationUtils.isViewDatasetProfileAuthorized(context, urn));
+    result.setCanViewDatasetOperations(
+        AuthorizationUtils.isViewDatasetOperationsAuthorized(context, urn));
     addCommonPrivileges(result, urn, context);
     return result;
   }
@@ -141,5 +161,19 @@ private void addCommonPrivileges(
       @Nonnull EntityPrivileges result, @Nonnull Urn urn, @Nonnull QueryContext context) {
     result.setCanEditLineage(canEditEntityLineage(urn, context));
     result.setCanEditProperties(AuthorizationUtils.canEditProperties(urn, context));
+    result.setCanEditAssertions(
+        AssertionUtils.isAuthorizedToEditAssertionFromAssertee(context, urn));
+    result.setCanEditIncidents(IncidentUtils.isAuthorizedToEditIncidentForResource(urn, context));
+    result.setCanEditDomains(
+        DomainUtils.isAuthorizedToUpdateDomainsForEntity(context, urn, _entityClient));
+    result.setCanEditDataProducts(
+        DataProductAuthorizationUtils.isAuthorizedToUpdateDataProductsForEntity(context, urn));
+    result.setCanEditDeprecation(
+        DeprecationUtils.isAuthorizedToUpdateDeprecationForEntity(context, urn));
+    result.setCanEditGlossaryTerms(LabelUtils.isAuthorizedToUpdateTerms(context, urn, null));
+    result.setCanEditTags(LabelUtils.isAuthorizedToUpdateTags(context, urn, null));
+    result.setCanEditOwners(OwnerUtils.isAuthorizedToUpdateOwners(context, urn));
+    result.setCanEditDescription(DescriptionUtils.isAuthorizedToUpdateDescription(context, urn));
+    result.setCanEditLinks(LinkUtils.isAuthorizedToUpdateLinks(context, urn));
   }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/incident/IncidentUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/incident/IncidentUtils.java
new file mode 100644
index 00000000000000..500813e01ad6bd
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/incident/IncidentUtils.java
@@ -0,0 +1,25 @@
+package com.linkedin.datahub.graphql.resolvers.incident;
+
+import com.datahub.authorization.ConjunctivePrivilegeGroup;
+import com.datahub.authorization.DisjunctivePrivilegeGroup;
+import com.google.common.collect.ImmutableList;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.authorization.AuthorizationUtils;
+import com.linkedin.metadata.authorization.PoliciesConfig;
+
+public class IncidentUtils {
+
+  public static boolean isAuthorizedToEditIncidentForResource(
+      final Urn resourceUrn, final QueryContext context) {
+    final DisjunctivePrivilegeGroup orPrivilegeGroups =
+        new DisjunctivePrivilegeGroup(
+            ImmutableList.of(
+                AuthorizationUtils.ALL_PRIVILEGES_GROUP,
+                new ConjunctivePrivilegeGroup(
+                    ImmutableList.of(PoliciesConfig.EDIT_ENTITY_INCIDENTS_PRIVILEGE.getType()))));
+
+    return AuthorizationUtils.isAuthorized(
+        context, resourceUrn.getEntityType(), resourceUrn.toString(), orPrivilegeGroups);
+  }
+}
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/BatchUpdateDeprecationResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/BatchUpdateDeprecationResolver.java
index 546694ede92697..c4c183b0b16b4f 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/BatchUpdateDeprecationResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/BatchUpdateDeprecationResolver.java
@@ -46,6 +46,7 @@ public CompletableFuture<Boolean> get(DataFetchingEnvironment environment) throw
                 input.getDeprecated(),
                 input.getNote(),
                 input.getDecommissionTime(),
+                input.getReplacement(),
                 resources,
                 context);
             return true;
@@ -84,20 +85,24 @@ private void batchUpdateDeprecation(
       boolean deprecated,
       @Nullable String note,
       @Nullable Long decommissionTime,
+      @Nullable String replacementUrn,
       List<ResourceRefInput> resources,
       QueryContext context) {
     log.debug(
-        "Batch updating deprecation. deprecated: {}, note: {}, decommissionTime: {}, resources: {}",
+        "Batch updating deprecation. deprecated: {}, note: {}, decommissionTime: {}, resources: {}"
+            + "replacementUrn: {}, notificationConfig: {}",
         deprecated,
         note,
         decommissionTime,
-        resources);
+        resources,
+        replacementUrn);
     try {
       DeprecationUtils.updateDeprecationForResources(
           context.getOperationContext(),
           deprecated,
           note,
           decommissionTime,
+          replacementUrn,
           resources,
           UrnUtils.getUrn(context.getActorUrn()),
           _entityService);
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/UpdateDisplayPropertiesResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/UpdateDisplayPropertiesResolver.java
new file mode 100644
index 00000000000000..47aee01ad94fe5
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/UpdateDisplayPropertiesResolver.java
@@ -0,0 +1,106 @@
+package com.linkedin.datahub.graphql.resolvers.mutate;
+
+import static com.linkedin.datahub.graphql.resolvers.ResolverUtils.bindArgument;
+import static com.linkedin.datahub.graphql.resolvers.mutate.MutationUtils.persistAspect;
+
+import com.linkedin.common.DisplayProperties;
+import com.linkedin.common.IconLibrary;
+import com.linkedin.common.IconProperties;
+import com.linkedin.common.urn.CorpuserUrn;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.authorization.AuthorizationUtils;
+import com.linkedin.datahub.graphql.exception.AuthorizationException;
+import com.linkedin.datahub.graphql.generated.DisplayPropertiesUpdateInput;
+import com.linkedin.metadata.Constants;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.entity.EntityUtils;
+import graphql.schema.DataFetcher;
+import graphql.schema.DataFetchingEnvironment;
+import java.util.concurrent.CompletableFuture;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RequiredArgsConstructor
+public class UpdateDisplayPropertiesResolver implements DataFetcher<CompletableFuture<Boolean>> {
+  private final EntityService _entityService;
+
+  @Override
+  public CompletableFuture<Boolean> get(DataFetchingEnvironment environment) throws Exception {
+    final DisplayPropertiesUpdateInput input =
+        bindArgument(environment.getArgument("input"), DisplayPropertiesUpdateInput.class);
+    final String urn = bindArgument(environment.getArgument("urn"), String.class);
+
+    final QueryContext context = environment.getContext();
+    Urn targetUrn = Urn.createFromString(urn);
+
+    log.info(
+        "Updating display properties. urn: {} input: {}", targetUrn.toString(), input.toString());
+
+    if (!_entityService.exists(context.getOperationContext(), targetUrn, true)) {
+      throw new IllegalArgumentException(
+          String.format("Failed to update %s. %s does not exist.", targetUrn, targetUrn));
+    }
+
+    return CompletableFuture.supplyAsync(
+        () -> {
+          if (!AuthorizationUtils.canManageDomains(context)) {
+            throw new AuthorizationException(
+                "Unauthorized to perform this action. Please contact your DataHub administrator.");
+          }
+
+          try {
+            DisplayProperties existingDisplayProperties =
+                (DisplayProperties)
+                    EntityUtils.getAspectFromEntity(
+                        context.getOperationContext(),
+                        targetUrn.toString(),
+                        Constants.DISPLAY_PROPERTIES_ASPECT_NAME,
+                        _entityService,
+                        new DisplayProperties());
+            if (input.getColorHex() != null) {
+              existingDisplayProperties.setColorHex(input.getColorHex());
+            }
+            if (input.getIcon() != null) {
+              if (!existingDisplayProperties.hasIcon()) {
+                existingDisplayProperties.setIcon(new IconProperties());
+              }
+              if (input.getIcon().getName() != null) {
+                existingDisplayProperties.getIcon().setName(input.getIcon().getName());
+              }
+              if (input.getIcon().getStyle() != null) {
+                existingDisplayProperties.getIcon().setStyle(input.getIcon().getStyle());
+              }
+              if (input.getIcon().getIconLibrary() != null) {
+                existingDisplayProperties
+                    .getIcon()
+                    .setIconLibrary(
+                        IconLibrary.valueOf(input.getIcon().getIconLibrary().toString()));
+              }
+            }
+            Urn actor = CorpuserUrn.createFromString(context.getActorUrn());
+            persistAspect(
+                context.getOperationContext(),
+                targetUrn,
+                Constants.DISPLAY_PROPERTIES_ASPECT_NAME,
+                existingDisplayProperties,
+                actor,
+                _entityService);
+            return true;
+          } catch (Exception e) {
+            log.error(
+                "Failed to update DisplayProperties for urn: {}, properties: {}. {}",
+                targetUrn.toString(),
+                input.toString(),
+                e.getMessage());
+            throw new RuntimeException(
+                String.format(
+                    "Failed to update DisplayProperties for urn: {}, properties: {}. {}",
+                    targetUrn.toString(),
+                    input.toString(),
+                    e.getMessage()));
+          }
+        });
+  }
+}
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/UpdateUserSettingResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/UpdateUserSettingResolver.java
index 8a598f8d8bbdda..a88c526552df1e 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/UpdateUserSettingResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/UpdateUserSettingResolver.java
@@ -18,7 +18,9 @@
 import com.linkedin.mxe.MetadataChangeProposal;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import io.datahubproject.metadata.context.OperationContext;
 import java.util.concurrent.CompletableFuture;
+import javax.annotation.Nonnull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -44,11 +46,16 @@ public CompletableFuture<Boolean> get(DataFetchingEnvironment environment) throw
           try {
             // In the future with more settings, we'll need to do a read-modify-write
             // for now though, we can just write since there is only 1 setting
-            CorpUserSettings newSettings = new CorpUserSettings();
-            newSettings.setAppearance(new CorpUserAppearanceSettings());
+            CorpUserSettings newSettings =
+                getCorpUserSettings(context.getOperationContext(), actor);
+            CorpUserAppearanceSettings appearanceSettings =
+                newSettings.hasAppearance()
+                    ? newSettings.getAppearance()
+                    : new CorpUserAppearanceSettings();
             if (name.equals(UserSetting.SHOW_SIMPLIFIED_HOMEPAGE)) {
-              newSettings.setAppearance(
-                  new CorpUserAppearanceSettings().setShowSimplifiedHomepage(value));
+              newSettings.setAppearance(appearanceSettings.setShowSimplifiedHomepage(value));
+            } else if (name.equals(UserSetting.SHOW_THEME_V2)) {
+              newSettings.setAppearance(appearanceSettings.setShowThemeV2(value));
             } else {
               log.error("User Setting name {} not currently supported", name);
               throw new RuntimeException(
@@ -77,4 +84,13 @@ public CompletableFuture<Boolean> get(DataFetchingEnvironment environment) throw
         this.getClass().getSimpleName(),
         "get");
   }
+
+  @Nonnull
+  private CorpUserSettings getCorpUserSettings(
+      @Nonnull OperationContext opContext, @Nonnull final Urn urn) {
+    CorpUserSettings settings =
+        (CorpUserSettings)
+            _entityService.getAspect(opContext, urn, CORP_USER_SETTINGS_ASPECT_NAME, 0);
+    return settings == null ? new CorpUserSettings() : settings;
+  }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/DeprecationUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/DeprecationUtils.java
index 541224b02c1b52..f4beb9e5a9b6c3 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/DeprecationUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/DeprecationUtils.java
@@ -16,8 +16,10 @@
 import com.linkedin.metadata.authorization.PoliciesConfig;
 import com.linkedin.metadata.entity.EntityService;
 import com.linkedin.metadata.entity.EntityUtils;
+import com.linkedin.metadata.utils.SchemaFieldUtils;
 import com.linkedin.mxe.MetadataChangeProposal;
 import io.datahubproject.metadata.context.OperationContext;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nonnull;
@@ -50,6 +52,7 @@ public static void updateDeprecationForResources(
       boolean deprecated,
       @Nullable String note,
       @Nullable Long decommissionTime,
+      @Nullable String replacementUrn,
       List<ResourceRefInput> resources,
       Urn actor,
       EntityService entityService) {
@@ -57,7 +60,14 @@ public static void updateDeprecationForResources(
     for (ResourceRefInput resource : resources) {
       changes.add(
           buildUpdateDeprecationProposal(
-              opContext, deprecated, note, decommissionTime, resource, actor, entityService));
+              opContext,
+              deprecated,
+              note,
+              decommissionTime,
+              replacementUrn,
+              resource,
+              actor,
+              entityService));
     }
     EntityUtils.ingestChangeProposals(opContext, changes, entityService, actor, false);
   }
@@ -67,14 +77,38 @@ private static MetadataChangeProposal buildUpdateDeprecationProposal(
       boolean deprecated,
       @Nullable String note,
       @Nullable Long decommissionTime,
+      @Nullable String replacementUrn,
       ResourceRefInput resource,
       Urn actor,
       EntityService entityService) {
     String resourceUrn = resource.getResourceUrn();
+    String subResource = resource.getSubResource();
+    String targetUrn = "";
+
+    if (subResource == null) {
+      targetUrn = resourceUrn;
+    } else {
+      try {
+        targetUrn =
+            SchemaFieldUtils.generateSchemaFieldUrn(Urn.createFromString(resourceUrn), subResource)
+                .toString();
+      } catch (URISyntaxException e) {
+        throw new RuntimeException(e);
+      }
+    }
+
     Deprecation deprecation =
         getDeprecation(
-            opContext, entityService, resourceUrn, actor, note, deprecated, decommissionTime);
+            opContext,
+            entityService,
+            resourceUrn,
+            actor,
+            note,
+            deprecated,
+            decommissionTime,
+            replacementUrn);
+
     return MutationUtils.buildMetadataChangeProposalWithUrn(
-        UrnUtils.getUrn(resourceUrn), Constants.DEPRECATION_ASPECT_NAME, deprecation);
+        UrnUtils.getUrn(targetUrn), Constants.DEPRECATION_ASPECT_NAME, deprecation);
   }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/OwnerUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/OwnerUtils.java
index b9a12a19f617a3..c0951f926da42a 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/OwnerUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/OwnerUtils.java
@@ -337,4 +337,15 @@ public static String mapOwnershipTypeToEntity(String type) {
     final String typeName = SYSTEM_ID + type.toLowerCase();
     return Urn.createFromTuple(Constants.OWNERSHIP_TYPE_ENTITY_NAME, typeName).toString();
   }
+
+  public static boolean isAuthorizedToUpdateOwners(@Nonnull QueryContext context, Urn resourceUrn) {
+    final DisjunctivePrivilegeGroup orPrivilegeGroups =
+        new DisjunctivePrivilegeGroup(
+            ImmutableList.of(
+                ALL_PRIVILEGES_GROUP,
+                new ConjunctivePrivilegeGroup(
+                    ImmutableList.of(PoliciesConfig.EDIT_ENTITY_OWNERS_PRIVILEGE.getType()))));
+    return AuthorizationUtils.isAuthorized(
+        context, resourceUrn.getEntityType(), resourceUrn.toString(), orPrivilegeGroups);
+  }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/post/ListPostsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/post/ListPostsResolver.java
index dc7797882371b7..ba78466fa25898 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/post/ListPostsResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/post/ListPostsResolver.java
@@ -4,26 +4,34 @@
 import static com.linkedin.metadata.Constants.*;
 
 import com.datahub.authentication.Authentication;
+import com.google.common.collect.ImmutableList;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.datahub.graphql.QueryContext;
 import com.linkedin.datahub.graphql.concurrency.GraphQLConcurrencyUtils;
+import com.linkedin.datahub.graphql.generated.AndFilterInput;
+import com.linkedin.datahub.graphql.generated.FacetFilterInput;
+import com.linkedin.datahub.graphql.generated.FilterOperator;
 import com.linkedin.datahub.graphql.generated.ListPostsInput;
 import com.linkedin.datahub.graphql.generated.ListPostsResult;
+import com.linkedin.datahub.graphql.resolvers.ResolverUtils;
 import com.linkedin.datahub.graphql.types.post.PostMapper;
 import com.linkedin.entity.EntityResponse;
 import com.linkedin.entity.client.EntityClient;
+import com.linkedin.metadata.query.filter.Filter;
 import com.linkedin.metadata.query.filter.SortCriterion;
 import com.linkedin.metadata.query.filter.SortOrder;
 import com.linkedin.metadata.search.SearchEntity;
 import com.linkedin.metadata.search.SearchResult;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -47,7 +55,9 @@ public CompletableFuture<ListPostsResult> get(final DataFetchingEnvironment envi
     final Integer start = input.getStart() == null ? DEFAULT_START : input.getStart();
     final Integer count = input.getCount() == null ? DEFAULT_COUNT : input.getCount();
     final String query = input.getQuery() == null ? DEFAULT_QUERY : input.getQuery();
-
+    final String maybeResourceUrn = input.getResourceUrn() == null ? null : input.getResourceUrn();
+    final List<AndFilterInput> filters =
+        input.getOrFilters() == null ? new ArrayList<>() : input.getOrFilters();
     return GraphQLConcurrencyUtils.supplyAsync(
         () -> {
           try {
@@ -63,7 +73,7 @@ public CompletableFuture<ListPostsResult> get(final DataFetchingEnvironment envi
                     context.getOperationContext().withSearchFlags(flags -> flags.setFulltext(true)),
                     POST_ENTITY_NAME,
                     query,
-                    null,
+                    buildFilters(maybeResourceUrn, filters),
                     sortCriteria,
                     start,
                     count);
@@ -95,4 +105,22 @@ public CompletableFuture<ListPostsResult> get(final DataFetchingEnvironment envi
         this.getClass().getSimpleName(),
         "get");
   }
+
+  @Nullable
+  private Filter buildFilters(@Nullable String maybeResourceUrn, List<AndFilterInput> filters) {
+    // Or between filters provided by the user and the maybeResourceUrn if present
+    if (maybeResourceUrn != null) {
+      filters.add(
+          new AndFilterInput(
+              List.of(
+                  new FacetFilterInput(
+                      "target",
+                      null,
+                      ImmutableList.of(maybeResourceUrn),
+                      false,
+                      FilterOperator.EQUAL))));
+    }
+
+    return ResolverUtils.buildFilter(null, filters);
+  }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolver.java
index 3c84884bedbae8..778e8e3b61cd60 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolver.java
@@ -1,6 +1,7 @@
 package com.linkedin.datahub.graphql.resolvers.query;
 
 import static com.linkedin.datahub.graphql.resolvers.ResolverUtils.*;
+import static com.linkedin.datahub.graphql.resolvers.search.SearchUtils.*;
 import static com.linkedin.metadata.Constants.*;
 
 import com.google.common.collect.ImmutableList;
@@ -14,6 +15,7 @@
 import com.linkedin.datahub.graphql.generated.ListQueriesInput;
 import com.linkedin.datahub.graphql.generated.ListQueriesResult;
 import com.linkedin.datahub.graphql.generated.QueryEntity;
+import com.linkedin.datahub.graphql.resolvers.search.SearchUtils;
 import com.linkedin.entity.client.EntityClient;
 import com.linkedin.metadata.query.filter.Filter;
 import com.linkedin.metadata.query.filter.SortCriterion;
@@ -56,13 +58,26 @@ public CompletableFuture<ListQueriesResult> get(final DataFetchingEnvironment en
     final Integer start = input.getStart() == null ? DEFAULT_START : input.getStart();
     final Integer count = input.getCount() == null ? DEFAULT_COUNT : input.getCount();
     final String query = input.getQuery() == null ? DEFAULT_QUERY : input.getQuery();
+    final Filter inputFilter =
+        input.getOrFilters() != null
+            ? buildFilter(Collections.emptyList(), input.getOrFilters())
+            : null;
+    final Filter finalFilter =
+        inputFilter != null
+            ? SearchUtils.combineFilters(inputFilter, buildFilters(input))
+            : buildFilters(input);
 
     return GraphQLConcurrencyUtils.supplyAsync(
         () -> {
           try {
-            final List<SortCriterion> sortCriteria =
-                Collections.singletonList(
-                    new SortCriterion().setField(CREATED_AT_FIELD).setOrder(SortOrder.DESCENDING));
+            List<SortCriterion> sortCriteria =
+                input.getSortInput() != null
+                    ? Collections.singletonList(
+                        mapSortCriterion(input.getSortInput().getSortCriterion()))
+                    : Collections.singletonList(
+                        new SortCriterion()
+                            .setField(CREATED_AT_FIELD)
+                            .setOrder(SortOrder.DESCENDING));
 
             // First, get all Query Urns.
             final SearchResult gmsResult =
@@ -73,7 +88,7 @@ public CompletableFuture<ListQueriesResult> get(final DataFetchingEnvironment en
                             flags -> flags.setFulltext(true).setSkipHighlighting(true)),
                     QUERY_ENTITY_NAME,
                     query,
-                    buildFilters(input),
+                    finalFilter,
                     sortCriteria,
                     start,
                     count);
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java
index f105a72a1273ee..fbcce1a5e6b065 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java
@@ -23,11 +23,13 @@
 import com.linkedin.datahub.graphql.concurrency.GraphQLConcurrencyUtils;
 import com.linkedin.datahub.graphql.generated.EntityType;
 import com.linkedin.datahub.graphql.generated.FacetFilterInput;
+import com.linkedin.datahub.graphql.generated.ScrollResults;
 import com.linkedin.datahub.graphql.generated.SearchResults;
 import com.linkedin.datahub.graphql.generated.SearchSortInput;
 import com.linkedin.datahub.graphql.resolvers.ResolverUtils;
 import com.linkedin.datahub.graphql.types.common.mappers.SearchFlagsInputMapper;
 import com.linkedin.datahub.graphql.types.entitytype.EntityTypeMapper;
+import com.linkedin.datahub.graphql.types.mappers.UrnScrollResultsMapper;
 import com.linkedin.datahub.graphql.types.mappers.UrnSearchResultsMapper;
 import com.linkedin.entity.client.EntityClient;
 import com.linkedin.metadata.query.SearchFlags;
@@ -38,6 +40,7 @@
 import com.linkedin.metadata.query.filter.Filter;
 import com.linkedin.metadata.query.filter.SortCriterion;
 import com.linkedin.metadata.query.filter.SortOrder;
+import com.linkedin.metadata.search.ScrollResult;
 import com.linkedin.metadata.search.SearchResult;
 import com.linkedin.metadata.service.ViewService;
 import com.linkedin.view.DataHubViewInfo;
@@ -362,6 +365,93 @@ public static List<SortCriterion> getSortCriteria(@Nullable final SearchSortInpu
     return sortCriteria;
   }
 
+  public static CompletableFuture<ScrollResults> scrollAcrossEntities(
+      QueryContext inputContext,
+      final EntityClient _entityClient,
+      final ViewService _viewService,
+      List<EntityType> inputEntityTypes,
+      String inputQuery,
+      Filter baseFilter,
+      String viewUrn,
+      com.linkedin.datahub.graphql.generated.SearchFlags inputSearchFlags,
+      Integer inputCount,
+      String scrollId,
+      String inputKeepAlive,
+      String className) {
+
+    final List<EntityType> entityTypes =
+        (inputEntityTypes == null || inputEntityTypes.isEmpty())
+            ? SEARCHABLE_ENTITY_TYPES
+            : inputEntityTypes;
+    final List<String> entityNames =
+        entityTypes.stream().map(EntityTypeMapper::getName).collect(Collectors.toList());
+
+    // escape forward slash since it is a reserved character in Elasticsearch, default to * if
+    // blank/empty
+    final String query =
+        StringUtils.isNotBlank(inputQuery) ? ResolverUtils.escapeForwardSlash(inputQuery) : "*";
+
+    final Optional<SearchFlags> searchFlags =
+        Optional.ofNullable(inputSearchFlags)
+            .map((flags) -> SearchFlagsInputMapper.map(inputContext, flags));
+    final OperationContext context =
+        inputContext.getOperationContext().withSearchFlags(searchFlags::orElse);
+
+    final int count = Optional.ofNullable(inputCount).orElse(DEFAULT_SCROLL_COUNT);
+    final String keepAlive = Optional.ofNullable(inputKeepAlive).orElse(DEFAULT_SCROLL_KEEP_ALIVE);
+
+    return GraphQLConcurrencyUtils.supplyAsync(
+        () -> {
+          final OperationContext baseContext = inputContext.getOperationContext();
+          final Optional<DataHubViewInfo> maybeResolvedView =
+              Optional.ofNullable(viewUrn)
+                  .map((urn) -> resolveView(baseContext, _viewService, UrnUtils.getUrn(urn)));
+
+          final List<String> finalEntityNames =
+              maybeResolvedView
+                  .map(
+                      (view) ->
+                          intersectEntityTypes(entityNames, view.getDefinition().getEntityTypes()))
+                  .orElse(entityNames);
+
+          final Filter finalFilters =
+              maybeResolvedView
+                  .map((view) -> combineFilters(baseFilter, view.getDefinition().getFilter()))
+                  .orElse(baseFilter);
+
+          log.debug(
+              "Executing search for multiple entities: entity types {}, query {}, filters: {}, scrollId: {}, count: {}",
+              finalEntityNames,
+              query,
+              finalFilters,
+              scrollId,
+              count);
+
+          try {
+            final ScrollResult scrollResult =
+                _entityClient.scrollAcrossEntities(
+                    context, finalEntityNames, query, finalFilters, scrollId, keepAlive, count);
+            return UrnScrollResultsMapper.map(inputContext, scrollResult);
+          } catch (Exception e) {
+            log.warn(
+                "Failed to execute search for multiple entities: entity types {}, query {}, filters: {}, searchAfter: {}, count: {}",
+                finalEntityNames,
+                query,
+                finalFilters,
+                scrollId,
+                count);
+            throw new RuntimeException(
+                "Failed to execute search: "
+                    + String.format(
+                        "entity types %s, query %s, filters: %s, start: %s, count: %s",
+                        finalEntityNames, query, finalFilters, scrollId, count),
+                e);
+          }
+        },
+        className,
+        "scrollAcrossEntities");
+  }
+
   public static CompletableFuture<SearchResults> searchAcrossEntities(
       QueryContext inputContext,
       final EntityClient _entityClient,
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/siblings/SiblingsSearchResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/siblings/SiblingsSearchResolver.java
new file mode 100644
index 00000000000000..6e1425bc44166f
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/siblings/SiblingsSearchResolver.java
@@ -0,0 +1,66 @@
+package com.linkedin.datahub.graphql.resolvers.siblings;
+
+import static com.linkedin.datahub.graphql.resolvers.ResolverUtils.bindArgument;
+
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.generated.Entity;
+import com.linkedin.datahub.graphql.generated.ScrollAcrossEntitiesInput;
+import com.linkedin.datahub.graphql.generated.ScrollResults;
+import com.linkedin.datahub.graphql.resolvers.ResolverUtils;
+import com.linkedin.datahub.graphql.resolvers.search.SearchUtils;
+import com.linkedin.entity.client.EntityClient;
+import com.linkedin.metadata.query.filter.Condition;
+import com.linkedin.metadata.query.filter.ConjunctiveCriterion;
+import com.linkedin.metadata.query.filter.ConjunctiveCriterionArray;
+import com.linkedin.metadata.query.filter.Criterion;
+import com.linkedin.metadata.query.filter.CriterionArray;
+import com.linkedin.metadata.query.filter.Filter;
+import com.linkedin.metadata.service.ViewService;
+import com.linkedin.metadata.utils.CriterionUtils;
+import graphql.schema.DataFetcher;
+import graphql.schema.DataFetchingEnvironment;
+import java.util.concurrent.CompletableFuture;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/** Resolver that executes a searchAcrossEntities only on an entity's siblings */
+@Slf4j
+@RequiredArgsConstructor
+public class SiblingsSearchResolver implements DataFetcher<CompletableFuture<ScrollResults>> {
+
+  private static final String SIBLINGS_FIELD_NAME = "siblings";
+
+  private final EntityClient _entityClient;
+  private final ViewService _viewService;
+
+  @Override
+  public CompletableFuture<ScrollResults> get(DataFetchingEnvironment environment) {
+    final Entity entity = environment.getSource();
+    final QueryContext context = environment.getContext();
+    final ScrollAcrossEntitiesInput input =
+        bindArgument(environment.getArgument("input"), ScrollAcrossEntitiesInput.class);
+
+    final Criterion siblingsFilter =
+        CriterionUtils.buildCriterion(SIBLINGS_FIELD_NAME, Condition.EQUAL, entity.getUrn());
+    final Filter baseFilter =
+        new Filter()
+            .setOr(
+                new ConjunctiveCriterionArray(
+                    new ConjunctiveCriterion().setAnd(new CriterionArray(siblingsFilter))));
+    final Filter inputFilter = ResolverUtils.buildFilter(null, input.getOrFilters());
+
+    return SearchUtils.scrollAcrossEntities(
+        context,
+        _entityClient,
+        _viewService,
+        input.getTypes(),
+        input.getQuery(),
+        SearchUtils.combineFilters(inputFilter, baseFilter),
+        input.getViewUrn(),
+        input.getSearchFlags(),
+        input.getCount(),
+        input.getScrollId(),
+        input.getKeepAlive(),
+        this.getClass().getSimpleName());
+  }
+}
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/timeline/GetTimelineResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/timeline/GetTimelineResolver.java
new file mode 100644
index 00000000000000..94d925b6e82548
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/timeline/GetTimelineResolver.java
@@ -0,0 +1,80 @@
+package com.linkedin.datahub.graphql.resolvers.timeline;
+
+import static com.linkedin.datahub.graphql.resolvers.ResolverUtils.*;
+
+import com.linkedin.common.urn.Urn;
+import com.linkedin.datahub.graphql.generated.ChangeCategoryType;
+import com.linkedin.datahub.graphql.generated.GetTimelineInput;
+import com.linkedin.datahub.graphql.generated.GetTimelineResult;
+import com.linkedin.datahub.graphql.types.timeline.mappers.ChangeTransactionMapper;
+import com.linkedin.metadata.timeline.TimelineService;
+import com.linkedin.metadata.timeline.data.ChangeCategory;
+import com.linkedin.metadata.timeline.data.ChangeTransaction;
+import graphql.schema.DataFetcher;
+import graphql.schema.DataFetchingEnvironment;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+
+/*
+Returns the timeline in its original form
+ */
+@Slf4j
+public class GetTimelineResolver implements DataFetcher<CompletableFuture<GetTimelineResult>> {
+  private final TimelineService _timelineService;
+
+  public GetTimelineResolver(TimelineService timelineService) {
+    _timelineService = timelineService;
+  }
+
+  @Override
+  public CompletableFuture<GetTimelineResult> get(final DataFetchingEnvironment environment)
+      throws Exception {
+    final GetTimelineInput input =
+        bindArgument(environment.getArgument("input"), GetTimelineInput.class);
+
+    final String datasetUrnString = input.getUrn();
+    final List<ChangeCategoryType> changeCategories = input.getChangeCategories();
+    final long startTime = 0;
+    final long endTime = 0;
+    //    final String version = input.getVersion() == null ? null : input.getVersion();
+
+    return CompletableFuture.supplyAsync(
+        () -> {
+          try {
+            final Set<ChangeCategory> changeCategorySet =
+                changeCategories != null
+                    ? changeCategories.stream()
+                        .map(
+                            changeCategoryType ->
+                                ChangeCategory.valueOf(changeCategoryType.toString()))
+                        .collect(Collectors.toSet())
+                    : Arrays.stream(ChangeCategory.values()).collect(Collectors.toSet());
+            final Urn datasetUrn = Urn.createFromString(datasetUrnString);
+            final List<ChangeTransaction> changeTransactionList =
+                _timelineService.getTimeline(
+                    datasetUrn, changeCategorySet, startTime, endTime, null, null, false);
+            GetTimelineResult result = new GetTimelineResult();
+            result.setChangeTransactions(
+                changeTransactionList.stream()
+                    .map(ChangeTransactionMapper::map)
+                    .collect(Collectors.toList()));
+            return result;
+          } catch (URISyntaxException u) {
+            log.error(
+                String.format(
+                    "Failed to list schema blame data, likely due to the Urn %s being invalid",
+                    datasetUrnString),
+                u);
+            return null;
+          } catch (Exception e) {
+            log.error("Failed to list schema blame data", e);
+            return null;
+          }
+        });
+  }
+}
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DeprecationMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DeprecationMapper.java
index 6959a6dcbd0393..c7523f946b950a 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DeprecationMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DeprecationMapper.java
@@ -23,6 +23,9 @@ public Deprecation apply(
     result.setActorEntity(UrnToEntityMapper.map(context, input.getActor()));
     result.setDeprecated(input.isDeprecated());
     result.setDecommissionTime(input.getDecommissionTime());
+    if (input.getReplacement() != null) {
+      result.setReplacement(UrnToEntityMapper.map(context, input.getReplacement()));
+    }
     result.setNote(input.getNote());
     return result;
   }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DisplayPropertiesMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DisplayPropertiesMapper.java
new file mode 100644
index 00000000000000..4e62a2d42baaac
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DisplayPropertiesMapper.java
@@ -0,0 +1,47 @@
+package com.linkedin.datahub.graphql.types.common.mappers;
+
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.generated.DisplayProperties;
+import com.linkedin.datahub.graphql.generated.IconLibrary;
+import com.linkedin.datahub.graphql.generated.IconProperties;
+import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
+import javax.annotation.Nullable;
+
+public class DisplayPropertiesMapper
+    implements ModelMapper<com.linkedin.common.DisplayProperties, DisplayProperties> {
+  public static final DisplayPropertiesMapper INSTANCE = new DisplayPropertiesMapper();
+
+  public static DisplayProperties map(
+      @Nullable final QueryContext context, com.linkedin.common.DisplayProperties input) {
+    return INSTANCE.apply(context, input);
+  }
+
+  @Override
+  public DisplayProperties apply(
+      @Nullable final QueryContext context, com.linkedin.common.DisplayProperties input) {
+    final DisplayProperties result = new DisplayProperties();
+
+    if (input.hasColorHex()) {
+      result.setColorHex(input.getColorHex());
+    }
+    if (input.hasIcon()) {
+      final com.linkedin.common.IconProperties iconPropertiesInput = input.getIcon();
+      if (iconPropertiesInput != null) {
+        final IconProperties iconPropertiesResult = new IconProperties();
+        if (iconPropertiesInput.hasIconLibrary()) {
+          iconPropertiesResult.setIconLibrary(
+              IconLibrary.valueOf(iconPropertiesInput.getIconLibrary().toString()));
+        }
+        if (iconPropertiesInput.hasName()) {
+          iconPropertiesResult.setName(iconPropertiesInput.getName());
+        }
+        if (iconPropertiesInput.hasStyle()) {
+          iconPropertiesResult.setStyle(iconPropertiesInput.getStyle());
+        }
+        result.setIcon(iconPropertiesResult);
+      }
+    }
+
+    return result;
+  }
+}
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/UrnToEntityMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/UrnToEntityMapper.java
index b815c1b1c1dd9f..694cda13a70e26 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/UrnToEntityMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/UrnToEntityMapper.java
@@ -25,6 +25,7 @@
 import com.linkedin.datahub.graphql.generated.ERModelRelationship;
 import com.linkedin.datahub.graphql.generated.Entity;
 import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.datahub.graphql.generated.Form;
 import com.linkedin.datahub.graphql.generated.GlossaryNode;
 import com.linkedin.datahub.graphql.generated.GlossaryTerm;
 import com.linkedin.datahub.graphql.generated.MLFeature;
@@ -34,6 +35,7 @@
 import com.linkedin.datahub.graphql.generated.MLPrimaryKey;
 import com.linkedin.datahub.graphql.generated.Notebook;
 import com.linkedin.datahub.graphql.generated.OwnershipTypeEntity;
+import com.linkedin.datahub.graphql.generated.Post;
 import com.linkedin.datahub.graphql.generated.QueryEntity;
 import com.linkedin.datahub.graphql.generated.Restricted;
 import com.linkedin.datahub.graphql.generated.Role;
@@ -227,6 +229,16 @@ public Entity apply(@Nullable QueryContext context, Urn input) {
       ((BusinessAttribute) partialEntity).setUrn(input.toString());
       ((BusinessAttribute) partialEntity).setType(EntityType.BUSINESS_ATTRIBUTE);
     }
+    if (input.getEntityType().equals(FORM_ENTITY_NAME)) {
+      partialEntity = new Form();
+      ((Form) partialEntity).setUrn(input.toString());
+      ((Form) partialEntity).setType(EntityType.FORM);
+    }
+    if (input.getEntityType().equals(POST_ENTITY_NAME)) {
+      partialEntity = new Post();
+      ((Post) partialEntity).setUrn(input.toString());
+      ((Post) partialEntity).setType(EntityType.POST);
+    }
     if (input.getEntityType().equals(DATA_PROCESS_INSTANCE_ENTITY_NAME)) {
       partialEntity = new DataProcessInstance();
       ((DataProcessInstance) partialEntity).setUrn(input.toString());
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/container/ContainerType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/container/ContainerType.java
index 37b021fcb1091a..fc47966b21903c 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/container/ContainerType.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/container/ContainerType.java
@@ -53,7 +53,8 @@ public class ContainerType
           Constants.DATA_PRODUCTS_ASPECT_NAME,
           Constants.STRUCTURED_PROPERTIES_ASPECT_NAME,
           Constants.FORMS_ASPECT_NAME,
-          Constants.ACCESS_ASPECT_NAME);
+          Constants.ACCESS_ASPECT_NAME,
+          Constants.BROWSE_PATHS_V2_ASPECT_NAME);
 
   private static final Set<String> FACET_FIELDS = ImmutableSet.of("origin", "platform");
   private static final String ENTITY_NAME = "container";
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/container/mappers/ContainerMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/container/mappers/ContainerMapper.java
index 7ac00c46475bce..5393235de26b45 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/container/mappers/ContainerMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/container/mappers/ContainerMapper.java
@@ -3,6 +3,7 @@
 import static com.linkedin.metadata.Constants.*;
 
 import com.linkedin.common.Access;
+import com.linkedin.common.BrowsePathsV2;
 import com.linkedin.common.DataPlatformInstance;
 import com.linkedin.common.Deprecation;
 import com.linkedin.common.Forms;
@@ -20,6 +21,7 @@
 import com.linkedin.datahub.graphql.generated.Container;
 import com.linkedin.datahub.graphql.generated.DataPlatform;
 import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.datahub.graphql.types.common.mappers.BrowsePathsV2Mapper;
 import com.linkedin.datahub.graphql.types.common.mappers.CustomPropertiesMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.DataPlatformInstanceAspectMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.DeprecationMapper;
@@ -172,6 +174,13 @@ public static Container map(
           FormsMapper.map(new Forms(envelopedForms.getValue().data()), entityUrn.toString()));
     }
 
+    final EnvelopedAspect envelopedBrowsePathsV2 = aspects.get(BROWSE_PATHS_V2_ASPECT_NAME);
+    if (envelopedBrowsePathsV2 != null) {
+      result.setBrowsePathV2(
+          BrowsePathsV2Mapper.map(
+              context, new BrowsePathsV2(envelopedBrowsePathsV2.getValue().data())));
+    }
+
     return result;
   }
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/corpuser/mappers/CorpUserMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/corpuser/mappers/CorpUserMapper.java
index a94b555daebdfb..e37322c3f5fd92 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/corpuser/mappers/CorpUserMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/corpuser/mappers/CorpUserMapper.java
@@ -134,6 +134,7 @@ private CorpUserAppearanceSettings mapCorpUserAppearanceSettings(
     if (corpUserSettings.hasAppearance()) {
       appearanceResult.setShowSimplifiedHomepage(
           corpUserSettings.getAppearance().isShowSimplifiedHomepage());
+      appearanceResult.setShowThemeV2(corpUserSettings.getAppearance().isShowThemeV2());
     }
     return appearanceResult;
   }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/domain/DomainMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/domain/DomainMapper.java
index ffcb94a0b7e29e..f0792928bef089 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/domain/DomainMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/domain/DomainMapper.java
@@ -4,6 +4,7 @@
 import static com.linkedin.metadata.Constants.FORMS_ASPECT_NAME;
 import static com.linkedin.metadata.Constants.STRUCTURED_PROPERTIES_ASPECT_NAME;
 
+import com.linkedin.common.DisplayProperties;
 import com.linkedin.common.Forms;
 import com.linkedin.common.InstitutionalMemory;
 import com.linkedin.common.Ownership;
@@ -12,6 +13,7 @@
 import com.linkedin.datahub.graphql.authorization.AuthorizationUtils;
 import com.linkedin.datahub.graphql.generated.Domain;
 import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.datahub.graphql.types.common.mappers.DisplayPropertiesMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.InstitutionalMemoryMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipMapper;
 import com.linkedin.datahub.graphql.types.form.FormsMapper;
@@ -82,6 +84,14 @@ public static Domain map(@Nullable QueryContext context, final EntityResponse en
           FormsMapper.map(new Forms(envelopedForms.getValue().data()), entityUrn.toString()));
     }
 
+    final EnvelopedAspect envelopedDisplayProperties =
+        aspects.get(Constants.DISPLAY_PROPERTIES_ASPECT_NAME);
+    if (envelopedDisplayProperties != null) {
+      result.setDisplayProperties(
+          DisplayPropertiesMapper.map(
+              context, new DisplayProperties(envelopedDisplayProperties.getValue().data())));
+    }
+
     if (context != null && !canView(context.getOperationContext(), entityUrn)) {
       return AuthorizationUtils.restrictEntity(result, Domain.class);
     } else {
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/glossary/mappers/GlossaryNodeMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/glossary/mappers/GlossaryNodeMapper.java
index a694b62999080e..f8425952bcdfe4 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/glossary/mappers/GlossaryNodeMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/glossary/mappers/GlossaryNodeMapper.java
@@ -3,6 +3,7 @@
 import static com.linkedin.datahub.graphql.authorization.AuthorizationUtils.canView;
 import static com.linkedin.metadata.Constants.*;
 
+import com.linkedin.common.DisplayProperties;
 import com.linkedin.common.Forms;
 import com.linkedin.common.Ownership;
 import com.linkedin.common.urn.Urn;
@@ -13,6 +14,7 @@
 import com.linkedin.datahub.graphql.generated.GlossaryNode;
 import com.linkedin.datahub.graphql.generated.GlossaryNodeProperties;
 import com.linkedin.datahub.graphql.types.common.mappers.CustomPropertiesMapper;
+import com.linkedin.datahub.graphql.types.common.mappers.DisplayPropertiesMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.util.MappingHelper;
 import com.linkedin.datahub.graphql.types.form.FormsMapper;
@@ -65,6 +67,11 @@ public GlossaryNode apply(
         FORMS_ASPECT_NAME,
         ((entity, dataMap) ->
             entity.setForms(FormsMapper.map(new Forms(dataMap), entityUrn.toString()))));
+    mappingHelper.mapToResult(
+        DISPLAY_PROPERTIES_ASPECT_NAME,
+        ((glossaryNode, dataMap) ->
+            glossaryNode.setDisplayProperties(
+                DisplayPropertiesMapper.map(context, new DisplayProperties(dataMap)))));
 
     if (context != null && !canView(context.getOperationContext(), entityUrn)) {
       return AuthorizationUtils.restrictEntity(mappingHelper.getResult(), GlossaryNode.class);
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/MapperUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/MapperUtils.java
index 8fe58df2d2edec..f747ba7ee4bd25 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/MapperUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/MapperUtils.java
@@ -86,7 +86,8 @@ public static FacetMetadata mapFacet(
                         filterValue.getFacetCount(),
                         filterValue.getEntity() == null
                             ? null
-                            : UrnToEntityMapper.map(context, filterValue.getEntity())))
+                            : UrnToEntityMapper.map(context, filterValue.getEntity()),
+                        null))
             .collect(Collectors.toList()));
     return facetMetadata;
   }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/post/PostMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/post/PostMapper.java
index 674011a4f2f288..e33db2a013190f 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/post/PostMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/post/PostMapper.java
@@ -48,6 +48,11 @@ private void mapPostInfo(@Nonnull Post post, @Nonnull DataMap dataMap) {
     post.setContent(mapPostContent(postInfo.getContent()));
     AuditStamp lastModified = new AuditStamp();
     lastModified.setTime(postInfo.getLastModified());
+    if (postInfo.hasAuditStamp()
+        && postInfo.getAuditStamp() != null
+        && postInfo.getAuditStamp().hasActor()) {
+      lastModified.setActor(postInfo.getAuditStamp().getActor().toString());
+    }
     post.setLastModified(lastModified);
   }
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/post/PostType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/post/PostType.java
new file mode 100644
index 00000000000000..c0b5ae8a32f065
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/post/PostType.java
@@ -0,0 +1,80 @@
+package com.linkedin.datahub.graphql.types.post;
+
+import static com.linkedin.datahub.graphql.authorization.AuthorizationUtils.canView;
+import static com.linkedin.metadata.Constants.POST_INFO_ASPECT_NAME;
+
+import com.google.common.collect.ImmutableSet;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.datahub.graphql.QueryContext;
+import com.linkedin.datahub.graphql.generated.Entity;
+import com.linkedin.datahub.graphql.generated.Post;
+import com.linkedin.datahub.graphql.types.EntityType;
+import com.linkedin.entity.EntityResponse;
+import com.linkedin.entity.client.EntityClient;
+import com.linkedin.metadata.Constants;
+import graphql.execution.DataFetcherResult;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class PostType implements EntityType<Post, String> {
+  public static final Set<String> ASPECTS_TO_FETCH = ImmutableSet.of(POST_INFO_ASPECT_NAME);
+
+  private final EntityClient _entityClient;
+
+  @Override
+  public com.linkedin.datahub.graphql.generated.EntityType type() {
+    return com.linkedin.datahub.graphql.generated.EntityType.POST;
+  }
+
+  @Override
+  public Function<Entity, String> getKeyProvider() {
+    return Entity::getUrn;
+  }
+
+  @Override
+  public Class<Post> objectClass() {
+    return Post.class;
+  }
+
+  @Override
+  public List<DataFetcherResult<Post>> batchLoad(
+      @Nonnull List<String> urns, @Nonnull QueryContext context) throws Exception {
+    try {
+      final List<Urn> postUrns = urns.stream().map(UrnUtils::getUrn).collect(Collectors.toList());
+
+      final Map<Urn, EntityResponse> postMap =
+          _entityClient.batchGetV2(
+              context.getOperationContext(),
+              Constants.POST_ENTITY_NAME,
+              postUrns.stream()
+                  .filter(urn -> canView(context.getOperationContext(), urn))
+                  .collect(Collectors.toSet()),
+              ASPECTS_TO_FETCH);
+
+      final List<EntityResponse> gmsResults = new ArrayList<>(urns.size());
+      for (Urn urn : postUrns) {
+        gmsResults.add(postMap.getOrDefault(urn, null));
+      }
+
+      return gmsResults.stream()
+          .map(
+              gmsPost ->
+                  gmsPost == null
+                      ? null
+                      : DataFetcherResult.<Post>newResult()
+                          .data(PostMapper.map(context, gmsPost))
+                          .build())
+          .collect(Collectors.toList());
+    } catch (Exception e) {
+      throw new RuntimeException("Failed to batch load Queries", e);
+    }
+  }
+}
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/query/QueryMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/query/QueryMapper.java
index 916ebc772f545f..71b66b38fe05ac 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/query/QueryMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/query/QueryMapper.java
@@ -4,6 +4,7 @@
 
 import com.linkedin.common.DataPlatformInstance;
 import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.data.DataMap;
 import com.linkedin.datahub.graphql.QueryContext;
 import com.linkedin.datahub.graphql.generated.DataPlatform;
@@ -11,6 +12,7 @@
 import com.linkedin.datahub.graphql.generated.EntityType;
 import com.linkedin.datahub.graphql.generated.QueryEntity;
 import com.linkedin.datahub.graphql.generated.QuerySubject;
+import com.linkedin.datahub.graphql.generated.SchemaFieldEntity;
 import com.linkedin.datahub.graphql.types.common.mappers.QueryPropertiesMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.util.MappingHelper;
 import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
@@ -67,16 +69,36 @@ private void mapQuerySubjects(@Nonnull QueryEntity query, @Nonnull DataMap dataM
     QuerySubjects querySubjects = new QuerySubjects(dataMap);
     List<QuerySubject> res =
         querySubjects.getSubjects().stream()
-            .map(sub -> new QuerySubject(createPartialDataset(sub.getEntity())))
+            .map(this::mapQuerySubject)
             .collect(Collectors.toList());
 
     query.setSubjects(res);
   }
 
+  @Nonnull
+  private QuerySubject mapQuerySubject(com.linkedin.query.QuerySubject subject) {
+    QuerySubject result = new QuerySubject();
+    if (subject.getEntity().getEntityType().equals(DATASET_ENTITY_NAME)) {
+      result.setDataset(createPartialDataset(subject.getEntity()));
+    } else if (subject.getEntity().getEntityType().equals(SCHEMA_FIELD_ENTITY_NAME)) {
+      String parentDataset = subject.getEntity().getEntityKey().get(0);
+      result.setDataset(createPartialDataset(UrnUtils.getUrn(parentDataset)));
+      result.setSchemaField(createPartialSchemaField(subject.getEntity()));
+    }
+    return result;
+  }
+
   @Nonnull
   private Dataset createPartialDataset(@Nonnull Urn datasetUrn) {
     Dataset partialDataset = new Dataset();
     partialDataset.setUrn(datasetUrn.toString());
     return partialDataset;
   }
+
+  @Nonnull
+  private SchemaFieldEntity createPartialSchemaField(@Nonnull Urn urn) {
+    SchemaFieldEntity partialSchemaField = new SchemaFieldEntity();
+    partialSchemaField.setUrn(urn.toString());
+    return partialSchemaField;
+  }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/schemafield/SchemaFieldMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/schemafield/SchemaFieldMapper.java
index 30eac54aede9bb..b476fa202d3097 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/schemafield/SchemaFieldMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/schemafield/SchemaFieldMapper.java
@@ -3,13 +3,17 @@
 import static com.linkedin.metadata.Constants.*;
 
 import com.linkedin.businessattribute.BusinessAttributes;
+import com.linkedin.common.Deprecation;
 import com.linkedin.common.Documentation;
+import com.linkedin.common.Status;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.datahub.graphql.QueryContext;
 import com.linkedin.datahub.graphql.generated.EntityType;
 import com.linkedin.datahub.graphql.generated.SchemaFieldEntity;
 import com.linkedin.datahub.graphql.types.businessattribute.mappers.BusinessAttributesMapper;
+import com.linkedin.datahub.graphql.types.common.mappers.DeprecationMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.DocumentationMapper;
+import com.linkedin.datahub.graphql.types.common.mappers.StatusMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.UrnToEntityMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.util.MappingHelper;
 import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
@@ -52,6 +56,15 @@ public SchemaFieldEntity apply(
         DOCUMENTATION_ASPECT_NAME,
         (entity, dataMap) ->
             entity.setDocumentation(DocumentationMapper.map(context, new Documentation(dataMap))));
+    mappingHelper.mapToResult(
+        STATUS_ASPECT_NAME,
+        (entity, dataMap) -> entity.setStatus(StatusMapper.map(context, new Status(dataMap))));
+    mappingHelper.mapToResult(
+        DEPRECATION_ASPECT_NAME,
+        ((schemaField, dataMap) ->
+            schemaField.setDeprecation(
+                DeprecationMapper.map(context, new Deprecation((dataMap))))));
+
     return result;
   }
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/schemafield/SchemaFieldType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/schemafield/SchemaFieldType.java
index 2fa26d8cf2cdd7..5ed40f843bdf79 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/schemafield/SchemaFieldType.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/schemafield/SchemaFieldType.java
@@ -31,7 +31,11 @@ public class SchemaFieldType
 
   public static final Set<String> ASPECTS_TO_FETCH =
       ImmutableSet.of(
-          STRUCTURED_PROPERTIES_ASPECT_NAME, BUSINESS_ATTRIBUTE_ASPECT, DOCUMENTATION_ASPECT_NAME);
+          STRUCTURED_PROPERTIES_ASPECT_NAME,
+          DEPRECATION_ASPECT_NAME,
+          BUSINESS_ATTRIBUTE_ASPECT,
+          DOCUMENTATION_ASPECT_NAME,
+          STATUS_ASPECT_NAME);
 
   private final EntityClient _entityClient;
   private final FeatureFlags _featureFlags;
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/timeline/mappers/ChangeEventMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/timeline/mappers/ChangeEventMapper.java
new file mode 100644
index 00000000000000..8c39760f739487
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/timeline/mappers/ChangeEventMapper.java
@@ -0,0 +1,47 @@
+package com.linkedin.datahub.graphql.types.timeline.mappers;
+
+import com.linkedin.datahub.graphql.generated.ChangeCategoryType;
+import com.linkedin.datahub.graphql.generated.ChangeOperationType;
+import com.linkedin.metadata.timeline.data.ChangeEvent;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import lombok.extern.slf4j.Slf4j;
+
+// Class for converting ChangeTransactions received from the Timeline API to SchemaFieldBlame
+// structs for every schema
+// at every semantic version.
+@Slf4j
+public class ChangeEventMapper {
+
+  public static com.linkedin.datahub.graphql.generated.ChangeEvent map(
+      @Nonnull final ChangeEvent incomingChangeEvent) {
+    final com.linkedin.datahub.graphql.generated.ChangeEvent result =
+        new com.linkedin.datahub.graphql.generated.ChangeEvent();
+
+    //    result.setAuditStamp(AuditStampMapper.map(incomingChangeEvent.getAuditStamp()));
+    result.setUrn("empty");
+    result.setCategory(ChangeCategoryType.valueOf(incomingChangeEvent.getCategory().toString()));
+    result.setDescription(incomingChangeEvent.getDescription());
+    result.setModifier(incomingChangeEvent.getModifier());
+    result.setOperation(ChangeOperationType.valueOf(incomingChangeEvent.getOperation().toString()));
+    if (incomingChangeEvent.getParameters() != null) {
+      result.setParameters(
+          incomingChangeEvent.getParameters().entrySet().stream()
+              .map(
+                  entry -> {
+                    final com.linkedin.datahub.graphql.generated.TimelineParameterEntry
+                        changeParameter =
+                            new com.linkedin.datahub.graphql.generated.TimelineParameterEntry();
+                    changeParameter.setKey(entry.getKey());
+                    changeParameter.setValue(entry.getValue().toString());
+                    return changeParameter;
+                  })
+              .collect(Collectors.toList()));
+    }
+    result.setUrn(result.getUrn());
+
+    return result;
+  }
+
+  private ChangeEventMapper() {}
+}
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/timeline/mappers/ChangeTransactionMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/timeline/mappers/ChangeTransactionMapper.java
new file mode 100644
index 00000000000000..91d30f93cf2e83
--- /dev/null
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/timeline/mappers/ChangeTransactionMapper.java
@@ -0,0 +1,37 @@
+package com.linkedin.datahub.graphql.types.timeline.mappers;
+
+import com.linkedin.datahub.graphql.generated.ChangeOperationType;
+import com.linkedin.metadata.timeline.data.ChangeTransaction;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import lombok.extern.slf4j.Slf4j;
+
+// Class for converting ChangeTransactions received from the Timeline API to SchemaFieldBlame
+// structs for every schema
+// at every semantic version.
+@Slf4j
+public class ChangeTransactionMapper {
+
+  public static com.linkedin.datahub.graphql.generated.ChangeTransaction map(
+      @Nonnull final ChangeTransaction incomingChangeTransaction) {
+    final com.linkedin.datahub.graphql.generated.ChangeTransaction result =
+        new com.linkedin.datahub.graphql.generated.ChangeTransaction();
+
+    result.setLastSemanticVersion(
+        incomingChangeTransaction.getSemVer() == null
+            ? "none"
+            : incomingChangeTransaction.getSemVer());
+    result.setTimestampMillis(incomingChangeTransaction.getTimestamp());
+    result.setVersionStamp("none");
+    result.setChangeType(ChangeOperationType.MODIFY);
+
+    result.setChanges(
+        incomingChangeTransaction.getChangeEvents().stream()
+            .map(ChangeEventMapper::map)
+            .collect(Collectors.toList()));
+
+    return result;
+  }
+
+  private ChangeTransactionMapper() {}
+}
diff --git a/datahub-graphql-core/src/main/resources/app.graphql b/datahub-graphql-core/src/main/resources/app.graphql
index ca7f89415f6b87..6c45419b622a89 100644
--- a/datahub-graphql-core/src/main/resources/app.graphql
+++ b/datahub-graphql-core/src/main/resources/app.graphql
@@ -231,6 +231,11 @@ type AppConfig {
   Feature flags telling the UI whether a feature is enabled or not
   """
   featureFlags: FeatureFlagsConfig!
+
+  """
+  Configuration related to the DataHub Chrome Extension
+  """
+  chromeExtensionConfig: ChromeExtensionConfig!
 }
 
 """
@@ -487,6 +492,11 @@ type FeatureFlagsConfig {
   """
   platformBrowseV2: Boolean!
 
+  """
+  Whether to show the new lineage visualization.
+  """
+  lineageGraphV2: Boolean!
+
   """
   Whether we should show CTAs in the UI related to moving to DataHub Cloud by Acryl.
   """
@@ -522,6 +532,30 @@ type FeatureFlagsConfig {
   """
   editableDatasetNameEnabled: Boolean!
 
+  """
+  Allows the V2 theme to be turned on.
+  Includes new UX for home page, search, entity profiles, and lineage.
+  If false, then the V2 experience will be unavailable even if themeV2Default or themeV2Toggleable are true.
+  """
+  themeV2Enabled: Boolean!
+
+  """
+  Sets the default theme to V2.
+  If `themeV2Toggleable` is set, then users can toggle between V1 and V2.
+  If not, then the default is the only option.
+  """
+  themeV2Default: Boolean!
+
+  """
+  Allows the V2 theme to be toggled by users.
+  """
+  themeV2Toggleable: Boolean!
+
+  """
+  Enables links to schema field-level lineage on lineage explorer.
+  """
+  schemaFieldCLLEnabled: Boolean!
+
   """
   If turned on, all siblings will be separated with no way to get to a "combined" sibling view
   """
@@ -532,6 +566,29 @@ type FeatureFlagsConfig {
   """
   showManageStructuredProperties: Boolean!
 
+  """
+  If turned on, hides DBT Sources from lineage by:
+  i) Hiding the source in the lineage graph, if it has no downstreams
+  ii) Swapping to the source's sibling urn on V2 lineage graph
+  iii) Representing source sibling as a merged node, with both icons on graph and combined version in sidebar
+  """
+  hideDbtSourceInLineage: Boolean!
+
+  """
+  If turned on, schema field lineage will always fetch ghost entities and present them as real
+  """
+  schemaFieldLineageIgnoreStatus: Boolean!
+
+  """
+  If turned on, show the newly designed nav bar in the V2 experience
+  """
+  showNavBarRedesign: Boolean!
+
+  """
+  If turned on, we display auto complete results. Otherwise, do not.
+  """
+  showAutoCompleteResults: Boolean!
+
   """
   If turned on, exposes the versioning feature by allowing users to link entities in the UI.
   """
@@ -579,3 +636,18 @@ type DocPropagationSettings {
   """
   docColumnPropagation: Boolean
 }
+"""
+Configurations related to DataHub Chrome extension
+"""
+type ChromeExtensionConfig {
+  """
+  Whether the Chrome Extension is enabled
+  """
+  enabled: Boolean!
+
+  """
+  Whether lineage is enabled
+  """
+  lineageEnabled: Boolean!
+}
+
diff --git a/datahub-graphql-core/src/main/resources/auth.graphql b/datahub-graphql-core/src/main/resources/auth.graphql
index 5ce26067fe58e3..81d8689dcdfdd0 100644
--- a/datahub-graphql-core/src/main/resources/auth.graphql
+++ b/datahub-graphql-core/src/main/resources/auth.graphql
@@ -286,6 +286,86 @@ type EntityPrivileges {
   Whether or not a user can update the properties for the entity (e.g. dataset)
   """
   canEditProperties: Boolean
+
+   """
+  Whether or not a user can update tags for the entity
+  """
+  canEditTags: Boolean
+
+  """
+  Whether or not a user can update glossary terms for the entity
+  """
+  canEditGlossaryTerms: Boolean
+
+  """
+  Whether or not a user can update the description for the entity
+  """
+  canEditDescription: Boolean
+
+  """
+  Whether or not a user can update the links for the entity
+  """
+  canEditLinks: Boolean
+
+  """
+  Whether or not a user can update the domain(s) for the entity
+  """
+  canEditDomains: Boolean
+
+  """
+  Whether or not a user can update the data product(s) that the entity belongs to
+  """
+  canEditDataProducts: Boolean
+
+  """
+  Whether or not a user can update the owners for the entity
+  """
+  canEditOwners: Boolean
+
+  """
+  Whether or not a user can update the incidents for an asset
+  """
+  canEditIncidents: Boolean
+
+  """
+  Whether or not a user can update assertions for an asset
+  """
+  canEditAssertions: Boolean
+
+  """
+  Whether or not a user can update the deprecation status for an entity
+  """
+  canEditDeprecation: Boolean
+
+  """
+  Whether or not a user can update the schema field tags for a dataset
+  """
+  canEditSchemaFieldTags: Boolean
+
+  """
+  Whether or not a user can update the schema field tags for a dataset
+  """
+  canEditSchemaFieldGlossaryTerms: Boolean
+
+  """
+  Whether or not a user can update the schema field tags for a dataset
+  """
+  canEditSchemaFieldDescription: Boolean
+
+  """
+  Whether the user can view dataset usage stats
+  """
+  canViewDatasetUsage: Boolean
+
+  """
+  Whether the user can view dataset profiling stats
+  """
+  canViewDatasetProfile: Boolean
+
+  """
+  Whether the user can view dataset operations
+  """
+  canViewDatasetOperations: Boolean
 }
 
 """
diff --git a/datahub-graphql-core/src/main/resources/entity.graphql b/datahub-graphql-core/src/main/resources/entity.graphql
index 64c79b05745ded..f6adf884b2badc 100644
--- a/datahub-graphql-core/src/main/resources/entity.graphql
+++ b/datahub-graphql-core/src/main/resources/entity.graphql
@@ -956,6 +956,11 @@ type Mutation {
     Remove Business Attribute
     """
     removeBusinessAttribute(input: AddBusinessAttributeInput!): Boolean
+
+    """
+    Update a particular entity's display properties
+    """
+    updateDisplayProperties(urn: String!, input: DisplayPropertiesUpdateInput!): Boolean
 }
 
 """
@@ -1750,6 +1755,11 @@ type Dataset implements EntityWithRelationships & Entity & BrowsableEntity {
     """
     siblings: SiblingProperties
 
+    """
+    Executes a search on only the siblings of an entity
+    """
+    siblingsSearch(input: ScrollAcrossEntitiesInput!): ScrollResults
+
     """
     Lineage information for the column-level. Includes a list of objects
     detailing which columns are upstream and which are downstream of each other.
@@ -1862,6 +1872,68 @@ type RoleProperties {
     requestUrl: String
 }
 
+"""
+Properties related to how the entity is displayed in the Datahub UI
+"""
+type DisplayProperties {
+    """
+    Color associated with the entity in Hex. For example #FFFFFF
+    """
+    colorHex: String
+
+    """
+    The icon associated with the entity
+    """
+    icon: IconProperties
+}
+
+"""
+Input for Properties describing an icon associated with an entity
+"""
+input IconPropertiesInput {
+    """
+    The source of the icon: e.g. Antd, Material, etc
+    """
+    iconLibrary: IconLibrary
+
+    """
+    The name of the icon
+    """
+    name: String
+
+    """
+    Any modifier for the icon, this will be library-specific, e.g. filled/outlined, etc
+    """
+    style: String
+}
+
+"""
+Properties describing an icon associated with an entity
+"""
+type IconProperties {
+    """
+    The source of the icon: e.g. Antd, Material, etc
+    """
+    iconLibrary: IconLibrary
+
+    """
+    The name of the icon
+    """
+    name: String
+
+    """
+    Any modifier for the icon, this will be library-specific, e.g. filled/outlined, etc
+    """
+    style: String
+}
+
+enum IconLibrary {
+    """
+    Icons from the Material UI icon library
+    """
+    MATERIAL
+}
+
 type FineGrainedLineage {
     upstreams: [SchemaFieldRef!]
     downstreams: [SchemaFieldRef!]
@@ -2434,6 +2506,11 @@ type GlossaryNode implements Entity {
     The forms associated with the Dataset
     """
     forms: Forms
+
+    """
+    Display properties for the glossary node
+    """
+    displayProperties: DisplayProperties
 }
 
 """
@@ -2875,6 +2952,11 @@ type Container implements Entity {
     Privileges given to a user relevant to this entity
     """
     privileges: EntityPrivileges
+
+    """
+    The browse path V2 corresponding to an entity. If no Browse Paths V2 have been generated before, this will be null.
+    """
+    browsePathV2: BrowsePathV2
 }
 
 """
@@ -3235,7 +3317,7 @@ type KeyValueSchema {
 Standalone schema field entity. Differs from the SchemaField struct because it is not directly nested inside a
 schema field
 """
-type SchemaFieldEntity implements Entity {
+type SchemaFieldEntity implements EntityWithRelationships & Entity {
     """
     Primary key of the schema field
     """
@@ -3271,6 +3353,11 @@ type SchemaFieldEntity implements Entity {
     """
     relationships(input: RelationshipsInput!): EntityRelationshipsResult
 
+    """
+    Edges extending from this entity grouped by direction in the lineage graph
+    """
+    lineage(input: LineageInput!): EntityLineageResult
+
     """
     Business Attribute associated with the field
     """
@@ -3280,6 +3367,16 @@ type SchemaFieldEntity implements Entity {
     Documentation aspect for this schema field
     """
     documentation: Documentation
+
+    """
+    The status of the SchemaFieldEntity
+    """
+    status: Status
+
+    """
+    deprecation status of the schema field
+    """
+    deprecation: Deprecation
 }
 
 """
@@ -3984,6 +4081,11 @@ type CorpUserAppearanceSettings {
     who have less operational use cases for the datahub tool.
     """
     showSimplifiedHomepage: Boolean
+
+    """
+    Flag controlling whether the V2 UI for DataHub is shown.
+    """
+    showThemeV2: Boolean
 }
 
 """
@@ -4450,6 +4552,21 @@ type CorpGroupEditableProperties {
   pictureLink: String
 }
 
+"""
+Update a particular entity's display properties
+"""
+input DisplayPropertiesUpdateInput {
+    """
+    Color associated with the entity in Hex. For example #FFFFFF
+    """
+    colorHex: String
+
+    """
+    The icon associated with the entity
+    """
+    icon: IconPropertiesInput
+}
+
 """
 Arguments provided to update a CorpGroup Entity
 """
@@ -7153,12 +7270,10 @@ type DashboardStatsSummary {
     The view count in the last 30 days
     """
     viewCountLast30Days: Int
-
     """
     The unique user count in the past 30 days
     """
     uniqueUserCountLast30Days: Int
-
     """
     The top users in the past 30 days
     """
@@ -7179,7 +7294,6 @@ type ChartStatsSummary {
     The view count in the last 30 days
     """
     viewCountLast30Days: Int
-
     """
     The unique user count in the past 30 days
     """
@@ -8309,6 +8423,11 @@ type Deprecation {
     The hydrated user who will be credited for modifying this deprecation content
     """
     actorEntity: Entity
+
+    """
+    The optional replacement entity
+    """
+    replacement: Entity
 }
 
 """
@@ -8798,6 +8917,16 @@ input UpdateDeprecationInput {
     """
     urn: String!
 
+    """
+    An optional type of a sub resource to set the deprecation for
+    """
+    subResourceType: SubResourceType
+
+    """
+    An optional sub resource identifier to set the deprecation for
+    """
+    subResource: String
+
     """
     Whether the Entity is marked as deprecated.
     """
@@ -8812,6 +8941,11 @@ input UpdateDeprecationInput {
     Optional - Additional information about the entity deprecation plan
     """
     note: String
+
+    """
+    Optional - URN to replace the entity with
+    """
+    replacement: String
 }
 
 
@@ -8838,6 +8972,11 @@ input BatchUpdateDeprecationInput {
     The target assets to attach the tags to
     """
     resources: [ResourceRefInput]!
+
+    """
+    Optional - URN to replace the entity with
+    """
+    replacement: String
 }
 
 """
@@ -10878,6 +11017,11 @@ type Domain implements Entity {
     """
     forms: Forms
 
+    """
+    Display properties for the domain
+    """
+    displayProperties: DisplayProperties
+
     """
     Privileges given to a user relevant to this entity
     """
@@ -11277,6 +11421,11 @@ enum UserSetting {
     Show simplified homepage
     """
     SHOW_SIMPLIFIED_HOMEPAGE
+
+    """
+    Show theme v2
+    """
+    SHOW_THEME_V2
 }
 
 """
@@ -11428,6 +11577,11 @@ enum PostType {
     Posts on the home page
     """
     HOME_PAGE_ANNOUNCEMENT,
+
+    """
+    Posts on an entity page
+    """
+    ENTITY_ANNOUNCEMENT,
 }
 
 """
@@ -11568,6 +11722,16 @@ input ListPostsInput {
     Optional search query
     """
     query: String
+
+    """
+    Optional resource urn
+    """
+    resourceUrn: String
+
+    """
+    A list of disjunctive criterion for the filter. (or operation to combine filters)
+    """
+    orFilters: [AndFilterInput!]
 }
 
 """
@@ -12044,6 +12208,12 @@ type QuerySubject {
   The dataset which is the subject of the Query
   """
   dataset: Dataset!
+
+  """
+  The schema field which is the subject of the Query.
+  This will be populated if the subject is specifically a schema field.
+  """
+  schemaField: SchemaFieldEntity
 }
 
 """
@@ -12214,6 +12384,16 @@ input ListQueriesInput {
   An optional Urn for the parent dataset that the query is associated with.
   """
   datasetUrn: String
+
+    """
+  Optional - Information on how to sort the list queries result
+  """
+  sortInput: SortQueriesInput
+
+  """
+  A list of disjunctive criterion for the filter. (or operation to combine filters)
+  """
+  orFilters: [AndFilterInput!]
 }
 
 """
diff --git a/datahub-graphql-core/src/main/resources/query.graphql b/datahub-graphql-core/src/main/resources/query.graphql
new file mode 100644
index 00000000000000..f4d2aae90a0ca5
--- /dev/null
+++ b/datahub-graphql-core/src/main/resources/query.graphql
@@ -0,0 +1,6 @@
+input SortQueriesInput {
+    """
+    A criterion to sort query results on
+    """
+    sortCriterion: SortCriterion!
+}
diff --git a/datahub-graphql-core/src/main/resources/search.graphql b/datahub-graphql-core/src/main/resources/search.graphql
index d8f17faa3d11c2..34169d8c6d18aa 100644
--- a/datahub-graphql-core/src/main/resources/search.graphql
+++ b/datahub-graphql-core/src/main/resources/search.graphql
@@ -829,7 +829,7 @@ type EntityPath {
     """
     Path of entities between source and destination nodes
     """
-    path: [Entity]
+    path: [Entity]!
 }
 
 
@@ -911,6 +911,11 @@ type AggregationMetadata {
   Entity corresponding to the facet field
   """
   entity: Entity
+
+  """
+  Optional display name to show in the UI for this filter value
+  """
+  displayName: String
 }
 
 """
diff --git a/datahub-graphql-core/src/main/resources/timeline.graphql b/datahub-graphql-core/src/main/resources/timeline.graphql
index a6f7dfcf3865b8..37c0a43cf0aa5d 100644
--- a/datahub-graphql-core/src/main/resources/timeline.graphql
+++ b/datahub-graphql-core/src/main/resources/timeline.graphql
@@ -8,6 +8,11 @@ extend type Query {
     Returns the list of schema versions for a dataset.
     """
     getSchemaVersionList(input: GetSchemaVersionListInput!): GetSchemaVersionListResult
+
+    """
+    Returns a list of timeline actions for an entity based on the filter criteria
+    """
+    getTimeline(input: GetTimelineInput!): GetTimelineResult
 }
 
 """
@@ -82,6 +87,22 @@ type GetSchemaVersionListResult {
     semanticVersionList: [SemanticVersionStruct!]
 }
 
+"""
+Input for getting timeline from a specific version.
+Todo: this is where additional filtering would go such as start & end times/versions, change types, etc
+"""
+input GetTimelineInput {
+    """
+    The urn to fetch timeline for
+    """
+    urn: String!
+
+    """
+    The change category types to filter by. If left empty, will fetch all.
+    """
+    changeCategories: [ChangeCategoryType!]
+}
+
 
 """
 Input for getting schema changes computed at a specific version.
@@ -167,4 +188,93 @@ type SemanticVersionStruct {
     Version stamp of the change
     """
     versionStamp: String
-}
\ No newline at end of file
+}
+
+"""
+Result of getting timeline from a specific version.
+"""
+type GetTimelineResult {
+    changeTransactions: [ChangeTransaction!]!
+}
+
+"""
+A change transaction is a set of changes that were committed together.
+"""
+type ChangeTransaction {
+    """
+    The time at which the transaction was committed
+    """
+    timestampMillis: Long!
+    """
+    The last semantic version that this schema was changed in
+    """
+    lastSemanticVersion: String!
+    """
+    Version stamp of the change
+    """
+    versionStamp: String!
+    """
+    The type of the change
+    """
+    changeType: ChangeOperationType!
+    """
+    The list of changes in this transaction
+    """
+    changes: [ChangeEvent!]
+}
+
+
+"""
+An individual change in a transaction
+"""
+type ChangeEvent {
+    """
+    The urn of the entity that was changed
+    """
+    urn: String!
+
+    """
+    The category of the change
+    """
+    category: ChangeCategoryType
+
+    """
+    The operation of the change
+    """
+    operation: ChangeOperationType
+
+    """
+    The modifier of the change
+    """
+    modifier: String
+
+    """
+    The parameters of the change
+    """
+    parameters: [TimelineParameterEntry!]
+
+    """
+    The audit stamp of the change
+    """
+    auditStamp: AuditStamp
+
+    """
+    description of the change
+    """
+    description: String
+}
+
+"""
+A timeline parameter entry
+"""
+type TimelineParameterEntry {
+    """
+    The key of the parameter
+    """
+    key: String
+
+    """
+    The value of the parameter
+    """
+    value: String
+}
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/deprecation/BatchUpdateDeprecationResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/deprecation/BatchUpdateDeprecationResolverTest.java
index 265a1a2e0af5ba..094dd31ab10f07 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/deprecation/BatchUpdateDeprecationResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/deprecation/BatchUpdateDeprecationResolverTest.java
@@ -69,7 +69,8 @@ public void testGetSuccessNoExistingDeprecation() throws Exception {
             "test",
             ImmutableList.of(
                 new ResourceRefInput(TEST_ENTITY_URN_1, null, null),
-                new ResourceRefInput(TEST_ENTITY_URN_2, null, null)));
+                new ResourceRefInput(TEST_ENTITY_URN_2, null, null)),
+            null);
     Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
     Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
     assertTrue(resolver.get(mockEnv).get());
@@ -134,7 +135,8 @@ public void testGetSuccessExistingDeprecation() throws Exception {
             "test",
             ImmutableList.of(
                 new ResourceRefInput(TEST_ENTITY_URN_1, null, null),
-                new ResourceRefInput(TEST_ENTITY_URN_2, null, null)));
+                new ResourceRefInput(TEST_ENTITY_URN_2, null, null)),
+            null);
     Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
     Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
     assertTrue(resolver.get(mockEnv).get());
@@ -192,7 +194,8 @@ public void testGetFailureResourceDoesNotExist() throws Exception {
             "test",
             ImmutableList.of(
                 new ResourceRefInput(TEST_ENTITY_URN_1, null, null),
-                new ResourceRefInput(TEST_ENTITY_URN_2, null, null)));
+                new ResourceRefInput(TEST_ENTITY_URN_2, null, null)),
+            null);
     Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
     Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
 
@@ -215,7 +218,8 @@ public void testGetUnauthorized() throws Exception {
             "test",
             ImmutableList.of(
                 new ResourceRefInput(TEST_ENTITY_URN_1, null, null),
-                new ResourceRefInput(TEST_ENTITY_URN_2, null, null)));
+                new ResourceRefInput(TEST_ENTITY_URN_2, null, null)),
+            null);
     Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
     QueryContext mockContext = getMockDenyContext();
     Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
@@ -244,7 +248,8 @@ public void testGetEntityClientException() throws Exception {
             "test",
             ImmutableList.of(
                 new ResourceRefInput(TEST_ENTITY_URN_1, null, null),
-                new ResourceRefInput(TEST_ENTITY_URN_2, null, null)));
+                new ResourceRefInput(TEST_ENTITY_URN_2, null, null)),
+            null);
     Mockito.when(mockEnv.getArgument(Mockito.eq("input"))).thenReturn(input);
     Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
 
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/deprecation/UpdateDeprecationResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/deprecation/UpdateDeprecationResolverTest.java
index ab180724da46df..59275fe9337665 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/deprecation/UpdateDeprecationResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/deprecation/UpdateDeprecationResolverTest.java
@@ -36,8 +36,27 @@ public class UpdateDeprecationResolverTest {
 
   private static final String TEST_ENTITY_URN =
       "urn:li:dataset:(urn:li:dataPlatform:mysql,my-test,PROD)";
+
+  // Create SchemaField URN for the entity being deprecated
+  private static final String TEST_SCHEMA_FIELD_URN =
+      "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:mysql,my-test,PROD),old_user_id)";
+
+  // Create SchemaField URN for the replacement
+  private static final String REPLACEMENT_SCHEMA_FIELD_URN =
+      "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:mysql,my-test,PROD),new_user_id)";
+
   private static final UpdateDeprecationInput TEST_DEPRECATION_INPUT =
-      new UpdateDeprecationInput(TEST_ENTITY_URN, true, 0L, "Test note");
+      new UpdateDeprecationInput(TEST_ENTITY_URN, null, null, true, 0L, "Test note", null);
+
+  private static final UpdateDeprecationInput TEST_DEPRECATION_INPUT_WITH_REPLACEMENT =
+      new UpdateDeprecationInput(
+          TEST_ENTITY_URN,
+          null,
+          null,
+          true,
+          0L,
+          "Test note",
+          "urn:li:dataset:(urn:li:dataPlatform:mysql,replacement-dataset,PROD)");
   private static final CorpuserUrn TEST_ACTOR_URN = new CorpuserUrn("test");
 
   @Test
@@ -220,4 +239,125 @@ public void testGetEntityClientException() throws Exception {
 
     assertThrows(CompletionException.class, () -> resolver.get(mockEnv).join());
   }
+
+  @Test
+  public void testGetSuccessNoExistingDeprecationWithReplacement() throws Exception {
+    // Create resolver
+    EntityClient mockClient = Mockito.mock(EntityClient.class);
+
+    Mockito.when(
+            mockClient.batchGetV2(
+                any(),
+                eq(Constants.DATASET_ENTITY_NAME),
+                eq(new HashSet<>(ImmutableSet.of(Urn.createFromString(TEST_ENTITY_URN)))),
+                eq(ImmutableSet.of(Constants.DEPRECATION_ASPECT_NAME))))
+        .thenReturn(
+            ImmutableMap.of(
+                Urn.createFromString(TEST_ENTITY_URN),
+                new EntityResponse()
+                    .setEntityName(Constants.DATASET_ENTITY_NAME)
+                    .setUrn(Urn.createFromString(TEST_ENTITY_URN))
+                    .setAspects(new EnvelopedAspectMap(Collections.emptyMap()))));
+
+    EntityService<?> mockService = getMockEntityService();
+    Mockito.when(mockService.exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true)))
+        .thenReturn(true);
+
+    UpdateDeprecationResolver resolver = new UpdateDeprecationResolver(mockClient, mockService);
+
+    // Execute resolver
+    QueryContext mockContext = getMockAllowContext();
+    Mockito.when(mockContext.getActorUrn()).thenReturn(TEST_ACTOR_URN.toString());
+    DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
+    Mockito.when(mockEnv.getArgument(eq("input")))
+        .thenReturn(TEST_DEPRECATION_INPUT_WITH_REPLACEMENT);
+    Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
+    resolver.get(mockEnv).get();
+
+    final Deprecation newDeprecation =
+        new Deprecation()
+            .setDeprecated(true)
+            .setDecommissionTime(0L)
+            .setNote("Test note")
+            .setReplacement(
+                Urn.createFromString(
+                    "urn:li:dataset:(urn:li:dataPlatform:mysql,replacement-dataset,PROD)"))
+            .setActor(TEST_ACTOR_URN);
+    final MetadataChangeProposal proposal =
+        MutationUtils.buildMetadataChangeProposalWithUrn(
+            UrnUtils.getUrn(TEST_ENTITY_URN), DEPRECATION_ASPECT_NAME, newDeprecation);
+
+    verifyIngestProposal(mockClient, 1, proposal);
+
+    Mockito.verify(mockService, Mockito.times(1))
+        .exists(any(), eq(Urn.createFromString(TEST_ENTITY_URN)), eq(true));
+  }
+
+  @Test
+  public void testGetSuccessSchemaFieldDeprecation() throws Exception {
+    // Create test input using schema field URNs
+    UpdateDeprecationInput testSchemaFieldInput =
+        new UpdateDeprecationInput(
+            TEST_SCHEMA_FIELD_URN,
+            null,
+            null,
+            true,
+            0L,
+            "Deprecating old_user_id in favor of new_user_id",
+            REPLACEMENT_SCHEMA_FIELD_URN);
+
+    // Create resolver
+    EntityClient mockClient = Mockito.mock(EntityClient.class);
+
+    Mockito.when(
+            mockClient.batchGetV2(
+                any(),
+                eq(Constants.SCHEMA_FIELD_ENTITY_NAME),
+                eq(new HashSet<>(ImmutableSet.of(Urn.createFromString(TEST_SCHEMA_FIELD_URN)))),
+                eq(ImmutableSet.of(Constants.DEPRECATION_ASPECT_NAME))))
+        .thenReturn(
+            ImmutableMap.of(
+                Urn.createFromString(TEST_SCHEMA_FIELD_URN),
+                new EntityResponse()
+                    .setEntityName(Constants.SCHEMA_FIELD_ENTITY_NAME)
+                    .setUrn(Urn.createFromString(TEST_SCHEMA_FIELD_URN))
+                    .setAspects(new EnvelopedAspectMap(Collections.emptyMap()))));
+
+    EntityService<?> mockService = getMockEntityService();
+    Mockito.when(
+            mockService.exists(any(), eq(Urn.createFromString(TEST_SCHEMA_FIELD_URN)), eq(true)))
+        .thenReturn(true);
+
+    UpdateDeprecationResolver resolver = new UpdateDeprecationResolver(mockClient, mockService);
+
+    // Execute resolver
+    QueryContext mockContext = getMockAllowContext();
+    Mockito.when(mockContext.getActorUrn()).thenReturn(TEST_ACTOR_URN.toString());
+    DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
+    Mockito.when(mockEnv.getArgument(eq("input"))).thenReturn(testSchemaFieldInput);
+    Mockito.when(mockEnv.getContext()).thenReturn(mockContext);
+
+    // Execute the resolver
+    resolver.get(mockEnv).get();
+
+    // Create expected deprecation object
+    final Deprecation expectedDeprecation =
+        new Deprecation()
+            .setDeprecated(true)
+            .setDecommissionTime(0L)
+            .setNote("Deprecating old_user_id in favor of new_user_id")
+            .setReplacement(Urn.createFromString(REPLACEMENT_SCHEMA_FIELD_URN))
+            .setActor(TEST_ACTOR_URN);
+
+    // Verify the correct proposal was made
+    final MetadataChangeProposal expectedProposal =
+        MutationUtils.buildMetadataChangeProposalWithUrn(
+            UrnUtils.getUrn(TEST_SCHEMA_FIELD_URN), DEPRECATION_ASPECT_NAME, expectedDeprecation);
+
+    verifyIngestProposal(mockClient, 1, expectedProposal);
+
+    // Verify that existence check was performed
+    Mockito.verify(mockService, Mockito.times(1))
+        .exists(any(), eq(Urn.createFromString(TEST_SCHEMA_FIELD_URN)), eq(true));
+  }
 }
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolverTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolverTest.java
index 414c62b693b698..fef87b76c56527 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolverTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolverTest.java
@@ -1,7 +1,7 @@
 package com.linkedin.datahub.graphql.resolvers.query;
 
 import static com.linkedin.datahub.graphql.TestUtils.*;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.*;
 import static org.testng.Assert.*;
 
 import com.google.common.collect.ImmutableList;
@@ -41,11 +41,12 @@ public class ListQueriesResolverTest {
   private static final Urn TEST_QUERY_URN = Urn.createFromTuple("query", "test-id");
 
   private static final ListQueriesInput TEST_INPUT_FULL_FILTERS =
-      new ListQueriesInput(0, 20, null, QuerySource.MANUAL, TEST_DATASET_URN.toString());
+      new ListQueriesInput(
+          0, 20, null, QuerySource.MANUAL, TEST_DATASET_URN.toString(), null, null);
   private static final ListQueriesInput TEST_INPUT_SOURCE_FILTER =
-      new ListQueriesInput(0, 30, null, QuerySource.MANUAL, null);
+      new ListQueriesInput(0, 30, null, QuerySource.MANUAL, null, null, null);
   private static final ListQueriesInput TEST_INPUT_ENTITY_FILTER =
-      new ListQueriesInput(0, 40, null, null, TEST_DATASET_URN.toString());
+      new ListQueriesInput(0, 40, null, null, TEST_DATASET_URN.toString(), null, null);
 
   @DataProvider(name = "inputs")
   public static Object[][] inputs() {
diff --git a/datahub-web-react/.eslintrc.js b/datahub-web-react/.eslintrc.js
index 3fdf7b6a3042ca..605cde8b9711e4 100644
--- a/datahub-web-react/.eslintrc.js
+++ b/datahub-web-react/.eslintrc.js
@@ -55,4 +55,12 @@ module.exports = {
             version: 'detect', // Tells eslint-plugin-react to automatically detect the version of React to use
         },
     },
+	overrides: [
+		{
+			files: ['src/app/searchV2/**/*.tsx', 'src/app/entityV2/**/*.tsx'],
+			rules: {
+				'import/no-cycle': 'off',
+			},
+		},
+	],
 };
diff --git a/datahub-web-react/package.json b/datahub-web-react/package.json
index 0ff68de2481ed0..d932945acf5068 100644
--- a/datahub-web-react/package.json
+++ b/datahub-web-react/package.json
@@ -15,6 +15,7 @@
         "@monaco-editor/react": "^4.3.1",
         "@mui/icons-material": "^5.15.21",
         "@mui/material": "^5.15.21",
+        "@phosphor-icons/react": "^2.1.7",
         "@react-hook/window-size": "^3.0.7",
         "@react-spring/web": "^9.7.3",
         "@remirror/pm": "^2.0.3",
@@ -22,6 +23,7 @@
         "@remirror/styles": "^2.0.3",
         "@testing-library/jest-dom": "^6.1.4",
         "@testing-library/react": "^12.0.0",
+        "@testing-library/react-hooks": "^8.0.1",
         "@tommoor/remove-markdown": "^0.3.2",
         "@types/diff": "^5.0.0",
         "@types/dompurify": "^2.3.3",
@@ -38,6 +40,7 @@
         "@visx/group": "^3.0.0",
         "@visx/hierarchy": "^3.0.0",
         "@visx/legend": "^3.2.0",
+        "@visx/marker": "^3.5.0",
         "@visx/scale": "^3.2.0",
         "@visx/shape": "^3.2.0",
         "@visx/xychart": "^3.2.0",
@@ -45,6 +48,8 @@
         "analytics": "^0.8.9",
         "antd": "4.24.7",
         "color-hash": "^2.0.1",
+        "colorthief": "^2.4.0",
+        "cron-parser": "^4.8.1",
         "cronstrue": "^1.122.0",
         "d3-scale": "^4.0.2",
         "dayjs": "^1.11.7",
@@ -53,14 +58,17 @@
         "dompurify": "^2.5.4",
         "dotenv": "^8.2.0",
         "faker": "5.5.3",
+        "fuse.js": "^7.0.0",
         "graphql": "^15.5.0",
         "graphql-tag": "2.10.3",
         "graphql.macro": "^1.4.2",
         "history": "^5.0.0",
+        "html-to-image": "^1.11.11",
         "js-cookie": "^2.2.1",
         "moment": "^2.29.4",
         "moment-timezone": "^0.5.35",
         "monaco-editor": "^0.28.1",
+        "phosphor-react": "^1.4.1",
         "prosemirror-autocomplete": "^0.4.3",
         "query-string": "^6.13.8",
         "rc-table": "^7.13.1",
@@ -75,7 +83,10 @@
         "react-router": "^5.3",
         "react-router-dom": "^5.3",
         "react-syntax-highlighter": "^15.4.4",
+        "react-vertical-timeline-component": "^3.6.0",
         "react-visibility-sensor": "^5.1.1",
+        "react-window": "^1.8.10",
+        "reactflow": "^11.10.1",
         "reactour": "^1.19.3",
         "remirror": "^2.0.23",
         "styled-components": "^5.2.1",
diff --git a/datahub-web-react/src/App.tsx b/datahub-web-react/src/App.tsx
index 81f137417f1f8a..9fef14b895a753 100644
--- a/datahub-web-react/src/App.tsx
+++ b/datahub-web-react/src/App.tsx
@@ -5,6 +5,7 @@ import { ApolloClient, ApolloProvider, createHttpLink, InMemoryCache, ServerErro
 import { onError } from '@apollo/client/link/error';
 import { Helmet, HelmetProvider } from 'react-helmet-async';
 import './App.less';
+import './AppV2.less';
 import { Routes } from './app/Routes';
 import { PageRoutes } from './conf/Global';
 import { isLoggedInVar } from './app/auth/checkAuthStatus';
diff --git a/datahub-web-react/src/AppV2.less b/datahub-web-react/src/AppV2.less
new file mode 100644
index 00000000000000..3980245cb486e3
--- /dev/null
+++ b/datahub-web-react/src/AppV2.less
@@ -0,0 +1,57 @@
+@import 'antd/dist/antd.less';
+@import './conf/theme/global-variables.less';
+@import './conf/theme/global-variables-v2.less';
+@import './conf/theme/global-overrides.less';
+@import './conf/theme/global-overrides-v2.less';
+
+@font-face {
+    font-family: 'Manrope';
+    font-style: normal;
+    src: local('Manrope'), url('./fonts/manrope.woff2') format('woff2');
+}
+
+@font-face {
+    font-family: 'Mulish';
+    font-style: normal;
+    font-weight: 400; // Regular weight
+    src: url('./fonts/Mulish-Regular.ttf') format('truetype');
+}
+
+@font-face {
+    font-family: 'Mulish';
+    font-style: normal;
+    font-weight: 500; // Medium weight
+    src: url('./fonts/Mulish-Medium.ttf') format('truetype');
+}
+
+@font-face {
+    font-family: 'Mulish';
+    font-style: normal;
+    font-weight: 600; // Semi-bold weight
+    src: url('./fonts/Mulish-SemiBold.ttf') format('truetype');
+}
+
+@font-face {
+    font-family: 'Mulish';
+    font-style: normal;
+    font-weight: 700; // Bold weight
+    src: url('./fonts/Mulish-Bold.ttf') format('truetype');
+}
+
+@font-face {
+    font-family: 'Mulish';
+    font-style: italic;
+    font-weight: 400; // Regular Italic
+    src: url('./fonts/Mulish-Italic.ttf') format('truetype');
+}
+
+@font-face {
+    font-family: 'Mulish';
+    font-style: italic;
+    font-weight: 700; // Bold Italic
+    src: url('./fonts/Mulish-BoldItalic.ttf') format('truetype');
+}
+
+.themeV2 * {
+    font-family: @font-family-v2;
+}
diff --git a/datahub-web-react/src/Mocks.tsx b/datahub-web-react/src/Mocks.tsx
index 063b784920e234..e3a5632c9f5fcd 100644
--- a/datahub-web-react/src/Mocks.tsx
+++ b/datahub-web-react/src/Mocks.tsx
@@ -1,3 +1,4 @@
+import React from 'react';
 import { GetDatasetDocument, UpdateDatasetDocument, GetDatasetSchemaDocument } from './graphql/dataset.generated';
 import { GetDataFlowDocument } from './graphql/dataFlow.generated';
 import { GetDataJobDocument } from './graphql/dataJob.generated';
@@ -31,6 +32,16 @@ import {
     AppConfig,
     EntityPrivileges,
     BusinessAttribute,
+    EntityRelationshipsResult,
+    Maybe,
+    SearchResult,
+    DataHubViewType,
+    LogicalOperator,
+    DataHubView,
+    DataHubViewFilter,
+    GlobalTags,
+    OwnershipType,
+    Owner,
 } from './types.generated';
 import { GetTagDocument } from './graphql/tag.generated';
 import { GetMlModelDocument } from './graphql/mlModel.generated';
@@ -44,14 +55,34 @@ import { DEFAULT_APP_CONFIG } from './appConfigContext';
 import { GetQuickFiltersDocument } from './graphql/quickFilters.generated';
 import { GetGrantedPrivilegesDocument } from './graphql/policy.generated';
 import { VIEW_ENTITY_PAGE } from './app/entity/shared/constants';
+import { Entity } from './app/entity/Entity';
+import { GenericEntityProperties } from './app/entity/shared/types';
+import { ViewBuilderState } from './app/entity/view/types';
+import { EntityCapabilityType } from './app/entityV2/Entity';
 
 export const entityPrivileges: EntityPrivileges = {
     canEditLineage: true,
+    canEditDomains: true,
+    canEditDataProducts: true,
+    canEditTags: true,
+    canEditGlossaryTerms: true,
+    canEditDescription: true,
+    canEditLinks: true,
+    canEditOwners: true,
+    canEditAssertions: true,
+    canEditIncidents: true,
+    canEditDeprecation: true,
+    canEditSchemaFieldTags: true,
+    canEditSchemaFieldGlossaryTerms: true,
+    canEditSchemaFieldDescription: true,
+    canEditQueries: true,
+    canEditEmbed: true,
     canManageEntity: true,
     canManageChildren: true,
-    canEditEmbed: true,
-    canEditQueries: true,
     canEditProperties: true,
+    canViewDatasetUsage: true,
+    canViewDatasetProfile: true,
+    canViewDatasetOperations: true,
     __typename: 'EntityPrivileges',
 };
 
@@ -94,7 +125,7 @@ export const user1 = {
     },
     settings: {
         __typename: 'CorpUserSettings',
-        appearance: { __typename: 'CorpUserAppearanceSettings', showSimplifiedHomepage: false },
+        appearance: { __typename: 'CorpUserAppearanceSettings', showSimplifiedHomepage: false, showThemeV2: false },
         views: { __typename: 'CorpUserViewSettings', defaultView: null },
     },
     editableInfo: null,
@@ -126,6 +157,8 @@ const user2 = {
         skills: [],
         __typename: 'CorpUserEditableProperties',
         email: 'john@domain.com',
+        persona: null,
+        platforms: null,
     },
     groups: {
         __typename: 'EntityRelationshipsResult',
@@ -164,7 +197,7 @@ const user2 = {
     },
     settings: {
         __typename: 'CorpUserSettings',
-        appearance: { __typename: 'CorpUserAppearanceSettings', showSimplifiedHomepage: false },
+        appearance: { __typename: 'CorpUserAppearanceSettings', showSimplifiedHomepage: false, showThemeV2: false },
         views: { __typename: 'CorpUserViewSettings', defaultView: null },
     },
     editableInfo: null,
@@ -549,6 +582,12 @@ export const dataset3 = {
                     parentNodes: null,
                 },
                 associatedUrn: 'urn:li:dataset:3',
+                actor: {
+                    __typename: 'CorpUser',
+                    urn: 'urn:li:corpuser:admin',
+                    type: EntityType.CorpUser,
+                    username: '',
+                },
             },
         ],
     },
@@ -585,6 +624,8 @@ export const dataset3 = {
     },
     deprecation: null,
     usageStats: null,
+    latestFullTableProfile: null,
+    latestPartitionProfile: null,
     operations: null,
     datasetProfiles: [
         {
@@ -619,6 +660,7 @@ export const dataset3 = {
             aspectName: 'autoRenderAspect',
             payload: '{ "values": [{ "autoField1": "autoValue1", "autoField2": "autoValue2" }] }',
             renderSpec: {
+                __typename: 'AutoRenderSpec',
                 displayType: 'tabular',
                 displayName: 'Auto Render Aspect Custom Tab Name',
                 key: 'values',
@@ -635,16 +677,20 @@ export const dataset3 = {
     runs: null,
     testResults: null,
     siblings: null,
+    siblingsSearch: null,
     statsSummary: null,
     embed: null,
-    browsePathV2: { __typename: 'BrowsePathV2', path: [{ name: 'test', entity: null }] },
+    browsePathV2: { __typename: 'BrowsePathV2', path: [{ name: 'test', entity: null, __typename: 'BrowsePathEntry' }] },
     access: null,
     dataProduct: null,
     lastProfile: null,
     lastOperation: null,
     structuredProperties: null,
     forms: null,
+    notes: [],
     activeIncidents: null,
+    upstream: null,
+    downstream: null,
     versionProperties: null,
 } as Dataset;
 
@@ -708,7 +754,9 @@ export const dataset3WithSchema = {
             foreignKeys: [],
         },
         editableSchemaMetadata: null,
+        documentation: null,
         siblings: null,
+        siblingsSearch: null,
     },
 };
 
@@ -3796,6 +3844,7 @@ export const mocks = [
                         EntityType.MlfeatureTable,
                         EntityType.Mlmodel,
                         EntityType.MlmodelGroup,
+                        EntityType.DataProduct,
                     ],
                 },
             },
@@ -3961,3 +4010,325 @@ export const platformPrivileges: PlatformPrivileges = {
     manageStructuredProperties: true,
     viewStructuredPropertiesPage: true,
 };
+
+export const DomainMock1 = {
+    urn: 'urn:li:domain:afbdad41-c523-469f-9b62-de94f938f702',
+    id: 'afbdad41-c523-469f-9b62-de94f938f702',
+    type: 'DOMAIN',
+    icon: () => <></>,
+    isSearchEnabled: () => false,
+    isBrowseEnabled: () => false,
+    isLineageEnabled: () => false,
+    getCollectionName: () => 'domain1_mock_1',
+    getPathName: () => 'domain_path_1',
+    getGraphName: () => 'domain_graph_1',
+    displayName: () => 'MOCK_DOMAIN_1',
+    parentDomains: {
+        domains: [],
+    },
+    renderProfile: () => <></>,
+    renderPreview: () => <></>,
+    renderSearch: () => <></>,
+    getGenericEntityProperties: () => {
+        return {
+            parentDomains: {
+                count: 1,
+                domains: [
+                    {
+                        urn: 'urn:li:domain:afbdad41-c523-469f-9b62-de94f938f702',
+                        type: 'DOMAIN',
+                        name: 'DOMAIN_1',
+                    },
+                ],
+            },
+        };
+    },
+    supportedCapabilities: () => new Set(),
+} as Entity<any>;
+
+export const DomainMock2 = {
+    urn: 'urn:li:domain:bebdad41-c523-469f-9b62-de94f938f603',
+    id: 'bebdad41-c523-469f-9b62-de94f938f603',
+    type: 'DOMAIN',
+    icon: () => <></>,
+    isSearchEnabled: () => false,
+    isBrowseEnabled: () => false,
+    isLineageEnabled: () => false,
+    getCollectionName: () => 'domain_mock_2',
+    getPathName: () => 'domain_path_2',
+    getGraphName: () => 'domain_graph_2',
+    displayName: () => 'MOCK_DOMAIN_2',
+    parentDomains: {
+        domains: [],
+    },
+    renderProfile: () => <></>,
+    renderPreview: () => <></>,
+    renderSearch: () => <></>,
+    getGenericEntityProperties: () => {
+        return {
+            parentDomains: {
+                count: 1,
+                domains: [
+                    {
+                        urn: 'urn:li:domain:afbdad41-c523-469f-9b62-de94f938f603',
+                        type: 'DOMAIN',
+                        name: 'DOMAIN_2',
+                    },
+                ],
+            },
+        };
+    },
+    supportedCapabilities: () => new Set(),
+} as Entity<any>;
+
+export const DomainMock3 = [DomainMock1, DomainMock2] as Array<Entity<any>>;
+
+export const expectedResult = [
+    {
+        type: 'DOMAIN',
+        urn: 'urn:li:domain:afbdad41-c523-469f-9b62-de94f938f702',
+        name: 'DOMAIN_1',
+    },
+];
+
+export const owners: Owner[] = [
+    {
+        __typename: 'Owner',
+        owner: {
+            __typename: 'CorpUser',
+            username: 'john',
+            urn: 'urn:li:corpuser:3',
+            type: EntityType.CorpUser,
+        },
+        associatedUrn: 'urn:li:dataset:1',
+        type: OwnershipType.Developer,
+    },
+    {
+        owner: {
+            __typename: 'CorpUser',
+            username: 'john',
+            urn: 'urn:li:corpuser:3',
+            type: EntityType.CorpUser,
+        },
+        associatedUrn: 'urn:li:dataset:1',
+        type: OwnershipType.Delegate,
+    },
+    {
+        owner: {
+            __typename: 'CorpUser',
+            username: 'sdas',
+            urn: 'urn:li:corpuser:1',
+            type: EntityType.CorpUser,
+        },
+        associatedUrn: 'urn:li:dataset:2',
+        type: OwnershipType.Dataowner,
+    },
+    {
+        owner: {
+            __typename: 'CorpUser',
+            username: 'sdas',
+            urn: 'urn:li:corpuser:1',
+            type: EntityType.CorpUser,
+        },
+        type: OwnershipType.Delegate,
+        associatedUrn: 'urn:li:dataset:2',
+    },
+];
+
+export const globalTags: GlobalTags = {
+    __typename: 'GlobalTags',
+    tags: [
+        {
+            __typename: 'TagAssociation',
+            tag: {
+                __typename: 'Tag',
+                type: EntityType.Tag,
+                urn: 'urn:li:tag:abc-sample-tag',
+                name: 'abc-sample-tag',
+                description: 'sample tag',
+                properties: {
+                    __typename: 'TagProperties',
+                    name: 'abc-sample-tag',
+                    description: 'sample tag',
+                    colorHex: 'sample tag color',
+                },
+            },
+            associatedUrn: 'urn:li:corpuser:1',
+        },
+    ],
+};
+
+export const entityCapabilities: Set<EntityCapabilityType> = new Set([
+    EntityCapabilityType.OWNERS,
+    EntityCapabilityType.GLOSSARY_TERMS,
+    EntityCapabilityType.TAGS,
+    EntityCapabilityType.DOMAINS,
+    EntityCapabilityType.DEPRECATION,
+    EntityCapabilityType.SOFT_DELETE,
+    EntityCapabilityType.TEST,
+    EntityCapabilityType.ROLES,
+    EntityCapabilityType.DATA_PRODUCTS,
+    EntityCapabilityType.HEALTH,
+    EntityCapabilityType.LINEAGE,
+]);
+
+const filters: DataHubViewFilter = {
+    filters: [
+        {
+            condition: FilterOperator.Equal,
+            field: 'mockField1',
+            negated: false,
+            values: ['value1', 'value2', 'value3'],
+        },
+        {
+            condition: FilterOperator.Exists,
+            field: 'mockField2',
+            negated: true,
+            values: ['value4', 'value5', 'value6'],
+        },
+    ],
+    operator: LogicalOperator.And,
+};
+
+export const viewBuilderStateMock: ViewBuilderState = {
+    viewType: DataHubViewType.Global,
+    name: 'VIEW_BUILDER_TEST',
+    description: 'A description for testing convertStateToUpdateInput',
+    definition: {
+        entityTypes: [EntityType.AccessToken, EntityType.Domain, EntityType.Container, EntityType.DataFlow],
+        filter: filters,
+    },
+};
+
+export const searchViewsMock: Array<DataHubView> = [
+    {
+        urn: 'test-urn1',
+        type: EntityType.DatahubView,
+        viewType: DataHubViewType.Global,
+        name: 'VIEW_BUILDER_TEST',
+        description: 'A description for testing convertStateToUpdateInput',
+        definition: {
+            entityTypes: [EntityType.AccessToken, EntityType.Domain, EntityType.Container, EntityType.DataFlow],
+            filter: {
+                operator: LogicalOperator.And,
+                filters: [
+                    {
+                        field: 'mockField1',
+                        condition: FilterOperator.Equal,
+                        values: ['value1', 'value2', 'value3'],
+                        negated: false,
+                    },
+                    {
+                        field: 'mockField2',
+                        condition: FilterOperator.Exists,
+                        values: ['value4', 'value5', 'value6'],
+                        negated: true,
+                    },
+                ],
+            },
+        },
+    },
+    {
+        urn: 'test-urn2',
+        type: EntityType.DatahubView,
+        viewType: DataHubViewType.Global,
+        name: 'MOCK_TEST_VIEW',
+        description: 'Lorem ipsum dolor sit amet, consectetu',
+        definition: {
+            entityTypes: [EntityType.AccessToken, EntityType.Container, EntityType.DataFlow],
+            filter: {
+                operator: LogicalOperator.Or,
+                filters: [
+                    {
+                        field: 'mockField1',
+                        condition: FilterOperator.GreaterThan,
+                        values: ['value1', 'value2', 'value3'],
+                        negated: false,
+                    },
+                    {
+                        field: 'mockField2',
+                        condition: FilterOperator.In,
+                        values: ['value4', 'value6'],
+                        negated: false,
+                    },
+                ],
+            },
+        },
+    },
+];
+
+export const mockEntityRelationShipResult: Maybe<EntityRelationshipsResult> = {
+    start: 0,
+    count: 0,
+    total: 0,
+    relationships: [
+        {
+            type: 'Test1',
+            direction: RelationshipDirection.Outgoing,
+            entity: {
+                urn: 'urn:li:glossaryTerm:schema.Field16Schema_v1',
+                type: EntityType.GlossaryTerm,
+            },
+        },
+        {
+            type: 'Test2',
+            direction: RelationshipDirection.Incoming,
+            entity: {
+                urn: 'urn:li:glossaryTerm:schema.Field16Schema_v2',
+                type: EntityType.Assertion,
+            },
+        },
+    ],
+    __typename: 'EntityRelationshipsResult',
+};
+
+export const mockSearchResult: SearchResult = {
+    __typename: 'SearchResult',
+    entity: {
+        __typename: 'Dataset',
+        ...dataset3,
+    },
+    matchedFields: [],
+    insights: [],
+    extraProperties: [
+        { name: 'isOutputPort', value: 'true' },
+        { name: 'test2_name', value: 'test2_value' },
+    ],
+};
+
+export const mockRecord: Record<string, string | boolean> = {
+    key1: 'value1',
+    key2: true,
+    key3: 'value2',
+    key4: false,
+    key5: 'value3',
+    key6: true,
+};
+
+export const mockFineGrainedLineages1: GenericEntityProperties = {
+    siblings: {
+        isPrimary: true,
+        siblings: [{ type: EntityType.Dataset, urn: 'test_urn' }],
+    },
+    siblingsSearch: {
+        count: 1,
+        total: 1,
+        searchResults: [{ entity: { type: EntityType.Dataset, urn: 'test_urn' }, matchedFields: [] }],
+    },
+    fineGrainedLineages: [
+        {
+            upstreams: [
+                {
+                    urn: 'urn:li:glossaryTerm:example.glossaryterm1',
+                    path: 'test_downstream1',
+                },
+            ],
+            downstreams: [
+                {
+                    urn: 'urn:li:glossaryTerm:example.glossaryterm2',
+                    path: 'test_downstream2',
+                },
+            ],
+        },
+    ],
+};
diff --git a/datahub-web-react/src/alchemy-components/components/Avatar/types.ts b/datahub-web-react/src/alchemy-components/components/Avatar/types.ts
index 98c554b620dcbd..8371384b9300de 100644
--- a/datahub-web-react/src/alchemy-components/components/Avatar/types.ts
+++ b/datahub-web-react/src/alchemy-components/components/Avatar/types.ts
@@ -2,7 +2,7 @@ import { AvatarSizeOptions } from '@src/alchemy-components/theme/config';
 
 export interface AvatarProps {
     name: string;
-    imageUrl?: string;
+    imageUrl?: string | null;
     onClick?: () => void;
     size?: AvatarSizeOptions;
     showInPill?: boolean;
diff --git a/datahub-web-react/src/alchemy-components/components/Avatar/utils.ts b/datahub-web-react/src/alchemy-components/components/Avatar/utils.ts
index 46b2ee25488b89..f5c2468e2ab813 100644
--- a/datahub-web-react/src/alchemy-components/components/Avatar/utils.ts
+++ b/datahub-web-react/src/alchemy-components/components/Avatar/utils.ts
@@ -48,6 +48,7 @@ export const getAvatarSizes = (size) => {
         sm: { width: '18px', height: '18px', fontSize: '8px' },
         md: { width: '24px', height: '24px', fontSize: '12px' },
         lg: { width: '28px', height: '28px', fontSize: '14px' },
+        xl: { width: '32px', height: '32px', fontSize: '14px' },
         default: { width: '20px', height: '20px', fontSize: '10px' },
     };
 
diff --git a/datahub-web-react/src/alchemy-components/components/AvatarStack/AvatarStack.stories.tsx b/datahub-web-react/src/alchemy-components/components/AvatarStack/AvatarStack.stories.tsx
new file mode 100644
index 00000000000000..d9d46f7ce84c27
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/AvatarStack/AvatarStack.stories.tsx
@@ -0,0 +1,76 @@
+import React from 'react';
+import { Meta, StoryObj } from '@storybook/react';
+import { AvatarStack, avatarListDefaults } from './AvatarStack';
+
+// Meta Configuration
+const meta = {
+    title: 'Components / AvatarStack',
+    component: AvatarStack,
+
+    // Component-level parameters
+    parameters: {
+        layout: 'centered',
+        docs: {
+            subtitle: 'Displays a list of assignees with avatars.',
+        },
+    },
+
+    // Component-level argTypes
+    argTypes: {
+        avatars: {
+            description: 'List of avatar objects with name and image source.',
+            control: 'object',
+            table: {
+                type: {
+                    summary: 'Array<{ name: string; imageUrl: string }>',
+                },
+                defaultValue: { summary: '[]' },
+            },
+        },
+    },
+
+    // Default props
+    args: {
+        avatars: avatarListDefaults.avatars,
+        size: avatarListDefaults.size,
+    },
+} satisfies Meta<typeof AvatarStack>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+// Sandbox Story
+export const sandbox: Story = {
+    render: (props) => <AvatarStack {...props} />,
+};
+
+// Example Stories
+export const withMultipleAvatar = () => (
+    <AvatarStack
+        avatars={[
+            { name: 'John Doe', imageUrl: 'https://randomuser.me/api/portraits/men/1.jpg' },
+            { name: 'Test User', imageUrl: 'https://robohash.org/sample-profile.png' },
+            { name: 'Micky Test', imageUrl: 'https://randomuser.me/api/portraits/women/1.jpg' },
+        ]}
+        size="md"
+    />
+);
+
+// Example Stories
+export const witouthImagesMultipleAvatar = () => (
+    <AvatarStack
+        avatars={[
+            { name: 'John Doe', imageUrl: null },
+            { name: 'Test User', imageUrl: null },
+            { name: 'Micky Test', imageUrl: null },
+        ]}
+        size="md"
+    />
+);
+
+export const withSingleAvatar = () => (
+    <AvatarStack avatars={[{ name: 'John Doe', imageUrl: 'https://randomuser.me/api/portraits/men/1.jpg' }]} />
+);
+
+export const withNoAvatar = () => <AvatarStack avatars={[]} />;
diff --git a/datahub-web-react/src/alchemy-components/components/AvatarStack/AvatarStack.tsx b/datahub-web-react/src/alchemy-components/components/AvatarStack/AvatarStack.tsx
new file mode 100644
index 00000000000000..e9d8323676bffd
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/AvatarStack/AvatarStack.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { AvatarContainer, AvatarStackContainer } from './components';
+import { Avatar } from '../Avatar';
+import { AvatarItemProps, AvatarStackProps } from './types';
+
+export const avatarListDefaults: AvatarStackProps = {
+    avatars: [
+        { name: 'John Doe', imageUrl: 'https://randomuser.me/api/portraits/men/1.jpg' },
+        { name: 'Test User', imageUrl: 'https://robohash.org/sample-profile.png' },
+        { name: 'Micky Test', imageUrl: 'https://randomuser.me/api/portraits/women/1.jpg' },
+    ],
+    size: 'md',
+};
+
+export const AvatarStack = ({ avatars, size = 'md' }: AvatarStackProps) => {
+    if (avatars?.length === 0) return <div>-</div>;
+    const renderAvatarStack = avatars?.map((avatar: AvatarItemProps) => (
+        <AvatarContainer key={avatar.name}>
+            <Avatar size={size} isOutlined imageUrl={avatar.imageUrl} name={avatar.name} />
+        </AvatarContainer>
+    ));
+    return <AvatarStackContainer>{renderAvatarStack}</AvatarStackContainer>;
+};
diff --git a/datahub-web-react/src/alchemy-components/components/AvatarStack/components.ts b/datahub-web-react/src/alchemy-components/components/AvatarStack/components.ts
new file mode 100644
index 00000000000000..8a437605fbc185
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/AvatarStack/components.ts
@@ -0,0 +1,14 @@
+import styled from 'styled-components';
+
+export const AvatarStackContainer = styled.div`
+    position: relative;
+    display: flex;
+    align-items: flex-start;
+`;
+
+export const AvatarContainer = styled.div`
+    margin-left: -10px;
+    &:first-child {
+        margin-left: 0;
+    }
+`;
diff --git a/datahub-web-react/src/alchemy-components/components/AvatarStack/types.ts b/datahub-web-react/src/alchemy-components/components/AvatarStack/types.ts
new file mode 100644
index 00000000000000..d32cf763db54a2
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/AvatarStack/types.ts
@@ -0,0 +1,11 @@
+import { AvatarSizeOptions } from '@src/alchemy-components/theme/config';
+
+export interface AvatarItemProps {
+    name: string;
+    imageUrl?: string | null;
+}
+
+export type AvatarStackProps = {
+    avatars: AvatarItemProps[];
+    size?: AvatarSizeOptions;
+};
diff --git a/datahub-web-react/src/alchemy-components/components/Bar/Bar.stories.tsx b/datahub-web-react/src/alchemy-components/components/Bar/Bar.stories.tsx
new file mode 100644
index 00000000000000..e2a1d378c2086d
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Bar/Bar.stories.tsx
@@ -0,0 +1,92 @@
+import React from 'react';
+import { Meta, StoryObj } from '@storybook/react';
+import colors from '@src/alchemy-components/theme/foundations/colors';
+
+import { Bar } from './Bar';
+
+const meta: Meta<typeof Bar> = {
+    title: 'Components / Bar',
+    component: Bar,
+
+    // Component-level parameters
+    parameters: {
+        layout: 'centered',
+        docs: {
+            subtitle: 'Displays a bar component with up to three segments that can be dynamically colored.',
+        },
+    },
+
+    // Component-level argTypes
+    argTypes: {
+        color: {
+            description: 'Color of the filled bars.',
+            control: 'color',
+            table: {
+                defaultValue: { summary: colors.violet[500] },
+            },
+        },
+        coloredBars: {
+            description: 'Number of bars to color.',
+            control: { type: 'number', min: 0, max: 3 },
+            table: {
+                defaultValue: { summary: '2' },
+            },
+        },
+        size: {
+            description: 'Size of the bars.',
+            control: 'select',
+            options: ['sm', 'lg', 'default'],
+            table: {
+                defaultValue: { summary: 'default' },
+            },
+        },
+    },
+
+    // Default props
+    args: {
+        color: colors.violet[500],
+        coloredBars: 2,
+        size: 'default',
+    },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+// Sandbox Story
+export const sandbox: Story = {
+    render: (props) => <Bar {...props} />,
+};
+
+// Example Stories
+export const withCustomColors: Story = {
+    args: {
+        color: '#ff6b6b',
+        coloredBars: 3,
+    },
+};
+
+export const smallBars: Story = {
+    args: {
+        size: 'sm',
+        coloredBars: 1,
+        color: '#6bc1ff',
+    },
+};
+
+export const defaultBars: Story = {
+    args: {
+        size: 'default',
+        coloredBars: 2,
+        color: colors.violet[500],
+    },
+};
+
+export const noColoredBars: Story = {
+    args: {
+        size: 'default',
+        coloredBars: 0,
+        color: '#C6C0E0',
+    },
+};
diff --git a/datahub-web-react/src/alchemy-components/components/Bar/Bar.tsx b/datahub-web-react/src/alchemy-components/components/Bar/Bar.tsx
new file mode 100644
index 00000000000000..2c3a4aea8984d6
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Bar/Bar.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import { colors } from '@src/alchemy-components/theme';
+
+import { BarComponentProps } from './types';
+import { BarContainer, IndividualBar } from './components';
+import { BAR_HEIGHT_MULTIPLIER } from './constant';
+
+const defaultProps: BarComponentProps = {
+    color: colors.violet[500],
+    coloredBars: 2,
+    size: 'default',
+};
+export const Bar = ({
+    color = defaultProps.color,
+    coloredBars = defaultProps.coloredBars,
+    size = defaultProps.size,
+}: BarComponentProps) => {
+    const Bars = Array.from({ length: 3 }, (_, index) => {
+        const barHeight = (index + 2) * BAR_HEIGHT_MULTIPLIER[size];
+        return (
+            <IndividualBar key={index} size={size} height={barHeight} isColored={index < coloredBars} color={color} />
+        );
+    });
+    return <BarContainer>{Bars}</BarContainer>;
+};
diff --git a/datahub-web-react/src/alchemy-components/components/Bar/components.ts b/datahub-web-react/src/alchemy-components/components/Bar/components.ts
new file mode 100644
index 00000000000000..be0e5774d1595f
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Bar/components.ts
@@ -0,0 +1,15 @@
+import styled from 'styled-components';
+
+export const BarContainer = styled.div`
+    display: flex;
+    gap: 2px;
+    align-items: baseline;
+`;
+
+export const IndividualBar = styled.div<{ height: number; isColored: boolean; color: string; size: string }>`
+    width: ${(props) => (props.size === 'default' ? '5px' : '3px')};
+    height: ${(props) => props.height}px;
+    background-color: ${(props) => (props.isColored ? props.color : '#C6C0E0')};
+    border-radius: 20px;
+    transition: background-color 0.3s ease, height 0.3s ease;
+`;
diff --git a/datahub-web-react/src/alchemy-components/components/Bar/constant.ts b/datahub-web-react/src/alchemy-components/components/Bar/constant.ts
new file mode 100644
index 00000000000000..ad50dd32dd887e
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Bar/constant.ts
@@ -0,0 +1,5 @@
+export const BAR_HEIGHT_MULTIPLIER = {
+    lg: 5,
+    sm: 4,
+    default: 5,
+};
diff --git a/datahub-web-react/src/alchemy-components/components/Bar/index.ts b/datahub-web-react/src/alchemy-components/components/Bar/index.ts
new file mode 100644
index 00000000000000..856726b09bcaa1
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Bar/index.ts
@@ -0,0 +1 @@
+export { Bar } from './Bar';
diff --git a/datahub-web-react/src/alchemy-components/components/Bar/types.ts b/datahub-web-react/src/alchemy-components/components/Bar/types.ts
new file mode 100644
index 00000000000000..0f8d6773a1b8ad
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Bar/types.ts
@@ -0,0 +1,5 @@
+export interface BarComponentProps {
+    color: string;
+    coloredBars: number;
+    size: 'default' | 'sm';
+}
diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/BarChart.stories.tsx b/datahub-web-react/src/alchemy-components/components/BarChart/BarChart.stories.tsx
index 1258ff398c0a7e..f0ee44725ad578 100644
--- a/datahub-web-react/src/alchemy-components/components/BarChart/BarChart.stories.tsx
+++ b/datahub-web-react/src/alchemy-components/components/BarChart/BarChart.stories.tsx
@@ -3,6 +3,8 @@ import { BADGE } from '@geometricpanda/storybook-addon-badges';
 import type { Meta, StoryObj } from '@storybook/react';
 import { BarChart } from './BarChart';
 import { getMockedProps } from './utils';
+import { DEFAULT_MIN_VALUE } from './hooks/useAdaptYAccessorToZeroValues';
+import { DEFAULT_MAX_DOMAIN_VALUE } from './hooks/useAdaptYScaleToZeroValues';
 
 const meta = {
     title: 'Charts / BarChart',
@@ -28,24 +30,26 @@ const meta = {
         yAccessor: {
             description: 'A function to convert datum to value of Y',
         },
-        renderTooltipContent: {
+        maxYDomainForZeroData: {
+            description:
+                'For the case where the data has only zero values, you can set the yScale domain to better display the chart',
+            table: {
+                defaultValue: { summary: `${DEFAULT_MAX_DOMAIN_VALUE}` },
+            },
+        },
+        minYForZeroData: {
+            description:
+                'For the case where the data has only zero values, you can set minimal Y value to better display the chart',
+            table: {
+                defaultValue: { summary: `${DEFAULT_MIN_VALUE}` },
+            },
+        },
+        popoverRenderer: {
             description: 'A function to replace default rendering of toolbar',
         },
         margin: {
             description: 'Add margins to chart',
         },
-        leftAxisTickFormat: {
-            description: 'A function to format labels of left axis',
-        },
-        leftAxisTickLabelProps: {
-            description: 'Props for label of left axis',
-        },
-        bottomAxisTickFormat: {
-            description: 'A function to format labels of bottom axis',
-        },
-        bottomAxisTickLabelProps: {
-            description: 'Props for label of bottom axis',
-        },
         barColor: {
             description: 'Color of bar',
             control: {
@@ -58,11 +62,14 @@ const meta = {
                 type: 'color',
             },
         },
-        gridColor: {
-            description: "Color of grid's lines",
-            control: {
-                type: 'color',
-            },
+        leftAxisProps: {
+            description: 'The props for the left axis',
+        },
+        bottomAxisProps: {
+            description: 'The props for the bottom axis',
+        },
+        gridProps: {
+            description: 'The props for the grid',
         },
         renderGradients: {
             description: 'A function to render different gradients that can be used as colors',
@@ -72,7 +79,7 @@ const meta = {
     // Define defaults
     args: {
         ...getMockedProps(),
-        renderTooltipContent: (datum) => <>DATUM: {JSON.stringify(datum)}</>,
+        popoverRenderer: (datum) => <>DATUM: {JSON.stringify(datum)}</>,
     },
 } satisfies Meta<typeof BarChart>;
 
diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/BarChart.tsx b/datahub-web-react/src/alchemy-components/components/BarChart/BarChart.tsx
index eb5465a1d1217b..96c2b4f3ebeae9 100644
--- a/datahub-web-react/src/alchemy-components/components/BarChart/BarChart.tsx
+++ b/datahub-web-react/src/alchemy-components/components/BarChart/BarChart.tsx
@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
 import { colors } from '@src/alchemy-components/theme';
+import { abbreviateNumber } from '@src/app/dataviz/utils';
 import { TickLabelProps } from '@visx/axis';
 import { LinearGradient } from '@visx/gradient';
 import { ParentSize } from '@visx/responsive';
@@ -7,8 +8,12 @@ import { Axis, AxisScale, BarSeries, Grid, Tooltip, XYChart } from '@visx/xychar
 import dayjs from 'dayjs';
 import { Popover } from '../Popover';
 import { ChartWrapper, StyledBarSeries } from './components';
-import { BarChartProps } from './types';
-import { abbreviateNumber } from '../dataviz/utils';
+import { AxisProps, BarChartProps } from './types';
+import { getMockedProps } from './utils';
+import useMergedProps from './hooks/useMergedProps';
+import useAdaptYScaleToZeroValues from './hooks/useAdaptYScaleToZeroValues';
+import useAdaptYAccessorToZeroValue from './hooks/useAdaptYAccessorToZeroValues';
+import useMaxDataValue from './hooks/useMaxDataValue';
 
 const commonTickLabelProps: TickLabelProps<any> = {
     fontSize: 10,
@@ -18,39 +23,66 @@ const commonTickLabelProps: TickLabelProps<any> = {
 
 export const barChartDefault: BarChartProps<any> = {
     data: [],
+
     xAccessor: (datum) => datum?.x,
     yAccessor: (datum) => datum?.y,
-    leftAxisTickFormat: abbreviateNumber,
-    leftAxisTickLabelProps: {
-        ...commonTickLabelProps,
-        textAnchor: 'end',
-    },
-    bottomAxisTickFormat: (value) => dayjs(value).format('DD MMM'),
-    bottomAxisTickLabelProps: {
-        ...commonTickLabelProps,
-        textAnchor: 'middle',
-        verticalAnchor: 'start',
-        width: 20,
-    },
+    xScale: { type: 'band', paddingInner: 0.4, paddingOuter: 0.1 },
+    yScale: { type: 'linear', nice: true, round: true },
+
     barColor: 'url(#bar-gradient)',
     barSelectedColor: colors.violet[500],
-    gridColor: '#e0e0e0',
+
+    leftAxisProps: {
+        tickFormat: abbreviateNumber,
+        tickLabelProps: {
+            ...commonTickLabelProps,
+            textAnchor: 'end',
+        },
+        hideAxisLine: true,
+        hideTicks: true,
+    },
+    bottomAxisProps: {
+        tickFormat: (value) => dayjs(value).format('DD MMM'),
+        tickLabelProps: {
+            ...commonTickLabelProps,
+            textAnchor: 'middle',
+            verticalAnchor: 'start',
+            width: 20,
+        },
+        hideAxisLine: true,
+        hideTicks: true,
+    },
+    gridProps: {
+        rows: true,
+        columns: false,
+        stroke: '#e0e0e0',
+        strokeWidth: 1,
+        lineStyle: {},
+    },
+
     renderGradients: () => <LinearGradient id="bar-gradient" from={colors.violet[500]} to="#917FFF" toOpacity={0.6} />,
 };
 
 export function BarChart<DatumType extends object = any>({
     data,
+    isEmpty,
+
     xAccessor = barChartDefault.xAccessor,
     yAccessor = barChartDefault.yAccessor,
-    renderTooltipContent,
-    margin,
-    leftAxisTickFormat = barChartDefault.leftAxisTickFormat,
-    leftAxisTickLabelProps = barChartDefault.leftAxisTickLabelProps,
-    bottomAxisTickFormat = barChartDefault.bottomAxisTickFormat,
-    bottomAxisTickLabelProps = barChartDefault.bottomAxisTickLabelProps,
+    xScale = barChartDefault.xScale,
+    yScale = barChartDefault.yScale,
+    maxYDomainForZeroData,
+    minYForZeroData,
+
     barColor = barChartDefault.barColor,
     barSelectedColor = barChartDefault.barSelectedColor,
-    gridColor = barChartDefault.gridColor,
+    margin,
+
+    leftAxisProps = barChartDefault.leftAxisProps,
+    bottomAxisProps = barChartDefault.bottomAxisProps,
+    gridProps = barChartDefault.gridProps,
+
+    popoverRenderer,
     renderGradients = barChartDefault.renderGradients,
 }: BarChartProps<DatumType>) {
     const [hasSelectedBar, setHasSelectedBar] = useState<boolean>(false);
@@ -63,7 +95,27 @@ export function BarChart<DatumType extends object = any>({
         left: (margin?.left ?? 0) + 40,
     };
 
-    const accessors = { xAccessor, yAccessor };
+    const maxDataValue = useMaxDataValue(data, yAccessor);
+    const adaptedYScale = useAdaptYScaleToZeroValues(yScale, maxDataValue, maxYDomainForZeroData);
+    const adaptedYAccessor = useAdaptYAccessorToZeroValue(yAccessor, maxDataValue, minYForZeroData);
+
+    const accessors = { xAccessor, yAccessor: adaptedYAccessor };
+
+    const { computeNumTicks: computeLeftAxisNumTicks, ...mergedLeftAxisProps } = useMergedProps<AxisProps<DatumType>>(
+        leftAxisProps,
+        barChartDefault.leftAxisProps,
+    );
+
+    const { computeNumTicks: computeBottomAxisNumTicks, ...mergedBottomAxisProps } = useMergedProps<
+        AxisProps<DatumType>
+    >(bottomAxisProps, barChartDefault.bottomAxisProps);
+
+    // In case of no data we should render empty graph with axises
+    // but they don't render at all without any data.
+    // To handle this case we will render the same graph with fake data and hide bars
+    if (!data.length) {
+        return <BarChart {...getMockedProps()} isEmpty />;
+    }
 
     return (
         <ChartWrapper>
@@ -73,8 +125,8 @@ export function BarChart<DatumType extends object = any>({
                         <XYChart
                             width={width}
                             height={height}
-                            xScale={{ type: 'band', paddingInner: 0.4, paddingOuter: 0.1 }}
-                            yScale={{ type: 'linear', nice: true, round: true }}
+                            xScale={xScale}
+                            yScale={adaptedYScale}
                             margin={internalMargin}
                             captureEvents={false}
                         >
@@ -82,19 +134,14 @@ export function BarChart<DatumType extends object = any>({
 
                             <Axis
                                 orientation="left"
-                                hideAxisLine
-                                hideTicks
-                                tickFormat={leftAxisTickFormat}
-                                tickLabelProps={leftAxisTickLabelProps}
+                                numTicks={computeLeftAxisNumTicks?.(width, height, internalMargin, data)}
+                                {...mergedLeftAxisProps}
                             />
 
                             <Axis
                                 orientation="bottom"
-                                numTicks={data.length}
-                                tickFormat={bottomAxisTickFormat}
-                                tickLabelProps={bottomAxisTickLabelProps}
-                                hideAxisLine
-                                hideTicks
+                                numTicks={computeBottomAxisNumTicks?.(width, height, internalMargin, data)}
+                                {...mergedBottomAxisProps}
                             />
 
                             <line
@@ -102,16 +149,17 @@ export function BarChart<DatumType extends object = any>({
                                 x2={internalMargin.left}
                                 y1={0}
                                 y2={height - internalMargin.bottom}
-                                stroke={gridColor}
+                                stroke={gridProps?.stroke}
                             />
 
-                            <Grid rows columns={false} stroke={gridColor} strokeWidth={1} lineStyle={{}} />
+                            <Grid {...gridProps} />
 
                             <StyledBarSeries
                                 as={BarSeries<AxisScale, AxisScale, DatumType>}
                                 $hasSelectedItem={hasSelectedBar}
                                 $color={barColor}
                                 $selectedColor={barSelectedColor}
+                                $isEmpty={isEmpty}
                                 dataKey="bar-seria-0"
                                 data={data}
                                 radius={4}
@@ -136,8 +184,10 @@ export function BarChart<DatumType extends object = any>({
                                         tooltipData?.nearestDatum && (
                                             <Popover
                                                 open
+                                                defaultOpen
                                                 placement="topLeft"
-                                                content={renderTooltipContent?.(tooltipData.nearestDatum.datum)}
+                                                key={`${xAccessor(tooltipData.nearestDatum.datum)}`}
+                                                content={popoverRenderer?.(tooltipData.nearestDatum.datum)}
                                             />
                                         )
                                     );
diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/components.tsx b/datahub-web-react/src/alchemy-components/components/BarChart/components.tsx
index aa8f1320ef21dd..a0a3f7a2cebfc1 100644
--- a/datahub-web-react/src/alchemy-components/components/BarChart/components.tsx
+++ b/datahub-web-react/src/alchemy-components/components/BarChart/components.tsx
@@ -12,11 +12,18 @@ export const StyledBarSeries = styled(BarSeries)<{
     $hasSelectedItem?: boolean;
     $color?: string;
     $selectedColor?: string;
+    $isEmpty?: boolean;
 }>`
     & {
         cursor: pointer;
 
-        fill: ${(props) => (props.$hasSelectedItem ? props.$selectedColor : props.$color) || colors.violet[500]};
+        ${(props) => props.$isEmpty && 'pointer-events: none;'}
+
+        fill: ${(props) => {
+            if (props.$isEmpty) return colors.transparent;
+            return (props.$hasSelectedItem ? props.$selectedColor : props.$color) || colors.violet[500];
+        }};
+
         ${(props) => props.$hasSelectedItem && 'opacity: 0.3;'}
 
         :hover {
diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useAdaptYAccessorToZeroValues.ts b/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useAdaptYAccessorToZeroValues.ts
new file mode 100644
index 00000000000000..19831af296262a
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useAdaptYAccessorToZeroValues.ts
@@ -0,0 +1,18 @@
+import { useMemo } from 'react';
+import { YAccessor } from '../types';
+
+export const DEFAULT_MIN_VALUE = 0.1;
+
+export default function useAdaptYAccessorToZeroValue<T>(
+    yAccessor: YAccessor<T>,
+    maxDataValue: number,
+    minimalValue: number | undefined,
+): YAccessor<T> {
+    return useMemo(() => {
+        // Data contains non zero values, skip adaptation
+        if (maxDataValue > 0) return yAccessor;
+
+        // add minimal `y` value
+        return (value) => Math.max(yAccessor(value), minimalValue ?? DEFAULT_MIN_VALUE);
+    }, [yAccessor, maxDataValue, minimalValue]);
+}
diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useAdaptYScaleToZeroValues.ts b/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useAdaptYScaleToZeroValues.ts
new file mode 100644
index 00000000000000..f46dd7297f3093
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useAdaptYScaleToZeroValues.ts
@@ -0,0 +1,23 @@
+import { AxisScaleOutput } from '@visx/axis';
+import { ScaleConfig } from '@visx/scale';
+import { useMemo } from 'react';
+
+export const DEFAULT_MAX_DOMAIN_VALUE = 10;
+
+export default function useAdaptYScaleToZeroValues(
+    yScale: ScaleConfig<AxisScaleOutput, any, any> | undefined,
+    maxDataValue: number,
+    maxDomainValue: number | undefined,
+): ScaleConfig<AxisScaleOutput, any, any> | undefined {
+    return useMemo(() => {
+        // yScale should be passed for adaptation otherwise return it as is
+        if (!yScale) return yScale;
+
+        // Data contains non zero values, no need to adapt
+        if (maxDataValue > 0) return yScale;
+
+        // Add domain with max value to show data with only zero values correctly
+        const domain: [number, number] = [0, maxDomainValue ?? DEFAULT_MAX_DOMAIN_VALUE];
+        return { domain, ...yScale };
+    }, [maxDataValue, maxDomainValue, yScale]);
+}
diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useMaxDataValue.ts b/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useMaxDataValue.ts
new file mode 100644
index 00000000000000..331756a1bca89e
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useMaxDataValue.ts
@@ -0,0 +1,6 @@
+import { useMemo } from 'react';
+import { YAccessor } from '../types';
+
+export default function useMaxDataValue<T>(data: T[], yAccessor: YAccessor<T>): number {
+    return useMemo(() => Math.max(...data.map(yAccessor)) ?? 0, [data, yAccessor]);
+}
diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useMergedProps.ts b/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useMergedProps.ts
new file mode 100644
index 00000000000000..cf1e3f1cb2c02d
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/BarChart/hooks/useMergedProps.ts
@@ -0,0 +1,8 @@
+import { useMemo } from 'react';
+
+export default function useMergedProps<PropsType extends object>(
+    props?: PropsType,
+    defaultProps?: PropsType,
+): PropsType {
+    return useMemo(() => ({ ...(defaultProps || {}), ...(props || {}) }), [props, defaultProps]) as PropsType;
+}
diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/types.ts b/datahub-web-react/src/alchemy-components/components/BarChart/types.ts
index 5fd7e2e63e2411..26e216ef2c2fc5 100644
--- a/datahub-web-react/src/alchemy-components/components/BarChart/types.ts
+++ b/datahub-web-react/src/alchemy-components/components/BarChart/types.ts
@@ -1,18 +1,38 @@
-import { TickFormatter, TickLabelProps } from '@visx/axis';
+import { AxisScaleOutput } from '@visx/axis';
+import { ScaleConfig } from '@visx/scale';
 import { Margin } from '@visx/xychart';
+import { AxisProps as VisxAxisProps } from '@visx/xychart/lib/components/axis/Axis';
+import { GridProps as VisxGridProps } from '@visx/xychart/lib/components/grid/Grid';
+
+export type AxisProps<DatumType extends object> = Omit<VisxAxisProps, 'orientation' | 'numTicks'> & {
+    computeNumTicks?: (width: number, height: number, margin: Margin, data: DatumType[]) => number | undefined;
+};
+
+export type GridProps<DatumType extends object> = Omit<VisxGridProps, 'numTicks'> & {
+    computeNumTicks?: (width: number, height: number, margin: Margin, data: DatumType[]) => number | undefined;
+};
+
+export type YAccessor<T> = (datum: T) => number;
 
 export type BarChartProps<DatumType extends object> = {
     data: DatumType[];
+    isEmpty?: boolean;
+
     xAccessor: (datum: DatumType) => string | number;
-    yAccessor: (datum: DatumType) => number;
-    renderTooltipContent?: (datum: DatumType) => React.ReactNode;
-    margin?: Margin;
-    leftAxisTickFormat?: TickFormatter<DatumType>;
-    leftAxisTickLabelProps?: TickLabelProps<DatumType>;
-    bottomAxisTickFormat?: TickFormatter<DatumType>;
-    bottomAxisTickLabelProps?: TickLabelProps<DatumType>;
+    yAccessor: YAccessor<DatumType>;
+    xScale?: ScaleConfig<AxisScaleOutput, any, any>;
+    yScale?: ScaleConfig<AxisScaleOutput, any, any>;
+    maxYDomainForZeroData?: number;
+    minYForZeroData?: number;
+
     barColor?: string;
     barSelectedColor?: string;
-    gridColor?: string;
+    margin?: Margin;
+
+    leftAxisProps?: AxisProps<DatumType>;
+    bottomAxisProps?: AxisProps<DatumType>;
+    gridProps?: GridProps<DatumType>;
+
+    popoverRenderer?: (datum: DatumType) => React.ReactNode;
     renderGradients?: () => React.ReactNode;
 };
diff --git a/datahub-web-react/src/alchemy-components/components/BarChart/utils.ts b/datahub-web-react/src/alchemy-components/components/BarChart/utils.ts
index 0b592da7f59b08..48f100a2813004 100644
--- a/datahub-web-react/src/alchemy-components/components/BarChart/utils.ts
+++ b/datahub-web-react/src/alchemy-components/components/BarChart/utils.ts
@@ -7,7 +7,8 @@ export function generateMockData(length = 30, maxValue = 50_000, minValue = 0) {
             const date = dayjs()
                 .startOf('day')
                 .add(index - length, 'days')
-                .toDate();
+                .toDate()
+                .getTime();
             const value = Math.max(Math.random() * maxValue, minValue);
 
             return {
diff --git a/datahub-web-react/src/alchemy-components/components/Button/Button.stories.tsx b/datahub-web-react/src/alchemy-components/components/Button/Button.stories.tsx
index e2d7c2852da519..22cd810c246bfe 100644
--- a/datahub-web-react/src/alchemy-components/components/Button/Button.stories.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Button/Button.stories.tsx
@@ -61,6 +61,19 @@ const meta = {
                 type: 'select',
             },
         },
+        iconSize: {
+            description: 'The optional size of the Icon.',
+            options: ['xs', 'sm', 'md', 'lg', 'xl', '2xl', '3xl', '4xl'],
+            table: {
+                defaultValue: {
+                    summary: 'undefined',
+                    detail: 'The size of the Button will be used as the size of the Icon',
+                },
+            },
+            control: {
+                type: 'select',
+            },
+        },
         icon: {
             description: 'The icon to display in the Button.',
             type: 'string',
diff --git a/datahub-web-react/src/alchemy-components/components/Button/Button.tsx b/datahub-web-react/src/alchemy-components/components/Button/Button.tsx
index a727b0faf97a99..daf3d39dccdb8c 100644
--- a/datahub-web-react/src/alchemy-components/components/Button/Button.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Button/Button.tsx
@@ -24,6 +24,7 @@ export const Button = ({
     size = buttonDefaults.size,
     icon, // default undefined
     iconPosition = buttonDefaults.iconPosition,
+    iconSize,
     isCircle = buttonDefaults.isCircle,
     isLoading = buttonDefaults.isLoading,
     isDisabled = buttonDefaults.isDisabled,
@@ -52,9 +53,9 @@ export const Button = ({
 
     return (
         <ButtonBase {...sharedProps} {...props}>
-            {icon && iconPosition === 'left' && <Icon icon={icon} size={size} />}
+            {icon && iconPosition === 'left' && <Icon icon={icon} size={iconSize || size} />}
             {!isCircle && children}
-            {icon && iconPosition === 'right' && <Icon icon={icon} size={size} />}
+            {icon && iconPosition === 'right' && <Icon icon={icon} size={iconSize || size} />}
         </ButtonBase>
     );
 };
diff --git a/datahub-web-react/src/alchemy-components/components/Button/types.ts b/datahub-web-react/src/alchemy-components/components/Button/types.ts
index f510ff4c6c13c5..f0f50b0e0cf8b6 100644
--- a/datahub-web-react/src/alchemy-components/components/Button/types.ts
+++ b/datahub-web-react/src/alchemy-components/components/Button/types.ts
@@ -1,7 +1,7 @@
 import { ButtonHTMLAttributes } from 'react';
 
 import type { IconNames } from '@components';
-import type { SizeOptions, ColorOptions } from '@components/theme/config';
+import type { SizeOptions, ColorOptions, FontSizeOptions } from '@components/theme/config';
 
 export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
     variant?: 'filled' | 'outline' | 'text';
@@ -9,6 +9,7 @@ export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
     size?: SizeOptions;
     icon?: IconNames;
     iconPosition?: 'left' | 'right';
+    iconSize?: FontSizeOptions;
     isCircle?: boolean;
     isLoading?: boolean;
     isDisabled?: boolean;
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/CalendarChart.stories.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/CalendarChart.stories.tsx
new file mode 100644
index 00000000000000..1221da45be815a
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/CalendarChart.stories.tsx
@@ -0,0 +1,82 @@
+import React from 'react';
+import { BADGE } from '@geometricpanda/storybook-addon-badges';
+import type { Meta, StoryObj } from '@storybook/react';
+import { CalendarChart } from './CalendarChart';
+import { getMockedProps } from './utils';
+
+const meta = {
+    title: 'Charts / CalendarChart',
+    component: CalendarChart,
+
+    // Display Properties
+    parameters: {
+        layout: 'centered',
+        badges: [BADGE.EXPERIMENTAL],
+        docs: {
+            subtitle: 'A component that is used to show CalendarChart',
+        },
+    },
+
+    // Component-level argTypes
+    argTypes: {
+        data: {
+            description: 'Array of datum to show',
+        },
+        startDate: {
+            description: 'The first day of calendar (it will be rounded by weeks)',
+        },
+        endDate: {
+            description: 'The last day of calendar (it will be rounded by weeks)',
+        },
+        colorAccessor: {
+            description: "A function to get color by datum's value",
+        },
+        showPopover: {
+            description: 'Enable to add popovers',
+            table: {
+                defaultValue: { summary: 'true' },
+            },
+            control: {
+                type: 'boolean',
+            },
+        },
+        popoverRenderer: {
+            description: "A function to render popover's content of datum's value",
+        },
+        leftAxisLabelProps: {
+            description: 'Props for label of left axis',
+        },
+        bottomAxisLabelProps: {
+            description: 'Props for label of bottom axis',
+        },
+        margin: {
+            description: 'Margins for CalendarChart',
+        },
+        selectedDay: {
+            description: 'Set a date in format `YYYY-MM-DD` to select this day on calendar',
+            control: {
+                type: 'text',
+            },
+        },
+    },
+
+    // Define defaults
+    args: {
+        ...getMockedProps(),
+        popoverRenderer: (day) => <>{JSON.stringify(day)}</>,
+        onDayClick: () => null,
+    },
+} satisfies Meta<typeof CalendarChart>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const sandbox: Story = {
+    tags: ['dev'],
+    render: (props) => (
+        <div style={{ width: '900px', height: '350px' }}>
+            <CalendarChart {...props} />
+        </div>
+    ),
+};
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/CalendarChart.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/CalendarChart.tsx
new file mode 100644
index 00000000000000..ca51e63b6feb85
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/CalendarChart.tsx
@@ -0,0 +1,80 @@
+import { colors } from '@src/alchemy-components/theme';
+import { ParentSize } from '@visx/responsive';
+import React, { useMemo } from 'react';
+import { ChartWrapper } from './components';
+import { AxisBottomMonths } from './private/components/AxisBottomMonths';
+import { AxisLeftWeekdays } from './private/components/AxisLeftWeekdays';
+import { Calendar } from './private/components/Calendar';
+import { CalendarProvider } from './private/context';
+import { CalendarChartProps } from './types';
+import { prepareCalendarData } from './utils';
+import { CalendarContainer } from './private/components/CalendarContainer';
+
+const commonLabelProps = {
+    fill: colors.gray[1700],
+    fontFamily: 'Mulish',
+    fontSize: 10,
+};
+
+export const calendarChartDefault: Omit<CalendarChartProps<any>, 'colorAccessor' | 'startDate' | 'endDate'> = {
+    data: [],
+    leftAxisLabelProps: {
+        ...commonLabelProps,
+        textAnchor: 'end',
+    },
+    bottomAxisLabelProps: {
+        ...commonLabelProps,
+        textAnchor: 'middle',
+    },
+    maxHeight: 350,
+    showPopover: true,
+};
+
+export function CalendarChart<ValueType = any>({
+    data = calendarChartDefault.data,
+    startDate,
+    endDate,
+    colorAccessor,
+    showPopover = calendarChartDefault.showPopover,
+    popoverRenderer,
+    leftAxisLabelProps = calendarChartDefault.leftAxisLabelProps,
+    bottomAxisLabelProps = calendarChartDefault.bottomAxisLabelProps,
+    margin,
+    maxHeight = calendarChartDefault.maxHeight,
+    selectedDay,
+    onDayClick,
+}: CalendarChartProps<ValueType>) {
+    const preparedData = useMemo(
+        () => prepareCalendarData<ValueType>(data, startDate, endDate),
+        [data, startDate, endDate],
+    );
+
+    return (
+        <ChartWrapper>
+            <ParentSize>
+                {({ width, height }) => {
+                    return (
+                        <CalendarProvider<ValueType>
+                            data={preparedData}
+                            width={width}
+                            height={maxHeight ?? height}
+                            margin={margin}
+                            colorAccessor={colorAccessor}
+                            showPopover={showPopover}
+                            popoverRenderer={popoverRenderer}
+                            selectedDay={selectedDay}
+                            onDayClick={onDayClick}
+                        >
+                            <CalendarContainer>
+                                <AxisLeftWeekdays<ValueType> labelProps={leftAxisLabelProps} />
+                                <AxisBottomMonths<ValueType> labelProps={bottomAxisLabelProps} />
+
+                                <Calendar<ValueType> data={preparedData} />
+                            </CalendarContainer>
+                        </CalendarProvider>
+                    );
+                }}
+            </ParentSize>
+        </ChartWrapper>
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/_tests_/getColorAccessors.test.ts b/datahub-web-react/src/alchemy-components/components/CalendarChart/_tests_/getColorAccessors.test.ts
new file mode 100644
index 00000000000000..788b611f1ec219
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/_tests_/getColorAccessors.test.ts
@@ -0,0 +1,82 @@
+import { CalendarData } from '../types';
+import { getColorAccessor } from '../utils';
+
+type Datum = {
+    value1: number;
+    value2: number;
+};
+
+const sampleData: CalendarData<Datum>[] = [
+    { day: '2024-01-01', value: { value1: 10, value2: 10 } },
+    { day: '2024-01-02', value: { value1: 20, value2: 15 } },
+    { day: '2024-01-03', value: { value1: 0, value2: 0 } },
+];
+
+const DEFAULT_COLOR = '#EBECF0';
+
+const sampleColorAccessors = getColorAccessor<Datum>(
+    sampleData,
+    {
+        value1: {
+            valueAccessor: (datum) => datum.value1,
+            colors: ['#fff', '#000'], // white -> black
+        },
+        value2: {
+            valueAccessor: (datum) => datum.value2,
+            colors: ['#ff0000', '#00ff00', '#0000ff'], // red -> green -> blue
+        },
+    },
+    DEFAULT_COLOR,
+);
+
+const sampleColorAccessorsEmpty = getColorAccessor<Datum>(sampleData, {}, DEFAULT_COLOR);
+
+describe('getColorAccessors', () => {
+    it('should return default color if there are zero values', () => {
+        const result = sampleColorAccessors({ value1: 0, value2: 0 });
+
+        expect(result).toBe(DEFAULT_COLOR);
+    });
+
+    it('should return defalut color when value is negative', () => {
+        const result = sampleColorAccessors({ value1: -50, value2: -10 });
+
+        expect(result).toBe(DEFAULT_COLOR);
+    });
+
+    it('should return defalut color when color accessors are no provided', () => {
+        const result = sampleColorAccessorsEmpty({ value1: 10, value2: 10 });
+
+        expect(result).toBe(DEFAULT_COLOR);
+    });
+
+    it('should return correctly interpolated color for average value', () => {
+        const result = sampleColorAccessors({ value1: 10, value2: 0 });
+
+        expect(result).toBe('rgb(128, 128, 128)'); // the color's between white and black
+    });
+
+    it('should return correctly interpolated color for max value', () => {
+        const result = sampleColorAccessors({ value1: 20, value2: 0 });
+
+        expect(result).toBe('rgb(0, 0, 0)');
+    });
+
+    it('should return colors for value2 when value2 great then value1', () => {
+        const result = sampleColorAccessors({ value1: 10, value2: 20 });
+
+        expect(result).toBe('rgb(0, 0, 255)'); // blue
+    });
+
+    it('should return colors for the first max value', () => {
+        const result = sampleColorAccessors({ value1: 20, value2: 20 });
+
+        expect(result).toBe('rgb(0, 0, 0)');
+    });
+
+    it('should return max color if value is great then max value', () => {
+        const result = sampleColorAccessors({ value1: 50, value2: 20 });
+
+        expect(result).toBe('rgb(0, 0, 0)');
+    });
+});
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/_tests_/prepareCalendarDate.test.ts b/datahub-web-react/src/alchemy-components/components/CalendarChart/_tests_/prepareCalendarDate.test.ts
new file mode 100644
index 00000000000000..97a0fe382ee116
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/_tests_/prepareCalendarDate.test.ts
@@ -0,0 +1,109 @@
+import { CalendarData } from '../types';
+import { prepareCalendarData } from '../utils';
+
+const sampleData: CalendarData<number>[] = [
+    { day: '2024-12-02', value: 1 },
+    { day: '2024-12-03', value: 2 },
+    { day: '2024-12-04', value: 3 },
+    { day: '2024-12-05', value: 4 },
+    { day: '2024-12-06', value: 5 },
+    { day: '2024-12-07', value: 6 },
+    { day: '2024-12-08', value: 7 },
+];
+
+describe('prepareCalendarData', () => {
+    it('should prepare data for a full month', () => {
+        const result = prepareCalendarData(sampleData, '2024-12-01', '2024-12-31');
+
+        // 3 months (Nov / Dec / Jan) because edge weeks aren't belong to Dec
+        // because of there are less Dec days then of another month
+        expect(result).toHaveLength(3);
+        // Nov 1 week from 2024-11-25 to 2024-12-01
+        expect(result[0].weeks).toHaveLength(1);
+        expect(result[0].weeks[0].days[0].day).toBe('2024-11-25');
+        expect(result[0].weeks[0].days[6].day).toBe('2024-12-01');
+        expect(result[0].weeks[0].days.some((day) => day.value !== undefined)).toBeFalsy(); // no values
+        // Dec 4 weeks from 2024-12-02 to 2024-12-29
+        expect(result[1].weeks).toHaveLength(4);
+        expect(result[1].weeks[0].days[0].day).toBe('2024-12-02');
+        expect(result[1].weeks[3].days[6].day).toBe('2024-12-29');
+        expect(result[1].weeks[0].days.some((day) => day.value !== undefined)).toBeTruthy(); // has values
+        sampleData.forEach((datum, index) => {
+            expect(result[1].weeks[0].days[index].value).toBe(datum.value);
+        });
+        expect(result[1].weeks[1].days.some((day) => day.value !== undefined)).toBeFalsy(); // no values
+        expect(result[1].weeks[2].days.some((day) => day.value !== undefined)).toBeFalsy(); // no values
+        expect(result[1].weeks[3].days.some((day) => day.value !== undefined)).toBeFalsy(); // no values
+        // Jan 1 wekk from 2024-12-30 to 2025-01-05
+        expect(result[2].weeks).toHaveLength(1);
+        expect(result[2].weeks[0].days[0].day).toBe('2024-12-30');
+        expect(result[2].weeks[0].days[6].day).toBe('2025-01-05');
+        expect(result[2].weeks[0].days.some((day) => day.value !== undefined)).toBeFalsy(); // no values
+    });
+
+    it('should prepare data for a full week', () => {
+        const result = prepareCalendarData(sampleData, '2024-12-02', '2024-12-08');
+
+        expect(result).toHaveLength(1);
+        expect(result[0]).toHaveProperty('weeks');
+        expect(result[0].weeks).toHaveLength(1);
+        expect(result[0].weeks[0].days).toHaveLength(7);
+        sampleData.forEach((datum, index) => {
+            expect(result[0].weeks[0].days[index].value).toBe(datum.value);
+        });
+    });
+
+    it('should handle a month transition', () => {
+        const result = prepareCalendarData(sampleData, '2024-11-04', '2024-12-29');
+
+        // 2 months (Nov / Dec)
+        expect(result).toHaveLength(2);
+        // Nov 4 weeks from 2024-11-04 to 2024-12-01
+        expect(result[0].key).toBe('2024-11');
+        expect(result[0].weeks).toHaveLength(4);
+        expect(result[0].weeks[0].days[0].day).toBe('2024-11-04');
+        expect(result[0].weeks[3].days[6].day).toBe('2024-12-01');
+        // Dec 4 weeks from 2024-12-02 to 2024-12-29
+        expect(result[1].key).toBe('2024-12');
+        expect(result[1].weeks).toHaveLength(4);
+        expect(result[1].weeks[0].days[0].day).toBe('2024-12-02');
+        expect(result[1].weeks[3].days[6].day).toBe('2024-12-29');
+    });
+
+    it('should handle a year transition', () => {
+        const result = prepareCalendarData(sampleData, '2024-12-02', '2025-01-05');
+
+        // 2 months (Dec / Jan)
+        expect(result).toHaveLength(2);
+        // Dec 4 weeks from 2024-12-02 to 2024-12-29
+        expect(result[0].key).toBe('2024-12');
+        expect(result[0].weeks).toHaveLength(4);
+        expect(result[0].weeks[0].days[0].day).toBe('2024-12-02');
+        expect(result[0].weeks[3].days[6].day).toBe('2024-12-29');
+        // Jan 1 week from 2024-12-30 to 2025-01-05
+        expect(result[1].key).toBe('2025-01');
+        expect(result[1].weeks).toHaveLength(1);
+        expect(result[1].weeks[0].days[0].day).toBe('2024-12-30');
+        expect(result[1].weeks[0].days[6].day).toBe('2025-01-05');
+    });
+
+    it('should handle when the start and end date are the same', () => {
+        const result = prepareCalendarData(sampleData, '2024-12-01', '2024-12-01');
+
+        expect(result).toHaveLength(1);
+        expect(result[0].weeks).toHaveLength(1);
+        expect(result[0].weeks[0].days).toHaveLength(7); // rounding by start/end of week
+        expect(result[0].weeks[0].days[0].day).toBe('2024-11-25');
+        expect(result[0].weeks[0].days[6].day).toBe('2024-12-01');
+    });
+
+    it('should handle a range with no data for the given dates', () => {
+        const result = prepareCalendarData([], '2024-01-01', '2024-01-07');
+
+        expect(result).toHaveLength(1);
+        expect(result[0]).toHaveProperty('weeks');
+        expect(result[0].weeks).toHaveLength(1);
+        expect(result[0].weeks[0].days).toHaveLength(7);
+        expect(result[0].weeks[0].days.some((day) => day.value !== undefined)).toBeFalsy();
+    });
+});
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/components.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/components.tsx
new file mode 100644
index 00000000000000..28524fe43085e4
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/components.tsx
@@ -0,0 +1,30 @@
+import { Bar } from '@visx/shape';
+import styled from 'styled-components';
+
+export const ChartWrapper = styled.div`
+    width: 100%;
+    height: 100%;
+    position: relative;
+`;
+
+export const CalendarWrapper = styled.div`
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: left;
+    overflow-x: auto;
+`;
+
+export const CalendarInnerWrapper = styled.div<{ $width: string }>`
+    width: ${(props) => props.$width};
+`;
+
+export const StyledBar = styled(Bar)<{ $addTransparency?: boolean }>`
+    cursor: pointer;
+
+    ${(props) => props.$addTransparency && 'filter: opacity(0.3);'}
+
+    :hover {
+        filter: drop-shadow(0px 0px 4px rgba(0 0 0 / 0.25)) brightness(90%);
+    }
+`;
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/constants.ts b/datahub-web-react/src/alchemy-components/components/CalendarChart/constants.ts
new file mode 100644
index 00000000000000..fb20520c9b7a23
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/constants.ts
@@ -0,0 +1 @@
+export const CALENDAR_DATE_FORMAT = 'YYYY-MM-DD';
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/index.ts b/datahub-web-react/src/alchemy-components/components/CalendarChart/index.ts
new file mode 100644
index 00000000000000..5ac232084cbf2d
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/index.ts
@@ -0,0 +1,2 @@
+export { CalendarChart } from './CalendarChart';
+export { CALENDAR_DATE_FORMAT } from './constants';
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/AxisBottomMonths.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/AxisBottomMonths.tsx
new file mode 100644
index 00000000000000..eabbf12c45511f
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/AxisBottomMonths.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import { DAYS_IN_WEEK } from '../constants';
+import { useCalendarState } from '../context';
+import { TickLabel } from './TickLabel';
+import { AxisBottomMonthsProps } from '../../types';
+
+export function AxisBottomMonths<ValueType>({ labelProps }: AxisBottomMonthsProps) {
+    const { squareSize, squareGap, margin, data } = useCalendarState<ValueType>();
+    const weeksInMonth = data.map((group) => group.weeks.length);
+    const axisTopMargin = 25;
+
+    return (
+        <>
+            {data.map((month, monthIndex) => {
+                // Do not show the first label when there are only one week in month to prevent labels overlay
+                if (monthIndex === 0 && month.weeks.length === 1) return null;
+
+                const weeksBefore = weeksInMonth.slice(0, monthIndex).reduce((acc, value) => acc + value, 0);
+                const yLabel = DAYS_IN_WEEK * (squareSize + squareGap) + margin.top + axisTopMargin;
+                const xLabel = weeksBefore * (squareSize + squareGap) + squareGap * monthIndex + margin.left + 10;
+
+                return (
+                    <TickLabel
+                        key={`axis-bottom-${month.key}`}
+                        text={month.label}
+                        x={xLabel}
+                        y={yLabel}
+                        {...labelProps}
+                    />
+                );
+            })}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/AxisLeftWeekdays.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/AxisLeftWeekdays.tsx
new file mode 100644
index 00000000000000..7888115d7fb289
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/AxisLeftWeekdays.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import { DAYS_IN_WEEK } from '../constants';
+import { AxisLeftWeekdaysProps } from '../../types';
+import { useCalendarState } from '../context';
+import { TickLabel } from './TickLabel';
+
+const WEEKDAYS = ['Mon', 'Tue', 'Wed', 'Thur', 'Fri', 'Sat', 'Sun'];
+
+export function AxisLeftWeekdays<ValueType>({ labelProps }: AxisLeftWeekdaysProps) {
+    const { margin, squareSize, squareGap } = useCalendarState<ValueType>();
+
+    const yLineOffset = 5;
+    const xLineOffset = 4;
+
+    const lineHeight = squareSize + squareGap;
+    const lineOffset = Math.floor(squareSize / 2) + squareGap;
+
+    const x = margin.left - xLineOffset;
+    const y = lineHeight * DAYS_IN_WEEK + margin.top + yLineOffset;
+
+    const renderTickLabel = (number: number, text: string) => {
+        const labelXOffset = 12;
+        const xLabel = margin.left - labelXOffset;
+        const yLabel = lineHeight * number + lineOffset + margin.top;
+
+        return <TickLabel key={`axis-left-${number}`} text={text} x={xLabel} y={yLabel} {...(labelProps ?? {})} />;
+    };
+
+    return (
+        <>
+            {WEEKDAYS.map((weekday, index) => renderTickLabel(index, weekday))}
+            <line x1={x} x2={x} y1={0} y2={y} stroke="#EBECF0" width={1} />
+        </>
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Calendar.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Calendar.tsx
new file mode 100644
index 00000000000000..61323ee48b1256
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Calendar.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { CalendarProps } from '../../types';
+import { Month } from './Month';
+
+export function Calendar<ValueType>({ data }: CalendarProps<ValueType>) {
+    return (
+        <>
+            {data.map((month, monthIndex) => {
+                return <Month key={month.key} month={month} monthIndex={monthIndex} />;
+            })}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/CalendarContainer.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/CalendarContainer.tsx
new file mode 100644
index 00000000000000..169a14f0a5d4ec
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/CalendarContainer.tsx
@@ -0,0 +1,31 @@
+import React, { useMemo } from 'react';
+import { useCalendarState } from '../context';
+import { DAYS_IN_WEEK } from '../constants';
+import { CalendarContainerProps } from '../../types';
+import { CalendarInnerWrapper, CalendarWrapper } from '../../components';
+
+export function CalendarContainer<ValueType>({ children }: CalendarContainerProps) {
+    const { squareSize, squareGap, margin, parentHeight, countOfWeeks, countOfMonths } = useCalendarState<ValueType>();
+
+    const svgHeight = useMemo(
+        () => Math.min((squareSize + squareGap) * DAYS_IN_WEEK + margin.top + margin.bottom, parentHeight),
+        [squareSize, squareGap, margin.top, margin.bottom, parentHeight],
+    );
+
+    // Calendar can be wider then the parent container because of minimal size of square and gap
+    // In this case the horizontal sroll should be shown
+    const svgWidth = useMemo(
+        () => (squareSize + squareGap) * countOfWeeks + squareGap * countOfMonths + margin.left + margin.right,
+        [squareSize, squareGap, countOfWeeks, countOfMonths, margin.left, margin.right],
+    );
+
+    return (
+        <CalendarWrapper>
+            <CalendarInnerWrapper $width={`${svgWidth}px`}>
+                <svg width={svgWidth} height={svgHeight}>
+                    {children}
+                </svg>
+            </CalendarInnerWrapper>
+        </CalendarWrapper>
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Day.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Day.tsx
new file mode 100644
index 00000000000000..229be8d2aa4b6b
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Day.tsx
@@ -0,0 +1,40 @@
+import { Popover } from '@src/alchemy-components/components/Popover';
+import React, { useMemo } from 'react';
+import { DayProps } from '../../types';
+import { useCalendarState } from '../context';
+import { StyledBar } from '../../components';
+
+export function Day<ValueType>({ day, weekOffset, dayIndex }: DayProps<ValueType>) {
+    const { squareSize, squareGap, margin, colorAccessor, showPopover, popoverRenderer, selectedDay, onDayClick } =
+        useCalendarState<ValueType>();
+    const color = useMemo(() => colorAccessor(day.value), [colorAccessor, day.value]);
+
+    const y = useMemo(
+        () => (squareGap + squareSize) * dayIndex + margin.top,
+        [squareGap, squareSize, dayIndex, margin],
+    );
+
+    const renderBar = () => {
+        return (
+            <StyledBar
+                x={weekOffset}
+                y={y}
+                width={squareSize}
+                height={squareSize}
+                rx={4}
+                fill={color}
+                onPointerUp={() => onDayClick?.(day)}
+                $addTransparency={!!selectedDay && selectedDay !== day.day}
+            />
+        );
+    };
+
+    if (showPopover) {
+        return (
+            <Popover placement="topLeft" content={popoverRenderer?.(day)}>
+                {renderBar()}
+            </Popover>
+        );
+    }
+    return renderBar();
+}
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Month.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Month.tsx
new file mode 100644
index 00000000000000..312935716d57f6
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Month.tsx
@@ -0,0 +1,28 @@
+import React, { useMemo } from 'react';
+import { MonthProps } from '../../types';
+import { useCalendarState } from '../context';
+import { Week } from './Week';
+
+export function Month<ValueType>({ month, monthIndex }: MonthProps<ValueType>) {
+    const { squareGap, data } = useCalendarState();
+    const monthOffset = useMemo(() => squareGap * monthIndex, [squareGap, monthIndex]);
+    const countOfWeeksBefore = useMemo(
+        () => data.slice(0, monthIndex).reduce((countOfWeeks, monthItem) => countOfWeeks + monthItem.weeks.length, 0),
+        [data, monthIndex],
+    );
+
+    return (
+        <>
+            {month.weeks.map((week, weekIndex) => {
+                return (
+                    <Week
+                        key={week.key}
+                        week={week}
+                        monthOffset={monthOffset}
+                        weekNumber={countOfWeeksBefore + weekIndex}
+                    />
+                );
+            })}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/TickLabel.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/TickLabel.tsx
new file mode 100644
index 00000000000000..b3af03cb176a0b
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/TickLabel.tsx
@@ -0,0 +1,13 @@
+import React, { SVGAttributes } from 'react';
+
+export type TickLabelProps = SVGAttributes<SVGTextElement> & {
+    text: string;
+};
+
+export const TickLabel = ({ text, ...props }: TickLabelProps) => {
+    return (
+        <text {...props}>
+            <tspan>{text}</tspan>
+        </text>
+    );
+};
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Week.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Week.tsx
new file mode 100644
index 00000000000000..973ad8c5165f1f
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/components/Week.tsx
@@ -0,0 +1,21 @@
+import React, { useMemo } from 'react';
+import { WeekProps } from '../../types';
+import { useCalendarState } from '../context';
+import { Day } from './Day';
+
+export function Week<ValueType>({ week, weekNumber, monthOffset }: WeekProps<ValueType>) {
+    const { squareSize, squareGap, margin } = useCalendarState<ValueType>();
+
+    const x = useMemo(() => {
+        const weekOffset = weekNumber * (squareGap + squareSize);
+        return monthOffset + weekOffset + margin.left;
+    }, [squareGap, squareSize, monthOffset, weekNumber, margin.left]);
+
+    return (
+        <>
+            {week.days.map((day, dayIndex) => {
+                return <Day<ValueType> key={day.key} day={day} weekOffset={x} dayIndex={dayIndex} />;
+            })}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/constants.ts b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/constants.ts
new file mode 100644
index 00000000000000..89baf1700b1431
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/constants.ts
@@ -0,0 +1,4 @@
+export const DAYS_IN_WEEK = 7;
+export const MIN_DAYS_IN_WEEK = 4;
+export const MIN_SQUARE_SIZE = 16;
+export const MIN_GAP_SIZE = 4;
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/private/context.tsx b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/context.tsx
new file mode 100644
index 00000000000000..a83fd6c7f56cfc
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/private/context.tsx
@@ -0,0 +1,109 @@
+import { Margin } from '@visx/xychart';
+import React, { createContext, PropsWithChildren, useContext, useMemo } from 'react';
+import { DayData, MonthData } from '../types';
+import { DAYS_IN_WEEK, MIN_GAP_SIZE, MIN_SQUARE_SIZE } from './constants';
+
+export type CalendarContextState<ValueType = any> = {
+    data: MonthData<ValueType>[];
+    parentWidth: number;
+    parentHeight: number;
+    squareSize: number;
+    squareGap: number;
+    margin: Margin;
+    countOfWeeks: number;
+    countOfMonths: number;
+    showPopover?: boolean;
+    popoverRenderer?: (day: DayData<ValueType>) => React.ReactNode;
+    colorAccessor: (value?: ValueType) => string;
+    selectedDay?: string | null;
+    onDayClick?: (day: DayData<ValueType>) => void;
+};
+
+export const CalendarContext = createContext<CalendarContextState | null>(null);
+
+export type CalendarProviderProps<ValueType> = {
+    data: MonthData<ValueType>[];
+    width: number;
+    height: number;
+    margin?: Margin;
+    showPopover?: boolean;
+    popoverRenderer?: (day: DayData<ValueType>) => React.ReactNode;
+    colorAccessor: (value?: ValueType) => string;
+    selectedDay?: string | null;
+    onDayClick?: (day: DayData<ValueType>) => void;
+};
+
+export function CalendarProvider<ValueType>({
+    children,
+    data,
+    width,
+    height,
+    margin,
+    showPopover,
+    popoverRenderer,
+    colorAccessor,
+    selectedDay,
+    onDayClick,
+}: PropsWithChildren<CalendarProviderProps<ValueType>>) {
+    const calendarMargin = useMemo(
+        () => ({
+            // additional top margin
+            top: (margin?.top ?? 0) + 10,
+            right: (margin?.right ?? 0) + 0,
+            // additional space for bottom axis
+            bottom: (margin?.bottom ?? 0) + 40,
+            // additional space for left axis
+            left: (margin?.left ?? 0) + 50,
+        }),
+        [margin],
+    );
+
+    const calendarWidth = useMemo(() => width - calendarMargin.right - calendarMargin.left, [width, calendarMargin]);
+    const calendarHeight = useMemo(() => height - calendarMargin.top - calendarMargin.bottom, [height, calendarMargin]);
+
+    const countOfWeeks = useMemo(() => data.reduce((acc, value) => acc + value.weeks.length, 0), [data]);
+    const countOfMonths = useMemo(() => data.length, [data.length]);
+
+    const squareGap = MIN_GAP_SIZE;
+
+    const squareSize = useMemo(() => {
+        // Compute size of square depending of width
+        const maxSizeByWidth = Math.floor(
+            (calendarWidth - squareGap * Math.floor(countOfWeeks) - squareGap * Math.floor(countOfMonths)) /
+                Math.floor(countOfWeeks),
+        );
+
+        // Compute size of square depending of height
+        const maxSizeByHeight = Math.floor((calendarHeight - squareGap * DAYS_IN_WEEK) / DAYS_IN_WEEK);
+
+        return Math.max(Math.min(maxSizeByWidth, maxSizeByHeight), MIN_SQUARE_SIZE);
+    }, [squareGap, countOfWeeks, countOfMonths, calendarHeight, calendarWidth]);
+
+    return (
+        <CalendarContext.Provider
+            value={{
+                data,
+                parentWidth: width,
+                parentHeight: height,
+                squareSize,
+                squareGap,
+                countOfWeeks,
+                countOfMonths,
+                colorAccessor,
+                showPopover,
+                popoverRenderer,
+                margin: calendarMargin,
+                selectedDay,
+                onDayClick,
+            }}
+        >
+            {children}
+        </CalendarContext.Provider>
+    );
+}
+
+export function useCalendarState<ValueType>() {
+    const context = useContext<CalendarContextState<ValueType> | null>(CalendarContext);
+    if (context === null) throw new Error(`${useCalendarState.name} must be used under a ${CalendarProvider.name}`);
+    return context;
+}
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/types.ts b/datahub-web-react/src/alchemy-components/components/CalendarChart/types.ts
new file mode 100644
index 00000000000000..198775527c3cfa
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/types.ts
@@ -0,0 +1,81 @@
+import { Margin } from '@visx/xychart';
+import { SVGAttributes } from 'react';
+
+export type DayData<ValueType> = {
+    day: string;
+    key: string;
+    value?: ValueType;
+};
+
+export type WeekData<ValueType> = {
+    days: DayData<ValueType>[];
+    key: string;
+};
+
+export type MonthData<ValueType> = {
+    weeks: WeekData<ValueType>[];
+    key: string;
+    label: string;
+};
+
+export type CalendarData<ValueType> = {
+    day: string;
+    value: ValueType;
+};
+
+export type LabelProps = Omit<SVGAttributes<SVGTextElement>, 'x, y'>;
+
+export type Accessor<ValueType, ResponseType> = (value: ValueType) => ResponseType;
+
+export type ColorAccessor<ValueType> = {
+    valueAccessor: Accessor<ValueType, number>;
+    colors: string[];
+};
+
+export type CalendarChartProps<ValueType> = {
+    data: CalendarData<ValueType>[];
+    startDate: string | Date;
+    endDate: string | Date;
+    colorAccessor: (value: any) => string;
+    showPopover?: boolean;
+    popoverRenderer?: (day: DayData<ValueType>) => React.ReactNode;
+    leftAxisLabelProps?: LabelProps;
+    bottomAxisLabelProps?: LabelProps;
+    margin?: Margin;
+    maxHeight?: number;
+    selectedDay?: string | null;
+    onDayClick?: (day: DayData<ValueType>) => void;
+};
+
+export type CalendarProps<ValueType> = {
+    data: MonthData<ValueType>[];
+};
+
+export type MonthProps<ValueType> = {
+    month: MonthData<ValueType>;
+    monthIndex: number;
+};
+
+export type WeekProps<ValueType> = {
+    week: WeekData<ValueType>;
+    weekNumber: number;
+    monthOffset: number;
+};
+
+export type DayProps<ValueType> = {
+    day: DayData<ValueType>;
+    weekOffset: number;
+    dayIndex: number;
+};
+
+export type AxisLeftWeekdaysProps = {
+    labelProps?: LabelProps;
+};
+
+export type AxisBottomMonthsProps = {
+    labelProps?: LabelProps;
+};
+
+export type CalendarContainerProps = {
+    children: React.ReactNode;
+};
diff --git a/datahub-web-react/src/alchemy-components/components/CalendarChart/utils.ts b/datahub-web-react/src/alchemy-components/components/CalendarChart/utils.ts
new file mode 100644
index 00000000000000..a4acb1dbbf5dfb
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/CalendarChart/utils.ts
@@ -0,0 +1,208 @@
+import { scaleLinear } from '@visx/scale';
+import * as d3interpolate from '@visx/vendor/d3-interpolate';
+import dayjs from 'dayjs';
+import isoWeek from 'dayjs/plugin/isoWeek';
+import utc from 'dayjs/plugin/utc';
+import advancedFormat from 'dayjs/plugin/advancedFormat';
+import { CalendarChartProps, CalendarData, ColorAccessor, DayData, MonthData, WeekData } from './types';
+import { DAYS_IN_WEEK, MIN_DAYS_IN_WEEK } from './private/constants';
+import { CALENDAR_DATE_FORMAT } from './constants';
+
+dayjs.extend(isoWeek);
+dayjs.extend(utc);
+dayjs.extend(advancedFormat);
+
+export function prepareCalendarData<ValueType>(
+    data: CalendarData<ValueType>[],
+    start: string | Date,
+    end: string | Date,
+    labelFormat = 'MMM ’YY',
+): MonthData<ValueType>[] {
+    // Round start/end date to the start/end of the week
+    const startDate = dayjs(start).utc(true).startOf('isoWeek').startOf('day');
+    const endDate = dayjs(end).utc(true).endOf('isoWeek').startOf('day');
+
+    // Helper functions to create day, week, and month objects
+    const createDay = (keyDay, value?: ValueType): DayData<ValueType> => ({
+        day: keyDay.format(CALENDAR_DATE_FORMAT),
+        key: keyDay.format(CALENDAR_DATE_FORMAT),
+        value,
+    });
+
+    const createWeek = (keyDay, days?: DayData<ValueType>[]): WeekData<ValueType> => ({
+        days: days ?? [],
+        key: keyDay.format('YYYY-MM-WW'),
+    });
+
+    const createMonth = (keyDay, weeks?: WeekData<ValueType>[]): MonthData<ValueType> => ({
+        weeks: weeks ?? [],
+        key: keyDay.format('YYYY-MM'),
+        label: keyDay.format(labelFormat),
+    });
+
+    const months: MonthData<ValueType>[] = [];
+    let month: MonthData<ValueType> = createMonth(startDate.endOf('isoWeek'));
+    let week: WeekData<ValueType> | null = createWeek(startDate);
+
+    // Iterate through each day from startDate to endDate
+    for (let day = dayjs(startDate); !day.isAfter(endDate); day = day.add(1, 'day')) {
+        // Find a value corresponding to the current day
+        const value = data.filter((datum) => dayjs(datum.day).utc(true).isSame(day, 'date'))?.[0]?.value;
+
+        const dayItem: DayData<ValueType> = createDay(day, value);
+
+        if (week === null) week = createWeek(day);
+        week.days.push(dayItem); // Add the day item to the current week
+
+        // Check if it's the last day of the week
+        if (day.isoWeekday() === DAYS_IN_WEEK) {
+            const startOfWeek = day.startOf('isoWeek');
+            const endOfWeek = day;
+            const firstDayOfNextWeek = day.add(1, 'day');
+
+            if (startOfWeek.month() !== endOfWeek.month()) {
+                // Handle month transition in current week
+
+                const lastWeekdayOfMonth = startOfWeek.endOf('month').isoWeekday();
+
+                if (lastWeekdayOfMonth >= MIN_DAYS_IN_WEEK) {
+                    // This week belongs to the current month
+                    month.weeks.push(week);
+                    months.push(month);
+                    week = null;
+                    month = createMonth(firstDayOfNextWeek);
+                } else {
+                    // This week belongs to the next month
+                    if (month.weeks.length) months.push(month); // add current month if it has any weeks
+                    month = createMonth(firstDayOfNextWeek, [week]);
+                    week = null;
+                }
+            } else if (firstDayOfNextWeek.month() !== endOfWeek.month()) {
+                // Handle if month changed on next week
+                month.weeks.push(week);
+                months.push(month);
+                week = null;
+                month = createMonth(firstDayOfNextWeek);
+            } else {
+                month.weeks.push(week);
+                week = null;
+            }
+
+            if (endOfWeek.isSame(endDate)) {
+                // Handle the end day
+                if (week && month) month.weeks.push(week);
+                if (month.weeks.length) months.push(month);
+            }
+        }
+    }
+
+    return months;
+}
+
+export function getColorAccessor<ValueType = any>(
+    data: CalendarData<ValueType>[],
+    colorAccessors: { [key: string]: ColorAccessor<ValueType> },
+    defaultColor: string,
+    correctiveMaxValue = 0,
+) {
+    if (Object.keys(colorAccessors).length === 0) return () => defaultColor;
+
+    const scales = Object.entries(colorAccessors).reduce((acc, [key, accessor]) => {
+        return {
+            ...acc,
+            ...{
+                [key]: scaleLinear({
+                    domain: [
+                        0,
+                        Math.max(...data.map((datum) => accessor.valueAccessor(datum.value)), correctiveMaxValue),
+                    ],
+                    range: [0, 1],
+                    clamp: true,
+                }),
+            },
+        };
+    }, {});
+
+    const colorInterpolators = Object.entries(colorAccessors).reduce((acc, [key, accessor]) => {
+        return {
+            ...acc,
+            ...{
+                [key]: d3interpolate.interpolateRgbBasis(accessor.colors),
+            },
+        };
+    }, {});
+
+    return function (datumValue?: ValueType) {
+        if (datumValue === undefined) return defaultColor;
+
+        // Get key and value of item with max value
+        const [key, value] = Object.entries(colorAccessors)
+            .map(([accessorKey, colorAccessor]) => [accessorKey, colorAccessor.valueAccessor(datumValue)])
+            .reduce((max, current) => (current[1] > max[1] ? current : max));
+
+        if ((value as number) <= 0) return defaultColor;
+
+        const scaledValue = scales[key](value);
+        return colorInterpolators[key](scaledValue);
+    };
+}
+
+export type MockCalendarValue = {
+    inserts: number;
+    updates: number;
+    deletes: number;
+};
+
+export function generateMockData(
+    length: number,
+    startDate: string | Date = '2024-11-30',
+    maxValue = 3_000,
+    minValue = 0,
+): CalendarData<MockCalendarValue>[] {
+    return Array(length)
+        .fill(0)
+        .map((_, index) => {
+            const day = dayjs(startDate)
+                .startOf('day')
+                .add(index - length + 1, 'days')
+                .format(CALENDAR_DATE_FORMAT);
+
+            return {
+                day,
+                value: {
+                    inserts: Math.max(Math.random() * maxValue, minValue),
+                    updates: Math.max(Math.random() * maxValue, minValue),
+                    deletes: Math.max(Math.random() * maxValue, minValue),
+                },
+            };
+        });
+}
+
+export function getMockedProps(
+    startDate = '2024-01-01',
+    endDate = '2024-12-31',
+): CalendarChartProps<MockCalendarValue> {
+    const data = generateMockData(150, '2024-11-30');
+
+    const colorAccessor = getColorAccessor<MockCalendarValue>(
+        data,
+        {
+            insertsAndUpdates: {
+                valueAccessor: (datum) => datum.inserts + datum.updates,
+                colors: ['#CAC3F1', '#705EE4', '#3E2F9D'],
+            },
+            deletes: {
+                valueAccessor: (datum) => datum.deletes,
+                colors: ['#f1c3ca', '#CF6D6D', '#ab4242'],
+            },
+        },
+        '#EBECF0',
+    );
+
+    return {
+        data,
+        startDate,
+        endDate,
+        colorAccessor,
+    };
+}
diff --git a/datahub-web-react/src/alchemy-components/components/Card/Card.stories.tsx b/datahub-web-react/src/alchemy-components/components/Card/Card.stories.tsx
index 336831fd15cfab..67966dbaa12d82 100644
--- a/datahub-web-react/src/alchemy-components/components/Card/Card.stories.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Card/Card.stories.tsx
@@ -70,9 +70,30 @@ const meta = {
                 type: 'text',
             },
         },
+        maxWidth: {
+            description: 'The maximum width of the card',
+            control: {
+                type: 'text',
+            },
+        },
+        height: {
+            description: 'The height of the card',
+            control: {
+                type: 'text',
+            },
+        },
         onClick: {
             description: 'The on click function for the card',
         },
+        isEmpty: {
+            description: 'Whether the card is in empty state with No data',
+            table: {
+                defaultValue: { summary: `${cardDefaults.isEmpty}` },
+            },
+            control: {
+                type: 'boolean',
+            },
+        },
     },
 
     // Define default args
@@ -80,7 +101,7 @@ const meta = {
         title: 'Title',
         subTitle: 'Subtitle',
         iconAlignment: 'horizontal',
-        width: '150px',
+        isEmpty: false,
     },
 } satisfies Meta<typeof Card>;
 
diff --git a/datahub-web-react/src/alchemy-components/components/Card/Card.tsx b/datahub-web-react/src/alchemy-components/components/Card/Card.tsx
index 55c581251bea99..397ae2a664e6f4 100644
--- a/datahub-web-react/src/alchemy-components/components/Card/Card.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Card/Card.tsx
@@ -6,6 +6,7 @@ import { Pill } from '../Pills';
 export const cardDefaults: CardProps = {
     title: 'Title',
     iconAlignment: 'horizontal',
+    isEmpty: false,
 };
 
 export const Card = ({
@@ -18,31 +19,45 @@ export const Card = ({
     icon,
     children,
     width,
+    maxWidth,
+    height,
+    isEmpty,
 }: CardProps) => {
     return (
-        <CardContainer hasButton={!!button} onClick={onClick} width={width}>
-            <Header iconAlignment={iconAlignment}>
-                {icon && <div>{icon}</div>}
-                <TitleContainer>
-                    <Title>
-                        {title}
-                        {!!percent && (
-                            <Pill
-                                label={`${Math.abs(percent)}%`}
-                                size="sm"
-                                colorScheme={percent < 0 ? 'red' : 'green'}
-                                leftIcon={percent < 0 ? 'TrendingDown' : 'TrendingUp'}
-                                clickable={false}
-                            />
-                        )}
-                    </Title>
-                    <SubTitleContainer>
+        <>
+            {isEmpty ? (
+                <CardContainer maxWidth={maxWidth} height={height} width={width}>
+                    <TitleContainer>
+                        <Title $isEmpty={isEmpty}>No Data</Title>
                         <SubTitle>{subTitle}</SubTitle>
-                        {button}
-                    </SubTitleContainer>
-                </TitleContainer>
-            </Header>
-            {children}
-        </CardContainer>
+                    </TitleContainer>
+                </CardContainer>
+            ) : (
+                <CardContainer hasButton={!!button} onClick={onClick} maxWidth={maxWidth} height={height} width={width}>
+                    <Header iconAlignment={iconAlignment}>
+                        {icon}
+                        <TitleContainer>
+                            <Title>
+                                {title}
+                                {!!percent && (
+                                    <Pill
+                                        label={`${Math.abs(percent)}%`}
+                                        size="sm"
+                                        colorScheme={percent < 0 ? 'red' : 'green'}
+                                        leftIcon={percent < 0 ? 'TrendingDown' : 'TrendingUp'}
+                                        clickable={false}
+                                    />
+                                )}
+                            </Title>
+                            <SubTitleContainer>
+                                <SubTitle>{subTitle}</SubTitle>
+                                {button}
+                            </SubTitleContainer>
+                        </TitleContainer>
+                    </Header>
+                    {children}
+                </CardContainer>
+            )}
+        </>
     );
 };
diff --git a/datahub-web-react/src/alchemy-components/components/Card/components.ts b/datahub-web-react/src/alchemy-components/components/Card/components.ts
index bb3821fffc7f58..f9510a85cb7a67 100644
--- a/datahub-web-react/src/alchemy-components/components/Card/components.ts
+++ b/datahub-web-react/src/alchemy-components/components/Card/components.ts
@@ -2,25 +2,30 @@ import { colors, radius, spacing, typography } from '@src/alchemy-components/the
 import { IconAlignmentOptions } from '@src/alchemy-components/theme/config';
 import styled from 'styled-components';
 
-export const CardContainer = styled.div<{ hasButton: boolean; width?: string }>(({ hasButton, width }) => ({
-    border: `1px solid ${colors.gray[100]}`,
-    borderRadius: radius.lg,
-    padding: spacing.md,
-    minWidth: '150px',
-    boxShadow: '0px 1px 2px 0px rgba(33, 23, 95, 0.07)',
-    backgroundColor: colors.white,
-    display: 'flex',
-    flexDirection: 'column',
-    gap: spacing.md,
-    width,
+export const CardContainer = styled.div<{ hasButton?: boolean; width?: string; maxWidth?: string; height?: string }>(
+    ({ hasButton, width, maxWidth, height }) => ({
+        border: `1px solid ${colors.gray[100]}`,
+        borderRadius: radius.lg,
+        padding: spacing.md,
+        display: 'flex',
+        flex: `1 1 ${maxWidth}`,
+        minWidth: '150px',
+        boxShadow: '0px 1px 2px 0px rgba(33, 23, 95, 0.07)',
+        backgroundColor: colors.white,
+        flexDirection: 'column',
+        gap: spacing.md,
+        maxWidth,
+        width,
+        height,
 
-    '&:hover': hasButton
-        ? {
-              border: `1px solid ${colors.violet[500]}`,
-              cursor: 'pointer',
-          }
-        : {},
-}));
+        '&:hover': hasButton
+            ? {
+                  border: `1px solid ${colors.violet[500]}`,
+                  cursor: 'pointer',
+              }
+            : {},
+    }),
+);
 
 export const Header = styled.div<{ iconAlignment?: IconAlignmentOptions }>(({ iconAlignment }) => ({
     display: 'flex',
@@ -37,14 +42,14 @@ export const TitleContainer = styled.div({
     width: '100%',
 });
 
-export const Title = styled.div({
+export const Title = styled.div<{ $isEmpty?: boolean }>(({ $isEmpty }) => ({
     fontSize: typography.fontSizes.lg,
     fontWeight: typography.fontWeights.bold,
-    color: colors.gray[600],
+    color: $isEmpty ? colors.gray[1800] : colors.gray[600],
     display: 'flex',
     alignItems: 'center',
     gap: spacing.xsm,
-});
+}));
 
 export const SubTitleContainer = styled.div({
     display: 'flex',
diff --git a/datahub-web-react/src/alchemy-components/components/Card/types.ts b/datahub-web-react/src/alchemy-components/components/Card/types.ts
index e5b0e36f83e4ce..991215f0bed066 100644
--- a/datahub-web-react/src/alchemy-components/components/Card/types.ts
+++ b/datahub-web-react/src/alchemy-components/components/Card/types.ts
@@ -10,4 +10,7 @@ export interface CardProps {
     iconAlignment?: IconAlignmentOptions;
     children?: React.ReactNode;
     width?: string;
+    maxWidth?: string;
+    height?: string;
+    isEmpty?: boolean;
 }
diff --git a/datahub-web-react/src/alchemy-components/components/Checkbox/Checkbox.tsx b/datahub-web-react/src/alchemy-components/components/Checkbox/Checkbox.tsx
index 6ab4db74610e49..d69a28195bebbe 100644
--- a/datahub-web-react/src/alchemy-components/components/Checkbox/Checkbox.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Checkbox/Checkbox.tsx
@@ -12,7 +12,6 @@ import {
 } from './components';
 
 export const checkboxDefaults: CheckboxProps = {
-    label: 'Label',
     error: '',
     isChecked: false,
     isDisabled: false,
@@ -42,9 +41,11 @@ export const Checkbox = ({
 
     return (
         <CheckboxContainer>
-            <Label aria-label={label}>
-                {label} {isRequired && <Required>*</Required>}
-            </Label>
+            {label ? (
+                <Label aria-label={label}>
+                    {label} {isRequired && <Required>*</Required>}
+                </Label>
+            ) : null}
             <CheckboxBase
                 onClick={() => {
                     if (!isDisabled) {
diff --git a/datahub-web-react/src/alchemy-components/components/Checkbox/components.ts b/datahub-web-react/src/alchemy-components/components/Checkbox/components.ts
index 6a4ad08c9c4ce6..7193f8577c4357 100644
--- a/datahub-web-react/src/alchemy-components/components/Checkbox/components.ts
+++ b/datahub-web-react/src/alchemy-components/components/Checkbox/components.ts
@@ -57,7 +57,7 @@ export const Checkmark = styled.div<{ intermediate?: boolean; error: string; che
             content: '""',
             position: 'absolute',
             display: 'none',
-            left: !intermediate ? '6px' : '8px',
+            left: !intermediate ? '5px' : '8px',
             top: !intermediate ? '1px' : '3px',
             width: !intermediate ? '5px' : '0px',
             height: '10px',
diff --git a/datahub-web-react/src/alchemy-components/components/Checkbox/types.ts b/datahub-web-react/src/alchemy-components/components/Checkbox/types.ts
index 7ee10011689397..e4bbe8808378e8 100644
--- a/datahub-web-react/src/alchemy-components/components/Checkbox/types.ts
+++ b/datahub-web-react/src/alchemy-components/components/Checkbox/types.ts
@@ -1,7 +1,7 @@
 import { InputHTMLAttributes } from 'react';
 
 export interface CheckboxProps extends InputHTMLAttributes<HTMLInputElement> {
-    label: string;
+    label?: string;
     error?: string;
     isChecked?: boolean;
     setIsChecked?: React.Dispatch<React.SetStateAction<boolean>>;
diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/DatePicker.stories.tsx b/datahub-web-react/src/alchemy-components/components/DatePicker/DatePicker.stories.tsx
new file mode 100644
index 00000000000000..c116003505bf72
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/DatePicker/DatePicker.stories.tsx
@@ -0,0 +1,61 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import moment from 'moment';
+import React, { useState } from 'react';
+import { DatePicker, datePickerDefault } from './DatePicker';
+import { DatePickerValue } from './types';
+
+const meta = {
+    title: 'Forms / DatePicker',
+    component: DatePicker,
+    parameters: {
+        layout: 'centered',
+        docs: {
+            subtitle: 'A component to select a date.',
+        },
+    },
+    argTypes: {
+        value: {
+            description: 'The value of the component can be a Moment object or null | undefined',
+            table: {
+                defaultValue: { summary: 'undefined' },
+                type: { summary: 'Moment | null | undefined' },
+            },
+        },
+        onChange: {
+            description: 'Callback function, can be executed when the selected date is changing',
+            table: {
+                defaultValue: { summary: 'undefined' },
+            },
+        },
+        disabled: {
+            description: 'Determine whether the DatePicker is disabled',
+            table: {
+                defaultValue: { summary: 'false' },
+            },
+            control: {
+                type: 'boolean',
+            },
+        },
+        variant: {
+            description: 'Preset of predefined props',
+            table: {
+                defaultValue: { summary: 'DEFAULT' },
+            },
+        },
+    },
+    args: { ...datePickerDefault },
+} satisfies Meta<typeof DatePicker>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+function WrappedDatePicker(props) {
+    const [value, setValue] = useState<DatePickerValue>(moment());
+    return <DatePicker value={value} onChange={(v) => setValue(v)} {...props} />;
+}
+
+export const sandbox: Story = {
+    tags: ['dev'],
+    render: WrappedDatePicker,
+};
diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/DatePicker.tsx b/datahub-web-react/src/alchemy-components/components/DatePicker/DatePicker.tsx
new file mode 100644
index 00000000000000..765cfdce14877d
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/DatePicker/DatePicker.tsx
@@ -0,0 +1,54 @@
+import React, { useEffect, useMemo, useState } from 'react';
+import { StyledAntdDatePicker } from './components';
+import useVariantProps from './hooks/useVariantProps';
+import { DatePickerVariant } from './constants';
+import { DatePickerProps, DatePickerValue } from './types';
+
+export const datePickerDefault: DatePickerProps = {
+    variant: DatePickerVariant.Default,
+    disabled: false,
+};
+
+export function DatePicker({
+    value,
+    onChange,
+    variant = datePickerDefault.variant,
+    disabled = datePickerDefault.disabled,
+    disabledDate,
+}: DatePickerProps) {
+    const [internalValue, setInternalValue] = useState<DatePickerValue | undefined>(value);
+
+    const [isOpen, setIsOpen] = useState<boolean>(false);
+    const presetProps = useVariantProps(variant);
+    const { inputRender, ...datePickerProps } = presetProps;
+
+    useEffect(() => onChange?.(internalValue), [onChange, internalValue]);
+
+    const wrappedInputRender = useMemo(() => {
+        if (!inputRender) return undefined;
+
+        return (props: React.InputHTMLAttributes<HTMLInputElement>) =>
+            inputRender({
+                ...props,
+                datePickerProps: {
+                    disabled,
+                },
+                datePickerState: {
+                    open: isOpen,
+                    setValue: setInternalValue,
+                },
+            });
+    }, [disabled, isOpen, inputRender]);
+
+    return (
+        <StyledAntdDatePicker
+            {...datePickerProps}
+            value={value}
+            inputRender={wrappedInputRender && ((props) => wrappedInputRender?.(props))}
+            onChange={(newValue) => setInternalValue(newValue)}
+            onOpenChange={(open) => setIsOpen(open)}
+            disabled={disabled}
+            disabledDate={disabledDate}
+        />
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/components.tsx b/datahub-web-react/src/alchemy-components/components/DatePicker/components.tsx
new file mode 100644
index 00000000000000..8d44635c622219
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/DatePicker/components.tsx
@@ -0,0 +1,32 @@
+import { colors } from '@src/alchemy-components/theme';
+import { DatePicker as AntdDatePicker } from 'antd';
+import styled from 'styled-components';
+
+export const StyledAntdDatePicker = styled(AntdDatePicker)<{ $noDefaultPaddings?: boolean }>`
+    &.ant-picker {
+        ${(props) => props.$noDefaultPaddings && 'padding: 0;'}
+        width: 100%;
+    }
+
+    &.acryl-date-picker .ant-picker-cell-today > .ant-picker-cell-inner::before {
+        border: 1px solid ${colors.violet[500]} !important;
+    }
+`;
+
+export const StyledCalendarWrapper = styled.div`
+    & .ant-picker-cell-selected > .ant-picker-cell-inner {
+        background: ${colors.violet[500]} !important;
+    }
+
+    & .ant-picker-cell-today > .ant-picker-cell-inner::before {
+        border: 1px solid ${colors.violet[500]} !important;
+    }
+
+    & .ant-picker-today-btn {
+        color: ${colors.violet[500]};
+    }
+
+    & .ant-picker-header-view button:hover {
+        color: ${colors.violet[500]};
+    }
+`;
diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/constants.ts b/datahub-web-react/src/alchemy-components/components/DatePicker/constants.ts
new file mode 100644
index 00000000000000..b452978fa2555e
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/DatePicker/constants.ts
@@ -0,0 +1,4 @@
+export enum DatePickerVariant {
+    Default = 'DEFAULT',
+    DateSwitcher = 'DATE_SWITCHER',
+}
diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/hooks/useVariantProps.ts b/datahub-web-react/src/alchemy-components/components/DatePicker/hooks/useVariantProps.ts
new file mode 100644
index 00000000000000..65932ba58a517e
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/DatePicker/hooks/useVariantProps.ts
@@ -0,0 +1,15 @@
+import { useMemo } from 'react';
+import { DatePickerVariant } from '../constants';
+import { VariantProps } from '../types';
+import { CommonVariantProps, DateSwitcherVariantProps } from '../variants';
+
+export default function useVariantProps(variant: DatePickerVariant | undefined): VariantProps {
+    return useMemo(() => {
+        switch (variant) {
+            case DatePickerVariant.DateSwitcher:
+                return DateSwitcherVariantProps;
+            default:
+                return CommonVariantProps;
+        }
+    }, [variant]);
+}
diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/index.ts b/datahub-web-react/src/alchemy-components/components/DatePicker/index.ts
new file mode 100644
index 00000000000000..f0563e87283cb7
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/DatePicker/index.ts
@@ -0,0 +1,3 @@
+export { DatePicker } from './DatePicker';
+export { DatePickerVariant } from './constants';
+export type { DatePickerValue } from './types';
diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/styles.css b/datahub-web-react/src/alchemy-components/components/DatePicker/styles.css
new file mode 100644
index 00000000000000..64a7be7eb39b4b
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/DatePicker/styles.css
@@ -0,0 +1,15 @@
+.acryl-date-picker .ant-picker-cell-today > .ant-picker-cell-inner::before {
+    border: 1px solid #533fd1 !important;
+}
+
+.acryl-date-picker .ant-picker-cell-selected > .ant-picker-cell-inner {
+    background: #533fd1 !important;
+}
+
+.acryl-date-picker .ant-picker-today-btn {
+    color: #533fd1;
+}
+
+.acryl-date-picker .ant-picker-header-view button:hover {
+    color: #533fd1;
+}
diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/types.ts b/datahub-web-react/src/alchemy-components/components/DatePicker/types.ts
new file mode 100644
index 00000000000000..4e16346edd679b
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/DatePicker/types.ts
@@ -0,0 +1,31 @@
+import { DatePicker as AntdDatePicker } from 'antd';
+import { Moment } from 'moment';
+import { DatePickerVariant } from './constants';
+
+export type DatePickerProps = {
+    value?: DatePickerValue;
+    onChange?: (value: DatePickerValue) => void;
+    disabled?: boolean;
+    disabledDate?: (value: DatePickerValue) => boolean;
+    variant?: DatePickerVariant;
+};
+
+export type DatePickerState = {
+    open?: boolean;
+    value?: DatePickerValue;
+    setValue?: React.Dispatch<React.SetStateAction<DatePickerValue>>;
+};
+
+export type ExtendedInputRenderProps = React.InputHTMLAttributes<HTMLInputElement> & {
+    datePickerProps: DatePickerProps;
+    datePickerState: DatePickerState;
+};
+
+export type AntdDatePickerProps = React.ComponentProps<typeof AntdDatePicker>;
+
+export type DatePickerValue = Moment | null | undefined;
+
+export type VariantProps = Omit<AntdDatePickerProps, 'inputRender'> & {
+    inputRender?: (props: ExtendedInputRenderProps) => React.ReactNode;
+    $noDefaultPaddings?: boolean;
+};
diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/variants/common/props.tsx b/datahub-web-react/src/alchemy-components/components/DatePicker/variants/common/props.tsx
new file mode 100644
index 00000000000000..9323530d332a8e
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/DatePicker/variants/common/props.tsx
@@ -0,0 +1,7 @@
+import React from 'react';
+import { StyledCalendarWrapper } from '../../components';
+import { VariantProps } from '../../types';
+
+export const CommonVariantProps: VariantProps = {
+    panelRender: (panel) => <StyledCalendarWrapper>{panel}</StyledCalendarWrapper>,
+};
diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/components.tsx b/datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/components.tsx
new file mode 100644
index 00000000000000..4e3f0067f907d1
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/components.tsx
@@ -0,0 +1,122 @@
+import { colors } from '@components';
+import { CaretLeft, CaretRight } from 'phosphor-react';
+import React, { useCallback, useMemo } from 'react';
+import styled from 'styled-components';
+import { Text } from '../../../Text/Text';
+import { SwitcherDirection } from './types';
+import { ExtendedInputRenderProps } from '../../types';
+
+const StyledContainer = styled.div<{ $opened?: boolean; $disabled?: boolean }>`
+    border: 1px solid ${(props) => (props.$opened || props.$disabled ? colors.gray[1800] : colors.gray[100])};
+    ${(props) => props.$opened && !props.$disabled && `outline: 2px solid ${colors.violet[300]};`}
+    border-radius: 8px;
+    padding: 8px;
+    display: flex;
+    flex-direction: row;
+    gap: 8px;
+    justify-content: space-between;
+    align-items: center;
+    width: 100%;
+
+    box-shadow: 0px 1px 2px 0px rgba(33, 23, 95, 0.07);
+
+    ${(props) =>
+        props.$disabled &&
+        `
+        background: ${colors.gray[1500]};
+        cursor: not-allowed;
+    `}
+
+    :hover,
+    :focus,
+    :active {
+        ${(props) => !props.$disabled && 'box-shadow: 0px 1px 2px 1px rgba(33, 23, 95, 0.07);'}
+    }
+`;
+
+const Content = styled(Text)<{ $disabled?: boolean }>`
+    color: ${colors.gray[1800]};
+    user-select: none;
+    cursor: ${(props) => (props.$disabled ? 'not-allowed' : 'pointer')};
+
+    :hover {
+        ${(props) => !props.$disabled && `color: ${colors.violet[500]};`}
+    }
+`;
+
+const CaretWrapper = styled.div<{ $disabled?: boolean }>`
+    & svg {
+        color: ${colors.gray[1800]};
+        display: flex;
+        align-items: center;
+        cursor: ${(props) => (props.$disabled ? 'not-allowed' : 'pointer')};
+
+        :hover {
+            ${(props) => !props.$disabled && `color: ${colors.violet[500]};`}
+        }
+    }
+`;
+
+type SwitcherButtonProps = {
+    direction: SwitcherDirection;
+    onClick: (direction: SwitcherDirection) => void;
+    disabled?: boolean;
+};
+
+function SwitcherButton({ direction, onClick, disabled }: SwitcherButtonProps) {
+    const Icon = direction === SwitcherDirection.Left ? CaretLeft : CaretRight;
+
+    const onClickHandler = useCallback(() => {
+        if (disabled) return null;
+        return onClick?.(direction);
+    }, [direction, disabled, onClick]);
+
+    return (
+        <CaretWrapper $disabled={disabled} onClick={onClickHandler} tabIndex={0}>
+            <Icon size="20px" />
+        </CaretWrapper>
+    );
+}
+
+export function DateSwitcherInput({ datePickerProps, datePickerState, ...props }: ExtendedInputRenderProps) {
+    const { disabled } = datePickerProps;
+    const { setValue, open } = datePickerState;
+
+    const onSwitcherClick = useCallback(
+        (direction: SwitcherDirection) => {
+            if (disabled) return null;
+
+            return setValue?.((currentValue) => {
+                if (!currentValue) return currentValue;
+                // FYI: clone value to trigger rerendering after changes
+                const cloneOfCurrentValue = currentValue.clone();
+                const sign = direction === SwitcherDirection.Left ? -1 : 1;
+                const newValue = cloneOfCurrentValue.add(1 * sign, 'day');
+                return newValue;
+            });
+        },
+        [setValue, disabled],
+    );
+
+    const isDateSwitchingDisabled = useMemo(() => disabled || !props.title, [disabled, props.title]);
+
+    return (
+        <StyledContainer $opened={open} $disabled={disabled} tabIndex={0}>
+            <SwitcherButton
+                disabled={isDateSwitchingDisabled}
+                direction={SwitcherDirection.Left}
+                onClick={onSwitcherClick}
+            />
+
+            <Content $disabled={disabled} onMouseDown={props.onMouseDown} onKeyDown={props.onKeyDown}>
+                {props.title ? props.title : props.placeholder}
+            </Content>
+
+            <SwitcherButton
+                disabled={isDateSwitchingDisabled}
+                direction={SwitcherDirection.Right}
+                onClick={onSwitcherClick}
+            />
+        </StyledContainer>
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/props.tsx b/datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/props.tsx
new file mode 100644
index 00000000000000..8deb9ad8902dc8
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/props.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import { VariantProps } from '../../types';
+import { CommonVariantProps } from '../common/props';
+import { DateSwitcherInput } from './components';
+
+export const DateSwitcherVariantProps: VariantProps = {
+    ...CommonVariantProps,
+    bordered: false,
+    allowClear: false,
+    format: 'll',
+    suffixIcon: null,
+    inputRender: (props) => <DateSwitcherInput {...props} />,
+    $noDefaultPaddings: true,
+};
diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/types.ts b/datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/types.ts
new file mode 100644
index 00000000000000..f0b73721ea0a61
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/DatePicker/variants/dateSwitcher/types.ts
@@ -0,0 +1,4 @@
+export enum SwitcherDirection {
+    Left = 'LEFT',
+    Right = 'RIGHT',
+}
diff --git a/datahub-web-react/src/alchemy-components/components/DatePicker/variants/index.ts b/datahub-web-react/src/alchemy-components/components/DatePicker/variants/index.ts
new file mode 100644
index 00000000000000..e9ce5e764fa631
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/DatePicker/variants/index.ts
@@ -0,0 +1,4 @@
+import { CommonVariantProps } from './common/props';
+import { DateSwitcherVariantProps } from './dateSwitcher/props';
+
+export { CommonVariantProps, DateSwitcherVariantProps };
diff --git a/datahub-web-react/src/alchemy-components/components/Drawer/Drawer.stories.tsx b/datahub-web-react/src/alchemy-components/components/Drawer/Drawer.stories.tsx
new file mode 100644
index 00000000000000..df0014ae7824e4
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Drawer/Drawer.stories.tsx
@@ -0,0 +1,97 @@
+import { BADGE } from '@geometricpanda/storybook-addon-badges';
+import type { Meta, StoryObj } from '@storybook/react';
+import React, { useState } from 'react';
+import { Button } from '../Button';
+import { Drawer, drawerDefault } from './Drawer';
+import { DrawerProps } from './types';
+
+// Auto Docs
+const meta = {
+    title: 'Components / Drawer',
+    component: Drawer,
+
+    // Display Properties
+    parameters: {
+        layout: 'centered',
+        badges: [BADGE.EXPERIMENTAL],
+        docs: {
+            subtitle: 'A panel which slides in from the edge of the screen.',
+        },
+    },
+
+    // Component-level argTypes
+    argTypes: {
+        title: {
+            description: 'The title of the drawer',
+            control: {
+                type: 'text',
+            },
+        },
+        open: {
+            description: 'is the drawer opened',
+            control: {
+                type: 'boolean',
+            },
+        },
+        onClose: {
+            description: 'The handler called when the drawer is closed',
+        },
+        width: {
+            description: 'Width of the drawer',
+            table: {
+                defaultValue: { summary: `${drawerDefault.width}` },
+            },
+            control: {
+                type: 'number',
+            },
+        },
+        closable: {
+            description: 'Whether a close (x) button is visible on top left of the Drawer dialog or not',
+            table: {
+                defaultValue: { summary: `${drawerDefault.closable}` },
+            },
+            control: {
+                type: 'boolean',
+            },
+        },
+        maskTransparent: {
+            description: 'Whether the mask is visible',
+            table: {
+                defaultValue: { summary: `${drawerDefault.maskTransparent}` },
+            },
+            control: {
+                type: 'boolean',
+            },
+        },
+    },
+
+    // Define default args
+    args: {
+        title: 'Title',
+        ...drawerDefault,
+    },
+} satisfies Meta<typeof Drawer>;
+
+export default meta;
+
+// Stories
+
+type Story = StoryObj<typeof meta>;
+
+const WrappedDrawer = ({ ...props }: DrawerProps) => {
+    const [isOpen, setIsOpen] = useState<boolean>(false);
+    return (
+        <>
+            <Button onClick={() => setIsOpen(true)}>Open</Button>
+            <Drawer {...props} open={isOpen} onClose={() => setIsOpen(false)}>
+                Content
+            </Drawer>
+        </>
+    );
+};
+// Basic story is what is displayed 1st in storybook
+// Pass props to this so that it can be customized via the UI props panel
+export const sandbox: Story = {
+    tags: ['dev'],
+    render: (props) => <WrappedDrawer {...props} />,
+};
diff --git a/datahub-web-react/src/alchemy-components/components/Drawer/Drawer.tsx b/datahub-web-react/src/alchemy-components/components/Drawer/Drawer.tsx
new file mode 100644
index 00000000000000..65ec4a14286eab
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Drawer/Drawer.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import { Button } from '../Button';
+import { Text } from '../Text';
+import { StyledDrawer, TitleContainer } from './components';
+import { maskTransparentStyle } from './constants';
+import { DrawerProps } from './types';
+
+export const drawerDefault: Omit<DrawerProps, 'title'> = {
+    width: 600,
+    closable: true,
+    maskTransparent: false,
+};
+
+export const Drawer = ({
+    title,
+    children,
+    open,
+    onClose,
+    width = drawerDefault.width,
+    closable = drawerDefault.closable,
+    maskTransparent = drawerDefault.maskTransparent,
+}: React.PropsWithChildren<DrawerProps>) => {
+    return (
+        <StyledDrawer
+            onClose={onClose}
+            destroyOnClose
+            title={
+                <TitleContainer>
+                    <Text weight="bold" size="xl">
+                        {title}
+                    </Text>
+                    {closable && (
+                        <Button
+                            color="gray"
+                            icon="Close"
+                            iconPosition="left"
+                            isCircle
+                            onClick={() => onClose?.()}
+                            size="xl"
+                            variant="text"
+                        />
+                    )}
+                </TitleContainer>
+            }
+            open={open}
+            width={width}
+            closable={false}
+            maskStyle={maskTransparent ? maskTransparentStyle : undefined}
+        >
+            {children}
+        </StyledDrawer>
+    );
+};
diff --git a/datahub-web-react/src/alchemy-components/components/Drawer/components.tsx b/datahub-web-react/src/alchemy-components/components/Drawer/components.tsx
new file mode 100644
index 00000000000000..65bf3c24a6622d
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Drawer/components.tsx
@@ -0,0 +1,19 @@
+import { Drawer } from 'antd';
+import styled from 'styled-components';
+
+export const StyledDrawer = styled(Drawer)`
+    .ant-drawer-header {
+        padding: 16px;
+        box-shadow: 0px 0px 6px 0px rgba(93, 102, 139, 0.2);
+    }
+
+    .ant-drawer-body {
+        padding: 16px;
+    }
+` as typeof Drawer;
+
+export const TitleContainer = styled.div`
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+`;
diff --git a/datahub-web-react/src/alchemy-components/components/Drawer/constants.ts b/datahub-web-react/src/alchemy-components/components/Drawer/constants.ts
new file mode 100644
index 00000000000000..7de115819df377
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Drawer/constants.ts
@@ -0,0 +1,3 @@
+import { colors } from '@src/alchemy-components/theme';
+
+export const maskTransparentStyle = { backgroundColor: colors.transparent };
diff --git a/datahub-web-react/src/alchemy-components/components/Drawer/index.ts b/datahub-web-react/src/alchemy-components/components/Drawer/index.ts
new file mode 100644
index 00000000000000..777c3778c28c00
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Drawer/index.ts
@@ -0,0 +1 @@
+export { Drawer } from './Drawer';
diff --git a/datahub-web-react/src/alchemy-components/components/Drawer/types.ts b/datahub-web-react/src/alchemy-components/components/Drawer/types.ts
new file mode 100644
index 00000000000000..563e69b6f39efc
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Drawer/types.ts
@@ -0,0 +1,8 @@
+export type DrawerProps = {
+    title: React.ReactNode;
+    open?: boolean;
+    onClose?: () => void;
+    width?: number | string;
+    closable?: boolean;
+    maskTransparent?: boolean;
+};
diff --git a/datahub-web-react/src/alchemy-components/components/GraphCard/GraphCard.stories.tsx b/datahub-web-react/src/alchemy-components/components/GraphCard/GraphCard.stories.tsx
new file mode 100644
index 00000000000000..c8f7bb700f6868
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/GraphCard/GraphCard.stories.tsx
@@ -0,0 +1,91 @@
+import React from 'react';
+import { BADGE } from '@geometricpanda/storybook-addon-badges';
+import type { Meta, StoryObj } from '@storybook/react';
+import { GraphCard } from './GraphCard';
+import { CalendarChart } from '../CalendarChart';
+import { getMockedProps } from '../CalendarChart/utils';
+import { Button } from '../Button';
+import { SimpleSelect } from '../Select';
+
+const meta = {
+    title: 'Charts / GraphCard',
+    component: GraphCard,
+
+    // Display Properties
+    parameters: {
+        layout: 'centered',
+        badges: [BADGE.EXPERIMENTAL],
+        docs: {
+            subtitle: 'A card component that wraps graphs',
+        },
+    },
+
+    // Component-level argTypes
+    argTypes: {
+        title: {
+            description: 'The title of the card',
+        },
+        subTitle: {
+            description: 'The subtitle of the card',
+        },
+        isEmpty: {
+            description: 'Enable when there are no data to show in graph to show the empty message',
+            control: 'boolean',
+        },
+        loading: {
+            description: 'Show loading state',
+            control: 'boolean',
+        },
+        renderGraph: {
+            description: 'A function to render certain graph',
+        },
+        renderControls: {
+            description: 'A function to render additiona controls on the card',
+        },
+    },
+
+    // Define defaults
+    args: {
+        title: 'Title of the card',
+        subTitle: 'Description of the card',
+        renderControls: () => (
+            <>
+                <Button icon="Add" variant="outline" size="md">
+                    Assertion
+                </Button>
+                <SimpleSelect
+                    options={[
+                        { value: 'Test1', label: 'Test1' },
+                        { value: 'Test2', label: 'Test2' },
+                        { value: 'Test3', label: 'Test3' },
+                    ]}
+                />
+                <SimpleSelect
+                    values={['year']}
+                    options={[
+                        { value: 'year', label: 'Year' },
+                        { value: 'Test2', label: 'Test2' },
+                        { value: 'Test3', label: 'Test3' },
+                    ]}
+                />
+            </>
+        ),
+        renderGraph: () => (
+            <CalendarChart {...getMockedProps()} popoverRenderer={(day) => <>{JSON.stringify(day)}</>} />
+        ),
+        graphHeight: 'fit-content',
+    },
+} satisfies Meta<typeof GraphCard>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const sandbox: Story = {
+    tags: ['dev'],
+    render: (props) => (
+        <div style={{ width: '900px' }}>
+            <GraphCard {...props} />
+        </div>
+    ),
+};
diff --git a/datahub-web-react/src/alchemy-components/components/GraphCard/GraphCard.tsx b/datahub-web-react/src/alchemy-components/components/GraphCard/GraphCard.tsx
new file mode 100644
index 00000000000000..a706c66317f462
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/GraphCard/GraphCard.tsx
@@ -0,0 +1,90 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { CardContainer } from '../Card/components';
+import { Loader } from '../Loader';
+import { PageTitle } from '../PageTitle';
+import { Text } from '../Text';
+import {
+    ControlsContainer,
+    EmptyMessageContainer,
+    GraphCardBody,
+    GraphCardHeader,
+    GraphContainer,
+    LoaderContainer,
+} from './components';
+import { GraphCardProps } from './types';
+import MoreInfoModal from './MoreInfoModal';
+
+const EmptyMessageWrapper = styled.div`
+    text-align: center;
+`;
+
+const LinkText = styled(Text)`
+    display: inline;
+    :hover {
+        cursor: pointer;
+    }
+`;
+
+export function GraphCard({
+    title,
+    subTitle,
+    loading,
+    graphHeight = '350px',
+    width = '100%',
+    renderGraph,
+    renderControls,
+    isEmpty,
+    emptyContent,
+    moreInfoModalContent,
+}: GraphCardProps) {
+    const [showInfoModal, setShowInfoModal] = useState<boolean>(false);
+
+    const handleModalClose = () => {
+        setShowInfoModal(false);
+    };
+
+    return (
+        <CardContainer maxWidth={width}>
+            <GraphCardHeader>
+                <PageTitle title={title} subTitle={subTitle} variant="sectionHeader" />
+                <ControlsContainer>{renderControls?.()}</ControlsContainer>
+            </GraphCardHeader>
+
+            {loading && (
+                <LoaderContainer $height={graphHeight}>
+                    <Loader />
+                </LoaderContainer>
+            )}
+
+            {!loading && (
+                <GraphCardBody>
+                    <GraphContainer $height={graphHeight} $isEmpty={isEmpty}>
+                        {renderGraph()}
+                    </GraphContainer>
+                    {isEmpty &&
+                        (emptyContent || (
+                            <EmptyMessageContainer>
+                                <EmptyMessageWrapper>
+                                    <Text size="2xl" weight="bold" color="gray">
+                                        No Data
+                                    </Text>
+                                    <Text color="gray">No stats collected for this asset at the moment.</Text>
+                                    {moreInfoModalContent && (
+                                        <LinkText color="violet" onClick={() => setShowInfoModal(true)}>
+                                            More info
+                                        </LinkText>
+                                    )}
+                                </EmptyMessageWrapper>
+                                <MoreInfoModal
+                                    showModal={showInfoModal}
+                                    handleClose={handleModalClose}
+                                    modalContent={moreInfoModalContent}
+                                />
+                            </EmptyMessageContainer>
+                        ))}
+                </GraphCardBody>
+            )}
+        </CardContainer>
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/GraphCard/MoreInfoModal.tsx b/datahub-web-react/src/alchemy-components/components/GraphCard/MoreInfoModal.tsx
new file mode 100644
index 00000000000000..eb3045a1aaef43
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/GraphCard/MoreInfoModal.tsx
@@ -0,0 +1,55 @@
+import { Text, typography } from '@components';
+import { Modal } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+
+export const StyledModal = styled(Modal)`
+    font-family: ${typography.fonts.body};
+
+    &&& .ant-modal-content {
+        box-shadow: 0px 4px 12px 0px rgba(9, 1, 61, 0.12);
+        border-radius: 12px;
+    }
+
+    .ant-modal-header {
+        border-bottom: 0;
+        padding-bottom: 0;
+        border-radius: 12px !important;
+    }
+
+    .ant-modal-body {
+        padding: 8px 24px 24px 24px;
+    }
+
+    .ant-modal-close-x {
+        svg {
+            font-size: 18px;
+        }
+    }
+`;
+
+interface Props {
+    showModal: boolean;
+    handleClose: () => void;
+    modalContent: React.ReactNode;
+}
+
+const MoreInfoModal = ({ showModal, handleClose, modalContent }: Props) => {
+    return (
+        <StyledModal
+            open={showModal}
+            onCancel={handleClose}
+            centered
+            footer={null}
+            title={
+                <Text size="xl" weight="bold" color="gray">
+                    No Data
+                </Text>
+            }
+        >
+            {modalContent}
+        </StyledModal>
+    );
+};
+
+export default MoreInfoModal;
diff --git a/datahub-web-react/src/alchemy-components/components/GraphCard/components.tsx b/datahub-web-react/src/alchemy-components/components/GraphCard/components.tsx
new file mode 100644
index 00000000000000..025bb896df2f7f
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/GraphCard/components.tsx
@@ -0,0 +1,46 @@
+import styled from 'styled-components';
+
+export const GraphCardHeader = styled.div`
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+`;
+
+export const GraphCardBody = styled.div`
+    width: 100%;
+    position: relative;
+`;
+
+export const ControlsContainer = styled.div`
+    height: 42px;
+    display: flex;
+    flex-direction: row;
+    gap: 8px;
+`;
+
+export const GraphContainer = styled.div<{ $isEmpty?: boolean; $height: string }>`
+    width: 100%;
+    height: ${(props) => props.$height};
+
+    ${(props) =>
+        props.$isEmpty &&
+        `
+        position: relative;
+        pointer-events: none;
+        filter: blur(2px);  
+    `}
+`;
+
+export const EmptyMessageContainer = styled.div`
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    position: absolute;
+`;
+
+export const LoaderContainer = styled.div<{ $height: string }>`
+    display: flex;
+    width: 100%;
+    height: ${(props) => props.$height};
+    min-height: 200px;
+`;
diff --git a/datahub-web-react/src/alchemy-components/components/GraphCard/index.ts b/datahub-web-react/src/alchemy-components/components/GraphCard/index.ts
new file mode 100644
index 00000000000000..5796bf09a240f7
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/GraphCard/index.ts
@@ -0,0 +1 @@
+export { GraphCard } from './GraphCard';
diff --git a/datahub-web-react/src/alchemy-components/components/GraphCard/types.ts b/datahub-web-react/src/alchemy-components/components/GraphCard/types.ts
new file mode 100644
index 00000000000000..b63e6b8999f747
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/GraphCard/types.ts
@@ -0,0 +1,12 @@
+export type GraphCardProps = {
+    title: string;
+    subTitle?: string | React.ReactNode;
+    loading?: boolean;
+    graphHeight?: string;
+    width?: string;
+    renderGraph: () => React.ReactNode;
+    renderControls?: () => React.ReactNode;
+    isEmpty?: boolean;
+    emptyContent?: React.ReactNode;
+    moreInfoModalContent?: React.ReactNode;
+};
diff --git a/datahub-web-react/src/alchemy-components/components/IconLabel/IconLabel.stories.tsx b/datahub-web-react/src/alchemy-components/components/IconLabel/IconLabel.stories.tsx
new file mode 100644
index 00000000000000..3f831d1b4c7c6f
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/IconLabel/IconLabel.stories.tsx
@@ -0,0 +1,95 @@
+import React from 'react';
+import { Meta, StoryObj } from '@storybook/react';
+import { Airplane } from '@phosphor-icons/react';
+
+import { IconLabel } from './IconLabel';
+import { IconType } from './types';
+
+const meta: Meta<typeof IconLabel> = {
+    title: 'Components / IconLabel',
+    component: IconLabel,
+
+    // Component-level parameters
+    parameters: {
+        layout: 'centered',
+        docs: {
+            subtitle: 'Displays a label with an icon or image.',
+        },
+    },
+
+    // Component-level argTypes
+    argTypes: {
+        icon: {
+            description: 'The icon or image source to display.',
+            control: false,
+            table: {
+                type: { summary: 'ReactNode' },
+            },
+        },
+        name: {
+            description: 'The label text.',
+            control: 'text',
+            table: {
+                type: { summary: 'string' },
+            },
+        },
+        imageUrl: {
+            description: 'The image url.',
+            control: 'text',
+            table: {
+                type: { summary: 'string' },
+            },
+        },
+        type: {
+            description: 'The type of icon to render.',
+            control: 'radio',
+            options: [IconType.ICON, IconType.IMAGE],
+            table: {
+                defaultValue: { summary: IconType.ICON },
+                type: { summary: 'IconType.ICON | IconType.IMAGE' },
+            },
+        },
+    },
+
+    // Default props
+    args: {
+        icon: <Airplane size={20} />, // Default to an emoji for demonstration
+        name: 'Icon Label',
+        type: IconType.ICON,
+    },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+// Sandbox Story
+export const sandbox: Story = {
+    render: (props) => <IconLabel {...props} />,
+};
+
+// Example Stories
+export const withIcon: Story = {
+    args: {
+        icon: <Airplane size={20} />,
+        name: 'Airplane Icon',
+        type: IconType.ICON,
+    },
+};
+
+export const withImage: Story = {
+    args: {
+        imageUrl: 'https://png.pngtree.com/png-vector/20230209/ourmid/pngtree-test-icon-png-image_6591706.png',
+        name: 'Placeholder Image',
+        type: IconType.IMAGE,
+        icon: <Airplane size={20} />,
+    },
+};
+
+export const longTextLabel: Story = {
+    args: {
+        icon: <Airplane size={20} />,
+        name: 'This is a very long label text for testing purposes',
+        type: IconType.ICON,
+    },
+};
diff --git a/datahub-web-react/src/alchemy-components/components/IconLabel/IconLabel.tsx b/datahub-web-react/src/alchemy-components/components/IconLabel/IconLabel.tsx
new file mode 100644
index 00000000000000..2fcf046c925c46
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/IconLabel/IconLabel.tsx
@@ -0,0 +1,33 @@
+import React, { useEffect, useState } from 'react';
+import { IconLabelProps, IconType } from './types';
+import { IconLabelContainer, ImageContainer, Label } from './component';
+import { isValidImageUrl } from './utils';
+
+export const IconLabel = ({ icon, name, type, style, imageUrl }: IconLabelProps) => {
+    const [isValidImage, setIsValidImage] = useState(false);
+
+    useEffect(() => {
+        if (type === IconType.IMAGE && typeof imageUrl === 'string') {
+            isValidImageUrl(imageUrl).then(setIsValidImage); // Validate the image URL
+        }
+    }, [imageUrl, type]);
+
+    const renderIcons = () => {
+        if (type === IconType.ICON) {
+            return icon;
+        }
+
+        if (type === IconType.IMAGE && isValidImage) {
+            return <img alt={name} src={imageUrl} height={24} width={24} />;
+        }
+
+        return null; // Render the fallback (e.g., emoji or placeholder)
+    };
+
+    return (
+        <IconLabelContainer>
+            <ImageContainer style={style}>{renderIcons()}</ImageContainer>
+            <Label title={name}>{name}</Label>
+        </IconLabelContainer>
+    );
+};
diff --git a/datahub-web-react/src/alchemy-components/components/IconLabel/component.ts b/datahub-web-react/src/alchemy-components/components/IconLabel/component.ts
new file mode 100644
index 00000000000000..a2878cdbf30385
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/IconLabel/component.ts
@@ -0,0 +1,21 @@
+import styled from 'styled-components';
+
+export const IconLabelContainer = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 10px;
+`;
+
+export const ImageContainer = styled.div`
+    display: flex;
+    align-items: center;
+    margin-right: 0px;
+`;
+
+export const Label = styled.span`
+    font-family: Mulish;
+    font-size: 14px;
+    font-weight: 400;
+    color: #374066;
+    white-space: normal;
+`;
diff --git a/datahub-web-react/src/alchemy-components/components/IconLabel/index.ts b/datahub-web-react/src/alchemy-components/components/IconLabel/index.ts
new file mode 100644
index 00000000000000..3f4085aa2b9364
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/IconLabel/index.ts
@@ -0,0 +1 @@
+export { IconLabel } from './IconLabel';
diff --git a/datahub-web-react/src/alchemy-components/components/IconLabel/types.ts b/datahub-web-react/src/alchemy-components/components/IconLabel/types.ts
new file mode 100644
index 00000000000000..3b38b45ee024a9
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/IconLabel/types.ts
@@ -0,0 +1,13 @@
+export interface IconLabelProps {
+    icon: JSX.Element;
+    name: string;
+    type: IconType;
+    marginRight?: string;
+    imageUrl?: string;
+    style?: React.CSSProperties;
+}
+
+export enum IconType {
+    ICON = 'ICON',
+    IMAGE = 'IMAGE',
+}
diff --git a/datahub-web-react/src/alchemy-components/components/IconLabel/utils.ts b/datahub-web-react/src/alchemy-components/components/IconLabel/utils.ts
new file mode 100644
index 00000000000000..0b5e6e0cb8a6c3
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/IconLabel/utils.ts
@@ -0,0 +1,10 @@
+// Helper function to validate image URLs
+export const isValidImageUrl = async (url: string): Promise<boolean> => {
+    return new Promise((resolve) => {
+        const img = new Image();
+        img.src = url;
+
+        img.onload = () => resolve(true); // Image is valid
+        img.onerror = () => resolve(false); // Image is invalid
+    });
+};
diff --git a/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/IncidentPriorityLabel.stories.tsx b/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/IncidentPriorityLabel.stories.tsx
new file mode 100644
index 00000000000000..7e21c5c9fc2a8a
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/IncidentPriorityLabel.stories.tsx
@@ -0,0 +1,85 @@
+import React from 'react';
+import { Meta, StoryObj } from '@storybook/react';
+import { IncidentPriorityLabel } from './IncidentPriorityLabel';
+
+const meta: Meta<typeof IncidentPriorityLabel> = {
+    title: 'Components / IncidentPriorityLabel',
+    component: IncidentPriorityLabel,
+
+    // Component-level parameters
+    parameters: {
+        layout: 'centered',
+        docs: {
+            subtitle: 'Displays a priority label for incidents with an icon and title.',
+        },
+    },
+
+    // Component-level argTypes
+    argTypes: {
+        priority: {
+            description: 'Incident string containing priority',
+            control: { type: 'text' },
+            table: {
+                type: { summary: '"CRITICAL" | "HIGH" | "MEDIUM" | "LOW"' },
+            },
+        },
+        title: {
+            description: 'Incident string containing title',
+            control: { type: 'text' },
+            table: {
+                type: { summary: 'title: string' },
+            },
+        },
+    },
+
+    // Default props
+    args: {
+        priority: 'CRITICAL',
+        title: 'Critical',
+    },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+// Sandbox Story
+export const sandbox: Story = {
+    render: (props) => <IncidentPriorityLabel {...props} />,
+};
+
+// Example Stories
+export const criticalPriority: Story = {
+    args: {
+        priority: 'CRITICAL',
+        title: 'Critical',
+    },
+};
+
+export const highPriority: Story = {
+    args: {
+        priority: 'HIGH',
+        title: 'High',
+    },
+};
+
+export const mediumPriority: Story = {
+    args: {
+        priority: 'MEDIUM',
+        title: 'Medium',
+    },
+};
+
+export const lowPriority: Story = {
+    args: {
+        priority: 'LOW',
+        title: 'Low',
+    },
+};
+
+export const unknownPriority: Story = {
+    args: {
+        priority: 'UNKNOWN',
+        title: 'Unknown',
+    },
+};
diff --git a/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/IncidentPriorityLabel.tsx b/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/IncidentPriorityLabel.tsx
new file mode 100644
index 00000000000000..d3e0ba6ab9316b
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/IncidentPriorityLabel.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import { ExclamationMark } from '@phosphor-icons/react';
+import colors from '@src/alchemy-components/theme/foundations/colors';
+
+import { IconLabel } from '../IconLabel';
+import { IncidentPriorityLabelProps } from './types';
+import { Bar } from '../Bar';
+import { PRIORITIES } from './constant';
+import { IconType } from '../IconLabel/types';
+
+const PRIORITY_LEVEL = {
+    [PRIORITIES.HIGH]: 3,
+    [PRIORITIES.MEDIUM]: 2,
+    [PRIORITIES.LOW]: 1,
+};
+
+const renderBars = (priority: string) => {
+    return <Bar size="default" color={colors.gray[1800]} coloredBars={PRIORITY_LEVEL[priority]} />;
+};
+
+const Icons = {
+    [PRIORITIES.CRITICAL]: {
+        icon: <ExclamationMark weight="fill" color={colors.gray[1800]} size={22} />,
+        type: IconType.ICON,
+    },
+    [PRIORITIES.HIGH]: {
+        icon: renderBars(PRIORITIES.HIGH),
+        type: IconType.ICON,
+    },
+    [PRIORITIES.MEDIUM]: {
+        icon: renderBars(PRIORITIES.MEDIUM),
+        type: IconType.ICON,
+    },
+    [PRIORITIES.LOW]: {
+        icon: renderBars(PRIORITIES.LOW),
+        type: IconType.ICON,
+    },
+};
+
+export const IncidentPriorityLabel = ({ priority, title, style }: IncidentPriorityLabelProps) => {
+    const { icon, type } = Icons[priority] || {};
+    return <IconLabel style={style} icon={icon} name={title} type={type} />;
+};
diff --git a/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/constant.ts b/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/constant.ts
new file mode 100644
index 00000000000000..55533c3ab7b6a1
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/constant.ts
@@ -0,0 +1,7 @@
+export const PRIORITIES = {
+    NONE: 'NONE',
+    LOW: 'LOW',
+    MEDIUM: 'MEDIUM',
+    HIGH: 'HIGH',
+    CRITICAL: 'CRITICAL',
+};
diff --git a/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/index.ts b/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/index.ts
new file mode 100644
index 00000000000000..2638ed25db9e52
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/index.ts
@@ -0,0 +1 @@
+export { IncidentPriorityLabel } from './IncidentPriorityLabel';
diff --git a/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/types.ts b/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/types.ts
new file mode 100644
index 00000000000000..2eb4dbefa8fac0
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/IncidentPriorityLabel/types.ts
@@ -0,0 +1,5 @@
+export interface IncidentPriorityLabelProps {
+    priority: string;
+    title: string;
+    style?: React.CSSProperties;
+}
diff --git a/datahub-web-react/src/alchemy-components/components/LineChart/LineChart.stories.tsx b/datahub-web-react/src/alchemy-components/components/LineChart/LineChart.stories.tsx
index 8cce0369918a2e..fce3921ff1ecd0 100644
--- a/datahub-web-react/src/alchemy-components/components/LineChart/LineChart.stories.tsx
+++ b/datahub-web-react/src/alchemy-components/components/LineChart/LineChart.stories.tsx
@@ -3,6 +3,7 @@ import { BADGE } from '@geometricpanda/storybook-addon-badges';
 import type { Meta, StoryObj } from '@storybook/react';
 import { LineChart } from './LineChart';
 import { getMockedProps } from '../BarChart/utils';
+import { DEFAULT_MAX_DOMAIN_VALUE } from '../BarChart/hooks/useAdaptYScaleToZeroValues';
 
 const meta = {
     title: 'Charts / LineChart',
@@ -28,24 +29,19 @@ const meta = {
         yAccessor: {
             description: 'A function to convert datum to value of Y',
         },
-        renderTooltipContent: {
+        maxYDomainForZeroData: {
+            description:
+                'For the case where the data has only zero values, you can set the yScale domain to better display the chart',
+            table: {
+                defaultValue: { summary: `${DEFAULT_MAX_DOMAIN_VALUE}` },
+            },
+        },
+        popoverRenderer: {
             description: 'A function to replace default rendering of toolbar',
         },
         margin: {
             description: 'Add margins to chart',
         },
-        leftAxisTickFormat: {
-            description: 'A function to format labels of left axis',
-        },
-        leftAxisTickLabelProps: {
-            description: 'Props for label of left axis',
-        },
-        bottomAxisTickFormat: {
-            description: 'A function to format labels of bottom axis',
-        },
-        bottomAxisTickLabelProps: {
-            description: 'Props for label of bottom axis',
-        },
         lineColor: {
             description: 'Color of line on chart',
             control: {
@@ -58,11 +54,14 @@ const meta = {
                 type: 'color',
             },
         },
-        gridColor: {
-            description: "Color of grid's lines",
-            control: {
-                type: 'color',
-            },
+        leftAxisProps: {
+            description: 'The props for the left axis',
+        },
+        bottomAxisProps: {
+            description: 'The props for the bottom axis',
+        },
+        gridProps: {
+            description: 'The props for the grid',
         },
         renderGradients: {
             description: 'A function to render different gradients that can be used as colors',
@@ -78,7 +77,7 @@ const meta = {
     // Define defaults
     args: {
         ...getMockedProps(),
-        renderTooltipContent: (datum) => <>DATUM: {JSON.stringify(datum)}</>,
+        popoverRenderer: (datum) => <>DATUM: {JSON.stringify(datum)}</>,
     },
 } satisfies Meta<typeof LineChart>;
 
diff --git a/datahub-web-react/src/alchemy-components/components/LineChart/LineChart.tsx b/datahub-web-react/src/alchemy-components/components/LineChart/LineChart.tsx
index 22580122ccf84f..540b798f1ab1d1 100644
--- a/datahub-web-react/src/alchemy-components/components/LineChart/LineChart.tsx
+++ b/datahub-web-react/src/alchemy-components/components/LineChart/LineChart.tsx
@@ -1,16 +1,22 @@
 import { colors } from '@src/alchemy-components/theme';
-// import { abbreviateNumber } from '@src/app/dataviz/utils';
+import { abbreviateNumber } from '@src/app/dataviz/utils';
 import { TickLabelProps } from '@visx/axis';
 import { curveMonotoneX } from '@visx/curve';
 import { LinearGradient } from '@visx/gradient';
 import { ParentSize } from '@visx/responsive';
-import { AreaSeries, Axis, AxisScale, Grid, LineSeries, Tooltip, XYChart } from '@visx/xychart';
+import { AreaSeries, Axis, AxisScale, Grid, Tooltip, XYChart } from '@visx/xychart';
 import dayjs from 'dayjs';
 import React, { useState } from 'react';
 import { Popover } from '../Popover';
-import { ChartWrapper } from './components';
+import { ChartWrapper, TooltipGlyph } from './components';
 import { LineChartProps } from './types';
-import { abbreviateNumber } from '../dataviz/utils';
+import { getMockedProps } from '../BarChart/utils';
+import useMergedProps from '../BarChart/hooks/useMergedProps';
+import { roundToEven } from './utils';
+import { AxisProps, GridProps } from '../BarChart/types';
+import { GLYPH_DROP_SHADOW_FILTER } from './constants';
+import useAdaptYScaleToZeroValues from '../BarChart/hooks/useAdaptYScaleToZeroValues';
+import useMaxDataValue from '../BarChart/hooks/useMaxDataValue';
 
 const commonTickLabelProps: TickLabelProps<any> = {
     fontSize: 10,
@@ -18,30 +24,55 @@ const commonTickLabelProps: TickLabelProps<any> = {
     fill: colors.gray[1700],
 };
 
-const GLYPH_DROP_SHADOW_FILTER = `
-    drop-shadow(0px 1px 3px rgba(33, 23, 95, 0.30))
-    drop-shadow(0px 2px 5px rgba(33, 23, 95, 0.25))
-    drop-shadow(0px -2px 5px rgba(33, 23, 95, 0.25)
-`;
-
 export const lineChartDefault: LineChartProps<any> = {
     data: [],
+    isEmpty: false,
+
     xAccessor: (datum) => datum?.x,
     yAccessor: (datum) => datum?.y,
-    leftAxisTickFormat: abbreviateNumber,
-    leftAxisTickLabelProps: {
-        ...commonTickLabelProps,
-        textAnchor: 'end',
-    },
-    bottomAxisTickFormat: (x) => dayjs(x).format('D MMM'),
-    bottomAxisTickLabelProps: {
-        ...commonTickLabelProps,
-        textAnchor: 'middle',
-        verticalAnchor: 'start',
-    },
+    xScale: { type: 'time' },
+    yScale: { type: 'log', nice: true, round: true, base: 2 },
+
     lineColor: colors.violet[500],
     areaColor: 'url(#line-gradient)',
-    gridColor: '#e0e0e0',
+    margin: { top: 0, right: 0, bottom: 0, left: 0 },
+
+    leftAxisProps: {
+        tickFormat: abbreviateNumber,
+        tickLabelProps: {
+            ...commonTickLabelProps,
+            textAnchor: 'end',
+            width: 50,
+        },
+        computeNumTicks: () => 5,
+        hideAxisLine: true,
+        hideTicks: true,
+    },
+    bottomAxisProps: {
+        tickFormat: (x) => dayjs(x).format('D MMM'),
+        tickLabelProps: {
+            ...commonTickLabelProps,
+            textAnchor: 'middle',
+            verticalAnchor: 'start',
+        },
+        computeNumTicks: (width, _, margin, data) => {
+            const widthOfTick = 80;
+            const widthOfAxis = width - margin.right - margin.left;
+            const maxCountOfTicks = Math.ceil(widthOfAxis / widthOfTick);
+            const numOfTicks = roundToEven(maxCountOfTicks / 2);
+            return Math.min(numOfTicks, data.length - 1);
+        },
+        hideAxisLine: true,
+        hideTicks: true,
+    },
+    gridProps: {
+        rows: true,
+        columns: false,
+        stroke: '#e0e0e0',
+        computeNumTicks: () => 5,
+        lineStyle: {},
+    },
+
     renderGradients: () => (
         <LinearGradient id="line-gradient" from={colors.violet[200]} to={colors.white} toOpacity={0.6} />
     ),
@@ -50,29 +81,28 @@ export const lineChartDefault: LineChartProps<any> = {
         strokeWidth: 2,
         filter: GLYPH_DROP_SHADOW_FILTER,
     },
-    renderTooltipGlyph: (props) => {
-        return (
-            <>
-                <circle cx={props.x} cy={props.y} r="8" fill={colors.white} filter={GLYPH_DROP_SHADOW_FILTER} />
-                <circle cx={props.x} cy={props.y} r="6" fill={colors.violet[500]} />
-            </>
-        );
-    },
+    renderTooltipGlyph: (props) => <TooltipGlyph x={props.x} y={props.y} />,
 };
 
 export function LineChart<DatumType extends object>({
     data,
+    isEmpty,
+
     xAccessor = lineChartDefault.xAccessor,
     yAccessor = lineChartDefault.yAccessor,
-    renderTooltipContent,
-    margin,
-    leftAxisTickFormat = lineChartDefault.leftAxisTickFormat,
-    leftAxisTickLabelProps = lineChartDefault.leftAxisTickLabelProps,
-    bottomAxisTickFormat = lineChartDefault.bottomAxisTickFormat,
-    bottomAxisTickLabelProps = lineChartDefault.bottomAxisTickLabelProps,
+    xScale = lineChartDefault.xScale,
+    yScale = lineChartDefault.yScale,
+    maxYDomainForZeroData,
+
     lineColor = lineChartDefault.lineColor,
     areaColor = lineChartDefault.areaColor,
-    gridColor = lineChartDefault.gridColor,
+    margin,
+
+    leftAxisProps,
+    bottomAxisProps,
+    gridProps,
+
+    popoverRenderer,
     renderGradients = lineChartDefault.renderGradients,
     toolbarVerticalCrosshairStyle = lineChartDefault.toolbarVerticalCrosshairStyle,
     renderTooltipGlyph = lineChartDefault.renderTooltipGlyph,
@@ -82,13 +112,37 @@ export function LineChart<DatumType extends object>({
     // FYI: additional margins to show left and bottom axises
     const internalMargin = {
         top: (margin?.top ?? 0) + 30,
-        right: (margin?.right ?? 0) + 20,
+        right: (margin?.right ?? 0) + 30,
         bottom: (margin?.bottom ?? 0) + 35,
         left: (margin?.left ?? 0) + 40,
     };
 
+    const maxDataValue = useMaxDataValue(data, yAccessor);
+    const adaptedYScale = useAdaptYScaleToZeroValues(yScale, maxDataValue, maxYDomainForZeroData);
+
     const accessors = { xAccessor, yAccessor };
 
+    const { computeNumTicks: computeLeftAxisNumTicks, ...mergedLeftAxisProps } = useMergedProps<AxisProps<DatumType>>(
+        leftAxisProps,
+        lineChartDefault.leftAxisProps,
+    );
+
+    const { computeNumTicks: computeBottomAxisNumTicks, ...mergedBottomAxisProps } = useMergedProps<
+        AxisProps<DatumType>
+    >(bottomAxisProps, lineChartDefault.bottomAxisProps);
+
+    const { computeNumTicks: computeGridNumTicks, ...mergedGridProps } = useMergedProps<GridProps<DatumType>>(
+        gridProps,
+        lineChartDefault.gridProps,
+    );
+
+    // In case of no data we should render empty graph with axises
+    // but they don't render at all without any data.
+    // To handle this case we will render the same graph with fake data and hide bars
+    if (!data.length) {
+        return <LineChart {...getMockedProps()} isEmpty />;
+    }
+
     return (
         <ChartWrapper onMouseEnter={() => setShowGrid(true)} onMouseLeave={() => setShowGrid(false)}>
             <ParentSize>
@@ -97,54 +151,54 @@ export function LineChart<DatumType extends object>({
                         <XYChart
                             width={width}
                             height={height}
-                            xScale={{ type: 'time' }}
-                            yScale={{ type: 'linear', nice: true, round: true }}
+                            xScale={xScale}
+                            yScale={adaptedYScale}
                             margin={internalMargin}
-                            captureEvents
+                            captureEvents={!isEmpty}
                         >
                             {renderGradients?.()}
 
                             <Axis
                                 orientation="left"
-                                tickFormat={leftAxisTickFormat}
-                                tickLabelProps={leftAxisTickLabelProps}
-                                hideAxisLine
-                                hideTicks
+                                numTicks={computeLeftAxisNumTicks?.(width, height, internalMargin, data)}
+                                {...mergedLeftAxisProps}
                             />
 
                             <Axis
                                 orientation="bottom"
-                                numTicks={Math.floor(data.length / 2)}
-                                tickFormat={bottomAxisTickFormat}
-                                tickLabelProps={bottomAxisTickLabelProps}
-                                hideAxisLine
-                                hideTicks
+                                numTicks={computeBottomAxisNumTicks?.(width, height, internalMargin, data)}
+                                {...mergedBottomAxisProps}
                             />
-
+                            {/* Left vertical line for y-axis */}
                             <line
                                 x1={internalMargin.left}
                                 x2={internalMargin.left}
                                 y1={0}
                                 y2={height - internalMargin.bottom}
-                                stroke={gridColor}
+                                stroke={mergedGridProps.stroke}
+                            />
+                            {/* Bottom horizontal line for x-axis */}
+                            <line
+                                x1={internalMargin.left}
+                                x2={width - internalMargin.right}
+                                y1={height - internalMargin.bottom}
+                                y2={height - internalMargin.bottom}
+                                stroke={mergedGridProps.stroke}
                             />
 
                             {showGrid && (
-                                <Grid rows={false} columns stroke={gridColor} numTicks={data.length} lineStyle={{}} />
+                                <Grid
+                                    numTicks={computeGridNumTicks?.(width, height, internalMargin, data)}
+                                    {...mergedGridProps}
+                                />
                             )}
 
                             <AreaSeries<AxisScale, AxisScale, DatumType>
                                 dataKey="line-chart-seria-01"
                                 data={data}
-                                fill={areaColor}
-                                curve={curveMonotoneX}
-                                {...accessors}
-                            />
-                            <LineSeries<AxisScale, AxisScale, DatumType>
-                                dataKey="line-chart-seria-01"
-                                data={data}
-                                stroke={lineColor}
+                                fill={!isEmpty ? areaColor : 'transparent'}
                                 curve={curveMonotoneX}
+                                lineProps={{ stroke: !isEmpty ? lineColor : 'transparent' }}
                                 {...accessors}
                             />
 
@@ -162,8 +216,10 @@ export function LineChart<DatumType extends object>({
                                         tooltipData?.nearestDatum && (
                                             <Popover
                                                 open
+                                                defaultOpen
                                                 placement="topLeft"
-                                                content={renderTooltipContent?.(tooltipData.nearestDatum.datum)}
+                                                key={`${xAccessor(tooltipData.nearestDatum.datum)}`}
+                                                content={popoverRenderer?.(tooltipData.nearestDatum.datum)}
                                             />
                                         )
                                     );
diff --git a/datahub-web-react/src/alchemy-components/components/LineChart/components.tsx b/datahub-web-react/src/alchemy-components/components/LineChart/components.tsx
index fb6c0cf1ced784..904f4dbbc360d1 100644
--- a/datahub-web-react/src/alchemy-components/components/LineChart/components.tsx
+++ b/datahub-web-react/src/alchemy-components/components/LineChart/components.tsx
@@ -1,4 +1,8 @@
+import { colors } from '@src/alchemy-components/theme';
+import React, { useEffect, useRef } from 'react';
 import styled from 'styled-components';
+import { GLYPH_DROP_SHADOW_FILTER } from './constants';
+import { TooltipGlyphProps } from './types';
 
 export const ChartWrapper = styled.div`
     width: 100%;
@@ -6,3 +10,27 @@ export const ChartWrapper = styled.div`
     position: relative;
     cursor: pointer;
 `;
+
+export const TooltipGlyph = ({ x, y }: TooltipGlyphProps) => {
+    const ref = useRef<SVGGElement>(null);
+
+    // FYI: Change size of parent SVG to prevent showing window's horizontal scrolling
+    // There are no any another ways to do it without fixing the library
+    useEffect(() => {
+        if (ref.current) {
+            const parent = ref.current.closest('svg');
+
+            if (parent) {
+                parent.setAttribute('width', '1');
+                parent.setAttribute('height', '1');
+            }
+        }
+    }, [ref]);
+
+    return (
+        <g ref={ref}>
+            <circle cx={x} cy={y} r="8" fill={colors.white} filter={GLYPH_DROP_SHADOW_FILTER} />
+            <circle cx={x} cy={y} r="6" fill={colors.violet[500]} />
+        </g>
+    );
+};
diff --git a/datahub-web-react/src/alchemy-components/components/LineChart/constants.ts b/datahub-web-react/src/alchemy-components/components/LineChart/constants.ts
new file mode 100644
index 00000000000000..d0952ded2be2e9
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/LineChart/constants.ts
@@ -0,0 +1,5 @@
+export const GLYPH_DROP_SHADOW_FILTER = `
+    drop-shadow(0px 1px 3px rgba(33, 23, 95, 0.30))
+    drop-shadow(0px 2px 5px rgba(33, 23, 95, 0.25))
+    drop-shadow(0px -2px 5px rgba(33, 23, 95, 0.25)
+`;
diff --git a/datahub-web-react/src/alchemy-components/components/LineChart/types.ts b/datahub-web-react/src/alchemy-components/components/LineChart/types.ts
index cf45662ba7cf90..818a353720e6a5 100644
--- a/datahub-web-react/src/alchemy-components/components/LineChart/types.ts
+++ b/datahub-web-react/src/alchemy-components/components/LineChart/types.ts
@@ -1,22 +1,35 @@
-import { TickFormatter, TickLabelProps } from '@visx/axis';
+import { AxisScaleOutput } from '@visx/axis';
+import { ScaleConfig } from '@visx/scale';
 import { Margin } from '@visx/xychart';
 import { RenderTooltipGlyphProps } from '@visx/xychart/lib/components/Tooltip';
 import React from 'react';
+import { AxisProps, GridProps } from '../BarChart/types';
 
 export type LineChartProps<DatumType extends object> = {
     data: DatumType[];
+    isEmpty?: boolean;
+
     xAccessor: (datum: DatumType) => string | number;
     yAccessor: (datum: DatumType) => number;
-    renderTooltipContent?: (datum: DatumType) => React.ReactNode;
-    margin?: Margin;
-    leftAxisTickFormat?: TickFormatter<DatumType>;
-    leftAxisTickLabelProps?: TickLabelProps<DatumType>;
-    bottomAxisTickFormat?: TickFormatter<DatumType>;
-    bottomAxisTickLabelProps?: TickLabelProps<DatumType>;
+    xScale?: ScaleConfig<AxisScaleOutput, any, any>;
+    yScale?: ScaleConfig<AxisScaleOutput, any, any>;
+    maxYDomainForZeroData?: number;
+
     lineColor?: string;
     areaColor?: string;
-    gridColor?: string;
+    margin?: Margin;
+
+    leftAxisProps?: AxisProps<DatumType>;
+    bottomAxisProps?: AxisProps<DatumType>;
+    gridProps?: GridProps<DatumType>;
+
+    popoverRenderer?: (datum: DatumType) => React.ReactNode;
     renderGradients?: () => React.ReactNode;
     toolbarVerticalCrosshairStyle?: React.SVGProps<SVGLineElement>;
     renderTooltipGlyph?: (props: RenderTooltipGlyphProps<object>) => React.ReactNode | undefined;
 };
+
+export type TooltipGlyphProps = {
+    x: number;
+    y: number;
+};
diff --git a/datahub-web-react/src/alchemy-components/components/LineChart/utils.ts b/datahub-web-react/src/alchemy-components/components/LineChart/utils.ts
new file mode 100644
index 00000000000000..1f3e8e55a9e663
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/LineChart/utils.ts
@@ -0,0 +1,4 @@
+export function roundToEven(value: number) {
+    const rounded = Math.ceil(value);
+    return rounded % 2 === 0 ? rounded : rounded + 1;
+}
diff --git a/datahub-web-react/src/alchemy-components/components/Loader/Loader.tsx b/datahub-web-react/src/alchemy-components/components/Loader/Loader.tsx
new file mode 100644
index 00000000000000..53ec36d34ee587
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Loader/Loader.tsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import { LoaderBackRing, LoaderWrapper, StyledLoadingOutlined } from './components';
+import { LoaderSizes, RingWidths } from './constants';
+import { LoaderProps } from './types';
+
+export const loaderDefault: LoaderProps = {
+    size: 'md',
+    justifyContent: 'center',
+    alignItems: 'none',
+};
+
+export function Loader({
+    size = loaderDefault.size,
+    justifyContent = loaderDefault.justifyContent,
+    alignItems = loaderDefault.alignItems,
+}: LoaderProps) {
+    const loaderSize = LoaderSizes[size || 'md'];
+    const ringWidth = RingWidths[size || 'md'];
+
+    return (
+        <LoaderWrapper $justifyContent={justifyContent || 'center'} $alignItems={alignItems || 'none'}>
+            <LoaderBackRing $height={loaderSize} $ringWidth={ringWidth} />
+            <StyledLoadingOutlined $height={loaderSize} />
+        </LoaderWrapper>
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/Loader/Loading.stories.tsx b/datahub-web-react/src/alchemy-components/components/Loader/Loading.stories.tsx
new file mode 100644
index 00000000000000..8d06d54c3201fb
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Loader/Loading.stories.tsx
@@ -0,0 +1,82 @@
+import { BADGE } from '@geometricpanda/storybook-addon-badges';
+import { GridList } from '@src/alchemy-components/.docs/mdx-components';
+import type { Meta, StoryObj } from '@storybook/react';
+import React from 'react';
+import { Loader, loaderDefault } from './Loader';
+
+const meta = {
+    title: 'Components / Loader',
+    component: Loader,
+
+    // Display Properties
+    parameters: {
+        // layout: 'flex',
+        badges: [BADGE.EXPERIMENTAL],
+        docs: {
+            subtitle: 'A component that is used to show the loading spinner',
+        },
+    },
+
+    // Component-level argTypes
+    argTypes: {
+        size: {
+            description: 'The size of the Loader',
+            type: 'string',
+            options: ['xs', 'sm', 'md', 'lg', 'xl'],
+            table: {
+                defaultValue: { summary: loaderDefault.size },
+            },
+            control: {
+                type: 'select',
+            },
+        },
+        justifyContent: {
+            description: 'The option to configure css-option: justify-content',
+            type: 'string',
+            options: ['center', 'flex-start'],
+            table: {
+                defaultValue: { summary: loaderDefault.justifyContent },
+            },
+            control: {
+                type: 'select',
+            },
+        },
+        alignItems: {
+            description: 'The option to configure css-option: align-items',
+            type: 'string',
+            options: ['center', 'flex-start', 'none'],
+            table: {
+                defaultValue: { summary: loaderDefault.alignItems },
+            },
+            control: {
+                type: 'select',
+            },
+        },
+    },
+
+    // Define defaults
+    args: loaderDefault,
+} satisfies Meta<typeof Loader>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const sandbox: Story = {
+    args: {
+        justifyContent: 'flex-start',
+    },
+
+    tags: ['dev'],
+    render: (props) => <Loader {...props} />,
+};
+
+export const sizes = () => (
+    <GridList>
+        <Loader size="xs" />
+        <Loader size="sm" />
+        <Loader size="md" />
+        <Loader size="lg" />
+        <Loader size="xl" />
+    </GridList>
+);
diff --git a/datahub-web-react/src/alchemy-components/components/Loader/components.tsx b/datahub-web-react/src/alchemy-components/components/Loader/components.tsx
new file mode 100644
index 00000000000000..161d342204e5da
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Loader/components.tsx
@@ -0,0 +1,34 @@
+import { LoadingOutlined } from '@ant-design/icons';
+import { colors } from '@src/alchemy-components/theme';
+import styled from 'styled-components';
+import { AlignItemsOptions, JustifyContentOptions } from './types';
+
+export const LoaderWrapper = styled.div<{
+    $marginTop?: number;
+    $justifyContent: JustifyContentOptions;
+    $alignItems: AlignItemsOptions;
+}>`
+    display: flex;
+    justify-content: ${(props) => props.$justifyContent};
+    align-items: ${(props) => props.$alignItems};
+    margin: auto;
+    width: 100%;
+    position: relative;
+`;
+
+export const StyledLoadingOutlined = styled(LoadingOutlined)<{ $height: number }>`
+    font-size: ${(props) => props.$height}px;
+    height: ${(props) => props.$height}px;
+    position: absolute;
+
+    svg {
+        fill: ${colors.violet[500]};
+    }
+`;
+
+export const LoaderBackRing = styled.span<{ $height: number; $ringWidth: number }>`
+    width: ${(props) => props.$height}px;
+    height: ${(props) => props.$height}px;
+    border: ${(props) => props.$ringWidth}px solid ${colors.gray[100]};
+    border-radius: 50%;
+`;
diff --git a/datahub-web-react/src/alchemy-components/components/Loader/constants.ts b/datahub-web-react/src/alchemy-components/components/Loader/constants.ts
new file mode 100644
index 00000000000000..383046fa5a72c0
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Loader/constants.ts
@@ -0,0 +1,16 @@
+export const LoaderSizes = {
+    xs: 14,
+    sm: 22,
+    md: 38,
+    lg: 54,
+    xl: 78,
+};
+
+// FYI: we have to adjust the width of border (ring) to size of the svg loading icon
+export const RingWidths = {
+    xs: 1,
+    sm: 2,
+    md: 3,
+    lg: 4,
+    xl: 6,
+};
diff --git a/datahub-web-react/src/alchemy-components/components/Loader/index.ts b/datahub-web-react/src/alchemy-components/components/Loader/index.ts
new file mode 100644
index 00000000000000..d70278852510b5
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Loader/index.ts
@@ -0,0 +1 @@
+export { Loader } from './Loader';
diff --git a/datahub-web-react/src/alchemy-components/components/Loader/types.ts b/datahub-web-react/src/alchemy-components/components/Loader/types.ts
new file mode 100644
index 00000000000000..ede553b11e73fb
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Loader/types.ts
@@ -0,0 +1,11 @@
+import { SizeOptions } from '@src/alchemy-components/theme/config';
+
+export type JustifyContentOptions = 'center' | 'flex-start';
+
+export type AlignItemsOptions = 'center' | 'flex-start' | 'none';
+
+export type LoaderProps = {
+    size?: SizeOptions;
+    justifyContent?: JustifyContentOptions;
+    alignItems?: AlignItemsOptions;
+};
diff --git a/datahub-web-react/src/alchemy-components/components/Pills/Pill.tsx b/datahub-web-react/src/alchemy-components/components/Pills/Pill.tsx
index 898ec89fce5957..86a12149272047 100644
--- a/datahub-web-react/src/alchemy-components/components/Pills/Pill.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Pills/Pill.tsx
@@ -1,6 +1,5 @@
 import { Icon } from '@components';
 import React from 'react';
-
 import { PillContainer, PillText } from './components';
 import { PillProps } from './types';
 
@@ -23,6 +22,8 @@ export function Pill({
     onClickRightIcon,
     onClickLeftIcon,
     onPillClick,
+    customStyle,
+    customIconRenderer,
 }: PillProps) {
     return (
         <PillContainer
@@ -33,9 +34,14 @@ export function Pill({
             id={id}
             data-testid="pill-container"
             onClick={onPillClick}
+            style={{
+                backgroundColor: customStyle?.backgroundColor,
+            }}
         >
-            {leftIcon && <Icon icon={leftIcon} size={size} onClick={onClickLeftIcon} />}
-            <PillText>{label}</PillText>
+            {customIconRenderer
+                ? customIconRenderer()
+                : leftIcon && <Icon icon={leftIcon} size={size} onClick={onClickLeftIcon} />}
+            <PillText style={customStyle}>{label}</PillText>
             {rightIcon && <Icon icon={rightIcon} size={size} onClick={onClickRightIcon} />}
         </PillContainer>
     );
diff --git a/datahub-web-react/src/alchemy-components/components/Pills/components.ts b/datahub-web-react/src/alchemy-components/components/Pills/components.ts
index 79734561a92da6..bd3b8e0e5578e7 100644
--- a/datahub-web-react/src/alchemy-components/components/Pills/components.ts
+++ b/datahub-web-react/src/alchemy-components/components/Pills/components.ts
@@ -30,4 +30,6 @@ export const PillText = styled.span({
     whiteSpace: 'nowrap',
     overflow: 'hidden',
     textOverflow: 'ellipsis',
+    fontSize: '12px',
+    fontWeight: 400,
 });
diff --git a/datahub-web-react/src/alchemy-components/components/Pills/types.ts b/datahub-web-react/src/alchemy-components/components/Pills/types.ts
index 17d4d12465e1ef..51685019f79b9c 100644
--- a/datahub-web-react/src/alchemy-components/components/Pills/types.ts
+++ b/datahub-web-react/src/alchemy-components/components/Pills/types.ts
@@ -12,6 +12,8 @@ export interface PillProps extends HTMLAttributes<HTMLElement>, PillStyleProps {
     label: string;
     rightIcon?: string;
     leftIcon?: string;
+    customStyle?: React.CSSProperties;
+    customIconRenderer?: () => void;
     onClickRightIcon?: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void;
     onClickLeftIcon?: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void;
     onPillClick?: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void;
diff --git a/datahub-web-react/src/alchemy-components/components/SearchBar/SearchBar.tsx b/datahub-web-react/src/alchemy-components/components/SearchBar/SearchBar.tsx
index f39f761058d8c7..8e9eea5eb907ca 100644
--- a/datahub-web-react/src/alchemy-components/components/SearchBar/SearchBar.tsx
+++ b/datahub-web-react/src/alchemy-components/components/SearchBar/SearchBar.tsx
@@ -4,7 +4,7 @@ import { StyledSearchBar } from './components';
 import { SearchBarProps } from './types';
 
 export const searchBarDefaults: SearchBarProps = {
-    placeholder: 'Search..',
+    placeholder: 'Search...',
     value: '',
     width: '272px',
     allowClear: true,
diff --git a/datahub-web-react/src/alchemy-components/components/Select/BasicSelect.tsx b/datahub-web-react/src/alchemy-components/components/Select/BasicSelect.tsx
index b49159ba38a758..c4b6404cc0f54e 100644
--- a/datahub-web-react/src/alchemy-components/components/Select/BasicSelect.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Select/BasicSelect.tsx
@@ -1,75 +1,31 @@
-import { Button, Icon, Pill, Text } from '@components';
+import { Button, Text } from '@components';
 import { isEqual } from 'lodash';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import {
     ActionButtonsContainer,
     Container,
-    DescriptionContainer,
     Dropdown,
     FooterBase,
     LabelContainer,
-    LabelsWrapper,
     OptionContainer,
     OptionLabel,
     OptionList,
-    Placeholder,
     SearchIcon,
     SearchInput,
     SearchInputContainer,
     SelectAllOption,
     SelectBase,
     SelectLabel,
-    SelectValue,
+    SelectLabelContainer,
     StyledCancelButton,
     StyledCheckbox,
     StyledClearButton,
+    StyledIcon,
 } from './components';
-import { ActionButtonsProps, SelectLabelDisplayProps, SelectOption, SelectProps } from './types';
+import SelectLabelRenderer from './private/SelectLabelRenderer/SelectLabelRenderer';
+import { ActionButtonsProps, SelectOption, SelectProps } from './types';
 import { getFooterButtonSize } from './utils';
 
-const SelectLabelDisplay = ({
-    selectedValues,
-    options,
-    placeholder,
-    isMultiSelect,
-    removeOption,
-    disabledValues,
-    showDescriptions,
-}: SelectLabelDisplayProps) => {
-    const selectedOptions = options.filter((opt) => selectedValues.includes(opt.value));
-    return (
-        <LabelsWrapper>
-            {!!selectedOptions.length &&
-                isMultiSelect &&
-                selectedOptions.map((o) => {
-                    const isDisabled = disabledValues?.includes(o.value);
-                    return (
-                        <Pill
-                            label={o.label}
-                            rightIcon={!isDisabled ? 'Close' : ''}
-                            size="sm"
-                            key={o.value}
-                            onClickRightIcon={(e) => {
-                                e.stopPropagation();
-                                removeOption?.(o);
-                            }}
-                            clickable={!isDisabled}
-                        />
-                    );
-                })}
-            {!selectedValues.length && <Placeholder>{placeholder}</Placeholder>}
-            {!isMultiSelect && (
-                <>
-                    <SelectValue>{selectedOptions[0]?.label}</SelectValue>
-                    {showDescriptions && !!selectedValues.length && (
-                        <DescriptionContainer>{selectedOptions[0]?.description}</DescriptionContainer>
-                    )}
-                </>
-            )}
-        </LabelsWrapper>
-    );
-};
-
 const SelectActionButtons = ({
     selectedValues,
     isOpen,
@@ -77,14 +33,13 @@ const SelectActionButtons = ({
     isReadOnly,
     showClear,
     handleClearSelection,
-    fontSize = 'md',
 }: ActionButtonsProps) => {
     return (
         <ActionButtonsContainer>
             {showClear && selectedValues.length > 0 && !isDisabled && !isReadOnly && (
-                <StyledClearButton icon="Close" isCircle onClick={handleClearSelection} size={fontSize} />
+                <StyledClearButton icon="Close" isCircle onClick={handleClearSelection} iconSize="lg" />
             )}
-            <Icon icon="ChevronLeft" rotate={isOpen ? '90' : '270'} size="xl" color="gray" />
+            <StyledIcon icon="ChevronLeft" rotate={isOpen ? '90' : '270'} size="lg" />
         </ActionButtonsContainer>
     );
 };
@@ -110,6 +65,7 @@ export const BasicSelect = ({
     options = selectDefaults.options,
     label = selectDefaults.label,
     values = [],
+    initialValues,
     onCancel,
     onUpdate,
     showSearch = selectDefaults.showSearch,
@@ -124,11 +80,12 @@ export const BasicSelect = ({
     showSelectAll = selectDefaults.showSelectAll,
     selectAllLabel = selectDefaults.selectAllLabel,
     showDescriptions = selectDefaults.showDescriptions,
+    icon,
     ...props
 }: SelectProps) => {
     const [searchQuery, setSearchQuery] = useState('');
     const [isOpen, setIsOpen] = useState(false);
-    const [selectedValues, setSelectedValues] = useState<string[]>(values);
+    const [selectedValues, setSelectedValues] = useState<string[]>(initialValues || values);
     const [tempValues, setTempValues] = useState<string[]>(values);
     const selectRef = useRef<HTMLDivElement>(null);
     const [areAllSelected, setAreAllSelected] = useState(false);
@@ -237,22 +194,24 @@ export const BasicSelect = ({
                 fontSize={size}
                 {...props}
             >
-                <SelectLabelDisplay
-                    selectedValues={selectedValues}
-                    options={options}
-                    placeholder={placeholder || 'Select an option'}
-                    isMultiSelect={isMultiSelect}
-                    removeOption={removeOption}
-                    disabledValues={disabledValues}
-                    showDescriptions={showDescriptions}
-                />
+                <SelectLabelContainer>
+                    {icon && <StyledIcon icon={icon} size="lg" />}
+                    <SelectLabelRenderer
+                        selectedValues={selectedValues}
+                        options={options}
+                        placeholder={placeholder || 'Select an option'}
+                        isMultiSelect={isMultiSelect}
+                        removeOption={removeOption}
+                        disabledValues={disabledValues}
+                        showDescriptions={showDescriptions}
+                    />
+                </SelectLabelContainer>
                 <SelectActionButtons
                     selectedValues={selectedValues}
                     isOpen={isOpen}
                     isDisabled={!!isDisabled}
                     isReadOnly={!!isReadOnly}
                     handleClearSelection={handleClearSelection}
-                    fontSize={size}
                     showClear={!!showClear}
                 />
             </SelectBase>
@@ -305,9 +264,16 @@ export const BasicSelect = ({
                                     </LabelContainer>
                                 ) : (
                                     <OptionContainer>
-                                        <Text color="gray" weight="semiBold" size="md">
-                                            {option.label}
-                                        </Text>
+                                        <ActionButtonsContainer>
+                                            {option.icon}
+                                            <Text
+                                                color={selectedValues.includes(option.value) ? 'violet' : 'gray'}
+                                                weight="semiBold"
+                                                size="md"
+                                            >
+                                                {option.label}
+                                            </Text>
+                                        </ActionButtonsContainer>
                                         {!!option.description && (
                                             <Text color="gray" weight="normal" size="sm">
                                                 {option.description}
diff --git a/datahub-web-react/src/alchemy-components/components/Select/Nested/NestedOption.tsx b/datahub-web-react/src/alchemy-components/components/Select/Nested/NestedOption.tsx
index 8a7d3670b2b1b9..2de5c4284fe4a4 100644
--- a/datahub-web-react/src/alchemy-components/components/Select/Nested/NestedOption.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Select/Nested/NestedOption.tsx
@@ -85,6 +85,7 @@ interface OptionProps {
     isMultiSelect?: boolean;
     isLoadingParentChildList?: boolean;
     setSelectedOptions: React.Dispatch<React.SetStateAction<SelectOption[]>>;
+    hideParentCheckbox?: boolean;
 }
 
 export const NestedOption = ({
@@ -99,6 +100,7 @@ export const NestedOption = ({
     areParentsSelectable,
     isLoadingParentChildList,
     setSelectedOptions,
+    hideParentCheckbox,
 }: OptionProps) => {
     const [autoSelectChildren, setAutoSelectChildren] = useState(false);
     const [loadingParentUrns, setLoadingParentUrns] = useState<string[]>([]);
@@ -240,7 +242,12 @@ export const NestedOption = ({
                     }}
                     isSelected={!isMultiSelect && isSelected}
                     // added hack to show cursor in wait untill we get the inline spinner
-                    style={{ width: '100%', cursor: loadingParentUrns.includes(option.value) ? 'wait' : 'pointer' }}
+                    style={{
+                        width: '100%',
+                        cursor: loadingParentUrns.includes(option.value) ? 'wait' : 'pointer',
+                        display: 'flex',
+                        justifyContent: hideParentCheckbox ? 'space-between' : 'normal',
+                    }}
                 >
                     {option.isParent && <strong>{option.label}</strong>}
                     {!option.isParent && <>{option.label}</>}
@@ -262,27 +269,29 @@ export const NestedOption = ({
                             style={{ cursor: 'pointer', marginLeft: '4px' }}
                         />
                     )}
-                    <StyledCheckbox
-                        checked={isImplicitlySelected || isSelected}
-                        indeterminate={
-                            areParentsSelectable && option.isParent ? areAnyChildrenSelected : isPartialSelected
-                        }
-                        onClick={(e) => {
-                            e.preventDefault();
-                            if (isImplicitlySelected) {
-                                return;
+                    {!(hideParentCheckbox && option.isParent) && (
+                        <StyledCheckbox
+                            checked={isImplicitlySelected || isSelected}
+                            indeterminate={
+                                areParentsSelectable && option.isParent ? areAnyChildrenSelected : isPartialSelected
                             }
-                            e.stopPropagation();
-                            if (isParentMissingChildren) {
-                                loadData?.(option);
-                                if (!areParentsSelectable) {
-                                    setAutoSelectChildren(true);
+                            onClick={(e) => {
+                                e.preventDefault();
+                                if (isImplicitlySelected) {
+                                    return;
                                 }
-                            }
-                            selectOption();
-                        }}
-                        disabled={isImplicitlySelected}
-                    />
+                                e.stopPropagation();
+                                if (isParentMissingChildren) {
+                                    loadData?.(option);
+                                    if (!areParentsSelectable) {
+                                        setAutoSelectChildren(true);
+                                    }
+                                }
+                                selectOption();
+                            }}
+                            disabled={isImplicitlySelected}
+                        />
+                    )}
                 </OptionLabel>
             </ParentOption>
             {isOpen && (
diff --git a/datahub-web-react/src/alchemy-components/components/Select/Nested/NestedSelect.tsx b/datahub-web-react/src/alchemy-components/components/Select/Nested/NestedSelect.tsx
index 744c7bfcfec0d2..d2748658e161c7 100644
--- a/datahub-web-react/src/alchemy-components/components/Select/Nested/NestedSelect.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Select/Nested/NestedSelect.tsx
@@ -1,11 +1,11 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import styled from 'styled-components';
-
-import { Icon, Pill } from '@components';
+import { Icon, Pill, colors } from '@components';
 
 import {
     ActionButtonsContainer,
     Container,
+    CountBadge,
     Dropdown,
     OptionList,
     Placeholder,
@@ -30,17 +30,35 @@ const LabelDisplayWrapper = styled.div`
     max-height: 125px;
     min-height: 16px;
 `;
+const StyledCountBadgeContainer = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    color: ${colors.gray[1800]};
+`;
 
 interface SelectLabelDisplayProps {
     selectedOptions: SelectOption[];
     placeholder: string;
     handleOptionChange: (node: SelectOption) => void;
+    showCount?: boolean;
 }
 
-const SelectLabelDisplay = ({ selectedOptions, placeholder, handleOptionChange }: SelectLabelDisplayProps) => {
+const SelectLabelDisplay = ({
+    selectedOptions,
+    placeholder,
+    handleOptionChange,
+    showCount,
+}: SelectLabelDisplayProps) => {
     return (
         <LabelDisplayWrapper>
-            {!!selectedOptions.length &&
+            {showCount && selectedOptions.length > 0 ? (
+                <StyledCountBadgeContainer>
+                    {placeholder}
+                    <CountBadge>{selectedOptions.length}</CountBadge>
+                </StyledCountBadgeContainer>
+            ) : (
+                !!selectedOptions.length &&
                 selectedOptions.map((o) => (
                     <Pill
                         label={o.label}
@@ -51,7 +69,8 @@ const SelectLabelDisplay = ({ selectedOptions, placeholder, handleOptionChange }
                             handleOptionChange(o);
                         }}
                     />
-                ))}
+                ))
+            )}
             {!selectedOptions.length && <Placeholder>{placeholder}</Placeholder>}
         </LabelDisplayWrapper>
     );
@@ -64,6 +83,7 @@ export interface ActionButtonsProps {
     isDisabled: boolean;
     isReadOnly: boolean;
     handleClearSelection: () => void;
+    showCount?: boolean;
 }
 
 const SelectActionButtons = ({
@@ -73,10 +93,11 @@ const SelectActionButtons = ({
     isReadOnly,
     handleClearSelection,
     fontSize = 'md',
+    showCount = false,
 }: ActionButtonsProps) => {
     return (
         <ActionButtonsContainer>
-            {!!selectedOptions.length && !isDisabled && !isReadOnly && (
+            {!showCount && !!selectedOptions.length && !isDisabled && !isReadOnly && (
                 <StyledClearButton
                     icon="Close"
                     isCircle
@@ -111,6 +132,9 @@ export interface SelectProps {
     placeholder?: string;
     searchPlaceholder?: string;
     isLoadingParentChildList?: boolean;
+    showCount?: boolean;
+    shouldAlwaysSyncParentValues?: boolean;
+    hideParentCheckbox?: boolean;
 }
 
 export const selectDefaults: SelectProps = {
@@ -144,6 +168,9 @@ export const NestedSelect = ({
     searchPlaceholder,
     height = selectDefaults.height,
     isLoadingParentChildList = false,
+    showCount = false,
+    shouldAlwaysSyncParentValues = false,
+    hideParentCheckbox = false,
     ...props
 }: SelectProps) => {
     const [searchQuery, setSearchQuery] = useState('');
@@ -151,6 +178,18 @@ export const NestedSelect = ({
     const [selectedOptions, setSelectedOptions] = useState<SelectOption[]>(initialValues);
     const selectRef = useRef<HTMLDivElement>(null);
 
+    useEffect(() => {
+        if (initialValues && shouldAlwaysSyncParentValues) {
+            const filteredOptions = selectedOptions.filter((option) =>
+                initialValues.some((initial) => initial.value === option.value),
+            );
+            if (filteredOptions.length !== selectedOptions.length) {
+                setSelectedOptions(filteredOptions);
+            }
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [initialValues]);
+
     // TODO: handle searching inside of a nested component on the FE only
 
     const handleDocumentClick = useCallback((e: MouseEvent) => {
@@ -257,12 +296,14 @@ export const NestedSelect = ({
                 onClick={handleSelectClick}
                 fontSize={size}
                 data-testid="nested-options-dropdown-container"
+                width={props.width}
                 {...props}
             >
                 <SelectLabelDisplay
                     selectedOptions={selectedOptions}
                     placeholder={placeholder || 'Select an option'}
                     handleOptionChange={handleOptionChange}
+                    showCount={showCount}
                 />
                 <SelectActionButtons
                     selectedOptions={selectedOptions}
@@ -271,6 +312,7 @@ export const NestedSelect = ({
                     isReadOnly={!!isReadOnly}
                     handleClearSelection={handleClearSelection}
                     fontSize={size}
+                    showCount={showCount}
                 />
             </SelectBase>
             {isOpen && (
@@ -302,6 +344,7 @@ export const NestedSelect = ({
                                 setSelectedOptions={setSelectedOptions}
                                 areParentsSelectable={areParentsSelectable}
                                 isLoadingParentChildList={isLoadingParentChildList}
+                                hideParentCheckbox={hideParentCheckbox}
                             />
                         ))}
                     </OptionList>
diff --git a/datahub-web-react/src/alchemy-components/components/Select/Select.stories.tsx b/datahub-web-react/src/alchemy-components/components/Select/Select.stories.tsx
index 0ec20b15e771ab..fefdb05c375a2f 100644
--- a/datahub-web-react/src/alchemy-components/components/Select/Select.stories.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Select/Select.stories.tsx
@@ -5,6 +5,7 @@ import React from 'react';
 import { Select, selectDefaults } from './Select';
 import { SimpleSelect } from './SimpleSelect';
 import { SelectSizeOptions } from './types';
+import { AVAILABLE_ICONS } from '../Icon';
 
 // Auto Docs
 const meta: Meta = {
@@ -158,6 +159,33 @@ const meta: Meta = {
                 defaultValue: { summary: selectDefaults.showDescriptions?.toString() },
             },
         },
+        icon: {
+            description: `The name of the icon to display.`,
+            type: 'string',
+            options: AVAILABLE_ICONS,
+            table: {
+                defaultValue: { summary: 'undefined' },
+            },
+            control: {
+                type: 'select',
+            },
+        },
+        optionSwitchable: {
+            description: 'Set to `true` to uselect option by clicking on it',
+            type: 'boolean',
+            table: {
+                defaultValue: { summary: 'undefined' },
+            },
+            control: {
+                type: 'boolean',
+            },
+        },
+        selectLabelProps: {
+            description: 'Additional props for rendering of select label',
+            table: {
+                defaultValue: { summary: 'undefined' },
+            },
+        },
     },
 
     // Define defaults
@@ -212,6 +240,7 @@ export const simpleSelectSandbox: Story = {
             isMultiSelect={props.isMultiSelect}
             placeholder={props.placeholder}
             disabledValues={props.disabledValues}
+            icon={props.icon}
         />
     ),
 };
@@ -321,6 +350,18 @@ export const simpleSelectSizes = () => (
     </GridList>
 );
 
+export const simpleSelectWithIcon = () => (
+    <SimpleSelect
+        options={[
+            { label: 'Option 1', value: '1' },
+            { label: 'Option 2', value: '2' },
+            { label: 'Option 3', value: '3' },
+        ]}
+        label="Simple Select with icon"
+        icon="Search"
+    />
+);
+
 // Basic story is what is displayed 1st in storybook & is used as the code sandbox
 // Pass props to this so that it can be customized via the UI props panel
 export const BasicSelectSandbox: Story = {
@@ -341,6 +382,7 @@ export const BasicSelectSandbox: Story = {
             width={props.width}
             isMultiSelect={props.isMultiSelect}
             placeholder={props.placeholder}
+            icon={props.icon}
         />
     ),
 };
@@ -429,3 +471,16 @@ export const footerActions = () => (
         />
     </GridList>
 );
+
+export const withIcon = () => (
+    <Select
+        options={[
+            { label: 'Option 1', value: '1' },
+            { label: 'Option 2', value: '2' },
+            { label: 'Option 3', value: '3' },
+        ]}
+        label="Select with icon"
+        values={['2']}
+        icon="Search"
+    />
+);
diff --git a/datahub-web-react/src/alchemy-components/components/Select/Select.tsx b/datahub-web-react/src/alchemy-components/components/Select/Select.tsx
index da28f090565431..3c346b0f1d40b4 100644
--- a/datahub-web-react/src/alchemy-components/components/Select/Select.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Select/Select.tsx
@@ -24,6 +24,7 @@ export const Select = ({
     options = selectDefaults.options,
     label = selectDefaults.label,
     values = [],
+    initialValues,
     onCancel,
     onUpdate,
     showSearch = selectDefaults.showSearch,
@@ -46,6 +47,7 @@ export const Select = ({
             size={size}
             label={label}
             values={values}
+            initialValues={initialValues}
             showSearch={showSearch}
             isDisabled={isDisabled}
             isReadOnly={isReadOnly}
diff --git a/datahub-web-react/src/alchemy-components/components/Select/SimpleSelect.tsx b/datahub-web-react/src/alchemy-components/components/Select/SimpleSelect.tsx
index be1184cee9e9f5..456650c51a7c61 100644
--- a/datahub-web-react/src/alchemy-components/components/Select/SimpleSelect.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Select/SimpleSelect.tsx
@@ -1,71 +1,27 @@
-import { Icon, Pill, Text } from '@components';
+import { Text } from '@components';
 import { isEqual } from 'lodash';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import {
     ActionButtonsContainer,
     Container,
-    DescriptionContainer,
     Dropdown,
     LabelContainer,
-    LabelsWrapper,
     OptionContainer,
     OptionLabel,
     OptionList,
-    Placeholder,
     SearchIcon,
     SearchInput,
     SearchInputContainer,
     SelectAllOption,
     SelectBase,
     SelectLabel,
-    SelectValue,
+    SelectLabelContainer,
     StyledCheckbox,
     StyledClearButton,
+    StyledIcon,
 } from './components';
-import { ActionButtonsProps, SelectLabelDisplayProps, SelectOption, SelectProps } from './types';
-
-const SelectLabelDisplay = ({
-    selectedValues,
-    options,
-    placeholder,
-    isMultiSelect,
-    removeOption,
-    disabledValues,
-    showDescriptions,
-}: SelectLabelDisplayProps) => {
-    const selectedOptions = options.filter((opt) => selectedValues.includes(opt.value));
-    return (
-        <LabelsWrapper>
-            {!!selectedOptions.length &&
-                isMultiSelect &&
-                selectedOptions.map((o) => {
-                    const isDisabled = disabledValues?.includes(o.value);
-                    return (
-                        <Pill
-                            label={o.label}
-                            rightIcon={!isDisabled ? 'Close' : ''}
-                            size="sm"
-                            key={o.value}
-                            onClickRightIcon={(e) => {
-                                e.stopPropagation();
-                                removeOption?.(o);
-                            }}
-                            clickable={!isDisabled}
-                        />
-                    );
-                })}
-            {!selectedValues.length && <Placeholder>{placeholder}</Placeholder>}
-            {!isMultiSelect && (
-                <>
-                    <SelectValue>{selectedOptions[0]?.label}</SelectValue>
-                    {showDescriptions && !!selectedValues.length && (
-                        <DescriptionContainer>{selectedOptions[0]?.description}</DescriptionContainer>
-                    )}
-                </>
-            )}
-        </LabelsWrapper>
-    );
-};
+import SelectLabelRenderer from './private/SelectLabelRenderer/SelectLabelRenderer';
+import { ActionButtonsProps, SelectOption, SelectProps } from './types';
 
 const SelectActionButtons = ({
     selectedValues,
@@ -74,14 +30,13 @@ const SelectActionButtons = ({
     isReadOnly,
     showClear,
     handleClearSelection,
-    fontSize = 'md',
 }: ActionButtonsProps) => {
     return (
         <ActionButtonsContainer>
             {showClear && selectedValues.length > 0 && !isDisabled && !isReadOnly && (
-                <StyledClearButton icon="Close" isCircle onClick={handleClearSelection} size={fontSize} />
+                <StyledClearButton icon="Close" isCircle onClick={handleClearSelection} iconSize="lg" />
             )}
-            <Icon icon="ChevronLeft" rotate={isOpen ? '90' : '270'} size="xl" color="gray" />
+            <StyledIcon icon="ChevronLeft" rotate={isOpen ? '90' : '270'} size="lg" />
         </ActionButtonsContainer>
     );
 };
@@ -107,6 +62,7 @@ export const SimpleSelect = ({
     options = selectDefaults.options,
     label = selectDefaults.label,
     values = [],
+    initialValues,
     onUpdate,
     showSearch = selectDefaults.showSearch,
     isDisabled = selectDefaults.isDisabled,
@@ -114,18 +70,21 @@ export const SimpleSelect = ({
     isRequired = selectDefaults.isRequired,
     showClear = selectDefaults.showClear,
     size = selectDefaults.size,
+    icon,
     isMultiSelect = selectDefaults.isMultiSelect,
     placeholder = selectDefaults.placeholder,
     disabledValues = [],
     showSelectAll = selectDefaults.showSelectAll,
     selectAllLabel = selectDefaults.selectAllLabel,
-    optionListTestId,
     showDescriptions = selectDefaults.showDescriptions,
+    optionListTestId,
+    optionSwitchable,
+    selectLabelProps,
     ...props
 }: SelectProps) => {
     const [searchQuery, setSearchQuery] = useState('');
     const [isOpen, setIsOpen] = useState(false);
-    const [selectedValues, setSelectedValues] = useState<string[]>(values);
+    const [selectedValues, setSelectedValues] = useState<string[]>(initialValues || values);
     const selectRef = useRef<HTMLDivElement>(null);
     const [areAllSelected, setAreAllSelected] = useState(false);
 
@@ -200,7 +159,13 @@ export const SimpleSelect = ({
     };
 
     return (
-        <Container ref={selectRef} size={size || 'md'} width={props.width || 255}>
+        <Container
+            ref={selectRef}
+            size={size || 'md'}
+            width={props.width || 255}
+            $selectLabelVariant={selectLabelProps?.variant}
+            isSelected={selectedValues.length > 0}
+        >
             {label && <SelectLabel onClick={handleSelectClick}>{label}</SelectLabel>}
             <SelectBase
                 isDisabled={isDisabled}
@@ -211,22 +176,25 @@ export const SimpleSelect = ({
                 fontSize={size}
                 {...props}
             >
-                <SelectLabelDisplay
-                    selectedValues={selectedValues}
-                    options={options}
-                    placeholder={placeholder || 'Select an option'}
-                    isMultiSelect={isMultiSelect}
-                    removeOption={handleOptionChange}
-                    disabledValues={disabledValues}
-                    showDescriptions={showDescriptions}
-                />
+                <SelectLabelContainer>
+                    {icon && <StyledIcon icon={icon} size="lg" />}
+                    <SelectLabelRenderer
+                        selectedValues={selectedValues}
+                        options={options}
+                        placeholder={placeholder || 'Select an option'}
+                        isMultiSelect={isMultiSelect}
+                        removeOption={handleOptionChange}
+                        disabledValues={disabledValues}
+                        showDescriptions={showDescriptions}
+                        {...(selectLabelProps || {})}
+                    />
+                </SelectLabelContainer>
                 <SelectActionButtons
                     selectedValues={selectedValues}
                     isOpen={isOpen}
                     isDisabled={!!isDisabled}
                     isReadOnly={!!isReadOnly}
                     handleClearSelection={handleClearSelection}
-                    fontSize={size}
                     showClear={!!showClear}
                 />
             </SelectBase>
@@ -263,7 +231,15 @@ export const SimpleSelect = ({
                         {filteredOptions.map((option) => (
                             <OptionLabel
                                 key={option.value}
-                                onClick={() => !isMultiSelect && handleOptionChange(option)}
+                                onClick={() => {
+                                    if (!isMultiSelect) {
+                                        if (optionSwitchable && selectedValues.includes(option.value)) {
+                                            handleClearSelection();
+                                        } else {
+                                            handleOptionChange(option);
+                                        }
+                                    }
+                                }}
                                 isSelected={selectedValues.includes(option.value)}
                                 isMultiSelect={isMultiSelect}
                                 isDisabled={disabledValues?.includes(option.value)}
@@ -279,9 +255,16 @@ export const SimpleSelect = ({
                                     </LabelContainer>
                                 ) : (
                                     <OptionContainer>
-                                        <Text color="gray" weight="semiBold" size="md">
-                                            {option.label}
-                                        </Text>
+                                        <ActionButtonsContainer>
+                                            {option.icon}
+                                            <Text
+                                                weight="semiBold"
+                                                size="md"
+                                                color={selectedValues.includes(option.value) ? 'violet' : 'gray'}
+                                            >
+                                                {option.label}
+                                            </Text>
+                                        </ActionButtonsContainer>
                                         {!!option.description && (
                                             <Text color="gray" weight="normal" size="sm">
                                                 {option.description}
diff --git a/datahub-web-react/src/alchemy-components/components/Select/components.ts b/datahub-web-react/src/alchemy-components/components/Select/components.ts
index a360238fef4923..47fe1056c260eb 100644
--- a/datahub-web-react/src/alchemy-components/components/Select/components.ts
+++ b/datahub-web-react/src/alchemy-components/components/Select/components.ts
@@ -3,7 +3,7 @@ import { borders, colors, radius, shadows, spacing, transition, typography } fro
 import { Checkbox } from 'antd';
 import styled from 'styled-components';
 import { formLabelTextStyles, inputPlaceholderTextStyles, inputValueTextStyles } from '../commonStyles';
-import { SelectSizeOptions, SelectStyleProps } from './types';
+import { SelectLabelVariants, SelectSizeOptions, SelectStyleProps } from './types';
 import { getOptionLabelStyle, getSelectFontStyles, getSelectStyle } from './utils';
 
 const sharedTransition = `${transition.property.colors} ${transition.easing['ease-in-out']} ${transition.duration.normal}`;
@@ -11,18 +11,31 @@ const sharedTransition = `${transition.property.colors} ${transition.easing['eas
 /**
  * Base Select component styling
  */
-export const SelectBase = styled.div<SelectStyleProps>(({ isDisabled, isReadOnly, fontSize, isOpen }) => ({
+export const SelectBase = styled.div<SelectStyleProps>(({ isDisabled, isReadOnly, fontSize, isOpen, width }) => ({
     ...getSelectStyle({ isDisabled, isReadOnly, fontSize, isOpen }),
     display: 'flex',
     flexDirection: 'row' as const,
     gap: spacing.xsm,
     transition: sharedTransition,
     justifyContent: 'space-between',
+    alignSelf: 'end',
+    minHeight: '42px',
     alignItems: 'center',
     overflow: 'auto',
-    backgroundColor: isDisabled ? colors.gray[100] : 'white',
+    textWrapMode: 'nowrap',
+    backgroundColor: isDisabled ? colors.gray[1500] : colors.white,
+    width: width === 'full' ? '100%' : `max-content`,
 }));
 
+export const SelectLabelContainer = styled.div({
+    display: 'flex',
+    flexDirection: 'row' as const,
+    gap: spacing.xsm,
+    lineHeight: typography.lineHeights.none,
+    alignItems: 'center',
+    maxWidth: 'calc(100% - 54px)',
+});
+
 /**
  * Styled components specific to the Basic version of the Select component
  */
@@ -31,19 +44,30 @@ export const SelectBase = styled.div<SelectStyleProps>(({ isDisabled, isReadOnly
 interface ContainerProps {
     size: SelectSizeOptions;
     width?: number | 'full';
+    $selectLabelVariant?: SelectLabelVariants;
+    isSelected?: boolean;
 }
 
-export const Container = styled.div<ContainerProps>(({ size, width }) => ({
-    position: 'relative',
-    display: 'flex',
-    flexDirection: 'column',
-    width: width === 'full' ? '100%' : `${width}px`,
-    gap: '4px',
-    transition: sharedTransition,
-    minWidth: '175px',
-    ...getSelectFontStyles(size),
-    ...inputValueTextStyles(size),
-}));
+export const Container = styled.div<ContainerProps>(({ size, width, $selectLabelVariant, isSelected }) => {
+    const getMinWidth = () => {
+        if ($selectLabelVariant === 'labeled') {
+            return isSelected ? '145px' : '103px';
+        }
+        return '175px';
+    };
+
+    return {
+        position: 'relative',
+        display: 'flex',
+        flexDirection: 'column',
+        width: width === 'full' ? '100%' : `${width}px`,
+        gap: '4px',
+        transition: sharedTransition,
+        minWidth: getMinWidth(),
+        ...getSelectFontStyles(size),
+        ...inputValueTextStyles(size),
+    };
+});
 
 export const Dropdown = styled.div({
     position: 'absolute',
@@ -52,7 +76,7 @@ export const Dropdown = styled.div({
     right: 0,
     borderRadius: radius.md,
     background: colors.white,
-    zIndex: 1,
+    zIndex: 900,
     transition: sharedTransition,
     boxShadow: shadows.dropdown,
     padding: spacing.xsm,
@@ -98,10 +122,12 @@ export const SearchIcon = styled(Icon)({
 // Styled components for SelectValue (Selected value display)
 export const SelectValue = styled.span({
     ...inputValueTextStyles(),
+    color: colors.gray[600],
 });
 
 export const Placeholder = styled.span({
     ...inputPlaceholderTextStyles,
+    color: colors.gray[1800],
 });
 
 export const ActionButtonsContainer = styled.div({
@@ -155,15 +181,16 @@ export const LabelsWrapper = styled.div({
     flexWrap: 'wrap',
     gap: spacing.xxsm,
     maxHeight: '150px',
-    maxWidth: 'calc(100% - 54px)',
+    maxWidth: '100%',
 });
 
-export const OptionLabel = styled.label<{ isSelected: boolean; isMultiSelect?: boolean; isDisabled?: boolean }>(
-    ({ isSelected, isMultiSelect, isDisabled }) => ({
-        ...getOptionLabelStyle(isSelected, isMultiSelect, isDisabled),
-    }),
-);
-
+export const OptionLabel = styled.label<{
+    isSelected: boolean;
+    isMultiSelect?: boolean;
+    isDisabled?: boolean;
+}>(({ isSelected, isMultiSelect, isDisabled }) => ({
+    ...getOptionLabelStyle(isSelected, isMultiSelect, isDisabled),
+}));
 export const SelectAllOption = styled.div<{ isSelected: boolean; isDisabled?: boolean }>(
     ({ isSelected, isDisabled }) => ({
         cursor: isDisabled ? 'not-allowed' : 'pointer',
@@ -193,22 +220,27 @@ export const StyledCancelButton = styled(Button)({
     },
 });
 
+export const StyledIcon = styled(Icon)({
+    flexShrink: 0,
+    color: colors.gray[1800],
+});
+
 export const StyledClearButton = styled(Button)({
-    backgroundColor: colors.gray[200],
-    border: `1px solid ${colors.gray[200]}`,
-    color: colors.black,
-    padding: '1px',
+    backgroundColor: colors.transparent,
+    border: 'none',
+    color: colors.gray[1800],
+    padding: '0px',
 
     '&:hover': {
-        backgroundColor: colors.violet[100],
-        color: colors.violet[700],
-        borderColor: colors.violet[100],
+        border: 'none',
+        backgroundColor: colors.transparent,
+        borderColor: colors.transparent,
         boxShadow: shadows.none,
     },
 
     '&:focus': {
-        backgroundColor: colors.violet[100],
-        color: colors.violet[700],
+        border: 'none',
+        backgroundColor: colors.transparent,
         boxShadow: `0 0 0 2px ${colors.white}, 0 0 0 4px ${colors.violet[50]}`,
     },
 });
@@ -233,3 +265,26 @@ export const StyledCheckbox = styled(Checkbox)({
         borderColor: `${colors.violet[500]} !important`,
     },
 });
+
+export const StyledBubbleButton = styled(Button)({
+    backgroundColor: colors.gray[200],
+    border: `1px solid ${colors.gray[200]}`,
+    color: colors.black,
+    padding: '1px',
+});
+
+export const CountBadge = styled.div({
+    backgroundColor: colors.gray[200],
+    color: colors.black,
+    padding: '3px 5px',
+    borderRadius: 50,
+    fontSize: typography.fontSizes.sm,
+});
+
+export const HighlightedLabel = styled.span`
+    background-color: ${colors.gray[100]};
+    padding: 4px 6px;
+    border-radius: 8px;
+    font-size: ${typography.fontSizes.sm};
+    color: ${colors.gray[500]};
+`;
diff --git a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/SelectLabelRenderer.tsx b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/SelectLabelRenderer.tsx
new file mode 100644
index 00000000000000..8fa84adbcfbe7d
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/SelectLabelRenderer.tsx
@@ -0,0 +1,35 @@
+import { useMemo } from 'react';
+import { SelectLabelDisplayProps } from '../../types';
+import MultiSelectDefault from './variants/MultiSelectDefault';
+import MultiSelectLabeled from './variants/MultiSelectLabeled';
+import SingleSelectDefault from './variants/SingleSelectDefault';
+import SingleSelectLabeled from './variants/SingleSelectLabeled';
+
+export default function SelectLabelRenderer({ variant, ...props }: SelectLabelDisplayProps) {
+    const { isMultiSelect, options, selectedValues } = props;
+
+    const selectedOptions = useMemo(
+        () => options.filter((opt) => selectedValues.includes(opt.value)),
+        [options, selectedValues],
+    );
+
+    const getComponent = () => {
+        if (isMultiSelect) {
+            switch (variant) {
+                case 'labeled':
+                    return MultiSelectLabeled;
+                default:
+                    return MultiSelectDefault;
+            }
+        }
+
+        switch (variant) {
+            case 'labeled':
+                return SingleSelectLabeled;
+            default:
+                return SingleSelectDefault;
+        }
+    };
+
+    return getComponent()({ ...props, selectedOptions });
+}
diff --git a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectDefault.tsx b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectDefault.tsx
new file mode 100644
index 00000000000000..d34c8465ad272d
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectDefault.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import { Pill } from '@src/alchemy-components/components/Pills';
+import { LabelsWrapper, Placeholder } from '../../../components';
+import { SelectLabelVariantProps } from '../../../types';
+
+export default function MultiSelectDefault({
+    selectedOptions,
+    selectedValues,
+    disabledValues,
+    removeOption,
+    placeholder,
+    isMultiSelect,
+}: SelectLabelVariantProps) {
+    return (
+        <LabelsWrapper>
+            {!selectedValues.length && <Placeholder>{placeholder}</Placeholder>}
+            {!!selectedOptions.length &&
+                isMultiSelect &&
+                selectedOptions.map((o) => {
+                    const isDisabled = disabledValues?.includes(o.value);
+                    return (
+                        <Pill
+                            label={o.label}
+                            rightIcon={!isDisabled ? 'Close' : ''}
+                            size="sm"
+                            key={o.value}
+                            onClickRightIcon={(e) => {
+                                e.stopPropagation();
+                                removeOption?.(o);
+                            }}
+                            clickable={!isDisabled}
+                        />
+                    );
+                })}
+        </LabelsWrapper>
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectLabeled.tsx b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectLabeled.tsx
new file mode 100644
index 00000000000000..b4dc54f58ccc7c
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/MultiSelectLabeled.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import { ActionButtonsContainer, HighlightedLabel, LabelsWrapper, SelectValue } from '../../../components';
+import { SelectLabelVariantProps } from '../../../types';
+
+export default function MultiSelectLabeled({ selectedOptions, label }: SelectLabelVariantProps) {
+    return (
+        <LabelsWrapper>
+            <ActionButtonsContainer>
+                <SelectValue>{label}</SelectValue>
+                <HighlightedLabel>{selectedOptions.length}</HighlightedLabel>
+            </ActionButtonsContainer>
+        </LabelsWrapper>
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectDefault.tsx b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectDefault.tsx
new file mode 100644
index 00000000000000..3b01e118b14c87
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectDefault.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import {
+    ActionButtonsContainer,
+    DescriptionContainer,
+    LabelsWrapper,
+    Placeholder,
+    SelectValue,
+} from '../../../components';
+import { SelectLabelVariantProps } from '../../../types';
+
+export default function SingleSelectDefault({
+    selectedOptions,
+    selectedValues,
+    placeholder,
+    isMultiSelect,
+    showDescriptions,
+}: SelectLabelVariantProps) {
+    return (
+        <LabelsWrapper>
+            {!selectedValues.length && <Placeholder>{placeholder}</Placeholder>}
+            {!isMultiSelect && (
+                <>
+                    <ActionButtonsContainer>
+                        {selectedOptions[0]?.icon}
+                        <SelectValue>{selectedOptions[0]?.label}</SelectValue>
+                    </ActionButtonsContainer>
+                    {showDescriptions && !!selectedValues.length && (
+                        <DescriptionContainer>{selectedOptions[0]?.description}</DescriptionContainer>
+                    )}
+                </>
+            )}
+        </LabelsWrapper>
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectLabeled.tsx b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectLabeled.tsx
new file mode 100644
index 00000000000000..906ef165f29ef1
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Select/private/SelectLabelRenderer/variants/SingleSelectLabeled.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import {
+    ActionButtonsContainer,
+    DescriptionContainer,
+    HighlightedLabel,
+    LabelsWrapper,
+    Placeholder,
+    SelectValue,
+} from '../../../components';
+import { SelectLabelVariantProps } from '../../../types';
+
+export default function SingleSelectLabeled({
+    selectedOptions,
+    selectedValues,
+    placeholder,
+    showDescriptions,
+    label,
+}: SelectLabelVariantProps) {
+    return (
+        <LabelsWrapper>
+            {!selectedValues.length && <Placeholder>{placeholder}</Placeholder>}
+
+            {!!selectedValues.length && (
+                <ActionButtonsContainer>
+                    <SelectValue>{label}</SelectValue>
+                    <HighlightedLabel>{selectedOptions[0]?.label}</HighlightedLabel>
+                </ActionButtonsContainer>
+            )}
+
+            {showDescriptions && <DescriptionContainer>{selectedOptions[0]?.description}</DescriptionContainer>}
+        </LabelsWrapper>
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/Select/types.ts b/datahub-web-react/src/alchemy-components/components/Select/types.ts
index 5ccde408b76999..9f4419dfab7423 100644
--- a/datahub-web-react/src/alchemy-components/components/Select/types.ts
+++ b/datahub-web-react/src/alchemy-components/components/Select/types.ts
@@ -1,18 +1,26 @@
+import React from 'react';
+import { IconNames } from '../Icon';
+
 export type SelectSizeOptions = 'sm' | 'md' | 'lg';
 
 export interface SelectOption {
     value: string;
     label: string;
     description?: string;
+    icon?: React.ReactNode;
 }
 
+export type SelectLabelVariants = 'default' | 'labeled';
+
 export interface SelectProps {
     options: SelectOption[];
     label?: string;
     values?: string[];
+    initialValues?: string[];
     onCancel?: () => void;
     onUpdate?: (selectedValues: string[]) => void;
     size?: SelectSizeOptions;
+    icon?: IconNames;
     showSearch?: boolean;
     isDisabled?: boolean;
     isReadOnly?: boolean;
@@ -24,8 +32,13 @@ export interface SelectProps {
     disabledValues?: string[];
     showSelectAll?: boolean;
     selectAllLabel?: string;
-    optionListTestId?: string;
     showDescriptions?: boolean;
+    optionListTestId?: string;
+    optionSwitchable?: boolean;
+    selectLabelProps?: {
+        variant: SelectLabelVariants;
+        label: string;
+    };
 }
 
 export interface SelectStyleProps {
@@ -34,10 +47,10 @@ export interface SelectStyleProps {
     isReadOnly?: boolean;
     isRequired?: boolean;
     isOpen?: boolean;
+    width?: number | 'full';
 }
 
 export interface ActionButtonsProps {
-    fontSize?: SelectSizeOptions;
     selectedValues: string[];
     isOpen: boolean;
     isDisabled: boolean;
@@ -54,6 +67,12 @@ export interface SelectLabelDisplayProps {
     removeOption?: (option: SelectOption) => void;
     disabledValues?: string[];
     showDescriptions?: boolean;
+    variant?: SelectLabelVariants;
+    label?: string;
+}
+
+export interface SelectLabelVariantProps extends Omit<SelectLabelDisplayProps, 'variant'> {
+    selectedOptions: SelectOption[];
 }
 
 export interface SearchInputProps extends React.InputHTMLAttributes<HTMLInputElement> {
diff --git a/datahub-web-react/src/alchemy-components/components/Select/utils.ts b/datahub-web-react/src/alchemy-components/components/Select/utils.ts
index d054dd8ff737ad..c134b3800d967b 100644
--- a/datahub-web-react/src/alchemy-components/components/Select/utils.ts
+++ b/datahub-web-react/src/alchemy-components/components/Select/utils.ts
@@ -1,24 +1,29 @@
-import { borders, colors, radius, spacing, typography } from '@components/theme';
+import { colors, radius, spacing, typography } from '@components/theme';
 import { getFontSize } from '@components/theme/utils';
 
 import { SelectStyleProps } from './types';
 
-export const getOptionLabelStyle = (isSelected: boolean, isMultiSelect?: boolean, isDisabled?: boolean) => ({
-    cursor: isDisabled ? 'not-allowed' : 'pointer',
-    padding: spacing.xsm,
-    borderRadius: radius.md,
-    lineHeight: typography.lineHeights.normal,
-    backgroundColor: isSelected && !isMultiSelect ? colors.violet[100] : 'transparent',
-    color: isSelected ? colors.violet[700] : colors.gray[500],
-    fontWeight: typography.fontWeights.medium,
-    fontSize: typography.fontSizes.md,
-    display: 'flex',
-    alignItems: 'center',
-
-    '&:hover': {
-        backgroundColor: isSelected ? colors.violet[100] : colors.gray[100],
-    },
-});
+export const getOptionLabelStyle = (isSelected: boolean, isMultiSelect?: boolean, isDisabled?: boolean) => {
+    const color = isSelected ? colors.gray[600] : colors.gray[500];
+    const backgroundColor = !isDisabled && !isMultiSelect && isSelected ? colors.gray[1000] : 'transparent';
+
+    return {
+        cursor: isDisabled ? 'not-allowed' : 'pointer',
+        padding: spacing.xsm,
+        borderRadius: radius.md,
+        lineHeight: typography.lineHeights.normal,
+        backgroundColor,
+        color,
+        fontWeight: typography.fontWeights.medium,
+        fontSize: typography.fontSizes.md,
+        display: 'flex',
+        alignItems: 'center',
+
+        '&:hover': {
+            backgroundColor: isSelected ? colors.violet[100] : colors.gray[100],
+        },
+    };
+};
 
 export const getFooterButtonSize = (size) => {
     return size === 'sm' ? 'sm' : 'md';
@@ -50,13 +55,13 @@ export const getSelectFontStyles = (size) => {
 export const getSelectPadding = (size) => {
     const paddingStyles = {
         sm: {
-            padding: `${spacing.sm} ${spacing.xsm}`,
+            padding: `${spacing.xxsm} ${spacing.xxsm}`,
         },
         md: {
-            padding: `${spacing.sm} ${spacing.md}`,
+            padding: `${spacing.xsm} ${spacing.xsm}`,
         },
         lg: {
-            padding: `${spacing.md} ${spacing.sm}`,
+            padding: `${spacing.sm} ${spacing.sm}`,
         },
     };
 
@@ -84,22 +89,23 @@ export const getSelectStyle = (props: SelectStyleProps) => {
 
     const baseStyle = {
         borderRadius: radius.md,
-        border: `1px solid ${colors.gray[200]}`,
+        border: `1px solid ${isDisabled ? colors.gray[1800] : colors.gray[100]}`,
         fontFamily: typography.fonts.body,
-        color: isDisabled ? colors.gray[300] : colors.black,
+        color: isDisabled ? colors.gray[300] : colors.gray[600],
         cursor: isDisabled || isReadOnly ? 'not-allowed' : 'pointer',
-        backgroundColor: isDisabled ? colors.gray[100] : 'initial',
+        backgroundColor: isDisabled ? colors.gray[1500] : 'initial',
+        boxShadow: '0px 1px 2px 0px rgba(33, 23, 95, 0.07)',
+        textWrap: 'nowrap',
 
         '&::placeholder': {
-            color: colors.gray[400],
+            color: colors.gray[1900],
         },
 
         // Open Styles
         ...(isOpen
             ? {
-                  borderColor: colors.violet[300],
-                  boxShadow: `0px 0px 4px 0px rgba(83, 63, 209, 0.5)`,
-                  outline: 'none',
+                  borderColor: colors.gray[1800],
+                  outline: `2px solid ${colors.violet[300]}`,
               }
             : {}),
 
@@ -108,8 +114,7 @@ export const getSelectStyle = (props: SelectStyleProps) => {
             ? {}
             : {
                   '&:hover': {
-                      borderColor: colors.violet[200],
-                      outline: `${borders['1px']} ${colors.violet[200]}`,
+                      boxShadow: '0px 1px 2px 1px rgba(33, 23, 95, 0.07)',
                   },
               }),
     };
diff --git a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItemCheckboxGroup.tsx b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItemCheckboxGroup.tsx
new file mode 100644
index 00000000000000..739e6e13f5fe4f
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItemCheckboxGroup.tsx
@@ -0,0 +1,49 @@
+// CheckboxGroup.tsx
+import React, { ReactNode } from 'react';
+import styled from 'styled-components';
+import { Checkbox } from '../Checkbox';
+
+const StyledCheckboxLabel = styled.div`
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 97%;
+    padding: 0px 6px 0px 4px;
+    cursor: pointer;
+`;
+
+const StyledCheckboxGroup = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+    margin-bottom: 12px;
+`;
+
+interface SelectItemCheckboxGroupProps {
+    options: Array<{ value: string; label: ReactNode | string }>;
+    handleCheckboxToggle: (value: string) => void;
+    renderOption?: (option: { value: string; label: ReactNode | string }) => React.ReactNode;
+    selectedOptions: string[];
+}
+
+export const SelectItemCheckboxGroup: React.FC<SelectItemCheckboxGroupProps> = ({
+    options,
+    handleCheckboxToggle,
+    renderOption,
+    selectedOptions,
+}) => {
+    return (
+        <StyledCheckboxGroup>
+            {options.map((option) => (
+                <StyledCheckboxLabel key={option.value} onClick={() => handleCheckboxToggle(option.value)}>
+                    {renderOption ? renderOption(option) : <span>{option.label}</span>}
+                    <Checkbox
+                        value={option.value}
+                        isChecked={selectedOptions.includes(option.value)}
+                        onChange={() => handleCheckboxToggle(option.value)}
+                    />
+                </StyledCheckboxLabel>
+            ))}
+        </StyledCheckboxGroup>
+    );
+};
diff --git a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItemPopover.tsx b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItemPopover.tsx
new file mode 100644
index 00000000000000..c8219b47d28788
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItemPopover.tsx
@@ -0,0 +1,62 @@
+import { Popover } from 'antd';
+import React, { ReactNode } from 'react';
+import { Entity, EntityType } from '@src/types.generated';
+import { CheckboxValueType } from 'antd/lib/checkbox/Group';
+import { SelectItems } from './SelectItems';
+import './select-items-popover.less';
+
+export type SelectItemPopoverProps = {
+    entities: Entity[];
+    selectedItems: any[];
+    visible: boolean;
+    onVisibleChange: (isOpen: boolean) => void;
+    refetch?: () => void;
+    onClose?: () => void;
+    entityType: EntityType;
+    handleSelectionChange: ({
+        selectedItems,
+        removedItems,
+    }: {
+        selectedItems: CheckboxValueType[];
+        removedItems: CheckboxValueType[];
+    }) => void;
+    renderOption?: (option: { value: string; label: ReactNode | string; item?: any }) => React.ReactNode;
+    children: React.ReactNode;
+};
+
+export const SelectItemPopover = ({
+    visible,
+    onVisibleChange,
+    entities,
+    selectedItems,
+    refetch,
+    onClose,
+    entityType,
+    handleSelectionChange,
+    renderOption,
+    children,
+}: SelectItemPopoverProps) => {
+    return (
+        <Popover
+            trigger="click"
+            open={visible}
+            onOpenChange={onVisibleChange}
+            overlayClassName="select-items-popover"
+            content={
+                <SelectItems
+                    key={`${visible}`}
+                    entities={entities}
+                    selectedItems={selectedItems}
+                    refetch={refetch}
+                    onClose={onClose}
+                    entityType={entityType}
+                    handleSelectionChange={handleSelectionChange}
+                    renderOption={renderOption}
+                />
+            }
+            showArrow={false}
+        >
+            {children}
+        </Popover>
+    );
+};
diff --git a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItems.stories.tsx b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItems.stories.tsx
new file mode 100644
index 00000000000000..66c01d19904388
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItems.stories.tsx
@@ -0,0 +1,160 @@
+import React from 'react';
+import { Meta, StoryObj } from '@storybook/react';
+import { Entity, EntityType, Tag as TagType } from '@src/types.generated';
+import { MockedProvider } from '@apollo/client/testing';
+import Tag from '@src/app/sharedV2/tags/tag/Tag';
+import { EntityRegistryContext } from '@src/entityRegistryContext';
+import { Button } from 'antd';
+import {
+    defaultGlossaryTermEntities,
+    defaultTagEntities,
+    mockGlossaryTermEntityRegistry,
+    mockGlossaryTermSelectedEntities,
+    mockTagEntityRegistry,
+    mockTagSelectedEntities,
+    tagMocks,
+} from './__mock.data';
+import { SelectItemPopoverProps, SelectItemPopover } from './SelectItemPopover';
+
+// Storybook meta configuration
+const meta: Meta<SelectItemPopoverProps> = {
+    title: 'Component / Select Items Popover',
+    component: SelectItemPopover,
+    parameters: {
+        layout: 'centered',
+        docs: {
+            subtitle:
+                'A component that is used to select item on popover by just passing the Entity Type and default values',
+        },
+    },
+    decorators: [
+        (Story) => (
+            <MockedProvider mocks={tagMocks} addTypename={false}>
+                <EntityRegistryContext.Provider value={mockTagEntityRegistry}>
+                    <Story />
+                </EntityRegistryContext.Provider>
+            </MockedProvider>
+        ),
+    ],
+    // Component-level argTypes
+    argTypes: {
+        children: {
+            description: 'The trigger element for the popover. This component will display the popover when clicked.',
+            table: {
+                defaultValue: { summary: '<Button>Click Me</Button>' },
+            },
+            control: { type: 'object' },
+        },
+        handleSelectionChange: {
+            description: 'Callback function triggered when selected items are updated.',
+            table: {
+                type: { summary: '(params: { addedItems: Entity[], removedItems: Entity[] }) => void' },
+            },
+            control: false,
+        },
+        refetch: {
+            description: 'Function to trigger a refetch of data when needed.',
+            table: {
+                type: { summary: '() => void' },
+            },
+            control: false,
+        },
+        onClose: {
+            description: 'Callback function triggered when the popover is closed.',
+            table: {
+                type: { summary: '() => void' },
+            },
+            control: false,
+        },
+        entities: {
+            description: 'List of available entity options to select from.',
+            table: {
+                type: { summary: 'Entity[]' },
+            },
+            control: { type: 'object' },
+        },
+        selectedItems: {
+            description: 'List of entities that are currently selected.',
+            table: {
+                type: { summary: 'Entity[]' },
+            },
+            control: { type: 'object' },
+        },
+        entityType: {
+            description: 'Type of entity being selected, e.g., Tag or GlossaryTerm.',
+            table: {
+                type: { summary: 'EntityType' },
+                defaultValue: { summary: 'EntityType.Tag' },
+            },
+            control: {
+                type: 'select',
+                options: Object.values(EntityType),
+            },
+        },
+        renderOption: {
+            description: 'Custom renderer function for each option in the select list.',
+            table: {
+                type: { summary: '(option: { item: Entity }) => React.ReactNode' },
+            },
+            control: false,
+        },
+    },
+    args: {
+        children: <Button>Open Popover</Button>,
+        handleSelectionChange: ({ selectedItems, removedItems }) => {
+            console.log('Newly Selected Items:', selectedItems);
+            console.log('Removed Items:', removedItems);
+        },
+        refetch: () => console.log('Refetch triggered'),
+        onClose: () => console.log('Close triggered'),
+    },
+    tags: ['autodocs'],
+};
+
+export default meta;
+type Story = StoryObj<SelectItemPopoverProps>;
+
+// Story with Tag Selector
+export const TagSelector: Story = {
+    decorators: [
+        (Story) => (
+            <MockedProvider mocks={tagMocks} addTypename={false}>
+                <EntityRegistryContext.Provider value={mockTagEntityRegistry}>
+                    <Story />
+                </EntityRegistryContext.Provider>
+            </MockedProvider>
+        ),
+    ],
+    args: {
+        entities: defaultTagEntities as unknown as Entity[],
+        selectedItems: mockTagSelectedEntities,
+        entityType: EntityType.Tag,
+        renderOption: (option) => {
+            return (
+                <Tag
+                    tag={{ tag: option.item as TagType, associatedUrn: option.item?.urn }}
+                    options={{ shouldNotOpenDrawerOnClick: true }}
+                    maxWidth={120}
+                />
+            );
+        },
+    },
+};
+
+// Story with GlossaryTerm Selector
+export const GlossaryTermSelectorWithoutCustomizeRenderingOptions: Story = {
+    decorators: [
+        (Story) => (
+            <MockedProvider mocks={tagMocks} addTypename={false}>
+                <EntityRegistryContext.Provider value={mockGlossaryTermEntityRegistry}>
+                    <Story />
+                </EntityRegistryContext.Provider>
+            </MockedProvider>
+        ),
+    ],
+    args: {
+        entities: defaultGlossaryTermEntities as unknown as Entity[],
+        selectedItems: mockGlossaryTermSelectedEntities,
+        entityType: EntityType.GlossaryTerm,
+    },
+};
diff --git a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItems.tsx b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItems.tsx
new file mode 100644
index 00000000000000..75b14b365b3256
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/SelectItems.tsx
@@ -0,0 +1,217 @@
+import React, { ReactNode } from 'react';
+import { Button, Checkbox, Empty, Typography } from 'antd';
+import styled from 'styled-components';
+import { LoadingOutlined } from '@ant-design/icons';
+import { Entity, EntityType } from '@src/types.generated';
+import { CheckboxValueType } from 'antd/lib/checkbox/Group';
+import { REDESIGN_COLORS } from '@src/app/entityV2/shared/constants';
+import { AcrylListSearch } from '@src/app/entityV2/shared/components/ListSearch/AcrylListSearch';
+import { useEntityRegistry } from '@src/app/useEntityRegistry';
+import { useEntityOperations } from './hooks'; // Import your custom hook
+import { SelectItemCheckboxGroup } from './SelectItemCheckboxGroup';
+
+export interface SelectItemsProps {
+    entities: Entity[];
+    selectedItems: any[];
+    refetch?: () => void;
+    onClose?: () => void;
+    entityType: EntityType;
+    handleSelectionChange: ({
+        selectedItems,
+        removedItems,
+    }: {
+        selectedItems: CheckboxValueType[];
+        removedItems: CheckboxValueType[];
+    }) => void;
+    renderOption?: (option: { value: string; label: ReactNode | string; item?: any }) => React.ReactNode;
+}
+
+const StyledSubSection = styled(Typography.Text)`
+    margin-bottom: 12px;
+    display: flex;
+    justify-content: space-between;
+    font-weight: 700;
+    line-height: 15.06px;
+    color: #5f6685;
+`;
+
+const StyledFooter = styled.div`
+    display: flex;
+    justify-content: center;
+    gap: 16px;
+    padding: 8px 0 0 0;
+    border-top: 1px solid ${REDESIGN_COLORS.SILVER_GREY};
+`;
+
+const StyledSelectContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    padding-bottom: 4px;
+    padding-top: 8px;
+`;
+
+const StyledGroupSection = styled.div`
+    &&& .ant-empty.ant-empty-normal {
+        margin: 0 !important;
+    }
+`;
+
+const StyledResetButton = styled(Button)`
+    background-color: ${REDESIGN_COLORS.ICON_ON_DARK};
+    border: 1px solid ${REDESIGN_COLORS.GREY_300};
+    color: ${REDESIGN_COLORS.GREY_300};
+    border-radius: 4px;
+`;
+
+const StyledUpdateButton = styled(Button)`
+    background-color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    border: 1px solid ${REDESIGN_COLORS.TITLE_PURPLE};
+    color: ${REDESIGN_COLORS.WHITE};
+    border-radius: 4px;
+`;
+
+const StyledCheckBoxContainer = styled.div`
+    max-height: 250px;
+    min-height: 250px;
+    overflow: auto;
+    width: 100%;
+    padding: 12px 0;
+`;
+
+const StyledLoader = styled.div`
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    min-height: 250px;
+    width: 100%;
+`;
+
+const StyledEmpty = styled(Empty)`
+    .ant-empty-image {
+        display: none;
+    }
+    color: #8d95b1;
+    margin-bottom 12px;
+`;
+
+export const SelectItems: React.FC<SelectItemsProps> = ({
+    entities,
+    selectedItems,
+    refetch,
+    onClose,
+    entityType,
+    handleSelectionChange,
+    renderOption,
+}) => {
+    const {
+        filteredAddableOptions,
+        filteredPreviouslyAddedOptions,
+        selectedOptions,
+        setSelectedOptions,
+        handleUpdate,
+        previouslyAddedOptions,
+        searchText,
+        handleSearchEntities,
+        entitySearchResultsLoading,
+        searchData,
+    } = useEntityOperations({
+        selectedItems,
+        refetch,
+        entities,
+        onClose,
+        entityType,
+        handleSelectionChange,
+    });
+
+    const entityRegistry = useEntityRegistry();
+
+    const handleCheckboxToggle = (urn: string) => {
+        const options = selectedOptions ? [...selectedOptions] : [];
+        if (options?.includes(urn)) {
+            const index = options.indexOf(urn);
+            options?.splice(index, 1);
+        } else {
+            options.push(urn);
+        }
+        setSelectedOptions(options);
+    };
+
+    const handleContainerClick = (e: React.MouseEvent) => {
+        e.stopPropagation(); // Prevent the row click event from triggering
+    };
+
+    const isLoading = !searchData && entitySearchResultsLoading;
+    const hasAddableEntitiesMatchingFilters = filteredAddableOptions?.length > 0;
+    const hasExistingEntitiesMatchingFilters = filteredPreviouslyAddedOptions?.length > 0;
+    const hasExistingEntities = previouslyAddedOptions?.length > 0;
+    const entityName = entityRegistry.getCollectionName(entityType)?.toLowerCase();
+    const emptyMessage = `No ${entityName} found`;
+    return (
+        <StyledSelectContainer onClick={handleContainerClick}>
+            <AcrylListSearch
+                searchText={searchText}
+                debouncedSetFilterText={handleSearchEntities}
+                matchResultCount={filteredPreviouslyAddedOptions?.length + filteredAddableOptions?.length}
+                numRows={searchData?.autoComplete?.entities?.length || 0}
+                entityTypeName={entityType}
+                options={{ hidePrefix: true, hideMatchCountText: true, placeholder: 'Search for tags...' }}
+            />
+            {isLoading ? (
+                <StyledLoader>
+                    <LoadingOutlined />
+                </StyledLoader>
+            ) : (
+                <StyledCheckBoxContainer>
+                    <Checkbox.Group value={selectedOptions} style={{ width: '100%' }}>
+                        {hasExistingEntities ? (
+                            <StyledGroupSection>
+                                <StyledSubSection>Selected</StyledSubSection>
+                                {hasExistingEntitiesMatchingFilters && (
+                                    <SelectItemCheckboxGroup
+                                        selectedOptions={selectedOptions}
+                                        handleCheckboxToggle={handleCheckboxToggle}
+                                        options={filteredPreviouslyAddedOptions}
+                                        renderOption={renderOption}
+                                    />
+                                )}
+
+                                {!hasExistingEntitiesMatchingFilters && searchText && (
+                                    <StyledEmpty description={emptyMessage} />
+                                )}
+                            </StyledGroupSection>
+                        ) : null}
+                        <StyledGroupSection>
+                            {(hasExistingEntitiesMatchingFilters || searchText) && (
+                                <StyledSubSection>Add more</StyledSubSection>
+                            )}
+                            {hasAddableEntitiesMatchingFilters && (
+                                <SelectItemCheckboxGroup
+                                    selectedOptions={selectedOptions}
+                                    handleCheckboxToggle={handleCheckboxToggle}
+                                    options={filteredAddableOptions}
+                                    renderOption={renderOption}
+                                />
+                            )}
+                            {!hasAddableEntitiesMatchingFilters && searchText && (
+                                <StyledEmpty description={emptyMessage} />
+                            )}
+                        </StyledGroupSection>
+                    </Checkbox.Group>
+                </StyledCheckBoxContainer>
+            )}
+            <StyledFooter>
+                {hasExistingEntities && (
+                    <StyledResetButton onClick={() => handleUpdate({ isRemoveAll: true })}>
+                        Remove All
+                    </StyledResetButton>
+                )}
+                <StyledUpdateButton
+                    style={{ width: !hasExistingEntities ? '100%' : '' }}
+                    onClick={() => handleUpdate({})}
+                >
+                    Update
+                </StyledUpdateButton>
+            </StyledFooter>
+        </StyledSelectContainer>
+    );
+};
diff --git a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/__mock.data.ts b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/__mock.data.ts
new file mode 100644
index 00000000000000..ec640ce6027483
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/__mock.data.ts
@@ -0,0 +1,359 @@
+/* eslint-disable */
+import EntityRegistry from '@src/app/entity/EntityRegistry';
+import { GetAutoCompleteResultsDocument } from '@src/graphql/search.generated';
+import { Entity, EntityType } from '@src/types.generated';
+
+// Mock data for entities and selected entities
+export const defaultTagEntities = [
+    {
+        urn: 'urn:li:tag:1',
+        name: 'Tag 1',
+        item: {
+            tag: {
+                __typename: 'Tag',
+                urn: 'urn:li:tag:1',
+                type: 'TAG',
+                name: 'Usage - C1',
+                description: 'Usage - C',
+                properties: { __typename: 'TagProperties', name: 'Usage - C1' },
+            },
+        },
+    },
+    {
+        urn: 'urn:li:tag:2',
+        name: 'Tag 2',
+        item: {
+            tag: {
+                __typename: 'Tag',
+                urn: 'urn:li:tag:2',
+                type: 'TAG',
+                name: 'Usage - C2',
+                description: 'Usage - C',
+                properties: { __typename: 'TagProperties', name: 'Usage - C2' },
+            },
+        },
+    },
+    {
+        urn: 'urn:li:tag:3',
+        name: 'Tag 3',
+        item: {
+            tag: {
+                __typename: 'Tag',
+                urn: 'urn:li:tag:3',
+                type: 'TAG',
+                name: 'Usage - C3',
+                description: 'Usage - C',
+                properties: { __typename: 'TagProperties', name: 'Usage - C3' },
+            },
+        },
+    },
+];
+
+const mockTagEntity: Entity = {
+    type: EntityType.Tag, // Add the required 'type' property
+    urn: 'urn:li:tag:1',
+    name: 'Tag 1',
+    icon: () => null, // Mock icon function
+    isSearchEnabled: () => true,
+    isBrowseEnabled: () => true,
+    isLineageEnabled: () => true,
+    getCollectionName: () => 'tag',
+    getPathName: () => 'tag',
+    getGraphName: () => 'TagGraph',
+    renderPreview: () => null,
+    renderProfile: () => null,
+    displayName: (data) => {
+        return data.name;
+    },
+    getEntityName: (type) => {
+        return type;
+    },
+    // Add other methods required by Entity interface
+} as Entity;
+
+const mockGlossaryTermEntity: Entity = {
+    type: EntityType.GlossaryTerm, // Add the required 'type' property
+    urn: 'urn:li:glossaryTerm:1',
+    name: 'Tag 1',
+    icon: () => null, // Mock icon function
+    isSearchEnabled: () => true,
+    isBrowseEnabled: () => true,
+    isLineageEnabled: () => true,
+    getCollectionName: () => 'glossary terms',
+    getPathName: () => 'GlossaryTerm',
+    getGraphName: () => 'GlossaryTermGraph',
+    renderPreview: () => null,
+    renderProfile: () => null,
+    displayName: (data) => {
+        return data.name;
+    },
+    getEntityName: (type) => {
+        return type;
+    },
+    // Add other methods required by Entity interface
+} as Entity;
+
+export const mockTagSelectedEntities = [{ urn: 'urn:li:tag:1', name: 'Tag 1' }];
+
+export const mockTagEntityRegistry = new EntityRegistry();
+mockTagEntityRegistry.entityTypeToEntity = new Map();
+// @ts-expect-error
+mockTagEntityRegistry.entityTypeToEntity.set(EntityType.Tag, mockTagEntity);
+
+export const mockGlossaryTermEntityRegistry = new EntityRegistry();
+mockGlossaryTermEntityRegistry.entityTypeToEntity = new Map();
+// @ts-expect-error
+mockGlossaryTermEntityRegistry.entityTypeToEntity.set(EntityType.GlossaryTerm, mockGlossaryTermEntity);
+
+export const tagMocks = [
+    {
+        request: {
+            query: GetAutoCompleteResultsDocument,
+            variables: {
+                input: {
+                    type: 'TAG',
+                    query: 'a',
+                    limit: 10,
+                },
+            },
+        },
+        result: {
+            data: {
+                autoComplete: {
+                    query: 'a',
+                    suggestions: [
+                        'Metadata Completeness - A',
+                        'Usage - A',
+                        'analytics-team-access',
+                        'example tag',
+                        'ATTRIBUTE',
+                    ],
+                    entities: [
+                        {
+                            urn: 'urn:li:tag:Metadata Completeness - A',
+                            type: 'TAG',
+                            name: 'Metadata Completeness - A',
+                            properties: {
+                                name: 'Metadata Completeness - A',
+                                colorHex: null,
+                                __typename: 'Tag',
+                            },
+                            __typename: 'Tag',
+                        },
+                        {
+                            urn: 'urn:li:tag:Usage - A',
+                            type: 'TAG',
+                            name: 'Usage - A',
+                            properties: {
+                                name: 'Usage - A',
+                                colorHex: null,
+                            },
+                            __typename: 'Tag',
+                        },
+                    ],
+                },
+            },
+        },
+    },
+];
+
+export const defaultGlossaryTermEntities = [
+    {
+        urn: 'urn:li:glossaryTerm:Classification.Sensitive',
+        type: 'GLOSSARY_TERM',
+        name: 'Sensitive',
+        hierarchicalName: 'Classification.Sensitive',
+        properties: {
+            name: 'Sensitive',
+            __typename: 'GlossaryTermProperties',
+        },
+        parentNodes: {
+            count: 1,
+            nodes: [
+                {
+                    urn: 'urn:li:glossaryNode:Classification',
+                    type: 'GLOSSARY_NODE',
+                    properties: {
+                        name: 'Classification',
+                        __typename: 'GlossaryNodeProperties',
+                    },
+                    displayProperties: null,
+                    __typename: 'GlossaryNode',
+                },
+            ],
+            __typename: 'ParentNodesResult',
+        },
+        __typename: 'GlossaryTerm',
+    },
+    {
+        urn: 'urn:li:glossaryTerm:PIITerms.SSN',
+        type: 'GLOSSARY_TERM',
+        name: 'SSN',
+        hierarchicalName: 'PIITerms.SSN',
+        properties: {
+            name: 'SSN',
+            __typename: 'GlossaryTermProperties',
+        },
+        parentNodes: {
+            count: 1,
+            nodes: [
+                {
+                    urn: 'urn:li:glossaryNode:PIITerms',
+                    type: 'GLOSSARY_NODE',
+                    properties: {
+                        name: 'Information Types',
+                        __typename: 'GlossaryNodeProperties',
+                    },
+                    displayProperties: null,
+                    __typename: 'GlossaryNode',
+                },
+            ],
+            __typename: 'ParentNodesResult',
+        },
+        __typename: 'GlossaryTerm',
+    },
+    {
+        urn: 'urn:li:glossaryTerm:PIITerms.ShippingAddress',
+        type: 'GLOSSARY_TERM',
+        name: 'ShippingAddress',
+        hierarchicalName: 'PIITerms.ShippingAddress',
+        properties: {
+            name: 'ShippingAddress',
+            __typename: 'GlossaryTermProperties',
+        },
+        parentNodes: {
+            count: 1,
+            nodes: [
+                {
+                    urn: 'urn:li:glossaryNode:PIITerms',
+                    type: 'GLOSSARY_NODE',
+                    properties: {
+                        name: 'Information Types',
+                        __typename: 'GlossaryNodeProperties',
+                    },
+                    displayProperties: null,
+                    __typename: 'GlossaryNode',
+                },
+            ],
+            __typename: 'ParentNodesResult',
+        },
+        __typename: 'GlossaryTerm',
+    },
+    {
+        urn: 'urn:li:glossaryTerm:PersonalInformation.SocialSecurityNumber',
+        type: 'GLOSSARY_TERM',
+        name: 'SocialSecurityNumber',
+        hierarchicalName: 'PersonalInformation.SocialSecurityNumber',
+        properties: {
+            name: 'SocialSecurityNumber',
+            __typename: 'GlossaryTermProperties',
+        },
+        parentNodes: {
+            count: 1,
+            nodes: [
+                {
+                    urn: 'urn:li:glossaryNode:PersonalInformation',
+                    type: 'GLOSSARY_NODE',
+                    properties: {
+                        name: 'Personal Information - Domestic (PII)',
+                        __typename: 'GlossaryNodeProperties',
+                    },
+                    displayProperties: null,
+                    __typename: 'GlossaryNode',
+                },
+            ],
+            __typename: 'ParentNodesResult',
+        },
+        __typename: 'GlossaryTerm',
+    },
+    {
+        urn: 'urn:li:glossaryTerm:PIITerms2.SecurityNumber',
+        type: 'GLOSSARY_TERM',
+        name: 'SecurityNumber',
+        hierarchicalName: 'PIITerms2.SecurityNumber',
+        properties: {
+            name: 'SocialSecurityNumber',
+            __typename: 'GlossaryTermProperties',
+        },
+        parentNodes: {
+            count: 1,
+            nodes: [
+                {
+                    urn: 'urn:li:glossaryNode:PIITerms2',
+                    type: 'GLOSSARY_NODE',
+                    properties: {
+                        name: 'Personal Information - Domestic (PII)',
+                        __typename: 'GlossaryNodeProperties',
+                    },
+                    displayProperties: null,
+                    __typename: 'GlossaryNode',
+                },
+            ],
+            __typename: 'ParentNodesResult',
+        },
+        __typename: 'GlossaryTerm',
+    },
+];
+export const mockGlossaryTermSelectedEntities = [
+    { urn: 'urn:li:glossaryTerm:Classification.Sensitive', name: 'Sensitive' },
+];
+
+export const glossaryTermMocks = [
+    {
+        request: {
+            query: GetAutoCompleteResultsDocument,
+            variables: {
+                input: {
+                    type: 'GLOSSARY_TERM',
+                    query: 'b',
+                    limit: 10,
+                },
+            },
+        },
+        result: {
+            data: {
+                autoComplete: {
+                    query: 'b',
+                    suggestions: [
+                        'Classification.Sensitive',
+                        'PIITerms.SSN',
+                        'PIITerms.ShippingAddress',
+                        'PersonalInformation.SocialSecurityNumber',
+                        '079618b2-7972-4d5d-bdb0-e55ac54f4bac',
+                        '18ff11b1-402d-475a-b79f-c74befc28823',
+                        '2458ac44-e484-41b9-aaaa-7a9166451555',
+                        '339b7f42-1eec-4af9-ae24-e2064fb4ddf8',
+                        '77a6b516562a18ce0f3d3f43fe513547',
+                        '86e1d17052ef5cb737d884d6067cd82c',
+                    ],
+                    entities: [
+                        {
+                            urn: 'urn:li:glossaryTerm:PIITerms.Age',
+                            type: 'GLOSSARY_TERM',
+                            name: 'Age',
+                            hierarchicalName: 'PIITerms.Age',
+                            properties: {
+                                name: 'Age',
+                            },
+                            parentNodes: {
+                                count: 1,
+                                nodes: [
+                                    {
+                                        urn: 'urn:li:glossaryNode:PIITerms',
+                                        type: 'GLOSSARY_NODE',
+                                        properties: {
+                                            name: 'Information Types',
+                                            __typename: 'GlossaryNodeProperties',
+                                        },
+                                        displayProperties: null,
+                                        __typename: 'GlossaryNode',
+                                    },
+                                ],
+                            },
+                        },
+                    ],
+                },
+            },
+        },
+    },
+];
diff --git a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/hooks.tsx b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/hooks.tsx
new file mode 100644
index 00000000000000..95a5faadfd36b1
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/hooks.tsx
@@ -0,0 +1,168 @@
+import { useState, useEffect } from 'react';
+import { EntityType } from '@src/types.generated';
+import { useGetAutoCompleteResultsLazyQuery } from '@src/graphql/search.generated';
+import { debounce } from 'lodash';
+import { useEntityRegistry } from '@src/app/useEntityRegistry';
+
+interface UseUpdateEntityParams {
+    selectedItems: any[];
+    entityType: EntityType;
+    refetch?: () => void;
+    onClose?: () => void;
+    entities: any[];
+    searchLimit?: number;
+    handleSelectionChange: ({
+        selectedItems,
+        removedItems,
+    }: {
+        selectedItems: string[];
+        removedItems: string[];
+    }) => void;
+}
+
+type SelectOption = { label: string; value: string; item: any };
+
+const MAX_EXISTING_SEARCH_RESULTS = 2; // Max results for previously added entities
+const DEBOUNCE_DELAY_TO_SEARCH_ENTITY_MS = 300;
+
+export const useEntityOperations = ({
+    selectedItems,
+    entities,
+    searchLimit = 10,
+    entityType,
+    handleSelectionChange,
+}: UseUpdateEntityParams) => {
+    const [searchText, setSearchText] = useState<string>(''); // Tracks the current search input
+    const entityRegistry = useEntityRegistry();
+
+    // State for organizing entity options
+    const [previouslyAddedOptions, setPreviouslyAddedOptions] = useState<SelectOption[]>([]); // Entities already added
+    const [selectedOptions, setSelectedOptions] = useState<string[]>([]); // User's current selections
+
+    // Filtered entity options based on search results or already added entities
+    const [filteredAddableOptions, setFilteredAddableOptions] = useState<SelectOption[]>([]);
+    const [filteredPreviouslyAddedOptions, setFilteredPreviouslyAddedOptions] = useState<SelectOption[]>([]);
+
+    // Lazy query for searching entity terms via GraphQL
+    const [entitySearch, { data: searchData, loading: entitySearchResultsLoading }] =
+        useGetAutoCompleteResultsLazyQuery();
+
+    // Handles search input for entity autocomplete
+    const handleSearchEntities = (e: React.ChangeEvent<HTMLInputElement>) => {
+        const { value } = e.target;
+        setSearchText(value);
+    };
+
+    useEffect(() => {
+        if (searchText.length > 0) {
+            const debouncedSearch = debounce(() => {
+                entitySearch({
+                    variables: {
+                        input: {
+                            type: entityType,
+                            query: searchText,
+                            limit: searchLimit,
+                        },
+                    },
+                });
+            }, DEBOUNCE_DELAY_TO_SEARCH_ENTITY_MS);
+            debouncedSearch();
+
+            // Cleanup debounce on unmount or when searchText changes
+            return () => debouncedSearch.cancel();
+        }
+        return undefined; // Explicitly return undefined when searchText is empty
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [searchText, entitySearch]);
+
+    const getOptionsFromEntities = (allEntities) => {
+        return allEntities?.map((entity) => ({
+            label: entityRegistry.getEntityName(entity.type),
+            value: entity?.urn,
+            item: entity,
+        }));
+    };
+
+    // Updates entity options based on current search or selected entities
+    const assignEntitiesOptions = (allEntities) => {
+        // Convert all entities to option objects
+        const allOptions = getOptionsFromEntities(allEntities);
+
+        const selectedEntityOptions = selectedItems?.map((item) => item.urn);
+
+        // No search text: Filter based on already selected entities
+        if (!searchText?.length) {
+            // Entities already selected
+            const prevOptions = getOptionsFromEntities(selectedItems);
+            setPreviouslyAddedOptions(prevOptions);
+            setFilteredPreviouslyAddedOptions(prevOptions);
+
+            // Entities available to add
+            const otherEntities = entities.filter((item) => !selectedEntityOptions?.includes(item?.urn));
+            const otherOptions = getOptionsFromEntities(otherEntities);
+            setFilteredAddableOptions(otherOptions);
+        } else {
+            // Search text present: Filter options based on the search
+
+            // Entities already selected, limited to max results
+            const prevOptions = allOptions.filter((option) => selectedEntityOptions?.includes(option.value));
+            setFilteredPreviouslyAddedOptions(prevOptions.slice(0, MAX_EXISTING_SEARCH_RESULTS));
+
+            // Entities available to add, excluding already selected
+            const otherOptions = allOptions.filter((option) => !selectedEntityOptions?.includes(option.value));
+            setFilteredAddableOptions(otherOptions);
+        }
+    };
+
+    // Updates selected entities when `selectedItems` changes
+    useEffect(() => {
+        const selectedEntityOptions = selectedItems?.map((item) => item.urn);
+        setSelectedOptions(selectedEntityOptions);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [selectedItems]);
+
+    // Updates entity options based on search results or entity list
+    useEffect(() => {
+        const searchResults = searchData?.autoComplete?.entities || [];
+        const allEntities = searchText ? searchResults : entities;
+        assignEntitiesOptions(allEntities);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [searchText, searchData]);
+
+    // Updates entity options when `entities` or `selectedItems` changes
+    useEffect(() => {
+        if (entities.length) {
+            assignEntitiesOptions(entities);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [selectedItems, entities]);
+
+    // Handles updating entities (add and remove)
+    const handleUpdate = async ({ isRemoveAll }: { isRemoveAll?: boolean }) => {
+        const olderSelectedEntities = selectedItems?.map((item) => item.urn);
+        // if isRemoveAll is true then remove all the older selected entity
+        const removedItems = isRemoveAll
+            ? olderSelectedEntities
+            : olderSelectedEntities?.filter((entity) => !selectedOptions?.includes(entity));
+
+        // if isRemoveAll is true then remove all the newly selected entity
+        const addedItems = isRemoveAll
+            ? []
+            : selectedOptions.filter((entity) => !olderSelectedEntities?.includes(entity));
+        handleSelectionChange({ selectedItems: addedItems, removedItems });
+        setSearchText('');
+    };
+
+    return {
+        filteredAddableOptions,
+        filteredPreviouslyAddedOptions,
+        previouslyAddedOptions,
+        selectedOptions,
+        setSelectedOptions,
+        handleUpdate,
+        searchText,
+        handleSearchEntities,
+        entitySearchResultsLoading,
+        searchData,
+    };
+};
diff --git a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/index.ts b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/index.ts
new file mode 100644
index 00000000000000..ab7780df93bdb9
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/index.ts
@@ -0,0 +1 @@
+export { SelectItemPopover } from './SelectItemPopover';
diff --git a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/select-items-popover.less b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/select-items-popover.less
new file mode 100644
index 00000000000000..677bad8ac205e3
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/select-items-popover.less
@@ -0,0 +1,3 @@
+.select-items-popover .ant-popover-inner-content {
+    padding: 6px 8px !important;
+}
diff --git a/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/types.ts b/datahub-web-react/src/alchemy-components/components/SelectItemsPopover/types.ts
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/datahub-web-react/src/alchemy-components/components/Table/Table.stories.tsx b/datahub-web-react/src/alchemy-components/components/Table/Table.stories.tsx
index 3a36b658978066..9e15ca91e23531 100644
--- a/datahub-web-react/src/alchemy-components/components/Table/Table.stories.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Table/Table.stories.tsx
@@ -1,7 +1,9 @@
 import { BADGE } from '@geometricpanda/storybook-addon-badges';
+import { AlignmentOptions } from '@src/alchemy-components/theme/config';
 import { Meta, StoryObj } from '@storybook/react';
-import React from 'react';
+import React, { useState } from 'react';
 import { Table, tableDefaults } from '.';
+import { SortingState } from './types';
 
 // Auto Docs
 const meta = {
@@ -61,6 +63,34 @@ const meta = {
                 defaultValue: { summary: tableDefaults.maxHeight },
             },
         },
+        isBorderless: {
+            description: 'Whether the table is borderless.',
+            control: 'boolean',
+            table: {
+                defaultValue: { summary: tableDefaults.isBorderless?.toString() },
+            },
+        },
+        onRowClick: {
+            description: 'Callback function for row click.',
+        },
+        rowClassName: {
+            description: 'Callback to get class name for the rows.',
+        },
+        onExpand: {
+            description: 'Callback for when a row is expanded.',
+        },
+        expandable: {
+            description: 'Set of props when a row is expandable.',
+            control: false,
+        },
+        rowRefs: {
+            description: 'List of refs for table rows.',
+            control: false,
+        },
+        headerRef: {
+            description: 'Ref for table header.',
+            control: false,
+        },
     },
 
     // Define defaults
@@ -77,6 +107,7 @@ const meta = {
         isLoading: tableDefaults.isLoading,
         isScrollable: tableDefaults.isScrollable,
         maxHeight: tableDefaults.maxHeight,
+        isBorderless: tableDefaults.isBorderless,
     },
 } satisfies Meta<typeof Table<any>>;
 
@@ -93,6 +124,7 @@ export const sandbox: Story = {
     render: (props) => <Table {...props} />,
 };
 
+// Scrollable Table with a maximum height
 export const withScroll = () => (
     <Table
         columns={[
@@ -112,6 +144,7 @@ export const withScroll = () => (
     />
 );
 
+// Table with custom column widths
 export const withCustomColumnWidths = () => (
     <Table
         columns={[
@@ -127,6 +160,7 @@ export const withCustomColumnWidths = () => (
     />
 );
 
+// Table with column sorting functionality
 export const withColumnSorting = () => (
     <Table
         columns={[
@@ -147,6 +181,7 @@ export const withColumnSorting = () => (
     />
 );
 
+// Table without a header
 export const withoutHeader = () => (
     <Table
         columns={[
@@ -160,3 +195,175 @@ export const withoutHeader = () => (
         showHeader={false}
     />
 );
+
+// Table with clickable rows
+export const ClickableRows = () => {
+    const [selectedRow, setSelectedRow] = useState<number | undefined>();
+
+    return (
+        <Table
+            columns={[
+                { title: 'Key', key: 'key', dataIndex: 'key' },
+                { title: 'Column 1', key: 'column1', dataIndex: 'column1' },
+                { title: 'Column 2', key: 'column2', dataIndex: 'column2' },
+            ]}
+            data={[
+                { key: 1, column1: 'Row 1 Col 1', column2: 'Row 1 Col 2' },
+                { key: 2, column1: 'Row 2 Col 1', column2: 'Row 2 Col 2' },
+            ]}
+            onRowClick={(record) => setSelectedRow(record.key)}
+            rowClassName={(record) => (record.key === selectedRow ? 'selected-row' : '')}
+        />
+    );
+};
+
+// Define columns for the grouped table. Each column specifies its title, data key, and optional functionalities like sorting or custom rendering.
+const groupByColumns = [
+    {
+        key: 'id',
+        title: 'ID',
+        width: '10%',
+        render: (record) => <div>{record.id}</div>,
+    },
+    {
+        key: 'name',
+        title: 'Name',
+        width: '30%',
+        render: (record) => <div>{record.name}</div>,
+        sorter: (a: any, b: any) => a - b,
+    },
+    {
+        key: 'status',
+        title: 'Status',
+        width: '20%',
+        sorter: (a: any, b: any) => a - b,
+        render: (record) => <div>{record.status}</div>,
+    },
+    {
+        key: 'createdAt',
+        title: 'Created At',
+        width: '25%',
+        render: (record) => <div>{record.createdAt}</div>,
+    },
+    {
+        title: '',
+        dataIndex: '',
+        key: 'actions',
+        width: '15%',
+        render: (record) => {
+            return !record.children && <div>actions</div>;
+        },
+        alignment: 'right' as AlignmentOptions,
+    },
+];
+
+// Hierarchical data with parent rows and nested child rows for group-by table functionality.
+const groupByData = [
+    {
+        id: '1',
+        name: 'Parent Row 1',
+        status: 'Active',
+        createdAt: '2024-11-20',
+        children: [
+            {
+                id: '1.1',
+                name: 'Child Row 1.1',
+                status: 'Active',
+                createdAt: '2024-11-21',
+            },
+            {
+                id: '1.2',
+                name: 'Child Row 1.2',
+                status: 'Inactive',
+                createdAt: '2024-11-22',
+            },
+        ],
+    },
+    {
+        id: '2',
+        name: 'Parent Row 2',
+        status: 'Inactive',
+        createdAt: '2024-11-19',
+        children: [
+            {
+                id: '2.1',
+                name: 'Child Row 2.1',
+                status: 'Active',
+                createdAt: '2024-11-21',
+            },
+            {
+                id: '2.2',
+                name: 'Child Row 2.2',
+                status: 'Inactive',
+                createdAt: '2024-11-22',
+            },
+        ],
+    },
+];
+
+// Table with group-by functionality and expandable rows
+export const WithGroupByFunctionality = () => {
+    const [expandedRowKeys, setExpandedRowKeys] = useState(['Parent Row 1']);
+    const [sortedOptions, setSortedOptions] = useState<{ sortColumn: string; sortOrder: SortingState }>({
+        sortColumn: '',
+        sortOrder: SortingState.ORIGINAL,
+    });
+    const onExapand = (record: any) => {
+        const key = record.name;
+        setExpandedRowKeys((prev: any) => (prev.includes(key) ? prev.filter((k) => k !== key) : [...prev, key]));
+    };
+    const getSortedRecord = (record) => {
+        const { sortOrder, sortColumn } = sortedOptions;
+        if (sortOrder === SortingState.ORIGINAL) {
+            return record.children;
+        }
+
+        const sortFunctions = {
+            status: {
+                [SortingState.ASCENDING]: (a, b) => a.name.localeCompare(b.name),
+                [SortingState.DESCENDING]: (a, b) => b.name.localeCompare(a.name),
+            },
+            name: {
+                [SortingState.ASCENDING]: (a, b) => a.name.localeCompare(b.name),
+                [SortingState.DESCENDING]: (a, b) => b.name.localeCompare(a.name),
+            },
+        };
+        const sortFunction = sortFunctions[sortColumn]?.[sortOrder];
+
+        const data = sortFunction ? [...record.children].sort(sortFunction) : record.children;
+
+        return data;
+    };
+
+    return (
+        <Table
+            columns={groupByColumns}
+            data={groupByData}
+            handleSortColumnChange={({ sortColumn, sortOrder }: { sortColumn: string; sortOrder: SortingState }) =>
+                setSortedOptions({ sortColumn, sortOrder })
+            }
+            expandable={{
+                expandedRowRender: (record) => {
+                    let sortedRecord = record.children;
+                    if (sortedOptions.sortColumn && sortedOptions.sortOrder) {
+                        sortedRecord = getSortedRecord(record);
+                    }
+
+                    return (
+                        <Table
+                            columns={groupByColumns}
+                            data={sortedRecord}
+                            showHeader={false}
+                            isBorderless
+                            isExpandedInnerTable
+                        />
+                    );
+                },
+                rowExpandable: () => true,
+                expandIconPosition: 'end',
+                expandedRowKeys,
+            }}
+            onExpand={onExapand}
+        />
+    );
+};
diff --git a/datahub-web-react/src/alchemy-components/components/Table/Table.tsx b/datahub-web-react/src/alchemy-components/components/Table/Table.tsx
index 11e598f8d4e0f7..92a75c7a9f0b1a 100644
--- a/datahub-web-react/src/alchemy-components/components/Table/Table.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Table/Table.tsx
@@ -1,6 +1,7 @@
+import { CaretUp, CaretDown } from 'phosphor-react';
 import { LoadingOutlined } from '@ant-design/icons';
 import { Text } from '@components';
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import {
     BaseTable,
     HeaderContainer,
@@ -13,8 +14,8 @@ import {
     TableHeaderCell,
     TableRow,
 } from './components';
-import { TableProps } from './types';
-import { getSortedData, handleActiveSort, renderCell, SortingState } from './utils';
+import { SortingState, TableProps } from './types';
+import { getSortedData, handleActiveSort, renderCell } from './utils';
 
 export const tableDefaults: TableProps<any> = {
     columns: [],
@@ -23,6 +24,7 @@ export const tableDefaults: TableProps<any> = {
     isLoading: false,
     isScrollable: false,
     maxHeight: '100%',
+    isBorderless: false,
 };
 
 export const Table = <T,>({
@@ -32,12 +34,28 @@ export const Table = <T,>({
     isLoading = tableDefaults.isLoading,
     isScrollable = tableDefaults.isScrollable,
     maxHeight = tableDefaults.maxHeight,
+    expandable,
+    isBorderless = tableDefaults.isBorderless,
+    onRowClick,
+    onExpand,
+    rowClassName,
+    handleSortColumnChange = undefined,
+    rowRefs,
+    headerRef,
     ...props
 }: TableProps<T>) => {
     const [sortColumn, setSortColumn] = useState<string | null>(null);
     const [sortOrder, setSortOrder] = useState<SortingState>(SortingState.ORIGINAL);
 
     const sortedData = getSortedData(columns, data, sortColumn, sortOrder);
+    const isRowClickable = !!onRowClick;
+
+    useEffect(() => {
+        if (handleSortColumnChange && sortOrder && sortColumn) {
+            handleSortColumnChange({ sortColumn, sortOrder });
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [sortOrder, sortColumn]);
 
     if (isLoading) {
         return (
@@ -49,19 +67,24 @@ export const Table = <T,>({
     }
 
     return (
-        <TableContainer isScrollable={isScrollable} maxHeight={maxHeight}>
+        <TableContainer isScrollable={isScrollable} maxHeight={maxHeight} isBorderless={isBorderless}>
             <BaseTable {...props}>
+                {/* Render the table header if enabled */}
                 {showHeader && (
-                    <TableHeader>
+                    <TableHeader ref={headerRef}>
                         <tr>
-                            {columns.map((column) => (
-                                <TableHeaderCell key={column.key} width={column.width}>
-                                    <HeaderContainer>
+                            {/* Map through columns to create header cells */}
+                            {columns.map((column, index) => (
+                                <TableHeaderCell
+                                    key={column.key} // Unique key for each header cell
+                                    width={column.width}
+                                    shouldAddRightBorder={index !== columns.length - 1} // Add border unless last column
+                                >
+                                    <HeaderContainer alignment={column.alignment}>
                                         {column.title}
-                                        {column.sorter && (
+                                        {column.sorter && ( // Render sort icons if the column is sortable
                                             <SortIconsContainer
                                                 onClick={() =>
-                                                    column.sorter &&
                                                     handleActiveSort(
                                                         column.key,
                                                         sortColumn,
@@ -70,6 +93,7 @@ export const Table = <T,>({
                                                     )
                                                 }
                                             >
+                                                {/* Sort icons for ascending and descending */}
                                                 <SortIcon
                                                     icon="ChevronLeft"
                                                     size="md"
@@ -93,21 +117,84 @@ export const Table = <T,>({
                                     </HeaderContainer>
                                 </TableHeaderCell>
                             ))}
+                            {/* Placeholder for expandable icon if enabled */}
                         </tr>
                     </TableHeader>
                 )}
+                {/* Render table body with rows and cells */}
                 <tbody>
-                    {sortedData.map((row, index) => (
-                        <TableRow>
-                            {columns.map((column) => {
-                                return (
-                                    <TableCell key={column.key} width={column.width} alignment={column.alignment}>
-                                        {renderCell(column, row, index)}
-                                    </TableCell>
-                                );
-                            })}
-                        </TableRow>
-                    ))}
+                    {sortedData.map((row: any, index) => {
+                        const isExpanded = expandable?.expandedRowKeys?.includes(row?.name); // Check if row is expanded
+                        const canExpand = expandable?.rowExpandable?.(row); // Check if row is expandable
+
+                        return (
+                            <>
+                                {/* Render the main row */}
+                                <TableRow
+                                    canExpand={canExpand}
+                                    onClick={() => {
+                                        if (canExpand) onExpand?.(row); // Handle row expansion
+                                        onRowClick?.(row); // Handle row click
+                                    }}
+                                    className={rowClassName?.(row)} // Add row-specific class
+                                    ref={(el) => {
+                                        if (rowRefs && el) {
+                                            const currentRefs = rowRefs.current;
+                                            currentRefs[index] = el;
+                                        }
+                                    }}
+                                    isRowClickable={isRowClickable}
+                                >
+                                    {/* Render each cell in the row */}
+
+                                    {columns.map((column, i) => {
+                                        return (
+                                            <TableCell
+                                                key={column.key}
+                                                width={column.width}
+                                                alignment={
+                                                    columns.length - 1 === i && canExpand ? 'right' : column.alignment
+                                                }
+                                                isGroupHeader={canExpand}
+                                            >
+                                                {/* Add expandable icon if applicable or render row */}
+                                                {columns.length - 1 === i && canExpand ? (
+                                                    <div
+                                                        style={{
+                                                            cursor: 'pointer',
+                                                            paddingTop: '10px',
+                                                            paddingRight: '10px',
+                                                        }}
+                                                    >
+                                                        {isExpanded ? (
+                                                            <CaretDown size={16} weight="bold" /> // Expanded icon
+                                                        ) : (
+                                                            <CaretUp size={16} weight="bold" /> // Collapsed icon
+                                                        )}
+                                                    </div>
+                                                ) : (
+                                                    renderCell(column, row, index)
+                                                )}
+                                            </TableCell>
+                                        );
+                                    })}
+                                </TableRow>
+                                {/* Render expanded content if row is expanded */}
+                                {isExpanded && expandable?.expandedRowRender && (
+                                    <TableRow isRowClickable={isRowClickable}>
+                                        <TableCell
+                                            colSpan={columns.length + (expandable?.expandIconPosition ? 1 : 0)}
+                                            style={{ padding: 0 }}
+                                        >
+                                            <div style={{ display: 'flex', flexDirection: 'column', width: '100%' }}>
+                                                {expandable.expandedRowRender(row, index)} {/* Expanded content */}
+                                            </div>
+                                        </TableCell>
+                                    </TableRow>
+                                )}
+                            </>
+                        );
+                    })}
                 </tbody>
             </BaseTable>
         </TableContainer>
diff --git a/datahub-web-react/src/alchemy-components/components/Table/components.ts b/datahub-web-react/src/alchemy-components/components/Table/components.ts
index 8908256a81ddf2..fae98fd1e97293 100644
--- a/datahub-web-react/src/alchemy-components/components/Table/components.ts
+++ b/datahub-web-react/src/alchemy-components/components/Table/components.ts
@@ -1,15 +1,19 @@
 import { Icon } from '@components';
-import { colors, radius, spacing, typography } from '@src/alchemy-components/theme';
+import { colors, radius, spacing, typography, borders } from '@src/alchemy-components/theme';
 import { AlignmentOptions } from '@src/alchemy-components/theme/config';
 import styled from 'styled-components';
 
-export const TableContainer = styled.div<{ isScrollable?: boolean; maxHeight?: string }>(
-    ({ isScrollable, maxHeight }) => ({
-        borderRadius: radius.lg,
-        border: `1px solid ${colors.gray[1400]}`,
+export const TableContainer = styled.div<{ isScrollable?: boolean; maxHeight?: string; isBorderless?: boolean }>(
+    ({ isScrollable, maxHeight, isBorderless }) => ({
+        borderRadius: isBorderless ? radius.none : radius.lg,
+        border: isBorderless ? borders.none : `1px solid ${colors.gray[1400]}`,
         overflow: isScrollable ? 'auto' : 'hidden',
         width: '100%',
         maxHeight: maxHeight || '100%',
+
+        '& .selected-row': {
+            background: `${colors.gray[100]} !important`,
+        },
     }),
 );
 
@@ -26,37 +30,53 @@ export const TableHeader = styled.thead({
     zIndex: 100,
 });
 
-export const TableHeaderCell = styled.th<{ width?: string }>(({ width }) => ({
-    padding: `${spacing.sm} ${spacing.md}`,
-    color: colors.gray[600],
-    fontSize: typography.fontSizes.sm,
-    fontWeight: typography.fontWeights.medium,
-    textAlign: 'start',
-    width: width || 'auto',
-}));
+export const TableHeaderCell = styled.th<{ width?: string; shouldAddRightBorder?: boolean }>(
+    ({ width, shouldAddRightBorder }) => ({
+        padding: `${spacing.sm} ${spacing.md}`,
+        color: colors.gray[600],
+        fontSize: typography.fontSizes.sm,
+        fontWeight: typography.fontWeights.medium,
+        textAlign: 'start',
+        width: width || 'auto',
+        borderRight: shouldAddRightBorder ? `1px solid ${colors.gray[1400]}` : borders.none,
+    }),
+);
 
-export const HeaderContainer = styled.div({
+export const HeaderContainer = styled.div<{ alignment?: AlignmentOptions }>(({ alignment }) => ({
     display: 'flex',
     alignItems: 'center',
     gap: spacing.sm,
-});
+    fontSize: '12px',
+    fontWeight: 700,
+    justifyContent: alignment,
+}));
 
-export const TableRow = styled.tr({
-    '&:last-child': {
-        '& td': {
-            borderBottom: 'none',
+export const TableRow = styled.tr<{ canExpand?: boolean; isRowClickable?: boolean }>(
+    ({ canExpand, isRowClickable }) => ({
+        background: canExpand ? colors.gray[100] : 'transparent',
+        cursor: isRowClickable ? 'pointer' : 'normal',
+        '&:last-child': {
+            '& td': {
+                borderBottom: 'none',
+            },
         },
-    },
 
-    '& td:first-child': {
-        fontWeight: typography.fontWeights.medium,
-        color: colors.gray[600],
-    },
-});
+        '& td:first-child': {
+            fontWeight: typography.fontWeights.medium,
+            color: colors.gray[600],
+        },
+    }),
+);
 
-export const TableCell = styled.td<{ width?: string; alignment?: AlignmentOptions }>(({ width, alignment }) => ({
-    padding: spacing.md,
-    borderBottom: `1px solid ${colors.gray[1400]}`,
+export const TableCell = styled.td<{
+    width?: string;
+    alignment?: AlignmentOptions;
+    isGroupHeader?: boolean;
+}>(({ width, alignment, isGroupHeader }) => ({
+    padding: isGroupHeader
+        ? `${spacing.xsm} ${spacing.xsm} ${spacing.xsm} ${spacing.md}`
+        : `${spacing.md} ${spacing.xsm} ${spacing.md} ${spacing.md}`,
+    borderBottom: isGroupHeader ? `1px solid ${colors.gray[200]}` : `1px solid ${colors.gray[100]}`,
     color: colors.gray[1700],
     fontSize: typography.fontSizes.md,
     fontWeight: typography.fontWeights.normal,
diff --git a/datahub-web-react/src/alchemy-components/components/Table/types.ts b/datahub-web-react/src/alchemy-components/components/Table/types.ts
index b3e0357d5cf147..1a980c7c81b4ca 100644
--- a/datahub-web-react/src/alchemy-components/components/Table/types.ts
+++ b/datahub-web-react/src/alchemy-components/components/Table/types.ts
@@ -18,4 +18,27 @@ export interface TableProps<T> extends TableHTMLAttributes<HTMLTableElement> {
     isLoading?: boolean;
     isScrollable?: boolean;
     maxHeight?: string;
+    isBorderless?: boolean;
+    isExpandedInnerTable?: boolean;
+    expandable?: ExpandableProps<T>;
+    onRowClick?: (record: T) => void;
+    rowClassName?: (record: T) => string;
+    onExpand?: (record: T) => void;
+    handleSortColumnChange?: ({ sortColumn, sortOrder }: { sortColumn: string; sortOrder: SortingState }) => void;
+    rowRefs?: React.MutableRefObject<HTMLTableRowElement[]>;
+    headerRef?: React.RefObject<HTMLTableSectionElement>;
+}
+
+export interface ExpandableProps<T> {
+    expandedRowRender?: (record: T, index: number) => React.ReactNode;
+    rowExpandable?: (record: T) => boolean;
+    defaultExpandedRowKeys?: string[];
+    expandIconPosition?: 'start' | 'end'; // Configurable position of the expand icon
+    expandedRowKeys?: string[];
+}
+
+export enum SortingState {
+    ASCENDING = 'ascending',
+    DESCENDING = 'descending',
+    ORIGINAL = 'original',
 }
diff --git a/datahub-web-react/src/alchemy-components/components/Table/utils.ts b/datahub-web-react/src/alchemy-components/components/Table/utils.ts
index c76494d32ca633..601af2beea8e21 100644
--- a/datahub-web-react/src/alchemy-components/components/Table/utils.ts
+++ b/datahub-web-react/src/alchemy-components/components/Table/utils.ts
@@ -1,10 +1,4 @@
-import { Column } from './types';
-
-export enum SortingState {
-    ASCENDING = 'ascending',
-    DESCENDING = 'descending',
-    ORIGINAL = 'original',
-}
+import { Column, SortingState } from './types';
 
 export const handleActiveSort = (
     key: string,
diff --git a/datahub-web-react/src/alchemy-components/components/Timeline/Timeline.stories.tsx b/datahub-web-react/src/alchemy-components/components/Timeline/Timeline.stories.tsx
new file mode 100644
index 00000000000000..191c0e522c17b0
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Timeline/Timeline.stories.tsx
@@ -0,0 +1,69 @@
+import { BADGE } from '@geometricpanda/storybook-addon-badges';
+import type { Meta, StoryObj } from '@storybook/react';
+import React from 'react';
+import { Timeline } from './Timeline';
+
+// Auto Docs
+const meta = {
+    title: 'Components / Timeline',
+    component: Timeline,
+
+    // Display Properties
+    parameters: {
+        layout: 'centered',
+        badges: [BADGE.EXPERIMENTAL],
+        docs: {
+            subtitle: 'Vertical display timeline.',
+        },
+    },
+
+    // Component-level argTypes
+    argTypes: {
+        items: {
+            description: 'A list of items to render in the timeline',
+        },
+        renderContent: {
+            description: "A function to render a content of the timeline's item",
+        },
+        renderDot: {
+            description: "A function to render a dot of the timeline's item",
+        },
+    },
+
+    // Define default args
+    args: {
+        items: [
+            {
+                key: '1',
+            },
+            {
+                key: '2',
+            },
+            {
+                key: '3',
+            },
+        ],
+        renderContent: (item) => `Content for item ${item.key}`,
+        renderDot: (item) => {
+            if (item.key === '2') {
+                return <div style={{ width: '10px', height: '10px', background: 'red' }} />;
+            }
+            return undefined;
+        },
+    },
+} satisfies Meta<typeof Timeline>;
+
+export default meta;
+
+// Stories
+
+type Story = StoryObj<typeof meta>;
+
+// Basic story is what is displayed 1st in storybook
+// Pass props to this so that it can be customized via the UI props panel
+export const sandbox: Story = {
+    tags: ['dev'],
+    render: (props) => {
+        return <Timeline {...props} />;
+    },
+};
diff --git a/datahub-web-react/src/alchemy-components/components/Timeline/Timeline.tsx b/datahub-web-react/src/alchemy-components/components/Timeline/Timeline.tsx
new file mode 100644
index 00000000000000..d6d994430f545b
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Timeline/Timeline.tsx
@@ -0,0 +1,20 @@
+import { Timeline as AntdTimeline } from 'antd';
+import React from 'react';
+import { StyledAntdTimeline } from './components';
+import { BaseItemType, TimelineProps } from './types';
+
+export const Timeline = <ItemType extends BaseItemType>({
+    items,
+    renderDot,
+    renderContent,
+}: TimelineProps<ItemType>) => {
+    return (
+        <StyledAntdTimeline>
+            {items.map((item) => (
+                <AntdTimeline.Item key={item.key} dot={renderDot?.(item)}>
+                    {renderContent(item)}
+                </AntdTimeline.Item>
+            ))}
+        </StyledAntdTimeline>
+    );
+};
diff --git a/datahub-web-react/src/alchemy-components/components/Timeline/components.tsx b/datahub-web-react/src/alchemy-components/components/Timeline/components.tsx
new file mode 100644
index 00000000000000..cbcf6540149293
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Timeline/components.tsx
@@ -0,0 +1,14 @@
+import { colors } from '@src/alchemy-components/theme';
+import { Timeline as AntdTimeline } from 'antd';
+import styled from 'styled-components';
+
+export const StyledAntdTimeline = styled(AntdTimeline)`
+    .ant-timeline-item-head {
+        padding: 0;
+    }
+
+    .ant-timeline-item-tail {
+        border-width: 1px;
+        border-color: ${colors.gray[100]};
+    }
+` as typeof AntdTimeline;
diff --git a/datahub-web-react/src/alchemy-components/components/Timeline/index.ts b/datahub-web-react/src/alchemy-components/components/Timeline/index.ts
new file mode 100644
index 00000000000000..f3667d487e7bab
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Timeline/index.ts
@@ -0,0 +1 @@
+export { Timeline } from './Timeline';
diff --git a/datahub-web-react/src/alchemy-components/components/Timeline/types.ts b/datahub-web-react/src/alchemy-components/components/Timeline/types.ts
new file mode 100644
index 00000000000000..a1a01dccf7f506
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Timeline/types.ts
@@ -0,0 +1,17 @@
+import React from 'react';
+
+export type TimelineItem = {
+    key: string;
+    content: React.ReactNode;
+    dot?: React.ReactNode;
+};
+
+export interface BaseItemType {
+    key: string;
+}
+
+export type TimelineProps<ItemType extends BaseItemType> = {
+    items: ItemType[];
+    renderContent: (item: ItemType) => React.ReactNode;
+    renderDot?: (item: ItemType) => React.ReactNode;
+};
diff --git a/datahub-web-react/src/alchemy-components/components/Tooltip2/Tooltip2.tsx b/datahub-web-react/src/alchemy-components/components/Tooltip2/Tooltip2.tsx
new file mode 100644
index 00000000000000..8b77195fb40726
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Tooltip2/Tooltip2.tsx
@@ -0,0 +1,60 @@
+import { Tooltip, TooltipProps } from 'antd';
+import * as React from 'react';
+import {
+    Container,
+    Content,
+    Section,
+    SectionHeader,
+    SectionsContainer,
+    SectionTitle,
+    Title,
+    TitleSuffix,
+} from './components';
+import { Tooltip2Props } from './types';
+
+export function Tooltip2(props: Tooltip2Props & TooltipProps) {
+    const { header: Header, width, title, sections, ...otherProps } = props;
+
+    if (!Header && !title) return null;
+
+    const renderTitle = () => {
+        return (
+            <Container>
+                {Header && <Header />}
+                <Title>{title}</Title>
+                {sections && (
+                    <SectionsContainer>
+                        {sections?.map((section) => (
+                            <Section>
+                                <SectionHeader>
+                                    <SectionTitle>{section.title}</SectionTitle>
+                                    {section.titleSuffix && <TitleSuffix>{section.titleSuffix}</TitleSuffix>}
+                                </SectionHeader>
+                                {section?.content && <Content>{section.content}</Content>}
+                            </Section>
+                        ))}
+                    </SectionsContainer>
+                )}
+            </Container>
+        );
+    };
+
+    return (
+        <Tooltip
+            {...otherProps}
+            showArrow={false}
+            title={renderTitle()}
+            overlayStyle={{
+                width: `${width || 278}px`,
+            }}
+            overlayInnerStyle={{
+                fontFamily: 'Mulish',
+                padding: '12px',
+                backgroundColor: 'white',
+                borderRadius: '8px',
+            }}
+        >
+            {props.children}
+        </Tooltip>
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/Tooltip2/TooltipHeader.tsx b/datahub-web-react/src/alchemy-components/components/Tooltip2/TooltipHeader.tsx
new file mode 100644
index 00000000000000..7b3ac460b4d8ce
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Tooltip2/TooltipHeader.tsx
@@ -0,0 +1,77 @@
+import colors from '@src/alchemy-components/theme/foundations/colors';
+import React from 'react';
+import styled from 'styled-components';
+import { TooltipHeaderProps } from './types';
+
+const Container = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const TitleContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    min-width: 0;
+    margin-right: 8px;
+`;
+
+const PrimaryTitle = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const Title = styled.div`
+    font-weight: 500;
+    font-size: 14px;
+    color: ${colors.gray[600]};
+`;
+
+const TitleSuffix = styled.div`
+    margin-left: 4px;
+`;
+
+export const SubTitle = styled.div`
+    font-weight: 400;
+    font-size: 12px;
+    flex-shrink: 1;
+    min-width: 0;
+    color: ${colors.gray[1700]};
+`;
+
+const ActionContainer = styled.div`
+    margin-left: auto;
+    flex-shrink: 0;
+`;
+
+const Image = styled.img`
+    width: 32px;
+    height: 32px;
+    border-radius: 200px;
+    margin-right: 8px;
+    flex-shrink: 0;
+    object-fit: contain;
+`;
+
+export function TooltipHeader({ title, subTitle, image, action: Action, titleSuffix }: TooltipHeaderProps) {
+    if (!title) return null;
+
+    return (
+        <Container>
+            {image && <Image src={image} alt="Tooltip header" />}
+            <TitleContainer>
+                <PrimaryTitle>
+                    <Title>{title}</Title>
+                    {titleSuffix && <TitleSuffix>{titleSuffix}</TitleSuffix>}
+                </PrimaryTitle>
+                {subTitle && <SubTitle>{subTitle}</SubTitle>}
+            </TitleContainer>
+            {Action && (
+                <ActionContainer>
+                    <Action />
+                </ActionContainer>
+            )}
+        </Container>
+    );
+}
+
+export default TooltipHeader;
diff --git a/datahub-web-react/src/alchemy-components/components/Tooltip2/components.ts b/datahub-web-react/src/alchemy-components/components/Tooltip2/components.ts
new file mode 100644
index 00000000000000..bb2af3a1c9eccd
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Tooltip2/components.ts
@@ -0,0 +1,41 @@
+import colors from '@src/alchemy-components/theme/foundations/colors';
+import styled from 'styled-components';
+
+export const Title = styled.div`
+    color: ${colors.gray[1700]};
+    font-size: 14px;
+    font-weight: 400;
+`;
+
+export const TitleSuffix = styled.div`
+    margin-left: 4px;
+`;
+
+export const SectionsContainer = styled.div`
+    margin-top: 8px;
+`;
+
+export const Section = styled.div`
+    margin-top: 12px;
+`;
+
+export const SectionHeader = styled.div`
+    display: flex;
+    align-items: flex-start;
+`;
+
+export const SectionTitle = styled.div`
+    font-weight: 700;
+    font-size: 12px;
+    color: ${colors.gray[600]};
+`;
+
+export const Content = styled.div`
+    margin: 4px 0;
+`;
+
+export const Container = styled.div`
+    ${Section}:first-child {
+        margin-top: 0px;
+    }
+`;
diff --git a/datahub-web-react/src/alchemy-components/components/Tooltip2/index.ts b/datahub-web-react/src/alchemy-components/components/Tooltip2/index.ts
new file mode 100644
index 00000000000000..b3f01cbaac7d08
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Tooltip2/index.ts
@@ -0,0 +1 @@
+export { Tooltip2 } from './Tooltip2';
diff --git a/datahub-web-react/src/alchemy-components/components/Tooltip2/types.ts b/datahub-web-react/src/alchemy-components/components/Tooltip2/types.ts
new file mode 100644
index 00000000000000..5438a0b408a956
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Tooltip2/types.ts
@@ -0,0 +1,20 @@
+export interface SectionType {
+    title: string;
+    titleSuffix?: string | React.ReactNode;
+    content: string | React.ReactNode;
+}
+
+export interface Tooltip2Props {
+    header?: React.ComponentType;
+    sections?: SectionType[];
+    children?: React.ReactNode;
+    width?: number;
+}
+
+export interface TooltipHeaderProps {
+    title: string;
+    titleSuffix?: React.ReactNode;
+    subTitle?: string;
+    image?: string;
+    action?: React.ComponentType;
+}
diff --git a/datahub-web-react/src/alchemy-components/index.ts b/datahub-web-react/src/alchemy-components/index.ts
index 7e40d343e884dc..ac05349437fd04 100644
--- a/datahub-web-react/src/alchemy-components/index.ts
+++ b/datahub-web-react/src/alchemy-components/index.ts
@@ -6,12 +6,17 @@ export * from './components/Avatar';
 export * from './components/Badge';
 export * from './components/BarChart';
 export * from './components/Button';
+export * from './components/CalendarChart';
 export * from './components/Card';
 export * from './components/Checkbox';
+export * from './components/DatePicker';
+export * from './components/Drawer';
+export * from './components/GraphCard';
 export * from './components/Heading';
 export * from './components/Icon';
 export * from './components/Input';
 export * from './components/LineChart';
+export * from './components/Loader';
 export * from './components/PageTitle';
 export * from './components/Pills';
 export * from './components/Popover';
@@ -21,4 +26,5 @@ export * from './components/Switch';
 export * from './components/Table';
 export * from './components/Text';
 export * from './components/TextArea';
+export * from './components/Timeline';
 export * from './components/Tooltip';
diff --git a/datahub-web-react/src/alchemy-components/theme/config/types.ts b/datahub-web-react/src/alchemy-components/theme/config/types.ts
index 79ba2e27018f76..f4d06f4c043ba6 100644
--- a/datahub-web-react/src/alchemy-components/theme/config/types.ts
+++ b/datahub-web-react/src/alchemy-components/theme/config/types.ts
@@ -41,7 +41,7 @@ export type VariantOptions = 'filled' | 'outline';
 export type AlignmentOptions = 'left' | 'right' | 'center' | 'justify';
 
 // Avatar Size options
-export type AvatarSizeOptions = 'sm' | 'md' | 'lg' | 'default';
+export type AvatarSizeOptions = 'sm' | 'md' | 'lg' | 'xl' | 'default';
 
 // Icon Alignment types
 export type IconAlignmentOptions = 'horizontal' | 'vertical';
diff --git a/datahub-web-react/src/alchemy-components/theme/foundations/colors.ts b/datahub-web-react/src/alchemy-components/theme/foundations/colors.ts
index 760127a8b0f781..013a1f55cfb323 100644
--- a/datahub-web-react/src/alchemy-components/theme/foundations/colors.ts
+++ b/datahub-web-react/src/alchemy-components/theme/foundations/colors.ts
@@ -23,6 +23,7 @@ const colors = {
         1600: '#F5F6FA',
         1700: '#5F6685',
         1800: '#8088A3',
+        1900: '#A3A7B9',
     },
 
     violet: {
diff --git a/datahub-web-react/src/app/AppProviders.tsx b/datahub-web-react/src/app/AppProviders.tsx
index 00597e1cf76406..767dd5e778c114 100644
--- a/datahub-web-react/src/app/AppProviders.tsx
+++ b/datahub-web-react/src/app/AppProviders.tsx
@@ -6,6 +6,7 @@ import QuickFiltersProvider from '../providers/QuickFiltersProvider';
 import SearchContextProvider from './search/context/SearchContextProvider';
 import EntityRegistryProvider from './EntityRegistryProvider';
 import { BrowserTitleProvider } from './shared/BrowserTabTitleContext';
+import { NavBarProvider } from './homeV2/layout/navBarRedesign/NavBarContext';
 
 interface Props {
     children: React.ReactNode;
@@ -19,7 +20,9 @@ export default function AppProviders({ children }: Props) {
                     <BrowserTitleProvider>
                         <EducationStepsProvider>
                             <QuickFiltersProvider>
-                                <SearchContextProvider>{children}</SearchContextProvider>
+                                <SearchContextProvider>
+                                    <NavBarProvider>{children}</NavBarProvider>
+                                </SearchContextProvider>
                             </QuickFiltersProvider>
                         </EducationStepsProvider>
                     </BrowserTitleProvider>
diff --git a/datahub-web-react/src/app/EntityRegistryProvider.tsx b/datahub-web-react/src/app/EntityRegistryProvider.tsx
index 9e283c0d07fc8a..000858bae6e150 100644
--- a/datahub-web-react/src/app/EntityRegistryProvider.tsx
+++ b/datahub-web-react/src/app/EntityRegistryProvider.tsx
@@ -1,9 +1,13 @@
+import buildEntityRegistryV2 from '@app/buildEntityRegistryV2';
 import React from 'react';
 import { EntityRegistryContext } from '../entityRegistryContext';
+import EntityRegistry from './entity/EntityRegistry';
 import useBuildEntityRegistry from './useBuildEntityRegistry';
 
+export const globalEntityRegistryV2 = buildEntityRegistryV2();
+
 const EntityRegistryProvider = ({ children }: { children: React.ReactNode }) => {
-    const entityRegistry = useBuildEntityRegistry();
+    const entityRegistry = useBuildEntityRegistry() as EntityRegistry;
     return <EntityRegistryContext.Provider value={entityRegistry}>{children}</EntityRegistryContext.Provider>;
 };
 
diff --git a/datahub-web-react/src/app/ProtectedRoutes.tsx b/datahub-web-react/src/app/ProtectedRoutes.tsx
index d975e6d4d99c2d..9d9f24e3da7936 100644
--- a/datahub-web-react/src/app/ProtectedRoutes.tsx
+++ b/datahub-web-react/src/app/ProtectedRoutes.tsx
@@ -1,16 +1,36 @@
 import React, { useEffect } from 'react';
 import { Switch, Route, useLocation, useHistory } from 'react-router-dom';
 import { Layout } from 'antd';
+import styled from 'styled-components';
 import { HomePage } from './home/HomePage';
+import { HomePage as HomePageV2 } from './homeV2/HomePage';
 import { SearchRoutes } from './SearchRoutes';
 import EmbedRoutes from './EmbedRoutes';
 import { NEW_ROUTE_MAP, PageRoutes } from '../conf/Global';
+import { useIsThemeV2, useSetThemeIsV2 } from './useIsThemeV2';
 import { getRedirectUrl } from '../conf/utils';
+import { IntroduceYourself } from './homeV2/introduce/IntroduceYourself';
+import { useSetUserTitle } from './identity/user/useUserTitle';
+import { useSetUserPersona } from './homeV2/persona/useUserPersona';
+import { useSetNavBarRedesignEnabled } from './useShowNavBarRedesign';
+import { OnboardingContextProvider } from './onboarding/OnboardingContextProvider';
+
+const StyledLayout = styled(Layout)`
+    background-color: transparent;
+`;
 
 /**
  * Container for all views behind an authentication wall.
  */
 export const ProtectedRoutes = (): JSX.Element => {
+    useSetThemeIsV2();
+    useSetUserPersona();
+    useSetUserTitle();
+    useSetNavBarRedesignEnabled();
+
+    const isThemeV2 = useIsThemeV2();
+    const FinalHomePage = isThemeV2 ? HomePageV2 : HomePage;
+
     const location = useLocation();
     const history = useHistory();
 
@@ -22,12 +42,15 @@ export const ProtectedRoutes = (): JSX.Element => {
     }, [location]);
 
     return (
-        <Layout>
-            <Switch>
-                <Route exact path="/" render={() => <HomePage />} />
-                <Route path={PageRoutes.EMBED} render={() => <EmbedRoutes />} />
-                <Route path="/*" render={() => <SearchRoutes />} />
-            </Switch>
-        </Layout>
+        <OnboardingContextProvider>
+            <StyledLayout className={isThemeV2 ? 'themeV2' : undefined}>
+                <Switch>
+                    <Route exact path="/" render={() => <FinalHomePage />} />
+                    <Route path={PageRoutes.EMBED} render={() => <EmbedRoutes />} />
+                    <Route exact path={PageRoutes.INTRODUCE} render={() => <IntroduceYourself />} />
+                    <Route path="/*" render={() => <SearchRoutes />} />
+                </Switch>
+            </StyledLayout>
+        </OnboardingContextProvider>
     );
 };
diff --git a/datahub-web-react/src/app/SearchRoutes.tsx b/datahub-web-react/src/app/SearchRoutes.tsx
index 024b6e0add15a3..9a635bec046373 100644
--- a/datahub-web-react/src/app/SearchRoutes.tsx
+++ b/datahub-web-react/src/app/SearchRoutes.tsx
@@ -1,16 +1,9 @@
 import React from 'react';
-import { Switch, Route, Redirect } from 'react-router-dom';
-import { NoPageFound } from './shared/NoPageFound';
+import { Redirect, Route, Switch } from 'react-router-dom';
 import { PageRoutes } from '../conf/Global';
-import { SearchablePage } from './search/SearchablePage';
-import { useEntityRegistry } from './useEntityRegistry';
-import { EntityPage } from './entity/EntityPage';
-import { BrowseResultsPage } from './browse/BrowseResultsPage';
-import { SearchPage } from './search/SearchPage';
 import { AnalyticsPage } from './analyticsDashboard/components/AnalyticsPage';
-import { ManageIngestionPage } from './ingest/ManageIngestionPage';
-import GlossaryRoutes from './glossary/GlossaryRoutes';
-import { SettingsPage } from './settings/SettingsPage';
+import { BrowseResultsPage } from './browse/BrowseResultsPage';
+import { BusinessAttributes } from './businessAttribute/BusinessAttributes';
 import { useUserContext } from './context/useUserContext';
 import DomainRoutes from './domain/DomainRoutes';
 import {
@@ -20,8 +13,26 @@ import {
     useIsNestedDomainsEnabled,
 } from './useAppConfig';
 import { ManageDomainsPage } from './domain/ManageDomainsPage';
-import { BusinessAttributes } from './businessAttribute/BusinessAttributes';
 import StructuredProperties from './govern/structuredProperties/StructuredProperties';
+
+import { EntityPage } from './entity/EntityPage';
+import { EntityPage as EntityPageV2 } from './entityV2/EntityPage';
+import GlossaryRoutes from './glossary/GlossaryRoutes';
+import GlossaryRoutesV2 from './glossaryV2/GlossaryRoutes';
+import { ManageIngestionPage } from './ingest/ManageIngestionPage';
+import { SearchPage } from './search/SearchPage';
+import { SearchablePage } from './search/SearchablePage';
+import { SearchPage as SearchPageV2 } from './searchV2/SearchPage';
+import { SearchablePage as SearchablePageV2 } from './searchV2/SearchablePage';
+import { SettingsPage } from './settings/SettingsPage';
+import { SettingsPage as SettingsPageV2 } from './settingsV2/SettingsPage';
+import { NoPageFound } from './shared/NoPageFound';
+import { useEntityRegistry } from './useEntityRegistry';
+
+import DomainRoutesV2 from './domainV2/DomainRoutes';
+import { ManageDomainsPage as ManageDomainsPageV2 } from './domainV2/ManageDomainsPage';
+import { useIsThemeV2 } from './useIsThemeV2';
+
 /**
  * Container for all searchable page routes
  */
@@ -33,6 +44,8 @@ export const SearchRoutes = (): JSX.Element => {
         ? entityRegistry.getEntitiesForSearchRoutes()
         : entityRegistry.getNonGlossaryEntities();
     const { config } = useAppConfig();
+    const isThemeV2 = useIsThemeV2();
+    const FinalSearchablePage = isThemeV2 ? SearchablePageV2 : SearchablePage;
 
     const businessAttributesFlag = useBusinessAttributesFlag();
     const appConfigContextLoaded = useIsAppConfigContextLoaded();
@@ -42,16 +55,25 @@ export const SearchRoutes = (): JSX.Element => {
         (me.platformPrivileges?.manageStructuredProperties || me.platformPrivileges?.viewStructuredPropertiesPage);
 
     return (
-        <SearchablePage>
+        <FinalSearchablePage>
             <Switch>
                 {entities.map((entity) => (
                     <Route
                         key={entity.getPathName()}
                         path={`/${entity.getPathName()}/:urn`}
-                        render={() => <EntityPage entityType={entity.type} />}
+                        render={() =>
+                            isThemeV2 ? (
+                                <EntityPageV2 entityType={entity.type} />
+                            ) : (
+                                <EntityPage entityType={entity.type} />
+                            )
+                        }
                     />
                 ))}
-                <Route path={PageRoutes.SEARCH_RESULTS} render={() => <SearchPage />} />
+                <Route
+                    path={PageRoutes.SEARCH_RESULTS}
+                    render={() => (isThemeV2 ? <SearchPageV2 /> : <SearchPage />)}
+                />
                 <Route path={PageRoutes.BROWSE_RESULTS} render={() => <BrowseResultsPage />} />
                 <Route path={PageRoutes.ANALYTICS} render={() => <AnalyticsPage />} />
                 <Route path={PageRoutes.POLICIES} render={() => <Redirect to="/settings/permissions/policies" />} />
@@ -61,11 +83,25 @@ export const SearchRoutes = (): JSX.Element => {
                 />
                 <Route path={PageRoutes.PERMISSIONS} render={() => <Redirect to="/settings/permissions" />} />
                 <Route path={PageRoutes.IDENTITIES} render={() => <Redirect to="/settings/identities" />} />
-                {isNestedDomainsEnabled && <Route path={`${PageRoutes.DOMAIN}*`} render={() => <DomainRoutes />} />}
-                {!isNestedDomainsEnabled && <Route path={PageRoutes.DOMAINS} render={() => <ManageDomainsPage />} />}
+                {isNestedDomainsEnabled && (
+                    <Route
+                        path={`${PageRoutes.DOMAIN}*`}
+                        render={() => (isThemeV2 ? <DomainRoutesV2 /> : <DomainRoutes />)}
+                    />
+                )}
+                {!isNestedDomainsEnabled && (
+                    <Route
+                        path={PageRoutes.DOMAINS}
+                        render={() => (isThemeV2 ? <ManageDomainsPageV2 /> : <ManageDomainsPage />)}
+                    />
+                )}
+
                 <Route path={PageRoutes.INGESTION} render={() => <ManageIngestionPage />} />
-                <Route path={PageRoutes.SETTINGS} render={() => <SettingsPage />} />
-                <Route path={`${PageRoutes.GLOSSARY}*`} render={() => <GlossaryRoutes />} />
+                <Route path={PageRoutes.SETTINGS} render={() => (isThemeV2 ? <SettingsPageV2 /> : <SettingsPage />)} />
+                <Route
+                    path={`${PageRoutes.GLOSSARY}*`}
+                    render={() => (isThemeV2 ? <GlossaryRoutesV2 /> : <GlossaryRoutes />)}
+                />
                 {showStructuredProperties && (
                     <Route path={PageRoutes.STRUCTURED_PROPERTIES} render={() => <StructuredProperties />} />
                 )}
@@ -83,6 +119,6 @@ export const SearchRoutes = (): JSX.Element => {
                 />
                 <Route component={NoPageFound} />
             </Switch>
-        </SearchablePage>
+        </FinalSearchablePage>
     );
 };
diff --git a/datahub-web-react/src/app/analytics/event.ts b/datahub-web-react/src/app/analytics/event.ts
index 9152f2fb8eedb8..7d213acb42a59e 100644
--- a/datahub-web-react/src/app/analytics/event.ts
+++ b/datahub-web-react/src/app/analytics/event.ts
@@ -2,6 +2,7 @@ import {
     AllowedValue,
     DataHubViewType,
     EntityType,
+    LineageDirection,
     PropertyCardinality,
     PropertyValueInput,
     RecommendationRenderType,
@@ -64,6 +65,8 @@ export enum EventType {
     ActivatePolicyEvent,
     ShowSimplifiedHomepageEvent,
     ShowStandardHomepageEvent,
+    ShowV2ThemeEvent,
+    RevertV2ThemeEvent,
     CreateGlossaryEntityEvent,
     CreateDomainEvent,
     MoveDomainEvent,
@@ -98,6 +101,16 @@ export enum EventType {
     ApplyStructuredPropertyEvent,
     UpdateStructuredPropertyOnAssetEvent,
     RemoveStructuredPropertyEvent,
+    ClickDocRequestCTA,
+    IntroduceYourselfViewEvent,
+    IntroduceYourselfSubmitEvent,
+    IntroduceYourselfSkipEvent,
+    ExpandLineageEvent,
+    ContractLineageEvent,
+    ShowHideLineageColumnsEvent,
+    SearchLineageColumnsEvent,
+    FilterLineageColumnsEvent,
+    DrillDownLineageEvent,
 }
 
 /**
@@ -119,6 +132,29 @@ export interface PageViewEvent extends BaseEvent {
     originPath: string;
 }
 
+/**
+ * Viewed the Introduce Yourself page on the UI.
+ */
+export interface IntroduceYourselfViewEvent extends BaseEvent {
+    type: EventType.IntroduceYourselfViewEvent;
+}
+
+/**
+ * Submitted the "Introduce Yourself" page through the UI.
+ */
+export interface IntroduceYourselfSubmitEvent extends BaseEvent {
+    type: EventType.IntroduceYourselfSubmitEvent;
+    role: string;
+    platformUrns: Array<string>;
+}
+
+/**
+ * Skipped the "Introduce Yourself" page through the UI.
+ */
+export interface IntroduceYourselfSkipEvent extends BaseEvent {
+    type: EventType.IntroduceYourselfSkipEvent;
+}
+
 /**
  * Viewed the Home Page on the UI.
  */
@@ -474,6 +510,14 @@ export interface ShowStandardHomepageEvent extends BaseEvent {
     type: EventType.ShowStandardHomepageEvent;
 }
 
+export interface ShowV2ThemeEvent extends BaseEvent {
+    type: EventType.ShowV2ThemeEvent;
+}
+
+export interface RevertV2ThemeEvent extends BaseEvent {
+    type: EventType.RevertV2ThemeEvent;
+}
+
 export interface HomePageExploreAllClickEvent extends BaseEvent {
     type: EventType.HomePageExploreAllClickEvent;
 }
@@ -656,6 +700,64 @@ export interface CreateBusinessAttributeEvent extends BaseEvent {
     name: string;
 }
 
+export enum DocRequestCTASource {
+    TaskCenter = 'TaskCenter',
+    AssetPage = 'AssetPage',
+}
+
+export interface ClickDocRequestCTA extends BaseEvent {
+    type: EventType.ClickDocRequestCTA;
+    source: DocRequestCTASource;
+}
+
+export interface ExpandLineageEvent extends BaseEvent {
+    type: EventType.ExpandLineageEvent;
+    direction: LineageDirection;
+    levelsExpanded: '1' | 'all';
+    entityUrn: string;
+    entityType: EntityType;
+}
+
+export interface ContractLineageEvent extends BaseEvent {
+    type: EventType.ContractLineageEvent;
+    direction: LineageDirection;
+    entityUrn: string;
+    entityType?: EntityType;
+}
+
+export interface ShowHideLineageColumnsEvent extends BaseEvent {
+    type: EventType.ShowHideLineageColumnsEvent;
+    action: 'show' | 'hide';
+    entityUrn: string;
+    entityType: EntityType;
+    entityPlatformUrn?: string;
+}
+
+export interface SearchLineageColumnsEvent extends BaseEvent {
+    type: EventType.SearchLineageColumnsEvent;
+    entityUrn: string;
+    entityType: EntityType;
+    searchTextLength: number;
+}
+
+export interface FilterLineageColumnsEvent extends BaseEvent {
+    type: EventType.FilterLineageColumnsEvent;
+    action: 'enable' | 'disable';
+    entityUrn: string;
+    entityType: EntityType;
+    shownCount: number;
+}
+
+export interface DrillDownLineageEvent extends BaseEvent {
+    type: EventType.DrillDownLineageEvent;
+    action: 'select' | 'deselect';
+    entityUrn: string;
+    entityType: EntityType;
+    parentUrn: string;
+    parentEntityType: EntityType;
+    dataType?: string;
+}
+
 export interface CreateStructuredPropertyClickEvent extends BaseEvent {
     type: EventType.CreateStructuredPropertyClickEvent;
 }
@@ -720,6 +822,9 @@ export interface RemoveStructuredPropertyEvent extends StructuredPropertyOnAsset
 export type Event =
     | PageViewEvent
     | HomePageViewEvent
+    | IntroduceYourselfViewEvent
+    | IntroduceYourselfSubmitEvent
+    | IntroduceYourselfSkipEvent
     | SignUpEvent
     | LogInEvent
     | LogOutEvent
@@ -774,6 +879,8 @@ export type Event =
     | DeleteIngestionSourceEvent
     | ExecuteIngestionSourceEvent
     | ShowStandardHomepageEvent
+    | ShowV2ThemeEvent
+    | RevertV2ThemeEvent
     | SsoEvent
     | CreateViewEvent
     | UpdateViewEvent
@@ -793,6 +900,12 @@ export type Event =
     | EmbedProfileViewInDataHubEvent
     | EmbedLookupNotFoundEvent
     | CreateBusinessAttributeEvent
+    | ExpandLineageEvent
+    | ContractLineageEvent
+    | ShowHideLineageColumnsEvent
+    | SearchLineageColumnsEvent
+    | FilterLineageColumnsEvent
+    | DrillDownLineageEvent
     | CreateStructuredPropertyClickEvent
     | CreateStructuredPropertyEvent
     | EditStructuredPropertyEvent
@@ -800,4 +913,5 @@ export type Event =
     | ViewStructuredPropertyEvent
     | ApplyStructuredPropertyEvent
     | UpdateStructuredPropertyOnAssetEvent
-    | RemoveStructuredPropertyEvent;
+    | RemoveStructuredPropertyEvent
+    | ClickDocRequestCTA;
diff --git a/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsChart.tsx b/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsChart.tsx
index d466a8f2ccd6d7..f8bf1350b783d1 100644
--- a/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsChart.tsx
+++ b/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsChart.tsx
@@ -33,7 +33,7 @@ export const AnalyticsChart = ({ chartData, width, height }: Props) => {
     }
 
     return (
-        <ChartCard shouldScroll={isTable}>
+        <ChartCard $shouldScroll={isTable}>
             <ChartContainer>
                 <div>
                     <Typography.Title level={5}>{chartData.title}</Typography.Title>
diff --git a/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsPage.tsx b/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsPage.tsx
index f139ef7368a74d..fed1b0c15e2cad 100644
--- a/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsPage.tsx
+++ b/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsPage.tsx
@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 import styled from 'styled-components';
 import { Alert, Divider, Input, Select } from 'antd';
 import { SearchOutlined } from '@ant-design/icons';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
 import { ChartGroup } from './ChartGroup';
 import { useGetAnalyticsChartsQuery, useGetMetadataAnalyticsChartsQuery } from '../../../graphql/analytics.generated';
 import { useGetHighlightsQuery } from '../../../graphql/highlights.generated';
@@ -11,13 +12,38 @@ import { useListDomainsQuery } from '../../../graphql/domain.generated';
 import filterSearchQuery from '../../search/utils/filterSearchQuery';
 import { ANTD_GRAY } from '../../entity/shared/constants';
 import { useUserContext } from '../../context/useUserContext';
+import { useIsThemeV2 } from '../../useIsThemeV2';
+
+const PageContainer = styled.div<{ isV2: boolean; $isShowNavBarRedesign?: boolean }>`
+    background-color: ${(props) => (props.isV2 ? '#fff' : 'inherit')};
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        height: 100%;
+        margin: 5px;
+        overflow: auto;
+        box-shadow: ${props.theme.styles['box-shadow-navbar-redesign']};
+    `}
+    ${(props) =>
+        !props.$isShowNavBarRedesign &&
+        `
+        margin-right: ${props.isV2 ? '24px' : '0'};
+        margin-bottom: ${props.isV2 ? '24px' : '0'};
+    `}
+    border-radius: ${(props) => {
+        if (props.isV2 && props.$isShowNavBarRedesign) return props.theme.styles['border-radius-navbar-redesign'];
+        return props.isV2 ? '8px' : '0';
+    }};
+`;
 
 const HighlightGroup = styled.div`
-    display: flex;
-    align-items: space-between;
-    justify-content: center;
-    padding-top: 20px;
+    margin-top: 20px;
+    padding: 0 20px;
     margin-bottom: 10px;
+    display: grid;
+    grid-template-rows: auto auto;
+    grid-template-columns: repeat(4, 1fr);
+    gap: 10px;
 `;
 
 const MetadataAnalyticsInput = styled.div`
@@ -47,6 +73,8 @@ const StyledSearchBar = styled(Input)`
 `;
 
 export const AnalyticsPage = () => {
+    const isV2 = useIsThemeV2();
+    const isShowNavBarRedesign = useShowNavBarRedesign();
     const me = useUserContext();
     const canManageDomains = me?.platformPrivileges?.createDomains;
     const { data: chartData, loading: chartLoading, error: chartError } = useGetAnalyticsChartsQuery();
@@ -88,14 +116,14 @@ export const AnalyticsPage = () => {
 
     const isLoading = highlightLoading || chartLoading || domainLoading || metadataAnalyticsLoading;
     return (
-        <>
-            {isLoading && <Message type="loading" content="Loading..." style={{ marginTop: '10%' }} />}
+        <PageContainer isV2={isV2} $isShowNavBarRedesign={isShowNavBarRedesign}>
+            {isLoading && <Message type="loading" content="Loading…" style={{ marginTop: '10%' }} />}
             <HighlightGroup>
                 {highlightError && (
                     <Alert type="error" message={highlightError?.message || 'Highlights failed to load'} />
                 )}
                 {highlightData?.getHighlights?.map((highlight) => (
-                    <Highlight highlight={highlight} shortenValue />
+                    <Highlight highlight={highlight} shortenValue key={highlight.title} />
                 ))}
             </HighlightGroup>
             <>
@@ -105,7 +133,7 @@ export const AnalyticsPage = () => {
                 {chartData?.getAnalyticsCharts
                     ?.filter((chartGroup) => chartGroup.groupId === 'GlobalMetadataAnalytics')
                     .map((chartGroup) => (
-                        <ChartGroup chartGroup={chartGroup} />
+                        <ChartGroup chartGroup={chartGroup} key={chartGroup.title} />
                     ))}
             </>
             <>
@@ -126,7 +154,7 @@ export const AnalyticsPage = () => {
                             >
                                 <Select.Option value="ALL">All</Select.Option>
                                 {domainData?.listDomains?.domains?.map((domainChoice) => (
-                                    <Select.Option value={domainChoice.urn}>
+                                    <Select.Option value={domainChoice.urn} key={domainChoice.urn}>
                                         {domainChoice?.properties?.name}
                                     </Select.Option>
                                 ))}
@@ -159,7 +187,7 @@ export const AnalyticsPage = () => {
                           </MetadataAnalyticsPlaceholder>
                       )
                     : metadataAnalyticsData?.getMetadataAnalyticsCharts?.map((chartGroup) => (
-                          <ChartGroup chartGroup={chartGroup} />
+                          <ChartGroup chartGroup={chartGroup} key={chartGroup.title} />
                       ))}
             </>
             <>
@@ -168,12 +196,12 @@ export const AnalyticsPage = () => {
                     chartData?.getAnalyticsCharts
                         ?.filter((chartGroup) => chartGroup.groupId === 'DataHubUsageAnalytics')
                         .map((chartGroup) => (
-                            <>
+                            <React.Fragment key={chartGroup.title}>
                                 <Divider />
                                 <ChartGroup chartGroup={chartGroup} />
-                            </>
+                            </React.Fragment>
                         ))}
             </>
-        </>
+        </PageContainer>
     );
 };
diff --git a/datahub-web-react/src/app/analyticsDashboard/components/ChartCard.tsx b/datahub-web-react/src/app/analyticsDashboard/components/ChartCard.tsx
index 1fe247b878543a..e975d2ecf92901 100644
--- a/datahub-web-react/src/app/analyticsDashboard/components/ChartCard.tsx
+++ b/datahub-web-react/src/app/analyticsDashboard/components/ChartCard.tsx
@@ -1,9 +1,9 @@
 import { Card } from 'antd';
 import styled from 'styled-components';
 
-export const ChartCard = styled(Card)<{ shouldScroll: boolean }>`
+export const ChartCard = styled(Card)<{ $shouldScroll: boolean }>`
     margin: 12px;
     box-shadow: ${(props) => props.theme.styles['box-shadow']};
     height: 440px;
-    overflow-y: ${(props) => (props.shouldScroll ? 'scroll' : 'hidden')};
+    overflow-y: ${(props) => (props.$shouldScroll ? 'scroll' : 'hidden')};
 `;
diff --git a/datahub-web-react/src/app/auth/useGetLogoutHandler.ts b/datahub-web-react/src/app/auth/useGetLogoutHandler.ts
new file mode 100644
index 00000000000000..a4b35b4de8db23
--- /dev/null
+++ b/datahub-web-react/src/app/auth/useGetLogoutHandler.ts
@@ -0,0 +1,17 @@
+import { useCallback } from 'react';
+import Cookies from 'js-cookie';
+import { GlobalCfg } from '@src/conf';
+import analytics, { EventType } from '../analytics';
+import { useUserContext } from '../context/useUserContext';
+import { isLoggedInVar } from './checkAuthStatus';
+
+export default function useGetLogoutHandler() {
+    const me = useUserContext();
+
+    return useCallback(() => {
+        analytics.event({ type: EventType.LogOutEvent });
+        isLoggedInVar(false);
+        Cookies.remove(GlobalCfg.CLIENT_AUTH_COOKIE);
+        me.updateLocalState({ selectedViewUrn: undefined });
+    }, [me]);
+}
diff --git a/datahub-web-react/src/app/buildEntityRegistryV2.ts b/datahub-web-react/src/app/buildEntityRegistryV2.ts
new file mode 100644
index 00000000000000..7461034bf81270
--- /dev/null
+++ b/datahub-web-react/src/app/buildEntityRegistryV2.ts
@@ -0,0 +1,58 @@
+import EntityRegistry from './entityV2/EntityRegistry';
+import { DashboardEntity } from './entityV2/dashboard/DashboardEntity';
+import { ChartEntity } from './entityV2/chart/ChartEntity';
+import { UserEntity } from './entityV2/user/User';
+import { GroupEntity } from './entityV2/group/Group';
+import { DatasetEntity } from './entityV2/dataset/DatasetEntity';
+import { DataFlowEntity } from './entityV2/dataFlow/DataFlowEntity';
+import { DataJobEntity } from './entityV2/dataJob/DataJobEntity';
+import { TagEntity } from './entityV2/tag/Tag';
+import { GlossaryTermEntity } from './entityV2/glossaryTerm/GlossaryTermEntity';
+import { MLFeatureEntity } from './entityV2/mlFeature/MLFeatureEntity';
+import { MLPrimaryKeyEntity } from './entityV2/mlPrimaryKey/MLPrimaryKeyEntity';
+import { MLFeatureTableEntity } from './entityV2/mlFeatureTable/MLFeatureTableEntity';
+import { MLModelEntity } from './entityV2/mlModel/MLModelEntity';
+import { MLModelGroupEntity } from './entityV2/mlModelGroup/MLModelGroupEntity';
+import { DomainEntity } from './entityV2/domain/DomainEntity';
+import { ContainerEntity } from './entityV2/container/ContainerEntity';
+import GlossaryNodeEntity from './entityV2/glossaryNode/GlossaryNodeEntity';
+import { DataPlatformEntity } from './entityV2/dataPlatform/DataPlatformEntity';
+import { DataProductEntity } from './entityV2/dataProduct/DataProductEntity';
+import { DataPlatformInstanceEntity } from './entityV2/dataPlatformInstance/DataPlatformInstanceEntity';
+import { RoleEntity } from './entityV2/Access/RoleEntity';
+import { QueryEntity } from './entityV2/query/QueryEntity';
+import { SchemaFieldEntity } from './entityV2/schemaField/SchemaFieldEntity';
+import { StructuredPropertyEntity } from './entityV2/structuredProperty/StructuredPropertyEntity';
+import { DataProcessInstanceEntity } from './entityV2/dataProcessInstance/DataProcessInstanceEntity';
+import { BusinessAttributeEntity } from './entityV2/businessAttribute/BusinessAttributeEntity';
+
+export default function buildEntityRegistryV2() {
+    const registry = new EntityRegistry();
+    registry.register(new DatasetEntity());
+    registry.register(new DashboardEntity());
+    registry.register(new ChartEntity());
+    registry.register(new UserEntity());
+    registry.register(new GroupEntity());
+    registry.register(new TagEntity());
+    registry.register(new DataFlowEntity());
+    registry.register(new DataJobEntity());
+    registry.register(new GlossaryTermEntity());
+    registry.register(new MLFeatureEntity());
+    registry.register(new MLPrimaryKeyEntity());
+    registry.register(new MLFeatureTableEntity());
+    registry.register(new MLModelEntity());
+    registry.register(new MLModelGroupEntity());
+    registry.register(new DomainEntity());
+    registry.register(new ContainerEntity());
+    registry.register(new GlossaryNodeEntity());
+    registry.register(new RoleEntity());
+    registry.register(new DataPlatformEntity());
+    registry.register(new DataProductEntity());
+    registry.register(new DataPlatformInstanceEntity());
+    registry.register(new QueryEntity());
+    registry.register(new SchemaFieldEntity());
+    registry.register(new StructuredPropertyEntity());
+    registry.register(new DataProcessInstanceEntity());
+    registry.register(new BusinessAttributeEntity());
+    return registry;
+}
diff --git a/datahub-web-react/src/app/dataviz/ChartCard.tsx b/datahub-web-react/src/app/dataviz/ChartCard.tsx
new file mode 100644
index 00000000000000..6d25daca9bc1e2
--- /dev/null
+++ b/datahub-web-react/src/app/dataviz/ChartCard.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+
+import { Typography } from 'antd';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../entity/shared/constants';
+
+const Card = styled.div`
+    display: flex;
+    flex-direction: column;
+    padding: 1rem;
+    background-color: white;
+    box-shadow: 0px 3px 6px 0px ${ANTD_GRAY[5]};
+    border-radius: 8px;
+
+    text {
+        fill: ${ANTD_GRAY[8]};
+        font-weight: 400 !important;
+    }
+`;
+
+const Header = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+`;
+
+const Body = styled.div`
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+`;
+
+const Heading = styled(Typography.Text)`
+	display: block;
+	font-size: 14px;s
+	font-weight: 600;
+	color: ${ANTD_GRAY[8]};
+	min-width: 300px;
+`;
+
+interface Props {
+    title: string;
+    chart: React.ReactElement;
+    flex?: number;
+}
+
+export const ChartCard = ({ title, chart, flex = 1 }: Props) => (
+    <Card style={{ flex }}>
+        <Header>
+            <Heading>{title}</Heading>
+        </Header>
+        <Body>{chart}</Body>
+    </Card>
+);
diff --git a/datahub-web-react/src/app/dataviz/ChartLoading.tsx b/datahub-web-react/src/app/dataviz/ChartLoading.tsx
new file mode 100644
index 00000000000000..393791aba6603f
--- /dev/null
+++ b/datahub-web-react/src/app/dataviz/ChartLoading.tsx
@@ -0,0 +1,3 @@
+import React from 'react';
+
+export const ChartLoading = () => <>Chart</>;
diff --git a/datahub-web-react/src/app/dataviz/Legend.tsx b/datahub-web-react/src/app/dataviz/Legend.tsx
new file mode 100644
index 00000000000000..a199894ae39d67
--- /dev/null
+++ b/datahub-web-react/src/app/dataviz/Legend.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+
+import { LegendOrdinal, LegendItem, LegendLabel } from '@visx/legend';
+
+interface Props {
+    scale: any;
+}
+
+export const Legend = ({ scale }: Props) => {
+    return (
+        <LegendOrdinal scale={scale}>
+            {(labels) => (
+                <div style={{ display: 'flex', flexDirection: 'row' }}>
+                    {labels.map((label) => (
+                        <LegendItem
+                            key={`legend-quantile-${label.text}-${label.value}-${Math.random() * 2024}`}
+                            margin="0 20px 0 0"
+                        >
+                            <svg width={8} height={8}>
+                                <rect fill={label.value} width={8} height={8} />
+                            </svg>
+                            <LegendLabel align="left" margin="0 0 0 5px">
+                                {label.text}
+                            </LegendLabel>
+                        </LegendItem>
+                    ))}
+                </div>
+            )}
+        </LegendOrdinal>
+    );
+};
diff --git a/datahub-web-react/src/app/dataviz/bar/BarChart.tsx b/datahub-web-react/src/app/dataviz/bar/BarChart.tsx
new file mode 100644
index 00000000000000..1176bc7ea7ebf6
--- /dev/null
+++ b/datahub-web-react/src/app/dataviz/bar/BarChart.tsx
@@ -0,0 +1,108 @@
+import React from 'react';
+
+import dayjs from 'dayjs';
+
+import { Axis, BarSeries, BarStack, Grid, XYChart } from '@visx/xychart';
+import { ParentSize } from '@visx/responsive';
+
+import { Legend } from '../Legend';
+import { ChartWrapper } from '../components';
+
+import { abbreviateNumber } from '../utils';
+
+export const BarChart = <Data extends object, DataKeys>({
+    data,
+    dataKeys,
+    xAccessor,
+    yAccessor,
+    colorAccessor,
+    tickFormat = 'MMM D',
+    yAxisLabel,
+}: {
+    data: any;
+    dataKeys: DataKeys;
+    xAccessor: (d: Data) => string;
+    yAccessor: (d: any, key: string) => string;
+    colorAccessor: (d: string) => string;
+    tickFormat?: string;
+    yAxisLabel?: string;
+}) => {
+    if (!Array.isArray(dataKeys)) throw new Error('Datakeys must be an array');
+
+    const multipleData = dataKeys.length > 1;
+    const margin = { top: 20, right: 20, bottom: 30, left: 60 };
+    const tickCount = Math.max(1, Math.min(data.length, 10));
+
+    return (
+        <ChartWrapper>
+            <ParentSize>
+                {({ width }) => {
+                    if (!width) return null;
+
+                    return (
+                        <>
+                            <XYChart
+                                width={width}
+                                height={255}
+                                xScale={{ type: 'band', nice: true, invert: true, paddingInner: 0.3 }}
+                                yScale={{ type: 'linear' }}
+                                margin={margin}
+                                captureEvents={false}
+                            >
+                                <Grid columns={false} numTicks={tickCount} lineStyle={{ stroke: '#EAEAEA' }} />
+                                {multipleData ? (
+                                    <BarStack>
+                                        {dataKeys
+                                            .slice()
+                                            .reverse()
+                                            .map((dK) => (
+                                                <BarSeries
+                                                    key={dK}
+                                                    dataKey={dK}
+                                                    data={data}
+                                                    xAccessor={xAccessor}
+                                                    yAccessor={(d) => yAccessor(d, dK)}
+                                                    colorAccessor={() => colorAccessor(dK)}
+                                                />
+                                            ))}
+                                    </BarStack>
+                                ) : (
+                                    <BarSeries
+                                        dataKey={dataKeys[0]}
+                                        data={data}
+                                        xAccessor={xAccessor}
+                                        yAccessor={(d) => yAccessor(d, dataKeys[0])}
+                                        colorAccessor={() => colorAccessor(dataKeys[0])}
+                                        radiusTop
+                                    />
+                                )}
+                                <Axis
+                                    orientation="bottom"
+                                    numTicks={Math.round(width / 100)}
+                                    tickFormat={(d) => dayjs(d).format(tickFormat)}
+                                    hideAxisLine
+                                />
+                                {/* Left Axis is for COUNT/NUMBER values only */}
+                                <Axis
+                                    orientation="left"
+                                    label={yAxisLabel}
+                                    labelOffset={20}
+                                    numTicks={tickCount}
+                                    tickLineProps={{ strokeWidth: 1 }}
+                                    tickFormat={(value) => (Number.isInteger(value) ? value : '')}
+                                    tickComponent={({ x, y, formattedValue }) => (
+                                        <text x={x} y={y} dy={3} dx={-3} fontSize="10" textAnchor="end">
+                                            <tspan>{abbreviateNumber(formattedValue)}</tspan>
+                                        </text>
+                                    )}
+                                    hideAxisLine
+                                />
+                            </XYChart>
+                            <Legend scale={colorAccessor} />
+                        </>
+                    );
+                }}
+            </ParentSize>
+        </ChartWrapper>
+    );
+};
diff --git a/datahub-web-react/src/app/dataviz/bar/HorizontalBarChart.tsx b/datahub-web-react/src/app/dataviz/bar/HorizontalBarChart.tsx
new file mode 100644
index 00000000000000..9a963addc834d6
--- /dev/null
+++ b/datahub-web-react/src/app/dataviz/bar/HorizontalBarChart.tsx
@@ -0,0 +1,157 @@
+/* eslint-disable @typescript-eslint/dot-notation, no-param-reassign */
+
+import React from 'react';
+
+import { Grid, XYChart } from '@visx/xychart';
+import { BarStackHorizontal, Bar } from '@visx/shape';
+import { AxisLeft } from '@visx/axis';
+import { scaleLinear, scaleBand } from '@visx/scale';
+import { ParentSize } from '@visx/responsive';
+
+import { Legend } from '../Legend';
+import { ChartWrapper } from '../components';
+
+import { COMPLETED_COLOR, NOT_STARTED_COLOR, IN_PROGRESS_COLOR } from '../constants';
+
+export const HorizontalBarChart = <Data extends object, DataKeys>({
+    data,
+    dataKeys,
+    yAccessor,
+    colorAccessor,
+}: {
+    data: Data[];
+    dataKeys: DataKeys;
+    yAccessor: (d: Data) => string;
+    colorAccessor: (d: string) => string;
+}) => {
+    if (!data || !data.length || !dataKeys) return null;
+    if (!Array.isArray(dataKeys)) throw new Error('Datakeys must be an array');
+
+    const totals = data.reduce((allTotals, currentDate) => {
+        const total = dataKeys.reduce((dailyTotal, k) => {
+            dailyTotal += Number(currentDate[k]);
+            return dailyTotal;
+        }, 0);
+        allTotals.push(total);
+        return allTotals;
+    }, [] as number[]);
+
+    const xScale = scaleLinear<number>({
+        domain: [0, Math.max(...totals)],
+        nice: true,
+    });
+
+    const yScale = scaleBand<string>({
+        domain: data.map(yAccessor),
+        padding: 0.2,
+    });
+
+    return (
+        <ChartWrapper>
+            <ParentSize>
+                {({ width: parentWidth }) => {
+                    if (!parentWidth) return null;
+
+                    const margin = { top: 20, right: 0, bottom: 0, left: 120 };
+                    const baseHeight = data.length < 2 ? 180 : 280;
+                    const xMax = parentWidth - margin.left - margin.right;
+                    const yMax = baseHeight - margin.top - margin.bottom;
+
+                    xScale.rangeRound([0, xMax]);
+                    yScale.rangeRound([yMax, 0]);
+
+                    return (
+                        <>
+                            <XYChart
+                                width={parentWidth}
+                                height={baseHeight}
+                                margin={margin}
+                                xScale={{ type: 'linear' }}
+                                yScale={{ type: 'band', paddingInner: 0.3 }}
+                                captureEvents={false}
+                            >
+                                <Grid numTicks={5} lineStyle={{ stroke: '#EAEAEA' }} rows={false} />
+
+                                <BarStackHorizontal
+                                    data={data}
+                                    keys={dataKeys.slice().reverse()}
+                                    width={parentWidth}
+                                    height={baseHeight}
+                                    y={yAccessor}
+                                    xScale={xScale}
+                                    yScale={yScale}
+                                    color={colorAccessor}
+                                >
+                                    {(barStacks) =>
+                                        barStacks.map((barStack) =>
+                                            barStack.bars.map((bar) => {
+                                                // Use the bar color to determine which label to display for Doc Initiatives
+                                                let label = null;
+                                                if (bar.color === COMPLETED_COLOR) label = bar.bar.data['Completed'];
+                                                if (bar.color === IN_PROGRESS_COLOR)
+                                                    label = bar.bar.data['In Progress'];
+                                                if (bar.color === NOT_STARTED_COLOR)
+                                                    label = bar.bar.data['Not Started'];
+
+                                                if (label === '0') return null;
+
+                                                const { x, y, width, height } = bar;
+                                                const { left } = margin;
+
+                                                const newX = x + left + 10;
+                                                const barWidth = width + 5;
+
+                                                let textX = barWidth <= 20 ? newX + barWidth - 5 : newX + barWidth - 15;
+                                                if (barWidth > 300) textX = newX + barWidth - 20;
+
+                                                return (
+                                                    <g key={`barstack-horizontal-${barStack.index}-${bar.index}`}>
+                                                        <Bar
+                                                            x={newX}
+                                                            y={y}
+                                                            width={barWidth}
+                                                            height={height}
+                                                            fill={bar.color}
+                                                        />
+                                                        {label && (
+                                                            <text
+                                                                className="horizontalBarChartInlineLabel"
+                                                                x={textX}
+                                                                y={y + height / 2}
+                                                                dy=".33em"
+                                                                textAnchor="end"
+                                                                fontSize={11}
+                                                            >
+                                                                {label}
+                                                            </text>
+                                                        )}
+                                                    </g>
+                                                );
+                                            }),
+                                        )
+                                    }
+                                </BarStackHorizontal>
+                                <AxisLeft
+                                    hideAxisLine
+                                    scale={yScale}
+                                    tickLabelProps={{
+                                        fontSize: 11,
+                                        textAnchor: 'end',
+                                        dy: '0.33em',
+                                        x: margin.left,
+                                        width: 135,
+                                    }}
+                                    tickLineProps={{
+                                        x1: margin.left + 5,
+                                        x2: margin.left + 10,
+                                    }}
+                                />
+                            </XYChart>
+                            <Legend scale={colorAccessor} />
+                        </>
+                    );
+                }}
+            </ParentSize>
+        </ChartWrapper>
+    );
+};
diff --git a/datahub-web-react/src/app/dataviz/bar/HorizontalFullBarChart.tsx b/datahub-web-react/src/app/dataviz/bar/HorizontalFullBarChart.tsx
new file mode 100644
index 00000000000000..4bb5848a38008b
--- /dev/null
+++ b/datahub-web-react/src/app/dataviz/bar/HorizontalFullBarChart.tsx
@@ -0,0 +1,157 @@
+/* eslint-disable @typescript-eslint/dot-notation, no-param-reassign */
+
+import React from 'react';
+
+import { Grid, XYChart } from '@visx/xychart';
+import { BarStackHorizontal, Bar } from '@visx/shape';
+import { AxisLeft } from '@visx/axis';
+import { scaleLinear, scaleBand } from '@visx/scale';
+import { ParentSize } from '@visx/responsive';
+
+import { Legend } from '../Legend';
+import { ChartWrapper } from '../components';
+
+import { COMPLETED_COLOR, NOT_STARTED_COLOR, IN_PROGRESS_COLOR } from '../constants';
+
+export const HorizontalFullBarChart = <Data extends object, DataKeys>({
+    data,
+    dataKeys,
+    yAccessor,
+    colorAccessor,
+}: {
+    data: Data[];
+    dataKeys: DataKeys;
+    yAccessor: (d: Data) => string;
+    colorAccessor: (d: string) => string;
+}) => {
+    if (!data || !data.length || !dataKeys) return null;
+    if (!Array.isArray(dataKeys)) throw new Error('Datakeys must be an array');
+
+    const totals = data.reduce((allTotals, currentDate) => {
+        const total = dataKeys.reduce((dailyTotal, k) => {
+            dailyTotal += Number(currentDate[k]);
+            return dailyTotal;
+        }, 0);
+        allTotals.push(total);
+        return allTotals;
+    }, [] as number[]);
+
+    const xScale = scaleLinear<number>({
+        domain: [0, Math.max(...totals)],
+        nice: true,
+    });
+
+    const yScale = scaleBand<string>({
+        domain: data.map(yAccessor),
+        padding: 0.2,
+    });
+
+    return (
+        <ChartWrapper>
+            <ParentSize>
+                {({ width: parentWidth }) => {
+                    if (!parentWidth) return null;
+
+                    const margin = { top: 20, right: 0, bottom: 0, left: 120 };
+                    const baseHeight = 280;
+                    const calculatedHeight = data.length > 4 ? baseHeight + data.length * 10 : baseHeight;
+                    const xMax = parentWidth - margin.left - margin.right;
+                    const yMax = calculatedHeight - margin.top - margin.bottom;
+
+                    xScale.rangeRound([0, xMax]);
+                    yScale.rangeRound([yMax, 0]);
+
+                    return (
+                        <>
+                            <XYChart
+                                width={parentWidth}
+                                height={baseHeight}
+                                margin={margin}
+                                xScale={{ type: 'linear' }}
+                                yScale={{ type: 'band', paddingInner: 0.3 }}
+                                captureEvents={false}
+                            >
+                                <Grid numTicks={5} lineStyle={{ stroke: '#EAEAEA' }} rows={false} />
+
+                                <BarStackHorizontal
+                                    data={data}
+                                    keys={dataKeys.slice().reverse()}
+                                    width={parentWidth}
+                                    y={yAccessor}
+                                    xScale={xScale}
+                                    yScale={yScale}
+                                    color={colorAccessor}
+                                >
+                                    {(barStacks) =>
+                                        barStacks.map((barStack) =>
+                                            barStack.bars.map((bar) => {
+                                                // Use the bar color to determine which label to display for Doc Initiatives
+                                                let label = null;
+                                                if (bar.color === COMPLETED_COLOR) label = bar.bar.data['Completed'];
+                                                if (bar.color === IN_PROGRESS_COLOR)
+                                                    label = bar.bar.data['In Progress'];
+                                                if (bar.color === NOT_STARTED_COLOR)
+                                                    label = bar.bar.data['Not Started'];
+
+                                                if (label === '0') return null;
+
+                                                const { x, y, width, height } = bar;
+                                                const { left } = margin;
+
+                                                const newX = x + left + 10;
+                                                const barWidth = width + 5;
+
+                                                let textX = barWidth <= 20 ? newX + barWidth - 5 : newX + barWidth - 10;
+                                                if (barWidth > 300) textX = newX + barWidth - 20;
+
+                                                return (
+                                                    <g key={`barstack-horizontal-${barStack.index}-${bar.index}`}>
+                                                        <Bar
+                                                            x={newX}
+                                                            y={y}
+                                                            width={barWidth}
+                                                            height={height}
+                                                            fill={bar.color}
+                                                        />
+                                                        {label && (
+                                                            <text
+                                                                className="horizontalBarChartInlineLabel"
+                                                                x={textX}
+                                                                y={y + height / 2}
+                                                                dy=".33em"
+                                                                textAnchor="end"
+                                                                fontSize={11}
+                                                            >
+                                                                {label}
+                                                            </text>
+                                                        )}
+                                                    </g>
+                                                );
+                                            }),
+                                        )
+                                    }
+                                </BarStackHorizontal>
+                                <AxisLeft
+                                    hideAxisLine
+                                    scale={yScale}
+                                    tickLabelProps={{
+                                        fontSize: 11,
+                                        textAnchor: 'end',
+                                        dy: '0.33em',
+                                        x: margin.left,
+                                        width: 135,
+                                    }}
+                                    tickLineProps={{
+                                        x1: margin.left + 5,
+                                        x2: margin.left + 10,
+                                    }}
+                                />
+                            </XYChart>
+                            <Legend scale={colorAccessor} />
+                        </>
+                    );
+                }}
+            </ParentSize>
+        </ChartWrapper>
+    );
+};
diff --git a/datahub-web-react/src/app/dataviz/candle/CandleStick.tsx b/datahub-web-react/src/app/dataviz/candle/CandleStick.tsx
new file mode 100644
index 00000000000000..437c677c7f11e5
--- /dev/null
+++ b/datahub-web-react/src/app/dataviz/candle/CandleStick.tsx
@@ -0,0 +1,79 @@
+import React from 'react';
+
+import { Group } from '@visx/group';
+import { Bar } from '@visx/shape';
+import { BarProps } from '@visx/shape/lib/shapes/Bar';
+import { GlyphCircle, GlyphDiamond } from '@visx/glyph';
+import { GlyphDiamondProps } from '@visx/glyph/lib/glyphs/GlyphDiamond';
+import { GlyphCircleProps } from '@visx/glyph/lib/glyphs/GlyphCircle';
+import { AddSVGProps } from '@visx/shape/lib/types';
+
+type DiamondProps = GlyphDiamondProps<any> & Omit<React.SVGProps<SVGPathElement>, keyof GlyphDiamondProps<any>>;
+type CircleProps = GlyphCircleProps<any> & Omit<React.SVGProps<SVGPathElement>, keyof GlyphCircleProps<any>>;
+type CandleBarProps = AddSVGProps<BarProps, SVGRectElement>;
+
+type Props = {
+    parentChartHeight: number;
+    candleHeight: number;
+    barWidth: number;
+    shapeSize: number;
+    leftOffset: number;
+    color: string;
+    shape:
+        | {
+              type: 'diamond';
+              extraProps?: DiamondProps;
+          }
+        | {
+              type: 'circle';
+              extraProps?: CircleProps;
+          };
+    markerOverlapPx?: number;
+    extraBarProps?: CandleBarProps;
+    opacity?: number;
+    wrapper?: (children: JSX.Element) => JSX.Element;
+};
+export const CandleStick = ({
+    parentChartHeight,
+    candleHeight,
+    barWidth,
+    shapeSize,
+    leftOffset,
+    color,
+    shape,
+    wrapper,
+    opacity,
+    markerOverlapPx,
+    extraBarProps,
+}: Props) => {
+    const yOffset = parentChartHeight - candleHeight;
+
+    const shapeProps: DiamondProps | CircleProps = {
+        top: yOffset,
+        left: leftOffset,
+        fill: color,
+        stroke: 'white',
+        strokeWidth: (markerOverlapPx ?? 1) > 1 ? 1 / (markerOverlapPx ?? 1) : 1,
+        filter: markerOverlapPx ? undefined : 'drop-shadow(0px 1px 2.5px rgb(0 0 0 / 0.1))',
+        size: shapeSize,
+        ...shape.extraProps,
+    };
+    const barProps: CandleBarProps = {
+        height: candleHeight,
+        width: barWidth,
+        x: leftOffset - barWidth / 2,
+        y: yOffset,
+        fill: color,
+        stroke: 'white',
+        strokeWidth: (markerOverlapPx ?? 1) > 1 ? 1 / (markerOverlapPx ?? 1) : 1,
+        ...extraBarProps,
+    };
+
+    const candleGroup = (
+        <Group opacity={opacity}>
+            <Bar {...barProps} />
+            {shape.type === 'diamond' ? <GlyphDiamond {...shapeProps} /> : <GlyphCircle {...shapeProps} />}
+        </Group>
+    );
+    return wrapper ? wrapper(candleGroup) : candleGroup;
+};
diff --git a/datahub-web-react/src/app/dataviz/components.ts b/datahub-web-react/src/app/dataviz/components.ts
new file mode 100644
index 00000000000000..9be7476522ce17
--- /dev/null
+++ b/datahub-web-react/src/app/dataviz/components.ts
@@ -0,0 +1,24 @@
+import styled from 'styled-components';
+
+export const ChartWrapper = styled.div`
+    width: 100%;
+    height: 100%;
+    position: relative;
+
+    .horizontalBarChartTick {
+        foreignObject {
+            text-align: right;
+        }
+    }
+
+    .horizontalBarChartInlineLabel {
+        fill: #fff;
+        font-weight: 600;
+        font-family: 'Manrope', sans-serif;
+    }
+
+    .visx-axis-label {
+        font-weight: 600 !important;
+        font-family: 'Manrope', sans-serif !important;
+    }
+`;
diff --git a/datahub-web-react/src/app/dataviz/constants.ts b/datahub-web-react/src/app/dataviz/constants.ts
new file mode 100644
index 00000000000000..ba8b2d642ca68e
--- /dev/null
+++ b/datahub-web-react/src/app/dataviz/constants.ts
@@ -0,0 +1,5 @@
+export type STATUS = 'Completed' | 'In Progress' | 'Not Started';
+
+export const COMPLETED_COLOR = '#20D3BD';
+export const IN_PROGRESS_COLOR = '#7532A4';
+export const NOT_STARTED_COLOR = '#1677FF';
diff --git a/datahub-web-react/src/app/dataviz/index.ts b/datahub-web-react/src/app/dataviz/index.ts
new file mode 100644
index 00000000000000..070c56bb50351e
--- /dev/null
+++ b/datahub-web-react/src/app/dataviz/index.ts
@@ -0,0 +1,6 @@
+export * from './ChartCard';
+export * from './ChartLoading';
+export * from './bar/BarChart';
+export * from './bar/HorizontalBarChart';
+export * from './bar/HorizontalFullBarChart';
+export * from './pie/PieChart';
diff --git a/datahub-web-react/src/app/dataviz/line/SimpleLineChart.tsx b/datahub-web-react/src/app/dataviz/line/SimpleLineChart.tsx
new file mode 100644
index 00000000000000..aa8831078ce643
--- /dev/null
+++ b/datahub-web-react/src/app/dataviz/line/SimpleLineChart.tsx
@@ -0,0 +1,69 @@
+import React from 'react';
+
+import { curveCatmullRom } from '@visx/curve';
+import { LinePath } from '@visx/shape';
+import { ParentSize } from '@visx/responsive';
+import { MarkerCircle } from '@visx/marker';
+import { extent, max } from '@visx/vendor/d3-array';
+import { scaleTime, scaleLinear } from '@visx/scale';
+
+import { ChartWrapper } from '../components';
+
+interface Props {
+    data: any;
+}
+
+type Data = {
+    date: string;
+    value: number;
+};
+
+export const SimpleLineChart = ({ data }: Props) => {
+    const getDate = (d: Data) => new Date(d.date);
+    const getValue = (d: Data) => d.value;
+
+    const markerEnd = 'url(#marker-circle)';
+
+    return (
+        <ChartWrapper>
+            <ParentSize>
+                {({ width }) => {
+                    if (!width) return null;
+
+                    const height = 20;
+
+                    const xScale = scaleTime<number>({
+                        range: [0, width - 10],
+                        domain: extent(data, getDate) as [Date, Date],
+                    });
+
+                    const yScale = scaleLinear<number>({
+                        range: [height / 2, 5],
+                        domain: [0, (max(data, getValue) || 0) as number],
+                        nice: true,
+                    });
+
+                    return (
+                        <svg width={width} height={height}>
+                            <defs>
+                                <linearGradient id="gradient" x1="0%" y1="0%" x2="100%" y2="100%">
+                                    <stop offset="0%" stopColor="#20D3BD" />
+                                    <stop offset="100%" stopColor="#9F33CC" />
+                                </linearGradient>
+                            </defs>
+                            <MarkerCircle id="marker-circle" fill="#9F33CC" stroke="#fff" strokeWidth={2} size={3} />
+                            <LinePath
+                                data={data}
+                                x={(d: Data) => xScale(getDate(d))}
+                                y={(d: Data) => yScale(getValue(d))}
+                                curve={curveCatmullRom}
+                                markerEnd={markerEnd}
+                                stroke="#9F33CC"
+                            />
+                        </svg>
+                    );
+                }}
+            </ParentSize>
+        </ChartWrapper>
+    );
+};
diff --git a/datahub-web-react/src/app/dataviz/pie/PieChart.tsx b/datahub-web-react/src/app/dataviz/pie/PieChart.tsx
new file mode 100644
index 00000000000000..6925e7b59ad69d
--- /dev/null
+++ b/datahub-web-react/src/app/dataviz/pie/PieChart.tsx
@@ -0,0 +1,90 @@
+import React from 'react';
+
+import { Pie } from '@visx/shape';
+import { PieArcDatum } from '@visx/shape/lib/shapes/Pie';
+import { Annotation, Label, Connector } from '@visx/annotation';
+
+import { useDataAnnotationPosition } from './usePieDataAnnotation';
+
+const PieDataAnnotation = ({
+    title,
+    arc,
+    path,
+    subtitle,
+}: {
+    title: string;
+    path: any;
+    arc: PieArcDatum<{ [x: string]: string }>;
+    subtitle?: string;
+}) => {
+    const { surfaceX, surfaceY, labelX, labelY } = useDataAnnotationPosition({ arc, path });
+
+    return (
+        <Annotation x={surfaceX} y={surfaceY} dx={labelX} dy={labelY}>
+            <Connector type="elbow" className="dark-width" />
+            <Label
+                showBackground={false}
+                showAnchorLine={false}
+                title={title}
+                titleFontWeight={600}
+                titleFontSize={12}
+                subtitle={subtitle}
+                subtitleFontSize={10}
+                width={85}
+            />
+        </Annotation>
+    );
+};
+
+export const PieChart = ({ data }: any) => {
+    const width = 380;
+    const height = 280;
+    const margin = { top: 50, right: 50, bottom: 50, left: 50 };
+
+    const innerWidth = width - margin.left - margin.right;
+    const innerHeight = height - margin.top - margin.bottom;
+    const radius = Math.min(innerWidth, innerHeight) * 0.45;
+    const centerY = innerHeight / 2;
+    const centerX = innerWidth / 2;
+
+    const pieSortValues = (a, b) => b - a;
+    const value = (d) => d.value;
+
+    const createValueLabel = (count: number) => {
+        let total = 0;
+        data.forEach((d) => {
+            total += d.value;
+        });
+        const percent = Math.round((count / total) * 100);
+        return `${percent}% (${count.toLocaleString()})`;
+    };
+
+    return (
+        <svg width={width} height={height}>
+            <g transform={`translate(${centerX + margin.left}, ${centerY + margin.top})`}>
+                <Pie data={data} pieValue={value} pieSortValues={pieSortValues} outerRadius={radius}>
+                    {(pie) => {
+                        return pie.arcs.map((arc) => {
+                            const { name } = arc.data;
+                            const { color } = arc.data;
+                            const arcPath = pie.path(arc);
+                            return (
+                                <g key={`arc-${name}`}>
+                                    <path d={arcPath || ''} fill={color} stroke="white" strokeWidth="2" />
+                                    {arc.endAngle - arc.startAngle !== 0 ? (
+                                        <PieDataAnnotation
+                                            arc={arc}
+                                            path={pie.path}
+                                            title={arc.data.name}
+                                            subtitle={createValueLabel(arc.value)}
+                                        />
+                                    ) : null}
+                                </g>
+                            );
+                        });
+                    }}
+                </Pie>
+            </g>
+        </svg>
+    );
+};
diff --git a/datahub-web-react/src/app/dataviz/pie/usePieDataAnnotation.ts b/datahub-web-react/src/app/dataviz/pie/usePieDataAnnotation.ts
new file mode 100644
index 00000000000000..1aeed5f169a848
--- /dev/null
+++ b/datahub-web-react/src/app/dataviz/pie/usePieDataAnnotation.ts
@@ -0,0 +1,36 @@
+import { PieArcDatum } from '@visx/shape/lib/shapes/Pie';
+
+const useDataAnnotationPosition = ({
+    arc,
+    path,
+}: {
+    arc: PieArcDatum<{ [x: string]: string }>;
+    path: any;
+}): {
+    labelX: number;
+    labelY: number;
+    surfaceX: number;
+    surfaceY: number;
+} => {
+    const middleAngle = Math.PI / 2 - (arc.startAngle + (arc.endAngle - arc.startAngle) / 2);
+
+    const outerRadius: number = path.outerRadius()(arc);
+
+    const normalX = Math.cos(middleAngle);
+    const normalY = Math.sin(-middleAngle);
+
+    const labelX = normalX * outerRadius * 0.1 * (middleAngle < Math.PI ? 1 : -1);
+    const labelY = normalY * outerRadius * 0.1;
+
+    const surfaceX = normalX * outerRadius;
+    const surfaceY = normalY * outerRadius;
+
+    return {
+        labelX,
+        labelY,
+        surfaceX,
+        surfaceY,
+    };
+};
+
+export { useDataAnnotationPosition };
diff --git a/datahub-web-react/src/app/dataviz/stat/SingleStat.tsx b/datahub-web-react/src/app/dataviz/stat/SingleStat.tsx
new file mode 100644
index 00000000000000..bce1553c2d7f57
--- /dev/null
+++ b/datahub-web-react/src/app/dataviz/stat/SingleStat.tsx
@@ -0,0 +1,5 @@
+import React from 'react';
+
+export const SingleStat = () => {
+    return <>stat</>;
+};
diff --git a/datahub-web-react/src/app/dataviz/utils.ts b/datahub-web-react/src/app/dataviz/utils.ts
new file mode 100644
index 00000000000000..c09e903ee47352
--- /dev/null
+++ b/datahub-web-react/src/app/dataviz/utils.ts
@@ -0,0 +1,130 @@
+import dayjs from 'dayjs';
+import { scaleOrdinal } from '@visx/scale';
+
+import { COMPLETED_COLOR, NOT_STARTED_COLOR, IN_PROGRESS_COLOR } from './constants';
+
+// Mock Data Util
+export const generateDateSeries = (numOfDays) =>
+    Array(numOfDays)
+        .fill(0)
+        .map((d, i) => ({
+            date: dayjs(new Date(Date.now() - 24 * 60 * 60 * 1000 * i)).format(),
+            value: Math.round(Math.max(10, Math.random() * 100 || 0)),
+        }));
+
+// Status Ordinal Scale
+export const statusOrdinalScale = scaleOrdinal({
+    domain: ['Not Started', 'In Progress', 'Completed'],
+    range: [NOT_STARTED_COLOR, IN_PROGRESS_COLOR, COMPLETED_COLOR],
+});
+
+// private utils to help with rounding y axis numbers
+const NUMERICAL_ABBREVIATIONS = ['k', 'm', 'b', 't'];
+function roundToPrecision(n: number, precision: number) {
+    const prec = 10 ** precision;
+    return Math.round(n * prec) / prec;
+}
+
+/**
+ * ie. 24044 -> 24k
+ * @param n
+ */
+export const truncateNumberForDisplay = (n: number, skipRounding?: boolean): string => {
+    let base = Math.floor(Math.log(Math.abs(n)) / Math.log(1000));
+    const suffix = NUMERICAL_ABBREVIATIONS[Math.min(NUMERICAL_ABBREVIATIONS.length - 1, base - 1)];
+    base = NUMERICAL_ABBREVIATIONS.indexOf(suffix) + 1;
+    const roundedNumber = skipRounding ? n : Math.round(n);
+    return suffix ? roundToPrecision(n / 1000 ** base, 0) + suffix : `${roundedNumber}`;
+};
+
+// Number Abbreviations
+export const abbreviateNumber = (str) => {
+    const number = parseFloat(str);
+    if (Number.isNaN(number)) return str;
+    if (number < 1000) return number;
+    const abbreviations = ['K', 'M', 'B', 'T'];
+    const index = Math.floor(Math.log10(number) / 3);
+    const suffix = abbreviations[index - 1];
+    const shortNumber = number / 10 ** (index * 3);
+    return `${shortNumber}${suffix}`;
+};
+
+// Byte Abbreviations
+export const abbreviateBytes = (str): string => {
+    const bytes = parseFloat(str);
+    if (Number.isNaN(bytes)) return str;
+    if (bytes < 1024) return `${bytes} B`;
+    const units = ['B', 'KB', 'MB', 'GB', 'TB'];
+    const index = Math.floor(Math.log(bytes) / Math.log(1024));
+    const shortBytes = bytes / 1024 ** index;
+
+    return `${abbreviateNumber(shortBytes.toFixed())} ${units[index]}`;
+};
+
+type CalculateYScaleExtentForChartOptions = {
+    defaultYValue: number;
+    // Between 0-1, represents what % of the chart's height should be empty above and below.
+    // ie. if this is .1, then 10% of the chart's height will be empty.
+    yScaleBufferFactor?: number;
+};
+
+/**
+ * Creates a yscale range for charts, with optional buffers
+ * @param yValues
+ * @param options
+ */
+export const calculateYScaleExtentForChart = (
+    yValues: number[],
+    options: CalculateYScaleExtentForChartOptions = { defaultYValue: 0 },
+): { min: number; max: number } => {
+    let min = yValues.length ? Math.min(...yValues) : options.defaultYValue;
+    let max = yValues.length ? Math.max(...yValues) : options.defaultYValue;
+
+    // Add some extra range above and below so things aren't pushed to the edge
+    const { yScaleBufferFactor } = options;
+    if (yScaleBufferFactor) {
+        let yScaleBuffer = 0;
+        // Edge case: if max and min are the same, add some buffer above and below so the points are nicely centered
+        if (max === min) {
+            // Ie. Let's say max/min=1.5B. In this case we want to add ~100M buffer and and below
+            // This will make the y-axis display 1.4B at the bottom and 1.6B at the top,
+            // While nicely centering the data points.
+            const decimalPlaceValue = max.toString().length;
+            yScaleBuffer = 10 ** (decimalPlaceValue - 1);
+        } else {
+            // By default, the chart will put the min at the bottom edge and the max at the top edge.
+            // So if yScaleBufferFactor=0.1, then we want 10% of the chart at the top and bottom to be empty
+            const distance = max - min;
+            const newDistance = distance / (1 - yScaleBufferFactor);
+            yScaleBuffer = newDistance * yScaleBufferFactor;
+        }
+
+        min -= yScaleBuffer;
+        max += yScaleBuffer;
+    }
+
+    return { min, max };
+};
+
+/**
+ * Gets the px overlap between two markers
+ * @param marker1
+ * @param marker2
+ * @returns {number | undefined} undefined if no overlap
+ */
+export function calculateOverlapBetweenTwoMarkers(
+    marker1: { xOffset: number; width: number },
+    marker2: { xOffset: number; width: number },
+): undefined | number {
+    let markerOverlapPx: number | undefined;
+
+    // Take width of the left and right half of the two markers (where they will collide)
+    const netWidth = marker1.width / 2 + marker2.width / 2;
+
+    // Calculate distance and potential overlap
+    const distance = Math.abs(marker1.xOffset - marker2.xOffset);
+    if (distance < netWidth) {
+        markerOverlapPx = netWidth - distance;
+    }
+    return markerOverlapPx;
+}
diff --git a/datahub-web-react/src/app/domainV2/CreateDomainModal.tsx b/datahub-web-react/src/app/domainV2/CreateDomainModal.tsx
new file mode 100644
index 00000000000000..056e0847c71d61
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/CreateDomainModal.tsx
@@ -0,0 +1,231 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { message, Button, Input, Modal, Typography, Form, Collapse, Tag } from 'antd';
+import { useCreateDomainMutation } from '../../graphql/domain.generated';
+import { useEnterKeyListener } from '../shared/useEnterKeyListener';
+import { validateCustomUrnId } from '../shared/textUtil';
+import analytics, { EventType } from '../analytics';
+import DomainParentSelect from '../entityV2/shared/EntityDropdown/DomainParentSelect';
+import { useIsNestedDomainsEnabled } from '../useAppConfig';
+import { useDomainsContext as useDomainsContextV2 } from './DomainsContext';
+
+const SuggestedNamesGroup = styled.div`
+    margin-top: 8px;
+`;
+
+const ClickableTag = styled(Tag)`
+    :hover {
+        cursor: pointer;
+    }
+`;
+
+const FormItem = styled(Form.Item)`
+    .ant-form-item-label {
+        padding-bottom: 2px;
+    }
+`;
+
+const FormItemWithMargin = styled(FormItem)`
+    margin-bottom: 16px;
+`;
+
+const FormItemNoMargin = styled(FormItem)`
+    margin-bottom: 0;
+`;
+
+const FormItemLabel = styled(Typography.Text)`
+    font-weight: 600;
+    color: #373d44;
+`;
+
+const AdvancedLabel = styled(Typography.Text)`
+    color: #373d44;
+`;
+
+type Props = {
+    onClose: () => void;
+    onCreate: (
+        urn: string,
+        id: string | undefined,
+        name: string,
+        description: string | undefined,
+        parentDomain?: string,
+    ) => void;
+};
+
+const SUGGESTED_DOMAIN_NAMES = ['Engineering', 'Marketing', 'Sales', 'Product'];
+
+const ID_FIELD_NAME = 'id';
+const NAME_FIELD_NAME = 'name';
+const DESCRIPTION_FIELD_NAME = 'description';
+
+export default function CreateDomainModal({ onClose, onCreate }: Props) {
+    const isNestedDomainsEnabled = useIsNestedDomainsEnabled();
+    const [createDomainMutation] = useCreateDomainMutation();
+    const { entityData } = useDomainsContextV2();
+    const [selectedParentUrn, setSelectedParentUrn] = useState<string>(
+        (isNestedDomainsEnabled && entityData?.urn) || '',
+    );
+    const [createButtonEnabled, setCreateButtonEnabled] = useState(false);
+    const [form] = Form.useForm();
+
+    const onCreateDomain = () => {
+        createDomainMutation({
+            variables: {
+                input: {
+                    id: form.getFieldValue(ID_FIELD_NAME),
+                    name: form.getFieldValue(NAME_FIELD_NAME),
+                    description: form.getFieldValue(DESCRIPTION_FIELD_NAME),
+                    parentDomain: selectedParentUrn || undefined,
+                },
+            },
+        })
+            .then(({ data, errors }) => {
+                if (!errors) {
+                    analytics.event({
+                        type: EventType.CreateDomainEvent,
+                        parentDomainUrn: selectedParentUrn || undefined,
+                    });
+                    message.success({
+                        content: `Created domain!`,
+                        duration: 3,
+                    });
+                    onCreate(
+                        data?.createDomain || '',
+                        form.getFieldValue(ID_FIELD_NAME),
+                        form.getFieldValue(NAME_FIELD_NAME),
+                        form.getFieldValue(DESCRIPTION_FIELD_NAME),
+                        selectedParentUrn || undefined,
+                    );
+                    form.resetFields();
+                }
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to create Domain!: \n ${e.message || ''}`, duration: 3 });
+            });
+        onClose();
+    };
+
+    // Handle the Enter press
+    useEnterKeyListener({
+        querySelectorToExecuteClick: '#createDomainButton',
+    });
+
+    return (
+        <Modal
+            title="Create New Domain"
+            visible
+            onCancel={onClose}
+            footer={
+                <>
+                    <Button onClick={onClose} type="text">
+                        Cancel
+                    </Button>
+                    <Button
+                        type="primary"
+                        id="createDomainButton"
+                        data-testid="create-domain-button"
+                        onClick={onCreateDomain}
+                        disabled={!createButtonEnabled}
+                    >
+                        Create
+                    </Button>
+                </>
+            }
+        >
+            <Form
+                form={form}
+                initialValues={{}}
+                layout="vertical"
+                onFieldsChange={() => {
+                    setCreateButtonEnabled(!form.getFieldsError().some((field) => field.errors.length > 0));
+                }}
+            >
+                {isNestedDomainsEnabled && (
+                    <FormItemWithMargin label={<FormItemLabel>Parent (optional)</FormItemLabel>}>
+                        <DomainParentSelect
+                            selectedParentUrn={selectedParentUrn}
+                            setSelectedParentUrn={setSelectedParentUrn}
+                        />
+                    </FormItemWithMargin>
+                )}
+                <FormItemWithMargin label={<FormItemLabel>Name</FormItemLabel>}>
+                    <FormItemNoMargin
+                        name={NAME_FIELD_NAME}
+                        rules={[
+                            {
+                                required: true,
+                                message: 'Enter a Domain name.',
+                            },
+                            { whitespace: true },
+                            { min: 1, max: 150 },
+                        ]}
+                        hasFeedback
+                    >
+                        <Input data-testid="create-domain-name" placeholder="A name for your domain" />
+                    </FormItemNoMargin>
+                    <SuggestedNamesGroup>
+                        {SUGGESTED_DOMAIN_NAMES.map((name) => {
+                            return (
+                                <ClickableTag
+                                    key={name}
+                                    onClick={() => {
+                                        form.setFieldsValue({
+                                            name,
+                                        });
+                                        setCreateButtonEnabled(true);
+                                    }}
+                                >
+                                    {name}
+                                </ClickableTag>
+                            );
+                        })}
+                    </SuggestedNamesGroup>
+                </FormItemWithMargin>
+                <FormItemWithMargin
+                    label={<FormItemLabel>Description</FormItemLabel>}
+                    help="You can always change the description later."
+                >
+                    <FormItemNoMargin
+                        name={DESCRIPTION_FIELD_NAME}
+                        rules={[{ whitespace: true }, { min: 1, max: 500 }]}
+                        hasFeedback
+                    >
+                        <Input.TextArea
+                            placeholder="A description for your domain"
+                            data-testid="create-domain-description"
+                        />
+                    </FormItemNoMargin>
+                </FormItemWithMargin>
+                <Collapse ghost>
+                    <Collapse.Panel header={<AdvancedLabel>Advanced Options</AdvancedLabel>} key="1">
+                        <FormItemWithMargin
+                            label={<Typography.Text strong>Domain Id</Typography.Text>}
+                            help="By default, a random UUID will be generated to uniquely identify this domain. If
+                                you'd like to provide a custom id instead to more easily keep track of this domain,
+                                you may provide it here. Be careful, you cannot easily change the domain id after
+                                creation."
+                        >
+                            <FormItemNoMargin
+                                name={ID_FIELD_NAME}
+                                rules={[
+                                    () => ({
+                                        validator(_, value) {
+                                            if (value && validateCustomUrnId(value)) {
+                                                return Promise.resolve();
+                                            }
+                                            return Promise.reject(new Error('Please enter a valid Domain id'));
+                                        },
+                                    }),
+                                ]}
+                            >
+                                <Input data-testid="create-domain-id" placeholder="engineering" />
+                            </FormItemNoMargin>
+                        </FormItemWithMargin>
+                    </Collapse.Panel>
+                </Collapse>
+            </Form>
+        </Modal>
+    );
+}
diff --git a/datahub-web-react/src/app/domainV2/DomainAutocompleteOptions.tsx b/datahub-web-react/src/app/domainV2/DomainAutocompleteOptions.tsx
new file mode 100644
index 00000000000000..7f392b6b8a57d0
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/DomainAutocompleteOptions.tsx
@@ -0,0 +1,53 @@
+import { LoadingOutlined } from '@ant-design/icons';
+import React from 'react';
+import styled from 'styled-components';
+import { Entity } from '../../types.generated';
+import { getParentDomains } from '../domain/utils';
+import EntityRegistry from '../entity/EntityRegistry';
+import { ANTD_GRAY } from '../entityV2/shared/constants';
+import ParentEntities from '../search/filters/ParentEntities';
+
+const LoadingWrapper = styled.div`
+    padding: 8px;
+    display: flex;
+    justify-content: center;
+
+    svg {
+        height: 15px;
+        width: 15px;
+        color: ${ANTD_GRAY[8]};
+    }
+`;
+
+interface AntOption {
+    label: JSX.Element;
+    value: string;
+}
+
+export default function domainAutocompleteOptions(
+    entities: Entity[],
+    loading: boolean,
+    entityRegistry: EntityRegistry,
+): AntOption[] {
+    if (loading) {
+        return [
+            {
+                label: (
+                    <LoadingWrapper>
+                        <LoadingOutlined />
+                    </LoadingWrapper>
+                ),
+                value: 'loading',
+            },
+        ];
+    }
+    return entities.map((entity) => ({
+        label: (
+            <>
+                <ParentEntities parentEntities={getParentDomains(entity, entityRegistry)} />
+                {entityRegistry.getDisplayName(entity.type, entity)}
+            </>
+        ),
+        value: entity.urn,
+    }));
+}
diff --git a/datahub-web-react/src/app/domainV2/DomainIcon.tsx b/datahub-web-react/src/app/domainV2/DomainIcon.tsx
new file mode 100644
index 00000000000000..76326f89bd70d2
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/DomainIcon.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import { Globe } from '@phosphor-icons/react';
+import { TYPE_ICON_CLASS_NAME } from '../entityV2/shared/components/subtypes';
+
+type Props = {
+    style?: React.CSSProperties;
+};
+
+export default function DomainIcon({ style }: Props) {
+    return <Globe className={TYPE_ICON_CLASS_NAME} style={style} />;
+}
diff --git a/datahub-web-react/src/app/domainV2/DomainItemMenu.tsx b/datahub-web-react/src/app/domainV2/DomainItemMenu.tsx
new file mode 100644
index 00000000000000..a0007b90435d74
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/DomainItemMenu.tsx
@@ -0,0 +1,65 @@
+import React from 'react';
+import { DeleteOutlined } from '@ant-design/icons';
+import { Dropdown, Menu, message, Modal } from 'antd';
+import { EntityType } from '../../types.generated';
+import { useEntityRegistry } from '../useEntityRegistry';
+import { useDeleteDomainMutation } from '../../graphql/domain.generated';
+import { MenuIcon } from '../entity/shared/EntityDropdown/EntityDropdown';
+
+type Props = {
+    urn: string;
+    name: string;
+    onDelete?: () => void;
+};
+
+export default function DomainItemMenu({ name, urn, onDelete }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const [deleteDomainMutation] = useDeleteDomainMutation();
+
+    const deleteDomain = () => {
+        deleteDomainMutation({
+            variables: {
+                urn,
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.success('Deleted Domain!');
+                    onDelete?.();
+                }
+            })
+            .catch(() => {
+                message.destroy();
+                message.error({ content: `Failed to delete Domain!: An unknown error occurred.`, duration: 3 });
+            });
+    };
+
+    const onConfirmDelete = () => {
+        Modal.confirm({
+            title: `Delete Domain '${name}'`,
+            content: `Are you sure you want to remove this ${entityRegistry.getEntityName(EntityType.Domain)}?`,
+            onOk() {
+                deleteDomain();
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
+    return (
+        <Dropdown
+            trigger={['click']}
+            overlay={
+                <Menu>
+                    <Menu.Item onClick={onConfirmDelete} key="delete">
+                        <DeleteOutlined /> &nbsp;Delete
+                    </Menu.Item>
+                </Menu>
+            }
+        >
+            <MenuIcon data-testid={`dropdown-menu-${urn}`} fontSize={20} />
+        </Dropdown>
+    );
+}
diff --git a/datahub-web-react/src/app/domainV2/DomainListColumns.tsx b/datahub-web-react/src/app/domainV2/DomainListColumns.tsx
new file mode 100644
index 00000000000000..646056adcf57ea
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/DomainListColumns.tsx
@@ -0,0 +1,68 @@
+import React from 'react';
+import { Tag, Typography } from 'antd';
+import { Tooltip } from '@components';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import { Maybe, Ownership } from '../../types.generated';
+import { useEntityRegistry } from '../useEntityRegistry';
+import AvatarsGroup from '../shared/avatar/AvatarsGroup';
+import DomainItemMenu from './DomainItemMenu';
+
+interface DomainEntry {
+    name: string;
+    entities: string;
+    urn: string;
+    ownership?: Maybe<Ownership>;
+    url: string;
+}
+
+const AvatarGroupWrapper = styled.div`
+    margin-right: 10px;
+    display: inline-block;
+`;
+
+const DomainNameContainer = styled.div`
+    margin-left: 16px;
+    margin-right: 16px;
+    display: inline;
+`;
+
+export function DomainListMenuColumn(handleDelete: (urn: string) => void) {
+    return (record: DomainEntry) => (
+        <DomainItemMenu name={record.name} urn={record.urn} onDelete={() => handleDelete(record.urn)} />
+    );
+}
+
+export function DomainNameColumn(logoIcon: JSX.Element) {
+    return (record: DomainEntry) => (
+        <span data-testid={record.urn}>
+            <Link to={record.url}>
+                {logoIcon}
+                <DomainNameContainer>
+                    <Typography.Text>{record.name}</Typography.Text>
+                </DomainNameContainer>
+                <Tooltip title={`There are ${record.entities} entities in this domain.`}>
+                    <Tag>{record.entities} entities</Tag>
+                </Tooltip>
+            </Link>
+        </span>
+    );
+}
+
+export function DomainOwnersColumn(ownership: Maybe<Ownership>) {
+    const entityRegistry = useEntityRegistry();
+
+    if (!ownership) {
+        return null;
+    }
+
+    const { owners } = ownership;
+    if (!owners || owners.length === 0) {
+        return null;
+    }
+    return (
+        <AvatarGroupWrapper>
+            <AvatarsGroup size={24} owners={owners} entityRegistry={entityRegistry} maxCount={4} />
+        </AvatarGroupWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/domainV2/DomainRoutes.tsx b/datahub-web-react/src/app/domainV2/DomainRoutes.tsx
new file mode 100644
index 00000000000000..4910bb807aef31
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/DomainRoutes.tsx
@@ -0,0 +1,58 @@
+import React, { useState } from 'react';
+import { matchPath, Route, Switch, useLocation } from 'react-router-dom';
+import styled from 'styled-components/macro';
+import { PageRoutes } from '../../conf/Global';
+import { EntityType } from '../../types.generated';
+import { EntityPage } from '../entity/EntityPage';
+import { GenericEntityProperties } from '../entity/shared/types';
+import EntitySidebarContext from '../sharedV2/EntitySidebarContext';
+import useSidebarWidth from '../sharedV2/sidebar/useSidebarWidth';
+import { useEntityRegistry } from '../useEntityRegistry';
+import { DomainsContext } from './DomainsContext';
+import ManageDomainsPageV2 from './nestedDomains/ManageDomainsPageV2';
+import ManageDomainsSidebar from './nestedDomains/ManageDomainsSidebar';
+import { useShowNavBarRedesign } from '../useShowNavBarRedesign';
+
+const ContentWrapper = styled.div<{ $isShowNavBarRedesign?: boolean; $isEntityProfile?: boolean }>`
+    display: flex;
+    overflow: hidden;
+    border-radius: 8px;
+    flex: 1;
+    ${(props) => !props.$isEntityProfile && props.$isShowNavBarRedesign && 'padding: 5px;'}
+`;
+
+export default function DomainRoutes() {
+    const entityRegistry = useEntityRegistry();
+    const [entityData, setEntityData] = useState<GenericEntityProperties | null>(null);
+    const [isSidebarClosed, setIsSidebarClosed] = useState(true);
+    const entitySidebarWidth = useSidebarWidth();
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+
+    const location = useLocation();
+    const isEntityProfile =
+        matchPath(location.pathname, `/${entityRegistry.getPathName(EntityType.Domain)}/:urn`) !== null;
+
+    return (
+        <DomainsContext.Provider value={{ entityData, setEntityData }}>
+            <ContentWrapper $isShowNavBarRedesign={isShowNavBarRedesign} $isEntityProfile={isEntityProfile}>
+                <ManageDomainsSidebar isEntityProfile={isEntityProfile} />
+                <Switch>
+                    <EntitySidebarContext.Provider
+                        value={{
+                            width: entitySidebarWidth,
+                            isClosed: isSidebarClosed,
+                            setSidebarClosed: setIsSidebarClosed,
+                        }}
+                    >
+                        <Route
+                            key={entityRegistry.getPathName(EntityType.Domain)}
+                            path={`/${entityRegistry.getPathName(EntityType.Domain)}/:urn`}
+                            render={() => <EntityPage entityType={EntityType.Domain} />}
+                        />
+                        <Route path={PageRoutes.DOMAINS} render={() => <ManageDomainsPageV2 />} />
+                    </EntitySidebarContext.Provider>
+                </Switch>
+            </ContentWrapper>
+        </DomainsContext.Provider>
+    );
+}
diff --git a/datahub-web-react/src/app/domainV2/DomainSearch.tsx b/datahub-web-react/src/app/domainV2/DomainSearch.tsx
new file mode 100644
index 00000000000000..73552060cb5e88
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/DomainSearch.tsx
@@ -0,0 +1,123 @@
+import React, { useRef, useState } from 'react';
+import { LoadingOutlined, SearchOutlined } from '@ant-design/icons';
+import styled from 'styled-components/macro';
+import { useGetAutoCompleteResultsQuery } from '../../graphql/search.generated';
+import { EntityType } from '../../types.generated';
+import { SearchBar } from '../searchV2/SearchBar';
+import ClickOutside from '../shared/ClickOutside';
+import { useEntityRegistry } from '../useEntityRegistry';
+import DomainSearchResultItem from './DomainSearchResultItem';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../entityV2/shared/constants';
+
+const DomainSearchWrapper = styled.div`
+    flex-shrink: 0;
+    position: relative;
+`;
+
+const ResultsWrapper = styled.div`
+    background-color: white;
+    border-radius: 5px;
+    box-shadow: 0 3px 6px -4px rgb(0 0 0 / 12%), 0 6px 16px 0 rgb(0 0 0 / 8%), 0 9px 28px 8px rgb(0 0 0 / 5%);
+    padding: 8px;
+    position: absolute;
+    max-height: 210px;
+    overflow: auto;
+    width: calc(100% - 32px);
+    left: 16px;
+    top: 55px;
+    z-index: 1;
+`;
+
+const LoadingWrapper = styled(ResultsWrapper)`
+    display: flex;
+    justify-content: center;
+    padding: 16px 0;
+    font-size: 16px;
+`;
+
+const SearchIcon = styled(SearchOutlined)`
+    color: ${REDESIGN_COLORS.TEXT_HEADING_SUB_LINK};
+    padding: 16px;
+    width: 100%;
+    font-size: 20px;
+`;
+
+type Props = {
+    isCollapsed?: boolean;
+    unhideSidebar?: () => void;
+};
+
+function DomainSearch({ isCollapsed, unhideSidebar }: Props) {
+    const [query, setQuery] = useState('');
+    const [isSearchBarFocused, setIsSearchBarFocused] = useState(false);
+    const entityRegistry = useEntityRegistry();
+    const { data, loading } = useGetAutoCompleteResultsQuery({
+        variables: {
+            input: {
+                type: EntityType.Domain,
+                query,
+            },
+        },
+        skip: !query,
+    });
+
+    const entities = data?.autoComplete?.entities || [];
+    const timerRef = useRef(-1);
+
+    const handleQueryChange = (q: string) => {
+        window.clearTimeout(timerRef.current);
+        timerRef.current = window.setTimeout(() => {
+            setQuery(q);
+        }, 250);
+    };
+
+    return (
+        <DomainSearchWrapper>
+            {isCollapsed && unhideSidebar ? (
+                <SearchIcon onClick={unhideSidebar} />
+            ) : (
+                <ClickOutside onClickOutside={() => setIsSearchBarFocused(false)}>
+                    <SearchBar
+                        initialQuery={query || ''}
+                        placeholderText="Search Domains"
+                        suggestions={[]}
+                        hideRecommendations
+                        style={{ padding: 9 }}
+                        inputStyle={{
+                            height: 30,
+                            fontSize: 10,
+                            fontWeight: 500,
+                            backgroundColor: ANTD_GRAY[3],
+                        }}
+                        textColor={ANTD_GRAY[10]}
+                        placeholderColor={REDESIGN_COLORS.PLACEHOLDER_PURPLE}
+                        onSearch={() => null}
+                        onQueryChange={(q) => handleQueryChange(q)}
+                        entityRegistry={entityRegistry}
+                        onFocus={() => setIsSearchBarFocused(true)}
+                    />
+                    {loading && isSearchBarFocused && (
+                        <LoadingWrapper>
+                            <LoadingOutlined />
+                        </LoadingWrapper>
+                    )}
+                    {!loading && isSearchBarFocused && !!entities?.length && (
+                        <ResultsWrapper>
+                            {entities?.map((entity) => (
+                                <DomainSearchResultItem
+                                    key={entity.urn}
+                                    entity={entity}
+                                    entityRegistry={entityRegistry}
+                                    query={query}
+                                    onResultClick={() => setIsSearchBarFocused(false)}
+                                />
+                            ))}
+                        </ResultsWrapper>
+                    )}
+                </ClickOutside>
+            )}
+        </DomainSearchWrapper>
+    );
+}
+
+export default DomainSearch;
diff --git a/datahub-web-react/src/app/domainV2/DomainSearchResultItem.tsx b/datahub-web-react/src/app/domainV2/DomainSearchResultItem.tsx
new file mode 100644
index 00000000000000..dc33ea173e0aeb
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/DomainSearchResultItem.tsx
@@ -0,0 +1,68 @@
+// Create a new component called SearchResultItem.js
+import React from 'react';
+import { Link } from 'react-router-dom';
+import Highlight from 'react-highlighter';
+import styled from 'styled-components/macro';
+import { Entity, EntityType } from '../../types.generated';
+import { IconStyleType } from '../entity/Entity';
+import { ANTD_GRAY } from '../entity/shared/constants';
+import DomainIcon from './DomainIcon';
+import ParentEntities from '../search/filters/ParentEntities';
+import { getParentDomains } from './utils';
+import EntityRegistry from '../entity/EntityRegistry';
+
+type Props = {
+    entity: Entity;
+    entityRegistry: EntityRegistry;
+    query: string;
+    onResultClick: () => void;
+};
+
+const SearchResult = styled(Link)`
+    color: #262626;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    height: 100%;
+    padding: 6px 8px;
+    width: 100%;
+    &:hover {
+        background-color: ${ANTD_GRAY[3]};
+        color: #262626;
+    }
+`;
+
+const IconWrapper = styled.span``;
+
+const highlightMatchStyle = {
+    fontWeight: 'bold',
+    background: 'none',
+    padding: 0,
+};
+
+function DomainSearchResultItem({ entity, entityRegistry, query, onResultClick }: Props) {
+    return (
+        <SearchResult to={entityRegistry.getEntityUrl(entity.type, entity.urn)} onClick={onResultClick}>
+            <IconWrapper>
+                {entity.type === EntityType.Domain ? (
+                    <DomainIcon
+                        style={{
+                            fontSize: 16,
+                            color: '#BFBFBF',
+                        }}
+                    />
+                ) : (
+                    entityRegistry.getIcon(entity.type, 12, IconStyleType.ACCENT)
+                )}
+            </IconWrapper>
+            <div>
+                <ParentEntities parentEntities={getParentDomains(entity, entityRegistry)} />
+                <Highlight matchStyle={highlightMatchStyle} search={query}>
+                    {entityRegistry.getDisplayName(entity.type, entity)}
+                </Highlight>
+            </div>
+        </SearchResult>
+    );
+}
+
+export default DomainSearchResultItem;
diff --git a/datahub-web-react/src/app/domainV2/DomainsContext.tsx b/datahub-web-react/src/app/domainV2/DomainsContext.tsx
new file mode 100644
index 00000000000000..3a6523e31a001f
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/DomainsContext.tsx
@@ -0,0 +1,17 @@
+import React, { useContext } from 'react';
+import { GenericEntityProperties } from '../entity/shared/types';
+
+export interface DomainsContextType {
+    entityData: GenericEntityProperties | null;
+    setEntityData: (entityData: GenericEntityProperties | null) => void;
+}
+
+export const DomainsContext = React.createContext<DomainsContextType>({
+    entityData: null,
+    setEntityData: () => {},
+});
+
+export const useDomainsContext = () => {
+    const { entityData, setEntityData } = useContext(DomainsContext);
+    return { entityData, setEntityData };
+};
diff --git a/datahub-web-react/src/app/domainV2/DomainsList.tsx b/datahub-web-react/src/app/domainV2/DomainsList.tsx
new file mode 100644
index 00000000000000..7966cdc671c3e2
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/DomainsList.tsx
@@ -0,0 +1,208 @@
+import React, { useEffect, useState } from 'react';
+import { Button, Empty, Pagination, Typography } from 'antd';
+import { useLocation } from 'react-router';
+import styled from 'styled-components';
+import * as QueryString from 'query-string';
+import { PlusOutlined } from '@ant-design/icons';
+import { AlignType } from 'rc-table/lib/interface';
+import { EntityType } from '../../types.generated';
+import { useListDomainsQuery } from '../../graphql/domain.generated';
+import CreateDomainModal from './CreateDomainModal';
+import { Message } from '../shared/Message';
+import TabToolbar from '../entity/shared/components/styled/TabToolbar';
+import { SearchBar } from '../search/SearchBar';
+import { useEntityRegistry } from '../useEntityRegistry';
+import { scrollToTop } from '../shared/searchUtils';
+import { addToListDomainsCache, removeFromListDomainsCache } from './utils';
+import { OnboardingTour } from '../onboarding/OnboardingTour';
+import { DOMAINS_INTRO_ID, DOMAINS_CREATE_DOMAIN_ID } from '../onboarding/config/DomainsOnboardingConfig';
+import { getElasticCappedTotalValueText } from '../entity/shared/constants';
+import { StyledTable } from '../entity/shared/components/styled/StyledTable';
+import { DomainOwnersColumn, DomainListMenuColumn, DomainNameColumn } from './DomainListColumns';
+import DomainIcon from './DomainIcon';
+
+const DomainsContainer = styled.div``;
+
+export const DomainsPaginationContainer = styled.div`
+    display: flex;
+    justify-content: center;
+    padding: 12px;
+    padding-left: 16px;
+    border-bottom: 1px solid;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+`;
+
+const PaginationInfo = styled(Typography.Text)`
+    padding: 0px;
+`;
+
+const DEFAULT_PAGE_SIZE = 25;
+
+export const DomainsList = () => {
+    const entityRegistry = useEntityRegistry();
+    const location = useLocation();
+    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
+    const paramsQuery = (params?.query as string) || undefined;
+    const [query, setQuery] = useState<undefined | string>(undefined);
+    useEffect(() => setQuery(paramsQuery), [paramsQuery]);
+
+    const [page, setPage] = useState(1);
+    const [isCreatingDomain, setIsCreatingDomain] = useState(false);
+
+    const pageSize = DEFAULT_PAGE_SIZE;
+    const start = (page - 1) * pageSize;
+
+    const { loading, error, data, client, refetch } = useListDomainsQuery({
+        variables: {
+            input: {
+                start,
+                count: pageSize,
+                query,
+            },
+        },
+        fetchPolicy: query && query.length > 0 ? 'no-cache' : 'cache-first',
+    });
+
+    const totalDomains = data?.listDomains?.total || 0;
+    const lastResultIndex = start + pageSize > totalDomains ? totalDomains : start + pageSize;
+    const domains = data?.listDomains?.domains || [];
+
+    const onChangePage = (newPage: number) => {
+        scrollToTop();
+        setPage(newPage);
+    };
+
+    const handleDelete = (urn: string) => {
+        removeFromListDomainsCache(client, urn, page, pageSize);
+        setTimeout(() => {
+            refetch?.();
+        }, 2000);
+    };
+
+    const allColumns = [
+        {
+            title: 'Name',
+            dataIndex: '',
+            key: 'name',
+            sorter: (sourceA, sourceB) => {
+                return sourceA.name.localeCompare(sourceB.name);
+            },
+            render: DomainNameColumn(
+                <DomainIcon
+                    style={{
+                        fontSize: 12,
+                        color: '#BFBFBF',
+                    }}
+                />,
+            ),
+        },
+        {
+            title: 'Owners',
+            dataIndex: 'ownership',
+            width: '10%',
+            key: 'ownership',
+            render: DomainOwnersColumn,
+        },
+        {
+            title: '',
+            dataIndex: '',
+            width: '5%',
+            align: 'right' as AlignType,
+            key: 'menu',
+            render: DomainListMenuColumn(handleDelete),
+        },
+    ];
+
+    const tableData = domains.map((domain) => {
+        const displayName = entityRegistry.getDisplayName(EntityType.Domain, domain);
+        const totalEntitiesText = getElasticCappedTotalValueText(domain.entities?.total || 0);
+        const url = entityRegistry.getEntityUrl(EntityType.Domain, domain.urn);
+
+        return {
+            urn: domain.urn,
+            name: displayName,
+            entities: totalEntitiesText,
+            ownership: domain.ownership,
+            url,
+        };
+    });
+
+    return (
+        <>
+            {!data && loading && <Message type="loading" content="Loading domains..." />}
+            {error && <Message type="error" content="Failed to load domains! An unexpected error occurred." />}
+            <OnboardingTour stepIds={[DOMAINS_INTRO_ID, DOMAINS_CREATE_DOMAIN_ID]} />
+            <DomainsContainer>
+                <TabToolbar>
+                    <Button id={DOMAINS_CREATE_DOMAIN_ID} type="text" onClick={() => setIsCreatingDomain(true)}>
+                        <PlusOutlined /> New Domain
+                    </Button>
+                    <SearchBar
+                        initialQuery={query || ''}
+                        placeholderText="Search domains..."
+                        suggestions={[]}
+                        style={{
+                            maxWidth: 220,
+                            padding: 0,
+                        }}
+                        inputStyle={{
+                            height: 32,
+                            fontSize: 12,
+                        }}
+                        onSearch={() => null}
+                        onQueryChange={(q) => setQuery(q && q.length > 0 ? q : undefined)}
+                        entityRegistry={entityRegistry}
+                        hideRecommendations
+                    />
+                </TabToolbar>
+                <StyledTable
+                    columns={allColumns}
+                    dataSource={tableData}
+                    rowKey="urn"
+                    pagination={false}
+                    locale={{ emptyText: <Empty description="No Domains!" image={Empty.PRESENTED_IMAGE_SIMPLE} /> }}
+                />
+                <DomainsPaginationContainer>
+                    <PaginationInfo>
+                        <b>
+                            {lastResultIndex > 0 ? (page - 1) * pageSize + 1 : 0} - {lastResultIndex}
+                        </b>
+                        of <b>{totalDomains}</b>
+                    </PaginationInfo>
+                    <Pagination
+                        current={page}
+                        pageSize={pageSize}
+                        total={totalDomains}
+                        showLessItems
+                        onChange={onChangePage}
+                        showSizeChanger={false}
+                    />
+                    <span />
+                </DomainsPaginationContainer>
+                {isCreatingDomain && (
+                    <CreateDomainModal
+                        onClose={() => setIsCreatingDomain(false)}
+                        onCreate={(urn, _, name, description) => {
+                            addToListDomainsCache(
+                                client,
+                                {
+                                    urn,
+                                    properties: {
+                                        name,
+                                        description: description || null,
+                                    },
+                                    ownership: null,
+                                    entities: null,
+                                },
+                                pageSize,
+                            );
+                            setTimeout(() => refetch(), 2000);
+                        }}
+                    />
+                )}
+            </DomainsContainer>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/domainV2/EmptyDomainDescription.tsx b/datahub-web-react/src/app/domainV2/EmptyDomainDescription.tsx
new file mode 100644
index 00000000000000..6a5f304e565be2
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/EmptyDomainDescription.tsx
@@ -0,0 +1,39 @@
+import { Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components/macro';
+import { ANTD_GRAY } from '../entity/shared/constants';
+
+const StyledParagraph = styled(Typography.Paragraph)`
+    text-align: justify;
+    text-justify: inter-word;
+    margin: 40px 0;
+    font-size: 15px;
+`;
+
+function EmptyDomainDescription() {
+    return (
+        <>
+            <StyledParagraph type="secondary">
+                <strong style={{ color: ANTD_GRAY[8] }}>Welcome to your Data Domains!</strong> It looks like this space
+                is ready to be transformed into a well-organized data universe. Start by creating your first domain - a
+                high-level category for your data assets.
+            </StyledParagraph>
+            <StyledParagraph type="secondary">
+                <strong style={{ color: ANTD_GRAY[8] }}> Create Nested Domains:</strong> Want to dive deeper? You can
+                also create nested domains to add granularity and structure. Just like nesting Russian dolls, its all
+                about refining your organization.
+            </StyledParagraph>
+            <StyledParagraph type="secondary">
+                <strong style={{ color: ANTD_GRAY[8] }}>Build Data Products</strong>: Once your domains are set, go a
+                step further! Organize your data assets into data products to realize a data mesh architecture. Data
+                products empower you to treat data as a product, making it more accessible and manageable.
+            </StyledParagraph>
+            <StyledParagraph type="secondary">
+                Ready to embark on this data adventure? Click the Create Domain button to begin shaping your data
+                landscape!
+            </StyledParagraph>
+        </>
+    );
+}
+
+export default EmptyDomainDescription;
diff --git a/datahub-web-react/src/app/domainV2/EmptyDomainsSection.tsx b/datahub-web-react/src/app/domainV2/EmptyDomainsSection.tsx
new file mode 100644
index 00000000000000..6ec44999978df1
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/EmptyDomainsSection.tsx
@@ -0,0 +1,69 @@
+import { PlusOutlined } from '@ant-design/icons';
+import { Button, Empty, Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components/macro';
+import { ANTD_GRAY } from '../entity/shared/constants';
+
+const EmptyDomainContainer = styled.div`
+    display: flex;
+    justify-content: center;
+    overflow-y: auto;
+`;
+
+const StyledEmpty = styled(Empty)`
+    width: 35vw;
+    @media screen and (max-width: 1300px) {
+        width: 50vw;
+    }
+    @media screen and (max-width: 896px) {
+        overflow-y: auto;
+        max-height: 75vh;
+        &::-webkit-scrollbar {
+            width: 5px;
+            background: #d6d6d6;
+        }
+    }
+    padding: 20px;
+    .ant-empty-image {
+        display: none;
+    }
+`;
+
+const StyledButton = styled(Button)`
+    margin: 18px 8px 0 0;
+`;
+
+const IconContainer = styled.span`
+    color: ${ANTD_GRAY[7]};
+    font-size: 40px;
+`;
+
+interface Props {
+    title?: string;
+    setIsCreatingDomain: React.Dispatch<React.SetStateAction<boolean>>;
+    description?: React.ReactNode;
+    icon?: React.ReactNode;
+}
+
+function EmptyDomainsSection(props: Props) {
+    const { title, description, setIsCreatingDomain, icon } = props;
+    return (
+        <EmptyDomainContainer>
+            <StyledEmpty
+                description={
+                    <>
+                        <IconContainer>{icon}</IconContainer>
+                        <Typography.Title level={4}>{title}</Typography.Title>
+                        {description}
+                    </>
+                }
+            >
+                <StyledButton onClick={() => setIsCreatingDomain(true)}>
+                    <PlusOutlined /> Create Domain
+                </StyledButton>
+            </StyledEmpty>
+        </EmptyDomainContainer>
+    );
+}
+
+export default EmptyDomainsSection;
diff --git a/datahub-web-react/src/app/domainV2/ManageDomainsPage.tsx b/datahub-web-react/src/app/domainV2/ManageDomainsPage.tsx
new file mode 100644
index 00000000000000..98a312854deec2
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/ManageDomainsPage.tsx
@@ -0,0 +1,44 @@
+import { Typography } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { DomainsList } from './DomainsList';
+import { DomainsContext } from './DomainsContext';
+import { GenericEntityProperties } from '../entity/shared/types';
+
+const PageContainer = styled.div`
+    padding-top: 20px;
+`;
+
+const PageHeaderContainer = styled.div`
+    && {
+        padding-left: 24px;
+    }
+`;
+
+const PageTitle = styled(Typography.Title)`
+    && {
+        margin-bottom: 12px;
+    }
+`;
+
+const ListContainer = styled.div``;
+
+export const ManageDomainsPage = () => {
+    const [entityData, setEntityData] = useState<GenericEntityProperties | null>(null);
+
+    return (
+        <DomainsContext.Provider value={{ entityData, setEntityData }}>
+            <PageContainer>
+                <PageHeaderContainer>
+                    <PageTitle level={3}>Domains</PageTitle>
+                    <Typography.Paragraph type="secondary">
+                        View your DataHub Domains. Take administrative actions.
+                    </Typography.Paragraph>
+                </PageHeaderContainer>
+                <ListContainer>
+                    <DomainsList />
+                </ListContainer>
+            </PageContainer>
+        </DomainsContext.Provider>
+    );
+};
diff --git a/datahub-web-react/src/app/domainV2/__tests__/utils.test.ts b/datahub-web-react/src/app/domainV2/__tests__/utils.test.ts
new file mode 100644
index 00000000000000..5a1b920f35bd04
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/__tests__/utils.test.ts
@@ -0,0 +1,179 @@
+import { renderHook } from '@testing-library/react-hooks';
+import { ApolloClient, InMemoryCache } from '@apollo/client';
+import { DomainMock1, DomainMock3, expectedResult } from '../../../Mocks';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import {
+    addToListDomainsCache,
+    removeFromListDomainsCache,
+    updateListDomainsCache,
+    useSortedDomains,
+    getParentDomains,
+} from '../utils';
+import { Entity, EntityType } from '../../../types.generated';
+
+const apolloClient = new ApolloClient({
+    cache: new InMemoryCache(),
+});
+
+describe('Domain V2 utils tests', () => {
+    test('addToListDomainsCache -> should add a new domain to the cache list', async () => {
+        const newDomain = 'new-domain.com';
+        const pageSize = 10;
+
+        const mockWriteQuery = vi.fn();
+        ApolloClient.prototype.writeQuery = mockWriteQuery;
+
+        addToListDomainsCache(apolloClient, newDomain, pageSize, 'example.com');
+        expect(mockWriteQuery).toHaveBeenCalled();
+        const args = mockWriteQuery.mock.calls;
+        const expectedValue = {
+            query: {
+                kind: 'Document',
+                definitions: expect.anything(),
+                loc: expect.anything(),
+            },
+
+            variables: { input: { start: 0, count: 10, parentDomain: 'example.com' } },
+            data: { listDomains: { start: 0, count: 1, total: 1, domains: ['new-domain.com'] } },
+        };
+
+        expect(args[0][0]).toMatchObject(expectedValue);
+    });
+    test('updateListDomainsCache -> should update and add a domain to the cache list', async () => {
+        const urn = 'urn123';
+        const id = 'domain123';
+        const name = 'New Domain';
+        const description = 'A test domain';
+        const parentDomain = 'example.com';
+
+        const initialDomains = [
+            {
+                id: 'domain1',
+                name: 'Domain 1',
+                description: 'Description for Domain 1',
+                parentDomain: 'example.com',
+            },
+            {
+                id: 'domain2',
+                name: 'Domain 2',
+                description: 'Description for Domain 2',
+                parentDomain: 'example.com',
+            },
+        ];
+
+        const mockReadQuery = vi.fn().mockReturnValue({
+            listDomains: {
+                start: 0,
+                count: initialDomains.length,
+                total: initialDomains.length,
+                domains: initialDomains,
+            },
+        });
+
+        const mockWriteQuery = vi.fn();
+        ApolloClient.prototype.readQuery = mockReadQuery;
+        ApolloClient.prototype.writeQuery = mockWriteQuery;
+
+        updateListDomainsCache(apolloClient, urn, id, name, description, parentDomain);
+        expect(mockReadQuery).toHaveBeenCalled();
+        expect(mockWriteQuery).toHaveBeenCalled();
+        const args = mockWriteQuery.mock.calls;
+
+        const expectedResponseAfterUpdate = [
+            {
+                urn,
+                id,
+                type: EntityType.Domain,
+                properties: {
+                    name,
+                    description: description || null,
+                },
+                ownership: null,
+                entities: null,
+                children: null,
+                dataProducts: null,
+                parentDomains: null,
+                displayProperties: null,
+            },
+            ...initialDomains,
+        ];
+
+        expect(args[0][0]?.data?.listDomains?.domains).toMatchObject(expectedResponseAfterUpdate);
+    });
+    test('removeFromListDomainsCache -> should remove a domain from the cache list', async () => {
+        const urn = 'urn1';
+        const pageSize = 1000;
+        const page = 1;
+
+        const initialDomains = [
+            {
+                urn: 'urn1',
+                id: 'domain1',
+                name: 'Domain 1',
+                description: 'Description for Domain 1',
+                parentDomain: 'example.com',
+            },
+            {
+                urn: 'urn2',
+                id: 'domain2',
+                name: 'Domain 2',
+                description: 'Description for Domain 2',
+                parentDomain: 'example.com',
+            },
+        ];
+        const mockReadQuery = vi.fn().mockReturnValue({
+            listDomains: {
+                start: 0,
+                count: initialDomains.length,
+                total: initialDomains.length,
+                domains: initialDomains,
+            },
+        });
+
+        const mockWriteQuery = vi.fn();
+        ApolloClient.prototype.readQuery = mockReadQuery;
+        ApolloClient.prototype.writeQuery = mockWriteQuery;
+
+        removeFromListDomainsCache(apolloClient, urn, page, pageSize);
+        expect(mockReadQuery).toHaveBeenCalled();
+        expect(mockWriteQuery).toHaveBeenCalled();
+        const args = mockWriteQuery.mock.calls;
+        const expectedResultAfterDelete = [
+            {
+                urn: 'urn2',
+                id: 'domain2',
+                name: 'Domain 2',
+                description: 'Description for Domain 2',
+                parentDomain: 'example.com',
+            },
+        ];
+        expect(args[0][0]?.data?.listDomains?.domains).toMatchObject(expectedResultAfterDelete);
+    });
+    test('useSortedDomains -> should return all domains in an unsorted format if sortBy by is not provided', () => {
+        const unsortedDomains = [DomainMock3[1], DomainMock3[0]];
+
+        const { result } = renderHook(() => {
+            const entityRegistry = useEntityRegistry();
+            entityRegistry.register(DomainMock3[0]);
+            entityRegistry.register(DomainMock3[1]);
+
+            return useSortedDomains(unsortedDomains as unknown as Entity[]);
+        });
+        expect(result.current).toStrictEqual(unsortedDomains);
+    });
+    test('useSortedDomains -> should return all domains in a sorted format', () => {
+        const { result } = renderHook(() => {
+            return useSortedDomains(DomainMock3 as unknown as Entity[], 'displayName');
+        });
+        expect(result.current).toStrictEqual(DomainMock3);
+    });
+    test('getParentDomains -> should get all parent domains', () => {
+        const { result } = renderHook(() => {
+            const entityRegistry = useEntityRegistry();
+            entityRegistry.register(DomainMock1);
+
+            return getParentDomains(DomainMock3[0] as unknown as Entity, entityRegistry);
+        });
+        expect(result.current).toStrictEqual(expectedResult);
+    });
+});
diff --git a/datahub-web-react/src/app/domainV2/nestedDomains/DomainsSidebarHeader.tsx b/datahub-web-react/src/app/domainV2/nestedDomains/DomainsSidebarHeader.tsx
new file mode 100644
index 00000000000000..23a5747e0c0024
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/nestedDomains/DomainsSidebarHeader.tsx
@@ -0,0 +1,56 @@
+import { useApolloClient } from '@apollo/client';
+import { PlusCircleOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+import { Tooltip } from '@components';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import CreateDomainModal from '../CreateDomainModal';
+import { updateListDomainsCache } from '../utils';
+import { REDESIGN_COLORS } from '../../entityV2/shared/constants';
+
+const Wrapper = styled.div`
+    color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    font-size: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+`;
+
+const StyledButton = styled(Button)`
+    padding: 0px 8px;
+    border: none;
+    box-shadow: none;
+    color: inherit;
+    font-size: inherit;
+`;
+
+const DomainTitle = styled.div`
+    font-size: 16px;
+    font-weight: bold;
+    color: #374066;
+`;
+
+export default function DomainsSidebarHeader() {
+    const [isCreatingDomain, setIsCreatingDomain] = useState(false);
+    const client = useApolloClient();
+
+    return (
+        <Wrapper>
+            <DomainTitle>Domains</DomainTitle>
+            <Tooltip showArrow={false} title="Create new Domain" placement="right">
+                <StyledButton onClick={() => setIsCreatingDomain(true)}>
+                    <PlusCircleOutlined style={{ fontSize: 'inherit' }} />
+                </StyledButton>
+            </Tooltip>
+            {isCreatingDomain && (
+                <CreateDomainModal
+                    onClose={() => setIsCreatingDomain(false)}
+                    onCreate={(urn, id, name, description, parentDomain) => {
+                        updateListDomainsCache(client, urn, id, name, description, parentDomain);
+                    }}
+                />
+            )}
+        </Wrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/domainV2/nestedDomains/ManageDomainsPageV2.tsx b/datahub-web-react/src/app/domainV2/nestedDomains/ManageDomainsPageV2.tsx
new file mode 100644
index 00000000000000..9735136972d12e
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/nestedDomains/ManageDomainsPageV2.tsx
@@ -0,0 +1,68 @@
+import React, { useEffect, useState } from 'react';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { Button } from '@src/alchemy-components';
+import styled from 'styled-components/macro';
+import { PageTitle } from '@src/alchemy-components/components/PageTitle';
+import { useApolloClient } from '@apollo/client';
+import RootDomains from './RootDomains';
+import { DOMAINS_CREATE_DOMAIN_ID, DOMAINS_INTRO_ID } from '../../onboarding/config/DomainsOnboardingConfig';
+import { OnboardingTour } from '../../onboarding/OnboardingTour';
+import CreateDomainModal from '../CreateDomainModal';
+import { updateListDomainsCache } from '../utils';
+import { useDomainsContext as useDomainsContextV2 } from '../DomainsContext';
+
+const PageWrapper = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    background-color: #ffffff;
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    border-radius: ${(props) =>
+        props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '8px'};
+    margin-left: ${(props) => (props.$isShowNavBarRedesign ? '0' : '12px')};
+    ${(props) => props.$isShowNavBarRedesign && `box-shadow: ${props.theme.styles['box-shadow-navbar-redesign']};`}
+`;
+
+const Header = styled.div`
+    display: flex;
+    justify-content: space-between;
+    padding: 16px 20px 20px 20px;
+    align-items: center;
+`;
+
+export default function ManageDomainsPageV2() {
+    const { setEntityData } = useDomainsContextV2();
+    const [isCreatingDomain, setIsCreatingDomain] = useState(false);
+    const client = useApolloClient();
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+
+    useEffect(() => {
+        setEntityData(null);
+    }, [setEntityData]);
+
+    return (
+        <PageWrapper $isShowNavBarRedesign={isShowNavBarRedesign}>
+            <OnboardingTour stepIds={[DOMAINS_INTRO_ID, DOMAINS_CREATE_DOMAIN_ID]} />
+            <Header>
+                <PageTitle title="Domains" subTitle="Group data assets using hierarchical collections" />
+                <Button
+                    id={DOMAINS_CREATE_DOMAIN_ID}
+                    onClick={() => setIsCreatingDomain(true)}
+                    data-testid="domains-new-domain-button"
+                    icon="Add"
+                >
+                    Create
+                </Button>
+            </Header>
+            <RootDomains setIsCreatingDomain={setIsCreatingDomain} />
+            {isCreatingDomain && (
+                <CreateDomainModal
+                    onClose={() => setIsCreatingDomain(false)}
+                    onCreate={(urn, id, name, description, parentDomain) =>
+                        updateListDomainsCache(client, urn, id, name, description, parentDomain)
+                    }
+                />
+            )}
+        </PageWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/domainV2/nestedDomains/ManageDomainsSidebar.tsx b/datahub-web-react/src/app/domainV2/nestedDomains/ManageDomainsSidebar.tsx
new file mode 100644
index 00000000000000..ca192a1db1ee81
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/nestedDomains/ManageDomainsSidebar.tsx
@@ -0,0 +1,123 @@
+import React, { useCallback, useState } from 'react';
+import { Button, Divider } from 'antd';
+import { Tooltip } from '@components';
+import styled from 'styled-components';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import useSidebarWidth from '../../sharedV2/sidebar/useSidebarWidth';
+import DomainsSidebarHeader from './DomainsSidebarHeader';
+import DomainNavigator from './domainNavigator/DomainNavigator';
+import DomainSearch from '../DomainSearch';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import SidebarBackArrow from '../../../images/sidebarBackArrow.svg?react';
+
+const PLATFORM_BROWSE_TRANSITION_MS = 300;
+
+// TODO: Clean up how we do expand / collapse
+const StyledEntitySidebarContainer = styled.div<{
+    isCollapsed: boolean;
+    $width?: number;
+    backgroundColor?: string;
+    $isShowNavBarRedesign?: boolean;
+    $isEntityProfile?: boolean;
+}>`
+    flex-shrink: 0;
+    max-height: 100%;
+
+    width: ${(props) => (props.isCollapsed ? '63px' : `${props.$width}px`)};
+    margin-bottom: ${(props) => (props.$isShowNavBarRedesign ? '0' : '12px')};
+    transition: width ${PLATFORM_BROWSE_TRANSITION_MS}ms ease-in-out;
+
+    background-color: #ffffff;
+    border-radius: ${(props) =>
+        props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '8px'};
+    display: flex;
+    flex-direction: column;
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        margin: ${props.$isEntityProfile ? '5px 12px 5px 5px' : '0 16px 0 0'};
+        box-shadow: ${props.theme.styles['box-shadow-navbar-redesign']};
+    `}
+`;
+
+const Controls = styled.div<{ isCollapsed: boolean }>`
+    display: flex;
+    align-items: center;
+    justify-content: ${(props) => (props.isCollapsed ? 'center' : 'space-between')};
+    padding: 15px 16px 10px 12px;
+    overflow: hidden;
+    height: 50px;
+`;
+
+const CloseButton = styled(Button)<{ $isActive }>`
+    margin: 0px;
+    padding: 2px 0px;
+    display: flex;
+    align-items: center;
+    transition: transform ${PLATFORM_BROWSE_TRANSITION_MS}ms ease;
+    && {
+        color: ${(props) => (props.$isActive ? ANTD_GRAY[9] : '#8088a3')};
+    }
+`;
+
+const ThinDivider = styled(Divider)`
+    margin: 0px;
+    padding: 0px;
+`;
+
+const StyledSidebarBackArrow = styled(SidebarBackArrow)<{ direction: 'left' | 'right' }>`
+    cursor: pointer;
+    ${(props) => (props.direction === 'right' && 'transform: scaleX(-1);') || undefined}
+`;
+
+const StyledSidebar = styled.div`
+    overflow: auto;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+`;
+
+type Props = {
+    isEntityProfile?: boolean;
+};
+
+export default function ManageDomainsSidebarV2({ isEntityProfile }: Props) {
+    const width = useSidebarWidth(0.2);
+    const [isClosed, setIsClosed] = useState(false);
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+
+    const unhideSidebar = useCallback(() => {
+        setIsClosed(false);
+    }, []);
+
+    return (
+        <StyledEntitySidebarContainer
+            isCollapsed={isClosed}
+            $width={width}
+            id="browse-v2"
+            $isShowNavBarRedesign={isShowNavBarRedesign}
+            $isEntityProfile={isEntityProfile}
+        >
+            <Controls isCollapsed={isClosed}>
+                {!isClosed && <DomainsSidebarHeader />}
+                <Tooltip
+                    placement="left"
+                    showArrow={false}
+                    title={!isClosed ? 'Close navigator' : 'Open navigator'}
+                    mouseEnterDelay={0.7}
+                    mouseLeaveDelay={0}
+                >
+                    <CloseButton $isActive={!isClosed} type="link" onClick={() => setIsClosed(!isClosed)}>
+                        <StyledSidebarBackArrow direction={isClosed ? 'left' : 'right'} />
+                    </CloseButton>
+                </Tooltip>
+            </Controls>
+            <ThinDivider />
+            <StyledSidebar>
+                <DomainSearch isCollapsed={isClosed} unhideSidebar={unhideSidebar} />
+                <ThinDivider />
+                <DomainNavigator isCollapsed={isClosed} unhideSidebar={unhideSidebar} />
+            </StyledSidebar>
+        </StyledEntitySidebarContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/domainV2/nestedDomains/RootDomains.tsx b/datahub-web-react/src/app/domainV2/nestedDomains/RootDomains.tsx
new file mode 100644
index 00000000000000..da76310b4394e2
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/nestedDomains/RootDomains.tsx
@@ -0,0 +1,57 @@
+import React from 'react';
+import styled from 'styled-components';
+import { ReadOutlined } from '@ant-design/icons';
+import { Message } from '../../shared/Message';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { EntityType } from '../../../types.generated';
+import useListDomains from '../useListDomains';
+import EmptyDomainsSection from '../EmptyDomainsSection';
+import EmptyDomainDescription from '../EmptyDomainDescription';
+
+const DomainsWrapper = styled.div`
+    overflow: auto;
+    padding: 0 20px 12px 20px;
+`;
+
+const ResultWrapper = styled.div`
+    padding: 16px;
+    margin: 0px;
+    margin-bottom: 12px;
+    display: flex;
+    align-items: center;
+    background-color: #ffffff;
+    border-radius: 12px;
+    overflow: hidden;
+    box-shadow: 0px 1px 2px 0px rgba(33, 23, 95, 0.07);
+    border: 1px solid #ebecf0;
+`;
+
+interface Props {
+    setIsCreatingDomain: React.Dispatch<React.SetStateAction<boolean>>;
+}
+export default function RootDomains({ setIsCreatingDomain }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const { loading, error, data, sortedDomains } = useListDomains({});
+
+    return (
+        <>
+            {!data && loading && <Message type="loading" content="Loading domains..." />}
+            {error && <Message type="error" content="Failed to load domains. An unexpected error occurred." />}
+            {!loading && (!data || !data?.listDomains?.domains?.length) && (
+                <EmptyDomainsSection
+                    icon={<ReadOutlined />}
+                    title="Organize your data"
+                    description={<EmptyDomainDescription />}
+                    setIsCreatingDomain={setIsCreatingDomain}
+                />
+            )}
+            <DomainsWrapper>
+                {sortedDomains?.map((domain) => (
+                    <ResultWrapper key={domain.urn}>
+                        {entityRegistry.renderSearchResult(EntityType.Domain, { entity: domain, matchedFields: [] })}
+                    </ResultWrapper>
+                ))}
+            </DomainsWrapper>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/domainV2/nestedDomains/domainNavigator/DomainNavigator.tsx b/datahub-web-react/src/app/domainV2/nestedDomains/domainNavigator/DomainNavigator.tsx
new file mode 100644
index 00000000000000..aac78e744cdcc4
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/nestedDomains/domainNavigator/DomainNavigator.tsx
@@ -0,0 +1,50 @@
+import { Alert, Empty } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import useListDomains from '../../useListDomains';
+import DomainNode from './DomainNode';
+import { Domain } from '../../../../types.generated';
+import { ANTD_GRAY } from '../../../entity/shared/constants';
+
+const NavigatorWrapper = styled.div`
+    font-size: 14px;
+    max-height: calc(100% - 65px);
+    overflow: auto;
+`;
+
+interface Props {
+    domainUrnToHide?: string;
+    selectDomainOverride?: (domain: Domain) => void;
+    isCollapsed: boolean;
+    unhideSidebar?: () => void;
+}
+
+export default function DomainNavigator({ domainUrnToHide, isCollapsed, selectDomainOverride, unhideSidebar }: Props) {
+    const { sortedDomains, error, loading } = useListDomains({});
+    const noDomainsFound: boolean = !sortedDomains || sortedDomains.length === 0;
+
+    return (
+        <NavigatorWrapper>
+            {error && <Alert message="Loading Domains failed." showIcon type="error" />}
+            {!loading && noDomainsFound && (
+                <Empty
+                    description="No Domains Found"
+                    image={Empty.PRESENTED_IMAGE_SIMPLE}
+                    style={{ color: ANTD_GRAY[7] }}
+                />
+            )}
+            {!noDomainsFound &&
+                sortedDomains?.map((domain) => (
+                    <DomainNode
+                        key={domain.urn}
+                        domain={domain as Domain}
+                        numDomainChildren={domain.children?.total || 0}
+                        domainUrnToHide={domainUrnToHide}
+                        selectDomainOverride={selectDomainOverride}
+                        isCollapsed={isCollapsed}
+                        unhideSidebar={unhideSidebar}
+                    />
+                ))}
+        </NavigatorWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/domainV2/nestedDomains/domainNavigator/DomainNode.tsx b/datahub-web-react/src/app/domainV2/nestedDomains/domainNavigator/DomainNode.tsx
new file mode 100644
index 00000000000000..c973783ccdc963
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/nestedDomains/domainNavigator/DomainNode.tsx
@@ -0,0 +1,234 @@
+import { Typography } from 'antd';
+import { Tooltip } from '@components';
+import React, { useEffect, useMemo } from 'react';
+import { useHistory } from 'react-router';
+import styled from 'styled-components';
+import { Domain } from '../../../../types.generated';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { RotatingTriangle } from '../../../sharedV2/sidebar/components';
+import useListDomains from '../../useListDomains';
+import useToggle from '../../../shared/useToggle';
+import { BodyContainer, BodyGridExpander } from '../../../shared/components';
+import { useDomainsContext as useDomainsContextV2 } from '../../DomainsContext';
+import { DomainColoredIcon } from '../../../entityV2/shared/links/DomainColoredIcon';
+import { REDESIGN_COLORS, SEARCH_COLORS } from '../../../entityV2/shared/constants';
+
+const Count = styled.div`
+    color: ${REDESIGN_COLORS.BLACK};
+    font-size: 12px;
+    padding-left: 8px;
+    padding-right: 8px;
+    margin-left: 8px;
+    border-radius: 11px;
+    background-color: ${REDESIGN_COLORS.SIDE_BAR};
+    width: 20%;
+    height: 22px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    max-width: 32px;
+    transition: opacity 0.3s ease; /* add a smooth transition effect */
+`;
+
+const NameWrapper = styled(Typography.Text)<{ $isSelected: boolean; $addLeftPadding: boolean }>`
+    flex: 1;
+    padding: 2px;
+    ${(props) => props.$isSelected && `color: ${SEARCH_COLORS.TITLE_PURPLE};`}
+    ${(props) => props.$addLeftPadding && 'padding-left: 20px;'}
+
+    &:hover {
+        cursor: pointer;
+    }
+    display: flex !important;
+    align-items: center;
+    justify-content: space-between;
+    transition: font-weight 0.3s ease-out;
+    width: 100%;
+`;
+
+const DisplayName = styled.span<{ $isSelected: boolean }>`
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    color: ${(props) => (props.$isSelected ? REDESIGN_COLORS.TITLE_PURPLE : REDESIGN_COLORS.BODY_TEXT_GREY)};
+`;
+
+const ButtonWrapper = styled.span<{ $addLeftPadding: boolean; $isSelected: boolean }>`
+    margin-right: 4px;
+    font-size: 16px;
+
+    svg {
+        font-size: 16px !important;
+        color: ${(props) =>
+            props.$isSelected ? REDESIGN_COLORS.TITLE_PURPLE : REDESIGN_COLORS.BODY_TEXT_GREY} !important;
+    }
+
+    .ant-btn {
+        height: 16px;
+        width: 16px;
+    }
+`;
+
+const RowWrapper = styled.div<{ $isSelected: boolean; isOpen?: boolean }>`
+    align-items: center;
+    display: flex;
+    width: 100%;
+    border-bottom: 1px solid ${REDESIGN_COLORS.COLD_GREY_TEXT_BLUE_1};
+    padding: 12px;
+    ${(props) => props.isOpen && `background-color: ${REDESIGN_COLORS.SECTION_BACKGROUND};`}
+    ${(props) => props.$isSelected && `background-color: ${REDESIGN_COLORS.LIGHT_TEXT_DARK_BACKGROUND};`}
+    &:hover {
+        background-color: ${REDESIGN_COLORS.COLD_GREY_TEXT_BLUE_1};
+        ${ButtonWrapper} {
+            svg {
+                color: ${REDESIGN_COLORS.TITLE_PURPLE} !important;
+            }
+        }
+        ${DisplayName} {
+            color: ${REDESIGN_COLORS.TITLE_PURPLE};
+        }
+    }
+`;
+
+const StyledExpander = styled(BodyGridExpander)<{ paddingLeft: number }>`
+    padding-left: 0px;
+    background: ${REDESIGN_COLORS.SECTION_BACKGROUND};
+    display: flex;
+    width: 100%;
+    overflow: auto;
+    ${RowWrapper} {
+        padding-left: ${(props) => props.paddingLeft + 12}px;
+    }
+`;
+
+const Text = styled.div`
+    display: flex;
+    gap: 9px;
+    align-items: center;
+    font-size: 14px;
+    width: 80%;
+`;
+
+interface Props {
+    domain: Domain;
+    numDomainChildren: number;
+    isCollapsed?: boolean;
+    domainUrnToHide?: string;
+    selectDomainOverride?: (domain: Domain) => void;
+    unhideSidebar?: () => void;
+    $paddingLeft?: number;
+}
+
+export default function DomainNode({
+    domain,
+    numDomainChildren,
+    domainUrnToHide,
+    isCollapsed,
+    selectDomainOverride,
+    unhideSidebar,
+    $paddingLeft = 0,
+}: Props) {
+    const shouldHideDomain = domainUrnToHide === domain.urn;
+    const history = useHistory();
+    const entityRegistry = useEntityRegistry();
+    const { entityData } = useDomainsContextV2();
+    const { isOpen, isClosing, toggle, toggleOpen, toggleClose } = useToggle({
+        initialValue: false,
+        closeDelay: 250,
+    });
+    const { sortedDomains } = useListDomains({ parentDomain: domain.urn, skip: !isOpen || shouldHideDomain });
+    const isOnEntityPage = entityData && entityData.urn === domain.urn;
+    const displayName = entityRegistry.getDisplayName(domain.type, isOnEntityPage ? entityData : domain);
+    const isInSelectMode = !!selectDomainOverride;
+    const isDomainNodeSelected = !!isOnEntityPage && !isInSelectMode;
+    const shouldAutoOpen = useMemo(
+        () => !isInSelectMode && entityData?.parentDomains?.domains.some((parent) => parent.urn === domain.urn),
+        [isInSelectMode, entityData, domain.urn],
+    );
+    const paddingLeft = $paddingLeft + 16;
+
+    useEffect(() => {
+        if (shouldAutoOpen) toggleOpen();
+    }, [shouldAutoOpen, toggleOpen]);
+
+    useEffect(() => {
+        if (isCollapsed) {
+            toggleClose();
+        }
+    }, [isCollapsed, toggleClose]);
+
+    function handleSelectDomain() {
+        if (selectDomainOverride && !isCollapsed) {
+            selectDomainOverride(domain);
+        } else if (unhideSidebar && isCollapsed) {
+            unhideSidebar();
+        } else {
+            history.push(entityRegistry.getEntityUrl(domain.type, domain.urn));
+        }
+    }
+
+    if (shouldHideDomain) return null;
+
+    const finalNumChildren = sortedDomains?.length ?? numDomainChildren;
+    const hasDomainChildren = !!finalNumChildren;
+
+    return (
+        <>
+            <RowWrapper
+                data-testid="domain-list-item"
+                $isSelected={isDomainNodeSelected && !isCollapsed}
+                isOpen={isOpen && !isClosing}
+            >
+                {!isCollapsed && hasDomainChildren && (
+                    <ButtonWrapper
+                        $addLeftPadding={!isCollapsed && !hasDomainChildren}
+                        $isSelected={isDomainNodeSelected && !isCollapsed}
+                    >
+                        <RotatingTriangle
+                            isOpen={isOpen && !isClosing}
+                            onClick={toggle}
+                            dataTestId="open-domain-item"
+                        />
+                    </ButtonWrapper>
+                )}
+                <Tooltip placement="right" title={displayName} mouseEnterDelay={0.7} mouseLeaveDelay={0}>
+                    <NameWrapper
+                        onClick={handleSelectDomain}
+                        $isSelected={isDomainNodeSelected}
+                        $addLeftPadding={!isCollapsed && !hasDomainChildren}
+                    >
+                        <Text>
+                            <Tooltip
+                                placement="right"
+                                title={isCollapsed && displayName}
+                                mouseEnterDelay={0.7}
+                                mouseLeaveDelay={0}
+                            >
+                                <DomainColoredIcon domain={domain} size={30} fontSize={14} />
+                            </Tooltip>
+                            <DisplayName $isSelected={isDomainNodeSelected && !isCollapsed}>
+                                {!isCollapsed && displayName}
+                            </DisplayName>
+                        </Text>
+                        {!isCollapsed && hasDomainChildren && <Count>{finalNumChildren}</Count>}
+                    </NameWrapper>
+                </Tooltip>
+            </RowWrapper>
+            <StyledExpander isOpen={isOpen && !isClosing} paddingLeft={paddingLeft}>
+                <BodyContainer style={{ width: '100%' }}>
+                    {sortedDomains?.map((childDomain) => (
+                        <DomainNode
+                            key={domain.urn}
+                            domain={childDomain as Domain}
+                            numDomainChildren={childDomain.children?.total || 0}
+                            domainUrnToHide={domainUrnToHide}
+                            selectDomainOverride={selectDomainOverride}
+                            unhideSidebar={unhideSidebar}
+                            $paddingLeft={paddingLeft}
+                        />
+                    ))}
+                </BodyContainer>
+            </StyledExpander>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/domainV2/useListDomains.tsx b/datahub-web-react/src/app/domainV2/useListDomains.tsx
new file mode 100644
index 00000000000000..74f6b454f11d4b
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/useListDomains.tsx
@@ -0,0 +1,27 @@
+import { useListDomainsQuery } from '../../graphql/domain.generated';
+import { useSortedDomains } from './utils';
+
+interface Props {
+    parentDomain?: string;
+    skip?: boolean;
+    sortBy?: 'displayName';
+}
+
+export default function useListDomains({ parentDomain, skip, sortBy = 'displayName' }: Props) {
+    const { data, error, loading, refetch } = useListDomainsQuery({
+        skip,
+        variables: {
+            input: {
+                start: 0,
+                count: 1000, // don't paginate the home page, get all root level domains
+                parentDomain,
+            },
+        },
+        fetchPolicy: 'network-only', // always use network request first to populate cache
+        nextFetchPolicy: 'cache-first', // then use cache after that so we can manipulate it
+    });
+
+    const sortedDomains = useSortedDomains(data?.listDomains?.domains, sortBy);
+
+    return { data, sortedDomains, error, loading, refetch };
+}
diff --git a/datahub-web-react/src/app/domainV2/utils.ts b/datahub-web-react/src/app/domainV2/utils.ts
new file mode 100644
index 00000000000000..2e294189dfadda
--- /dev/null
+++ b/datahub-web-react/src/app/domainV2/utils.ts
@@ -0,0 +1,146 @@
+import { ApolloClient } from '@apollo/client';
+import { useEffect } from 'react';
+import { isEqual } from 'lodash';
+import { ListDomainsDocument, ListDomainsQuery } from '../../graphql/domain.generated';
+import { Entity, EntityType } from '../../types.generated';
+import { GenericEntityProperties } from '../entity/shared/types';
+import usePrevious from '../shared/usePrevious';
+import { useDomainsContext } from './DomainsContext';
+import { useEntityRegistry } from '../useEntityRegistry';
+import EntityRegistry from '../entity/EntityRegistry';
+
+/**
+ * Add an entry to the list domains cache.
+ */
+export const addToListDomainsCache = (client: ApolloClient<any>, newDomain, pageSize, parentDomain?: string) => {
+    // Read the data from our cache for this query.
+    const currData: ListDomainsQuery | null = client.readQuery({
+        query: ListDomainsDocument,
+        variables: {
+            input: {
+                start: 0,
+                count: pageSize,
+                parentDomain,
+            },
+        },
+    });
+
+    // Add our new domain into the existing list.
+    const newDomains = [newDomain, ...(currData?.listDomains?.domains || [])];
+
+    // Write our data back to the cache.
+    client.writeQuery({
+        query: ListDomainsDocument,
+        variables: {
+            input: {
+                start: 0,
+                count: pageSize,
+                parentDomain,
+            },
+        },
+        data: {
+            listDomains: {
+                start: 0,
+                count: (currData?.listDomains?.count || 0) + 1,
+                total: (currData?.listDomains?.total || 0) + 1,
+                domains: newDomains,
+            },
+        },
+    });
+};
+
+export const updateListDomainsCache = (
+    client: ApolloClient<any>,
+    urn: string,
+    id: string | undefined,
+    name: string,
+    description: string | undefined,
+    parentDomain?: string,
+) => {
+    addToListDomainsCache(
+        client,
+        {
+            urn,
+            id: id || '',
+            type: EntityType.Domain,
+            properties: {
+                name,
+                description: description || null,
+            },
+            ownership: null,
+            entities: null,
+            children: null,
+            dataProducts: null,
+            parentDomains: null,
+            displayProperties: null,
+        },
+        1000,
+        parentDomain,
+    );
+};
+
+/**
+ * Remove an entry from the list domains cache.
+ */
+export const removeFromListDomainsCache = (client, urn, page, pageSize, parentDomain?: string) => {
+    // Read the data from our cache for this query.
+    const currData: ListDomainsQuery | null = client.readQuery({
+        query: ListDomainsDocument,
+        variables: {
+            input: {
+                start: (page - 1) * pageSize,
+                count: pageSize,
+                parentDomain,
+            },
+        },
+    });
+
+    // Remove the domain from the existing domain set.
+    const newDomains = [...(currData?.listDomains?.domains || []).filter((domain) => domain.urn !== urn)];
+
+    // Write our data back to the cache.
+    client.writeQuery({
+        query: ListDomainsDocument,
+        variables: {
+            input: {
+                start: (page - 1) * pageSize,
+                count: pageSize,
+                parentDomain,
+            },
+        },
+        data: {
+            listDomains: {
+                start: currData?.listDomains?.start || 0,
+                count: (currData?.listDomains?.count || 1) - 1,
+                total: (currData?.listDomains?.total || 1) - 1,
+                domains: newDomains,
+            },
+        },
+    });
+};
+
+export function useUpdateDomainEntityDataOnChange(entityData: GenericEntityProperties | null, entityType: EntityType) {
+    const { setEntityData } = useDomainsContext();
+    const previousEntityData = usePrevious(entityData);
+
+    useEffect(() => {
+        if (EntityType.Domain === entityType && !isEqual(entityData, previousEntityData)) {
+            setEntityData(entityData);
+        }
+    });
+}
+
+export function useSortedDomains<T extends Entity>(domains?: Array<T>, sortBy?: 'displayName') {
+    const entityRegistry = useEntityRegistry();
+    if (!domains || !sortBy) return domains;
+    return [...domains].sort((a, b) => {
+        const nameA = entityRegistry.getDisplayName(EntityType.Domain, a) || '';
+        const nameB = entityRegistry.getDisplayName(EntityType.Domain, b) || '';
+        return nameA.localeCompare(nameB);
+    });
+}
+
+export function getParentDomains<T extends Entity>(domain: T, entityRegistry: EntityRegistry) {
+    const props = entityRegistry.getGenericEntityProperties(EntityType.Domain, domain);
+    return props?.parentDomains?.domains ?? [];
+}
diff --git a/datahub-web-react/src/app/entity/Entity.tsx b/datahub-web-react/src/app/entity/Entity.tsx
index c56c97454a1d57..37a63e9971ae00 100644
--- a/datahub-web-react/src/app/entity/Entity.tsx
+++ b/datahub-web-react/src/app/entity/Entity.tsx
@@ -47,6 +47,7 @@ export enum IconStyleType {
 
 /**
  * A standard set of Entity Capabilities that span across entity types.
+ * Note: Must be kept in sync with V2 EntityCapabilityType.
  */
 export enum EntityCapabilityType {
     /**
@@ -74,13 +75,25 @@ export enum EntityCapabilityType {
      */
     SOFT_DELETE,
     /**
-     * Assigning a role to an entity. Currently only supported for users.
+     * Run tests against an entity
+     */
+    TEST,
+    /**
+     * Add roles to the entity
      */
     ROLES,
     /**
      * Assigning the entity to a data product
      */
     DATA_PRODUCTS,
+    /**
+     * Health status of an entity
+     */
+    HEALTH,
+    /**
+     * Lineage information of an entity
+     */
+    LINEAGE,
     /**
      * Assigning Business Attribute to a entity
      */
@@ -153,7 +166,7 @@ export interface Entity<T> {
      *
      * TODO: Explore using getGenericEntityProperties for rendering profiles.
      */
-    renderSearch: (result: SearchResult) => JSX.Element;
+    renderSearch: (result: SearchResult, previewType?: PreviewType, onCardClick?: (any: any) => any) => JSX.Element;
 
     /**
      * Constructs config to add entity to lineage viz
diff --git a/datahub-web-react/src/app/entity/EntityRegistry.tsx b/datahub-web-react/src/app/entity/EntityRegistry.tsx
index 827f0e6692442e..7aed83440f3ab3 100644
--- a/datahub-web-react/src/app/entity/EntityRegistry.tsx
+++ b/datahub-web-react/src/app/entity/EntityRegistry.tsx
@@ -151,14 +151,19 @@ export default class EntityRegistry {
         );
     }
 
-    renderSearchResult(type: EntityType, searchResult: SearchResult): JSX.Element {
+    renderSearchResult(
+        type: EntityType,
+        searchResult: SearchResult,
+        previewType?: PreviewType,
+        onCardClick?: (any: any) => any,
+    ): JSX.Element {
         const entity = validatedGet(type, this.entityTypeToEntity);
         const genericEntityData = entity.getGenericEntityProperties(searchResult.entity);
 
         return (
             <SearchResultProvider searchResult={searchResult}>
                 <PreviewContext.Provider value={genericEntityData}>
-                    {entity.renderSearch(searchResult)}
+                    {entity.renderSearch(searchResult, previewType, onCardClick)}
                 </PreviewContext.Provider>
             </SearchResultProvider>
         );
@@ -214,6 +219,7 @@ export default class EntityRegistry {
                 siblingPlatforms: genericEntityProperties?.siblingPlatforms,
                 fineGrainedLineages,
                 siblings: genericEntityProperties?.siblings,
+                siblingsSearch: genericEntityProperties?.siblingsSearch,
                 schemaMetadata: genericEntityProperties?.schemaMetadata,
                 inputFields: genericEntityProperties?.inputFields,
                 canEditLineage: genericEntityProperties?.privileges?.canEditLineage,
diff --git a/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx b/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx
index abf8e732c47d61..cca6b0e60d22dd 100644
--- a/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx
+++ b/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx
@@ -240,7 +240,7 @@ export class DatasetEntity implements Entity<Dataset> {
         {
             component: SidebarSiblingsSection,
             display: {
-                visible: (_, dataset: GetDatasetQuery) => (dataset?.dataset?.siblings?.siblings?.length || 0) > 0,
+                visible: (_, dataset: GetDatasetQuery) => (dataset?.dataset?.siblingsSearch?.total || 0) > 0,
             },
         },
         {
diff --git a/datahub-web-react/src/app/entity/dataset/profile/OperationsTab.tsx b/datahub-web-react/src/app/entity/dataset/profile/OperationsTab.tsx
index d3371d3790d028..8896167469f9bd 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/OperationsTab.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/OperationsTab.tsx
@@ -137,7 +137,10 @@ export const OperationsTab = () => {
     const [page, setPage] = useState(1);
 
     // Fetch data across all siblings.
-    const allUrns = [urn, ...(entityData?.siblings?.siblings || []).map((sibling) => sibling?.urn).filter(notEmpty)];
+    const allUrns = [
+        urn,
+        ...(entityData?.siblingsSearch?.searchResults || []).map((sibling) => sibling.entity.urn).filter(notEmpty),
+    ];
     const loadings: boolean[] = [];
     const datas: GetDatasetRunsQuery[] = [];
     allUrns.forEach((entityUrn) => {
diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Schema.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/Schema.test.tsx
index 2cb155d43d302b..19917d23b9eccd 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Schema.test.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/__tests__/Schema.test.tsx
@@ -11,7 +11,7 @@ import {
 } from '../stories/sampleSchema';
 import { mocks } from '../../../../../Mocks';
 import { SchemaTab } from '../../../shared/tabs/Dataset/Schema/SchemaTab';
-import EntityContext from '../../../shared/EntityContext';
+import { EntityContext } from '../../../shared/EntityContext';
 import { EntityType, SchemaMetadata } from '../../../../../types.generated';
 import { SchemaRow } from '../../../shared/tabs/Dataset/Schema/components/SchemaRow';
 
diff --git a/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/StatChart.tsx b/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/StatChart.tsx
index ac9d9f77cce2a3..a6d2d2b4c855c6 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/StatChart.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/StatChart.tsx
@@ -73,7 +73,7 @@ export default function StatChart({ title, values, tickInterval: interval, dateR
     return (
         <>
             <Col sm={24} md={24} lg={8} xl={8}>
-                <ChartCard shouldScroll={false}>
+                <ChartCard $shouldScroll={false}>
                     <ChartContainer>
                         <ChartTitle level={5}>{chartData.title}</ChartTitle>
                         <ThinDivider />
diff --git a/datahub-web-react/src/app/entity/domain/preview/DomainEntitiesSnippet.tsx b/datahub-web-react/src/app/entity/domain/preview/DomainEntitiesSnippet.tsx
index 6d36964004d64f..a730d7ed0d233b 100644
--- a/datahub-web-react/src/app/entity/domain/preview/DomainEntitiesSnippet.tsx
+++ b/datahub-web-react/src/app/entity/domain/preview/DomainEntitiesSnippet.tsx
@@ -2,6 +2,7 @@ import { DatabaseOutlined, FileDoneOutlined } from '@ant-design/icons';
 import { VerticalDivider } from '@remirror/react';
 import React from 'react';
 import styled from 'styled-components';
+import { useHoverEntityTooltipContext } from '@src/app/recommendations/HoverEntityTooltipContext';
 import { SearchResultFields_Domain_Fragment } from '../../../../graphql/search.generated';
 import { ANTD_GRAY_V2 } from '../../shared/constants';
 import DomainIcon from '../../../domain/DomainIcon';
@@ -12,6 +13,7 @@ const Wrapper = styled.div`
     font-size: 12px;
     display: flex;
     align-items: center;
+    line-height: 20px;
 
     svg {
         margin-right: 4px;
@@ -29,14 +31,18 @@ interface Props {
 }
 
 export default function DomainEntitiesSnippet({ domain }: Props) {
-    const entityCount = domain.entities?.total || 0;
+    const { entityCount } = useHoverEntityTooltipContext();
     const subDomainCount = domain.children?.total || 0;
     const dataProductCount = domain.dataProducts?.total || 0;
 
     return (
         <Wrapper>
-            <DatabaseOutlined /> {entityCount} {entityCount === 1 ? 'entity' : 'entities'}
-            <StyledDivider />
+            {!!entityCount && (
+                <>
+                    <DatabaseOutlined /> {entityCount} {entityCount === 1 ? 'entity' : 'entities'}
+                    <StyledDivider />
+                </>
+            )}
             <DomainIcon /> {subDomainCount} {pluralize(subDomainCount, 'sub-domain')}
             <StyledDivider />
             <FileDoneOutlined /> {dataProductCount} {pluralize(dataProductCount, 'data product')}
diff --git a/datahub-web-react/src/app/entity/group/AddGroupMembersModal.tsx b/datahub-web-react/src/app/entity/group/AddGroupMembersModal.tsx
index 7666eb04612e5c..db1ec3355e726d 100644
--- a/datahub-web-react/src/app/entity/group/AddGroupMembersModal.tsx
+++ b/datahub-web-react/src/app/entity/group/AddGroupMembersModal.tsx
@@ -36,7 +36,7 @@ export const AddGroupMembersModal = ({ urn, open, onCloseModal, onSubmit }: Prop
     const [addGroupMembersMutation] = useAddGroupMembersMutation();
     const [userSearch, { data: userSearchData }] = useGetSearchResultsLazyQuery();
     const searchResults = userSearchData?.search?.searchResults?.map((searchResult) => searchResult.entity) || [];
-    const [recommendedData] = useGetRecommendations([EntityType.CorpUser]);
+    const { recommendedData } = useGetRecommendations([EntityType.CorpUser]);
     const inputEl = useRef(null);
 
     const handleUserSearch = (text: string) => {
diff --git a/datahub-web-react/src/app/entity/group/GroupOwnerSideBarSection.tsx b/datahub-web-react/src/app/entity/group/GroupOwnerSideBarSection.tsx
index de139d37caeedd..95ac2e67872ac7 100644
--- a/datahub-web-react/src/app/entity/group/GroupOwnerSideBarSection.tsx
+++ b/datahub-web-react/src/app/entity/group/GroupOwnerSideBarSection.tsx
@@ -11,6 +11,13 @@ const TITLE = 'Owners';
 
 const SectionWrapper = styled.div``;
 
+const OwnersWrapper = styled.div`
+    display: flex;
+    gap: 6px;
+    flex-wrap: wrap;
+    margin-bottom: 8px;
+`;
+
 const AddOwnerButton = styled(Button)``;
 
 type Props = {
@@ -30,10 +37,12 @@ export default function GroupOwnerSideBarSection({ urn, ownership, refetch }: Pr
                 <DisplayCount>{ownership?.owners?.length || ''}</DisplayCount>
             </GroupSectionHeader>
             <SectionWrapper>
-                {ownership &&
-                    ownership?.owners?.map((owner) => (
-                        <ExpandedOwner entityUrn={urn} owner={owner} refetch={refetch} />
-                    ))}
+                <OwnersWrapper>
+                    {ownership &&
+                        ownership?.owners?.map((owner) => (
+                            <ExpandedOwner entityUrn={urn} owner={owner} refetch={refetch} />
+                        ))}
+                </OwnersWrapper>
                 {ownersEmpty && (
                     <Typography.Paragraph type="secondary">No group owners added yet.</Typography.Paragraph>
                 )}
diff --git a/datahub-web-react/src/app/entity/query/QueryEntity.tsx b/datahub-web-react/src/app/entity/query/QueryEntity.tsx
new file mode 100644
index 00000000000000..aa97fe26fd63b2
--- /dev/null
+++ b/datahub-web-react/src/app/entity/query/QueryEntity.tsx
@@ -0,0 +1,97 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes';
+import { ConsoleSqlOutlined } from '@ant-design/icons';
+import { useGetQueryQuery } from '@graphql/query.generated';
+import { DataPlatform, EntityType, QueryEntity as Query } from '@types';
+import * as React from 'react';
+import { Entity, IconStyleType } from '../Entity';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+
+/**
+ * Definition of the DataHub DataPlatformInstance entity.
+ * Most of this still needs to be filled out.
+ */
+export class QueryEntity implements Entity<Query> {
+    type: EntityType = EntityType.Query;
+
+    icon = (fontSize?: number, _styleType?: IconStyleType, color?: string) => {
+        return (
+            <ConsoleSqlOutlined
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => false;
+
+    isBrowseEnabled = () => false;
+
+    isLineageEnabled = () => false;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getPathName = () => 'query';
+
+    getEntityName = () => 'Query';
+
+    getCollectionName = () => 'Queries';
+
+    useEntityQuery = useGetQueryQuery;
+
+    renderProfile = (_urn: string) => {
+        return <></>;
+    };
+
+    getOverridePropertiesFromEntity = (query?: Query | null): GenericEntityProperties => {
+        return {
+            name: query && this.displayName(query),
+            platform: query?.platform,
+        };
+    };
+
+    renderEmbeddedProfile = (_: string) => <></>;
+
+    renderPreview = () => {
+        return <></>;
+    };
+
+    renderSearch = () => {
+        return <></>;
+    };
+
+    getLineageVizConfig = (query: Query) => {
+        // TODO: Set up types better here
+        const platform: DataPlatform | undefined = (query as any)?.queryPlatform;
+        return {
+            urn: query.urn,
+            name: query.properties?.name || query.urn,
+            type: EntityType.Query,
+            icon: platform?.properties?.logoUrl || undefined,
+            platform: platform || undefined,
+        };
+    };
+
+    displayName = (data: Query) => {
+        return data?.properties?.name || (data?.properties?.source === 'SYSTEM' && 'System Query') || data?.urn;
+    };
+
+    getGenericEntityProperties = (data: Query) => {
+        return getDataForEntityType({
+            data,
+            entityType: this.type,
+            getOverrideProperties: this.getOverridePropertiesFromEntity,
+        });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([]);
+    };
+
+    getGraphName = () => {
+        return 'query';
+    };
+}
diff --git a/datahub-web-react/src/app/entity/shared/EntityContext.ts b/datahub-web-react/src/app/entity/shared/EntityContext.ts
index abc7fcfa6cced0..74b92e17a2531b 100644
--- a/datahub-web-react/src/app/entity/shared/EntityContext.ts
+++ b/datahub-web-react/src/app/entity/shared/EntityContext.ts
@@ -1,9 +1,9 @@
 import React, { useContext } from 'react';
 import { EntityType } from '../../../types.generated';
-import { useIsSeparateSiblingsMode } from './siblingUtils';
+import { shouldEntityBeTreatedAsPrimary, useIsSeparateSiblingsMode } from './siblingUtils';
 import { EntityContextType, UpdateEntityType } from './types';
 
-const EntityContext = React.createContext<EntityContextType>({
+export const EntityContext = React.createContext<EntityContextType>({
     urn: '',
     entityType: EntityType.Dataset,
     entityData: null,
@@ -14,6 +14,7 @@ const EntityContext = React.createContext<EntityContextType>({
     refetch: () => Promise.resolve({}),
     lineage: undefined,
     dataNotCombinedWithSiblings: null,
+    entityState: { shouldRefetchContents: false, setShouldRefetchContents: () => {} },
 });
 
 export default EntityContext;
@@ -60,8 +61,8 @@ export const useLineageData = () => {
 export const useMutationUrn = () => {
     const { urn, entityData } = useContext(EntityContext);
     const isHideSiblingMode = useIsSeparateSiblingsMode();
-    if (!entityData?.siblings || entityData?.siblings?.isPrimary || isHideSiblingMode) {
+    if (!entityData?.siblingsSearch?.searchResults || shouldEntityBeTreatedAsPrimary(entityData) || isHideSiblingMode) {
         return urn;
     }
-    return entityData?.siblings?.siblings?.[0]?.urn || urn;
+    return entityData?.siblingsSearch?.searchResults?.[0].entity.urn || urn;
 };
diff --git a/datahub-web-react/src/app/entity/shared/__tests__/siblingsUtils.test.ts b/datahub-web-react/src/app/entity/shared/__tests__/siblingsUtils.test.ts
index f3b857ab2ef3be..3fd9dd32454c3c 100644
--- a/datahub-web-react/src/app/entity/shared/__tests__/siblingsUtils.test.ts
+++ b/datahub-web-react/src/app/entity/shared/__tests__/siblingsUtils.test.ts
@@ -169,6 +169,11 @@ const datasetPrimaryWithSiblings = {
         isPrimary: true,
         siblings: [datasetUnprimary],
     },
+    siblingsSearch: {
+        count: 1,
+        total: 1,
+        searchResults: [{ entity: datasetUnprimary, matchedFields: [] }],
+    },
 };
 
 const datasetUnprimaryWithPrimarySiblings = {
@@ -177,6 +182,11 @@ const datasetUnprimaryWithPrimarySiblings = {
         isPrimary: false,
         siblings: [datasetPrimary],
     },
+    siblingsSearch: {
+        count: 1,
+        total: 1,
+        searchResults: [{ entity: datasetPrimary, matchedFields: [] }],
+    },
 };
 
 const datasetUnprimaryWithNoPrimarySiblings = {
@@ -185,6 +195,11 @@ const datasetUnprimaryWithNoPrimarySiblings = {
         isPrimary: false,
         siblings: [datasetUnprimary],
     },
+    siblingsSearch: {
+        count: 1,
+        total: 1,
+        searchResults: [{ entity: datasetUnprimary, matchedFields: [] }],
+    },
 };
 
 describe('siblingUtils', () => {
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ExpandedOwner/ExpandedOwner.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ExpandedOwner/ExpandedOwner.tsx
index 9bd4edd0d19d3a..dac382ab8403ef 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/ExpandedOwner/ExpandedOwner.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/ExpandedOwner/ExpandedOwner.tsx
@@ -9,11 +9,12 @@ import { useEntityRegistry } from '../../../../../useEntityRegistry';
 import analytics, { EventType, EntityActionType } from '../../../../../analytics';
 import { useEntityData } from '../../../EntityContext';
 import OwnerContent from './OwnerContent';
+import { useEmbeddedProfileLinkProps } from '../../../../../shared/useEmbeddedProfileLinkProps';
 
 const OwnerTag = styled(Tag)`
+    margin: 0;
     padding: 2px;
     padding-right: 6px;
-    margin-bottom: 8px;
     display: inline-flex;
     align-items: center;
 `;
@@ -30,6 +31,7 @@ type Props = {
 export const ExpandedOwner = ({ entityUrn, owner, hidePopOver, refetch, readOnly, fontSize }: Props) => {
     const entityRegistry = useEntityRegistry();
     const { entityType } = useEntityData();
+    const linkProps = useEmbeddedProfileLinkProps();
     const [removeOwnerMutation] = useRemoveOwnerMutation();
     let name = '';
     let ownershipTypeName = '';
@@ -94,7 +96,7 @@ export const ExpandedOwner = ({ entityUrn, owner, hidePopOver, refetch, readOnly
         <OwnerTag onClose={onClose} closable={!!entityUrn && !readOnly}>
             {readOnly && <OwnerContent name={name} owner={owner} hidePopOver={hidePopOver} pictureLink={pictureLink} />}
             {!readOnly && (
-                <Link to={entityRegistry.getEntityUrl(owner.owner.type, owner.owner.urn)}>
+                <Link to={`${entityRegistry.getEntityUrl(owner.owner.type, owner.owner.urn)}/owner of`} {...linkProps}>
                     <OwnerContent
                         name={name}
                         owner={owner}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/EntityProfile.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/EntityProfile.tsx
index 1deeed076d8d6f..8ceba1e426965e 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/EntityProfile.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/EntityProfile.tsx
@@ -23,7 +23,7 @@ import { ANTD_GRAY } from '../../constants';
 import { EntityHeader } from './header/EntityHeader';
 import { EntityTabs } from './header/EntityTabs';
 import { EntitySidebar } from './sidebar/EntitySidebar';
-import EntityContext from '../../EntityContext';
+import { EntityContext } from '../../EntityContext';
 import useIsLineageMode from '../../../../lineage/utils/useIsLineageMode';
 import { useEntityRegistry } from '../../../../useEntityRegistry';
 import LineageExplorer from '../../../../lineage/LineageExplorer';
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx
index ec65b31968d83d..34d00836f02b2b 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx
@@ -27,7 +27,8 @@ export default function DataProductSection({ readOnly }: Props) {
     const [batchSetDataProductMutation] = useBatchSetDataProductMutation();
     const [dataProduct, setDataProduct] = useState<DataProduct | null>(null);
     const dataProductRelationships = entityData?.dataProduct?.relationships;
-    const siblingUrns: string[] = entityData?.siblings?.siblings?.map((sibling) => sibling?.urn || '') || [];
+    const siblingUrns: string[] =
+        entityData?.siblingsSearch?.searchResults?.map((sibling) => sibling.entity.urn || '') || [];
 
     useEffect(() => {
         if (dataProductRelationships && dataProductRelationships.length > 0) {
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx
index e57666471df1a6..2e2962ed865edc 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx
@@ -148,10 +148,12 @@ export const EditOwnersModal = ({
     // User and group dropdown search results!
     const [userSearch, { data: userSearchData }] = useGetSearchResultsLazyQuery();
     const [groupSearch, { data: groupSearchData }] = useGetSearchResultsLazyQuery();
-    const userSearchResults = userSearchData?.search?.searchResults?.map((searchResult) => searchResult.entity) || [];
-    const groupSearchResults = groupSearchData?.search?.searchResults?.map((searchResult) => searchResult.entity) || [];
+    const userSearchResults: Array<Entity> =
+        userSearchData?.search?.searchResults?.map((searchResult) => searchResult.entity) || [];
+    const groupSearchResults: Array<Entity> =
+        groupSearchData?.search?.searchResults?.map((searchResult) => searchResult.entity) || [];
     const combinedSearchResults = [...userSearchResults, ...groupSearchResults];
-    const [recommendedData] = useGetRecommendations([EntityType.CorpGroup, EntityType.CorpUser]);
+    const { recommendedData } = useGetRecommendations([EntityType.CorpGroup, EntityType.CorpUser]);
     const inputEl = useRef(null);
 
     // Invokes the search API as the owner types
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx
index 10e5f4d87764b3..03c25193d862ee 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx
@@ -25,6 +25,7 @@ const OwnersContainer = styled.div`
     flex-direction: row;
     flex-wrap: wrap;
     margin-top: 8px;
+    gap: 6px;
 `;
 
 interface Props {
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx
index 17e09045196a43..29073d6164f827 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx
@@ -36,7 +36,7 @@ export const SidebarSiblingsSection = () => {
         );
     }
 
-    const siblingEntities = entityData?.siblings?.siblings || [];
+    const siblingEntities = entityData?.siblingsSearch?.searchResults?.map((r) => r.entity) || [];
     const entityDataWithoutSiblings = stripSiblingsFromEntity(dataNotCombinedWithSiblings.dataset);
 
     const allSiblingsInGroup = showSeparateSiblings
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/utils.ts b/datahub-web-react/src/app/entity/shared/containers/profile/utils.ts
index bb35755826a899..ac074cc54ae348 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/utils.ts
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/utils.ts
@@ -60,9 +60,12 @@ export function getDataForEntityType<T>({
         };
     }
 
-    if (anyEntityData?.siblings?.siblings?.filter((sibling) => sibling.exists).length > 0 && !isHideSiblingMode) {
-        const genericSiblingProperties: GenericEntityProperties[] = anyEntityData?.siblings?.siblings?.map((sibling) =>
-            getDataForEntityType({ data: sibling, getOverrideProperties: () => ({}) }),
+    if (
+        anyEntityData?.siblingsSearch?.searchResults?.filter((sibling) => sibling.entity.exists).length > 0 &&
+        !isHideSiblingMode
+    ) {
+        const genericSiblingProperties: GenericEntityProperties[] = anyEntityData?.siblingsSearch?.searchResults?.map(
+            (sibling) => getDataForEntityType({ data: sibling.entity, getOverrideProperties: () => ({}) }),
         );
 
         const allPlatforms = anyEntityData.siblings.isPrimary
diff --git a/datahub-web-react/src/app/entity/shared/embed/EmbeddedProfile.tsx b/datahub-web-react/src/app/entity/shared/embed/EmbeddedProfile.tsx
index df928fc408de60..fc3f015ec4d938 100644
--- a/datahub-web-react/src/app/entity/shared/embed/EmbeddedProfile.tsx
+++ b/datahub-web-react/src/app/entity/shared/embed/EmbeddedProfile.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { EntityType, Exact } from '../../../../types.generated';
 import useGetDataForProfile from '../containers/profile/useGetDataForProfile';
-import EntityContext from '../EntityContext';
+import { EntityContext } from '../EntityContext';
 import { GenericEntityProperties } from '../types';
 import EmbeddedHeader from './EmbeddedHeader';
 import { SidebarAboutSection } from '../containers/profile/sidebar/AboutSection/SidebarAboutSection';
diff --git a/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx b/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx
index b20aa26930fe92..61a70c145bd115 100644
--- a/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx
+++ b/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx
@@ -4,11 +4,13 @@ import Form from './Form';
 import { ANTD_GRAY_V2 } from '../constants';
 import ProfileSidebar from '../containers/profile/sidebar/ProfileSidebar';
 import { useEntityRegistry } from '../../../useEntityRegistry';
-import EntityContext, { useEntityContext } from '../EntityContext';
+import { EntityContext, useEntityContext } from '../EntityContext';
 import EntityInfo from '../containers/profile/sidebar/EntityInfo/EntityInfo';
 import { useEntityFormContext } from './EntityFormContext';
 import ProgressBar from './ProgressBar';
 
+import { useIsThemeV2 } from '../../../useIsThemeV2';
+
 const ContentWrapper = styled.div`
     background-color: ${ANTD_GRAY_V2[1]};
     max-height: 100%;
@@ -34,6 +36,15 @@ export default function FormByEntity({ formUrn }: Props) {
     const { entityType } = useEntityContext();
     const entityRegistry = useEntityRegistry();
     const sidebarSections = entityRegistry.getSidebarSections(selectedEntity?.type || entityType);
+    const isV2 = useIsThemeV2();
+
+    // Used for v2 - removes repeated entity header (we use EntityInfo in this component)
+    // SidebarEntityHeader is always the first index in sidebarSections, so remove it here
+    // TODO (OBS-677): remove this logic once we get form info into V2 sidebar
+    const cleanedSidebarSections = sidebarSections.slice(1);
+
+    // Conditional sections based on theme version
+    const sections = isV2 ? cleanedSidebarSections : sidebarSections;
 
     return (
         <EntityContext.Provider
@@ -53,7 +64,7 @@ export default function FormByEntity({ formUrn }: Props) {
                 <ProgressBar formUrn={formUrn} />
                 <FlexWrapper>
                     <ProfileSidebar
-                        sidebarSections={sidebarSections}
+                        sidebarSections={loading ? [] : sections}
                         topSection={{ component: () => <EntityInfo formUrn={formUrn} /> }}
                         backgroundColor="white"
                         alignLeft
diff --git a/datahub-web-react/src/app/entity/shared/entityForm/__tests__/Form.test.tsx b/datahub-web-react/src/app/entity/shared/entityForm/__tests__/Form.test.tsx
index 750ef71acbd120..88507b95513fd2 100644
--- a/datahub-web-react/src/app/entity/shared/entityForm/__tests__/Form.test.tsx
+++ b/datahub-web-react/src/app/entity/shared/entityForm/__tests__/Form.test.tsx
@@ -1,7 +1,7 @@
 import { MockedProvider } from '@apollo/client/testing';
 import React from 'react';
 import { render, waitFor } from '@testing-library/react';
-import EntityContext from '../../EntityContext';
+import { EntityContext } from '../../EntityContext';
 import { mockEntityDataWithFieldPrompts, mockEntityData } from '../mocks';
 import { EntityType } from '../../../../../types.generated';
 import Form from '../Form';
diff --git a/datahub-web-react/src/app/entity/shared/siblingUtils.ts b/datahub-web-react/src/app/entity/shared/siblingUtils.ts
index aa9e4bcb5e46e1..5633da034a829f 100644
--- a/datahub-web-react/src/app/entity/shared/siblingUtils.ts
+++ b/datahub-web-react/src/app/entity/shared/siblingUtils.ts
@@ -1,8 +1,19 @@
+import { useEntityData } from '@app/entity/shared/EntityContext';
 import merge from 'deepmerge';
-import { unionBy, keyBy, values } from 'lodash';
-import { useLocation } from 'react-router-dom';
+import { keyBy, unionBy, values } from 'lodash';
 import * as QueryString from 'query-string';
-import { Dataset, Entity, Maybe, SiblingProperties } from '../../../types.generated';
+import { useLocation } from 'react-router-dom';
+import {
+    Dataset,
+    Entity,
+    Health,
+    HealthStatus,
+    HealthStatusType,
+    Maybe,
+    ScrollResults,
+    Operation,
+    SiblingProperties,
+} from '../../../types.generated';
 import { GenericEntityProperties } from './types';
 import { useIsShowSeparateSiblingsEnabled } from '../../useAppConfig';
 import { downgradeV2FieldPath } from '../dataset/profile/schema/utils/utils';
@@ -11,9 +22,11 @@ export function stripSiblingsFromEntity(entity: any) {
     return {
         ...entity,
         siblings: null,
+        siblingsSearch: null,
         siblingPlatforms: null,
     };
 }
+
 function cleanHelper(obj, visited) {
     if (visited.has(obj)) return obj;
     visited.add(obj);
@@ -25,11 +38,15 @@ function cleanHelper(obj, visited) {
         }
         if ((v && typeof v === 'object' && !Object.keys(v).length) || v === null || v === undefined || v === '') {
             if (Array.isArray(object)) {
-                object.splice(Number(k), 1);
+                // do nothing
             } else if (Object.getOwnPropertyDescriptor(object, k)?.configurable) {
                 // TODO(hsheth2): Not sure why we needed to add the above "configurable" check.
                 // However, I was getting errors when it was not present in dev mode (but not in prod mode).
-                delete object[k];
+                try {
+                    delete object[k];
+                } catch (e) {
+                    console.warn('error deleting key', k, 'from object', object, e);
+                }
             }
         }
     });
@@ -94,10 +111,18 @@ const mergeAssertions = (destinationArray, sourceArray, _options) => {
     return unionBy(destinationArray, sourceArray, 'urn');
 };
 
+const mergeIncidents = (destinationArray, sourceArray, _options) => {
+    return unionBy(destinationArray, sourceArray, 'urn');
+};
+
 const mergeProperties = (destinationArray, sourceArray, _options) => {
     return unionBy(destinationArray, sourceArray, 'key');
 };
 
+const mergeStructuredProperties = (destinationArray, sourceArray, _options) => {
+    return unionBy(sourceArray, destinationArray, 'structuredProperty.urn');
+};
+
 const mergeOwners = (destinationArray, sourceArray, _options) => {
     return unionBy(destinationArray, sourceArray, 'owner.urn');
 };
@@ -106,6 +131,112 @@ const mergeFields = (destinationArray, sourceArray, _options) => {
     return mergeArrayOfObjectsByKey(destinationArray, sourceArray, 'fieldPath', true);
 };
 
+const mergeForms = (destinationArray, sourceArray, _options) => {
+    return unionBy(sourceArray, destinationArray, 'form.urn');
+};
+
+const mergeLastOperations = (
+    destinationArray: Pick<Operation, 'lastUpdatedTimestamp'>[],
+    sourceArray: Pick<Operation, 'lastUpdatedTimestamp'>[],
+    _options,
+) => {
+    // return whichever operation is more recent
+    // const lastUpdated = (operations?.length && operations[0].lastUpdatedTimestamp) || 0;
+    const destinationLastUpdated = (destinationArray?.length && destinationArray[0]?.lastUpdatedTimestamp) || 0;
+    const sourceLastUpdated = (sourceArray?.length && sourceArray[0]?.lastUpdatedTimestamp) || 0;
+    // return whichever operation is more recent
+    return destinationLastUpdated > sourceLastUpdated ? destinationArray : sourceArray;
+};
+
+const mergeSubtypes = (destinationArray: string[], sourceArray: string[], _options) => {
+    const seen = new Set<string>();
+    const result: string[] = [];
+    [...sourceArray, ...destinationArray].forEach((subtype) => {
+        if (!seen.has(subtype)) {
+            seen.add(subtype);
+            result.push(subtype);
+        }
+    });
+    return result;
+};
+
+const mergeHealthStatus = (destStatus?: HealthStatus, sourceStatus?: HealthStatus): HealthStatus => {
+    if (destStatus === HealthStatus.Fail || sourceStatus === HealthStatus.Fail) {
+        return HealthStatus.Fail;
+    }
+    if (destStatus === HealthStatus.Warn || sourceStatus === HealthStatus.Warn) {
+        return HealthStatus.Warn;
+    }
+    return HealthStatus.Pass;
+};
+
+const mergeHealthMessage = (type: HealthStatusType, mergedStatus: HealthStatus): string => {
+    if (mergedStatus === HealthStatus.Fail) {
+        switch (type) {
+            case HealthStatusType.Assertions:
+                return 'See failing assertions →';
+            case HealthStatusType.Incidents:
+                return 'See active incidents →';
+            default:
+                return 'See failed checks →';
+        }
+    }
+    if (mergedStatus === HealthStatus.Warn) {
+        switch (type) {
+            case HealthStatusType.Assertions:
+                return 'Some assertions have problems.';
+            default:
+                return 'Some checks have problems.';
+        }
+    }
+    if (mergedStatus === HealthStatus.Pass) {
+        switch (type) {
+            case HealthStatusType.Assertions:
+                return 'All assertions are passing';
+            case HealthStatusType.Incidents:
+                return 'No active incidents';
+            default:
+                return 'All checks are passing';
+        }
+    }
+    return 'All checks are passing';
+};
+
+// Merge entity health across siblings.
+const mergeHealth = (
+    destinationArray: Maybe<Health[]> | undefined,
+    sourceArray: Maybe<Health[]> | undefined,
+    _options,
+) => {
+    const viewedHealthType = new Set();
+    return [...(sourceArray || []), ...(destinationArray || [])]
+        .map((source) => {
+            if (viewedHealthType.has(source.type)) {
+                return null;
+            }
+
+            viewedHealthType.add(source.type);
+
+            const { type, status, causes } = source;
+
+            const destHealth = destinationArray?.find((dest) => dest.type === type);
+            const destStatus = destHealth?.status;
+            const destCauses = destHealth?.causes;
+
+            const finalStatus = mergeHealthStatus(destStatus, status);
+            const finalMessage = mergeHealthMessage(type, finalStatus);
+            const finalCauses = [...(causes || []), ...(destCauses || [])];
+
+            return {
+                type,
+                status: finalStatus,
+                message: finalMessage,
+                causes: finalCauses,
+            };
+        })
+        .filter((health) => health !== null);
+};
+
 function getArrayMergeFunction(key) {
     switch (key) {
         case 'tags':
@@ -118,15 +249,45 @@ function getArrayMergeFunction(key) {
             return mergeProperties;
         case 'owners':
             return mergeOwners;
+        case 'incidents':
+            return mergeIncidents;
         case 'fields':
             return mergeFields;
         case 'editableSchemaFieldInfo':
             return mergeFields;
+        case 'health':
+            return mergeHealth;
+        case 'typeNames':
+            return mergeSubtypes;
+        case 'lastOperation':
+            return mergeLastOperations;
+        case 'completedForms':
+        case 'incompleteForms':
+        case 'verifications':
+            return mergeForms;
         default:
             return undefined;
     }
 }
 
+// needs its own merge function because "properties" exists as a key elsewhere
+function structuredPropertiesMerge(isPrimary, key) {
+    if (key === 'properties') {
+        return (secondary, primary) => {
+            return merge(secondary, primary, {
+                arrayMerge: mergeStructuredProperties,
+                customMerge: customMerge.bind({}, isPrimary),
+            });
+        };
+    }
+    return (secondary, primary) => {
+        return merge(secondary, primary, {
+            arrayMerge: combineMerge,
+            customMerge: customMerge.bind({}, isPrimary),
+        });
+    };
+}
+
 function customMerge(isPrimary, key) {
     if (key === 'upstream' || key === 'downstream') {
         return (_secondary, primary) => primary;
@@ -135,17 +296,56 @@ function customMerge(isPrimary, key) {
     if (key === 'platform' || key === 'siblings') {
         return (secondary, primary) => (isPrimary ? primary : secondary);
     }
-    if (key === 'forms') {
+    if (key === 'testResults') {
         return (_secondary, primary) => primary;
     }
+    if (key === 'activeIncidents') {
+        return (secondary, primary) => ({ ...primary, total: primary.total + secondary.total });
+    }
+    if (key === 'lastModified') {
+        return (secondary, primary) => (secondary?.time || primary?.time < 0 || 0 ? secondary : primary);
+    }
+    if (key === 'statsSummary') {
+        return (secondary, primary) => {
+            if (!primary) {
+                return secondary;
+            }
+            if (!secondary) {
+                return primary;
+            }
+            return {
+                ...primary,
+                queryCountLast30Days: primary?.queryCountLast30Days || secondary?.queryCountLast30Days,
+                queryCountPercentileLast30Days:
+                    primary?.queryCountPercentileLast30Days || secondary?.queryCountPercentileLast30Days,
+                uniqueUserCountLast30Days: primary?.uniqueUserCountLast30Days || secondary?.uniqueUserCountLast30Days,
+                uniqueUserPercentileLast30Days:
+                    primary?.uniqueUserPercentileLast30Days || secondary?.uniqueUserPercentileLast30Days,
+            };
+        };
+    }
+    if (key === 'structuredProperties') {
+        return (secondary, primary) => {
+            return merge(secondary, primary, {
+                arrayMerge: combineMerge,
+                customMerge: structuredPropertiesMerge.bind({}, isPrimary),
+            });
+        };
+    }
     if (
         key === 'tags' ||
         key === 'terms' ||
         key === 'assertions' ||
         key === 'customProperties' ||
         key === 'owners' ||
+        key === 'incidents' ||
         key === 'fields' ||
-        key === 'editableSchemaFieldInfo'
+        key === 'editableSchemaFieldInfo' ||
+        key === 'health' ||
+        key === 'typeNames' ||
+        key === 'completedForms' ||
+        key === 'incompleteForms' ||
+        key === 'verifications'
     ) {
         return (secondary, primary) => {
             return merge(secondary, primary, {
@@ -174,13 +374,14 @@ export const getEntitySiblingData = <T>(baseEntity: T): Maybe<SiblingProperties>
 };
 
 // should the entity's metadata win out against its siblings?
-export const shouldEntityBeTreatedAsPrimary = (extractedBaseEntity: { siblings?: SiblingProperties | null }) => {
-    const siblingAspect = extractedBaseEntity?.siblings;
-
-    const siblingsList = siblingAspect?.siblings || [];
+export const shouldEntityBeTreatedAsPrimary = (extractedBaseEntity: {
+    siblings?: SiblingProperties | null;
+    siblingsSearch?: ScrollResults | null;
+}) => {
+    const siblingsList = extractedBaseEntity?.siblingsSearch?.searchResults?.map((r) => r.entity) || [];
 
     // if the entity is marked as primary, take its metadata first
-    const isPrimarySibling = !!siblingAspect?.isPrimary;
+    const isPrimarySibling = !!extractedBaseEntity?.siblings?.isPrimary;
 
     // if no entity in the cohort is primary, just have the entity whos urn is navigated
     // to be primary
@@ -192,15 +393,12 @@ export const shouldEntityBeTreatedAsPrimary = (extractedBaseEntity: { siblings?:
 };
 
 const combineEntityWithSiblings = (entity: GenericEntityProperties) => {
-    // eslint-disable-next-line @typescript-eslint/dot-notation
-    const siblingAspect = entity.siblings;
-    if ((siblingAspect?.siblings || []).length === 0) {
+    const siblings = entity.siblingsSearch?.searchResults?.map((r) => r.entity) || [];
+
+    if (!entity?.siblingsSearch?.count || !siblings.length) {
         return entity;
     }
 
-    // eslint-disable-next-line @typescript-eslint/dot-notation
-    const siblings = siblingAspect?.siblings || [];
-
     const isPrimary = shouldEntityBeTreatedAsPrimary(entity);
 
     const combinedBaseEntity: any = siblings.reduce(
@@ -212,12 +410,35 @@ const combineEntityWithSiblings = (entity: GenericEntityProperties) => {
         entity,
     );
 
+    // if a key is null in the primary sibling, it will not merge with the secondary even if the secondary is not null
+    const secondarySibling = isPrimary ? siblings[0] : entity;
+    Object.keys(secondarySibling).forEach((key) => {
+        if (combinedBaseEntity[key] === null && secondarySibling[key] !== null) {
+            combinedBaseEntity[key] = secondarySibling[key];
+        }
+    });
+
     // Force the urn of the combined entity to the current entity urn.
     combinedBaseEntity.urn = entity.urn;
 
+    combinedBaseEntity.properties = {
+        ...combinedBaseEntity.properties,
+        externalUrl: entity?.properties?.externalUrl,
+    };
+
     return combinedBaseEntity;
 };
 
+export function combineEntityData<T>(entityValue: T, siblingValue: T, isPrimary: boolean) {
+    if (!entityValue) return siblingValue;
+    if (!siblingValue) return entityValue;
+
+    return merge(clean(isPrimary ? siblingValue : entityValue), clean(isPrimary ? entityValue : siblingValue), {
+        arrayMerge: combineMerge,
+        customMerge: customMerge.bind({}, isPrimary),
+    });
+}
+
 export const combineEntityDataWithSiblings = <T>(baseEntity: T): T => {
     if (!baseEntity) {
         return baseEntity;
@@ -225,9 +446,7 @@ export const combineEntityDataWithSiblings = <T>(baseEntity: T): T => {
     const baseEntityKey = Object.keys(baseEntity)[0];
     const extractedBaseEntity = baseEntity[baseEntityKey];
 
-    // eslint-disable-next-line @typescript-eslint/dot-notation
-    const siblingAspect = extractedBaseEntity.siblings;
-    if ((siblingAspect?.siblings || []).length === 0) {
+    if (!extractedBaseEntity?.siblingsSearch?.count) {
         return baseEntity;
     }
 
@@ -254,7 +473,8 @@ export function combineSiblingsForEntity(entity: Entity, visitedSiblingUrns: Set
     if (visitedSiblingUrns.has(entity.urn)) return { skipped: true };
 
     const combinedEntity: CombinedEntity = { entity: combineEntityWithSiblings({ ...entity }) };
-    const siblings = (combinedEntity.entity as GenericEntityProperties).siblings?.siblings ?? [];
+    const siblings =
+        (combinedEntity.entity as GenericEntityProperties).siblingsSearch?.searchResults.map((r) => r.entity) ?? [];
     const isPrimary = (combinedEntity.entity as GenericEntityProperties).siblings?.isPrimary;
     const siblingUrns = siblings.map((sibling) => sibling?.urn);
 
@@ -289,3 +509,16 @@ export function useIsSeparateSiblingsMode() {
 
     return showSeparateSiblings || params[SEPARATE_SIBLINGS_URL_PARAM] === 'true';
 }
+
+/**
+ * `siblingPlatforms` in GenericEntityProperties always puts the primary first.
+ * This method allows getting sibling platforms without considering the primary.
+ */
+export function useGetSiblingPlatforms() {
+    const { entityData } = useEntityData();
+    const isPrimary = entityData?.siblings?.isPrimary ?? false;
+    return {
+        entityPlatform: isPrimary ? entityData?.siblingPlatforms?.[0] : entityData?.siblingPlatforms?.[1],
+        siblingPlatform: isPrimary ? entityData?.siblingPlatforms?.[1] : entityData?.siblingPlatforms?.[0],
+    };
+}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PropertyTypeLabel.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PropertyTypeLabel.tsx
index b4ffce294d136a..775680cb1eb294 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PropertyTypeLabel.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PropertyTypeLabel.tsx
@@ -10,22 +10,29 @@ import { TypeData } from '../../../Properties/types';
 type Props = {
     type: TypeData;
     dataType?: DataTypeEntity;
+    displayTransparent?: boolean;
 };
 
-export const PropertyTypeBadge = styled(Badge)`
+export const PropertyTypeBadge = styled(Badge)<{ displayTransparent?: boolean }>`
     margin: 4px 0 4px 8px;
     &&& .ant-badge-count {
+        ${(props) =>
+            props.displayTransparent
+                ? `
+            background-color: transparent;
+            `
+                : `
         background-color: ${ANTD_GRAY[1]};
         color: ${ANTD_GRAY_V2[8]};
         border: 1px solid ${ANTD_GRAY_V2[6]};
+        `}
         font-size: 12px;
         font-weight: 500;
-        height: 22px;
         font-family: 'Manrope';
     }
 `;
 
-export default function PropertyTypeLabel({ type, dataType }: Props) {
+export default function PropertyTypeLabel({ type, dataType, displayTransparent }: Props) {
     // if unable to match type to DataHub, display native type info by default
     const { nativeDataType } = type;
     const nativeFallback = type.type === SchemaFieldDataType.Null;
@@ -35,5 +42,5 @@ export default function PropertyTypeLabel({ type, dataType }: Props) {
         dataType?.info?.type ||
         (nativeFallback ? truncate(250, nativeDataType) : type.type);
 
-    return <PropertyTypeBadge count={capitalizeFirstLetterOnly(typeText)} />;
+    return <PropertyTypeBadge count={capitalizeFirstLetterOnly(typeText)} displayTransparent={displayTransparent} />;
 }
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/acrylTypes.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/acrylTypes.tsx
new file mode 100644
index 00000000000000..8a70a3d87c1478
--- /dev/null
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/acrylTypes.tsx
@@ -0,0 +1,21 @@
+import { Assertion, AssertionType } from '../../../../../../types.generated';
+
+export type AssertionStatusSummary = {
+    passing: number;
+    failing: number;
+    erroring: number;
+    total: number; // Total assertions with at least 1 run.
+    totalAssertions: number;
+};
+
+/**
+ * A group of assertions related by their logical type or category.
+ */
+export type AssertionGroup = {
+    name: string;
+    icon: React.ReactNode;
+    description?: string;
+    assertions: Assertion[];
+    summary: AssertionStatusSummary;
+    type: AssertionType;
+};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx
index 054331721df364..ea8afce4e99033 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import { mocks } from '../../../../../../Mocks';
 import { EntityType } from '../../../../../../types.generated';
 import TestPageContainer from '../../../../../../utils/test-utils/TestPageContainer';
-import EntityContext from '../../../EntityContext';
+import { EntityContext } from '../../../EntityContext';
 import { DocumentationTab } from '../DocumentationTab';
 
 describe('SchemaDescriptionField', () => {
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx
index 765e9e98232c24..2e90dcedd116f5 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx
@@ -5,7 +5,7 @@ import { dataJob1, mocks } from '../../../../../../Mocks';
 import { EntityType } from '../../../../../../types.generated';
 import TestPageContainer from '../../../../../../utils/test-utils/TestPageContainer';
 import { getDataForEntityType } from '../../../containers/profile/utils';
-import EntityContext from '../../../EntityContext';
+import { EntityContext } from '../../../EntityContext';
 import { DataJobFlowTab } from '../DataJobFlowTab';
 
 describe('DataJobFlowTab', () => {
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Incident/incidentUtils.ts b/datahub-web-react/src/app/entity/shared/tabs/Incident/incidentUtils.ts
index d7826bdc8907a1..32e15b4cded8e4 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Incident/incidentUtils.ts
+++ b/datahub-web-react/src/app/entity/shared/tabs/Incident/incidentUtils.ts
@@ -100,6 +100,7 @@ export const updateListIncidentsCache = (client, urn, incident, pageSize) => {
                 },
                 // Add the missing 'siblings' field with the appropriate data
                 siblings: currData?.entity?.siblings || null,
+                siblingsSearch: currData?.entity?.siblingsSearch || null,
             },
         },
     });
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/AddPropertyButton.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/AddPropertyButton.tsx
index cac3e268c1df5e..50e6c64c7463b8 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/AddPropertyButton.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/AddPropertyButton.tsx
@@ -1,8 +1,10 @@
 import { LoadingOutlined } from '@ant-design/icons';
 import { colors, Icon, Input as InputComponent, Text } from '@src/alchemy-components';
 import { useUserContext } from '@src/app/context/useUserContext';
+import { REDESIGN_COLORS } from '@src/app/entityV2/shared/constants';
 import { getEntityTypesPropertyFilter, getNotHiddenPropertyFilter } from '@src/app/govern/structuredProperties/utils';
 import { useEntityRegistry } from '@src/app/useEntityRegistry';
+import { useIsThemeV2 } from '@src/app/useIsThemeV2';
 import { PageRoutes } from '@src/conf/Global';
 import { useGetSearchResultsForMultipleQuery } from '@src/graphql/search.generated';
 import { Dropdown } from 'antd';
@@ -14,9 +16,9 @@ import styled from 'styled-components';
 import { useEntityData } from '../../EntityContext';
 import EditStructuredPropertyModal from './Edit/EditStructuredPropertyModal';
 
-const AddButton = styled.div<{ isV1Drawer?: boolean }>`
+const AddButton = styled.div<{ isThemeV2: boolean; isV1Drawer?: boolean }>`
     border-radius: 200px;
-    background-color: #5280e2;
+    background-color: ${(props) => (props.isThemeV2 ? colors.violet[500] : REDESIGN_COLORS.LINK_HOVER_BLUE)};
     width: ${(props) => (props.isV1Drawer ? '24px' : '32px')};
     height: ${(props) => (props.isV1Drawer ? '24px' : '32px')};
     display: flex;
@@ -78,6 +80,7 @@ interface Props {
 const AddPropertyButton = ({ fieldUrn, refetch, fieldProperties, isV1Drawer }: Props) => {
     const [searchQuery, setSearchQuery] = useState('');
     const { entityData, entityType } = useEntityData();
+    const isThemeV2 = useIsThemeV2();
     const me = useUserContext();
     const entityRegistry = useEntityRegistry();
     const [isEditModalVisible, setIsEditModalVisible] = useState(false);
@@ -131,19 +134,20 @@ const AddPropertyButton = ({ fieldUrn, refetch, fieldProperties, isV1Drawer }: P
                 )
                 .map((prop) => {
                     const entity = prop.entity as StructuredPropertyEntity;
+                    const name = entityRegistry.getDisplayName(entity.type, entity);
                     return {
                         label: (
                             <Option key={entity.urn} onClick={() => handleOptionClick(entity)}>
                                 <Text weight="semiBold" color="gray">
-                                    {entity.definition?.displayName}
+                                    {name}
                                 </Text>
                             </Option>
                         ),
                         key: entity.urn,
-                        name: entity.definition?.displayName || entity.urn,
+                        name: name || entity.urn,
                     };
                 }),
-        [data, fieldUrn, fieldPropertiesUrns, entityPropertiesUrns],
+        [data, fieldUrn, fieldPropertiesUrns, entityPropertiesUrns, entityRegistry],
     );
 
     const canEditProperties =
@@ -206,7 +210,7 @@ const AddPropertyButton = ({ fieldUrn, refetch, fieldProperties, isV1Drawer }: P
                 )}
             >
                 <Tooltip title="Add property" placement="left" showArrow={false}>
-                    <AddButton isV1Drawer={isV1Drawer} data-testid="add-structured-prop-button">
+                    <AddButton isThemeV2={isThemeV2} isV1Drawer={isV1Drawer} data-testid="add-structured-prop-button">
                         <Icon icon="Add" size={isV1Drawer ? 'lg' : '2xl'} color="white" />
                     </AddButton>
                 </Tooltip>
diff --git a/datahub-web-react/src/app/entity/shared/types.ts b/datahub-web-react/src/app/entity/shared/types.ts
index ceba5b4bf30eb0..8ef1dbac678ab2 100644
--- a/datahub-web-react/src/app/entity/shared/types.ts
+++ b/datahub-web-react/src/app/entity/shared/types.ts
@@ -40,6 +40,9 @@ import {
     ParentDomainsResult,
     StructuredProperties,
     Forms,
+    ScrollResults,
+    Documentation,
+    DisplayProperties,
 } from '../../../types.generated';
 import { FetchedEntity } from '../../lineage/types';
 
@@ -78,6 +81,7 @@ export type GenericEntityProperties = {
         sourceUrl?: Maybe<string>;
         sourceRef?: Maybe<string>;
         businessAttributeDataType?: Maybe<string>;
+        externalUrl?: Maybe<string>;
     }>;
     globalTags?: Maybe<GlobalTags>;
     glossaryTerms?: Maybe<GlossaryTerms>;
@@ -91,12 +95,13 @@ export type GenericEntityProperties = {
     institutionalMemory?: Maybe<InstitutionalMemory>;
     schemaMetadata?: Maybe<SchemaMetadata>;
     externalUrl?: Maybe<string>;
-    // to indicate something is a Stream, View instead of Dataset... etc
-    entityTypeOverride?: Maybe<string>;
+    entityTypeOverride?: Maybe<string>; // to indicate something is a Stream, View instead of Dataset... etc
     /** Dataset specific- TODO, migrate these out */
     editableSchemaMetadata?: Maybe<EditableSchemaMetadata>;
     editableProperties?: Maybe<DatasetEditableProperties>;
     autoRenderAspects?: Maybe<Array<RawAspect>>;
+    lineageUrn?: string; // If set, render this urn's lineage instead if not in separate siblings mode
+    lineageSiblingIcon?: string; // If set, render this entity in lineage along with the sibling icon and do not separate siblings in the sidebar
     upstream?: Maybe<EntityLineageResult>;
     downstream?: Maybe<EntityLineageResult>;
     subTypes?: Maybe<SubTypes>;
@@ -105,12 +110,13 @@ export type GenericEntityProperties = {
     health?: Maybe<Array<Health>>;
     status?: Maybe<Status>;
     deprecation?: Maybe<Deprecation>;
+    siblings?: Maybe<SiblingProperties>;
+    siblingsSearch?: Maybe<ScrollResults>;
     parentContainers?: Maybe<ParentContainersResult>;
     parentDomains?: Maybe<ParentDomainsResult>;
     children?: Maybe<EntityRelationshipsResult>;
     parentNodes?: Maybe<ParentNodesResult>;
     isAChildren?: Maybe<EntityRelationshipsResult>;
-    siblings?: Maybe<SiblingProperties>;
     siblingPlatforms?: Maybe<DataPlatform[]>;
     lastIngested?: Maybe<number>;
     inputFields?: Maybe<InputFields>;
@@ -119,10 +125,13 @@ export type GenericEntityProperties = {
     embed?: Maybe<Embed>;
     exists?: boolean;
     origin?: Maybe<FabricType>;
+    documentation?: Maybe<Documentation>;
     browsePathV2?: Maybe<BrowsePathV2>;
     inputOutput?: Maybe<DataJobInputOutput>;
     forms?: Maybe<Forms>;
     parent?: Maybe<GenericEntityProperties>;
+    displayProperties?: Maybe<DisplayProperties>;
+    notes?: Maybe<EntityRelationshipsResult>;
 };
 
 export type GenericEntityUpdate = {
@@ -146,6 +155,11 @@ export type UpdateEntityType<U> = (
         | undefined,
 ) => Promise<FetchResult<U, Record<string, any>, Record<string, any>>>;
 
+interface EntityState {
+    shouldRefetchContents: boolean;
+    setShouldRefetchContents: (shouldRefetch: boolean) => void;
+}
+
 export type EntityContextType = {
     urn: string;
     entityType: EntityType;
@@ -156,9 +170,10 @@ export type EntityContextType = {
     updateEntity?: UpdateEntityType<any> | null;
     routeToTab: (params: { tabName: string; tabParams?: Record<string, any>; method?: 'push' | 'replace' }) => void;
     refetch: () => Promise<any>;
-    lineage: FetchedEntity | undefined;
+    lineage?: FetchedEntity | undefined;
     shouldRefetchEmbeddedListSearch?: boolean;
     setShouldRefetchEmbeddedListSearch?: React.Dispatch<React.SetStateAction<boolean>>;
+    entityState?: EntityState;
 };
 
 export type SchemaContextType = {
diff --git a/datahub-web-react/src/app/entity/shared/useEntityState.ts b/datahub-web-react/src/app/entity/shared/useEntityState.ts
new file mode 100644
index 00000000000000..3d891f33dd500f
--- /dev/null
+++ b/datahub-web-react/src/app/entity/shared/useEntityState.ts
@@ -0,0 +1,7 @@
+import { useState } from 'react';
+
+export default function useEntityState() {
+    const [shouldRefetchContents, setShouldRefetchContents] = useState(false);
+
+    return { shouldRefetchContents, setShouldRefetchContents };
+}
diff --git a/datahub-web-react/src/app/entity/shared/utils.ts b/datahub-web-react/src/app/entity/shared/utils.ts
index 217aaaaf9dde85..db0d7bc4b65660 100644
--- a/datahub-web-react/src/app/entity/shared/utils.ts
+++ b/datahub-web-react/src/app/entity/shared/utils.ts
@@ -114,9 +114,9 @@ export function getFineGrainedLineageWithSiblings(
     const fineGrainedLineages = [
         ...(entityData?.fineGrainedLineages || entityData?.inputOutput?.fineGrainedLineages || []),
     ];
-    entityData?.siblings?.siblings?.forEach((sibling) => {
-        if (sibling) {
-            const genericSiblingProps = getGenericEntityProperties(sibling.type, sibling);
+    entityData?.siblingsSearch?.searchResults?.forEach((sibling) => {
+        if (sibling.entity) {
+            const genericSiblingProps = getGenericEntityProperties(sibling.entity.type, sibling.entity);
             if (genericSiblingProps && genericSiblingProps.fineGrainedLineages) {
                 fineGrainedLineages.push(...genericSiblingProps.fineGrainedLineages);
             }
diff --git a/datahub-web-react/src/app/entityV2/Access/RoleEntity.tsx b/datahub-web-react/src/app/entityV2/Access/RoleEntity.tsx
new file mode 100644
index 00000000000000..6ec79ebfe4b96f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/Access/RoleEntity.tsx
@@ -0,0 +1,99 @@
+import { TagOutlined, TagFilled } from '@ant-design/icons';
+import * as React from 'react';
+import styled from 'styled-components';
+import { Role, EntityType, SearchResult } from '../../../types.generated';
+import DefaultPreviewCard from '../../previewV2/DefaultPreviewCard';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import { urlEncodeUrn } from '../shared/utils';
+import RoleEntityProfile from './RoleEntityProfile';
+import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+
+const PreviewTagIcon = styled(TagOutlined)`
+    font-size: 20px;
+`;
+// /**
+//  * Definition of the DataHub Access Role entity.
+//  */
+export class RoleEntity implements Entity<Role> {
+    type: EntityType = EntityType.Role;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <TagFilled className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return <TagFilled className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color: color || '#B37FEB' }} />;
+        }
+
+        return (
+            <TagOutlined
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => false;
+
+    isLineageEnabled = () => false;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getPathName: () => string = () => 'role';
+
+    getCollectionName: () => string = () => 'Roles';
+
+    getEntityName: () => string = () => 'Role';
+
+    renderProfile: (urn: string) => JSX.Element = (_) => <RoleEntityProfile />;
+
+    renderPreview = (previewType: PreviewType, data: Role) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <DefaultPreviewCard
+                data={genericProperties}
+                description={data?.properties?.description || ''}
+                name={this.displayName(data)}
+                urn={data.urn}
+                url={`/${this.getPathName()}/${urlEncodeUrn(data.urn)}`}
+                logoComponent={<PreviewTagIcon />}
+                entityType={EntityType.Role}
+                typeIcon={this.icon(14, IconStyleType.ACCENT)}
+                previewType={previewType}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        return this.renderPreview(PreviewType.SEARCH, result.entity as Role);
+    };
+
+    displayName = (data: Role) => {
+        return data.properties?.name || data.urn;
+    };
+
+    getOverridePropertiesFromEntity = (data: Role) => {
+        return {
+            name: data.properties?.name,
+        };
+    };
+
+    getGenericEntityProperties = (role: Role) => {
+        return getDataForEntityType({ data: role, entityType: this.type, getOverrideProperties: (data) => data });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([EntityCapabilityType.OWNERS]);
+    };
+
+    getGraphName = () => {
+        return 'roleEntity';
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/Access/RoleEntityProfile.tsx b/datahub-web-react/src/app/entityV2/Access/RoleEntityProfile.tsx
new file mode 100644
index 00000000000000..d8a31700fb918e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/Access/RoleEntityProfile.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+
+import { useParams } from 'react-router';
+import { Divider, Typography } from 'antd';
+import { grey } from '@ant-design/colors';
+import styled from 'styled-components';
+
+import { Message } from '../../shared/Message';
+import { decodeUrn } from '../shared/utils';
+import { useGetExternalRoleQuery } from '../../../graphql/accessrole.generated';
+
+const PageContainer = styled.div`
+    padding: 32px 100px;
+`;
+
+const LoadingMessage = styled(Message)`
+    margin-top: 10%;
+`;
+
+type RolePageParams = {
+    urn: string;
+};
+
+const TitleLabel = styled(Typography.Text)`
+    &&& {
+        color: ${grey[2]};
+        font-size: 12px;
+        display: block;
+        line-height: 20px;
+        font-weight: 700;
+    }
+`;
+
+const DescriptionLabel = styled(Typography.Text)`
+    &&& {
+        text-align: left;
+        font-weight: bold;
+        font-size: 14px;
+        line-height: 28px;
+        color: rgb(38, 38, 38);
+    }
+`;
+
+const TitleText = styled(Typography.Text)`
+    &&& {
+        color: ${grey[10]};
+        font-weight: 700;
+        font-size: 20px;
+        line-height: 28px;
+        display: inline-block;
+        margin: 0px 7px;
+    }
+`;
+
+const { Paragraph } = Typography;
+
+export default function RoleEntityProfile() {
+    const { urn: encodedUrn } = useParams<RolePageParams>();
+    const urn = decodeUrn(encodedUrn);
+    const { data, loading } = useGetExternalRoleQuery({ variables: { urn } });
+
+    return (
+        <PageContainer>
+            {loading && <LoadingMessage type="loading" content="Loading..." />}
+            <TitleLabel>Role</TitleLabel>
+            <TitleText>{data?.role?.properties?.name}</TitleText>
+            <Divider />
+            {/* Role Description */}
+            <DescriptionLabel>About</DescriptionLabel>
+            <Paragraph style={{ fontSize: '12px', lineHeight: '15px', padding: '5px 0px' }}>
+                {data?.role?.properties?.description}
+            </Paragraph>
+        </PageContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/DefaultEntity.tsx b/datahub-web-react/src/app/entityV2/DefaultEntity.tsx
new file mode 100644
index 00000000000000..01c496348beccf
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/DefaultEntity.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import { EntityType, SearchResult } from '../../types.generated';
+import { Entity, EntityMenuActions, IconStyleType, PreviewType } from './Entity';
+
+class DefaultEntity implements Entity<null> {
+    type: EntityType = EntityType.Other;
+
+    icon = (_fontSize?: number | undefined, _styleType?: IconStyleType | undefined, _color?: string | undefined) => (
+        <></>
+    );
+
+    isSearchEnabled = () => false;
+
+    isBrowseEnabled = () => false;
+
+    isLineageEnabled = () => false;
+
+    getPathName = () => '';
+
+    getCollectionName = () => '';
+
+    renderProfile = (_urn: string) => <></>;
+
+    renderPreview = (_type: PreviewType, _data: null, _actions?: EntityMenuActions | undefined) => <></>;
+
+    renderSearch = (_result: SearchResult) => <></>;
+
+    displayName = (_data: null) => '';
+
+    getGenericEntityProperties = (_data: null) => null;
+
+    supportedCapabilities = () => new Set([]);
+
+    getGraphName = () => '';
+}
+
+export default new DefaultEntity();
diff --git a/datahub-web-react/src/app/entityV2/Entity.tsx b/datahub-web-react/src/app/entityV2/Entity.tsx
new file mode 100644
index 00000000000000..7df9deabf64033
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/Entity.tsx
@@ -0,0 +1,240 @@
+import { QueryHookOptions, QueryResult } from '@apollo/client';
+import { EntityType, Exact, FeatureFlagsConfig, SearchResult } from '../../types.generated';
+import { GenericEntityProperties } from '../entity/shared/types';
+import { FetchedEntity } from '../lineage/types';
+import { EntitySidebarSection, EntitySidebarTab } from './shared/types';
+
+export enum PreviewType {
+    /**
+     * A preview shown within the search experience
+     */
+    SEARCH,
+    /**
+     * A preview shown within the browse experience
+     */
+    BROWSE,
+    /**
+     * A generic preview shown within other entity pages, etc.
+     */
+    PREVIEW,
+    /**
+     * A tiny search preview for text-box search.
+     */
+    MINI_SEARCH,
+    /**
+     * Previews rendered when hovering over the entity in a compact list
+     */
+    HOVER_CARD,
+}
+
+export enum IconStyleType {
+    /**
+     * Colored Icon
+     */
+    HIGHLIGHT,
+    /**
+     * Grayed out icon
+     */
+    ACCENT,
+    /**
+     * Rendered in a Tab pane header
+     */
+    TAB_VIEW,
+    /**
+     * Rendered in Lineage as default
+     */
+    SVG,
+}
+
+/**
+ * A standard set of Entity Capabilities that span across entity types.
+ */
+export enum EntityCapabilityType {
+    /**
+     * Ownership of an entity
+     */
+    OWNERS,
+    /**
+     * Adding a glossary term to the entity
+     */
+    GLOSSARY_TERMS,
+    /**
+     * Adding a tag to an entity
+     */
+    TAGS,
+    /**
+     * Assigning the entity to a domain
+     */
+    DOMAINS,
+    /**
+     * Deprecating an entity
+     */
+    DEPRECATION,
+    /**
+     * Soft deleting an entity
+     */
+    SOFT_DELETE,
+    /**
+     * Run tests against an entity
+     */
+    TEST,
+    /**
+     * Add roles to the entity
+     */
+    ROLES,
+    /**
+     * Assigning the entity to a data product
+     */
+    DATA_PRODUCTS,
+    /**
+     * Health status of an entity
+     */
+    HEALTH,
+    /**
+     * Lineage information of an entity
+     */
+    LINEAGE,
+}
+
+export interface EntityMenuActions {
+    onDelete?: () => void;
+    onEdit?: () => void;
+}
+
+/**
+ * Base interface used for authoring DataHub Entities on the client side.
+ *
+ * <T> the generated GraphQL data type associated with the entity.
+ */
+export interface Entity<T> {
+    /**
+     * Corresponding GQL EntityType.
+     */
+    type: EntityType;
+
+    /**
+     * Ant-design icon associated with the Entity. For a list of all candidate icons, see
+     * https://ant.design/components/icon/
+     */
+    icon: (fontSize?: number, styleType?: IconStyleType, color?: string) => JSX.Element;
+
+    /**
+     * Returns whether the entity search is enabled
+     */
+    isSearchEnabled: () => boolean;
+
+    /**
+     * Returns whether the entity browse is enabled
+     */
+    isBrowseEnabled: () => boolean;
+
+    /**
+     * Returns whether the entity browse is enabled
+     */
+    isLineageEnabled: () => boolean;
+
+    /**
+     * Returns the name of the entity as it appears in a URL, e.g. '/dataset/:urn'.
+     */
+    getPathName: () => string;
+
+    /**
+     * Returns the plural name of the entity used when displaying collections (search, browse results), e.g. 'Datasets'.
+     */
+    getCollectionName: () => string;
+
+    /**
+     * Returns the singular name of the entity used when referring to an individual
+     */
+    getEntityName?: () => string;
+
+    /**
+     * Renders the 'profile' of the entity on an entity details page.
+     *
+     * TODO: Explore using getGenericEntityProperties for rendering profiles.
+     */
+    renderProfile: (urn: string) => JSX.Element;
+
+    /**
+     * Renders a preview of the entity across different use cases like search, browse, etc.
+     *
+     * TODO: Explore using getGenericEntityProperties for rendering previews.
+     */
+    renderPreview: (type: PreviewType, data: T, actions?: EntityMenuActions) => JSX.Element;
+
+    /**
+     * Renders a search result
+     *
+     * TODO: Explore using getGenericEntityProperties for rendering profiles.
+     */
+    renderSearch: (result: SearchResult) => JSX.Element;
+
+    /**
+     * Renders search
+     */
+    renderSearchMatches?: (result: SearchResult) => JSX.Element;
+
+    /**
+     * Constructs config to add entity to lineage viz
+     */
+    getLineageVizConfig?: (entity: T) => FetchedEntity;
+
+    /**
+     * Returns a display name for the entity
+     *
+     * TODO: Migrate to using getGenericEntityProperties for display name retrieval.
+     */
+    displayName: (data: T) => string;
+
+    /**
+     * Returns generic entity properties for the entity
+     */
+    getGenericEntityProperties: (data: T, flags?: FeatureFlagsConfig) => GenericEntityProperties | null;
+
+    /**
+     * Returns the supported features for the entity
+     */
+    supportedCapabilities: () => Set<EntityCapabilityType>;
+
+    /**
+     * Returns the graph name of the entity, as it appears in the GMS entity registry
+     */
+    getGraphName: () => string;
+
+    /**
+     * Returns the profile component to be displayed in our Chrome extension
+     */
+    renderEmbeddedProfile?: (urn: string) => JSX.Element;
+
+    /**
+     * Returns the entity profile sidebar sections for an entity type. Only implemented on Datasets for now.
+     */
+    getSidebarSections?: () => EntitySidebarSection[];
+
+    /**
+     * Returns the entity profile sidebar tabs for an entity type.
+     */
+    getSidebarTabs?: () => EntitySidebarTab[];
+
+    /**
+     * Get the query necessary for refetching data on an entity profile page
+     */
+    useEntityQuery?: (
+        baseOptions: QueryHookOptions<
+            any,
+            Exact<{
+                urn: string;
+            }>
+        >,
+    ) => QueryResult<
+        any,
+        Exact<{
+            urn: string;
+        }>
+    >;
+
+    /**
+     * Returns the url to be navigated to when clicked on Cards
+     */
+    getCustomCardUrlPath?: () => string | undefined;
+}
diff --git a/datahub-web-react/src/app/entityV2/EntityPage.tsx b/datahub-web-react/src/app/entityV2/EntityPage.tsx
new file mode 100644
index 00000000000000..84c74b8304a150
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/EntityPage.tsx
@@ -0,0 +1,124 @@
+import React, { useEffect, useState } from 'react';
+import { useParams } from 'react-router-dom';
+import { EntityType } from '../../types.generated';
+import { BrowsableEntityPage } from '../browse/BrowsableEntityPage';
+import LineageExplorer from '../lineage/LineageExplorer';
+import useIsLineageMode from '../lineage/utils/useIsLineageMode';
+import { useLineageV2 } from '../lineageV2/useLineageV2';
+import useSidebarWidth from '../sharedV2/sidebar/useSidebarWidth';
+import { useEntityRegistry } from '../useEntityRegistry';
+import analytics, { EventType } from '../analytics';
+import { decodeUrn } from './shared/utils';
+import { useGetGrantedPrivilegesQuery } from '../../graphql/policy.generated';
+import { UnauthorizedPage } from '../authorization/UnauthorizedPage';
+import { ErrorSection } from '../shared/error/ErrorSection';
+import { VIEW_ENTITY_PAGE } from './shared/constants';
+import { useUserContext } from '../context/useUserContext';
+import EntitySidebarContext from '../sharedV2/EntitySidebarContext';
+import TabFullSizedContext from '../shared/TabFullsizedContext';
+
+interface RouteParams {
+    urn: string;
+}
+
+interface Props {
+    entityType: EntityType;
+}
+
+const ALLOWED_ENTITY_TYPES = [
+    EntityType.Dataset,
+    EntityType.Dashboard,
+    EntityType.Chart,
+    EntityType.DataFlow,
+    EntityType.DataJob,
+    EntityType.Mlmodel,
+    EntityType.Mlfeature,
+    EntityType.MlprimaryKey,
+    EntityType.MlfeatureTable,
+    EntityType.MlmodelGroup,
+    EntityType.GlossaryTerm,
+    EntityType.GlossaryNode,
+    EntityType.SchemaField,
+];
+
+/**
+ * Responsible for rendering an Entity Profile
+ */
+export const EntityPage = ({ entityType }: Props) => {
+    const { urn: encodedUrn } = useParams<RouteParams>();
+    const urn = decodeUrn(encodedUrn);
+    const entityRegistry = useEntityRegistry();
+    const entity = entityRegistry.getEntity(entityType);
+    const isBrowsable = entity.isBrowseEnabled();
+    const isLineageSupported = entity.isLineageEnabled();
+    const isLineageMode = useIsLineageMode();
+    const authenticatedUserUrn = useUserContext()?.user?.urn;
+    const { error, data } = useGetGrantedPrivilegesQuery({
+        variables: {
+            input: {
+                actorUrn: authenticatedUserUrn as string,
+                resourceSpec: {
+                    resourceType: entityType,
+                    resourceUrn: urn,
+                },
+            },
+        },
+        skip: !authenticatedUserUrn,
+        fetchPolicy: 'cache-first',
+    });
+    const privileges = data?.getGrantedPrivileges?.privileges || [];
+
+    useEffect(() => {
+        analytics.event({
+            type: EventType.EntityViewEvent,
+            entityType,
+            entityUrn: urn,
+        });
+    }, [entityType, urn]);
+
+    const canViewEntityPage = privileges.find((privilege) => privilege === VIEW_ENTITY_PAGE);
+    const showNewPage = ALLOWED_ENTITY_TYPES.includes(entityType);
+
+    const isLineageV2 = useLineageV2();
+    const showLineage = isLineageMode && isLineageSupported;
+    const [isSidebarClosed, setIsSidebarClosed] = useState(false);
+    const [isTabFullsize, setTabFullsize] = useState(false);
+    const sidebarWidth = useSidebarWidth();
+
+    return (
+        <>
+            {error && <ErrorSection />}
+            {data && !canViewEntityPage && <UnauthorizedPage />}
+            {canViewEntityPage && (
+                <EntitySidebarContext.Provider
+                    value={{
+                        width: sidebarWidth,
+                        isClosed: isSidebarClosed,
+                        setSidebarClosed: setIsSidebarClosed,
+                    }}
+                >
+                    <TabFullSizedContext.Provider
+                        value={{
+                            isTabFullsize,
+                            // TODO: Clean up logic after removing lineageGraphV2 flag
+                            setTabFullsize: isLineageV2 && showLineage ? undefined : setTabFullsize,
+                        }}
+                    >
+                        {showNewPage && entityRegistry.renderProfile(entityType, urn)}
+                        {!showNewPage && (
+                            <BrowsableEntityPage
+                                isBrowsable={isBrowsable}
+                                urn={urn}
+                                type={entityType}
+                                lineageSupported={isLineageSupported}
+                            >
+                                {showLineage && !isLineageV2 && <LineageExplorer type={entityType} urn={urn} />}
+                                {(!showLineage || isLineageV2) && entityRegistry.renderProfile(entityType, urn)}
+                            </BrowsableEntityPage>
+                        )}
+                    </TabFullSizedContext.Provider>
+                </EntitySidebarContext.Provider>
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/EntityRegistry.tsx b/datahub-web-react/src/app/entityV2/EntityRegistry.tsx
new file mode 100644
index 00000000000000..94b54bf45ec201
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/EntityRegistry.tsx
@@ -0,0 +1,369 @@
+import { QueryHookOptions, QueryResult } from '@apollo/client';
+import { downgradeV2FieldPath } from '@app/lineageV2/lineageUtils';
+import React from 'react';
+import { EntityLineageV2Fragment, LineageSchemaFieldFragment } from '@graphql/lineage.generated';
+import { Entity as EntityInterface, EntityType, Exact, FeatureFlagsConfig, SearchResult } from '../../types.generated';
+import { GenericEntityProperties } from '../entity/shared/types';
+import { FetchedEntity } from '../lineage/types';
+import { FetchedEntityV2, FetchedEntityV2Relationship, LineageAsset, LineageAssetType } from '../lineageV2/types';
+import { SearchResultProvider } from '../search/context/SearchResultContext';
+import DefaultEntity from './DefaultEntity';
+import { Entity, EntityCapabilityType, EntityMenuActions, IconStyleType, PreviewType } from './Entity';
+import PreviewContext from './shared/PreviewContext';
+import { GLOSSARY_ENTITY_TYPES } from './shared/constants';
+import { EntitySidebarSection, EntitySidebarTab } from './shared/types';
+import { dictToQueryStringParams, getFineGrainedLineageWithSiblings, urlEncodeUrn } from './shared/utils';
+
+function validatedGet<K, V>(key: K, map: Map<K, V>, def: V): V {
+    if (map.has(key)) {
+        return map.get(key) as V;
+    }
+    return def;
+}
+
+/**
+ * Serves as a singleton registry for all DataHub entities to appear on the frontend.
+ */
+export default class EntityRegistry {
+    entities: Array<Entity<any>> = new Array<Entity<any>>();
+
+    entityTypeToEntity: Map<EntityType, Entity<any>> = new Map<EntityType, Entity<any>>();
+
+    collectionNameToEntityType: Map<string, EntityType> = new Map<string, EntityType>();
+
+    pathNameToEntityType: Map<string, EntityType> = new Map<string, EntityType>();
+
+    graphNameToEntityType: Map<string, EntityType> = new Map<string, EntityType>();
+
+    register(entity: Entity<any>) {
+        this.entities.push(entity);
+        this.entityTypeToEntity.set(entity.type, entity);
+        this.collectionNameToEntityType.set(entity.getCollectionName(), entity.type);
+        this.pathNameToEntityType.set(entity.getPathName(), entity.type);
+        this.graphNameToEntityType.set(entity.getGraphName(), entity.type);
+    }
+
+    getEntity(type: EntityType): Entity<any> {
+        return validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+    }
+
+    hasEntity(type: EntityType): boolean {
+        return this.entityTypeToEntity.has(type);
+    }
+
+    getEntities(): Array<Entity<any>> {
+        return this.entities;
+    }
+
+    getEntitiesForSearchRoutes(): Array<Entity<any>> {
+        return this.entities.filter(
+            (entity) => !GLOSSARY_ENTITY_TYPES.includes(entity.type) && entity.type !== EntityType.Domain,
+        );
+    }
+
+    getNonGlossaryEntities(): Array<Entity<any>> {
+        return this.entities.filter((entity) => !GLOSSARY_ENTITY_TYPES.includes(entity.type));
+    }
+
+    getGlossaryEntities(): Array<Entity<any>> {
+        return this.entities.filter((entity) => GLOSSARY_ENTITY_TYPES.includes(entity.type));
+    }
+
+    getSearchEntityTypes(): Array<EntityType> {
+        return this.entities.filter((entity) => entity.isSearchEnabled()).map((entity) => entity.type);
+    }
+
+    getDefaultSearchEntityType(): EntityType {
+        return this.entities[0].type;
+    }
+
+    getBrowseEntityTypes(): Array<EntityType> {
+        return this.entities.filter((entity) => entity.isBrowseEnabled()).map((entity) => entity.type);
+    }
+
+    getLineageEntityTypes(): Array<EntityType> {
+        return this.entities.filter((entity) => entity.isLineageEnabled()).map((entity) => entity.type);
+    }
+
+    getIcon(type: EntityType, fontSize?: number, styleType?: IconStyleType, color?: string): JSX.Element {
+        const entity = validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+        return entity.icon(fontSize, styleType || IconStyleType.TAB_VIEW, color);
+    }
+
+    getCollectionName(type: EntityType): string {
+        const entity = validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+        return entity.getCollectionName();
+    }
+
+    getEntityName(type: EntityType): string | undefined {
+        const entity = validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+        return entity.getEntityName?.();
+    }
+
+    getTypeFromCollectionName(name: string): EntityType {
+        return validatedGet(name, this.collectionNameToEntityType, DefaultEntity.type);
+    }
+
+    getPathName(type: EntityType): string {
+        const entity = validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+        return entity.getPathName();
+    }
+
+    getEntityUrl(type: EntityType, urn: string, params?: Record<string, string | boolean>): string {
+        return `/${this.getPathName(type)}/${urlEncodeUrn(urn)}${params ? `?${dictToQueryStringParams(params)}` : ''}`;
+    }
+
+    getTypeFromPathName(pathName: string): EntityType {
+        return validatedGet(pathName, this.pathNameToEntityType, DefaultEntity.type);
+    }
+
+    getTypeOrDefaultFromPathName(pathName: string, def?: EntityType): EntityType | undefined {
+        return validatedGet(pathName, this.pathNameToEntityType, def);
+    }
+
+    renderProfile(type: EntityType, urn: string): JSX.Element {
+        const entity = validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+        return entity.renderProfile(urn);
+    }
+
+    renderPreview<T>(entityType: EntityType, type: PreviewType, data: T, actions?: EntityMenuActions): JSX.Element {
+        const entity = validatedGet(entityType, this.entityTypeToEntity, DefaultEntity);
+        const genericEntityData = entity.getGenericEntityProperties(data);
+        return (
+            <PreviewContext.Provider value={genericEntityData}>
+                {entity.renderPreview(type, data, actions)}
+            </PreviewContext.Provider>
+        );
+    }
+
+    renderSearchResult(type: EntityType, searchResult: SearchResult): JSX.Element {
+        const entity = validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+        const genericEntityData = entity.getGenericEntityProperties(searchResult.entity);
+        return (
+            <SearchResultProvider searchResult={searchResult}>
+                <PreviewContext.Provider value={genericEntityData}>
+                    {entity.renderSearch(searchResult)}
+                </PreviewContext.Provider>
+            </SearchResultProvider>
+        );
+    }
+
+    renderSearchMatches(type: EntityType, searchResult: SearchResult): JSX.Element {
+        const entity = validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+        return (
+            <SearchResultProvider searchResult={searchResult}>
+                {entity?.renderSearchMatches?.(searchResult) || <></>}
+            </SearchResultProvider>
+        );
+    }
+
+    renderBrowse<T>(type: EntityType, data: T): JSX.Element {
+        const entity = validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+        return entity.renderPreview(PreviewType.BROWSE, data);
+    }
+
+    // render the regular profile if embedded profile doesn't exist. Compact context should be set to true.
+    renderEmbeddedProfile(type: EntityType, urn: string): JSX.Element {
+        const entity = validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+        return entity.renderEmbeddedProfile ? entity.renderEmbeddedProfile(urn) : entity.renderProfile(urn);
+    }
+
+    getLineageVizConfig<T>(type: EntityType, data: T): FetchedEntity {
+        const entity = validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+        const genericEntityProperties = this.getGenericEntityProperties(type, data);
+        // combine fineGrainedLineages from this node as well as its siblings
+        const fineGrainedLineages = getFineGrainedLineageWithSiblings(
+            genericEntityProperties,
+            (t: EntityType, d: EntityInterface) => this.getGenericEntityProperties(t, d),
+        );
+        return {
+            ...entity.getLineageVizConfig?.(data),
+            downstreamChildren: genericEntityProperties?.downstream?.relationships
+                ?.filter((relationship) => relationship.entity)
+                ?.map((relationship) => ({
+                    entity: relationship.entity as EntityInterface,
+                    type: (relationship.entity as EntityInterface).type,
+                })),
+            downstreamRelationships: genericEntityProperties?.downstream?.relationships?.filter(
+                (relationship) => relationship.entity,
+            ),
+            numDownstreamChildren:
+                (genericEntityProperties?.downstream?.total || 0) -
+                (genericEntityProperties?.downstream?.filtered || 0),
+            upstreamChildren: genericEntityProperties?.upstream?.relationships
+                ?.filter((relationship) => relationship.entity)
+                ?.map((relationship) => ({
+                    entity: relationship.entity as EntityInterface,
+                    type: (relationship.entity as EntityInterface).type,
+                })),
+            upstreamRelationships: genericEntityProperties?.upstream?.relationships?.filter(
+                (relationship) => relationship.entity,
+            ),
+            numUpstreamChildren:
+                (genericEntityProperties?.upstream?.total || 0) - (genericEntityProperties?.upstream?.filtered || 0),
+            status: genericEntityProperties?.status,
+            siblingPlatforms: genericEntityProperties?.siblingPlatforms,
+            fineGrainedLineages,
+            siblings: genericEntityProperties?.siblings,
+            schemaMetadata: genericEntityProperties?.schemaMetadata,
+            inputFields: genericEntityProperties?.inputFields,
+            canEditLineage: genericEntityProperties?.privileges?.canEditLineage,
+        } as FetchedEntity;
+    }
+
+    getLineageVizConfigV2<T>(type: EntityType, data: T, flags?: FeatureFlagsConfig): FetchedEntityV2 | null {
+        const entity = validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+        const genericEntityProperties = this.getGenericEntityProperties(type, data, flags);
+        if (!genericEntityProperties || !entity.getLineageVizConfig) return null;
+
+        const reversedBrowsePath = genericEntityProperties.browsePathV2?.path?.slice();
+        reversedBrowsePath?.reverse();
+        const containers = genericEntityProperties?.parentContainers?.containers?.length
+            ? genericEntityProperties?.parentContainers?.containers
+                  ?.map((p) => this.getGenericEntityProperties(p.type, p))
+                  .filter((p): p is GenericEntityProperties => !!p)
+            : reversedBrowsePath
+                  ?.map((p) => (p.entity ? this.getGenericEntityProperties(p.entity.type, p.entity) : { name: p.name }))
+                  .filter((p): p is GenericEntityProperties => !!p);
+
+        return {
+            ...entity.getLineageVizConfig(data),
+            containers,
+            fineGrainedLineages:
+                genericEntityProperties?.fineGrainedLineages ||
+                genericEntityProperties?.inputOutput?.fineGrainedLineages ||
+                [],
+            numDownstreamChildren:
+                (genericEntityProperties.downstream?.total || 0) - (genericEntityProperties.downstream?.filtered || 0),
+            numUpstreamChildren:
+                (genericEntityProperties.upstream?.total || 0) - (genericEntityProperties.upstream?.filtered || 0),
+            downstreamRelationships: genericEntityProperties.downstream?.relationships
+                ?.map((r) => ({ ...r, urn: r.entity?.urn }))
+                .filter((r): r is FetchedEntityV2Relationship => !!r.urn),
+            upstreamRelationships: genericEntityProperties.upstream?.relationships
+                ?.map((r) => ({ ...r, urn: r.entity?.urn }))
+                .filter((r): r is FetchedEntityV2Relationship => !!r.urn),
+            exists: genericEntityProperties.exists,
+            health: genericEntityProperties.health ?? undefined,
+            status: genericEntityProperties.status ?? undefined,
+            schemaMetadata: genericEntityProperties.schemaMetadata ?? undefined,
+            inputFields: genericEntityProperties.inputFields ?? undefined,
+            canEditLineage: genericEntityProperties.privileges?.canEditLineage ?? undefined,
+            lineageSiblingIcon: genericEntityProperties?.lineageSiblingIcon,
+            structuredProperties: genericEntityProperties.structuredProperties ?? undefined,
+        };
+    }
+
+    getLineageAssets(type: EntityType, data: EntityLineageV2Fragment): Map<string, LineageAsset> | undefined {
+        // TODO: Fold into entity registry?
+        if (data?.__typename === 'Domain') {
+            return data?.dataProducts?.searchResults.reduce((obj, r) => {
+                if (r.entity.__typename === 'DataProduct') {
+                    const name = this.getDisplayName(r.entity.type, r.entity);
+                    obj.set(name, { name, type: LineageAssetType.DataProduct, size: r.entity.entities?.total });
+                }
+                return obj;
+            }, new Map<string, LineageAsset>());
+        }
+        const fields = getSchemaFields(data, this.getGenericEntityProperties(type, data));
+        if (fields) {
+            return new Map(
+                fields.map((field) => {
+                    const name = downgradeV2FieldPath(field.fieldPath);
+                    const value: LineageAsset = {
+                        name,
+                        type: LineageAssetType.Column,
+                        dataType: field.type,
+                        nativeDataType: field.nativeDataType,
+                    };
+                    return [name, value];
+                }),
+            );
+        }
+        return undefined;
+    }
+
+    getDisplayName<T>(type: EntityType, data: T): string {
+        const entity = validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+        return entity.displayName(data);
+    }
+
+    getSidebarTabs(type: EntityType): EntitySidebarTab[] {
+        const entity = validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+        return entity.getSidebarTabs ? entity.getSidebarTabs() : [];
+    }
+
+    getSidebarSections(type: EntityType): EntitySidebarSection[] {
+        const entity = validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+        return entity.getSidebarSections ? entity.getSidebarSections() : [];
+    }
+
+    getGenericEntityProperties<T>(
+        type: EntityType,
+        data: T,
+        flags?: FeatureFlagsConfig,
+    ): GenericEntityProperties | null {
+        const entity = validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+        return entity.getGenericEntityProperties(data, flags);
+    }
+
+    getSupportedEntityCapabilities(type: EntityType): Set<EntityCapabilityType> {
+        const entity = validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+        return entity.supportedCapabilities();
+    }
+
+    getTypesWithSupportedCapabilities(capability: EntityCapabilityType): Set<EntityType> {
+        return new Set(
+            this.getEntities()
+                .filter((entity) => entity.supportedCapabilities().has(capability))
+                .map((entity) => entity.type),
+        );
+    }
+
+    getCustomCardUrlPath(type: EntityType): string | undefined {
+        const entity = validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+        return entity.getCustomCardUrlPath?.() as string | undefined;
+    }
+
+    getTypeFromGraphName(name: string): EntityType | undefined {
+        return this.graphNameToEntityType.get(name);
+    }
+
+    getGraphNameFromType(type: EntityType): string {
+        return validatedGet(type, this.entityTypeToEntity, DefaultEntity).getGraphName();
+    }
+
+    getEntityQuery(type: EntityType):
+        | ((
+              baseOptions: QueryHookOptions<
+                  any,
+                  Exact<{
+                      urn: string;
+                  }>
+              >,
+          ) => QueryResult<
+              any,
+              Exact<{
+                  urn: string;
+              }>
+          >)
+        | undefined {
+        const entity = validatedGet(type, this.entityTypeToEntity, DefaultEntity);
+        return entity.useEntityQuery;
+    }
+}
+
+function getSchemaFields(
+    data: EntityLineageV2Fragment,
+    genericEntityProperties: GenericEntityProperties | null,
+): LineageSchemaFieldFragment[] | undefined {
+    if (data?.__typename === 'Dataset') {
+        return data?.schemaMetadata?.fields;
+    }
+    if (data?.__typename === 'Chart') {
+        return data?.inputFields?.fields
+            ?.map((field) => field?.schemaField)
+            .filter((field): field is LineageSchemaFieldFragment => !!field);
+    }
+    return genericEntityProperties?.schemaMetadata?.fields;
+}
diff --git a/datahub-web-react/src/app/entityV2/businessAttribute/BusinessAttributeEntity.tsx b/datahub-web-react/src/app/entityV2/businessAttribute/BusinessAttributeEntity.tsx
new file mode 100644
index 00000000000000..218402c753448a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/businessAttribute/BusinessAttributeEntity.tsx
@@ -0,0 +1,157 @@
+import * as React from 'react';
+import { GlobalOutlined } from '@ant-design/icons';
+import { BusinessAttribute, EntityType, SearchResult } from '../../../types.generated';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { useGetBusinessAttributeQuery } from '../../../graphql/businessAttribute.generated';
+import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions';
+import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
+import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
+import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection';
+import { Preview } from './preview/Preview';
+import { PageRoutes } from '../../../conf/Global';
+import BusinessAttributeRelatedEntity from './profile/BusinessAttributeRelatedEntity';
+import { BusinessAttributeDataTypeSection } from './profile/BusinessAttributeDataTypeSection';
+
+/**
+ *  Definition of datahub Business Attribute Entity
+ */
+/* eslint-disable @typescript-eslint/no-unused-vars */
+export class BusinessAttributeEntity implements Entity<BusinessAttribute> {
+    type: EntityType = EntityType.BusinessAttribute;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <GlobalOutlined style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return <GlobalOutlined style={{ fontSize, color: color || '#B37FEB' }} />;
+        }
+
+        if (styleType === IconStyleType.SVG) {
+            // TODO: Update the returned path value to the correct svg icon path
+            return (
+                <path d="M832 64H192c-17.7 0-32 14.3-32 32v832c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V96c0-17.7-14.3-32-32-32zm-600 72h560v208H232V136zm560 480H232V408h560v208zm0 272H232V680h560v208zM304 240a40 40 0 1080 0 40 40 0 10-80 0zm0 272a40 40 0 1080 0 40 40 0 10-80 0zm0 272a40 40 0 1080 0 40 40 0 10-80 0z" />
+            );
+        }
+
+        return (
+            <GlobalOutlined
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    displayName = (data: BusinessAttribute) => {
+        return data?.properties?.name || data?.urn;
+    };
+
+    getPathName = () => 'business-attribute';
+
+    getEntityName = () => 'Business Attribute';
+
+    getCollectionName = () => 'Business Attributes';
+
+    getGraphName = () => 'businessAttribute';
+
+    getCustomCardUrlPath = () => PageRoutes.BUSINESS_ATTRIBUTE;
+
+    isBrowseEnabled = () => false;
+
+    isLineageEnabled = () => false;
+
+    isSearchEnabled = () => true;
+
+    getOverridePropertiesFromEntity = (data: BusinessAttribute) => {
+        return {
+            name: data.properties?.name,
+        };
+    };
+
+    getGenericEntityProperties = (data: BusinessAttribute) => {
+        return getDataForEntityType({
+            data,
+            entityType: this.type,
+            getOverrideProperties: this.getOverridePropertiesFromEntity,
+        });
+    };
+
+    renderPreview = (previewType: PreviewType, data: BusinessAttribute) => {
+        return (
+            <Preview
+                previewType={previewType}
+                urn={data.urn}
+                name={this.displayName(data)}
+                description={data.properties?.description || ''}
+                owners={data.ownership?.owners}
+            />
+        );
+    };
+
+    renderProfile = (urn: string) => {
+        return (
+            <EntityProfile
+                urn={urn}
+                entityType={EntityType.BusinessAttribute}
+                useEntityQuery={useGetBusinessAttributeQuery as any}
+                headerDropdownItems={new Set([EntityMenuItems.DELETE])}
+                isNameEditable
+                tabs={[
+                    {
+                        name: 'Documentation',
+                        component: DocumentationTab,
+                    },
+                    {
+                        name: 'Related Entities',
+                        component: BusinessAttributeRelatedEntity,
+                    },
+                    {
+                        name: 'Properties',
+                        component: PropertiesTab,
+                    },
+                ]}
+                sidebarSections={[
+                    {
+                        component: SidebarAboutSection,
+                    },
+                    {
+                        component: BusinessAttributeDataTypeSection,
+                    },
+                    {
+                        component: SidebarOwnerSection,
+                    },
+                    {
+                        component: SidebarTagsSection,
+                        properties: {
+                            hasTags: true,
+                            hasTerms: true,
+                            customTagPath: 'properties.tags',
+                            customTermPath: 'properties.glossaryTerms',
+                        },
+                    },
+                ]}
+                getOverrideProperties={this.getOverridePropertiesFromEntity}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        return this.renderPreview(PreviewType.SEARCH, result.entity as BusinessAttribute);
+    };
+
+    supportedCapabilities = () => {
+        return new Set([
+            EntityCapabilityType.OWNERS,
+            EntityCapabilityType.TAGS,
+            EntityCapabilityType.GLOSSARY_TERMS,
+            // EntityCapabilityType.BUSINESS_ATTRIBUTES,
+        ]);
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/businessAttribute/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/businessAttribute/preview/Preview.tsx
new file mode 100644
index 00000000000000..323c287a0acd78
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/businessAttribute/preview/Preview.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import { GlobalOutlined } from '@ant-design/icons';
+import { EntityType, Owner } from '../../../../types.generated';
+import DefaultPreviewCard from '../../../preview/DefaultPreviewCard';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { IconStyleType, PreviewType } from '../../Entity';
+import UrlButton from '../../shared/UrlButton';
+import { getRelatedEntitiesUrl } from '../../../businessAttribute/businessAttributeUtils';
+
+export const Preview = ({
+    urn,
+    name,
+    description,
+    owners,
+    previewType,
+}: {
+    urn: string;
+    name: string;
+    description?: string | null;
+    owners?: Array<Owner> | null;
+    previewType: PreviewType;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    return (
+        <DefaultPreviewCard
+            previewType={previewType}
+            url={entityRegistry.getEntityUrl(EntityType.BusinessAttribute, urn)}
+            name={name || ''}
+            urn={urn}
+            description={description || ''}
+            owners={owners}
+            logoComponent={<GlobalOutlined style={{ fontSize: '20px' }} />}
+            type="Business Attribute"
+            typeIcon={entityRegistry.getIcon(EntityType.BusinessAttribute, 14, IconStyleType.ACCENT)}
+            entityTitleSuffix={
+                <UrlButton href={getRelatedEntitiesUrl(entityRegistry, urn)}>View Related Entities</UrlButton>
+            }
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/businessAttribute/preview/_tests_/Preview.test.tsx b/datahub-web-react/src/app/entityV2/businessAttribute/preview/_tests_/Preview.test.tsx
new file mode 100644
index 00000000000000..bca32de985d377
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/businessAttribute/preview/_tests_/Preview.test.tsx
@@ -0,0 +1,26 @@
+import { MockedProvider } from '@apollo/client/testing';
+import { render } from '@testing-library/react';
+import React from 'react';
+import { mocks } from '../../../../../Mocks';
+import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer';
+import { Preview } from '../Preview';
+import { PreviewType } from '../../../Entity';
+
+describe('Preview', () => {
+    it('renders', () => {
+        const { getByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer>
+                    <Preview
+                        urn="urn:li:businessAttribute:ba1"
+                        name="name"
+                        description="definition"
+                        owners={null}
+                        previewType={PreviewType.PREVIEW}
+                    />
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(getByText('definition')).toBeInTheDocument();
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx b/datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx
new file mode 100644
index 00000000000000..05b649be554bfd
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx
@@ -0,0 +1,98 @@
+import { Button, message, Select } from 'antd';
+import { EditOutlined } from '@ant-design/icons';
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components';
+import { useEntityData, useRefetch } from '@src/app/entity/shared/EntityContext';
+import { SidebarHeader } from '../../shared/containers/profile/sidebar/SidebarHeader';
+import { useUpdateBusinessAttributeMutation } from '../../../../graphql/businessAttribute.generated';
+import { SchemaFieldDataType } from '../../../businessAttribute/businessAttributeUtils';
+
+interface Props {
+    readOnly?: boolean;
+}
+
+const DataTypeSelect = styled(Select)`
+    && {
+        width: 100%;
+        margin-top: 1em;
+        margin-bottom: 1em;
+    }
+`;
+// Ensures that any newly added datatype is automatically included in the user dropdown.
+const DATA_TYPES = Object.values(SchemaFieldDataType);
+export const BusinessAttributeDataTypeSection = ({ readOnly }: Props) => {
+    const { urn, entityData } = useEntityData();
+    const [originalDescription, setOriginalDescription] = useState<string | null>(null);
+    const [isEditing, setEditing] = useState(false);
+    const refetch = useRefetch();
+
+    useEffect(() => {
+        if (entityData?.properties?.businessAttributeDataType) {
+            setOriginalDescription(entityData?.properties?.businessAttributeDataType);
+        }
+    }, [entityData]);
+
+    const [updateBusinessAttribute] = useUpdateBusinessAttributeMutation();
+
+    const handleChange = (value) => {
+        if (value === originalDescription) {
+            setEditing(false);
+            return;
+        }
+
+        updateBusinessAttribute({ variables: { urn, input: { type: value } } })
+            .then(() => {
+                setEditing(false);
+                setOriginalDescription(value);
+                message.success({ content: 'Data Type Updated', duration: 2 });
+                refetch();
+            })
+            .catch((e: unknown) => {
+                message.destroy();
+                if (e instanceof Error) {
+                    message.error({ content: `Failed to update Data Type: \n ${e.message || ''}`, duration: 3 });
+                }
+            });
+    };
+
+    // Toggle editing mode
+    const handleEditClick = () => {
+        setEditing(!isEditing);
+    };
+
+    return (
+        <div>
+            <SidebarHeader
+                title="Data Type"
+                actions={
+                    !readOnly && (
+                        <Button
+                            data-testid="edit-data-type-button"
+                            onClick={handleEditClick}
+                            type="text"
+                            shape="circle"
+                        >
+                            <EditOutlined />
+                        </Button>
+                    )
+                }
+            />
+            {originalDescription}
+            {isEditing && (
+                <DataTypeSelect
+                    data-testid="add-data-type-option"
+                    placeholder="A data type for business attribute"
+                    onChange={handleChange}
+                >
+                    {DATA_TYPES.map((dataType: SchemaFieldDataType) => (
+                        <Select.Option key={dataType} value={dataType}>
+                            {dataType}
+                        </Select.Option>
+                    ))}
+                </DataTypeSelect>
+            )}
+        </div>
+    );
+};
+
+export default BusinessAttributeDataTypeSection;
diff --git a/datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx b/datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx
new file mode 100644
index 00000000000000..e7c46021f430a6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx
@@ -0,0 +1,43 @@
+import * as React from 'react';
+import { useEntityData } from '@src/app/entity/shared/EntityContext';
+import { UnionType } from '../../../search/utils/constants';
+import { EmbeddedListSearchSection } from '../../shared/components/styled/search/EmbeddedListSearchSection';
+
+export default function BusinessAttributeRelatedEntity() {
+    const { entityData } = useEntityData();
+
+    const entityUrn = entityData?.urn;
+
+    const fixedOrFilters =
+        (entityUrn && [
+            {
+                field: 'businessAttribute',
+                values: [entityUrn],
+            },
+        ]) ||
+        [];
+
+    entityData?.isAChildren?.relationships?.forEach((businessAttribute) => {
+        const childUrn = businessAttribute.entity?.urn;
+
+        if (childUrn) {
+            fixedOrFilters.push({
+                field: 'businessAttributes',
+                values: [childUrn],
+            });
+        }
+    });
+
+    return (
+        <EmbeddedListSearchSection
+            fixedFilters={{
+                unionType: UnionType.OR,
+                filters: fixedOrFilters,
+            }}
+            emptySearchQuery="*"
+            placeholderText="Filter entities..."
+            skipCache
+            applyView
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/chart/ChartEntity.tsx b/datahub-web-react/src/app/entityV2/chart/ChartEntity.tsx
new file mode 100644
index 00000000000000..36777846155cf5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/chart/ChartEntity.tsx
@@ -0,0 +1,391 @@
+import {
+    DashboardOutlined,
+    EyeOutlined,
+    FileOutlined,
+    LayoutOutlined,
+    LineChartOutlined,
+    PartitionOutlined,
+    UnorderedListOutlined,
+    WarningOutlined,
+} from '@ant-design/icons';
+import * as React from 'react';
+import { GetChartQuery, useGetChartQuery, useUpdateChartMutation } from '../../../graphql/chart.generated';
+import { Chart, EntityType, LineageDirection, SearchResult } from '../../../types.generated';
+import { GenericEntityProperties } from '../../entity/shared/types';
+import { LOOKER_URN, MODE, MODE_URN } from '../../ingest/source/builder/constants';
+import { MatchedFieldList } from '../../searchV2/matches/MatchedFieldList';
+import { matchedInputFieldRenderer } from '../../searchV2/matches/matchedInputFieldRenderer';
+import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions';
+import { SubType, TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
+import SidebarChartHeaderSection from '../shared/containers/profile/sidebar/Chart/Header/SidebarChartHeaderSection';
+import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection';
+import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection';
+import SidebarLineageSection from '../shared/containers/profile/sidebar/Lineage/SidebarLineageSection';
+import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
+import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader';
+import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection';
+import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection';
+import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import EmbeddedProfile from '../shared/embed/EmbeddedProfile';
+import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties';
+import { SUMMARY_TAB_ICON } from '../shared/summary/HeaderComponents';
+import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab';
+import { EmbedTab } from '../shared/tabs/Embed/EmbedTab';
+import { ChartDashboardsTab } from '../shared/tabs/Entity/ChartDashboardsTab';
+import { InputFieldsTab } from '../shared/tabs/Entity/InputFieldsTab';
+import TabNameWithCount from '../shared/tabs/Entity/TabNameWithCount';
+import { IncidentTab } from '../shared/tabs/Incident/IncidentTab';
+import { LineageTab } from '../shared/tabs/Lineage/LineageTab';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+import { SidebarTitleActionType, getDashboardLastUpdatedMs, getDataProduct, isOutputPort } from '../shared/utils';
+import { ChartPreview } from './preview/ChartPreview';
+import { ChartStatsSummarySubHeader } from './profile/stats/ChartStatsSummarySubHeader';
+import ChartSummaryTab from './summary/ChartSummaryTab';
+import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection';
+
+const PREVIEW_SUPPORTED_PLATFORMS = [LOOKER_URN, MODE_URN];
+
+const headerDropdownItems = new Set([
+    EntityMenuItems.EXTERNAL_URL,
+    EntityMenuItems.SHARE,
+    EntityMenuItems.UPDATE_DEPRECATION,
+    EntityMenuItems.ANNOUNCE,
+]);
+
+/**
+ * Definition of the DataHub Chart entity.
+ */
+export class ChartEntity implements Entity<Chart> {
+    type: EntityType = EntityType.Chart;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <LineChartOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return (
+                <LineChartOutlined
+                    className={TYPE_ICON_CLASS_NAME}
+                    style={{ fontSize, color: color || 'rgb(144 163 236)' }}
+                />
+            );
+        }
+
+        if (styleType === IconStyleType.SVG) {
+            return (
+                <path d="M888 792H200V168c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v688c0 4.4 3.6 8 8 8h752c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM305.8 637.7c3.1 3.1 8.1 3.1 11.3 0l138.3-137.6L583 628.5c3.1 3.1 8.2 3.1 11.3 0l275.4-275.3c3.1-3.1 3.1-8.2 0-11.3l-39.6-39.6a8.03 8.03 0 00-11.3 0l-230 229.9L461.4 404a8.03 8.03 0 00-11.3 0L266.3 586.7a8.03 8.03 0 000 11.3l39.5 39.7z" />
+            );
+        }
+
+        return (
+            <LineChartOutlined
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => true;
+
+    isLineageEnabled = () => true;
+
+    getAutoCompleteFieldName = () => 'title';
+
+    getGraphName = () => 'chart';
+
+    getPathName = () => this.getGraphName();
+
+    getEntityName = () => 'Chart';
+
+    getCollectionName = () => 'Charts';
+
+    useEntityQuery = useGetChartQuery;
+
+    renderProfile = (urn: string) => (
+        <EntityProfile
+            urn={urn}
+            entityType={EntityType.Chart}
+            useEntityQuery={useGetChartQuery}
+            useUpdateQuery={useUpdateChartMutation}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+            headerDropdownItems={headerDropdownItems}
+            subHeader={{
+                component: ChartStatsSummarySubHeader,
+            }}
+            tabs={[
+                {
+                    name: 'Summary',
+                    component: ChartSummaryTab,
+                    icon: SUMMARY_TAB_ICON,
+                    display: {
+                        visible: (_, chart: GetChartQuery) =>
+                            !!chart?.chart?.subTypes?.typeNames?.includes(SubType.TableauWorksheet) ||
+                            !!chart?.chart?.subTypes?.typeNames?.includes(SubType.Looker) ||
+                            chart?.chart?.platform.name === MODE,
+                        enabled: () => true,
+                    },
+                },
+                {
+                    name: 'Documentation',
+                    component: DocumentationTab,
+                    icon: FileOutlined,
+                },
+                {
+                    name: 'Fields',
+                    component: InputFieldsTab,
+                    icon: LayoutOutlined,
+                    display: {
+                        visible: (_, chart: GetChartQuery) => (chart?.chart?.inputFields?.fields?.length || 0) > 0,
+                        enabled: (_, chart: GetChartQuery) => (chart?.chart?.inputFields?.fields?.length || 0) > 0,
+                    },
+                },
+                {
+                    name: 'Preview',
+                    component: EmbedTab,
+                    icon: EyeOutlined,
+                    display: {
+                        visible: (_, chart: GetChartQuery) =>
+                            !!chart?.chart?.embed?.renderUrl &&
+                            PREVIEW_SUPPORTED_PLATFORMS.includes(chart?.chart?.platform.urn),
+                        enabled: (_, chart: GetChartQuery) =>
+                            !!chart?.chart?.embed?.renderUrl &&
+                            PREVIEW_SUPPORTED_PLATFORMS.includes(chart?.chart?.platform.urn),
+                    },
+                },
+                {
+                    name: 'Lineage',
+                    component: LineageTab,
+                    icon: PartitionOutlined,
+                    properties: {
+                        defaultDirection: LineageDirection.Upstream,
+                    },
+                },
+                {
+                    name: 'Properties',
+                    component: PropertiesTab,
+                    icon: UnorderedListOutlined,
+                },
+                {
+                    name: 'Dashboards',
+                    component: ChartDashboardsTab,
+                    icon: DashboardOutlined,
+                    display: {
+                        visible: (_, _1) => true,
+                        enabled: (_, chart: GetChartQuery) => (chart?.chart?.dashboards?.total || 0) > 0,
+                    },
+                },
+                {
+                    name: 'Incidents',
+                    getDynamicName: (_, chart, loading) => {
+                        const activeIncidentCount = chart?.chart?.activeIncidents?.total;
+                        return <TabNameWithCount name="Incidents" count={activeIncidentCount} loading={loading} />;
+                    },
+                    icon: WarningOutlined,
+                    component: IncidentTab,
+                },
+            ]}
+            sidebarSections={this.getSidebarSections()}
+            sidebarTabs={this.getSidebarTabs()}
+        />
+    );
+
+    getSidebarSections = () => [
+        {
+            component: SidebarEntityHeader,
+        },
+        {
+            component: SidebarChartHeaderSection,
+        },
+        {
+            component: SidebarAboutSection,
+        },
+        {
+            component: SidebarNotesSection,
+        },
+        {
+            component: SidebarLineageSection,
+        },
+        {
+            component: SidebarOwnerSection,
+        },
+        {
+            component: SidebarDomainSection,
+        },
+        {
+            component: DataProductSection,
+        },
+        {
+            component: SidebarTagsSection,
+        },
+        {
+            component: SidebarGlossaryTermsSection,
+        },
+        {
+            component: StatusSection,
+        },
+        {
+            component: SidebarStructuredProperties,
+        },
+    ];
+
+    getSidebarTabs = () => [
+        {
+            name: 'Lineage',
+            component: LineageTab,
+            description: "View this data asset's upstream and downstream dependencies",
+            icon: PartitionOutlined,
+            properties: {
+                actionType: SidebarTitleActionType.LineageExplore,
+            },
+        },
+        {
+            name: 'Properties',
+            component: PropertiesTab,
+            description: 'View additional properties about this asset',
+            icon: UnorderedListOutlined,
+        },
+    ];
+
+    getOverridePropertiesFromEntity = (chart?: Chart | null): GenericEntityProperties => {
+        // TODO: Get rid of this once we have correctly formed platform coming back.
+        const name = chart?.properties?.name;
+        const subTypes = chart?.subTypes;
+        const externalUrl = chart?.properties?.externalUrl;
+        return {
+            name,
+            externalUrl,
+            entityTypeOverride: subTypes ? capitalizeFirstLetterOnly(subTypes.typeNames?.[0]) : '',
+        };
+    };
+
+    renderPreview = (_: PreviewType, data: Chart) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+
+        return (
+            <ChartPreview
+                urn={data.urn}
+                data={genericProperties}
+                platform={data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)}
+                name={data.properties?.name}
+                description={data.editableProperties?.description || data.properties?.description}
+                access={data.properties?.access}
+                owners={data.ownership?.owners}
+                tags={data?.globalTags || undefined}
+                glossaryTerms={data?.glossaryTerms}
+                logoUrl={data?.platform?.properties?.logoUrl}
+                domain={data.domain?.domain}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                parentContainers={data.parentContainers}
+                subType={data.subTypes?.typeNames?.[0]}
+                headerDropdownItems={headerDropdownItems}
+                browsePaths={data.browsePathV2 || undefined}
+                externalUrl={data.properties?.externalUrl}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        const data = result.entity as Chart;
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <ChartPreview
+                urn={data.urn}
+                data={genericProperties}
+                subType={data.subTypes?.typeNames?.[0]}
+                platform={data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)}
+                platformInstanceId={data.dataPlatformInstance?.instanceId}
+                name={data.properties?.name}
+                description={data.editableProperties?.description || data.properties?.description}
+                access={data.properties?.access}
+                owners={data.ownership?.owners}
+                tags={data?.globalTags || undefined}
+                glossaryTerms={data?.glossaryTerms}
+                insights={result.insights}
+                logoUrl={data?.platform?.properties?.logoUrl || ''}
+                domain={data.domain?.domain}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                deprecation={data.deprecation}
+                statsSummary={data.statsSummary}
+                lastUpdatedMs={getDashboardLastUpdatedMs(data?.properties)}
+                createdMs={data.properties?.created?.time}
+                externalUrl={data.properties?.externalUrl}
+                snippet={
+                    <MatchedFieldList
+                        customFieldRenderer={(matchedField) => matchedInputFieldRenderer(matchedField, data)}
+                    />
+                }
+                degree={(result as any).degree}
+                paths={(result as any).paths}
+                isOutputPort={isOutputPort(result)}
+                headerDropdownItems={headerDropdownItems}
+                browsePaths={data.browsePathV2 || undefined}
+            />
+        );
+    };
+
+    renderSearchMatches = (result: SearchResult) => {
+        const data = result.entity as Chart;
+        return (
+            <MatchedFieldList customFieldRenderer={(matchedField) => matchedInputFieldRenderer(matchedField, data)} />
+        );
+    };
+
+    getLineageVizConfig = (entity: Chart) => {
+        return {
+            urn: entity.urn,
+            name: entity.properties?.name || entity.urn,
+            type: EntityType.Chart,
+            icon: entity?.platform?.properties?.logoUrl || undefined,
+            platform: entity?.platform,
+            subtype: entity?.subTypes?.typeNames?.[0] || undefined,
+            deprecation: entity?.deprecation,
+        };
+    };
+
+    displayName = (data: Chart) => {
+        return data.properties?.name || data.urn;
+    };
+
+    getGenericEntityProperties = (data: Chart) => {
+        return getDataForEntityType({
+            data,
+            entityType: this.type,
+            getOverrideProperties: this.getOverridePropertiesFromEntity,
+        });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([
+            EntityCapabilityType.OWNERS,
+            EntityCapabilityType.GLOSSARY_TERMS,
+            EntityCapabilityType.TAGS,
+            EntityCapabilityType.DOMAINS,
+            EntityCapabilityType.DEPRECATION,
+            EntityCapabilityType.SOFT_DELETE,
+            EntityCapabilityType.DATA_PRODUCTS,
+            EntityCapabilityType.TEST,
+            EntityCapabilityType.LINEAGE,
+            EntityCapabilityType.HEALTH,
+        ]);
+    };
+
+    renderEmbeddedProfile = (urn: string) => (
+        <EmbeddedProfile
+            urn={urn}
+            entityType={EntityType.Chart}
+            useEntityQuery={useGetChartQuery}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/chart/preview/ChartPreview.tsx b/datahub-web-react/src/app/entityV2/chart/preview/ChartPreview.tsx
new file mode 100644
index 00000000000000..933fc50bb7d019
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/chart/preview/ChartPreview.tsx
@@ -0,0 +1,137 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import React from 'react';
+import {
+    AccessLevel,
+    ChartStatsSummary,
+    Container,
+    DataProduct,
+    Deprecation,
+    Domain,
+    EntityPath,
+    EntityType,
+    GlobalTags,
+    GlossaryTerms,
+    Owner,
+    ParentContainersResult,
+    SearchInsight,
+    BrowsePathV2,
+} from '../../../../types.generated';
+import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { IconStyleType } from '../../Entity';
+import { PopularityTier } from '../../shared/containers/profile/sidebar/shared/utils';
+import { summaryHasStats, DashboardLastUpdatedMs } from '../../shared/utils';
+import { ChartStatsSummary as ChartStatsSummaryView } from '../shared/ChartStatsSummary';
+import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions';
+
+export const ChartPreview = ({
+    urn,
+    data,
+    name,
+    description,
+    platform,
+    platformInstanceId,
+    access,
+    owners,
+    tags,
+    glossaryTerms,
+    domain,
+    dataProduct,
+    container,
+    insights,
+    logoUrl,
+    deprecation,
+    statsSummary,
+    lastUpdatedMs,
+    createdMs,
+    externalUrl,
+    parentContainers,
+    snippet,
+    degree,
+    paths,
+    subType,
+    isOutputPort,
+    tier,
+    headerDropdownItems,
+    browsePaths,
+}: {
+    urn: string;
+    data: GenericEntityProperties | null;
+    platform?: string;
+    platformInstanceId?: string;
+    name?: string;
+    description?: string | null;
+    access?: AccessLevel | null;
+    owners?: Array<Owner> | null;
+    tags?: GlobalTags;
+    glossaryTerms?: GlossaryTerms | null;
+    domain?: Domain | null;
+    dataProduct?: DataProduct | null;
+    container?: Container | null;
+    insights?: Array<SearchInsight> | null;
+    logoUrl?: string | null;
+    deprecation?: Deprecation | null;
+    statsSummary?: ChartStatsSummary | null;
+    lastUpdatedMs?: DashboardLastUpdatedMs;
+    createdMs?: number | null;
+    externalUrl?: string | null;
+    parentContainers?: ParentContainersResult | null;
+    snippet?: React.ReactNode | null;
+    degree?: number;
+    paths?: EntityPath[];
+    subType?: string | null;
+    isOutputPort?: boolean;
+    tier?: PopularityTier;
+    headerDropdownItems?: Set<EntityMenuItems>;
+    browsePaths?: BrowsePathV2 | undefined;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    const hasStats = summaryHasStats(statsSummary);
+
+    return (
+        <DefaultPreviewCard
+            url={entityRegistry.getEntityUrl(EntityType.Chart, urn)}
+            name={name || ''}
+            urn={urn}
+            data={data}
+            description={description || ''}
+            entityType={EntityType.Chart}
+            type={subType}
+            typeIcon={entityRegistry.getIcon(EntityType.Chart, 14, IconStyleType.ACCENT)}
+            logoUrl={logoUrl || ''}
+            platform={platform}
+            platformInstanceId={platformInstanceId}
+            qualifier={access}
+            tags={tags}
+            owners={owners}
+            glossaryTerms={glossaryTerms || undefined}
+            domain={domain}
+            dataProduct={dataProduct}
+            container={container || undefined}
+            insights={insights}
+            parentEntities={parentContainers?.containers}
+            deprecation={deprecation}
+            externalUrl={externalUrl}
+            snippet={snippet}
+            topUsers={statsSummary?.topUsersLast30Days}
+            subHeader={
+                hasStats && (
+                    <ChartStatsSummaryView
+                        viewCount={statsSummary?.viewCount}
+                        viewCountLast30Days={statsSummary?.viewCountLast30Days}
+                        uniqueUserCountLast30Days={statsSummary?.uniqueUserCountLast30Days}
+                        createdMs={createdMs}
+                    />
+                )
+            }
+            degree={degree}
+            paths={paths}
+            lastUpdatedMs={lastUpdatedMs}
+            isOutputPort={isOutputPort}
+            tier={tier}
+            headerDropdownItems={headerDropdownItems}
+            statsSummary={statsSummary}
+            browsePaths={browsePaths}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/chart/profile/stats/ChartStatsSummarySubHeader.tsx b/datahub-web-react/src/app/entityV2/chart/profile/stats/ChartStatsSummarySubHeader.tsx
new file mode 100644
index 00000000000000..31326f8e0bab1d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/chart/profile/stats/ChartStatsSummarySubHeader.tsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import { ChartStatsSummary as ChartStatsSummaryObj } from '../../../../../types.generated';
+import { useBaseEntity } from '../../../../entity/shared/EntityContext';
+import { GetChartQuery } from '../../../../../graphql/chart.generated';
+import { ChartStatsSummary } from '../../shared/ChartStatsSummary';
+
+export const ChartStatsSummarySubHeader = () => {
+    const result = useBaseEntity<GetChartQuery>();
+    const chart = result?.chart;
+    const maybeStatsSummary = chart?.statsSummary as ChartStatsSummaryObj;
+    const viewCount = maybeStatsSummary?.viewCount;
+    const uniqueUserCountLast30Days = maybeStatsSummary?.uniqueUserCountLast30Days;
+    const lastUpdatedMs = chart?.properties?.lastModified?.time;
+    const createdMs = chart?.properties?.created?.time;
+    const viewCountLast30Days = maybeStatsSummary?.viewCountLast30Days;
+
+    return (
+        <ChartStatsSummary
+            viewCount={viewCount}
+            viewCountLast30Days={viewCountLast30Days}
+            uniqueUserCountLast30Days={uniqueUserCountLast30Days}
+            lastUpdatedMs={lastUpdatedMs}
+            createdMs={createdMs}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/chart/shared/ChartStatsSummary.tsx b/datahub-web-react/src/app/entityV2/chart/shared/ChartStatsSummary.tsx
new file mode 100644
index 00000000000000..87e5d9a4130379
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/chart/shared/ChartStatsSummary.tsx
@@ -0,0 +1,113 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { Popover, Tooltip } from '@components';
+import { ClockCircleOutlined, EyeOutlined, TeamOutlined, QuestionCircleOutlined } from '@ant-design/icons';
+import { formatNumber, formatNumberWithoutAbbreviation } from '../../../shared/formatNumber';
+import { ANTD_GRAY } from '../../shared/constants';
+import { toLocalDateTimeString, toRelativeTimeString } from '../../../shared/time/timeUtils';
+import { StatsSummary } from '../../shared/components/styled/StatsSummary';
+import { PercentileLabel } from '../../shared/stats/PercentileLabel';
+import { countFormatter, needsFormatting } from '../../../../utils/formatter';
+import ExpandingStat from '../../dataset/shared/ExpandingStat';
+
+const StatText = styled.span`
+    color: ${ANTD_GRAY[8]};
+`;
+
+const HelpIcon = styled(QuestionCircleOutlined)`
+    color: ${ANTD_GRAY[7]};
+    padding-left: 4px;
+`;
+
+type Props = {
+    chartCount?: number | null;
+    viewCount?: number | null;
+    viewCountLast30Days?: number | null;
+    viewCountPercentileLast30Days?: number | null;
+    uniqueUserCountLast30Days?: number | null;
+    uniqueUserPercentileLast30Days?: number | null;
+    lastUpdatedMs?: number | null;
+    createdMs?: number | null;
+};
+
+export const ChartStatsSummary = ({
+    chartCount,
+    viewCount,
+    viewCountLast30Days,
+    viewCountPercentileLast30Days,
+    uniqueUserCountLast30Days,
+    uniqueUserPercentileLast30Days,
+    lastUpdatedMs,
+    createdMs,
+}: Props) => {
+    // acryl-main only.
+    const effectiveViewCount = (!!viewCountLast30Days && viewCountLast30Days) || viewCount;
+    const effectiveViewCountText = (!!viewCountLast30Days && 'views last month') || 'views';
+
+    const statsViews = [
+        (!!chartCount && (
+            <ExpandingStat
+                disabled={!needsFormatting(chartCount)}
+                render={(isExpanded) => (
+                    <StatText color={ANTD_GRAY[8]}>
+                        <b>{isExpanded ? formatNumberWithoutAbbreviation(chartCount) : countFormatter(chartCount)}</b>{' '}
+                        charts
+                    </StatText>
+                )}
+            />
+        )) ||
+            undefined,
+        (!!effectiveViewCount && (
+            <StatText>
+                <EyeOutlined style={{ marginRight: 8, color: ANTD_GRAY[7] }} />
+                {formatNumber(effectiveViewCount)} {effectiveViewCountText}
+                {!!viewCountPercentileLast30Days && (
+                    <PercentileLabel
+                        percentile={viewCountPercentileLast30Days}
+                        description={`More views than ${viewCountPercentileLast30Days}% of similar assets in the past 30 days`}
+                    />
+                )}
+            </StatText>
+        )) ||
+            undefined,
+        (!!uniqueUserCountLast30Days && (
+            <StatText>
+                <TeamOutlined style={{ marginRight: 8, color: ANTD_GRAY[7] }} />
+                {formatNumber(uniqueUserCountLast30Days)} users
+                {!!uniqueUserPercentileLast30Days && (
+                    <Typography.Text type="secondary">
+                        <PercentileLabel
+                            percentile={uniqueUserPercentileLast30Days}
+                            description={`More users than ${uniqueUserPercentileLast30Days}% of similar assets in the past 30 days`}
+                        />
+                    </Typography.Text>
+                )}
+            </StatText>
+        )) ||
+            undefined,
+        (!!lastUpdatedMs && (
+            <Popover
+                content={
+                    <>
+                        {createdMs && <div>Created on {toLocalDateTimeString(createdMs)}.</div>}
+                        <div>
+                            Changed on {toLocalDateTimeString(lastUpdatedMs)}.{' '}
+                            <Tooltip title="The time at which the chart was last changed in the source platform">
+                                <HelpIcon />
+                            </Tooltip>
+                        </div>
+                    </>
+                }
+            >
+                <StatText>
+                    <ClockCircleOutlined style={{ marginRight: 8, color: ANTD_GRAY[7] }} />
+                    Changed {toRelativeTimeString(lastUpdatedMs)}
+                </StatText>
+            </Popover>
+        )) ||
+            undefined,
+    ].filter((stat) => stat !== undefined);
+
+    return <>{statsViews.length > 0 && <StatsSummary stats={statsViews} />}</>;
+};
diff --git a/datahub-web-react/src/app/entityV2/chart/summary/ChartFieldsTable.tsx b/datahub-web-react/src/app/entityV2/chart/summary/ChartFieldsTable.tsx
new file mode 100644
index 00000000000000..e7e5971e3cbfcf
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/chart/summary/ChartFieldsTable.tsx
@@ -0,0 +1,121 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Link } from 'react-router-dom';
+import { Table, Typography } from 'antd';
+import { EntityType, SchemaField } from '../../../../types.generated';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { CompactFieldIconWithTooltip } from '../../../sharedV2/icons/CompactFieldIcon';
+import { REDESIGN_COLORS } from '../../shared/constants';
+
+const MAX_ROWS = 5;
+
+const TableContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+    .ant-table-thead > tr > th {
+        background-color: transparent;
+        font-weight: 700;
+        font-size: 14px;
+        color: ${REDESIGN_COLORS.SUBTITLE};
+    }
+    && .ant-table-tbody > tr > td {
+        padding: 8px 5px;
+        border-bottom: none;
+        border-right: 1px solid ${REDESIGN_COLORS.COLD_GREY_TEXT_BLUE_1};
+    }
+`;
+
+const SeeMoreLink = styled(Link)`
+    color: ${REDESIGN_COLORS.SUBTITLE};
+    font-size: 12px;
+    font-weight: 600;
+`;
+
+interface Props {
+    urn: string;
+    rows: SchemaField[];
+}
+
+export default function ChartFieldsTable({ urn, rows }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const hasSeeMore = rows.length > MAX_ROWS;
+
+    const nameColumn = {
+        ellipsis: true,
+        width: '45%',
+        title: 'Name',
+        dataIndex: 'fieldPath',
+        key: 'fieldPath',
+        filtered: true,
+        render: nameRender,
+    };
+
+    const descriptionColumn = {
+        ellipsis: true,
+        width: '45%',
+        title: 'Description',
+        dataIndex: 'description',
+        key: 'description',
+        render: descriptionRender,
+    };
+
+    return (
+        <TableContainer>
+            <Table
+                size="small"
+                columns={[nameColumn, descriptionColumn]}
+                dataSource={rows.slice(0, MAX_ROWS)}
+                rowKey="fieldPath"
+                pagination={false}
+                onRow={(record) => ({
+                    style: {
+                        padding: '0px',
+                        maxWidth: '300px',
+                        minWidth: '300px',
+                    },
+                    id: `column-${record.fieldPath}`,
+                })}
+            />
+            {hasSeeMore && (
+                <SeeMoreLink type="text" to={`${entityRegistry.getEntityUrl(EntityType.Chart, urn)}/Fields`}>
+                    View {rows.length - MAX_ROWS} More
+                </SeeMoreLink>
+            )}
+        </TableContainer>
+    );
+}
+
+const TypeWrapper = styled.span`
+    color: ${REDESIGN_COLORS.SUBTITLE};
+    margin-right: 4px;
+    width: 11px;
+`;
+
+const FieldPathText = styled(Typography.Text)`
+    font-size: 12px;
+    font-weight: 500;
+    color: ${REDESIGN_COLORS.SUBTITLE};
+`;
+
+const Description = styled(Typography.Text)`
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    color: ${REDESIGN_COLORS.SUBTITLE};
+`;
+
+function nameRender(fieldPath: string, row: SchemaField) {
+    return (
+        <FieldPathText>
+            <TypeWrapper>
+                <CompactFieldIconWithTooltip type={row.type} nativeDataType={row.nativeDataType} />
+            </TypeWrapper>
+            {fieldPath}
+        </FieldPathText>
+    );
+}
+
+function descriptionRender(description: string) {
+    return <Description>{description}</Description>;
+}
diff --git a/datahub-web-react/src/app/entityV2/chart/summary/ChartSummaryOverview.tsx b/datahub-web-react/src/app/entityV2/chart/summary/ChartSummaryOverview.tsx
new file mode 100644
index 00000000000000..bbd55e8f61d5d9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/chart/summary/ChartSummaryOverview.tsx
@@ -0,0 +1,118 @@
+import React from 'react';
+import styled from 'styled-components';
+import { GetChartQuery } from '../../../../graphql/chart.generated';
+import { Entity, EntityType } from '../../../../types.generated';
+import { useBaseEntity, useEntityData } from '../../../entity/shared/EntityContext';
+import Loading from '../../../shared/Loading';
+import SummaryEntityCard from '../../../sharedV2/cards/SummaryEntityCard';
+import { useEntityRegistryV2 } from '../../../useEntityRegistry';
+import { SubType } from '../../shared/components/subtypes';
+import { HorizontalList, SummaryColumns } from '../../shared/summary/ListComponents';
+import SummaryCreatedBySection from '../../shared/summary/SummaryCreatedBySection';
+import SummaryQuerySection from './SummaryQuerySection';
+import { MainSection, StyledTitle, SummaryHeader, VerticalDivider } from './styledComponents';
+
+const Count = styled.div`
+    padding: 1px 8px;
+    display: flex;
+    justify-content: center;
+    border-radius: 10px;
+    background-color: #e5ece9;
+    font-size: 10px;
+    font-weight: 400;
+    margin-left: 8px;
+`;
+
+const FirstRow = styled.div`
+    display: flex;
+`;
+
+const SectionContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+`;
+
+export default function ChartSummaryOverview() {
+    const { loading } = useEntityData();
+    const chart = useBaseEntity<GetChartQuery>()?.chart;
+    const entityRegistry = useEntityRegistryV2();
+
+    // TODO: Fix casting
+    // TODO: Check workbook + data source platform actually matches this entity's platform
+    const workbook = chart?.parentContainers?.containers?.find((c) =>
+        c.subTypes?.typeNames?.includes(SubType.TableauWorkbook),
+    ) as Entity;
+
+    // TODO: Calculate this better?
+    const dataSources = (chart?.inputs?.relationships
+        ?.map((r) => r.entity)
+        ?.filter((e) => e?.__typename === 'Dataset') || []) as Entity[];
+
+    const dashboards = (chart?.dashboards?.relationships?.map((r) => r.entity) || []) as Entity[];
+
+    const owner = chart?.ownership?.owners && chart?.ownership?.owners[0]?.owner;
+
+    const query = chart?.query?.rawQuery || '';
+
+    if (loading) {
+        return <Loading />;
+    }
+
+    return (
+        <SummaryColumns>
+            <MainSection>
+                <SummaryHeader>General Info</SummaryHeader>
+                <FirstRow>
+                    {!!owner && <SummaryCreatedBySection owner={owner} />}
+
+                    {!!dataSources?.length && (
+                        <>
+                            <VerticalDivider />
+
+                            <MainSection>
+                                <StyledTitle>
+                                    Data Sources
+                                    <Count>{dataSources.length} </Count>
+                                </StyledTitle>
+                                <HorizontalList>
+                                    {dataSources.map((dataSource) => (
+                                        <SummaryEntityCard key={dataSource.urn} entity={dataSource} />
+                                    ))}
+                                </HorizontalList>
+                            </MainSection>
+                        </>
+                    )}
+                    {!!query && (
+                        <>
+                            <VerticalDivider />
+
+                            <SectionContainer>
+                                <StyledTitle>Query</StyledTitle>
+                                <SummaryQuerySection query={query} />
+                            </SectionContainer>
+                        </>
+                    )}
+                </FirstRow>
+                {workbook && (
+                    <>
+                        <StyledTitle>{SubType.TableauWorkbook}</StyledTitle>
+                        <SummaryEntityCard entity={workbook} />
+                    </>
+                )}
+            </MainSection>
+            {!!dashboards?.length && (
+                <>
+                    <StyledTitle>
+                        {entityRegistry.getEntityName(EntityType.Dashboard)}
+                        <Count>{dashboards?.length}</Count>
+                    </StyledTitle>
+                    <HorizontalList>
+                        {dashboards.map((dashboard) => (
+                            <SummaryEntityCard key={dashboard.urn} entity={dashboard} />
+                        ))}
+                    </HorizontalList>
+                </>
+            )}
+        </SummaryColumns>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/chart/summary/ChartSummaryTab.tsx b/datahub-web-react/src/app/entityV2/chart/summary/ChartSummaryTab.tsx
new file mode 100644
index 00000000000000..a5977ae2e41f3a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/chart/summary/ChartSummaryTab.tsx
@@ -0,0 +1,67 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Divider } from 'antd';
+import { SummaryTabWrapper } from '../../shared/summary/HeaderComponents';
+import TableauEmbed from './TableauEmbed';
+import ChartSummaryOverview from './ChartSummaryOverview';
+import { TABLEAU_URN, LOOKER_URN, MODE_URN } from '../../../ingest/source/builder/constants';
+import SummaryAboutSection from '../../shared/summary/SummaryAboutSection';
+import { useEntityData } from '../../../entity/shared/EntityContext';
+import { useGetTagFields } from './useGetTagFields';
+import { SummaryColumns } from '../../shared/summary/ListComponents';
+import FieldTableByTag from './FieldTableByTag';
+import EmbedPreview from './EmbedPreview';
+
+const StyledDivider = styled(Divider)`
+    width: 100%;
+    border-top-width: 2px;
+    margin: 10px 0;
+`;
+
+const MEASURE_TAG = 'urn:li:tag:Measure';
+const DIMENSION_TAG = 'urn:li:tag:Dimension';
+const TEMPORAL_TAG = 'urn:li:tag:Temporal';
+
+export default function ChartSummaryTab(): JSX.Element | null {
+    const { entityData } = useEntityData();
+
+    const measureFields = useGetTagFields(MEASURE_TAG);
+    const dimensionFields = useGetTagFields(DIMENSION_TAG);
+    const temporalFields = useGetTagFields(TEMPORAL_TAG);
+
+    const areTagFieldsPresent = !!(measureFields?.length || dimensionFields?.length || temporalFields?.length);
+
+    return (
+        <SummaryTabWrapper>
+            <ChartSummaryOverview />
+
+            {(entityData?.platform?.urn === TABLEAU_URN ||
+                entityData?.platform?.urn === LOOKER_URN ||
+                entityData?.platform?.urn === MODE_URN) &&
+                areTagFieldsPresent && (
+                    <>
+                        <StyledDivider />
+
+                        <SummaryColumns>
+                            {measureFields?.length && <FieldTableByTag title="Measures" fields={measureFields} />}
+                            {dimensionFields?.length && <FieldTableByTag title="Dimensions" fields={dimensionFields} />}
+                            {temporalFields?.length && <FieldTableByTag title="Temporals" fields={temporalFields} />}
+                        </SummaryColumns>
+                    </>
+                )}
+            <StyledDivider />
+
+            <SummaryAboutSection />
+
+            {entityData?.platform?.urn === TABLEAU_URN && entityData?.externalUrl && (
+                <>
+                    <StyledDivider />
+                    {entityData?.platform?.urn === TABLEAU_URN && <TableauEmbed externalUrl={entityData.externalUrl} />}
+                </>
+            )}
+            {entityData?.platform?.urn === LOOKER_URN && entityData.embed?.renderUrl && (
+                <EmbedPreview embedUrl={entityData.embed?.renderUrl} />
+            )}
+        </SummaryTabWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/chart/summary/EmbedPreview.tsx b/datahub-web-react/src/app/entityV2/chart/summary/EmbedPreview.tsx
new file mode 100644
index 00000000000000..ceacfd37791342
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/chart/summary/EmbedPreview.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import styled from 'styled-components';
+import HeaderIcon from '@mui/icons-material/VisibilityOutlined';
+import { SummaryTabHeaderTitle, SummaryTabHeaderWrapper } from '../../shared/summary/HeaderComponents';
+
+const Wrapper = styled.div`
+    height: fit-content;
+`;
+
+const StyledIframe = styled.iframe`
+    width: 100%;
+    height: 70vh;
+`;
+
+interface Props {
+    embedUrl: string;
+}
+
+export default function EmbedPreview({ embedUrl }: Props) {
+    return (
+        <Wrapper>
+            <SummaryTabHeaderWrapper>
+                <SummaryTabHeaderTitle icon={<HeaderIcon />} title="Preview" />
+            </SummaryTabHeaderWrapper>
+            <StyledIframe src={embedUrl} frameBorder={0} />
+        </Wrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/chart/summary/FieldTableByTag.tsx b/datahub-web-react/src/app/entityV2/chart/summary/FieldTableByTag.tsx
new file mode 100644
index 00000000000000..bae4ef40312053
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/chart/summary/FieldTableByTag.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import styled from 'styled-components';
+import ChartFieldsTable from './ChartFieldsTable';
+import { SchemaField } from '../../../../types.generated';
+import { SummaryTabHeaderTitle } from '../../shared/summary/HeaderComponents';
+import { useEntityData } from '../../../entity/shared/EntityContext';
+
+const ColumnWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+`;
+
+interface Props {
+    title: string;
+    fields: SchemaField[];
+}
+
+export default function FieldTableByTag({ title, fields }: Props) {
+    const { urn } = useEntityData();
+
+    if (!fields?.length) {
+        return null;
+    }
+
+    return (
+        <>
+            <ColumnWrapper>
+                <SummaryTabHeaderTitle title={title} />
+                <ChartFieldsTable urn={urn} rows={fields} />
+            </ColumnWrapper>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/chart/summary/SummaryQuerySection.tsx b/datahub-web-react/src/app/entityV2/chart/summary/SummaryQuerySection.tsx
new file mode 100644
index 00000000000000..ea0b14e86cfc1d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/chart/summary/SummaryQuerySection.tsx
@@ -0,0 +1,75 @@
+import React, { useState } from 'react';
+import styled from 'styled-components/macro';
+import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
+import { Button, Modal } from 'antd';
+import { REDESIGN_COLORS } from '../../shared/constants';
+
+const PreviewSyntax = styled(SyntaxHighlighter)`
+    max-height: 68px;
+    overflow: hidden !important;
+    border-radius: 12px;
+    max-width: 100%;
+    background: #fafafc !important;
+
+    span {
+        font-family: 'Roboto Mono', monospace;
+    }
+`;
+
+const ModalSyntaxContainer = styled.div`
+    margin: 20px;
+    overflow: auto;
+`;
+
+const Container = styled.div`
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    max-width: 400px;
+`;
+
+const StyledButton = styled(Button)`
+    color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    display: flex;
+    width: fit-content;
+
+    :hover {
+        color: ${REDESIGN_COLORS.HOVER_PURPLE};
+        background: transparent;
+    }
+`;
+
+interface Props {
+    query: string;
+}
+
+const SummaryQuerySection = ({ query }: Props) => {
+    const [showFullContentModal, setShowFullContentModal] = useState(false);
+
+    return (
+        <Container>
+            <Modal
+                closeIcon={null}
+                width="800px"
+                footer={<Button onClick={() => setShowFullContentModal(false)}>Dismiss</Button>}
+                open={showFullContentModal}
+                onCancel={() => setShowFullContentModal(false)}
+            >
+                <ModalSyntaxContainer>
+                    <SyntaxHighlighter language="sql" wrapLongLines showLineNumbers>
+                        {query}
+                    </SyntaxHighlighter>
+                </ModalSyntaxContainer>
+            </Modal>
+
+            <PreviewSyntax language="sql" wrapLongLines>
+                {query}
+            </PreviewSyntax>
+            <StyledButton type="text" onClick={() => setShowFullContentModal(true)}>
+                Read More
+            </StyledButton>
+        </Container>
+    );
+};
+
+export default SummaryQuerySection;
diff --git a/datahub-web-react/src/app/entityV2/chart/summary/TableauEmbed.tsx b/datahub-web-react/src/app/entityV2/chart/summary/TableauEmbed.tsx
new file mode 100644
index 00000000000000..d217dcdf955c92
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/chart/summary/TableauEmbed.tsx
@@ -0,0 +1,40 @@
+import React, { useEffect } from 'react';
+import styled from 'styled-components';
+import HeaderIcon from '@mui/icons-material/VisibilityOutlined';
+import { SummaryTabHeaderTitle, SummaryTabHeaderWrapper } from '../../shared/summary/HeaderComponents';
+
+const Wrapper = styled.div`
+    height: fit-content;
+`;
+
+interface Props {
+    externalUrl: string;
+}
+
+export default function TableauEmbed({ externalUrl }: Props) {
+    useEffect(() => {
+        const script = document.createElement('script');
+        script.type = 'module';
+        script.src = 'https://public.tableau.com/javascripts/api/tableau.embedding.3.latest.min.js';
+        script.async = true;
+
+        document.head.appendChild(script);
+        return () => {
+            document.head.removeChild(script);
+        };
+    }, []);
+
+    // TODO: Calculate height better (desired: height of tab content)
+    return (
+        <Wrapper>
+            <SummaryTabHeaderWrapper>
+                <SummaryTabHeaderTitle icon={<HeaderIcon />} title="Preview" />
+            </SummaryTabHeaderWrapper>
+            {
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore
+                <tableau-viz id="tableauViz" src={externalUrl} height="70vh" width="100%" />
+            }
+        </Wrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/chart/summary/styledComponents.ts b/datahub-web-react/src/app/entityV2/chart/summary/styledComponents.ts
new file mode 100644
index 00000000000000..1ead96bbefa7db
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/chart/summary/styledComponents.ts
@@ -0,0 +1,32 @@
+import { Typography } from 'antd';
+import styled from 'styled-components';
+import { REDESIGN_COLORS } from '../../shared/constants';
+import { HeaderTitle } from '../../shared/summary/HeaderComponents';
+
+export const MainSection = styled.div`
+    display: flex;
+    flex-direction: column;
+`;
+
+export const SummaryHeader = styled(Typography.Text)`
+    margin-bottom: 20px;
+    font-size: 18px;
+    color: ${REDESIGN_COLORS.TEXT_HEADING};
+    font-weight: 500;
+`;
+
+export const VerticalDivider = styled.hr`
+    align-self: stretch;
+    height: auto;
+    margin: 0 20px;
+    color: ${REDESIGN_COLORS.COLD_GREY_TEXT_BLUE_1};
+    border-width: 1px;
+    opacity: 0.2;
+`;
+
+export const StyledTitle = styled(HeaderTitle)`
+    margin-bottom: 12px;
+    font-size: 14px;
+    color: ${REDESIGN_COLORS.TEXT_HEADING};
+    font-weight: 700;
+`;
diff --git a/datahub-web-react/src/app/entityV2/chart/summary/useGetTagFields.ts b/datahub-web-react/src/app/entityV2/chart/summary/useGetTagFields.ts
new file mode 100644
index 00000000000000..8495351f37f56e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/chart/summary/useGetTagFields.ts
@@ -0,0 +1,16 @@
+import { GetChartQuery } from '../../../../graphql/chart.generated';
+import { SchemaField } from '../../../../types.generated';
+import { useBaseEntity } from '../../../entity/shared/EntityContext';
+
+export function useGetTagFields(tag: string): SchemaField[] | undefined {
+    const chart = useBaseEntity<GetChartQuery>()?.chart;
+
+    // Have to type cast because of line `businessAttributeDataType: type` in `businessAttribute` fragment
+    // Can we get rid of this? Why is this renamed?
+    return chart?.inputFields?.fields
+        ?.filter((f) =>
+            f?.schemaField?.globalTags?.tags?.map((t) => t.tag.urn.toLowerCase()).includes(tag.toLowerCase()),
+        )
+        .map((f) => f?.schemaField)
+        .filter((f) => !!f) as SchemaField[] | undefined;
+}
diff --git a/datahub-web-react/src/app/entityV2/container/ContainerEntitiesTab.tsx b/datahub-web-react/src/app/entityV2/container/ContainerEntitiesTab.tsx
new file mode 100644
index 00000000000000..0f760e3ccca3d2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/container/ContainerEntitiesTab.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import { useEntityData } from '../../entity/shared/EntityContext';
+import { EmbeddedListSearchSection } from '../shared/components/styled/search/EmbeddedListSearchSection';
+import { UnionType } from '../../search/utils/constants';
+
+export const ContainerEntitiesTab = () => {
+    const { urn } = useEntityData();
+
+    const fixedFilter = {
+        field: 'container',
+        values: [urn],
+    };
+
+    return (
+        <EmbeddedListSearchSection
+            fixedFilters={{
+                unionType: UnionType.AND,
+                filters: [fixedFilter],
+            }}
+            emptySearchQuery="*"
+            placeholderText="Filter container entities..."
+            applyView
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/container/ContainerEntity.tsx b/datahub-web-react/src/app/entityV2/container/ContainerEntity.tsx
new file mode 100644
index 00000000000000..a23a1c2e017f62
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/container/ContainerEntity.tsx
@@ -0,0 +1,279 @@
+import { AppstoreOutlined, FileOutlined, FolderOutlined, UnorderedListOutlined } from '@ant-design/icons';
+import * as React from 'react';
+import { GetContainerQuery, useGetContainerQuery } from '../../../graphql/container.generated';
+import { Container, EntityType, SearchResult } from '../../../types.generated';
+import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions';
+import { SubType, TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
+import SidebarContentsSection from '../shared/containers/profile/sidebar/Container/SidebarContentsSection';
+import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection';
+import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection';
+import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
+import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader';
+import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection';
+import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection';
+import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import EmbeddedProfile from '../shared/embed/EmbeddedProfile';
+import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties';
+import { SUMMARY_TAB_ICON } from '../shared/summary/HeaderComponents';
+import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+import { getDataProduct, isOutputPort } from '../shared/utils';
+import { ContainerEntitiesTab } from './ContainerEntitiesTab';
+import ContainerSummaryTab from './ContainerSummaryTab';
+import { Preview } from './preview/Preview';
+import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection';
+
+const headerDropdownItems = new Set([EntityMenuItems.EXTERNAL_URL, EntityMenuItems.SHARE, EntityMenuItems.ANNOUNCE]);
+
+/**
+ * Definition of the DataHub Container entity.
+ */
+export class ContainerEntity implements Entity<Container> {
+    type: EntityType = EntityType.Container;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <FolderOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return <FolderOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color: color || '#B37FEB' }} />;
+        }
+
+        if (styleType === IconStyleType.SVG) {
+            return (
+                <path d="M832 64H192c-17.7 0-32 14.3-32 32v832c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V96c0-17.7-14.3-32-32-32zm-600 72h560v208H232V136zm560 480H232V408h560v208zm0 272H232V680h560v208zM304 240a40 40 0 1080 0 40 40 0 10-80 0zm0 272a40 40 0 1080 0 40 40 0 10-80 0zm0 272a40 40 0 1080 0 40 40 0 10-80 0z" />
+            );
+        }
+
+        return (
+            <FolderOutlined
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => false;
+
+    isLineageEnabled = () => false;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getGraphName = () => 'container';
+
+    getPathName = () => this.getGraphName();
+
+    getEntityName = () => 'Container';
+
+    getCollectionName = () => 'Containers';
+
+    useEntityQuery = useGetContainerQuery;
+
+    renderProfile = (urn: string) => (
+        <EntityProfile
+            urn={urn}
+            entityType={EntityType.Container}
+            useEntityQuery={useGetContainerQuery}
+            useUpdateQuery={undefined}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+            headerDropdownItems={headerDropdownItems}
+            tabs={[
+                {
+                    name: 'Summary',
+                    component: ContainerSummaryTab,
+                    icon: SUMMARY_TAB_ICON,
+                    display: {
+                        visible: (_, container: GetContainerQuery) =>
+                            !!container?.container?.subTypes?.typeNames?.includes(SubType.TableauWorkbook),
+                        enabled: () => true,
+                    },
+                },
+                {
+                    name: 'Contents',
+                    component: ContainerEntitiesTab,
+                    icon: AppstoreOutlined,
+                },
+                {
+                    name: 'Documentation',
+                    component: DocumentationTab,
+                    icon: FileOutlined,
+                },
+                {
+                    name: 'Properties',
+                    component: PropertiesTab,
+                    icon: UnorderedListOutlined,
+                },
+            ]}
+            sidebarSections={this.getSidebarSections()}
+            sidebarTabs={this.getSidebarTabs()}
+        />
+    );
+
+    getSidebarSections = () => [
+        {
+            component: SidebarEntityHeader,
+        },
+        {
+            component: SidebarAboutSection,
+        },
+        {
+            component: SidebarNotesSection,
+        },
+        {
+            component: SidebarContentsSection,
+        },
+        {
+            component: SidebarOwnerSection,
+        },
+        {
+            component: SidebarDomainSection,
+        },
+        {
+            component: DataProductSection,
+        },
+        {
+            component: SidebarTagsSection,
+        },
+        {
+            component: SidebarGlossaryTermsSection,
+        },
+        {
+            component: StatusSection,
+        },
+        {
+            component: SidebarStructuredProperties,
+        },
+        // TODO: Add back once entity-level recommendations are complete.
+        // {
+        //    component: SidebarRecommendationsSection,
+        // },
+    ];
+
+    getSidebarTabs = () => [
+        {
+            name: 'Properties',
+            component: PropertiesTab,
+            description: 'View additional properties about this asset',
+            icon: UnorderedListOutlined,
+        },
+    ];
+
+    renderPreview = (_: PreviewType, data: Container) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <Preview
+                urn={data.urn}
+                data={genericProperties}
+                name={this.displayName(data)}
+                platformName={data.platform.properties?.displayName || capitalizeFirstLetterOnly(data.platform.name)}
+                platformLogo={data.platform.properties?.logoUrl}
+                description={data.properties?.description}
+                owners={data.ownership?.owners}
+                subTypes={data.subTypes}
+                container={data}
+                domain={data.domain?.domain}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                tags={data.tags}
+                externalUrl={data.properties?.externalUrl}
+                entityCount={data.entities?.total}
+                headerDropdownItems={headerDropdownItems}
+                browsePaths={data.browsePathV2 || undefined}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        const data = result.entity as Container;
+        const genericProperties = this.getGenericEntityProperties(data);
+
+        return (
+            <Preview
+                urn={data.urn}
+                data={genericProperties}
+                name={this.displayName(data)}
+                platformName={data.platform.properties?.displayName || capitalizeFirstLetterOnly(data.platform.name)}
+                platformLogo={data.platform.properties?.logoUrl}
+                platformInstanceId={data.dataPlatformInstance?.instanceId}
+                description={data.editableProperties?.description || data.properties?.description}
+                owners={data.ownership?.owners}
+                subTypes={data.subTypes}
+                container={data}
+                domain={data.domain?.domain}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                parentContainers={data.parentContainers}
+                externalUrl={data.properties?.externalUrl}
+                tags={data.tags}
+                glossaryTerms={data.glossaryTerms}
+                degree={(result as any).degree}
+                paths={(result as any).paths}
+                entityCount={data.entities?.total}
+                isOutputPort={isOutputPort(result)}
+                headerDropdownItems={headerDropdownItems}
+                browsePaths={data.browsePathV2 || undefined}
+            />
+        );
+    };
+
+    getLineageVizConfig(entity: Container) {
+        return {
+            urn: entity.urn,
+            name: this.displayName(entity),
+            type: this.type,
+            icon: entity?.platform?.properties?.logoUrl || undefined,
+            platform: entity?.platform,
+            subtype: entity?.subTypes?.typeNames?.[0] || undefined,
+        };
+    }
+
+    displayName = (data: Container) => {
+        return data?.properties?.name || data?.properties?.qualifiedName || data?.urn;
+    };
+
+    getOverridePropertiesFromEntity = (data: Container) => {
+        return {
+            name: this.displayName(data),
+            externalUrl: data.properties?.externalUrl,
+            entityCount: data.entities?.total,
+        };
+    };
+
+    getGenericEntityProperties = (data: Container) => {
+        return getDataForEntityType({
+            data,
+            entityType: this.type,
+            getOverrideProperties: this.getOverridePropertiesFromEntity,
+        });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([
+            EntityCapabilityType.OWNERS,
+            EntityCapabilityType.GLOSSARY_TERMS,
+            EntityCapabilityType.TAGS,
+            EntityCapabilityType.DOMAINS,
+            EntityCapabilityType.SOFT_DELETE,
+            EntityCapabilityType.DATA_PRODUCTS,
+            EntityCapabilityType.TEST,
+        ]);
+    };
+
+    renderEmbeddedProfile = (urn: string) => (
+        <EmbeddedProfile
+            urn={urn}
+            entityType={EntityType.Container}
+            useEntityQuery={useGetContainerQuery}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/container/ContainerSummaryTab.tsx b/datahub-web-react/src/app/entityV2/container/ContainerSummaryTab.tsx
new file mode 100644
index 00000000000000..74c9049365c7e5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/container/ContainerSummaryTab.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import { useEntityData } from '../../entity/shared/EntityContext';
+import { SubType } from '../shared/components/subtypes';
+import TableauWorkbookSummaryTab from './tableau/TableauWorkbookSummaryTab';
+
+export default function ContainerSummaryTab() {
+    const { entityData } = useEntityData();
+    const subtype = entityData?.subTypes?.typeNames?.[0];
+    switch (subtype) {
+        case SubType.TableauWorkbook:
+            return <TableauWorkbookSummaryTab />;
+        default:
+            return null;
+    }
+}
diff --git a/datahub-web-react/src/app/entityV2/container/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/container/preview/Preview.tsx
new file mode 100644
index 00000000000000..7d6f6176e9efd5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/container/preview/Preview.tsx
@@ -0,0 +1,110 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import React from 'react';
+import {
+    Container,
+    EntityType,
+    Owner,
+    SearchInsight,
+    SubTypes,
+    Domain,
+    ParentContainersResult,
+    GlobalTags,
+    Deprecation,
+    GlossaryTerms,
+    DataProduct,
+    EntityPath,
+    BrowsePathV2,
+} from '../../../../types.generated';
+import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import ContainerIcon from '../../shared/containers/profile/header/PlatformContent/ContainerIcon';
+import EntityCount from '../../shared/containers/profile/header/EntityCount';
+import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions';
+
+export const Preview = ({
+    urn,
+    data,
+    name,
+    platformName,
+    platformLogo,
+    platformInstanceId,
+    description,
+    owners,
+    tags,
+    glossaryTerms,
+    insights,
+    subTypes,
+    logoComponent,
+    container,
+    domain,
+    dataProduct,
+    parentContainers,
+    externalUrl,
+    deprecation,
+    degree,
+    paths,
+    entityCount,
+    isOutputPort,
+    headerDropdownItems,
+    browsePaths,
+}: {
+    urn: string;
+    data: GenericEntityProperties | null;
+    name: string;
+    platformName?: string;
+    platformLogo?: string | null;
+    platformInstanceId?: string;
+    description?: string | null;
+    owners?: Array<Owner> | null;
+    tags?: GlobalTags | null;
+    glossaryTerms?: GlossaryTerms | null;
+    insights?: Array<SearchInsight> | null;
+    subTypes?: SubTypes | null;
+    logoComponent?: JSX.Element;
+    container?: Container | null;
+    domain?: Domain | null;
+    dataProduct?: DataProduct | null;
+    deprecation?: Deprecation | null;
+    parentContainers?: ParentContainersResult | null;
+    externalUrl?: string | null;
+    degree?: number;
+    paths?: EntityPath[];
+    entityCount?: number;
+    isOutputPort?: boolean;
+    headerDropdownItems?: Set<EntityMenuItems>;
+    browsePaths?: BrowsePathV2;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    return (
+        <DefaultPreviewCard
+            url={entityRegistry.getEntityUrl(EntityType.Container, urn)}
+            name={name || ''}
+            urn={urn}
+            data={data}
+            platform={platformName}
+            platformInstanceId={platformInstanceId}
+            description={description || ''}
+            entityType={EntityType.Container}
+            type={subTypes?.typeNames?.[0]}
+            owners={owners}
+            deprecation={deprecation}
+            insights={insights}
+            logoUrl={platformLogo || undefined}
+            logoComponent={logoComponent}
+            container={container || undefined}
+            typeIcon={<ContainerIcon container={container} />}
+            domain={domain || undefined}
+            dataProduct={dataProduct}
+            parentEntities={parentContainers?.containers}
+            tags={tags || undefined}
+            glossaryTerms={glossaryTerms || undefined}
+            externalUrl={externalUrl}
+            degree={degree}
+            paths={paths}
+            subHeader={<EntityCount displayAssetsText entityCount={entityCount} />}
+            isOutputPort={isOutputPort}
+            headerDropdownItems={headerDropdownItems}
+            browsePaths={browsePaths}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/container/tableau/TableauDataSourcesSection.tsx b/datahub-web-react/src/app/entityV2/container/tableau/TableauDataSourcesSection.tsx
new file mode 100644
index 00000000000000..7d03c40034153c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/container/tableau/TableauDataSourcesSection.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import { useEntityData } from '../../../entity/shared/EntityContext';
+import { useGetSearchResultsForMultipleQuery } from '../../../../graphql/search.generated';
+import { EntityType, FilterOperator } from '../../../../types.generated';
+import { HorizontalList } from '../../shared/summary/ListComponents';
+import { HeaderTitle } from '../../shared/summary/HeaderComponents';
+import { getSubTypeIcon, SubType } from '../../shared/components/subtypes';
+import { CONTAINER_FILTER_NAME, TYPE_NAMES_FILTER_NAME } from '../../../searchV2/utils/constants';
+import SummaryEntityCard from '../../../sharedV2/cards/SummaryEntityCard';
+
+export default function TableauDataSourcesSection() {
+    const { urn } = useEntityData();
+
+    const { data: searchData } = useGetSearchResultsForMultipleQuery({
+        skip: !urn,
+        variables: {
+            input: {
+                types: [EntityType.Dataset],
+                query: '',
+                count: 10,
+                orFilters: [
+                    {
+                        and: [
+                            { field: CONTAINER_FILTER_NAME, values: [urn] },
+                            {
+                                field: TYPE_NAMES_FILTER_NAME,
+                                values: [SubType.TableauEmbeddedDataSource, SubType.TableauPublishedDataSource],
+                                condition: FilterOperator.Contain,
+                            },
+                        ],
+                    },
+                ],
+            },
+        },
+        fetchPolicy: 'cache-first',
+    });
+
+    const dataSources = searchData?.searchAcrossEntities?.searchResults.map((r) => r.entity);
+
+    if (!dataSources?.length) {
+        return null;
+    }
+    return (
+        <>
+            <HeaderTitle>
+                {getSubTypeIcon(SubType.TableauPublishedDataSource)}
+                Data Sources ({searchData?.searchAcrossEntities?.total})
+            </HeaderTitle>
+            <HorizontalList>
+                {dataSources.map((dataSource) => (
+                    <SummaryEntityCard key={dataSource.urn} entity={dataSource} />
+                ))}
+            </HorizontalList>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/container/tableau/TableauViewsSection.tsx b/datahub-web-react/src/app/entityV2/container/tableau/TableauViewsSection.tsx
new file mode 100644
index 00000000000000..d71b13c2f26b63
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/container/tableau/TableauViewsSection.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import Icon from '@ant-design/icons';
+import { useEntityData } from '../../../entity/shared/EntityContext';
+import { useGetSearchResultsForMultipleQuery } from '../../../../graphql/search.generated';
+import { EntityType } from '../../../../types.generated';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { HorizontalList } from '../../shared/summary/ListComponents';
+import { HeaderTitle } from '../../shared/summary/HeaderComponents';
+import TableauViewIcon from '../../../../images/tableau-view.svg?react';
+import { CONTAINER_FILTER_NAME } from '../../../searchV2/utils/constants';
+import SummaryEntityCard from '../../../sharedV2/cards/SummaryEntityCard';
+
+const viewPattern = /.*tableau.com.*\/#(\/site\/[^/]*)?\/views\/(.*)/;
+
+export default function TableauViewsSection() {
+    const { urn } = useEntityData();
+
+    const { data } = useGetSearchResultsForMultipleQuery({
+        skip: !urn,
+        variables: {
+            input: {
+                types: [EntityType.Chart, EntityType.Dashboard],
+                query: '',
+                orFilters: [{ and: [{ field: CONTAINER_FILTER_NAME, values: [urn] }] }],
+                // TODO: Store this information in a filterable property
+                count: 1000,
+            },
+        },
+        fetchPolicy: 'cache-first',
+    });
+
+    const entityRegistry = useEntityRegistry();
+    const views = data?.searchAcrossEntities?.searchResults
+        .filter((r) =>
+            entityRegistry.getGenericEntityProperties(r.entity.type, r.entity)?.externalUrl?.match(viewPattern),
+        )
+        .map((r) => r.entity);
+
+    if (!views?.length) {
+        return null;
+    }
+    return (
+        <>
+            <HeaderTitle>
+                <Icon component={TableauViewIcon} />
+                Views ({views.length})
+            </HeaderTitle>
+            <HorizontalList>
+                {views.map((view) => (
+                    <SummaryEntityCard key={view.urn} entity={view} />
+                ))}
+            </HorizontalList>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/container/tableau/TableauWorkbookSummaryTab.tsx b/datahub-web-react/src/app/entityV2/container/tableau/TableauWorkbookSummaryTab.tsx
new file mode 100644
index 00000000000000..4e0142c76a2fe2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/container/tableau/TableauWorkbookSummaryTab.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import SummaryAboutSection from '../../shared/summary/SummaryAboutSection';
+import { SummaryTabWrapper } from '../../shared/summary/HeaderComponents';
+import TableauViewsSection from './TableauViewsSection';
+import TableauDataSourcesSection from './TableauDataSourcesSection';
+
+export default function TableauWorkbookSummaryTab() {
+    return (
+        <SummaryTabWrapper>
+            <TableauViewsSection />
+            <TableauDataSourcesSection />
+            <SummaryAboutSection />
+        </SummaryTabWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dashboard/DashboardEntity.tsx b/datahub-web-react/src/app/entityV2/dashboard/DashboardEntity.tsx
new file mode 100644
index 00000000000000..88494f8f2b75b5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dashboard/DashboardEntity.tsx
@@ -0,0 +1,404 @@
+import {
+    AppstoreOutlined,
+    DashboardFilled,
+    DashboardOutlined,
+    EyeOutlined,
+    FileOutlined,
+    PartitionOutlined,
+    TableOutlined,
+    UnorderedListOutlined,
+    WarningOutlined,
+} from '@ant-design/icons';
+import * as React from 'react';
+import {
+    GetDashboardQuery,
+    useGetDashboardQuery,
+    useUpdateDashboardMutation,
+} from '../../../graphql/dashboard.generated';
+import { Dashboard, EntityType, LineageDirection, SearchResult } from '../../../types.generated';
+import { GenericEntityProperties } from '../../entity/shared/types';
+import { LOOKER_URN, MODE_URN } from '../../ingest/source/builder/constants';
+import { matchedInputFieldRenderer } from '../../search/matches/matchedInputFieldRenderer';
+import { MatchedFieldList } from '../../searchV2/matches/MatchedFieldList';
+import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions';
+import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
+import SidebarDashboardHeaderSection from '../shared/containers/profile/sidebar/Dashboard/Header/SidebarDashboardHeaderSection';
+import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection';
+import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection';
+import SidebarLineageSection from '../shared/containers/profile/sidebar/Lineage/SidebarLineageSection';
+import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
+import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader';
+import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection';
+import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection';
+import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import EmbeddedProfile from '../shared/embed/EmbeddedProfile';
+import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties';
+import { SUMMARY_TAB_ICON } from '../shared/summary/HeaderComponents';
+import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab';
+import { EmbedTab } from '../shared/tabs/Embed/EmbedTab';
+import { DashboardChartsTab } from '../shared/tabs/Entity/DashboardChartsTab';
+import { DashboardDatasetsTab } from '../shared/tabs/Entity/DashboardDatasetsTab';
+import TabNameWithCount from '../shared/tabs/Entity/TabNameWithCount';
+import { IncidentTab } from '../shared/tabs/Incident/IncidentTab';
+import { LineageTab } from '../shared/tabs/Lineage/LineageTab';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+import { SidebarTitleActionType, getDashboardLastUpdatedMs, getDataProduct, isOutputPort } from '../shared/utils';
+import { DashboardPreview } from './preview/DashboardPreview';
+import { DashboardStatsSummarySubHeader } from './profile/DashboardStatsSummarySubHeader';
+import DashboardSummaryTab from './summary/DashboardSummaryTab';
+import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection';
+
+const PREVIEW_SUPPORTED_PLATFORMS = [LOOKER_URN, MODE_URN];
+
+/**
+ * Definition of the DataHub Dashboard entity.
+ */
+
+const headerDropdownItems = new Set([
+    EntityMenuItems.EXTERNAL_URL,
+    EntityMenuItems.SHARE,
+    EntityMenuItems.UPDATE_DEPRECATION,
+    EntityMenuItems.ANNOUNCE,
+]);
+
+export class DashboardEntity implements Entity<Dashboard> {
+    type: EntityType = EntityType.Dashboard;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <DashboardOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return (
+                <DashboardFilled
+                    className={TYPE_ICON_CLASS_NAME}
+                    style={{ fontSize, color: color || 'rgb(144 163 236)' }}
+                />
+            );
+        }
+
+        if (styleType === IconStyleType.SVG) {
+            return (
+                <path d="M924.8 385.6a446.7 446.7 0 00-96-142.4 446.7 446.7 0 00-142.4-96C631.1 123.8 572.5 112 512 112s-119.1 11.8-174.4 35.2a446.7 446.7 0 00-142.4 96 446.7 446.7 0 00-96 142.4C75.8 440.9 64 499.5 64 560c0 132.7 58.3 257.7 159.9 343.1l1.7 1.4c5.8 4.8 13.1 7.5 20.6 7.5h531.7c7.5 0 14.8-2.7 20.6-7.5l1.7-1.4C901.7 817.7 960 692.7 960 560c0-60.5-11.9-119.1-35.2-174.4zM761.4 836H262.6A371.12 371.12 0 01140 560c0-99.4 38.7-192.8 109-263 70.3-70.3 163.7-109 263-109 99.4 0 192.8 38.7 263 109 70.3 70.3 109 163.7 109 263 0 105.6-44.5 205.5-122.6 276zM623.5 421.5a8.03 8.03 0 00-11.3 0L527.7 506c-18.7-5-39.4-.2-54.1 14.5a55.95 55.95 0 000 79.2 55.95 55.95 0 0079.2 0 55.87 55.87 0 0014.5-54.1l84.5-84.5c3.1-3.1 3.1-8.2 0-11.3l-28.3-28.3zM490 320h44c4.4 0 8-3.6 8-8v-80c0-4.4-3.6-8-8-8h-44c-4.4 0-8 3.6-8 8v80c0 4.4 3.6 8 8 8zm260 218v44c0 4.4 3.6 8 8 8h80c4.4 0 8-3.6 8-8v-44c0-4.4-3.6-8-8-8h-80c-4.4 0-8 3.6-8 8zm12.7-197.2l-31.1-31.1a8.03 8.03 0 00-11.3 0l-56.6 56.6a8.03 8.03 0 000 11.3l31.1 31.1c3.1 3.1 8.2 3.1 11.3 0l56.6-56.6c3.1-3.1 3.1-8.2 0-11.3zm-458.6-31.1a8.03 8.03 0 00-11.3 0l-31.1 31.1a8.03 8.03 0 000 11.3l56.6 56.6c3.1 3.1 8.2 3.1 11.3 0l31.1-31.1c3.1-3.1 3.1-8.2 0-11.3l-56.6-56.6zM262 530h-80c-4.4 0-8 3.6-8 8v44c0 4.4 3.6 8 8 8h80c4.4 0 8-3.6 8-8v-44c0-4.4-3.6-8-8-8z" />
+            );
+        }
+
+        return (
+            <DashboardOutlined
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => true;
+
+    isLineageEnabled = () => true;
+
+    getAutoCompleteFieldName = () => 'title';
+
+    getPathName = () => 'dashboard';
+
+    getEntityName = () => 'Dashboard';
+
+    getCollectionName = () => 'Dashboards';
+
+    useEntityQuery = useGetDashboardQuery;
+
+    renderProfile = (urn: string) => (
+        <EntityProfile
+            urn={urn}
+            entityType={EntityType.Dashboard}
+            useEntityQuery={useGetDashboardQuery}
+            useUpdateQuery={useUpdateDashboardMutation}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+            headerDropdownItems={headerDropdownItems}
+            subHeader={{
+                component: DashboardStatsSummarySubHeader,
+            }}
+            tabs={[
+                {
+                    name: 'Summary',
+                    component: DashboardSummaryTab,
+                    icon: SUMMARY_TAB_ICON,
+                },
+                {
+                    name: 'Contents',
+                    component: DashboardChartsTab,
+                    icon: AppstoreOutlined,
+                    display: {
+                        visible: (_, dashboard: GetDashboardQuery) =>
+                            (dashboard?.dashboard?.charts?.total || 0) > 0 ||
+                            (dashboard?.dashboard?.datasets?.total || 0) === 0,
+                        enabled: (_, dashboard: GetDashboardQuery) => (dashboard?.dashboard?.charts?.total || 0) > 0,
+                    },
+                },
+                {
+                    name: 'Datasets',
+                    component: DashboardDatasetsTab,
+                    icon: TableOutlined,
+                    display: {
+                        visible: (_, dashboard: GetDashboardQuery) => (dashboard?.dashboard?.datasets?.total || 0) > 0,
+                        enabled: (_, dashboard: GetDashboardQuery) => (dashboard?.dashboard?.datasets?.total || 0) > 0,
+                    },
+                },
+                {
+                    name: 'Documentation',
+                    component: DocumentationTab,
+                    icon: FileOutlined,
+                },
+                {
+                    name: 'Preview',
+                    component: EmbedTab,
+                    icon: EyeOutlined,
+                    display: {
+                        visible: (_, dashboard: GetDashboardQuery) =>
+                            !!dashboard?.dashboard?.embed?.renderUrl &&
+                            PREVIEW_SUPPORTED_PLATFORMS.includes(dashboard?.dashboard?.platform.urn),
+                        enabled: (_, dashboard: GetDashboardQuery) =>
+                            !!dashboard?.dashboard?.embed?.renderUrl &&
+                            PREVIEW_SUPPORTED_PLATFORMS.includes(dashboard?.dashboard?.platform.urn),
+                    },
+                },
+                {
+                    name: 'Lineage',
+                    component: LineageTab,
+                    icon: PartitionOutlined,
+                    properties: {
+                        defaultDirection: LineageDirection.Upstream,
+                    },
+                },
+                {
+                    name: 'Properties',
+                    component: PropertiesTab,
+                    icon: UnorderedListOutlined,
+                },
+                {
+                    name: 'Incidents',
+                    icon: WarningOutlined,
+                    component: IncidentTab,
+                    getDynamicName: (_, dashboard, loading) => {
+                        const activeIncidentCount = dashboard?.dashboard?.activeIncidents?.total;
+                        return <TabNameWithCount name="Incidents" count={activeIncidentCount} loading={loading} />;
+                    },
+                },
+            ]}
+            sidebarSections={this.getSidebarSections()}
+            sidebarTabs={this.getSidebarTabs()}
+        />
+    );
+
+    getSidebarSections = () => [
+        {
+            component: SidebarEntityHeader,
+        },
+        {
+            component: SidebarDashboardHeaderSection,
+        },
+        {
+            component: SidebarAboutSection,
+        },
+        {
+            component: SidebarNotesSection,
+        },
+        {
+            component: SidebarLineageSection,
+        },
+        {
+            component: SidebarOwnerSection,
+        },
+        {
+            component: SidebarDomainSection,
+        },
+        {
+            component: DataProductSection,
+        },
+        {
+            component: SidebarGlossaryTermsSection,
+        },
+        {
+            component: SidebarTagsSection,
+        },
+        {
+            component: StatusSection,
+        },
+        {
+            component: SidebarStructuredProperties,
+        },
+    ];
+
+    getSidebarTabs = () => [
+        {
+            name: 'Lineage',
+            component: LineageTab,
+            description: "View this data asset's upstream and downstream dependencies",
+            icon: PartitionOutlined,
+            properties: {
+                defaultDirection: LineageDirection.Upstream,
+                actionType: SidebarTitleActionType.LineageExplore,
+            },
+        },
+        {
+            name: 'Properties',
+            component: PropertiesTab,
+            description: 'View additional properties about this asset',
+            icon: UnorderedListOutlined,
+        },
+    ];
+
+    getOverridePropertiesFromEntity = (dashboard?: Dashboard | null): GenericEntityProperties => {
+        // TODO: Get rid of this once we have correctly formed platform coming back.
+        const name = dashboard?.properties?.name;
+        const externalUrl = dashboard?.properties?.externalUrl;
+        const subTypes = dashboard?.subTypes;
+        return {
+            name,
+            externalUrl,
+            entityTypeOverride: subTypes ? capitalizeFirstLetterOnly(subTypes.typeNames?.[0]) : '',
+        };
+    };
+
+    renderPreview = (previewType: PreviewType, data: Dashboard) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <DashboardPreview
+                urn={data.urn}
+                data={genericProperties}
+                platform={data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)}
+                name={data.properties?.name}
+                description={data.editableProperties?.description || data.properties?.description}
+                access={data.properties?.access}
+                tags={data.globalTags || undefined}
+                owners={data.ownership?.owners}
+                glossaryTerms={data?.glossaryTerms}
+                logoUrl={data?.platform?.properties?.logoUrl}
+                domain={data.domain?.domain}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                container={data.container}
+                parentContainers={data.parentContainers}
+                deprecation={data.deprecation}
+                externalUrl={data.properties?.externalUrl}
+                statsSummary={data.statsSummary}
+                lastUpdatedMs={getDashboardLastUpdatedMs(data.properties)}
+                createdMs={data.properties?.created?.time}
+                subtype={data.subTypes?.typeNames?.[0]}
+                headerDropdownItems={headerDropdownItems}
+                previewType={previewType}
+                browsePaths={data.browsePathV2 || undefined}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        const data = result.entity as Dashboard;
+        const genericProperties = this.getGenericEntityProperties(data);
+
+        return (
+            <DashboardPreview
+                urn={data.urn}
+                data={genericProperties}
+                platform={data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)}
+                name={data.properties?.name}
+                platformInstanceId={data.dataPlatformInstance?.instanceId}
+                description={data.editableProperties?.description || data.properties?.description}
+                access={data.properties?.access}
+                tags={data.globalTags || undefined}
+                owners={data.ownership?.owners}
+                glossaryTerms={data?.glossaryTerms}
+                insights={result.insights}
+                logoUrl={data?.platform?.properties?.logoUrl || ''}
+                domain={data.domain?.domain}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                container={data.container}
+                parentContainers={data.parentContainers}
+                deprecation={data.deprecation}
+                externalUrl={data.properties?.externalUrl}
+                statsSummary={data.statsSummary}
+                lastUpdatedMs={getDashboardLastUpdatedMs(data.properties)}
+                createdMs={data.properties?.created?.time}
+                snippet={
+                    <MatchedFieldList
+                        customFieldRenderer={(matchedField) => matchedInputFieldRenderer(matchedField, data)}
+                        matchSuffix="on a contained chart"
+                    />
+                }
+                subtype={data.subTypes?.typeNames?.[0]}
+                degree={(result as any).degree}
+                paths={(result as any).paths}
+                isOutputPort={isOutputPort(result)}
+                headerDropdownItems={headerDropdownItems}
+                browsePaths={data.browsePathV2 || undefined}
+            />
+        );
+    };
+
+    renderSearchMatches = (result: SearchResult) => {
+        const data = result.entity as Dashboard;
+        return (
+            <MatchedFieldList
+                customFieldRenderer={(matchedField) => matchedInputFieldRenderer(matchedField, data)}
+                matchSuffix="on a contained chart"
+            />
+        );
+    };
+
+    getLineageVizConfig = (entity: Dashboard) => {
+        return {
+            urn: entity.urn,
+            name: entity.properties?.name || entity.urn,
+            type: EntityType.Dashboard,
+            subtype: entity?.subTypes?.typeNames?.[0] || undefined,
+            icon: entity?.platform?.properties?.logoUrl || undefined,
+            platform: entity?.platform,
+            deprecation: entity?.deprecation,
+        };
+    };
+
+    displayName = (data: Dashboard) => {
+        return data.properties?.name || data.urn;
+    };
+
+    getGenericEntityProperties = (data: Dashboard) => {
+        return getDataForEntityType({
+            data,
+            entityType: this.type,
+            getOverrideProperties: this.getOverridePropertiesFromEntity,
+        });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([
+            EntityCapabilityType.OWNERS,
+            EntityCapabilityType.GLOSSARY_TERMS,
+            EntityCapabilityType.TAGS,
+            EntityCapabilityType.DOMAINS,
+            EntityCapabilityType.DEPRECATION,
+            EntityCapabilityType.SOFT_DELETE,
+            EntityCapabilityType.DATA_PRODUCTS,
+            EntityCapabilityType.TEST,
+            EntityCapabilityType.LINEAGE,
+            EntityCapabilityType.HEALTH,
+        ]);
+    };
+
+    getGraphName = () => this.getPathName();
+
+    renderEmbeddedProfile = (urn: string) => (
+        <EmbeddedProfile
+            urn={urn}
+            entityType={EntityType.Dashboard}
+            useEntityQuery={useGetDashboardQuery}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dashboard/preview/DashboardPreview.tsx b/datahub-web-react/src/app/entityV2/dashboard/preview/DashboardPreview.tsx
new file mode 100644
index 00000000000000..c1800d38a12275
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dashboard/preview/DashboardPreview.tsx
@@ -0,0 +1,143 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import React from 'react';
+import {
+    AccessLevel,
+    Container,
+    DashboardStatsSummary,
+    DataProduct,
+    Deprecation,
+    Domain,
+    EntityPath,
+    EntityType,
+    GlobalTags,
+    GlossaryTerms,
+    Owner,
+    ParentContainersResult,
+    SearchInsight,
+    BrowsePathV2,
+} from '../../../../types.generated';
+import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { IconStyleType, PreviewType } from '../../Entity';
+import { PopularityTier } from '../../shared/containers/profile/sidebar/shared/utils';
+import { summaryHasStats, DashboardLastUpdatedMs } from '../../shared/utils';
+import { DashboardStatsSummary as DashboardStatsSummaryView } from '../shared/DashboardStatsSummary';
+import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions';
+
+export const DashboardPreview = ({
+    urn,
+    data,
+    platform,
+    platformInstanceId,
+    name,
+    subtype,
+    description,
+    access,
+    owners,
+    tags,
+    glossaryTerms,
+    domain,
+    dataProduct,
+    container,
+    insights,
+    logoUrl,
+    chartCount,
+    statsSummary,
+    lastUpdatedMs,
+    createdMs,
+    externalUrl,
+    parentContainers,
+    deprecation,
+    snippet,
+    degree,
+    paths,
+    isOutputPort,
+    tier,
+    headerDropdownItems,
+    previewType,
+    browsePaths,
+}: {
+    urn: string;
+    data: GenericEntityProperties | null;
+    platform?: string;
+    platformInstanceId?: string;
+    name?: string;
+    subtype?: string | null;
+    description?: string | null;
+    access?: AccessLevel | null;
+    owners?: Array<Owner> | null;
+    tags?: GlobalTags;
+    glossaryTerms?: GlossaryTerms | null;
+    domain?: Domain | null;
+    dataProduct?: DataProduct | null;
+    container?: Container | null;
+    deprecation?: Deprecation | null;
+    insights?: Array<SearchInsight> | null;
+    logoUrl?: string | null;
+    chartCount?: number | null;
+    statsSummary?: DashboardStatsSummary | null;
+    lastUpdatedMs?: DashboardLastUpdatedMs;
+    createdMs?: number | null;
+    externalUrl?: string | null;
+    parentContainers?: ParentContainersResult | null;
+    snippet?: React.ReactNode | null;
+    degree?: number;
+    paths?: EntityPath[];
+    isOutputPort?: boolean;
+    tier?: PopularityTier;
+    headerDropdownItems?: Set<EntityMenuItems>;
+    previewType?: PreviewType;
+    browsePaths?: BrowsePathV2;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    const hasStats = summaryHasStats(statsSummary);
+
+    return (
+        <DefaultPreviewCard
+            url={entityRegistry.getEntityUrl(EntityType.Dashboard, urn)}
+            name={name || ''}
+            urn={urn}
+            data={data}
+            description={description || ''}
+            entityType={EntityType.Dashboard}
+            type={subtype}
+            typeIcon={entityRegistry.getIcon(EntityType.Dashboard, 14, IconStyleType.ACCENT)}
+            logoUrl={logoUrl || ''}
+            platformInstanceId={platformInstanceId}
+            platform={platform}
+            qualifier={access}
+            owners={owners}
+            tags={tags}
+            container={container || undefined}
+            glossaryTerms={glossaryTerms || undefined}
+            domain={domain}
+            dataProduct={dataProduct}
+            deprecation={deprecation}
+            insights={insights}
+            parentEntities={parentContainers?.containers}
+            externalUrl={externalUrl}
+            topUsers={statsSummary?.topUsersLast30Days}
+            snippet={snippet}
+            subHeader={
+                hasStats && (
+                    <DashboardStatsSummaryView
+                        chartCount={chartCount}
+                        viewCount={statsSummary?.viewCount}
+                        viewCountLast30Days={statsSummary?.viewCountLast30Days}
+                        uniqueUserCountLast30Days={statsSummary?.uniqueUserCountLast30Days}
+                        createdMs={createdMs}
+                    />
+                )
+            }
+            degree={degree}
+            paths={paths}
+            lastUpdatedMs={lastUpdatedMs}
+            isOutputPort={isOutputPort}
+            tier={tier}
+            headerDropdownItems={headerDropdownItems}
+            statsSummary={statsSummary}
+            previewType={previewType}
+            browsePaths={browsePaths}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/dashboard/profile/DashboardStatsSummarySubHeader.tsx b/datahub-web-react/src/app/entityV2/dashboard/profile/DashboardStatsSummarySubHeader.tsx
new file mode 100644
index 00000000000000..ceaf5d9c971f44
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dashboard/profile/DashboardStatsSummarySubHeader.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import { DashboardStatsSummary as DashboardStatsSummaryObj } from '../../../../types.generated';
+import { useBaseEntity } from '../../../entity/shared/EntityContext';
+import { GetDashboardQuery } from '../../../../graphql/dashboard.generated';
+import { DashboardStatsSummary } from '../shared/DashboardStatsSummary';
+
+export const DashboardStatsSummarySubHeader = () => {
+    const result = useBaseEntity<GetDashboardQuery>();
+    const dashboard = result?.dashboard;
+    const maybeStatsSummary = dashboard?.statsSummary as DashboardStatsSummaryObj;
+    const chartCount = dashboard?.charts?.total;
+    const viewCount = maybeStatsSummary?.viewCount;
+    const viewCountLast30Days = maybeStatsSummary?.viewCountLast30Days;
+    const uniqueUserCountLast30Days = maybeStatsSummary?.uniqueUserCountLast30Days;
+    const lastUpdatedMs = dashboard?.properties?.lastModified?.time;
+    const createdMs = dashboard?.properties?.created?.time;
+
+    return (
+        <DashboardStatsSummary
+            chartCount={chartCount}
+            viewCount={viewCount}
+            viewCountLast30Days={viewCountLast30Days}
+            uniqueUserCountLast30Days={uniqueUserCountLast30Days}
+            lastUpdatedMs={lastUpdatedMs}
+            createdMs={createdMs}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/dashboard/shared/DashboardStatsSummary.tsx b/datahub-web-react/src/app/entityV2/dashboard/shared/DashboardStatsSummary.tsx
new file mode 100644
index 00000000000000..8e04f08860f7f4
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dashboard/shared/DashboardStatsSummary.tsx
@@ -0,0 +1,117 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { Popover, Tooltip } from '@components';
+import { ClockCircleOutlined, EyeOutlined, TeamOutlined, QuestionCircleOutlined } from '@ant-design/icons';
+import { formatNumber, formatNumberWithoutAbbreviation } from '../../../shared/formatNumber';
+import { ANTD_GRAY } from '../../shared/constants';
+import { toLocalDateTimeString, toRelativeTimeString } from '../../../shared/time/timeUtils';
+import { StatsSummary } from '../../shared/components/styled/StatsSummary';
+import { PercentileLabel } from '../../shared/stats/PercentileLabel';
+import { countFormatter, needsFormatting } from '../../../../utils/formatter';
+import ExpandingStat from '../../dataset/shared/ExpandingStat';
+
+const StatText = styled.span`
+    color: ${ANTD_GRAY[8]};
+    @media (min-width: 1024px) {
+        white-space: nowrap;
+`;
+
+const HelpIcon = styled(QuestionCircleOutlined)`
+    color: ${ANTD_GRAY[7]};
+    padding-left: 4px;
+`;
+
+type Props = {
+    chartCount?: number | null;
+    viewCount?: number | null;
+    viewCountLast30Days?: number | null;
+    viewCountPercentileLast30Days?: number | null;
+    uniqueUserCountLast30Days?: number | null;
+    uniqueUserPercentileLast30Days?: number | null;
+    lastUpdatedMs?: number | null;
+    createdMs?: number | null;
+};
+
+export const DashboardStatsSummary = ({
+    chartCount,
+    viewCount,
+    viewCountLast30Days,
+    viewCountPercentileLast30Days,
+    uniqueUserCountLast30Days,
+    uniqueUserPercentileLast30Days,
+    lastUpdatedMs,
+    createdMs,
+}: Props) => {
+    // acryl-main only.
+    const effectiveViewCount = (!!viewCountLast30Days && viewCountLast30Days) || viewCount;
+    const effectiveViewCountText = (!!viewCountLast30Days && 'views last month') || 'views';
+
+    const statsViews = [
+        (!!chartCount && (
+            <ExpandingStat
+                disabled={!needsFormatting(chartCount)}
+                render={(isExpanded) => (
+                    <StatText color={ANTD_GRAY[8]}>
+                        <b>{isExpanded ? formatNumberWithoutAbbreviation(chartCount) : countFormatter(chartCount)}</b>{' '}
+                        charts
+                    </StatText>
+                )}
+            />
+        )) ||
+            undefined,
+        (!!effectiveViewCount && (
+            <StatText>
+                <EyeOutlined style={{ marginRight: 8, color: ANTD_GRAY[7] }} />
+                {formatNumber(effectiveViewCount)} {effectiveViewCountText}
+                {!!viewCountPercentileLast30Days && (
+                    <Typography.Text type="secondary">
+                        <PercentileLabel
+                            percentile={viewCountPercentileLast30Days}
+                            description={`More views often than ${viewCountPercentileLast30Days}% of similar assets in the past 30 days`}
+                        />
+                    </Typography.Text>
+                )}
+            </StatText>
+        )) ||
+            undefined,
+        (!!uniqueUserCountLast30Days && (
+            <StatText>
+                <TeamOutlined style={{ marginRight: 8, color: ANTD_GRAY[7] }} />
+                {formatNumber(uniqueUserCountLast30Days)} users
+                {!!uniqueUserPercentileLast30Days && (
+                    <Typography.Text type="secondary">
+                        <PercentileLabel
+                            percentile={uniqueUserPercentileLast30Days}
+                            description={`More users than ${uniqueUserPercentileLast30Days}% of similar assets in the past 30 days`}
+                        />
+                    </Typography.Text>
+                )}
+            </StatText>
+        )) ||
+            undefined,
+        (!!lastUpdatedMs && (
+            <Popover
+                content={
+                    <>
+                        {createdMs && <div>Created on {toLocalDateTimeString(createdMs)}.</div>}
+                        <div>
+                            Changed on {toLocalDateTimeString(lastUpdatedMs)}.{' '}
+                            <Tooltip title="The time at which the dashboard was last changed in the source platform">
+                                <HelpIcon />
+                            </Tooltip>
+                        </div>
+                    </>
+                }
+            >
+                <StatText>
+                    <ClockCircleOutlined style={{ marginRight: 8, color: ANTD_GRAY[7] }} />
+                    Changed {toRelativeTimeString(lastUpdatedMs)}
+                </StatText>
+            </Popover>
+        )) ||
+            undefined,
+    ].filter((stat) => stat !== undefined);
+
+    return <>{statsViews.length > 0 && <StatsSummary stats={statsViews} />}</>;
+};
diff --git a/datahub-web-react/src/app/entityV2/dashboard/summary/DashboardSummaryOverview.tsx b/datahub-web-react/src/app/entityV2/dashboard/summary/DashboardSummaryOverview.tsx
new file mode 100644
index 00000000000000..b4f8c74c308b8f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dashboard/summary/DashboardSummaryOverview.tsx
@@ -0,0 +1,157 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import { GetDashboardQuery } from '../../../../graphql/dashboard.generated';
+import { Entity, EntityType } from '../../../../types.generated';
+import { useBaseEntity, useEntityData } from '../../../entity/shared/EntityContext';
+import { GenericEntityProperties } from '../../../entity/shared/types';
+import { HoverEntityTooltip } from '../../../recommendations/renderer/component/HoverEntityTooltip';
+import PlatformIcon from '../../../sharedV2/icons/PlatformIcon';
+import { useEntityRegistryV2 } from '../../../useEntityRegistry';
+import { MainSection, StyledTitle, SummaryHeader, VerticalDivider } from '../../chart/summary/styledComponents';
+import { REDESIGN_COLORS } from '../../shared/constants';
+import { SummaryColumns } from '../../shared/summary/ListComponents';
+import SummaryCreatedBySection from '../../shared/summary/SummaryCreatedBySection';
+
+import { useGetSearchResultsQuery } from '../../../../graphql/search.generated';
+import Loading from '../../../shared/Loading';
+
+const Count = styled.div`
+    padding: 1px 8px;
+    display: flex;
+    justify-content: center;
+    border-radius: 10px;
+    background-color: #e5ece9;
+    font-size: 10px;
+    font-weight: 400;
+    margin-left: 8px;
+`;
+
+const EntityItem = styled.div`
+    display: flex;
+    align-items: center;
+    padding: 6px 40px 6px 0;
+    gap: 8px;
+    font-size: 14px;
+    font-weight: 500;
+    color: ${REDESIGN_COLORS.SUBTITLE};
+`;
+
+const AssetSections = styled.div`
+    display: flex;
+`;
+
+const EntitiesList = styled.div`
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+    max-height: 220px;
+`;
+
+export default function DashboardSummaryOverview() {
+    const { loading } = useEntityData();
+    const dashboard = useBaseEntity<GetDashboardQuery>()?.dashboard;
+    const entityRegistry = useEntityRegistryV2();
+
+    const charts = (dashboard?.charts?.relationships?.map((r) => r.entity) || []) as Entity[];
+
+    const sources = charts
+        .flatMap((chart: any) => chart?.upstream?.relationships?.map((r) => r.entity))
+        .filter((e) => e.type === EntityType.Dataset)
+        .map((dataSource) => dataSource.urn);
+
+    const { data: dataSourcesData } = useGetSearchResultsQuery({
+        variables: {
+            input: {
+                type: EntityType.Dataset,
+                query: '',
+                filters: [
+                    {
+                        field: 'urn',
+                        values: sources,
+                    },
+                ],
+            },
+        },
+    });
+
+    if (loading) {
+        return <Loading />;
+    }
+
+    const dataSources = (dataSourcesData?.search?.searchResults?.map((result) => result.entity) || []) as Entity[];
+
+    const owner = dashboard?.ownership?.owners && dashboard?.ownership?.owners[0]?.owner;
+    const displayName = entityRegistry.getDisplayName(EntityType.Dashboard, dashboard);
+
+    return (
+        <SummaryColumns>
+            <MainSection>
+                <SummaryHeader>General Info</SummaryHeader>
+
+                {!!owner && <SummaryCreatedBySection owner={owner} />}
+            </MainSection>
+
+            <MainSection>
+                <SummaryHeader>Related Assets</SummaryHeader>
+                <AssetSections>
+                    {!!dataSources?.length && (
+                        <MainSection>
+                            <StyledTitle>
+                                Data Sources
+                                <Count>{dataSources.length} </Count>
+                            </StyledTitle>
+                            <EntitiesList>
+                                {dataSources.map((dataSource) => (
+                                    <Link to={entityRegistry.getEntityUrl(dataSource.type, dataSource.urn)}>
+                                        <HoverEntityTooltip placement="bottom" entity={dataSource} showArrow={false}>
+                                            <EntityItem>
+                                                <PlatformIcon
+                                                    platform={(dataSource as GenericEntityProperties)?.platform}
+                                                    size={18}
+                                                    alt={displayName}
+                                                    entityType={dataSource.type as EntityType}
+                                                />
+                                                {entityRegistry.getDisplayName(
+                                                    dataSource?.type as EntityType,
+                                                    dataSource,
+                                                )}
+                                            </EntityItem>
+                                        </HoverEntityTooltip>
+                                    </Link>
+                                ))}
+                            </EntitiesList>
+                        </MainSection>
+                    )}
+
+                    <VerticalDivider />
+                    {!!charts?.length && (
+                        <MainSection>
+                            <StyledTitle>
+                                Contents
+                                <Count>{charts.length} </Count>
+                            </StyledTitle>
+                            <EntitiesList>
+                                {charts.map((chart) => (
+                                    <Link to={entityRegistry.getEntityUrl(chart.type, chart.urn)}>
+                                        <HoverEntityTooltip placement="bottom" entity={chart} showArrow={false}>
+                                            <EntityItem>
+                                                <PlatformIcon
+                                                    platform={(chart as GenericEntityProperties).platform}
+                                                    size={18}
+                                                    alt={displayName}
+                                                    entityType={chart.type as EntityType}
+                                                />
+                                                {entityRegistry.getDisplayName(chart?.type as EntityType, chart)}
+                                            </EntityItem>
+                                        </HoverEntityTooltip>
+                                    </Link>
+                                ))}
+                            </EntitiesList>
+                        </MainSection>
+                    )}
+                </AssetSections>
+            </MainSection>
+        </SummaryColumns>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dashboard/summary/DashboardSummaryTab.tsx b/datahub-web-react/src/app/entityV2/dashboard/summary/DashboardSummaryTab.tsx
new file mode 100644
index 00000000000000..b8474f5a08515a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dashboard/summary/DashboardSummaryTab.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Divider } from 'antd';
+import { useEntityData } from '../../../entity/shared/EntityContext';
+import { SummaryTabWrapper } from '../../shared/summary/HeaderComponents';
+import SummaryAboutSection from '../../shared/summary/SummaryAboutSection';
+import EmbedPreview from '../../chart/summary/EmbedPreview';
+import DashboardSummaryOverview from './DashboardSummaryOverview';
+
+const StyledDivider = styled(Divider)`
+    width: 100%;
+    border-top-width: 2px;
+    margin: 10px 0;
+`;
+
+export default function DashboardSummaryTab(): JSX.Element | null {
+    const { entityData } = useEntityData();
+
+    return (
+        <SummaryTabWrapper>
+            <DashboardSummaryOverview />
+            <StyledDivider />
+            <SummaryAboutSection />
+
+            {entityData?.embed?.renderUrl && (
+                <>
+                    <StyledDivider />
+                    <EmbedPreview embedUrl={entityData?.embed?.renderUrl} />
+                </>
+            )}
+        </SummaryTabWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataFlow/DataFlowEntity.tsx b/datahub-web-react/src/app/entityV2/dataFlow/DataFlowEntity.tsx
new file mode 100644
index 00000000000000..2f6f217d7e648f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataFlow/DataFlowEntity.tsx
@@ -0,0 +1,263 @@
+import {
+    ConsoleSqlOutlined,
+    FileOutlined,
+    ShareAltOutlined,
+    UnorderedListOutlined,
+    WarningOutlined,
+} from '@ant-design/icons';
+import * as React from 'react';
+import { useGetDataFlowQuery, useUpdateDataFlowMutation } from '../../../graphql/dataFlow.generated';
+import { DataFlow, EntityType, SearchResult } from '../../../types.generated';
+import { GenericEntityProperties } from '../../entity/shared/types';
+import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
+import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection';
+import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection';
+import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
+import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection';
+import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader';
+import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection';
+import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions';
+import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties';
+import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab';
+import { DataFlowJobsTab } from '../shared/tabs/Entity/DataFlowJobsTab';
+import TabNameWithCount from '../shared/tabs/Entity/TabNameWithCount';
+import { IncidentTab } from '../shared/tabs/Incident/IncidentTab';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+import { getDataProduct, isOutputPort } from '../shared/utils';
+import { Preview } from './preview/Preview';
+import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection';
+
+const headerDropdownItems = new Set([
+    EntityMenuItems.EXTERNAL_URL,
+    EntityMenuItems.SHARE,
+    EntityMenuItems.UPDATE_DEPRECATION,
+    EntityMenuItems.ANNOUNCE,
+]);
+
+/**
+ * Definition of the DataHub DataFlow entity.
+ */
+export class DataFlowEntity implements Entity<DataFlow> {
+    type: EntityType = EntityType.DataFlow;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <ShareAltOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return (
+                <ShareAltOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color: color || '#d6246c' }} />
+            );
+        }
+
+        return (
+            <ShareAltOutlined
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => true;
+
+    isLineageEnabled = () => false;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getGraphName = () => 'dataFlow';
+
+    getPathName = () => 'pipelines';
+
+    getEntityName = () => 'Pipeline';
+
+    getCollectionName = () => 'Pipelines';
+
+    useEntityQuery = useGetDataFlowQuery;
+
+    renderProfile = (urn: string) => (
+        <EntityProfile
+            urn={urn}
+            entityType={EntityType.DataFlow}
+            useEntityQuery={useGetDataFlowQuery}
+            useUpdateQuery={useUpdateDataFlowMutation}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+            headerDropdownItems={headerDropdownItems}
+            tabs={[
+                {
+                    name: 'Documentation',
+                    component: DocumentationTab,
+                    icon: FileOutlined,
+                },
+                {
+                    name: 'Tasks',
+                    component: DataFlowJobsTab,
+                    icon: ConsoleSqlOutlined,
+                    properties: {
+                        urn,
+                    },
+                },
+                {
+                    name: 'Incidents',
+                    icon: WarningOutlined,
+                    component: IncidentTab,
+                    getDynamicName: (_, dataFlow, loading) => {
+                        const activeIncidentCount = dataFlow?.dataFlow?.activeIncidents?.total;
+                        return <TabNameWithCount name="Incidents" count={activeIncidentCount} loading={loading} />;
+                    },
+                },
+                {
+                    name: 'Properties',
+                    component: PropertiesTab,
+                    icon: UnorderedListOutlined,
+                },
+            ]}
+            sidebarSections={this.getSidebarSections()}
+            sidebarTabs={this.getSidebarTabs()}
+        />
+    );
+
+    getSidebarSections = () => [
+        {
+            component: SidebarEntityHeader,
+        },
+        {
+            component: SidebarAboutSection,
+        },
+        {
+            component: SidebarNotesSection,
+        },
+        {
+            component: SidebarOwnerSection,
+        },
+        {
+            component: SidebarDomainSection,
+        },
+        {
+            component: DataProductSection,
+        },
+        {
+            component: SidebarGlossaryTermsSection,
+        },
+        {
+            component: SidebarTagsSection,
+        },
+        {
+            component: StatusSection,
+        },
+        {
+            component: SidebarStructuredProperties,
+        },
+    ];
+
+    getSidebarTabs = () => [
+        {
+            name: 'Properties',
+            component: PropertiesTab,
+            description: 'View additional properties about this asset',
+            icon: UnorderedListOutlined,
+        },
+    ];
+
+    getOverridePropertiesFromEntity = (dataFlow?: DataFlow | null): GenericEntityProperties => {
+        // TODO: Get rid of this once we have correctly formed platform coming back.
+        const name = dataFlow?.properties?.name;
+        const externalUrl = dataFlow?.properties?.externalUrl;
+        return {
+            name,
+            externalUrl,
+        };
+    };
+
+    renderPreview = (previewType: PreviewType, data: DataFlow) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <Preview
+                urn={data.urn}
+                data={genericProperties}
+                name={data.properties?.name || ''}
+                description={data.editableProperties?.description || data.properties?.description}
+                platformName={
+                    data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)
+                }
+                platformLogo={data?.platform?.properties?.logoUrl || ''}
+                owners={data.ownership?.owners}
+                globalTags={data.globalTags}
+                domain={data.domain?.domain}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                externalUrl={data.properties?.externalUrl}
+                headerDropdownItems={headerDropdownItems}
+                previewType={previewType}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        const data = result.entity as DataFlow;
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <Preview
+                urn={data.urn}
+                data={genericProperties}
+                name={data.properties?.name || ''}
+                platformInstanceId={data.dataPlatformInstance?.instanceId}
+                description={data.editableProperties?.description || data.properties?.description || ''}
+                platformName={
+                    data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)
+                }
+                platformLogo={data?.platform?.properties?.logoUrl || ''}
+                owners={data.ownership?.owners}
+                globalTags={data.globalTags}
+                insights={result.insights}
+                domain={data.domain?.domain}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                externalUrl={data.properties?.externalUrl}
+                jobCount={(data as any).childJobs?.total}
+                deprecation={data.deprecation}
+                degree={(result as any).degree}
+                paths={(result as any).paths}
+                isOutputPort={isOutputPort(result)}
+                headerDropdownItems={headerDropdownItems}
+                parentContainers={data.parentContainers}
+            />
+        );
+    };
+
+    displayName = (data: DataFlow) => {
+        return data.properties?.name || data.urn;
+    };
+
+    getGenericEntityProperties = (data: DataFlow) => {
+        return getDataForEntityType({
+            data,
+            entityType: this.type,
+            getOverrideProperties: this.getOverridePropertiesFromEntity,
+        });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([
+            EntityCapabilityType.OWNERS,
+            EntityCapabilityType.GLOSSARY_TERMS,
+            EntityCapabilityType.TAGS,
+            EntityCapabilityType.DOMAINS,
+            EntityCapabilityType.DEPRECATION,
+            EntityCapabilityType.SOFT_DELETE,
+            EntityCapabilityType.DATA_PRODUCTS,
+            EntityCapabilityType.TEST,
+            EntityCapabilityType.LINEAGE,
+            EntityCapabilityType.HEALTH,
+        ]);
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/dataFlow/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/dataFlow/preview/Preview.tsx
new file mode 100644
index 00000000000000..af1997bfae6f1a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataFlow/preview/Preview.tsx
@@ -0,0 +1,110 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import React from 'react';
+import { Typography } from 'antd';
+import styled from 'styled-components';
+import {
+    DataProduct,
+    Deprecation,
+    Domain,
+    EntityPath,
+    EntityType,
+    GlobalTags,
+    Owner,
+    ParentContainersResult,
+    SearchInsight,
+} from '../../../../types.generated';
+import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { IconStyleType, PreviewType } from '../../Entity';
+import { ANTD_GRAY } from '../../shared/constants';
+import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions';
+
+const StatText = styled(Typography.Text)`
+    color: ${ANTD_GRAY[8]};
+`;
+
+export const Preview = ({
+    urn,
+    data,
+    name,
+    platformInstanceId,
+    description,
+    platformName,
+    platformLogo,
+    owners,
+    globalTags,
+    domain,
+    dataProduct,
+    externalUrl,
+    snippet,
+    insights,
+    jobCount,
+    deprecation,
+    degree,
+    paths,
+    isOutputPort,
+    headerDropdownItems,
+    previewType,
+    parentContainers,
+}: {
+    urn: string;
+    data: GenericEntityProperties | null;
+    name: string;
+    platformInstanceId?: string;
+    description?: string | null;
+    platformName?: string;
+    platformLogo?: string | null;
+    owners?: Array<Owner> | null;
+    domain?: Domain | null;
+    dataProduct?: DataProduct | null;
+    globalTags?: GlobalTags | null;
+    deprecation?: Deprecation | null;
+    externalUrl?: string | null;
+    snippet?: React.ReactNode | null;
+    insights?: Array<SearchInsight> | null;
+    jobCount?: number | null;
+    degree?: number;
+    paths?: EntityPath[];
+    isOutputPort?: boolean;
+    headerDropdownItems?: Set<EntityMenuItems>;
+    previewType?: PreviewType;
+    parentContainers?: ParentContainersResult | null;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    return (
+        <DefaultPreviewCard
+            url={entityRegistry.getEntityUrl(EntityType.DataFlow, urn)}
+            name={name}
+            urn={urn}
+            data={data}
+            description={description || ''}
+            platformInstanceId={platformInstanceId}
+            entityType={EntityType.DataFlow}
+            typeIcon={entityRegistry.getIcon(EntityType.DataFlow, 14, IconStyleType.ACCENT)}
+            platform={platformName}
+            logoUrl={platformLogo || ''}
+            owners={owners}
+            tags={globalTags || undefined}
+            domain={domain}
+            dataProduct={dataProduct}
+            snippet={snippet}
+            insights={insights}
+            externalUrl={externalUrl}
+            deprecation={deprecation}
+            subHeader={
+                (jobCount && [
+                    <StatText>
+                        <b>{jobCount}</b> {entityRegistry.getCollectionName(EntityType.DataJob)}
+                    </StatText>,
+                ]) ||
+                undefined
+            }
+            degree={degree}
+            paths={paths}
+            isOutputPort={isOutputPort}
+            headerDropdownItems={headerDropdownItems}
+            previewType={previewType}
+            parentEntities={parentContainers?.containers}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/dataJob/DataJobEntity.tsx b/datahub-web-react/src/app/entityV2/dataJob/DataJobEntity.tsx
new file mode 100644
index 00000000000000..7fd7d21314ec81
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataJob/DataJobEntity.tsx
@@ -0,0 +1,329 @@
+import {
+    ConsoleSqlOutlined,
+    FileOutlined,
+    PartitionOutlined,
+    ShareAltOutlined,
+    SyncOutlined,
+    UnorderedListOutlined,
+    WarningOutlined,
+} from '@ant-design/icons';
+import * as React from 'react';
+import { GetDataJobQuery, useGetDataJobQuery, useUpdateDataJobMutation } from '../../../graphql/dataJob.generated';
+import { DataJob, EntityType, SearchResult } from '../../../types.generated';
+import { GenericEntityProperties } from '../../entity/shared/types';
+import { EntityAndType } from '../../lineage/types';
+import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { DataFlowEntity } from '../dataFlow/DataFlowEntity';
+import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions';
+import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
+import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection';
+import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection';
+import SidebarLineageSection from '../shared/containers/profile/sidebar/Lineage/SidebarLineageSection';
+import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
+import SidebarQueryOperationsSection from '../shared/containers/profile/sidebar/Query/SidebarQueryOperationsSection';
+import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader';
+import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection';
+import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection';
+import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties';
+import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab';
+import { DataJobFlowTab } from '../shared/tabs/Entity/DataJobFlowTab';
+import TabNameWithCount from '../shared/tabs/Entity/TabNameWithCount';
+import { IncidentTab } from '../shared/tabs/Incident/IncidentTab';
+import { LineageTab } from '../shared/tabs/Lineage/LineageTab';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+import { SidebarTitleActionType, getDataProduct, isOutputPort } from '../shared/utils';
+import { Preview } from './preview/Preview';
+import { RunsTab } from './tabs/RunsTab';
+import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection';
+
+const getDataJobPlatformName = (data?: DataJob): string => {
+    return (
+        data?.dataFlow?.platform?.properties?.displayName ||
+        capitalizeFirstLetterOnly(data?.dataFlow?.platform?.name) ||
+        ''
+    );
+};
+
+const headerDropdownItems = new Set([
+    EntityMenuItems.EXTERNAL_URL,
+    EntityMenuItems.SHARE,
+    EntityMenuItems.UPDATE_DEPRECATION,
+    EntityMenuItems.ANNOUNCE,
+]);
+
+/**
+ * Definition of the DataHub DataJob entity.
+ */
+export class DataJobEntity implements Entity<DataJob> {
+    type: EntityType = EntityType.DataJob;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <ConsoleSqlOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return (
+                <ConsoleSqlOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color: color || '#B37FEB' }} />
+            );
+        }
+
+        return (
+            <ConsoleSqlOutlined
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => false;
+
+    isLineageEnabled = () => true;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getGraphName = () => 'dataJob';
+
+    getPathName = () => 'tasks';
+
+    getEntityName = () => 'Task';
+
+    getCollectionName = () => 'Tasks';
+
+    useEntityQuery = useGetDataJobQuery;
+
+    renderProfile = (urn: string) => (
+        <EntityProfile
+            urn={urn}
+            entityType={EntityType.DataJob}
+            useEntityQuery={useGetDataJobQuery}
+            useUpdateQuery={useUpdateDataJobMutation}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+            headerDropdownItems={headerDropdownItems}
+            tabs={[
+                {
+                    name: 'Documentation',
+                    component: DocumentationTab,
+                    icon: FileOutlined,
+                },
+                {
+                    name: 'Pipeline',
+                    component: DataJobFlowTab,
+                    icon: ShareAltOutlined,
+                },
+                {
+                    name: 'Lineage',
+                    component: LineageTab,
+                    icon: PartitionOutlined,
+                },
+                {
+                    name: 'Properties',
+                    component: PropertiesTab,
+                    icon: UnorderedListOutlined,
+                },
+                {
+                    name: 'Runs',
+                    component: RunsTab,
+                    icon: SyncOutlined,
+                    display: {
+                        visible: (_, _1) => true,
+                        enabled: (_, dataJob: GetDataJobQuery) => (dataJob?.dataJob?.runs?.total || 0) !== 0,
+                    },
+                },
+                {
+                    name: 'Incidents',
+                    icon: WarningOutlined,
+                    component: IncidentTab,
+                    getDynamicName: (_, dataJob, loading) => {
+                        const activeIncidentCount = dataJob?.dataJob?.activeIncidents?.total;
+                        return <TabNameWithCount name="Incidents" count={activeIncidentCount} loading={loading} />;
+                    },
+                },
+            ]}
+            sidebarSections={this.getSidebarSections()}
+            sidebarTabs={this.getSidebarTabs()}
+        />
+    );
+
+    getSidebarSections = () => [
+        { component: SidebarEntityHeader },
+        { component: SidebarQueryOperationsSection },
+        { component: SidebarAboutSection },
+        { component: SidebarNotesSection },
+        { component: SidebarLineageSection },
+        { component: SidebarOwnerSection },
+        { component: SidebarDomainSection },
+        { component: DataProductSection },
+        { component: SidebarGlossaryTermsSection },
+        { component: SidebarTagsSection },
+        { component: StatusSection },
+        {
+            component: SidebarStructuredProperties,
+        },
+    ];
+
+    getSidebarTabs = () => [
+        {
+            name: 'Lineage',
+            component: LineageTab,
+            description: "View this data asset's upstream and downstream dependencies",
+            icon: PartitionOutlined,
+            properties: {
+                actionType: SidebarTitleActionType.LineageExplore,
+            },
+        },
+        {
+            name: 'Properties',
+            component: PropertiesTab,
+            description: 'View additional properties about this asset',
+            icon: UnorderedListOutlined,
+        },
+    ];
+
+    getOverridePropertiesFromEntity = (dataJob?: DataJob | null): GenericEntityProperties => {
+        // TODO: Get rid of this once we have correctly formed platform coming back.
+        const name = dataJob?.properties?.name;
+        const externalUrl = dataJob?.properties?.externalUrl;
+        return {
+            name,
+            externalUrl,
+            platform: dataJob?.dataFlow?.platform,
+        };
+    };
+
+    renderPreview = (previewType: PreviewType, data: DataJob) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <Preview
+                urn={data.urn}
+                data={genericProperties}
+                name={data.properties?.name || ''}
+                subtype={data.subTypes?.typeNames?.[0]}
+                description={data.editableProperties?.description || data.properties?.description}
+                platformName={getDataJobPlatformName(data)}
+                platformLogo={data?.dataFlow?.platform?.properties?.logoUrl || ''}
+                owners={data.ownership?.owners}
+                globalTags={data.globalTags || null}
+                domain={data.domain?.domain}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                externalUrl={data.properties?.externalUrl}
+                headerDropdownItems={headerDropdownItems}
+                previewType={previewType}
+                browsePaths={data?.browsePathV2 || undefined}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        const data = result.entity as DataJob;
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <Preview
+                urn={data.urn}
+                data={genericProperties}
+                name={data.properties?.name || ''}
+                subtype={data.subTypes?.typeNames?.[0]}
+                description={data.editableProperties?.description || data.properties?.description}
+                platformName={getDataJobPlatformName(data)}
+                platformLogo={data?.dataFlow?.platform?.properties?.logoUrl || ''}
+                platformInstanceId={data.dataPlatformInstance?.instanceId}
+                owners={data.ownership?.owners}
+                globalTags={data.globalTags}
+                domain={data.domain?.domain}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                deprecation={data.deprecation}
+                insights={result.insights}
+                externalUrl={data.properties?.externalUrl}
+                lastRunTimeMs={
+                    ((data as any).lastRun?.runs?.length && (data as any).lastRun?.runs[0]?.created?.time) || undefined
+                }
+                degree={(result as any).degree}
+                paths={(result as any).paths}
+                isOutputPort={isOutputPort(result)}
+                headerDropdownItems={headerDropdownItems}
+                browsePaths={data?.browsePathV2 || undefined}
+                parentContainers={data.parentContainers}
+            />
+        );
+    };
+
+    getExpandedNameForDataJob = (entity: DataJob): string => {
+        const name = this.displayName(entity);
+        const flowName = entity?.dataFlow ? new DataFlowEntity().displayName(entity?.dataFlow) : undefined;
+
+        // if we have no name, just return blank. this should not happen, so dont try & construct a name
+        if (!name) {
+            return '';
+        }
+
+        // if we have a flow name, return the full name of flow.task
+        if (flowName) {
+            return `${flowName}.${name}`;
+        }
+
+        // otherwise, just return the task name (same as non-expanded)
+        return name;
+    };
+
+    getLineageVizConfig = (entity: DataJob) => {
+        return {
+            urn: entity?.urn,
+            name: this.displayName(entity),
+            expandedName: this.getExpandedNameForDataJob(entity),
+            type: EntityType.DataJob,
+            icon: entity?.dataFlow?.platform?.properties?.logoUrl || undefined, // eslint-disable-next-line @typescript-eslint/dot-notation
+            downstreamChildren: entity?.['downstream']?.relationships?.map(
+                (relationship) =>
+                    ({
+                        entity: relationship.entity,
+                        type: relationship.entity.type,
+                    } as EntityAndType),
+            ), // eslint-disable-next-line @typescript-eslint/dot-notation
+            upstreamChildren: entity?.['upstream']?.relationships?.map(
+                (relationship) =>
+                    ({
+                        entity: relationship.entity,
+                        type: relationship.entity.type,
+                    } as EntityAndType),
+            ),
+            platform: entity?.dataFlow?.platform,
+        };
+    };
+
+    displayName = (data: DataJob) => {
+        return data.properties?.name || data.urn;
+    };
+
+    getGenericEntityProperties = (data: DataJob) => {
+        return getDataForEntityType({
+            data,
+            entityType: this.type,
+            getOverrideProperties: this.getOverridePropertiesFromEntity,
+        });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([
+            EntityCapabilityType.OWNERS,
+            EntityCapabilityType.GLOSSARY_TERMS,
+            EntityCapabilityType.TAGS,
+            EntityCapabilityType.DOMAINS,
+            EntityCapabilityType.DEPRECATION,
+            EntityCapabilityType.SOFT_DELETE,
+            EntityCapabilityType.DATA_PRODUCTS,
+            EntityCapabilityType.TEST,
+            EntityCapabilityType.LINEAGE,
+            EntityCapabilityType.HEALTH,
+        ]);
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/dataJob/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/dataJob/preview/Preview.tsx
new file mode 100644
index 00000000000000..c8485016712cd5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataJob/preview/Preview.tsx
@@ -0,0 +1,122 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { ClockCircleOutlined } from '@ant-design/icons';
+
+import {
+    BrowsePathV2,
+    DataProduct,
+    Deprecation,
+    Domain,
+    EntityPath,
+    EntityType,
+    GlobalTags,
+    Owner,
+    ParentContainersResult,
+    SearchInsight,
+} from '../../../../types.generated';
+import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { IconStyleType, PreviewType } from '../../Entity';
+import { ANTD_GRAY } from '../../shared/constants';
+import { toRelativeTimeString } from '../../../shared/time/timeUtils';
+import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions';
+
+const StatText = styled(Typography.Text)`
+    color: ${ANTD_GRAY[8]};
+`;
+
+export const Preview = ({
+    urn,
+    data,
+    name,
+    subtype,
+    description,
+    platformName,
+    platformLogo,
+    platformInstanceId,
+    owners,
+    domain,
+    dataProduct,
+    deprecation,
+    globalTags,
+    snippet,
+    insights,
+    lastRunTimeMs,
+    externalUrl,
+    degree,
+    paths,
+    isOutputPort,
+    headerDropdownItems,
+    previewType,
+    browsePaths,
+    parentContainers,
+}: {
+    urn: string;
+    data: GenericEntityProperties | null;
+    name: string;
+    subtype?: string | null;
+    description?: string | null;
+    platformName: string;
+    platformLogo?: string | null;
+    platformInstanceId?: string;
+    owners?: Array<Owner> | null;
+    domain?: Domain | null;
+    dataProduct?: DataProduct | null;
+    deprecation?: Deprecation | null;
+    globalTags?: GlobalTags | null;
+    snippet?: React.ReactNode | null;
+    insights?: Array<SearchInsight> | null;
+    lastRunTimeMs?: number | null;
+    externalUrl?: string | null;
+    degree?: number;
+    paths?: EntityPath[];
+    isOutputPort?: boolean;
+    headerDropdownItems?: Set<EntityMenuItems>;
+    previewType?: PreviewType;
+    browsePaths?: BrowsePathV2;
+    parentContainers?: ParentContainersResult | null;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    return (
+        <DefaultPreviewCard
+            url={entityRegistry.getEntityUrl(EntityType.DataJob, urn)}
+            name={name}
+            urn={urn}
+            data={data}
+            description={description || ''}
+            entityType={EntityType.DataJob}
+            type={subtype}
+            typeIcon={entityRegistry.getIcon(EntityType.DataJob, 14, IconStyleType.ACCENT)}
+            platform={platformName}
+            logoUrl={platformLogo || ''}
+            platformInstanceId={platformInstanceId}
+            owners={owners}
+            tags={globalTags || undefined}
+            domain={domain}
+            dataProduct={dataProduct}
+            snippet={snippet}
+            deprecation={deprecation}
+            dataTestID="datajob-item-preview"
+            insights={insights}
+            externalUrl={externalUrl}
+            subHeader={
+                (lastRunTimeMs && [
+                    <StatText>
+                        <ClockCircleOutlined style={{ paddingRight: 8 }} />
+                        Last run {toRelativeTimeString(lastRunTimeMs)}
+                    </StatText>,
+                ]) ||
+                undefined
+            }
+            degree={degree}
+            paths={paths}
+            isOutputPort={isOutputPort}
+            headerDropdownItems={headerDropdownItems}
+            previewType={previewType}
+            browsePaths={browsePaths}
+            parentEntities={parentContainers?.containers}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/dataJob/tabs/RunsTab.tsx b/datahub-web-react/src/app/entityV2/dataJob/tabs/RunsTab.tsx
new file mode 100644
index 00000000000000..dffc8d35ea9ad6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataJob/tabs/RunsTab.tsx
@@ -0,0 +1,168 @@
+import { DeliveredProcedureOutlined } from '@ant-design/icons';
+import { Pagination, Table, Typography } from 'antd';
+import { Tooltip } from '@components';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+
+import { useGetDataJobRunsQuery } from '../../../../graphql/dataJob.generated';
+import { DataProcessInstanceRunResultType, DataProcessRunStatus } from '../../../../types.generated';
+import {
+    getExecutionRequestStatusDisplayColor,
+    getExecutionRequestStatusDisplayText,
+    getExecutionRequestStatusIcon,
+} from '../../../ingest/source/utils';
+import { CompactEntityNameList } from '../../../recommendations/renderer/component/CompactEntityNameList';
+import { ANTD_GRAY } from '../../shared/constants';
+import { useEntityData } from '../../../entity/shared/EntityContext';
+import LoadingSvg from '../../../../images/datahub-logo-color-loading_pendulum.svg?react';
+import { scrollToTop } from '../../../shared/searchUtils';
+
+const ExternalUrlLink = styled.a`
+    font-size: 16px;
+    color: ${ANTD_GRAY[8]};
+`;
+
+const PaginationControlContainer = styled.div`
+    padding-top: 16px;
+    padding-bottom: 16px;
+    text-align: center;
+`;
+
+const LoadingText = styled.div`
+    margin-top: 18px;
+    font-size: 12px;
+`;
+
+const LoadingContainer = styled.div`
+    padding-top: 40px;
+    padding-bottom: 40px;
+    width: 100%;
+    text-align: center;
+`;
+
+function getStatusForStyling(status: DataProcessRunStatus, resultType: DataProcessInstanceRunResultType) {
+    if (status === 'COMPLETE') {
+        if (resultType === 'SKIPPED') {
+            return 'CANCELLED';
+        }
+        return resultType;
+    }
+    return 'RUNNING';
+}
+
+const columns = [
+    {
+        title: 'Time',
+        dataIndex: 'time',
+        key: 'time',
+        render: (value) => (
+            <Tooltip title={new Date(Number(value)).toUTCString()}>{new Date(Number(value)).toLocaleString()}</Tooltip>
+        ),
+    },
+    {
+        title: 'Run ID',
+        dataIndex: 'name',
+        key: 'name',
+    },
+    {
+        title: 'Status',
+        dataIndex: 'status',
+        key: 'status',
+        render: (status: any, row) => {
+            const statusForStyling = getStatusForStyling(status, row?.resultType);
+            const Icon = getExecutionRequestStatusIcon(statusForStyling);
+            const text = getExecutionRequestStatusDisplayText(statusForStyling);
+            const color = getExecutionRequestStatusDisplayColor(statusForStyling);
+            return (
+                <>
+                    <div style={{ display: 'flex', justifyContent: 'left', alignItems: 'center' }}>
+                        {Icon && <Icon style={{ color }} />}
+                        <Typography.Text strong style={{ color, marginLeft: 8 }}>
+                            {text || 'N/A'}
+                        </Typography.Text>
+                    </div>
+                </>
+            );
+        },
+    },
+    {
+        title: 'Inputs',
+        dataIndex: 'inputs',
+        key: 'inputs',
+        render: (inputs) => <CompactEntityNameList entities={inputs} placement="right" />,
+        width: 150,
+    },
+    {
+        title: 'Outputs',
+        dataIndex: 'outputs',
+        key: 'outputs',
+        render: (outputs) => <CompactEntityNameList entities={outputs} placement="right" />,
+        width: 150,
+    },
+    {
+        title: '',
+        dataIndex: 'externalUrl',
+        key: 'externalUrl',
+        render: (externalUrl) =>
+            externalUrl && (
+                <Tooltip title="View task run details">
+                    <ExternalUrlLink href={externalUrl}>
+                        <DeliveredProcedureOutlined />
+                    </ExternalUrlLink>
+                </Tooltip>
+            ),
+    },
+];
+
+const PAGE_SIZE = 20;
+
+export const RunsTab = () => {
+    const { urn } = useEntityData();
+    const [page, setPage] = useState(1);
+
+    const { loading, data } = useGetDataJobRunsQuery({
+        variables: { urn, start: (page - 1) * PAGE_SIZE, count: PAGE_SIZE },
+    });
+    const runs = data && data?.dataJob?.runs?.runs;
+
+    const tableData = runs
+        ?.filter((run) => run?.state?.length)
+        .map((run) => ({
+            time: run?.created?.time,
+            name: run?.name,
+            status: run?.state?.[0]?.status,
+            resultType: run?.state?.[0]?.result?.resultType,
+            inputs: run?.inputs?.relationships.map((relationship) => relationship.entity),
+            outputs: run?.outputs?.relationships.map((relationship) => relationship.entity),
+            externalUrl: run?.externalUrl,
+        }));
+    if (loading) {
+        return (
+            <LoadingContainer>
+                <LoadingSvg height={80} width={80} />
+                <LoadingText>Fetching runs...</LoadingText>
+            </LoadingContainer>
+        );
+    }
+
+    const onChangePage = (newPage: number) => {
+        scrollToTop();
+        setPage(newPage);
+    };
+
+    return (
+        <>
+            <Table dataSource={tableData} columns={columns} pagination={false} />
+            <PaginationControlContainer>
+                <Pagination
+                    current={page}
+                    pageSize={PAGE_SIZE}
+                    total={data?.dataJob?.runs?.total || 0}
+                    showLessItems
+                    onChange={onChangePage}
+                    showSizeChanger={false}
+                />
+            </PaginationControlContainer>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/dataPlatform/DataPlatformEntity.tsx b/datahub-web-react/src/app/entityV2/dataPlatform/DataPlatformEntity.tsx
new file mode 100644
index 00000000000000..f7c2256ca55d9f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataPlatform/DataPlatformEntity.tsx
@@ -0,0 +1,77 @@
+import * as React from 'react';
+import { DatabaseOutlined } from '@ant-design/icons';
+import { DataPlatform, EntityType, SearchResult } from '../../../types.generated';
+import { Entity, IconStyleType, PreviewType } from '../Entity';
+import { GenericEntityProperties } from '../../entity/shared/types';
+import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+
+const getDisplayName = (data?: DataPlatform): string => {
+    return data?.properties?.displayName || data?.name || '';
+};
+
+/**
+ * Definition of the DataHub DataJob entity.
+ */
+export class DataPlatformEntity implements Entity<DataPlatform> {
+    type: EntityType = EntityType.DataPlatform;
+
+    icon = (fontSize?: number, _styleType?: IconStyleType, color?: string) => {
+        return (
+            <DatabaseOutlined
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => false;
+
+    isBrowseEnabled = () => false;
+
+    isLineageEnabled = () => false;
+
+    // Currently unused.
+    getAutoCompleteFieldName = () => 'name';
+
+    // Currently unused.
+    getPathName = () => 'platform';
+
+    // Currently unused.
+    getEntityName = () => 'Data Platform';
+
+    // Currently unused.
+    getCollectionName = () => 'Data Platforms';
+
+    // Currently unused.
+    renderProfile = (_: string) => <></>;
+
+    // Currently unused.
+    renderPreview = (_: PreviewType, _1: DataPlatform) => <></>;
+
+    // Currently unused.
+    renderSearch = (_: SearchResult) => <></>;
+
+    displayName = (data: DataPlatform) => {
+        return getDisplayName(data);
+    };
+
+    getGenericEntityProperties = (data: DataPlatform) => {
+        return {
+            ...data,
+            entityType: this.type,
+            name: getDisplayName(data),
+            platform: data,
+        } as GenericEntityProperties;
+    };
+
+    supportedCapabilities = () => {
+        return new Set([]);
+    };
+
+    getGraphName = () => {
+        return 'dataPlatform';
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/dataPlatformInstance/DataPlatformInstanceEntity.tsx b/datahub-web-react/src/app/entityV2/dataPlatformInstance/DataPlatformInstanceEntity.tsx
new file mode 100644
index 00000000000000..f76c94782e9735
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataPlatformInstance/DataPlatformInstanceEntity.tsx
@@ -0,0 +1,65 @@
+import * as React from 'react';
+import { DataPlatformInstance, EntityType } from '../../../types.generated';
+import { Entity } from '../Entity';
+import { GenericEntityProperties } from '../../entity/shared/types';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+
+/**
+ * Definition of the DataHub DataPlatformInstance entity.
+ * Most of this still needs to be filled out.
+ */
+export class DataPlatformInstanceEntity implements Entity<DataPlatformInstance> {
+    type: EntityType = EntityType.DataPlatformInstance;
+
+    icon = () => {
+        return <></>;
+    };
+
+    isSearchEnabled = () => false;
+
+    isBrowseEnabled = () => false;
+
+    isLineageEnabled = () => false;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getPathName = () => 'dataPlatformInstance';
+
+    getEntityName = () => 'Data Platform Instance';
+
+    getCollectionName = () => 'Data Platform Instances';
+
+    renderProfile = () => <></>;
+
+    getOverridePropertiesFromEntity = (): GenericEntityProperties => {
+        return {};
+    };
+
+    renderPreview = () => {
+        return <></>;
+    };
+
+    renderSearch = () => {
+        return <></>;
+    };
+
+    displayName = (data: DataPlatformInstance) => {
+        return data?.instanceId || data.urn;
+    };
+
+    getGenericEntityProperties = (data: DataPlatformInstance) => {
+        return getDataForEntityType({
+            data,
+            entityType: this.type,
+            getOverrideProperties: this.getOverridePropertiesFromEntity,
+        });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([]);
+    };
+
+    getGraphName = () => {
+        return 'dataPlatformInstance';
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/dataProcessInstance/DataProcessInstanceEntity.tsx b/datahub-web-react/src/app/entityV2/dataProcessInstance/DataProcessInstanceEntity.tsx
new file mode 100644
index 00000000000000..3ab8c2b268aac3
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataProcessInstance/DataProcessInstanceEntity.tsx
@@ -0,0 +1,265 @@
+import React from 'react';
+import { ApiOutlined } from '@ant-design/icons';
+import { GenericEntityProperties } from '@src/app/entity/shared/types';
+import {
+    DataProcessInstance,
+    Entity as GeneratedEntity,
+    EntityType,
+    OwnershipType,
+    SearchResult,
+} from '../../../types.generated';
+import { Preview } from './preview/Preview';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { useGetDataProcessInstanceQuery } from '../../../graphql/dataProcessInstance.generated';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+import { LineageTab } from '../shared/tabs/Lineage/LineageTab';
+import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
+import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection';
+import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection';
+import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
+import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection';
+import { getDataProduct } from '../shared/utils';
+// import SummaryTab from './profile/DataProcessInstaceSummary';
+
+// const getProcessPlatformName = (data?: DataProcessInstance): string => {
+//     return (
+//         data?.dataPlatformInstance?.platform?.properties?.displayName ||
+//         capitalizeFirstLetterOnly(data?.dataPlatformInstance?.platform?.name) ||
+//         ''
+//     );
+// };
+
+const getParentEntities = (data: DataProcessInstance): GeneratedEntity[] => {
+    const parentEntity = data?.relationships?.relationships?.find(
+        (rel) => rel.type === 'InstanceOf' && rel.entity?.type === EntityType.DataJob,
+    );
+
+    if (!parentEntity?.entity) return [];
+
+    // Convert to GeneratedEntity
+    return [
+        {
+            type: parentEntity.entity.type,
+            urn: (parentEntity.entity as any).urn, // Make sure urn exists
+            relationships: (parentEntity.entity as any).relationships,
+        },
+    ];
+};
+/**
+ * Definition of the DataHub DataProcessInstance entity.
+ */
+export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
+    type: EntityType = EntityType.DataProcessInstance;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <ApiOutlined style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return <ApiOutlined style={{ fontSize, color: color || '#B37FEB' }} />;
+        }
+
+        return (
+            <ApiOutlined
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => true;
+
+    isLineageEnabled = () => true;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getPathName = () => 'dataProcessInstance';
+
+    getEntityName = () => 'Process Instance';
+
+    getGraphName = () => 'dataProcessInstance';
+
+    getCollectionName = () => 'Process Instances';
+
+    useEntityQuery = useGetDataProcessInstanceQuery;
+
+    renderProfile = (urn: string) => (
+        <EntityProfile
+            urn={urn}
+            entityType={EntityType.DataProcessInstance}
+            useEntityQuery={this.useEntityQuery}
+            // useUpdateQuery={useUpdateDataProcessInstanceMutation}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+            tabs={[
+                // {
+                //     name: 'Documentation',
+                //     component: DocumentationTab,
+                // },
+                // {
+                //     name: 'Summary',
+                //     component: SummaryTab,
+                // },
+                {
+                    name: 'Lineage',
+                    component: LineageTab,
+                },
+                {
+                    name: 'Properties',
+                    component: PropertiesTab,
+                },
+                // {
+                //     name: 'Incidents',
+                //     component: IncidentTab,
+                //     getDynamicName: (_, processInstance) => {
+                //         const activeIncidentCount = processInstance?.dataProcessInstance?.activeIncidents.total;
+                //         return `Incidents${(activeIncidentCount && ` (${activeIncidentCount})`) || ''}`;
+                //     },
+                // },
+            ]}
+            sidebarSections={this.getSidebarSections()}
+        />
+    );
+
+    getSidebarSections = () => [
+        {
+            component: SidebarAboutSection,
+        },
+        {
+            component: SidebarOwnerSection,
+            properties: {
+                defaultOwnerType: OwnershipType.TechnicalOwner,
+            },
+        },
+        {
+            component: SidebarTagsSection,
+            properties: {
+                hasTags: true,
+                hasTerms: true,
+            },
+        },
+        {
+            component: SidebarDomainSection,
+        },
+        {
+            component: DataProductSection,
+        },
+    ];
+
+    getOverridePropertiesFromEntity = (processInstance?: DataProcessInstance | null): GenericEntityProperties => {
+        const name = processInstance?.name;
+        const externalUrl = processInstance?.externalUrl;
+        return {
+            name,
+            externalUrl,
+            platform: processInstance?.dataPlatformInstance?.platform,
+        };
+    };
+
+    renderPreview = (_: PreviewType, data: DataProcessInstance) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        const parentEntities = getParentEntities(data);
+        return (
+            <Preview
+                urn={data.urn}
+                name={data.properties?.name || data.name || ''}
+                subType={data.subTypes?.typeNames?.[0]}
+                description=""
+                platformName={
+                    data?.dataPlatformInstance?.platform?.properties?.displayName ||
+                    capitalizeFirstLetterOnly(data?.dataPlatformInstance?.platform?.name)
+                }
+                platformLogo={data?.dataPlatformInstance?.platform?.properties?.logoUrl}
+                owners={null}
+                globalTags={null}
+                // domain={data.domain?.domain}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                externalUrl={data.properties?.externalUrl}
+                parentContainers={data.parentContainers}
+                parentEntities={parentEntities}
+                container={data.container || undefined}
+                // health={data.health}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        const data = result.entity as DataProcessInstance;
+        const genericProperties = this.getGenericEntityProperties(data);
+        const parentEntities = getParentEntities(data);
+        return (
+            <Preview
+                urn={data.urn}
+                name={data.properties?.name || data.name || ''}
+                subType={data.subTypes?.typeNames?.[0]}
+                description=""
+                platformName={
+                    data?.dataPlatformInstance?.platform?.properties?.displayName ||
+                    capitalizeFirstLetterOnly(data?.dataPlatformInstance?.platform?.name)
+                }
+                platformLogo={data.dataPlatformInstance?.platform?.properties?.logoUrl}
+                platformInstanceId={data.dataPlatformInstance?.instanceId}
+                owners={null}
+                globalTags={null}
+                //                domain={data.domain?.domain}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                //                deprecation={data.deprecation}
+                insights={result.insights}
+                externalUrl={data.properties?.externalUrl}
+                degree={(result as any).degree}
+                paths={(result as any).paths}
+                parentContainers={data.parentContainers}
+                parentEntities={parentEntities}
+                container={data.container || undefined}
+                // duration={data?.state?.[0]?.durationMillis}
+                // status={data?.state?.[0]?.result?.resultType}
+                // startTime={data?.state?.[0]?.timestampMillis}
+                //                health={data.health}
+            />
+        );
+    };
+
+    getLineageVizConfig = (entity: DataProcessInstance) => {
+        return {
+            urn: entity?.urn,
+            name: this.displayName(entity),
+            type: EntityType.DataProcessInstance,
+            subtype: entity?.subTypes?.typeNames?.[0],
+            icon: entity?.dataPlatformInstance?.platform?.properties?.logoUrl || undefined,
+            platform: entity?.dataPlatformInstance?.platform,
+            container: entity?.container,
+            //            health: entity?.health || undefined,
+        };
+    };
+
+    displayName = (data: DataProcessInstance) => {
+        return data.properties?.name || data.urn;
+    };
+
+    getGenericEntityProperties = (data: DataProcessInstance) => {
+        return getDataForEntityType({
+            data,
+            entityType: this.type,
+            getOverrideProperties: this.getOverridePropertiesFromEntity,
+        });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([
+            EntityCapabilityType.OWNERS,
+            EntityCapabilityType.GLOSSARY_TERMS,
+            EntityCapabilityType.TAGS,
+            EntityCapabilityType.DOMAINS,
+            EntityCapabilityType.DEPRECATION,
+            EntityCapabilityType.SOFT_DELETE,
+            EntityCapabilityType.DATA_PRODUCTS,
+        ]);
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/dataProcessInstance/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/dataProcessInstance/preview/Preview.tsx
new file mode 100644
index 00000000000000..3a3b0340695d96
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataProcessInstance/preview/Preview.tsx
@@ -0,0 +1,103 @@
+import React from 'react';
+import {
+    DataProduct,
+    Deprecation,
+    Domain,
+    Entity as GeneratedEntity,
+    EntityPath,
+    EntityType,
+    GlobalTags,
+    Health,
+    Owner,
+    SearchInsight,
+    Container,
+    ParentContainersResult,
+} from '../../../../types.generated';
+import DefaultPreviewCard from '../../../preview/DefaultPreviewCard';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { IconStyleType } from '../../Entity';
+
+export const Preview = ({
+    urn,
+    name,
+    subType,
+    description,
+    platformName,
+    platformLogo,
+    platformInstanceId,
+    container,
+    owners,
+    domain,
+    dataProduct,
+    deprecation,
+    globalTags,
+    snippet,
+    insights,
+    externalUrl,
+    degree,
+    paths,
+    health,
+    parentEntities,
+    parentContainers,
+}: // duration,
+// status,
+// startTime,
+{
+    urn: string;
+    name: string;
+    subType?: string | null;
+    description?: string | null;
+    platformName?: string;
+    platformLogo?: string | null;
+    platformInstanceId?: string;
+    container?: Container;
+    owners?: Array<Owner> | null;
+    domain?: Domain | null;
+    dataProduct?: DataProduct | null;
+    deprecation?: Deprecation | null;
+    globalTags?: GlobalTags | null;
+    snippet?: React.ReactNode | null;
+    insights?: Array<SearchInsight> | null;
+    externalUrl?: string | null;
+    degree?: number;
+    paths?: EntityPath[];
+    health?: Health[] | null;
+    parentEntities?: Array<GeneratedEntity> | null;
+    parentContainers?: ParentContainersResult | null;
+    // duration?: number | null;
+    // status?: string | null;
+    // startTime?: number | null;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    return (
+        <DefaultPreviewCard
+            url={entityRegistry.getEntityUrl(EntityType.DataProcessInstance, urn)}
+            name={name}
+            urn={urn}
+            description={description || ''}
+            type={subType || 'Process Instance'}
+            typeIcon={entityRegistry.getIcon(EntityType.DataProcessInstance, 14, IconStyleType.ACCENT)}
+            platform={platformName || undefined}
+            logoUrl={platformLogo || undefined}
+            platformInstanceId={platformInstanceId}
+            container={container}
+            parentContainers={parentContainers}
+            owners={owners}
+            tags={globalTags || undefined}
+            domain={domain}
+            dataProduct={dataProduct}
+            snippet={snippet}
+            deprecation={deprecation}
+            dataTestID="process-instance-item-preview"
+            insights={insights}
+            externalUrl={externalUrl}
+            degree={degree}
+            paths={paths}
+            health={health || undefined}
+            parentEntities={parentEntities}
+            // duration={duration}
+            // status={status}
+            // startTime={startTime}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/dataProduct/AddOutputPortCard.tsx b/datahub-web-react/src/app/entityV2/dataProduct/AddOutputPortCard.tsx
new file mode 100644
index 00000000000000..e6e3af90227b36
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataProduct/AddOutputPortCard.tsx
@@ -0,0 +1,23 @@
+import { PlusOutlined } from '@ant-design/icons';
+import React from 'react';
+import styled from 'styled-components';
+import { Card } from '../../sharedV2/cards/components';
+import { REDESIGN_COLORS } from '../shared/constants';
+
+const DataProductTitle = styled.div`
+    font-size: 16px;
+    font-weight: 400;
+    color: ${REDESIGN_COLORS.BLUE};
+    padding: 10px 14px;
+`;
+
+export default function AddOutputPortCard() {
+    return (
+        <Card>
+            <DataProductTitle>
+                <PlusOutlined style={{ marginRight: 4 }} />
+                Add Output Port
+            </DataProductTitle>
+        </Card>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataProduct/AssetsSections.tsx b/datahub-web-react/src/app/entityV2/dataProduct/AssetsSections.tsx
new file mode 100644
index 00000000000000..b2ac5adeac5816
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataProduct/AssetsSections.tsx
@@ -0,0 +1,95 @@
+import { Button } from 'antd';
+import React from 'react';
+import { useHistory } from 'react-router';
+import { AppstoreOutlined } from '@ant-design/icons';
+import styled from 'styled-components';
+import { useListDataProductAssetsQuery } from '../../../graphql/search.generated';
+import { pluralize } from '../../shared/textUtil';
+import { EntityCountCard } from '../../sharedV2/cards/EntityCountCard';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import ContentSectionLoading from '../domain/summary/ContentSectionLoading';
+import { useEntityData } from '../../entity/shared/EntityContext';
+import {
+    getContentsSummary,
+    getDomainEntitiesFilterUrl,
+    navigateToDomainEntities,
+} from '../shared/containers/profile/sidebar/Domain/utils';
+import { SummaryTabHeaderTitle, SummaryTabHeaderWrapper } from '../shared/summary/HeaderComponents';
+import { HorizontalList } from '../shared/summary/ListComponents';
+import { getContentTypeIcon } from '../shared/summary/IconComponents';
+
+const AssetsSectionWrapper = styled.div`
+    flex: 1;
+    min-width: 100px;
+`;
+
+export const StyledHeaderWrapper = styled(SummaryTabHeaderWrapper)`
+    margin-bottom: 8px;
+`;
+
+export const AssetsSection = () => {
+    const history = useHistory();
+    const entityRegistry = useEntityRegistry();
+    const { urn, entityType } = useEntityData();
+    const { data, loading } = useListDataProductAssetsQuery({
+        variables: {
+            urn,
+            input: {
+                query: '*',
+                start: 0,
+                count: 0,
+                filters: [],
+            },
+        },
+    });
+
+    const contentsSummary = data?.listDataProductAssets && getContentsSummary(data.listDataProductAssets);
+    const contentsCount = contentsSummary?.total || 0;
+    const hasContents = contentsCount > 0;
+
+    if (!hasContents) {
+        return null;
+    }
+
+    return (
+        <AssetsSectionWrapper>
+            <StyledHeaderWrapper>
+                <SummaryTabHeaderTitle icon={<AppstoreOutlined />} title={`Assets (${contentsCount})`} />
+                <Button type="link" onClick={() => navigateToDomainEntities(urn, entityType, history, entityRegistry)}>
+                    View all
+                </Button>
+            </StyledHeaderWrapper>
+            {loading && <ContentSectionLoading />}
+
+            <HorizontalList>
+                {!loading &&
+                    contentsSummary?.types.map((summary) => {
+                        const { type, count, entityType: summaryEntityType } = summary;
+                        const typeName = (
+                            type ||
+                            entityRegistry.getEntityName(summaryEntityType) ||
+                            summaryEntityType
+                        ).toLocaleLowerCase();
+                        const link = getDomainEntitiesFilterUrl(
+                            urn,
+                            entityType,
+                            entityRegistry,
+                            [summary.entityType],
+                            summary.type ? [summary.type] : undefined,
+                        );
+                        return (
+                            <EntityCountCard
+                                key={typeName}
+                                type={typeName}
+                                name={typeName}
+                                count={summary.count}
+                                icon={getContentTypeIcon(entityRegistry, summary.entityType, summary.type)}
+                                tooltipDescriptor={pluralize(count, typeName)}
+                                link={link}
+                            />
+                        );
+                    })}
+            </HorizontalList>
+        </AssetsSectionWrapper>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/dataProduct/DataProductEntitiesTab.tsx b/datahub-web-react/src/app/entityV2/dataProduct/DataProductEntitiesTab.tsx
new file mode 100644
index 00000000000000..2b7d32c0d0662f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataProduct/DataProductEntitiesTab.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { useEntityData } from '../../entity/shared/EntityContext';
+import { EmbeddedListSearchSection } from '../shared/components/styled/search/EmbeddedListSearchSection';
+import generateUseListDataProductAssets from './generateUseListDataProductAssets';
+import { SearchCardContext } from '../shared/SearchCardContext';
+import { generateUseListDataProductAssetsCount } from './generateUseListDataProductAssetsCount';
+
+export function DataProductEntitiesTab() {
+    const { urn } = useEntityData();
+
+    return (
+        <SearchCardContext.Provider value={{ showRemovalFromList: true }}>
+            <EmbeddedListSearchSection
+                useGetSearchResults={generateUseListDataProductAssets({ urn })}
+                useGetSearchCountResult={generateUseListDataProductAssetsCount({ urn })}
+                emptySearchQuery="*"
+                placeholderText="Filter assets..."
+                skipCache
+                applyView
+            />
+        </SearchCardContext.Provider>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataProduct/DataProductEntity.tsx b/datahub-web-react/src/app/entityV2/dataProduct/DataProductEntity.tsx
new file mode 100644
index 00000000000000..a8d904e476dda6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataProduct/DataProductEntity.tsx
@@ -0,0 +1,268 @@
+import {
+    AppstoreOutlined,
+    FileDoneOutlined,
+    FileOutlined,
+    ReadOutlined,
+    UnorderedListOutlined,
+} from '@ant-design/icons';
+import * as React from 'react';
+import { useGetDataProductQuery } from '../../../graphql/dataProduct.generated';
+import { GetDatasetQuery } from '../../../graphql/dataset.generated';
+import { DataProduct, EntityType, SearchResult } from '../../../types.generated';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions';
+import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+import { EntityProfileTab } from '../shared/constants';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
+import { SidebarViewDefinitionSection } from '../shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection';
+import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection';
+import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
+import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader';
+import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection';
+import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection';
+import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import { EntityActionItem } from '../shared/entity/EntityActions';
+import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties';
+import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab';
+import TabNameWithCount from '../shared/tabs/Entity/TabNameWithCount';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+import { DataProductEntitiesTab } from './DataProductEntitiesTab';
+import { DataProductSummaryTab } from './DataProductSummaryTab';
+import { Preview } from './preview/Preview';
+import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection';
+
+const headerDropdownItems = new Set([
+    EntityMenuItems.SHARE,
+    EntityMenuItems.DELETE,
+    EntityMenuItems.EDIT,
+    EntityMenuItems.ANNOUNCE,
+]);
+
+/**
+ * Definition of the DataHub Data Product entity.
+ */
+export class DataProductEntity implements Entity<DataProduct> {
+    type: EntityType = EntityType.DataProduct;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <FileDoneOutlined className={TYPE_ICON_CLASS_NAME} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return (
+                <FileDoneOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color: color || '#B37FEB' }} />
+            );
+        }
+
+        if (styleType === IconStyleType.SVG) {
+            return (
+                <path d="M832 64H192c-17.7 0-32 14.3-32 32v832c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V96c0-17.7-14.3-32-32-32zm-600 72h560v208H232V136zm560 480H232V408h560v208zm0 272H232V680h560v208zM304 240a40 40 0 1080 0 40 40 0 10-80 0zm0 272a40 40 0 1080 0 40 40 0 10-80 0zm0 272a40 40 0 1080 0 40 40 0 10-80 0z" />
+            );
+        }
+
+        return (
+            <FileDoneOutlined
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => true;
+
+    isLineageEnabled = () => false;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getPathName = () => 'dataProduct';
+
+    getEntityName = () => 'Data Product';
+
+    getCollectionName = () => 'Data Products';
+
+    useEntityQuery = useGetDataProductQuery;
+
+    renderProfile = (urn: string) => (
+        <EntityProfile
+            urn={urn}
+            entityType={EntityType.DataProduct}
+            useEntityQuery={useGetDataProductQuery}
+            useUpdateQuery={undefined}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+            headerActionItems={new Set([EntityActionItem.BATCH_ADD_DATA_PRODUCT])}
+            headerDropdownItems={headerDropdownItems}
+            isNameEditable
+            tabs={[
+                {
+                    id: EntityProfileTab.SUMMARY_TAB,
+                    name: 'Summary',
+                    component: DataProductSummaryTab,
+                    icon: ReadOutlined,
+                },
+                {
+                    name: 'Documentation',
+                    component: DocumentationTab,
+                    icon: FileOutlined,
+                },
+                {
+                    name: 'Assets',
+                    getDynamicName: (entityData, _, loading) => {
+                        const assetCount = entityData?.entities?.total;
+                        return <TabNameWithCount name="Assets" count={assetCount} loading={loading} />;
+                    },
+                    component: DataProductEntitiesTab,
+                    icon: AppstoreOutlined,
+                },
+                {
+                    name: 'Properties',
+                    component: PropertiesTab,
+                    icon: UnorderedListOutlined,
+                },
+            ]}
+            sidebarSections={this.getSidebarSections()}
+            sidebarTabs={this.getSidebarTabs()}
+        />
+    );
+
+    getSidebarSections = () => [
+        {
+            component: SidebarEntityHeader,
+        },
+        {
+            component: SidebarAboutSection,
+        },
+        {
+            component: SidebarNotesSection,
+        },
+        {
+            component: SidebarOwnerSection,
+        },
+        {
+            component: SidebarDomainSection,
+            properties: {
+                updateOnly: true,
+            },
+        },
+        // TODO: Is someone actually using the below code?
+        {
+            component: SidebarViewDefinitionSection,
+            display: {
+                // to do - change when we have a GetDataProductQuery
+                visible: (_, dataset: GetDatasetQuery) => (dataset?.dataset?.viewProperties?.logic && true) || false,
+            },
+        },
+        {
+            component: SidebarTagsSection,
+        },
+        {
+            component: SidebarGlossaryTermsSection,
+        },
+        {
+            component: StatusSection,
+        },
+        {
+            component: SidebarStructuredProperties,
+        },
+    ];
+
+    getSidebarTabs = () => [
+        {
+            name: 'Properties',
+            component: PropertiesTab,
+            description: 'View additional properties about this asset',
+            icon: UnorderedListOutlined,
+        },
+    ];
+
+    renderPreview = (previewType: PreviewType, data: DataProduct, actions) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <Preview
+                urn={data.urn}
+                data={genericProperties}
+                name={data.properties?.name || ''}
+                description={data.properties?.description}
+                owners={data.ownership?.owners}
+                globalTags={data.tags}
+                glossaryTerms={data.glossaryTerms}
+                domain={data.domain?.domain}
+                entityCount={data?.entities?.total || undefined}
+                externalUrl={data.properties?.externalUrl}
+                headerDropdownItems={headerDropdownItems}
+                previewType={previewType}
+                actions={actions}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        const data = result.entity as DataProduct;
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <Preview
+                urn={data.urn}
+                data={genericProperties}
+                name={data.properties?.name || ''}
+                description={data.properties?.description}
+                owners={data.ownership?.owners}
+                globalTags={data.tags}
+                glossaryTerms={data.glossaryTerms}
+                domain={data.domain?.domain}
+                entityCount={data?.entities?.total || undefined}
+                externalUrl={data.properties?.externalUrl}
+                degree={(result as any).degree}
+                paths={(result as any).paths}
+                headerDropdownItems={headerDropdownItems}
+            />
+        );
+    };
+
+    displayName = (data: DataProduct) => {
+        return data?.properties?.name || data.urn;
+    };
+
+    getOverridePropertiesFromEntity = (data: DataProduct) => {
+        const name = data?.properties?.name;
+        const externalUrl = data?.properties?.externalUrl;
+        const entityCount = data?.entities?.total || undefined;
+        const parentDomains = {
+            domains: (data?.domain && [data?.domain?.domain]) || [],
+            count: (data?.domain && 1) || 0,
+        };
+        return {
+            name,
+            externalUrl,
+            entityCount,
+            parentDomains,
+        };
+    };
+
+    getGenericEntityProperties = (data: DataProduct) => {
+        return getDataForEntityType({
+            data,
+            entityType: this.type,
+            getOverrideProperties: this.getOverridePropertiesFromEntity,
+        });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([
+            EntityCapabilityType.OWNERS,
+            EntityCapabilityType.GLOSSARY_TERMS,
+            EntityCapabilityType.TAGS,
+            EntityCapabilityType.DOMAINS,
+        ]);
+    };
+
+    getGraphName = () => {
+        return 'dataProduct';
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/dataProduct/DataProductSummaryTab.tsx b/datahub-web-react/src/app/entityV2/dataProduct/DataProductSummaryTab.tsx
new file mode 100644
index 00000000000000..b35b8ce99c80c7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataProduct/DataProductSummaryTab.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import { SummaryTabWrapper } from '../shared/summary/HeaderComponents';
+import SummaryAboutSection from '../shared/summary/SummaryAboutSection';
+import { AssetsSection } from './AssetsSections';
+import { OutputPortsSection } from './OutputPortsSection';
+
+export const DataProductSummaryTab = () => {
+    return (
+        <SummaryTabWrapper>
+            <OutputPortsSection />
+            <AssetsSection />
+            <SummaryAboutSection />
+        </SummaryTabWrapper>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/dataProduct/OutputPortsSection.tsx b/datahub-web-react/src/app/entityV2/dataProduct/OutputPortsSection.tsx
new file mode 100644
index 00000000000000..99362ea4bd2f45
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataProduct/OutputPortsSection.tsx
@@ -0,0 +1,112 @@
+import React, { useEffect, useState } from 'react';
+import RefreshIcon from '@mui/icons-material/Refresh';
+import OutputIcon from '@mui/icons-material/Output';
+import styled from 'styled-components';
+import { useListDataProductAssetsLazyQuery, useListDataProductAssetsQuery } from '../../../graphql/search.generated';
+import { useEntityData } from '../../entity/shared/EntityContext';
+import { SummaryTabHeaderTitle } from '../shared/summary/HeaderComponents';
+import { HorizontalList } from '../shared/summary/ListComponents';
+import { SCREEN_WIDTH_BREAK_POINT } from './constants';
+import { Card } from '../../sharedV2/cards/components';
+// import AddOutputPortCard from './AddOutputPortCard';
+import { StyledHeaderWrapper } from './AssetsSections';
+import { SearchResult } from '../../../types.generated';
+import { ANTD_GRAY } from '../shared/constants';
+import { OUTPUT_PORTS_FIELD } from '../../search/utils/constants';
+import SummaryEntityCard from '../../sharedV2/cards/SummaryEntityCard';
+
+const OutputPortsWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    min-width: 100px;
+    @media (max-width: ${SCREEN_WIDTH_BREAK_POINT}px) {
+        margin: 16px 0 0 0;
+    }
+`;
+
+const StyledHorizontalList = styled(HorizontalList)`
+    flex: 1;
+`;
+
+const LoadMoreButton = styled(Card)`
+    font-size: 16px;
+    font-weight: 400;
+    font-family: Mulish;
+    padding: 10px 14px;
+    color: ${ANTD_GRAY[8]};
+`;
+
+const COUNT = 10;
+
+export const OutputPortsSection = () => {
+    const [additionalResults, setAdditionalResults] = useState<SearchResult[]>([]);
+    const [hasFetchedNewData, setHasFetchedNewData] = useState(false);
+    const [start, setStart] = useState(0);
+    const { urn } = useEntityData();
+    const [listDataProductAssets, { data: additionalData }] = useListDataProductAssetsLazyQuery();
+    const variables = {
+        urn,
+        input: {
+            query: '*',
+            start: 0,
+            count: COUNT,
+            filters: [{ field: OUTPUT_PORTS_FIELD, value: 'true' }], // we use this filter hardcoded in list data product assets resolver
+        },
+    };
+
+    const { data, loading } = useListDataProductAssetsQuery({ variables });
+    const numResults = data?.listDataProductAssets?.total;
+    const showLoadMoreButton = (numResults || 0) > start + COUNT;
+    const finalResults = [...(data?.listDataProductAssets?.searchResults || []), ...additionalResults];
+
+    function loadMore() {
+        const newStart = start + COUNT;
+        listDataProductAssets({
+            variables: {
+                ...variables,
+                input: {
+                    ...variables.input,
+                    start: newStart,
+                },
+            },
+        });
+        setStart(newStart);
+        setHasFetchedNewData(true);
+    }
+
+    useEffect(() => {
+        if (additionalData && additionalData.listDataProductAssets?.searchResults && hasFetchedNewData) {
+            setAdditionalResults([...additionalResults, ...additionalData.listDataProductAssets.searchResults]);
+            setHasFetchedNewData(false);
+        }
+    }, [additionalData, additionalResults, hasFetchedNewData]);
+
+    if (!data || !finalResults?.length) return null;
+
+    return (
+        <OutputPortsWrapper>
+            <StyledHeaderWrapper>
+                <SummaryTabHeaderTitle
+                    icon={<OutputIcon style={{ fontSize: 16, color: ANTD_GRAY[8] }} />}
+                    title={`Output Ports (${numResults})`}
+                />
+            </StyledHeaderWrapper>
+            <StyledHorizontalList>
+                {!loading &&
+                    finalResults.map((searchResult) => {
+                        const { entity } = searchResult;
+                        return <SummaryEntityCard key={entity.urn} entity={entity} />;
+                    })}
+                {showLoadMoreButton && (
+                    <LoadMoreButton onClick={loadMore}>
+                        <RefreshIcon style={{ marginRight: 4 }} />
+                        Load more
+                    </LoadMoreButton>
+                )}
+                {/* KEEPING THIS COMMENTED UNTIL DESIGN IS READY FOR OUTPUT PORT */}
+                {/* <AddOutputPortCard /> */}
+            </StyledHorizontalList>
+        </OutputPortsWrapper>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/dataProduct/constants.ts b/datahub-web-react/src/app/entityV2/dataProduct/constants.ts
new file mode 100644
index 00000000000000..821271a7c01f19
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataProduct/constants.ts
@@ -0,0 +1 @@
+export const SCREEN_WIDTH_BREAK_POINT = 1300;
diff --git a/datahub-web-react/src/app/entityV2/dataProduct/generateUseListDataProductAssets.ts b/datahub-web-react/src/app/entityV2/dataProduct/generateUseListDataProductAssets.ts
new file mode 100644
index 00000000000000..9063c3de1933b1
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataProduct/generateUseListDataProductAssets.ts
@@ -0,0 +1,23 @@
+import { useListDataProductAssetsQuery } from '../../../graphql/search.generated';
+import { GetSearchResultsParams } from '../shared/components/styled/search/types';
+
+export default function generateUseListDataProductAssets({ urn }: { urn: string }) {
+    return (params: GetSearchResultsParams) => {
+        const {
+            variables: { input },
+        } = params;
+
+        const { data, loading, error, refetch } = useListDataProductAssetsQuery({
+            variables: { urn, input },
+        });
+
+        return {
+            data: data?.listDataProductAssets,
+            loading,
+            error,
+            refetch: (refetchParams: GetSearchResultsParams['variables']) => {
+                return refetch({ urn, input: refetchParams.input }).then((res) => res.data.listDataProductAssets);
+            },
+        };
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/dataProduct/generateUseListDataProductAssetsCount.ts b/datahub-web-react/src/app/entityV2/dataProduct/generateUseListDataProductAssetsCount.ts
new file mode 100644
index 00000000000000..4790a2d437ad45
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataProduct/generateUseListDataProductAssetsCount.ts
@@ -0,0 +1,16 @@
+import { useListDataProductAssetsQuery } from '@src/graphql/search.generated';
+import { GetSearchResultsParams } from '@src/app/entity/shared/components/styled/search/types';
+
+export function generateUseListDataProductAssetsCount({ urn }: { urn: string }) {
+    return function useListDataProductAssetsCount({ variables: { input } }: GetSearchResultsParams) {
+        const { data, loading, error } = useListDataProductAssetsQuery({
+            variables: {
+                urn,
+                input: { ...input, count: 0 },
+            },
+            fetchPolicy: 'cache-first',
+        });
+
+        return { total: data?.listDataProductAssets?.total, loading, error };
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/dataProduct/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/dataProduct/preview/Preview.tsx
new file mode 100644
index 00000000000000..d29e4bb6baaa26
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataProduct/preview/Preview.tsx
@@ -0,0 +1,70 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import React from 'react';
+import { EntityType, Owner, GlobalTags, GlossaryTerms, Domain, EntityPath } from '../../../../types.generated';
+import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { EntityMenuActions, IconStyleType, PreviewType } from '../../Entity';
+import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions';
+
+interface Props {
+    urn: string;
+    data: GenericEntityProperties | null;
+    name: string;
+    description?: string | null;
+    owners?: Array<Owner> | null;
+    domain?: Domain | null;
+    globalTags?: GlobalTags | null;
+    glossaryTerms?: GlossaryTerms | null;
+    entityCount?: number;
+    externalUrl?: string | null;
+    degree?: number;
+    paths?: EntityPath[];
+    headerDropdownItems?: Set<EntityMenuItems>;
+    previewType?: PreviewType;
+    actions?: EntityMenuActions;
+}
+
+export const Preview = ({
+    urn,
+    data,
+    name,
+    description,
+    owners,
+    globalTags,
+    domain,
+    glossaryTerms,
+    entityCount,
+    externalUrl,
+    degree,
+    paths,
+    headerDropdownItems,
+    previewType,
+    actions,
+}: Props): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+
+    return (
+        <DefaultPreviewCard
+            url={entityRegistry.getEntityUrl(EntityType.DataProduct, urn)}
+            name={name || ''}
+            urn={urn}
+            data={data}
+            description={description || ''}
+            entityType={EntityType.DataProduct}
+            typeIcon={entityRegistry.getIcon(EntityType.DataProduct, 12, IconStyleType.ACCENT)}
+            qualifier={origin}
+            tags={globalTags || undefined}
+            owners={owners}
+            domain={domain}
+            parentEntities={domain ? [domain] : []}
+            glossaryTerms={glossaryTerms || undefined}
+            entityCount={entityCount}
+            externalUrl={externalUrl}
+            degree={degree}
+            paths={paths}
+            headerDropdownItems={headerDropdownItems}
+            previewType={previewType}
+            actions={actions}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/dataset/DatasetEntity.tsx b/datahub-web-react/src/app/entityV2/dataset/DatasetEntity.tsx
new file mode 100644
index 00000000000000..2257940158afa1
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/DatasetEntity.tsx
@@ -0,0 +1,517 @@
+import {
+    CheckCircleOutlined,
+    CodeOutlined,
+    ConsoleSqlOutlined,
+    EyeOutlined,
+    FileOutlined,
+    FundOutlined,
+    LayoutOutlined,
+    PartitionOutlined,
+    UnlockOutlined,
+    UnorderedListOutlined,
+    WarningOutlined,
+} from '@ant-design/icons';
+import { DBT_URN } from '@app/ingest/source/builder/constants';
+import ViewComfyOutlinedIcon from '@mui/icons-material/ViewComfyOutlined';
+import { GovernanceTab } from '@src/app/entity/shared/tabs/Dataset/Governance/GovernanceTab';
+import * as React from 'react';
+import { GetDatasetQuery, useGetDatasetQuery, useUpdateDatasetMutation } from '../../../graphql/dataset.generated';
+import GovernMenuIcon from '../../../images/governMenuIcon.svg?react';
+import { Dataset, DatasetProperties, EntityType, FeatureFlagsConfig, SearchResult } from '../../../types.generated';
+import { GenericEntityProperties } from '../../entity/shared/types';
+import { MatchedFieldList } from '../../searchV2/matches/MatchedFieldList';
+import { matchedFieldPathsRenderer } from '../../searchV2/matches/matchedFieldPathsRenderer';
+import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
+import { useAppConfig } from '../../useAppConfig';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions';
+import { SubType, TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
+import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection';
+import SidebarDatasetHeaderSection from '../shared/containers/profile/sidebar/Dataset/Header/SidebarDatasetHeaderSection';
+import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection';
+import SidebarLineageSection from '../shared/containers/profile/sidebar/Lineage/SidebarLineageSection';
+import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
+import SidebarQueryOperationsSection from '../shared/containers/profile/sidebar/Query/SidebarQueryOperationsSection';
+import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader';
+import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection';
+import { SidebarDatasetViewDefinitionSection } from '../shared/containers/profile/sidebar/SidebarLogicSection';
+import { SidebarSiblingsSection } from '../shared/containers/profile/sidebar/SidebarSiblingsSection';
+import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection';
+import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import EmbeddedProfile from '../shared/embed/EmbeddedProfile';
+import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection';
+import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties';
+import AccessManagement from '../shared/tabs/Dataset/AccessManagement/AccessManagement';
+import QueriesTab from '../shared/tabs/Dataset/Queries/QueriesTab';
+import { SchemaTab } from '../shared/tabs/Dataset/Schema/SchemaTab';
+import { AcrylValidationsTab } from '../shared/tabs/Dataset/Validations/AcrylValidationsTab';
+import ViewDefinitionTab from '../shared/tabs/Dataset/View/ViewDefinitionTab';
+import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab';
+import { EmbedTab } from '../shared/tabs/Embed/EmbedTab';
+import ColumnTabNameHeader from '../shared/tabs/Entity/ColumnTabNameHeader';
+import TabNameWithCount from '../shared/tabs/Entity/TabNameWithCount';
+import { IncidentTab } from '../shared/tabs/Incident/IncidentTab';
+import { LineageTab } from '../shared/tabs/Lineage/LineageTab';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+import { SidebarTitleActionType, getDataProduct, getDatasetLastUpdatedMs, isOutputPort } from '../shared/utils';
+import { Preview } from './preview/Preview';
+import { OperationsTab } from './profile/OperationsTab';
+import { DatasetStatsSummarySubHeader } from './profile/stats/stats/DatasetStatsSummarySubHeader';
+import StatsTab from '../shared/tabs/Dataset/Stats/StatsTab';
+
+const SUBTYPES = {
+    VIEW: 'view',
+};
+
+const headerDropdownItems = new Set([
+    EntityMenuItems.EXTERNAL_URL,
+    EntityMenuItems.SHARE,
+    EntityMenuItems.UPDATE_DEPRECATION,
+    EntityMenuItems.RAISE_INCIDENT,
+    EntityMenuItems.ANNOUNCE,
+]);
+
+/**
+ * Definition of the DataHub Dataset entity.
+ */
+export class DatasetEntity implements Entity<Dataset> {
+    type: EntityType = EntityType.Dataset;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <ViewComfyOutlinedIcon className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return (
+                <ViewComfyOutlinedIcon
+                    className={TYPE_ICON_CLASS_NAME}
+                    style={{ fontSize, color: color || '#B37FEB' }}
+                />
+            );
+        }
+
+        if (styleType === IconStyleType.SVG) {
+            return <path d="M2 4v16h20V4zm2 2h16v5H4zm0 12v-5h4v5zm6 0v-5h10v5z" />;
+        }
+
+        return (
+            <ViewComfyOutlinedIcon
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    appconfig = useAppConfig;
+
+    isBrowseEnabled = () => true;
+
+    isLineageEnabled = () => true;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getGraphName = () => 'dataset';
+
+    getPathName = () => this.getGraphName();
+
+    getEntityName = () => 'Dataset';
+
+    getCollectionName = () => 'Datasets';
+
+    useEntityQuery = useGetDatasetQuery;
+
+    renderProfile = (urn: string) => (
+        <EntityProfile
+            urn={urn}
+            entityType={EntityType.Dataset}
+            useEntityQuery={useGetDatasetQuery}
+            useUpdateQuery={useUpdateDatasetMutation}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+            headerDropdownItems={headerDropdownItems}
+            subHeader={{
+                component: DatasetStatsSummarySubHeader,
+            }}
+            tabs={[
+                {
+                    name: 'Columns',
+                    component: SchemaTab,
+                    icon: LayoutOutlined,
+                    getDynamicName: ColumnTabNameHeader,
+                },
+                {
+                    name: 'View Definition',
+                    component: ViewDefinitionTab,
+                    icon: CodeOutlined,
+                    display: {
+                        visible: (_, dataset: GetDatasetQuery) =>
+                            !!dataset?.dataset?.viewProperties?.logic ||
+                            !!dataset?.dataset?.subTypes?.typeNames
+                                ?.map((t) => t.toLocaleLowerCase())
+                                .includes(SUBTYPES.VIEW.toLocaleLowerCase()),
+                        enabled: (_, dataset: GetDatasetQuery) => !!dataset?.dataset?.viewProperties?.logic,
+                    },
+                },
+                {
+                    name: 'Documentation',
+                    component: DocumentationTab,
+                    icon: FileOutlined,
+                },
+                {
+                    name: 'Preview',
+                    component: EmbedTab,
+                    icon: EyeOutlined,
+                    display: {
+                        visible: (_, dataset: GetDatasetQuery) => !!dataset?.dataset?.embed?.renderUrl,
+                        enabled: (_, dataset: GetDatasetQuery) => !!dataset?.dataset?.embed?.renderUrl,
+                    },
+                },
+                {
+                    name: 'Lineage',
+                    component: LineageTab,
+                    icon: PartitionOutlined,
+                },
+                {
+                    name: 'Properties',
+                    component: PropertiesTab,
+                    icon: UnorderedListOutlined,
+                    getDynamicName: (_, dataset: GetDatasetQuery, loading) => {
+                        const customPropertiesCount = dataset?.dataset?.properties?.customProperties?.length || 0;
+                        const structuredPropertiesCount =
+                            dataset?.dataset?.structuredProperties?.properties?.length || 0;
+                        const propertiesCount = customPropertiesCount + structuredPropertiesCount;
+                        return <TabNameWithCount name="Properties" count={propertiesCount} loading={loading} />;
+                    },
+                },
+                {
+                    name: 'Queries',
+                    component: QueriesTab,
+                    icon: ConsoleSqlOutlined,
+                    display: {
+                        visible: (_, _1) => true,
+                        enabled: (_, _2) => true,
+                    },
+                },
+                {
+                    name: 'Stats',
+                    component: StatsTab,
+                    icon: FundOutlined,
+                    display: {
+                        visible: (_, _1) => true,
+                        enabled: (_, dataset: GetDatasetQuery) =>
+                            (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
+                            (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
+                            (dataset?.dataset?.usageStats?.buckets?.length || 0) > 0 ||
+                            (dataset?.dataset?.operations?.length || 0) > 0,
+                    },
+                },
+                {
+                    name: 'Quality',
+                    component: AcrylValidationsTab, // Use SaaS specific Validations Tab.
+                    icon: CheckCircleOutlined,
+                },
+                {
+                    name: 'Governance',
+                    icon: () => (
+                        <span
+                            style={{
+                                marginRight: 6,
+                                verticalAlign: '-0.2em',
+                            }}
+                        >
+                            <GovernMenuIcon width={16} height={16} fill="currentColor" />
+                        </span>
+                    ),
+                    component: GovernanceTab,
+                },
+                {
+                    name: 'Runs', // TODO: Rename this to DatasetRunsTab.
+                    component: OperationsTab,
+                    display: {
+                        visible: (_, dataset: GetDatasetQuery) => {
+                            return (dataset?.dataset?.runs?.total || 0) > 0;
+                        },
+                        enabled: (_, dataset: GetDatasetQuery) => {
+                            return (dataset?.dataset?.runs?.total || 0) > 0;
+                        },
+                    },
+                },
+                {
+                    name: 'Access Management',
+                    component: AccessManagement,
+                    icon: UnlockOutlined,
+                    display: {
+                        visible: (_, _1) => this.appconfig().config.featureFlags.showAccessManagement,
+                        enabled: (_, _2) => true,
+                    },
+                },
+                {
+                    name: 'Incidents',
+                    icon: WarningOutlined,
+                    component: IncidentTab,
+                    getDynamicName: (_, dataset, loading) => {
+                        const activeIncidentCount = dataset?.dataset?.activeIncidents?.total;
+                        return <TabNameWithCount name="Incidents" count={activeIncidentCount} loading={loading} />;
+                    },
+                },
+            ]}
+            sidebarSections={this.getSidebarSections()}
+            sidebarTabs={this.getSidebarTabs()}
+        />
+    );
+
+    getSidebarSections = () => [
+        { component: SidebarEntityHeader },
+        { component: SidebarDatasetHeaderSection },
+        { component: SidebarAboutSection },
+        { component: SidebarNotesSection },
+        { component: SidebarLineageSection },
+        { component: SidebarOwnerSection },
+        { component: SidebarDomainSection },
+        { component: DataProductSection },
+        { component: SidebarTagsSection },
+        { component: SidebarGlossaryTermsSection },
+        {
+            component: SidebarSiblingsSection,
+            display: {
+                visible: (_, dataset: GetDatasetQuery) => !!dataset?.dataset?.siblingsSearch?.total,
+            },
+        },
+        { component: SidebarDatasetViewDefinitionSection },
+        { component: SidebarQueryOperationsSection },
+        { component: StatusSection },
+        { component: SidebarStructuredProperties },
+        // {
+        //    component: SidebarRecommendationsSection,
+        // },
+    ];
+
+    getSidebarTabs = () => [
+        {
+            name: 'Lineage',
+            component: LineageTab,
+            description: "View this data asset's upstream and downstream dependencies",
+            icon: PartitionOutlined,
+            properties: {
+                actionType: SidebarTitleActionType.LineageExplore,
+            },
+        },
+        {
+            name: 'Columns',
+            component: SchemaTab,
+            description: "View this data asset's columns",
+            icon: LayoutOutlined,
+            properties: {
+                fullHeight: true,
+            },
+        },
+        {
+            name: 'Properties',
+            component: PropertiesTab,
+            description: 'View additional properties about this asset',
+            icon: UnorderedListOutlined,
+        },
+    ];
+
+    #shouldMergeInLineage(dataset?: Dataset | null, flags?: FeatureFlagsConfig): boolean {
+        // Lineage query must include platform and typeNames on dataset and its sibling
+        return (
+            !!flags?.hideDbtSourceInLineage &&
+            dataset?.platform?.urn === DBT_URN &&
+            !!dataset?.subTypes?.typeNames?.includes(SubType.DbtSource)
+        );
+    }
+
+    getOverridePropertiesFromEntity = (
+        dataset?: Dataset | null,
+        flags?: FeatureFlagsConfig,
+    ): GenericEntityProperties => {
+        // if dataset has subTypes filled out, pick the most specific subtype and return it
+        const subTypes = dataset?.subTypes;
+
+        const extendedProperties: DatasetProperties | undefined | null = dataset?.properties && {
+            ...dataset?.properties,
+            qualifiedName: dataset?.properties?.qualifiedName || this.displayName(dataset),
+        };
+
+        const firstSibling = dataset?.siblingsSearch?.searchResults?.[0]?.entity as Dataset | undefined;
+        const isReplacedBySibling = this.#shouldMergeInLineage(dataset, flags);
+        const isSiblingHidden = this.#shouldMergeInLineage(firstSibling, flags);
+
+        const lineageUrn = isReplacedBySibling ? firstSibling?.urn : undefined;
+        let lineageSiblingIcon: string | undefined;
+        if (isReplacedBySibling) {
+            // Swap lineage urn and show as merged with sibling, extra icon is the original entity icon
+            lineageSiblingIcon = dataset?.platform?.properties?.logoUrl ?? undefined;
+        } else if (isSiblingHidden) {
+            // Same lineage urn but show as merged with sibling, extra icon is the sibling's icon
+            lineageSiblingIcon = firstSibling?.platform?.properties?.logoUrl ?? undefined;
+        }
+        return {
+            name: dataset && this.displayName(dataset),
+            externalUrl: dataset?.properties?.externalUrl,
+            entityTypeOverride: subTypes ? capitalizeFirstLetterOnly(subTypes.typeNames?.[0]) : '',
+            properties: extendedProperties,
+            lineageUrn,
+            lineageSiblingIcon,
+        };
+    };
+
+    renderPreview = (previewType: PreviewType, data: Dataset) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        const platformNames = genericProperties?.siblingPlatforms?.map(
+            (platform) => platform.properties?.displayName || capitalizeFirstLetterOnly(platform.name),
+        );
+        return (
+            <Preview
+                urn={data.urn}
+                data={genericProperties}
+                name={data.properties?.name || data.name}
+                origin={data.origin}
+                subtype={data.subTypes?.typeNames?.[0]}
+                description={data.editableProperties?.description || data.properties?.description}
+                platformName={
+                    data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)
+                }
+                platformNames={platformNames}
+                platformLogo={data.platform.properties?.logoUrl}
+                platformLogos={genericProperties?.siblingPlatforms?.map((platform) => platform.properties?.logoUrl)}
+                platformInstanceId={data.dataPlatformInstance?.instanceId}
+                owners={data.ownership?.owners}
+                globalTags={data.globalTags}
+                glossaryTerms={data.glossaryTerms}
+                domain={data.domain?.domain}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                container={data.container}
+                externalUrl={data.properties?.externalUrl}
+                health={data.health}
+                headerDropdownItems={headerDropdownItems}
+                previewType={previewType}
+                browsePaths={data.browsePathV2 || undefined}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        const data = result.entity as Dataset;
+        const genericProperties = this.getGenericEntityProperties(data);
+        const platformNames = genericProperties?.siblingPlatforms?.map(
+            (platform) => platform.properties?.displayName || capitalizeFirstLetterOnly(platform.name),
+        );
+
+        return (
+            <Preview
+                urn={data.urn}
+                data={genericProperties}
+                name={data.properties?.name || data.name}
+                origin={data.origin}
+                description={data.editableProperties?.description || data.properties?.description}
+                platformName={
+                    platformNames?.[0] ||
+                    data?.platform?.properties?.displayName ||
+                    capitalizeFirstLetterOnly(data?.platform?.name)
+                }
+                platformLogo={data.platform.properties?.logoUrl}
+                platformInstanceId={data.dataPlatformInstance?.instanceId}
+                platformNames={platformNames}
+                platformLogos={genericProperties?.siblingPlatforms?.map((platform) => platform.properties?.logoUrl)}
+                owners={data.ownership?.owners}
+                globalTags={data.globalTags}
+                domain={data.domain?.domain}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                deprecation={data.deprecation}
+                glossaryTerms={data.glossaryTerms}
+                subtype={data.subTypes?.typeNames?.[0]}
+                container={data.container}
+                parentContainers={data.parentContainers}
+                snippet={<MatchedFieldList customFieldRenderer={matchedFieldPathsRenderer} />}
+                insights={result.insights}
+                externalUrl={data.properties?.externalUrl}
+                statsSummary={data.statsSummary}
+                rowCount={(data as any).lastProfile?.length && (data as any).lastProfile[0].rowCount}
+                columnCount={(data as any).lastProfile?.length && (data as any).lastProfile[0].columnCount}
+                lastUpdatedMs={getDatasetLastUpdatedMs(
+                    (data as any).properties,
+                    (data as any).lastOperation?.length && (data as any).lastOperation[0],
+                )}
+                health={data.health}
+                degree={(result as any).degree}
+                paths={(result as any).paths}
+                isOutputPort={isOutputPort(result)}
+                headerDropdownItems={headerDropdownItems}
+                browsePaths={data.browsePathV2 || undefined}
+            />
+        );
+    };
+
+    renderSearchMatches = (_: SearchResult) => {
+        return (
+            <>
+                <MatchedFieldList customFieldRenderer={matchedFieldPathsRenderer} />
+            </>
+        );
+    };
+
+    getLineageVizConfig = (entity: Dataset) => {
+        return {
+            urn: entity?.urn,
+            name: entity?.properties?.name || entity.name,
+            expandedName: entity?.properties?.qualifiedName || entity?.properties?.name || entity.name,
+            type: EntityType.Dataset,
+            subtype: entity?.subTypes?.typeNames?.[0] || undefined,
+            icon: entity?.platform?.properties?.logoUrl || undefined,
+            platform: entity?.platform,
+            health: entity?.health || undefined,
+            deprecation: entity?.deprecation,
+        };
+    };
+
+    displayName = (data: Dataset) => {
+        return data?.properties?.name || data.name || data.urn;
+    };
+
+    platformLogoUrl = (data: Dataset) => {
+        return data.platform.properties?.logoUrl || undefined;
+    };
+
+    getGenericEntityProperties = (data: Dataset, flags?: FeatureFlagsConfig) => {
+        return getDataForEntityType({
+            data,
+            entityType: this.type,
+            getOverrideProperties: this.getOverridePropertiesFromEntity,
+            flags,
+        });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([
+            EntityCapabilityType.OWNERS,
+            EntityCapabilityType.GLOSSARY_TERMS,
+            EntityCapabilityType.TAGS,
+            EntityCapabilityType.DOMAINS,
+            EntityCapabilityType.DEPRECATION,
+            EntityCapabilityType.SOFT_DELETE,
+            EntityCapabilityType.DATA_PRODUCTS,
+            EntityCapabilityType.TEST,
+            EntityCapabilityType.LINEAGE,
+            EntityCapabilityType.HEALTH,
+        ]);
+    };
+
+    renderEmbeddedProfile = (urn: string) => (
+        <EmbeddedProfile
+            urn={urn}
+            entityType={EntityType.Dataset}
+            useEntityQuery={useGetDatasetQuery}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/dataset/preview/Preview.tsx
new file mode 100644
index 00000000000000..7d7b770e95ca5f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/preview/Preview.tsx
@@ -0,0 +1,155 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import React from 'react';
+import {
+    Container,
+    DataProduct,
+    DatasetStatsSummary,
+    Deprecation,
+    Domain,
+    EntityPath,
+    EntityType,
+    FabricType,
+    GlobalTags,
+    GlossaryTerms,
+    Health,
+    Maybe,
+    Owner,
+    ParentContainersResult,
+    SearchInsight,
+    BrowsePathV2,
+} from '../../../../types.generated';
+import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { IconStyleType, PreviewType } from '../../Entity';
+import { ANTD_GRAY } from '../../shared/constants';
+import { PopularityTier } from '../../shared/containers/profile/sidebar/shared/utils';
+import { summaryHasStats, DatasetLastUpdatedMs } from '../../shared/utils';
+import { DatasetStatsSummary as DatasetStatsSummaryView } from '../shared/DatasetStatsSummary';
+import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions';
+
+export const Preview = ({
+    urn,
+    data,
+    name,
+    origin,
+    description,
+    platformName,
+    platformLogo,
+    platformNames,
+    platformLogos,
+    platformInstanceId,
+    owners,
+    globalTags,
+    domain,
+    dataProduct,
+    deprecation,
+    snippet,
+    insights,
+    glossaryTerms,
+    subtype,
+    externalUrl,
+    container,
+    parentContainers,
+    rowCount,
+    columnCount,
+    statsSummary,
+    lastUpdatedMs,
+    health,
+    degree,
+    paths,
+    isOutputPort,
+    tier,
+    headerDropdownItems,
+    previewType,
+    browsePaths,
+}: {
+    urn: string;
+    data: GenericEntityProperties | null;
+    name: string;
+    origin: FabricType;
+    description?: string | null;
+    platformName?: string;
+    platformLogo?: string | null;
+    platformNames?: (Maybe<string> | undefined)[];
+    platformLogos?: (Maybe<string> | undefined)[];
+    platformInstanceId?: string;
+    owners?: Array<Owner> | null;
+    domain?: Domain | null;
+    dataProduct?: DataProduct | null;
+    deprecation?: Deprecation | null;
+    globalTags?: GlobalTags | null;
+    snippet?: React.ReactNode | null;
+    insights?: Array<SearchInsight> | null;
+    glossaryTerms?: GlossaryTerms | null;
+    subtype?: string | null;
+    externalUrl?: string | null;
+    container?: Container | null;
+    parentContainers?: ParentContainersResult | null;
+    rowCount?: number | null;
+    columnCount?: number | null;
+    statsSummary?: DatasetStatsSummary | null;
+    lastUpdatedMs?: DatasetLastUpdatedMs;
+    health?: Health[] | null;
+    degree?: number;
+    paths?: EntityPath[];
+    isOutputPort?: boolean;
+    tier?: PopularityTier;
+    headerDropdownItems?: Set<EntityMenuItems>;
+    previewType?: Maybe<PreviewType>;
+    browsePaths?: BrowsePathV2;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    const hasStats = !!columnCount || summaryHasStats(statsSummary);
+
+    return (
+        <DefaultPreviewCard
+            url={entityRegistry.getEntityUrl(EntityType.Dataset, urn)}
+            name={name || ''}
+            urn={urn}
+            data={data}
+            description={description || ''}
+            entityType={EntityType.Dataset}
+            type={subtype}
+            logoUrl={platformLogo || ''}
+            typeIcon={entityRegistry.getIcon(EntityType.Dataset, 12, IconStyleType.ACCENT)}
+            platform={platformName}
+            platforms={platformNames}
+            logoUrls={platformLogos}
+            platformInstanceId={platformInstanceId}
+            qualifier={origin}
+            tags={globalTags || undefined}
+            owners={owners}
+            domain={domain}
+            dataProduct={dataProduct}
+            container={container || undefined}
+            deprecation={deprecation}
+            snippet={snippet}
+            glossaryTerms={glossaryTerms || undefined}
+            insights={insights}
+            parentEntities={parentContainers?.containers}
+            externalUrl={externalUrl}
+            topUsers={statsSummary?.topUsersLast30Days}
+            subHeader={
+                hasStats && (
+                    <DatasetStatsSummaryView
+                        columnCount={columnCount}
+                        rowCount={rowCount}
+                        queryCountLast30Days={statsSummary?.queryCountLast30Days}
+                        uniqueUserCountLast30Days={statsSummary?.uniqueUserCountLast30Days}
+                        color={ANTD_GRAY[8]}
+                    />
+                )
+            }
+            health={health || undefined}
+            degree={degree}
+            paths={paths}
+            isOutputPort={isOutputPort}
+            lastUpdatedMs={lastUpdatedMs}
+            tier={tier}
+            headerDropdownItems={headerDropdownItems}
+            statsSummary={statsSummary}
+            previewType={previewType}
+            browsePaths={browsePaths}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/Lineage.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/Lineage.tsx
new file mode 100644
index 00000000000000..419ce1c8381508
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/Lineage.tsx
@@ -0,0 +1,62 @@
+import { Button, List, Space, Typography } from 'antd';
+import React from 'react';
+import { useHistory, useLocation } from 'react-router-dom';
+import styled from 'styled-components';
+import { DownstreamEntityRelationships, EntityType, UpstreamEntityRelationships } from '../../../../types.generated';
+import { navigateToLineageUrl } from '../../../lineage/utils/navigateToLineageUrl';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { PreviewType } from '../../Entity';
+
+export type Props = {
+    upstreamLineage?: UpstreamEntityRelationships | null;
+    downstreamLineage?: DownstreamEntityRelationships | null;
+};
+
+const ViewRawButtonContainer = styled.div`
+    display: flex;
+    justify-content: flex-end;
+`;
+
+export default function Lineage({ upstreamLineage, downstreamLineage }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const history = useHistory();
+    const location = useLocation();
+    const upstreamEntities = upstreamLineage?.entities?.map((entityRelationship) => entityRelationship?.entity);
+    const downstreamEntities = downstreamLineage?.entities?.map((entityRelationship) => entityRelationship?.entity);
+
+    return (
+        <>
+            <div>
+                <ViewRawButtonContainer>
+                    <Button onClick={() => navigateToLineageUrl({ location, history, isLineageMode: true })}>
+                        View Graph
+                    </Button>
+                </ViewRawButtonContainer>
+            </div>
+            <Space direction="vertical" style={{ width: '100%' }} size="large">
+                <List
+                    style={{ marginTop: '24px', padding: '16px 32px' }}
+                    bordered
+                    dataSource={upstreamEntities}
+                    header={<Typography.Title level={3}>Upstream</Typography.Title>}
+                    renderItem={(item) => (
+                        <List.Item style={{ paddingTop: '20px' }}>
+                            {entityRegistry.renderPreview(item?.type || EntityType.Dataset, PreviewType.PREVIEW, item)}
+                        </List.Item>
+                    )}
+                />
+                <List
+                    style={{ marginTop: '12px', padding: '16px 32px' }}
+                    bordered
+                    dataSource={downstreamEntities}
+                    header={<Typography.Title level={3}>Downstream</Typography.Title>}
+                    renderItem={(item) => (
+                        <List.Item style={{ paddingTop: '20px' }}>
+                            {entityRegistry.renderPreview(item?.type || EntityType.Dataset, PreviewType.PREVIEW, item)}
+                        </List.Item>
+                    )}
+                />
+            </Space>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/OperationsTab.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/OperationsTab.tsx
new file mode 100644
index 00000000000000..0f83c922624545
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/OperationsTab.tsx
@@ -0,0 +1,247 @@
+import { DeliveredProcedureOutlined } from '@ant-design/icons';
+import { Pagination, Table, Typography } from 'antd';
+import { Tooltip } from '@components';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+
+import { GetDatasetRunsQuery, useGetDatasetRunsQuery } from '../../../../graphql/dataset.generated';
+import {
+    DataProcessInstanceRunResultType,
+    DataProcessRunStatus,
+    EntityType,
+    RelationshipDirection,
+} from '../../../../types.generated';
+import {
+    getExecutionRequestStatusDisplayColor,
+    getExecutionRequestStatusDisplayText,
+    getExecutionRequestStatusIcon,
+} from '../../../ingest/source/utils';
+import { CompactEntityNameList } from '../../../recommendations/renderer/component/CompactEntityNameList';
+import { ANTD_GRAY } from '../../shared/constants';
+import { useEntityData } from '../../../entity/shared/EntityContext';
+import LoadingSvg from '../../../../images/datahub-logo-color-loading_pendulum.svg?react';
+import { scrollToTop } from '../../../shared/searchUtils';
+import { formatDuration } from '../../../shared/formatDuration';
+import { notEmpty } from '../../shared/utils';
+
+const ExternalUrlLink = styled.a`
+    font-size: 16px;
+    color: ${ANTD_GRAY[8]};
+`;
+
+const PaginationControlContainer = styled.div`
+    padding-top: 16px;
+    padding-bottom: 16px;
+    text-align: center;
+`;
+
+const LoadingText = styled.div`
+    margin-top: 18px;
+    font-size: 12px;
+`;
+
+const LoadingContainer = styled.div`
+    padding-top: 40px;
+    padding-bottom: 40px;
+    width: 100%;
+    text-align: center;
+`;
+
+function getStatusForStyling(status: DataProcessRunStatus, resultType: DataProcessInstanceRunResultType) {
+    if (status === 'COMPLETE') {
+        if (resultType === 'SKIPPED') {
+            return 'CANCELLED';
+        }
+        return resultType;
+    }
+    return 'RUNNING';
+}
+
+const columns = [
+    {
+        title: 'Time',
+        dataIndex: 'time',
+        key: 'time',
+        render: (value) => (
+            <Tooltip title={new Date(Number(value)).toUTCString()}>{new Date(Number(value)).toLocaleString()}</Tooltip>
+        ),
+    },
+    {
+        title: 'Duration',
+        dataIndex: 'duration',
+        key: 'duration',
+        render: (durationMs: number) => formatDuration(durationMs),
+    },
+    {
+        title: 'Run ID',
+        dataIndex: 'name',
+        key: 'name',
+    },
+    {
+        title: 'Task',
+        dataIndex: 'parentTemplate',
+        key: 'parentTemplate',
+        render: (parentTemplate) => <CompactEntityNameList entities={[parentTemplate]} />,
+    },
+    {
+        title: 'Status',
+        dataIndex: 'status',
+        key: 'status',
+        render: (status: any, row) => {
+            const statusForStyling = getStatusForStyling(status, row?.resultType);
+            const Icon = getExecutionRequestStatusIcon(statusForStyling);
+            const text = getExecutionRequestStatusDisplayText(statusForStyling);
+            const color = getExecutionRequestStatusDisplayColor(statusForStyling);
+            return (
+                <>
+                    <div style={{ display: 'flex', justifyContent: 'left', alignItems: 'center' }}>
+                        {Icon && <Icon style={{ color }} />}
+                        <Typography.Text strong style={{ color, marginLeft: 8 }}>
+                            {text || 'N/A'}
+                        </Typography.Text>
+                    </div>
+                </>
+            );
+        },
+    },
+    {
+        title: 'Inputs',
+        dataIndex: 'inputs',
+        key: 'inputs',
+        render: (inputs) => <CompactEntityNameList entities={inputs} />,
+    },
+    {
+        title: 'Outputs',
+        dataIndex: 'outputs',
+        key: 'outputs',
+        render: (outputs) => <CompactEntityNameList entities={outputs} />,
+    },
+    {
+        title: '',
+        dataIndex: 'externalUrl',
+        key: 'externalUrl',
+        render: (externalUrl) =>
+            externalUrl && (
+                <Tooltip title="View task run details">
+                    <ExternalUrlLink href={externalUrl}>
+                        <DeliveredProcedureOutlined />
+                    </ExternalUrlLink>
+                </Tooltip>
+            ),
+    },
+];
+
+const PAGE_SIZE = 20;
+
+export const OperationsTab = () => {
+    const { urn, entityData } = useEntityData();
+    const [page, setPage] = useState(1);
+
+    // Fetch data across all siblings.
+    const allUrns = [
+        urn,
+        ...(entityData?.siblingsSearch?.searchResults || []).map((sibling) => sibling.entity.urn).filter(notEmpty),
+    ];
+    const loadings: boolean[] = [];
+    const datas: GetDatasetRunsQuery[] = [];
+    allUrns.forEach((entityUrn) => {
+        // Because there's a consistent number and order of the urns,
+        // this usage of a hook within a loop should be safe.
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        const { loading, data } = useGetDatasetRunsQuery({
+            variables: {
+                urn: entityUrn,
+                start: (page - 1) * PAGE_SIZE,
+                count: PAGE_SIZE,
+                direction: RelationshipDirection.Outgoing,
+            },
+        });
+        loadings.push(loading);
+        if (data) {
+            datas.push(data);
+        }
+    });
+
+    const loading = loadings.some((loadingEntry) => loadingEntry);
+
+    // Merge the runs data from all entities.
+    // If there's more than one entity contributing to the data, then we can't do pagination.
+    let canPaginate = true;
+    let dataRuns: NonNullable<GetDatasetRunsQuery['dataset']>['runs'] | undefined;
+    if (datas.length > 0) {
+        let numWithRuns = 0;
+        for (let i = 0; i < datas.length; i++) {
+            if (datas[i]?.dataset?.runs?.total) {
+                numWithRuns++;
+            }
+
+            if (dataRuns && dataRuns.runs) {
+                dataRuns.runs.push(...(datas[i]?.dataset?.runs?.runs || []));
+                dataRuns.total = (dataRuns.total ?? 0) + (datas[i]?.dataset?.runs?.total ?? 0);
+            } else {
+                dataRuns = JSON.parse(JSON.stringify(datas[i]?.dataset?.runs));
+            }
+        }
+
+        if (numWithRuns > 1) {
+            canPaginate = false;
+        }
+    }
+
+    // This also sorts the runs data across all entities.
+    const runs = dataRuns?.runs?.sort((a, b) => (b?.created?.time ?? 0) - (a?.created?.time ?? 0));
+
+    const tableData = runs
+        ?.filter((run) => run)
+        .map((run) => ({
+            time: run?.created?.time,
+            name: run?.name,
+            status: run?.state?.[0]?.status,
+            resultType: run?.state?.[0]?.result?.resultType,
+            duration: run?.state?.[0]?.durationMillis,
+            inputs: run?.inputs?.relationships.map((relationship) => relationship.entity),
+            outputs: run?.outputs?.relationships.map((relationship) => relationship.entity),
+            externalUrl: run?.externalUrl,
+            parentTemplate: run?.parentTemplate?.relationships?.[0]?.entity,
+        }));
+
+    // If the table contains jobs, we need to show the job-related columns. Otherwise we can simplify the table.
+    const containsJobs = tableData?.some((run) => run.parentTemplate?.type !== EntityType.Dataset);
+    const simplifiedColumns = containsJobs
+        ? columns
+        : columns.filter((column) => !['name', 'inputs', 'outputs'].includes(column.key));
+
+    const onChangePage = (newPage: number) => {
+        scrollToTop();
+        setPage(newPage);
+    };
+
+    // TODO: Much of this file is duplicated from RunsTab.tsx. We should refactor this to share code.
+    return (
+        <>
+            {loading && (
+                <LoadingContainer>
+                    <LoadingSvg height={80} width={80} />
+                    <LoadingText>Fetching runs...</LoadingText>
+                </LoadingContainer>
+            )}
+            {!loading && (
+                <>
+                    <Table dataSource={tableData} columns={simplifiedColumns} pagination={false} />
+                    {canPaginate && (
+                        <PaginationControlContainer>
+                            <Pagination
+                                current={page}
+                                pageSize={PAGE_SIZE}
+                                total={dataRuns?.total || 0}
+                                showLessItems
+                                onChange={onChangePage}
+                                showSizeChanger={false}
+                            />
+                        </PaginationControlContainer>
+                    )}
+                </>
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/UsageFacepile.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/UsageFacepile.tsx
new file mode 100644
index 00000000000000..f2bdd4750e3ea5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/UsageFacepile.tsx
@@ -0,0 +1,42 @@
+import React, { useMemo } from 'react';
+import { Tooltip } from '@components';
+import { EntityType, UserUsageCounts } from '../../../../types.generated';
+import { SpacedAvatarGroup } from '../../../shared/avatar/SpaceAvatarGroup';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import ActorAvatar from '../../shared/ActorAvatar';
+
+export type Props = {
+    users?: (UserUsageCounts | null)[] | null;
+    maxNumberDisplayed?: number;
+};
+
+export default function UsageFacepile({ users, maxNumberDisplayed }: Props) {
+    const sortedUsers = useMemo(() => users?.slice().sort((a, b) => (b?.count || 0) - (a?.count || 0)), [users]);
+    let displayedUsers = sortedUsers;
+    if (maxNumberDisplayed) {
+        displayedUsers = displayedUsers?.slice(0, maxNumberDisplayed);
+    }
+
+    const entityRegistry = useEntityRegistry();
+
+    return (
+        <SpacedAvatarGroup maxCount={2}>
+            {displayedUsers?.map((displayedUser) => {
+                const user = displayedUser?.user;
+                const userName = entityRegistry.getDisplayName(EntityType.CorpUser, user);
+                return (
+                    <Tooltip title={userName}>
+                        <ActorAvatar
+                            size={32}
+                            name={userName}
+                            url={`/${entityRegistry.getPathName(EntityType.CorpUser)}/${user?.urn}`}
+                            photoUrl={
+                                user?.editableProperties?.pictureLink || user?.editableInfo?.pictureLink || undefined
+                            }
+                        />
+                    </Tooltip>
+                );
+            })}
+        </SpacedAvatarGroup>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Lineage.test.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Lineage.test.tsx
new file mode 100644
index 00000000000000..f7cca3addf283b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Lineage.test.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { MockedProvider } from '@apollo/client/testing';
+
+import Lineage from '../Lineage';
+import { sampleDownstreamRelationship, sampleRelationship } from '../stories/lineageEntities';
+import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer';
+import { mocks } from '../../../../../Mocks';
+
+describe('Lineage', () => {
+    it('renders', () => {
+        const { getByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer>
+                    <Lineage upstreamLineage={sampleRelationship} downstreamLineage={sampleDownstreamRelationship} />,
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(getByText('Upstream HiveDataset')).toBeInTheDocument();
+        expect(getByText('Downstream HiveDataset')).toBeInTheDocument();
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Properties.test.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Properties.test.tsx
new file mode 100644
index 00000000000000..4787efcc08c287
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Properties.test.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { MockedProvider } from '@apollo/client/testing';
+import { Properties } from '../../../shared/components/legacy/Properties';
+import { sampleProperties } from '../stories/properties';
+import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer';
+import { mocks } from '../../../../../Mocks';
+
+describe('Properties', () => {
+    it('renders', () => {
+        const { getByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer>
+                    <Properties properties={sampleProperties} />,
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(getByText('Properties')).toBeInTheDocument();
+        expect(getByText('Number of Partitions')).toBeInTheDocument();
+        expect(getByText('18')).toBeInTheDocument();
+        expect(getByText('Cluster Name')).toBeInTheDocument();
+        expect(getByText('Testing')).toBeInTheDocument();
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Schema.test.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Schema.test.tsx
new file mode 100644
index 00000000000000..bc20887a1a34bc
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Schema.test.tsx
@@ -0,0 +1,398 @@
+import { MockedProvider } from '@apollo/client/testing';
+import { fireEvent, render } from '@testing-library/react';
+import React from 'react';
+import { mocks } from '../../../../../Mocks';
+import { EntityType, SchemaMetadata } from '../../../../../types.generated';
+import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer';
+import { EntityContext } from '../../../../entity/shared/EntityContext';
+import { SchemaTab } from '../../../shared/tabs/Dataset/Schema/SchemaTab';
+import { TabRenderType } from '../../../shared/types';
+import SchemaRow from '../schema/components/SchemaRow';
+import {
+    sampleSchema,
+    sampleSchemaWithKeyValueFields,
+    sampleSchemaWithoutFields,
+    sampleSchemaWithPkFk,
+    sampleSchemaWithTags,
+} from '../stories/sampleSchema';
+
+vi.mock('virtualizedtableforantd4', async () => {
+    return {
+        ...(await vi.importActual<object>('virtualizedtableforantd4')),
+        useVT: () => [{ body: { row: SchemaRow } }, vi.fn()],
+    };
+});
+
+describe('Schema', () => {
+    it('renders', () => {
+        const { getByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer>
+                    <EntityContext.Provider
+                        value={{
+                            urn: 'urn:li:dataset:123',
+                            entityType: EntityType.Dataset,
+                            entityData: {
+                                schemaMetadata: sampleSchema as SchemaMetadata,
+                            },
+                            baseEntity: {},
+                            updateEntity: vi.fn(),
+                            routeToTab: vi.fn(),
+                            refetch: vi.fn(),
+                            loading: true,
+                            lineage: undefined,
+                            dataNotCombinedWithSiblings: null,
+                        }}
+                    >
+                        <SchemaTab renderType={TabRenderType.DEFAULT} />
+                    </EntityContext.Provider>
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(getByText('name')).toBeInTheDocument();
+        expect(getByText('the name of the order')).toBeInTheDocument();
+        expect(getByText('shipping_address')).toBeInTheDocument();
+        expect(getByText('the address the order ships to')).toBeInTheDocument();
+    });
+
+    it('renders raw', () => {
+        const { getByText, queryAllByTestId } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer>
+                    <EntityContext.Provider
+                        value={{
+                            urn: 'urn:li:dataset:123',
+                            entityType: EntityType.Dataset,
+                            entityData: {
+                                properties: {
+                                    description: 'This is a description',
+                                },
+                                schemaMetadata: sampleSchema as SchemaMetadata,
+                            },
+                            baseEntity: {},
+                            updateEntity: vi.fn(),
+                            routeToTab: vi.fn(),
+                            refetch: vi.fn(),
+                            loading: true,
+                            lineage: undefined,
+                            dataNotCombinedWithSiblings: null,
+                        }}
+                    >
+                        <SchemaTab renderType={TabRenderType.DEFAULT} />
+                    </EntityContext.Provider>
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+
+        expect(queryAllByTestId('schema-raw-view')).toHaveLength(0);
+
+        const rawButton = getByText('Raw');
+        fireEvent.click(rawButton);
+
+        expect(queryAllByTestId('schema-raw-view')).toHaveLength(1);
+
+        const schemaButton = getByText('Tabular');
+        fireEvent.click(schemaButton);
+
+        expect(queryAllByTestId('schema-raw-view')).toHaveLength(0);
+    });
+
+    it('renders tags and terms', () => {
+        const { getByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer>
+                    <EntityContext.Provider
+                        value={{
+                            urn: 'urn:li:dataset:123',
+                            entityType: EntityType.Dataset,
+                            entityData: {
+                                properties: {
+                                    description: 'This is a description',
+                                },
+                                schemaMetadata: sampleSchemaWithTags as SchemaMetadata,
+                            },
+                            baseEntity: {},
+                            updateEntity: vi.fn(),
+                            routeToTab: vi.fn(),
+                            refetch: vi.fn(),
+                            loading: true,
+                            lineage: undefined,
+                            dataNotCombinedWithSiblings: null,
+                        }}
+                    >
+                        <SchemaTab renderType={TabRenderType.DEFAULT} />
+                    </EntityContext.Provider>
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(getByText('Legacy')).toBeInTheDocument();
+        expect(getByText('sample-glossary-term')).toBeInTheDocument();
+    });
+
+    it('renders description', () => {
+        const { getByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer>
+                    <EntityContext.Provider
+                        value={{
+                            urn: 'urn:li:dataset:123',
+                            entityType: EntityType.Dataset,
+                            entityData: {
+                                properties: {
+                                    description: 'This is a description',
+                                },
+                                schemaMetadata: sampleSchemaWithTags as SchemaMetadata,
+                            },
+                            baseEntity: {},
+                            updateEntity: vi.fn(),
+                            routeToTab: vi.fn(),
+                            refetch: vi.fn(),
+                            loading: true,
+                            lineage: undefined,
+                            dataNotCombinedWithSiblings: null,
+                        }}
+                    >
+                        <SchemaTab renderType={TabRenderType.DEFAULT} />
+                    </EntityContext.Provider>
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(getByText('order id')).toBeInTheDocument();
+    });
+
+    it('renders field', () => {
+        const { getByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer>
+                    <EntityContext.Provider
+                        value={{
+                            urn: 'urn:li:dataset:123',
+                            entityType: EntityType.Dataset,
+                            entityData: {
+                                properties: {
+                                    description: 'This is a description',
+                                },
+                                schemaMetadata: sampleSchemaWithTags as SchemaMetadata,
+                            },
+                            baseEntity: {},
+                            updateEntity: vi.fn(),
+                            routeToTab: vi.fn(),
+                            refetch: vi.fn(),
+                            loading: true,
+                            lineage: undefined,
+                            dataNotCombinedWithSiblings: null,
+                        }}
+                    >
+                        <SchemaTab renderType={TabRenderType.DEFAULT} />
+                    </EntityContext.Provider>
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(getByText('shipping_address')).toBeInTheDocument();
+    });
+
+    it('renders primary keys', () => {
+        const { getByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer>
+                    <EntityContext.Provider
+                        value={{
+                            urn: 'urn:li:dataset:123',
+                            entityType: EntityType.Dataset,
+                            entityData: {
+                                properties: {
+                                    description: 'This is a description',
+                                },
+                                schemaMetadata: sampleSchemaWithPkFk as SchemaMetadata,
+                            },
+                            baseEntity: {},
+                            updateEntity: vi.fn(),
+                            routeToTab: vi.fn(),
+                            refetch: vi.fn(),
+                            loading: true,
+                            lineage: undefined,
+                            dataNotCombinedWithSiblings: null,
+                        }}
+                    >
+                        <SchemaTab renderType={TabRenderType.DEFAULT} />
+                    </EntityContext.Provider>
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(getByText('Primary Key')).toBeInTheDocument();
+    });
+
+    it.skip('renders foreign keys', () => {
+        const { getByText, getAllByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer>
+                    <EntityContext.Provider
+                        value={{
+                            urn: 'urn:li:dataset:123',
+                            entityType: EntityType.Dataset,
+                            entityData: {
+                                properties: {
+                                    description: 'This is a description',
+                                },
+                                schemaMetadata: sampleSchemaWithPkFk as SchemaMetadata,
+                            },
+                            baseEntity: {},
+                            updateEntity: vi.fn(),
+                            routeToTab: vi.fn(),
+                            refetch: vi.fn(),
+                            loading: true,
+                            lineage: undefined,
+                            dataNotCombinedWithSiblings: null,
+                        }}
+                    >
+                        <SchemaTab renderType={TabRenderType.DEFAULT} />
+                    </EntityContext.Provider>
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(getByText('Foreign Key')).toBeInTheDocument();
+
+        const fkButton = getByText('Foreign Key');
+        fireEvent.click(fkButton);
+
+        expect(getByText('Foreign Key to')).toBeInTheDocument();
+        expect(getAllByText('Yet Another Dataset')).toHaveLength(2);
+    });
+
+    it('renders key/value toggle', () => {
+        const { getByText, queryByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer>
+                    <EntityContext.Provider
+                        value={{
+                            urn: 'urn:li:dataset:123',
+                            entityType: EntityType.Dataset,
+                            entityData: {
+                                properties: {
+                                    description: 'This is a description',
+                                },
+                                schemaMetadata: sampleSchemaWithKeyValueFields as SchemaMetadata,
+                            },
+                            baseEntity: {},
+                            updateEntity: vi.fn(),
+                            routeToTab: vi.fn(),
+                            refetch: vi.fn(),
+                            loading: true,
+                            lineage: undefined,
+                            dataNotCombinedWithSiblings: null,
+                        }}
+                    >
+                        <SchemaTab renderType={TabRenderType.DEFAULT} />
+                    </EntityContext.Provider>
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(getByText('Key')).toBeInTheDocument();
+        expect(getByText('Value')).toBeInTheDocument();
+        expect(getByText('count')).toBeInTheDocument();
+        expect(getByText('cost')).toBeInTheDocument();
+        expect(queryByText('id')).not.toBeInTheDocument();
+
+        const keyButton = getByText('Key');
+        fireEvent.click(keyButton);
+
+        expect(getByText('Key')).toBeInTheDocument();
+        expect(getByText('Value')).toBeInTheDocument();
+        expect(getByText('id')).toBeInTheDocument();
+        expect(queryByText('count')).not.toBeInTheDocument();
+        expect(queryByText('cost')).not.toBeInTheDocument();
+    });
+
+    it('does not renders key/value toggle when no schema', () => {
+        const { queryByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer>
+                    <EntityContext.Provider
+                        value={{
+                            urn: 'urn:li:dataset:123',
+                            entityType: EntityType.Dataset,
+                            entityData: {
+                                properties: {
+                                    description: 'This is a description',
+                                },
+                                schemaMetadata: sampleSchemaWithoutFields as SchemaMetadata,
+                            },
+                            baseEntity: {},
+                            updateEntity: vi.fn(),
+                            routeToTab: vi.fn(),
+                            refetch: vi.fn(),
+                            loading: true,
+                            lineage: undefined,
+                            dataNotCombinedWithSiblings: null,
+                        }}
+                    >
+                        <SchemaTab renderType={TabRenderType.DEFAULT} />
+                    </EntityContext.Provider>
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(queryByText('Key')).not.toBeInTheDocument();
+        expect(queryByText('Value')).not.toBeInTheDocument();
+    });
+
+    it('renders usage column when usage is present', () => {
+        const usageStats = {
+            buckets: [
+                {
+                    bucket: Date.now(),
+                    metrics: {
+                        totalSqlQueries: 10,
+                    },
+                },
+            ],
+            aggregations: {
+                uniqueUserCount: 2,
+                totalSqlQueries: 10,
+                fields: [
+                    {
+                        fieldName: 'id',
+                        count: 10,
+                    },
+                    {
+                        fieldName: 'name',
+                        count: 24,
+                    },
+                ],
+            },
+        };
+
+        const { queryByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer>
+                    <EntityContext.Provider
+                        value={{
+                            urn: 'urn:li:dataset:123',
+                            entityType: EntityType.Dataset,
+                            entityData: {
+                                properties: {
+                                    description: 'This is a description',
+                                },
+                                schemaMetadata: sampleSchema as SchemaMetadata,
+                            },
+                            baseEntity: {
+                                dataset: {
+                                    urn: 'urn:li:dataset:123',
+                                    usageStats,
+                                },
+                            },
+                            updateEntity: vi.fn(),
+                            routeToTab: vi.fn(),
+                            refetch: vi.fn(),
+                            loading: true,
+                            lineage: undefined,
+                            dataNotCombinedWithSiblings: null,
+                        }}
+                    >
+                        <SchemaTab renderType={TabRenderType.DEFAULT} />
+                    </EntityContext.Provider>
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(queryByText('Stats')).toBeInTheDocument();
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/SchemaDescriptionField.test.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/SchemaDescriptionField.test.tsx
new file mode 100644
index 00000000000000..4fc846409d963a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/SchemaDescriptionField.test.tsx
@@ -0,0 +1,66 @@
+import { MockedProvider } from '@apollo/client/testing';
+import { fireEvent, render, waitFor } from '@testing-library/react';
+import React from 'react';
+import { mocks } from '../../../../../Mocks';
+import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer';
+import SchemaDescriptionField from '../schema/components/SchemaDescriptionField';
+
+describe('SchemaDescriptionField', () => {
+    it('renders editable description', async () => {
+        const { getByText, getByRole, queryByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer>
+                    <SchemaDescriptionField
+                        expanded
+                        onExpanded={() => {}}
+                        description="test description updated"
+                        isEdited
+                        onUpdate={async () => {}}
+                    />{' '}
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(getByRole('img')).toBeInTheDocument();
+        expect(getByText('test description updated')).toBeInTheDocument();
+        expect(queryByText('Update description')).not.toBeInTheDocument();
+    });
+
+    it('renders update description modal', async () => {
+        const { getByText, getByRole, queryByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer>
+                    <SchemaDescriptionField
+                        expanded
+                        onExpanded={() => {}}
+                        description="test description"
+                        original="test description"
+                        isEdited
+                        onUpdate={async () => {}}
+                    />
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(queryByText('Update description')).not.toBeInTheDocument();
+        fireEvent.click(getByRole('img'));
+        await waitFor(() => expect(getByText('Update description')).toBeInTheDocument());
+        expect(getByText('Cancel')).toBeInTheDocument();
+        expect(getByText('Publish')).toBeInTheDocument();
+        expect(getByText('Original:')).toBeInTheDocument();
+        fireEvent.click(getByText('Cancel'));
+        await waitFor(() => expect(queryByText('Update description')).not.toBeInTheDocument());
+    });
+
+    it('renders short messages without show more / show less', () => {
+        const { getByText, queryByText } = render(
+            <SchemaDescriptionField
+                expanded
+                onExpanded={() => {}}
+                description="short description"
+                onUpdate={() => Promise.resolve()}
+            />,
+        );
+        expect(getByText('short description')).toBeInTheDocument();
+        expect(queryByText('Read Less')).not.toBeInTheDocument();
+        expect(queryByText('Read More')).not.toBeInTheDocument();
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Stats.test.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Stats.test.tsx
new file mode 100644
index 00000000000000..d5682a629b92b3
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/Stats.test.tsx
@@ -0,0 +1,155 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { MockedProvider } from '@apollo/client/testing';
+import SnapshotStatsView from '../stats/snapshot/SnapshotStatsView';
+import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer';
+import { completeSampleProfile, missingFieldStatsProfile, missingTableStatsProfile } from '../stories/stats';
+import { mocks } from '../../../../../Mocks';
+
+describe('SnapshotStatsView', () => {
+    it('renders complete profile', () => {
+        const { getByText } = render(
+            <MockedProvider mocks={mocks}>
+                <TestPageContainer>
+                    <SnapshotStatsView profile={completeSampleProfile} />
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+
+        // Row Count
+        expect(getByText('1000')).toBeInTheDocument();
+        expect(getByText('Rows')).toBeInTheDocument();
+
+        // Column Count
+        expect(getByText('2000')).toBeInTheDocument();
+        expect(getByText('Columns')).toBeInTheDocument();
+
+        // Field Profiles
+        // First column
+        expect(getByText('testColumn')).toBeInTheDocument();
+        expect(getByText('1')).toBeInTheDocument();
+        expect(getByText('11.10%')).toBeInTheDocument();
+        expect(getByText('2')).toBeInTheDocument();
+        expect(getByText('22.20%')).toBeInTheDocument();
+        expect(getByText('3')).toBeInTheDocument();
+        expect(getByText('4')).toBeInTheDocument();
+        expect(getByText('5')).toBeInTheDocument();
+        expect(getByText('6')).toBeInTheDocument();
+        expect(getByText('value1')).toBeInTheDocument();
+        expect(getByText('value2')).toBeInTheDocument();
+        expect(getByText('value3')).toBeInTheDocument();
+
+        // Second column
+        expect(getByText('testColumn2')).toBeInTheDocument();
+        expect(getByText('8')).toBeInTheDocument();
+        expect(getByText('33.30%')).toBeInTheDocument();
+        expect(getByText('9')).toBeInTheDocument();
+        expect(getByText('44.40%')).toBeInTheDocument();
+        expect(getByText('10')).toBeInTheDocument();
+        expect(getByText('11')).toBeInTheDocument();
+        expect(getByText('12')).toBeInTheDocument();
+        expect(getByText('13')).toBeInTheDocument();
+        expect(getByText('14')).toBeInTheDocument();
+        expect(getByText('value4')).toBeInTheDocument();
+        expect(getByText('value5')).toBeInTheDocument();
+        expect(getByText('value6')).toBeInTheDocument();
+    });
+
+    it('renders profile without field stats', () => {
+        const { getByText, queryByText } = render(
+            <MockedProvider mocks={mocks}>
+                <TestPageContainer>
+                    <SnapshotStatsView profile={missingFieldStatsProfile} />
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+
+        // Row Count
+        expect(getByText('1000')).toBeInTheDocument();
+        expect(getByText('Rows')).toBeInTheDocument();
+
+        // Column Count
+        expect(getByText('2000')).toBeInTheDocument();
+        expect(getByText('Columns')).toBeInTheDocument();
+
+        // Field Profiles
+        // First column
+        expect(queryByText('testColumn')).toBeNull();
+        expect(queryByText('1')).toBeNull();
+        expect(queryByText('11.10%')).toBeNull();
+        expect(queryByText('2')).toBeNull();
+        expect(queryByText('22.20%')).toBeNull();
+        expect(queryByText('3')).toBeNull();
+        expect(queryByText('4')).toBeNull();
+        expect(queryByText('5')).toBeNull();
+        expect(queryByText('6')).toBeNull();
+        expect(queryByText('value1')).toBeNull();
+        expect(queryByText('value2')).toBeNull();
+        expect(queryByText('value3')).toBeNull();
+
+        // Second column
+        expect(queryByText('testColumn2')).toBeNull();
+        expect(queryByText('8')).toBeNull();
+        expect(queryByText('33.30%')).toBeNull();
+        expect(queryByText('9')).toBeNull();
+        expect(queryByText('44.40%')).toBeNull();
+        expect(queryByText('10')).toBeNull();
+        expect(queryByText('11')).toBeNull();
+        expect(queryByText('12')).toBeNull();
+        expect(queryByText('13')).toBeNull();
+        expect(queryByText('14')).toBeNull();
+        expect(queryByText('value4')).toBeNull();
+        expect(queryByText('value5')).toBeNull();
+        expect(queryByText('value6')).toBeNull();
+    });
+
+    it('renders profile without table stats', () => {
+        const { getByText, queryByText } = render(
+            <MockedProvider mocks={mocks}>
+                <TestPageContainer>
+                    <SnapshotStatsView profile={missingTableStatsProfile} />
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+
+        // Row Count
+        expect(queryByText('1000')).toBeNull();
+        expect(queryByText('Rows')).toBeNull();
+        expect(queryByText('Row Count Unknown')).toBeInTheDocument();
+
+        // Column Count
+        expect(queryByText('2000')).toBeNull();
+        expect(queryByText('Columns')).toBeNull();
+        expect(queryByText('Column Count Unknown')).toBeInTheDocument();
+
+        // Field Profiles
+        // First column
+        expect(getByText('testColumn')).toBeInTheDocument();
+        expect(getByText('1')).toBeInTheDocument();
+        expect(getByText('11.10%')).toBeInTheDocument();
+        expect(getByText('2')).toBeInTheDocument();
+        expect(getByText('22.20%')).toBeInTheDocument();
+        expect(getByText('3')).toBeInTheDocument();
+        expect(getByText('4')).toBeInTheDocument();
+        expect(getByText('5')).toBeInTheDocument();
+        expect(getByText('6')).toBeInTheDocument();
+        expect(getByText('value1')).toBeInTheDocument();
+        expect(getByText('value2')).toBeInTheDocument();
+        expect(getByText('value3')).toBeInTheDocument();
+
+        // Second column
+        expect(getByText('testColumn2')).toBeInTheDocument();
+        expect(getByText('8')).toBeInTheDocument();
+        expect(getByText('33.30%')).toBeInTheDocument();
+        expect(getByText('9')).toBeInTheDocument();
+        expect(getByText('44.40%')).toBeInTheDocument();
+        expect(getByText('10')).toBeInTheDocument();
+        expect(getByText('11')).toBeInTheDocument();
+        expect(getByText('12')).toBeInTheDocument();
+        expect(getByText('13')).toBeInTheDocument();
+        expect(getByText('14')).toBeInTheDocument();
+        expect(getByText('value4')).toBeInTheDocument();
+        expect(getByText('value5')).toBeInTheDocument();
+        expect(getByText('value6')).toBeInTheDocument();
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/translateFieldPath.test.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/translateFieldPath.test.tsx
new file mode 100644
index 00000000000000..bb2c0121ef251f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/translateFieldPath.test.tsx
@@ -0,0 +1,33 @@
+import translateFieldPath from '../../schema/utils/translateFieldPath';
+
+describe('translateFieldPath', () => {
+    it('translates qualified unions', () => {
+        expect(translateFieldPath('[type=union].[type=QualifyingStruct].struct.[type=long].field')).toEqual(
+            '(QualifyingStruct) struct.field',
+        );
+    });
+
+    it('translates nested arrays', () => {
+        expect(translateFieldPath('[type=array].[type=array].my_array.[type=long].field')).toEqual(
+            'my_array[][].field',
+        );
+    });
+
+    it('removes non-qualifying structs', () => {
+        expect(
+            translateFieldPath('[type=array].[type=array].MyArray.[type=Struct].field.[type=long].nested_field'),
+        ).toEqual('MyArray[][].field.nested_field');
+    });
+
+    it('cleans the [key=true] prefix', () => {
+        expect(
+            translateFieldPath(
+                '[key=True].[type=array].[type=array].MyArray.[type=Struct].field.[type=long].nested_field',
+            ),
+        ).toEqual('MyArray[][].field.nested_field');
+    });
+
+    it('leaves old fieldpaths as is', () => {
+        expect(translateFieldPath('a.b.c')).toEqual('a.b.c');
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/translateFieldPathSegment.test.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/translateFieldPathSegment.test.tsx
new file mode 100644
index 00000000000000..2ddfe7d19e2425
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/translateFieldPathSegment.test.tsx
@@ -0,0 +1,39 @@
+import translateFieldPathSegment from '../../schema/utils/translateFieldPathSegment';
+
+describe('translateFieldPathSegment', () => {
+    it('translates unions', () => {
+        expect(translateFieldPathSegment('MyUnion', 1, ['[type=union]', 'MyUnion'])).toEqual('MyUnion.');
+    });
+
+    it('translates arrays', () => {
+        expect(translateFieldPathSegment('MyArray', 1, ['[type=array]', 'MyArray'])).toEqual('MyArray[].');
+    });
+
+    it('translates qualifying structs in the middle', () => {
+        expect(
+            translateFieldPathSegment('[type=QualifyingStruct]', 1, [
+                '[type=union]',
+                '[type=QualifyingStruct]',
+                'MyUnion',
+            ]),
+        ).toEqual('(QualifyingStruct) ');
+    });
+
+    it('translates qualifying structs in the end', () => {
+        expect(
+            translateFieldPathSegment('[type=QualifyingStruct]', 1, ['[type=union]', '[type=QualifyingStruct]']),
+        ).toEqual(' QualifyingStruct');
+    });
+
+    it('translates primitives', () => {
+        expect(
+            translateFieldPathSegment('field', 4, [
+                '[type=union]',
+                'MyUnion',
+                '[type=QualifyingStruct]',
+                '[type=long]',
+                'field',
+            ]),
+        ).toEqual('field.');
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/utils.test.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/utils.test.tsx
new file mode 100644
index 00000000000000..8d41161380295b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/__tests__/schema/utils.test.tsx
@@ -0,0 +1,49 @@
+import { SchemaFieldDataType } from '../../../../../../types.generated';
+import { filterKeyFieldPath } from '../../schema/utils/utils';
+
+describe('utils', () => {
+    describe('filterKeyFieldPath', () => {
+        it('allows keys when looking for keys', () => {
+            expect(
+                filterKeyFieldPath(true, {
+                    fieldPath: '[version=2.0].[key=True].[type=long].field',
+                    nullable: false,
+                    type: SchemaFieldDataType.Number,
+                    recursive: false,
+                }),
+            ).toEqual(true);
+        });
+        it('blocks non-keys when looking for keys', () => {
+            expect(
+                filterKeyFieldPath(true, {
+                    fieldPath: '[version=2.0].[type=long].field',
+                    nullable: false,
+                    type: SchemaFieldDataType.Number,
+                    recursive: false,
+                }),
+            ).toEqual(false);
+        });
+
+        it('allows non-keys when looking for non-keys', () => {
+            expect(
+                filterKeyFieldPath(false, {
+                    fieldPath: '[version=2.0].[type=long].field',
+                    nullable: false,
+                    type: SchemaFieldDataType.Number,
+                    recursive: false,
+                }),
+            ).toEqual(true);
+        });
+
+        it('blocks keys when looking for non-keys', () => {
+            expect(
+                filterKeyFieldPath(false, {
+                    fieldPath: '[version=2.0].[key=True].[type=long].field',
+                    nullable: false,
+                    type: SchemaFieldDataType.Number,
+                    recursive: false,
+                }),
+            ).toEqual(false);
+        });
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/CustomPagination.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/CustomPagination.tsx
new file mode 100644
index 00000000000000..8d270898a44566
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/CustomPagination.tsx
@@ -0,0 +1,113 @@
+import React, { useState } from 'react';
+import { Button, Menu, Dropdown, Typography } from 'antd';
+import { LeftOutlined, RightOutlined } from '@ant-design/icons';
+import styled from 'styled-components';
+
+const CustomPaginationContainer = styled.div`
+    display: flex;
+    flex-direction: row;
+    height: 32px;
+`;
+const NavButton = styled(Button)`
+    margin: 4px 6px;
+    cursor: pointer;
+`;
+const DescriptionText = styled(Typography.Text)`
+    line-height: 32px;
+`;
+const VersionText = styled(Typography.Text)`
+    padding: 0 4px;
+    line-height: 32px;
+    cursor: pointer;
+`;
+const VersionRightText = styled(Typography.Text)`
+    padding-left: 4px;
+    line-height: 32px;
+    cursor: pointer;
+`;
+
+type Props = {
+    onChange: (version1: number, version2: number) => void;
+    maxVersion: number;
+};
+
+export default function CustomPagination({ onChange, maxVersion }: Props) {
+    const [version1, setVersion1] = useState(maxVersion || 1); // current version - first dropdown selected
+    const [version2, setVersion2] = useState(maxVersion ? maxVersion - 1 : 0); // past version comparing with current - second dropdown
+
+    const onNextClick = () => {
+        setVersion1((v) => v - 1);
+        setVersion2(version1 - 2);
+        onChange(version1 - 1, version1 - 2);
+    };
+    const onPrevClick = () => {
+        setVersion1((v) => v + 1);
+        setVersion2(version1);
+        onChange(version1 + 1, version1);
+    };
+    const onVersion1Click = ({ key }) => {
+        const newVersion1 = parseInt(key, 10);
+        setVersion1(newVersion1);
+        if (version2 >= newVersion1) {
+            setVersion2(newVersion1 - 1);
+            onChange(newVersion1, newVersion1 - 1);
+            return;
+        }
+        onChange(newVersion1, version2);
+    };
+    const onVersion2Click = ({ key }) => {
+        setVersion2(parseInt(key, 10));
+        onChange(version1, parseInt(key, 10));
+    };
+
+    const menu1 = (
+        <Menu onClick={onVersion1Click} selectedKeys={[`${version1}`]}>
+            {[...Array(maxVersion)].map((_, i) => (
+                // eslint-disable-next-line react/no-array-index-key
+                <Menu.Item key={maxVersion - i}>
+                    <Typography.Text>{i === 0 ? 'latest' : `version ${maxVersion + 1 - i}`}</Typography.Text>
+                </Menu.Item>
+            ))}
+        </Menu>
+    );
+
+    const menu2 = (
+        <Menu onClick={onVersion2Click} selectedKeys={[`${version2}`]}>
+            {[...Array(version1)].map((_, i) => (
+                // eslint-disable-next-line react/no-array-index-key
+                <Menu.Item key={version1 - i - 1}>
+                    <Typography.Text>{`version ${version1 - i}`}</Typography.Text>
+                </Menu.Item>
+            ))}
+        </Menu>
+    );
+
+    return (
+        <CustomPaginationContainer>
+            <NavButton
+                size="small"
+                type="text"
+                icon={<LeftOutlined />}
+                onClick={onPrevClick}
+                disabled={version1 >= maxVersion}
+            />
+            <DescriptionText>Comparing</DescriptionText>
+            <Dropdown overlay={menu1} trigger={['click']}>
+                <VersionText strong type="success">
+                    {version1 === maxVersion ? 'latest' : `version ${version1 + 1}`}
+                </VersionText>
+            </Dropdown>
+            <DescriptionText>to</DescriptionText>
+            <Dropdown overlay={menu2} trigger={['click']}>
+                <VersionRightText strong type="success">{`version ${version2 + 1}`}</VersionRightText>
+            </Dropdown>
+            <NavButton
+                size="small"
+                type="text"
+                icon={<RightOutlined />}
+                onClick={onNextClick}
+                disabled={version1 <= 1}
+            />
+        </CustomPaginationContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/InteriorTitleContent.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/InteriorTitleContent.tsx
new file mode 100644
index 00000000000000..6e3cd3c95c3531
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/InteriorTitleContent.tsx
@@ -0,0 +1,132 @@
+import { Tooltip, Typography } from 'antd';
+import React from 'react';
+import Highlight from 'react-highlighter';
+import styled from 'styled-components';
+import { DeprecationIcon } from '@src/app/entityV2/shared/components/styled/DeprecationIcon';
+import { SchemaMetadata, SubResourceType } from '../../../../../../types.generated';
+import { REDESIGN_COLORS } from '../../../../shared/constants';
+import NullableLabel, {
+    ForeignKeyLabel,
+    PartitioningKeyLabel,
+    PrimaryKeyLabel,
+} from '../../../../shared/tabs/Dataset/Schema/components/ConstraintLabels';
+import translateFieldPath from '../utils/translateFieldPath';
+import { ExtendedSchemaFields } from '../utils/types';
+
+const MAX_COMPACT_FIELD_PATH_LENGTH = 15;
+
+const FieldTitleWrapper = styled.div<{ $isCompact: boolean }>`
+    display: inline-flex;
+    flex-direction: ${(props) => (props.$isCompact ? 'column' : 'row')};
+    align-items: ${(props) => (props.$isCompact ? 'start' : 'center')};
+    justify-content: start;
+    gap: 10px;
+    width: 100%;
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+`;
+
+const FieldPathContainer = styled.div`
+    vertical-align: top;
+    display: inline-block;
+`;
+
+const DeprecatedContainer = styled.div`
+    color: ${REDESIGN_COLORS.DARK_GREY};
+`;
+
+const FieldPathText = styled(Typography.Text)<{ $isCompact: boolean }>`
+    font-size: 12px;
+    line-height: ${(props) => (props.$isCompact ? '14px' : '24px')};
+    font-weight: 600;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+
+    display: flex;
+    align-items: center;
+    gap: 6px;
+`;
+
+type InteriorTitleProps = {
+    parentUrn: string;
+    schemaMetadata: SchemaMetadata | undefined | null;
+    filterText: string;
+    fieldPath: string;
+    record: ExtendedSchemaFields;
+    isCompact?: boolean;
+};
+
+export const InteriorTitleContent = ({
+    parentUrn,
+    schemaMetadata,
+    filterText,
+    fieldPath,
+    record,
+    isCompact,
+}: InteriorTitleProps) => {
+    const fieldPathWithoutAnnotations = translateFieldPath(fieldPath);
+    const parentPathWithoutAnnotations = translateFieldPath(record.parent?.fieldPath || '');
+    let pathToDisplay = fieldPathWithoutAnnotations;
+
+    // if the parent path is a prefix of the field path, remove it for display purposes
+    if (parentPathWithoutAnnotations && fieldPathWithoutAnnotations.indexOf(parentPathWithoutAnnotations) === 0) {
+        // parent length + 1 because of the trailing `.` of the parent
+        pathToDisplay = fieldPathWithoutAnnotations.slice(parentPathWithoutAnnotations.length + 1);
+    }
+
+    let compactPathToDisplay;
+    if (isCompact) {
+        compactPathToDisplay =
+            pathToDisplay.length > MAX_COMPACT_FIELD_PATH_LENGTH
+                ? `${pathToDisplay.substring(0, MAX_COMPACT_FIELD_PATH_LENGTH)}...`
+                : pathToDisplay;
+    }
+
+    return (
+        <FieldTitleWrapper $isCompact={!!isCompact}>
+            {!!record.schemaFieldEntity?.deprecation?.deprecated && !isCompact && (
+                <DeprecatedContainer>
+                    <DeprecationIcon
+                        urn={parentUrn}
+                        subResource={fieldPath}
+                        subResourceType={SubResourceType.DatasetField}
+                        deprecation={record.schemaFieldEntity?.deprecation}
+                        showUndeprecate={false}
+                        showText={false}
+                        popoverPlacement="right"
+                    />
+                </DeprecatedContainer>
+            )}
+            <FieldPathContainer>
+                <FieldPathText $isCompact={!!isCompact}>
+                    {isCompact ? (
+                        <Tooltip title={pathToDisplay} placement="right">
+                            <Highlight search={filterText}>{compactPathToDisplay}</Highlight>
+                        </Tooltip>
+                    ) : (
+                        <Highlight search={filterText}>{pathToDisplay}</Highlight>
+                    )}
+                </FieldPathText>
+            </FieldPathContainer>
+            {!isCompact && (
+                <>
+                    {(schemaMetadata?.primaryKeys?.includes(fieldPath) || record.isPartOfKey) && <PrimaryKeyLabel />}
+                    {record.isPartitioningKey && <PartitioningKeyLabel />}
+                    {record.nullable && <NullableLabel />}
+                    {/* {record.nullable && <NullableLabel />} */}
+                    {schemaMetadata?.foreignKeys
+                        ?.filter(
+                            (constraint) =>
+                                (constraint?.sourceFields?.filter(
+                                    (sourceField) => sourceField?.fieldPath.trim() === fieldPath.trim(),
+                                ).length || 0) > 0,
+                        )
+                        .map((constraint) => (
+                            <ForeignKeyLabel key={constraint?.name} />
+                        ))}
+                </>
+            )}
+        </FieldTitleWrapper>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaDescriptionField.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaDescriptionField.tsx
new file mode 100644
index 00000000000000..d9d60894653d3b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaDescriptionField.tsx
@@ -0,0 +1,255 @@
+import { Typography, message, Button } from 'antd';
+import { EditOutlined } from '@ant-design/icons';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { FetchResult } from '@apollo/client';
+
+import CompactMarkdownViewer from '@src/app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer';
+import { UpdateDatasetMutation } from '../../../../../../graphql/dataset.generated';
+import UpdateDescriptionModal from '../../../../shared/components/legacy/DescriptionModal';
+import { removeMarkdown } from '../../../../shared/components/styled/StripMarkdownText';
+import SchemaEditableContext from '../../../../../shared/SchemaEditableContext';
+import { useEntityData } from '../../../../../entity/shared/EntityContext';
+import analytics, { EventType, EntityActionType } from '../../../../../analytics';
+import { Editor } from '../../../../shared/tabs/Documentation/components/editor/Editor';
+import { REDESIGN_COLORS } from '../../../../shared/constants';
+import { StringMapEntry } from '../../../../../../types.generated';
+import DocumentationPropagationDetails from '../../../../../sharedV2/propagation/DocumentationPropagationDetails';
+
+const EditIcon = styled(EditOutlined)`
+    cursor: pointer;
+    display: none;
+`;
+
+const AddNewDescription = styled(Button)`
+    display: flex;
+    width: 140px;
+    background-color: #fafafa;
+    border-radius: 4px;
+    align-items: center;
+    justify-content: center;
+`;
+
+const ExpandedActions = styled.div`
+    height: 10px;
+`;
+
+const DescriptionContainer = styled.div`
+    position: relative;
+    display: inline-block;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    width: 100%;
+    min-height: 22px;
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 24px;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    vertical-align: middle;
+    &:hover ${EditIcon} {
+        display: inline-block;
+    }
+
+    & ins.diff {
+        background-color: #b7eb8f99;
+        text-decoration: none;
+        &:hover {
+            background-color: #b7eb8faa;
+        }
+    }
+    & del.diff {
+        background-color: #ffa39e99;
+        text-decoration: line-through;
+        &: hover {
+            background-color: #ffa39eaa;
+        }
+    }
+`;
+const EditedLabel = styled(Typography.Text)`
+    display: inline-block;
+    margin-left: 8px;
+    color: rgba(150, 150, 150, 0.5);
+    font-style: italic;
+    position: relative;
+    top: -2px;
+`;
+
+const ReadLessText = styled(Typography.Link)`
+    margin-right: 4px;
+`;
+
+const StyledViewer = styled(Editor)`
+    padding-right: 8px;
+    display: block;
+
+    .remirror-editor.ProseMirror {
+        padding: 0;
+        font-size: 12px;
+        font-weight: 400;
+        line-height: 24px;
+        color: ${REDESIGN_COLORS.DARK_GREY};
+        vertical-align: middle;
+    }
+`;
+
+const DescriptionWrapper = styled.span`
+    display: inline-flex;
+    align-items: center;
+`;
+
+const AddModalWrapper = styled.div``;
+
+type Props = {
+    onExpanded: (expanded: boolean) => void;
+    expanded: boolean;
+    description: string;
+    fieldPath?: string;
+    original?: string | null;
+    onUpdate: (
+        description: string,
+    ) => Promise<FetchResult<UpdateDatasetMutation, Record<string, any>, Record<string, any>> | void>;
+    handleShowMore?: (_: string) => void;
+    isEdited?: boolean;
+    isReadOnly?: boolean;
+    isPropagated?: boolean;
+    sourceDetail?: StringMapEntry[] | null;
+};
+
+export default function DescriptionField({
+    expanded,
+    onExpanded: handleExpanded,
+    description,
+    fieldPath,
+    onUpdate,
+    handleShowMore,
+    isEdited = false,
+    original,
+    isReadOnly,
+    isPropagated,
+    sourceDetail,
+}: Props) {
+    const [showAddModal, setShowAddModal] = useState(false);
+
+    const overLimit = removeMarkdown(description).length > 40;
+    const isSchemaEditable = React.useContext(SchemaEditableContext);
+    const onCloseModal = () => {
+        setShowAddModal(false);
+    };
+    const { urn, entityType } = useEntityData();
+
+    const sendAnalytics = () => {
+        analytics.event({
+            type: EventType.EntityActionEvent,
+            actionType: EntityActionType.UpdateSchemaDescription,
+            entityType,
+            entityUrn: urn,
+        });
+    };
+
+    const onUpdateModal = async (desc: string | null) => {
+        message.loading({ content: 'Updating...' });
+        try {
+            await onUpdate(desc || '');
+            message.destroy();
+            message.success({ content: 'Updated!', duration: 2 });
+            sendAnalytics();
+        } catch (e: unknown) {
+            message.destroy();
+            if (e instanceof Error) message.error({ content: `Update Failed! \n ${e.message || ''}`, duration: 2 });
+        }
+        onCloseModal();
+    };
+
+    const enableEdits = isSchemaEditable && !isReadOnly;
+    const EditButton =
+        (enableEdits && description && <EditIcon twoToneColor="#52c41a" onClick={() => setShowAddModal(true)} />) ||
+        undefined;
+
+    const showAddButton = enableEdits && !description;
+
+    return (
+        <DescriptionContainer>
+            {/* {expanded || !overLimit ? ( */}
+            {expanded ? (
+                <>
+                    {!!description && <StyledViewer content={description} readOnly />}
+                    {!!description && (EditButton || overLimit) && (
+                        <ExpandedActions>
+                            {overLimit && (
+                                <ReadLessText
+                                    onClick={(e) => {
+                                        e.stopPropagation();
+                                        handleExpanded(false);
+                                    }}
+                                >
+                                    Read Less
+                                </ReadLessText>
+                            )}
+                            {EditButton}
+                        </ExpandedActions>
+                    )}
+                </>
+            ) : (
+                description && (
+                    <>
+                        {/* <StripMarkdownText
+                        limit={ABBREVIATED_LIMIT}
+                        // readMore={
+                        //     <>
+                        //         <Typography.Link
+                        //             onClick={(e) => {
+                        //                 e.stopPropagation();
+                        //                 handleExpanded(true);
+                        //             }}
+                        //         >
+                        //             Read More
+                        //         </Typography.Link>
+                        //     </>
+                        // }
+                        suffix={EditButton}
+                        shouldWrap
+                    > */}
+                        <DescriptionWrapper>
+                            {isPropagated && <DocumentationPropagationDetails sourceDetail={sourceDetail} />}
+                            &nbsp;
+                            <CompactMarkdownViewer
+                                content={description}
+                                lineLimit={1}
+                                handleShowMore={() => handleShowMore && handleShowMore(fieldPath || '')}
+                                fixedLineHeight
+                                customStyle={{ fontSize: '12px' }}
+                                scrollableY={false}
+                            />
+                        </DescriptionWrapper>
+                        {/* </StripMarkdownText> */}
+                    </>
+                )
+            )}
+            {isSchemaEditable && isEdited && <EditedLabel>(edited)</EditedLabel>}
+            {showAddModal && (
+                <AddModalWrapper onClick={(e) => e.stopPropagation()}>
+                    <UpdateDescriptionModal
+                        title={description ? 'Update description' : 'Add description'}
+                        description={description}
+                        original={original || ''}
+                        onClose={onCloseModal}
+                        onSubmit={onUpdateModal}
+                        isAddDesc={!description}
+                    />
+                </AddModalWrapper>
+            )}
+            {showAddButton && (
+                <AddNewDescription
+                    type="text"
+                    onClick={(e) => {
+                        setShowAddModal(true);
+                        e.stopPropagation();
+                    }}
+                >
+                    Add Description
+                </AddNewDescription>
+            )}
+        </DescriptionContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaFilterSelectContent.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaFilterSelectContent.tsx
new file mode 100644
index 00000000000000..c602cd7813650c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaFilterSelectContent.tsx
@@ -0,0 +1,71 @@
+import React, { useState } from 'react';
+import { Button, Checkbox } from 'antd';
+import styled from 'styled-components';
+
+import { SchemaFilterType } from '../../../../shared/tabs/Dataset/Schema/utils/filterSchemaRows';
+import { ANTD_GRAY } from '../../../../shared/constants';
+
+type Props = {
+    schemaFilterTypes: SchemaFilterType[];
+    setSchemaFilterTypes: (filters: SchemaFilterType[]) => void;
+    close: () => void;
+};
+
+const UpdateButton = styled(Button)`
+    width: 100%;
+    text-align: center;
+    background-color: ${(props) => props.theme.styles['primary-color']};
+    color: white;
+    border-radius: 0;
+    margin-top: 10px;
+`;
+
+const StyledCheckbox = styled(Checkbox)`
+    font-size: 14px;
+    line-height: 22px;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    margin-left: -16px;
+    padding-left: 16px;
+    :hover {
+        background-color: ${ANTD_GRAY[3]};
+    }
+    width: 232px;
+`;
+
+export default function SchemaFilterSelectContent({ schemaFilterTypes, setSchemaFilterTypes, close }: Props) {
+    const [stagedSchemaFilterTypes, setStagedSchemaFilterTypes] = useState<SchemaFilterType[]>(schemaFilterTypes);
+
+    return (
+        <div>
+            <Checkbox.Group
+                style={{ width: '200px' }}
+                defaultValue={stagedSchemaFilterTypes}
+                onChange={(values) => setStagedSchemaFilterTypes(values as SchemaFilterType[])}
+            >
+                <span>
+                    <StyledCheckbox value={SchemaFilterType.FieldPath}>Name</StyledCheckbox>
+                </span>
+                <span>
+                    <StyledCheckbox value={SchemaFilterType.Documentation}>Documentation</StyledCheckbox>
+                </span>
+                <span>
+                    <StyledCheckbox value={SchemaFilterType.Tags}>Tags</StyledCheckbox>
+                </span>
+                <span>
+                    <StyledCheckbox value={SchemaFilterType.Terms}>Glossary Terms</StyledCheckbox>
+                </span>
+            </Checkbox.Group>
+            <div>
+                <UpdateButton
+                    onClick={() => {
+                        setSchemaFilterTypes(stagedSchemaFilterTypes);
+                        close();
+                    }}
+                >
+                    Update
+                </UpdateButton>
+            </div>
+        </div>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaHeader.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaHeader.tsx
new file mode 100644
index 00000000000000..d95ff2992c2b8e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaHeader.tsx
@@ -0,0 +1,210 @@
+import { FileTextOutlined, TableOutlined } from '@ant-design/icons';
+import VersionSelector from '@app/entityV2/dataset/profile/schema/components/VersionSelector';
+import HistoryIcon from '@mui/icons-material/History';
+import { Button, Typography } from 'antd';
+import { Tooltip } from '@components';
+import { debounce } from 'lodash';
+import React, { useState } from 'react';
+import styled from 'styled-components/macro';
+import { SemanticVersionStruct } from '../../../../../../types.generated';
+import TabToolbar from '../../../../shared/components/styled/TabToolbar';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../../../../shared/constants';
+import { SchemaFilterType } from '../../../../shared/tabs/Dataset/Schema/utils/filterSchemaRows';
+import SchemaSearchInput from './SchemaSearchInput';
+
+const SchemaHeaderContainer = styled.div`
+    display: flex;
+    justify-content: space-between;
+    width: 100%;
+    padding-bottom: 3px;
+`;
+
+// Below styles are for buttons on the left side of the Schema Header
+const LeftButtonsGroup = styled.div`
+    &&& {
+        display: flex;
+        justify-content: left;
+        width: 100%;
+    }
+`;
+
+const RawButton = styled(Button)`
+    &&& {
+        display: flex;
+        margin-right: 10px;
+        justify-content: left;
+        align-items: center;
+    }
+`;
+
+const RawButtonTitleContainer = styled.span`
+    display: flex;
+    align-items: center;
+`;
+
+const RawButtonTitle = styled(Typography.Text)`
+    margin-left: 6px;
+`;
+
+const KeyButton = styled(Button)<{ $highlighted: boolean }>`
+    border-radius: 8px 0px 0px 8px;
+    font-weight: ${(props) => (props.$highlighted ? '600' : '400')};
+`;
+
+const ValueButton = styled(Button)<{ $highlighted: boolean }>`
+    border-radius: 0px 8px 8px 0px;
+    font-weight: ${(props) => (props.$highlighted ? '600' : '400')};
+`;
+
+const KeyValueButtonGroup = styled.div`
+    margin-right: 10px;
+    display: flex;
+`;
+
+// Below styles are for buttons on the right side of the Schema Header
+const RightButtonsGroup = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: right;
+    gap: 15px;
+
+    padding-left: 5px;
+`;
+
+const SchemaAuditButton = styled(Button)`
+    display: flex;
+    align-items: center;
+    background: ${REDESIGN_COLORS.WHITE};
+    padding: 0;
+    margin-right: 15px;
+
+    svg {
+        background: ${REDESIGN_COLORS.TITLE_PURPLE};
+        border-radius: 50%;
+        stroke: ${REDESIGN_COLORS.WHITE};
+        color: ${REDESIGN_COLORS.WHITE};
+        padding: 4px;
+        stroke-width: 0.5px;
+    }
+`;
+
+const MAX_ROWS_BEFORE_DEBOUNCE = 50;
+
+type Props = {
+    hasRaw: boolean;
+    showRaw: boolean;
+    setShowRaw: (show: boolean) => void;
+    hasKeySchema: boolean;
+    showKeySchema: boolean;
+    setShowKeySchema: (show: boolean) => void;
+    selectedVersion: string;
+    versionList: Array<SemanticVersionStruct>;
+    showSchemaTimeline: boolean;
+    setShowSchemaTimeline: any;
+    setFilterText: (text: string) => void;
+    numRows: number;
+    schemaFilterTypes: SchemaFilterType[];
+    setSchemaFilterTypes: (filters: SchemaFilterType[]) => void;
+    highlightedMatchIndex: number | null;
+    setHighlightedMatchIndex: (val: number | null) => void;
+    matches: { path: string; index: number }[];
+    schemaFilter: string;
+};
+
+export default function SchemaHeader({
+    hasRaw,
+    showRaw,
+    setShowRaw,
+    hasKeySchema,
+    showKeySchema,
+    setShowKeySchema,
+    selectedVersion,
+    versionList,
+    setShowSchemaTimeline,
+    showSchemaTimeline,
+    setFilterText,
+    numRows,
+    schemaFilterTypes,
+    setSchemaFilterTypes,
+    matches,
+    highlightedMatchIndex,
+    setHighlightedMatchIndex,
+    schemaFilter,
+}: Props) {
+    const [schemaFilterSelectOpen, setSchemaFilterSelectOpen] = useState(false);
+
+    const schemaAuditToggleText = showSchemaTimeline ? 'Close change history' : 'View change history';
+
+    const debouncedSetFilterText = debounce(
+        (e: React.ChangeEvent<HTMLInputElement>) => setFilterText(e.target.value),
+        numRows > MAX_ROWS_BEFORE_DEBOUNCE ? 100 : 0,
+    );
+
+    return (
+        <TabToolbar>
+            <SchemaHeaderContainer>
+                <LeftButtonsGroup>
+                    {hasRaw && (
+                        <RawButton type="text" onClick={() => setShowRaw(!showRaw)}>
+                            {showRaw ? (
+                                <RawButtonTitleContainer>
+                                    <TableOutlined style={{ padding: 0, margin: 0 }} />
+                                    <RawButtonTitle>Tabular</RawButtonTitle>
+                                </RawButtonTitleContainer>
+                            ) : (
+                                <RawButtonTitleContainer>
+                                    <FileTextOutlined style={{ padding: 0, margin: 0 }} />
+                                    <RawButtonTitle>Raw</RawButtonTitle>
+                                </RawButtonTitleContainer>
+                            )}
+                        </RawButton>
+                    )}
+                    {hasKeySchema && (
+                        <KeyValueButtonGroup>
+                            <KeyButton $highlighted={showKeySchema} onClick={() => setShowKeySchema(true)}>
+                                Key
+                            </KeyButton>
+                            <ValueButton $highlighted={!showKeySchema} onClick={() => setShowKeySchema(false)}>
+                                Value
+                            </ValueButton>
+                        </KeyValueButtonGroup>
+                    )}
+                    {!showRaw && (
+                        <SchemaSearchInput
+                            schemaFilterTypes={schemaFilterTypes}
+                            setSchemaFilterTypes={setSchemaFilterTypes}
+                            schemaFilter={schemaFilter}
+                            debouncedSetFilterText={debouncedSetFilterText}
+                            matches={matches.map((match) => match.path)}
+                            highlightedMatchIndex={highlightedMatchIndex}
+                            setHighlightedMatchIndex={setHighlightedMatchIndex}
+                            schemaFilterSelectOpen={schemaFilterSelectOpen}
+                            setSchemaFilterSelectOpen={setSchemaFilterSelectOpen}
+                            numRows={numRows}
+                        />
+                    )}
+                </LeftButtonsGroup>
+                <RightButtonsGroup>
+                    {versionList.length > 1 && (
+                        <VersionSelector
+                            versionList={versionList}
+                            selectedVersion={selectedVersion}
+                            isSibling={false}
+                            isPrimary
+                        />
+                    )}
+                    <Tooltip title={schemaAuditToggleText} showArrow={false}>
+                        <SchemaAuditButton
+                            type="text"
+                            data-testid="schema-blame-button"
+                            onClick={() => setShowSchemaTimeline(!showSchemaTimeline)}
+                            style={{ color: showSchemaTimeline ? REDESIGN_COLORS.BLUE : ANTD_GRAY[7] }}
+                        >
+                            <HistoryIcon />
+                        </SchemaAuditButton>
+                    </Tooltip>
+                </RightButtonsGroup>
+            </SchemaHeaderContainer>
+        </TabToolbar>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaRawView.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaRawView.tsx
new file mode 100644
index 00000000000000..07235a4e32cfb6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaRawView.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import { Typography } from 'antd';
+import styled from 'styled-components';
+import { Schema, SchemaMetadata } from '../../../../../../types.generated';
+import { diffJson, formatRawSchema, getRawSchema } from '../utils/utils';
+
+type Props = {
+    schemaDiff: {
+        current?: SchemaMetadata | Schema | null;
+        previous?: SchemaMetadata | null;
+    };
+    editMode: boolean;
+    showKeySchema: boolean;
+};
+
+const SchemaContainer = styled.div`
+    padding: 12px;
+`;
+
+export default function SchemaRawView({ schemaDiff, editMode, showKeySchema }: Props) {
+    const currentSchemaRaw = formatRawSchema(getRawSchema(schemaDiff.current?.platformSchema, showKeySchema));
+
+    const schemaRawDiff = editMode
+        ? currentSchemaRaw
+        : diffJson(formatRawSchema(getRawSchema(schemaDiff.previous?.platformSchema, showKeySchema)), currentSchemaRaw);
+
+    return (
+        <SchemaContainer>
+            <Typography.Text data-testid="schema-raw-view">
+                <pre>
+                    <code>{schemaRawDiff}</code>
+                </pre>
+            </Typography.Text>
+        </SchemaContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaRow.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaRow.tsx
new file mode 100644
index 00000000000000..bbdd935cba411a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaRow.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+
+const SchemaRow = React.forwardRef<HTMLTableRowElement>((props, ref) => {
+    // eslint-disable-next-line react/prop-types
+    const { children, ...rest } = props;
+    return (
+        <tr {...rest} ref={ref}>
+            {children}
+        </tr>
+    );
+});
+
+export default SchemaRow;
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaSearchInput.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaSearchInput.tsx
new file mode 100644
index 00000000000000..7c6333ab78b31d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaSearchInput.tsx
@@ -0,0 +1,175 @@
+import { FilterOutlined, SearchOutlined } from '@ant-design/icons';
+import { Input } from 'antd';
+import { Popover } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import { pluralize } from '../../../../../shared/textUtil';
+import { REDESIGN_COLORS } from '../../../../shared/constants';
+import { SchemaFilterType } from '../../../../shared/tabs/Dataset/Schema/utils/filterSchemaRows';
+import SchemaFilterSelectContent from './SchemaFilterSelectContent';
+
+const StyledInput = styled(Input)`
+    max-width: 300px;
+    background: ${REDESIGN_COLORS.LIGHT_GREY};
+    margin-top: 5px;
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 24px;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+`;
+
+const MatchLabelText = styled.span`
+    font-size: 12px;
+    font-style: normal;
+    font-weight: 700;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    padding-left: 10px;
+    margin-top: 5px;
+`;
+
+const SearchContainer = styled.span`
+    --antd-wave-shadow-color: transparent;
+    flex: auto;
+    white-space: nowrap;
+    display: flex;
+    align-items: center;
+
+    .ant-input-group-wrapper {
+        border-radius: 20px;
+        border: 1px solid ${REDESIGN_COLORS.GREY};
+        background: #f3f5fa;
+    }
+
+    .ant-input-group-wrapper {
+        background-color: #ffffff00 !important;
+    }
+
+    .ant-input-wrapper {
+        background-color: #ffffff00 !important;
+    }
+
+    .ant-input {
+        border-radius: 0;
+    }
+
+    .ant-input-affix-wrapper {
+        border-radius: 20px;
+        border: none;
+    }
+
+    .ant-input-group-addon {
+        border: none;
+        background-color: #ffffff00 !important;
+        left: 2px;
+    }
+
+    .ant-input-affix-wrapper:focus {
+        border: none;
+    }
+
+    .ant-input-affix-wrapper:not(.ant-input-affix-wrapper-disabled):hover {
+        border: none;
+    }
+
+    .ant-input-affix-wrapper::selection {
+        background: transparent;
+    }
+`;
+
+const StyledPopover = styled(Popover)`
+    border-radius: 50%;
+    background: ${REDESIGN_COLORS.GREY};
+`;
+
+const StyledFilterIcon = styled(FilterOutlined)<{ $hasFiltered: boolean }>`
+    cursor: pointer;
+    margin-left: -14px;
+    margin-right: -14px;
+    margin-top: -12px;
+    margin-bottom: -12px;
+    padding-left: 14px;
+    padding-right: 14px;
+    padding-top: 12px;
+    padding-bottom: 12px;
+    border-radius: 50%;
+    color: ${(props) => (props.$hasFiltered ? props.theme.styles['primary-color'] : 'inherit')};
+
+    :hover {
+        color: ${(props) => (!props.$hasFiltered ? props.theme.styles['primary-color'] : 'inherit')};
+    }
+`;
+
+interface SchemaSearchProps {
+    schemaFilterTypes: SchemaFilterType[];
+    setSchemaFilterTypes: (filters: SchemaFilterType[]) => void;
+    schemaFilter: string;
+    debouncedSetFilterText: (event: React.ChangeEvent<HTMLInputElement>) => void;
+    matches: string[];
+    highlightedMatchIndex: number | null;
+    setHighlightedMatchIndex: (val: number | null) => void;
+    schemaFilterSelectOpen: boolean;
+    setSchemaFilterSelectOpen: (val: boolean) => void;
+    numRows: number;
+}
+
+const SchemaSearchInput: React.FC<SchemaSearchProps> = ({
+    schemaFilterTypes,
+    setSchemaFilterTypes,
+    schemaFilter,
+    debouncedSetFilterText,
+    matches,
+    highlightedMatchIndex,
+    setHighlightedMatchIndex,
+    schemaFilterSelectOpen,
+    setSchemaFilterSelectOpen,
+    numRows,
+}: SchemaSearchProps) => {
+    const schemaFilterTypeSelectPrompt = (
+        <StyledPopover
+            placement="bottom"
+            open={schemaFilterSelectOpen}
+            onOpenChange={(val) => setSchemaFilterSelectOpen(val)}
+            content={
+                <SchemaFilterSelectContent
+                    close={() => setSchemaFilterSelectOpen(false)}
+                    schemaFilterTypes={schemaFilterTypes}
+                    setSchemaFilterTypes={setSchemaFilterTypes}
+                />
+            }
+            trigger="click"
+            overlayInnerStyle={{ padding: 0 }}
+        >
+            <StyledFilterIcon
+                $hasFiltered={schemaFilterTypes.length < 4}
+                style={{ cursor: 'pointer', margin: '-10px', padding: '10px' }}
+            />
+        </StyledPopover>
+    );
+
+    return (
+        <SearchContainer>
+            <StyledInput
+                bordered={false}
+                disabled={schemaFilterTypes.length === 0}
+                addonAfter={schemaFilterTypeSelectPrompt}
+                defaultValue={schemaFilter}
+                placeholder="Search"
+                onChange={debouncedSetFilterText}
+                allowClear
+                prefix={<SearchOutlined />}
+                onKeyDown={(e) => {
+                    if (e.code === 'Enter' && highlightedMatchIndex !== null && matches.length > 0) {
+                        setHighlightedMatchIndex((highlightedMatchIndex + 1) % matches.length);
+                    }
+                }}
+            />
+            {schemaFilter.length > 0 && (
+                <MatchLabelText>
+                    Matched {matches.length} {pluralize(matches.length, 'column')} of {numRows}
+                </MatchLabelText>
+            )}
+        </SearchContainer>
+    );
+};
+
+export default SchemaSearchInput;
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaVersionSummary.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaVersionSummary.tsx
new file mode 100644
index 00000000000000..b0f07a59e29c0e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaVersionSummary.tsx
@@ -0,0 +1,52 @@
+import React from 'react';
+import { Typography } from 'antd';
+import styled from 'styled-components';
+
+const SummaryContainer = styled.div`
+    margin-bottom: 16px;
+    padding-left: 10px;
+    & ul {
+        padding-inline-start: 30px;
+        margin-top: 5px;
+    }
+`;
+
+export interface SchemaDiffSummary {
+    added: number;
+    removed: number;
+    updated: number;
+}
+
+type Props = {
+    diffSummary: SchemaDiffSummary;
+};
+
+export default function SchemaVersionSummary({ diffSummary }: Props) {
+    return (
+        <SummaryContainer>
+            <ul>
+                {diffSummary.added ? (
+                    <li>
+                        <Typography.Text>{`${diffSummary.added} column${
+                            diffSummary.added > 1 ? 's were' : ' was'
+                        } added`}</Typography.Text>
+                    </li>
+                ) : null}
+                {diffSummary.removed ? (
+                    <li>
+                        <Typography.Text>{`${diffSummary.removed} column${
+                            diffSummary.removed > 1 ? 's were' : ' was'
+                        } removed`}</Typography.Text>
+                    </li>
+                ) : null}
+                {diffSummary.updated ? (
+                    <li>
+                        <Typography.Text>{`${diffSummary.updated} description${
+                            diffSummary.updated > 1 ? 's were' : ' was'
+                        } updated`}</Typography.Text>
+                    </li>
+                ) : null}
+            </ul>
+        </SummaryContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/StructuredPropValues.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/StructuredPropValues.tsx
new file mode 100644
index 00000000000000..8d74ff748ab8d3
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/StructuredPropValues.tsx
@@ -0,0 +1,69 @@
+import StructuredPropertyValue from '@src/app/entityV2/shared/tabs/Properties/StructuredPropertyValue';
+import { mapStructuredPropertyToPropertyRow } from '@src/app/entityV2/shared/tabs/Properties/useStructuredProperties';
+import { useEntityRegistry } from '@src/app/useEntityRegistry';
+import { SchemaFieldEntity, SearchResult, StdDataType } from '@src/types.generated';
+import { Tooltip } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+
+const ValuesContainer = styled.span`
+    max-width: 120px;
+    display: flex;
+`;
+
+const MoreIndicator = styled.span`
+    float: right;
+`;
+
+interface Props {
+    schemaFieldEntity: SchemaFieldEntity;
+    propColumn: SearchResult | undefined;
+}
+
+const StructuredPropValues = ({ schemaFieldEntity, propColumn }: Props) => {
+    const entityRegistry = useEntityRegistry();
+
+    const property = schemaFieldEntity.structuredProperties?.properties?.find(
+        (prop) => prop.structuredProperty.urn === propColumn?.entity?.urn,
+    );
+    const propRow = property ? mapStructuredPropertyToPropertyRow(property) : undefined;
+    const values = propRow?.values;
+    const isRichText = propRow?.dataType?.info.type === StdDataType.RichText;
+
+    const hasMoreValues = values && values.length > 2;
+    const displayedValues = hasMoreValues ? values.slice(0, 1) : values;
+    const tooltipContent = values?.map((value) => {
+        const title = value.entity
+            ? entityRegistry.getDisplayName(value.entity.type, value.entity)
+            : value.value?.toString();
+        return <div>{title}</div>;
+    });
+
+    return (
+        <>
+            {values && (
+                <>
+                    {displayedValues?.map((val) => {
+                        return (
+                            <ValuesContainer>
+                                <StructuredPropertyValue
+                                    value={val}
+                                    isRichText={isRichText}
+                                    truncateText
+                                    isFieldColumn
+                                />
+                            </ValuesContainer>
+                        );
+                    })}
+                    {hasMoreValues && (
+                        <Tooltip title={tooltipContent} showArrow={false}>
+                            <MoreIndicator>...</MoreIndicator>
+                        </Tooltip>
+                    )}
+                </>
+            )}
+        </>
+    );
+};
+
+export default StructuredPropValues;
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/TypeIcon.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/TypeIcon.tsx
new file mode 100644
index 00000000000000..4117bea0c53879
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/TypeIcon.tsx
@@ -0,0 +1,113 @@
+import {
+    FieldBinaryOutlined,
+    NumberOutlined,
+    UnorderedListOutlined,
+    QuestionCircleOutlined,
+    UnderlineOutlined,
+    CalendarOutlined,
+    FieldTimeOutlined,
+} from '@ant-design/icons';
+import { Typography } from 'antd';
+import { Tooltip } from '@components';
+import React, { FC } from 'react';
+import { VscSymbolString, VscFileBinary } from 'react-icons/vsc';
+import styled from 'styled-components';
+import { capitalizeFirstLetter } from '../../../../../shared/textUtil';
+import { SchemaFieldDataType } from '../../../../../../types.generated';
+
+const TypeIconContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    text-align: center;
+    margin-top: 2.5px;
+    width: 40px;
+`;
+
+const TypeSubtitle = styled(Typography.Text)<{ hasicon?: string }>`
+    font-size: 8px;
+    text-align: center;
+    ${(props) => (props.hasicon ? '' : 'margin-top: 4px;')}
+`;
+
+const IconSpan = styled.span`
+    font-size: 18px;
+`;
+
+const DATA_TYPE_ICON_MAP: Record<SchemaFieldDataType, { icon: FC<{ style: any }> | null; size: number; text: string }> =
+    {
+        [SchemaFieldDataType.Boolean]: {
+            icon: FieldBinaryOutlined,
+            size: 18,
+            text: 'Boolean',
+        },
+        [SchemaFieldDataType.Fixed]: { icon: FieldBinaryOutlined, size: 18, text: 'Fixed' },
+        [SchemaFieldDataType.String]: {
+            icon: () => (
+                <IconSpan role="img" aria-label="calendar" className="anticon anticon-calendar">
+                    <VscSymbolString />
+                </IconSpan>
+            ),
+            size: 20,
+            text: 'String',
+        },
+        [SchemaFieldDataType.Bytes]: {
+            icon: () => (
+                <IconSpan role="img" aria-label="calendar" className="anticon anticon-calendar">
+                    <VscFileBinary />
+                </IconSpan>
+            ),
+            size: 18,
+            text: 'Bytes',
+        },
+        [SchemaFieldDataType.Number]: { icon: NumberOutlined, size: 14, text: 'Number' },
+        [SchemaFieldDataType.Date]: { icon: CalendarOutlined, size: 18, text: 'Date' },
+        [SchemaFieldDataType.Time]: { icon: FieldTimeOutlined, size: 18, text: 'Time' },
+        [SchemaFieldDataType.Enum]: { icon: UnorderedListOutlined, size: 18, text: 'Enum' },
+        [SchemaFieldDataType.Null]: { icon: QuestionCircleOutlined, size: 16, text: '' },
+        [SchemaFieldDataType.Map]: { icon: null, size: 0, text: 'Map' },
+        [SchemaFieldDataType.Array]: { icon: UnorderedListOutlined, size: 14, text: 'Array' },
+        [SchemaFieldDataType.Union]: { icon: UnderlineOutlined, size: 14, text: 'Union' },
+        [SchemaFieldDataType.Struct]: { icon: null, size: 0, text: 'Struct' },
+    };
+
+const truncate = (length: number, input?: string | null) => {
+    if (!input) return '';
+    if (input.length > length) {
+        return `${input.substring(0, length)}...`;
+    }
+    return input;
+};
+
+type Props = {
+    type: SchemaFieldDataType;
+    nativeDataType: string | null | undefined;
+};
+
+export default function TypeIcon({ type, nativeDataType }: Props) {
+    const { icon: Icon, size, text } = DATA_TYPE_ICON_MAP[type];
+
+    // if unable to match type to DataHub, display native type info by default
+    const nativeFallback = type === SchemaFieldDataType.Null;
+
+    // eslint-disable-next-line react/prop-types
+    const NativeDataTypeTooltip = ({ children }) =>
+        nativeDataType ? (
+            <Tooltip placement="top" title={capitalizeFirstLetter(nativeDataType)}>
+                {children}
+            </Tooltip>
+        ) : (
+            <>{children}</>
+        );
+
+    return (
+        <NativeDataTypeTooltip>
+            <TypeIconContainer data-testid={`icon-${type}`}>
+                {Icon && <Icon style={{ fontSize: size }} />}
+                <TypeSubtitle type="secondary" hasicon={Icon ? 'yes' : undefined}>
+                    {nativeFallback ? truncate(250, nativeDataType) : text}
+                </TypeSubtitle>
+            </TypeIconContainer>
+        </NativeDataTypeTooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/VersionSelector.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/VersionSelector.tsx
new file mode 100644
index 00000000000000..2a3b255e31c770
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/VersionSelector.tsx
@@ -0,0 +1,153 @@
+import { CaretDownOutlined } from '@ant-design/icons';
+import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
+import { toRelativeTimeString } from '@app/shared/time/timeUtils';
+import PlatformIcon from '@app/sharedV2/icons/PlatformIcon';
+import navigateToUrl from '@app/utils/navigateToUrl';
+import { DataPlatform, SemanticVersionStruct } from '@types';
+import { Select } from 'antd';
+import { Tooltip } from '@components';
+import React, { useEffect, useMemo } from 'react';
+import { useHistory, useLocation } from 'react-router-dom';
+import styled from 'styled-components/macro';
+
+export const SEMANTIC_VERSION_PARAM = 'semantic_version';
+export const SIBLING_VERSION_PARAM = 'secondary_version'; // Note: Currently unused
+
+const Wrapper = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 4px;
+`;
+
+const SchemaBlameSelector = styled(Select)`
+    &&& .ant-select-selector {
+        background: ${REDESIGN_COLORS.LIGHT_GREY};
+        font-size: 14px;
+        font-weight: 500;
+        line-height: 24px;
+        color: ${REDESIGN_COLORS.DARK_GREY};
+        min-width: 30px;
+        margin-right: 10px;
+        border-radius: 20px;
+    }
+`;
+
+const SchemaBlameSelectorOption = styled(Select.Option)`
+    &&& {
+        overflow: visible;
+        margin-top: 6px;
+        width: 100%;
+    }
+`;
+
+interface VersionOption {
+    label: string;
+    timestamp: number;
+    disabled: boolean;
+}
+
+interface Props {
+    versionList: Array<SemanticVersionStruct>;
+    selectedVersion: string;
+    platform?: DataPlatform;
+    isSibling: boolean;
+    isPrimary: boolean;
+    minTimestamp?: number;
+    maxTimestamp?: number;
+    primaryVersion?: string;
+}
+
+/**
+ * Note: Configured to allow for displaying two version selectors, one for each sibling.
+ * Currently not used in that way.
+ */
+export default function VersionSelector({
+    versionList,
+    selectedVersion,
+    platform,
+    isSibling,
+    isPrimary,
+    minTimestamp,
+    maxTimestamp,
+    primaryVersion,
+}: Props) {
+    const location = useLocation();
+    const history = useHistory();
+
+    const versionOptions = useMemo(() => {
+        return getVersionOptions(
+            versionList,
+            isPrimary ? undefined : minTimestamp,
+            isPrimary ? undefined : maxTimestamp,
+        );
+    }, [versionList, minTimestamp, maxTimestamp, isPrimary]);
+
+    useEffect(() => {
+        // If the selected version is disabled, navigate to the first available version
+        if (isPrimary || !selectedVersion) return;
+        const selectedIndex = versionOptions.findIndex((v) => v.label === selectedVersion);
+        const nextOption = versionOptions.find((v) => !v.disabled);
+        if (selectedIndex !== -1 && versionOptions[selectedIndex].disabled && nextOption?.label) {
+            navigateToUrl({
+                location,
+                history,
+                urlParam: isSibling ? SIBLING_VERSION_PARAM : SEMANTIC_VERSION_PARAM,
+                value: nextOption.label,
+            });
+        }
+    }, [versionOptions, selectedVersion, isSibling, isPrimary, history, location]);
+
+    return (
+        <Wrapper>
+            {platform && <PlatformIcon platform={platform} size={17} />}
+            <SchemaBlameSelector
+                value={selectedVersion}
+                onChange={(e) => {
+                    navigateToUrl({
+                        location,
+                        history,
+                        urlParam: isSibling ? SIBLING_VERSION_PARAM : SEMANTIC_VERSION_PARAM,
+                        value: e as string,
+                    });
+                }}
+                data-testid="schema-version-selector-dropdown"
+                suffixIcon={<CaretDownOutlined />}
+            >
+                {versionOptions.map((v) => (
+                    <SchemaBlameSelectorOption
+                        value={v.label}
+                        data-testid={`sem-ver-select-button-${v.label}`}
+                        disabled={v.disabled}
+                    >
+                        <Tooltip
+                            title={v.disabled ? `Incompatible with primary version ${primaryVersion}` : ''}
+                            placement="left"
+                        >
+                            {`${v.label} - ${toRelativeTimeString(v.timestamp) || 'unknown'}`}
+                        </Tooltip>
+                    </SchemaBlameSelectorOption>
+                ))}
+            </SchemaBlameSelector>
+        </Wrapper>
+    );
+}
+
+function getVersionOptions(
+    versionList: Array<SemanticVersionStruct>,
+    minTimestamp?: number,
+    maxTimestamp?: number,
+): VersionOption[] {
+    return versionList
+        .map(
+            (v) =>
+                v?.semanticVersion &&
+                v?.semanticVersionTimestamp && {
+                    label: v.semanticVersion,
+                    timestamp: v.semanticVersionTimestamp,
+                    disabled:
+                        v.semanticVersionTimestamp < (minTimestamp || 0) ||
+                        v.semanticVersionTimestamp > (maxTimestamp || Number.POSITIVE_INFINITY),
+                },
+        )
+        .filter((v): v is VersionOption => !!v);
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/constants.ts b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/constants.ts
new file mode 100644
index 00000000000000..ae842ab9558850
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/constants.ts
@@ -0,0 +1,4 @@
+export const KEY_SCHEMA_PREFIX = '[key=True].';
+export const VERSION_PREFIX = '[version=2.0].';
+export const ARRAY_TOKEN = '[type=array]';
+export const UNION_TOKEN = '[type=union]';
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/schemaTitleRenderer.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/schemaTitleRenderer.tsx
new file mode 100644
index 00000000000000..86f9166faab758
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/schemaTitleRenderer.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { SchemaMetadata } from '../../../../../../types.generated';
+import { InteriorTitleContent } from '../components/InteriorTitleContent';
+import { ExtendedSchemaFields } from './types';
+
+export default function useSchemaTitleRenderer(
+    parentUrn: string,
+    schemaMetadata: SchemaMetadata | undefined | null,
+    filterText: string,
+    isCompact?: boolean,
+) {
+    return (fieldPath: string, record: ExtendedSchemaFields): JSX.Element => {
+        return (
+            <InteriorTitleContent
+                parentUrn={parentUrn}
+                isCompact={isCompact}
+                filterText={filterText}
+                fieldPath={fieldPath}
+                record={record}
+                schemaMetadata={schemaMetadata}
+            />
+        );
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/schemaTypeRenderer.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/schemaTypeRenderer.tsx
new file mode 100644
index 00000000000000..ffc1b39072fb6b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/schemaTypeRenderer.tsx
@@ -0,0 +1,41 @@
+import { Popover } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import TypeLabel from '../../../../shared/tabs/Dataset/Schema/components/TypeLabel';
+import { ExtendedSchemaFields } from './types';
+import { REDESIGN_COLORS } from '../../../../shared/constants';
+
+const FieldTypeWrapper = styled.div`
+    display: inline-flex;
+    align-items: center;
+`;
+
+const FieldTypeContainer = styled.div`
+    vertical-align: top;
+    display: flex;
+    color: ${REDESIGN_COLORS.GREY_500};
+`;
+
+type InteriorTypeProps = {
+    record: ExtendedSchemaFields;
+};
+
+const InteriorTypeContent = ({ record }: InteriorTypeProps) => {
+    return (
+        <FieldTypeWrapper>
+            <FieldTypeContainer>
+                <TypeLabel type={record.type} nativeDataType={record.nativeDataType} />
+            </FieldTypeContainer>
+        </FieldTypeWrapper>
+    );
+};
+
+export default function useSchemaTypeRenderer() {
+    return (fieldPath: string, record: ExtendedSchemaFields): JSX.Element => {
+        return (
+            <Popover content={<InteriorTypeContent record={record} />}>
+                <InteriorTypeContent record={record} />
+            </Popover>
+        );
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/translateFieldPath.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/translateFieldPath.tsx
new file mode 100644
index 00000000000000..ccb532bc2d4b34
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/translateFieldPath.tsx
@@ -0,0 +1,24 @@
+import { KEY_SCHEMA_PREFIX, VERSION_PREFIX } from './constants';
+import translateFieldPathSegment from './translateFieldPathSegment';
+
+export default function translateFieldPath(fieldPath: string) {
+    // fields that are part of a key schema are prefixed with [key=true]
+    // we don't want to display this
+    const cleanedFieldPath = fieldPath.replace(KEY_SCHEMA_PREFIX, '').replace(VERSION_PREFIX, '');
+    const fieldPathParts = cleanedFieldPath.split('.');
+
+    // convert each fieldPathSegment into a human readable format
+    const adjustedFieldPathParts = fieldPathParts.map(translateFieldPathSegment);
+
+    let fieldPathWithoutAnnotations = adjustedFieldPathParts.join('');
+
+    // clean up artifacts from unions and arrays nested within one another
+    fieldPathWithoutAnnotations = fieldPathWithoutAnnotations.replace(/\.\./g, '.').replace(/\. /g, ' ');
+
+    // removing a hanging dot if present
+    if (fieldPathWithoutAnnotations.endsWith('.')) {
+        fieldPathWithoutAnnotations = fieldPathWithoutAnnotations.slice(0, -1);
+    }
+
+    return fieldPathWithoutAnnotations;
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/translateFieldPathSegment.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/translateFieldPathSegment.tsx
new file mode 100644
index 00000000000000..7153a38a32c3b5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/translateFieldPathSegment.tsx
@@ -0,0 +1,53 @@
+import { ARRAY_TOKEN, UNION_TOKEN } from './constants';
+
+export default function translateFieldPathSegment(fieldPathSegment, i, fieldPathParts) {
+    // for each segment, convert its fieldPath representation into a human readable version
+    // We leave the annotations present and strip them out in a second pass
+    const previousSegment = fieldPathParts[i - 1];
+
+    // we need to look back to see how many arrays there were previously to display the array indexing notation after the field
+    let previousArrayCount = 0;
+    for (let j = i - 1; j >= 0; j--) {
+        if (fieldPathParts[j] === ARRAY_TOKEN) {
+            previousArrayCount++;
+        }
+        if (fieldPathParts[j].indexOf('[') === -1) {
+            break;
+        }
+    }
+
+    // strip out the version prefix
+    if (
+        fieldPathSegment.startsWith('[version=') ||
+        fieldPathSegment === ARRAY_TOKEN ||
+        fieldPathSegment === UNION_TOKEN
+    ) {
+        return '';
+    }
+
+    // structs that qualify a union are represented as [union]union_field.[type=QualifiedStruct].qualified_struct_field
+    // we convert into union_field. (QualifiedStruct) qualified_struct_field
+    if (fieldPathSegment.startsWith('[type=') && fieldPathSegment.endsWith(']')) {
+        const typeName = fieldPathSegment.replace('[type=', '').replace(']', '');
+        // if the qualified struct is the last element, just show the qualified struct
+        if (i === fieldPathParts.length - 1) {
+            return ` ${typeName}`;
+        }
+
+        // if the qualified struct is not the last element, surround with parens
+        if (previousSegment === UNION_TOKEN) {
+            return `(${typeName}) `;
+        }
+
+        // if the struct is not qualifying, ignore
+        return '';
+    }
+
+    // arrays are represented as [type=array]array_field_name
+    // we convert into array_field_name[]
+    if (previousArrayCount > 0) {
+        return `${fieldPathSegment}${'[]'.repeat(previousArrayCount)}.`;
+    }
+
+    return `${fieldPathSegment}.`;
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/types.ts b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/types.ts
new file mode 100644
index 00000000000000..b71b21112ddb58
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/types.ts
@@ -0,0 +1,16 @@
+import { SchemaField, GlobalTags } from '../../../../../../types.generated';
+
+export interface ExtendedSchemaFields extends SchemaField {
+    children?: Array<ExtendedSchemaFields>;
+    depth?: number;
+    previousDescription?: string | null;
+    pastGlobalTags?: GlobalTags | null;
+    isNewRow?: boolean;
+    isDeletedRow?: boolean;
+    parent?: ExtendedSchemaFields;
+}
+
+export enum SchemaViewType {
+    NORMAL,
+    BLAME,
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/utils.ts b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/utils.ts
new file mode 100644
index 00000000000000..f9afa21b670e3e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/utils.ts
@@ -0,0 +1,283 @@
+import { SorterResult } from 'antd/lib/table/interface';
+import * as diff from 'diff';
+
+import {
+    EditableSchemaFieldInfo,
+    EditableSchemaMetadata,
+    EditableSchemaMetadataUpdate,
+    PlatformSchema,
+    SchemaField,
+} from '../../../../../../types.generated';
+import { convertTagsForUpdate } from '../../../../../shared/tags/utils/convertTagsForUpdate';
+import { SchemaDiffSummary } from '../components/SchemaVersionSummary';
+import { KEY_SCHEMA_PREFIX, UNION_TOKEN, VERSION_PREFIX } from './constants';
+import { ExtendedSchemaFields } from './types';
+
+export function convertEditableSchemaMeta(
+    editableSchemaMeta?: Array<EditableSchemaFieldInfo>,
+    fields?: Array<SchemaField>,
+): Array<SchemaField> {
+    const updatedFields = [...(fields || [])] as Array<SchemaField>;
+    if (editableSchemaMeta && editableSchemaMeta.length > 0) {
+        editableSchemaMeta.forEach((updatedField) => {
+            const originalFieldIndex = updatedFields.findIndex((f) => f.fieldPath === updatedField.fieldPath);
+            if (originalFieldIndex > -1) {
+                updatedFields[originalFieldIndex] = {
+                    ...updatedFields[originalFieldIndex],
+                    description: updatedField.description,
+                    globalTags: { ...updatedField.globalTags },
+                };
+            }
+        });
+    }
+    return updatedFields;
+}
+
+export function convertEditableSchemaMetadataForUpdate(
+    editableSchemaMetadata: EditableSchemaMetadata | null | undefined,
+): EditableSchemaMetadataUpdate {
+    return {
+        editableSchemaFieldInfo:
+            editableSchemaMetadata?.editableSchemaFieldInfo.map((editableSchemaFieldInfo) => ({
+                fieldPath: editableSchemaFieldInfo?.fieldPath,
+                description: editableSchemaFieldInfo?.description,
+                globalTags: { tags: convertTagsForUpdate(editableSchemaFieldInfo?.globalTags?.tags || []) },
+            })) || [],
+    };
+}
+
+export function filterKeyFieldPath(showKeySchema: boolean, field: SchemaField) {
+    return field.fieldPath.indexOf(KEY_SCHEMA_PREFIX) > -1 ? showKeySchema : !showKeySchema;
+}
+
+export function downgradeV2FieldPath(fieldPath?: string | null) {
+    if (!fieldPath) {
+        return fieldPath;
+    }
+
+    const cleanedFieldPath = fieldPath.replace(KEY_SCHEMA_PREFIX, '').replace(VERSION_PREFIX, '');
+
+    // strip out all annotation segments
+    return cleanedFieldPath
+        .split('.')
+        .map((segment) => (segment.startsWith('[') ? null : segment))
+        .filter(Boolean)
+        .join('.');
+}
+
+export function pathMatchesNewPath(fieldPathA?: string | null, fieldPathB?: string | null) {
+    return fieldPathA === fieldPathB || fieldPathA === downgradeV2FieldPath(fieldPathB);
+}
+
+// group schema fields by fieldPath and grouping for hierarchy in schema table
+export function groupByFieldPath(
+    schemaRows?: Array<SchemaField>,
+    options: {
+        showKeySchema: boolean;
+    } = { showKeySchema: false },
+): Array<ExtendedSchemaFields> {
+    const rows = [
+        ...(schemaRows?.filter(filterKeyFieldPath.bind({}, options.showKeySchema)) || []),
+    ] as Array<ExtendedSchemaFields>;
+
+    const outputRows: Array<ExtendedSchemaFields> = [];
+    const outputRowByPath = {};
+
+    for (let rowIndex = 0; rowIndex < rows.length; rowIndex++) {
+        let parentRow: null | ExtendedSchemaFields = null;
+        const row = { children: undefined, ...rows[rowIndex], depth: 0 };
+
+        for (let j = rowIndex - 1; j >= 0; j--) {
+            const rowTokens = row.fieldPath.split('.');
+            const isQualifyingUnionField = rowTokens[rowTokens.length - 3] === UNION_TOKEN;
+            if (isQualifyingUnionField) {
+                // in the case of unions, parent will not be a subset of the child
+                rowTokens.splice(rowTokens.length - 2, 1);
+                const parentPath = rowTokens.join('.');
+
+                if (rows[j].fieldPath === parentPath) {
+                    parentRow = outputRowByPath[rows[j].fieldPath];
+                    break;
+                }
+            } else {
+                // In the case of structs, arrays, etc, parent will be the first token from
+                // the left of this field's name(last token of the path) that does not enclosed in [].
+                let parentPath: null | string = null;
+                for (
+                    let lastParentTokenIndex = rowTokens.length - 2;
+                    lastParentTokenIndex >= 0;
+                    --lastParentTokenIndex
+                ) {
+                    const lastParentToken: string = rowTokens[lastParentTokenIndex];
+                    if (lastParentToken && lastParentToken[0] !== '[') {
+                        parentPath = rowTokens.slice(0, lastParentTokenIndex + 1).join('.');
+                        break;
+                    }
+                }
+                if (parentPath && rows[j].fieldPath === parentPath) {
+                    parentRow = outputRowByPath[rows[j].fieldPath];
+                    break;
+                }
+            }
+        }
+
+        // if the parent field exists in the ouput, add the current row as a child
+        if (parentRow) {
+            row.depth = (parentRow.depth || 0) + 1;
+            row.parent = parentRow;
+            parentRow.children = [...(parentRow.children || []), row];
+        } else {
+            outputRows.push(row);
+        }
+        outputRowByPath[row.fieldPath] = row;
+    }
+    return outputRows;
+}
+
+export function diffMarkdown(oldStr: string, newStr: string) {
+    const diffArray = diff.diffChars(oldStr || '', newStr || '');
+    return diffArray
+        .map((diffOne) => {
+            if (diffOne.added) {
+                return `<ins class="diff">${diffOne.value}</ins>`;
+            }
+            if (diffOne.removed) {
+                return `<del class="diff">${diffOne.value}</del>`;
+            }
+            return diffOne.value;
+        })
+        .join('');
+}
+
+export function diffJson(oldStr: string, newStr: string) {
+    const diffArray = diff.diffJson(oldStr || '', newStr || '');
+    return diffArray
+        .map((diffOne) => {
+            if (diffOne.added) {
+                return `+${diffOne.value}`;
+            }
+            if (diffOne.removed) {
+                return `-${diffOne.value}`;
+            }
+            return diffOne.value;
+        })
+        .join('');
+}
+
+export function formatRawSchema(schemaValue?: string | null): string {
+    try {
+        if (!schemaValue) {
+            return schemaValue || '';
+        }
+        return JSON.stringify(JSON.parse(schemaValue), null, 2);
+    } catch (e) {
+        return schemaValue || '';
+    }
+}
+
+export function getRawSchema(schema: PlatformSchema | undefined | null, showKeySchema: boolean): string {
+    if (!schema) {
+        return '';
+    }
+
+    if (schema.__typename === 'TableSchema') {
+        return schema.schema;
+    }
+    if (schema.__typename === 'KeyValueSchema') {
+        return showKeySchema ? schema.keySchema : schema.valueSchema;
+    }
+    return '';
+}
+
+// Get diff summary between two versions and prepare to visualize description diff changes
+export function getDiffSummary(
+    currentVersionRows?: Array<SchemaField>,
+    previousVersionRows?: Array<SchemaField>,
+    options: { showKeySchema: boolean } = { showKeySchema: false },
+): {
+    rows: Array<ExtendedSchemaFields>;
+    diffSummary: SchemaDiffSummary;
+} {
+    let rows = [
+        ...(currentVersionRows?.filter(filterKeyFieldPath.bind({}, options.showKeySchema)) || []),
+    ] as Array<ExtendedSchemaFields>;
+    const previousRows = [
+        ...(previousVersionRows?.filter(filterKeyFieldPath.bind({}, options.showKeySchema)) || []),
+    ] as Array<ExtendedSchemaFields>;
+
+    const diffSummary: SchemaDiffSummary = {
+        added: 0,
+        removed: 0,
+        updated: 0,
+    };
+
+    if (previousVersionRows && previousVersionRows.length > 0) {
+        rows.forEach((field, rowIndex) => {
+            const relevantPastFieldIndex = previousRows.findIndex(
+                (pf) => pf.type === rows[rowIndex].type && pf.fieldPath === rows[rowIndex].fieldPath,
+            );
+            if (relevantPastFieldIndex > -1) {
+                if (previousRows[relevantPastFieldIndex].description !== rows[rowIndex].description) {
+                    rows[rowIndex] = {
+                        ...rows[rowIndex],
+                        previousDescription: previousRows[relevantPastFieldIndex].description,
+                    };
+                    diffSummary.updated++; // Increase updated row number in diff summary
+                }
+                previousRows.splice(relevantPastFieldIndex, 1);
+            } else {
+                rows[rowIndex] = { ...rows[rowIndex], isNewRow: true };
+                diffSummary.added++; // Increase added row number in diff summary
+            }
+        });
+        rows = [...rows, ...previousRows.map((pf) => ({ ...pf, isDeletedRow: true }))];
+        diffSummary.removed = previousRows.length; // removed row number in diff summary
+    }
+
+    return { rows, diffSummary };
+}
+
+// we need to calculate excluding collapsed fields because Antd table expects
+// an indexToScroll to only counting based on visible fields
+export function findIndexOfFieldPathExcludingCollapsedFields(
+    fieldPath: string,
+    expandedRows: Set<string>,
+    rows: Array<ExtendedSchemaFields>,
+    sorter: SorterResult<any> | undefined,
+    compareFn: ((a: any, b: any) => number) | undefined,
+) {
+    let index = 0; // This will keep track of the index across recursive calls
+
+    function search(shadowedRows) {
+        let sortedRows = shadowedRows;
+        if (sorter?.order === 'ascend') {
+            sortedRows = shadowedRows.toSorted(compareFn);
+        } else if (sorter?.order === 'descend') {
+            sortedRows = shadowedRows.toSorted(compareFn).toReversed();
+        }
+
+        // eslint-disable-next-line no-restricted-syntax
+        for (const row of sortedRows) {
+            // eslint-disable-next) {
+            // Check if the current row's ID matches the ID we're looking for
+            if (row.fieldPath === fieldPath) {
+                return index;
+            }
+            index++; // Increment index for the current row
+
+            // Check if current row is expanded and has children
+            if (expandedRows.has(row.fieldPath) && row.children && row.children.length) {
+                const foundIndex = search(row.children); // Recursively search children
+                if (foundIndex !== -1) {
+                    // If found in children, return the found index
+                    return foundIndex;
+                }
+            }
+        }
+        // Return -1 if the ID was not found in this branch
+        return -1;
+    }
+
+    // Start the recursive search
+    return search(rows);
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/Stats.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/Stats.tsx
new file mode 100644
index 00000000000000..f9f5dff5cce8fc
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/stats/Stats.tsx
@@ -0,0 +1,40 @@
+import React, { useState } from 'react';
+import { Radio } from 'antd';
+import { DatasetProfile } from '../../../../../types.generated';
+import LatestStatsView from './snapshot/LatestStatsView';
+import HistoricalStatsView from './historical/HistoricalStatsView';
+
+export type Props = {
+    urn: string;
+    profile: DatasetProfile;
+};
+
+enum ViewType {
+    LATEST,
+    HISTORICAL,
+}
+
+export default function Stats({ urn, profile }: Props) {
+    /**
+     * Determines which view should be visible: latest or historical.
+     */
+    const [view, setView] = useState(ViewType.LATEST);
+
+    const onChangeView = (e) => {
+        setView(e.target.value);
+    };
+
+    const toggleView = (
+        <Radio.Group value={view} onChange={onChangeView}>
+            <Radio.Button value={ViewType.LATEST}>Latest</Radio.Button>
+            <Radio.Button value={ViewType.HISTORICAL}>Historical</Radio.Button>
+        </Radio.Group>
+    );
+
+    return (
+        <>
+            {view === ViewType.LATEST && <LatestStatsView profile={profile} toggleView={toggleView} />}
+            {view === ViewType.HISTORICAL && <HistoricalStatsView urn={urn} toggleView={toggleView} />}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/StatsSection.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/StatsSection.tsx
new file mode 100644
index 00000000000000..c0a98e44f8c358
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/stats/StatsSection.tsx
@@ -0,0 +1,34 @@
+import { Divider, Row, Typography } from 'antd';
+import styled from 'styled-components';
+import React from 'react';
+
+const Section = styled.div`
+    padding-top: 24px;
+    padding-bottom: 40px;
+    margin-bottom: 20px;
+    width: 100%;
+`;
+
+const ThinDivider = styled(Divider)`
+    margin-top: 8px;
+    margin-bottom: 8px;
+`;
+
+export type Props = {
+    children: React.ReactNode;
+    title: string;
+    rightFloatView?: React.ReactNode;
+};
+
+export default function StatsSection({ children, title, rightFloatView }: Props) {
+    return (
+        <Section>
+            <Row justify="space-between">
+                <Typography.Title level={3}>{title}</Typography.Title>
+                {rightFloatView || <span />}
+            </Row>
+            <ThinDivider />
+            {children}
+        </Section>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/HistoricalStatsView.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/HistoricalStatsView.tsx
new file mode 100644
index 00000000000000..2b98a4d8f67544
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/HistoricalStatsView.tsx
@@ -0,0 +1,230 @@
+import React, { ReactNode, useEffect, useState } from 'react';
+import styled from 'styled-components';
+
+import { Affix, Row, Select, Typography } from 'antd';
+import { useGetDataProfilesLazyQuery } from '../../../../../../graphql/dataset.generated';
+import { DateInterval } from '../../../../../../types.generated';
+import { Message } from '../../../../../shared/Message';
+import { getFixedLookbackWindow } from '../../../../../shared/time/timeUtils';
+
+import ProfilingRunsChart from './charts/ProfilingRunsChart';
+import StatsSection from '../StatsSection';
+import StatChart from './charts/StatChart';
+import {
+    computeAllFieldPaths,
+    computeChartTickInterval,
+    extractChartValuesFromFieldProfiles,
+    extractChartValuesFromTableProfiles,
+} from '../../../../shared/utils';
+
+const HeaderRow = styled(Row)`
+    padding-top: 24px;
+    padding-bottom: 28px;
+    background-color: white;
+`;
+
+const SubHeaderText = styled(Typography.Text)`
+    color: gray;
+    font-size: 16px;
+`;
+
+const EmbeddedSelect = styled(Select)`
+    padding-left: 8px;
+`;
+
+/**
+ * Change this to add or modify the lookback windows that are selectable via the UI.
+ */
+const LOOKBACK_WINDOWS = [
+    { text: '1 day', windowSize: { interval: DateInterval.Day, count: 1 } },
+    { text: '1 week', windowSize: { interval: DateInterval.Week, count: 1 } },
+    { text: '1 month', windowSize: { interval: DateInterval.Month, count: 1 } },
+    { text: '3 months', windowSize: { interval: DateInterval.Month, count: 3 } },
+    { text: '1 year', windowSize: { interval: DateInterval.Year, count: 1 } },
+];
+
+const DEFAULT_LOOKBACK_WINDOW = '3 months';
+
+const getLookbackWindowSize = (text: string) => {
+    for (let i = 0; i < LOOKBACK_WINDOWS.length; i++) {
+        const window = LOOKBACK_WINDOWS[i];
+        if (window.text === text) {
+            return window.windowSize;
+        }
+    }
+    throw new Error(`Unrecognized lookback window size ${text} provided`);
+};
+
+export type Props = {
+    urn: string;
+    toggleView: ReactNode;
+};
+
+export default function HistoricalStatsView({ urn, toggleView }: Props) {
+    const [getDataProfiles, { data: profilesData, loading: profilesLoading }] = useGetDataProfilesLazyQuery({
+        fetchPolicy: 'cache-first',
+    });
+
+    /**
+     * Perform initial fetch of default lookback window stats.
+     */
+    useEffect(() => {
+        getDataProfiles({
+            variables: { urn, ...getFixedLookbackWindow(getLookbackWindowSize(DEFAULT_LOOKBACK_WINDOW)) },
+        });
+    }, [urn, getDataProfiles]);
+
+    /**
+     * Determines which fixed lookback window is used to display historical statistics. See above for valid options.
+     */
+    const [selectedLookbackWindow, setSelectedLookbackWindow] = useState(DEFAULT_LOOKBACK_WINDOW);
+    const selectedWindowSize = getLookbackWindowSize(selectedLookbackWindow);
+    const selectedWindow = getFixedLookbackWindow(selectedWindowSize);
+
+    /**
+     * Determines which field path is highlighted in column stats. Defaults to none.
+     */
+    const [selectedFieldPath, setSelectedFieldPath] = useState('');
+
+    /**
+     *  Change handlers.
+     */
+    const onChangeSelectedLookbackWindow = (text) => {
+        const newWindowSize = getLookbackWindowSize(text);
+        const newTimeWindow = getFixedLookbackWindow(newWindowSize);
+        getDataProfiles({
+            variables: { urn, ...newTimeWindow },
+        });
+        setSelectedLookbackWindow(text);
+    };
+
+    const onChangeSelectedFieldPath = (value) => {
+        setSelectedFieldPath(value);
+    };
+
+    const graphTickInterval = computeChartTickInterval(selectedWindowSize);
+    const graphDateRange = {
+        start: selectedWindow.startTime.toString(),
+        end: selectedWindow.endTime.toString(),
+    };
+
+    const profiles = profilesData?.dataset?.datasetProfiles || [];
+    const allFieldPaths = Array.from(computeAllFieldPaths(profiles));
+
+    if (selectedFieldPath === '' && allFieldPaths.length > 0) {
+        // Set initially selected field path.
+        setSelectedFieldPath(allFieldPaths[0]);
+    }
+
+    const columnSelectView = (
+        <span>
+            <SubHeaderText>Viewing stats for column</SubHeaderText>
+            <EmbeddedSelect style={{ width: 200 }} value={selectedFieldPath} onChange={onChangeSelectedFieldPath}>
+                {allFieldPaths.map((fieldPath) => (
+                    <Select.Option value={fieldPath}>{fieldPath}</Select.Option>
+                ))}
+            </EmbeddedSelect>
+        </span>
+    );
+
+    /**
+     * Compute Table Stat chart data.
+     */
+    const rowCountChartValues = extractChartValuesFromTableProfiles(profiles, 'rowCount');
+    const columnCountChartValues = extractChartValuesFromTableProfiles(profiles, 'columnCount');
+
+    /**
+     * Compute Column Stat chart data.
+     */
+    const nullCountChartValues: Array<any> = extractChartValuesFromFieldProfiles(
+        profiles,
+        selectedFieldPath,
+        'nullCount',
+    );
+    const nullPercentageChartValues: Array<any> = extractChartValuesFromFieldProfiles(
+        profiles,
+        selectedFieldPath,
+        'nullProportion',
+    );
+    const distinctCountChartValues: Array<any> = extractChartValuesFromFieldProfiles(
+        profiles,
+        selectedFieldPath,
+        'uniqueCount',
+    );
+    const distinctPercentageChartValues: Array<any> = extractChartValuesFromFieldProfiles(
+        profiles,
+        selectedFieldPath,
+        'uniqueProportion',
+    );
+
+    return (
+        <>
+            {profilesLoading && <Message type="loading" content="Loading..." style={{ marginTop: '10%' }} />}
+            <Affix offsetTop={127}>
+                <HeaderRow justify="space-between" align="middle">
+                    <div>
+                        <Typography.Title level={2}>Profiling History</Typography.Title>
+                        <span>
+                            <SubHeaderText>Viewing profiling history for the past</SubHeaderText>
+                            <EmbeddedSelect value={selectedLookbackWindow} onChange={onChangeSelectedLookbackWindow}>
+                                {LOOKBACK_WINDOWS.map((lookbackWindow) => (
+                                    <Select.Option value={lookbackWindow.text}>{lookbackWindow.text}</Select.Option>
+                                ))}
+                            </EmbeddedSelect>
+                        </span>
+                    </div>
+                    {toggleView}
+                </HeaderRow>
+            </Affix>
+            <StatsSection title="Profiling Runs">
+                <Row>
+                    <ProfilingRunsChart profiles={profiles} />
+                </Row>
+            </StatsSection>
+            <StatsSection title="Historical Table Stats">
+                <Row>
+                    <StatChart
+                        title="Row Count Over Time"
+                        tickInterval={graphTickInterval}
+                        dateRange={graphDateRange}
+                        values={rowCountChartValues}
+                    />
+                    <StatChart
+                        title="Column Count Over Time"
+                        tickInterval={graphTickInterval}
+                        dateRange={graphDateRange}
+                        values={columnCountChartValues}
+                    />
+                </Row>
+            </StatsSection>
+            <StatsSection title="Historical Column Stats" rightFloatView={columnSelectView}>
+                <Row>
+                    <StatChart
+                        title="Null Count Over Time"
+                        tickInterval={graphTickInterval}
+                        dateRange={graphDateRange}
+                        values={nullCountChartValues}
+                    />
+                    <StatChart
+                        title="Null Percentage Over Time"
+                        tickInterval={graphTickInterval}
+                        dateRange={graphDateRange}
+                        values={nullPercentageChartValues}
+                    />
+                    <StatChart
+                        title="Distinct Count Over Time"
+                        tickInterval={graphTickInterval}
+                        dateRange={graphDateRange}
+                        values={distinctCountChartValues}
+                    />
+                    <StatChart
+                        title="Distinct Percentage Over Time"
+                        tickInterval={graphTickInterval}
+                        dateRange={graphDateRange}
+                        values={distinctPercentageChartValues}
+                    />
+                </Row>
+            </StatsSection>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx
new file mode 100644
index 00000000000000..36f2b5e37902e2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx
@@ -0,0 +1,91 @@
+import { Button, Col, Modal, Table, Typography } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { DatasetProfile } from '../../../../../../../types.generated';
+import DataProfileView from '../../snapshot/SnapshotStatsView';
+
+export const ChartTable = styled(Table)`
+    margin: 12px;
+    box-shadow: ${(props) => props.theme.styles['box-shadow']};
+`;
+
+export type Props = {
+    profiles: Array<DatasetProfile>;
+};
+
+export default function ProfilingRunsChart({ profiles }: Props) {
+    const [showModal, setShowModal] = useState(false);
+    const [selectedProfileIndex, setSelectedProfileIndex] = useState(-1);
+
+    const showProfileModal = (index: number) => {
+        setSelectedProfileIndex(index);
+        setShowModal(true);
+    };
+
+    const onClose = () => {
+        setShowModal(false);
+        setSelectedProfileIndex(-1);
+    };
+
+    const tableData = profiles.map((profile) => {
+        const profileDate = new Date(profile.timestampMillis);
+        return {
+            timestamp: `${profileDate.toLocaleDateString()} at ${profileDate.toLocaleTimeString()}`,
+            rowCount: profile.rowCount?.toString() || 'unknown',
+            columnCount: profile.columnCount?.toString() || 'unknown',
+        };
+    });
+
+    const tableColumns = [
+        {
+            title: 'Recent Profiles',
+            key: 'Recent Profiles',
+            dataIndex: 'timestamp',
+            render: (title, record, index) => {
+                return (
+                    <Button type="text" onClick={() => showProfileModal(index)}>
+                        <Typography.Text underline>{title}</Typography.Text>
+                    </Button>
+                );
+            },
+        },
+        {
+            title: 'Row Count',
+            key: 'Row Count',
+            dataIndex: 'rowCount',
+        },
+        {
+            title: 'Column Count',
+            key: 'Column Count',
+            dataIndex: 'columnCount',
+        },
+    ];
+
+    const selectedProfile = (selectedProfileIndex >= 0 && profiles[selectedProfileIndex]) || undefined;
+    const profileModalTitle =
+        selectedProfile &&
+        `Showing profile from ${new Date(selectedProfile?.timestampMillis).toLocaleDateString()} at ${new Date(
+            selectedProfile?.timestampMillis,
+        ).toLocaleTimeString()}`;
+
+    return (
+        <>
+            {selectedProfile && (
+                <Modal width="100%" footer={null} title={profileModalTitle} visible={showModal} onCancel={onClose}>
+                    <DataProfileView profile={selectedProfile} />
+                </Modal>
+            )}
+            <Col sm={24} md={24} lg={12} xl={12}>
+                <ChartTable
+                    scroll={{ y: 400 }}
+                    bordered
+                    style={{ width: '100%', maxHeight: 440 }}
+                    columns={tableColumns}
+                    dataSource={tableData}
+                    pagination={false}
+                    size="small"
+                />
+            </Col>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/StatChart.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/StatChart.tsx
new file mode 100644
index 00000000000000..a6d2d2b4c855c6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/StatChart.tsx
@@ -0,0 +1,96 @@
+import { Col, Divider, Typography } from 'antd';
+import React, { useMemo } from 'react';
+import styled from 'styled-components';
+
+import { DateInterval, DateRange } from '../../../../../../../types.generated';
+import { ChartCard } from '../../../../../../analyticsDashboard/components/ChartCard';
+import { ChartContainer } from '../../../../../../analyticsDashboard/components/ChartContainer';
+import { TimeSeriesChart } from '../../../../../../analyticsDashboard/components/TimeSeriesChart';
+
+const ChartTitle = styled(Typography.Title)`
+    && {
+        margin-bottom: 20px;
+        text-align: left;
+        width: 100%;
+    }
+`;
+
+const ThinDivider = styled(Divider)`
+    margin: 0px;
+    padding: 0px;
+`;
+
+type Point = {
+    timeMs: number;
+    value: number;
+};
+
+export type Props = {
+    title: string;
+    values: Array<Point>;
+    tickInterval: DateInterval;
+    dateRange: DateRange;
+};
+
+/**
+ * Change these to change the chart axis & line colors
+ * TODO: Add this to the theme config.
+ */
+const DEFAULT_LINE_COLOR = '#20d3bd';
+const DEFAULT_AXIS_COLOR = '#D8D8D8';
+const DEFAULT_AXIS_WIDTH = 2;
+
+/**
+ * Time Series Chart with a single line.
+ */
+export default function StatChart({ title, values, tickInterval: interval, dateRange }: Props) {
+    const timeSeriesData = useMemo(
+        () =>
+            values
+                .sort((a, b) => a.timeMs - b.timeMs)
+                .map((value) => {
+                    const dateStr = new Date(value.timeMs).toISOString();
+                    return {
+                        x: dateStr,
+                        y: value.value,
+                    };
+                }),
+        [values],
+    );
+
+    const chartData = {
+        title,
+        lines: [
+            {
+                name: 'line_1',
+                data: timeSeriesData,
+            },
+        ],
+        interval,
+        dateRange,
+    };
+
+    return (
+        <>
+            <Col sm={24} md={24} lg={8} xl={8}>
+                <ChartCard $shouldScroll={false}>
+                    <ChartContainer>
+                        <ChartTitle level={5}>{chartData.title}</ChartTitle>
+                        <ThinDivider />
+                        <TimeSeriesChart
+                            style={{
+                                lineColor: DEFAULT_LINE_COLOR,
+                                axisColor: DEFAULT_AXIS_COLOR,
+                                axisWidth: DEFAULT_AXIS_WIDTH,
+                            }}
+                            hideLegend
+                            chartData={chartData}
+                            width={360}
+                            height={300}
+                        />
+                    </ChartContainer>
+                </ChartCard>
+            </Col>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/LatestStatsView.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/LatestStatsView.tsx
new file mode 100644
index 00000000000000..a94e6c4f6d98d2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/LatestStatsView.tsx
@@ -0,0 +1,36 @@
+import React, { ReactNode } from 'react';
+import styled from 'styled-components';
+import { Affix, Row, Typography } from 'antd';
+import { DatasetProfile } from '../../../../../../types.generated';
+import DataProfileView from './SnapshotStatsView';
+
+const HeaderRow = styled(Row)`
+    padding-top: 24px;
+    padding-bottom: 28px;
+    background-color: white;
+`;
+
+export type Props = {
+    profile: DatasetProfile;
+    toggleView: ReactNode;
+};
+
+export default function LatestStatsView({ profile, toggleView }: Props) {
+    const reportedAtDate = new Date(profile.timestampMillis);
+    return (
+        <>
+            <Affix offsetTop={127}>
+                <HeaderRow justify="space-between" align="middle">
+                    <div>
+                        <Typography.Title level={2}>Latest Stats</Typography.Title>
+                        <Typography.Text style={{ color: 'gray' }}>
+                            Reported on {reportedAtDate.toLocaleDateString()} at {reportedAtDate.toLocaleTimeString()}
+                        </Typography.Text>
+                    </div>
+                    {toggleView}
+                </HeaderRow>
+            </Affix>
+            <DataProfileView profile={profile} />
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/SnapshotStatsView.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/SnapshotStatsView.tsx
new file mode 100644
index 00000000000000..73c37fc3ac363f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/SnapshotStatsView.tsx
@@ -0,0 +1,180 @@
+import { Row, Table, Tag, Typography } from 'antd';
+import styled from 'styled-components';
+
+import { ColumnsType, ColumnType } from 'antd/lib/table';
+import React, { useMemo } from 'react';
+import { DatasetProfile } from '../../../../../../types.generated';
+import { Highlight } from '../../../../../analyticsDashboard/components/Highlight';
+import StatsSection from '../StatsSection';
+
+const ColumnStatsTable = styled(Table)`
+    margin-top: 24px;
+`;
+
+const isPresent = (val: any) => {
+    return val !== undefined && val !== null;
+};
+
+const decimalToPercentStr = (decimal: number, precision: number): string => {
+    return `${(decimal * 100).toFixed(precision)}%`;
+};
+
+export type Props = {
+    profile: DatasetProfile;
+};
+
+export default function DataProfileView({ profile }: Props) {
+    const columnStatsTableData = useMemo(
+        () =>
+            profile.fieldProfiles?.map((doc) => ({
+                name: doc.fieldPath,
+                min: doc.min,
+                max: doc.max,
+                mean: doc.mean,
+                median: doc.median,
+                stdev: doc.stdev,
+                nullCount: isPresent(doc.nullCount) && doc.nullCount!.toString(),
+                nullPercentage: isPresent(doc.nullProportion) && decimalToPercentStr(doc.nullProportion!, 2),
+                distinctCount: isPresent(doc.uniqueCount) && doc.uniqueCount!.toString(),
+                distinctPercentage: isPresent(doc.uniqueProportion) && decimalToPercentStr(doc.uniqueProportion!, 2),
+                sampleValues: doc.sampleValues,
+            })) || [],
+        [profile],
+    );
+
+    /**
+     * Returns a placeholder value to show in the column data table when data is null.
+     */
+    const unknownValue = () => {
+        return <Typography.Text style={{ color: '#B8B8B8' }}>unknown</Typography.Text>;
+    };
+
+    /**
+     * Computes a set of the object keys across all items in a given array.
+     */
+    const getItemKeySet = (items: Array<any>) => {
+        const keySet = new Set<string>();
+        items.forEach((item) => {
+            Object.keys(item).forEach((key) => {
+                keySet.add(key);
+            });
+        });
+        return keySet;
+    };
+
+    /**
+     * Dynamically builds column stat table columns based on the fields present in the dataset profile data.
+     */
+    const buildColumnStatsColumns = (tableData: Array<any>) => {
+        // Optional columns. Defines how to render a column given a value exists somewhere in the profile.
+        const optionalColumns: ColumnsType<any> = [
+            {
+                title: 'Min',
+                dataIndex: 'min',
+                render: (value) => value || unknownValue(),
+            },
+            {
+                title: 'Max',
+                dataIndex: 'max',
+                render: (value) => value || unknownValue(),
+            },
+            {
+                title: 'Mean',
+                dataIndex: 'mean',
+                render: (value) => value || unknownValue(),
+            },
+            {
+                title: 'Median',
+                dataIndex: 'median',
+                render: (value) => value || unknownValue(),
+            },
+            {
+                title: 'Null Count',
+                dataIndex: 'nullCount',
+                render: (value) => value || unknownValue(),
+            },
+            {
+                title: 'Null %',
+                dataIndex: 'nullPercentage',
+                render: (value) => value || unknownValue(),
+            },
+            {
+                title: 'Distinct Count',
+                dataIndex: 'distinctCount',
+                render: (value) => value || unknownValue(),
+            },
+            {
+                title: 'Distinct %',
+                dataIndex: 'distinctPercentage',
+                render: (value) => value || unknownValue(),
+            },
+            {
+                title: 'Std. Dev',
+                dataIndex: 'stdev',
+                render: (value) => value || unknownValue(),
+            },
+            {
+                title: 'Sample Values',
+                dataIndex: 'sampleValues',
+                render: (sampleValues: Array<string>) => {
+                    return (
+                        (sampleValues &&
+                            sampleValues
+                                .slice(0, sampleValues.length < 3 ? sampleValues?.length : 3)
+                                .map((value) => <Tag key={value}>{value}</Tag>)) ||
+                        unknownValue()
+                    );
+                },
+            },
+        ];
+
+        // Name column always required.
+        const requiredColumns: ColumnsType<any> = [
+            {
+                title: 'Name',
+                dataIndex: 'name',
+            },
+        ];
+
+        // Retrieves a set of names of columns that should be shown based on their presence in the data profile.
+        const columnsPresent: Set<string> = getItemKeySet(tableData);
+
+        // Compute the final columns to render.
+        const columns = [
+            ...requiredColumns,
+            ...optionalColumns.filter((column: ColumnType<any>) => columnsPresent.has(column.dataIndex as string)),
+        ];
+
+        // TODO: Support Quantiles && Distinct Value Frequencies.
+        return columns;
+    };
+
+    const columnStatsColumns = buildColumnStatsColumns(columnStatsTableData);
+
+    const rowCount = (isPresent(profile?.rowCount) ? profile?.rowCount : -1) as number;
+    const rowCountTitle = (rowCount >= 0 && 'Rows') || 'Row Count Unknown';
+
+    const columnCount = (isPresent(profile?.columnCount) ? profile?.columnCount : -1) as number;
+    const columnCountTitle = (columnCount >= 0 && 'Columns') || 'Column Count Unknown';
+
+    return (
+        <>
+            <StatsSection title="Table Stats">
+                <Row align="top" justify="start">
+                    <Highlight highlight={{ value: rowCount, title: rowCountTitle, body: '' }} />
+                    <Highlight highlight={{ value: columnCount, title: columnCountTitle, body: '' }} />
+                </Row>
+            </StatsSection>
+            <StatsSection title="Column Stats">
+                <ColumnStatsTable
+                    bordered
+                    pagination={false}
+                    columns={columnStatsColumns}
+                    dataSource={columnStatsTableData}
+                    // TODO: this table's types should be cleaned up so `any` is not needed here or in the column definitions
+                    rowKey={(record: any) => record.name}
+                />
+            </StatsSection>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/stats/DatasetStatsSummarySubHeader.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/stats/DatasetStatsSummarySubHeader.tsx
new file mode 100644
index 00000000000000..7337b4a4d76cd4
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/stats/stats/DatasetStatsSummarySubHeader.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import { GetDatasetQuery } from '../../../../../../graphql/dataset.generated';
+import { DatasetStatsSummary as DatasetStatsSummaryObj, EntityType } from '../../../../../../types.generated';
+import { useBaseEntity } from '../../../../../entity/shared/EntityContext';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { DatasetStatsSummary } from '../../../shared/DatasetStatsSummary';
+
+export const DatasetStatsSummarySubHeader = () => {
+    const result = useBaseEntity<GetDatasetQuery>();
+    const dataset = result?.dataset;
+
+    const maybeStatsSummary = dataset?.statsSummary as DatasetStatsSummaryObj;
+
+    const latestFullTableProfile = dataset?.latestFullTableProfile?.[0];
+    const latestPartitionProfile = dataset?.latestPartitionProfile?.[0];
+
+    const maybeLastProfile = latestFullTableProfile || latestPartitionProfile || undefined;
+
+    const maybeLastOperation = dataset?.operations && dataset.operations.length ? dataset.operations[0] : undefined;
+
+    const rowCount = maybeLastProfile?.rowCount;
+    const columnCount = maybeLastProfile?.columnCount;
+    const sizeInBytes = maybeLastProfile?.sizeInBytes;
+    const totalSqlQueries = dataset?.usageStats?.aggregations?.totalSqlQueries;
+    const queryCountLast30Days = maybeStatsSummary?.queryCountLast30Days;
+    const uniqueUserCountLast30Days = maybeStatsSummary?.uniqueUserCountLast30Days;
+
+    const lastUpdatedMs = maybeLastOperation?.lastUpdatedTimestamp;
+
+    const entityRegistry = useEntityRegistry();
+    const platformName = dataset?.platform && entityRegistry.getDisplayName(EntityType.DataPlatform, dataset?.platform);
+    const platformLogoUrl = dataset?.platform?.properties?.logoUrl;
+
+    return (
+        <DatasetStatsSummary
+            rowCount={rowCount}
+            columnCount={columnCount}
+            sizeInBytes={sizeInBytes}
+            totalSqlQueries={totalSqlQueries}
+            queryCountLast30Days={queryCountLast30Days}
+            uniqueUserCountLast30Days={uniqueUserCountLast30Days}
+            lastUpdatedMs={lastUpdatedMs}
+            platformName={platformName}
+            platformLogoUrl={platformLogoUrl}
+            subTypes={dataset?.subTypes?.typeNames || undefined}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stories/documentation.ts b/datahub-web-react/src/app/entityV2/dataset/profile/stories/documentation.ts
new file mode 100644
index 00000000000000..3b62c3e6cf0ec3
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/stories/documentation.ts
@@ -0,0 +1,13 @@
+import { EntityType } from '../../../../../types.generated';
+
+export const sampleDocs = [
+    {
+        url: 'https://www.google.com',
+        description: 'This doc spans the internet web',
+        author: { urn: 'urn:li:corpuser:1', username: '1', type: EntityType.CorpUser },
+        created: {
+            time: 0,
+            actor: 'urn:li:corpuser:1',
+        },
+    },
+];
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stories/lineageEntities.ts b/datahub-web-react/src/app/entityV2/dataset/profile/stories/lineageEntities.ts
new file mode 100644
index 00000000000000..15c04d9ebe2ae3
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/stories/lineageEntities.ts
@@ -0,0 +1,101 @@
+import { EntityType, FabricType, PlatformNativeType } from '../../../../../types.generated';
+
+export const sampleUpstreamEntities = [
+    {
+        name: 'Upstream HiveDataset',
+        type: EntityType.Dataset,
+        urn: 'abc',
+        platform: {
+            urn: 'urn:li:dataPlatform:hive',
+            name: 'Hive',
+            type: EntityType.DataPlatform,
+        },
+        origin: FabricType.Prod,
+        description: 'this is a dataset',
+        platformNativeType: PlatformNativeType.Table,
+        tags: [],
+        created: {
+            time: 0,
+        },
+        lastModified: {
+            time: 0,
+        },
+    },
+    {
+        name: 'Upstream KafkaDataset',
+        type: EntityType.Dataset,
+        urn: 'abc',
+        platform: {
+            urn: 'urn:li:dataPlatform:hive',
+            name: 'Hive',
+            type: EntityType.DataPlatform,
+        },
+        origin: FabricType.Prod,
+        description: 'this is a dataset',
+        platformNativeType: PlatformNativeType.Table,
+        tags: [],
+        created: {
+            time: 0,
+        },
+        lastModified: {
+            time: 0,
+        },
+    },
+];
+
+export const sampleDownstreamEntities = [
+    {
+        name: 'Downstream HiveDataset',
+        type: EntityType.Dataset,
+        urn: 'abc',
+        platform: {
+            urn: 'urn:li:dataPlatform:hive',
+            name: 'Hive',
+            type: EntityType.DataPlatform,
+        },
+        origin: FabricType.Prod,
+        description: 'this is a dataset',
+        platformNativeType: PlatformNativeType.Table,
+        tags: [],
+        created: {
+            time: 0,
+        },
+        lastModified: {
+            time: 0,
+        },
+    },
+    {
+        name: 'Downstream KafkaDataset',
+        type: EntityType.Dataset,
+        urn: 'abc',
+        platform: {
+            urn: 'urn:li:dataPlatform:hive',
+            name: 'Hive',
+            type: EntityType.DataPlatform,
+        },
+        origin: FabricType.Prod,
+        description: 'this is a dataset',
+        platformNativeType: PlatformNativeType.Table,
+        tags: [],
+        created: {
+            time: 0,
+        },
+        lastModified: {
+            time: 0,
+        },
+    },
+];
+
+export const sampleRelationship = {
+    entities: sampleUpstreamEntities.map((entity) => ({
+        entity,
+        created: { time: 0 },
+    })),
+};
+
+export const sampleDownstreamRelationship = {
+    entities: sampleDownstreamEntities.map((entity) => ({
+        entity,
+        created: { time: 0 },
+    })),
+};
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stories/properties.ts b/datahub-web-react/src/app/entityV2/dataset/profile/stories/properties.ts
new file mode 100644
index 00000000000000..dc74984113df14
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/stories/properties.ts
@@ -0,0 +1,10 @@
+export const sampleProperties = [
+    {
+        key: 'Number of Partitions',
+        value: '18',
+    },
+    {
+        key: 'Cluster Name',
+        value: 'Testing',
+    },
+];
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stories/sampleSchema.ts b/datahub-web-react/src/app/entityV2/dataset/profile/stories/sampleSchema.ts
new file mode 100644
index 00000000000000..2d7a226b948219
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/stories/sampleSchema.ts
@@ -0,0 +1,366 @@
+import { dataset3 } from '../../../../../Mocks';
+import { EntityType, Schema, SchemaMetadata, SchemaField, SchemaFieldDataType } from '../../../../../types.generated';
+
+// Extending the schema type with an option for tags
+export type TaggedSchemaField = {
+    tags: Tag[];
+} & SchemaField;
+
+export type Tag = {
+    name: string;
+    value?: string;
+    color: string;
+    category: string;
+    descriptor?: boolean;
+};
+
+export const sampleSchema: SchemaMetadata | Schema | null = {
+    name: 'MockSchema',
+    platformUrn: 'mock:urn',
+    version: 1,
+    hash: '',
+    fields: [
+        {
+            fieldPath: 'id',
+            nullable: false,
+            description: 'order id',
+            type: SchemaFieldDataType.Number,
+            nativeDataType: 'number',
+            recursive: false,
+        },
+        {
+            fieldPath: 'name',
+            nullable: true,
+            description: 'the name of the order',
+            type: SchemaFieldDataType.String,
+            nativeDataType: 'string',
+            recursive: false,
+        },
+        {
+            fieldPath: 'shipping_address',
+            nullable: true,
+            description: 'the address the order ships to',
+            type: SchemaFieldDataType.String,
+            nativeDataType: 'string',
+            recursive: false,
+        },
+        {
+            fieldPath: 'count',
+            nullable: true,
+            description: 'the number of items in the order',
+            type: SchemaFieldDataType.Number,
+            nativeDataType: 'number',
+            recursive: false,
+        },
+        {
+            fieldPath: 'cost',
+            nullable: true,
+            description: 'the dollar value of the order',
+            type: SchemaFieldDataType.Number,
+            nativeDataType: 'number',
+            recursive: false,
+        },
+        {
+            fieldPath: 'was_returned',
+            nullable: true,
+            description: 'if the order was sent back',
+            type: SchemaFieldDataType.Boolean,
+            nativeDataType: 'boolean',
+            recursive: false,
+        },
+        {
+            fieldPath: 'payload',
+            nullable: true,
+            description: 'payload attached to the order',
+            type: SchemaFieldDataType.Bytes,
+            nativeDataType: 'bytes',
+            recursive: false,
+        },
+        {
+            fieldPath: 'payment_information',
+            nullable: true,
+            description: 'struct representing the payment information',
+            type: SchemaFieldDataType.Struct,
+            nativeDataType: 'struct',
+            recursive: false,
+        },
+    ],
+    platformSchema: {
+        __typename: 'TableSchema',
+        schema: '{ "type": "record", "name": "SampleHdfsSchema", "namespace": "com.linkedin.dataset", "doc": "Sample HDFS dataset", "fields": [ { "name": "field_foo", "type": [ "string" ] }, { "name": "field_bar", "type": [ "boolean" ] } ] }',
+    },
+};
+
+export const sampleSchemaWithTags: Schema = {
+    name: 'MockSchema',
+    platformUrn: 'mock:urn',
+    version: 1,
+    hash: '',
+    fields: [
+        {
+            fieldPath: 'id',
+            nullable: false,
+            description: 'order id',
+            type: SchemaFieldDataType.Number,
+            nativeDataType: 'number',
+            recursive: false,
+            globalTags: {
+                tags: [
+                    {
+                        tag: {
+                            urn: 'urn:li:tag:Legacy',
+                            name: 'Legacy',
+                            description: 'this is a legacy dataset',
+                            type: EntityType.Tag,
+                        },
+                        associatedUrn: 'mock:urn',
+                    },
+                ],
+            },
+            glossaryTerms: {
+                terms: [
+                    {
+                        term: {
+                            type: EntityType.GlossaryTerm,
+                            name: 'sample-glossary-term',
+                            urn: 'urn:li:glossaryTerm:sample-glossary-term',
+                            hierarchicalName: 'example.sample-glossary-term',
+                            properties: {
+                                name: 'sample-glossary-term',
+                                description: 'sample definition',
+                                definition: 'sample definition',
+                                termSource: 'sample term source',
+                            },
+                        },
+                        associatedUrn: 'mock:urn',
+                    },
+                ],
+            },
+        },
+        {
+            fieldPath: 'name',
+            nullable: true,
+            description: 'the name of the order',
+            type: SchemaFieldDataType.String,
+            nativeDataType: 'string',
+            recursive: false,
+        } as SchemaField,
+        {
+            fieldPath: 'shipping_address',
+            nullable: true,
+            description: 'the address the order ships to',
+            type: SchemaFieldDataType.String,
+            nativeDataType: 'string',
+            recursive: false,
+        } as SchemaField,
+        {
+            fieldPath: 'count',
+            nullable: true,
+            description: 'the number of items in the order',
+            type: SchemaFieldDataType.Number,
+            nativeDataType: 'number',
+            recursive: false,
+        },
+        {
+            fieldPath: 'cost',
+            nullable: true,
+            description: 'the dollar value of the order',
+            type: SchemaFieldDataType.Number,
+            nativeDataType: 'number',
+            recursive: false,
+        } as SchemaField,
+        {
+            fieldPath: 'was_returned',
+            nullable: true,
+            description: 'if the order was sent back',
+            type: SchemaFieldDataType.Boolean,
+            nativeDataType: 'boolean',
+            recursive: false,
+        },
+        {
+            fieldPath: 'payload',
+            nullable: true,
+            description: 'payload attached to the order',
+            type: SchemaFieldDataType.Bytes,
+            nativeDataType: 'bytes',
+            recursive: false,
+        },
+        {
+            fieldPath: 'payment_information',
+            nullable: true,
+            description: 'struct representing the payment information',
+            type: SchemaFieldDataType.Struct,
+            nativeDataType: 'struct',
+            recursive: false,
+        } as SchemaField,
+    ],
+};
+
+export const sampleSchemaWithPkFk: SchemaMetadata = {
+    primaryKeys: ['name'],
+    foreignKeys: [
+        {
+            name: 'constraint',
+            sourceFields: [
+                {
+                    urn: 'datasetUrn',
+                    type: EntityType.Dataset,
+                    parent: { urn: 'test', type: EntityType.Dataset },
+                    fieldPath: 'shipping_address',
+                },
+            ],
+            foreignFields: [
+                {
+                    urn: dataset3.urn,
+                    type: EntityType.Dataset,
+                    parent: { urn: dataset3.name, type: EntityType.Dataset },
+                    fieldPath: 'address',
+                },
+            ],
+            foreignDataset: dataset3,
+        },
+    ],
+    name: 'MockSchema',
+    platformUrn: 'mock:urn',
+    version: 1,
+    hash: '',
+    fields: [
+        {
+            fieldPath: 'id',
+            nullable: false,
+            description: 'order id',
+            type: SchemaFieldDataType.Number,
+            nativeDataType: 'number',
+            recursive: false,
+            globalTags: {
+                tags: [
+                    {
+                        tag: {
+                            urn: 'urn:li:tag:Legacy',
+                            name: 'Legacy',
+                            description: 'this is a legacy dataset',
+                            type: EntityType.Tag,
+                        },
+                        associatedUrn: 'mock:urn',
+                    },
+                ],
+            },
+            glossaryTerms: {
+                terms: [
+                    {
+                        term: {
+                            type: EntityType.GlossaryTerm,
+                            urn: 'urn:li:glossaryTerm:sample-glossary-term',
+                            name: 'sample-glossary-term',
+                            hierarchicalName: 'example.sample-glossary-term',
+                            properties: {
+                                name: 'sample-glossary-term',
+                                description: 'sample definition',
+                                definition: 'sample definition',
+                                termSource: 'sample term source',
+                            },
+                        },
+                        associatedUrn: 'mock:urn',
+                    },
+                ],
+            },
+        },
+        {
+            fieldPath: 'name',
+            nullable: true,
+            description: 'the name of the order',
+            type: SchemaFieldDataType.String,
+            nativeDataType: 'string',
+            recursive: false,
+        } as SchemaField,
+        {
+            fieldPath: 'shipping_address',
+            nullable: true,
+            description: 'the address the order ships to',
+            type: SchemaFieldDataType.String,
+            nativeDataType: 'string',
+            recursive: false,
+        } as SchemaField,
+        {
+            fieldPath: 'count',
+            nullable: true,
+            description: 'the number of items in the order',
+            type: SchemaFieldDataType.Number,
+            nativeDataType: 'number',
+            recursive: false,
+        },
+        {
+            fieldPath: 'cost',
+            nullable: true,
+            description: 'the dollar value of the order',
+            type: SchemaFieldDataType.Number,
+            nativeDataType: 'number',
+            recursive: false,
+        } as SchemaField,
+        {
+            fieldPath: 'was_returned',
+            nullable: true,
+            description: 'if the order was sent back',
+            type: SchemaFieldDataType.Boolean,
+            nativeDataType: 'boolean',
+            recursive: false,
+        },
+        {
+            fieldPath: 'payload',
+            nullable: true,
+            description: 'payload attached to the order',
+            type: SchemaFieldDataType.Bytes,
+            nativeDataType: 'bytes',
+            recursive: false,
+        },
+        {
+            fieldPath: 'payment_information',
+            nullable: true,
+            description: 'struct representing the payment information',
+            type: SchemaFieldDataType.Struct,
+            nativeDataType: 'struct',
+            recursive: false,
+        } as SchemaField,
+    ],
+};
+
+export const sampleSchemaWithoutFields: SchemaMetadata | Schema | null = {
+    name: 'MockSchema',
+    platformUrn: 'mock:urn',
+    version: 1,
+    hash: '',
+    fields: [],
+};
+
+export const sampleSchemaWithKeyValueFields: SchemaMetadata | Schema | null = {
+    name: 'MockSchema',
+    platformUrn: 'mock:urn',
+    version: 1,
+    hash: '',
+    fields: [
+        {
+            fieldPath: '[key=True].[version=2.0].id',
+            nullable: true,
+            description: 'the number of items in the order',
+            type: SchemaFieldDataType.Number,
+            nativeDataType: 'number',
+            recursive: false,
+        },
+        {
+            fieldPath: 'count',
+            nullable: true,
+            description: 'the number of items in the order',
+            type: SchemaFieldDataType.Number,
+            nativeDataType: 'number',
+            recursive: false,
+        },
+        {
+            fieldPath: 'cost',
+            nullable: true,
+            description: 'the dollar value of the order',
+            type: SchemaFieldDataType.Number,
+            nativeDataType: 'number',
+            recursive: false,
+        } as SchemaField,
+    ],
+};
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stories/stats.ts b/datahub-web-react/src/app/entityV2/dataset/profile/stories/stats.ts
new file mode 100644
index 00000000000000..035acd5668e8ed
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/stories/stats.ts
@@ -0,0 +1,73 @@
+import { DatasetProfile } from '../../../../../types.generated';
+
+export const completeSampleProfile: DatasetProfile = {
+    rowCount: 1000,
+    columnCount: 2000,
+    timestampMillis: 0,
+    fieldProfiles: [
+        {
+            fieldPath: 'testColumn',
+            uniqueCount: 1,
+            uniqueProportion: 0.111,
+            nullCount: 2,
+            nullProportion: 0.222,
+            min: '3',
+            max: '4',
+            mean: '5',
+            median: '6',
+            stdev: '7',
+            sampleValues: ['value1', 'value2', 'value3'],
+        },
+        {
+            fieldPath: 'testColumn2',
+            uniqueCount: 8,
+            uniqueProportion: 0.333,
+            nullCount: 9,
+            nullProportion: 0.444,
+            min: '10',
+            max: '11',
+            mean: '12',
+            median: '13',
+            stdev: '14',
+            sampleValues: ['value4', 'value5', 'value6'],
+        },
+    ],
+};
+
+export const missingFieldStatsProfile: DatasetProfile = {
+    rowCount: 1000,
+    columnCount: 2000,
+    timestampMillis: 0,
+};
+
+export const missingTableStatsProfile: DatasetProfile = {
+    timestampMillis: 0,
+    fieldProfiles: [
+        {
+            fieldPath: 'testColumn',
+            uniqueCount: 1,
+            uniqueProportion: 0.111,
+            nullCount: 2,
+            nullProportion: 0.222,
+            min: '3',
+            max: '4',
+            mean: '5',
+            median: '6',
+            stdev: '7',
+            sampleValues: ['value1', 'value2', 'value3'],
+        },
+        {
+            fieldPath: 'testColumn2',
+            uniqueCount: 8,
+            uniqueProportion: 0.333,
+            nullCount: 9,
+            nullProportion: 0.444,
+            min: '10',
+            max: '11',
+            mean: '12',
+            median: '13',
+            stdev: '14',
+            sampleValues: ['value4', 'value5', 'value6'],
+        },
+    ],
+};
diff --git a/datahub-web-react/src/app/entityV2/dataset/shared/DatasetStatsSummary.tsx b/datahub-web-react/src/app/entityV2/dataset/shared/DatasetStatsSummary.tsx
new file mode 100644
index 00000000000000..c94a6279acb633
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/shared/DatasetStatsSummary.tsx
@@ -0,0 +1,122 @@
+import { Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components/macro';
+import { countFormatter, needsFormatting } from '../../../../utils/formatter';
+import LastUpdated from '../../../shared/LastUpdated';
+import { formatNumber, formatNumberWithoutAbbreviation } from '../../../shared/formatNumber';
+import { StatsSummary } from '../../shared/components/styled/StatsSummary';
+import { ANTD_GRAY } from '../../shared/constants';
+import { PercentileLabel } from '../../shared/stats/PercentileLabel';
+import ExpandingStat from './ExpandingStat';
+
+const StatText = styled.span<{ color: string }>`
+    color: ${(props) => props.color};
+    @media (min-width: 1160px) {
+        white-space: nowrap;
+    }
+    font-size: 12px;
+    font-family: 'Mulish', sans-serif;
+    color: #8894a9;
+`;
+
+type Props = {
+    rowCount?: number | null;
+    columnCount?: number | null;
+    sizeInBytes?: number | null;
+    totalSqlQueries?: number | null;
+    queryCountLast30Days?: number | null;
+    queryCountPercentileLast30Days?: number | null;
+    uniqueUserCountLast30Days?: number | null;
+    uniqueUserPercentileLast30Days?: number | null;
+    lastUpdatedMs?: number | null;
+    color?: string;
+    platformName?: string;
+    platformLogoUrl?: string | null;
+    subTypes?: string[];
+    mode?: 'normal' | 'tooltip-content';
+};
+
+export const DatasetStatsSummary = ({
+    rowCount,
+    columnCount,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    sizeInBytes,
+    totalSqlQueries,
+    queryCountLast30Days,
+    queryCountPercentileLast30Days,
+    uniqueUserCountLast30Days,
+    uniqueUserPercentileLast30Days,
+    lastUpdatedMs,
+    color,
+    platformName,
+    platformLogoUrl,
+    subTypes,
+    mode = 'normal',
+}: Props) => {
+    const isTooltipMode = mode === 'tooltip-content';
+    const displayedColor = isTooltipMode ? '' : color ?? ANTD_GRAY[7];
+
+    const statsViews = [
+        !!rowCount && (
+            <ExpandingStat
+                disabled={isTooltipMode || !needsFormatting(rowCount)}
+                render={(isExpanded) => (
+                    <StatText color={displayedColor}>
+                        {/* <TableOutlined style={{ marginRight: 8, color: displayedColor }} /> */}
+                        {isExpanded ? formatNumberWithoutAbbreviation(rowCount) : countFormatter(rowCount)} rows
+                        {!!columnCount && (
+                            <>
+                                ,{' '}
+                                {isExpanded
+                                    ? formatNumberWithoutAbbreviation(columnCount)
+                                    : countFormatter(columnCount)}{' '}
+                                columns
+                            </>
+                        )}
+                    </StatText>
+                )}
+            />
+        ),
+        (!!queryCountLast30Days || !!totalSqlQueries) && (
+            <StatText color={displayedColor}>
+                {/* <ConsoleSqlOutlined style={{ marginRight: 8, color: displayedColor }} /> */}
+                {formatNumber(queryCountLast30Days || totalSqlQueries)}{' '}
+                {queryCountLast30Days ? <>queries</> : <>monthly queries</>}
+                {!!queryCountPercentileLast30Days && (
+                    <Typography.Text type="secondary">
+                        <PercentileLabel
+                            percentile={queryCountPercentileLast30Days}
+                            description={`More queries than ${queryCountPercentileLast30Days}% of similar assets in the past 30 days`}
+                        />
+                    </Typography.Text>
+                )}
+            </StatText>
+        ),
+        !!uniqueUserCountLast30Days && (
+            <StatText color={displayedColor}>
+                {/* <TeamOutlined style={{ marginRight: 8, color: displayedColor }} /> */}
+                {formatNumber(uniqueUserCountLast30Days)} users
+                {!!uniqueUserPercentileLast30Days && (
+                    <Typography.Text type="secondary">
+                        <PercentileLabel
+                            percentile={uniqueUserPercentileLast30Days}
+                            description={`More users than ${uniqueUserPercentileLast30Days}% of similar assets in the past 30 days`}
+                        />
+                    </Typography.Text>
+                )}
+            </StatText>
+        ),
+        !!lastUpdatedMs && (
+            <StatText color={displayedColor}>
+                <LastUpdated
+                    time={lastUpdatedMs}
+                    platformName={platformName}
+                    platformLogoUrl={platformLogoUrl || undefined}
+                    typeName={subTypes?.[0] || 'dataset'}
+                />
+            </StatText>
+        ),
+    ].filter((stat) => stat);
+
+    return <>{statsViews.length > 0 && <StatsSummary stats={statsViews} />}</>;
+};
diff --git a/datahub-web-react/src/app/entityV2/dataset/shared/ExpandingStat.tsx b/datahub-web-react/src/app/entityV2/dataset/shared/ExpandingStat.tsx
new file mode 100644
index 00000000000000..4e223b6e540588
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/shared/ExpandingStat.tsx
@@ -0,0 +1,47 @@
+import React, { ReactNode, useEffect, useRef, useState } from 'react';
+import styled from 'styled-components';
+
+const ExpandingStatContainer = styled.span<{ disabled: boolean; expanded: boolean; width: string }>`
+    max-width: 100%;
+    transition: width 250ms ease;
+`;
+
+const ExpandingStat = ({
+    disabled = false,
+    render,
+}: {
+    disabled?: boolean;
+
+    render: (isExpanded: boolean) => ReactNode;
+}) => {
+    const contentRef = useRef<HTMLSpanElement>(null);
+    const [width, setWidth] = useState<string>('inherit');
+    const [isExpanded, setIsExpanded] = useState(false);
+
+    useEffect(() => {
+        if (!contentRef.current) return;
+        setWidth(`${contentRef.current.offsetWidth}px`);
+    }, [isExpanded]);
+
+    const onMouseEnter = () => {
+        if (!disabled) setIsExpanded(true);
+    };
+
+    const onMouseLeave = () => {
+        if (!disabled) setIsExpanded(false);
+    };
+
+    return (
+        <ExpandingStatContainer
+            disabled={disabled}
+            expanded={isExpanded}
+            width={width}
+            onMouseEnter={onMouseEnter}
+            onMouseLeave={onMouseLeave}
+        >
+            <span ref={contentRef}>{render(isExpanded)}</span>
+        </ExpandingStatContainer>
+    );
+};
+
+export default ExpandingStat;
diff --git a/datahub-web-react/src/app/entityV2/dataset/shared/FormattedBytesStat.tsx b/datahub-web-react/src/app/entityV2/dataset/shared/FormattedBytesStat.tsx
new file mode 100644
index 00000000000000..5430f514ee9700
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataset/shared/FormattedBytesStat.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { Tooltip } from '@components';
+import { formatBytes, formatNumberWithoutAbbreviation } from '../../../shared/formatNumber';
+
+export const FormattedBytesStat = ({ bytes }: { bytes: number }) => {
+    const formattedBytes = formatBytes(bytes);
+    return (
+        <Tooltip title={`This dataset consumes ${formatNumberWithoutAbbreviation(bytes)} bytes of storage.`}>
+            <b>{formattedBytes.number}</b> {formattedBytes.unit}
+        </Tooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/domain/DataProductsTab/CreateDataProductModal.tsx b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/CreateDataProductModal.tsx
new file mode 100644
index 00000000000000..d0e74f4e031c5a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/CreateDataProductModal.tsx
@@ -0,0 +1,80 @@
+import { Button, Modal, message } from 'antd';
+import React, { useState } from 'react';
+import DataProductBuilderForm from './DataProductBuilderForm';
+import { DataProductBuilderState } from './types';
+import { useCreateDataProductMutation } from '../../../../graphql/dataProduct.generated';
+import { DataProduct, Domain } from '../../../../types.generated';
+
+export const MODAL_WIDTH = '75vw';
+
+export const MODAL_BODY_STYLE = {
+    overflow: 'auto',
+    width: '80vw',
+    maxWidth: 800,
+};
+
+const DEFAULT_STATE = {
+    name: '',
+};
+
+type Props = {
+    domain: Domain;
+    onClose: () => void;
+    onCreateDataProduct: (dataProduct: DataProduct) => void;
+};
+
+export default function CreateDataProductModal({ domain, onCreateDataProduct, onClose }: Props) {
+    const [builderState, updateBuilderState] = useState<DataProductBuilderState>(DEFAULT_STATE);
+    const [createDataProductMutation] = useCreateDataProductMutation();
+
+    function createDataProduct() {
+        createDataProductMutation({
+            variables: {
+                input: {
+                    domainUrn: domain.urn,
+                    properties: {
+                        name: builderState.name,
+                        description: builderState.description || undefined,
+                    },
+                },
+            },
+        })
+            .then(({ data, errors }) => {
+                if (!errors) {
+                    message.success('Created Data Product!');
+                    if (data?.createDataProduct) {
+                        const updateDataProduct = { ...data.createDataProduct, domain: { domain } };
+                        onCreateDataProduct(updateDataProduct as DataProduct);
+                    }
+                    onClose();
+                }
+            })
+            .catch(() => {
+                onClose();
+                message.destroy();
+                message.error({ content: 'Failed to create Data Product. An unexpected error occurred' });
+            });
+    }
+
+    return (
+        <Modal
+            title="Create Data Product"
+            onCancel={onClose}
+            style={MODAL_BODY_STYLE}
+            width={MODAL_WIDTH}
+            open
+            footer={
+                <>
+                    <Button onClick={onClose} type="text">
+                        Cancel
+                    </Button>
+                    <Button type="primary" onClick={createDataProduct} disabled={!builderState.name}>
+                        Create
+                    </Button>
+                </>
+            }
+        >
+            <DataProductBuilderForm builderState={builderState} updateBuilderState={updateBuilderState} />
+        </Modal>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductBuilderForm.tsx b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductBuilderForm.tsx
new file mode 100644
index 00000000000000..b5a27a6e1b8766
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductBuilderForm.tsx
@@ -0,0 +1,52 @@
+import { Form, Input, Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { Editor as MarkdownEditor } from '../../shared/tabs/Documentation/components/editor/Editor';
+import { ANTD_GRAY } from '../../shared/constants';
+import { DataProductBuilderState } from './types';
+
+const StyledEditor = styled(MarkdownEditor)`
+    border: 1px solid ${ANTD_GRAY[4]};
+`;
+
+type Props = {
+    builderState: DataProductBuilderState;
+    updateBuilderState: (newState: DataProductBuilderState) => void;
+};
+
+export default function DataProductBuilderForm({ builderState, updateBuilderState }: Props) {
+    function updateName(name: string) {
+        updateBuilderState({
+            ...builderState,
+            name,
+        });
+    }
+
+    function updateDescription(description: string) {
+        updateBuilderState({
+            ...builderState,
+            description,
+        });
+    }
+
+    return (
+        <Form layout="vertical">
+            <Form.Item
+                rules={[{ min: 1, max: 500 }]}
+                hasFeedback
+                label={<Typography.Text strong>Name</Typography.Text>}
+                required
+            >
+                <Input
+                    autoFocus
+                    value={builderState.name}
+                    onChange={(e) => updateName(e.target.value)}
+                    placeholder="Revenue Dashboards"
+                />
+            </Form.Item>
+            <Form.Item label={<Typography.Text strong>Description</Typography.Text>}>
+                <StyledEditor doNotFocus content={builderState.description} onChange={updateDescription} />
+            </Form.Item>
+        </Form>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductResult.tsx b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductResult.tsx
new file mode 100644
index 00000000000000..4036be8cca2e73
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductResult.tsx
@@ -0,0 +1,91 @@
+import { useEntityContext } from '@src/app/entity/shared/EntityContext';
+import { Button } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { DataProduct, EntityType } from '../../../../types.generated';
+import { useEntityRegistryV2 } from '../../../useEntityRegistry';
+import { PreviewType } from '../../Entity';
+import EditDataProductModal from './EditDataProductModal';
+import { REDESIGN_COLORS } from '../../shared/constants';
+import useDeleteEntity from '../../shared/EntityDropdown/useDeleteEntity';
+
+const TransparentButton = styled(Button)`
+    color: ${REDESIGN_COLORS.RED_ERROR};
+    font-size: 12px;
+    box-shadow: none;
+    border: none;
+    display: none;
+    padding: unset;
+    align-items: center;
+    &&& span {
+        font-size: 12px;
+    }
+
+    &:hover {
+        transition: 0.15s;
+        opacity: 0.9;
+        color: ${REDESIGN_COLORS.RED_ERROR};
+    }
+`;
+
+const ResultWrapper = styled.div`
+    padding: 20px;
+    display: flex;
+    align-items: center;
+    border: 1px solid #ebecf0;
+    background: ${REDESIGN_COLORS.WHITE};
+    border-radius: 10px;
+
+    &:hover ${TransparentButton} {
+        display: flex;
+    }
+`;
+
+const PreviewWrapper = styled.div`
+    position: relative;
+    flex: 1;
+    max-width: 100%;
+`;
+
+interface Props {
+    dataProduct: DataProduct;
+    onUpdateDataProduct: (dataProduct: DataProduct) => void;
+    setDeletedDataProductUrns: React.Dispatch<React.SetStateAction<string[]>>;
+}
+
+export default function DataProductResult({ dataProduct, onUpdateDataProduct, setDeletedDataProductUrns }: Props) {
+    const entityRegistry = useEntityRegistryV2();
+    const { refetch } = useEntityContext();
+    const [isEditModalVisible, setIsEditModalVisible] = useState(false);
+
+    function deleteDataProduct() {
+        setDeletedDataProductUrns((currentUrns) => [...currentUrns, dataProduct.urn]);
+    }
+
+    const { onDeleteEntity } = useDeleteEntity(dataProduct.urn, dataProduct.type, dataProduct, deleteDataProduct);
+
+    function onDeleteDataProduct() {
+        onDeleteEntity();
+        setTimeout(() => refetch(), 3000);
+    }
+
+    return (
+        <>
+            <ResultWrapper>
+                <PreviewWrapper>
+                    {entityRegistry.renderPreview(EntityType.DataProduct, PreviewType.PREVIEW, dataProduct, {
+                        onDelete: onDeleteDataProduct,
+                        onEdit: () => setIsEditModalVisible(true),
+                    })}
+                </PreviewWrapper>
+            </ResultWrapper>
+            {isEditModalVisible && (
+                <EditDataProductModal
+                    dataProduct={dataProduct}
+                    onClose={() => setIsEditModalVisible(false)}
+                    onUpdateDataProduct={onUpdateDataProduct}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductsTab.tsx b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductsTab.tsx
new file mode 100644
index 00000000000000..f010b804488ebc
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductsTab.tsx
@@ -0,0 +1,171 @@
+import { Button, Empty, Pagination } from 'antd';
+import { LoadingOutlined, PlusOutlined } from '@ant-design/icons';
+import React, { useState } from 'react';
+import * as QueryString from 'query-string';
+import { useLocation } from 'react-router';
+import styled from 'styled-components';
+import { useGetSearchResultsForMultipleQuery } from '../../../../graphql/search.generated';
+import { DataProduct, Domain, EntityType } from '../../../../types.generated';
+import TabToolbar from '../../shared/components/styled/TabToolbar';
+import { SearchBar } from '../../../search/SearchBar';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { scrollToTop } from '../../../shared/searchUtils';
+import { DomainsPaginationContainer } from '../../../domain/DomainsList';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../../shared/constants';
+import { useEntityContext, useEntityData } from '../../../entity/shared/EntityContext';
+import { DOMAINS_FILTER_NAME } from '../../../search/utils/constants';
+import DataProductResult from './DataProductResult';
+import CreateDataProductModal from './CreateDataProductModal';
+
+const DataProductsPaginationWrapper = styled(DomainsPaginationContainer)`
+    justify-content: center;
+`;
+
+const ResultsWrapper = styled.div`
+    height: auto;
+    overflow: auto;
+    flex: 1;
+    position: relative;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    padding: 16px;
+    gap: 12px;
+    background: ${REDESIGN_COLORS.BACKGROUND};
+`;
+
+const StyledLoading = styled(LoadingOutlined)`
+    font-size: 32px;
+`;
+
+const LoadingWrapper = styled.div`
+    display: flex;
+    justify-content: center;
+    margin-top: 25%;
+`;
+
+const DEFAULT_PAGE_SIZE = 10;
+
+export default function DataProductsTab() {
+    const { refetch } = useEntityContext();
+    const { entityData } = useEntityData();
+    const entityRegistry = useEntityRegistry();
+    const location = useLocation();
+    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
+    const paramsQuery = (params?.query as string) || undefined;
+    const [query, setQuery] = useState<string | undefined>(paramsQuery);
+    const [page, setPage] = useState(1);
+    const [isCreateModalVisible, setIsCreateModalVisible] = useState(params.createModal === 'true');
+    const [createdDataProducts, setCreatedDataProducts] = useState<DataProduct[]>([]);
+    const [editedDataProducts, setEditedDataProducts] = useState<DataProduct[]>([]);
+    const [deletedDataProductUrns, setDeletedDataProductUrns] = useState<string[]>([]);
+
+    const start = (page - 1) * DEFAULT_PAGE_SIZE;
+    const domainUrn = entityData?.urn || '';
+
+    const { data, loading } = useGetSearchResultsForMultipleQuery({
+        skip: !domainUrn,
+        variables: {
+            input: {
+                types: [EntityType.DataProduct],
+                query: query || '',
+                start,
+                count: DEFAULT_PAGE_SIZE,
+                orFilters: [{ and: [{ field: DOMAINS_FILTER_NAME, values: [domainUrn] }] }],
+                searchFlags: { skipCache: true },
+            },
+        },
+        fetchPolicy: 'no-cache',
+    });
+    const totalResults = data?.searchAcrossEntities?.total || 0;
+    const searchResults = data?.searchAcrossEntities?.searchResults.map((r) => r.entity) || [];
+    const dataProducts = [...createdDataProducts, ...searchResults];
+    const displayedDataProducts = dataProducts
+        .map(
+            (dataProduct) =>
+                editedDataProducts.find((editedDataProduct) => editedDataProduct.urn === dataProduct.urn) ||
+                dataProduct,
+        )
+        .filter((dataProduct) => !deletedDataProductUrns.includes(dataProduct.urn));
+
+    const onChangePage = (newPage: number) => {
+        scrollToTop();
+        setPage(newPage);
+    };
+
+    function onCreateDataProduct(dataProduct: DataProduct) {
+        setCreatedDataProducts([dataProduct, ...createdDataProducts]);
+        setTimeout(() => refetch(), 3000);
+    }
+
+    function onUpdateDataProduct(dataProduct: DataProduct) {
+        setEditedDataProducts([dataProduct, ...editedDataProducts]);
+    }
+
+    return (
+        <>
+            <TabToolbar>
+                <Button type="text" onClick={() => setIsCreateModalVisible(true)}>
+                    <PlusOutlined /> New Data Product
+                </Button>
+                <SearchBar
+                    initialQuery={query || ''}
+                    placeholderText="Search data products..."
+                    suggestions={[]}
+                    style={{
+                        maxWidth: 220,
+                        padding: 0,
+                    }}
+                    inputStyle={{
+                        height: 32,
+                        fontSize: 12,
+                    }}
+                    onSearch={() => null}
+                    onQueryChange={(q) => setQuery(q && q.length > 0 ? q : undefined)}
+                    entityRegistry={entityRegistry}
+                    hideRecommendations
+                />
+            </TabToolbar>
+            <ResultsWrapper>
+                {!loading && !displayedDataProducts.length && (
+                    <Empty
+                        description="No Data Products"
+                        image={Empty.PRESENTED_IMAGE_SIMPLE}
+                        style={{ color: ANTD_GRAY[7] }}
+                    />
+                )}
+                {loading && (
+                    <LoadingWrapper>
+                        <StyledLoading />
+                    </LoadingWrapper>
+                )}
+                {!loading &&
+                    displayedDataProducts.map((dataProduct) => (
+                        <DataProductResult
+                            key={dataProduct.urn}
+                            dataProduct={dataProduct as DataProduct}
+                            onUpdateDataProduct={onUpdateDataProduct}
+                            setDeletedDataProductUrns={setDeletedDataProductUrns}
+                        />
+                    ))}
+            </ResultsWrapper>
+            <DataProductsPaginationWrapper>
+                <Pagination
+                    current={page}
+                    pageSize={DEFAULT_PAGE_SIZE}
+                    total={totalResults}
+                    showLessItems
+                    onChange={onChangePage}
+                    showSizeChanger={false}
+                />
+            </DataProductsPaginationWrapper>
+            {isCreateModalVisible && (
+                <CreateDataProductModal
+                    domain={entityData as Domain}
+                    onCreateDataProduct={onCreateDataProduct}
+                    onClose={() => setIsCreateModalVisible(false)}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/domain/DataProductsTab/EditDataProductModal.tsx b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/EditDataProductModal.tsx
new file mode 100644
index 00000000000000..67b3b2904b512f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/EditDataProductModal.tsx
@@ -0,0 +1,69 @@
+import { Button, Modal, message } from 'antd';
+import React, { useState } from 'react';
+import DataProductBuilderForm from './DataProductBuilderForm';
+import { DataProductBuilderState } from './types';
+import { useUpdateDataProductMutation } from '../../../../graphql/dataProduct.generated';
+import { DataProduct } from '../../../../types.generated';
+import { MODAL_BODY_STYLE, MODAL_WIDTH } from './CreateDataProductModal';
+
+type Props = {
+    dataProduct: DataProduct;
+    onClose: () => void;
+    onUpdateDataProduct: (dataProduct: DataProduct) => void;
+};
+
+export default function EditDataProductModal({ dataProduct, onUpdateDataProduct, onClose }: Props) {
+    const [builderState, updateBuilderState] = useState<DataProductBuilderState>({
+        name: dataProduct.properties?.name || '',
+        description: dataProduct.properties?.description || '',
+    });
+    const [updateDataProductMutation] = useUpdateDataProductMutation();
+
+    function updateDataProduct() {
+        updateDataProductMutation({
+            variables: {
+                urn: dataProduct.urn,
+                input: {
+                    name: builderState.name,
+                    description: builderState.description || undefined,
+                },
+            },
+        })
+            .then(({ data, errors }) => {
+                if (!errors) {
+                    message.success('Updates Data Product!');
+                    if (data?.updateDataProduct) {
+                        onUpdateDataProduct(data.updateDataProduct as DataProduct);
+                    }
+                    onClose();
+                }
+            })
+            .catch(() => {
+                onClose();
+                message.destroy();
+                message.error({ content: 'Failed to update Data Product. An unexpected error occurred' });
+            });
+    }
+
+    return (
+        <Modal
+            title={`Update ${dataProduct.properties?.name || 'Data Product'}`}
+            onCancel={onClose}
+            style={MODAL_BODY_STYLE}
+            width={MODAL_WIDTH}
+            open
+            footer={
+                <>
+                    <Button onClick={onClose} type="text">
+                        Cancel
+                    </Button>
+                    <Button onClick={updateDataProduct} disabled={!builderState.name}>
+                        Update
+                    </Button>
+                </>
+            }
+        >
+            <DataProductBuilderForm builderState={builderState} updateBuilderState={updateBuilderState} />
+        </Modal>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/domain/DataProductsTab/types.ts b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/types.ts
new file mode 100644
index 00000000000000..1ed3ede39cfbe4
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/types.ts
@@ -0,0 +1,4 @@
+export type DataProductBuilderState = {
+    name: string;
+    description?: string;
+};
diff --git a/datahub-web-react/src/app/entityV2/domain/DomainEntitiesTab.tsx b/datahub-web-react/src/app/entityV2/domain/DomainEntitiesTab.tsx
new file mode 100644
index 00000000000000..27894eaddfba3f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/domain/DomainEntitiesTab.tsx
@@ -0,0 +1,36 @@
+import { SearchCardContext } from '@app/entityV2/shared/SearchCardContext';
+import React from 'react';
+import { useEntityData } from '../../entity/shared/EntityContext';
+import { EntityType } from '../../../types.generated';
+import { EmbeddedListSearchSection } from '../shared/components/styled/search/EmbeddedListSearchSection';
+import { UnionType } from '../../search/utils/constants';
+
+export const DomainEntitiesTab = () => {
+    const { urn, entityType } = useEntityData();
+
+    let fixedFilter;
+    // Set a fixed filter corresponding to the current entity urn.
+    if (entityType === EntityType.Domain) {
+        fixedFilter = {
+            field: 'domains',
+            values: [urn],
+        };
+    }
+
+    const excludeFromFilter = { field: '_entityType', values: ['DATA_PRODUCT'], value: 'DATA_PRODUCT', negated: true };
+
+    return (
+        <SearchCardContext.Provider value={{ showRemovalFromList: true }}>
+            <EmbeddedListSearchSection
+                fixedFilters={{
+                    unionType: UnionType.AND,
+                    filters: [excludeFromFilter, fixedFilter],
+                }}
+                emptySearchQuery="*"
+                placeholderText="Filter domain entities..."
+                skipCache
+                applyView
+            />
+        </SearchCardContext.Provider>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/domain/DomainEntity.tsx b/datahub-web-react/src/app/entityV2/domain/DomainEntity.tsx
new file mode 100644
index 00000000000000..f5dad4847cb191
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/domain/DomainEntity.tsx
@@ -0,0 +1,236 @@
+import { AppstoreOutlined, FileDoneOutlined, FileOutlined, UnorderedListOutlined } from '@ant-design/icons';
+import * as React from 'react';
+import { useGetDomainQuery } from '../../../graphql/domain.generated';
+import { Domain, EntityType, SearchResult } from '../../../types.generated';
+import DomainIcon from '../../domain/DomainIcon';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions';
+import { EntityProfileTab } from '../shared/constants';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
+import SidebarEntitiesSection from '../shared/containers/profile/sidebar/Domain/SidebarEntitiesSection';
+import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
+import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader';
+import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import { EntityActionItem } from '../shared/entity/EntityActions';
+import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties';
+import { SUMMARY_TAB_ICON } from '../shared/summary/HeaderComponents';
+import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab';
+import TabNameWithCount from '../shared/tabs/Entity/TabNameWithCount';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+import DataProductsTab from './DataProductsTab/DataProductsTab';
+import { DomainEntitiesTab } from './DomainEntitiesTab';
+import { Preview } from './preview/Preview';
+import { DomainSummaryTab } from './summary/DomainSummaryTab';
+import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection';
+
+const headerDropdownItems = new Set([
+    EntityMenuItems.MOVE,
+    EntityMenuItems.SHARE,
+    EntityMenuItems.DELETE,
+    EntityMenuItems.ANNOUNCE,
+]);
+
+/**
+ * Definition of the DataHub Domain entity.
+ */
+export class DomainEntity implements Entity<Domain> {
+    type: EntityType = EntityType.Domain;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <DomainIcon />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return <DomainIcon style={{ fontSize, color: color || '#B37FEB' }} />;
+        }
+
+        if (styleType === IconStyleType.SVG) {
+            return (
+                <path
+                    fillRule="evenodd"
+                    clipRule="evenodd"
+                    d="M5.38241 4.45017C5.79578 5.08156 6.64272 5.2583 7.2741 4.84493C7.90549 4.43156 8.08223 3.58462 7.66886 2.95323C7.25549 2.32184 6.40855 2.14511 5.77716 2.55847C5.14578 2.97184 4.96904 3.81878 5.38241 4.45017ZM5.14394 5.70522C5.93376 6.24949 7.0063 6.2952 7.85837 5.73735C8.54707 5.28646 8.93198 4.54586 8.95765 3.78126C10.4383 3.8373 11.732 4.62372 12.4888 5.79063C12.8376 5.61918 13.2124 5.53858 13.5832 5.54251C12.6507 3.85455 10.8528 2.71139 8.78798 2.71139L8.74856 2.71152C8.76299 2.74381 8.77666 2.7763 8.78957 2.80897C8.72977 2.65776 8.65383 2.51033 8.56128 2.36896C7.82523 1.24471 6.31715 0.930005 5.1929 1.66606C4.11266 2.37329 3.77982 3.79327 4.40835 4.90069C3.72087 5.81574 3.31348 6.95324 3.31348 8.18589C3.31348 9.17754 3.57714 10.1076 4.03819 10.9098C4.2114 10.6603 4.43456 10.4392 4.70432 10.2626C4.75298 10.2307 4.80235 10.2008 4.85235 10.1729C4.55031 9.57585 4.38014 8.90074 4.38014 8.18589C4.38014 7.26597 4.66195 6.41188 5.14394 5.70522ZM12.4163 8.72427C12.8297 9.35566 13.6767 9.5324 14.308 9.11903C14.9394 8.70566 15.1162 7.85872 14.7028 7.22733C14.2894 6.59594 13.4425 6.4192 12.8111 6.83257C12.1797 7.24594 12.003 8.09288 12.4163 8.72427ZM13.7973 10.3978C14.1761 10.3609 14.5518 10.2344 14.8923 10.0114C16.0166 9.27539 16.3313 7.76732 15.5952 6.64306C14.8592 5.51881 13.3511 5.2041 12.2268 5.94015C11.1026 6.6762 10.7879 8.18428 11.5239 9.30854C11.8145 9.75234 12.2254 10.07 12.6854 10.2467C11.9457 11.6427 10.4779 12.5937 8.78798 12.5937C8.67553 12.5937 8.56407 12.5895 8.45373 12.5812C8.51807 12.0342 8.39801 11.4624 8.07271 10.9655C7.33667 9.84128 5.82859 9.52658 4.70433 10.2626C3.58008 10.9987 3.26537 12.5068 4.00142 13.631C4.73747 14.7553 6.24555 15.07 7.36981 14.3339C7.66496 14.1407 7.90432 13.8942 8.08351 13.6155C8.31415 13.6451 8.54928 13.6604 8.78798 13.6604C11.0243 13.6604 12.9475 12.3195 13.7973 10.3978ZM6.78554 13.4415C6.15415 13.8549 5.30721 13.6781 4.89384 13.0467C4.48047 12.4154 4.65721 11.5684 5.2886 11.155C5.91999 10.7417 6.76693 10.9184 7.1803 11.5498C7.59367 12.1812 7.41693 13.0281 6.78554 13.4415Z"
+                    fill="currentColor"
+                />
+            );
+        }
+
+        return (
+            <DomainIcon
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => false;
+
+    isLineageEnabled = () => false;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getGraphName = () => 'domain';
+
+    getPathName = () => this.getGraphName();
+
+    getEntityName = () => 'Domain';
+
+    getCollectionName = () => 'Domains';
+
+    useEntityQuery = useGetDomainQuery;
+
+    renderProfile = (urn: string) => (
+        <EntityProfile
+            urn={urn}
+            entityType={EntityType.Domain}
+            useEntityQuery={useGetDomainQuery}
+            useUpdateQuery={undefined}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+            headerDropdownItems={headerDropdownItems}
+            headerActionItems={new Set([EntityActionItem.BATCH_ADD_DOMAIN])}
+            isNameEditable
+            isIconEditable
+            isColorEditable
+            tabs={[
+                {
+                    id: EntityProfileTab.SUMMARY_TAB,
+                    name: 'Summary',
+                    component: DomainSummaryTab,
+                    icon: SUMMARY_TAB_ICON,
+                },
+                {
+                    id: EntityProfileTab.DOMAIN_ENTITIES_TAB,
+                    name: 'Assets',
+                    getDynamicName: (entityData, _, loading) => {
+                        const assetCount = entityData?.entities?.total;
+                        return <TabNameWithCount name="Assets" count={assetCount} loading={loading} />;
+                    },
+                    component: DomainEntitiesTab,
+                    icon: AppstoreOutlined,
+                },
+                {
+                    id: EntityProfileTab.DOCUMENTATION_TAB,
+                    name: 'Documentation',
+                    component: DocumentationTab,
+                    icon: FileOutlined,
+                },
+                {
+                    id: EntityProfileTab.DATA_PRODUCTS_TAB,
+                    name: 'Data Products',
+                    getDynamicName: (entityData, _, loading) => {
+                        const dataProductsCount = entityData?.dataProducts?.total;
+                        return <TabNameWithCount name="Data Products" count={dataProductsCount} loading={loading} />;
+                    },
+                    component: DataProductsTab,
+                    icon: FileDoneOutlined,
+                },
+                {
+                    name: 'Properties',
+                    component: PropertiesTab,
+                    icon: UnorderedListOutlined,
+                },
+            ]}
+            sidebarSections={this.getSidebarSections()}
+            sidebarTabs={this.getSidebarTabs()}
+        />
+    );
+
+    getSidebarSections = () => [
+        {
+            component: SidebarEntityHeader,
+        },
+        {
+            component: SidebarAboutSection,
+        },
+        {
+            component: SidebarNotesSection,
+        },
+        {
+            component: SidebarEntitiesSection,
+        },
+        {
+            component: SidebarOwnerSection,
+        },
+        {
+            component: StatusSection,
+        },
+        {
+            component: SidebarStructuredProperties,
+        },
+    ];
+
+    getSidebarTabs = () => [
+        {
+            name: 'Properties',
+            component: PropertiesTab,
+            description: 'View additional properties about this asset',
+            icon: UnorderedListOutlined,
+        },
+    ];
+
+    renderPreview = (previewType: PreviewType, data: Domain) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <Preview
+                domain={data}
+                urn={data.urn}
+                data={genericProperties}
+                name={this.displayName(data)}
+                description={data.properties?.description}
+                owners={data.ownership?.owners}
+                logoComponent={this.icon(12, IconStyleType.ACCENT)}
+                entityCount={data.entities?.total}
+                headerDropdownItems={headerDropdownItems}
+                previewType={previewType}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        const data = result.entity as Domain;
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <Preview
+                domain={data}
+                urn={data.urn}
+                data={genericProperties}
+                name={this.displayName(data)}
+                description={data.properties?.description}
+                owners={data.ownership?.owners}
+                logoComponent={this.icon(12, IconStyleType.ACCENT)}
+                entityCount={data.entities?.total}
+                headerDropdownItems={headerDropdownItems}
+            />
+        );
+    };
+
+    displayName = (data: Domain) => {
+        return data?.properties?.name || data?.id || data.urn;
+    };
+
+    getOverridePropertiesFromEntity = (data: Domain) => {
+        return {
+            name: data.properties?.name,
+        };
+    };
+
+    getGenericEntityProperties = (data: Domain) => {
+        return getDataForEntityType({
+            data,
+            entityType: this.type,
+            getOverrideProperties: this.getOverridePropertiesFromEntity,
+        });
+    };
+
+    supportedCapabilities = () => {
+        // TODO.. Determine whether SOFT_DELETE should go into here.
+        return new Set([EntityCapabilityType.OWNERS]);
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/domain/preview/DomainEntitiesSnippet.tsx b/datahub-web-react/src/app/entityV2/domain/preview/DomainEntitiesSnippet.tsx
new file mode 100644
index 00000000000000..6d36964004d64f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/domain/preview/DomainEntitiesSnippet.tsx
@@ -0,0 +1,45 @@
+import { DatabaseOutlined, FileDoneOutlined } from '@ant-design/icons';
+import { VerticalDivider } from '@remirror/react';
+import React from 'react';
+import styled from 'styled-components';
+import { SearchResultFields_Domain_Fragment } from '../../../../graphql/search.generated';
+import { ANTD_GRAY_V2 } from '../../shared/constants';
+import DomainIcon from '../../../domain/DomainIcon';
+import { pluralize } from '../../../shared/textUtil';
+
+const Wrapper = styled.div`
+    color: ${ANTD_GRAY_V2[8]};
+    font-size: 12px;
+    display: flex;
+    align-items: center;
+
+    svg {
+        margin-right: 4px;
+    }
+`;
+
+const StyledDivider = styled(VerticalDivider)`
+    &&& {
+        margin: 0 8px;
+    }
+`;
+
+interface Props {
+    domain: SearchResultFields_Domain_Fragment;
+}
+
+export default function DomainEntitiesSnippet({ domain }: Props) {
+    const entityCount = domain.entities?.total || 0;
+    const subDomainCount = domain.children?.total || 0;
+    const dataProductCount = domain.dataProducts?.total || 0;
+
+    return (
+        <Wrapper>
+            <DatabaseOutlined /> {entityCount} {entityCount === 1 ? 'entity' : 'entities'}
+            <StyledDivider />
+            <DomainIcon /> {subDomainCount} {pluralize(subDomainCount, 'sub-domain')}
+            <StyledDivider />
+            <FileDoneOutlined /> {dataProductCount} {pluralize(dataProductCount, 'data product')}
+        </Wrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/domain/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/domain/preview/Preview.tsx
new file mode 100644
index 00000000000000..a2189ea1c51f15
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/domain/preview/Preview.tsx
@@ -0,0 +1,66 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import React from 'react';
+import { Domain, EntityType, Owner, SearchInsight } from '../../../../types.generated';
+import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import DomainEntitiesSnippet from './DomainEntitiesSnippet';
+import DomainIcon from '../../../domain/DomainIcon';
+import EntityCount from '../../shared/containers/profile/header/EntityCount';
+import { DomainColoredIcon } from '../../shared/links/DomainColoredIcon';
+import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions';
+import { PreviewType } from '../../Entity';
+
+export const Preview = ({
+    domain,
+    urn,
+    data,
+    name,
+    description,
+    owners,
+    insights,
+    logoComponent,
+    entityCount,
+    headerDropdownItems,
+    previewType,
+}: {
+    domain: Domain;
+    urn: string;
+    data: GenericEntityProperties | null;
+    name: string;
+    description?: string | null;
+    owners?: Array<Owner> | null;
+    insights?: Array<SearchInsight> | null;
+    logoComponent?: JSX.Element;
+    entityCount?: number;
+    headerDropdownItems?: Set<EntityMenuItems>;
+    previewType?: PreviewType;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    return (
+        <DefaultPreviewCard
+            url={entityRegistry.getEntityUrl(EntityType.Domain, urn)}
+            name={name || ''}
+            urn={urn}
+            data={data}
+            description={description || ''}
+            entityType={EntityType.Domain}
+            typeIcon={
+                <DomainIcon
+                    style={{
+                        fontSize: 14,
+                        color: '#BFBFBF',
+                    }}
+                />
+            }
+            owners={owners}
+            insights={insights}
+            logoComponent={logoComponent}
+            parentEntities={domain.parentDomains?.domains}
+            snippet={<DomainEntitiesSnippet domain={domain} />}
+            subHeader={<EntityCount displayAssetsText entityCount={entityCount} />}
+            entityIcon={<DomainColoredIcon domain={domain as Domain} size={28} />}
+            headerDropdownItems={headerDropdownItems}
+            previewType={previewType}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/domain/summary/ContentSectionLoading.tsx b/datahub-web-react/src/app/entityV2/domain/summary/ContentSectionLoading.tsx
new file mode 100644
index 00000000000000..63bfd2b0f689df
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/domain/summary/ContentSectionLoading.tsx
@@ -0,0 +1,24 @@
+import * as React from 'react';
+import { Skeleton, Space } from 'antd';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../shared/constants';
+
+const TypeSkeleton = styled(Skeleton.Input)`
+    && {
+        width: 60px;
+        height: 60px;
+        border-radius: 8px;
+        background-color: ${ANTD_GRAY[3]};
+    }
+`;
+
+export default function ContentSectionLoading() {
+    return (
+        <Space direction="horizontal">
+            <TypeSkeleton active size="default" />
+            <TypeSkeleton active size="default" />
+            <TypeSkeleton active size="default" />
+            <TypeSkeleton active size="default" />
+        </Space>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/domain/summary/ContentsSection.tsx b/datahub-web-react/src/app/entityV2/domain/summary/ContentsSection.tsx
new file mode 100644
index 00000000000000..921e5304fe71e6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/domain/summary/ContentsSection.tsx
@@ -0,0 +1,102 @@
+import React, { useEffect } from 'react';
+import { useHistory } from 'react-router';
+import styled from 'styled-components';
+import { AppstoreOutlined } from '@ant-design/icons';
+import { useEntityContext, useEntityData } from '../../../entity/shared/EntityContext';
+import { useGetDomainEntitySummaryQuery } from '../../../../graphql/domain.generated';
+import {
+    getContentsSummary,
+    getDomainEntitiesFilterUrl,
+    navigateToDomainEntities,
+} from '../../shared/containers/profile/sidebar/Domain/utils';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import ContentSectionLoading from './ContentSectionLoading';
+import { EntityCountCard } from '../../../sharedV2/cards/EntityCountCard';
+import { pluralize } from '../../../shared/textUtil';
+import {
+    SectionContainer,
+    SummaryTabHeaderTitle,
+    SummaryTabHeaderWrapper,
+} from '../../shared/summary/HeaderComponents';
+import { getContentTypeIcon } from '../../shared/summary/IconComponents';
+import { ANTD_GRAY } from '../../shared/constants';
+import { Carousel } from '../../../sharedV2/carousel/Carousel';
+
+const ViewAllButton = styled.div`
+    color: ${ANTD_GRAY[7]};
+    padding: 2px;
+    :hover {
+        cursor: pointer;
+        color: ${ANTD_GRAY[8]};
+        text-decoration: underline;
+    }
+`;
+
+export const ContentsSection = () => {
+    const { entityState } = useEntityContext();
+    const history = useHistory();
+    const entityRegistry = useEntityRegistry();
+    const { urn, entityType } = useEntityData();
+    const { data, loading, refetch } = useGetDomainEntitySummaryQuery({
+        variables: {
+            urn,
+        },
+    });
+
+    const contentsSummary = data?.aggregateAcrossEntities && getContentsSummary(data.aggregateAcrossEntities as any);
+    const contentsCount = contentsSummary?.total || 0;
+    const hasContents = contentsCount > 0;
+
+    const shouldRefetch = entityState?.shouldRefetchContents;
+    useEffect(() => {
+        if (shouldRefetch) {
+            refetch();
+            entityState?.setShouldRefetchContents(false);
+        }
+    }, [shouldRefetch, entityState, refetch]);
+
+    if (!hasContents) {
+        return null;
+    }
+
+    return (
+        <SectionContainer>
+            <SummaryTabHeaderWrapper>
+                <SummaryTabHeaderTitle icon={<AppstoreOutlined />} title={`Assets (${contentsCount})`} />
+                <ViewAllButton onClick={() => navigateToDomainEntities(urn, entityType, history, entityRegistry)}>
+                    View all
+                </ViewAllButton>
+            </SummaryTabHeaderWrapper>
+            {loading && <ContentSectionLoading />}
+            <Carousel>
+                {!loading &&
+                    contentsSummary?.types.map((summary) => {
+                        const { type, count, entityType: summaryEntityType } = summary;
+                        const typeName = (
+                            type ||
+                            entityRegistry.getEntityName(summaryEntityType) ||
+                            summaryEntityType
+                        ).toLocaleLowerCase();
+                        const link = getDomainEntitiesFilterUrl(
+                            urn,
+                            entityType,
+                            entityRegistry,
+                            [summary.entityType],
+                            summary.type ? [summary.type] : undefined,
+                        );
+                        return (
+                            <EntityCountCard
+                                key={typeName}
+                                type={typeName}
+                                name={typeName}
+                                count={summary.count}
+                                icon={getContentTypeIcon(entityRegistry, summary.entityType, summary.type)}
+                                tooltipDescriptor={pluralize(count, typeName)}
+                                link={link}
+                            />
+                        );
+                    })}
+            </Carousel>
+        </SectionContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/domain/summary/DataProductsSection.tsx b/datahub-web-react/src/app/entityV2/domain/summary/DataProductsSection.tsx
new file mode 100644
index 00000000000000..81db264f9f069f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/domain/summary/DataProductsSection.tsx
@@ -0,0 +1,93 @@
+import React from 'react';
+import styled from 'styled-components';
+import { useHistory } from 'react-router';
+import AddRoundedIcon from '@mui/icons-material/AddRounded';
+import { useEntityData } from '../../../entity/shared/EntityContext';
+import ContentSectionLoading from './ContentSectionLoading';
+import { useGetSearchResultsForMultipleQuery } from '../../../../graphql/search.generated';
+import { DataProduct, EntityType } from '../../../../types.generated';
+import { DOMAINS_FILTER_NAME } from '../../../searchV2/utils/constants';
+import { DataProductMiniPreview } from '../../shared/links/DataProductMiniPreview';
+import {
+    SectionContainer,
+    SummaryTabHeaderTitle,
+    SummaryTabHeaderWrapper,
+    SummaryHeaderButtonGroup,
+} from '../../shared/summary/HeaderComponents';
+import { navigateToDomainDataProducts } from '../../shared/containers/profile/sidebar/Domain/utils';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { IconStyleType } from '../../../entity/Entity';
+import { ANTD_GRAY } from '../../shared/constants';
+import { Carousel } from '../../../sharedV2/carousel/Carousel';
+import SectionActionButton from '../../shared/containers/profile/sidebar/SectionActionButton';
+
+const ViewAllButton = styled.div`
+    color: ${ANTD_GRAY[7]};
+    padding: 2px;
+
+    :hover {
+        cursor: pointer;
+        color: ${ANTD_GRAY[8]};
+        text-decoration: underline;
+    }
+`;
+
+const StyledCarousel = styled(Carousel)`
+    align-items: stretch;
+`;
+
+export const DataProductsSection = () => {
+    const { urn, entityType, entityData } = useEntityData();
+    const history = useHistory();
+    const domainUrn = entityData?.urn || '';
+    const entityRegistry = useEntityRegistry();
+
+    const { data, loading } = useGetSearchResultsForMultipleQuery({
+        skip: !domainUrn,
+        variables: {
+            input: {
+                types: [EntityType.DataProduct],
+                query: '',
+                start: 0,
+                count: 5,
+                orFilters: [{ and: [{ field: DOMAINS_FILTER_NAME, values: [domainUrn] }] }],
+                searchFlags: { skipCache: true },
+            },
+        },
+    });
+
+    const dataProducts = data?.searchAcrossEntities?.searchResults.map((r) => r.entity) || [];
+    const numDataProducts = data?.searchAcrossEntities?.total || 0;
+
+    if (!numDataProducts) {
+        return null;
+    }
+
+    return (
+        <SectionContainer>
+            <SummaryTabHeaderWrapper>
+                <SummaryHeaderButtonGroup>
+                    <SummaryTabHeaderTitle
+                        icon={entityRegistry.getIcon(EntityType.DataProduct, 16, IconStyleType.ACCENT, ANTD_GRAY[8])}
+                        title={`Data Products (${numDataProducts})`}
+                    />
+                    <SectionActionButton
+                        tip="Create Data Product"
+                        button={<AddRoundedIcon />}
+                        onClick={() => navigateToDomainDataProducts(urn, entityType, history, entityRegistry, true)}
+                    />
+                </SummaryHeaderButtonGroup>
+                <ViewAllButton onClick={() => navigateToDomainDataProducts(urn, entityType, history, entityRegistry)}>
+                    View all
+                </ViewAllButton>
+            </SummaryTabHeaderWrapper>
+            {loading && <ContentSectionLoading />}
+            <StyledCarousel>
+                {!loading &&
+                    dataProducts.map((product) => (
+                        <DataProductMiniPreview dataProduct={product as DataProduct} key={product.urn} />
+                    ))}
+            </StyledCarousel>
+        </SectionContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/domain/summary/DocumentationSection.tsx b/datahub-web-react/src/app/entityV2/domain/summary/DocumentationSection.tsx
new file mode 100644
index 00000000000000..4990f0b87c7f3c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/domain/summary/DocumentationSection.tsx
@@ -0,0 +1,98 @@
+import { EditOutlined, ExpandAltOutlined, FileOutlined } from '@ant-design/icons';
+import { Button, Divider, Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { useEntityData, useRefetch, useRouteToTab } from '../../../entity/shared/EntityContext';
+import { AddLinkModal } from '../../shared/components/styled/AddLinkModal';
+import { EmptyTab } from '../../shared/components/styled/EmptyTab';
+import { ANTD_GRAY } from '../../shared/constants';
+import { LinkList } from '../../shared/tabs/Documentation/components/LinkList';
+import { Editor } from '../../shared/tabs/Documentation/components/editor/Editor';
+
+const Header = styled.div`
+    display: flex;
+    align-items: start;
+    justify-content: space-between;
+    padding: 16px 4px;
+`;
+
+const Title = styled(Typography.Title)`
+    && {
+        color: ${ANTD_GRAY[9]};
+        padding: 0px;
+        margin: 0px;
+        display: flex;
+        align-items: center;
+    }
+`;
+
+const ThinDivider = styled(Divider)`
+    && {
+        padding-top: 0px;
+        padding-bottom: 0px;
+        margin-top: 0px;
+        margin-bottom: 20px;
+    }
+`;
+
+const Documentation = styled.div`
+    .remirror-editor.ProseMirror {
+        padding: 0px 8px;
+    }
+`;
+
+const StyledFileOutlined = styled(FileOutlined)`
+    && {
+        font-size: 16px;
+        margin-right: 8px;
+    }
+`;
+
+export const DocumentationSection = () => {
+    // The summary tab consists of modules
+    const { entityData } = useEntityData();
+    const refetch = useRefetch();
+    const routeToTab = useRouteToTab();
+
+    const description = entityData?.editableProperties?.description || entityData?.properties?.description || '';
+    const hasDescription = description || description !== '';
+
+    return (
+        <>
+            <Header>
+                <Title level={3}>
+                    <StyledFileOutlined />
+                    About
+                </Title>
+                {hasDescription && (
+                    <Button
+                        type="text"
+                        onClick={() =>
+                            routeToTab({
+                                tabName: 'Documentation',
+                                tabParams: { modal: true },
+                            })
+                        }
+                    >
+                        <ExpandAltOutlined />
+                    </Button>
+                )}
+            </Header>
+            <ThinDivider />
+            <Documentation>
+                {(hasDescription && <Editor content={description} readOnly />) || (
+                    <EmptyTab tab="documentation">
+                        <Button
+                            data-testid="add-documentation"
+                            onClick={() => routeToTab({ tabName: 'Documentation', tabParams: { editing: true } })}
+                        >
+                            <EditOutlined /> Add Documentation
+                        </Button>
+                        <AddLinkModal refetch={refetch} />
+                    </EmptyTab>
+                )}
+                <LinkList refetch={refetch} />
+            </Documentation>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/domain/summary/DomainSummaryTab.tsx b/datahub-web-react/src/app/entityV2/domain/summary/DomainSummaryTab.tsx
new file mode 100644
index 00000000000000..0a02d9fbad0f30
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/domain/summary/DomainSummaryTab.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import { ContentsSection } from './ContentsSection';
+import { DataProductsSection } from './DataProductsSection';
+import SummaryAboutSection from '../../shared/summary/SummaryAboutSection';
+import { SummaryTabWrapper } from '../../shared/summary/HeaderComponents';
+import OwnersSection from './OwnersSection';
+
+export const DomainSummaryTab = () => {
+    return (
+        <SummaryTabWrapper>
+            <OwnersSection />
+            <DataProductsSection />
+            <ContentsSection />
+            <SummaryAboutSection />
+        </SummaryTabWrapper>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/domain/summary/OwnerDetail.tsx b/datahub-web-react/src/app/entityV2/domain/summary/OwnerDetail.tsx
new file mode 100644
index 00000000000000..39eff2d6678638
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/domain/summary/OwnerDetail.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Tooltip } from '@components';
+import { useEntityRegistryV2 } from '../../../useEntityRegistry';
+import { EntityType, Owner } from '../../../../types.generated';
+import CustomAvatar from '../../../shared/avatar/CustomAvatar';
+import { REDESIGN_COLORS } from '../../shared/constants';
+
+const Details = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 5px;
+    color: ${REDESIGN_COLORS.SUBTITLE};
+    font-size: 14px;
+    font-weight: 500;
+`;
+
+const OwnerName = styled.div`
+    width: 110px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+`;
+
+interface Props {
+    owner: Owner;
+}
+
+const OwnerDetail = ({ owner }: Props) => {
+    const entityRegistry = useEntityRegistryV2();
+
+    const ownerName = entityRegistry.getDisplayName(EntityType.CorpUser, owner.owner);
+
+    const ownerPictureLink = owner.owner.editableProperties?.pictureLink || undefined;
+
+    const avatar: React.ReactNode = (
+        <CustomAvatar name={ownerName} photoUrl={ownerPictureLink} useDefaultAvatar={false} hideTooltip />
+    );
+
+    return (
+        <>
+            {!!ownerName && (
+                <>
+                    <Details>
+                        <div>{avatar}</div>
+                        <Tooltip title={ownerName}>
+                            <OwnerName>{ownerName}</OwnerName>
+                        </Tooltip>
+                    </Details>
+                </>
+            )}
+        </>
+    );
+};
+
+export default OwnerDetail;
diff --git a/datahub-web-react/src/app/entityV2/domain/summary/OwnersSection.tsx b/datahub-web-react/src/app/entityV2/domain/summary/OwnersSection.tsx
new file mode 100644
index 00000000000000..0c80bd565e935c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/domain/summary/OwnersSection.tsx
@@ -0,0 +1,89 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { UserOutlined } from '@ant-design/icons';
+import { useEntityData } from '../../../entity/shared/EntityContext';
+import { Owner, OwnershipTypeEntity } from '../../../../types.generated';
+import { getOwnershipTypeName } from '../../shared/containers/profile/sidebar/Ownership/ownershipUtils';
+import { REDESIGN_COLORS } from '../../shared/constants';
+import OwnerDetail from './OwnerDetail';
+import { SummaryTabHeaderTitle } from '../../shared/summary/HeaderComponents';
+
+const OwnershipTypeNameText = styled(Typography.Text)`
+    font-weight: 500;
+    font-size: 12px;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+`;
+
+const OwnersContainer = styled.div`
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    gap: 8px;
+`;
+
+const OwnershipContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    gap: 8px;
+`;
+
+const SectionContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+`;
+
+const Details = styled.div`
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    gap: 24px;
+`;
+
+const OwnersSection = () => {
+    const { entityData } = useEntityData();
+    const ownersEmpty = !entityData?.ownership?.owners?.length;
+    const ownershipTypesMap: Map<string, OwnershipTypeEntity> = new Map();
+    const ownersByTypeMap: Map<string, Owner[]> = new Map();
+    entityData?.ownership?.owners?.forEach((owner) => {
+        const ownershipType = owner?.ownershipType;
+        const ownershipTypeName = getOwnershipTypeName(ownershipType);
+        // If ownership type is not in the map, add it
+        if (ownershipType && !ownershipTypesMap.has(ownershipTypeName)) {
+            ownershipTypesMap.set(ownershipTypeName, ownershipType);
+        }
+        if (!ownersByTypeMap.has(ownershipTypeName)) {
+            ownersByTypeMap.set(ownershipTypeName, []);
+        }
+        ownersByTypeMap.get(ownershipTypeName)?.push(owner);
+    });
+    // Sort ownership types by name alphabetically
+    const ownershipTypeNames = Array.from(ownershipTypesMap.keys()).sort();
+
+    if (ownersEmpty) return null;
+
+    return (
+        <SectionContainer>
+            <SummaryTabHeaderTitle title="Owners" icon={<UserOutlined />} />
+            <Details>
+                {ownershipTypeNames.map((ownershipTypeName) => {
+                    const owners = ownersByTypeMap.get(ownershipTypeName) as Owner[];
+                    return (
+                        <OwnershipContainer>
+                            <OwnershipTypeNameText>{ownershipTypeName}</OwnershipTypeNameText>
+                            <OwnersContainer>
+                                {owners.map((owner) => (
+                                    <OwnerDetail owner={owner} />
+                                ))}
+                            </OwnersContainer>
+                        </OwnershipContainer>
+                    );
+                })}
+            </Details>
+        </SectionContainer>
+    );
+};
+
+export default OwnersSection;
diff --git a/datahub-web-react/src/app/entityV2/glossaryNode/ChildrenTab.tsx b/datahub-web-react/src/app/entityV2/glossaryNode/ChildrenTab.tsx
new file mode 100644
index 00000000000000..2c254908321e61
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryNode/ChildrenTab.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import { EntityType, GlossaryNode, GlossaryTerm } from '../../../types.generated';
+import EmptyGlossarySection from '../../glossaryV2/EmptyGlossarySection';
+import GlossaryEntitiesList from '../../glossaryV2/GlossaryEntitiesList';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { sortGlossaryTerms } from '../glossaryTerm/utils';
+import { useEntityData } from '../../entity/shared/EntityContext';
+import { sortGlossaryNodes } from './utils';
+
+function ChildrenTab() {
+    const { entityData } = useEntityData();
+    const entityRegistry = useEntityRegistry();
+
+    if (!entityData) return <></>;
+
+    const childNodes = entityData?.children?.relationships
+        .filter((child) => child.entity?.type === EntityType.GlossaryNode)
+        .sort((nodeA, nodeB) => sortGlossaryNodes(entityRegistry, nodeA.entity, nodeB.entity))
+        .map((child) => child.entity);
+    const childTerms = entityData?.children?.relationships
+        .filter((child) => child.entity?.type === EntityType.GlossaryTerm)
+        .sort((termA, termB) => sortGlossaryTerms(entityRegistry, termA.entity, termB.entity))
+        .map((child) => child.entity);
+
+    const hasTermsOrNodes = !!childNodes?.length || !!childTerms?.length;
+
+    if (hasTermsOrNodes) {
+        return (
+            <GlossaryEntitiesList
+                nodes={(childNodes as GlossaryNode[]) || []}
+                terms={(childTerms as GlossaryTerm[]) || []}
+            />
+        );
+    }
+
+    return <EmptyGlossarySection description="No Terms or Term Groups" />;
+}
+
+export default ChildrenTab;
diff --git a/datahub-web-react/src/app/entityV2/glossaryNode/GlossaryNodeEntity.tsx b/datahub-web-react/src/app/entityV2/glossaryNode/GlossaryNodeEntity.tsx
new file mode 100644
index 00000000000000..e819f00f20640c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryNode/GlossaryNodeEntity.tsx
@@ -0,0 +1,202 @@
+import { AppstoreOutlined, FileOutlined, UnorderedListOutlined } from '@ant-design/icons';
+import React from 'react';
+import { BookmarksSimple } from '@phosphor-icons/react';
+import { useGetGlossaryNodeQuery } from '../../../graphql/glossaryNode.generated';
+import { EntityType, GlossaryNode, SearchResult } from '../../../types.generated';
+import { FetchedEntity } from '../../lineage/types';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
+import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
+import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import { EntityActionItem } from '../shared/entity/EntityActions';
+import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions';
+import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties';
+import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+import ChildrenTab from './ChildrenTab';
+import { Preview } from './preview/Preview';
+import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection';
+
+const headerDropdownItems = new Set([
+    EntityMenuItems.MOVE,
+    EntityMenuItems.SHARE,
+    EntityMenuItems.DELETE,
+    EntityMenuItems.ANNOUNCE,
+]);
+
+class GlossaryNodeEntity implements Entity<GlossaryNode> {
+    getLineageVizConfig?: ((entity: GlossaryNode) => FetchedEntity) | undefined;
+
+    type: EntityType = EntityType.GlossaryNode;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <BookmarksSimple className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return (
+                <BookmarksSimple
+                    className={TYPE_ICON_CLASS_NAME}
+                    style={{ fontSize, color: color || '#B37FEB' }}
+                    weight="fill"
+                />
+            );
+        }
+
+        if (styleType === IconStyleType.ACCENT) {
+            return <BookmarksSimple style={{ fontSize: fontSize || 10, color: color || '#6C6B88' }} />;
+        }
+
+        return (
+            <BookmarksSimple
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => false;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    isLineageEnabled = () => false;
+
+    getPathName = () => 'glossaryNode';
+
+    getCollectionName = () => 'Term Groups';
+
+    getEntityName = () => 'Term Group';
+
+    useEntityQuery = useGetGlossaryNodeQuery;
+
+    renderProfile = (urn: string) => {
+        return (
+            <EntityProfile
+                urn={urn}
+                entityType={EntityType.GlossaryNode}
+                useEntityQuery={useGetGlossaryNodeQuery}
+                getOverrideProperties={this.getOverridePropertiesFromEntity}
+                isNameEditable
+                tabs={[
+                    {
+                        name: 'Contents',
+                        component: ChildrenTab,
+                        icon: AppstoreOutlined,
+                    },
+                    {
+                        name: 'Documentation',
+                        component: DocumentationTab,
+                        icon: FileOutlined,
+                        properties: {
+                            hideLinksButton: true,
+                        },
+                    },
+                    {
+                        name: 'Properties',
+                        component: PropertiesTab,
+                        icon: UnorderedListOutlined,
+                    },
+                ]}
+                sidebarSections={this.getSidebarSections()}
+                headerActionItems={
+                    new Set([EntityActionItem.ADD_CHILD_GLOSSARY_NODE, EntityActionItem.ADD_CHILD_GLOSSARY_TERM])
+                }
+                headerDropdownItems={headerDropdownItems}
+                sidebarTabs={this.getSidebarTabs()}
+            />
+        );
+    };
+
+    getSidebarSections = () => [
+        {
+            component: SidebarAboutSection,
+            properties: {
+                hideLinksButton: true,
+            },
+        },
+        {
+            component: SidebarNotesSection,
+        },
+        {
+            component: SidebarOwnerSection,
+        },
+        {
+            component: StatusSection,
+        },
+        {
+            component: SidebarStructuredProperties,
+        },
+    ];
+
+    getSidebarTabs = () => [
+        {
+            name: 'Properties',
+            component: PropertiesTab,
+            description: 'View additional properties about this asset',
+            icon: UnorderedListOutlined,
+        },
+    ];
+
+    displayName = (data: GlossaryNode) => {
+        return data?.properties?.name || data?.urn;
+    };
+
+    getOverridePropertiesFromEntity = (data: GlossaryNode) => {
+        return {
+            name: this.displayName(data),
+        };
+    };
+
+    renderSearch = (result: SearchResult) => {
+        return this.renderPreview(PreviewType.SEARCH, result.entity as GlossaryNode);
+    };
+
+    renderPreview = (previewType: PreviewType, data: GlossaryNode) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <Preview
+                urn={data?.urn}
+                data={genericProperties}
+                parentNodes={data.parentNodes}
+                name={this.displayName(data)}
+                description={data?.properties?.description || ''}
+                owners={data?.ownership?.owners}
+                headerDropdownItems={headerDropdownItems}
+                previewType={previewType}
+            />
+        );
+    };
+
+    platformLogoUrl = (_: GlossaryNode) => {
+        return undefined;
+    };
+
+    getGenericEntityProperties = (glossaryNode: GlossaryNode) => {
+        return getDataForEntityType({
+            data: glossaryNode,
+            entityType: this.type,
+            getOverrideProperties: (data) => data,
+        });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([
+            EntityCapabilityType.OWNERS,
+            EntityCapabilityType.DEPRECATION,
+            EntityCapabilityType.SOFT_DELETE,
+        ]);
+    };
+
+    getGraphName = () => this.getPathName();
+}
+
+export default GlossaryNodeEntity;
diff --git a/datahub-web-react/src/app/entityV2/glossaryNode/_tests_/utils.test.ts b/datahub-web-react/src/app/entityV2/glossaryNode/_tests_/utils.test.ts
new file mode 100644
index 00000000000000..1b10c95e4be240
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryNode/_tests_/utils.test.ts
@@ -0,0 +1,65 @@
+import { globalEntityRegistryV2 } from '@app/EntityRegistryProvider';
+import { EntityType } from '../../../../types.generated';
+import { sortGlossaryNodes } from '../utils';
+
+describe('sortGlossaryNodes', () => {
+    it('should correctly sort glossary nodes when both nodes are provided', () => {
+        const nodeA = {
+            type: EntityType.GlossaryNode,
+            urn: 'urn:123',
+            properties: {
+                __typename: 'GlossaryNodeProperties',
+                name: 'test child 2',
+            },
+        };
+        const nodeB = {
+            type: EntityType.GlossaryNode,
+            urn: 'urn:li:456',
+            properties: {
+                __typename: 'GlossaryNodeProperties',
+                name: 'test child 1',
+            },
+        };
+        const result = sortGlossaryNodes(globalEntityRegistryV2, nodeA, nodeB);
+        expect(result).toBeGreaterThan(0);
+    });
+
+    it('should not sort glossary nodes when both nodes are provided in sorted order', () => {
+        const nodeA = {
+            type: EntityType.GlossaryNode,
+            urn: 'urn:123',
+            properties: {
+                __typename: 'GlossaryNodeProperties',
+                name: 'test child 1',
+            },
+        };
+        const nodeB = {
+            type: EntityType.GlossaryNode,
+            urn: 'urn:li:456',
+            properties: {
+                __typename: 'GlossaryNodeProperties',
+                name: 'test child 2',
+            },
+        };
+        const result = sortGlossaryNodes(globalEntityRegistryV2, nodeA, nodeB);
+        expect(result).toBeLessThan(0);
+    });
+
+    it('should correctly sort glossary nodes when only one node is provided', () => {
+        const nodeA = {
+            type: EntityType.GlossaryNode,
+            urn: 'urn:123',
+            properties: {
+                __typename: 'GlossaryNodeProperties',
+                name: 'test child 1',
+            },
+        };
+        const result = sortGlossaryNodes(globalEntityRegistryV2, nodeA);
+        expect(result).toBeGreaterThan(0);
+    });
+
+    it('should handle null nodes by considering them equal in sorting', () => {
+        const result = sortGlossaryNodes(globalEntityRegistryV2);
+        expect(result).toBe(0);
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/glossaryNode/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/glossaryNode/preview/Preview.tsx
new file mode 100644
index 00000000000000..392d56f4a8acdd
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryNode/preview/Preview.tsx
@@ -0,0 +1,45 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import React from 'react';
+import { FolderOutlined } from '@ant-design/icons';
+import { EntityType, Owner, ParentNodesResult } from '../../../../types.generated';
+import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions';
+import { PreviewType } from '../../Entity';
+
+export const Preview = ({
+    urn,
+    data,
+    name,
+    description,
+    owners,
+    parentNodes,
+    headerDropdownItems,
+    previewType,
+}: {
+    urn: string;
+    data: GenericEntityProperties | null;
+    name: string;
+    description?: string | null;
+    owners?: Array<Owner> | null;
+    parentNodes?: ParentNodesResult | null;
+    headerDropdownItems?: Set<EntityMenuItems>;
+    previewType?: PreviewType;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    return (
+        <DefaultPreviewCard
+            url={entityRegistry.getEntityUrl(EntityType.GlossaryNode, urn)}
+            name={name || ''}
+            urn={urn}
+            data={data}
+            description={description || ''}
+            owners={owners}
+            logoComponent={<FolderOutlined style={{ fontSize: '20px' }} />}
+            entityType={EntityType.GlossaryNode}
+            parentEntities={parentNodes?.nodes}
+            headerDropdownItems={headerDropdownItems}
+            previewType={previewType}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/glossaryNode/utils.ts b/datahub-web-react/src/app/entityV2/glossaryNode/utils.ts
new file mode 100644
index 00000000000000..2263f5a9238d01
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryNode/utils.ts
@@ -0,0 +1,8 @@
+import { Entity, EntityType } from '../../../types.generated';
+import { EntityRegistry } from '../../../entityRegistryContext';
+
+export function sortGlossaryNodes(entityRegistry: EntityRegistry, nodeA?: Entity | null, nodeB?: Entity | null) {
+    const nodeAName = entityRegistry.getDisplayName(EntityType.GlossaryNode, nodeA) || '';
+    const nodeBName = entityRegistry.getDisplayName(EntityType.GlossaryNode, nodeB) || '';
+    return nodeAName.localeCompare(nodeBName);
+}
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/GlossaryRelatedAssetsTabHeader.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/GlossaryRelatedAssetsTabHeader.tsx
new file mode 100644
index 00000000000000..4f52dd15c090bd
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryTerm/GlossaryRelatedAssetsTabHeader.tsx
@@ -0,0 +1,54 @@
+import { Pill } from '@src/alchemy-components';
+import { useEntityData } from '@src/app/entity/shared/EntityContext';
+import { formatNumber } from '@src/app/shared/formatNumber';
+import { useGetSearchResultsForMultipleQuery } from '@src/graphql/search.generated';
+import React from 'react';
+import styled from 'styled-components';
+
+const Styled = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const TabName = styled.div`
+    padding-right: 4px;
+`;
+
+function GlossaryRelatedAssetsTabHeader() {
+    const { entityData } = useEntityData();
+
+    // To get the number of related assets
+    const { data } = useGetSearchResultsForMultipleQuery({
+        variables: {
+            input: {
+                types: [],
+                query: '*',
+                count: 0,
+                orFilters: [
+                    {
+                        and: [
+                            {
+                                field: 'glossaryTerms',
+                                values: [entityData?.urn || ''],
+                            },
+                        ],
+                    },
+                ],
+                searchFlags: {
+                    skipCache: true,
+                },
+            },
+        },
+        skip: !entityData?.urn,
+        fetchPolicy: 'cache-and-network',
+    });
+
+    return (
+        <Styled>
+            <TabName>Related Assets</TabName>
+            <Pill label={formatNumber(data?.searchAcrossEntities?.total || 0)} />
+        </Styled>
+    );
+}
+
+export default GlossaryRelatedAssetsTabHeader;
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/GlossaryTermEntity.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/GlossaryTermEntity.tsx
new file mode 100644
index 00000000000000..bb8bad0eeff547
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryTerm/GlossaryTermEntity.tsx
@@ -0,0 +1,244 @@
+import { AppstoreOutlined, FileOutlined, LayoutOutlined, UnorderedListOutlined } from '@ant-design/icons';
+import * as React from 'react';
+import { BookmarkSimple } from '@phosphor-icons/react';
+import { GetGlossaryTermQuery, useGetGlossaryTermQuery } from '../../../graphql/glossaryTerm.generated';
+import { EntityType, GlossaryTerm, SearchResult } from '../../../types.generated';
+import { GenericEntityProperties } from '../../entity/shared/types';
+import { FetchedEntity } from '../../lineage/types';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions';
+import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
+import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection';
+import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
+import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader';
+import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import { EntityActionItem } from '../shared/entity/EntityActions';
+import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties';
+import { SchemaTab } from '../shared/tabs/Dataset/Schema/SchemaTab';
+import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab';
+import TabNameWithCount from '../shared/tabs/Entity/TabNameWithCount';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+import GlossaryRelatedAssetsTabHeader from './GlossaryRelatedAssetsTabHeader';
+import { Preview } from './preview/Preview';
+import GlossaryRelatedEntity from './profile/GlossaryRelatedEntity';
+import GlossayRelatedTerms from './profile/GlossaryRelatedTerms';
+import { RelatedTermTypes } from './profile/GlossaryRelatedTermsResult';
+import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection';
+
+const headerDropdownItems = new Set([
+    EntityMenuItems.MOVE,
+    EntityMenuItems.SHARE,
+    EntityMenuItems.UPDATE_DEPRECATION,
+    EntityMenuItems.DELETE,
+    EntityMenuItems.ANNOUNCE,
+]);
+
+/**
+ * Definition of the DataHub Dataset entity.
+ */
+export class GlossaryTermEntity implements Entity<GlossaryTerm> {
+    getLineageVizConfig?: ((entity: GlossaryTerm) => FetchedEntity) | undefined;
+
+    type: EntityType = EntityType.GlossaryTerm;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <BookmarkSimple className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return (
+                <BookmarkSimple
+                    className={TYPE_ICON_CLASS_NAME}
+                    style={{ fontSize, color: color || '#B37FEB' }}
+                    weight="fill"
+                />
+            );
+        }
+
+        if (styleType === IconStyleType.ACCENT) {
+            return <BookmarkSimple style={{ fontSize: fontSize ?? 10, color: color || '#6C6B88' }} />;
+        }
+
+        return (
+            <BookmarkSimple
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => true;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    isLineageEnabled = () => false;
+
+    getPathName = () => 'glossaryTerm';
+
+    getCollectionName = () => 'Glossary Terms';
+
+    getEntityName = () => 'Glossary Term';
+
+    useEntityQuery = useGetGlossaryTermQuery;
+
+    renderProfile = (urn) => {
+        return (
+            <EntityProfile
+                urn={urn}
+                entityType={EntityType.GlossaryTerm}
+                useEntityQuery={useGetGlossaryTermQuery as any}
+                headerActionItems={new Set([EntityActionItem.BATCH_ADD_GLOSSARY_TERM])}
+                headerDropdownItems={headerDropdownItems}
+                isNameEditable
+                tabs={[
+                    {
+                        name: 'Documentation',
+                        component: DocumentationTab,
+                        icon: FileOutlined,
+                    },
+                    {
+                        name: 'Related Assets',
+                        getDynamicName: GlossaryRelatedAssetsTabHeader,
+                        component: GlossaryRelatedEntity,
+                        icon: AppstoreOutlined,
+                    },
+                    {
+                        name: 'Schema',
+                        component: SchemaTab,
+                        icon: LayoutOutlined,
+                        properties: {
+                            editMode: false,
+                        },
+                        display: {
+                            visible: (_, glossaryTerm: GetGlossaryTermQuery) =>
+                                glossaryTerm?.glossaryTerm?.schemaMetadata !== null,
+                            enabled: (_, glossaryTerm: GetGlossaryTermQuery) =>
+                                glossaryTerm?.glossaryTerm?.schemaMetadata !== null,
+                        },
+                    },
+                    {
+                        name: 'Related Terms',
+                        getDynamicName: (entityData, _, loading) => {
+                            const totalRelatedTerms = Object.keys(RelatedTermTypes).reduce((acc, curr) => {
+                                return acc + (entityData?.[curr]?.total || 0);
+                            }, 0);
+                            return (
+                                <TabNameWithCount name="Related Terms" count={totalRelatedTerms} loading={loading} />
+                            );
+                        },
+                        component: GlossayRelatedTerms,
+                        icon: () => <BookmarkSimple style={{ marginRight: 6 }} />,
+                    },
+                    {
+                        name: 'Properties',
+                        component: PropertiesTab,
+                        icon: UnorderedListOutlined,
+                    },
+                ]}
+                sidebarSections={this.getSidebarSections()}
+                getOverrideProperties={this.getOverridePropertiesFromEntity}
+                sidebarTabs={this.getSidebarTabs()}
+            />
+        );
+    };
+
+    getSidebarSections = () => [
+        {
+            component: SidebarEntityHeader,
+        },
+        {
+            component: SidebarAboutSection,
+        },
+        {
+            component: SidebarNotesSection,
+        },
+        {
+            component: SidebarOwnerSection,
+        },
+        {
+            component: SidebarDomainSection,
+            properties: {
+                hideOwnerType: true,
+            },
+        },
+        {
+            component: StatusSection,
+        },
+        {
+            component: SidebarStructuredProperties,
+        },
+    ];
+
+    getSidebarTabs = () => [
+        {
+            name: 'Properties',
+            component: PropertiesTab,
+            description: 'View additional properties about this asset',
+            icon: UnorderedListOutlined,
+        },
+    ];
+
+    getOverridePropertiesFromEntity = (glossaryTerm?: GlossaryTerm | null): GenericEntityProperties => {
+        // if dataset has subTypes filled out, pick the most specific subtype and return it
+        return {
+            customProperties: glossaryTerm?.properties?.customProperties,
+        };
+    };
+
+    renderSearch = (result: SearchResult) => {
+        return this.renderPreview(PreviewType.SEARCH, result.entity as GlossaryTerm);
+    };
+
+    renderPreview = (previewType: PreviewType, data: GlossaryTerm) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <Preview
+                data={genericProperties}
+                previewType={previewType}
+                urn={data?.urn}
+                parentNodes={data.parentNodes}
+                name={this.displayName(data)}
+                description={data?.properties?.description || ''}
+                owners={data?.ownership?.owners}
+                deprecation={data?.deprecation}
+                domain={data.domain?.domain}
+                headerDropdownItems={headerDropdownItems}
+            />
+        );
+    };
+
+    displayName = (data: GlossaryTerm) => {
+        return data?.properties?.name || data?.name || data?.urn;
+    };
+
+    platformLogoUrl = (_: GlossaryTerm) => {
+        return undefined;
+    };
+
+    getGenericEntityProperties = (glossaryTerm: GlossaryTerm) => {
+        return getDataForEntityType({
+            data: glossaryTerm,
+            entityType: this.type,
+            getOverrideProperties: (data) => data,
+        });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([
+            EntityCapabilityType.OWNERS,
+            EntityCapabilityType.DEPRECATION,
+            EntityCapabilityType.SOFT_DELETE,
+        ]);
+    };
+
+    getGraphName = () => this.getPathName();
+}
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/_tests_/utils.test.ts b/datahub-web-react/src/app/entityV2/glossaryTerm/_tests_/utils.test.ts
new file mode 100644
index 00000000000000..446841344fed71
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryTerm/_tests_/utils.test.ts
@@ -0,0 +1,83 @@
+import { globalEntityRegistryV2 } from '@app/EntityRegistryProvider';
+import { EntityType } from '../../../../types.generated';
+import { getRelatedAssetsUrl, getRelatedEntitiesUrl, sortGlossaryTerms } from '../utils';
+
+describe('sortGlossaryTerms', () => {
+    it('should correctly sort glossary terms when both nodes are provided', () => {
+        const nodeA = {
+            type: EntityType.GlossaryTerm,
+            urn: 'urn:123',
+            properties: {
+                __typename: 'GlossaryTermProperties',
+                name: 'test child 2',
+            },
+        };
+        const nodeB = {
+            type: EntityType.GlossaryTerm,
+            urn: 'urn:li:456',
+            properties: {
+                __typename: 'GlossaryTermProperties',
+                name: 'test child 1',
+            },
+        };
+        const result = sortGlossaryTerms(globalEntityRegistryV2, nodeA, nodeB);
+        expect(result).toBeGreaterThan(0);
+    });
+
+    it('should not sort glossary terms when both nodes are provided in sorted order', () => {
+        const nodeA = {
+            type: EntityType.GlossaryTerm,
+            urn: 'urn:123',
+            properties: {
+                __typename: 'GlossaryTermProperties',
+                name: 'test child 1',
+            },
+        };
+        const nodeB = {
+            type: EntityType.GlossaryTerm,
+            urn: 'urn:li:456',
+            properties: {
+                __typename: 'GlossaryTermProperties',
+                name: 'test child 2',
+            },
+        };
+        const result = sortGlossaryTerms(globalEntityRegistryV2, nodeA, nodeB);
+        expect(result).toBeLessThan(0);
+    });
+
+    it('should correctly sort glossary terms when only one node is provided', () => {
+        const nodeA = {
+            type: EntityType.GlossaryTerm,
+            urn: 'urn:123',
+            properties: {
+                __typename: 'GlossaryTermProperties',
+                name: 'test child 1',
+            },
+        };
+        const result = sortGlossaryTerms(globalEntityRegistryV2, nodeA);
+        expect(result).toBeGreaterThan(0);
+    });
+
+    it('should handle null nodes by considering them equal in sorting', () => {
+        const result = sortGlossaryTerms(globalEntityRegistryV2);
+        expect(result).toBe(0);
+    });
+});
+
+describe('getRelatedEntitiesUrl', () => {
+    it('should return Related Entities URL', () => {
+        const urn = 'urn123';
+        const url = getRelatedEntitiesUrl(globalEntityRegistryV2, urn);
+        const expectedURL = `/glossaryTerm/${urn}/${encodeURIComponent('Related Entities')}`;
+        expect(url).toEqual(expectedURL);
+    });
+});
+
+describe('getRelatedAssetsUrl', () => {
+    it('should return Related Assets URL', () => {
+        const urn = 'urn123';
+        const url = getRelatedAssetsUrl(globalEntityRegistryV2, urn);
+        const expectedURL = `/glossaryTerm/${urn}/${encodeURIComponent('Related Assets')}`;
+        expect(url).toEqual(expectedURL);
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/preview/Preview.tsx
new file mode 100644
index 00000000000000..5db90779779adb
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryTerm/preview/Preview.tsx
@@ -0,0 +1,57 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import React from 'react';
+import { BookmarkSimple } from '@phosphor-icons/react';
+import { Deprecation, Domain, EntityType, Owner, ParentNodesResult } from '../../../../types.generated';
+import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { IconStyleType, PreviewType } from '../../Entity';
+import UrlButton from '../../shared/UrlButton';
+import { getRelatedAssetsUrl } from '../utils';
+import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions';
+
+export const Preview = ({
+    urn,
+    name,
+    data,
+    description,
+    owners,
+    deprecation,
+    parentNodes,
+    previewType,
+    domain,
+    headerDropdownItems,
+}: {
+    urn: string;
+    data: GenericEntityProperties | null;
+    name: string;
+    description?: string | null;
+    owners?: Array<Owner> | null;
+    deprecation?: Deprecation | null;
+    parentNodes?: ParentNodesResult | null;
+    previewType: PreviewType;
+    domain?: Domain | undefined;
+    headerDropdownItems?: Set<EntityMenuItems>;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    return (
+        <DefaultPreviewCard
+            previewType={previewType}
+            url={entityRegistry.getEntityUrl(EntityType.GlossaryTerm, urn)}
+            name={name || ''}
+            urn={urn}
+            data={data}
+            description={description || ''}
+            owners={owners}
+            logoComponent={<BookmarkSimple style={{ fontSize: '20px' }} />}
+            entityType={EntityType.GlossaryTerm}
+            typeIcon={entityRegistry.getIcon(EntityType.GlossaryTerm, 14, IconStyleType.ACCENT)}
+            deprecation={deprecation}
+            parentEntities={parentNodes?.nodes}
+            domain={domain}
+            entityTitleSuffix={
+                <UrlButton href={getRelatedAssetsUrl(entityRegistry, urn)}>View Related Assets</UrlButton>
+            }
+            headerDropdownItems={headerDropdownItems}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/preview/__tests__/Preview.test.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/preview/__tests__/Preview.test.tsx
new file mode 100644
index 00000000000000..f65cbb8db71f3f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryTerm/preview/__tests__/Preview.test.tsx
@@ -0,0 +1,27 @@
+import { MockedProvider } from '@apollo/client/testing';
+import { render } from '@testing-library/react';
+import React from 'react';
+import { mocks } from '../../../../../Mocks';
+import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer';
+import { Preview } from '../Preview';
+import { PreviewType } from '../../../Entity';
+
+describe('Preview', () => {
+    it('renders', () => {
+        const { getByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer>
+                    <Preview
+                        data={null}
+                        urn="urn:li:glossaryTerm:instruments.FinancialInstrument_v1"
+                        name="custom_name"
+                        description="definition"
+                        owners={null}
+                        previewType={PreviewType.PREVIEW}
+                    />
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(getByText('custom_name')).toBeInTheDocument();
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/AddRelatedTermsModal.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/AddRelatedTermsModal.tsx
new file mode 100644
index 00000000000000..7986eb19070ddf
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/AddRelatedTermsModal.tsx
@@ -0,0 +1,218 @@
+import { message, Button, Modal, Select, Tag } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components/macro';
+import { useAddRelatedTermsMutation } from '../../../../graphql/glossaryTerm.generated';
+import { useGetSearchResultsLazyQuery } from '../../../../graphql/search.generated';
+import { EntityType, SearchResult, TermRelationshipType } from '../../../../types.generated';
+import GlossaryBrowser from '../../../glossary/GlossaryBrowser/GlossaryBrowser';
+import ClickOutside from '../../../shared/ClickOutside';
+import { BrowserWrapper } from '../../../shared/tags/AddTagsTermsModal';
+import TermLabel from '../../../shared/TermLabel';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { useEntityData, useRefetch } from '../../../entity/shared/EntityContext';
+import ParentEntities from '../../../searchV2/filters/ParentEntities';
+import { getParentEntities } from '../../../searchV2/filters/utils';
+
+const StyledSelect = styled(Select)`
+    width: 480px;
+`;
+
+const SearchResultContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+`;
+
+interface Props {
+    onClose: () => void;
+    relationshipType: TermRelationshipType;
+}
+
+function AddRelatedTermsModal(props: Props) {
+    const { onClose, relationshipType } = props;
+
+    const [inputValue, setInputValue] = useState('');
+    const [selectedUrns, setSelectedUrns] = useState<any[]>([]);
+    const [selectedTerms, setSelectedTerms] = useState<any[]>([]);
+    const [isFocusedOnInput, setIsFocusedOnInput] = useState(false);
+    const entityRegistry = useEntityRegistry();
+    const { urn: entityDataUrn } = useEntityData();
+    const refetch = useRefetch();
+
+    const [AddRelatedTerms] = useAddRelatedTermsMutation();
+
+    function addTerms() {
+        AddRelatedTerms({
+            variables: {
+                input: {
+                    urn: entityDataUrn,
+                    termUrns: selectedUrns,
+                    relationshipType,
+                },
+            },
+        })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to move: \n ${e.message || ''}`, duration: 3 });
+            })
+            .finally(() => {
+                message.loading({ content: 'Adding...', duration: 2 });
+                setTimeout(() => {
+                    message.success({
+                        content: 'Added Related Terms!',
+                        duration: 2,
+                    });
+                    refetch();
+                }, 2000);
+            });
+        onClose();
+    }
+
+    const [termSearch, { data: termSearchData }] = useGetSearchResultsLazyQuery();
+    const termSearchResults = termSearchData?.search?.searchResults || [];
+
+    const tagSearchOptions = termSearchResults
+        .filter((result) => result?.entity?.urn !== entityDataUrn)
+        .map((result: SearchResult) => {
+            const displayName = entityRegistry.getDisplayName(result.entity.type, result.entity);
+
+            return (
+                <Select.Option value={result.entity.urn} key={result.entity.urn} name={displayName}>
+                    <SearchResultContainer>
+                        <ParentEntities parentEntities={getParentEntities(result.entity) || []} />
+                        <TermLabel name={displayName} />
+                    </SearchResultContainer>
+                </Select.Option>
+            );
+        });
+
+    const handleSearch = (text: string) => {
+        if (text.length > 0) {
+            termSearch({
+                variables: {
+                    input: {
+                        type: EntityType.GlossaryTerm,
+                        query: text,
+                        start: 0,
+                        count: 20,
+                    },
+                },
+            });
+        }
+    };
+
+    // When a Tag or term search result is selected, add the urn to the Urns
+    const onSelectValue = (urn: string) => {
+        const newUrns = [...selectedUrns, urn];
+        setSelectedUrns(newUrns);
+        const selectedSearchOption = tagSearchOptions.find((option) => option.props.value === urn);
+        setSelectedTerms([...selectedTerms, { urn, component: <TermLabel name={selectedSearchOption?.props.name} /> }]);
+    };
+
+    // When a Tag or term search result is deselected, remove the urn from the Owners
+    const onDeselectValue = (urn: string) => {
+        const newUrns = selectedUrns.filter((u) => u !== urn);
+        setSelectedUrns(newUrns);
+        setInputValue('');
+        setIsFocusedOnInput(true);
+        setSelectedTerms(selectedTerms.filter((term) => term.urn !== urn));
+    };
+
+    function selectTermFromBrowser(urn: string, displayName: string) {
+        setIsFocusedOnInput(false);
+        const newUrns = [...selectedUrns, urn];
+        setSelectedUrns(newUrns);
+        setSelectedTerms([...selectedTerms, { urn, component: <TermLabel name={displayName} /> }]);
+    }
+
+    function clearInput() {
+        setInputValue('');
+        setTimeout(() => setIsFocusedOnInput(true), 0); // call after click outside
+    }
+
+    function handleBlur() {
+        setInputValue('');
+    }
+
+    const tagRender = (properties) => {
+        // eslint-disable-next-line react/prop-types
+        const { closable, onClose: close, value } = properties;
+        const onPreventMouseDown = (event) => {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+        const selectedItem = selectedTerms.find((term) => term.urn === value).component;
+
+        return (
+            <Tag
+                onMouseDown={onPreventMouseDown}
+                closable={closable}
+                onClose={close}
+                style={{
+                    marginRight: 3,
+                    display: 'flex',
+                    justifyContent: 'start',
+                    alignItems: 'center',
+                    whiteSpace: 'nowrap',
+                    opacity: 1,
+                    color: '#434343',
+                    lineHeight: '16px',
+                }}
+            >
+                {selectedItem}
+            </Tag>
+        );
+    };
+
+    const isShowingGlossaryBrowser = !inputValue && isFocusedOnInput;
+
+    return (
+        <Modal
+            title="Add Related Terms"
+            visible
+            onCancel={onClose}
+            footer={
+                <>
+                    <Button onClick={onClose} type="text">
+                        Cancel
+                    </Button>
+                    <Button type="primary" onClick={addTerms} disabled={!selectedUrns.length}>
+                        Add
+                    </Button>
+                </>
+            }
+        >
+            <ClickOutside onClickOutside={() => setIsFocusedOnInput(false)}>
+                <StyledSelect
+                    autoFocus
+                    mode="multiple"
+                    filterOption={false}
+                    placeholder="Search for Glossary Terms..."
+                    showSearch
+                    defaultActiveFirstOption={false}
+                    onSelect={(asset: any) => onSelectValue(asset)}
+                    onDeselect={(asset: any) => onDeselectValue(asset)}
+                    onSearch={(value: string) => {
+                        // eslint-disable-next-line react/prop-types
+                        handleSearch(value.trim());
+                        // eslint-disable-next-line react/prop-types
+                        setInputValue(value.trim());
+                    }}
+                    tagRender={tagRender}
+                    value={selectedUrns}
+                    onClear={clearInput}
+                    onFocus={() => setIsFocusedOnInput(true)}
+                    onBlur={handleBlur}
+                    dropdownStyle={isShowingGlossaryBrowser || !inputValue ? { display: 'none' } : {}}
+                >
+                    {tagSearchOptions}
+                </StyledSelect>
+                <BrowserWrapper isHidden={!isShowingGlossaryBrowser}>
+                    <GlossaryBrowser isSelecting selectTerm={selectTermFromBrowser} termUrnToHide={entityDataUrn} />
+                </BrowserWrapper>
+            </ClickOutside>
+        </Modal>
+    );
+}
+
+export default AddRelatedTermsModal;
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedEntity.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedEntity.tsx
new file mode 100644
index 00000000000000..bf41caefba3c22
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedEntity.tsx
@@ -0,0 +1,56 @@
+import * as React from 'react';
+import { UnionType } from '../../../search/utils/constants';
+import { EmbeddedListSearchSection } from '../../shared/components/styled/search/EmbeddedListSearchSection';
+
+import { useEntityData } from '../../../entity/shared/EntityContext';
+import { SearchCardContext } from '../../shared/SearchCardContext';
+
+export default function GlossaryRelatedEntity() {
+    const { entityData } = useEntityData();
+
+    const entityUrn = entityData?.urn;
+
+    const fixedOrFilters =
+        (entityUrn && [
+            {
+                field: 'glossaryTerms',
+                values: [entityUrn],
+            },
+            {
+                field: 'fieldGlossaryTerms',
+                values: [entityUrn],
+            },
+        ]) ||
+        [];
+
+    entityData?.isAChildren?.relationships.forEach((term) => {
+        const childUrn = term.entity?.urn;
+
+        if (childUrn) {
+            fixedOrFilters.push({
+                field: 'glossaryTerms',
+                values: [childUrn],
+            });
+
+            fixedOrFilters.push({
+                field: 'fieldGlossaryTerms',
+                values: [childUrn],
+            });
+        }
+    });
+
+    return (
+        <SearchCardContext.Provider value={{ showRemovalFromList: true }}>
+            <EmbeddedListSearchSection
+                fixedFilters={{
+                    unionType: UnionType.OR,
+                    filters: fixedOrFilters,
+                }}
+                emptySearchQuery="*"
+                placeholderText="Filter assets..."
+                skipCache
+                applyView
+            />
+        </SearchCardContext.Provider>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTerms.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTerms.tsx
new file mode 100644
index 00000000000000..3538375ba18e2a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTerms.tsx
@@ -0,0 +1,70 @@
+import { Menu } from 'antd';
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components/macro';
+import { useEntityData } from '../../../entity/shared/EntityContext';
+import GlossaryRelatedTermsResult, { RelatedTermTypes } from './GlossaryRelatedTermsResult';
+
+const DetailWrapper = styled.div`
+    display: inline-flex;
+    flex: 1;
+    width: 100%;
+`;
+
+const MenuWrapper = styled.div`
+    border-right: 2px solid #f5f5f5;
+    flex-basis: 30%;
+    flex-shrink: 1;
+`;
+
+const Content = styled.div`
+    flex-grow: 1;
+    flex-basis: 70%;
+    flex-shrink: 0;
+    max-width: 100%;
+    overflow: hidden;
+`;
+
+export default function GlossayRelatedTerms() {
+    const { entityData } = useEntityData();
+    const [selectedKey, setSelectedKey] = useState('');
+    const menuOptionsArray = Object.keys(RelatedTermTypes);
+
+    useEffect(() => {
+        if (menuOptionsArray && menuOptionsArray.length > 0 && selectedKey.length === 0) {
+            setSelectedKey(menuOptionsArray[0]);
+        }
+    }, [menuOptionsArray, selectedKey]);
+
+    const onMenuClick = ({ key }) => {
+        setSelectedKey(key);
+    };
+
+    return (
+        <DetailWrapper>
+            <MenuWrapper>
+                <Menu
+                    selectable={false}
+                    mode="inline"
+                    selectedKeys={[selectedKey]}
+                    onClick={(key) => {
+                        onMenuClick(key);
+                    }}
+                >
+                    {menuOptionsArray.map((option) => (
+                        <Menu.Item data-testid={option} key={option}>
+                            {RelatedTermTypes[option]}
+                        </Menu.Item>
+                    ))}
+                </Menu>
+            </MenuWrapper>
+            <Content>
+                {selectedKey && entityData && (
+                    <GlossaryRelatedTermsResult
+                        glossaryRelatedTermType={RelatedTermTypes[selectedKey]}
+                        glossaryRelatedTermResult={entityData[selectedKey]?.relationships || []}
+                    />
+                )}
+            </Content>
+        </DetailWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx
new file mode 100644
index 00000000000000..1312c3cdaff6e6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx
@@ -0,0 +1,114 @@
+import { Button, Typography } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components/macro';
+import { TermRelationshipType } from '../../../../types.generated';
+import { Message } from '../../../shared/Message';
+import { EmptyTab } from '../../shared/components/styled/EmptyTab';
+import AddRelatedTermsModal from './AddRelatedTermsModal';
+import RelatedTerm from './RelatedTerm';
+import { CustomIcon } from '../../../sharedV2/icons/customIcons/CustomIcon';
+import addTerm from '../../../sharedV2/icons/customIcons/add-term.svg';
+import { REDESIGN_COLORS } from '../../shared/constants';
+
+export enum RelatedTermTypes {
+    hasRelatedTerms = 'Contains',
+    isRelatedTerms = 'Inherits',
+    containedBy = 'Contained by',
+    isAChildren = 'Inherited by',
+}
+
+export type Props = {
+    glossaryRelatedTermType: string;
+    glossaryRelatedTermResult: Array<any>;
+};
+
+const ListWrapper = styled.div`
+    display: flex;
+    padding: 0 16px;
+    flex-direction: column;
+    width: 100%;
+`;
+
+const ListContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+`;
+
+const TitleContainer = styled.div`
+    align-items: center;
+    display: flex;
+    justify-content: space-between;
+    padding: 10px 20px;
+    margin-bottom: 10px;
+`;
+
+const messageStyle = { marginTop: '10%' };
+
+const ButtonStyle = styled(Button)`
+    border: 1px solid ${REDESIGN_COLORS.TITLE_PURPLE};
+    color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    border-radius: 8px;
+    display: flex;
+    gap: 0.2rem;
+
+    &:hover,
+    &:focus {
+        border: 1px solid ${REDESIGN_COLORS.TITLE_PURPLE};
+        color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    }
+`;
+
+export default function GlossaryRelatedTermsResult({ glossaryRelatedTermType, glossaryRelatedTermResult }: Props) {
+    const [isShowingAddModal, setIsShowingAddModal] = useState(false);
+    const glossaryRelatedTermUrns: Array<string> = [];
+    glossaryRelatedTermResult.forEach((item: any) => {
+        glossaryRelatedTermUrns.push(item?.entity?.urn);
+    });
+    const contentLoading = false;
+    const relationshipType =
+        glossaryRelatedTermType === RelatedTermTypes.hasRelatedTerms ||
+        glossaryRelatedTermType === RelatedTermTypes.containedBy
+            ? TermRelationshipType.HasA
+            : TermRelationshipType.IsA;
+    const canEditRelatedTerms =
+        glossaryRelatedTermType === RelatedTermTypes.isRelatedTerms ||
+        glossaryRelatedTermType === RelatedTermTypes.hasRelatedTerms;
+
+    return (
+        <>
+            {contentLoading ? (
+                <Message type="loading" content="Loading..." style={messageStyle} />
+            ) : (
+                <ListWrapper>
+                    <TitleContainer>
+                        <Typography.Title style={{ margin: '0' }} level={3}>
+                            {glossaryRelatedTermType}
+                        </Typography.Title>
+                        {canEditRelatedTerms && (
+                            <ButtonStyle type="text" onClick={() => setIsShowingAddModal(true)}>
+                                <CustomIcon iconSvg={addTerm} /> Add Terms
+                            </ButtonStyle>
+                        )}
+                    </TitleContainer>
+                    <ListContainer>
+                        {glossaryRelatedTermUrns.map((urn) => (
+                            <RelatedTerm
+                                key={urn}
+                                urn={urn}
+                                relationshipType={relationshipType}
+                                isEditable={canEditRelatedTerms}
+                            />
+                        ))}
+                    </ListContainer>
+                    {glossaryRelatedTermUrns.length === 0 && (
+                        <EmptyTab tab={glossaryRelatedTermType.toLocaleLowerCase()} />
+                    )}
+                </ListWrapper>
+            )}
+            {isShowingAddModal && (
+                <AddRelatedTermsModal onClose={() => setIsShowingAddModal(false)} relationshipType={relationshipType} />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossarySidebarAboutSection.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossarySidebarAboutSection.tsx
new file mode 100644
index 00000000000000..cae3b2c5c2ed40
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossarySidebarAboutSection.tsx
@@ -0,0 +1,53 @@
+import { Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import StripMarkdownText from '../../shared/components/styled/StripMarkdownText';
+import { SidebarHeader } from '../../shared/containers/profile/sidebar/SidebarHeader';
+import { useEntityData, useRouteToTab } from '../../../entity/shared/EntityContext';
+
+const DescriptionTypography = styled(Typography.Paragraph)`
+    max-width: 65ch;
+`;
+
+export default function GlossarySidebarAboutSection() {
+    const { entityData }: any = useEntityData();
+    const description = entityData?.glossaryTermInfo?.definition;
+    const source = entityData?.glossaryTermInfo?.sourceRef;
+    const sourceUrl = entityData?.glossaryTermInfo?.sourceUrl;
+    const routeToTab = useRouteToTab();
+
+    return (
+        <div>
+            <SidebarHeader title="About" />
+            {description && (
+                <DescriptionTypography>
+                    <StripMarkdownText
+                        limit={205}
+                        readMore={
+                            <Typography.Link onClick={() => routeToTab({ tabName: 'Documentation' })}>
+                                Read More
+                            </Typography.Link>
+                        }
+                    >
+                        {description}
+                    </StripMarkdownText>
+                </DescriptionTypography>
+            )}
+
+            <SidebarHeader title="Source" />
+            {source && (
+                <DescriptionTypography>
+                    {sourceUrl ? (
+                        <a href={sourceUrl} target="_blank" rel="noreferrer">
+                            {source}
+                        </a>
+                    ) : (
+                        {
+                            source,
+                        }
+                    )}
+                </DescriptionTypography>
+            )}
+        </div>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryTermHeader.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryTermHeader.tsx
new file mode 100644
index 00000000000000..fdf007d0c6d3a7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryTermHeader.tsx
@@ -0,0 +1,31 @@
+import { Divider, Space, Typography } from 'antd';
+import React from 'react';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { AvatarsGroup } from '../../../shared/avatar';
+
+type Props = {
+    definition: string;
+    sourceRef: string;
+    sourceUrl: string;
+    ownership?: any;
+};
+export default function GlossaryTermHeader({ definition, sourceRef, sourceUrl, ownership }: Props) {
+    const entityRegistry = useEntityRegistry();
+    return (
+        <>
+            <Space direction="vertical" size="middle" style={{ marginBottom: '15px' }}>
+                <Typography.Paragraph>{definition}</Typography.Paragraph>
+                <Space split={<Divider type="vertical" />}>
+                    <Typography.Text>Source</Typography.Text>
+                    <Typography.Text strong>{sourceRef}</Typography.Text>
+                    {sourceUrl && (
+                        <a href={decodeURIComponent(sourceUrl)} target="_blank" rel="noreferrer">
+                            view source
+                        </a>
+                    )}
+                </Space>
+                <AvatarsGroup owners={ownership?.owners} entityRegistry={entityRegistry} />
+            </Space>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/RelatedTerm.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/RelatedTerm.tsx
new file mode 100644
index 00000000000000..442fced4528e6d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/RelatedTerm.tsx
@@ -0,0 +1,83 @@
+import React from 'react';
+import { CloseOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+import styled from 'styled-components/macro';
+import { useGetGlossaryTermQuery } from '../../../../graphql/glossaryTerm.generated';
+import { EntityType, TermRelationshipType } from '../../../../types.generated';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { PreviewType } from '../../Entity';
+import useRemoveRelatedTerms from './useRemoveRelatedTerms';
+import { REDESIGN_COLORS } from '../../shared/constants';
+
+const TransparentButton = styled(Button)`
+    color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    font-size: 12px;
+    box-shadow: none;
+    border: none;
+    padding: 0px 10px;
+    position: absolute;
+    top: 19px;
+    right: 50px;
+    display: none;
+
+    &:hover {
+        transition: 0.15s;
+        opacity: 0.9;
+        color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    }
+`;
+
+const ListItem = styled.div`
+    position: relative;
+    border: 1px solid #ebebeb;
+    border-radius: 11px;
+
+    &:hover ${TransparentButton} {
+        display: inline-block;
+    }
+    &:hover {
+        border: 1px solid ${REDESIGN_COLORS.TITLE_PURPLE};
+    }
+`;
+
+const Profile = styled.div`
+    display: flex;
+    position: relative;
+    overflow: hidden;
+    padding: 16px;
+`;
+
+interface Props {
+    urn: string;
+    relationshipType: TermRelationshipType;
+    isEditable: boolean;
+}
+
+function RelatedTerm(props: Props) {
+    const { urn, relationshipType, isEditable } = props;
+
+    const entityRegistry = useEntityRegistry();
+    const { data, loading } = useGetGlossaryTermQuery({ variables: { urn } });
+    let displayName = '';
+    if (data) {
+        displayName = entityRegistry.getDisplayName(EntityType.GlossaryTerm, data.glossaryTerm);
+    }
+    const { onRemove } = useRemoveRelatedTerms(urn, relationshipType, displayName);
+
+    if (loading) return null;
+
+    return (
+        <ListItem>
+            <Profile>
+                {entityRegistry.renderPreview(EntityType.GlossaryTerm, PreviewType.PREVIEW, data?.glossaryTerm)}
+                {isEditable && (
+                    <TransparentButton size="small" onClick={onRemove}>
+                        <CloseOutlined size={5} /> Remove Relationship
+                    </TransparentButton>
+                )}
+            </Profile>
+        </ListItem>
+    );
+}
+
+export default RelatedTerm;
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/SchemaView.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/SchemaView.tsx
new file mode 100644
index 00000000000000..46484459ba4a33
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/SchemaView.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { Empty, Typography } from 'antd';
+import styled from 'styled-components';
+
+export type Props = {
+    rawSchema: string | null;
+};
+
+const Content = styled.div`
+    margin-left: 32px;
+    flex-grow: 1;
+`;
+
+export default function SchemaView({ rawSchema }: Props) {
+    return (
+        <>
+            {rawSchema && rawSchema.length > 0 ? (
+                <Typography.Text data-testid="schema-raw-view">
+                    <pre>
+                        <code>{rawSchema}</code>
+                    </pre>
+                </Typography.Text>
+            ) : (
+                <Content>
+                    <Empty description="No Schema" image={Empty.PRESENTED_IMAGE_SIMPLE} />
+                </Content>
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/__tests__/GlossaryRelatedTerms.test.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/__tests__/GlossaryRelatedTerms.test.tsx
new file mode 100644
index 00000000000000..1f791ddebe51a7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/__tests__/GlossaryRelatedTerms.test.tsx
@@ -0,0 +1,20 @@
+import { render } from '@testing-library/react';
+import React from 'react';
+import { MockedProvider } from '@apollo/client/testing';
+import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer';
+import GlossaryRelatedTerms from '../GlossaryRelatedTerms';
+import { mocks } from '../../../../../Mocks';
+
+describe('Glossary Related Terms', () => {
+    it('renders and print hasRelatedTerms detail by default', async () => {
+        const { getByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer>
+                    <GlossaryRelatedTerms />
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(getByText('Contains')).toBeInTheDocument();
+        expect(getByText('Inherits')).toBeInTheDocument();
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx
new file mode 100644
index 00000000000000..0dfc088143baf5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx
@@ -0,0 +1,31 @@
+import { MockedProvider } from '@apollo/client/testing';
+import { render } from '@testing-library/react';
+import React from 'react';
+import { mocks } from '../../../../../Mocks';
+import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer';
+import GlossaryTermHeader from '../GlossaryTermHeader';
+
+const glossaryTermHeaderData = {
+    definition: 'this is sample definition',
+    sourceUrl: 'sourceUrl',
+    sourceRef: 'Source ref',
+    fqdn: 'fqdn',
+};
+
+describe('Glossary Term Header', () => {
+    it('renders', () => {
+        const { getByText } = render(
+            <MockedProvider mocks={mocks}>
+                <TestPageContainer>
+                    <GlossaryTermHeader
+                        definition={glossaryTermHeaderData.definition}
+                        sourceUrl={glossaryTermHeaderData.sourceUrl}
+                        sourceRef={glossaryTermHeaderData.sourceRef}
+                        ownership={undefined}
+                    />
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(getByText(glossaryTermHeaderData.definition)).toBeInTheDocument();
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/useRemoveRelatedTerms.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/useRemoveRelatedTerms.tsx
new file mode 100644
index 00000000000000..bfe5f6fbe074db
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/useRemoveRelatedTerms.tsx
@@ -0,0 +1,60 @@
+import { message, Modal } from 'antd';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { useEntityData, useRefetch } from '../../../entity/shared/EntityContext';
+import { useRemoveRelatedTermsMutation } from '../../../../graphql/glossaryTerm.generated';
+import { TermRelationshipType } from '../../../../types.generated';
+
+function useRemoveRelatedTerms(termUrn: string, relationshipType: TermRelationshipType, displayName: string) {
+    const { urn, entityType } = useEntityData();
+    const entityRegistry = useEntityRegistry();
+    const refetch = useRefetch();
+
+    const [removeRelatedTerms] = useRemoveRelatedTermsMutation();
+
+    function handleRemoveRelatedTerms() {
+        removeRelatedTerms({
+            variables: {
+                input: {
+                    urn,
+                    termUrns: [termUrn],
+                    relationshipType,
+                },
+            },
+        })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to remove: \n ${e.message || ''}`, duration: 3 });
+            })
+            .finally(() => {
+                message.loading({
+                    content: 'Removing...',
+                    duration: 2,
+                });
+                setTimeout(() => {
+                    refetch();
+                    message.success({
+                        content: `Removed Glossary Term!`,
+                        duration: 2,
+                    });
+                }, 2000);
+            });
+    }
+
+    function onRemove() {
+        Modal.confirm({
+            title: `Remove ${displayName}`,
+            content: `Are you sure you want to remove this ${entityRegistry.getEntityName(entityType)}?`,
+            onOk() {
+                handleRemoveRelatedTerms();
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    }
+
+    return { onRemove };
+}
+
+export default useRemoveRelatedTerms;
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/utils.ts b/datahub-web-react/src/app/entityV2/glossaryTerm/utils.ts
new file mode 100644
index 00000000000000..f4973abe3957ce
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/glossaryTerm/utils.ts
@@ -0,0 +1,16 @@
+import { Entity, EntityType } from '../../../types.generated';
+import { EntityRegistry } from '../../../entityRegistryContext';
+
+export function sortGlossaryTerms(entityRegistry: EntityRegistry, nodeA?: Entity | null, nodeB?: Entity | null) {
+    const nodeAName = entityRegistry.getDisplayName(EntityType.GlossaryTerm, nodeA) || '';
+    const nodeBName = entityRegistry.getDisplayName(EntityType.GlossaryTerm, nodeB) || '';
+    return nodeAName.localeCompare(nodeBName);
+}
+
+export function getRelatedEntitiesUrl(entityRegistry: EntityRegistry, urn: string) {
+    return `${entityRegistry.getEntityUrl(EntityType.GlossaryTerm, urn)}/${encodeURIComponent('Related Entities')}`;
+}
+
+export function getRelatedAssetsUrl(entityRegistry: EntityRegistry, urn: string) {
+    return `${entityRegistry.getEntityUrl(EntityType.GlossaryTerm, urn)}/${encodeURIComponent('Related Assets')}`;
+}
diff --git a/datahub-web-react/src/app/entityV2/group/AddGroupMembersModal.tsx b/datahub-web-react/src/app/entityV2/group/AddGroupMembersModal.tsx
new file mode 100644
index 00000000000000..08d5065487e95f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/group/AddGroupMembersModal.tsx
@@ -0,0 +1,213 @@
+import React, { useRef, useState } from 'react';
+import { message, Modal, Button, Select, Tag, Empty } from 'antd';
+import { getModalDomContainer } from '@src/utils/focus';
+import { LoadingOutlined } from '@ant-design/icons';
+import styled from 'styled-components';
+import { useAddGroupMembersMutation } from '../../../graphql/group.generated';
+import { CorpUser, Entity, EntityType } from '../../../types.generated';
+import { useGetSearchResultsLazyQuery } from '../../../graphql/search.generated';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { useGetRecommendations } from '../../shared/recommendation';
+import { OwnerLabel } from '../../shared/OwnerLabel';
+import { ANTD_GRAY } from '../shared/constants';
+
+type Props = {
+    urn: string;
+    visible: boolean;
+    onCloseModal: () => void;
+    onSubmit: () => void;
+};
+
+const SelectInput = styled(Select)``;
+
+const StyleTag = styled(Tag)`
+    padding: 0px 7px 0px 0px;
+    margin-right: 3px;
+    display: flex;
+    justify-content: start;
+    align-items: center;
+`;
+
+const LoadingWrapper = styled.div`
+    padding: 8px;
+    display: flex;
+    justify-content: center;
+
+    svg {
+        height: 15px;
+        width: 15px;
+        color: ${ANTD_GRAY[8]};
+    }
+`;
+
+export const AddGroupMembersModal = ({ urn, visible, onCloseModal, onSubmit }: Props) => {
+    const entityRegistry = useEntityRegistry();
+    const [selectedMembers, setSelectedMembers] = useState<any[]>([]);
+    const [inputValue, setInputValue] = useState('');
+    const [addGroupMembersMutation] = useAddGroupMembersMutation();
+    const [userSearch, { data: userSearchData, loading: searchLoading }] = useGetSearchResultsLazyQuery();
+    const searchResults = userSearchData?.search?.searchResults?.map((searchResult) => searchResult.entity) || [];
+    const { recommendedData, loading: recommendationsLoading } = useGetRecommendations([EntityType.CorpUser]);
+    const loading = recommendationsLoading || searchLoading;
+    const inputEl = useRef(null);
+
+    const handleUserSearch = (text: string) => {
+        userSearch({
+            variables: {
+                input: {
+                    type: EntityType.CorpUser,
+                    query: text,
+                    start: 0,
+                    count: 5,
+                },
+            },
+        });
+    };
+
+    // Renders a search result in the select dropdown.
+    const renderSearchResult = (entity: Entity) => {
+        const avatarUrl = (entity as CorpUser).editableProperties?.pictureLink || undefined;
+        const displayName = entityRegistry.getDisplayName(entity.type, entity);
+        return (
+            <Select.Option value={entity.urn} key={entity.urn}>
+                <OwnerLabel name={displayName} avatarUrl={avatarUrl} type={entity.type} />
+            </Select.Option>
+        );
+    };
+
+    const groupResult = !inputValue || inputValue.length === 0 ? recommendedData : searchResults;
+
+    const groupSearchOptions = groupResult?.map((result) => {
+        return renderSearchResult(result);
+    });
+
+    const onModalClose = () => {
+        setInputValue('');
+        setSelectedMembers([]);
+        onCloseModal();
+    };
+
+    const onSelectMember = (newMemberUrn: string) => {
+        if (inputEl && inputEl.current) {
+            (inputEl.current as any).blur();
+        }
+        const newUsers = [...(selectedMembers || []), newMemberUrn];
+        setSelectedMembers(newUsers);
+    };
+
+    const onDeselectMember = (member: { key: string; label: React.ReactNode; value: string }) => {
+        setInputValue('');
+        const newUserActors = selectedMembers.filter((user) => user.value !== member.value);
+        setSelectedMembers(newUserActors);
+    };
+
+    const tagRender = (props) => {
+        // eslint-disable-next-line react/prop-types
+        const { label, closable, onClose } = props;
+        const onPreventMouseDown = (event) => {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+        return (
+            <StyleTag onMouseDown={onPreventMouseDown} closable={closable} onClose={onClose}>
+                {label}
+            </StyleTag>
+        );
+    };
+
+    const onAdd = async () => {
+        const selectedMemberUrns = selectedMembers.map((selectedMember) => selectedMember.value);
+        if (selectedMembers.length === 0) {
+            return;
+        }
+        try {
+            await addGroupMembersMutation({
+                variables: {
+                    groupUrn: urn,
+                    userUrns: selectedMemberUrns,
+                },
+            });
+            message.success({ content: 'Group members added!', duration: 3 });
+        } catch (e: unknown) {
+            message.destroy();
+            if (e instanceof Error) {
+                message.error({ content: `Failed to group members: \n ${e.message || ''}`, duration: 3 });
+            }
+        } finally {
+            onSubmit();
+            onModalClose();
+        }
+    };
+
+    function handleBlur() {
+        setInputValue('');
+    }
+
+    return (
+        <Modal
+            title="Add group members"
+            visible={visible}
+            onCancel={onModalClose}
+            footer={
+                <>
+                    <Button onClick={onModalClose} type="text">
+                        Cancel
+                    </Button>
+                    <Button
+                        type="primary"
+                        disabled={selectedMembers.length === 0}
+                        onClick={onAdd}
+                        data-testid="modal-add-member-button"
+                    >
+                        Add
+                    </Button>
+                </>
+            }
+            getContainer={getModalDomContainer}
+        >
+            <SelectInput
+                data-testid="search-for-users-input"
+                labelInValue
+                autoFocus
+                defaultOpen
+                mode="multiple"
+                ref={inputEl}
+                placeholder="Search for users..."
+                showSearch
+                filterOption={false}
+                defaultActiveFirstOption={false}
+                onSelect={(actorUrn: any) => onSelectMember(actorUrn)}
+                onDeselect={(actorUrn: any) => onDeselectMember(actorUrn)}
+                onSearch={(value: string) => {
+                    // eslint-disable-next-line react/prop-types
+                    handleUserSearch(value.trim());
+                    // eslint-disable-next-line react/prop-types
+                    setInputValue(value.trim());
+                }}
+                tagRender={tagRender}
+                onBlur={handleBlur}
+                value={selectedMembers}
+                style={{ width: '100%' }}
+                notFoundContent={
+                    !loading ? (
+                        <Empty
+                            description="No Users Found"
+                            image={Empty.PRESENTED_IMAGE_SIMPLE}
+                            style={{ color: ANTD_GRAY[7] }}
+                        />
+                    ) : null
+                }
+            >
+                {loading ? (
+                    <Select.Option value="loading" key="loading">
+                        <LoadingWrapper>
+                            <LoadingOutlined />
+                        </LoadingWrapper>
+                    </Select.Option>
+                ) : (
+                    groupSearchOptions
+                )}
+            </SelectInput>
+        </Modal>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/group/Group.tsx b/datahub-web-react/src/app/entityV2/group/Group.tsx
new file mode 100644
index 00000000000000..5d08fdb62ddd30
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/group/Group.tsx
@@ -0,0 +1,79 @@
+import { TeamOutlined } from '@ant-design/icons';
+import * as React from 'react';
+import { CorpGroup, EntityType, SearchResult } from '../../../types.generated';
+import { Entity, IconStyleType, PreviewType } from '../Entity';
+import { Preview } from './preview/Preview';
+import GroupProfile from './GroupProfile';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+
+/**
+ * Definition of the DataHub CorpGroup entity.
+ */
+export class GroupEntity implements Entity<CorpGroup> {
+    type: EntityType = EntityType.CorpGroup;
+
+    // TODO: update icons for UserGroup
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <TeamOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return <TeamOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        return (
+            <TeamOutlined
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => false;
+
+    isLineageEnabled = () => false;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getGraphName: () => string = () => 'corpGroup';
+
+    getPathName: () => string = () => 'group';
+
+    getEntityName = () => 'Group';
+
+    getCollectionName: () => string = () => 'Groups';
+
+    renderProfile = (urn: string) => <GroupProfile urn={urn} />;
+
+    renderPreview = (_: PreviewType, data: CorpGroup) => (
+        <Preview
+            urn={data.urn}
+            name={this.displayName(data)}
+            description={data.info?.description}
+            membersCount={(data as any)?.memberCount?.total || (data as any)?.relationships?.total || 0}
+        />
+    );
+
+    renderSearch = (result: SearchResult) => {
+        return this.renderPreview(PreviewType.SEARCH, result.entity as CorpGroup);
+    };
+
+    displayName = (data: CorpGroup) => {
+        return data.properties?.displayName || data.info?.displayName || data.name || data.urn;
+    };
+
+    getGenericEntityProperties = (group: CorpGroup) => {
+        return getDataForEntityType({ data: group, entityType: this.type, getOverrideProperties: (data) => data });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([]);
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/group/GroupAssets.tsx b/datahub-web-react/src/app/entityV2/group/GroupAssets.tsx
new file mode 100644
index 00000000000000..64c29cc6a6b643
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/group/GroupAssets.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import styled from 'styled-components';
+import { UnionType } from '../../search/utils/constants';
+import { EmbeddedListSearchSection } from '../shared/components/styled/search/EmbeddedListSearchSection';
+
+const GroupAssetsWrapper = styled.div`
+    height: 100%;
+`;
+
+type Props = {
+    urn: string;
+};
+
+export const GroupAssets = ({ urn }: Props) => {
+    return (
+        <GroupAssetsWrapper>
+            <EmbeddedListSearchSection
+                skipCache
+                fixedFilters={{
+                    unionType: UnionType.AND,
+                    filters: [{ field: 'owners', values: [urn] }],
+                }}
+                emptySearchQuery="*"
+                placeholderText="Filter entities..."
+            />
+        </GroupAssetsWrapper>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/group/GroupBasicInfoSection.tsx b/datahub-web-react/src/app/entityV2/group/GroupBasicInfoSection.tsx
new file mode 100644
index 00000000000000..ec9bdacea1b640
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/group/GroupBasicInfoSection.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import { SlackOutlined } from '@ant-design/icons';
+import styled from 'styled-components';
+import {
+    EmptyValue,
+    SocialDetails,
+    BasicDetailsContainer,
+    SocialInfo,
+    DraftsOutlinedIconStyle,
+} from '../shared/SidebarStyledComponents';
+
+const StyledBasicDetailsContainer = styled(BasicDetailsContainer)`
+    padding: 10px;
+`;
+
+type Props = {
+    email: string | undefined;
+    slack: string | undefined;
+};
+
+export const GroupBasicInfoSection = ({ email, slack }: Props) => {
+    return (
+        <StyledBasicDetailsContainer>
+            <SocialInfo>
+                <SocialDetails>
+                    <DraftsOutlinedIconStyle />
+                    {email || <EmptyValue />}
+                </SocialDetails>
+                <SocialDetails>
+                    <SlackOutlined />
+                    {slack || <EmptyValue />}
+                </SocialDetails>
+            </SocialInfo>
+        </StyledBasicDetailsContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/group/GroupEditModal.tsx b/datahub-web-react/src/app/entityV2/group/GroupEditModal.tsx
new file mode 100644
index 00000000000000..f89a103f57b921
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/group/GroupEditModal.tsx
@@ -0,0 +1,153 @@
+import React, { useEffect, useState } from 'react';
+import { message, Button, Input, Modal, Typography, Form } from 'antd';
+import { useUpdateCorpGroupPropertiesMutation } from '../../../graphql/group.generated';
+
+type PropsData = {
+    name: string | undefined;
+    email: string | undefined;
+    slack: string | undefined;
+    urn: string | undefined;
+};
+
+type Props = {
+    canEditGroupName?: boolean;
+    visible: boolean;
+    onClose: () => void;
+    onSave: () => void;
+    handleTitleUpdate: (name: string) => void;
+    editModalData: PropsData;
+    updateName?: (name: string) => void; // TODO: Add name to the update mutation for groups to avoid 2 calls.
+};
+/** Regex Validations */
+export const USER_NAME_REGEX = new RegExp('^[a-zA-Z ]*$');
+
+export default function GroupEditModal({
+    canEditGroupName,
+    visible,
+    onClose,
+    onSave,
+    editModalData,
+    handleTitleUpdate,
+    updateName,
+}: Props) {
+    const [updateCorpGroupPropertiesMutation] = useUpdateCorpGroupPropertiesMutation();
+    const [form] = Form.useForm();
+
+    console.log(updateName); // will used later now to fix lint added in console
+
+    const [saveButtonEnabled, setSaveButtonEnabled] = useState(true);
+    const [data, setData] = useState<PropsData>({
+        name: editModalData.name,
+        slack: editModalData.slack,
+        email: editModalData.email,
+        urn: editModalData.urn,
+    });
+
+    useEffect(() => {
+        setData({ ...editModalData });
+    }, [editModalData]);
+
+    // save changes function
+    const onSaveChanges = () => {
+        updateCorpGroupPropertiesMutation({
+            variables: {
+                urn: editModalData?.urn || '',
+                input: {
+                    email: data.email,
+                    slack: data.slack,
+                },
+            },
+        })
+            .then(() => {
+                message.success({
+                    content: `Changes saved.`,
+                    duration: 3,
+                });
+                onSave(); // call the refetch function once save
+                // clear the values from edit profile form
+                setData({
+                    name: '',
+                    email: '',
+                    slack: '',
+                    urn: '',
+                });
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to Save changes!: \n ${e.message || ''}`, duration: 3 });
+            });
+        handleTitleUpdate(data?.name || '');
+        onClose();
+    };
+
+    return (
+        <Modal
+            title="Edit Profile"
+            open={visible}
+            onCancel={onClose}
+            footer={
+                <>
+                    <Button onClick={onClose} type="text">
+                        Cancel
+                    </Button>
+                    <Button type="primary" id="editGroupButton" onClick={onSaveChanges} disabled={saveButtonEnabled}>
+                        Save Changes
+                    </Button>
+                </>
+            }
+        >
+            <Form
+                form={form}
+                initialValues={{ ...editModalData }}
+                autoComplete="off"
+                layout="vertical"
+                onFieldsChange={() =>
+                    setSaveButtonEnabled(form.getFieldsError().some((field) => field.errors.length > 0))
+                }
+                onKeyPress={(event) => {
+                    if (event.key === 'Enter') {
+                        event.preventDefault();
+                        onSaveChanges();
+                    }
+                }}
+            >
+                {canEditGroupName && (
+                    <Form.Item name="name" label={<Typography.Text strong>Name</Typography.Text>}>
+                        <Input value={data.name} onChange={(event) => setData({ ...data, name: event.target.value })} />
+                    </Form.Item>
+                )}
+                <Form.Item
+                    name="email"
+                    label={<Typography.Text strong>Email</Typography.Text>}
+                    rules={[
+                        {
+                            type: 'email',
+                            message: 'Please enter valid email',
+                        },
+                        { whitespace: true },
+                        { min: 2, max: 50 },
+                    ]}
+                    hasFeedback
+                >
+                    <Input
+                        placeholder="engineering@example.com"
+                        value={data.email}
+                        onChange={(event) => setData({ ...data, email: event.target.value })}
+                    />
+                </Form.Item>
+                <Form.Item
+                    name="slack"
+                    label={<Typography.Text strong>Slack Channel</Typography.Text>}
+                    rules={[{ whitespace: true }, { min: 2, max: 50 }]}
+                    hasFeedback
+                >
+                    <Input
+                        placeholder="#engineering"
+                        value={data.slack}
+                        onChange={(event) => setData({ ...data, slack: event.target.value })}
+                    />
+                </Form.Item>
+            </Form>
+        </Modal>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/group/GroupInfoHeaderSection.tsx b/datahub-web-react/src/app/entityV2/group/GroupInfoHeaderSection.tsx
new file mode 100644
index 00000000000000..0dd47fcca11325
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/group/GroupInfoHeaderSection.tsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import { LockOutlined } from '@ant-design/icons';
+import { Typography } from 'antd';
+import { Tooltip } from '@components';
+import styled from 'styled-components';
+import { REDESIGN_COLORS } from '../shared/constants';
+import { MemberCount } from './GroupSidebar';
+import { EntityRelationshipsResult } from '../../../types.generated';
+
+const GroupHeader = styled.div`
+    position: relative;
+    z-index: 2;
+`;
+
+const GroupName = styled(Typography.Title)`
+    word-wrap: break-word;
+    text-align: left;
+    &&& {
+        margin-bottom: 0;
+        word-break: break-all;
+        font-size: 12px;
+        color: ${REDESIGN_COLORS.WHITE};
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+    }
+
+    .ant-typography-edit {
+        font-size: 12px;
+    }
+`;
+
+type Props = {
+    groupMemberRelationships: EntityRelationshipsResult;
+    isExternalGroup: boolean;
+    externalGroupType: string | undefined;
+    groupName: string | undefined;
+};
+
+export const GroupInfoHeaderSection = ({
+    groupMemberRelationships,
+    externalGroupType,
+    isExternalGroup,
+    groupName,
+}: Props) => {
+    const groupMemberRelationshipsCount = groupMemberRelationships?.count || 0;
+    return (
+        <GroupHeader>
+            <Tooltip title={groupName}>
+                <GroupName level={3}>{groupName}</GroupName>
+            </Tooltip>
+            {groupMemberRelationshipsCount > 0 && <MemberCount>{groupMemberRelationships?.count} members</MemberCount>}
+            {isExternalGroup && (
+                <Tooltip
+                    title={`Membership for this group cannot be edited in DataHub as it originates from ${externalGroupType}.`}
+                >
+                    <LockOutlined />
+                </Tooltip>
+            )}
+        </GroupHeader>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/group/GroupMemberLink.tsx b/datahub-web-react/src/app/entityV2/group/GroupMemberLink.tsx
new file mode 100644
index 00000000000000..ed34070e0b0c17
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/group/GroupMemberLink.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import { Tag } from 'antd';
+import { Tooltip } from '@components';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import { CustomAvatar } from '../../shared/avatar';
+import { CorpUser, EntityType } from '../../../types.generated';
+import EntityRegistry from '../../entity/EntityRegistry';
+
+const MemberTag = styled(Tag)`
+    padding: 2px;
+    padding-right: 6px;
+    margin-bottom: 8px;
+    display: inline-flex;
+    width: auto;
+`;
+
+type Props = {
+    user: CorpUser;
+    entityRegistry: EntityRegistry;
+};
+
+export const GroupMemberLink = ({ user, entityRegistry }: Props) => {
+    const name = entityRegistry.getDisplayName(EntityType.CorpUser, user);
+    return (
+        <MemberTag key={user.urn}>
+            <Link to={`${entityRegistry.getEntityUrl(EntityType.CorpUser, user.urn)}`}>
+                <CustomAvatar
+                    name={name}
+                    photoUrl={user.editableProperties?.pictureLink || undefined}
+                    useDefaultAvatar={false}
+                />
+                {name.length > 15 ? <Tooltip title={name}>{`${name.substring(0, 15)}..`}</Tooltip> : name}
+            </Link>
+        </MemberTag>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/group/GroupMembers.tsx b/datahub-web-react/src/app/entityV2/group/GroupMembers.tsx
new file mode 100644
index 00000000000000..61ca97d0bd6e77
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/group/GroupMembers.tsx
@@ -0,0 +1,254 @@
+import React, { useState } from 'react';
+import { MoreOutlined, UserAddOutlined, UserDeleteOutlined } from '@ant-design/icons';
+import { Col, Dropdown, message, Modal, Pagination, Row, Empty, Button, Typography, MenuProps } from 'antd';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import { useGetAllGroupMembersQuery, useRemoveGroupMembersMutation } from '../../../graphql/group.generated';
+import { CorpUser, EntityType } from '../../../types.generated';
+import { CustomAvatar } from '../../shared/avatar';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { AddGroupMembersModal } from './AddGroupMembersModal';
+import { scrollToTop } from '../../shared/searchUtils';
+
+const ADD_MEMBER_STYLE = {
+    backGround: '#ffffff',
+    boxShadow: '0px 2px 6px rgba(0, 0, 0, 0.05)',
+};
+const AVATAR_STYLE = { margin: '5px 5px 5px 0' };
+
+/**
+ * Styled Components
+ */
+const AddMember = styled(Button)`
+    padding: 13px 13px 30px 30px;
+    cursor: pointer;
+
+    &&& .anticon.anticon-user-add {
+        margin-right: 6px;
+    }
+`;
+
+const AddMemberText = styled(Typography.Text)`
+    font-family: Mulish;
+    font-style: normal;
+    font-weight: 500;
+    font-size: 12px;
+    line-height: 20px;
+`;
+
+const MemberNameSection = styled.div`
+    font-size: 20px;
+    line-height: 28px;
+    color: #262626;
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    padding-left: 12px;
+`;
+
+const GroupMemberWrapper = styled.div`
+    height: calc(100vh - 217px);
+    overflow-y: auto;
+
+    & .groupMemberRow {
+        margin: 0 19px;
+    }
+`;
+
+const MemberColumn = styled(Col)`
+    padding: 19px 0 19px 0;
+    border-bottom: 1px solid #f0f0f0;
+`;
+
+const MemberEditIcon = styled.div`
+    font-size: 22px;
+    float: right;
+`;
+
+const Name = styled.span`
+    font-weight: bold;
+    font-size: 14px;
+    line-height: 22px;
+    color: #262626;
+    margin-left: 8px;
+`;
+
+const NoGroupMembers = styled(Empty)`
+    padding: 40px;
+`;
+
+const StyledMoreOutlined = styled(MoreOutlined)`
+    :hover {
+        cursor: pointer;
+    }
+`;
+
+type Props = {
+    urn: string;
+    pageSize: number;
+    isExternalGroup: boolean;
+    onChangeMembers?: () => void;
+};
+
+export default function GroupMembers({ urn, pageSize, isExternalGroup, onChangeMembers }: Props) {
+    const entityRegistry = useEntityRegistry();
+
+    const [page, setPage] = useState(1);
+    /* eslint-disable @typescript-eslint/no-unused-vars */
+    const [isEditingMembers, setIsEditingMembers] = useState(false);
+    const start = (page - 1) * pageSize;
+    const { data: membersData, refetch } = useGetAllGroupMembersQuery({
+        variables: { urn, start, count: pageSize },
+        fetchPolicy: 'cache-first',
+    });
+    const [removeGroupMembersMutation] = useRemoveGroupMembersMutation();
+
+    const onChangeMembersPage = (newPage: number) => {
+        scrollToTop();
+        setPage(newPage);
+    };
+
+    const removeGroupMember = (userUrn: string) => {
+        removeGroupMembersMutation({
+            variables: {
+                groupUrn: urn,
+                userUrns: [userUrn],
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.success({ content: 'Removed Group Member!', duration: 2 });
+                    // Hack to deal with eventual consistency
+                    setTimeout(() => {
+                        // Reload the page.
+                        refetch();
+                    }, 3000);
+                    onChangeMembers?.();
+                }
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to remove group member: \n ${e.message || ''}`, duration: 3 });
+            });
+    };
+
+    const onClickEditMembers = () => {
+        setIsEditingMembers(true);
+    };
+
+    const onAddMembers = () => {
+        setTimeout(() => {
+            refetch();
+        }, 3000);
+        onChangeMembers?.();
+    };
+
+    const onRemoveMember = (memberUrn: string) => {
+        Modal.confirm({
+            title: `Confirm Group Member Removal`,
+            content: `Are you sure you want to remove this user from the group?`,
+            onOk() {
+                removeGroupMember(memberUrn);
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
+    const relationships = membersData && membersData.corpGroup?.relationships;
+    const total = relationships?.total || 0;
+    const groupMembers = relationships?.relationships?.map((rel) => rel.entity as CorpUser) || [];
+
+    const getItems = (urnID: string): MenuProps['items'] => {
+        return [
+            {
+                key: 'make',
+                disabled: true,
+                label: (
+                    <span>
+                        <UserAddOutlined /> Make owner
+                    </span>
+                ),
+            },
+            {
+                key: 'remove',
+                disabled: isExternalGroup,
+                onClick: () => onRemoveMember(urnID),
+                label: (
+                    <span>
+                        <UserDeleteOutlined /> Remove from Group
+                    </span>
+                ),
+            },
+        ];
+    };
+
+    return (
+        <>
+            <Row style={ADD_MEMBER_STYLE}>
+                <AddMember
+                    type="text"
+                    disabled={isExternalGroup}
+                    onClick={onClickEditMembers}
+                    data-testid="add-group-member-button"
+                >
+                    <UserAddOutlined />
+                    <AddMemberText>Add Member</AddMemberText>
+                </AddMember>
+            </Row>
+            <GroupMemberWrapper>
+                {groupMembers.length === 0 && <NoGroupMembers description="No members in this group yet." />}
+                {groupMembers
+                    ? groupMembers.map((item) => {
+                          const entityUrn = entityRegistry.getEntityUrl(EntityType.CorpUser, item.urn);
+                          return (
+                              <Row className="groupMemberRow" align="middle" key={entityUrn}>
+                                  <MemberColumn xl={23} lg={23} md={23} sm={23} xs={23}>
+                                      <Link to={entityUrn}>
+                                          <MemberNameSection>
+                                              <CustomAvatar
+                                                  useDefaultAvatar={false}
+                                                  size={28}
+                                                  photoUrl={item.editableProperties?.pictureLink || ''}
+                                                  name={entityRegistry.getDisplayName(EntityType.CorpUser, item)}
+                                                  style={AVATAR_STYLE}
+                                              />
+                                              <Name>{entityRegistry.getDisplayName(EntityType.CorpUser, item)}</Name>
+                                          </MemberNameSection>
+                                      </Link>
+                                  </MemberColumn>
+                                  <MemberColumn xl={1} lg={1} md={1} sm={1} xs={1}>
+                                      <MemberEditIcon>
+                                          <Dropdown menu={{ items: getItems(item.urn) }}>
+                                              <StyledMoreOutlined />
+                                          </Dropdown>
+                                      </MemberEditIcon>
+                                  </MemberColumn>
+                              </Row>
+                          );
+                      })
+                    : null}
+            </GroupMemberWrapper>
+            <Row justify="center" style={{ marginTop: '15px' }}>
+                <Pagination
+                    current={page}
+                    pageSize={pageSize}
+                    total={total}
+                    showLessItems
+                    onChange={onChangeMembersPage}
+                    showSizeChanger={false}
+                />
+            </Row>
+            {isEditingMembers && (
+                <AddGroupMembersModal
+                    urn={urn}
+                    visible={isEditingMembers}
+                    onSubmit={onAddMembers}
+                    onCloseModal={() => setIsEditingMembers(false)}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/group/GroupMembersSidebarSectionContent.tsx b/datahub-web-react/src/app/entityV2/group/GroupMembersSidebarSectionContent.tsx
new file mode 100644
index 00000000000000..4ac155146de4f4
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/group/GroupMembersSidebarSectionContent.tsx
@@ -0,0 +1,41 @@
+import React, { useState } from 'react';
+import { Typography } from 'antd';
+import { CorpUser, EntityRelationship } from '../../../types.generated';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { TagsSection } from '../shared/SidebarStyledComponents';
+import { ShowMoreSection } from '../shared/sidebarSection/ShowMoreSection';
+import { GroupMemberLink } from './GroupMemberLink';
+
+type Props = {
+    relationships: Array<EntityRelationship>;
+};
+const DEFAULT_MAX_ENTITIES_TO_SHOW = 4;
+
+export default function GroupMembersSidebarSectionContent({ relationships }: Props) {
+    const [entityCount, setEntityCount] = useState(DEFAULT_MAX_ENTITIES_TO_SHOW);
+
+    const entityRegistry = useEntityRegistry();
+    const relationshipsCount = relationships?.length || 0;
+    return (
+        <>
+            <TagsSection>
+                {relationships.length === 0 && (
+                    <Typography.Paragraph type="secondary">No members yet.</Typography.Paragraph>
+                )}
+                {relationships.length > 0 &&
+                    relationships.map((item, index) => {
+                        const user = item.entity as CorpUser;
+                        return index < entityCount && <GroupMemberLink user={user} entityRegistry={entityRegistry} />;
+                    })}
+            </TagsSection>
+            {relationshipsCount > entityCount && (
+                <ShowMoreSection
+                    totalCount={relationshipsCount}
+                    entityCount={entityCount}
+                    setEntityCount={setEntityCount}
+                    showMaxEntity={DEFAULT_MAX_ENTITIES_TO_SHOW}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/group/GroupOwnerSidebarSectionContent.tsx b/datahub-web-react/src/app/entityV2/group/GroupOwnerSidebarSectionContent.tsx
new file mode 100644
index 00000000000000..148e19d815d327
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/group/GroupOwnerSidebarSectionContent.tsx
@@ -0,0 +1,63 @@
+import React, { useState } from 'react';
+import { Typography } from 'antd';
+import { EntityType, Ownership } from '../../../types.generated';
+import { ExpandedOwner } from '../shared/components/styled/ExpandedOwner/ExpandedOwner';
+import { EditOwnersModal } from '../shared/containers/profile/sidebar/Ownership/EditOwnersModal';
+import { ShowMoreSection } from '../shared/sidebarSection/ShowMoreSection';
+import { TagsSection } from '../shared/SidebarStyledComponents';
+
+type Props = {
+    ownership: Ownership;
+    refetch: () => Promise<any>;
+    urn: string;
+    showAddOwnerModal: boolean;
+    setShowAddOwnerModal: (showAddOwnerModal) => void;
+};
+
+const DEFAULT_MAX_ENTITIES_TO_SHOW = 4;
+
+export default function GroupOwnerSidebarSectionContent({
+    urn,
+    ownership,
+    refetch,
+    showAddOwnerModal,
+    setShowAddOwnerModal,
+}: Props) {
+    const [entityCount, setEntityCount] = useState(DEFAULT_MAX_ENTITIES_TO_SHOW);
+    const ownershipCount = ownership?.owners?.length || 0;
+    const ownersEmpty = !ownership?.owners?.length;
+
+    return (
+        <>
+            <TagsSection>
+                {ownersEmpty && (
+                    <Typography.Paragraph type="secondary">No group owners added yet.</Typography.Paragraph>
+                )}
+                {ownership &&
+                    ownership?.owners?.map(
+                        (owner, index) =>
+                            index < entityCount && <ExpandedOwner entityUrn={urn} owner={owner} refetch={refetch} />,
+                    )}
+            </TagsSection>
+            {ownershipCount > entityCount && (
+                <ShowMoreSection
+                    totalCount={ownershipCount}
+                    entityCount={entityCount}
+                    setEntityCount={setEntityCount}
+                    showMaxEntity={DEFAULT_MAX_ENTITIES_TO_SHOW}
+                />
+            )}
+            {showAddOwnerModal && (
+                <EditOwnersModal
+                    urns={[urn]}
+                    hideOwnerType
+                    entityType={EntityType.CorpGroup}
+                    refetch={refetch}
+                    onCloseModal={() => {
+                        setShowAddOwnerModal(false);
+                    }}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/group/GroupProfile.tsx b/datahub-web-react/src/app/entityV2/group/GroupProfile.tsx
new file mode 100644
index 00000000000000..8056d72535a6d3
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/group/GroupProfile.tsx
@@ -0,0 +1,224 @@
+import React, { useContext, useState } from 'react';
+import { Col } from 'antd';
+import { matchPath } from 'react-router';
+import { useLocation } from 'react-router-dom';
+import styled from 'styled-components/macro';
+import { ReadOutlined } from '@ant-design/icons';
+import colors from '@src/alchemy-components/theme/foundations/colors';
+import { PageRoutes } from '../../../conf/Global';
+import { useGetGroupQuery } from '../../../graphql/group.generated';
+import { OriginType, EntityRelationshipsResult, Ownership, EntityType } from '../../../types.generated';
+import { EntityContext } from '../../entity/shared/EntityContext';
+import { EntityHead } from '../../shared/EntityHead';
+import { GenericEntityProperties } from '../../entity/shared/types';
+import { Message } from '../../shared/Message';
+import GroupMembers from './GroupMembers';
+import { RoutedTabs } from '../../shared/RoutedTabs';
+import GroupSidebar from './GroupSidebar';
+import { GroupAssets } from './GroupAssets';
+import { ErrorSection } from '../../shared/error/ErrorSection';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import NonExistentEntityPage from '../shared/entity/NonExistentEntityPage';
+import CompactContext from '../../shared/CompactContext';
+import { StyledEntitySidebarContainer, StyledSidebar } from '../shared/containers/profile/sidebar/EntityProfileSidebar';
+import EntitySidebarSectionsTab from '../shared/containers/profile/sidebar/EntitySidebarSectionsTab';
+import EntitySidebarContext from '../../sharedV2/EntitySidebarContext';
+import SidebarCollapsibleHeader from '../shared/containers/profile/sidebar/SidebarCollapsibleHeader';
+import { EntitySidebarTabs } from '../shared/containers/profile/sidebar/EntitySidebarTabs';
+import { REDESIGN_COLORS } from '../shared/constants';
+
+const messageStyle = { marginTop: '10%' };
+
+export enum TabType {
+    Assets = 'Owner Of',
+    Members = 'Members',
+}
+
+const ENABLED_TAB_TYPES = [TabType.Assets, TabType.Members];
+
+const MEMBER_PAGE_SIZE = 15;
+
+/**
+ * Styled Components
+ */
+const GroupProfileWrapper = styled.div`
+    &&& .ant-tabs-nav {
+        margin: 0;
+    }
+
+    background-color: ${REDESIGN_COLORS.WHITE};
+    border-radius: 8px;
+    overflow: hidden;
+    height: 100%;
+    display: flex;
+    &&& .ant-tabs > .ant-tabs-nav .ant-tabs-nav-wrap {
+        padding-left: 15px;
+    }
+`;
+
+const ContentContainer = styled.div<{ isVisible: boolean }>`
+    flex: 1;
+    ${(props) => props.isVisible && `border-right: 1px solid ${REDESIGN_COLORS.SIDE_BAR_BORDER_RIGHT};`}
+    overflow: inherit;
+`;
+
+const TabsContainer = styled.div``;
+
+const Tabs = styled.div``;
+
+type Props = {
+    urn: string;
+};
+
+const defaultTabDisplayConfig = {
+    visible: (_, _1) => true,
+    enabled: (_, _1) => true,
+};
+
+/**
+ * Responsible for reading & writing groups.
+ *
+ * TODO: Add use of apollo cache to improve fetching performance.
+ */
+export default function GroupProfile({ urn }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const location = useLocation();
+    const isCompact = React.useContext(CompactContext);
+    const isInSearch = matchPath(location.pathname, PageRoutes.SEARCH_RESULTS) !== null;
+    const { loading, error, data, refetch } = useGetGroupQuery({ variables: { urn, membersCount: MEMBER_PAGE_SIZE } });
+
+    const groupMemberRelationships = data?.corpGroup?.relationships as EntityRelationshipsResult;
+    const isExternalGroup: boolean = data?.corpGroup?.origin?.type === OriginType.External;
+    const externalGroupType: string = data?.corpGroup?.origin?.externalType || 'outside DataHub';
+    const groupName = data?.corpGroup ? entityRegistry.getDisplayName(EntityType.CorpGroup, data.corpGroup) : undefined;
+
+    const finalTabs = [
+        {
+            name: 'About',
+            icon: ReadOutlined,
+            component: EntitySidebarSectionsTab,
+            display: {
+                ...defaultTabDisplayConfig,
+            },
+        },
+    ];
+
+    const [selectedTabName, setSelectedTabName] = useState(finalTabs[0].name);
+    const selectedTab = finalTabs.find((tab) => tab.name === selectedTabName);
+    const { width, isClosed } = useContext(EntitySidebarContext);
+
+    const getTabs = () => {
+        return [
+            {
+                name: TabType.Assets,
+                path: TabType.Assets.toLocaleLowerCase(),
+                content: <GroupAssets urn={urn} />,
+                display: {
+                    enabled: () => true,
+                },
+            },
+            {
+                name: TabType.Members,
+                path: TabType.Members.toLocaleLowerCase(),
+                content: (
+                    <GroupMembers
+                        urn={urn}
+                        pageSize={MEMBER_PAGE_SIZE}
+                        isExternalGroup={isExternalGroup}
+                        onChangeMembers={() => {
+                            setTimeout(() => refetch(), 3000);
+                        }}
+                    />
+                ),
+                display: {
+                    enabled: () => true,
+                },
+            },
+        ].filter((tab) => ENABLED_TAB_TYPES.includes(tab.name));
+    };
+
+    const defaultTabPath = getTabs() && getTabs()?.length > 0 ? getTabs()[0].path : '';
+    const onTabChange = () => null;
+
+    // Side bar data
+    const sidebarData = {
+        photoUrl: undefined,
+        avatarName:
+            data?.corpGroup?.properties?.displayName ||
+            data?.corpGroup?.name ||
+            data?.corpGroup?.info?.displayName ||
+            undefined,
+        name: groupName,
+        email: data?.corpGroup?.editableProperties?.email || data?.corpGroup?.properties?.email || undefined,
+        slack: data?.corpGroup?.editableProperties?.slack || data?.corpGroup?.properties?.slack || undefined,
+        aboutText:
+            data?.corpGroup?.editableProperties?.description || data?.corpGroup?.properties?.description || undefined,
+        groupMemberRelationships: groupMemberRelationships as EntityRelationshipsResult,
+        groupOwnership: data?.corpGroup?.ownership as Ownership,
+        isExternalGroup,
+        externalGroupType,
+        urn,
+    };
+
+    if (data?.corpGroup?.exists === false) {
+        return <NonExistentEntityPage />;
+    }
+
+    if (isCompact) {
+        return (
+            <StyledEntitySidebarContainer isCollapsed={isClosed} $width={width} isFocused={isInSearch}>
+                <StyledSidebar isCard={isInSearch} isFocused={isInSearch}>
+                    <ContentContainer isVisible={!isClosed}>
+                        <SidebarCollapsibleHeader currentTab={selectedTab} />
+                        {!isClosed && <GroupSidebar sidebarData={sidebarData} refetch={refetch} />}
+                    </ContentContainer>
+                    <TabsContainer>
+                        <Tabs>
+                            <EntitySidebarTabs
+                                tabs={finalTabs}
+                                selectedTab={selectedTab}
+                                onSelectTab={(name) => setSelectedTabName(name)}
+                            />
+                        </Tabs>
+                    </TabsContainer>
+                </StyledSidebar>
+            </StyledEntitySidebarContainer>
+        );
+    }
+
+    return (
+        <EntityContext.Provider
+            value={{
+                urn,
+                loading,
+                refetch,
+                entityType: EntityType.CorpGroup,
+                entityData: (data?.corpGroup ?? null) as GenericEntityProperties | null,
+                routeToTab: () => {},
+                dataNotCombinedWithSiblings: null,
+                baseEntity: null,
+            }}
+        >
+            <EntityHead />
+            {error && <ErrorSection />}
+            {loading && <Message type="loading" content="Loading..." style={messageStyle} />}
+            {data && data?.corpGroup && (
+                <GroupProfileWrapper>
+                    <Col xl={7} lg={7} md={7} sm={24} xs={24} style={{ height: '100%', overflow: 'auto' }}>
+                        <GroupSidebar sidebarData={sidebarData} refetch={refetch} />
+                    </Col>
+                    <Col
+                        xl={17}
+                        lg={17}
+                        md={17}
+                        sm={24}
+                        xs={24}
+                        style={{ borderLeft: `1px solid ${colors.gray[100]}`, height: '100%' }}
+                    >
+                        <RoutedTabs defaultPath={defaultTabPath} tabs={getTabs()} onTabChange={onTabChange} />
+                    </Col>
+                </GroupProfileWrapper>
+            )}
+        </EntityContext.Provider>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/group/GroupProfileInfoCard.tsx b/datahub-web-react/src/app/entityV2/group/GroupProfileInfoCard.tsx
new file mode 100644
index 00000000000000..8255373db2ae77
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/group/GroupProfileInfoCard.tsx
@@ -0,0 +1,144 @@
+import React, { useState } from 'react';
+import { Col, message } from 'antd';
+import styled from 'styled-components';
+import SectionActionButton from '../shared/containers/profile/sidebar/SectionActionButton';
+import { REDESIGN_COLORS } from '../shared/constants';
+import CustomAvatar from '../../shared/avatar/CustomAvatar';
+import {
+    CustomAvatarContainer,
+    EditProfileButtonContainer,
+    WhiteEditOutlinedIconStyle,
+    GroupInfo,
+} from '../shared/SidebarStyledComponents';
+import { EntityRelationshipsResult, Ownership } from '../../../types.generated';
+import GroupEditModal from './GroupEditModal';
+import { useUpdateNameMutation } from '../../../graphql/mutations.generated';
+import { GroupBasicInfoSection } from './GroupBasicInfoSection';
+import { GroupInfoHeaderSection } from './GroupInfoHeaderSection';
+import { useUserContext } from '../../context/useUserContext';
+
+export type SidebarData = {
+    photoUrl: string | undefined;
+    avatarName: string | undefined;
+    name: string | undefined;
+    email: string | undefined;
+    slack: string | undefined;
+    aboutText: string | undefined;
+    groupMemberRelationships: EntityRelationshipsResult;
+    groupOwnership: Ownership;
+    isExternalGroup: boolean;
+    externalGroupType: string | undefined;
+    urn: string;
+};
+
+const AVATAR_STYLE = {
+    borderRadius: '9px',
+    zIndex: '2',
+    height: '36px',
+    width: '36px',
+    backgroundColor: REDESIGN_COLORS.AVATAR_STYLE_WHITE_BACKGROUND,
+};
+
+const AvatarWithTitleContainer = styled.div`
+    display: flex;
+    padding: 10px;
+    background: ${REDESIGN_COLORS.GROUP_AVATAR_STYLE_GRADIENT}};
+    gap: 0.5rem;
+`;
+
+type Props = {
+    sidebarData: SidebarData;
+    refetch: () => Promise<any>;
+};
+
+export const GroupProfileInfoCard = ({ sidebarData, refetch }: Props) => {
+    const {
+        avatarName,
+        name,
+        groupMemberRelationships,
+        email,
+        photoUrl,
+        slack,
+        isExternalGroup,
+        externalGroupType,
+        urn,
+    } = sidebarData;
+
+    const [updateName] = useUpdateNameMutation();
+    const [editGroupModal, showEditGroupModal] = useState(false);
+
+    const me = useUserContext();
+    const canEditGroupName = me?.platformPrivileges?.manageIdentities;
+
+    // Update Group Title
+    // eslint-disable-next-line @typescript-eslint/no-shadow
+    const handleTitleUpdate = async (name: string) => {
+        await updateName({ variables: { input: { name, urn } } })
+            .then(() => {
+                message.success({ content: 'Name Updated', duration: 2 });
+                refetch();
+            })
+            .catch((e: unknown) => {
+                message.destroy();
+                if (e instanceof Error) {
+                    message.error({ content: `Failed to update name: \n ${e.message || ''}`, duration: 3 });
+                }
+            });
+    };
+
+    const getEditModalData = {
+        name,
+        urn,
+        email,
+        slack,
+    };
+
+    return (
+        <>
+            <CustomAvatarContainer>
+                <GroupInfo>
+                    <AvatarWithTitleContainer>
+                        <Col xxl={2} xl={3} lg={4} md={4} sm={3} xs={3}>
+                            <CustomAvatar
+                                useDefaultAvatar={false}
+                                size={36}
+                                photoUrl={photoUrl}
+                                name={avatarName}
+                                style={AVATAR_STYLE}
+                            />
+                        </Col>
+                        <Col xxl={20} xl={18} lg={16} md={16} sm={19} xs={19}>
+                            <GroupInfoHeaderSection
+                                groupName={name}
+                                groupMemberRelationships={groupMemberRelationships}
+                                isExternalGroup={isExternalGroup}
+                                externalGroupType={externalGroupType}
+                            />
+                        </Col>
+                        <EditProfileButtonContainer className="edit-button-container">
+                            <SectionActionButton
+                                button={<WhiteEditOutlinedIconStyle />}
+                                onClick={(event) => {
+                                    showEditGroupModal(true);
+                                    event.stopPropagation();
+                                }}
+                            />
+                        </EditProfileButtonContainer>
+                    </AvatarWithTitleContainer>
+                    <GroupBasicInfoSection email={email} slack={slack} />
+                </GroupInfo>
+            </CustomAvatarContainer>
+            {/* Modal */}
+            <GroupEditModal
+                canEditGroupName={canEditGroupName}
+                visible={editGroupModal}
+                handleTitleUpdate={handleTitleUpdate}
+                onClose={() => showEditGroupModal(false)}
+                onSave={() => {
+                    refetch();
+                }}
+                editModalData={getEditModalData}
+            />
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/group/GroupSidebar.tsx b/datahub-web-react/src/app/entityV2/group/GroupSidebar.tsx
new file mode 100644
index 00000000000000..f1771b3544e940
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/group/GroupSidebar.tsx
@@ -0,0 +1,64 @@
+import { message } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { useUpdateCorpGroupPropertiesMutation } from '../../../graphql/group.generated';
+import { SideBar, Content } from '../shared/SidebarStyledComponents';
+import { AboutSidebarSection } from '../shared/sidebarSection/AboutSidebarSection';
+import { REDESIGN_COLORS } from '../shared/constants';
+import { GroupProfileInfoCard, SidebarData } from './GroupProfileInfoCard';
+import { GroupSidebarOwnersSection } from './GroupSidebarOwnersSection';
+import { GroupSidebarMembersSection } from './GroupSidebarMembersSection';
+
+type Props = {
+    sidebarData: SidebarData;
+    refetch: () => Promise<any>;
+};
+
+export const MemberCount = styled.div`
+    font-size: 10px;
+    color: ${REDESIGN_COLORS.WHITE};
+    font-weight: 400;
+    text-align: left;
+`;
+
+/**
+ * Responsible for reading & writing users.
+ */
+export default function GroupSidebar({ sidebarData, refetch }: Props) {
+    const { aboutText, groupMemberRelationships, urn, groupOwnership: ownership } = sidebarData;
+    const [updateCorpGroupPropertiesMutation] = useUpdateCorpGroupPropertiesMutation();
+
+    // About Text save
+    const onSaveAboutMe = (inputString) => {
+        updateCorpGroupPropertiesMutation({
+            variables: {
+                urn: urn || '',
+                input: {
+                    description: inputString,
+                },
+            },
+        })
+            .then(() => {
+                message.success({
+                    content: `Changes saved.`,
+                    duration: 3,
+                });
+                refetch();
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to Save changes!: \n ${e.message || ''}`, duration: 3 });
+            });
+    };
+
+    return (
+        <SideBar>
+            <GroupProfileInfoCard sidebarData={sidebarData} refetch={refetch} />
+            <Content>
+                <AboutSidebarSection aboutText={aboutText || ''} isProfileOwner onSaveAboutMe={onSaveAboutMe} />
+                <GroupSidebarOwnersSection ownership={ownership} refetch={refetch} urn={urn} />
+                <GroupSidebarMembersSection groupMemberRelationships={groupMemberRelationships} />
+            </Content>
+        </SideBar>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/group/GroupSidebarMembersSection.tsx b/datahub-web-react/src/app/entityV2/group/GroupSidebarMembersSection.tsx
new file mode 100644
index 00000000000000..1359c82cea64b5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/group/GroupSidebarMembersSection.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import GroupMembersSideBarSectionContent from './GroupMembersSidebarSectionContent';
+import { SidebarSection } from '../shared/containers/profile/sidebar/SidebarSection';
+import { EntityRelationshipsResult } from '../../../types.generated';
+
+type Props = {
+    groupMemberRelationships: EntityRelationshipsResult;
+};
+
+export const GroupSidebarMembersSection = ({ groupMemberRelationships }: Props) => {
+    return (
+        <SidebarSection
+            title="Members"
+            count={groupMemberRelationships?.total || undefined}
+            content={
+                <GroupMembersSideBarSectionContent relationships={groupMemberRelationships?.relationships || []} />
+            }
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/group/GroupSidebarOwnersSection.tsx b/datahub-web-react/src/app/entityV2/group/GroupSidebarOwnersSection.tsx
new file mode 100644
index 00000000000000..6e659be91f2097
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/group/GroupSidebarOwnersSection.tsx
@@ -0,0 +1,41 @@
+import React, { useState } from 'react';
+import { PlusOutlined } from '@ant-design/icons';
+import GroupOwnerSidebarSectionContent from './GroupOwnerSidebarSectionContent';
+import SectionActionButton from '../shared/containers/profile/sidebar/SectionActionButton';
+import { SidebarSection } from '../shared/containers/profile/sidebar/SidebarSection';
+import { Ownership } from '../../../types.generated';
+
+type Props = {
+    ownership: Ownership;
+    refetch: () => Promise<any>;
+    urn: string;
+};
+
+export const GroupSidebarOwnersSection = ({ ownership, refetch, urn }: Props) => {
+    const [showAddOwnerModal, setShowAddOwnerModal] = useState(false);
+
+    return (
+        <SidebarSection
+            title="Owners"
+            count={ownership?.owners?.length}
+            content={
+                <GroupOwnerSidebarSectionContent
+                    ownership={ownership}
+                    urn={urn || ''}
+                    refetch={refetch}
+                    showAddOwnerModal={showAddOwnerModal}
+                    setShowAddOwnerModal={setShowAddOwnerModal}
+                />
+            }
+            extra={
+                <SectionActionButton
+                    button={<PlusOutlined />}
+                    onClick={(event) => {
+                        setShowAddOwnerModal(true);
+                        event.stopPropagation();
+                    }}
+                />
+            }
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/group/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/group/preview/Preview.tsx
new file mode 100644
index 00000000000000..b875bd4a55efc2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/group/preview/Preview.tsx
@@ -0,0 +1,111 @@
+import React from 'react';
+import { Tag, Typography } from 'antd';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+
+import { EntityType } from '../../../../types.generated';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { ANTD_GRAY } from '../../shared/constants';
+import { IconStyleType } from '../../Entity';
+import NoMarkdownViewer from '../../shared/components/styled/StripMarkdownText';
+import SearchTextHighlighter from '../../../searchV2/matches/SearchTextHighlighter';
+
+const PreviewContainer = styled.div`
+    margin-bottom: 4px;
+    display: flex;
+    width: 100%;
+    justify-content: space-between;
+    align-items: center;
+`;
+
+const PlatformInfo = styled.div`
+    margin-bottom: 8px;
+    display: flex;
+    align-items: center;
+    height: 24px;
+`;
+
+const TitleContainer = styled.div`
+    margin-bottom: 8px;
+`;
+
+const PreviewImage = styled.div`
+    max-height: 18px;
+    width: auto;
+    object-fit: contain;
+    margin-right: 10px;
+    background-color: transparent;
+`;
+
+const EntityTitle = styled(Typography.Text)`
+    &&& {
+        margin-bottom: 0;
+        font-size: 16px;
+        font-weight: 600;
+        vertical-align: middle;
+    }
+`;
+
+const PlatformText = styled(Typography.Text)`
+    font-size: 12px;
+    line-height: 20px;
+    font-weight: 700;
+    color: ${ANTD_GRAY[7]};
+`;
+
+const DescriptionContainer = styled.div`
+    margin-top: 5px;
+`;
+
+const MemberCountContainer = styled.span`
+    margin-left: 12px;
+    margin-right: 12px;
+`;
+
+export const Preview = ({
+    urn,
+    name,
+    description,
+    membersCount,
+}: {
+    urn: string;
+    name: string;
+    description?: string | null;
+    membersCount?: number;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    const url = entityRegistry.getEntityUrl(EntityType.CorpGroup, urn);
+
+    return (
+        <PreviewContainer>
+            <div>
+                <Link to={url}>
+                    <TitleContainer>
+                        <PlatformInfo>
+                            <PreviewImage>
+                                {entityRegistry.getIcon(EntityType.CorpGroup, 20, IconStyleType.HIGHLIGHT)}
+                            </PreviewImage>
+                            <PlatformText>{entityRegistry.getEntityName(EntityType.CorpGroup)}</PlatformText>
+                        </PlatformInfo>
+                        <Link to={url}>
+                            <EntityTitle>{name ? <SearchTextHighlighter field="name" text={name} /> : urn}</EntityTitle>
+                            <MemberCountContainer>
+                                <Tag>{membersCount} members</Tag>
+                            </MemberCountContainer>
+                        </Link>
+                    </TitleContainer>
+                </Link>
+                {description && description.length > 0 && (
+                    <DescriptionContainer>
+                        <NoMarkdownViewer
+                            limit={200}
+                            customRender={(text) => <SearchTextHighlighter field="description" text={text} />}
+                        >
+                            {description}
+                        </NoMarkdownViewer>
+                    </DescriptionContainer>
+                )}
+            </div>
+        </PreviewContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/mlFeature/MLFeatureEntity.tsx b/datahub-web-react/src/app/entityV2/mlFeature/MLFeatureEntity.tsx
new file mode 100644
index 00000000000000..3ff8b2b4c01bce
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/mlFeature/MLFeatureEntity.tsx
@@ -0,0 +1,251 @@
+import { DotChartOutlined, PartitionOutlined, UnorderedListOutlined } from '@ant-design/icons';
+import * as React from 'react';
+import { useGetMlFeatureQuery } from '../../../graphql/mlFeature.generated';
+import { EntityType, MlFeature, SearchResult } from '../../../types.generated';
+import { GenericEntityProperties } from '../../entity/shared/types';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions';
+import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
+import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection';
+import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection';
+import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
+import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader';
+import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection';
+import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection';
+import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties';
+import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab';
+import { LineageTab } from '../shared/tabs/Lineage/LineageTab';
+import { FeatureTableTab } from '../shared/tabs/ML/MlFeatureFeatureTableTab';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+import { SidebarTitleActionType, getDataProduct, isOutputPort } from '../shared/utils';
+import { Preview } from './preview/Preview';
+import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection';
+
+const headerDropdownItems = new Set([
+    EntityMenuItems.UPDATE_DEPRECATION,
+    EntityMenuItems.RAISE_INCIDENT,
+    EntityMenuItems.ANNOUNCE,
+]);
+
+/**
+ * Definition of the DataHub MLFeature entity.
+ */
+export class MLFeatureEntity implements Entity<MlFeature> {
+    type: EntityType = EntityType.Mlfeature;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <DotChartOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return (
+                <DotChartOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color: color || '#9633b9' }} />
+            );
+        }
+
+        return (
+            <DotChartOutlined
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => false;
+
+    isLineageEnabled = () => true;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getGraphName = () => 'mlFeature';
+
+    getPathName = () => 'features';
+
+    getEntityName = () => 'Feature';
+
+    getCollectionName = () => 'Features';
+
+    getOverridePropertiesFromEntity = (feature?: MlFeature | null): GenericEntityProperties => {
+        return {
+            // eslint-disable-next-line
+            platform: feature?.['featureTables']?.relationships?.[0]?.entity?.platform,
+        };
+    };
+
+    useEntityQuery = useGetMlFeatureQuery;
+
+    renderProfile = (urn: string) => (
+        <EntityProfile
+            urn={urn}
+            key={urn}
+            entityType={EntityType.Mlfeature}
+            useEntityQuery={useGetMlFeatureQuery}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+            headerDropdownItems={headerDropdownItems}
+            tabs={[
+                {
+                    name: 'Feature Tables',
+                    component: FeatureTableTab,
+                },
+                {
+                    name: 'Documentation',
+                    component: DocumentationTab,
+                },
+                {
+                    name: 'Lineage',
+                    component: LineageTab,
+                },
+                {
+                    name: 'Properties',
+                    component: PropertiesTab,
+                },
+            ]}
+            sidebarSections={this.getSidebarSections()}
+            sidebarTabs={this.getSidebarTabs()}
+        />
+    );
+
+    getSidebarSections = () => [
+        {
+            component: SidebarEntityHeader,
+        },
+        {
+            component: SidebarAboutSection,
+        },
+        {
+            component: SidebarNotesSection,
+        },
+        {
+            component: SidebarOwnerSection,
+        },
+        {
+            component: SidebarDomainSection,
+        },
+        {
+            component: DataProductSection,
+        },
+        {
+            component: SidebarTagsSection,
+        },
+        {
+            component: SidebarGlossaryTermsSection,
+        },
+        {
+            component: StatusSection,
+        },
+        {
+            component: SidebarStructuredProperties,
+        },
+    ];
+
+    getSidebarTabs = () => [
+        {
+            name: 'Lineage',
+            component: LineageTab,
+            description: "View this data asset's upstream and downstream dependencies",
+            icon: PartitionOutlined,
+            properties: {
+                actionType: SidebarTitleActionType.LineageExplore,
+            },
+        },
+        {
+            name: 'Properties',
+            component: PropertiesTab,
+            description: 'View additional properties about this asset',
+            icon: UnorderedListOutlined,
+        },
+    ];
+
+    renderPreview = (previewType: PreviewType, data: MlFeature) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        // eslint-disable-next-line
+        const platform = data?.['featureTables']?.relationships?.[0]?.entity?.platform;
+        return (
+            <Preview
+                urn={data.urn}
+                data={genericProperties}
+                name={data.name || ''}
+                featureNamespace={data.featureNamespace || ''}
+                description={data.description}
+                owners={data.ownership?.owners}
+                platform={platform}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                headerDropdownItems={headerDropdownItems}
+                previewType={previewType}
+                browsePaths={data.browsePathV2 || undefined}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        const data = result.entity as MlFeature;
+        const genericProperties = this.getGenericEntityProperties(data);
+        // eslint-disable-next-line
+        const platform = data?.['featureTables']?.relationships?.[0]?.entity?.platform;
+        return (
+            <Preview
+                urn={data.urn}
+                data={genericProperties}
+                name={data.name || ''}
+                featureNamespace={data.featureNamespace || ''}
+                description={data.description || ''}
+                owners={data.ownership?.owners}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                platform={platform}
+                platformInstanceId={data.dataPlatformInstance?.instanceId}
+                degree={(result as any).degree}
+                paths={(result as any).paths}
+                isOutputPort={isOutputPort(result)}
+                headerDropdownItems={headerDropdownItems}
+                browsePaths={data.browsePathV2 || undefined}
+            />
+        );
+    };
+
+    displayName = (data: MlFeature) => {
+        return data.name || data.urn;
+    };
+
+    getGenericEntityProperties = (mlFeature: MlFeature) => {
+        return getDataForEntityType({
+            data: mlFeature,
+            entityType: this.type,
+            getOverrideProperties: this.getOverridePropertiesFromEntity,
+        });
+    };
+
+    getLineageVizConfig = (entity: MlFeature) => {
+        return {
+            urn: entity.urn,
+            name: entity.name,
+            type: EntityType.Mlfeature,
+            // eslint-disable-next-line
+            icon: entity?.['featureTables']?.relationships?.[0]?.entity?.platform?.properties?.logoUrl || undefined,
+            // eslint-disable-next-line
+            platform: entity?.['featureTables']?.relationships?.[0]?.entity?.platform,
+        };
+    };
+
+    supportedCapabilities = () => {
+        return new Set([
+            EntityCapabilityType.OWNERS,
+            EntityCapabilityType.GLOSSARY_TERMS,
+            EntityCapabilityType.TAGS,
+            EntityCapabilityType.DOMAINS,
+            EntityCapabilityType.DEPRECATION,
+            EntityCapabilityType.SOFT_DELETE,
+            EntityCapabilityType.DATA_PRODUCTS,
+            EntityCapabilityType.LINEAGE,
+        ]);
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/mlFeature/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/mlFeature/preview/Preview.tsx
new file mode 100644
index 00000000000000..f0753bebb46600
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/mlFeature/preview/Preview.tsx
@@ -0,0 +1,72 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import React from 'react';
+import { BrowsePathV2, DataPlatform, DataProduct, EntityPath, EntityType, Owner } from '../../../../types.generated';
+import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard';
+import { capitalizeFirstLetterOnly } from '../../../shared/textUtil';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { IconStyleType, PreviewType } from '../../Entity';
+import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions';
+
+export const Preview = ({
+    urn,
+    data,
+    name,
+    platformInstanceId,
+    featureNamespace,
+    description,
+    dataProduct,
+    owners,
+    platform,
+    degree,
+    paths,
+    isOutputPort,
+    headerDropdownItems,
+    previewType,
+    browsePaths,
+}: {
+    urn: string;
+    data: GenericEntityProperties | null;
+    name: string;
+    featureNamespace: string;
+    platformInstanceId?: string;
+    description?: string | null;
+    dataProduct?: DataProduct | null;
+    owners?: Array<Owner> | null;
+    platform?: DataPlatform | null | undefined;
+    degree?: number;
+    paths?: EntityPath[];
+    isOutputPort?: boolean;
+    headerDropdownItems?: Set<EntityMenuItems>;
+    previewType?: PreviewType;
+    browsePaths?: BrowsePathV2 | undefined;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    const platformName = platform?.properties?.displayName || capitalizeFirstLetterOnly(platform?.name);
+    const platformTitle =
+        platformName && featureNamespace
+            ? `${platformName} > ${featureNamespace}`
+            : platformName || featureNamespace || '';
+
+    return (
+        <DefaultPreviewCard
+            url={entityRegistry.getEntityUrl(EntityType.Mlfeature, urn)}
+            name={name}
+            urn={urn}
+            data={data}
+            platformInstanceId={platformInstanceId}
+            description={description || ''}
+            platform={platformTitle}
+            logoUrl={platform?.properties?.logoUrl || ''}
+            entityType={EntityType.Mlfeature}
+            typeIcon={entityRegistry.getIcon(EntityType.Mlfeature, 14, IconStyleType.ACCENT)}
+            owners={owners}
+            dataProduct={dataProduct}
+            degree={degree}
+            paths={paths}
+            isOutputPort={isOutputPort}
+            headerDropdownItems={headerDropdownItems}
+            previewType={previewType}
+            browsePaths={browsePaths}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/mlFeatureTable/MLFeatureTableEntity.tsx b/datahub-web-react/src/app/entityV2/mlFeatureTable/MLFeatureTableEntity.tsx
new file mode 100644
index 00000000000000..e304b221b5d492
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/mlFeatureTable/MLFeatureTableEntity.tsx
@@ -0,0 +1,229 @@
+import { DotChartOutlined, UnorderedListOutlined } from '@ant-design/icons';
+import * as React from 'react';
+import { useGetMlFeatureTableQuery } from '../../../graphql/mlFeatureTable.generated';
+import { EntityType, MlFeatureTable, SearchResult } from '../../../types.generated';
+import { GenericEntityProperties } from '../../entity/shared/types';
+import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
+import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection';
+import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection';
+import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
+import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection';
+import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader';
+import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection';
+import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions';
+import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties';
+import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+import { getDataProduct, isOutputPort } from '../shared/utils';
+import { Preview } from './preview/Preview';
+import MlFeatureTableFeatures from './profile/features/MlFeatureTableFeatures';
+import Sources from './profile/Sources';
+import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection';
+
+const headerDropdownItems = new Set([EntityMenuItems.UPDATE_DEPRECATION, EntityMenuItems.ANNOUNCE]);
+
+/**
+ * Definition of the DataHub MLFeatureTable entity.
+ */
+export class MLFeatureTableEntity implements Entity<MlFeatureTable> {
+    type: EntityType = EntityType.MlfeatureTable;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <DotChartOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return (
+                <DotChartOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color: color || '#9633b9' }} />
+            );
+        }
+
+        return (
+            <DotChartOutlined
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => true;
+
+    isLineageEnabled = () => true;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getGraphName = () => 'mlFeatureTable';
+
+    getPathName = () => 'featureTables';
+
+    getEntityName = () => 'Feature Table';
+
+    getCollectionName = () => 'Feature Tables';
+
+    getOverridePropertiesFromEntity = (_?: MlFeatureTable | null): GenericEntityProperties => {
+        return {};
+    };
+
+    useEntityQuery = useGetMlFeatureTableQuery;
+
+    renderProfile = (urn: string) => (
+        <EntityProfile
+            urn={urn}
+            key={urn}
+            entityType={EntityType.MlfeatureTable}
+            useEntityQuery={useGetMlFeatureTableQuery}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+            headerDropdownItems={headerDropdownItems}
+            tabs={[
+                {
+                    name: 'Features',
+                    component: MlFeatureTableFeatures,
+                },
+                {
+                    name: 'Sources',
+                    component: Sources,
+                },
+                {
+                    name: 'Documentation',
+                    component: DocumentationTab,
+                },
+                {
+                    name: 'Properties',
+                    component: PropertiesTab,
+                },
+            ]}
+            sidebarSections={this.getSidebarSections()}
+            sidebarTabs={this.getSidebarTabs()}
+        />
+    );
+
+    getSidebarSections = () => [
+        {
+            component: SidebarEntityHeader,
+        },
+        {
+            component: SidebarAboutSection,
+        },
+        {
+            component: SidebarNotesSection,
+        },
+        {
+            component: SidebarOwnerSection,
+        },
+        {
+            component: SidebarDomainSection,
+        },
+        {
+            component: DataProductSection,
+        },
+        {
+            component: SidebarTagsSection,
+        },
+        {
+            component: SidebarGlossaryTermsSection,
+        },
+        {
+            component: StatusSection,
+        },
+        {
+            component: SidebarStructuredProperties,
+        },
+    ];
+
+    getSidebarTabs = () => [
+        {
+            name: 'Properties',
+            component: PropertiesTab,
+            description: 'View additional properties about this asset',
+            icon: UnorderedListOutlined,
+        },
+    ];
+
+    renderPreview = (previewType: PreviewType, data: MlFeatureTable) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <Preview
+                urn={data.urn}
+                data={genericProperties}
+                name={data.name || ''}
+                description={data.description}
+                owners={data.ownership?.owners}
+                logoUrl={data.platform?.properties?.logoUrl}
+                platformName={data.platform?.properties?.displayName || capitalizeFirstLetterOnly(data.platform?.name)}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                headerDropdownItems={headerDropdownItems}
+                previewType={previewType}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        const data = result.entity as MlFeatureTable;
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <Preview
+                urn={data.urn}
+                data={genericProperties}
+                name={data.name || ''}
+                description={data.description || ''}
+                owners={data.ownership?.owners}
+                logoUrl={data.platform?.properties?.logoUrl}
+                platformName={data.platform?.properties?.displayName || capitalizeFirstLetterOnly(data.platform?.name)}
+                platformInstanceId={data.dataPlatformInstance?.instanceId}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                degree={(result as any).degree}
+                paths={(result as any).paths}
+                isOutputPort={isOutputPort(result)}
+                headerDropdownItems={headerDropdownItems}
+            />
+        );
+    };
+
+    getLineageVizConfig = (entity: MlFeatureTable) => {
+        return {
+            urn: entity.urn,
+            name: entity.name,
+            type: EntityType.MlfeatureTable,
+            icon: entity.platform.properties?.logoUrl || undefined,
+            platform: entity.platform,
+            deprecation: entity?.deprecation,
+        };
+    };
+
+    displayName = (data: MlFeatureTable) => {
+        return data.name || data.urn;
+    };
+
+    getGenericEntityProperties = (mlFeatureTable: MlFeatureTable) => {
+        return getDataForEntityType({
+            data: mlFeatureTable,
+            entityType: this.type,
+            getOverrideProperties: (data) => data,
+        });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([
+            EntityCapabilityType.OWNERS,
+            EntityCapabilityType.GLOSSARY_TERMS,
+            EntityCapabilityType.TAGS,
+            EntityCapabilityType.DOMAINS,
+            EntityCapabilityType.DEPRECATION,
+            EntityCapabilityType.SOFT_DELETE,
+            EntityCapabilityType.DATA_PRODUCTS,
+            EntityCapabilityType.LINEAGE,
+        ]);
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/mlFeatureTable/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/mlFeatureTable/preview/Preview.tsx
new file mode 100644
index 00000000000000..e72f781a89b45d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/mlFeatureTable/preview/Preview.tsx
@@ -0,0 +1,63 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import React from 'react';
+import { DataProduct, EntityPath, EntityType, Owner } from '../../../../types.generated';
+import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { IconStyleType, PreviewType } from '../../Entity';
+import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions';
+
+export const Preview = ({
+    urn,
+    data,
+    name,
+    description,
+    owners,
+    logoUrl,
+    platformName,
+    dataProduct,
+    platformInstanceId,
+    degree,
+    paths,
+    isOutputPort,
+    headerDropdownItems,
+    previewType,
+}: {
+    urn: string;
+    data: GenericEntityProperties | null;
+    name: string;
+    description?: string | null;
+    owners?: Array<Owner> | null;
+    logoUrl?: string | null;
+    platformName?: string | null;
+    dataProduct?: DataProduct | null;
+    platformInstanceId?: string;
+    degree?: number;
+    paths?: EntityPath[];
+    isOutputPort?: boolean;
+    headerDropdownItems?: Set<EntityMenuItems>;
+    previewType?: PreviewType;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    return (
+        <DefaultPreviewCard
+            url={entityRegistry.getEntityUrl(EntityType.MlfeatureTable, urn)}
+            name={name}
+            urn={urn}
+            data={data}
+            description={description || ''}
+            entityType={EntityType.MlfeatureTable}
+            typeIcon={entityRegistry.getIcon(EntityType.MlfeatureTable, 14, IconStyleType.ACCENT)}
+            owners={owners}
+            logoUrl={logoUrl || undefined}
+            platform={platformName || ''}
+            platformInstanceId={platformInstanceId}
+            dataProduct={dataProduct}
+            logoComponent={entityRegistry.getIcon(EntityType.MlfeatureTable, 20, IconStyleType.HIGHLIGHT)}
+            degree={degree}
+            paths={paths}
+            isOutputPort={isOutputPort}
+            headerDropdownItems={headerDropdownItems}
+            previewType={previewType}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/Sources.tsx b/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/Sources.tsx
new file mode 100644
index 00000000000000..71145b6b8f10ba
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/Sources.tsx
@@ -0,0 +1,81 @@
+import { List, Typography } from 'antd';
+import React, { useMemo } from 'react';
+import styled from 'styled-components';
+import { GetMlFeatureTableQuery } from '../../../../graphql/mlFeatureTable.generated';
+import { Dataset, EntityType } from '../../../../types.generated';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { PreviewType } from '../../Entity';
+import { useBaseEntity } from '../../../entity/shared/EntityContext';
+import { notEmpty } from '../../shared/utils';
+
+const ViewRawButtonContainer = styled.div`
+    display: flex;
+    justify-content: flex-end;
+`;
+
+export default function SourcesView() {
+    const entityRegistry = useEntityRegistry();
+    const baseEntity = useBaseEntity<GetMlFeatureTableQuery>();
+    const featureTable = baseEntity?.mlFeatureTable;
+
+    const features = useMemo(
+        () =>
+            featureTable?.properties &&
+            (featureTable?.properties?.mlFeatures || featureTable?.properties?.mlPrimaryKeys)
+                ? [
+                      ...(featureTable?.properties?.mlPrimaryKeys || []),
+                      ...(featureTable?.properties?.mlFeatures || []),
+                  ].filter(notEmpty)
+                : [],
+        [featureTable?.properties],
+    );
+
+    const sources = useMemo(
+        () =>
+            features?.reduce((accumulator: Array<Dataset>, feature) => {
+                if (feature.__typename === 'MLFeature' && feature.properties?.sources) {
+                    // eslint-disable-next-line array-callback-return
+                    feature.properties?.sources.map((source: Dataset | null) => {
+                        if (source && accumulator.findIndex((dataset) => dataset.urn === source?.urn) === -1) {
+                            accumulator.push(source);
+                        }
+                    });
+                } else if (feature.__typename === 'MLPrimaryKey' && feature.properties?.sources) {
+                    // eslint-disable-next-line array-callback-return
+                    feature.properties?.sources.map((source: Dataset | null) => {
+                        if (source && accumulator.findIndex((dataset) => dataset.urn === source?.urn) === -1) {
+                            accumulator.push(source);
+                        }
+                    });
+                }
+                return accumulator;
+            }, []),
+        [features],
+    );
+
+    return (
+        <>
+            <div>
+                <ViewRawButtonContainer>
+                    {
+                        // ToDo: uncomment below these after refactored Lineage to support dynamic entities
+                        /* <Button onClick={() => navigateToLineageUrl({ location, history, isLineageMode: true })}>
+                            View Graph
+                        </Button> */
+                    }
+                </ViewRawButtonContainer>
+            </div>
+            <List
+                style={{ marginTop: '24px', padding: '16px 32px' }}
+                bordered
+                dataSource={sources}
+                header={<Typography.Title level={3}>Sources</Typography.Title>}
+                renderItem={(item) => (
+                    <List.Item style={{ paddingTop: '20px' }}>
+                        {entityRegistry.renderPreview(item?.type || EntityType.Dataset, PreviewType.PREVIEW, item)}
+                    </List.Item>
+                )}
+            />
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/MlFeatureDataTypeIcon.tsx b/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/MlFeatureDataTypeIcon.tsx
new file mode 100644
index 00000000000000..0d3896949a948a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/MlFeatureDataTypeIcon.tsx
@@ -0,0 +1,95 @@
+import {
+    UnorderedListOutlined,
+    FieldStringOutlined,
+    ClockCircleOutlined,
+    QuestionOutlined,
+    StopOutlined,
+    OrderedListOutlined,
+    NumberOutlined,
+    AudioOutlined,
+    VideoCameraOutlined,
+    FileImageOutlined,
+    FieldBinaryOutlined,
+    LineChartOutlined,
+} from '@ant-design/icons';
+import { Typography } from 'antd';
+import { Tooltip } from '@components';
+import React, { FC } from 'react';
+import { VscFileBinary } from 'react-icons/vsc';
+import styled from 'styled-components';
+import { capitalizeFirstLetter } from '../../../../shared/textUtil';
+import { MlFeatureDataType } from '../../../../../types.generated';
+
+const TypeIconContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    text-align: center;
+    margin-top: 2.5px;
+    width: 70px;
+`;
+
+const TypeSubtitle = styled(Typography.Text)<{ hasicon?: string }>`
+    font-size: 8px;
+    text-align: center;
+    text-transform: uppercase;
+    ${(props) => (props.hasicon ? '' : 'margin-top: 4px;')}
+`;
+
+const IconSpan = styled.span`
+    font-size: 18px;
+`;
+
+const DATA_TYPE_ICON_MAP: Record<MlFeatureDataType, { icon: FC<{ style: any }> | null; size: number; text: string }> = {
+    [MlFeatureDataType.Byte]: {
+        icon: () => (
+            <IconSpan role="img" aria-label="calendar" className="anticon anticon-calendar">
+                <VscFileBinary />
+            </IconSpan>
+        ),
+        size: 18,
+        text: 'Byte',
+    },
+    [MlFeatureDataType.Time]: { icon: ClockCircleOutlined, size: 18, text: 'Time' },
+    [MlFeatureDataType.Set]: { icon: UnorderedListOutlined, size: 18, text: 'Set' },
+    [MlFeatureDataType.Unknown]: { icon: QuestionOutlined, size: 16, text: 'Unknown' },
+    [MlFeatureDataType.Map]: { icon: UnorderedListOutlined, size: 14, text: 'Map' },
+    [MlFeatureDataType.Useless]: { icon: StopOutlined, size: 18, text: 'Useless' },
+    [MlFeatureDataType.Nominal]: { icon: NumberOutlined, size: 14, text: 'Nominal' },
+    [MlFeatureDataType.Ordinal]: { icon: OrderedListOutlined, size: 18, text: 'Ordinal' },
+    [MlFeatureDataType.Binary]: { icon: FieldBinaryOutlined, size: 16, text: 'Binary' },
+    [MlFeatureDataType.Count]: { icon: NumberOutlined, size: 14, text: 'Count' },
+    [MlFeatureDataType.Interval]: { icon: ClockCircleOutlined, size: 16, text: 'Interval' },
+    [MlFeatureDataType.Image]: { icon: FileImageOutlined, size: 16, text: 'Image' },
+    [MlFeatureDataType.Video]: { icon: VideoCameraOutlined, size: 16, text: 'Video' },
+    [MlFeatureDataType.Audio]: { icon: AudioOutlined, size: 16, text: 'Audio' },
+    [MlFeatureDataType.Text]: { icon: FieldStringOutlined, size: 18, text: 'Text' },
+    [MlFeatureDataType.Sequence]: { icon: OrderedListOutlined, size: 16, text: 'Sequence' },
+    [MlFeatureDataType.Continuous]: { icon: LineChartOutlined, size: 16, text: 'Continuous' },
+};
+
+type Props = {
+    dataType?: MlFeatureDataType;
+};
+
+export default function MlFeatureDataTypeIcon({ dataType }: Props) {
+    const { icon: Icon, size, text } = DATA_TYPE_ICON_MAP[dataType || MlFeatureDataType.Unknown];
+
+    // eslint-disable-next-line react/prop-types
+    const NativeDataTypeTooltip = ({ children }) => (
+        <Tooltip placement="top" title={capitalizeFirstLetter(text)}>
+            {children}
+        </Tooltip>
+    );
+
+    return (
+        <NativeDataTypeTooltip>
+            <TypeIconContainer>
+                {Icon && <Icon style={{ fontSize: size }} />}
+                <TypeSubtitle type="secondary" hasicon={Icon ? 'yes' : undefined}>
+                    {text}
+                </TypeSubtitle>
+            </TypeIconContainer>
+        </NativeDataTypeTooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/MlFeatureTableFeatures.tsx b/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/MlFeatureTableFeatures.tsx
new file mode 100644
index 00000000000000..1eb92daa896f45
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/MlFeatureTableFeatures.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+
+import { MlPrimaryKey, MlFeature } from '../../../../../types.generated';
+import { GetMlFeatureTableQuery } from '../../../../../graphql/mlFeatureTable.generated';
+import { useBaseEntity } from '../../../../entity/shared/EntityContext';
+import { notEmpty } from '../../../shared/utils';
+import TableOfMlFeatures from './TableOfMlFeatures';
+
+export default function MlFeatureTableFeatures() {
+    const baseEntity = useBaseEntity<GetMlFeatureTableQuery>();
+    const featureTable = baseEntity?.mlFeatureTable;
+
+    const features = (
+        featureTable?.properties && (featureTable?.properties?.mlFeatures || featureTable?.properties?.mlPrimaryKeys)
+            ? [
+                  ...(featureTable?.properties?.mlPrimaryKeys || []),
+                  ...(featureTable?.properties?.mlFeatures || []),
+              ].filter(notEmpty)
+            : []
+    ) as Array<MlFeature | MlPrimaryKey>;
+
+    return <TableOfMlFeatures features={features} />;
+}
diff --git a/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/TableOfMlFeatures.tsx b/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/TableOfMlFeatures.tsx
new file mode 100644
index 00000000000000..24fcc622030843
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/mlFeatureTable/profile/features/TableOfMlFeatures.tsx
@@ -0,0 +1,160 @@
+import React, { useState } from 'react';
+import { Table, Typography } from 'antd';
+import { CheckSquareOutlined } from '@ant-design/icons';
+import { AlignType } from 'rc-table/lib/interface';
+import styled from 'styled-components';
+import { Link } from 'react-router-dom';
+
+import MlFeatureDataTypeIcon from './MlFeatureDataTypeIcon';
+import { MlFeatureDataType, MlPrimaryKey, MlFeature } from '../../../../../types.generated';
+import { useRefetch } from '../../../../entity/shared/EntityContext';
+import TagTermGroup from '../../../../sharedV2/tags/TagTermGroup';
+import SchemaDescriptionField from '../../../dataset/profile/schema/components/SchemaDescriptionField';
+import { useUpdateDescriptionMutation } from '../../../../../graphql/mutations.generated';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+
+const FeaturesContainer = styled.div`
+    margin-bottom: 100px;
+`;
+
+const defaultColumns = [
+    {
+        title: 'Type',
+        dataIndex: 'dataType',
+        key: 'dataType',
+        width: 100,
+        align: 'left' as AlignType,
+        render: (dataType: MlFeatureDataType) => {
+            return <MlFeatureDataTypeIcon dataType={dataType} />;
+        },
+    },
+];
+
+type Props = {
+    features: Array<MlFeature | MlPrimaryKey>;
+};
+
+export default function TableOfMlFeatures({ features }: Props) {
+    const refetch = useRefetch();
+    const [updateDescription] = useUpdateDescriptionMutation();
+    const entityRegistry = useEntityRegistry();
+
+    const [tagHoveredIndex, setTagHoveredIndex] = useState<string | undefined>(undefined);
+    const [expandedRows, setExpandedRows] = useState({});
+
+    const onTagTermCell = (record: any, rowIndex: number | undefined) => ({
+        onMouseEnter: () => {
+            setTagHoveredIndex(`${record.urn}-${rowIndex}`);
+        },
+        onMouseLeave: () => {
+            setTagHoveredIndex(undefined);
+        },
+    });
+
+    const nameColumn = {
+        title: 'Name',
+        dataIndex: 'name',
+        key: 'name',
+        width: 100,
+        render: (name: string, feature: MlFeature | MlPrimaryKey) => (
+            <Link to={entityRegistry.getEntityUrl(feature.type, feature.urn)}>
+                <Typography.Text strong>{name}</Typography.Text>
+            </Link>
+        ),
+    };
+
+    const descriptionColumn = {
+        title: 'Description',
+        dataIndex: 'description',
+        key: 'description',
+        render: (_, feature: MlFeature | MlPrimaryKey, index: number) => (
+            <SchemaDescriptionField
+                onExpanded={(expanded) => {
+                    setExpandedRows((prev) => ({ ...prev, [index]: expanded }));
+                }}
+                expanded={!!expandedRows[index]}
+                description={feature?.editableProperties?.description || feature?.properties?.description || ''}
+                original={feature?.properties?.description}
+                isEdited={!!feature?.editableProperties?.description}
+                onUpdate={(updatedDescription) =>
+                    updateDescription({
+                        variables: {
+                            input: {
+                                description: updatedDescription,
+                                resourceUrn: feature.urn,
+                            },
+                        },
+                    }).then(refetch)
+                }
+            />
+        ),
+        width: 300,
+    };
+
+    const tagColumn = {
+        width: 125,
+        title: 'Tags',
+        dataIndex: 'tags',
+        key: 'tags',
+        render: (_, feature: MlFeature | MlPrimaryKey, rowIndex: number) => (
+            <TagTermGroup
+                editableTags={feature.tags}
+                canRemove
+                buttonProps={{ size: 'small' }}
+                canAddTag={tagHoveredIndex === `${feature.urn}-${rowIndex}`}
+                onOpenModal={() => setTagHoveredIndex(undefined)}
+                entityUrn={feature.urn}
+                entityType={feature.type}
+                refetch={refetch}
+            />
+        ),
+        onCell: onTagTermCell,
+    };
+
+    const termColumn = {
+        width: 125,
+        title: 'Terms',
+        dataIndex: 'glossaryTerms',
+        key: 'glossaryTerms',
+        render: (_, feature: MlFeature | MlPrimaryKey, rowIndex: number) => (
+            <TagTermGroup
+                editableGlossaryTerms={feature.glossaryTerms}
+                canRemove
+                buttonProps={{ size: 'small' }}
+                canAddTerm={tagHoveredIndex === `${feature.urn}-${rowIndex}`}
+                onOpenModal={() => setTagHoveredIndex(undefined)}
+                entityUrn={feature.urn}
+                entityType={feature.type}
+                refetch={refetch}
+            />
+        ),
+        onCell: onTagTermCell,
+    };
+
+    const primaryKeyColumn = {
+        title: 'Primary Key',
+        dataIndex: 'primaryKey',
+        key: 'primaryKey',
+        render: (_: any, record: MlFeature | MlPrimaryKey) =>
+            record.__typename === 'MLPrimaryKey' ? <CheckSquareOutlined /> : null,
+        width: 50,
+    };
+
+    const allColumns = [...defaultColumns, nameColumn, descriptionColumn, tagColumn, termColumn, primaryKeyColumn];
+
+    return (
+        <FeaturesContainer>
+            {features && features.length > 0 && (
+                <Table
+                    columns={allColumns}
+                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    // @ts-ignore
+                    dataSource={features}
+                    rowKey={(record) => `${record.dataType}-${record.name}`}
+                    expandable={{ defaultExpandAllRows: true, expandRowByClick: true }}
+                    pagination={false}
+                />
+            )}
+        </FeaturesContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/mlModel/MLModelEntity.tsx b/datahub-web-react/src/app/entityV2/mlModel/MLModelEntity.tsx
new file mode 100644
index 00000000000000..e0839929b9f556
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/mlModel/MLModelEntity.tsx
@@ -0,0 +1,223 @@
+import { CodeSandboxOutlined, UnorderedListOutlined } from '@ant-design/icons';
+import * as React from 'react';
+import { useGetMlModelQuery } from '../../../graphql/mlModel.generated';
+import { EntityType, MlModel, SearchResult } from '../../../types.generated';
+import { GenericEntityProperties } from '../../entity/shared/types';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions';
+import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
+import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection';
+import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection';
+import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
+import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader';
+import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection';
+import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection';
+import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties';
+import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+import { isOutputPort } from '../shared/utils';
+import { Preview } from './preview/Preview';
+import MLModelGroupsTab from './profile/MLModelGroupsTab';
+import MLModelSummary from './profile/MLModelSummary';
+import MlModelFeaturesTab from './profile/MlModelFeaturesTab';
+import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection';
+
+const headerDropdownItems = new Set([
+    EntityMenuItems.SHARE,
+    EntityMenuItems.UPDATE_DEPRECATION,
+    EntityMenuItems.RAISE_INCIDENT,
+    EntityMenuItems.ANNOUNCE,
+]);
+
+/**
+ * Definition of the DataHub MlModel entity.
+ */
+export class MLModelEntity implements Entity<MlModel> {
+    type: EntityType = EntityType.Mlmodel;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <CodeSandboxOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return (
+                <CodeSandboxOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color: color || '#9633b9' }} />
+            );
+        }
+
+        return (
+            <CodeSandboxOutlined
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => true;
+
+    isLineageEnabled = () => true;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getGraphName = () => 'mlModel';
+
+    getPathName = () => 'mlModels';
+
+    getEntityName = () => 'ML Model';
+
+    getCollectionName = () => 'ML Models';
+
+    getOverridePropertiesFromEntity = (mlModel?: MlModel | null): GenericEntityProperties => {
+        return {
+            externalUrl: mlModel?.properties?.externalUrl,
+        };
+    };
+
+    useEntityQuery = useGetMlModelQuery;
+
+    renderProfile = (urn: string) => (
+        <EntityProfile
+            urn={urn}
+            key={urn}
+            entityType={EntityType.Mlmodel}
+            useEntityQuery={useGetMlModelQuery}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+            headerDropdownItems={headerDropdownItems}
+            tabs={[
+                {
+                    name: 'Summary',
+                    component: MLModelSummary,
+                },
+                {
+                    name: 'Documentation',
+                    component: DocumentationTab,
+                },
+                {
+                    name: 'Properties',
+                    component: PropertiesTab,
+                },
+                {
+                    name: 'Group',
+                    component: MLModelGroupsTab,
+                },
+                {
+                    name: 'Features',
+                    component: MlModelFeaturesTab,
+                },
+            ]}
+            sidebarSections={this.getSidebarSections()}
+            sidebarTabs={this.getSidebarTabs()}
+        />
+    );
+
+    getSidebarSections = () => [
+        {
+            component: SidebarEntityHeader,
+        },
+        {
+            component: SidebarAboutSection,
+        },
+        {
+            component: SidebarNotesSection,
+        },
+        {
+            component: SidebarOwnerSection,
+        },
+        {
+            component: SidebarDomainSection,
+        },
+        {
+            component: DataProductSection,
+        },
+        {
+            component: SidebarTagsSection,
+        },
+        {
+            component: SidebarGlossaryTermsSection,
+        },
+        {
+            component: StatusSection,
+        },
+        {
+            component: SidebarStructuredProperties,
+        },
+    ];
+
+    getSidebarTabs = () => [
+        {
+            name: 'Properties',
+            component: PropertiesTab,
+            description: 'View additional properties about this asset',
+            icon: UnorderedListOutlined,
+        },
+    ];
+
+    renderPreview = (previewType: PreviewType, data: MlModel) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <Preview
+                data={genericProperties}
+                model={data}
+                headerDropdownItems={headerDropdownItems}
+                previewType={previewType}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        const data = result.entity as MlModel;
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <Preview
+                data={genericProperties}
+                model={data}
+                degree={(result as any).degree}
+                paths={(result as any).paths}
+                isOutputPort={isOutputPort(result)}
+                headerDropdownItems={headerDropdownItems}
+            />
+        );
+    };
+
+    getLineageVizConfig = (entity: MlModel) => {
+        return {
+            urn: entity.urn,
+            name: entity.name,
+            type: EntityType.Mlmodel,
+            icon: entity.platform?.properties?.logoUrl || undefined,
+            platform: entity.platform,
+            deprecation: entity?.deprecation,
+        };
+    };
+
+    displayName = (data: MlModel) => {
+        return data.name || data.urn;
+    };
+
+    getGenericEntityProperties = (mlModel: MlModel) => {
+        return getDataForEntityType({ data: mlModel, entityType: this.type, getOverrideProperties: (data) => data });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([
+            EntityCapabilityType.OWNERS,
+            EntityCapabilityType.GLOSSARY_TERMS,
+            EntityCapabilityType.TAGS,
+            EntityCapabilityType.DOMAINS,
+            EntityCapabilityType.DEPRECATION,
+            EntityCapabilityType.SOFT_DELETE,
+            EntityCapabilityType.DATA_PRODUCTS,
+            EntityCapabilityType.LINEAGE,
+        ]);
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/mlModel/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/mlModel/preview/Preview.tsx
new file mode 100644
index 00000000000000..89529a9087cc86
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/mlModel/preview/Preview.tsx
@@ -0,0 +1,53 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import React from 'react';
+import { EntityPath, EntityType, MlModel } from '../../../../types.generated';
+import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard';
+import { capitalizeFirstLetterOnly } from '../../../shared/textUtil';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { IconStyleType, PreviewType } from '../../Entity';
+import { getDataProduct } from '../../shared/utils';
+import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions';
+
+export const Preview = ({
+    data,
+    model,
+    degree,
+    paths,
+    isOutputPort,
+    headerDropdownItems,
+    previewType,
+}: {
+    data: GenericEntityProperties | null;
+    model: MlModel;
+    degree?: number;
+    paths?: EntityPath[];
+    isOutputPort?: boolean;
+    headerDropdownItems?: Set<EntityMenuItems>;
+    previewType?: PreviewType;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    const genericProperties = entityRegistry.getGenericEntityProperties(EntityType.Mlmodel, model);
+
+    return (
+        <DefaultPreviewCard
+            url={entityRegistry.getEntityUrl(EntityType.Mlmodel, model.urn)}
+            name={model.name || ''}
+            urn={model.urn}
+            data={data}
+            description={model.description || ''}
+            platformInstanceId={model.dataPlatformInstance?.instanceId}
+            entityType={EntityType.Mlmodel}
+            typeIcon={entityRegistry.getIcon(EntityType.Mlmodel, 14, IconStyleType.ACCENT)}
+            platform={model?.platform?.properties?.displayName || capitalizeFirstLetterOnly(model?.platform?.name)}
+            qualifier={model.origin}
+            tags={model.globalTags || undefined}
+            owners={model?.ownership?.owners}
+            dataProduct={getDataProduct(genericProperties?.dataProduct)}
+            degree={degree}
+            paths={paths}
+            isOutputPort={isOutputPort}
+            headerDropdownItems={headerDropdownItems}
+            previewType={previewType}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/mlModel/profile/MLModelGroupsTab.tsx b/datahub-web-react/src/app/entityV2/mlModel/profile/MLModelGroupsTab.tsx
new file mode 100644
index 00000000000000..2ba9e0edd6783d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/mlModel/profile/MLModelGroupsTab.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import { Space, Table, Typography } from 'antd';
+import Link from 'antd/lib/typography/Link';
+import { ColumnsType } from 'antd/es/table';
+import styled from 'styled-components';
+
+import { EntityType, MlModelGroup } from '../../../../types.generated';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { useBaseEntity } from '../../../entity/shared/EntityContext';
+import { GetMlModelQuery } from '../../../../graphql/mlModel.generated';
+
+const TabContent = styled.div`
+    padding: 16px;
+`;
+
+export default function MLModelGroupsTab() {
+    const baseEntity = useBaseEntity<GetMlModelQuery>();
+    const model = baseEntity?.mlModel;
+
+    const entityRegistry = useEntityRegistry();
+
+    const propertyTableColumns: ColumnsType<MlModelGroup> = [
+        {
+            title: 'Group',
+            dataIndex: 'name',
+            render: (name, record) => {
+                return <Link href={entityRegistry.getEntityUrl(EntityType.MlmodelGroup, record.urn)}>{name}</Link>;
+            },
+        },
+        {
+            title: 'Description',
+            dataIndex: 'description',
+        },
+    ];
+
+    return (
+        <TabContent>
+            <Space direction="vertical" style={{ width: '100%' }} size="large">
+                <Typography.Title level={3}>Groups</Typography.Title>
+                <Table
+                    pagination={false}
+                    columns={propertyTableColumns}
+                    dataSource={model?.properties?.groups as MlModelGroup[]}
+                />
+            </Space>
+        </TabContent>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/mlModel/profile/MLModelSummary.tsx b/datahub-web-react/src/app/entityV2/mlModel/profile/MLModelSummary.tsx
new file mode 100644
index 00000000000000..c5dc468f5ac23d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/mlModel/profile/MLModelSummary.tsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Space, Table, Typography } from 'antd';
+
+import { MlHyperParam, MlMetric } from '../../../../types.generated';
+import { useBaseEntity } from '../../../entity/shared/EntityContext';
+import { GetMlModelQuery } from '../../../../graphql/mlModel.generated';
+
+const TabContent = styled.div`
+    padding: 16px;
+`;
+
+export default function MLModelSummary() {
+    const baseEntity = useBaseEntity<GetMlModelQuery>();
+    const model = baseEntity?.mlModel;
+
+    const propertyTableColumns = [
+        {
+            title: 'Name',
+            dataIndex: 'name',
+            width: 450,
+        },
+        {
+            title: 'Value',
+            dataIndex: 'value',
+        },
+    ];
+
+    return (
+        <TabContent>
+            <Space direction="vertical" style={{ width: '100%' }} size="large">
+                <Typography.Title level={3}>Training Metrics</Typography.Title>
+                <Table
+                    pagination={false}
+                    columns={propertyTableColumns}
+                    dataSource={model?.properties?.trainingMetrics as MlMetric[]}
+                />
+                <Typography.Title level={3}>Hyper Parameters</Typography.Title>
+                <Table
+                    pagination={false}
+                    columns={propertyTableColumns}
+                    dataSource={model?.properties?.hyperParams as MlHyperParam[]}
+                />
+            </Space>
+        </TabContent>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/mlModel/profile/MlModelFeaturesTab.tsx b/datahub-web-react/src/app/entityV2/mlModel/profile/MlModelFeaturesTab.tsx
new file mode 100644
index 00000000000000..81f0750a88a78b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/mlModel/profile/MlModelFeaturesTab.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+
+import { MlPrimaryKey, MlFeature } from '../../../../types.generated';
+import { useBaseEntity } from '../../../entity/shared/EntityContext';
+import { GetMlModelQuery } from '../../../../graphql/mlModel.generated';
+import TableOfMlFeatures from '../../mlFeatureTable/profile/features/TableOfMlFeatures';
+
+export default function MlModelFeaturesTab() {
+    const entity = useBaseEntity() as GetMlModelQuery;
+
+    const model = entity && entity.mlModel;
+    const features = model?.features?.relationships.map((relationship) => relationship.entity) as Array<
+        MlFeature | MlPrimaryKey
+    >;
+
+    return <TableOfMlFeatures features={features || []} />;
+}
diff --git a/datahub-web-react/src/app/entityV2/mlModelGroup/MLModelGroupEntity.tsx b/datahub-web-react/src/app/entityV2/mlModelGroup/MLModelGroupEntity.tsx
new file mode 100644
index 00000000000000..0a2f99e02dd761
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/mlModelGroup/MLModelGroupEntity.tsx
@@ -0,0 +1,210 @@
+import { CodeSandboxOutlined, UnorderedListOutlined } from '@ant-design/icons';
+import * as React from 'react';
+import { useGetMlModelGroupQuery } from '../../../graphql/mlModelGroup.generated';
+import { EntityType, MlModelGroup, SearchResult } from '../../../types.generated';
+import { GenericEntityProperties } from '../../entity/shared/types';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions';
+import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
+import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection';
+import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection';
+import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
+import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader';
+import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection';
+import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection';
+import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties';
+import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+import { isOutputPort } from '../shared/utils';
+import { Preview } from './preview/Preview';
+import ModelGroupModels from './profile/ModelGroupModels';
+import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection';
+
+const headerDropdownItems = new Set([EntityMenuItems.UPDATE_DEPRECATION, EntityMenuItems.ANNOUNCE]);
+
+/**
+ * Definition of the DataHub MlModelGroup entity.
+ */
+export class MLModelGroupEntity implements Entity<MlModelGroup> {
+    type: EntityType = EntityType.MlmodelGroup;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <CodeSandboxOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return (
+                <CodeSandboxOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color: color || '#9633b9' }} />
+            );
+        }
+
+        return (
+            <CodeSandboxOutlined
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => true;
+
+    isLineageEnabled = () => true;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getGraphName = () => 'mlModelGroup';
+
+    getPathName = () => 'mlModelGroup';
+
+    getEntityName = () => 'ML Group';
+
+    getCollectionName = () => 'ML Groups';
+
+    getOverridePropertiesFromEntity = (_?: MlModelGroup | null): GenericEntityProperties => {
+        return {};
+    };
+
+    useEntityQuery = useGetMlModelGroupQuery;
+
+    renderProfile = (urn: string) => (
+        <EntityProfile
+            urn={urn}
+            key={urn}
+            entityType={EntityType.MlmodelGroup}
+            useEntityQuery={useGetMlModelGroupQuery}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+            headerDropdownItems={headerDropdownItems}
+            tabs={[
+                {
+                    name: 'Models',
+                    component: ModelGroupModels,
+                },
+                {
+                    name: 'Documentation',
+                    component: DocumentationTab,
+                },
+                {
+                    name: 'Properties',
+                    component: PropertiesTab,
+                },
+            ]}
+            sidebarSections={this.getSidebarSections()}
+            sidebarTabs={this.getSidebarTabs()}
+        />
+    );
+
+    getSidebarSections = () => [
+        {
+            component: SidebarEntityHeader,
+        },
+        {
+            component: SidebarAboutSection,
+        },
+        {
+            component: SidebarNotesSection,
+        },
+        {
+            component: SidebarOwnerSection,
+        },
+        {
+            component: SidebarDomainSection,
+        },
+        {
+            component: DataProductSection,
+        },
+        {
+            component: SidebarTagsSection,
+        },
+        {
+            component: SidebarGlossaryTermsSection,
+        },
+        {
+            component: StatusSection,
+        },
+        {
+            component: SidebarStructuredProperties,
+        },
+    ];
+
+    getSidebarTabs = () => [
+        {
+            name: 'Properties',
+            component: PropertiesTab,
+            description: 'View additional properties about this asset',
+            icon: UnorderedListOutlined,
+        },
+    ];
+
+    renderPreview = (previewType: PreviewType, data: MlModelGroup) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <Preview
+                data={genericProperties}
+                group={data}
+                headerDropdownItems={headerDropdownItems}
+                previewType={previewType}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        const data = result.entity as MlModelGroup;
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <Preview
+                data={genericProperties}
+                group={data}
+                degree={(result as any).degree}
+                paths={(result as any).paths}
+                isOutputPort={isOutputPort(result)}
+                headerDropdownItems={headerDropdownItems}
+            />
+        );
+    };
+
+    getLineageVizConfig = (entity: MlModelGroup) => {
+        return {
+            urn: entity.urn,
+            name: entity.name,
+            type: EntityType.MlmodelGroup,
+            icon: entity.platform?.properties?.logoUrl || undefined,
+            platform: entity.platform,
+            deprecation: entity?.deprecation,
+        };
+    };
+
+    displayName = (data: MlModelGroup) => {
+        return data.name || data.urn;
+    };
+
+    getGenericEntityProperties = (mlModelGroup: MlModelGroup) => {
+        return getDataForEntityType({
+            data: mlModelGroup,
+            entityType: this.type,
+            getOverrideProperties: (data) => data,
+        });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([
+            EntityCapabilityType.OWNERS,
+            EntityCapabilityType.GLOSSARY_TERMS,
+            EntityCapabilityType.TAGS,
+            EntityCapabilityType.DOMAINS,
+            EntityCapabilityType.DEPRECATION,
+            EntityCapabilityType.SOFT_DELETE,
+            EntityCapabilityType.DATA_PRODUCTS,
+            EntityCapabilityType.LINEAGE,
+        ]);
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/mlModelGroup/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/mlModelGroup/preview/Preview.tsx
new file mode 100644
index 00000000000000..31abd228e4466e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/mlModelGroup/preview/Preview.tsx
@@ -0,0 +1,51 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import React from 'react';
+import { EntityPath, EntityType, MlModelGroup } from '../../../../types.generated';
+import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard';
+import { capitalizeFirstLetterOnly } from '../../../shared/textUtil';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { getDataProduct } from '../../shared/utils';
+import { EntityMenuItems } from '../../shared/EntityDropdown/EntityMenuActions';
+import { PreviewType } from '../../Entity';
+
+export const Preview = ({
+    data,
+    group,
+    degree,
+    paths,
+    isOutputPort,
+    headerDropdownItems,
+    previewType,
+}: {
+    data: GenericEntityProperties | null;
+    group: MlModelGroup;
+    degree?: number;
+    paths?: EntityPath[];
+    isOutputPort?: boolean;
+    headerDropdownItems?: Set<EntityMenuItems>;
+    previewType?: PreviewType;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    const genericProperties = entityRegistry.getGenericEntityProperties(EntityType.MlmodelGroup, group);
+    return (
+        <DefaultPreviewCard
+            url={entityRegistry.getEntityUrl(EntityType.MlmodelGroup, group.urn)}
+            name={group?.name || ''}
+            urn={group.urn}
+            data={data}
+            platformInstanceId={group.dataPlatformInstance?.instanceId}
+            description={group?.description || ''}
+            entityType={EntityType.MlmodelGroup}
+            logoUrl={group?.platform?.properties?.logoUrl || ''}
+            platform={group?.platform?.properties?.displayName || capitalizeFirstLetterOnly(group?.platform?.name)}
+            qualifier={group?.origin}
+            owners={group?.ownership?.owners}
+            dataProduct={getDataProduct(genericProperties?.dataProduct)}
+            degree={degree}
+            paths={paths}
+            isOutputPort={isOutputPort}
+            headerDropdownItems={headerDropdownItems}
+            previewType={previewType}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/mlModelGroup/profile/ModelGroupModels.tsx b/datahub-web-react/src/app/entityV2/mlModelGroup/profile/ModelGroupModels.tsx
new file mode 100644
index 00000000000000..916256bb999f61
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/mlModelGroup/profile/ModelGroupModels.tsx
@@ -0,0 +1,32 @@
+import { List, Space, Typography } from 'antd';
+import React from 'react';
+import { GetMlModelGroupQuery } from '../../../../graphql/mlModelGroup.generated';
+import { EntityType } from '../../../../types.generated';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { PreviewType } from '../../Entity';
+import { useBaseEntity } from '../../../entity/shared/EntityContext';
+
+export default function MLGroupModels() {
+    const baseEntity = useBaseEntity<GetMlModelGroupQuery>();
+    const models = baseEntity?.mlModelGroup?.incoming?.relationships?.map((relationship) => relationship.entity) || [];
+
+    const entityRegistry = useEntityRegistry();
+
+    return (
+        <>
+            <Space direction="vertical" style={{ width: '100%' }} size="large">
+                <List
+                    style={{ padding: '16px 16px' }}
+                    bordered
+                    dataSource={models}
+                    header={<Typography.Title level={3}>Models</Typography.Title>}
+                    renderItem={(item) => (
+                        <List.Item style={{ paddingTop: '20px' }}>
+                            {entityRegistry.renderPreview(EntityType.Mlmodel, PreviewType.PREVIEW, item)}
+                        </List.Item>
+                    )}
+                />
+            </Space>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/mlPrimaryKey/MLPrimaryKeyEntity.tsx b/datahub-web-react/src/app/entityV2/mlPrimaryKey/MLPrimaryKeyEntity.tsx
new file mode 100644
index 00000000000000..cb19739476ec70
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/mlPrimaryKey/MLPrimaryKeyEntity.tsx
@@ -0,0 +1,235 @@
+import { DotChartOutlined, PartitionOutlined, UnorderedListOutlined } from '@ant-design/icons';
+import * as React from 'react';
+import { useGetMlPrimaryKeyQuery } from '../../../graphql/mlPrimaryKey.generated';
+import { EntityType, MlPrimaryKey, SearchResult } from '../../../types.generated';
+import { GenericEntityProperties } from '../../entity/shared/types';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
+import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection';
+import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection';
+import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
+import SidebarEntityHeader from '../shared/containers/profile/sidebar/SidebarEntityHeader';
+import { SidebarGlossaryTermsSection } from '../shared/containers/profile/sidebar/SidebarGlossaryTermsSection';
+import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection';
+import StatusSection from '../shared/containers/profile/sidebar/shared/StatusSection';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import SidebarStructuredProperties from '../shared/sidebarSection/SidebarStructuredProperties';
+import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab';
+import { LineageTab } from '../shared/tabs/Lineage/LineageTab';
+import { FeatureTableTab } from '../shared/tabs/ML/MlPrimaryKeyFeatureTableTab';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+import { SidebarTitleActionType, getDataProduct, isOutputPort } from '../shared/utils';
+import { Preview } from './preview/Preview';
+
+/**
+ * Definition of the DataHub MLPrimaryKey entity.
+ */
+export class MLPrimaryKeyEntity implements Entity<MlPrimaryKey> {
+    type: EntityType = EntityType.MlprimaryKey;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <DotChartOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return (
+                <DotChartOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color: color || '#9633b9' }} />
+            );
+        }
+
+        return (
+            <DotChartOutlined
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => false;
+
+    isLineageEnabled = () => true;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getGraphName = () => 'mlPrimaryKey';
+
+    getPathName = () => 'mlPrimaryKeys';
+
+    getEntityName = () => 'ML Primary Key';
+
+    getCollectionName = () => 'ML Primary Keys';
+
+    getOverridePropertiesFromEntity = (key?: MlPrimaryKey | null): GenericEntityProperties => {
+        return {
+            // eslint-disable-next-line
+            platform: key?.['featureTables']?.relationships?.[0]?.entity?.platform,
+        };
+    };
+
+    useEntityQuery = useGetMlPrimaryKeyQuery;
+
+    renderProfile = (urn: string) => (
+        <EntityProfile
+            urn={urn}
+            key={urn}
+            entityType={EntityType.MlprimaryKey}
+            useEntityQuery={useGetMlPrimaryKeyQuery}
+            getOverrideProperties={this.getOverridePropertiesFromEntity}
+            tabs={[
+                {
+                    name: 'Feature Tables',
+                    component: FeatureTableTab,
+                },
+                {
+                    name: 'Documentation',
+                    component: DocumentationTab,
+                },
+                {
+                    name: 'Lineage',
+                    component: LineageTab,
+                },
+                {
+                    name: 'Properties',
+                    component: PropertiesTab,
+                },
+            ]}
+            sidebarSections={this.getSidebarSections()}
+            sidebarTabs={this.getSidebarTabs()}
+        />
+    );
+
+    getSidebarSections = () => [
+        {
+            component: SidebarEntityHeader,
+        },
+        {
+            component: SidebarAboutSection,
+        },
+        {
+            component: SidebarOwnerSection,
+        },
+        {
+            component: SidebarDomainSection,
+        },
+        {
+            component: DataProductSection,
+        },
+        {
+            component: SidebarTagsSection,
+        },
+        {
+            component: SidebarGlossaryTermsSection,
+        },
+        {
+            component: StatusSection,
+        },
+        {
+            component: SidebarStructuredProperties,
+        },
+    ];
+
+    getSidebarTabs = () => [
+        {
+            name: 'Lineage',
+            component: LineageTab,
+            description: "View this data asset's upstream and downstream dependencies",
+            icon: PartitionOutlined,
+            properties: {
+                actionType: SidebarTitleActionType.LineageExplore,
+            },
+        },
+        {
+            name: 'Properties',
+            component: PropertiesTab,
+            description: 'View additional properties about this asset',
+            icon: UnorderedListOutlined,
+        },
+    ];
+
+    renderPreview = (previewType: PreviewType, data: MlPrimaryKey) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        // eslint-disable-next-line
+        const platform = data?.['featureTables']?.relationships?.[0]?.entity?.platform;
+        return (
+            <Preview
+                urn={data.urn}
+                data={genericProperties}
+                name={data.name || ''}
+                featureNamespace={data.featureNamespace || ''}
+                description={data.description}
+                owners={data.ownership?.owners}
+                platform={platform}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                previewType={previewType}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        const data = result.entity as MlPrimaryKey;
+        const genericProperties = this.getGenericEntityProperties(data);
+        // eslint-disable-next-line
+        const platform = data?.['featureTables']?.relationships?.[0]?.entity?.platform;
+        return (
+            <Preview
+                urn={data.urn}
+                data={genericProperties}
+                name={data.name || ''}
+                featureNamespace={data.featureNamespace || ''}
+                description={data.description || ''}
+                owners={data.ownership?.owners}
+                platform={platform}
+                platformInstanceId={data.dataPlatformInstance?.instanceId}
+                dataProduct={getDataProduct(genericProperties?.dataProduct)}
+                degree={(result as any).degree}
+                paths={(result as any).paths}
+                isOutputPort={isOutputPort(result)}
+            />
+        );
+    };
+
+    displayName = (data: MlPrimaryKey) => {
+        return data.name || data.urn;
+    };
+
+    getGenericEntityProperties = (mlPrimaryKey: MlPrimaryKey) => {
+        return getDataForEntityType({
+            data: mlPrimaryKey,
+            entityType: this.type,
+            getOverrideProperties: this.getOverridePropertiesFromEntity,
+        });
+    };
+
+    getLineageVizConfig = (entity: MlPrimaryKey) => {
+        return {
+            urn: entity.urn,
+            name: entity.name,
+            type: EntityType.MlprimaryKey,
+            // eslint-disable-next-line
+            icon: entity?.['featureTables']?.relationships?.[0]?.entity?.platform?.properties?.logoUrl || undefined,
+            // eslint-disable-next-line
+            platform: entity?.['featureTables']?.relationships?.[0]?.entity?.platform?.name,
+        };
+    };
+
+    supportedCapabilities = () => {
+        return new Set([
+            EntityCapabilityType.OWNERS,
+            EntityCapabilityType.GLOSSARY_TERMS,
+            EntityCapabilityType.TAGS,
+            EntityCapabilityType.DOMAINS,
+            EntityCapabilityType.DEPRECATION,
+            EntityCapabilityType.SOFT_DELETE,
+            EntityCapabilityType.DATA_PRODUCTS,
+            EntityCapabilityType.LINEAGE,
+        ]);
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/mlPrimaryKey/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/mlPrimaryKey/preview/Preview.tsx
new file mode 100644
index 00000000000000..993d6b51773217
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/mlPrimaryKey/preview/Preview.tsx
@@ -0,0 +1,61 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import React from 'react';
+import { DataPlatform, DataProduct, EntityPath, EntityType, Owner } from '../../../../types.generated';
+import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard';
+import { capitalizeFirstLetterOnly } from '../../../shared/textUtil';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { IconStyleType, PreviewType } from '../../Entity';
+
+export const Preview = ({
+    urn,
+    data,
+    name,
+    featureNamespace,
+    description,
+    owners,
+    platform,
+    dataProduct,
+    platformInstanceId,
+    degree,
+    paths,
+    isOutputPort,
+    previewType,
+}: {
+    urn: string;
+    data: GenericEntityProperties | null;
+    name: string;
+    featureNamespace: string;
+    description?: string | null;
+    owners?: Array<Owner> | null;
+    platform?: DataPlatform | null | undefined;
+    dataProduct?: DataProduct | null;
+    platformInstanceId?: string;
+    degree?: number;
+    paths?: EntityPath[];
+    isOutputPort?: boolean;
+    previewType?: PreviewType;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    return (
+        <DefaultPreviewCard
+            url={entityRegistry.getEntityUrl(EntityType.MlprimaryKey, urn)}
+            name={name}
+            urn={urn}
+            data={data}
+            description={description || ''}
+            platform={
+                platform?.properties?.displayName || capitalizeFirstLetterOnly(platform?.name) || featureNamespace
+            }
+            logoUrl={platform?.properties?.logoUrl || ''}
+            entityType={EntityType.MlprimaryKey}
+            typeIcon={entityRegistry.getIcon(EntityType.MlprimaryKey, 14, IconStyleType.ACCENT)}
+            owners={owners}
+            dataProduct={dataProduct}
+            platformInstanceId={platformInstanceId}
+            degree={degree}
+            paths={paths}
+            isOutputPort={isOutputPort}
+            previewType={previewType}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/ownership/ManageOwnership.tsx b/datahub-web-react/src/app/entityV2/ownership/ManageOwnership.tsx
new file mode 100644
index 00000000000000..a3304ab015faa4
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/ownership/ManageOwnership.tsx
@@ -0,0 +1,49 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { Typography } from 'antd';
+import { OwnershipList } from './OwnershipList';
+
+const PageContainer = styled.div`
+    padding-top: 20px;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+`;
+
+const PageHeaderContainer = styled.div`
+    && {
+        padding-left: 24px;
+    }
+`;
+
+const PageTitle = styled(Typography.Title)`
+    && {
+        margin-bottom: 12px;
+    }
+`;
+
+const ListContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+`;
+
+/**
+ * Component used for displaying the 'Manage Ownership' experience.
+ */
+export const ManageOwnership = () => {
+    return (
+        <PageContainer>
+            <PageHeaderContainer>
+                <PageTitle level={3}>Manage Ownership</PageTitle>
+                <Typography.Paragraph type="secondary">
+                    Create, edit, and remove custom Ownership Types.
+                </Typography.Paragraph>
+            </PageHeaderContainer>
+            <ListContainer>
+                <OwnershipList />
+            </ListContainer>
+        </PageContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/ownership/OwnershipBuilderModal.tsx b/datahub-web-react/src/app/entityV2/ownership/OwnershipBuilderModal.tsx
new file mode 100644
index 00000000000000..ca5a5ee0253201
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/ownership/OwnershipBuilderModal.tsx
@@ -0,0 +1,225 @@
+import React, { useEffect, useState } from 'react';
+import { Button, Form, Input, Modal, Typography, message, notification } from 'antd';
+import styled from 'styled-components/macro';
+import { useCreateOwnershipTypeMutation, useUpdateOwnershipTypeMutation } from '../../../graphql/ownership.generated';
+import { OwnershipTypeEntity } from '../../../types.generated';
+import { OwnershipTypeBuilderState } from './table/types';
+
+const NAME_INPUT_TEST_ID = 'ownership-type-name-input';
+const DESCRIPTION_INPUT_TEST_ID = 'ownership-type-description-input';
+
+const TitleContainer = styled.div`
+    display: flex;
+    justify-content: space-between;
+`;
+
+const TitleText = styled(Typography.Text)`
+    font-size: 16px;
+    font-weight: 700;
+`;
+
+const FormItemContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+`;
+
+const FormItemTitle = styled(Typography.Text)`
+    margin-bottom: 8px;
+    font-weight: 700;
+`;
+
+const StyledFormItem = styled(Form.Item)`
+    margin-bottom: 8px;
+`;
+
+const SaveButtonContainer = styled.div`
+    width: 100%;
+    display: flex;
+    justify-content: right;
+`;
+
+const CancelButton = styled(Button)`
+    margin-right: 12px;
+`;
+
+type Props = {
+    isOpen: boolean;
+    onClose: () => void;
+    refetch: () => void;
+    ownershipType?: OwnershipTypeEntity;
+};
+
+export const OwnershipBuilderModal = ({ isOpen, onClose, refetch, ownershipType }: Props) => {
+    // State
+    const [ownershipTypeBuilderState, setOwnershipTypeBuilderState] = useState<OwnershipTypeBuilderState>({
+        name: ownershipType?.info?.name || ownershipType?.urn || '',
+        description: ownershipType?.info?.description || '',
+    });
+    const setName = (name: string) => {
+        setOwnershipTypeBuilderState({ ...ownershipTypeBuilderState, name });
+    };
+    const setDescription = (description: string) => {
+        setOwnershipTypeBuilderState({ ...ownershipTypeBuilderState, description });
+    };
+    const [form] = Form.useForm();
+    form.setFieldsValue(ownershipTypeBuilderState);
+
+    // Side effects
+    useEffect(() => {
+        if (ownershipType) {
+            const ownershipTypeName = ownershipType?.info?.name || ownershipType?.urn;
+            const ownershipTypeDescription = ownershipType?.info?.description || '';
+            setOwnershipTypeBuilderState({
+                name: ownershipTypeName,
+                description: ownershipTypeDescription,
+            });
+        } else {
+            setOwnershipTypeBuilderState({
+                name: '',
+                description: '',
+            });
+        }
+    }, [ownershipType]);
+
+    // Queries
+    const [createOwnershipTypeMutation] = useCreateOwnershipTypeMutation();
+    const [updateOwnershipTypeMutation] = useUpdateOwnershipTypeMutation();
+
+    const onCreateOwnershipType = () => {
+        if (ownershipTypeBuilderState.name) {
+            createOwnershipTypeMutation({
+                variables: {
+                    input: {
+                        name: ownershipTypeBuilderState.name,
+                        description: ownershipTypeBuilderState.description,
+                    },
+                },
+            })
+                .then(() => {
+                    setName('');
+                    setDescription('');
+                    onClose();
+                    notification.success({
+                        message: `Success`,
+                        description: 'Successfully created ownership type.',
+                        placement: 'bottomLeft',
+                        duration: 3,
+                    });
+                    setTimeout(() => {
+                        refetch();
+                    }, 3000);
+                })
+                .catch((e: unknown) => {
+                    message.destroy();
+                    if (e instanceof Error) {
+                        message.error({
+                            content: `Failed to create ownership type`,
+                            duration: 3,
+                        });
+                    }
+                });
+        }
+    };
+
+    const onUpdateOwnershipType = () => {
+        if (ownershipType) {
+            updateOwnershipTypeMutation({
+                variables: {
+                    urn: ownershipType?.urn || '',
+                    input: {
+                        name: ownershipTypeBuilderState.name,
+                        description: ownershipTypeBuilderState.description,
+                    },
+                },
+            })
+                .then(() => {
+                    setName('');
+                    setDescription('');
+                    onClose();
+                    notification.success({
+                        message: `Success`,
+                        description: 'Successfully updated ownership type.',
+                        placement: 'bottomLeft',
+                        duration: 3,
+                    });
+                    setTimeout(() => {
+                        refetch();
+                    }, 3000);
+                })
+                .catch((e: unknown) => {
+                    message.destroy();
+                    if (e instanceof Error) {
+                        message.error({
+                            content: `Failed to update ownership type`,
+                            duration: 3,
+                        });
+                    }
+                });
+        }
+    };
+
+    const onUpsert = ownershipType ? onUpdateOwnershipType : onCreateOwnershipType;
+    const titleText = ownershipType ? 'Edit Ownership Type' : 'Create Ownership Type';
+    return (
+        <Modal
+            open={isOpen}
+            onCancel={onClose}
+            title={
+                <TitleContainer>
+                    <TitleText>{titleText}</TitleText>
+                </TitleContainer>
+            }
+            footer={null}
+        >
+            <Form form={form}>
+                <FormItemContainer>
+                    <FormItemTitle>Name</FormItemTitle>
+                    <StyledFormItem
+                        name="name"
+                        rules={[
+                            {
+                                required: true,
+                                message: 'Please input a name for the ownership type',
+                            },
+                            { whitespace: true },
+                            { min: 1, max: 50 },
+                        ]}
+                    >
+                        <Input
+                            data-testid={NAME_INPUT_TEST_ID}
+                            placeholder="Ownership type name"
+                            onChange={(e) => {
+                                setName(e.target.value);
+                            }}
+                        />
+                    </StyledFormItem>
+                </FormItemContainer>
+                <FormItemContainer>
+                    <FormItemTitle>Description</FormItemTitle>
+                    <StyledFormItem name="description" rules={[{ whitespace: true }, { min: 1, max: 250 }]}>
+                        <Input
+                            data-testid={DESCRIPTION_INPUT_TEST_ID}
+                            placeholder="Ownership type description"
+                            onChange={(e) => {
+                                setDescription(e.target.value);
+                            }}
+                        />
+                    </StyledFormItem>
+                </FormItemContainer>
+            </Form>
+            <SaveButtonContainer>
+                <CancelButton data-testid="ownership-builder-cancel" onClick={onClose}>
+                    Cancel
+                </CancelButton>
+                <Button
+                    data-testid="ownership-builder-save"
+                    type="primary"
+                    disabled={!ownershipTypeBuilderState.name}
+                    onClick={onUpsert}
+                >
+                    Save
+                </Button>
+            </SaveButtonContainer>
+        </Modal>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/ownership/OwnershipList.tsx b/datahub-web-react/src/app/entityV2/ownership/OwnershipList.tsx
new file mode 100644
index 00000000000000..6e735c7cb4cf27
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/ownership/OwnershipList.tsx
@@ -0,0 +1,132 @@
+import React, { useState } from 'react';
+import { Button, Pagination, message } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
+import styled from 'styled-components/macro';
+import { useListOwnershipTypesQuery } from '../../../graphql/ownership.generated';
+import { Message } from '../../shared/Message';
+import { OwnershipBuilderModal } from './OwnershipBuilderModal';
+import TabToolbar from '../shared/components/styled/TabToolbar';
+import { OwnershipTable } from './table/OwnershipTable';
+import { OwnershipTypeEntity } from '../../../types.generated';
+import { SearchBar } from '../../search/SearchBar';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { scrollToTop } from '../../shared/searchUtils';
+
+const PaginationContainer = styled.div`
+    display: flex;
+    justify-content: center;
+`;
+
+const StyledPagination = styled(Pagination)`
+    margin: 40px;
+`;
+
+const searchBarStyle = {
+    maxWidth: 220,
+    padding: 0,
+};
+
+const searchBarInputStyle = {
+    height: 32,
+    fontSize: 12,
+};
+
+/**
+ * This component renders a paginated, searchable list of Ownership Types.
+ */
+export const OwnershipList = () => {
+    /**
+     * Context
+     */
+    const entityRegistry = useEntityRegistry();
+
+    /**
+     * State
+     */
+    const [page, setPage] = useState(1);
+    const [showOwnershipBuilder, setShowOwnershipBuilder] = useState<boolean>(false);
+    const [ownershipType, setOwnershipType] = useState<undefined | OwnershipTypeEntity>(undefined);
+    const [query, setQuery] = useState<undefined | string>(undefined);
+
+    /**
+     * Queries
+     */
+    const pageSize = 10;
+    const start: number = (page - 1) * pageSize;
+    const { data, loading, error, refetch } = useListOwnershipTypesQuery({
+        variables: {
+            input: {
+                start,
+                count: pageSize,
+                query,
+            },
+        },
+    });
+    const totalOwnershipTypes = data?.listOwnershipTypes?.total || 0;
+    const ownershipTypes =
+        data?.listOwnershipTypes?.ownershipTypes.filter((type) => type.urn !== 'urn:li:ownershipType:none') || [];
+
+    const onClickCreateOwnershipType = () => {
+        setShowOwnershipBuilder(true);
+    };
+
+    const onCloseModal = () => {
+        setShowOwnershipBuilder(false);
+        setOwnershipType(undefined);
+    };
+
+    const onChangePage = (newPage: number) => {
+        scrollToTop();
+        setPage(newPage);
+    };
+
+    return (
+        <>
+            {!data && loading && <Message type="loading" content="Loading Ownership Types..." />}
+            {error &&
+                message.error({
+                    content: `Failed to load Ownership Types! An unexpected error occurred.`,
+                    duration: 3,
+                })}
+            <TabToolbar>
+                <Button type="text" onClick={onClickCreateOwnershipType} data-testid="create-owner-type">
+                    <PlusOutlined /> Create Ownership Type
+                </Button>
+                <SearchBar
+                    initialQuery=""
+                    placeholderText="Search by Name..."
+                    suggestions={[]}
+                    style={searchBarStyle}
+                    inputStyle={searchBarInputStyle}
+                    onSearch={() => null}
+                    onQueryChange={(q) => setQuery(q.length > 0 ? q : undefined)}
+                    entityRegistry={entityRegistry}
+                />
+            </TabToolbar>
+            <OwnershipTable
+                ownershipTypes={ownershipTypes}
+                setIsOpen={setShowOwnershipBuilder}
+                setOwnershipType={setOwnershipType}
+                refetch={refetch}
+            />
+            {totalOwnershipTypes >= pageSize && (
+                <PaginationContainer>
+                    <StyledPagination
+                        current={page}
+                        pageSize={pageSize}
+                        total={totalOwnershipTypes}
+                        showLessItems
+                        onChange={onChangePage}
+                        showSizeChanger={false}
+                    />
+                </PaginationContainer>
+            )}
+            <OwnershipBuilderModal
+                isOpen={showOwnershipBuilder}
+                onClose={onCloseModal}
+                refetch={refetch}
+                ownershipType={ownershipType}
+            />
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/ownership/table/ActionsColumn.tsx b/datahub-web-react/src/app/entityV2/ownership/table/ActionsColumn.tsx
new file mode 100644
index 00000000000000..41e07520a0ece5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/ownership/table/ActionsColumn.tsx
@@ -0,0 +1,128 @@
+import React from 'react';
+import { Dropdown, MenuProps, Popconfirm, Typography, message, notification } from 'antd';
+import { DeleteOutlined, EditOutlined, MoreOutlined } from '@ant-design/icons';
+import styled from 'styled-components/macro';
+import { OwnershipTypeEntity } from '../../../../types.generated';
+import { useDeleteOwnershipTypeMutation } from '../../../../graphql/ownership.generated';
+
+const DROPDOWN_TEST_ID = 'ownership-table-dropdown';
+const EDIT_OWNERSHIP_TYPE_TEST_ID = 'edit-ownership-type';
+const DELETE_OWNERSHIP_TYPE_TEST_ID = 'delete-ownership-type';
+
+const StyledDropdown = styled(Dropdown)``;
+
+const MenuButtonContainer = styled.div`
+    display: flex;
+    justify-content: center;
+    align-items: center;
+`;
+
+const MenuButtonText = styled(Typography.Text)`
+    font-size: 14px;
+    font-weight: 400;
+    margin-left: 8px;
+`;
+
+const StyledMoreOutlined = styled(MoreOutlined)`
+    width: 20px;
+    &&& {
+        padding-left: 0px;
+        padding-right: 0px;
+        font-size: 18px;
+    }
+    :hover {
+        cursor: pointer;
+    }
+`;
+
+type Props = {
+    ownershipType: OwnershipTypeEntity;
+    setIsOpen: (isOpen: boolean) => void;
+    setOwnershipType: (ownershipType: OwnershipTypeEntity) => void;
+    refetch: () => void;
+};
+
+export const ActionsColumn = ({ ownershipType, setIsOpen, setOwnershipType, refetch }: Props) => {
+    const editOnClick = () => {
+        setIsOpen(true);
+        setOwnershipType(ownershipType);
+    };
+
+    const [deleteOwnershipTypeMutation] = useDeleteOwnershipTypeMutation();
+
+    const onDelete = () => {
+        deleteOwnershipTypeMutation({
+            variables: {
+                urn: ownershipType.urn,
+            },
+        })
+            .then(() => {
+                notification.success({
+                    message: `Success`,
+                    description: 'You have deleted an ownership type.',
+                    placement: 'bottomLeft',
+                    duration: 3,
+                });
+                setTimeout(() => {
+                    refetch();
+                }, 3000);
+            })
+            .catch((e: unknown) => {
+                message.destroy();
+                if (e instanceof Error) {
+                    message.error({
+                        content: `Failed to delete an ownership type`,
+                        duration: 3,
+                    });
+                }
+            });
+    };
+
+    const items: MenuProps['items'] = [
+        {
+            key: 'edit',
+            icon: (
+                <MenuButtonContainer data-testid={EDIT_OWNERSHIP_TYPE_TEST_ID}>
+                    <EditOutlined />
+                    <MenuButtonText>Edit</MenuButtonText>
+                </MenuButtonContainer>
+            ),
+        },
+        {
+            key: 'delete',
+            icon: (
+                <Popconfirm
+                    title={<Typography.Text>Are you sure you want to delete this ownership type?</Typography.Text>}
+                    placement="left"
+                    onCancel={() => {}}
+                    onConfirm={onDelete}
+                    okText="Yes"
+                    cancelText="No"
+                >
+                    <MenuButtonContainer data-testid={DELETE_OWNERSHIP_TYPE_TEST_ID}>
+                        <DeleteOutlined />
+                        <MenuButtonText>Delete</MenuButtonText>
+                    </MenuButtonContainer>
+                </Popconfirm>
+            ),
+        },
+    ];
+
+    const onClick: MenuProps['onClick'] = (e) => {
+        const key = e.key as string;
+        if (key === 'edit') {
+            editOnClick();
+        }
+    };
+
+    const menuProps: MenuProps = {
+        items,
+        onClick,
+    };
+
+    return (
+        <StyledDropdown menu={menuProps}>
+            <StyledMoreOutlined date-testid={DROPDOWN_TEST_ID} style={{ display: undefined }} />
+        </StyledDropdown>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/ownership/table/DescriptionColumn.tsx b/datahub-web-react/src/app/entityV2/ownership/table/DescriptionColumn.tsx
new file mode 100644
index 00000000000000..5db6a671960627
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/ownership/table/DescriptionColumn.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { Typography } from 'antd';
+import styled from 'styled-components/macro';
+import { OwnershipTypeEntity } from '../../../../types.generated';
+
+const DescriptionText = styled(Typography.Text)`
+    font-size: 12px;
+    font-weight: 400;
+`;
+
+type Props = {
+    ownershipType: OwnershipTypeEntity;
+};
+
+export const DescriptionColumn = ({ ownershipType }: Props) => {
+    const description = ownershipType?.info?.description || '';
+
+    return <DescriptionText>{description}</DescriptionText>;
+};
diff --git a/datahub-web-react/src/app/entityV2/ownership/table/NameColumn.tsx b/datahub-web-react/src/app/entityV2/ownership/table/NameColumn.tsx
new file mode 100644
index 00000000000000..46100621eae94c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/ownership/table/NameColumn.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { Typography } from 'antd';
+import styled from 'styled-components/macro';
+import { OwnershipTypeEntity } from '../../../../types.generated';
+
+const NameText = styled(Typography.Text)`
+    font-size: 12px;
+    font-weight: 700;
+`;
+
+type Props = {
+    ownershipType: OwnershipTypeEntity;
+};
+
+export const NameColumn = ({ ownershipType }: Props) => {
+    const name = ownershipType?.info?.name || ownershipType?.urn;
+
+    return <NameText>{name}</NameText>;
+};
diff --git a/datahub-web-react/src/app/entityV2/ownership/table/OwnershipTable.tsx b/datahub-web-react/src/app/entityV2/ownership/table/OwnershipTable.tsx
new file mode 100644
index 00000000000000..cc05c5e3901389
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/ownership/table/OwnershipTable.tsx
@@ -0,0 +1,60 @@
+import React from 'react';
+import { Empty } from 'antd';
+import { OwnershipTypeEntity } from '../../../../types.generated';
+import { StyledTable } from '../../shared/components/styled/StyledTable';
+import { NameColumn } from './NameColumn';
+import { DescriptionColumn } from './DescriptionColumn';
+import { ActionsColumn } from './ActionsColumn';
+
+type Props = {
+    ownershipTypes: OwnershipTypeEntity[];
+    setIsOpen: (isOpen: boolean) => void;
+    setOwnershipType: (ownershipType: OwnershipTypeEntity) => void;
+    refetch: () => void;
+};
+
+export const OwnershipTable = ({ ownershipTypes, setIsOpen, setOwnershipType, refetch }: Props) => {
+    const tableColumns = [
+        {
+            title: 'Name',
+            dataIndex: 'name',
+            sorter: (a: any, b: any) => a?.info?.name?.localeCompare(b?.info?.name),
+            key: 'name',
+            render: (_, record: any) => <NameColumn ownershipType={record} />,
+        },
+        {
+            title: 'Description',
+            dataIndex: 'description',
+            key: 'description',
+            render: (_, record: any) => <DescriptionColumn ownershipType={record} />,
+        },
+        {
+            dataIndex: 'actions',
+            key: 'actions',
+            render: (_, record: any) => (
+                <ActionsColumn
+                    ownershipType={record}
+                    setIsOpen={setIsOpen}
+                    setOwnershipType={setOwnershipType}
+                    refetch={refetch}
+                />
+            ),
+        },
+    ];
+
+    const getRowKey = (ownershipType: OwnershipTypeEntity) => {
+        return ownershipType?.info?.name || ownershipType.urn;
+    };
+
+    return (
+        <StyledTable
+            columns={tableColumns}
+            dataSource={ownershipTypes}
+            rowKey={getRowKey}
+            locale={{
+                emptyText: <Empty description="No Ownership Types found!" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
+            }}
+            pagination={false}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/ownership/table/types.ts b/datahub-web-react/src/app/entityV2/ownership/table/types.ts
new file mode 100644
index 00000000000000..6d7f9bdcf760b7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/ownership/table/types.ts
@@ -0,0 +1,14 @@
+/**
+ * The object represents the state of the Ownership Type Builder form.
+ */
+export interface OwnershipTypeBuilderState {
+    /**
+     * The name of the Ownership Type.
+     */
+    name: string;
+
+    /**
+     * The description of the Ownership Type.
+     */
+    description: string;
+}
diff --git a/datahub-web-react/src/app/entityV2/query/QueryEntity.tsx b/datahub-web-react/src/app/entityV2/query/QueryEntity.tsx
new file mode 100644
index 00000000000000..3cef8976b9f377
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/query/QueryEntity.tsx
@@ -0,0 +1,126 @@
+import * as React from 'react';
+import { ConsoleSqlOutlined, FileOutlined } from '@ant-design/icons';
+import { DataPlatform, EntityType, QueryEntity as Query } from '../../../types.generated';
+import { Entity, IconStyleType } from '../Entity';
+import { GenericEntityProperties } from '../../entity/shared/types';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import { EntityProfile } from '../shared/containers/profile/EntityProfile';
+import { useGetQueryQuery } from '../../../graphql/query.generated';
+import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab';
+import SidebarQueryUpdatedAtSection from '../shared/containers/profile/sidebar/Query/SidebarQueryUpdatedAtSection';
+import SidebarQueryDescriptionSection from '../shared/containers/profile/sidebar/Query/SidebarQueryDescriptionSection';
+import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+import SidebarQueryOperationsSection from '../shared/containers/profile/sidebar/Query/SidebarQueryOperationsSection';
+import SidebarQueryDefinitionSection from '../shared/containers/profile/sidebar/Query/SidebarQueryDefinitionSection';
+import { SidebarQueryLogicSection } from '../shared/containers/profile/sidebar/SidebarLogicSection';
+
+/**
+ * Definition of the DataHub DataPlatformInstance entity.
+ * Most of this still needs to be filled out.
+ */
+export class QueryEntity implements Entity<Query> {
+    type: EntityType = EntityType.Query;
+
+    icon = (fontSize?: number, _styleType?: IconStyleType, color?: string) => {
+        return (
+            <ConsoleSqlOutlined
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => false;
+
+    isBrowseEnabled = () => false;
+
+    isLineageEnabled = () => false;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getPathName = () => 'query';
+
+    getEntityName = () => 'Query';
+
+    getCollectionName = () => 'Queries';
+
+    useEntityQuery = useGetQueryQuery;
+
+    renderProfile = (urn: string) => {
+        return (
+            <EntityProfile
+                urn={urn}
+                entityType={EntityType.Query}
+                useEntityQuery={useGetQueryQuery}
+                tabs={[
+                    {
+                        name: 'Documentation',
+                        component: DocumentationTab,
+                        icon: FileOutlined,
+                    },
+                ]}
+                sidebarSections={[
+                    { component: SidebarQueryUpdatedAtSection },
+                    { component: SidebarQueryDefinitionSection },
+                    { component: SidebarQueryLogicSection },
+                    { component: SidebarQueryDescriptionSection },
+                    { component: SidebarQueryOperationsSection },
+                ]}
+                sidebarTabs={[]}
+                getOverrideProperties={() => ({})}
+            />
+        );
+    };
+
+    getOverridePropertiesFromEntity = (query?: Query | null): GenericEntityProperties => {
+        return {
+            name: query && this.displayName(query),
+            platform: query?.platform,
+        };
+    };
+
+    renderEmbeddedProfile = (_: string) => <></>;
+
+    renderPreview = () => {
+        return <></>;
+    };
+
+    renderSearch = () => {
+        return <></>;
+    };
+
+    getLineageVizConfig = (query: Query) => {
+        // TODO: Set up types better here
+        const platform: DataPlatform | undefined = (query as any)?.queryPlatform;
+        return {
+            urn: query.urn,
+            name: query.properties?.name || query.urn,
+            type: EntityType.Query,
+            icon: platform?.properties?.logoUrl || undefined,
+            platform: platform || undefined,
+        };
+    };
+
+    displayName = (data: Query) => {
+        return data?.properties?.name || (data?.properties?.source === 'SYSTEM' && 'System Query') || data?.urn;
+    };
+
+    getGenericEntityProperties = (data: Query) => {
+        return getDataForEntityType({
+            data,
+            entityType: this.type,
+            getOverrideProperties: this.getOverridePropertiesFromEntity,
+        });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([]);
+    };
+
+    getGraphName = () => {
+        return 'query';
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/schemaField/SchemaFieldEntity.tsx b/datahub-web-react/src/app/entityV2/schemaField/SchemaFieldEntity.tsx
new file mode 100644
index 00000000000000..8a0052b6b38a3d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/schemaField/SchemaFieldEntity.tsx
@@ -0,0 +1,114 @@
+import * as React from 'react';
+import TabFullsizedContext from '@src/app/shared/TabFullsizedContext';
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import { globalEntityRegistryV2 } from '@app/EntityRegistryProvider';
+import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader';
+import { LineageTab } from '@app/entityV2/shared/tabs/Lineage/LineageTab';
+import { FetchedEntity } from '@app/lineage/types';
+import { useGetSchemaFieldQuery } from '@graphql/schemaField.generated';
+import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile';
+import { downgradeV2FieldPath } from '@app/lineageV2/lineageUtils';
+import { decodeSchemaField } from '@app/lineage/utils/columnLineageUtils';
+import { PartitionOutlined, PicCenterOutlined, UnorderedListOutlined } from '@ant-design/icons';
+import { EntityType, SchemaFieldEntity as SchemaField, SearchResult } from '@types';
+
+import { Entity, IconStyleType, PreviewType } from '../Entity';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import { Preview } from './preview/Preview';
+import SidebarNotesSection from '../shared/sidebarSection/SidebarNotesSection';
+import { EntityMenuItems } from '../shared/EntityDropdown/EntityMenuActions';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
+
+const headerDropdownItems = new Set([EntityMenuItems.SHARE, EntityMenuItems.ANNOUNCE]);
+
+export class SchemaFieldEntity implements Entity<SchemaField> {
+    type: EntityType = EntityType.SchemaField;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color = 'inherit') => (
+        <PicCenterOutlined style={{ fontSize, color }} />
+    );
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => false;
+
+    isLineageEnabled = () => false;
+
+    // Currently unused.
+    getAutoCompleteFieldName = () => 'schemaField';
+
+    getPathName = () => 'schemaField';
+
+    getEntityName = () => 'Column';
+
+    getCollectionName = () => 'Columns';
+
+    useEntityQuery = useGetSchemaFieldQuery;
+
+    renderProfile = (urn: string) => (
+        <TabFullsizedContext.Provider value={{ isTabFullsize: true }}>
+            <EntityProfile
+                urn={urn}
+                entityType={EntityType.SchemaField}
+                useEntityQuery={useGetSchemaFieldQuery}
+                headerDropdownItems={headerDropdownItems}
+                tabs={[
+                    {
+                        name: 'Lineage',
+                        component: LineageTab,
+                        icon: PartitionOutlined,
+                    },
+                    {
+                        name: 'Properties',
+                        component: PropertiesTab,
+                        icon: UnorderedListOutlined,
+                    },
+                ]}
+                sidebarSections={this.getSidebarSections()}
+            />
+        </TabFullsizedContext.Provider>
+    );
+
+    getSidebarSections = () => [{ component: SidebarEntityHeader }, { component: SidebarNotesSection }];
+
+    getGraphName = () => 'schemaField';
+
+    renderPreview = (previewType: PreviewType, data: SchemaField) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <Preview
+                data={genericProperties}
+                previewType={previewType}
+                datasetUrn={data.parent.urn}
+                name={downgradeV2FieldPath(data.fieldPath) || data.urn}
+                parent={data?.parent as GenericEntityProperties}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => this.renderPreview(PreviewType.SEARCH, result.entity as SchemaField);
+
+    displayName = (data: SchemaField) => decodeSchemaField(downgradeV2FieldPath(data?.fieldPath) || '') || data.urn;
+
+    getGenericEntityProperties = (data: SchemaField): GenericEntityProperties | null =>
+        getDataForEntityType({
+            data,
+            entityType: this.type,
+            getOverrideProperties: (newData) => newData,
+        });
+
+    getLineageVizConfig = (entity: SchemaField): FetchedEntity => {
+        const parent =
+            entity.parent && globalEntityRegistryV2.getGenericEntityProperties(entity.parent.type, entity.parent);
+        return {
+            urn: entity.urn,
+            type: EntityType.SchemaField,
+            name: entity?.fieldPath,
+            expandedName: `${parent?.name}.${entity?.fieldPath}`,
+            icon: parent?.platform?.properties?.logoUrl ?? undefined,
+            parent: parent ?? undefined,
+        };
+    };
+
+    supportedCapabilities = () => new Set([]);
+}
diff --git a/datahub-web-react/src/app/entityV2/schemaField/__tests__/utils.test.ts b/datahub-web-react/src/app/entityV2/schemaField/__tests__/utils.test.ts
new file mode 100644
index 00000000000000..b61dbeb0f18af5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/schemaField/__tests__/utils.test.ts
@@ -0,0 +1,22 @@
+import { getFieldPathFromSchemaFieldUrn, getSchemaFieldParentLink, getSourceUrnFromSchemaFieldUrn } from '../utils';
+
+describe('schema field utils', () => {
+    const schemaFieldUrn =
+        'urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,long_tail_companions.adoption.pet_profiles,PROD),profile_id)';
+
+    it('should get a parent link for a schema field urn properly', () => {
+        expect(getSchemaFieldParentLink(schemaFieldUrn)).toBe(
+            '/dataset/urn:li:dataset:(urn:li:dataPlatform:snowflake,long_tail_companions.adoption.pet_profiles,PROD)/Columns?highlightedPath=profile_id',
+        );
+    });
+
+    it('should get the source urn from a schema field urn properly', () => {
+        expect(getSourceUrnFromSchemaFieldUrn(schemaFieldUrn)).toBe(
+            'urn:li:dataset:(urn:li:dataPlatform:snowflake,long_tail_companions.adoption.pet_profiles,PROD)',
+        );
+    });
+
+    it('should get the field path from a schema field urn properly', () => {
+        expect(getFieldPathFromSchemaFieldUrn(schemaFieldUrn)).toBe('profile_id');
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/schemaField/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/schemaField/preview/Preview.tsx
new file mode 100644
index 00000000000000..70d00882a9c7de
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/schemaField/preview/Preview.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+import { PicCenterOutlined } from '@ant-design/icons';
+import { GenericEntityProperties } from '@src/app/entity/shared/types';
+import { capitalizeFirstLetterOnly } from '@src/app/shared/textUtil';
+import { EntityType, Owner } from '../../../../types.generated';
+import DefaultPreviewCard from '../../../previewV2/DefaultPreviewCard';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { IconStyleType, PreviewType } from '../../Entity';
+
+export const Preview = ({
+    data,
+    datasetUrn,
+    name,
+    description,
+    owners,
+    previewType,
+    parent,
+}: {
+    data: GenericEntityProperties | null;
+    datasetUrn: string;
+    name: string;
+    description?: string | null;
+    owners?: Array<Owner> | null;
+    previewType: PreviewType;
+    parent?: GenericEntityProperties;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+
+    const url = `${entityRegistry.getEntityUrl(EntityType.Dataset, datasetUrn)}/${encodeURIComponent(
+        'Columns',
+    )}?schemaFilter=${encodeURIComponent(name)}`;
+
+    return (
+        <DefaultPreviewCard
+            data={data}
+            entityType={EntityType.SchemaField}
+            platform={parent?.platform?.properties?.displayName || capitalizeFirstLetterOnly(parent?.platform?.name)}
+            logoUrl={parent?.platform?.properties?.logoUrl || ''}
+            previewType={previewType}
+            url={url}
+            name={name ?? ''}
+            urn={datasetUrn}
+            description={description ?? ''}
+            owners={owners}
+            logoComponent={<PicCenterOutlined style={{ fontSize: '20px' }} />}
+            type="Column"
+            typeIcon={entityRegistry.getIcon(EntityType.SchemaField, 14, IconStyleType.ACCENT)}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/schemaField/utils.ts b/datahub-web-react/src/app/entityV2/schemaField/utils.ts
new file mode 100644
index 00000000000000..df74f3758f041f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/schemaField/utils.ts
@@ -0,0 +1,22 @@
+export function getSourceUrnFromSchemaFieldUrn(schemaFieldUrn: string) {
+    return schemaFieldUrn.replace('urn:li:schemaField:(', '').split(')')[0].concat(')');
+}
+
+export function getFieldPathFromSchemaFieldUrn(schemaFieldUrn: string) {
+    const val = schemaFieldUrn.replace('urn:li:schemaField:(', '').split(')')[1]?.replace(',', '') ?? '';
+    try {
+        return decodeURI(val);
+    } catch (e) {
+        return val;
+    }
+}
+
+/*
+ * Returns a link to the schemaField dataset with the field selected
+ */
+export function getSchemaFieldParentLink(schemaFieldUrn: string) {
+    const fieldPath = getFieldPathFromSchemaFieldUrn(schemaFieldUrn);
+    const parentUrn = getSourceUrnFromSchemaFieldUrn(schemaFieldUrn);
+
+    return `/dataset/${parentUrn}/Columns?highlightedPath=${fieldPath}`;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/ActorAvatar.tsx b/datahub-web-react/src/app/entityV2/shared/ActorAvatar.tsx
new file mode 100644
index 00000000000000..c6041a9383890d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/ActorAvatar.tsx
@@ -0,0 +1,112 @@
+import { Avatar } from 'antd';
+import { Tooltip } from '@components';
+import { TooltipPlacement } from 'antd/lib/tooltip';
+import React from 'react';
+import { useHistory } from 'react-router-dom';
+import styled from 'styled-components';
+import { useIsEmbeddedProfile } from '@src/app/shared/useEmbeddedProfileLinkProps';
+import defaultAvatar from '../../../images/default_avatar.png';
+import getAvatarColor from '../../shared/avatar/getAvatarColor';
+
+const AvatarStyled = styled(Avatar)<{ size?: number; $backgroundColor?: string }>`
+    color: #fff;
+    background-color: ${(props) => (props.$backgroundColor ? `${props.$backgroundColor}` : 'transparent')};
+    font-size: ${(props) => (props.size ? `${Math.max(props.size / 2.0, 10)}px` : '10px')} !important;
+    height: ${(props) => (props.size ? props.size : 20)}px;
+    width: ${(props) => (props.size ? props.size : 20)}px;
+
+    .ant-avatar-string {
+        text-align: center;
+        top: 0px;
+        line-height: ${(props) => (props.size ? props.size : 20)}px;
+    }
+    :hover {
+        cursor: pointer;
+    }
+`;
+
+type Props = {
+    url?: string;
+    photoUrl?: string;
+    useDefaultAvatar?: boolean;
+    name?: string;
+    style?: React.CSSProperties;
+    placement?: TooltipPlacement;
+    size?: number;
+    isGroup?: boolean;
+    isPolicy?: boolean;
+    isRole?: boolean;
+    hideTooltip?: boolean;
+};
+
+export default function ActorAvatar({
+    url,
+    photoUrl,
+    useDefaultAvatar,
+    name,
+    style,
+    placement,
+    size,
+    isGroup = false,
+    isPolicy = false,
+    isRole = false,
+    hideTooltip = false,
+}: Props) {
+    const history = useHistory();
+    const isEmbeddedProfile = useIsEmbeddedProfile();
+
+    const navigate = () => {
+        if (url) {
+            if (isEmbeddedProfile) window.open(url, '_blank');
+            else history.push(url);
+        }
+    };
+
+    const avatarWithInitial = name ? (
+        <AvatarStyled onClick={navigate} style={style} size={size} $backgroundColor={getAvatarColor(name)}>
+            {name.charAt(0).toUpperCase()}
+        </AvatarStyled>
+    ) : (
+        <AvatarStyled src={defaultAvatar} style={style} size={size} $backgroundColor={getAvatarColor(name)} />
+    );
+    const avatarWithDefault = useDefaultAvatar ? (
+        <AvatarStyled
+            onClick={navigate}
+            src={defaultAvatar}
+            style={style}
+            size={size}
+            $backgroundColor={getAvatarColor(name)}
+        />
+    ) : (
+        avatarWithInitial
+    );
+    const avatar =
+        photoUrl && photoUrl !== '' ? (
+            <AvatarStyled onClick={navigate} src={photoUrl} style={style} size={size} />
+        ) : (
+            avatarWithDefault
+        );
+    if (!name) {
+        return avatar;
+    }
+
+    const renderTitle = (input) => {
+        let title = `${input}`;
+        if (isGroup) {
+            title = `${title} - Group`;
+        } else if (isPolicy) {
+            title = `${title}`;
+        } else if (isRole) {
+            title = `${title} - Role`;
+        }
+        return title;
+    };
+
+    return hideTooltip ? (
+        avatar
+    ) : (
+        <Tooltip title={renderTitle(name)} placement={placement} showArrow={false}>
+            {avatar}
+        </Tooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/CreateGlossaryEntityModal.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/CreateGlossaryEntityModal.tsx
new file mode 100644
index 00000000000000..9cc9f16c80e213
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/CreateGlossaryEntityModal.tsx
@@ -0,0 +1,243 @@
+import React, { useState } from 'react';
+import styled from 'styled-components/macro';
+import { EditOutlined } from '@ant-design/icons';
+import { message, Button, Input, Modal, Typography, Form, Collapse } from 'antd';
+import DOMPurify from 'dompurify';
+import {
+    useCreateGlossaryTermMutation,
+    useCreateGlossaryNodeMutation,
+} from '../../../../graphql/glossaryTerm.generated';
+import { EntityType } from '../../../../types.generated';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import NodeParentSelect from './NodeParentSelect';
+import { useEntityData, useRefetch } from '../../../entity/shared/EntityContext';
+import analytics, { EventType } from '../../../analytics';
+import DescriptionModal from '../components/legacy/DescriptionModal';
+import { validateCustomUrnId } from '../../../shared/textUtil';
+import { useGlossaryEntityData } from '../GlossaryEntityContext';
+import { getGlossaryRootToUpdate, updateGlossarySidebar } from '../../../glossary/utils';
+
+const StyledItem = styled(Form.Item)`
+    margin-bottom: 0;
+`;
+
+const OptionalWrapper = styled.span`
+    font-weight: normal;
+`;
+
+const StyledButton = styled(Button)`
+    padding: 0;
+`;
+
+interface Props {
+    entityType: EntityType;
+    onClose: () => void;
+    refetchData?: () => void;
+    // acryl-main only prop
+    canCreateGlossaryEntity: boolean;
+    canSelectParentUrn?: boolean;
+}
+
+function CreateGlossaryEntityModal(props: Props) {
+    const { entityType, onClose, refetchData, canCreateGlossaryEntity, canSelectParentUrn = true } = props;
+    const entityData = useEntityData();
+    const { isInGlossaryContext, urnsToUpdate, setUrnsToUpdate } = useGlossaryEntityData();
+    const [form] = Form.useForm();
+    const entityRegistry = useEntityRegistry();
+    const [stagedId, setStagedId] = useState<string | undefined>(undefined);
+    const [stagedName, setStagedName] = useState('');
+    const [selectedParentUrn, setSelectedParentUrn] = useState(entityData.urn);
+    const [documentation, setDocumentation] = useState('');
+    const [isDocumentationModalVisible, setIsDocumentationModalVisible] = useState(false);
+    const [createButtonDisabled, setCreateButtonDisabled] = useState(true);
+    const refetch = useRefetch();
+
+    const [createGlossaryTermMutation] = useCreateGlossaryTermMutation();
+    const [createGlossaryNodeMutation] = useCreateGlossaryNodeMutation();
+
+    function createGlossaryEntity() {
+        const mutation =
+            entityType === EntityType.GlossaryTerm ? createGlossaryTermMutation : createGlossaryNodeMutation;
+
+        const sanitizedDescription = DOMPurify.sanitize(documentation);
+        mutation({
+            variables: {
+                input: {
+                    id: stagedId?.length ? stagedId : undefined,
+                    name: stagedName,
+                    parentNode: selectedParentUrn || null,
+                    description: sanitizedDescription || null,
+                },
+            },
+        })
+            .then(() => {
+                message.loading({ content: 'Updating...', duration: 2 });
+                setTimeout(() => {
+                    analytics.event({
+                        type: EventType.CreateGlossaryEntityEvent,
+                        entityType,
+                        parentNodeUrn: selectedParentUrn || undefined,
+                    });
+                    message.success({
+                        content: `Created ${entityRegistry.getEntityName(entityType)}!`,
+                        duration: 2,
+                    });
+                    refetch();
+                    if (isInGlossaryContext) {
+                        // either refresh this current glossary node or the root nodes or root terms
+                        const nodeToUpdate = entityData?.urn || getGlossaryRootToUpdate(entityType);
+                        updateGlossarySidebar([nodeToUpdate], urnsToUpdate, setUrnsToUpdate);
+                    }
+                    if (refetchData) {
+                        refetchData();
+                    }
+                }, 2000);
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to create: \n ${e.message || ''}`, duration: 3 });
+            });
+        onClose();
+    }
+
+    function addDocumentation(description: string) {
+        setDocumentation(description);
+        setIsDocumentationModalVisible(false);
+    }
+
+    return (
+        <Modal
+            title={`Create ${
+                !selectedParentUrn && entityType === EntityType.GlossaryNode
+                    ? 'Glossary'
+                    : entityRegistry.getEntityName(entityType)
+            }`}
+            visible
+            onCancel={onClose}
+            footer={
+                <>
+                    <Button onClick={onClose} type="text">
+                        Cancel
+                    </Button>
+                    <Button
+                        type="primary"
+                        data-testid="glossary-entity-modal-create-button"
+                        onClick={createGlossaryEntity}
+                        disabled={createButtonDisabled || !canCreateGlossaryEntity}
+                    >
+                        Create
+                    </Button>
+                </>
+            }
+        >
+            <Form
+                form={form}
+                initialValues={{
+                    parent: selectedParentUrn,
+                }}
+                layout="vertical"
+                onFieldsChange={() =>
+                    setCreateButtonDisabled(form.getFieldsError().some((field) => field.errors.length > 0))
+                }
+            >
+                <Form.Item label={<Typography.Text strong>Name</Typography.Text>}>
+                    <StyledItem
+                        data-testid="create-glossary-entity-modal-name"
+                        name="name"
+                        rules={[
+                            {
+                                required: true,
+                                message: `Enter a ${entityRegistry.getEntityName(entityType)} name.`,
+                            },
+                            { whitespace: true },
+                            { min: 1, max: 100 },
+                        ]}
+                        hasFeedback
+                    >
+                        <Input
+                            autoFocus
+                            placeholder="Provide a name..."
+                            value={stagedName}
+                            onChange={(event) => setStagedName(event.target.value)}
+                        />
+                    </StyledItem>
+                </Form.Item>
+                {canSelectParentUrn && (
+                    <Form.Item
+                        label={
+                            <Typography.Text strong>
+                                Parent <OptionalWrapper>(optional)</OptionalWrapper>
+                            </Typography.Text>
+                        }
+                    >
+                        <StyledItem name="parent">
+                            <NodeParentSelect
+                                selectedParentUrn={selectedParentUrn}
+                                setSelectedParentUrn={setSelectedParentUrn}
+                            />
+                        </StyledItem>
+                    </Form.Item>
+                )}
+
+                <StyledItem
+                    label={
+                        <Typography.Text strong>
+                            Documentation <OptionalWrapper>(optional)</OptionalWrapper>
+                        </Typography.Text>
+                    }
+                >
+                    <StyledButton type="link" onClick={() => setIsDocumentationModalVisible(true)}>
+                        <EditOutlined />
+                        {documentation ? 'Edit' : 'Add'} Documentation
+                    </StyledButton>
+                    {isDocumentationModalVisible && (
+                        <DescriptionModal
+                            title="Add Documentation"
+                            onClose={() => setIsDocumentationModalVisible(false)}
+                            onSubmit={addDocumentation}
+                            description={documentation}
+                        />
+                    )}
+                </StyledItem>
+                <Collapse ghost>
+                    <Collapse.Panel header={<Typography.Text type="secondary">Advanced</Typography.Text>} key="1">
+                        <Form.Item
+                            label={
+                                <Typography.Text strong>
+                                    {entityRegistry.getEntityName(props.entityType)} Id
+                                </Typography.Text>
+                            }
+                        >
+                            <Typography.Paragraph>
+                                By default, a random UUID will be generated to uniquely identify this entity. If
+                                you&apos;d like to provide a custom id, you may provide it here. Note that it should be
+                                unique across the entire Glossary. Be careful, you cannot easily change the id after
+                                creation.
+                            </Typography.Paragraph>
+                            <Form.Item
+                                name="id"
+                                rules={[
+                                    () => ({
+                                        validator(_, value) {
+                                            if (value && validateCustomUrnId(value)) {
+                                                return Promise.resolve();
+                                            }
+                                            return Promise.reject(new Error('Please enter a valid entity id'));
+                                        },
+                                    }),
+                                ]}
+                            >
+                                <Input
+                                    placeholder="classification"
+                                    onChange={(event) => setStagedId(event.target.value)}
+                                />
+                            </Form.Item>
+                        </Form.Item>
+                    </Collapse.Panel>
+                </Collapse>
+            </Form>
+        </Modal>
+    );
+}
+
+export default CreateGlossaryEntityModal;
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/DeleteEntityMenuAction.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/DeleteEntityMenuAction.tsx
new file mode 100644
index 00000000000000..86bccdfd30c43a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/DeleteEntityMenuAction.tsx
@@ -0,0 +1,63 @@
+import React from 'react';
+import { DeleteOutlined } from '@ant-design/icons';
+import { Tooltip } from '@components';
+import { Redirect } from 'react-router';
+import { useUserContext } from '../../../context/useUserContext';
+import { isDeleteDisabled, shouldDisplayChildDeletionWarning } from './utils';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import useDeleteEntity from './useDeleteEntity';
+import { getEntityProfileDeleteRedirectPath } from '../../../shared/deleteUtils';
+import { EntityType } from '../../../../types.generated';
+import { useEntityData } from '../../../entity/shared/EntityContext';
+import { ActionMenuItem } from './styledComponents';
+
+interface Props {
+    options?: any;
+    onDelete?: () => void;
+}
+
+export default function DeleteEntityMenuItem({ options, onDelete }: Props) {
+    const { urn, entityData, entityType } = useEntityData();
+    const me = useUserContext();
+    const entityRegistry = useEntityRegistry();
+    const isDomainEntity = entityType === EntityType.Domain;
+
+    const { onDeleteEntity, hasBeenDeleted } = useDeleteEntity(
+        urn,
+        entityType,
+        entityData,
+        onDelete,
+        options?.hideDeleteMessage,
+        options?.skipDeleteWait,
+    );
+
+    if (!entityData) return null;
+
+    /**
+     * A default path to redirect to if the entity is deleted.
+     */
+    const deleteRedirectPath = getEntityProfileDeleteRedirectPath(entityType, entityData);
+
+    return (
+        <Tooltip
+            placement="bottom"
+            title={
+                shouldDisplayChildDeletionWarning(entityType, entityData, me.platformPrivileges)
+                    ? `Can't delete ${entityRegistry.getEntityName(entityType)} with ${
+                          isDomainEntity ? 'sub-domain' : 'child'
+                      } entities.`
+                    : `Delete this ${entityRegistry.getEntityName(entityType)}`
+            }
+        >
+            <ActionMenuItem
+                key="delete"
+                disabled={isDeleteDisabled(entityType, entityData, me.platformPrivileges)}
+                onClick={onDeleteEntity}
+                data-testid="entity-menu-delete-button"
+            >
+                <DeleteOutlined style={{ display: 'flex' }} />
+            </ActionMenuItem>
+            {hasBeenDeleted && !onDelete && deleteRedirectPath && <Redirect to={deleteRedirectPath} />}
+        </Tooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/DomainParentSelect.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/DomainParentSelect.tsx
new file mode 100644
index 00000000000000..43e4eaf5791b42
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/DomainParentSelect.tsx
@@ -0,0 +1,107 @@
+import React, { MouseEvent } from 'react';
+import { Empty, Select } from 'antd';
+import { CloseCircleFilled } from '@ant-design/icons';
+import { useDomainsContext } from '@src/app/domainV2/DomainsContext';
+import { Domain, EntityType } from '../../../../types.generated';
+import domainAutocompleteOptions from '../../../domainV2/DomainAutocompleteOptions';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import ClickOutside from '../../../shared/ClickOutside';
+import { BrowserWrapper } from '../../../shared/tags/AddTagsTermsModal';
+import { ANTD_GRAY } from '../constants';
+import useParentSelector from './useParentSelector';
+import DomainNavigator from '../../../domain/nestedDomains/domainNavigator/DomainNavigator';
+
+// filter out entity itself and its children
+export function filterResultsForMove(entity: Domain, entityUrn: string) {
+    return (
+        entity.urn !== entityUrn &&
+        entity.__typename === 'Domain' &&
+        !entity.parentDomains?.domains.some((node) => node.urn === entityUrn)
+    );
+}
+
+interface Props {
+    selectedParentUrn: string;
+    setSelectedParentUrn: (parent: string) => void;
+    isMoving?: boolean;
+}
+
+export default function DomainParentSelect({ selectedParentUrn, setSelectedParentUrn, isMoving }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const { entityData } = useDomainsContext();
+    const domainUrn = entityData?.urn;
+
+    const {
+        searchResults,
+        searchQuery,
+        isFocusedOnInput,
+        selectedParentName,
+        selectParentFromBrowser,
+        onSelectParent,
+        handleSearch,
+        clearSelectedParent,
+        setIsFocusedOnInput,
+        autoCompleteResultsLoading,
+    } = useParentSelector({
+        entityType: EntityType.Domain,
+        entityData,
+        selectedParentUrn,
+        setSelectedParentUrn,
+    });
+    const domainSearchResultsFiltered =
+        isMoving && domainUrn
+            ? searchResults.filter((r) => filterResultsForMove(r as Domain, domainUrn))
+            : searchResults;
+
+    function selectDomain(domain: Domain) {
+        selectParentFromBrowser(domain.urn, entityRegistry.getDisplayName(EntityType.Domain, domain));
+    }
+
+    const isShowingDomainNavigator = !searchQuery && isFocusedOnInput;
+
+    const handleFocus = () => setIsFocusedOnInput(true);
+    const handleClickOutside = () => setIsFocusedOnInput(false);
+
+    const handleClear = (event: MouseEvent) => {
+        // Prevent, otherwise antd will close the select menu but leaves it focused
+        event.stopPropagation();
+        clearSelectedParent();
+    };
+
+    return (
+        <ClickOutside onClickOutside={handleClickOutside}>
+            <Select
+                autoFocus
+                showSearch
+                allowClear
+                clearIcon={<CloseCircleFilled onClick={handleClear} />}
+                filterOption={false}
+                defaultActiveFirstOption={false}
+                placeholder="Select"
+                value={selectedParentName}
+                onSelect={onSelectParent}
+                onSearch={handleSearch}
+                onFocus={handleFocus}
+                dropdownStyle={isShowingDomainNavigator || !searchQuery ? { display: 'none' } : {}}
+                notFoundContent={
+                    <Empty
+                        description="No Domains Found"
+                        image={Empty.PRESENTED_IMAGE_SIMPLE}
+                        style={{ color: ANTD_GRAY[7] }}
+                    />
+                }
+                options={domainAutocompleteOptions(
+                    domainSearchResultsFiltered,
+                    autoCompleteResultsLoading,
+                    entityRegistry,
+                )}
+            />
+            <BrowserWrapper isHidden={!isShowingDomainNavigator}>
+                <DomainNavigator
+                    domainUrnToHide={isMoving ? domainUrn : undefined}
+                    selectDomainOverride={selectDomain}
+                />
+            </BrowserWrapper>
+        </ClickOutside>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityDropdown.tsx
new file mode 100644
index 00000000000000..45915290ca5ca2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityDropdown.tsx
@@ -0,0 +1,389 @@
+import {
+    DeleteOutlined,
+    EditOutlined,
+    FolderAddOutlined,
+    FolderOpenOutlined,
+    LinkOutlined,
+    MoreOutlined,
+    NotificationOutlined,
+    PlusOutlined,
+    ShareAltOutlined,
+    WarningOutlined,
+} from '@ant-design/icons';
+import MoreVertOutlinedIcon from '@mui/icons-material/MoreVertOutlined';
+import { Dropdown, Menu, message } from 'antd';
+import { Tooltip } from '@components';
+import React, { useState } from 'react';
+import { Redirect, useHistory } from 'react-router';
+import styled from 'styled-components';
+import { useUpdateDeprecationMutation } from '../../../../graphql/mutations.generated';
+import { EntityType } from '../../../../types.generated';
+import { useUserContext } from '../../../context/useUserContext';
+import { getEntityProfileDeleteRedirectPath } from '../../../shared/deleteUtils';
+import ShareButtonMenu from '../../../shared/share/v2/ShareButtonMenu';
+import { useIsNestedDomainsEnabled } from '../../../useAppConfig';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import CreateEntityAnnouncementModal from '../announce/CreateEntityAnnouncementModal';
+import { MarkAsDeprecatedButtonContents } from '../components/styled/MarkAsDeprecatedButton';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../constants';
+import { getEntityPath } from '../containers/profile/utils';
+import { AddIncidentModal } from '../tabs/Incident/components/AddIncidentModal';
+import { useIsSeparateSiblingsMode } from '../useIsSeparateSiblingsMode';
+import CreateGlossaryEntityModal from './CreateGlossaryEntityModal';
+import { EntityMenuItems } from './EntityMenuActions';
+import MoveDomainModal from './MoveDomainModal';
+import MoveGlossaryEntityModal from './MoveGlossaryEntityModal';
+import { UpdateDeprecationModal } from './UpdateDeprecationModal';
+import useDeleteEntity from './useDeleteEntity';
+import { isDeleteDisabled, isMoveDisabled, shouldDisplayChildDeletionWarning } from './utils';
+
+export const MenuIcon = styled(MoreOutlined)<{ fontSize?: number }>`
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: ${(props) => props.fontSize || '24'}px;
+    height: 32px;
+    margin-left: 5px;
+`;
+
+const MenuItem = styled.div`
+    font-size: 13px;
+    font-weight: 400;
+    padding: 0 12px;
+    color: #46507b;
+    line-height: 24px;
+    display: flex;
+    align-items: center;
+    gap: 6px;
+`;
+
+export const StyledSubMenu = styled(Menu.SubMenu)`
+    .ant-dropdown-menu-submenu-title {
+        display: flex;
+        align-items: end;
+    }
+`;
+
+const StyledMoreIcon = styled(MoreVertOutlinedIcon)`
+    &&& {
+        display: flex;
+        font-size: 20px;
+        padding: 2px;
+        :hover {
+            color: ${REDESIGN_COLORS.TITLE_PURPLE};
+        }
+    }
+`;
+
+const StyledMenuItem = styled(Menu.Item)<{ disabled?: boolean }>`
+    ${(props) =>
+        props.disabled
+            ? `
+            ${MenuItem} {
+                color: ${ANTD_GRAY[7]};
+            }
+    `
+            : ''}
+`;
+
+interface Options {
+    hideDeleteMessage?: boolean;
+    skipDeleteWait?: boolean;
+}
+
+interface Props {
+    urn: string;
+    entityType: EntityType;
+    entityData?: any;
+    menuItems: Set<EntityMenuItems>;
+    options?: Options;
+    refetchForEntity?: () => void;
+    refetchForTerms?: () => void;
+    refetchForNodes?: () => void;
+    onDeleteEntity?: () => void;
+    onEditEntity?: () => void;
+    triggerType?: ('click' | 'contextMenu' | 'hover')[] | undefined;
+}
+
+const EntityDropdown = (props: Props) => {
+    const history = useHistory();
+
+    const {
+        urn,
+        entityData,
+        entityType,
+        menuItems,
+        refetchForEntity,
+        refetchForTerms,
+        refetchForNodes,
+        onDeleteEntity: onDelete,
+        onEditEntity: onEdit,
+        options,
+        triggerType = ['click'],
+    } = props;
+
+    const me = useUserContext();
+    const entityRegistry = useEntityRegistry();
+    const [updateDeprecation] = useUpdateDeprecationMutation();
+    const isHideSiblingMode = useIsSeparateSiblingsMode();
+    const isNestedDomainsEnabled = useIsNestedDomainsEnabled();
+    const { onDeleteEntity, hasBeenDeleted } = useDeleteEntity(
+        urn,
+        entityType,
+        entityData,
+        onDelete,
+        options?.hideDeleteMessage,
+        options?.skipDeleteWait,
+    );
+
+    const [isCreateTermModalVisible, setIsCreateTermModalVisible] = useState(false);
+    const [isCreateNodeModalVisible, setIsCreateNodeModalVisible] = useState(false);
+    const [isDeprecationModalVisible, setIsDeprecationModalVisible] = useState(false);
+    const [isEntityAnnouncementModalVisible, setIsEntityAnnouncementModalVisible] = useState(false);
+    const [isMoveModalVisible, setIsMoveModalVisible] = useState(false);
+    // acryl-main only
+    const [isRaiseIncidentModalVisible, setIsRaiseIncidentModalVisible] = useState(false);
+
+    const handleUpdateDeprecation = async (deprecatedStatus: boolean) => {
+        message.loading({ content: 'Updating...' });
+        try {
+            await updateDeprecation({
+                variables: {
+                    input: {
+                        urn,
+                        deprecated: deprecatedStatus,
+                        note: '',
+                        decommissionTime: null,
+                    },
+                },
+            });
+            message.destroy();
+            message.success({ content: 'Deprecation Updated', duration: 2 });
+        } catch (e: unknown) {
+            message.destroy();
+            if (e instanceof Error) {
+                message.error({ content: `Failed to update Deprecation: \n ${e.message || ''}`, duration: 2 });
+            }
+        }
+        refetchForEntity?.();
+    };
+
+    const pageUrl = window.location.href;
+    const isGlossaryEntity = entityType === EntityType.GlossaryNode || entityType === EntityType.GlossaryTerm;
+    const isDomainEntity = entityType === EntityType.Domain;
+    const canCreateGlossaryEntity = !!entityData?.privileges?.canManageChildren;
+    const isDomainMoveHidden = !isNestedDomainsEnabled && isDomainEntity;
+
+    /**
+     * A default path to redirect to if the entity is deleted.
+     */
+    const deleteRedirectPath = getEntityProfileDeleteRedirectPath(entityType, entityData);
+
+    return (
+        <>
+            <Dropdown
+                overlayStyle={{ minWidth: 150 }}
+                overlay={
+                    <Menu>
+                        {menuItems.has(EntityMenuItems.COPY_URL) && navigator.clipboard && (
+                            <Menu.Item key="0">
+                                <MenuItem
+                                    onClick={() => {
+                                        navigator.clipboard.writeText(pageUrl);
+                                        message.info('Copied URL!', 1.2);
+                                    }}
+                                >
+                                    <LinkOutlined />
+                                    &nbsp; Copy Url
+                                </MenuItem>
+                            </Menu.Item>
+                        )}
+                        {menuItems.has(EntityMenuItems.UPDATE_DEPRECATION) && (
+                            <Menu.Item key="1">
+                                {!entityData?.deprecation?.deprecated ? (
+                                    <MenuItem onClick={() => setIsDeprecationModalVisible(true)}>
+                                        <MarkAsDeprecatedButtonContents />
+                                    </MenuItem>
+                                ) : (
+                                    <MenuItem onClick={() => handleUpdateDeprecation(false)}>
+                                        <MarkAsDeprecatedButtonContents internalText="Mark as un-deprecated" />
+                                    </MenuItem>
+                                )}
+                            </Menu.Item>
+                        )}
+                        {menuItems.has(EntityMenuItems.ANNOUNCE) && (
+                            <Menu.Item key="1-1">
+                                <MenuItem onClick={() => setIsEntityAnnouncementModalVisible(true)}>
+                                    <NotificationOutlined />
+                                    &nbsp;Add Note
+                                </MenuItem>
+                            </Menu.Item>
+                        )}
+                        {menuItems.has(EntityMenuItems.ADD_TERM) && (
+                            <StyledMenuItem
+                                key="2"
+                                // can not be disabled on acryl-main due to ability to propose
+                                onClick={() => setIsCreateTermModalVisible(true)}
+                            >
+                                <MenuItem>
+                                    <PlusOutlined />
+                                    &nbsp;Add Term
+                                </MenuItem>
+                            </StyledMenuItem>
+                        )}
+                        {menuItems.has(EntityMenuItems.ADD_TERM_GROUP) && (
+                            <StyledMenuItem
+                                key="3"
+                                // can not be disabled on acryl-main due to ability to propose
+                                onClick={() => setIsCreateNodeModalVisible(true)}
+                            >
+                                <MenuItem>
+                                    <FolderAddOutlined />
+                                    &nbsp;Add Term Group
+                                </MenuItem>
+                            </StyledMenuItem>
+                        )}
+                        {!isDomainMoveHidden && menuItems.has(EntityMenuItems.MOVE) && (
+                            <StyledMenuItem
+                                data-testid="entity-menu-move-button"
+                                key="4"
+                                disabled={isMoveDisabled(entityType, entityData, me.platformPrivileges)}
+                                onClick={() => setIsMoveModalVisible(true)}
+                            >
+                                <MenuItem>
+                                    <FolderOpenOutlined /> &nbsp;Move
+                                </MenuItem>
+                            </StyledMenuItem>
+                        )}
+                        {menuItems.has(EntityMenuItems.DELETE) && (
+                            <StyledMenuItem
+                                key="5"
+                                disabled={isDeleteDisabled(entityType, entityData, me.platformPrivileges)}
+                                onClick={onDeleteEntity}
+                            >
+                                <Tooltip
+                                    title={
+                                        shouldDisplayChildDeletionWarning(entityType, entityData, me.platformPrivileges)
+                                            ? `Can't delete ${entityRegistry.getEntityName(entityType)} with ${
+                                                  isDomainEntity ? 'sub-domain' : 'child'
+                                              } entities.`
+                                            : undefined
+                                    }
+                                >
+                                    <MenuItem data-testid="entity-menu-delete-button">
+                                        <DeleteOutlined /> &nbsp;Delete
+                                    </MenuItem>
+                                </Tooltip>
+                            </StyledMenuItem>
+                        )}
+                        {menuItems.has(EntityMenuItems.EDIT) && onEdit && (
+                            <StyledMenuItem key="9" onClick={onEdit}>
+                                <MenuItem data-testid="entity-menu-edit-button">
+                                    <EditOutlined /> &nbsp;Edit
+                                </MenuItem>
+                            </StyledMenuItem>
+                        )}
+                        {menuItems.has(EntityMenuItems.RAISE_INCIDENT) && (
+                            <StyledMenuItem key="6" disabled={false}>
+                                <MenuItem onClick={() => setIsRaiseIncidentModalVisible(true)}>
+                                    <WarningOutlined /> &nbsp;Raise Incident
+                                </MenuItem>
+                            </StyledMenuItem>
+                        )}
+                        {menuItems.has(EntityMenuItems.SHARE) && (
+                            <StyledSubMenu
+                                key="8"
+                                disabled={false}
+                                title={
+                                    <MenuItem>
+                                        <ShareAltOutlined /> &nbsp;Share
+                                    </MenuItem>
+                                }
+                            >
+                                <ShareButtonMenu
+                                    urn={urn}
+                                    entityType={entityType}
+                                    subType={
+                                        (entityData?.subTypes?.typeNames?.length &&
+                                            entityData?.subTypes?.typeNames?.[0]) ||
+                                        undefined
+                                    }
+                                    name={entityData?.name}
+                                />
+                            </StyledSubMenu>
+                        )}{' '}
+                    </Menu>
+                }
+                trigger={triggerType}
+            >
+                <StyledMoreIcon />
+            </Dropdown>
+            {isCreateTermModalVisible && (
+                <CreateGlossaryEntityModal
+                    entityType={EntityType.GlossaryTerm}
+                    canCreateGlossaryEntity={canCreateGlossaryEntity}
+                    onClose={() => setIsCreateTermModalVisible(false)}
+                    refetchData={refetchForTerms}
+                />
+            )}
+            {isCreateNodeModalVisible && (
+                <CreateGlossaryEntityModal
+                    entityType={EntityType.GlossaryNode}
+                    canCreateGlossaryEntity={canCreateGlossaryEntity}
+                    onClose={() => setIsCreateNodeModalVisible(false)}
+                    refetchData={refetchForNodes}
+                />
+            )}
+            {isDeprecationModalVisible && (
+                <UpdateDeprecationModal
+                    urns={[urn]}
+                    onClose={() => setIsDeprecationModalVisible(false)}
+                    refetch={refetchForEntity}
+                />
+            )}
+            {isEntityAnnouncementModalVisible && (
+                <CreateEntityAnnouncementModal
+                    urn={urn}
+                    onClose={() => setIsEntityAnnouncementModalVisible(false)}
+                    onCreate={() => setTimeout(() => refetchForEntity?.(), 2000)}
+                />
+            )}
+            {isMoveModalVisible && isGlossaryEntity && (
+                <MoveGlossaryEntityModal
+                    entityData={entityData}
+                    urn={urn}
+                    entityType={entityType}
+                    onClose={() => setIsMoveModalVisible(false)}
+                />
+            )}
+            {isMoveModalVisible && isDomainEntity && <MoveDomainModal onClose={() => setIsMoveModalVisible(false)} />}
+            {hasBeenDeleted && !onDelete && deleteRedirectPath && <Redirect to={deleteRedirectPath} />}
+            {/* acryl-main only */}
+            {isRaiseIncidentModalVisible && (
+                <AddIncidentModal
+                    urn={urn}
+                    entityType={entityType}
+                    visible={isRaiseIncidentModalVisible}
+                    onClose={() => setIsRaiseIncidentModalVisible(false)}
+                    refetch={
+                        (() => {
+                            refetchForEntity?.();
+                            history.push(
+                                `${getEntityPath(
+                                    entityType,
+                                    urn,
+                                    entityRegistry,
+                                    false,
+                                    isHideSiblingMode,
+                                    'Incidents',
+                                )}`,
+                            );
+                        }) as any
+                    }
+                />
+            )}
+        </>
+    );
+};
+
+export default EntityDropdown;
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx
new file mode 100644
index 00000000000000..116dd47caaa0e9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx
@@ -0,0 +1,97 @@
+import { MoreOutlined } from '@ant-design/icons';
+import React, { useContext } from 'react';
+import styled from 'styled-components';
+import { useEntityData, useRefetch } from '../../../entity/shared/EntityContext';
+import { ENTITY_PROFILE_V2_SUBSCRIPTION_ID } from '../../../onboarding/configV2/EntityProfileOnboardingConfig';
+import ShareMenuAction from '../../../shared/share/v2/ShareMenuAction';
+import EntitySidebarContext from '../../../sharedV2/EntitySidebarContext';
+import DeleteEntityMenuItem from './DeleteEntityMenuAction';
+import ExternalUrlMenuAction from './ExternalUrlMenuAction';
+import MoreOptionsMenuAction from './MoreOptionsMenuAction';
+import MoveEntityMenuAction from './MoveEntityMenuAction';
+import RaiseIncidentMenuAction from './RaiseIncidentMenuAction';
+import UpdateDeprecationMenuAction from './UpdateDeprecationMenuAction';
+
+export enum EntityMenuItems {
+    EXTERNAL_URL,
+    SHARE,
+    COPY_URL,
+    UPDATE_DEPRECATION,
+    ADD_TERM, // Make primary
+    ADD_TERM_GROUP, // Make primary
+    MOVE,
+    DELETE, // acryl-main only
+    EDIT, // acryl-main only
+    ANNOUNCE, // acryl-main only
+    RAISE_INCIDENT,
+}
+
+export const MenuIcon = styled(MoreOutlined)<{ fontSize?: number }>`
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: ${(props) => props.fontSize || '24'}px;
+    height: 32px;
+    margin-left: 5px;
+`;
+
+const MenuItems = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: end;
+`;
+
+const MoreOptionsContainer = styled.div``;
+
+export interface Options {
+    hideDeleteMessage?: boolean;
+    skipDeleteWait?: boolean;
+}
+
+interface Props {
+    menuItems: Set<EntityMenuItems>;
+    options?: Options;
+    onDeleteEntity?: () => void;
+}
+
+function EntityMenuActions(props: Props) {
+    const { menuItems, onDeleteEntity: onDelete, options } = props;
+
+    const { isClosed } = useContext(EntitySidebarContext);
+
+    const { urn, entityType, entityData } = useEntityData();
+
+    const refetch = useRefetch();
+
+    return (
+        <>
+            {isClosed ? (
+                <MenuItems>
+                    {menuItems.has(EntityMenuItems.EXTERNAL_URL) && <ExternalUrlMenuAction />}
+                    {menuItems.has(EntityMenuItems.MOVE) && <MoveEntityMenuAction />}
+                    {menuItems.has(EntityMenuItems.SHARE) && <ShareMenuAction />}
+                    {menuItems.has(EntityMenuItems.UPDATE_DEPRECATION) && <UpdateDeprecationMenuAction />}
+                    {menuItems.has(EntityMenuItems.DELETE) && (
+                        <DeleteEntityMenuItem onDelete={onDelete} options={options} />
+                    )}
+                    {menuItems.has(EntityMenuItems.RAISE_INCIDENT) && <RaiseIncidentMenuAction />}{' '}
+                </MenuItems>
+            ) : (
+                <MenuItems>
+                    {menuItems.has(EntityMenuItems.EXTERNAL_URL) && <ExternalUrlMenuAction />}
+                    <MoreOptionsContainer id={ENTITY_PROFILE_V2_SUBSCRIPTION_ID}>
+                        <MoreOptionsMenuAction
+                            menuItems={menuItems}
+                            urn={urn}
+                            entityType={entityType}
+                            entityData={entityData}
+                            refetch={refetch}
+                        />
+                    </MoreOptionsContainer>
+                </MenuItems>
+            )}
+        </>
+    );
+}
+
+export default EntityMenuActions;
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/ExternalUrlMenuAction.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/ExternalUrlMenuAction.tsx
new file mode 100644
index 00000000000000..e0841a61a622a5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/ExternalUrlMenuAction.tsx
@@ -0,0 +1,9 @@
+import ViewInPlatform from '@app/entityV2/shared/externalUrl/ViewInPlatform';
+import React from 'react';
+import { useEntityData } from '@src/app/entity/shared/EntityContext';
+
+export default function ExternalUrlMenuAction() {
+    const { urn: entityUrn, entityData } = useEntityData();
+
+    return <ViewInPlatform urn={entityUrn} data={entityData} />;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoreOptionsMenuAction.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoreOptionsMenuAction.tsx
new file mode 100644
index 00000000000000..38781c63a229de
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoreOptionsMenuAction.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import { ActionMenuItem } from './styledComponents';
+import { EntityMenuItems } from './EntityMenuActions';
+import EntityDropdown from './EntityDropdown';
+import { EntityType } from '../../../../types.generated';
+import { EntityMenuActions } from '../../Entity';
+
+interface Props {
+    menuItems: Set<EntityMenuItems>;
+    urn: string;
+    entityType: EntityType;
+    entityData?: any;
+    refetch?: () => void;
+    size?: number;
+    triggerType?: ('click' | 'contextMenu' | 'hover')[] | undefined;
+    actions?: EntityMenuActions;
+}
+
+export default function MoreOptionsMenuAction({
+    menuItems,
+    urn,
+    entityType,
+    entityData,
+    refetch,
+    size,
+    triggerType,
+    actions,
+}: Props) {
+    return (
+        <ActionMenuItem key="view-more" fontSize={size} excludeMargin>
+            <EntityDropdown
+                urn={urn}
+                entityType={entityType}
+                entityData={entityData}
+                menuItems={menuItems}
+                refetchForEntity={refetch}
+                triggerType={triggerType}
+                onEditEntity={actions?.onEdit}
+                onDeleteEntity={actions?.onDelete}
+            />
+        </ActionMenuItem>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveDomainModal.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveDomainModal.tsx
new file mode 100644
index 00000000000000..9cbaea99829a5d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveDomainModal.tsx
@@ -0,0 +1,105 @@
+import React, { useState } from 'react';
+import styled from 'styled-components/macro';
+import { message, Button, Modal, Typography, Form } from 'antd';
+import { useRefetch } from '../../../entity/shared/EntityContext';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { useMoveDomainMutation } from '../../../../graphql/domain.generated';
+import DomainParentSelect from './DomainParentSelect';
+import { useHandleMoveDomainComplete } from './useHandleMoveDomainComplete';
+import { EntityType } from '../../../../types.generated';
+import { useDomainsContext } from '../../../domainV2/DomainsContext';
+
+const StyledItem = styled(Form.Item)`
+    margin-bottom: 0;
+`;
+
+const OptionalWrapper = styled.span`
+    font-weight: normal;
+`;
+
+interface Props {
+    onClose: () => void;
+}
+
+function MoveDomainModal(props: Props) {
+    const { onClose } = props;
+    const { entityData } = useDomainsContext();
+    const domainUrn = entityData?.urn;
+    const [form] = Form.useForm();
+    const entityRegistry = useEntityRegistry();
+    const [selectedParentUrn, setSelectedParentUrn] = useState('');
+    const refetch = useRefetch();
+
+    const [moveDomainMutation] = useMoveDomainMutation();
+
+    const { handleMoveDomainComplete } = useHandleMoveDomainComplete();
+
+    function moveDomain() {
+        if (!domainUrn) return;
+
+        moveDomainMutation({
+            variables: {
+                input: {
+                    resourceUrn: domainUrn,
+                    parentDomain: selectedParentUrn || undefined,
+                },
+            },
+        })
+            .then(() => {
+                message.loading({ content: 'Updating...', duration: 2 });
+                const newParentToUpdate = selectedParentUrn || undefined;
+                handleMoveDomainComplete(domainUrn, newParentToUpdate);
+                setTimeout(() => {
+                    message.success({
+                        content: `Moved ${entityRegistry.getEntityName(EntityType.Domain)}!`,
+                        duration: 2,
+                    });
+                    refetch();
+                }, 2000);
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to move: \n ${e.message || ''}`, duration: 3 });
+            });
+        onClose();
+    }
+
+    return (
+        <Modal
+            title="Move Domain"
+            data-testid="move-domain-modal"
+            visible
+            onCancel={onClose}
+            footer={
+                <>
+                    <Button onClick={onClose} type="text">
+                        Cancel
+                    </Button>
+                    <Button type="primary" onClick={moveDomain} data-testid="move-domain-modal-move-button">
+                        Move
+                    </Button>
+                </>
+            }
+        >
+            <Form form={form} initialValues={{}} layout="vertical">
+                <Form.Item
+                    label={
+                        <Typography.Text strong>
+                            Move To <OptionalWrapper>(optional)</OptionalWrapper>
+                        </Typography.Text>
+                    }
+                >
+                    <StyledItem name="parent">
+                        <DomainParentSelect
+                            selectedParentUrn={selectedParentUrn}
+                            setSelectedParentUrn={setSelectedParentUrn}
+                            isMoving
+                        />
+                    </StyledItem>
+                </Form.Item>
+            </Form>
+        </Modal>
+    );
+}
+
+export default MoveDomainModal;
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveEntityMenuAction.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveEntityMenuAction.tsx
new file mode 100644
index 00000000000000..ddc61fd676cd10
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveEntityMenuAction.tsx
@@ -0,0 +1,49 @@
+import React, { useState } from 'react';
+import { FolderOpenOutlined } from '@ant-design/icons';
+import { Tooltip } from '@components';
+import { useUserContext } from '../../../context/useUserContext';
+import MoveGlossaryEntityModal from './MoveGlossaryEntityModal';
+import MoveDomainModal from './MoveDomainModal';
+import { useIsNestedDomainsEnabled } from '../../../useAppConfig';
+import { isMoveDisabled } from './utils';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { EntityType } from '../../../../types.generated';
+import { useEntityData } from '../../../entity/shared/EntityContext';
+import { ActionMenuItem } from './styledComponents';
+
+export default function MoveEntityMenuAction() {
+    const { entityData, entityType, urn } = useEntityData();
+    const me = useUserContext();
+    const entityRegistry = useEntityRegistry();
+    const isNestedDomainsEnabled = useIsNestedDomainsEnabled();
+    const [isMoveModalVisible, setIsMoveModalVisible] = useState(false);
+    const isGlossaryEntity = entityType === EntityType.GlossaryNode || entityType === EntityType.GlossaryTerm;
+    const isDomainEntity = entityType === EntityType.Domain;
+    const isDomainMoveHidden = !isNestedDomainsEnabled && isDomainEntity;
+
+    if (isDomainMoveHidden) {
+        return null;
+    }
+
+    return (
+        <Tooltip placement="bottom" title={`Move this ${entityRegistry.getEntityName(entityType)}`} showArrow={false}>
+            <ActionMenuItem
+                key="move"
+                disabled={isMoveDisabled(entityType, entityData, me.platformPrivileges)}
+                onClick={() => setIsMoveModalVisible(true)}
+                data-testid="entity-menu-move-button"
+            >
+                <FolderOpenOutlined style={{ display: 'flex' }} />
+            </ActionMenuItem>
+            {isMoveModalVisible && isGlossaryEntity && (
+                <MoveGlossaryEntityModal
+                    entityData={entityData}
+                    entityType={entityType}
+                    urn={urn}
+                    onClose={() => setIsMoveModalVisible(false)}
+                />
+            )}
+            {isMoveModalVisible && isDomainEntity && <MoveDomainModal onClose={() => setIsMoveModalVisible(false)} />}
+        </Tooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveGlossaryEntityModal.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveGlossaryEntityModal.tsx
new file mode 100644
index 00000000000000..71723f7fa871b9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoveGlossaryEntityModal.tsx
@@ -0,0 +1,106 @@
+import React, { useState } from 'react';
+import styled from 'styled-components/macro';
+import { message, Button, Modal, Typography, Form } from 'antd';
+import { useRefetch } from '../../../entity/shared/EntityContext';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { useUpdateParentNodeMutation } from '../../../../graphql/glossary.generated';
+import NodeParentSelect from './NodeParentSelect';
+import { useGlossaryEntityData } from '../GlossaryEntityContext';
+import { getGlossaryRootToUpdate, getParentNodeToUpdate, updateGlossarySidebar } from '../../../glossary/utils';
+import { GenericEntityProperties } from '../../../entity/shared/types';
+import { EntityType } from '../../../../types.generated';
+
+const StyledItem = styled(Form.Item)`
+    margin-bottom: 0;
+`;
+
+const OptionalWrapper = styled.span`
+    font-weight: normal;
+`;
+
+interface Props {
+    entityData: GenericEntityProperties | null;
+    entityType: EntityType;
+    urn: string;
+    onClose: () => void;
+}
+
+function MoveGlossaryEntityModal({ onClose, urn, entityData, entityType }: Props) {
+    const { isInGlossaryContext, urnsToUpdate, setUrnsToUpdate } = useGlossaryEntityData();
+    const [form] = Form.useForm();
+    const entityRegistry = useEntityRegistry();
+    const [selectedParentUrn, setSelectedParentUrn] = useState('');
+    const refetch = useRefetch();
+
+    const [updateParentNode] = useUpdateParentNodeMutation();
+
+    function moveGlossaryEntity() {
+        updateParentNode({
+            variables: {
+                input: {
+                    resourceUrn: urn,
+                    parentNode: selectedParentUrn || null,
+                },
+            },
+        })
+            .then(() => {
+                message.loading({ content: 'Updating...', duration: 2 });
+                setTimeout(() => {
+                    message.success({
+                        content: `Moved ${entityRegistry.getEntityName(entityType)}!`,
+                        duration: 2,
+                    });
+                    refetch();
+                    if (isInGlossaryContext) {
+                        const oldParentToUpdate = getParentNodeToUpdate(entityData, entityType);
+                        const newParentToUpdate = selectedParentUrn || getGlossaryRootToUpdate(entityType);
+                        updateGlossarySidebar([oldParentToUpdate, newParentToUpdate], urnsToUpdate, setUrnsToUpdate);
+                    }
+                }, 2000);
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to move: \n ${e.message || ''}`, duration: 3 });
+            });
+        onClose();
+    }
+
+    return (
+        <Modal
+            data-testid="move-glossary-entity-modal"
+            title={`Move ${entityType === EntityType.GlossaryNode ? 'Term Group' : 'Term'}`}
+            visible
+            onCancel={onClose}
+            footer={
+                <>
+                    <Button onClick={onClose} type="text">
+                        Cancel
+                    </Button>
+                    <Button type="primary" onClick={moveGlossaryEntity} data-testid="glossary-entity-modal-move-button">
+                        Move
+                    </Button>
+                </>
+            }
+        >
+            <Form form={form} initialValues={{}} layout="vertical">
+                <Form.Item
+                    label={
+                        <Typography.Text strong>
+                            Move To <OptionalWrapper>(optional)</OptionalWrapper>
+                        </Typography.Text>
+                    }
+                >
+                    <StyledItem name="parent">
+                        <NodeParentSelect
+                            selectedParentUrn={selectedParentUrn}
+                            setSelectedParentUrn={setSelectedParentUrn}
+                            isMoving
+                        />
+                    </StyledItem>
+                </Form.Item>
+            </Form>
+        </Modal>
+    );
+}
+
+export default MoveGlossaryEntityModal;
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/NodeParentSelect.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/NodeParentSelect.tsx
new file mode 100644
index 00000000000000..efa0bc0bb9bd9b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/NodeParentSelect.tsx
@@ -0,0 +1,86 @@
+import React from 'react';
+import { Select } from 'antd';
+import { EntityType, GlossaryNode } from '../../../../types.generated';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { useEntityData } from '../../../entity/shared/EntityContext';
+import ClickOutside from '../../../shared/ClickOutside';
+import GlossaryBrowser from '../../../glossary/GlossaryBrowser/GlossaryBrowser';
+import { BrowserWrapper } from '../../../shared/tags/AddTagsTermsModal';
+import useParentSelector from './useParentSelector';
+
+// filter out entity itself and its children
+export function filterResultsForMove(entity: GlossaryNode, entityUrn: string) {
+    return (
+        entity.urn !== entityUrn &&
+        entity.__typename === 'GlossaryNode' &&
+        !entity.parentNodes?.nodes.some((node) => node.urn === entityUrn)
+    );
+}
+
+interface Props {
+    selectedParentUrn: string;
+    setSelectedParentUrn: (parent: string) => void;
+    isMoving?: boolean;
+}
+
+function NodeParentSelect(props: Props) {
+    const { selectedParentUrn, setSelectedParentUrn, isMoving } = props;
+    const entityRegistry = useEntityRegistry();
+    const { entityData, urn: entityDataUrn, entityType } = useEntityData();
+
+    const {
+        searchResults,
+        searchQuery,
+        isFocusedOnInput,
+        selectedParentName,
+        selectParentFromBrowser,
+        onSelectParent,
+        handleSearch,
+        clearSelectedParent,
+        setIsFocusedOnInput,
+    } = useParentSelector({
+        entityType: EntityType.GlossaryNode,
+        entityData,
+        selectedParentUrn,
+        setSelectedParentUrn,
+    });
+
+    const nodeSearchResults = isMoving
+        ? searchResults.filter((r) => filterResultsForMove(r as GlossaryNode, entityDataUrn))
+        : searchResults;
+
+    const isShowingGlossaryBrowser = !searchQuery && isFocusedOnInput;
+    const shouldHideSelf = isMoving && entityType === EntityType.GlossaryNode;
+
+    return (
+        <ClickOutside onClickOutside={() => setIsFocusedOnInput(false)}>
+            <Select
+                showSearch
+                allowClear
+                filterOption={false}
+                value={selectedParentName}
+                onSelect={onSelectParent}
+                onSearch={handleSearch}
+                onClear={clearSelectedParent}
+                onFocus={() => setIsFocusedOnInput(true)}
+                dropdownStyle={isShowingGlossaryBrowser || !searchQuery ? { display: 'none' } : {}}
+            >
+                {nodeSearchResults?.map((result) => (
+                    <Select.Option key={result?.urn} value={result.urn}>
+                        {entityRegistry.getDisplayName(result.type, result)}
+                    </Select.Option>
+                ))}
+            </Select>
+            <BrowserWrapper isHidden={!isShowingGlossaryBrowser}>
+                <GlossaryBrowser
+                    isSelecting
+                    hideTerms
+                    selectNode={selectParentFromBrowser}
+                    nodeUrnToHide={shouldHideSelf ? entityData?.urn : undefined}
+                />
+            </BrowserWrapper>
+        </ClickOutside>
+    );
+}
+
+export default NodeParentSelect;
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/RaiseIncidentMenuAction.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/RaiseIncidentMenuAction.tsx
new file mode 100644
index 00000000000000..f78b57e178a2ee
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/RaiseIncidentMenuAction.tsx
@@ -0,0 +1,50 @@
+import React, { useState } from 'react';
+import { WarningOutlined } from '@ant-design/icons';
+import { Tooltip } from '@components';
+import { useHistory } from 'react-router';
+import { useEntityData, useRefetch } from '../../../entity/shared/EntityContext';
+import { ActionMenuItem } from './styledComponents';
+import { AddIncidentModal } from '../tabs/Incident/components/AddIncidentModal';
+import { getEntityPath } from '../containers/profile/utils';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { useIsSeparateSiblingsMode } from '../useIsSeparateSiblingsMode';
+
+export default function RaiseIncidentMenuAction() {
+    const { urn, entityType } = useEntityData();
+    const refetchForEntity = useRefetch();
+    const history = useHistory();
+    const entityRegistry = useEntityRegistry();
+    const isHideSiblingMode = useIsSeparateSiblingsMode();
+    const [isRaiseIncidentModalVisible, setIsRaiseIncidentModalVisible] = useState(false);
+
+    return (
+        <Tooltip placement="bottom" title="Raise an incident">
+            <ActionMenuItem key="incident" disabled={false} onClick={() => setIsRaiseIncidentModalVisible(true)}>
+                <WarningOutlined style={{ display: 'flex' }} />
+            </ActionMenuItem>
+            {isRaiseIncidentModalVisible && (
+                <AddIncidentModal
+                    urn={urn}
+                    entityType={entityType}
+                    visible={isRaiseIncidentModalVisible}
+                    onClose={() => setIsRaiseIncidentModalVisible(false)}
+                    refetch={
+                        (() => {
+                            refetchForEntity?.();
+                            history.push(
+                                `${getEntityPath(
+                                    entityType,
+                                    urn,
+                                    entityRegistry,
+                                    false,
+                                    isHideSiblingMode,
+                                    'Incidents',
+                                )}`,
+                            );
+                        }) as any
+                    }
+                />
+            )}
+        </Tooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/UpdateDeprecationMenuAction.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/UpdateDeprecationMenuAction.tsx
new file mode 100644
index 00000000000000..5e8eb11bb88fee
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/UpdateDeprecationMenuAction.tsx
@@ -0,0 +1,71 @@
+import React, { useState } from 'react';
+import { ExclamationCircleOutlined } from '@ant-design/icons';
+import { message } from 'antd';
+import { Tooltip } from '@components';
+import { useEntityData, useRefetch } from '../../../entity/shared/EntityContext';
+import { ActionMenuItem } from './styledComponents';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { UpdateDeprecationModal } from './UpdateDeprecationModal';
+import { useUpdateDeprecationMutation } from '../../../../graphql/mutations.generated';
+
+export default function UpdateDeprecationMenuAction() {
+    const { urn, entityData, entityType } = useEntityData();
+    const refetchForEntity = useRefetch();
+    const [isDeprecationModalVisible, setIsDeprecationModalVisible] = useState(false);
+    const entityRegistry = useEntityRegistry();
+    const [updateDeprecation] = useUpdateDeprecationMutation();
+
+    const handleUpdateDeprecation = async (deprecatedStatus: boolean) => {
+        message.loading({ content: 'Updating...' });
+        try {
+            await updateDeprecation({
+                variables: {
+                    input: {
+                        urn,
+                        deprecated: deprecatedStatus,
+                        note: '',
+                        decommissionTime: null,
+                    },
+                },
+            });
+            message.destroy();
+            message.success({ content: 'Deprecation Updated', duration: 2 });
+        } catch (e: unknown) {
+            message.destroy();
+            if (e instanceof Error) {
+                message.error({ content: `Failed to update Deprecation: \n ${e.message || ''}`, duration: 2 });
+            }
+        }
+        refetchForEntity?.();
+    };
+
+    return (
+        <Tooltip
+            placement="bottom"
+            title={
+                !entityData?.deprecation?.deprecated
+                    ? `Mark this ${entityRegistry.getEntityName(entityType)} as deprecated`
+                    : `Mark this ${entityRegistry.getEntityName(entityType)} as un-deprecated`
+            }
+        >
+            <ActionMenuItem
+                key="deprecation"
+                onClick={() =>
+                    !entityData?.deprecation?.deprecated
+                        ? setIsDeprecationModalVisible(true)
+                        : handleUpdateDeprecation(false)
+                }
+                data-testid="entity-menu-deprecate-button"
+            >
+                <ExclamationCircleOutlined style={{ display: 'flex' }} />
+            </ActionMenuItem>
+            {isDeprecationModalVisible && (
+                <UpdateDeprecationModal
+                    urns={[urn]}
+                    onClose={() => setIsDeprecationModalVisible(false)}
+                    refetch={refetchForEntity}
+                />
+            )}
+        </Tooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/UpdateDeprecationModal.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/UpdateDeprecationModal.tsx
new file mode 100644
index 00000000000000..fabb2be584a294
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/UpdateDeprecationModal.tsx
@@ -0,0 +1,188 @@
+import { Button, DatePicker, Form, message, Modal, Select, Skeleton } from 'antd';
+import TextArea from 'antd/lib/input/TextArea';
+import dayjs from 'dayjs';
+import React from 'react';
+import { useGetEntitiesQuery } from '../../../../graphql/entity.generated';
+import { useBatchUpdateDeprecationMutation } from '../../../../graphql/mutations.generated';
+import { ResourceRefInput, SubResourceType } from '../../../../types.generated';
+import { EntityLink } from '../../../homeV2/reference/sections/EntityLink';
+import { getV1FieldPathFromSchemaFieldUrn } from '../../../lineageV2/lineageUtils';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { downgradeV2FieldPath } from '../../dataset/profile/schema/utils/utils';
+import { EntityCapabilityType } from '../../Entity';
+import { SearchSelectModal } from '../components/styled/search/SearchSelectModal';
+import { useGetEntityWithSchema } from '../tabs/Dataset/Schema/useGetEntitySchema';
+import { generateSchemaFieldUrn } from '../tabs/Lineage/utils';
+import { handleBatchError } from '../utils';
+
+type Props = {
+    urns: string[];
+    // if you need to provide context for subresources, resourceRefs should be provided and will take precedence over urns
+    resourceRefs?: ResourceRefInput[];
+    onClose: () => void;
+    refetch?: () => void;
+    zIndexOverride?: number;
+};
+
+const SCHEMA_FIELD_PREFIX = 'urn:li:schemaField:';
+
+export const UpdateDeprecationModal = ({ urns, resourceRefs, onClose, refetch, zIndexOverride }: Props) => {
+    const { entityWithSchema } = useGetEntityWithSchema();
+    const schemaMetadata: any = entityWithSchema?.schemaMetadata || undefined;
+
+    const [batchUpdateDeprecation] = useBatchUpdateDeprecationMutation();
+    const [isReplacementModalVisible, setIsReplacementModalVisible] = React.useState(false);
+    const [replacementUrn, setReplacementUrn] = React.useState<string | null>(null);
+    const entityRegistry = useEntityRegistry();
+
+    const isDeprecatingFields =
+        !!resourceRefs && resourceRefs.length > 0 && resourceRefs[0].subResourceType === SubResourceType.DatasetField;
+    const resourceFromWhichReplacementIsSelected = resourceRefs?.[0]?.resourceUrn;
+
+    const { data: replacementData, loading: replacementLoading } = useGetEntitiesQuery({
+        variables: {
+            urns: [replacementUrn || ''],
+        },
+        skip: !replacementUrn || replacementUrn?.startsWith(SCHEMA_FIELD_PREFIX),
+    });
+
+    const [form] = Form.useForm();
+
+    const handleClose = () => {
+        form.resetFields();
+        onClose();
+    };
+
+    const handleOk = async (formData: any) => {
+        message.loading({ content: 'Updating...' });
+        try {
+            await batchUpdateDeprecation({
+                variables: {
+                    input: {
+                        resources: resourceRefs || urns.map((resourceUrn) => ({ resourceUrn })),
+                        deprecated: true,
+                        note: formData.note,
+                        decommissionTime: formData.decommissionTime && formData.decommissionTime.unix() * 1000,
+                        replacement: replacementUrn,
+                    },
+                },
+            });
+            message.destroy();
+            message.success({ content: 'Deprecation Updated', duration: 2 });
+        } catch (e: unknown) {
+            message.destroy();
+            if (e instanceof Error) {
+                message.error(
+                    handleBatchError(urns, e, {
+                        content: `Failed to update Deprecation: \n ${e.message || ''}`,
+                        duration: 2,
+                    }),
+                );
+            }
+        }
+        refetch?.();
+        handleClose();
+    };
+
+    return (
+        <Modal
+            title="Set as Deprecated"
+            zIndex={zIndexOverride ?? 10}
+            visible
+            onCancel={handleClose}
+            keyboard
+            footer={
+                <>
+                    <Button onClick={handleClose} type="text">
+                        Cancel
+                    </Button>
+                    <Button type="primary" data-testid="add" form="addDeprecationForm" key="submit" htmlType="submit">
+                        Save
+                    </Button>
+                </>
+            }
+        >
+            <Form form={form} name="addDeprecationForm" onFinish={handleOk} layout="vertical">
+                <Form.Item name="note" label="Reason" rules={[{ whitespace: true }, { min: 0, max: 1000 }]}>
+                    <TextArea placeholder="Add Reason" autoFocus rows={4} />
+                </Form.Item>
+                <Form.Item name="decommissionTime" label="Decommission Date" initialValue={dayjs()}>
+                    {/* @ts-expect-error dayjs type mismatch with DatePicker defaultValue */}
+                    <DatePicker style={{ width: '100%' }} defaultValue={dayjs()} />
+                </Form.Item>
+                <Form.Item name="replacement" label="Replacement">
+                    {isReplacementModalVisible && !isDeprecatingFields && (
+                        <SearchSelectModal
+                            limit={1}
+                            titleText="Select one entity to replace the deprecated entity with."
+                            continueText="Set Replacement"
+                            onContinue={(entityUrns) => {
+                                if (entityUrns.length > 0) {
+                                    setReplacementUrn(entityUrns[0]);
+                                }
+                                setIsReplacementModalVisible(false);
+                            }}
+                            onCancel={() => setIsReplacementModalVisible(false)}
+                            fixedEntityTypes={Array.from(
+                                entityRegistry.getTypesWithSupportedCapabilities(EntityCapabilityType.DEPRECATION),
+                            )}
+                        />
+                    )}
+                    {isReplacementModalVisible && isDeprecatingFields && (
+                        <Modal
+                            open
+                            title="Select Replacement"
+                            onCancel={() => setIsReplacementModalVisible(false)}
+                            onOk={() => setIsReplacementModalVisible(false)}
+                        >
+                            <Select
+                                style={{ width: 250 }}
+                                dropdownMatchSelectWidth
+                                placeholder="Select Replacement"
+                                onChange={(value) =>
+                                    setReplacementUrn(
+                                        generateSchemaFieldUrn(value, resourceFromWhichReplacementIsSelected || ''),
+                                    )
+                                }
+                            >
+                                {schemaMetadata?.fields?.map((field: any) => (
+                                    <Select.Option key={field.fieldPath} value={field.fieldPath}>
+                                        {downgradeV2FieldPath(field.fieldPath)}
+                                    </Select.Option>
+                                ))}
+                            </Select>
+                        </Modal>
+                    )}
+                    {replacementUrn && replacementLoading && <Skeleton />}
+                    {replacementUrn && !replacementLoading && !!replacementData?.entities?.[0] && (
+                        <EntityLink
+                            onClick={() => {
+                                setIsReplacementModalVisible(true);
+                            }}
+                            entity={replacementData?.entities?.[0] as any}
+                        />
+                    )}
+                    {replacementUrn && isDeprecatingFields && (
+                        <Button
+                            type="text"
+                            style={{
+                                padding: 5,
+                                marginLeft: -5,
+                            }}
+                            onClick={() => {
+                                setIsReplacementModalVisible(true);
+                            }}
+                        >
+                            {getV1FieldPathFromSchemaFieldUrn(replacementUrn)}
+                        </Button>
+                    )}
+                    {!replacementUrn && (
+                        <Button size="small" onClick={() => setIsReplacementModalVisible(true)}>
+                            Select Replacement
+                        </Button>
+                    )}
+                </Form.Item>
+            </Form>
+        </Modal>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/__tests__/NodeParentSelect.test.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/__tests__/NodeParentSelect.test.tsx
new file mode 100644
index 00000000000000..53959d0d7786c2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/__tests__/NodeParentSelect.test.tsx
@@ -0,0 +1,24 @@
+import { glossaryNode1, glossaryNode2, glossaryNode3, glossaryNode4 } from '../../../../../Mocks';
+import { filterResultsForMove } from '../NodeParentSelect';
+
+describe('filterResultsForMove', () => {
+    it('should return true if the given node is different than given urn and the node is not a child of the given urn', () => {
+        const shouldKeep = filterResultsForMove(glossaryNode4, glossaryNode1.urn);
+        expect(shouldKeep).toBe(true);
+    });
+
+    it('should return false if the given node has the same urn as the given urn', () => {
+        const shouldKeep = filterResultsForMove(glossaryNode1, glossaryNode1.urn);
+        expect(shouldKeep).toBe(false);
+    });
+
+    it('should return false if the given node is a direct child of the given urn', () => {
+        const shouldKeep = filterResultsForMove(glossaryNode2, glossaryNode1.urn);
+        expect(shouldKeep).toBe(false);
+    });
+
+    it('should return false if the given node is a child of a child of the given urn', () => {
+        const shouldKeep = filterResultsForMove(glossaryNode3, glossaryNode1.urn);
+        expect(shouldKeep).toBe(false);
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/index.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/index.tsx
new file mode 100644
index 00000000000000..096bc612d13377
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/index.tsx
@@ -0,0 +1,3 @@
+import EntityMenuActions from './EntityMenuActions';
+
+export default EntityMenuActions;
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/styledComponents.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/styledComponents.tsx
new file mode 100644
index 00000000000000..bac9c8b6497cad
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/styledComponents.tsx
@@ -0,0 +1,39 @@
+import styled from 'styled-components';
+import { Button } from 'antd';
+import { ANTD_GRAY, REDESIGN_COLORS, SEARCH_COLORS } from '../constants';
+
+const MenuItem = styled.div`
+    font-size: 12px;
+    padding: 0 4px;
+    color: #262626;
+`;
+
+export const ActionMenuItem = styled(Button)<{ disabled?: boolean; fontSize?: number; excludeMargin?: boolean }>`
+    border-radius: 20px;
+    width: ${(props) => (props.fontSize ? `${props.fontSize}px` : '28px')};
+    height: ${(props) => (props.fontSize ? `${props.fontSize}px` : '28px')};
+    margin: 0px ${(props) => (props.excludeMargin ? '0px' : '4px')};
+    padding: 0px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    overflow: hidden;
+    border: none;
+    background-color: 'white';
+    border: 1px solid #eee;
+    color: ${REDESIGN_COLORS.ACTION_ICON_GREY};
+    box-shadow: none;
+    &&:hover {
+        background-color: ${ANTD_GRAY[3]};
+        color: ${SEARCH_COLORS.TITLE_PURPLE};
+        border-color: ${SEARCH_COLORS.TITLE_PURPLE};
+    }
+    ${(props) =>
+        props.disabled
+            ? `
+            ${MenuItem} {
+                color: ${ANTD_GRAY[7]};
+            }
+    `
+            : ''};
+`;
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteEntity.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteEntity.tsx
new file mode 100644
index 00000000000000..9518837eaea155
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteEntity.tsx
@@ -0,0 +1,99 @@
+import { useState } from 'react';
+import { message, Modal } from 'antd';
+import { EntityType } from '../../../../types.generated';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { getDeleteEntityMutation } from '../../../shared/deleteUtils';
+import analytics, { EventType } from '../../../analytics';
+import { useGlossaryEntityData } from '../GlossaryEntityContext';
+import { getParentNodeToUpdate, updateGlossarySidebar } from '../../../glossaryV2/utils';
+import { useHandleDeleteDomain } from './useHandleDeleteDomain';
+import { removeTermFromGlossaryNode } from '../../../glossaryV2/cacheUtils';
+
+/**
+ * Performs the flow for deleting an entity of a given type.
+ *
+ * @param urn the type of the entity to delete
+ * @param type the type of the entity to delete
+ * @param name the name of the entity to delete
+ */
+function useDeleteEntity(
+    urn: string,
+    type: EntityType,
+    entityData: any,
+    onDelete?: () => void,
+    hideMessage?: boolean,
+    skipWait?: boolean,
+) {
+    const [hasBeenDeleted, setHasBeenDeleted] = useState(false);
+    const entityRegistry = useEntityRegistry();
+    const { isInGlossaryContext, urnsToUpdate, setUrnsToUpdate } = useGlossaryEntityData();
+    const { handleDeleteDomain } = useHandleDeleteDomain({ entityData, urn });
+
+    const [deleteEntity, { client }] = getDeleteEntityMutation(type)() ?? [undefined, { client: undefined }];
+
+    function handleDeleteEntity() {
+        deleteEntity?.({ variables: { urn } })
+            .then(() => {
+                analytics.event({
+                    type: EventType.DeleteEntityEvent,
+                    entityUrn: urn,
+                    entityType: type,
+                });
+                if (!hideMessage && !skipWait) {
+                    message.loading({
+                        content: 'Deleting...',
+                        duration: 2,
+                    });
+                }
+
+                if (type === EntityType.Domain) {
+                    handleDeleteDomain();
+                }
+
+                setTimeout(
+                    () => {
+                        setHasBeenDeleted(true);
+                        onDelete?.();
+                        if (isInGlossaryContext) {
+                            const parentNodeToUpdate = getParentNodeToUpdate(entityData, type);
+                            updateGlossarySidebar([parentNodeToUpdate], urnsToUpdate, setUrnsToUpdate);
+                            if (client) {
+                                removeTermFromGlossaryNode(client, parentNodeToUpdate, urn);
+                            }
+                        }
+                        if (!hideMessage) {
+                            message.success({
+                                content: `Deleted ${entityRegistry.getEntityName(type)}!`,
+                                duration: 2,
+                            });
+                        }
+                    },
+                    skipWait ? 0 : 2000,
+                );
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to delete: \n ${e.message || ''}`, duration: 3 });
+            });
+    }
+
+    function onDeleteEntity() {
+        Modal.confirm({
+            title: `Delete ${
+                (entityData && entityRegistry.getDisplayName(type, entityData)) || entityRegistry.getEntityName(type)
+            }`,
+            content: `Are you sure you want to remove this ${entityRegistry.getEntityName(type)}?`,
+            onOk() {
+                handleDeleteEntity();
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    }
+
+    return { onDeleteEntity, hasBeenDeleted };
+}
+
+export default useDeleteEntity;
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteGlossaryEntity.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteGlossaryEntity.tsx
new file mode 100644
index 00000000000000..df48205852a80d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteGlossaryEntity.tsx
@@ -0,0 +1,55 @@
+import { message, Modal } from 'antd';
+import { useState } from 'react';
+import { useEntityData } from '../../../entity/shared/EntityContext';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { useDeleteGlossaryEntityMutation } from '../../../../graphql/glossary.generated';
+
+function useDeleteGlossaryEntity() {
+    const [hasBeenDeleted, setHasBeenDeleted] = useState(false);
+    const { entityData, urn: entityDataUrn, entityType } = useEntityData();
+    const entityRegistry = useEntityRegistry();
+
+    const [deleteGlossaryEntity] = useDeleteGlossaryEntityMutation();
+
+    function handleDeleteGlossaryEntity() {
+        deleteGlossaryEntity({
+            variables: {
+                urn: entityDataUrn,
+            },
+            fetchPolicy: 'cache-first',
+        })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to delete: \n ${e.message || ''}`, duration: 3 });
+            })
+            .finally(() => {
+                message.loading({
+                    content: 'Deleting...',
+                    duration: 2,
+                });
+                setHasBeenDeleted(true);
+                message.success({
+                    content: `Deleted ${entityRegistry.getEntityName(entityType)}!`,
+                    duration: 2,
+                });
+            });
+    }
+
+    function onDeleteEntity() {
+        Modal.confirm({
+            title: `Delete ${entityRegistry.getDisplayName(entityType, entityData)}`,
+            content: `Are you sure you want to remove this ${entityRegistry.getEntityName(entityType)}?`,
+            onOk() {
+                handleDeleteGlossaryEntity();
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    }
+
+    return { onDeleteEntity, hasBeenDeleted };
+}
+
+export default useDeleteGlossaryEntity;
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useHandleDeleteDomain.ts b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useHandleDeleteDomain.ts
new file mode 100644
index 00000000000000..0d3df7fe91674e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useHandleDeleteDomain.ts
@@ -0,0 +1,27 @@
+import { useApolloClient } from '@apollo/client';
+import { GenericEntityProperties } from '../../../entity/shared/types';
+import { removeFromListDomainsCache } from '../../../domain/utils';
+import { useDomainsContext } from '../../../domain/DomainsContext';
+
+interface DeleteDomainProps {
+    entityData: GenericEntityProperties;
+    urn: string;
+}
+
+export function useHandleDeleteDomain({ entityData, urn }: DeleteDomainProps) {
+    const client = useApolloClient();
+    const { parentDomainsToUpdate, setParentDomainsToUpdate } = useDomainsContext();
+
+    const handleDeleteDomain = () => {
+        if (entityData.parentDomains && entityData.parentDomains.domains.length > 0) {
+            const parentDomainUrn = entityData.parentDomains.domains[0].urn;
+
+            removeFromListDomainsCache(client, urn, 1, 1000, parentDomainUrn);
+            setParentDomainsToUpdate([...parentDomainsToUpdate, parentDomainUrn]);
+        } else {
+            removeFromListDomainsCache(client, urn, 1, 1000);
+        }
+    };
+
+    return { handleDeleteDomain };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useHandleMoveDomainComplete.ts b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useHandleMoveDomainComplete.ts
new file mode 100644
index 00000000000000..60763ccfb65bdc
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useHandleMoveDomainComplete.ts
@@ -0,0 +1,36 @@
+import { useApolloClient } from '@apollo/client';
+import { removeFromListDomainsCache, updateListDomainsCache } from '../../../domain/utils';
+import { Domain } from '../../../../types.generated';
+import analytics from '../../../analytics/analytics';
+import { EventType } from '../../../analytics';
+import { useDomainsContext } from '../../../domainV2/DomainsContext';
+
+export function useHandleMoveDomainComplete() {
+    const client = useApolloClient();
+    const { entityData } = useDomainsContext();
+
+    const handleMoveDomainComplete = (urn: string, newParentUrn?: string) => {
+        if (!entityData) return;
+
+        const domain = entityData as Domain;
+        const oldParentUrn = domain.parentDomains?.domains?.[0].urn;
+
+        analytics.event({
+            type: EventType.MoveDomainEvent,
+            oldParentDomainUrn: oldParentUrn,
+            parentDomainUrn: newParentUrn,
+        });
+
+        removeFromListDomainsCache(client, urn, 1, 1000, oldParentUrn);
+        updateListDomainsCache(
+            client,
+            domain.urn,
+            undefined,
+            domain.properties?.name ?? '',
+            domain.properties?.description ?? '',
+            newParentUrn,
+        );
+    };
+
+    return { handleMoveDomainComplete };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useParentSelector.ts b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useParentSelector.ts
new file mode 100644
index 00000000000000..360ae7164e8e43
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useParentSelector.ts
@@ -0,0 +1,79 @@
+import { useEffect, useState } from 'react';
+import { useGetAutoCompleteResultsLazyQuery } from '../../../../graphql/search.generated';
+import { EntityType } from '../../../../types.generated';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { GenericEntityProperties } from '../../../entity/shared/types';
+
+interface Props {
+    entityType: EntityType;
+    entityData: GenericEntityProperties | null;
+    selectedParentUrn: string;
+    setSelectedParentUrn: (parent: string) => void;
+}
+
+export default function useParentSelector({ entityType, entityData, selectedParentUrn, setSelectedParentUrn }: Props) {
+    const [selectedParentName, setSelectedParentName] = useState<string>();
+    const [isFocusedOnInput, setIsFocusedOnInput] = useState(false);
+    const [searchQuery, setSearchQuery] = useState('');
+    const entityRegistry = useEntityRegistry();
+
+    const [getAutoCompleteResults, { data: autoCompleteResultsValue, loading: autoCompleteResultsLoading }] =
+        useGetAutoCompleteResultsLazyQuery();
+    const searchResults = autoCompleteResultsValue?.autoComplete?.entities || [];
+
+    useEffect(() => {
+        if (entityData && selectedParentUrn === entityData.urn) {
+            const displayName = entityRegistry.getDisplayName(entityType, entityData);
+            setSelectedParentName(displayName);
+        }
+    }, [entityData, entityRegistry, selectedParentUrn, entityData?.urn, entityType]);
+
+    function handleSearch(text: string) {
+        setSearchQuery(text);
+        if (text) {
+            getAutoCompleteResults({
+                variables: {
+                    input: {
+                        type: entityType,
+                        query: text,
+                        limit: 5,
+                    },
+                },
+            });
+        }
+    }
+
+    function onSelectParent(parentUrn: string) {
+        const selectedParent = searchResults.find((result) => result.urn === parentUrn);
+        if (selectedParent) {
+            setSelectedParentUrn(parentUrn);
+            const displayName = entityRegistry.getDisplayName(selectedParent.type, selectedParent);
+            setSelectedParentName(displayName);
+        }
+    }
+
+    function clearSelectedParent() {
+        setSelectedParentUrn('');
+        setSelectedParentName(undefined);
+        setSearchQuery('');
+    }
+
+    function selectParentFromBrowser(urn: string, displayName: string) {
+        setIsFocusedOnInput(false);
+        setSelectedParentUrn(urn);
+        setSelectedParentName(displayName);
+    }
+
+    return {
+        searchQuery,
+        searchResults,
+        isFocusedOnInput,
+        selectedParentName,
+        onSelectParent,
+        handleSearch,
+        setIsFocusedOnInput,
+        selectParentFromBrowser,
+        clearSelectedParent,
+        autoCompleteResultsLoading,
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/utils.ts b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/utils.ts
new file mode 100644
index 00000000000000..8d4eb7b0ecfe06
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/utils.ts
@@ -0,0 +1,61 @@
+import { EntityType, PlatformPrivileges } from '../../../../types.generated';
+import { GenericEntityProperties } from '../../../entity/shared/types';
+
+export function isDeleteDisabled(
+    entityType: EntityType,
+    entityData: GenericEntityProperties | null,
+    platformPrivileges: PlatformPrivileges | null | undefined,
+) {
+    if (entityType === EntityType.GlossaryTerm || entityType === EntityType.GlossaryNode) {
+        const entityHasChildren = !!entityData?.children?.total;
+        const canManageGlossaryEntity = !!entityData?.privileges?.canManageEntity;
+        const canDeleteGlossaryEntity = !entityHasChildren && canManageGlossaryEntity;
+        return !canDeleteGlossaryEntity;
+    }
+    if (entityType === EntityType.DataProduct) {
+        return false; // TODO: update with permissions
+    }
+    if (entityType === EntityType.Domain) {
+        const entityHasChildren = !!entityData?.children?.total;
+        const canManageDomains = !!platformPrivileges?.manageDomains;
+        const canDeleteDomainEntity = !entityHasChildren && canManageDomains;
+        return !canDeleteDomainEntity;
+    }
+    return false;
+}
+
+export function isMoveDisabled(
+    entityType: EntityType,
+    entityData: GenericEntityProperties | null,
+    platformPrivileges: PlatformPrivileges | null | undefined,
+) {
+    if (entityType === EntityType.GlossaryTerm || entityType === EntityType.GlossaryNode) {
+        const canManageGlossaryEntity = !!entityData?.privileges?.canManageEntity;
+        return !canManageGlossaryEntity;
+    }
+    if (entityType === EntityType.Domain) {
+        const canManageDomains = !!platformPrivileges?.manageDomains;
+        return !canManageDomains;
+    }
+    return false;
+}
+
+export function shouldDisplayChildDeletionWarning(
+    entityType: EntityType,
+    entityData: GenericEntityProperties | null,
+    platformPrivileges: PlatformPrivileges | null | undefined,
+) {
+    if (entityType === EntityType.GlossaryTerm || entityType === EntityType.GlossaryNode) {
+        const entityHasChildren = !!entityData?.children?.total;
+        const canManageGlossaryEntity = !!entityData?.privileges?.canManageEntity;
+        const hasTooltip = entityHasChildren && canManageGlossaryEntity;
+        return hasTooltip;
+    }
+    if (entityType === EntityType.Domain) {
+        const entityHasChildren = !!entityData?.children?.total;
+        const canManageDomains = !!platformPrivileges?.manageDomains;
+        const hasTooltip = entityHasChildren && canManageDomains;
+        return hasTooltip;
+    }
+    return false;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityGroups.tsx b/datahub-web-react/src/app/entityV2/shared/EntityGroups.tsx
new file mode 100644
index 00000000000000..980a551a6826ed
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityGroups.tsx
@@ -0,0 +1,55 @@
+import { Tag } from 'antd';
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { EntityType, EntityRelationship } from '../../../types.generated';
+import { EmptyValue, TagsSection, Tags, GroupsSeeMoreText } from './SidebarStyledComponents';
+import { useEntityRegistry } from '../../useEntityRegistry';
+
+type Props = {
+    readMore: boolean;
+    setReadMore: (readMore: boolean) => void;
+    groupMemberRelationships: Array<EntityRelationship>;
+};
+
+/**
+ * EntityGroups- to display the groups category in sidebar section
+ */
+export default function EntityGroups({ readMore, setReadMore, groupMemberRelationships }: Props) {
+    const entityRegistry = useEntityRegistry();
+
+    return (
+        <TagsSection>
+            {groupMemberRelationships?.length === 0 && <EmptyValue />}
+            {!readMore &&
+                groupMemberRelationships?.slice(0, 2).map((item) => {
+                    if (!item?.entity?.urn) return null;
+                    const entityUrn = entityRegistry.getEntityUrl(EntityType.CorpGroup, item?.entity?.urn);
+                    return (
+                        <Link to={entityUrn} key={entityUrn}>
+                            <Tags>
+                                <Tag>{entityRegistry.getDisplayName(EntityType.CorpGroup, item.entity)}</Tag>
+                            </Tags>
+                        </Link>
+                    );
+                })}
+            {readMore &&
+                groupMemberRelationships?.length > 2 &&
+                groupMemberRelationships?.map((item) => {
+                    if (!item?.entity?.urn) return null;
+                    const entityUrn = entityRegistry.getEntityUrl(EntityType.CorpGroup, item.entity.urn);
+                    return (
+                        <Link to={entityUrn} key={entityUrn}>
+                            <Tags>
+                                <Tag>{entityRegistry.getDisplayName(EntityType.CorpGroup, item.entity)}</Tag>
+                            </Tags>
+                        </Link>
+                    );
+                })}
+            {!readMore && groupMemberRelationships?.length > 2 && (
+                <GroupsSeeMoreText onClick={() => setReadMore(!readMore)}>
+                    {`+${groupMemberRelationships?.length - 2} more`}
+                </GroupsSeeMoreText>
+            )}
+        </TagsSection>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInput.tsx b/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInput.tsx
new file mode 100644
index 00000000000000..6a11427af6aca6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInput.tsx
@@ -0,0 +1,179 @@
+import { Select, Tag } from 'antd';
+import { Tooltip } from '@components';
+import React, { useEffect, useState } from 'react';
+import { useGetEntitiesLazyQuery } from '../../../../graphql/entity.generated';
+import { useGetSearchResultsForMultipleLazyQuery } from '../../../../graphql/search.generated';
+import { Entity, EntityType } from '../../../../types.generated';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { EntitySearchInputResult } from './EntitySearchInputResult';
+
+type Props = {
+    selectedUrns: string[];
+    entityTypes: EntityType[];
+    placeholder?: string;
+    mode?: 'multiple' | 'single';
+    style?: any;
+    tagStyle?: React.CSSProperties;
+    optionStyle?: React.CSSProperties;
+    onChangeSelectedUrns: (newUrns: string[]) => void;
+};
+
+const addToCache = (cache: Map<string, Entity>, entity: Entity) => {
+    cache.set(entity.urn, entity);
+    return cache;
+};
+
+const buildCache = (entities: Entity[]) => {
+    const cache = new Map();
+    entities.forEach((entity) => cache.set(entity.urn, entity));
+    return cache;
+};
+
+const isResolutionRequired = (urns: string[], cache: Map<string, Entity>) => {
+    const uncachedUrns = urns.filter((urn) => !cache.has(urn));
+    return uncachedUrns.length > 0;
+};
+
+/**
+ * This component allows you to search and select entities. It will handle everything, including
+ * resolving the entities to their display name when required.
+ *
+ * TODO: Ideally an initial entity cache could be injected into the component when it's created.
+ */
+export const EntitySearchInput = ({
+    selectedUrns,
+    entityTypes,
+    placeholder,
+    style,
+    tagStyle,
+    optionStyle,
+    mode,
+    onChangeSelectedUrns,
+}: Props) => {
+    const entityRegistry = useEntityRegistry();
+    const [entityCache, setEntityCache] = useState<Map<string, Entity>>(new Map());
+
+    /**
+     * Bootstrap by resolving all URNs that are not in the cache yet.
+     */
+    const [getEntities, { data: resolvedEntitiesData }] = useGetEntitiesLazyQuery();
+    useEffect(() => {
+        if (isResolutionRequired(selectedUrns, entityCache)) {
+            // Resolve urns to their full entities
+            getEntities({ variables: { urns: selectedUrns } });
+        }
+    }, [selectedUrns, entityCache, getEntities]);
+
+    /**
+     * If some entities need to be resolved, simply build the cache from them.
+     * This should only happen once at component bootstrap. Typically
+     * all URNs will be missing from the cache.
+     */
+    useEffect(() => {
+        if (resolvedEntitiesData && resolvedEntitiesData.entities?.length) {
+            const entities: Entity[] = (resolvedEntitiesData?.entities as Entity[]) || [];
+            setEntityCache(buildCache(entities));
+        }
+    }, [resolvedEntitiesData]);
+
+    /**
+     * Response to user typing with search.
+     */
+    const [searchResources, { data: resourcesSearchData }] = useGetSearchResultsForMultipleLazyQuery();
+    const searchResults = resourcesSearchData?.searchAcrossEntities?.searchResults || [];
+    const searchResultEntities = searchResults.map((result) => result.entity) as Entity[];
+    const urnToSearchResultEntity = new Map();
+    searchResults.forEach((result) => {
+        urnToSearchResultEntity[result.entity.urn] = {
+            urn: result.entity.urn,
+            type: result.entity.type,
+            displayName: entityRegistry.getDisplayName(result.entity.type, result.entity),
+        };
+    });
+
+    const onSelect = (newUrn) => {
+        const newEntity = searchResultEntities.find((entity) => entity.urn === newUrn);
+        if (newEntity) {
+            setEntityCache(addToCache(entityCache, newEntity));
+            if (mode === 'single') {
+                onChangeSelectedUrns([newUrn]);
+            } else {
+                const newUrns = [...selectedUrns, newUrn];
+                onChangeSelectedUrns(newUrns);
+            }
+        }
+    };
+
+    const onDeselect = (urn) => {
+        if (mode === 'single') {
+            onChangeSelectedUrns([]);
+        } else {
+            onChangeSelectedUrns(selectedUrns.filter((u) => u !== urn));
+        }
+    };
+
+    const onSearch = (text: string) => {
+        searchResources({
+            variables: {
+                input: {
+                    types: entityTypes,
+                    query: text,
+                    start: 0,
+                    count: 10,
+                },
+            },
+        });
+    };
+
+    /**
+     * Issue a star search on component mount to provide a default set of results.
+     */
+    useEffect(() => {
+        searchResources({
+            variables: {
+                input: {
+                    types: entityTypes,
+                    query: '*',
+                    start: 0,
+                    count: 10,
+                },
+            },
+        });
+    }, [entityTypes, searchResources]);
+
+    return (
+        <Select
+            value={selectedUrns}
+            mode="multiple"
+            style={style}
+            filterOption={false}
+            placeholder={placeholder || 'Search for entities...'}
+            onSelect={onSelect}
+            onDeselect={onDeselect}
+            onSearch={onSearch}
+            data-testid="entity-search-input"
+            tagRender={(tagProps) => {
+                let displayName = tagProps.value;
+                if (entityCache.has(tagProps.value as string)) {
+                    const entity = entityCache.get(tagProps.value as string) as Entity;
+                    displayName = entityRegistry.getDisplayName(entity?.type, entity) || displayName;
+                }
+                return (
+                    <Tag closable={tagProps.closable} onClose={tagProps.onClose} style={tagStyle}>
+                        <Tooltip title={displayName}>{displayName}</Tooltip>
+                    </Tag>
+                );
+            }}
+        >
+            {searchResults?.map((result) => (
+                <Select.Option
+                    value={result.entity.urn}
+                    style={optionStyle}
+                    data-testid={`${result.entity.urn}-entity-search-input-result`}
+                >
+                    <EntitySearchInputResult entity={result.entity} />
+                </Select.Option>
+            ))}
+        </Select>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResult.tsx b/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResult.tsx
new file mode 100644
index 00000000000000..ca30a13061dbd2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResult.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import styled from 'styled-components';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { IconStyleType } from '../../Entity';
+
+type Props = {
+    entity: any;
+};
+
+const Container = styled.div`
+    display: flex;
+    justify-content: left;
+    align-items: center;
+    padding: 12px;
+`;
+
+const IconContainer = styled.div`
+    margin-right: 8px;
+`;
+
+export const EntitySearchInputResult = ({ entity }: Props) => {
+    const entityRegistry = useEntityRegistry();
+    return (
+        <Container>
+            <IconContainer>{entityRegistry.getIcon(entity.type, 12, IconStyleType.ACCENT)}</IconContainer>
+            {entityRegistry.getDisplayName(entity.type, entity)}
+        </Container>
+    );
+};
+
+export default EntitySearchInputResult;
diff --git a/datahub-web-react/src/app/entityV2/shared/GlossaryEntityContext.tsx b/datahub-web-react/src/app/entityV2/shared/GlossaryEntityContext.tsx
new file mode 100644
index 00000000000000..1e7275f4de3100
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/GlossaryEntityContext.tsx
@@ -0,0 +1,46 @@
+import React, { useContext } from 'react';
+import { GenericEntityProperties } from '../../entity/shared/types';
+
+export interface GlossaryEntityContextType {
+    isInGlossaryContext: boolean;
+    entityData: GenericEntityProperties | null;
+    setEntityData: (entityData: GenericEntityProperties | null) => void;
+    // Since we have glossary data in the profile and in the sidebar browser, we need to communicate to the
+    // sidebar when to refetch for a given node or at the root level (if we're editing a term or node without a parent).
+    // This will happen when you edit a name, move a term/group, create a new term/group, and delete a term/group
+    urnsToUpdate: string[];
+    setUrnsToUpdate: (updatdUrns: string[]) => void;
+    isSidebarOpen: boolean;
+    setIsSidebarOpen: (isOpen: boolean) => void;
+}
+
+export const GlossaryEntityContext = React.createContext<GlossaryEntityContextType>({
+    isInGlossaryContext: false,
+    entityData: null,
+    setEntityData: () => {},
+    urnsToUpdate: [],
+    setUrnsToUpdate: () => {},
+    isSidebarOpen: true,
+    setIsSidebarOpen: () => {},
+});
+
+export const useGlossaryEntityData = () => {
+    const {
+        isInGlossaryContext,
+        entityData,
+        setEntityData,
+        urnsToUpdate,
+        setUrnsToUpdate,
+        isSidebarOpen,
+        setIsSidebarOpen,
+    } = useContext(GlossaryEntityContext);
+    return {
+        isInGlossaryContext,
+        entityData,
+        setEntityData,
+        urnsToUpdate,
+        setUrnsToUpdate,
+        isSidebarOpen,
+        setIsSidebarOpen,
+    };
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/PreviewContext.tsx b/datahub-web-react/src/app/entityV2/shared/PreviewContext.tsx
new file mode 100644
index 00000000000000..ec54127687e0db
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/PreviewContext.tsx
@@ -0,0 +1,9 @@
+import React from 'react';
+import { GenericEntityProperties } from '../../entity/shared/types';
+
+const PreviewContext = React.createContext<GenericEntityProperties | null>(null);
+export default PreviewContext;
+
+export function usePreviewData() {
+    return React.useContext(PreviewContext);
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/SearchCardContext.tsx b/datahub-web-react/src/app/entityV2/shared/SearchCardContext.tsx
new file mode 100644
index 00000000000000..89fc32600fb838
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/SearchCardContext.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+
+interface SearchCardContextType {
+    showRemovalFromList: boolean;
+}
+
+const defaultContext: SearchCardContextType = {
+    showRemovalFromList: false,
+};
+
+export const SearchCardContext = React.createContext<SearchCardContextType>(defaultContext);
+
+export function useSearchCardContext() {
+    return React.useContext(SearchCardContext);
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/SidebarStyledComponents.tsx b/datahub-web-react/src/app/entityV2/shared/SidebarStyledComponents.tsx
new file mode 100644
index 00000000000000..d248a927679c6e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/SidebarStyledComponents.tsx
@@ -0,0 +1,400 @@
+import styled from 'styled-components';
+import { Row } from 'antd';
+import DraftsOutlinedIcon from '@mui/icons-material/DraftsOutlined';
+import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
+import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from './constants';
+
+/**
+ * Styled Components- Users and Groups Side bar component
+ * Description: The following styles are used for User and Groups UI for sidebar.
+ */
+
+export const SideBar = styled.div`
+    padding: 0 17px;
+    text-align: center;
+    font-style: normal;
+    font-weight: bold;
+    position: relative;
+
+    &&& .ant-avatar.ant-avatar-icon {
+        font-size: 46px !important;
+    }
+
+    .divider-infoSection {
+        margin: 18px 0px 18px 0;
+    }
+    .divider-aboutSection {
+        margin: 23px 0px 11px 0;
+    }
+    .divider-groupsSection {
+        margin: 23px 0px 11px 0;
+    }
+`;
+
+export const SideBarSubSection = styled.div`
+    height: calc(100vh - 135px);
+    overflow: auto;
+    padding-right: 18px;
+    &.fullView {
+        height: calc(100vh - 70px);
+    }
+    &::-webkit-scrollbar {
+        height: 12px;
+        width: 1px;
+        background: #d6d6d6;
+    }
+    &::-webkit-scrollbar-thumb {
+        background: #d6d6d6;
+        -webkit-border-radius: 1ex;
+        -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.75);
+    }
+`;
+
+export const EmptyValue = styled.div<{ color?: string }>`
+    &:after {
+        content: 'None';
+        color: ${(props) => (props.color ? props.color : '#b7b7b7')};
+        font-style: italic;
+        font-weight: 100;
+    }
+`;
+
+export const Name = styled.div`
+    font-size: 12px;
+    line-height: 18px;
+    color: ${ANTD_GRAY_V2['11']};
+    text-align: left;
+    display: flex;
+    align-items: center;
+    gap: 0.2rem;
+    span {
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+    }
+    @media only screen and (min-width: 1200px) {
+        color: ${REDESIGN_COLORS.WHITE};
+    }
+`;
+
+export const TitleRole = styled.div`
+    font-size: 12px;
+    line-height: 18px;
+    color: ${ANTD_GRAY_V2['11']};
+    text-align: left;
+    white-space: wrap;
+    @media only screen and (min-width: 1200px) {
+        color: ${REDESIGN_COLORS.WHITE};
+    }
+`;
+
+export const RoleName = styled.div`
+    text-align: center;
+    color: ${REDESIGN_COLORS.WHITE};
+    border-radius: 30px;
+    background-color: #565657;
+    padding: 3px 5px;
+    text-transform: uppercase;
+    font-size: 7px;
+    line-height: 9px;
+    position: relative;
+    z-index: 2;
+    @media only screen and (min-width: 1200px) {
+        background-color: ${ANTD_GRAY[1]}4a;
+    }
+`;
+
+export const Team = styled.div`
+    font-size: 12px;
+    line-height: 20px;
+    color: #8c8c8c;
+`;
+
+export const SocialDetails = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 0.4rem;
+    font-size: 12px;
+    line-height: 20px;
+    color: ${ANTD_GRAY_V2['11']};
+    text-align: left;
+    span {
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+    }
+    .ant-space-item {
+        display: flex;
+        align-items: center;
+    }
+`;
+
+export const EditButton = styled.div`
+    bottom: 24px;
+    position: absolute;
+    right: 27px;
+    width: 80%;
+    left: 50%;
+    -webkit-transform: translateX(-50%);
+    -moz-transform: translateX(-50%);
+    transform: translateX(-50%);
+
+    button {
+        width: 100%;
+        font-size: 12px;
+        line-height: 20px;
+        color: #262626;
+    }
+`;
+
+export const AboutSection = styled.div`
+    text-align: left;
+    font-weight: bold;
+    font-size: 14px;
+    line-height: 22px;
+    color: #262626;
+`;
+
+export const AboutSectionText = styled.div`
+    font-size: 12px;
+    font-weight: 100;
+    line-height: 15px;
+    color: #434863;
+
+    &&& .ant-typography {
+        margin-bottom: 0;
+    }
+    &&& .ant-typography-edit-content {
+        padding-left: 15px;
+        padding-top: 5px;
+    }
+`;
+
+export const GroupsSection = styled.div`
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 0.5rem;
+    text-align: left;
+`;
+
+export const TagsSection = styled.div`
+    display: flex;
+    align-items: start;
+    justify-content: start;
+    flex-wrap: wrap;
+    margin-top: 0.5rem;
+    align-self: start;
+`;
+
+export const NoDataFound = styled.span`
+    font-size: 12px;
+    color: #262626;
+    font-weight: 100;
+`;
+
+export const Tags = styled.div`
+    margin-top: 5px;
+`;
+
+export const GroupsSeeMoreText = styled.span`
+    font-weight: 500;
+    font-size: 12px;
+    line-height: 20px;
+    color: #1890ff;
+    cursor: pointer;
+`;
+
+export const DisplayCount = styled.span`
+    font-family: Mulish;
+    font-style: normal;
+    font-weight: 500;
+    font-size: 12px;
+    line-height: 20px;
+    color: #8c8c8c;
+`;
+
+export const GroupSectionTitle = styled.span`
+    margin-right: 8px;
+`;
+
+export const GroupSectionHeader = styled.div`
+    padding-bottom: 12px;
+`;
+
+export const Content = styled.div`
+    display: flex;
+    flex-direction: column;
+    align-items: start;
+    justify-content: start;
+
+    & > div {
+        padding-top: 12px;
+        padding-bottom: 12px;
+        width: 100%;
+        &:not(:last-child) {
+            border-bottom: 1px dashed;
+            border-color: rgba(0, 0, 0, 0.3);
+        }
+    }
+`;
+
+export const CustomAvatarContainer = styled.div`
+    position: relative;
+    margin-top 20px;
+    &:hover{
+        .edit-button-container{
+            display: block;
+        }
+    }
+`;
+
+export const UserInfo = styled(Row)`
+    display: flex;
+    gap: 1rem;
+    padding: 10px 10px;
+    background: ${ANTD_GRAY_V2['14']};
+    border-radius: 10px;
+    justify-content: center;
+    @media only screen and (min-width: 1200px) {
+        justify-content: flex-start;
+    }
+    @media only screen and (min-width: 1600px) {
+        padding: 20px 20px;
+    }
+`;
+
+export const GroupInfo = styled.div`
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    background: ${ANTD_GRAY_V2['14']};
+    border-radius: 10px;
+    overflow: hidden;
+`;
+
+export const SocialInfo = styled.div`
+    display: flex;
+    flex-direction: column;
+    z-index: 2;
+    position: relative;
+    justify-content: flex-end;
+    gap: 0.4rem;
+`;
+
+export const GradientContainer = styled.div<{ gradient?: string; height?: number }>`
+    border-radius: 10px 10px 0px 0px;
+    background: ${(props) => (props.gradient ? props.gradient : REDESIGN_COLORS.PROFILE_AVATAR_STYLE_GRADIENT)};
+    height: 65px;
+    width: 100%;
+    z-index: 1;
+    display: flex;
+    gap: 10px;
+    justify-content: start;
+    padding: 0 10px;
+    position: absolute;
+    @media only screen and (min-width: 1200px) and (max-width: 1600px) {
+        height: 55px;
+    }
+`;
+
+export const BasicDetailsContainer = styled.div`
+    font-size: 12px;
+    align-items: start;
+    position: relative;
+`;
+
+export const EditProfileButtonContainer = styled.div`
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    z-index: 2;
+    cursor: pointer;
+    display: none;
+    &&& div {
+        border-color: ${REDESIGN_COLORS.WHITE};
+        height: 18px;
+        width: 18px;
+        display: flex;
+        align-items: center;
+        &:hover {
+            border-color: ${REDESIGN_COLORS.BORDER_4};
+        }
+    }
+`;
+
+export const BasicDetails = styled.div`
+    position: relative;
+    z-index: 2;
+    display: flex;
+    flex-direction: column;
+    .ant-divider {
+        margin: 0.5rem 0px;
+    }
+    @media only screen and (min-width: 1200px) {
+        gap: 1rem;
+        .ant-divider {
+            display: none;
+        }
+    }
+`;
+
+export const DraftsOutlinedIconStyle = styled(DraftsOutlinedIcon)`
+    font-size: 12px !important;
+`;
+
+export const SubscriptionContainer = styled(Row)`
+    display: flex;
+    gap: 0.5rem;
+`;
+
+export const OwnershipContainer = styled(Row)`
+    display: flex;
+    gap: 0.5rem;
+`;
+
+export const DisplayNameText = styled.span`
+    color: ${ANTD_GRAY_V2[12]};
+    font-family: Mulish;
+    font-size: 12px;
+    font-style: normal;
+    font-weight: 600;
+    line-height: normal;
+`;
+
+export const NameTitleContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+`;
+
+export const WhiteEditOutlinedIconStyle = styled(EditOutlinedIcon)`
+    color: ${REDESIGN_COLORS.WHITE};
+    height: 18px !important;
+    width: 18px !important;
+    &:hover,
+    &:focus {
+        color: ${REDESIGN_COLORS.WHITE};
+        border-color: ${REDESIGN_COLORS.WHITE};
+    }
+`;
+
+export const ShowMoreButton = styled.div`
+    margin-top: 8px;
+    padding: 0px;
+    color: ${ANTD_GRAY[7]};
+    text-align: left;
+    :hover {
+        cursor: pointer;
+        color: ${ANTD_GRAY[8]};
+        text-decoration: underline;
+    }
+`;
+
+export const CountStyle = styled.div`
+    background-color: #ebecf0;
+    border-radius: 100px;
+    color: #5b6282;
+    padding: 0px 10px;
+    margin: 0px 5px;
+    font-size: 10px;
+    line-height: 18px;
+`;
diff --git a/datahub-web-react/src/app/entityV2/shared/StyledSyntaxHighlighter.tsx b/datahub-web-react/src/app/entityV2/shared/StyledSyntaxHighlighter.tsx
new file mode 100644
index 00000000000000..603bacf79b1a13
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/StyledSyntaxHighlighter.tsx
@@ -0,0 +1,8 @@
+import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
+import styled from 'styled-components';
+
+export const StyledSyntaxHighlighter = styled(SyntaxHighlighter)`
+    span {
+        font-family: 'Roboto Mono', monospace !important;
+    }
+`;
diff --git a/datahub-web-react/src/app/entityV2/shared/UrlButton.tsx b/datahub-web-react/src/app/entityV2/shared/UrlButton.tsx
new file mode 100644
index 00000000000000..a6f6da4a60ad57
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/UrlButton.tsx
@@ -0,0 +1,37 @@
+import React, { ReactNode } from 'react';
+import { ArrowRightOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+import styled from 'styled-components/macro';
+
+const UrlButtonContainer = styled.span`
+    font-size: 12px;
+`;
+
+const StyledButton = styled(Button)`
+    > :hover {
+        text-decoration: underline;
+    }
+    &&& {
+        padding-bottom: 0px;
+    }
+    padding-left: 12px;
+    padding-right: 12px;
+`;
+
+interface Props {
+    href: string;
+    children: ReactNode;
+    onClick?: () => void;
+}
+
+const NOOP = () => {};
+
+export default function UrlButton({ href, children, onClick = NOOP }: Props) {
+    return (
+        <UrlButtonContainer>
+            <StyledButton type="link" href={href} target="_blank" rel="noreferrer noopener" onClick={onClick}>
+                {children} <ArrowRightOutlined style={{ fontSize: 12 }} />
+            </StyledButton>
+        </UrlButtonContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/__tests__/DeprecationPill.test.tsx b/datahub-web-react/src/app/entityV2/shared/__tests__/DeprecationPill.test.tsx
new file mode 100644
index 00000000000000..5d024fbb3c4334
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/__tests__/DeprecationPill.test.tsx
@@ -0,0 +1,85 @@
+import { MockedProvider } from '@apollo/client/testing';
+import { EntityType, SubResourceType } from '@src/types.generated';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import React from 'react';
+import { DeprecationIcon } from '../components/styled/DeprecationIcon';
+
+describe('DeprecationPill', () => {
+    const defaultProps = {
+        urn: 'urn:li:dataset:123',
+        subResource: null,
+        subResourceType: SubResourceType.DatasetField,
+        showUndeprecate: false,
+        refetch: vi.fn(),
+    };
+
+    it('correctly converts v2 schema field replacement path', async () => {
+        render(
+            <MockedProvider>
+                <DeprecationIcon
+                    {...defaultProps}
+                    deprecation={{
+                        note: 'Deprecating this field',
+                        decommissionTime: null,
+                        deprecated: true,
+                        replacement: {
+                            urn: 'urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,db.schema.table,PROD),[version=2.0].[key=True].parent.[type=struct].child.[type=string])',
+                            type: EntityType.SchemaField,
+                        },
+                    }}
+                />
+            </MockedProvider>,
+        );
+
+        const pill = screen.getByText('Deprecated');
+        fireEvent.mouseEnter(pill);
+        await waitFor(() => {
+            expect(screen.getByText(/parent\.child/)).toBeInTheDocument();
+        });
+    });
+
+    it('shows note and decommission time when both present', async () => {
+        render(
+            <MockedProvider>
+                <DeprecationIcon
+                    {...defaultProps}
+                    deprecation={{
+                        note: 'This is deprecated',
+                        decommissionTime: 1735689600, // Jan 1, 2025
+                        deprecated: true,
+                        replacement: null,
+                    }}
+                />
+            </MockedProvider>,
+        );
+
+        const pill = screen.getByText('Deprecated');
+        fireEvent.mouseEnter(pill);
+        await waitFor(() => {
+            expect(screen.getByText('This is deprecated')).toBeInTheDocument();
+            expect(screen.getByText(/Scheduled to be decommissioned/)).toBeInTheDocument();
+        });
+    });
+
+    it('shows "No additional details" when no details provided', async () => {
+        render(
+            <MockedProvider>
+                <DeprecationIcon
+                    {...defaultProps}
+                    deprecation={{
+                        note: '',
+                        decommissionTime: null,
+                        deprecated: true,
+                        replacement: null,
+                    }}
+                />
+            </MockedProvider>,
+        );
+
+        const pill = screen.getByText('Deprecated');
+        fireEvent.mouseEnter(pill);
+        await waitFor(() => {
+            expect(screen.getByText('No additional details')).toBeInTheDocument();
+        });
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/__tests__/utils.test.ts b/datahub-web-react/src/app/entityV2/shared/__tests__/utils.test.ts
new file mode 100644
index 00000000000000..913244d7f3852b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/__tests__/utils.test.ts
@@ -0,0 +1,173 @@
+import { DataProduct, DatasetStatsSummary, EntityType } from '../../../../types.generated';
+import {
+    dictToQueryStringParams,
+    getNumberWithOrdinal,
+    encodeComma,
+    decodeComma,
+    notEmpty,
+    truncate,
+    singularizeCollectionName,
+    getDataProduct,
+    isOutputPort,
+    getPlatformName,
+    isListSubset,
+    urlEncodeUrn,
+    handleBatchError,
+    getFineGrainedLineageWithSiblings,
+    summaryHasStats,
+} from '../utils';
+import {
+    mockEntityRelationShipResult,
+    mockFineGrainedLineages1,
+    mockRecord,
+    mockSearchResult,
+} from '../../../../Mocks';
+
+describe('entity V2 utils test ->', () => {
+    describe('dictToQueryStringParams ->', () => {
+        it('should convert an object to string params', () => {
+            expect(dictToQueryStringParams(mockRecord)).toEqual(
+                'key1=value1&key2=true&key3=value2&key4=false&key5=value3&key6=true',
+            );
+        });
+    });
+    describe('urlEncodeUrn ->', () => {
+        it('should encode URN string into URL format', () => {
+            expect(urlEncodeUrn('urn#li:dataPlatformInstance?[urn%clickhouse,clickhousetestserver]')).toMatch(
+                'urn%23li:dataPlatformInstance%3F%5Burn{{encoded_percent}}clickhouse,clickhousetestserver%5D',
+            );
+        });
+    });
+    describe('getNumberWithOrdinal ->', () => {
+        it('should return number with appropriate suffix', () => {
+            expect(getNumberWithOrdinal(3)).toBe('3rd');
+            expect(getNumberWithOrdinal(10)).toBe('10th');
+            expect(getNumberWithOrdinal(2)).toBe('2nd');
+            expect(getNumberWithOrdinal(20)).toBe('20th');
+            expect(getNumberWithOrdinal(53)).toBe('53rd');
+        });
+    });
+    describe('encodeComma ->', () => {
+        it('should replace commas with %2C', () => {
+            expect(encodeComma('test,encode,commas')).toBe('test%2Cencode%2Ccommas');
+        });
+    });
+    describe('decodeComma ->', () => {
+        it('should replace %2C with commas', () => {
+            expect(decodeComma('test%2Cencode%2Ccommas')).toBe('test,encode,commas');
+        });
+    });
+    describe('notEmpty ->', () => {
+        it('should return if value is null or undefined', () => {
+            expect(notEmpty('test_value')).toBe(true);
+            expect(notEmpty(null)).toBe(false);
+            expect(notEmpty(undefined)).toBe(false);
+        });
+    });
+    describe('truncate ->', () => {
+        it('should truncate input text', () => {
+            const largeText =
+                'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.';
+
+            expect(truncate(40, largeText)).toBe('Lorem ipsum dolor sit amet, consectetur ...');
+        });
+    });
+    describe('singularizeCollectionName ->', () => {
+        it('should return single collection name', () => {
+            expect(singularizeCollectionName('posts')).toBe('post');
+        });
+    });
+    describe('getPlatformName ->', () => {
+        it('should return platform name with first letter capitalized', () => {
+            const x: any = {
+                urn: 'urn:li:dataPlatformInstance:(urn:li:dataPlatform:clickhouse,clickhousetestserver)',
+                type: EntityType.DataPlatformInstance,
+                instanceId: 'clickhousetestserver',
+                platform: {
+                    name: 'clickhouse',
+                    type: 'DATA_PLATFORM',
+                    urn: 'urn:li:dataPlatform:clickhouse',
+                    properties: {
+                        logoUrl: '/assets/platforms/clickhouselogo.png',
+                    },
+                },
+            };
+            expect(getPlatformName(x as any)).toBe('Clickhouse');
+        });
+    });
+    describe('isListSubset ->', () => {
+        it('should return if a list is a subset of another', () => {
+            const arr1 = [1, 2, 3, 4];
+            const arr2 = [1, 2, 3, 4, 5, 6, 7];
+            expect(isListSubset(arr1, arr2)).toBe(true);
+        });
+    });
+    describe('handleBatchError ->', () => {
+        it('should return entities from EntityRelationshipsResult', () => {
+            const urns = ['urn1', 'urn2'];
+            const defaultMessage = { content: 'Default message', duration: 3 };
+            test('should return custom message if urns length is greater than 1 and error code is 403', () => {
+                const e = {
+                    graphQLErrors: [{ extensions: { code: 403 } }],
+                };
+                const result = handleBatchError(urns, e, defaultMessage);
+                expect(result).toEqual({
+                    content:
+                        'Your bulk edit selection included entities that you are unauthorized to update. The bulk edit being performed will not be saved.',
+                    duration: 3,
+                });
+            });
+            test('should return defaultMessage if urns length is not greater than 1', () => {
+                const result = handleBatchError('urn', new Error(), defaultMessage);
+                expect(result).toEqual(defaultMessage);
+            });
+            test('should return defaultMessage if urns length is greater than 1 but error code is not 403', () => {
+                const e = {
+                    graphQLErrors: [{ extensions: { code: 500 } }],
+                };
+                const result = handleBatchError(urns, e, defaultMessage);
+                expect(result).toEqual(defaultMessage);
+            });
+        });
+    });
+    describe('getDataProduct ->', () => {
+        it('should return entities from EntityRelationshipsResult', () => {
+            expect(getDataProduct(mockEntityRelationShipResult)).toMatchObject(
+                mockEntityRelationShipResult?.relationships[0].entity as DataProduct,
+            );
+        });
+    });
+
+    describe('getFineGrainedLineageWithSiblings ->', () => {
+        describe('should put all of the fineGrainedLineages for a given entity and its siblings into one array so we have all of it in one place', () => {
+            test('should return empty array if entityData is null', () => {
+                const result = getFineGrainedLineageWithSiblings(null, vi.fn());
+                expect(result).toEqual([]);
+            });
+            test('should return fineGrainedLineages from entityData if available', () => {
+                const expectedResult = [
+                    {
+                        upstreams: [{ urn: 'urn:li:glossaryTerm:example.glossaryterm1', path: 'test_downstream1' }],
+                        downstreams: [{ urn: 'urn:li:glossaryTerm:example.glossaryterm2', path: 'test_downstream2' }],
+                    },
+                ];
+                const result = getFineGrainedLineageWithSiblings(mockFineGrainedLineages1, vi.fn());
+                expect(result).toMatchObject(expectedResult);
+            });
+        });
+    });
+    describe('summaryHasStats ->', () => {
+        it('should return whether summary has stats or not', () => {
+            const mockPayload: DatasetStatsSummary = {
+                __typename: 'DatasetStatsSummary',
+                topUsersLast30Days: [{ urn: 'test_urn', type: EntityType.CorpUser, username: 'test_username' }],
+            };
+            expect(summaryHasStats(mockPayload)).toBe(true);
+        });
+    });
+    describe('isOutputPort ->', () => {
+        it('should return entities from EntityRelationshipsResult', () => {
+            expect(isOutputPort(mockSearchResult)).toBe(true);
+        });
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/announce/CreateEntityAnnouncementModal.tsx b/datahub-web-react/src/app/entityV2/shared/announce/CreateEntityAnnouncementModal.tsx
new file mode 100644
index 00000000000000..9af91149a2dc59
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/announce/CreateEntityAnnouncementModal.tsx
@@ -0,0 +1,261 @@
+import React, { useEffect, useState } from 'react';
+import { Button, Form, Input, Modal, Typography, message } from 'antd';
+import styled from 'styled-components';
+import EditNoteIcon from '@mui/icons-material/EditNote';
+import { useCreatePostMutation, useUpdatePostMutation } from '../../../../graphql/mutations.generated';
+import { MediaType, PostContentType, PostType, SubResourceType } from '../../../../types.generated';
+import { PostEntry } from '../../../settings/posts/PostsListColumns';
+import {
+    CREATE_POST_BUTTON_ID,
+    LINK_FIELD_NAME,
+    LOCATION_FIELD_NAME,
+    TYPE_FIELD_NAME,
+} from '../../../settings/posts/constants';
+import handleGraphQLError from '../../../shared/handleGraphQLError';
+import { useEnterKeyListener } from '../../../shared/useEnterKeyListener';
+import { Editor } from '../tabs/Documentation/components/editor/Editor';
+
+const SubFormItem = styled(Form.Item)`
+    margin-bottom: 24px;
+`;
+
+type Props = {
+    urn: string;
+    subResource?: string | null;
+    editData?: PostEntry;
+    onClose: () => void;
+    onCreate?: (title: string, description: string | undefined) => void;
+    onEdit?: () => void;
+};
+
+const EditorContainer = styled.div`
+    flex: 1;
+    border: 1px solid #d9d9d9;
+    border-radius: 8px;
+    .remirror-editor.ProseMirror {
+        padding: 10px;
+        min-height: 150px;
+    }
+    .remirror-theme > div:first-child {
+        padding: 0;
+        margin: 0;
+    }
+`;
+
+const ModalHeaderContainer = styled.div`
+    height: 86px;
+    display: flex;
+    align-items: center;
+    font-size: 20px;
+    font-family: 'Mulish', sans-serif;
+    font-weight: lighter;
+`;
+
+const ModalTitle = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    max-height: 240px;
+`;
+
+const StyledModal = styled(Modal)`
+    width: 680px !important;
+    .ant-modal-header {
+        padding: 0px 32px;
+    }
+`;
+
+const StyledButton = styled(Button)`
+    background: #533fd1;
+    color: #f9fafc;
+    border-radius: 5px;
+    border: 1px;
+`;
+
+export default function CreateEntityAnnouncementModal({
+    urn,
+    subResource,
+    onClose,
+    onCreate,
+    editData,
+    onEdit,
+}: Props) {
+    const [createPostMutation] = useCreatePostMutation();
+    const [updatePostMutation] = useUpdatePostMutation();
+    const [createButtonEnabled, setCreateButtonEnabled] = useState(false);
+    const noteTitle = 'title';
+    const noteContent = 'description';
+    const [form] = Form.useForm();
+
+    useEffect(() => {
+        if (editData) {
+            form.setFieldsValue({
+                description: editData.description,
+                title: editData.title,
+                link: editData.link,
+                location: editData.imageUrl,
+                type: editData.contentType,
+            });
+        }
+    }, [editData, form]);
+
+    const onCreatePost = () => {
+        createPostMutation({
+            variables: {
+                input: {
+                    postType: PostType.EntityAnnouncement,
+                    content: {
+                        contentType: PostContentType.Text,
+                        title: form.getFieldValue(noteTitle),
+                        description: form.getFieldValue(noteContent) ?? null,
+                    },
+                    resourceUrn: urn,
+                    subResource,
+                    subResourceType: SubResourceType.DatasetField,
+                },
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.success({
+                        content: `Created Note!`,
+                        duration: 3,
+                    });
+                    onCreate?.(form.getFieldValue(noteTitle), form.getFieldValue(noteContent));
+                    form.resetFields();
+                }
+            })
+            .catch((error) => {
+                handleGraphQLError({
+                    error,
+                    defaultMessage: 'Failed to create Note! An unexpected error occurred',
+                    permissionMessage: 'Unauthorized to create Note. Please contact your DataHub administrator.',
+                });
+            });
+        onClose();
+    };
+
+    const onUpdatePost = () => {
+        const mediaValue =
+            form.getFieldValue(TYPE_FIELD_NAME) && form.getFieldValue(LOCATION_FIELD_NAME)
+                ? {
+                      type: MediaType.Image,
+                      location: form.getFieldValue(LOCATION_FIELD_NAME) ?? null,
+                  }
+                : null;
+        updatePostMutation({
+            variables: {
+                input: {
+                    urn: editData?.urn || '',
+                    postType: PostType.EntityAnnouncement,
+                    content: {
+                        contentType: PostContentType.Text,
+                        title: form.getFieldValue(noteTitle),
+                        description: form.getFieldValue(noteContent) ?? null,
+                        link: form.getFieldValue(LINK_FIELD_NAME) ?? null,
+                        media: mediaValue,
+                    },
+                },
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.success({
+                        content: `Updated Note!`,
+                        duration: 3,
+                    });
+                    onEdit?.();
+                    form.resetFields();
+                }
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: 'Failed to update Note! An unknown error occured.', duration: 3 });
+                console.error('Failed to update Note:', e.message);
+            });
+        onClose();
+    };
+
+    // Handle the Enter press
+    useEnterKeyListener({
+        querySelectorToExecuteClick: '#createPostButton',
+    });
+
+    const onCloseModal = () => {
+        form.resetFields();
+        onClose();
+    };
+
+    // note-- edit announcement functionality is not implemented
+    const titleText = editData ? 'Edit Note' : 'Create Note';
+
+    /**
+     * Handles the change in the description field.
+     * @param {string} value - The new value of the description field.
+     */
+    const handleDescriptionChange = (value) => {
+        form.setFieldsValue({ [noteContent]: value });
+        form.validateFields();
+    };
+
+    return (
+        <StyledModal
+            title={
+                <ModalHeaderContainer>
+                    <ModalTitle>
+                        <EditNoteIcon fontSize="medium" />
+                        {titleText}
+                    </ModalTitle>
+                </ModalHeaderContainer>
+            }
+            open
+            onCancel={onCloseModal}
+            footer={
+                <>
+                    <Button onClick={onCloseModal} type="text" id="createPostButton">
+                        Cancel
+                    </Button>
+                    <StyledButton
+                        id={CREATE_POST_BUTTON_ID}
+                        data-testid={!editData ? 'create-announcement-button' : 'update-announcement-button'}
+                        onClick={!editData ? onCreatePost : onUpdatePost}
+                        disabled={!createButtonEnabled}
+                    >
+                        {!editData ? 'Create' : 'Update'}
+                    </StyledButton>
+                </>
+            }
+        >
+            <Form
+                form={form}
+                initialValues={editData}
+                layout="vertical"
+                onFieldsChange={() => {
+                    setCreateButtonEnabled(!form.getFieldsError().some((field) => field.errors.length > 0));
+                }}
+                onKeyDown={(e) => {
+                    // Preventing the modal from closing when the Enter key is pressed
+                    if (e.key === 'Enter') {
+                        e.preventDefault();
+                        e.stopPropagation();
+                    }
+                }}
+            >
+                <Typography.Paragraph>Title</Typography.Paragraph>
+                <SubFormItem name={noteTitle} rules={[{ min: 1, max: 500, required: true }]} hasFeedback>
+                    <Input placeholder="Your title" />
+                </SubFormItem>
+                <Typography.Paragraph>Content</Typography.Paragraph>
+                <SubFormItem name={noteContent} rules={[{ min: 1, max: 5000 }]} hasFeedback>
+                    <EditorContainer>
+                        <Editor
+                            content={editData?.description || ''}
+                            onChange={handleDescriptionChange}
+                            placeholder="Write a note. Tag @user or reference @asset to make your note come to life!"
+                        />
+                    </EditorContainer>
+                </SubFormItem>
+            </Form>
+        </StyledModal>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/ListSearch/AcrylListSearch.tsx b/datahub-web-react/src/app/entityV2/shared/components/ListSearch/AcrylListSearch.tsx
new file mode 100644
index 00000000000000..4786a738696847
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/ListSearch/AcrylListSearch.tsx
@@ -0,0 +1,118 @@
+import { SearchOutlined } from '@ant-design/icons';
+import { Input } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { REDESIGN_COLORS } from '@src/app/entityV2/shared/constants';
+import { pluralize } from '@src/app/shared/textUtil';
+
+const StyledInput = styled(Input)`
+    width: auto;
+    background: ${REDESIGN_COLORS.WHITE};
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 24px;
+    color: ${REDESIGN_COLORS.BODY_TEXT};
+`;
+
+const MatchLabelText = styled.span`
+    font-size: 12px;
+    font-weight: 400;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+`;
+
+const SearchContainer = styled.div`
+    position: relative;
+    --antd-wave-shadow-color: transparent;
+    flex: auto;
+    display: flex;
+    flex-grow: 0;
+    align-items: start;
+    white-space: nowrap;
+    flex-direction: column;
+
+    .ant-input-group-wrapper {
+        border-radius: 8px;
+        border: 1px solid ${REDESIGN_COLORS.SILVER_GREY};
+        background: #f3f5fa;
+    }
+
+    .ant-input-group-wrapper {
+        background-color: #ffffff !important;
+    }
+
+    .ant-input-wrapper {
+        background-color: #ffffff00 !important;
+    }
+
+    .ant-input {
+        border-radius: 0;
+        color: ${REDESIGN_COLORS.BODY_TEXT};
+    }
+    .ant-input::placeholder {
+        color: ${REDESIGN_COLORS.BODY_TEXT} !important;
+        opacity: 1;
+    }
+
+    .ant-input-affix-wrapper {
+        border-radius: 8px;
+        border: 1px solid ${REDESIGN_COLORS.SILVER_GREY};
+        transition: border-color 0.3s ease-in-out;
+        cursor: text !important;
+    }
+
+    .ant-input-group-addon {
+        border: none;
+        background-color: #ffffff00 !important;
+        left: 2px;
+    }
+
+    .ant-input-affix-wrapper:focus-within,
+    .ant-input-affix-wrapper:not(.ant-input-affix-wrapper-disabled):hover {
+        border: 1px solid ${REDESIGN_COLORS.TITLE_PURPLE};
+    }
+
+    .ant-input-affix-wrapper::selection {
+        background: transparent;
+    }
+`;
+
+interface AcrylListSearchProps {
+    searchText: string;
+    debouncedSetFilterText: (event: React.ChangeEvent<HTMLInputElement>) => void;
+    matchResultCount: number;
+    numRows: number;
+    options?: {
+        hidePrefix?: boolean;
+        placeholder?: string;
+        allowClear?: boolean;
+        hideMatchCountText?: boolean;
+    };
+    entityTypeName: string;
+}
+
+export const AcrylListSearch: React.FC<AcrylListSearchProps> = ({
+    searchText,
+    debouncedSetFilterText,
+    matchResultCount,
+    numRows,
+    entityTypeName,
+    options,
+}) => {
+    return (
+        <SearchContainer>
+            <StyledInput
+                bordered={false}
+                value={searchText}
+                placeholder={options?.placeholder || 'Search...'}
+                onChange={debouncedSetFilterText}
+                allowClear
+                prefix={!options?.hidePrefix && <SearchOutlined />}
+            />
+            {searchText && !options?.hideMatchCountText && (
+                <MatchLabelText>
+                    Matched {matchResultCount} {pluralize(matchResultCount, entityTypeName)} of {numRows}
+                </MatchLabelText>
+            )}
+        </SearchContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/legacy/DescriptionModal.tsx b/datahub-web-react/src/app/entityV2/shared/components/legacy/DescriptionModal.tsx
new file mode 100644
index 00000000000000..0b8cde0f1cc404
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/legacy/DescriptionModal.tsx
@@ -0,0 +1,85 @@
+import { Typography, Modal, Button, Form } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { Editor } from '../../tabs/Documentation/components/editor/Editor';
+import { ANTD_GRAY } from '../../constants';
+
+const FormLabel = styled(Typography.Text)`
+    font-size: 10px;
+    font-weight: bold;
+`;
+
+const StyledEditor = styled(Editor)`
+    border: 1px solid ${ANTD_GRAY[4.5]};
+`;
+
+const StyledViewer = styled(Editor)`
+    .remirror-editor.ProseMirror {
+        padding: 0;
+    }
+`;
+
+const OriginalDocumentation = styled(Form.Item)`
+    margin-bottom: 12px;
+`;
+
+type Props = {
+    title: string;
+    description?: string;
+    original?: string;
+    propagatedDescription?: string;
+    onClose: () => void;
+    onSubmit: (description: string) => void;
+    isAddDesc?: boolean;
+};
+
+export default function UpdateDescriptionModal({
+    title,
+    description,
+    original,
+    propagatedDescription,
+    onClose,
+    onSubmit,
+    isAddDesc,
+}: Props) {
+    const [updatedDesc, setDesc] = useState(description || original || '');
+
+    return (
+        <Modal
+            title={title}
+            open
+            width={900}
+            onCancel={onClose}
+            okText={isAddDesc ? 'Submit' : 'Update'}
+            footer={
+                <>
+                    <Button onClick={onClose}>Cancel</Button>
+                    <Button
+                        type="primary"
+                        onClick={() => onSubmit(updatedDesc)}
+                        disabled={updatedDesc === description}
+                        data-testid="description-modal-update-button"
+                    >
+                        Publish
+                    </Button>
+                </>
+            }
+        >
+            <Form layout="vertical">
+                {!isAddDesc && description && original && (
+                    <OriginalDocumentation label={<FormLabel>Original:</FormLabel>}>
+                        <StyledViewer content={original || ''} readOnly />
+                    </OriginalDocumentation>
+                )}
+                {!isAddDesc && description && propagatedDescription && (
+                    <OriginalDocumentation label={<FormLabel>Propagated:</FormLabel>}>
+                        <StyledViewer content={propagatedDescription || ''} readOnly />
+                    </OriginalDocumentation>
+                )}
+                <Form.Item>
+                    <StyledEditor content={updatedDesc} onChange={setDesc} />
+                </Form.Item>
+            </Form>
+        </Modal>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/legacy/Properties.tsx b/datahub-web-react/src/app/entityV2/shared/components/legacy/Properties.tsx
new file mode 100644
index 00000000000000..7b0de67195ad1e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/legacy/Properties.tsx
@@ -0,0 +1,30 @@
+import { Space, Table, Typography } from 'antd';
+import React from 'react';
+import { ColumnsType } from 'antd/es/table';
+import { StringMapEntry } from '../../../../../types.generated';
+
+export type Props = {
+    properties: StringMapEntry[];
+};
+
+export function Properties({ properties }: Props) {
+    const propertyTableColumns: ColumnsType<StringMapEntry> = [
+        {
+            title: 'Name',
+            dataIndex: 'key',
+            sorter: (a, b) => a.key.localeCompare(b.key),
+            defaultSortOrder: 'ascend',
+        },
+        {
+            title: 'Value',
+            dataIndex: 'value',
+        },
+    ];
+
+    return (
+        <Space direction="vertical" style={{ width: '100%' }} size="large">
+            <Typography.Title level={3}>Properties</Typography.Title>
+            <Table pagination={false} columns={propertyTableColumns} dataSource={properties} />
+        </Space>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/AddLinkModal.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/AddLinkModal.tsx
new file mode 100644
index 00000000000000..77e9e751d31b21
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/AddLinkModal.tsx
@@ -0,0 +1,141 @@
+import React, { useState } from 'react';
+import { message, Modal, Button, Form, Input } from 'antd';
+import styled from 'styled-components/macro';
+import { PlusOutlined } from '@ant-design/icons';
+import { useEntityData, useMutationUrn } from '../../../../entity/shared/EntityContext';
+import { useAddLinkMutation } from '../../../../../graphql/mutations.generated';
+import analytics, { EventType, EntityActionType } from '../../../../analytics';
+import { useUserContext } from '../../../../context/useUserContext';
+import { REDESIGN_COLORS } from '../../constants';
+
+const TransparentButton = styled(Button)`
+    color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    font-size: 12px;
+    box-shadow: none;
+    border-color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    &:hover {
+        transition: 0.15s;
+        opacity: 0.9;
+        border-color: ${REDESIGN_COLORS.TITLE_PURPLE};
+        color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    }
+`;
+
+type AddLinkProps = {
+    buttonProps?: Record<string, unknown>;
+    refetch?: () => Promise<any>;
+    buttonType?: string;
+};
+
+export const AddLinkModal = ({ buttonProps, refetch, buttonType }: AddLinkProps) => {
+    const [isModalVisible, setIsModalVisible] = useState(false);
+    const mutationUrn = useMutationUrn();
+    const user = useUserContext();
+    const { entityType } = useEntityData();
+    const [addLinkMutation] = useAddLinkMutation();
+
+    const [form] = Form.useForm();
+
+    const showModal = () => {
+        setIsModalVisible(true);
+    };
+
+    const handleClose = () => {
+        form.resetFields();
+        setIsModalVisible(false);
+    };
+
+    const handleAdd = async (formData: any) => {
+        if (user?.urn) {
+            try {
+                await addLinkMutation({
+                    variables: { input: { linkUrl: formData.url, label: formData.label, resourceUrn: mutationUrn } },
+                });
+                message.success({ content: 'Link Added', duration: 2 });
+                analytics.event({
+                    type: EventType.EntityActionEvent,
+                    entityType,
+                    entityUrn: mutationUrn,
+                    actionType: EntityActionType.UpdateLinks,
+                });
+            } catch (e: unknown) {
+                message.destroy();
+                if (e instanceof Error) {
+                    message.error({ content: `Failed to add link: \n ${e.message || ''}`, duration: 3 });
+                }
+            }
+            refetch?.();
+            handleClose();
+        } else {
+            message.error({ content: `Error adding link: no user`, duration: 2 });
+        }
+    };
+
+    return (
+        <>
+            {buttonType === 'transparent' ? (
+                <TransparentButton
+                    data-testid="add-link-button"
+                    size="large"
+                    icon={<PlusOutlined />}
+                    onClick={showModal}
+                    {...buttonProps}
+                >
+                    Add Link
+                </TransparentButton>
+            ) : (
+                <Button data-testid="add-link-button" icon={<PlusOutlined />} onClick={showModal} {...buttonProps}>
+                    Add Link
+                </Button>
+            )}
+            <Modal
+                title="Add Link"
+                visible={isModalVisible}
+                destroyOnClose
+                onCancel={handleClose}
+                footer={[
+                    <Button type="text" onClick={handleClose}>
+                        Cancel
+                    </Button>,
+                    <Button data-testid="add-link-modal-add-button" form="addLinkForm" key="submit" htmlType="submit">
+                        Add
+                    </Button>,
+                ]}
+            >
+                <Form form={form} name="addLinkForm" onFinish={handleAdd} layout="vertical">
+                    <Form.Item
+                        data-testid="add-link-modal-url"
+                        name="url"
+                        label="URL"
+                        rules={[
+                            {
+                                required: true,
+                                message: 'A URL is required.',
+                            },
+                            {
+                                type: 'url',
+                                warningOnly: true,
+                                message: 'This field must be a valid url.',
+                            },
+                        ]}
+                    >
+                        <Input placeholder="https://" autoFocus />
+                    </Form.Item>
+                    <Form.Item
+                        data-testid="add-link-modal-label"
+                        name="label"
+                        label="Label"
+                        rules={[
+                            {
+                                required: true,
+                                message: 'A label is required.',
+                            },
+                        ]}
+                    >
+                        <Input placeholder="A short label for this link" />
+                    </Form.Item>
+                </Form>
+            </Modal>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/DemoButton.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/DemoButton.tsx
new file mode 100644
index 00000000000000..b7b974ef6e2ea0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/DemoButton.tsx
@@ -0,0 +1,22 @@
+import { Button } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+
+const StyledButton = styled(Button)`
+    padding: 8px;
+    font-size: 14px;
+    margin-left: 18px;
+`;
+
+export default function DemoButton() {
+    return (
+        <StyledButton
+            type="primary"
+            href="https://www.acryldata.io/datahub-sign-up?utm_source=datahub&utm_medium=referral&utm_campaign=acryl_signup"
+            target="_blank"
+            rel="noopener noreferrer"
+        >
+            Schedule a Demo
+        </StyledButton>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/DeprecationIcon.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/DeprecationIcon.tsx
new file mode 100644
index 00000000000000..eeff163ad31d5b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/DeprecationIcon.tsx
@@ -0,0 +1,224 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Popover, Tooltip } from '@components';
+import { Divider, Modal, Typography, message } from 'antd';
+import moment from 'moment';
+import { TooltipPlacement } from 'antd/es/tooltip';
+import DeprecatedIcon from '../../../../../images/deprecated-status.svg?react';
+import { useBatchUpdateDeprecationMutation } from '../../../../../graphql/mutations.generated';
+import { Deprecation, SubResourceType } from '../../../../../types.generated';
+import { EntityLink } from '../../../../homeV2/reference/sections/EntityLink';
+import { getV1FieldPathFromSchemaFieldUrn } from '../../../../lineageV2/lineageUtils';
+import { getLocaleTimezone, toLocalDateString } from '../../../../shared/time/timeUtils';
+import { REDESIGN_COLORS } from '../../constants';
+import MarkAsDeprecatedButton from './MarkAsDeprecatedButton';
+
+const DeprecatedContainer = styled.div`
+    display: flex;
+    justify-content: center;
+    gap: 4px;
+    align-items: center;
+    color: ${REDESIGN_COLORS.DEPRECATION_RED};
+`;
+
+const DeprecatedTitle = styled(Typography.Text)`
+    display: block;
+    font-size: 14px;
+    margin-bottom: 5px;
+    font-weight: bold;
+    color: ${REDESIGN_COLORS.TEXT_HEADING};
+`;
+
+const DeprecatedSubTitle = styled(Typography.Text)`
+    display: block;
+    margin-bottom: 5px;
+    color: ${REDESIGN_COLORS.TEXT_HEADING};
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 100%;
+`;
+
+const LastEvaluatedAtLabel = styled.div`
+    padding: 0;
+    margin: 0;
+    display: flex;
+    align-items: center;
+    color: ${REDESIGN_COLORS.SUB_TEXT};
+`;
+
+const ReplacementContainer = styled.span`
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    // make sure the span doesn't exceed the parent div
+    max-width: 100%;
+`;
+
+const ThinDivider = styled(Divider)`
+    margin-top: 8px;
+    margin-bottom: 8px;
+`;
+
+const IconGroup = styled.div`
+    padding-top: 10px;
+    font-size: 12px;
+    color: ${REDESIGN_COLORS.TEXT_HEADING};
+
+    &:hover {
+        color: ${REDESIGN_COLORS.TITLE_PURPLE};
+        cursor: pointer;
+    }
+`;
+
+const StyledDeprecatedIcon = styled(DeprecatedIcon)`
+    color: inherit;
+    path {
+        fill: currentColor;
+    }
+    && {
+        fill: currentColor;
+    }
+`;
+
+type Props = {
+    urn: string;
+    subResource?: string | null;
+    subResourceType?: SubResourceType;
+    deprecation: Deprecation;
+    refetch?: () => void;
+    showUndeprecate: boolean | null;
+    showText?: boolean;
+    zIndexOverride?: number;
+    popoverPlacement?: TooltipPlacement;
+};
+
+export const DeprecationIcon = ({
+    deprecation,
+    urn,
+    subResource,
+    subResourceType,
+    refetch,
+    showUndeprecate,
+    zIndexOverride,
+    showText = true,
+    popoverPlacement = 'bottom',
+}: Props) => {
+    const [batchUpdateDeprecationMutation] = useBatchUpdateDeprecationMutation();
+    const localeTimezone = getLocaleTimezone(); // Deprecation Decommission Timestamp
+
+    let decommissionTimeSeconds;
+    if (deprecation.decommissionTime) {
+        if (deprecation.decommissionTime < 943920000000) {
+            // Time is set in way past if it was milli-second so considering this as set in seconds
+            decommissionTimeSeconds = deprecation.decommissionTime;
+        } else {
+            decommissionTimeSeconds = deprecation.decommissionTime / 1000;
+        }
+    }
+    const decommissionTimeLocal =
+        (decommissionTimeSeconds &&
+            `Scheduled to be decommissioned on ${toLocalDateString(
+                decommissionTimeSeconds * 1000,
+            )} (${localeTimezone})`) ||
+        undefined;
+    const decommissionTimeGMT =
+        decommissionTimeSeconds && moment.unix(decommissionTimeSeconds).utc().format('dddd, DD/MMM/YYYY HH:mm:ss z');
+
+    const hasDetails = deprecation.note !== '' || deprecation.decommissionTime !== null;
+    const isDividerNeeded = deprecation.note !== '' && deprecation.decommissionTime !== null;
+
+    const batchUndeprecate = () => {
+        batchUpdateDeprecationMutation({
+            variables: {
+                input: {
+                    resources: [{ resourceUrn: urn, subResource, subResourceType }],
+                    deprecated: false,
+                },
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.success({ content: 'Marked assets as un-deprecated!', duration: 2 });
+                    refetch?.();
+                }
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({
+                    content: `Failed to mark assets as un-deprecated: \n ${e.message || ''}`,
+                    duration: 3,
+                });
+            });
+    };
+
+    const isReplacementSchemaField = deprecation?.replacement?.urn?.startsWith('urn:li:schemaField');
+    const entityTypeDisplayName = subResourceType === SubResourceType.DatasetField ? 'column' : 'asset';
+
+    return (
+        <Popover
+            overlayStyle={{ maxWidth: 240 }}
+            zIndex={zIndexOverride || 999} // set to 999 to ensure it is below the 1000 mark of the entity popover if on the entity level
+            placement={popoverPlacement}
+            content={
+                hasDetails ? (
+                    <>
+                        <DeprecatedTitle>This {entityTypeDisplayName} is deprecated</DeprecatedTitle>
+                        {isDividerNeeded && <ThinDivider />}
+                        {deprecation.replacement && (
+                            <DeprecatedSubTitle>
+                                {isReplacementSchemaField ? (
+                                    <>
+                                        <b>Replacement: </b>
+                                        <ReplacementContainer>
+                                            {getV1FieldPathFromSchemaFieldUrn(deprecation.replacement.urn)}
+                                        </ReplacementContainer>
+                                    </>
+                                ) : (
+                                    <>
+                                        <b>Replacement:</b> <EntityLink entity={deprecation.replacement} />
+                                    </>
+                                )}
+                            </DeprecatedSubTitle>
+                        )}
+                        {deprecation?.note !== '' && <DeprecatedSubTitle>{deprecation.note}</DeprecatedSubTitle>}
+                        {deprecation?.decommissionTime !== null && (
+                            <Typography.Text type="secondary">
+                                <Tooltip placement="right" title={decommissionTimeGMT}>
+                                    <LastEvaluatedAtLabel>{decommissionTimeLocal}</LastEvaluatedAtLabel>
+                                </Tooltip>
+                            </Typography.Text>
+                        )}
+                        {isDividerNeeded && showUndeprecate ? <ThinDivider /> : null}
+                        {showUndeprecate && (
+                            <IconGroup
+                                onClick={() =>
+                                    Modal.confirm({
+                                        title: `Confirm Mark as un-deprecated`,
+                                        content: `Are you sure you want to mark this asset as un-deprecated?`,
+                                        onOk() {
+                                            batchUndeprecate();
+                                        },
+                                        onCancel() {},
+                                        okText: 'Yes',
+                                        maskClosable: true,
+                                        closable: true,
+                                    })
+                                }
+                            >
+                                <MarkAsDeprecatedButton internalText="Mark as un-deprecated" />
+                            </IconGroup>
+                        )}
+                    </>
+                ) : (
+                    'No additional details'
+                )
+            }
+        >
+            <DeprecatedContainer>
+                <StyledDeprecatedIcon />
+                {showText ? 'Deprecated' : null}
+            </DeprecatedContainer>
+        </Popover>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/EmptyTab.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/EmptyTab.tsx
new file mode 100644
index 00000000000000..479d5cdd01bea7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/EmptyTab.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Empty, Typography } from 'antd';
+import { EMPTY_MESSAGES } from '../../constants';
+import NoDocs from '../../../../../images/no-docs.svg';
+
+const StyledEmpty = styled(Empty)<{ $hideImage?: boolean }>`
+    padding: 40px;
+    ${({ $hideImage }) => ($hideImage ? '.ant-empty-image { margin: 0; }' : '.ant-empty-image { height: 86px; }')}
+
+    .ant-empty-footer {
+        .ant-btn:not(:last-child) {
+            margin-right: 8px;
+        }
+    }
+`;
+
+const EmptyDescription = styled.div`
+    > * {
+        max-width: 70ch;
+        display: block;
+        margin-right: auto;
+        margin-left: auto;
+    }
+`;
+
+type Props = {
+    tab: string;
+    hideImage?: boolean;
+    children?: React.ReactNode;
+};
+
+export const EmptyTab = ({ tab, hideImage, children }: Props) => {
+    return (
+        <StyledEmpty
+            description={
+                <EmptyDescription data-testid="empty-tab-description">
+                    <Typography.Title level={4}>{EMPTY_MESSAGES[tab]?.title}</Typography.Title>
+                    <Typography.Text type="secondary">{EMPTY_MESSAGES[tab]?.description}</Typography.Text>
+                </EmptyDescription>
+            }
+            $hideImage={hideImage}
+            image={NoDocs}
+        >
+            {children}
+        </StyledEmpty>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedActor.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedActor.tsx
new file mode 100644
index 00000000000000..8dbf5da7d24731
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedActor.tsx
@@ -0,0 +1,50 @@
+import { Tag } from 'antd';
+import { Popover } from '@components';
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import { CorpGroup, CorpUser, EntityType } from '../../../../../types.generated';
+import { CustomAvatar } from '../../../../shared/avatar';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+
+type Props = {
+    actor: CorpUser | CorpGroup;
+    popOver?: React.ReactNode;
+    closable?: boolean | undefined;
+    onClose?: () => void;
+};
+
+const ActorTag = styled(Tag)`
+    padding: 2px;
+    padding-right: 6px;
+    margin-bottom: 8px;
+    display: inline-flex;
+    align-items: center;
+`;
+
+export const ExpandedActor = ({ actor, popOver, closable, onClose }: Props) => {
+    const entityRegistry = useEntityRegistry();
+
+    let name = '';
+    if (actor.__typename === 'CorpGroup') {
+        name = entityRegistry.getDisplayName(EntityType.CorpGroup, actor);
+    }
+    if (actor.__typename === 'CorpUser') {
+        name = entityRegistry.getDisplayName(EntityType.CorpUser, actor);
+    }
+
+    const pictureLink = (actor.__typename === 'CorpUser' && actor.editableProperties?.pictureLink) || undefined;
+
+    return (
+        <ActorTag onClose={onClose} closable={closable}>
+            <Link to={`${entityRegistry.getEntityUrl(actor.type, actor.urn)}`}>
+                <CustomAvatar name={name} photoUrl={pictureLink} useDefaultAvatar={false} />
+                {(!popOver && <>{name}</>) || (
+                    <Popover overlayStyle={{ maxWidth: 200 }} placement="left" content={popOver}>
+                        {name}
+                    </Popover>
+                )}
+            </Link>
+        </ActorTag>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedActorGroup.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedActorGroup.tsx
new file mode 100644
index 00000000000000..3afdfdf344c5f0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedActorGroup.tsx
@@ -0,0 +1,57 @@
+import { Typography } from 'antd';
+import { Popover } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import { CorpGroup, CorpUser } from '../../../../../types.generated';
+import { ExpandedActor } from './ExpandedActor';
+
+const PopoverActors = styled.div`
+    max-width: 600px;
+`;
+
+const ActorsContainer = styled.div`
+    display: flex;
+    justify-content: right;
+    flex-wrap: wrap;
+    align-items: center;
+`;
+
+const RemainderText = styled(Typography.Text)`
+    display: flex;
+    justify-content: right;
+    margin-right: 8px;
+`;
+
+type Props = {
+    actors: Array<CorpUser | CorpGroup>;
+    max: number;
+    onClose?: (actor: CorpUser | CorpGroup) => void;
+    containerStyle?: any;
+};
+
+const DEFAULT_MAX = 10;
+
+export const ExpandedActorGroup = ({ actors, max = DEFAULT_MAX, onClose, containerStyle }: Props) => {
+    const finalActors = actors.length > max ? actors.slice(0, max) : actors;
+    const remainder = actors.length > max ? actors.length - max : undefined;
+
+    return (
+        <Popover
+            placement="left"
+            content={
+                <PopoverActors>
+                    {actors.map((actor) => (
+                        <ExpandedActor key={actor.urn} actor={actor} onClose={() => onClose?.(actor)} />
+                    ))}
+                </PopoverActors>
+            }
+        >
+            <ActorsContainer style={containerStyle}>
+                {finalActors.map((actor) => (
+                    <ExpandedActor key={actor.urn} actor={actor} onClose={() => onClose?.(actor)} />
+                ))}
+            </ActorsContainer>
+            {remainder && <RemainderText type="secondary">+ {remainder} more</RemainderText>}
+        </Popover>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/ExpandedOwner.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/ExpandedOwner.tsx
new file mode 100644
index 00000000000000..f0fa26b9de765d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/ExpandedOwner.tsx
@@ -0,0 +1,119 @@
+import { message, Modal, Tag } from 'antd';
+import React from 'react';
+import styled from 'styled-components/macro';
+import { StyledLink } from '@src/app/previewV2/EntityHeader';
+import { useRemoveOwnerMutation } from '../../../../../../graphql/mutations.generated';
+import { EntityType, Owner } from '../../../../../../types.generated';
+import { getNameFromType } from '../../../containers/profile/sidebar/Ownership/ownershipUtils';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import analytics, { EventType, EntityActionType } from '../../../../../analytics';
+import { useEntityData } from '../../../../../entity/shared/EntityContext';
+import OwnerContent from './OwnerContent';
+import { useEmbeddedProfileLinkProps } from '../../../../../shared/useEmbeddedProfileLinkProps';
+
+const OwnerTag = styled(Tag)`
+    padding: 1px;
+    padding-right: 6px;
+    margin-bottom: 8px;
+    display: inline-flex;
+    align-items: center;
+    font-weight: 600;
+    border-color: #9da7c0 !important;
+    padding: 2px 6px 2px 3px;
+
+    max-width: inherit;
+`;
+
+type Props = {
+    entityUrn?: string;
+    owner: Owner;
+    hidePopOver?: boolean | undefined;
+    refetch?: () => Promise<any>;
+    readOnly?: boolean;
+    fontSize?: number;
+};
+
+export const ExpandedOwner = ({ entityUrn, owner, hidePopOver, refetch, readOnly, fontSize }: Props) => {
+    const entityRegistry = useEntityRegistry();
+    const { entityType } = useEntityData();
+    const linkProps = useEmbeddedProfileLinkProps();
+    const [removeOwnerMutation] = useRemoveOwnerMutation();
+    let name = '';
+    let ownershipTypeName = '';
+    if (owner.owner.__typename === 'CorpGroup') {
+        name = entityRegistry.getDisplayName(EntityType.CorpGroup, owner.owner);
+    }
+    if (owner.owner.__typename === 'CorpUser') {
+        name = entityRegistry.getDisplayName(EntityType.CorpUser, owner.owner);
+    }
+    if (owner.ownershipType && owner.ownershipType.info) {
+        ownershipTypeName = owner.ownershipType.info.name;
+    } else if (owner.type) {
+        ownershipTypeName = getNameFromType(owner.type);
+    }
+    const pictureLink =
+        (owner.owner.__typename === 'CorpUser' && owner.owner.editableProperties?.pictureLink) || undefined;
+    const onDelete = async () => {
+        if (!entityUrn) {
+            return;
+        }
+        try {
+            await removeOwnerMutation({
+                variables: {
+                    input: {
+                        ownerUrn: owner.owner.urn,
+                        ownershipTypeUrn: owner.ownershipType?.urn,
+                        resourceUrn: entityUrn,
+                    },
+                },
+            });
+            message.success({ content: 'Owner Removed', duration: 2 });
+            analytics.event({
+                type: EventType.EntityActionEvent,
+                actionType: EntityActionType.UpdateOwnership,
+                entityType,
+                entityUrn,
+            });
+        } catch (e: unknown) {
+            message.destroy();
+            if (e instanceof Error) {
+                message.error({ content: `Failed to remove owner: \n ${e.message || ''}`, duration: 3 });
+            }
+        }
+        refetch?.();
+    };
+    const onClose = (e) => {
+        e.preventDefault();
+        Modal.confirm({
+            title: `Do you want to remove ${name}?`,
+            content: `Are you sure you want to remove ${name} as an ${ownershipTypeName} type owner?`,
+            onOk() {
+                onDelete();
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
+    return (
+        <OwnerTag onClose={onClose} closable={!!entityUrn && !readOnly}>
+            {readOnly && <OwnerContent name={name} owner={owner} hidePopOver={hidePopOver} pictureLink={pictureLink} />}
+            {!readOnly && (
+                <StyledLink
+                    to={`${entityRegistry.getEntityUrl(owner.owner.type, owner.owner.urn)}/owner of`}
+                    {...linkProps}
+                >
+                    <OwnerContent
+                        name={name}
+                        owner={owner}
+                        hidePopOver={hidePopOver}
+                        pictureLink={pictureLink}
+                        fontSize={fontSize}
+                    />
+                </StyledLink>
+            )}
+        </OwnerTag>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/OwnerContent.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/OwnerContent.tsx
new file mode 100644
index 00000000000000..74003374b0c9a6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/OwnerContent.tsx
@@ -0,0 +1,143 @@
+import React from 'react';
+import { Typography } from 'antd';
+import { Popover } from '@components';
+import styled from 'styled-components/macro';
+import { Owner } from '../../../../../../types.generated';
+import { CustomAvatar } from '../../../../../shared/avatar';
+import { getDescriptionFromType, getNameFromType } from '../../../containers/profile/sidebar/Ownership/ownershipUtils';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { REDESIGN_COLORS } from '../../../constants';
+
+const TextWrapper = styled.span<{ fontSize?: number }>`
+    ${(props) => props.fontSize && `font-size: ${props.fontSize}px;`}
+    color: ${REDESIGN_COLORS.DARK_GREY};
+
+    max-width: 150px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+`;
+
+const ContentWrapper = styled.span`
+    display: flex;
+    align-items: center;
+    gap: 4px;
+
+    max-width: inherit;
+`;
+
+const AvatarWrapper = styled.div`
+    min-width: 24px;
+`;
+
+const OwnerPopoverTitleContainer = styled.div`
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-start;
+    gap: 6px;
+`;
+
+const OwnerEntityTypeText = styled(Typography.Text)`
+    font-family: 'Mulish', sans-serif;
+    font-weight: 500;
+    font-size: 14px;
+    line-height: 19px;
+`;
+
+const OwnerPopoverContentContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+
+    text-overflow: ellipsis;
+    overflow: hidden;
+`;
+
+const OwnerNameText = styled(Typography.Text)`
+    font-family: 'Mulish', sans-serif;
+    font-weight: 700;
+    font-size: 12px;
+    line-height: 16px;
+    margin-bottom: 4px;
+`;
+
+const OwnershipTypeText = styled(Typography.Text)`
+    font-family: 'Mulish', sans-serif;
+    font-weight: 700;
+    font-size: 10px;
+    line-height: 14px;
+`;
+
+const OwnwershipTypeDescriptionText = styled(Typography.Text)`
+    font-family: 'Mulish', sans-serif;
+    font-weight: 500;
+    font-size: 10px;
+    line-height: 14px;
+`;
+
+interface Props {
+    name: string;
+    owner: Owner;
+    hidePopOver?: boolean;
+    pictureLink?: string;
+    fontSize?: number;
+}
+
+export default function OwnerContent({ name, owner, hidePopOver, pictureLink, fontSize }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const ownerEntity = owner.owner;
+    const ownerEntityType = owner.owner.type;
+    const ownerEntityTypeDisplayName = entityRegistry.getEntityName(ownerEntityType);
+    const ownerDisplayName = entityRegistry.getDisplayName(ownerEntityType, ownerEntity);
+    let ownershipTypeName;
+    let ownershipTypeDescription;
+    if (owner.ownershipType && owner.ownershipType.info) {
+        ownershipTypeName = owner.ownershipType.info.name;
+        ownershipTypeDescription = owner.ownershipType.info.description;
+    } else if (owner.type) {
+        ownershipTypeName = getNameFromType(owner.type);
+        ownershipTypeDescription = getDescriptionFromType(owner.type);
+    }
+
+    const avatar: React.ReactNode = (
+        <CustomAvatar
+            name={name}
+            photoUrl={pictureLink}
+            useDefaultAvatar={false}
+            hideTooltip
+            style={{ marginRight: 0 }}
+        />
+    );
+
+    /* TODO: We probably do not want render if ownership type has been soft deleted */
+
+    return (
+        <ContentWrapper>
+            <AvatarWrapper>{avatar}</AvatarWrapper>
+            {hidePopOver ? (
+                <TextWrapper fontSize={fontSize}>{name}</TextWrapper>
+            ) : (
+                <Popover
+                    overlayStyle={{ maxWidth: 200 }}
+                    placement="left"
+                    showArrow={false}
+                    title={
+                        <OwnerPopoverTitleContainer>
+                            {avatar}
+                            <OwnerEntityTypeText>{ownerEntityTypeDisplayName}</OwnerEntityTypeText>
+                        </OwnerPopoverTitleContainer>
+                    }
+                    content={
+                        <OwnerPopoverContentContainer>
+                            <OwnerNameText>{ownerDisplayName}</OwnerNameText>
+                            <OwnershipTypeText>{ownershipTypeName}</OwnershipTypeText>
+                            <OwnwershipTypeDescriptionText>{ownershipTypeDescription}</OwnwershipTypeDescriptionText>
+                        </OwnerPopoverContentContainer>
+                    }
+                >
+                    <TextWrapper fontSize={fontSize}>{name}</TextWrapper>
+                </Popover>
+            )}
+        </ContentWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/InfoItem.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/InfoItem.tsx
new file mode 100644
index 00000000000000..472b1c35f4e4d8
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/InfoItem.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { ANTD_GRAY } from '../../constants';
+
+const HeaderInfoItem = styled.div<{ onClick?: () => void; width?: string }>`
+    display: inline-block;
+    text-align: left;
+    width: ${(props) => (props.width ? `${props.width};` : '125px;')};
+    vertical-align: top;
+    &:hover {
+        cursor: ${(props) => (props.onClick ? 'pointer' : 'default')};
+    }
+`;
+
+const HeaderInfoTitle = styled(Typography.Text)`
+    font-size: 12px;
+    color: ${ANTD_GRAY[7]};
+`;
+
+type Props = {
+    title: string;
+    children: React.ReactNode;
+    onClick?: () => void;
+    width?: string;
+};
+
+export const InfoItem = ({ title, children, width, onClick }: Props) => {
+    return (
+        <HeaderInfoItem onClick={onClick} width={width}>
+            <div>
+                <HeaderInfoTitle>{title}</HeaderInfoTitle>
+            </div>
+            <span>{children}</span>
+        </HeaderInfoItem>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/MarkAsDeprecatedButton.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/MarkAsDeprecatedButton.tsx
new file mode 100644
index 00000000000000..e363bd17e23f2e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/MarkAsDeprecatedButton.tsx
@@ -0,0 +1,61 @@
+import { Button } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import DeprecatedIcon from '../../../../../images/deprecated-status.svg?react';
+import { REDESIGN_COLORS } from '../../constants';
+
+// Styled Components
+// Todo(Gabe): replace this with the @components button once it supports text buttons with hover states
+const StyledButton = styled(Button)`
+    padding: 4px;
+    margin-top: -8px;
+    color: ${REDESIGN_COLORS.LINK_GREY};
+    :hover {
+        color: ${REDESIGN_COLORS.LINK_GREY};
+    }
+`;
+
+const FlexContainer = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 8px;
+`;
+
+const StyledDeprecatedIcon = styled(DeprecatedIcon)`
+    color: inherit;
+    path {
+        fill: currentColor;
+    }
+    && {
+        fill: currentColor;
+    }
+`;
+
+type DeprecatedButtonProps = {
+    onClick?: () => void;
+    internalText?: string;
+};
+
+type MarkAsDeprecatedButtonContentsProps = {
+    internalText?: string;
+};
+
+export const MarkAsDeprecatedButtonContents = ({ internalText }: MarkAsDeprecatedButtonContentsProps) => {
+    return (
+        <FlexContainer>
+            <StyledDeprecatedIcon />
+            {internalText || 'Mark as deprecated'}
+        </FlexContainer>
+    );
+};
+
+// Main Component
+const MarkAsDeprecatedButton = ({ onClick, internalText }: DeprecatedButtonProps) => {
+    return (
+        <StyledButton onClick={onClick} type="text">
+            <MarkAsDeprecatedButtonContents internalText={internalText} />
+        </StyledButton>
+    );
+};
+
+export default MarkAsDeprecatedButton;
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/SeeMore.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/SeeMore.tsx
new file mode 100644
index 00000000000000..289e39b66d78b5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/SeeMore.tsx
@@ -0,0 +1,12 @@
+import { Button } from 'antd';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../constants';
+
+export const SeeMore = styled(Button)`
+    margin-top: -20px;
+    background-color: ${ANTD_GRAY[4]};
+    padding: 8px;
+    border: none;
+    line-height: 8px;
+    height: 20px;
+`;
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/StatsSummary.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/StatsSummary.tsx
new file mode 100644
index 00000000000000..afeee7b5060858
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/StatsSummary.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../constants';
+
+type Props = {
+    stats: Array<React.ReactNode>;
+};
+
+const StatsContainer = styled.div<{ shouldWrap?: boolean }>`
+    display: flex;
+    align-items: center;
+`;
+
+const StatDivider = styled.div`
+    padding-left: 10px;
+    margin-right: 10px;
+    border-right: 1px solid ${ANTD_GRAY[4]};
+    height: 21px;
+`;
+
+export const StatsSummary = ({ stats }: Props) => {
+    return (
+        <>
+            {stats && stats.length > 0 && (
+                <StatsContainer>
+                    {stats.map((statView, index) => (
+                        <>
+                            {statView}
+                            {index < stats.length - 1 && <StatDivider />}
+                        </>
+                    ))}
+                </StatsContainer>
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/StripMarkdownText.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/StripMarkdownText.tsx
new file mode 100644
index 00000000000000..370e1c547786a0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/StripMarkdownText.tsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import styled from 'styled-components';
+
+const RemoveMarkdownContainer = styled.div<{ shouldWrap: boolean }>`
+    display: block;
+    overflow-wrap: break-word;
+    white-space: ${(props) => (props.shouldWrap ? 'normal' : 'nowrap')};
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+`;
+
+export type Props = {
+    children: string | undefined | null;
+    readMore?: JSX.Element;
+    suffix?: JSX.Element;
+    limit?: number;
+    shouldWrap?: boolean;
+    customRender?: (text: string) => JSX.Element;
+};
+
+function extractContentBetweenHeaders(markdown: string): string {
+    // Regular expression to match Markdown headers (both # and ## styles)
+    const headerRegex = /^#+\s+(.*)$/gm;
+
+    const match = headerRegex.exec(markdown);
+    if (!match) {
+        return markdown;
+    }
+
+    const startIndex = match.index + match[0].length;
+    const endIndex = headerRegex.exec(markdown)?.index || markdown.length;
+    return markdown.substring(startIndex, endIndex).trim();
+}
+
+export const removeMarkdown = (text: string) => {
+    return extractContentBetweenHeaders(text);
+};
+
+export default function NoMarkdownViewer({ children, customRender, readMore, suffix, limit, shouldWrap }: Props) {
+    let plainText = removeMarkdown(children || '');
+
+    if (limit) {
+        let abridgedPlainText = plainText.substring(0, limit);
+        if (abridgedPlainText.length < plainText.length) {
+            abridgedPlainText = `${abridgedPlainText}...`;
+        }
+        plainText = abridgedPlainText;
+    }
+
+    const showReadMore = plainText.length >= (limit || 0);
+
+    return (
+        <RemoveMarkdownContainer shouldWrap={!!shouldWrap}>
+            {customRender ? customRender(plainText) : plainText}
+            {showReadMore && <>{readMore}</>} {suffix}
+        </RemoveMarkdownContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/StyledButton.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/StyledButton.tsx
new file mode 100644
index 00000000000000..b3e744a5aac728
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/StyledButton.tsx
@@ -0,0 +1,17 @@
+import { Button } from 'antd';
+import styled from 'styled-components';
+
+export default styled(Button)`
+    padding-top: 5px;
+    padding-bottom: 5px;
+    padding-right: 16px;
+    padding-left: 16px;
+    box-shadow: 0px 0px 4px 0px #0000001a;
+    border: 1px solid #d9d9d9;
+
+    font-size: 12px;
+    font-weight: 500;
+    line-height: 20px;
+    vertical-align: top;
+    border-radius: 5px;
+`;
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/StyledMDEditor.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/StyledMDEditor.tsx
new file mode 100644
index 00000000000000..6ff965cd4c2338
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/StyledMDEditor.tsx
@@ -0,0 +1,37 @@
+import MDEditor from '@uiw/react-md-editor';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../constants';
+
+export default styled(MDEditor)`
+    height: calc(100% - 46px) !important;
+    z-index: 0;
+    box-shadow: none;
+    border-radius: 0;
+    font-weight: 400;
+    .w-md-editor-toolbar {
+        border-color: ${ANTD_GRAY[4]};
+        background: white;
+        padding: 0 20px;
+        height: 46px !important;
+        li {
+            button {
+                height: 100%;
+                margin: 0 5px;
+            }
+            svg {
+                width: 16px;
+                height: 16px;
+            }
+            &.active > button {
+                color: ${(props) => props.theme.styles['primary-color']};
+                background-color: ${ANTD_GRAY[3]};
+            }
+        }
+    }
+    .w-md-editor-preview {
+        box-shadow: inset 1px 0 0 0 ${ANTD_GRAY[4]};
+    }
+    .w-md-editor-content {
+        height: calc(100% - 46px) !important;
+    }
+`;
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/StyledTable.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/StyledTable.tsx
new file mode 100644
index 00000000000000..30378f69ed27f0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/StyledTable.tsx
@@ -0,0 +1,65 @@
+import { Table } from 'antd';
+import styled from 'styled-components';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../../constants';
+
+export const StyledTable = styled(Table)`
+    overflow: inherit;
+    height: inherit;
+
+    &&& .ant-table-cell {
+        background-color: #fff;
+    }
+    &&& .ant-table-thead .ant-table-cell {
+        font-weight: 700;
+        font-size: 12px;
+        color: ${REDESIGN_COLORS.HEADING_COLOR};
+        background-color: ${REDESIGN_COLORS.LIGHT_GREY};
+    }
+    &&& .ant-table-thead > tr > th {
+        padding-left: 10px;
+    }
+
+    &&
+        .ant-table-thead
+        > tr
+        > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not(
+            [colspan]
+        )::before {
+        border: 1px solid ${ANTD_GRAY[4]};
+    }
+
+    &&& tr {
+        height: 32px;
+    }
+
+    &&& td {
+        background-color: inherit;
+    }
+` as typeof Table;
+// this above line preserves the Table component's generic-ness
+
+export const CompactStyledTable = styled(Table)`
+    overflow: inherit;
+    height: inherit;
+
+    &&& .ant-table-cell {
+        background-color: #fff;
+    }
+    &&& .ant-table-thead .ant-table-cell {
+        font-weight: 600;
+        font-size: 12px;
+        color: ${ANTD_GRAY[8]};
+    }
+    &&
+        .ant-table-thead
+        > tr
+        > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not(
+            [colspan]
+        )::before {
+        border: 1px solid ${ANTD_GRAY[4]};
+    }
+
+    &&& td {
+        background-color: inherit;
+    }
+` as typeof Table;
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/StyledTag.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/StyledTag.tsx
new file mode 100644
index 00000000000000..539e17bc7056cf
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/StyledTag.tsx
@@ -0,0 +1,59 @@
+import { Tag } from 'antd';
+import styled, { css } from 'styled-components';
+import ColorHash from 'color-hash';
+import { REDESIGN_COLORS } from '../../constants';
+
+export const generateColor = new ColorHash({
+    saturation: 0.9,
+});
+
+export const StyledTag = styled(Tag)<{
+    $color: any;
+    $colorHash?: string;
+    fontSize?: number;
+    $highlightTag?: boolean;
+    $showOneAndCount?: boolean;
+}>`
+    display: flex;
+    align-items: center;
+    margin: 0;
+    max-width: 200px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    &&& {
+        ${(props) =>
+            props.$highlightTag &&
+            `
+                background: ${props.theme.styles['highlight-color']};
+                border: 1px solid ${props.theme.styles['highlight-border-color']};
+            `}
+    }
+    ${(props) => props.fontSize && `font-size: ${props.fontSize}px;`}
+    ${(props) =>
+        props.$colorHash &&
+        css`
+            &:before {
+                display: inline-block;
+                content: '';
+                min-width: 8px;
+                min-height: 8px;
+                background: ${props.$color === null || props.$color === undefined
+                    ? generateColor.hex(props.$colorHash)
+                    : props.$color};
+                border-radius: 100em;
+                margin-right: 4px;
+            }
+        `};
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    font-weight: 400;
+    ${(props) =>
+        props.$showOneAndCount &&
+        `
+            width: 100%;
+            max-width: max-content;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            vertical-align: middle;
+        `}
+`;
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/TabToolbar.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/TabToolbar.tsx
new file mode 100644
index 00000000000000..6c3d2ad3e6a3af
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/TabToolbar.tsx
@@ -0,0 +1,14 @@
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../constants';
+
+export default styled.div`
+    display: flex;
+    position: relative;
+    z-index: 1;
+    justify-content: space-between;
+    height: 46px;
+    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
+    padding: 7px 16px;
+    box-shadow: 0px 2px 6px 0px #0000000d;
+    flex: 0 0 auto;
+`;
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/DownloadAsCsvModal.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/DownloadAsCsvModal.tsx
new file mode 100644
index 00000000000000..fab97d73773dc4
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/DownloadAsCsvModal.tsx
@@ -0,0 +1,196 @@
+import React, { useState } from 'react';
+import { useLocation } from 'react-router';
+import { Button, Input, Modal, Spin, notification } from 'antd';
+import { LoadingOutlined } from '@ant-design/icons';
+import { AndFilterInput } from '../../../../../../types.generated';
+import { getSearchCsvDownloadHeader, transformResultsToCsvRow } from './downloadAsCsvUtil';
+import { downloadRowsAsCsv } from '../../../../../search/utils/csvUtils';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { useEntityData } from '../../../../../entity/shared/EntityContext';
+import analytics, { EventType } from '../../../../../analytics';
+import { DownloadSearchResultsInput, DownloadSearchResults } from '../../../../../search/utils/types';
+
+type Props = {
+    downloadSearchResults: (input: DownloadSearchResultsInput) => Promise<DownloadSearchResults | null | undefined>;
+    filters: AndFilterInput[];
+    query: string;
+    viewUrn?: string;
+    totalResults?: number;
+    setIsDownloadingCsv: (isDownloadingCsv: boolean) => any;
+    showDownloadAsCsvModal: boolean;
+    setShowDownloadAsCsvModal: (showDownloadAsCsvModal: boolean) => any;
+};
+
+const SEARCH_PAGE_SIZE_FOR_DOWNLOAD = 200;
+const DOWNLOAD_NOTIFICATION_KEY = 'download-csv-notification';
+const formatTime = (seconds: number) => {
+    if (seconds < 60) return `${Math.round(seconds)}s`;
+    const minutes = Math.floor(seconds / 60);
+    const remainingSeconds = Math.round(seconds % 60);
+    return `${minutes}m ${remainingSeconds}s`;
+};
+
+export default function DownloadAsCsvModal({
+    downloadSearchResults,
+    filters,
+    query,
+    viewUrn,
+    totalResults,
+    setIsDownloadingCsv,
+    showDownloadAsCsvModal,
+    setShowDownloadAsCsvModal,
+}: Props) {
+    const { entityData: entitySearchIsEmbeddedWithin } = useEntityData();
+    const location = useLocation();
+
+    const [saveAsTitle, setSaveAsTitle] = useState(
+        entitySearchIsEmbeddedWithin ? `${entitySearchIsEmbeddedWithin.name}_impact.csv` : 'results.csv',
+    );
+    const entityRegistry = useEntityRegistry();
+    const openNotification = (currentCount = 0, estimatedTimeRemaining?: number) => {
+        let description =
+            totalResults && currentCount < totalResults
+                ? `Downloading ${currentCount} of ${totalResults} entities...`
+                : 'Creating CSV to download';
+
+        if (estimatedTimeRemaining !== undefined) {
+            description += `\nEstimated time remaining: ${formatTime(estimatedTimeRemaining)}`;
+        }
+
+        notification.info({
+            key: DOWNLOAD_NOTIFICATION_KEY,
+            message: 'Preparing Download',
+            description,
+            placement: 'bottomRight',
+            duration: null,
+            icon: <Spin indicator={<LoadingOutlined style={{ fontSize: 24 }} spin />} />,
+        });
+    };
+
+    const closeNotification = () => {
+        setTimeout(() => {
+            notification.destroy();
+        }, 3000);
+    };
+
+    const showFailedDownloadNotification = () => {
+        notification.destroy();
+        notification.error({
+            message: 'Download Failed',
+            description: 'The CSV file could not be downloaded',
+            placement: 'bottomRight',
+            duration: 3,
+        });
+    };
+
+    const triggerCsvDownload = (filename) => {
+        setIsDownloadingCsv(true);
+        openNotification();
+
+        let nextScrollId: string | null = null;
+        let accumulatedResults: string[][] = [];
+
+        analytics.event({
+            type: EventType.DownloadAsCsvEvent,
+            query,
+            entityUrn: entitySearchIsEmbeddedWithin?.urn,
+            path: location.pathname,
+        });
+
+        let sizeForDownload = SEARCH_PAGE_SIZE_FOR_DOWNLOAD;
+        let accumulatedTime = 0;
+        let batchesProcessed = 0;
+
+        function fetchNextPage() {
+            const startTime = new Date().getTime();
+            downloadSearchResults({
+                scrollId: nextScrollId,
+                query,
+                count: sizeForDownload,
+                orFilters: filters,
+                viewUrn,
+            })
+                .then((refetchData) => {
+                    const endTime = new Date().getTime();
+                    const batchTime = endTime - startTime;
+                    accumulatedTime += batchTime;
+                    batchesProcessed++;
+
+                    accumulatedResults = [
+                        ...accumulatedResults,
+                        ...transformResultsToCsvRow(refetchData?.searchResults || [], entityRegistry),
+                    ];
+                    // Scroll Across Entities gives max 10k as total but results can go further than that
+                    if (totalResults && batchesProcessed > 0 && totalResults - accumulatedResults.length > 0) {
+                        const averageTimePerBatch = accumulatedTime / batchesProcessed;
+                        const remainingItems = totalResults - accumulatedResults.length;
+                        const remainingBatches = Math.ceil(remainingItems / sizeForDownload);
+                        const estimatedTimeRemaining = (averageTimePerBatch * remainingBatches) / 1000;
+                        openNotification(accumulatedResults.length, estimatedTimeRemaining);
+                    } else {
+                        openNotification(accumulatedResults.length);
+                    }
+                    // If we have a "next offset", then we continue.
+                    // Otherwise, we terminate fetching.
+                    if (refetchData?.nextScrollId) {
+                        nextScrollId = refetchData?.nextScrollId;
+                        fetchNextPage();
+                    } else {
+                        setIsDownloadingCsv(false);
+                        closeNotification();
+                        downloadRowsAsCsv(
+                            getSearchCsvDownloadHeader(refetchData?.searchResults[0]),
+                            accumulatedResults,
+                            filename,
+                        );
+                    }
+                })
+                .catch((_) => {
+                    if (sizeForDownload > 10) {
+                        sizeForDownload = Math.floor(sizeForDownload / 2);
+                        console.log(`Failed to download, retrying with smaller page size of ${sizeForDownload}`);
+                        fetchNextPage();
+                    } else {
+                        setIsDownloadingCsv(false);
+                        showFailedDownloadNotification();
+                    }
+                });
+        }
+        fetchNextPage();
+    };
+
+    return (
+        <Modal
+            centered
+            onCancel={() => setShowDownloadAsCsvModal(false)}
+            title="Download as..."
+            visible={showDownloadAsCsvModal}
+            footer={
+                <>
+                    <Button onClick={() => setShowDownloadAsCsvModal(false)} type="text">
+                        Close
+                    </Button>
+                    <Button
+                        data-testid="csv-modal-download-button"
+                        onClick={() => {
+                            setShowDownloadAsCsvModal(false);
+                            triggerCsvDownload(saveAsTitle);
+                        }}
+                        disabled={saveAsTitle.length === 0}
+                    >
+                        Download
+                    </Button>
+                </>
+            }
+        >
+            <Input
+                data-testid="download-as-csv-input"
+                placeholder="datahub.csv"
+                value={saveAsTitle}
+                onChange={(e) => {
+                    setSaveAsTitle(e.target.value);
+                }}
+            />
+        </Modal>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearch.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearch.tsx
new file mode 100644
index 00000000000000..4c7218b9df9fa7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearch.tsx
@@ -0,0 +1,413 @@
+import { ApolloError } from '@apollo/client';
+import { combineOrFilters } from '@src/app/searchV2/utils/filterUtils';
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components';
+import { SearchCfg } from '../../../../../../conf';
+import {
+    useGetSearchCountQuery,
+    useGetSearchResultsForMultipleQuery,
+} from '../../../../../../graphql/search.generated';
+import { useGetViewQuery } from '../../../../../../graphql/view.generated';
+import {
+    AndFilterInput,
+    EntityType,
+    FacetFilterInput,
+    FacetMetadata,
+    SearchAcrossEntitiesInput,
+    SearchFlags,
+    SortCriterion,
+} from '../../../../../../types.generated';
+import analytics, { EventType } from '../../../../../analytics';
+import { useUserContext } from '../../../../../context/useUserContext';
+import { useEntityContext } from '../../../../../entity/shared/EntityContext';
+import { EntityAndType } from '../../../../../entity/shared/types';
+import { DEGREE_FILTER_NAME, UnionType } from '../../../../../search/utils/constants';
+import { mergeFilterSets } from '../../../../../search/utils/filterUtils';
+import { generateOrFilters } from '../../../../../search/utils/generateOrFilters';
+import {
+    DownloadSearchResults,
+    DownloadSearchResultsInput,
+    DownloadSearchResultsParams,
+} from '../../../../../search/utils/types';
+import { useDownloadScrollAcrossEntitiesSearchResults } from '../../../../../search/utils/useDownloadScrollAcrossEntitiesSearchResults';
+import { Message } from '../../../../../shared/Message';
+import { isListSubset } from '../../../utils';
+import EmbeddedListSearchHeader from './EmbeddedListSearchHeader';
+import { EmbeddedListSearchResults } from './EmbeddedListSearchResults';
+import { EntityActionProps } from './EntitySearchResults';
+import { FilterSet, GetSearchResultsParams, SearchResultsInterface } from './types';
+
+const Container = styled.div`
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow-y: hidden;
+`;
+
+// this extracts the response from useGetSearchResultsForMultipleQuery into a common interface other search endpoints can also produce
+function useWrappedSearchResults(params: GetSearchResultsParams) {
+    const { data, loading, error, refetch } = useGetSearchResultsForMultipleQuery(params);
+    return {
+        data: data?.searchAcrossEntities,
+        loading,
+        error,
+        refetch: (refetchParams: GetSearchResultsParams['variables']) =>
+            refetch(refetchParams).then((res) => res.data.searchAcrossEntities),
+    };
+}
+
+// the addFixedQuery checks and generate the query as per params pass to embeddedListSearch
+export const addFixedQuery = (baseQuery: string, fixedQuery: string, emptyQuery: string) => {
+    let finalQuery = ``;
+    if (baseQuery && fixedQuery) {
+        finalQuery = baseQuery.includes(fixedQuery) ? `${baseQuery}` : `(*${baseQuery}*) AND (${fixedQuery})`;
+    } else if (baseQuery) {
+        finalQuery = `${baseQuery}`;
+    } else if (fixedQuery) {
+        finalQuery = `${fixedQuery}`;
+    } else {
+        return emptyQuery || '';
+    }
+    return finalQuery;
+};
+
+// Simply remove the fields that were marked as fixed from the facets that the server
+// responds.
+export const removeFixedFiltersFromFacets = (fixedFilters: FilterSet, facets: FacetMetadata[]) => {
+    const fixedFields = fixedFilters.filters.map((filter) => filter.field);
+    return facets.filter((facet) => !fixedFields.includes(facet.field));
+};
+
+function useWrappedSearchCountResults(params: GetSearchResultsParams) {
+    const { data, loading, error, refetch } = useGetSearchCountQuery(params);
+    return { total: data?.searchAcrossEntities?.total, loading, error, refetch };
+}
+
+type Props = {
+    query: string;
+    entityTypes?: EntityType[];
+    page: number;
+    unionType: UnionType;
+    filters: FacetFilterInput[];
+    onChangeQuery: (query) => void;
+    onChangeFilters: (filters) => void;
+    onChangePage: (page) => void;
+    onChangeUnionType: (unionType: UnionType) => void;
+    onTotalChanged?: (newTotal: number) => void;
+    emptySearchQuery?: string | null;
+    fixedFilters?: FilterSet;
+    fixedOrFilters?: AndFilterInput[];
+    fixedQuery?: string | null;
+    placeholderText?: string | null;
+    defaultShowFilters?: boolean;
+    defaultFilters?: Array<FacetFilterInput>;
+    searchBarStyle?: any;
+    searchBarInputStyle?: any;
+    entityAction?: React.FC<EntityActionProps>;
+    skipCache?: boolean;
+    useGetSearchResults?: (params: GetSearchResultsParams) => {
+        data: SearchResultsInterface | undefined | null;
+        loading: boolean;
+        error: ApolloError | undefined;
+        refetch: (variables: GetSearchResultsParams['variables']) => Promise<SearchResultsInterface | undefined | null>;
+    };
+    useGetSearchCountResult?: (params: GetSearchResultsParams) => {
+        total: number | undefined;
+        loading: boolean;
+        error?: ApolloError;
+        refetch?: () => void;
+    };
+    useGetDownloadSearchResults?: (params: DownloadSearchResultsParams) => {
+        loading: boolean;
+        error: ApolloError | undefined;
+        searchResults: DownloadSearchResults | undefined | null;
+        refetch: (input: DownloadSearchResultsInput) => Promise<DownloadSearchResults | undefined | null>;
+    };
+    shouldRefetch?: boolean;
+    resetShouldRefetch?: () => void;
+    applyView?: boolean;
+    showFilterBar?: boolean;
+    sort?: SortCriterion;
+    searchFlags?: SearchFlags;
+};
+
+export const EmbeddedListSearch = ({
+    query,
+    entityTypes,
+    filters,
+    page,
+    unionType,
+    onChangeQuery,
+    onChangeFilters,
+    onChangePage,
+    onChangeUnionType,
+    onTotalChanged,
+    emptySearchQuery,
+    fixedFilters,
+    fixedOrFilters,
+    fixedQuery,
+    placeholderText,
+    defaultShowFilters,
+    defaultFilters,
+    searchBarStyle,
+    searchBarInputStyle,
+    entityAction,
+    skipCache,
+    useGetSearchResults = useWrappedSearchResults,
+    useGetDownloadSearchResults = useDownloadScrollAcrossEntitiesSearchResults,
+    useGetSearchCountResult = useWrappedSearchCountResults,
+    shouldRefetch,
+    resetShouldRefetch,
+    applyView = false,
+    showFilterBar = true,
+    sort,
+    searchFlags,
+}: Props) => {
+    const userContext = useUserContext();
+
+    const { shouldRefetchEmbeddedListSearch, setShouldRefetchEmbeddedListSearch } = useEntityContext();
+    // Adjust query based on props
+    const finalQuery: string = addFixedQuery(query as string, fixedQuery as string, emptySearchQuery as string);
+
+    const baseFilters = {
+        unionType,
+        filters,
+    };
+
+    let finalFilters =
+        (fixedFilters && mergeFilterSets(fixedFilters, baseFilters)) || generateOrFilters(unionType, filters);
+    if (fixedOrFilters) {
+        finalFilters = combineOrFilters(fixedOrFilters, finalFilters);
+    }
+
+    const [showFilters, setShowFilters] = useState(defaultShowFilters || false);
+    const [isSelectMode, setIsSelectMode] = useState(false);
+    const [selectedEntities, setSelectedEntities] = useState<EntityAndType[]>([]);
+    const [numResultsPerPage, setNumResultsPerPage] = useState(SearchCfg.RESULTS_PER_PAGE);
+    const [defaultViewUrn, setDefaultViewUrn] = useState<string | undefined>();
+    const [selectedViewUrn, setSelectedViewUrn] = useState<string | undefined>();
+
+    useEffect(() => {
+        setSelectedViewUrn(userContext.localState?.selectedViewUrn || undefined);
+        setDefaultViewUrn(userContext.localState?.selectedViewUrn || undefined);
+    }, [userContext.localState?.selectedViewUrn]);
+
+    // This hook is simply used to generate a refetch callback that the DownloadAsCsv component can use to
+    // download the correct results given the current context.
+    // TODO: Use the loading indicator to log a message to the user should download to CSV fail.
+    // TODO: Revisit this pattern -- what can we push down?
+
+    const { refetch: refetchForDownload } = useGetDownloadSearchResults({
+        variables: {
+            input: {
+                types: entityTypes || [],
+                query,
+                count: SearchCfg.RESULTS_PER_PAGE,
+                orFilters: generateOrFilters(unionType, filters),
+                scrollId: null,
+                searchFlags,
+            },
+        },
+        skip: true,
+    });
+
+    const searchInput: SearchAcrossEntitiesInput = {
+        types: entityTypes || [],
+        query: finalQuery,
+        start: (page - 1) * numResultsPerPage,
+        count: numResultsPerPage,
+        orFilters: finalFilters,
+        viewUrn: applyView ? selectedViewUrn : undefined,
+        sortInput: sort ? { sortCriterion: sort } : undefined,
+        searchFlags,
+        ...(skipCache && { searchFlags: { ...searchFlags, skipCache: true } }),
+    };
+
+    const { data, loading, error, refetch } = useGetSearchResults({
+        variables: { input: searchInput },
+        fetchPolicy: skipCache ? undefined : 'cache-first',
+    });
+
+    const useGetViewSearchData = (viewUrn: string | undefined) => {
+        return useGetSearchCountResult({
+            variables: {
+                input: {
+                    ...searchInput,
+                    viewUrn: viewUrn || undefined,
+                },
+            },
+            fetchPolicy: skipCache ? undefined : 'cache-first',
+        });
+    };
+
+    const { total: allSearchCount, refetch: refetchAllSearchCount } = useGetViewSearchData(undefined);
+    const { total: defaultViewCount, refetch: refetchDefaultViewCount } = useGetViewSearchData(defaultViewUrn);
+    const { data: viewData } = useGetViewQuery({
+        variables: {
+            urn: defaultViewUrn || '',
+        },
+        skip: !defaultViewUrn,
+    });
+
+    const view = (viewData?.view?.__typename === 'DataHubView' && viewData?.view) || undefined;
+
+    useEffect(() => {
+        if (shouldRefetch && resetShouldRefetch) {
+            refetch({
+                input: searchInput,
+            });
+            resetShouldRefetch();
+            refetchAllSearchCount?.();
+            if (defaultViewUrn) refetchDefaultViewCount?.();
+        }
+    });
+
+    useEffect(() => {
+        if (shouldRefetchEmbeddedListSearch) {
+            refetch({
+                input: searchInput,
+            });
+            setShouldRefetchEmbeddedListSearch?.(false);
+            refetchAllSearchCount?.();
+            if (defaultViewUrn) refetchDefaultViewCount?.();
+        }
+    });
+
+    useEffect(() => {
+        if (data?.total !== undefined && onTotalChanged) {
+            onTotalChanged(data?.total);
+        }
+    }, [data?.total, onTotalChanged]);
+
+    const searchResultEntities =
+        data?.searchResults?.map((result) => ({ urn: result.entity.urn, type: result.entity.type })) || [];
+    const searchResultUrns = searchResultEntities.map((entity) => entity.urn);
+    const selectedEntityUrns = selectedEntities.map((entity) => entity.urn);
+
+    useEffect(() => {
+        if (filters.length) {
+            setShowFilters(true);
+        }
+    }, [filters]);
+
+    const onToggleFilters = () => {
+        setShowFilters(!showFilters);
+    };
+
+    /**
+     * Invoked when the "select all" checkbox is clicked.
+     *
+     * This method either adds the entire current page of search results to
+     * the list of selected entities, or removes the current page from the set of selected entities.
+     */
+    const onChangeSelectAll = (selected: boolean) => {
+        if (selected) {
+            // Add current page of urns to the master selected entity list
+            const entitiesToAdd = searchResultEntities.filter(
+                (entity) =>
+                    selectedEntities.findIndex(
+                        (element) => element.urn === entity.urn && element.type === entity.type,
+                    ) < 0,
+            );
+            setSelectedEntities(Array.from(new Set(selectedEntities.concat(entitiesToAdd))));
+        } else {
+            // Filter out the current page of entity urns from the list
+            setSelectedEntities(selectedEntities.filter((entity) => searchResultUrns.indexOf(entity.urn) === -1));
+        }
+    };
+
+    useEffect(() => {
+        if (!isSelectMode) {
+            setSelectedEntities([]);
+        }
+    }, [isSelectMode]);
+
+    useEffect(() => {
+        if (defaultFilters && filters.length === 0) {
+            onChangeFilters(defaultFilters);
+        }
+        // only want to run once on page load
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
+    /**
+     * Compute the final Facet fields that we show in the left hand search Filters (aggregation).
+     *
+     * Do this by filtering out any fields that are included in the fixed filters.
+     */
+    const finalFacets =
+        (fixedFilters && removeFixedFiltersFromFacets(fixedFilters, data?.facets || [])) || data?.facets;
+
+    // used for logging impact anlaysis events
+    const degreeFilter = filters.find((filter) => filter.field === DEGREE_FILTER_NAME);
+
+    // we already have some lineage logging through Tab events, but this adds additional context, particularly degree
+    if (!loading && (degreeFilter?.values?.length || 0) > 0) {
+        analytics.event({
+            type: EventType.SearchAcrossLineageResultsViewEvent,
+            query,
+            page,
+            total: data?.total || 0,
+            maxDegree: degreeFilter?.values?.sort()?.reverse()[0] || '1',
+        });
+    }
+
+    let errorMessage = '';
+    if (error) {
+        errorMessage =
+            'Failed to load results! An unexpected error occurred. This may be due to a timeout when fetching lineage results.';
+    }
+
+    return (
+        <Container>
+            {error && <Message type="error" content={errorMessage} />}
+            {showFilterBar && (
+                <EmbeddedListSearchHeader
+                    onSearch={(q) => onChangeQuery(addFixedQuery(q, fixedQuery as string, emptySearchQuery as string))}
+                    placeholderText={placeholderText}
+                    onToggleFilters={onToggleFilters}
+                    downloadSearchResults={(input) => refetchForDownload({ searchFlags, ...input })}
+                    filters={finalFilters}
+                    query={finalQuery}
+                    isSelectMode={isSelectMode}
+                    isSelectAll={selectedEntities.length > 0 && isListSubset(searchResultUrns, selectedEntityUrns)}
+                    setIsSelectMode={setIsSelectMode}
+                    selectedEntities={selectedEntities}
+                    setSelectedEntities={setSelectedEntities}
+                    onChangeSelectAll={onChangeSelectAll}
+                    refetch={() => refetch({ input: searchInput })}
+                    searchBarStyle={searchBarStyle}
+                    searchBarInputStyle={searchBarInputStyle}
+                    numResults={data?.total}
+                />
+            )}
+            <EmbeddedListSearchResults
+                unionType={unionType}
+                loading={loading}
+                searchResponse={data}
+                filters={finalFacets}
+                selectedFilters={filters}
+                onChangeFilters={onChangeFilters}
+                onChangePage={onChangePage}
+                onChangeUnionType={onChangeUnionType}
+                page={page}
+                showFilters={showFilters}
+                numResultsPerPage={numResultsPerPage}
+                setNumResultsPerPage={setNumResultsPerPage}
+                isSelectMode={isSelectMode}
+                selectedEntities={selectedEntities}
+                setSelectedEntities={setSelectedEntities}
+                entityAction={entityAction}
+                selectedViewUrn={selectedViewUrn || ''}
+                setSelectedViewUrn={setSelectedViewUrn}
+                applyView={applyView}
+                defaultViewUrn={defaultViewUrn}
+                allSearchCount={allSearchCount}
+                defaultViewCount={defaultViewCount}
+                view={view}
+                compactUserSearchCardStyle
+                errorMessage={errorMessage}
+            />
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchEmbed.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchEmbed.tsx
new file mode 100644
index 00000000000000..7e9e8e7aead1aa
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchEmbed.tsx
@@ -0,0 +1,116 @@
+import React, { useState } from 'react';
+import { ApolloError } from '@apollo/client';
+import useSortInput from '@src/app/searchV2/sorting/useSortInput';
+import { useSelectedSortOption } from '@src/app/search/context/SearchContext';
+import { FacetFilterInput } from '../../../../../../types.generated';
+import { FilterSet, GetSearchResultsParams, SearchResultsInterface } from './types';
+import { EmbeddedListSearch } from './EmbeddedListSearch';
+import { UnionType } from '../../../../../search/utils/constants';
+import {
+    DownloadSearchResults,
+    DownloadSearchResultsInput,
+    DownloadSearchResultsParams,
+} from '../../../../../search/utils/types';
+
+type Props = {
+    emptySearchQuery?: string | null;
+    fixedFilters?: FilterSet;
+    fixedQuery?: string | null;
+    placeholderText?: string | null;
+    defaultShowFilters?: boolean;
+    defaultFilters?: Array<FacetFilterInput>;
+    searchBarStyle?: any;
+    searchBarInputStyle?: any;
+    skipCache?: boolean;
+    useGetSearchResults?: (params: GetSearchResultsParams) => {
+        data: SearchResultsInterface | undefined | null;
+        loading: boolean;
+        error: ApolloError | undefined;
+        refetch: (variables: GetSearchResultsParams['variables']) => Promise<SearchResultsInterface | undefined | null>;
+    };
+    useGetDownloadSearchResults?: (params: DownloadSearchResultsParams) => {
+        loading: boolean;
+        error: ApolloError | undefined;
+        searchResults: DownloadSearchResults | undefined | null;
+        refetch: (input: DownloadSearchResultsInput) => Promise<DownloadSearchResults | undefined | null>;
+    };
+    useGetSearchCountResult?: (params: GetSearchResultsParams) => {
+        total: number | undefined;
+        loading: boolean;
+        error?: ApolloError;
+    };
+    shouldRefetch?: boolean;
+    resetShouldRefetch?: () => void;
+    applyView?: boolean;
+    showFilterBar?: boolean;
+};
+
+export const EmbeddedListSearchEmbed = ({
+    emptySearchQuery,
+    fixedFilters,
+    fixedQuery,
+    placeholderText,
+    defaultShowFilters,
+    defaultFilters,
+    searchBarStyle,
+    searchBarInputStyle,
+    skipCache,
+    useGetSearchResults,
+    useGetDownloadSearchResults,
+    useGetSearchCountResult,
+    shouldRefetch,
+    resetShouldRefetch,
+    applyView,
+    showFilterBar,
+}: Props) => {
+    // Component state
+    const [query, setQuery] = useState<string>('');
+    const [page, setPage] = useState(1);
+    const [unionType, setUnionType] = useState(UnionType.AND);
+
+    const [filters, setFilters] = useState<Array<FacetFilterInput>>([]);
+    const selectedSortOption = useSelectedSortOption();
+    const sortInput = useSortInput(selectedSortOption);
+
+    const onChangeQuery = (q: string) => {
+        setQuery(q);
+    };
+
+    const onChangeFilters = (newFilters: Array<FacetFilterInput>) => {
+        setFilters(newFilters);
+    };
+
+    const onChangePage = (newPage: number) => {
+        setPage(newPage);
+    };
+
+    return (
+        <EmbeddedListSearch
+            query={query}
+            page={page}
+            unionType={unionType}
+            filters={filters}
+            onChangeFilters={onChangeFilters}
+            onChangeQuery={onChangeQuery}
+            onChangePage={onChangePage}
+            onChangeUnionType={setUnionType}
+            emptySearchQuery={emptySearchQuery}
+            fixedFilters={fixedFilters}
+            fixedQuery={fixedQuery}
+            placeholderText={placeholderText}
+            defaultShowFilters={defaultShowFilters}
+            defaultFilters={defaultFilters}
+            searchBarStyle={searchBarStyle}
+            searchBarInputStyle={searchBarInputStyle}
+            skipCache={skipCache}
+            useGetSearchResults={useGetSearchResults}
+            useGetDownloadSearchResults={useGetDownloadSearchResults}
+            shouldRefetch={shouldRefetch}
+            useGetSearchCountResult={useGetSearchCountResult}
+            resetShouldRefetch={resetShouldRefetch}
+            applyView={applyView}
+            showFilterBar={showFilterBar}
+            sort={sortInput?.sortCriterion}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchHeader.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchHeader.tsx
new file mode 100644
index 00000000000000..d83e0a6c246fd6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchHeader.tsx
@@ -0,0 +1,137 @@
+import React from 'react';
+import { Button, Typography } from 'antd';
+import { FilterOutlined } from '@ant-design/icons';
+import styled from 'styled-components/macro';
+import SearchSortSelect from '@src/app/searchV2/sorting/SearchSortSelect';
+import { useSearchContext } from '@src/app/search/context/SearchContext';
+import TabToolbar from '../TabToolbar';
+import { SearchBar } from '../../../../../search/SearchBar';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { AndFilterInput } from '../../../../../../types.generated';
+import { SearchSelectBar } from './SearchSelectBar';
+import { EntityAndType } from '../../../../../entity/shared/types';
+import { DownloadSearchResultsInput, DownloadSearchResults } from '../../../../../search/utils/types';
+import SearchMenuItems from '../../../../../sharedV2/search/SearchMenuItems';
+
+const HeaderContainer = styled.div`
+    display: flex;
+    justify-content: space-between;
+    width: 100%;
+    padding-right: 4px;
+    padding-left: 4px;
+`;
+
+const SearchAndDownloadContainer = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const SearchMenuContainer = styled.div`
+    margin-left: 10px;
+    display: flex;
+`;
+
+type Props = {
+    onSearch: (q: string) => void;
+    onToggleFilters: () => void;
+    placeholderText?: string | null;
+    downloadSearchResults: (input: DownloadSearchResultsInput) => Promise<DownloadSearchResults | null | undefined>;
+    filters: AndFilterInput[];
+    query: string;
+    isSelectMode: boolean;
+    isSelectAll: boolean;
+    selectedEntities: EntityAndType[];
+    setSelectedEntities: (entities: EntityAndType[]) => void;
+    setIsSelectMode: (showSelectMode: boolean) => any;
+    onChangeSelectAll: (selected: boolean) => void;
+    refetch?: () => void;
+    numResults?: number;
+    searchBarStyle?: any;
+    searchBarInputStyle?: any;
+};
+
+export default function EmbeddedListSearchHeader({
+    onSearch,
+    onToggleFilters,
+    placeholderText,
+    downloadSearchResults,
+    filters,
+    query,
+    isSelectMode,
+    isSelectAll,
+    selectedEntities,
+    setSelectedEntities,
+    setIsSelectMode,
+    onChangeSelectAll,
+    refetch,
+    numResults,
+    searchBarStyle,
+    searchBarInputStyle,
+}: Props) {
+    const entityRegistry = useEntityRegistry();
+    const { selectedSortOption, setSelectedSortOption } = useSearchContext();
+
+    return (
+        <>
+            <TabToolbar>
+                <HeaderContainer>
+                    <Button type="text" onClick={onToggleFilters}>
+                        <FilterOutlined />
+                        <Typography.Text>Filters</Typography.Text>
+                    </Button>
+                    <SearchAndDownloadContainer>
+                        <SearchBar
+                            data-testid="embedded-search-bar"
+                            initialQuery=""
+                            placeholderText={placeholderText || 'Search entities...'}
+                            suggestions={[]}
+                            style={
+                                searchBarStyle || {
+                                    maxWidth: 220,
+                                    padding: 0,
+                                }
+                            }
+                            inputStyle={
+                                searchBarInputStyle || {
+                                    height: 32,
+                                    fontSize: 12,
+                                }
+                            }
+                            onSearch={onSearch}
+                            onQueryChange={onSearch}
+                            entityRegistry={entityRegistry}
+                            hideRecommendations
+                        />
+                        <SearchMenuContainer>
+                            <SearchSortSelect
+                                selectedSortOption={selectedSortOption}
+                                setSelectedSortOption={setSelectedSortOption}
+                            />
+                            <SearchMenuItems
+                                downloadSearchResults={downloadSearchResults}
+                                filters={filters}
+                                query={query}
+                                setShowSelectMode={setIsSelectMode}
+                                totalResults={numResults}
+                            />
+                        </SearchMenuContainer>
+                    </SearchAndDownloadContainer>
+                </HeaderContainer>
+            </TabToolbar>
+            {isSelectMode && (
+                <TabToolbar>
+                    <SearchSelectBar
+                        isSelectAll={isSelectAll}
+                        onChangeSelectAll={onChangeSelectAll}
+                        selectedEntities={selectedEntities}
+                        setSelectedEntities={setSelectedEntities}
+                        onCancel={() => {
+                            setIsSelectMode(false);
+                        }}
+                        refetch={refetch}
+                    />
+                </TabToolbar>
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchModal.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchModal.tsx
new file mode 100644
index 00000000000000..f286803c6ab140
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchModal.tsx
@@ -0,0 +1,123 @@
+import React, { useState } from 'react';
+import { Button, Modal } from 'antd';
+import styled from 'styled-components';
+import {
+    AndFilterInput,
+    EntityType,
+    FacetFilterInput,
+    SearchFlags,
+    SortCriterion,
+} from '../../../../../../types.generated';
+import { EmbeddedListSearch } from './EmbeddedListSearch';
+import { UnionType } from '../../../../../search/utils/constants';
+import { FilterSet } from './types';
+import { EntityActionProps } from './EntitySearchResults';
+
+const SearchContainer = styled.div<{ height?: string }>`
+    height: ${(props) => props.height || '500px'};
+`;
+const modalStyle = {
+    top: 40,
+};
+
+const modalBodyStyle = {
+    padding: 0,
+};
+
+type Props = {
+    title: React.ReactNode;
+    emptySearchQuery?: string | null;
+    fixedFilters?: FilterSet;
+    fixedOrFilters?: AndFilterInput[];
+    fixedQuery?: string | null;
+    placeholderText?: string | null;
+    defaultShowFilters?: boolean;
+    defaultFilters?: Array<FacetFilterInput>;
+    onClose?: () => void;
+    searchBarStyle?: any;
+    searchBarInputStyle?: any;
+    entityAction?: React.FC<EntityActionProps>;
+    applyView?: boolean;
+    height?: string;
+    sort?: SortCriterion;
+    entityTypes?: EntityType[];
+    searchFlags?: SearchFlags;
+};
+
+export const EmbeddedListSearchModal = ({
+    title,
+    emptySearchQuery,
+    fixedFilters,
+    fixedOrFilters,
+    fixedQuery,
+    placeholderText,
+    defaultShowFilters,
+    defaultFilters,
+    onClose,
+    searchBarStyle,
+    searchBarInputStyle,
+    entityAction,
+    applyView,
+    height,
+    sort,
+    entityTypes,
+    searchFlags,
+}: Props) => {
+    // Component state
+    const [query, setQuery] = useState<string>('');
+    const [page, setPage] = useState(1);
+    const [unionType, setUnionType] = useState(UnionType.AND);
+
+    const [filters, setFilters] = useState<Array<FacetFilterInput>>([]);
+
+    const onChangeQuery = (q: string) => {
+        setQuery(q);
+    };
+
+    const onChangeFilters = (newFilters: Array<FacetFilterInput>) => {
+        setFilters(newFilters);
+    };
+
+    const onChangePage = (newPage: number) => {
+        setPage(newPage);
+    };
+
+    return (
+        <Modal
+            width={800}
+            style={modalStyle}
+            bodyStyle={modalBodyStyle}
+            title={title}
+            visible
+            onCancel={onClose}
+            footer={<Button onClick={onClose}>Close</Button>}
+        >
+            <SearchContainer height={height}>
+                <EmbeddedListSearch
+                    query={query}
+                    filters={filters}
+                    page={page}
+                    unionType={unionType}
+                    onChangeQuery={onChangeQuery}
+                    onChangeFilters={onChangeFilters}
+                    onChangePage={onChangePage}
+                    onChangeUnionType={setUnionType}
+                    emptySearchQuery={emptySearchQuery}
+                    fixedFilters={fixedFilters}
+                    fixedOrFilters={fixedOrFilters}
+                    fixedQuery={fixedQuery}
+                    placeholderText={placeholderText}
+                    defaultShowFilters={defaultShowFilters}
+                    defaultFilters={defaultFilters}
+                    searchBarStyle={searchBarStyle}
+                    searchBarInputStyle={searchBarInputStyle}
+                    entityAction={entityAction}
+                    applyView={applyView}
+                    sort={sort}
+                    entityTypes={entityTypes}
+                    searchFlags={searchFlags}
+                />
+            </SearchContainer>
+        </Modal>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchResults.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchResults.tsx
new file mode 100644
index 00000000000000..c82b04bc1f59ed
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchResults.tsx
@@ -0,0 +1,295 @@
+import { LoadingOutlined } from '@ant-design/icons';
+import LanguageIcon from '@mui/icons-material/Language';
+import { Pagination, Spin, Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { SearchCfg } from '../../../../../../conf';
+import {
+    DataHubView,
+    FacetFilterInput,
+    FacetMetadata,
+    SearchResults as SearchResultType,
+} from '../../../../../../types.generated';
+import { EntityAndType } from '../../../../../entity/shared/types';
+import { SearchFiltersSection } from '../../../../../search/SearchFiltersSection';
+import { UnionType } from '../../../../../search/utils/constants';
+import { combineSiblingsInSearchResults } from '../../../../../searchV2/utils/combineSiblingsInSearchResults';
+import { useIsShowSeparateSiblingsEnabled } from '../../../../../useAppConfig';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../../../constants';
+import { EntityActionProps, EntitySearchResults } from './EntitySearchResults';
+import MatchingViewsLabel from './MatchingViewsLabel';
+
+const SearchBody = styled.div`
+    height: 100%;
+    overflow-y: auto;
+    display: flex;
+    background-color: ${REDESIGN_COLORS.BACKGROUND};
+`;
+
+const PaginationInfo = styled(Typography.Text)`
+    padding: 0px;
+`;
+
+const FiltersContainer = styled.div`
+    background-color: ${REDESIGN_COLORS.WHITE};
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    max-width: 260px;
+    min-width: 260px;
+    border-right: 1px solid;
+    border-color: ${(props) => props.theme.styles['border-color-base']};
+`;
+
+const ResultContainer = styled.div`
+    height: auto;
+    overflow: auto;
+    flex: 1;
+    position: relative;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+`;
+
+const PaginationInfoContainer = styled.span`
+    padding: 8px;
+    padding-left: 16px;
+    border-top: 1px solid;
+    border-color: ${(props) => props.theme.styles['border-color-base']};
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    overflow: auto;
+`;
+
+const StyledPagination = styled(Pagination)`
+    margin: 0px;
+    padding: 0px;
+`;
+
+const LoadingContainer = styled.div`
+    padding-top: 40px;
+    padding-bottom: 40px;
+    width: 100%;
+    text-align: center;
+    flex: 1;
+`;
+
+const StyledLoading = styled(LoadingOutlined)`
+    font-size: 32px;
+    color: ${ANTD_GRAY[7]};
+    padding-bottom: 18px;
+`;
+
+const ViewsContainer = styled.div`
+    background-color: ${REDESIGN_COLORS.BORDER_2};
+    padding: 10px 16px;
+    width: 100%;
+    display: flex;
+    align-items: center;
+    gap: 1rem;
+`;
+
+const Pill = styled.div<{ selected?: boolean }>`
+    border: 1px solid ${(props) => (props.selected ? REDESIGN_COLORS.TITLE_PURPLE : `#797F98`)};
+    white-space: nowrap;
+    border-radius: 20px;
+    padding: 5px 16px;
+    color: ${(props) => (props.selected ? REDESIGN_COLORS.TITLE_PURPLE : '#797F98')};
+    cursor: pointer;
+    display: flex;
+    gap: 0.5rem;
+    align-items: center;
+    background: ${(props) => (props.selected ? '#E5E2F8' : 'none')};
+`;
+
+const Count = styled.div<{ selected: boolean }>`
+    background-color: ${(props) => (props.selected ? REDESIGN_COLORS.HOVER_PURPLE : '#A3A7B9')};
+    color: ${REDESIGN_COLORS.WHITE};
+    border-radius: 20px;
+    min-width: 25px;
+    padding: 2px 4px;
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    font-size: 11px;
+`;
+
+const LanguageIconStyle = styled(LanguageIcon)<{ selected?: boolean }>`
+    font-size: 18px !important;
+    color: ${(props) => (props.selected ? REDESIGN_COLORS.TITLE_PURPLE : '#797F98')};
+`;
+
+const ViewLabel = styled.span`
+    font-weight: 700;
+    color: #5f6685;
+    font-size: 16px;
+    margin-right: 8px;
+`;
+
+interface Props {
+    page: number;
+    searchResponse?: SearchResultType | null;
+    filters?: Array<FacetMetadata> | null;
+    selectedFilters: Array<FacetFilterInput>;
+    loading: boolean;
+    showFilters?: boolean;
+    unionType: UnionType;
+    onChangeFilters: (filters: Array<FacetFilterInput>) => void;
+    onChangePage: (page: number) => void;
+    onChangeUnionType: (unionType: UnionType) => void;
+    isSelectMode: boolean;
+    selectedEntities: EntityAndType[];
+    setSelectedEntities: (entities: EntityAndType[]) => any;
+    numResultsPerPage: number;
+    setNumResultsPerPage: (numResults: number) => void;
+    entityAction?: React.FC<EntityActionProps>;
+    applyView?: boolean;
+    selectedViewUrn?: string;
+    setSelectedViewUrn?: (selectedViewUrn: string | undefined) => void;
+    compactUserSearchCardStyle?: boolean;
+    defaultViewUrn?: string | undefined;
+    defaultViewCount?: number;
+    allSearchCount?: number;
+    view?: DataHubView;
+    errorMessage?: string;
+    selectLimit?: number;
+}
+
+export const EmbeddedListSearchResults = ({
+    page,
+    searchResponse,
+    filters,
+    selectedFilters,
+    loading,
+    showFilters,
+    unionType,
+    onChangeUnionType,
+    onChangeFilters,
+    onChangePage,
+    isSelectMode,
+    selectedEntities,
+    setSelectedEntities,
+    numResultsPerPage,
+    setNumResultsPerPage,
+    entityAction,
+    applyView,
+    compactUserSearchCardStyle,
+    selectedViewUrn,
+    setSelectedViewUrn,
+    defaultViewUrn,
+    defaultViewCount = 0,
+    allSearchCount = 0,
+    view,
+    errorMessage,
+    selectLimit,
+}: Props) => {
+    const showSeparateSiblings = useIsShowSeparateSiblingsEnabled();
+    const combinedSiblingSearchResults = combineSiblingsInSearchResults(
+        showSeparateSiblings,
+        searchResponse?.searchResults,
+    );
+
+    const pageStart = searchResponse?.start || 0;
+    const pageSize = searchResponse?.count || 0;
+    const totalResults = searchResponse?.total || 0;
+    const lastResultIndex = pageStart + pageSize > totalResults ? totalResults : pageStart + pageSize;
+
+    return (
+        <>
+            <SearchBody>
+                {!!showFilters && (
+                    <FiltersContainer>
+                        <SearchFiltersSection
+                            filters={filters}
+                            selectedFilters={selectedFilters}
+                            unionType={unionType}
+                            loading={loading}
+                            onChangeFilters={onChangeFilters}
+                            onChangeUnionType={onChangeUnionType}
+                        />
+                    </FiltersContainer>
+                )}
+
+                <ResultContainer>
+                    {view && (
+                        <ViewsContainer>
+                            <ViewLabel>View</ViewLabel>
+                            <Pill selected={!selectedViewUrn} onClick={() => setSelectedViewUrn?.(undefined)}>
+                                <LanguageIconStyle selected={!selectedViewUrn} />
+                                <span>All</span>
+                                {allSearchCount > 0 && <Count selected={!selectedViewUrn}>{allSearchCount}</Count>}
+                            </Pill>
+                            {defaultViewUrn === view.urn && (
+                                <Pill
+                                    selected={selectedViewUrn === view.urn}
+                                    onClick={() => setSelectedViewUrn?.(view?.urn)}
+                                >
+                                    <span>{view.name}</span>
+                                    {defaultViewCount > 0 && (
+                                        <Count selected={selectedViewUrn === view.urn}>{defaultViewCount}</Count>
+                                    )}
+                                </Pill>
+                            )}
+                        </ViewsContainer>
+                    )}
+                    {loading && (
+                        <LoadingContainer>
+                            <Spin indicator={<StyledLoading />} />
+                        </LoadingContainer>
+                    )}
+                    {!loading && (
+                        <EntitySearchResults
+                            noResultsMessage={errorMessage}
+                            searchResults={combinedSiblingSearchResults || []}
+                            additionalPropertiesList={
+                                combinedSiblingSearchResults?.map((searchResult) => ({
+                                    // when we add impact analysis, we will want to pipe the path to each element to the result this
+                                    // eslint-disable-next-line @typescript-eslint/dot-notation
+                                    degree: searchResult['degree'], // eslint-disable-next-line @typescript-eslint/dot-notation
+                                    paths: searchResult['paths'],
+                                })) || []
+                            }
+                            isSelectMode={isSelectMode}
+                            selectLimit={selectLimit}
+                            selectedEntities={selectedEntities}
+                            setSelectedEntities={setSelectedEntities}
+                            bordered={false}
+                            entityAction={entityAction}
+                            compactUserSearchCardStyle={compactUserSearchCardStyle}
+                        />
+                    )}
+                </ResultContainer>
+            </SearchBody>
+            <PaginationInfoContainer>
+                <PaginationInfo>
+                    <b>
+                        {lastResultIndex > 0 ? (page - 1) * pageSize + 1 : 0} - {lastResultIndex}
+                    </b>{' '}
+                    of <b>{totalResults}</b>
+                </PaginationInfo>
+                <StyledPagination
+                    current={page}
+                    pageSize={numResultsPerPage}
+                    total={totalResults}
+                    showLessItems
+                    onChange={onChangePage}
+                    showSizeChanger={totalResults > SearchCfg.RESULTS_PER_PAGE}
+                    onShowSizeChange={(_currNum, newNum) => setNumResultsPerPage(newNum)}
+                    pageSizeOptions={['10', '20', '50', '100']}
+                />
+                {applyView ? (
+                    <MatchingViewsLabel
+                        view={view}
+                        selectedViewUrn={selectedViewUrn}
+                        setSelectedViewUrn={setSelectedViewUrn}
+                    />
+                ) : (
+                    <span />
+                )}
+            </PaginationInfoContainer>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchSection.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchSection.tsx
new file mode 100644
index 00000000000000..a9601cc12df30b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchSection.tsx
@@ -0,0 +1,176 @@
+import React from 'react';
+import * as QueryString from 'query-string';
+import { useHistory, useLocation } from 'react-router';
+import { ApolloError } from '@apollo/client';
+import useSortInput from '@src/app/searchV2/sorting/useSortInput';
+import { useSelectedSortOption } from '@src/app/search/context/SearchContext';
+import { FacetFilterInput } from '../../../../../../types.generated';
+import useFilters from '../../../../../search/utils/useFilters';
+import { navigateToEntitySearchUrl } from './navigateToEntitySearchUrl';
+import { FilterSet, GetSearchResultsParams, SearchResultsInterface } from './types';
+import { useEntityQueryParams } from '../../../containers/profile/utils';
+import { EmbeddedListSearch } from './EmbeddedListSearch';
+import { UnionType } from '../../../../../search/utils/constants';
+import {
+    DownloadSearchResults,
+    DownloadSearchResultsInput,
+    DownloadSearchResultsParams,
+} from '../../../../../search/utils/types';
+import { decodeComma } from '../../../utils';
+
+const FILTER = 'filter';
+
+function getParamsWithoutFilters(params: QueryString.ParsedQuery<string>) {
+    const paramsCopy = { ...params };
+    Object.keys(paramsCopy).forEach((key) => {
+        if (key.startsWith(FILTER)) {
+            delete paramsCopy[key];
+        }
+    });
+    return paramsCopy;
+}
+
+type Props = {
+    emptySearchQuery?: string | null;
+    fixedFilters?: FilterSet;
+    fixedQuery?: string | null;
+    placeholderText?: string | null;
+    defaultShowFilters?: boolean;
+    defaultFilters?: Array<FacetFilterInput>;
+    searchBarStyle?: any;
+    searchBarInputStyle?: any;
+    skipCache?: boolean;
+    useGetSearchResults?: (params: GetSearchResultsParams) => {
+        data: SearchResultsInterface | undefined | null;
+        loading: boolean;
+        error: ApolloError | undefined;
+        refetch: (variables: GetSearchResultsParams['variables']) => Promise<SearchResultsInterface | undefined | null>;
+    };
+    useGetDownloadSearchResults?: (params: DownloadSearchResultsParams) => {
+        loading: boolean;
+        error: ApolloError | undefined;
+        searchResults: DownloadSearchResults | undefined | null;
+        refetch: (input: DownloadSearchResultsInput) => Promise<DownloadSearchResults | undefined | null>;
+    };
+    useGetSearchCountResult?: (params: GetSearchResultsParams) => {
+        total: number | undefined;
+        loading: boolean;
+        error?: ApolloError;
+    };
+    shouldRefetch?: boolean;
+    resetShouldRefetch?: () => void;
+    applyView?: boolean;
+    showFilterBar?: boolean;
+};
+
+export const EmbeddedListSearchSection = ({
+    emptySearchQuery,
+    fixedFilters,
+    fixedQuery,
+    placeholderText,
+    defaultShowFilters,
+    defaultFilters,
+    searchBarStyle,
+    searchBarInputStyle,
+    skipCache,
+    useGetSearchResults,
+    useGetDownloadSearchResults,
+    useGetSearchCountResult,
+    shouldRefetch,
+    resetShouldRefetch,
+    applyView,
+    showFilterBar,
+}: Props) => {
+    const history = useHistory();
+    const location = useLocation();
+    const entityQueryParams = useEntityQueryParams();
+
+    const params = QueryString.parse(decodeComma(location.search), { arrayFormat: 'comma' });
+    const paramsWithoutFilters = getParamsWithoutFilters(params);
+    const baseParams = { ...entityQueryParams, ...paramsWithoutFilters };
+    const query: string = params?.query as string;
+    const page: number = params.page && Number(params.page as string) > 0 ? Number(params.page as string) : 1;
+    const unionType: UnionType = Number(params.unionType as any as UnionType) || UnionType.AND;
+    const selectedSortOption = useSelectedSortOption();
+    const sortInput = useSortInput(selectedSortOption);
+
+    const filters: Array<FacetFilterInput> = useFilters(params);
+
+    const onSearch = (q: string) => {
+        navigateToEntitySearchUrl({
+            baseUrl: location.pathname,
+            baseParams,
+            query: q,
+            page: 1,
+            filters,
+            history,
+            unionType,
+        });
+    };
+
+    const onChangeFilters = (newFilters: Array<FacetFilterInput>) => {
+        navigateToEntitySearchUrl({
+            baseUrl: location.pathname,
+            baseParams,
+            query,
+            page: 1,
+            filters: newFilters,
+            unionType,
+            history,
+        });
+    };
+
+    const onChangePage = (newPage: number) => {
+        navigateToEntitySearchUrl({
+            baseUrl: location.pathname,
+            baseParams,
+            query,
+            page: newPage,
+            filters,
+            history,
+            unionType,
+        });
+    };
+
+    const onChangeUnionType = (newUnionType: UnionType) => {
+        navigateToEntitySearchUrl({
+            baseUrl: location.pathname,
+            baseParams,
+            query,
+            page,
+            filters,
+            history,
+            unionType: newUnionType,
+        });
+    };
+
+    return (
+        <EmbeddedListSearch
+            query={query || ''}
+            page={page}
+            unionType={unionType}
+            filters={filters}
+            onChangeFilters={onChangeFilters}
+            onChangeQuery={onSearch}
+            onChangePage={onChangePage}
+            onChangeUnionType={onChangeUnionType}
+            emptySearchQuery={emptySearchQuery}
+            fixedFilters={fixedFilters}
+            fixedQuery={fixedQuery}
+            placeholderText={placeholderText}
+            defaultShowFilters={defaultShowFilters}
+            defaultFilters={defaultFilters}
+            searchBarStyle={searchBarStyle}
+            searchBarInputStyle={searchBarInputStyle}
+            skipCache={skipCache}
+            useGetSearchResults={useGetSearchResults}
+            useGetDownloadSearchResults={useGetDownloadSearchResults}
+            useGetSearchCountResult={useGetSearchCountResult}
+            shouldRefetch={shouldRefetch}
+            resetShouldRefetch={resetShouldRefetch}
+            applyView={applyView}
+            showFilterBar={showFilterBar}
+            sort={sortInput?.sortCriterion}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EntitySearchResults.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EntitySearchResults.tsx
new file mode 100644
index 00000000000000..b2a8e21b4ba3d9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EntitySearchResults.tsx
@@ -0,0 +1,194 @@
+import { Checkbox, Empty, List } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { EntityPath, EntityType, SearchResult } from '../../../../../../types.generated';
+import { EntityAndType } from '../../../../../entity/shared/types';
+import { useSearchContext } from '../../../../../search/context/SearchContext';
+import { MATCHES_CONTAINER_HEIGHT } from '../../../../../searchV2/SearchResultList';
+import { MatchContextContainer } from '../../../../../searchV2/matches/MatchContextContainer';
+import { PreviewSection } from '../../../../../shared/MatchesContext';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { useInitializeColumnLineageCards } from './useInitializeColumnLineageCards';
+
+export const StyledList = styled(List)`
+    height: 100%;
+    flex: 1;
+    overflow: auto;
+
+    .ant-list-items > .ant-list-item {
+        padding-right: 0px;
+        padding-left: 0px;
+    }
+
+    > .ant-list-header {
+        padding-right: 0px;
+        padding-left: 0px;
+        font-size: 14px;
+        font-weight: 600;
+        margin-left: -20px;
+        border-bottom: none;
+        padding-bottom: 0px;
+        padding-top: 15px;
+    }
+` as typeof List;
+
+const StyledCheckbox = styled(Checkbox)`
+    margin-right: 12px;
+`;
+
+export const ListItem = styled.div<{ isSelectMode: boolean; areMatchesExpanded; compactUserSearchCardStyle: boolean }>`
+    padding: 20px;
+    display: flex;
+    align-items: center;
+    background-color: #ffffff;
+    border-radius: 10px;
+    overflow: hidden;
+    margin-bottom: ${({ areMatchesExpanded, compactUserSearchCardStyle }) => {
+        if (!areMatchesExpanded) return 0;
+        if (compactUserSearchCardStyle) return MATCHES_CONTAINER_HEIGHT;
+        return MATCHES_CONTAINER_HEIGHT + 20;
+    }}px;
+    transition: margin-bottom 0.3s ease;
+    border: 1px solid #ebecf0;
+    ${(props) =>
+        props.areMatchesExpanded &&
+        `
+        -webkit-box-shadow: 0px 0px 24px 0px rgba(0, 0, 0, 0.15);
+        -moz-box-shadow: 0px 0px 24px 0px rgba(0, 0, 0, 0.15);
+         box-shadow: 0px 0px 24px 0px rgba(0, 0, 0, 0.15);
+    `}
+`;
+
+export type EntityActionProps = {
+    urn: string;
+    type: EntityType;
+};
+
+type AdditionalProperties = {
+    degree?: number;
+    paths?: EntityPath[];
+};
+
+type Props = {
+    // additional data about the search result that is not part of the entity used to enrich the
+    // presentation of the entity. For example, metadata about how the entity is related for the case
+    // of impact analysis
+    additionalPropertiesList?: Array<AdditionalProperties>;
+    searchResults: Array<SearchResult>;
+    isSelectMode?: boolean;
+    selectedEntities?: EntityAndType[];
+    setSelectedEntities?: (entities: EntityAndType[]) => any;
+    bordered?: boolean;
+    entityAction?: React.FC<EntityActionProps>;
+    compactUserSearchCardStyle?: boolean;
+    noResultsMessage?: string;
+    selectLimit?: number;
+};
+
+const MatchContextAndEntityContainer = styled.div`
+    position: relative;
+    margin: 16px;
+    overflow: hidden;
+`;
+
+export const EntitySearchResults = ({
+    additionalPropertiesList,
+    searchResults,
+    isSelectMode,
+    selectedEntities = [],
+    setSelectedEntities,
+    bordered = true,
+    entityAction,
+    compactUserSearchCardStyle,
+    noResultsMessage,
+    selectLimit,
+}: Props) => {
+    const entityRegistry = useEntityRegistry();
+    const selectedEntityUrns = selectedEntities?.map((entity) => entity.urn) || [];
+
+    if (
+        additionalPropertiesList?.length !== undefined &&
+        additionalPropertiesList.length > 0 &&
+        additionalPropertiesList?.length !== searchResults.length
+    ) {
+        console.warn(
+            'Warning: additionalPropertiesList length provided to EntityNameList does not match entity array length',
+            { additionalPropertiesList, searchResults },
+        );
+    }
+
+    /**
+     * Invoked when a new entity is selected. Simply updates the state of the list of selected entities.
+     */
+    const onSelectEntity = (selectedEntity: EntityAndType, selected: boolean) => {
+        if (selected) {
+            setSelectedEntities?.([...selectedEntities, selectedEntity]);
+        } else {
+            setSelectedEntities?.(selectedEntities?.filter((entity) => entity.urn !== selectedEntity.urn) || []);
+        }
+    };
+
+    const EntityAction = entityAction as React.FC<EntityActionProps>;
+
+    const [urnToExpandedSection, setUrnToExpandedSection] = React.useState<Record<string, PreviewSection>>({});
+
+    // when in CLL impact analysis, default open up the column paths card slideout
+    useInitializeColumnLineageCards(searchResults, setUrnToExpandedSection);
+
+    const { isFullViewCard } = useSearchContext();
+
+    return (
+        <StyledList
+            locale={{
+                emptyText: (
+                    <>
+                        <Empty
+                            description={noResultsMessage || 'No results found'}
+                            image={Empty.PRESENTED_IMAGE_SIMPLE}
+                        />
+                    </>
+                ),
+            }}
+            bordered={bordered}
+            dataSource={searchResults}
+            renderItem={(searchResult) => {
+                const { entity } = searchResult;
+                const expandedSection = isFullViewCard ? urnToExpandedSection[entity.urn] : undefined;
+                return (
+                    <MatchContextAndEntityContainer>
+                        <MatchContextContainer
+                            selected={false}
+                            item={searchResult}
+                            onClick={() => {}}
+                            urnToExpandedSection={urnToExpandedSection}
+                            setUrnToExpandedSection={setUrnToExpandedSection}
+                            compactUserSearchCardStyle={compactUserSearchCardStyle}
+                        >
+                            <ListItem
+                                isSelectMode={isSelectMode || false}
+                                areMatchesExpanded={expandedSection}
+                                compactUserSearchCardStyle={compactUserSearchCardStyle || false}
+                            >
+                                {isSelectMode && (
+                                    <StyledCheckbox
+                                        checked={selectedEntityUrns.indexOf(entity.urn) >= 0}
+                                        disabled={
+                                            selectLimit !== undefined &&
+                                            selectedEntities.length >= selectLimit &&
+                                            !selectedEntityUrns.includes(entity.urn)
+                                        }
+                                        onChange={(e) =>
+                                            onSelectEntity({ urn: entity.urn, type: entity.type }, e.target.checked)
+                                        }
+                                    />
+                                )}
+                                {entityRegistry.renderSearchResult(entity.type, searchResult)}
+                                {entityAction && <EntityAction urn={entity.urn} type={entity.type} />}
+                            </ListItem>
+                        </MatchContextContainer>
+                    </MatchContextAndEntityContainer>
+                );
+            }}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/MatchingViewsLabel.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/MatchingViewsLabel.tsx
new file mode 100644
index 00000000000000..9628a369a81d8f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/MatchingViewsLabel.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import { Button, Typography } from 'antd';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../constants';
+import { DataHubView } from '../../../../../../types.generated';
+
+const StyledMatchingViewsLabel = styled.div`
+    color: ${ANTD_GRAY[8]};
+`;
+
+interface Props {
+    view?: DataHubView;
+    selectedViewUrn?: string;
+    setSelectedViewUrn?: (viewUrn: string | undefined) => void;
+}
+
+const MatchingViewsLabel = ({ view, selectedViewUrn, setSelectedViewUrn }: Props) => {
+    if (selectedViewUrn === view?.urn) {
+        return (
+            <StyledMatchingViewsLabel>
+                Only showing entities in the
+                <Typography.Text strong> {view?.name} </Typography.Text>
+                view.
+                <Button data-testid="view-select-clear" type="link" onClick={() => setSelectedViewUrn?.(undefined)}>
+                    Clear view
+                </Button>
+            </StyledMatchingViewsLabel>
+        );
+    }
+
+    return <div />;
+};
+
+export default MatchingViewsLabel;
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelect.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelect.tsx
new file mode 100644
index 00000000000000..9d58f5c73403c7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelect.tsx
@@ -0,0 +1,212 @@
+import { FilterOutlined } from '@ant-design/icons';
+import { Button, message, Typography } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { useDebounce } from 'react-use';
+
+import useSortInput from '@src/app/searchV2/sorting/useSortInput';
+import SearchSortSelect from '@src/app/searchV2/sorting/SearchSortSelect';
+import { SearchCfg } from '../../../../../../conf';
+import { useGetSearchResultsForMultipleQuery } from '../../../../../../graphql/search.generated';
+import { EntityType, FacetFilterInput, FilterOperator } from '../../../../../../types.generated';
+import { EntityAndType } from '../../../../../entity/shared/types';
+import { SearchBar } from '../../../../../search/SearchBar';
+import { ENTITY_FILTER_NAME, UnionType } from '../../../../../search/utils/constants';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { ANTD_GRAY } from '../../../constants';
+import { isListSubset } from '../../../utils';
+import TabToolbar from '../TabToolbar';
+import { EmbeddedListSearchResults } from './EmbeddedListSearchResults';
+import { SearchSelectBar } from './SearchSelectBar';
+
+const Container = styled.span`
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+`;
+
+const SearchBarContainer = styled.div`
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 12px;
+    border-bottom: 1px solid ${ANTD_GRAY[4]};
+`;
+
+const SEARCH_BAR_STYLE = {
+    maxWidth: 680,
+    padding: 0,
+};
+
+const SEARCH_INPUT_STYLE = {
+    height: 40,
+    fontSize: 12,
+};
+
+type Props = {
+    fixedEntityTypes?: Array<EntityType> | null;
+    placeholderText?: string | null;
+    selectedEntities: EntityAndType[];
+    setSelectedEntities: (Entities: EntityAndType[]) => void;
+    limit?: number;
+};
+
+/**
+ * An embeddable component that can be used for searching & selecting a subset of the entities on the Metadata Graph
+ * in order to perform some action.
+ *
+ * This component provides easy ways to filter for a specific set of entity types, and provides a set of entity urns
+ * when the selection is complete.
+ */
+export const SearchSelect = ({
+    fixedEntityTypes,
+    placeholderText,
+    selectedEntities,
+    setSelectedEntities,
+    limit,
+}: Props) => {
+    const entityRegistry = useEntityRegistry();
+
+    // Component state
+    const [searchQuery, setSearchQuery] = useState<string>('');
+    const [query, setQuery] = useState<string>('');
+    const [page, setPage] = useState(1);
+    const [filters, setFilters] = useState<Array<FacetFilterInput>>([]);
+    const [unionType, setUnionType] = useState(UnionType.AND);
+    const [showFilters, setShowFilters] = useState(false);
+    const [numResultsPerPage, setNumResultsPerPage] = useState(SearchCfg.RESULTS_PER_PAGE);
+    const [sortOption, setSortOption] = useState<string | undefined>();
+    const sortInput = useSortInput(sortOption);
+
+    useDebounce(() => setSearchQuery(query), 300, [query]);
+
+    // Compute search filters
+    const filtersWithoutEntities: Array<FacetFilterInput> = filters.filter(
+        (filter) => filter.field !== ENTITY_FILTER_NAME,
+    );
+    const entityFilters: Array<EntityType> = filters
+        .filter((filter) => filter.field === ENTITY_FILTER_NAME)
+        .flatMap((filter) => filter.values?.map((value) => value.toUpperCase() as EntityType) || []);
+    const finalEntityTypes = (entityFilters.length > 0 && entityFilters) || fixedEntityTypes || [];
+
+    const finalEntityFilter: FacetFilterInput = {
+        field: ENTITY_FILTER_NAME,
+        condition: FilterOperator.Equal,
+        values: finalEntityTypes,
+        negated: false,
+    };
+
+    // Execute search
+    const { data, loading, error, refetch } = useGetSearchResultsForMultipleQuery({
+        variables: {
+            input: {
+                types: finalEntityTypes,
+                query: searchQuery,
+                start: (page - 1) * numResultsPerPage,
+                count: numResultsPerPage,
+                filters: [...filtersWithoutEntities, finalEntityFilter],
+                sortInput,
+            },
+        },
+    });
+
+    const searchAcrossEntities = data?.searchAcrossEntities;
+    const searchResultEntities =
+        searchAcrossEntities?.searchResults?.map((result) => ({ urn: result.entity.urn, type: result.entity.type })) ||
+        [];
+    const searchResultUrns = searchResultEntities.map((entity) => entity.urn);
+    const selectedEntityUrns = selectedEntities.map((entity) => entity.urn);
+    const facets = searchAcrossEntities?.facets || [];
+
+    const onSearch = (q: string) => {
+        setQuery(q);
+    };
+
+    const onChangeFilters = (newFilters: Array<FacetFilterInput>) => {
+        setPage(1);
+        setFilters(newFilters);
+    };
+
+    const onChangePage = (newPage: number) => {
+        setPage(newPage);
+    };
+
+    const onToggleFilters = () => {
+        setShowFilters(!showFilters);
+    };
+
+    /**
+     * Invoked when the "select all" checkbox is clicked.
+     *
+     * This method either adds the entire current page of search results to
+     * the list of selected entities, or removes the current page from the set of selected entities.
+     */
+    const onChangeSelectAll = (selected: boolean) => {
+        if (selected) {
+            // Add current page of urns to the master selected entity list
+            const entitiesToAdd = searchResultEntities.filter(
+                (entity) =>
+                    selectedEntities.findIndex(
+                        (element) => element.urn === entity.urn && element.type === entity.type,
+                    ) < 0,
+            );
+            setSelectedEntities(Array.from(new Set(selectedEntities.concat(entitiesToAdd))));
+        } else {
+            // Filter out the current page of entity urns from the list
+            setSelectedEntities(selectedEntities.filter((entity) => searchResultUrns.indexOf(entity.urn) === -1));
+        }
+    };
+
+    return (
+        <Container>
+            {error && message.error(`Failed to complete search: ${error && error.message}`)}
+            <SearchBarContainer>
+                <Button type="text" onClick={onToggleFilters}>
+                    <FilterOutlined />
+                    <Typography.Text>Filters</Typography.Text>
+                </Button>
+                <SearchBar
+                    initialQuery=""
+                    placeholderText={placeholderText || 'Search entities...'}
+                    suggestions={[]}
+                    style={SEARCH_BAR_STYLE}
+                    inputStyle={SEARCH_INPUT_STYLE}
+                    onSearch={onSearch}
+                    onQueryChange={onSearch}
+                    entityRegistry={entityRegistry}
+                />
+                <SearchSortSelect selectedSortOption={sortOption} setSelectedSortOption={setSortOption} />
+            </SearchBarContainer>
+            <TabToolbar>
+                <SearchSelectBar
+                    isSelectAll={selectedEntities.length > 0 && isListSubset(searchResultUrns, selectedEntityUrns)}
+                    onChangeSelectAll={onChangeSelectAll}
+                    showCancel={false}
+                    showActions={false}
+                    refetch={refetch}
+                    selectedEntities={selectedEntities}
+                    setSelectedEntities={setSelectedEntities}
+                    limit={limit}
+                />
+            </TabToolbar>
+            <EmbeddedListSearchResults
+                loading={loading}
+                searchResponse={searchAcrossEntities}
+                filters={facets}
+                unionType={unionType}
+                selectedFilters={filters}
+                onChangeFilters={onChangeFilters}
+                onChangePage={onChangePage}
+                onChangeUnionType={setUnionType}
+                page={page}
+                showFilters={showFilters}
+                numResultsPerPage={numResultsPerPage}
+                setNumResultsPerPage={setNumResultsPerPage}
+                isSelectMode
+                selectedEntities={selectedEntities}
+                setSelectedEntities={setSelectedEntities}
+                selectLimit={limit}
+            />
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectActions.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectActions.tsx
new file mode 100644
index 00000000000000..6f0f34346f7a62
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectActions.tsx
@@ -0,0 +1,137 @@
+import React from 'react';
+import OwnersDropdown from './action/OwnersDropdown';
+import GlossaryTermDropdown from './action/GlossaryTermsDropdown';
+import TagsDropdown from './action/TagsDropdown';
+import DomainDropdown from './action/DomainsDropdown';
+import DeprecationDropdown from './action/DeprecationDropdown';
+import DeleteDropdown from './action/DeleteDropdown';
+import DataProductsDropdown from './action/DataProductsDropdown';
+import { EntityType } from '../../../../../../types.generated';
+import { EntityCapabilityType } from '../../../../Entity';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { EntityAndType } from '../../../../../entity/shared/types';
+import { SelectActionGroups } from './types';
+
+/**
+ * The set of action groups that are visible by default.
+ *
+ * Currently, only the change tags action is implemented.
+ */
+const DEFAULT_ACTION_GROUPS = [
+    SelectActionGroups.CHANGE_TAGS,
+    SelectActionGroups.CHANGE_GLOSSARY_TERMS,
+    SelectActionGroups.CHANGE_DOMAINS,
+    SelectActionGroups.CHANGE_OWNERS,
+    SelectActionGroups.CHANGE_DEPRECATION,
+    SelectActionGroups.DELETE,
+    SelectActionGroups.CHANGE_DATA_PRODUCTS,
+];
+
+type Props = {
+    selectedEntities: EntityAndType[];
+    visibleActionGroups?: Set<SelectActionGroups>;
+    refetch?: () => void;
+};
+
+/**
+ * A component used for rendering a group of actions to take on a group of selected entities such
+ * as changing owners, tags, domains, etc.
+ */
+export const SearchSelectActions = ({
+    selectedEntities,
+    visibleActionGroups = new Set(DEFAULT_ACTION_GROUPS),
+    refetch,
+}: Props) => {
+    const entityRegistry = useEntityRegistry();
+
+    /**
+     * Extract the urns and entity types, which are used for a) qualifying actions
+     * and b) executing actions.
+     */
+    const selectedEntityUrns = selectedEntities.map((entity) => entity.urn);
+    const selectedEntityTypes = new Set(selectedEntities.map((entity) => entity.type));
+
+    /**
+     * Returns true if a specific capability is supported by ALL entities in a set.
+     */
+    const isEntityCapabilitySupported = (type: EntityCapabilityType, entityTypes: Set<EntityType>) => {
+        return Array.from(entityTypes).every((entityType) =>
+            entityRegistry.getSupportedEntityCapabilities(entityType).has(type),
+        );
+    };
+
+    return (
+        <>
+            {visibleActionGroups.has(SelectActionGroups.CHANGE_OWNERS) && (
+                <OwnersDropdown
+                    urns={selectedEntityUrns}
+                    disabled={
+                        selectedEntityUrns.length === 0 ||
+                        !isEntityCapabilitySupported(EntityCapabilityType.OWNERS, selectedEntityTypes)
+                    }
+                    refetch={refetch}
+                />
+            )}
+            {visibleActionGroups.has(SelectActionGroups.CHANGE_GLOSSARY_TERMS) && (
+                <GlossaryTermDropdown
+                    urns={selectedEntityUrns}
+                    disabled={
+                        selectedEntityUrns.length === 0 ||
+                        !isEntityCapabilitySupported(EntityCapabilityType.GLOSSARY_TERMS, selectedEntityTypes)
+                    }
+                    refetch={refetch}
+                />
+            )}
+            {visibleActionGroups.has(SelectActionGroups.CHANGE_TAGS) && (
+                <TagsDropdown
+                    urns={selectedEntityUrns}
+                    disabled={
+                        selectedEntityUrns.length === 0 ||
+                        !isEntityCapabilitySupported(EntityCapabilityType.TAGS, selectedEntityTypes)
+                    }
+                    refetch={refetch}
+                />
+            )}
+            {visibleActionGroups.has(SelectActionGroups.CHANGE_DOMAINS) && (
+                <DomainDropdown
+                    urns={selectedEntityUrns}
+                    disabled={
+                        selectedEntityUrns.length === 0 ||
+                        !isEntityCapabilitySupported(EntityCapabilityType.DOMAINS, selectedEntityTypes)
+                    }
+                    refetch={refetch}
+                />
+            )}
+            {visibleActionGroups.has(SelectActionGroups.CHANGE_DEPRECATION) && (
+                <DeprecationDropdown
+                    urns={selectedEntityUrns}
+                    disabled={
+                        selectedEntityUrns.length === 0 ||
+                        !isEntityCapabilitySupported(EntityCapabilityType.DEPRECATION, selectedEntityTypes)
+                    }
+                    refetch={refetch}
+                />
+            )}
+            {visibleActionGroups.has(SelectActionGroups.DELETE) && (
+                <DeleteDropdown
+                    urns={selectedEntityUrns}
+                    disabled={
+                        selectedEntityUrns.length === 0 ||
+                        !isEntityCapabilitySupported(EntityCapabilityType.SOFT_DELETE, selectedEntityTypes)
+                    }
+                    refetch={refetch}
+                />
+            )}
+            {visibleActionGroups.has(SelectActionGroups.CHANGE_DATA_PRODUCTS) && (
+                <DataProductsDropdown
+                    urns={selectedEntityUrns}
+                    disabled={
+                        selectedEntityUrns.length === 0 ||
+                        !isEntityCapabilitySupported(EntityCapabilityType.DATA_PRODUCTS, selectedEntityTypes)
+                    }
+                    refetch={refetch}
+                />
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectBar.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectBar.tsx
new file mode 100644
index 00000000000000..253db2c9f79598
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectBar.tsx
@@ -0,0 +1,133 @@
+import { Button, Checkbox, Modal, Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { useEntityFormContext } from '@src/app/entity/shared/entityForm/EntityFormContext';
+import { EntityAndType } from '../../../../../entity/shared/types';
+import { SearchSelectActions } from './SearchSelectActions';
+
+const CheckboxContainer = styled.div`
+    display: flex;
+    justify-content: left;
+    align-items: center;
+`;
+
+const ActionsContainer = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const CancelButton = styled(Button)`
+    && {
+        margin-left: 8px;
+        padding: 0px;
+    }
+`;
+
+const StyledCheckbox = styled(Checkbox)`
+    margin-right: 12px;
+    padding-bottom: 0px;
+`;
+
+const StyledButton = styled(Button)`
+    margin-left: 8px;
+    color: ${(props) => props.theme.styles['primary-color']};
+`;
+
+type Props = {
+    isSelectAll: boolean;
+    totalResults?: number;
+    selectedEntities?: EntityAndType[];
+    setSelectedEntities: (entities: EntityAndType[]) => void;
+    limit?: number;
+    showCancel?: boolean;
+    showActions?: boolean;
+    onChangeSelectAll: (selected: boolean) => void;
+    onCancel?: () => void;
+    refetch?: () => void;
+    areAllEntitiesSelected?: boolean;
+    setAreAllEntitiesSelected?: (areAllSelected: boolean) => void;
+};
+
+/**
+ * A header for use when an entity search select experience is active.
+ *
+ * This component provides a select all checkbox and a set of actions that can be taken on the selected entities.
+ */
+export const SearchSelectBar = ({
+    isSelectAll,
+    totalResults = 0,
+    selectedEntities = [],
+    setSelectedEntities,
+    limit,
+    showCancel = true,
+    showActions = true,
+    onChangeSelectAll,
+    onCancel,
+    refetch,
+    areAllEntitiesSelected,
+    setAreAllEntitiesSelected,
+}: Props) => {
+    const { isInFormContext } = useEntityFormContext();
+    const selectedEntityCount = selectedEntities.length;
+    const onClickCancel = () => {
+        if (selectedEntityCount > 0) {
+            Modal.confirm({
+                title: `Exit Selection`,
+                content: `Are you sure you want to exit? ${selectedEntityCount} selection(s) will be cleared.`,
+                onOk() {
+                    onCancel?.();
+                },
+                onCancel() {},
+                okText: 'Yes',
+                maskClosable: true,
+                closable: true,
+            });
+        } else {
+            onCancel?.();
+        }
+    };
+
+    return (
+        <>
+            <CheckboxContainer>
+                <StyledCheckbox
+                    checked={isSelectAll || areAllEntitiesSelected}
+                    onChange={(e) => {
+                        onChangeSelectAll(e.target.checked as boolean);
+                        setAreAllEntitiesSelected?.(false);
+                    }}
+                    disabled={limit !== undefined && limit > 0}
+                />
+                <Typography.Text strong type="secondary">
+                    {areAllEntitiesSelected ? (
+                        <>All {totalResults} assets selected</>
+                    ) : (
+                        <>{selectedEntityCount} selected</>
+                    )}
+                </Typography.Text>
+                {areAllEntitiesSelected && (
+                    <StyledButton
+                        type="text"
+                        onClick={() => {
+                            onChangeSelectAll(false);
+                            setAreAllEntitiesSelected?.(false);
+                            setSelectedEntities([]);
+                        }}
+                    >
+                        Clear selection
+                    </StyledButton>
+                )}
+            </CheckboxContainer>
+            {!isInFormContext && (
+                <ActionsContainer>
+                    {showActions && <SearchSelectActions selectedEntities={selectedEntities} refetch={refetch} />}
+                    {showCancel && (
+                        <CancelButton onClick={onClickCancel} type="link">
+                            Done
+                        </CancelButton>
+                    )}
+                </ActionsContainer>
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectModal.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectModal.tsx
new file mode 100644
index 00000000000000..19d6bd61b01e21
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/SearchSelectModal.tsx
@@ -0,0 +1,98 @@
+import { Button, Modal } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { EntityType } from '../../../../../../types.generated';
+import ClickOutside from '../../../../../shared/ClickOutside';
+import { EntityAndType } from '../../../../../entity/shared/types';
+import { SearchSelect } from './SearchSelect';
+
+const StyledModal = styled(Modal)`
+    top: 30px;
+`;
+
+const MODAL_WIDTH_PX = 800;
+
+const MODAL_BODY_STYLE = { padding: 0, height: '70vh' };
+
+type Props = {
+    fixedEntityTypes?: Array<EntityType> | null;
+    placeholderText?: string | null;
+    titleText?: string | null;
+    continueText?: string | null;
+    onContinue: (entityUrns: string[]) => void;
+    onCancel?: () => void;
+    limit?: number;
+};
+
+/**
+ * Modal that can be used for searching & selecting a subset of the entities in the Metadata Graph in order to take a specific action.
+ *
+ * This component provides easy ways to filter for a specific set of entity types, and provides a set of entity urns
+ * when the selection is complete.
+ */
+export const SearchSelectModal = ({
+    fixedEntityTypes,
+    placeholderText,
+    titleText,
+    continueText,
+    onContinue,
+    onCancel,
+    limit,
+}: Props) => {
+    const [selectedEntities, setSelectedEntities] = useState<EntityAndType[]>([]);
+
+    const onCancelSelect = () => {
+        if (selectedEntities.length > 0) {
+            Modal.confirm({
+                title: `Exit Selection`,
+                content: `Are you sure you want to exit? ${selectedEntities.length} selection(s) will be cleared.`,
+                onOk() {
+                    onCancel?.();
+                },
+                onCancel() {},
+                okText: 'Yes',
+                maskClosable: true,
+                closable: true,
+            });
+        } else {
+            onCancel?.();
+        }
+    };
+
+    return (
+        <ClickOutside onClickOutside={onCancelSelect} wrapperClassName="search-select-modal">
+            <StyledModal
+                wrapClassName="search-select-modal"
+                bodyStyle={MODAL_BODY_STYLE}
+                title={titleText || 'Select entities'}
+                width={MODAL_WIDTH_PX}
+                zIndex={999}
+                visible
+                onCancel={onCancelSelect}
+                footer={
+                    <>
+                        <Button onClick={onCancel} type="text">
+                            Cancel
+                        </Button>
+                        <Button
+                            type="primary"
+                            id="continueButton"
+                            onClick={() => onContinue(selectedEntities.map((entity) => entity.urn))}
+                            disabled={selectedEntities.length === 0}
+                        >
+                            {continueText || 'Done'}
+                        </Button>
+                    </>
+                }
+            >
+                <SearchSelect
+                    fixedEntityTypes={fixedEntityTypes}
+                    placeholderText={placeholderText}
+                    selectedEntities={selectedEntities}
+                    setSelectedEntities={setSelectedEntities}
+                    limit={limit}
+                />
+            </StyledModal>
+        </ClickOutside>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/ActionDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/ActionDropdown.tsx
new file mode 100644
index 00000000000000..2ab7dac445f811
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/ActionDropdown.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import { Button, Dropdown, Menu } from 'antd';
+import { Tooltip } from '@components';
+import { CaretDownOutlined } from '@ant-design/icons';
+import styled from 'styled-components';
+import MenuItem from 'antd/lib/menu/MenuItem';
+import { ANTD_GRAY } from '../../../../constants';
+
+const DownArrow = styled(CaretDownOutlined)`
+    && {
+        padding-top: 4px;
+        font-size: 8px;
+        margin-left: 2px;
+        margin-top: 2px;
+        color: ${ANTD_GRAY[7]};
+    }
+`;
+
+const StyledMenuItem = styled(MenuItem)`
+    && {
+        padding: 0px;
+    }
+`;
+
+const ActionButton = styled(Button)`
+    font-weight: normal;
+`;
+
+const DropdownWrapper = styled.div<{
+    disabled: boolean;
+}>`
+    cursor: ${(props) => (props.disabled ? 'normal' : 'pointer')};
+    color: ${(props) => (props.disabled ? ANTD_GRAY[7] : 'none')};
+    display: flex;
+    margin-left: 12px;
+    margin-right: 12px;
+`;
+
+export type Action = {
+    title: React.ReactNode;
+    onClick: () => void;
+};
+
+type Props = {
+    name: string;
+    actions: Array<Action>;
+    disabled?: boolean;
+};
+
+export default function ActionDropdown({ name, actions, disabled }: Props) {
+    return (
+        <Tooltip title={disabled ? 'This action is not supported for the selected types.' : ''}>
+            <Dropdown
+                disabled={disabled}
+                trigger={['click']}
+                overlay={
+                    <Menu>
+                        {actions.map((action) => (
+                            <StyledMenuItem>
+                                <ActionButton type="text" onClick={action.onClick}>
+                                    {action.title}
+                                </ActionButton>
+                            </StyledMenuItem>
+                        ))}
+                    </Menu>
+                }
+            >
+                <DropdownWrapper disabled={!!disabled}>
+                    {name}
+                    <DownArrow />
+                </DropdownWrapper>
+            </Dropdown>
+        </Tooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DataProductsDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DataProductsDropdown.tsx
new file mode 100644
index 00000000000000..08dab767fa8a34
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DataProductsDropdown.tsx
@@ -0,0 +1,89 @@
+import { message, Modal } from 'antd';
+import React, { useState } from 'react';
+import ActionDropdown from './ActionDropdown';
+import { handleBatchError } from '../../../../utils';
+import { useBatchSetDataProductMutation } from '../../../../../../../graphql/dataProduct.generated';
+import SetDataProductModal from '../../../../containers/profile/sidebar/DataProduct/SetDataProductModal';
+
+type Props = {
+    urns: Array<string>;
+    disabled: boolean;
+    refetch?: () => void;
+};
+
+// eslint-disable-next-line
+export default function DataProductsDropdown({ urns, disabled = false, refetch }: Props) {
+    const [isEditModalVisible, setIsEditModalVisible] = useState(false);
+    const [batchSetDataProductMutation] = useBatchSetDataProductMutation();
+
+    const batchUnsetDataProducts = () => {
+        batchSetDataProductMutation({
+            variables: {
+                input: {
+                    resourceUrns: urns,
+                },
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.loading({ content: 'Loading...', duration: 2 });
+                    setTimeout(() => {
+                        message.success({ content: 'Removed Data Product!', duration: 2 });
+                        refetch?.();
+                    }, 2000);
+                }
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error(
+                    handleBatchError(urns, e, {
+                        content: `Failed to remove assets from Data Product: \n ${e.message || ''}`,
+                        duration: 3,
+                    }),
+                );
+            });
+    };
+
+    return (
+        <>
+            <ActionDropdown
+                name="Data Product"
+                actions={[
+                    {
+                        title: 'Set Data Product',
+                        onClick: () => {
+                            setIsEditModalVisible(true);
+                        },
+                    },
+                    {
+                        title: 'Unset Data Product',
+                        onClick: () => {
+                            Modal.confirm({
+                                title: `If you continue, Data Product will be removed for the selected assets.`,
+                                content: `Are you sure you want to unset Data Product for these assets?`,
+                                onOk() {
+                                    batchUnsetDataProducts();
+                                },
+                                onCancel() {},
+                                okText: 'Yes',
+                                maskClosable: true,
+                                closable: true,
+                            });
+                        },
+                    },
+                ]}
+                disabled={disabled}
+            />
+            {isEditModalVisible && (
+                <SetDataProductModal
+                    urns={urns}
+                    currentDataProduct={null}
+                    onModalClose={() => {
+                        setIsEditModalVisible(false);
+                    }}
+                    refetch={refetch}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DeleteDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DeleteDropdown.tsx
new file mode 100644
index 00000000000000..c79d43a21e45fd
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DeleteDropdown.tsx
@@ -0,0 +1,70 @@
+import { message, Modal } from 'antd';
+import React from 'react';
+import { useBatchUpdateSoftDeletedMutation } from '../../../../../../../graphql/mutations.generated';
+import ActionDropdown from './ActionDropdown';
+import { handleBatchError } from '../../../../utils';
+
+type Props = {
+    urns: Array<string>;
+    disabled: boolean;
+    refetch?: () => void;
+};
+
+// eslint-disable-next-line
+export default function DeleteDropdown({ urns, disabled = false, refetch }: Props) {
+    const [batchUpdateSoftDeletedMutation] = useBatchUpdateSoftDeletedMutation();
+
+    const batchSoftDelete = () => {
+        batchUpdateSoftDeletedMutation({
+            variables: {
+                input: {
+                    urns,
+                    deleted: true,
+                },
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.success({ content: 'Deleted assets!', duration: 2 });
+                    setTimeout(() => refetch?.(), 3000);
+                }
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error(
+                    handleBatchError(urns, e, {
+                        content: `Failed to delete assets: \n ${e.message || ''}`,
+                        duration: 3,
+                    }),
+                );
+            });
+    };
+
+    return (
+        <>
+            <ActionDropdown
+                name="Delete"
+                actions={[
+                    {
+                        title: 'Mark as deleted',
+                        onClick: () => {
+                            Modal.confirm({
+                                title: `Confirm Delete`,
+                                content: `Are you sure you want to mark these assets as deleted? This will hide the assets
+                                from future DataHub searches. If the assets are re-ingested from an external data platform, they will be restored.`,
+                                onOk() {
+                                    batchSoftDelete();
+                                },
+                                onCancel() {},
+                                okText: 'Yes',
+                                maskClosable: true,
+                                closable: true,
+                            });
+                        },
+                    },
+                ]}
+                disabled={disabled}
+            />
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DeprecationDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DeprecationDropdown.tsx
new file mode 100644
index 00000000000000..981a1a8a0d0f88
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DeprecationDropdown.tsx
@@ -0,0 +1,86 @@
+import { message, Modal } from 'antd';
+import React, { useState } from 'react';
+import { useBatchUpdateDeprecationMutation } from '../../../../../../../graphql/mutations.generated';
+import { UpdateDeprecationModal } from '../../../../EntityDropdown/UpdateDeprecationModal';
+import ActionDropdown from './ActionDropdown';
+import { handleBatchError } from '../../../../utils';
+
+type Props = {
+    urns: Array<string>;
+    disabled: boolean;
+    refetch?: () => void;
+};
+
+// eslint-disable-next-line
+export default function DeprecationDropdown({ urns, disabled = false, refetch }: Props) {
+    const [isEditModalVisible, setIsEditModalVisible] = useState(false);
+    const [batchUpdateDeprecationMutation] = useBatchUpdateDeprecationMutation();
+
+    const batchUndeprecate = () => {
+        batchUpdateDeprecationMutation({
+            variables: {
+                input: {
+                    resources: [...urns.map((urn) => ({ resourceUrn: urn }))],
+                    deprecated: false,
+                },
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.success({ content: 'Marked assets as un-deprecated!', duration: 2 });
+                    refetch?.();
+                }
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error(
+                    handleBatchError(urns, e, {
+                        content: `Failed to mark assets as un-deprecated: \n ${e.message || ''}`,
+                        duration: 3,
+                    }),
+                );
+            });
+    };
+
+    return (
+        <>
+            <ActionDropdown
+                name="Deprecation"
+                actions={[
+                    {
+                        title: 'Mark as deprecated',
+                        onClick: () => {
+                            setIsEditModalVisible(true);
+                        },
+                    },
+                    {
+                        title: 'Mark as un-deprecated',
+                        onClick: () => {
+                            Modal.confirm({
+                                title: `Confirm Mark as un-deprecated`,
+                                content: `Are you sure you want to mark these assets as un-deprecated?`,
+                                onOk() {
+                                    batchUndeprecate();
+                                },
+                                onCancel() {},
+                                okText: 'Yes',
+                                maskClosable: true,
+                                closable: true,
+                            });
+                        },
+                    },
+                ]}
+                disabled={disabled}
+            />
+            {isEditModalVisible && (
+                <UpdateDeprecationModal
+                    urns={urns}
+                    onClose={() => {
+                        setIsEditModalVisible(false);
+                        refetch?.();
+                    }}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DomainsDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DomainsDropdown.tsx
new file mode 100644
index 00000000000000..ad9c58c67de88f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/DomainsDropdown.tsx
@@ -0,0 +1,85 @@
+import { message, Modal } from 'antd';
+import React, { useState } from 'react';
+import { useBatchSetDomainMutation } from '../../../../../../../graphql/mutations.generated';
+import { SetDomainModal } from '../../../../containers/profile/sidebar/Domain/SetDomainModal';
+import ActionDropdown from './ActionDropdown';
+import { handleBatchError } from '../../../../utils';
+
+type Props = {
+    urns: Array<string>;
+    disabled: boolean;
+    refetch?: () => void;
+};
+
+// eslint-disable-next-line
+export default function DomainsDropdown({ urns, disabled = false, refetch }: Props) {
+    const [isEditModalVisible, setIsEditModalVisible] = useState(false);
+    const [batchSetDomainMutation] = useBatchSetDomainMutation();
+
+    const batchUnsetDomains = () => {
+        batchSetDomainMutation({
+            variables: {
+                input: {
+                    resources: [...urns.map((urn) => ({ resourceUrn: urn }))],
+                },
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.success({ content: 'Removed Domain!', duration: 2 });
+                    refetch?.();
+                }
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error(
+                    handleBatchError(urns, e, {
+                        content: `Failed to remove assets from Domain: \n ${e.message || ''}`,
+                        duration: 3,
+                    }),
+                );
+            });
+    };
+
+    return (
+        <>
+            <ActionDropdown
+                name="Domain"
+                actions={[
+                    {
+                        title: 'Set Domain',
+                        onClick: () => {
+                            setIsEditModalVisible(true);
+                        },
+                    },
+                    {
+                        title: 'Unset Domain',
+                        onClick: () => {
+                            Modal.confirm({
+                                title: `If you continue, Domain will be removed for the selected assets.`,
+                                content: `Are you sure you want to unset Domain for these assets?`,
+                                onOk() {
+                                    batchUnsetDomains();
+                                },
+                                onCancel() {},
+                                okText: 'Yes',
+                                maskClosable: true,
+                                closable: true,
+                            });
+                        },
+                    },
+                ]}
+                disabled={disabled}
+            />
+            {isEditModalVisible && (
+                <SetDomainModal
+                    urns={urns}
+                    onCloseModal={() => {
+                        setIsEditModalVisible(false);
+                        refetch?.();
+                    }}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/GlossaryTermsDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/GlossaryTermsDropdown.tsx
new file mode 100644
index 00000000000000..9083567d0fd70f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/GlossaryTermsDropdown.tsx
@@ -0,0 +1,55 @@
+import React, { useState } from 'react';
+import { EntityType } from '../../../../../../../types.generated';
+import EditTagTermsModal, { OperationType } from '../../../../../../shared/tags/AddTagsTermsModal';
+import ActionDropdown from './ActionDropdown';
+
+type Props = {
+    urns: Array<string>;
+    disabled: boolean;
+    refetch?: () => void;
+};
+
+// eslint-disable-next-line
+export default function GlossaryTermsDropdown({ urns, disabled = false, refetch }: Props) {
+    const [isEditModalVisible, setIsEditModalVisible] = useState(false);
+    const [operationType, setOperationType] = useState(OperationType.ADD);
+
+    return (
+        <>
+            <ActionDropdown
+                name="Glossary Terms"
+                actions={[
+                    {
+                        title: 'Add Glossary Terms',
+                        onClick: () => {
+                            setOperationType(OperationType.ADD);
+                            setIsEditModalVisible(true);
+                        },
+                    },
+                    {
+                        title: 'Remove Glossary Terms',
+                        onClick: () => {
+                            setOperationType(OperationType.REMOVE);
+                            setIsEditModalVisible(true);
+                        },
+                    },
+                ]}
+                disabled={disabled}
+            />
+            {isEditModalVisible && (
+                <EditTagTermsModal
+                    type={EntityType.GlossaryTerm}
+                    open
+                    onCloseModal={() => {
+                        setIsEditModalVisible(false);
+                        refetch?.();
+                    }}
+                    resources={urns.map((urn) => ({
+                        resourceUrn: urn,
+                    }))}
+                    operationType={operationType}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/OwnersDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/OwnersDropdown.tsx
new file mode 100644
index 00000000000000..5482d287ada321
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/OwnersDropdown.tsx
@@ -0,0 +1,51 @@
+import React, { useState } from 'react';
+import { EditOwnersModal, OperationType } from '../../../../containers/profile/sidebar/Ownership/EditOwnersModal';
+import ActionDropdown from './ActionDropdown';
+
+type Props = {
+    urns: Array<string>;
+    disabled: boolean;
+    refetch?: () => void;
+};
+
+// eslint-disable-next-line
+export default function OwnersDropdown({ urns, disabled = false, refetch }: Props) {
+    const [isEditModalVisible, setIsEditModalVisible] = useState(false);
+    const [operationType, setOperationType] = useState(OperationType.ADD);
+
+    return (
+        <>
+            <ActionDropdown
+                name="Owners"
+                actions={[
+                    {
+                        title: 'Add owners',
+                        onClick: () => {
+                            setOperationType(OperationType.ADD);
+                            setIsEditModalVisible(true);
+                        },
+                    },
+                    {
+                        title: 'Remove owners',
+                        onClick: () => {
+                            setOperationType(OperationType.REMOVE);
+                            setIsEditModalVisible(true);
+                        },
+                    },
+                ]}
+                disabled={disabled}
+            />
+            {isEditModalVisible && (
+                <EditOwnersModal
+                    urns={urns}
+                    operationType={operationType}
+                    onCloseModal={() => {
+                        setIsEditModalVisible(false);
+                        refetch?.();
+                    }}
+                    hideOwnerType={operationType === OperationType.REMOVE}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/TagsDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/TagsDropdown.tsx
new file mode 100644
index 00000000000000..94dcd4d24540f0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/TagsDropdown.tsx
@@ -0,0 +1,55 @@
+import React, { useState } from 'react';
+import { EntityType } from '../../../../../../../types.generated';
+import EditTagTermsModal, { OperationType } from '../../../../../../shared/tags/AddTagsTermsModal';
+import ActionDropdown from './ActionDropdown';
+
+type Props = {
+    urns: Array<string>;
+    disabled: boolean;
+    refetch?: () => void;
+};
+
+// eslint-disable-next-line
+export default function TagsDropdown({ urns, disabled = false, refetch }: Props) {
+    const [isEditModalVisible, setIsEditModalVisible] = useState(false);
+    const [operationType, setOperationType] = useState(OperationType.ADD);
+
+    return (
+        <>
+            <ActionDropdown
+                name="Tags"
+                actions={[
+                    {
+                        title: 'Add tags',
+                        onClick: () => {
+                            setOperationType(OperationType.ADD);
+                            setIsEditModalVisible(true);
+                        },
+                    },
+                    {
+                        title: 'Remove tags',
+                        onClick: () => {
+                            setOperationType(OperationType.REMOVE);
+                            setIsEditModalVisible(true);
+                        },
+                    },
+                ]}
+                disabled={disabled}
+            />
+            {isEditModalVisible && (
+                <EditTagTermsModal
+                    type={EntityType.Tag}
+                    open
+                    onCloseModal={() => {
+                        setIsEditModalVisible(false);
+                        refetch?.();
+                    }}
+                    resources={urns.map((urn) => ({
+                        resourceUrn: urn,
+                    }))}
+                    operationType={operationType}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/downloadAsCsvUtil.ts b/datahub-web-react/src/app/entityV2/shared/components/styled/search/downloadAsCsvUtil.ts
new file mode 100644
index 00000000000000..99ae03ab9c385c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/downloadAsCsvUtil.ts
@@ -0,0 +1,103 @@
+import { CorpGroup, CorpUser, EntityType } from '../../../../../../types.generated';
+import { capitalizeFirstLetterOnly } from '../../../../../shared/textUtil';
+import { EntityRegistry } from '../../../../../../entityRegistryContext';
+import { GenericEntityProperties } from '../../../../../entity/shared/types';
+import { SearchResultInterface } from './types';
+
+const searchCsvDownloadHeader = [
+    'urn',
+    'name',
+    'type',
+    'description',
+    'user owners',
+    'user owner emails',
+    'group owners',
+    'group owner emails',
+    'tags',
+    'terms',
+    'domain',
+    'platform',
+    'container',
+    'entity url',
+];
+
+export const getSearchCsvDownloadHeader = (sampleResult?: SearchResultInterface) => {
+    let result = searchCsvDownloadHeader;
+
+    // this is checking if the degree field is filled out- if it is that
+    // means the caller is interested in level of dependency.
+    if (typeof sampleResult?.degree === 'number') {
+        result = [...result, 'level of dependency'];
+    }
+    return result;
+};
+
+export const transformGenericEntityPropertiesToCsvRow = (
+    properties: GenericEntityProperties | null,
+    entityUrl: string,
+    result: SearchResultInterface,
+) => {
+    let row = [
+        // urn
+        properties?.urn || '',
+        // name
+        properties?.name || '',
+        // type
+        result.entity.type || '',
+        // description
+        properties?.properties?.description || properties?.editableProperties?.description || '',
+        // user owners
+        properties?.ownership?.owners
+            ?.filter((owner) => owner.owner.type === EntityType.CorpUser)
+            .map(
+                (owner) =>
+                    (owner.owner as CorpUser).editableProperties?.displayName ||
+                    (owner.owner as CorpUser).properties?.fullName ||
+                    (owner.owner as CorpUser).properties?.displayName,
+            )
+            .join(',') || '',
+        // user owner emails
+        properties?.ownership?.owners
+            ?.filter((owner) => owner.owner.type === EntityType.CorpUser)
+            .map(
+                (owner) =>
+                    (owner.owner as CorpUser).editableProperties?.email || (owner.owner as CorpUser).properties?.email,
+            )
+            .join(',') || '',
+        // group owners
+        properties?.ownership?.owners
+            ?.filter((owner) => owner.owner.type === EntityType.CorpGroup)
+            .map((owner) => (owner.owner as CorpGroup).name)
+            .join(',') || '',
+        // group owner emails
+        properties?.ownership?.owners
+            ?.filter((owner) => owner.owner.type === EntityType.CorpGroup)
+            .map((owner) => (owner.owner as CorpGroup).properties?.email)
+            .join(',') || '',
+        // tags
+        properties?.globalTags?.tags?.map((tag) => tag.tag.name).join(',') || '',
+        // terms
+        properties?.glossaryTerms?.terms?.map((term) => term.term.name).join(',') || '',
+        // domain
+        properties?.domain?.domain?.properties?.name || '',
+        // properties
+        properties?.platform?.properties?.displayName || capitalizeFirstLetterOnly(properties?.platform?.name) || '',
+        // container
+        properties?.container?.properties?.name || '',
+        // entity url
+        window.location.origin + entityUrl,
+    ];
+    if (typeof result.degree === 'number') {
+        // optional level of dependency
+        row = [...row, String(result?.degree)];
+    }
+    return row;
+};
+
+export const transformResultsToCsvRow = (results: SearchResultInterface[], entityRegistry: EntityRegistry) => {
+    return results.map((result) => {
+        const genericEntityProperties = entityRegistry.getGenericEntityProperties(result.entity.type, result.entity);
+        const entityUrl = entityRegistry.getEntityUrl(result.entity.type, result.entity.urn);
+        return transformGenericEntityPropertiesToCsvRow(genericEntityProperties, entityUrl, result);
+    });
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/navigateToEntitySearchUrl.ts b/datahub-web-react/src/app/entityV2/shared/components/styled/search/navigateToEntitySearchUrl.ts
new file mode 100644
index 00000000000000..44459e590b222e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/navigateToEntitySearchUrl.ts
@@ -0,0 +1,46 @@
+import { RouteComponentProps } from 'react-router';
+import * as QueryString from 'query-string';
+import { EntityType, FacetFilterInput } from '../../../../../../types.generated';
+import filtersToQueryStringParams from '../../../../../search/utils/filtersToQueryStringParams';
+import { UnionType } from '../../../../../search/utils/constants';
+
+export const navigateToEntitySearchUrl = ({
+    baseUrl,
+    baseParams,
+    type: newType,
+    query: newQuery,
+    page: newPage = 1,
+    filters: newFilters,
+    history,
+    unionType,
+}: {
+    baseUrl: string;
+    baseParams: Record<string, string | boolean>;
+    type?: EntityType;
+    query?: string;
+    page?: number;
+    filters?: Array<FacetFilterInput>;
+    history: RouteComponentProps['history'];
+    unionType: UnionType;
+}) => {
+    const constructedFilters = newFilters || [];
+    if (newType) {
+        constructedFilters.push({ field: 'entity', values: [newType] });
+    }
+
+    const search = QueryString.stringify(
+        {
+            ...baseParams,
+            ...filtersToQueryStringParams(constructedFilters),
+            query: newQuery,
+            page: newPage,
+            unionType,
+        },
+        { arrayFormat: 'comma' },
+    );
+
+    history.replace({
+        pathname: `${baseUrl}`,
+        search,
+    });
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/types.ts b/datahub-web-react/src/app/entityV2/shared/components/styled/search/types.ts
new file mode 100644
index 00000000000000..5509bb8d662527
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/types.ts
@@ -0,0 +1,60 @@
+import {
+    Entity,
+    FacetFilterInput,
+    FacetMetadata,
+    MatchedField,
+    Maybe,
+    Scalars,
+    SearchAcrossEntitiesInput,
+    SearchInsight,
+} from '../../../../../../types.generated';
+import { UnionType } from '../../../../../search/utils/constants';
+
+export type GetSearchResultsParams = {
+    variables: {
+        input: SearchAcrossEntitiesInput;
+    };
+} & Record<string, any>;
+
+export type SearchResultInterface = {
+    entity: Entity;
+    /** Insights about why the search result was matched */
+    insights?: Maybe<Array<SearchInsight>>;
+    /** Matched field hint */
+    matchedFields: Array<MatchedField>;
+    degree?: Maybe<number>;
+} & Record<string, any>;
+
+export type SearchResultsInterface = {
+    /** The offset of the result set */
+    start: Scalars['Int'];
+    /** The number of entities included in the result set */
+    count: Scalars['Int'];
+    /** The total number of search results matching the query and filters */
+    total: Scalars['Int'];
+    /** The search result entities */
+    searchResults: Array<SearchResultInterface>;
+    /** Candidate facet aggregations used for search filtering */
+    facets?: Maybe<Array<FacetMetadata>>;
+};
+
+/**
+ * Supported Action Groups for search-select feature.
+ */
+export enum SelectActionGroups {
+    CHANGE_OWNERS,
+    CHANGE_TAGS,
+    CHANGE_GLOSSARY_TERMS,
+    CHANGE_DOMAINS,
+    CHANGE_DEPRECATION,
+    DELETE,
+    CHANGE_DATA_PRODUCTS,
+}
+
+/**
+ * A fixed set of Filters, joined in conjunction or disjunction.
+ */
+export type FilterSet = {
+    unionType: UnionType;
+    filters: FacetFilterInput[];
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/useInitializeColumnLineageCards.ts b/datahub-web-react/src/app/entityV2/shared/components/styled/search/useInitializeColumnLineageCards.ts
new file mode 100644
index 00000000000000..777fffc1638950
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/useInitializeColumnLineageCards.ts
@@ -0,0 +1,26 @@
+import { useContext, useEffect, useState } from 'react';
+import { LineageTabContext } from '../../../tabs/Lineage/LineageTabContext';
+import { PreviewSection } from '../../../../../shared/MatchesContext';
+import { EntityType, SearchResult } from '../../../../../../types.generated';
+
+export const useInitializeColumnLineageCards = (
+    searchResults: SearchResult[],
+    setUrnToExpandedSection: (urnToExpandedSection: Record<string, PreviewSection>) => void,
+) => {
+    const [isInitalized, setIsInitalized] = useState(false);
+    const { isColumnLevelLineage, selectedColumn } = useContext(LineageTabContext);
+
+    useEffect(() => {
+        if (isColumnLevelLineage && selectedColumn && searchResults?.length && !isInitalized) {
+            const updatedUrnToExpandedSection = {};
+            searchResults.forEach((result) => {
+                // only open datasets column paths expanded section because they're the only ones with columns
+                if (result.entity.type === EntityType.Dataset) {
+                    updatedUrnToExpandedSection[result.entity.urn] = PreviewSection.COLUMN_PATHS;
+                }
+            });
+            setUrnToExpandedSection(updatedUrnToExpandedSection);
+            setIsInitalized(true);
+        }
+    }, [isInitalized, searchResults, isColumnLevelLineage, selectedColumn, setUrnToExpandedSection]);
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/useInitializeSearchResultCards.ts b/datahub-web-react/src/app/entityV2/shared/components/styled/search/useInitializeSearchResultCards.ts
new file mode 100644
index 00000000000000..acaa61dc3128e5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/useInitializeSearchResultCards.ts
@@ -0,0 +1,35 @@
+import { useEffect, useState } from 'react';
+import { PreviewSection } from '../../../../../shared/MatchesContext';
+import { SearchResult } from '../../../../../../types.generated';
+import { getMatchedFieldsForList } from '../../../../../search/context/SearchResultContext';
+
+export const useInitializeSearchResultCards = (
+    searchResults: SearchResult[],
+    setUrnToExpandedSection: React.Dispatch<React.SetStateAction<Record<string, PreviewSection>>>,
+) => {
+    const [initializedUrns, setInitializedUrns] = useState<Set<string>>(new Set());
+
+    useEffect(() => {
+        if (searchResults?.length) {
+            const updatedUrnToExpandedSection: Record<string, PreviewSection> = {};
+            searchResults.forEach((result) => {
+                if (!initializedUrns.has(result.entity.urn)) {
+                    const matchedFields = getMatchedFieldsForList(
+                        'fieldLabels',
+                        result.entity.type,
+                        result.matchedFields,
+                    );
+                    if (matchedFields.length > 0) {
+                        updatedUrnToExpandedSection[result.entity.urn] = PreviewSection.MATCHES;
+                        setInitializedUrns((urns) => {
+                            const updatedUrns = new Set(urns);
+                            updatedUrns.add(result.entity.urn);
+                            return updatedUrns;
+                        });
+                    }
+                }
+            });
+            setUrnToExpandedSection((prev) => ({ ...prev, ...updatedUrnToExpandedSection }));
+        }
+    }, [searchResults, setUrnToExpandedSection, initializedUrns, setInitializedUrns]);
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/components/subtypes.tsx b/datahub-web-react/src/app/entityV2/shared/components/subtypes.tsx
new file mode 100644
index 00000000000000..7f74d5207783f9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/components/subtypes.tsx
@@ -0,0 +1,66 @@
+import React from 'react';
+import Icon, {
+    ApartmentOutlined,
+    DatabaseOutlined,
+    DeploymentUnitOutlined,
+    FilterOutlined,
+    LineChartOutlined,
+} from '@ant-design/icons';
+import ViewComfyOutlinedIcon from '@mui/icons-material/ViewComfyOutlined';
+import TableauWorkbookLogo from '../../../../images/tableau-workbook.svg?react';
+import TableauEmbeddedDataSourceLogo from '../../../../images/tableau-embedded-data-source.svg?react';
+import TableauPublishedDataSourceLogo from '../../../../images/tableau-published-data-source.svg?react';
+
+export enum SubType {
+    Database = 'Database',
+    Schema = 'Schema',
+    Dataset = 'Dataset',
+    Project = 'Project',
+    View = 'View',
+    Table = 'Table',
+    TableauWorksheet = 'Worksheet',
+    TableauWorkbook = 'Workbook',
+    TableauPublishedDataSource = 'Published Data Source',
+    TableauEmbeddedDataSource = 'Embedded Data Source',
+    LookerExplore = 'Explore',
+    Looker = 'Look',
+    DbtSource = 'Source',
+}
+
+export const TYPE_ICON_CLASS_NAME = 'typeIcon';
+
+export function getSubTypeIcon(subType?: string): JSX.Element | undefined {
+    if (!subType) return undefined;
+    const lowerSubType = subType.toLowerCase();
+    if (lowerSubType === SubType.Database.toLowerCase()) {
+        return <DatabaseOutlined className={TYPE_ICON_CLASS_NAME} />;
+    }
+    if (lowerSubType === SubType.Schema.toLowerCase()) {
+        return <ApartmentOutlined className={TYPE_ICON_CLASS_NAME} />;
+    }
+    if (lowerSubType === SubType.Dataset.toLowerCase()) {
+        return <ApartmentOutlined className={TYPE_ICON_CLASS_NAME} />;
+    }
+    if (lowerSubType === SubType.Project.toLowerCase()) {
+        return <DeploymentUnitOutlined className={TYPE_ICON_CLASS_NAME} />;
+    }
+    if (lowerSubType === SubType.Table.toLowerCase()) {
+        return <ViewComfyOutlinedIcon fontSize="inherit" className={TYPE_ICON_CLASS_NAME} />;
+    }
+    if (lowerSubType === SubType.View.toLowerCase()) {
+        return <FilterOutlined className={TYPE_ICON_CLASS_NAME} />;
+    }
+    if (lowerSubType === SubType.TableauWorkbook.toLowerCase()) {
+        return <Icon component={TableauWorkbookLogo} className={TYPE_ICON_CLASS_NAME} />;
+    }
+    if (lowerSubType === SubType.TableauPublishedDataSource.toLowerCase()) {
+        return <Icon component={TableauPublishedDataSourceLogo} className={TYPE_ICON_CLASS_NAME} />;
+    }
+    if (lowerSubType === SubType.TableauEmbeddedDataSource.toLowerCase()) {
+        return <Icon component={TableauEmbeddedDataSourceLogo} className={TYPE_ICON_CLASS_NAME} />;
+    }
+    if (lowerSubType === SubType.TableauWorksheet.toLowerCase()) {
+        return <LineChartOutlined className={TYPE_ICON_CLASS_NAME} />;
+    }
+    return undefined;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/constants.ts b/datahub-web-react/src/app/entityV2/shared/constants.ts
new file mode 100644
index 00000000000000..59fe49fd07fa7a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/constants.ts
@@ -0,0 +1,231 @@
+import { EntityType } from '../../../types.generated';
+
+// TODO(Gabe): integrate this w/ the theme
+export const REDESIGN_COLORS = {
+    BACKGROUND: '#F4F5F7',
+    GREY: '#e5e5e5',
+    BLUE: '#1890FF',
+    DARK_GREY: '#56668E',
+    HEADING_COLOR: '#403D5C',
+    LIGHT_GREY: '#F6F7FA',
+    BACKGROUND_GREY: '#F5F5F5',
+    PRIMARY_DARK_GREEN: '#113633',
+    TERTIARY_GREEN: '#3CB47A',
+    WHITE_WIRE: '#F1F1F1',
+    WHITE: '#FFF',
+    BLACK: '#000',
+    SIDE_BAR: '#E8E6EB',
+    PRIMARY_PURPLE: '#736BA4',
+    BACKGROUND_PURPLE: '#8D76E9',
+    TEXT_HEADING: '#374066',
+    TITLE_PURPLE: '#533FD1',
+    TITLE_PURPLE_2: '#4232A7',
+    HOVER_PURPLE: '#3e2f9d',
+    HOVER_PURPLE_2: '#4b39bc',
+    PLACEHOLDER_PURPLE: '#9AA4BB',
+    HIGHLIGHT_PURPLE: '#F9F8FF',
+    LINK_HOVER_BLUE: '#5280E2',
+    RED_ERROR_BORDER: '#FFA39E',
+    BACKGROUND_SECONDARY_GRAY: '#AAA2CB0F',
+    BACKGROUND_GRAY_2: '#FAF9FC',
+    BACKGROUND_GRAY_3: '#F6F7FA',
+    BACKGROUND_GRAY_4: '#F8F7FE',
+    BACKGROUND_OVERLAY_BLACK: '#171723',
+    BACKGROUND_OVERLAY_BLACK_SEARCH: '#404053',
+    BACKGROUND_PRIMARY_1: '#533fd1',
+    BACKGROUND_PRIMARY_2: '#4232a7',
+    VIEW_PURPLE: '#9178f6',
+    BOX_SHADOW: '#E0E0E025',
+    BORDER_1: '#4b4b54',
+    BORDER_2: '#E6E6E6',
+    BORDER_3: '#EFEFEF',
+    BORDER_4: '#533FD1',
+    BORDER_5: '#8C7EE0',
+    SECONDARY_LIGHT_GREY: '#9DA7C0',
+    ACTION_ICON_GREY: '#676b75',
+    AVATAR_STYLE_WHITE_BACKGROUND: '#ffffff66',
+    GROUP_AVATAR_STYLE_GRADIENT: 'linear-gradient(0deg, #CB427B 0%, #CB427B 100%), #65B5C0',
+    PROFILE_AVATAR_STYLE_GRADIENT: 'linear-gradient(93deg, #23c5b1 5.11%, #30d572 112.87%), #65b5c0',
+    SIDE_BAR_BORDER_RIGHT: '#e8e8e8',
+    DARK_PURPLE: '#6C6B88',
+    LINK_GREY: '#586287',
+    TEXT_GREY: '#8D95B1',
+    WARNING_RED: '#d07b7b',
+    SUBTITLE: '#434863',
+    LIGHT_GREY_BORDER: '#ededed',
+    BACKGROUND_PURPLE_2: '#887fae',
+    FOUNDATION_BLUE_2: '#CFD1DA',
+    FOUNDATION_BLUE_4: '#81879F',
+    FOUNDATION_BLUE_5: '#5B6282',
+    SUB_TEXT: '#81879F',
+    COLD_GREY_TEXT: '#A9ADBD',
+    COLD_GREY_TEXT_BLUE_1: '#EBECF0',
+    LIGHT_GREY_PILL: '#F7F7F7',
+    RED_LIGHT: '#F6D5D5',
+    RED_NORMAL: '#CC6C6C',
+    RED_ERROR: '#d23939',
+    RED_800: '#7D4242',
+    BODY_TEXT: '#5f6685',
+    GREEN_LIGHT: '#d5e9c9',
+    GREEN_NORMAL: '#5f9240',
+    GREEN_800: '#41652C',
+    TEXT_HEADING_SUB_LINK: '#323A5D',
+    DARK_DIVIDER: '#797F98',
+    DEPRECATION_RED: '#CD0D24',
+    DEPRECATION_RED_LIGHT: '#E37878',
+    BODY_TEXT_GREY: '#5F6685',
+    SECTION_BACKGROUND: '#F6F6F6',
+    LIGHT_TEXT_DARK_BACKGROUND: '#EEECFA',
+    GREY_500: '#6b7280',
+    GREY_300: '#8088A3',
+    YELLOW_500: '#f6cf6a',
+    YELLOW_200: '#fcf1d3',
+    YELLOW_600: '#f4c449',
+    YELLOW_700: '#cfa73e',
+    WARNING_YELLOW: '#866C28',
+    YELLOW_BACKGROUND: '#FCEDC7',
+    TOOLTIP_BACKGROUND: '#272D48',
+    ICON_ON_DARK: '#F9FAFC',
+    SILVER_GREY: '#E9EAEE',
+    GREY_100: '#C1C4D0',
+    PURPLE_LIGHT: '#CAC3F1',
+};
+
+export const SEARCH_COLORS = {
+    TITLE_PURPLE: '#533FD1',
+    SUBTEXT_PURPPLE: '#3F54D1',
+    BACKGROUND_PURPLE: '#ece9f8',
+    PLATFORM_TEXT: '#56668E',
+    MATCH_BACKGROUND_GREY: '#5A617110',
+    MATCH_TEXT_GREY: '#8894A9',
+    LINK_BLUE: '#5280E2',
+};
+
+export const ANTD_GRAY = {
+    1: '#FFFFFF',
+    2: '#FAFAFA',
+    2.5: '#F8F8F8',
+    3: '#F5F5F5',
+    4: '#F0F0F0',
+    4.5: '#E9E9E9',
+    5: '#D9D9D9',
+    5.5: '#CCCCCC',
+    6: '#BFBFBF',
+    7: '#8C8C8C',
+    8: '#595959',
+    9: '#434343',
+    10: '#272727',
+    11: '#262626',
+};
+
+export const ANTD_GRAY_V2 = {
+    1: '#F8F9Fa',
+    2: '#F3F5F6',
+    5: '#DDE0E4',
+    6: '#B2B8BD',
+    8: '#5E666E',
+    10: '#1B1E22',
+    11: '#6C6B88',
+    12: '#52596c',
+    13: '#ababab',
+    14: '#f7f7f7',
+};
+
+export const LINEAGE_COLORS = {
+    BLUE_1: '#0958D9',
+    BLUE_2: '#1890FF',
+    PURPLE_1: '#5280E2',
+    PURPLE_2: '#324473',
+    PURPLE_3: SEARCH_COLORS.TITLE_PURPLE,
+    NODE_BORDER: ANTD_GRAY[6],
+};
+
+export const EMPTY_MESSAGES = {
+    documentation: {
+        title: 'No documentation yet',
+    },
+    tags: {
+        title: 'No tags yet',
+        description: 'Tag entities to help make them more discoverable and call out their most important attributes.',
+    },
+    terms: {
+        title: 'No terms yet',
+        description: 'Apply glossary terms to entities to classify their data.',
+    },
+    owners: {
+        title: 'No owners yet',
+        description: 'Adding owners helps you keep track of who is responsible for this data.',
+    },
+    properties: {
+        title: 'No properties',
+        description: 'Properties will appear here if they exist in your data source.',
+    },
+    queries: {
+        title: 'No queries yet',
+        description: 'Create, view, and share commonly used queries for this dataset.',
+    },
+    domain: {
+        title: 'No domain yet',
+        description: 'Group related entities based on your organizational structure using by adding them to a Domain.',
+    },
+    dataProduct: {
+        title: 'No product yet',
+        description: 'Group related entities based on shared characteristics by adding them to a Data Product.',
+    },
+    contains: {
+        title: 'Does not Contain any Glossary Terms',
+        description: 'Terms can contain other terms to represent a "Has A" style relationship.',
+    },
+    inherits: {
+        title: 'Does not Inherit any Glossary Terms',
+        description: 'Terms can inherit from other terms to represent an "Is A" style relationship.',
+    },
+    'contained by': {
+        title: 'Is not Contained by any Glossary Terms',
+        description: 'Terms can be contained by other terms to represent a "Has A" style relationship.',
+    },
+    'inherited by': {
+        title: 'Is not Inherited by any Glossary Terms',
+        description: 'Terms can be inherited by other terms to represent an "Is A" style relationship.',
+    },
+    structuredProps: {
+        title: 'No value set',
+    },
+};
+
+export const ELASTIC_MAX_COUNT = 10000;
+
+export const getElasticCappedTotalValueText = (count: number) => {
+    if (count === ELASTIC_MAX_COUNT) {
+        return `${ELASTIC_MAX_COUNT}+`;
+    }
+
+    return `${count}`;
+};
+
+export const ENTITY_TYPES_WITH_MANUAL_LINEAGE = new Set([
+    EntityType.Dashboard,
+    EntityType.Chart,
+    EntityType.Dataset,
+    EntityType.DataJob,
+]);
+
+export const GLOSSARY_ENTITY_TYPES = [EntityType.GlossaryTerm, EntityType.GlossaryNode];
+
+export const DEFAULT_SYSTEM_ACTOR_URNS = ['urn:li:corpuser:__datahub_system', 'urn:li:corpuser:unknown'];
+
+export const VIEW_ENTITY_PAGE = 'VIEW_ENTITY_PAGE';
+
+// only values for Domain Entity for custom configurable default tab
+export enum EntityProfileTab {
+    DOMAIN_ENTITIES_TAB = 'DOMAIN_ENTITIES_TAB',
+    DOCUMENTATION_TAB = 'DOCUMENTATION_TAB',
+    DATA_PRODUCTS_TAB = 'DATA_PRODUCTS_TAB',
+    SUMMARY_TAB = 'SUMMARY_TAB',
+}
+
+export const EDITING_DOCUMENTATION_URL_PARAM = 'editing';
+
+export const UNKNOWN_DATA_PLATFORM = 'urn:li:dataPlatform:unknown';
+
+export const SMART_ASSERTION_STALE_IN_DAYS = 3;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/EntityProfile.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/EntityProfile.tsx
new file mode 100644
index 00000000000000..74d6accd09a732
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/EntityProfile.tsx
@@ -0,0 +1,422 @@
+import LineageGraph from '@app/lineageV2/LineageGraph';
+import React, { useCallback, useContext, useState } from 'react';
+import { Alert } from 'antd';
+import { MutationHookOptions, MutationTuple, QueryHookOptions, QueryResult } from '@apollo/client/react/types/types';
+import useEntityState from '@src/app/entity/shared/useEntityState';
+import styled from 'styled-components/macro';
+import { useHistory, useLocation } from 'react-router';
+import { matchPath } from 'react-router-dom';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+
+import { EntityType, Exact } from '../../../../../types.generated';
+import { useLineageV2 } from '../../../../lineageV2/useLineageV2';
+import {
+    getEntityPath,
+    getFinalSidebarTabs,
+    getOnboardingStepIdsForEntityType,
+    useRoutedTab,
+    useUpdateGlossaryEntityDataOnChange,
+    defaultTabDisplayConfig,
+} from './utils';
+import { EntityHeader } from './header/EntityHeader';
+import { EntityTabs } from './header/EntityTabs';
+import useIsLineageMode from '../../../../lineage/utils/useIsLineageMode';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+import LineageExplorer from '../../../../lineage/LineageExplorer';
+import CompactContext from '../../../../shared/CompactContext';
+import DynamicTab from '../../tabs/Entity/weaklyTypedAspects/DynamicTab';
+import analytics, { EventType } from '../../../../analytics';
+import { EntityMenuItems } from '../../EntityDropdown/EntityMenuActions';
+import { useIsSeparateSiblingsMode } from '../../useIsSeparateSiblingsMode';
+import { EntityActionItem } from '../../entity/EntityActions';
+import { ErrorSection } from '../../../../shared/error/ErrorSection';
+import { EntityHead } from '../../../../shared/EntityHead';
+import { OnboardingTour } from '../../../../onboarding/OnboardingTour';
+import useGetDataForProfile from './useGetDataForProfile';
+import NonExistentEntityPage from '../../entity/NonExistentEntityPage';
+import {
+    LINEAGE_GRAPH_INTRO_ID,
+    LINEAGE_GRAPH_TIME_FILTER_ID,
+} from '../../../../onboarding/config/LineageGraphOnboardingConfig';
+import EntityProfileSidebar from './sidebar/EntityProfileSidebar';
+import { PageRoutes } from '../../../../../conf/Global';
+import EntitySidebarContext from '../../../../sharedV2/EntitySidebarContext';
+import TabFullsizeContext from '../../../../shared/TabFullsizedContext';
+import { useUpdateDomainEntityDataOnChange as useUpdateDomainEntityDataOnChangeV2 } from '../../../../domainV2/utils';
+import { EntityContext } from '../../../../entity/shared/EntityContext';
+import { EntitySubHeaderSection, GenericEntityProperties, GenericEntityUpdate } from '../../../../entity/shared/types';
+import { EntitySidebarSection, EntitySidebarTab, EntityTab, TabContextType, TabRenderType } from '../../types';
+
+type Props<T, U> = {
+    urn: string;
+    entityType: EntityType;
+    useEntityQuery: (
+        baseOptions: QueryHookOptions<
+            T,
+            Exact<{
+                urn: string;
+            }>
+        >,
+    ) => QueryResult<
+        T,
+        Exact<{
+            urn: string;
+        }>
+    >;
+    useUpdateQuery?: (
+        baseOptions?:
+            | MutationHookOptions<
+                  U,
+                  {
+                      urn: string;
+                      input: GenericEntityUpdate;
+                  }
+              >
+            | undefined,
+    ) => MutationTuple<U, { urn: string; input: GenericEntityUpdate }>;
+    getOverrideProperties?: (T) => GenericEntityProperties;
+    tabs: EntityTab[];
+    sidebarTabs?: EntitySidebarTab[];
+    sidebarSections?: EntitySidebarSection[]; // Deprecated.
+    subHeader?: EntitySubHeaderSection;
+    headerDropdownItems?: Set<EntityMenuItems>;
+    headerActionItems?: Set<EntityActionItem>;
+    isNameEditable?: boolean;
+    isIconEditable?: boolean;
+    isColorEditable?: boolean;
+};
+
+const ContentContainer = styled.div`
+    display: flex;
+    height: 100%;
+`;
+
+const StyledEntityProfileSidebar = styled(EntityProfileSidebar)<{ $isShowNavBarRedesign?: boolean }>`
+    ${(props) => !props.$isShowNavBarRedesign && 'padding-bottom: 12px;'}
+`;
+
+const HeaderAndTabsFlex = styled.div`
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    max-height: 100%;
+    overflow: hidden;
+    min-height: 0;
+    overflow-y: auto;
+    /* Hide scrollbar for Chrome, Safari, and Opera */
+
+    &::-webkit-scrollbar {
+        display: none;
+    }
+`;
+
+const Header = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    /* padding: ${(props) => (props.$isShowNavBarRedesign ? '4px 8px 4px 4px' : '0px 16px 0px 16px')}; */
+    padding: ${(props) => (props.$isShowNavBarRedesign ? '5px 9px 4px 5px' : '0px 16px 0px 16px')};
+    ${(props) => props.$isShowNavBarRedesign && 'margin-right: 0px;'}
+    display: flex;
+    align-items: center;
+`;
+
+const HeaderContent = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    background-color: #ffffff;
+    border-radius: ${(props) =>
+        props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '8px'};
+    box-shadow: ${(props) =>
+        props.$isShowNavBarRedesign
+            ? props.theme.styles['box-shadow-navbar-redesign']
+            : '0px 0px 5px rgba(0, 0, 0, 0.08)'};
+    flex: 1;
+    flex-shrink: 0;
+    padding: 0;
+`;
+
+const Body = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    padding: ${(props) => (props.$isShowNavBarRedesign ? '12px 8px 4px 4px' : '12px 16px 12px 16px')};
+    height: 100%;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+`;
+
+const BodyContent = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    background-color: #ffffff;
+    border-radius: ${(props) =>
+        props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '8px'};
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    box-shadow: ${(props) =>
+        props.$isShowNavBarRedesign
+            ? props.theme.styles['box-shadow-navbar-redesign']
+            : '0px 0px 5px rgba(0, 0, 0, 0.08)'};
+    height: 100%;
+    overflow: hidden;
+`;
+
+const TabsWrapper = styled.div``;
+
+const TabContent = styled.div`
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    overflow: auto;
+`;
+
+const StyledAlert = styled(Alert)`
+    box-sizing: border-box;
+    position: fixed;
+    width: calc(100% - 70px);
+    z-index: 1000;
+`;
+
+const Wrapper = styled.div<{ showAlert: boolean }>`
+    flex-grow: 1;
+    min-width: 0;
+    height: 100%;
+    margin-top: ${({ showAlert }) => (showAlert ? '2.5rem' : '0')};
+`;
+
+/**
+ * Container for display of the Entity Page
+ */
+export const EntityProfile = <T, U>({
+    urn,
+    useEntityQuery,
+    useUpdateQuery,
+    entityType,
+    getOverrideProperties,
+    tabs,
+    sidebarTabs = [],
+    sidebarSections,
+    headerDropdownItems,
+    headerActionItems,
+    isNameEditable,
+    isColorEditable,
+    isIconEditable,
+    subHeader,
+}: Props<T, U>): JSX.Element => {
+    const { isTabFullsize } = useContext(TabFullsizeContext);
+    const isLineageMode = useIsLineageMode();
+    const isLineageV2 = useLineageV2();
+    const isHideSiblingMode = useIsSeparateSiblingsMode();
+    const entityRegistry = useEntityRegistry();
+    const history = useHistory();
+    const location = useLocation();
+    const isInSearch = matchPath(location.pathname, PageRoutes.SEARCH_RESULTS) !== null;
+    const [showAlert, setShowAlert] = useState(true);
+    const entityState = useEntityState();
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+
+    const { width } = React.useContext(EntitySidebarContext);
+    const isCompact = React.useContext(CompactContext);
+
+    const tabsWithDefaults = tabs.map((tab) => ({ ...tab, display: { ...defaultTabDisplayConfig, ...tab.display } }));
+
+    const [shouldRefetchEmbeddedListSearch, setShouldRefetchEmbeddedListSearch] = useState(false);
+    const entityStepIds: string[] = getOnboardingStepIdsForEntityType(entityType);
+    const lineageGraphStepIds: string[] = [LINEAGE_GRAPH_INTRO_ID, LINEAGE_GRAPH_TIME_FILTER_ID];
+    const stepIds = isLineageMode ? lineageGraphStepIds : entityStepIds;
+
+    const routeToTab = useCallback(
+        ({
+            tabName,
+            tabParams,
+            method = 'replace',
+        }: {
+            tabName: string;
+            tabParams?: Record<string, any>;
+            method?: 'push' | 'replace';
+        }) => {
+            analytics.event({
+                type: EventType.EntitySectionViewEvent,
+                entityType,
+                entityUrn: urn,
+                section: tabName.toLowerCase(),
+            });
+            history[method](
+                getEntityPath(entityType, urn, entityRegistry, false, isHideSiblingMode, tabName, tabParams),
+            );
+        },
+        [history, entityType, urn, entityRegistry, isHideSiblingMode],
+    );
+
+    const { entityData, dataPossiblyCombinedWithSiblings, dataNotCombinedWithSiblings, loading, error, refetch } =
+        useGetDataForProfile({ urn, entityType, useEntityQuery, getOverrideProperties });
+
+    useUpdateGlossaryEntityDataOnChange(entityData, entityType);
+    useUpdateDomainEntityDataOnChangeV2(entityData, entityType);
+
+    const maybeUpdateEntity = useUpdateQuery?.({
+        onCompleted: () => refetch(),
+    });
+
+    let updateEntity;
+    if (maybeUpdateEntity) {
+        [updateEntity] = maybeUpdateEntity;
+    }
+
+    const lineage = entityData ? entityRegistry.getLineageVizConfig(entityType, entityData) : undefined;
+
+    const autoRenderTabs: EntityTab[] =
+        entityData?.autoRenderAspects?.map((aspect) => ({
+            name: aspect.renderSpec?.displayName || aspect.aspectName,
+            component: () => (
+                <DynamicTab
+                    renderSpec={aspect.renderSpec}
+                    type={aspect.renderSpec?.displayType}
+                    payload={aspect.payload}
+                />
+            ),
+            display: {
+                visible: () => true,
+                enabled: () => true,
+            },
+        })) || [];
+
+    const visibleTabs = [...tabsWithDefaults, ...autoRenderTabs].filter((tab) =>
+        tab.display?.visible(entityData, dataPossiblyCombinedWithSiblings),
+    );
+
+    const enabledAndVisibleTabs = visibleTabs.filter((tab) =>
+        tab.display?.enabled(entityData, dataPossiblyCombinedWithSiblings),
+    );
+
+    const routedTab = useRoutedTab(enabledAndVisibleTabs);
+
+    if (entityData?.exists === false) {
+        return <NonExistentEntityPage />;
+    }
+
+    const finalTabs = getFinalSidebarTabs(sidebarTabs, sidebarSections || []);
+
+    if (isCompact) {
+        return (
+            <EntityContext.Provider
+                value={{
+                    urn,
+                    entityType,
+                    entityData,
+                    loading,
+                    baseEntity: dataPossiblyCombinedWithSiblings,
+                    dataNotCombinedWithSiblings,
+                    updateEntity,
+                    routeToTab,
+                    refetch,
+                    lineage,
+                    shouldRefetchEmbeddedListSearch,
+                    setShouldRefetchEmbeddedListSearch,
+                    entityState,
+                }}
+            >
+                <>
+                    {(error && <ErrorSection />) || (
+                        <EntityProfileSidebar
+                            type={isInSearch ? 'card' : undefined}
+                            focused={isInSearch}
+                            tabs={finalTabs}
+                            contextType={isInSearch ? TabContextType.SEARCH_SIDEBAR : TabContextType.LINEAGE_SIDEBAR}
+                            width={width}
+                            headerDropdownItems={headerDropdownItems}
+                        />
+                    )}
+                </>
+            </EntityContext.Provider>
+        );
+    }
+
+    const showError = error;
+    const showFullScreen = !error && isLineageMode && isLineageV2;
+    const showExplorer = isLineageMode && !isLineageV2;
+
+    return (
+        <EntityContext.Provider
+            value={{
+                urn,
+                entityType,
+                entityData,
+                loading,
+                baseEntity: dataPossiblyCombinedWithSiblings,
+                dataNotCombinedWithSiblings,
+                updateEntity,
+                routeToTab,
+                refetch,
+                lineage,
+                shouldRefetchEmbeddedListSearch,
+                setShouldRefetchEmbeddedListSearch,
+                entityState,
+            }}
+        >
+            {entityData?.status?.removed && (
+                <StyledAlert
+                    message="This entity is not discoverable via search or lineage graph. Contact your DataHub admin for more information."
+                    banner
+                    closable
+                    onClose={() => setShowAlert(false)}
+                />
+            )}
+            <Wrapper showAlert={showAlert && !!entityData?.status?.removed}>
+                <OnboardingTour stepIds={stepIds} />
+                <EntityHead />
+                {showError && <ErrorSection />}
+                {showFullScreen && <LineageGraph isFullscreen />}
+                {!showFullScreen && (
+                    <ContentContainer>
+                        {showExplorer && <LineageExplorer type={entityType} urn={urn} />}
+                        {!isLineageMode && (
+                            <>
+                                <HeaderAndTabsFlex>
+                                    {!isTabFullsize && (
+                                        <Header $isShowNavBarRedesign={isShowNavBarRedesign}>
+                                            <HeaderContent $isShowNavBarRedesign={isShowNavBarRedesign}>
+                                                <EntityHeader
+                                                    headerDropdownItems={headerDropdownItems}
+                                                    headerActionItems={headerActionItems}
+                                                    isNameEditable={isNameEditable}
+                                                    isIconEditable={isIconEditable}
+                                                    isColorEditable={isColorEditable}
+                                                    displayProperties={entityData?.displayProperties || undefined}
+                                                    subHeader={subHeader}
+                                                />
+                                            </HeaderContent>
+                                        </Header>
+                                    )}
+                                    <Body $isShowNavBarRedesign={isShowNavBarRedesign}>
+                                        <BodyContent $isShowNavBarRedesign={isShowNavBarRedesign}>
+                                            {!isTabFullsize && (
+                                                <TabsWrapper>
+                                                    <EntityTabs tabs={visibleTabs} selectedTab={routedTab} />
+                                                </TabsWrapper>
+                                            )}
+                                            <TabContent>
+                                                {routedTab && (
+                                                    <routedTab.component
+                                                        properties={routedTab.properties}
+                                                        contextType={TabContextType.PROFILE}
+                                                        renderType={TabRenderType.DEFAULT}
+                                                    />
+                                                )}
+                                            </TabContent>
+                                        </BodyContent>
+                                    </Body>
+                                </HeaderAndTabsFlex>
+                                {!isTabFullsize && (
+                                    <StyledEntityProfileSidebar
+                                        tabs={finalTabs}
+                                        type="card"
+                                        width={width}
+                                        contextType={TabContextType.PROFILE_SIDEBAR}
+                                        headerDropdownItems={headerDropdownItems}
+                                        $isShowNavBarRedesign={isShowNavBarRedesign}
+                                    />
+                                )}
+                            </>
+                        )}
+                    </ContentContainer>
+                )}
+            </Wrapper>
+        </EntityContext.Provider>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityHeader.test.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityHeader.test.tsx
new file mode 100644
index 00000000000000..db347d4f1cc54c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityHeader.test.tsx
@@ -0,0 +1,95 @@
+import { platformPrivileges } from '../../../../../../Mocks';
+import { EntityType } from '../../../../../../types.generated';
+import { getCanEditName } from '../header/EntityHeader';
+
+describe('getCanEditName', () => {
+    const entityDataWithManagePrivileges = { privileges: { canManageEntity: true } };
+    const entityDataWithoutManagePrivileges = { privileges: { canManageEntity: false } };
+
+    it('should return true for Terms if manageGlossaries privilege is true', () => {
+        const canEditName = getCanEditName(
+            EntityType.GlossaryTerm,
+            entityDataWithoutManagePrivileges,
+            platformPrivileges,
+        );
+
+        expect(canEditName).toBe(true);
+    });
+
+    it('should return false for Terms if manageGlossaries privilege and canManageEntity is false', () => {
+        const privilegesWithoutGlossaries = { ...platformPrivileges, manageGlossaries: false };
+        const canEditName = getCanEditName(
+            EntityType.GlossaryTerm,
+            entityDataWithoutManagePrivileges,
+            privilegesWithoutGlossaries,
+        );
+
+        expect(canEditName).toBe(false);
+    });
+
+    it('should return true for Terms if manageGlossaries privilege is false but canManageEntity is true', () => {
+        const privilegesWithoutGlossaries = { ...platformPrivileges, manageGlossaries: false };
+        const canEditName = getCanEditName(
+            EntityType.GlossaryTerm,
+            entityDataWithManagePrivileges,
+            privilegesWithoutGlossaries,
+        );
+
+        expect(canEditName).toBe(true);
+    });
+
+    it('should return true for Nodes if manageGlossaries privilege is true', () => {
+        const canEditName = getCanEditName(
+            EntityType.GlossaryNode,
+            entityDataWithoutManagePrivileges,
+            platformPrivileges,
+        );
+
+        expect(canEditName).toBe(true);
+    });
+
+    it('should return false for Nodes if manageGlossaries privilege and canManageEntity is false', () => {
+        const privilegesWithoutGlossaries = { ...platformPrivileges, manageGlossaries: false };
+        const canEditName = getCanEditName(
+            EntityType.GlossaryNode,
+            entityDataWithoutManagePrivileges,
+            privilegesWithoutGlossaries,
+        );
+
+        expect(canEditName).toBe(false);
+    });
+
+    it('should return true for Nodes if manageGlossaries privilege is false but canManageEntity is true', () => {
+        const privilegesWithoutGlossaries = { ...platformPrivileges, manageGlossaries: false };
+        const canEditName = getCanEditName(
+            EntityType.GlossaryNode,
+            entityDataWithManagePrivileges,
+            privilegesWithoutGlossaries,
+        );
+
+        expect(canEditName).toBe(true);
+    });
+
+    it('should return true for Domains if manageDomains privilege is true', () => {
+        const canEditName = getCanEditName(EntityType.Domain, entityDataWithoutManagePrivileges, platformPrivileges);
+
+        expect(canEditName).toBe(true);
+    });
+
+    it('should return false for Domains if manageDomains privilege is false', () => {
+        const privilegesWithoutDomains = { ...platformPrivileges, manageDomains: false };
+        const canEditName = getCanEditName(
+            EntityType.Domain,
+            entityDataWithoutManagePrivileges,
+            privilegesWithoutDomains,
+        );
+
+        expect(canEditName).toBe(false);
+    });
+
+    it('should return false for an unsupported entity', () => {
+        const canEditName = getCanEditName(EntityType.Chart, entityDataWithManagePrivileges, platformPrivileges);
+
+        expect(canEditName).toBe(false);
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityProfile.test.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityProfile.test.tsx
new file mode 100644
index 00000000000000..14d712db4967ab
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityProfile.test.tsx
@@ -0,0 +1,474 @@
+import { MockedProvider } from '@apollo/client/testing';
+import { fireEvent, render, waitFor } from '@testing-library/react';
+import React from 'react';
+import { mocks } from '../../../../../../Mocks';
+import {
+    GetDatasetQuery,
+    useGetDatasetQuery,
+    useUpdateDatasetMutation,
+} from '../../../../../../graphql/dataset.generated';
+import { EntityType } from '../../../../../../types.generated';
+import TestPageContainer from '../../../../../../utils/test-utils/TestPageContainer';
+import QueriesTab from '../../../tabs/Dataset/Queries/QueriesTab';
+import { SchemaTab } from '../../../tabs/Dataset/Schema/SchemaTab';
+import StatsTab from '../../../tabs/Dataset/Stats/StatsTab';
+import { DocumentationTab } from '../../../tabs/Documentation/DocumentationTab';
+import { LineageTab } from '../../../tabs/Lineage/LineageTab';
+import { PropertiesTab } from '../../../tabs/Properties/PropertiesTab';
+import { EntityProfile } from '../EntityProfile';
+import { SidebarAboutSection } from '../sidebar/AboutSection/SidebarAboutSection';
+import { SidebarStatsSection } from '../sidebar/Dataset/StatsSidebarSection';
+import { SidebarOwnerSection } from '../sidebar/Ownership/sidebar/SidebarOwnerSection';
+import { SidebarTagsSection } from '../sidebar/SidebarTagsSection';
+
+describe('EntityProfile', () => {
+    it('renders dataset page', async () => {
+        const { getByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
+                    <EntityProfile
+                        urn="urn:li:dataset:3"
+                        entityType={EntityType.Dataset}
+                        useEntityQuery={useGetDatasetQuery}
+                        useUpdateQuery={useUpdateDatasetMutation}
+                        getOverrideProperties={() => ({})}
+                        tabs={[
+                            {
+                                name: 'Schema',
+                                component: SchemaTab,
+                            },
+                            {
+                                name: 'Documentation',
+                                component: DocumentationTab,
+                            },
+                            {
+                                name: 'Properties',
+                                component: PropertiesTab,
+                            },
+                            {
+                                name: 'Lineage',
+                                component: LineageTab,
+                                display: {
+                                    visible: (_, _1) => true,
+                                    enabled: (_, dataset: GetDatasetQuery) =>
+                                        ((dataset?.dataset as any)?.upstreamLineage?.entities?.length || 0) > 0 ||
+                                        ((dataset?.dataset as any)?.downstreamLineage?.entities?.length || 0) > 0,
+                                },
+                            },
+                            {
+                                name: 'Queries',
+                                component: QueriesTab,
+                                display: {
+                                    visible: (_, _1) => true,
+                                    enabled: (_, dataset: GetDatasetQuery) =>
+                                        (dataset?.dataset?.usageStats?.buckets?.length && true) || false,
+                                },
+                            },
+                            {
+                                name: 'Stats',
+                                component: StatsTab,
+                                display: {
+                                    visible: (_, _1) => true,
+                                    enabled: (_, dataset: GetDatasetQuery) =>
+                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
+                                        false,
+                                },
+                            },
+                        ]}
+                        sidebarSections={[
+                            {
+                                component: SidebarAboutSection,
+                            },
+                            {
+                                component: SidebarStatsSection,
+                                display: {
+                                    visible: (_, dataset: GetDatasetQuery) =>
+                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
+                                        false,
+                                },
+                            },
+                            {
+                                component: SidebarTagsSection,
+                            },
+                            {
+                                component: SidebarOwnerSection,
+                            },
+                        ]}
+                    />
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+
+        await waitFor(() => expect(getByText('Yet Another Dataset')).toBeInTheDocument());
+        await waitFor(() =>
+            expect(getByText('This and here we have yet another Dataset (YAN). Are there more?')).toBeInTheDocument(),
+        );
+    }, 10000);
+
+    it('renders tab content', async () => {
+        const { getByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
+                    <EntityProfile
+                        urn="urn:li:dataset:3"
+                        entityType={EntityType.Dataset}
+                        useEntityQuery={useGetDatasetQuery}
+                        useUpdateQuery={useUpdateDatasetMutation}
+                        getOverrideProperties={() => ({})}
+                        tabs={[
+                            {
+                                name: 'Schema',
+                                component: SchemaTab,
+                            },
+                            {
+                                name: 'Documentation',
+                                component: DocumentationTab,
+                            },
+                            {
+                                name: 'Properties',
+                                component: PropertiesTab,
+                            },
+                            {
+                                name: 'Lineage',
+                                component: LineageTab,
+                                display: {
+                                    visible: (_, _1) => true,
+                                    enabled: (_, dataset: GetDatasetQuery) =>
+                                        ((dataset?.dataset as any)?.upstreamLineage?.entities?.length || 0) > 0 ||
+                                        ((dataset?.dataset as any)?.downstreamLineage?.entities?.length || 0) > 0,
+                                },
+                            },
+                            {
+                                name: 'Queries',
+                                component: QueriesTab,
+                                display: {
+                                    visible: (_, _1) => true,
+                                    enabled: (_, dataset: GetDatasetQuery) =>
+                                        (dataset?.dataset?.usageStats?.buckets?.length && true) || false,
+                                },
+                            },
+                            {
+                                name: 'Stats',
+                                component: StatsTab,
+                                display: {
+                                    visible: (_, _1) => true,
+                                    enabled: (_, dataset: GetDatasetQuery) =>
+                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
+                                        false,
+                                },
+                            },
+                        ]}
+                        sidebarSections={[
+                            {
+                                component: SidebarAboutSection,
+                            },
+                            {
+                                component: SidebarStatsSection,
+                                display: {
+                                    visible: (_, dataset: GetDatasetQuery) =>
+                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
+                                        false,
+                                },
+                            },
+                            {
+                                component: SidebarTagsSection,
+                            },
+                            {
+                                component: SidebarOwnerSection,
+                            },
+                        ]}
+                    />
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+
+        // find the schema fields in the schema table
+        await waitFor(() => expect(getByText('user_name')).toBeInTheDocument());
+        await waitFor(() => expect(getByText('user_id')).toBeInTheDocument());
+    });
+
+    it('switches tab content', async () => {
+        const { getByText, queryByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
+                    <EntityProfile
+                        urn="urn:li:dataset:3"
+                        entityType={EntityType.Dataset}
+                        useEntityQuery={useGetDatasetQuery}
+                        useUpdateQuery={useUpdateDatasetMutation}
+                        getOverrideProperties={() => ({})}
+                        tabs={[
+                            {
+                                name: 'Schema',
+                                component: SchemaTab,
+                            },
+                            {
+                                name: 'Documentation',
+                                component: DocumentationTab,
+                            },
+                            {
+                                name: 'Properties',
+                                component: PropertiesTab,
+                            },
+                            {
+                                name: 'Lineage',
+                                component: LineageTab,
+                                display: {
+                                    visible: (_, _1) => true,
+                                    enabled: (_, dataset: GetDatasetQuery) =>
+                                        ((dataset?.dataset as any)?.upstreamLineage?.entities?.length || 0) > 0 ||
+                                        ((dataset?.dataset as any)?.downstreamLineage?.entities?.length || 0) > 0,
+                                },
+                            },
+                            {
+                                name: 'Queries',
+                                component: QueriesTab,
+                                display: {
+                                    visible: (_, _1) => true,
+                                    enabled: (_, dataset: GetDatasetQuery) =>
+                                        (dataset?.dataset?.usageStats?.buckets?.length && true) || false,
+                                },
+                            },
+                            {
+                                name: 'Stats',
+                                component: StatsTab,
+                                display: {
+                                    enabled: (_, _1) => true,
+                                    visible: (_, dataset: GetDatasetQuery) =>
+                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
+                                        false,
+                                },
+                            },
+                        ]}
+                        sidebarSections={[
+                            {
+                                component: SidebarAboutSection,
+                            },
+                            {
+                                component: SidebarStatsSection,
+                                display: {
+                                    visible: (_, dataset: GetDatasetQuery) =>
+                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
+                                        false,
+                                },
+                            },
+                            {
+                                component: SidebarTagsSection,
+                            },
+                            {
+                                component: SidebarOwnerSection,
+                            },
+                        ]}
+                    />
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+
+        // find the schema fields in the schema table
+        await waitFor(() => expect(getByText('user_name')).toBeInTheDocument());
+        await waitFor(() => expect(getByText('user_id')).toBeInTheDocument());
+        expect(queryByText('propertyAKey')).not.toBeInTheDocument();
+
+        fireEvent(
+            getByText('Properties'),
+            new MouseEvent('click', {
+                bubbles: true,
+                cancelable: true,
+            }),
+        );
+
+        await waitFor(() => expect(getByText('propertyAKey')).toBeInTheDocument());
+        await waitFor(() => expect(getByText('propertyAValue')).toBeInTheDocument());
+        expect(queryByText('user_name')).not.toBeInTheDocument();
+    });
+
+    it('renders sidebar content', async () => {
+        const { getByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
+                    <EntityProfile
+                        urn="urn:li:dataset:3"
+                        entityType={EntityType.Dataset}
+                        useEntityQuery={useGetDatasetQuery}
+                        useUpdateQuery={useUpdateDatasetMutation}
+                        getOverrideProperties={() => ({})}
+                        tabs={[
+                            {
+                                name: 'Schema',
+                                component: SchemaTab,
+                            },
+                            {
+                                name: 'Documentation',
+                                component: DocumentationTab,
+                            },
+                            {
+                                name: 'Properties',
+                                component: PropertiesTab,
+                            },
+                            {
+                                name: 'Lineage',
+                                component: LineageTab,
+                            },
+                            {
+                                name: 'Queries',
+                                component: QueriesTab,
+                                display: {
+                                    visible: (_, _1) => true,
+                                    enabled: (_, dataset: GetDatasetQuery) =>
+                                        (dataset?.dataset?.usageStats?.buckets?.length && true) || false,
+                                },
+                            },
+                            {
+                                name: 'Stats',
+                                component: StatsTab,
+                                display: {
+                                    enabled: (_, _1) => true,
+                                    visible: (_, dataset: GetDatasetQuery) =>
+                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
+                                        false,
+                                },
+                            },
+                        ]}
+                        sidebarSections={[
+                            {
+                                component: SidebarAboutSection,
+                            },
+                            {
+                                component: SidebarStatsSection,
+                                display: {
+                                    visible: (_, dataset: GetDatasetQuery) =>
+                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
+                                        false,
+                                },
+                            },
+                            {
+                                component: SidebarTagsSection,
+                            },
+                            {
+                                component: SidebarOwnerSection,
+                            },
+                        ]}
+                    />
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+
+        // find the tags
+        await waitFor(() => expect(getByText('Tags')).toBeInTheDocument());
+        await waitFor(() => expect(getByText('abc-sample-tag')).toBeInTheDocument());
+    });
+
+    it('renders autorender aspects', async () => {
+        const { getByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
+                    <EntityProfile
+                        urn="urn:li:dataset:3"
+                        entityType={EntityType.Dataset}
+                        useEntityQuery={useGetDatasetQuery}
+                        useUpdateQuery={useUpdateDatasetMutation}
+                        getOverrideProperties={() => ({})}
+                        tabs={[
+                            {
+                                name: 'Schema',
+                                component: SchemaTab,
+                            },
+                            {
+                                name: 'Documentation',
+                                component: DocumentationTab,
+                            },
+                            {
+                                name: 'Properties',
+                                component: PropertiesTab,
+                            },
+                            {
+                                name: 'Lineage',
+                                component: LineageTab,
+                                display: {
+                                    visible: (_, _1) => true,
+                                    enabled: (_, dataset: GetDatasetQuery) =>
+                                        ((dataset?.dataset as any)?.upstreamLineage?.entities?.length || 0) > 0 ||
+                                        ((dataset?.dataset as any)?.downstreamLineage?.entities?.length || 0) > 0,
+                                },
+                            },
+                            {
+                                name: 'Queries',
+                                component: QueriesTab,
+                                display: {
+                                    visible: (_, _1) => true,
+                                    enabled: (_, dataset: GetDatasetQuery) =>
+                                        (dataset?.dataset?.usageStats?.buckets?.length && true) || false,
+                                },
+                            },
+                            {
+                                name: 'Stats',
+                                component: StatsTab,
+                                display: {
+                                    enabled: (_, _1) => true,
+                                    visible: (_, dataset: GetDatasetQuery) =>
+                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
+                                        false,
+                                },
+                            },
+                        ]}
+                        sidebarSections={[
+                            {
+                                component: SidebarAboutSection,
+                            },
+                            {
+                                component: SidebarStatsSection,
+                                display: {
+                                    visible: (_, dataset: GetDatasetQuery) =>
+                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
+                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
+                                        false,
+                                },
+                            },
+                            {
+                                component: SidebarTagsSection,
+                            },
+                            {
+                                component: SidebarOwnerSection,
+                            },
+                        ]}
+                    />
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+
+        // find the tab name
+        await waitFor(() => expect(getByText('Auto Render Aspect Custom Tab Name')).toBeInTheDocument());
+
+        // open the custom tab
+        fireEvent(
+            getByText('Auto Render Aspect Custom Tab Name'),
+            new MouseEvent('click', {
+                bubbles: true,
+                cancelable: true,
+            }),
+        );
+
+        // find the tab contents
+        await waitFor(() => expect(getByText('autoField1')).toBeInTheDocument());
+        await waitFor(() => expect(getByText('autoValue1')).toBeInTheDocument());
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/PlatformContent.test.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/PlatformContent.test.tsx
new file mode 100644
index 00000000000000..8e6d54e0629235
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/PlatformContent.test.tsx
@@ -0,0 +1,134 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { BrowserRouter } from 'react-router-dom';
+import PlatformContentView, { getParentContainerNames } from '../header/PlatformContent/PlatformContentView';
+import { EntityType } from '../../../../../../types.generated';
+import { container1, container2 } from '../../../../../../Mocks';
+
+vi.mock('../../../../../useEntityRegistry', () => ({
+    useEntityRegistry: () => ({
+        getEntityUrl: vi.fn(() => 'test'),
+        getDisplayName: vi.fn(() => 'database1'),
+    }),
+}));
+
+describe('PlatformContent', () => {
+    const defaultProps = {
+        platformName: 'mysql',
+        entityLogoComponent: <></>,
+        typeIcon: <></>,
+        entityType: EntityType.Dataset,
+        parentContainers: [],
+        parentContainersRef: React.createRef<HTMLDivElement>(),
+        areContainersTruncated: false,
+    };
+
+    it('should not render any containers if there are none in parentContainers', () => {
+        const { queryAllByTestId } = render(<PlatformContentView {...defaultProps} />);
+
+        expect(queryAllByTestId('container')).toHaveLength(0);
+        expect(queryAllByTestId('divider')).toHaveLength(0);
+    });
+
+    it('should render a direct parent container correctly when there is only one container', () => {
+        const { queryAllByTestId, getByText } = render(
+            <BrowserRouter>
+                <PlatformContentView {...defaultProps} parentContainers={[container1]} />
+            </BrowserRouter>,
+        );
+
+        expect(queryAllByTestId('container')).toHaveLength(1);
+        expect(queryAllByTestId('divider')).toHaveLength(1);
+        expect(getByText('database1')).toBeInTheDocument();
+    });
+
+    it('should render all parent containers properly', () => {
+        const { queryAllByTestId } = render(
+            <BrowserRouter>
+                <PlatformContentView {...defaultProps} parentContainers={[container1, container2]} />
+            </BrowserRouter>,
+        );
+
+        expect(queryAllByTestId('container')).toHaveLength(2);
+        expect(queryAllByTestId('divider')).toHaveLength(2);
+    });
+
+    it('should render the correct number of right arrows with no containers and an instanceId', () => {
+        render(
+            <BrowserRouter>
+                <PlatformContentView {...defaultProps} instanceId="mysql1" />
+            </BrowserRouter>,
+        );
+        expect(screen.queryAllByTestId('divider')).toHaveLength(1);
+    });
+
+    it('should render the correct number of right arrows with multiple containers and an instanceId', () => {
+        render(
+            <BrowserRouter>
+                <PlatformContentView
+                    {...defaultProps}
+                    instanceId="mysql1"
+                    parentContainers={[container1, container2]}
+                />
+            </BrowserRouter>,
+        );
+        expect(screen.queryAllByTestId('divider')).toHaveLength(3);
+    });
+
+    it('should render the correct number of right arrows with one containers and an instanceId', () => {
+        render(
+            <BrowserRouter>
+                <PlatformContentView {...defaultProps} instanceId="mysql1" parentContainers={[container2]} />
+            </BrowserRouter>,
+        );
+        expect(screen.queryAllByTestId('divider')).toHaveLength(2);
+    });
+
+    it('should render the correct number of right arrows with multiple containers and no instanceId', () => {
+        render(
+            <BrowserRouter>
+                <PlatformContentView {...defaultProps} parentContainers={[container1, container2]} />
+            </BrowserRouter>,
+        );
+        expect(screen.queryAllByTestId('divider')).toHaveLength(2);
+    });
+
+    it('should render the correct number of right arrows with one container and no instanceId', () => {
+        render(
+            <BrowserRouter>
+                <PlatformContentView {...defaultProps} parentContainers={[container1]} />
+            </BrowserRouter>,
+        );
+        expect(screen.queryAllByTestId('divider')).toHaveLength(1);
+    });
+
+    it('should render the correct number of right arrows with no containers and no instanceID', () => {
+        render(
+            <BrowserRouter>
+                <PlatformContentView {...defaultProps} parentContainers={[]} />
+            </BrowserRouter>,
+        );
+        expect(screen.queryAllByTestId('divider')).toHaveLength(0);
+    });
+});
+
+describe('getParentContainerNames', () => {
+    it('should return an empty string if there are no parent containers', () => {
+        const parentContainerNames = getParentContainerNames([]);
+        expect(parentContainerNames).toBe('');
+    });
+
+    it('should return the name of the parent container if there is only one', () => {
+        const parentContainerNames = getParentContainerNames([container1]);
+        expect(parentContainerNames).toBe(container1.properties?.name);
+    });
+
+    it('should return the names of the parents in reverse order, separated by cright arrows if there are multiple without manipulating the original array', () => {
+        const parentContainers = [container1, container2];
+        const parentContainersCopy = [...parentContainers];
+        const parentContainerNames = getParentContainerNames(parentContainers);
+
+        expect(parentContainerNames).toBe(`${container2.properties?.name} > ${container1.properties?.name}`);
+        expect(parentContainers).toMatchObject(parentContainersCopy);
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx
new file mode 100644
index 00000000000000..8faf069c68b022
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx
@@ -0,0 +1,250 @@
+import { Divider } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components/macro';
+import {
+    Container,
+    DataPlatform,
+    DisplayProperties,
+    Domain,
+    EntityType,
+    Post,
+} from '../../../../../../types.generated';
+import { EntitySubHeaderSection, GenericEntityProperties } from '../../../../../entity/shared/types';
+import ContextPath from '../../../../../previewV2/ContextPath';
+import HealthIcon from '../../../../../previewV2/HealthIcon';
+import NotesIcon from '../../../../../previewV2/NotesIcon';
+import useContentTruncation from '../../../../../shared/useContentTruncation';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { IconStyleType } from '../../../../Entity';
+import EntityMenuActions, { EntityMenuItems } from '../../../EntityDropdown/EntityMenuActions';
+import { DeprecationIcon } from '../../../components/styled/DeprecationIcon';
+import EntityActions, { EntityActionItem } from '../../../entity/EntityActions';
+import { DomainColoredIcon } from '../../../links/DomainColoredIcon';
+import { EntityBackButton } from '../sidebar/EntityBackButton';
+import EntityTitleLoadingSection from './EntityHeaderLoadingSection';
+import EntityName from './EntityName';
+import { GlossaryPreviewCardDecoration } from './GlossaryPreviewCardDecoration';
+import IconColorPicker from './IconPicker/IconColorPicker';
+import ContainerIcon from './PlatformContent/ContainerIcon';
+import PlatformHeaderIcons from './PlatformContent/PlatformHeaderIcons';
+import StructuredPropertyBadge from './StructuredPropertyBadge';
+import { getDisplayedEntityType, getEntityPlatforms } from './utils';
+
+export const TitleWrapper = styled.div`
+    display: flex;
+    justify-content: start;
+    align-items: center;
+    padding: 0px 0px 0px 0px;
+
+    .ant-typography-edit-content {
+        padding-top: 7px;
+        margin-left: 15px;
+    }
+`;
+const EntityDetailsContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 0px;
+`;
+
+const HeaderRow = styled.div`
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 8px;
+`;
+
+const TitleRow = styled(HeaderRow)`
+    font-size: 16px;
+`;
+
+export const Row = styled.div`
+    padding: 18px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+    overflow: hidden;
+`;
+
+export const LeftColumn = styled.div`
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: start;
+    flex-grow: 1;
+    flex-shrink: 1;
+`;
+
+export const RightColumn = styled.div`
+    display: flex;
+    flex-direction: column;
+    align-items: end;
+    justify-content: center;
+`;
+
+export const TopButtonsWrapper = styled.div`
+    display: flex;
+    justify-content: flex-end;
+    gap: 8px;
+    max-width: 100%;
+`;
+
+export const StyledDivider = styled(Divider)`
+    &&& {
+        margin: 0px;
+        padding: 0px;
+    }
+`;
+
+const HeaderIconsWrapper = styled.span`
+    margin-right: 8px;
+`;
+
+export type Props = {
+    urn: string;
+    entityType: EntityType;
+    entityUrl: string;
+    loading: boolean;
+    entityData: GenericEntityProperties | null;
+    refetch: () => void;
+    headerActionItems?: Set<EntityActionItem>;
+    headerDropdownItems?: Set<EntityMenuItems>;
+    subHeader?: EntitySubHeaderSection;
+    showEditName?: boolean;
+    isColorEditable?: boolean;
+    isIconEditable?: boolean;
+    displayProperties?: DisplayProperties;
+};
+
+export const DefaultEntityHeader = ({
+    urn,
+    entityType,
+    entityUrl,
+    loading,
+    entityData,
+    refetch,
+    headerDropdownItems,
+    headerActionItems, // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    subHeader,
+    showEditName,
+    isColorEditable,
+    isIconEditable,
+    displayProperties,
+}: Props) => {
+    const [showIconPicker, setShowIconPicker] = useState(false);
+    const entityRegistry = useEntityRegistry();
+
+    const { contentRef, isContentTruncated } = useContentTruncation(entityData);
+    const typeIcon =
+        entityType === EntityType.Container ? (
+            <ContainerIcon container={entityData as Container} />
+        ) : (
+            entityRegistry.getIcon(entityType, 12, IconStyleType.ACCENT)
+        );
+
+    const displayedEntityType = getDisplayedEntityType(entityData, entityRegistry, entityType);
+    const { platform, platforms } = getEntityPlatforms(entityType, entityData);
+
+    return (
+        <>
+            <Row>
+                {!loading && (entityType === EntityType.GlossaryNode || entityType === EntityType.GlossaryTerm) && (
+                    <GlossaryPreviewCardDecoration
+                        urn={urn}
+                        entityData={entityData}
+                        displayProperties={displayProperties}
+                    />
+                )}
+                <EntityBackButton />
+                <LeftColumn>
+                    {(loading && <EntityTitleLoadingSection />) || (
+                        <>
+                            <TitleWrapper>
+                                <HeaderIconsWrapper>
+                                    <PlatformHeaderIcons
+                                        platform={platform as DataPlatform}
+                                        platforms={platforms as DataPlatform[]}
+                                    />
+                                </HeaderIconsWrapper>
+                                {(isIconEditable || isColorEditable) && (
+                                    <div
+                                        style={{
+                                            cursor: 'pointer',
+                                            marginRight: 12,
+                                        }}
+                                    >
+                                        <DomainColoredIcon
+                                            onClick={() => setShowIconPicker(true)}
+                                            domain={entityData as Domain}
+                                        />
+                                    </div>
+                                )}
+                                {showIconPicker && (
+                                    <IconColorPicker
+                                        name={entityRegistry.getDisplayName(entityType, entityData)}
+                                        open={showIconPicker}
+                                        onClose={() => setShowIconPicker(false)}
+                                        color={displayProperties?.colorHex}
+                                        icon={displayProperties?.icon?.name}
+                                    />
+                                )}
+                                <EntityDetailsContainer>
+                                    <TitleRow>
+                                        <EntityName isNameEditable={showEditName} />
+                                        {!!entityData?.notes?.total && (
+                                            <NotesIcon
+                                                notes={entityData?.notes?.relationships?.map((r) => r.entity as Post)}
+                                            />
+                                        )}
+                                        {entityData?.deprecation?.deprecated && (
+                                            <DeprecationIcon
+                                                urn={urn}
+                                                deprecation={entityData?.deprecation}
+                                                showUndeprecate
+                                                refetch={refetch}
+                                                showText={false}
+                                            />
+                                        )}
+                                        {entityData?.health && (
+                                            <HealthIcon urn={urn} health={entityData.health} baseUrl={entityUrl} />
+                                        )}
+                                        <StructuredPropertyBadge
+                                            structuredProperties={entityData?.structuredProperties}
+                                        />
+                                    </TitleRow>
+                                    <HeaderRow>
+                                        <ContextPath
+                                            instanceId={entityData?.dataPlatformInstance?.instanceId}
+                                            typeIcon={typeIcon}
+                                            type={displayedEntityType}
+                                            entityType={entityType}
+                                            browsePaths={entityData?.browsePathV2}
+                                            parentEntities={
+                                                entityData?.parentContainers?.containers ||
+                                                entityData?.parentDomains?.domains ||
+                                                entityData?.parentNodes?.nodes
+                                            }
+                                            contentRef={contentRef}
+                                            isContentTruncated={isContentTruncated}
+                                        />
+                                    </HeaderRow>
+                                </EntityDetailsContainer>
+                            </TitleWrapper>
+                        </>
+                    )}
+                </LeftColumn>
+                <RightColumn>
+                    <TopButtonsWrapper>
+                        {headerActionItems && (
+                            <EntityActions urn={urn} actionItems={headerActionItems} refetchForEntity={refetch} />
+                        )}
+                        {headerDropdownItems && <EntityMenuActions menuItems={headerDropdownItems} />}
+                    </TopButtonsWrapper>
+                </RightColumn>
+            </Row>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityCount.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityCount.tsx
new file mode 100644
index 00000000000000..d48bdf4144db24
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityCount.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import { Typography } from 'antd';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../constants';
+
+export const EntityCountText = styled(Typography.Text)`
+    display: inline-block;
+    font-size: 12px;
+    line-height: 20px;
+    font-weight: 400;
+    color: ${ANTD_GRAY[7]};
+`;
+
+interface Props {
+    entityCount?: number;
+    displayAssetsText?: boolean;
+}
+
+function EntityCount(props: Props) {
+    const { entityCount, displayAssetsText } = props;
+
+    if (!entityCount || entityCount <= 0) return <EntityCountText className="entityCount">0 assets</EntityCountText>;
+
+    return (
+        <EntityCountText className="entityCount">
+            {entityCount.toLocaleString()}{' '}
+            {displayAssetsText ? (
+                <>{entityCount === 1 ? 'asset' : 'assets'}</>
+            ) : (
+                <>{entityCount === 1 ? 'entity' : 'entities'}</>
+            )}
+        </EntityCountText>
+    );
+}
+
+export default EntityCount;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeader.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeader.tsx
new file mode 100644
index 00000000000000..60ce8c859de594
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeader.tsx
@@ -0,0 +1,79 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { EntityMenuItems } from '../../../EntityDropdown/EntityMenuActions';
+import { DisplayProperties, EntityType, PlatformPrivileges } from '../../../../../../types.generated';
+import { EntityActionItem } from '../../../entity/EntityActions';
+import { useUserContext } from '../../../../../context/useUserContext';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { DefaultEntityHeader } from './DefaultEntityHeader';
+import { useEntityData, useRefetch } from '../../../../../entity/shared/EntityContext';
+import { EntitySubHeaderSection, GenericEntityProperties } from '../../../../../entity/shared/types';
+
+const Container = styled.div``;
+
+export function getCanEditName(
+    entityType: EntityType,
+    entityData: GenericEntityProperties | null,
+    privileges?: PlatformPrivileges,
+) {
+    switch (entityType) {
+        case EntityType.GlossaryTerm:
+        case EntityType.GlossaryNode:
+            return privileges?.manageGlossaries || !!entityData?.privileges?.canManageEntity;
+        case EntityType.Domain:
+            return privileges?.manageDomains;
+        case EntityType.DataProduct:
+            return true; // TODO: add permissions for data products
+        default:
+            return false;
+    }
+}
+
+type Props = {
+    headerDropdownItems?: Set<EntityMenuItems>;
+    headerActionItems?: Set<EntityActionItem>;
+    isNameEditable?: boolean;
+    isIconEditable?: boolean;
+    isColorEditable?: boolean;
+    displayProperties?: DisplayProperties;
+    subHeader?: EntitySubHeaderSection;
+};
+
+export const EntityHeader = ({
+    headerDropdownItems,
+    headerActionItems,
+    isNameEditable,
+    isIconEditable,
+    isColorEditable,
+    displayProperties,
+    subHeader,
+}: Props) => {
+    const { urn, entityType, entityData, loading } = useEntityData();
+    const refetch = useRefetch();
+    const me = useUserContext();
+    const entityRegistry = useEntityRegistry();
+
+    const entityUrl = entityRegistry.getEntityUrl(entityType, urn);
+    const showEditName =
+        isNameEditable && getCanEditName(entityType, entityData, me?.platformPrivileges as PlatformPrivileges);
+
+    return (
+        <Container data-testid="entity-header-test-id">
+            <DefaultEntityHeader
+                entityType={entityType}
+                urn={urn}
+                entityUrl={entityUrl}
+                loading={loading}
+                entityData={entityData}
+                refetch={refetch}
+                showEditName={showEditName}
+                isColorEditable={isColorEditable}
+                isIconEditable={isIconEditable}
+                displayProperties={displayProperties}
+                headerActionItems={headerActionItems}
+                headerDropdownItems={headerDropdownItems}
+                subHeader={subHeader}
+            />
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeaderLoadingSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeaderLoadingSection.tsx
new file mode 100644
index 00000000000000..419f01b77538d9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeaderLoadingSection.tsx
@@ -0,0 +1,32 @@
+import * as React from 'react';
+import { Skeleton, Space } from 'antd';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../constants';
+
+const Wrapper = styled(Space)`
+    min-height: 50px;
+    width: 100%;
+`;
+
+const NameSkeleton = styled(Skeleton.Input)`
+    && {
+        height: 20px;
+        width: 240px;
+        border-radius: 4px;
+        background-color: ${ANTD_GRAY[3]};
+        margin-right: 12px;
+    }
+`;
+
+export default function EntityTitleLoadingSection() {
+    return (
+        <Wrapper direction="horizontal">
+            <Skeleton.Avatar active />
+
+            <Space direction="vertical">
+                <NameSkeleton active />
+                <NameSkeleton active />
+            </Space>
+        </Wrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthPopover.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthPopover.tsx
new file mode 100644
index 00000000000000..7f8c592a876a20
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthPopover.tsx
@@ -0,0 +1,83 @@
+import { Divider } from 'antd';
+import { Popover } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import { Health } from '../../../../../../types.generated';
+import {
+    HealthSummaryIconType,
+    getHealthSummaryIcon,
+    getHealthSummaryMessage,
+} from '../../../../../shared/health/healthUtils';
+import { ANTD_GRAY } from '../../../constants';
+import { EntityHealthStatus } from './EntityHealthStatus';
+
+const Header = styled.span`
+    display: flex;
+    align-items: center;
+    justify-content: left;
+`;
+
+const Icon = styled.span`
+    margin-right: 8px;
+    display: flex;
+    align-items: center;
+`;
+
+const Title = styled.span`
+    font-weight: bold;
+    color: ${ANTD_GRAY[1]};
+    padding-top: 4px;
+    padding-bottom: 4px;
+    font-size: 14px;
+`;
+
+const StatusContainer = styled.div`
+    margin-bottom: 8px;
+`;
+
+const StyledDivider = styled(Divider)`
+    &&& {
+        margin: 0px;
+        padding: 0px;
+        padding-right: 8px;
+        padding-left: 8px;
+        margin-top: 8px;
+        margin-bottom: 8px;
+        border-color: ${ANTD_GRAY[5]};
+    }
+`;
+
+type Props = {
+    health: Health[];
+    baseUrl: string;
+    children: React.ReactNode;
+    fontSize?: number;
+    placement?: any;
+};
+
+export const EntityHealthPopover = ({ health, baseUrl, children, fontSize, placement = 'right' }: Props) => {
+    return (
+        <Popover
+            showArrow={false}
+            content={
+                <>
+                    <Header>
+                        <Icon>{getHealthSummaryIcon(health, HealthSummaryIconType.OUTLINED, fontSize)}</Icon>{' '}
+                        <Title>{getHealthSummaryMessage(health)}</Title>
+                    </Header>
+                    <StyledDivider />
+                    {health.map((h) => (
+                        <StatusContainer key={h.type}>
+                            <EntityHealthStatus type={h.type} message={h.message || undefined} baseUrl={baseUrl} />
+                        </StatusContainer>
+                    ))}
+                </>
+            }
+            color="#262626"
+            placement={placement}
+            zIndex={10000000}
+        >
+            {children}
+        </Popover>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthStatus.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthStatus.tsx
new file mode 100644
index 00000000000000..27c85b85163ae8
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthStatus.tsx
@@ -0,0 +1,49 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Link } from 'react-router-dom';
+import { getHealthTypeName, getHealthRedirectPath } from '../../../../../shared/health/healthUtils';
+import { HealthStatusType } from '../../../../../../types.generated';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../../../constants';
+
+const StatusContainer = styled.div`
+    display: flex;
+    justify-content: left;
+    align-items: center;
+    color: ${ANTD_GRAY[1]};
+    font-size: 14px;
+`;
+
+const Title = styled.span`
+    display: flex;
+    align-items: center;
+    font-weight: bold;
+    margin-right: 8px;
+    width: 72px;
+`;
+
+const RedirectLink = styled(Link)`
+    margin-left: 4px;
+    color: ${REDESIGN_COLORS.BLUE};
+`;
+
+type Props = {
+    type: HealthStatusType;
+    message?: string | undefined;
+    baseUrl: string;
+};
+
+export const EntityHealthStatus = ({ type, message, baseUrl }: Props) => {
+    const title = getHealthTypeName(type);
+    const redirectPath = getHealthRedirectPath(type);
+    const fullPath = `${baseUrl}/${redirectPath}`;
+    return (
+        <StatusContainer>
+            <Title>{title}</Title> {message}
+            {redirectPath && (
+                <RedirectLink to={fullPath} data-testid={`${title.toLowerCase()}-details`}>
+                    details
+                </RedirectLink>
+            )}
+        </StatusContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityName.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityName.tsx
new file mode 100644
index 00000000000000..20ae6a0dac3c4d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityName.tsx
@@ -0,0 +1,123 @@
+import { message, Typography } from 'antd';
+import React, { useState, useEffect } from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components/macro';
+import { useEmbeddedProfileLinkProps } from '@src/app/shared/useEmbeddedProfileLinkProps';
+import { useUpdateNameMutation } from '../../../../../../graphql/mutations.generated';
+import { getParentNodeToUpdate, updateGlossarySidebar } from '../../../../../glossary/utils';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { useEntityData, useRefetch } from '../../../../../entity/shared/EntityContext';
+import { useGlossaryEntityData } from '../../../GlossaryEntityContext';
+import { REDESIGN_COLORS } from '../../../constants';
+import CompactContext from '../../../../../shared/CompactContext';
+import { EntityType } from '../../../../../../types.generated';
+
+const EntityTitle = styled(Typography.Text)<{ $showEntityLink?: boolean }>`
+    font-weight: 700;
+    color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    line-height: normal;
+
+    ${(props) =>
+        props.$showEntityLink &&
+        `
+    :hover {
+        color: ${REDESIGN_COLORS.HOVER_PURPLE};
+    }
+    `}
+    &&& {
+        margin-bottom: 0;
+        word-break: break-word;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+
+    .ant-typography-edit {
+        font-size: 12px;
+        margin-left: 2px;
+
+        & svg {
+            fill: #533fd1;
+        }
+    }
+`;
+
+interface Props {
+    isNameEditable?: boolean;
+}
+
+function EntityName(props: Props) {
+    const { isNameEditable } = props;
+    const refetch = useRefetch();
+    const entityRegistry = useEntityRegistry();
+    const { isInGlossaryContext, urnsToUpdate, setUrnsToUpdate } = useGlossaryEntityData();
+    const { urn, entityType, entityData } = useEntityData();
+    const entityName = entityData ? entityRegistry.getDisplayName(entityType, entityData) : '';
+    const [updatedName, setUpdatedName] = useState(entityName);
+    const [isEditing, setIsEditing] = useState(false);
+
+    const isCompact = React.useContext(CompactContext);
+    const showEntityLink = isCompact && entityType !== EntityType.Query;
+
+    useEffect(() => {
+        setUpdatedName(entityName);
+    }, [entityName]);
+
+    const [updateName, { loading: isMutatingName }] = useUpdateNameMutation();
+
+    const handleStartEditing = () => {
+        setIsEditing(true);
+    };
+
+    const handleChangeName = (name: string) => {
+        if (name === entityName) {
+            setIsEditing(false);
+            return;
+        }
+        setUpdatedName(name);
+        updateName({ variables: { input: { name, urn } } })
+            .then(() => {
+                setIsEditing(false);
+                message.success({ content: 'Name Updated', duration: 2 });
+                refetch();
+                if (isInGlossaryContext) {
+                    const parentNodeToUpdate = getParentNodeToUpdate(entityData, entityType);
+                    updateGlossarySidebar([parentNodeToUpdate], urnsToUpdate, setUrnsToUpdate);
+                }
+            })
+            .catch((e: unknown) => {
+                message.destroy();
+                if (e instanceof Error) {
+                    message.error({ content: `Failed to update name: \n ${e.message || ''}`, duration: 3 });
+                }
+            });
+    };
+
+    const Title = isNameEditable ? (
+        <EntityTitle
+            disabled={isMutatingName}
+            editable={{
+                editing: isEditing,
+                onChange: handleChangeName,
+                onStart: handleStartEditing,
+            }}
+            $showEntityLink={showEntityLink}
+        >
+            {updatedName}
+        </EntityTitle>
+    ) : (
+        <EntityTitle $showEntityLink={showEntityLink}>{entityName}</EntityTitle>
+    );
+
+    // have entity link open new tab if in the chrome extension
+    const linkProps = useEmbeddedProfileLinkProps();
+
+    return showEntityLink ? (
+        <Link to={`${entityRegistry.getEntityUrl(entityType, urn)}/`} {...linkProps}>
+            {Title}
+        </Link>
+    ) : (
+        Title
+    );
+}
+
+export default EntityName;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityPlatformLoadingSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityPlatformLoadingSection.tsx
new file mode 100644
index 00000000000000..1bd176e0e2c9de
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityPlatformLoadingSection.tsx
@@ -0,0 +1,20 @@
+import * as React from 'react';
+import { Skeleton, Space } from 'antd';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../constants';
+
+const ContextSkeleton = styled(Skeleton.Input)`
+    && {
+        width: 320px;
+        border-radius: 4px;
+        background-color: ${ANTD_GRAY[3]};
+    }
+`;
+
+export default function EntityPlatformLoadingSection() {
+    return (
+        <Space direction="vertical">
+            <ContextSkeleton active size="small" />
+        </Space>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityTabs.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityTabs.tsx
new file mode 100644
index 00000000000000..19f4678e1c4fe0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityTabs.tsx
@@ -0,0 +1,127 @@
+import { Tabs } from 'antd';
+import React, { useEffect } from 'react';
+import styled from 'styled-components/macro';
+
+import { useBaseEntity, useEntityData, useRouteToTab } from '../../../../../entity/shared/EntityContext';
+import { EntityTab } from '../../../types';
+
+type Props = {
+    tabs: EntityTab[];
+    selectedTab?: EntityTab;
+};
+
+const Header = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const UnborderedTabs = styled(Tabs)`
+    width: 100%;
+    padding: 12px 14px 10px 12px;
+
+    &&& .ant-tabs-nav {
+        margin-bottom: 0;
+
+        &::before {
+            border-bottom: none;
+        }
+    }
+
+    &&& .ant-tabs-nav-wrap {
+        background-color: #f6f7fa;
+        border-radius: 4px;
+        gap: 3px;
+        padding: 2px;
+    }
+
+    &&& .ant-tabs-tab {
+        padding: 10px 16px;
+        margin: 0;
+        border-radius: 4px;
+        font-size: 14px;
+        font-weight: 400;
+    }
+
+    &&& .ant-tabs-tab-active {
+        background-color: #5c3fd1;
+    }
+
+    &&& .ant-tabs-tab-active .ant-tabs-tab-btn {
+        color: #ffffff;
+
+        &:hover {
+            color: #ffffff;
+        }
+    }
+
+    &&& .ant-tabs-ink-bar {
+        height: 0px;
+    }
+
+    &&& .ant-tabs-content-holder {
+        display: none;
+    }
+
+    background-color: #ffffff;
+`;
+
+const Tab = styled(Tabs.TabPane)`
+    font-size: 10px;
+    line-height: normal;
+    font-weight: 400;
+`;
+
+const tabIconStyle = { fontSize: 14, marginRight: 6 };
+
+export const EntityTabs = <T,>({ tabs, selectedTab }: Props) => {
+    const { entityData, loading } = useEntityData();
+    const routeToTab = useRouteToTab();
+    const baseEntity = useBaseEntity<T>();
+
+    const enabledTabs = tabs.filter((tab) => tab.display?.enabled(entityData, baseEntity));
+
+    useEffect(() => {
+        if (!loading && !selectedTab && enabledTabs[0]) {
+            routeToTab({ tabName: enabledTabs[0].name, method: 'replace' });
+        }
+    }, [loading, enabledTabs, selectedTab, routeToTab]);
+
+    return (
+        <UnborderedTabs
+            animated={false}
+            activeKey={selectedTab?.name || ''}
+            size="large"
+            onTabClick={(tab: string) => routeToTab({ tabName: tab })}
+        >
+            {tabs.map((tab) => {
+                const TabIcon = tab.icon;
+                const tabName = (tab.getDynamicName && tab.getDynamicName(entityData, baseEntity, loading)) || tab.name;
+                if (!tab.display?.enabled(entityData, baseEntity)) {
+                    return (
+                        <Tab
+                            tab={
+                                <span data-testid={`${tab.name}-entity-tab-header`}>
+                                    {TabIcon && <TabIcon style={tabIconStyle} />}
+                                    {tab.name}
+                                </span>
+                            }
+                            key={tab.name}
+                            disabled
+                        />
+                    );
+                }
+                return (
+                    <Tab
+                        tab={
+                            <Header data-testid={`${tab.name}-entity-tab-header`}>
+                                {TabIcon && <TabIcon style={tabIconStyle} />}
+                                {tabName}
+                            </Header>
+                        }
+                        key={tab.name}
+                    />
+                );
+            })}
+        </UnborderedTabs>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration.tsx
new file mode 100644
index 00000000000000..f9c959b2cde73f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { DisplayProperties } from '../../../../../../types.generated';
+import { generateColorFromPalette } from '../../../../../glossaryV2/colorUtils';
+import { GenericEntityProperties } from '../../../../../entity/shared/types';
+
+type Props = {
+    urn: string;
+    entityData: GenericEntityProperties | null;
+    displayProperties?: DisplayProperties;
+};
+
+interface GlossaryItemRibbonProps {
+    color: string;
+}
+
+export const GLOSSARY_RIBBON_SIZE = 8;
+
+const GlossaryItemRibbon = styled.span<GlossaryItemRibbonProps>`
+    position: absolute;
+    left: -20px;
+    top: 4px;
+    width: 80px;
+    transform: rotate(-45deg);
+    padding: ${GLOSSARY_RIBBON_SIZE}px;
+    opacity: 1;
+    background-color: ${(props) => `${props.color}`};
+`;
+
+export const GlossaryPreviewCardDecoration = ({ urn, entityData, displayProperties }: Props) => {
+    const parentNodeCount = entityData?.parentNodes?.count || 0;
+    const urnText = parentNodeCount === 0 ? urn : entityData?.parentNodes?.nodes[parentNodeCount - 1].urn || '';
+    const glossaryColor = displayProperties?.colorHex || generateColorFromPalette(urnText);
+
+    return <GlossaryItemRibbon color={glossaryColor} />;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/IconPicker/IconColorPicker.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/IconPicker/IconColorPicker.tsx
new file mode 100644
index 00000000000000..714e54439e5fbc
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/IconPicker/IconColorPicker.tsx
@@ -0,0 +1,138 @@
+import { Input, Modal } from 'antd';
+import { debounce } from 'lodash';
+import React from 'react';
+import styled from 'styled-components';
+
+import { useUpdateDisplayPropertiesMutation } from '../../../../../../../graphql/mutations.generated';
+import { IconLibrary } from '../../../../../../../types.generated';
+import { useEntityData, useRefetch } from '../../../../../../entity/shared/EntityContext';
+import { ChatIconPicker } from './IconPicker';
+
+type IconColorPickerProps = {
+    name: string;
+    open: boolean;
+    onClose: () => void;
+    color?: string | null;
+    icon?: string | null;
+    onChangeColor?: (color: string) => void;
+    onChangeIcon?: (icon: string) => void;
+};
+
+function capitalize(string) {
+    if (string.length === 0) return '';
+
+    return string[0].toUpperCase() + string.slice(1);
+}
+function snakeToCamel(string) {
+    const [start, ...rest] = string.split('_');
+
+    return start + rest.map(capitalize).join('');
+}
+
+const Title = styled.span`
+    font-size: 16px;
+    font-weight: 600;
+    position: relative;
+    bottom: 6px;
+    left: 6px;
+`;
+
+const IconColorPicker: React.FC<IconColorPickerProps> = ({
+    name,
+    open,
+    onClose,
+    color,
+    icon,
+    onChangeColor,
+    onChangeIcon,
+}) => {
+    const refetch = useRefetch();
+    const { urn } = useEntityData();
+    const [updateDisplayProperties] = useUpdateDisplayPropertiesMutation();
+
+    const [stagedColor, setStagedColor] = React.useState<string>(color || '#000000');
+    const [stagedIcon, setStagedIcon] = React.useState<string>(icon || 'account_circle');
+
+    // a debounced version of updateDisplayProperties that takes in the same arguments
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    const debouncedUpdateDisplayProperties = React.useCallback(
+        debounce((...args) => updateDisplayProperties(...args).then(() => setTimeout(() => refetch(), 1000)), 500),
+        [],
+    );
+
+    return (
+        <Modal
+            open={open}
+            onCancel={() => onClose()}
+            onOk={() => {
+                updateDisplayProperties({
+                    variables: {
+                        urn,
+                        input: {
+                            colorHex: stagedColor,
+                            icon: {
+                                iconLibrary: IconLibrary.Material,
+                                name: capitalize(snakeToCamel(stagedIcon)),
+                                style: 'Outlined',
+                            },
+                        },
+                    },
+                });
+                onChangeColor?.(stagedColor);
+                onChangeIcon?.(stagedIcon);
+                onClose();
+            }}
+        >
+            <Input
+                type="color"
+                size="large"
+                value={stagedColor}
+                style={{
+                    padding: 2,
+                    width: 37,
+                    marginBottom: 30,
+                    marginTop: 15,
+                }}
+                onChange={(e) => {
+                    setStagedColor(e.target.value);
+                    debouncedUpdateDisplayProperties?.({
+                        variables: {
+                            urn,
+                            input: {
+                                colorHex: e.target.value,
+                                icon: {
+                                    iconLibrary: IconLibrary.Material,
+                                    name: stagedIcon,
+                                    style: 'Outlined',
+                                },
+                            },
+                        },
+                    });
+                }}
+            />
+            <Title>Choose an icon for {name || 'Domain'}</Title>
+            <ChatIconPicker
+                color={stagedColor}
+                onIconPick={(i) => {
+                    console.log('picking icon', i);
+                    debouncedUpdateDisplayProperties?.({
+                        variables: {
+                            urn,
+                            input: {
+                                colorHex: stagedColor,
+                                icon: {
+                                    iconLibrary: IconLibrary.Material,
+                                    name: capitalize(snakeToCamel(i)),
+                                    style: 'Outlined',
+                                },
+                            },
+                        },
+                    });
+                    setStagedIcon(i);
+                }}
+            />
+        </Modal>
+    );
+};
+
+export default IconColorPicker;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/IconPicker/IconPicker.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/IconPicker/IconPicker.tsx
new file mode 100644
index 00000000000000..b88b38a5fa9d52
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/IconPicker/IconPicker.tsx
@@ -0,0 +1,115 @@
+import * as Icons from '@mui/icons-material';
+import { Input } from 'antd';
+import React, { useEffect, useState } from 'react';
+import { FixedSizeGrid as Grid } from 'react-window';
+import styled from 'styled-components';
+
+const columnCount = 5; // Number of columns in the grid
+
+type Props = {
+    onIconPick: (icon: string) => void;
+    color?: string | null;
+};
+
+const CellContainer = styled.div<{ color?: string; selected?: boolean }>`
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: ${({ color }) => color || 'black'};
+    border: ${({ selected }) => (selected ? '2px solid blue' : '1px solid lightgray')};
+`;
+
+const Cell = ({
+    columnIndex,
+    rowIndex,
+    style,
+    data,
+}: {
+    columnIndex: number;
+    rowIndex: number;
+    style: any;
+    data: any;
+}) => {
+    const { icons, onIconPick, selectedIcon, setSelectedIcon, color } = data;
+    const index = rowIndex * columnCount + columnIndex;
+    const iconName = icons[index];
+    const Icon = Icons[iconName];
+
+    if (!Icon) return <div style={style} />;
+
+    return (
+        <CellContainer
+            color={color}
+            selected={selectedIcon === iconName}
+            style={{
+                ...style,
+            }}
+            role="button"
+            tabIndex={0}
+            onKeyDown={(e) => {
+                if (e.key === 'Enter') {
+                    onIconPick(iconName);
+                    setSelectedIcon(iconName);
+                }
+            }}
+            onClick={() => {
+                onIconPick(iconName);
+                setSelectedIcon(iconName);
+            }}
+        >
+            <Icon />
+        </CellContainer>
+    );
+};
+
+const GridContainer = styled.div`
+    height: 400px;
+    width: 100%;
+    margin-top: 15px;
+    border: 1px solid lightgray;
+`;
+
+export const ChatIconPicker = ({ onIconPick, color }: Props) => {
+    const [searchTerm, setSearchTerm] = useState('');
+    const [selectedIcon, setSelectedIcon] = useState<string>('');
+    const [filteredIcons, setFilteredIcons] = useState<string[]>([]);
+
+    useEffect(() => {
+        const filtered = Object.keys(Icons).filter((iconName) =>
+            iconName.toLowerCase().includes(searchTerm.toLowerCase()),
+        );
+        setFilteredIcons(filtered);
+    }, [searchTerm]);
+
+    const cellData = {
+        icons: filteredIcons,
+        onIconPick,
+        selectedIcon,
+        setSelectedIcon,
+        color,
+    };
+
+    return (
+        <div>
+            <Input
+                type="text"
+                value={searchTerm}
+                onChange={(e) => setSearchTerm(e.target.value)}
+                placeholder="Search icons..."
+            />
+            <GridContainer>
+                <Grid
+                    columnCount={columnCount}
+                    columnWidth={91} // Adjust the width as needed
+                    height={400}
+                    rowCount={Math.ceil(filteredIcons.length / columnCount)}
+                    rowHeight={70} // Adjust the height as needed
+                    itemData={cellData}
+                    width={470}
+                >
+                    {Cell}
+                </Grid>
+            </GridContainer>
+        </div>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerIcon.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerIcon.tsx
new file mode 100644
index 00000000000000..0a8a11949c5221
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerIcon.tsx
@@ -0,0 +1,33 @@
+import { FolderOpenOutlined } from '@ant-design/icons';
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import { Maybe } from 'graphql/jsutils/Maybe';
+import React from 'react';
+import styled from 'styled-components';
+import { Container } from '@types';
+import { getSubTypeIcon, TYPE_ICON_CLASS_NAME } from '../../../../components/subtypes';
+
+const IconWrapper = styled.span`
+    line-height: 0;
+    .${TYPE_ICON_CLASS_NAME} {
+        font-size: 14px;
+    }
+`;
+
+const DefaultIcon = styled(FolderOpenOutlined)``;
+
+interface Props {
+    container: Maybe<Container | GenericEntityProperties>;
+}
+
+export default function ContainerIcon({ container }: Props): JSX.Element {
+    return (
+        <IconWrapper>
+            <ContainerIconBase container={container} />
+        </IconWrapper>
+    );
+}
+
+export function ContainerIconBase({ container }: Props): JSX.Element {
+    const subtype = container?.subTypes?.typeNames?.[0].toLowerCase();
+    return (subtype && getSubTypeIcon(subtype)) || <DefaultIcon />;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerLink.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerLink.tsx
new file mode 100644
index 00000000000000..0d8aff80ca7342
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerLink.tsx
@@ -0,0 +1,49 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Link } from 'react-router-dom';
+import { Maybe } from 'graphql/jsutils/Maybe';
+import { Container, EntityType } from '../../../../../../../types.generated';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+import ContainerIcon from './ContainerIcon';
+import { ANTD_GRAY } from '../../../../constants';
+import { useEmbeddedProfileLinkProps } from '../../../../../../shared/useEmbeddedProfileLinkProps';
+
+const ContainerText = styled.span`
+    font-size: 14px;
+    line-height: 20px;
+    margin-left: 6px;
+`;
+
+const StyledLink = styled(Link)`
+    white-space: nowrap;
+    :hover {
+        background-color: ${ANTD_GRAY[3]};
+    }
+    border-radius: 4px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+`;
+
+interface Props {
+    container: Maybe<Container>;
+}
+
+function ContainerLink(props: Props) {
+    const { container } = props;
+    const entityRegistry = useEntityRegistry();
+    const linkProps = useEmbeddedProfileLinkProps();
+
+    if (!container) return null;
+
+    const containerUrl = entityRegistry.getEntityUrl(EntityType.Container, container.urn);
+    const containerName = entityRegistry.getDisplayName(EntityType.Container, container);
+
+    return (
+        <StyledLink to={containerUrl} data-testid="container" {...linkProps}>
+            <ContainerIcon container={props.container} />
+            <ContainerText>{containerName}</ContainerText>
+        </StyledLink>
+    );
+}
+
+export default ContainerLink;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx
new file mode 100644
index 00000000000000..e4656cf31a7b7f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx
@@ -0,0 +1,96 @@
+import { FolderOutlined, RightOutlined } from '@ant-design/icons';
+import { Typography } from 'antd';
+import { Tooltip } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import { EntityType, GlossaryNode } from '../../../../../../../types.generated';
+import useContentTruncation from '../../../../../../shared/useContentTruncation';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+import { ANTD_GRAY } from '../../../../constants';
+
+export const StyledRightOutlined = styled(RightOutlined)`
+    color: ${ANTD_GRAY[7]};
+    font-size: 8px;
+    margin: 0 4px;
+`;
+
+// must display content in reverse to have ellipses at the beginning of content
+export const ParentNodesWrapper = styled.div`
+    align-items: center;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    flex-direction: row-reverse;
+    display: flex;
+    max-width: 460px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+`;
+
+export const Ellipsis = styled.span`
+    color: ${ANTD_GRAY[7]};
+    margin-right: 2px;
+`;
+
+export const StyledTooltip = styled(Tooltip)<{ maxWidth?: number }>`
+    display: flex;
+    white-space: nowrap;
+    overflow: hidden;
+    ${(props) => (props.maxWidth ? `max-width: ${props.maxWidth}px;` : '')}
+`;
+
+const GlossaryNodeText = styled(Typography.Text)<{ color: string }>`
+    font-size: 12px;
+    line-height: 20px;
+    color: ${(props) => props.color};
+`;
+
+const GlossaryNodeIcon = styled(FolderOutlined)<{ color: string }>`
+    color: ${(props) => props.color};
+
+    &&& {
+        font-size: 12px;
+        margin-right: 4px;
+    }
+`;
+
+interface Props {
+    parentNodes?: GlossaryNode[] | null;
+}
+
+export default function ParentNodesView({ parentNodes }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const { contentRef, isContentTruncated } = useContentTruncation(parentNodes);
+
+    return (
+        <StyledTooltip
+            title={
+                <>
+                    {[...(parentNodes || [])]?.reverse()?.map((parentNode, idx) => (
+                        <>
+                            <GlossaryNodeIcon color="white" />
+                            <GlossaryNodeText color="white">
+                                {entityRegistry.getDisplayName(EntityType.GlossaryNode, parentNode)}
+                            </GlossaryNodeText>
+                            {idx + 1 !== parentNodes?.length && <StyledRightOutlined data-testid="right-arrow" />}
+                        </>
+                    ))}
+                </>
+            }
+            overlayStyle={isContentTruncated ? {} : { display: 'none' }}
+            maxWidth={580}
+        >
+            {isContentTruncated && <Ellipsis>...</Ellipsis>}
+            <ParentNodesWrapper ref={contentRef}>
+                {[...(parentNodes || [])]?.map((parentNode, idx) => (
+                    <>
+                        <GlossaryNodeText color={ANTD_GRAY[7]}>
+                            {entityRegistry.getDisplayName(EntityType.GlossaryNode, parentNode)}
+                        </GlossaryNodeText>
+                        <GlossaryNodeIcon color={ANTD_GRAY[7]} />
+                        {idx + 1 !== parentNodes?.length && <StyledRightOutlined data-testid="right-arrow" />}
+                    </>
+                ))}
+            </ParentNodesWrapper>
+        </StyledTooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesViewForSearchRedesign.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesViewForSearchRedesign.tsx
new file mode 100644
index 00000000000000..50b3d2ab955681
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesViewForSearchRedesign.tsx
@@ -0,0 +1,96 @@
+import { FolderOutlined, RightOutlined } from '@ant-design/icons';
+import { Typography } from 'antd';
+import { Tooltip } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import { EntityType, GlossaryNode } from '../../../../../../../types.generated';
+import useContentTruncation from '../../../../../../shared/useContentTruncation';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+import { ANTD_GRAY } from '../../../../constants';
+
+export const StyledRightOutlined = styled(RightOutlined)`
+    color: ${ANTD_GRAY[7]};
+    font-size: 8px;
+    margin: 0 4px;
+`;
+
+// must display content in reverse to have ellipses at the beginning of content
+export const ParentNodesWrapper = styled.div`
+    align-items: center;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    flex-direction: row-reverse;
+    display: flex;
+`;
+
+export const Ellipsis = styled.span`
+    color: ${ANTD_GRAY[7]};
+    margin-right: 2px;
+`;
+
+export const StyledTooltip = styled(Tooltip)`
+    display: flex;
+    white-space: nowrap;
+    overflow: hidden;
+`;
+
+const GlossaryNodeText = styled(Typography.Text)<{ color: string }>`
+    color: #56668e;
+
+    font-family: Mulish;
+    font-size: 10px;
+    font-style: normal;
+    font-weight: 500;
+    line-height: normal;
+`;
+
+const GlossaryNodeIcon = styled(FolderOutlined)<{ color: string }>`
+    color: ${(props) => props.color};
+
+    &&& {
+        font-size: 12px;
+        margin-right: 4px;
+    }
+`;
+
+interface Props {
+    parentNodes?: GlossaryNode[] | null;
+}
+
+export default function ParentNodesView({ parentNodes }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const { contentRef, isContentTruncated } = useContentTruncation(parentNodes);
+
+    return (
+        <StyledTooltip
+            title={
+                <>
+                    {[...(parentNodes || [])]?.reverse()?.map((parentNode, idx) => (
+                        <>
+                            <GlossaryNodeIcon color="white" />
+                            <GlossaryNodeText color="white">
+                                {entityRegistry.getDisplayName(EntityType.GlossaryNode, parentNode)}
+                            </GlossaryNodeText>
+                            {idx + 1 !== parentNodes?.length && <StyledRightOutlined data-testid="right-arrow" />}
+                        </>
+                    ))}
+                </>
+            }
+            overlayStyle={isContentTruncated ? {} : { display: 'none' }}
+        >
+            {isContentTruncated && <Ellipsis>...</Ellipsis>}
+            <ParentNodesWrapper ref={contentRef}>
+                {[...(parentNodes || [])]?.map((parentNode, idx) => (
+                    <>
+                        hihihihi
+                        <GlossaryNodeText color={ANTD_GRAY[7]}>
+                            {entityRegistry.getDisplayName(EntityType.GlossaryNode, parentNode)}
+                        </GlossaryNodeText>
+                        <GlossaryNodeIcon color={ANTD_GRAY[7]} />
+                        {idx + 1 !== parentNodes?.length && <StyledRightOutlined data-testid="right-arrow" />}
+                    </>
+                ))}
+            </ParentNodesWrapper>
+        </StyledTooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentContainer.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentContainer.tsx
new file mode 100644
index 00000000000000..815441c458c3b2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentContainer.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+import { Container, EntityType } from '../../../../../../../types.generated';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+import { IconStyleType } from '../../../../../Entity';
+import { useEntityData } from '../../../../../../entity/shared/EntityContext';
+import { capitalizeFirstLetterOnly } from '../../../../../../shared/textUtil';
+import { getPlatformName } from '../../../../utils';
+import ContainerIcon from './ContainerIcon';
+import PlatformContentView from './PlatformContentView';
+import useContentTruncation from '../../../../../../shared/useContentTruncation';
+import { getDisplayedEntityType } from '../utils';
+
+function PlatformContentContainer() {
+    const { entityType, entityData } = useEntityData();
+    const entityRegistry = useEntityRegistry();
+    const platformName = getPlatformName(entityData);
+    const platformLogoUrl = entityData?.platform?.properties?.logoUrl;
+    const entityLogoComponent = entityRegistry.getIcon(entityType, 12, IconStyleType.ACCENT);
+    const typeIcon =
+        entityType === EntityType.Container ? (
+            <ContainerIcon container={entityData as Container} />
+        ) : (
+            entityRegistry.getIcon(entityType, 12, IconStyleType.ACCENT)
+        );
+    const displayedEntityType = getDisplayedEntityType(entityData, entityRegistry, entityType);
+    const instanceId = entityData?.dataPlatformInstance?.instanceId;
+
+    const { contentRef, isContentTruncated } = useContentTruncation(entityData);
+
+    return (
+        <PlatformContentView
+            platformName={platformName}
+            platformLogoUrl={platformLogoUrl}
+            platformNames={entityData?.siblingPlatforms?.map(
+                (platform) => platform.properties?.displayName || capitalizeFirstLetterOnly(platform.name),
+            )}
+            platformLogoUrls={entityData?.siblingPlatforms?.map((platform) => platform.properties?.logoUrl)}
+            entityLogoComponent={entityLogoComponent}
+            instanceId={instanceId}
+            typeIcon={typeIcon}
+            entityType={displayedEntityType}
+            parentContainers={entityData?.parentContainers?.containers}
+            parentContainersRef={contentRef}
+            areContainersTruncated={isContentTruncated}
+            parentEntities={entityData?.parentDomains?.domains}
+        />
+    );
+}
+
+export default PlatformContentContainer;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx
new file mode 100644
index 00000000000000..38d4b7016c622f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx
@@ -0,0 +1,157 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography, Image } from 'antd';
+import { useIsShowSeparateSiblingsEnabled } from '@src/app/useAppConfig';
+import { Maybe } from 'graphql/jsutils/Maybe';
+import { Container, Entity } from '../../../../../../../types.generated';
+import ContainerLink from './ContainerLink';
+import { ParentNodesWrapper as ParentContainersWrapper, Ellipsis, StyledTooltip } from './ParentNodesView';
+import ParentEntities from '../../../../../../search/filters/ParentEntities';
+
+const LogoIcon = styled.span`
+    display: flex;
+    gap: 4px;
+    margin-right: 4px;
+`;
+
+const PreviewImage = styled(Image)`
+    max-height: 17px;
+    width: auto;
+    object-fit: contain;
+    background-color: transparent;
+`;
+
+const PlatformContentWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    margin: 0px 8px 0px 0;
+    flex-wrap: nowrap;
+    flex: 1;
+`;
+
+const PlatformText = styled(Typography.Text)`
+    font-size: 10px;
+    font-weight: 400;
+    color: #6c6b88;
+    text-transform: capitalize;
+    white-space: nowrap;
+`;
+
+const PlatformDivider = styled.div`
+    display: inline-block;
+    margin: 0 10px;
+    border-left: 1px solid #d5d5d5;
+    height: 16px;
+    vertical-align: text-top;
+`;
+
+export function getParentContainerNames(containers?: Maybe<Container>[] | null) {
+    let parentNames = '';
+    if (containers) {
+        [...containers].reverse().forEach((container, index) => {
+            if (container?.properties) {
+                if (index !== 0) {
+                    parentNames += ' > ';
+                }
+                parentNames += container.properties.name;
+            }
+        });
+    }
+    return parentNames;
+}
+
+interface Props {
+    platformName?: string;
+    platformLogoUrl?: Maybe<string>;
+    platformNames?: Maybe<string>[];
+    platformLogoUrls?: Maybe<string>[];
+    entityLogoComponent?: JSX.Element;
+    instanceId?: string;
+    typeIcon?: JSX.Element;
+    entityType?: string;
+    parentContainers?: Maybe<Container>[] | null;
+    parentEntities?: Entity[] | null;
+    parentContainersRef: React.RefObject<HTMLDivElement>;
+    areContainersTruncated: boolean;
+}
+
+function PlatformContentView(props: Props) {
+    const {
+        parentEntities,
+        platformName,
+        platformLogoUrl,
+        platformNames,
+        platformLogoUrls,
+        entityLogoComponent,
+        instanceId,
+        typeIcon,
+        entityType,
+        parentContainers,
+        parentContainersRef,
+        areContainersTruncated,
+    } = props;
+
+    const directParentContainer = parentContainers && parentContainers[0];
+    const remainingParentContainers = parentContainers && parentContainers.slice(1, parentContainers.length);
+
+    const shouldShowSeparateSiblings = useIsShowSeparateSiblingsEnabled();
+    const showSiblingPlatformLogos = !shouldShowSeparateSiblings && !!platformLogoUrls;
+    const showSiblingPlatformNames = !shouldShowSeparateSiblings && !!platformNames;
+
+    return (
+        <PlatformContentWrapper>
+            {platformName && (
+                <>
+                    <LogoIcon>
+                        {!platformLogoUrl && !platformLogoUrls && entityLogoComponent}
+                        {!!platformLogoUrl && !showSiblingPlatformLogos && (
+                            <PreviewImage preview={false} src={platformLogoUrl} alt={platformName} />
+                        )}
+                        {!!showSiblingPlatformLogos &&
+                            platformLogoUrls.slice(0, 2).map((platformLogoUrlsEntry) => (
+                                <>
+                                    <PreviewImage
+                                        preview={false}
+                                        src={platformLogoUrlsEntry || ''}
+                                        alt={platformName}
+                                    />
+                                </>
+                            ))}
+                    </LogoIcon>
+                    <PlatformText>
+                        <span>{showSiblingPlatformNames ? platformNames.join(' & ') : platformName}</span>
+                    </PlatformText>
+                    <PlatformDivider data-testid="platform-divider" />
+                </>
+            )}
+            {instanceId && (
+                <PlatformText>
+                    {instanceId}
+                    <PlatformDivider data-testid="divider" />
+                </PlatformText>
+            )}
+            {typeIcon && <LogoIcon>{typeIcon}</LogoIcon>}
+            <PlatformText>{entityType}</PlatformText>
+            {(!!parentContainers?.length || !!parentEntities?.length) && <PlatformDivider data-testid="divider" />}
+            <StyledTooltip
+                title={getParentContainerNames(parentContainers)}
+                overlayStyle={areContainersTruncated ? {} : { display: 'none' }}
+            >
+                {areContainersTruncated && <Ellipsis>...</Ellipsis>}
+                <ParentContainersWrapper ref={parentContainersRef}>
+                    {remainingParentContainers &&
+                        remainingParentContainers.map((container) => (
+                            <span key={container?.urn}>
+                                <ContainerLink container={container} />
+                                <PlatformDivider data-testid="divider" />
+                            </span>
+                        ))}
+                </ParentContainersWrapper>
+                {directParentContainer && <ContainerLink container={directParentContainer} />}
+            </StyledTooltip>
+            <ParentEntities parentEntities={parentEntities || []} numVisible={3} />
+        </PlatformContentWrapper>
+    );
+}
+
+export default PlatformContentView;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformHeaderIcons.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformHeaderIcons.tsx
new file mode 100644
index 00000000000000..c041e8f37cd875
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformHeaderIcons.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import styled, { CSSObject } from 'styled-components';
+import { DataPlatform } from '../../../../../../../types.generated';
+import StackPlatformImages from './StackPlatformImages';
+import PlatformIcon from '../../../../../../sharedV2/icons/PlatformIcon';
+
+const LogoIcon = styled.span`
+    display: flex;
+    gap: 4px;
+    margin-right: 4px;
+`;
+
+const PlatformContentWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    flex-wrap: nowrap;
+`;
+
+const iconStyles = {
+    borderRadius: '16px',
+    border: '1px solid #FFF',
+    padding: '10px',
+};
+
+interface Props {
+    platform?: DataPlatform;
+    platforms?: DataPlatform[];
+    size?: number;
+    styles?: CSSObject;
+}
+
+function PlatformHeaderIcons(props: Props) {
+    const { platform, platforms, size = 28, styles } = props;
+
+    return (
+        <PlatformContentWrapper>
+            {platform && (
+                <LogoIcon>
+                    {!platforms && (
+                        <PlatformIcon
+                            platform={platform}
+                            size={size}
+                            styles={styles ? { ...iconStyles, ...styles } : iconStyles}
+                        />
+                    )}
+                    {!!platforms && <StackPlatformImages platforms={platforms} size={size} styles={styles} />}
+                </LogoIcon>
+            )}
+        </PlatformContentWrapper>
+    );
+}
+
+export default PlatformHeaderIcons;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/StackPlatformImages.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/StackPlatformImages.tsx
new file mode 100644
index 00000000000000..eff1f8c0f19cd4
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/StackPlatformImages.tsx
@@ -0,0 +1,76 @@
+import React from 'react';
+import styled, { CSSObject } from 'styled-components';
+import PlatformIcon from '../../../../../../sharedV2/icons/PlatformIcon';
+import { DataPlatform } from '../../../../../../../types.generated';
+
+const Container = styled.div`
+    display: flex;
+    align-items: center;
+    position: relative;
+`;
+
+const secondIconStyles = (isSmall: boolean) => ({
+    marginLeft: isSmall ? '-10px' : '-16px',
+    zIndex: 0,
+    borderRadius: isSmall ? '8px' : '16px',
+    border: '1px solid #FFF',
+    padding: isSmall ? '4px' : '10px',
+});
+
+const firstIconStyles = (isSmall: boolean) => ({
+    zIndex: 1,
+    borderRadius: isSmall ? '8px' : '16px',
+    border: '1px solid #FFF',
+    padding: isSmall ? '4px' : '10px',
+});
+
+const SMALL_ICON_SIZE = 20;
+
+interface Props {
+    platforms: DataPlatform[];
+    size?: number;
+    styles?: CSSObject | undefined;
+}
+
+const StackImages = ({ platforms, size = 28, styles }: Props) => {
+    const uniquePlatforms = platforms.reduce<DataPlatform[]>((acc, current) => {
+        if (!acc.find((platform) => platform.urn === current.urn)) {
+            acc.push(current);
+        }
+        return acc;
+    }, []);
+
+    const areIconsSmall = size < SMALL_ICON_SIZE;
+
+    return (
+        <Container>
+            {uniquePlatforms.slice(0, 2).map((platform, index) => (
+                <>
+                    {index === 1 ? (
+                        <PlatformIcon
+                            platform={platform}
+                            size={size}
+                            styles={
+                                styles
+                                    ? { ...secondIconStyles(areIconsSmall), ...styles }
+                                    : secondIconStyles(areIconsSmall)
+                            }
+                        />
+                    ) : (
+                        <PlatformIcon
+                            platform={platform}
+                            size={size}
+                            styles={
+                                styles
+                                    ? { ...firstIconStyles(areIconsSmall), ...styles }
+                                    : firstIconStyles(areIconsSmall)
+                            }
+                        />
+                    )}
+                </>
+            ))}
+        </Container>
+    );
+};
+
+export default StackImages;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/constants.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/constants.ts
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/index.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/index.ts
new file mode 100644
index 00000000000000..e41f35d7b42593
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/index.ts
@@ -0,0 +1,3 @@
+import PlatformContentContainer from './PlatformContentContainer';
+
+export default PlatformContentContainer;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge.tsx
new file mode 100644
index 00000000000000..956b8688d3893e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge.tsx
@@ -0,0 +1,93 @@
+import { colors, Pill, Text, Tooltip } from '@src/alchemy-components';
+import { getStructuredPropertyValue } from '@src/app/entity/shared/utils';
+import { getDisplayName } from '@src/app/govern/structuredProperties/utils';
+import { StructuredProperties } from '@src/types.generated';
+import React from 'react';
+import styled from 'styled-components';
+import { mapStructuredPropertyToPropertyRow } from '../../../tabs/Properties/useStructuredProperties';
+import { filterForAssetBadge } from './utils';
+
+export const MAX_PROP_BADGE_WIDTH = 150;
+
+const StyledTooltip = styled(Tooltip)`
+    .ant-tooltip-inner {
+        border-radius: 8px;
+        box-shadow: 0px 4px 12px 0px rgba(9, 1, 61, 0.12);
+    }
+`;
+
+const TooltipContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+`;
+
+const ValueContainer = styled.div`
+    gap: 4px;
+`;
+
+const BadgeContainer = styled.div`
+    max-width: ${MAX_PROP_BADGE_WIDTH}px;
+    display: flex;
+`;
+
+interface Props {
+    structuredProperties?: StructuredProperties | null;
+}
+
+const StructuredPropertyBadge = ({ structuredProperties }: Props) => {
+    const badgeStructuredProperty = structuredProperties?.properties?.find(filterForAssetBadge);
+
+    const propRow = badgeStructuredProperty ? mapStructuredPropertyToPropertyRow(badgeStructuredProperty) : undefined;
+
+    if (!badgeStructuredProperty) return null;
+
+    const propertyValue = propRow?.values[0]?.value;
+    const relatedDescription = propRow?.structuredProperty.definition.allowedValues?.find(
+        (v) => getStructuredPropertyValue(v.value) === propertyValue,
+    )?.description;
+
+    const BadgeTooltip = () => {
+        return (
+            <TooltipContainer>
+                <Text color="gray" weight="semiBold">
+                    {getDisplayName(badgeStructuredProperty.structuredProperty)}
+                </Text>
+                <ValueContainer>
+                    <Text color="gray" size="sm" weight="bold">
+                        Value
+                    </Text>
+                    <Text color="gray">{propRow?.values[0]?.value}</Text>
+                </ValueContainer>
+                {relatedDescription && (
+                    <ValueContainer>
+                        <Text color="gray" size="sm" weight="bold">
+                            Description
+                        </Text>
+                        <Text color="gray">{relatedDescription}</Text>
+                    </ValueContainer>
+                )}
+            </TooltipContainer>
+        );
+    };
+
+    return (
+        <StyledTooltip
+            showArrow={false}
+            title={<BadgeTooltip />}
+            color={colors.white}
+            overlayInnerStyle={{ width: 250, padding: 16 }}
+        >
+            <BadgeContainer>
+                <Pill
+                    label={propRow?.values[0]?.value?.toString() || ''}
+                    size="sm"
+                    colorScheme="violet"
+                    clickable={false}
+                />
+            </BadgeContainer>
+        </StyledTooltip>
+    );
+};
+
+export default StructuredPropertyBadge;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/utils.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/utils.ts
new file mode 100644
index 00000000000000..052e0d53ed8b58
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/utils.ts
@@ -0,0 +1,29 @@
+import { EntityType, StructuredPropertiesEntry } from '../../../../../../types.generated';
+import { capitalizeFirstLetterOnly } from '../../../../../shared/textUtil';
+import { EntityRegistry } from '../../../../../../entityRegistryContext';
+import { GenericEntityProperties } from '../../../../../entity/shared/types';
+
+export function getDisplayedEntityType(
+    entityData: GenericEntityProperties | null,
+    entityRegistry: EntityRegistry,
+    entityType: EntityType,
+) {
+    return (
+        entityData?.entityTypeOverride ||
+        capitalizeFirstLetterOnly(entityData?.subTypes?.typeNames?.[0]) ||
+        entityRegistry.getEntityName(entityType) ||
+        ''
+    );
+}
+
+export function getEntityPlatforms(entityType: EntityType | null, entityData: GenericEntityProperties | null) {
+    const platform = entityType === EntityType.SchemaField ? entityData?.parent?.platform : entityData?.platform;
+    const platforms =
+        entityType === EntityType.SchemaField ? entityData?.parent?.siblingPlatforms : entityData?.siblingPlatforms;
+
+    return { platform, platforms };
+}
+
+export function filterForAssetBadge(prop: StructuredPropertiesEntry) {
+    return prop.structuredProperty.settings?.showAsAssetBadge && !prop.structuredProperty.settings?.isHidden;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/DescriptionSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/DescriptionSection.tsx
new file mode 100644
index 00000000000000..82ae35a26613c3
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/DescriptionSection.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import CompactMarkdownViewer from '../../../../tabs/Documentation/components/CompactMarkdownViewer';
+import { REDESIGN_COLORS } from '../../../../constants';
+
+const ContentWrapper = styled.div`
+    font-size: 12px;
+    font-weight: 500;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    line-height: 20px;
+    white-space: break-spaces;
+`;
+
+interface Props {
+    description: string;
+    isExpandable?: boolean;
+    lineLimit?: number;
+    isShowMoreEnabled?: boolean;
+}
+
+export default function DescriptionSection({ description, isExpandable, lineLimit, isShowMoreEnabled }: Props) {
+    return (
+        <ContentWrapper>
+            <CompactMarkdownViewer
+                lineLimit={isExpandable ? lineLimit : null}
+                content={description}
+                isShowMoreEnabled={isShowMoreEnabled}
+            />
+        </ContentWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/EmptyContentSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/EmptyContentSection.tsx
new file mode 100644
index 00000000000000..bf085a525af271
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/EmptyContentSection.tsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
+import { useRouteToTab } from '../../../../../../entity/shared/EntityContext';
+import { EMPTY_MESSAGES } from '../../../../constants';
+
+const EmptyContentWrapper = styled.div`
+    font-size: 12px;
+    display: flex;
+    justify-content: start;
+    align-items: start;
+`;
+
+const EmptyContentMessage = styled(Typography.Text)`
+    font-size: 12px;
+`;
+
+const AddButton = styled.div`
+    margin: 0px;
+    padding: 0px;
+    margin-left: 12px;
+    :hover {
+        cursor: pointer;
+    }
+`;
+
+interface Props {
+    readOnly?: boolean;
+}
+
+export default function EmptyContentSection({ readOnly }: Props) {
+    const routeToTab = useRouteToTab();
+
+    return (
+        <EmptyContentWrapper>
+            <EmptyContentMessage type="secondary">{EMPTY_MESSAGES.documentation.title}</EmptyContentMessage>
+            {!readOnly && (
+                <AddButton onClick={() => routeToTab({ tabName: 'Documentation', tabParams: { editing: true } })}>
+                    <PlusOutlined style={{ fontSize: 10, marginRight: 6 }} /> Add docs
+                </AddButton>
+            )}
+        </EmptyContentWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/LinksSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/LinksSection.tsx
new file mode 100644
index 00000000000000..b55d4bf9524512
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/LinksSection.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import styled from 'styled-components';
+import LinkButton from '../LinkButton';
+import { useEntityData, useRefetch } from '../../../../../../entity/shared/EntityContext';
+import { AddLinkModal } from '../../../../components/styled/AddLinkModal';
+
+const AddLinksWrapper = styled.div`
+    margin-left: -15px;
+`;
+
+interface Props {
+    hideLinksButton?: boolean;
+    readOnly?: boolean;
+}
+
+export default function LinksSection({ hideLinksButton, readOnly }: Props) {
+    const { entityData } = useEntityData();
+    const refetch = useRefetch();
+
+    const links = entityData?.institutionalMemory?.elements || [];
+
+    return (
+        <>
+            {links.map((link) => (
+                <>
+                    <LinkButton link={link} />
+                </>
+            ))}
+            {!readOnly && !hideLinksButton && (
+                <AddLinksWrapper>
+                    <AddLinkModal buttonProps={{ type: 'text' }} refetch={refetch} />
+                </AddLinksWrapper>
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx
new file mode 100644
index 00000000000000..1a418c246f74df
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx
@@ -0,0 +1,104 @@
+import React from 'react';
+import AddRoundedIcon from '@mui/icons-material/AddRounded';
+import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
+import { getAssetDescriptionDetails } from '@src/app/entityV2/shared/tabs/Documentation/utils';
+import { useIsEmbeddedProfile } from '@src/app/shared/useEmbeddedProfileLinkProps';
+import useIsLineageMode from '@src/app/lineage/utils/useIsLineageMode';
+import { useIsSeparateSiblingsMode } from '@src/app/entity/shared/siblingUtils';
+import { useEntityRegistry } from '@src/app/useEntityRegistry';
+import DescriptionSection from './DescriptionSection';
+import LinksSection from './LinksSection';
+import SourceRefSection from './SourceRefSection';
+import { SidebarSection } from '../SidebarSection';
+import { EMPTY_MESSAGES } from '../../../../constants';
+import SectionActionButton from '../SectionActionButton';
+import EmptySectionText from '../EmptySectionText';
+import { useEntityData, useMutationUrn, useRouteToTab } from '../../../../../../entity/shared/EntityContext';
+import { getEntityPath } from '../../utils';
+
+const LINE_LIMIT = 5;
+
+interface Properties {
+    hideLinksButton?: boolean;
+}
+
+interface Props {
+    properties?: Properties;
+    readOnly?: boolean;
+}
+
+export const SidebarAboutSection = ({ properties, readOnly }: Props) => {
+    const { entityData, entityType } = useEntityData();
+    const entityRegistry = useEntityRegistry();
+    const isLineageMode = useIsLineageMode();
+    const isHideSiblingMode = useIsSeparateSiblingsMode();
+    const urn = useMutationUrn();
+
+    const hideLinksButton = properties?.hideLinksButton;
+    const isEmbeddedProfile = useIsEmbeddedProfile();
+    const routeToTab = useRouteToTab();
+
+    const { displayedDescription } = getAssetDescriptionDetails({
+        entityProperties: entityData,
+    });
+
+    const links = entityData?.institutionalMemory?.elements || [];
+
+    const hasContent = !!displayedDescription || links.length > 0;
+
+    const canEditDescription = !!entityData?.privileges?.canEditDescription;
+
+    return (
+        <>
+            <SidebarSection
+                title="Documentation"
+                content={
+                    <>
+                        {displayedDescription && [
+                            <DescriptionSection
+                                description={displayedDescription}
+                                isExpandable
+                                lineLimit={LINE_LIMIT}
+                            />,
+                        ]}
+                        {hasContent && <LinksSection hideLinksButton={hideLinksButton} readOnly />}
+                        {!hasContent && [<EmptySectionText message={EMPTY_MESSAGES.documentation.title} />]}
+                    </>
+                }
+                extra={
+                    <>
+                        {!readOnly && (
+                            <SectionActionButton
+                                button={hasContent ? <EditOutlinedIcon /> : <AddRoundedIcon />}
+                                dataTestId="editDocumentation"
+                                onClick={(event) => {
+                                    if (!isEmbeddedProfile) {
+                                        routeToTab({ tabName: 'Documentation', tabParams: { editing: true } });
+                                    } else {
+                                        const url = getEntityPath(
+                                            entityType,
+                                            urn,
+                                            entityRegistry,
+                                            isLineageMode,
+                                            isHideSiblingMode,
+                                            'Documentation',
+                                            {
+                                                editing: true,
+                                            },
+                                        );
+                                        window.open(url, '_blank');
+                                    }
+                                    event.stopPropagation();
+                                }}
+                                actionPrivilege={canEditDescription}
+                            />
+                        )}
+                    </>
+                }
+            />
+            <SourceRefSection />
+        </>
+    );
+};
+
+export default SidebarAboutSection;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SourceRefSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SourceRefSection.tsx
new file mode 100644
index 00000000000000..9a2a73721b20ec
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SourceRefSection.tsx
@@ -0,0 +1,37 @@
+import { LinkOutlined } from '@ant-design/icons';
+import { Typography } from 'antd';
+import React from 'react';
+import { useEntityData } from '../../../../../../entity/shared/EntityContext';
+import { StyledLink } from '../LinkButton';
+import { SidebarSection } from '../SidebarSection';
+
+export default function SourceRefSection() {
+    const { entityData } = useEntityData();
+
+    const sourceUrl = entityData?.properties?.sourceUrl;
+    const sourceRef = entityData?.properties?.sourceRef;
+
+    if (!sourceRef) return null;
+
+    return (
+        <>
+            <SidebarSection
+                title="Source"
+                content={
+                    <>
+                        <Typography.Paragraph>
+                            {sourceUrl ? (
+                                <StyledLink type="link" href={sourceUrl} target="_blank" rel="noreferrer">
+                                    <LinkOutlined />
+                                    {sourceRef}
+                                </StyledLink>
+                            ) : (
+                                <span>{sourceRef}</span>
+                            )}
+                        </Typography.Paragraph>
+                    </>
+                }
+            />
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/SidebarChartHeaderSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/SidebarChartHeaderSection.tsx
new file mode 100644
index 00000000000000..cc75ec5ab7c0e7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/SidebarChartHeaderSection.tsx
@@ -0,0 +1,113 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Tooltip } from '@components';
+import { useEntityData } from '../../../../../../../entity/shared/EntityContext';
+import { SidebarHeaderSectionColumns } from '../../SidebarHeaderSectionColumns';
+import SidebarTopUsersHeaderSection from '../../shared/SidebarTopUsersHeaderSection';
+import { getChartPopularityTier, userExists } from '../../shared/utils';
+import { REDESIGN_COLORS } from '../../../../../constants';
+import { formatNumber, formatNumberWithoutAbbreviation } from '../../../../../../../shared/formatNumber';
+import { getPopularityColumn, SidebarStatsColumn } from '../../../utils';
+
+const StatContent = styled.div`
+    color: ${REDESIGN_COLORS.FOUNDATION_BLUE_4};
+    font-size: 12px;
+    font-weight: 600;
+`;
+
+const SidebarChartHeaderSection = () => {
+    const { entityData } = useEntityData();
+    const chart = entityData as any;
+
+    const columns: SidebarStatsColumn[] = [];
+
+    /**
+     * Popularity tab
+     */
+    const popularityColumn = getPopularityColumn(
+        getChartPopularityTier(
+            chart?.statsSummary?.viewCountPercentileLast30Days,
+            chart?.statsSummary?.uniqueUserPercentileLast30Days,
+        ),
+    );
+    if (popularityColumn) {
+        columns.push(popularityColumn);
+    }
+
+    /**
+     * Top users tab
+     */
+    if (
+        chart?.statsSummary?.topUsersLast30Days &&
+        chart?.statsSummary?.topUsersLast30Days?.find((user) => userExists(user))
+    ) {
+        columns.push({
+            title: 'Top Users',
+            content: <SidebarTopUsersHeaderSection />,
+        });
+    }
+
+    /**
+     * Queries column
+     */
+    if (chart?.statsSummary?.queryCountLast30Days) {
+        columns.push({
+            title: 'Queries',
+            content: <StatContent>{formatNumber(chart?.statsSummary?.queryCountLast30Days)} queries</StatContent>,
+        });
+    }
+
+    /**
+     * Users column
+     */
+    if (chart?.statsSummary?.uniqueUserCountLast30Days) {
+        columns.push({
+            title: 'Users',
+            content: <StatContent>{formatNumber(chart?.statsSummary?.uniqueUserCountLast30Days)} users</StatContent>,
+        });
+    }
+
+    /**
+     * Recent Views
+     */
+    if (chart?.statsSummary?.viewCountLast30Days) {
+        columns.push({
+            title: 'Recent Views',
+            content: (
+                <Tooltip
+                    showArrow={false}
+                    title={`${formatNumberWithoutAbbreviation(
+                        chart?.statsSummary?.viewCountLast30Days,
+                    )} views over the past 30 days`}
+                >
+                    <StatContent>{formatNumber(chart?.statsSummary?.viewCountLast30Days)} views</StatContent>
+                </Tooltip>
+            ),
+        });
+    }
+
+    /**
+     * Total Views
+     */
+    if (chart?.statsSummary?.viewCount) {
+        columns.push({
+            title: 'Total Views',
+            content: (
+                <Tooltip
+                    showArrow={false}
+                    title={`${formatNumberWithoutAbbreviation(chart?.statsSummary?.viewCount)} views`}
+                >
+                    <StatContent>{formatNumber(chart?.statsSummary?.viewCount)} views</StatContent>
+                </Tooltip>
+            ),
+        });
+    }
+
+    if (!columns.length) {
+        return null;
+    }
+
+    return <SidebarHeaderSectionColumns columns={columns} />;
+};
+
+export default SidebarChartHeaderSection;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/utils.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/utils.ts
new file mode 100644
index 00000000000000..59f514e85d39ca
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/utils.ts
@@ -0,0 +1,8 @@
+import { ChartProperties } from '../../../../../../../../types.generated';
+
+// This util is used for Charts and Dashboards who get last updated differently than others
+export function getLastUpdatedMs(
+    properties: Pick<ChartProperties, 'lastModified' | 'lastRefreshed'> | null | undefined,
+): number | undefined {
+    return properties?.lastRefreshed || properties?.lastModified?.time || undefined;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx
new file mode 100644
index 00000000000000..2b5cf7456baa7c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx
@@ -0,0 +1,190 @@
+import { Button, Form, Modal, Select, Tag } from 'antd';
+import { Tooltip } from '@components';
+import React, { ReactNode, useRef, useState } from 'react';
+import styled from 'styled-components/macro';
+import { useGetSearchResultsLazyQuery } from '../../../../../../../graphql/search.generated';
+import { Container, Entity, EntityType } from '../../../../../../../types.generated';
+import { useEnterKeyListener } from '../../../../../../shared/useEnterKeyListener';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+
+type Props = {
+    onCloseModal: () => void;
+    defaultValues?: { urn: string; entity?: Entity | null }[];
+    onOkOverride?: (result: string[]) => void;
+    titleOverride?: string;
+};
+
+type SelectedContainer = {
+    entity?: Entity | null;
+    urn: string;
+};
+
+const StyleTag = styled(Tag)`
+    padding: 0px 7px;
+    margin-right: 3px;
+    display: flex;
+    justify-content: start;
+    align-items: center;
+`;
+
+const PreviewImage = styled.img`
+    max-height: 18px;
+    width: auto;
+    object-fit: contain;
+    background-color: transparent;
+    margin-right: 4px;
+`;
+
+export const ContainerSelectModal = ({ onCloseModal, defaultValues, onOkOverride, titleOverride }: Props) => {
+    const [containerSearch, { data: platforSearchData }] = useGetSearchResultsLazyQuery();
+    const entityRegistry = useEntityRegistry();
+
+    const containerSearchResults =
+        platforSearchData?.search?.searchResults?.map((searchResult) => searchResult.entity) || [];
+
+    const [selectedContainers, setSelectedContainers] = useState<SelectedContainer[]>(defaultValues || []);
+
+    const inputEl = useRef(null);
+
+    const onModalClose = () => {
+        onCloseModal();
+    };
+
+    const handleSearch = (text: string) => {
+        containerSearch({
+            variables: {
+                input: {
+                    type: EntityType.Container,
+                    query: text,
+                    start: 0,
+                    count: 5,
+                },
+            },
+        });
+    };
+
+    // Renders a search result in the select dropdown.
+    const renderSearchResult = (entity: Container) => {
+        const displayName = entityRegistry.getDisplayName(EntityType.Container, entity);
+
+        const truncatedDisplayName = displayName.length > 25 ? `${displayName.slice(0, 25)}...` : displayName;
+        return (
+            <Tooltip title={displayName}>
+                <PreviewImage src={entity.platform?.properties?.logoUrl || undefined} alt={entity.properties?.name} />
+                <span>{truncatedDisplayName}</span>
+            </Tooltip>
+        );
+    };
+
+    const containerSearchOptions = containerSearchResults?.map((result) => {
+        return (
+            <Select.Option value={result.urn} key={result.urn}>
+                {renderSearchResult(result as Container)}
+            </Select.Option>
+        );
+    });
+
+    const onSelectContainer = (newValue: { value: string; label: ReactNode }) => {
+        const newUrn = newValue.value;
+
+        if (inputEl && inputEl.current) {
+            (inputEl.current as any).blur();
+        }
+
+        const filteredContainer = containerSearchResults?.find((entity) => entity.urn === newUrn);
+
+        if (filteredContainer) {
+            const container = filteredContainer as Container;
+            setSelectedContainers([
+                ...(selectedContainers || []),
+                {
+                    entity: container,
+                    urn: newUrn,
+                },
+            ]);
+        }
+    };
+
+    const onDeselectContainer = (val) => {
+        setSelectedContainers(selectedContainers?.filter((container) => container.urn !== val.value));
+    };
+
+    const onOk = () => {
+        if (!selectedContainers) {
+            return;
+        }
+
+        if (onOkOverride) {
+            onOkOverride(selectedContainers?.map((container) => container.urn));
+        }
+    };
+
+    // Handle the Enter press
+    useEnterKeyListener({
+        querySelectorToExecuteClick: '#setContainerButton',
+    });
+
+    const tagRender = (props) => {
+        // eslint-disable-next-line react/prop-types
+        const { label, closable, onClose } = props;
+        const onPreventMouseDown = (event) => {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+        return (
+            <StyleTag onMouseDown={onPreventMouseDown} closable={closable} onClose={onClose}>
+                {label}
+            </StyleTag>
+        );
+    };
+
+    return (
+        <Modal
+            title={titleOverride || 'Select Container'}
+            visible
+            onCancel={onModalClose}
+            footer={
+                <>
+                    <Button onClick={onModalClose} type="text">
+                        Cancel
+                    </Button>
+                    <Button id="setContainerButton" disabled={selectedContainers?.length === 0} onClick={onOk}>
+                        Add
+                    </Button>
+                </>
+            }
+        >
+            <Form component={false}>
+                <Form.Item>
+                    <Select
+                        autoFocus
+                        filterOption={false}
+                        showSearch
+                        mode="multiple"
+                        defaultActiveFirstOption={false}
+                        placeholder="Search for Containers..."
+                        onSelect={(containerUrn: any) => onSelectContainer(containerUrn)}
+                        onDeselect={onDeselectContainer}
+                        onSearch={(value: string) => {
+                            // eslint-disable-next-line react/prop-types
+                            handleSearch(value.trim());
+                        }}
+                        ref={inputEl}
+                        labelInValue
+                        value={selectedContainers?.map((container) => ({
+                            value: container.urn,
+                            label: container.entity ? (
+                                renderSearchResult(container.entity as Container)
+                            ) : (
+                                <span>{container.urn}</span>
+                            ),
+                        }))}
+                        tagRender={tagRender}
+                    >
+                        {containerSearchOptions}
+                    </Select>
+                </Form.Item>
+            </Form>
+        </Modal>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/SidebarContentsLoadingSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/SidebarContentsLoadingSection.tsx
new file mode 100644
index 00000000000000..e246ac44c8036f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/SidebarContentsLoadingSection.tsx
@@ -0,0 +1,9 @@
+import React from 'react';
+import { Spin } from 'antd';
+import { LoadingOutlined } from '@ant-design/icons';
+
+const SidebarContentsLoadingSection = () => {
+    return <Spin indicator={<LoadingOutlined />} />;
+};
+
+export default SidebarContentsLoadingSection;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/SidebarContentsSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/SidebarContentsSection.tsx
new file mode 100644
index 00000000000000..d07316c216ef00
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/SidebarContentsSection.tsx
@@ -0,0 +1,81 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { useHistory } from 'react-router';
+import { useEntityData } from '../../../../../../entity/shared/EntityContext';
+import { SidebarSection } from '../SidebarSection';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+import { getContentsSummary, getContentsSummaryText, navigateToContainerContents } from './utils';
+import { useGetContainerEntitySummaryQuery } from '../../../../../../../graphql/container.generated';
+import SidebarContentsLoadingSection from './SidebarContentsLoadingSection';
+import EmptySectionText from '../EmptySectionText';
+import { REDESIGN_COLORS } from '../../../../constants';
+
+const Section = styled.div`
+    display: flex;
+    align-items: start;
+    justify-content: start;
+    flex-wrap: wrap;
+`;
+
+const SummaryText = styled.div`
+    margin-right: 8px;
+    text-wrap: wrap;
+`;
+
+const ViewAllButton = styled.div`
+    display: flex;
+    align-items: center;
+    font-weight: bold;
+    padding: 0px 2px;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    :hover {
+        cursor: pointer;
+    }
+`;
+
+const SidebarContentsSection = () => {
+    const { urn, entityType } = useEntityData();
+    const entityRegistry = useEntityRegistry();
+    const history = useHistory();
+    const { data, loading } = useGetContainerEntitySummaryQuery({
+        variables: {
+            urn,
+        },
+        fetchPolicy: 'cache-first',
+    });
+
+    const contentsSummary = data?.aggregateAcrossEntities && getContentsSummary(data.aggregateAcrossEntities as any);
+    const contentsCount = contentsSummary?.total || 0;
+    const hasContents = contentsCount > 0;
+
+    return (
+        <SidebarSection
+            title="Contents"
+            key="Contents"
+            content={
+                <>
+                    {loading && <SidebarContentsLoadingSection />}
+                    {!loading &&
+                        (hasContents ? (
+                            <Section>
+                                <SummaryText>
+                                    {getContentsSummaryText(contentsSummary as any, entityRegistry)}
+                                </SummaryText>
+                                <ViewAllButton
+                                    onClick={() =>
+                                        navigateToContainerContents(urn, entityType, history, entityRegistry)
+                                    }
+                                >
+                                    View all
+                                </ViewAllButton>
+                            </Section>
+                        ) : (
+                            <EmptySectionText message="No contents yet" />
+                        ))}
+                </>
+            }
+        />
+    );
+};
+
+export default SidebarContentsSection;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/utils.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/utils.tsx
new file mode 100644
index 00000000000000..619ce6aacdbb12
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/utils.tsx
@@ -0,0 +1,111 @@
+import React from 'react';
+import styled from 'styled-components';
+import { AggregationMetadata, EntityType, FacetMetadata, SearchResults } from '../../../../../../../types.generated';
+import { pluralize } from '../../../../../../shared/textUtil';
+import { EntityRegistry } from '../../../../../../../entityRegistryContext';
+import { ANTD_GRAY } from '../../../../constants';
+
+const UNIT_SEPARATOR = '␞';
+
+const SummaryText = styled.span`
+    color: ${ANTD_GRAY[7]};
+`;
+
+export type ContentTypeSummary = {
+    type: string;
+    count: number;
+    isEntityType: boolean; // If false, this represents a sub-type.
+};
+
+export type ContentsSummary = {
+    total: number;
+    types: ContentTypeSummary[];
+};
+
+const mergeEntityTypeSubTypeAggregations = (
+    entityTypeTotals: Map<EntityType, any>,
+    subTypeAggregations?: FacetMetadata,
+) => {
+    const results = new Map();
+    Array.from(entityTypeTotals.keys()).forEach((key) => {
+        results.set(key, { count: entityTypeTotals.get(key).count, isEntityType: true });
+    });
+
+    // Iterate through sub-type aggregations, add them, and subtract the total from the corresponding entity type.
+    subTypeAggregations?.aggregations?.forEach((agg) => {
+        const { value } = agg;
+        const values = value.split(UNIT_SEPARATOR);
+        const entityType = values[0];
+        const subType = values.length > 1 ? values[1] : undefined;
+
+        if (subType) {
+            // TODO: Determine what null subtype means.
+            results.set(subType, { count: agg.count, isEntityType: false });
+            if (results.has(entityType)) {
+                const entityTypeValue = results.get(entityType);
+                const newCount = entityTypeValue.count - agg.count;
+                results.set(entityType, {
+                    ...entityTypeValue,
+                    count: newCount,
+                });
+            }
+        }
+    });
+    return results;
+};
+
+const getContentCountsByEntityType = (aggregations: AggregationMetadata[]): Map<EntityType, any> => {
+    const result = new Map();
+    aggregations.forEach((agg) => {
+        result.set(agg.value, { count: agg.count, isEntityType: true });
+    });
+    return result;
+};
+
+const getContentCountsByType = (results: SearchResults) => {
+    const entityTypeAggregations = results.facets?.find((facet) => facet.field === '_entityType');
+    const entityTypeTotals =
+        (entityTypeAggregations && getContentCountsByEntityType(entityTypeAggregations.aggregations)) || new Map();
+    const subTypeAggregations = results.facets?.find((facet) => facet.field === '_entityType␞typeNames');
+    const finalCounts = mergeEntityTypeSubTypeAggregations(entityTypeTotals, subTypeAggregations) || entityTypeTotals;
+    const result = Array.from(finalCounts.keys())
+        .map((key) => ({
+            type: key,
+            count: finalCounts.get(key).count,
+            isEntityType: finalCounts.get(key).isEntityType,
+        }))
+        .filter((entry) => entry.count > 0);
+    return {
+        types: result,
+        total: result.reduce((accumulator, entry) => accumulator + entry.count, 0),
+    };
+};
+
+export const getContentsSummary = (contents: SearchResults): ContentsSummary => {
+    return getContentCountsByType(contents);
+};
+
+export const getContentsSummaryText = (summary: ContentsSummary, entityRegistry: EntityRegistry): React.ReactNode => {
+    return (
+        <>
+            {summary.types.map((type, idx) => {
+                return (
+                    <SummaryText>
+                        {type.count}{' '}
+                        {pluralize(
+                            type.count,
+                            type.isEntityType
+                                ? (entityRegistry.getEntityName(type.type as EntityType) as any)
+                                : type.type,
+                        ).toLocaleLowerCase()}
+                        {idx < summary.types.length - 1 && <>, </>}
+                    </SummaryText>
+                );
+            })}
+        </>
+    );
+};
+
+export const navigateToContainerContents = (urn, type, history, entityRegistry) => {
+    history.push(`${entityRegistry.getEntityUrl(type, urn)}/Contents`);
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dashboard/Header/SidebarDashboardHeaderSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dashboard/Header/SidebarDashboardHeaderSection.tsx
new file mode 100644
index 00000000000000..4f320a068d25ff
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dashboard/Header/SidebarDashboardHeaderSection.tsx
@@ -0,0 +1,115 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Tooltip } from '@components';
+import { useEntityData } from '../../../../../../../entity/shared/EntityContext';
+import { SidebarHeaderSectionColumns } from '../../SidebarHeaderSectionColumns';
+import SidebarTopUsersHeaderSection from '../../shared/SidebarTopUsersHeaderSection';
+import { getDashboardPopularityTier, userExists } from '../../shared/utils';
+import { REDESIGN_COLORS } from '../../../../../constants';
+import { formatNumber, formatNumberWithoutAbbreviation } from '../../../../../../../shared/formatNumber';
+import { getPopularityColumn, SidebarStatsColumn } from '../../../utils';
+
+const StatContent = styled.div`
+    color: ${REDESIGN_COLORS.FOUNDATION_BLUE_4};
+    font-size: 12px;
+    font-weight: 600;
+`;
+
+const SidebarDashboardHeaderSection = () => {
+    const { entityData } = useEntityData();
+    const dashboard = entityData as any;
+
+    const columns: SidebarStatsColumn[] = [];
+
+    /**
+     * Popularity tab
+     */
+    const popularityColumn = getPopularityColumn(
+        getDashboardPopularityTier(
+            dashboard?.statsSummary?.viewCountPercentileLast30Days,
+            dashboard?.statsSummary?.uniqueUserPercentileLast30Days,
+        ),
+    );
+    if (popularityColumn) {
+        columns.push(popularityColumn);
+    }
+
+    /**
+     * Top users tab
+     */
+    if (
+        dashboard?.statsSummary?.topUsersLast30Days &&
+        dashboard?.statsSummary?.topUsersLast30Days?.find((user) => userExists(user))
+    ) {
+        columns.push({
+            title: 'Top Users',
+            content: <SidebarTopUsersHeaderSection />,
+        });
+    }
+
+    /**
+     * Queries column
+     */
+    if (dashboard?.statsSummary?.queryCountLast30Days) {
+        columns.push({
+            title: 'Queries',
+            content: <StatContent>{formatNumber(dashboard?.statsSummary?.queryCountLast30Days)} queries</StatContent>,
+        });
+    }
+
+    /**
+     * Users column
+     */
+    if (dashboard?.statsSummary?.uniqueUserCountLast30Days) {
+        columns.push({
+            title: 'Users',
+            content: (
+                <StatContent>{formatNumber(dashboard?.statsSummary?.uniqueUserCountLast30Days)} users</StatContent>
+            ),
+        });
+    }
+
+    /**
+     * Recent Views
+     */
+    if (dashboard?.statsSummary?.viewCountLast30Days) {
+        columns.push({
+            title: 'Recent Views',
+            content: (
+                <Tooltip
+                    showArrow={false}
+                    title={`${formatNumberWithoutAbbreviation(
+                        dashboard?.statsSummary?.viewCountLast30Days,
+                    )} views over the past 30 days`}
+                >
+                    <StatContent>{formatNumber(dashboard?.statsSummary?.viewCountLast30Days)} views</StatContent>
+                </Tooltip>
+            ),
+        });
+    }
+
+    /**
+     * Total Views
+     */
+    if (dashboard?.statsSummary?.viewCount) {
+        columns.push({
+            title: 'Total Views',
+            content: (
+                <Tooltip
+                    showArrow={false}
+                    title={`${formatNumberWithoutAbbreviation(dashboard?.statsSummary?.viewCount)} views`}
+                >
+                    <StatContent>{formatNumber(dashboard?.statsSummary?.viewCount)} views</StatContent>
+                </Tooltip>
+            ),
+        });
+    }
+
+    if (!columns.length) {
+        return null;
+    }
+
+    return <SidebarHeaderSectionColumns columns={columns} />;
+};
+
+export default SidebarDashboardHeaderSection;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx
new file mode 100644
index 00000000000000..824800d08f3e30
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx
@@ -0,0 +1,117 @@
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components';
+import AddRoundedIcon from '@mui/icons-material/AddRounded';
+import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
+import { Modal, message } from 'antd';
+import { useEntityData } from '../../../../../../entity/shared/EntityContext';
+import { EMPTY_MESSAGES } from '../../../../constants';
+import SetDataProductModal from './SetDataProductModal';
+import { DataProductLink } from '../../../../../../sharedV2/tags/DataProductLink';
+import { useBatchSetDataProductMutation } from '../../../../../../../graphql/dataProduct.generated';
+import { DataProduct } from '../../../../../../../types.generated';
+import { SidebarSection } from '../SidebarSection';
+import SectionActionButton from '../SectionActionButton';
+import EmptySectionText from '../EmptySectionText';
+
+const Content = styled.div`
+    display: flex;
+    align-items: start;
+    justify-content: start;
+    flex-wrap: wrap;
+    text-wrap: wrap;
+`;
+interface Props {
+    readOnly?: boolean;
+}
+
+export default function DataProductSection({ readOnly }: Props) {
+    const [isModalVisible, setIsModalVisible] = useState(false);
+    const { entityData, urn } = useEntityData();
+    const [batchSetDataProductMutation] = useBatchSetDataProductMutation();
+    const [dataProduct, setDataProduct] = useState<DataProduct | null>(null);
+    const dataProductRelationships = entityData?.dataProduct?.relationships;
+    const siblingUrns: string[] =
+        entityData?.siblingsSearch?.searchResults.map((sibling) => sibling.entity.urn || '') || [];
+
+    const canEditDataProducts = !!entityData?.privileges?.canEditDataProducts;
+
+    useEffect(() => {
+        if (dataProductRelationships && dataProductRelationships.length > 0) {
+            setDataProduct(dataProductRelationships[0].entity as DataProduct);
+        }
+    }, [dataProductRelationships]);
+
+    function removeDataProduct() {
+        batchSetDataProductMutation({ variables: { input: { resourceUrns: [urn, ...siblingUrns] } } })
+            .then(() => {
+                message.success({ content: 'Removed Data Product.', duration: 2 });
+                setDataProduct(null);
+            })
+            .catch((e: unknown) => {
+                message.destroy();
+                if (e instanceof Error) {
+                    message.error({
+                        content: `Failed to remove data product. An unknown error occurred.`,
+                        duration: 3,
+                    });
+                }
+            });
+    }
+
+    const onRemoveDataProduct = () => {
+        Modal.confirm({
+            title: `Confirm Data Product Removal`,
+            content: `Are you sure you want to remove this data product?`,
+            onOk() {
+                removeDataProduct();
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
+    return (
+        <>
+            <SidebarSection
+                title="Data Product"
+                content={
+                    <Content>
+                        {dataProduct && (
+                            <DataProductLink
+                                dataProduct={dataProduct}
+                                closable={!readOnly}
+                                readOnly={readOnly}
+                                onClose={(e) => {
+                                    e.preventDefault();
+                                    onRemoveDataProduct();
+                                }}
+                                fontSize={12}
+                            />
+                        )}
+                        {!dataProduct && <EmptySectionText message={EMPTY_MESSAGES.dataProduct.title} />}
+                    </Content>
+                }
+                extra={
+                    <SectionActionButton
+                        button={dataProduct ? <EditOutlinedIcon /> : <AddRoundedIcon />}
+                        onClick={(event) => {
+                            setIsModalVisible(true);
+                            event.stopPropagation();
+                        }}
+                        actionPrivilege={canEditDataProducts}
+                    />
+                }
+            />
+            {isModalVisible && (
+                <SetDataProductModal
+                    urns={[urn, ...siblingUrns]}
+                    currentDataProduct={dataProduct || null}
+                    onModalClose={() => setIsModalVisible(false)}
+                    setDataProduct={setDataProduct}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/DataProduct/SetDataProductModal.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/DataProduct/SetDataProductModal.tsx
new file mode 100644
index 00000000000000..9989a5aa0671e2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/DataProduct/SetDataProductModal.tsx
@@ -0,0 +1,206 @@
+import { LoadingOutlined } from '@ant-design/icons';
+import Modal from 'antd/lib/modal/Modal';
+import { Button, Empty, Select, message } from 'antd';
+import { getModalDomContainer } from '@src/utils/focus';
+import { ANTD_GRAY } from '@src/app/entityV2/shared/constants';
+import { debounce } from 'lodash';
+import React, { useMemo, useRef, useState } from 'react';
+import styled from 'styled-components';
+import { useGetRecommendations } from '@src/app/shared/recommendation';
+import { useGetAutoCompleteMultipleResultsLazyQuery } from '../../../../../../../graphql/search.generated';
+import { DataProduct, Entity, EntityType } from '../../../../../../../types.generated';
+import { useEnterKeyListener } from '../../../../../../shared/useEnterKeyListener';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+import { IconStyleType } from '../../../../../Entity';
+import { useBatchSetDataProductMutation } from '../../../../../../../graphql/dataProduct.generated';
+import { handleBatchError } from '../../../../utils';
+
+const OptionWrapper = styled.div`
+    padding: 2px 0;
+
+    svg {
+        margin-right: 8px;
+    }
+`;
+
+const LoadingWrapper = styled.div`
+    display: flex;
+    justify-content: center;
+    margin: 5px;
+`;
+
+interface Props {
+    urns: string[];
+    currentDataProduct: DataProduct | null;
+    onModalClose: () => void;
+    titleOverride?: string;
+    onOkOverride?: (result: string) => void;
+    setDataProduct?: (dataProduct: DataProduct | null) => void;
+    refetch?: () => void;
+}
+
+export default function SetDataProductModal({
+    urns,
+    currentDataProduct,
+    onModalClose,
+    titleOverride,
+    onOkOverride,
+    setDataProduct,
+    refetch,
+}: Props) {
+    const entityRegistry = useEntityRegistry();
+    const [batchSetDataProductMutation] = useBatchSetDataProductMutation();
+    const [selectedDataProduct, setSelectedDataProduct] = useState<DataProduct | null>(currentDataProduct);
+    const inputEl = useRef(null);
+
+    const [getSearchResults, { data, loading: searchLoading }] = useGetAutoCompleteMultipleResultsLazyQuery();
+    const { recommendedData: recommendedDataProducts, loading: recommendationsLoading } = useGetRecommendations([
+        EntityType.DataProduct,
+    ]);
+    const [showRecommendations, setShowRecommendations] = useState(true);
+    const loading = recommendationsLoading || searchLoading;
+
+    const displayedDataProducts: Entity[] =
+        !showRecommendations && data?.autoCompleteForMultiple?.suggestions
+            ? data?.autoCompleteForMultiple?.suggestions.flatMap((suggestion) => suggestion.entities)
+            : recommendedDataProducts;
+
+    const handleSearch = useMemo(() => {
+        const fetch = (text: string) => {
+            if (text.trim()) {
+                getSearchResults({
+                    variables: {
+                        input: {
+                            types: [EntityType.DataProduct],
+                            query: text.trim(),
+                            limit: 10,
+                        },
+                    },
+                });
+            }
+            setShowRecommendations(!text.trim());
+        };
+        return debounce(fetch, 100);
+    }, [getSearchResults]);
+
+    function onOk() {
+        if (!selectedDataProduct) return;
+
+        if (onOkOverride) {
+            onOkOverride(selectedDataProduct?.urn);
+            return;
+        }
+
+        batchSetDataProductMutation({
+            variables: {
+                input: {
+                    resourceUrns: urns,
+                    dataProductUrn: selectedDataProduct.urn,
+                },
+            },
+        })
+            .then(() => {
+                message.success({ content: 'Updated Data Product!', duration: 3 });
+                setDataProduct?.(selectedDataProduct);
+                onModalClose();
+                setSelectedDataProduct(null);
+                // refetch is for search results, need to set a timeout
+                setTimeout(() => {
+                    refetch?.();
+                }, 2000);
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error(
+                    handleBatchError(urns, e, {
+                        content: `Failed to add assets to Data Product: \n ${e.message || ''}`,
+                        duration: 3,
+                    }),
+                );
+            });
+    }
+
+    function onSelectDataProduct(urn: string) {
+        if (inputEl && inputEl.current) {
+            (inputEl.current as any).blur();
+        }
+        const dataProduct = displayedDataProducts?.find((entity) => entity.urn === urn);
+        setSelectedDataProduct((dataProduct as DataProduct) || null);
+    }
+
+    function onDeselect() {
+        setSelectedDataProduct(null);
+    }
+
+    // Handle the Enter press
+    useEnterKeyListener({
+        querySelectorToExecuteClick: '#setDataProductButton',
+    });
+
+    const selectValue =
+        (selectedDataProduct && [entityRegistry.getDisplayName(EntityType.DataProduct, selectedDataProduct)]) ||
+        undefined;
+
+    const loadingOption = {
+        label: (
+            <LoadingWrapper>
+                <LoadingOutlined />
+            </LoadingWrapper>
+        ),
+        value: 'loading',
+    };
+
+    const options = displayedDataProducts.map((result) => ({
+        label: (
+            <OptionWrapper>
+                {entityRegistry.getIcon(EntityType.DataProduct, 12, IconStyleType.ACCENT, 'black')}
+                {entityRegistry.getDisplayName(EntityType.DataProduct, result)}
+            </OptionWrapper>
+        ),
+        value: result.urn,
+    }));
+
+    return (
+        <Modal
+            title={titleOverride || 'Set Data Product'}
+            open
+            onCancel={onModalClose}
+            getContainer={getModalDomContainer}
+            footer={
+                <>
+                    <Button onClick={onModalClose} type="text">
+                        Cancel
+                    </Button>
+                    <Button type="primary" id="setDataProductButton" disabled={!selectedDataProduct} onClick={onOk}>
+                        Save
+                    </Button>
+                </>
+            }
+        >
+            <Select
+                autoFocus
+                showSearch
+                defaultOpen
+                filterOption={false}
+                defaultActiveFirstOption={false}
+                placeholder="Search for Data Products..."
+                onSelect={(urn: string) => onSelectDataProduct(urn)}
+                onDeselect={onDeselect}
+                onSearch={handleSearch}
+                style={{ width: '100%' }}
+                ref={inputEl}
+                value={selectValue}
+                options={loading ? [loadingOption] : options}
+                notFoundContent={
+                    !loading ? (
+                        <Empty
+                            description="No Data Products Found"
+                            image={Empty.PRESENTED_IMAGE_SIMPLE}
+                            style={{ color: ANTD_GRAY[7] }}
+                        />
+                    ) : null
+                }
+            />
+        </Modal>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/Header/SidebarDatasetHeaderSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/Header/SidebarDatasetHeaderSection.tsx
new file mode 100644
index 00000000000000..06ba4be0fd589c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/Header/SidebarDatasetHeaderSection.tsx
@@ -0,0 +1,158 @@
+import { Tooltip } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+
+import { useEntityData } from '../../../../../../../entity/shared/EntityContext';
+import CompactContext from '../../../../../../../shared/CompactContext';
+import { formatBytes, formatNumber, formatNumberWithoutAbbreviation } from '../../../../../../../shared/formatNumber';
+import { REDESIGN_COLORS } from '../../../../../constants';
+import { getPopularityColumn, SidebarStatsColumn } from '../../../utils';
+import SidebarTopUsersHeaderSection from '../../shared/SidebarTopUsersHeaderSection';
+import { getDatasetPopularityTier, isValuePresent, userExists } from '../../shared/utils';
+import { SidebarHeaderSectionColumns } from '../../SidebarHeaderSectionColumns';
+
+const StatContent = styled.div`
+    color: ${REDESIGN_COLORS.FOUNDATION_BLUE_4};
+    font-size: 12px;
+    font-weight: 600;
+`;
+
+const SidebarDatasetHeaderSection = () => {
+    const { entityData } = useEntityData();
+    const dataset = entityData as any;
+
+    const isCompact = React.useContext(CompactContext);
+
+    const columns: SidebarStatsColumn[] = [];
+
+    const latestFullTableProfile = dataset?.latestFullTableProfile?.[0];
+    const latestPartitionProfile = dataset?.latestPartitionProfile?.[0];
+
+    const maybeLastProfile = latestFullTableProfile || latestPartitionProfile || undefined;
+
+    /**
+     * Popularity tab
+     */
+    const popularityColumn = getPopularityColumn(
+        getDatasetPopularityTier(
+            dataset?.statsSummary?.queryCountPercentileLast30Days,
+            dataset?.statsSummary?.uniqueUserPercentileLast30Days,
+        ),
+    );
+    if (popularityColumn) {
+        columns.push(popularityColumn);
+    }
+
+    /**
+     * Top users tab
+     */
+    if (
+        dataset?.statsSummary?.topUsersLast30Days &&
+        dataset?.statsSummary?.topUsersLast30Days?.find((user) => userExists(user))
+    ) {
+        columns.push({
+            title: 'Top Users',
+            content: (
+                <Tooltip showArrow={false} title="Top users over the past 30 days">
+                    <SidebarTopUsersHeaderSection />
+                </Tooltip>
+            ),
+        });
+    }
+
+    /**
+     * Queries column
+     */
+    if (dataset?.statsSummary?.queryCountLast30Days) {
+        columns.push({
+            title: 'Queries',
+            content: (
+                <Tooltip
+                    showArrow={false}
+                    title={`${formatNumberWithoutAbbreviation(
+                        dataset?.statsSummary?.queryCountLast30Days,
+                    )} queries over the past 30 days`}
+                >
+                    <StatContent>{formatNumber(dataset?.statsSummary?.queryCountLast30Days)} queries</StatContent>
+                </Tooltip>
+            ),
+        });
+    }
+
+    /**
+     * Users column
+     */
+    if (dataset?.statsSummary?.uniqueUserCountLast30Days) {
+        columns.push({
+            title: 'Users',
+            content: (
+                <Tooltip
+                    showArrow={false}
+                    title={`${formatNumberWithoutAbbreviation(
+                        dataset?.statsSummary?.uniqueUserCountLast30Days,
+                    )} users over the past 30 days`}
+                >
+                    <StatContent>{formatNumber(dataset?.statsSummary?.uniqueUserCountLast30Days)} users</StatContent>
+                </Tooltip>
+            ),
+        });
+    }
+
+    /**
+     * Rows column
+     */
+    if (isValuePresent(maybeLastProfile?.rowCount)) {
+        columns.push({
+            title: 'Rows',
+            content: (
+                <Tooltip
+                    showArrow={false}
+                    title={`${formatNumberWithoutAbbreviation(maybeLastProfile?.rowCount)} rows`}
+                >
+                    <StatContent>{formatNumber(maybeLastProfile?.rowCount)} rows</StatContent>
+                </Tooltip>
+            ),
+        });
+    }
+
+    /**
+     * Column column
+     */
+    if (isValuePresent(maybeLastProfile?.columnCount)) {
+        columns.push({
+            title: 'Columns',
+            content: <StatContent>{formatNumber(maybeLastProfile?.columnCount)} columns</StatContent>,
+        });
+    }
+
+    /**
+     * Size column
+     */
+    if (isValuePresent(maybeLastProfile?.sizeInBytes)) {
+        const formattedBytes = formatBytes(maybeLastProfile?.sizeInBytes, 0);
+        const { number, unit } = formattedBytes;
+        columns.push({
+            title: 'Size',
+            content: (
+                <Tooltip
+                    showArrow={false}
+                    title={`Consumes ${formatNumberWithoutAbbreviation(
+                        maybeLastProfile?.sizeInBytes,
+                    )} bytes of storage.`}
+                >
+                    <StatContent>
+                        {number} {unit}
+                    </StatContent>
+                </Tooltip>
+            ),
+        });
+    }
+
+    if (!columns.length && !isCompact) {
+        return null;
+    }
+
+    return <SidebarHeaderSectionColumns columns={columns} />;
+};
+
+export default SidebarDatasetHeaderSection;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/StatsSidebarSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/StatsSidebarSection.tsx
new file mode 100644
index 00000000000000..9eadf1a8a1a79a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/StatsSidebarSection.tsx
@@ -0,0 +1,134 @@
+import { Button, Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { GetDatasetQuery } from '../../../../../../../graphql/dataset.generated';
+import { Operation, UsageQueryResult } from '../../../../../../../types.generated';
+import { useBaseEntity, useRouteToTab } from '../../../../../../entity/shared/EntityContext';
+import { formatNumberWithoutAbbreviation } from '../../../../../../shared/formatNumber';
+import UsageFacepile from '../../../../../dataset/profile/UsageFacepile';
+import { InfoItem } from '../../../../components/styled/InfoItem';
+import { ANTD_GRAY } from '../../../../constants';
+import { SidebarHeader } from '../SidebarHeader';
+
+const HeaderInfoBody = styled(Typography.Text)`
+    font-size: 16px;
+    color: ${ANTD_GRAY[9]};
+`;
+
+const HeaderContainer = styled.div`
+    justify-content: space-between;
+    display: flex;
+`;
+
+const StatsButton = styled(Button)`
+    margin-top: -4px;
+`;
+
+const StatsRow = styled.div`
+    padding-top: 12px;
+    padding-bottom: 12px;
+`;
+
+const INFO_ITEM_WIDTH_PX = '150px';
+const LAST_UPDATED_WIDTH_PX = '220px';
+
+export const SidebarStatsSection = () => {
+    const baseEntity = useBaseEntity<GetDatasetQuery>();
+
+    const toLocalDateTimeString = (time: number) => {
+        const date = new Date(time);
+        return date.toLocaleString([], {
+            year: 'numeric',
+            month: 'numeric',
+            day: 'numeric',
+            hour: '2-digit',
+            minute: '2-digit',
+            timeZoneName: 'short',
+        });
+    };
+
+    const latestFullTableProfile = baseEntity?.dataset?.latestFullTableProfile?.[0];
+    const latestPartitionProfile = baseEntity?.dataset?.latestPartitionProfile?.[0];
+
+    const hasUsageStats = baseEntity?.dataset?.usageStats !== undefined;
+    const hasOperations = (baseEntity?.dataset?.operations?.length || 0) > 0;
+
+    const usageStats = (hasUsageStats && (baseEntity?.dataset?.usageStats as UsageQueryResult)) || undefined;
+    const latestProfile = latestFullTableProfile || latestPartitionProfile;
+
+    const operations = (hasOperations && (baseEntity?.dataset?.operations as Array<Operation>)) || undefined;
+    const latestOperation = operations && operations[0];
+
+    const lastUpdatedTime = latestOperation && toLocalDateTimeString(latestOperation?.lastUpdatedTimestamp);
+
+    const hasUsageStatsAggregations =
+        usageStats?.aggregations?.totalSqlQueries || (usageStats?.aggregations?.users?.length || 0) > 0;
+    const hasLatestProfiles = latestProfile?.rowCount || latestProfile?.columnCount;
+    const hasLatestOperation = latestOperation?.timestampMillis;
+    const routeToTab = useRouteToTab();
+
+    return (
+        <div>
+            <HeaderContainer>
+                <SidebarHeader title="Stats" />
+                <StatsButton onClick={() => routeToTab({ tabName: 'Stats' })} type="link">
+                    More stats &gt;
+                </StatsButton>
+            </HeaderContainer>
+            {/* Dataset Profile Entry */}
+            {hasLatestProfiles && (
+                <StatsRow>
+                    {latestProfile?.rowCount ? (
+                        <InfoItem
+                            title="Rows"
+                            onClick={() => routeToTab({ tabName: 'Queries' })}
+                            width={INFO_ITEM_WIDTH_PX}
+                        >
+                            <HeaderInfoBody>{formatNumberWithoutAbbreviation(latestProfile?.rowCount)}</HeaderInfoBody>
+                        </InfoItem>
+                    ) : null}
+                    {latestProfile?.columnCount ? (
+                        <InfoItem title="Columns" width={INFO_ITEM_WIDTH_PX}>
+                            <HeaderInfoBody>{latestProfile?.columnCount}</HeaderInfoBody>
+                        </InfoItem>
+                    ) : null}
+                </StatsRow>
+            )}
+            {/* Usage Stats Entry */}
+            {hasUsageStatsAggregations && (
+                <StatsRow>
+                    {usageStats?.aggregations?.totalSqlQueries ? (
+                        <InfoItem
+                            title="Monthly Queries"
+                            onClick={() => routeToTab({ tabName: 'Queries' })}
+                            width={INFO_ITEM_WIDTH_PX}
+                        >
+                            <HeaderInfoBody>
+                                {usageStats?.aggregations?.totalSqlQueries
+                                    ? formatNumberWithoutAbbreviation(usageStats?.aggregations?.totalSqlQueries)
+                                    : null}
+                            </HeaderInfoBody>
+                        </InfoItem>
+                    ) : null}
+                    {(usageStats?.aggregations?.users?.length || 0) > 0 ? (
+                        <InfoItem title="Top Users" width={INFO_ITEM_WIDTH_PX}>
+                            <UsageFacepile users={usageStats?.aggregations?.users} maxNumberDisplayed={10} />
+                        </InfoItem>
+                    ) : null}
+                </StatsRow>
+            )}
+            {/* Operation Entry */}
+            {hasLatestOperation ? (
+                <StatsRow>
+                    <InfoItem
+                        title="Last Updated"
+                        onClick={() => routeToTab({ tabName: 'Queries' })}
+                        width={LAST_UPDATED_WIDTH_PX}
+                    >
+                        <HeaderInfoBody>{lastUpdatedTime}</HeaderInfoBody>
+                    </InfoItem>
+                </StatsRow>
+            ) : null}
+        </div>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection.tsx
new file mode 100644
index 00000000000000..11e7f3f7226ed0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection.tsx
@@ -0,0 +1,57 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Button, Typography } from 'antd';
+import { GetDatasetQuery } from '../../../../../../../../graphql/dataset.generated';
+import { InfoItem } from '../../../../../components/styled/InfoItem';
+import { ANTD_GRAY } from '../../../../../constants';
+import { useBaseEntity, useRouteToTab } from '../../../../../../../entity/shared/EntityContext';
+import { SidebarSection } from '../../SidebarSection';
+
+const HeaderInfoBody = styled(Typography.Text)`
+    font-size: 16px;
+    color: ${ANTD_GRAY[9]};
+`;
+
+const StatsButton = styled(Button)`
+    && {
+        margin: 0px;
+        padding: 0px;
+    }
+`;
+
+const InfoRow = styled.div`
+    padding-top: 8px;
+    padding-bottom: 8px;
+`;
+
+const INFO_ITEM_WIDTH_PX = '150px';
+
+export const SidebarViewDefinitionSection = () => {
+    const baseEntity = useBaseEntity<GetDatasetQuery>();
+
+    const materialized = baseEntity?.dataset?.viewProperties?.materialized;
+    const language = baseEntity?.dataset?.viewProperties?.language || 'UNKNOWN';
+
+    const routeToTab = useRouteToTab();
+
+    return (
+        <SidebarSection
+            title="Definition"
+            content={
+                <>
+                    <InfoRow>
+                        <InfoItem title="Materialized" width={INFO_ITEM_WIDTH_PX}>
+                            <HeaderInfoBody>{materialized ? 'True' : 'False'}</HeaderInfoBody>
+                        </InfoItem>
+                        <InfoItem title="Language" width={INFO_ITEM_WIDTH_PX}>
+                            <HeaderInfoBody>{language.toUpperCase()}</HeaderInfoBody>
+                        </InfoItem>
+                    </InfoRow>
+                    <StatsButton onClick={() => routeToTab({ tabName: 'View Definition' })} type="link">
+                        View full definition &gt;
+                    </StatsButton>
+                </>
+            }
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SetDomainModal.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SetDomainModal.tsx
new file mode 100644
index 00000000000000..ac86118f028a08
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SetDomainModal.tsx
@@ -0,0 +1,210 @@
+import React, { useRef, useState } from 'react';
+import { Button, Form, message, Modal, Select, Empty } from 'antd';
+import { getModalDomContainer } from '@src/utils/focus';
+import { useGetAutoCompleteResultsLazyQuery } from '../../../../../../../graphql/search.generated';
+import { Domain, Entity, EntityType } from '../../../../../../../types.generated';
+import { useBatchSetDomainMutation } from '../../../../../../../graphql/mutations.generated';
+import domainAutocompleteOptions from '../../../../../../domainV2/DomainAutocompleteOptions';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+import { useEnterKeyListener } from '../../../../../../shared/useEnterKeyListener';
+import { handleBatchError } from '../../../../utils';
+import { BrowserWrapper } from '../../../../../../shared/tags/AddTagsTermsModal';
+import DomainNavigator from '../../../../../../domain/nestedDomains/domainNavigator/DomainNavigator';
+import ClickOutside from '../../../../../../shared/ClickOutside';
+import { ANTD_GRAY } from '../../../../constants';
+
+type Props = {
+    urns: string[];
+    onCloseModal: () => void;
+    refetch?: () => Promise<any>;
+    defaultValue?: { urn: string; entity?: Entity | null };
+    onOkOverride?: (result: string) => void;
+    titleOverride?: string;
+};
+
+type SelectedDomain = {
+    displayName: string;
+    type: EntityType;
+    urn: string;
+};
+
+export const SetDomainModal = ({ urns, onCloseModal, refetch, defaultValue, onOkOverride, titleOverride }: Props) => {
+    const entityRegistry = useEntityRegistry();
+    const [isFocusedOnInput, setIsFocusedOnInput] = useState(false);
+    const [inputValue, setInputValue] = useState('');
+    const [selectedDomain, setSelectedDomain] = useState<SelectedDomain | undefined>(
+        defaultValue
+            ? {
+                  displayName: entityRegistry.getDisplayName(EntityType.Domain, defaultValue?.entity),
+                  type: EntityType.Domain,
+                  urn: defaultValue?.urn,
+              }
+            : undefined,
+    );
+    const [domainSearch, { data: domainSearchData, loading: searchLoading }] = useGetAutoCompleteResultsLazyQuery();
+    const domainSearchResults: Entity[] = domainSearchData?.autoComplete?.entities || [];
+
+    const [batchSetDomainMutation] = useBatchSetDomainMutation();
+    const inputEl = useRef(null);
+    const isShowingDomainNavigator = !inputValue && isFocusedOnInput;
+
+    const onModalClose = () => {
+        setInputValue('');
+        setSelectedDomain(undefined);
+        onCloseModal();
+    };
+
+    const handleSearch = (text: string) => {
+        console.log('Not calling search');
+        if (text) {
+            domainSearch({
+                variables: {
+                    input: {
+                        type: EntityType.Domain,
+                        query: text,
+                        limit: 5,
+                    },
+                },
+            });
+        }
+    };
+
+    const domainResult = !inputValue.length ? [] : domainSearchResults;
+
+    const onSelectDomain = (newUrn: string) => {
+        if (inputEl && inputEl.current) {
+            (inputEl.current as any).blur();
+        }
+        const filteredDomains = domainResult?.filter((entity) => entity.urn === newUrn).map((entity) => entity) || [];
+        if (filteredDomains.length) {
+            const domain = filteredDomains[0];
+            setSelectedDomain({
+                displayName: entityRegistry.getDisplayName(EntityType.Domain, domain),
+                type: EntityType.Domain,
+                urn: newUrn,
+            });
+        }
+    };
+
+    function selectDomainFromBrowser(domain: Domain) {
+        setIsFocusedOnInput(false);
+        setSelectedDomain({
+            displayName: entityRegistry.getDisplayName(EntityType.Domain, domain),
+            type: EntityType.Domain,
+            urn: domain.urn,
+        });
+    }
+
+    const onDeselectDomain = () => {
+        setInputValue('');
+        setSelectedDomain(undefined);
+    };
+
+    const onOk = () => {
+        if (!selectedDomain) {
+            return;
+        }
+
+        if (onOkOverride) {
+            onOkOverride(selectedDomain?.urn);
+            return;
+        }
+
+        batchSetDomainMutation({
+            variables: {
+                input: {
+                    resources: [...urns.map((urn) => ({ resourceUrn: urn }))],
+                    domainUrn: selectedDomain.urn,
+                },
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.success({ content: 'Updated Domain!', duration: 2 });
+                    refetch?.();
+                    onModalClose();
+                    setSelectedDomain(undefined);
+                }
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error(
+                    handleBatchError(urns, e, {
+                        content: `Failed to add assets to Domain: \n ${e.message || ''}`,
+                        duration: 3,
+                    }),
+                );
+            });
+    };
+
+    const selectValue = (selectedDomain && [selectedDomain?.displayName]) || undefined;
+
+    // Handle the Enter press
+    useEnterKeyListener({
+        querySelectorToExecuteClick: '#setDomainButton',
+    });
+
+    function handleBlur() {
+        setInputValue('');
+    }
+
+    function handleClickOutside() {
+        // delay closing the domain navigator so we don't get a UI "flash" between showing search results and navigator
+        setTimeout(() => setIsFocusedOnInput(false), 0);
+    }
+
+    return (
+        <Modal
+            title={titleOverride || 'Set Domain'}
+            open
+            onCancel={onModalClose}
+            footer={
+                <>
+                    <Button onClick={onModalClose} type="text">
+                        Cancel
+                    </Button>
+                    <Button type="primary" id="setDomainButton" disabled={selectedDomain === undefined} onClick={onOk}>
+                        Save
+                    </Button>
+                </>
+            }
+            getContainer={getModalDomContainer}
+        >
+            <Form component={false}>
+                <Form.Item>
+                    <ClickOutside onClickOutside={handleClickOutside}>
+                        <Select
+                            autoFocus
+                            showSearch
+                            filterOption={false}
+                            defaultActiveFirstOption={false}
+                            placeholder="Search for Domains..."
+                            onSelect={(domainUrn: any) => onSelectDomain(domainUrn)}
+                            onDeselect={onDeselectDomain}
+                            onSearch={(value: string) => {
+                                handleSearch(value.trim());
+                                setInputValue(value.trim());
+                            }}
+                            ref={inputEl}
+                            value={selectValue}
+                            onBlur={handleBlur}
+                            onFocus={() => setIsFocusedOnInput(true)}
+                            dropdownStyle={isShowingDomainNavigator ? { display: 'none' } : {}}
+                            notFoundContent={
+                                <Empty
+                                    description="No Domains Found"
+                                    image={Empty.PRESENTED_IMAGE_SIMPLE}
+                                    style={{ color: ANTD_GRAY[7] }}
+                                />
+                            }
+                            options={domainAutocompleteOptions(domainResult, searchLoading, entityRegistry)}
+                        />
+                        <BrowserWrapper isHidden={!isShowingDomainNavigator}>
+                            <DomainNavigator selectDomainOverride={selectDomainFromBrowser} />
+                        </BrowserWrapper>
+                    </ClickOutside>
+                </Form.Item>
+            </Form>
+        </Modal>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDataProductsSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDataProductsSection.tsx
new file mode 100644
index 00000000000000..0a01619533d310
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDataProductsSection.tsx
@@ -0,0 +1,76 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { useHistory } from 'react-router';
+import { useEntityData } from '../../../../../../entity/shared/EntityContext';
+import { SidebarSection } from '../SidebarSection';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+import { navigateToDomainDataProducts } from './utils';
+import { pluralize } from '../../../../../../shared/textUtil';
+import EmptySectionText from '../EmptySectionText';
+import { REDESIGN_COLORS } from '../../../../constants';
+
+const Section = styled.div`
+    display: flex;
+    align-items: start;
+    justify-content: start;
+    flex-wrap: wrap;
+    text-wrap: wrap;
+`;
+
+const SummaryText = styled.div``;
+
+const ViewAllButton = styled.div`
+    display: flex;
+    align-items: center;
+    font-weight: bold;
+    padding: 0px 2px;
+    margin-left: 8px;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    :hover {
+        cursor: pointer;
+    }
+`;
+
+const SidebarDataProductsSection = () => {
+    const { urn, entityType, entityData } = useEntityData();
+    const entityRegistry = useEntityRegistry();
+    const history = useHistory();
+
+    const domain = entityData as any;
+    const productsCount = domain?.dataProducts?.total || 0;
+    const hasProducts = productsCount > 0;
+
+    if (!hasProducts) {
+        return null;
+    }
+
+    return (
+        <SidebarSection
+            title="Data Products"
+            key="Data Products"
+            content={
+                <>
+                    {(hasProducts && (
+                        <>
+                            <Section>
+                                <SummaryText>
+                                    {productsCount}
+                                    {pluralize(productsCount, 'data product')}
+                                </SummaryText>
+                                <ViewAllButton
+                                    onClick={() =>
+                                        navigateToDomainDataProducts(urn, entityType, history, entityRegistry)
+                                    }
+                                >
+                                    View all
+                                </ViewAllButton>
+                            </Section>
+                        </>
+                    )) || <EmptySectionText message="No products yet" />}
+                </>
+            }
+        />
+    );
+};
+
+export default SidebarDataProductsSection;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection.tsx
new file mode 100644
index 00000000000000..0ed70ac1308f63
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection.tsx
@@ -0,0 +1,125 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { Modal, message } from 'antd';
+import AddRoundedIcon from '@mui/icons-material/AddRounded';
+import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
+import { EMPTY_MESSAGES } from '../../../../constants';
+import { useEntityData, useMutationUrn, useRefetch } from '../../../../../../entity/shared/EntityContext';
+import { SetDomainModal } from './SetDomainModal';
+import { useUnsetDomainMutation } from '../../../../../../../graphql/mutations.generated';
+import { DomainLink } from '../../../../../../sharedV2/tags/DomainLink';
+import { ENTITY_PROFILE_DOMAINS_ID } from '../../../../../../onboarding/config/EntityProfileOnboardingConfig';
+import { SidebarSection } from '../SidebarSection';
+import SectionActionButton from '../SectionActionButton';
+import EmptySectionText from '../EmptySectionText';
+
+const Content = styled.div`
+    display: flex;
+    align-items: start;
+    justify-content: start;
+    flex-wrap: wrap;
+    text-wrap: wrap;
+`;
+
+const DomainLinkWrapper = styled.div`
+    margin-right: 12px;
+    display: flex;
+    align-items: center;
+`;
+
+interface PropertiesProps {
+    updateOnly?: boolean;
+}
+
+interface Props {
+    readOnly?: boolean;
+    properties?: PropertiesProps;
+}
+
+export const SidebarDomainSection = ({ readOnly, properties }: Props) => {
+    const updateOnly = properties?.updateOnly;
+    const { entityData } = useEntityData();
+    const refetch = useRefetch();
+    const urn = useMutationUrn();
+    const [unsetDomainMutation] = useUnsetDomainMutation();
+    const [showModal, setShowModal] = useState(false);
+    const domain = entityData?.domain?.domain;
+
+    const canEditDomains = !!entityData?.privileges?.canEditDomains;
+
+    const removeDomain = (urnToRemoveFrom) => {
+        unsetDomainMutation({ variables: { entityUrn: urnToRemoveFrom } })
+            .then(() => {
+                message.success({ content: 'Removed Domain.', duration: 2 });
+                refetch?.();
+            })
+            .catch((e: unknown) => {
+                message.destroy();
+                if (e instanceof Error) {
+                    message.error({ content: `Failed to remove domain: \n ${e.message || ''}`, duration: 3 });
+                }
+            });
+    };
+
+    const onRemoveDomain = (urnToRemoveFrom) => {
+        Modal.confirm({
+            title: `Confirm Domain Removal`,
+            content: `Are you sure you want to remove this domain?`,
+            onOk() {
+                removeDomain(urnToRemoveFrom);
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
+    return (
+        <div id={ENTITY_PROFILE_DOMAINS_ID} className="sidebar-domain-section">
+            <SidebarSection
+                title="Domain"
+                content={
+                    <Content>
+                        {domain && (
+                            <DomainLinkWrapper>
+                                <DomainLink
+                                    domain={domain}
+                                    closable={!readOnly && !updateOnly}
+                                    readOnly={readOnly}
+                                    onClose={(e) => {
+                                        e.preventDefault();
+                                        onRemoveDomain(entityData?.domain?.associatedUrn);
+                                    }}
+                                    fontSize={12}
+                                />
+                            </DomainLinkWrapper>
+                        )}
+                        {(!domain || !!updateOnly) && (
+                            <>{!domain && <EmptySectionText message={EMPTY_MESSAGES.domain.title} />}</>
+                        )}
+                    </Content>
+                }
+                extra={
+                    <SectionActionButton
+                        button={domain ? <EditOutlinedIcon /> : <AddRoundedIcon />}
+                        onClick={(event) => {
+                            setShowModal(true);
+                            event.stopPropagation();
+                        }}
+                        actionPrivilege={canEditDomains}
+                    />
+                }
+            />
+            {showModal && (
+                <SetDomainModal
+                    urns={[urn]}
+                    refetch={refetch}
+                    onCloseModal={() => {
+                        setShowModal(false);
+                    }}
+                />
+            )}
+        </div>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarEntitiesLoadingSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarEntitiesLoadingSection.tsx
new file mode 100644
index 00000000000000..df1e94b02e3ed2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarEntitiesLoadingSection.tsx
@@ -0,0 +1,10 @@
+import React from 'react';
+import { Spin } from 'antd';
+import { LoadingOutlined } from '@ant-design/icons';
+import { ANTD_GRAY } from '../../../../constants';
+
+const SidebarEntitiesLoadingSection = () => {
+    return <Spin indicator={<LoadingOutlined style={{ color: ANTD_GRAY[7] }} />} />;
+};
+
+export default SidebarEntitiesLoadingSection;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarEntitiesSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarEntitiesSection.tsx
new file mode 100644
index 00000000000000..1cce433701e446
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarEntitiesSection.tsx
@@ -0,0 +1,91 @@
+import React, { useEffect } from 'react';
+import styled from 'styled-components/macro';
+import { useHistory } from 'react-router';
+import { useEntityContext, useEntityData } from '../../../../../../entity/shared/EntityContext';
+import { SidebarSection } from '../SidebarSection';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+import { getContentsSummary, getContentsSummaryText, navigateToDomainEntities } from './utils';
+import { useGetDomainEntitySummaryQuery } from '../../../../../../../graphql/domain.generated';
+import SidebarEntitiesLoadingSection from './SidebarEntitiesLoadingSection';
+import EmptySectionText from '../EmptySectionText';
+import { REDESIGN_COLORS } from '../../../../constants';
+
+const Section = styled.div`
+    display: flex;
+    align-items: start;
+    justify-content: start;
+    flex-wrap: wrap;
+`;
+
+const SummaryText = styled.div`
+    margin-right: 8px;
+    text-wrap: wrap;
+`;
+
+const ViewAllButton = styled.div`
+    display: flex;
+    align-items: center;
+    font-weight: bold;
+    padding: 0px 2px;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    :hover {
+        cursor: pointer;
+    }
+`;
+
+const SidebarEntitiesSection = () => {
+    const { urn, entityType } = useEntityData();
+    const entityRegistry = useEntityRegistry();
+    const { entityState } = useEntityContext();
+    const history = useHistory();
+    const { data, loading, refetch } = useGetDomainEntitySummaryQuery({
+        variables: {
+            urn,
+        },
+    });
+
+    const shouldRefetch = entityState?.shouldRefetchContents;
+    useEffect(() => {
+        if (shouldRefetch) {
+            refetch();
+            entityState?.setShouldRefetchContents(false);
+        }
+    }, [shouldRefetch, entityState, refetch]);
+
+    const contentsSummary = data?.aggregateAcrossEntities && getContentsSummary(data.aggregateAcrossEntities as any);
+    const contentsCount = contentsSummary?.total || 0;
+    const hasContents = contentsCount > 0;
+
+    return (
+        <SidebarSection
+            title="Contents"
+            key="Contents"
+            content={
+                <>
+                    {loading && <SidebarEntitiesLoadingSection />}
+                    {!loading &&
+                        (hasContents ? (
+                            <>
+                                <Section>
+                                    <SummaryText>
+                                        {getContentsSummaryText(contentsSummary as any, entityRegistry)}
+                                    </SummaryText>
+                                    <ViewAllButton
+                                        onClick={() =>
+                                            navigateToDomainEntities(urn, entityType, history, entityRegistry)
+                                        }
+                                    >
+                                        View all
+                                    </ViewAllButton>
+                                </Section>
+                            </>
+                        ) : (
+                            <EmptySectionText message="No contents yet" />
+                        ))}
+                </>
+            }
+        />
+    );
+};
+
+export default SidebarEntitiesSection;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/utils.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/utils.tsx
new file mode 100644
index 00000000000000..b29dac61356ba7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/utils.tsx
@@ -0,0 +1,137 @@
+import React from 'react';
+import styled from 'styled-components';
+import * as QueryString from 'query-string';
+import { AggregationMetadata, EntityType, FacetMetadata, SearchResults } from '../../../../../../../types.generated';
+import filtersToQueryStringParams from '../../../../../../search/utils/filtersToQueryStringParams';
+import { pluralize } from '../../../../../../shared/textUtil';
+import { EntityRegistry } from '../../../../../../../entityRegistryContext';
+import { ANTD_GRAY } from '../../../../constants';
+
+const UNIT_SEPARATOR = '␞';
+
+const SummaryText = styled.span`
+    color: ${ANTD_GRAY[7]};
+`;
+
+export type ContentTypeSummary = {
+    entityType: EntityType;
+    type?: string;
+    count: number;
+};
+
+export type ContentsSummary = {
+    total: number;
+    types: ContentTypeSummary[];
+};
+
+const mergeEntityTypeSubTypeAggregations = (
+    entityTypeTotals: Map<EntityType, any>,
+    subTypeAggregations?: FacetMetadata,
+) => {
+    const typeToSummary = new Map();
+    Array.from(entityTypeTotals.keys()).forEach((key) => {
+        typeToSummary.set(key, { count: entityTypeTotals.get(key), entityType: key });
+    });
+
+    // Iterate through sub-type aggregations, add them, and subtract the total from the corresponding entity type.
+    subTypeAggregations?.aggregations?.forEach((agg) => {
+        const { value } = agg;
+        const values = value.split(UNIT_SEPARATOR);
+        const entityType = values[0];
+        const subType = values.length > 1 ? values[1] : undefined;
+        if (subType) {
+            typeToSummary.set(subType, { count: agg.count, entityType, type: subType });
+            if (typeToSummary.has(entityType)) {
+                const entityTypeValue = typeToSummary.get(entityType);
+                const newCount = entityTypeValue.count - agg.count;
+                typeToSummary.set(entityType, {
+                    ...entityTypeValue,
+                    count: newCount,
+                });
+            }
+        }
+    });
+    return Array.from(typeToSummary.keys())
+        .map((key) => ({
+            entityType: typeToSummary.get(key).entityType,
+            type: typeToSummary.get(key).type,
+            count: typeToSummary.get(key).count,
+        }))
+        .filter((entry) => entry.count > 0)
+        .sort((a, b) => b.count - a.count);
+};
+
+const getContentCountsByEntityType = (aggregations: AggregationMetadata[]): Map<EntityType, any> => {
+    const result = new Map();
+    aggregations.forEach((agg) => {
+        result.set(agg.value, agg.count);
+    });
+    return result;
+};
+
+const getContentCountsByType = (results: SearchResults) => {
+    const entityTypeAggregations = results.facets?.find((facet) => facet.field === '_entityType');
+    const entityTypeTotals =
+        (entityTypeAggregations && getContentCountsByEntityType(entityTypeAggregations.aggregations)) || new Map();
+    const subTypeAggregations = results.facets?.find((facet) => facet.field === '_entityType␞typeNames');
+    const result = mergeEntityTypeSubTypeAggregations(entityTypeTotals, subTypeAggregations);
+    return {
+        types: result,
+        total: result.reduce((accumulator, entry) => accumulator + entry.count, 0),
+    };
+};
+
+export const getContentsSummary = (contents: SearchResults): ContentsSummary => {
+    return getContentCountsByType(contents);
+};
+
+export const getContentsSummaryText = (summary: ContentsSummary, entityRegistry: EntityRegistry): React.ReactNode => {
+    return (
+        <>
+            {summary.types.map((type, idx) => {
+                return (
+                    <SummaryText key={type.entityType}>
+                        {type.count}{' '}
+                        {pluralize(
+                            type.count,
+                            !type.type
+                                ? (entityRegistry.getEntityName(type.entityType as EntityType) as any)
+                                : type.type,
+                        ).toLocaleLowerCase()}
+                        {idx < summary.types.length - 1 && <>, </>}
+                    </SummaryText>
+                );
+            })}
+        </>
+    );
+};
+
+export const navigateToDomainEntities = (urn, type, history, entityRegistry) => {
+    history.push(`${entityRegistry.getEntityUrl(type, urn)}/Assets`);
+};
+
+export function getDomainEntitiesFilterUrl(urn, type, entityRegistry, types, subTypes): string {
+    const filters = [
+        {
+            field: '_entityType',
+            values: types,
+            negated: false,
+        },
+    ];
+
+    if (subTypes) {
+        filters.push({
+            field: 'typeNames',
+            values: subTypes,
+            negated: false,
+        });
+    }
+
+    const search = QueryString.stringify(filtersToQueryStringParams(filters), { arrayFormat: 'comma' });
+
+    return `${entityRegistry.getEntityUrl(type, urn)}/Assets?${search}`;
+}
+
+export const navigateToDomainDataProducts = (urn, type, history, entityRegistry, isAdd = false) => {
+    history.push(`${entityRegistry.getEntityUrl(type, urn)}/Data Products${isAdd ? '?createModal=true' : ''}`);
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EmptySectionText.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EmptySectionText.tsx
new file mode 100644
index 00000000000000..fb8bdfed8d586d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EmptySectionText.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { REDESIGN_COLORS } from '../../../constants';
+
+const EmptyContentMessage = styled(Typography.Text)`
+    font-size: 12px;
+    font-weight: 400;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    opacity: 0.5;
+`;
+
+type Props = {
+    message: string;
+};
+
+const EmptySectionText = ({ message }: Props) => {
+    return <EmptyContentMessage type="secondary">{message}.</EmptyContentMessage>;
+};
+
+export default EmptySectionText;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityBackButton.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityBackButton.tsx
new file mode 100644
index 00000000000000..92ae03ca5fa953
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityBackButton.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import { useHistory } from 'react-router';
+import { BackButton } from '../../../../../sharedV2/buttons/BackButton';
+
+export const EntityBackButton = () => {
+    const history = useHistory();
+
+    // Temporary hack.
+    const hasHistory = (history as any)?.length > 2;
+
+    const onGoBack = () => {
+        // TODO: Create a proper navigation history provider.
+        // This can result in strange behavior when accessing via direct link.
+        // Should do this before we merge.
+        // PRD-766
+        (history as any).goBack();
+    };
+
+    if (!hasHistory) {
+        // No button to show.
+        return null;
+    }
+
+    return <BackButton onGoBack={onGoBack} />;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityInfo/EntityInfo.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityInfo/EntityInfo.tsx
new file mode 100644
index 00000000000000..ca28767a61e89c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityInfo/EntityInfo.tsx
@@ -0,0 +1,66 @@
+import Link from 'antd/lib/typography/Link';
+import React from 'react';
+import styled from 'styled-components';
+import PlatformContent from '../../header/PlatformContent';
+import { useEntityData } from '../../../../../../entity/shared/EntityContext';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+import { StyledDivider } from '../FormInfo/components';
+import { DatasetStatsSummarySubHeader } from '../../../../../dataset/profile/stats/stats/DatasetStatsSummarySubHeader';
+import LinkOut from '../../../../../../../images/link-out.svg?react';
+import FormInfo from '../FormInfo/FormInfo';
+
+const EntityName = styled.div`
+    font-size: 16px;
+    font-weight: 700;
+    line-height: 24px;
+    margin-bottom: 8px;
+`;
+
+const EntityInfoWrapper = styled.div`
+    padding-top: 20px;
+`;
+
+const StyledLink = styled(Link)`
+    font-size: 14px;
+    line-height: 18px;
+    display: inline-flex;
+    align-items: center;
+
+    svg {
+        height: 14px;
+        width: 14px;
+    }
+`;
+
+const FormInfoWrapper = styled.div`
+    margin-top: 12px;
+`;
+
+interface Props {
+    formUrn: string;
+}
+
+export default function EntityInfo({ formUrn }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const { entityType, entityData } = useEntityData();
+    const entityName = entityData ? entityRegistry.getDisplayName(entityType, entityData) : '';
+
+    return (
+        <EntityInfoWrapper>
+            <PlatformContent />
+            <EntityName>{entityName}</EntityName>
+            <StyledLink
+                href={`${entityRegistry.getEntityUrl(entityType, entityData?.urn || '')}/`}
+                target="_blank"
+                rel="noreferrer noopener"
+            >
+                View Profile <LinkOut style={{ marginLeft: '4px' }} />
+            </StyledLink>
+            <DatasetStatsSummarySubHeader />
+            <FormInfoWrapper>
+                <FormInfo formUrn={formUrn} />
+            </FormInfoWrapper>
+            <StyledDivider />
+        </EntityInfoWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebar.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebar.tsx
new file mode 100644
index 00000000000000..0891f805b121be
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebar.tsx
@@ -0,0 +1,176 @@
+/* eslint-disable prefer-template */
+import React, { useContext, useState } from 'react';
+import styled from 'styled-components';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import EntitySidebarContext from '../../../../../sharedV2/EntitySidebarContext';
+import { SEARCH_COLORS } from '../../../constants';
+import { EntitySidebarTab, TabContextType, TabRenderType } from '../../../types';
+import { EntitySidebarTabs } from './EntitySidebarTabs';
+import SidebarCollapsibleHeader from './SidebarCollapsibleHeader';
+import { EntityMenuItems } from '../../../EntityDropdown/EntityMenuActions';
+
+export const StyledEntitySidebarContainer = styled.div<{
+    isCollapsed: boolean;
+    $width?: number;
+    backgroundColor?: string;
+    isFocused?: boolean;
+    $isShowNavBarRedesign?: boolean;
+}>`
+    flex: 1;
+    overflow: auto;
+    box-shadow: ${(props) =>
+        props.$isShowNavBarRedesign
+            ? props.theme.styles['box-shadow-navbar-redesign']
+            : '0px 0px 6px 0px rgba(93, 102, 139, 0.2)'};
+    ${(props) => !props.isCollapsed && props.$width && `min-width: ${props.$width}px; max-width: ${props.$width}px;`}
+    ${(props) => props.isCollapsed && 'min-width: 56px; max-width: 56px;'}
+    ${(props) => props.backgroundColor && `background-color: ${props.backgroundColor};`}
+        /* Hide scrollbar for Chrome, Safari, and Opera */
+    &::-webkit-scrollbar {
+        display: none;
+    }
+
+    margin: ${(props) => {
+        if (props.$isShowNavBarRedesign) {
+            return props.isFocused ? '6px 5px 5px 9px' : '4px 4px 4px 8px';
+        }
+        return props.isFocused ? '12px 12px 12px 0px' : '0px 0px 0px 0px';
+    }};
+    ${(props) =>
+        props.$isShowNavBarRedesign && `border-radius: ${props.theme.styles['border-radius-navbar-redesign']};`}
+    transition: max-width 0.3s ease-in-out, min-width 0.3s ease-in-out;
+`;
+
+export const StyledSidebar = styled.div<{ isCard: boolean; isFocused?: boolean; $isShowNavBarRedesign?: boolean }>`
+    background-color: #ffffff;
+    box-shadow: ${(props) => (props.isCard ? '0px 0px 5px rgba(0, 0, 0, 0.08)' : 'none')};
+    border-radius: ${(props) => {
+        if (!props.isCard) return 'none';
+        return props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '8px';
+    }};
+    border: none;
+    overflow: hidden;
+    height: 100%;
+    display: flex;
+    border-top: ${(props) => (props.isFocused ? `1px solid ${SEARCH_COLORS.TITLE_PURPLE}` : 'inherit')};
+    border-top-width: ${(props) => (props.isFocused ? 'medium' : 'inherit')};
+`;
+
+const Body = styled.div`
+    display: flex;
+    align-items: space-between;
+    justify-content: start;
+    flex: 1;
+    overflow: auto;
+`;
+
+const Content = styled.div`
+    flex: 1;
+    min-height: 100%;
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+    white-space: nowrap;
+    /* hide the scrollbar */
+
+    ::-webkit-scrollbar {
+        display: none; /* for Chrome, Safari and Opera */
+    }
+
+    -ms-overflow-style: none; /* IE and Edge */
+    scrollbar-width: none; /* Firefox */
+`;
+
+const ContentContainer = styled.div<{ isVisible: boolean }>`
+    flex: 1;
+    ${(props) => props.isVisible && 'border-right: 1px solid #e8e8e8;'}
+    overflow: auto;
+    display: flex;
+    flex-direction: column;
+    /* hide the scrollbar */
+
+    ::-webkit-scrollbar {
+        display: none; /* for Chrome, Safari and Opera */
+    }
+
+    -ms-overflow-style: none; /* IE and Edge */
+    scrollbar-width: none; /* Firefox */
+`;
+
+const TabsContainer = styled.div``;
+
+const Tabs = styled.div``;
+
+interface Props {
+    type?: 'card' | 'default';
+    focused?: boolean;
+    tabs: EntitySidebarTab[];
+    backgroundColor?: string;
+    contextType?: TabContextType;
+    hideCollapse?: boolean;
+    width?: number;
+    headerDropdownItems?: Set<EntityMenuItems>;
+    className?: string;
+}
+
+export default function EntityProfileSidebar({
+    type = 'default',
+    focused = false,
+    tabs,
+    backgroundColor,
+    contextType = TabContextType.PROFILE_SIDEBAR,
+    hideCollapse = false,
+    width,
+    headerDropdownItems,
+    className,
+}: Props) {
+    const { isClosed } = useContext(EntitySidebarContext);
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+
+    // TODO: Allow selecting a tab via the URL.
+    const [selectedTabName, setSelectedTabName] = useState(tabs[0].name);
+    const selectedTab = tabs.find((tab) => tab.name === selectedTabName);
+
+    const isCardLayout = type === 'card';
+
+    return (
+        <StyledEntitySidebarContainer
+            isCollapsed={isClosed}
+            $width={width}
+            backgroundColor={backgroundColor}
+            id="entity-profile-sidebar"
+            isFocused={focused}
+            className={className}
+            $isShowNavBarRedesign={isShowNavBarRedesign}
+        >
+            <StyledSidebar isCard={isCardLayout} isFocused={focused} $isShowNavBarRedesign={isShowNavBarRedesign}>
+                <ContentContainer isVisible={!isClosed}>
+                    {!hideCollapse && (
+                        <SidebarCollapsibleHeader currentTab={selectedTab} headerDropdownItems={headerDropdownItems} />
+                    )}
+                    <Body>
+                        {selectedTab && (
+                            <Content>
+                                <selectedTab.component
+                                    properties={selectedTab.properties}
+                                    renderType={TabRenderType.COMPACT}
+                                    contextType={contextType}
+                                />
+                            </Content>
+                        )}
+                    </Body>
+                </ContentContainer>
+                <TabsContainer>
+                    <Tabs>
+                        <EntitySidebarTabs
+                            tabs={tabs}
+                            selectedTab={selectedTab}
+                            onSelectTab={(name) => setSelectedTabName(name)}
+                            hideCollapse={contextType === TabContextType.CHROME_SIDEBAR}
+                        />
+                    </Tabs>
+                </TabsContainer>
+            </StyledSidebar>
+        </StyledEntitySidebarContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebarSearchHeader.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebarSearchHeader.tsx
new file mode 100644
index 00000000000000..4de4b889a56d6b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebarSearchHeader.tsx
@@ -0,0 +1,54 @@
+import { Button } from 'antd';
+import React, { useContext } from 'react';
+import styled from 'styled-components';
+import EntitySidebarContext from '../../../../../sharedV2/EntitySidebarContext';
+
+import SidebarBackArrow from '../../../../../../images/sidebarBackArrow.svg?react';
+import { useEntityData } from '../../../../../entity/shared/EntityContext';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { SEARCH_COLORS } from '../../../constants';
+
+const Container = styled.div`
+    display: flex;
+    flex-direction: horizontal;
+    justify-content: space-between;
+    padding-left: 20px;
+    padding-right: 20px;
+    padding-top: 12px;
+    padding-bottom: 4px;
+    align-items: center;
+`;
+
+const StyledSidebarBackArrow = styled(SidebarBackArrow)`
+    cursor: pointer;
+`;
+
+type Props = {
+    showViewDetails?: boolean;
+};
+
+export default function EntityProfileSidebarSearchHeader({ showViewDetails = true }: Props) {
+    const entitySidebarContext = useContext(EntitySidebarContext);
+    const entityRegistry = useEntityRegistry();
+    const { urn, entityType } = useEntityData();
+
+    return (
+        <Container>
+            <StyledSidebarBackArrow
+                onClick={() => {
+                    entitySidebarContext.setSidebarClosed(true);
+                }}
+            />
+            {showViewDetails && (
+                <Button
+                    size="small"
+                    type="primary"
+                    color={SEARCH_COLORS.TITLE_PURPLE}
+                    href={entityRegistry.getEntityUrl(entityType, urn)}
+                >
+                    View more
+                </Button>
+            )}
+        </Container>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebar.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebar.tsx
new file mode 100644
index 00000000000000..39acada71b088f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebar.tsx
@@ -0,0 +1,65 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { useBaseEntity, useEntityData } from '../../../../../entity/shared/EntityContext';
+import { EntitySidebarSection, TabContextType, TabRenderType } from '../../../types';
+import { ENTITY_PROFILE_V2_SIDEBAR_ID } from '../../../../../onboarding/config/EntityProfileOnboardingConfig';
+
+const Container = styled.div`
+    padding: 0px 18px 18px 18px;
+`;
+
+const Content = styled.div`
+    position: relative;
+
+    & > div {
+        padding-top: 12px;
+        padding-bottom: 12px;
+        &:not(:last-child) {
+            border-bottom: 1px dashed;
+            border-color: rgba(0, 0, 0, 0.3);
+        }
+    }
+    &::-webkit-scrollbar {
+        height: 12px;
+        width: 2px;
+        background: #f2f2f2;
+    }
+    &::-webkit-scrollbar-thumb {
+        background: #cccccc;
+        -webkit-border-radius: 1ex;
+        -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.75);
+    }
+`;
+
+type Props = {
+    sidebarSections: EntitySidebarSection[];
+    topSection?: EntitySidebarSection;
+    renderType?: TabRenderType;
+    contextType: TabContextType;
+};
+
+export const EntitySidebarSections = <T,>({ sidebarSections, topSection, renderType, contextType }: Props) => {
+    const { entityData } = useEntityData();
+    const baseEntity = useBaseEntity<T>();
+
+    return (
+        <Container id={ENTITY_PROFILE_V2_SIDEBAR_ID}>
+            {topSection && <topSection.component key={`${topSection.component}`} properties={topSection.properties} />}
+            <Content>
+                {sidebarSections?.map((section) => {
+                    if (section.display?.visible(entityData, baseEntity, contextType) !== true) {
+                        return null;
+                    }
+                    return (
+                        <section.component
+                            key={`${section.component}`}
+                            renderType={renderType}
+                            contexType={contextType}
+                            properties={section.properties}
+                        />
+                    );
+                })}
+            </Content>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarSectionsTab.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarSectionsTab.tsx
new file mode 100644
index 00000000000000..dedf0f0624520a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarSectionsTab.tsx
@@ -0,0 +1,51 @@
+import React from 'react';
+import styled from 'styled-components';
+import { EntitySidebarSections } from './EntitySidebar';
+import { EntitySidebarSection, TabContextType, TabRenderType } from '../../../types';
+import SidebarFormInfoWrapper from './FormInfo/SidebarFormInfoWrapper';
+
+const DEFAULT_SIDEBAR_SECTION = {
+    visible: (_, _1) => true,
+};
+
+const SidebarFormContentWrapper = styled.div`
+    padding: 0px 20px;
+`;
+
+interface Props {
+    properties?: {
+        sections: EntitySidebarSection[];
+        setIsFormModalVisible?: (visible: boolean) => void;
+    };
+    contextType: TabContextType;
+    renderType: TabRenderType;
+}
+
+export const contextsWithoutLastSynchronized = [
+    TabContextType.CHROME_SIDEBAR,
+    TabContextType.SEARCH_SIDEBAR,
+    TabContextType.LINEAGE_SIDEBAR,
+    TabContextType.FORM_SIDEBAR,
+];
+
+export default function EntitySidebarSectionsTab({ properties, contextType, renderType }: Props) {
+    const sections = properties?.sections || [];
+
+    const sectionsWithDefaults = sections.map((sidebarSection) => ({
+        ...sidebarSection,
+        display: { ...DEFAULT_SIDEBAR_SECTION, ...sidebarSection.display },
+    }));
+
+    return (
+        <>
+            <SidebarFormContentWrapper>
+                <SidebarFormInfoWrapper />
+            </SidebarFormContentWrapper>
+            <EntitySidebarSections
+                renderType={renderType}
+                contextType={contextType}
+                sidebarSections={sectionsWithDefaults}
+            />
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarTabs.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarTabs.tsx
new file mode 100644
index 00000000000000..c4d198df03d24a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarTabs.tsx
@@ -0,0 +1,115 @@
+import React, { useContext } from 'react';
+import styled from 'styled-components/macro';
+import { Tabs } from 'antd';
+import { Tooltip } from '@components';
+import { EntitySidebarTab } from '../../../types';
+import { useBaseEntity, useEntityData } from '../../../../../entity/shared/EntityContext';
+import SidebarCollapseIcon from './SidebarCollapseIcon';
+import EntitySidebarContext from '../../../../../sharedV2/EntitySidebarContext';
+import { REDESIGN_COLORS } from '../../../constants';
+
+type Props = {
+    tabs: EntitySidebarTab[];
+    selectedTab?: EntitySidebarTab;
+    onSelectTab: (name: string) => void;
+    hideCollapse?: boolean;
+};
+
+const UnborderedTabs = styled(Tabs)<{ $isClosed: boolean }>`
+    height: 100%;
+
+    &&& .ant-tabs-nav {
+        margin-bottom: 0;
+    }
+
+    &&& .ant-tabs-ink-bar {
+        display: none;
+    }
+
+    &&& .ant-tabs-tab {
+        padding: 10px 10px 10px 10px;
+        margin: 8px 8px 16px 8px;
+        border-radius: 6px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        .ant-tabs-tab-btn {
+            color: ${(props) => (props.$isClosed ? REDESIGN_COLORS.BLACK : REDESIGN_COLORS.TITLE_PURPLE)};
+        }
+
+        :hover {
+            color: ${REDESIGN_COLORS.WHITE};
+            background-color: ${REDESIGN_COLORS.TITLE_PURPLE};
+
+            .ant-tabs-tab-btn {
+                color: ${REDESIGN_COLORS.WHITE};
+            }
+        }
+    }
+
+    &&& .ant-tabs-tab-active {
+        background-color: ${(props) => !props.$isClosed && REDESIGN_COLORS.TITLE_PURPLE_2};
+
+        .ant-tabs-tab-btn {
+            color: ${(props) => (props.$isClosed ? REDESIGN_COLORS.TITLE_PURPLE : REDESIGN_COLORS.WHITE)};
+        }
+    }
+
+    &&& .ant-tabs-content-holder {
+        display: none;
+    }
+
+    background-color: #ffffff;
+`;
+
+const Tab = styled(Tabs.TabPane)`
+    font-size: 14px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+`;
+
+const tabIconStyle = { fontSize: 20, margin: 0, display: 'flex' };
+
+export const EntitySidebarTabs = <T,>({ tabs, selectedTab, onSelectTab, hideCollapse }: Props) => {
+    const { entityData } = useEntityData();
+    const baseEntity = useBaseEntity<T>();
+
+    const { isClosed, setSidebarClosed } = useContext(EntitySidebarContext);
+
+    return (
+        <>
+            {!hideCollapse && <SidebarCollapseIcon />}
+            <UnborderedTabs
+                id="entity-sidebar-tabs"
+                animated={false}
+                tabPosition="right"
+                activeKey={selectedTab?.name || ''}
+                size="large"
+                onTabClick={(name: string) => {
+                    onSelectTab(name);
+                    setSidebarClosed(false);
+                }}
+                $isClosed={isClosed}
+            >
+                {tabs.map((tab) => {
+                    const TabIcon = tab.icon;
+                    const { name } = tab;
+                    const isDisabled = !tab.display?.enabled(entityData, baseEntity);
+                    return (
+                        <Tab
+                            disabled={isDisabled}
+                            tab={
+                                <Tooltip title={name} placement="left" showArrow={false}>
+                                    <TabIcon style={tabIconStyle} />
+                                </Tooltip>
+                            }
+                            key={tab.name}
+                        />
+                    );
+                })}
+            </UnborderedTabs>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/ExploreLineageAction.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/ExploreLineageAction.tsx
new file mode 100644
index 00000000000000..4b5b1117d850ae
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/ExploreLineageAction.tsx
@@ -0,0 +1,62 @@
+import React, { useContext } from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import { Tooltip } from '@components';
+import CompactContext from '@src/app/shared/CompactContext';
+import { REDESIGN_COLORS } from '../../../constants';
+import { getEntityPath } from '../utils';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { useEntityData } from '../../../../../entity/shared/EntityContext';
+
+const ActionButton = styled(Link)`
+    height: 22px;
+    width: 22px;
+    border: 1px solid ${REDESIGN_COLORS.TITLE_PURPLE};
+    border-radius: 50%;
+    text-align: center;
+    color: ${REDESIGN_COLORS.TITLE_PURPLE};
+
+    svg {
+        height: 20px;
+        width: 20px;
+        padding: 4px 5px 4px 4px;
+    }
+
+    :hover {
+        cursor: pointer;
+        color: ${REDESIGN_COLORS.WHITE};
+        background: ${REDESIGN_COLORS.TITLE_PURPLE};
+    }
+`;
+
+interface Props {
+    icon?: React.FC<any>;
+}
+
+export const ExploreLineageAction = ({ icon }: Props) => {
+    const entityRegistry = useEntityRegistry();
+    const isCompact = useContext(CompactContext);
+    const { urn, entityType, entityData } = useEntityData();
+    const entityName = (entityData && entityRegistry.getDisplayName(entityType, entityData)) || '-';
+
+    const ButtonIcon = icon;
+
+    return (
+        <>
+            {ButtonIcon && (
+                <Tooltip
+                    placement="left"
+                    showArrow={false}
+                    title={`Visually explore the upstreams and downstreams of ${entityName}`}
+                >
+                    <ActionButton
+                        target={isCompact ? '_blank' : '_self'}
+                        to={getEntityPath(entityType, urn, entityRegistry, false, false, 'Lineage')}
+                    >
+                        <ButtonIcon />
+                    </ActionButton>
+                </Tooltip>
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/CompletedView.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/CompletedView.tsx
new file mode 100644
index 00000000000000..cecc4ca409235d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/CompletedView.tsx
@@ -0,0 +1,87 @@
+import { Button } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import {
+    CTAWrapper,
+    Content,
+    FlexWrapper,
+    StyledArrow,
+    StyledButtonWrapper,
+    StyledImgIcon,
+    StyledReadOutlined,
+    Title,
+    TitleWrapper,
+} from './components';
+import OptionalPromptsRemaining from '../../../../../../entity/shared/containers/profile/sidebar/FormInfo/OptionalPromptsRemaining';
+import VerificationAuditStamp from '../../../../../../entity/shared/containers/profile/sidebar/FormInfo/VerificationAuditStamp';
+import ShieldCheck from '../../../../../../../images/shield-check.svg';
+import { REDESIGN_COLORS } from '../../../../constants';
+
+const StyledButton = styled(Button)`
+    margin-top: 16px;
+    font-size: 12px;
+    line-height: 14px;
+    display: inline-flex;
+    align-items: center;
+    border: 1px solid ${REDESIGN_COLORS.TITLE_PURPLE};
+    color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    padding: 9px 17px;
+    border-radius: 6px;
+    &:hover {
+        color: ${REDESIGN_COLORS.TITLE_PURPLE};
+        border: 1px solid ${REDESIGN_COLORS.TITLE_PURPLE};
+    }
+`;
+
+interface Props {
+    showVerificationStyles: boolean;
+    numOptionalPromptsRemaining: number;
+    isUserAssigned: boolean;
+    formUrn?: string;
+    openFormModal?: () => void;
+}
+
+export default function CompletedView({
+    showVerificationStyles,
+    numOptionalPromptsRemaining,
+    isUserAssigned,
+    formUrn,
+    openFormModal,
+}: Props) {
+    const [isOpen, setIsOpen] = useState(false);
+
+    return (
+        <CTAWrapper backgroundColor="#FFF" borderColor="#77B750">
+            <FlexWrapper>
+                <Content>
+                    <TitleWrapper
+                        isOpen={isOpen}
+                        isUserAssigned={isUserAssigned}
+                        onClick={() => isUserAssigned && setIsOpen(!isOpen)}
+                    >
+                        <Title>
+                            {showVerificationStyles ? (
+                                <StyledImgIcon src={ShieldCheck} addLineHeight />
+                            ) : (
+                                <StyledReadOutlined color="#77B750" addLineHeight />
+                            )}
+                            {showVerificationStyles ? 'Verified' : 'Documented'}
+                        </Title>
+                        {isUserAssigned && <StyledArrow isOpen={isOpen} />}
+                    </TitleWrapper>
+                    {isUserAssigned && isOpen && (
+                        <>
+                            <VerificationAuditStamp formUrn={formUrn} />
+                            {isUserAssigned && <OptionalPromptsRemaining numRemaining={numOptionalPromptsRemaining} />}
+                            {!!openFormModal && (
+                                <StyledButtonWrapper>
+                                    <StyledButton onClick={openFormModal}>View & Edit</StyledButton>
+                                </StyledButtonWrapper>
+                            )}
+                        </>
+                    )}
+                </Content>
+            </FlexWrapper>
+        </CTAWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/FormInfo.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/FormInfo.tsx
new file mode 100644
index 00000000000000..5a09d5c10bad37
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/FormInfo.tsx
@@ -0,0 +1,49 @@
+import React from 'react';
+import {
+    isVerificationComplete,
+    shouldShowVerificationInfo,
+} from '../../../../../../entity/shared/containers/profile/sidebar/FormInfo/utils';
+import CompletedView from './CompletedView';
+import IncompleteView from './IncompleteView';
+import { useEntityData } from '../../../../../../entity/shared/EntityContext';
+import useGetPromptInfo from '../../../../../../entity/shared/containers/profile/sidebar/FormInfo/useGetPromptInfo';
+import useIsUserAssigned from '../../../../../../entity/shared/containers/profile/sidebar/FormInfo/useIsUserAssigned';
+
+interface Props {
+    formUrn?: string;
+    openFormModal?: () => void;
+}
+
+export default function FormInfo({ formUrn, openFormModal }: Props) {
+    const { entityData } = useEntityData();
+    const { numRequiredPromptsRemaining, numOptionalPromptsRemaining } = useGetPromptInfo(formUrn);
+    const showVerificationInfo = shouldShowVerificationInfo(entityData, formUrn);
+    const isUserAssigned = useIsUserAssigned();
+    const allRequiredPromptsAreComplete = numRequiredPromptsRemaining === 0;
+
+    const shouldShowCompletedView = showVerificationInfo
+        ? allRequiredPromptsAreComplete && isVerificationComplete(entityData, formUrn)
+        : allRequiredPromptsAreComplete;
+
+    if (shouldShowCompletedView) {
+        return (
+            <CompletedView
+                showVerificationStyles={showVerificationInfo}
+                numOptionalPromptsRemaining={numOptionalPromptsRemaining}
+                isUserAssigned={isUserAssigned}
+                formUrn={formUrn}
+                openFormModal={openFormModal}
+            />
+        );
+    }
+
+    return (
+        <IncompleteView
+            showVerificationStyles={showVerificationInfo && !isVerificationComplete(entityData, formUrn)}
+            numRequiredPromptsRemaining={numRequiredPromptsRemaining}
+            numOptionalPromptsRemaining={numOptionalPromptsRemaining}
+            isUserAssigned={isUserAssigned}
+            openFormModal={openFormModal}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/IncompleteView.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/IncompleteView.tsx
new file mode 100644
index 00000000000000..5e0c32c9e9730f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/IncompleteView.tsx
@@ -0,0 +1,108 @@
+import { Button } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import ShieldExclamation from '../../../../../../../images/shield-exclamation.svg';
+
+import {
+    CTAWrapper,
+    Content,
+    FlexWrapper,
+    StyledArrow,
+    StyledButtonWrapper,
+    StyledImgIcon,
+    StyledReadOutlined,
+    Title,
+    TitleWrapper,
+} from './components';
+import OptionalPromptsRemaining from '../../../../../../entity/shared/containers/profile/sidebar/FormInfo/OptionalPromptsRemaining';
+import RequiredPromptsRemaining from '../../../../../../entity/shared/containers/profile/sidebar/FormInfo/RequiredPromptsRemaining';
+import { REDESIGN_COLORS } from '../../../../constants';
+
+const StyledButtonV2 = styled(Button)`
+    margin-top: 16px;
+    font-size: 12px;
+    line-height: 14px;
+    display: inline-flex;
+    align-items: center;
+    border: 1px solid ${REDESIGN_COLORS.TITLE_PURPLE};
+    color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    padding: 9px 17px;
+    border-radius: 6px;
+    &:hover {
+        color: ${REDESIGN_COLORS.TITLE_PURPLE};
+        border: 1px solid ${REDESIGN_COLORS.TITLE_PURPLE};
+    }
+`;
+
+const Text = styled.div`
+    text-wrap: wrap;
+`;
+
+interface Props {
+    showVerificationStyles: boolean;
+    numOptionalPromptsRemaining: number;
+    numRequiredPromptsRemaining: number;
+    isUserAssigned: boolean;
+    openFormModal?: () => void;
+}
+
+export default function IncompleteView({
+    showVerificationStyles,
+    numOptionalPromptsRemaining,
+    numRequiredPromptsRemaining,
+    isUserAssigned,
+    openFormModal,
+}: Props) {
+    const [isOpen, setIsOpen] = useState(false);
+
+    return (
+        <CTAWrapper backgroundColor="#FEF9ED" borderColor="#F4C449">
+            <FlexWrapper>
+                <Content>
+                    <TitleWrapper
+                        isOpen={isOpen}
+                        isUserAssigned={isUserAssigned}
+                        onClick={() => isUserAssigned && setIsOpen(!isOpen)}
+                        data-testid={
+                            showVerificationStyles ? 'incomplete-verification-title' : 'incomplete-documentation-title'
+                        }
+                    >
+                        <Title>
+                            {isUserAssigned && (
+                                <>
+                                    {showVerificationStyles ? (
+                                        <StyledImgIcon src={ShieldExclamation} />
+                                    ) : (
+                                        <StyledReadOutlined color="#F4C449" addLineHeight />
+                                    )}
+                                </>
+                            )}
+                            {!isUserAssigned && <StyledImgIcon src={ShieldExclamation} disable />}
+                            Awaiting {showVerificationStyles ? 'Verification' : 'Documentation'}
+                        </Title>
+                        {isUserAssigned && <StyledArrow isOpen={isOpen} />}
+                    </TitleWrapper>
+                    {isUserAssigned && isOpen && (
+                        <>
+                            <Text>You are being asked to complete a set of requirements for this entity.</Text>
+                            <RequiredPromptsRemaining numRemaining={numRequiredPromptsRemaining} />
+                            <OptionalPromptsRemaining numRemaining={numOptionalPromptsRemaining} />
+                        </>
+                    )}
+                </Content>
+            </FlexWrapper>
+            {!!openFormModal && isUserAssigned && isOpen && (
+                <StyledButtonWrapper>
+                    <StyledButtonV2
+                        onClick={openFormModal}
+                        data-testid={
+                            showVerificationStyles ? 'complete-verification-button' : 'complete-documentation-button'
+                        }
+                    >
+                        {showVerificationStyles ? 'Complete Verification' : 'Complete Documentation'}
+                    </StyledButtonV2>
+                </StyledButtonWrapper>
+            )}
+        </CTAWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/SidebarFormInfoWrapper.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/SidebarFormInfoWrapper.tsx
new file mode 100644
index 00000000000000..3095fdbffcfa1c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/SidebarFormInfoWrapper.tsx
@@ -0,0 +1,62 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import EntityFormModal from '../../../../entityForm/EntityFormModal';
+import FormInfo from './FormInfo';
+import analytics, { DocRequestCTASource, EventType } from '../../../../../../analytics';
+import { useEntityData } from '../../../../../../entity/shared/EntityContext';
+import { getFormAssociations } from '../../../../../../entity/shared/containers/profile/sidebar/FormInfo/utils';
+import FormSelectionModal from '../../../../../../entity/shared/entityForm/FormSelectionModal/FormSelectionModal';
+
+const FormInfoWrapper = styled.div`
+    padding: 12px 0px;
+    border-bottom: 1px dashed;
+    border-color: rgba(0, 0, 0, 0.3);
+`;
+
+export default function SidebarFormInfoWrapper() {
+    const { entityData } = useEntityData();
+    const [isFormSelectionModalVisible, setIsFormSelectionModalVisible] = useState(false);
+    const [isFormVisible, setIsFormVisible] = useState(false);
+    const [selectedFormUrn, setSelectedFormUrn] = useState<string | null>(null);
+    const formAssociations = getFormAssociations(entityData);
+
+    if (!formAssociations.length) return null;
+
+    function openFormModal() {
+        analytics.event({
+            type: EventType.ClickDocRequestCTA,
+            source: DocRequestCTASource.AssetPage,
+        });
+
+        if (formAssociations.length === 1) {
+            setSelectedFormUrn(formAssociations[0].form.urn);
+            setIsFormVisible(true);
+        } else {
+            setIsFormSelectionModalVisible(true);
+        }
+    }
+
+    function selectFormUrn(urn: string) {
+        setSelectedFormUrn(urn);
+        setIsFormVisible(true);
+        setIsFormSelectionModalVisible(false);
+    }
+
+    return (
+        <>
+            <FormInfoWrapper>
+                <FormInfo openFormModal={openFormModal} />
+            </FormInfoWrapper>
+            <EntityFormModal
+                selectedFormUrn={selectedFormUrn}
+                isFormVisible={isFormVisible}
+                hideFormModal={() => setIsFormVisible(false)}
+            />
+            <FormSelectionModal
+                isFormSelectionModalVisible={isFormSelectionModalVisible}
+                hideFormSelectionModal={() => setIsFormSelectionModalVisible(false)}
+                selectFormUrn={selectFormUrn}
+            />
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/components.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/components.ts
new file mode 100644
index 00000000000000..194c7f390db355
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/components.ts
@@ -0,0 +1,104 @@
+import { ReadFilled, ReadOutlined } from '@ant-design/icons';
+import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined';
+import Icon from '@ant-design/icons/lib/components/Icon';
+import { Divider } from 'antd';
+import styled from 'styled-components';
+
+export const FlexWrapper = styled.div`
+    display: flex;
+    line-height: 18px;
+`;
+
+export const StyledIcon = styled(Icon)<{ addLineHeight?: boolean }>`
+    font-size: 18px;
+    margin-right: 8px;
+    ${(props) => props.addLineHeight && `line-height: 24px;`}
+`;
+
+export const SubTitle = styled.div<{ addMargin?: boolean }>`
+    font-weight: 600;
+    margin-bottom: 4px;
+    ${(props) => props.addMargin && `margin-top: 8px;`}
+    text-wrap: wrap;
+`;
+
+export const Title = styled.div`
+    font-size: 16px;
+    font-weight: 600;
+    display: flex;
+    align-items: center;
+`;
+
+export const StyledDivider = styled(Divider)`
+    margin: 12px 0 0 0;
+`;
+
+export const StyledReadOutlined = styled(ReadOutlined)<{ color?: string; addLineHeight?: boolean }>`
+    margin-right: 8px;
+    height: 18px;
+    width: 18px;
+    color: #373d44;
+    ${(props) => props.addLineHeight && `line-height: 24px;`}
+    ${(props) => props.color && `color: ${props.color};`}
+`;
+
+export const StyledReadFilled = styled(ReadFilled)<{ color: string; addLineHeight?: boolean }>`
+    margin-right: 8px;
+    height: 18px;
+    width: 18px;
+    color: #7532a4;
+    ${(props) => props.addLineHeight && `line-height: 24px;`}
+    ${(props) => props.color && `color: ${props.color};`}
+`;
+
+export const CTAWrapper = styled.div<{ backgroundColor?: string; borderColor?: string; padding?: string }>`
+    color: #373d44;
+    font-size: 14px;
+    min-width: 180px;
+    ${(props) =>
+        `
+        border-radius: 8px;
+        padding: ${props.padding || '16px'};
+        background-color: ${props.backgroundColor ? props.backgroundColor : '#f9f0ff'};
+        border: 1px solid ${props.borderColor ? props.borderColor : '#8338b8'};
+        `}
+`;
+
+export const Content = styled.div`
+    width: 100%;
+`;
+
+export const TitleWrapper = styled.div<{ isOpen?: boolean; isUserAssigned?: boolean }>`
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 100%;
+    margin-bottom: ${(props) => (props.isOpen ? '10px' : '0px')};
+    cursor: ${(props) => (props.isUserAssigned ? 'pointer' : 'not-allowed')};
+    text-wrap: wrap;
+`;
+
+export const StyledArrow = styled(KeyboardArrowDownOutlinedIcon)<{ isOpen: boolean }>`
+    font-size: 12px;
+    margin-left: 3px;
+    cursor: pointer;
+    ${(props) =>
+        props.isOpen &&
+        `
+        transform: rotate(180deg);
+        padding-top: 1px;
+    `}
+`;
+
+export const StyledButtonWrapper = styled.div`
+    display: flex;
+    justify-content: flex-end;
+`;
+
+export const StyledImgIcon = styled.img<{ addLineHeight?: boolean; disable?: boolean }>`
+    font-size: 24px;
+    margin-right: 8px;
+    align-self: flex-start;
+    ${(props) => props.disable && `opacity: 0.5;`};
+    ${(props) => props.addLineHeight && `line-height: 24px;`}
+`;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/HeaderAndTabs.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/HeaderAndTabs.tsx
new file mode 100644
index 00000000000000..ac9ae7b1abe296
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/HeaderAndTabs.tsx
@@ -0,0 +1,68 @@
+import React, { useState, useCallback } from 'react';
+import styled from 'styled-components';
+
+let isResizing = false;
+
+export type Props = {
+    children: React.ReactNode;
+};
+
+const ResizableDiv = styled.div<{ width }>`
+    width: ${(props) => props.width}px;
+    min-width: 440px;
+    display: flex;
+    justify-content: space-between;
+`;
+
+const HeaderAndTabs = ({ children }: Props) => {
+    const initialWidth = 70 / (100 / document.documentElement.clientWidth);
+
+    const [sidebarWidth, setSidebarWidth] = useState(initialWidth);
+
+    const cbHandleMouseMove = useCallback((e) => {
+        const offsetRight = e.clientX - document.body.offsetLeft;
+
+        const minWidthVw = 70;
+        const minWidthPx = minWidthVw / (100 / document.documentElement.clientWidth);
+
+        const maxWidthVw = 98;
+        const maxWidthPx = maxWidthVw / (100 / document.documentElement.clientWidth);
+
+        if (offsetRight > minWidthPx && offsetRight < maxWidthPx) {
+            setSidebarWidth(offsetRight);
+        }
+    }, []);
+
+    const cbHandleMouseUp = useCallback(
+        (_) => {
+            if (!isResizing) {
+                return;
+            }
+            isResizing = false;
+            document.removeEventListener('mousemove', cbHandleMouseMove);
+            document.removeEventListener('mouseup', cbHandleMouseUp);
+        },
+        [cbHandleMouseMove],
+    );
+
+    function handleMousedown(e) {
+        e.stopPropagation();
+        e.preventDefault();
+        // we will only add listeners when needed, and remove them afterward
+        document.addEventListener('mousemove', cbHandleMouseMove);
+        document.addEventListener('mouseup', cbHandleMouseUp);
+        isResizing = true;
+    }
+
+    return (
+        <ResizableDiv width={sidebarWidth}>
+            {children}
+            {/* eslint-disable jsx-a11y/no-static-element-interactions */}
+            <div onMouseDown={handleMousedown} style={{ backgroundColor: 'black', width: '5px', height: '100px' }}>
+                header
+            </div>
+        </ResizableDiv>
+    );
+};
+
+export default HeaderAndTabs;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LastIngested.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LastIngested.tsx
new file mode 100644
index 00000000000000..591f0f7047a28a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LastIngested.tsx
@@ -0,0 +1,181 @@
+import { green, orange, red } from '@ant-design/colors';
+import { Image } from 'antd';
+import { Popover } from '@components';
+import styled from 'styled-components/macro';
+import moment from 'moment-timezone';
+import React from 'react';
+import { QuestionCircleOutlined } from '@ant-design/icons';
+import { toLocalDateTimeString, toRelativeTimeString } from '../../../../../shared/time/timeUtils';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../../../constants';
+import { useEntityData } from '../../../../../entity/shared/EntityContext';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { getPlatformName } from '../../../utils';
+import { getDisplayedEntityType } from '../header/utils';
+
+const StyledDot = styled.div<{ color: string }>`
+    border: 1px solid ${ANTD_GRAY[5]};
+    border-radius: 50%;
+    background-color: ${(props) => props.color};
+    width: 5px;
+    height: 5px;
+    margin-right: 5px;
+    vertical-align: middle;
+`;
+
+const Title = styled.div`
+    font-size: 12px;
+    font-weight: bold;
+    display: flex;
+    align-items: center;
+    margin-bottom: 5px;
+
+    ${StyledDot} {
+        margin: 0 8px 0 0;
+    }
+`;
+
+const PopoverContentWrapper = styled.div``;
+
+const MainContent = styled.div`
+    align-items: center;
+    display: flex;
+    color: ${REDESIGN_COLORS.HEADING_COLOR};
+    font-size: 10px;
+    font-weight: 400;
+    line-height: 20px;
+`;
+
+const RelativeDescription = styled.div`
+    align-items: center;
+    display: flex;
+    margin-bottom: 5px;
+`;
+
+const SubText = styled.div`
+    color: ${ANTD_GRAY[7]};
+    font-size: 10px;
+    font-style: italic;
+`;
+
+const HelpIcon = styled(QuestionCircleOutlined)`
+    color: ${ANTD_GRAY[7]};
+    margin-left: 7px;
+    font-size: 10px;
+`;
+
+const HelpHeader = styled.div`
+    margin-bottom: 5px;
+    max-width: 250px;
+`;
+
+const LastIngestedWrapper = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const TooltipSection = styled.div`
+    align-items: center;
+    display: flex;
+    margin-bottom: 5px;
+`;
+
+const PreviewImage = styled(Image)`
+    max-height: 9px;
+    width: auto;
+    object-fit: contain;
+    background-color: transparent;
+    padding-left: 1px;
+`;
+
+function TooltipContent() {
+    return (
+        <div>
+            <TooltipSection>
+                <StyledDot color={green[5]} /> Synchronized in the&nbsp;<b>past week</b>
+            </TooltipSection>
+            <TooltipSection>
+                <StyledDot color={orange[5]} /> Synchronized in the&nbsp;<b>past month</b>
+            </TooltipSection>
+            <TooltipSection>
+                <StyledDot color={red[5]} /> Synchronized&nbsp;<b>more than a month ago</b>
+            </TooltipSection>
+        </div>
+    );
+}
+
+export function getLastIngestedColor(lastIngested: number) {
+    const lastIngestedDate = moment(lastIngested);
+    if (lastIngestedDate.isAfter(moment().subtract(1, 'week'))) {
+        return green[5];
+    }
+    if (lastIngestedDate.isAfter(moment().subtract(1, 'month'))) {
+        return orange[5];
+    }
+    return red[5];
+}
+
+interface Props {
+    lastIngested: number;
+}
+
+function LastIngested({ lastIngested }: Props) {
+    const { entityData, entityType } = useEntityData();
+    const entityRegistry = useEntityRegistry();
+    const displayedEntityType = getDisplayedEntityType(entityData, entityRegistry, entityType);
+    const lastIngestedColor = getLastIngestedColor(lastIngested);
+    const platformName = getPlatformName(entityData);
+    const platformLogoUrl = entityData?.platform?.properties?.logoUrl;
+
+    return (
+        <LastIngestedWrapper>
+            <Popover
+                placement="left"
+                content={
+                    <PopoverContentWrapper>
+                        <Title>
+                            <StyledDot color={lastIngestedColor} />
+                            Last Synchronized
+                        </Title>
+                        <RelativeDescription>
+                            This {displayedEntityType.toLocaleLowerCase()} was last synchronized&nbsp;
+                            <b>{toRelativeTimeString(lastIngested)}</b>
+                        </RelativeDescription>
+                        <SubText>Synchronized on {toLocalDateTimeString(lastIngested)}</SubText>
+                    </PopoverContentWrapper>
+                }
+            >
+                <MainContent>
+                    <StyledDot color={lastIngestedColor} />
+                    Last synchronized&nbsp;
+                    <b>{toRelativeTimeString(lastIngested)}</b>
+                </MainContent>
+            </Popover>
+            <Popover
+                title={
+                    <HelpHeader>
+                        This represents the time that the entity was last synchronized with&nbsp;
+                        {platformName ? (
+                            <strong>
+                                {platformLogoUrl && (
+                                    <>
+                                        <PreviewImage preview={false} src={platformLogoUrl} alt={platformName} />
+                                        &nbsp;
+                                    </>
+                                )}
+                                {platformName}
+                            </strong>
+                        ) : (
+                            <>the source platform</>
+                        )}
+                    </HelpHeader>
+                }
+                content={TooltipContent}
+                placement="bottom"
+            >
+                <HelpIcon />
+            </Popover>
+        </LastIngestedWrapper>
+    );
+}
+
+export default LastIngested;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageLoadingSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageLoadingSection.tsx
new file mode 100644
index 00000000000000..ceca535c442bd2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageLoadingSection.tsx
@@ -0,0 +1,10 @@
+import React from 'react';
+import { Spin } from 'antd';
+import { LoadingOutlined } from '@ant-design/icons';
+import { ANTD_GRAY } from '../../../../constants';
+
+const SidebarLineageLoadingSection = () => {
+    return <Spin indicator={<LoadingOutlined style={{ color: ANTD_GRAY[7] }} />} />;
+};
+
+export default SidebarLineageLoadingSection;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageSection.tsx
new file mode 100644
index 00000000000000..efbb97e600067e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/SidebarLineageSection.tsx
@@ -0,0 +1,159 @@
+import { useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode';
+import { useGetDefaultLineageStartTimeMillis } from '@app/lineage/utils/useGetLineageTimeParams';
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components/macro';
+import { Tooltip } from '@components';
+import { ArrowDownOutlined, ArrowUpOutlined, PartitionOutlined } from '@ant-design/icons';
+import UpstreamHealth from '@src/app/entityV2/shared/embed/UpstreamHealth/UpstreamHealth';
+import { useGetSearchAcrossLineageCountsQuery } from '../../../../../../../graphql/lineage.generated';
+import { useEntityData } from '../../../../../../entity/shared/EntityContext';
+import { SidebarSection } from '../SidebarSection';
+import { getDirectDownstreamSummary, getDirectUpstreamSummary, getRelatedEntitySummary } from './utils';
+import SidebarLineageLoadingSection from './SidebarLineageLoadingSection';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../../../../constants';
+import SectionActionButton from '../SectionActionButton';
+import { useEmbeddedProfileLinkProps } from '../../../../../../shared/useEmbeddedProfileLinkProps';
+
+const Section = styled.div`
+    display: flex;
+    align-items: start;
+    justify-content: start;
+    margin-bottom: 6px;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+`;
+
+const DirectionText = styled.div`
+    font-size: 10px;
+    font-weight: 700;
+    line-height: 20px;
+    letter-spacing: 0.48px;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+`;
+
+const SummaryText = styled.div`
+    text-wrap: wrap;
+    font-size: 12px;
+    font-weight: 600;
+    line-height: 20px;
+`;
+
+const StyledUpOutlined = styled(ArrowUpOutlined)`
+    margin-right: 4px;
+`;
+
+const StyledDownOutlined = styled(ArrowDownOutlined)`
+    margin-right: 4px;
+`;
+
+const DirectionHeader = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    font-weight: bold;
+    font-size: 12px;
+    letter-spacing: 1px;
+    height: 20px;
+    color: ${ANTD_GRAY[6]};
+    min-width: 100px;
+    margin-right: 6px;
+`;
+
+const StyledPartitionOutlined = styled(PartitionOutlined)`
+    svg {
+        padding: 4px 5px 4px 4px;
+    }
+`;
+
+const SidebarLineageSection = () => {
+    const { urn, entityData, entityType } = useEntityData();
+    const entityRegistry = useEntityRegistry();
+    const linkProps = useEmbeddedProfileLinkProps();
+    const startTimeMillis = useGetDefaultLineageStartTimeMillis();
+
+    const separateSiblings = useIsSeparateSiblingsMode();
+    const onCombinedSiblingPage = !separateSiblings && (entityData?.siblingsSearch?.total || 0) > 0;
+    const { data, loading } = useGetSearchAcrossLineageCountsQuery({
+        variables: { urn, startTimeMillis },
+        fetchPolicy: 'cache-first',
+        skip: onCombinedSiblingPage,
+    });
+
+    const directUpstreamSummary = data?.upstreams && getDirectUpstreamSummary(data.upstreams as any);
+    const directDownstreamSummary = data?.downstreams && getDirectDownstreamSummary(data.downstreams as any);
+
+    const directUpstreamCount = directUpstreamSummary?.total || 0;
+    const directDownstreamCount = directDownstreamSummary?.total || 0;
+
+    const hasLineage = directUpstreamCount > 0 || directDownstreamCount > 0;
+
+    if (!hasLineage) {
+        return null;
+    }
+
+    return (
+        <SidebarSection
+            title="Lineage"
+            key="Lineage"
+            content={
+                <>
+                    {loading && <SidebarLineageLoadingSection />}
+                    {!loading && <UpstreamHealth />}
+                    {!loading && directUpstreamCount > 0 && (
+                        <Section key="upstream">
+                            <Tooltip
+                                title="Data assets that this is directly derived from"
+                                placement="left"
+                                showArrow={false}
+                            >
+                                <DirectionHeader>
+                                    <StyledUpOutlined />
+                                    <DirectionText>UPSTREAM</DirectionText>
+                                </DirectionHeader>
+                            </Tooltip>
+                            <SummaryText>
+                                Depends on {getRelatedEntitySummary(directUpstreamSummary as any, entityRegistry)}
+                            </SummaryText>
+                        </Section>
+                    )}
+                    {!loading && directDownstreamCount > 0 && (
+                        <Section key="downstream">
+                            <Tooltip
+                                title="Data assets that directly depend on this"
+                                placement="left"
+                                showArrow={false}
+                            >
+                                <DirectionHeader>
+                                    <StyledDownOutlined />
+                                    <DirectionText>DOWNSTREAM</DirectionText>
+                                </DirectionHeader>
+                            </Tooltip>
+                            <SummaryText>
+                                Used by {getRelatedEntitySummary(directDownstreamSummary as any, entityRegistry)}
+                            </SummaryText>
+                        </Section>
+                    )}
+                </>
+            }
+            extra={
+                <SectionActionButton
+                    button={
+                        <Tooltip
+                            title="Explore related entities using the lineage graph"
+                            placement="left"
+                            showArrow={false}
+                        >
+                            <Link to={`${entityRegistry.getEntityUrl(entityType, urn)}/Lineage`} {...linkProps}>
+                                <StyledPartitionOutlined />
+                            </Link>
+                        </Tooltip>
+                    }
+                    onClick={(e) => e.stopPropagation()}
+                />
+            }
+        />
+    );
+};
+
+export default SidebarLineageSection;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/utils.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/utils.tsx
new file mode 100644
index 00000000000000..250e959e4c69dc
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/utils.tsx
@@ -0,0 +1,126 @@
+import React from 'react';
+import styled from 'styled-components';
+import {
+    AggregationMetadata,
+    EntityType,
+    FacetMetadata,
+    SearchAcrossLineageResults,
+} from '../../../../../../../types.generated';
+import { EntityRegistry } from '../../../../../../../entityRegistryContext';
+import { pluralize } from '../../../../../../shared/textUtil';
+
+const UNIT_SEPARATOR = '␞';
+
+const SummaryText = styled.span`
+    font-weight: bold;
+`;
+
+export type LineageDirectionTypeSummary = {
+    type: string;
+    count: number;
+    isEntityType: boolean; // If false, this represents a sub-type.
+};
+
+export type LineageDirectionSummary = {
+    total: number;
+    types: LineageDirectionTypeSummary[];
+};
+
+const mergeEntityTypeSubTypeAggregations = (
+    entityTypeTotals: Map<EntityType, any>,
+    subTypeAggregations?: FacetMetadata,
+) => {
+    const results = new Map();
+    Array.from(entityTypeTotals.keys()).forEach((key) => {
+        results.set(key, { count: entityTypeTotals.get(key).count, isEntityType: true });
+    });
+
+    // Iterate through sub-type aggregations, add them, and subtract the total from the corresponding entity type.
+    subTypeAggregations?.aggregations?.forEach((agg) => {
+        const { value } = agg;
+        const values = value.split(UNIT_SEPARATOR);
+        const entityType = values[0];
+        const subType = values.length > 1 ? value.split(UNIT_SEPARATOR)[1] : undefined;
+        if (subType) {
+            // TODO: Determine what null subtype means.
+            results.set(subType, { count: agg.count, isEntityType: false });
+            if (results.has(entityType)) {
+                const entityTypeValue = results.get(entityType);
+                const newCount = entityTypeValue.count - agg.count;
+                results.set(entityType, {
+                    ...entityTypeValue,
+                    count: newCount,
+                });
+            }
+        }
+    });
+    return results;
+};
+
+const getLineageCountsByEntityType = (aggregations: AggregationMetadata[]): Map<EntityType, any> => {
+    const result = new Map();
+    aggregations.forEach((agg) => {
+        result.set(agg.value, { count: agg.count, isEntityType: true });
+    });
+    return result;
+};
+
+const getLineageCountsByType = (results: SearchAcrossLineageResults) => {
+    const entityTypeAggregations = results.facets?.find(
+        (facet) => facet.field === '_entityType' || facet.field === 'entity',
+    );
+    const entityTypeTotals =
+        (entityTypeAggregations && getLineageCountsByEntityType(entityTypeAggregations.aggregations)) || new Map();
+    const subTypeAggregations = results.facets?.find((facet) => facet.field === '_entityType␞typeNames');
+    const finalCounts = mergeEntityTypeSubTypeAggregations(entityTypeTotals, subTypeAggregations) || entityTypeTotals;
+    const result = Array.from(finalCounts.keys())
+        .map((key) => ({
+            type: key,
+            count: finalCounts.get(key).count,
+            isEntityType: finalCounts.get(key).isEntityType,
+        }))
+        .filter((entry) => entry.count > 0);
+    return result;
+};
+
+export const getDirectUpstreamSummary = (results: SearchAcrossLineageResults): LineageDirectionSummary => {
+    const { total } = results;
+    const types = getLineageCountsByType(results);
+    return {
+        total,
+        types,
+    };
+};
+
+export const getDirectDownstreamSummary = (results: SearchAcrossLineageResults): LineageDirectionSummary => {
+    const { total } = results;
+    const types = getLineageCountsByType(results);
+    return {
+        total,
+        types,
+    };
+};
+
+export const getRelatedEntitySummary = (
+    summary: LineageDirectionSummary,
+    entityRegistry: EntityRegistry,
+): React.ReactNode => {
+    return (
+        <>
+            {summary.types.map((type, idx) => {
+                return (
+                    <SummaryText>
+                        {type.count}{' '}
+                        {pluralize(
+                            type.count,
+                            type.isEntityType
+                                ? (entityRegistry.getEntityName(type.type as EntityType) as any)
+                                : type.type,
+                        ).toLocaleLowerCase()}
+                        {idx < summary.types.length - 1 && <>, </>}
+                    </SummaryText>
+                );
+            })}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LinkButton.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LinkButton.tsx
new file mode 100644
index 00000000000000..c3896baedace79
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LinkButton.tsx
@@ -0,0 +1,38 @@
+import { LinkOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { InstitutionalMemoryMetadata } from '../../../../../../types.generated';
+
+export const StyledLink = styled(Button)`
+    display: flex;
+    align-items: center;
+    min-width: 0;
+    padding: 0;
+    > span:not(.anticon) {
+        display: inline-block;
+        max-width: 100%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
+`;
+
+interface Props {
+    link: InstitutionalMemoryMetadata;
+}
+
+export default function LinkButton({ link }: Props) {
+    return (
+        <StyledLink
+            type="link"
+            href={link.url}
+            target="_blank"
+            rel="noreferrer"
+            key={`${link.label}-${link.url}-${link.actor.urn}`}
+        >
+            <LinkOutlined />
+            {link.description || link.label}
+        </StyledLink>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx
new file mode 100644
index 00000000000000..c21994020286dc
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx
@@ -0,0 +1,431 @@
+import React, { ReactNode, useEffect, useMemo, useRef, useState } from 'react';
+import { Button, Empty, Form, message, Modal, Select, Tag, Typography } from 'antd';
+import styled from 'styled-components/macro';
+import { getModalDomContainer } from '@src/utils/focus';
+import { ANTD_GRAY } from '@src/app/entityV2/shared/constants';
+import { LoadingOutlined } from '@ant-design/icons';
+import { CorpUser, Entity, EntityType, OwnerEntityType } from '../../../../../../../types.generated';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+import analytics, { EventType, EntityActionType } from '../../../../../../analytics';
+import {
+    useBatchAddOwnersMutation,
+    useBatchRemoveOwnersMutation,
+} from '../../../../../../../graphql/mutations.generated';
+import { useGetAutoCompleteResultsLazyQuery } from '../../../../../../../graphql/search.generated';
+import { useGetRecommendations } from '../../../../../../shared/recommendation';
+import { OwnerLabel } from '../../../../../../shared/OwnerLabel';
+import { handleBatchError } from '../../../../utils';
+import { useListOwnershipTypesQuery } from '../../../../../../../graphql/ownership.generated';
+import OwnershipTypesSelect from './OwnershipTypesSelect';
+
+const SelectInput = styled(Select)`
+    width: 480px;
+`;
+
+const StyleTag = styled(Tag)`
+    padding: 0px 7px 0px 0px;
+    margin: 2px;
+    display: flex;
+    justify-content: start;
+    align-items: center;
+`;
+
+const LoadingWrapper = styled.div`
+    display: flex;
+    justify-content: center;
+    margin: 5px;
+`;
+
+export enum OperationType {
+    ADD,
+    REMOVE,
+}
+
+type Props = {
+    urns: string[];
+    defaultOwnerType?: string;
+    hideOwnerType?: boolean | undefined;
+    operationType?: OperationType;
+    onCloseModal: () => void;
+    refetch?: () => Promise<any>;
+    entityType?: EntityType; // Only used for tracking events
+    onOkOverride?: (result: SelectedOwner[]) => void;
+    title?: string;
+    defaultValues?: { urn: string; entity?: Entity | null }[];
+};
+
+type SelectedOwner = {
+    label: string | React.ReactNode;
+    value: {
+        ownerUrn: string;
+        ownerEntityType: EntityType;
+    };
+};
+
+export const EditOwnersModal = ({
+    urns,
+    hideOwnerType,
+    defaultOwnerType,
+    operationType = OperationType.ADD,
+    onCloseModal,
+    refetch,
+    entityType,
+    onOkOverride,
+    title,
+    defaultValues,
+}: Props) => {
+    const entityRegistry = useEntityRegistry();
+
+    // Renders a search result in the select dropdown.
+    const renderSearchResult = (entity: Entity) => {
+        const avatarUrl =
+            (entity.type === EntityType.CorpUser && (entity as CorpUser).editableProperties?.pictureLink) || undefined;
+        const displayName = entityRegistry.getDisplayName(entity.type, entity);
+        return (
+            <Select.Option value={entity.urn} key={entity.urn} data-testid={`owner-${displayName}`}>
+                <OwnerLabel name={displayName} avatarUrl={avatarUrl} type={entity.type} />
+            </Select.Option>
+        );
+    };
+
+    const renderDropdownResult = (entity: Entity) => {
+        const avatarUrl =
+            entity.type === EntityType.CorpUser
+                ? (entity as CorpUser).editableProperties?.pictureLink || undefined
+                : undefined;
+        const displayName = entityRegistry.getDisplayName(entity.type, entity);
+        return <OwnerLabel name={displayName} avatarUrl={avatarUrl} type={entity.type} />;
+    };
+
+    const defaultValuesToSelectedOwners = (vals: { urn: string; entity?: Entity | null }[]): SelectedOwner[] => {
+        return vals.map((defaultValue) => ({
+            label: defaultValue.entity ? renderDropdownResult(defaultValue.entity) : defaultValue.urn,
+            value: {
+                ownerUrn: defaultValue.urn,
+                ownerEntityType: defaultValue.entity?.type || EntityType.CorpUser,
+            },
+        }));
+    };
+
+    const [inputValue, setInputValue] = useState('');
+    const [batchAddOwnersMutation] = useBatchAddOwnersMutation();
+    const [batchRemoveOwnersMutation] = useBatchRemoveOwnersMutation();
+    const { data: ownershipTypesData, loading: ownershipTypesLoading } = useListOwnershipTypesQuery({
+        variables: {
+            input: {},
+        },
+    });
+    const ownershipTypes = useMemo(() => {
+        return ownershipTypesData?.listOwnershipTypes?.ownershipTypes || [];
+    }, [ownershipTypesData]);
+
+    const [selectedOwners, setSelectedOwners] = useState<SelectedOwner[]>(
+        defaultValuesToSelectedOwners(defaultValues || []),
+    );
+    const [selectedOwnerType, setSelectedOwnerType] = useState<string | undefined>(undefined);
+
+    useEffect(() => {
+        if (ownershipTypes.length) {
+            const defaultType = ownershipTypes.find((type) => type.urn === defaultOwnerType);
+            setSelectedOwnerType(defaultType?.urn || ownershipTypes[0].urn);
+        }
+    }, [ownershipTypes, defaultOwnerType]);
+
+    // User and group dropdown search results!
+    const [groupSearch, { data: groupSearchData, loading: groupSearchLoading }] = useGetAutoCompleteResultsLazyQuery();
+    const [userSearch, { data: userSearchData, loading: userSearchLoading }] = useGetAutoCompleteResultsLazyQuery();
+    const userSearchResults: Array<Entity> = userSearchData?.autoComplete?.entities || [];
+    const groupSearchResults: Array<Entity> = groupSearchData?.autoComplete?.entities || [];
+    const combinedSearchResults = [...userSearchResults, ...groupSearchResults];
+    const { recommendedData, loading: recommendationsLoading } = useGetRecommendations([
+        EntityType.CorpGroup,
+        EntityType.CorpUser,
+    ]);
+    const loading = recommendationsLoading || userSearchLoading || groupSearchLoading;
+    const inputEl = useRef(null);
+
+    // Invokes the search API as the owner types
+    const handleSearch = (type: EntityType, text: string, searchQuery: any) => {
+        if (text) {
+            searchQuery({
+                variables: {
+                    input: {
+                        type,
+                        query: text,
+                        limit: 10,
+                    },
+                },
+            });
+        }
+    };
+
+    // Invokes the user search API for both users and groups.
+    const handleActorSearch = (text: string) => {
+        handleSearch(EntityType.CorpUser, text, userSearch);
+        handleSearch(EntityType.CorpGroup, text, groupSearch);
+    };
+
+    const ownerResult = !inputValue || inputValue.length === 0 ? recommendedData : combinedSearchResults;
+
+    const ownerSearchOptions = ownerResult?.map((result) => {
+        return renderSearchResult(result);
+    });
+
+    const onModalClose = () => {
+        setInputValue('');
+        setSelectedOwners([]);
+        setSelectedOwnerType(defaultOwnerType || undefined);
+        onCloseModal();
+    };
+
+    /**
+     * When a owner search result is selected, add the new owner  to the selectedOwners
+     * value: {ownerUrn: string, ownerEntityType: EntityType}
+     */
+    const onSelectOwner = (selectedValue: { key: string; label: React.ReactNode; value: string }) => {
+        if (inputEl && inputEl.current) {
+            (inputEl.current as any).blur();
+        }
+        const filteredActors = ownerResult
+            ?.filter((entity) => entity.urn === selectedValue.value)
+            .map((entity) => entity);
+        if (filteredActors?.length) {
+            const actor = filteredActors[0];
+            const ownerEntityType =
+                actor && actor.type === EntityType.CorpGroup ? OwnerEntityType.CorpGroup : OwnerEntityType.CorpUser;
+            const newValues = [
+                ...selectedOwners,
+                {
+                    label: selectedValue.value,
+                    value: {
+                        ownerUrn: selectedValue.value,
+                        ownerEntityType: ownerEntityType as unknown as EntityType,
+                    },
+                },
+            ];
+            setSelectedOwners(newValues);
+        }
+    };
+
+    // When a owner search result is deselected, remove the Owner
+    const onDeselectOwner = (selectedValue: { key: string; label: React.ReactNode; value: string }) => {
+        setInputValue('');
+        const newValues = selectedOwners.filter(
+            (owner) => owner.label !== selectedValue.value && owner.value.ownerUrn !== selectedValue.value,
+        );
+        setSelectedOwners(newValues);
+    };
+
+    // When a owner type is selected, set the type as selected type.
+    const onSelectOwnerType = (urn: string) => {
+        setSelectedOwnerType(urn);
+    };
+
+    const tagRender = ({ closable, label, onClose }: { closable: boolean; label: ReactNode; onClose: () => void }) => {
+        return (
+            <StyleTag
+                onMouseDown={(event) => {
+                    event.preventDefault();
+                    event.stopPropagation();
+                }}
+                closable={closable}
+                onClose={onClose}
+            >
+                {label}
+            </StyleTag>
+        );
+    };
+
+    const emitAnalytics = () => {
+        if (urns.length > 1) {
+            analytics.event({
+                type: EventType.BatchEntityActionEvent,
+                actionType: EntityActionType.UpdateOwnership,
+                entityUrns: urns,
+            });
+        } else {
+            analytics.event({
+                type: EventType.EntityActionEvent,
+                actionType: EntityActionType.UpdateOwnership,
+                entityType,
+                entityUrn: urns[0],
+            });
+        }
+    };
+
+    const batchAddOwners = async (inputs) => {
+        try {
+            await batchAddOwnersMutation({
+                variables: {
+                    input: {
+                        owners: inputs,
+                        resources: urns.map((urn) => ({ resourceUrn: urn })),
+                    },
+                },
+            });
+            message.success({ content: 'Owners Added', duration: 2 });
+            emitAnalytics();
+        } catch (e: unknown) {
+            message.destroy();
+            if (e instanceof Error) {
+                message.error(
+                    handleBatchError(urns, e, {
+                        content: `Failed to add owners: \n ${e.message || ''}`,
+                        duration: 3,
+                    }),
+                );
+            }
+        } finally {
+            refetch?.();
+            onModalClose();
+        }
+    };
+
+    const batchRemoveOwners = async (inputs) => {
+        try {
+            await batchRemoveOwnersMutation({
+                variables: {
+                    input: {
+                        ownerUrns: inputs.map((input) => input.ownerUrn),
+                        resources: urns.map((urn) => ({ resourceUrn: urn })),
+                    },
+                },
+            });
+            message.success({ content: 'Owners Removed', duration: 2 });
+            emitAnalytics();
+        } catch (e: unknown) {
+            message.destroy();
+            if (e instanceof Error) {
+                message.error(
+                    handleBatchError(urns, e, {
+                        content: `Failed to remove owners: \n ${e.message || ''}`,
+                        duration: 3,
+                    }),
+                );
+            }
+        } finally {
+            refetch?.();
+            onModalClose();
+        }
+    };
+
+    // Function to handle the modal action's
+    const onOk = () => {
+        if (selectedOwners.length === 0) {
+            return;
+        }
+
+        if (onOkOverride) {
+            onOkOverride(selectedOwners);
+            return;
+        }
+
+        const inputs = selectedOwners.map((selectedActor) => {
+            const input = {
+                ownerUrn: selectedActor.value.ownerUrn,
+                ownerEntityType: selectedActor.value.ownerEntityType,
+                ownershipTypeUrn: selectedOwnerType,
+            };
+            return input;
+        });
+
+        if (operationType === OperationType.ADD) {
+            batchAddOwners(inputs);
+        } else {
+            batchRemoveOwners(inputs);
+        }
+    };
+
+    function handleBlur() {
+        setInputValue('');
+    }
+
+    return (
+        <Modal
+            title={title || `${operationType === OperationType.ADD ? 'Add' : 'Remove'} Owners`}
+            visible
+            onCancel={onModalClose}
+            keyboard
+            footer={
+                <>
+                    <Button onClick={onModalClose} type="text">
+                        Cancel
+                    </Button>
+                    <Button type="primary" id="addOwnerButton" disabled={selectedOwners.length === 0} onClick={onOk}>
+                        Add
+                    </Button>
+                </>
+            }
+            getContainer={getModalDomContainer}
+        >
+            <Form layout="vertical" colon={false}>
+                <Form.Item key="owners" name="owners" label={<Typography.Text strong>Owner</Typography.Text>}>
+                    <Typography.Paragraph>Find a user or group</Typography.Paragraph>
+                    <Form.Item name="owner">
+                        <SelectInput
+                            labelInValue
+                            autoFocus
+                            defaultOpen
+                            mode="multiple"
+                            ref={inputEl}
+                            placeholder="Search for users or groups..."
+                            showSearch
+                            filterOption={false}
+                            defaultActiveFirstOption={false}
+                            onSelect={(asset: any) => onSelectOwner(asset)}
+                            onDeselect={(asset: any) => onDeselectOwner(asset)}
+                            onSearch={(value: string) => {
+                                // eslint-disable-next-line react/prop-types
+                                handleActorSearch(value.trim());
+                                // eslint-disable-next-line react/prop-types
+                                setInputValue(value.trim());
+                            }}
+                            tagRender={tagRender}
+                            onBlur={handleBlur}
+                            value={selectedOwners as any}
+                            defaultValue={selectedOwners.map((owner) => ({
+                                key: owner.value.ownerUrn,
+                                value: owner.value.ownerUrn,
+                                label: owner.label,
+                            }))}
+                            notFoundContent={
+                                !loading ? (
+                                    <Empty
+                                        description="No Users or Groups Found"
+                                        image={Empty.PRESENTED_IMAGE_SIMPLE}
+                                        style={{ color: ANTD_GRAY[7] }}
+                                    />
+                                ) : null
+                            }
+                        >
+                            {loading ? (
+                                <Select.Option value="loading" key="loading">
+                                    <LoadingWrapper>
+                                        <LoadingOutlined />
+                                    </LoadingWrapper>
+                                </Select.Option>
+                            ) : (
+                                ownerSearchOptions
+                            )}
+                        </SelectInput>
+                    </Form.Item>
+                </Form.Item>
+                {!hideOwnerType && (
+                    <Form.Item label={<Typography.Text strong>Type</Typography.Text>}>
+                        <Typography.Paragraph>Choose an owner type</Typography.Paragraph>
+                        <Form.Item name="type">
+                            {ownershipTypesLoading && <Select />}
+                            {!ownershipTypesLoading && (
+                                <OwnershipTypesSelect
+                                    selectedOwnerTypeUrn={selectedOwnerType}
+                                    ownershipTypes={ownershipTypes}
+                                    onSelectOwnerType={onSelectOwnerType}
+                                />
+                            )}
+                        </Form.Item>
+                    </Form.Item>
+                )}
+            </Form>
+        </Modal>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/LdapFormItem.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/LdapFormItem.tsx
new file mode 100644
index 00000000000000..9ff7ed8f2907d2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/LdapFormItem.tsx
@@ -0,0 +1,65 @@
+import { AutoComplete, Form } from 'antd';
+import { FormInstance } from 'antd/es/form/Form';
+import React, { useState } from 'react';
+import { useGetAutoCompleteResultsLazyQuery } from '../../../../../../../graphql/search.generated';
+import { EntityType } from '../../../../../../../types.generated';
+
+const OWNER_SEARCH_PLACEHOLDER = 'Search an LDAP';
+
+type Props = {
+    form: FormInstance<any>;
+};
+
+export const LdapFormItem = ({ form }: Props) => {
+    const [getOwnerAutoCompleteResults, { data: searchOwnerSuggestionsData }] = useGetAutoCompleteResultsLazyQuery();
+    const [ownerQuery, setOwnerQuery] = useState('');
+
+    const onSelectSuggestion = (ldap: string) => {
+        setOwnerQuery(ldap);
+    };
+
+    const onChangeOwnerQuery = async (query: string) => {
+        const row = await form.validateFields();
+
+        if (query && query.trim() !== '') {
+            getOwnerAutoCompleteResults({
+                variables: {
+                    input: {
+                        type: row.type,
+                        query,
+                        field: row.type === EntityType.CorpUser ? 'ldap' : 'name',
+                    },
+                },
+            });
+        }
+        setOwnerQuery(query);
+    };
+
+    return (
+        <Form.Item
+            name="ldap"
+            rules={[
+                {
+                    required: true,
+                    type: 'string',
+                    message: `Please provide a valid LDAP!`,
+                },
+            ]}
+        >
+            <AutoComplete
+                options={
+                    (searchOwnerSuggestionsData &&
+                        searchOwnerSuggestionsData.autoComplete &&
+                        searchOwnerSuggestionsData.autoComplete.suggestions.map((suggestion: string) => ({
+                            value: suggestion,
+                        }))) ||
+                    []
+                }
+                value={ownerQuery}
+                onSelect={onSelectSuggestion}
+                onSearch={onChangeOwnerQuery}
+                placeholder={OWNER_SEARCH_PLACEHOLDER}
+            />
+        </Form.Item>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/OwnershipTypesSelect.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/OwnershipTypesSelect.tsx
new file mode 100644
index 00000000000000..dede9b4bebfca9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/OwnershipTypesSelect.tsx
@@ -0,0 +1,43 @@
+import { OwnershipTypeEntity } from '@src/types.generated';
+import { Select, Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+
+const StyledSelect = styled(Select)`
+    .ant-select-selection-placeholder {
+        font-size: 12px;
+    }
+`;
+
+interface Props {
+    selectedOwnerTypeUrn?: string;
+    ownershipTypes: OwnershipTypeEntity[];
+    onSelectOwnerType: (typeUrn: string) => void;
+}
+
+export default function OwnershipTypesSelect({ selectedOwnerTypeUrn, ownershipTypes, onSelectOwnerType }: Props) {
+    return (
+        <StyledSelect
+            value={selectedOwnerTypeUrn}
+            onChange={(v) => onSelectOwnerType(v as string)}
+            placeholder="Select ownership type..."
+        >
+            {ownershipTypes.map((ownershipType: OwnershipTypeEntity | undefined) => {
+                const ownershipTypeUrn = ownershipType?.urn || '';
+                const ownershipTypeName = ownershipType?.info?.name || ownershipType?.urn || '';
+                const ownershipTypeDescription = ownershipType?.info?.description || '';
+                return (
+                    <Select.Option key={ownershipTypeUrn} value={ownershipTypeUrn}>
+                        <Typography.Text>{ownershipTypeName}</Typography.Text>
+                        <Typography.Paragraph
+                            style={{ wordWrap: 'break-word', whiteSpace: 'break-spaces' }}
+                            type="secondary"
+                        >
+                            {ownershipTypeDescription}
+                        </Typography.Paragraph>
+                    </Select.Option>
+                );
+            })}
+        </StyledSelect>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts
new file mode 100644
index 00000000000000..a5f5c9b382dc73
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts
@@ -0,0 +1,46 @@
+import { OwnershipType, OwnershipTypeEntity } from '../../../../../../../types.generated';
+import { forcePluralize } from '../../../../../../shared/textUtil';
+
+/**
+ * A mapping from OwnershipType to it's display name & description. In the future,
+ * we intend to make this configurable.
+ */
+export const OWNERSHIP_DISPLAY_TYPES = [
+    {
+        type: OwnershipType.TechnicalOwner,
+        name: 'Technical Owner',
+        description: 'Involved in the production, maintenance, or distribution of the asset(s).',
+    },
+    {
+        type: OwnershipType.BusinessOwner,
+        name: 'Business Owner',
+        description: 'Principle stakeholders or domain experts associated with the asset(s).',
+    },
+    {
+        type: OwnershipType.DataSteward,
+        name: 'Data Steward',
+        description: 'Involved in governance of the asset(s).',
+    },
+    {
+        type: OwnershipType.None,
+        name: 'None',
+        description: 'No ownership type specified.',
+    },
+];
+
+const ownershipTypeToDetails = new Map();
+OWNERSHIP_DISPLAY_TYPES.forEach((ownershipDetails) => {
+    ownershipTypeToDetails.set(ownershipDetails.type, ownershipDetails);
+});
+
+export const getNameFromType = (type: OwnershipType) => {
+    return ownershipTypeToDetails.get(type)?.name || type;
+};
+
+export const getDescriptionFromType = (type: OwnershipType) => {
+    return ownershipTypeToDetails.get(type)?.description || 'No description';
+};
+
+export function getOwnershipTypeName(ownershipType?: OwnershipTypeEntity | null) {
+    return (ownershipType?.info?.name && forcePluralize(ownershipType?.info?.name)) || 'Other';
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx
new file mode 100644
index 00000000000000..840be2c1df7dc9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx
@@ -0,0 +1,58 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { Typography } from 'antd';
+import { Owner, OwnershipTypeEntity } from '../../../../../../../../types.generated';
+import { ExpandedOwner } from '../../../../../components/styled/ExpandedOwner/ExpandedOwner';
+import { useMutationUrn, useRefetch } from '../../../../../../../entity/shared/EntityContext';
+import { getOwnershipTypeName } from '../ownershipUtils';
+import { REDESIGN_COLORS } from '../../../../../constants';
+
+const OwnershipTypeContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    margin-right 12px;
+    max-width: inherit;
+`;
+
+const OwnershipTypeNameText = styled(Typography.Text)`
+    font-family: 'Mulish', sans-serif;
+    font-weight: 500;
+    font-size: 10px;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+`;
+
+const OwnersContainer = styled.div`
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    margin-top: 8px;
+    max-width: inherit;
+`;
+
+interface Props {
+    ownershipType: OwnershipTypeEntity;
+    owners: Owner[];
+    readOnly?: boolean;
+}
+
+export const OwnershipTypeSection = ({ ownershipType, owners, readOnly }: Props) => {
+    const mutationUrn = useMutationUrn();
+    const refetch = useRefetch();
+    const ownershipTypeName = getOwnershipTypeName(ownershipType);
+    return (
+        <OwnershipTypeContainer>
+            <OwnershipTypeNameText>{ownershipTypeName}</OwnershipTypeNameText>
+            <OwnersContainer>
+                {owners.map((owner) => (
+                    <ExpandedOwner
+                        key={owner.owner.urn}
+                        entityUrn={owner.associatedUrn || mutationUrn}
+                        owner={owner}
+                        refetch={refetch}
+                        readOnly={readOnly}
+                    />
+                ))}
+            </OwnersContainer>
+        </OwnershipTypeContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection.tsx
new file mode 100644
index 00000000000000..637eed21ad6fad
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection.tsx
@@ -0,0 +1,129 @@
+import React, { useState } from 'react';
+import styled from 'styled-components/macro';
+import AddRoundedIcon from '@mui/icons-material/AddRounded';
+// import { ExpandedOwner } from '../../../../../components/styled/ExpandedOwner/ExpandedOwner';
+import { EMPTY_MESSAGES } from '../../../../../constants';
+import { Owner, OwnershipType, OwnershipTypeEntity } from '../../../../../../../../types.generated';
+import { useEntityData, useMutationUrn, useRefetch } from '../../../../../../../entity/shared/EntityContext';
+import { EditOwnersModal } from '../EditOwnersModal';
+import { ENTITY_PROFILE_OWNERS_ID } from '../../../../../../../onboarding/config/EntityProfileOnboardingConfig';
+import { OwnershipTypeSection } from './OwnershipTypeSection';
+import { getOwnershipTypeName } from '../ownershipUtils';
+import { SidebarSection } from '../../SidebarSection';
+import SectionActionButton from '../../SectionActionButton';
+import EmptySectionText from '../../EmptySectionText';
+
+const Content = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    flex-wrap: wrap;
+`;
+
+const OwnershipSections = styled.div`
+    display: flex;
+    align-items: start;
+    justify-content: start;
+    flex-wrap: wrap;
+    max-width: 100%;
+`;
+
+interface Props {
+    properties?: any;
+    readOnly?: boolean;
+}
+
+export const SidebarOwnerSection = ({ properties, readOnly }: Props) => {
+    const { entityType, entityData } = useEntityData();
+    const mutationUrn = useMutationUrn();
+
+    const refetch = useRefetch();
+    const [showAddModal, setShowAddModal] = useState(false);
+
+    const ownersEmpty = !entityData?.ownership?.owners?.length;
+    const ownershipTypesMap: Map<string, OwnershipTypeEntity> = new Map();
+    const ownersByTypeMap: Map<string, Owner[]> = new Map();
+    entityData?.ownership?.owners?.forEach((owner) => {
+        const ownershipType = owner?.ownershipType;
+        const ownershipTypeName = getOwnershipTypeName(ownershipType);
+        // If ownership type is not in the map, add it
+        if (ownershipType && !ownershipTypesMap.has(ownershipTypeName)) {
+            ownershipTypesMap.set(ownershipTypeName, ownershipType);
+        }
+        if (!ownersByTypeMap.has(ownershipTypeName)) {
+            ownersByTypeMap.set(ownershipTypeName, []);
+        }
+        ownersByTypeMap.get(ownershipTypeName)?.push(owner);
+    });
+    // Sort ownership types by name alphabetically
+    const ownershipTypeNames = Array.from(ownershipTypesMap.keys()).sort();
+
+    let defaultOwnerTypeUrn = 'urn:li:ownershipType:__system__technical_owner';
+    switch (properties?.defaultOwnerType) {
+        case OwnershipType.TechnicalOwner:
+            defaultOwnerTypeUrn = 'urn:li:ownershipType:__system__technical_owner';
+            break;
+        case OwnershipType.BusinessOwner:
+            defaultOwnerTypeUrn = 'urn:li:ownershipType:__system__business_owner';
+            break;
+        case OwnershipType.DataSteward:
+            defaultOwnerTypeUrn = 'urn:li:ownershipType:__system__data_steward';
+            break;
+        default:
+            break;
+    }
+
+    const canEditOwners = !!entityData?.privileges?.canEditOwners;
+
+    return (
+        <div id={ENTITY_PROFILE_OWNERS_ID}>
+            <SidebarSection
+                title="Owners"
+                content={
+                    <Content>
+                        <OwnershipSections>
+                            {ownershipTypeNames.map((ownershipTypeName) => {
+                                const ownershipType = ownershipTypesMap.get(ownershipTypeName) as OwnershipTypeEntity;
+                                const owners = ownersByTypeMap.get(ownershipTypeName) as Owner[];
+                                return (
+                                    <OwnershipTypeSection
+                                        key={ownershipTypeName}
+                                        ownershipType={ownershipType}
+                                        owners={owners}
+                                        readOnly={readOnly}
+                                    />
+                                );
+                            })}
+                        </OwnershipSections>
+                        {ownersEmpty && <EmptySectionText message={EMPTY_MESSAGES.owners.title} />}
+                    </Content>
+                }
+                extra={
+                    !readOnly && (
+                        <SectionActionButton
+                            button={<AddRoundedIcon />}
+                            onClick={(event) => {
+                                setShowAddModal(true);
+                                event.stopPropagation();
+                            }}
+                            actionPrivilege={canEditOwners}
+                            dataTestId="addOwner"
+                        />
+                    )
+                }
+            />
+            {showAddModal && (
+                <EditOwnersModal
+                    urns={[mutationUrn]}
+                    defaultOwnerType={defaultOwnerTypeUrn}
+                    hideOwnerType={properties?.hideOwnerType || false}
+                    entityType={entityType}
+                    refetch={refetch}
+                    onCloseModal={() => {
+                        setShowAddModal(false);
+                    }}
+                />
+            )}
+        </div>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx
new file mode 100644
index 00000000000000..80e5c53df25381
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx
@@ -0,0 +1,187 @@
+import { Button, Form, Modal, Select, Tag } from 'antd';
+import { Tooltip } from '@components';
+import React, { ReactNode, useRef, useState } from 'react';
+import styled from 'styled-components/macro';
+import { useGetSearchResultsLazyQuery } from '../../../../../../../graphql/search.generated';
+import { DataPlatform, Entity, EntityType } from '../../../../../../../types.generated';
+import { useEnterKeyListener } from '../../../../../../shared/useEnterKeyListener';
+
+type Props = {
+    onCloseModal: () => void;
+    defaultValues?: { urn: string; entity?: Entity | null }[];
+    onOk?: (result: string[]) => void;
+    titleOverride?: string;
+};
+
+type SelectedPlatform = {
+    entity?: Entity | null;
+    urn: string;
+};
+
+const StyleTag = styled(Tag)`
+    padding: 0px 7px;
+    margin-right: 3px;
+    display: flex;
+    justify-content: start;
+    align-items: center;
+`;
+
+const PreviewImage = styled.img`
+    max-height: 18px;
+    width: auto;
+    object-fit: contain;
+    background-color: transparent;
+    margin-right: 4px;
+`;
+
+export const SelectPlatformModal = ({ onCloseModal, defaultValues, onOk, titleOverride }: Props) => {
+    const [platformSearch, { data: platforSearchData }] = useGetSearchResultsLazyQuery();
+    const platformSearchResults =
+        platforSearchData?.search?.searchResults?.map((searchResult) => searchResult.entity) || [];
+
+    const [selectedPlatforms, setSelectedPlatforms] = useState<SelectedPlatform[] | undefined>(defaultValues);
+
+    const inputEl = useRef(null);
+
+    const onModalClose = () => {
+        onCloseModal();
+    };
+
+    const handleSearch = (text: string) => {
+        platformSearch({
+            variables: {
+                input: {
+                    type: EntityType.DataPlatform,
+                    query: text,
+                    start: 0,
+                    count: 5,
+                },
+            },
+        });
+    };
+
+    // Renders a search result in the select dropdown.
+    const renderSearchResult = (entity: DataPlatform) => {
+        const displayName = entity.properties?.displayName || entity.name;
+        const truncatedDisplayName = displayName.length > 25 ? `${displayName.slice(0, 25)}...` : displayName;
+        return (
+            <Tooltip title={displayName}>
+                {!!entity.properties?.logoUrl && <PreviewImage src={entity?.properties?.logoUrl} alt={entity?.name} />}
+                <span>{truncatedDisplayName}</span>
+            </Tooltip>
+        );
+    };
+
+    const platformSearchOptions = platformSearchResults?.map((result) => {
+        return (
+            <Select.Option value={result.urn} key={result.urn}>
+                {renderSearchResult(result as DataPlatform)}
+            </Select.Option>
+        );
+    });
+
+    const onSelectPlatform = (newValue: { value: string; label: ReactNode }) => {
+        const newUrn = newValue.value;
+
+        if (inputEl && inputEl.current) {
+            (inputEl.current as any).blur();
+        }
+
+        const filteredPlatforms =
+            platformSearchResults?.filter((entity) => entity.urn === newUrn).map((entity) => entity) || [];
+
+        if (filteredPlatforms.length) {
+            const platform = filteredPlatforms[0] as DataPlatform;
+            setSelectedPlatforms([
+                ...(selectedPlatforms || []),
+                {
+                    entity: platform,
+                    urn: newUrn,
+                },
+            ]);
+        }
+    };
+
+    const onDeselectPlatform = (val) => {
+        setSelectedPlatforms(selectedPlatforms?.filter((platform) => platform.urn !== val.value));
+    };
+
+    const handleOk = () => {
+        if (!selectedPlatforms) {
+            return;
+        }
+
+        if (onOk) {
+            onOk(selectedPlatforms?.map((platform) => platform.urn));
+        }
+    };
+
+    // Handle the Enter press
+    useEnterKeyListener({
+        querySelectorToExecuteClick: '#setPlatformButton',
+    });
+
+    const tagRender = (props) => {
+        // eslint-disable-next-line react/prop-types
+        const { label, closable, onClose } = props;
+        const onPreventMouseDown = (event) => {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+        return (
+            <StyleTag onMouseDown={onPreventMouseDown} closable={closable} onClose={onClose}>
+                {label}
+            </StyleTag>
+        );
+    };
+
+    return (
+        <Modal
+            title={titleOverride || 'Select Platform'}
+            visible
+            onCancel={onModalClose}
+            footer={
+                <>
+                    <Button onClick={onModalClose} type="text">
+                        Cancel
+                    </Button>
+                    <Button id="setPlatformButton" disabled={selectedPlatforms?.length === 0} onClick={handleOk}>
+                        Add
+                    </Button>
+                </>
+            }
+        >
+            <Form component={false}>
+                <Form.Item>
+                    <Select
+                        autoFocus
+                        filterOption={false}
+                        showSearch
+                        mode="multiple"
+                        defaultActiveFirstOption={false}
+                        placeholder="Search for Platforms..."
+                        onSelect={(platformUrn: any) => onSelectPlatform(platformUrn)}
+                        onDeselect={onDeselectPlatform}
+                        onSearch={(value: string) => {
+                            // eslint-disable-next-line react/prop-types
+                            handleSearch(value.trim());
+                        }}
+                        ref={inputEl}
+                        labelInValue
+                        value={selectedPlatforms?.map((platform) => ({
+                            value: platform.urn,
+                            label: platform.entity ? (
+                                renderSearchResult(platform.entity as DataPlatform)
+                            ) : (
+                                <span>{platform.urn}</span>
+                            ),
+                        }))}
+                        tagRender={tagRender}
+                    >
+                        {platformSearchOptions}
+                    </Select>
+                </Form.Item>
+            </Form>
+        </Modal>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/ProfileSidebarResizer.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/ProfileSidebarResizer.tsx
new file mode 100644
index 00000000000000..3a05ad9991b946
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/ProfileSidebarResizer.tsx
@@ -0,0 +1,56 @@
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import React from 'react';
+import styled from 'styled-components';
+
+type Props = {
+    setSidePanelWidth: (width: number) => void;
+    initialSize: number;
+    isSidebarOnLeft?: boolean;
+};
+
+const ResizerBar = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    min-height: 100%;
+    width: 4px;
+    cursor: col-resize;
+    ${(props) => !props.$isShowNavBarRedesign && 'margin-right: 12px;'}
+`;
+
+export const ProfileSidebarResizer = ({ setSidePanelWidth, initialSize, isSidebarOnLeft }: Props) => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    let dragState: { initialX: number; initialSize: number } | undefined;
+
+    const dragContinue = (event: MouseEvent) => {
+        if (!dragState) {
+            return;
+        }
+
+        let xDifference = event.clientX - (dragState.initialX || 0);
+        if (isSidebarOnLeft) {
+            xDifference = (dragState.initialX || 0) - event.clientX;
+        }
+        setSidePanelWidth(dragState.initialSize - xDifference);
+    };
+
+    const stopDragging = () => {
+        window.removeEventListener('mousemove', dragContinue, false);
+        window.removeEventListener('mouseup', stopDragging, false);
+    };
+
+    const onDrag = (event: React.MouseEvent) => {
+        const { clientX } = event;
+        dragState = { initialX: clientX, initialSize };
+
+        window.addEventListener('mousemove', dragContinue, false);
+        window.addEventListener('mouseup', stopDragging, false);
+        event.preventDefault();
+    };
+
+    return (
+        <ResizerBar
+            onMouseDown={(event) => {
+                onDrag(event);
+            }}
+            $isShowNavBarRedesign={isShowNavBarRedesign}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryCreatedAtSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryCreatedAtSection.tsx
new file mode 100644
index 00000000000000..a5a5ce725ec13d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryCreatedAtSection.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+// import styled from 'styled-components/macro';
+
+import { useBaseEntity } from '../../../../../../entity/shared/EntityContext';
+import { SidebarSection } from '../SidebarSection';
+import { QueryEntity } from '../../../../../../../types.generated';
+import { toRelativeTimeString } from '../../../../../../shared/time/timeUtils';
+
+export default function SidebarQueryUpdatedAtSection() {
+    const baseEntity = useBaseEntity<{ entity: QueryEntity }>();
+
+    return (
+        <SidebarSection
+            title="First Seen"
+            content={<>{toRelativeTimeString(baseEntity?.entity?.properties?.created?.time || 0)}</>}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryDefinitionSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryDefinitionSection.tsx
new file mode 100644
index 00000000000000..10cf3206f44299
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryDefinitionSection.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import styled from 'styled-components';
+import { useBaseEntity } from '../../../../../../entity/shared/EntityContext';
+import { QueryEntity } from '../../../../../../../types.generated';
+import { SidebarSection } from '../SidebarSection';
+import PlatformIcon from '../../../../../../sharedV2/icons/PlatformIcon';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+import { REDESIGN_COLORS } from '../../../../constants';
+
+const DefinitionLink = styled.a`
+    align-items: center;
+    display: flex;
+    margin-bottom: 4px;
+    overflow: hidden;
+    width: 100%;
+`;
+
+const DefinitionIcon = styled(PlatformIcon)`
+    margin-right: 0.5em;
+`;
+
+const DefinitionName = styled.span`
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+`;
+
+export default function SidebarQueryDefinitionSection() {
+    const query = useBaseEntity<{ entity: QueryEntity | null }>()?.entity;
+    const entityRegistry = useEntityRegistry();
+
+    if (!query?.properties?.origin) {
+        return null;
+    }
+
+    const { origin } = query.properties;
+    const entity = entityRegistry.getGenericEntityProperties(origin.type, origin);
+
+    return (
+        <SidebarSection
+            title="Definition"
+            content={
+                <>
+                    <DefinitionLink href={entityRegistry.getEntityUrl(origin.type, origin.urn)}>
+                        {entity?.platform && (
+                            <DefinitionIcon platform={entity?.platform} size={16} entityType={origin.type} />
+                        )}
+                        <DefinitionName>{entityRegistry.getDisplayName(origin.type, entity)}</DefinitionName>
+                    </DefinitionLink>
+                </>
+            }
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryDescriptionSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryDescriptionSection.tsx
new file mode 100644
index 00000000000000..3ba32cc0f46d7c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryDescriptionSection.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+
+import { useBaseEntity } from '../../../../../../entity/shared/EntityContext';
+import { SidebarSection } from '../SidebarSection';
+import { QueryEntity } from '../../../../../../../types.generated';
+import { REDESIGN_COLORS } from '../../../../constants';
+
+const ContentWrapper = styled.div`
+    font-size: 12px;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+`;
+
+export default function SidebarQueryDescriptionSection() {
+    const baseEntity = useBaseEntity<{ entity: QueryEntity }>();
+
+    if (!baseEntity?.entity?.properties?.description) {
+        return null;
+    }
+
+    return (
+        <SidebarSection
+            title="Description"
+            content={
+                <>
+                    <ContentWrapper>{baseEntity?.entity?.properties?.description}</ContentWrapper>
+                </>
+            }
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryOperationsSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryOperationsSection.tsx
new file mode 100644
index 00000000000000..a619a9ab8119c9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryOperationsSection.tsx
@@ -0,0 +1,120 @@
+import React, { useContext } from 'react';
+import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
+import styled from 'styled-components';
+import EntitySidebarContext, { FineGrainedOperation } from '../../../../../../sharedV2/EntitySidebarContext';
+import { REDESIGN_COLORS } from '../../../../constants';
+import { SidebarSection } from '../SidebarSection';
+
+export default function SidebarQueryOperationsSection() {
+    const { fineGrainedOperations } = useContext(EntitySidebarContext);
+
+    if (!fineGrainedOperations?.length) {
+        return null;
+    }
+
+    return (
+        <>
+            {fineGrainedOperations.map((operation: FineGrainedOperation, index) => (
+                <SidebarSection
+                    title={`Operation ${index + 1}`}
+                    /* eslint-disable-next-line react/no-array-index-key */
+                    key={index}
+                    content={<SidebarQueryOperation operation={operation} />}
+                />
+            ))}{' '}
+        </>
+    );
+}
+
+const OperationContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+`;
+
+const Section = styled.div`
+    display: flex;
+    flex-direction: column;
+    align-items: start;
+    justify-content: start;
+    margin-bottom: 6px;
+    text-wrap: wrap;
+`;
+
+const SectionHeader = styled.div`
+    display: flex;
+    height: 20px;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    font-size: 12px;
+    font-weight: 700;
+    line-height: 20px;
+    letter-spacing: 0.04em;
+`;
+
+const HeaderColumn = styled.th`
+    padding: 0 0.5em 0 0;
+    text-align: left;
+    vertical-align: top;
+    font-weight: normal;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+`;
+
+const TextColumn = styled.td`
+    text-wrap: wrap;
+    font-family: 'Roboto Mono', monospace;
+`;
+
+const PreviewSyntax = styled(SyntaxHighlighter)`
+    max-width: 100%;
+    max-height: 150px;
+    overflow: hidden;
+    mask-image: linear-gradient(to bottom, rgba(0, 0, 0, 1) 80%, rgba(255, 0, 0, 0.5) 85%, rgba(255, 0, 0, 0) 90%);
+
+    span {
+        font-family: 'Roboto Mono', monospace;
+    }
+`;
+
+function SidebarQueryOperation({ operation }: { operation: FineGrainedOperation }) {
+    return (
+        <OperationContainer>
+            {operation.transformOperation && (
+                <Section key="logic">
+                    <SectionHeader>LOGIC</SectionHeader>
+                    <PreviewSyntax language="sql" showLineNumbers wrapLines lineNumberStyle={{ display: 'none' }}>
+                        {operation.transformOperation}
+                    </PreviewSyntax>
+                </Section>
+            )}
+            {operation.inputColumns?.length && (
+                <OperationInputsOrOutputs title="inputs" columns={operation.inputColumns} />
+            )}
+            {operation.outputColumns?.length && (
+                <OperationInputsOrOutputs title="outputs" columns={operation.outputColumns} />
+            )}
+        </OperationContainer>
+    );
+}
+
+function OperationInputsOrOutputs({ title, columns }: { title: string; columns: Array<[string, string]> }) {
+    const tables = Array.from(new Set(columns.map(([name]) => name)));
+    return (
+        <Section key={title}>
+            <SectionHeader>{title.toLocaleUpperCase()}</SectionHeader>
+            <div>
+                <table cellSpacing={0} cellPadding={0}>
+                    <tbody>
+                        <tr>
+                            <HeaderColumn>Tables:</HeaderColumn>
+                            <TextColumn>{tables.join(', ')}</TextColumn>
+                        </tr>
+                        <tr>
+                            <HeaderColumn>Columns:</HeaderColumn>
+                            <TextColumn>{columns.map(([table, col]) => `${table}.${col}`).join(', ')}</TextColumn>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </Section>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryUpdatedAtSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryUpdatedAtSection.tsx
new file mode 100644
index 00000000000000..9937b2274b1117
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryUpdatedAtSection.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+// import styled from 'styled-components/macro';
+
+import { useBaseEntity } from '../../../../../../entity/shared/EntityContext';
+import { SidebarSection } from '../SidebarSection';
+import { QueryEntity } from '../../../../../../../types.generated';
+import { toRelativeTimeString } from '../../../../../../shared/time/timeUtils';
+
+export default function SidebarQueryUpdatedAtSection() {
+    const baseEntity = useBaseEntity<{ entity: QueryEntity }>();
+
+    return (
+        <SidebarSection
+            title="Last Seen"
+            content={<>{toRelativeTimeString(baseEntity?.entity?.properties?.lastModified?.time || 0)}</>}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations.tsx
new file mode 100644
index 00000000000000..db233598f3b967
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations.tsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import styled from 'styled-components';
+import { useListRecommendationsQuery } from '../../../../../../../graphql/recommendations.generated';
+import {
+    EntityType,
+    ScenarioType,
+    RecommendationModule as RecommendationModuleType,
+} from '../../../../../../../types.generated';
+import { RecommendationModule } from '../../../../../../recommendations/RecommendationModule';
+import { RecommendationDisplayType } from '../../../../../../recommendations/types';
+import { SidebarHeader } from '../SidebarHeader';
+
+const RecommendationsContainer = styled.div``;
+
+const RecommendationContainer = styled.div`
+    margin-bottom: 20px;
+`;
+
+export const SidebarEntityRecommendations = ({
+    userUrn,
+    entityUrn,
+    entityType,
+}: {
+    userUrn: string;
+    entityUrn: string;
+    entityType: EntityType;
+}) => {
+    const scenario = ScenarioType.EntityProfile;
+    const { data } = useListRecommendationsQuery({
+        variables: {
+            input: {
+                userUrn,
+                requestContext: {
+                    scenario,
+                    entityRequestContext: {
+                        urn: entityUrn,
+                        type: entityType,
+                    },
+                },
+                limit: 3,
+            },
+        },
+    });
+    const recommendationModules = data?.listRecommendations?.modules;
+    return (
+        <RecommendationsContainer>
+            {recommendationModules &&
+                recommendationModules.map((module) => (
+                    <RecommendationContainer>
+                        <SidebarHeader title={module.title} />
+                        <RecommendationModule
+                            key={module.moduleId}
+                            module={module as RecommendationModuleType}
+                            scenarioType={scenario}
+                            showTitle={false}
+                            displayType={RecommendationDisplayType.COMPACT}
+                        />
+                    </RecommendationContainer>
+                ))}
+        </RecommendationsContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarRecommendationsSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarRecommendationsSection.tsx
new file mode 100644
index 00000000000000..c79a386749690c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarRecommendationsSection.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import styled from 'styled-components';
+import { useUserContext } from '../../../../../../context/useUserContext';
+import { useEntityData } from '../../../../../../entity/shared/EntityContext';
+import { SidebarEntityRecommendations } from './SidebarEntityRecommendations';
+
+const RecommendationsContainer = styled.div``;
+
+export const SidebarRecommendationsSection = () => {
+    const { urn, entityType } = useEntityData();
+    const authenticatedUserUrn = useUserContext()?.user?.urn;
+    return (
+        <RecommendationsContainer>
+            {authenticatedUserUrn && (
+                <SidebarEntityRecommendations userUrn={authenticatedUserUrn} entityUrn={urn} entityType={entityType} />
+            )}
+        </RecommendationsContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SectionActionButton.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SectionActionButton.tsx
new file mode 100644
index 00000000000000..4c6f050d7c305f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SectionActionButton.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Tooltip } from '@components';
+import { REDESIGN_COLORS } from '../../../constants';
+
+export const ActionButton = styled.div<{ privilege: boolean }>`
+    color: ${(props) =>
+        props.privilege ? `${REDESIGN_COLORS.TITLE_PURPLE}` : `${REDESIGN_COLORS.SECONDARY_LIGHT_GREY}`};
+    border: ${(props) =>
+        props.privilege
+            ? `1px solid ${REDESIGN_COLORS.TITLE_PURPLE}`
+            : `1px solid ${REDESIGN_COLORS.SECONDARY_LIGHT_GREY}`};
+    ${(props) => (props.privilege ? 'cursor: pointer;' : 'pointer-events: none;')}
+    height: 20px;
+    width: 20px;
+    border-radius: 50%;
+    text-align: center;
+    svg {
+        width: 18px;
+        height: 18px;
+        padding: 3px;
+    }
+    :hover {
+        ${(props) =>
+            props.privilege &&
+            `
+        color: ${REDESIGN_COLORS.WHITE};
+        background: ${REDESIGN_COLORS.TITLE_PURPLE};
+        `}
+    
+`;
+
+type Props = {
+    tip?: string;
+    button: React.ReactNode;
+    onClick: any;
+    actionPrivilege?: boolean;
+    dataTestId?: string;
+};
+
+const SectionActionButton = ({ tip, button, onClick, actionPrivilege = true, dataTestId }: Props) => {
+    return (
+        <Tooltip placement="top" title={!actionPrivilege ? 'No access' : tip} showArrow={false}>
+            <>
+                <ActionButton onClick={onClick} privilege={actionPrivilege} data-testid={dataTestId}>
+                    {button}
+                </ActionButton>
+            </>
+        </Tooltip>
+    );
+};
+
+export default SectionActionButton;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapseIcon.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapseIcon.tsx
new file mode 100644
index 00000000000000..b73a546370b564
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapseIcon.tsx
@@ -0,0 +1,59 @@
+import { Tooltip } from '@components';
+import React, { useContext } from 'react';
+import styled from 'styled-components';
+import KeyboardTabOutlinedIcon from '@mui/icons-material/KeyboardTabOutlined';
+import EntitySidebarContext from '../../../../../sharedV2/EntitySidebarContext';
+import { REDESIGN_COLORS, SEARCH_COLORS } from '../../../constants';
+
+const Container = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 56px;
+    padding: 8px;
+`;
+
+const StyledKeyboardTabOutlinedIcon = styled(KeyboardTabOutlinedIcon)<{ direction: 'left' | 'right' }>`
+    ${(props) => (props.direction === 'left' && 'transform: scaleX(-1);') || undefined}
+`;
+
+const CloseButton = styled.div<{ $isClosed: boolean }>`
+    cursor: pointer;
+    margin: 0px;
+    padding: 2px 6px;
+    display: flex;
+    align-items: center;
+    height: 40px;
+    width: 40px;
+    border-radius: 6px;
+    justify-content: center;
+    color: ${SEARCH_COLORS.TITLE_PURPLE};
+    ${(props) =>
+        props.$isClosed &&
+        `
+        background-color: ${REDESIGN_COLORS.TITLE_PURPLE_2};
+        color: ${REDESIGN_COLORS.WHITE};  
+    `}
+    :hover {
+        background-color: ${REDESIGN_COLORS.TITLE_PURPLE_2};
+        color: ${REDESIGN_COLORS.WHITE};
+    }
+`;
+
+export default function SidebarCollapseIcon() {
+    const { isClosed, setSidebarClosed } = useContext(EntitySidebarContext);
+
+    return (
+        <Container>
+            <Tooltip placement="left" showArrow={false} title={!isClosed ? 'Close sidebar' : 'Open sidebar'}>
+                <CloseButton
+                    $isClosed={isClosed}
+                    onClick={() => setSidebarClosed(!isClosed)}
+                    data-testid="toggleSidebar"
+                >
+                    <StyledKeyboardTabOutlinedIcon direction={isClosed ? 'left' : 'right'} />
+                </CloseButton>
+            </Tooltip>
+        </Container>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapsibleHeader.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapsibleHeader.tsx
new file mode 100644
index 00000000000000..792ee588930166
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapsibleHeader.tsx
@@ -0,0 +1,102 @@
+import ViewInPlatform from '@app/entityV2/shared/externalUrl/ViewInPlatform';
+import React, { useContext } from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import EntitySidebarContext from '../../../../../sharedV2/EntitySidebarContext';
+import { REDESIGN_COLORS } from '../../../constants';
+import { EntitySidebarTab } from '../../../types';
+import { TitleAction } from './TitleAction';
+import MoreOptionsMenuAction from '../../../EntityDropdown/MoreOptionsMenuAction';
+import { EntityMenuItems } from '../../../EntityDropdown/EntityMenuActions';
+import { useEntityData, useRefetch } from '../../../../../entity/shared/EntityContext';
+
+const Controls = styled.div<{ isCollapsed: boolean }>`
+    display: flex;
+    align-items: center;
+    justify-content: ${(props) => (props.isCollapsed ? 'center' : 'space-between')};
+    height: 56px;
+    padding: 8px 20px 5px 20px;
+    border-bottom: 1px solid #d5d5d5;
+`;
+
+const Title = styled.div`
+    display: flex;
+    flex-direction: column;
+    align-items: start;
+    justify-content: center;
+    gap: 2px;
+    width: 100%;
+`;
+
+const TabTitle = styled(Typography.Text)`
+    font-size: 14px;
+    font-weight: 800;
+    line-height: 20px;
+    color: ${REDESIGN_COLORS.HEADING_COLOR};
+`;
+
+const TitleDescription = styled(Typography.Text)`
+    font-size: 10px;
+    font-weight: 400;
+    color: ${REDESIGN_COLORS.HEADING_COLOR};
+    opacity: 0.5;
+`;
+
+const Top = styled.div`
+    display: flex;
+    justify-content: space-between;
+    width: 100%;
+`;
+
+const RightActions = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 3px;
+`;
+
+interface Props {
+    currentTab?: EntitySidebarTab;
+    headerDropdownItems?: Set<EntityMenuItems>;
+}
+
+export default function SidebarCollapsibleHeader({ currentTab, headerDropdownItems }: Props) {
+    const { isClosed, forLineage, separateSiblings } = useContext(EntitySidebarContext);
+
+    const currentTabName = currentTab?.name === 'About' ? 'Summary' : currentTab?.name;
+    const currentTabDescription = currentTab?.description;
+    const actionType = currentTab?.properties?.actionType;
+    const icon = currentTab?.icon;
+
+    const { urn, entityType, entityData } = useEntityData();
+    const refetch = useRefetch();
+
+    return (
+        <Controls isCollapsed={isClosed}>
+            {!isClosed && currentTab && (
+                <Title>
+                    <Top>
+                        <TabTitle>{currentTabName}</TabTitle>
+                        <RightActions>
+                            {actionType && <TitleAction actionType={actionType} icon={icon} />}
+                            {forLineage && (
+                                <ViewInPlatform hideSiblingActions={separateSiblings} urn={urn} data={entityData} />
+                            )}
+                            {forLineage && headerDropdownItems && (
+                                <MoreOptionsMenuAction
+                                    menuItems={headerDropdownItems}
+                                    urn={urn}
+                                    entityType={entityType}
+                                    entityData={entityData}
+                                    refetch={refetch}
+                                    size={22}
+                                />
+                            )}
+                        </RightActions>
+                    </Top>
+
+                    {currentTabDescription && <TitleDescription> {currentTabDescription}</TitleDescription>}
+                </Title>
+            )}
+        </Controls>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCompactSchemaSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCompactSchemaSection.tsx
new file mode 100644
index 00000000000000..0154bcdd114283
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCompactSchemaSection.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { ENTITY_PROFILE_SCHEMA_ID } from '../../../../../onboarding/config/EntityProfileOnboardingConfig';
+import { SidebarSection } from './SidebarSection';
+import { TabRenderType } from '../../../types';
+import { SchemaTab } from '../../../tabs/Dataset/Schema/SchemaTab';
+
+export const SidebarCompactSchemaSection = () => {
+    return (
+        <div id={ENTITY_PROFILE_SCHEMA_ID}>
+            <SidebarSection title="Fields" content={<SchemaTab renderType={TabRenderType.COMPACT} />} />
+        </div>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader.tsx
new file mode 100644
index 00000000000000..4d8eeba24408c7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader.tsx
@@ -0,0 +1,106 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Container, DataPlatform, EntityType, Post } from '../../../../../../types.generated';
+import { useEntityData, useRefetch } from '../../../../../entity/shared/EntityContext';
+import ContextPath from '../../../../../previewV2/ContextPath';
+import HealthIcon from '../../../../../previewV2/HealthIcon';
+import NotesIcon from '../../../../../previewV2/NotesIcon';
+import useContentTruncation from '../../../../../shared/useContentTruncation';
+import HorizontalScroller from '../../../../../sharedV2/carousel/HorizontalScroller';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { IconStyleType } from '../../../../Entity';
+import EntityTitleLoadingSection from '../header/EntityHeaderLoadingSection';
+import EntityName from '../header/EntityName';
+import ContainerIcon from '../header/PlatformContent/ContainerIcon';
+import PlatformHeaderIcons from '../header/PlatformContent/PlatformHeaderIcons';
+import StructuredPropertyBadge from '../header/StructuredPropertyBadge';
+import { getDisplayedEntityType } from '../header/utils';
+import { DeprecationIcon } from '../../../components/styled/DeprecationIcon';
+
+const TitleContainer = styled(HorizontalScroller)`
+    display: flex;
+    gap: 5px;
+`;
+
+const EntityDetailsContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 5px;
+    margin-left: 8px;
+`;
+
+const NameWrapper = styled.div`
+    display: flex;
+    gap: 6px;
+    align-items: center;
+
+    font-size: 16px;
+`;
+
+const SidebarEntityHeader = () => {
+    const { urn, entityType, entityData, loading } = useEntityData();
+    const refetch = useRefetch();
+    const entityRegistry = useEntityRegistry();
+    const entityUrl = entityRegistry.getEntityUrl(entityType, entityData?.urn as string);
+
+    const { contentRef, isContentTruncated } = useContentTruncation(entityData);
+    const typeIcon =
+        entityType === EntityType.Container ? (
+            <ContainerIcon container={entityData as Container} />
+        ) : (
+            entityRegistry.getIcon(entityType, 12, IconStyleType.ACCENT)
+        );
+    const displayedEntityType = getDisplayedEntityType(entityData, entityRegistry, entityType);
+
+    const platform = entityType === EntityType.SchemaField ? entityData?.parent?.platform : entityData?.platform;
+    const platforms =
+        entityType === EntityType.SchemaField ? entityData?.parent?.siblingPlatforms : entityData?.siblingPlatforms;
+
+    if (loading) {
+        return <EntityTitleLoadingSection />;
+    }
+    return (
+        <TitleContainer scrollButtonSize={18} scrollButtonOffset={15}>
+            <PlatformHeaderIcons
+                platform={platform as DataPlatform}
+                platforms={platforms as DataPlatform[]}
+                size={24}
+            />
+            <EntityDetailsContainer>
+                <NameWrapper>
+                    <EntityName isNameEditable={false} />
+                    {!!entityData?.notes?.total && (
+                        <NotesIcon notes={entityData?.notes?.relationships?.map((r) => r.entity as Post) || []} />
+                    )}
+                    {entityData?.deprecation?.deprecated && (
+                        <DeprecationIcon
+                            urn={urn}
+                            deprecation={entityData?.deprecation}
+                            showUndeprecate
+                            refetch={refetch}
+                            showText={false}
+                        />
+                    )}
+                    {entityData?.health && <HealthIcon urn={urn} health={entityData.health} baseUrl={entityUrl} />}
+                    <StructuredPropertyBadge structuredProperties={entityData?.structuredProperties} />
+                </NameWrapper>
+                <ContextPath
+                    instanceId={entityData?.dataPlatformInstance?.instanceId}
+                    typeIcon={typeIcon}
+                    type={displayedEntityType}
+                    entityType={entityType}
+                    browsePaths={entityData?.browsePathV2}
+                    parentEntities={
+                        entityData?.parentContainers?.containers ||
+                        entityData?.parentDomains?.domains ||
+                        entityData?.parentNodes?.nodes
+                    }
+                    contentRef={contentRef}
+                    isContentTruncated={isContentTruncated}
+                />
+            </EntityDetailsContainer>
+        </TitleContainer>
+    );
+};
+
+export default SidebarEntityHeader;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection.tsx
new file mode 100644
index 00000000000000..3de7f199a8ff98
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection.tsx
@@ -0,0 +1,79 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import AddRoundedIcon from '@mui/icons-material/AddRounded';
+import TagTermGroup from '../../../../../sharedV2/tags/TagTermGroup';
+import { useEntityData, useMutationUrn, useRefetch } from '../../../../../entity/shared/EntityContext';
+import { ENTITY_PROFILE_GLOSSARY_TERMS_ID } from '../../../../../onboarding/config/EntityProfileOnboardingConfig';
+import { SidebarSection } from './SidebarSection';
+import { EntityType } from '../../../../../../types.generated';
+import EmptySectionText from './EmptySectionText';
+import { EMPTY_MESSAGES } from '../../../constants';
+import SectionActionButton from './SectionActionButton';
+import AddTagTerm from '../../../../../sharedV2/tags/AddTagTerm';
+
+const Content = styled.div`
+    display: flex;
+    align-items: start;
+    justify-content: start;
+    flex-wrap: wrap;
+`;
+
+interface Props {
+    readOnly?: boolean;
+}
+
+export const SidebarGlossaryTermsSection = ({ readOnly }: Props) => {
+    const { entityType, entityData } = useEntityData();
+    const refetch = useRefetch();
+    const mutationUrn = useMutationUrn();
+
+    const [showAddModal, setShowAddModal] = useState(false);
+    const [addModalType, setAddModalType] = useState<EntityType | undefined>(undefined);
+
+    const areTermsEmpty = !entityData?.glossaryTerms?.terms?.length;
+
+    return (
+        <div id={ENTITY_PROFILE_GLOSSARY_TERMS_ID}>
+            <SidebarSection
+                title="Terms"
+                content={
+                    <Content>
+                        {!areTermsEmpty ? (
+                            <TagTermGroup
+                                editableGlossaryTerms={entityData?.glossaryTerms}
+                                canAddTerm
+                                canRemove
+                                entityUrn={mutationUrn}
+                                entityType={entityType}
+                                refetch={refetch}
+                                readOnly={readOnly}
+                                fontSize={12}
+                                showAddButton={false}
+                            />
+                        ) : (
+                            <EmptySectionText message={EMPTY_MESSAGES.terms.title} />
+                        )}
+                    </Content>
+                }
+                extra={
+                    <SectionActionButton
+                        button={<AddRoundedIcon />}
+                        onClick={(event) => {
+                            setShowAddModal(true);
+                            setAddModalType(EntityType.GlossaryTerm);
+                            event.stopPropagation();
+                        }}
+                    />
+                }
+            />
+            <AddTagTerm
+                entityUrn={mutationUrn}
+                entityType={entityType}
+                showAddModal={showAddModal}
+                setShowAddModal={setShowAddModal}
+                addModalType={addModalType}
+                refetch={refetch}
+            />
+        </div>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarHeader.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarHeader.tsx
new file mode 100644
index 00000000000000..0ee3fcb90e5756
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarHeader.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { Typography } from 'antd';
+import styled from 'styled-components';
+
+const HeaderContainer = styled.div`
+    min-height: 32px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 8px;
+    > .ant-typography {
+        margin-bottom: 0;
+    }
+`;
+
+type Props = {
+    title: string;
+    actions?: React.ReactNode;
+    children?: React.ReactNode;
+};
+
+export const SidebarHeader = ({ title, actions, children }: Props) => {
+    return (
+        <HeaderContainer>
+            <Typography.Title level={5}>{title}</Typography.Title>
+            {actions && <div>{actions}</div>}
+            {children}
+        </HeaderContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarHeaderSectionColumns.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarHeaderSectionColumns.tsx
new file mode 100644
index 00000000000000..d6619c0848899b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarHeaderSectionColumns.tsx
@@ -0,0 +1,68 @@
+import React from 'react';
+import styled from 'styled-components';
+import HorizontalScroller from '../../../../../sharedV2/carousel/HorizontalScroller';
+import { REDESIGN_COLORS } from '../../../constants';
+import { SidebarStatsColumn } from '../utils';
+
+const ColumnsContainer = styled(HorizontalScroller)`
+    display: flex;
+    flex-direction: row;
+    align-items: start;
+    justify-content: start;
+    margin-left: 5px;
+    overflow: auto;
+
+    & > div {
+        &:not(:first-child) {
+            border-left: 1px dashed;
+            border-color: rgba(0, 0, 0, 0.3);
+        }
+    }
+`;
+
+const Column = styled.div`
+    font-weight: bold;
+    font-size: 12px;
+    display: flex;
+    flex-direction: column;
+    justify-content: start;
+    margin-right: 20px;
+
+    &:not(:first-child) {
+        padding-left: 20px;
+    }
+`;
+
+const Heading = styled.div`
+    display: flex;
+    gap: 4px;
+    align-items: center;
+    margin-bottom: 4px;
+`;
+
+const Title = styled.div`
+    font-size: 12px;
+    font-weight: 600;
+    color: ${REDESIGN_COLORS.TEXT_HEADING};
+`;
+
+interface Props {
+    columns: SidebarStatsColumn[];
+}
+
+export const SidebarHeaderSectionColumns = ({ columns }: Props) => {
+    if (!columns.length) return null;
+
+    return (
+        <ColumnsContainer scrollButtonSize={18} scrollButtonOffset={15}>
+            {columns.map((column) => (
+                <Column>
+                    <Heading>
+                        <Title>{column.title}</Title>
+                    </Heading>
+                    {column.content}
+                </Column>
+            ))}
+        </ColumnsContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarLogicSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarLogicSection.tsx
new file mode 100644
index 00000000000000..842c5f1db08f16
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarLogicSection.tsx
@@ -0,0 +1,184 @@
+import CopyQuery from '@src/app/entity/shared/tabs/Dataset/Queries/CopyQuery';
+import { useIsEmbeddedProfile } from '@src/app/shared/useEmbeddedProfileLinkProps';
+import { useEntityRegistry } from '@src/app/useEntityRegistry';
+import { Button, Modal } from 'antd';
+import React, { useContext, useMemo, useState } from 'react';
+import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
+import styled from 'styled-components/macro';
+import { GetDatasetQuery } from '../../../../../../graphql/dataset.generated';
+import { EntityType, QueryEntity } from '../../../../../../types.generated';
+import { useBaseEntity } from '../../../../../entity/shared/EntityContext';
+import { DBT_URN } from '../../../../../ingest/source/builder/constants';
+import EntitySidebarContext from '../../../../../sharedV2/EntitySidebarContext';
+import { ViewTab } from '../../../tabs/Dataset/View/ViewDefinitionTab';
+import { SidebarSection } from './SidebarSection';
+
+const PreviewSyntax = styled(SyntaxHighlighter)`
+    max-width: 100%;
+    max-height: 150px;
+    overflow: hidden;
+    mask-image: linear-gradient(to bottom, rgba(0, 0, 0, 1) 80%, rgba(255, 0, 0, 0.5) 85%, rgba(255, 0, 0, 0) 90%);
+
+    span {
+        font-family: 'Roboto Mono', monospace;
+    }
+`;
+
+const ModalSyntaxContainer = styled.div`
+    margin: 20px;
+`;
+
+export const ViewHeader = styled.div`
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 10px;
+`;
+
+export function SidebarDatasetViewDefinitionSection() {
+    const baseEntity = useBaseEntity<GetDatasetQuery>();
+    const statement = baseEntity?.dataset?.viewProperties?.logic;
+    const entityRegistry = useEntityRegistry();
+    const externalUrl = entityRegistry.getEntityUrl(EntityType.Dataset, baseEntity?.dataset?.urn || '');
+    if (!statement) return null;
+
+    return <SidebarLogicSection title="View Definition" statement={statement} externalUrl={externalUrl} />;
+}
+
+export function SidebarQueryLogicSection() {
+    const baseEntity = useBaseEntity<{ entity: QueryEntity }>();
+    const statement = baseEntity?.entity?.properties?.statement?.value;
+    const entityRegistry = useEntityRegistry();
+    const externalUrl = entityRegistry.getEntityUrl(EntityType.Query, baseEntity?.entity?.urn || '');
+    const { fineGrainedOperations } = useContext(EntitySidebarContext);
+    const highlightedStrings = useMemo(
+        () => fineGrainedOperations?.map((e) => e.transformOperation)?.filter((s): s is string => !!s),
+        [fineGrainedOperations],
+    );
+
+    if (!statement) return null;
+
+    return (
+        <SidebarLogicSection
+            title="Logic"
+            statement={statement}
+            highlightedStrings={highlightedStrings}
+            externalUrl={externalUrl}
+        />
+    );
+}
+
+interface HelperProps {
+    title: string;
+    statement: string;
+    highlightedStrings?: string[];
+    externalUrl: string;
+}
+
+// exported for testing only
+export function SidebarLogicSection({ title, statement, highlightedStrings, externalUrl }: HelperProps) {
+    const [showFullContentModal, setShowFullContentModal] = useState(false);
+    const isEmbeddedProfile = useIsEmbeddedProfile();
+
+    const highlightedLineNumbers = new Set(highlightedStrings?.map((s) => findLineNumberToHighlight(statement, s)));
+
+    function lineProps(lineNumber: number): React.HTMLProps<HTMLElement> {
+        const style: React.CSSProperties = { display: 'block', width: 'fit-content' };
+        if (highlightedLineNumbers.has(lineNumber)) {
+            style.backgroundColor = 'rgba(134, 169, 244, 0.41)';
+        }
+        return { style };
+    }
+    const baseEntity = useBaseEntity<GetDatasetQuery>();
+    const formattedLogic = baseEntity?.dataset?.viewProperties?.formattedLogic;
+
+    const canShowFormatted = !!formattedLogic;
+
+    const isDbt = baseEntity?.dataset?.platform?.urn === DBT_URN;
+    const formatOptions = isDbt ? ['Source', 'Compiled'] : ['Raw', 'Formatted'];
+    const [showFormatted, setShowFormatted] = useState(false);
+
+    return (
+        <SidebarSection
+            title={title}
+            content={
+                <>
+                    <Modal
+                        closeIcon={null}
+                        width="1000px"
+                        footer={
+                            <Button key="back" onClick={() => setShowFullContentModal(false)}>
+                                Dismiss
+                            </Button>
+                        }
+                        open={showFullContentModal}
+                        onCancel={() => setShowFullContentModal(false)}
+                    >
+                        <ModalSyntaxContainer>
+                            <ViewHeader>
+                                {canShowFormatted && (
+                                    <ViewTab
+                                        formatOptions={formatOptions}
+                                        setShowFormatted={setShowFormatted}
+                                        showFormatted={showFormatted}
+                                    />
+                                )}
+                                <CopyQuery query={showFormatted ? formattedLogic || '' : statement} showCopyText />
+                            </ViewHeader>
+                            <SyntaxHighlighter language="sql" showLineNumbers lineProps={lineProps}>
+                                {showFormatted ? formattedLogic : statement}
+                            </SyntaxHighlighter>
+                        </ModalSyntaxContainer>
+                    </Modal>
+                    {canShowFormatted && (
+                        <ViewTab
+                            formatOptions={formatOptions}
+                            setShowFormatted={setShowFormatted}
+                            showFormatted={showFormatted}
+                        />
+                    )}
+                    <PreviewSyntax
+                        language="sql"
+                        showLineNumbers
+                        wrapLines
+                        lineNumberStyle={{ display: 'none' }}
+                        lineProps={lineProps}
+                    >
+                        {showFormatted ? formattedLogic : statement}
+                    </PreviewSyntax>
+                    <Button
+                        type="text"
+                        onClick={() => {
+                            if (isEmbeddedProfile) {
+                                window.open(`${externalUrl}/View Definition`, '_blank');
+                            } else {
+                                setShowFullContentModal(true);
+                            }
+                        }}
+                    >
+                        See Full
+                    </Button>
+                </>
+            }
+        />
+    );
+}
+
+/** Find the line number of a target substring in a given string */
+function findLineNumberToHighlight(inputString: string, targetSubstring: string) {
+    if (!targetSubstring) {
+        return -1;
+    }
+
+    const lines = inputString.split('\n');
+
+    for (let lineNumber = 0; lineNumber < lines.length; lineNumber++) {
+        if (lines[lineNumber].includes(targetSubstring)) {
+            // Adding 1 because line numbers are 1-based, not 0-based
+            return lineNumber + 1;
+        }
+    }
+
+    // Return -1 if the target substring is not found in any line
+    return -1;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarSection.tsx
new file mode 100644
index 00000000000000..d4c93b34b12695
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarSection.tsx
@@ -0,0 +1,119 @@
+import { KeyboardArrowDown, KeyboardArrowRight } from '@mui/icons-material';
+import { Collapse, Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+
+import { REDESIGN_COLORS } from '../../../constants';
+import { CountStyle } from '../../../SidebarStyledComponents';
+
+const Container = styled.div`
+    margin-left: 7px;
+    width: 100%;
+`;
+
+const StyledCollapse = styled(Collapse)`
+    .ant-collapse-header {
+        padding: 0px 0px !important;
+        align-items: center;
+    }
+
+    .ant-collapse-content-box {
+        padding-top: 4px !important;
+        padding-bottom: 0px !important;
+    }
+
+    .ant-collapse-arrow {
+        margin-right: 5px !important;
+        line-height: 32px;
+    }
+
+    .ant-collapse-expand-icon {
+        height: 22px;
+    }
+
+    .ant-collapse-item-disabled > .ant-collapse-header {
+        cursor: default;
+
+        > .ant-collapse-extra {
+            cursor: pointer;
+        }
+    }
+
+    .ant-collapse-header-text {
+        max-width: calc(100% - 50px);
+    }
+`;
+
+const SectionHeader = styled.span<{ collapsible?: boolean }>`
+    display: flex;
+    align-items: center;
+    ${(props) => !props.collapsible && 'margin-left: 8px;'}
+`;
+
+const Title = styled(Typography.Text)`
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    font-weight: 700;
+    line-height: 20px;
+    font-size: 14px;
+`;
+
+const StyledIcon = styled.div`
+    svg {
+        height: 18px;
+        width: 18px;
+        color: ${REDESIGN_COLORS.SECONDARY_LIGHT_GREY};
+        stroke: ${REDESIGN_COLORS.SECONDARY_LIGHT_GREY};
+        stroke-width: 1px;
+    }
+`;
+
+type Props = {
+    title: string;
+    content: React.ReactNode;
+    extra?: React.ReactNode;
+    count?: number;
+    collapsedContent?: React.ReactNode;
+    collapsible?: boolean;
+    expandedByDefault?: boolean;
+};
+
+export const SidebarSection = ({
+    title,
+    content,
+    extra,
+    count = 0,
+    collapsedContent,
+    collapsible = true,
+    expandedByDefault = true,
+}: Props) => {
+    return (
+        <StyledCollapse
+            ghost
+            expandIcon={({ isActive }) => (
+                <StyledIcon>{isActive ? <KeyboardArrowDown /> : <KeyboardArrowRight />} </StyledIcon>
+            )}
+            defaultActiveKey={expandedByDefault ? title : ''}
+        >
+            <Collapse.Panel
+                header={
+                    <>
+                        <SectionHeader collapsible={collapsible}>
+                            <Title ellipsis={{ tooltip: true }}>{title}</Title>
+                            {count > 0 && <CountStyle> {count > 10 ? '10+' : count}</CountStyle>}
+                        </SectionHeader>
+                        {collapsedContent}
+                    </>
+                }
+                key={title}
+                extra={extra}
+                collapsible={!collapsible ? 'disabled' : undefined}
+                showArrow={collapsible}
+            >
+                <Container>{content}</Container>
+            </Collapse.Panel>
+        </StyledCollapse>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx
new file mode 100644
index 00000000000000..fe340274b340ff
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx
@@ -0,0 +1,114 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { useIsShowSeparateSiblingsEnabled } from '@src/app/useAppConfig';
+import { useDataNotCombinedWithSiblings, useEntityData } from '../../../../../entity/shared/EntityContext';
+import { stripSiblingsFromEntity } from '../../../../../entity/shared/siblingUtils';
+import { CompactEntityNameList } from '../../../../../recommendations/renderer/component/CompactEntityNameList';
+import { Dataset, Entity } from '../../../../../../types.generated';
+import { SEPARATE_SIBLINGS_URL_PARAM, useIsSeparateSiblingsMode } from '../../../useIsSeparateSiblingsMode';
+import { GetDatasetQuery } from '../../../../../../graphql/dataset.generated';
+import { SidebarSection } from './SidebarSection';
+import { REDESIGN_COLORS } from '../../../constants';
+import { EmbeddedListSearchModal } from '../../../components/styled/search/EmbeddedListSearchModal';
+import { UnionType } from '../../../../../searchV2/utils/constants';
+
+const EntityListContainer = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    flex-wrap: wrap;
+
+    margin-left: -8px;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+`;
+
+const AndMoreWrapper = styled.div`
+    margin-left: 4px;
+    margin-top: 5px;
+    :hover {
+        cursor: pointer;
+        color: ${REDESIGN_COLORS.LINK_HOVER_BLUE};
+    }
+`;
+
+export const SidebarSiblingsSection = () => {
+    const { entityData, urn } = useEntityData();
+
+    const dataNotCombinedWithSiblings = useDataNotCombinedWithSiblings<GetDatasetQuery>();
+
+    const showSeparateSiblings = useIsShowSeparateSiblingsEnabled();
+    const isHideSiblingMode = useIsSeparateSiblingsMode();
+
+    const [showAllSiblings, setShowAllSiblings] = useState(false);
+
+    if (!entityData) {
+        return <></>;
+    }
+
+    // showSeparateSiblings disables the combined view, but with this flag in we show siblings in the sidebar to navigate to them
+    if (!showSeparateSiblings && isHideSiblingMode) {
+        return (
+            <SidebarSection
+                title="Part of"
+                content={
+                    <EntityListContainer>
+                        <CompactEntityNameList entities={[entityData as Entity]} showTooltips />
+                    </EntityListContainer>
+                }
+            />
+        );
+    }
+
+    const siblingEntities = entityData?.siblingsSearch?.searchResults?.map((r) => r.entity) || [];
+    const entityDataWithoutSiblings = stripSiblingsFromEntity(dataNotCombinedWithSiblings.dataset);
+
+    const allSiblingsInGroup = showSeparateSiblings
+        ? (siblingEntities as Dataset[])
+        : ([...siblingEntities, entityDataWithoutSiblings] as Dataset[]);
+
+    const allSiblingsInGroupThatExist = allSiblingsInGroup.filter((sibling) => sibling.exists);
+
+    if (!allSiblingsInGroupThatExist.length) {
+        return <></>;
+    }
+
+    // you are always going to be in the sibling group, so if the sibling group is just you do not render.
+    // The less than case is likely not neccessary but just there as a safety case for unexpected scenarios
+    if (!showSeparateSiblings && allSiblingsInGroupThatExist.length <= 1) {
+        return <></>;
+    }
+
+    const numSiblingsNotShown = (entityData?.siblingsSearch?.total || 0) - allSiblingsInGroup.length;
+
+    return (
+        <>
+            <SidebarSection
+                title="Composed of"
+                content={
+                    <EntityListContainer>
+                        <CompactEntityNameList
+                            entities={allSiblingsInGroupThatExist}
+                            linkUrlParams={{ [SEPARATE_SIBLINGS_URL_PARAM]: true }}
+                            showTooltips
+                        />
+                        {numSiblingsNotShown > 0 && (
+                            <AndMoreWrapper onClick={() => setShowAllSiblings(true)}>
+                                and {numSiblingsNotShown} more
+                            </AndMoreWrapper>
+                        )}
+                    </EntityListContainer>
+                }
+            />
+            {showAllSiblings && (
+                <EmbeddedListSearchModal
+                    title="View All Siblings"
+                    fixedFilters={{
+                        unionType: UnionType.OR,
+                        filters: [{ field: 'siblings', values: [urn] }],
+                    }}
+                    onClose={() => setShowAllSiblings(false)}
+                />
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection.tsx
new file mode 100644
index 00000000000000..164362cba75255
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection.tsx
@@ -0,0 +1,83 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import AddRoundedIcon from '@mui/icons-material/AddRounded';
+import TagTermGroup from '../../../../../sharedV2/tags/TagTermGroup';
+import { useEntityData, useMutationUrn, useRefetch } from '../../../../../entity/shared/EntityContext';
+import { ENTITY_PROFILE_TAGS_ID } from '../../../../../onboarding/config/EntityProfileOnboardingConfig';
+import { SidebarSection } from './SidebarSection';
+import { EntityType } from '../../../../../../types.generated';
+import SectionActionButton from './SectionActionButton';
+import AddTagTerm from '../../../../../sharedV2/tags/AddTagTerm';
+import EmptySectionText from './EmptySectionText';
+import { EMPTY_MESSAGES } from '../../../constants';
+
+const Content = styled.div`
+    display: flex;
+    align-items: start;
+    justify-content: start;
+    flex-wrap: wrap;
+`;
+
+interface Props {
+    readOnly?: boolean;
+}
+
+export const SidebarTagsSection = ({ readOnly }: Props) => {
+    const { entityType, entityData } = useEntityData();
+    const refetch = useRefetch();
+    const mutationUrn = useMutationUrn();
+
+    const [showAddModal, setShowAddModal] = useState(false);
+    const [addModalType, setAddModalType] = useState<EntityType | undefined>(undefined);
+
+    const areTagsEmpty = !entityData?.globalTags?.tags?.length;
+
+    const canEditTags = !!entityData?.privileges?.canEditTags;
+
+    return (
+        <div id={ENTITY_PROFILE_TAGS_ID}>
+            <SidebarSection
+                title="Tags"
+                content={
+                    <Content>
+                        {!areTagsEmpty ? (
+                            <TagTermGroup
+                                editableTags={entityData?.globalTags}
+                                canAddTag
+                                canRemove
+                                showEmptyMessage
+                                entityUrn={mutationUrn}
+                                entityType={entityType}
+                                refetch={refetch}
+                                readOnly={readOnly}
+                                fontSize={12}
+                                showAddButton={false}
+                            />
+                        ) : (
+                            <EmptySectionText message={EMPTY_MESSAGES.tags.title} />
+                        )}
+                    </Content>
+                }
+                extra={
+                    <SectionActionButton
+                        button={<AddRoundedIcon />}
+                        onClick={(event) => {
+                            setShowAddModal(true);
+                            setAddModalType(EntityType.Tag);
+                            event.stopPropagation();
+                        }}
+                        actionPrivilege={canEditTags}
+                    />
+                }
+            />
+            <AddTagTerm
+                entityUrn={mutationUrn}
+                entityType={entityType}
+                showAddModal={showAddModal}
+                setShowAddModal={setShowAddModal}
+                addModalType={addModalType}
+                refetch={refetch}
+            />
+        </div>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/TitleAction.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/TitleAction.tsx
new file mode 100644
index 00000000000000..970735a0a1658f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/TitleAction.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { SidebarTitleActionType } from '../../../utils';
+import { ExploreLineageAction } from './ExploreLineageAction';
+
+interface Props {
+    actionType: SidebarTitleActionType;
+    icon?: React.FC<any>;
+}
+
+export const TitleAction = ({ actionType, icon }: Props) => {
+    return <>{actionType === SidebarTitleActionType.LineageExplore && <ExploreLineageAction icon={icon} />}</>;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/__tests__/LastIngested.test.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/__tests__/LastIngested.test.tsx
new file mode 100644
index 00000000000000..8608e40d84ceea
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/__tests__/LastIngested.test.tsx
@@ -0,0 +1,41 @@
+import { green, orange, red } from '@ant-design/colors';
+import moment from 'moment-timezone';
+import { getLastIngestedColor } from '../LastIngested';
+
+describe('getLastIngestedColor', () => {
+    it('should return green if the last ingested date is the present moment', () => {
+        const lastIngested = moment().valueOf();
+        const lastIngestedColor = getLastIngestedColor(lastIngested);
+        expect(lastIngestedColor).toBe(green[5]);
+    });
+
+    it('should return green if the last ingested date is less than a week ago from now', () => {
+        const lastIngested = moment().subtract(1, 'day').valueOf();
+        const lastIngestedColor = getLastIngestedColor(lastIngested);
+        expect(lastIngestedColor).toBe(green[5]);
+    });
+
+    it('should return orange if the last ingested date is exactly a week ago', () => {
+        const lastIngested = moment().subtract(1, 'week').valueOf();
+        const lastIngestedColor = getLastIngestedColor(lastIngested);
+        expect(lastIngestedColor).toBe(orange[5]);
+    });
+
+    it('should return orange if the last ingested date is more than a week but less than a month ago', () => {
+        const lastIngested = moment().subtract(2, 'week').valueOf();
+        const lastIngestedColor = getLastIngestedColor(lastIngested);
+        expect(lastIngestedColor).toBe(orange[5]);
+    });
+
+    it('should return red if the last ingested date is exactly a month ago', () => {
+        const lastIngested = moment().subtract(1, 'month').valueOf();
+        const lastIngestedColor = getLastIngestedColor(lastIngested);
+        expect(lastIngestedColor).toBe(red[5]);
+    });
+
+    it('should return red if the last ingested date is more than a month ago', () => {
+        const lastIngested = moment().subtract(3, 'month').valueOf();
+        const lastIngestedColor = getLastIngestedColor(lastIngested);
+        expect(lastIngestedColor).toBe(red[5]);
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/__tests__/SidebarLogicSection.test.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/__tests__/SidebarLogicSection.test.tsx
new file mode 100644
index 00000000000000..108cae6c76a590
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/__tests__/SidebarLogicSection.test.tsx
@@ -0,0 +1,232 @@
+import { MockedProvider } from '@apollo/client/testing';
+import { fireEvent, render } from '@testing-library/react';
+import React from 'react';
+import { dataset3, mocks } from '../../../../../../../Mocks';
+import { EntityType } from '../../../../../../../types.generated';
+import TestPageContainer from '../../../../../../../utils/test-utils/TestPageContainer';
+import { EntityContext } from '../../../../../../entity/shared/EntityContext';
+import { getDataForEntityType } from '../../utils';
+import { SidebarDatasetViewDefinitionSection, SidebarQueryLogicSection } from '../SidebarLogicSection';
+
+const datasetWithViewProperties = {
+    ...dataset3,
+    viewProperties: {
+        __typename: 'ViewProperties',
+        formattedLogic: 'SELECT\n  *\nFROM\n  table\nWHERE\n  id = 1',
+        language: 'SQL',
+        logic: 'SELECT * FROM table WHERE id = 1',
+        materialized: false,
+    },
+};
+
+const queryWithProperties = {
+    type: EntityType.Query,
+    urn: 'urn:li:query:1',
+    properties: {
+        statement: {
+            value: 'SELECT * FROM my_table WHERE id = 123',
+        },
+        source: 'SYSTEM',
+        name: 'Example Query',
+        description: 'An example query',
+        created: {
+            time: 1612396473001,
+            actor: 'urn:li:corpuser:datahub',
+        },
+        createdOn: {
+            time: 1612396473001,
+            actor: {
+                urn: 'urn:li:corpuser:datahub',
+                username: 'datahub',
+                type: EntityType.CorpUser,
+            },
+        },
+        lastModified: {
+            time: 1612396473001,
+            actor: 'urn:li:corpuser:datahub',
+        },
+        origin: {
+            type: EntityType.Dataset,
+            urn: 'urn:li:dataset:origin-dataset',
+            name: 'Origin Dataset',
+        },
+    },
+};
+
+describe('Sidebar Logic Components', () => {
+    describe('SidebarDatasetViewDefinitionSection', () => {
+        it('renders view definition section', () => {
+            const { getByText } = render(
+                <MockedProvider mocks={mocks} addTypename={false}>
+                    <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
+                        <EntityContext.Provider
+                            value={{
+                                urn: 'urn:li:dataset:3',
+                                entityType: EntityType.Dataset,
+                                entityData: getDataForEntityType({
+                                    data: datasetWithViewProperties,
+                                    entityType: EntityType.Dataset,
+                                    getOverrideProperties: () => ({}),
+                                }),
+                                baseEntity: { dataset: datasetWithViewProperties },
+                                updateEntity: vi.fn(),
+                                routeToTab: vi.fn(),
+                                refetch: vi.fn(),
+                                lineage: undefined,
+                                loading: false,
+                                dataNotCombinedWithSiblings: null,
+                            }}
+                        >
+                            <SidebarDatasetViewDefinitionSection />
+                        </EntityContext.Provider>
+                    </TestPageContainer>
+                </MockedProvider>,
+            );
+
+            expect(getByText('View Definition')).toBeInTheDocument();
+        });
+
+        it('handles format switching', () => {
+            const { getByText } = render(
+                <MockedProvider mocks={mocks} addTypename={false}>
+                    <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
+                        <EntityContext.Provider
+                            value={{
+                                urn: 'urn:li:dataset:3',
+                                entityType: EntityType.Dataset,
+                                entityData: getDataForEntityType({
+                                    data: datasetWithViewProperties,
+                                    entityType: EntityType.Dataset,
+                                    getOverrideProperties: () => ({}),
+                                }),
+                                baseEntity: { dataset: datasetWithViewProperties },
+                                updateEntity: vi.fn(),
+                                routeToTab: vi.fn(),
+                                refetch: vi.fn(),
+                                lineage: undefined,
+                                loading: false,
+                                dataNotCombinedWithSiblings: null,
+                            }}
+                        >
+                            <SidebarDatasetViewDefinitionSection />
+                        </EntityContext.Provider>
+                    </TestPageContainer>
+                </MockedProvider>,
+            );
+
+            const rawButton = getByText('Raw');
+            fireEvent.click(rawButton);
+            expect(getByText('Raw')).toBeInTheDocument();
+
+            const formattedButton = getByText('Formatted');
+            fireEvent.click(formattedButton);
+            expect(getByText('Formatted')).toBeInTheDocument();
+        });
+    });
+
+    describe('SidebarQueryLogicSection', () => {
+        it('renders query logic section', () => {
+            const { getByText } = render(
+                <MockedProvider mocks={mocks} addTypename={false}>
+                    <TestPageContainer initialEntries={['/query/urn:li:query:1']}>
+                        <EntityContext.Provider
+                            value={{
+                                urn: 'urn:li:query:1',
+                                entityType: EntityType.Query,
+                                entityData: getDataForEntityType({
+                                    data: queryWithProperties,
+                                    entityType: EntityType.Query,
+                                    getOverrideProperties: () => ({}),
+                                }),
+                                baseEntity: { entity: queryWithProperties },
+                                updateEntity: vi.fn(),
+                                routeToTab: vi.fn(),
+                                refetch: vi.fn(),
+                                lineage: undefined,
+                                loading: false,
+                                dataNotCombinedWithSiblings: null,
+                            }}
+                        >
+                            <SidebarQueryLogicSection />
+                        </EntityContext.Provider>
+                    </TestPageContainer>
+                </MockedProvider>,
+            );
+
+            expect(getByText('Logic')).toBeInTheDocument();
+        });
+
+        it('handles modal interaction', () => {
+            const { getByText, queryByRole } = render(
+                <MockedProvider mocks={mocks} addTypename={false}>
+                    <TestPageContainer initialEntries={['/query/urn:li:query:1']}>
+                        <EntityContext.Provider
+                            value={{
+                                urn: 'urn:li:query:1',
+                                entityType: EntityType.Query,
+                                entityData: getDataForEntityType({
+                                    data: queryWithProperties,
+                                    entityType: EntityType.Query,
+                                    getOverrideProperties: () => ({}),
+                                }),
+                                baseEntity: { entity: queryWithProperties },
+                                updateEntity: vi.fn(),
+                                routeToTab: vi.fn(),
+                                refetch: vi.fn(),
+                                lineage: undefined,
+                                loading: false,
+                                dataNotCombinedWithSiblings: null,
+                            }}
+                        >
+                            <SidebarQueryLogicSection />
+                        </EntityContext.Provider>
+                    </TestPageContainer>
+                </MockedProvider>,
+            );
+
+            const seeFullButton = getByText('See Full');
+            fireEvent.click(seeFullButton);
+            expect(queryByRole('dialog')).toBeInTheDocument();
+
+            const dismissButton = getByText('Dismiss');
+            fireEvent.click(dismissButton);
+            expect(queryByRole('dialog')).not.toBeInTheDocument();
+        });
+
+        it('does not render when no query properties are present', () => {
+            const queryWithoutProperties = {
+                ...queryWithProperties,
+                properties: null,
+            };
+
+            const { container } = render(
+                <MockedProvider mocks={mocks} addTypename={false}>
+                    <TestPageContainer initialEntries={['/query/urn:li:query:1']}>
+                        <EntityContext.Provider
+                            value={{
+                                urn: 'urn:li:query:1',
+                                entityType: EntityType.Query,
+                                entityData: getDataForEntityType({
+                                    data: queryWithoutProperties,
+                                    entityType: EntityType.Query,
+                                    getOverrideProperties: () => ({}),
+                                }),
+                                baseEntity: { entity: queryWithoutProperties },
+                                updateEntity: vi.fn(),
+                                routeToTab: vi.fn(),
+                                refetch: vi.fn(),
+                                lineage: undefined,
+                                loading: false,
+                                dataNotCombinedWithSiblings: null,
+                            }}
+                        >
+                            <SidebarQueryLogicSection />
+                        </EntityContext.Provider>
+                    </TestPageContainer>
+                </MockedProvider>,
+            );
+
+            expect(container.firstChild).toBeNull();
+        });
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/EntityProperty.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/EntityProperty.tsx
new file mode 100644
index 00000000000000..f0e42b4b9ae4e9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/EntityProperty.tsx
@@ -0,0 +1,31 @@
+import { EntityLink } from '@src/app/homeV2/reference/sections/EntityLink';
+import { Entity } from '@src/types.generated';
+import React from 'react';
+import styled from 'styled-components';
+import { LabelText } from './styledComponents';
+
+const PropertyContainer = styled.div`
+    display: flex;
+    gap: 5px;
+    margin-bottom: 6px;
+    align-items: center; /* This will vertically center all items by default */
+
+    // when this overflows, the entity link components should truncate text
+    white-space: nowrap;
+`;
+
+interface Props {
+    labelText: string;
+    entity?: Entity | null;
+}
+
+const EntityProperty = ({ labelText, entity }: Props) => {
+    return (
+        <PropertyContainer>
+            <LabelText>{labelText}</LabelText>
+            {!!entity && <EntityLink entity={entity} />}
+        </PropertyContainer>
+    );
+};
+
+export default EntityProperty;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SidebarPopularityHeaderSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SidebarPopularityHeaderSection.tsx
new file mode 100644
index 00000000000000..a9d654c9016adb
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SidebarPopularityHeaderSection.tsx
@@ -0,0 +1,178 @@
+import React from 'react';
+import { Popover } from '@components';
+import styled from 'styled-components';
+import { ConsoleSqlOutlined, UserOutlined, ToolOutlined, EyeOutlined } from '@ant-design/icons';
+import { useEntityData } from '../../../../../../entity/shared/EntityContext';
+import {
+    getBarsStatusFromPopularityTier,
+    getChartPopularityTier,
+    getDashboardPopularityTier,
+    getDatasetPopularityTier,
+    isValuePresent,
+} from './utils';
+import { REDESIGN_COLORS } from '../../../../constants';
+import { PopularityBars } from '../../../../tabs/Dataset/Schema/components/SchemaFieldDrawer/PopularityBars';
+import { EntityType } from '../../../../../../../types.generated';
+
+const Wrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+`;
+
+const Insight = styled.div`
+    max-width: 240px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    && {
+        color: ${REDESIGN_COLORS.DARK_GREY};
+    }
+`;
+
+const StyledEyeOutlined = styled(EyeOutlined)`
+    && {
+        font-size: 20px;
+        margin-right: 12px;
+    }
+`;
+
+const StyledConsoleSqlOutlined = styled(ConsoleSqlOutlined)`
+    && {
+        font-size: 20px;
+        margin-right: 12px;
+    }
+`;
+
+const StyledUserOutlined = styled(UserOutlined)`
+    && {
+        font-size: 20px;
+        margin-right: 12px;
+    }
+`;
+
+const StyledToolOutlined = styled(ToolOutlined)`
+    && {
+        font-size: 20px;
+        margin-right: 12px;
+    }
+`;
+
+const Container = styled.div``;
+
+function getTier(
+    entityType,
+    queryCountPercentileLast30Days,
+    uniqueUserPercentileLast30Days,
+    viewCountPercentileLast30Days,
+) {
+    if (entityType === EntityType.Chart) {
+        return getChartPopularityTier(viewCountPercentileLast30Days, uniqueUserPercentileLast30Days);
+    }
+    if (entityType === EntityType.Dashboard) {
+        return getDashboardPopularityTier(viewCountPercentileLast30Days, uniqueUserPercentileLast30Days);
+    }
+    return getDatasetPopularityTier(queryCountPercentileLast30Days, uniqueUserPercentileLast30Days);
+}
+
+function shouldRender(
+    entityType,
+    queryCountPercentileLast30Days,
+    uniqueUserPercentileLast30Days,
+    viewCountPercentileLast30Days,
+) {
+    if (entityType === EntityType.Chart || entityType === EntityType.Dashboard) {
+        return isValuePresent(viewCountPercentileLast30Days) || isValuePresent(uniqueUserPercentileLast30Days);
+    }
+    return isValuePresent(queryCountPercentileLast30Days) || isValuePresent(uniqueUserPercentileLast30Days);
+}
+
+interface Props {
+    statsSummary?: any;
+    size?: string;
+    entityType?: EntityType;
+}
+
+const SidebarPopularityHeaderSection = ({ statsSummary: statsSummaryFromProps, size, entityType }: Props) => {
+    const { entityData } = useEntityData();
+    const dataset = entityData as any;
+
+    // To determine the popularity for the dataset, we need to pull out the stats summary.
+    const statsSummary = dataset?.statsSummary || statsSummaryFromProps;
+    const viewCountPercentileLast30Days = statsSummary?.viewCountPercentileLast30Days;
+    const queryCountPercentileLast30Days = statsSummary?.queryCountPercentileLast30Days;
+    const uniqueUserPercentileLast30Days = statsSummary?.uniqueUserPercentileLast30Days;
+    const updatePercentileLast30Days = statsSummary?.updatePercentileLast30Days;
+
+    if (
+        !shouldRender(
+            entityType || entityData?.type,
+            queryCountPercentileLast30Days,
+            uniqueUserPercentileLast30Days,
+            viewCountPercentileLast30Days,
+        )
+    ) {
+        return null;
+    }
+
+    const tier = getTier(
+        entityType || entityData?.type,
+        queryCountPercentileLast30Days,
+        uniqueUserPercentileLast30Days,
+        viewCountPercentileLast30Days,
+    );
+    const status = getBarsStatusFromPopularityTier(tier);
+
+    return (
+        <Popover
+            placement="bottom"
+            showArrow={false}
+            content={
+                <Wrapper>
+                    {isValuePresent(viewCountPercentileLast30Days) && (
+                        <Insight>
+                            <StyledEyeOutlined />
+                            <div>
+                                Viewed more than <b>{viewCountPercentileLast30Days}%</b> of similar assets in the past
+                                30 days
+                            </div>
+                        </Insight>
+                    )}
+                    {isValuePresent(queryCountPercentileLast30Days) && (
+                        <Insight>
+                            <StyledConsoleSqlOutlined />
+                            <div>
+                                Queried more than <b>{queryCountPercentileLast30Days}%</b> of similar assets in the past
+                                30 days
+                            </div>
+                        </Insight>
+                    )}
+                    {isValuePresent(uniqueUserPercentileLast30Days) && (
+                        <Insight>
+                            <StyledUserOutlined />
+                            <div>
+                                More users than <b>{uniqueUserPercentileLast30Days}%</b> of similar assets in the past
+                                30 days
+                            </div>
+                        </Insight>
+                    )}
+                    {isValuePresent(updatePercentileLast30Days) && (
+                        <Insight>
+                            <StyledToolOutlined />
+                            <div>
+                                More changes than <b>{updatePercentileLast30Days}%</b> of similar assets in the past 30
+                                days
+                            </div>
+                        </Insight>
+                    )}
+                </Wrapper>
+            }
+        >
+            <Container>
+                <PopularityBars status={status} size={size} />
+            </Container>
+        </Popover>
+    );
+};
+
+export default SidebarPopularityHeaderSection;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SidebarTopUsersHeaderSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SidebarTopUsersHeaderSection.tsx
new file mode 100644
index 00000000000000..2ddd86fb487cb6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SidebarTopUsersHeaderSection.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import { useEntityData } from '../../../../../../entity/shared/EntityContext';
+import TopUsersFacepile from './TopUsersFacepile';
+
+const SidebarTopUsersHeaderSection = () => {
+    const { entityData } = useEntityData();
+    const dataset = entityData as any;
+    const statsSummary = dataset?.statsSummary;
+    const topUsersLast30Days = statsSummary?.topUsersLast30Days;
+
+    if (!topUsersLast30Days) {
+        return null;
+    }
+
+    return <TopUsersFacepile users={topUsersLast30Days} max={3} />;
+};
+
+export default SidebarTopUsersHeaderSection;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/StatusSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/StatusSection.tsx
new file mode 100644
index 00000000000000..ab670011776c19
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/StatusSection.tsx
@@ -0,0 +1,163 @@
+import { KeyboardArrowDown, KeyboardArrowRight } from '@mui/icons-material';
+import { Collapse, Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { EntityType } from '../../../../../../../types.generated';
+import { useEntityData } from '../../../../../../entity/shared/EntityContext';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+import { REDESIGN_COLORS } from '../../../../constants';
+import { getPlatformName } from '../../../../utils';
+import { SidebarSection } from '../SidebarSection';
+import EntityProperty from './EntityProperty';
+import SyncedOrShared from './SyncedOrShared';
+import TimeProperty from './TimeProperty';
+import { ActionType } from './utils';
+
+const SyncedAssetContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+`;
+
+export const StyledCollapse = styled(Collapse)`
+    text-wrap: wrap;
+    .ant-collapse-header {
+        padding: 0px 0px !important;
+        align-items: center !important;
+    }
+
+    .ant-collapse-content-box {
+        padding: 0 0 6px 20px !important;
+    }
+
+    .ant-collapse-arrow {
+        margin-right: 0 !important;
+        height: 20px;
+        width: 20px;
+    }
+`;
+
+const StyledIcon = styled.div`
+    svg {
+        height: 18px;
+        width: 18px;
+        color: ${REDESIGN_COLORS.DARK_DIVIDER};
+        stroke: ${REDESIGN_COLORS.DARK_DIVIDER};
+        stroke-width: 1px;
+    }
+`;
+
+const EmptyText = styled(Typography.Text)`
+    color: ${REDESIGN_COLORS.COLD_GREY_TEXT};
+`;
+
+const StatusSection = () => {
+    const { entityData } = useEntityData();
+    const entityRegistry = useEntityRegistry();
+
+    const dataset = entityData as any;
+    const entityType = entityData?.type;
+    const properties = dataset?.properties;
+
+    const created = properties?.created?.time;
+    const lastModified = properties?.lastModified?.time;
+    const lastRefreshed = properties?.lastRefreshed;
+    const lastOp = dataset?.operations?.length && dataset?.operations[0]?.lastUpdatedTimestamp;
+    const lastUpdated = Math.max(lastModified, lastOp);
+
+    const lastIngested = entityData?.lastIngested;
+    const platform = entityData?.siblingPlatforms?.[0] || entityData?.platform;
+    const rootSiblingPlatformName = getPlatformName(entityData);
+    const baseEntityPlatformName = entityData?.platform
+        ? entityRegistry.getDisplayName(EntityType.DataPlatform, entityData?.platform)
+        : null;
+
+    const source = dataset?.assetOrigin?.resolvedSourceDetails;
+
+    const isDeprecated = entityData?.deprecation?.deprecated;
+    const deprecatedByEntity = entityData?.deprecation?.actorEntity;
+    const deprecatedByEntityName =
+        deprecatedByEntity?.type && entityRegistry.getDisplayName(deprecatedByEntity.type, deprecatedByEntity);
+    const decommissionTime = entityData?.deprecation?.decommissionTime;
+    const deprecationReplacement = entityData?.deprecation?.replacement;
+
+    const hasTimeProperties = !!(
+        created ||
+        lastModified ||
+        lastRefreshed ||
+        lastUpdated ||
+        lastIngested ||
+        source ||
+        isDeprecated
+    );
+
+    if (!hasTimeProperties) return null;
+
+    return (
+        <SidebarSection
+            title="Status"
+            content={
+                <SyncedAssetContainer>
+                    {!!created && <TimeProperty labelText="Created:" time={created} />}
+                    {(entityType === EntityType.Dashboard || entityType === EntityType.Chart) && (
+                        <>
+                            {!!lastModified && <TimeProperty labelText="Last Modified:" time={lastModified} />}
+                            {!!lastRefreshed && <TimeProperty labelText="Data Last Refreshed:" time={lastRefreshed} />}
+                        </>
+                    )}
+                    {!!lastUpdated && entityType === EntityType.Dataset && (
+                        <TimeProperty
+                            labelText="Last Updated:"
+                            time={lastUpdated}
+                            titleTip={`Time when the asset was last modified ${
+                                baseEntityPlatformName ? `in ${baseEntityPlatformName}` : null
+                            }`}
+                        />
+                    )}
+                    {isDeprecated && (
+                        <StyledCollapse
+                            defaultActiveKey=""
+                            ghost
+                            expandIcon={({ isActive }) => (
+                                <StyledIcon>{isActive ? <KeyboardArrowDown /> : <KeyboardArrowRight />} </StyledIcon>
+                            )}
+                        >
+                            <Collapse.Panel
+                                header={
+                                    <TimeProperty
+                                        labelText={`Deprecated${
+                                            !!deprecatedByEntityName && `: by ${deprecatedByEntityName}`
+                                        }`}
+                                    />
+                                }
+                                key={1}
+                            >
+                                {deprecationReplacement && (
+                                    <EntityProperty labelText="Replacement:" entity={deprecationReplacement} />
+                                )}
+                                {decommissionTime ? (
+                                    <TimeProperty
+                                        labelText="Scheduled Decommission:"
+                                        time={entityData.deprecation?.decommissionTime}
+                                    />
+                                ) : (
+                                    <EmptyText>No additional information</EmptyText>
+                                )}
+                            </Collapse.Panel>
+                        </StyledCollapse>
+                    )}
+                    {!!lastIngested && (
+                        <SyncedOrShared
+                            labelText="Synced:"
+                            time={lastIngested}
+                            platformName={rootSiblingPlatformName}
+                            platform={platform}
+                            type={ActionType.SYNC}
+                        />
+                    )}
+                </SyncedAssetContainer>
+            }
+        />
+    );
+};
+
+export default StatusSection;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SyncedOrShared.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SyncedOrShared.tsx
new file mode 100644
index 00000000000000..a46c579d2a27c9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SyncedOrShared.tsx
@@ -0,0 +1,90 @@
+import React from 'react';
+import styled from 'styled-components';
+import SwapHorizOutlinedIcon from '@mui/icons-material/SwapHorizOutlined';
+import { Typography } from 'antd';
+import { Tooltip } from '@components';
+import { REDESIGN_COLORS } from '../../../../constants';
+import { toLocalDateString, toRelativeTimeString } from '../../../../../../shared/time/timeUtils';
+import PlatformIcon from '../../../../../../sharedV2/icons/PlatformIcon';
+import { ContentText, LabelText, RelativeTime } from './styledComponents';
+import { DataPlatform, Maybe } from '../../../../../../../types.generated';
+import { ActionType, getRelativeTimeColor } from './utils';
+import SyncedOrSharedTooltip from './SyncedOrSharedTooltip';
+
+const DetailsContainer = styled.div`
+    display: flex;
+    gap: 5px;
+    flex-direction: column;
+    justify-content: center;
+    padding: 5px 8px;
+    background-color: ${REDESIGN_COLORS.SECTION_BACKGROUND};
+    border-radius: 8px;
+`;
+
+const SyncIcon = styled.div`
+    color: ${REDESIGN_COLORS.DARK_DIVIDER};
+    height: 24px;
+    width: 24px;
+`;
+
+const DetailRow = styled.div`
+    display: flex;
+    gap: 6px;
+    align-items: center;
+    flex-wrap: wrap;
+`;
+
+const SyncedSharedText = styled(Typography.Text)`
+    color: ${REDESIGN_COLORS.TEXT_HEADING_SUB_LINK};
+    font-weight: 700;
+`;
+
+const StyledTooltip = styled(Tooltip)`
+    .ant-tooltip-inner {
+        border-radius: 4px;
+    }
+`;
+
+interface Props {
+    labelText: string;
+    time: number;
+    platformName?: string;
+    platform?: Maybe<DataPlatform> | undefined;
+    type: ActionType;
+}
+
+const SyncedOrShared = ({ labelText, time, platformName, platform, type }: Props) => {
+    return (
+        <DetailsContainer>
+            <DetailRow>
+                <StyledTooltip
+                    showArrow={false}
+                    title={<SyncedOrSharedTooltip type={type} />}
+                    color={REDESIGN_COLORS.TOOLTIP_BACKGROUND}
+                    overlayInnerStyle={{ width: 300, padding: 10 }}
+                    placement="bottomLeft"
+                >
+                    <SyncIcon>
+                        <SwapHorizOutlinedIcon />
+                    </SyncIcon>
+                </StyledTooltip>
+
+                <SyncedSharedText>{labelText} </SyncedSharedText>
+                <Tooltip showArrow={false} title={toLocalDateString(time)}>
+                    <RelativeTime relativeTimeColor={getRelativeTimeColor(time)}>
+                        {toRelativeTimeString(time)}
+                    </RelativeTime>
+                </Tooltip>
+                {!!platform && (
+                    <>
+                        <LabelText>from</LabelText>
+                        <PlatformIcon platform={platform} size={16} />
+                        <ContentText color={REDESIGN_COLORS.BODY_TEXT}>{platformName}</ContentText>
+                    </>
+                )}
+            </DetailRow>
+        </DetailsContainer>
+    );
+};
+
+export default SyncedOrShared;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SyncedOrSharedTooltip.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SyncedOrSharedTooltip.tsx
new file mode 100644
index 00000000000000..397a8b931dd01b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/SyncedOrSharedTooltip.tsx
@@ -0,0 +1,66 @@
+import React from 'react';
+import { Typography } from 'antd';
+import styled from 'styled-components';
+import { ActionType } from './utils';
+import { REDESIGN_COLORS } from '../../../../constants';
+
+const HeaderText = styled(Typography.Text)`
+    color: ${REDESIGN_COLORS.LIGHT_TEXT_DARK_BACKGROUND};
+    font-size: 14px;
+    font-weight: 500;
+`;
+
+const Container = styled.div`
+    font-family: Mulish;
+`;
+
+const Wrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+    margin: 12px 0;
+`;
+
+const ColoredContainer = styled.div<{ backgroundColor: string; textColor: string }>`
+    border-radius: 20px;
+    padding: 4px 12px;
+    background-color: ${(props) => props.backgroundColor};
+    color: ${(props) => props.textColor};
+    font-weight: 500;
+    width: max-content;
+`;
+
+const BoldText = styled(Typography.Text)`
+    font-weight: 600;
+`;
+
+interface Props {
+    type: ActionType;
+}
+
+const SyncedOrSharedTooltip = ({ type }: Props) => {
+    const action = type === ActionType.SYNC ? 'Synced' : 'Shared';
+    return (
+        <Container>
+            <HeaderText>
+                This represents the time that the entity was last {type === ActionType.SYNC ? 'synchronized' : 'shared'}
+            </HeaderText>
+            <Wrapper>
+                <ColoredContainer backgroundColor={REDESIGN_COLORS.GREEN_LIGHT} textColor={REDESIGN_COLORS.GREEN_800}>
+                    {action} within the <BoldText>past week </BoldText>
+                </ColoredContainer>
+                <ColoredContainer
+                    backgroundColor={REDESIGN_COLORS.YELLOW_BACKGROUND}
+                    textColor={REDESIGN_COLORS.RED_800}
+                >
+                    {action} within the <BoldText>past month</BoldText>
+                </ColoredContainer>
+                <ColoredContainer backgroundColor={REDESIGN_COLORS.RED_LIGHT} textColor={REDESIGN_COLORS.RED_800}>
+                    {action} <BoldText>more than a month ago</BoldText>
+                </ColoredContainer>
+            </Wrapper>
+        </Container>
+    );
+};
+
+export default SyncedOrSharedTooltip;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TimeProperty.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TimeProperty.tsx
new file mode 100644
index 00000000000000..e5cd46dd9720f6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TimeProperty.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import { Tooltip } from '@components';
+import moment from 'moment';
+import styled from 'styled-components';
+import { LabelText } from './styledComponents';
+import { REDESIGN_COLORS } from '../../../../constants';
+import { toLocalDateString, toRelativeTimeString } from '../../../../../../shared/time/timeUtils';
+
+const PropertyContainer = styled.div`
+    display: flex;
+    gap: 5px;
+    margin-bottom: 6px;
+`;
+
+const UpdatedTime = styled.span`
+    font-weight: 700;
+    color: ${REDESIGN_COLORS.BODY_TEXT};
+`;
+
+interface Props {
+    labelText: string;
+    time?: number | null;
+    titleTip?: React.ReactNode;
+}
+
+const TimeProperty = ({ labelText, time, titleTip }: Props) => {
+    const timeFormatted = moment(time).format('hh:mm A');
+    return (
+        <PropertyContainer>
+            <Tooltip showArrow={false} title={titleTip}>
+                <LabelText>{labelText}</LabelText>
+            </Tooltip>
+            {!!time && (
+                <Tooltip showArrow={false} title={`${toLocalDateString(time)} at ${timeFormatted}`}>
+                    <UpdatedTime>{toRelativeTimeString(time)}</UpdatedTime>
+                </Tooltip>
+            )}
+        </PropertyContainer>
+    );
+};
+
+export default TimeProperty;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TopUsersFacepile.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TopUsersFacepile.tsx
new file mode 100644
index 00000000000000..a1709bb9659ac7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TopUsersFacepile.tsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import { Avatar } from 'antd';
+import { Tooltip } from '@components';
+import { CorpUser, EntityType } from '../../../../../../../types.generated';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+import ActorAvatar from '../../../../ActorAvatar';
+import { userExists } from './utils';
+
+export type Props = {
+    users: Array<CorpUser>;
+    max?: number;
+    checkExistence?: boolean;
+};
+
+export default function TopUsersFacepile({ users, max, checkExistence = true }: Props) {
+    const displayedUsers = users.filter((user) => userExists(user));
+    const usersList = checkExistence ? displayedUsers : users;
+    const entityRegistry = useEntityRegistry();
+    return (
+        <Avatar.Group maxCount={max}>
+            {usersList?.map((user) => {
+                const userName = entityRegistry.getDisplayName(EntityType.CorpUser, user);
+                return (
+                    <Tooltip title={userName} showArrow={false}>
+                        <ActorAvatar
+                            size={26}
+                            name={userName}
+                            url={`/${entityRegistry.getPathName(EntityType.CorpUser)}/${user.urn}`}
+                            photoUrl={
+                                user?.editableProperties?.pictureLink || user?.editableInfo?.pictureLink || undefined
+                            }
+                        />
+                    </Tooltip>
+                );
+            })}
+        </Avatar.Group>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIcon.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIcon.tsx
new file mode 100644
index 00000000000000..b572af2ff0458e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIcon.tsx
@@ -0,0 +1,24 @@
+import { Group } from '@visx/group';
+import React from 'react';
+import { PopularityTier } from '../utils';
+import PopularityIconBar from './PopularityIconBar';
+
+type Props = {
+    tier: PopularityTier;
+    width?: number;
+    height?: number;
+};
+
+const PopularityIcon = ({ tier, width = 38, height = 32 }: Props) => {
+    return (
+        <svg width={width} height={height}>
+            <Group>
+                <PopularityIconBar index={0} active={tier < 3} opacity={0.6} />
+                <PopularityIconBar index={1} active={tier < 2} opacity={0.8} />
+                <PopularityIconBar index={2} active={tier < 1} opacity={1} />
+            </Group>
+        </svg>
+    );
+};
+
+export default PopularityIcon;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIconBar.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIconBar.tsx
new file mode 100644
index 00000000000000..4051328775fbce
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIconBar.tsx
@@ -0,0 +1,31 @@
+import { Bar } from '@visx/shape';
+import React from 'react';
+import { ANTD_GRAY } from '../../../../../constants';
+
+const ACTIVE_COLOR = '#3F54D1';
+const INACTIVE_COLOR = ANTD_GRAY[5];
+
+type Props = {
+    index: number;
+    active: boolean;
+    opacity: number;
+};
+
+const PopularityIconBar = ({ index, active, opacity }: Props) => {
+    return (
+        <Bar
+            rx={2}
+            ry={2}
+            key={index}
+            x={4 + 12 * index}
+            y={14 - 6 * index}
+            width={6}
+            height={12 + index * 6}
+            opacity={active ? opacity : 1}
+            stroke={active ? ACTIVE_COLOR : INACTIVE_COLOR}
+            fill={active ? ACTIVE_COLOR : INACTIVE_COLOR}
+        />
+    );
+};
+
+export default PopularityIconBar;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/styledComponents.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/styledComponents.ts
new file mode 100644
index 00000000000000..4c7caa34fe7d66
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/styledComponents.ts
@@ -0,0 +1,45 @@
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { REDESIGN_COLORS } from '../../../../constants';
+
+export const RelativeTime = styled.div<{ relativeTimeColor: string }>`
+    display: flex;
+    padding: 2px 8px;
+    border-radius: 20px;
+    border: 1px solid;
+    border-color: ${(props) => props.relativeTimeColor};
+    color: ${(props) => props.relativeTimeColor};
+`;
+
+export const ContentText = styled(Typography.Text)<{ color?: string }>`
+    font-size: 12px;
+    font-weight: 500;
+    color: ${(props) => props.color || REDESIGN_COLORS.TEXT_HEADING};
+`;
+
+export const LabelText = styled(Typography.Text)`
+    font-size: 12px;
+    font-weight: 500;
+    color: ${REDESIGN_COLORS.BODY_TEXT};
+`;
+
+export const InstanceIcon = styled.div`
+    height: 22px;
+    width: 22px;
+    background-color: #c9fff2;
+    border-radius: 6px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    svg {
+        padding: 3px;
+        height: 20px;
+        width: 20px;
+    }
+`;
+
+export const StyledLabel = styled.span`
+    font-size: 16px;
+    font-weight: 400;
+    color: ${REDESIGN_COLORS.BODY_TEXT};
+`;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/utils.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/utils.tsx
new file mode 100644
index 00000000000000..d281173ecdd854
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/utils.tsx
@@ -0,0 +1,132 @@
+import moment from 'moment';
+import { REDESIGN_COLORS } from '../../../../constants';
+import { CorpUser } from '../../../../../../../types.generated';
+
+/**
+ * A tier of popularity for the dataset.
+ */
+export enum PopularityTier {
+    TIER_1, // Most Popular
+    TIER_2,
+    TIER_3,
+    TIER_4, // Least Popular
+}
+
+export const ACRYL_PLATFORM = 'Acryl';
+
+export enum ActionType {
+    SHARE,
+    SYNC,
+}
+
+/**
+ * Retrieve a tier of popularity for dataset given statistics about the dataset.
+ * The tier is a function of the query count + unique users
+ *
+ * Tier 1: The dataset is in the top 20% of queries or unique users.
+ * Tier 2: The dataset is in the top 70% of queries or unique users.
+ * Tier 3: The dataset is in the bottom 30% of queries or unique users.
+ * Tier 4: No usage: The dataset has no usage or unique users
+ */
+export const getDatasetPopularityTier = (queryCountPercentileLast30Days, uniqueUserPercentileLast30Days) => {
+    if (queryCountPercentileLast30Days > 80 || uniqueUserPercentileLast30Days > 80) {
+        return PopularityTier.TIER_1;
+    }
+    if (queryCountPercentileLast30Days > 30 || uniqueUserPercentileLast30Days > 30) {
+        return PopularityTier.TIER_2;
+    }
+    if (queryCountPercentileLast30Days > 0 || uniqueUserPercentileLast30Days > 0) {
+        return PopularityTier.TIER_3;
+    }
+    return PopularityTier.TIER_4;
+};
+
+/**
+ * Retrieve a tier of popularity for dashboard given statistics about the dashboard.
+ * The tier is a function of the view count + unique users
+ *
+ * Tier 1: The dashboard is in the top 20% of queries or unique users.
+ * Tier 2: The dashboard is in the top 70% of queries or unique users.
+ * Tier 3: The dashboard is in the bottom 30% of queries or unique users.
+ * Tier 4: No usage: The dashboard has no usage or unique users
+ */
+export const getDashboardPopularityTier = (viewCountPercentileLast30Days, uniqueUserPercentileLast30Days) => {
+    if (viewCountPercentileLast30Days > 80 || uniqueUserPercentileLast30Days > 80) {
+        return PopularityTier.TIER_1;
+    }
+    if (viewCountPercentileLast30Days > 30 || uniqueUserPercentileLast30Days > 30) {
+        return PopularityTier.TIER_2;
+    }
+    if (viewCountPercentileLast30Days > 0 || uniqueUserPercentileLast30Days > 0) {
+        return PopularityTier.TIER_3;
+    }
+    return PopularityTier.TIER_4;
+};
+
+/**
+ * Retrieve a tier of popularity for chart given statistics about the chart.
+ * The tier is a function of the view count + unique users
+ *
+ * Tier 1: The chart is in the top 20% of queries or unique users.
+ * Tier 2: The chart is in the top 70% of queries or unique users.
+ * Tier 3: The chart is in the bottom 30% of queries or unique users.
+ * Tier 4: No usage: The chart has no usage or unique users
+ */
+export const getChartPopularityTier = (viewCountPercentileLast30Days, uniqueUserPercentileLast30Days) => {
+    if (viewCountPercentileLast30Days > 80 || uniqueUserPercentileLast30Days > 80) {
+        return PopularityTier.TIER_1;
+    }
+    if (viewCountPercentileLast30Days > 30 || uniqueUserPercentileLast30Days > 30) {
+        return PopularityTier.TIER_2;
+    }
+    if (viewCountPercentileLast30Days > 0 || uniqueUserPercentileLast30Days > 0) {
+        return PopularityTier.TIER_3;
+    }
+    return PopularityTier.TIER_4;
+};
+
+export const getQueryPopularityTier = (runsPercentileLast30days: number) => {
+    if (runsPercentileLast30days > 80) {
+        return PopularityTier.TIER_1;
+    }
+    if (runsPercentileLast30days > 30) {
+        return PopularityTier.TIER_2;
+    }
+    if (runsPercentileLast30days > 0) {
+        return PopularityTier.TIER_3;
+    }
+    return PopularityTier.TIER_4;
+};
+
+/**
+ * Returns true if the user "exists", e.g. there exists some information about
+ * the user in DataHub already.
+ *
+ * @param user the user under consideration
+ */
+export const userExists = (user: CorpUser) => {
+    return user.editableProperties || user.properties || user.isNativeUser;
+};
+
+export function isValuePresent(value) {
+    return value !== null && value !== undefined && !Number.isNaN(value);
+}
+
+export const getBarsStatusFromPopularityTier = (tier: number) => {
+    let status = 0;
+    if (tier === 0) status = 3;
+    else if (tier === 1) status = 2;
+    else if (tier === 2) status = 1;
+    return status;
+};
+
+export function getRelativeTimeColor(time: number) {
+    const relativeTime = moment(time);
+    if (relativeTime.isAfter(moment().subtract(1, 'week'))) {
+        return `${REDESIGN_COLORS.GREEN_NORMAL}`;
+    }
+    if (relativeTime.isAfter(moment().subtract(1, 'month'))) {
+        return `${REDESIGN_COLORS.WARNING_YELLOW}`;
+    }
+    return `${REDESIGN_COLORS.WARNING_RED}`;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/tagRenderer.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/tagRenderer.tsx
new file mode 100644
index 00000000000000..b188d96f810311
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/tagRenderer.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import { Tag } from 'antd';
+import styled from 'styled-components';
+
+const StyleTag = styled(Tag)`
+    padding: 0px 7px;
+    margin-right: 3px;
+    display: flex;
+    justify-content: start;
+    align-items: center;
+`;
+
+export const tagRender = (props) => {
+    // eslint-disable-next-line react/prop-types
+    const { label, closable, onClose } = props;
+    const onPreventMouseDown = (event) => {
+        event.preventDefault();
+        event.stopPropagation();
+    };
+    return (
+        <StyleTag onMouseDown={onPreventMouseDown} closable={closable} onClose={onClose}>
+            {label}
+        </StyleTag>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/useGetDataForProfile.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/useGetDataForProfile.ts
new file mode 100644
index 00000000000000..7429c4103ed474
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/useGetDataForProfile.ts
@@ -0,0 +1,58 @@
+import { useAppConfig } from '@src/app/useAppConfig';
+import { QueryHookOptions, QueryResult } from '@apollo/client';
+import { getDataForEntityType } from './utils';
+import { useIsSeparateSiblingsMode } from '../../useIsSeparateSiblingsMode';
+import { GenericEntityProperties } from '../../../../entity/shared/types';
+import { EntityType, Exact } from '../../../../../types.generated';
+import { combineEntityDataWithSiblings } from '../../../../entity/shared/siblingUtils';
+
+interface Props<T> {
+    urn: string;
+    entityType: EntityType;
+    useEntityQuery: (
+        baseOptions: QueryHookOptions<
+            T,
+            Exact<{
+                urn: string;
+            }>
+        >,
+    ) => QueryResult<
+        T,
+        Exact<{
+            urn: string;
+        }>
+    >;
+    getOverrideProperties?: (T) => GenericEntityProperties;
+}
+
+export default function useGetDataForProfile<T>({ urn, entityType, useEntityQuery, getOverrideProperties }: Props<T>) {
+    const flags = useAppConfig().config.featureFlags;
+    const isHideSiblingMode = useIsSeparateSiblingsMode();
+    const {
+        loading,
+        error,
+        data: dataNotCombinedWithSiblings,
+        refetch,
+    } = useEntityQuery({
+        variables: { urn },
+        fetchPolicy: 'cache-first',
+    });
+
+    const dataPossiblyCombinedWithSiblings = isHideSiblingMode
+        ? dataNotCombinedWithSiblings
+        : combineEntityDataWithSiblings(dataNotCombinedWithSiblings);
+
+    const entityData =
+        (dataPossiblyCombinedWithSiblings &&
+            Object.keys(dataPossiblyCombinedWithSiblings).length > 0 &&
+            getDataForEntityType({
+                data: dataPossiblyCombinedWithSiblings[Object.keys(dataPossiblyCombinedWithSiblings)[0]],
+                entityType,
+                getOverrideProperties,
+                isHideSiblingMode,
+                flags,
+            })) ||
+        null;
+
+    return { entityData, dataPossiblyCombinedWithSiblings, dataNotCombinedWithSiblings, loading, error, refetch };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/utils.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/utils.tsx
new file mode 100644
index 00000000000000..ae3ab994f206dc
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/utils.tsx
@@ -0,0 +1,298 @@
+import { ReadOutlined } from '@ant-design/icons';
+import { isEqual } from 'lodash';
+import queryString from 'query-string';
+import React, { useEffect } from 'react';
+import { useLocation } from 'react-router';
+import { EntityRegistry } from '../../../../../entityRegistryContext';
+import { EntityType, FeatureFlagsConfig } from '../../../../../types.generated';
+import useIsLineageMode from '../../../../lineage/utils/useIsLineageMode';
+import {
+    ENTITY_PROFILE_DOMAINS_ID,
+    ENTITY_PROFILE_GLOSSARY_TERMS_ID,
+    ENTITY_PROFILE_LINEAGE_ID,
+    ENTITY_PROFILE_OWNERS_ID,
+    ENTITY_PROFILE_PROPERTIES_ID,
+    ENTITY_PROFILE_TAGS_ID,
+    ENTITY_PROFILE_V2_SIDEBAR_ID,
+} from '../../../../onboarding/config/EntityProfileOnboardingConfig';
+import {
+    ENTITY_PROFILE_V2_COLUMNS_ID,
+    ENTITY_PROFILE_V2_CONTENTS_ID,
+    ENTITY_PROFILE_V2_DOCUMENTATION_ID,
+    ENTITY_PROFILE_V2_INCIDENTS_ID,
+    ENTITY_SIDEBAR_V2_PROPERTIES_ID,
+    ENTITY_PROFILE_V2_QUERIES_ID,
+    ENTITY_PROFILE_V2_VALIDATION_ID,
+    ENTITY_SIDEBAR_V2_LINEAGE_TAB_ID,
+    ENTITY_SIDEBAR_V2_COLUMNS_TAB_ID,
+    ENTITY_SIDEBAR_V2_ABOUT_TAB_ID,
+} from '../../../../onboarding/configV2/EntityProfileOnboardingConfig';
+import usePrevious from '../../../../shared/usePrevious';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+import { GLOSSARY_ENTITY_TYPES } from '../../constants';
+import { useGlossaryEntityData } from '../../GlossaryEntityContext';
+import { SEPARATE_SIBLINGS_URL_PARAM, useIsSeparateSiblingsMode } from '../../useIsSeparateSiblingsMode';
+import { EntitySidebarSection, EntitySidebarTab, EntityTab } from '../../types';
+import { GenericEntityProperties } from '../../../../entity/shared/types';
+import EntitySidebarSectionsTab from './sidebar/EntitySidebarSectionsTab';
+import SidebarPopularityHeaderSection from './sidebar/shared/SidebarPopularityHeaderSection';
+import { PopularityTier, getBarsStatusFromPopularityTier } from './sidebar/shared/utils';
+
+/**
+ * The structure of our path will be
+ *
+ * /<entity-name>/<entity-urn>/<tab-name>
+ */
+const ENTITY_TAB_NAME_REGEX_PATTERN = '^/[^/]+/[^/]+/([^/]+).*';
+
+export type SidebarStatsColumn = {
+    title: React.ReactNode;
+    content: React.ReactNode;
+};
+
+export function getDataForEntityType<T>({
+    data: entityData,
+    getOverrideProperties,
+    isHideSiblingMode,
+    flags,
+}: {
+    data: T;
+    entityType?: EntityType;
+    getOverrideProperties?: (T, flags?: FeatureFlagsConfig) => GenericEntityProperties;
+    isHideSiblingMode?: boolean;
+    flags?: FeatureFlagsConfig;
+}): GenericEntityProperties | null {
+    if (!entityData) {
+        return null;
+    }
+    const anyEntityData = entityData as any;
+    let modifiedEntityData = entityData;
+    // Bring 'customProperties' field to the root level.
+    const customProperties = anyEntityData.properties?.customProperties || anyEntityData.info?.customProperties;
+    if (customProperties) {
+        modifiedEntityData = {
+            ...entityData,
+            customProperties,
+        };
+    }
+    if (anyEntityData.tags) {
+        modifiedEntityData = {
+            ...modifiedEntityData,
+            globalTags: anyEntityData.tags,
+        };
+    }
+
+    if (
+        anyEntityData?.siblingsSearch?.searchResults?.filter((sibling) => sibling.entity.exists).length > 0 &&
+        !isHideSiblingMode
+    ) {
+        const genericSiblingProperties: GenericEntityProperties[] = anyEntityData?.siblingsSearch?.searchResults?.map(
+            (sibling) => getDataForEntityType({ data: sibling.entity, getOverrideProperties: () => ({}) }),
+        );
+
+        const allPlatforms = anyEntityData.siblings?.isPrimary
+            ? [anyEntityData.platform, genericSiblingProperties?.[0]?.platform]
+            : [genericSiblingProperties?.[0]?.platform, anyEntityData.platform];
+
+        modifiedEntityData = {
+            ...modifiedEntityData,
+            siblingPlatforms: allPlatforms,
+        };
+    }
+
+    return {
+        ...modifiedEntityData,
+        ...getOverrideProperties?.(entityData, flags),
+    };
+}
+
+export function getEntityPath(
+    entityType: EntityType,
+    urn: string,
+    entityRegistry: EntityRegistry,
+    isLineageMode: boolean,
+    isHideSiblingMode: boolean,
+    tabName?: string,
+    tabParams?: Record<string, any>,
+) {
+    const tabParamsString = tabParams ? `&${queryString.stringify(tabParams)}` : '';
+
+    if (!tabName) {
+        return `${entityRegistry.getEntityUrl(entityType, urn)}?is_lineage_mode=${isLineageMode}${tabParamsString}`;
+    }
+    return `${entityRegistry.getEntityUrl(entityType, urn)}/${tabName}?is_lineage_mode=${isLineageMode}${
+        isHideSiblingMode ? `&${SEPARATE_SIBLINGS_URL_PARAM}=${isHideSiblingMode}` : ''
+    }${tabParamsString}`;
+}
+
+export function useEntityPath(entityType: EntityType, urn: string, tabName?: string, tabParams?: Record<string, any>) {
+    const isLineageMode = useIsLineageMode();
+    const isHideSiblingMode = useIsSeparateSiblingsMode();
+    const entityRegistry = useEntityRegistry();
+    return getEntityPath(entityType, urn, entityRegistry, isLineageMode, isHideSiblingMode, tabName, tabParams);
+}
+
+export function useRoutedTab(tabs: EntityTab[]): EntityTab | undefined {
+    const { pathname } = useLocation();
+    const trimmedPathName = pathname.endsWith('/') ? pathname.slice(0, pathname.length - 1) : pathname;
+    // Match against the regex
+    const match = trimmedPathName.match(ENTITY_TAB_NAME_REGEX_PATTERN);
+    if (match && match[1]) {
+        const selectedTabPath = match[1];
+        const routedTab = tabs.find((tab) => tab.name === selectedTabPath);
+        return routedTab;
+    }
+    // No match found!
+    return undefined;
+}
+
+export function useIsOnTab(tabName: string): boolean {
+    const { pathname } = useLocation();
+    const trimmedPathName = pathname.endsWith('/') ? pathname.slice(0, pathname.length - 1) : pathname;
+    // Match against the regex
+    const match = trimmedPathName.match(ENTITY_TAB_NAME_REGEX_PATTERN);
+    if (match && match[1]) {
+        const selectedTabPath = match[1];
+        return selectedTabPath === tabName;
+    }
+    // No match found!
+    return false;
+}
+
+export function useGlossaryActiveTabPath(): string {
+    const { pathname, search } = useLocation();
+    const trimmedPathName = pathname.endsWith('/') ? pathname.slice(0, pathname.length - 1) : pathname;
+
+    // Match against the regex
+    const match = trimmedPathName.match(ENTITY_TAB_NAME_REGEX_PATTERN);
+
+    if (match && match[1]) {
+        const selectedTabPath = match[1] + (search || ''); // Include all query parameters
+        return selectedTabPath;
+    }
+
+    // No match found!
+    return '';
+}
+
+export function formatDateString(time: number) {
+    const date = new Date(time);
+    return date.toLocaleDateString('en-US');
+}
+
+export function useEntityQueryParams() {
+    const isHideSiblingMode = useIsSeparateSiblingsMode();
+    const response = {};
+    if (isHideSiblingMode) {
+        response[SEPARATE_SIBLINGS_URL_PARAM] = true;
+    }
+
+    return response;
+}
+
+export function useUpdateGlossaryEntityDataOnChange(
+    entityData: GenericEntityProperties | null,
+    entityType: EntityType,
+) {
+    const { setEntityData } = useGlossaryEntityData();
+    const previousEntityData = usePrevious(entityData);
+
+    useEffect(() => {
+        // first check this is a glossary entity to prevent unnecessary comparisons in non-glossary context
+        if (GLOSSARY_ENTITY_TYPES.includes(entityType) && !isEqual(entityData, previousEntityData)) {
+            setEntityData(entityData);
+        }
+    });
+}
+
+export function getOnboardingStepIdsForEntityType(entityType: EntityType): string[] {
+    switch (entityType) {
+        case EntityType.Chart:
+            return [
+                ENTITY_PROFILE_V2_DOCUMENTATION_ID,
+                ENTITY_PROFILE_PROPERTIES_ID,
+                ENTITY_PROFILE_LINEAGE_ID,
+                ENTITY_PROFILE_TAGS_ID,
+                ENTITY_PROFILE_GLOSSARY_TERMS_ID,
+                ENTITY_PROFILE_OWNERS_ID,
+                ENTITY_PROFILE_DOMAINS_ID,
+            ];
+        case EntityType.Container:
+            return [
+                ENTITY_PROFILE_V2_CONTENTS_ID,
+                ENTITY_PROFILE_V2_DOCUMENTATION_ID,
+                ENTITY_PROFILE_PROPERTIES_ID,
+                ENTITY_PROFILE_OWNERS_ID,
+                ENTITY_PROFILE_TAGS_ID,
+                ENTITY_PROFILE_GLOSSARY_TERMS_ID,
+                ENTITY_PROFILE_DOMAINS_ID,
+            ];
+        case EntityType.Dataset:
+            return [
+                ENTITY_PROFILE_V2_SIDEBAR_ID,
+                ENTITY_SIDEBAR_V2_ABOUT_TAB_ID,
+                ENTITY_SIDEBAR_V2_LINEAGE_TAB_ID,
+                ENTITY_SIDEBAR_V2_COLUMNS_TAB_ID,
+                ENTITY_SIDEBAR_V2_PROPERTIES_ID,
+                ENTITY_PROFILE_DOMAINS_ID,
+                ENTITY_PROFILE_OWNERS_ID,
+                ENTITY_PROFILE_TAGS_ID,
+                ENTITY_PROFILE_GLOSSARY_TERMS_ID,
+                ENTITY_PROFILE_V2_COLUMNS_ID,
+                ENTITY_PROFILE_V2_DOCUMENTATION_ID,
+                ENTITY_PROFILE_LINEAGE_ID,
+                ENTITY_PROFILE_V2_QUERIES_ID,
+                ENTITY_PROFILE_V2_VALIDATION_ID,
+                ENTITY_PROFILE_V2_INCIDENTS_ID,
+            ];
+        default:
+            return [];
+    }
+}
+
+export const defaultTabDisplayConfig = {
+    visible: (_, _1) => true,
+    enabled: (_, _1) => true,
+};
+
+export const getFinalSidebarTabs = (tabs: EntitySidebarTab[], sidebarSections: EntitySidebarSection[]) => {
+    const sidebarTabsWithDefaults = tabs.map((tab) => ({
+        ...tab,
+        display: { ...defaultTabDisplayConfig, ...tab.display },
+    }));
+
+    let finalTabs = sidebarTabsWithDefaults;
+
+    // Add a default "About" tab if only the legacy sections were provided.
+    if ((sidebarSections || [])?.length > 0) {
+        finalTabs = [
+            {
+                name: 'About',
+                icon: ReadOutlined,
+                component: EntitySidebarSectionsTab,
+                properties: {
+                    sections: sidebarSections || [],
+                },
+                display: {
+                    ...defaultTabDisplayConfig,
+                },
+            },
+            ...sidebarTabsWithDefaults,
+        ];
+    }
+
+    return finalTabs;
+};
+
+export function getPopularityColumn(tier: PopularityTier): SidebarStatsColumn | null {
+    if (tier === undefined) return null;
+
+    const status = getBarsStatusFromPopularityTier(tier);
+    if (status) {
+        return {
+            title: 'Popularity',
+            content: <SidebarPopularityHeaderSection />,
+        };
+    }
+    return null;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHeader.tsx b/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHeader.tsx
new file mode 100644
index 00000000000000..d5c916fabf2a40
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHeader.tsx
@@ -0,0 +1,107 @@
+import { Image, Typography } from 'antd';
+import React from 'react';
+import styled, { useTheme } from 'styled-components/macro';
+import Link from 'antd/lib/typography/Link';
+import { ArrowRightOutlined } from '@ant-design/icons';
+import { DEFAULT_APP_CONFIG } from '../../../../appConfigContext';
+import { useAppConfig } from '../../../useAppConfig';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { IconStyleType } from '../../Entity';
+import { useEntityData } from '../../../entity/shared/EntityContext';
+import { getDisplayedEntityType } from '../containers/profile/header/utils';
+import { ANTD_GRAY } from '../constants';
+import analytics from '../../../analytics/analytics';
+import { EventType } from '../../../analytics';
+
+const HeaderWrapper = styled.div`
+    display: flex;
+`;
+
+const LogoImage = styled(Image)`
+    display: inline-block;
+    height: 40px;
+    width: auto;
+`;
+
+const EntityContent = styled.div`
+    margin-left: 16px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+`;
+
+const EntityTypeWrapper = styled.div`
+    font-size: 12px;
+    color: ${ANTD_GRAY[8]};
+`;
+
+const TypeIcon = styled.span`
+    margin-right: 5px;
+`;
+
+const EntityName = styled(Typography.Text)`
+    font-size: 16px;
+    font-weight: 700;
+    line-height: 24px;
+`;
+
+const StyledLink = styled(Link)`
+    font-size: 10px;
+    font-weight: 700;
+    line-height: 22px;
+    margin-left: 8px;
+`;
+
+const EntityNameWrapper = styled.div`
+    display: flex;
+    align-items: baseline;
+`;
+
+export default function EmbeddedHeader() {
+    const entityRegistry = useEntityRegistry();
+    const { entityData, entityType } = useEntityData();
+    const appConfig = useAppConfig();
+    const themeConfig = useTheme();
+
+    function trackClickViewInDataHub() {
+        analytics.event({
+            type: EventType.EmbedProfileViewInDataHubEvent,
+            entityType,
+            entityUrn: entityData?.urn || '',
+        });
+    }
+
+    const typeIcon = entityRegistry.getIcon(entityType, 12, IconStyleType.ACCENT, ANTD_GRAY[8]);
+    const displayedEntityType = getDisplayedEntityType(entityData, entityRegistry, entityType);
+    const entityName = entityRegistry.getDisplayName(entityType, entityData);
+    const entityTypePathName = entityRegistry.getPathName(entityType);
+    const logoUrl =
+        appConfig.config !== DEFAULT_APP_CONFIG
+            ? appConfig.config.visualConfig.logoUrl || themeConfig.assets.logoUrl
+            : undefined;
+
+    return (
+        <HeaderWrapper>
+            <LogoImage src={logoUrl} preview={false} />
+            <EntityContent>
+                <EntityTypeWrapper>
+                    <TypeIcon>{typeIcon}</TypeIcon>
+                    {displayedEntityType}
+                </EntityTypeWrapper>
+                <EntityNameWrapper>
+                    <EntityName ellipsis={{ tooltip: entityName }} style={{ maxWidth: '75%' }}>
+                        {entityName}
+                    </EntityName>
+                    <StyledLink
+                        href={`${window.location.origin}/${entityTypePathName}/${entityData?.urn}`}
+                        target="_blank"
+                        rel="noreferrer noopener"
+                        onClick={trackClickViewInDataHub}
+                    >
+                        view in DataHub <ArrowRightOutlined />
+                    </StyledLink>
+                </EntityNameWrapper>
+            </EntityContent>
+        </HeaderWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHealthIcon.tsx b/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHealthIcon.tsx
new file mode 100644
index 00000000000000..52eaac311d2a69
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHealthIcon.tsx
@@ -0,0 +1,64 @@
+import { orange } from '@ant-design/colors';
+import { WarningFilled } from '@ant-design/icons';
+import { useGetDefaultLineageStartTimeMillis } from '@app/lineage/utils/useGetLineageTimeParams';
+import React from 'react';
+import { useParams } from 'react-router';
+import styled from 'styled-components';
+import { useSearchAcrossLineageQuery } from '../../../../graphql/search.generated';
+import { HAS_ACTIVE_INCIDENTS_FILTER_NAME, HAS_FAILING_ASSERTIONS_FILTER_NAME } from '../../../search/utils/constants';
+import { useAppConfig } from '../../../useAppConfig';
+import { decodeUrn } from '../utils';
+import { generateQueryVariables } from './UpstreamHealth/utils';
+
+// Do not update unless you update the reference to this ID in our Chrome extension code
+const ICON_ID = 'embedded-datahub-health-icon';
+
+const StyledWarning = styled(WarningFilled)`
+    color: ${orange[5]};
+    font-size: 16px;
+`;
+
+interface RouteParams {
+    urn: string;
+}
+
+// Used by our Chrome Extension to show a warning health icon if there are unhealthy upstreams
+export default function EmbeddedHealthIcon() {
+    const { urn: encodedUrn } = useParams<RouteParams>();
+    const urn = decodeUrn(encodedUrn);
+    const appConfig = useAppConfig();
+    const lineageEnabled: boolean = appConfig?.config?.chromeExtensionConfig?.lineageEnabled || false;
+    const startTimeMillis = useGetDefaultLineageStartTimeMillis();
+
+    const { data: incidentsData } = useSearchAcrossLineageQuery(
+        generateQueryVariables({
+            urn,
+            startTimeMillis,
+            filterField: HAS_ACTIVE_INCIDENTS_FILTER_NAME,
+            start: 0,
+            includeAssertions: false,
+            includeIncidents: true,
+            skip: !lineageEnabled,
+            count: 0,
+        }),
+    );
+
+    const { data: assertionsData } = useSearchAcrossLineageQuery(
+        generateQueryVariables({
+            urn,
+            startTimeMillis,
+            filterField: HAS_FAILING_ASSERTIONS_FILTER_NAME,
+            start: 0,
+            includeAssertions: true,
+            includeIncidents: false,
+            skip: !lineageEnabled,
+            count: 0,
+        }),
+    );
+
+    if (incidentsData?.searchAcrossLineage?.total || assertionsData?.searchAcrossLineage?.total) {
+        return <StyledWarning id={ICON_ID} />;
+    }
+
+    return null;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedProfile.tsx b/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedProfile.tsx
new file mode 100644
index 00000000000000..8a876beb5832c2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedProfile.tsx
@@ -0,0 +1,96 @@
+import { LoadingOutlined } from '@ant-design/icons';
+import { QueryHookOptions, QueryResult } from '@apollo/client';
+import EntitySidebarContext, { entitySidebarContextDefaults } from '@app/sharedV2/EntitySidebarContext';
+import React from 'react';
+import styled from 'styled-components';
+import { EntityType, Exact } from '../../../../types.generated';
+import useGetDataForProfile from '../containers/profile/useGetDataForProfile';
+import { EntityContext } from '../../../entity/shared/EntityContext';
+import { GenericEntityProperties } from '../../../entity/shared/types';
+import { TabContextType } from '../types';
+import NonExistentEntityPage from '../entity/NonExistentEntityPage';
+import { useEntityRegistryV2 } from '../../../useEntityRegistry';
+import EntityProfileSidebar from '../containers/profile/sidebar/EntityProfileSidebar';
+import { getFinalSidebarTabs } from '../containers/profile/utils';
+
+const LoadingWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 85vh;
+    font-size: 50px;
+`;
+
+const SidebarWrapper = styled.div`
+    display: flex;
+    height: 100vh;
+`;
+
+interface Props<T> {
+    urn: string;
+    entityType: EntityType;
+    useEntityQuery: (
+        baseOptions: QueryHookOptions<
+            T,
+            Exact<{
+                urn: string;
+            }>
+        >,
+    ) => QueryResult<
+        T,
+        Exact<{
+            urn: string;
+        }>
+    >;
+    getOverrideProperties: (T) => GenericEntityProperties;
+}
+
+export default function EmbeddedProfile<T>({ urn, entityType, getOverrideProperties, useEntityQuery }: Props<T>) {
+    const entityRegistry = useEntityRegistryV2();
+    const { entityData, dataPossiblyCombinedWithSiblings, dataNotCombinedWithSiblings, loading, refetch } =
+        useGetDataForProfile({ urn, entityType, useEntityQuery, getOverrideProperties });
+
+    if (entityData?.exists === false) {
+        return <NonExistentEntityPage />;
+    }
+
+    if (!entityData?.type) return null;
+
+    const sidebarTabs = entityRegistry.getSidebarTabs(entityData.type);
+    const sidebarSections = entityRegistry.getSidebarSections(entityData.type);
+    const finalTabs = getFinalSidebarTabs(sidebarTabs, sidebarSections);
+
+    return (
+        <EntityContext.Provider
+            value={{
+                urn,
+                entityType,
+                entityData,
+                loading,
+                baseEntity: dataPossiblyCombinedWithSiblings,
+                dataNotCombinedWithSiblings,
+                routeToTab: () => {},
+                refetch,
+                lineage: undefined,
+            }}
+        >
+            {loading && (
+                <LoadingWrapper>
+                    <LoadingOutlined />
+                </LoadingWrapper>
+            )}
+            {!loading && entityData && entityData.type && (
+                <EntitySidebarContext.Provider
+                    value={{
+                        ...entitySidebarContextDefaults,
+                        separateSiblings: true,
+                    }}
+                >
+                    <SidebarWrapper>
+                        <EntityProfileSidebar tabs={finalTabs} contextType={TabContextType.CHROME_SIDEBAR} />
+                    </SidebarWrapper>
+                </EntitySidebarContext.Provider>
+            )}
+        </EntityContext.Provider>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/ActiveIncidents.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/ActiveIncidents.tsx
new file mode 100644
index 00000000000000..180fd2c65f85a3
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/ActiveIncidents.tsx
@@ -0,0 +1,55 @@
+import { LoadingOutlined } from '@ant-design/icons';
+import React from 'react';
+import { Dataset } from '../../../../../types.generated';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+import { FailingDataWrapper, FailingSectionWrapper, LoadingWrapper, LoadMoreButton } from './FailingAssertions';
+import FailingEntity from './FailingEntity';
+
+interface Props {
+    datasetsWithActiveIncidents: Dataset[];
+    totalDatasetsWithActiveIncidents: number;
+    fetchMoreIncidentsData: () => void;
+    isLoadingIncidents: boolean;
+}
+
+export default function ActiveIncidents({
+    datasetsWithActiveIncidents,
+    totalDatasetsWithActiveIncidents,
+    fetchMoreIncidentsData,
+    isLoadingIncidents,
+}: Props) {
+    const entityRegistry = useEntityRegistry();
+
+    return (
+        <FailingSectionWrapper>
+            {totalDatasetsWithActiveIncidents} data source{totalDatasetsWithActiveIncidents > 1 && 's'} with active
+            incidents
+            <FailingDataWrapper>
+                {datasetsWithActiveIncidents.map((dataset) => {
+                    const numActiveIncidents = (dataset as any).activeIncidents.total;
+
+                    return (
+                        <FailingEntity
+                            key={dataset.urn}
+                            link={entityRegistry.getEntityUrl(dataset.type, dataset.urn)}
+                            displayName={entityRegistry.getDisplayName(dataset.type, dataset)}
+                            contentText={`${numActiveIncidents} active incident${numActiveIncidents > 1 ? 's' : ''}`}
+                        />
+                    );
+                })}
+                {totalDatasetsWithActiveIncidents > datasetsWithActiveIncidents.length && (
+                    <>
+                        {isLoadingIncidents && (
+                            <LoadingWrapper>
+                                <LoadingOutlined />
+                            </LoadingWrapper>
+                        )}
+                        {!isLoadingIncidents && (
+                            <LoadMoreButton onClick={fetchMoreIncidentsData}>+ Load more</LoadMoreButton>
+                        )}
+                    </>
+                )}
+            </FailingDataWrapper>
+        </FailingSectionWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingAssertions.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingAssertions.tsx
new file mode 100644
index 00000000000000..75edb370f7b10f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingAssertions.tsx
@@ -0,0 +1,82 @@
+import { LoadingOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { Dataset } from '../../../../../types.generated';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+import FailingEntity from './FailingEntity';
+import { getNumAssertionsFailing } from './utils';
+
+export const FailingSectionWrapper = styled.div`
+    margin: 8px 0 0 34px;
+    font-size: 14px;
+    color: black;
+`;
+
+export const FailingDataWrapper = styled.div`
+    margin-left: 20px;
+`;
+
+export const LoadMoreButton = styled(Button)`
+    border: none;
+    padding: 0;
+    box-shadow: none;
+`;
+
+export const LoadingWrapper = styled.div`
+    // set width and height to what our load more button is
+    width: 68px;
+    height: 32px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+`;
+
+interface Props {
+    datasetsWithFailingAssertions: Dataset[];
+    totalDatasetsWithFailingAssertions: number;
+    fetchMoreAssertionsData: () => void;
+    isLoadingAssertions: boolean;
+}
+
+export default function FailingAssertions({
+    datasetsWithFailingAssertions,
+    totalDatasetsWithFailingAssertions,
+    fetchMoreAssertionsData,
+    isLoadingAssertions,
+}: Props) {
+    const entityRegistry = useEntityRegistry();
+
+    return (
+        <FailingSectionWrapper>
+            {totalDatasetsWithFailingAssertions} data source{totalDatasetsWithFailingAssertions > 1 && 's'} with failing
+            assertions
+            <FailingDataWrapper>
+                {datasetsWithFailingAssertions.map((dataset) => {
+                    const totalNumAssertions = dataset.assertions?.assertions?.length;
+                    const numAssertionsFailing = getNumAssertionsFailing(dataset);
+
+                    return (
+                        <FailingEntity
+                            link={entityRegistry.getEntityUrl(dataset.type, dataset.urn)}
+                            displayName={entityRegistry.getDisplayName(dataset.type, dataset)}
+                            contentText={`${numAssertionsFailing} of ${totalNumAssertions} failing`}
+                        />
+                    );
+                })}
+                {totalDatasetsWithFailingAssertions > datasetsWithFailingAssertions.length && (
+                    <>
+                        {isLoadingAssertions && (
+                            <LoadingWrapper>
+                                <LoadingOutlined />
+                            </LoadingWrapper>
+                        )}
+                        {!isLoadingAssertions && (
+                            <LoadMoreButton onClick={fetchMoreAssertionsData}>+ Load more</LoadMoreButton>
+                        )}
+                    </>
+                )}
+            </FailingDataWrapper>
+        </FailingSectionWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingEntity.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingEntity.tsx
new file mode 100644
index 00000000000000..4498dd7596d555
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingEntity.tsx
@@ -0,0 +1,60 @@
+import { red } from '@ant-design/colors';
+import Icon from '@ant-design/icons/lib/components/Icon';
+import { Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import ExternalLink from '../../../../../images/link-out.svg?react';
+
+const DatasetWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    margin-top: 8px;
+    overflow: hidden;
+    justify-content: space-between;
+`;
+
+const AssertionsSummaryWrapper = styled.span`
+    font-size: 10px;
+    font-weight: 700;
+    line-height: 13px;
+    color: ${red[7]};
+    background-color: ${red[0]};
+    border-radius: 8px;
+    margin-left: 5px;
+    padding: 2px 4px;
+    letter-spacing: 0.2px;
+    white-space: nowrap;
+`;
+
+const StyledLink = styled(Typography.Link)`
+    align-items: center;
+    display: flex;
+    overflow: hidden;
+    img {
+        margin-right: 3px;
+    }
+`;
+
+const StyledIcon = styled(Icon)`
+    margin-right: 3px;
+`;
+
+interface Props {
+    link: string;
+    displayName: string;
+    contentText: string;
+}
+
+export default function FailingEntity({ link, displayName, contentText }: Props) {
+    return (
+        <DatasetWrapper>
+            <StyledLink href={link} target="_blank" rel="noopener noreferrer">
+                <StyledIcon component={ExternalLink} />
+                <Typography.Text ellipsis={{ tooltip: true }} style={{ color: 'inherit' }}>
+                    {displayName}
+                </Typography.Text>
+            </StyledLink>
+            <AssertionsSummaryWrapper>{contentText}</AssertionsSummaryWrapper>
+        </DatasetWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingInputs.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingInputs.tsx
new file mode 100644
index 00000000000000..38f920be603312
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingInputs.tsx
@@ -0,0 +1,111 @@
+import { orange } from '@ant-design/colors';
+import { DownOutlined, WarningFilled } from '@ant-design/icons';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { Dataset } from '../../../../../types.generated';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+import { ANTD_GRAY } from '../../constants';
+import { getDisplayedEntityType } from '../../containers/profile/header/utils';
+import { useEntityData } from '../../../../entity/shared/EntityContext';
+import ActiveIncidents from './ActiveIncidents';
+import FailingAssertions from './FailingAssertions';
+
+const FailingEntityTitle = styled(Typography.Text)`
+    font-size: 16px;
+    line-height: 24px;
+    margin-left: 6px;
+`;
+
+const StyledWarning = styled(WarningFilled)`
+    color: ${orange[5]};
+    font-size: 14px;
+`;
+
+const FailingDetailsWrapper = styled.span`
+    font-size: 14px;
+    color: ${ANTD_GRAY[8]};
+    margin-left: 6px;
+    white-space: nowrap;
+    &:hover {
+        cursor: pointer;
+        color: ${(props) => props.theme.styles['primary-color']};
+    }
+`;
+
+const FailingInputsHeader = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const StyledArrow = styled(DownOutlined)<{ isOpen: boolean }>`
+    font-size: 12px;
+    margin-left: 3px;
+    ${(props) =>
+        props.isOpen &&
+        `
+        transform: rotate(180deg);
+        padding-top: 1px;
+    `}
+`;
+
+interface Props {
+    datasetsWithActiveIncidents: Dataset[];
+    totalDatasetsWithActiveIncidents: number;
+    fetchMoreIncidentsData: () => void;
+    isLoadingIncidents: boolean;
+    datasetsWithFailingAssertions: Dataset[];
+    totalDatasetsWithFailingAssertions: number;
+    fetchMoreAssertionsData: () => void;
+    isLoadingAssertions: boolean;
+}
+
+export default function FailingInputs({
+    datasetsWithActiveIncidents,
+    totalDatasetsWithActiveIncidents,
+    fetchMoreIncidentsData,
+    isLoadingIncidents,
+    datasetsWithFailingAssertions,
+    totalDatasetsWithFailingAssertions,
+    fetchMoreAssertionsData,
+    isLoadingAssertions,
+}: Props) {
+    const [areFailingDetailsVisible, setAreFailingDetailsVisible] = useState(false);
+    const entityRegistry = useEntityRegistry();
+    const { entityData, entityType } = useEntityData();
+    const displayedEntityType = getDisplayedEntityType(entityData, entityRegistry, entityType);
+
+    return (
+        <div>
+            <FailingInputsHeader>
+                <StyledWarning />
+                <FailingEntityTitle ellipsis={{ tooltip: true }}>
+                    Data quality issues impacting this {displayedEntityType}
+                </FailingEntityTitle>
+                <FailingDetailsWrapper onClick={() => setAreFailingDetailsVisible(!areFailingDetailsVisible)}>
+                    details <StyledArrow isOpen={areFailingDetailsVisible} />
+                </FailingDetailsWrapper>
+            </FailingInputsHeader>
+            {areFailingDetailsVisible && (
+                <>
+                    {datasetsWithActiveIncidents.length > 0 && (
+                        <ActiveIncidents
+                            datasetsWithActiveIncidents={datasetsWithActiveIncidents}
+                            totalDatasetsWithActiveIncidents={totalDatasetsWithActiveIncidents}
+                            fetchMoreIncidentsData={fetchMoreIncidentsData}
+                            isLoadingIncidents={isLoadingIncidents}
+                        />
+                    )}
+                    {datasetsWithFailingAssertions.length > 0 && (
+                        <FailingAssertions
+                            datasetsWithFailingAssertions={datasetsWithFailingAssertions}
+                            totalDatasetsWithFailingAssertions={totalDatasetsWithFailingAssertions}
+                            fetchMoreAssertionsData={fetchMoreAssertionsData}
+                            isLoadingAssertions={isLoadingAssertions}
+                        />
+                    )}
+                </>
+            )}
+        </div>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamEntitiesList.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamEntitiesList.tsx
new file mode 100644
index 00000000000000..84b41f8abe236e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamEntitiesList.tsx
@@ -0,0 +1,93 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Dataset } from '@src/types.generated';
+import { Divider } from 'antd';
+import { EntityLinkList } from '@src/app/homeV2/reference/sections/EntityLinkList';
+import { ANTD_GRAY } from '../../constants';
+
+type Props = {
+    directEntities: Dataset[];
+    indirectEntities: Dataset[];
+    loadMoreDirectEntities: () => void;
+    loadMoreIndirectEntities: () => void;
+    remainingDirectEntities: number;
+    remainingIndirectEntities: number;
+};
+
+const Container = styled.div`
+    padding: 10px;
+    background-color: white;
+`;
+
+const StyledDivider = styled(Divider)`
+    margin: 12px 0;
+`;
+
+const SubHeader = styled.div`
+    font-weight: 700;
+`;
+
+const Content = styled.div`
+    padding: 0 3px;
+`;
+
+const ShowMoreWrapper = styled.div`
+    margin-top: 5px;
+    display: flex;
+    justify-content: end;
+    font-weight: 600;
+    color: ${ANTD_GRAY[7]};
+    font-size: 12px;
+`;
+
+const UpstreamEntitiesList = ({
+    directEntities,
+    indirectEntities,
+    loadMoreDirectEntities,
+    loadMoreIndirectEntities,
+    remainingDirectEntities,
+    remainingIndirectEntities,
+}: Props) => {
+    return (
+        <Container>
+            <Content>
+                {!!directEntities.length && (
+                    <>
+                        <SubHeader>Direct Upstreams</SubHeader>
+                        <EntityLinkList
+                            entities={directEntities}
+                            loading={false}
+                            showMore={!!remainingDirectEntities}
+                            showMoreCount={remainingDirectEntities}
+                            onClickMore={loadMoreDirectEntities}
+                            showMoreComponent={
+                                <ShowMoreWrapper>{`Show ${remainingDirectEntities} more`}</ShowMoreWrapper>
+                            }
+                            showHealthIcon
+                        />
+                    </>
+                )}
+
+                {!!indirectEntities.length && (
+                    <>
+                        {!!directEntities.length && <StyledDivider />}
+                        <SubHeader>Indirect Upstreams</SubHeader>
+                        <EntityLinkList
+                            entities={indirectEntities}
+                            loading={false}
+                            showMore={!!remainingIndirectEntities}
+                            showMoreCount={remainingIndirectEntities}
+                            onClickMore={loadMoreIndirectEntities}
+                            showMoreComponent={
+                                <ShowMoreWrapper>{`Show ${remainingIndirectEntities} more`}</ShowMoreWrapper>
+                            }
+                            showHealthIcon
+                        />
+                    </>
+                )}
+            </Content>
+        </Container>
+    );
+};
+
+export default UpstreamEntitiesList;
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamHealth.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamHealth.tsx
new file mode 100644
index 00000000000000..d0d8709cb0ec48
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamHealth.tsx
@@ -0,0 +1,220 @@
+import { useGetDefaultLineageStartTimeMillis } from '@app/lineage/utils/useGetLineageTimeParams';
+import { Divider } from 'antd';
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components';
+import { ErrorRounded } from '@mui/icons-material';
+import { useSearchAcrossLineageQuery } from '../../../../../graphql/search.generated';
+import { Dataset, EntityType, FilterOperator, LineageDirection } from '../../../../../types.generated';
+import {
+    HAS_ACTIVE_INCIDENTS_FILTER_NAME,
+    HAS_FAILING_ASSERTIONS_FILTER_NAME,
+} from '../../../../search/utils/constants';
+import { useAppConfig } from '../../../../useAppConfig';
+import { useEntityData } from '../../../../entity/shared/EntityContext';
+import { DATASET_COUNT } from './utils';
+import UpstreamEntitiesList from './UpstreamEntitiesList';
+import { CTAWrapper, StyledArrow } from '../../containers/profile/sidebar/FormInfo/components';
+
+export const StyledDivider = styled(Divider)`
+    margin: 16px 0;
+`;
+
+const Title = styled.div`
+    font-size: 14px;
+    font-weight: 600;
+    display: flex;
+    align-items: center;
+`;
+
+const Header = styled.div`
+    display: flex;
+    gap: 8px;
+    align-items: center;
+`;
+
+const TitleWrapper = styled.div<{ isOpen?: boolean }>`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 10px;
+    margin-bottom: ${(props) => (props.isOpen ? '10px' : '12px')};
+    cursor: pointer;
+    text-wrap: auto;
+`;
+
+const Container = styled.div`
+    margin-bottom: 10px;
+`;
+
+export default function UpstreamHealth() {
+    const { entityData } = useEntityData();
+
+    const [isOpen, setIsOpen] = useState(false);
+    const [directUpstreamEntities, setDirectUpstreamEntities] = useState<Dataset[]>([]);
+    const [indirectUpstreamEntities, setIndirectUpstreamEntities] = useState<Dataset[]>([]);
+
+    const [directUpstreamsDataStart, setDirectUpstreamsDataStart] = useState(0);
+    const [indirectUpstreamsDataStart, setIndirectUpstreamsDataStart] = useState(0);
+
+    const [directUpstreamsDataTotal, setDirectUpstreamsDataTotal] = useState(0);
+    const [indirectUpstreamsDataTotal, setIndirectUpstreamsDataTotal] = useState(0);
+
+    const appConfig = useAppConfig();
+    const lineageEnabled: boolean = appConfig?.config?.chromeExtensionConfig?.lineageEnabled || false;
+    const startTimeMillis = useGetDefaultLineageStartTimeMillis();
+
+    const urn = entityData?.urn || '';
+
+    const generateQueryVariables = ({ degree, start }) => {
+        return {
+            skip: !lineageEnabled,
+            variables: {
+                input: {
+                    urn,
+                    query: '*',
+                    startTimeMillis,
+                    types: [EntityType.Dataset],
+                    count: DATASET_COUNT,
+                    start,
+                    direction: LineageDirection.Upstream,
+                    orFilters: [
+                        {
+                            and: [
+                                {
+                                    field: 'degree',
+                                    condition: FilterOperator.Equal,
+                                    values: degree,
+                                },
+                                {
+                                    field: HAS_ACTIVE_INCIDENTS_FILTER_NAME,
+                                    condition: FilterOperator.Equal,
+                                    values: ['true'],
+                                },
+                            ],
+                        },
+                        {
+                            and: [
+                                {
+                                    field: 'degree',
+                                    condition: FilterOperator.Equal,
+                                    values: degree,
+                                },
+                                {
+                                    field: HAS_FAILING_ASSERTIONS_FILTER_NAME,
+                                    condition: FilterOperator.Equal,
+                                    values: ['true'],
+                                },
+                            ],
+                        },
+                    ],
+                },
+                includeAssertions: false,
+                includeIncidents: false,
+            },
+        };
+    };
+
+    const { data: directUpstreamData, fetchMore: fetchMoreDirectUpstreamData } = useSearchAcrossLineageQuery(
+        generateQueryVariables({ degree: ['1'], start: directUpstreamsDataStart }),
+    );
+
+    const { data: indirectUpstreamData, fetchMore: fetchMoreIndirectUpstreamData } = useSearchAcrossLineageQuery(
+        generateQueryVariables({ degree: ['2', '3+'], start: indirectUpstreamsDataStart }),
+    );
+
+    useEffect(() => {
+        if (directUpstreamData?.searchAcrossLineage?.searchResults.length && !directUpstreamEntities.length) {
+            setDirectUpstreamEntities(
+                directUpstreamData.searchAcrossLineage.searchResults.map((result) => result.entity as Dataset),
+            );
+            setDirectUpstreamsDataTotal(directUpstreamData.searchAcrossLineage.total);
+        }
+    }, [
+        directUpstreamData?.searchAcrossLineage?.searchResults,
+        directUpstreamEntities.length,
+        directUpstreamData?.searchAcrossLineage?.total,
+    ]);
+
+    useEffect(() => {
+        if (indirectUpstreamData?.searchAcrossLineage?.searchResults.length && !indirectUpstreamEntities.length) {
+            setIndirectUpstreamEntities(
+                indirectUpstreamData.searchAcrossLineage.searchResults.map((result) => result.entity as Dataset),
+            );
+            setIndirectUpstreamsDataTotal(indirectUpstreamData.searchAcrossLineage.total);
+        }
+    }, [
+        indirectUpstreamData?.searchAcrossLineage?.searchResults,
+        indirectUpstreamEntities.length,
+        indirectUpstreamData?.searchAcrossLineage?.total,
+    ]);
+
+    function loadMoreDirectUpstreamData() {
+        const newStart = directUpstreamsDataStart + DATASET_COUNT;
+        fetchMoreDirectUpstreamData(
+            generateQueryVariables({
+                degree: ['1'],
+                start: newStart,
+            }),
+        ).then((result) => {
+            if (result.data.searchAcrossLineage?.searchResults) {
+                setDirectUpstreamEntities([
+                    ...directUpstreamEntities,
+                    ...result.data.searchAcrossLineage.searchResults.map((r) => r.entity as Dataset),
+                ]);
+            }
+        });
+        setDirectUpstreamsDataStart(newStart);
+    }
+
+    function loadMoreIndirectUpstreamData() {
+        const newStart = indirectUpstreamsDataStart + DATASET_COUNT;
+        fetchMoreIndirectUpstreamData(
+            generateQueryVariables({
+                degree: ['2', '3+'],
+                start: newStart,
+            }),
+        ).then((result) => {
+            if (result.data.searchAcrossLineage?.searchResults) {
+                setIndirectUpstreamEntities([
+                    ...indirectUpstreamEntities,
+                    ...result.data.searchAcrossLineage.searchResults.map((r) => r.entity as Dataset),
+                ]);
+            }
+        });
+        setIndirectUpstreamsDataStart(newStart);
+    }
+
+    const hasUnhealthyUpstreams = directUpstreamEntities.length || indirectUpstreamEntities.length;
+
+    if (!hasUnhealthyUpstreams) return null;
+
+    return (
+        <Container>
+            <CTAWrapper backgroundColor="#FBF3EF" borderColor="#FBF3EF" padding="10px 0 0 0">
+                <TitleWrapper isOpen={isOpen} onClick={() => setIsOpen(!isOpen)}>
+                    <Header>
+                        <ErrorRounded style={{ color: '#E54D1F', fontSize: '18' }} />
+                        <Title>Some upstreams are unhealthy</Title>
+                    </Header>
+                    <StyledArrow isOpen={isOpen} />
+                </TitleWrapper>
+                {isOpen && (
+                    <UpstreamEntitiesList
+                        directEntities={directUpstreamEntities}
+                        loadMoreDirectEntities={loadMoreDirectUpstreamData}
+                        remainingDirectEntities={Math.max(
+                            directUpstreamsDataTotal - (directUpstreamsDataStart + DATASET_COUNT),
+                            0,
+                        )}
+                        indirectEntities={indirectUpstreamEntities}
+                        loadMoreIndirectEntities={loadMoreIndirectUpstreamData}
+                        remainingIndirectEntities={Math.max(
+                            indirectUpstreamsDataTotal - (indirectUpstreamsDataStart + DATASET_COUNT),
+                            0,
+                        )}
+                    />
+                )}
+            </CTAWrapper>
+        </Container>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/__tests__/utils.test.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/__tests__/utils.test.tsx
new file mode 100644
index 00000000000000..1f371f5142de9c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/__tests__/utils.test.tsx
@@ -0,0 +1,75 @@
+import { dataset1, dataset2, dataset3 } from '../../../../../../Mocks';
+import { Dataset } from '../../../../../../types.generated';
+import * as utils from '../utils';
+
+// has 1 passing and 1 failing assertion
+const dataset1WithAssertions = {
+    ...dataset1,
+    assertions: {
+        count: 2,
+        total: 2,
+        start: 0,
+        assertions: [
+            {
+                runEvents: {
+                    total: 1,
+                    failed: 1,
+                    succeeded: 0,
+                },
+            },
+            {
+                runEvents: {
+                    total: 1,
+                    failed: 0,
+                    succeeded: 1,
+                },
+            },
+        ],
+    },
+};
+
+// 2 passing assertions
+const dataset2WithAssertions = {
+    ...dataset2,
+    assertions: {
+        count: 2,
+        total: 2,
+        start: 0,
+        assertions: [
+            {
+                runEvents: {
+                    total: 1,
+                    failed: 0,
+                    succeeded: 1,
+                },
+            },
+            {
+                runEvents: {
+                    total: 1,
+                    failed: 0,
+                    succeeded: 1,
+                },
+            },
+        ],
+    },
+};
+
+describe('utils', () => {
+    it('should get the number of assertions failing with some passing and some failing', () => {
+        const numAssertionsFailing = utils.getNumAssertionsFailing(dataset1WithAssertions as any as Dataset);
+
+        expect(numAssertionsFailing).toBe(1);
+    });
+
+    it('should get the number of assertions failing with all passing', () => {
+        const numAssertionsFailing = utils.getNumAssertionsFailing(dataset2WithAssertions as any as Dataset);
+
+        expect(numAssertionsFailing).toBe(0);
+    });
+
+    it('should get the number of assertions failing with no assertions', () => {
+        const numAssertionsFailing = utils.getNumAssertionsFailing(dataset3 as any as Dataset);
+
+        expect(numAssertionsFailing).toBe(0);
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/utils.ts b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/utils.ts
new file mode 100644
index 00000000000000..4108a8c4ee44f8
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/utils.ts
@@ -0,0 +1,62 @@
+import { Dataset, EntityType, FilterOperator, LineageDirection } from '../../../../../types.generated';
+
+export function getNumAssertionsFailing(dataset: Dataset) {
+    let numFailing = 0;
+
+    dataset.assertions?.assertions.forEach((assertion) => {
+        if (assertion.runEvents?.failed) {
+            numFailing += 1;
+        }
+    });
+
+    return numFailing;
+}
+
+export const DATASET_COUNT = 5;
+
+interface Arguments {
+    urn: string;
+    filterField: string;
+    start: number;
+    includeAssertions: boolean;
+    includeIncidents: boolean;
+    startTimeMillis: number | null;
+    skip?: boolean;
+    count?: number;
+}
+
+export function generateQueryVariables({
+    urn,
+    startTimeMillis,
+    filterField,
+    start,
+    includeAssertions,
+    includeIncidents,
+    skip,
+    count,
+}: Arguments) {
+    return {
+        skip,
+        variables: {
+            input: {
+                urn,
+                startTimeMillis,
+                query: '*',
+                types: [EntityType.Dataset],
+                start,
+                count: count !== undefined ? count : DATASET_COUNT,
+                direction: LineageDirection.Upstream,
+                orFilters: [
+                    {
+                        and: [
+                            { field: 'degree', condition: FilterOperator.Equal, values: ['1', '2', '3+'] },
+                            { field: filterField, condition: FilterOperator.Equal, values: ['true'] },
+                        ],
+                    },
+                ],
+            },
+            includeAssertions,
+            includeIncidents,
+        },
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/entity/EntityActions.tsx b/datahub-web-react/src/app/entityV2/shared/entity/EntityActions.tsx
new file mode 100644
index 00000000000000..98b934e9a7fc51
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/entity/EntityActions.tsx
@@ -0,0 +1,336 @@
+import React, { useState } from 'react';
+import { Button, message } from 'antd';
+import { Tooltip } from '@components';
+import styled from 'styled-components/macro';
+import { LinkOutlined, PlusOutlined } from '@ant-design/icons';
+import { SearchSelectModal } from '../components/styled/search/SearchSelectModal';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { EntityCapabilityType } from '../../Entity';
+import { useBatchAddTermsMutation, useBatchSetDomainMutation } from '../../../../graphql/mutations.generated';
+import { handleBatchError } from '../utils';
+import { useBatchSetDataProductMutation } from '../../../../graphql/dataProduct.generated';
+import { useEntityContext, useEntityData } from '../../../entity/shared/EntityContext';
+import CreateGlossaryEntityModal from '../EntityDropdown/CreateGlossaryEntityModal';
+import { EntityType } from '../../../../types.generated';
+
+export enum EntityActionItem {
+    /**
+     * Batch add a Glossary Term to a set of assets
+     */
+    BATCH_ADD_GLOSSARY_TERM,
+    /**
+     * Batch add a Domain to a set of assets
+     */
+    BATCH_ADD_DOMAIN,
+    /**
+     * Batch add a Data Product to a set of assets
+     */
+    BATCH_ADD_DATA_PRODUCT,
+    /**
+     * Add a new Glossary Term as child
+     */
+    ADD_CHILD_GLOSSARY_TERM,
+    /**
+     * Add a new Glossary Node as child
+     */
+    ADD_CHILD_GLOSSARY_NODE,
+}
+
+const ButtonWrapper = styled.div`
+    gap: 8px;
+    white-space: nowrap;
+    display: flex;
+    align-items: center;
+    overflow: hidden;
+
+    & button:hover {
+        opacity: 0.9;
+    }
+`;
+
+const TransparentButton = styled(Button)`
+    color: #533fd1;
+    font-size: 12px;
+    box-shadow: none;
+    border-color: #533fd1;
+    padding: 10px 20px;
+
+    &:hover {
+        transition: 0.15s;
+        opacity: 0.9;
+        border-color: #533fd1;
+        color: #533fd1;
+    }
+`;
+
+const PrimaryButton = styled(Button)`
+    color: #ffffff;
+    font-size: 12px;
+    box-shadow: none;
+    border-color: #533fd1;
+    background-color: #533fd1;
+    padding: 10px 20px;
+
+    &:hover {
+        transition: 0.15s;
+        opacity: 0.9;
+        border-color: #533fd1;
+        background-color: #533fd1;
+    }
+`;
+
+const StyledPlusOutlined = styled(PlusOutlined)`
+    font-size: 12px;
+`;
+
+interface Props {
+    urn: string;
+    actionItems: Set<EntityActionItem>;
+    refetchForEntity?: () => void;
+    refetchForTerms?: () => void;
+    refetchForNodes?: () => void;
+}
+
+function EntityActions(props: Props) {
+    // eslint ignore react/no-unused-prop-types
+    const entityRegistry = useEntityRegistry();
+    const { urn, actionItems, refetchForEntity, refetchForTerms, refetchForNodes } = props;
+    const { setShouldRefetchEmbeddedListSearch, entityState } = useEntityContext();
+    const [isBatchAddGlossaryTermModalVisible, setIsBatchAddGlossaryTermModalVisible] = useState(false);
+    const [isBatchSetDomainModalVisible, setIsBatchSetDomainModalVisible] = useState(false);
+    const [isBatchSetDataProductModalVisible, setIsBatchSetDataProductModalVisible] = useState(false);
+    const [isCreateTermModalVisible, setIsCreateTermModalVisible] = useState(false);
+    const [isCreateNodeModalVisible, setIsCreateNodeModalVisible] = useState(false);
+    const [batchAddTermsMutation] = useBatchAddTermsMutation();
+    const [batchSetDomainMutation] = useBatchSetDomainMutation();
+    const [batchSetDataProductMutation] = useBatchSetDataProductMutation();
+
+    // eslint-disable-next-line
+    const batchAddGlossaryTerms = (entityUrns: Array<string>) => {
+        batchAddTermsMutation({
+            variables: {
+                input: {
+                    termUrns: [urn],
+                    resources: entityUrns.map((entityUrn) => ({
+                        resourceUrn: entityUrn,
+                    })),
+                },
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    setIsBatchAddGlossaryTermModalVisible(false);
+                    message.loading({ content: 'Updating...', duration: 3 });
+                    setTimeout(() => {
+                        message.success({
+                            content: `Added Glossary Term to entities!`,
+                            duration: 2,
+                        });
+                        refetchForEntity?.();
+                        setShouldRefetchEmbeddedListSearch?.(true);
+                    }, 3000);
+                }
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error(
+                    handleBatchError(entityUrns, e, {
+                        content: `Failed to add glossary term: \n ${e.message || ''}`,
+                        duration: 3,
+                    }),
+                );
+            });
+    };
+
+    // eslint-disable-next-line
+    const batchSetDomain = (entityUrns: Array<string>) => {
+        batchSetDomainMutation({
+            variables: {
+                input: {
+                    domainUrn: urn,
+                    resources: entityUrns.map((entityUrn) => ({
+                        resourceUrn: entityUrn,
+                    })),
+                },
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    setIsBatchSetDomainModalVisible(false);
+                    message.loading({ content: 'Updating...', duration: 3 });
+                    setTimeout(() => {
+                        message.success({
+                            content: `Added assets to Domain!`,
+                            duration: 3,
+                        });
+                        refetchForEntity?.();
+                        setShouldRefetchEmbeddedListSearch?.(true);
+                        entityState?.setShouldRefetchContents(true);
+                    }, 3000);
+                }
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error(
+                    handleBatchError(entityUrns, e, {
+                        content: `Failed to add assets to Domain: \n ${e.message || ''}`,
+                        duration: 3,
+                    }),
+                );
+            });
+    };
+
+    // eslint-disable-next-line
+    const batchSetDataProduct = (entityUrns: Array<string>) => {
+        batchSetDataProductMutation({
+            variables: {
+                input: {
+                    dataProductUrn: urn,
+                    resourceUrns: entityUrns,
+                },
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    setIsBatchSetDataProductModalVisible(false);
+                    message.loading({ content: 'Updating...', duration: 3 });
+                    setTimeout(() => {
+                        message.success({
+                            content: `Added assets to Data Product!`,
+                            duration: 3,
+                        });
+                        refetchForEntity?.();
+                        setShouldRefetchEmbeddedListSearch?.(true);
+                    }, 3000);
+                }
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error(
+                    handleBatchError(entityUrns, e, {
+                        content: `Failed to add assets to Data Product. An unknown error occurred.`,
+                        duration: 3,
+                    }),
+                );
+            });
+    };
+
+    const { entityData } = useEntityData();
+    const canCreateGlossaryEntity = !!entityData?.privileges?.canManageChildren;
+
+    return (
+        <>
+            <ButtonWrapper>
+                {actionItems.has(EntityActionItem.BATCH_ADD_GLOSSARY_TERM) && (
+                    <Tooltip title="Add Glossary Term to Assets" showArrow={false} placement="bottom">
+                        <TransparentButton
+                            size="large"
+                            onClick={() => setIsBatchAddGlossaryTermModalVisible(true)}
+                            data-testid="glossary-batch-add"
+                        >
+                            <LinkOutlined /> Add to Assets
+                        </TransparentButton>
+                    </Tooltip>
+                )}
+                {actionItems.has(EntityActionItem.BATCH_ADD_DOMAIN) && (
+                    <Tooltip title="Add Assets to Domain" showArrow={false} placement="bottom">
+                        <TransparentButton
+                            size="large"
+                            onClick={() => setIsBatchSetDomainModalVisible(true)}
+                            data-testid="domain-batch-add"
+                        >
+                            <LinkOutlined /> Add to Assets
+                        </TransparentButton>
+                    </Tooltip>
+                )}
+                {actionItems.has(EntityActionItem.BATCH_ADD_DATA_PRODUCT) && (
+                    <Tooltip
+                        title="Add Assets to Data Product"
+                        showArrow={false}
+                        placement="bottom"
+                        data-testid="data-product-batch-add"
+                    >
+                        <TransparentButton size="large" onClick={() => setIsBatchSetDataProductModalVisible(true)}>
+                            <LinkOutlined />
+                            Add Assets
+                        </TransparentButton>
+                    </Tooltip>
+                )}
+                {actionItems.has(EntityActionItem.ADD_CHILD_GLOSSARY_NODE) && (
+                    <Tooltip title="Create New Term Group" showArrow={false} placement="bottom">
+                        <TransparentButton
+                            data-testid="add-term-group-button-v2"
+                            size="large"
+                            onClick={() => setIsCreateNodeModalVisible(true)}
+                        >
+                            <StyledPlusOutlined /> Add Term Group
+                        </TransparentButton>
+                    </Tooltip>
+                )}
+                {actionItems.has(EntityActionItem.ADD_CHILD_GLOSSARY_TERM) && (
+                    <Tooltip title="Create New Glossary Term" showArrow={false} placement="bottom">
+                        <PrimaryButton
+                            data-testid="add-term-button"
+                            type="primary"
+                            size="large"
+                            onClick={() => setIsCreateTermModalVisible(true)}
+                        >
+                            <StyledPlusOutlined /> Add Term
+                        </PrimaryButton>
+                    </Tooltip>
+                )}
+            </ButtonWrapper>
+            {isBatchAddGlossaryTermModalVisible && (
+                <SearchSelectModal
+                    titleText="Add Glossary Term to assets"
+                    continueText="Add"
+                    onContinue={batchAddGlossaryTerms}
+                    onCancel={() => setIsBatchAddGlossaryTermModalVisible(false)}
+                    fixedEntityTypes={Array.from(
+                        entityRegistry.getTypesWithSupportedCapabilities(EntityCapabilityType.GLOSSARY_TERMS),
+                    )}
+                />
+            )}
+            {isBatchSetDomainModalVisible && (
+                <SearchSelectModal
+                    titleText="Add assets to Domain"
+                    continueText="Add"
+                    onContinue={batchSetDomain}
+                    onCancel={() => setIsBatchSetDomainModalVisible(false)}
+                    fixedEntityTypes={Array.from(
+                        entityRegistry.getTypesWithSupportedCapabilities(EntityCapabilityType.DOMAINS),
+                    )}
+                />
+            )}
+            {isBatchSetDataProductModalVisible && (
+                <SearchSelectModal
+                    titleText="Add assets to Data Product"
+                    continueText="Add"
+                    onContinue={batchSetDataProduct}
+                    onCancel={() => setIsBatchSetDataProductModalVisible(false)}
+                    fixedEntityTypes={Array.from(
+                        entityRegistry.getTypesWithSupportedCapabilities(EntityCapabilityType.DATA_PRODUCTS),
+                    )}
+                />
+            )}
+            {isCreateTermModalVisible && (
+                <CreateGlossaryEntityModal
+                    entityType={EntityType.GlossaryTerm}
+                    canCreateGlossaryEntity={canCreateGlossaryEntity}
+                    onClose={() => setIsCreateTermModalVisible(false)}
+                    refetchData={refetchForTerms}
+                />
+            )}
+            {isCreateNodeModalVisible && (
+                <CreateGlossaryEntityModal
+                    entityType={EntityType.GlossaryNode}
+                    canCreateGlossaryEntity={canCreateGlossaryEntity}
+                    onClose={() => setIsCreateNodeModalVisible(false)}
+                    refetchData={refetchForNodes}
+                />
+            )}
+        </>
+    );
+}
+
+export default EntityActions;
diff --git a/datahub-web-react/src/app/entityV2/shared/entity/NonExistentEntityPage.tsx b/datahub-web-react/src/app/entityV2/shared/entity/NonExistentEntityPage.tsx
new file mode 100644
index 00000000000000..fa0281d5c244b9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/entity/NonExistentEntityPage.tsx
@@ -0,0 +1,6 @@
+import { Result } from 'antd';
+import React from 'react';
+
+export default function NonExistentEntityPage() {
+    return <Result status="404" title="Not Found" subTitle="Sorry, we are unable to find this entity in DataHub" />;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/entityForm/EntityForm.tsx b/datahub-web-react/src/app/entityV2/shared/entityForm/EntityForm.tsx
new file mode 100644
index 00000000000000..97637b6c4a96cf
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/entityForm/EntityForm.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import { FormView, useEntityFormContext } from '@src/app/entity/shared/entityForm/EntityFormContext';
+import FormByEntity from '@src/app/entity/shared/entityForm/FormByEntity';
+
+interface Props {
+    formUrn: string;
+}
+
+export default function EntityForm({ formUrn }: Props) {
+    const { formView } = useEntityFormContext();
+
+    if (formView === FormView.BY_ENTITY) return <FormByEntity formUrn={formUrn} />;
+
+    return null;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/entityForm/EntityFormModal.tsx b/datahub-web-react/src/app/entityV2/shared/entityForm/EntityFormModal.tsx
new file mode 100644
index 00000000000000..760a8ddc7aeba6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/entityForm/EntityFormModal.tsx
@@ -0,0 +1,59 @@
+import { CloseOutlined } from '@ant-design/icons';
+import React from 'react';
+import EntityFormContextProvider from '@src/app/entity/shared/entityForm/EntityFormContextProvider';
+import FormPageHeader from '@src/app/entity/shared/entityForm/FormHeader/FormPageHeader';
+import { Modal } from 'antd';
+import styled from 'styled-components';
+import EntityForm from './EntityForm';
+
+const StyledModal = styled(Modal)`
+    &&& .ant-modal-content {
+        display: flex;
+        flex-direction: column;
+        height: calc(100vh);
+    }
+
+    .ant-modal-header {
+        padding: 0;
+    }
+
+    .ant-modal-body {
+        flex: 1;
+        max-height: 100%;
+        overflow: hidden;
+        padding: 0;
+        display: flex;
+    }
+`;
+
+const StyledClose = styled(CloseOutlined)`
+    && {
+        color: white;
+        font-size: 24px;
+        margin: 18px 12px 0 0;
+    }
+`;
+
+interface Props {
+    selectedFormUrn: string | null;
+    isFormVisible: boolean;
+    hideFormModal: () => void;
+}
+
+export default function EntityFormModal({ selectedFormUrn, isFormVisible, hideFormModal }: Props) {
+    return (
+        <EntityFormContextProvider formUrn={selectedFormUrn || ''}>
+            <StyledModal
+                open={isFormVisible}
+                onCancel={hideFormModal}
+                footer={null}
+                title={<FormPageHeader />}
+                closeIcon={<StyledClose />}
+                style={{ top: 0, height: '100vh', minWidth: '100vw' }}
+                destroyOnClose
+            >
+                <EntityForm formUrn={selectedFormUrn || ''} />
+            </StyledModal>
+        </EntityFormContextProvider>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/externalUrl/ViewInPlatform.tsx b/datahub-web-react/src/app/entityV2/shared/externalUrl/ViewInPlatform.tsx
new file mode 100644
index 00000000000000..a02f7e21de8669
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/externalUrl/ViewInPlatform.tsx
@@ -0,0 +1,99 @@
+import { EntityActionType, EventType } from '@app/analytics';
+import analytics from '@app/analytics/analytics';
+import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
+import { useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode';
+import LaunchIcon from '@mui/icons-material/Launch';
+import { GenericEntityProperties } from '@src/app/entity/shared/types';
+import React from 'react';
+import styled from 'styled-components';
+import { getSiblings } from '../tabs/Dataset/Validations/acrylUtils';
+import { getExternalUrlDisplayName } from '../utils';
+
+const Link = styled.a`
+    display: flex;
+    align-items: center;
+    gap: 5px;
+
+    border-radius: 4px;
+    padding: 4px 6px;
+    margin: 0px 4px;
+
+    background: ${REDESIGN_COLORS.LIGHT_TEXT_DARK_BACKGROUND};
+    color: ${REDESIGN_COLORS.TITLE_PURPLE};
+`;
+
+const IconWrapper = styled.span`
+    display: flex;
+    align-items: center;
+    font-size: ${4 / 3}em;
+`;
+
+const Links = styled.div`
+    display: flex;
+    justify-content: end;
+    gap: 4px;
+    flex-wrap: wrap;
+`;
+
+const MAX_VISIBILE_ACTIONS = 2;
+
+interface Props {
+    data: GenericEntityProperties | null;
+    className?: string;
+    hideSiblingActions?: boolean;
+    urn: string;
+}
+
+export default function ViewInPlatform({ urn, className, data, hideSiblingActions }: Props) {
+    const separateSiblings = useIsSeparateSiblingsMode();
+    if (!data) return null;
+
+    function sendAnalytics() {
+        analytics.event({
+            type: EventType.EntityActionEvent,
+            actionType: EntityActionType.ClickExternalUrl,
+            entityUrn: urn,
+            entityType: data?.type ?? undefined,
+        });
+    }
+    const externalUrl = data?.properties?.externalUrl;
+    const parentPlatformName = getExternalUrlDisplayName(data);
+    const defaultAction = externalUrl ? [{ displayName: parentPlatformName || 'source', url: externalUrl }] : [];
+
+    let visibleActions: any = [...defaultAction];
+    if (!(hideSiblingActions ?? separateSiblings)) {
+        const siblings = getSiblings(data);
+        if (siblings && siblings.length) {
+            const siblingActions: any = siblings
+                .map((sibling) => {
+                    if (sibling?.platform?.name && sibling?.properties?.externalUrl) {
+                        return {
+                            displayName: getExternalUrlDisplayName(sibling),
+                            url: sibling.properties.externalUrl,
+                        };
+                    }
+                    return null;
+                })
+                .filter((action) => action !== null);
+
+            visibleActions = [...defaultAction, ...siblingActions].slice(0, MAX_VISIBILE_ACTIONS);
+        }
+    }
+
+    if (!visibleActions.length) return null;
+
+    return (
+        <Links>
+            {visibleActions.map((action) => (
+                <div>
+                    <Link href={action.url} target="_blank" onClick={sendAnalytics} className={className}>
+                        <IconWrapper>
+                            <LaunchIcon fontSize="inherit" />
+                        </IconWrapper>
+                        View in {action.displayName}
+                    </Link>
+                </div>
+            ))}
+        </Links>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreview.tsx b/datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreview.tsx
new file mode 100644
index 00000000000000..e4430d731d026e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreview.tsx
@@ -0,0 +1,80 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+
+import { DataProduct, EntityType } from '../../../../types.generated';
+import EntityCount from '../containers/profile/header/EntityCount';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { HoverEntityTooltip } from '../../../recommendations/renderer/component/HoverEntityTooltip';
+import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '../../../entity/shared/constants';
+
+const DomainInfoContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+`;
+
+const DataProductDescription = styled.div`
+    font-size: 14px;
+    font-weight: 400;
+    color: ${ANTD_GRAY[7]};
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    max-width: 200px;
+`;
+
+const DataProductTitle = styled.div`
+    font-size: 16px;
+    font-weight: 400;
+    color: ${ANTD_GRAY[9]};
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    max-width: 200px;
+`;
+
+const DomainContents = styled.div`
+    font-size: 12px;
+    font-weight: 400;
+    color: ${ANTD_GRAY[7]};
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+`;
+
+const Card = styled(Link)`
+    align-items: center;
+    background-color: ${ANTD_GRAY[1]};
+    border: 1.5px solid ${ANTD_GRAY_V2[5]};
+    border-radius: 10px;
+    display: flex;
+    justify-content: start;
+    min-height: 96px;
+    min-width: 160px;
+    padding: 8px 16px 8px 16px;
+
+    :hover {
+        border: 1.5px solid ${REDESIGN_COLORS.BLUE};
+        cursor: pointer;
+    }
+`;
+
+export const DataProductMiniPreview = ({ dataProduct }: { dataProduct: DataProduct }): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    const url = entityRegistry.getEntityUrl(EntityType.DataProduct, dataProduct.urn as string);
+    const assetCount = dataProduct?.entities?.total;
+    return (
+        <Card to={url}>
+            <HoverEntityTooltip entity={dataProduct} placement="bottom" showArrow={false}>
+                <DomainInfoContainer>
+                    <DataProductTitle>{dataProduct?.properties?.name}</DataProductTitle>
+                    <DataProductDescription>{dataProduct?.properties?.description}</DataProductDescription>
+                    <DomainContents>
+                        {assetCount ? <EntityCount displayAssetsText entityCount={assetCount} /> : null}
+                    </DomainContents>
+                </DomainInfoContainer>
+            </HoverEntityTooltip>
+        </Card>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreviewAddDataProduct.tsx b/datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreviewAddDataProduct.tsx
new file mode 100644
index 00000000000000..be67044f0b6eeb
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreviewAddDataProduct.tsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import styled from 'styled-components';
+import { PlusOutlined } from '@ant-design/icons';
+import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '../../../entity/shared/constants';
+
+const DomainInfoContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+`;
+
+const DataProductDescription = styled.div`
+    font-size: 14px;
+    font-weight: 400;
+    color: ${ANTD_GRAY[7]};
+    font-family: Mulish;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    max-width: 200px;
+`;
+
+const DataProductTitle = styled.div`
+    font-size: 16px;
+    font-weight: 400;
+    color: ${REDESIGN_COLORS.BLUE};
+    font-family: Mulish;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    max-width: 200px;
+`;
+
+const Card = styled.div`
+    align-self: stretch;
+    align-items: center;
+    background-color: ${ANTD_GRAY[1]};
+    border: 1.5px solid ${ANTD_GRAY_V2[5]};
+    border-radius: 10px;
+    display: flex;
+    justify-content: start;
+    min-width: 160px;
+    padding: 16px;
+    height: 100%;
+    :hover {
+        border: 1.5px solid ${REDESIGN_COLORS.BLUE};
+        cursor: pointer;
+    }
+`;
+
+export const DataProductMiniPreviewAddDataProduct = ({ onAdd }: { onAdd: () => void }): JSX.Element => {
+    return (
+        <Card onClick={onAdd}>
+            <DomainInfoContainer>
+                <DataProductTitle>
+                    <PlusOutlined style={{ marginRight: 4 }} />
+                    Add Data Product
+                </DataProductTitle>
+                <DataProductDescription>Share your knowledge</DataProductDescription>
+            </DomainInfoContainer>
+        </Card>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/links/DomainColoredIcon.tsx b/datahub-web-react/src/app/entityV2/shared/links/DomainColoredIcon.tsx
new file mode 100644
index 00000000000000..3170c5b8f6ab7b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/links/DomainColoredIcon.tsx
@@ -0,0 +1,63 @@
+import * as Muicon from '@mui/icons-material';
+import React from 'react';
+import styled from 'styled-components';
+import { hexToRgba } from '@app/sharedV2/colors/colorUtils';
+import { Domain } from '../../../../types.generated';
+import { generateColor } from '../components/styled/StyledTag';
+import { REDESIGN_COLORS } from '../constants';
+
+const DomainIconContainer = styled.div<{ color: string; size: number }>`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 8px;
+    height: ${(props) => props.size}px;
+    width: ${(props) => props.size}px;
+    min-width: ${(props) => props.size}px;
+    background-color: ${({ color }) => color};
+`;
+
+const DomainCharacterIcon = styled.div<{ color: string; $fontSize: number }>`
+    font-size: ${(props) => (props.$fontSize ? props.$fontSize : '20')}px;
+    font-weight: 500;
+    color: ${({ color }) => color};
+`;
+
+type Props = {
+    iconColor?: string;
+    domain: Domain;
+    size?: number;
+    fontSize?: number;
+    onClick?: () => void;
+};
+
+// looks through the object keys of Muicon and finds the best match for the search string
+// returns the icon if found, otherwise returns undefined
+function getIcon(search: string): React.ElementType | undefined {
+    // If the search string is empty or consists only of whitespace after trimming,
+    // return undefined to signify that no valid search string is present.
+    if (!search.trim()) return undefined;
+
+    const icon = Object.keys(Muicon).find((key) => key.toLowerCase().includes(search.toLowerCase()));
+    return icon ? Muicon[icon] : undefined;
+}
+
+export const DomainColoredIcon = ({ iconColor, domain, size = 40, fontSize = 20, onClick }: Props): JSX.Element => {
+    const iconName = domain?.displayProperties?.icon?.name || '';
+    const MaterialIcon = getIcon(iconName);
+
+    const domainColor = domain?.displayProperties?.colorHex || generateColor.hex(domain?.urn || '');
+    const domainBackgroundColor = hexToRgba(iconColor || domainColor, 0.75);
+
+    return (
+        <DomainIconContainer color={domainBackgroundColor} size={size} onClick={onClick}>
+            {MaterialIcon ? (
+                <MaterialIcon style={{ color: `${REDESIGN_COLORS.WHITE}` }} fontSize="large" sx={{ px: 1 }} />
+            ) : (
+                <DomainCharacterIcon color={`${REDESIGN_COLORS.WHITE}`} $fontSize={fontSize}>
+                    {domain?.properties?.name.charAt(0)}
+                </DomainCharacterIcon>
+            )}
+        </DomainIconContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/links/DomainMiniPreview.tsx b/datahub-web-react/src/app/entityV2/shared/links/DomainMiniPreview.tsx
new file mode 100644
index 00000000000000..831e3cccc01424
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/links/DomainMiniPreview.tsx
@@ -0,0 +1,69 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+
+import { Domain, EntityType } from '../../../../types.generated';
+import { DomainColoredIcon } from './DomainColoredIcon';
+import EntityCount from '../containers/profile/header/EntityCount';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { HoverEntityTooltip } from '../../../recommendations/renderer/component/HoverEntityTooltip';
+import { ANTD_GRAY } from '../../../entity/shared/constants';
+
+const DomainLinkContainer = styled.div`
+    display: flex;
+    flex-direction: row;
+    :hover {
+        background-color: #f5f7fa;
+    }
+    border-radius: 12px;
+    cursor: pointer;
+    padding: 4px;
+`;
+
+const DomainInfoContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    margin-left: 8px;
+`;
+
+const DomainTitle = styled.div`
+    font-size: 12px;
+    font-weight: 400;
+    color: ${ANTD_GRAY[9]};
+    font-family: Mulish;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    max-width: 200px;
+`;
+
+const DomainContents = styled.div`
+    font-size: 12px;
+    font-weight: 400;
+    color: ${ANTD_GRAY[7]};
+    font-family: Mulish;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+`;
+
+export const DomainMiniPreview = ({ domain }: { domain: Domain }): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    const url = entityRegistry.getEntityUrl(EntityType.Domain, domain.urn as string);
+
+    return (
+        <Link to={url}>
+            <HoverEntityTooltip entity={domain} placement="bottom" showArrow={false}>
+                <DomainLinkContainer>
+                    <DomainColoredIcon domain={domain} />
+                    <DomainInfoContainer>
+                        <DomainTitle>{domain?.properties?.name}</DomainTitle>
+                        <DomainContents>
+                            <EntityCount displayAssetsText entityCount={domain?.entities?.total} />
+                        </DomainContents>
+                    </DomainInfoContainer>
+                </DomainLinkContainer>
+            </HoverEntityTooltip>
+        </Link>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/links/EntityExternalLink.tsx b/datahub-web-react/src/app/entityV2/shared/links/EntityExternalLink.tsx
new file mode 100644
index 00000000000000..defdf717eb7e4f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/links/EntityExternalLink.tsx
@@ -0,0 +1,14 @@
+import React, { ReactNode } from 'react';
+
+interface Props {
+    url: string | null | undefined;
+    children: ReactNode;
+}
+
+const EntityExternalLink: React.FC<Props> = ({ url, children }) => (
+    <a href={url || undefined} target="blank">
+        {children}
+    </a>
+);
+
+export default EntityExternalLink;
diff --git a/datahub-web-react/src/app/entityV2/shared/links/GlossaryTermMiniPreview.tsx b/datahub-web-react/src/app/entityV2/shared/links/GlossaryTermMiniPreview.tsx
new file mode 100644
index 00000000000000..814b975fed9fb2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/links/GlossaryTermMiniPreview.tsx
@@ -0,0 +1,77 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import * as Muicon from '@mui/icons-material';
+
+import { EntityType, GlossaryTerm } from '../../../../types.generated';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { HoverEntityTooltip } from '../../../recommendations/renderer/component/HoverEntityTooltip';
+import { generateColorFromPalette } from '../../../glossaryV2/colorUtils';
+
+const GlossaryTermMiniPreviewContainer = styled.div<{ color: string }>`
+    display: inline-flex;
+    flex-direction: column;
+    flex-grow: 1;
+    padding-left: 16px;
+    padding-right: 12px;
+    padding-top: 8px;
+    // padding-bottom: 8px;
+    margin: 4px;
+    height: 34px;
+    border-radius: 5px;
+    justify-content: center;
+    border: 1px solid #ccd1dd;
+    background-color: #f8f8f8;
+    :hover {
+        background-color: #f2f2f2;
+        // background-color: red;
+    }
+    color: #565657;
+    cursor: pointer;
+    font-family: Mulish;
+    overflow: hidden;
+
+    :after {
+        content: '';
+        width: 141.421%;
+        background-color: ${(props) => props.color};
+        min-height: 10px;
+        position: relative;
+        left: -64px;
+        top: 20px;
+        transform: rotate(-45deg);
+        transform-origin: 1px 1px;
+    }
+`;
+
+const GlossaryTermTitleText = styled.span`
+    margin-bottom: 600px;
+`;
+
+export const GlossaryTermMiniPreview = ({ glossaryTerm }: { glossaryTerm: GlossaryTerm }): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    const { parentNodes, urn } = glossaryTerm;
+    const url = entityRegistry.getEntityUrl(EntityType.GlossaryTerm, urn as string);
+    const lastParentNode = parentNodes && parentNodes.count > 0 && parentNodes.nodes[parentNodes.count - 1];
+    const termColor = lastParentNode
+        ? lastParentNode.displayProperties?.colorHex || generateColorFromPalette(lastParentNode.urn)
+        : generateColorFromPalette(urn);
+    const MaterialIcon = Muicon.Book;
+
+    return (
+        <Link to={url}>
+            <HoverEntityTooltip entity={glossaryTerm} showArrow={false} placement="bottom">
+                <GlossaryTermMiniPreviewContainer color={termColor}>
+                    <span>
+                        <MaterialIcon
+                            style={{ verticalAlign: 'bottom', fontSize: 22, paddingRight: 6 }}
+                            fontSize="large"
+                            // sx={{ px: 1 }}
+                        />
+                        <GlossaryTermTitleText>{glossaryTerm?.properties?.name}</GlossaryTermTitleText>
+                    </span>
+                </GlossaryTermMiniPreviewContainer>
+            </HoverEntityTooltip>
+        </Link>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/links/__tests__/colorUtils.test.tsx b/datahub-web-react/src/app/entityV2/shared/links/__tests__/colorUtils.test.tsx
new file mode 100644
index 00000000000000..ad8c0155b61d5f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/links/__tests__/colorUtils.test.tsx
@@ -0,0 +1,38 @@
+import { hexToRgb, hexToRgba } from '@app/sharedV2/colors/colorUtils';
+
+describe('hexToRgba', () => {
+    it('should convert hex to rgba with opacity 1', () => {
+        const hex = '#FF5733';
+        const opacity = 1;
+        const rgba = hexToRgba(hex, opacity);
+        expect(rgba).toBe('rgba(255, 87, 51, 1)');
+    });
+
+    it('should convert hex to rgba with opacity 0.5', () => {
+        const hex = '#33FF57';
+        const opacity = 0.5;
+        const rgba = hexToRgba(hex, opacity);
+        expect(rgba).toBe('rgba(51, 255, 87, 0.5)');
+    });
+
+    it('should clamp opacity between 0 and 1', () => {
+        const hex = '#000000';
+        const opacity = -1;
+        const rgba = hexToRgba(hex, opacity);
+        expect(rgba).toBe('rgba(0, 0, 0, 0)');
+    });
+});
+
+describe('hexToRgb', () => {
+    it('should convert hex to rgb', () => {
+        const hex = '#FF5733';
+        const rgb = hexToRgb(hex);
+        expect(rgb).toEqual([255, 87, 51]);
+    });
+
+    it('should handle lowercase hex', () => {
+        const hex = '#ff5733';
+        const rgb = hexToRgb(hex);
+        expect(rgb).toEqual([255, 87, 51]);
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/notes/NotesSection.tsx b/datahub-web-react/src/app/entityV2/shared/notes/NotesSection.tsx
new file mode 100644
index 00000000000000..310e9a5d16b318
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/notes/NotesSection.tsx
@@ -0,0 +1,232 @@
+import SchemaEditableContext from '@app/shared/SchemaEditableContext';
+import AddRoundedIcon from '@mui/icons-material/AddRounded';
+import DeleteOutlineOutlinedIcon from '@mui/icons-material/DeleteOutlineOutlined';
+import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
+import { Modal } from 'antd';
+import moment from 'moment';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { useDeletePostMutation } from '../../../../graphql/post.generated';
+import { Post } from '../../../../types.generated';
+import CustomAvatar from '../../../shared/avatar/CustomAvatar';
+import { COLORS } from '../../../sharedV2/colors';
+import CreateEntityAnnouncementModal from '../announce/CreateEntityAnnouncementModal';
+import CompactMarkdownViewer from '../tabs/Documentation/components/CompactMarkdownViewer';
+import EmptySectionText from '../containers/profile/sidebar/EmptySectionText';
+import SectionActionButton from '../containers/profile/sidebar/SectionActionButton';
+import { SidebarSection } from '../containers/profile/sidebar/SidebarSection';
+
+const ContentWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+`;
+
+interface Props {
+    urn: string;
+    subResource?: string;
+    notes?: Post[];
+    refetch?: () => void;
+    showEmpty?: boolean;
+}
+
+export default function NotesSection({ urn, subResource, notes, refetch, showEmpty }: Props) {
+    const isSchemaEditable = React.useContext(SchemaEditableContext);
+    const [showAddModal, setShowAddModal] = useState(false);
+
+    const content = notes?.length ? (
+        <ContentWrapper>
+            {notes?.map((note) => (
+                <SidebarNote
+                    key={note.urn}
+                    note={note}
+                    parentUrn={urn}
+                    parentSubResource={subResource}
+                    refetch={refetch}
+                />
+            ))}
+        </ContentWrapper>
+    ) : (
+        <EmptySectionText message="No notes yet" />
+    );
+
+    if (!showEmpty && !notes?.length) return null;
+    return (
+        <>
+            <SidebarSection
+                title="Notes"
+                content={content}
+                extra={
+                    isSchemaEditable && (
+                        <SectionActionButton
+                            button={<AddRoundedIcon />}
+                            onClick={(event) => {
+                                setShowAddModal(true);
+                                event.stopPropagation();
+                            }}
+                        />
+                    )
+                }
+            />
+            {showAddModal && (
+                <CreateEntityAnnouncementModal
+                    urn={urn}
+                    subResource={subResource}
+                    // refetch after 2 seconds on create to ensure the new note is visible
+                    onCreate={refetch}
+                    onClose={() => setShowAddModal(false)}
+                />
+            )}
+        </>
+    );
+}
+
+const NoteEditWrapper = styled.div`
+    display: none;
+    position: relative;
+`;
+
+const NoteEditIcons = styled.div`
+    display: flex;
+    gap: 5px;
+
+    position: absolute;
+    right: -9px;
+`;
+
+const NoteWrapper = styled.div`
+    display: flex;
+    justify-content: space-between;
+    max-width: 100%;
+
+    :hover {
+        ${NoteEditWrapper} {
+            display: inline;
+        }
+    }
+`;
+
+const NoteContent = styled.div`
+    border-left: 2px solid ${COLORS.blue_5};
+    padding: 2px 0 5px 10px;
+    display: flex;
+    flex-direction: column;
+    gap: 2px;
+    max-width: inherit;
+`;
+
+const NoteHeader = styled.div`
+    align-items: center;
+    display: flex;
+    font-size: 12px;
+    color: ${COLORS.blue_10};
+`;
+
+const NoteTime = styled.div`
+    overflow: hidden;
+    text-overflow: ellipsis;
+`;
+
+const NoteOwner = styled.div`
+    min-width: 24px;
+`;
+
+const NoteTitle = styled.div`
+    font-size: 16px;
+    font-weight: 600;
+    line-height: 20px;
+    max-width: inherit;
+    overflow: hidden;
+    text-overflow: ellipsis;
+`;
+
+const NoteDescriptionContainer = styled.div`
+    flex: 1;
+
+    .remirror-editor.ProseMirror {
+        font-size: 12px;
+        padding: 0;
+        max-width: 400px;
+    }
+
+    p {
+        margin-bottom: 0;
+    }
+`;
+
+interface NoteProps {
+    note: Post;
+    parentUrn: string;
+    parentSubResource?: string;
+    refetch?: () => void;
+}
+
+function SidebarNote({ note, parentUrn, parentSubResource, refetch }: NoteProps) {
+    const isSchemaEditable = React.useContext(SchemaEditableContext);
+    const [showEditModal, setShowEditModal] = useState(false);
+    const [deletePost] = useDeletePostMutation();
+
+    const time = moment(note.lastModified.time);
+    const isToday = time.isSame(moment(), 'day');
+    const isYesterday = time.isSame(moment().subtract(1, 'day'), 'day');
+
+    // parsedName should strip the urn:li:corpuser: prefix from actor
+    const parsedName = note?.lastModified?.actor?.split(':')?.slice(-1)[0] || '';
+
+    return (
+        <NoteWrapper>
+            <NoteContent>
+                <NoteHeader>
+                    <NoteOwner>{note.lastModified.actor && <CustomAvatar size={18} name={parsedName} />}</NoteOwner>
+                    <NoteTime>
+                        {isToday && 'Today'}
+                        {isYesterday && 'Yesterday'}
+                        {!isToday && !isYesterday && time.format('MMM D, YYYY')}
+                        {' at '}
+                        {time.format('h:mm A')}
+                    </NoteTime>
+                </NoteHeader>
+                <NoteTitle>{note.content.title}</NoteTitle>
+                {note.content.description && (
+                    <NoteDescriptionContainer>
+                        <CompactMarkdownViewer content={note.content.description} />
+                    </NoteDescriptionContainer>
+                )}
+            </NoteContent>
+            {isSchemaEditable && (
+                <NoteEditWrapper>
+                    <NoteEditIcons>
+                        <SectionActionButton button={<EditOutlinedIcon />} onClick={() => setShowEditModal(true)} />
+                        <SectionActionButton
+                            button={<DeleteOutlineOutlinedIcon />}
+                            onClick={() =>
+                                onDeleteNote(() => deletePost({ variables: { urn: note.urn } }).then(refetch))
+                            }
+                        />
+                    </NoteEditIcons>
+                </NoteEditWrapper>
+            )}
+            {showEditModal && (
+                <CreateEntityAnnouncementModal
+                    urn={parentUrn}
+                    subResource={parentSubResource}
+                    editData={{ urn: note.urn, ...note.content }}
+                    onClose={() => setShowEditModal(false)}
+                    onEdit={refetch}
+                />
+            )}
+        </NoteWrapper>
+    );
+}
+
+function onDeleteNote(onDelete: () => void) {
+    Modal.confirm({
+        title: 'Delete Note',
+        content: `Are you sure you want to remove this note?`,
+        onOk: onDelete,
+        onCancel() {},
+        okText: 'Yes',
+        maskClosable: true,
+        closable: true,
+    });
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/sidebarSection/AboutSidebarSection.tsx b/datahub-web-react/src/app/entityV2/shared/sidebarSection/AboutSidebarSection.tsx
new file mode 100644
index 00000000000000..a090276d9c7028
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/sidebarSection/AboutSidebarSection.tsx
@@ -0,0 +1,77 @@
+import React, { useEffect, useState } from 'react';
+import TextArea from 'antd/lib/input/TextArea';
+import Paragraph from 'antd/lib/typography/Paragraph';
+import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
+import CheckOutlinedIcon from '@mui/icons-material/CheckOutlined';
+import SectionActionButton from '../containers/profile/sidebar/SectionActionButton';
+import { SidebarSection } from '../containers/profile/sidebar/SidebarSection';
+import { AboutSection, AboutSectionText, EmptyValue } from '../SidebarStyledComponents';
+
+type Props = {
+    aboutText: string;
+    isProfileOwner: boolean;
+    onSaveAboutMe: (string: string) => void;
+};
+
+export const AboutSidebarSection = ({ aboutText, isProfileOwner, onSaveAboutMe }: Props) => {
+    const [about, setAbout] = useState(aboutText);
+    const [isAboutEditable, setIsAboutEditable] = useState(false);
+
+    useEffect(() => {
+        if (aboutText) {
+            setAbout(aboutText);
+        }
+    }, [aboutText, setAbout]);
+
+    const onSave = (value: string) => {
+        setIsAboutEditable(false);
+        onSaveAboutMe(value);
+    };
+
+    return (
+        <SidebarSection
+            title="About"
+            content={
+                <AboutSection>
+                    <AboutSectionText>
+                        {isProfileOwner && isAboutEditable ? (
+                            (
+                                <TextArea
+                                    value={about}
+                                    onChange={(e) => setAbout(e.target.value)}
+                                    onBlur={(event) => {
+                                        if (aboutText !== event.target.value) {
+                                            onSave(event.target.value);
+                                        }
+                                        setIsAboutEditable(false);
+                                    }}
+                                />
+                            ) || <EmptyValue />
+                        ) : (
+                            <Paragraph ellipsis={{ rows: 2, expandable: true, symbol: 'Read more' }}>
+                                {about || <EmptyValue />}
+                            </Paragraph>
+                        )}
+                    </AboutSectionText>
+                </AboutSection>
+            }
+            extra={
+                <>
+                    <SectionActionButton
+                        button={isAboutEditable ? <CheckOutlinedIcon /> : <EditOutlinedIcon />}
+                        onClick={(event) => {
+                            if (isProfileOwner) {
+                                if (aboutText !== about) {
+                                    onSave(about);
+                                }
+                                setIsAboutEditable(!isAboutEditable);
+                            }
+                            event.stopPropagation();
+                        }}
+                        actionPrivilege={isProfileOwner}
+                    />
+                </>
+            }
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/sidebarSection/ShowMoreSection.tsx b/datahub-web-react/src/app/entityV2/shared/sidebarSection/ShowMoreSection.tsx
new file mode 100644
index 00000000000000..06f6ddb36240d5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/sidebarSection/ShowMoreSection.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import { ShowMoreButton } from '../SidebarStyledComponents';
+
+type Props = {
+    totalCount: number;
+    entityCount: number;
+    setEntityCount: (entityCount: number) => void;
+    showMaxEntity?: number;
+};
+
+export const ShowMoreSection = ({ totalCount, entityCount, setEntityCount, showMaxEntity = 4 }: Props) => {
+    const showMoreCount = entityCount + showMaxEntity > totalCount ? totalCount - entityCount : showMaxEntity;
+    return (
+        <ShowMoreButton onClick={() => setEntityCount(entityCount + showMaxEntity)}>
+            {(showMoreCount && <>show {showMoreCount} more</>) || <>show more</>}
+        </ShowMoreButton>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/sidebarSection/SidebarNotesSection.tsx b/datahub-web-react/src/app/entityV2/shared/sidebarSection/SidebarNotesSection.tsx
new file mode 100644
index 00000000000000..28d8e46ea9b7c7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/sidebarSection/SidebarNotesSection.tsx
@@ -0,0 +1,15 @@
+import moment from 'moment/moment';
+import React from 'react';
+import { Post } from '../../../../types.generated';
+import { useEntityData, useRefetch } from '../../../entity/shared/EntityContext';
+import NotesSection from '../notes/NotesSection';
+
+export default function SidebarNotesSection() {
+    const { urn, entityData } = useEntityData();
+    const refetch = useRefetch();
+    const notes = entityData?.notes?.relationships
+        ?.map((r) => r.entity as Post)
+        ?.sort((a, b) => moment(b.lastModified.time).diff(moment(a.lastModified.time)));
+
+    return <NotesSection urn={urn} notes={notes} refetch={() => setTimeout(() => refetch?.(), 2000)} />;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/sidebarSection/SidebarStructuredProperties.tsx b/datahub-web-react/src/app/entityV2/shared/sidebarSection/SidebarStructuredProperties.tsx
new file mode 100644
index 00000000000000..18222776752ee2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/sidebarSection/SidebarStructuredProperties.tsx
@@ -0,0 +1,158 @@
+import AddRoundedIcon from '@mui/icons-material/AddRounded';
+import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
+import { useUserContext } from '@src/app/context/useUserContext';
+import { useEntityData } from '@src/app/entity/shared/EntityContext';
+import EditStructuredPropertyModal from '@src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal';
+import {
+    getDisplayName,
+    getEntityTypesPropertyFilter,
+    getNotHiddenPropertyFilter,
+    getPropertyRowFromSearchResult,
+} from '@src/app/govern/structuredProperties/utils';
+import {
+    SHOW_IN_ASSET_SUMMARY_PROPERTY_FILTER_NAME,
+    SHOW_IN_COLUMNS_TABLE_PROPERTY_FILTER_NAME,
+} from '@src/app/searchV2/utils/constants';
+import { useEntityRegistryV2 } from '@src/app/useEntityRegistry';
+import { useGetSearchResultsForMultipleQuery } from '@src/graphql/search.generated';
+import {
+    EntityType,
+    Maybe,
+    SchemaFieldEntity,
+    SearchResult,
+    StdDataType,
+    StructuredPropertyEntity,
+} from '@src/types.generated';
+import React, { useState } from 'react';
+import { EMPTY_MESSAGES } from '../constants';
+import EmptySectionText from '../containers/profile/sidebar/EmptySectionText';
+import SectionActionButton from '../containers/profile/sidebar/SectionActionButton';
+import { SidebarSection } from '../containers/profile/sidebar/SidebarSection';
+import { StyledDivider } from '../tabs/Dataset/Schema/components/SchemaFieldDrawer/components';
+import StructuredPropertyValue from '../tabs/Properties/StructuredPropertyValue';
+import { PropertyRow } from '../tabs/Properties/types';
+
+interface FieldProperties {
+    isSchemaSidebar?: boolean;
+    refetch?: () => void;
+    fieldEntity?: Maybe<SchemaFieldEntity>;
+}
+
+interface Props {
+    properties?: FieldProperties;
+}
+
+const SidebarStructuredProperties = ({ properties }: Props) => {
+    const { entityData, entityType } = useEntityData();
+    const me = useUserContext();
+    const entityRegistry = useEntityRegistryV2();
+    const canEditProps = me.platformPrivileges?.manageStructuredProperties;
+    const [isPropModalVisible, setIsPropModalVisible] = useState(false);
+    const [selectedProperty, setSelectedProperty] = useState<SearchResult | undefined>();
+    const isSchemaSidebar = properties?.isSchemaSidebar || false;
+
+    const inputs = {
+        types: [EntityType.StructuredProperty],
+        query: '',
+        start: 0,
+        count: 50,
+        searchFlags: { skipCache: true },
+        orFilters: [
+            {
+                and: [
+                    getEntityTypesPropertyFilter(entityRegistry, isSchemaSidebar, entityType),
+                    getNotHiddenPropertyFilter(),
+                    {
+                        field: isSchemaSidebar
+                            ? SHOW_IN_COLUMNS_TABLE_PROPERTY_FILTER_NAME
+                            : SHOW_IN_ASSET_SUMMARY_PROPERTY_FILTER_NAME,
+                        values: ['true'],
+                    },
+                ],
+            },
+        ],
+    };
+
+    // Execute search
+    const { data } = useGetSearchResultsForMultipleQuery({
+        variables: {
+            input: inputs,
+        },
+        fetchPolicy: 'cache-first',
+    });
+
+    const entityTypeProperties = data?.searchAcrossEntities?.searchResults;
+
+    const allProperties = isSchemaSidebar
+        ? properties?.fieldEntity?.structuredProperties
+        : entityData?.structuredProperties;
+
+    const selectedPropertyValues = selectedProperty
+        ? getPropertyRowFromSearchResult(selectedProperty, allProperties)?.values
+        : undefined;
+
+    return (
+        <>
+            {entityTypeProperties?.map((property) => {
+                const propertyRow: PropertyRow | undefined = getPropertyRowFromSearchResult(property, allProperties);
+                const isRichText = propertyRow?.dataType?.info.type === StdDataType.RichText;
+                const values = propertyRow?.values;
+                const propertyName = getDisplayName(property.entity as StructuredPropertyEntity);
+
+                return (
+                    <>
+                        <SidebarSection
+                            title={propertyName}
+                            key={property.entity.urn}
+                            content={
+                                <>
+                                    {values ? (
+                                        <>
+                                            {values.map((val) => (
+                                                <StructuredPropertyValue value={val} isRichText={isRichText} />
+                                            ))}
+                                        </>
+                                    ) : (
+                                        <EmptySectionText message={EMPTY_MESSAGES.structuredProps.title} />
+                                    )}
+                                </>
+                            }
+                            extra={
+                                <>
+                                    <SectionActionButton
+                                        button={values ? <EditOutlinedIcon /> : <AddRoundedIcon />}
+                                        onClick={(event) => {
+                                            setSelectedProperty(property);
+                                            setIsPropModalVisible(true);
+                                            event.stopPropagation();
+                                        }}
+                                        actionPrivilege={canEditProps}
+                                        dataTestId={`${propertyName}-add-or-edit-button`}
+                                    />
+                                </>
+                            }
+                        />
+                        {isSchemaSidebar && <StyledDivider dashed />}
+                    </>
+                );
+            })}
+
+            {selectedProperty && (
+                <EditStructuredPropertyModal
+                    isOpen={isPropModalVisible}
+                    closeModal={() => {
+                        setIsPropModalVisible(false);
+                        setSelectedProperty(undefined);
+                    }}
+                    structuredProperty={selectedProperty?.entity as StructuredPropertyEntity}
+                    isAddMode={!selectedPropertyValues}
+                    values={selectedPropertyValues?.map((val) => val.value)}
+                    refetch={isSchemaSidebar ? properties?.refetch : undefined}
+                    associatedUrn={isSchemaSidebar ? properties?.fieldEntity?.urn : undefined}
+                />
+            )}
+        </>
+    );
+};
+
+export default SidebarStructuredProperties;
diff --git a/datahub-web-react/src/app/entityV2/shared/sidebarSection/UserGroupSidebarSection.tsx b/datahub-web-react/src/app/entityV2/shared/sidebarSection/UserGroupSidebarSection.tsx
new file mode 100644
index 00000000000000..96a732949a9a81
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/sidebarSection/UserGroupSidebarSection.tsx
@@ -0,0 +1,65 @@
+import React, { useState } from 'react';
+import { SidebarSection } from '../containers/profile/sidebar/SidebarSection';
+import { GroupsSection } from '../SidebarStyledComponents';
+import { EntityLink } from '../../../homeV2/reference/sections/EntityLink';
+import { ANTD_GRAY, ANTD_GRAY_V2 } from '../constants';
+import { EntityRelationship } from '../../../../types.generated';
+import { ShowMoreSection } from './ShowMoreSection';
+
+const DEFAULT_MAX_ENTITIES_TO_SHOW = 4;
+
+const groupLinkStyle = {
+    backgroundColor: ANTD_GRAY_V2[13],
+    '& svg': {
+        color: ANTD_GRAY[1],
+    },
+};
+
+const entityLinkTextStyle = {
+    overflow: 'hidden',
+    'white-space': 'nowrap',
+    'text-overflow': 'ellipsis',
+};
+
+type Props = {
+    groupsDetails: EntityRelationship[];
+};
+
+export const UserGroupSideBarSection = ({ groupsDetails }: Props) => {
+    const [entityCount, setEntityCount] = useState(DEFAULT_MAX_ENTITIES_TO_SHOW);
+    const groupsDetailsCount = groupsDetails.length || 0;
+    return (
+        <SidebarSection
+            title="Groups"
+            content={
+                <>
+                    <GroupsSection>
+                        {groupsDetails.map((groupDetail, index) => {
+                            const { entity } = groupDetail;
+                            return (
+                                entity &&
+                                index < entityCount && (
+                                    <EntityLink
+                                        key={entity?.urn}
+                                        entity={entity}
+                                        styles={groupLinkStyle}
+                                        displayTextStyle={entityLinkTextStyle}
+                                    />
+                                )
+                            );
+                        })}
+                    </GroupsSection>
+                    {groupsDetailsCount > entityCount && (
+                        <ShowMoreSection
+                            totalCount={groupsDetailsCount}
+                            entityCount={entityCount}
+                            setEntityCount={setEntityCount}
+                            showMaxEntity={DEFAULT_MAX_ENTITIES_TO_SHOW}
+                        />
+                    )}
+                </>
+            }
+            count={groupsDetailsCount}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/sidebarSection/UserOwnershipSideBarSection.tsx b/datahub-web-react/src/app/entityV2/shared/sidebarSection/UserOwnershipSideBarSection.tsx
new file mode 100644
index 00000000000000..ceeb0e3e2141eb
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/sidebarSection/UserOwnershipSideBarSection.tsx
@@ -0,0 +1,59 @@
+import React, { useState } from 'react';
+import { Col } from 'antd';
+import { OwnershipContainer } from '../SidebarStyledComponents';
+import { SidebarSection } from '../containers/profile/sidebar/SidebarSection';
+import { EntityLink } from '../../../homeV2/reference/sections/EntityLink';
+import { SearchResult } from '../../../../types.generated';
+import { ShowMoreSection } from './ShowMoreSection';
+
+const DEFAULT_MAX_ENTITIES_TO_SHOW = 4;
+
+const entityLinkTextStyle = {
+    overflow: 'hidden',
+    'white-space': 'nowrap',
+    'text-overflow': 'ellipsis',
+};
+
+type Props = {
+    ownedEntities: SearchResult[] | undefined;
+};
+
+export const UserOwnershipSidebarSection = ({ ownedEntities }: Props) => {
+    const [entityCount, setEntityCount] = useState(DEFAULT_MAX_ENTITIES_TO_SHOW);
+    const ownedEntitiesCount = ownedEntities?.length || 0;
+
+    return (
+        <SidebarSection
+            title="Owner Of"
+            count={ownedEntities?.length}
+            content={
+                <>
+                    <OwnershipContainer>
+                        {ownedEntities?.map((ownership, index) => {
+                            const { entity } = ownership;
+                            return (
+                                index < entityCount && (
+                                    <Col xs={11}>
+                                        <EntityLink
+                                            key={entity.urn}
+                                            entity={entity}
+                                            displayTextStyle={entityLinkTextStyle}
+                                        />
+                                    </Col>
+                                )
+                            );
+                        })}
+                    </OwnershipContainer>
+                    {ownedEntitiesCount > entityCount && (
+                        <ShowMoreSection
+                            totalCount={ownedEntitiesCount}
+                            entityCount={entityCount}
+                            setEntityCount={setEntityCount}
+                            showMaxEntity={DEFAULT_MAX_ENTITIES_TO_SHOW}
+                        />
+                    )}
+                </>
+            }
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/stats/PercentileLabel.tsx b/datahub-web-react/src/app/entityV2/shared/stats/PercentileLabel.tsx
new file mode 100644
index 00000000000000..3effde42e62ccf
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/stats/PercentileLabel.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Popover } from '@components';
+import { percentileToColor, percentileToLabel } from './statsUtils';
+import { ANTD_GRAY } from '../constants';
+
+const Description = styled.div`
+    color: white;
+    font-size: 14px;
+`;
+
+const Label = styled.span<{ color?: string }>`
+    border-radius: 8px;
+    padding: 2px 6px;
+    background-color: ${(props) => props.color || ANTD_GRAY[3]};
+    :hover {
+        opacity: 0.7;
+    }
+    margin-left: 4px;
+    color: ${ANTD_GRAY[8]};
+`;
+
+type Props = {
+    percentile: number;
+    description: React.ReactNode;
+};
+
+export const PercentileLabel = ({ percentile, description }: Props) => {
+    return (
+        <Popover
+            color="#262626"
+            overlayStyle={{ maxWidth: 260 }}
+            placement="bottom"
+            showArrow={false}
+            content={<Description>{description}</Description>}
+        >
+            <Label color={percentileToColor(percentile)}>{percentileToLabel(percentile)}</Label>
+        </Popover>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/stats/__tests__/statsUtils.test.tsx b/datahub-web-react/src/app/entityV2/shared/stats/__tests__/statsUtils.test.tsx
new file mode 100644
index 00000000000000..83609859b8ac00
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/stats/__tests__/statsUtils.test.tsx
@@ -0,0 +1,36 @@
+import { ANTD_GRAY } from '../../constants';
+import { percentileToColor, percentileToLabel } from '../statsUtils';
+
+describe('percentileToLabel', () => {
+    it('should return "Low" when percentile is <= 30', () => {
+        const label = percentileToLabel(25);
+        expect(label).toBe('Low');
+    });
+
+    it('should return "Med" when percentile is > 30 and <= 80', () => {
+        const label = percentileToLabel(60);
+        expect(label).toBe('Med');
+    });
+
+    it('should return "High" when percentile is > 80', () => {
+        const label = percentileToLabel(85);
+        expect(label).toBe('High');
+    });
+});
+
+describe('percentileToColor', () => {
+    it('should return ANTD_GRAY[3] when percentile is <= 30', () => {
+        const color = percentileToColor(25);
+        expect(color).toBe(ANTD_GRAY[3]);
+    });
+
+    it('should return "#EBF3F2" when percentile is > 30 and <= 80', () => {
+        const color = percentileToColor(60);
+        expect(color).toBe('#EBF3F2');
+    });
+
+    it('should return "#cef5f0" when percentile is > 80', () => {
+        const color = percentileToColor(85);
+        expect(color).toBe('#cef5f0');
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/stats/statsUtils.ts b/datahub-web-react/src/app/entityV2/shared/stats/statsUtils.ts
new file mode 100644
index 00000000000000..cff00a5b63e79b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/stats/statsUtils.ts
@@ -0,0 +1,28 @@
+import { ANTD_GRAY } from '../constants';
+
+/**
+ * Normalizes a percentile integer to a 3-tier
+ * label system of 'High', 'Med', 'Low' for usability.
+ */
+export const percentileToLabel = (pct: number) => {
+    /* eslint-disable no-else-return */
+    if (pct <= 30) {
+        return 'Low';
+    } else if (pct > 30 && pct <= 80) {
+        return 'Med';
+    }
+    return 'High';
+};
+
+/**
+ * Normalizes a percentile to a color.
+ */
+export const percentileToColor = (pct: number) => {
+    /* eslint-disable no-else-return */
+    if (pct <= 30) {
+        return ANTD_GRAY[3];
+    } else if (pct > 30 && pct <= 80) {
+        return '#EBF3F2';
+    }
+    return '#cef5f0';
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/summary/HeaderComponents.tsx b/datahub-web-react/src/app/entityV2/shared/summary/HeaderComponents.tsx
new file mode 100644
index 00000000000000..165dc3a19be937
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/summary/HeaderComponents.tsx
@@ -0,0 +1,67 @@
+import React from 'react';
+import styled from 'styled-components';
+import { ReadOutlined } from '@ant-design/icons';
+import { REDESIGN_COLORS } from '../constants';
+
+export const SUMMARY_TAB_ICON = ReadOutlined;
+
+export const SummaryTabWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+    height: fit-content;
+    padding: 12px 20px;
+    gap: 20px;
+    position: relative;
+`;
+
+export const SectionContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+
+    &:hover {
+        .hover-btn {
+            display: flex;
+        }
+    }
+`;
+
+export const SummaryTabHeaderWrapper = styled.div`
+    margin-top: 4px;
+    align-items: center;
+    display: flex;
+    justify-content: space-between;
+`;
+
+export const SummaryHeaderButtonGroup = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 16px;
+`;
+
+export const HeaderTitle = styled.h3`
+    align-items: center;
+    display: flex;
+    font-size: 18px;
+    color: ${REDESIGN_COLORS.TEXT_HEADING};
+    font-weight: 500;
+    margin: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    text-transform: capitalize;
+    white-space: nowrap;
+
+    img,
+    svg {
+        margin-right: 8px;
+    }
+`;
+
+export function SummaryTabHeaderTitle({ icon, title }: { icon?: React.ReactNode; title: string }) {
+    return (
+        <HeaderTitle>
+            {React.isValidElement(icon) && icon}
+            {title}
+        </HeaderTitle>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/summary/IconComponents.tsx b/datahub-web-react/src/app/entityV2/shared/summary/IconComponents.tsx
new file mode 100644
index 00000000000000..a4a4b6979d1a1a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/summary/IconComponents.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import styled from 'styled-components';
+import { EntityType } from '../../../../types.generated';
+import { TYPE_ICON_CLASS_NAME } from '../components/subtypes';
+import getTypeIcon from '../../../sharedV2/icons/getTypeIcon';
+import { LINEAGE_COLORS } from '../constants';
+import { EntityRegistry } from '../../../../entityRegistryContext';
+
+const IconWrapper = styled.span`
+    line-height: 0;
+    .${TYPE_ICON_CLASS_NAME} {
+        color: ${LINEAGE_COLORS.PURPLE_2};
+    }
+`;
+
+export function getContentTypeIcon(entityRegistry: EntityRegistry, type: EntityType, subtype?: string) {
+    const icon = getTypeIcon(entityRegistry, type, subtype);
+    return <IconWrapper>{icon}</IconWrapper>;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/summary/ListComponents.tsx b/datahub-web-react/src/app/entityV2/shared/summary/ListComponents.tsx
new file mode 100644
index 00000000000000..5828d1c04a96d5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/summary/ListComponents.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import styled from 'styled-components';
+
+export const HorizontalList = styled.div<{ gap?: number }>`
+    display: flex;
+    flex-direction: row;
+    gap: ${({ gap }) => gap || 12}px;
+    padding-right: min(10%, 40px);
+    overflow-x: auto;
+    overflow-y: hidden;
+    scroll-behavior: smooth;
+    white-space: nowrap;
+    width: 100%;
+
+    &::-webkit-scrollbar {
+        display: none;
+    }
+`;
+
+const SummaryColumnsWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+    max-width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    width: 100%;
+`;
+
+const SummaryColumn = styled.div<{ n: number }>`
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+`;
+
+const HorizontalDivider = styled.hr<{ margin: number }>`
+    align-self: stretch;
+    height: 1px;
+    margin: 10px ${({ margin }) => margin}px;
+    opacity: 0.2;
+`;
+
+export function SummaryColumns({ children }: { children: React.ReactNode[] }) {
+    return (
+        <SummaryColumnsWrapper>
+            {children
+                .filter((c) => !!c)
+                .map((child, i) => (
+                    <>
+                        {i !== 0 && <HorizontalDivider margin={0} />}
+                        <SummaryColumn n={children.length}>{child}</SummaryColumn>
+                    </>
+                ))}
+        </SummaryColumnsWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/summary/SummaryAboutSection.tsx b/datahub-web-react/src/app/entityV2/shared/summary/SummaryAboutSection.tsx
new file mode 100644
index 00000000000000..97d15182b26c5a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/summary/SummaryAboutSection.tsx
@@ -0,0 +1,94 @@
+import React, { useCallback, useState } from 'react';
+import styled from 'styled-components';
+import { Button } from 'antd';
+import { EditOutlined, FileOutlined } from '@ant-design/icons';
+import { useEntityData, useRefetch, useRouteToTab } from '../../../entity/shared/EntityContext';
+import { Editor } from '../tabs/Documentation/components/editor/Editor';
+import { EmptyTab } from '../components/styled/EmptyTab';
+import { AddLinkModal } from '../components/styled/AddLinkModal';
+import { LinkList } from '../tabs/Documentation/components/LinkList';
+import { SectionContainer, SummaryTabHeaderTitle } from './HeaderComponents';
+
+const UNEXPANDED_HEIGHT = 2000;
+
+const DocumentationWrapper = styled.div<{ canExpand?: boolean }>`
+    position: relative;
+
+    && {
+        margin: 0;
+        ${({ canExpand }) => canExpand && 'margin-bottom: 50px;'}
+    }
+
+    && .ant-empty {
+        padding: 0;
+    }
+
+    .remirror-editor.ProseMirror {
+        padding: 0px 8px;
+    }
+`;
+
+const EditorWrapper = styled.div<{ mask?: boolean; maxHeight: string }>`
+    max-height: ${({ maxHeight }) => maxHeight};
+    overflow-y: hidden;
+    ${({ mask }) =>
+        mask &&
+        `-webkit-mask-image: linear-gradient(to bottom, rgba(0,0,0,1) 50%, rgba(255,0,0,0.5) 60%, rgba(255,0,0,0) 90% );
+         mask-image: linear-gradient(to bottom, rgba(0,0,0,1) 80%, rgba(255,0,0,0.5) 95%, rgba(255,0,0,0) 100%);`}
+`;
+
+const ExpandButton = styled(Button)`
+    position: absolute;
+    left: 50%;
+    top: ${UNEXPANDED_HEIGHT + 10}px;
+    transform: translateX(-50%);
+    z-index: 1;
+`;
+
+export default function SummaryAboutSection() {
+    const { entityData } = useEntityData();
+    const refetch = useRefetch();
+    const routeToTab = useRouteToTab();
+
+    const [height, setHeight] = useState(0);
+    const measuredRef = useCallback((node) => {
+        if (node !== null) {
+            const resizeObserver = new ResizeObserver(() => {
+                setHeight(node.getBoundingClientRect().height);
+            });
+            resizeObserver.observe(node);
+        }
+    }, []);
+    const [expanded, setExpanded] = useState(false);
+    const maxHeight = expanded ? 'unset' : `${UNEXPANDED_HEIGHT}px`;
+    const description = entityData?.editableProperties?.description || entityData?.properties?.description || '';
+    const canExpand = !!description && !expanded && height >= UNEXPANDED_HEIGHT;
+
+    return (
+        <SectionContainer>
+            <SummaryTabHeaderTitle title="Documentation" icon={<FileOutlined />} />
+            <DocumentationWrapper canExpand={canExpand ? true : undefined}>
+                {!!description && (
+                    <>
+                        <EditorWrapper ref={measuredRef} mask={canExpand ? true : undefined} maxHeight={maxHeight}>
+                            <Editor content={description} readOnly />
+                        </EditorWrapper>
+                        {canExpand && <ExpandButton onClick={() => setExpanded(true)}>Expand</ExpandButton>}
+                    </>
+                )}
+                {!description && (
+                    <EmptyTab tab="documentation" hideImage>
+                        <Button
+                            data-testid="add-documentation"
+                            onClick={() => routeToTab({ tabName: 'Documentation', tabParams: { editing: true } })}
+                        >
+                            <EditOutlined /> Add Documentation
+                        </Button>
+                        <AddLinkModal refetch={refetch} />
+                    </EmptyTab>
+                )}
+                <LinkList refetch={refetch} />
+            </DocumentationWrapper>
+        </SectionContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/summary/SummaryCreatedBySection.tsx b/datahub-web-react/src/app/entityV2/shared/summary/SummaryCreatedBySection.tsx
new file mode 100644
index 00000000000000..3354049b41c45d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/summary/SummaryCreatedBySection.tsx
@@ -0,0 +1,60 @@
+import React from 'react';
+import styled from 'styled-components';
+import { HeaderTitle } from './HeaderComponents';
+import { CorpGroup, CorpUser, EntityType } from '../../../../types.generated';
+import { useEntityRegistryV2 } from '../../../useEntityRegistry';
+import { REDESIGN_COLORS } from '../constants';
+import CustomAvatar from '../../../shared/avatar/CustomAvatar';
+
+const StyledTitle = styled(HeaderTitle)`
+    margin-bottom: 12px;
+    font-size: 14px;
+    color: ${REDESIGN_COLORS.TEXT_HEADING};
+    font-weight: 700;
+`;
+
+const Details = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 5px;
+    color: ${REDESIGN_COLORS.SUBTITLE};
+    font-size: 14px;
+    font-weight: 500;
+`;
+
+const SectionContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+`;
+
+interface Props {
+    owner: CorpUser | CorpGroup;
+}
+
+export default function SummaryCreatedBySection({ owner }: Props) {
+    const entityRegistry = useEntityRegistryV2();
+
+    let ownerName;
+    if (owner?.__typename === 'CorpGroup') {
+        ownerName = entityRegistry.getDisplayName(EntityType.CorpGroup, owner);
+    }
+    if (owner?.__typename === 'CorpUser') {
+        ownerName = entityRegistry.getDisplayName(EntityType.CorpUser, owner);
+    }
+    const ownerPictureLink =
+        (owner && owner.__typename === 'CorpUser' && owner.editableProperties?.pictureLink) || undefined;
+
+    return (
+        <>
+            {!!ownerName && (
+                <SectionContainer>
+                    <StyledTitle>Created By</StyledTitle>
+                    <Details>
+                        {!!ownerPictureLink && <CustomAvatar photoUrl={ownerPictureLink} size={28} useDefaultAvatar />}
+                        {ownerName}
+                    </Details>
+                </SectionContainer>
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagement.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagement.tsx
new file mode 100644
index 00000000000000..3c256a43d3acd5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagement.tsx
@@ -0,0 +1,117 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Button, Table } from 'antd';
+import { useBaseEntity } from '../../../../../entity/shared/EntityContext';
+import { GetDatasetQuery, useGetExternalRolesQuery } from '../../../../../../graphql/dataset.generated';
+import { useGetMeQuery } from '../../../../../../graphql/me.generated';
+import { handleAccessRoles } from './utils';
+import AccessManagerDescription from './AccessManagerDescription';
+
+const StyledTable = styled(Table)`
+    overflow: inherit;
+    height: inherit;
+
+    &&& .ant-table-cell {
+        background-color: #fff;
+    }
+    &&& .ant-table-thead .ant-table-cell {
+        font-weight: 600;
+        font-size: 12px;
+        color: '#898989';
+    }
+    &&
+        .ant-table-thead
+        > tr
+        > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not(
+            [colspan]
+        )::before {
+        border: 1px solid #f0f0f0;
+    }
+` as typeof Table;
+
+const StyledSection = styled.section`
+    background-color: #fff;
+    color: black;
+    width: 83px;
+    text-align: center;
+    border-radius: 3px;
+    border: none;
+    font-weight: bold;
+`;
+
+const AccessButton = styled(Button)`
+    background-color: #1890ff;
+    color: white;
+    width: 80px;
+    height: 30px;
+    border-radius: 3.5px;
+    border: none;
+    font-weight: bold;
+    &:hover {
+        background-color: #18baff;
+        color: white;
+        width: 80px;
+        height: 30px;
+        border-radius: 3.5px;
+        border: none;
+        font-weight: bold;
+    }
+`;
+
+export default function AccessManagement() {
+    const { data: loggedInUser } = useGetMeQuery({ fetchPolicy: 'cache-first' });
+    const baseEntity = useBaseEntity<GetDatasetQuery>();
+    const { data: externalRoles } = useGetExternalRolesQuery({
+        variables: { urn: baseEntity?.dataset?.urn as string },
+        skip: !baseEntity?.dataset?.urn,
+    });
+
+    const columns = [
+        {
+            title: 'Role Name',
+            dataIndex: 'name',
+            key: 'name',
+        },
+        {
+            title: 'Description',
+            dataIndex: 'description',
+            key: 'description',
+            render: (roleDescription) => {
+                return <AccessManagerDescription description={roleDescription} />;
+            },
+        },
+        {
+            title: 'Access Type',
+            dataIndex: 'accessType',
+            key: 'accessType',
+        },
+        {
+            title: 'Access',
+            dataIndex: 'hasAccess',
+            key: 'hasAccess',
+            render: (hasAccess, record) => {
+                if (hasAccess) {
+                    return <StyledSection>Provisioned</StyledSection>;
+                }
+                if (record?.url) {
+                    return (
+                        <AccessButton
+                            onClick={(e) => {
+                                e.preventDefault();
+                                window.open(record.url);
+                            }}
+                        >
+                            Request
+                        </AccessButton>
+                    );
+                }
+                return <StyledSection />;
+            },
+            hidden: true,
+        },
+    ];
+
+    return (
+        <StyledTable dataSource={handleAccessRoles(externalRoles, loggedInUser)} columns={columns} pagination={false} />
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx
new file mode 100644
index 00000000000000..c87a499e34ac0f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx
@@ -0,0 +1,38 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+
+export type Props = {
+    description: any;
+};
+
+const DescriptionContainer = styled.div`
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    width: 500px;
+    height: 100%;
+    min-height: 22px;
+`;
+
+export default function AccessManagerDescription({ description }: Props) {
+    const shouldTruncateDescription = description.length > 150;
+    const [expanded, setIsExpanded] = useState(!shouldTruncateDescription);
+    const finalDescription = expanded ? description : description.slice(0, 150);
+    const toggleExpanded = () => {
+        setIsExpanded(!expanded);
+    };
+
+    return (
+        <DescriptionContainer>
+            {finalDescription}
+            <Typography.Link
+                onClick={() => {
+                    toggleExpanded();
+                }}
+            >
+                {(shouldTruncateDescription && (expanded ? ' Read Less' : '...Read More')) || undefined}
+            </Typography.Link>
+        </DescriptionContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts
new file mode 100644
index 00000000000000..c2bb7b6a8973ab
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts
@@ -0,0 +1,279 @@
+import { GetExternalRolesQuery } from '../../../../../../../graphql/dataset.generated';
+import { GetMeQuery } from '../../../../../../../graphql/me.generated';
+import { handleAccessRoles } from '../utils';
+
+describe('handleAccessRoles', () => {
+    it('should properly map the externalroles and loggedin user', () => {
+        const externalRolesQuery: GetExternalRolesQuery = {
+            dataset: {
+                access: {
+                    roles: [
+                        {
+                            role: {
+                                id: 'accessRole',
+                                properties: {
+                                    name: 'accessRole',
+                                    description:
+                                        'This role access is required by the developers to test and deploy the code also adding few more details to check the description length for the given data and hence check the condition of read more and read less ',
+                                    type: 'READ',
+                                    requestUrl: 'https://www.google.com/',
+                                },
+                                urn: 'urn:li:role:accessRole',
+                                isAssignedToMe: true,
+                            },
+                        },
+                    ],
+                },
+                __typename: 'Dataset',
+            },
+        };
+
+        const GetMeQueryUser: GetMeQuery = {
+            me: {
+                corpUser: {
+                    urn: 'urn:li:corpuser:datahub',
+                    username: 'datahub',
+                    info: {
+                        active: true,
+                        displayName: 'DataHub',
+                        title: 'DataHub Root User',
+                        firstName: null,
+                        lastName: null,
+                        fullName: null,
+                        email: null,
+                        __typename: 'CorpUserInfo',
+                    },
+                    editableProperties: {
+                        displayName: null,
+                        title: null,
+                        pictureLink:
+                            'https://raw.githubusercontent.com/datahub-project/datahub/master/datahub-web-react/src/images/default_avatar.png',
+                        teams: [],
+                        skills: [],
+                        __typename: 'CorpUserEditableProperties',
+                    },
+                    settings: {
+                        appearance: {
+                            showSimplifiedHomepage: false,
+                            __typename: 'CorpUserAppearanceSettings',
+                        },
+                        views: null,
+                        __typename: 'CorpUserSettings',
+                    },
+                    __typename: 'CorpUser',
+                },
+                platformPrivileges: {
+                    viewAnalytics: true,
+                    managePolicies: true,
+                    manageIdentities: true,
+                    manageDomains: true,
+                    manageTags: true,
+                    createDomains: true,
+                    createTags: true,
+                    manageUserCredentials: true,
+                    manageGlossaries: true,
+                    viewTests: false,
+                    manageTests: true,
+                    manageTokens: true,
+                    manageSecrets: true,
+                    manageIngestion: true,
+                    generatePersonalAccessTokens: true,
+                    manageGlobalViews: true,
+                    manageOwnershipTypes: true,
+                    manageGlobalAnnouncements: true,
+                    createBusinessAttributes: true,
+                    manageBusinessAttributes: true,
+                    manageStructuredProperties: true,
+                    viewStructuredPropertiesPage: true,
+
+                    __typename: 'PlatformPrivileges',
+                },
+                __typename: 'AuthenticatedUser',
+            },
+        };
+        const externalRole = handleAccessRoles(externalRolesQuery, GetMeQueryUser);
+        expect(externalRole).toMatchObject([
+            {
+                name: 'accessRole',
+                description:
+                    'This role access is required by the developers to test and deploy the code also adding few more details to check the description length for the given data and hence check the condition of read more and read less ',
+                accessType: 'READ',
+                hasAccess: false,
+                url: 'https://www.google.com/',
+            },
+        ]);
+    });
+    it('should return empty array', () => {
+        const externalRolesQuery: GetExternalRolesQuery = {
+            dataset: {
+                access: null,
+                __typename: 'Dataset',
+            },
+        };
+
+        const GetMeQueryUser: GetMeQuery = {
+            me: {
+                corpUser: {
+                    urn: 'urn:li:corpuser:datahub',
+                    username: 'datahub',
+                    info: {
+                        active: true,
+                        displayName: 'DataHub',
+                        title: 'DataHub Root User',
+                        firstName: null,
+                        lastName: null,
+                        fullName: null,
+                        email: null,
+                        __typename: 'CorpUserInfo',
+                    },
+                    editableProperties: {
+                        displayName: null,
+                        title: null,
+                        pictureLink:
+                            'https://raw.githubusercontent.com/datahub-project/datahub/master/datahub-web-react/src/images/default_avatar.png',
+                        teams: [],
+                        skills: [],
+                        __typename: 'CorpUserEditableProperties',
+                    },
+                    settings: {
+                        appearance: {
+                            showSimplifiedHomepage: false,
+                            __typename: 'CorpUserAppearanceSettings',
+                        },
+                        views: null,
+                        __typename: 'CorpUserSettings',
+                    },
+                    __typename: 'CorpUser',
+                },
+                platformPrivileges: {
+                    viewAnalytics: true,
+                    managePolicies: true,
+                    manageIdentities: true,
+                    manageDomains: true,
+                    manageTags: true,
+                    createDomains: true,
+                    createTags: true,
+                    manageUserCredentials: true,
+                    manageGlossaries: true,
+                    viewTests: false,
+                    manageTests: true,
+                    manageTokens: true,
+                    manageSecrets: true,
+                    manageIngestion: true,
+                    generatePersonalAccessTokens: true,
+                    manageGlobalViews: true,
+                    manageOwnershipTypes: true,
+                    manageGlobalAnnouncements: true,
+                    createBusinessAttributes: true,
+                    manageBusinessAttributes: true,
+                    manageStructuredProperties: true,
+                    viewStructuredPropertiesPage: true,
+                    __typename: 'PlatformPrivileges',
+                },
+                __typename: 'AuthenticatedUser',
+            },
+        };
+        const externalRole = handleAccessRoles(externalRolesQuery, GetMeQueryUser);
+        expect(externalRole).toMatchObject([]);
+    });
+    it('should properly map the externalroles and loggedin user and access true', () => {
+        const externalRolesQuery: GetExternalRolesQuery = {
+            dataset: {
+                access: {
+                    roles: [
+                        {
+                            role: {
+                                id: 'accessRole',
+                                properties: {
+                                    name: 'accessRole',
+                                    description:
+                                        'This role access is required by the developers to test and deploy the code also adding few more details to check the description length for the given data and hence check the condition of read more and read less ',
+                                    type: 'READ',
+                                    requestUrl: 'https://www.google.com/',
+                                },
+                                urn: 'urn:li:role:accessRole',
+                                isAssignedToMe: true,
+                            },
+                        },
+                    ],
+                },
+                __typename: 'Dataset',
+            },
+        };
+
+        const GetMeQueryUser: GetMeQuery = {
+            me: {
+                corpUser: {
+                    urn: 'urn:li:corpuser:datahub',
+                    username: 'datahub',
+                    info: {
+                        active: true,
+                        displayName: 'DataHub',
+                        title: 'DataHub Root User',
+                        firstName: null,
+                        lastName: null,
+                        fullName: null,
+                        email: null,
+                        __typename: 'CorpUserInfo',
+                    },
+                    editableProperties: {
+                        displayName: null,
+                        title: null,
+                        pictureLink:
+                            'https://raw.githubusercontent.com/datahub-project/datahub/master/datahub-web-react/src/images/default_avatar.png',
+                        teams: [],
+                        skills: [],
+                        __typename: 'CorpUserEditableProperties',
+                    },
+                    settings: {
+                        appearance: {
+                            showSimplifiedHomepage: false,
+                            __typename: 'CorpUserAppearanceSettings',
+                        },
+                        views: null,
+                        __typename: 'CorpUserSettings',
+                    },
+                    __typename: 'CorpUser',
+                },
+                platformPrivileges: {
+                    viewAnalytics: true,
+                    managePolicies: true,
+                    manageIdentities: true,
+                    manageDomains: true,
+                    manageTags: true,
+                    createDomains: true,
+                    createTags: true,
+                    manageUserCredentials: true,
+                    manageGlossaries: true,
+                    viewTests: false,
+                    manageTests: true,
+                    manageTokens: true,
+                    manageSecrets: true,
+                    manageIngestion: true,
+                    generatePersonalAccessTokens: true,
+                    manageGlobalViews: true,
+                    manageOwnershipTypes: true,
+                    manageGlobalAnnouncements: true,
+                    createBusinessAttributes: true,
+                    manageBusinessAttributes: true,
+                    manageStructuredProperties: true,
+                    viewStructuredPropertiesPage: true,
+
+                    __typename: 'PlatformPrivileges',
+                },
+                __typename: 'AuthenticatedUser',
+            },
+        };
+        const externalRole = handleAccessRoles(externalRolesQuery, GetMeQueryUser);
+        expect(externalRole).toMatchObject([
+            {
+                name: 'accessRole',
+                description:
+                    'This role access is required by the developers to test and deploy the code also adding few more details to check the description length for the given data and hence check the condition of read more and read less ',
+                accessType: 'READ',
+                hasAccess: false,
+                url: 'https://www.google.com/',
+            },
+        ]);
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/utils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/utils.tsx
new file mode 100644
index 00000000000000..38322514edad69
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/utils.tsx
@@ -0,0 +1,27 @@
+export function handleAccessRoles(externalRoles, loggedInUser) {
+    const accessRoles = new Array<any>();
+    if (
+        externalRoles?.dataset?.access &&
+        externalRoles?.dataset?.access.roles &&
+        externalRoles?.dataset?.access.roles.length > 0
+    ) {
+        externalRoles?.dataset?.access?.roles?.forEach((userRoles) => {
+            const role = {
+                name: userRoles?.role?.properties?.name || ' ',
+                description: userRoles?.role?.properties?.description || ' ',
+                accessType: userRoles?.role?.properties?.type || ' ',
+                hasAccess:
+                    (userRoles?.role?.actors?.users &&
+                        userRoles?.role?.actors?.users.length > 0 &&
+                        userRoles?.role?.actors?.users?.some(
+                            (user) => user.user.urn === loggedInUser?.me?.corpUser?.urn,
+                        )) ||
+                    false,
+                url: userRoles?.role?.properties?.requestUrl || undefined,
+            };
+            accessRoles.push(role);
+        });
+    }
+
+    return accessRoles;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResults.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResults.tsx
new file mode 100644
index 00000000000000..fd1ce5fadcdb4c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResults.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { TestResult } from '../../../../../../types.generated';
+import { TestResultsList } from './TestResultsList';
+import { TestResultsSummary } from './TestResultsSummary';
+
+type Props = {
+    passing: Array<TestResult>;
+    failing: Array<TestResult>;
+};
+
+export const TestResults = ({ passing, failing }: Props) => {
+    const filteredPassing = passing.filter((testResult) => testResult.test !== null);
+    const filteredFailing = failing.filter((testResult) => testResult.test !== null);
+    const totalTests = filteredPassing.length + filteredFailing.length;
+
+    return (
+        <>
+            <TestResultsSummary
+                summary={{
+                    passing: filteredPassing.length,
+                    failing: filteredFailing.length,
+                    total: totalTests,
+                }}
+            />
+            {totalTests > 0 && (
+                <TestResultsList title="Test Results" results={[...filteredFailing, ...filteredPassing]} />
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsList.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsList.tsx
new file mode 100644
index 00000000000000..4c5ccbd0f3f1d0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsList.tsx
@@ -0,0 +1,112 @@
+import { CopyOutlined, StopOutlined } from '@ant-design/icons';
+import { Button, Divider, Empty, Tag, Typography } from 'antd';
+import { Tooltip } from '@components';
+import styled from 'styled-components';
+import React from 'react';
+import { TestResult } from '../../../../../../types.generated';
+import { StyledTable } from '../../../components/styled/StyledTable';
+import { getResultColor, getResultIcon, getResultText } from './testUtils';
+
+const ResultContainer = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: left;
+`;
+
+const TestResultsContainer = styled.div`
+    padding: 20px;
+`;
+
+const TestName = styled(Typography.Title)`
+    margin: 0px;
+    padding: 0px;
+
+    && {
+        margin-bottom: 4px;
+    }
+`;
+
+const TestCategory = styled(Typography.Text)`
+    margin: 0px;
+    padding: 0px;
+`;
+
+const ResultTypeText = styled(Typography.Text)`
+    margin-left: 8px;
+`;
+
+type Props = {
+    title: string;
+    results: Array<TestResult>;
+};
+
+export const TestResultsList = ({ title, results }: Props) => {
+    const resultsTableData = results.map((result) => ({
+        urn: result.test?.urn,
+        name: result?.test?.name,
+        category: result?.test?.category,
+        description: result?.test?.description,
+        resultType: result.type,
+    }));
+
+    const resultsTableCols = [
+        {
+            title: '',
+            dataIndex: '',
+            key: '',
+            render: (_, record: any) => {
+                const resultColor = (record.resultType && getResultColor(record.resultType)) || 'default';
+                const resultText = (record.resultType && getResultText(record.resultType)) || 'No Evaluations';
+                const resultIcon = (record.resultType && getResultIcon(record.resultType)) || <StopOutlined />;
+                return (
+                    <ResultContainer>
+                        <div>
+                            <Tag style={{ borderColor: resultColor }}>
+                                {resultIcon}
+                                <ResultTypeText style={{ color: resultColor }}>{resultText}</ResultTypeText>
+                            </Tag>
+                        </div>
+                        <div style={{ width: '100%', display: 'flex', justifyContent: 'space-between' }}>
+                            <div style={{ marginLeft: 8 }}>
+                                <div>
+                                    <TestName level={5}>{record.name}</TestName>
+                                    <TestCategory type="secondary">{record.category}</TestCategory>
+                                    <Divider type="vertical" />
+                                    <Typography.Text type={record.description ? undefined : 'secondary'}>
+                                        {record.description || 'No description'}
+                                    </Typography.Text>
+                                </div>
+                            </div>
+                            {navigator.clipboard && (
+                                <Tooltip title="Copy URN. An URN uniquely identifies an entity on DataHub.">
+                                    <Button
+                                        icon={<CopyOutlined />}
+                                        onClick={() => {
+                                            navigator.clipboard.writeText(record.urn);
+                                        }}
+                                    />
+                                </Tooltip>
+                            )}
+                        </div>
+                    </ResultContainer>
+                );
+            },
+        },
+    ];
+
+    return (
+        <TestResultsContainer>
+            <Typography.Title level={5}>{title}</Typography.Title>
+            <StyledTable
+                columns={resultsTableCols}
+                dataSource={resultsTableData}
+                rowKey="urn"
+                locale={{
+                    emptyText: <Empty description="No Tests Found :(" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
+                }}
+                showHeader={false}
+                pagination={false}
+            />
+        </TestResultsContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsSummary.tsx
new file mode 100644
index 00000000000000..68466746df8bec
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsSummary.tsx
@@ -0,0 +1,87 @@
+import { CheckCircleFilled, CloseCircleFilled, StopOutlined } from '@ant-design/icons';
+import { Typography } from 'antd';
+import { Tooltip } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../constants';
+
+const SummaryHeader = styled.div`
+    width: 100%;
+    padding-left: 40px;
+    padding-top: 20px;
+    padding-bottom: 20px;
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
+`;
+
+const SummaryContainer = styled.div``;
+
+const SummaryMessage = styled.div`
+    display: inline-block;
+    margin-left: 20px;
+`;
+
+const SummaryTitle = styled(Typography.Title)`
+    && {
+        padding-bottom: 0px;
+        margin-bottom: 0px;
+    }
+`;
+
+export type TestsSummary = {
+    failing: number;
+    passing: number;
+    total: number;
+};
+
+type Props = {
+    summary: TestsSummary;
+};
+
+const SUCCESS_COLOR_HEX = '#52C41A';
+const FAILURE_COLOR_HEX = '#F5222D';
+
+const getSummaryIcon = (summary: TestsSummary) => {
+    if (summary.total === 0) {
+        return <StopOutlined style={{ color: ANTD_GRAY[6], fontSize: 28 }} />;
+    }
+    if (summary.passing === summary.total) {
+        return <CheckCircleFilled style={{ color: SUCCESS_COLOR_HEX, fontSize: 28 }} />;
+    }
+    return <CloseCircleFilled style={{ color: FAILURE_COLOR_HEX, fontSize: 28 }} />;
+};
+
+const getSummaryMessage = (summary: TestsSummary) => {
+    if (summary.total === 0) {
+        return 'No tests have run';
+    }
+    if (summary.passing === summary.total) {
+        return 'All tests are passing';
+    }
+    if (summary.failing === summary.total) {
+        return 'All tests are failing';
+    }
+    return 'Some tests are failing';
+};
+
+export const TestResultsSummary = ({ summary }: Props) => {
+    const summaryIcon = getSummaryIcon(summary);
+    const summaryMessage = getSummaryMessage(summary);
+    const subtitleMessage = `${summary.passing} passing tests, ${summary.failing} failing tests`;
+    return (
+        <SummaryHeader>
+            <SummaryContainer>
+                <Tooltip title="This status is based on the most recent run of each test.">
+                    <div style={{ display: 'flex', alignItems: 'center' }}>
+                        {summaryIcon}
+                        <SummaryMessage>
+                            <SummaryTitle level={5}>{summaryMessage}</SummaryTitle>
+                            <Typography.Text type="secondary">{subtitleMessage}</Typography.Text>
+                        </SummaryMessage>
+                    </div>
+                </Tooltip>
+            </SummaryContainer>
+        </SummaryHeader>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/testUtils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/testUtils.tsx
new file mode 100644
index 00000000000000..8a0ef59c818636
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/testUtils.tsx
@@ -0,0 +1,49 @@
+import React from 'react';
+import { CheckCircleOutlined, CloseCircleOutlined } from '@ant-design/icons';
+import { TestResultType } from '../../../../../../types.generated';
+
+/**
+ * Returns the display text assoociated with an Test Result Type
+ */
+export const getResultText = (result: TestResultType) => {
+    switch (result) {
+        case TestResultType.Success:
+            return 'Passing';
+        case TestResultType.Failure:
+            return 'Failing';
+        default:
+            throw new Error(`Unsupported Test Result Type ${result} provided.`);
+    }
+};
+
+/**
+ * Returns the display color assoociated with an TestResultType
+ */
+const SUCCESS_COLOR_HEX = '#4db31b';
+const FAILURE_COLOR_HEX = '#F5222D';
+
+export const getResultColor = (result: TestResultType) => {
+    switch (result) {
+        case TestResultType.Success:
+            return SUCCESS_COLOR_HEX;
+        case TestResultType.Failure:
+            return FAILURE_COLOR_HEX;
+        default:
+            throw new Error(`Unsupported Test Result Type ${result} provided.`);
+    }
+};
+
+/**
+ * Returns the display icon assoociated with an TestResultType
+ */
+export const getResultIcon = (result: TestResultType) => {
+    const resultColor = getResultColor(result);
+    switch (result) {
+        case TestResultType.Success:
+            return <CheckCircleOutlined style={{ color: resultColor }} />;
+        case TestResultType.Failure:
+            return <CloseCircleOutlined style={{ color: resultColor }} />;
+        default:
+            throw new Error(`Unsupported Test Result Type ${result} provided.`);
+    }
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/AddButton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/AddButton.tsx
new file mode 100644
index 00000000000000..7761f00c119dfc
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/AddButton.tsx
@@ -0,0 +1,45 @@
+import { PlusOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+import { Tooltip } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import { REDESIGN_COLORS } from '../../../constants';
+import { ADD_UNAUTHORIZED_MESSAGE } from './utils/constants';
+
+export const PrimaryButton = styled(Button)`
+    color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    font-size: 14px;
+    font-family: Mulish;
+    font-weight: 600;
+    box-shadow: none;
+    border-color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    margin-left: 9px;
+    display: flex;
+    align-items: center;
+
+    &:hover {
+        transition: 0.15s;
+        opacity: 0.9;
+        border-color: ${REDESIGN_COLORS.TITLE_PURPLE};
+        background-color: ${REDESIGN_COLORS.TITLE_PURPLE};
+        color: #ffffff;
+    }
+`;
+interface Props {
+    buttonLabel?: string;
+    isButtonDisabled?: boolean;
+    dataTestId?: string;
+    onButtonClick?: () => void;
+}
+
+const AddButton = ({ buttonLabel, isButtonDisabled, dataTestId, onButtonClick }: Props) => {
+    return (
+        <Tooltip placement="right" title={(isButtonDisabled && ADD_UNAUTHORIZED_MESSAGE) || 'Add a highlighted query'}>
+            <PrimaryButton disabled={isButtonDisabled} onClick={onButtonClick} data-testid={dataTestId}>
+                <PlusOutlined /> {buttonLabel}
+            </PrimaryButton>
+        </Tooltip>
+    );
+};
+
+export default AddButton;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/CopyQuery.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/CopyQuery.tsx
new file mode 100644
index 00000000000000..578bb8de0b9352
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/CopyQuery.tsx
@@ -0,0 +1,28 @@
+import React, { useState } from 'react';
+import { CheckOutlined, CopyOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+import { Tooltip } from '@components';
+
+export type Props = {
+    query: string;
+    showCopyText?: boolean;
+    style?: any;
+};
+
+export default function CopyQuery({ query, showCopyText = false, style }: Props) {
+    const [queryCopied, setQueryCopied] = useState(false);
+
+    const copyQuery = () => {
+        navigator.clipboard.writeText(query || '');
+        setQueryCopied(true);
+    };
+
+    return (
+        <Tooltip title="Copy the query">
+            <Button onClick={copyQuery} style={style}>
+                {showCopyText && ((queryCopied && 'Copied') || 'Copy')}
+                {(queryCopied && <CheckOutlined />) || <CopyOutlined />}
+            </Button>
+        </Tooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/EmptyQueriesSection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/EmptyQueriesSection.tsx
new file mode 100644
index 00000000000000..fef562b96c6873
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/EmptyQueriesSection.tsx
@@ -0,0 +1,110 @@
+import React from 'react';
+import { Empty, Typography } from 'antd';
+import { Popover } from '@components';
+import styled from 'styled-components';
+import { InfoCircleOutlined } from '@ant-design/icons';
+import { TooltipPlacement } from 'antd/es/tooltip';
+import NoDocs from '../../../../../../images/no-docs.svg';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../../../constants';
+import AddButton from './AddButton';
+
+const StyledEmpty = styled(Empty)`
+    display: flex;
+    gap: 10px;
+    align-items: center;
+
+    .ant-empty-image {
+        margin: 0;
+        height: 50px;
+    }
+`;
+
+const SectionWrapper = styled.div`
+    border-radius: 0 0 10px 10px;
+    background-color: white;
+    padding: 24px;
+    box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.08);
+    height: 100%;
+`;
+
+const ContentContainer = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 12px;
+`;
+
+const LeftContainer = styled.div`
+    display: flex;
+`;
+
+const RightContainer = styled.div`
+    display: flex;
+    align-self: flex-start;
+`;
+
+const SectionTitle = styled(Typography.Text)`
+    font-size: 16px;
+    font-weight: 700;
+    color: ${REDESIGN_COLORS.TEXT_HEADING};
+`;
+
+const Description = styled(Typography.Text)`
+    font-size: 14px;
+    font-weight: 700;
+    color: ${REDESIGN_COLORS.GREY_500};
+`;
+
+const StyledInfoOutlined = styled(InfoCircleOutlined)`
+    margin-left: 8px;
+    font-size: 12px;
+    color: ${ANTD_GRAY[7]};
+`;
+
+interface Props {
+    sectionName?: string;
+    showButton: boolean;
+    buttonLabel?: string;
+    isButtonDisabled?: boolean;
+    onButtonClick?: () => void;
+    tooltip?: string;
+    tooltipPosition?: TooltipPlacement;
+}
+
+export default function EmptyQueriesSection({
+    sectionName,
+    showButton = false,
+    buttonLabel,
+    isButtonDisabled,
+    onButtonClick,
+    tooltip,
+    tooltipPosition,
+}: Props) {
+    return (
+        <SectionWrapper>
+            <div>
+                <SectionTitle>{sectionName}</SectionTitle>
+                {tooltip && (
+                    <Popover content={tooltip} placement={tooltipPosition}>
+                        <StyledInfoOutlined />
+                    </Popover>
+                )}
+            </div>
+            <ContentContainer>
+                <LeftContainer>
+                    <StyledEmpty description={<Description>No highlighted queries yet</Description>} image={NoDocs} />
+                </LeftContainer>
+                <RightContainer>
+                    {showButton && (
+                        <AddButton
+                            dataTestId="add-query-button"
+                            buttonLabel={buttonLabel}
+                            isButtonDisabled={isButtonDisabled}
+                            onButtonClick={onButtonClick}
+                        />
+                    )}
+                </RightContainer>
+            </ContentContainer>
+        </SectionWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesListSection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesListSection.tsx
new file mode 100644
index 00000000000000..1c56d244e34e7b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesListSection.tsx
@@ -0,0 +1,263 @@
+import React, { useState } from 'react';
+import { Typography, Table, TablePaginationConfig } from 'antd';
+import { Popover } from '@components';
+import { TooltipPlacement } from 'antd/es/tooltip';
+import { InfoCircleOutlined } from '@ant-design/icons';
+import styled from 'styled-components';
+import { FacetFilterInput } from '@src/types.generated';
+import { QueriesTabSection, Query } from './types';
+import { DEFAULT_PAGE_SIZE } from './utils/constants';
+import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '../../../constants';
+import useQueryTableColumns from './useQueryTableColumns';
+import Loading from '../../../../../shared/Loading';
+import usePagination, { Pagination } from '../../../../../sharedV2/pagination/usePagination';
+import { Sorting } from '../../../../../sharedV2/sorting/useSorting';
+import AddButton from './AddButton';
+import QueryFilters from './QueryFilters/QueryFilters';
+
+const SectionWrapper = styled.div<{ $borderRadiusBottom?: boolean }>`
+    background-color: white;
+    padding: 24px;
+    box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.08);
+    ${(props) => (props.$borderRadiusBottom ? `border-radius: 0 0 10px 10px;` : `border-radius: 10px;`)}
+    height: 100%;
+`;
+
+const QueriesTitleSection = styled.div`
+    display: flex;
+    align-items: center;
+    margin-bottom: 20px;
+    justify-content: space-between;
+`;
+
+const TitleWrapper = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const QueriesTitle = styled(Typography.Text)`
+    && {
+        margin: 0px;
+        font-size: 16px;
+        font-weight: 700;
+        color: ${REDESIGN_COLORS.TEXT_HEADING};
+    }
+`;
+
+const StyledInfoOutlined = styled(InfoCircleOutlined)`
+    margin-left: 8px;
+    font-size: 12px;
+    color: ${ANTD_GRAY[7]};
+`;
+
+const StyledTable = styled(Table)`
+    .ant-table-thead > tr > th {
+        font-weight: 700;
+        font-size: 14px;
+        line-height: 16px;
+        color: ${ANTD_GRAY_V2[12]};
+    }
+
+    .lastRun {
+        min-width: 120px;
+    }
+    .usedBy {
+        min-width: 100px;
+    }
+`;
+
+const LoadingWrapper = styled.div`
+    height: 300px;
+    display: flex;
+    align-items: center;
+`;
+
+const FiltersContainer = styled.div`
+    display: flex;
+    gap: 10px;
+`;
+
+type Props = {
+    title: string;
+    queries: Query[];
+    totalQueries: number;
+    tooltip?: string;
+    tooltipPosition?: TooltipPlacement;
+    initialPageSize?: number;
+    showDetails?: boolean;
+    showEdit?: boolean;
+    showDelete?: boolean;
+    onDeleted?: (query) => void;
+    onEdited?: (query) => void;
+    section: QueriesTabSection;
+    selectedColumnsFilter: FacetFilterInput;
+    setSelectedColumnsFilter: (usersFilter: FacetFilterInput) => void;
+    selectedUsersFilter: FacetFilterInput;
+    setSelectedUsersFilter: (usersFilter: FacetFilterInput) => void;
+    loading?: boolean;
+    pagination?: Pagination;
+    sorting?: Sorting;
+    addQueryDisabled?: boolean;
+    onAddQuery?: () => void;
+    isTopSection?: boolean;
+};
+
+export default function QueriesListSection({
+    title,
+    tooltip,
+    tooltipPosition,
+    queries,
+    totalQueries,
+    showDetails,
+    showEdit,
+    showDelete,
+    onDeleted,
+    onEdited,
+    section,
+    selectedColumnsFilter,
+    setSelectedColumnsFilter,
+    selectedUsersFilter,
+    setSelectedUsersFilter,
+    loading,
+    pagination,
+    sorting,
+    addQueryDisabled,
+    onAddQuery,
+    isTopSection,
+}: Props) {
+    /**
+     * Table state
+     */
+    const [hoveredQueryUrn, setHoveredQueryUrn] = useState<string | null>(null);
+    const defaultPagination = usePagination(DEFAULT_PAGE_SIZE);
+    const { pageSize, page, setPage } = pagination || defaultPagination;
+    const showPagination = totalQueries > pageSize;
+
+    const {
+        titleColumn,
+        descriptionColumn,
+        queryTextColumn,
+        createdByColumn,
+        createdDateColumn,
+        powersColumn,
+        usedByColumn,
+        popularityColumn,
+        columnsColumn,
+        lastRunColumn,
+        editColumn,
+    } = useQueryTableColumns({
+        queries,
+        hoveredQueryUrn,
+        showDelete,
+        showDetails,
+        showEdit,
+        onDeleted,
+        onEdited,
+        sorting,
+        showPagination,
+    });
+
+    const highlightedQueriesColumns = [
+        titleColumn,
+        descriptionColumn,
+        queryTextColumn(),
+        createdByColumn,
+        createdDateColumn,
+        editColumn,
+    ];
+
+    const popularQueriesColumns = [queryTextColumn(), usedByColumn, lastRunColumn, columnsColumn, popularityColumn];
+
+    const downstreamQueriesColumns = [queryTextColumn(550), powersColumn, lastRunColumn];
+
+    const recentQueriesColumns = [queryTextColumn(550), lastRunColumn];
+
+    const pagionationOptions: false | TablePaginationConfig = showPagination
+        ? ({
+              total: totalQueries,
+              current: page,
+              pageSize,
+              position: ['bottomCenter'],
+              onChange: (newPage: number) => {
+                  setPage(newPage);
+              },
+          } as TablePaginationConfig)
+        : false;
+
+    const loadingConfig = loading
+        ? {
+              indicator: (
+                  <LoadingWrapper>
+                      <Loading />{' '}
+                  </LoadingWrapper>
+              ),
+          }
+        : false;
+
+    const handleTableChange = (_pagination, _filters, tableSorting) => {
+        if (showPagination && sorting && tableSorting && Object.keys(tableSorting).length) {
+            sorting.setSortField((tableSorting as any).column?.field || null);
+            sorting.setSortOrder((tableSorting as any).order || null);
+        }
+    };
+
+    const tableProps = {
+        dataSource: queries,
+        pagination: pagionationOptions,
+        style: loading ? { minHeight: 400 } : {},
+        loading: loadingConfig,
+        scroll: { x: 'auto' },
+        onChange: handleTableChange,
+    };
+
+    return (
+        <SectionWrapper $borderRadiusBottom={isTopSection}>
+            <QueriesTitleSection>
+                <TitleWrapper>
+                    <QueriesTitle>{title}</QueriesTitle>
+                    {tooltip && (
+                        <Popover content={tooltip} placement={tooltipPosition}>
+                            <StyledInfoOutlined />
+                        </Popover>
+                    )}
+                </TitleWrapper>
+                {section === QueriesTabSection.Popular && (
+                    <FiltersContainer>
+                        <QueryFilters
+                            selectedUsersFilter={selectedUsersFilter}
+                            setSelectedUsersFilter={setSelectedUsersFilter}
+                            selectedColumnsFilter={selectedColumnsFilter}
+                            setSelectedColumnsFilter={setSelectedColumnsFilter}
+                            setPage={setPage}
+                        />
+                    </FiltersContainer>
+                )}
+                {section === QueriesTabSection.Highlighted && (
+                    <AddButton
+                        dataTestId="add-query-button"
+                        buttonLabel="Add Highlighted Query"
+                        isButtonDisabled={addQueryDisabled}
+                        onButtonClick={onAddQuery}
+                    />
+                )}
+            </QueriesTitleSection>
+            {section === QueriesTabSection.Highlighted && (
+                <StyledTable
+                    {...tableProps}
+                    columns={highlightedQueriesColumns}
+                    onRow={(row) => {
+                        return {
+                            onMouseEnter: () => setHoveredQueryUrn((row as Query).urn || ''),
+                            onMouseLeave: () => setHoveredQueryUrn(null),
+                        };
+                    }}
+                />
+            )}
+            {section === QueriesTabSection.Popular && <StyledTable {...tableProps} columns={popularQueriesColumns} />}
+            {section === QueriesTabSection.Downstream && (
+                <StyledTable columns={downstreamQueriesColumns} {...tableProps} />
+            )}
+            {section === QueriesTabSection.Recent && <StyledTable columns={recentQueriesColumns} {...tableProps} />}
+        </SectionWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesTab.tsx
new file mode 100644
index 00000000000000..f5de13329ae042
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueriesTab.tsx
@@ -0,0 +1,207 @@
+import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
+import styled from 'styled-components/macro';
+import React, { useEffect, useState } from 'react';
+import { GetDatasetQuery } from '../../../../../../graphql/dataset.generated';
+import { useBaseEntity } from '../../../../../entity/shared/EntityContext';
+import QueryBuilderModal from './QueryBuilderModal';
+import { addQueryToListQueriesCache, removeQueryFromListQueriesCache, updateListQueriesCache } from './cacheUtils';
+import QueriesListSection from './QueriesListSection';
+import useDownstreamQueries from './useDownstreamQueries';
+import { QueriesTabSection } from './types';
+import { useHighlightedQueries } from './useHighlightedQueries';
+import { usePopularQueries } from './usePopularQueries';
+import { useRecentQueries } from './useRecentQueries';
+import Loading from '../../../../../shared/Loading';
+import { useIsSeparateSiblingsMode } from '../../../../../entity/shared/siblingUtils';
+import usePrevious from '../../../../../shared/usePrevious';
+import EmptyQueriesSection from './EmptyQueriesSection';
+
+const Content = styled.div<{ $backgroundColor: string }>`
+    height: 100%;
+    overflow: auto;
+    display: flex;
+    flex-direction: column;
+    gap: 24px;
+    background-color: ${(props) => props.$backgroundColor};
+`;
+
+export default function QueriesTab() {
+    const isSeparateSiblings = useIsSeparateSiblingsMode();
+    const baseEntity = useBaseEntity<GetDatasetQuery>();
+    const entityUrn = baseEntity?.dataset?.urn;
+    const canEditQueries = baseEntity?.dataset?.privileges?.canEditQueries || false;
+    const siblingUrn = isSeparateSiblings
+        ? undefined
+        : baseEntity?.dataset?.siblingsSearch?.searchResults?.[0]?.entity?.urn;
+
+    const [showQueryBuilder, setShowQueryBuilder] = useState(false);
+    // TODO: implement search filtering properly
+    const [filterText] = useState('');
+    const [hasLoadedInitially, setHasLoadedInitially] = useState(false);
+
+    /**
+     * Fetch the List of Custom (Highlighted) Queries
+     */
+    const {
+        highlightedQueries,
+        client,
+        loading: highlightedQueriesLoading,
+        pagination: highlightedPagination,
+        total: highlightedTotal,
+        sorting: highlightedSorting,
+    } = useHighlightedQueries({ entityUrn, siblingUrn, filterText });
+
+    /**
+     * Fetch the List of Popular Queries
+     */
+    const {
+        popularQueries,
+        loading: popularQueriesLoading,
+        pagination: popularQueriesPagination,
+        total,
+        sorting: popularSorting,
+        selectedUsersFilter,
+        setSelectedUsersFilter,
+        selectedColumnsFilter,
+        setSelectedColumnsFilter,
+    } = usePopularQueries({ entityUrn, siblingUrn, filterText });
+
+    /**
+     * Fetch the List of Downstream Queries
+     */
+    const { downstreamQueries, loading: downstreamQueriesLoading } = useDownstreamQueries(filterText);
+
+    /**
+     * Fetch the List of Recent (auto-extracted) Queries
+     */
+    const { recentQueries, loading: recentQueriesLoading } = useRecentQueries({ entityUrn, siblingUrn, filterText });
+
+    const onQueryCreated = (newQuery) => {
+        addQueryToListQueriesCache(newQuery, client, highlightedPagination.count, entityUrn, siblingUrn);
+        setShowQueryBuilder(false);
+    };
+
+    const onQueryDeleted = (query) => {
+        removeQueryFromListQueriesCache(query.urn, client, 1, highlightedPagination.count, entityUrn, siblingUrn);
+    };
+
+    const onQueryEdited = (query) => {
+        updateListQueriesCache(query.urn, query, client, 1, highlightedPagination.count, entityUrn, siblingUrn);
+    };
+
+    // can add something about initalLoading if there was never data, or have state that is like finishedInitialLoad = false, with useEffect
+    const isLoading =
+        !entityUrn ||
+        highlightedQueriesLoading ||
+        popularQueriesLoading ||
+        downstreamQueriesLoading ||
+        recentQueriesLoading;
+    const showEmptyView =
+        !isLoading &&
+        !recentQueries.length &&
+        !highlightedQueries.length &&
+        !downstreamQueries.length &&
+        !popularQueries.length;
+
+    // shared props with all of the QueriesListSection components below
+    const props = {
+        showDetails: false,
+        showDelete: false,
+        showEdit: false,
+        onDeleted: onQueryDeleted,
+        onEdited: onQueryEdited,
+        selectedUsersFilter,
+        setSelectedUsersFilter,
+        selectedColumnsFilter,
+        setSelectedColumnsFilter,
+    };
+
+    const previousIsLoading = usePrevious(isLoading);
+    useEffect(() => {
+        if (previousIsLoading && !isLoading && !hasLoadedInitially) {
+            setHasLoadedInitially(true);
+        }
+    }, [previousIsLoading, isLoading, hasLoadedInitially]);
+
+    const showLoading = isLoading && !hasLoadedInitially;
+
+    return (
+        <>
+            <Content $backgroundColor={showLoading || showEmptyView ? 'white' : REDESIGN_COLORS.BACKGROUND}>
+                {showLoading && <Loading />}
+                {!showLoading && (
+                    <>
+                        {(highlightedQueries.length > 0 || highlightedQueriesLoading) && (
+                            <QueriesListSection
+                                title="Highlighted Queries"
+                                section={QueriesTabSection.Highlighted}
+                                tooltip="Curated queries relevant to this dataset"
+                                tooltipPosition="bottom"
+                                queries={highlightedQueries}
+                                loading={highlightedQueriesLoading}
+                                totalQueries={highlightedTotal}
+                                pagination={highlightedPagination}
+                                sorting={highlightedSorting}
+                                addQueryDisabled={!canEditQueries}
+                                onAddQuery={() => setShowQueryBuilder(true)}
+                                isTopSection
+                                {...props}
+                            />
+                        )}
+                        {highlightedQueries.length === 0 && !highlightedQueriesLoading && (
+                            <EmptyQueriesSection
+                                sectionName="Highlighted Queries"
+                                tooltip="Curated queries relevant to this dataset"
+                                tooltipPosition="bottom"
+                                showButton
+                                buttonLabel="Add Highlighted Query"
+                                isButtonDisabled={!canEditQueries}
+                                onButtonClick={() => setShowQueryBuilder(true)}
+                            />
+                        )}
+                        {(popularQueries.length > 0 || popularQueriesLoading) && (
+                            <QueriesListSection
+                                title="Popular Queries"
+                                section={QueriesTabSection.Popular}
+                                tooltip="The most popular queries that were run against this dataset"
+                                queries={popularQueries}
+                                loading={popularQueriesLoading}
+                                totalQueries={total}
+                                pagination={popularQueriesPagination}
+                                sorting={popularSorting}
+                                {...props}
+                            />
+                        )}
+                        {downstreamQueries.length > 0 && (
+                            <QueriesListSection
+                                title="Downstream Queries"
+                                section={QueriesTabSection.Downstream}
+                                tooltip="Queries that power downstream assets"
+                                queries={downstreamQueries}
+                                totalQueries={downstreamQueries.length}
+                                {...props}
+                            />
+                        )}
+                        {recentQueries.length > 0 && (
+                            <QueriesListSection
+                                title="Recent Queries"
+                                section={QueriesTabSection.Recent}
+                                tooltip="Recently executed queries against this dataset"
+                                queries={recentQueries}
+                                totalQueries={recentQueries.length}
+                                {...props}
+                            />
+                        )}
+                    </>
+                )}
+            </Content>
+            {showQueryBuilder && (
+                <QueryBuilderModal
+                    datasetUrn={baseEntity.dataset?.urn}
+                    onClose={() => setShowQueryBuilder(false)}
+                    onSubmit={onQueryCreated}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/Query.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/Query.tsx
new file mode 100644
index 00000000000000..40c0819c9cbfed
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/Query.tsx
@@ -0,0 +1,81 @@
+import React, { useState } from 'react';
+import QueryModal from './QueryModal';
+import QueryBuilderModal from './QueryBuilderModal';
+import QueryCard from './QueryCard';
+
+export type Props = {
+    urn?: string;
+    query: string;
+    title?: string;
+    description?: string;
+    createdAtMs?: number;
+    showDelete?: boolean;
+    showEdit?: boolean;
+    showDetails?: boolean;
+    showHeader?: boolean;
+    onDeleted?: () => void;
+    onEdited?: (query) => void;
+    index?: number;
+    isCompact?: boolean;
+};
+
+export default function Query({
+    urn,
+    query,
+    title,
+    description,
+    createdAtMs,
+    showDelete,
+    showEdit,
+    showDetails = true,
+    showHeader = true,
+    onDeleted,
+    onEdited,
+    index,
+    isCompact,
+}: Props) {
+    const [showQueryModal, setShowQueryModal] = useState(false);
+    const [showEditQueryModal, setShowEditQueryModal] = useState(false);
+
+    const onEditSubmitted = (newQuery) => {
+        setShowEditQueryModal(false);
+        onEdited?.(newQuery);
+    };
+
+    return (
+        <React.Fragment key={index}>
+            <QueryCard
+                urn={urn}
+                query={query}
+                title={title}
+                description={description}
+                createdAtMs={createdAtMs}
+                showEdit={showEdit}
+                showDelete={showDelete}
+                showDetails={showDetails}
+                showHeader={showHeader}
+                onClickEdit={() => setShowEditQueryModal(true)}
+                onClickExpand={() => setShowQueryModal(true)}
+                onDeleted={onDeleted}
+                index={index}
+                isCompact={isCompact}
+            />
+            {showQueryModal && (
+                <QueryModal
+                    query={query}
+                    title={title}
+                    description={description}
+                    onClose={() => setShowQueryModal(false)}
+                    showDetails={showDetails}
+                />
+            )}
+            {showEditQueryModal && (
+                <QueryBuilderModal
+                    initialState={{ urn: urn as string, title, description, query }}
+                    onSubmit={onEditSubmitted}
+                    onClose={() => setShowEditQueryModal(false)}
+                />
+            )}
+        </React.Fragment>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderForm.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderForm.tsx
new file mode 100644
index 00000000000000..d44fb3a7cc6f12
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderForm.tsx
@@ -0,0 +1,94 @@
+import React from 'react';
+import Editor from '@monaco-editor/react';
+import styled from 'styled-components';
+import { Form, Input, Typography } from 'antd';
+import { ANTD_GRAY } from '../../../constants';
+import { QueryBuilderState } from './types';
+import { Editor as MarkdownEditor } from '../../Documentation/components/editor/Editor';
+
+const EditorWrapper = styled.div`
+    border: 1px solid ${ANTD_GRAY[5]};
+    border-radius: 1px;
+    background-color: ${ANTD_GRAY[2]};
+`;
+
+const StyledEditor = styled(MarkdownEditor)`
+    border: 1px solid ${ANTD_GRAY[4.5]};
+`;
+
+const QUERY_EDITOR_HEIGHT = '240px';
+
+const QUERY_EDITOR_OPTIONS = {
+    minimap: { enabled: false },
+    scrollbar: {
+        vertical: 'hidden',
+        horizontal: 'hidden',
+    },
+} as any;
+
+type Props = {
+    state: QueryBuilderState;
+    updateState: (newState: QueryBuilderState) => void;
+};
+
+export default function QueryBuilderForm({ state, updateState }: Props) {
+    const updateQuery = (query) => {
+        updateState({
+            ...state,
+            query,
+        });
+    };
+
+    const updateTitle = (title) => {
+        updateState({
+            ...state,
+            title,
+        });
+    };
+
+    const updateDescription = (description) => {
+        console.log(description);
+        updateState({
+            ...state,
+            description,
+        });
+    };
+
+    return (
+        <Form layout="vertical">
+            <Form.Item required label={<Typography.Text strong>Query</Typography.Text>}>
+                <EditorWrapper>
+                    <Editor
+                        options={QUERY_EDITOR_OPTIONS}
+                        height={QUERY_EDITOR_HEIGHT}
+                        defaultLanguage="sql"
+                        value={state.query}
+                        onChange={updateQuery}
+                        className="query-builder-editor-input"
+                    />
+                </EditorWrapper>
+            </Form.Item>
+            <Form.Item
+                rules={[{ min: 1, max: 500 }]}
+                hasFeedback
+                label={<Typography.Text strong>Title</Typography.Text>}
+            >
+                <Input
+                    data-testid="query-builder-title-input"
+                    autoFocus
+                    value={state.title}
+                    onChange={(newTitle) => updateTitle(newTitle.target.value)}
+                    placeholder="Join Transactions and Users Tables"
+                />
+            </Form.Item>
+            <Form.Item label={<Typography.Text strong>Description</Typography.Text>}>
+                <StyledEditor
+                    data-testid="query-builder-description-input"
+                    doNotFocus
+                    content={state.description}
+                    onChange={updateDescription}
+                />
+            </Form.Item>
+        </Form>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx
new file mode 100644
index 00000000000000..33f9652bb3fd39
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx
@@ -0,0 +1,173 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { Button, message, Modal, Typography } from 'antd';
+import { useCreateQueryMutation, useUpdateQueryMutation } from '../../../../../../graphql/query.generated';
+import { QueryLanguage } from '../../../../../../types.generated';
+import { QueryBuilderState } from './types';
+import ClickOutside from '../../../../../shared/ClickOutside';
+import QueryBuilderForm from './QueryBuilderForm';
+import analytics, { EventType } from '../../../../../analytics';
+
+const StyledModal = styled(Modal)`
+    top: 4vh;
+    max-width: 1200px;
+`;
+
+const MODAL_WIDTH = '80vw';
+
+const MODAL_BODY_STYLE = {
+    height: '74vh',
+    overflow: 'auto',
+};
+
+const PLACEHOLDER_QUERY = `-- SELECT sum(price)
+-- FROM transactions
+-- WHERE user_id = "john_smith"
+--  AND product_id IN [1, 2, 3]`;
+
+const DEFAULT_STATE = {
+    query: PLACEHOLDER_QUERY,
+};
+
+type Props = {
+    initialState?: QueryBuilderState;
+    datasetUrn?: string;
+    onClose?: () => void;
+    onSubmit?: (newQuery: any) => void;
+};
+
+export default function QueryBuilderModal({ initialState, datasetUrn, onClose, onSubmit }: Props) {
+    const isUpdating = initialState?.urn !== undefined;
+
+    const [builderState, setBuilderState] = useState<QueryBuilderState>(initialState || DEFAULT_STATE);
+    const [createQueryMutation] = useCreateQueryMutation();
+    const [updateQueryMutation] = useUpdateQueryMutation();
+
+    const createQuery = () => {
+        if (datasetUrn) {
+            createQueryMutation({
+                variables: {
+                    input: {
+                        properties: {
+                            name: builderState.title,
+                            description: builderState.description,
+                            statement: {
+                                value: builderState.query as string,
+                                language: QueryLanguage.Sql,
+                            },
+                        },
+                        subjects: [{ datasetUrn }],
+                    },
+                },
+            })
+                .then(({ data, errors }) => {
+                    if (!errors) {
+                        analytics.event({
+                            type: EventType.CreateQueryEvent,
+                        });
+                        message.success({
+                            content: `Created Query!`,
+                            duration: 3,
+                        });
+                        onSubmit?.(data?.createQuery);
+                        setBuilderState(DEFAULT_STATE);
+                    }
+                })
+                .catch(() => {
+                    message.destroy();
+                    message.error({ content: 'Failed to create Query! An unexpected error occurred' });
+                });
+        }
+    };
+
+    const updateQuery = () => {
+        if (initialState) {
+            updateQueryMutation({
+                variables: {
+                    urn: initialState?.urn as string,
+                    input: {
+                        properties: {
+                            name: builderState.title,
+                            description: builderState.description,
+                            statement: {
+                                value: builderState.query as string,
+                                language: QueryLanguage.Sql,
+                            },
+                        },
+                    },
+                },
+            })
+                .then(({ data, errors }) => {
+                    if (!errors) {
+                        analytics.event({
+                            type: EventType.UpdateQueryEvent,
+                        });
+                        message.success({
+                            content: `Edited Query!`,
+                            duration: 3,
+                        });
+                        onSubmit?.(data?.updateQuery);
+                        setBuilderState(DEFAULT_STATE);
+                    }
+                })
+                .catch(() => {
+                    message.destroy();
+                    message.error({ content: 'Failed to edit Query! An unexpected error occurred' });
+                });
+        }
+    };
+
+    const saveQuery = () => {
+        if (isUpdating) {
+            updateQuery();
+        } else {
+            createQuery();
+        }
+    };
+
+    const confirmClose = () => {
+        Modal.confirm({
+            title: `Exit Query Editor`,
+            content: `Are you sure you want to exit the editor? Any unsaved changes will be lost.`,
+            onOk() {
+                setBuilderState(DEFAULT_STATE);
+                onClose?.();
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
+    return (
+        <ClickOutside onClickOutside={confirmClose} wrapperClassName="query-builder-modal">
+            <StyledModal
+                width={MODAL_WIDTH}
+                bodyStyle={MODAL_BODY_STYLE}
+                title={<Typography.Text>{isUpdating ? 'Edit' : 'New'} Query</Typography.Text>}
+                className="query-builder-modal"
+                visible
+                onCancel={confirmClose}
+                footer={
+                    <>
+                        <Button onClick={onClose} data-testid="query-builder-cancel-button" type="text">
+                            Cancel
+                        </Button>
+                        <Button
+                            id="createQueryButton"
+                            data-testid="query-builder-save-button"
+                            onClick={saveQuery}
+                            type="primary"
+                        >
+                            Save
+                        </Button>
+                    </>
+                }
+                data-testid="query-builder-modal"
+            >
+                <QueryBuilderForm state={builderState} updateState={setBuilderState} />
+            </StyledModal>
+        </ClickOutside>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCard.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCard.tsx
new file mode 100644
index 00000000000000..4f8444016b8ec7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCard.tsx
@@ -0,0 +1,79 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../constants';
+import QueryCardHeader from './QueryCardHeader';
+import QueryCardQuery from './QueryCardQuery';
+import QueryCardDetails from './QueryCardDetails';
+
+const Card = styled.div<{ isCompact?: boolean }>`
+    border: 1px solid ${ANTD_GRAY[5]};
+    border-radius: 4px;
+    box-shadow: ${(props) => props.theme.styles['box-shadow']};
+    max-width: 450px;
+
+    ${(props) => !props.isCompact && `height: 380px;`}
+    ${(props) => props.isCompact && `max-width: 650px;`}
+`;
+
+export type Props = {
+    urn?: string;
+    query: string;
+    title?: string;
+    description?: string;
+    createdAtMs?: number;
+    showDelete?: boolean;
+    showEdit?: boolean;
+    showDetails?: boolean;
+    showHeader?: boolean;
+    onDeleted?: () => void;
+    onClickExpand?: () => void;
+    onClickEdit?: () => void;
+    index?: number;
+    isCompact?: boolean;
+};
+
+export default function QueryCard({
+    urn,
+    query,
+    title,
+    description,
+    createdAtMs,
+    showDelete,
+    showEdit,
+    showDetails = true,
+    showHeader = true,
+    onDeleted,
+    onClickExpand,
+    onClickEdit,
+    index,
+    isCompact,
+}: Props) {
+    const [focused, setFocused] = useState(false);
+
+    return (
+        <Card onMouseEnter={() => setFocused(true)} onMouseLeave={() => setFocused(false)} isCompact={isCompact}>
+            {showHeader && <QueryCardHeader query={query} focused={focused} onClickExpand={onClickExpand} />}
+            <QueryCardQuery
+                query={query}
+                showDetails={showDetails}
+                onClickExpand={onClickExpand}
+                index={index}
+                isCompact={isCompact}
+            />
+            {showDetails && (
+                <QueryCardDetails
+                    urn={urn}
+                    title={title}
+                    description={description}
+                    createdAtMs={createdAtMs}
+                    showEdit={showEdit}
+                    showDelete={showDelete}
+                    onDeleted={onDeleted}
+                    onClickEdit={onClickEdit}
+                    onClickExpand={onClickExpand}
+                    index={index}
+                />
+            )}
+        </Card>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetails.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetails.tsx
new file mode 100644
index 00000000000000..90a7a9ba402985
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetails.tsx
@@ -0,0 +1,133 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { ANTD_GRAY } from '../../../constants';
+import { toLocalDateString } from '../../../../../shared/time/timeUtils';
+import NoMarkdownViewer from '../../../components/styled/StripMarkdownText';
+import QueryCardDetailsMenu from './QueryCardDetailsMenu';
+import QueryCardEditButton from './QueryCardEditButton';
+
+const Title = styled(Typography.Title)<{ secondary?: boolean }>`
+    && {
+        margin: 0px;
+        padding: 0px;
+        color: ${(props) => (props.secondary && ANTD_GRAY[6]) || ANTD_GRAY[9]};
+    }
+    max-height: 40px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+`;
+
+const Details = styled.div`
+    padding: 0px 20px 0px 20px;
+`;
+
+const Header = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    white-space: nowrap;
+`;
+
+const Actions = styled.div`
+    flex-wrap: nowrap;
+`;
+
+const EditQueryAction = styled.span`
+    && {
+        margin: 0px;
+        padding: 0px;
+        margin-left: 4px;
+    }
+`;
+
+const Description = styled.div`
+    margin-bottom: 16px;
+    height: 52px;
+    overflow: auto;
+`;
+
+const MoreButton = styled.span`
+    :hover {
+        cursor: pointer;
+    }
+    font-weight: bold;
+`;
+
+const Date = styled.div`
+    display: flex;
+    justify-content: right;
+    align-items: center;
+`;
+
+const EmptyText = styled.div`
+    && {
+        color: ${ANTD_GRAY[6]};
+    }
+`;
+
+export type Props = {
+    urn?: string;
+    title?: string;
+    description?: string;
+    createdAtMs?: number;
+    showDelete?: boolean;
+    showEdit?: boolean;
+    onDeleted?: (urn) => void;
+    onClickExpand?: () => void;
+    onClickEdit?: () => void;
+    index?: number;
+};
+
+export default function QueryCardDetails({
+    urn,
+    title,
+    description,
+    createdAtMs,
+    showDelete,
+    showEdit,
+    onClickExpand,
+    onClickEdit,
+    onDeleted,
+    index,
+}: Props) {
+    return (
+        <Details>
+            <Header>
+                <Title secondary={!title} level={5}>
+                    {title || 'No title'}
+                </Title>
+                <Actions>
+                    {showEdit && (
+                        <EditQueryAction>
+                            <QueryCardEditButton onClickEdit={onClickEdit} index={index} />
+                        </EditQueryAction>
+                    )}
+                    {showDelete && urn && (
+                        <EditQueryAction>
+                            <QueryCardDetailsMenu urn={urn} onDeleted={onDeleted} index={index} />
+                        </EditQueryAction>
+                    )}
+                </Actions>
+            </Header>
+            <Description>
+                {(description && (
+                    <NoMarkdownViewer
+                        shouldWrap
+                        limit={200}
+                        readMore={<MoreButton onClick={onClickExpand}>more</MoreButton>}
+                    >
+                        {description}
+                    </NoMarkdownViewer>
+                )) || <EmptyText>No description</EmptyText>}
+            </Description>
+            <Date>
+                {(createdAtMs && (
+                    <Typography.Text type="secondary">Created on {toLocalDateString(createdAtMs)}</Typography.Text>
+                )) ||
+                    undefined}
+            </Date>
+        </Details>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx
new file mode 100644
index 00000000000000..d17f0d12b3cf31
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx
@@ -0,0 +1,65 @@
+import React from 'react';
+import styled from 'styled-components';
+import { DeleteOutlined, MoreOutlined } from '@ant-design/icons';
+import { Dropdown, Menu, message, Modal } from 'antd';
+import { useDeleteQueryMutation } from '../../../../../../graphql/query.generated';
+
+const StyledMoreOutlined = styled(MoreOutlined)`
+    font-size: 14px;
+`;
+
+export type Props = {
+    urn: string;
+    onDeleted?: (urn: string) => void;
+    index?: number;
+};
+
+export default function QueryCardDetailsMenu({ urn, onDeleted, index }: Props) {
+    const [deleteQueryMutation] = useDeleteQueryMutation();
+
+    const deleteQuery = () => {
+        deleteQueryMutation({ variables: { urn } })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.success({
+                        content: `Deleted Query!`,
+                        duration: 3,
+                    });
+                    onDeleted?.(urn);
+                }
+            })
+            .catch(() => {
+                message.destroy();
+                message.error({ content: 'Failed to delete Query! An unexpected error occurred' });
+            });
+    };
+
+    const confirmDeleteQuery = () => {
+        Modal.confirm({
+            title: `Delete Query`,
+            content: `Are you sure you want to delete this query?`,
+            onOk() {
+                deleteQuery();
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
+    return (
+        <Dropdown
+            overlay={
+                <Menu>
+                    <Menu.Item key="0" onClick={confirmDeleteQuery} data-testid={`query-delete-button-${index}`}>
+                        <DeleteOutlined /> &nbsp; Delete
+                    </Menu.Item>
+                </Menu>
+            }
+            trigger={['click']}
+        >
+            <StyledMoreOutlined data-testid={`query-more-button-${index}`} />
+        </Dropdown>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx
new file mode 100644
index 00000000000000..d0ebf23a40684f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import styled from 'styled-components';
+import { EditOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+
+const EditQueryActionButton = styled(Button)`
+    && {
+        margin: 0px;
+        padding: 0px 4px 0px 4px;
+    }
+`;
+
+export type Props = {
+    onClickEdit?: () => void;
+    index?: number;
+};
+
+export default function QueryCardEditButton({ onClickEdit, index }: Props) {
+    return (
+        <EditQueryActionButton type="text" onClick={onClickEdit} data-testid={`query-edit-button-${index}`}>
+            <EditOutlined />
+        </EditQueryActionButton>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardHeader.tsx
new file mode 100644
index 00000000000000..d605830b700c74
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardHeader.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import styled from 'styled-components';
+import { ExpandOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+import CopyQuery from './CopyQuery';
+
+const Header = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: right;
+`;
+
+const Actions = styled.div<{ opacity?: number }>`
+    padding: 0px;
+    height: 0px;
+    transform: translate(-12px, 12px);
+    opacity: ${(props) => props.opacity || 1.0};
+`;
+
+const ExpandButton = styled(Button)`
+    margin-left: 8px;
+`;
+
+export type Props = {
+    query: string;
+    focused: boolean;
+    onClickExpand?: (newQuery) => void;
+};
+
+export default function QueryCardHeader({ query, focused, onClickExpand }: Props) {
+    return (
+        <Header>
+            <Actions opacity={(!focused && 0.3) || 1.0}>
+                <CopyQuery query={query} />
+                <ExpandButton onClick={onClickExpand}>
+                    <ExpandOutlined />
+                </ExpandButton>
+            </Actions>
+        </Header>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardQuery.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardQuery.tsx
new file mode 100644
index 00000000000000..14da5cf9d9c1ca
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardQuery.tsx
@@ -0,0 +1,64 @@
+import React from 'react';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../constants';
+import { StyledSyntaxHighlighter } from '../../../StyledSyntaxHighlighter';
+
+const Statement = styled.div<{ fullHeight?: boolean; isCompact?: boolean }>`
+    background-color: ${ANTD_GRAY[2]};
+    height: ${(props) => (props.fullHeight && '378px') || '240px'};
+    margin: 0px 0px 4px 0px;
+    border-radius: 8px;
+    :hover {
+        cursor: pointer;
+    }
+    overflow: auto !important;
+
+    ${(props) =>
+        props.isCompact &&
+        `
+        height: 55px;
+        overflow: hidden !important;
+        margin: 0;
+    `}
+`;
+
+const NestedSyntax = styled(StyledSyntaxHighlighter)<{ isCompact?: boolean }>`
+    background-color: transparent !important;
+    border: none !important;
+    margin: 0px !important;
+    height: 100% !important;
+    overflow: auto !important;
+    ::-webkit-scrollbar {
+        display: none;
+    } !important;
+
+    ${(props) =>
+        props.isCompact &&
+        `
+        overflow: hidden !important;
+    `}
+`;
+
+export type Props = {
+    query: string;
+    showDetails: boolean;
+    onClickExpand?: (newQuery) => void;
+    index?: number;
+    isCompact?: boolean;
+};
+
+export default function QueryCardQuery({ query, showDetails, onClickExpand, index, isCompact }: Props) {
+    return (
+        <Statement
+            fullHeight={!showDetails}
+            onClick={onClickExpand}
+            data-testid={`query-content-${index}`}
+            isCompact={isCompact}
+        >
+            <NestedSyntax showLineNumbers language="sql" isCompact={isCompact}>
+                {query}
+                {query}
+            </NestedSyntax>
+        </Statement>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/QueryFilters.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/QueryFilters.tsx
new file mode 100644
index 00000000000000..1467e58b9d5f4c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/QueryFilters.tsx
@@ -0,0 +1,106 @@
+import React from 'react';
+import styled from 'styled-components';
+import { FilterPredicate } from '../../../../../../searchV2/filters/types';
+import { convertToAvailableFilterPredictes } from '../../../../../../searchV2/filters/utils';
+import { FacetFilterInput } from '../../../../../../../types.generated';
+import SearchFilter from '../../../../../../searchV2/filters/SearchFilter';
+import SelectedSearchFilters from '../../../../../../searchV2/filters/SelectedSearchFilters';
+import { UnionType } from '../../../../../../searchV2/utils/constants';
+import { ANTD_GRAY_V2, REDESIGN_COLORS } from '../../../../constants';
+import useUsersFilter from './useUsersFilter';
+import useColumnsFilter from './useColumnsFilter';
+
+const ColumnsFilterWrapper = styled.div`
+    align-items: flex-end;
+    display: flex;
+    flex-direction: column;
+    gap: 6px;
+`;
+
+const FiltersWrapper = styled.div`
+    display: flex;
+    gap: 8px;
+`;
+
+interface Props {
+    selectedColumnsFilter: FacetFilterInput;
+    setSelectedColumnsFilter: (columnsFilter: FacetFilterInput) => void;
+    selectedUsersFilter: FacetFilterInput;
+    setSelectedUsersFilter: (usersFilter: FacetFilterInput) => void;
+    setPage: (c: number) => void;
+}
+
+export default function QueryFilters({
+    selectedColumnsFilter,
+    setSelectedColumnsFilter,
+    setSelectedUsersFilter,
+    selectedUsersFilter,
+    setPage,
+}: Props) {
+    const onChangeFilters = (newFilters: FacetFilterInput[]) => {
+        const usedByFilter = newFilters.find((f) => f.field === 'topUsersLast30DaysFeature');
+        if (usedByFilter) {
+            setSelectedUsersFilter(usedByFilter);
+        } else {
+            setSelectedUsersFilter({ field: 'topUsersLast30DaysFeature', values: [] });
+        }
+
+        const columnsFilter = newFilters.find((f) => f.field === 'entities');
+        if (columnsFilter) {
+            setSelectedColumnsFilter(columnsFilter);
+        } else {
+            setSelectedColumnsFilter({ field: 'entities', values: [] });
+        }
+
+        setPage(1);
+    };
+
+    const usersFilter = useUsersFilter({ selectedColumnsFilter, selectedUsersFilter });
+    const columnsFilter = useColumnsFilter({ selectedColumnsFilter, selectedUsersFilter, setSelectedColumnsFilter });
+
+    const filterPredicates: FilterPredicate[] = convertToAvailableFilterPredictes(
+        [selectedUsersFilter, selectedColumnsFilter],
+        [usersFilter, columnsFilter],
+    );
+    let selectedFilters: FacetFilterInput[] = selectedColumnsFilter.values?.length ? [selectedColumnsFilter] : [];
+    selectedFilters = selectedUsersFilter.values?.length ? [...selectedFilters, selectedUsersFilter] : selectedFilters;
+
+    const labelStyle = {
+        backgroundColor: ANTD_GRAY_V2[15],
+        border: `1px solid ${REDESIGN_COLORS.COLD_GREY_TEXT_BLUE_1}`,
+    };
+
+    return (
+        <ColumnsFilterWrapper>
+            <FiltersWrapper>
+                <SearchFilter
+                    filter={columnsFilter}
+                    filterPredicates={filterPredicates}
+                    onChangeFilters={onChangeFilters}
+                    activeFilters={[selectedColumnsFilter, selectedUsersFilter]}
+                    labelStyle={selectedColumnsFilter.values?.length ? undefined : labelStyle}
+                />
+                <SearchFilter
+                    filter={usersFilter}
+                    filterPredicates={filterPredicates}
+                    onChangeFilters={onChangeFilters}
+                    activeFilters={[selectedUsersFilter, selectedColumnsFilter]}
+                    labelStyle={selectedUsersFilter.values?.length ? undefined : labelStyle}
+                />
+            </FiltersWrapper>
+            <SelectedSearchFilters
+                availableFilters={[columnsFilter, usersFilter]}
+                selectedFilters={selectedFilters}
+                unionType={UnionType.AND}
+                onChangeFilters={onChangeFilters}
+                onChangeUnionType={() => {}}
+                onClearFilters={() => {}}
+                showUnionType={false}
+                showAddFilter={false}
+                showClearAll={false}
+                isCompact
+                isOperatorDisabled
+            />
+        </ColumnsFilterWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/useColumnsFilter.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/useColumnsFilter.ts
new file mode 100644
index 00000000000000..015d71d42cd15f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/useColumnsFilter.ts
@@ -0,0 +1,83 @@
+import { useEffect, useMemo } from 'react';
+import { getSourceUrnFromSchemaFieldUrn } from '@src/app/entityV2/schemaField/utils';
+import { useEntityData } from '../../../../../../entity/shared/EntityContext';
+import { EntityType, FacetFilterInput, QuerySource } from '../../../../../../../types.generated';
+import { useAggregateAcrossEntitiesQuery } from '../../../../../../../graphql/search.generated';
+import { getV1FieldPathFromSchemaFieldUrn } from '../../../../../../lineageV2/lineageUtils';
+import { getAndFilters } from '../utils/filterQueries';
+
+interface Props {
+    selectedColumnsFilter: FacetFilterInput;
+    selectedUsersFilter: FacetFilterInput;
+    setSelectedColumnsFilter: (columnsFilter: FacetFilterInput) => void;
+}
+
+export default function useColumnsFilter({
+    selectedColumnsFilter,
+    selectedUsersFilter,
+    setSelectedColumnsFilter,
+}: Props) {
+    const { entityData } = useEntityData();
+    const entityUrn = entityData?.urn;
+    const siblingUrn = entityData?.siblingsSearch?.searchResults?.[0]?.entity?.urn;
+
+    const values = siblingUrn ? [entityUrn as string, siblingUrn] : [entityUrn as string];
+    const entityFilter = { field: 'entities', values };
+    const sourceFilter = { field: 'source', values: [QuerySource.System] };
+    const andFilters = getAndFilters({ ...selectedColumnsFilter, values: [] }, selectedUsersFilter, [
+        entityFilter,
+        sourceFilter,
+    ]);
+    const { data } = useAggregateAcrossEntitiesQuery({
+        variables: {
+            input: {
+                facets: ['entities'],
+                query: '*',
+                types: [EntityType.Query],
+                orFilters: [{ and: andFilters }],
+                searchFlags: {
+                    maxAggValues: 100,
+                },
+            },
+        },
+        skip: !entityUrn,
+    });
+
+    const aggregations = data?.aggregateAcrossEntities?.facets?.find(
+        (facet) => facet.field === 'entities',
+    )?.aggregations;
+
+    const columnAggregations = useMemo(
+        () =>
+            aggregations
+                ?.filter((agg) => agg.entity?.type === EntityType.SchemaField)
+                ?.filter((agg) => {
+                    const schemaFieldSourceUrn = getSourceUrnFromSchemaFieldUrn(agg.entity?.urn || '');
+                    return schemaFieldSourceUrn === entityUrn || schemaFieldSourceUrn === siblingUrn;
+                })
+                ?.map((agg) => ({
+                    value: agg.entity?.urn || '',
+                    displayName: agg.entity?.urn ? getV1FieldPathFromSchemaFieldUrn(agg.entity.urn) : '',
+                    count: agg.count,
+                }))
+                ?.sort((aggA, aggB) => aggB.count - aggA.count) || [],
+        [aggregations, entityUrn, siblingUrn],
+    );
+
+    useEffect(() => {
+        // if we get a selected column that doesn't exist in our aggregations, remove it.
+        // this can happen with sibling schema field urns passed in from query params
+        if (selectedColumnsFilter && columnAggregations && columnAggregations.length) {
+            const currentSelectedValues = selectedColumnsFilter.values;
+            const existingValues = columnAggregations.map((agg) => agg.value);
+            const existingSelectedValues = currentSelectedValues?.filter((v) => existingValues.includes(v));
+            if (currentSelectedValues?.length !== existingSelectedValues?.length) {
+                setSelectedColumnsFilter({ ...selectedColumnsFilter, values: existingSelectedValues });
+            }
+        }
+    }, [selectedColumnsFilter, columnAggregations, setSelectedColumnsFilter]);
+
+    const columnsFilter = { aggregations: columnAggregations, displayName: 'Columns', field: 'entities' };
+
+    return columnsFilter;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/useUsersFilter.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/useUsersFilter.ts
new file mode 100644
index 00000000000000..40074b7d01dc16
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryFilters/useUsersFilter.ts
@@ -0,0 +1,56 @@
+import { useEntityRegistryV2 } from '../../../../../../useEntityRegistry';
+import { useEntityData } from '../../../../../../entity/shared/EntityContext';
+import { EntityType, FacetFilterInput, QuerySource } from '../../../../../../../types.generated';
+import { useAggregateAcrossEntitiesQuery } from '../../../../../../../graphql/search.generated';
+import { getAndFilters } from '../utils/filterQueries';
+
+interface Props {
+    selectedColumnsFilter: FacetFilterInput;
+    selectedUsersFilter: FacetFilterInput;
+}
+
+export default function useUsersFilter({ selectedColumnsFilter, selectedUsersFilter }: Props) {
+    const entityRegistry = useEntityRegistryV2();
+    const { entityData } = useEntityData();
+    const entityUrn = entityData?.urn;
+    const siblingUrn = entityData?.siblingsSearch?.searchResults?.[0]?.entity?.urn;
+
+    const values = siblingUrn ? [entityUrn as string, siblingUrn] : [entityUrn as string];
+    const entityFilter = { field: 'entities', values };
+    const sourceFilter = { field: 'source', values: [QuerySource.System] };
+    const andFilters = getAndFilters(selectedColumnsFilter, { ...selectedUsersFilter, values: [] }, [
+        entityFilter,
+        sourceFilter,
+    ]);
+    const { data } = useAggregateAcrossEntitiesQuery({
+        variables: {
+            input: {
+                facets: ['topUsersLast30DaysFeature'],
+                query: '*',
+                types: [EntityType.Query],
+                orFilters: [{ and: andFilters }],
+                searchFlags: {
+                    maxAggValues: 100,
+                },
+            },
+        },
+        skip: !entityUrn,
+    });
+
+    const aggregations = data?.aggregateAcrossEntities?.facets?.find(
+        (facet) => facet.field === 'topUsersLast30DaysFeature',
+    )?.aggregations;
+
+    const userAggregations =
+        aggregations
+            ?.map((agg) => ({
+                value: agg.entity?.urn || agg.value,
+                displayName: agg.entity?.urn ? entityRegistry.getDisplayName(agg.entity.type, agg.entity) : agg.value,
+                count: agg.count,
+            }))
+            ?.sort((aggA, aggB) => aggB.count - aggA.count) || [];
+
+    const usersFilter = { aggregations: userAggregations, displayName: 'Users', field: 'topUsersLast30DaysFeature' };
+
+    return usersFilter;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryModal.tsx
new file mode 100644
index 00000000000000..981cc339ad09dc
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryModal.tsx
@@ -0,0 +1,107 @@
+import React from 'react';
+import { Button, Modal, Typography } from 'antd';
+import styled from 'styled-components';
+import CopyQuery from './CopyQuery';
+import { ANTD_GRAY } from '../../../constants';
+import { Editor as MarkdownEditor } from '../../Documentation/components/editor/Editor';
+import { StyledSyntaxHighlighter } from '../../../StyledSyntaxHighlighter';
+
+const StyledModal = styled(Modal)`
+    top: 4vh;
+    max-width: 1200px;
+`;
+
+const MODAL_WIDTH = '80vw';
+
+const MODAL_BODY_STYLE = {
+    maxHeight: '84vh',
+    padding: 0,
+    overflow: 'auto',
+};
+
+const QueryActions = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: end;
+    width: 100%;
+    height: 0px;
+    transform: translate(-24px, 32px);
+`;
+
+const QueryDetails = styled.div`
+    padding: 28px 28px 28px 28px;
+`;
+
+const QueryTitle = styled(Typography.Title)<{ secondary?: boolean }>`
+    && {
+        margin-bottom: 16px;
+        color: ${(props) => (props.secondary && ANTD_GRAY[6]) || undefined};
+    }
+`;
+
+const StyledViewer = styled(MarkdownEditor)<{ secondary?: boolean }>`
+    .remirror-editor.ProseMirror {
+        padding: 0;
+        color: ${(props) => (props.secondary && ANTD_GRAY[6]) || undefined};
+    }
+`;
+
+const QueryContainer = styled.div`
+    min-height: 50vh;
+    max-height: 80vh;
+    overflow-y: scroll;
+    background-color: ${ANTD_GRAY[2]};
+    border-radius: 4px;
+`;
+
+const NestedSyntax = styled(StyledSyntaxHighlighter)`
+    background-color: transparent !important;
+    border: none !important;
+    height: 100% !important;
+    margin: 0px !important;
+    padding: 12px !important;
+`;
+
+type Props = {
+    query: string;
+    title?: string;
+    description?: string;
+    onClose?: () => void;
+    showDetails?: boolean;
+};
+
+export default function QueryModal({ query, title, description, showDetails = true, onClose }: Props) {
+    return (
+        <StyledModal
+            visible
+            width={MODAL_WIDTH}
+            title={null}
+            closable={false}
+            onCancel={onClose}
+            bodyStyle={MODAL_BODY_STYLE}
+            data-testid="query-modal"
+            footer={
+                <Button onClick={onClose} type="text" data-testid="query-modal-close-button">
+                    Close
+                </Button>
+            }
+        >
+            <QueryActions>
+                <CopyQuery query={query} showCopyText />
+            </QueryActions>
+            <QueryContainer>
+                <NestedSyntax data-testid="query-modal-query" showLineNumbers language="sql">
+                    {query}
+                </NestedSyntax>
+            </QueryContainer>
+            {showDetails && (
+                <QueryDetails>
+                    <QueryTitle level={4} secondary={!title}>
+                        {title || 'No title'}
+                    </QueryTitle>
+                    <StyledViewer readOnly secondary={!title} content={description || 'No description'} />
+                </QueryDetails>
+            )}
+        </StyledModal>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/cacheUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/cacheUtils.ts
new file mode 100644
index 00000000000000..01e11342d76321
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/cacheUtils.ts
@@ -0,0 +1,139 @@
+import { ListQueriesDocument, ListQueriesQuery } from '../../../../../../graphql/query.generated';
+import { QueryEntity, QuerySource } from '../../../../../../types.generated';
+import { getQueryEntitiesFilter } from './utils/filterQueries';
+
+export const removeQueryFromListQueriesCache = (urn, client, page, pageSize, datasetUrn, siblingUrn) => {
+    const entityFilter = getQueryEntitiesFilter(datasetUrn, siblingUrn);
+    const currData: ListQueriesQuery | null = client.readQuery({
+        query: ListQueriesDocument,
+        variables: {
+            input: {
+                start: (page - 1) * pageSize,
+                count: pageSize,
+                orFilters: [{ and: [entityFilter] }],
+                source: QuerySource.Manual,
+            },
+        },
+    });
+
+    const newQueries = [...(currData?.listQueries?.queries || []).filter((query) => query.urn !== urn)];
+
+    client.writeQuery({
+        query: ListQueriesDocument,
+        variables: {
+            input: {
+                start: (page - 1) * pageSize,
+                count: pageSize,
+                orFilters: [{ and: [entityFilter] }],
+                source: QuerySource.Manual,
+            },
+        },
+        data: {
+            listQueries: {
+                start: currData?.listQueries?.start || 0,
+                count: (currData?.listQueries?.count || 1) - 1,
+                total: (currData?.listQueries?.total || 1) - 1,
+                queries: newQueries,
+            },
+        },
+    });
+};
+
+export const updateListQueriesCache = (
+    urn: string,
+    newQuery: QueryEntity,
+    client,
+    page,
+    pageSize,
+    datasetUrn,
+    siblingUrn,
+) => {
+    const entityFilter = getQueryEntitiesFilter(datasetUrn, siblingUrn);
+    // Read the data from our cache for this query.
+    const currData: ListQueriesQuery | null = client.readQuery({
+        query: ListQueriesDocument,
+        variables: {
+            input: {
+                start: (page - 1) * pageSize,
+                count: pageSize,
+                orFilters: [{ and: [entityFilter] }],
+                source: QuerySource.Manual,
+            },
+        },
+    });
+
+    if (currData === null) {
+        // If there's no cached data, the first load has not occurred. Let it occur naturally.
+        return;
+    }
+
+    const existingQueries = currData?.listQueries?.queries || [];
+    const newQueries = [...existingQueries];
+    const updatedQueries = newQueries.map((query) => {
+        if (urn === query.urn) {
+            return newQuery;
+        }
+        return query;
+    });
+
+    const currCount = currData?.listQueries?.count || 0;
+    const currTotal = currData?.listQueries?.total || 0;
+    const didAdd = newQueries.length > existingQueries.length;
+
+    client.writeQuery({
+        query: ListQueriesDocument,
+        variables: {
+            input: {
+                start: 0,
+                count: pageSize,
+                orFilters: [{ and: [entityFilter] }],
+                source: QuerySource.Manual,
+            },
+        },
+        data: {
+            listQueries: {
+                start: currData?.listQueries?.start || 0,
+                count: currCount + (didAdd ? 1 : 0),
+                total: currTotal + (didAdd ? 1 : 0),
+                queries: updatedQueries,
+            },
+        },
+    });
+};
+
+export const addQueryToListQueriesCache = (query, client, pageSize, datasetUrn, siblingUrn) => {
+    const entityFilter = getQueryEntitiesFilter(datasetUrn, siblingUrn);
+    const currData: ListQueriesQuery | null = client.readQuery({
+        query: ListQueriesDocument,
+        variables: {
+            input: {
+                start: 0,
+                count: pageSize,
+                orFilters: [{ and: [entityFilter] }],
+                source: QuerySource.Manual,
+            },
+        },
+    });
+
+    const newQueries = [query, ...(currData?.listQueries?.queries || [])];
+
+    client.writeQuery({
+        query: ListQueriesDocument,
+        variables: {
+            input: {
+                start: 0,
+                count: pageSize,
+                orFilters: [{ and: [entityFilter] }],
+                source: QuerySource.Manual,
+            },
+        },
+        data: {
+            listQueries: {
+                start: currData?.listQueries?.start || 0,
+                count: (currData?.listQueries?.count || 1) + 1,
+                total: (currData?.listQueries?.total || 1) + 1,
+                queries: newQueries,
+            },
+        },
+    });
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/queryColumns.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/queryColumns.tsx
new file mode 100644
index 00000000000000..d769586b183128
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/queryColumns.tsx
@@ -0,0 +1,225 @@
+import DeleteOutlinedIcon from '@mui/icons-material/DeleteOutlined';
+import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
+import { Modal, Typography, message } from 'antd';
+import { Popover } from '@components';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import MarkdownViewer from '@src/app/entity/shared/components/legacy/MarkdownViewer';
+import { useDeleteQueryMutation } from '../../../../../../graphql/query.generated';
+import { CorpUser, EntityType } from '../../../../../../types.generated';
+import { useEntityRegistryV2 } from '../../../../../useEntityRegistry';
+import ActorAvatar from '../../../ActorAvatar';
+import { ActionButton } from '../../../containers/profile/sidebar/SectionActionButton';
+import {
+    getBarsStatusFromPopularityTier,
+    getQueryPopularityTier,
+} from '../../../containers/profile/sidebar/shared/utils';
+import { PopularityBars } from '../Schema/components/SchemaFieldDrawer/PopularityBars';
+import QueryBuilderModal from './QueryBuilderModal';
+import { Query } from './types';
+
+/*
+ * Description Column
+ */
+
+const StyledLink = styled(Typography.Link)`
+    display: block;
+`;
+
+const TruncatedTextWrapper = styled.div`
+    display: inline;
+`;
+
+const MAX_DESCRIPTION_LENGTH = 50;
+
+interface DescriptionProps {
+    description?: string;
+}
+
+export const QueryDescription = ({ description }: DescriptionProps) => {
+    const [isTruncated, setIsTruncated] = useState(description && description.length > MAX_DESCRIPTION_LENGTH);
+
+    if (!description) return null;
+
+    const truncatedDescription = description.slice(0, MAX_DESCRIPTION_LENGTH);
+
+    return (
+        <div>
+            {isTruncated && (
+                <>
+                    <TruncatedTextWrapper>
+                        <MarkdownViewer source={`${truncatedDescription}...`} />
+                    </TruncatedTextWrapper>
+                    <StyledLink onClick={() => setIsTruncated(false)}>Read more</StyledLink>
+                </>
+            )}
+            {!isTruncated && (
+                <>
+                    <MarkdownViewer source={description} ignoreLimit />
+                    {description.length > MAX_DESCRIPTION_LENGTH && (
+                        <StyledLink onClick={() => setIsTruncated(true)}>Read less</StyledLink>
+                    )}
+                </>
+            )}
+        </div>
+    );
+};
+
+/*
+ * Created By Column
+ */
+
+const INGESTION_URN = 'urn:li:corpuser:_ingestion';
+
+interface CreatedByProps {
+    createdBy?: CorpUser;
+}
+
+export const QueryCreatedBy = ({ createdBy }: CreatedByProps) => {
+    const entityRegistry = useEntityRegistryV2();
+
+    if (!createdBy || createdBy.urn === INGESTION_URN) return null;
+
+    const userName = entityRegistry.getDisplayName(EntityType.CorpUser, createdBy);
+
+    return (
+        <div>
+            <ActorAvatar
+                size={26}
+                name={userName}
+                url={`/${entityRegistry.getPathName(EntityType.CorpUser)}/${createdBy.urn}`}
+                photoUrl={
+                    createdBy?.editableProperties?.pictureLink || createdBy?.editableInfo?.pictureLink || undefined
+                }
+            />
+        </div>
+    );
+};
+
+/*
+ * Edit/Delete Column
+ */
+
+const ButtonsWrapper = styled.span<{ $isHidden: boolean }>`
+    display: flex;
+    gap: 8px;
+    align-items: center;
+    justify-content: center;
+    ${(props) => props.$isHidden && `visibility: hidden;`}
+`;
+
+interface EditDeleteProps {
+    query: Query;
+    hoveredQueryUrn: string | null;
+    onEdited?: (query) => void;
+    onDeleted?: (query) => void;
+}
+
+export const EditDeleteColumn = ({ query, hoveredQueryUrn, onEdited, onDeleted }: EditDeleteProps) => {
+    const [editingQuery, setEditingQuery] = useState<Query | null>(null);
+    const [deleteQueryMutation] = useDeleteQueryMutation();
+    const urn = query.urn as string;
+
+    const deleteQuery = () => {
+        deleteQueryMutation({ variables: { urn } })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.success({
+                        content: `Deleted Query!`,
+                        duration: 3,
+                    });
+                    onDeleted?.(query);
+                }
+            })
+            .catch(() => {
+                message.destroy();
+                message.error({ content: 'Failed to delete Query! An unexpected error occurred' });
+            });
+    };
+
+    const confirmDeleteQuery = () => {
+        Modal.confirm({
+            title: `Delete Query`,
+            content: `Are you sure you want to delete this query?`,
+            onOk() {
+                deleteQuery();
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
+    const onEditSubmitted = (newQuery) => {
+        setEditingQuery(null);
+        onEdited?.(newQuery);
+    };
+
+    return (
+        <>
+            <ButtonsWrapper $isHidden={hoveredQueryUrn !== query.urn}>
+                <ActionButton privilege onClick={() => setEditingQuery(query)} data-testid="edit-query">
+                    <EditOutlinedIcon />
+                </ActionButton>
+                <ActionButton privilege onClick={confirmDeleteQuery} data-testid="delete-query">
+                    <DeleteOutlinedIcon />
+                </ActionButton>
+            </ButtonsWrapper>
+            {editingQuery && (
+                <QueryBuilderModal
+                    initialState={{
+                        urn: editingQuery.urn as string,
+                        title: editingQuery.title,
+                        description: editingQuery.description,
+                        query: editingQuery.query,
+                    }}
+                    onSubmit={onEditSubmitted}
+                    onClose={() => setEditingQuery(null)}
+                />
+            )}
+        </>
+    );
+};
+
+/*
+ * Popularity Column
+ */
+
+const PopularityWrapper = styled.div`
+    display: flex;
+    justify-content: center;
+`;
+
+interface PopularityColumnProps {
+    query: Query;
+}
+
+export const PopularityColumn = ({ query }: PopularityColumnProps) => {
+    const { runsPercentileLast30days } = query;
+    if (!runsPercentileLast30days) return null;
+    const tier = getQueryPopularityTier(runsPercentileLast30days);
+    const status = getBarsStatusFromPopularityTier(tier);
+    return (
+        <Popover
+            content={
+                <>This query has been run more than {runsPercentileLast30days}% of other queries in the last 30 days.</>
+            }
+        >
+            <PopularityWrapper>
+                <PopularityBars status={status} />
+            </PopularityWrapper>
+        </Popover>
+    );
+};
+
+const ColumnsWrapper = styled.div`
+    text-align: right;
+`;
+
+/*
+ * Columns Column
+ */
+export const ColumnsColumn = ({ query }: PopularityColumnProps) => {
+    return <ColumnsWrapper>{query.columns?.length ?? 0}</ColumnsWrapper>;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/types.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/types.ts
new file mode 100644
index 00000000000000..6647dcf3d160e7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/types.ts
@@ -0,0 +1,29 @@
+import { CorpUser, Entity, SchemaFieldEntity } from '../../../../../../types.generated';
+
+export type QueryBuilderState = {
+    urn?: string;
+    query: string;
+    title?: string;
+    description?: string;
+};
+
+export type Query = {
+    urn?: string;
+    query: string;
+    title?: string;
+    description?: string;
+    lastRun?: number;
+    createdTime?: number;
+    createdBy?: CorpUser | null;
+    poweredEntity?: Entity;
+    usedBy?: CorpUser[];
+    runsPercentileLast30days?: number | null;
+    columns?: SchemaFieldEntity[];
+};
+
+export enum QueriesTabSection {
+    Highlighted,
+    Popular,
+    Recent,
+    Downstream,
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useDownstreamQueries.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useDownstreamQueries.ts
new file mode 100644
index 00000000000000..a78502dc6316bd
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useDownstreamQueries.ts
@@ -0,0 +1,79 @@
+import { useGetDefaultLineageStartTimeMillis } from '@app/lineage/utils/useGetLineageTimeParams';
+import { useEffect, useState } from 'react';
+import { GetDatasetQuery } from '../../../../../../graphql/dataset.generated';
+import { useSearchAcrossLineageForQueriesQuery } from '../../../../../../graphql/query.generated';
+import { Entity, EntityType, LineageDirection, QueryEntity } from '../../../../../../types.generated';
+import { useBaseEntity } from '../../../../../entity/shared/EntityContext';
+import { DBT_URN } from '../../../../../ingest/source/builder/constants';
+import { LINEAGE_FILTER_PAGINATION, isQuery } from '../../../../../lineageV2/common';
+import { DEGREE_FILTER_NAME } from '../../../../../search/utils/constants';
+import { MAX_QUERIES_COUNT } from './utils/constants';
+import { filterQueries } from './utils/filterQueries';
+import { mapQuery } from './utils/mapQuery';
+
+export default function useDownstreamQueries(filterText: string) {
+    const baseEntity = useBaseEntity<GetDatasetQuery>();
+    const startTimeMillis = useGetDefaultLineageStartTimeMillis();
+
+    const { data: lineageData, loading } = useSearchAcrossLineageForQueriesQuery({
+        variables: {
+            input: {
+                urn: baseEntity?.dataset?.urn,
+                count: MAX_QUERIES_COUNT,
+                direction: LineageDirection.Downstream,
+                orFilters: [
+                    {
+                        and: [
+                            {
+                                field: DEGREE_FILTER_NAME,
+                                values: ['1'],
+                            },
+                        ],
+                    },
+                ],
+                lineageFlags: {
+                    startTimeMillis,
+                    entitiesExploredPerHopLimit: LINEAGE_FILTER_PAGINATION,
+                    ignoreAsHops: [
+                        {
+                            entityType: EntityType.Dataset,
+                            platforms: [DBT_URN],
+                        },
+                        { entityType: EntityType.DataJob },
+                    ],
+                },
+            },
+        },
+        skip: !baseEntity?.dataset?.urn,
+        fetchPolicy: 'cache-first',
+    });
+
+    const [seenQueryUrns] = useState<Set<string>>(new Set());
+    const [downstreamQueryEntities, setDownstreamQueryEntities] = useState<[QueryEntity, Entity][]>([]);
+
+    useEffect(() => {
+        lineageData?.searchAcrossLineage?.searchResults.forEach((result) => {
+            result.paths?.forEach((path) => {
+                if (!path) return;
+                const parent = path.path[path.path.length - 2];
+                if (!parent) return;
+                if (isQuery(parent) && !seenQueryUrns.has(parent.urn)) {
+                    setDownstreamQueryEntities((prevQueries) => [
+                        ...prevQueries,
+                        [parent as QueryEntity, result.entity as Entity],
+                    ]);
+                    seenQueryUrns.add(parent.urn);
+                }
+            });
+        });
+    }, [lineageData, downstreamQueryEntities, seenQueryUrns]);
+
+    const downstreamQueries = filterQueries(
+        filterText,
+        downstreamQueryEntities.map(([queryEntity, poweredEntity]) =>
+            mapQuery({ queryEntity, entityUrn: baseEntity?.dataset?.urn, poweredEntity }),
+        ),
+    );
+
+    return { downstreamQueries, loading };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useHighlightedQueries.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useHighlightedQueries.ts
new file mode 100644
index 00000000000000..8d7eddfa4b5a49
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useHighlightedQueries.ts
@@ -0,0 +1,50 @@
+import { useListQueriesQuery } from '../../../../../../graphql/query.generated';
+import { QueryEntity, QuerySource } from '../../../../../../types.generated';
+import usePagination from '../../../../../sharedV2/pagination/usePagination';
+import useSorting from '../../../../../sharedV2/sorting/useSorting';
+import { DEFAULT_PAGE_SIZE } from './utils/constants';
+import { filterQueries, getQueryEntitiesFilter } from './utils/filterQueries';
+import { mapQuery } from './utils/mapQuery';
+
+interface Props {
+    entityUrn?: string;
+    siblingUrn?: string;
+    filterText: string;
+}
+
+export const useHighlightedQueries = ({ entityUrn, siblingUrn, filterText }: Props) => {
+    const pagination = usePagination(DEFAULT_PAGE_SIZE);
+    const { start, count } = pagination;
+    const sorting = useSorting();
+    const { sortField, sortOrder } = sorting;
+
+    const entityFilter = getQueryEntitiesFilter(entityUrn, siblingUrn);
+    const {
+        data: highlightedQueriesData,
+        client,
+        loading,
+    } = useListQueriesQuery({
+        variables: {
+            input: {
+                start,
+                count,
+                source: QuerySource.Manual,
+                orFilters: [{ and: [entityFilter] }],
+                sortInput: sortField && sortOrder ? { sortCriterion: { field: sortField, sortOrder } } : undefined,
+            },
+        },
+        skip: !entityUrn,
+        fetchPolicy: 'cache-first',
+    });
+
+    const queries = [...(highlightedQueriesData?.listQueries?.queries || [])] as QueryEntity[];
+
+    const highlightedQueries = filterQueries(
+        filterText,
+        queries.map((queryEntity) => mapQuery({ queryEntity, entityUrn, siblingUrn })),
+    );
+
+    const total = highlightedQueriesData?.listQueries?.total || 0;
+
+    return { highlightedQueries, client, loading, total, pagination, sorting };
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/usePopularQueries.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/usePopularQueries.ts
new file mode 100644
index 00000000000000..35e667dff2f30f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/usePopularQueries.ts
@@ -0,0 +1,85 @@
+import { useState } from 'react';
+import { useListQueriesQuery } from '../../../../../../graphql/query.generated';
+import { FacetFilterInput, QueryEntity, QuerySource, SortOrder } from '../../../../../../types.generated';
+import { filterQueries, getAndFilters, getQueryEntitiesFilter } from './utils/filterQueries';
+import usePagination from '../../../../../sharedV2/pagination/usePagination';
+import { DEFAULT_PAGE_SIZE } from './utils/constants';
+import { mapQuery } from './utils/mapQuery';
+import useSorting from '../../../../../sharedV2/sorting/useSorting';
+import { useQueryParamValue } from '../../../useQueryParamValue';
+
+interface Props {
+    entityUrn?: string;
+    siblingUrn?: string;
+    filterText: string;
+    defaultSelectedColumns?: string[];
+    defaultSelectedUsers?: string[];
+}
+
+export const usePopularQueries = ({
+    entityUrn,
+    siblingUrn,
+    filterText,
+    defaultSelectedColumns,
+    defaultSelectedUsers,
+}: Props) => {
+    const columnFromQueryParam = useQueryParamValue('column') as string | null;
+    const siblingColumnFromQueryParam = useQueryParamValue('siblingColumn') as string | null;
+    let columnsFromQueryParams = columnFromQueryParam ? [decodeURI(columnFromQueryParam)] : [];
+    columnsFromQueryParams = siblingColumnFromQueryParam
+        ? [...columnsFromQueryParams, decodeURI(siblingColumnFromQueryParam)]
+        : columnsFromQueryParams;
+    const defaultColumnsFilter = {
+        field: 'entities',
+        values: [...(columnsFromQueryParams.length ? columnsFromQueryParams : defaultSelectedColumns || [])],
+    };
+    const [selectedColumnsFilter, setSelectedColumnsFilter] = useState<FacetFilterInput>(defaultColumnsFilter);
+    const defaultUsersFilter = { field: 'topUsersLast30DaysFeature', values: [...(defaultSelectedUsers || [])] };
+    const [selectedUsersFilter, setSelectedUsersFilter] = useState<FacetFilterInput>(defaultUsersFilter);
+
+    const pagination = usePagination(DEFAULT_PAGE_SIZE);
+    const { start, count } = pagination;
+    const sorting = useSorting();
+    const { sortField, sortOrder } = sorting;
+
+    const entityFilter = getQueryEntitiesFilter(entityUrn, siblingUrn);
+    const andFilters = getAndFilters(selectedColumnsFilter, selectedUsersFilter, [entityFilter]);
+    const { data: popularQueriesData, loading } = useListQueriesQuery({
+        variables: {
+            input: {
+                start,
+                count,
+                source: QuerySource.System,
+                sortInput:
+                    sortField && sortOrder
+                        ? { sortCriterion: { field: sortField, sortOrder } }
+                        : { sortCriterion: { field: 'runsPercentileLast30days', sortOrder: SortOrder.Descending } },
+
+                orFilters: [{ and: andFilters }],
+            },
+        },
+        skip: !entityUrn,
+        fetchPolicy: 'cache-first',
+    });
+
+    const popularQueriesList = [...(popularQueriesData?.listQueries?.queries || [])] as QueryEntity[];
+
+    const total = popularQueriesData?.listQueries?.total || 0;
+
+    const popularQueries = filterQueries(
+        filterText,
+        popularQueriesList.map((queryEntity) => mapQuery({ queryEntity, entityUrn, siblingUrn })),
+    );
+
+    return {
+        popularQueries,
+        loading,
+        selectedColumnsFilter,
+        setSelectedColumnsFilter,
+        pagination,
+        total,
+        sorting,
+        selectedUsersFilter,
+        setSelectedUsersFilter,
+    };
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useQueryTableColumns.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useQueryTableColumns.tsx
new file mode 100644
index 00000000000000..03ab88486b6bbb
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useQueryTableColumns.tsx
@@ -0,0 +1,228 @@
+import moment from 'moment';
+import React from 'react';
+import styled from 'styled-components';
+import { Tooltip } from '@components';
+import { Query } from './types';
+import QueryComponent from './Query';
+import { EditDeleteColumn, QueryCreatedBy, QueryDescription, PopularityColumn, ColumnsColumn } from './queryColumns';
+import { CorpUser, Entity } from '../../../../../../types.generated';
+import { EntityLink } from '../../../../../homeV2/reference/sections/EntityLink';
+import { useEntityRegistryV2 } from '../../../../../useEntityRegistry';
+import { Sorting } from '../../../../../sharedV2/sorting/useSorting';
+import TopUsersFacepile from '../../../containers/profile/sidebar/shared/TopUsersFacepile';
+import { toRelativeTimeString } from '../../../../../shared/time/timeUtils';
+
+const UsersWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+`;
+
+interface Props {
+    queries: Query[];
+    hoveredQueryUrn: string | null;
+    showDetails?: boolean;
+    showEdit?: boolean;
+    showDelete?: boolean;
+    onDeleted?: (query) => void;
+    onEdited?: (query) => void;
+    sorting?: Sorting;
+    showPagination: boolean;
+}
+
+export default function useQueryTableColumns({
+    queries,
+    hoveredQueryUrn,
+    showDetails,
+    showEdit,
+    showDelete,
+    onDeleted,
+    onEdited,
+    sorting,
+    showPagination,
+}: Props) {
+    const entityRegistry = useEntityRegistryV2();
+    // only rely on backend sorting if we provide a sorting config and we are paginating
+    const shouldRelyOnBackendSorting = sorting && showPagination;
+
+    const titleColumn = {
+        title: 'Title',
+        dataIndex: 'title',
+        key: 'name',
+        field: 'name',
+        sorter: shouldRelyOnBackendSorting ? true : (queryA, queryB) => queryA.title?.localeCompare(queryB.title),
+        render: (queryTitle: string) => {
+            return <div>{queryTitle}</div>;
+        },
+    };
+
+    const descriptionColumn = {
+        title: 'Description',
+        dataIndex: 'description',
+        key: 'description',
+        render: (description: string) => <QueryDescription description={description} />,
+    };
+
+    const queryTextColumn = (width?: string | number) => ({
+        title: 'Query Text',
+        dataIndex: 'query',
+        key: 'query',
+        render: (rowQuery: string) => {
+            const query = queries.find(({ query: q }) => q === rowQuery);
+            if (!query) return null;
+            return (
+                <div style={{ width: width || 450 }}>
+                    <QueryComponent
+                        urn={query.urn}
+                        title={query.title || undefined}
+                        description={query.description || undefined}
+                        query={query.query}
+                        createdAtMs={query.createdTime}
+                        showDelete={showDelete}
+                        showEdit={showEdit}
+                        showDetails={showDetails}
+                        showHeader={false}
+                        onDeleted={() => onDeleted?.(query)}
+                        onEdited={(newQuery) => onEdited?.(newQuery)}
+                        isCompact
+                    />
+                </div>
+            );
+        },
+    });
+
+    const createdByColumn = {
+        title: 'Created By',
+        dataIndex: 'createdBy',
+        key: 'createdBy',
+        sorter: shouldRelyOnBackendSorting
+            ? false // we don't support sorting by createdBy on backend since it is a text field
+            : (queryA, queryB) => {
+                  if (!queryA.createdBy || !queryB.createdBy) return 0;
+                  const createdByA = entityRegistry.getDisplayName(queryA.createdBy.type, queryA.createdBy);
+                  const createdByB = entityRegistry.getDisplayName(queryB.createdBy.type, queryB.createdBy);
+                  return createdByA.localeCompare(createdByB);
+              },
+        render: (createdBy: CorpUser) => {
+            return <QueryCreatedBy createdBy={createdBy} />;
+        },
+    };
+
+    const createdDateColumn = {
+        title: 'Date Created',
+        dataIndex: 'createdTime',
+        key: 'dateCreated',
+        field: 'createdAt',
+        sorter: shouldRelyOnBackendSorting ? true : (queryA, queryB) => queryA.createdTime - queryB.createdTime,
+        render: (date: number) => {
+            return <div>{moment(date).format('MM/DD/YYYY')}</div>;
+        },
+    };
+
+    const powersColumn = {
+        title: 'Powers',
+        dataIndex: 'poweredEntity',
+        key: 'powers',
+        sorter: (queryA, queryB) => {
+            if (!queryA.poweredEntity || !queryB.poweredEntity) return 0;
+            const createdByA = entityRegistry.getDisplayName(queryA.poweredEntity.type, queryA.poweredEntity);
+            const createdByB = entityRegistry.getDisplayName(queryB.poweredEntity.type, queryB.poweredEntity);
+            return createdByA.localeCompare(createdByB);
+        },
+        render: (entity: Entity) => {
+            if (!entity) return null;
+            return (
+                <div>
+                    <EntityLink entity={entity} />
+                </div>
+            );
+        },
+    };
+
+    const usedByColumn = {
+        title: 'Used By',
+        dataIndex: 'usedBy',
+        key: 'usedBy',
+        className: 'usedBy',
+        sorter: shouldRelyOnBackendSorting
+            ? false // we don't support sorting by topUsersLast30DaysFeature on backend since it is a text field
+            : (queryA, queryB) => {
+                  if (!queryA.usedBy || !queryA.usedBy[0] || !queryB.usedBy || !queryB.usedBy[0]) return 0;
+                  const usedByA = entityRegistry.getDisplayName(queryA.usedBy[0].type, queryA.usedBy[0]);
+                  const usedByB = entityRegistry.getDisplayName(queryB.usedBy[0].type, queryB.usedBy[0]);
+                  return usedByA.localeCompare(usedByB);
+              },
+        render: (usedBy: CorpUser[]) => {
+            return (
+                <UsersWrapper>
+                    <TopUsersFacepile users={usedBy} max={3} checkExistence={false} />
+                </UsersWrapper>
+            );
+        },
+    };
+
+    const popularityColumn = {
+        title: 'Popularity',
+        key: 'popularity',
+        field: 'runsPercentileLast30days',
+        width: 110,
+        sorter: shouldRelyOnBackendSorting
+            ? true
+            : (queryA, queryB) => queryA.runsPercentileLast30days - queryB.runsPercentileLast30days,
+        render: (query: Query) => <PopularityColumn query={query} />,
+    };
+
+    const columnsColumn = {
+        title: 'Columns',
+        key: 'columns',
+        width: 105,
+        render: (query: Query) => <ColumnsColumn query={query} />,
+    };
+
+    const lastRunColumn = {
+        title: 'Last Run',
+        dataIndex: 'lastRun',
+        key: 'lastRun',
+        field: 'lastExecutedAtFeature',
+        className: 'lastRun',
+        sorter: shouldRelyOnBackendSorting ? true : (queryA, queryB) => queryA.lastRun - queryB.lastRun,
+        render: (lastRun: string) => {
+            if (!lastRun) return null;
+            return (
+                <div>
+                    <Tooltip title={moment(lastRun).format('MM/DD/YYYY')}>
+                        {toRelativeTimeString(new Date(lastRun).getTime())}
+                    </Tooltip>
+                </div>
+            );
+        },
+    };
+
+    const editColumn = {
+        title: '',
+        key: 'edit',
+        width: 80,
+        render: (query: Query) => (
+            <EditDeleteColumn
+                query={query}
+                onEdited={onEdited}
+                onDeleted={onDeleted}
+                hoveredQueryUrn={hoveredQueryUrn}
+            />
+        ),
+    };
+
+    return {
+        titleColumn,
+        descriptionColumn,
+        queryTextColumn,
+        createdByColumn,
+        createdDateColumn,
+        powersColumn,
+        usedByColumn,
+        popularityColumn,
+        columnsColumn,
+        lastRunColumn,
+        editColumn,
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useRecentQueries.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useRecentQueries.ts
new file mode 100644
index 00000000000000..5a8f8cf229f531
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/useRecentQueries.ts
@@ -0,0 +1,53 @@
+import { useGetRecentQueriesQuery } from '../../../../../../graphql/dataset.generated';
+// import { useAppConfig } from '../../../../../useAppConfig';
+import { useIsSeparateSiblingsMode } from '../../../useIsSeparateSiblingsMode';
+import { MAX_QUERIES_COUNT } from './utils/constants';
+import { filterQueries } from './utils/filterQueries';
+import getTopNQueries from './utils/getTopNQueries';
+
+interface Props {
+    entityUrn?: string;
+    siblingUrn?: string;
+    filterText: string;
+}
+
+export const useRecentQueries = ({ entityUrn, siblingUrn, filterText }: Props) => {
+    // const appConfig = useAppConfig();
+    const isSeparateSiblings = useIsSeparateSiblingsMode();
+
+    const { data: recentQueriesData, loading } = useGetRecentQueriesQuery({
+        variables: { urn: entityUrn as string },
+        skip: !entityUrn,
+        fetchPolicy: 'cache-first',
+    });
+
+    const { data: siblingRecentQueriesData, loading: siblingsLoading } = useGetRecentQueriesQuery({
+        variables: { urn: siblingUrn as string },
+        skip: !siblingUrn || isSeparateSiblings,
+        fetchPolicy: 'cache-first',
+    });
+
+    const recentQueriesBuckets = [
+        ...(recentQueriesData?.dataset?.usageStats?.buckets || []),
+        ...(siblingRecentQueriesData?.dataset?.usageStats?.buckets || []),
+    ];
+
+    recentQueriesBuckets.sort((bucketA, bucketB) => (bucketB?.bucket || 0) - (bucketA?.bucket || 0));
+
+    const recentQueries = filterQueries(
+        filterText,
+        (
+            getTopNQueries(
+                // TODO: uncomment later
+                // appConfig?.config?.visualConfig?.queriesTab?.queriesTabResultSize || DEFAULT_MAX_RECENT_QUERIES,
+                MAX_QUERIES_COUNT,
+                recentQueriesBuckets,
+            ) || []
+        ).map((recentQuery) => ({
+            query: recentQuery.query,
+            lastRun: recentQuery.dateMs,
+        })),
+    );
+
+    return { recentQueries, loading: loading || siblingsLoading };
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/constants.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/constants.ts
new file mode 100644
index 00000000000000..fd3b8fbe062317
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/constants.ts
@@ -0,0 +1,20 @@
+/**
+ * Max queries to fetch on the Queries Tab
+ */
+export const MAX_QUERIES_COUNT = 25;
+/**
+ * Default page size for Queries Tab Section
+ */
+export const DEFAULT_PAGE_SIZE = 5;
+/**
+ * The Max number of "Recent Queries" to surface.
+ */
+export const DEFAULT_MAX_RECENT_QUERIES = 9;
+
+/**
+ * Searching Queries
+ */
+export const MAX_ROWS_BEFORE_DEBOUNCE = 50;
+export const HALF_SECOND_IN_MS = 500;
+
+export const ADD_UNAUTHORIZED_MESSAGE = 'You are not authorized to add Queries to this entity.';
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/filterQueries.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/filterQueries.ts
new file mode 100644
index 00000000000000..2ca5498b707140
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/filterQueries.ts
@@ -0,0 +1,36 @@
+import { FacetFilterInput } from '../../../../../../../types.generated';
+import { Query } from '../types';
+
+/**
+ * Filter queries by a search string. Compares name, description, and query statement.
+ *
+ * @param filterText the search text
+ * @param queries the queries to filter
+ */
+export const filterQueries = (filterText, queries: Query[]) => {
+    const lowerFilterText = filterText.toLowerCase();
+    return queries.filter((query) => {
+        return (
+            query.title?.toLowerCase().includes(lowerFilterText) ||
+            query.description?.toLowerCase().includes(lowerFilterText) ||
+            query.query?.toLowerCase()?.includes(lowerFilterText)
+        );
+    });
+};
+
+export const getQueryEntitiesFilter = (entityUrn?: string, siblingUrn?: string) => {
+    const values = siblingUrn ? [entityUrn as string, siblingUrn] : [entityUrn as string];
+    return { field: 'entities', values };
+};
+
+export const getAndFilters = (
+    selectedColumnsFilter: FacetFilterInput,
+    selectedUsersFilter: FacetFilterInput,
+    existingFilters: FacetFilterInput[] = [],
+) => {
+    let andFilters = selectedColumnsFilter.values?.length
+        ? [...existingFilters, selectedColumnsFilter]
+        : existingFilters;
+    andFilters = selectedUsersFilter.values?.length ? [...andFilters, selectedUsersFilter] : andFilters;
+    return andFilters;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/getCurrentPage.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/getCurrentPage.ts
new file mode 100644
index 00000000000000..2931de97e69aca
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/getCurrentPage.ts
@@ -0,0 +1,8 @@
+/**
+ * Returns the queries for the current page
+ */
+export const getQueriesForPage = (queries: any, page: number, pageSize: number) => {
+    const start = (page - 1) * pageSize;
+    const end = start + pageSize;
+    return queries.length >= end ? queries.slice(start, end) : queries.slice(start, queries.length);
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/getTopNQueries.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/getTopNQueries.ts
new file mode 100644
index 00000000000000..db3c11e28d7136
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/getTopNQueries.ts
@@ -0,0 +1,34 @@
+import { UsageAggregation, Maybe } from '../../../../../../../types.generated';
+
+type RecentQuery = {
+    query: string;
+    dateMs: number;
+};
+
+export default function getTopNQueries(n: number, buckets?: Maybe<UsageAggregation>[] | null): RecentQuery[] {
+    let response: RecentQuery[] = [];
+    const seenQueries = new Set<string>();
+
+    if (!buckets) {
+        return response;
+    }
+
+    for (let i = 0; i < buckets.length; i++) {
+        const bucket = buckets[i];
+        const newQueries: string[] =
+            (bucket?.metrics?.topSqlQueries?.filter(
+                (query) => query && bucket?.bucket && !seenQueries.has(query),
+            ) as string[]) || [];
+
+        // Mark each query as seen.
+        newQueries.forEach((query) => seenQueries.add(query as string));
+
+        response = [...response, ...newQueries.map((query) => ({ query, dateMs: bucket?.bucket as number }))];
+
+        if (response.length >= n) {
+            return response.slice(0, n);
+        }
+    }
+
+    return response;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/mapQuery.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/mapQuery.ts
new file mode 100644
index 00000000000000..053305e1c5c476
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/mapQuery.ts
@@ -0,0 +1,28 @@
+import { getSourceUrnFromSchemaFieldUrn } from '@src/app/entityV2/schemaField/utils';
+import { Entity, QueryEntity, SchemaFieldEntity } from '../../../../../../../types.generated';
+import { Query } from '../types';
+
+interface Props {
+    queryEntity: QueryEntity;
+    entityUrn?: string;
+    siblingUrn?: string;
+    poweredEntity?: Entity;
+}
+
+export function mapQuery({ queryEntity, entityUrn, siblingUrn, poweredEntity }: Props) {
+    return {
+        urn: queryEntity.urn,
+        title: queryEntity.properties?.name || undefined,
+        description: queryEntity.properties?.description || undefined,
+        query: queryEntity.properties?.statement?.value || '',
+        createdTime: queryEntity?.properties?.created?.time,
+        columns: queryEntity.subjects
+            ?.filter((s) => !!s.schemaField)
+            ?.filter((s) => {
+                const schemaFieldSourceUrn = getSourceUrnFromSchemaFieldUrn(s.schemaField?.urn || '');
+                return schemaFieldSourceUrn === entityUrn || schemaFieldSourceUrn === siblingUrn;
+            })
+            .map((s) => s.schemaField) as SchemaFieldEntity[],
+        poweredEntity,
+    } as Query;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/CompactSchemaTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/CompactSchemaTable.tsx
new file mode 100644
index 00000000000000..0664e29efe9891
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/CompactSchemaTable.tsx
@@ -0,0 +1,242 @@
+import React, { useMemo, useState } from 'react';
+import { ColumnsType } from 'antd/es/table';
+import { Button, Table } from 'antd';
+import styled from 'styled-components';
+import { useDebounce } from 'react-use';
+
+import { FixedType } from 'rc-table/lib/interface';
+import translateFieldPath from '@src/app/entityV2/dataset/profile/schema/utils/translateFieldPath';
+import {
+    EditableSchemaMetadata,
+    EntityType,
+    SchemaField,
+    SchemaMetadata,
+    UsageQueryResult,
+} from '../../../../../../types.generated';
+import useSchemaTitleRenderer from '../../../../dataset/profile/schema/utils/schemaTitleRenderer';
+import { ExtendedSchemaFields } from '../../../../dataset/profile/schema/utils/types';
+import useDescriptionRenderer from './utils/useDescriptionRenderer';
+import useUsageStatsRenderer from './utils/useUsageStatsRenderer';
+import { useEntityData } from '../../../../../entity/shared/EntityContext';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { REDESIGN_COLORS } from '../../../constants';
+import ExpandIcon from './components/ExpandIcon';
+import SchemaFieldDrawer from './components/SchemaFieldDrawer/SchemaFieldDrawer';
+import useKeyboardControls from './useKeyboardControls';
+import useExtractFieldDescriptionInfo from './utils/useExtractFieldDescriptionInfo';
+
+export type Props = {
+    rows: Array<ExtendedSchemaFields>;
+    schemaMetadata: SchemaMetadata | undefined | null;
+    editableSchemaMetadata?: EditableSchemaMetadata | null;
+    usageStats?: UsageQueryResult | null;
+    fullHeight?: boolean;
+    expandedRowsFromFilter?: Set<string>;
+    expandedDrawerFieldPath: string | null;
+    setExpandedDrawerFieldPath: (path: string | null) => void;
+    openTimelineDrawer?: boolean;
+    setOpenTimelineDrawer?: any;
+    inputFields?: SchemaField[];
+    refetch?: () => void;
+};
+
+const TableContainer = styled.div<{ fullHeight?: boolean }>`
+    margin-top: ${(props) => (props.fullHeight ? '0px' : '5px')};
+    margin-left: ${(props) => (props.fullHeight ? '12px' : '0px')};
+    .ant-table-thead > tr > th {
+        background-color: transparent;
+        font-weight: 600;
+        color: ${REDESIGN_COLORS.DARK_GREY};
+        font-weight: 700;
+    }
+    &&& .ant-table-cell:first-of-type {
+        ${(props) => !props.fullHeight && 'padding: 8px 8px 8px 0px'};
+    }
+
+    &&& .selected-row * {
+        color: white;
+        background-color: ${REDESIGN_COLORS.BACKGROUND_PURPLE};
+    }
+
+    &&& .field-column {
+        max-width: 100px;
+    }
+
+    &&& .description-column {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        max-width: 100px;
+    }
+`;
+
+const StyledButton = styled(Button)`
+    color: #b0a2c2;
+    font-weight: 500;
+    :hover {
+        color: ${REDESIGN_COLORS.DARK_GREY};
+    }
+`;
+
+const KEYBOARD_CONTROL_DEBOUNCE_MS = 50;
+
+export default function CompactSchemaTable({
+    rows,
+    schemaMetadata,
+    editableSchemaMetadata,
+    usageStats,
+    fullHeight,
+    inputFields,
+    expandedDrawerFieldPath,
+    setExpandedDrawerFieldPath,
+    openTimelineDrawer = false,
+    setOpenTimelineDrawer,
+    refetch,
+}: Props): JSX.Element {
+    const numberOfRowsToShow = fullHeight ? 20 : 5;
+    const { urn } = useEntityData();
+    const entityRegistry = useEntityRegistry();
+
+    const hasUsageStats = useMemo(() => (usageStats?.aggregations?.fields?.length || 0) > 0, [usageStats]);
+
+    const descriptionRender = useDescriptionRenderer(editableSchemaMetadata, true);
+    const usageStatsRenderer = useUsageStatsRenderer(usageStats);
+
+    const schemaTitleRenderer = useSchemaTitleRenderer(urn, schemaMetadata, '', true);
+
+    const shortenedRows = useMemo(() => rows.slice(0, numberOfRowsToShow), [rows, numberOfRowsToShow]);
+    const hasSeeMore = rows.length > numberOfRowsToShow;
+
+    const schemaFields = schemaMetadata ? schemaMetadata.fields : inputFields;
+    const [schemaFieldDrawerFieldPath, setSchemaFieldDrawerFieldPath] = useState(expandedDrawerFieldPath);
+    useDebounce(() => setSchemaFieldDrawerFieldPath(expandedDrawerFieldPath), KEYBOARD_CONTROL_DEBOUNCE_MS, [
+        expandedDrawerFieldPath,
+    ]);
+
+    const [expandedRows, setExpandedRows] = useState<Set<string>>(new Set());
+
+    const { selectPreviousField, selectNextField } = useKeyboardControls(
+        shortenedRows,
+        expandedDrawerFieldPath,
+        setExpandedDrawerFieldPath,
+        expandedRows,
+        setExpandedRows,
+    );
+
+    const extractFieldDescription = useExtractFieldDescriptionInfo(editableSchemaMetadata);
+
+    const fieldColumn = {
+        fixed: 'left' as FixedType,
+        width: 100,
+        title: 'Name',
+        dataIndex: 'fieldPath',
+        key: 'fieldPath',
+        className: 'field-column',
+        render: schemaTitleRenderer,
+        filtered: true,
+        onCell: () => ({
+            style: {
+                whiteSpace: 'pre' as any,
+            },
+        }),
+        sorter: (sourceA, sourceB) =>
+            translateFieldPath(sourceA.fieldPath).localeCompare(translateFieldPath(sourceB.fieldPath)),
+    };
+
+    const descriptionColumn = {
+        ellipsis: true,
+        width: 600,
+        title: 'Description',
+        dataIndex: 'description',
+        key: 'description',
+        className: 'description-column',
+        render: descriptionRender,
+        onCell: () => ({
+            style: {
+                whiteSpace: 'pre' as any,
+                textWrap: 'whitespace',
+            },
+        }),
+        sorter: (sourceA, sourceB) =>
+            (extractFieldDescription(sourceA).sanitizedDescription ? 1 : 0) -
+            (extractFieldDescription(sourceB).sanitizedDescription ? 1 : 0),
+    };
+
+    // Function to get the count of each usageStats fieldPath
+    function getCount(fieldPath: any) {
+        const data: any =
+            usageStats?.aggregations?.fields &&
+            usageStats?.aggregations?.fields.find((field) => {
+                return field?.fieldName === fieldPath;
+            });
+        return (data && data.count) ?? 0;
+    }
+
+    const usageColumn = {
+        width: '100',
+        title: 'Usage',
+        dataIndex: 'fieldPath',
+        key: 'usage',
+        render: usageStatsRenderer,
+        sorter: (sourceA, sourceB) => getCount(sourceA.fieldPath) - getCount(sourceB.fieldPath),
+    };
+
+    let allColumns: ColumnsType<ExtendedSchemaFields> = [fieldColumn, descriptionColumn];
+
+    if (hasUsageStats) {
+        allColumns = [...allColumns, usageColumn];
+    }
+
+    const rowClassName = (record) => {
+        let className = '';
+
+        if (expandedDrawerFieldPath === record.fieldPath) {
+            className += 'selected-row';
+        } else {
+            className = 'row';
+        }
+
+        return className;
+    };
+
+    return (
+        <TableContainer fullHeight={fullHeight}>
+            <Table
+                size="small"
+                columns={allColumns}
+                dataSource={shortenedRows}
+                rowKey="fieldPath"
+                pagination={false}
+                rowClassName={rowClassName}
+                onRow={(record) => ({
+                    id: `column-${record.fieldPath}`,
+                })}
+                scroll={{ x: 'auto' }}
+                expandable={{
+                    expandIcon: (props) => <ExpandIcon {...props} isCompact />,
+                }}
+            />
+            {hasSeeMore && (
+                <StyledButton type="text" size="small" href={entityRegistry.getEntityUrl(EntityType.Dataset, urn)}>
+                    View {rows.length - numberOfRowsToShow} More
+                </StyledButton>
+            )}
+            {!!schemaFields && (
+                <SchemaFieldDrawer
+                    schemaFields={schemaFields}
+                    expandedDrawerFieldPath={schemaFieldDrawerFieldPath}
+                    editableSchemaMetadata={editableSchemaMetadata}
+                    setExpandedDrawerFieldPath={setExpandedDrawerFieldPath}
+                    openTimelineDrawer={openTimelineDrawer}
+                    setOpenTimelineDrawer={setOpenTimelineDrawer}
+                    selectPreviousField={selectPreviousField}
+                    selectNextField={selectNextField}
+                    usageStats={usageStats}
+                    displayedRows={shortenedRows}
+                    refetch={refetch}
+                    mask
+                />
+            )}
+        </TableContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaContext.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaContext.tsx
new file mode 100644
index 00000000000000..f891438679f7be
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaContext.tsx
@@ -0,0 +1,13 @@
+import React, { useContext } from 'react';
+import { SchemaContextType } from '../../../../../entity/shared/types';
+
+const SchemaContext = React.createContext<SchemaContextType>({
+    refetch: () => Promise.resolve({}),
+});
+
+export default SchemaContext;
+
+export const useSchemaRefetch = () => {
+    const { refetch } = useContext(SchemaContext);
+    return refetch;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTab.tsx
new file mode 100644
index 00000000000000..32bca28639c81a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTab.tsx
@@ -0,0 +1,277 @@
+import { LoadingOutlined } from '@ant-design/icons';
+import { SEMANTIC_VERSION_PARAM } from '@app/entityV2/dataset/profile/schema/components/VersionSelector';
+import useSchemaVersioning from '@app/entityV2/shared/tabs/Dataset/Schema/useSchemaVersioning';
+import { useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode';
+import { Empty } from 'antd';
+import React, { useEffect, useMemo, useState } from 'react';
+import { useLocation } from 'react-router';
+import styled from 'styled-components';
+
+import { GetDatasetQuery } from '../../../../../../graphql/dataset.generated';
+import { useBaseEntity, useEntityData } from '../../../../../entity/shared/EntityContext';
+import SchemaEditableContext from '../../../../../shared/SchemaEditableContext';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import SchemaHeader from '../../../../dataset/profile/schema/components/SchemaHeader';
+import SchemaRawView from '../../../../dataset/profile/schema/components/SchemaRawView';
+import { KEY_SCHEMA_PREFIX } from '../../../../dataset/profile/schema/utils/constants';
+import { groupByFieldPath } from '../../../../dataset/profile/schema/utils/utils';
+import { ANTD_GRAY } from '../../../constants';
+import { TabRenderType } from '../../../types';
+import CompactSchemaTable from './CompactSchemaTable';
+import HistorySidebar from './history/HistorySidebar';
+import SchemaContext from './SchemaContext';
+import SchemaTable from './SchemaTable';
+import { useGetEntityWithSchema } from './useGetEntitySchema';
+import { filterSchemaRows, SchemaFilterType } from './utils/filterSchemaRows';
+import getExpandedDrawerFieldPath from './utils/getExpandedDrawerFieldPath';
+import getSchemaFilterTypesFromUrl from './utils/getSchemaFilterTypesFromUrl';
+import { getMatchedTextFromQueryString, getSchemaFilterFromQueryString } from './utils/queryStringUtils';
+import useUpdateSchemaFilterQueryString from './utils/updateSchemaFilterQueryString';
+
+const NoSchema = styled(Empty)`
+    color: ${ANTD_GRAY[6]};
+    padding-top: 60px;
+`;
+
+const SchemaTableContainer = styled.div`
+    overflow: auto;
+    height: 100%;
+`;
+
+const LoadingWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 350px;
+    font-size: 30px;
+`;
+
+const DEFAULT_SCHEMA_FILTER_TYPES = [
+    SchemaFilterType.Documentation,
+    SchemaFilterType.FieldPath,
+    SchemaFilterType.Tags,
+    SchemaFilterType.Terms,
+];
+
+export const SchemaTab = ({ renderType, properties }: { renderType: TabRenderType; properties?: any }) => {
+    const entityRegistry = useEntityRegistry();
+    const { urn, entityData } = useEntityData();
+    const baseEntity = useBaseEntity<GetDatasetQuery>();
+    // Dynamically load the schema + editable schema information.
+    const { entityWithSchema, loading, refetch } = useGetEntityWithSchema();
+    let schemaMetadata: any = entityWithSchema?.schemaMetadata || undefined;
+    let editableSchemaMetadata: any = entityWithSchema?.editableSchemaMetadata || undefined;
+    const separateSiblings = useIsSeparateSiblingsMode();
+    const siblingUrn = entityData?.siblingsSearch?.searchResults?.[0]?.entity?.urn;
+    const usageStats = baseEntity?.dataset?.usageStats;
+    const [showRaw, setShowRaw] = useState(false);
+    const location = useLocation();
+    const schemaFilter = getSchemaFilterFromQueryString(location);
+    const matchedTextFromUrl = getMatchedTextFromQueryString(location);
+    const expandedDrawerFieldPathFromUrl = getExpandedDrawerFieldPath(location);
+    const schemaFilterTypesFromUrl = getSchemaFilterTypesFromUrl(location);
+    const [filterText, setFilterText] = useState(schemaFilter || '');
+    const [matchedText, setMatchedText] = useState<string | null>(matchedTextFromUrl || null);
+    const [schemaFilterTypes, setSchemaFilterTypes] = useState<SchemaFilterType[]>(schemaFilterTypesFromUrl);
+    const [expandedDrawerFieldPath, setExpandedDrawerFieldPath] = useState<string | null>(
+        expandedDrawerFieldPathFromUrl,
+    );
+    const [openTimelineDrawer, setOpenTimelineDrawer] = useState<boolean>(false);
+    const [highlightedMatchIndex, setHighlightedMatchIndex] = useState<number | null>(null);
+    const [wasSearchReset, setWasSearchReset] = useState(false);
+
+    useUpdateSchemaFilterQueryString(filterText, expandedDrawerFieldPath, schemaFilterTypes);
+
+    const hasRawSchema = useMemo(
+        () =>
+            schemaMetadata?.platformSchema?.__typename === 'TableSchema' &&
+            schemaMetadata?.platformSchema?.schema?.length > 0,
+        [schemaMetadata],
+    );
+    const hasKeySchema = useMemo(
+        () =>
+            (schemaMetadata?.fields?.length || 0) > 0 &&
+            schemaMetadata?.fields?.findIndex((field) => field.fieldPath.indexOf(KEY_SCHEMA_PREFIX) > -1) !== -1,
+        [schemaMetadata],
+    );
+
+    const hasValueSchema = useMemo(
+        () =>
+            (schemaMetadata?.fields?.length || 0) > 0 &&
+            schemaMetadata?.fields?.findIndex((field) => field.fieldPath.indexOf(KEY_SCHEMA_PREFIX) === -1) !== -1,
+        [schemaMetadata],
+    );
+
+    const [showKeySchema, setShowKeySchema] = useState(false);
+    const [showSchemaTimelineView, setShowSchemaTimelineView] = useState(false);
+
+    // Do not show semantic version (dropdown or in change history drawer) if we are on combined siblings page
+    const hideSemanticVersions = !separateSiblings && !!siblingUrn;
+    const {
+        selectedVersion,
+        versionList,
+        schema: versionedSchema,
+        editableSchemaMetadata: versionedESM,
+        isLatest: isLatestVersion,
+    } = useSchemaVersioning({
+        datasetUrn: urn,
+        urlParam: SEMANTIC_VERSION_PARAM,
+        skip: !urn || hideSemanticVersions,
+    });
+
+    let editMode = true;
+    if (!isLatestVersion) {
+        schemaMetadata = versionedSchema;
+        editableSchemaMetadata = versionedESM;
+        editMode = false;
+    } else if (properties && properties.hasOwnProperty('editMode')) {
+        editMode = properties.editMode;
+    }
+
+    // if there is no value schema, default the selected schema to Key
+    useEffect(() => {
+        if (!hasValueSchema && hasKeySchema) {
+            setShowKeySchema(true);
+        }
+    }, [hasValueSchema, hasKeySchema, setShowKeySchema]);
+
+    const {
+        filteredRows,
+        expandedRowsFromFilter,
+        matches = [],
+    } = filterSchemaRows(
+        schemaMetadata?.fields,
+        editableSchemaMetadata,
+        filterText,
+        schemaFilterTypes,
+        expandedDrawerFieldPath,
+        entityRegistry,
+        false,
+    );
+
+    useEffect(() => {
+        if (matchedText) {
+            const { filteredRows: matchedRows } = filterSchemaRows(
+                schemaMetadata?.fields,
+                editableSchemaMetadata,
+                matchedText,
+                DEFAULT_SCHEMA_FILTER_TYPES,
+                expandedDrawerFieldPath,
+                entityRegistry,
+                true,
+            );
+            if (matchedRows && matchedRows.length) {
+                setExpandedDrawerFieldPath(matchedRows[0].fieldPath);
+                setMatchedText(null);
+            }
+        }
+    }, [matchedText, schemaMetadata?.fields, editableSchemaMetadata, entityRegistry, expandedDrawerFieldPath]);
+
+    useEffect(() => {
+        setHighlightedMatchIndex(matches.length > 0 ? 0 : null);
+    }, [filterText, matches.length]);
+
+    const rows = useMemo(() => {
+        return groupByFieldPath(filteredRows, { showKeySchema });
+    }, [showKeySchema, filteredRows]);
+
+    // hack to reset default value of SchemaHeader filter when there are no matches so the old query doesn't lie around
+    // Gabe did this. I apologize to anyone reading.
+    useEffect(() => {
+        if (!loading && matches.length === 0) {
+            setFilterText('');
+            setSchemaFilterTypes(DEFAULT_SCHEMA_FILTER_TYPES);
+            setWasSearchReset(true);
+        }
+        /* eslint-disable-next-line react-hooks/exhaustive-deps */
+    }, [loading]);
+
+    if (renderType === TabRenderType.COMPACT) {
+        if (loading && !schemaMetadata) {
+            return <LoadingOutlined />;
+        }
+        return (
+            <CompactSchemaTable
+                rows={rows}
+                schemaMetadata={schemaMetadata}
+                editableSchemaMetadata={editableSchemaMetadata}
+                expandedDrawerFieldPath={expandedDrawerFieldPath}
+                setExpandedDrawerFieldPath={setExpandedDrawerFieldPath}
+                openTimelineDrawer={openTimelineDrawer}
+                setOpenTimelineDrawer={setOpenTimelineDrawer}
+                usageStats={usageStats}
+                fullHeight={!!properties?.fullHeight}
+                refetch={refetch}
+            />
+        );
+    }
+
+    return (
+        <SchemaContext.Provider value={{ refetch }}>
+            <HistorySidebar
+                urn={urn}
+                siblingUrn={siblingUrn}
+                versionList={versionList}
+                hideSemanticVersions={hideSemanticVersions}
+                open={showSchemaTimelineView}
+                onClose={() => setShowSchemaTimelineView(false)}
+            />
+            <SchemaHeader
+                // see above hook
+                key={wasSearchReset ? 'key1' : 'key2'}
+                schemaFilter={filterText}
+                showRaw={showRaw}
+                setShowRaw={setShowRaw}
+                hasRaw={hasRawSchema}
+                hasKeySchema={hasKeySchema}
+                showKeySchema={showKeySchema}
+                setShowKeySchema={setShowKeySchema}
+                selectedVersion={selectedVersion}
+                versionList={versionList}
+                showSchemaTimeline={showSchemaTimelineView}
+                setShowSchemaTimeline={setShowSchemaTimelineView}
+                setFilterText={setFilterText}
+                numRows={schemaMetadata?.fields?.length}
+                schemaFilterTypes={schemaFilterTypes}
+                setSchemaFilterTypes={setSchemaFilterTypes}
+                matches={matches}
+                highlightedMatchIndex={highlightedMatchIndex}
+                setHighlightedMatchIndex={setHighlightedMatchIndex}
+            />
+            {loading && !schemaMetadata ? (
+                <LoadingWrapper>
+                    <LoadingOutlined />
+                </LoadingWrapper>
+            ) : (
+                <SchemaTableContainer>
+                    {/* eslint-disable-next-line no-nested-ternary */}
+                    {showRaw ? (
+                        <SchemaRawView
+                            schemaDiff={{ current: schemaMetadata }}
+                            editMode={editMode}
+                            showKeySchema={showKeySchema}
+                        />
+                    ) : rows && rows.length > 0 ? (
+                        <SchemaEditableContext.Provider value={editMode}>
+                            <SchemaTable
+                                schemaMetadata={schemaMetadata}
+                                rows={rows}
+                                editableSchemaMetadata={editableSchemaMetadata}
+                                usageStats={usageStats}
+                                expandedRowsFromFilter={expandedRowsFromFilter}
+                                filterText={filterText}
+                                expandedDrawerFieldPath={expandedDrawerFieldPath}
+                                setExpandedDrawerFieldPath={setExpandedDrawerFieldPath}
+                                openTimelineDrawer={openTimelineDrawer}
+                                setOpenTimelineDrawer={setOpenTimelineDrawer}
+                                refetch={refetch}
+                            />
+                        </SchemaEditableContext.Provider>
+                    ) : (
+                        <NoSchema />
+                    )}
+                </SchemaTableContainer>
+            )}
+        </SchemaContext.Provider>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTable.tsx
new file mode 100644
index 00000000000000..521e28a3f7dfa3
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTable.tsx
@@ -0,0 +1,536 @@
+import { ColumnsType } from 'antd/es/table';
+import type { FixedType } from 'rc-table/lib/interface';
+import { SorterResult } from 'antd/lib/table/interface';
+import ResizeObserver from 'rc-resize-observer';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+import styled from 'styled-components';
+import { useVT } from 'virtualizedtableforantd4';
+import { useDebounce } from 'react-use';
+import { useEntityData } from '@src/app/entity/shared/EntityContext';
+import { colors } from '@src/alchemy-components';
+import {
+    EditableSchemaMetadata,
+    SchemaField,
+    SchemaMetadata,
+    UsageQueryResult,
+} from '../../../../../../types.generated';
+import SchemaRow from '../../../../dataset/profile/schema/components/SchemaRow';
+import useSchemaTitleRenderer from '../../../../dataset/profile/schema/utils/schemaTitleRenderer';
+import useSchemaTypeRenderer from '../../../../dataset/profile/schema/utils/schemaTypeRenderer';
+import translateFieldPath from '../../../../dataset/profile/schema/utils/translateFieldPath';
+import { ExtendedSchemaFields } from '../../../../dataset/profile/schema/utils/types';
+import { StyledTable } from '../../../components/styled/StyledTable';
+import { REDESIGN_COLORS } from '../../../constants';
+import ExpandIcon from './components/ExpandIcon';
+import SchemaFieldDrawer from './components/SchemaFieldDrawer/SchemaFieldDrawer';
+import useDescriptionRenderer from './utils/useDescriptionRenderer';
+import useTagsAndTermsRenderer from './utils/useTagsAndTermsRenderer';
+import useUsageStatsRenderer from './utils/useUsageStatsRenderer';
+import useKeyboardControls from './useKeyboardControls';
+import { findIndexOfFieldPathExcludingCollapsedFields } from '../../../../dataset/profile/schema/utils/utils';
+import useExtractFieldGlossaryTermsInfo from './utils/useExtractFieldGlossaryTermsInfo';
+import useExtractFieldTagsInfo from './utils/useExtractFieldTagsInfo';
+import useExtractFieldDescriptionInfo from './utils/useExtractFieldDescriptionInfo';
+import { useGetTableColumnProperties } from './utils/useGetTableColumnProperties';
+import { useGetStructuredPropColumns } from './utils/useGetStructuredPropColumns';
+
+const TableContainer = styled.div<{ isSearchActive: boolean; hasRowWithDepth: boolean }>`
+    overflow: inherit;
+    height: inherit;
+
+    &&& .ant-table-tbody > tr > .ant-table-cell-with-append {
+        border-right: none;
+        padding: 0px;
+    }
+
+    &&& .ant-table-tbody > tr {
+        background-color: #fff;
+    }
+
+    &&& .ant-table-tbody > tr.expanded-child {
+        background-color: #f5f9fa;
+    }
+
+    &&& .ant-table-tbody > tr > .ant-table-cell {
+        border-right: none;
+    }
+
+    &&& .open-fk-row > td {
+        padding-bottom: 600px;
+        vertical-align: top;
+    }
+
+    &&& .ant-table-cell {
+        max-height: 45px !important;
+        height: 45px !important;
+        background-color: inherit;
+        cursor: pointer;
+        padding-top: 0px;
+        padding-bottom: 0px;
+    }
+
+    &&& .selected-row * {
+        .ant-typography mark {
+            background-color: ${REDESIGN_COLORS.HEADING_COLOR} !important;
+        }
+
+        .row-icon-tooltip .ant-tooltip-inner {
+            background: #e5eff1 !important;
+            color: ${REDESIGN_COLORS.DARK_GREY} !important;
+        }
+
+        .ant-tag {
+            background-color: ${REDESIGN_COLORS.WHITE};
+        }
+    }
+
+    &&& .selected-row {
+        background: ${colors.gray[100]} !important;
+    }
+
+    &&& .level-0 td .row-icon-container .row-icon {
+        ${(props) => (props.isSearchActive && props.hasRowWithDepth ? '' : `display: none;`)}
+    }
+
+    &&& .level-1 td .row-icon-container .row-icon {
+        ${(props) => (props.isSearchActive && props.hasRowWithDepth ? '' : `display: none;`)}
+    }
+
+    &&& tr.expanded-row td:first-of-type {
+        border-left: ${(props) =>
+            props.isSearchActive ? '4px solid #ffffff00' : `4px solid ${REDESIGN_COLORS.BACKGROUND_PURPLE}`};
+    }
+
+    &&& .expanded-child > td {
+        .depth-container {
+            background: ${REDESIGN_COLORS.PRIMARY_PURPLE};
+        }
+
+        .depth-text {
+            background: transparent;
+        }
+    }
+
+    &&& .description-column {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        max-width: 400px;
+    }
+
+    // this makes the table fill up height of parent
+    .ant-spin-nested-loading {
+        height: 100%;
+        .ant-spin-container {
+            height: 100%;
+            .ant-table {
+                height: 100%;
+                .ant-table-container {
+                    height: 100%;
+                    .ant-table-body {
+                        height: 100%;
+                    }
+                    .ant-table-body > div:first-child {
+                        height: 100%;
+                    }
+                }
+            }
+        }
+    }
+`;
+
+export type Props = {
+    rows: Array<ExtendedSchemaFields>;
+    schemaMetadata: SchemaMetadata | undefined | null;
+    editableSchemaMetadata?: EditableSchemaMetadata | null;
+    usageStats?: UsageQueryResult | null;
+    expandedRowsFromFilter?: Set<string>;
+    filterText?: string;
+    inputFields?: SchemaField[];
+    expandedDrawerFieldPath: string | null;
+    setExpandedDrawerFieldPath: (path: string | null) => void;
+    openTimelineDrawer?: boolean;
+    setOpenTimelineDrawer?: any;
+    matches?: {
+        path: string;
+        index: number;
+    }[];
+    refetch?: () => void;
+};
+
+const EMPTY_SET: Set<string> = new Set();
+const TABLE_HEADER_HEIGHT = 52;
+const KEYBOARD_CONTROL_DEBOUNCE_MS = 50;
+
+export default function SchemaTable({
+    rows,
+    schemaMetadata,
+    editableSchemaMetadata,
+    usageStats,
+    expandedRowsFromFilter = EMPTY_SET,
+    filterText = '',
+    inputFields,
+    expandedDrawerFieldPath,
+    setExpandedDrawerFieldPath,
+    openTimelineDrawer = false,
+    setOpenTimelineDrawer,
+    refetch,
+}: Props): JSX.Element {
+    const { urn: entityUrn } = useEntityData();
+
+    const [tableHeight, setTableHeight] = useState(0);
+    const [schemaSorter, setSchemaSorter] = useState<SorterResult<any> | undefined>(undefined);
+
+    const [isSearchActive, setIsSearchActive] = useState<boolean>(false);
+
+    const schemaFields = schemaMetadata ? schemaMetadata.fields : inputFields;
+
+    const [rowDescriptionExpanded, setRowDescriptionExpanded] = useState<{
+        [_: string]: boolean;
+    }>({});
+
+    const handleShowMore = (field) => {
+        setRowDescriptionExpanded({ [field]: true });
+    };
+
+    const descriptionRender = useDescriptionRenderer(editableSchemaMetadata, false, {
+        handleShowMore,
+    });
+    const usageStatsRenderer = useUsageStatsRenderer(usageStats, expandedDrawerFieldPath);
+    const tagRenderer = useTagsAndTermsRenderer(
+        editableSchemaMetadata,
+        {
+            showTags: true,
+            showTerms: false,
+        },
+        filterText,
+        false,
+        true,
+    );
+    const termRenderer = useTagsAndTermsRenderer(
+        editableSchemaMetadata,
+        {
+            showTags: false,
+            showTerms: true,
+        },
+        filterText,
+        false,
+        true,
+    );
+    const extractFieldGlossaryTermsInfo = useExtractFieldGlossaryTermsInfo(editableSchemaMetadata);
+    const extractFieldTagsInfo = useExtractFieldTagsInfo(editableSchemaMetadata);
+    const extractFieldDescription = useExtractFieldDescriptionInfo(editableSchemaMetadata);
+    const schemaTitleRenderer = useSchemaTitleRenderer(entityUrn, schemaMetadata, filterText);
+    const schemaTypeRenderer = useSchemaTypeRenderer();
+
+    const tableColumnStructuredProps = useGetTableColumnProperties();
+    const structuredPropColumns = useGetStructuredPropColumns(tableColumnStructuredProps);
+
+    const fieldColumn = {
+        fixed: 'left' as FixedType,
+        width: 200,
+        title: 'Name',
+        dataIndex: 'fieldPath',
+        key: 'fieldPath',
+        render: schemaTitleRenderer,
+        filtered: true,
+        onCell: () => ({ style: { whiteSpace: 'pre' } }),
+        sorter: (sourceA, sourceB) =>
+            translateFieldPath(sourceA.fieldPath).localeCompare(translateFieldPath(sourceB.fieldPath)),
+    };
+
+    const typeColumn = {
+        width: 100,
+        title: 'Type',
+        dataIndex: 'type',
+        key: 'type',
+        render: schemaTypeRenderer,
+        sorter: (sourceA, sourceB) => sourceA.type.localeCompare(sourceB.type),
+    };
+
+    const descriptionColumn = {
+        ellipsis: true,
+        className: 'description-column',
+        title: 'Description',
+        dataIndex: 'description',
+        key: 'description',
+        render: descriptionRender,
+        sorter: (sourceA, sourceB) =>
+            (extractFieldDescription(sourceA).sanitizedDescription ? 1 : 0) -
+            (extractFieldDescription(sourceB).sanitizedDescription ? 1 : 0),
+    };
+
+    const tagColumn = {
+        width: 100,
+        title: 'Tags',
+        dataIndex: 'globalTags',
+        key: 'tag',
+        render: tagRenderer,
+        sorter: (sourceA, sourceB) =>
+            extractFieldTagsInfo(sourceA).numberOfTags - extractFieldTagsInfo(sourceB).numberOfTags,
+    };
+
+    const termColumn = {
+        width: 200,
+        title: 'Glossary Terms',
+        dataIndex: 'globalTags',
+        key: 'term',
+        render: termRenderer,
+        sorter: (sourceA, sourceB) =>
+            extractFieldGlossaryTermsInfo(sourceA).numberOfTerms - extractFieldGlossaryTermsInfo(sourceB).numberOfTerms,
+    };
+
+    // Function to get the count of each usageStats fieldPath
+    function getCount(fieldPath: any) {
+        const data: any =
+            usageStats?.aggregations?.fields &&
+            usageStats?.aggregations?.fields.find((field) => {
+                return field?.fieldName === fieldPath;
+            });
+        return (data && data.count) ?? 0;
+    }
+
+    const usageColumn = {
+        width: 100,
+        title: 'Stats',
+        dataIndex: 'fieldPath',
+        key: 'usage',
+        render: usageStatsRenderer,
+        sorter: (sourceA, sourceB) => getCount(sourceA.fieldPath) - getCount(sourceB.fieldPath),
+    };
+
+    const allColumns: ColumnsType<ExtendedSchemaFields> = [
+        fieldColumn,
+        typeColumn,
+        descriptionColumn,
+        tagColumn,
+        termColumn,
+        usageColumn,
+    ];
+
+    if (structuredPropColumns) allColumns.splice(allColumns?.length - 1, 0, ...structuredPropColumns);
+
+    const [expandedRows, setExpandedRows] = useState<Set<string>>(new Set());
+
+    useEffect(() => {
+        if (filterText === '') {
+            setIsSearchActive(false);
+        } else setIsSearchActive(true);
+    }, [filterText]);
+
+    useEffect(() => {
+        setExpandedRows((previousRows) => {
+            const finalRowsSet = new Set();
+            expandedRowsFromFilter.forEach((row) => finalRowsSet.add(row));
+            previousRows.forEach((row) => finalRowsSet.add(row));
+            return finalRowsSet as Set<string>;
+        });
+    }, [expandedRowsFromFilter]);
+
+    const [VT, setVT, vtRef] = useVT(() => ({ scroll: { y: tableHeight } }), [tableHeight]);
+    const tableRef = useRef<HTMLDivElement>(null);
+
+    useEffect(() => setVT({ body: { row: SchemaRow } }), [setVT]);
+
+    useDebounce(
+        () => {
+            if (!expandedDrawerFieldPath) return;
+
+            if (tableRef.current) {
+                const tableBody = tableRef.current.querySelector('.ant-table-body');
+                const row = tableBody?.querySelector(`[data-row-key="${expandedDrawerFieldPath}"]`);
+                if (row) {
+                    row.scrollIntoView({ block: 'nearest', behavior: 'smooth' });
+                }
+            }
+            // only scroll to new row on arrow key, navigate from header click or initial load
+        },
+        KEYBOARD_CONTROL_DEBOUNCE_MS,
+        [expandedDrawerFieldPath, tableRef, filterText, schemaSorter],
+    );
+
+    const [shouldScrollToSelectedRow, setShouldScrollToSelectedRow] = useState(true);
+
+    // scroll to expanded field on page load
+    useEffect(() => {
+        if (expandedDrawerFieldPath && shouldScrollToSelectedRow) {
+            const indexToScrollTo = findIndexOfFieldPathExcludingCollapsedFields(
+                expandedDrawerFieldPath,
+                expandedRows,
+                rows,
+                schemaSorter,
+                allColumns.find((column) => column.key === schemaSorter?.columnKey)?.sorter as any,
+            );
+            if (indexToScrollTo >= 0) {
+                setShouldScrollToSelectedRow?.(false);
+                vtRef?.current?.scrollToIndex(indexToScrollTo);
+            }
+        }
+        /* eslint-disable-next-line react-hooks/exhaustive-deps */
+    }, [expandedRows, expandedDrawerFieldPath]);
+
+    const rowClassName = (record) => {
+        let className = '';
+
+        if (expandedDrawerFieldPath === record.fieldPath) {
+            className += 'selected-row';
+        }
+        if (expandedRows.has(record?.fieldPath)) {
+            className += ' expanded-row';
+        }
+        // Add different classes based on depth
+        if (record?.depth < 2) className += ` level-${record?.depth}`;
+        else className += ' level-n';
+
+        const path: string = record?.fieldPath?.toString();
+
+        expandedRows.forEach((row) => {
+            if (path.startsWith(`${row}.`)) {
+                className += ' expanded-child';
+            }
+        });
+
+        return className;
+    };
+
+    const hasSomeRowsWithDepthGreaterThanZero = useMemo(() => rows.some((row) => row.depth || 0 > 1), [rows]);
+
+    const [schemaFieldDrawerFieldPath, setSchemaFieldDrawerFieldPath] = useState(expandedDrawerFieldPath);
+    useDebounce(() => setSchemaFieldDrawerFieldPath(expandedDrawerFieldPath), KEYBOARD_CONTROL_DEBOUNCE_MS, [
+        expandedDrawerFieldPath,
+    ]);
+
+    const dataSource = rows;
+    const [sortedDataSource, setSortedDataSource] = useState(dataSource);
+
+    const [displayedRows, setDisplayedRows] = useState(dataSource);
+    const [sortedDisplayedRows, setSortedDisplayedRows] = useState(displayedRows);
+
+    const { selectPreviousField, selectNextField } = useKeyboardControls(
+        schemaSorter ? sortedDisplayedRows : displayedRows,
+        expandedDrawerFieldPath,
+        setExpandedDrawerFieldPath,
+        expandedRows,
+        setExpandedRows,
+        vtRef?.current,
+    );
+
+    useEffect(() => {
+        const updateDisplayedRows = () => {
+            const visibleRows: ExtendedSchemaFields[] = [];
+
+            const getVisibleRows = (data) => {
+                data.forEach((record) => {
+                    visibleRows.push(record);
+                    if (expandedRows.has(record.fieldPath) && record.children) {
+                        getVisibleRows(record.children);
+                    }
+                });
+            };
+            if (schemaSorter) getVisibleRows(sortedDataSource);
+            else getVisibleRows(dataSource);
+
+            setDisplayedRows(visibleRows);
+            setSortedDisplayedRows(visibleRows);
+        };
+        updateDisplayedRows();
+    }, [expandedRows, dataSource, sortedDataSource, schemaSorter]);
+
+    const sortData = (data, sorter) => {
+        if (sorter.order) {
+            const { field, order } = sorter;
+
+            const column = allColumns.find((col) => col.key === field);
+
+            if (column && column.sorter) {
+                const sortedRows = data.slice().sort((a, b) => {
+                    const sorterFunction = typeof column.sorter === 'function' ? column.sorter : undefined;
+
+                    return sorterFunction ? sorterFunction(a, b) : 0;
+                });
+                return order === 'ascend' ? sortedRows : sortedRows.reverse();
+            }
+        }
+        return data;
+    };
+
+    const handleTableChange = (_, __, sorter, { currentDataSource }) => {
+        setSchemaSorter(sorter as SorterResult<ExtendedSchemaFields>);
+        setSortedDataSource(currentDataSource);
+        const sortedrows = sortData(displayedRows, sorter);
+        setSortedDisplayedRows(sortedrows);
+    };
+
+    return (
+        <>
+            <TableContainer
+                ref={tableRef}
+                isSearchActive={isSearchActive}
+                hasRowWithDepth={hasSomeRowsWithDepthGreaterThanZero}
+            >
+                <ResizeObserver onResize={(dimensions) => setTableHeight(dimensions.height - TABLE_HEADER_HEIGHT)}>
+                    <StyledTable
+                        onChange={handleTableChange}
+                        rowClassName={rowClassName}
+                        columns={allColumns}
+                        dataSource={dataSource}
+                        // rowKey={(record) => `column-${record.fieldPath}`}
+                        rowKey="fieldPath"
+                        scroll={{ x: 'max-content', y: tableHeight }}
+                        components={VT}
+                        expandable={{
+                            expandedRowKeys: [...Array.from(expandedRows)],
+                            defaultExpandAllRows: false,
+
+                            expandRowByClick: false,
+                            expandIcon: (props) => <ExpandIcon {...props} />,
+
+                            onExpand: (expanded, record) => {
+                                if (expanded) {
+                                    setExpandedRows((previousRows) => new Set(previousRows.add(record.fieldPath)));
+                                } else {
+                                    setExpandedRows((previousRows) => {
+                                        previousRows.delete(record.fieldPath);
+                                        return new Set(previousRows);
+                                    });
+                                }
+                            },
+                            indentSize: 0,
+                        }}
+                        pagination={false}
+                        onRow={(record) => ({
+                            onClick: () => {
+                                // shouldScrollToSelectedRow is meant for scrolling on page load, scrolling
+                                // on select for certain screen sizes causes weird UI bug
+                                setShouldScrollToSelectedRow(false);
+                                setExpandedDrawerFieldPath(
+                                    expandedDrawerFieldPath === record.fieldPath ? null : record.fieldPath,
+                                );
+                            },
+                            id: `column-${record.fieldPath}`,
+                        })}
+                        showSorterTooltip={false}
+                    />
+                </ResizeObserver>
+            </TableContainer>
+            {!!schemaFields && (
+                <SchemaFieldDrawer
+                    schemaFields={schemaFields}
+                    expandedDrawerFieldPath={schemaFieldDrawerFieldPath}
+                    editableSchemaMetadata={editableSchemaMetadata}
+                    setExpandedDrawerFieldPath={setExpandedDrawerFieldPath}
+                    openTimelineDrawer={openTimelineDrawer}
+                    setOpenTimelineDrawer={setOpenTimelineDrawer}
+                    selectPreviousField={selectPreviousField}
+                    selectNextField={selectNextField}
+                    usageStats={usageStats}
+                    displayedRows={schemaSorter ? sortedDisplayedRows : displayedRows}
+                    refetch={refetch}
+                    isShowMoreEnabled={
+                        (schemaFieldDrawerFieldPath && rowDescriptionExpanded[schemaFieldDrawerFieldPath]) || false
+                    }
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/__tests__/filterSchemaRows.test.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/__tests__/filterSchemaRows.test.ts
new file mode 100644
index 00000000000000..407a2658130bf6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/__tests__/filterSchemaRows.test.ts
@@ -0,0 +1,286 @@
+import { glossaryTerm1, sampleTag } from '../../../../../../../Mocks';
+import { SchemaField } from '../../../../../../../types.generated';
+import { getTestEntityRegistry } from '../../../../../../../utils/test-utils/TestPageContainer';
+import { filterSchemaRows, SchemaFilterType } from '../utils/filterSchemaRows';
+
+describe('filterSchemaRows', () => {
+    const testEntityRegistry = getTestEntityRegistry();
+    const rows = [
+        { fieldPath: 'customer', description: 'customer description' },
+        { fieldPath: 'testing', description: 'testing description' },
+        { fieldPath: 'shipment', description: 'shipment description' },
+    ] as SchemaField[];
+
+    it('should properly filter schema rows based on field name', () => {
+        const filterText = 'test';
+        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
+        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
+            rows,
+            editableSchemaMetadata,
+            filterText,
+            [SchemaFilterType.Documentation, SchemaFilterType.FieldPath, SchemaFilterType.Tags, SchemaFilterType.Terms],
+            null,
+            testEntityRegistry,
+        );
+
+        expect(filteredRows).toMatchObject([{ fieldPath: 'testing' }]);
+        expect(expandedRowsFromFilter).toMatchObject(new Set());
+    });
+
+    it('should properly filter schema rows based on field name regardless of capitalization', () => {
+        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
+        const filterText = 'TeSt';
+        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
+            rows,
+            editableSchemaMetadata,
+            filterText,
+            [SchemaFilterType.Documentation, SchemaFilterType.FieldPath, SchemaFilterType.Tags, SchemaFilterType.Terms],
+            null,
+            testEntityRegistry,
+        );
+
+        expect(filteredRows).toMatchObject([{ fieldPath: 'testing' }]);
+        expect(expandedRowsFromFilter).toMatchObject(new Set());
+    });
+
+    it('should properly filter schema rows based on description', () => {
+        const filterText = 'testing description';
+        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
+        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
+            rows,
+            editableSchemaMetadata,
+            filterText,
+            [SchemaFilterType.Documentation, SchemaFilterType.FieldPath, SchemaFilterType.Tags, SchemaFilterType.Terms],
+            null,
+            testEntityRegistry,
+        );
+
+        expect(filteredRows).toMatchObject([{ fieldPath: 'testing' }]);
+        expect(expandedRowsFromFilter).toMatchObject(new Set());
+    });
+
+    it('should properly filter schema rows based on description regardless of capitalization', () => {
+        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
+        const filterText = 'TeSting DesCriptioN';
+        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
+            rows,
+            editableSchemaMetadata,
+            filterText,
+            [SchemaFilterType.Documentation, SchemaFilterType.FieldPath, SchemaFilterType.Tags, SchemaFilterType.Terms],
+            null,
+            testEntityRegistry,
+        );
+
+        expect(filteredRows).toMatchObject([{ fieldPath: 'testing' }]);
+        expect(expandedRowsFromFilter).toMatchObject(new Set());
+    });
+
+    it('should properly filter schema rows based on editable description', () => {
+        const editableSchemaMetadata = {
+            editableSchemaFieldInfo: [
+                {
+                    fieldPath: 'customer',
+                    description: 'editable customer description',
+                    globalTags: null,
+                    glossaryTerms: null,
+                },
+            ],
+        };
+        const filterText = 'editable customer description';
+        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
+            rows,
+            editableSchemaMetadata,
+            filterText,
+            [SchemaFilterType.Documentation, SchemaFilterType.FieldPath, SchemaFilterType.Tags, SchemaFilterType.Terms],
+            null,
+            testEntityRegistry,
+        );
+
+        expect(filteredRows).toMatchObject([{ fieldPath: 'customer' }]);
+        expect(expandedRowsFromFilter).toMatchObject(new Set());
+    });
+
+    it('should properly filter schema rows based on editable description regardless of capitalization', () => {
+        const editableSchemaMetadata = {
+            editableSchemaFieldInfo: [
+                {
+                    fieldPath: 'customer',
+                    description: 'editable customer description',
+                    globalTags: null,
+                    glossaryTerms: null,
+                },
+            ],
+        };
+        const filterText = 'EdiTable CuStoMer DesCriptioN';
+        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
+            rows,
+            editableSchemaMetadata,
+            filterText,
+            [SchemaFilterType.Documentation, SchemaFilterType.FieldPath, SchemaFilterType.Tags, SchemaFilterType.Terms],
+            null,
+            testEntityRegistry,
+        );
+
+        expect(filteredRows).toMatchObject([{ fieldPath: 'customer' }]);
+        expect(expandedRowsFromFilter).toMatchObject(new Set());
+    });
+
+    it('should properly filter schema rows based on editable tags', () => {
+        const editableSchemaMetadata = {
+            editableSchemaFieldInfo: [
+                { fieldPath: 'customer', globalTags: { tags: [{ tag: sampleTag }] }, glossaryTerms: null },
+            ],
+        };
+        const filterText = sampleTag.properties.name;
+        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
+            rows,
+            editableSchemaMetadata,
+            filterText,
+            [SchemaFilterType.Documentation, SchemaFilterType.FieldPath, SchemaFilterType.Tags, SchemaFilterType.Terms],
+            null,
+            testEntityRegistry,
+        );
+
+        expect(filteredRows).toMatchObject([{ fieldPath: 'customer' }]);
+        expect(expandedRowsFromFilter).toMatchObject(new Set());
+    });
+
+    it('should properly filter schema rows based on editable glossary terms', () => {
+        const editableSchemaMetadata = {
+            editableSchemaFieldInfo: [
+                { fieldPath: 'shipment', globalTags: null, glossaryTerms: { terms: [{ term: glossaryTerm1 }] } },
+            ],
+        };
+        const filterText = glossaryTerm1.properties?.name as string;
+        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
+            rows,
+            editableSchemaMetadata,
+            filterText,
+            [SchemaFilterType.Documentation, SchemaFilterType.FieldPath, SchemaFilterType.Tags, SchemaFilterType.Terms],
+            null,
+            testEntityRegistry,
+        );
+
+        expect(filteredRows).toMatchObject([{ fieldPath: 'shipment' }]);
+        expect(expandedRowsFromFilter).toMatchObject(new Set());
+    });
+
+    it('should properly filter and find children fields', () => {
+        const rowsWithChildren = [
+            { fieldPath: 'customer' },
+            { fieldPath: 'testing' },
+            { fieldPath: 'customer.child1' },
+            { fieldPath: 'customer.child2' },
+        ] as SchemaField[];
+        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
+        const filterText = 'child';
+        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
+            rowsWithChildren,
+            editableSchemaMetadata,
+            filterText,
+            [SchemaFilterType.Documentation, SchemaFilterType.FieldPath, SchemaFilterType.Tags, SchemaFilterType.Terms],
+            null,
+            testEntityRegistry,
+        );
+
+        expect(filteredRows).toMatchObject([
+            { fieldPath: 'customer' },
+            { fieldPath: 'customer.child1' },
+            { fieldPath: 'customer.child2' },
+        ]);
+        expect(expandedRowsFromFilter).toMatchObject(new Set(['customer']));
+    });
+
+    it('should properly filter and find children fields multiple levels down', () => {
+        const rowsWithChildren = [
+            { fieldPath: 'customer' },
+            { fieldPath: 'testing' },
+            { fieldPath: 'customer.child1' },
+            { fieldPath: 'customer.child1.findMe' },
+            { fieldPath: 'customer.child2' },
+        ] as SchemaField[];
+        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
+        const filterText = 'find';
+        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
+            rowsWithChildren,
+            editableSchemaMetadata,
+            filterText,
+            [SchemaFilterType.Documentation, SchemaFilterType.FieldPath, SchemaFilterType.Tags, SchemaFilterType.Terms],
+            null,
+            testEntityRegistry,
+        );
+
+        expect(filteredRows).toMatchObject([
+            { fieldPath: 'customer' },
+            { fieldPath: 'customer.child1' },
+            { fieldPath: 'customer.child1.findMe' },
+        ]);
+        expect(expandedRowsFromFilter).toMatchObject(new Set(['customer', 'customer.child1']));
+    });
+
+    it('should return only children if skipParents is passed in', () => {
+        const rowsWithChildren = [
+            { fieldPath: 'customer' },
+            { fieldPath: 'testing' },
+            { fieldPath: 'customer.child1' },
+            { fieldPath: 'customer.child1.findMe' },
+            { fieldPath: 'customer.child2' },
+        ] as SchemaField[];
+        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
+        const filterText = 'find';
+        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
+            rowsWithChildren,
+            editableSchemaMetadata,
+            filterText,
+            [SchemaFilterType.Documentation, SchemaFilterType.FieldPath, SchemaFilterType.Tags, SchemaFilterType.Terms],
+            null,
+            testEntityRegistry,
+            true,
+        );
+
+        expect(filteredRows).toMatchObject([{ fieldPath: 'customer.child1.findMe' }]);
+        expect(expandedRowsFromFilter).toMatchObject(new Set());
+    });
+
+    it('should properly filter schema rows based on non-editable tags', () => {
+        const rowsWithTags = [
+            { fieldPath: 'customer' },
+            { fieldPath: 'testing', globalTags: { tags: [{ tag: sampleTag }] } },
+            { fieldPath: 'shipment' },
+        ] as SchemaField[];
+        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
+        const filterText = sampleTag.properties.name;
+        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
+            rowsWithTags,
+            editableSchemaMetadata,
+            filterText,
+            [SchemaFilterType.Documentation, SchemaFilterType.FieldPath, SchemaFilterType.Tags, SchemaFilterType.Terms],
+            null,
+            testEntityRegistry,
+        );
+
+        expect(filteredRows).toMatchObject([{ fieldPath: 'testing' }]);
+        expect(expandedRowsFromFilter).toMatchObject(new Set());
+    });
+
+    it('should properly filter schema rows based on non-editable glossary terms', () => {
+        const rowsWithTerms = [
+            { fieldPath: 'customer' },
+            { fieldPath: 'testing' },
+            { fieldPath: 'shipment', glossaryTerms: { terms: [{ term: glossaryTerm1 }] } },
+        ] as SchemaField[];
+        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
+        const filterText = glossaryTerm1.properties?.name as string;
+        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
+            rowsWithTerms,
+            editableSchemaMetadata,
+            filterText,
+            [SchemaFilterType.Documentation, SchemaFilterType.FieldPath, SchemaFilterType.Tags, SchemaFilterType.Terms],
+            null,
+            testEntityRegistry,
+        );
+
+        expect(filteredRows).toMatchObject([{ fieldPath: 'shipment' }]);
+        expect(expandedRowsFromFilter).toMatchObject(new Set());
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/ConstraintLabels.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/ConstraintLabels.tsx
new file mode 100644
index 00000000000000..08ae83cb6ba443
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/ConstraintLabels.tsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import styled from 'styled-components';
+import { blue, green } from '@ant-design/colors';
+import { ANTD_GRAY } from '../../../../constants';
+
+const Pill = styled.div`
+    background-color: ${ANTD_GRAY[1]};
+    border-radius: 10px;
+    border: 1px solid;
+    font-size: 12px;
+    font-weight: 400;
+
+    padding: 0 8px;
+`;
+
+const PrimaryKeyPill = styled(Pill)`
+    color: ${blue[5]} !important;
+    border-color: ${blue[2]};
+`;
+
+const ForeignKeyPill = styled(Pill)`
+    color: ${green[5]} !important;
+    border-color: ${green[2]};
+`;
+
+const NullablePill = styled(Pill)`
+    color: ${ANTD_GRAY[7]} !important;
+    border-color: ${ANTD_GRAY[7]};
+`;
+
+export function PrimaryKeyLabel() {
+    return <PrimaryKeyPill>Primary Key</PrimaryKeyPill>;
+}
+
+export function ForeignKeyLabel() {
+    return <ForeignKeyPill>Foreign Key</ForeignKeyPill>;
+}
+
+export function PartitioningKeyLabel() {
+    return <PrimaryKeyPill>Partition Key</PrimaryKeyPill>;
+}
+
+export default function NullableLabel() {
+    return <NullablePill>Nullable</NullablePill>;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/ExpandIcon.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/ExpandIcon.tsx
new file mode 100644
index 00000000000000..59d908b8f8095a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/ExpandIcon.tsx
@@ -0,0 +1,150 @@
+import { DownOutlined, RightOutlined } from '@ant-design/icons';
+import { Typography } from 'antd';
+import { Tooltip } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import RowIcon from '../../../../../../../images/row-icon.svg?react';
+import { REDESIGN_COLORS, SEARCH_COLORS } from '../../../../constants';
+
+const Prefix = styled.div<{ padding: number }>`
+    position: absolute;
+    min-height: 100%;
+    margin-bottom: -1px;
+    top: -1px;
+`;
+
+const IconContainer = styled.div`
+    vertical-align: middle;
+    display: inline-flex;
+    gap: 5px;
+`;
+
+const Padding = styled.span<{ padding: number }>`
+    margin-left: ${(props) => props.padding}px;
+`;
+
+const Down = styled(DownOutlined)<{ $isCompact?: boolean }>`
+    :hover {
+        color: ${SEARCH_COLORS.TITLE_PURPLE};
+        stroke: ${SEARCH_COLORS.TITLE_PURPLE};
+        stroke-width: 140px;
+    }
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    stroke: ${REDESIGN_COLORS.DARK_GREY};
+    stroke-width: 100px;
+    padding-right: 5px;
+    ${(props) =>
+        props.$isCompact &&
+        `
+        font-size: 8px;
+        
+    `}
+`;
+
+const Right = styled(RightOutlined)<{ isCompact?: boolean }>`
+    :hover {
+        stroke: ${SEARCH_COLORS.TITLE_PURPLE};
+        color: ${SEARCH_COLORS.TITLE_PURPLE};
+        stroke-width: 140px;
+    }
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    stroke: ${REDESIGN_COLORS.DARK_GREY};
+    stroke-width: 100px;
+    padding-right: 5px;
+    ${(props) =>
+        props.isCompact &&
+        `
+        font-size: 8px;
+    `}
+`;
+
+const RowIconContainer = styled.div`
+    position: relative;
+    display: flex;
+    align-items: center;
+`;
+
+const DepthContainer = styled.div<{ multipleDigits?: boolean }>`
+    height: ${(props) => (props.multipleDigits ? '20px' : '13px')};
+    width: ${(props) => (props.multipleDigits ? '20px' : '13px')};
+    border-radius: 50%;
+    background: ${REDESIGN_COLORS.PRIMARY_PURPLE};
+    margin-left: -7px;
+    margin-top: -12px;
+    display: flex;
+    align-items: center;
+`;
+
+const DepthNumber = styled(Typography.Text)`
+    margin-left: 4px;
+    background: transparent;
+    color: ${REDESIGN_COLORS.WHITE};
+    font-size: 10px;
+    font-weight: 400;
+`;
+
+const StyledTooltip = styled(Tooltip)`
+    .ant-tooltip-inner {
+        border-radius: 3px;
+        background: #e5eff1;
+        font-size: 10px;
+        font-weight: 400;
+        line-height: 24px;
+        color: ${REDESIGN_COLORS.DARK_GREY};
+    }
+`;
+
+const DEPTH_PADDING = 15;
+
+type Props = {
+    expanded: boolean;
+    onExpand: any;
+    expandable: boolean;
+    record: any;
+    isCompact?: boolean;
+};
+
+export default function ExpandIcon(props: Props) {
+    const { expanded, onExpand, expandable, record, isCompact = false } = props;
+
+    function toggleExpand(e: React.MouseEvent<HTMLSpanElement, MouseEvent>) {
+        e.stopPropagation();
+        onExpand(record, e);
+    }
+
+    return (
+        <>
+            <IconContainer className="row-icon-container">
+                {!isCompact && (
+                    <>
+                        {Array.from({ length: record.depth }, (_, k) => (
+                            <Prefix padding={5 + DEPTH_PADDING * (k + 1)} />
+                        ))}
+                        <Padding padding={DEPTH_PADDING * (record.depth + 1)} />
+                        <StyledTooltip
+                            placement="bottom"
+                            title={`${record.depth + 1} level${record.depth === 0 ? '' : 's'} nested`}
+                            getPopupContainer={(triggerNode) => triggerNode}
+                            showArrow={false}
+                            className="row-icon-tooltip"
+                        >
+                            <RowIconContainer className="row-icon">
+                                <RowIcon height={16} width={16} />
+                                <DepthContainer multipleDigits={record.depth >= 9} className="depth-container">
+                                    <DepthNumber className="depth-text">{record.depth + 1}</DepthNumber>
+                                </DepthContainer>
+                            </RowIconContainer>
+                        </StyledTooltip>
+                    </>
+                )}
+                {expandable &&
+                    record.children !== undefined &&
+                    (expanded ? (
+                        <Down onClick={toggleExpand} $isCompact={isCompact} />
+                    ) : (
+                        <Right onClick={toggleExpand} isCompact={isCompact} />
+                    ))}
+            </IconContainer>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/MenuColumn.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/MenuColumn.tsx
new file mode 100644
index 00000000000000..f6682bf0f4e183
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/MenuColumn.tsx
@@ -0,0 +1,78 @@
+import React from 'react';
+import { VscGraphLeft } from 'react-icons/vsc';
+import { CopyOutlined } from '@ant-design/icons';
+import styled from 'styled-components/macro';
+import { Dropdown, Menu } from 'antd';
+import { MenuIcon } from '../../../../EntityDropdown/EntityMenuActions';
+import { useEntityData, useRouteToTab } from '../../../../../../entity/shared/EntityContext';
+import { SchemaField } from '../../../../../../../types.generated';
+import { generateSchemaFieldUrn } from '../../../Lineage/utils';
+
+export const ImpactAnalysisIcon = styled(VscGraphLeft)`
+    transform: scaleX(-1);
+    font-size: 18px;
+`;
+
+export const CopyOutlinedIcon = styled(CopyOutlined)`
+    transform: scaleX(-1);
+    font-size: 16px;
+`;
+
+const MenuItem = styled.div`
+    align-items: center;
+    display: flex;
+    font-size: 12px;
+    padding: 0 4px;
+    color: #262626;
+`;
+
+interface Props {
+    field: SchemaField;
+}
+
+export default function MenuColumn({ field }: Props) {
+    const routeToTab = useRouteToTab();
+    const { urn } = useEntityData();
+    const selectedColumnUrn = generateSchemaFieldUrn(field.fieldPath, urn);
+
+    return (
+        <Dropdown
+            overlay={
+                <Menu>
+                    <Menu.Item key="0" onClick={(e) => e.domEvent.stopPropagation()}>
+                        <MenuItem
+                            onClick={() => routeToTab({ tabName: 'Lineage', tabParams: { column: field.fieldPath } })}
+                        >
+                            <ImpactAnalysisIcon /> &nbsp; See Column Lineage
+                        </MenuItem>
+                    </Menu.Item>
+                    {navigator.clipboard && (
+                        <Menu.Item key="1" onClick={(e) => e.domEvent.stopPropagation()}>
+                            <MenuItem
+                                onClick={() => {
+                                    navigator.clipboard.writeText(field.fieldPath);
+                                }}
+                            >
+                                <CopyOutlinedIcon /> &nbsp; Copy Column Field Path
+                            </MenuItem>
+                        </Menu.Item>
+                    )}
+                    {navigator.clipboard && (
+                        <Menu.Item key="2" onClick={(e) => e.domEvent.stopPropagation()}>
+                            <MenuItem
+                                onClick={() => {
+                                    navigator.clipboard.writeText(selectedColumnUrn || '');
+                                }}
+                            >
+                                <CopyOutlinedIcon /> &nbsp; Copy Column Urn
+                            </MenuItem>
+                        </Menu.Item>
+                    )}
+                </Menu>
+            }
+            trigger={['click']}
+        >
+            <MenuIcon fontSize={16} onClick={(e) => e.stopPropagation()} />
+        </Dropdown>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/NestedRowIcon.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/NestedRowIcon.tsx
new file mode 100644
index 00000000000000..eb172ce9179728
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/NestedRowIcon.tsx
@@ -0,0 +1,44 @@
+import { Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { REDESIGN_COLORS } from '../../../../constants';
+import RowIcon from '../../../../../../../images/row-icon.svg?react';
+
+const RowIconContainer = styled.div`
+    position: relative;
+    display: flex;
+    align-items: center;
+`;
+const DepthContainer = styled.div`
+    height: 13px;
+    width: 13px;
+    border-radius: 50%;
+    background: ${REDESIGN_COLORS.WHITE};
+    margin-left: -7px;
+    margin-top: -12px;
+    display: flex;
+    align-items: center;
+`;
+
+const DepthNumber = styled(Typography.Text)`
+    margin-left: 4px;
+    background: transparent;
+    color: ${REDESIGN_COLORS.PRIMARY_PURPLE};
+    font-size: 10px;
+    font-weight: 400;
+`;
+
+type Props = {
+    depth: number;
+};
+
+export default function NestedRowIcon({ depth }: Props) {
+    return (
+        <RowIconContainer className="row-icon">
+            <RowIcon height={16} width={16} />
+            <DepthContainer className="depth-container">
+                <DepthNumber className="depth-text">{depth}</DepthNumber>
+            </DepthContainer>
+        </RowIconContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/AboutFieldTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/AboutFieldTab.tsx
new file mode 100644
index 00000000000000..d6d4caee20e46b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/AboutFieldTab.tsx
@@ -0,0 +1,115 @@
+import SidebarStructuredProperties from '@src/app/entityV2/shared/sidebarSection/SidebarStructuredProperties';
+import moment from 'moment';
+import React, { useMemo } from 'react';
+import styled from 'styled-components';
+import {
+    DatasetFieldProfile,
+    EditableSchemaMetadata,
+    Post,
+    SchemaField,
+    UsageQueryResult,
+} from '../../../../../../../../types.generated';
+import { useMutationUrn } from '../../../../../../../entity/shared/EntityContext';
+import { pathMatchesNewPath } from '../../../../../../dataset/profile/schema/utils/utils';
+import NotesSection from '../../../../../notes/NotesSection';
+import FieldDescription from './FieldDescription';
+import { FieldDetails } from './FieldDetails';
+import FieldTags from './FieldTags';
+import FieldTerms from './FieldTerms';
+import SampleValuesSection from './SampleValuesSection';
+import StatsSection from './StatsSection';
+import { StyledDivider } from './components';
+
+const MetadataSections = styled.div`
+    padding: 16px 12px;
+    padding-top: 0px;
+`;
+
+interface AboutFieldTabProps {
+    properties: {
+        schemaFields: SchemaField[];
+        expandedDrawerFieldPath: string | null;
+        editableSchemaMetadata?: EditableSchemaMetadata | null;
+        usageStats?: UsageQueryResult | null;
+        fieldProfile: DatasetFieldProfile | undefined;
+        profiles: any[];
+        notes: Post[];
+        setSelectedTabName: any;
+        isShowMoreEnabled?: boolean;
+        refetch?: () => void;
+        refetchNotes?: () => void;
+    };
+}
+
+export function AboutFieldTab({ properties }: AboutFieldTabProps) {
+    const datasetUrn = useMutationUrn();
+    const { refetch, refetchNotes } = properties;
+
+    const expandedFieldIndex = useMemo(
+        () => properties.schemaFields.findIndex((row) => row.fieldPath === properties.expandedDrawerFieldPath),
+        [properties.expandedDrawerFieldPath, properties.schemaFields],
+    );
+    const expandedField =
+        expandedFieldIndex !== undefined && expandedFieldIndex !== -1
+            ? properties.schemaFields[expandedFieldIndex]
+            : undefined;
+    const editableFieldInfo = properties.editableSchemaMetadata?.editableSchemaFieldInfo.find(
+        (candidateEditableFieldInfo) =>
+            pathMatchesNewPath(candidateEditableFieldInfo.fieldPath, expandedField?.fieldPath),
+    );
+
+    const notes = properties.notes?.sort((a, b) => moment(b.lastModified.time).diff(moment(a.lastModified.time))) || [];
+
+    const delayedRefetchNotes = () =>
+        setTimeout(() => refetchNotes?.(), 2000) && setTimeout(() => refetchNotes?.(), 5000);
+
+    return (
+        <>
+            {expandedField && (
+                <>
+                    <FieldDetails
+                        usageStats={properties.usageStats}
+                        deprecation={expandedField?.schemaFieldEntity?.deprecation}
+                        fieldPath={properties.expandedDrawerFieldPath}
+                        refetch={() => setTimeout(() => refetch?.(), 2000)}
+                        refetchNotes={delayedRefetchNotes}
+                    />
+                    <MetadataSections>
+                        <NotesSection
+                            urn={datasetUrn}
+                            subResource={properties.expandedDrawerFieldPath ?? undefined}
+                            notes={notes}
+                            refetch={delayedRefetchNotes}
+                        />
+                        {!!notes?.length && <StyledDivider dashed />}
+                        <FieldDescription
+                            expandedField={expandedField}
+                            editableFieldInfo={editableFieldInfo}
+                            isShowMoreEnabled={properties.isShowMoreEnabled}
+                        />
+                        <FieldTags
+                            expandedField={expandedField}
+                            editableSchemaMetadata={properties.editableSchemaMetadata}
+                        />
+                        <FieldTerms
+                            expandedField={expandedField}
+                            editableSchemaMetadata={properties.editableSchemaMetadata}
+                        />
+                        <SidebarStructuredProperties
+                            properties={{
+                                isSchemaSidebar: true,
+                                refetch,
+                                fieldEntity: expandedField.schemaFieldEntity,
+                            }}
+                        />
+                        <StatsSection
+                            fieldProfile={properties.fieldProfile}
+                            setSelectedTabName={properties.setSelectedTabName}
+                        />
+                        <SampleValuesSection fieldProfile={properties.fieldProfile} />
+                    </MetadataSections>
+                </>
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/DrawerFooter.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/DrawerFooter.tsx
new file mode 100644
index 00000000000000..714cd633ede017
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/DrawerFooter.tsx
@@ -0,0 +1,90 @@
+import React from 'react';
+import styled from 'styled-components';
+import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp';
+import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
+import { pluralize } from '../../../../../../../shared/textUtil';
+import { REDESIGN_COLORS } from '../../../../../constants';
+import { ExtendedSchemaFields } from '../../../../../../dataset/profile/schema/utils/types';
+
+const HeaderWrapper = styled.div`
+    position: absolute;
+    align-self: flex-end;
+    display: flex;
+    justify-content: center;
+    align-self: center;
+    margin-bottom: 16px;
+    padding: 2px 4px;
+    background: #d9d9d9;
+    opacity: 0.8;
+    border-radius: 15.5px;
+    width: max-content;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    bottom: 0px;
+`;
+
+const StyledIcon = styled.div`
+    font-size: 12px;
+    padding: 0;
+    height: 26px;
+    width: 26px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: transparent;
+    border: none;
+
+    &&:hover {
+        cursor: pointer;
+        stroke: ${REDESIGN_COLORS.DARK_GREY};
+        stroke-width: 1px;
+    }
+
+    svg {
+        height: 20px;
+        width: 20px;
+        color: ${REDESIGN_COLORS.DARK_GREY};
+    }
+`;
+
+const FieldIndexText = styled.span`
+    font-size: 12px;
+    font-weight: 800;
+    color: ${REDESIGN_COLORS.HEADING_COLOR};
+    margin: 0 8px;
+`;
+
+const ButtonsWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+`;
+
+interface Props {
+    expandedFieldIndex?: number;
+    selectPreviousField: () => void;
+    selectNextField: () => void;
+    displayedRows: ExtendedSchemaFields[];
+}
+
+export default function DrawerFooter({
+    expandedFieldIndex = 0,
+    selectPreviousField,
+    selectNextField,
+    displayedRows,
+}: Props) {
+    return (
+        <HeaderWrapper>
+            <ButtonsWrapper>
+                <StyledIcon onClick={selectPreviousField}>
+                    <KeyboardArrowUpIcon />
+                </StyledIcon>
+                <FieldIndexText>
+                    {expandedFieldIndex + 1} of {displayedRows.length} {pluralize(displayedRows.length, 'field')}
+                </FieldIndexText>
+                <StyledIcon onClick={selectNextField}>
+                    <KeyboardArrowDownIcon />
+                </StyledIcon>
+            </ButtonsWrapper>
+        </HeaderWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx
new file mode 100644
index 00000000000000..a7b9f65d7e5014
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx
@@ -0,0 +1,181 @@
+import { PlusOutlined } from '@ant-design/icons';
+import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
+import { message } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { useUpdateDescriptionMutation } from '../../../../../../../../graphql/mutations.generated';
+import { EditableSchemaFieldInfo, SchemaField, SubResourceType } from '../../../../../../../../types.generated';
+import analytics, { EntityActionType, EventType } from '../../../../../../../analytics';
+import SchemaEditableContext from '../../../../../../../shared/SchemaEditableContext';
+import { useEntityData, useMutationUrn, useRefetch } from '../../../../../../../entity/shared/EntityContext';
+import UpdateDescriptionModal from '../../../../../components/legacy/DescriptionModal';
+import { REDESIGN_COLORS } from '../../../../../constants';
+import DescriptionSection from '../../../../../containers/profile/sidebar/AboutSection/DescriptionSection';
+import SectionActionButton from '../../../../../containers/profile/sidebar/SectionActionButton';
+import { SidebarSection } from '../../../../../containers/profile/sidebar/SidebarSection';
+import { useSchemaRefetch } from '../../SchemaContext';
+import { StyledDivider } from './components';
+import { sanitizeRichText } from '../../../../Documentation/components/editor/utils';
+import { getFieldDescriptionDetails } from '../../utils/getFieldDescriptionDetails';
+import DocumentationPropagationDetails from '../../../../../../../sharedV2/propagation/DocumentationPropagationDetails';
+
+const AddNewDescription = styled.div`
+    margin: 0px;
+    padding: 0px;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    :hover {
+        cursor: pointer;
+        color: ${REDESIGN_COLORS.LINK_HOVER_BLUE};
+    }
+`;
+
+const StyledPlusOutlined = styled(PlusOutlined)`
+    && {
+        font-size: 10px;
+        margin-right: 8px;
+    }
+`;
+
+const AddDescriptionText = styled.span`
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    font-size: 12px;
+    font-weight: 500;
+    line-height: 16px;
+    :hover {
+        color: ${REDESIGN_COLORS.LINK_HOVER_BLUE};
+    }
+`;
+
+const DescriptionWrapper = styled.div`
+    display: flex;
+    gap: 4px;
+    align-items: center;
+`;
+
+interface Props {
+    expandedField: SchemaField;
+    editableFieldInfo?: EditableSchemaFieldInfo;
+    isShowMoreEnabled?: boolean;
+}
+
+export default function FieldDescription({ expandedField, editableFieldInfo, isShowMoreEnabled }: Props) {
+    const isSchemaEditable = React.useContext(SchemaEditableContext);
+    const urn = useMutationUrn();
+    const refetch = useRefetch();
+    const schemaRefetch = useSchemaRefetch();
+    const [updateDescription] = useUpdateDescriptionMutation();
+    const [isModalVisible, setIsModalVisible] = useState(false);
+    const { entityType } = useEntityData();
+
+    const sendAnalytics = () => {
+        analytics.event({
+            type: EventType.EntityActionEvent,
+            actionType: EntityActionType.UpdateSchemaDescription,
+            entityType,
+            entityUrn: urn,
+        });
+    };
+
+    const refresh: any = () => {
+        refetch?.();
+        schemaRefetch?.();
+    };
+
+    const onSuccessfulMutation = () => {
+        refresh();
+        sendAnalytics();
+        message.destroy();
+        message.success({ content: 'Updated!', duration: 2 });
+    };
+
+    const onFailMutation = (e) => {
+        message.destroy();
+        if (e instanceof Error) message.error({ content: `Proposal Failed! \n ${e.message || ''}`, duration: 2 });
+    };
+    const onClose = () => {
+        setIsModalVisible(false);
+    };
+
+    const generateMutationVariables = (updatedDescription: string) => {
+        return {
+            variables: {
+                input: {
+                    description: sanitizeRichText(updatedDescription),
+                    resourceUrn: urn,
+                    subResource: expandedField.fieldPath,
+                    subResourceType: SubResourceType.DatasetField,
+                },
+            },
+        };
+    };
+
+    const { schemaFieldEntity, description } = expandedField;
+    const { displayedDescription, isPropagated, sourceDetail, propagatedDescription } = getFieldDescriptionDetails({
+        schemaFieldEntity,
+        editableFieldInfo,
+        defaultDescription: description,
+    });
+
+    return (
+        <>
+            <SidebarSection
+                title="Description"
+                extra={
+                    isSchemaEditable && (
+                        <SectionActionButton
+                            onClick={(e) => {
+                                e.preventDefault();
+                                e.stopPropagation();
+                                setIsModalVisible(true);
+                            }}
+                            button={<EditOutlinedIcon />}
+                        />
+                    )
+                }
+                content={
+                    <>
+                        {!displayedDescription &&
+                            isSchemaEditable && [
+                                <AddNewDescription
+                                    onClick={() => {
+                                        setIsModalVisible(true);
+                                    }}
+                                >
+                                    <StyledPlusOutlined />
+                                    <AddDescriptionText>Add Description</AddDescriptionText>
+                                </AddNewDescription>,
+                            ]}
+                        <DescriptionWrapper>
+                            {isPropagated && <DocumentationPropagationDetails sourceDetail={sourceDetail} />}
+                            {!!displayedDescription && (
+                                <DescriptionSection
+                                    description={displayedDescription}
+                                    isShowMoreEnabled={isShowMoreEnabled}
+                                    isExpandable
+                                />
+                            )}
+                        </DescriptionWrapper>
+                    </>
+                }
+            />
+            {isModalVisible && (
+                <UpdateDescriptionModal
+                    title={displayedDescription ? 'Update description' : 'Add description'}
+                    description={displayedDescription || ''}
+                    original={expandedField.description || ''}
+                    propagatedDescription={propagatedDescription || ''}
+                    onClose={onClose}
+                    onSubmit={(updatedDescription: string) => {
+                        message.loading({ content: 'Updating...' });
+                        updateDescription(generateMutationVariables(updatedDescription))
+                            .then(onSuccessfulMutation)
+                            .catch(onFailMutation);
+                        onClose();
+                    }}
+                    isAddDesc={!displayedDescription}
+                />
+            )}
+            <StyledDivider dashed />
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDetails.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDetails.tsx
new file mode 100644
index 00000000000000..2a7a16619b11e8
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDetails.tsx
@@ -0,0 +1,169 @@
+import SchemaEditableContext from '@app/shared/SchemaEditableContext';
+import MarkAsDeprecatedButton from '@src/app/entityV2/shared/components/styled/MarkAsDeprecatedButton';
+import { Button, Typography } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { Deprecation, SubResourceType, UsageQueryResult } from '../../../../../../../../types.generated';
+import { useMutationUrn } from '../../../../../../../entity/shared/EntityContext';
+import { UpdateDeprecationModal } from '../../../../../EntityDropdown/UpdateDeprecationModal';
+import CreateEntityAnnouncementModal from '../../../../../announce/CreateEntityAnnouncementModal';
+import { DeprecationIcon } from '../../../../../components/styled/DeprecationIcon';
+import { REDESIGN_COLORS } from '../../../../../constants';
+import { FieldPopularity } from './FieldPopularity';
+
+const FieldDetailsWrapper = styled.div`
+    padding: 16px 12px;
+`;
+
+const FieldDetailsContent = styled.div`
+    display: flex;
+    gap: 10px;
+    border-bottom: 1px dashed;
+    border-color: rgba(0, 0, 0, 0.3);
+    padding-bottom: 16px;
+    & > div {
+        &:not(:first-child) {
+            border-left: 1px dashed;
+            border-color: rgba(0, 0, 0, 0.3);
+        }
+    }
+`;
+
+const PopularityContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 5px;
+    padding: 0px 12px;
+`;
+
+const NotesWrapper = styled.div`
+    align-items: start;
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    padding: 0px 16px;
+`;
+
+const DeprecationWrapper = styled.div`
+    align-items: start;
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    padding: 0px 16px;
+`;
+
+const MarkAsDeprecatedButtonContainer = styled.div`
+    margin-left: -4px;
+`;
+
+const DetailLabel = styled(Typography.Text)`
+    color: rgb(55, 64, 102);
+    font-size: 12px;
+    font-weight: 600;
+    line-height: 16px;
+`;
+
+const DetailValue = styled(Typography.Text)`
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    opacity: 0.5;
+    font-size: 12px;
+    font-weight: 500;
+    line-height: 16px;
+    width: max-content;
+`;
+
+type FieldDetailsProps = {
+    fieldPath: string | null;
+    deprecation?: Deprecation | null;
+    usageStats?: UsageQueryResult | null;
+    refetch?: () => void;
+    refetchNotes?: () => void;
+};
+
+export const FieldDetails = ({ fieldPath, deprecation, usageStats, refetch, refetchNotes }: FieldDetailsProps) => {
+    const isSchemaEditable = React.useContext(SchemaEditableContext);
+    const [isDeprecationModalVisible, setIsDeprecationModalVisible] = useState(false);
+    const [isPostModalVisible, setIsPostModalVisible] = useState(false);
+
+    const datasetUrn = useMutationUrn();
+
+    return (
+        <FieldDetailsWrapper>
+            {isDeprecationModalVisible && (
+                <UpdateDeprecationModal
+                    urns={[datasetUrn || '']}
+                    resourceRefs={[
+                        {
+                            resourceUrn: datasetUrn,
+                            subResource: fieldPath,
+                            subResourceType: SubResourceType.DatasetField,
+                        },
+                    ]}
+                    onClose={() => setIsDeprecationModalVisible(false)}
+                    refetch={refetch}
+                    zIndexOverride={1000}
+                />
+            )}
+            {isPostModalVisible && (
+                <CreateEntityAnnouncementModal
+                    subResource={fieldPath}
+                    urn={datasetUrn}
+                    onClose={() => setIsPostModalVisible(false)}
+                    onCreate={refetchNotes}
+                />
+            )}
+            <FieldDetailsContent>
+                <PopularityContainer>
+                    <DetailLabel>Popularity</DetailLabel>
+                    <DetailValue>
+                        <FieldPopularity
+                            isFieldSelected={false}
+                            usageStats={usageStats}
+                            fieldPath={fieldPath}
+                            displayOnDrawer
+                        />
+                    </DetailValue>
+                </PopularityContainer>
+                <NotesWrapper>
+                    <DetailLabel>Notes</DetailLabel>
+                    {isSchemaEditable && (
+                        <Button
+                            type="text"
+                            style={{
+                                width: 70,
+                                padding: 0,
+                                marginTop: -8,
+                                color: REDESIGN_COLORS.LINK_GREY,
+                            }}
+                            onClick={() => {
+                                setIsPostModalVisible(true);
+                            }}
+                        >
+                            + Add Note
+                        </Button>
+                    )}
+                </NotesWrapper>
+                <DeprecationWrapper>
+                    <DetailLabel>Deprecation</DetailLabel>
+                    {!deprecation?.deprecated && (
+                        <MarkAsDeprecatedButtonContainer>
+                            <MarkAsDeprecatedButton onClick={() => setIsDeprecationModalVisible(true)} />
+                        </MarkAsDeprecatedButtonContainer>
+                    )}
+                    {!!deprecation?.deprecated && (
+                        <DeprecationIcon
+                            urn={datasetUrn}
+                            subResource={fieldPath}
+                            subResourceType={SubResourceType.DatasetField}
+                            deprecation={deprecation}
+                            showUndeprecate
+                            refetch={refetch}
+                            // default zIndex of the popover
+                            zIndexOverride={1030}
+                        />
+                    )}
+                </DeprecationWrapper>
+            </FieldDetailsContent>
+        </FieldDetailsWrapper>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldHeader.tsx
new file mode 100644
index 00000000000000..c4c202c0c22534
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldHeader.tsx
@@ -0,0 +1,139 @@
+import { CloseOutlined } from '@ant-design/icons';
+import { useAppConfig } from '@app/useAppConfig';
+import { Divider } from 'antd';
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import colors from '@src/alchemy-components/theme/foundations/colors';
+import { SchemaField } from '../../../../../../../../types.generated';
+import translateFieldPath from '../../../../../../dataset/profile/schema/utils/translateFieldPath';
+import NullableLabel, { PartitioningKeyLabel, PrimaryKeyLabel } from '../ConstraintLabels';
+import MenuColumn from '../MenuColumn';
+import TypeLabel from '../TypeLabel';
+import FieldPath from './FieldPath';
+import { useEntityRegistry } from '../../../../../../../useEntityRegistry';
+
+const FieldHeaderWrapper = styled.div`
+    padding: 16px;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 1px solid rgb(213, 213, 213);
+`;
+
+const NameTypesWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+`;
+
+const TitleWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 5px;
+    font-size: 16px;
+`;
+
+const RightGroup = styled.div`
+    display: flex;
+    align-items: baseline;
+`;
+
+const MenuWrapper = styled.div`
+    margin-right: 5px;
+`;
+
+const FieldText = styled.div`
+    font-size: 12px;
+    line-height: 24px;
+    color: #8d95b1;
+`;
+
+const CloseIcon = styled.div`
+    font-size: 12px;
+    padding: 0;
+    height: 24px;
+    width: 24px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    &&:hover {
+        cursor: pointer;
+        stroke-width: 10px;
+    }
+
+    svg {
+        height: 16px;
+        width: 16px;
+    }
+`;
+
+const StyledDivider = styled(Divider)`
+    height: 75%;
+    margin: 0;
+`;
+
+const StyledTypeLabel = styled(TypeLabel)`
+    font-size: 14px;
+    color: ${colors.gray[500]};
+`;
+
+const StyleLink = styled(Link)`
+    color: ${colors.gray[800]};
+    font-weight: 700;
+
+    &:hover {
+        text-decoration: underline;
+    }
+`;
+
+interface Props {
+    expandedField: SchemaField;
+    setExpandedDrawerFieldPath: (fieldPath: string | null) => void;
+}
+
+export default function FieldHeader({ expandedField, setExpandedDrawerFieldPath }: Props) {
+    const { config } = useAppConfig();
+    const displayName = translateFieldPath(expandedField.fieldPath || '');
+    const entityRegistry = useEntityRegistry();
+
+    const linkEnabled = config.featureFlags.schemaFieldCLLEnabled;
+
+    return (
+        <FieldHeaderWrapper>
+            <NameTypesWrapper>
+                <TitleWrapper>
+                    {linkEnabled ? (
+                        <StyleLink
+                            to={
+                                expandedField.schemaFieldEntity &&
+                                `${entityRegistry.getEntityUrl(
+                                    expandedField.schemaFieldEntity?.type,
+                                    (expandedField.schemaFieldEntity?.urn as string) || '',
+                                )}/Lineage`
+                            }
+                        >
+                            {displayName.split('.').pop()}
+                        </StyleLink>
+                    ) : (
+                        displayName.split('.').pop()
+                    )}
+                    <StyledDivider type="vertical" />
+                    <StyledTypeLabel type={expandedField.type} nativeDataType={expandedField.nativeDataType} />
+                    {expandedField.isPartOfKey && <PrimaryKeyLabel />}
+                    {expandedField.isPartitioningKey && <PartitioningKeyLabel />}
+                    {expandedField.nullable && <NullableLabel />}
+                    <FieldPath displayName={displayName} setExpandedDrawerFieldPath={setExpandedDrawerFieldPath} />
+                </TitleWrapper>
+                <FieldText>Column</FieldText>
+            </NameTypesWrapper>
+            <RightGroup>
+                <MenuWrapper>
+                    <MenuColumn field={expandedField} />
+                </MenuWrapper>
+                <CloseIcon onClick={() => setExpandedDrawerFieldPath(null)}>
+                    <CloseOutlined />
+                </CloseIcon>
+            </RightGroup>
+        </FieldHeaderWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPath.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPath.tsx
new file mode 100644
index 00000000000000..19cb47d0016d60
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPath.tsx
@@ -0,0 +1,112 @@
+import { EnterOutlined } from '@ant-design/icons';
+import { Divider, Typography } from 'antd';
+import { Popover } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import RowIcon from '../../../../../../../../images/row-icon.svg?react';
+import { REDESIGN_COLORS } from '../../../../../constants';
+
+const FieldPathWrapper = styled.div`
+    display: flex;
+    align-self: center;
+    stroke: ${REDESIGN_COLORS.WHITE};
+`;
+
+const PopoverContentWrapper = styled.span`
+    color: ${REDESIGN_COLORS.BLACK};
+`;
+const FieldName = styled(Typography.Text)`
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 24px;
+    // padding-left: 15px;
+    overflow: hidden;
+    display: block;
+    cursor: pointer;
+`;
+const LevelNum = styled(Typography.Text)`
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 24px;
+`;
+
+const StyledDivider = styled(Divider)`
+    margin: 5px;
+    margin-left: 0px;
+    height: 1px;
+    background: ${REDESIGN_COLORS.BLACK};
+    opacity: 0.1;
+`;
+const RowIconContainer = styled.div`
+    position: relative;
+    display: flex;
+    align-items: center;
+`;
+const DepthContainer = styled.div`
+    height: 13px;
+    width: 13px;
+    border-radius: 50%;
+    background: ${REDESIGN_COLORS.WHITE};
+    margin-left: -7px;
+    margin-top: -12px;
+    display: flex;
+    align-items: center;
+`;
+
+const DepthNumber = styled(Typography.Text)`
+    margin-left: 4px;
+    background: transparent;
+    color: ${REDESIGN_COLORS.PRIMARY_PURPLE};
+    font-size: 10px;
+    font-weight: 400;
+`;
+
+interface Props {
+    displayName: string;
+    setExpandedDrawerFieldPath: (fieldPath: string | null) => void;
+}
+
+export default function FieldPath({ displayName, setExpandedDrawerFieldPath }: Props) {
+    const displayNameTokens = displayName.split('.');
+    const isNestedField = displayNameTokens.length > 1;
+    if (!isNestedField) {
+        return null;
+    }
+    const content = (
+        <PopoverContentWrapper>
+            <LevelNum>{displayNameTokens.length} levels nested </LevelNum>
+            <StyledDivider />
+            {displayNameTokens.map((token, idx) => (
+                <FieldName onClick={() => setExpandedDrawerFieldPath(displayNameTokens.slice(0, idx + 1).join('.'))}>
+                    {idx !== 0 && (
+                        <EnterOutlined
+                            style={{
+                                transform: 'scaleX(-1)',
+                                paddingLeft: 6,
+                                fontSize: 14,
+                                fontWeight: 'bolder',
+                            }}
+                        />
+                    )}
+                    {idx === displayNameTokens.length - 1 ? <strong>{token}</strong> : token}
+                </FieldName>
+            ))}
+        </PopoverContentWrapper>
+    );
+    return (
+        <FieldPathWrapper>
+            <Popover
+                content={content}
+                overlayStyle={{ borderRadius: 10, minWidth: 200 }}
+                overlayInnerStyle={{ borderRadius: 10, border: '1px solid #D0DDE0', background: '#F5F9FA' }}
+            >
+                <RowIconContainer className="row-icon">
+                    <RowIcon height={16} width={16} />
+                    <DepthContainer className="depth-container">
+                        <DepthNumber className="depth-text">{displayNameTokens.length}</DepthNumber>
+                    </DepthContainer>
+                </RowIconContainer>
+            </Popover>
+        </FieldPathWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPopularity.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPopularity.tsx
new file mode 100644
index 00000000000000..659cb55794eeb2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldPopularity.tsx
@@ -0,0 +1,48 @@
+import React, { useMemo } from 'react';
+import { Tooltip } from '@components';
+import { UsageQueryResult } from '../../../../../../../../types.generated';
+import { pathMatchesNewPath } from '../../../../../../dataset/profile/schema/utils/utils';
+import { PopularityBars } from './PopularityBars';
+import { formatNumberWithoutAbbreviation } from '../../../../../../../shared/formatNumber';
+
+type FieldPopularityProps = {
+    isFieldSelected: boolean;
+    usageStats: UsageQueryResult | null | undefined;
+    fieldPath: string | null;
+    displayOnDrawer?: boolean;
+};
+export const FieldPopularity = ({ isFieldSelected, usageStats, fieldPath, displayOnDrawer }: FieldPopularityProps) => {
+    const maxFieldUsageCount = useMemo(
+        () => Math.max(...(usageStats?.aggregations?.fields?.map((field) => field?.count || 0) || [])),
+        [usageStats],
+    );
+    const relevantUsageStats = usageStats?.aggregations?.fields?.find((fieldStats) =>
+        pathMatchesNewPath(fieldStats?.fieldName, fieldPath),
+    );
+
+    let usageStatus;
+
+    if (relevantUsageStats) {
+        const percentage = ((relevantUsageStats.count || 0) / maxFieldUsageCount) * 100;
+        usageStatus = Math.ceil((percentage / 100) * 3);
+    }
+    return (
+        <Tooltip
+            placement="top"
+            title={
+                relevantUsageStats
+                    ? `${formatNumberWithoutAbbreviation(relevantUsageStats.count || 0)} queries / month`
+                    : 'No column usage data'
+            }
+            showArrow={false}
+        >
+            <div>
+                <PopularityBars
+                    status={usageStatus}
+                    isFieldSelected={isFieldSelected}
+                    size={displayOnDrawer ? 'default' : 'small'}
+                />
+            </div>
+        </Tooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTags.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTags.tsx
new file mode 100644
index 00000000000000..f92120ae5d77e0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTags.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import { EditableSchemaMetadata, GlobalTags, SchemaField } from '../../../../../../../../types.generated';
+import SchemaEditableContext from '../../../../../../../shared/SchemaEditableContext';
+import { SidebarSection } from '../../../../../containers/profile/sidebar/SidebarSection';
+import useTagsAndTermsRenderer from '../../utils/useTagsAndTermsRenderer';
+import { StyledDivider } from './components';
+
+interface Props {
+    expandedField: SchemaField;
+    editableSchemaMetadata?: EditableSchemaMetadata | null;
+}
+
+export default function FieldTags({ expandedField, editableSchemaMetadata }: Props) {
+    const isSchemaEditable = React.useContext(SchemaEditableContext);
+    const tagRenderer = useTagsAndTermsRenderer(
+        editableSchemaMetadata,
+        {
+            showTags: true,
+            showTerms: false,
+        },
+        '',
+        isSchemaEditable,
+    );
+
+    return (
+        <>
+            <SidebarSection title="Tags" content={tagRenderer(expandedField.globalTags as GlobalTags, expandedField)} />
+            <StyledDivider dashed />
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTerms.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTerms.tsx
new file mode 100644
index 00000000000000..7f1885810e944b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTerms.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import { EditableSchemaMetadata, GlobalTags, SchemaField } from '../../../../../../../../types.generated';
+import SchemaEditableContext from '../../../../../../../shared/SchemaEditableContext';
+import { SidebarSection } from '../../../../../containers/profile/sidebar/SidebarSection';
+import useTagsAndTermsRenderer from '../../utils/useTagsAndTermsRenderer';
+import { StyledDivider } from './components';
+
+interface Props {
+    expandedField: SchemaField;
+    editableSchemaMetadata?: EditableSchemaMetadata | null;
+}
+
+export default function FieldTerms({ expandedField, editableSchemaMetadata }: Props) {
+    const isSchemaEditable = React.useContext(SchemaEditableContext);
+    const termRenderer = useTagsAndTermsRenderer(
+        editableSchemaMetadata,
+        {
+            showTags: false,
+            showTerms: true,
+        },
+        '',
+        isSchemaEditable,
+    );
+
+    return (
+        <>
+            <SidebarSection
+                title="Glossary Terms"
+                content={termRenderer(expandedField.globalTags as GlobalTags, expandedField)}
+            />
+            <StyledDivider dashed />
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTitle.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTitle.tsx
new file mode 100644
index 00000000000000..886c1d5bc9e84e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTitle.tsx
@@ -0,0 +1,26 @@
+import { Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { REDESIGN_COLORS } from '../../../../../constants';
+
+const FieldName = styled(Typography.Text)`
+    color: ${REDESIGN_COLORS.WHITE_WIRE};
+    font-size: 16px;
+    font-weight: 700;
+    line-height: 24px;
+    overflow: hidden;
+    display: block;
+    cursor: pointer;
+    :hover {
+        font-weight: bold;
+    }
+`;
+
+interface Props {
+    displayName: string;
+}
+
+export default function FieldTitle({ displayName }: Props) {
+    const name = displayName.split('.').pop();
+    return <FieldName>{name}</FieldName>;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats.tsx
new file mode 100644
index 00000000000000..9becd812895c6e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats.tsx
@@ -0,0 +1,65 @@
+import React, { useMemo } from 'react';
+import styled from 'styled-components';
+import { GetDatasetQuery } from '../../../../../../../../graphql/dataset.generated';
+import { useBaseEntity } from '../../../../../../../entity/shared/EntityContext';
+import { ANTD_GRAY_V2 } from '../../../../../constants';
+import { SectionHeader } from './components';
+import { pathMatchesNewPath } from '../../../../../../dataset/profile/schema/utils/utils';
+import { UsageBar } from '../../utils/useUsageStatsRenderer';
+import { SchemaField } from '../../../../../../../../types.generated';
+import { formatNumberWithoutAbbreviation } from '../../../../../../../shared/formatNumber';
+
+const USAGE_BAR_MAX_WIDTH = 100;
+
+const UsageBarWrapper = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const UsageBarBackground = styled.div`
+    background-color: ${ANTD_GRAY_V2[3]};
+    border-radius: 2px;
+    height: 4px;
+    width: ${USAGE_BAR_MAX_WIDTH}px;
+`;
+
+const UsageTextWrapper = styled.span`
+    margin-left: 8px;
+`;
+
+const UsageSection = styled.div`
+    margin-bottom: 24px;
+`;
+
+interface Props {
+    expandedField: SchemaField;
+}
+
+export default function FieldUsageStats({ expandedField }: Props) {
+    const baseEntity = useBaseEntity<GetDatasetQuery>();
+    const usageStats = baseEntity?.dataset?.usageStats;
+    const hasUsageStats = useMemo(() => (usageStats?.aggregations?.fields?.length || 0) > 0, [usageStats]);
+    const maxFieldUsageCount = useMemo(
+        () => Math.max(...(usageStats?.aggregations?.fields?.map((field) => field?.count || 0) || [])),
+        [usageStats],
+    );
+    const relevantUsageStats = usageStats?.aggregations?.fields?.find((fieldStats) =>
+        pathMatchesNewPath(fieldStats?.fieldName, expandedField.fieldPath),
+    );
+
+    if (!hasUsageStats || !relevantUsageStats) return null;
+
+    return (
+        <UsageSection>
+            <SectionHeader>Usage</SectionHeader>
+            <UsageBarWrapper>
+                <UsageBarBackground>
+                    <UsageBar width={((relevantUsageStats.count || 0) / maxFieldUsageCount) * USAGE_BAR_MAX_WIDTH} />
+                </UsageBarBackground>
+                <UsageTextWrapper>
+                    {formatNumberWithoutAbbreviation(relevantUsageStats.count || 0)} queries / month
+                </UsageTextWrapper>
+            </UsageBarWrapper>
+        </UsageSection>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/PopularityBars.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/PopularityBars.tsx
new file mode 100644
index 00000000000000..c28eb892d4ad34
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/PopularityBars.tsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import styled from 'styled-components';
+
+const Bar = styled.div<{ status: number; bar: number; isFieldSelected: boolean; size: string }>`
+    width: ${(props) => (props.size === 'default' ? '5px' : '3px')};
+    height: ${(props) => 5 * (props.bar + 1)}px;
+    background: ${(props) => {
+        return props.bar <= props.status ? '#533fd1' : '#C6C0E0';
+    }};
+    opacity: ${(props) => (props.isFieldSelected && !(props.bar <= props.status) ? '0.5' : '')};
+    margin-right: ${(props) => (props.size === 'default' ? '3px' : '4px')};
+    border-radius: 20px;
+`;
+
+const BarContainer = styled.div`
+    display: flex;
+    flex-direction: row;
+    align-items: flex-end;
+`;
+
+type PopularityBarsProps = {
+    status: number;
+    isFieldSelected?: boolean;
+    size?: string;
+};
+export const PopularityBars = ({ status, isFieldSelected, size = 'default' }: PopularityBarsProps) => {
+    const renderBars = () => {
+        const bars: any = [];
+        for (let bar = 1; bar <= 3; bar++) {
+            bars.push(
+                <Bar
+                    className="usage-bars"
+                    key={bar}
+                    status={status}
+                    bar={bar}
+                    isFieldSelected={!!isFieldSelected}
+                    size={size}
+                />,
+            );
+        }
+        return bars;
+    };
+
+    return <BarContainer>{renderBars()}</BarContainer>;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SampleValuesSection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SampleValuesSection.tsx
new file mode 100644
index 00000000000000..a5517b5fd6d134
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SampleValuesSection.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import { DatasetFieldProfile } from '../../../../../../../../types.generated';
+import { SidebarSection } from '../../../../../containers/profile/sidebar/SidebarSection';
+import SampleValueTag from '../../../Stats/snapshot/SampleValueTag';
+import { StyledDivider } from './components';
+
+interface Props {
+    fieldProfile: DatasetFieldProfile | undefined;
+}
+
+export default function SampleValuesSection({ fieldProfile }: Props) {
+    // If current field profile doesn't exist or historic profiles don't have multiple profiles of the current field
+    if (!fieldProfile) return null;
+
+    return (
+        <>
+            <SidebarSection
+                title="Sample Values"
+                content={fieldProfile.sampleValues
+                    ?.filter((value) => value !== undefined)
+                    .slice(0, 3)
+                    .map((value) => (
+                        <SampleValueTag value={value} />
+                    ))}
+            />
+            <StyledDivider dashed />
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx
new file mode 100644
index 00000000000000..aac6bab1d6c0a8
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx
@@ -0,0 +1,307 @@
+import { CodeOutlined, ReadOutlined, UnorderedListOutlined } from '@ant-design/icons';
+import { generateSchemaFieldUrn } from '@app/entityV2/shared/tabs/Lineage/utils';
+import { useGetEntitiesNotesQuery } from '@graphql/relationships.generated';
+import QueryStatsOutlinedIcon from '@mui/icons-material/QueryStatsOutlined';
+import { Drawer, Typography } from 'antd';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import styled from 'styled-components';
+import { GetDatasetQuery, useGetDataProfilesLazyQuery } from '../../../../../../../../graphql/dataset.generated';
+import {
+    EditableSchemaMetadata,
+    Post,
+    SchemaField,
+    TimeWindow,
+    UsageQueryResult,
+} from '../../../../../../../../types.generated';
+import { useBaseEntity } from '../../../../../../../entity/shared/EntityContext';
+import { ExtendedSchemaFields } from '../../../../../../dataset/profile/schema/utils/types';
+import { PropertiesTab } from '../../../../Properties/PropertiesTab';
+import { SchemaTimelineSection } from '../../../Timeline/SchemaTimelineSection';
+import { AboutFieldTab } from './AboutFieldTab';
+import DrawerFooter from './DrawerFooter';
+import FieldHeader from './FieldHeader';
+import { SchemaFieldDrawerTabs, TABS_WIDTH } from './SchemaFieldDrawerTabs';
+import SchemaFieldQueriesSidebarTab from './SchemaFieldQueriesSidebarTab';
+import StatsSidebarView from './StatsSidebarView';
+
+const StyledDrawer = styled(Drawer)`
+    &&& .ant-drawer-body {
+        padding: 0;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        height: 100%;
+    }
+
+    &&& .ant-drawer-content-wrapper {
+        box-shadow: -20px 0px 44px 0px rgba(0, 0, 0, 0.1);
+    }
+`;
+
+const DrawerContent = styled.div`
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+`;
+
+const TimelineHeader = styled(Typography.Text)`
+    font-size: 16px;
+    font-weight: 700;
+    line-height: 24px;
+    overflow: hidden;
+    display: block;
+    cursor: pointer;
+`;
+
+const TimelineHeaderWrapper = styled.div`
+    padding: 16px;
+    display: flex;
+    justify-content: space-between;
+`;
+
+const Body = styled.div`
+    display: flex;
+    flex-direction: row;
+    height: 100%;
+`;
+
+const Content = styled.div`
+    flex: 1;
+    border-right: 1px solid #e8e8e8;
+    max-width: calc(100% - ${TABS_WIDTH}px);
+`;
+
+const Tabs = styled.div``;
+
+interface Props {
+    schemaFields: SchemaField[];
+    editableSchemaMetadata?: EditableSchemaMetadata | null;
+    expandedDrawerFieldPath: string | null;
+    setExpandedDrawerFieldPath: (fieldPath: string | null) => void;
+    openTimelineDrawer?: boolean;
+    setOpenTimelineDrawer?: any;
+    selectPreviousField?: () => void;
+    selectNextField?: () => void;
+    usageStats?: UsageQueryResult | null;
+    displayedRows: ExtendedSchemaFields[];
+    refetch?: () => void;
+    mask?: boolean;
+    isShowMoreEnabled?: boolean;
+    defaultSelectedTabName?: string;
+}
+
+export default function SchemaFieldDrawer({
+    schemaFields,
+    editableSchemaMetadata,
+    expandedDrawerFieldPath,
+    setExpandedDrawerFieldPath,
+    openTimelineDrawer,
+    setOpenTimelineDrawer,
+    selectPreviousField,
+    selectNextField,
+    usageStats,
+    displayedRows,
+    refetch,
+    mask = false,
+    isShowMoreEnabled,
+    defaultSelectedTabName = 'About',
+}: Props) {
+    const expandedFieldIndex = useMemo(
+        () => displayedRows.findIndex((row) => row.fieldPath === expandedDrawerFieldPath),
+        [expandedDrawerFieldPath, displayedRows],
+    );
+    const expandedField =
+        expandedFieldIndex !== undefined && expandedFieldIndex !== -1 ? displayedRows[expandedFieldIndex] : undefined;
+
+    const baseEntity = useBaseEntity<GetDatasetQuery>();
+    const latestFullTableProfile = baseEntity?.dataset?.latestFullTableProfile?.[0];
+    const latestPartitionProfile = baseEntity?.dataset?.latestPartitionProfile?.[0];
+
+    const latestProfile = latestFullTableProfile || latestPartitionProfile;
+
+    const fieldProfile = latestProfile?.fieldProfiles?.find(
+        (profile) => profile.fieldPath === expandedField?.fieldPath,
+    );
+
+    const urn = (baseEntity && baseEntity.dataset && baseEntity.dataset?.urn) || '';
+    const siblingUrn =
+        (baseEntity && baseEntity.dataset && baseEntity.dataset?.siblingsSearch?.searchResults?.[0]?.entity?.urn) || '';
+    const schemaFieldUrn = generateSchemaFieldUrn(expandedDrawerFieldPath, urn);
+    const schemaFieldSiblingUrn = generateSchemaFieldUrn(expandedDrawerFieldPath, siblingUrn);
+    const notesUrns = [schemaFieldUrn, schemaFieldSiblingUrn].filter((v): v is string => !!v);
+    const { data: notesData, refetch: refetchNotes } = useGetEntitiesNotesQuery({
+        skip: !notesUrns.length,
+        variables: { urns: notesUrns },
+        fetchPolicy: 'cache-first',
+    });
+    const notes: Post[] =
+        notesData?.entities?.flatMap(
+            (entity) =>
+                (entity?.__typename === 'SchemaFieldEntity' &&
+                    entity?.notes?.relationships?.map((r) => r.entity as Post)) ||
+                [],
+        ) || [];
+
+    const [getDataProfiles, { data: profilesData, loading: profilesDataLoading }] = useGetDataProfilesLazyQuery();
+
+    useEffect(() => {
+        if (urn) {
+            getDataProfiles({
+                variables: { urn },
+            });
+        }
+    }, [urn, getDataProfiles]);
+
+    useEffect(() => {
+        if (
+            displayedRows.length > 0 &&
+            expandedDrawerFieldPath &&
+            !displayedRows.find((row) => row.fieldPath === expandedDrawerFieldPath)
+        ) {
+            setExpandedDrawerFieldPath(null);
+        }
+    }, [displayedRows, expandedDrawerFieldPath, setExpandedDrawerFieldPath]);
+
+    const profiles = profilesData?.dataset?.datasetProfiles || [];
+    const [selectedTabName, setSelectedTabName] = useState(defaultSelectedTabName);
+
+    /**
+     * Fetches updated data profiles when the lookback window is changed in the Historical Chart view.
+     * @param lookbackWindow The new time window for data fetching.
+     */
+    const fetchDataWithLookbackWindow = useCallback(
+        (lookbackWindow: TimeWindow) => {
+            if (urn) {
+                getDataProfiles({
+                    variables: { urn, ...lookbackWindow },
+                });
+            }
+        },
+        [urn, getDataProfiles],
+    );
+
+    const tabs: any = [
+        {
+            name: 'About',
+            icon: ReadOutlined,
+            component: AboutFieldTab,
+            properties: {
+                schemaFields,
+                editableSchemaMetadata,
+                expandedDrawerFieldPath,
+                usageStats,
+                fieldProfile,
+                profiles,
+                notes,
+                isShowMoreEnabled,
+                setSelectedTabName,
+                refetch,
+                refetchNotes,
+            },
+        },
+        {
+            name: 'Statistics',
+            icon: QueryStatsOutlinedIcon,
+            component: StatsSidebarView,
+            properties: {
+                expandedField,
+                fieldProfile,
+                profiles,
+                fetchDataWithLookbackWindow,
+                profilesDataLoading,
+            },
+        },
+        {
+            name: 'Queries',
+            component: SchemaFieldQueriesSidebarTab,
+            description: 'View queries about this field',
+            icon: CodeOutlined,
+            properties: { fieldPath: expandedField?.fieldPath },
+        },
+        {
+            name: 'Properties',
+            component: PropertiesTab,
+            description: 'View additional properties about this field',
+            icon: UnorderedListOutlined,
+            properties: {
+                fieldPath: expandedField?.fieldPath,
+                fieldUrn: expandedField?.schemaFieldEntity?.urn,
+                fieldProperties: expandedField?.schemaFieldEntity?.structuredProperties,
+                refetch,
+            },
+        },
+    ];
+
+    const selectedTab = tabs.find((tab) => tab.name === selectedTabName);
+
+    return (
+        <>
+            {!openTimelineDrawer && (
+                <StyledDrawer
+                    open={!!expandedDrawerFieldPath}
+                    onClose={() => setExpandedDrawerFieldPath(null)}
+                    getContainer={() => document.getElementById('entity-profile-sidebar') as HTMLElement}
+                    // The minWidth is calculated based on the width of the Chart's displayed in the Historical stats view
+                    // And Insight Stats View Table to ensure consistent container width across various screen sizes.
+                    contentWrapperStyle={{ width: `fit-content`, minWidth: '560px', maxWidth: '560px' }}
+                    mask={mask}
+                    maskClosable={mask}
+                    placement="right"
+                    closable={false}
+                >
+                    {expandedField && (
+                        <DrawerContent>
+                            <FieldHeader
+                                setExpandedDrawerFieldPath={setExpandedDrawerFieldPath}
+                                expandedField={expandedField}
+                            />
+                            <Body onKeyDown={(e) => e.stopPropagation()}>
+                                {selectedTab && (
+                                    <Content>
+                                        <selectedTab.component properties={selectedTab.properties} />
+                                    </Content>
+                                )}
+
+                                <Tabs>
+                                    <SchemaFieldDrawerTabs
+                                        tabs={tabs}
+                                        selectedTab={selectedTab}
+                                        onSelectTab={(name) => setSelectedTabName(name)}
+                                    />
+                                </Tabs>
+                            </Body>
+                            {selectNextField && selectPreviousField && (
+                                <DrawerFooter
+                                    expandedFieldIndex={expandedFieldIndex}
+                                    selectPreviousField={selectPreviousField}
+                                    selectNextField={selectNextField}
+                                    displayedRows={displayedRows}
+                                />
+                            )}
+                        </DrawerContent>
+                    )}
+                </StyledDrawer>
+            )}
+            {!!openTimelineDrawer && (
+                <StyledDrawer
+                    open={!!openTimelineDrawer}
+                    onClose={() => setOpenTimelineDrawer(false)}
+                    getContainer={() => document.getElementById('entity-profile-sidebar') as HTMLElement}
+                    contentWrapperStyle={{ width: '33%' }}
+                    mask={false}
+                    maskClosable={false}
+                    placement="right"
+                    closable={false}
+                    autoFocus={false}
+                >
+                    <DrawerContent>
+                        <TimelineHeaderWrapper>
+                            <TimelineHeader>Timeline for table</TimelineHeader>
+                        </TimelineHeaderWrapper>
+                        <SchemaTimelineSection />
+                    </DrawerContent>
+                </StyledDrawer>
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawerTabs.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawerTabs.tsx
new file mode 100644
index 00000000000000..db0b0d19ab50cf
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawerTabs.tsx
@@ -0,0 +1,76 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { Tabs } from 'antd';
+import { Tooltip } from '@components';
+import { EntitySidebarTab } from '../../../../../types';
+
+export const TABS_WIDTH = 56;
+
+const UnborderedTabs = styled(Tabs)`
+    height: 100%;
+    width: ${TABS_WIDTH}px;
+    &&& .ant-tabs-nav {
+        margin-bottom: 0;
+    }
+    &&& .ant-tabs-ink-bar {
+        display: none;
+    }
+    &&& .ant-tabs-tab {
+        padding: 10px 10px 10px 10px;
+        margin: 8px 8px 16px 8px;
+        border-radius: 6px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+    &&& .ant-tabs-tab-active {
+        background-color: #533fd1;
+    }
+    &&& .ant-tabs-tab-active .ant-tabs-tab-btn {
+        color: #ffffff;
+    }
+    &&& .ant-tabs-content-holder {
+        display: none;
+    }
+    background-color: #ffffff;
+`;
+
+const Tab = styled(Tabs.TabPane)`
+    font-size: 14px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+`;
+
+const tabIconStyle = { fontSize: 20, margin: 0, display: 'flex' };
+type Props = {
+    tabs: EntitySidebarTab[];
+    selectedTab?: EntitySidebarTab;
+    onSelectTab: (name: string) => void;
+};
+export const SchemaFieldDrawerTabs = ({ tabs, selectedTab, onSelectTab }: Props) => {
+    return (
+        <UnborderedTabs
+            animated={false}
+            tabPosition="right"
+            activeKey={selectedTab?.name || ''}
+            size="large"
+            onTabClick={(name: string) => onSelectTab(name)}
+        >
+            {tabs.map((tab) => {
+                const TabIcon = tab.icon;
+                const { name } = tab;
+                return (
+                    <Tab
+                        tab={
+                            <Tooltip title={name} placement="left" showArrow={false}>
+                                <TabIcon style={tabIconStyle} data-testid={`${name}-field-drawer-tab-header`} />
+                            </Tooltip>
+                        }
+                        key={tab.name}
+                    />
+                );
+            })}
+        </UnborderedTabs>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldQueriesSidebarTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldQueriesSidebarTab.tsx
new file mode 100644
index 00000000000000..3963b3f3845587
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldQueriesSidebarTab.tsx
@@ -0,0 +1,200 @@
+import { useIsSeparateSiblingsMode } from '@src/app/entity/shared/siblingUtils';
+import Icon from '@ant-design/icons';
+import { Button, Typography } from 'antd';
+import moment from 'moment';
+import React, { useEffect } from 'react';
+import styled from 'styled-components';
+import NoStatsAvailble from '../../../../../../../../images/no-stats-available.svg?react';
+import { useBaseEntity, useRouteToTab } from '../../../../../../../entity/shared/EntityContext';
+import { ANTD_GRAY } from '../../../../../constants';
+import Query from '../../../Queries/Query';
+import { PopularityColumn, QueryCreatedBy } from '../../../Queries/queryColumns';
+import { usePopularQueries } from '../../../Queries/usePopularQueries';
+import { GetDatasetQuery } from '../../../../../../../../graphql/dataset.generated';
+import Loading from '../../../../../../../shared/Loading';
+import { generateSchemaFieldUrn } from '../../../../Lineage/utils';
+
+interface Props {
+    properties: {
+        fieldPath: string;
+    };
+}
+
+const StyledCreatedBy = styled.div`
+    margin-top: -2.5px;
+    margin-left: 4px;
+    margin-right: 4px;
+`;
+
+const StyledQueryContainer = styled.div`
+    margin-top: 10px;
+    display: flex;
+    flex-direction: column;
+    max-width: 100%;
+`;
+
+const StyledQueryCard = styled.div`
+    background: #f5f5f5;
+    border-radius: 4px;
+    margin-bottom: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
+    border: 1px solid ${ANTD_GRAY[5]};
+    border-radius: 4px;
+    box-shadow: ${(props) => props.theme.styles['box-shadow']};
+`;
+
+const QuerySubtitleContainer = styled.div`
+    align-items: center;
+    padding: 10px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+`;
+
+const SubtitleSection = styled.div`
+    display: flex;
+    flex-direction: row;
+`;
+
+const PopularityLabel = styled.span`
+    line-height: 26px;
+    margin-right: 8px;
+`;
+
+const PopularityColumnContainer = styled.div`
+    margin-bottom: 5px;
+`;
+
+const QUERIES_TO_SHOW = 6;
+
+const SeeAllButton = styled(Button)`
+    margin-top: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
+    margin-bottom: 50px;
+    width: 170px;
+`;
+
+const QueriesTabContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    max-width: 485px;
+    text-align: center;
+    align-items: center;
+    margin: auto;
+`;
+
+const NoDataContainer = styled.div`
+    margin: 40px auto;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+`;
+
+const StyledIcon = styled(Icon)`
+    font-size: 80px;
+    margin-bottom: 6px;
+    color: #fff;
+`;
+
+const Section = styled.div`
+    color: #56668e;
+    font-weight: 700;
+    font-size: 12px;
+    line-height: 24px;
+`;
+
+const QueriesTitle = styled(Typography.Text)`
+    && {
+        margin: 0px;
+        font-size: 16px;
+        font-weight: 700;
+        align-self: flex-start;
+        margin: 10px 0 0 10px;
+    }
+`;
+
+export default function SchemaFieldQueriesSidebarTab({ properties: { fieldPath } }: Props) {
+    const isSeparateSiblings = useIsSeparateSiblingsMode();
+    const baseEntity = useBaseEntity<GetDatasetQuery>();
+    const urn = (baseEntity && baseEntity.dataset && baseEntity.dataset?.urn) || '';
+    const siblingUrn = isSeparateSiblings
+        ? undefined
+        : baseEntity?.dataset?.siblingsSearch?.searchResults?.[0]?.entity?.urn;
+    const schemaFieldUrn = generateSchemaFieldUrn(fieldPath, urn) || '';
+    const siblingSchemaFieldUrn =
+        !isSeparateSiblings && siblingUrn ? generateSchemaFieldUrn(fieldPath, siblingUrn) || '' : '';
+
+    const { popularQueries, loading, total, selectedColumnsFilter, setSelectedColumnsFilter } = usePopularQueries({
+        entityUrn: urn,
+        siblingUrn,
+        filterText: '',
+        defaultSelectedColumns: [schemaFieldUrn || '', siblingSchemaFieldUrn],
+    });
+
+    useEffect(() => {
+        setSelectedColumnsFilter({ ...selectedColumnsFilter, values: [schemaFieldUrn, siblingSchemaFieldUrn] });
+        // disable next line because we ONLY want this to run when schemaFieldUrn or siblingSchemaFieldUrn changes
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [schemaFieldUrn, siblingSchemaFieldUrn]);
+
+    const routeToTab = useRouteToTab();
+
+    const firstQueries = popularQueries.slice(0, QUERIES_TO_SHOW);
+
+    const hasMore = total > firstQueries.length;
+
+    const hasNoQueries = popularQueries.length === 0;
+
+    return (
+        <QueriesTabContainer>
+            {!loading && hasNoQueries && (
+                <NoDataContainer>
+                    <StyledIcon component={NoStatsAvailble} />
+                    <Section>No queries for this column found</Section>
+                </NoDataContainer>
+            )}
+            {loading && <Loading />}
+            {!loading && firstQueries.length > 0 && <QueriesTitle>Queries</QueriesTitle>}
+
+            {firstQueries.length > 0 &&
+                firstQueries.map((query, idx) => (
+                    <StyledQueryContainer>
+                        <StyledQueryCard>
+                            <Query query={query.query} index={idx} isCompact showDetails={false} showHeader={false} />
+                            <QuerySubtitleContainer>
+                                <SubtitleSection>
+                                    Last run by{' '}
+                                    {query.createdBy && (
+                                        <StyledCreatedBy>
+                                            <QueryCreatedBy createdBy={query.createdBy} />
+                                        </StyledCreatedBy>
+                                    )}
+                                    on {moment(query.lastRun).format('MM/DD/YYYY')}
+                                </SubtitleSection>
+                                <SubtitleSection>
+                                    <PopularityLabel>Popularity</PopularityLabel>
+                                    <PopularityColumnContainer>
+                                        <PopularityColumn query={query} />
+                                    </PopularityColumnContainer>
+                                </SubtitleSection>
+                            </QuerySubtitleContainer>
+                        </StyledQueryCard>
+                    </StyledQueryContainer>
+                ))}
+            {hasMore && !loading && (
+                <SeeAllButton
+                    onClick={() => {
+                        routeToTab({
+                            tabName: 'Queries',
+                            tabParams: { column: schemaFieldUrn, siblingColumn: siblingSchemaFieldUrn },
+                        });
+                    }}
+                >
+                    See All Queries
+                </SeeAllButton>
+            )}
+        </QueriesTabContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSection.tsx
new file mode 100644
index 00000000000000..494ec7bfa5b803
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSection.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import styled from 'styled-components';
+import { DatasetFieldProfile } from '../../../../../../../../types.generated';
+import { REDESIGN_COLORS } from '../../../../../constants';
+import { SidebarSection } from '../../../../../containers/profile/sidebar/SidebarSection';
+import StatsSummaryRow from './StatsSummaryRow';
+import { StyledDivider } from './components';
+
+const ViewAll = styled.div`
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    font-family: Mulish;
+    font-size: 10px;
+    font-weight: 400;
+    line-height: 24px;
+    :hover {
+        cursor: pointer;
+    }
+`;
+
+interface Props {
+    fieldProfile: DatasetFieldProfile | undefined;
+    setSelectedTabName: any;
+}
+
+export default function StatsSection({ fieldProfile, setSelectedTabName }: Props) {
+    // If current field profile doesn't exist or historic profiles don't have multiple profiles of the current field
+    if (!fieldProfile) return null;
+
+    return (
+        <>
+            <SidebarSection
+                title="Stats"
+                extra={<ViewAll onClick={() => setSelectedTabName('Statistics')}>View all</ViewAll>}
+                content={<StatsSummaryRow fieldProfile={fieldProfile} />}
+            />
+            <StyledDivider dashed />
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarColumnTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarColumnTab.tsx
new file mode 100644
index 00000000000000..23c779d7ff1f8b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarColumnTab.tsx
@@ -0,0 +1,158 @@
+import React from 'react';
+import styled from 'styled-components';
+import Icon from '@ant-design/icons/lib/components/Icon';
+import StatChart, { ChartCard } from '../../../Stats/historical/charts/StatChart';
+import { getFixedLookbackWindow } from '../../../../../../../shared/time/timeUtils';
+import { LookbackWindow } from '../../../Stats/lookbackWindows';
+import { DatasetFieldProfile, SchemaField } from '../../../../../../../../types.generated';
+import NoStatsAvailble from '../../../../../../../../images/no-stats-available.svg?react';
+import { REDESIGN_COLORS } from '../../../../../constants';
+import { computeChartTickInterval, extractChartValuesFromFieldProfiles } from '../../../../../utils';
+
+const CHART_WIDTH = 460;
+const CHART_HEIGHT = 170;
+const DEFAULT_LINE_COLOR = REDESIGN_COLORS.BACKGROUND_PURPLE;
+
+const StatSection = styled.div`
+    padding: 12px 16px;
+    // Temporary solution for chart circle color, as V1 theme colors are in place.
+    circle {
+        fill: ${REDESIGN_COLORS.BACKGROUND_PRIMARY_1};
+    }
+`;
+
+const ChartRow = styled.div`
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(${CHART_WIDTH}px, 1fr));
+    gap: 12px 0;
+    column-gap: 12px;
+    & > ${ChartCard} {
+        box-shadow: none;
+        border-radius: 9px;
+        border: 1px solid #eeeef3;
+        .ant-card-body {
+            padding: 5px;
+        }
+    }
+`;
+
+const NoDataContainer = styled.div`
+    margin: 40px auto;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+`;
+
+const Section = styled.div`
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    font-weight: 700;
+    font-size: 12px;
+    line-height: 24px;
+`;
+
+const StyledIcon = styled(Icon)`
+    font-size: 80px;
+    margin-bottom: 6px;
+    color: ${REDESIGN_COLORS.WHITE};
+`;
+
+interface Props {
+    properties: {
+        expandedField: SchemaField;
+        fieldProfile: DatasetFieldProfile | undefined;
+        profiles: any[];
+    };
+    lookbackWindow: LookbackWindow;
+}
+
+const getLookbackWindowSize = (window: LookbackWindow) => {
+    return window.windowSize;
+};
+
+export default function StatsSidebarColumnTab({ properties, lookbackWindow }: Props) {
+    const { fieldProfile, profiles } = properties;
+    const selectedFieldPath = fieldProfile?.fieldPath || '';
+
+    const selectedWindowSize = getLookbackWindowSize(lookbackWindow);
+    const selectedWindow = getFixedLookbackWindow(selectedWindowSize);
+
+    const graphTickInterval = computeChartTickInterval(selectedWindowSize);
+    const graphDateRange = {
+        start: selectedWindow.startTime.toString(),
+        end: selectedWindow.endTime.toString(),
+    };
+
+    // Extracting chart values from field profiles
+    const nullCountChartValues: Array<any> = extractChartValuesFromFieldProfiles(
+        profiles,
+        selectedFieldPath,
+        'nullCount',
+    );
+    const nullPercentageChartValues: Array<any> = extractChartValuesFromFieldProfiles(
+        profiles,
+        selectedFieldPath,
+        'nullProportion',
+    );
+    const distinctCountChartValues: Array<any> = extractChartValuesFromFieldProfiles(
+        profiles,
+        selectedFieldPath,
+        'uniqueCount',
+    );
+    const distinctPercentageChartValues: Array<any> = extractChartValuesFromFieldProfiles(
+        profiles,
+        selectedFieldPath,
+        'uniqueProportion',
+    );
+
+    if (!fieldProfile) {
+        return (
+            <NoDataContainer>
+                <StyledIcon component={NoStatsAvailble} />
+                <Section>No column statistics found</Section>
+            </NoDataContainer>
+        );
+    }
+
+    return (
+        <StatSection>
+            <ChartRow>
+                <StatChart
+                    width={CHART_WIDTH}
+                    height={CHART_HEIGHT}
+                    lineColor={DEFAULT_LINE_COLOR}
+                    title="Null Count Over Time"
+                    tickInterval={graphTickInterval}
+                    dateRange={graphDateRange}
+                    values={nullCountChartValues}
+                />
+                <StatChart
+                    width={CHART_WIDTH}
+                    height={CHART_HEIGHT}
+                    lineColor={DEFAULT_LINE_COLOR}
+                    title="Null Percentage Over Time"
+                    tickInterval={graphTickInterval}
+                    dateRange={graphDateRange}
+                    values={nullPercentageChartValues}
+                />
+                <StatChart
+                    width={CHART_WIDTH}
+                    height={CHART_HEIGHT}
+                    lineColor={DEFAULT_LINE_COLOR}
+                    title="Distinct Count Over Time"
+                    tickInterval={graphTickInterval}
+                    dateRange={graphDateRange}
+                    values={distinctCountChartValues}
+                />
+                <StatChart
+                    width={CHART_WIDTH}
+                    height={CHART_HEIGHT}
+                    lineColor={DEFAULT_LINE_COLOR}
+                    title="Distinct Percentage Over Time"
+                    tickInterval={graphTickInterval}
+                    dateRange={graphDateRange}
+                    values={distinctPercentageChartValues}
+                />
+            </ChartRow>
+        </StatSection>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarContent.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarContent.tsx
new file mode 100644
index 00000000000000..0a2ca72be64113
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarContent.tsx
@@ -0,0 +1,195 @@
+import Icon from '@ant-design/icons/lib/components/Icon';
+import { Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import NoStatsAvailble from '../../../../../../../../images/no-stats-available.svg?react';
+import TrendingDownIcon from '../../../../../../../../images/trending-down-icon.svg?react';
+import TrendingUpIcon from '../../../../../../../../images/trending-up-icon.svg?react';
+import { DatasetFieldProfile, SchemaField } from '../../../../../../../../types.generated';
+import { REDESIGN_COLORS } from '../../../../../constants';
+import SampleValueTag from '../../../Stats/snapshot/SampleValueTag';
+import { decimalToPercentStr } from '../../utils/statsUtil';
+import { extractChartValuesFromFieldProfiles } from '../../../../../utils';
+import { formatNumberWithoutAbbreviation } from '../../../../../../../shared/formatNumber';
+
+const maxLabelWidth = 150;
+
+const StatsWrapper = styled.div`
+    padding: 0px 24px;
+    display: flex;
+    flex-direction: column;
+    height: fit-content; // to prevent unnecessary scrolling
+    margin-bottom: 50px;
+`;
+
+const StatRow = styled.div`
+    display: flex;
+    flex-direction: column;
+    padding-top: 12px;
+    padding-bottom: 12px;
+`;
+
+const StatLabel = styled.div`
+    display: flex;
+    align-items: center;
+    padding-top: 12px;
+    padding-bottom: 12px;
+    :not(:last-child) {
+        border-bottom: 1px dashed;
+        border-color: rgba(0, 0, 0, 0.3);
+    }
+`;
+
+const LabelText = styled(Typography.Text)`
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 24px;
+    width: ${maxLabelWidth}px;
+    margin-right: 8px;
+`;
+
+const StatValue = styled.div<{ isDecreasing: boolean }>`
+    color: ${(props) => (props.isDecreasing ? `${REDESIGN_COLORS.RED_ERROR_BORDER}` : `${REDESIGN_COLORS.DARK_GREY}`)};
+    font-size: 12px;
+    font-weight: 800;
+    line-height: 24px;
+`;
+
+const TrendLines = styled.div`
+    margin-left: 5px;
+    margin-top: 4px;
+`;
+
+const NoDataContainer = styled.div`
+    margin: 40px auto;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+`;
+
+const Section = styled.div`
+    color: #56668e;
+    font-weight: 700;
+    font-size: 12px;
+    line-height: 24px;
+`;
+
+const StyledIcon = styled(Icon)`
+    font-size: 80px;
+    margin-bottom: 6px;
+    color: #fff;
+`;
+interface Props {
+    properties: {
+        expandedField: SchemaField;
+        fieldProfile: DatasetFieldProfile | undefined;
+        profiles: any[];
+    };
+}
+
+export function StatsSidebarContent({ properties }: Props) {
+    const { expandedField, fieldProfile, profiles } = properties;
+
+    const getFieldStatTrendComponent = (statName: string) => {
+        const statValues = extractChartValuesFromFieldProfiles(profiles, expandedField.fieldPath, statName);
+
+        if (!fieldProfile || !statValues[1]) return null;
+
+        const currentValue = fieldProfile[statName];
+        const lastValue = statValues[1].value;
+
+        let trendLine: any = null;
+        if (currentValue === null || currentValue === undefined || lastValue === null || lastValue === undefined)
+            return null;
+        if (currentValue > lastValue) {
+            trendLine = <TrendingUpIcon />;
+        } else if (currentValue < lastValue) {
+            trendLine = <TrendingDownIcon />;
+        }
+        const isDecreasing = currentValue < lastValue;
+
+        return trendLine ? [trendLine, isDecreasing] : null;
+    };
+
+    if (!fieldProfile) {
+        return (
+            <NoDataContainer>
+                <StyledIcon component={NoStatsAvailble} />
+                <Section>No column statistics found</Section>
+            </NoDataContainer>
+        );
+    }
+
+    const statsData = {
+        stats: [
+            {
+                name: 'Null Count',
+                value: fieldProfile.nullCount ? formatNumberWithoutAbbreviation(fieldProfile.nullCount) : null,
+                trend: getFieldStatTrendComponent('nullCount'),
+            },
+            {
+                name: 'Null %',
+                value: decimalToPercentStr(fieldProfile.nullProportion, 2),
+                trend: getFieldStatTrendComponent('nullProportion'),
+            },
+            {
+                name: 'Distinct Count',
+                value: fieldProfile.uniqueCount ? formatNumberWithoutAbbreviation(fieldProfile.uniqueCount) : null,
+                trend: getFieldStatTrendComponent('uniqueCount'),
+            },
+            {
+                name: 'Distinct %',
+                value: decimalToPercentStr(fieldProfile.uniqueProportion, 2),
+                trend: getFieldStatTrendComponent('uniqueProportion'),
+            },
+            {
+                name: 'Min',
+                value: fieldProfile.min ? formatNumberWithoutAbbreviation(fieldProfile.min) : null,
+                trend: getFieldStatTrendComponent('min'),
+            },
+            {
+                name: 'Max',
+                value: fieldProfile.max ? formatNumberWithoutAbbreviation(fieldProfile.max) : null,
+                trend: getFieldStatTrendComponent('max'),
+            },
+            {
+                name: 'Median',
+                value: fieldProfile.median ? formatNumberWithoutAbbreviation(fieldProfile.median) : null,
+                trend: getFieldStatTrendComponent('median'),
+            },
+            {
+                name: 'Std Dev',
+                value: fieldProfile.stdev ? formatNumberWithoutAbbreviation(fieldProfile.stdev) : null,
+                trend: getFieldStatTrendComponent('stdev'),
+            },
+            {
+                name: 'Sample Values',
+                value: fieldProfile.sampleValues
+                    ?.filter((value) => value !== undefined)
+                    .slice(0, 3)
+                    .map((value) => <SampleValueTag value={value} />),
+                trend: null,
+            },
+        ],
+    };
+
+    return (
+        <StatsWrapper>
+            {fieldProfile && (
+                <StatRow>
+                    {statsData.stats.map((stat) => {
+                        if (stat.value === undefined || stat.value === null) return null;
+                        return (
+                            <StatLabel key={stat.name}>
+                                <LabelText>{stat.name}</LabelText>
+                                <StatValue isDecreasing={stat.trend?.[1] || false}>{stat.value}</StatValue>
+                                <TrendLines>{stat.trend?.[0]}</TrendLines>
+                            </StatLabel>
+                        );
+                    })}
+                </StatRow>
+            )}
+        </StatsWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarHeader.tsx
new file mode 100644
index 00000000000000..f38166a668a84c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarHeader.tsx
@@ -0,0 +1,110 @@
+import React from 'react';
+import { ClockCircleOutlined, LineChartOutlined } from '@ant-design/icons';
+import styled from 'styled-components';
+import LookbackWindowSelect from '../../../Stats/historical/LookbackWindowSelect';
+import { LookbackWindow } from '../../../Stats/lookbackWindows';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../../../../../constants';
+
+export enum StatsViewType {
+    LATEST,
+    HISTORICAL,
+}
+
+const TabContainer = styled.div`
+    display: flex;
+    margin: 15px 0px 0px;
+    align-items: start;
+    padding: 0 15px;
+    gap: 20px;
+    flex-direction: column;
+`;
+
+const StatsTabViewSwitch = styled.div<{ isActive: boolean }>`
+    background: ${({ isActive }) => (isActive ? `${REDESIGN_COLORS.BACKGROUND_PRIMARY_1}` : 'transperent')};
+    border-radius: 4px;
+    color: ${({ isActive }) => (isActive ? '#fff' : '#56668E')};
+    cursor: pointer;
+    display: flex;
+    font-size: 14px;
+    justify-content: center;
+    line-height: 30px;
+    height: 42px;
+    width: 180px;
+    align-items: center;
+    gap: 5px;
+    transition: background 0.3s ease, color 0.3s ease;
+`;
+
+const SwitchWrapper = styled.div`
+    border-radius: 4.5px;
+    display: flex;
+    width: 250px;
+    width: 100%;
+    background: ${REDESIGN_COLORS.BACKGROUND_GRAY_3};
+`;
+
+const ReportedAtLabel = styled.div`
+    padding: 0;
+    margin: 0;
+    display: flex;
+    align-items: center;
+    color: ${ANTD_GRAY[7]};
+`;
+
+const ActionContainer = styled.div`
+    display: flex;
+    justify-content: end;
+    width: 100%;
+    span {
+        font-size: 12px;
+    }
+`;
+
+type Props = {
+    activeTab: StatsViewType;
+    setActiveTab: (type: StatsViewType) => void;
+    reportedAt: string;
+    lookbackWindow: LookbackWindow;
+    setLookbackWindow: (window: LookbackWindow) => void;
+};
+
+export default function StatsSidebarHeader({
+    activeTab,
+    setActiveTab,
+    lookbackWindow,
+    setLookbackWindow,
+    reportedAt,
+}: Props) {
+    const handleTabClick = (type: StatsViewType) => {
+        setActiveTab(type);
+    };
+
+    const actionView =
+        activeTab === StatsViewType.HISTORICAL ? (
+            <LookbackWindowSelect lookbackWindow={lookbackWindow} setLookbackWindow={setLookbackWindow} />
+        ) : (
+            <ReportedAtLabel>{reportedAt}</ReportedAtLabel>
+        );
+
+    return (
+        <TabContainer>
+            <SwitchWrapper>
+                <StatsTabViewSwitch
+                    isActive={activeTab === StatsViewType.LATEST}
+                    onClick={() => handleTabClick(StatsViewType.LATEST)}
+                >
+                    <LineChartOutlined />
+                    Stats & Insights
+                </StatsTabViewSwitch>
+                <StatsTabViewSwitch
+                    isActive={activeTab === StatsViewType.HISTORICAL}
+                    onClick={() => handleTabClick(StatsViewType.HISTORICAL)}
+                >
+                    <ClockCircleOutlined />
+                    Historical Stats
+                </StatsTabViewSwitch>
+            </SwitchWrapper>
+            <ActionContainer>{actionView}</ActionContainer>
+        </TabContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarView.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarView.tsx
new file mode 100644
index 00000000000000..4b639326de065f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSidebarView.tsx
@@ -0,0 +1,102 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import styled from 'styled-components';
+import { LoadingOutlined } from '@ant-design/icons';
+import { DatasetFieldProfile, SchemaField } from '../../../../../../../../types.generated';
+import StatsSidebarHeader, { StatsViewType } from './StatsSidebarHeader';
+import { StatsSidebarContent } from './StatsSidebarContent';
+import StatsSidebarColumnTab from './StatsSidebarColumnTab';
+import { LOOKBACK_WINDOWS, LookbackWindow } from '../../../Stats/lookbackWindows';
+import {
+    getFixedLookbackWindow,
+    toLocalDateString,
+    toLocalTimeString,
+} from '../../../../../../../shared/time/timeUtils';
+
+interface Props {
+    properties: {
+        expandedField: SchemaField;
+        fieldProfile: DatasetFieldProfile | undefined;
+        profiles: any[];
+        fetchDataWithLookbackWindow: (lookbackWindow: any) => void;
+        profilesDataLoading: boolean;
+    };
+}
+
+const LoadingContainer = styled.div`
+    margin-top: 50%;
+    width: 100%;
+    text-align: center;
+`;
+const LoadingText = styled.div`
+    margin-top: 18px;
+    font-size: 12px;
+`;
+
+const StyledLoading = styled(LoadingOutlined)`
+    font-size: 32px;
+    color: #533fd1;
+`;
+
+export default function StatsSidebarView({
+    properties: { expandedField, fieldProfile, profiles, fetchDataWithLookbackWindow, profilesDataLoading },
+}: Props) {
+    const [viewType, setViewType] = useState(StatsViewType.LATEST);
+    const [lookbackWindow, setLookbackWindow] = useState(LOOKBACK_WINDOWS.QUARTER);
+
+    /**
+     * Handles the change of the lookback window in the UI.
+     * Updates the selected lookback window and fetches data with the new window size.
+     * @param lookback The new lookback window selected.
+     */
+    const handleLockbackWindowChange = useCallback(
+        (lookback: LookbackWindow) => {
+            setLookbackWindow(lookback);
+            // Fetch data with the new lookback window size
+            fetchDataWithLookbackWindow(getFixedLookbackWindow(lookback.windowSize));
+        },
+        [fetchDataWithLookbackWindow, setLookbackWindow],
+    );
+
+    useEffect(() => {
+        handleLockbackWindowChange(LOOKBACK_WINDOWS.QUARTER);
+    }, [handleLockbackWindowChange]);
+
+    // Get the latest profile information
+    const latestProfile = profiles && profiles[0];
+    const reportedAt =
+        latestProfile &&
+        `Reported on ${toLocalDateString(latestProfile?.timestampMillis)} at ${toLocalTimeString(
+            latestProfile?.timestampMillis,
+        )}`;
+
+    // Components for insight view and historical stats view
+    const insightView = <StatsSidebarContent properties={{ expandedField, fieldProfile, profiles }} />;
+    const historicalStats = (
+        <StatsSidebarColumnTab
+            properties={{ expandedField, fieldProfile, profiles }}
+            lookbackWindow={lookbackWindow as LookbackWindow}
+        />
+    );
+
+    return (
+        <>
+            {/* Stats sidebar header component */}
+            <StatsSidebarHeader
+                activeTab={viewType}
+                setActiveTab={setViewType}
+                lookbackWindow={lookbackWindow}
+                setLookbackWindow={handleLockbackWindowChange}
+                reportedAt={reportedAt}
+            />
+
+            {profilesDataLoading && (
+                <LoadingContainer>
+                    <StyledLoading />
+                    <LoadingText>Loading...</LoadingText>
+                </LoadingContainer>
+            )}
+            {/* Conditional rendering based on active tab */}
+            {!profilesDataLoading && (viewType === StatsViewType.HISTORICAL ? historicalStats : insightView)}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSummaryRow.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSummaryRow.tsx
new file mode 100644
index 00000000000000..cf54cb7864121e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/StatsSummaryRow.tsx
@@ -0,0 +1,61 @@
+import React from 'react';
+import styled from 'styled-components';
+import { DatasetFieldProfile } from '../../../../../../../../types.generated';
+import { pluralize } from '../../../../../../../shared/textUtil';
+import TrendDetail from './TrendDetail';
+
+const StatsSummaryRowContent = styled.div`
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+`;
+
+interface Props {
+    fieldProfile: DatasetFieldProfile | undefined;
+}
+
+export default function StatsSummaryRow({ fieldProfile }: Props) {
+    const nullProportion = fieldProfile?.nullProportion;
+    const nullCount = fieldProfile?.nullCount;
+    const uniqueProportion = fieldProfile?.uniqueProportion;
+    const uniqueCount = fieldProfile?.uniqueCount;
+
+    const numericalStatsCount =
+        (fieldProfile?.min !== null && fieldProfile?.min !== undefined ? 1 : 0) +
+        (fieldProfile?.max !== null && fieldProfile?.max !== undefined ? 1 : 0) +
+        (fieldProfile?.mean !== null && fieldProfile?.mean !== undefined ? 1 : 0) +
+        (fieldProfile?.median !== null && fieldProfile?.median !== undefined ? 1 : 0) +
+        (fieldProfile?.stdev !== null && fieldProfile?.stdev !== undefined ? 1 : 0);
+
+    return (
+        <StatsSummaryRowContent>
+            <TrendDetail
+                tooltipTitle={`${nullCount} null ${pluralize(
+                    nullCount || 0,
+                    'value',
+                )} found for this column across rows`}
+                headline="Null Values"
+                proportion={nullProportion}
+                showCount
+                count={nullCount || 0}
+            />
+            <TrendDetail
+                tooltipTitle={`${uniqueCount} unique ${pluralize(
+                    uniqueCount || 0,
+                    'value',
+                )} found for this column across rows`}
+                headline="Distinct Values"
+                proportion={uniqueProportion}
+                showCount
+                count={uniqueCount || 0}
+            />
+            <TrendDetail
+                tooltipTitle=""
+                headline="Numerical stats"
+                proportion={undefined}
+                showCount
+                count={numericalStatsCount}
+            />
+        </StatsSummaryRowContent>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/TrendDetail.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/TrendDetail.tsx
new file mode 100644
index 00000000000000..aaf314faa3134a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/TrendDetail.tsx
@@ -0,0 +1,83 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { Tooltip } from '@components';
+import { Maybe } from 'graphql/jsutils/Maybe';
+import { decimalToPercentStr } from '../../utils/statsUtil';
+import { REDESIGN_COLORS } from '../../../../../constants';
+
+interface TrendDetailProps {
+    tooltipTitle: string;
+    headline: string;
+    proportion: Maybe<number> | undefined;
+    showCount?: boolean; // indicate whether to show count or not
+    count?: number; //  numerical stats count
+}
+
+const TrendDetailContainer = styled.div`
+    display: flex;
+    margin-right: 40px;
+    span {
+        display: flex;
+        gap: 5px;
+        align-content: center;
+        align-items: center;
+    }
+`;
+
+const TitleContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+`;
+
+const StatSummarySubtitle = styled.div`
+    display: flex;
+    flex-direction: row;
+`;
+
+const Headline = styled.div`
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    font-family: Mulish;
+    font-size: 12px;
+    font-weight: 700;
+    line-height: 24px;
+`;
+
+const SubtitleText = styled(Typography.Text)<{ color?: string }>`
+    color: ${(props) => (props.color ? props.color : REDESIGN_COLORS.DARK_GREY)};
+    font-family: Mulish;
+    font-size: 13px;
+    line-height: 14px;
+    font-weight: 400;
+`;
+
+const TrendDetail = ({ tooltipTitle, headline, proportion, showCount = false, count = 0 }: TrendDetailProps) => {
+    let displayText;
+    if (showCount && count > 0) {
+        if (headline === 'Numerical stats') {
+            displayText = `${count} stats`;
+        } else {
+            displayText = `${count} values`;
+        }
+    } else if (count < 1) {
+        displayText = 'None';
+    } else {
+        displayText = decimalToPercentStr(proportion, 2);
+    }
+    return (
+        <TrendDetailContainer>
+            <Tooltip title={tooltipTitle}>
+                <TitleContainer>
+                    <Headline>{headline}</Headline>
+                    <StatSummarySubtitle>
+                        <SubtitleText color={showCount && count < 1 ? REDESIGN_COLORS.SECONDARY_LIGHT_GREY : undefined}>
+                            {displayText}
+                        </SubtitleText>
+                    </StatSummarySubtitle>
+                </TitleContainer>
+            </Tooltip>
+        </TrendDetailContainer>
+    );
+};
+
+export default TrendDetail;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components.ts
new file mode 100644
index 00000000000000..5592fd5e809f93
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components.ts
@@ -0,0 +1,16 @@
+import { Divider } from 'antd';
+import styled from 'styled-components';
+import { REDESIGN_COLORS } from '../../../../../constants';
+
+export const SectionHeader = styled.div`
+    margin-bottom: 8px;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    font-size: 14px;
+    font-style: normal;
+    font-weight: 700;
+    line-height: 24px;
+`;
+
+export const StyledDivider = styled(Divider)`
+    border-color: rgba(0, 0, 0, 0.3);
+`;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/TypeLabel.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/TypeLabel.tsx
new file mode 100644
index 00000000000000..f0694e60e469f7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/TypeLabel.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import { Tooltip } from '@components';
+import styled from 'styled-components';
+
+import { capitalizeFirstLetter } from '../../../../../../shared/textUtil';
+import { SchemaFieldDataType } from '../../../../../../../types.generated';
+import { ColumnTypeIcon } from '../../../../../../sharedV2/utils';
+import { truncate } from '../../../../utils';
+
+const Wrapper = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const IconWrapper = styled.div`
+    margin-right: 4px;
+    font-size: 14px;
+    display: flex;
+`;
+
+interface Props {
+    type: SchemaFieldDataType;
+    nativeDataType: string | null | undefined;
+    className?: string;
+}
+
+export default function TypeLabel({ type, nativeDataType, className }: Props) {
+    // if unable to match type to DataHub, display native type info by default
+    const nativeFallback = type === SchemaFieldDataType.Null;
+
+    const NativeDataTypeTooltip = ({ children }: { children: React.ReactNode }) =>
+        nativeDataType ? (
+            <Tooltip placement="top" title={capitalizeFirstLetter(nativeDataType)}>
+                {children}
+            </Tooltip>
+        ) : (
+            <>{children}</>
+        );
+
+    return (
+        <NativeDataTypeTooltip>
+            <Wrapper className={className}>
+                <IconWrapper>{ColumnTypeIcon(type)}</IconWrapper>
+                {capitalizeFirstLetter(nativeFallback ? truncate(250, nativeDataType) : type)}
+            </Wrapper>
+        </NativeDataTypeTooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/ChangeEvent.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/ChangeEvent.tsx
new file mode 100644
index 00000000000000..bc3b01fcd62c39
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/ChangeEvent.tsx
@@ -0,0 +1,51 @@
+import { processDocumentationString } from '@src/app/lineageV2/lineageUtils';
+import React from 'react';
+import styled from 'styled-components';
+import { ChangeEvent } from '../../../../../../../types.generated';
+import { REDESIGN_COLORS } from '../../../../constants';
+import { getDocumentationString } from './changeEventToString';
+
+const ChangeEventCircle = styled.div`
+    display: inline-block;
+    min-width: 8px;
+    height: 8px;
+    border-radius: 50%;
+    border: 1px solid ${REDESIGN_COLORS.DARK_GREY};
+    margin-top: 8px;
+`;
+
+const ChangeEventText = styled.div`
+    display: inline-block;
+    color: #5f6685;
+    font-size: 13px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 20px; /* 200% */
+    letter-spacing: -0.12px;
+    margin-left: 22px;
+    width: calc(100% - 22px);
+`;
+
+const ChangeEventContainer = styled.div`
+    display: flex;
+    flex-direction: row;
+    width: 100%;
+    margin-top: 8px;
+    word-wrap: break-word;
+`;
+
+interface ChangeTransactionProps {
+    changeEvent: ChangeEvent;
+}
+
+const ChangeEventComponent: React.FC<ChangeTransactionProps> = ({ changeEvent }) => {
+    const documentationString = getDocumentationString(changeEvent);
+
+    return (
+        <ChangeEventContainer>
+            <ChangeEventCircle /> <ChangeEventText>{processDocumentationString(documentationString)}</ChangeEventText>
+        </ChangeEventContainer>
+    );
+};
+
+export default ChangeEventComponent;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/ChangeTransactionView.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/ChangeTransactionView.tsx
new file mode 100644
index 00000000000000..61940aaa7c4001
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/ChangeTransactionView.tsx
@@ -0,0 +1,117 @@
+import PlatformIcon from '@app/sharedV2/icons/PlatformIcon';
+import React from 'react';
+import styled from 'styled-components';
+import { ChangeTransaction, DataPlatform } from '../../../../../../../types.generated';
+import { formatTimestamp } from './historyUtils';
+import ChangeEventComponent from './ChangeEvent';
+import { REDESIGN_COLORS } from '../../../../constants';
+
+const TitleText = styled.span`
+    color: ${REDESIGN_COLORS.TEXT_HEADING};
+    font-size: 13px;
+    font-style: normal;
+    font-weight: 600;
+    line-height: 16px; /* 160% */
+`;
+
+const ChangeTransactionTimestamp = styled(TitleText)`
+    background: #eeecfa;
+    border-radius: 20px;
+    padding: 5px 15px;
+`;
+
+const ChangeTransactionContainer = styled.div`
+    display: flex;
+    flex-direction: row;
+    width: 100%;
+`;
+
+const ChangeTransactionSidebar = styled.div`
+    display: flex;
+    flex-direction: column;
+    width: 2px;
+    margin-right: -2px;
+    min-height: 100%;
+`;
+
+const ChangeTransactionMainContent = styled.div`
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    min-height: 100%;
+    padding-bottom: 36px;
+`;
+
+const ChangeTransactionTitle = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    margin-left: 15px;
+`;
+
+const TransactionDateHeader = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: start;
+`;
+
+const ChangeEventCircle = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 14px;
+    height: 14px;
+    border-radius: 50%;
+    background-color: #d2d6e0;
+    margin-left: -3px;
+`;
+
+const InnerEventCircle = styled.div`
+    display: flex;
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+    background-color: ${REDESIGN_COLORS.DARK_GREY};
+`;
+
+const ChangeEventVerticalLine = styled.div`
+    width: 2px;
+    height: 100%;
+    margin-left: 3px;
+    background-color: #e8e6eb;
+`;
+
+export interface ChangeTransactionEntry {
+    transaction: ChangeTransaction;
+    semanticVersion?: string;
+    platform?: DataPlatform;
+}
+
+export default function ChangeTransactionView({ transaction, platform, semanticVersion }: ChangeTransactionEntry) {
+    return (
+        <ChangeTransactionContainer>
+            <ChangeTransactionSidebar>
+                <ChangeEventVerticalLine />
+            </ChangeTransactionSidebar>
+            <ChangeTransactionMainContent>
+                <TransactionDateHeader>
+                    <ChangeEventCircle>
+                        <InnerEventCircle />
+                    </ChangeEventCircle>
+                    <ChangeTransactionTitle>
+                        {platform && <PlatformIcon platform={platform} size={14} />}
+                        <ChangeTransactionTimestamp>
+                            {formatTimestamp(transaction.timestampMillis)}
+                        </ChangeTransactionTimestamp>
+                        {semanticVersion && <TitleText>{`(${semanticVersion})`}</TitleText>}
+                    </ChangeTransactionTitle>
+                </TransactionDateHeader>
+                <div>
+                    {transaction?.changes?.map((change) => (
+                        <ChangeEventComponent changeEvent={change} />
+                    ))}
+                </div>
+            </ChangeTransactionMainContent>
+        </ChangeTransactionContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/HistorySidebar.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/HistorySidebar.tsx
new file mode 100644
index 00000000000000..554d33759a483e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/HistorySidebar.tsx
@@ -0,0 +1,139 @@
+import { useGetSiblingPlatforms } from '@app/entity/shared/siblingUtils';
+import ChangeTransactionView, {
+    ChangeTransactionEntry,
+} from '@app/entityV2/shared/tabs/Dataset/Schema/history/ChangeTransactionView';
+import CloseOutlinedIcon from '@mui/icons-material/CloseOutlined';
+import { Drawer } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { useGetTimelineQuery } from '@graphql/timeline.generated';
+import { ChangeCategoryType, ChangeTransaction, DataPlatform, SemanticVersionStruct } from '@types';
+import { REDESIGN_COLORS } from '../../../../constants';
+
+const StyledDrawer = styled(Drawer)`
+    &&& .ant-drawer-body {
+        padding: 0;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        height: 100%;
+        overflow-x: hidden;
+    }
+
+    &&& .ant-drawer-content-wrapper {
+        box-shadow: -20px 0px 44px 0px rgba(0, 0, 0, 0.15);
+    }
+`;
+
+const DrawerContent = styled.div`
+    height: 100%;
+`;
+
+const FieldHeaderWrapper = styled.div`
+    padding: 16px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background: ${REDESIGN_COLORS.BACKGROUND_PURPLE};
+    color: #fff;
+    font-size: 14px;
+    font-weight: 700;
+`;
+
+const ChangeTransactionList = styled.div`
+    display: flex;
+    flex-direction: column;
+    padding: 26px;
+`;
+
+const CloseIcon = styled.div`
+    display: flex;
+    &&:hover {
+        cursor: pointer;
+        stroke: ${REDESIGN_COLORS.WHITE};
+    }
+`;
+
+interface Props {
+    open: boolean;
+    onClose: () => void;
+    urn: string;
+    siblingUrn?: string;
+    versionList: SemanticVersionStruct[];
+    hideSemanticVersions: boolean;
+}
+
+const HistorySidebar = ({ open, onClose, urn, siblingUrn, versionList, hideSemanticVersions }: Props) => {
+    const { data: entityTimelineData } = useGetTimelineQuery({
+        variables: {
+            input: {
+                urn,
+                changeCategories: [ChangeCategoryType.TechnicalSchema, ChangeCategoryType.Documentation],
+            },
+        },
+    });
+    const { data: siblingTimelineData } = useGetTimelineQuery({
+        skip: !siblingUrn,
+        variables: {
+            input: {
+                urn: siblingUrn || '',
+                changeCategories: [ChangeCategoryType.TechnicalSchema, ChangeCategoryType.Documentation],
+            },
+        },
+    });
+
+    const { entityPlatform, siblingPlatform } = useGetSiblingPlatforms();
+    const transactionEntries: ChangeTransactionEntry[] = [
+        ...(entityTimelineData?.getTimeline?.changeTransactions.map((transaction) =>
+            makeTransactionEntry(transaction, hideSemanticVersions ? [] : versionList, entityPlatform ?? undefined),
+        ) || []),
+        ...(siblingTimelineData?.getTimeline?.changeTransactions.map((transaction) =>
+            makeTransactionEntry(transaction, [], siblingPlatform ?? undefined),
+        ) || []),
+    ].sort((a, b) => a.transaction.timestampMillis - b.transaction.timestampMillis);
+
+    return (
+        <StyledDrawer
+            open={open}
+            onClose={() => onClose()}
+            getContainer={() => document.getElementById('entity-profile-sidebar') as HTMLElement}
+            contentWrapperStyle={{ width: '33%' }}
+            mask={false}
+            maskClosable={false}
+            placement="right"
+            closable={false}
+            autoFocus={false}
+        >
+            <DrawerContent>
+                <FieldHeaderWrapper>
+                    Change History
+                    <CloseIcon onClick={() => onClose()}>
+                        <CloseOutlinedIcon />
+                    </CloseIcon>
+                </FieldHeaderWrapper>
+
+                <ChangeTransactionList>
+                    {transactionEntries
+                        .map((entry) => <ChangeTransactionView key={entry.transaction.versionStamp} {...entry} />)
+                        .reverse()}
+                </ChangeTransactionList>
+            </DrawerContent>
+        </StyledDrawer>
+    );
+};
+
+function makeTransactionEntry(
+    transaction: ChangeTransaction,
+    versionList: SemanticVersionStruct[],
+    platform?: DataPlatform,
+): ChangeTransactionEntry {
+    return {
+        transaction,
+        platform,
+        semanticVersion:
+            versionList.find((v) => v.semanticVersionTimestamp === transaction.timestampMillis)?.semanticVersion ??
+            undefined,
+    };
+}
+
+export default HistorySidebar;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/__tests__/changeEventToString.test.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/__tests__/changeEventToString.test.ts
new file mode 100644
index 00000000000000..1a2c5259749031
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/__tests__/changeEventToString.test.ts
@@ -0,0 +1,102 @@
+import { ChangeCategoryType, ChangeEvent, ChangeOperationType } from '@src/types.generated';
+import { getDocumentationString } from '../changeEventToString';
+
+describe('getDocumentationString', () => {
+    describe('Technical Schema Changes', () => {
+        it('should handle adding a column with specified field path', () => {
+            const changeEvent: ChangeEvent = {
+                urn: 'urn:test',
+                category: ChangeCategoryType.TechnicalSchema,
+                operation: ChangeOperationType.Add,
+                parameters: [{ key: 'fieldPath', value: 'test.field.path' }],
+                description: 'Original description',
+            };
+
+            const result = getDocumentationString(changeEvent);
+            expect(result).toBe('Added column test.field.path.');
+        });
+
+        it('should handle removing a column', () => {
+            const changeEvent: ChangeEvent = {
+                urn: 'urn:test',
+                category: ChangeCategoryType.TechnicalSchema,
+                operation: ChangeOperationType.Remove,
+                parameters: [
+                    {
+                        key: 'fieldPath',
+                        value: '[version=2.0].[type=struct].[type=array].[type=struct].addresses.[type=string].zip',
+                    },
+                ],
+                description: 'Original description',
+            };
+
+            const result = getDocumentationString(changeEvent);
+            expect(result).toBe('Removed column addresses.zip.');
+        });
+
+        it('should handle v2 field path column', () => {
+            const changeEvent: ChangeEvent = {
+                urn: 'urn:test',
+                category: ChangeCategoryType.TechnicalSchema,
+                operation: ChangeOperationType.Remove,
+                parameters: [{ key: 'fieldPath', value: 'test.field.path' }],
+                description: 'Original description',
+            };
+
+            const result = getDocumentationString(changeEvent);
+            expect(result).toBe('Removed column test.field.path.');
+        });
+    });
+
+    describe('Documentation Changes', () => {
+        it('should handle empty asset documentation', () => {
+            const changeEvent: ChangeEvent = {
+                urn: 'urn:test',
+                category: ChangeCategoryType.Documentation,
+                parameters: [{ key: 'description', value: '' }],
+                description: 'Original description',
+            };
+
+            const result = getDocumentationString(changeEvent);
+            expect(result).toBe('Asset documentation is empty.');
+        });
+
+        it('should handle setting asset documentation', () => {
+            const changeEvent: ChangeEvent = {
+                urn: 'urn:test',
+                category: ChangeCategoryType.Documentation,
+                parameters: [{ key: 'description', value: 'New asset description' }],
+                description: 'Original description',
+            };
+
+            const result = getDocumentationString(changeEvent);
+            expect(result).toBe('Set asset documentation to New asset description');
+        });
+
+        it('should handle setting field documentation', () => {
+            const changeEvent: ChangeEvent = {
+                urn: 'urn:test',
+                category: ChangeCategoryType.Documentation,
+                modifier: 'test.field',
+                parameters: [{ key: 'description', value: 'New field description' }],
+                description: 'Original description',
+            };
+
+            const result = getDocumentationString(changeEvent);
+            expect(result).toBe('Set field documentation for test.field to New field description');
+        });
+
+        it('should handle setting v2 field documentation', () => {
+            const changeEvent: ChangeEvent = {
+                urn: 'urn:test',
+                category: ChangeCategoryType.Documentation,
+                modifier: '[version=2.0].[type=struct].[type=array].[type=struct].addresses.[type=string].zip',
+                parameters: [{ key: 'description', value: 'New field description' }],
+                description: 'Original description',
+            };
+
+            const result = getDocumentationString(changeEvent);
+            expect(result).toBe('Set field documentation for addresses.zip to New field description');
+        });
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/changeEventToString.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/changeEventToString.ts
new file mode 100644
index 00000000000000..648d4b7b640771
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/changeEventToString.ts
@@ -0,0 +1,51 @@
+import { downgradeV2FieldPath } from '@src/app/lineageV2/lineageUtils';
+import { ChangeEvent } from '@src/types.generated';
+
+const CATEGORY_TECHNICAL_SCHEMA = 'TECHNICAL_SCHEMA';
+const CATEGORY_DOCUMENTATION = 'DOCUMENTATION';
+const OPERATION_ADD = 'ADD';
+const OPERATION_REMOVE = 'REMOVE';
+const DEFAULT_FIELD_PATH = 'A new field';
+const EMPTY_ASSET_DOC = 'Asset documentation is empty.';
+const EMPTY_FIELD_DOC = (fieldPath) => `Field documentation for ${downgradeV2FieldPath(fieldPath)} is empty.`;
+const SET_ASSET_DOC = (description) => `Set asset documentation to ${description}`;
+const SET_FIELD_DOC = (fieldPath, description) =>
+    `Set field documentation for ${downgradeV2FieldPath(fieldPath)} to ${description}`;
+
+// function that iterates through array of key, value objects and returns the value associated with the key or default value
+// if the key is not found
+function getParameter(
+    parameters?: Array<{ key?: string | undefined | null; value?: string | undefined | null }> | null,
+    key?: string,
+    defaultValue?: string,
+): string | undefined {
+    const parameter = (parameters || []).find((param) => param.key === key);
+    return parameter?.value || defaultValue;
+}
+
+export function getDocumentationString(changeEvent: ChangeEvent) {
+    let documentationString = changeEvent.description;
+
+    if (changeEvent.category === CATEGORY_TECHNICAL_SCHEMA) {
+        const fieldPath = getParameter(changeEvent.parameters, 'fieldPath', DEFAULT_FIELD_PATH);
+        if (changeEvent.operation === OPERATION_ADD) {
+            documentationString = `Added column ${downgradeV2FieldPath(fieldPath || '')}.`;
+        } else if (changeEvent.operation === OPERATION_REMOVE) {
+            documentationString = `Removed column ${downgradeV2FieldPath(fieldPath || '')}.`;
+        }
+    } else if (changeEvent.category === CATEGORY_DOCUMENTATION) {
+        const description = getParameter(changeEvent.parameters, 'description', '');
+
+        if (!changeEvent.modifier) {
+            // Documentation at the entity level
+            documentationString = description === '' ? EMPTY_ASSET_DOC : SET_ASSET_DOC(description);
+        } else {
+            // Documentation at the field level
+            const fieldPath = changeEvent.modifier;
+            documentationString =
+                description === '' ? EMPTY_FIELD_DOC(fieldPath) : SET_FIELD_DOC(fieldPath, description);
+        }
+    }
+
+    return documentationString;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/historyUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/historyUtils.ts
new file mode 100644
index 00000000000000..e14ce32c6d3fc9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/history/historyUtils.ts
@@ -0,0 +1,12 @@
+export function formatTimestamp(timestamp: number): string {
+    const date = new Date(timestamp);
+    const options = {
+        year: 'numeric',
+        month: 'long',
+        day: 'numeric',
+        hour: 'numeric',
+        minute: 'numeric',
+        hour12: true,
+    };
+    return date.toLocaleString('en-US', options as any);
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useGetEntitySchema.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useGetEntitySchema.tsx
new file mode 100644
index 00000000000000..7b98e11e32ad15
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useGetEntitySchema.tsx
@@ -0,0 +1,35 @@
+import { cloneDeep } from 'lodash';
+import { EntityType } from '../../../../../../types.generated';
+import { useEntityData } from '../../../../../entity/shared/EntityContext';
+import { useGetDatasetSchemaQuery } from '../../../../../../graphql/dataset.generated';
+import { combineEntityDataWithSiblings } from '../../../../../entity/shared/siblingUtils';
+import { useIsSeparateSiblingsMode } from '../../../useIsSeparateSiblingsMode';
+
+// Whether to dynamically load the schema from the backend.
+const shouldLoadSchema = (entityType, entityData) => {
+    return entityType === EntityType.Dataset && !entityData?.schemaMetadata;
+};
+
+export const useGetEntityWithSchema = (skip?: boolean) => {
+    const { urn, entityData, entityType } = useEntityData();
+    // Load the dataset schema lazily.
+    const {
+        data: rawData,
+        loading,
+        refetch,
+    } = useGetDatasetSchemaQuery({
+        variables: {
+            urn,
+        },
+        skip: skip || !urn || !shouldLoadSchema(entityType, entityData),
+        fetchPolicy: 'cache-first',
+    });
+    const isHideSiblingMode = useIsSeparateSiblingsMode();
+    // Merge with sibling information as required.
+    const combinedData = rawData && !isHideSiblingMode ? combineEntityDataWithSiblings(cloneDeep(rawData)) : rawData;
+    return {
+        loading,
+        entityWithSchema: shouldLoadSchema(entityType, entityData) ? combinedData?.dataset : entityData,
+        refetch,
+    };
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useKeyboardControls.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useKeyboardControls.ts
new file mode 100644
index 00000000000000..abd9aad2b09cfb
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useKeyboardControls.ts
@@ -0,0 +1,84 @@
+import { useCallback, useEffect, useMemo } from 'react';
+import { ExtendedSchemaFields } from '../../../../dataset/profile/schema/utils/types';
+
+export default function useKeyboardControls(
+    rows: ExtendedSchemaFields[],
+    selectedRowFieldPath: string | null,
+    setSelectedRowFieldPath: (fieldPath: string | null) => void,
+    expandedRows?: Set<string>,
+    setExpandedRows?: (expandedRows: React.SetStateAction<Set<string>>) => void,
+    tableDiv?: {
+        scrollTo: (y: number) => void;
+        scrollToIndex: (idx: number) => void;
+    },
+) {
+    const index = useMemo(
+        () => rows.findIndex((row) => row.fieldPath === selectedRowFieldPath),
+        [rows, selectedRowFieldPath],
+    );
+    const selectedRow = rows[index];
+    const selectNextField = useCallback(() => {
+        if (index !== undefined && index !== -1) {
+            if (index === rows.length - 1) {
+                setSelectedRowFieldPath(rows[0].fieldPath);
+                tableDiv?.scrollToIndex(0);
+            } else {
+                setSelectedRowFieldPath(rows[index + 1].fieldPath);
+            }
+        }
+    }, [index, rows, setSelectedRowFieldPath, tableDiv]);
+
+    const selectPreviousField = useCallback(() => {
+        if (index !== undefined && index !== -1) {
+            if (index === 0) {
+                setSelectedRowFieldPath(rows[rows.length - 1].fieldPath);
+                tableDiv?.scrollTo(-1);
+            } else {
+                setSelectedRowFieldPath(rows[index - 1].fieldPath);
+            }
+        }
+    }, [index, rows, setSelectedRowFieldPath, tableDiv]);
+
+    const expandCurrentField = useCallback(() => {
+        if (index !== undefined && index !== -1) {
+            if (selectedRow.children && !expandedRows?.has(selectedRow.fieldPath)) {
+                setExpandedRows?.((previousRows) => new Set(previousRows.add(rows[index].fieldPath)));
+            }
+        }
+    }, [index, rows, expandedRows, setExpandedRows, selectedRow]);
+
+    const collapseCurrentField = useCallback(() => {
+        if (index !== undefined && index !== -1) {
+            if (selectedRow.children && expandedRows?.has(selectedRow.fieldPath)) {
+                setExpandedRows?.((previousRows) => {
+                    previousRows.delete(rows[index].fieldPath);
+                    return new Set(previousRows);
+                });
+            }
+        }
+    }, [index, rows, expandedRows, setExpandedRows, selectedRow]);
+
+    function handleArrowKeys(event: KeyboardEvent) {
+        if (event.code === 'ArrowUp') {
+            event.preventDefault();
+            selectPreviousField();
+        } else if (event.code === 'ArrowDown') {
+            event.preventDefault();
+            selectNextField();
+        } else if (event.code === 'ArrowRight') {
+            expandCurrentField();
+        } else if (event.code === 'ArrowLeft') {
+            collapseCurrentField();
+        } else if (event.code === 'Escape') {
+            setSelectedRowFieldPath(null);
+        }
+    }
+
+    useEffect(() => {
+        document.addEventListener('keydown', handleArrowKeys);
+
+        return () => document.removeEventListener('keydown', handleArrowKeys);
+    });
+
+    return { selectNextField, selectPreviousField };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useSchemaVersioning.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useSchemaVersioning.tsx
new file mode 100644
index 00000000000000..4a7c9519336717
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/useSchemaVersioning.tsx
@@ -0,0 +1,68 @@
+import navigateToUrl from '@app/utils/navigateToUrl';
+import { useGetSchemaVersionListQuery } from '@graphql/schemaBlame.generated';
+import { useGetVersionedDatasetQuery } from '@graphql/versionedDataset.generated';
+import { EditableSchemaMetadata, Schema, SemanticVersionStruct } from '@types';
+import * as QueryString from 'query-string';
+import { useEffect } from 'react';
+import { useHistory, useLocation } from 'react-router-dom';
+
+interface Args {
+    datasetUrn?: string;
+    urlParam: string;
+    skip: boolean;
+}
+
+interface Return {
+    selectedVersion: string;
+    versionList: SemanticVersionStruct[];
+    isLatest: boolean;
+    schema?: Partial<Schema>;
+    editableSchemaMetadata?: EditableSchemaMetadata;
+}
+
+export default function useSchemaVersioning({ datasetUrn, urlParam, skip }: Args): Return {
+    const location = useLocation();
+    const history = useHistory();
+    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
+    const urlVersion = params[urlParam] as string;
+
+    const { data } = useGetSchemaVersionListQuery({
+        skip: !datasetUrn || skip,
+        variables: { input: { datasetUrn: datasetUrn || '' } },
+        fetchPolicy: 'cache-first',
+    });
+
+    const versionList = data?.getSchemaVersionList?.semanticVersionList || [];
+    const latestVersion = versionList[0]?.semanticVersion || '';
+    const selectedVersion = urlVersion || latestVersion;
+    const selectedVersionStruct = versionList.find((v) => v.semanticVersion === selectedVersion);
+
+    useEffect(() => {
+        // If the version in the URL is invalid, reset the URL to the latest version
+        if (urlVersion && !selectedVersionStruct) {
+            navigateToUrl({
+                location,
+                history,
+                urlParam,
+                value: '',
+            });
+        }
+    }, [urlVersion, selectedVersionStruct, history, location, urlParam]);
+
+    const versionedDatasetData = useGetVersionedDatasetQuery({
+        skip: !datasetUrn || !selectedVersionStruct || skip,
+        variables: {
+            urn: datasetUrn || '',
+            versionStamp: selectedVersionStruct?.versionStamp,
+        },
+        fetchPolicy: 'cache-first',
+    });
+
+    return {
+        selectedVersion,
+        versionList,
+        isLatest: selectedVersion === latestVersion,
+        schema: versionedDatasetData.data?.versionedDataset?.schema ?? undefined,
+        editableSchemaMetadata: versionedDatasetData.data?.versionedDataset?.editableSchemaMetadata ?? undefined,
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractDescriptionInfo.test.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractDescriptionInfo.test.ts
new file mode 100644
index 00000000000000..b4483251191ffb
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractDescriptionInfo.test.ts
@@ -0,0 +1,46 @@
+import { EditableSchemaMetadata, SchemaField, SchemaFieldDataType } from '@src/types.generated';
+import { renderHook } from '@testing-library/react-hooks';
+import useExtractFieldDescriptionInfo from '../useExtractFieldDescriptionInfo';
+
+describe('useExtractDescriptionInfo', () => {
+    const emptyEditableSchemaMetadata: EditableSchemaMetadata = { editableSchemaFieldInfo: [] };
+
+    const emptySchemaField: SchemaField = {
+        fieldPath: 'testField',
+        nullable: true,
+        recursive: false,
+        type: SchemaFieldDataType.String,
+    };
+
+    const { mockedGetFieldDescriptionDetails } = vi.hoisted(() => {
+        return { mockedGetFieldDescriptionDetails: vi.fn() };
+    });
+
+    vi.mock('../getFieldDescriptionDetails', async (importOriginal) => {
+        const original = await importOriginal<object>();
+        return {
+            ...original,
+            getFieldDescriptionDetails: vi.fn(() => mockedGetFieldDescriptionDetails()),
+        };
+    });
+
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+
+    it('should extract description when it was provided', () => {
+        mockedGetFieldDescriptionDetails.mockReturnValue({
+            displayedDescription: 'testDescription',
+            isPropagated: false,
+            sourceDetail: '',
+        });
+
+        const extractFieldDescriptionInfo = renderHook(() =>
+            useExtractFieldDescriptionInfo(emptyEditableSchemaMetadata),
+        ).result.current;
+
+        const { sanitizedDescription } = extractFieldDescriptionInfo(emptySchemaField);
+        console.log(sanitizedDescription);
+        expect(sanitizedDescription === 'testDescription').toBeTruthy();
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractFieldGlossaryTermsInfo.test.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractFieldGlossaryTermsInfo.test.ts
new file mode 100644
index 00000000000000..41d5b710d3d4f7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractFieldGlossaryTermsInfo.test.ts
@@ -0,0 +1,130 @@
+import {
+    EditableSchemaMetadata,
+    EntityType,
+    GlossaryTerm,
+    SchemaField,
+    SchemaFieldDataType,
+} from '@src/types.generated';
+import { renderHook } from '@testing-library/react-hooks';
+import useExtractFieldGlossaryTermsInfo from '../useExtractFieldGlossaryTermsInfo';
+
+describe('useExtractFieldGlossaryTermsInfo', () => {
+    const testGlossaryTerm: GlossaryTerm = {
+        urn: 'urn:testField',
+        type: EntityType.GlossaryTerm,
+        name: 'testTermName',
+        hierarchicalName: 'test.testTermName',
+        properties: {
+            name: 'testTermName',
+            definition: 'test',
+            termSource: 'INTERNAL',
+        },
+    };
+    const emptyEditableSchemaMetadata: EditableSchemaMetadata = { editableSchemaFieldInfo: [] };
+
+    const filledEditableSchemaMetadata: EditableSchemaMetadata = {
+        editableSchemaFieldInfo: [
+            {
+                fieldPath: 'testField',
+                glossaryTerms: {
+                    terms: [
+                        {
+                            associatedUrn: 'urn:li:glossaryTerm:test.testTermName',
+                            term: testGlossaryTerm,
+                        },
+                    ],
+                },
+            },
+        ],
+    };
+
+    const emptySchemaField: SchemaField = {
+        fieldPath: 'testField',
+        nullable: true,
+        recursive: false,
+        type: SchemaFieldDataType.String,
+    };
+
+    const filledSchemaField: SchemaField = {
+        fieldPath: 'testField',
+        nullable: true,
+        recursive: false,
+        type: SchemaFieldDataType.String,
+        glossaryTerms: {
+            terms: [
+                {
+                    associatedUrn: 'urn:li:glossaryTerm:test.testTermName',
+                    term: testGlossaryTerm,
+                },
+            ],
+        },
+    };
+
+    const emptyBaseEntity = {};
+
+    const { mockedUseBaseEntity } = vi.hoisted(() => {
+        return { mockedUseBaseEntity: vi.fn() };
+    });
+
+    vi.mock('@src/app/entity/shared/EntityContext', async (importOriginal) => {
+        const original = await importOriginal<object>();
+        return {
+            ...original,
+            useBaseEntity: vi.fn(() => mockedUseBaseEntity()),
+        };
+    });
+
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+
+    it('should extract uneditableTerms when they were provided in SchemaFild only', () => {
+        const extractFieldGlossaryTermsInfo = renderHook(() =>
+            useExtractFieldGlossaryTermsInfo(emptyEditableSchemaMetadata),
+        ).result.current;
+
+        const { editableTerms, uneditableTerms, numberOfTerms } = extractFieldGlossaryTermsInfo(filledSchemaField);
+
+        expect(editableTerms).toBeUndefined();
+        expect(uneditableTerms?.terms?.[0]?.term?.properties?.name === 'testTermName').toBeTruthy();
+        expect(numberOfTerms).toBe(1);
+    });
+
+    it('should extract editableTerms when they were provided in editableSchemaMetadata only', () => {
+        const extractFieldGlossaryTermsInfo = renderHook(() =>
+            useExtractFieldGlossaryTermsInfo(filledEditableSchemaMetadata),
+        ).result.current;
+
+        const { editableTerms, uneditableTerms, numberOfTerms } = extractFieldGlossaryTermsInfo(emptySchemaField);
+
+        expect(editableTerms?.terms?.[0]?.term?.properties?.name === 'testTermName').toBeTruthy();
+        expect(uneditableTerms).toBeUndefined();
+        expect(numberOfTerms).toBe(1);
+    });
+
+    it('should extract all terms when they were provided', () => {
+        mockedUseBaseEntity.mockReturnValue(emptyBaseEntity);
+        const extractFieldGlossaryTermsInfo = renderHook(() =>
+            useExtractFieldGlossaryTermsInfo(filledEditableSchemaMetadata),
+        ).result.current;
+
+        const { editableTerms, uneditableTerms, numberOfTerms } = extractFieldGlossaryTermsInfo(filledSchemaField);
+
+        expect(editableTerms?.terms?.[0]?.term?.properties?.name === 'testTermName').toBeTruthy();
+        expect(uneditableTerms?.terms?.[0]?.term?.properties?.name === 'testTermName').toBeTruthy();
+        expect(numberOfTerms).toBe(2);
+    });
+
+    it('should not extract any terms when they were not provided', () => {
+        mockedUseBaseEntity.mockReturnValue(emptyBaseEntity);
+        const extractFieldGlossaryTermsInfo = renderHook(() =>
+            useExtractFieldGlossaryTermsInfo(emptyEditableSchemaMetadata),
+        ).result.current;
+
+        const { editableTerms, uneditableTerms, numberOfTerms } = extractFieldGlossaryTermsInfo(emptySchemaField);
+
+        expect(editableTerms).toBeUndefined();
+        expect(uneditableTerms).toBeUndefined();
+        expect(numberOfTerms).toBe(0);
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractFieldTagsInfo.test.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractFieldTagsInfo.test.ts
new file mode 100644
index 00000000000000..4700fb48e36d78
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/__tests__/useExtractFieldTagsInfo.test.ts
@@ -0,0 +1,117 @@
+import { EditableSchemaMetadata, EntityType, SchemaField, SchemaFieldDataType, Tag } from '@src/types.generated';
+import { renderHook } from '@testing-library/react-hooks';
+import useExtractFieldTagsInfo from '../useExtractFieldTagsInfo';
+
+describe('useExtractFieldTagsInfo', () => {
+    const testTag: Tag = {
+        urn: 'urn:testField',
+        type: EntityType.Tag,
+        name: 'testTagName',
+        properties: {
+            name: 'testTagName',
+        },
+    };
+    const emptyEditableSchemaMetadata: EditableSchemaMetadata = { editableSchemaFieldInfo: [] };
+
+    const filledEditableSchemaMetadata: EditableSchemaMetadata = {
+        editableSchemaFieldInfo: [
+            {
+                fieldPath: 'testField',
+                globalTags: {
+                    tags: [
+                        {
+                            associatedUrn: 'urn:li:globalTags:test.testTagName',
+                            tag: testTag,
+                        },
+                    ],
+                },
+            },
+        ],
+    };
+
+    const emptySchemaField: SchemaField = {
+        fieldPath: 'testField',
+        nullable: true,
+        recursive: false,
+        type: SchemaFieldDataType.String,
+    };
+
+    const filledSchemaField: SchemaField = {
+        fieldPath: 'testField',
+        nullable: true,
+        recursive: false,
+        type: SchemaFieldDataType.String,
+        globalTags: {
+            tags: [
+                {
+                    associatedUrn: 'urn:li:globalTag:test.testTagName',
+                    tag: testTag,
+                },
+            ],
+        },
+    };
+
+    const emptyBaseEntity = {};
+
+    const { mockedUseBaseEntity } = vi.hoisted(() => {
+        return { mockedUseBaseEntity: vi.fn() };
+    });
+
+    vi.mock('@src/app/entity/shared/EntityContext', async (importOriginal) => {
+        const original = await importOriginal<object>();
+        return {
+            ...original,
+            useBaseEntity: vi.fn(() => mockedUseBaseEntity()),
+        };
+    });
+
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+
+    it('should extract uneditableTags when they were provided in SchemaFild only', () => {
+        const extractFieldTagsInfo = renderHook(() => useExtractFieldTagsInfo(emptyEditableSchemaMetadata)).result
+            .current;
+
+        const { editableTags, uneditableTags, numberOfTags } = extractFieldTagsInfo(filledSchemaField);
+
+        expect(editableTags).toBeUndefined();
+        expect(uneditableTags?.tags?.[0]?.tag?.properties?.name === 'testTagName').toBeTruthy();
+        expect(numberOfTags).toBe(1);
+    });
+
+    it('should extract editableTags when they were provided in editableSchemaMetadata only', () => {
+        const extractFieldTagsInfo = renderHook(() => useExtractFieldTagsInfo(filledEditableSchemaMetadata)).result
+            .current;
+
+        const { editableTags, uneditableTags, numberOfTags } = extractFieldTagsInfo(emptySchemaField);
+
+        expect(editableTags?.tags?.[0]?.tag?.properties?.name === 'testTagName').toBeTruthy();
+        expect(uneditableTags).toBeUndefined();
+        expect(numberOfTags).toBe(1);
+    });
+
+    it('should extract all tags when they were provided', () => {
+        mockedUseBaseEntity.mockReturnValue(emptyBaseEntity);
+        const extractFieldTagsInfo = renderHook(() => useExtractFieldTagsInfo(filledEditableSchemaMetadata)).result
+            .current;
+
+        const { editableTags, uneditableTags, numberOfTags } = extractFieldTagsInfo(filledSchemaField);
+
+        expect(editableTags?.tags?.[0]?.tag?.properties?.name === 'testTagName').toBeTruthy();
+        expect(uneditableTags?.tags?.[0]?.tag?.properties?.name === 'testTagName').toBeTruthy();
+        expect(numberOfTags).toBe(2);
+    });
+
+    it('should not extract any tags when they are not provided', () => {
+        mockedUseBaseEntity.mockReturnValue(emptyBaseEntity);
+        const extractFieldTagsInfo = renderHook(() => useExtractFieldTagsInfo(emptyEditableSchemaMetadata)).result
+            .current;
+
+        const { editableTags, uneditableTags, numberOfTags } = extractFieldTagsInfo(emptySchemaField);
+
+        expect(editableTags).toBeUndefined();
+        expect(uneditableTags).toBeUndefined();
+        expect(numberOfTags).toBe(0);
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/filterSchemaRows.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/filterSchemaRows.ts
new file mode 100644
index 00000000000000..c42c1305200ec0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/filterSchemaRows.ts
@@ -0,0 +1,136 @@
+import { EntityRegistry } from '../../../../../../../entityRegistryContext';
+import { EntityType, SchemaField } from '../../../../../../../types.generated';
+
+export enum SchemaFilterType {
+    FieldPath = 'Field Path',
+    Documentation = 'Documentation',
+    Tags = 'Tags',
+    Terms = 'Terms',
+}
+
+function matchesTagsOrTermsOrDescription(
+    field: SchemaField,
+    filterText: string,
+    entityRegistry: EntityRegistry,
+    schemaFilterTypes: SchemaFilterType[],
+) {
+    return (
+        (field.globalTags?.tags?.find((tagAssociation) =>
+            entityRegistry.getDisplayName(EntityType.Tag, tagAssociation.tag).toLocaleLowerCase().includes(filterText),
+        ) &&
+            schemaFilterTypes.includes(SchemaFilterType.Tags)) ||
+        (field.glossaryTerms?.terms?.find((termAssociation) =>
+            entityRegistry
+                .getDisplayName(EntityType.GlossaryTerm, termAssociation.term)
+                .toLocaleLowerCase()
+                .includes(filterText),
+        ) &&
+            schemaFilterTypes.includes(SchemaFilterType.Terms)) ||
+        (field.description?.toLocaleLowerCase().includes(filterText) &&
+            schemaFilterTypes.includes(SchemaFilterType.Documentation))
+    );
+}
+
+// returns list of fieldPaths for fields that have Terms or Tags or Descriptions matching the filterText
+function getFilteredFieldPathsByMetadata(
+    editableSchemaMetadata: any,
+    entityRegistry,
+    filterText,
+    schemaFilterTypes: SchemaFilterType[],
+) {
+    return (
+        editableSchemaMetadata?.editableSchemaFieldInfo
+            .filter((fieldInfo) =>
+                matchesTagsOrTermsOrDescription(fieldInfo, filterText, entityRegistry, schemaFilterTypes),
+            )
+            .map((fieldInfo) => fieldInfo.fieldPath) || []
+    );
+}
+
+function matchesEditableTagsOrTermsOrDescription(field: SchemaField, filteredFieldPathsByEditableMetadata: any) {
+    return filteredFieldPathsByEditableMetadata.includes(field.fieldPath);
+}
+
+function matchesFieldName(fieldName: string, filterText: string, schemaFilterTypes: SchemaFilterType[]) {
+    return fieldName.toLocaleLowerCase().includes(filterText) && schemaFilterTypes.includes(SchemaFilterType.FieldPath);
+}
+
+function returnNoFilterAndExpandedPathMatch(rows: SchemaField[], expandedDrawerFieldPath: string | null) {
+    const expandedRowsFromFilter = new Set<string>();
+    rows.forEach((row) => {
+        const splitFieldPath = row.fieldPath.split('.');
+        if (row.fieldPath === expandedDrawerFieldPath) {
+            // if we match specifically on this field (not just its parent), add and expand all parents
+            splitFieldPath.reduce((previous, current) => {
+                expandedRowsFromFilter.add(previous);
+                return `${previous}.${current}`;
+            });
+        }
+    });
+    return { filteredRows: rows, expandedRowsFromFilter, matches: [] };
+}
+
+export function filterSchemaRows(
+    rows: SchemaField[],
+    editableSchemaMetadata: any,
+    filterText: string,
+    schemaFilterTypes: SchemaFilterType[],
+    // if they have the drawer expanded on some asset we don't want to let this collapse
+    expandedDrawerFieldPath: string | null,
+    entityRegistry: EntityRegistry,
+    skipParents?: boolean,
+) {
+    if (!rows) return { filteredRows: [], expandedRowsFromFilter: new Set<string>() };
+
+    if (!filterText && expandedDrawerFieldPath) {
+        return returnNoFilterAndExpandedPathMatch(rows, expandedDrawerFieldPath);
+    }
+    if (!filterText || schemaFilterTypes.length === 0)
+        return {
+            filteredRows: rows,
+            expandedRowsFromFilter: new Set<string>(),
+        };
+
+    const formattedFilterText = filterText.toLocaleLowerCase();
+
+    const filteredFieldPathsByEditableMetadata = getFilteredFieldPathsByMetadata(
+        editableSchemaMetadata,
+        entityRegistry,
+        formattedFilterText,
+        schemaFilterTypes,
+    );
+
+    const finalFieldPaths = new Set();
+    const expandedRowsFromFilter = new Set<string>();
+    const matches: { path: string; index: number }[] = [];
+
+    rows.forEach((row, idx) => {
+        if (
+            matchesFieldName(row.fieldPath, formattedFilterText, schemaFilterTypes) ||
+            matchesEditableTagsOrTermsOrDescription(row, filteredFieldPathsByEditableMetadata) ||
+            matchesTagsOrTermsOrDescription(row, formattedFilterText, entityRegistry, schemaFilterTypes) // non-editable tags, terms and description
+        ) {
+            finalFieldPaths.add(row.fieldPath);
+        }
+        const splitFieldPath = row.fieldPath.split('.');
+        const fieldName = splitFieldPath.slice(-1)[0];
+        if (
+            !skipParents &&
+            (matchesFieldName(fieldName, formattedFilterText, schemaFilterTypes) ||
+                matchesEditableTagsOrTermsOrDescription(row, filteredFieldPathsByEditableMetadata) ||
+                matchesTagsOrTermsOrDescription(row, formattedFilterText, entityRegistry, schemaFilterTypes)) // non-editable tags, terms and description
+        ) {
+            // if we match specifically on this field (not just its parent), add and expand all parents
+            matches.push({ path: row.fieldPath, index: idx });
+            splitFieldPath.reduce((previous, current) => {
+                finalFieldPaths.add(previous);
+                expandedRowsFromFilter.add(previous);
+                return `${previous}.${current}`;
+            });
+        }
+    });
+
+    const filteredRows = rows.filter((row) => finalFieldPaths.has(row.fieldPath));
+
+    return { filteredRows, expandedRowsFromFilter, matches };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getExpandedDrawerFieldPath.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getExpandedDrawerFieldPath.ts
new file mode 100644
index 00000000000000..4bebeca62130a8
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getExpandedDrawerFieldPath.ts
@@ -0,0 +1,10 @@
+import * as QueryString from 'query-string';
+
+export default function getExpandedDrawerFieldPath(location: any) {
+    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
+    try {
+        return decodeURIComponent(params.highlightedPath ? (params.highlightedPath as string) : '');
+    } catch (ex) {
+        return '';
+    }
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails.ts
new file mode 100644
index 00000000000000..edcdb07fb802fc
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails.ts
@@ -0,0 +1,29 @@
+import { EditableSchemaFieldInfo, SchemaFieldEntity } from '../../../../../../../types.generated';
+
+interface Props {
+    schemaFieldEntity?: SchemaFieldEntity | null;
+    editableFieldInfo?: EditableSchemaFieldInfo;
+    defaultDescription?: string | null;
+}
+
+export function getFieldDescriptionDetails({ schemaFieldEntity, editableFieldInfo, defaultDescription }: Props) {
+    // get most recent documentation
+    const sortedDocumentations = schemaFieldEntity?.documentation?.documentations.sort(
+        (doc1, doc2) => (doc2.attribution?.time || 0) - (doc1.attribution?.time || 0),
+    );
+    const documentation = sortedDocumentations?.[0];
+    const isUsingDocumentationAspect = !editableFieldInfo?.description && !defaultDescription && !!documentation;
+    const isPropagated =
+        isUsingDocumentationAspect &&
+        !!documentation?.attribution?.sourceDetail?.find(
+            (mapEntry) => mapEntry.key === 'propagated' && mapEntry.value === 'true',
+        );
+
+    const displayedDescription =
+        editableFieldInfo?.description || defaultDescription || documentation?.documentation || '';
+
+    const sourceDetail = documentation?.attribution?.sourceDetail;
+    const propagatedDescription = isPropagated ? documentation?.documentation : undefined;
+
+    return { displayedDescription, isPropagated, sourceDetail, propagatedDescription };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getSchemaFilterTypesFromUrl.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getSchemaFilterTypesFromUrl.ts
new file mode 100644
index 00000000000000..bfefae1f049982
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/getSchemaFilterTypesFromUrl.ts
@@ -0,0 +1,18 @@
+import * as QueryString from 'query-string';
+import { SchemaFilterType } from './filterSchemaRows';
+
+export default function getSchemaFilterTypesFromUrl(location: any): SchemaFilterType[] {
+    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
+    const schemaFilterTypeString = decodeURIComponent(
+        params.schemaFilterTypes ? (params.schemaFilterTypes as string) : '',
+    );
+    if (!schemaFilterTypeString || schemaFilterTypeString.length < 1) {
+        return [
+            SchemaFilterType.Documentation,
+            SchemaFilterType.FieldPath,
+            SchemaFilterType.Tags,
+            SchemaFilterType.Terms,
+        ];
+    }
+    return schemaFilterTypeString.split(',') as SchemaFilterType[];
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/queryStringUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/queryStringUtils.ts
new file mode 100644
index 00000000000000..76d18affff3624
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/queryStringUtils.ts
@@ -0,0 +1,11 @@
+import * as QueryString from 'query-string';
+
+export function getSchemaFilterFromQueryString(location: any) {
+    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
+    return decodeURIComponent(params.schemaFilter ? (params.schemaFilter as string) : '');
+}
+
+export function getMatchedTextFromQueryString(location: any) {
+    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
+    return decodeURIComponent(params.matchedText ? (params.matchedText as string) : '');
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/statsUtil.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/statsUtil.ts
new file mode 100644
index 00000000000000..159b4dbf62c53c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/statsUtil.ts
@@ -0,0 +1,9 @@
+export const decimalToPercentStr = (decimal?: number | null, precision = 2): string => {
+    if (!decimal) return '0%';
+    return `${(decimal * 100).toFixed(precision)}%`;
+};
+
+export const percentStrToDecimal = (percentStr: string): number => {
+    const value = parseFloat(percentStr.replace('%', '').trim());
+    return Number.isNaN(value) ? 0 : value / 100;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/updateSchemaFilterQueryString.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/updateSchemaFilterQueryString.ts
new file mode 100644
index 00000000000000..531a3bc7913a07
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/updateSchemaFilterQueryString.ts
@@ -0,0 +1,32 @@
+import * as QueryString from 'query-string';
+import { useHistory, useLocation } from 'react-router';
+import { useDebounce } from 'react-use';
+import { SchemaFilterType } from './filterSchemaRows';
+
+export default function useUpdateSchemaFilterQueryString(
+    filterText: string,
+    expandedDrawerFieldPath: string | null,
+    schemaFilterTypes: SchemaFilterType[],
+) {
+    const location = useLocation();
+    const history = useHistory();
+    const parsedParams = QueryString.parse(location.search, { arrayFormat: 'comma' });
+    const newParams = {
+        ...parsedParams,
+        schemaFilter: filterText,
+        highlightedPath: expandedDrawerFieldPath,
+        schemaFilterTypes: schemaFilterTypes.length === 4 ? [] : schemaFilterTypes,
+    };
+    const stringifiedParams = QueryString.stringify(newParams, { arrayFormat: 'comma' });
+
+    useDebounce(
+        () => {
+            history.replace({
+                pathname: location.pathname,
+                search: stringifiedParams,
+            });
+        },
+        500,
+        [filterText, history, location.pathname, stringifiedParams, expandedDrawerFieldPath, schemaFilterTypes],
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx
new file mode 100644
index 00000000000000..2d4151aaa26c5a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx
@@ -0,0 +1,76 @@
+import React, { useState } from 'react';
+
+import { EditableSchemaMetadata, SchemaField, SubResourceType } from '../../../../../../../types.generated';
+import DescriptionField from '../../../../../dataset/profile/schema/components/SchemaDescriptionField';
+import { pathMatchesNewPath } from '../../../../../dataset/profile/schema/utils/utils';
+import { useUpdateDescriptionMutation } from '../../../../../../../graphql/mutations.generated';
+import { useMutationUrn, useRefetch } from '../../../../../../entity/shared/EntityContext';
+import { useSchemaRefetch } from '../SchemaContext';
+import { sanitizeRichText } from '../../../Documentation/components/editor/utils';
+import CompactMarkdownViewer from '../../../Documentation/components/CompactMarkdownViewer';
+import useExtractFieldDescriptionInfo from './useExtractFieldDescriptionInfo';
+
+export default function useDescriptionRenderer(
+    editableSchemaMetadata: EditableSchemaMetadata | null | undefined,
+    isCompact: boolean,
+    options?: {
+        handleShowMore?: (_: string) => void;
+    },
+) {
+    const urn = useMutationUrn();
+    const refetch = useRefetch();
+    const schemaRefetch = useSchemaRefetch();
+    const [updateDescription] = useUpdateDescriptionMutation();
+    const [expandedRows, setExpandedRows] = useState({});
+    const extractFieldDescription = useExtractFieldDescriptionInfo(editableSchemaMetadata);
+
+    const refresh: any = () => {
+        refetch?.();
+        schemaRefetch?.();
+    };
+
+    return (description: string | undefined, record: SchemaField, index: number): JSX.Element => {
+        const editableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo.find((candidateEditableFieldInfo) =>
+            pathMatchesNewPath(candidateEditableFieldInfo.fieldPath, record.fieldPath),
+        );
+        const { schemaFieldEntity } = record;
+        const { displayedDescription, sanitizedDescription, isPropagated, sourceDetail } = extractFieldDescription(
+            record,
+            description,
+        );
+        const original = record.description ? sanitizeRichText(record.description) : undefined;
+
+        const handleExpandedRows = (expanded) => setExpandedRows((prev) => ({ ...prev, [index]: expanded }));
+
+        if (isCompact) {
+            return <CompactMarkdownViewer content={displayedDescription} />;
+        }
+
+        return (
+            <DescriptionField
+                onExpanded={handleExpandedRows}
+                expanded={!!expandedRows[index]}
+                fieldPath={schemaFieldEntity?.fieldPath}
+                description={sanitizedDescription}
+                original={original}
+                isEdited={!!editableFieldInfo?.description}
+                onUpdate={(updatedDescription) =>
+                    updateDescription({
+                        variables: {
+                            input: {
+                                description: sanitizeRichText(updatedDescription),
+                                resourceUrn: urn,
+                                subResource: record.fieldPath,
+                                subResourceType: SubResourceType.DatasetField,
+                            },
+                        },
+                    }).then(refresh)
+                }
+                handleShowMore={options?.handleShowMore}
+                isReadOnly
+                isPropagated={isPropagated}
+                sourceDetail={sourceDetail}
+            />
+        );
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldDescriptionInfo.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldDescriptionInfo.ts
new file mode 100644
index 00000000000000..b2158f9760ca17
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldDescriptionInfo.ts
@@ -0,0 +1,28 @@
+import { pathMatchesNewPath } from '@src/app/entityV2/dataset/profile/schema/utils/utils';
+import { EditableSchemaMetadata, SchemaField } from '@src/types.generated';
+import { getFieldDescriptionDetails } from './getFieldDescriptionDetails';
+import { sanitizeRichText } from '../../../Documentation/components/editor/utils';
+
+export default function useExtractFieldDescriptionInfo(
+    editableSchemaMetadata: EditableSchemaMetadata | null | undefined,
+) {
+    return (record: SchemaField, description: string | undefined | null = null) => {
+        const editableFieldInfoB = editableSchemaMetadata?.editableSchemaFieldInfo.find((candidateEditableFieldInfo) =>
+            pathMatchesNewPath(candidateEditableFieldInfo.fieldPath, record.fieldPath),
+        );
+        const { displayedDescription, isPropagated, sourceDetail } = getFieldDescriptionDetails({
+            schemaFieldEntity: record.schemaFieldEntity,
+            editableFieldInfo: editableFieldInfoB,
+            defaultDescription: description || record?.description,
+        });
+
+        const sanitizedDescription = sanitizeRichText(displayedDescription);
+
+        return {
+            displayedDescription,
+            sanitizedDescription,
+            isPropagated,
+            sourceDetail,
+        };
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldGlossaryTermsInfo.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldGlossaryTermsInfo.ts
new file mode 100644
index 00000000000000..848b5e647cbafa
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldGlossaryTermsInfo.ts
@@ -0,0 +1,18 @@
+import { pathMatchesNewPath } from '@src/app/entityV2/dataset/profile/schema/utils/utils';
+import { EditableSchemaMetadata, GlossaryTerms, SchemaField } from '@src/types.generated';
+
+export default function useExtractFieldGlossaryTermsInfo(
+    editableSchemaMetadata: EditableSchemaMetadata | null | undefined,
+) {
+    return (record: SchemaField, defaultUneditableTerms: GlossaryTerms | null = null) => {
+        const editableTerms = editableSchemaMetadata?.editableSchemaFieldInfo.find((candidateEditableFieldInfo) =>
+            pathMatchesNewPath(candidateEditableFieldInfo.fieldPath, record.fieldPath),
+        )?.glossaryTerms;
+
+        const uneditableTerms = defaultUneditableTerms || record?.glossaryTerms;
+
+        const numberOfTerms = (editableTerms?.terms?.length ?? 0) + (uneditableTerms?.terms?.length ?? 0);
+
+        return { editableTerms, uneditableTerms, numberOfTerms };
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldTagsInfo.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldTagsInfo.ts
new file mode 100644
index 00000000000000..bdd34e64e651eb
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useExtractFieldTagsInfo.ts
@@ -0,0 +1,16 @@
+import { pathMatchesNewPath } from '@src/app/entityV2/dataset/profile/schema/utils/utils';
+import { EditableSchemaMetadata, GlobalTags, SchemaField } from '@src/types.generated';
+
+export default function useExtractFieldTagsInfo(editableSchemaMetadata: EditableSchemaMetadata | null | undefined) {
+    return (record: SchemaField, defaultUneditableTags: GlobalTags | null = null) => {
+        const editableTags = editableSchemaMetadata?.editableSchemaFieldInfo.find((candidateEditableFieldInfo) =>
+            pathMatchesNewPath(candidateEditableFieldInfo.fieldPath, record.fieldPath),
+        )?.globalTags;
+
+        const uneditableTags = defaultUneditableTags || record?.globalTags;
+
+        const numberOfTags = (editableTags?.tags?.length ?? 0) + (uneditableTags?.tags?.length ?? 0);
+
+        return { editableTags, uneditableTags, numberOfTags };
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useGetStructuredPropColumns.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useGetStructuredPropColumns.tsx
new file mode 100644
index 00000000000000..3861e5d4e9625d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useGetStructuredPropColumns.tsx
@@ -0,0 +1,22 @@
+import StructuredPropValues from '@src/app/entityV2/dataset/profile/schema/components/StructuredPropValues';
+import { getDisplayName } from '@src/app/govern/structuredProperties/utils';
+import { SearchResult, StructuredPropertyEntity } from '@src/types.generated';
+import React, { useMemo } from 'react';
+
+export const useGetStructuredPropColumns = (properties: SearchResult[] | undefined) => {
+    const columns = useMemo(() => {
+        return properties?.map((prop) => {
+            const name = getDisplayName(prop.entity as StructuredPropertyEntity);
+            return {
+                width: 120,
+                title: name,
+                dataIndex: 'schemaFieldEntity',
+                key: prop.entity.urn,
+                render: (record) => <StructuredPropValues schemaFieldEntity={record} propColumn={prop} />,
+                ellipsis: true,
+            };
+        });
+    }, [properties]);
+
+    return columns;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useGetTableColumnProperties.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useGetTableColumnProperties.ts
new file mode 100644
index 00000000000000..80ae54c6766796
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useGetTableColumnProperties.ts
@@ -0,0 +1,39 @@
+import {
+    getEntityTypesPropertyFilter,
+    getNotHiddenPropertyFilter,
+    getShowInColumnsTablePropertyFilter,
+} from '@src/app/govern/structuredProperties/utils';
+import { useEntityRegistryV2 } from '@src/app/useEntityRegistry';
+import { useGetSearchResultsForMultipleQuery } from '@src/graphql/search.generated';
+import { EntityType } from '@src/types.generated';
+
+export const useGetTableColumnProperties = () => {
+    const entityRegistry = useEntityRegistryV2();
+
+    const inputs = {
+        types: [EntityType.StructuredProperty],
+        query: '',
+        start: 0,
+        count: 50,
+        searchFlags: { skipCache: true },
+        orFilters: [
+            {
+                and: [
+                    getEntityTypesPropertyFilter(entityRegistry, true),
+                    getNotHiddenPropertyFilter(),
+                    getShowInColumnsTablePropertyFilter(),
+                ],
+            },
+        ],
+    };
+
+    // Execute search
+    const { data } = useGetSearchResultsForMultipleQuery({
+        variables: {
+            input: inputs,
+        },
+        fetchPolicy: 'cache-first',
+    });
+
+    return data?.searchAcrossEntities?.searchResults;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx
new file mode 100644
index 00000000000000..300f2627ee8f06
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+import { EditableSchemaMetadata, EntityType, GlobalTags, SchemaField } from '../../../../../../../types.generated';
+import { useMutationUrn, useRefetch } from '../../../../../../entity/shared/EntityContext';
+import TagTermGroup from '../../../../../../sharedV2/tags/TagTermGroup';
+import { useSchemaRefetch } from '../SchemaContext';
+import useExtractFieldGlossaryTermsInfo from './useExtractFieldGlossaryTermsInfo';
+import useExtractFieldTagsInfo from './useExtractFieldTagsInfo';
+
+export default function useTagsAndTermsRenderer(
+    editableSchemaMetadata: EditableSchemaMetadata | null | undefined,
+    options: { showTags: boolean; showTerms: boolean },
+    filterText: string,
+    canEdit: boolean,
+    showOneAndCount?: boolean,
+) {
+    const urn = useMutationUrn();
+    const refetch = useRefetch();
+    const schemaRefetch = useSchemaRefetch();
+    const extractFieldGlossaryTermsInfo = useExtractFieldGlossaryTermsInfo(editableSchemaMetadata);
+    const extractFieldTagsInfo = useExtractFieldTagsInfo(editableSchemaMetadata);
+
+    const refresh: any = () => {
+        refetch?.();
+        schemaRefetch?.();
+    };
+
+    const tagAndTermRender = (tags: GlobalTags, record: SchemaField) => {
+        const { editableTerms, uneditableTerms } = extractFieldGlossaryTermsInfo(record);
+        const { editableTags, uneditableTags } = extractFieldTagsInfo(record, tags);
+
+        return (
+            <div data-testid={`schema-field-${record.fieldPath}-${options.showTags ? 'tags' : 'terms'}`}>
+                <TagTermGroup
+                    uneditableTags={options.showTags ? uneditableTags : null}
+                    editableTags={options.showTags ? editableTags : null}
+                    uneditableGlossaryTerms={options.showTerms ? uneditableTerms : null}
+                    editableGlossaryTerms={options.showTerms ? editableTerms : null}
+                    canRemove={canEdit}
+                    buttonProps={{ size: 'small' }}
+                    canAddTag={canEdit && options.showTags}
+                    canAddTerm={canEdit && options.showTerms}
+                    entityUrn={urn}
+                    entityType={EntityType.Dataset}
+                    entitySubresource={record.fieldPath}
+                    highlightText={filterText}
+                    refetch={refresh}
+                    showOneAndCount={showOneAndCount}
+                    fontSize={12}
+                />
+            </div>
+        );
+    };
+    return tagAndTermRender;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx
new file mode 100644
index 00000000000000..b14072d1b5f29e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import { EditableSchemaMetadata, EntityType, GlobalTags, SchemaField } from '../../../../../../../types.generated';
+import TagTermGroup from '../../../../../../sharedV2/tags/TagTermGroup';
+import { pathMatchesNewPath } from '../../../../../dataset/profile/schema/utils/utils';
+import { useEntityData, useRefetch } from '../../../../../../entity/shared/EntityContext';
+
+export default function useTagsAndTermsRendererFeatureTable(
+    editableSchemaMetadata: EditableSchemaMetadata | null | undefined,
+    tagHoveredIndex: string | undefined,
+    setTagHoveredIndex: (index: string | undefined) => void,
+    options: { showTags: boolean; showTerms: boolean },
+) {
+    const { urn } = useEntityData();
+    const refetch = useRefetch();
+
+    const tagAndTermRender = (tags: GlobalTags, record: SchemaField, rowIndex: number | undefined) => {
+        const relevantEditableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo.find(
+            (candidateEditableFieldInfo) => pathMatchesNewPath(candidateEditableFieldInfo.fieldPath, record.fieldPath),
+        );
+
+        return (
+            <div data-testid={`schema-field-${record.fieldPath}-${options.showTags ? 'tags' : 'terms'}`}>
+                <TagTermGroup
+                    uneditableTags={options.showTags ? tags : null}
+                    editableTags={options.showTags ? relevantEditableFieldInfo?.globalTags : null}
+                    uneditableGlossaryTerms={options.showTerms ? record.glossaryTerms : null}
+                    editableGlossaryTerms={options.showTerms ? relevantEditableFieldInfo?.glossaryTerms : null}
+                    canRemove
+                    buttonProps={{ size: 'small' }}
+                    canAddTag={tagHoveredIndex === `${record.fieldPath}-${rowIndex}` && options.showTags}
+                    canAddTerm={tagHoveredIndex === `${record.fieldPath}-${rowIndex}` && options.showTerms}
+                    onOpenModal={() => setTagHoveredIndex(undefined)}
+                    entityUrn={urn}
+                    entityType={EntityType.Dataset}
+                    entitySubresource={record.fieldPath}
+                    refetch={refetch}
+                />
+            </div>
+        );
+    };
+    return tagAndTermRender;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx
new file mode 100644
index 00000000000000..c8f0cc71a4bd4c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx
@@ -0,0 +1,69 @@
+import { geekblue } from '@ant-design/colors';
+import QueryStatsOutlinedIcon from '@mui/icons-material/QueryStatsOutlined';
+import { useBaseEntity } from '@src/app/entity/shared/EntityContext';
+import { Tooltip } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import { UsageQueryResult } from '../../../../../../../types.generated';
+// import { ReactComponent as LineageDisabledIcon } from '../../../../../../../images/lineage-disabled-icon.svg';
+import { GetDatasetQuery } from '../../../../../../../graphql/dataset.generated';
+import { FieldPopularity } from '../components/SchemaFieldDrawer/FieldPopularity';
+
+export const UsageBar = styled.div<{ width: number }>`
+    width: ${(props) => props.width}px;
+    height: 4px;
+    background-color: ${geekblue[3]};
+    border-radius: 2px;
+`;
+
+const IconsContainer = styled.div`
+    display: flex;
+    gap: 3px;
+    flex-direction: row;
+`;
+
+const IconWrapper = styled.div<{ hasStats: boolean; isFieldSelected: boolean }>`
+    display: flex;
+    svg {
+        width: 18px;
+        height: 18px;
+        color: ${(props) => {
+            return props.hasStats ? '#533fd1' : '#C6C0E0';
+        }};
+        opacity: ${(props) => (props.isFieldSelected && !props.hasStats ? '0.5' : '')};
+    }
+`;
+
+export default function useUsageStatsRenderer(
+    usageStats?: UsageQueryResult | null,
+    expandedDrawerFieldPath?: string | null,
+) {
+    const baseEntity = useBaseEntity<GetDatasetQuery>();
+    const latestFullTableProfile = baseEntity?.dataset?.latestFullTableProfile?.[0];
+    const latestPartitionProfile = baseEntity?.dataset?.latestPartitionProfile?.[0];
+
+    const latestProfile = latestFullTableProfile || latestPartitionProfile;
+
+    const usageStatsRenderer = (fieldPath: string) => {
+        const isFieldSelected = expandedDrawerFieldPath === fieldPath;
+
+        const fieldProfile = latestProfile?.fieldProfiles?.find((profile) => profile.fieldPath === fieldPath);
+
+        return (
+            <IconsContainer>
+                <FieldPopularity isFieldSelected={isFieldSelected} usageStats={usageStats} fieldPath={fieldPath} />
+
+                {/* <Icon>
+                        <LineageDisabledIcon height={20} width={20} />
+                    </Icon> */}
+
+                <Tooltip placement="top" title={!fieldProfile ? 'No column statistics' : 'Has column statistics'}>
+                    <IconWrapper hasStats={!!fieldProfile} isFieldSelected={isFieldSelected}>
+                        <QueryStatsOutlinedIcon />
+                    </IconWrapper>
+                </Tooltip>
+            </IconsContainer>
+        );
+    };
+    return usageStatsRenderer;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsHeader.tsx
new file mode 100644
index 00000000000000..5d4dd3083be930
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsHeader.tsx
@@ -0,0 +1,68 @@
+import React from 'react';
+import { Button, Typography } from 'antd';
+import { ClockCircleOutlined, LineChartOutlined } from '@ant-design/icons';
+
+import styled from 'styled-components';
+import { ViewType } from './viewType';
+import TabToolbar from '../../../components/styled/TabToolbar';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../../../constants';
+import { LookbackWindow } from './lookbackWindows';
+import LookbackWindowSelect from './historical/LookbackWindowSelect';
+
+const StatsHeaderContainer = styled.div`
+    display: flex;
+    justify-content: flex-end;
+    padding: 0;
+    margin: 0;
+`;
+
+const ReportedAtLabel = styled.div`
+    padding: 0;
+    margin: 0;
+    display: flex;
+    align-items: center;
+    color: ${ANTD_GRAY[7]};
+`;
+
+type Props = {
+    viewType: ViewType;
+    setViewType: (type: ViewType) => void;
+    reportedAt: string;
+    lookbackWindow: LookbackWindow;
+    setLookbackWindow: (window: LookbackWindow) => void;
+};
+
+export default function StatsHeader({ viewType, setViewType, reportedAt, lookbackWindow, setLookbackWindow }: Props) {
+    const latestButtonColor = viewType === ViewType.LATEST ? REDESIGN_COLORS.BLUE : ANTD_GRAY[8];
+    const latestButton = (
+        <Button type="text" onClick={() => setViewType(ViewType.LATEST)}>
+            <LineChartOutlined style={{ color: latestButtonColor }} />
+            <Typography.Text style={{ color: latestButtonColor }}>Latest</Typography.Text>
+        </Button>
+    );
+
+    const historicalButtonColor = viewType === ViewType.HISTORICAL ? REDESIGN_COLORS.BLUE : ANTD_GRAY[8];
+    const historicalButton = (
+        <Button type="text" onClick={() => setViewType(ViewType.HISTORICAL)}>
+            <ClockCircleOutlined style={{ color: historicalButtonColor }} />
+            <Typography.Text style={{ color: historicalButtonColor }}>Historical</Typography.Text>
+        </Button>
+    );
+
+    const actionView =
+        viewType === ViewType.HISTORICAL ? (
+            <LookbackWindowSelect lookbackWindow={lookbackWindow} setLookbackWindow={setLookbackWindow} />
+        ) : (
+            <ReportedAtLabel>{reportedAt}</ReportedAtLabel>
+        );
+
+    return (
+        <TabToolbar>
+            <StatsHeaderContainer>
+                {latestButton}
+                {historicalButton}
+            </StatsHeaderContainer>
+            {actionView}
+        </TabToolbar>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsSection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsSection.tsx
new file mode 100644
index 00000000000000..c0a98e44f8c358
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsSection.tsx
@@ -0,0 +1,34 @@
+import { Divider, Row, Typography } from 'antd';
+import styled from 'styled-components';
+import React from 'react';
+
+const Section = styled.div`
+    padding-top: 24px;
+    padding-bottom: 40px;
+    margin-bottom: 20px;
+    width: 100%;
+`;
+
+const ThinDivider = styled(Divider)`
+    margin-top: 8px;
+    margin-bottom: 8px;
+`;
+
+export type Props = {
+    children: React.ReactNode;
+    title: string;
+    rightFloatView?: React.ReactNode;
+};
+
+export default function StatsSection({ children, title, rightFloatView }: Props) {
+    return (
+        <Section>
+            <Row justify="space-between">
+                <Typography.Title level={3}>{title}</Typography.Title>
+                {rightFloatView || <span />}
+            </Row>
+            <ThinDivider />
+            {children}
+        </Section>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTab.tsx
new file mode 100644
index 00000000000000..0761ff12a87749
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTab.tsx
@@ -0,0 +1,107 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { GetDatasetQuery, useGetLastMonthUsageAggregationsQuery } from '../../../../../../graphql/dataset.generated';
+import { Operation, UsageQueryResult } from '../../../../../../types.generated';
+import { useBaseEntity } from '../../../../../entity/shared/EntityContext';
+import { toLocalDateString, toLocalDateTimeString, toLocalTimeString } from '../../../../../shared/time/timeUtils';
+import StatsHeader from './StatsHeader';
+import HistoricalStats from './historical/HistoricalStats';
+import { LOOKBACK_WINDOWS } from './lookbackWindows';
+import ColumnStats from './snapshot/ColumnStats';
+import TableStats from './snapshot/TableStats';
+import { ViewType } from './viewType';
+
+const SectionWrapper = styled.div`
+    overflow-y: auto;
+`;
+
+export default function StatsTab() {
+    const baseEntity = useBaseEntity<GetDatasetQuery>();
+
+    const [viewType, setViewType] = useState(ViewType.LATEST);
+    const [lookbackWindow, setLookbackWindow] = useState(LOOKBACK_WINDOWS.QUARTER);
+
+    const { data: usageStatsData } = useGetLastMonthUsageAggregationsQuery({
+        variables: { urn: baseEntity?.dataset?.urn as string },
+        skip: !baseEntity?.dataset?.urn,
+    });
+
+    const hasUsageStats = usageStatsData?.dataset?.usageStats !== undefined;
+
+    const hasOperations = baseEntity?.dataset?.operations !== undefined;
+
+    const usageStats = (hasUsageStats && (usageStatsData?.dataset?.usageStats as UsageQueryResult)) || undefined;
+
+    const latestFullTableProfile = baseEntity?.dataset?.latestFullTableProfile?.[0];
+    const latestPartitionProfile = baseEntity?.dataset?.latestPartitionProfile?.[0];
+
+    // Used for rendering latest stats.
+    const urn = baseEntity && baseEntity.dataset && baseEntity.dataset?.urn;
+
+    // Used for rendering operation info.
+    const operations = (hasOperations && (baseEntity?.dataset?.operations as Array<Operation>)) || undefined;
+    const latestOperation = operations && operations[0];
+    const lastUpdatedTime = latestOperation && toLocalDateTimeString(latestOperation?.lastUpdatedTimestamp);
+    const lastReportedTime = latestOperation && toLocalDateTimeString(latestOperation?.timestampMillis);
+
+    // Okay so if we are disabled, we don't have both or the other. Let's render
+    // Action buttons.
+    // Table Stats.
+    // Column Stats
+
+    const fullTableReportedAt =
+        latestFullTableProfile &&
+        `Reported on ${toLocalDateString(latestFullTableProfile?.timestampMillis)} at ${toLocalTimeString(
+            latestFullTableProfile?.timestampMillis,
+        )}`;
+
+    const partitionReportedAt =
+        latestPartitionProfile &&
+        `Reported on ${toLocalDateString(latestPartitionProfile?.timestampMillis)} at ${toLocalTimeString(
+            latestPartitionProfile?.timestampMillis,
+        )}`;
+
+    const totalSqlQueries = usageStats?.aggregations?.totalSqlQueries;
+    const queryCountLast30Days = baseEntity.dataset?.statsSummary?.queryCountLast30Days;
+
+    const statsHeader = (
+        <StatsHeader
+            reportedAt={fullTableReportedAt || partitionReportedAt || ''}
+            viewType={viewType}
+            setViewType={setViewType}
+            lookbackWindow={lookbackWindow}
+            setLookbackWindow={setLookbackWindow}
+        />
+    );
+
+    const latestProfile = latestFullTableProfile || latestPartitionProfile;
+
+    const latestStats = (
+        <SectionWrapper>
+            <TableStats
+                partitionSpec={latestProfile?.partitionSpec}
+                rowCount={latestProfile?.rowCount || undefined}
+                columnCount={latestProfile?.columnCount || undefined}
+                queryCount={queryCountLast30Days || totalSqlQueries || undefined}
+                users={usageStats?.aggregations?.users || undefined}
+                lastUpdatedTime={lastUpdatedTime || undefined}
+                lastReportedTime={lastReportedTime || undefined}
+            />
+            {latestProfile?.fieldProfiles && latestProfile?.fieldProfiles?.length > 0 && (
+                <ColumnStats
+                    partitionSpec={latestProfile?.partitionSpec}
+                    columnStats={(latestProfile && latestProfile.fieldProfiles) || []}
+                />
+            )}
+        </SectionWrapper>
+    );
+
+    const historicalStats = <HistoricalStats urn={urn || ''} lookbackWindow={lookbackWindow} />;
+
+    return (
+        <>
+            {statsHeader}
+            {viewType === ViewType.LATEST ? latestStats : historicalStats}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/constants.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/constants.ts
new file mode 100644
index 00000000000000..d01628ff686e65
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/constants.ts
@@ -0,0 +1 @@
+export const FULL_TABLE_PARTITION_KEYS = ['FULL_TABLE_SNAPSHOT', 'SAMPLE', '', undefined, null];
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx
new file mode 100644
index 00000000000000..f8711e47008136
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx
@@ -0,0 +1,236 @@
+import { Divider, Typography } from 'antd';
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components';
+import { useGetDataProfilesLazyQuery } from '../../../../../../../graphql/dataset.generated';
+import { Message } from '../../../../../../shared/Message';
+import { formatBytes } from '../../../../../../shared/formatNumber';
+import { getFixedLookbackWindow } from '../../../../../../shared/time/timeUtils';
+import { ANTD_GRAY } from '../../../../constants';
+import {
+    computeAllFieldPaths,
+    computeChartTickInterval,
+    extractChartValuesFromFieldProfiles,
+    extractChartValuesFromTableProfiles,
+} from '../../../../utils';
+import { FULL_TABLE_PARTITION_KEYS } from '../constants';
+import { LookbackWindow } from '../lookbackWindows';
+import ProfilingRunsChart from './charts/ProfilingRunsChart';
+import StatChart from './charts/StatChart';
+import PrefixedSelect from './shared/PrefixedSelect';
+
+// TODO: Reuse stat sections.
+const StatSection = styled.div`
+    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
+    padding: 16px 20px;
+    margin-top: 12px;
+`;
+
+const ColumnStatsHeader = styled.div`
+    display: flex;
+    justify-content: space-between;
+`;
+
+const ChartRow = styled.div`
+    display: flex;
+    justify-content: space-around;
+    padding: 24px;
+`;
+
+const ChartDivider = styled(Divider)<{ height: number; width: number }>`
+    background-color: ${ANTD_GRAY[0]};
+    height: ${(props) => props.height}px;
+    width: ${(props) => props.width}px;
+    margin: 20px;
+`;
+
+const getLookbackWindowSize = (window: LookbackWindow) => {
+    return window.windowSize;
+};
+
+export type Props = {
+    urn: string;
+    lookbackWindow: LookbackWindow;
+};
+
+export default function HistoricalStats({ urn, lookbackWindow }: Props) {
+    const [getDataProfiles, { data: profilesData, loading: profilesLoading }] = useGetDataProfilesLazyQuery();
+
+    /**
+     * Perform initial fetch of default lookback window stats.
+     */
+    useEffect(() => {
+        getDataProfiles({
+            variables: { urn, ...getFixedLookbackWindow(getLookbackWindowSize(lookbackWindow)) },
+        });
+    }, [urn, lookbackWindow, getDataProfiles]);
+
+    /**
+     * Determines which fixed lookback window is used to display historical statistics. See above for valid options.
+     */
+    const selectedWindowSize = getLookbackWindowSize(lookbackWindow);
+    const selectedWindow = getFixedLookbackWindow(selectedWindowSize);
+
+    /**
+     * Determines which field path is highlighted in column stats. Defaults to none.
+     */
+    const [selectedFieldPath, setSelectedFieldPath] = useState('');
+
+    const onChangeSelectedFieldPath = (value) => {
+        setSelectedFieldPath(value);
+    };
+
+    const graphTickInterval = computeChartTickInterval(selectedWindowSize);
+    const graphDateRange = {
+        start: selectedWindow.startTime.toString(),
+        end: selectedWindow.endTime.toString(),
+    };
+
+    const profiles = profilesData?.dataset?.datasetProfiles || [];
+    const allFieldPaths = Array.from(computeAllFieldPaths(profiles));
+
+    if (selectedFieldPath === '' && allFieldPaths.length > 0) {
+        // Set initially selected field path.
+        setSelectedFieldPath(allFieldPaths[0]);
+    }
+
+    const columnSelectView = (
+        <PrefixedSelect
+            prefixText="Stats for column "
+            values={allFieldPaths}
+            value={selectedFieldPath}
+            setValue={onChangeSelectedFieldPath}
+        />
+    );
+
+    /**
+     * Compute Table Stat chart data.
+     */
+    const rowCountChartValues = extractChartValuesFromTableProfiles(profiles, 'rowCount');
+    const columnCountChartValues = extractChartValuesFromTableProfiles(profiles, 'columnCount');
+    const sizeChartValues = extractChartValuesFromTableProfiles(profiles, 'sizeInBytes');
+
+    /**
+     * Compute Column Stat chart data.
+     */
+    const nullCountChartValues: Array<any> = extractChartValuesFromFieldProfiles(
+        profiles,
+        selectedFieldPath,
+        'nullCount',
+    );
+    const nullPercentageChartValues: Array<any> = extractChartValuesFromFieldProfiles(
+        profiles,
+        selectedFieldPath,
+        'nullProportion',
+    );
+    const distinctCountChartValues: Array<any> = extractChartValuesFromFieldProfiles(
+        profiles,
+        selectedFieldPath,
+        'uniqueCount',
+    );
+    const distinctPercentageChartValues: Array<any> = extractChartValuesFromFieldProfiles(
+        profiles,
+        selectedFieldPath,
+        'uniqueProportion',
+    );
+
+    const bytesFormatter = (num: number) => {
+        const formattedBytes = formatBytes(num);
+        return `${formattedBytes.number} ${formattedBytes.unit}`;
+    };
+
+    const placeholderChart = (
+        <StatChart
+            title="Placeholder"
+            tickInterval={graphTickInterval}
+            dateRange={{ start: '', end: '' }}
+            values={[]}
+            visible={false}
+        />
+    );
+    const placeholderVerticalDivider = (
+        <ChartDivider type="vertical" height={360} width={1} style={{ visibility: 'hidden' }} />
+    );
+
+    const areAllProfilesPartitioned = profiles.every(
+        (profile) => !FULL_TABLE_PARTITION_KEYS.includes(profile.partitionSpec?.partition || ''),
+    );
+
+    return (
+        <>
+            {profilesLoading && <Message type="loading" content="Loading..." style={{ marginTop: '10%' }} />}
+            <StatSection>
+                <Typography.Title level={5}>Profiling Runs</Typography.Title>
+                <ProfilingRunsChart profiles={profiles} areAllProfilesPartitioned={areAllProfilesPartitioned} />
+            </StatSection>
+            <StatSection>
+                <Typography.Title level={5}>
+                    {areAllProfilesPartitioned ? 'Partition Stats' : 'Table Stats'}
+                </Typography.Title>
+                <ChartRow>
+                    <StatChart
+                        title="Row Count Over Time"
+                        tickInterval={graphTickInterval}
+                        dateRange={graphDateRange}
+                        values={rowCountChartValues}
+                    />
+                    <ChartDivider type="vertical" height={360} width={1} />
+                    <StatChart
+                        title="Column Count Over Time"
+                        tickInterval={graphTickInterval}
+                        dateRange={graphDateRange}
+                        values={columnCountChartValues}
+                    />
+                </ChartRow>
+                <ChartDivider type="horizontal" height={1} width={400} />
+                <ChartRow>
+                    <StatChart
+                        title="Size Over Time"
+                        tickInterval={graphTickInterval}
+                        dateRange={graphDateRange}
+                        values={sizeChartValues}
+                        yAxis={{ formatter: bytesFormatter }}
+                    />
+                    {placeholderVerticalDivider}
+                    {placeholderChart}
+                </ChartRow>
+            </StatSection>
+            <StatSection>
+                <ColumnStatsHeader>
+                    <Typography.Title level={5}>Column Stats</Typography.Title>
+                    {columnSelectView}
+                </ColumnStatsHeader>
+                <ChartRow>
+                    <StatChart
+                        title="Null Count Over Time"
+                        tickInterval={graphTickInterval}
+                        dateRange={graphDateRange}
+                        values={nullCountChartValues}
+                    />
+                    <ChartDivider type="vertical" height={360} width={1} />
+                    <StatChart
+                        title="Null Percentage Over Time"
+                        tickInterval={graphTickInterval}
+                        dateRange={graphDateRange}
+                        values={nullPercentageChartValues}
+                    />
+                </ChartRow>
+                <ChartDivider type="horizontal" height={1} width={400} />
+                <ChartRow>
+                    <StatChart
+                        title="Distinct Count Over Time"
+                        tickInterval={graphTickInterval}
+                        dateRange={graphDateRange}
+                        values={distinctCountChartValues}
+                    />
+                    <ChartDivider type="vertical" height={360} width={1} />
+                    <StatChart
+                        title="Distinct Percentage Over Time"
+                        tickInterval={graphTickInterval}
+                        dateRange={graphDateRange}
+                        values={distinctPercentageChartValues}
+                    />
+                </ChartRow>
+            </StatSection>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect.tsx
new file mode 100644
index 00000000000000..65925c1bde26bc
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import { SelectValue } from 'antd/lib/select';
+import { LookbackWindow, LOOKBACK_WINDOWS } from '../lookbackWindows';
+import PrefixedSelect from './shared/PrefixedSelect';
+
+type Props = {
+    lookbackWindow: LookbackWindow;
+    setLookbackWindow: (window: LookbackWindow) => void;
+};
+
+export default function LookbackWindowSelect({ lookbackWindow, setLookbackWindow }: Props) {
+    const onChangeLookbackWindow = (value: SelectValue) => {
+        const newLookbackWindow = Object.values(LOOKBACK_WINDOWS).filter((window) => window.text === value?.valueOf());
+        setLookbackWindow(newLookbackWindow[0]);
+    };
+
+    /**
+     * Note:
+     * The 'HOUR' option is currently filtered out as it was causing issues (white screen problem).
+     * Additionally, the 'HOUR' option is not utilized in the historical stats view.
+     * It can be added back when needed in the future.
+     */
+    const filteredLookbackWindows = Object.values(LOOKBACK_WINDOWS).filter((window) => window.text !== '1 hour');
+
+    return (
+        <PrefixedSelect
+            prefixText="Profiling history for past "
+            values={filteredLookbackWindows.map((window) => window.text)}
+            value={lookbackWindow.text}
+            setValue={onChangeLookbackWindow}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx
new file mode 100644
index 00000000000000..6608afd9610ab1
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx
@@ -0,0 +1,111 @@
+import { Button, Modal, Table, Typography } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { DatasetProfile } from '../../../../../../../../types.generated';
+import { formatBytes, formatNumberWithoutAbbreviation } from '../../../../../../../shared/formatNumber';
+import { FULL_TABLE_PARTITION_KEYS } from '../../constants';
+import ColumnStats from '../../snapshot/ColumnStats';
+import TableStats from '../../snapshot/TableStats';
+
+export const ChartTable = styled(Table)`
+    margin-top: 16px;
+`;
+
+export type Props = {
+    profiles: Array<DatasetProfile>;
+    areAllProfilesPartitioned: boolean;
+};
+
+const bytesFormatter = (bytes: number) => {
+    const formattedBytes = formatBytes(bytes);
+    const fullBytes = formatNumberWithoutAbbreviation(bytes);
+    return `${formattedBytes.number} ${formattedBytes.unit} (${fullBytes} bytes)`;
+};
+
+export default function ProfilingRunsChart({ profiles, areAllProfilesPartitioned }: Props) {
+    const [showModal, setShowModal] = useState(false);
+    const [selectedProfileIndex, setSelectedProfileIndex] = useState(-1);
+
+    const showProfileModal = (index: number) => {
+        setSelectedProfileIndex(index);
+        setShowModal(true);
+    };
+
+    const onClose = () => {
+        setShowModal(false);
+        setSelectedProfileIndex(-1);
+    };
+
+    const tableData = profiles.map((profile) => {
+        const profileDate = new Date(profile.timestampMillis);
+        return {
+            timestamp: `${profileDate.toLocaleDateString()} at ${profileDate.toLocaleTimeString()}`,
+            rowCount: profile.rowCount?.toString() || 'unknown',
+            columnCount: profile.columnCount?.toString() || 'unknown',
+            sizeInBytes: profile.sizeInBytes ? bytesFormatter(profile.sizeInBytes) : 'unknown',
+            partition: profile.partitionSpec?.partition || '',
+        };
+    });
+
+    const tableColumns = [
+        {
+            title: areAllProfilesPartitioned ? 'Partition' : 'Date',
+            key: 'Date',
+            dataIndex: 'timestamp',
+            render: (title, record, index) => {
+                return (
+                    <Button type="text" onClick={() => showProfileModal(index)}>
+                        <Typography.Text underline>
+                            {FULL_TABLE_PARTITION_KEYS.includes(record.partition) ? title : record.partition}
+                        </Typography.Text>
+                    </Button>
+                );
+            },
+        },
+        {
+            title: 'Row Count',
+            key: 'Row Count',
+            dataIndex: 'rowCount',
+        },
+        {
+            title: 'Column Count',
+            key: 'Column Count',
+            dataIndex: 'columnCount',
+        },
+        {
+            title: 'Size',
+            key: 'Size',
+            dataIndex: 'sizeInBytes',
+        },
+    ];
+
+    const selectedProfile = (selectedProfileIndex >= 0 && profiles[selectedProfileIndex]) || undefined;
+    const profileModalTitle =
+        selectedProfile &&
+        `Showing profile from ${new Date(selectedProfile?.timestampMillis).toLocaleDateString()} at ${new Date(
+            selectedProfile?.timestampMillis,
+        ).toLocaleTimeString()}`;
+
+    return (
+        <>
+            {selectedProfile && (
+                <Modal width="100%" footer={null} title={profileModalTitle} visible={showModal} onCancel={onClose}>
+                    <TableStats
+                        rowCount={selectedProfile.rowCount || -1}
+                        columnCount={selectedProfile.columnCount || -1}
+                    />
+                    <ColumnStats columnStats={selectedProfile.fieldProfiles || []} />
+                </Modal>
+            )}
+            <ChartTable
+                scroll={{ y: 400 }}
+                bordered
+                style={{ width: '100%', maxHeight: 440 }}
+                columns={tableColumns}
+                dataSource={tableData}
+                pagination={false}
+                size="small"
+            />
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx
new file mode 100644
index 00000000000000..a38c1ff540e716
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx
@@ -0,0 +1,113 @@
+import { Card, Typography } from 'antd';
+import React, { useMemo } from 'react';
+import styled from 'styled-components';
+import { DateInterval, DateRange } from '../../../../../../../../types.generated';
+import { ChartContainer } from '../../../../../../../analyticsDashboard/components/ChartContainer';
+import { TimeSeriesChart } from '../../../../../../../analyticsDashboard/components/TimeSeriesChart';
+import { ANTD_GRAY } from '../../../../../constants';
+
+const ChartTitle = styled(Typography.Text)`
+    && {
+        text-align: left;
+        font-size: 12px;
+        color: ${ANTD_GRAY[8]};
+    }
+`;
+
+/**
+ * Exported this styled card to enable width adjustment for better fit within the sidebar also for boxShadow.
+ * This approach allows style updates without the need for unnecessary props.
+ */
+export const ChartCard = styled(Card)<{ visible: boolean }>`
+    box-shadow: ${(props) => props.theme.styles['box-shadow']};
+    visibility: ${(props) => (props.visible ? 'visible' : 'hidden')};
+`;
+
+type Point = {
+    timeMs: number;
+    value: number;
+};
+
+type AxisConfig = {
+    formatter: (tick: number) => string;
+};
+
+export type Props = {
+    title: string;
+    values: Array<Point>;
+    tickInterval: DateInterval;
+    dateRange: DateRange;
+    yAxis?: AxisConfig;
+    visible?: boolean;
+    width?: number;
+    height?: number;
+    lineColor?: string;
+};
+
+/**
+ * Change these to change the chart axis & line colors
+ * TODO: Add this to the theme config.
+ */
+const DEFAULT_LINE_COLOR = '#20d3bd';
+const DEFAULT_AXIS_COLOR = '#D8D8D8';
+const DEFAULT_AXIS_WIDTH = 2;
+
+/**
+ * Time Series Chart with a single line.
+ */
+export default function StatChart({
+    title,
+    values,
+    tickInterval: interval,
+    dateRange,
+    yAxis,
+    visible = true,
+    width = 360,
+    height = 300,
+    lineColor = DEFAULT_LINE_COLOR,
+}: Props) {
+    const timeSeriesData = useMemo(
+        () =>
+            values
+                .sort((a, b) => a.timeMs - b.timeMs)
+                .map((value) => {
+                    const dateStr = new Date(value.timeMs).toISOString();
+                    return {
+                        x: dateStr,
+                        y: value.value,
+                    };
+                }),
+        [values],
+    );
+
+    return (
+        <ChartCard visible={visible}>
+            <ChartContainer>
+                <ChartTitle>{title}</ChartTitle>
+                <TimeSeriesChart
+                    style={{
+                        lineColor,
+                        axisColor: DEFAULT_AXIS_COLOR,
+                        axisWidth: DEFAULT_AXIS_WIDTH,
+                    }}
+                    hideLegend
+                    chartData={{
+                        title,
+                        lines: [
+                            {
+                                name: 'line_1',
+                                data: timeSeriesData,
+                            },
+                        ],
+                        interval,
+                        dateRange,
+                    }}
+                    width={width}
+                    height={height}
+                    yScale={{ type: 'linear', zero: false }}
+                    yAxis={yAxis}
+                />
+            </ChartContainer>
+        </ChartCard>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect.tsx
new file mode 100644
index 00000000000000..51b4797dd4e18e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import { Select, Typography } from 'antd';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../../../constants';
+
+type Props = {
+    prefixText: string;
+    values: Array<string>;
+    value: string;
+    setValue: (value: string) => void;
+};
+
+const SubHeaderText = styled(Typography.Text)`
+    font-size: 14px;
+    color: ${ANTD_GRAY[8]};
+`;
+
+const EmbeddedSelect = styled(Select)`
+    padding-left: 8px;
+`;
+
+export default function PrefixedSelect({ prefixText, values, value, setValue }: Props): JSX.Element {
+    return (
+        <span>
+            <SubHeaderText>{prefixText}</SubHeaderText>
+            <EmbeddedSelect value={value} onChange={(val) => setValue(val as string)}>
+                {values.map((val) => (
+                    <Select.Option value={val}>{val}</Select.Option>
+                ))}
+            </EmbeddedSelect>
+        </span>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows.ts
new file mode 100644
index 00000000000000..764722d6bfd607
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows.ts
@@ -0,0 +1,21 @@
+import { DateInterval } from '../../../../../../types.generated';
+
+/**
+ * Change this to add or modify the lookback windows that are selectable via the UI.
+ */
+export const LOOKBACK_WINDOWS = {
+    HOUR: { text: '1 hour', windowSize: { interval: DateInterval.Hour, count: 1 } },
+    DAY: { text: '1 day', windowSize: { interval: DateInterval.Day, count: 1 } },
+    WEEK: { text: '1 week', windowSize: { interval: DateInterval.Week, count: 1 } },
+    MONTH: { text: '1 month', windowSize: { interval: DateInterval.Month, count: 1 } },
+    QUARTER: { text: '3 months', windowSize: { interval: DateInterval.Month, count: 3 } },
+    YEAR: { text: '1 year', windowSize: { interval: DateInterval.Year, count: 1 } },
+};
+
+export type LookbackWindow = {
+    text: string;
+    windowSize: {
+        interval: DateInterval;
+        count: number;
+    };
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/ColumnStats.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/ColumnStats.tsx
new file mode 100644
index 00000000000000..7a43dc76449190
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/ColumnStats.tsx
@@ -0,0 +1,175 @@
+import { downgradeV2FieldPath } from '@src/app/entityV2/dataset/profile/schema/utils/utils';
+import { Typography } from 'antd';
+import { ColumnsType, ColumnType } from 'antd/lib/table';
+import React, { useMemo } from 'react';
+import styled from 'styled-components';
+import { DatasetFieldProfile, Maybe, PartitionSpec, PartitionType } from '../../../../../../../types.generated';
+import { StyledTable } from '../../../../components/styled/StyledTable';
+import { ANTD_GRAY } from '../../../../constants';
+import SampleValueTag from './SampleValueTag';
+
+type Props = {
+    columnStats: Array<DatasetFieldProfile>;
+    partitionSpec?: Maybe<PartitionSpec>;
+};
+
+const StatSection = styled.div`
+    padding: 20px 20px;
+`;
+
+const NameText = styled(Typography.Text)`
+    font-family: 'Roboto Mono', monospace;
+    font-weight: 600;
+    font-size: 12px;
+    color: ${ANTD_GRAY[9]};
+`;
+
+const isPresent = (val?: string | number | null): val is string | number => {
+    return val !== undefined && val !== null;
+};
+
+const decimalToPercentStr = (decimal: number, precision: number): string => {
+    return `${(decimal * 100).toFixed(precision)}%`;
+};
+
+export default function ColumnStats({ columnStats, partitionSpec }: Props) {
+    const columnStatsTableData = useMemo(
+        () =>
+            columnStats.map((doc) => ({
+                name: downgradeV2FieldPath(doc.fieldPath),
+                min: doc.min,
+                max: doc.max,
+                mean: doc.mean,
+                median: doc.median,
+                stdev: doc.stdev,
+                nullCount: isPresent(doc.nullCount) && doc.nullCount.toString(),
+                nullPercentage: isPresent(doc.nullProportion) && decimalToPercentStr(doc.nullProportion, 2),
+                distinctCount: isPresent(doc.uniqueCount) && doc.uniqueCount.toString(),
+                distinctPercentage: isPresent(doc.uniqueProportion) && decimalToPercentStr(doc.uniqueProportion, 2),
+                sampleValues: doc.sampleValues,
+            })) || [],
+        [columnStats],
+    );
+
+    // we assume if no partition spec is provided, it's a full table
+    const isPartitioned = partitionSpec && partitionSpec.type !== PartitionType.FullTable;
+
+    /**
+     * Returns a placeholder value to show in the column data table when data is null.
+     */
+    const unknownValue = () => {
+        return <Typography.Text style={{ color: '#B8B8B8' }}>unknown</Typography.Text>;
+    };
+
+    /**
+     * Computes a set of the object keys across all items in a given array.
+     */
+    const getItemKeySet = (items: Array<any>) => {
+        const keySet = new Set<string>();
+        items.forEach((item) => {
+            Object.keys(item).forEach((key) => {
+                keySet.add(key);
+            });
+        });
+        return keySet;
+    };
+
+    /**
+     * Dynamically builds column stat table columns based on the fields present in the dataset profile data.
+     */
+    const buildColumnStatsColumns = (tableData: Array<any>) => {
+        // Optional columns. Defines how to render a column given a value exists somewhere in the profile.
+        const optionalColumns: ColumnsType<any> = [
+            {
+                title: 'Min',
+                dataIndex: 'min',
+                render: (value) => value || unknownValue(),
+            },
+            {
+                title: 'Max',
+                dataIndex: 'max',
+                render: (value) => value || unknownValue(),
+            },
+            {
+                title: 'Mean',
+                dataIndex: 'mean',
+                render: (value) => value || unknownValue(),
+            },
+            {
+                title: 'Median',
+                dataIndex: 'median',
+                render: (value) => value || unknownValue(),
+            },
+            {
+                title: 'Null Count',
+                dataIndex: 'nullCount',
+                render: (value) => value || unknownValue(),
+            },
+            {
+                title: 'Null %',
+                dataIndex: 'nullPercentage',
+                render: (value) => value || unknownValue(),
+            },
+            {
+                title: 'Distinct Count',
+                dataIndex: 'distinctCount',
+                render: (value) => value || unknownValue(),
+            },
+            {
+                title: 'Distinct %',
+                dataIndex: 'distinctPercentage',
+                render: (value) => value || unknownValue(),
+            },
+            {
+                title: 'Std. Dev',
+                dataIndex: 'stdev',
+                render: (value) => value || unknownValue(),
+            },
+            {
+                title: 'Sample Values',
+                dataIndex: 'sampleValues',
+                render: (sampleValues: Array<string>) => {
+                    return (
+                        (sampleValues &&
+                            sampleValues
+                                .slice(0, sampleValues.length < 3 ? sampleValues?.length : 3)
+                                .map((value) => <SampleValueTag value={value} />)) ||
+                        unknownValue()
+                    );
+                },
+            },
+        ];
+
+        // Name column always required.
+        const requiredColumns: ColumnsType<any> = [
+            {
+                title: 'Name',
+                dataIndex: 'name',
+                render: (value) => <NameText>{value}</NameText>,
+                ellipsis: true,
+            },
+        ];
+
+        // Retrieves a set of names of columns that should be shown based on their presence in the data profile.
+        const columnsPresent: Set<string> = getItemKeySet(tableData);
+
+        // Compute the final columns to render.
+        const columns = [
+            ...requiredColumns,
+            ...optionalColumns.filter((column: ColumnType<any>) => columnsPresent.has(column.dataIndex as string)),
+        ];
+
+        return columns;
+    };
+
+    const columnStatsColumns = buildColumnStatsColumns(columnStatsTableData);
+
+    return (
+        <StatSection>
+            <Typography.Title level={5}>
+                {isPartitioned ? `Column Stats for Partition ${partitionSpec.partition}` : 'Column Stats'}
+            </Typography.Title>
+            <StyledTable pagination={false} columns={columnStatsColumns} dataSource={columnStatsTableData} />
+        </StatSection>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/SampleValueTag.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/SampleValueTag.tsx
new file mode 100644
index 00000000000000..e9e58bd9795ad0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/SampleValueTag.tsx
@@ -0,0 +1,36 @@
+import React, { useState } from 'react';
+import { Tag } from 'antd';
+import { Tooltip } from '@components';
+import styled from 'styled-components';
+
+const StyledTag = styled(Tag)`
+    cursor: pointer;
+    max-width: 250px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+
+    &&:hover {
+        color: ${(props) => props.theme.styles['primary-color']};
+        border-color: ${(props) => props.theme.styles['primary-color']};
+    }
+`;
+
+type Props = {
+    value: string;
+};
+
+export default function SampleValueTag({ value }: Props) {
+    const [copied, setCopied] = useState(false);
+
+    const onClick = () => {
+        setCopied(true);
+        navigator.clipboard.writeText(value);
+        setTimeout(() => setCopied(false), 2000);
+    };
+
+    return (
+        <Tooltip title={copied ? 'Copied' : 'Click to copy'}>
+            <StyledTag onClick={onClick}>{value}</StyledTag>
+        </Tooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/TableStats.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/TableStats.tsx
new file mode 100644
index 00000000000000..b672fe274c321e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/snapshot/TableStats.tsx
@@ -0,0 +1,120 @@
+import { Typography } from 'antd';
+import { Tooltip } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import { CorpUser, Maybe, PartitionSpec, PartitionType, UserUsageCounts } from '../../../../../../../types.generated';
+import { countFormatter } from '../../../../../../../utils/formatter/index';
+import { formatNumberWithoutAbbreviation } from '../../../../../../shared/formatNumber';
+import { ExpandedActorGroup } from '../../../../components/styled/ExpandedActorGroup';
+import { InfoItem } from '../../../../components/styled/InfoItem';
+import { ANTD_GRAY } from '../../../../constants';
+
+type Props = {
+    rowCount?: number;
+    columnCount?: number;
+    queryCount?: number;
+    users?: Array<Maybe<UserUsageCounts>>;
+    lastUpdatedTime?: string;
+    lastReportedTime?: string;
+    partitionSpec?: Maybe<PartitionSpec>;
+};
+
+const StatSection = styled.div`
+    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
+    padding: 16px 20px;
+`;
+
+const StatContainer = styled.div<{ justifyContent }>`
+    display: flex;
+    position: relative;
+    z-index: 1;
+    justify-content: ${(props) => props.justifyContent};
+    padding: 12px 2px;
+`;
+
+export default function TableStats({
+    rowCount,
+    columnCount,
+    queryCount,
+    users,
+    lastUpdatedTime,
+    lastReportedTime,
+    partitionSpec,
+}: Props) {
+    // If there are less than 4 items, simply stack the stat views.
+    const justifyContent = !queryCount && !users ? 'default' : 'space-between';
+    const lastReportedTimeString = lastReportedTime || 'unknown';
+    if (
+        !rowCount &&
+        !columnCount &&
+        !queryCount &&
+        !(users && users.length > 0) &&
+        !lastUpdatedTime &&
+        !lastReportedTime
+    ) {
+        return null;
+    }
+    const sortedUsers = users?.slice().sort((a, b) => (b?.count || 0) - (a?.count || 0));
+
+    // we assume if no partition spec is provided, it's a full table
+    const isPartitioned = partitionSpec && partitionSpec.type !== PartitionType.FullTable;
+
+    return (
+        <StatSection>
+            <Typography.Title level={5}>
+                {isPartitioned ? `Partition Stats for Partition ${partitionSpec.partition}` : 'Table Stats'}
+            </Typography.Title>
+            <StatContainer justifyContent={justifyContent}>
+                {rowCount && (
+                    <InfoItem title="Rows">
+                        <Tooltip title={formatNumberWithoutAbbreviation(rowCount)} placement="right">
+                            <Typography.Text strong style={{ fontSize: 24 }} data-testid="table-stats-rowcount">
+                                {countFormatter(rowCount)}
+                            </Typography.Text>
+                        </Tooltip>
+                    </InfoItem>
+                )}
+                {columnCount && (
+                    <InfoItem title="Columns">
+                        <Typography.Text strong style={{ fontSize: 24 }}>
+                            {columnCount}
+                        </Typography.Text>
+                    </InfoItem>
+                )}
+                {queryCount && (
+                    <InfoItem title="Monthly Queries">
+                        <Typography.Text strong style={{ fontSize: 24 }}>
+                            {queryCount}
+                        </Typography.Text>
+                    </InfoItem>
+                )}
+                {sortedUsers && sortedUsers.length > 0 && (
+                    <InfoItem title="Top Users" width="inherit">
+                        <div style={{ paddingTop: 8 }}>
+                            <ExpandedActorGroup
+                                containerStyle={{
+                                    justifyContent: 'left',
+                                }}
+                                actors={
+                                    sortedUsers
+                                        .filter((user) => user && user?.user !== undefined && user?.user !== null)
+                                        .map((user) => user?.user as CorpUser) || []
+                                }
+                                max={4}
+                            />
+                        </div>
+                    </InfoItem>
+                )}
+                {lastUpdatedTime && (
+                    <InfoItem title="Last Updated" width="220px">
+                        <Tooltip title={`Last reported at ${lastReportedTimeString}`}>
+                            <Typography.Text strong style={{ fontSize: 16 }}>
+                                {lastUpdatedTime}
+                            </Typography.Text>
+                        </Tooltip>
+                    </InfoItem>
+                )}
+            </StatContainer>
+        </StatSection>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/viewType.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/viewType.ts
new file mode 100644
index 00000000000000..bfcba17422bccd
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/viewType.ts
@@ -0,0 +1,4 @@
+export enum ViewType {
+    LATEST,
+    HISTORICAL,
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Timeline/SchemaTimelineSection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Timeline/SchemaTimelineSection.tsx
new file mode 100644
index 00000000000000..863917d396513b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Timeline/SchemaTimelineSection.tsx
@@ -0,0 +1,99 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { VerticalTimeline, VerticalTimelineElement } from 'react-vertical-timeline-component';
+import { useEntityData } from '../../../../../entity/shared/EntityContext';
+import { useGetTimelineQuery } from '../../../../../../graphql/timeline.generated';
+import { ChangeCategoryType } from '../../../../../../types.generated';
+import 'react-vertical-timeline-component/style.min.css';
+import { REDESIGN_COLORS } from '../../../constants';
+import TimelineIcon from '../../../../../../images/timeline-icon.svg?react';
+
+const TimeLine = styled(VerticalTimeline)`
+    svg {
+        height: 10px;
+        width: 10px;
+        left: 150%;
+        top: 0;
+        margin-left: 0;
+    }
+`;
+
+const DateText = styled(Typography.Text)`
+    font-size: 10px;
+    font-style: normal;
+    font-weight: 500;
+    line-height: 16px;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+`;
+
+const Event = styled(Typography.Text)`
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    font-size: 12px;
+    font-weight: 500;
+    letter-spacing: -0.12px;
+`;
+
+export const SchemaTimelineSection = () => {
+    const { urn } = useEntityData();
+
+    const timelineResult = useGetTimelineQuery({
+        // also pass in the changeCategories
+        variables: { input: { urn, changeCategories: [ChangeCategoryType.TechnicalSchema] } },
+    });
+
+    const transactions = timelineResult.data?.getTimeline?.changeTransactions;
+    const timelineHistory: any[] = [];
+
+    transactions?.forEach((transaction) => {
+        const time = new Date(transaction.timestampMillis).toDateString();
+        transaction.changes?.forEach((change) => {
+            const entry = {
+                // operation: change.operation,
+                // description: change.description,
+                title: `${
+                    change.parameters?.find((parameter) => parameter.key === 'fieldPath')?.value
+                } was ${change.operation?.toLowerCase()}ed.`,
+                subtitle: 'subtitle',
+                desc: 'description',
+                time,
+            };
+            timelineHistory.push(entry);
+        });
+    });
+
+    return (
+        <TimeLine layout="1-column-left" lineColor={REDESIGN_COLORS.SIDE_BAR} animate={false}>
+            {timelineHistory.map((t) => {
+                return (
+                    <VerticalTimelineElement
+                        key={t.title}
+                        contentStyle={{
+                            boxShadow: 'none',
+                            padding: 0,
+                        }}
+                        date={t.date}
+                        icon={<TimelineIcon />}
+                        iconStyle={{
+                            height: '10px',
+                            width: '10px',
+                            boxShadow: 'none',
+                            position: 'absolute',
+                            top: '30%',
+                            left: 0,
+                        }}
+                    >
+                        {t.title && (
+                            <>
+                                <DateText> {t.time}</DateText>
+                                <div>
+                                    <Event>{t.title} </Event>
+                                </div>
+                            </>
+                        )}
+                    </VerticalTimelineElement>
+                );
+            })}
+        </TimeLine>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetails.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetails.tsx
new file mode 100644
index 00000000000000..13e4c9dd93a8d6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetails.tsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import styled from 'styled-components';
+import { CronSchedule } from '../../../../../../types.generated';
+import { AcrylAssertionDetailsHeader } from './AcrylAssertionDetailsHeader';
+import { AcrylAssertionResultsChart } from './AcrylAssertionResultsChart';
+
+const Container = styled.div`
+    width: 100%;
+    padding-left: 52px;
+`;
+
+type Props = {
+    urn: string;
+    schedule?: CronSchedule;
+    lastEvaluatedAtMillis?: number | undefined;
+    nextEvaluatedAtMillis?: number | undefined;
+    isStopped?: boolean;
+};
+
+export const AcrylAssertionDetails = ({
+    urn,
+    schedule,
+    lastEvaluatedAtMillis,
+    nextEvaluatedAtMillis,
+    isStopped = false,
+}: Props) => {
+    return (
+        <Container>
+            <AcrylAssertionDetailsHeader
+                schedule={schedule}
+                lastEvaluatedAtMillis={lastEvaluatedAtMillis}
+                nextEvaluatedAtMillis={nextEvaluatedAtMillis}
+                isStopped={isStopped}
+            />
+            <AcrylAssertionResultsChart urn={urn} />
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetailsHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetailsHeader.tsx
new file mode 100644
index 00000000000000..95d1d3dd97ec00
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetailsHeader.tsx
@@ -0,0 +1,103 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Divider, Typography } from 'antd';
+import { Tooltip } from '@components';
+import { ClockCircleOutlined } from '@ant-design/icons';
+import { CronSchedule } from '../../../../../../types.generated';
+import { getLocaleTimezone } from '../../../../../shared/time/timeUtils';
+import { ANTD_GRAY } from '../../../constants';
+import { getCronAsText } from './acrylUtils';
+import { TruncatedTextWithTooltip } from '../../../../../shared/TruncatedTextWithTooltip';
+
+const TimeLabel = styled.div`
+    max-width: 280px;
+    padding: 0;
+    margin: 0;
+    display: flex;
+    align-items: center;
+    color: ${ANTD_GRAY[7]};
+`;
+
+const Schedule = styled.span`
+    display: flex;
+    align-items: center;
+    justify-content: left;
+`;
+
+const StyledTruncatedText = styled(TruncatedTextWithTooltip)`
+    color: ${ANTD_GRAY[7]};
+`;
+
+const StyledClockCircleOutlined = styled(ClockCircleOutlined)`
+    margin-right: 8px;
+`;
+
+type Props = {
+    schedule?: CronSchedule;
+    lastEvaluatedAtMillis?: number | undefined;
+    nextEvaluatedAtMillis?: number | undefined;
+    isStopped?: boolean;
+};
+
+/**
+ * Renders the header of the Assertion Details card, which displays the run schedule for the assertion.
+ */
+export const AcrylAssertionDetailsHeader = ({
+    schedule,
+    lastEvaluatedAtMillis,
+    nextEvaluatedAtMillis,
+    isStopped = false,
+}: Props) => {
+    const localeTimezone = getLocaleTimezone();
+
+    /**
+     * Last evaluated timestamp
+     */
+    const lastEvaluatedAt = lastEvaluatedAtMillis && new Date(lastEvaluatedAtMillis);
+    const lastEvaluatedTimeLocal = lastEvaluatedAt
+        ? `Last evaluated on ${lastEvaluatedAt.toLocaleDateString()} at ${lastEvaluatedAt.toLocaleTimeString()} (${localeTimezone})`
+        : null;
+    const lastEvaluatedTimeGMT = lastEvaluatedAt ? lastEvaluatedAt.toUTCString() : null;
+
+    /**
+     * Next evaluated timestamp
+     */
+    const nextEvaluatedAt = nextEvaluatedAtMillis && new Date(nextEvaluatedAtMillis);
+    const nextEvaluatedTimeLocal = nextEvaluatedAt
+        ? `Next evaluation at ${nextEvaluatedAt.toLocaleDateString()} at ${nextEvaluatedAt.toLocaleTimeString()} (${localeTimezone})`
+        : null;
+    const nextEvaluatedTimeGMT = nextEvaluatedAt ? nextEvaluatedAt.toUTCString() : null;
+
+    /**
+     * Cron String - This will not be present for external assertions.
+     */
+    const interval = schedule?.cron?.replaceAll(', ', '');
+    const timezone = schedule?.timezone || Intl.DateTimeFormat().resolvedOptions().timeZone;
+    const cronAsText = interval && getCronAsText(interval);
+    const scheduleText = schedule && cronAsText && !cronAsText.error && cronAsText.text;
+
+    return (
+        <div>
+            <Typography.Title level={5}>Evaluations</Typography.Title>
+            {(!isStopped && (
+                <Schedule>
+                    {scheduleText && (
+                        <TimeLabel>
+                            <StyledClockCircleOutlined />
+                            <StyledTruncatedText text={`Runs ${scheduleText} (${timezone})`} maxLength={80} />
+                            {lastEvaluatedTimeLocal && <Divider type="vertical" />}
+                        </TimeLabel>
+                    )}
+                    <Tooltip placement="topLeft" title={lastEvaluatedTimeGMT}>
+                        <TimeLabel>
+                            {lastEvaluatedTimeLocal} {nextEvaluatedAtMillis ? <Divider type="vertical" /> : true}
+                        </TimeLabel>
+                    </Tooltip>
+                    <Tooltip placement="topLeft" title={nextEvaluatedTimeGMT}>
+                        {nextEvaluatedTimeLocal && <TimeLabel>{nextEvaluatedTimeLocal}</TimeLabel>}
+                    </Tooltip>
+                </Schedule>
+            )) || <Typography.Text type="secondary">This assertion is not actively running.</Typography.Text>}
+        </div>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChart.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChart.tsx
new file mode 100644
index 00000000000000..b422778914be07
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChart.tsx
@@ -0,0 +1,62 @@
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components';
+import { useGetAssertionRunsLazyQuery } from '../../../../../../graphql/assertion.generated';
+import { getFixedLookbackWindow } from '../../../../../shared/time/timeUtils';
+import { LOOKBACK_WINDOWS } from '../Stats/lookbackWindows';
+import { AcrylAssertionResultsChartHeader } from './AcrylAssertionResultsChartHeader';
+import { AcrylAssertionResultsChartTimeline } from './AcrylAssertionResultsChartTimeline';
+
+const RESULT_CHART_WIDTH_PX = 800;
+
+const Container = styled.div`
+    width: ${RESULT_CHART_WIDTH_PX}px;
+    padding-top: 12px;
+`;
+
+type Props = {
+    urn: string;
+};
+
+export const AcrylAssertionResultsChart = ({ urn }: Props) => {
+    /**
+     * Retrieve a specific assertion's evaluations between a particular start and end time.
+     */
+    const [getAssertionRuns, { data }] = useGetAssertionRunsLazyQuery({ fetchPolicy: 'cache-first' });
+
+    /**
+     * Set default window for fetching assertion history.
+     */
+    const [lookbackWindow, setLookbackWindow] = useState(LOOKBACK_WINDOWS.WEEK);
+
+    /**
+     * Whenever the selected lookback window changes (via user selection), then
+     * refetch the runs for the assertion.
+     */
+    useEffect(() => {
+        getAssertionRuns({
+            variables: { assertionUrn: urn, ...getFixedLookbackWindow(lookbackWindow.windowSize) },
+        });
+    }, [urn, lookbackWindow, getAssertionRuns]);
+
+    const selectedWindow = getFixedLookbackWindow(lookbackWindow.windowSize);
+    const selectedWindowTimeRange = {
+        startMs: selectedWindow.startTime,
+        endMs: selectedWindow.endTime,
+    };
+
+    return (
+        <Container>
+            <AcrylAssertionResultsChartHeader
+                timeRange={selectedWindowTimeRange}
+                results={data?.assertion?.runEvents as any}
+                lookbackWindow={lookbackWindow}
+                setLookbackWindow={setLookbackWindow}
+            />
+            <AcrylAssertionResultsChartTimeline
+                timeRange={selectedWindowTimeRange}
+                results={data?.assertion?.runEvents as any}
+                platform={data?.assertion?.platform as any}
+            />
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartHeader.tsx
new file mode 100644
index 00000000000000..19c8f2b61e46cb
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartHeader.tsx
@@ -0,0 +1,113 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { SelectValue } from 'antd/lib/select';
+import { AssertionResultType, AssertionRunEventsResult } from '../../../../../../types.generated';
+import { formatNumber } from '../../../../../shared/formatNumber';
+import PrefixedSelect from '../Stats/historical/shared/PrefixedSelect';
+import { LookbackWindow, LOOKBACK_WINDOWS } from '../Stats/lookbackWindows';
+import { getResultColor } from './assertionUtils';
+import { TimeRange } from './AssertionResultTimeline';
+
+const Header = styled.div`
+    display: flex;
+    justify-content: space-between;
+`;
+
+const EvaluationsSummary = styled.div`
+    width: 300px;
+    display: flex;
+    align-items: center;
+    justify-content: left;
+`;
+
+const EvaluationDateRange = styled(Typography.Text)`
+    margin-right: 20px;
+`;
+
+const EvaluationResults = styled.div``;
+
+const ResultTypeCount = styled.span`
+    margin-right: 12px;
+`;
+
+const ErrorEvaluationsCount = styled(Typography.Text)`
+    font-weight: 600;
+    color: ${getResultColor(AssertionResultType.Error)};
+`;
+
+type Props = {
+    timeRange: TimeRange;
+    results?: AssertionRunEventsResult | null;
+    lookbackWindow: LookbackWindow;
+    setLookbackWindow: (newWindow: LookbackWindow) => void;
+};
+
+export const AcrylAssertionResultsChartHeader = ({ timeRange, lookbackWindow, setLookbackWindow, results }: Props) => {
+    /**
+     * Start and end dates being observed in the chart.
+     */
+    const startDate = new Date(timeRange.startMs).toLocaleDateString('en-us', {
+        month: 'short',
+        day: 'numeric',
+    });
+    const endDate = new Date(timeRange.endMs).toLocaleDateString('en-us', {
+        month: 'short',
+        day: 'numeric',
+    });
+
+    /**
+     * Success / Failure summary
+     */
+    const succeededCount = results?.succeeded;
+    const failedCount = results?.failed;
+    const errorCount = results?.errored;
+
+    /**
+     * Invoked when user selects new lookback window (e.g. 1 year)
+     */
+    const onChangeLookbackWindow = (value: SelectValue) => {
+        const newLookbackWindow = Object.values(LOOKBACK_WINDOWS).filter((window) => window.text === value?.valueOf());
+        setLookbackWindow(newLookbackWindow[0]);
+    };
+
+    return (
+        <Header>
+            <EvaluationsSummary>
+                <EvaluationDateRange strong>
+                    {startDate} - {endDate}
+                </EvaluationDateRange>
+                <EvaluationResults>
+                    <ResultTypeCount>
+                        <Typography.Text
+                            style={{ color: getResultColor(AssertionResultType.Success), fontWeight: 600 }}
+                        >
+                            {formatNumber(succeededCount)}
+                        </Typography.Text>{' '}
+                        passed
+                    </ResultTypeCount>
+                    <ResultTypeCount>
+                        <Typography.Text
+                            style={{ color: getResultColor(AssertionResultType.Failure), fontWeight: 600 }}
+                        >
+                            {formatNumber(failedCount)}
+                        </Typography.Text>{' '}
+                        failed
+                    </ResultTypeCount>
+                    {errorCount ? (
+                        <ResultTypeCount>
+                            <ErrorEvaluationsCount>{formatNumber(errorCount)}</ErrorEvaluationsCount> error
+                            {errorCount > 1 ? 's' : ''}
+                        </ResultTypeCount>
+                    ) : null}
+                </EvaluationResults>
+            </EvaluationsSummary>
+            <PrefixedSelect
+                prefixText="Show "
+                values={Object.values(LOOKBACK_WINDOWS).map((window) => window.text)}
+                value={lookbackWindow.text}
+                setValue={onChangeLookbackWindow}
+            />
+        </Header>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartTimeline.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartTimeline.tsx
new file mode 100644
index 00000000000000..e6f2bcaf471813
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartTimeline.tsx
@@ -0,0 +1,115 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { Tooltip } from '@components';
+import { ArrowRightOutlined } from '@ant-design/icons';
+import {
+    AssertionResultType,
+    AssertionRunEventsResult,
+    AssertionRunStatus,
+    DataPlatform,
+    EntityType,
+} from '../../../../../../types.generated';
+import { getResultErrorMessage, getResultIcon, getResultText } from './assertionUtils';
+import { AssertionResultTimeline, TimeRange } from './AssertionResultTimeline';
+import { DatasetAssertionResultDetails } from './DatasetAssertionResultDetails';
+import { LinkWrapper } from '../../../../../shared/LinkWrapper';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+
+const RESULT_CHART_WIDTH_PX = 800;
+
+const AssertionResultIcon = styled.span`
+    margin-right: 8px;
+`;
+
+const AssertionResultDetailsContainer = styled.div`
+    margin-bottom: 4px;
+`;
+
+const AssertionResultErrorMessage = styled.div`
+    max-width: 250px;
+    margin-bottom: 4px;
+`;
+
+const AssertionResultInitializingMessage = styled.div`
+    max-width: 250px;
+    margin-bottom: 4px;
+`;
+
+type Props = {
+    timeRange: TimeRange;
+    results?: AssertionRunEventsResult | null;
+    platform?: DataPlatform | null;
+};
+
+export const AcrylAssertionResultsChartTimeline = ({ results, platform, timeRange }: Props) => {
+    const entityRegistry = useEntityRegistry();
+    const completedRuns =
+        results?.runEvents.filter((runEvent) => runEvent.status === AssertionRunStatus.Complete) || [];
+
+    /**
+     * Data for the timeline of assertion results.
+     */
+    const timelineData =
+        completedRuns
+            .filter((runEvent) => !!runEvent.result)
+            .map((runEvent) => {
+                const { result } = runEvent;
+
+                if (!result) throw new Error('Completed assertion run event does not have a result.');
+
+                const resultTime = new Date(runEvent.timestampMillis);
+                const localTime = resultTime.toLocaleString();
+                const gmtTime = resultTime.toUTCString();
+                const resultUrl = result.externalUrl;
+                const isInitializing = result.type === AssertionResultType.Init;
+                const errorMessage = getResultErrorMessage(result);
+                const platformName =
+                    (platform && entityRegistry.getDisplayName(EntityType.DataPlatform, platform)) || undefined;
+
+                /**
+                 * Create a "result" to render in the timeline chart.
+                 */
+                return {
+                    time: runEvent.timestampMillis,
+                    result: {
+                        type: result.type,
+                        resultUrl,
+                        title: (
+                            <>
+                                <AssertionResultIcon>{getResultIcon(result.type)}</AssertionResultIcon>
+                                <Typography.Text strong>{getResultText(result.type)}</Typography.Text>
+                            </>
+                        ),
+                        content: (
+                            <>
+                                <AssertionResultDetailsContainer>
+                                    <DatasetAssertionResultDetails result={result} />
+                                </AssertionResultDetailsContainer>
+                                {isInitializing && (
+                                    <AssertionResultInitializingMessage>
+                                        Collecting the information required to evaluate this assertion.
+                                    </AssertionResultInitializingMessage>
+                                )}
+                                {errorMessage && (
+                                    <AssertionResultErrorMessage>{errorMessage}</AssertionResultErrorMessage>
+                                )}
+                                <div>
+                                    <Tooltip title={`${gmtTime}`}>
+                                        <Typography.Text type="secondary">{localTime}</Typography.Text>
+                                    </Tooltip>
+                                </div>
+                                {resultUrl && (
+                                    <LinkWrapper to={resultUrl} target="_blank">
+                                        {platformName ? `View in ${platformName}` : 'View results'}{' '}
+                                        <ArrowRightOutlined />
+                                    </LinkWrapper>
+                                )}
+                            </>
+                        ),
+                    },
+                };
+            }) || [];
+
+    return <AssertionResultTimeline width={RESULT_CHART_WIDTH_PX} data={timelineData} timeRange={timeRange} />;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsList.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsList.tsx
new file mode 100644
index 00000000000000..02beb913f3058d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsList.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import { Assertion, DataContract } from '../../../../../../types.generated';
+import { AcrylAssertionsTable } from './AcrylAssertionsTable';
+
+type Props = {
+    assertions: Array<Assertion>;
+    contract?: DataContract;
+    showMenu?: boolean;
+    showSelect?: boolean;
+    selectedUrns?: string[];
+    onSelect?: (assertionUrn: string) => void;
+    refetch?: () => void;
+};
+
+/**
+ * Acryl-specific list of assertions displaying their most recent run status, their human-readable
+ * description, and platform.
+ *
+ * Currently this component supports rendering Dataset Assertions only.
+ */
+export const AcrylDatasetAssertionsList = ({
+    assertions,
+    contract,
+    showMenu,
+    showSelect,
+    selectedUrns,
+    onSelect,
+    refetch,
+}: Props) => {
+    return (
+        <AcrylAssertionsTable
+            assertions={assertions}
+            contract={contract}
+            onSelect={onSelect}
+            showMenu={showMenu}
+            showSelect={showSelect}
+            selectedUrns={selectedUrns}
+            refetch={refetch}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsSummaryLoading.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsSummaryLoading.tsx
new file mode 100644
index 00000000000000..fe4912379bb962
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsSummaryLoading.tsx
@@ -0,0 +1,60 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Skeleton } from 'antd';
+import { ANTD_GRAY } from '../../../constants';
+
+const Header = styled.div`
+    width: 100%;
+    padding-left: 40px;
+    padding-top: 20px;
+    padding-bottom: 20px;
+    padding-right: 40px;
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
+`;
+
+const Body = styled.div``;
+
+const HeaderSkeleton = styled(Skeleton.Input)`
+    && {
+        padding: 0px 12px 12px 0px;
+        height: 60px;
+        border-radius: 8px;
+        width: 540px;
+    }
+`;
+
+const CardWrapper = styled.div`
+    padding: 20px 40px;
+`;
+
+const CardSkeleton = styled(Skeleton.Input)`
+    && {
+        padding: 0px 12px 12px 0px;
+        height: 60px;
+        border-radius: 8px;
+        width: 100%;
+    }
+`;
+
+export const AcrylAssertionsSummaryLoading = () => {
+    return (
+        <>
+            <Header>
+                <HeaderSkeleton active size="large" />
+            </Header>
+            <Body>
+                <CardWrapper>
+                    <CardSkeleton active size="large" />
+                </CardWrapper>
+                <CardWrapper>
+                    <CardSkeleton active size="large" />
+                </CardWrapper>
+                <CardWrapper>
+                    <CardSkeleton active size="large" />
+                </CardWrapper>
+            </Body>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTable.tsx
new file mode 100644
index 00000000000000..c4f07b97ca5e0e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTable.tsx
@@ -0,0 +1,216 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { Checkbox, Empty, Table, TableProps } from 'antd';
+import { Assertion, AssertionRunStatus, DataContract } from '../../../../../../types.generated';
+import { useEntityData } from '../../../../../entity/shared/EntityContext';
+import { ActionsColumn, DetailsColumn } from './AcrylAssertionsTableColumns';
+import { AssertionProfileDrawer } from './assertion/profile/AssertionProfileDrawer';
+import { ANTD_GRAY } from '../../../constants';
+import { useOpenAssertionDetailModal } from './assertion/builder/hooks';
+import { getEntityUrnForAssertion, getSiblingWithUrn } from './acrylUtils';
+
+type StyledTableProps = {
+    showSelect?: boolean;
+} & TableProps<any>;
+
+export const StyledTable = styled(Table)<StyledTableProps>`
+    ${(props) => !props.showSelect && `margin-left: -50px;`}
+    max-width: none;
+    overflow: inherit;
+    height: inherit;
+    &&& .ant-table-thead .ant-table-cell {
+        font-weight: 600;
+        font-size: 12px;
+        color: ${ANTD_GRAY[8]};
+    }
+    &&
+        .ant-table-thead
+        > tr
+        > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not(
+            [colspan]
+        )::before {
+        border: 1px solid ${ANTD_GRAY[4]};
+    }
+    && {
+        .ant-table-tbody > tr > td {
+            border: none;
+            ${(props) => props.showSelect && `padding: 16px 20px;`}
+        }
+    }
+    &&& .ant-table-cell {
+        background-color: transparent;
+    }
+    &&& .acryl-assertions-table-row {
+        cursor: pointer;
+        background-color: ${ANTD_GRAY[2]};
+        :hover {
+            background-color: ${ANTD_GRAY[3]};
+        }
+    }
+    &&& .acryl-selected-assertions-table-row {
+        background-color: ${ANTD_GRAY[4]};
+    }
+`;
+
+const DetailsColumnWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: left;
+`;
+
+const AssertionSelectCheckbox = styled(Checkbox)`
+    margin-right: 12px;
+`;
+
+type Props = {
+    assertions: Array<Assertion>;
+    contract?: DataContract;
+    showMenu?: boolean;
+    showSelect?: boolean;
+    selectedUrns?: string[];
+    onSelect?: (assertionUrn: string) => void;
+    refetch?: () => void;
+};
+
+/**
+ * Acryl-specific list of assertions displaying their most recent run status, their human-readable
+ * description, and platform.
+ */
+export const AcrylAssertionsTable = ({
+    assertions,
+    contract,
+    showMenu = true,
+    showSelect = false,
+    selectedUrns,
+    onSelect,
+    refetch,
+}: Props) => {
+    const { entityData } = useEntityData();
+    const [focusAssertionUrn, setFocusAssertionUrn] = useState<string | null>(null);
+
+    const focusedAssertion = assertions.find((assertion) => assertion.urn === focusAssertionUrn);
+    const focusedEntityUrn = focusedAssertion ? getEntityUrnForAssertion(focusedAssertion) : undefined;
+    const focusedAssertionEntity =
+        focusedEntityUrn && entityData ? getSiblingWithUrn(entityData, focusedEntityUrn) : undefined;
+
+    if (focusAssertionUrn && !focusedAssertion) {
+        setFocusAssertionUrn(null);
+    }
+
+    useOpenAssertionDetailModal(setFocusAssertionUrn);
+
+    const assertionsTableData = assertions.map((assertion) => ({
+        urn: assertion.urn,
+        type: assertion.info?.type,
+        platform: assertion.platform,
+        datasetAssertionInfo: assertion.info?.datasetAssertion,
+        freshnessAssertionInfo: assertion.info?.freshnessAssertion,
+        lastEvaluation:
+            assertion.runEvents?.runEvents?.length &&
+            assertion.runEvents.runEvents[0].status === AssertionRunStatus.Complete &&
+            assertion.runEvents.runEvents[0],
+        lastEvaluationTimeMs:
+            assertion.runEvents?.runEvents?.length && assertion.runEvents.runEvents[0].timestampMillis,
+        lastEvaluationResult:
+            assertion.runEvents?.runEvents?.length &&
+            assertion.runEvents.runEvents[0].status === AssertionRunStatus.Complete &&
+            assertion.runEvents.runEvents[0].result?.type,
+        lastEvaluationUrl:
+            assertion.runEvents?.runEvents?.length &&
+            assertion.runEvents.runEvents[0].status === AssertionRunStatus.Complete &&
+            assertion.runEvents.runEvents[0].result?.externalUrl,
+        assertion,
+        monitor:
+            (assertion as any).monitor?.relationships?.length && (assertion as any).monitor?.relationships[0]?.entity,
+    }));
+
+    const assertionsTableCols = [
+        {
+            title: '',
+            dataIndex: '',
+            key: '',
+            render: (_, record: any) => {
+                const selected = selectedUrns?.some((selectedUrn) => selectedUrn === record.urn);
+                return (
+                    <DetailsColumnWrapper>
+                        {showSelect && (
+                            <AssertionSelectCheckbox
+                                checked={selected}
+                                onClick={(e) => e.stopPropagation()}
+                                onChange={() => onSelect?.(record.urn as string)}
+                            />
+                        )}
+                        <DetailsColumn
+                            assertion={record.assertion}
+                            contract={contract}
+                            lastEvaluation={record.lastEvaluation}
+                            onViewAssertionDetails={() => setFocusAssertionUrn(record.urn)}
+                        />
+                    </DetailsColumnWrapper>
+                );
+            },
+        },
+        {
+            title: '',
+            dataIndex: '',
+            key: '',
+            render: (_, record: any) => {
+                // TODO: Add permission for editing contract.
+                return (
+                    <>
+                        {(showMenu && (
+                            <ActionsColumn
+                                assertion={record.assertion}
+                                contract={contract}
+                                canEditContract
+                                refetch={refetch}
+                            />
+                        )) ||
+                            undefined}
+                    </>
+                );
+            },
+        },
+    ];
+
+    return (
+        <>
+            <StyledTable
+                showSelect={showSelect}
+                rowClassName={(record) => {
+                    return (
+                        (record.urn === focusAssertionUrn && 'acryl-selected-assertions-table-row') ||
+                        'acryl-assertions-table-row'
+                    );
+                }}
+                columns={assertionsTableCols}
+                dataSource={assertionsTableData}
+                rowKey="urn"
+                locale={{
+                    emptyText: <Empty description="No Assertions Found :(" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
+                }}
+                onRow={(record) => {
+                    return {
+                        onClick: (_) => {
+                            if (showSelect) {
+                                onSelect?.(record.urn as string);
+                            } else {
+                                setFocusAssertionUrn(record.urn);
+                            }
+                        },
+                    };
+                }}
+                showHeader={false}
+                pagination={false}
+            />
+            {focusAssertionUrn && focusedAssertionEntity && (
+                <AssertionProfileDrawer
+                    urn={focusAssertionUrn}
+                    contract={contract}
+                    closeDrawer={() => setFocusAssertionUrn(null)}
+                    refetch={refetch}
+                />
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTableColumns.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTableColumns.tsx
new file mode 100644
index 00000000000000..a9e1803d7badbf
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionsTableColumns.tsx
@@ -0,0 +1,135 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Tooltip } from '@components';
+import { AuditOutlined } from '@ant-design/icons';
+import { Link } from 'react-router-dom';
+import { Assertion, EntityType, DataContract, AssertionRunEvent } from '../../../../../../types.generated';
+import { REDESIGN_COLORS } from '../../../constants';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { isAssertionPartOfContract } from './contract/utils';
+import { AssertionDescription } from './assertion/profile/summary/AssertionDescription';
+import { AssertionResultDot } from './assertion/profile/shared/AssertionResultDot';
+import { AssertionResultPopover } from './assertion/profile/shared/result/AssertionResultPopover';
+import { ResultStatusType } from './assertion/profile/summary/shared/resultMessageUtils';
+import { useEntityData } from '../../../../../entity/shared/EntityContext';
+import { AssertionListItemActions } from './assertion/profile/actions/AssertionListItemActions';
+
+const DetailsContainer = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: left;
+    &:hover {
+        cursor: pointer;
+    }
+    font-size: 14px;
+`;
+
+const Result = styled.div`
+    margin: 0px 40px 0px 48px;
+    display: flex;
+    align-items: center;
+`;
+
+const ActionButtonContainer = styled.div<{ removeRightPadding?: boolean }>`
+    display: flex;
+    align-items: center;
+    margin-left: ${(props) => (props.removeRightPadding ? 'auto' : undefined)};
+`;
+
+const DataContractLogo = styled(AuditOutlined)`
+    margin-left: 8px;
+    font-size: 16px;
+    color: ${REDESIGN_COLORS.BLUE};
+`;
+
+interface DetailsColumnProps {
+    assertion: Assertion;
+    contract?: DataContract;
+    lastEvaluation?: AssertionRunEvent;
+    onViewAssertionDetails: () => void;
+}
+
+export function DetailsColumn({ assertion, contract, lastEvaluation, onViewAssertionDetails }: DetailsColumnProps) {
+    const entityRegistry = useEntityRegistry();
+    const entityData = useEntityData();
+
+    if (!assertion.info) {
+        return <>No details found</>;
+    }
+    const disabled = false;
+    const isPartOfContract = contract && isAssertionPartOfContract(assertion, contract);
+    return (
+        <DetailsContainer>
+            <AssertionResultPopover
+                assertion={assertion}
+                run={lastEvaluation}
+                showProfileButton
+                onClickProfileButton={onViewAssertionDetails}
+                placement="right"
+                resultStatusType={ResultStatusType.LATEST}
+            >
+                <Result>
+                    <AssertionResultDot run={lastEvaluation} disabled={disabled} size={18} />
+                </Result>
+            </AssertionResultPopover>
+            <AssertionDescription assertion={assertion} options={{ hideSecondaryLabel: true, showColumnTag: true }} />
+            {(isPartOfContract && entityData?.urn && (
+                <Tooltip
+                    title={
+                        <>
+                            Part of Data Contract{' '}
+                            <Link
+                                to={`${entityRegistry.getEntityUrl(
+                                    EntityType.Dataset,
+                                    entityData.urn,
+                                )}/Quality/Data Contract`}
+                                style={{ color: REDESIGN_COLORS.BLUE }}
+                            >
+                                view
+                            </Link>
+                        </>
+                    }
+                >
+                    <Link
+                        to={`${entityRegistry.getEntityUrl(EntityType.Dataset, entityData.urn)}/Quality/Data Contract`}
+                    >
+                        <DataContractLogo />
+                    </Link>
+                </Tooltip>
+            )) ||
+                undefined}
+        </DetailsContainer>
+    );
+}
+
+interface ActionsColumnProps {
+    assertion: Assertion;
+    contract?: DataContract;
+    canEditContract: boolean;
+    refetch?: () => void;
+    shouldRightAlign?: boolean;
+    options?: {
+        removeRightPadding?: boolean;
+    };
+}
+
+export function ActionsColumn({
+    assertion,
+    contract,
+    canEditContract,
+    refetch,
+    shouldRightAlign,
+    options,
+}: ActionsColumnProps) {
+    return (
+        <ActionButtonContainer removeRightPadding={options?.removeRightPadding}>
+            <AssertionListItemActions
+                assertion={assertion}
+                contract={contract}
+                canEditContract={canEditContract}
+                refetch={refetch}
+                shouldRightAlign={shouldRightAlign}
+            />
+        </ActionButtonContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylValidationsTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylValidationsTab.tsx
new file mode 100644
index 00000000000000..81c71018f42f5e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylValidationsTab.tsx
@@ -0,0 +1,155 @@
+import React, { useEffect } from 'react';
+import { Tooltip } from '@components';
+import { useHistory, useLocation } from 'react-router';
+import styled from 'styled-components';
+import { useEntityData } from '../../../../../entity/shared/EntityContext';
+import { useGetValidationsTab } from './useGetValidationsTab';
+import { REDESIGN_COLORS } from '../../../constants';
+import { useAppConfig } from '../../../../../useAppConfig';
+import { DataContractTab } from './contract/DataContractTab';
+import { SEPARATE_SIBLINGS_URL_PARAM, useIsSeparateSiblingsMode } from '../../../useIsSeparateSiblingsMode';
+import { AcrylAssertionList } from './AssertionList/AcrylAssertionList';
+import { AcrylAssertionSummaryTab } from './AssertionList/Summary/AcrylAssertionSummaryTab';
+
+const TabTitle = styled.span`
+    margin-left: 4px;
+`;
+
+const TabButton = styled.div<{ selected: boolean; disabled: boolean }>`
+    display: flex;
+    background-color: ${(props) => (props.selected && '#f1f3fd') || 'none'};
+    color: ${(props) => (props.selected ? REDESIGN_COLORS.TITLE_PURPLE : 'none')};
+    align-items: center;
+    justify-content: center;
+    cursor: ${(props) => (props.disabled ? 'not-allowed' : 'pointer')};
+    border-radius: 5px;
+    padding: 0px 12px 0px 12px;
+    font-size: 14px;
+    height: 40px;
+    color: ${(props) => (props.disabled && '#00000040') || 'none'};
+`;
+const TabToolbar = styled.div`
+    display: flex;
+    position: relative;
+    z-index: 1;
+    height: 46px;
+    padding: 7px 12px;
+    flex: 0 0 auto;
+`;
+
+const TabContentWrapper = styled.div`
+    @media screen and (min-height: 800px) {
+        display: contents;
+        overflow: auto;
+    }
+`;
+
+enum TabPaths {
+    ASSERTIONS = 'List',
+    DATA_CONTRACT = 'Data Contract',
+    SUMMARY = 'Summary',
+}
+
+const DEFAULT_TAB = TabPaths.SUMMARY;
+
+/**
+ * Acryl-specific component used for rendering the Entity Validations Tab.
+ */
+export const AcrylValidationsTab = () => {
+    const history = useHistory();
+    const { pathname } = useLocation();
+    const { entityData } = useEntityData();
+    const isHideSiblingMode = useIsSeparateSiblingsMode();
+    const isRenderingSiblings = (entityData?.siblingsSearch?.total && !isHideSiblingMode) || false;
+    const appConfig = useAppConfig();
+
+    const { selectedTab, basePath } = useGetValidationsTab(pathname, Object.values(TabPaths));
+
+    // If no tab was selected, select a default tab.
+    useEffect(() => {
+        if (!selectedTab) {
+            // Route to the default tab.
+            history.replace(`${basePath}/${DEFAULT_TAB}?${SEPARATE_SIBLINGS_URL_PARAM}=${isHideSiblingMode}`);
+        }
+    }, [selectedTab, basePath, history, isHideSiblingMode]);
+
+    /**
+     * The top-level Toolbar tabs to display.
+     */
+    const tabs: any[] = [
+        {
+            title: (
+                <>
+                    <TabTitle>Summary</TabTitle>
+                </>
+            ),
+            path: TabPaths.SUMMARY,
+            disabled: false, // Always keep the assertions tab clickable in saas.
+            content: <AcrylAssertionSummaryTab />,
+            id: 'summary',
+        },
+        {
+            title: (
+                <>
+                    <TabTitle>Assertions</TabTitle>
+                </>
+            ),
+            path: TabPaths.ASSERTIONS,
+            disabled: false, // Always keep the assertions tab clickable in saas.
+            content: <AcrylAssertionList />,
+            id: 'assertions',
+        },
+    ];
+
+    if (appConfig.config.featureFlags?.dataContractsEnabled) {
+        // If contracts feature is enabled, add to list.
+        tabs.push({
+            title: (
+                <>
+                    <TabTitle>Data Contract</TabTitle>
+                </>
+            ),
+            path: TabPaths.DATA_CONTRACT,
+            content: <DataContractTab />,
+            disabled: isRenderingSiblings,
+            tip: isRenderingSiblings ? (
+                <>
+                    You cannot view a data contract for a group of assets. <br />
+                    <br />
+                    To view the data contract for a specific asset in this group, navigate to them using the{' '}
+                    <b>Composed Of</b> sidebar section on the right.
+                </>
+            ) : null,
+            id: 'data-contract',
+        });
+    }
+
+    return (
+        <>
+            <TabToolbar>
+                {tabs.map((tab) => (
+                    <Tooltip showArrow={false} title={tab.tip}>
+                        <TabButton
+                            key={tab.path}
+                            disabled={tab.disabled}
+                            selected={selectedTab === tab.path}
+                            id={`acryl-validation-tab-${tab.id}-sub-tab`}
+                            onClick={() => {
+                                if (!tab.disabled) {
+                                    history.replace(
+                                        `${basePath}/${tab.path}?${SEPARATE_SIBLINGS_URL_PARAM}=${isHideSiblingMode}`,
+                                    );
+                                }
+                            }}
+                        >
+                            {tab.title}
+                        </TabButton>
+                    </Tooltip>
+                ))}
+            </TabToolbar>
+            <TabContentWrapper>
+                {tabs.filter((tab) => tab.path === selectedTab).map((tab) => tab.content)}
+            </TabContentWrapper>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionGroupHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionGroupHeader.tsx
new file mode 100644
index 00000000000000..89dcaf6d806aec
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionGroupHeader.tsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { getAssertionGroupSummaryIcon } from './acrylUtils';
+import { AssertionGroup } from './acrylTypes';
+
+const Container = styled.div`
+    display: flex;
+    align-items: center;
+    padding: 4px 0px;
+    &:hover {
+        cursor: pointer;
+    }
+`;
+
+const TextContainer = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: left;
+    font-size: 14px;
+`;
+
+const Title = styled(Typography.Text)`
+    && {
+        padding-bottom: 0px;
+        margin-bottom: 0px;
+    }
+`;
+
+const Message = styled(Typography.Text)`
+    && {
+        font-size: 12px;
+        margin-left: 8px;
+    }
+`;
+
+const SummaryIcon = styled.div`
+    margin-right: 16px;
+`;
+
+type Props = {
+    group: AssertionGroup;
+};
+
+export const AssertionGroupHeader = ({ group }: Props) => {
+    const { summary } = group;
+    const summaryIcon = getAssertionGroupSummaryIcon(summary);
+    const inactiveCount = summary.totalAssertions - summary.total;
+    const summaryMessage = `${summary.passing} passing, ${summary.failing} failing${
+        summary.erroring ? `, ${summary.erroring} errors` : ''
+    }${inactiveCount ? `, ${inactiveCount} inactive` : ''}`;
+    return (
+        <Container>
+            {summaryIcon && <SummaryIcon>{summaryIcon}</SummaryIcon>}
+            <TextContainer>
+                {group.icon}
+                <Title strong>{group.name}</Title>
+                <Message type="secondary">{summaryMessage}</Message>
+            </TextContainer>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcryAssertionTypeSelect.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcryAssertionTypeSelect.tsx
new file mode 100644
index 00000000000000..fc14cf5eeca330
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcryAssertionTypeSelect.tsx
@@ -0,0 +1,39 @@
+import { SimpleSelect } from '@src/alchemy-components';
+import React from 'react';
+
+type Option = {
+    label: string;
+    value: string;
+};
+
+type Props = {
+    options: Option[];
+    selectedValue: string | undefined;
+    onSelect: (value: string) => void;
+};
+
+export function AcryAssertionTypeSelect({ options, selectedValue, onSelect }: Props) {
+    const selectedOption = options.find((option) => option.value === selectedValue) || { label: undefined };
+
+    const displayValue = selectedOption.label ? `Group ${selectedOption.label}` : 'Group';
+
+    return (
+        <SimpleSelect
+            options={options}
+            values={selectedValue ? [selectedValue] : []}
+            selectLabelProps={{ variant: 'labeled', label: 'Group' }}
+            onUpdate={(value) => {
+                if (value.length) {
+                    onSelect(value[0]);
+                } else {
+                    onSelect('');
+                }
+            }}
+            placeholder={displayValue}
+            size="md"
+            showClear={false}
+            optionSwitchable
+            width={50}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionFilters.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionFilters.tsx
new file mode 100644
index 00000000000000..5470d002043801
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionFilters.tsx
@@ -0,0 +1,86 @@
+import React, { useMemo, useCallback } from 'react';
+import { NestedSelect } from '@src/alchemy-components/components/Select/Nested/NestedSelect';
+import { SelectOption } from '@src/alchemy-components/components/Select/Nested/types';
+import capitalize from 'lodash/capitalize';
+import { ASSERTION_FILTER_TYPES } from './constant';
+
+interface FilterOption {
+    name: string;
+    category: string;
+    count: number;
+    displayName: string;
+}
+
+interface FilterGroupOptions {
+    [key: string]: FilterOption[];
+}
+
+interface AcrylAssertionFiltersProps {
+    filterOptions: FilterGroupOptions;
+    selectedFilters: FilterOption[];
+    onFilterChange: (selectedFilters: FilterOption[]) => void;
+}
+
+export const AcrylAssertionFilters: React.FC<AcrylAssertionFiltersProps> = ({
+    filterOptions,
+    selectedFilters,
+    onFilterChange,
+}) => {
+    const initialSelectedOptions = useMemo(() => {
+        return selectedFilters.map((filter) => ({
+            value: filter.name,
+            label: filter.displayName,
+            parentValue: filter.category,
+        }));
+    }, [selectedFilters]);
+
+    const handleFilterChange = useCallback(
+        (selectedValues: SelectOption[]) => {
+            const updatedFilters = selectedValues.map((option) => {
+                const category = option.parentValue || '';
+                return filterOptions[category].find((filter) => filter.name === option.value)!;
+            });
+
+            onFilterChange(updatedFilters);
+        },
+        [filterOptions, onFilterChange],
+    );
+
+    const getOptions = useMemo((): SelectOption[] => {
+        const opts: SelectOption[] = [];
+        Object.entries(filterOptions).forEach(([category, filters]) => {
+            if (category !== ASSERTION_FILTER_TYPES.TAG) {
+                opts.push({
+                    value: category,
+                    label: capitalize(category),
+                    isParent: true,
+                });
+                opts.push(
+                    ...filters.map((filter) => ({
+                        value: filter.name,
+                        label: filter.displayName,
+                        parentValue: category,
+                        isParent: false,
+                    })),
+                );
+            }
+        });
+        return opts;
+    }, [filterOptions]);
+
+    return (
+        <NestedSelect
+            label=""
+            placeholder="Filter"
+            options={getOptions}
+            initialValues={initialSelectedOptions}
+            onUpdate={handleFilterChange}
+            isMultiSelect
+            areParentsSelectable={false}
+            width={100}
+            showCount
+            shouldAlwaysSyncParentValues
+            hideParentCheckbox
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionList.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionList.tsx
new file mode 100644
index 00000000000000..3f51de8a96b52a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionList.tsx
@@ -0,0 +1,105 @@
+import React, { useEffect, useState } from 'react';
+import { Empty } from 'antd';
+import { useGetDatasetContractQuery } from '@src/graphql/contract.generated';
+import { Assertion, DataContract } from '@src/types.generated';
+import { useGetDatasetAssertionsWithRunEventsQuery } from '@src/graphql/dataset.generated';
+import { useEntityData } from '../../../../../../entity/shared/EntityContext';
+import { useIsSeparateSiblingsMode } from '../../../../useIsSeparateSiblingsMode';
+import { tryExtractMonitorDetailsFromAssertionsWithMonitorsQuery } from '../acrylUtils';
+import { combineEntityDataWithSiblings } from '../../../../../../entity/shared/siblingUtils';
+import { getFilteredTransformedAssertionData } from './utils';
+import { AcrylAssertionsSummaryLoading } from '../AcrylAssertionsSummaryLoading';
+import { AssertionTable, AssertionListFilter } from './types';
+import { AssertionListTitleContainer } from './AssertionListTitleContainer';
+import { AcrylAssertionListFilters } from './AcrylAssertionListFilters';
+import { AcrylAssertionListTable } from './AcrylAssertionListTable';
+import { useSetFilterFromURLParams } from './hooks';
+import { ASSERTION_DEFAULT_FILTERS, ASSERTION_DEFAULT_RAW_DATA } from './constant';
+
+/**
+ * Component used for rendering the Assertions Sub Tab on the Validations Tab
+ */
+export const AcrylAssertionList = () => {
+    const { urn } = useEntityData();
+
+    const isHideSiblingMode = useIsSeparateSiblingsMode();
+    const [visibleAssertions, setVisibleAssertions] = useState<AssertionTable>({
+        ...ASSERTION_DEFAULT_RAW_DATA,
+    });
+    // TODO we need to create setter function to set the filter as per the filter component
+    const [filter, setFilters] = useState<AssertionListFilter>(ASSERTION_DEFAULT_FILTERS);
+    useSetFilterFromURLParams(filter, setFilters);
+
+    const [assertionMonitorData, setAssertionMonitorData] = useState<Assertion[]>([]);
+
+    const { data, refetch, loading } = useGetDatasetAssertionsWithRunEventsQuery({
+        variables: { urn },
+        fetchPolicy: 'cache-first',
+    });
+    const { data: contractData, refetch: contractRefetch } = useGetDatasetContractQuery({
+        variables: { urn },
+        fetchPolicy: 'cache-first',
+    });
+
+    const contract: DataContract = contractData?.dataset?.contract as DataContract;
+
+    // get filtered Assertion as per the filter object
+    const getFilteredAssertions = (assertions: Assertion[]) => {
+        const filteredAssertionData: AssertionTable = getFilteredTransformedAssertionData(assertions, filter);
+        setVisibleAssertions(filteredAssertionData);
+    };
+
+    useEffect(() => {
+        const combinedData = isHideSiblingMode ? data : combineEntityDataWithSiblings(data);
+        const assertionsWithMonitorsDetails: Assertion[] =
+            tryExtractMonitorDetailsFromAssertionsWithMonitorsQuery(combinedData) ?? [];
+        setAssertionMonitorData(assertionsWithMonitorsDetails);
+        getFilteredAssertions(assertionsWithMonitorsDetails);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [data]);
+
+    useEffect(() => {
+        // after filter change need to get filtered assertions
+        if (assertionMonitorData?.length > 0) {
+            getFilteredAssertions(assertionMonitorData);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [filter]);
+
+    const renderListTable = () => {
+        if (loading) {
+            return <AcrylAssertionsSummaryLoading />;
+        }
+        if ((visibleAssertions?.assertions || []).length > 0) {
+            return (
+                <AcrylAssertionListTable
+                    contract={contract}
+                    assertionData={visibleAssertions}
+                    filter={filter}
+                    refetch={() => {
+                        refetch();
+                        contractRefetch();
+                    }}
+                />
+            );
+        }
+        return <Empty description="No assertions have run" image={Empty.PRESENTED_IMAGE_SIMPLE} />;
+    };
+
+    return (
+        <>
+            <AssertionListTitleContainer />
+            {assertionMonitorData?.length > 0 && (
+                <AcrylAssertionListFilters
+                    filterOptions={visibleAssertions?.filterOptions}
+                    originalFilterOptions={visibleAssertions?.originalFilterOptions}
+                    setFilters={setFilters}
+                    filter={filter}
+                    filteredAssertions={visibleAssertions}
+                />
+            )}
+
+            {renderListTable()}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListConstants.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListConstants.tsx
new file mode 100644
index 00000000000000..582b717fd52753
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListConstants.tsx
@@ -0,0 +1,68 @@
+import React from 'react';
+import styled from 'styled-components';
+import { CheckOutlined, CloseOutlined, InfoCircleOutlined } from '@ant-design/icons';
+import { AssertionResultType } from '@src/types.generated';
+import { NO_RUNNING_STATE } from './constant';
+
+const StyledCardTitle = styled.div<{ background: string; color: string }>`
+    background: ${({ background }) => background};
+    color: ${({ color }) => color};
+    padding: 8px;
+    font-weight: 700;
+    padding-left: 24px;
+    gap: 8px;
+    display: flex;
+    align-items: center;
+    font-size: 12px;
+`;
+
+export const ASSERTION_SUMMARY_CARD_HEADER_BY_STATUS = {
+    passing: {
+        color: '#548239',
+        backgroundColor: '#F1F8EE',
+        resultType: AssertionResultType.Success,
+        icon: <CheckOutlined />,
+        text: 'Passing',
+        headerComponent: (
+            <StyledCardTitle background="#F1F8EE" color="#548239">
+                <CheckOutlined /> Passing
+            </StyledCardTitle>
+        ),
+    },
+    failing: {
+        color: '#D23939',
+        backgroundColor: '#FCF2F2',
+        resultType: AssertionResultType.Failure,
+        icon: <CloseOutlined />,
+        text: 'Failing',
+        headerComponent: (
+            <StyledCardTitle background="#FCF2F2" color="#D23939">
+                <CloseOutlined /> Failing
+            </StyledCardTitle>
+        ),
+    },
+    erroring: {
+        color: '#EEAE09',
+        backgroundColor: '#FEF9ED',
+        resultType: AssertionResultType.Error,
+        icon: <InfoCircleOutlined />,
+        text: 'Errors',
+        headerComponent: (
+            <StyledCardTitle background="#FEF9ED" color="#EEAE09">
+                <InfoCircleOutlined /> Error
+            </StyledCardTitle>
+        ),
+    },
+    [NO_RUNNING_STATE]: {
+        color: '#8D95B1',
+        backgroundColor: '#e0e0e0',
+        resultType: null,
+        icon: <InfoCircleOutlined />,
+        text: '0 Running',
+        headerComponent: (
+            <StyledCardTitle background="#F6F6F6" color="#8D95B1">
+                <InfoCircleOutlined /> No runs
+            </StyledCardTitle>
+        ),
+    },
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListFilters.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListFilters.tsx
new file mode 100644
index 00000000000000..9ca8030907b546
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListFilters.tsx
@@ -0,0 +1,150 @@
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components';
+import { AcrylListSearch } from '@src/app/entityV2/shared/components/ListSearch/AcrylListSearch';
+import { AcrylAssertionRecommendedFilters } from './AcrylAssertionRecommendedFilters';
+import { AcryAssertionTypeSelect } from './AcryAssertionTypeSelect';
+import { AssertionListFilter, AssertionTable } from './types';
+import { AcrylAssertionFilters } from './AcrylAssertionFilters';
+import { ASSERTION_GROUP_BY_FILTER_OPTIONS, ASSERTION_DEFAULT_FILTERS } from './constant';
+
+interface FilterItem {
+    name: string;
+    category: string;
+    count: number;
+    displayName: string;
+}
+
+interface AcrylAssertionListFiltersProps {
+    filterOptions: any;
+    originalFilterOptions: any;
+    setFilters: React.Dispatch<React.SetStateAction<AssertionListFilter>>;
+    filter: AssertionListFilter;
+    filteredAssertions: AssertionTable;
+}
+
+const SearchFilterContainer = styled.div`
+    display: flex;
+    padding: 0px 10px;
+    margin-bottom: 8px;
+    margin-top: 8px;
+    gap: 12px;
+    justify-content: space-between;
+`;
+
+const FiltersContainer = styled.div`
+    display: flex;
+`;
+
+const StyledFilterContainer = styled.div`
+    margin-right: 12px;
+    button {
+        box-shadow: none !important;
+        height: 36px !important;
+        font-size: 14px !important;
+        border-radius: 8px !important;
+        color: #5f6685;
+    }
+`;
+
+export const AcrylAssertionListFilters: React.FC<AcrylAssertionListFiltersProps> = ({
+    filterOptions,
+    originalFilterOptions,
+    setFilters,
+    filter,
+    filteredAssertions,
+}) => {
+    const [appliedFilters, setAppliedFilters] = useState<FilterItem[]>([]);
+    const [selectedGroupBy, setSelectedGroupBy] = useState<string | undefined>(filter.groupBy || undefined);
+
+    const handleSearchTextChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        const searchText = event.target.value;
+        setFilters((prev) => ({
+            ...prev,
+            filterCriteria: { ...prev.filterCriteria, searchText },
+        }));
+    };
+
+    const handleAssertionTypeChange = (value: string) => {
+        setSelectedGroupBy(value);
+        setFilters((prev) => ({ ...prev, groupBy: value }));
+    };
+
+    const handleFilterChange = (updatedFilters: FilterItem[]) => {
+        /** Set Recommended Filters when there is value in type,status or source if not then set it as empty to clear the filter */
+        const selectedRecommendedFilters = updatedFilters.reduce<Record<string, string[]>>(
+            (acc, selectedfilter) => {
+                acc[selectedfilter.category] = acc[selectedfilter.category] || [];
+                acc[selectedfilter.category].push(selectedfilter.name);
+                return acc;
+            },
+            { type: [], status: [], source: [], column: [] },
+        );
+
+        setFilters((prev) => ({
+            ...prev,
+            filterCriteria: { ...prev.filterCriteria, ...selectedRecommendedFilters },
+        }));
+        setAppliedFilters(updatedFilters);
+    };
+
+    /**
+     * This hook is for setting applied filter when we are getting it from selected Filter state
+     */
+    useEffect(() => {
+        const { status, type, source, column } = filter.filterCriteria || ASSERTION_DEFAULT_FILTERS.filterCriteria;
+        const recommendedFilters = originalFilterOptions?.recommendedFilters || [];
+        // just set recommended filters for status, type & Others as of right now
+        const appliedRecommendedFilters = recommendedFilters.filter(
+            (item) =>
+                status.includes(item.name) ||
+                type.includes(item.name) ||
+                source.includes(item.name) ||
+                column.includes(item.name),
+        );
+        setAppliedFilters(appliedRecommendedFilters);
+        setSelectedGroupBy(filter.groupBy);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [filter, filterOptions]);
+
+    return (
+        <>
+            <SearchFilterContainer>
+                {/* ************Render Search Component ************************* */}
+                <AcrylListSearch
+                    searchText={filter.filterCriteria.searchText}
+                    debouncedSetFilterText={handleSearchTextChange}
+                    matchResultCount={filteredAssertions.searchMatchesCount || 0}
+                    numRows={filteredAssertions.totalCount || 0}
+                    entityTypeName="assertion"
+                />
+
+                {/* ************Render Filter Component ************************* */}
+                <FiltersContainer>
+                    <StyledFilterContainer>
+                        <AcrylAssertionFilters
+                            filterOptions={originalFilterOptions?.filterGroupOptions || []}
+                            selectedFilters={appliedFilters}
+                            onFilterChange={handleFilterChange}
+                        />
+                    </StyledFilterContainer>
+                    {/* ************Render Group By Component ************************* */}
+                    <div>
+                        <AcryAssertionTypeSelect
+                            options={ASSERTION_GROUP_BY_FILTER_OPTIONS}
+                            selectedValue={selectedGroupBy}
+                            onSelect={handleAssertionTypeChange}
+                        />
+                    </div>
+                </FiltersContainer>
+            </SearchFilterContainer>
+            <div>
+                {/* ************Render Recommended Filter Component ************************* */}
+                <AcrylAssertionRecommendedFilters
+                    filters={filterOptions?.recommendedFilters || []}
+                    appliedFilters={appliedFilters}
+                    onFilterChange={handleFilterChange}
+                />
+            </div>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListStatusDot.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListStatusDot.tsx
new file mode 100644
index 00000000000000..3686b9936f439e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListStatusDot.tsx
@@ -0,0 +1,51 @@
+import { AssertionResultType, AssertionRunEvent } from '@src/types.generated';
+import React from 'react';
+import styled from 'styled-components';
+
+const StyledAssertionResultDotContainer = styled.div`
+    display: flex;
+`;
+
+const statusColors = {
+    success: {
+        backgroundColor: '#248F5B',
+        outerColor: '#F7FBF4',
+    },
+    failure: {
+        backgroundColor: '#E54D1F',
+        outerColor: '#FBF3EF',
+    },
+    gray: {
+        backgroundColor: '#d9d9d9',
+        outerColor: '#f5f5f5',
+    },
+};
+
+type Props = {
+    run?: AssertionRunEvent;
+    disabled?: boolean;
+    size?: number;
+};
+
+const AcrylAssertionListStatusDot = ({ run, disabled, size = 12 }: Props) => {
+    const status = (run?.result?.type as AssertionResultType) || 'gray';
+    const { backgroundColor, outerColor } = statusColors[status.toLocaleLowerCase()] || statusColors.gray;
+
+    const dotStyle = {
+        backgroundColor,
+        width: `${size}px`,
+        height: `${size}px`,
+        borderRadius: '50%',
+        boxShadow: `0 0 0 3px ${outerColor}`,
+        display: 'inline-block',
+        opacity: disabled ? 0.5 : 1,
+    };
+
+    return (
+        <StyledAssertionResultDotContainer className="assertion-result-dot" data-assertion-result-type={status}>
+            <span style={dotStyle} />
+        </StyledAssertionResultDotContainer>
+    );
+};
+
+export default AcrylAssertionListStatusDot;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListTable.tsx
new file mode 100644
index 00000000000000..6b0a2917de19b2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionListTable.tsx
@@ -0,0 +1,152 @@
+import React, { useEffect, useState } from 'react';
+import { DataContract } from '@src/types.generated';
+import { useEntityData } from '@src/app/entity/shared/EntityContext';
+import { Table } from '@src/alchemy-components';
+import { SortingState } from '@src/alchemy-components/components/Table/types';
+
+import { AssertionProfileDrawer } from '../assertion/profile/AssertionProfileDrawer';
+import { getEntityUrnForAssertion, getSiblingWithUrn } from '../acrylUtils';
+import { useExpandedRowKeys, useOpenAssertionDetailModal } from '../assertion/builder/hooks';
+import { AssertionTable, AssertionListFilter } from './types';
+import { useAssertionsTableColumns } from './hooks';
+import { StyledTableContainer } from './StyledComponents';
+
+type Props = {
+    assertionData: AssertionTable;
+    filter: AssertionListFilter;
+    refetch: () => void;
+    contract: DataContract;
+};
+
+export const AcrylAssertionListTable = ({ assertionData, filter, refetch, contract }: Props) => {
+    const { entityData } = useEntityData();
+    const { groupBy } = filter;
+
+    const [sortedOptions, setSortedOptions] = useState<{ sortColumn: string; sortOrder: SortingState }>({
+        sortColumn: '',
+        sortOrder: SortingState.ORIGINAL,
+    });
+
+    const { expandedRowKeys, setExpandedRowKeys } = useExpandedRowKeys(
+        assertionData?.groupBy ? assertionData?.groupBy[groupBy] : [],
+        { isGroupBy: !!groupBy },
+    );
+
+    // get columns data from the custom hooks
+    const assertionsTableCols = useAssertionsTableColumns({
+        groupBy,
+        contract,
+        refetch,
+    });
+
+    const [focusAssertionUrn, setFocusAssertionUrn] = useState<string | null>(null);
+    const focusedAssertion = assertionData.assertions.find((assertion) => assertion.urn === focusAssertionUrn);
+    const focusedEntityUrn = focusedAssertion ? getEntityUrnForAssertion(focusedAssertion.assertion) : undefined;
+
+    const focusedAssertionEntity =
+        focusedEntityUrn && entityData ? getSiblingWithUrn(entityData, focusedEntityUrn) : undefined;
+
+    useEffect(() => {
+        if (focusAssertionUrn && !focusedAssertion) {
+            setFocusAssertionUrn(null);
+        }
+    }, [focusAssertionUrn, focusedAssertion]);
+
+    useOpenAssertionDetailModal(setFocusAssertionUrn);
+
+    const onAssertionExpand = (record) => {
+        const key = record.name;
+        setExpandedRowKeys((prev) => (prev.includes(key) ? prev.filter((k) => k !== key) : [...prev, key]));
+    };
+
+    const getGroupData = () => {
+        return (assertionData?.groupBy && assertionData?.groupBy[groupBy]) || [];
+    };
+
+    const rowClassName = (record): string => {
+        if (record.groupName) {
+            return 'group-header';
+        }
+        if (record.urn === focusAssertionUrn) {
+            return 'acryl-selected-table-row' || 'acryl-assertions-table-row';
+        }
+        return 'acryl-assertions-table-row';
+    };
+
+    const onRowClick = (record) => {
+        setFocusAssertionUrn(record.urn);
+    };
+
+    const getSortedAssertions = (record) => {
+        const { sortOrder, sortColumn } = sortedOptions;
+        if (sortOrder === SortingState.ORIGINAL) {
+            return record.assertions;
+        }
+
+        const sortFunctions = {
+            lastEvaluation: {
+                [SortingState.DESCENDING]: (a, b) => a.lastEvaluationTimeMs - b.lastEvaluationTimeMs,
+                [SortingState.ASCENDING]: (a, b) => b.lastEvaluationTimeMs - a.lastEvaluationTimeMs,
+            },
+            name: {
+                [SortingState.ASCENDING]: (a, b) => a.description.localeCompare(b.description),
+                [SortingState.DESCENDING]: (a, b) => b.description.localeCompare(a.description),
+            },
+        };
+
+        const sortFunction = sortFunctions[sortColumn]?.[sortOrder];
+        return sortFunction ? [...record.assertions].sort(sortFunction) : record.assertions;
+    };
+
+    return (
+        <>
+            <StyledTableContainer style={{ height: '100vh', overflow: 'hidden' }}>
+                <Table
+                    columns={assertionsTableCols}
+                    data={groupBy ? getGroupData() : assertionData.assertions || []}
+                    showHeader
+                    isScrollable
+                    rowClassName={rowClassName}
+                    handleSortColumnChange={({
+                        sortColumn,
+                        sortOrder,
+                    }: {
+                        sortColumn: string;
+                        sortOrder: SortingState;
+                    }) => setSortedOptions({ sortColumn, sortOrder })}
+                    expandable={{
+                        expandedRowRender: (record) => {
+                            let sortedAssertions = record.assertions;
+                            if (sortedOptions.sortColumn && sortedOptions.sortOrder) {
+                                sortedAssertions = getSortedAssertions(record);
+                            }
+                            return (
+                                <Table
+                                    columns={assertionsTableCols}
+                                    data={sortedAssertions}
+                                    showHeader={false}
+                                    isBorderless
+                                    isExpandedInnerTable
+                                    onRowClick={onRowClick}
+                                    rowClassName={rowClassName}
+                                />
+                            );
+                        },
+                        rowExpandable: () => !!groupBy,
+                        expandIconPosition: 'end',
+                        expandedRowKeys,
+                    }}
+                    onExpand={onAssertionExpand}
+                />
+            </StyledTableContainer>
+            {focusAssertionUrn && focusedAssertionEntity && (
+                <AssertionProfileDrawer
+                    urn={focusAssertionUrn}
+                    contract={contract}
+                    closeDrawer={() => setFocusAssertionUrn(null)}
+                    refetch={refetch}
+                />
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionProgressBar.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionProgressBar.tsx
new file mode 100644
index 00000000000000..9ad303a553ae31
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionProgressBar.tsx
@@ -0,0 +1,44 @@
+import React from 'react';
+import styled from 'styled-components';
+
+export interface AssertionProgressSummary {
+    passing: number;
+    failing: number;
+    erroring: number;
+}
+
+interface Props {
+    summary: AssertionProgressSummary;
+}
+
+// Styled Components
+const StyledProgressContainer = styled.div`
+    display: flex;
+    height: 4px;
+    width: 100%;
+    border-radius: 20px,
+    overflow: hidden;
+    background-color: #e0e0e0;
+`;
+
+const StyledSegment = styled.div<{ width: number; color: string }>`
+    width: ${({ width }) => `${width}%`};
+    background-color: ${({ color }) => color};
+    height: 100%;
+    border-radius: 20px;
+`;
+
+export const AcrylAssertionProgressBar: React.FC<Props> = ({ summary }) => {
+    const total = summary.passing + summary.failing + summary.erroring;
+    const passingPercent = (summary.passing / total) * 100;
+    const failingPercent = (summary.failing / total) * 100;
+    const erroringPercent = (summary.erroring / total) * 100;
+
+    return (
+        <StyledProgressContainer>
+            <StyledSegment width={passingPercent} color="#548239" />
+            <StyledSegment width={failingPercent} color="#D23939" />
+            <StyledSegment width={erroringPercent} color="#EEAE09" />
+        </StyledProgressContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionRecommendedFilters.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionRecommendedFilters.tsx
new file mode 100644
index 00000000000000..196d9adfacadf5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcrylAssertionRecommendedFilters.tsx
@@ -0,0 +1,88 @@
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components';
+import { REDESIGN_COLORS } from '@src/app/entityV2/shared/constants';
+
+interface FilterItem {
+    name: string;
+    displayName: string;
+    category: string;
+    count: number;
+}
+
+interface AcrylAssertionRecommendedFiltersProps {
+    filters: FilterItem[];
+    appliedFilters: FilterItem[];
+    onFilterChange: (updatedFilters: FilterItem[]) => void;
+}
+
+const FilterContainer = styled.div`
+    display: flex;
+    flex-direction: row;
+    padding: 10px;
+    gap: 10px;
+    overflow: auto;
+`;
+
+const FilterItemRow = styled.div<{ selected: boolean }>`
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    padding: 0 8px;
+    height: 30px;
+    font-size: 14px;
+    border-radius: 20px;
+    min-width: fit-content;
+    cursor: pointer;
+    color: ${({ selected }) => (selected ? REDESIGN_COLORS.WHITE : REDESIGN_COLORS.BODY_TEXT_GREY)};
+    background-color: ${({ selected }) =>
+        selected ? REDESIGN_COLORS.BACKGROUND_PRIMARY_1 : REDESIGN_COLORS.COLD_GREY_TEXT_BLUE_1};
+
+    &:hover {
+        background-color: ${REDESIGN_COLORS.BACKGROUND_PRIMARY_1};
+        color: ${REDESIGN_COLORS.WHITE};
+        box-shadow: none;
+    }
+    box-shadow: none;
+`;
+
+const FilterName = styled.span``;
+const FilterCount = styled.span``;
+
+export const AcrylAssertionRecommendedFilters: React.FC<AcrylAssertionRecommendedFiltersProps> = ({
+    filters,
+    appliedFilters,
+    onFilterChange,
+}) => {
+    const [visibleFilters, setVisibleFilters] = useState<FilterItem[]>([]);
+    const handleFilterClick = (filter: FilterItem) => {
+        const isSelected = appliedFilters.some((appliedFilter) => appliedFilter.name === filter.name);
+        const updatedFilters = isSelected
+            ? appliedFilters.filter((appliedFilter) => appliedFilter.name !== filter.name)
+            : [...appliedFilters, filter];
+
+        onFilterChange(updatedFilters);
+    };
+
+    useEffect(() => {
+        const transformedAppliedFilters = appliedFilters.map((filter) => filter.name);
+        const newVisibleFilters = filters.filter(
+            (filter: FilterItem) =>
+                filter.category !== 'column' && (filter.count || transformedAppliedFilters.includes(filter.name)),
+        );
+        setVisibleFilters(newVisibleFilters);
+    }, [filters, appliedFilters]);
+    return (
+        <FilterContainer>
+            {visibleFilters.map((filter) => (
+                <FilterItemRow
+                    key={filter.name}
+                    selected={appliedFilters.some((appliedFilter) => appliedFilter.name === filter.name)}
+                    onClick={() => handleFilterClick(filter)}
+                >
+                    <FilterName>{filter.displayName}</FilterName>
+                    <FilterCount>({filter.count})</FilterCount>
+                </FilterItemRow>
+            ))}
+        </FilterContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionGroupHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionGroupHeader.tsx
new file mode 100644
index 00000000000000..68cc99c8101ed0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionGroupHeader.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { AssertionGroup } from '../acrylTypes';
+
+const Container = styled.div`
+    display: flex;
+    align-items: center;
+    padding: 4px 0px;
+    &:hover {
+        cursor: pointer;
+    }
+`;
+
+const TextContainer = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: left;
+    font-size: 14px;
+`;
+
+const Title = styled(Typography.Text)`
+    && {
+        padding-bottom: 0px;
+        margin-bottom: 0px;
+    }
+`;
+
+const Message = styled(Typography.Text)`
+    && {
+        font-size: 12px;
+        margin-left: 8px;
+    }
+`;
+
+type Props = {
+    group: AssertionGroup;
+};
+
+export const AssertionGroupHeader = ({ group }: Props) => {
+    const { summary } = group;
+    const inactiveCount = summary.totalAssertions - summary.total;
+    const summaryMessage = `${summary.passing} passing, ${summary.failing} failing${
+        summary.erroring ? `, ${summary.erroring} errors` : ''
+    }${inactiveCount ? `, ${inactiveCount} inactive` : ''}`;
+    return (
+        <Container>
+            <TextContainer>
+                <Title strong>{group.name}</Title>
+                <Message type="secondary">{summaryMessage}</Message>
+            </TextContainer>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionListTitleContainer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionListTitleContainer.tsx
new file mode 100644
index 00000000000000..b3298491ea4701
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionListTitleContainer.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import { Typography } from 'antd';
+import styled from 'styled-components';
+
+const AssertionTitleContainer = styled.div`
+    display: flex;
+    justify-content: space-between;
+    margin: 20px;
+    height: 50px;
+    div {
+        border-bottom: 0px;
+    }
+`;
+const AssertionListTitle = styled(Typography.Title)`
+    && {
+        margin-bottom: 0px;
+    }
+`;
+
+const SubTitle = styled(Typography.Text)`
+    font-size: 14px;
+    color: #5f6685;
+`;
+
+export const AssertionListTitleContainer = () => {
+    return (
+        <AssertionTitleContainer>
+            <div className="left-section">
+                <AssertionListTitle level={4}>Assertions</AssertionListTitle>
+                <SubTitle>View and manage data quality checks for this table</SubTitle>
+            </div>
+        </AssertionTitleContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionName.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionName.tsx
new file mode 100644
index 00000000000000..3a2b85814015ff
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AssertionName.tsx
@@ -0,0 +1,123 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { useEntityRegistry } from '@src/app/useEntityRegistry';
+import { useEntityData } from '@src/app/entity/shared/EntityContext';
+import { EntityType, DataContract } from '@src/types.generated';
+import { UNKNOWN_DATA_PLATFORM } from '@src/app/entityV2/shared/constants';
+import { AssertionResultPopover } from '../assertion/profile/shared/result/AssertionResultPopover';
+import { ResultStatusType } from '../assertion/profile/summary/shared/resultMessageUtils';
+import { AssertionPlatformAvatar } from '../AssertionPlatformAvatar';
+import { isAssertionPartOfContract } from '../contract/utils';
+import { useBuildAssertionDescriptionLabels } from '../assertion/profile/summary/utils';
+import { DataContractBadge } from './DataContractBadge';
+import { AssertionListTableRow } from './types';
+import AcrylAssertionListStatusDot from './AcrylAssertionListStatusDot';
+
+const StyledAssertionNameContainer = styled.div`
+    display: flex;
+    align-items: center;
+    white-space: normal;
+`;
+
+const Result = styled.div`
+    margin: 0px 20px 0px 0px;
+    display: flex;
+    align-items: center;
+`;
+
+const AssertionPlatformWrapper = styled.div`
+    margin-left: 10px;
+`;
+
+const AssertionDescriptionContainer = styled.div`
+    display: flex;
+    justify-content: space-between;
+    width: 100%;
+    align-items: center;
+`;
+
+const StyledAssertionBadgeContainer = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const StyledAssertionName = styled(Typography.Paragraph)`
+    margin-bottom: 0 !important;
+    font-size: 14px;
+    font-weight: 500;
+`;
+
+type Props = {
+    record: AssertionListTableRow;
+    groupBy: string;
+    contract: DataContract;
+};
+
+export const AssertionName = ({ record, groupBy, contract }: Props) => {
+    const entityRegistry = useEntityRegistry();
+    const entityData = useEntityData();
+
+    const { platform, assertion, lastEvaluation, lastEvaluationUrl } = record;
+    const monitorSchedule = null;
+    const { primaryLabel } = useBuildAssertionDescriptionLabels(record?.assertion?.info, monitorSchedule, {
+        showColumnTag: true,
+    });
+    let name = primaryLabel;
+
+    // if it is group header then just display group name instead of other fields
+    if (groupBy && record.name) {
+        name = <>{record.groupName}</>;
+        return <Typography.Text>{name}</Typography.Text>;
+    }
+
+    const disabled = false;
+    const isPartOfContract = contract && isAssertionPartOfContract(assertion, contract);
+
+    return (
+        <StyledAssertionNameContainer>
+            {/* ******** Popover on hover ******** */}
+            <AssertionResultPopover
+                assertion={assertion}
+                run={lastEvaluation}
+                showProfileButton
+                placement="right"
+                resultStatusType={ResultStatusType.LATEST}
+            >
+                <Result>
+                    <AcrylAssertionListStatusDot run={lastEvaluation} disabled={disabled} size={10} />
+                </Result>
+            </AssertionResultPopover>
+
+            {/* ******** Assertion description ******** */}
+            <AssertionDescriptionContainer>
+                <StyledAssertionName>{name}</StyledAssertionName>
+                {/* ****render external Icon if the assertion is external**** */}
+                {platform && platform.urn !== UNKNOWN_DATA_PLATFORM && (
+                    <AssertionPlatformWrapper>
+                        <AssertionPlatformAvatar
+                            platform={platform}
+                            externalUrl={lastEvaluationUrl || assertion?.info?.externalUrl || undefined}
+                            noRightMargin
+                        />
+                    </AssertionPlatformWrapper>
+                )}
+
+                {isPartOfContract && (
+                    <StyledAssertionBadgeContainer>
+                        {/* ******** Data Contract Popover ******** */}
+                        {(isPartOfContract && entityData?.urn && (
+                            <DataContractBadge
+                                link={`${entityRegistry.getEntityUrl(
+                                    EntityType.Dataset,
+                                    entityData.urn,
+                                )}/Quality/Data Contract`}
+                            />
+                        )) ||
+                            undefined}
+                    </StyledAssertionBadgeContainer>
+                )}
+            </AssertionDescriptionContainer>
+        </StyledAssertionNameContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/DataContractBadge.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/DataContractBadge.tsx
new file mode 100644
index 00000000000000..92c4135e535595
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/DataContractBadge.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { AuditOutlined } from '@ant-design/icons';
+import { REDESIGN_COLORS } from '@src/app/entity/shared/constants';
+import { Tooltip } from '@components';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+
+const DataContractLogo = styled(AuditOutlined)`
+    margin-left: 8px;
+    font-size: 16px;
+    color: ${REDESIGN_COLORS.BLUE};
+`;
+export const DataContractBadge = ({ link }: { link: string }) => {
+    return (
+        <Tooltip
+            title={
+                <>
+                    Part of Data Contract{' '}
+                    <Link to={link} style={{ color: REDESIGN_COLORS.BLUE }}>
+                        view
+                    </Link>
+                </>
+            }
+        >
+            <Link to={link}>
+                <DataContractLogo />
+            </Link>
+        </Tooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/GroupByTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/GroupByTable.tsx
new file mode 100644
index 00000000000000..4c4634aa6693ed
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/GroupByTable.tsx
@@ -0,0 +1,84 @@
+import { ANTD_GRAY } from '@src/app/entityV2/shared/constants';
+import React from 'react';
+import styled from 'styled-components';
+import { AssertionListTableRow } from './types';
+
+const GroupContainer = styled.div`
+    background: #fafafa;
+    &&& .acryl-selected-assertions-table-row {
+        background-color: ${ANTD_GRAY[4]};
+    }
+`;
+
+const Row = styled.div`
+    display: flex;
+    width: 100%;
+    border-bottom: 1px solid #f0f0f0;
+    padding: 16px;
+`;
+
+const Cell = styled.div<{ width?: string; minWidth?: string | null; paddingRight?: string | number }>`
+    width: ${(props) => props.width || 'auto'};
+    min-width: ${(props) => props.minWidth || null};
+    padding-right: ${(props) => props.paddingRight || '20px'};
+    text-overflow: ellipsis;
+    overflow-wrap: break-word;
+`;
+
+type AcrylAssertionGroupByComponentProps = {
+    groupData: AssertionListTableRow[];
+    columns: any[];
+    onRow: (record: any) => {
+        onClick: (_: any) => void;
+    };
+    focusUrn?: string;
+    entityType: string;
+};
+
+export const GroupByTable = ({
+    groupData,
+    columns,
+    onRow,
+    focusUrn,
+    entityType,
+}: AcrylAssertionGroupByComponentProps) => {
+    return (
+        <GroupContainer>
+            {groupData?.map((item) => (
+                <Row
+                    key={item.name}
+                    onClick={(event) => {
+                        onRow(item)?.onClick(event);
+                    }}
+                    className={
+                        focusUrn === item.urn
+                            ? `acryl-selected-${entityType}s-table-row`
+                            : `acryl-${entityType}s-table-row`
+                    }
+                >
+                    {columns.map((column) => {
+                        const isNameColumn = column?.key === 'name';
+                        const isActionColumn = column?.key === 'actions';
+                        const minWidth = isNameColumn ? 'min-content' : null;
+                        return (
+                            column?.width &&
+                            column?.key && (
+                                <Cell
+                                    key={column.key}
+                                    width={column.width}
+                                    style={{ display: !isNameColumn ? 'flex' : 'block', alignItems: 'center' }}
+                                    minWidth={minWidth}
+                                    paddingRight={isActionColumn ? '0px' : undefined}
+                                >
+                                    {column.render
+                                        ? column.render(item[column.dataIndex], item)
+                                        : item[column.dataIndex]}
+                                </Cell>
+                            )
+                        );
+                    })}
+                </Row>
+            ))}
+        </GroupContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/StyledComponents.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/StyledComponents.tsx
new file mode 100644
index 00000000000000..fbc6922d8ab5e6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/StyledComponents.tsx
@@ -0,0 +1,9 @@
+import { ANTD_GRAY } from '@src/app/entityV2/shared/constants';
+import styled from 'styled-components';
+
+export const StyledTableContainer = styled.div`
+    table tr.acryl-selected-table-row {
+        background-color: ${ANTD_GRAY[4]};
+    }
+    margin: 0px 12px 12px 12px;
+`;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummaryCard.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummaryCard.tsx
new file mode 100644
index 00000000000000..129f95188f27a5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummaryCard.tsx
@@ -0,0 +1,155 @@
+import React from 'react';
+import { useHistory } from 'react-router-dom';
+import styled from 'styled-components';
+import { AssertionType, EntityType } from '@src/types.generated';
+import { ANTD_GRAY, REDESIGN_COLORS } from '@src/app/entityV2/shared/constants';
+import { useEntityRegistry } from '@src/app/useEntityRegistry';
+import { useEntityData } from '@src/app/entity/shared/EntityContext';
+import { AssertionGroup } from '../../acrylTypes';
+import { getAssertionGroupName } from '../../acrylUtils';
+import { AcrylAssertionProgressBar, AssertionProgressSummary } from '../AcrylAssertionProgressBar';
+import { ASSERTION_SUMMARY_CARD_HEADER_BY_STATUS } from '../AcrylAssertionListConstants';
+import { AcrylAssertionSummarySection } from './AcrylAssertionSummarySection';
+import { ASSERTION_TYPE_TO_ICON_MAP } from '../../shared/constant';
+import { ASSERTION_SUMMARY_CARD_STATUSES, NO_RUNNING_STATE } from '../constant';
+import { buildAssertionUrlSearch } from '../utils';
+
+const StyledCard = styled.div`
+    display: flex;
+    gap: 4px;
+    flex-direction: column;
+    width: auto;
+    height: 210px;
+    box-shadow: 0px 4px 8px 0px #cecece1a;
+    border: 1px solid #e5e7ed;
+    border-radius: 8px;
+    cursor: pointer;
+    overflow: hidden;
+    :hover {
+        box-shadow: 0 1px 12px 0px rgba(0, 0, 0, 0.1);
+    }
+    transition: box-shadow 0.3s ease;
+`;
+
+const StyledCardChartSection = styled.div`
+    padding: 24px;
+    border-top: 1px solid ${ANTD_GRAY[3]};
+    display: flex;
+    flex-direction: column;
+    gap: 24px;
+`;
+
+const AssertionTypeDetailsContainer = styled.div`
+    display: flex;
+    align-items: start;
+    flex-direction: column;
+`;
+
+const AssertionIconWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: ${ANTD_GRAY[3]};
+    height: 36px;
+    width: 36px;
+    border-radius: 36px;
+    svg {
+        color: ${ANTD_GRAY[7]};
+    }
+`;
+
+const AssertionTitle = styled.span`
+    font-size: 16px;
+    font-weight: 700;
+`;
+
+const AssertionDetailsContainer = styled.div`
+    display: flex;
+    gap: 12px;
+    padding: 12px 24px;
+`;
+
+const AssertionTextContainer = styled.div`
+    color: #8c8c8c;
+    font-size: 14px;
+    font-weight: 600;
+`;
+
+const ChartSectionContainer = styled.div`
+    display: flex;
+    flex-direction: row;
+    gap: 24px;
+    justify-content: space-between;
+    align-items: center;
+`;
+
+const ViewAllWrapper = styled.div`
+    color: ${REDESIGN_COLORS.BODY_TEXT_GREY};
+    font-size: 12px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    font-weight: 700;
+    cursor: pointer;
+`;
+
+const ViewAllText = styled.div``;
+
+type Props = {
+    group: AssertionGroup;
+};
+
+export const AcrylAssertionSummaryCard: React.FC<Props> = ({ group }) => {
+    const history = useHistory();
+    const entityRegistry = useEntityRegistry();
+    const entityData = useEntityData();
+    const name = getAssertionGroupName(group.name);
+    const icon = ASSERTION_TYPE_TO_ICON_MAP[group.type];
+
+    const visibleStatuses: string[] = ['passing', 'failing', 'erroring'].filter((status) => group.summary?.[status]);
+    // add No running state if there is no running state assertions
+    if (visibleStatuses.length === 0) {
+        visibleStatuses.push(NO_RUNNING_STATE);
+    }
+
+    const status = ASSERTION_SUMMARY_CARD_STATUSES.find((key) => group.summary[key]) || NO_RUNNING_STATE;
+    const headerTitle = status ? ASSERTION_SUMMARY_CARD_HEADER_BY_STATUS[status].headerComponent : null;
+
+    const handleCardClick = (type: AssertionType, event: React.MouseEvent) => {
+        event.stopPropagation(); // Prevent parent click handlers from being triggered
+        const url = `${entityRegistry.getEntityUrl(
+            EntityType.Dataset,
+            entityData.urn,
+        )}/Quality/List${buildAssertionUrlSearch({ type })}`;
+        history.push(url);
+    };
+
+    return (
+        <StyledCard onClick={(event) => handleCardClick(group.type, event)}>
+            {/* **********************Render Summary Card header **************************** */}
+            <div>{headerTitle}</div>
+
+            {/* **********************Render Icon and Type of Assertion **************************** */}
+            <AssertionDetailsContainer>
+                <AssertionIconWrapper>{icon}</AssertionIconWrapper>
+                <AssertionTypeDetailsContainer>
+                    <AssertionTitle>{name}</AssertionTitle>
+                    <AssertionTextContainer>Verifies when this dataset should be updated.</AssertionTextContainer>
+                </AssertionTypeDetailsContainer>
+            </AssertionDetailsContainer>
+
+            <StyledCardChartSection>
+                <ChartSectionContainer>
+                    {/* **********************Render Assertion Summary Card Summary Section**************************** */}
+                    <AcrylAssertionSummarySection group={group} visibleStatus={visibleStatuses} />
+                    <ViewAllWrapper>
+                        <ViewAllText>View All</ViewAllText>
+                    </ViewAllWrapper>
+                </ChartSectionContainer>
+
+                {/* **********************Render Progress bar **************************** */}
+                <AcrylAssertionProgressBar summary={group.summary as AssertionProgressSummary} />
+            </StyledCardChartSection>
+        </StyledCard>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummarySection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummarySection.tsx
new file mode 100644
index 00000000000000..285d840df21883
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummarySection.tsx
@@ -0,0 +1,80 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { Tooltip } from '@components';
+import styled from 'styled-components';
+import { EntityType } from '@src/types.generated';
+import { useEntityRegistry } from '@src/app/useEntityRegistry';
+import { useEntityData } from '@src/app/entity/shared/EntityContext';
+import { REDESIGN_COLORS } from '@src/app/entityV2/shared/constants';
+import { AssertionGroup } from '../../acrylTypes';
+import { ASSERTION_SUMMARY_CARD_HEADER_BY_STATUS } from '../AcrylAssertionListConstants';
+import { buildAssertionUrlSearch } from '../utils';
+
+const StyledSummaryLabel = styled.div<{ background: string; color: string }>`
+    background: ${({ background }) => background};
+    color: ${({ color }) => color};
+    font-weight: bold;
+    padding: 4px 12px;
+    border-radius: 16px;
+    font-size: 12px;
+`;
+
+const SummaryContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 12px;
+    cursor: pointer;
+`;
+
+const SummarySection = styled.div`
+    display: flex;
+    flex-direction: row;
+    gap: 24px;
+`;
+
+type SummarySectionProps = {
+    group: AssertionGroup;
+    visibleStatus: string[];
+};
+
+export const AcrylAssertionSummarySection: React.FC<SummarySectionProps> = ({ group, visibleStatus }) => {
+    const entityRegistry = useEntityRegistry();
+    const entityData = useEntityData();
+
+    return (
+        <SummarySection>
+            {visibleStatus.map((key) => {
+                const status = ASSERTION_SUMMARY_CARD_HEADER_BY_STATUS[key];
+                const url = `${entityRegistry.getEntityUrl(
+                    EntityType.Dataset,
+                    entityData.urn,
+                )}/Quality/List${buildAssertionUrlSearch({ type: group.type, status: status.resultType })}`;
+                return (
+                    <Tooltip
+                        title={
+                            status.resultType && (
+                                <>
+                                    {group.name} {status.text} Assertions{' '}
+                                    <Link
+                                        to={url}
+                                        style={{ color: REDESIGN_COLORS.BLUE }}
+                                        onClick={(event) => event.stopPropagation()}
+                                    >
+                                        view
+                                    </Link>
+                                </>
+                            )
+                        }
+                    >
+                        <SummaryContainer>
+                            <StyledSummaryLabel background={status.backgroundColor} color={status.color}>
+                                {group.summary[key]} {status.text}
+                            </StyledSummaryLabel>
+                        </SummaryContainer>
+                    </Tooltip>
+                );
+            })}
+        </SummarySection>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummaryTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummaryTab.tsx
new file mode 100644
index 00000000000000..00bde38b76625e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionSummaryTab.tsx
@@ -0,0 +1,60 @@
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components';
+import { Empty } from 'antd';
+import { useEntityData } from '@src/app/entity/shared/EntityContext';
+import { combineEntityDataWithSiblings, useIsSeparateSiblingsMode } from '@src/app/entity/shared/siblingUtils';
+import { useGetDatasetAssertionsWithRunEventsQuery } from '@src/graphql/dataset.generated';
+import { Assertion } from '@src/types.generated';
+import { createAssertionGroups, tryExtractMonitorDetailsFromAssertionsWithMonitorsQuery } from '../../acrylUtils';
+import { AcrylAssertionSummaryCard } from './AcrylAssertionSummaryCard';
+import { AssertionGroup } from '../../acrylTypes';
+import { getAssertionGroupsByDisplayOrder } from '../utils';
+import { AcrylAssertionsSummaryTabLoading } from './AcrylAssertionsSummaryLoading';
+
+const AcrylAssertionSummaryContainer = styled.div`
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(400px, 1fr));
+    padding: 16px;
+    row-gap: 24px;
+    column-gap: 24px;
+    overflow: auto;
+`;
+export const AcrylAssertionSummaryTab = () => {
+    const { urn } = useEntityData();
+
+    const isHideSiblingMode = useIsSeparateSiblingsMode();
+
+    const [groupedAssertions, setGroupedAssertions] = useState<AssertionGroup[]>([]);
+
+    const { data, loading } = useGetDatasetAssertionsWithRunEventsQuery({
+        variables: { urn },
+        fetchPolicy: 'cache-first',
+    });
+
+    useEffect(() => {
+        const combinedData = isHideSiblingMode ? data : combineEntityDataWithSiblings(data);
+        const assertionsWithMonitorsDetails: Assertion[] =
+            tryExtractMonitorDetailsFromAssertionsWithMonitorsQuery(combinedData) ?? [];
+        const assertionGroup = createAssertionGroups(assertionsWithMonitorsDetails);
+        const orderedAssertionGroups = getAssertionGroupsByDisplayOrder(assertionGroup);
+        setGroupedAssertions(orderedAssertionGroups);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [data]);
+
+    const renderSummaryTab = () => {
+        if (loading) {
+            return <AcrylAssertionsSummaryTabLoading />;
+        }
+        if (groupedAssertions?.length > 0) {
+            return (
+                <AcrylAssertionSummaryContainer>
+                    {groupedAssertions.map((group: AssertionGroup) => (
+                        <AcrylAssertionSummaryCard group={group} />
+                    ))}
+                </AcrylAssertionSummaryContainer>
+            );
+        }
+        return <Empty description="No assertions created yet." image={Empty.PRESENTED_IMAGE_SIMPLE} />;
+    };
+    return <>{renderSummaryTab()}</>;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionsSummaryLoading.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionsSummaryLoading.tsx
new file mode 100644
index 00000000000000..8adefd4c3d9c21
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Summary/AcrylAssertionsSummaryLoading.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Card } from 'antd';
+
+const Body = styled.div`
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(400px, 1fr));
+    padding: 24px;
+    row-gap: 24px;
+    column-gap: 24px;
+    overflow: auto;
+`;
+
+const CardSkeleton = styled(Card)`
+    && {
+        padding: 0px 12px 12px 0px;
+        height: 210px;
+        border-radius: 8px;
+        width: 100%;
+    }
+`;
+
+export const AcrylAssertionsSummaryTabLoading = () => {
+    return (
+        <Body>
+            <CardSkeleton loading />
+            <CardSkeleton loading />
+            <CardSkeleton loading />
+            <CardSkeleton loading />
+        </Body>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Tags/AcrylAssertionTagColumn.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Tags/AcrylAssertionTagColumn.tsx
new file mode 100644
index 00000000000000..5fe9f14e29561b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/Tags/AcrylAssertionTagColumn.tsx
@@ -0,0 +1,223 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { message } from 'antd';
+import Tag from '@src/app/sharedV2/tags/tag/Tag';
+import { REDESIGN_COLORS } from '@src/app/entityV2/shared/constants';
+import { Plus } from 'phosphor-react';
+import { useGetRecommendations } from '@src/app/shared/recommendation';
+import { handleBatchError } from '@src/app/entityV2/shared/utils';
+import { useBatchAddTagsMutation, useBatchRemoveTagsMutation } from '@src/graphql/mutations.generated';
+import { EntityType, Entity, TagAssociation, Tag as TagType } from '@src/types.generated';
+import { getColor } from '@src/alchemy-components/theme/utils';
+import { SelectItemPopover } from '@src/alchemy-components/components/SelectItemsPopover';
+import DataHubTooltip from '@src/alchemy-components/components/Tooltip/Tooltip';
+
+const StyledTagContainer = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-wrap: wrap;
+    cursor: pointer;
+    gap: 4px;
+`;
+
+const StyledPill = styled.div<{ color?: string; backgroundColor?: string }>`
+    display: flex;
+    gap: 4px;
+    align-items: center;
+    justify-content: center;
+    background-color: ${(props) => props.backgroundColor || 'none'};
+    height: 24px;
+    width: 24px;
+    color: ${(props) => props.color || '#5F6685'};
+    border-radius: 100px;
+    transition: all 0.2s;
+    &:hover {
+        color: black;
+        background-color: ${getColor('gray', 100)};
+    }
+`;
+
+const AdditionalPillCount = styled.div`
+    display: flex;
+    flex-wrap: wrap;
+    gap: 2px;
+    align-items: center;
+    font-size: 12px;
+    font-family: Mulish;
+    color: ${REDESIGN_COLORS.BODY_TEXT};
+`;
+
+const TooltipTitleWrapper = styled.div`
+    cursor: pointer;
+    padding: 8px 4px 0px;
+`;
+
+const TooltipMoreText = styled.div`
+    color: ${getColor('gray', 500)};
+    font-size: 12px;
+    margin-bottom: 4px;
+`;
+
+const MAX_TAGS_FOR_HOVER = 5;
+
+interface AcrylAssertionTagColumnProps {
+    record: any;
+    refetch?: () => void;
+}
+
+export const AcrylAssertionTagColumn: React.FC<AcrylAssertionTagColumnProps> = ({ record, refetch }) => {
+    const [popoverVisible, setPopoverVisible] = useState(false);
+
+    const { recommendedData: allGlobalTags } = useGetRecommendations([EntityType.Tag]);
+    // GraphQL mutations for adding/removing entities
+    const [batchAddTagsMutation] = useBatchAddTagsMutation();
+    const [batchRemoveTagsMutation] = useBatchRemoveTagsMutation();
+
+    const totalTagsLength = record?.tags?.length || 0;
+    // just take first tag if there are more than 1 tag
+    const displayTags = totalTagsLength >= 2 ? [record.tags[0]] : record.tags;
+    const remainingTagsCount = totalTagsLength - displayTags?.length || 0;
+
+    const selectedTags = record?.tags?.map((global) => global.tag) || [];
+
+    const tagsPreview = (
+        <>
+            {displayTags?.map((tag) => (
+                <Tag
+                    tag={tag}
+                    options={{
+                        shouldNotOpenDrawerOnClick: true,
+                        shouldNotAddBottomMargin: true,
+                        shouldShowEllipses: true,
+                    }}
+                    maxWidth={100}
+                />
+            ))}
+            {remainingTagsCount > 0 ? (
+                <DataHubTooltip
+                    overlayInnerStyle={{ backgroundColor: 'white' }}
+                    open={popoverVisible ? false : undefined}
+                    title={
+                        <TooltipTitleWrapper onClick={() => setPopoverVisible(true)}>
+                            {record?.tags?.slice(1, MAX_TAGS_FOR_HOVER).map((tag) => (
+                                <Tag
+                                    tag={{ tag: tag.tag } as TagAssociation}
+                                    options={{ shouldNotOpenDrawerOnClick: true }}
+                                    maxWidth={120}
+                                    tagStyle={{ marginBottom: 4 }}
+                                />
+                            ))}
+                            {(record?.tags?.length ?? 0) > MAX_TAGS_FOR_HOVER ? (
+                                <TooltipMoreText>+ {record.tags.length - MAX_TAGS_FOR_HOVER} more</TooltipMoreText>
+                            ) : null}
+                        </TooltipTitleWrapper>
+                    }
+                >
+                    <AdditionalPillCount>
+                        <Plus />
+                        <span>{remainingTagsCount}</span>
+                    </AdditionalPillCount>
+                </DataHubTooltip>
+            ) : (
+                <StyledPill>
+                    <Plus />
+                </StyledPill>
+            )}
+        </>
+    );
+
+    const addTag = (
+        <StyledPill>
+            <Plus />
+        </StyledPill>
+    );
+
+    const handleTagContainerClick = (e: React.MouseEvent) => {
+        e.stopPropagation();
+    };
+    const handleClosePopover = () => {
+        setPopoverVisible(false);
+    };
+
+    // Adds multiple entities to the resource
+    const batchAddTags = async (newTags: string[]) => {
+        try {
+            await batchAddTagsMutation({
+                variables: {
+                    input: {
+                        tagUrns: newTags,
+                        resources: [{ resourceUrn: record.urn }],
+                    },
+                },
+            });
+        } catch (e) {
+            message.error(handleBatchError(newTags, e, 'Failed to add entities.'));
+        }
+    };
+
+    // Removes multiple entities from the resource
+    const batchRemoveTags = async (removedTags: string[]) => {
+        try {
+            await batchRemoveTagsMutation({
+                variables: {
+                    input: {
+                        tagUrns: removedTags,
+                        resources: [{ resourceUrn: record.urn }],
+                    },
+                },
+            });
+        } catch (e) {
+            message.error(handleBatchError(removedTags, e, 'Failed to remove entities.'));
+        }
+    };
+
+    const handleSelectionChange = async ({ selectedItems, removedItems }) => {
+        if (selectedItems?.length || removedItems?.length) {
+            try {
+                // Add new entities
+                if (selectedItems?.length) {
+                    await batchAddTags(selectedItems as string[]);
+                }
+                // Remove unselected entities
+                if (removedItems?.length) {
+                    await batchRemoveTags(removedItems as string[]);
+                }
+
+                // Notify success and refresh UI
+                message.success('Tags Updated!', 2);
+                setPopoverVisible(false);
+                refetch?.();
+            } catch (e) {
+                console.log(e);
+            }
+        }
+    };
+
+    return (
+        <SelectItemPopover
+            key={`${popoverVisible}`}
+            entities={(allGlobalTags as Entity[]) || []}
+            selectedItems={selectedTags}
+            refetch={refetch}
+            onClose={handleClosePopover}
+            entityType={EntityType.Tag}
+            handleSelectionChange={handleSelectionChange}
+            visible={popoverVisible}
+            onVisibleChange={setPopoverVisible}
+            renderOption={(option) => {
+                return (
+                    <Tag
+                        tag={{ tag: option.item as TagType, associatedUrn: option.item?.urn }}
+                        options={{ shouldNotOpenDrawerOnClick: true }}
+                        maxWidth={120}
+                    />
+                );
+            }}
+        >
+            <StyledTagContainer onClick={handleTagContainerClick}>
+                {totalTagsLength > 0 ? tagsPreview : addTag}
+            </StyledTagContainer>
+        </SelectItemPopover>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/constant.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/constant.ts
new file mode 100644
index 00000000000000..c8992a5061f792
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/constant.ts
@@ -0,0 +1,43 @@
+import { AssertionSourceType } from '@src/types.generated';
+import { AssertionTable } from './types';
+
+export const ASSERTION_DEFAULT_FILTERS = {
+    sortBy: '',
+    groupBy: 'type',
+    filterCriteria: {
+        searchText: '',
+        status: [],
+        type: [],
+        tags: [],
+        column: [],
+        source: [],
+    },
+};
+
+export const ASSERTION_GROUP_BY_FILTER_OPTIONS = [
+    { label: 'Type', value: 'type' },
+    { label: 'Status', value: 'status' },
+];
+
+export const ASSERTION_SUMMARY_CARD_STATUSES = ['failing', 'passing', 'erroring'];
+
+export const NO_RUNNING_STATE = 'notRunning';
+
+export const ASSERTION_DEFAULT_RAW_DATA: AssertionTable = {
+    assertions: [],
+    groupBy: { type: [], status: [], column: [] },
+    filterOptions: {},
+    totalCount: 0,
+    filteredCount: 0,
+    searchMatchesCount: 0,
+};
+
+export const ASSERTION_SOURCES = [
+    AssertionSourceType.Native,
+    AssertionSourceType.Inferred,
+    AssertionSourceType.External,
+];
+
+export const ASSERTION_FILTER_TYPES = {
+    TAG: 'tags',
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/hooks.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/hooks.tsx
new file mode 100644
index 00000000000000..c539dde3892933
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/hooks.tsx
@@ -0,0 +1,167 @@
+import React, { Dispatch, SetStateAction, useEffect, useMemo, useRef, useState } from 'react';
+import { Typography } from 'antd';
+import styled from 'styled-components';
+import { REDESIGN_COLORS } from '@src/app/entityV2/shared/constants';
+import { getTimeFromNow } from '@src/app/shared/time/timeUtils';
+import { AssertionResultType, AssertionType } from '@src/types.generated';
+import { useHistory, useLocation } from 'react-router';
+import { AssertionName } from './AssertionName';
+import { getAssertionGroupName } from '../acrylUtils';
+import { ActionsColumn } from '../AcrylAssertionsTableColumns';
+import { AssertionListFilter } from './types';
+import { getQueryParams } from '../assertionUtils';
+import { AcrylAssertionTagColumn } from './Tags/AcrylAssertionTagColumn';
+
+const CategoryType = styled.div`
+    font-family: Mulish;
+    color: ${REDESIGN_COLORS.BODY_TEXT};
+    display: flex;
+    align-items: center;
+    white-space: nowrap;
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    font-size: 14px;
+`;
+
+const LastRun = styled(Typography.Text)`
+    font-family: Mulish;
+    color: ${REDESIGN_COLORS.BODY_TEXT};
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    max-width: 80px;
+    display: inline-block;
+`;
+
+const TABLE_HEADER_HEIGHT = 50;
+
+export const useAssertionsTableColumns = ({ groupBy, contract, refetch }) => {
+    return useMemo(() => {
+        const columns = [
+            {
+                title: 'Name',
+                dataIndex: 'name',
+                key: 'name',
+                render: (record) => <AssertionName record={record} groupBy={groupBy} contract={contract} />,
+                width: '42%',
+                sorter: (a, b) => {
+                    return a - b;
+                },
+            },
+            {
+                title: 'Category',
+                dataIndex: 'type',
+                key: 'type',
+                render: (record) =>
+                    !record.groupName && <CategoryType>{getAssertionGroupName(record?.type)}</CategoryType>,
+                width: '10%',
+            },
+            {
+                title: 'Last Run',
+                dataIndex: 'lastEvaluation',
+                key: 'lastEvaluation',
+                render: (record) => {
+                    return !record.groupName && <LastRun>{getTimeFromNow(record.lastEvaluationTimeMs)}</LastRun>;
+                },
+                width: '10%',
+                sorter: (sourceA, sourceB) => {
+                    return sourceA.lastEvaluationTimeMs - sourceB.lastEvaluationTimeMs;
+                },
+            },
+            {
+                title: 'Tags',
+                dataIndex: 'tags',
+                key: 'tags',
+                width: '20%',
+                render: (record) => !record.groupName && <AcrylAssertionTagColumn record={record} refetch={refetch} />,
+            },
+            {
+                title: '',
+                dataIndex: '',
+                key: 'actions',
+                width: '15%',
+                render: (record) => {
+                    return (
+                        !record.groupName && (
+                            <ActionsColumn
+                                assertion={record.assertion}
+                                contract={contract}
+                                canEditContract
+                                refetch={refetch}
+                                shouldRightAlign
+                                options={{ removeRightPadding: true }}
+                            />
+                        )
+                    );
+                },
+            },
+        ];
+
+        return columns;
+    }, [groupBy, contract, refetch]);
+};
+
+export const usePinnedAssertionTableHeaderProps = () => {
+    // Dynamic height calculation
+    const tableContainerRef = useRef<HTMLDivElement>(null);
+    const [scrollY, setScrollY] = useState<number>(0);
+
+    useEffect(() => {
+        const handleResize = () => {
+            if (tableContainerRef.current) {
+                const containerHeight = tableContainerRef.current.getBoundingClientRect().height;
+                setScrollY(containerHeight - TABLE_HEADER_HEIGHT);
+            }
+        };
+
+        handleResize();
+        window.addEventListener('resize', handleResize);
+
+        return () => {
+            window.removeEventListener('resize', handleResize);
+        };
+    }, []);
+
+    return { tableContainerRef, scrollY };
+};
+
+/** set filter as per the params we are getting from URL set assertion type and status as per the url */
+export const useSetFilterFromURLParams = (
+    filter: AssertionListFilter,
+    setFilters: Dispatch<SetStateAction<AssertionListFilter>>,
+) => {
+    const location = useLocation();
+    const history = useHistory();
+    const assertionType = getQueryParams('assertion_type', location);
+    const assertionStatus = getQueryParams('assertion_status', location);
+
+    useEffect(() => {
+        if (assertionType || assertionStatus) {
+            const decodedAssertionType = decodeURIComponent(assertionType || '');
+            const decodedAssertionStatus = decodeURIComponent(assertionStatus || '');
+
+            const updatedFilterCriteria = { ...filter.filterCriteria };
+            if (decodedAssertionType) {
+                updatedFilterCriteria.type = [decodedAssertionType as AssertionType];
+            }
+            if (decodedAssertionStatus) {
+                updatedFilterCriteria.status = [decodedAssertionStatus as AssertionResultType];
+            }
+
+            const newUrlParams = new URLSearchParams(location.search);
+            newUrlParams.delete('assertion_type');
+            newUrlParams.delete('assertion_status');
+            const newUrl = `${location.pathname}?${newUrlParams.toString()}`;
+
+            if (assertionType || assertionStatus) {
+                setFilters({ ...filter, filterCriteria: updatedFilterCriteria });
+            }
+
+            history.replace(newUrl);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [assertionType, assertionStatus, location, history]);
+
+    return { filter };
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types.ts
new file mode 100644
index 00000000000000..9dd9125558ab3b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types.ts
@@ -0,0 +1,109 @@
+import {
+    Assertion,
+    AssertionResultType,
+    AssertionRunEvent,
+    AssertionRunStatus,
+    AssertionSourceType,
+    AssertionType,
+    AuditStamp,
+    DataPlatform,
+    EntityType,
+    TagAssociation,
+} from '@src/types.generated';
+import { AssertionGroup } from '../acrylTypes';
+
+export type EntityStagedForAssertion = {
+    urn: string;
+    platform: DataPlatform;
+    entityType: EntityType;
+};
+
+export type AssertionBuilderSiblingOptions = {
+    title: string;
+    disabled?: boolean;
+} & Partial<EntityStagedForAssertion>;
+
+export type AssertionListFilter = {
+    sortBy: string;
+    groupBy: string;
+    filterCriteria: {
+        searchText: string;
+        status: AssertionResultType[];
+        type: AssertionType[];
+        tags: string[];
+        column: string[];
+        source: AssertionSourceType[];
+    };
+};
+
+export type AssertionListTableRow = {
+    type?: AssertionType | string;
+    lastUpdated?: AuditStamp;
+    tags: TagAssociation[];
+    descriptionHTML: JSX.Element | null;
+    description: string;
+    urn: string;
+    platform: DataPlatform;
+    lastEvaluation?: AssertionRunEvent;
+    lastEvaluationTimeMs?: number;
+    lastEvaluationResult?: AssertionResultType; // add type
+    lastEvaluationUrl?: string;
+    assertion: Assertion;
+    status: AssertionRunStatus; // status;
+    groupName?: string;
+    name?: string;
+};
+
+export type AssertionGroupExtended = Omit<AssertionGroup, 'assertions'> & {
+    assertions: AssertionListTableRow[];
+    groupName?: JSX.Element;
+};
+
+export type AssertionStatusGroup = {
+    name: string;
+    assertions: AssertionListTableRow[];
+    summary: { [key: string]: number };
+    groupName?: JSX.Element;
+};
+
+export type AssertionColumnGroup = {
+    name: string;
+    assertions: AssertionListTableRow[];
+    summary?: { [key: string]: number };
+};
+
+type AssertionGroupBy = {
+    type: any[];
+    status: AssertionStatusGroup[];
+    column: AssertionColumnGroup[];
+};
+
+export type AssertionTable = {
+    assertions: AssertionListTableRow[];
+    groupBy: AssertionGroupBy;
+    filterOptions?: any;
+    originalFilterOptions?: any;
+    filteredCount?: number;
+    searchMatchesCount?: number;
+    totalCount?: number;
+};
+
+export type AssertionFilterOptions = {
+    filterGroupOptions: {
+        type: AssertionType[];
+        status: AssertionResultType[];
+        column: string[];
+        tags: string[];
+        source: AssertionSourceType[];
+    };
+    recommendedFilters: AssertionRecommendedFilter[];
+};
+
+export type AssertionRecommendedFilter = {
+    name: string;
+    category: 'status' | 'type' | 'source';
+    count: number;
+    displayName: string;
+};
+
+export type AssertionWithDescription = Assertion & { description: string };
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/utils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/utils.tsx
new file mode 100644
index 00000000000000..ee993b25182962
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/utils.tsx
@@ -0,0 +1,496 @@
+import React from 'react';
+import Fuse from 'fuse.js';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import {
+    Assertion,
+    AssertionInfo,
+    AssertionResultType,
+    AssertionRunEvent,
+    AssertionRunStatus,
+    AssertionSourceType,
+    AssertionType,
+    AuditStamp,
+    TagAssociation,
+    EntityType,
+} from '@src/types.generated';
+import { AssertionGroup } from '@src/app/entity/shared/tabs/Dataset/Validations/acrylTypes';
+import { GenericEntityProperties } from '@src/app/entity/shared/types';
+import { getPlatformName } from '@src/app/entityV2/shared/utils';
+import { ASSERTION_INFO, createAssertionGroups, getAssertionGroupName, getAssertionType } from '../acrylUtils';
+import { isExternalAssertion } from '../assertion/profile/shared/isExternalAssertion';
+import { AssertionGroupHeader } from './AssertionGroupHeader';
+import {
+    AssertionStatusGroup,
+    AssertionTable,
+    AssertionListFilter,
+    AssertionListTableRow,
+    AssertionFilterOptions,
+    AssertionRecommendedFilter,
+    AssertionWithDescription,
+    AssertionColumnGroup,
+    AssertionBuilderSiblingOptions,
+} from './types';
+import { ASSERTION_DEFAULT_RAW_DATA, ASSERTION_SOURCES } from './constant';
+import { getPlainTextDescriptionFromAssertion } from '../assertion/profile/summary/utils';
+
+const ASSERTION_TYPE_NAME_MAP = {
+    VOLUME: 'Volume',
+    SQL: 'Sql',
+    FIELD: 'Column',
+    FRESHNESS: 'Freshness',
+    DATASET: 'Other',
+    DATA_SCHEMA: 'Schema',
+    Unknown: 'Unknown',
+};
+const NO_STATUS = 'NO_STATUS';
+
+const ASSERTION_STATUS_NAME_MAP = {
+    FAILURE: 'Failing',
+    SUCCESS: 'Passing',
+    ERROR: 'Error',
+    [NO_STATUS]: 'No Status',
+};
+
+const STATUS_GROUP_NAME_MAP = { ...ASSERTION_TYPE_NAME_MAP, ...ASSERTION_STATUS_NAME_MAP };
+
+const RECOMMENDED_FILTER_NAME_MAP = {
+    [AssertionSourceType.External]: 'External',
+    [AssertionSourceType.Native]: 'Native',
+    [AssertionSourceType.Inferred]: 'Smart Assertions',
+};
+
+// Create Group's Summary to name and number of records for each group
+const getGroupNameBySummary = (record) => {
+    const TextContainer = styled.div`
+        display: flex;
+        align-items: center;
+        justify-content: left;
+        font-size: 14px;
+    `;
+
+    const Title = styled(Typography.Text)`
+        && {
+            padding-bottom: 0px;
+            margin-bottom: 0px;
+        }
+    `;
+
+    const Message = styled(Typography.Text)`
+        && {
+            font-size: 12px;
+            margin-left: 8px;
+        }
+    `;
+
+    const newSummary = record.summary;
+    const list: string[] = [];
+    Object.keys(newSummary).forEach((key) => {
+        if (newSummary[key] > 0) {
+            list.push(`${newSummary[key]} ${STATUS_GROUP_NAME_MAP[key]}`);
+        }
+    });
+
+    return (
+        <TextContainer>
+            <Title strong>{STATUS_GROUP_NAME_MAP[record.name]}</Title>
+            <Message type="secondary">{list.join(', ')}</Message>
+        </TextContainer>
+    );
+};
+
+/**
+ * Gets sibling options that a user can author assertions with
+ * This includes direct links that will open the respective siblings' assertion builder UI
+ * @param entityData
+ * @param urn
+ * @param entityType
+ * @returns {AssertionBuilderSiblingOptions[]}
+ */
+export const useSiblingOptionsForAssertionBuilder = (
+    entityData: GenericEntityProperties | null,
+    urn: string,
+    entityType: EntityType,
+): AssertionBuilderSiblingOptions[] => {
+    const optionsToAuthorOn: AssertionBuilderSiblingOptions[] = [];
+    // push main entity data
+    optionsToAuthorOn.push({
+        title:
+            entityData?.platform?.properties?.displayName ??
+            entityData?.platform?.name ??
+            entityData?.dataPlatformInstance?.platform.name ??
+            entityData?.platform?.urn ??
+            urn,
+        disabled: true,
+        urn,
+        platform: entityData?.platform ?? entityData?.dataPlatformInstance?.platform,
+        entityType,
+    });
+    // push siblings data
+    const siblings: GenericEntityProperties[] = entityData?.siblingsSearch?.searchResults?.map((r) => r.entity) || [];
+    siblings.forEach((sibling) => {
+        if (sibling.urn === urn || !sibling.urn) {
+            return;
+        }
+        optionsToAuthorOn.push({
+            urn: sibling.urn,
+            title:
+                getPlatformName(sibling) ??
+                sibling?.dataPlatformInstance?.platform.name ??
+                sibling?.platform?.urn ??
+                sibling.urn,
+            disabled: true,
+            platform: sibling?.platform ?? sibling?.dataPlatformInstance?.platform,
+            entityType: sibling.type,
+        });
+    });
+    return optionsToAuthorOn;
+};
+
+// transform assertions into table data
+const mapAssertionData = (assertions: Assertion[]): AssertionListTableRow[] => {
+    return assertions.map((assertion: Assertion) => {
+        const mostRecentRun = assertion.runEvents?.runEvents?.[0];
+
+        const primaryPainTextLabel = getPlainTextDescriptionFromAssertion(assertion.info as AssertionInfo);
+        const isCompleted = mostRecentRun?.status === AssertionRunStatus.Complete;
+        const rowData: AssertionListTableRow = {
+            type: getAssertionType(assertion),
+            lastUpdated: assertion.info?.lastUpdated as AuditStamp,
+            tags: assertion.tags?.tags as TagAssociation[],
+            descriptionHTML: null,
+            description: primaryPainTextLabel,
+            urn: assertion.urn,
+            platform: assertion.platform,
+            lastEvaluation: (isCompleted && mostRecentRun) as AssertionRunEvent,
+            lastEvaluationTimeMs: mostRecentRun?.timestampMillis,
+            lastEvaluationResult: (isCompleted && mostRecentRun?.result?.type) as AssertionResultType,
+            lastEvaluationUrl: (isCompleted && mostRecentRun?.result?.externalUrl) || '',
+            assertion: assertion as Assertion,
+            status: mostRecentRun?.status as AssertionRunStatus,
+        };
+        return rowData;
+    });
+};
+
+const CORE_STATUSES = [AssertionResultType.Failure, AssertionResultType.Error, AssertionResultType.Success];
+
+// Generate Assertion Group By Status
+const generateAssertionGroupByStatus = (assertions: Assertion[]): AssertionStatusGroup[] => {
+    const assertionStatus = [...CORE_STATUSES, AssertionResultType.Init, NO_STATUS];
+
+    const assertionGroup: AssertionStatusGroup[] = [];
+
+    assertionStatus.forEach((status) => {
+        const filteredAssertions = assertions.filter((assertion) => {
+            const mostRecentRun = assertion.runEvents?.runEvents?.[0];
+            const resultType = mostRecentRun?.result?.type;
+            if (status === NO_STATUS) {
+                return assertion.info?.type && resultType === undefined;
+            }
+            return assertion.info?.type && resultType === status;
+        });
+
+        if (filteredAssertions.length > 0) {
+            const summary = {};
+            filteredAssertions.forEach((assertion) => {
+                const assertionType = getAssertionType(assertion) || 'Unknown';
+                summary[assertionType] = (summary[assertionType] || 0) + 1;
+            });
+            const group: AssertionStatusGroup = {
+                name: status,
+                assertions: mapAssertionData(filteredAssertions),
+                summary,
+            };
+            assertionGroup.push({ ...group, groupName: getGroupNameBySummary(group) });
+        }
+    });
+
+    return assertionGroup;
+};
+
+// get Assertion group by Display order
+export const getAssertionGroupsByDisplayOrder = (assertionGroups: AssertionGroup[]) => {
+    // Create a map of order from the display order
+    const orderMap = new Map(ASSERTION_INFO.map((item, index) => [item.type, index]));
+
+    // Sort the unordered list based on the orderMap
+    const orderedAssertionGroups = assertionGroups.sort(
+        (a, b) => (orderMap.get(a.type) ?? Infinity) - (orderMap.get(b.type) ?? Infinity),
+    );
+    return orderedAssertionGroups;
+};
+
+// Build the Filter Options as per the type & status
+const buildFilterOptions = (key: string, value: Record<string, number>, filterOptions: AssertionFilterOptions) => {
+    Object.entries(value).forEach(([name, count]) => {
+        let displayName = key === 'type' ? getAssertionGroupName(name) : STATUS_GROUP_NAME_MAP[name] || name;
+        if (key === 'source') {
+            displayName = RECOMMENDED_FILTER_NAME_MAP[name];
+        }
+        const filterItem = { name, category: key, count, displayName } as AssertionRecommendedFilter;
+
+        filterOptions.recommendedFilters.push(filterItem);
+        filterOptions.filterGroupOptions[key].push(filterItem);
+    });
+};
+
+// get columnId from Column/Field Assertion
+const getColumnIdFromAssertion = (assertion: Assertion): string | null => {
+    const info = assertion?.info;
+    const fieldAssertion = info?.fieldAssertion;
+    if (info?.type === AssertionType.Field) {
+        const field = (fieldAssertion?.fieldMetricAssertion || fieldAssertion?.fieldValuesAssertion)?.field;
+        return field?.path || null;
+    }
+    return null;
+};
+
+/** Create filter option list as per the assertion data present 
+ * for example
+ * status :[
+ * 
+  {
+    name: "SUCCESS",
+    category: 'status',
+    count:10,
+    displayName: "Passing"
+  }
+ * ]
+ * 
+ * 
+*/
+const extractFilterOptionListFromAssertions = (assertions: Assertion[]) => {
+    const filterOptions: AssertionFilterOptions = {
+        filterGroupOptions: {
+            type: [],
+            status: [],
+            column: [],
+            tags: [],
+            source: [],
+        },
+        recommendedFilters: [],
+    };
+
+    const filterGroupCounts = {
+        type: {} as Record<string, number>,
+        status: {} as Record<string, number>,
+        column: {} as Record<string, number>,
+        tags: {} as Record<string, number>,
+        source: {} as Record<string, number>,
+    };
+
+    // maintain array to show all the Assertion Type count even if it is not present
+    const remainingAssertionTypes = ASSERTION_INFO.map((item) => item.type);
+    const remainingAssertionStatus = [...CORE_STATUSES];
+    const remainingAssertionSources = [...ASSERTION_SOURCES];
+
+    assertions.forEach((assertion: Assertion) => {
+        // filter out tracked types
+        const type = (getAssertionType(assertion) || '') as AssertionType;
+        const index = remainingAssertionTypes.indexOf(type);
+        if (index > -1) {
+            remainingAssertionTypes.splice(index, 1);
+        }
+
+        filterGroupCounts.type[type] = (filterGroupCounts.type[type] || 0) + 1;
+
+        // filter out tracked statuses
+        const mostRecentRun = assertion.runEvents?.runEvents?.[0];
+        const resultType = mostRecentRun?.result?.type || '';
+        if (resultType) {
+            const statusIndex = remainingAssertionStatus.indexOf(resultType);
+            if (statusIndex > -1) {
+                remainingAssertionStatus.splice(statusIndex, 1);
+            }
+
+            filterGroupCounts.status[resultType] = (filterGroupCounts.status[resultType] || 0) + 1;
+        }
+
+        const tags = assertion.tags?.tags || [];
+        tags.forEach((tag) => {
+            const tagName = tag.tag.properties?.name || '';
+            filterGroupCounts.tags[tagName] = (filterGroupCounts.tags[tagName] || 0) + 1;
+        });
+
+        // count columnIds assertion
+        const columnId = getColumnIdFromAssertion(assertion);
+        if (columnId) {
+            filterGroupCounts.column[columnId] = (filterGroupCounts.column[columnId] || 0) + 1;
+        }
+
+        // count source type assertion
+        let sourceType = assertion.info?.source?.type as AssertionSourceType;
+        if (isExternalAssertion(assertion)) {
+            filterGroupCounts.source[AssertionSourceType.External] =
+                (filterGroupCounts.source[AssertionSourceType.External] || 0) + 1;
+            sourceType = AssertionSourceType.External;
+        } else {
+            filterGroupCounts.source[sourceType] = (filterGroupCounts.source[sourceType] || 0) + 1;
+        }
+        const sourceTypeIndex = remainingAssertionSources.indexOf(sourceType);
+        if (sourceTypeIndex > -1) {
+            remainingAssertionSources.splice(index, 1);
+        }
+    });
+
+    // Add remaining Assertion type with count 0
+    remainingAssertionTypes.forEach((assertionType: AssertionType) => {
+        filterGroupCounts.type[assertionType] = 0;
+    });
+
+    // Add remaining Assertion status with count 0
+    remainingAssertionStatus.forEach((status: AssertionResultType) => {
+        filterGroupCounts.status[status] = 0;
+    });
+
+    // Add remaining Assertion status with count 0
+    remainingAssertionSources.forEach((sourceType: AssertionSourceType) => {
+        filterGroupCounts.source[sourceType] = 0;
+    });
+
+    buildFilterOptions('status', filterGroupCounts.status, filterOptions);
+    buildFilterOptions('type', filterGroupCounts.type, filterOptions);
+    buildFilterOptions('column', filterGroupCounts.column, filterOptions);
+    buildFilterOptions('source', filterGroupCounts.source, filterOptions);
+    return filterOptions;
+};
+
+// create column id group from column assertions
+const groupColumnAssertions = (assertions: Assertion[]): AssertionColumnGroup[] => {
+    const columnIdGroups: AssertionColumnGroup[] = [];
+    const columnIdToAssertionMap = new Map<string, Assertion[]>();
+    assertions.forEach((assertion: Assertion) => {
+        const columnId = getColumnIdFromAssertion(assertion);
+        if (columnId) {
+            const columnAssertions = columnIdToAssertionMap.get(columnId) || [];
+            columnAssertions.push(assertion);
+            columnIdToAssertionMap.set(columnId, columnAssertions);
+        }
+    });
+
+    // transform columnIds group data into table render Row
+    columnIdToAssertionMap.forEach((columnAssertions: Assertion[], columnId: string) => {
+        const assertionColumnGroup: AssertionColumnGroup = {
+            name: columnId,
+            assertions: mapAssertionData(columnAssertions),
+        };
+        columnIdGroups.push(assertionColumnGroup);
+    });
+    return columnIdGroups;
+};
+
+// Assign Filtered Assertions to group
+const assignFilteredAssertionToGroup = (filteredAssertions: AssertionWithDescription[]): AssertionTable => {
+    const assertionRawData: AssertionTable = {
+        ...ASSERTION_DEFAULT_RAW_DATA,
+    };
+    assertionRawData.assertions = mapAssertionData(filteredAssertions);
+    const assertionsByType = createAssertionGroups(filteredAssertions);
+    assertionRawData.groupBy.type = getAssertionGroupsByDisplayOrder(assertionsByType);
+    // separate out column assertion list for filter
+    const columnTypeAssertions =
+        assertionRawData.groupBy.type?.find((item) => item.type === AssertionType.Field)?.assertions || [];
+
+    assertionRawData.groupBy.type?.forEach((item) => {
+        const transformedData = mapAssertionData(item.assertions);
+        // eslint-disable-next-line  no-param-reassign
+        item.assertions = transformedData;
+        // eslint-disable-next-line  no-param-reassign
+        item.groupName = <AssertionGroupHeader group={item} />;
+    });
+    assertionRawData.groupBy.status = generateAssertionGroupByStatus(filteredAssertions);
+    const columnsGroup = groupColumnAssertions(columnTypeAssertions);
+    assertionRawData.groupBy.column = columnsGroup;
+    assertionRawData.filterOptions = extractFilterOptionListFromAssertions(filteredAssertions);
+    return assertionRawData;
+};
+
+const getFilteredAssertions = (assertions: AssertionWithDescription[], filter: AssertionListFilter) => {
+    const { type, status, source, column } = filter.filterCriteria;
+
+    // Apply type, status, and other filters
+    return assertions.filter((assertion: Assertion) => {
+        const resultType = assertion.runEvents?.runEvents?.[0]?.result?.type as AssertionResultType;
+        const columnId = getColumnIdFromAssertion(assertion) || '';
+        const matchesType = type.length === 0 || type.includes(getAssertionType(assertion) as AssertionType);
+        const matchesStatus = status.length === 0 || status.includes(resultType);
+        const matchesColumn = column.length === 0 || column.includes(columnId);
+        const matchesOthers =
+            source.length === 0 ||
+            source.includes(assertion.info?.source?.type as AssertionSourceType) ||
+            (source.includes(AssertionSourceType.External) && isExternalAssertion(assertion));
+
+        return matchesType && matchesStatus && matchesOthers && matchesColumn;
+    });
+};
+
+// Fuse.js setup for search functionality
+const fuse = new Fuse<AssertionWithDescription>([], {
+    keys: ['description'],
+    threshold: 0.4,
+});
+
+/** Return return filter assertion as per selected type status and other things
+ * it returns transformated into
+ * 1. group of assertions as per type , status
+ * 2. Transform data into {@link AssertionListTableRow }  data
+ * 2. Filter out assertions as per the search text
+ * 3. filter out assertions as per the selected type and status
+ */
+export const getFilteredTransformedAssertionData = (
+    assertions: Assertion[],
+    filter: AssertionListFilter,
+): AssertionTable => {
+    // Add descriptions to assertions
+    const assertionsWithDescription = assertions.map((assertion) => {
+        const description = getPlainTextDescriptionFromAssertion(assertion.info as AssertionInfo);
+        return {
+            ...assertion,
+            description,
+        };
+    });
+
+    // Apply search filter if searchText is provided
+    let filteredAssertions = assertionsWithDescription;
+    const { searchText } = filter.filterCriteria;
+    let searchMatchesCount = 0;
+    if (searchText) {
+        fuse.setCollection(assertionsWithDescription || []);
+        const result = fuse.search(searchText);
+        filteredAssertions = result.map((match) => match.item as AssertionWithDescription);
+        searchMatchesCount = filteredAssertions.length;
+    }
+
+    // Apply type, status, and other filters
+    filteredAssertions = getFilteredAssertions(filteredAssertions, filter);
+
+    // Transform filtered assertions
+    const assertionRawData = assignFilteredAssertionToGroup(filteredAssertions);
+    assertionRawData.totalCount = assertions.length;
+    assertionRawData.searchMatchesCount = searchMatchesCount;
+    assertionRawData.filteredCount = getFilteredAssertions(assertionsWithDescription, filter).length;
+    assertionRawData.originalFilterOptions = extractFilterOptionListFromAssertions(assertions);
+    return assertionRawData;
+};
+
+/** Build the Assertion Redirect Search Param URL to help add with location pathname for redirection */
+export const buildAssertionUrlSearch = ({
+    type,
+    status,
+}: {
+    type?: AssertionType;
+    status?: AssertionResultType;
+}): string => {
+    const { search } = window.location;
+    const params = new URLSearchParams(search);
+
+    if (type) {
+        params.set('assertion_type', type);
+    }
+    if (status) {
+        params.set('assertion_status', status);
+    }
+
+    return params.toString() ? `?${params.toString()}` : '';
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionMenu.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionMenu.tsx
new file mode 100644
index 00000000000000..888f41d9d5847e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionMenu.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import { Menu } from 'antd';
+import CopyUrnMenuItem from '../../../../../shared/share/items/CopyUrnMenuItem';
+
+interface AssertionMenuProps {
+    urn: string;
+}
+
+export default function AssertionMenu({ urn }: AssertionMenuProps) {
+    return (
+        <Menu>
+            <CopyUrnMenuItem key="1" urn={urn} type="Assertion" />
+        </Menu>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionPlatformAvatar.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionPlatformAvatar.tsx
new file mode 100644
index 00000000000000..92bed8a5a1bd83
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionPlatformAvatar.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography, Image } from 'antd';
+import { Tooltip } from '@components';
+import { DataPlatform, EntityType } from '../../../../../../types.generated';
+import { LinkWrapper } from '../../../../../shared/LinkWrapper';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+
+const PlatformContainer = styled.div<{ noRightMargin?: boolean }>`
+    margin-right: ${(props) => (props.noRightMargin ? '0px' : '8px')};
+`;
+
+type Props = {
+    platform: DataPlatform;
+    externalUrl?: string;
+    noRightMargin?: boolean;
+};
+
+export const AssertionPlatformAvatar = ({ platform, externalUrl, noRightMargin }: Props) => {
+    const entityRegistry = useEntityRegistry();
+    return (
+        <Tooltip title={`Run by ${entityRegistry.getDisplayName(EntityType.DataPlatform, platform)}`}>
+            <PlatformContainer noRightMargin={noRightMargin}>
+                <LinkWrapper to={externalUrl} target="_blank" onClick={(e) => e.stopPropagation()}>
+                    {(platform.properties?.logoUrl && (
+                        <Image
+                            preview={false}
+                            height={24}
+                            width={24}
+                            src={platform.properties?.logoUrl}
+                            style={{ objectFit: 'fill', borderRadius: 12 }}
+                        />
+                    )) || (
+                        <Typography.Text>
+                            {entityRegistry.getDisplayName(EntityType.DataPlatform, platform)}
+                        </Typography.Text>
+                    )}
+                </LinkWrapper>
+            </PlatformContainer>
+        </Tooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionResultTimeline.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionResultTimeline.tsx
new file mode 100644
index 00000000000000..5197075d9764b0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionResultTimeline.tsx
@@ -0,0 +1,133 @@
+import React, { useMemo } from 'react';
+import { Popover } from '@components';
+import { Bar } from '@visx/shape';
+import { Group } from '@visx/group';
+import { AxisBottom } from '@visx/axis';
+import { scaleUtc } from '@visx/scale';
+import { Maybe } from 'graphql/jsutils/Maybe';
+import { ANTD_GRAY } from '../../../constants';
+import { LinkWrapper } from '../../../../../shared/LinkWrapper';
+import { AssertionResultType } from '../../../../../../types.generated';
+
+export type AssertionResult = {
+    type: AssertionResultType;
+    title: React.ReactNode;
+    content: React.ReactNode;
+    resultUrl?: Maybe<string>;
+};
+
+export type AssertionDataPoint = {
+    time: number;
+    result: AssertionResult;
+};
+
+export type TimeRange = {
+    startMs: number;
+    endMs: number;
+};
+
+type Props = {
+    data: Array<AssertionDataPoint>;
+    timeRange: TimeRange;
+    width: number;
+};
+
+const SUCCESS_COLOR_HEX = '#52C41A';
+const FAILURE_COLOR_HEX = '#F5222D';
+const ERROR_COLOR_HEX = '#FAAD14';
+const INIT_COLOR_HEX = '#8C8C8C';
+
+const getFillColor = (type: AssertionResultType) => {
+    switch (type) {
+        case AssertionResultType.Success:
+            return SUCCESS_COLOR_HEX;
+        case AssertionResultType.Failure:
+            return FAILURE_COLOR_HEX;
+        case AssertionResultType.Error:
+            return ERROR_COLOR_HEX;
+        case AssertionResultType.Init:
+            return INIT_COLOR_HEX;
+        default:
+            throw new Error(`Unsupported Assertion Result Type ${type} provided.`);
+    }
+};
+
+/**
+ * Assertion run results displayed on a horizontal timeline.
+ */
+export const AssertionResultTimeline = ({ data, timeRange, width }: Props) => {
+    const yMax = 60;
+    const left = 0;
+
+    const xScale = useMemo(
+        () =>
+            scaleUtc({
+                domain: [new Date(timeRange.startMs), new Date(timeRange.endMs + 600000)],
+                range: [0, width],
+            }),
+        [timeRange, width],
+    );
+
+    const transformedData = data.map((result, i) => {
+        return {
+            index: i,
+            title: result.result.title,
+            content: result.result.content,
+            type: result.result.type,
+            time: result.time,
+            url: result.result.resultUrl,
+        };
+    });
+
+    return (
+        <>
+            <svg width={width} height={88}>
+                <Group>
+                    {transformedData.map((d) => {
+                        const barWidth = 8;
+                        const barHeight = 18;
+                        const barX = xScale(new Date(d.time));
+                        const barY = yMax - barHeight;
+                        const fillColor = getFillColor(d.type);
+                        return (
+                            <LinkWrapper to={d.url} target="_blank">
+                                <Popover
+                                    key={d.time}
+                                    title={d.title}
+                                    overlayStyle={{
+                                        maxWidth: 440,
+                                        wordWrap: 'break-word',
+                                    }}
+                                    content={d.content}
+                                >
+                                    <Bar
+                                        key={`bar-${d.time}`}
+                                        x={barX}
+                                        y={barY}
+                                        stroke="white"
+                                        width={barWidth}
+                                        height={barHeight}
+                                        fill={fillColor}
+                                    />
+                                </Popover>
+                            </LinkWrapper>
+                        );
+                    })}
+                </Group>
+                <AxisBottom
+                    top={yMax}
+                    left={left}
+                    scale={xScale}
+                    numTicks={7}
+                    stroke={ANTD_GRAY[5]}
+                    tickFormat={(v: any) => v.toLocaleDateString('en-us', { month: 'short', day: 'numeric' })}
+                    tickLabelProps={(_) => ({
+                        fontSize: 11,
+                        angle: 0,
+                        textAnchor: 'middle',
+                    })}
+                />
+            </svg>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/Assertions.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/Assertions.tsx
new file mode 100644
index 00000000000000..3a3b15ec45cbd3
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/Assertions.tsx
@@ -0,0 +1,82 @@
+import React, { useState } from 'react';
+import { useGetDatasetAssertionsQuery } from '../../../../../../graphql/dataset.generated';
+import { Assertion, AssertionResultType } from '../../../../../../types.generated';
+import { useEntityData } from '../../../../../entity/shared/EntityContext';
+import { combineEntityDataWithSiblings } from '../../../../../entity/shared/siblingUtils';
+import { DatasetAssertionsList } from './DatasetAssertionsList';
+import { DatasetAssertionsSummary } from './DatasetAssertionsSummary';
+import { sortAssertions } from './assertionUtils';
+import { useIsSeparateSiblingsMode } from '../../../useIsSeparateSiblingsMode';
+
+/**
+ * Returns a status summary for the assertions associated with a Dataset.
+ */
+const getAssertionsStatusSummary = (assertions: Array<Assertion>) => {
+    const summary = {
+        failedRuns: 0,
+        succeededRuns: 0,
+        erroredRuns: 0,
+        totalRuns: 0,
+        totalAssertions: assertions.length,
+    };
+    assertions.forEach((assertion) => {
+        if ((assertion.runEvents?.runEvents?.length || 0) > 0) {
+            const mostRecentRun = assertion.runEvents?.runEvents?.[0];
+            const resultType = mostRecentRun?.result?.type;
+            if (AssertionResultType.Success === resultType) {
+                summary.succeededRuns++;
+            }
+            if (AssertionResultType.Failure === resultType) {
+                summary.failedRuns++;
+            }
+            if (AssertionResultType.Error === resultType) {
+                summary.erroredRuns++;
+            }
+            if (AssertionResultType.Init !== resultType) {
+                summary.totalRuns++; // only count assertions for which there is one completed run event, ignoring INIT statuses!
+            }
+        }
+    });
+    return summary;
+};
+
+/**
+ * Component used for rendering the Validations Tab on the Dataset Page.
+ *
+ * TODO: Note that only the legacy DATASET assertions are supported for viewing as of today.
+ */
+// CAN DELETE
+export const Assertions = () => {
+    const { urn, entityData } = useEntityData();
+    const { data, refetch } = useGetDatasetAssertionsQuery({ variables: { urn }, fetchPolicy: 'cache-first' });
+    const isHideSiblingMode = useIsSeparateSiblingsMode();
+
+    const combinedData = isHideSiblingMode ? data : combineEntityDataWithSiblings(data);
+    const [removedUrns, setRemovedUrns] = useState<string[]>([]);
+
+    const assertions =
+        (combinedData && combinedData.dataset?.assertions?.assertions?.map((assertion) => assertion as Assertion)) ||
+        [];
+    const filteredAssertions = assertions.filter(
+        (assertion) => !removedUrns.includes(assertion.urn) && !!assertion.info?.datasetAssertion,
+    );
+
+    // Pre-sort the list of assertions based on which has been most recently executed.
+    assertions.sort(sortAssertions);
+
+    return (
+        <>
+            <DatasetAssertionsSummary summary={getAssertionsStatusSummary(filteredAssertions)} />
+            {entityData && (
+                <DatasetAssertionsList
+                    assertions={filteredAssertions}
+                    onDelete={(assertionUrn) => {
+                        // Hack to deal with eventual consistency.
+                        setRemovedUrns([...removedUrns, assertionUrn]);
+                        setTimeout(() => refetch(), 3000);
+                    }}
+                />
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/BooleanTimeline.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/BooleanTimeline.tsx
new file mode 100644
index 00000000000000..4dd8a90121baa5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/BooleanTimeline.tsx
@@ -0,0 +1,110 @@
+import React, { useMemo } from 'react';
+import { Popover } from '@components';
+import { Bar } from '@visx/shape';
+import { Group } from '@visx/group';
+import { AxisBottom } from '@visx/axis';
+import { scaleUtc } from '@visx/scale';
+import { ANTD_GRAY } from '../../../constants';
+
+export type BooleanResult = {
+    isSuccess: boolean;
+    title: React.ReactNode;
+    content: React.ReactNode;
+    resultUrl?: string;
+};
+
+export type BooleanDataPoint = {
+    time: number;
+    result: BooleanResult;
+};
+
+export type TimeRange = {
+    startMs: number;
+    endMs: number;
+};
+
+type Props = {
+    data: Array<BooleanDataPoint>;
+    timeRange: TimeRange;
+    width: number;
+};
+
+const SUCCESS_COLOR_HEX = '#52C41A';
+const FAILURE_COLOR_HEX = '#F5222D';
+
+/**
+ * True / false results displayed on a horizontal timeline.
+ */
+export const BooleanTimeline = ({ data, timeRange, width }: Props) => {
+    const yMax = 60;
+    const left = 0;
+
+    const xScale = useMemo(
+        () =>
+            scaleUtc({
+                domain: [new Date(timeRange.startMs), new Date(timeRange.endMs + 600000)],
+                range: [0, width],
+            }),
+        [timeRange, width],
+    );
+
+    const transformedData = data.map((result, i) => {
+        return {
+            index: i,
+            title: result.result.title,
+            content: result.result.content,
+            isSuccess: result.result.isSuccess,
+            time: result.time,
+        };
+    });
+
+    return (
+        <>
+            <svg width={width} height={88}>
+                <Group>
+                    {transformedData.map((d) => {
+                        const barWidth = 8;
+                        const barHeight = 18;
+                        const barX = xScale(new Date(d.time));
+                        const barY = yMax - barHeight;
+                        const fillColor = d.isSuccess ? SUCCESS_COLOR_HEX : FAILURE_COLOR_HEX;
+                        return (
+                            <Popover
+                                key={d.time}
+                                title={d.title}
+                                overlayStyle={{
+                                    maxWidth: 440,
+                                    wordWrap: 'break-word',
+                                }}
+                                content={d.content}
+                            >
+                                <Bar
+                                    key={`bar-${d.time}`}
+                                    x={barX}
+                                    y={barY}
+                                    stroke="white"
+                                    width={barWidth}
+                                    height={barHeight}
+                                    fill={fillColor}
+                                />
+                            </Popover>
+                        );
+                    })}
+                </Group>
+                <AxisBottom
+                    top={yMax}
+                    left={left}
+                    scale={xScale}
+                    numTicks={7}
+                    stroke={ANTD_GRAY[5]}
+                    tickFormat={(v: any) => v.toLocaleDateString('en-us', { month: 'short', day: 'numeric' })}
+                    tickLabelProps={(_) => ({
+                        fontSize: 11,
+                        angle: 0,
+                        textAnchor: 'middle',
+                    })}
+                />
+            </svg>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx
new file mode 100644
index 00000000000000..7d9d95805d1aee
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx
@@ -0,0 +1,408 @@
+import { Typography, Button } from 'antd';
+import { Popover } from '@components';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import {
+    AssertionRunEvent,
+    AssertionStdAggregation,
+    AssertionStdOperator,
+    AssertionStdParameters,
+    DatasetAssertionInfo,
+    DatasetAssertionScope,
+    SchemaFieldRef,
+} from '../../../../../../types.generated';
+import { decodeSchemaField } from '../../../../../lineage/utils/columnLineageUtils';
+import { getFormattedParameterValue } from './assertionUtils';
+import { DatasetAssertionLogicModal } from './DatasetAssertionLogicModal';
+import { toReadableLocalDateTimeString } from './assertion/profile/shared/utils';
+
+const ViewLogicButton = styled(Button)`
+    padding: 0px;
+    margin: 0px;
+`;
+
+const AssertionDetailsContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 5px;
+`;
+
+const LastRunSection = styled.div`
+    display: flex;
+    gap: 5px;
+`;
+
+const TypographyContainer = styled.div`
+    word-wrap: break-word;
+`;
+
+const StyledLastRunText = styled(Typography.Text)`
+    font-size: 10px;
+    display: flex;
+    align-items: center;
+`;
+
+type Props = {
+    description?: string;
+    assertionInfo: DatasetAssertionInfo;
+    lastEvaluation?: AssertionRunEvent;
+};
+
+/**
+ * Returns the React Component to render for the aggregation portion of the Assertion Description
+ * for Assertions on Dataset Schemas.
+ *
+ * Schema assertions require an aggregation.
+ */
+const getSchemaAggregationText = (
+    aggregation: AssertionStdAggregation | undefined | null,
+    fields: Array<SchemaFieldRef> | undefined | null,
+) => {
+    switch (aggregation) {
+        case AssertionStdAggregation.ColumnCount:
+            return <Typography.Text>Dataset column count is</Typography.Text>;
+        case AssertionStdAggregation.Columns:
+            return <Typography.Text>Dataset columns are</Typography.Text>;
+        case AssertionStdAggregation.Native: {
+            const fieldNames = fields?.map((field) => decodeSchemaField(field.path)) || [];
+            return (
+                <Typography.Text>
+                    Dataset columns <Typography.Text strong>{JSON.stringify(fieldNames)}</Typography.Text> are
+                </Typography.Text>
+            );
+        }
+        default:
+            console.error(`Unsupported schema aggregation assertion ${aggregation} provided.`);
+            return <Typography.Text>Dataset columns are</Typography.Text>;
+    }
+};
+
+/**
+ * Returns the React Component to render for the aggregation portion of the Assertion Description
+ * for Assertions on Dataset Rows
+ *
+ * Row assertions require an aggregation.
+ */
+const getRowsAggregationText = (aggregation: AssertionStdAggregation | undefined | null) => {
+    switch (aggregation) {
+        case AssertionStdAggregation.RowCount:
+            return <Typography.Text>Dataset row count is</Typography.Text>;
+        case AssertionStdAggregation.Native:
+            return <Typography.Text>Dataset rows are</Typography.Text>;
+        default:
+            console.error(`Unsupported Dataset Rows Aggregation ${aggregation} provided`);
+            return <Typography.Text>Dataset rows are</Typography.Text>;
+    }
+};
+
+/**
+ * Returns the React Component to render for the aggregation portion of the Assertion Description
+ * for Assertions on Dataset Columns
+ */
+const getColumnAggregationText = (
+    aggregation: AssertionStdAggregation | undefined | null,
+    field: SchemaFieldRef | undefined,
+) => {
+    let columnText = decodeSchemaField(field?.path || '');
+    if (field === undefined) {
+        columnText = 'undefined';
+        console.error(`Invalid field provided for Dataset Assertion with scope Column ${JSON.stringify(field)}`);
+    }
+    switch (aggregation) {
+        // Hybrid Aggregations
+        case AssertionStdAggregation.UniqueCount: {
+            return (
+                <Typography.Text>
+                    Unique value count for column <Typography.Text strong>{columnText}</Typography.Text> is
+                </Typography.Text>
+            );
+        }
+        case AssertionStdAggregation.UniquePropotion: {
+            return (
+                <Typography.Text>
+                    Unique value proportion for column <Typography.Text strong>{columnText}</Typography.Text> is
+                </Typography.Text>
+            );
+        }
+        case AssertionStdAggregation.NullCount: {
+            return (
+                <Typography.Text>
+                    Null count for column <Typography.Text strong>{columnText}</Typography.Text> is
+                </Typography.Text>
+            );
+        }
+        case AssertionStdAggregation.NullProportion: {
+            return (
+                <Typography.Text>
+                    Null proportion for column <Typography.Text strong>{columnText}</Typography.Text> is
+                </Typography.Text>
+            );
+        }
+        // Numeric Aggregations
+        case AssertionStdAggregation.Min: {
+            return (
+                <Typography.Text>
+                    Minimum value for column <Typography.Text strong>{columnText}</Typography.Text> is
+                </Typography.Text>
+            );
+        }
+        case AssertionStdAggregation.Max: {
+            return (
+                <Typography.Text>
+                    Maximum value for column <Typography.Text strong>{columnText}</Typography.Text> is
+                </Typography.Text>
+            );
+        }
+        case AssertionStdAggregation.Mean: {
+            return (
+                <Typography.Text>
+                    Mean value for column <Typography.Text strong>{columnText}</Typography.Text> is
+                </Typography.Text>
+            );
+        }
+        case AssertionStdAggregation.Median: {
+            return (
+                <Typography.Text>
+                    Median value for column <Typography.Text strong>{columnText}</Typography.Text> is
+                </Typography.Text>
+            );
+        }
+        case AssertionStdAggregation.Stddev: {
+            return (
+                <Typography.Text>
+                    Standard deviation for column <Typography.Text strong>{columnText}</Typography.Text> is
+                </Typography.Text>
+            );
+        }
+        // Native Aggregations
+        case AssertionStdAggregation.Native: {
+            return (
+                <Typography.Text>
+                    Column <Typography.Text strong>{columnText}</Typography.Text> values are
+                </Typography.Text>
+            );
+        }
+        default:
+            // No aggregation on the column at hand. Treat the column as a set of values.
+            return (
+                <Typography.Text>
+                    Column <Typography.Text strong>{columnText}</Typography.Text> values are
+                </Typography.Text>
+            );
+    }
+};
+
+/**
+ * Returns the React Component to render for the aggregation portion of the Assertion Description
+ */
+const getAggregationText = (
+    scope: DatasetAssertionScope,
+    aggregation: AssertionStdAggregation | undefined | null,
+    fields: Array<SchemaFieldRef> | undefined | null,
+) => {
+    switch (scope) {
+        case DatasetAssertionScope.DatasetSchema:
+            return getSchemaAggregationText(aggregation, fields);
+        case DatasetAssertionScope.DatasetRows:
+            return getRowsAggregationText(aggregation);
+        case DatasetAssertionScope.DatasetColumn:
+            return getColumnAggregationText(aggregation, fields?.length === 1 ? fields[0] : undefined);
+        default:
+            console.error(`Unsupported Dataset Assertion scope ${scope} provided`);
+            return 'Dataset is';
+    }
+};
+
+/**
+ * Returns the React Component to render for the operator portion of the Assertion Description
+ */
+const getOperatorText = (
+    op: AssertionStdOperator,
+    parameters: AssertionStdParameters | undefined,
+    nativeType: string | undefined,
+) => {
+    switch (op) {
+        // Hybrid Operators
+        case AssertionStdOperator.Between: {
+            return (
+                <Typography.Text>
+                    between{' '}
+                    <Typography.Text strong>{getFormattedParameterValue(parameters?.minValue)} </Typography.Text>
+                    and <Typography.Text strong>{getFormattedParameterValue(parameters?.maxValue)}</Typography.Text>
+                </Typography.Text>
+            );
+        }
+        case AssertionStdOperator.EqualTo: {
+            const operatorText = 'equal to';
+            return (
+                <Typography.Text>
+                    {operatorText}{' '}
+                    <Typography.Text strong>{getFormattedParameterValue(parameters?.value)}</Typography.Text>
+                </Typography.Text>
+            );
+        }
+        case AssertionStdOperator.Contain: {
+            const operatorText = 'contains';
+            return (
+                <Typography.Text>
+                    {operatorText}{' '}
+                    <Typography.Text strong>{getFormattedParameterValue(parameters?.value)} </Typography.Text>
+                </Typography.Text>
+            );
+        }
+        case AssertionStdOperator.In: {
+            const operatorText = 'in';
+            return (
+                <Typography.Text>
+                    {operatorText}{' '}
+                    <Typography.Text strong>{getFormattedParameterValue(parameters?.value)} </Typography.Text>
+                </Typography.Text>
+            );
+        }
+        case AssertionStdOperator.NotNull: {
+            const operatorText = 'not null';
+            return <Typography.Text strong>{operatorText}</Typography.Text>;
+        }
+        // Numeric Operators
+        case AssertionStdOperator.GreaterThan: {
+            const operatorText = 'greater than';
+            return (
+                <Typography.Text>
+                    {operatorText}{' '}
+                    <Typography.Text strong>{getFormattedParameterValue(parameters?.value)} </Typography.Text>
+                </Typography.Text>
+            );
+        }
+        case AssertionStdOperator.GreaterThanOrEqualTo: {
+            const operatorText = 'greater than or equal to';
+            return (
+                <Typography.Text>
+                    {operatorText}{' '}
+                    <Typography.Text strong>{getFormattedParameterValue(parameters?.value)} </Typography.Text>
+                </Typography.Text>
+            );
+        }
+        case AssertionStdOperator.LessThan: {
+            const operatorText = 'less than';
+            return (
+                <Typography.Text>
+                    {operatorText}{' '}
+                    <Typography.Text strong>{getFormattedParameterValue(parameters?.value)} </Typography.Text>
+                </Typography.Text>
+            );
+        }
+        case AssertionStdOperator.LessThanOrEqualTo: {
+            const operatorText = 'less than or equal to';
+            return (
+                <Typography.Text>
+                    {operatorText}{' '}
+                    <Typography.Text strong>{getFormattedParameterValue(parameters?.value)} </Typography.Text>
+                </Typography.Text>
+            );
+        }
+        // String Operators
+        case AssertionStdOperator.StartWith: {
+            const operatorText = 'starts with';
+            return (
+                <Typography.Text>
+                    {operatorText}{' '}
+                    <Typography.Text strong>{getFormattedParameterValue(parameters?.value)}</Typography.Text>
+                </Typography.Text>
+            );
+        }
+        case AssertionStdOperator.EndWith: {
+            const operatorText = 'ends with';
+            return (
+                <Typography.Text>
+                    {operatorText}{' '}
+                    <Typography.Text strong>{getFormattedParameterValue(parameters?.value)} </Typography.Text>
+                </Typography.Text>
+            );
+        }
+        case AssertionStdOperator.Native: {
+            return (
+                <Typography.Text>
+                    passing assertion <Typography.Text strong>{nativeType}</Typography.Text>
+                </Typography.Text>
+            );
+        }
+        default:
+            return (
+                <Typography.Text>
+                    passing operator{' '}
+                    <Typography.Text strong>
+                        {op} with value ${getFormattedParameterValue(parameters?.value)}
+                    </Typography.Text>
+                </Typography.Text>
+            );
+    }
+};
+
+const TOOLTIP_MAX_WIDTH = 440;
+
+/**
+ * A human-readable description of an Assertion.
+ *
+ * For example, Column 'X' values are in [1, 2, 3]
+ */
+export const DatasetAssertionDescription = ({ description, assertionInfo, lastEvaluation }: Props) => {
+    const { scope, aggregation, fields, operator, parameters, nativeType, nativeParameters, logic } = assertionInfo;
+    const [isLogicVisible, setIsLogicVisible] = useState(false);
+    /**
+     * Build a description component from a) input (aggregation, inputs) b) the operator text
+     */
+    const descriptionFragment = (
+        <>
+            {description || (
+                <Typography.Text>
+                    {getAggregationText(scope, aggregation, fields)}{' '}
+                    {getOperatorText(operator, parameters || undefined, nativeType || undefined)}
+                </Typography.Text>
+            )}
+        </>
+    );
+
+    return (
+        <Popover
+            overlayStyle={{ maxWidth: TOOLTIP_MAX_WIDTH }}
+            title={<Typography.Text strong>Details</Typography.Text>}
+            content={
+                <>
+                    <AssertionDetailsContainer>
+                        {lastEvaluation?.lastObservedMillis && (
+                            <LastRunSection>
+                                <Typography.Text strong>Reported:</Typography.Text>
+                                <StyledLastRunText>
+                                    {lastEvaluation?.lastObservedMillis &&
+                                        toReadableLocalDateTimeString(lastEvaluation.lastObservedMillis)}
+                                </StyledLastRunText>
+                            </LastRunSection>
+                        )}
+                        <TypographyContainer>
+                            <Typography.Text strong>type</Typography.Text>: {nativeType || 'N/A'}
+                            {nativeParameters?.map((parameter) => (
+                                <div key={parameter.key}>
+                                    <Typography.Text strong>{parameter.key}</Typography.Text>: {parameter.value}
+                                </div>
+                            ))}
+                        </TypographyContainer>
+                    </AssertionDetailsContainer>
+                </>
+            }
+        >
+            <div>{descriptionFragment}</div>
+            {logic && (
+                <div>
+                    <ViewLogicButton onClick={() => setIsLogicVisible(true)} type="link">
+                        View Logic
+                    </ViewLogicButton>
+                </div>
+            )}
+            <DatasetAssertionLogicModal
+                logic={logic || 'N/A'}
+                visible={isLogicVisible}
+                onClose={() => setIsLogicVisible(false)}
+            />
+        </Popover>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx
new file mode 100644
index 00000000000000..7d91b670c78c50
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx
@@ -0,0 +1,259 @@
+import { Typography } from 'antd';
+import { Tooltip } from '@components';
+import { SelectValue } from 'antd/lib/select';
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components';
+import { ArrowRightOutlined } from '@ant-design/icons';
+import { useGetAssertionRunsLazyQuery } from '../../../../../../graphql/assertion.generated';
+import { AssertionResultType, AssertionRunStatus, EntityType } from '../../../../../../types.generated';
+import { formatNumber } from '../../../../../shared/formatNumber';
+import { getFixedLookbackWindow, getLocaleTimezone } from '../../../../../shared/time/timeUtils';
+import { ANTD_GRAY } from '../../../constants';
+import PrefixedSelect from '../Stats/historical/shared/PrefixedSelect';
+import { LOOKBACK_WINDOWS } from '../Stats/lookbackWindows';
+import { getResultColor, getResultErrorMessage, getResultIcon, getResultText } from './assertionUtils';
+import { DatasetAssertionResultDetails } from './DatasetAssertionResultDetails';
+import { LinkWrapper } from '../../../../../shared/LinkWrapper';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { BooleanDataPoint, BooleanTimeline } from './BooleanTimeline';
+
+const RESULT_CHART_WIDTH_PX = 800;
+
+const LastEvaluatedAtLabel = styled.div`
+    padding: 0;
+    margin: 0;
+    display: flex;
+    align-items: center;
+    color: ${ANTD_GRAY[7]};
+`;
+
+const AssertionResultIcon = styled.span`
+    margin-right: 8px;
+`;
+
+const AssertionResultDetailsContainer = styled.div`
+    margin-bottom: 4px;
+`;
+
+const AssertionResultErrorMessage = styled.div`
+    max-width: 250px;
+    margin-bottom: 4px;
+`;
+
+const AssertionResultInitializingMessage = styled.div`
+    max-width: 250px;
+    margin-bottom: 4px;
+`;
+
+const ContentContainer = styled.div`
+    width: 100%;
+    padding-left: 52px;
+`;
+
+const EvaluationsDetails = styled.div`
+    width: ${RESULT_CHART_WIDTH_PX}px;
+    padding-top: 12px;
+`;
+
+const EvaluationsHeader = styled.div`
+    display: flex;
+    justify-content: space-between;
+`;
+
+const EvaluationsSummary = styled.div`
+    width: 300px;
+    display: flex;
+    align-items: center;
+    justify-content: left;
+`;
+
+const EvaluationDateRange = styled(Typography.Text)`
+    margin-right: 20px;
+`;
+
+const SucceededEvaluationsCount = styled.span`
+    margin-right: 12px;
+`;
+
+const FailedEvaluationsCount = styled.span`
+    margin-right: 12px;
+`;
+
+type Props = {
+    urn: string;
+    lastEvaluatedAtMillis?: number | undefined;
+};
+
+export const DatasetAssertionDetails = ({ urn, lastEvaluatedAtMillis }: Props) => {
+    const [getAssertionRuns, { data }] = useGetAssertionRunsLazyQuery({ fetchPolicy: 'cache-first' });
+    const entityRegistry = useEntityRegistry();
+
+    /**
+     * Set default window for fetching assertion history.
+     */
+    const [lookbackWindow, setLookbackWindow] = useState(LOOKBACK_WINDOWS.WEEK);
+    useEffect(() => {
+        getAssertionRuns({
+            variables: { assertionUrn: urn, ...getFixedLookbackWindow(lookbackWindow.windowSize) },
+        });
+    }, [urn, lookbackWindow, getAssertionRuns]);
+
+    /**
+     * Invoked when user selects new lookback window (e.g. 1 year)
+     */
+    const onChangeLookbackWindow = (value: SelectValue) => {
+        const newLookbackWindow = Object.values(LOOKBACK_WINDOWS).filter((window) => window.text === value?.valueOf());
+        setLookbackWindow(newLookbackWindow[0]);
+    };
+    const selectedWindow = getFixedLookbackWindow(lookbackWindow.windowSize);
+    const selectedWindowTimeRange = {
+        startMs: selectedWindow.startTime,
+        endMs: selectedWindow.endTime,
+    };
+
+    const completeAssertionRunEvents =
+        data?.assertion?.runEvents?.runEvents.filter(
+            (runEvent) => runEvent.status === AssertionRunStatus.Complete && runEvent.result,
+        ) || [];
+
+    /**
+     * Last evaluated timestamp
+     */
+    const lastEvaluatedAt = lastEvaluatedAtMillis
+        ? new Date(lastEvaluatedAtMillis)
+        : completeAssertionRunEvents.length > 0 && new Date(completeAssertionRunEvents[0].timestampMillis);
+    const localeTimezone = getLocaleTimezone();
+    const lastEvaluatedTimeLocal =
+        (lastEvaluatedAt &&
+            `Last evaluated on ${lastEvaluatedAt.toLocaleDateString()} at ${lastEvaluatedAt.toLocaleTimeString()} (${localeTimezone})`) ||
+        'No evaluations found';
+    const lastEvaluatedTimeGMT = lastEvaluatedAt && lastEvaluatedAt.toUTCString();
+
+    /**
+     * Start and end date bounds for Chart
+     */
+    const startDate = new Date(selectedWindowTimeRange.startMs).toLocaleDateString('en-us', {
+        month: 'short',
+        day: 'numeric',
+    });
+    const endDate = new Date(selectedWindowTimeRange.endMs).toLocaleDateString('en-us', {
+        month: 'short',
+        day: 'numeric',
+    });
+
+    /**
+     * Success / Failure summary
+     */
+    const succeededCount = data?.assertion?.runEvents?.succeeded;
+    const failedCount = data?.assertion?.runEvents?.failed;
+
+    /**
+     * Data for the chart of assertion results.
+     */
+    const assertionResultsChartData: BooleanDataPoint[] =
+        completeAssertionRunEvents.map((runEvent) => {
+            const { result } = runEvent;
+
+            if (!result) throw new Error('Completed assertion run event does not have a result.');
+
+            const resultTime = new Date(runEvent.timestampMillis);
+            const localTime = resultTime.toLocaleString();
+            const gmtTime = resultTime.toUTCString();
+            const resultUrl: string | undefined = result.externalUrl?.valueOf();
+            const isInitializing = result.type === AssertionResultType.Init;
+            const errorMessage = getResultErrorMessage(result);
+            const platformName = data?.assertion?.platform
+                ? entityRegistry.getDisplayName(EntityType.DataPlatform, data?.assertion?.platform)
+                : undefined;
+
+            /**
+             * Create a "result" to render in the timeline chart.
+             */
+            return {
+                time: runEvent.timestampMillis,
+                result: {
+                    type: result.type,
+                    isSuccess: result.type === AssertionResultType.Success,
+                    resultUrl,
+                    title: (
+                        <>
+                            <AssertionResultIcon>{getResultIcon(result.type)}</AssertionResultIcon>
+                            <Typography.Text strong>{getResultText(result.type)}</Typography.Text>
+                        </>
+                    ),
+                    content: (
+                        <>
+                            <AssertionResultDetailsContainer>
+                                <DatasetAssertionResultDetails result={result} />
+                            </AssertionResultDetailsContainer>
+                            {isInitializing && (
+                                <AssertionResultInitializingMessage>
+                                    Collecting the information required to evaluate this assertion.
+                                </AssertionResultInitializingMessage>
+                            )}
+                            {errorMessage && <AssertionResultErrorMessage>{errorMessage}</AssertionResultErrorMessage>}
+                            <div>
+                                <Tooltip title={`${gmtTime}`}>
+                                    <Typography.Text type="secondary">{localTime}</Typography.Text>
+                                </Tooltip>
+                            </div>
+                            {resultUrl && (
+                                <LinkWrapper to={resultUrl} target="_blank">
+                                    {platformName ? `View in ${platformName}` : 'View results'} <ArrowRightOutlined />
+                                </LinkWrapper>
+                            )}
+                        </>
+                    ),
+                },
+            };
+        }) || [];
+
+    return (
+        <ContentContainer>
+            <div>
+                <Typography.Title level={5}>Evaluations</Typography.Title>
+                <Tooltip placement="topLeft" title={lastEvaluatedTimeGMT}>
+                    <LastEvaluatedAtLabel>{lastEvaluatedTimeLocal}</LastEvaluatedAtLabel>
+                </Tooltip>
+                <EvaluationsDetails>
+                    <EvaluationsHeader>
+                        <EvaluationsSummary>
+                            <EvaluationDateRange strong>
+                                {startDate} - {endDate}
+                            </EvaluationDateRange>
+                            <div>
+                                <SucceededEvaluationsCount>
+                                    <Typography.Text
+                                        style={{ color: getResultColor(AssertionResultType.Success), fontWeight: 600 }}
+                                    >
+                                        {formatNumber(succeededCount)}
+                                    </Typography.Text>{' '}
+                                    passed
+                                </SucceededEvaluationsCount>
+                                <FailedEvaluationsCount>
+                                    <Typography.Text
+                                        style={{ color: getResultColor(AssertionResultType.Failure), fontWeight: 600 }}
+                                    >
+                                        {formatNumber(failedCount)}
+                                    </Typography.Text>{' '}
+                                    failed
+                                </FailedEvaluationsCount>
+                            </div>
+                        </EvaluationsSummary>
+                        <PrefixedSelect
+                            prefixText="Show "
+                            values={Object.values(LOOKBACK_WINDOWS).map((window) => window.text)}
+                            value={lookbackWindow.text}
+                            setValue={onChangeLookbackWindow}
+                        />
+                    </EvaluationsHeader>
+                    <BooleanTimeline
+                        width={RESULT_CHART_WIDTH_PX}
+                        data={assertionResultsChartData}
+                        timeRange={selectedWindowTimeRange}
+                    />
+                </EvaluationsDetails>
+            </div>
+        </ContentContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx
new file mode 100644
index 00000000000000..549a10ecd24cde
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx
@@ -0,0 +1,24 @@
+import { Modal, Button } from 'antd';
+import React from 'react';
+import Query from '../Queries/Query';
+
+export type AssertionsSummary = {
+    totalAssertions: number;
+    totalRuns: number;
+    failedRuns: number;
+    succeededRuns: number;
+};
+
+type Props = {
+    logic: string;
+    visible: boolean;
+    onClose: () => void;
+};
+
+export const DatasetAssertionLogicModal = ({ logic, visible, onClose }: Props) => {
+    return (
+        <Modal visible={visible} onCancel={onClose} footer={<Button onClick={onClose}>Close</Button>}>
+            <Query query={logic} />
+        </Modal>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails.tsx
new file mode 100644
index 00000000000000..424c89994df5a6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails.tsx
@@ -0,0 +1,42 @@
+import { Typography } from 'antd';
+import React from 'react';
+import { AssertionResult } from '../../../../../../types.generated';
+
+type Props = {
+    result: AssertionResult;
+};
+
+export const DatasetAssertionResultDetails = ({ result }: Props) => {
+    const maybeActualValue = result.actualAggValue;
+    const maybeUnexpectedCount = result.unexpectedCount;
+    const maybeRowCount = result.rowCount;
+    const maybeNativeResults = result.nativeResults;
+    return (
+        <>
+            {maybeActualValue !== null && maybeActualValue !== undefined && (
+                <div>
+                    <Typography.Text strong>Actual</Typography.Text>: {maybeActualValue}
+                </div>
+            )}
+            {maybeUnexpectedCount !== null && maybeUnexpectedCount !== undefined && (
+                <div>
+                    <Typography.Text strong>Invalid Count</Typography.Text>: {maybeUnexpectedCount}
+                </div>
+            )}
+            {maybeRowCount !== null && maybeRowCount !== undefined && (
+                <div>
+                    <Typography.Text strong>Row Count</Typography.Text>: {maybeRowCount}
+                </div>
+            )}
+            {maybeNativeResults && (
+                <div>
+                    {maybeNativeResults.map((entry) => (
+                        <div>
+                            <Typography.Text strong>{entry.key}</Typography.Text>: {entry.value}
+                        </div>
+                    ))}
+                </div>
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx
new file mode 100644
index 00000000000000..a67ad227ea1254
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx
@@ -0,0 +1,191 @@
+import { Button, Dropdown, Empty, Image, message, Modal, Tag, Typography } from 'antd';
+import { Tooltip } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import { DeleteOutlined, DownOutlined, MoreOutlined, RightOutlined, StopOutlined } from '@ant-design/icons';
+import { DatasetAssertionDescription } from './DatasetAssertionDescription';
+import { StyledTable } from '../../../components/styled/StyledTable';
+import { DatasetAssertionDetails } from './DatasetAssertionDetails';
+import { Assertion, AssertionRunStatus } from '../../../../../../types.generated';
+import { getResultColor, getResultIcon, getResultText } from './assertionUtils';
+import { useDeleteAssertionMutation } from '../../../../../../graphql/assertion.generated';
+import { capitalizeFirstLetterOnly } from '../../../../../shared/textUtil';
+import AssertionMenu from './AssertionMenu';
+
+const ResultContainer = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: left;
+`;
+
+const ResultTypeText = styled(Typography.Text)`
+    margin-left: 8px;
+`;
+
+const ActionButtonContainer = styled.div`
+    display: flex;
+    justify-content: right;
+    align-items: center;
+`;
+
+const PlatformContainer = styled.div`
+    margin-right: 8px;
+`;
+
+const StyledMoreOutlined = styled(MoreOutlined)`
+    font-size: 18px;
+`;
+
+type Props = {
+    assertions: Array<Assertion>;
+    onDelete?: (urn: string) => void;
+};
+
+/**
+ * A list of assertions displaying their most recent run status, their human-readable
+ * description, and platform.
+ *
+ * Currently this component supports rendering Dataset Assertions only.
+ */
+export const DatasetAssertionsList = ({ assertions, onDelete }: Props) => {
+    const [deleteAssertionMutation] = useDeleteAssertionMutation();
+
+    const deleteAssertion = async (urn: string) => {
+        try {
+            await deleteAssertionMutation({
+                variables: { urn },
+            });
+            message.success({ content: 'Removed assertion.', duration: 2 });
+        } catch (e: unknown) {
+            message.destroy();
+            if (e instanceof Error) {
+                message.error({ content: `Failed to remove assertion: \n ${e.message || ''}`, duration: 3 });
+            }
+        }
+        onDelete?.(urn);
+    };
+
+    const onDeleteAssertion = (urn: string) => {
+        Modal.confirm({
+            title: `Confirm Assertion Removal`,
+            content: `Are you sure you want to remove this assertion from the dataset?`,
+            onOk() {
+                deleteAssertion(urn);
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
+    const assertionsTableData = assertions.map((assertion) => ({
+        urn: assertion.urn,
+        type: assertion.info?.type,
+        platform: assertion.platform,
+        datasetAssertionInfo: assertion.info?.datasetAssertion,
+        description: assertion.info?.description,
+        lastExecTime: assertion.runEvents?.runEvents?.length && assertion.runEvents.runEvents[0].timestampMillis,
+        lastExecResult:
+            assertion.runEvents?.runEvents?.length &&
+            assertion.runEvents.runEvents[0].status === AssertionRunStatus.Complete &&
+            assertion.runEvents.runEvents[0].result?.type,
+    }));
+
+    const assertionsTableCols = [
+        {
+            title: '',
+            dataIndex: '',
+            key: '',
+            render: (_, record: any) => {
+                const executionDate = record.lastExecTime && new Date(record.lastExecTime);
+                const localTime = executionDate && `${executionDate.toLocaleDateString()}`;
+                const resultColor = (record.lastExecResult && getResultColor(record.lastExecResult)) || 'default';
+                const resultText = (record.lastExecResult && getResultText(record.lastExecResult)) || 'No Evaluations';
+                const resultIcon = (record.lastExecResult && getResultIcon(record.lastExecResult)) || <StopOutlined />;
+                const { description } = record;
+                return (
+                    <ResultContainer>
+                        <div>
+                            <Tooltip title={(localTime && `Last evaluated on ${localTime}`) || 'No Evaluations'}>
+                                <Tag style={{ borderColor: resultColor }}>
+                                    {resultIcon}
+                                    <ResultTypeText style={{ color: resultColor }}>{resultText}</ResultTypeText>
+                                </Tag>
+                            </Tooltip>
+                        </div>
+                        <DatasetAssertionDescription
+                            description={description}
+                            assertionInfo={record.datasetAssertionInfo}
+                            lastEvaluation={record.lastEvaluation}
+                        />
+                    </ResultContainer>
+                );
+            },
+        },
+        {
+            title: '',
+            dataIndex: '',
+            key: '',
+            render: (_, record: any) => (
+                <ActionButtonContainer>
+                    <Tooltip
+                        title={
+                            record.platform.properties?.displayName || capitalizeFirstLetterOnly(record.platform.name)
+                        }
+                    >
+                        <PlatformContainer>
+                            {(record.platform.properties?.logoUrl && (
+                                <Image
+                                    preview={false}
+                                    height={20}
+                                    width={20}
+                                    src={record.platform.properties?.logoUrl}
+                                />
+                            )) || (
+                                <Typography.Text>
+                                    {record.platform.properties?.displayName ||
+                                        capitalizeFirstLetterOnly(record.platform.name)}
+                                </Typography.Text>
+                            )}
+                        </PlatformContainer>
+                    </Tooltip>
+                    <Button onClick={() => onDeleteAssertion(record.urn)} type="text" shape="circle" danger>
+                        <DeleteOutlined />
+                    </Button>
+                    <Dropdown overlay={<AssertionMenu urn={record.urn} />} trigger={['click']}>
+                        <StyledMoreOutlined />
+                    </Dropdown>
+                </ActionButtonContainer>
+            ),
+        },
+    ];
+
+    return (
+        <>
+            <StyledTable
+                columns={assertionsTableCols}
+                dataSource={assertionsTableData}
+                rowKey="urn"
+                locale={{
+                    emptyText: <Empty description="No Assertions Found :(" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
+                }}
+                expandable={{
+                    defaultExpandAllRows: false,
+                    expandRowByClick: true,
+                    expandedRowRender: (record) => {
+                        return <DatasetAssertionDetails urn={record.urn} lastEvaluatedAtMillis={record.lastExecTime} />;
+                    },
+                    expandIcon: ({ expanded, onExpand, record }: any) =>
+                        expanded ? (
+                            <DownOutlined style={{ fontSize: 8 }} onClick={(e) => onExpand(record, e)} />
+                        ) : (
+                            <RightOutlined style={{ fontSize: 8 }} onClick={(e) => onExpand(record, e)} />
+                        ),
+                }}
+                showHeader={false}
+                pagination={false}
+            />
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsSummary.tsx
new file mode 100644
index 00000000000000..3aef7bfbd66bab
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsSummary.tsx
@@ -0,0 +1,105 @@
+import { CheckCircleFilled, CloseCircleFilled, ExclamationCircleFilled, StopOutlined } from '@ant-design/icons';
+import { Typography } from 'antd';
+import { Tooltip } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../constants';
+
+const SummaryHeader = styled.div`
+    width: 100%;
+    padding-left: 40px;
+    padding-top: 20px;
+    padding-bottom: 20px;
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
+`;
+
+const SummaryContainer = styled.div``;
+
+const SummaryMessage = styled.div`
+    display: inline-block;
+    margin-left: 20px;
+`;
+
+const SummaryTitle = styled(Typography.Title)`
+    && {
+        padding-bottom: 0px;
+        margin-bottom: 0px;
+    }
+`;
+
+export type AssertionsSummary = {
+    totalAssertions: number;
+    totalRuns: number;
+    failedRuns: number;
+    succeededRuns: number;
+    erroredRuns: number;
+};
+
+type Props = {
+    summary: AssertionsSummary;
+};
+
+const SUCCESS_COLOR_HEX = '#52C41A';
+const FAILURE_COLOR_HEX = '#F5222D';
+const ERROR_COLOR_HEX = '#FAAD14';
+
+const getSummaryIcon = (summary: AssertionsSummary) => {
+    if (summary.totalRuns === 0) {
+        return <StopOutlined style={{ color: ANTD_GRAY[6], fontSize: 28 }} />;
+    }
+    if (summary.succeededRuns === summary.totalRuns) {
+        return <CheckCircleFilled style={{ color: SUCCESS_COLOR_HEX, fontSize: 28 }} />;
+    }
+    if (summary.erroredRuns > 0) {
+        return <ExclamationCircleFilled style={{ color: ERROR_COLOR_HEX, fontSize: 28 }} />;
+    }
+    return <CloseCircleFilled style={{ color: FAILURE_COLOR_HEX, fontSize: 28 }} />;
+};
+
+const getSummaryMessage = (summary: AssertionsSummary) => {
+    if (summary.totalRuns === 0) {
+        return 'No assertions have run';
+    }
+    if (summary.succeededRuns === summary.totalRuns) {
+        return 'All assertions are passing';
+    }
+    if (summary.erroredRuns > 0) {
+        return 'An error is preventing some assertions from running';
+    }
+    if (summary.failedRuns === summary.totalRuns) {
+        return 'All assertions are failing';
+    }
+    return 'Some assertions are failing';
+};
+
+export const DatasetAssertionsSummary = ({ summary }: Props) => {
+    const summaryIcon = getSummaryIcon(summary);
+    const summaryMessage = getSummaryMessage(summary);
+    const errorMessage = summary.erroredRuns
+        ? `, ${summary.erroredRuns} error${summary.erroredRuns > 1 ? 's' : ''}`
+        : '';
+    const inactiveAssertionsCount = summary.totalAssertions - summary.totalRuns;
+    const inactiveAssertionsMessage = inactiveAssertionsCount ? `, ${inactiveAssertionsCount} inactive.` : '.';
+    const subtitleMessage = `${summary.succeededRuns} successful assertions, ${summary.failedRuns} failed assertions`;
+    return (
+        <SummaryHeader>
+            <SummaryContainer>
+                <Tooltip title="This status is based on the most recent result of each assertion.">
+                    <div style={{ display: 'flex', alignItems: 'center' }}>
+                        {summaryIcon}
+                        <SummaryMessage>
+                            <SummaryTitle level={5}>{summaryMessage}</SummaryTitle>
+                            <Typography.Text type="secondary">
+                                {subtitleMessage}
+                                {errorMessage}
+                                {inactiveAssertionsMessage}
+                            </Typography.Text>
+                        </SummaryMessage>
+                    </div>
+                </Tooltip>
+            </SummaryContainer>
+        </SummaryHeader>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FieldAssertionDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FieldAssertionDescription.tsx
new file mode 100644
index 00000000000000..3e5eec4d5d3122
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FieldAssertionDescription.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import { Typography } from 'antd';
+import styled from 'styled-components';
+import { Maybe } from 'graphql/jsutils/Maybe';
+import { FieldAssertionInfo } from '../../../../../../types.generated';
+import {
+    getFieldDescription,
+    getFieldOperatorDescription,
+    getFieldParametersDescription,
+    getFieldTransformDescription,
+} from './fieldDescriptionUtils';
+import { REDESIGN_COLORS } from '../../../constants';
+
+type Props = {
+    assertionInfo: FieldAssertionInfo;
+    showColumnTag?: boolean;
+    // use below description which is present in assertion info object to decide whether to show description or generate dynamic one
+    assertionDescription?: Maybe<string>;
+};
+
+const StyledDescrptionContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+`;
+const StyledColumnTag = styled.div`
+    align-items: center;
+    background-color: ${REDESIGN_COLORS.COLD_GREY_TEXT_BLUE_1};
+    width: fit-content;
+    border-radius: 12px;
+    height: 24px;
+    display: flex;
+    text-align: center;
+    justify-content: center;
+    padding: 0px 8px;
+`;
+
+/**
+ * A human-readable description of a Field Assertion.
+ * @param showColumnTag decide whether to show column tag or not
+ * e.g.
+ * consider user selected field -> profileId, operator -> greater than, parameters-> 5
+ * if @param showColumnTag is true then description will be -> column values are greater than 5
+ * if @param showColumnTag is false then description will be -> profileId is greater than 5
+ */
+export const FieldAssertionDescription = ({ assertionInfo, showColumnTag, assertionDescription }: Props) => {
+    const field = getFieldDescription(assertionInfo);
+    const transform = getFieldTransformDescription(assertionInfo);
+    // Do not pluralize if this is a metric assertion since you're checking one metric, not multiple values
+    const operator = getFieldOperatorDescription({ assertionInfo, isPlural: showColumnTag && !transform });
+    const parameters = getFieldParametersDescription(assertionInfo);
+    let descriptionContent = <>{assertionDescription}</>;
+
+    if (!assertionDescription) {
+        descriptionContent = (
+            <>
+                {transform}
+                {transform ? ' of ' : ''}
+                {showColumnTag ? (
+                    (transform && 'column') || 'Values'
+                ) : (
+                    <Typography.Text style={{ fontWeight: 'bold' }}>{field}</Typography.Text>
+                )}{' '}
+                {operator} {parameters}
+            </>
+        );
+    }
+
+    return (
+        <StyledDescrptionContainer>
+            <Typography.Text>{descriptionContent}</Typography.Text>
+            {showColumnTag && <StyledColumnTag>{field}</StyledColumnTag>}
+        </StyledDescrptionContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FreshnessAssertionDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FreshnessAssertionDescription.tsx
new file mode 100644
index 00000000000000..29d18f46183a53
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FreshnessAssertionDescription.tsx
@@ -0,0 +1,78 @@
+import { Typography } from 'antd';
+import React from 'react';
+import cronstrue from 'cronstrue';
+import { Maybe } from 'graphql/jsutils/Maybe';
+import {
+    CronSchedule,
+    FixedIntervalSchedule,
+    FreshnessAssertionInfo,
+    FreshnessAssertionScheduleType,
+    FreshnessAssertionType,
+} from '../../../../../../types.generated';
+
+type Props = {
+    assertionInfo: FreshnessAssertionInfo;
+    monitorSchedule?: Maybe<CronSchedule>;
+};
+
+export const getCronAsLabel = (cronSchedule: CronSchedule) => {
+    const { cron, timezone } = cronSchedule;
+    if (!cron) {
+        return '';
+    }
+    return `${cronstrue.toString(cron).toLocaleLowerCase().replace('at', '')} (${timezone})`;
+};
+export const createCronText = (cronSchedule: CronSchedule) => {
+    return `between cron windows scheduled at ${getCronAsLabel(cronSchedule)}`;
+};
+
+export const createFixedIntervalText = (
+    fixedIntervalSchedule?: FixedIntervalSchedule | null,
+    monitorSchedule?: Maybe<CronSchedule>,
+) => {
+    if (!fixedIntervalSchedule) {
+        return 'No interval found!';
+    }
+    const { multiple, unit } = fixedIntervalSchedule;
+    const cronText = monitorSchedule ? `, as of ${getCronAsLabel(monitorSchedule)}` : '';
+    return `in the past ${multiple} ${unit.toLocaleLowerCase()}s${cronText}`;
+};
+
+export const createSinceTheLastCheckText = (monitorSchedule?: Maybe<CronSchedule>) => {
+    const cronText = monitorSchedule ? `, as of ${getCronAsLabel(monitorSchedule)}` : '';
+    return `since the previous check${cronText}.`;
+};
+
+/**
+ * A human-readable description of an Freshness Assertion.
+ */
+export const FreshnessAssertionDescription = ({ assertionInfo, monitorSchedule }: Props) => {
+    const scheduleType = assertionInfo.schedule?.type;
+    const freshnessType = assertionInfo.type;
+
+    let scheduleText = '';
+    switch (scheduleType) {
+        case FreshnessAssertionScheduleType.FixedInterval:
+            scheduleText = createFixedIntervalText(assertionInfo.schedule?.fixedInterval, monitorSchedule);
+            break;
+        case FreshnessAssertionScheduleType.Cron:
+            scheduleText = createCronText(assertionInfo.schedule?.cron as any);
+            break;
+        case FreshnessAssertionScheduleType.SinceTheLastCheck:
+            scheduleText = createSinceTheLastCheckText(monitorSchedule);
+            break;
+        default:
+            scheduleText = 'within an unrecognized schedule window.';
+            break;
+    }
+    return (
+        <div>
+            <Typography.Text>
+                {freshnessType === FreshnessAssertionType.DatasetChange
+                    ? 'Table was updated '
+                    : 'Data Task is run successfully '}
+                {scheduleText}
+            </Typography.Text>
+        </div>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaAssertionDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaAssertionDescription.tsx
new file mode 100644
index 00000000000000..a93d0edaf4199f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaAssertionDescription.tsx
@@ -0,0 +1,28 @@
+import React, { useState } from 'react';
+import { Typography } from 'antd';
+import { SchemaSummaryModal } from './SchemaSummaryModal';
+import { SchemaAssertionInfo, SchemaAssertionCompatibility } from '../../../../../../types.generated';
+
+type Props = {
+    assertionInfo: SchemaAssertionInfo;
+};
+
+/**
+ * A human-readable description of a Schema Assertion.
+ */
+export const SchemaAssertionDescription = ({ assertionInfo }: Props) => {
+    const [showSchemaSummary, setShowSchemaSummary] = useState(false);
+    const { compatibility } = assertionInfo;
+    const matchText = compatibility === SchemaAssertionCompatibility.ExactMatch ? 'exactly match' : 'include';
+    const expectedColumnCount = assertionInfo?.fields?.length || 0;
+    return (
+        <div>
+            <Typography.Text>
+                Actual table columns {matchText} {expectedColumnCount} expected columns
+            </Typography.Text>
+            {showSchemaSummary && !!assertionInfo.schema && (
+                <SchemaSummaryModal schema={assertionInfo.schema} onClose={() => setShowSchemaSummary(false)} />
+            )}
+        </div>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaSummary.tsx
new file mode 100644
index 00000000000000..063660bcef7252
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaSummary.tsx
@@ -0,0 +1,71 @@
+import React from 'react';
+import styled from 'styled-components';
+import { MoreOutlined } from '@ant-design/icons';
+import { Table } from 'antd';
+import { SchemaMetadata } from '../../../../../../types.generated';
+import { ANTD_GRAY } from '../../../constants';
+
+const TitleText = styled.div`
+    color: ${ANTD_GRAY[7]};
+    margin-bottom: 20px;
+    letter-spacing; 4px;
+
+`;
+
+const ColumnHeader = styled.div`
+    color: ${ANTD_GRAY[8]};
+    letter-spacing; 4px;
+`;
+
+const Container = styled.div`
+    padding: 28px;
+    height: 100%;
+`;
+
+const SummaryContainer = styled.div`
+    width: 100%;
+    display: flex;
+    align-items: center;
+`;
+
+const StyledTable = styled(Table)`
+    width: 100%;
+    border-radius: 8px;
+    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.1);
+    height: 100%;
+`;
+
+type Props = {
+    schema: SchemaMetadata;
+};
+
+export const SchemaSummary = ({ schema }: Props) => {
+    const columns = [
+        {
+            title: () => <ColumnHeader>NAME</ColumnHeader>,
+            render: (field) => <>{field.fieldPath}</>,
+        },
+        {
+            title: () => <ColumnHeader>TYPE</ColumnHeader>,
+            render: (field) => <>{field.nativeDataType}</>,
+        },
+        {
+            title: () => <MoreOutlined />,
+            render: (_) => undefined,
+        },
+    ];
+
+    const data = (schema?.fields || []).map((field) => ({
+        ...field,
+        key: field.fieldPath,
+    }));
+
+    return (
+        <Container>
+            <TitleText>SCHEMA</TitleText>
+            <SummaryContainer>
+                <StyledTable pagination={false} columns={columns} dataSource={data} />
+            </SummaryContainer>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaSummaryModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaSummaryModal.tsx
new file mode 100644
index 00000000000000..67cff70360e123
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SchemaSummaryModal.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import { Button, Modal } from 'antd';
+import { SchemaSummary } from './SchemaSummary';
+import { SchemaMetadata } from '../../../../../../types.generated';
+
+const modalStyle = {
+    top: 40,
+};
+
+const modalBodyStyle = {
+    padding: 0,
+};
+
+type Props = {
+    schema: SchemaMetadata;
+    onClose: () => void;
+};
+
+export const SchemaSummaryModal = ({ schema, onClose }: Props) => {
+    return (
+        <Modal
+            width={800}
+            style={modalStyle}
+            bodyStyle={modalBodyStyle}
+            title="View Schema Assertion"
+            visible
+            onCancel={onClose}
+            footer={<Button onClick={onClose}>Close</Button>}
+        >
+            <SchemaSummary schema={schema} />
+        </Modal>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SqlAssertionDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SqlAssertionDescription.tsx
new file mode 100644
index 00000000000000..047f7c7db28f65
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/SqlAssertionDescription.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import { Typography } from 'antd';
+import { AssertionInfo } from '../../../../../../types.generated';
+
+type Props = {
+    assertionInfo: AssertionInfo;
+};
+
+/**
+ * A human-readable description of a SQL Assertion.
+ */
+export const SqlAssertionDescription = ({ assertionInfo }: Props) => {
+    const { description } = assertionInfo;
+
+    return <Typography.Text>{description}</Typography.Text>;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/ValidationsTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/ValidationsTab.tsx
new file mode 100644
index 00000000000000..203cfc8052133c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/ValidationsTab.tsx
@@ -0,0 +1,101 @@
+import React, { useEffect } from 'react';
+import { Button } from 'antd';
+import { useHistory, useLocation } from 'react-router';
+import styled from 'styled-components';
+import { FileDoneOutlined, FileProtectOutlined } from '@ant-design/icons';
+import { useEntityData } from '../../../../../entity/shared/EntityContext';
+import { Assertions } from './Assertions';
+import TabToolbar from '../../../components/styled/TabToolbar';
+import { useGetValidationsTab } from './useGetValidationsTab';
+import { ANTD_GRAY } from '../../../constants';
+import { TestResults } from '../Governance/TestResults';
+
+const TabTitle = styled.span`
+    margin-left: 4px;
+`;
+
+const TabButton = styled(Button)<{ selected: boolean }>`
+    background-color: ${(props) => (props.selected && ANTD_GRAY[3]) || 'none'};
+    margin-left: 4px;
+`;
+
+enum TabPaths {
+    ASSERTIONS = 'Assertions',
+    TESTS = 'Tests',
+}
+
+const DEFAULT_TAB = TabPaths.ASSERTIONS;
+
+/**
+ * Component used for rendering the Entity Validations Tab.
+ */
+
+// CAN DELETE
+export const ValidationsTab = () => {
+    const { entityData } = useEntityData();
+    const history = useHistory();
+    const { pathname } = useLocation();
+
+    const totalAssertions = (entityData as any)?.assertions?.total;
+    const passingTests = (entityData as any)?.testResults?.passing || [];
+    const maybeFailingTests = (entityData as any)?.testResults?.failing || [];
+    const totalTests = maybeFailingTests.length + passingTests.length;
+
+    const { selectedTab, basePath } = useGetValidationsTab(pathname, Object.values(TabPaths));
+
+    // If no tab was selected, select a default tab.
+    useEffect(() => {
+        if (!selectedTab) {
+            // Route to the default tab.
+            history.replace(`${basePath}/${DEFAULT_TAB}`);
+        }
+    }, [selectedTab, basePath, history]);
+
+    /**
+     * The top-level Toolbar tabs to display.
+     */
+    const tabs = [
+        {
+            title: (
+                <>
+                    <FileProtectOutlined />
+                    <TabTitle>Assertions ({totalAssertions})</TabTitle>
+                </>
+            ),
+            path: TabPaths.ASSERTIONS,
+            disabled: false,
+            content: <Assertions />,
+        },
+        {
+            title: (
+                <>
+                    <FileDoneOutlined />
+                    <TabTitle>Tests ({totalTests})</TabTitle>
+                </>
+            ),
+            path: TabPaths.TESTS,
+            disabled: totalTests === 0,
+            content: <TestResults passing={passingTests} failing={maybeFailingTests} />,
+        },
+    ];
+
+    return (
+        <>
+            <TabToolbar>
+                <div>
+                    {tabs.map((tab) => (
+                        <TabButton
+                            type="text"
+                            disabled={tab.disabled}
+                            selected={selectedTab === tab.path}
+                            onClick={() => history.replace(`${basePath}/${tab.path}`)}
+                        >
+                            {tab.title}
+                        </TabButton>
+                    ))}
+                </div>
+            </TabToolbar>
+            {tabs.filter((tab) => tab.path === selectedTab).map((tab) => tab.content)}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/VolumeAssertionDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/VolumeAssertionDescription.tsx
new file mode 100644
index 00000000000000..26634c459df0d4
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/VolumeAssertionDescription.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import { Typography } from 'antd';
+import {
+    IncrementingSegmentRowCountChange,
+    RowCountChange,
+    VolumeAssertionInfo,
+} from '../../../../../../types.generated';
+import {
+    getIsRowCountChange,
+    getOperatorDescription,
+    getParameterDescription,
+    getValueChangeTypeDescription,
+    getVolumeTypeDescription,
+    getVolumeTypeInfo,
+} from './utils';
+
+type Props = {
+    assertionInfo: VolumeAssertionInfo;
+};
+
+/**
+ * A human-readable description of a Volume Assertion.
+ */
+export const VolumeAssertionDescription = ({ assertionInfo }: Props) => {
+    const volumeType = assertionInfo.type;
+    const volumeTypeInfo = getVolumeTypeInfo(assertionInfo);
+    const volumeTypeDescription = getVolumeTypeDescription(volumeType);
+    const operatorDescription = volumeTypeInfo ? getOperatorDescription(volumeTypeInfo.operator) : '';
+    const parameterDescription = volumeTypeInfo ? getParameterDescription(volumeTypeInfo.parameters) : '';
+    const valueChangeTypeDescription = getIsRowCountChange(volumeType)
+        ? getValueChangeTypeDescription((volumeTypeInfo as RowCountChange | IncrementingSegmentRowCountChange).type)
+        : 'rows';
+
+    return (
+        <div>
+            <Typography.Text>
+                Table {volumeTypeDescription} {operatorDescription} {parameterDescription} {valueChangeTypeDescription}
+            </Typography.Text>
+        </div>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts
new file mode 100644
index 00000000000000..1f71fd0ef629c0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts
@@ -0,0 +1,38 @@
+import { useGetValidationsTab } from '../useGetValidationsTab';
+
+describe('useGetValidationsTab', () => {
+    it('should correctly extract valid tab', () => {
+        const pathname = '/dataset/urn:li:abc/Quality/List';
+        const tabNames = ['List'];
+        const res = useGetValidationsTab(pathname, tabNames);
+        expect(res.selectedTab).toEqual('List');
+        expect(res.basePath).toEqual('/dataset/urn:li:abc/Quality');
+    });
+    it('should extract undefined for invalid tab', () => {
+        const pathname = '/dataset/urn:li:abc/Governance/Assertions';
+        const tabNames = ['Tests'];
+        const res = useGetValidationsTab(pathname, tabNames);
+        expect(res.selectedTab).toBeUndefined();
+        expect(res.basePath).toEqual('/dataset/urn:li:abc/Governance');
+    });
+    it('should extract undefined for missing tab', () => {
+        const pathname = '/dataset/urn:li:abc/Governance';
+        const tabNames = ['Tests'];
+        const res = useGetValidationsTab(pathname, tabNames);
+        expect(res.selectedTab).toBeUndefined();
+        expect(res.basePath).toEqual('/dataset/urn:li:abc/Governance');
+    });
+    it('should handle trailing slashes', () => {
+        let pathname = '/dataset/urn:li:abc/Quality/List/';
+        let tabNames = ['List'];
+        let res = useGetValidationsTab(pathname, tabNames);
+        expect(res.selectedTab).toEqual('List');
+        expect(res.basePath).toEqual('/dataset/urn:li:abc/Quality');
+
+        pathname = '/dataset/urn:li:abc/Quality/';
+        tabNames = ['Assertions'];
+        res = useGetValidationsTab(pathname, tabNames);
+        expect(res.selectedTab).toBeUndefined();
+        expect(res.basePath).toEqual('/dataset/urn:li:abc/Quality');
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylTypes.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylTypes.tsx
new file mode 100644
index 00000000000000..8a70a3d87c1478
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylTypes.tsx
@@ -0,0 +1,21 @@
+import { Assertion, AssertionType } from '../../../../../../types.generated';
+
+export type AssertionStatusSummary = {
+    passing: number;
+    failing: number;
+    erroring: number;
+    total: number; // Total assertions with at least 1 run.
+    totalAssertions: number;
+};
+
+/**
+ * A group of assertions related by their logical type or category.
+ */
+export type AssertionGroup = {
+    name: string;
+    icon: React.ReactNode;
+    description?: string;
+    assertions: Assertion[];
+    summary: AssertionStatusSummary;
+    type: AssertionType;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylUtils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylUtils.tsx
new file mode 100644
index 00000000000000..49199c4b071a20
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylUtils.tsx
@@ -0,0 +1,391 @@
+import React from 'react';
+import styled from 'styled-components';
+import * as moment from 'moment-timezone';
+import * as cronParser from 'cron-parser';
+import cronstrue from 'cronstrue';
+import { CheckOutlined, CloseOutlined, ApiOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
+import { ASSERTION_TYPE_TO_ICON_MAP } from '@src/app/entityV2/shared/tabs/Dataset/Validations/shared/constant';
+import { GetDatasetAssertionsWithRunEventsQuery } from '@src/graphql/dataset.generated';
+import {
+    Assertion,
+    AssertionResultType,
+    AssertionType,
+    CronSchedule,
+    EntityType,
+} from '../../../../../../types.generated';
+import { sortAssertions } from './assertionUtils';
+import { AssertionGroup, AssertionStatusSummary } from './acrylTypes';
+import { lowerFirstLetter } from '../../../../../shared/textUtil';
+import { GenericEntityProperties } from '../../../../../entity/shared/types';
+
+export const SUCCESS_COLOR_HEX = '#52C41A';
+export const FAILURE_COLOR_HEX = '#F5222D';
+export const WARNING_COLOR_HEX = '#FA8C16';
+
+const StyledApiOutlined = styled(ApiOutlined)`
+    && {
+        margin: 0px;
+        padding: 0px;
+        margin-right: 8px;
+        font-size: 18px;
+    }
+`;
+
+const StyledCheckOutlined = styled(CheckOutlined)`
+    && {
+        color: ${SUCCESS_COLOR_HEX};
+        font-size: 14px;
+        padding: 0px;
+        margin: 0px;
+    }
+`;
+
+const StyledCloseOutlined = styled(CloseOutlined)`
+    && {
+        color: ${FAILURE_COLOR_HEX};
+        font-size: 14px;
+        padding: 0px;
+        margin: 0px;
+    }
+`;
+
+const StyledExclamationOutlined = styled(ExclamationCircleOutlined)`
+    && {
+        color: ${WARNING_COLOR_HEX};
+        font-size: 14px;
+        padding: 0px;
+        margin: 0px;
+    }
+`;
+
+const getStyledIconComponent = (type: AssertionType) => {
+    const IconComponent = ASSERTION_TYPE_TO_ICON_MAP[type];
+
+    // Wrap the JSX element in a styled div
+    const StyledIcon = styled.div`
+        margin: 0;
+        padding: 0;
+        margin-right: 8px;
+        font-size: 18px;
+        display: inline-flex;
+        align-items: center;
+    `;
+
+    // Return the styled wrapper with the icon inside
+    return () => <StyledIcon>{IconComponent}</StyledIcon>;
+};
+
+export const ASSERTION_INFO = [
+    {
+        name: 'Freshness',
+        description: 'Define & monitor your expectations about when this dataset should be updated',
+        icon: React.createElement(getStyledIconComponent(AssertionType.Freshness)),
+        type: AssertionType.Freshness,
+        entityTypes: [EntityType.Dataset],
+        enabled: true,
+        visible: true,
+    },
+    {
+        name: 'Volume',
+        description: 'Define & monitor your expectations about the size of this dataset',
+        icon: React.createElement(getStyledIconComponent(AssertionType.Volume)),
+        type: AssertionType.Volume,
+        entityTypes: [EntityType.Dataset],
+        enabled: true,
+        visible: true,
+    },
+    {
+        name: 'Column',
+        description: 'Define & monitor your expectations about the values in a column',
+        icon: React.createElement(getStyledIconComponent(AssertionType.Field)),
+        type: AssertionType.Field,
+        entityTypes: [EntityType.Dataset],
+        enabled: true,
+        visible: true,
+        requiresConnectionSupportedByMonitors: false,
+    },
+    {
+        name: 'Schema',
+        description: "Define & monitor your expectations about the table's columns and their types",
+        icon: React.createElement(getStyledIconComponent(AssertionType.DataSchema)),
+        type: AssertionType.DataSchema,
+        entityTypes: [EntityType.Dataset],
+        enabled: true,
+        visible: true,
+    },
+    {
+        name: 'SQL',
+        description: 'Define & monitor your expectations using custom SQL rules',
+        icon: React.createElement(getStyledIconComponent(AssertionType.Sql)),
+        type: AssertionType.Sql,
+        entityTypes: [EntityType.Dataset],
+        enabled: true,
+        visible: true,
+        requiresConnectionSupportedByMonitors: true,
+    },
+    {
+        name: 'Other',
+        description: 'Other assertions that are defined and maintained outside of DataHub.',
+        icon: React.createElement(getStyledIconComponent(AssertionType.Dataset)),
+        type: AssertionType.Dataset,
+        entityTypes: [EntityType.Dataset],
+        enabled: false,
+        visible: false,
+    },
+];
+
+const ASSERTION_TYPE_TO_INFO = new Map();
+ASSERTION_INFO.forEach((info) => {
+    ASSERTION_TYPE_TO_INFO.set(info.type, info);
+});
+
+export const getAssertionGroupName = (type: string): string => {
+    return ASSERTION_TYPE_TO_INFO.has(type) ? ASSERTION_TYPE_TO_INFO.get(type).name : type;
+};
+
+export const getAssertionGroupTypeIcon = (type: string) => {
+    return ASSERTION_TYPE_TO_INFO.has(type) ? ASSERTION_TYPE_TO_INFO.get(type).icon : <StyledApiOutlined />;
+};
+
+export const tryExtractMonitorDetailsFromAssertionsWithMonitorsQuery = (
+    queryData?: GetDatasetAssertionsWithRunEventsQuery,
+): Assertion[] | undefined => {
+    return queryData?.dataset?.assertions?.assertions?.map((assertion) => ({
+        ...(assertion as Assertion),
+    }));
+};
+
+/**
+ * Returns a status summary for the assertions associated with a Dataset.
+ *
+ * @param assertions The assertions to extract the summary for
+ */
+export const getAssertionsSummary = (assertions: Assertion[]): AssertionStatusSummary => {
+    const summary = {
+        passing: 0,
+        failing: 0,
+        erroring: 0,
+        total: 0,
+        totalAssertions: assertions.length,
+    };
+    assertions.forEach((assertion) => {
+        if ((assertion.runEvents?.runEvents?.length || 0) > 0) {
+            const mostRecentRun = assertion.runEvents?.runEvents?.[0];
+            const resultType = mostRecentRun?.result?.type;
+            if (AssertionResultType.Success === resultType) {
+                summary.passing++;
+            }
+            if (AssertionResultType.Failure === resultType) {
+                summary.failing++;
+            }
+            if (AssertionResultType.Error === resultType) {
+                summary.erroring++;
+            }
+            if (AssertionResultType.Init !== resultType) {
+                summary.total++; // only count assertions for which there is one completed run event, ignoring INIT statuses!
+            }
+        }
+    });
+    return summary;
+};
+
+/**
+ * TODO: We will remove this mapping code once we replace the OSS legacy assertions summary with the new
+ * format.
+ */
+export const getLegacyAssertionsSummary = (assertions: Assertion[]) => {
+    const newSummary = getAssertionsSummary(assertions);
+    return {
+        failedRuns: newSummary.failing,
+        succeededRuns: newSummary.passing,
+        erroredRuns: newSummary.erroring,
+        totalRuns: newSummary.total,
+        totalAssertions: newSummary.totalAssertions,
+    };
+};
+
+export const getAssertionType = (assertion: Assertion): string | undefined => {
+    return assertion?.info?.customAssertion?.type?.toUpperCase() || assertion?.info?.type?.toUpperCase();
+};
+
+/**
+ * Returns a list of assertion groups, where assertions are grouped
+ * by their "type" or "category". Each group includes the assertions inside, along with
+ * a summary of passing and failing assertions for the group.
+ *
+ * @param assertions The assertions to group
+ */
+export const createAssertionGroups = (assertions: Array<Assertion>): AssertionGroup[] => {
+    // Pre-sort the list of assertions based on which has been most recently executed.
+    assertions.sort(sortAssertions);
+
+    const typeToAssertions = new Map();
+    assertions
+        .filter((assertion) => assertion.info?.type)
+        .forEach((assertion) => {
+            const assertionType: string | undefined = getAssertionType(assertion);
+            const assertionGroup: string = assertionType || 'Unknown';
+            const groupedAssertions = typeToAssertions.get(assertionGroup) || [];
+            groupedAssertions.push(assertion);
+            typeToAssertions.set(assertionGroup, groupedAssertions);
+        });
+
+    // Now, create summary for each type and build the AssertionGroup object
+    const assertionGroups: AssertionGroup[] = [];
+    typeToAssertions.forEach((groupedAssertions, type) => {
+        const newGroup: AssertionGroup = {
+            name: getAssertionGroupName(type),
+            icon: getAssertionGroupTypeIcon(type),
+            assertions: groupedAssertions,
+            summary: getAssertionsSummary(groupedAssertions),
+            type,
+        };
+        assertionGroups.push(newGroup);
+    });
+
+    return assertionGroups;
+};
+
+// TODO: Make this the default inside DatasetAssertionsSummary.tsx.
+export const getAssertionGroupSummaryIcon = (summary: AssertionStatusSummary) => {
+    if (summary.total === 0) {
+        return null;
+    }
+    if (summary.passing === summary.total) {
+        return <StyledCheckOutlined />;
+    }
+    if (summary.erroring > 0) {
+        return <StyledExclamationOutlined />;
+    }
+    return <StyledCloseOutlined />;
+};
+
+// TODO: Make this the default inside DatasetAssertionsSummary.tsx.
+export const getAssertionGroupSummaryMessage = (summary: AssertionStatusSummary) => {
+    if (summary.total === 0) {
+        return 'No assertions have run';
+    }
+    if (summary.passing === summary.total) {
+        return 'All assertions are passing';
+    }
+    if (summary.erroring > 0) {
+        return 'An error is preventing some assertions from running';
+    }
+    if (summary.failing === summary.total) {
+        return 'All assertions are failing';
+    }
+    return 'Some assertions are failing';
+};
+
+/**
+ * Returns the next scheduled run of a cron schedule, in the local timezone of the user.
+ *
+ * @param schedule a cron schedule
+ */
+export const getNextScheduleEvaluationTimeMs = (schedule: CronSchedule) => {
+    try {
+        const interval = cronParser.parseExpression(schedule.cron, { tz: schedule.timezone });
+        const nextDate = interval.next().toDate(); // Get next date as JavaScript Date object
+        const userTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+        const nextDateInUserTz = moment.tz(nextDate, userTimezone); // Convert to user's timezone
+        return nextDateInUserTz.valueOf();
+    } catch (e) {
+        console.log('Failed to parse cron expression', e);
+        return undefined;
+    }
+};
+
+/**
+ * Returns the previously scheduled run of a cron schedule, in the local timezone of the user.
+ *
+ * @param schedule a cron schedule
+ * @param maybeFromDateTS
+ */
+export const getPreviousScheduleEvaluationTimeMs = (schedule: CronSchedule, maybeFromDateTS?: number) => {
+    try {
+        const interval = cronParser.parseExpression(schedule.cron, { tz: schedule.timezone });
+        if (typeof maybeFromDateTS !== 'undefined') {
+            interval.reset(maybeFromDateTS);
+        }
+        const prevDate = interval.prev().toDate(); // Get prev date as JavaScript Date object
+        const userTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+        const prevDateInUserTz = moment.tz(prevDate, userTimezone); // Convert to user's timezone
+        return prevDateInUserTz.valueOf();
+    } catch (e) {
+        console.log('Failed to parse cron expression', e);
+        return undefined;
+    }
+};
+export const getAssertionTypesForEntityType = (entityType: EntityType, monitorsConnectionForEntityExists: boolean) => {
+    return ASSERTION_INFO.filter((type) => type.entityTypes.includes(entityType)).map((type) => ({
+        ...type,
+        enabled: type.enabled && (!type.requiresConnectionSupportedByMonitors || monitorsConnectionForEntityExists),
+    }));
+};
+
+export const getCronAsText = (interval: string, options: { verbose: boolean } = { verbose: false }) => {
+    const { verbose } = options;
+    if (interval) {
+        try {
+            return {
+                text: `${lowerFirstLetter(cronstrue.toString(interval, { verbose }))}.`,
+                error: false,
+            };
+        } catch (e) {
+            return {
+                text: undefined,
+                error: true,
+            };
+        }
+    }
+    return {
+        text: undefined,
+        error: false,
+    };
+};
+
+export const getEntityUrnForAssertion = (assertion: Assertion) => {
+    if (assertion.info?.type === AssertionType.Dataset) {
+        return assertion.info?.datasetAssertion?.datasetUrn;
+    }
+    if (assertion.info?.type === AssertionType.Freshness) {
+        return assertion.info?.freshnessAssertion?.entityUrn;
+    }
+    if (assertion.info?.type === AssertionType.Volume) {
+        return assertion.info?.volumeAssertion?.entityUrn;
+    }
+    if (assertion.info?.type === AssertionType.Field) {
+        return assertion.info?.fieldAssertion?.entityUrn;
+    }
+    if (assertion.info?.type === AssertionType.Sql) {
+        return assertion.info?.sqlAssertion?.entityUrn;
+    }
+    if (assertion.info?.type === AssertionType.DataSchema) {
+        return assertion.info?.schemaAssertion?.entityUrn;
+    }
+    if (assertion.info?.type === AssertionType.Custom) {
+        return assertion.info?.customAssertion?.entityUrn;
+    }
+    console.error(`Unable to extract entity urn from unrecognized assertion with type ${assertion.info?.type}`);
+    return undefined;
+};
+
+/**
+ * Attempts to extract the sibling entity associated with a given urn.
+ */
+export const getSiblingWithUrn = (entityData: GenericEntityProperties, urn: string) => {
+    if (entityData.urn === urn) {
+        return entityData;
+    }
+    return entityData?.siblingsSearch?.searchResults
+        ?.map((result) => result.entity)
+        .find((entity) => entity?.urn === urn);
+};
+
+/**
+ * Extract the siblings for an entity
+ */
+export const getSiblings = (entityData: GenericEntityProperties | null): GenericEntityProperties[] => {
+    if (!entityData) return [];
+    return entityData?.siblingsSearch?.searchResults?.map((result) => result.entity) || [];
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/details/PrimaryButton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/details/PrimaryButton.tsx
new file mode 100644
index 00000000000000..3eb2c5ff1f8a8b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/details/PrimaryButton.tsx
@@ -0,0 +1,58 @@
+import React from 'react';
+
+import styled from 'styled-components';
+import { Tooltip } from '@components';
+
+import { ANTD_GRAY } from '../../../../../../constants';
+
+const Button = styled.div<{ disabled: boolean }>`
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 16px;
+    padding: 4px 12px;
+    background-color: ${(props) => (props.disabled ? ANTD_GRAY[4] : props.theme.styles['primary-color'])};
+    border: 1px solid ${(props) => (props.disabled ? ANTD_GRAY[4] : props.theme.styles['primary-color'])};
+    color: ${(props) => (props.disabled ? ANTD_GRAY[9] : '#fff')};
+    ${(props) =>
+        (!props.disabled &&
+            `:hover {
+            color: #fff;
+            opacity: 0.8;
+            border-color: ${props.theme.styles['primary-color']};
+            cursor: pointer;
+        }
+    `) ||
+        null}
+`;
+
+const Icon = styled.div`
+    margin-right: 8px;
+`;
+
+type Props = {
+    icon?: React.ReactNode;
+    title: string;
+    disabled?: boolean;
+    tooltip?: React.ReactNode;
+    style?: any;
+    onClick: () => void;
+};
+
+export const PrimaryButton = ({ icon, title, tooltip, disabled = false, style, onClick }: Props) => {
+    return (
+        <Tooltip title={tooltip} placement="left" showArrow={false}>
+            <Button
+                disabled={disabled}
+                onClick={(e) => {
+                    e.stopPropagation();
+                    onClick();
+                }}
+                style={style}
+            >
+                {(icon && <Icon>{icon}</Icon>) || null}
+                {title}
+            </Button>
+        </Tooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/hooks.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/hooks.ts
new file mode 100644
index 00000000000000..a178b81fd090da
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/hooks.ts
@@ -0,0 +1,139 @@
+import { useEffect, useState } from 'react';
+import { useLocation, useHistory } from 'react-router';
+import { message } from 'antd';
+import { getQueryParams } from '../../assertionUtils';
+
+export const useAssertionURNCopyLink = (urn: string) => {
+    const onCopyLink = () => {
+        const assertionUrn = urn;
+
+        // Create a URL with the assertion_urn query parameter
+        const currentUrl = new URL(window.location.href);
+
+        // Add or update the assertion_urn query parameter
+        currentUrl.searchParams.set('assertion_urn', encodeURIComponent(assertionUrn));
+
+        // The updated URL with the new or modified query parameter
+        const assertionUrl = currentUrl.href;
+
+        // Copy the URL to the clipboard
+        navigator.clipboard.writeText(assertionUrl).then(
+            () => {
+                message.success('Link copied to clipboard!');
+            },
+            () => {
+                message.error('Failed to copy link to clipboard.');
+            },
+        );
+    };
+
+    return onCopyLink;
+};
+
+/**
+ * Hook to manage the details view of assertions based on URL query parameters.
+ *
+ * @param {Function} setFocusAssertionUrn - Function to set details of the viewing assertion and open detail Modal.
+ * @returns {Object} Object containing the 'assertionUrnParam' from the URL.
+ */
+export const useOpenAssertionDetailModal = (setFocusAssertionUrn) => {
+    const location = useLocation();
+    const history = useHistory();
+    const assertionUrnParam = getQueryParams('assertion_urn', location);
+
+    useEffect(() => {
+        if (assertionUrnParam) {
+            const decodedAssertionUrn = decodeURIComponent(assertionUrnParam);
+
+            setFocusAssertionUrn(decodedAssertionUrn);
+
+            // Remove the query parameter from the URL
+            const newUrlParams = new URLSearchParams(location.search);
+            newUrlParams.delete('assertion_urn');
+            const newUrl = `${location.pathname}?${newUrlParams.toString()}`;
+
+            // Use React Router's history.replace to replace the current URL
+            history.replace(newUrl);
+        }
+    }, [assertionUrnParam, setFocusAssertionUrn, location.search, location.pathname, history]);
+
+    return { assertionUrnParam };
+};
+
+const OPEN_ASSERTION_BUILDER_QUERY_PARAM = 'open_assertion_builder';
+
+/**
+ * Hook to automatically open up assertion authoring on mount.
+ *
+ * @param {Function} onOpenAssertionBuilder - Function to open assertion builder.
+ * @returns {Object} Object containing the 'open_assertion_builder' from the URL.
+ */
+export const useOpenAssertionBuilder = (onOpenAssertionBuilder: () => void) => {
+    const location = useLocation();
+    const history = useHistory();
+    const openBuilderParam = getQueryParams(OPEN_ASSERTION_BUILDER_QUERY_PARAM, location);
+
+    useEffect(() => {
+        if (openBuilderParam) {
+            const decodedOpenAssertionBuilder = decodeURIComponent(openBuilderParam);
+
+            if (decodedOpenAssertionBuilder === 'true') {
+                onOpenAssertionBuilder();
+            }
+
+            // Remove the query parameter from the URL
+            const newUrlParams = new URLSearchParams(location.search);
+            newUrlParams.delete(OPEN_ASSERTION_BUILDER_QUERY_PARAM);
+            const newUrl = `${location.pathname}?${newUrlParams.toString()}`;
+
+            // Use React Router's history.replace to replace the current URL
+            history.replace(newUrl);
+        }
+    }, [openBuilderParam, onOpenAssertionBuilder, location.search, location.pathname, history]);
+
+    return { openBuilderParam };
+};
+
+/**
+ * Hook for managing the expanded row keys based on the `assertion_urn` query parameter.
+ *
+ * This hook ensures that relevant rows are expanded if an `assertion_urn` is present in the URL query parameters.
+ * If no `assertion_urn` is provided, it expands all groups initially.
+ *
+ * @param {Array} groups - Array of assertion groups, where each group contains a list of assertions.
+ * @returns {Object} - Object containing the expanded row keys and a function to update them.
+ *  - expandedRowKeys: Array of currently expanded row keys.
+ *  - setExpandedRowKeys: Function to manually set the expanded row keys.
+ */
+export const useExpandedRowKeys = (groups, { isGroupBy }: { isGroupBy: boolean }) => {
+    const location = useLocation();
+    const assertionUrnParam = new URLSearchParams(location.search).get('assertion_urn');
+    const [expandedRowKeys, setExpandedRowKeys] = useState<string[]>([]);
+    const [processed, setProcessed] = useState(false);
+
+    useEffect(() => {
+        if (isGroupBy) {
+            if (assertionUrnParam) {
+                const decodedAssertionUrn = decodeURIComponent(assertionUrnParam);
+
+                // Find the row key to expand based on the assertion URN
+                const rowKeyToExpand = groups.find((group) =>
+                    group.assertions.some((assertion) => assertion.urn === decodedAssertionUrn),
+                )?.name;
+
+                if (rowKeyToExpand) {
+                    setExpandedRowKeys((prevKeys) => [...prevKeys, rowKeyToExpand]);
+                }
+
+                setProcessed(true);
+            } else if (!processed) {
+                // If no assertion URN is present initially, set expandedRowKeys from groups
+                const allGroupKeys = groups.map((group) => group.name);
+                setExpandedRowKeys(allGroupKeys);
+                setProcessed(true);
+            }
+        }
+    }, [groups, assertionUrnParam, processed, isGroupBy]);
+
+    return { expandedRowKeys, setExpandedRowKeys };
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfile.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfile.tsx
new file mode 100644
index 00000000000000..948668af29f6a1
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfile.tsx
@@ -0,0 +1,63 @@
+import React from 'react';
+
+import { useGetAssertionWithRunEventsQuery } from '@src/graphql/assertion.generated';
+import { AssertionSummaryTab } from './summary/AssertionSummaryTab';
+import { Assertion, DataContract } from '../../../../../../../../types.generated';
+import { AssertionProfileHeader } from './AssertionProfileHeader';
+import { AssertionTabs } from './AssertionTabs';
+import { AssertionProfileFooter } from './AssertionProfileFooter';
+import { AssertionProfileHeaderLoading } from './AssertionProfileHeaderLoading';
+
+enum TabType {
+    Summary = 'Summary',
+    Settings = 'Settings',
+}
+
+type Props = {
+    urn: string;
+    contract?: DataContract; // TODO: ideally this would be a field available on the assertion itself.
+    close: () => void;
+    refetch?: () => void;
+};
+
+// TODO: Handling Loading Errors.
+
+export const AssertionProfile = ({ urn, contract, close, refetch }: Props) => {
+    const {
+        data,
+        loading,
+        refetch: localRefetch,
+    } = useGetAssertionWithRunEventsQuery({ variables: { assertionUrn: urn } });
+    const assertion = data?.assertion as Assertion;
+    const result = assertion?.runEvents?.runEvents[0]?.result;
+
+    const fullRefetch = () => {
+        localRefetch();
+        refetch?.();
+    };
+
+    const tabs = [
+        {
+            key: TabType.Summary,
+            label: 'Summary',
+            content: <AssertionSummaryTab loading={loading} assertion={assertion} />,
+        },
+    ];
+
+    return (
+        <>
+            {(loading && <AssertionProfileHeaderLoading />) || (
+                <AssertionProfileHeader
+                    assertion={assertion}
+                    contract={contract}
+                    result={result || undefined}
+                    canEditContract
+                    refetch={fullRefetch}
+                    close={close}
+                />
+            )}
+            <AssertionTabs defaultSelectedTab={TabType.Summary} tabs={tabs} />
+            <AssertionProfileFooter />
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileDrawer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileDrawer.tsx
new file mode 100644
index 00000000000000..399e41c30d117c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileDrawer.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+
+import { Drawer } from 'antd';
+
+import { AssertionProfile } from './AssertionProfile';
+import { DataContract } from '../../../../../../../../types.generated';
+
+type Props = {
+    urn: string;
+    contract?: DataContract;
+    closeDrawer: () => void;
+    refetch?: () => void;
+};
+
+export const AssertionProfileDrawer = ({ urn, contract, closeDrawer, refetch }: Props) => {
+    return (
+        <Drawer width={600} placement="right" closable={false} visible bodyStyle={{ padding: 0 }} onClose={closeDrawer}>
+            <AssertionProfile urn={urn} contract={contract} close={closeDrawer} refetch={refetch} />
+        </Drawer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileFooter.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileFooter.tsx
new file mode 100644
index 00000000000000..cbbbd4fed6053f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileFooter.tsx
@@ -0,0 +1,51 @@
+import React from 'react';
+
+import styled from 'styled-components';
+import { BellTwoTone } from '@ant-design/icons';
+
+import { ANTD_GRAY } from '../../../../../constants';
+
+const Container = styled.div`
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0px 24px;
+    margin-bottom: 20px;
+`;
+
+const Tip = styled.div`
+    background-color: ${ANTD_GRAY[3]};
+    padding: 20px;
+    border-radius: 4px;
+    color: ${ANTD_GRAY[8]};
+`;
+
+const Title = styled.div`
+    font-weight: 700;
+    margin-bottom: 8px;
+`;
+
+const StyledBell = styled(BellTwoTone)`
+    margin-right: 4px;
+`;
+
+// TODO: Add support for V2 styled actions: Delete, start, stop.
+export const AssertionProfileFooter = () => {
+    return (
+        <Container>
+            <Tip>
+                <Title>
+                    <StyledBell /> When things go wrong, be the first to know.
+                </Title>
+                Sign up to receive notifications when this assertion passes or fails by{' '}
+                <a
+                    href="https://datahubproject.io/docs/next/managed-datahub/subscription-and-notification/"
+                    target="_blank"
+                    rel="noreferrer noopener"
+                >
+                    subscribing to this table.
+                </a>
+            </Tip>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileHeader.tsx
new file mode 100644
index 00000000000000..da28800147a034
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileHeader.tsx
@@ -0,0 +1,89 @@
+import React from 'react';
+
+import styled from 'styled-components';
+import { AssertionType } from '@src/types.generated';
+
+import { Assertion, AssertionResult, DataContract } from '../../../../../../../../types.generated';
+import { AssertionDescription } from './summary/AssertionDescription';
+import { AssertionResultPill } from './summary/shared/AssertionResultPill';
+import { Actions } from './actions/Actions';
+import { CloseButton } from './shared/CloseButton';
+
+const Container = styled.div`
+    display: flex;
+    justify-content: space-between;
+    align-items: start;
+    padding: 20px 24px;
+    border-bottom: 1px solid #f0f0f0;
+    background-color: #fff;
+`;
+
+const NavBar = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid #f0f0f0;
+`;
+
+const Status = styled.div``;
+
+const ActionsWrapper = styled.div`
+    padding: 8px 0px;
+`;
+
+const Title = styled.div`
+    flex: 1;
+    font-size: 16px;
+    font-weight: 600;
+    margin-right: 16px;
+    . * {
+        text-overflow: ellipsis;
+    }
+`;
+
+type Props = {
+    assertion: Assertion;
+    contract?: DataContract;
+    result?: AssertionResult;
+    canEditContract: boolean;
+    close: () => void;
+    refetch: () => void;
+};
+
+// TODO: Add support for V2 styled actions: Delete, start, stop.
+// TODO: Replace with the newer close Icon.
+export const AssertionProfileHeader = ({ assertion, contract, result, canEditContract, close, refetch }: Props) => {
+    const isFieldAssertion = assertion?.info?.type === AssertionType.Field;
+    return (
+        <>
+            <NavBar>
+                <CloseButton close={close} />
+                <ActionsWrapper>
+                    <Actions
+                        assertion={assertion}
+                        contract={contract}
+                        canEditContract={canEditContract}
+                        refetch={refetch}
+                    />
+                </ActionsWrapper>
+            </NavBar>
+            <Container>
+                <Title>
+                    {(assertion && (
+                        <AssertionDescription
+                            assertion={assertion}
+                            options={{
+                                noSecondarySpacing: isFieldAssertion,
+                                showColumnTag: isFieldAssertion,
+                            }}
+                        />
+                    )) ||
+                        'Assertion details'}
+                </Title>
+                <Status>
+                    <AssertionResultPill result={result} />
+                </Status>
+            </Container>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileHeaderLoading.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileHeaderLoading.tsx
new file mode 100644
index 00000000000000..177c5a5b8c9ab9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionProfileHeaderLoading.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+
+import { Skeleton } from 'antd';
+import styled from 'styled-components';
+
+const Container = styled.div`
+    display: flex;
+    flex-direction: column;
+    justify-content: start;
+    gap: 8px;
+    margin-left: 12px 0px 12px 0px;
+`;
+
+const CardSkeleton = styled(Skeleton.Input)`
+    && {
+        padding: 2px 12px 2px 0px;
+        height: 20px;
+        border-radius: 8px;
+        width: 100%;
+    }
+`;
+
+export const AssertionProfileHeaderLoading = () => {
+    return (
+        <Container>
+            <CardSkeleton active size="large" />
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionTabs.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionTabs.tsx
new file mode 100644
index 00000000000000..80026ac6013909
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/AssertionTabs.tsx
@@ -0,0 +1,77 @@
+import React, { useState } from 'react';
+
+import styled from 'styled-components';
+import { Divider } from 'antd';
+import { Tooltip } from '@components';
+
+import { ANTD_GRAY } from '../../../../../constants';
+
+const Tabs = styled.div`
+    margin: 12px 24px;
+    padding: 0px;
+    display: flex;
+    gap: 8px;
+    border-radius: 4px;
+    background-color: ${ANTD_GRAY[2]};
+`;
+
+const TabButton = styled.div<{ selected: boolean; disabled?: boolean }>`
+    height: 40px;
+    border-radius: 4px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0px 24px;
+    border: none;
+    background-color: ${(props) => (props.selected ? props.theme.styles['primary-color'] : 'transparent')};
+    color: ${(props) => (props.selected ? '#fff' : ANTD_GRAY[9] || ANTD_GRAY[3])};
+    font-size: 12px;
+    cursor: pointer;
+    ${(props) => props.disabled && 'opacity: 0.5;'}
+    &:hover {
+        cursor: ${(props) => (props.disabled ? 'not-allowed' : 'pointer')};
+    }
+`;
+
+const TabContent = styled.div`
+    padding: 12px 24px;
+`;
+
+const StyledDivider = styled(Divider)`
+    margin: 12px 0px;
+`;
+
+type Props = {
+    defaultSelectedTab: string;
+    tabs: {
+        key: string;
+        label: React.ReactNode;
+        content: React.ReactNode;
+        disabled?: boolean;
+        tooltip?: React.ReactNode;
+    }[];
+};
+
+export const AssertionTabs = ({ defaultSelectedTab, tabs }: Props) => {
+    const [selectedTab, setSelectedTab] = useState<string>(defaultSelectedTab);
+    return (
+        <>
+            <Tabs>
+                {tabs.map((tab) => (
+                    <Tooltip title={tab.tooltip} placement="bottom" showArrow={false}>
+                        <TabButton
+                            selected={selectedTab === tab.key}
+                            disabled={tab.disabled}
+                            key={tab.key}
+                            onClick={() => (!tab.disabled ? setSelectedTab(tab.key) : null)}
+                        >
+                            {tab.label}
+                        </TabButton>
+                    </Tooltip>
+                ))}
+            </Tabs>
+            <StyledDivider />
+            <TabContent>{tabs.find((tab) => tab.key === selectedTab)?.content}</TabContent>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ActionItem.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ActionItem.tsx
new file mode 100644
index 00000000000000..81a5e20da92292
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ActionItem.tsx
@@ -0,0 +1,60 @@
+import React from 'react';
+import { Tooltip } from '@components';
+import { TooltipPlacement } from 'antd/es/tooltip';
+import styled from 'styled-components';
+import { ActionItemButton } from './styledComponents';
+
+const StyledActionButtonContainer = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    color: #46507b;
+`;
+
+type Props = {
+    primary?: boolean;
+    tip?: string;
+    disabled?: boolean;
+    onClick: () => void;
+    icon: React.ReactNode;
+    key?: string;
+    placement?: TooltipPlacement;
+    isExpandedView?: boolean;
+    actionName?: string;
+};
+
+export const ActionItem = ({
+    primary = false,
+    tip,
+    disabled = false,
+    onClick,
+    icon,
+    key,
+    placement = 'top',
+    isExpandedView = false,
+    actionName,
+}: Props) => {
+    return (
+        <Tooltip placement={placement} title={isExpandedView ? '' : tip}>
+            <StyledActionButtonContainer
+                style={{ cursor: disabled ? 'not-allowed' : 'pointer' }}
+                onClick={(e) => {
+                    e.stopPropagation();
+                    if (disabled) return;
+                    onClick();
+                }}
+            >
+                <ActionItemButton
+                    primary={primary}
+                    key={key}
+                    disabled={disabled}
+                    title={!isExpandedView ? tip : undefined}
+                    isExpandedView={isExpandedView}
+                >
+                    {icon}
+                </ActionItemButton>
+                {isExpandedView && actionName && <span>{actionName}</span>}
+            </StyledActionButtonContainer>
+        </Tooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/Actions.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/Actions.tsx
new file mode 100644
index 00000000000000..fc2da4c0996452
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/Actions.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+
+import styled from 'styled-components';
+
+import { Assertion, DataContract } from '../../../../../../../../../types.generated';
+import { ContractAction } from './ContractAction';
+import { CopyLinkAction } from './CopyLinkAction';
+import { CopyUrnAction } from './CopyUrnAction';
+import { ExternalUrlAction } from './ExternalUrlAction';
+import { useIsOnSiblingsView } from '../../../../../../useIsSeparateSiblingsMode';
+
+const ActionList = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0px 20px;
+`;
+
+type Props = {
+    assertion: Assertion;
+    contract?: DataContract;
+    canEditContract: boolean;
+    refetch?: () => void;
+};
+
+export const Actions = ({ assertion, contract, canEditContract, refetch }: Props) => {
+    const isSiblingsView = useIsOnSiblingsView();
+
+    return (
+        <ActionList>
+            <ExternalUrlAction assertion={assertion} />
+            {/** Currently, we do not handle adding to a contract in siblings mode, since we only load the root node's contract. */}
+            {(!isSiblingsView && (
+                <ContractAction assertion={assertion} contract={contract} canEdit={canEditContract} refetch={refetch} />
+            )) ||
+                null}
+            <CopyLinkAction assertion={assertion} />
+            <CopyUrnAction assertion={assertion} />
+        </ActionList>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/AssertionListItemActions.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/AssertionListItemActions.tsx
new file mode 100644
index 00000000000000..cc7c829698f677
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/AssertionListItemActions.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Button, Dropdown, Menu } from 'antd';
+import { MoreOutlined } from '@ant-design/icons';
+
+import { Assertion, AssertionRunStatus, DataContract } from '../../../../../../../../../types.generated';
+import { ContractAction } from './ContractAction';
+import { CopyLinkAction } from './CopyLinkAction';
+import { CopyUrnAction } from './CopyUrnAction';
+import { ExternalUrlAction } from './ExternalUrlAction';
+import { useIsOnSiblingsView } from '../../../../../../useIsSeparateSiblingsMode';
+
+const ActionList = styled.div<{ $shouldRightAlign?: boolean }>`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: ${(props) => (props.$shouldRightAlign ? '0px' : '0px 10px')};
+    margin-left: ${(props) => (props.$shouldRightAlign ? 'auto' : undefined)};
+`;
+
+type Props = {
+    assertion: Assertion;
+    contract?: DataContract;
+    canEditContract: boolean;
+    refetch?: () => void;
+    shouldRightAlign?: boolean;
+};
+
+export const AssertionListItemActions = ({
+    assertion,
+    contract,
+    canEditContract,
+    refetch,
+    shouldRightAlign,
+}: Props) => {
+    const isSiblingsView = useIsOnSiblingsView();
+    const mostRun = assertion.runEvents?.runEvents;
+    const externalUrl =
+        assertion?.info?.externalUrl ||
+        (mostRun?.length && mostRun[0].status === AssertionRunStatus.Complete && mostRun[0].result?.externalUrl);
+    const menu = (
+        <Menu>
+            {/** Currently, we do not handle adding to a contract in siblings mode, since we only load the root node's contract. */}
+            {!isSiblingsView ? (
+                <Menu.Item key="1">
+                    <ContractAction
+                        assertion={assertion}
+                        contract={contract}
+                        canEdit={canEditContract}
+                        refetch={refetch}
+                        isExpandedView
+                    />
+                </Menu.Item>
+            ) : null}
+            {externalUrl ? (
+                <Menu.Item key="2">
+                    <ExternalUrlAction assertion={assertion} isExpandedView />
+                </Menu.Item>
+            ) : null}
+            <Menu.Item key="4">
+                <CopyLinkAction assertion={assertion} isExpandedView />
+            </Menu.Item>
+            <Menu.Item key="5">
+                <CopyUrnAction assertion={assertion} isExpandedView />
+            </Menu.Item>
+        </Menu>
+    );
+    return (
+        <ActionList onClick={(e) => e.stopPropagation()} $shouldRightAlign={shouldRightAlign}>
+            <Dropdown overlay={menu} trigger={['click']}>
+                <Button type="text" icon={<MoreOutlined />} />
+            </Dropdown>
+        </ActionList>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ContractAction.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ContractAction.tsx
new file mode 100644
index 00000000000000..7c6f24f8d9672d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ContractAction.tsx
@@ -0,0 +1,107 @@
+import React from 'react';
+
+import styled from 'styled-components';
+import { MinusOutlined, PlusOutlined } from '@ant-design/icons';
+import { message } from 'antd';
+
+import { ActionItem } from './ActionItem';
+import { Assertion, DataContract } from '../../../../../../../../../types.generated';
+import { useUpsertDataContractMutation } from '../../../../../../../../../graphql/contract.generated';
+import {
+    buildAddAssertionToContractMutationVariables,
+    buildRemoveAssertionFromContractMutationVariables,
+} from '../../../contract/builder/utils';
+import { getDataContractCategoryFromAssertion, isAssertionPartOfContract } from '../../../contract/utils';
+import { useEntityData } from '../../../../../../../../entity/shared/EntityContext';
+import { useIsContractsEnabled } from './useIsContractsEnabled';
+
+const StyledMinusOutlined = styled(MinusOutlined)`
+    && {
+        font-size: 12px;
+        display: flex;
+    }
+`;
+
+const StyledPlusOutlined = styled(PlusOutlined)`
+    && {
+        font-size: 12px;
+        display: flex;
+    }
+`;
+
+type Props = {
+    assertion: Assertion;
+    contract?: DataContract;
+    canEdit: boolean;
+    // Should be defined if canEdit
+    refetch?: () => void;
+    isExpandedView?: boolean;
+};
+
+export const ContractAction = ({ assertion, contract, canEdit, refetch, isExpandedView = false }: Props) => {
+    const { urn: entityUrn } = useEntityData();
+    const [upsertDataContractMutation] = useUpsertDataContractMutation();
+    const contractsEnabled = useIsContractsEnabled();
+
+    if (!entityUrn || !contractsEnabled) {
+        return null;
+    }
+
+    const assertionUrn = assertion.urn;
+
+    const onAddToContract = () => {
+        const category = getDataContractCategoryFromAssertion(assertion);
+        upsertDataContractMutation({
+            variables: buildAddAssertionToContractMutationVariables(category, entityUrn, assertionUrn, contract),
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.success({ content: 'Added assertion to contract!', duration: 2 });
+                    refetch?.();
+                }
+            })
+            .catch(() => {
+                message.destroy();
+                message.error({ content: 'Failed to add Assertion to Contract. An unexpected error occurred' });
+            });
+    };
+
+    const onRemoveFromContract = () => {
+        upsertDataContractMutation({
+            variables: buildRemoveAssertionFromContractMutationVariables(entityUrn, assertionUrn, contract),
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.success({ content: 'Removed assertion from contract.', duration: 2 });
+                    refetch?.();
+                }
+            })
+            .catch(() => {
+                message.destroy();
+                message.error({ content: 'Failed to remove Assertion from Contract. An unexpected error occurred' });
+            });
+    };
+
+    const isPartOfContract = contract ? isAssertionPartOfContract(assertion, contract) : false;
+    const contractTip = isPartOfContract ? 'Remove from contract' : 'Add to contract';
+
+    const unauthorizedTip = canEdit ? undefined : 'You do not have permission to edit the contract';
+    const tip = canEdit ? contractTip : unauthorizedTip;
+
+    return (
+        <>
+            {(entityUrn && (
+                <ActionItem
+                    key="0"
+                    tip={tip}
+                    disabled={!canEdit}
+                    onClick={isPartOfContract ? onRemoveFromContract : onAddToContract}
+                    icon={isPartOfContract ? <StyledMinusOutlined /> : <StyledPlusOutlined />}
+                    isExpandedView={isExpandedView}
+                    actionName={contractTip}
+                />
+            )) ||
+                null}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyLinkAction.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyLinkAction.tsx
new file mode 100644
index 00000000000000..9570855e1139f0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyLinkAction.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+
+import styled from 'styled-components';
+import { LinkOutlined } from '@ant-design/icons';
+
+import { ActionItem } from './ActionItem';
+import { Assertion } from '../../../../../../../../../types.generated';
+import { useAssertionURNCopyLink } from '../../builder/hooks';
+
+const StyledLinkOutlined = styled(LinkOutlined)`
+    && {
+        font-size: 12px;
+        display: flex;
+    }
+`;
+
+type Props = {
+    assertion: Assertion;
+    isExpandedView?: boolean;
+};
+
+export const CopyLinkAction = ({ assertion, isExpandedView = false }: Props) => {
+    const onCopyLink = useAssertionURNCopyLink(assertion.urn);
+    return (
+        <ActionItem
+            key="copy-link"
+            tip="Copy link to this assertion"
+            icon={<StyledLinkOutlined />}
+            onClick={onCopyLink}
+            isExpandedView={isExpandedView}
+            actionName="Copy link"
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyUrnAction.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyUrnAction.tsx
new file mode 100644
index 00000000000000..11df2f365d6e1d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/CopyUrnAction.tsx
@@ -0,0 +1,43 @@
+import React, { useState } from 'react';
+
+import styled from 'styled-components';
+import { CheckOutlined, CopyOutlined } from '@ant-design/icons';
+
+import { ActionItem } from './ActionItem';
+import { Assertion } from '../../../../../../../../../types.generated';
+
+const StyledCheckOutlined = styled(CheckOutlined)`
+    && {
+        font-size: 12px;
+        display: flex;
+    }
+`;
+
+const StyledCopyOutlined = styled(CopyOutlined)`
+    && {
+        font-size: 12px;
+        display: flex;
+    }
+`;
+
+type Props = {
+    assertion: Assertion;
+    isExpandedView?: boolean;
+};
+
+export const CopyUrnAction = ({ assertion, isExpandedView = false }: Props) => {
+    const [isUrnCopied, setIsUrnCopied] = useState(false);
+    return (
+        <ActionItem
+            key="copy-urn"
+            tip="Copy urn for this assertion"
+            onClick={() => {
+                navigator.clipboard.writeText(assertion.urn);
+                setIsUrnCopied(true);
+            }}
+            icon={isUrnCopied ? <StyledCheckOutlined /> : <StyledCopyOutlined />}
+            isExpandedView={isExpandedView}
+            actionName="Copy urn"
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ExternalUrlAction.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ExternalUrlAction.tsx
new file mode 100644
index 00000000000000..585b5ce35fdeea
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/ExternalUrlAction.tsx
@@ -0,0 +1,58 @@
+import React from 'react';
+
+import styled from 'styled-components';
+import { LaunchOutlined } from '@mui/icons-material';
+import analytics, { EntityActionType, EventType } from '../../../../../../../../analytics';
+import { ActionItem } from './ActionItem';
+import { Assertion, AssertionRunStatus, EntityType } from '../../../../../../../../../types.generated';
+
+const StyledLaunchOutlined = styled(LaunchOutlined)`
+    && {
+        display: flex;
+        font-size: 16px;
+    }
+`;
+
+type Props = {
+    assertion: Assertion;
+    isExpandedView?: boolean;
+};
+
+export const ExternalUrlAction = ({ assertion, isExpandedView = false }: Props) => {
+    const platformName =
+        assertion?.platform?.properties?.displayName || assertion?.platform?.name || 'external platform';
+    const externalUrl =
+        assertion?.info?.externalUrl ||
+        (assertion.runEvents?.runEvents?.length &&
+            assertion.runEvents.runEvents[0].status === AssertionRunStatus.Complete &&
+            assertion.runEvents.runEvents[0].result?.externalUrl);
+
+    if (!externalUrl) {
+        return null;
+    }
+
+    const handleRedirect = () => {
+        // Sending analytics data
+        analytics.event({
+            type: EventType.EntityActionEvent,
+            actionType: EntityActionType.ClickExternalUrl,
+            entityType: EntityType.Assertion,
+            entityUrn: assertion.urn,
+        });
+
+        // Opening the URL in a new tab
+        window.open(externalUrl, '_blank', 'noopener,noreferrer');
+    };
+
+    return (
+        <ActionItem
+            key="external-url"
+            primary
+            tip={`View in ${platformName}.`}
+            onClick={handleRedirect}
+            icon={<StyledLaunchOutlined />}
+            isExpandedView={isExpandedView}
+            actionName="View External platform"
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/styledComponents.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/styledComponents.tsx
new file mode 100644
index 00000000000000..e5ba6ac093de3d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/styledComponents.tsx
@@ -0,0 +1,37 @@
+import styled from 'styled-components';
+
+// Helper functions to simplify logic
+const getBackgroundColor = ({ isExpandedView, primary }: { isExpandedView?: boolean; primary?: boolean }) => {
+    if (isExpandedView) return 'inherit';
+    return primary ? '#5280e8' : '#ffffff';
+};
+
+const getColor = ({ isExpandedView, primary }: { isExpandedView?: boolean; primary?: boolean }) => {
+    if (primary) return '#fff';
+    return isExpandedView ? '#000' : '#5280e8';
+};
+const getBorder = ({ isExpandedView, primary }: { isExpandedView?: boolean; primary?: boolean }) => {
+    if (isExpandedView) return 'none';
+    return primary ? '1px solid #5280e8' : '1px solid #f0f0f0';
+};
+
+export const ActionItemButton = styled.button<{ disabled?: boolean; primary?: boolean; isExpandedView?: boolean }>`
+    border-radius: ${(props) => (props.isExpandedView ? `0px` : `20px`)};
+    width: 28px;
+    height: 28px;
+    margin: ${(props) => (props.isExpandedView ? `0px` : `0px 4px`)};
+    padding: 0px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    overflow: hidden;
+    background-color: ${(props) => getBackgroundColor(props)};
+    color: ${(props) => getColor(props)};
+    box-shadow: none;
+    cursor: ${(props) => (props.disabled ? 'not-allowed' : 'pointer')};
+    &&:hover {
+        ${(props) => !props.disabled && 'opacity: 0.8;'}
+    }
+    ${(props) => props.disabled && 'opacity: 0.5'};
+    border: ${(props) => getBorder(props)};
+`;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/useIsContractsEnabled.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/useIsContractsEnabled.tsx
new file mode 100644
index 00000000000000..e04dcdc32257fb
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/useIsContractsEnabled.tsx
@@ -0,0 +1,7 @@
+import { useAppConfig } from '../../../../../../../../useAppConfig';
+
+export const useIsContractsEnabled = () => {
+    const appConfig = useAppConfig();
+    const contractsEnabled = appConfig.config.featureFlags?.dataContractsEnabled;
+    return contractsEnabled;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/AssertionResultDot.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/AssertionResultDot.tsx
new file mode 100644
index 00000000000000..95030aab244c28
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/AssertionResultDot.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import styled from 'styled-components';
+
+import { AssertionResultType, AssertionRunEvent } from '../../../../../../../../../types.generated';
+import { getResultDotIcon } from '../../../assertionUtils';
+
+const StyledAssertionResultDotContainer = styled.div`
+    display: flex;
+`;
+
+type Props = {
+    run?: AssertionRunEvent;
+    disabled?: boolean;
+    size?: number;
+};
+
+// TODO: Add our beautiful new tooltip here.
+export const AssertionResultDot = ({ run, disabled, size = 14 }: Props) => {
+    const icon = getResultDotIcon(run?.result?.type as AssertionResultType, size, disabled);
+    return (
+        <StyledAssertionResultDotContainer
+            className="assertion-result-dot"
+            data-assertion-resut-type={run?.result?.type}
+        >
+            {icon}
+        </StyledAssertionResultDotContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/CloseButton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/CloseButton.tsx
new file mode 100644
index 00000000000000..ce7616404a821e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/CloseButton.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+
+import { ArrowRightOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+
+type Props = {
+    close: () => void;
+};
+
+export const CloseButton = ({ close }: Props) => {
+    return (
+        <Button type="text" onClick={close}>
+            <ArrowRightOutlined />
+        </Button>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/isExternalAssertion.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/isExternalAssertion.tsx
new file mode 100644
index 00000000000000..001d397ca54578
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/isExternalAssertion.tsx
@@ -0,0 +1,15 @@
+import { AssertionSourceType, AssertionType } from '../../../../../../../../../types.generated';
+
+/**
+ * Returns true if the assertion is definitely an external assertion,
+ * meaning that was reported using a custom source or a well-supported integration
+ * like dbt test or Great Expectations.
+ */
+export const isExternalAssertion = (assertion) => {
+    return (
+        assertion?.info?.type === AssertionType.Dataset || // Legacy, non-native assertion type.
+        assertion?.info?.type === AssertionType.Custom ||
+        (assertion?.info?.source?.type !== AssertionSourceType.Inferred &&
+            assertion?.info?.source?.type !== AssertionSourceType.Native)
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopover.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopover.tsx
new file mode 100644
index 00000000000000..a9f86ec0bb482e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopover.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+
+import { Popover } from '@components';
+import { TooltipPlacement } from 'antd/lib/tooltip';
+
+import { Assertion, AssertionRunEvent } from '../../../../../../../../../../types.generated';
+import { AssertionResultPopoverContent } from './AssertionResultPopoverContent';
+import { ResultStatusType } from '../../summary/shared/resultMessageUtils';
+
+type Props = {
+    assertion: Assertion;
+    run?: AssertionRunEvent;
+    showProfileButton?: boolean;
+    onClickProfileButton?: () => void;
+    placement?: TooltipPlacement;
+    children: React.ReactNode;
+    resultStatusType?: ResultStatusType;
+};
+
+export const AssertionResultPopover = ({
+    assertion,
+    run,
+    showProfileButton,
+    onClickProfileButton,
+    placement,
+    children,
+    resultStatusType,
+}: Props) => {
+    return (
+        <Popover
+            overlayInnerStyle={{ width: 400, overflow: 'hidden' }}
+            showArrow={false}
+            trigger="hover"
+            content={
+                <AssertionResultPopoverContent
+                    assertion={assertion}
+                    run={run}
+                    showProfileButton={showProfileButton}
+                    onClickProfileButton={onClickProfileButton}
+                    resultStatusType={resultStatusType}
+                />
+            }
+            placement={placement}
+        >
+            {children}
+        </Popover>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopoverContent.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopoverContent.tsx
new file mode 100644
index 00000000000000..5185fdeaa9e56e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/result/AssertionResultPopoverContent.tsx
@@ -0,0 +1,229 @@
+import React from 'react';
+
+import styled from 'styled-components';
+import { Divider, Typography } from 'antd';
+import { ClockCircleOutlined } from '@ant-design/icons';
+
+import { Assertion, AssertionResultType, AssertionRunEvent } from '../../../../../../../../../../types.generated';
+import { AssertionResultPill } from '../../summary/shared/AssertionResultPill';
+import { PrimaryButton } from '../../../builder/details/PrimaryButton';
+import { isExternalAssertion } from '../isExternalAssertion';
+import { ProviderSummarySection } from '../../summary/schedule/ProviderSummarySection';
+import { ANTD_GRAY } from '../../../../../../../constants';
+import { toReadableLocalDateTimeString } from '../utils';
+import {
+    ResultStatusType,
+    getDetailedErrorMessage,
+    getFormattedExpectedResultText,
+    getFormattedReasonText,
+} from '../../summary/shared/resultMessageUtils';
+
+const HeaderRow = styled.div`
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 4px;
+`;
+
+// NOTE: removed the title for now as the assertion's current title may not accurately describe the assertion that ran at this point in history
+// const Title = styled.div`
+//     flex: 1;
+//     font-size: 16px;
+//     font-weight: 600;
+//     overflow: hidden;
+//     > div {
+//         overflow: hidden;
+//         white-space: nowrap;
+//         text-overflow: ellipsis;
+//     }
+//     margin-right: 20px;
+// `;
+
+const Actions = styled.div`
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    gap: 8px;
+`;
+
+const TimestampContainer = styled.div`
+    gap: 5px;
+    display: flex;
+    flex-direction: column;
+`;
+
+const LastResultsRow = styled.div`
+    font-size: 14px;
+    display: flex;
+    align-items: center;
+    font-weight: 500;
+`;
+const LastRunRow = styled.div`
+    font-size: 10px;
+    display: flex;
+    align-items: center;
+    font-weight: 500;
+    color: ${ANTD_GRAY[7]};
+    .anticon-clock-circle {
+        font-size: 10px;
+    }
+`;
+
+const ReasonRow = styled.div``;
+
+const SecondaryHeader = styled.div`
+    font-size: 10px;
+    color: ${ANTD_GRAY[7]};
+`;
+
+const ReasonText = styled.div``;
+
+const ContextRow = styled.div``;
+
+const ExpectedText = styled.div``;
+
+const PlatformRow = styled.div``;
+
+const StyledClockCircleOutlined = styled(ClockCircleOutlined)`
+    margin-right: 4px;
+    font-size: 12px;
+`;
+
+const ThinDivider = styled(Divider)`
+    margin: 12px 0px;
+    padding: 0px;
+`;
+
+const detailsButtonStyle = {
+    borderRadius: 20,
+    padding: '4px 12px',
+};
+
+type Props = {
+    assertion: Assertion;
+    run?: AssertionRunEvent;
+    showProfileButton?: boolean;
+    onClickProfileButton?: () => void;
+    resultStatusType?: ResultStatusType;
+};
+
+// TODO: Add this in the assertion list, as hover on the timeline as well.
+export const AssertionResultPopoverContent = ({
+    assertion,
+    run,
+    showProfileButton,
+    resultStatusType,
+    onClickProfileButton,
+}: Props) => {
+    // Last run time
+    const timestamp = run && new Date(run?.timestampMillis);
+    const reportedTimestamp = run && run?.lastObservedMillis;
+
+    // Reason
+    const result = run?.result ? run.result! : undefined;
+    const reasonText = run ? getFormattedReasonText(assertion, run) : undefined;
+    const hasReason = !!reasonText;
+
+    // Context
+    const expectedText = run ? getFormattedExpectedResultText() : undefined;
+    const hasContext = !!expectedText;
+
+    // Error
+    const errorMessage = (run && getDetailedErrorMessage(run)) || undefined;
+    const hasDetailedError = run?.result?.type === AssertionResultType.Error && !!errorMessage;
+
+    // Platform
+    const isExternal = isExternalAssertion(assertion);
+    const hasPlatform = !!assertion.platform;
+
+    return (
+        <>
+            <HeaderRow>
+                <TimestampContainer>
+                    {/* NOTE: we don't show the assertion title in the header because the assertion's current title may not accurately represent the assertion that actually ran at this point in time. */}
+                    <LastResultsRow>
+                        {(timestamp && (
+                            <>
+                                <StyledClockCircleOutlined /> Ran {toReadableLocalDateTimeString(run?.timestampMillis)}{' '}
+                            </>
+                        )) || <>No results yet</>}
+                    </LastResultsRow>
+                    {reportedTimestamp && (
+                        <LastRunRow>
+                            Reported {reportedTimestamp && toReadableLocalDateTimeString(reportedTimestamp)}
+                        </LastRunRow>
+                    )}
+                </TimestampContainer>
+                <Actions>
+                    <AssertionResultPill result={result} type={resultStatusType} />
+                    {(showProfileButton && onClickProfileButton && (
+                        <PrimaryButton title="Details" onClick={onClickProfileButton} style={detailsButtonStyle} />
+                    )) ||
+                        undefined}
+                </Actions>
+            </HeaderRow>
+            {hasReason && (
+                <>
+                    <ThinDivider />
+                    <ReasonRow>
+                        <SecondaryHeader>Reason</SecondaryHeader>
+                        <ReasonText>{reasonText}</ReasonText>
+                    </ReasonRow>
+                </>
+            )}
+            {hasContext && (
+                <>
+                    <ThinDivider />
+                    <ContextRow>
+                        <SecondaryHeader>Expected</SecondaryHeader>
+                        <ExpectedText>{expectedText}</ExpectedText>
+                    </ContextRow>
+                </>
+            )}
+            {hasDetailedError && (
+                <>
+                    <ThinDivider />
+                    <ContextRow>
+                        <SecondaryHeader>Message</SecondaryHeader>
+                        <Typography.Paragraph
+                            ellipsis={{
+                                expandable: true,
+                                symbol: 'more',
+                                rows: 3,
+                                onExpand: (e) => e.stopPropagation(),
+                            }}
+                        >
+                            {errorMessage}
+                        </Typography.Paragraph>
+                    </ContextRow>
+                </>
+            )}
+            {isExternal ? (
+                <>
+                    {/* Show the native results if it's an external platform, so the customers can see things like 'result' that they've emitted into DH */}
+                    {result?.nativeResults?.length
+                        ? [
+                              <ThinDivider />,
+                              <PlatformRow>
+                                  {result.nativeResults.map((entry) => (
+                                      <div>
+                                          <Typography.Text strong>{entry.key}</Typography.Text>: {entry.value}
+                                      </div>
+                                  ))}
+                              </PlatformRow>,
+                          ]
+                        : null}
+                    {hasPlatform && (
+                        <>
+                            {/* Show the external platform details */}
+                            <ThinDivider />
+                            <PlatformRow>
+                                <ProviderSummarySection assertion={assertion} showDivider={false} />
+                            </PlatformRow>
+                        </>
+                    )}
+                </>
+            ) : null}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/utils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/utils.ts
new file mode 100644
index 00000000000000..4e22c119ece7d7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/utils.ts
@@ -0,0 +1,11 @@
+export const toReadableLocalDateTimeString = (timeMs: number) => {
+    const date = new Date(timeMs);
+    return date.toLocaleString([], {
+        year: 'numeric',
+        month: 'short',
+        day: 'numeric',
+        hour: 'numeric',
+        minute: '2-digit',
+        timeZoneName: 'short',
+    });
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionDescription.tsx
new file mode 100644
index 00000000000000..9808d6777cfe24
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionDescription.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+
+import { Typography } from 'antd';
+import { Assertion } from '../../../../../../../../../types.generated';
+import { useBuildAssertionDescriptionLabels } from './utils';
+
+type Props = {
+    assertion: Assertion;
+    options?: {
+        noSecondarySpacing?: boolean;
+        showColumnTag?: boolean;
+        hideSecondaryLabel?: boolean;
+    };
+};
+
+// Component useful for rendering descriptions of assertions.
+export const AssertionDescription = ({ assertion, options }: Props) => {
+    const assertionInfo = assertion.info;
+    const monitorSchedule = null;
+    const { primaryLabel, secondaryLabel } = useBuildAssertionDescriptionLabels(assertionInfo, monitorSchedule, {
+        showColumnTag: options?.showColumnTag,
+    });
+
+    return (
+        <>
+            {primaryLabel}
+            {!options?.hideSecondaryLabel && (
+                <Typography.Text style={{ marginLeft: options?.noSecondarySpacing ? 0 : 12 }}>
+                    {secondaryLabel}
+                </Typography.Text>
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryContent.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryContent.tsx
new file mode 100644
index 00000000000000..69aba2285b3304
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryContent.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+
+import { Divider } from 'antd';
+
+import { Assertion } from '../../../../../../../../../types.generated';
+import { AssertionSummarySection } from './AssertionSummarySection';
+import { AssertionResultsTimeline } from './result/timeline/AssertionResultsTimeline';
+import { AssertionResultsTable } from './result/table/AssertionResultsTable';
+import { AssertionScheduleSummary } from './schedule/AssertionScheduleSummary';
+
+type Props = {
+    assertion: Assertion;
+};
+
+export const AssertionSummaryContent = ({ assertion }: Props) => {
+    const lastEvaluatedAtMillis = assertion.runEvents?.runEvents?.[0]?.timestampMillis;
+    return (
+        <>
+            {/* NOTE: the timeline chart will have a title, so no need to add a section title here */}
+            <AssertionSummarySection>
+                <AssertionResultsTimeline assertion={assertion} />
+            </AssertionSummarySection>
+            <Divider />
+            <AssertionSummarySection title="Activity">
+                <AssertionResultsTable assertion={assertion} />
+            </AssertionSummarySection>
+            <Divider />
+            <AssertionSummarySection title="Schedule details">
+                <AssertionScheduleSummary assertion={assertion} lastEvaluatedAtMillis={lastEvaluatedAtMillis} />
+            </AssertionSummarySection>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryLoading.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryLoading.tsx
new file mode 100644
index 00000000000000..c2e635282a184a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryLoading.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+
+import { Skeleton } from 'antd';
+import styled from 'styled-components';
+
+const Container = styled.div`
+    display: flex;
+    flex-direction: column;
+    justify-content: start;
+    gap: 8px;
+    margin-left: 12px 0px 12px 0px;
+`;
+
+const CardSkeleton = styled(Skeleton.Input)`
+    && {
+        padding: 2px 12px 2px 0px;
+        height: 20px;
+        border-radius: 8px;
+        width: 100%;
+    }
+`;
+
+export const AssertionSummaryLoading = () => {
+    return (
+        <Container>
+            <CardSkeleton active size="large" />
+            <CardSkeleton active size="large" />
+            <CardSkeleton active size="large" />
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummarySection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummarySection.tsx
new file mode 100644
index 00000000000000..fb31752accf17f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummarySection.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../../../../constants';
+
+const Title = styled.div`
+    padding: 0;
+    margin: 0;
+    margin-bottom: 4px;
+    display: flex;
+    align-items: center;
+    color: ${ANTD_GRAY[9]};
+    font-weight: 600;
+    font-size: 16px;
+    margin-bottom: 18px;
+`;
+
+type Props = {
+    title?: string;
+    children: React.ReactNode;
+};
+
+export const AssertionSummarySection = ({ title, children }: Props) => {
+    return (
+        <>
+            {title ? <Title>{title}</Title> : null}
+            {children}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryTab.tsx
new file mode 100644
index 00000000000000..f5669f1f804340
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/AssertionSummaryTab.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+
+import { Assertion } from '../../../../../../../../../types.generated';
+import { AssertionSummaryLoading } from './AssertionSummaryLoading';
+import { AssertionSummaryContent } from './AssertionSummaryContent';
+
+type Props = {
+    loading: boolean;
+    assertion?: Assertion;
+};
+
+export const AssertionSummaryTab = ({ loading, assertion }: Props) => {
+    return (
+        <>
+            {loading || !assertion ? (
+                <AssertionSummaryLoading />
+            ) : (
+                <AssertionSummaryContent assertion={assertion as Assertion} />
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/NoResultsSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/NoResultsSummary.tsx
new file mode 100644
index 00000000000000..837b1a9a67d0fb
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/NoResultsSummary.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../../../../constants';
+
+const SecondaryText = styled.div`
+    color: ${ANTD_GRAY[7]};
+`;
+
+/**
+ * No results yet summarization.
+ */
+export const NoResultsSummary = () => {
+    return <SecondaryText>This assertion has not been evaluated yet! Come back later to view results.</SecondaryText>;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/popoverUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/popoverUtils.ts
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsLoadingItems.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsLoadingItems.tsx
new file mode 100644
index 00000000000000..5cc0a472c1efad
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsLoadingItems.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+
+import styled from 'styled-components';
+import { Skeleton, Timeline } from 'antd';
+import { range } from 'remirror';
+
+import { AssertionResultType } from '../../../../../../../../../../../types.generated';
+import { getResultDotIcon } from '../../../../../assertionUtils';
+import { ANTD_GRAY } from '../../../../../../../../constants';
+
+const ItemSkeleton = styled(Skeleton.Input)`
+    && {
+        width: 100%;
+        border-radius: 4px;
+        background-color: ${ANTD_GRAY[3]};
+    }
+`;
+
+export const AssertionResultsLoadingItems = () => {
+    return (
+        <>
+            {range(0, 3).map((index) => (
+                <Timeline.Item
+                    key={index}
+                    dot={<div style={{ opacity: 0.3 }}>{getResultDotIcon(AssertionResultType.Success)}</div>}
+                >
+                    <ItemSkeleton active />
+                </Timeline.Item>
+            ))}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsTable.tsx
new file mode 100644
index 00000000000000..31c84f3a181221
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsTable.tsx
@@ -0,0 +1,93 @@
+import React, { useState } from 'react';
+
+import styled from 'styled-components';
+import { Timeline } from 'antd';
+
+import { Assertion, AssertionResultType, AssertionRunEvent } from '../../../../../../../../../../../types.generated';
+import { useGetAssertionRunsQuery } from '../../../../../../../../../../../graphql/assertion.generated';
+import { ANTD_GRAY } from '../../../../../../../../constants';
+import { getResultColor } from '../../../../../assertionUtils';
+import { AssertionResultsTableItem } from './AssertionResultsTableItem';
+import { AssertionResultsLoadingItems } from './AssertionResultsLoadingItems';
+import { NoResultsSummary } from '../../NoResultsSummary';
+import { AssertionResultDot } from '../../../shared/AssertionResultDot';
+
+const Container = styled.div`
+    margin-top: 20px;
+`;
+
+const StyledTimeline = styled.div`
+    margin: 12px 4px;
+`;
+
+const ShowMoreButton = styled.div`
+    color: ${ANTD_GRAY[7]};
+    cursor: pointer;
+    :hover {
+        text-decoration: underline;
+    }
+`;
+
+type Props = {
+    assertion: Assertion;
+};
+
+const DEFAULT_FETCH_COUNT = 25;
+const DEFAULT_VISIBLE_COUNT = 3;
+
+export const AssertionResultsTable = ({ assertion }: Props) => {
+    const [count, setCount] = useState(DEFAULT_FETCH_COUNT);
+    const [visible, setVisible] = useState(DEFAULT_VISIBLE_COUNT);
+    const { data, loading } = useGetAssertionRunsQuery({
+        variables: {
+            assertionUrn: assertion.urn,
+            limit: count,
+        },
+        fetchPolicy: 'cache-first',
+    });
+    const visibleRuns = data?.assertion?.runEvents?.runEvents?.slice(0, visible) || [];
+    const total = data?.assertion?.runEvents?.total || 0;
+    const showMore = visible < total;
+
+    const timelineItems = visibleRuns.map((run) => {
+        return {
+            dot: (
+                <div style={{ paddingTop: 12 }}>
+                    <AssertionResultDot run={run as AssertionRunEvent} />
+                </div>
+            ),
+            color: getResultColor(run.result?.type as AssertionResultType),
+            children: <AssertionResultsTableItem assertion={assertion} run={run as AssertionRunEvent} />,
+            key: run.timestampMillis,
+        };
+    });
+
+    if (visibleRuns.length === 0) {
+        return <NoResultsSummary />;
+    }
+
+    return (
+        <Container>
+            <StyledTimeline>
+                {(loading && <AssertionResultsLoadingItems />) ||
+                    timelineItems.map((item) => (
+                        <Timeline.Item key={item.key} dot={item.dot} color={item.color}>
+                            {item.children}
+                        </Timeline.Item>
+                    ))}
+            </StyledTimeline>
+            {showMore && (
+                <ShowMoreButton
+                    onClick={() => {
+                        if (visible + DEFAULT_VISIBLE_COUNT > count) {
+                            setCount(count + DEFAULT_FETCH_COUNT);
+                        }
+                        setVisible(visible + DEFAULT_VISIBLE_COUNT);
+                    }}
+                >
+                    Show more
+                </ShowMoreButton>
+            )}
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsTableItem.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsTableItem.tsx
new file mode 100644
index 00000000000000..02dc6d6f9e263f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/table/AssertionResultsTableItem.tsx
@@ -0,0 +1,87 @@
+import React from 'react';
+
+import styled from 'styled-components';
+import { Tooltip } from '@components';
+
+import { Assertion, AssertionRunEvent } from '../../../../../../../../../../../types.generated';
+import { ANTD_GRAY } from '../../../../../../../../constants';
+import { toLocalDateTimeString, toRelativeTimeString } from '../../../../../../../../../../shared/time/timeUtils';
+import { getFormattedTimeString } from '../timeline/utils';
+import { ResultStatusType, getFormattedReasonText, getFormattedResultText } from '../../shared/resultMessageUtils';
+import { getResultColor } from '../../../../../assertionUtils';
+import { AssertionResultPopover } from '../../../shared/result/AssertionResultPopover';
+import { applyOpacityToHexColor } from '../../../../../../../../../../shared/styleUtils';
+
+const Container = styled.div<{ highlightColor?: string }>`
+    display: flex;
+    align-items: start;
+    justify-content: start;
+    padding: 4px 8px;
+    border-radius: 4px;
+    :hover {
+        background-color: ${(props) => props.highlightColor || ANTD_GRAY[2]};
+    }
+`;
+
+const TimeColumn = styled.div`
+    display: flex;
+    flex-direction: column;
+    justify-content: start;
+    align-items: start;
+    width: 112px;
+`;
+
+const ResultColumn = styled.div`
+    display: flex;
+    flex-direction: column;
+    justify-content: start;
+    align-items: start;
+    flex: 1;
+`;
+
+const PreHeaderText = styled.div<{ color?: string }>`
+    font-size: 12px;
+    color: ${(props) => props.color || ANTD_GRAY[7]};
+`;
+
+const HeaderText = styled.div`
+    font-size: 14px;
+`;
+
+type Props = {
+    assertion: Assertion;
+    run: AssertionRunEvent;
+};
+
+export const AssertionResultsTableItem = ({ assertion, run }: Props) => {
+    const assertionRunTime = run.timestampMillis;
+    const absoluteRunTime = getFormattedTimeString(assertionRunTime);
+    const resultText = getFormattedResultText(run.result?.type);
+    const resultTextColor = getResultColor(run.result?.type) || undefined;
+    const reasonText = getFormattedReasonText(assertion, run);
+    const highlightColor = getResultColor(run.result?.type);
+    return (
+        <Container
+            highlightColor={(highlightColor && applyOpacityToHexColor(highlightColor, 0.035)) || resultTextColor}
+        >
+            <Tooltip showArrow={false} placement="left" title={toLocalDateTimeString(assertionRunTime)}>
+                <TimeColumn>
+                    <PreHeaderText>{toRelativeTimeString(assertionRunTime)}</PreHeaderText>
+                    <HeaderText>{absoluteRunTime}</HeaderText>
+                </TimeColumn>
+            </Tooltip>
+            <AssertionResultPopover
+                assertion={assertion}
+                run={run}
+                showProfileButton={false}
+                resultStatusType={ResultStatusType.LATEST}
+                placement="bottom"
+            >
+                <ResultColumn>
+                    <PreHeaderText color={resultTextColor}>{resultText}</PreHeaderText>
+                    <HeaderText>{reasonText}</HeaderText>
+                </ResultColumn>
+            </AssertionResultPopover>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionResultsTimeline.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionResultsTimeline.tsx
new file mode 100644
index 00000000000000..78a915a67d6a7b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionResultsTimeline.tsx
@@ -0,0 +1,111 @@
+import React, { useEffect, useState } from 'react';
+
+import styled from 'styled-components';
+
+import { useGetAssertionRunsLazyQuery } from '../../../../../../../../../../../graphql/assertion.generated';
+import { getFixedLookbackWindow } from '../../../../../../../../../../shared/time/timeUtils';
+import { LOOKBACK_WINDOWS } from '../../../../../../Stats/lookbackWindows';
+import { TimeSelect } from './TimeSelect';
+import { AssertionResultsTimelineViz } from './AssertionResultsTimelineViz';
+import { Assertion, AssertionType } from '../../../../../../../../../../../types.generated';
+import { calculateInitialLookbackWindowFromRunEvents } from './utils';
+import { AssertionTimelineSkeleton } from './AssertionTimelineSkeleton';
+import { Message } from '../../../../../../../../../../shared/Message';
+
+const RESULT_CHART_WIDTH_PX = 560;
+const VIZ_CONTAINER_HEIGHT = 240;
+const FRESHNESS_VIZ_CONTAINER_HEIGHT = 180;
+
+const Container = styled.div`
+    width: ${RESULT_CHART_WIDTH_PX}px;
+`;
+
+type Props = {
+    assertion: Assertion;
+};
+
+// TODO: Add the run summary table here as well.
+// TODO: here's where we will switch on the assertion itself.
+export const AssertionResultsTimeline = ({ assertion }: Props) => {
+    /**
+     * Retrieve a specific assertion's evaluations between a particular start and end time.
+     */
+    const [getAssertionRuns, { data, loading, error }] = useGetAssertionRunsLazyQuery({ fetchPolicy: 'cache-first' });
+
+    /**
+     * Set default window for fetching assertion history.
+     */
+    const [lookbackWindow, setLookbackWindow] = useState(LOOKBACK_WINDOWS.MONTH);
+
+    /**
+     * Track whether we've triggered a data fetch yet
+     */
+    const [hasInitialDataFetchTriggered, setHasInitialDataFetchTriggered] = useState(false);
+
+    /**
+     * On initial load, set the lookback window to a reasonable scale
+     */
+    const [hasInitializedLookbackWindow, setHasInitializedLookbackWindow] = useState(false);
+    const allRunEvents = data?.assertion?.runEvents?.runEvents;
+    useEffect(() => {
+        if (hasInitializedLookbackWindow) return;
+
+        const maybeWindow = allRunEvents && calculateInitialLookbackWindowFromRunEvents(allRunEvents);
+        if (maybeWindow) {
+            setLookbackWindow(maybeWindow);
+        }
+        if (!loading && hasInitialDataFetchTriggered) {
+            // Update initialization state on the next tick so the UI has a tick to react to the new lookback window
+            setTimeout(() => setHasInitializedLookbackWindow(true), 0);
+        }
+    }, [allRunEvents, loading, hasInitialDataFetchTriggered, hasInitializedLookbackWindow]);
+
+    /**
+     * Whenever the selected lookback window changes (via user selection), then
+     * refetch the runs for the assertion.
+     */
+    useEffect(() => {
+        getAssertionRuns({
+            variables: { assertionUrn: assertion.urn, ...getFixedLookbackWindow(lookbackWindow.windowSize) },
+        });
+
+        // Next tick so the UI has a moment to respond to the graphql query starting
+        setTimeout(() => setHasInitialDataFetchTriggered(true), 0);
+    }, [assertion.urn, lookbackWindow, getAssertionRuns]);
+
+    const selectedWindow = getFixedLookbackWindow(lookbackWindow.windowSize);
+    const selectedWindowTimeRange = {
+        startMs: selectedWindow.startTime,
+        endMs: selectedWindow.endTime,
+    };
+    const results = data?.assertion?.runEvents;
+    const isInitializing = !hasInitializedLookbackWindow;
+
+    const vizHeight =
+        assertion.info?.type === AssertionType.Freshness ? FRESHNESS_VIZ_CONTAINER_HEIGHT : VIZ_CONTAINER_HEIGHT;
+    return (
+        <Container>
+            {error && <Message type="error" content="Failed to load results! An unexpected error occurred." />}
+            {loading || isInitializing ? (
+                <AssertionTimelineSkeleton
+                    parentDimensions={{
+                        width: RESULT_CHART_WIDTH_PX,
+                        height: vizHeight,
+                    }}
+                />
+            ) : (
+                <AssertionResultsTimelineViz
+                    parentDimensions={{
+                        width: RESULT_CHART_WIDTH_PX,
+                        height: vizHeight,
+                    }}
+                    assertion={assertion}
+                    timeRange={selectedWindowTimeRange}
+                    isInitializing={isInitializing}
+                    results={results as any}
+                />
+            )}
+            <TimeSelect lookbackWindow={lookbackWindow} setLookbackWindow={setLookbackWindow} />
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionResultsTimelineViz.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionResultsTimelineViz.tsx
new file mode 100644
index 00000000000000..694ce120aa0418
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionResultsTimelineViz.tsx
@@ -0,0 +1,88 @@
+import React from 'react';
+
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import {
+    Assertion,
+    AssertionRunEventsResult,
+    AssertionRunStatus,
+} from '../../../../../../../../../../../types.generated';
+import { AssertionResultChartData, TimeRange } from './charts/types';
+import { getAssertionResultChartData } from './transformers';
+import { StatusOverTimeAssertionResultChart } from './charts/StatusOverTimeAssertionResultChart';
+import { ANTD_GRAY } from '../../../../../../../../constants';
+import { getTimeRangeDisplay } from './utils';
+
+const VIZ_CONTAINER_TITLE_HEIGHT = 36;
+
+const getVisualizationContainer = (height: number) => styled.div`
+    border-radius: 4px;
+    height: ${height}px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+`;
+
+const VizHeader = styled.div`
+    width: 100%;
+    height: ${VIZ_CONTAINER_TITLE_HEIGHT}px;
+    display: flex;
+    align-items: center;
+    justify-content: left;
+`;
+
+const VizHeaderTitle = styled(Typography.Text)`
+    margin-bottom: 20px;
+    margin-top: 4px;
+    color: ${ANTD_GRAY[9]};
+    font-size: 16px;
+    font-weight: 600;
+`;
+
+type Props = {
+    assertion: Assertion;
+    timeRange: TimeRange;
+    results?: AssertionRunEventsResult | null;
+    isInitializing: boolean;
+    parentDimensions: { width: number; height: number };
+};
+
+export const AssertionResultsTimelineViz = ({
+    assertion,
+    results,
+    timeRange,
+    parentDimensions,
+    isInitializing,
+}: Props) => {
+    // Run event data
+    const completedRuns =
+        results?.runEvents.filter((runEvent) => runEvent.status === AssertionRunStatus.Complete) || [];
+
+    const assertionResultChartData: AssertionResultChartData = getAssertionResultChartData(assertion, completedRuns);
+
+    // render
+    const chartDimensions = {
+        height: parentDimensions.height - VIZ_CONTAINER_TITLE_HEIGHT - 8, // margin below (flex-start)
+        width: parentDimensions.width - 8, // margin on the sides (we have align-items=center)
+    };
+
+    const renderChartTitle = (title?: string) => (
+        <VizHeader>
+            <VizHeaderTitle strong>{title || getTimeRangeDisplay(timeRange)}</VizHeaderTitle>
+        </VizHeader>
+    );
+
+    const renderChart = (): JSX.Element | undefined => {
+        return (
+            <StatusOverTimeAssertionResultChart
+                chartDimensions={chartDimensions}
+                data={assertionResultChartData}
+                timeRange={timeRange}
+                renderHeader={renderChartTitle}
+            />
+        );
+    };
+
+    const VisualizationContainer = getVisualizationContainer(parentDimensions.height);
+    return <VisualizationContainer style={{ opacity: isInitializing ? 0 : 1 }}>{renderChart()}</VisualizationContainer>;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionTimelineSkeleton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionTimelineSkeleton.tsx
new file mode 100644
index 00000000000000..de1b43a8cc9349
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/AssertionTimelineSkeleton.tsx
@@ -0,0 +1,94 @@
+import React from 'react';
+import { Col, Row, Typography } from 'antd';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../../../../../../constants';
+
+const SKELETON_MARGIN_BOTTOM_PX = 12;
+const Body = styled.div`
+    padding-bottom: ${SKELETON_MARGIN_BOTTOM_PX}px;
+`;
+
+const GridContainer = styled.div`
+    display: flex;
+`;
+
+const Container = styled.div`
+    padding: 0;
+    width: 100%;
+    height: 100%;
+    position: relative;
+`;
+
+const StyledCol = styled(Col)`
+    height: 100%;
+    padding: 0;
+    margin: 0;
+    display: flex;
+    justify-content: center;
+`;
+
+const Box = styled.div`
+    width: 100%;
+    height: 100%;
+    background-color: ${ANTD_GRAY[3]};
+    border: 1px solid ${ANTD_GRAY[4]};
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin: -1px 0 0 -1px;
+`;
+
+const GridSkeletonContainer = styled.div`
+    width: 100%;
+    height: 100%;
+`;
+
+const LoadingTextContainer = styled.div`
+    display: flex;
+    position: absolute;
+    z-index: 10;
+    width: 100%;
+    height: 100%;
+    justify-content: center;
+    align-items: center;
+`;
+const LoadingText = styled(Typography.Text)`
+    font-size: 14px;
+    color: ${ANTD_GRAY[6]};
+`;
+
+const NUM_GRID_BOXES = 12;
+const ANT_COL_6_SPAN = 6;
+const ANT_COL_6_ITEM_WIDTH_RATIO = 1 / 4;
+const NUM_GRID_ROWS = NUM_GRID_BOXES * ANT_COL_6_ITEM_WIDTH_RATIO;
+const renderGridSkeleton = (height: number) => {
+    const boxes = Array.from({ length: NUM_GRID_BOXES }, (_, index) => (
+        <StyledCol key={index} span={ANT_COL_6_SPAN}>
+            <Box style={{ height: height / NUM_GRID_ROWS }} />
+        </StyledCol>
+    ));
+
+    return (
+        <Container>
+            <LoadingTextContainer>
+                <LoadingText>Loading...</LoadingText>
+            </LoadingTextContainer>
+            <Row gutter={0}>{boxes}</Row>
+        </Container>
+    );
+};
+
+type Props = {
+    parentDimensions: { width: number; height: number };
+};
+
+export const AssertionTimelineSkeleton = (props: Props) => {
+    const skeletonHeight = props.parentDimensions.height - SKELETON_MARGIN_BOTTOM_PX;
+    return (
+        <Body style={props.parentDimensions}>
+            <GridContainer style={{ height: skeletonHeight }}>
+                <GridSkeletonContainer>{renderGridSkeleton(skeletonHeight)}</GridSkeletonContainer>
+            </GridContainer>
+        </Body>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/ColumnMetricAssertionsResultsGraph.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/ColumnMetricAssertionsResultsGraph.tsx
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/ColumnValueAssertionsResultsGraph.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/ColumnValueAssertionsResultsGraph.tsx
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/CustomSqlAssertionsResultsGraph.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/CustomSqlAssertionsResultsGraph.tsx
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/FreshnessAssertionsResultsGraph.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/FreshnessAssertionsResultsGraph.tsx
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/TimeSelect.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/TimeSelect.tsx
new file mode 100644
index 00000000000000..96c099232f3f67
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/TimeSelect.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+
+import styled from 'styled-components';
+import { SelectValue } from 'antd/lib/select';
+
+import { LookbackWindow, LOOKBACK_WINDOWS } from '../../../../../../Stats/lookbackWindows';
+import { SelectablePill } from '../../shared/SelectablePill';
+
+const TimeWindowPills = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    justify-content: start;
+    margin: 24px 4px;
+    margin-top: 0px;
+`;
+
+type Props = {
+    lookbackWindow: LookbackWindow;
+    setLookbackWindow: (newWindow: LookbackWindow) => void;
+};
+
+export const TimeSelect = ({ lookbackWindow, setLookbackWindow }: Props) => {
+    /**
+     * Invoked when user selects new lookback window (e.g. 1 year)
+     */
+    const onChangeLookbackWindow = (value: SelectValue) => {
+        const newLookbackWindow = Object.values(LOOKBACK_WINDOWS).filter((window) => window.text === value?.valueOf());
+        setLookbackWindow(newLookbackWindow[0]);
+    };
+
+    return (
+        <TimeWindowPills>
+            {Object.values(LOOKBACK_WINDOWS).map((window) => (
+                <SelectablePill
+                    text={window.text}
+                    selected={lookbackWindow === window}
+                    onSelect={() => onChangeLookbackWindow(window.text)}
+                />
+            ))}
+        </TimeWindowPills>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/VolumeAssertionResultsGraph.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/VolumeAssertionResultsGraph.tsx
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/StatusOverTimeAssertionResultChart.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/StatusOverTimeAssertionResultChart.tsx
new file mode 100644
index 00000000000000..d2cfe94ed36f85
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/StatusOverTimeAssertionResultChart.tsx
@@ -0,0 +1,132 @@
+import React, { useMemo } from 'react';
+
+import { Popover } from '@components';
+import { Group } from '@visx/group';
+import { AxisBottom } from '@visx/axis';
+import { scaleUtc } from '@visx/scale';
+import { GlyphCircle } from '@visx/glyph';
+import { LinePath } from '@visx/shape';
+import { GridColumns } from '@visx/grid';
+
+import { ANTD_GRAY } from '../../../../../../../../../constants';
+import { LinkWrapper } from '../../../../../../../../../../../shared/LinkWrapper';
+import { ACCENT_COLOR_HEX, generateTimeScaleTickValues, getCustomTimeScaleTickValue, getFillColor } from './utils';
+import { AssertionResultChartData, TimeRange } from './types';
+import { AssertionResultPopoverContent } from '../../../../shared/result/AssertionResultPopoverContent';
+import { getTimeRangeDisplay } from '../utils';
+
+type Props = {
+    data: AssertionResultChartData;
+    timeRange: TimeRange;
+    chartDimensions: {
+        width: number;
+        height: number;
+    };
+    renderHeader?: (title?: string) => JSX.Element;
+};
+
+const CHART_HORIZ_MARGIN = 36;
+const CHART_AXIS_BOTTOM_HEIGHT = 40;
+
+/**
+ * Assertion run result status displayed on a horizontal timeline.
+ * TODO(jayacryl) refactor to a pretty timeline line-view
+ */
+export const StatusOverTimeAssertionResultChart = ({ data, timeRange, chartDimensions, renderHeader }: Props) => {
+    const chartInnerHeight = chartDimensions.height - CHART_AXIS_BOTTOM_HEIGHT;
+    const chartInnerWidth = chartDimensions.width - CHART_HORIZ_MARGIN;
+
+    const xScale = useMemo(
+        () =>
+            scaleUtc({
+                domain: [new Date(timeRange.startMs), new Date(timeRange.endMs)],
+                range: [0, chartInnerWidth],
+            }),
+        [timeRange, chartInnerWidth],
+    );
+
+    const timeScaleTicks = generateTimeScaleTickValues(timeRange.startMs, timeRange.endMs);
+    return (
+        <>
+            {renderHeader?.(getTimeRangeDisplay(timeRange))}
+            <svg width={chartDimensions.width} height={chartDimensions.height}>
+                <Group left={CHART_HORIZ_MARGIN / 2}>
+                    {/* Axis */}
+                    <AxisBottom
+                        top={chartInnerHeight}
+                        scale={xScale}
+                        stroke={ANTD_GRAY[4]}
+                        tickValues={timeScaleTicks}
+                        tickFormat={(v) => getCustomTimeScaleTickValue(v, timeRange)}
+                        tickStroke={ANTD_GRAY[9]}
+                        tickLength={4}
+                        tickLabelProps={{
+                            fontSize: 11,
+                            angle: 0,
+                            textAnchor: 'middle',
+                        }}
+                    />
+
+                    {/* Grid */}
+                    <GridColumns
+                        scale={xScale}
+                        tickValues={timeScaleTicks}
+                        height={chartInnerHeight}
+                        lineStyle={{
+                            stroke: ANTD_GRAY[5],
+                            strokeLinecap: 'round',
+                            strokeWidth: 1,
+                            strokeDasharray: '1 4',
+                        }}
+                    />
+
+                    {/* Line */}
+                    <LinePath
+                        // Full across the entire timeline
+                        data={[0, chartInnerWidth]}
+                        x={(x) => x}
+                        y={chartDimensions.height / 3}
+                        stroke={ACCENT_COLOR_HEX}
+                        strokeWidth={0.5}
+                    />
+
+                    {/* Circular data points */}
+                    {data.dataPoints.map((dataPoint) => {
+                        const xOffset = xScale(new Date(dataPoint.time));
+                        const yOffset = chartDimensions.height / 3;
+                        const fillColor = getFillColor(dataPoint.result.type);
+                        return (
+                            <LinkWrapper key={dataPoint.time} to={dataPoint.result.resultUrl} target="_blank">
+                                <Popover
+                                    key={dataPoint.time}
+                                    title={undefined}
+                                    overlayStyle={{
+                                        maxWidth: 440,
+                                        wordWrap: 'break-word',
+                                    }}
+                                    content={
+                                        <AssertionResultPopoverContent
+                                            assertion={data.context.assertion}
+                                            run={dataPoint.relatedRunEvent}
+                                        />
+                                    }
+                                    showArrow={false}
+                                >
+                                    <GlyphCircle
+                                        left={xOffset}
+                                        top={yOffset}
+                                        fill={fillColor}
+                                        stroke="white"
+                                        strokeWidth={2}
+                                        size={100}
+                                        filter="drop-shadow(0px 1px 2.5px rgb(0 0 0 / 0.05))"
+                                    />
+                                </Popover>
+                            </LinkWrapper>
+                        );
+                    })}
+                </Group>
+            </svg>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/types.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/types.ts
new file mode 100644
index 00000000000000..b7afc8b8667b1a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/types.ts
@@ -0,0 +1,33 @@
+import { Maybe } from 'graphql/jsutils/Maybe';
+import { Assertion, AssertionResultType, AssertionRunEvent } from '../../../../../../../../../../../../types.generated';
+
+export type AssertionResult = {
+    type: AssertionResultType;
+    resultUrl?: Maybe<string>;
+    yValue?: number; // for checks with varying y-values
+};
+
+export type AssertionDataPoint = {
+    time: number;
+    result: AssertionResult;
+    relatedRunEvent: AssertionRunEvent;
+};
+
+export type AssertionResultChartData = {
+    dataPoints: AssertionDataPoint[];
+    yAxisLabel?: string;
+    context: {
+        assertion: Assertion;
+    };
+};
+
+export type TimeRange = {
+    startMs: number;
+    endMs: number;
+};
+
+export enum AssertionChartType {
+    ValuesOverTime,
+    StatusOverTime,
+    Freshness,
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/utils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/utils.ts
new file mode 100644
index 00000000000000..e0b828349dba07
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/utils.ts
@@ -0,0 +1,148 @@
+import _ from 'lodash';
+
+import {
+    AssertionInfo,
+    AssertionResultType,
+    AssertionType,
+    Maybe,
+} from '../../../../../../../../../../../../types.generated';
+import { AssertionChartType, AssertionDataPoint } from './types';
+
+export const ACCENT_COLOR_HEX = '#222222';
+export const EXTRA_HIGHLIGHT_COLOR_HEX = '#4050E7';
+export const SUCCESS_COLOR_HEX = '#52C41A';
+export const FAILURE_COLOR_HEX = '#F5222D';
+export const ERROR_COLOR_HEX = '#FAAD14';
+export const INIT_COLOR_HEX = '#8C8C8C';
+export const EXPECTED_RANGE_SHADE_COLOR = '#11d469';
+
+export const getFillColor = (type: AssertionResultType) => {
+    switch (type) {
+        case AssertionResultType.Success:
+            return SUCCESS_COLOR_HEX;
+        case AssertionResultType.Failure:
+            return FAILURE_COLOR_HEX;
+        case AssertionResultType.Error:
+            return ERROR_COLOR_HEX;
+        case AssertionResultType.Init:
+            return INIT_COLOR_HEX;
+        default:
+            throw new Error(`Unsupported Assertion Result Type ${type} provided.`);
+    }
+};
+
+/**
+ * For now we're keeping it simple by only showing the range of values being displayed on the chart
+ * @param minY
+ * @param maxY
+ * @returns {number[]}
+ */
+export function generateYScaleTickValues(minY: number, maxY: number): number[] {
+    return [minY, maxY];
+}
+
+export function generateTimeScaleTickValues(startMs: number, endMs: number): Date[] {
+    const ticks: Date[] = [];
+    const minDate = new Date(startMs);
+    const maxDate = new Date(endMs);
+    const diff = maxDate.getTime() - minDate.getTime();
+
+    const oneHourInMillis = 60 * 60 * 1000; // Milliseconds in one hour
+    const oneDayInMillis = 24 * oneHourInMillis; // Milliseconds in one day
+    const oneWeekInMillis = 7 * oneDayInMillis; // Milliseconds in one week
+
+    if (diff <= oneHourInMillis) {
+        // Last hour or less: ticks every 15 minutes
+        const currentDate = new Date(minDate);
+        while (currentDate <= maxDate) {
+            ticks.push(new Date(currentDate));
+            currentDate.setMinutes(currentDate.getMinutes() + 15);
+        }
+    } else if (diff <= oneDayInMillis) {
+        // Last day or less: ticks every 4 hours
+        const currentDate = new Date(minDate);
+        currentDate.setHours(minDate.getHours() - (minDate.getHours() % 4), 0, 0, 0); // Align to the nearest 4-hour mark
+        currentDate.setHours(currentDate.getHours() + 4); // skip hour 0 - looks better on the graph
+        while (currentDate <= maxDate) {
+            ticks.push(new Date(currentDate));
+            currentDate.setHours(currentDate.getHours() + 4);
+        }
+    } else if (diff <= oneWeekInMillis) {
+        // Less than a week: ticks at the start of each day
+        const currentDate = new Date(minDate);
+        currentDate.setHours(0, 0, 0, 0); // Start of the day
+        currentDate.setDate(currentDate.getDate() + 1); // skip day 0 - looks better on the graph
+        while (currentDate <= maxDate) {
+            ticks.push(new Date(currentDate));
+            currentDate.setDate(currentDate.getDate() + 1);
+        }
+    } else {
+        // More than a week: divide the range into 8 equal parts
+        const interval = diff / 7; // Divide into 8 parts, but calculate interval based on 7 divisions to include both start and end points
+        const currentDate = new Date(minDate.getTime());
+        for (let i = 0; i <= 7; i++) {
+            // Ensure we add the last tick by iterating one extra time
+            ticks.push(new Date(currentDate.getTime() + i * interval));
+        }
+    }
+
+    return ticks;
+}
+
+export function getCustomTimeScaleTickValue(v, timeRange) {
+    // Assuming 'v' is a JavaScript Date object.
+    // You'll need to adjust 'minDate' and 'maxDate' to reflect your actual data range.
+    const minDate = new Date(timeRange.startMs);
+    const maxDate = new Date(timeRange.endMs);
+
+    const oneHourInMillis = 60 * 60 * 1000; // Milliseconds in one hour
+    const oneDayInMillis = 24 * 60 * 60 * 1000; // Milliseconds in one day
+
+    // Determine if the range is less than or equal to one day
+    if (maxDate.getTime() - minDate.getTime() <= oneHourInMillis) {
+        return v.toLocaleTimeString('en-us', { hour: '2-digit', minute: '2-digit' });
+    }
+    if (maxDate.getTime() - minDate.getTime() <= oneDayInMillis) {
+        // Format as hour of the day if the range is within a single day
+        return v.toLocaleTimeString('en-us', { hour: 'numeric' });
+    }
+    // Format as month and day if the range is more than one day
+    return v.toLocaleDateString('en-us', { month: 'short', day: 'numeric' });
+}
+
+export const getBestChartTypeForAssertion = (
+    assertionInfo?: AssertionInfo | Maybe<AssertionInfo>,
+): AssertionChartType => {
+    switch (assertionInfo?.type) {
+        case AssertionType.Freshness:
+            return AssertionChartType.Freshness;
+        case AssertionType.Field:
+            return AssertionChartType.ValuesOverTime;
+        case AssertionType.Sql:
+            return AssertionChartType.ValuesOverTime;
+        case AssertionType.Volume:
+            return AssertionChartType.ValuesOverTime;
+        default:
+            break;
+    }
+    return AssertionChartType.StatusOverTime; // safest catch-all fallback
+};
+
+/**
+ * Duplicates a datapoint with +- a certain amount of buffer on the timestamp
+ * Useful to extend a line with some buffer to the left and right
+ * @param dataPoint
+ * @param timestampMillisModifiers
+ * @returns {AssertionDataPoint[]}
+ */
+export const duplicateDataPointsAcrossBufferedTimeRange = (
+    dataPoint: AssertionDataPoint,
+    timestampMillisBuffer: number,
+): AssertionDataPoint[] => {
+    const timestampMillisModifiers = [-timestampMillisBuffer, 0, timestampMillisBuffer];
+    const points: AssertionDataPoint[] = timestampMillisModifiers.map((tsModifier) => ({
+        ...dataPoint,
+        time: dataPoint.time + tsModifier,
+    }));
+    return points;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/transformers.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/transformers.ts
new file mode 100644
index 00000000000000..8e353c97f6970c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/transformers.ts
@@ -0,0 +1,128 @@
+import { Maybe } from 'graphql/jsutils/Maybe';
+import {
+    Assertion,
+    AssertionInfo,
+    AssertionRunEvent,
+    AssertionType,
+    FieldAssertionInfo,
+    FieldAssertionType,
+} from '../../../../../../../../../../../types.generated';
+import { AssertionDataPoint, AssertionResultChartData } from './charts/types';
+import { getFieldMetricTypeReadableLabel } from '../../../../../fieldDescriptionUtils';
+import { tryGetPrimaryMetricValueFromAssertionRunEvent } from '../../shared/resultExtractionUtils';
+
+/**
+ * Gets the Y value that we should be plotting on the graph from the assertion run event
+ * @param runEvent
+ * @returns {number | undefined}
+ */
+export const tryGetYValueForChartFromAssertionRunEvent = (): number | undefined => {
+    return tryGetPrimaryMetricValueFromAssertionRunEvent();
+};
+
+/**
+ * Get assertion data points that can be plotted on the various assertion charts
+ * @param runEvents
+ * @returns {AssertionDataPoint[]}
+ */
+export const getAssertionDataPointsFromRunEvents = (runEvents: AssertionRunEvent[]): AssertionDataPoint[] => {
+    return (
+        runEvents
+            .filter((runEvent) => !!runEvent.result)
+            // TODO(jayacryl): filter out run events that don't have the same general metrics as the latest run event
+            // ie. if user changed a column assertion to do something completely different on a different column
+            .map((runEvent) => {
+                const result = runEvent.result!; // NOTE: we've done `!` because we filter it out in the earlier lambda
+                const resultUrl = result.externalUrl;
+
+                /**
+                 * Create a "result" to render in the timeline chart.
+                 */
+                const dataPoint: AssertionDataPoint = {
+                    time: runEvent.timestampMillis,
+                    result: {
+                        type: result.type,
+                        resultUrl,
+                        yValue: tryGetYValueForChartFromAssertionRunEvent(),
+                    },
+                    relatedRunEvent: runEvent,
+                };
+                return dataPoint;
+            }) || []
+    );
+};
+
+/**
+ * Gets a Y axis label depending on the assertion type
+ * @param assertionInfo
+ * @returns {number | undefined}
+ */
+export const tryGetYAxisLabelForChartFromAssertionInfo = (
+    assertionInfo?: AssertionInfo | Maybe<AssertionInfo>,
+): string | undefined => {
+    let label: string | undefined;
+    switch (assertionInfo?.type) {
+        case AssertionType.Volume:
+            label = 'Row count';
+            break;
+        case AssertionType.Field:
+            label = tryGetFieldAssertionYAxisLabel(assertionInfo.fieldAssertion);
+            break;
+        case AssertionType.Sql:
+            label = 'SQL query result';
+            break;
+        case AssertionType.DataSchema:
+            break;
+        case AssertionType.Freshness:
+            label = 'Freshness check results';
+            break;
+        case AssertionType.Dataset:
+            break;
+        default:
+            break;
+    }
+    return label;
+};
+
+function tryGetFieldAssertionYAxisLabel(info?: Maybe<FieldAssertionInfo>): string | undefined {
+    let label: string | undefined;
+    switch (info?.type) {
+        case FieldAssertionType.FieldValues:
+            label = 'Invalid Rows';
+            break;
+        case FieldAssertionType.FieldMetric: {
+            const maybeMetricType = info.fieldMetricAssertion?.metric;
+            try {
+                label = maybeMetricType && getFieldMetricTypeReadableLabel(maybeMetricType);
+            } catch (e) {
+                // Best attempt
+            }
+            label = label || maybeMetricType?.valueOf() || 'Metric Value';
+            break;
+        }
+        default:
+            break;
+    }
+    return label;
+}
+
+/**
+ * Gets all the data necessary to plot assertion and its run events on viz charts
+ * @param assertion
+ * @param completedRuns
+ * @returns {AssertionResultChartData}
+ */
+export const getAssertionResultChartData = (
+    assertion: Assertion,
+    completedRuns: AssertionRunEvent[],
+): AssertionResultChartData => {
+    const timelineDataPoints: AssertionDataPoint[] = getAssertionDataPointsFromRunEvents(completedRuns);
+    const maybeYAxisLabel: string | undefined = tryGetYAxisLabelForChartFromAssertionInfo(assertion.info);
+    return {
+        dataPoints: timelineDataPoints,
+        yAxisLabel: maybeYAxisLabel,
+        context: {
+            assertion,
+        },
+    };
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/utils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/utils.ts
new file mode 100644
index 00000000000000..9abfe4af50f718
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/utils.ts
@@ -0,0 +1,90 @@
+import { AssertionRunEventDetailsFragment } from '../../../../../../../../../../../graphql/assertion.generated';
+import { LOOKBACK_WINDOWS, LookbackWindow } from '../../../../../../Stats/lookbackWindows';
+
+const ONE_HOUR_IN_MS = 60 * 60 * 1000; // Milliseconds in one hour
+const ONE_DAY_IN_MS = 24 * ONE_HOUR_IN_MS; // Milliseconds in one day
+const ONE_WEEK_IN_MS = 7 * ONE_DAY_IN_MS; // Milliseconds in one week
+
+export function isLessThanOneDay(timeRange) {
+    return timeRange.endMs - timeRange.startMs <= ONE_DAY_IN_MS;
+}
+
+export function isLessThanOneHour(timeRange) {
+    return timeRange.endMs - timeRange.startMs <= ONE_HOUR_IN_MS;
+}
+
+export function isGreaterThanOneYear(timeRange) {
+    return timeRange.endMs - timeRange.startMs >= 365 * ONE_DAY_IN_MS;
+}
+
+export function getTimeRangeDisplay(timeRange) {
+    /**
+     * Start and end dates being observed in the chart.
+     */
+    const startDate = new Date(timeRange.startMs).toLocaleDateString('en-us', {
+        month: 'short',
+        day: 'numeric',
+    });
+    const endDate = new Date(timeRange.endMs).toLocaleDateString('en-us', {
+        month: 'short',
+        day: 'numeric',
+    });
+
+    if (isLessThanOneHour(timeRange)) {
+        return 'Last hour';
+    }
+    if (isLessThanOneDay(timeRange)) {
+        return 'Last day';
+    }
+    if (isGreaterThanOneYear(timeRange)) {
+        return 'Last year';
+    }
+    return `${startDate} - ${endDate}`;
+}
+
+export const getFormattedTimeString = (timestampMs) => {
+    // If the time is less than 1 day ago, show the time of day in hours and minutes.
+    if (Date.now() - timestampMs < ONE_DAY_IN_MS) {
+        return new Date(timestampMs).toLocaleTimeString('en-us', { hour: '2-digit', minute: '2-digit' });
+    }
+    // If the time is less than 1 year ago, show the date in month and day.
+    if (Date.now() - timestampMs < 365 * ONE_DAY_IN_MS) {
+        return new Date(timestampMs).toLocaleDateString('en-us', { month: 'short', day: 'numeric' });
+    }
+    // If the time is more than 1 year ago, show the date in month and year.
+    return new Date(timestampMs).toLocaleDateString('en-us', { month: 'short', year: 'numeric' });
+};
+
+export function calculateInitialLookbackWindowFromRunEvents(
+    allRunEvents: Array<{ __typename?: 'AssertionRunEvent' } & AssertionRunEventDetailsFragment>,
+): LookbackWindow | undefined {
+    if (!allRunEvents?.length) return undefined;
+
+    // Take the latest two events.
+    // A more fancy way would be to recency-weighted averages across the board...
+    // ...but the most recent are almost always indicative of currently relevant time window, so we keep it simple for now.
+    const ts1 = allRunEvents[0].timestampMillis;
+    const ts2 = allRunEvents[1] ? allRunEvents[1].timestampMillis : undefined;
+
+    if (typeof ts2 !== 'number') return undefined;
+
+    const diffMillis = Math.abs(ts1 - ts2);
+
+    const ticksPerAtom = 2;
+    const adjustmentFactor = 1 / ticksPerAtom;
+
+    // If the difference between the two ts is larger than (ie.) 1wk, we set the window to 1mo
+    // or if the difference is 1h, we set the window to a day
+    // The above 'adjustment' factor basically lets us add some tolerance, so instead of 1wk, if the difference is 1/2wk, we still roll up to 1mo.
+    let lookbackWindow: LookbackWindow | undefined;
+    if (diffMillis / (ONE_WEEK_IN_MS * adjustmentFactor) > 1) {
+        lookbackWindow = LOOKBACK_WINDOWS.MONTH;
+    } else if (diffMillis / (ONE_DAY_IN_MS * adjustmentFactor) > 1) {
+        lookbackWindow = LOOKBACK_WINDOWS.WEEK;
+    } else if (diffMillis / (ONE_HOUR_IN_MS * adjustmentFactor) > 1) {
+        lookbackWindow = LOOKBACK_WINDOWS.DAY;
+    } else {
+        lookbackWindow = LOOKBACK_WINDOWS.HOUR;
+    }
+    return lookbackWindow;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummary.tsx
new file mode 100644
index 00000000000000..c2695f1714b173
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummary.tsx
@@ -0,0 +1,125 @@
+import React from 'react';
+
+import styled from 'styled-components';
+import { ClockCircleOutlined, StopOutlined } from '@ant-design/icons';
+
+import { Assertion, CronSchedule } from '../../../../../../../../../../types.generated';
+import { getLocaleTimezone } from '../../../../../../../../../shared/time/timeUtils';
+import { getCronAsText } from '../../../../acrylUtils';
+import { AssertionScheduleSummarySection } from './AssertionScheduleSummarySection';
+import { isExternalAssertion } from '../../shared/isExternalAssertion';
+import { ProviderSummarySection } from './ProviderSummarySection';
+
+const Container = styled.div`
+    margin-top: 20px;
+`;
+
+const Sections = styled.div`
+    margin: 20px 4px;
+`;
+
+const StyledClockCircleOutlined = styled(ClockCircleOutlined)`
+    margin-right: 8px;
+    font-size: 14px;
+`;
+
+const StyledStopOutlined = styled(StopOutlined)`
+    margin-right: 8px;
+    font-size: 14px;
+`;
+
+type Props = {
+    assertion: Assertion;
+    schedule?: CronSchedule;
+    lastEvaluatedAtMillis?: number | undefined;
+    nextEvaluatedAtMillis?: number | undefined;
+    isStopped?: boolean;
+};
+
+/**
+ * Renders the header of the Assertion Details card, which displays the run schedule for the assertion.
+ */
+export const AssertionScheduleSummary = ({
+    assertion,
+    schedule,
+    lastEvaluatedAtMillis,
+    nextEvaluatedAtMillis,
+    isStopped = false,
+}: Props) => {
+    const localeTimezone = getLocaleTimezone();
+
+    /**
+     * Last evaluated timestamp
+     */
+    const lastEvaluatedAt = lastEvaluatedAtMillis && new Date(lastEvaluatedAtMillis);
+    const lastEvaluatedTimeLocal = lastEvaluatedAt
+        ? `Last evaluated on ${lastEvaluatedAt.toLocaleDateString()} at ${lastEvaluatedAt.toLocaleTimeString()} (${localeTimezone})`
+        : null;
+    const lastEvaluatedTimeGMT = lastEvaluatedAt ? lastEvaluatedAt.toUTCString() : null;
+
+    /**
+     * Next evaluated timestamp
+     */
+    const nextEvaluatedAt = nextEvaluatedAtMillis && new Date(nextEvaluatedAtMillis);
+    const nextEvaluatedTimeLocal = nextEvaluatedAt
+        ? `Next evaluation at ${nextEvaluatedAt.toLocaleDateString()} at ${nextEvaluatedAt.toLocaleTimeString()} (${localeTimezone})`
+        : null;
+    const nextEvaluatedTimeGMT = nextEvaluatedAt ? nextEvaluatedAt.toUTCString() : null;
+
+    /**
+     * Cron String - This will not be present for external assertions.
+     */
+    const interval = schedule?.cron?.replaceAll(', ', '');
+    const timezone = schedule?.timezone || Intl.DateTimeFormat().resolvedOptions().timeZone;
+    const cronAsText = interval && getCronAsText(interval);
+    const scheduleText = schedule && cronAsText && !cronAsText.error && cronAsText.text;
+
+    /**
+     * For external assertions, show the running platforms
+     */
+    const isExternal = isExternalAssertion(assertion);
+
+    return (
+        <Container>
+            <Sections>
+                {scheduleText && (
+                    <AssertionScheduleSummarySection
+                        icon={<StyledClockCircleOutlined />}
+                        title="Run schedule"
+                        subtitle={`Runs ${scheduleText} (${timezone})`}
+                        showDivider
+                    />
+                )}
+                <AssertionScheduleSummarySection
+                    icon={<StyledClockCircleOutlined />}
+                    title="Last evaluated"
+                    subtitle={
+                        (lastEvaluatedTimeLocal && lastEvaluatedTimeLocal) ||
+                        'This assertion has not been evaluated yet.'
+                    }
+                    tooltip={lastEvaluatedTimeGMT}
+                    showDivider
+                />
+                {(isExternal && assertion.platform && <ProviderSummarySection assertion={assertion} />) || null}
+                {(nextEvaluatedTimeLocal && !isStopped && (
+                    <AssertionScheduleSummarySection
+                        icon={<StyledClockCircleOutlined />}
+                        title="Next evaluation"
+                        subtitle={nextEvaluatedTimeLocal}
+                        tooltip={nextEvaluatedTimeGMT}
+                        showDivider={false}
+                    />
+                )) ||
+                    (nextEvaluatedTimeLocal && (
+                        <AssertionScheduleSummarySection
+                            icon={<StyledStopOutlined />}
+                            title="Next evaluation"
+                            subtitle="This assertion is not actively running. Start the assertion to view the next evaluation time."
+                            showDivider={false}
+                        />
+                    )) ||
+                    null}
+            </Sections>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummarySection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummarySection.tsx
new file mode 100644
index 00000000000000..2383e25bb14361
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/AssertionScheduleSummarySection.tsx
@@ -0,0 +1,72 @@
+import React from 'react';
+
+import styled from 'styled-components';
+import { Divider } from 'antd';
+import { Tooltip } from '@components';
+
+import { ANTD_GRAY } from '../../../../../../../constants';
+import { TruncatedTextWithTooltip } from '../../../../../../../../../shared/TruncatedTextWithTooltip';
+
+const Container = styled.div`
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+`;
+
+const LeftColumn = styled.div`
+    flex: 1;
+`;
+
+const RightColumn = styled.div`
+    padding: 12px;
+`;
+
+const Title = styled.div`
+    padding: 0;
+    margin: 0;
+    margin-bottom: 8px;
+    display: flex;
+    align-items: center;
+    color: ${ANTD_GRAY[8]};
+    font-weight: 700;
+`;
+
+const StyledTruncatedText = styled(TruncatedTextWithTooltip)`
+    color: ${ANTD_GRAY[7]};
+`;
+
+const StyledDivider = styled(Divider)`
+    margin: 16px 0px;
+`;
+
+type Props = {
+    icon?: React.ReactNode;
+    title: string;
+    subtitle: string;
+    tooltip?: React.ReactNode;
+    showDivider: boolean;
+    action?: React.ReactNode;
+};
+
+/**
+ * Renders a given section of the summary.
+ */
+export const AssertionScheduleSummarySection = ({ icon, title, subtitle, tooltip, showDivider, action }: Props) => {
+    return (
+        <>
+            <Container>
+                <LeftColumn>
+                    <Tooltip placement="topLeft" title={tooltip} showArrow={false}>
+                        <Title>
+                            {icon}
+                            {title}
+                        </Title>
+                    </Tooltip>
+                    <StyledTruncatedText text={subtitle} maxLength={200} />
+                </LeftColumn>
+                <RightColumn>{action}</RightColumn>
+            </Container>
+            {showDivider ? <StyledDivider dashed /> : null}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/ProviderSummarySection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/ProviderSummarySection.tsx
new file mode 100644
index 00000000000000..5266a5ab1f2469
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/schedule/ProviderSummarySection.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+
+import styled from 'styled-components';
+import { ApiOutlined } from '@ant-design/icons';
+
+import { AssertionPlatformAvatar } from '../../../../AssertionPlatformAvatar';
+import { AssertionScheduleSummarySection } from './AssertionScheduleSummarySection';
+import { Assertion } from '../../../../../../../../../../types.generated';
+
+const StyledApiOutlined = styled(ApiOutlined)`
+    margin-right: 8px;
+    font-size: 14px;
+`;
+
+type Props = {
+    assertion: Assertion;
+    showDivider?: boolean;
+};
+
+export const ProviderSummarySection = ({ assertion, showDivider = true }: Props) => {
+    const platformName = assertion?.platform?.properties?.displayName || assertion?.platform?.name;
+    const hasPlatformLogo = !!assertion?.platform?.properties?.logoUrl;
+    return (
+        <AssertionScheduleSummarySection
+            icon={
+                (hasPlatformLogo && (
+                    <AssertionPlatformAvatar
+                        platform={assertion.platform}
+                        externalUrl={assertion?.info?.externalUrl || undefined}
+                    />
+                )) || <StyledApiOutlined />
+            }
+            title={`Provided by ${platformName || 'an external platform'}`}
+            subtitle={`This assertion and its results are provided by ${
+                platformName || 'an external data quality tool'
+            }.`}
+            showDivider={showDivider}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/AssertionResultPill.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/AssertionResultPill.tsx
new file mode 100644
index 00000000000000..ad19c5a614d89e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/AssertionResultPill.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+
+import styled from 'styled-components';
+
+import { ANTD_GRAY } from '../../../../../../../constants';
+import { AssertionResult } from '../../../../../../../../../../types.generated';
+import { getResultColor } from '../../../../assertionUtils';
+import { ResultStatusType, getResultStatusText } from './resultMessageUtils';
+import { applyOpacityToHexColor } from '../../../../../../../../../shared/styleUtils';
+
+const Pill = styled.div<{ color: string; highlightColor: string }>`
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 20px;
+    padding: 4px 12px;
+    background-color: ${(props) => props.highlightColor || ANTD_GRAY[3]};
+    color: ${(props) => props.color || ANTD_GRAY[3]};
+    :hover {
+        opacity: 0.8;
+    }
+`;
+
+type Props = {
+    result?: AssertionResult;
+    type?: ResultStatusType;
+};
+
+export const AssertionResultPill = ({ result, type = ResultStatusType.LATEST }: Props) => {
+    const resultType = result?.type;
+    const resultColor = getResultColor(resultType);
+    const highlightColor = applyOpacityToHexColor(resultColor, 0.15);
+    const text = (resultType && getResultStatusText(resultType, type)) || 'No results yet';
+    return (
+        <Pill color={resultColor} highlightColor={highlightColor}>
+            {text}
+        </Pill>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessage.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessage.tsx
new file mode 100644
index 00000000000000..299a1716ed6c60
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessage.tsx
@@ -0,0 +1,49 @@
+import React from 'react';
+
+import styled from 'styled-components';
+
+import { AssertionRunEvent } from '../../../../../../../../../../types.generated';
+import { getDetailedErrorMessage } from './resultMessageUtils';
+import { ANTD_GRAY } from '../../../../../../../constants';
+
+const Container = styled.div`
+    padding: 4px;
+`;
+
+const Row = styled.div`
+    display: flex;
+    align-items: start;
+    justify-content: start;
+    padding: 4px 8px;
+`;
+
+const Title = styled.div`
+    font-weight: bold;
+    margin-right: 8px;
+    font-size: 16px;
+`;
+
+const Message = styled.div`
+    color: ${ANTD_GRAY[8]};
+`;
+
+type Props = {
+    run: AssertionRunEvent;
+};
+
+export const DetailedErrorMessage = ({ run }: Props) => {
+    const type = run?.result?.error?.type;
+    const message = getDetailedErrorMessage(run);
+    return (
+        <Container>
+            <Row>
+                <Title>{type} </Title>
+            </Row>
+            {message && (
+                <Row>
+                    <Message>{message}</Message>
+                </Row>
+            )}
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessageTooltip.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessageTooltip.tsx
new file mode 100644
index 00000000000000..1c090d079672b4
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessageTooltip.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+
+import styled from 'styled-components';
+import { Popover } from '@components';
+import { InfoCircleOutlined } from '@ant-design/icons';
+import { TooltipPlacement } from 'antd/lib/tooltip';
+
+import { ANTD_GRAY } from '../../../../../../../constants';
+import { AssertionRunEvent } from '../../../../../../../../../../types.generated';
+import { DetailedErrorMessage } from './DetailedErrorMessage';
+
+const StyledInfoCircleOutlined = styled(InfoCircleOutlined)`
+    margin-left: 8px;
+    font-size: 12px;
+    color: ${ANTD_GRAY[7]};
+`;
+
+type Props = {
+    run: AssertionRunEvent;
+    placement?: TooltipPlacement;
+};
+
+export const DetailedErrorMessageTooltip = ({ run, placement = 'bottom' }: Props) => {
+    return (
+        <Popover
+            overlayStyle={{ maxWidth: 500 }}
+            showArrow={false}
+            placement={placement}
+            content={<DetailedErrorMessage run={run} />}
+        >
+            <StyledInfoCircleOutlined />
+        </Popover>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/SelectablePill.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/SelectablePill.tsx
new file mode 100644
index 00000000000000..cfeb3fc6c11524
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/SelectablePill.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+
+import styled from 'styled-components';
+import { Tooltip } from '@components';
+
+import { ANTD_GRAY } from '../../../../../../../constants';
+
+const Pill = styled.div<{ selected: boolean }>`
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 20px;
+    padding: 4px 12px;
+    background-color: ${(props) => (props.selected ? props.theme.styles['primary-color'] : ANTD_GRAY[3])};
+    color: ${(props) => (props.selected ? '#fff' : ANTD_GRAY)};
+    :hover {
+        opacity: 0.6;
+        cursor: pointer;
+    }
+`;
+
+type Props = {
+    text: React.ReactNode;
+    tip?: React.ReactNode;
+    selected: boolean;
+    onSelect: () => void;
+};
+
+export const SelectablePill = ({ text, tip, selected, onSelect }: Props) => {
+    return (
+        <Tooltip title={tip} placement="left" showArrow={false}>
+            <Pill selected={selected} onClick={onSelect}>
+                {text}
+            </Pill>
+        </Tooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/assertionUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/assertionUtils.ts
new file mode 100644
index 00000000000000..85ade1ac73370c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/assertionUtils.ts
@@ -0,0 +1,87 @@
+import { Assertion, AssertionSourceType, AssertionType } from '../../../../../../../../../../types.generated';
+
+export enum AssertionEditabilityScopeType {
+    FULL = 'FULL',
+    ACTIONS_AND_DESCRIPTION = 'ACTIONS_AND_DESCRIPTION',
+    ACTIONS_ONLY = 'ACTIONS_ONLY',
+    NONE = 'NONE',
+}
+
+// ------- NOTE: we take the lowest permission of the union of (AssertType, AssertionSourceType) from the maps below ------- //
+const ASSERTION_TYPE_TO_EDITING_SCOPE: { [type in AssertionType]: AssertionEditabilityScopeType } = {
+    [AssertionType.Custom]: AssertionEditabilityScopeType.FULL,
+    [AssertionType.Field]: AssertionEditabilityScopeType.FULL,
+    [AssertionType.Freshness]: AssertionEditabilityScopeType.FULL,
+    [AssertionType.Sql]: AssertionEditabilityScopeType.FULL,
+    [AssertionType.Volume]: AssertionEditabilityScopeType.FULL,
+    [AssertionType.DataSchema]: AssertionEditabilityScopeType.FULL,
+    [AssertionType.Dataset]: AssertionEditabilityScopeType.ACTIONS_AND_DESCRIPTION,
+    [AssertionType.Custom]: AssertionEditabilityScopeType.ACTIONS_AND_DESCRIPTION,
+};
+const SOURCE_TYPE_TO_EDITING_SCOPE: { [type in AssertionSourceType]: AssertionEditabilityScopeType } = {
+    [AssertionSourceType.Native]: AssertionEditabilityScopeType.FULL,
+    [AssertionSourceType.External]: AssertionEditabilityScopeType.ACTIONS_AND_DESCRIPTION,
+    [AssertionSourceType.Inferred]: AssertionEditabilityScopeType.ACTIONS_ONLY,
+};
+
+// Scope types that unlock the certain editing abilities (broadest to narrowest)
+const TIERED_SCOPE_TYPES_MAP = {
+    FULL: [AssertionEditabilityScopeType.FULL],
+    ACTIONS_AND_DESCRIPTION: [
+        AssertionEditabilityScopeType.ACTIONS_AND_DESCRIPTION,
+        AssertionEditabilityScopeType.FULL,
+    ],
+    ACTIONS_ONLY: [
+        AssertionEditabilityScopeType.ACTIONS_ONLY,
+        AssertionEditabilityScopeType.ACTIONS_AND_DESCRIPTION,
+        AssertionEditabilityScopeType.FULL,
+    ],
+};
+
+/**
+ * Gets the edabilityType of an asseriton
+ * @param assertion
+ * @returns {AssertionEditabilityScopeType}
+ */
+export const getAssertionEditabilityType = (assertion: Assertion): AssertionEditabilityScopeType => {
+    const assertionType = assertion.info?.type;
+    const assertionSourceType = assertion.info?.source?.type ?? AssertionSourceType.External; // NOTE: null==External since some of our integration connectors actually do not and historically have not produced this field
+    if (!assertionType) {
+        return AssertionEditabilityScopeType.NONE;
+    }
+
+    // 1. Full editing
+    const isSourceTypeValidForFullEditing = TIERED_SCOPE_TYPES_MAP.FULL.includes(
+        SOURCE_TYPE_TO_EDITING_SCOPE[assertionSourceType],
+    );
+    const isAssertionTypeValidForFullEditing = TIERED_SCOPE_TYPES_MAP.FULL.includes(
+        ASSERTION_TYPE_TO_EDITING_SCOPE[assertionType],
+    );
+    if (isSourceTypeValidForFullEditing && isAssertionTypeValidForFullEditing) {
+        return AssertionEditabilityScopeType.FULL;
+    }
+
+    // 2. Actions and description editing
+    const isSourceTypeValidForActionAndDescriptionEditing = TIERED_SCOPE_TYPES_MAP.ACTIONS_AND_DESCRIPTION.includes(
+        SOURCE_TYPE_TO_EDITING_SCOPE[assertionSourceType],
+    );
+    const isAssertionTypeValidForActionAndDescriptionEditing = TIERED_SCOPE_TYPES_MAP.ACTIONS_AND_DESCRIPTION.includes(
+        ASSERTION_TYPE_TO_EDITING_SCOPE[assertionType],
+    );
+    if (isSourceTypeValidForActionAndDescriptionEditing && isAssertionTypeValidForActionAndDescriptionEditing) {
+        return AssertionEditabilityScopeType.ACTIONS_AND_DESCRIPTION;
+    }
+
+    // 3. Actions only editing
+    const isSourceTypeValidForActionOnlyEditing = TIERED_SCOPE_TYPES_MAP.ACTIONS_ONLY.includes(
+        SOURCE_TYPE_TO_EDITING_SCOPE[assertionSourceType],
+    );
+    const isAssertionTypeValidForActionOnlyEditing = TIERED_SCOPE_TYPES_MAP.ACTIONS_ONLY.includes(
+        ASSERTION_TYPE_TO_EDITING_SCOPE[assertionType],
+    );
+    if (isSourceTypeValidForActionOnlyEditing && isAssertionTypeValidForActionOnlyEditing) {
+        return AssertionEditabilityScopeType.ACTIONS_ONLY;
+    }
+
+    return AssertionEditabilityScopeType.NONE;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/constants.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/constants.ts
new file mode 100644
index 00000000000000..a1f478936fae19
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/constants.ts
@@ -0,0 +1,66 @@
+import { AssertionStdOperator } from '../../../../../../../../../../types.generated';
+
+// We hard code this here because there's no set schema NativeResults on the AssertionResult document
+// - it's a generic map.
+export const ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE = {
+    FIELD_ASSERTIONS: {
+        FIELD_VALUES: {
+            Y_VALUE_KEY_NAME: 'Invalid Rows',
+            THRESHOLD_VALUE_KEY_NAME: 'Threshold Value', // NOTE: we're better off accessing this from the assertionInfo directly
+        },
+        METRIC_VALUES: {
+            Y_VALUE_KEY_NAME: 'Metric Value',
+            COMPARED_VALUE_KEY_NAME: 'Compared Value', // NOTE: we're better off accessing this from the assertionInfo directly
+            COMPARED_MIN_VALUE_KEY_NAME: 'Compared Min Value', // ^
+            COMPARED_MAX_VALUE_KEY_NAME: 'Compared Max Value', // ^
+        },
+    },
+    SQL_ASSERTIONS: {
+        Y_VALUE_KEY_NAME: 'Value',
+        PREVIOUS_Y_VALUE_KEY_NAME: 'Previous Value',
+    },
+    VOLUME_ASSERTIONS: {
+        PREVIOUS_Y_VALUE_KEY_NAME: 'Previous Row Count',
+    },
+    SCHEMA_ASSERTIONS: {
+        EXTRA_FIELDS_IN_ACTUAL_KEY_NAME: 'Extra Fields in Actual',
+        EXTRA_FIELDS_IN_EXPECTED_KEY_NAME: 'Extra Fields in Expected',
+        MISMATCHED_TYPE_FIELDS_KEY_NAME: 'Mismatched Type Fields',
+    },
+    FRESHNESS_ASSERTIONS: {
+        EVALUATION_WINDOW_START_TIME: 'Window Start Time',
+        EVALUATION_WINDOW_END_TIME: 'Window End Time',
+    },
+};
+
+export const ASSERTION_OPERATOR_DESCRIPTIONS_REQUIRING_SUFFIX = [
+    AssertionStdOperator.EqualTo,
+    AssertionStdOperator.NotEqualTo,
+    AssertionStdOperator.Contain,
+    AssertionStdOperator.RegexMatch,
+    AssertionStdOperator.StartWith,
+    AssertionStdOperator.EndWith,
+    AssertionStdOperator.In,
+    AssertionStdOperator.NotIn,
+];
+
+export const GET_ASSERTION_OPERATOR_TO_DESCRIPTION_MAP = ({ isPlural }) => ({
+    [AssertionStdOperator.EqualTo]: `${isPlural ? 'are' : 'Is'} equal to`,
+    [AssertionStdOperator.NotEqualTo]: `${isPlural ? 'are' : 'Is'} not equal to`,
+    [AssertionStdOperator.Contain]: 'Contains',
+    [AssertionStdOperator.RegexMatch]: 'Matches',
+    [AssertionStdOperator.StartWith]: 'Starts with',
+    [AssertionStdOperator.EndWith]: 'Ends with',
+    [AssertionStdOperator.In]: `${isPlural ? 'are' : 'Is'} in`,
+    [AssertionStdOperator.NotIn]: `${isPlural ? 'are' : 'Is'} not in`,
+    [AssertionStdOperator.IsFalse]: `${isPlural ? 'are' : 'Is'} False`,
+    [AssertionStdOperator.IsTrue]: `${isPlural ? 'are' : 'Is'} True`,
+    [AssertionStdOperator.Null]: `${isPlural ? 'are' : 'Is'} NULL`,
+    [AssertionStdOperator.NotNull]: `${isPlural ? 'are' : 'Is'} not NULL`,
+    [AssertionStdOperator.GreaterThan]: `${isPlural ? 'are' : 'Is'} greater than`,
+    [AssertionStdOperator.GreaterThanOrEqualTo]: `${isPlural ? 'are' : 'Is'} greater than or equal to`,
+    [AssertionStdOperator.LessThan]: `${isPlural ? 'are' : 'Is'} less than`,
+    [AssertionStdOperator.LessThanOrEqualTo]: `${isPlural ? 'are' : 'Is'} less than or equal to`,
+    [AssertionStdOperator.Between]: `${isPlural ? 'are' : 'Is'} within a range`,
+    [AssertionStdOperator.Native]: undefined,
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultExtractionUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultExtractionUtils.ts
new file mode 100644
index 00000000000000..bcca217bd2eebb
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultExtractionUtils.ts
@@ -0,0 +1,367 @@
+import { Maybe } from 'graphql/jsutils/Maybe';
+import {
+    AssertionResult,
+    AssertionResultType,
+    AssertionStdOperator,
+    AssertionStdParameter,
+    AssertionStdParameterType,
+    AssertionValueChangeType,
+    FieldMetricAssertion,
+    FieldValuesAssertion,
+    FieldValuesFailThresholdType,
+    IncrementingSegmentRowCountChange,
+    IncrementingSegmentRowCountTotal,
+    RowCountChange,
+    RowCountTotal,
+    SqlAssertionInfo,
+    StringMapEntry,
+} from '../../../../../../../../../../types.generated';
+import { ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE } from './constants';
+import {
+    parseJsonArrayOrDefault,
+    parseMaybeStringAsFloatOrDefault,
+} from '../../../../../../../../../shared/numberUtil';
+
+/**
+ * Calculates expected value of an assertion given previous value and change modifier details
+ * ie. { previous row count = 1000, changeType=%, modifier=100 } | expectedOutput=2000
+ * @param previousValue
+ * @param changeType
+ * @param expectedChangeModifier
+ * @returns {number | undefined}
+ */
+const calculateExpectedNumericalValueWithPreviousNumericalValue = (
+    previousValue: number,
+    changeType: AssertionValueChangeType,
+    expectedChangeModifier: number,
+): number | undefined => {
+    let expectedRowCount: undefined | number;
+    switch (changeType) {
+        case AssertionValueChangeType.Absolute:
+            expectedRowCount = previousValue + expectedChangeModifier;
+            break;
+        case AssertionValueChangeType.Percentage:
+            expectedRowCount = previousValue * (1 + expectedChangeModifier / 100);
+            break;
+        default:
+            break;
+    }
+    return expectedRowCount;
+};
+
+/**
+ * Attempts to extract a numerical value from native results with a given key
+ * @param nativeResults
+ * @param key
+ * @returns {number | undefined}
+ */
+export function tryExtractNumericalValueFromNativeResults(
+    nativeResults: Maybe<StringMapEntry[]> | undefined,
+    key: string,
+): number | undefined {
+    const maybeValue = nativeResults?.find((result) => result.key === key)?.value;
+    return parseMaybeStringAsFloatOrDefault(maybeValue, undefined);
+}
+
+/**
+ * Attempts to extract a JSON array value from native results with a given key
+ * @param nativeResults
+ * @param key
+ * @returns {number | undefined}
+ */
+export function tryExtractArrayValueFromNativeResults(
+    nativeResults: Maybe<StringMapEntry[]> | undefined,
+    key: string,
+): any[] | undefined {
+    const maybeValue = nativeResults?.find((result) => result.key === key)?.value;
+    return parseJsonArrayOrDefault(maybeValue, undefined);
+}
+
+export function tryExtractNumericalValueFromAssertionStdParameter(
+    param?: Maybe<AssertionStdParameter>,
+): number | undefined {
+    let maybeNumber: undefined | number;
+    if (param?.type === AssertionStdParameterType.Number) {
+        maybeNumber = parseFloat(param.value);
+        maybeNumber = !Number.isNaN(maybeNumber) ? maybeNumber : undefined;
+    }
+    return maybeNumber;
+}
+
+export const tryGetFieldMetricAssertionNumericalResult = (result?: Maybe<AssertionResult>): number | undefined => {
+    return tryExtractNumericalValueFromNativeResults(
+        result?.nativeResults,
+        ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE.FIELD_ASSERTIONS.METRIC_VALUES.Y_VALUE_KEY_NAME,
+    );
+};
+export const tryGetFieldValueAssertionNumericalResult = (result?: Maybe<AssertionResult>) => {
+    if (result?.type === AssertionResultType.Init) return 0;
+    return tryExtractNumericalValueFromNativeResults(
+        result?.nativeResults,
+        ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE.FIELD_ASSERTIONS.FIELD_VALUES.Y_VALUE_KEY_NAME,
+    );
+};
+
+export const tryGetSqlAssertionNumericalResult = (result?: Maybe<AssertionResult>) => {
+    return tryExtractNumericalValueFromNativeResults(
+        result?.nativeResults,
+        ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE.SQL_ASSERTIONS.Y_VALUE_KEY_NAME,
+    );
+};
+
+export const tryGetPreviousSqlAssertionNumericalResult = (result?: Maybe<AssertionResult>) => {
+    return tryExtractNumericalValueFromNativeResults(
+        result?.nativeResults,
+        ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE.SQL_ASSERTIONS.PREVIOUS_Y_VALUE_KEY_NAME,
+    );
+};
+
+export const tryGetAbsoluteVolumeAssertionNumericalResult = (result?: Maybe<AssertionResult>) => {
+    const rowCount = result?.rowCount;
+    return rowCount || undefined;
+};
+
+export const tryGetPreviousVolumeAssertionNumericalResult = (result?: Maybe<AssertionResult>) => {
+    return tryExtractNumericalValueFromNativeResults(
+        result?.nativeResults,
+        ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE.VOLUME_ASSERTIONS.PREVIOUS_Y_VALUE_KEY_NAME,
+    );
+};
+export const tryGetActualUpdatedTimestampFromAssertionResult = (result?: Maybe<AssertionResult>) => {
+    const eventsArrString = result?.nativeResults?.find((pair) => pair.key === 'events')?.value;
+    const eventsArr = eventsArrString ? JSON.parse(eventsArrString) : [];
+    const timestamps = eventsArr.map((event) => event.time);
+    const sortedTimestampsDescending = timestamps.sort((a, b) => b - a);
+    const maxTimestamp = sortedTimestampsDescending[0];
+    return maxTimestamp;
+};
+
+export const tryGetExtraFieldsInActual = (result?: AssertionResult | null) => {
+    return tryExtractArrayValueFromNativeResults(
+        result?.nativeResults,
+        ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE.SCHEMA_ASSERTIONS.EXTRA_FIELDS_IN_ACTUAL_KEY_NAME,
+    );
+};
+
+export const tryGetExtraFieldsInExpected = (result?: AssertionResult | null) => {
+    return tryExtractArrayValueFromNativeResults(
+        result?.nativeResults,
+        ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE.SCHEMA_ASSERTIONS.EXTRA_FIELDS_IN_EXPECTED_KEY_NAME,
+    );
+};
+
+export const tryGetMismatchedTypeFields = (result?: AssertionResult | null) => {
+    return tryExtractArrayValueFromNativeResults(
+        result?.nativeResults,
+        ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE.SCHEMA_ASSERTIONS.MISMATCHED_TYPE_FIELDS_KEY_NAME,
+    );
+};
+
+/**
+ * Gets the main metric on an assertion's results that are being monitored over time
+ * @param runEvent
+ * @returns {number | undefined}
+ */
+export const tryGetPrimaryMetricValueFromAssertionRunEvent = (): number | undefined => {
+    return undefined;
+};
+
+// This captures context around the expected range of values
+export type AssertionRangeEndType = 'inclusive' | 'exclusive';
+export type AssertionExpectedRange = {
+    // These are the actual values we expect (ie. actual row count)
+    high?: number;
+    low?: number;
+    // This contains extra context about this range
+    context?: {
+        highType?: AssertionRangeEndType;
+        lowType?: AssertionRangeEndType;
+        // This contains context for relative assertions (ie. grows by max 10%, min 5%)
+        relativeModifiers?: {
+            type: AssertionValueChangeType; // percent vs absolute
+            high?: number;
+            low?: number;
+        };
+    };
+};
+
+/**
+ * Tries to calculate expected result ranges for assertions that have fixed numerical expectations
+ * ie. handles 'RowCount should be between 10k and 50k'
+ * @param totals
+ * @returns
+ */
+export function tryGetExpectedRangeFromAssertionAgainstAbsoluteValues(
+    totals?:
+        | Maybe<IncrementingSegmentRowCountTotal>
+        | Maybe<RowCountTotal>
+        | Maybe<SqlAssertionInfo>
+        | Maybe<FieldValuesAssertion>
+        | Maybe<FieldMetricAssertion>,
+): AssertionExpectedRange {
+    if (!totals?.parameters) {
+        return {};
+    }
+    let high: undefined | number;
+    let low: undefined | number;
+    let highType: undefined | AssertionRangeEndType;
+    let lowType: undefined | AssertionRangeEndType;
+    switch (totals?.operator) {
+        case AssertionStdOperator.Between:
+            high = tryExtractNumericalValueFromAssertionStdParameter(totals.parameters.maxValue);
+            low = tryExtractNumericalValueFromAssertionStdParameter(totals.parameters.minValue);
+            highType = 'inclusive';
+            lowType = 'inclusive';
+            break;
+        case AssertionStdOperator.GreaterThan:
+            low = tryExtractNumericalValueFromAssertionStdParameter(totals.parameters.value);
+            lowType = 'exclusive';
+            break;
+        case AssertionStdOperator.GreaterThanOrEqualTo:
+            low = tryExtractNumericalValueFromAssertionStdParameter(totals.parameters.value);
+            lowType = 'inclusive';
+            break;
+        case AssertionStdOperator.LessThan:
+            high = tryExtractNumericalValueFromAssertionStdParameter(totals.parameters.value);
+            highType = 'exclusive';
+            break;
+        case AssertionStdOperator.LessThanOrEqualTo:
+            high = tryExtractNumericalValueFromAssertionStdParameter(totals.parameters.value);
+            highType = 'inclusive';
+            break;
+        default:
+            break;
+    }
+    return {
+        high,
+        low,
+        context: {
+            highType,
+            lowType,
+        },
+    };
+}
+/**
+ * Tries to calculate expected result ranges for assertions that have expectations defined relative to previous runs
+ * ie. handles 'RowCount should not grow by more than 50%'
+ * @param changingInfo
+ * @param changeType
+ * @param previousCount
+ * @returns {AssertionExpectedRange}
+ */
+export function tryGetExpectedRangeFromAssertionAgainstRelativeValues(
+    changingInfo?: Maybe<RowCountChange | IncrementingSegmentRowCountChange | SqlAssertionInfo>,
+    changeType?: Maybe<AssertionValueChangeType>,
+    previousCount?: Maybe<number>,
+): AssertionExpectedRange {
+    if (
+        !changingInfo?.parameters ||
+        typeof previousCount !== 'number' ||
+        typeof changeType === 'undefined' ||
+        changeType === null
+    ) {
+        return {};
+    }
+
+    let high: undefined | number;
+    let low: undefined | number;
+    let highType: undefined | AssertionRangeEndType;
+    let lowType: undefined | AssertionRangeEndType;
+    let modifierHigh: undefined | number;
+    let modifierLow: undefined | number;
+
+    switch (changingInfo?.operator) {
+        case AssertionStdOperator.Between: {
+            modifierHigh = tryExtractNumericalValueFromAssertionStdParameter(changingInfo.parameters.maxValue);
+            modifierLow = tryExtractNumericalValueFromAssertionStdParameter(changingInfo.parameters.minValue);
+            high =
+                typeof modifierHigh === 'number'
+                    ? calculateExpectedNumericalValueWithPreviousNumericalValue(previousCount, changeType, modifierHigh)
+                    : undefined;
+            low =
+                typeof modifierLow === 'number'
+                    ? calculateExpectedNumericalValueWithPreviousNumericalValue(previousCount, changeType, modifierLow)
+                    : undefined;
+
+            highType = 'inclusive';
+            lowType = 'inclusive';
+            break;
+        }
+        case AssertionStdOperator.GreaterThan: {
+            modifierLow = tryExtractNumericalValueFromAssertionStdParameter(changingInfo.parameters.value);
+            low =
+                typeof modifierLow === 'number'
+                    ? calculateExpectedNumericalValueWithPreviousNumericalValue(previousCount, changeType, modifierLow)
+                    : undefined;
+            lowType = 'exclusive';
+            break;
+        }
+        case AssertionStdOperator.GreaterThanOrEqualTo: {
+            modifierLow = tryExtractNumericalValueFromAssertionStdParameter(changingInfo.parameters.value);
+            low =
+                typeof modifierLow === 'number'
+                    ? calculateExpectedNumericalValueWithPreviousNumericalValue(previousCount, changeType, modifierLow)
+                    : undefined;
+            lowType = 'inclusive';
+            break;
+        }
+        case AssertionStdOperator.LessThan: {
+            modifierHigh = tryExtractNumericalValueFromAssertionStdParameter(changingInfo.parameters.value);
+            high =
+                typeof modifierHigh === 'number'
+                    ? calculateExpectedNumericalValueWithPreviousNumericalValue(previousCount, changeType, modifierHigh)
+                    : undefined;
+            highType = 'exclusive';
+            break;
+        }
+        case AssertionStdOperator.LessThanOrEqualTo: {
+            modifierHigh = tryExtractNumericalValueFromAssertionStdParameter(changingInfo.parameters.value);
+            high =
+                typeof modifierHigh === 'number'
+                    ? calculateExpectedNumericalValueWithPreviousNumericalValue(previousCount, changeType, modifierHigh)
+                    : undefined;
+            highType = 'inclusive';
+            break;
+        }
+        default:
+            break;
+    }
+    return {
+        high,
+        low,
+        context: {
+            highType,
+            lowType,
+            relativeModifiers: {
+                type: changeType,
+                high: modifierHigh,
+                low: modifierLow,
+            },
+        },
+    };
+}
+
+export function tryGetExpectedRangeFromFailThreshold(
+    fieldValuesAssertion?: Maybe<FieldValuesAssertion>,
+): AssertionExpectedRange {
+    const highType: AssertionRangeEndType = 'inclusive';
+    let high: number | undefined;
+
+    const thresholdType = fieldValuesAssertion?.failThreshold?.type;
+    switch (thresholdType) {
+        case FieldValuesFailThresholdType.Count:
+            high = parseMaybeStringAsFloatOrDefault(fieldValuesAssertion?.failThreshold.value);
+            break;
+        case FieldValuesFailThresholdType.Percentage:
+            break;
+        default:
+            break;
+    }
+
+    return {
+        high,
+        context: {
+            highType,
+        },
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultMessageUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultMessageUtils.ts
new file mode 100644
index 00000000000000..646f4fa1913a33
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultMessageUtils.ts
@@ -0,0 +1,112 @@
+import {
+    Assertion,
+    AssertionResult,
+    AssertionResultType,
+    AssertionRunEvent,
+    AssertionType,
+} from '../../../../../../../../../../types.generated';
+import { getResultErrorMessage } from '../../../../assertionUtils';
+
+export const getFormattedResultText = (result?: AssertionResultType) => {
+    if (result === undefined) {
+        return 'Not completed';
+    }
+    if (result === AssertionResultType.Success) {
+        return 'Passing';
+    }
+    if (result === AssertionResultType.Failure) {
+        return 'Failing';
+    }
+    if (result === AssertionResultType.Error) {
+        return 'Error';
+    }
+    if (result === AssertionResultType.Init) {
+        return 'Initializing';
+    }
+    return undefined;
+};
+
+const getFormattedReasonTextForDefaultAssertion = (run: AssertionRunEvent) => {
+    const type = run.result?.type;
+    switch (type) {
+        case AssertionResultType.Success: {
+            return `The expected conditions were met`;
+        }
+        case AssertionResultType.Error: {
+            let message = `Assertion encountered an error during execution.`;
+
+            const maybeError = run.result?.error;
+            const maybeType = maybeError?.type;
+            const maybeErrorMessage = maybeError?.properties?.find((e) => e.key === 'message')?.value;
+            if (maybeType) {
+                message = `Assertion execution encountered an error with type ${maybeType}.`;
+            }
+            if (maybeErrorMessage) {
+                message += ` "${maybeErrorMessage}"`;
+            }
+            return message;
+        }
+        default: {
+            return `The expected conditions were not met.`;
+        }
+    }
+};
+
+export const getFormattedReasonText = (assertion: Assertion, run: AssertionRunEvent) => {
+    if (run?.result?.type === AssertionResultType.Init) {
+        return 'Initial data recorded successfully. Assertion result will be available on the next evaluation.';
+    }
+    if (run?.result?.type === AssertionResultType.Error) {
+        const formattedError = getResultErrorMessage(run?.result);
+        return `${formattedError}`;
+    }
+
+    // Some historical assertion results may not have asseriton info...
+    // so we coalesce the current info onto there to avoid blanks
+    const coalescedResult: AssertionResult | undefined | null = run.result && {
+        ...run.result,
+    };
+    const coalescedRun: AssertionRunEvent = {
+        ...run,
+        result: coalescedResult,
+    };
+    switch (assertion.info?.type) {
+        case AssertionType.Dataset:
+            return getFormattedReasonTextForDefaultAssertion(coalescedRun);
+        case AssertionType.Custom:
+            return getFormattedReasonTextForDefaultAssertion(coalescedRun);
+        default:
+            return 'No reason provided';
+    }
+};
+
+export const getFormattedExpectedResultText = (): string | undefined => {
+    return undefined;
+};
+
+export const getDetailedErrorMessage = (run: AssertionRunEvent) => {
+    return run.result?.error?.properties?.find((property) => property.key === 'message')?.value || undefined;
+};
+
+export enum ResultStatusType {
+    LATEST = 'latest',
+    HISTORICAL = 'historical',
+}
+
+/**
+ * Returns the display text assoociated with an AssertionResultType
+ */
+export const getResultStatusText = (result: AssertionResultType, type: ResultStatusType) => {
+    switch (result) {
+        case AssertionResultType.Success:
+            return type === ResultStatusType.LATEST ? 'Passing' : 'Passed';
+        case AssertionResultType.Failure:
+            return type === ResultStatusType.LATEST ? 'Failing' : 'Failed';
+        case AssertionResultType.Error:
+            return 'Error';
+        case AssertionResultType.Init:
+            return type === ResultStatusType.LATEST ? 'Initializing' : 'Initialized';
+        default:
+            throw new Error(`Unsupported Assertion Result Type ${result} provided.`);
+    }
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/utils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/utils.tsx
new file mode 100644
index 00000000000000..90820d534fa623
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/utils.tsx
@@ -0,0 +1,537 @@
+import React from 'react';
+
+import { Typography } from 'antd';
+import { Tooltip } from '@components';
+import { Maybe } from 'graphql/jsutils/Maybe';
+import {
+    AssertionInfo,
+    AssertionStdAggregation,
+    AssertionStdOperator,
+    AssertionStdParameters,
+    AssertionType,
+    CronSchedule,
+    DatasetAssertionInfo,
+    DatasetAssertionScope,
+    EntityType,
+    FieldAssertionInfo,
+    FreshnessAssertionInfo,
+    FreshnessAssertionScheduleType,
+    FreshnessAssertionType,
+    IncrementingSegmentRowCountChange,
+    RowCountChange,
+    SchemaAssertionCompatibility,
+    SchemaAssertionInfo,
+    SchemaFieldRef,
+    VolumeAssertionInfo,
+} from '@src/types.generated';
+import { decodeSchemaField } from '@src/app/lineage/utils/columnLineageUtils';
+import { DatasetAssertionDescription } from '../../../DatasetAssertionDescription';
+import {
+    createCronText,
+    createFixedIntervalText,
+    createSinceTheLastCheckText,
+    FreshnessAssertionDescription,
+} from '../../../FreshnessAssertionDescription';
+import { VolumeAssertionDescription } from '../../../VolumeAssertionDescription';
+import { SqlAssertionDescription } from '../../../SqlAssertionDescription';
+import { FieldAssertionDescription } from '../../../FieldAssertionDescription';
+import { SchemaAssertionDescription } from '../../../SchemaAssertionDescription';
+import { useEntityRegistry } from '../../../../../../../../useEntityRegistry';
+import { useGetUserQuery } from '../../../../../../../../../graphql/user.generated';
+import { ANTD_GRAY_V2 } from '../../../../../../constants';
+import { getFormattedParameterValue } from '../../../assertionUtils';
+import {
+    getIsRowCountChange,
+    getOperatorDescription,
+    getParameterDescription,
+    getValueChangeTypeDescription,
+    getVolumeTypeDescription,
+    getVolumeTypeInfo,
+} from '../../../utils';
+import {
+    getFieldDescription,
+    getFieldOperatorDescription,
+    getFieldParametersDescription,
+    getFieldTransformDescription,
+} from '../../../fieldDescriptionUtils';
+
+/**
+ * It refers the {@link getOperatorText} utility function to get plain text from html description.
+ * @link getOperatorText
+ * Returns the Plain Text to render for the operator portion of the Assertion Description
+ */
+export const getOperatorPlainText = (
+    op: AssertionStdOperator,
+    parameters: AssertionStdParameters | undefined,
+    nativeType: string | undefined,
+) => {
+    switch (op) {
+        // Hybrid Operators
+        case AssertionStdOperator.Between: {
+            return `between ${getFormattedParameterValue(parameters?.minValue)} and ${getFormattedParameterValue(
+                parameters?.maxValue,
+            )}`;
+        }
+        case AssertionStdOperator.EqualTo: {
+            const operatorText = 'equal to';
+            return `${operatorText} ${getFormattedParameterValue(parameters?.value)}`;
+        }
+        case AssertionStdOperator.Contain: {
+            const operatorText = 'contains';
+            return `${operatorText} ${getFormattedParameterValue(parameters?.value)}`;
+        }
+        case AssertionStdOperator.In: {
+            const operatorText = 'in';
+            return `${operatorText} ${getFormattedParameterValue(parameters?.value)}`;
+        }
+        case AssertionStdOperator.NotNull: {
+            const operatorText = 'not null';
+            return operatorText;
+        }
+        case AssertionStdOperator.GreaterThan: {
+            const operatorText = 'greater than';
+            return `${operatorText} ${getFormattedParameterValue(parameters?.value)}`;
+        }
+        case AssertionStdOperator.GreaterThanOrEqualTo: {
+            const operatorText = 'greater than or equal to';
+            return `${operatorText} ${getFormattedParameterValue(parameters?.value)}`;
+        }
+        case AssertionStdOperator.LessThan: {
+            const operatorText = 'less than';
+            return `${operatorText} ${getFormattedParameterValue(parameters?.value)}`;
+        }
+        case AssertionStdOperator.LessThanOrEqualTo: {
+            const operatorText = 'less than or equal to';
+            return `${operatorText} ${getFormattedParameterValue(parameters?.value)}`;
+        }
+        case AssertionStdOperator.StartWith: {
+            const operatorText = 'starts with';
+            return `${operatorText} ${getFormattedParameterValue(parameters?.value)}`;
+        }
+        case AssertionStdOperator.EndWith: {
+            const operatorText = 'ends with';
+            return `${operatorText} ${getFormattedParameterValue(parameters?.value)}`;
+        }
+        case AssertionStdOperator.Native: {
+            return `passing assertion ${nativeType}`;
+        }
+        default: {
+            return `passing operator ${op} with value ${getFormattedParameterValue(parameters?.value)}`;
+        }
+    }
+};
+
+/**
+ * It refers the {@link getSchemaAggregationText} utility function to get plain text from html description.
+ * @link getSchemaAggregationText
+ * Returns the Plain Text to render for the aggregation portion of the Assertion Description
+ * for Assertions on Dataset Schemas.
+ *
+ * Schema assertions require an aggregation.
+ */
+export const getSchemaAggregationPlainText = (
+    aggregation: AssertionStdAggregation | undefined | null,
+    fields: Array<SchemaFieldRef> | undefined | null,
+) => {
+    switch (aggregation) {
+        case AssertionStdAggregation.ColumnCount:
+            return 'Dataset column count is';
+        case AssertionStdAggregation.Columns:
+            return 'Dataset columns are';
+        case AssertionStdAggregation.Native: {
+            const fieldNames = fields?.map((field) => decodeSchemaField(field.path)) || [];
+            return `Dataset columns ${JSON.stringify(fieldNames)} are `;
+        }
+        default:
+            console.error(`Unsupported schema aggregation assertion ${aggregation} provided.`);
+            return 'Dataset columns are';
+    }
+};
+
+/**
+ * It refers the {@link getRowsAggregationText} utility function to get plain text from html description.
+ * @link getRowsAggregationText
+ * for Assertions on Dataset Rows
+ *
+ * Row assertions require an aggregation.
+ */
+export const getRowsAggregationPlainText = (aggregation: AssertionStdAggregation | undefined | null) => {
+    switch (aggregation) {
+        case AssertionStdAggregation.RowCount:
+            return 'Dataset row count is';
+        case AssertionStdAggregation.Native:
+            return 'Dataset rows are';
+        default:
+            console.error(`Unsupported Dataset Rows Aggregation ${aggregation} provided`);
+            return 'Dataset rows are';
+    }
+};
+
+/**
+ *
+ * It refers the {@link getColumnAggregationText} utility function to get plain text from html description.
+ * @link getColumnAggregationText
+ *
+ * Returns the Plain Text to render for the aggregation portion of the Assertion Description
+ * for Assertions on Dataset Columns
+ */
+export const getColumnAggregationPlainText = (
+    aggregation: AssertionStdAggregation | undefined | null,
+    field: SchemaFieldRef | undefined,
+) => {
+    let columnText = decodeSchemaField(field?.path || '');
+    if (field === undefined) {
+        columnText = 'undefined';
+        console.error(`Invalid field provided for Dataset Assertion with scope Column ${JSON.stringify(field)}`);
+    }
+    switch (aggregation) {
+        // Hybrid Aggregations
+        case AssertionStdAggregation.UniqueCount: {
+            return `Unique value count for column ${columnText} is`;
+        }
+        case AssertionStdAggregation.UniquePropotion: {
+            return `Unique value proportion for column ${columnText} is`;
+        }
+        case AssertionStdAggregation.NullCount: {
+            return `Null count for column ${columnText} is`;
+        }
+        case AssertionStdAggregation.NullProportion: {
+            return `Null proportion for column ${columnText} is`;
+        }
+        // Numeric Aggregations
+        case AssertionStdAggregation.Min: {
+            return `Minimum value for column ${columnText} is`;
+        }
+        case AssertionStdAggregation.Max: {
+            return `Maximum value for column ${columnText} is`;
+        }
+        case AssertionStdAggregation.Mean: {
+            return `Mean value for column ${columnText} is`;
+        }
+        case AssertionStdAggregation.Median: {
+            return `Median value for column ${columnText} is`;
+        }
+        case AssertionStdAggregation.Stddev: {
+            return `Standard deviation for column ${columnText} is`;
+        }
+        // Native Aggregations
+        case AssertionStdAggregation.Native: {
+            return `Column ${columnText} values are`;
+        }
+        default:
+            // No aggregation on the column at hand. Treat the column as a set of values.
+            return `Column ${columnText} values are`;
+    }
+};
+
+/**
+ * It refers the {@link getAggregationText} utility function to get plain text from html description.
+ * @link getAggregationText
+ * Returns the Plain Text to render for the aggregation portion of the Assertion Description
+ */
+export const getAggregationPlainText = (
+    scope: DatasetAssertionScope,
+    aggregation: AssertionStdAggregation | undefined | null,
+    fields: Array<SchemaFieldRef> | undefined | null,
+) => {
+    switch (scope) {
+        case DatasetAssertionScope.DatasetSchema:
+            return getSchemaAggregationPlainText(aggregation, fields);
+        case DatasetAssertionScope.DatasetRows:
+            return getRowsAggregationPlainText(aggregation);
+        case DatasetAssertionScope.DatasetColumn:
+            return getColumnAggregationPlainText(aggregation, fields?.length === 1 ? fields[0] : undefined);
+        default:
+            console.error(`Unsupported Dataset Assertion scope ${scope} provided`);
+            return 'Dataset is';
+    }
+};
+
+/**
+ * It refers the {@link DatasetAssertionDescription} utility function to get plain text from html description.
+ * @link DatasetAssertionDescription
+ * A human-readable Plain Text description of a Dataset Assertion.
+ */
+
+export const getDatasetAssertionPlainTextDescription = (datasetAssertion: DatasetAssertionInfo): string => {
+    const { scope, aggregation, fields, operator, parameters, nativeType } = datasetAssertion;
+    const aggregationPlainText = getAggregationPlainText(scope, aggregation, fields);
+    const operatorPlainText = getOperatorPlainText(operator, parameters || undefined, nativeType || undefined);
+    return `${aggregationPlainText} ${operatorPlainText}`;
+};
+
+/**
+ * It refers the {@link getAggregationText} utility function to get plain text from html description.
+ * @link getAggregationText
+ * A human-readable Plain Text description of a Volume Assertion.
+ */
+export const getVolumeAssertionPlainTextDescription = (assertionInfo: VolumeAssertionInfo): string => {
+    const volumeType = assertionInfo.type;
+    const volumeTypeInfo = getVolumeTypeInfo(assertionInfo);
+    const volumeTypeDescription = getVolumeTypeDescription(volumeType);
+    const operatorDescription = volumeTypeInfo ? getOperatorDescription(volumeTypeInfo.operator) : '';
+    const parameterDescription = volumeTypeInfo ? getParameterDescription(volumeTypeInfo.parameters) : '';
+    const valueChangeTypeDescription = getIsRowCountChange(volumeType)
+        ? getValueChangeTypeDescription((volumeTypeInfo as RowCountChange | IncrementingSegmentRowCountChange).type)
+        : 'rows';
+
+    return `Table ${volumeTypeDescription} ${operatorDescription} ${parameterDescription} ${valueChangeTypeDescription}`;
+};
+
+/**
+ * It refers the {@link getAggregationText} utility function to get plain text from html description.
+ * @link getAggregationText
+ * A human-readable Plain Text description of a Field Assertion.
+ */
+export const getFieldAssertionPlainTextDescription = (assertionInfo: FieldAssertionInfo) => {
+    const field = getFieldDescription(assertionInfo);
+    const transform = getFieldTransformDescription(assertionInfo);
+    // Do not pluralize if this is a metric assertion since you're checking one metric, not multiple values
+    const operator = getFieldOperatorDescription({ assertionInfo, isPlural: !transform });
+    const parameters = getFieldParametersDescription(assertionInfo);
+    return `${transform} ${transform ? ' of ' : ''}${field} ${
+        (transform && 'column') || 'Values'
+    } ${operator} ${parameters}`;
+};
+
+/**
+ * It refers the {@link getAggregationText} utility function to get plain text from html description.
+ * @link getAggregationText
+ * A human-readable Plain Text description of a Schema Assertion.
+ */
+export const getSchemaAssertionPlainTextDescription = (assertionInfo: SchemaAssertionInfo) => {
+    const { compatibility } = assertionInfo;
+    const matchText = compatibility === SchemaAssertionCompatibility.ExactMatch ? 'exactly match' : 'include';
+    const expectedColumnCount = assertionInfo?.fields?.length || 0;
+    return `Actual table columns ${matchText} ${expectedColumnCount} expected columns`;
+};
+
+/** below functions are related to Freshness */
+
+/**
+ * A human-readable Plain Text description of an Freshness Assertion.
+ */
+export const getFreshnessAssertionPlainTextDescription = (
+    assertionInfo: FreshnessAssertionInfo,
+    monitorSchedule: CronSchedule,
+) => {
+    const scheduleType = assertionInfo.schedule?.type;
+    const freshnessType = assertionInfo.type;
+
+    let scheduleText = '';
+    switch (scheduleType) {
+        case FreshnessAssertionScheduleType.FixedInterval:
+            scheduleText = createFixedIntervalText(assertionInfo.schedule?.fixedInterval, monitorSchedule);
+            break;
+        case FreshnessAssertionScheduleType.Cron:
+            scheduleText = createCronText(assertionInfo.schedule?.cron as CronSchedule);
+            break;
+        case FreshnessAssertionScheduleType.SinceTheLastCheck:
+            scheduleText = createSinceTheLastCheckText(monitorSchedule);
+            break;
+        default:
+            scheduleText = 'within an unrecognized schedule window.';
+            break;
+    }
+    return `${
+        freshnessType === FreshnessAssertionType.DatasetChange ? 'Table was updated ' : 'Data Task is run successfully '
+    }${scheduleText}`;
+};
+
+/**
+ * Returns a text element describing the given assertion
+ * If the assertion has a user-defined assertion, it'll prioritize displaying that.
+ * Else it'll infer a description.
+ * @IMPORTANT if you modify this, also modify {@link #getPlainTextDescriptionFromAssertion()} below
+ * @param assertionInfo
+ * @param monitorSchedule
+ * @returns {JSX.Element}
+ */
+const useBuildPrimaryLabel = (
+    assertionInfo?: Maybe<AssertionInfo>,
+    monitorSchedule?: Maybe<CronSchedule>,
+    options?: { showColumnTag?: boolean },
+): JSX.Element => {
+    let primaryLabel = <Typography.Text>No description found</Typography.Text>;
+    if (assertionInfo?.description && assertionInfo?.type !== AssertionType.Field) {
+        primaryLabel = <Typography.Text>{assertionInfo.description}</Typography.Text>;
+    } else {
+        switch (assertionInfo?.type) {
+            case AssertionType.Dataset:
+                primaryLabel = (
+                    <DatasetAssertionDescription
+                        assertionInfo={assertionInfo.datasetAssertion as DatasetAssertionInfo}
+                    />
+                );
+                break;
+            case AssertionType.Freshness:
+                primaryLabel = (
+                    <FreshnessAssertionDescription
+                        assertionInfo={assertionInfo.freshnessAssertion as FreshnessAssertionInfo}
+                        monitorSchedule={monitorSchedule}
+                    />
+                );
+                break;
+            case AssertionType.Volume:
+                primaryLabel = (
+                    <VolumeAssertionDescription assertionInfo={assertionInfo.volumeAssertion as VolumeAssertionInfo} />
+                );
+                break;
+            case AssertionType.Sql:
+                primaryLabel = <SqlAssertionDescription assertionInfo={assertionInfo} />;
+                break;
+            case AssertionType.Field:
+                primaryLabel = (
+                    <FieldAssertionDescription
+                        assertionDescription={assertionInfo?.description}
+                        assertionInfo={assertionInfo.fieldAssertion as FieldAssertionInfo}
+                        showColumnTag={options?.showColumnTag}
+                    />
+                );
+                break;
+            case AssertionType.DataSchema:
+                primaryLabel = (
+                    <SchemaAssertionDescription assertionInfo={assertionInfo.schemaAssertion as SchemaAssertionInfo} />
+                );
+                break;
+            default:
+                break;
+        }
+    }
+    return primaryLabel;
+};
+
+/**
+ * Builds secondary label component containing information about who created and last updated the assertion
+ * Has a tooltip on hover with richer context
+ * @param assertionInfo
+ * @returns {JSX.Element} if sufficient data is present
+ */
+const useBuildSecondaryLabel = (assertionInfo?: Maybe<AssertionInfo>): JSX.Element | null => {
+    const entityRegistry = useEntityRegistry();
+
+    // 1. Fetching the most recent actor data.
+    const creatorActorUrn = assertionInfo?.source?.created?.actor;
+    const updatedActorUrn = assertionInfo?.lastUpdated?.actor;
+    const { data: createdActor } = useGetUserQuery({
+        variables: { urn: creatorActorUrn ?? '', groupsCount: 0 },
+        fetchPolicy: 'cache-first',
+        skip: !creatorActorUrn,
+    });
+    const { data: lastUpdatedActor } = useGetUserQuery({
+        variables: { urn: updatedActorUrn ?? '', groupsCount: 0 },
+        fetchPolicy: 'cache-first',
+        skip: !updatedActorUrn,
+    });
+
+    // 2. Define the secondary label message and the richer tooltip messages
+    let secondaryLabelMessage = '';
+    let tooltipCreatedByMessage = '';
+    let tooltipLastUpdatedByMessage = '';
+
+    // 2.1 Creator info if available
+    if (createdActor?.corpUser && entityRegistry.getDisplayName(EntityType.CorpUser, createdActor.corpUser)) {
+        secondaryLabelMessage = `Created by ${entityRegistry.getDisplayName(
+            EntityType.CorpUser,
+            createdActor.corpUser,
+        )}`;
+
+        tooltipCreatedByMessage = `Created by: ${entityRegistry.getDisplayName(
+            EntityType.CorpUser,
+            createdActor.corpUser,
+        )}${createdActor.corpUser?.info?.email ? ` (${createdActor.corpUser.info.email})` : ''} on ${
+            assertionInfo?.source?.created?.time
+                ? new Date(assertionInfo.source.created.time).toLocaleString()
+                : 'an unknown time' // should never get here
+        }.`;
+    }
+    // 2.2 Last updated info if available
+    if (lastUpdatedActor?.corpUser && entityRegistry.getDisplayName(EntityType.CorpUser, lastUpdatedActor.corpUser)) {
+        // Special handling if creator is last updater
+        if (updatedActorUrn === creatorActorUrn) {
+            const prefix =
+                assertionInfo?.source?.created?.time === assertionInfo?.lastUpdated?.time
+                    ? `Created by`
+                    : `Last updated by`;
+            secondaryLabelMessage = `${prefix} ${entityRegistry.getDisplayName(
+                EntityType.CorpUser,
+                lastUpdatedActor.corpUser,
+            )}`;
+        } else {
+            secondaryLabelMessage = `Last updated by ${entityRegistry.getDisplayName(
+                EntityType.CorpUser,
+                lastUpdatedActor.corpUser,
+            )}`;
+        }
+
+        // Show tooltip label for last updated if either the updater != creator OR if updatedTime != createdTime
+        if (
+            updatedActorUrn !== creatorActorUrn ||
+            assertionInfo?.lastUpdated?.time !== assertionInfo?.source?.created?.time
+        ) {
+            tooltipLastUpdatedByMessage = `Last updated by ${entityRegistry.getDisplayName(
+                EntityType.CorpUser,
+                lastUpdatedActor.corpUser,
+            )}${lastUpdatedActor.corpUser?.info?.email ? ` (${lastUpdatedActor.corpUser.info.email})` : ''} on ${
+                assertionInfo?.lastUpdated?.time
+                    ? new Date(assertionInfo.lastUpdated.time).toLocaleString()
+                    : 'an unknown time' // should never get here
+            }.`;
+        }
+    }
+
+    // 3. Construct the secondary label component if sufficient data exists
+    return secondaryLabelMessage ? (
+        <Tooltip
+            title={
+                <>
+                    {tooltipCreatedByMessage ? [tooltipCreatedByMessage, <br />] : null}
+                    {tooltipLastUpdatedByMessage}
+                </>
+            }
+        >
+            <Typography.Text style={{ color: ANTD_GRAY_V2['6'], fontSize: 12 }}>
+                {secondaryLabelMessage}
+            </Typography.Text>
+        </Tooltip>
+    ) : null;
+};
+
+/**
+ * @IMPORTANT if you modify this, also modify {@link #getPlainTextDescriptionFromAssertion()} below
+ */
+export const useBuildAssertionDescriptionLabels = (
+    assertionInfo?: Maybe<AssertionInfo>,
+    monitorSchedule?: Maybe<CronSchedule>,
+    options?: { showColumnTag?: boolean },
+): {
+    primaryLabel: JSX.Element;
+    secondaryLabel: JSX.Element | null;
+} => {
+    // ------- Primary label with assertion description ------ //
+    // IMPORTANT: if you modify this, also modify {@link #getPlainTextDescriptionFromAssertion} below
+    const primaryLabel = useBuildPrimaryLabel(assertionInfo, monitorSchedule, options);
+
+    // ----------- Try displaying secondary label showing creator/updater context ------------ //
+    const secondaryLabel = useBuildSecondaryLabel(assertionInfo);
+
+    return {
+        primaryLabel,
+        secondaryLabel,
+    };
+};
+
+/**
+ * Similar to {@link #useBuildPrimaryLabel}, but returns plaintext instead of jsx.
+ * Primarily used for building the search index!
+ */
+export const getPlainTextDescriptionFromAssertion = (assertionInfo?: AssertionInfo): string => {
+    // if description is present don't generate dynamic description
+    if (assertionInfo?.description) {
+        return assertionInfo.description;
+    }
+
+    return assertionInfo
+        ? getDatasetAssertionPlainTextDescription(assertionInfo.datasetAssertion as DatasetAssertionInfo)
+        : '';
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertionUtils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertionUtils.tsx
new file mode 100644
index 00000000000000..d7f1683f98e4dd
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertionUtils.tsx
@@ -0,0 +1,194 @@
+import React from 'react';
+import QueryString from 'query-string';
+import { CheckCircleOutlined, CloseCircleOutlined, ExclamationCircleOutlined, StopOutlined } from '@ant-design/icons';
+import {
+    AssertionResult,
+    AssertionResultErrorType,
+    AssertionResultType,
+    AssertionStdParameter,
+    AssertionStdParameterType,
+    DatasetAssertionInfo,
+    StringMapEntry,
+    Maybe,
+} from '../../../../../../types.generated';
+import AssertionSuccessIcon from '../../../../../../images/assertion_v2_success_dot.svg?react';
+import AssertionFailureIcon from '../../../../../../images/assertion_v2_failure_dot.svg?react';
+import AssertionErrorIcon from '../../../../../../images/assertion_error_dot.svg?react';
+import AssertionInitIcon from '../../../../../../images/assertion_init_dot.svg?react'; // TODO
+import AssertionNoResultsIcon from '../../../../../../images/assertion_no_results_dot.svg?react'; // TODO
+import { ANTD_GRAY } from '../../../constants';
+
+/**
+ * Utility methods
+ */
+export const sortAssertions = (a, b) => {
+    if (!a.runEvents?.runEvents?.length) {
+        return 1;
+    }
+    if (!b.runEvents?.runEvents?.length) {
+        return -1;
+    }
+    return b?.runEvents?.runEvents[0]?.timestampMillis - a?.runEvents?.runEvents[0]?.timestampMillis;
+};
+
+/**
+ * Returns the display text assoociated with an AssertionResultType
+ */
+export const getResultText = (result: AssertionResultType) => {
+    switch (result) {
+        case AssertionResultType.Success:
+            return 'Passed';
+        case AssertionResultType.Failure:
+            return 'Failed';
+        case AssertionResultType.Error:
+            return 'Error';
+        case AssertionResultType.Init:
+            return 'Initializing';
+        default:
+            throw new Error(`Unsupported Assertion Result Type ${result} provided.`);
+    }
+};
+
+/**
+ * Returns the display color associated with an AssertionResultType
+ */
+const SUCCESS_COLOR_HEX = '#4db31b';
+const FAILURE_COLOR_HEX = '#F5222D';
+const ERROR_COLOR_HEX = '#FAAD14';
+const INIT_COLOR_HEX = '#2F54EB';
+const NO_RESULTS_COLOR_HEX = ANTD_GRAY[8];
+
+export const getResultColor = (result?: AssertionResultType) => {
+    if (!result) {
+        return NO_RESULTS_COLOR_HEX;
+    }
+    switch (result) {
+        case AssertionResultType.Success:
+            return SUCCESS_COLOR_HEX;
+        case AssertionResultType.Failure:
+            return FAILURE_COLOR_HEX;
+        case AssertionResultType.Error:
+            return ERROR_COLOR_HEX;
+        case AssertionResultType.Init:
+            return INIT_COLOR_HEX;
+        default:
+            throw new Error(`Unsupported Assertion Result Type ${result} provided.`);
+    }
+};
+
+/**
+ * Returns the display icon associated with an AssertionResultType
+ */
+export const getResultIcon = (result: AssertionResultType, color?: string) => {
+    const resultColor = color || getResultColor(result);
+    switch (result) {
+        case AssertionResultType.Success:
+            return <CheckCircleOutlined style={{ color: resultColor }} />;
+        case AssertionResultType.Failure:
+            return <CloseCircleOutlined style={{ color: resultColor }} />;
+        case AssertionResultType.Error:
+            return <ExclamationCircleOutlined style={{ color: resultColor }} />;
+        case AssertionResultType.Init:
+            return <StopOutlined style={{ color: resultColor }} />;
+        default:
+            throw new Error(`Unsupported Assertion Result Type ${result} provided.`);
+    }
+};
+
+/**
+ * Convert an array of StringMapEntry into a map, for easy retrieval.
+ */
+export const convertNativeParametersArrayToMap = (nativeParameters: Maybe<Array<StringMapEntry>> | undefined) => {
+    if (nativeParameters) {
+        const map = new Map();
+        nativeParameters.forEach((parameter) => {
+            map.set(parameter.key, parameter.value);
+        });
+        return map;
+    }
+    return undefined;
+};
+
+export const getResultErrorMessage = (result: AssertionResult) => {
+    if (result.type !== AssertionResultType.Error) {
+        return undefined;
+    }
+
+    const errorType = result.error?.type;
+
+    switch (errorType) {
+        case AssertionResultErrorType.SourceConnectionError:
+            return 'Unable to connect to source data platform. Please check the connection.';
+        case AssertionResultErrorType.SourceQueryFailed:
+            return 'Failed to evaluate query against the source platform.';
+        case AssertionResultErrorType.InsufficientData:
+            return 'Not enough data to evaluate assertion.';
+        case AssertionResultErrorType.InvalidParameters:
+            return 'Invalid parameters. Please check the assertion configuration.';
+        case AssertionResultErrorType.InvalidSourceType:
+            return 'Invalid source type selected. Please select different source type in assertion configuration.';
+        case AssertionResultErrorType.UnsupportedPlatform:
+            return 'Unsupported platform.';
+        case AssertionResultErrorType.CustomSqlError:
+            return 'Custom SQL query resulted in an error.';
+        default:
+            return 'An unknown error occurred.';
+    }
+};
+
+/**
+ * Returns the value of an AssertionStdParameter suitable for display
+ */
+const MISSING_PARAMETER_VALUE = '?';
+export const getFormattedParameterValue = (parameter: AssertionStdParameter | undefined | null): React.ReactNode => {
+    if (parameter === null || parameter === undefined) {
+        return MISSING_PARAMETER_VALUE;
+    }
+    switch (parameter.type) {
+        case AssertionStdParameterType.Number:
+            return parseFloat(parameter.value as string).toLocaleString();
+        case AssertionStdParameterType.String:
+            return parameter.value;
+        case AssertionStdParameterType.Set:
+            return parameter.value;
+        default:
+            return Number.isNaN(Number(parameter.value as any))
+                ? parameter.value
+                : parseFloat(parameter.value as string).toLocaleString();
+    }
+};
+
+/**
+ * Throws if an assertion has no input fields
+ */
+export const validateAssertionsHasInputFields = (info: DatasetAssertionInfo) => {
+    if (info.fields && info.fields.length === 1) {
+        return info.fields[0].path;
+    }
+    throw new Error('Failed to find field path(s) for column assertion.');
+};
+
+export const getQueryParams = (param: string, location: any): string | null => {
+    const params = QueryString.parse(location.search);
+    return params[param] ? String(params[param]) : null;
+};
+
+export const getResultDotIcon = (result?: AssertionResultType, size?: number, disabled?: boolean) => {
+    const opacity = disabled ? 0.4 : 1;
+    if (!result) {
+        // Todo replace will no results yet icon.
+        return <AssertionNoResultsIcon width={size} height={size} opacity={opacity} />;
+    }
+    switch (result) {
+        case AssertionResultType.Success:
+            return <AssertionSuccessIcon width={size} height={size} opacity={opacity} />;
+        case AssertionResultType.Failure:
+            return <AssertionFailureIcon width={size} height={size} opacity={opacity} />;
+        case AssertionResultType.Error:
+            return <AssertionErrorIcon width={size} height={size} opacity={opacity} />;
+        case AssertionResultType.Init:
+            return <AssertionInitIcon width={size} height={size} opacity={opacity} />;
+        default:
+            throw new Error(`Unsupported Assertion Result Type ${result} provided.`);
+    }
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractAssertionStatus.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractAssertionStatus.tsx
new file mode 100644
index 00000000000000..9122823f4b9ed6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractAssertionStatus.tsx
@@ -0,0 +1,44 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Tooltip } from '@components';
+import { StopOutlined } from '@ant-design/icons';
+import { Assertion, AssertionResultType } from '../../../../../../../types.generated';
+import {
+    StyledCheckOutlined,
+    StyledClockCircleOutlined,
+    StyledCloseOutlined,
+    StyledExclamationOutlined,
+} from '../shared/styledComponents';
+
+const StatusContainer = styled.div`
+    width: 100%;
+    display: flex;
+    justify-content: center;
+`;
+
+type Props = {
+    assertion: Assertion;
+};
+
+export const DataContractAssertionStatus = ({ assertion }: Props) => {
+    const latestRun = (assertion.runEvents?.runEvents?.length && assertion.runEvents?.runEvents[0]) || undefined;
+    const latestResultType = latestRun?.result?.type || undefined;
+
+    return (
+        <StatusContainer>
+            {latestResultType === undefined && <StopOutlined />}
+            <Tooltip title="Assertion is passing">
+                {latestResultType === AssertionResultType.Success && <StyledCheckOutlined />}
+            </Tooltip>
+            <Tooltip title="Assertion is failing">
+                {latestResultType === AssertionResultType.Failure && <StyledCloseOutlined />}
+            </Tooltip>
+            <Tooltip title="Assertion has completed with errors">
+                {latestResultType === AssertionResultType.Error && <StyledExclamationOutlined />}
+            </Tooltip>
+            <Tooltip title="Assertion is initializing">
+                {latestResultType === AssertionResultType.Init && <StyledClockCircleOutlined />}
+            </Tooltip>
+        </StatusContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummary.tsx
new file mode 100644
index 00000000000000..ec7e1f0be1bfe1
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummary.tsx
@@ -0,0 +1,106 @@
+import React from 'react';
+import styled from 'styled-components';
+import EditIcon from '@mui/icons-material/Edit';
+import { Button, Typography } from 'antd';
+import { Tooltip } from '@components';
+import { DataContractState } from '../../../../../../../types.generated';
+import { AssertionStatusSummary } from '../acrylTypes';
+import { getContractSummaryIcon, getContractSummaryTitle, getContractSummaryMessage } from './utils';
+import { ANTD_GRAY } from '../../../../constants';
+
+const SummaryHeader = styled.div`
+    width: 100%;
+    padding-left: 40px;
+    padding-top: 20px;
+    padding-bottom: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
+`;
+
+const SummaryContainer = styled.div``;
+
+const SummaryDescription = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const SummaryMessage = styled.div`
+    display: inline-block;
+    margin-left: 20px;
+`;
+
+const SummaryTitle = styled(Typography.Title)`
+    && {
+        padding-bottom: 0px;
+        margin-bottom: 0px;
+    }
+`;
+
+const Actions = styled.div`
+    margin: 12px;
+    margin-right: 20px;
+`;
+
+const CreateButton = styled(Button)`
+    display: flex;
+    align-items: center;
+    gap: 0.3rem;
+    margin-right: 12px;
+    border-color: ${(props) => props.theme.styles['primary-color']};
+    color: ${(props) => props.theme.styles['primary-color']};
+    letter-spacing: 2px;
+    &&:hover {
+        color: white;
+        background-color: ${(props) => props.theme.styles['primary-color']};
+        border-color: ${(props) => props.theme.styles['primary-color']};
+    }
+`;
+
+const EditIconStyle = styled(EditIcon)`
+    && {
+        font-size: 16px;
+    }
+`;
+
+type Props = {
+    state: DataContractState;
+    summary: AssertionStatusSummary;
+    showContractBuilder: () => void;
+    editDisabled?: boolean;
+    editDisabledMessage?: React.ReactNode;
+};
+
+export const DataContractSummary = ({
+    state,
+    summary,
+    showContractBuilder,
+    editDisabled,
+    editDisabledMessage,
+}: Props) => {
+    const summaryIcon = getContractSummaryIcon(state, summary);
+    const summaryTitle = getContractSummaryTitle(state, summary);
+    const summaryMessage = getContractSummaryMessage(state, summary);
+    return (
+        <SummaryHeader>
+            <SummaryContainer>
+                <SummaryDescription>
+                    {summaryIcon}
+                    <SummaryMessage>
+                        <SummaryTitle level={5}>{summaryTitle}</SummaryTitle>
+                        <Typography.Text type="secondary">{summaryMessage}</Typography.Text>
+                    </SummaryMessage>
+                </SummaryDescription>
+            </SummaryContainer>
+            <Actions>
+                <Tooltip title={editDisabled ? editDisabledMessage : null}>
+                    <CreateButton disabled={editDisabled} onClick={showContractBuilder}>
+                        <EditIconStyle />
+                        EDIT
+                    </CreateButton>
+                </Tooltip>
+            </Actions>
+        </SummaryHeader>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter.tsx
new file mode 100644
index 00000000000000..29e41553149f7b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import styled from 'styled-components';
+import { ArrowRightOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+import { Assertion } from '../../../../../../../types.generated';
+import { StyledCheckOutlined, StyledCloseOutlined, StyledExclamationOutlined } from '../shared/styledComponents';
+import { getAssertionsSummary } from '../acrylUtils';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../../../../constants';
+
+const Container = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+`;
+
+const StatusContainer = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const StatusText = styled.div`
+    color: ${ANTD_GRAY[8]};
+    margin-left: 4px;
+`;
+
+const ActionButton = styled(Button)`
+    color: ${REDESIGN_COLORS.BLUE};
+`;
+
+const StyledArrowRightOutlined = styled(ArrowRightOutlined)`
+    font-size: 8px;
+`;
+
+type Props = {
+    assertions: Assertion[];
+    passingText: string;
+    failingText: string;
+    errorText: string;
+    actionText?: string;
+    showAction?: boolean;
+};
+
+export const DataContractSummaryFooter = ({
+    assertions,
+    actionText,
+    passingText,
+    errorText,
+    failingText,
+    showAction = true,
+}: Props) => {
+    const summary = getAssertionsSummary(assertions);
+    const isFailing = summary.failing > 0;
+    const isPassing = summary.passing && summary.passing === summary.total;
+    const isErroring = summary.erroring > 0;
+    return (
+        <Container>
+            <StatusContainer>
+                {(isFailing && <StyledCloseOutlined />) || undefined}
+                {(isPassing && <StyledCheckOutlined />) || undefined}
+                {(isErroring && !isFailing && <StyledExclamationOutlined />) || undefined}
+                <StatusText>
+                    {(isFailing && failingText) || undefined}
+                    {(isPassing && passingText) || undefined}
+                    {(isErroring && errorText) || undefined}
+                </StatusText>
+            </StatusContainer>
+            {showAction && (
+                <ActionButton type="text">
+                    {actionText}
+                    <StyledArrowRightOutlined />
+                </ActionButton>
+            )}
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractTab.tsx
new file mode 100644
index 00000000000000..359056638af566
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataContractTab.tsx
@@ -0,0 +1,115 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { useGetDatasetContractQuery } from '../../../../../../../graphql/contract.generated';
+import { DataContractState } from '../../../../../../../types.generated';
+import { useEntityData } from '../../../../../../entity/shared/EntityContext';
+import { DataContractSummary } from './DataContractSummary';
+import { DataQualityContractSummary } from './DataQualityContractSummary';
+import { SchemaContractSummary } from './SchemaContractSummary';
+import { FreshnessContractSummary } from './FreshnessContractSummary';
+import { DataContractBuilderModal } from './builder/DataContractBuilderModal';
+import { DataContractEmptyState } from '../../../../../../entity/shared/tabs/Dataset/Validations/contract/DataContractEmptyState';
+import { getAssertionsSummary } from '../acrylUtils';
+
+const Container = styled.div`
+    display: flex;
+`;
+
+const LeftColumn = styled.div`
+    width: 50%;
+`;
+
+const RightColumn = styled.div`
+    width: 50%;
+`;
+
+/**
+ * Component used for rendering the Data Contract Tab on the Assertions parent tab.
+ */
+export const DataContractTab = () => {
+    const { urn } = useEntityData();
+
+    const { data, refetch } = useGetDatasetContractQuery({
+        variables: {
+            urn,
+        },
+    });
+    const [showContractBuilder, setShowContractBuilder] = useState(false);
+
+    const contract = data?.dataset?.contract;
+    const schemaContracts = data?.dataset?.contract?.properties?.schema || [];
+    const freshnessContracts = data?.dataset?.contract?.properties?.freshness || [];
+    const dataQualityContracts = data?.dataset?.contract?.properties?.dataQuality || [];
+    const schemaAssertions = schemaContracts.map((c) => c.assertion);
+    const freshnessAssertions = freshnessContracts.map((c) => c.assertion);
+    const dataQualityAssertions = dataQualityContracts.map((c) => c.assertion);
+    const assertionsSummary = getAssertionsSummary([
+        ...schemaAssertions,
+        ...freshnessAssertions,
+        ...dataQualityAssertions,
+    ] as any);
+    const contractState = data?.dataset?.contract?.status?.state || DataContractState.Active;
+    const hasFreshnessContract = freshnessContracts && freshnessContracts?.length;
+    const hasSchemaContract = schemaContracts && schemaContracts?.length;
+    const hasDataQualityContract = dataQualityContracts && dataQualityContracts?.length;
+    const showLeftColumn = hasFreshnessContract || hasSchemaContract || undefined;
+
+    const onContractUpdate = () => {
+        if (contract) {
+            // Contract exists, just refetch.
+            refetch();
+        } else {
+            // no contract yet, wait for indxing,
+            setTimeout(() => refetch(), 3000);
+        }
+        setShowContractBuilder(false);
+    };
+
+    return (
+        <>
+            {data?.dataset?.contract ? (
+                <>
+                    <DataContractSummary
+                        state={contractState}
+                        summary={assertionsSummary}
+                        showContractBuilder={() => setShowContractBuilder(true)}
+                    />
+                    <Container>
+                        {showLeftColumn && (
+                            <LeftColumn>
+                                {(hasFreshnessContract && (
+                                    <FreshnessContractSummary
+                                        contracts={freshnessContracts as any}
+                                        showAction={false}
+                                    />
+                                )) ||
+                                    undefined}
+                                {(hasSchemaContract && (
+                                    <SchemaContractSummary contracts={schemaContracts as any} showAction={false} />
+                                )) ||
+                                    undefined}
+                            </LeftColumn>
+                        )}
+                        <RightColumn>
+                            {hasDataQualityContract ? (
+                                <DataQualityContractSummary
+                                    contracts={dataQualityContracts as any}
+                                    showAction={false}
+                                />
+                            ) : undefined}
+                        </RightColumn>
+                    </Container>
+                </>
+            ) : (
+                <DataContractEmptyState showContractBuilder={() => setShowContractBuilder(true)} />
+            )}
+            {showContractBuilder && (
+                <DataContractBuilderModal
+                    entityUrn={urn}
+                    onCancel={() => setShowContractBuilder(false)}
+                    onSubmit={onContractUpdate}
+                />
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataQualityContractSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataQualityContractSummary.tsx
new file mode 100644
index 00000000000000..5b01540f859c62
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/DataQualityContractSummary.tsx
@@ -0,0 +1,100 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Table } from 'antd';
+import { Assertion, DataQualityContract, DatasetAssertionInfo } from '../../../../../../../types.generated';
+import { ANTD_GRAY } from '../../../../constants';
+import { DataContractAssertionStatus } from './DataContractAssertionStatus';
+import { DataContractSummaryFooter } from './DataContractSummaryFooter';
+import { DatasetAssertionDescription } from '../DatasetAssertionDescription';
+import { FieldAssertionDescription } from '../FieldAssertionDescription';
+import { SqlAssertionDescription } from '../SqlAssertionDescription';
+import { VolumeAssertionDescription } from '../VolumeAssertionDescription';
+
+const TitleText = styled.div`
+    color: ${ANTD_GRAY[7]};
+    margin-bottom: 20px;
+    letter-spacing: 1px;
+`;
+
+const ColumnHeader = styled.div`
+    color: ${ANTD_GRAY[8]};
+`;
+
+const Container = styled.div`
+    padding: 28px;
+`;
+
+const SummaryContainer = styled.div`
+    width: 100%;
+    display: flex;
+    align-items: center;
+`;
+
+const StyledTable = styled(Table)`
+    width: 100%;
+    border-radius: 8px;
+    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.1);
+`;
+
+type Props = {
+    contracts: DataQualityContract[];
+    showAction?: boolean;
+};
+
+export const DataQualityContractSummary = ({ contracts, showAction = false }: Props) => {
+    const assertions: Assertion[] = contracts?.map((contract) => contract.assertion);
+
+    const columns = [
+        {
+            title: () => <ColumnHeader>ASSERTION</ColumnHeader>,
+            render: (assertion: Assertion) => (
+                <>
+                    {assertion.info?.datasetAssertion && (
+                        <DatasetAssertionDescription
+                            assertionInfo={assertion.info?.datasetAssertion as DatasetAssertionInfo}
+                        />
+                    )}
+                    {assertion.info?.volumeAssertion && (
+                        <VolumeAssertionDescription assertionInfo={assertion.info?.volumeAssertion} />
+                    )}
+                    {assertion.info?.fieldAssertion && (
+                        <FieldAssertionDescription assertionInfo={assertion.info?.fieldAssertion} />
+                    )}
+                    {assertion.info?.sqlAssertion && <SqlAssertionDescription assertionInfo={assertion.info} />}
+                </>
+            ),
+        },
+        {
+            title: () => <ColumnHeader style={{ display: 'flex', justifyContent: 'center' }}>STATUS</ColumnHeader>,
+            render: (assertion: Assertion) => <DataContractAssertionStatus assertion={assertion} />,
+        },
+    ];
+
+    const data = (assertions || []).map((assertion) => ({
+        ...assertion,
+        key: assertion.urn,
+    }));
+
+    return (
+        <Container>
+            <TitleText>DATA QUALITY</TitleText>
+            <SummaryContainer>
+                <StyledTable
+                    pagination={false}
+                    columns={columns}
+                    dataSource={data}
+                    footer={() => (
+                        <DataContractSummaryFooter
+                            assertions={assertions}
+                            passingText="Meeting data quality contract"
+                            failingText="Violating data quality contract"
+                            errorText="Data quality contract assertions are completing with errors"
+                            actionText="view data quality assertions"
+                            showAction={showAction}
+                        />
+                    )}
+                />
+            </SummaryContainer>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/FreshnessContractSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/FreshnessContractSummary.tsx
new file mode 100644
index 00000000000000..efd0151b69bc2f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/FreshnessContractSummary.tsx
@@ -0,0 +1,96 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Divider } from 'antd';
+import { ClockCircleOutlined } from '@ant-design/icons';
+import { FreshnessContract } from '../../../../../../../types.generated';
+import { ANTD_GRAY } from '../../../../constants';
+import { DataContractSummaryFooter } from './DataContractSummaryFooter';
+import { FreshnessScheduleSummary } from './FreshnessScheduleSummary';
+
+const Container = styled.div`
+    padding: 28px;
+`;
+
+const TitleText = styled.div`
+    color: ${ANTD_GRAY[7]};
+    margin-bottom: 20px;
+    letter-spacing: 1px;
+`;
+
+const ThinDivider = styled(Divider)`
+    && {
+        padding: 0px;
+        margin: 0px;
+    }
+`;
+
+const Header = styled.div`
+    color: ${ANTD_GRAY[8]};
+    letter-spacing; 4px;
+    padding-top: 8px;
+    padding: 12px;
+    background-color: ${ANTD_GRAY[2]};
+`;
+
+const Body = styled.div`
+    padding: 12px;
+`;
+
+const Footer = styled.div`
+    padding-top: 8px;
+    padding: 12px;
+    background-color: ${ANTD_GRAY[2]};
+`;
+
+const SummaryContainer = styled.div`
+    width: 100%;
+    border-radius: 8px;
+    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.1);
+`;
+
+type Props = {
+    contracts: FreshnessContract[];
+    showAction?: boolean;
+};
+
+export const FreshnessContractSummary = ({ contracts, showAction = false }: Props) => {
+    // TODO: Support multiple per-asset contracts.
+    const firstContract = (contracts.length && contracts[0]) || undefined;
+    const assertionDefinition = firstContract?.assertion?.info?.freshnessAssertion?.schedule;
+    const evaluationSchedule = (firstContract?.assertion as any)?.monitor?.relationships[0]?.entity?.info
+        ?.assertionMonitor?.assertions[0]?.schedule;
+
+    return (
+        <Container>
+            <TitleText>FRESHNESS</TitleText>
+            <SummaryContainer>
+                <Header>
+                    <ClockCircleOutlined style={{ marginRight: 8 }} />
+                    UPDATE FREQUENCY
+                </Header>
+                <Body>
+                    {!assertionDefinition && <>No contract found :(</>}
+                    <b>
+                        {assertionDefinition && (
+                            <FreshnessScheduleSummary
+                                definition={assertionDefinition}
+                                evaluationSchedule={evaluationSchedule}
+                            />
+                        )}
+                    </b>
+                </Body>
+                <ThinDivider />
+                <Footer>
+                    <DataContractSummaryFooter
+                        assertions={(firstContract && [firstContract?.assertion]) || []}
+                        passingText="Meeting freshness contract"
+                        failingText="Violating freshness contract"
+                        errorText="Freshness contract assertions are completing with errors"
+                        actionText="view freshness assertions"
+                        showAction={showAction}
+                    />
+                </Footer>
+            </SummaryContainer>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx
new file mode 100644
index 00000000000000..e46a08694c39a9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import cronstrue from 'cronstrue';
+import {
+    FreshnessAssertionSchedule,
+    FreshnessAssertionScheduleType,
+    CronSchedule,
+} from '../../../../../../../types.generated';
+import { capitalizeFirstLetter } from '../../../../../../shared/textUtil';
+
+type Props = {
+    definition: FreshnessAssertionSchedule;
+    evaluationSchedule?: CronSchedule; // When the assertion is run.
+};
+
+export const FreshnessScheduleSummary = ({ definition, evaluationSchedule }: Props) => {
+    let scheduleText = '';
+
+    const cronStr = definition.cron?.cron ?? evaluationSchedule?.cron;
+    switch (definition.type) {
+        case FreshnessAssertionScheduleType.Cron:
+            scheduleText = cronStr
+                ? `${capitalizeFirstLetter(cronstrue.toString(cronStr))}.`
+                : `Unknown freshness schedule.`;
+            break;
+        case FreshnessAssertionScheduleType.SinceTheLastCheck:
+            scheduleText = cronStr
+                ? `Since the previous check, as of ${cronstrue.toString(cronStr).toLowerCase()}`
+                : 'Since the previous check';
+            break;
+        case FreshnessAssertionScheduleType.FixedInterval:
+            scheduleText = `In the past ${
+                definition.fixedInterval?.multiple
+            } ${definition.fixedInterval?.unit.toLocaleLowerCase()}s${
+                cronStr ? `, as of ${cronstrue.toString(cronStr).toLowerCase()}` : ''
+            }`;
+            break;
+        default:
+            break;
+    }
+
+    return <>{scheduleText}</>;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/SchemaContractSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/SchemaContractSummary.tsx
new file mode 100644
index 00000000000000..7313a1064634c8
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/SchemaContractSummary.tsx
@@ -0,0 +1,82 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Table } from 'antd';
+import { SchemaContract } from '../../../../../../../types.generated';
+import { ANTD_GRAY } from '../../../../constants';
+import { DataContractSummaryFooter } from './DataContractSummaryFooter';
+
+const TitleText = styled.div`
+    color: ${ANTD_GRAY[7]};
+    margin-bottom: 20px;
+    letter-spacing: 1px;
+`;
+
+const ColumnHeader = styled.div`
+    color: ${ANTD_GRAY[8]};
+`;
+
+const Container = styled.div`
+    padding: 28px;
+`;
+
+const SummaryContainer = styled.div`
+    width: 100%;
+    display: flex;
+    align-items: center;
+`;
+
+const StyledTable = styled(Table)`
+    width: 100%;
+    border-radius: 8px;
+    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.1);
+    height: 100%;
+`;
+
+type Props = {
+    contracts: SchemaContract[];
+    showAction?: boolean;
+};
+
+export const SchemaContractSummary = ({ contracts, showAction = false }: Props) => {
+    const firstContract = (contracts.length && contracts[0]) || undefined;
+    const schemaMetadata = firstContract?.assertion?.info?.schemaAssertion?.schema;
+
+    const columns = [
+        {
+            title: () => <ColumnHeader>NAME</ColumnHeader>,
+            render: (field) => <>{field.fieldPath}</>,
+        },
+        {
+            title: () => <ColumnHeader>TYPE</ColumnHeader>,
+            render: (field) => <>{field.type}</>,
+        },
+    ];
+
+    const data = (schemaMetadata?.fields || []).map((field) => ({
+        ...field,
+        key: field.fieldPath,
+    }));
+
+    return (
+        <Container>
+            <TitleText>SCHEMA</TitleText>
+            <SummaryContainer>
+                <StyledTable
+                    pagination={false}
+                    columns={columns}
+                    dataSource={data}
+                    footer={() => (
+                        <DataContractSummaryFooter
+                            assertions={(firstContract && [firstContract?.assertion]) || []}
+                            passingText="Meeting schema contract"
+                            failingText="Violating schema contract"
+                            errorText="Schema contract assertions are completing with errors"
+                            actionText="view schema assertions"
+                            showAction={showAction}
+                        />
+                    )}
+                />
+            </SummaryContainer>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractAssertionGroupSelect.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractAssertionGroupSelect.tsx
new file mode 100644
index 00000000000000..fc19288c2532a3
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractAssertionGroupSelect.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Assertion } from '../../../../../../../../types.generated';
+import { ANTD_GRAY } from '../../../../../constants';
+import { AcrylDatasetAssertionsList } from '../../AcrylAssertionsList';
+import { DataContractCategoryType } from './types';
+
+const Category = styled.div`
+    padding: 20px;
+    font-weight: bold;
+    font-size: 14px;
+    background-color: ${ANTD_GRAY[3]};
+    border-radius: 4px;
+`;
+
+const Hint = styled.span`
+    font-weight: normal;
+    font-size: 14px;
+    color: ${ANTD_GRAY[8]};
+`;
+
+type Props = {
+    category: DataContractCategoryType;
+    multiple?: boolean;
+    assertions: Assertion[];
+    selectedUrns: string[];
+    onSelect: (assertionUrn: string) => void;
+};
+
+/**
+ * Used for selecting the assertions that are part of a data contract
+ */
+export const DataContractAssertionGroupSelect = ({
+    category,
+    assertions,
+    multiple = true,
+    selectedUrns,
+    onSelect,
+}: Props) => {
+    return (
+        <>
+            <Category>
+                {category} <Hint> {!multiple && `(Choose 1)`}</Hint>
+            </Category>
+            <AcrylDatasetAssertionsList
+                assertions={assertions}
+                showMenu={false}
+                showSelect
+                selectedUrns={selectedUrns}
+                onSelect={onSelect}
+            />
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilder.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilder.tsx
new file mode 100644
index 00000000000000..ff9e7f7f241b05
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilder.tsx
@@ -0,0 +1,191 @@
+import React, { useState } from 'react';
+import { message, Button } from 'antd';
+import styled from 'styled-components';
+import lodash from 'lodash';
+import { useGetDatasetAssertionsWithRunEventsQuery } from '@src/graphql/dataset.generated';
+import { DataContract, AssertionType, Assertion } from '../../../../../../../../types.generated';
+import { DataContractBuilderState, DataContractCategoryType, DEFAULT_BUILDER_STATE } from './types';
+import { buildUpsertDataContractMutationVariables } from './utils';
+import { useUpsertDataContractMutation } from '../../../../../../../../graphql/contract.generated';
+import { createAssertionGroups, tryExtractMonitorDetailsFromAssertionsWithMonitorsQuery } from '../../acrylUtils';
+import { DataContractAssertionGroupSelect } from './DataContractAssertionGroupSelect';
+import { ANTD_GRAY } from '../../../../../constants';
+import { DATA_QUALITY_ASSERTION_TYPES } from '../utils';
+
+const AssertionsSection = styled.div`
+    border: 0.5px solid ${ANTD_GRAY[4]};
+`;
+
+const HeaderText = styled.div`
+    padding: 16px 20px;
+    color: ${ANTD_GRAY[7]};
+    font-size: 16px;
+`;
+
+const ActionContainer = styled.div`
+    display: flex;
+    justify-content: space-between;
+    margin-top: 16px;
+`;
+
+const CancelButton = styled(Button)`
+    margin-left: 12px;
+`;
+
+const SaveButton = styled(Button)`
+    margin-right: 20px;
+`;
+
+type Props = {
+    entityUrn: string;
+    initialState?: DataContractBuilderState;
+    onSubmit?: (contract: DataContract) => void;
+    onCancel?: () => void;
+};
+
+/**
+ * This component is a modal used for constructing new Data Contracts
+ *
+ * In order to build a data contract, we simply list all dataset assertions and allow the user to choose.
+ */
+export const DataContractBuilder = ({ entityUrn, initialState, onSubmit, onCancel }: Props) => {
+    const isEdit = !!initialState;
+    const [builderState, setBuilderState] = useState(initialState || DEFAULT_BUILDER_STATE);
+    const [upsertDataContractMutation] = useUpsertDataContractMutation();
+
+    // note that for contracts, we do not allow the use of sibling node assertions, for clarity.
+    const { data: assertionData } = useGetDatasetAssertionsWithRunEventsQuery({
+        variables: { urn: entityUrn },
+        fetchPolicy: 'cache-first',
+    });
+    const assertionsWithMonitorsDetails: Assertion[] =
+        tryExtractMonitorDetailsFromAssertionsWithMonitorsQuery(assertionData) ?? [];
+    const assertionGroups = createAssertionGroups(assertionsWithMonitorsDetails);
+    const freshnessAssertions =
+        assertionGroups.find((group) => group.type === AssertionType.Freshness)?.assertions || [];
+    const schemaAssertions = assertionGroups.find((group) => group.type === AssertionType.DataSchema)?.assertions || [];
+    const dataQualityAssertions = assertionGroups
+        .filter((group) => DATA_QUALITY_ASSERTION_TYPES.has(group.type))
+        .flatMap((group) => group.assertions || []);
+
+    /**
+     * Upserts the Data Contract for an entity
+     */
+    const upsertDataContract = () => {
+        return upsertDataContractMutation({
+            variables: buildUpsertDataContractMutationVariables(entityUrn, builderState),
+        })
+            .then(({ data, errors }) => {
+                if (!errors) {
+                    message.success({
+                        content: isEdit ? `Edited Data Contract` : `Created Data Contract!`,
+                        duration: 3,
+                    });
+                    onSubmit?.(data?.upsertDataContract as DataContract);
+                }
+            })
+            .catch(() => {
+                message.destroy();
+                message.error({ content: 'Failed to create Data Contract! An unexpected error occurred' });
+            });
+    };
+
+    const onSelectFreshnessAssertion = (assertionUrn: string) => {
+        const selected = builderState.freshness?.assertionUrn === assertionUrn;
+        if (selected) {
+            setBuilderState({
+                ...builderState,
+                freshness: undefined,
+            });
+        } else {
+            setBuilderState({
+                ...builderState,
+                freshness: { assertionUrn },
+            });
+        }
+    };
+
+    const onSelectSchemaAssertion = (assertionUrn: string) => {
+        const selected = builderState.schema?.assertionUrn === assertionUrn;
+        if (selected) {
+            setBuilderState({
+                ...builderState,
+                schema: undefined,
+            });
+        } else {
+            setBuilderState({
+                ...builderState,
+                schema: { assertionUrn },
+            });
+        }
+    };
+
+    const onSelectDataQualityAssertion = (assertionUrn: string) => {
+        const selected = builderState.dataQuality?.some((c) => c.assertionUrn === assertionUrn);
+        if (selected) {
+            setBuilderState({
+                ...builderState,
+                dataQuality: builderState.dataQuality?.filter((c) => c.assertionUrn !== assertionUrn),
+            });
+        } else {
+            setBuilderState({
+                ...builderState,
+                dataQuality: [...(builderState.dataQuality || []), { assertionUrn }],
+            });
+        }
+    };
+
+    const editDisabled =
+        lodash.isEqual(builderState, initialState) || lodash.isEqual(builderState, DEFAULT_BUILDER_STATE);
+
+    const hasAssertions = freshnessAssertions.length || schemaAssertions.length || dataQualityAssertions.length;
+
+    return (
+        <>
+            {(hasAssertions && <HeaderText>Select the assertions that will make up your contract.</HeaderText>) || (
+                <HeaderText>Add a few assertions on this entity to create a data contract out of them.</HeaderText>
+            )}
+            <AssertionsSection>
+                {(freshnessAssertions.length && (
+                    <DataContractAssertionGroupSelect
+                        category={DataContractCategoryType.FRESHNESS}
+                        assertions={freshnessAssertions}
+                        multiple={false}
+                        selectedUrns={
+                            (builderState.freshness?.assertionUrn && [builderState.freshness?.assertionUrn]) || []
+                        }
+                        onSelect={onSelectFreshnessAssertion}
+                    />
+                )) ||
+                    undefined}
+                {(schemaAssertions.length && (
+                    <DataContractAssertionGroupSelect
+                        category={DataContractCategoryType.SCHEMA}
+                        assertions={schemaAssertions}
+                        multiple={false}
+                        selectedUrns={(builderState.schema?.assertionUrn && [builderState.schema?.assertionUrn]) || []}
+                        onSelect={onSelectSchemaAssertion}
+                    />
+                )) ||
+                    undefined}
+                {(dataQualityAssertions.length && (
+                    <DataContractAssertionGroupSelect
+                        category={DataContractCategoryType.DATA_QUALITY}
+                        assertions={dataQualityAssertions}
+                        selectedUrns={builderState.dataQuality?.map((c) => c.assertionUrn) || []}
+                        onSelect={onSelectDataQualityAssertion}
+                    />
+                )) ||
+                    undefined}
+            </AssertionsSection>
+            <ActionContainer>
+                <CancelButton onClick={onCancel}>Cancel</CancelButton>
+                <div>
+                    <SaveButton disabled={editDisabled} type="primary" onClick={upsertDataContract}>
+                        Save
+                    </SaveButton>
+                </div>
+            </ActionContainer>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx
new file mode 100644
index 00000000000000..75a8fe0410918b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx
@@ -0,0 +1,67 @@
+import React from 'react';
+import { Modal, Typography } from 'antd';
+import { DataContract } from '../../../../../../../../types.generated';
+import ClickOutside from '../../../../../../../shared/ClickOutside';
+import { DataContractBuilderState } from './types';
+import { DataContractBuilder } from './DataContractBuilder';
+
+const modalStyle = {};
+const modalBodyStyle = {
+    paddingRight: 0,
+    paddingLeft: 0,
+    paddingBottom: 20,
+    paddingTop: 0,
+    maxHeight: '70vh',
+    'overflow-x': 'auto',
+};
+
+type Props = {
+    entityUrn: string;
+    initialState?: DataContractBuilderState;
+    onSubmit?: (contract: DataContract) => void;
+    onCancel?: () => void;
+};
+
+/**
+ * This component is a modal used for constructing new Data Contracts
+ */
+export const DataContractBuilderModal = ({ entityUrn, initialState, onSubmit, onCancel }: Props) => {
+    const isEditing = initialState !== undefined;
+    const titleText = isEditing ? 'Edit Data Contract' : 'New Data Contract';
+
+    const modalClosePopup = () => {
+        Modal.confirm({
+            title: 'Exit Editor',
+            content: `Are you sure you want to exit the editor? All changes will be lost`,
+            onOk() {
+                onCancel?.();
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
+    return (
+        <ClickOutside onClickOutside={modalClosePopup} wrapperClassName="data-contract-builder-modal">
+            <Modal
+                wrapClassName="data-contract-builder-modal"
+                width={800}
+                footer={null}
+                title={<Typography.Text>{titleText}</Typography.Text>}
+                style={modalStyle}
+                bodyStyle={modalBodyStyle}
+                visible
+                onCancel={onCancel}
+            >
+                <DataContractBuilder
+                    entityUrn={entityUrn}
+                    initialState={initialState}
+                    onSubmit={onSubmit}
+                    onCancel={onCancel}
+                />
+            </Modal>
+        </ClickOutside>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/types.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/types.ts
new file mode 100644
index 00000000000000..d527837efd72ef
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/types.ts
@@ -0,0 +1,37 @@
+/**
+ * The Data Contract Builder state
+ */
+export type DataContractBuilderState = {
+    /**
+     * The schema contract. In the UI, we only support defining a single schema contract.
+     */
+    schema?: {
+        assertionUrn: string;
+    };
+
+    /**
+     * The freshness contract. In the UI, we only support defining a single freshness contract.
+     */
+    freshness?: {
+        assertionUrn: string;
+    };
+
+    /**
+     * Data Quality contract. We cane define multiple data quality rules as part of the contract.
+     */
+    dataQuality?: {
+        assertionUrn: string;
+    }[];
+};
+
+export const DEFAULT_BUILDER_STATE = {
+    dataQuality: undefined,
+    schema: undefined,
+    freshness: undefined,
+};
+
+export enum DataContractCategoryType {
+    FRESHNESS = 'Freshness',
+    SCHEMA = 'Schema',
+    DATA_QUALITY = 'Data Quality',
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/utils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/utils.ts
new file mode 100644
index 00000000000000..7eeb526d2bf4dd
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/utils.ts
@@ -0,0 +1,120 @@
+import { DataContract } from '../../../../../../../../types.generated';
+import { DataContractBuilderState, DataContractCategoryType } from './types';
+
+/**
+ * Creates a builder state instance from a Data Contract object.
+ */
+export const createBuilderState = (contract?: DataContract | null): DataContractBuilderState | undefined => {
+    if (contract) {
+        return {
+            schema:
+                (contract?.properties?.schema?.length && {
+                    assertionUrn: contract?.properties?.schema[0]?.assertion?.urn,
+                }) ||
+                undefined,
+            freshness:
+                (contract?.properties?.freshness?.length && {
+                    assertionUrn: contract?.properties?.freshness[0]?.assertion?.urn,
+                }) ||
+                undefined,
+            dataQuality:
+                contract?.properties?.dataQuality?.map((c) => ({ assertionUrn: c.assertion.urn })) || undefined,
+        };
+    }
+    return undefined;
+};
+
+/**
+ * Constructs the input variables required for upserting a data contract using graphql
+ */
+export const buildUpsertDataContractMutationVariables = (entityUrn: string, state: DataContractBuilderState) => {
+    return {
+        input: {
+            entityUrn,
+            freshness: (state.freshness && [state.freshness]) || [],
+            schema: (state.schema && [state.schema]) || [],
+            dataQuality: state.dataQuality || [],
+        },
+    };
+};
+
+/**
+ * Constructs the input variables required for removing an assertion from a data contract using graphql.
+ */
+export const buildRemoveAssertionFromContractMutationVariables = (
+    entityUrn: string,
+    assertionUrn: string,
+    contract?: DataContract,
+) => {
+    return {
+        input: {
+            entityUrn,
+            freshness: contract?.properties?.freshness
+                ?.filter((c) => c.assertion.urn !== assertionUrn)
+                ?.map((c) => ({
+                    assertionUrn: c.assertion.urn,
+                })),
+            schema: contract?.properties?.schema
+                ?.filter((c) => c.assertion.urn !== assertionUrn)
+                ?.map((c) => ({
+                    assertionUrn: c.assertion.urn,
+                })),
+            dataQuality: contract?.properties?.dataQuality
+                ?.filter((c) => c.assertion.urn !== assertionUrn)
+                ?.map((c) => ({
+                    assertionUrn: c.assertion.urn,
+                })),
+        },
+    };
+};
+
+/**
+ * Constructs the input variables required for adding an assertion to a data contract using graphql.
+ */
+export const buildAddAssertionToContractMutationVariables = (
+    category: DataContractCategoryType,
+    entityUrn: string,
+    assertionUrn: string,
+    contract?: DataContract,
+) => {
+    const baseInput = {
+        entityUrn,
+        freshness: contract?.properties?.freshness?.map((c) => ({
+            assertionUrn: c.assertion.urn,
+        })),
+        schema: contract?.properties?.schema?.map((c) => ({
+            assertionUrn: c.assertion.urn,
+        })),
+        dataQuality: contract?.properties?.dataQuality?.map((c) => ({
+            assertionUrn: c.assertion.urn,
+        })),
+    };
+
+    switch (category) {
+        case DataContractCategoryType.SCHEMA:
+            // Replace schema assertion. We only support 1 schema assertion at a time (currently).
+            return {
+                input: {
+                    ...baseInput,
+                    schema: [{ assertionUrn }],
+                },
+            };
+        case DataContractCategoryType.FRESHNESS:
+            // Replace freshness assertion. We only support 1 freshness assertion at a time (currently).
+            return {
+                input: {
+                    ...baseInput,
+                    freshness: [{ assertionUrn }],
+                },
+            };
+        case DataContractCategoryType.DATA_QUALITY:
+            return {
+                input: {
+                    ...baseInput,
+                    dataQuality: [...(baseInput.dataQuality || []), { assertionUrn }],
+                },
+            };
+        default:
+            throw new Error(`Unrecognized category type ${category} provided.`);
+    }
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/utils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/utils.tsx
new file mode 100644
index 00000000000000..fa8941a1823cb8
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/utils.tsx
@@ -0,0 +1,115 @@
+import React from 'react';
+import {
+    CheckOutlined,
+    ClockCircleOutlined,
+    CloseOutlined,
+    ExclamationCircleFilled,
+    StopOutlined,
+} from '@ant-design/icons';
+import { Assertion, AssertionType, DataContract, DataContractState } from '../../../../../../../types.generated';
+import { ANTD_GRAY } from '../../../../constants';
+import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX, WARNING_COLOR_HEX } from '../acrylUtils';
+import { DataContractCategoryType } from './builder/types';
+import { AssertionStatusSummary } from '../acrylTypes';
+
+export const getContractSummaryIcon = (state: DataContractState, summary: AssertionStatusSummary) => {
+    if (state === DataContractState.Pending) {
+        return <ClockCircleOutlined style={{ color: ANTD_GRAY[6], fontSize: 28 }} />;
+    }
+    if (summary.total === 0) {
+        return <StopOutlined style={{ color: ANTD_GRAY[6], fontSize: 28 }} />;
+    }
+    if (summary.passing === summary.total) {
+        return <CheckOutlined style={{ color: SUCCESS_COLOR_HEX, fontSize: 28 }} />;
+    }
+    if (summary.failing > 0) {
+        return <CloseOutlined style={{ color: FAILURE_COLOR_HEX, fontSize: 28 }} />;
+    }
+    if (summary.erroring > 0) {
+        return <ExclamationCircleFilled style={{ color: WARNING_COLOR_HEX, fontSize: 28 }} />;
+    }
+    return <StopOutlined style={{ color: ANTD_GRAY[6], fontSize: 28 }} />;
+};
+
+export const getContractSummaryTitle = (state: DataContractState, summary: AssertionStatusSummary) => {
+    if (state === DataContractState.Pending) {
+        return 'This contract is pending implementation';
+    }
+    if (summary.total === 0) {
+        return 'This contract has not yet been validated';
+    }
+    if (summary.passing === summary.total) {
+        return 'This dataset is meeting its contract';
+    }
+    if (summary.failing > 0) {
+        return 'This dataset is not meeting its contract';
+    }
+    if (summary.erroring > 0) {
+        return 'Unable to determine contract status';
+    }
+    return 'This contract has not yet been validated';
+};
+
+export const getContractSummaryMessage = (state: DataContractState, summary: AssertionStatusSummary) => {
+    if (state === DataContractState.Pending) {
+        return 'This may take some time. Come back later!';
+    }
+    if (summary.total === 0) {
+        return 'No contract assertions have been run yet';
+    }
+    if (summary.passing === summary.total) {
+        return 'All contract assertions are passing';
+    }
+    if (summary.failing > 0) {
+        return 'Some contract assertions are failing';
+    }
+    if (summary.erroring > 0) {
+        return 'Some contract assertions are completing with errors';
+    }
+    return 'No contract assertions have been run yet';
+};
+
+/**
+ * Returns true if a given assertion is part of a given contract, false otherwise.
+ */
+export const isAssertionPartOfContract = (assertion: Assertion, contract: DataContract) => {
+    if (contract.properties?.dataQuality?.some((c) => c.assertion.urn === assertion?.urn)) {
+        return true;
+    }
+    if (contract.properties?.schema?.some((c) => c.assertion.urn === assertion?.urn)) {
+        return true;
+    }
+    if (contract.properties?.freshness?.some((c) => c.assertion.urn === assertion?.urn)) {
+        return true;
+    }
+    return false;
+};
+
+/**
+ * Retrieves the high level contract category - schema, freshness, or data quality - given an assertion
+ */
+export const getDataContractCategoryFromAssertion = (assertion: Assertion) => {
+    if (
+        assertion.info?.type === AssertionType.Dataset ||
+        assertion.info?.type === AssertionType.Volume ||
+        assertion.info?.type === AssertionType.Field ||
+        assertion.info?.type === AssertionType.Sql
+    ) {
+        return DataContractCategoryType.DATA_QUALITY;
+    }
+    if (assertion.info?.type === AssertionType.Freshness) {
+        return DataContractCategoryType.FRESHNESS;
+    }
+    if (assertion.info?.type === AssertionType.DataSchema) {
+        return DataContractCategoryType.SCHEMA;
+    }
+    return DataContractCategoryType.DATA_QUALITY;
+};
+
+export const DATA_QUALITY_ASSERTION_TYPES = new Set([
+    AssertionType.Volume,
+    AssertionType.Sql,
+    AssertionType.Field,
+    AssertionType.Dataset,
+    AssertionType.Custom,
+]);
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/fieldDescriptionUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/fieldDescriptionUtils.ts
new file mode 100644
index 00000000000000..4fb783407b68f3
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/fieldDescriptionUtils.ts
@@ -0,0 +1,163 @@
+import {
+    AssertionStdOperator,
+    AssertionStdParameters,
+    FieldAssertionInfo,
+    FieldAssertionType,
+    FieldMetricType,
+    FieldTransformType,
+} from '../../../../../../types.generated';
+import { formatNumberWithoutAbbreviation } from '../../../../../shared/formatNumber';
+import { parseMaybeStringAsFloatOrDefault } from '../../../../../shared/numberUtil';
+import { GET_ASSERTION_OPERATOR_TO_DESCRIPTION_MAP } from './assertion/profile/summary/shared/constants';
+
+const SUPPORTED_OPERATORS_FOR_FIELD_DESCRIPTION = [
+    AssertionStdOperator.EqualTo,
+    AssertionStdOperator.Null,
+    AssertionStdOperator.NotNull,
+    AssertionStdOperator.NotEqualTo,
+    AssertionStdOperator.NotIn,
+    AssertionStdOperator.RegexMatch,
+    AssertionStdOperator.GreaterThan,
+    AssertionStdOperator.LessThan,
+    AssertionStdOperator.GreaterThanOrEqualTo,
+    AssertionStdOperator.LessThanOrEqualTo,
+    AssertionStdOperator.In,
+    AssertionStdOperator.Between,
+    AssertionStdOperator.Contain,
+    AssertionStdOperator.IsTrue,
+    AssertionStdOperator.IsFalse,
+];
+const getAssertionStdOperator = ({ operator, isPlural }: { operator: AssertionStdOperator; isPlural?: boolean }) => {
+    const ASSERTION_OPERATOR_TO_DESCRIPTION = GET_ASSERTION_OPERATOR_TO_DESCRIPTION_MAP({ isPlural });
+
+    if (!ASSERTION_OPERATOR_TO_DESCRIPTION[operator] || !SUPPORTED_OPERATORS_FOR_FIELD_DESCRIPTION.includes(operator)) {
+        throw new Error(`Unknown operator ${operator}`);
+    }
+    return ASSERTION_OPERATOR_TO_DESCRIPTION[operator]?.toLowerCase();
+};
+
+export const getFieldMetricTypeReadableLabel = (metric: FieldMetricType) => {
+    switch (metric) {
+        case FieldMetricType.NullCount:
+            return 'Null count';
+        case FieldMetricType.NullPercentage:
+            return 'Null percentage';
+        case FieldMetricType.UniqueCount:
+            return 'Unique count';
+        case FieldMetricType.UniquePercentage:
+            return 'Unique percentage';
+        case FieldMetricType.MaxLength:
+            return 'Max length';
+        case FieldMetricType.MinLength:
+            return 'Min length';
+        case FieldMetricType.EmptyCount:
+            return 'Empty count';
+        case FieldMetricType.EmptyPercentage:
+            return 'Empty percentage';
+        case FieldMetricType.Max:
+            return 'Max';
+        case FieldMetricType.Min:
+            return 'Min';
+        case FieldMetricType.Mean:
+            return 'Average';
+        case FieldMetricType.Median:
+            return 'Median';
+        case FieldMetricType.NegativeCount:
+            return 'Negative count';
+        case FieldMetricType.NegativePercentage:
+            return 'Negative percentage';
+        case FieldMetricType.Stddev:
+            return 'Standard deviation';
+        case FieldMetricType.ZeroCount:
+            return 'Zero count';
+        case FieldMetricType.ZeroPercentage:
+            return 'Zero percentage';
+        default:
+            throw new Error(`Unknown field metric type ${metric}`);
+    }
+};
+
+const getFieldTransformType = (transform: FieldTransformType) => {
+    switch (transform) {
+        case FieldTransformType.Length:
+            return 'Length';
+        default:
+            throw new Error(`Unknown field transform type ${transform}`);
+    }
+};
+
+const getAssertionStdParameters = (parameters: AssertionStdParameters) => {
+    if (parameters.value) {
+        return formatNumberWithoutAbbreviation(
+            parseMaybeStringAsFloatOrDefault(parameters.value.value, parameters.value.value),
+        );
+    }
+    if (parameters.minValue && parameters.maxValue) {
+        return `${formatNumberWithoutAbbreviation(
+            parseMaybeStringAsFloatOrDefault(parameters.minValue.value, parameters.minValue.value),
+        )} and ${formatNumberWithoutAbbreviation(
+            parseMaybeStringAsFloatOrDefault(parameters.maxValue.value, parameters.maxValue.value),
+        )}`;
+    }
+    return '';
+};
+
+export const getFieldDescription = (assertionInfo: FieldAssertionInfo) => {
+    const { type, fieldValuesAssertion, fieldMetricAssertion } = assertionInfo;
+    switch (type) {
+        case FieldAssertionType.FieldValues:
+            return fieldValuesAssertion?.field?.path;
+        case FieldAssertionType.FieldMetric:
+            return fieldMetricAssertion?.field?.path;
+        default:
+            throw new Error(`Unknown field assertion type ${type}`);
+    }
+};
+
+export const getFieldOperatorDescription = ({
+    assertionInfo,
+    isPlural,
+}: {
+    assertionInfo: FieldAssertionInfo;
+    isPlural?: boolean;
+}) => {
+    const { type, fieldValuesAssertion, fieldMetricAssertion } = assertionInfo;
+    switch (type) {
+        case FieldAssertionType.FieldValues:
+            if (!fieldValuesAssertion?.operator) return '';
+            return getAssertionStdOperator({ operator: fieldValuesAssertion.operator, isPlural });
+        case FieldAssertionType.FieldMetric:
+            if (!fieldMetricAssertion?.operator) return '';
+            return getAssertionStdOperator({ operator: fieldMetricAssertion.operator, isPlural });
+        default:
+            throw new Error(`Unknown field assertion type ${type}`);
+    }
+};
+
+export const getFieldTransformDescription = (assertionInfo: FieldAssertionInfo) => {
+    const { type, fieldValuesAssertion, fieldMetricAssertion } = assertionInfo;
+    switch (type) {
+        case FieldAssertionType.FieldValues:
+            if (!fieldValuesAssertion?.transform?.type) return '';
+            return getFieldTransformType(fieldValuesAssertion.transform.type);
+        case FieldAssertionType.FieldMetric:
+            if (!fieldMetricAssertion?.metric) return '';
+            return getFieldMetricTypeReadableLabel(fieldMetricAssertion.metric);
+        default:
+            throw new Error(`Unknown field assertion type ${type}`);
+    }
+};
+
+export const getFieldParametersDescription = (assertionInfo: FieldAssertionInfo) => {
+    const { type, fieldValuesAssertion, fieldMetricAssertion } = assertionInfo;
+    switch (type) {
+        case FieldAssertionType.FieldValues:
+            if (!fieldValuesAssertion?.parameters) return '';
+            return getAssertionStdParameters(fieldValuesAssertion.parameters);
+        case FieldAssertionType.FieldMetric:
+            if (!fieldMetricAssertion?.parameters) return '';
+            return getAssertionStdParameters(fieldMetricAssertion.parameters);
+        default:
+            throw new Error(`Unknown field assertion type ${type}`);
+    }
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/shared/constant.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/shared/constant.tsx
new file mode 100644
index 00000000000000..1158d8808159d0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/shared/constant.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { AssertionType } from '@src/types.generated';
+import { Clock, Database, GitFork, Hammer, Dresser } from '@phosphor-icons/react';
+
+export const ASSERTION_TYPE_TO_ICON_MAP: Record<AssertionType, JSX.Element> = {
+    [AssertionType.Freshness]: <Clock size={20} />,
+    [AssertionType.Volume]: <Database size={20} />,
+    [AssertionType.Field]: <Dresser size={20} />,
+    [AssertionType.DataSchema]: <GitFork size={20} />,
+    [AssertionType.Custom]: <Hammer size={20} />,
+    [AssertionType.Sql]: <Database size={20} />,
+    [AssertionType.Dataset]: <Database size={20} />,
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/shared/styledComponents.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/shared/styledComponents.tsx
new file mode 100644
index 00000000000000..a43e8ad841eeeb
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/shared/styledComponents.tsx
@@ -0,0 +1,32 @@
+import styled from 'styled-components';
+import { CheckOutlined, ClockCircleOutlined, CloseOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
+import { ANTD_GRAY } from '../../../../constants';
+import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX, WARNING_COLOR_HEX } from '../acrylUtils';
+
+export const StyledCheckOutlined = styled(CheckOutlined)`
+    color: ${SUCCESS_COLOR_HEX};
+    font-size: 16px;
+    margin-right: 4px;
+    margin-left: 4px;
+`;
+
+export const StyledCloseOutlined = styled(CloseOutlined)`
+    color: ${FAILURE_COLOR_HEX};
+    font-size: 16px;
+    margin-right: 4px;
+    margin-left: 4px;
+`;
+
+export const StyledExclamationOutlined = styled(ExclamationCircleOutlined)`
+    color: ${WARNING_COLOR_HEX};
+    font-size: 16px;
+    margin-right: 4px;
+    margin-left: 4px;
+`;
+
+export const StyledClockCircleOutlined = styled(ClockCircleOutlined)`
+    color: ${ANTD_GRAY[6]};
+    font-size: 16px;
+    margin-right: 4px;
+    margin-left: 4px;
+`;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/useGetValidationsTab.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/useGetValidationsTab.ts
new file mode 100644
index 00000000000000..164e8e489e3465
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/useGetValidationsTab.ts
@@ -0,0 +1,35 @@
+/**
+ * The structure of our path will be
+ *
+ * /<entity-name>/<entity-urn>/Validation/<tab-name>
+ */
+const VALIDATION_TAB_NAME_REGEX_PATTERN = '^/[^/]+/[^/]+/[^/]+/([^/]+).*';
+
+export type SelectedTab = {
+    basePath: string;
+    selectedTab: string | undefined;
+};
+
+/**
+ * Returns information about the currently selected Validations Tab path.
+ *
+ * This is determined by parsing the current URL path and attempting to match against a set of
+ * valid path names. If a matching tab cannot be found, then the selected tab will be returned as undefined.
+ */
+export const useGetValidationsTab = (pathname: string, tabNames: string[]): SelectedTab => {
+    const trimmedPathName = pathname.endsWith('/') ? pathname.slice(0, pathname.length - 1) : pathname;
+    const match = trimmedPathName.match(VALIDATION_TAB_NAME_REGEX_PATTERN);
+    if (match && match[1]) {
+        const selectedTabPath = match[1];
+        const routedTab = tabNames.find((tab) => tab === selectedTabPath);
+        return {
+            basePath: trimmedPathName.substring(0, trimmedPathName.lastIndexOf('/')),
+            selectedTab: routedTab,
+        };
+    }
+    // No match found!
+    return {
+        basePath: trimmedPathName,
+        selectedTab: undefined,
+    };
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/utils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/utils.tsx
new file mode 100644
index 00000000000000..efb519c583da47
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/utils.tsx
@@ -0,0 +1,95 @@
+import {
+    AssertionStdOperator,
+    AssertionStdParameters,
+    AssertionValueChangeType,
+    VolumeAssertionInfo,
+    VolumeAssertionType,
+} from '../../../../../../types.generated';
+import { formatNumberWithoutAbbreviation } from '../../../../../shared/formatNumber';
+import { parseMaybeStringAsFloatOrDefault } from '../../../../../shared/numberUtil';
+
+export const getIsRowCountChange = (type: VolumeAssertionType) => {
+    return [VolumeAssertionType.RowCountChange, VolumeAssertionType.IncrementingSegmentRowCountChange].includes(type);
+};
+
+export const getVolumeTypeDescription = (volumeType: VolumeAssertionType) => {
+    switch (volumeType) {
+        case VolumeAssertionType.RowCountTotal:
+        case VolumeAssertionType.IncrementingSegmentRowCountTotal:
+            return 'has';
+        case VolumeAssertionType.RowCountChange:
+        case VolumeAssertionType.IncrementingSegmentRowCountChange:
+            return 'should grow by';
+        default:
+            throw new Error(`Unknown volume type ${volumeType}`);
+    }
+};
+
+export const getOperatorDescription = (operator: AssertionStdOperator) => {
+    switch (operator) {
+        case AssertionStdOperator.GreaterThanOrEqualTo:
+            return 'at least';
+        case AssertionStdOperator.LessThanOrEqualTo:
+            return 'at most';
+        case AssertionStdOperator.Between:
+            return 'between';
+        default:
+            throw new Error(`Unknown operator ${operator}`);
+    }
+};
+
+export const getParameterDescription = (parameters: AssertionStdParameters) => {
+    if (parameters.value) {
+        return formatNumberWithoutAbbreviation(
+            parseMaybeStringAsFloatOrDefault(parameters.value.value, parameters.value.value),
+        );
+    }
+    if (parameters.minValue && parameters.maxValue) {
+        return `${formatNumberWithoutAbbreviation(
+            parseMaybeStringAsFloatOrDefault(parameters.minValue.value, parameters.minValue.value),
+        )} and ${formatNumberWithoutAbbreviation(
+            parseMaybeStringAsFloatOrDefault(parameters.maxValue.value, parameters.maxValue.value),
+        )}`;
+    }
+    throw new Error('Invalid assertion parameters provided');
+};
+
+export const getValueChangeTypeDescription = (valueChangeType: AssertionValueChangeType) => {
+    switch (valueChangeType) {
+        case AssertionValueChangeType.Absolute:
+            return 'rows';
+        case AssertionValueChangeType.Percentage:
+            return '%';
+        default:
+            throw new Error(`Unknown value change type ${valueChangeType}`);
+    }
+};
+
+type VolumeTypeField =
+    | 'rowCountTotal'
+    | 'rowCountChange'
+    | 'incrementingSegmentRowCountTotal'
+    | 'incrementingSegmentRowCountChange';
+
+export const getPropertyFromVolumeType = (type: VolumeAssertionType) => {
+    switch (type) {
+        case VolumeAssertionType.RowCountTotal:
+            return 'rowCountTotal' as VolumeTypeField;
+        case VolumeAssertionType.RowCountChange:
+            return 'rowCountChange' as VolumeTypeField;
+        case VolumeAssertionType.IncrementingSegmentRowCountTotal:
+            return 'incrementingSegmentRowCountTotal' as VolumeTypeField;
+        case VolumeAssertionType.IncrementingSegmentRowCountChange:
+            return 'incrementingSegmentRowCountChange' as VolumeTypeField;
+        default:
+            throw new Error(`Unknown volume assertion type: ${type}`);
+    }
+};
+
+export const getVolumeTypeInfo = (volumeAssertion: VolumeAssertionInfo) => {
+    const result = volumeAssertion[getPropertyFromVolumeType(volumeAssertion.type)];
+    if (!result) {
+        return undefined;
+    }
+    return result;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/View/ViewDefinitionTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/View/ViewDefinitionTab.tsx
new file mode 100644
index 00000000000000..5ffef29d11bfe2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/View/ViewDefinitionTab.tsx
@@ -0,0 +1,116 @@
+import { Radio, Typography } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { GetDatasetQuery } from '../../../../../../graphql/dataset.generated';
+import { ANTD_GRAY } from '../../../constants';
+import { useBaseEntity } from '../../../../../entity/shared/EntityContext';
+import { InfoItem } from '../../../components/styled/InfoItem';
+import { StyledSyntaxHighlighter } from '../../../StyledSyntaxHighlighter';
+import { DBT_URN } from '../../../../../ingest/source/builder/constants';
+import CopyQuery from '../Queries/CopyQuery';
+import { ViewHeader } from '../../../containers/profile/sidebar/SidebarLogicSection';
+
+const InfoSection = styled.div`
+    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
+    padding: 16px 20px;
+`;
+
+const InfoItemContainer = styled.div<{ justifyContent }>`
+    display: flex;
+    position: relative;
+    justify-content: ${(props) => props.justifyContent};
+    padding: 12px 2px;
+`;
+
+const InfoItemContent = styled.div`
+    padding-top: 8px;
+`;
+
+const FormattingSelector = styled.div``;
+
+/**
+ * NOTE: To ensure consistent font-family for pre and code tags within as the parent wrapper was overriding it,
+ * we explicitly apply 'Roboto Mono', monospace as the font-family for code children using span.
+ */
+const QueryText = styled(Typography.Paragraph)`
+    margin-top: 20px;
+    background-color: ${ANTD_GRAY[2]};
+    span {
+        font-family: 'Roboto Mono', monospace !important;
+    }
+`;
+
+// NOTE: Yes, using `!important` is a shame. However, the SyntaxHighlighter is applying styles directly
+// to the component, so there's no way around this
+const NestedSyntax = styled(StyledSyntaxHighlighter)`
+    background-color: transparent !important;
+    border: none !important;
+`;
+
+interface ViewTabProps {
+    formatOptions: string[];
+    showFormatted: boolean;
+    setShowFormatted: (showFormatted: boolean) => void;
+}
+
+export function ViewTab({ formatOptions, showFormatted, setShowFormatted }: ViewTabProps) {
+    return (
+        <FormattingSelector>
+            <Radio.Group
+                options={[
+                    { label: formatOptions[0], value: false },
+                    { label: formatOptions[1], value: true },
+                ]}
+                onChange={(e) => setShowFormatted(e.target.value)}
+                value={showFormatted}
+                optionType="button"
+            />
+        </FormattingSelector>
+    );
+}
+
+export default function ViewDefinitionTab() {
+    const baseEntity = useBaseEntity<GetDatasetQuery>();
+    const logic = baseEntity?.dataset?.viewProperties?.logic || 'UNKNOWN';
+    const formattedLogic = baseEntity?.dataset?.viewProperties?.formattedLogic;
+
+    const materialized = (baseEntity?.dataset?.viewProperties?.materialized && true) || false;
+    const language = baseEntity?.dataset?.viewProperties?.language || 'UNKNOWN';
+    const canShowFormatted = !!formattedLogic;
+
+    const isDbt = baseEntity?.dataset?.platform?.urn === DBT_URN;
+    const formatOptions = isDbt ? ['Source', 'Compiled'] : ['Raw', 'Formatted'];
+    const [showFormatted, setShowFormatted] = useState(false);
+
+    return (
+        <>
+            <InfoSection>
+                <Typography.Title level={5}>Details</Typography.Title>
+                <InfoItemContainer justifyContent="left">
+                    <InfoItem title="Materialized">
+                        <InfoItemContent>{materialized ? 'True' : 'False'}</InfoItemContent>
+                    </InfoItem>
+                    <InfoItem title="Language">
+                        <InfoItemContent>{language.toUpperCase()}</InfoItemContent>
+                    </InfoItem>
+                </InfoItemContainer>
+            </InfoSection>
+            <InfoSection>
+                <Typography.Title level={5}>Logic</Typography.Title>
+                <ViewHeader>
+                    {canShowFormatted && (
+                        <ViewTab
+                            formatOptions={formatOptions}
+                            setShowFormatted={setShowFormatted}
+                            showFormatted={showFormatted}
+                        />
+                    )}
+                    <CopyQuery query={showFormatted ? formattedLogic || '' : logic} showCopyText />
+                </ViewHeader>
+                <QueryText>
+                    <NestedSyntax language="sql">{showFormatted ? formattedLogic : logic}</NestedSyntax>
+                </QueryText>
+            </InfoSection>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/DocumentationTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/DocumentationTab.tsx
new file mode 100644
index 00000000000000..60704d44786a60
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/DocumentationTab.tsx
@@ -0,0 +1,163 @@
+import queryString from 'query-string';
+import React, { useEffect } from 'react';
+import { useLocation } from 'react-router-dom';
+
+import { EditOutlined, ExpandAltOutlined, PlusOutlined } from '@ant-design/icons';
+import { Button, Divider, Typography } from 'antd';
+import styled from 'styled-components';
+
+import { AddLinkModal } from '../../components/styled/AddLinkModal';
+import { EmptyTab } from '../../components/styled/EmptyTab';
+import TabToolbar from '../../components/styled/TabToolbar';
+import { DescriptionEditor } from './components/DescriptionEditor';
+import { LinkList } from './components/LinkList';
+
+import { useEntityData, useRefetch, useRouteToTab } from '../../../../entity/shared/EntityContext';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../../constants';
+import { EDITED_DESCRIPTIONS_CACHE_NAME } from '../../utils';
+import { DescriptionPreviewModal } from './components/DescriptionPreviewModal';
+import { Editor } from './components/editor/Editor';
+import { getAssetDescriptionDetails } from './utils';
+
+const DocumentationContainer = styled.div`
+    margin: 0 32px;
+    padding: 40px 0;
+    max-width: calc(100% - 10px);
+`;
+
+const StyledTabToolbar = styled(TabToolbar)`
+    background-color: ${REDESIGN_COLORS.LIGHT_GREY};
+    border-top-left-radius: 4px;
+    border-bottom-left-radius: 4px;
+    border-left: 2px solid #5c3fd1;
+    padding: 8px 20px;
+    margin: 2px 14px 2px 12px;
+
+    position: sticky;
+    top: 0;
+`;
+
+const PrimaryButton = styled(Button)`
+    color: ${ANTD_GRAY[1]};
+    font-size: 12px;
+    box-shadow: none;
+    border-color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    background-color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    margin-left: 9px;
+
+    &:hover {
+        transition: 0.15s;
+        opacity: 0.9;
+        border-color: ${REDESIGN_COLORS.TITLE_PURPLE};
+        background-color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    }
+`;
+
+const EmptyTabWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    height: 100%;
+`;
+
+interface Props {
+    hideLinksButton?: boolean;
+}
+
+export const DocumentationTab = ({ properties }: { properties?: Props }) => {
+    const hideLinksButton = properties?.hideLinksButton;
+    const { urn, entityData } = useEntityData();
+
+    const refetch = useRefetch();
+    const { displayedDescription } = getAssetDescriptionDetails({
+        entityProperties: entityData,
+    });
+    const links = entityData?.institutionalMemory?.elements || [];
+    const localStorageDictionary = localStorage.getItem(EDITED_DESCRIPTIONS_CACHE_NAME);
+
+    const routeToTab = useRouteToTab();
+    const isEditing = queryString.parse(useLocation().search, { parseBooleans: true }).editing;
+    const showModal = queryString.parse(useLocation().search, { parseBooleans: true }).modal;
+
+    useEffect(() => {
+        const editedDescriptions = (localStorageDictionary && JSON.parse(localStorageDictionary)) || {};
+        if (editedDescriptions.hasOwnProperty(urn)) {
+            routeToTab({
+                tabName: 'Documentation',
+                tabParams: { editing: true, modal: !!showModal },
+            });
+        }
+    }, [urn, routeToTab, showModal, localStorageDictionary]);
+
+    return isEditing && !showModal ? (
+        <DescriptionEditor onComplete={() => routeToTab({ tabName: 'Documentation' })} />
+    ) : (
+        <>
+            {displayedDescription || links.length ? (
+                <>
+                    <StyledTabToolbar>
+                        <div>
+                            <Button
+                                data-testid="edit-documentation-button"
+                                type="text"
+                                onClick={() => routeToTab({ tabName: 'Documentation', tabParams: { editing: true } })}
+                            >
+                                <EditOutlined /> Edit
+                            </Button>
+                            {!hideLinksButton && <AddLinkModal buttonProps={{ type: 'text' }} refetch={refetch} />}
+                        </div>
+                        <div>
+                            <Button
+                                type="text"
+                                onClick={() =>
+                                    routeToTab({
+                                        tabName: 'Documentation',
+                                        tabParams: { modal: true },
+                                    })
+                                }
+                            >
+                                <ExpandAltOutlined />
+                            </Button>
+                        </div>
+                    </StyledTabToolbar>
+                    <div>
+                        {displayedDescription ? (
+                            [<Editor content={displayedDescription} readOnly />]
+                        ) : (
+                            <DocumentationContainer>
+                                <Typography.Text type="secondary">No documentation added yet.</Typography.Text>
+                            </DocumentationContainer>
+                        )}
+                        <Divider />
+                        <DocumentationContainer>
+                            {!hideLinksButton && <LinkList refetch={refetch} />}
+                        </DocumentationContainer>
+                    </div>
+                </>
+            ) : (
+                <EmptyTabWrapper>
+                    <EmptyTab tab="documentation" hideImage={false}>
+                        {!hideLinksButton && <AddLinkModal buttonType="transparent" refetch={refetch} />}
+                        <PrimaryButton
+                            type="primary"
+                            size="large"
+                            data-testid="add-documentation"
+                            onClick={() => routeToTab({ tabName: 'Documentation', tabParams: { editing: true } })}
+                        >
+                            <PlusOutlined /> Add Documentation
+                        </PrimaryButton>
+                    </EmptyTab>
+                </EmptyTabWrapper>
+            )}
+            {showModal && (
+                <DescriptionPreviewModal
+                    editMode={(isEditing && true) || false}
+                    description={displayedDescription}
+                    onClose={() => {
+                        routeToTab({ tabName: 'Documentation', tabParams: { editing: false } });
+                    }}
+                />
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx
new file mode 100644
index 00000000000000..cdc9b56d30e2b7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx
@@ -0,0 +1,99 @@
+import { MockedProvider } from '@apollo/client/testing';
+import { render } from '@testing-library/react';
+import DOMPurify from 'dompurify';
+import React from 'react';
+import { mocks } from '../../../../../../Mocks';
+import { EntityType } from '../../../../../../types.generated';
+import TestPageContainer from '../../../../../../utils/test-utils/TestPageContainer';
+import { EntityContext } from '../../../../../entity/shared/EntityContext';
+import { DocumentationTab } from '../DocumentationTab';
+
+describe('SchemaDescriptionField', () => {
+    it('renders original description', async () => {
+        const { getByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
+                    <EntityContext.Provider
+                        value={{
+                            urn: 'urn:li:dataset:123',
+                            entityType: EntityType.Dataset,
+                            entityData: {
+                                properties: {
+                                    description: 'This is a description',
+                                },
+                            },
+                            baseEntity: {},
+                            updateEntity: vi.fn(),
+                            routeToTab: vi.fn(),
+                            loading: true,
+                            lineage: undefined,
+                            dataNotCombinedWithSiblings: null,
+                            refetch: vi.fn(),
+                        }}
+                    >
+                        <DocumentationTab />
+                    </EntityContext.Provider>
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(getByText('This is a description')).toBeInTheDocument();
+    });
+
+    it('if editable is present, renders edited description', async () => {
+        const { getByText, queryByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
+                    <EntityContext.Provider
+                        value={{
+                            urn: 'urn:li:dataset:123',
+                            entityType: EntityType.Dataset,
+                            entityData: {
+                                properties: {
+                                    description: 'This is a description',
+                                },
+                                editableProperties: {
+                                    description: 'Edited description',
+                                },
+                            },
+                            baseEntity: {},
+                            updateEntity: vi.fn(),
+                            routeToTab: vi.fn(),
+                            refetch: vi.fn(),
+                            loading: true,
+                            lineage: undefined,
+                            dataNotCombinedWithSiblings: null,
+                        }}
+                    >
+                        <DocumentationTab />
+                    </EntityContext.Provider>
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(getByText('Edited description')).toBeInTheDocument();
+        expect(queryByText('This is a description')).not.toBeInTheDocument();
+    });
+});
+
+describe('markdown sanitization', () => {
+    it('should remove malicious tags like <script> from text', () => {
+        const text = 'Testing this out<script>console.log("testing")</script>';
+        const sanitizedText = DOMPurify.sanitize(text);
+
+        expect(sanitizedText).toBe('Testing this out');
+    });
+
+    it('should allow acceptable html', () => {
+        const text = '<strong>Testing</strong> this <p>out</p> <span>for</span> <div>safety</div>';
+        const sanitizedText = DOMPurify.sanitize(text);
+
+        expect(sanitizedText).toBe(text);
+    });
+
+    it('should allow acceptable markdown', () => {
+        const text =
+            '~~Testing~~ **this** *out* \n\n> for\n\n- safety\n\n1. ordered list\n\n[ test link](https://www.google.com/)\n';
+        const sanitizedText = DOMPurify.sanitize(text);
+
+        expect(sanitizedText).toBe(text);
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/components/editor/extensions/htmlToMarkdown.test.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/components/editor/extensions/htmlToMarkdown.test.tsx
new file mode 100644
index 00000000000000..0877779d8bc434
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/components/editor/extensions/htmlToMarkdown.test.tsx
@@ -0,0 +1,69 @@
+import { htmlToMarkdown } from '../../../../components/editor/extensions/htmlToMarkdown';
+
+const cases = [
+    ['strike', '<strike>Lorem ipsum</strike>', '~Lorem ipsum~'],
+    ['s', '<s>Lorem ipsum</s>', '~Lorem ipsum~'],
+    ['del', '<del>Lorem ipsum</del>', '~Lorem ipsum~'],
+    [
+        'should replace blank nodes in table',
+        '<table><thead><tr><th>Lorem ipsum</th></tr></thead><tbody><tr><td><p>Lorem</p><p>ipsum</p></td></tr></tbody></table>',
+        '| Lorem ipsum |\n| --- |\n| Lorem<br />ipsum |',
+    ],
+    ['should replace empty p tags to line breaks', '<p>Lorem</p><p></p><p>ipsum</p>', 'Lorem\n\n&nbsp;\n\nipsum'],
+    [
+        'should parse image if it does not have a width attribute',
+        '<img src="/my-image.png" style="width: 100%; min-width: 50px; object-fit: contain;" alt="my image">',
+        '![my image](/my-image.png)',
+    ],
+
+    [
+        'should highlight code block with html',
+        '<pre><code class="language language-html">&lt;<span class="pl-ent">p</span>&gt;Hello world&lt;/<span class="pl-ent">p</span>&gt;</code></pre>',
+        '```html\n<p>Hello world</p>\n```',
+    ],
+    [
+        'should highlight code block with js',
+        '<pre><code class="lang lang-js">;(<span class="pl-k">function</span> () {})()</code></pre>',
+        '```js\n;(function () {})()\n```',
+    ],
+    [
+        'should highlighted remirror code block',
+        '<pre><code data-code-block-language="ts">;(<span class="pl-k">function</span> () {})()</code></pre>',
+        '```ts\n;(function () {})()\n```',
+    ],
+    [
+        'should parse without language code block',
+        '<pre><code>;(<span class="pl-k">function</span> () {})()</code></pre>',
+        '```\n;(function () {})()\n```',
+    ],
+    [
+        'should parse datahub mention',
+        '<span class="mentions" data-datahub-mention-urn="urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD)">@SampleHiveDataset</span>',
+        '[@SampleHiveDataset](urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD))',
+    ],
+];
+
+const skipParseCases = [
+    [
+        'table if ul or li is present',
+        '<table><thead><tr><th>Lorem ipsum</th></tr></thead><tbody><tr><td><ul><li>Lorem</li><li>ipsum</li></ul></td></tr></tbody></table>',
+    ],
+    [
+        'table if  present',
+        '<table><thead><tr><th>Lorem ipsum</th></tr></thead><tbody><tr><td><ul><li>Lorem</li><li>ipsum</li></ul></td></tr></tbody></table>',
+    ],
+    [
+        'image if it has a width attribute',
+        '<img src="/my-image.png" style="width: 100%; min-width: 50px; object-fit: contain;" alt="my image" width="200">',
+    ],
+];
+
+describe('htmlToMarkdown', () => {
+    it.each(cases)('%s', (_, input, expected) => {
+        expect(htmlToMarkdown(input)).toBe(expected);
+    });
+
+    it.each(skipParseCases)('should skip parsing %s', (_, input) => {
+        expect(htmlToMarkdown(input)).toBe(input);
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/components/editor/extensions/markdownToHtml.test.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/components/editor/extensions/markdownToHtml.test.tsx
new file mode 100644
index 00000000000000..5e2e9034a96c19
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/__tests__/components/editor/extensions/markdownToHtml.test.tsx
@@ -0,0 +1,21 @@
+import { markdownToHtml } from '../../../../components/editor/extensions/markdownToHtml';
+
+const cases = [
+    [
+        'should parse datahub mentions',
+        'Lorem [@SampleHiveDataset](urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD)) ipsum',
+        '<p>Lorem <span data-datahub-mention-urn="urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD)">@SampleHiveDataset</span> ipsum</p>\n',
+    ],
+    ['should not parse github mentions', 'Lorem @githubuser ipsum', '<p>Lorem @githubuser ipsum</p>\n'],
+    [
+        'should parse invalid mentions as links',
+        'Lorem [@Some link](/lorem-ipsum) ipsum',
+        '<p>Lorem <a href="/lorem-ipsum">@Some link</a> ipsum</p>\n',
+    ],
+];
+
+describe('markdownToHtml', () => {
+    it.each(cases)('%s', (_, input, expected) => {
+        expect(markdownToHtml(input)).toBe(expected);
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx
new file mode 100644
index 00000000000000..de6c7dea375064
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx
@@ -0,0 +1,162 @@
+import { Button } from 'antd';
+import React, { useCallback, useEffect, useState } from 'react';
+import styled from 'styled-components';
+import { REDESIGN_COLORS } from '../../../constants';
+import { Editor } from './editor/Editor';
+
+const LINE_HEIGHT = 1.5;
+
+const ShowMoreWrapper = styled.div`
+    align-items: start;
+    display: flex;
+    flex-direction: column;
+`;
+
+const MarkdownContainer = styled.div<{ lineLimit?: number | null }>`
+    max-width: 100%;
+    position: relative;
+    ${(props) =>
+        props.lineLimit &&
+        props.lineLimit <= 1 &&
+        ` 
+        display: flex;
+        align-items: center;
+        gap: 4px;
+        ${ShowMoreWrapper}{
+            flex-direction: row;
+            align-items: center;
+            gap: 4px;
+        }
+    `}
+`;
+
+const CustomButton = styled(Button)`
+    padding: 0;
+    color: ${REDESIGN_COLORS.ACTION_ICON_GREY};
+`;
+
+const MarkdownViewContainer = styled.div<{ scrollableY: boolean }>`
+    display: block;
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+    overflow-x: hidden;
+    overflow-y: ${(props) => (props.scrollableY ? 'auto' : 'hidden')};
+`;
+
+const CompactEditor = styled(Editor)<{ limit: number | null; customStyle?: React.CSSProperties }>`
+    .remirror-editor.ProseMirror {
+        ${({ limit }) => limit && `max-height: ${limit * LINE_HEIGHT}em;`}
+        h1 {
+            font-size: 1.4em;
+        }
+
+        h2 {
+            font-size: 1.3em;
+        }
+
+        h3 {
+            font-size: 1.2em;
+        }
+
+        h4 {
+            font-size: 1.1em;
+        }
+
+        h5,
+        h6 {
+            font-size: 1em;
+        }
+
+        p {
+            ${(props) => props?.customStyle?.fontSize && `font-size: ${props?.customStyle?.fontSize}`};
+            margin-bottom: 0;
+        }
+
+        padding: 0;
+    }
+`;
+
+const FixedLineHeightEditor = styled(CompactEditor)<{ customStyle?: React.CSSProperties }>`
+    .remirror-editor.ProseMirror {
+        * {
+            line-height: ${LINE_HEIGHT};
+            font-size: 1em !important;
+            margin-top: 0;
+            margin-bottom: 0;
+        }
+        p {
+            font-size: ${(props) => (props?.customStyle?.fontSize ? props?.customStyle?.fontSize : '1em')} !important;
+        }
+    }
+`;
+
+export type Props = {
+    content: string;
+    lineLimit?: number | null;
+    fixedLineHeight?: boolean;
+    isShowMoreEnabled?: boolean;
+    customStyle?: React.CSSProperties;
+    scrollableY?: boolean; // Whether the viewer is vertically scrollable.
+    handleShowMore?: () => void;
+    hideShowMore?: boolean;
+};
+
+export default function CompactMarkdownViewer({
+    content,
+    lineLimit = 4,
+    fixedLineHeight = false,
+    isShowMoreEnabled = false,
+    customStyle = {},
+    scrollableY = true,
+    handleShowMore,
+    hideShowMore,
+}: Props) {
+    const [isShowingMore, setIsShowingMore] = useState(false);
+    const [isTruncated, setIsTruncated] = useState(false);
+
+    useEffect(() => {
+        if (isShowMoreEnabled) {
+            setIsShowingMore(isShowMoreEnabled);
+        }
+        return () => {
+            setIsShowingMore(false);
+        };
+    }, [isShowMoreEnabled]);
+
+    const measuredRef = useCallback((node: HTMLDivElement | null) => {
+        if (node !== null) {
+            const resizeObserver = new ResizeObserver(() => {
+                setIsTruncated(node.scrollHeight > node.clientHeight + 1);
+            });
+            resizeObserver.observe(node);
+        }
+    }, []);
+
+    const StyledEditor = fixedLineHeight ? FixedLineHeightEditor : CompactEditor;
+
+    return (
+        <MarkdownContainer lineLimit={lineLimit}>
+            <MarkdownViewContainer scrollableY={scrollableY} ref={measuredRef}>
+                <StyledEditor
+                    customStyle={customStyle}
+                    limit={isShowingMore ? null : lineLimit}
+                    content={content}
+                    readOnly
+                />
+            </MarkdownViewContainer>
+            {hideShowMore && <>...</>}
+
+            {!hideShowMore &&
+                (isShowingMore || isTruncated) && ( // "show more" when isTruncated, "show less" when isShowingMore
+                    <ShowMoreWrapper>
+                        <CustomButton
+                            type="link"
+                            onClick={() => (handleShowMore ? handleShowMore() : setIsShowingMore(!isShowingMore))}
+                        >
+                            {isShowingMore ? 'show less' : 'show more'}
+                        </CustomButton>
+                    </ShowMoreWrapper>
+                )}
+        </MarkdownContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionEditor.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionEditor.tsx
new file mode 100644
index 00000000000000..9749da1da28c0b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionEditor.tsx
@@ -0,0 +1,209 @@
+import React, { useEffect, useRef, useState } from 'react';
+import { message, Modal } from 'antd';
+import styled from 'styled-components/macro';
+import { useUpdateDescriptionMutation } from '../../../../../../graphql/mutations.generated';
+import analytics, { EntityActionType, EventType } from '../../../../../analytics';
+import { useEntityData, useEntityUpdate, useMutationUrn, useRefetch } from '../../../../../entity/shared/EntityContext';
+import { GenericEntityUpdate } from '../../../../../entity/shared/types';
+import { EDITED_DESCRIPTIONS_CACHE_NAME } from '../../../utils';
+import { DescriptionEditorToolbar } from './DescriptionEditorToolbar';
+import { Editor } from './editor/Editor';
+import SourceDescription from './SourceDescription';
+import { getAssetDescriptionDetails } from '../utils';
+
+const EditorContainer = styled.div`
+    flex: 1;
+`;
+
+const EditorSourceWrapper = styled.div`
+    overflow: auto;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+`;
+
+type DescriptionEditorProps = {
+    onComplete?: () => void;
+};
+
+export const DescriptionEditor = ({ onComplete }: DescriptionEditorProps) => {
+    const mutationUrn = useMutationUrn();
+    const { entityType, entityData, loading } = useEntityData();
+    const refetch = useRefetch();
+
+    const updateEntity = useEntityUpdate<GenericEntityUpdate>();
+    const [updateDescriptionMutation] = useUpdateDescriptionMutation();
+
+    const localStorageDictionary = localStorage.getItem(EDITED_DESCRIPTIONS_CACHE_NAME);
+
+    const { displayedDescription, isUsingDocumentationAspect: isUsingDocumentationAspectRaw } =
+        getAssetDescriptionDetails({
+            entityProperties: entityData,
+            defaultDescription: '',
+        });
+
+    const editedDescriptions = (localStorageDictionary && JSON.parse(localStorageDictionary)) || {};
+    const shouldUseEditedDescription = editedDescriptions.hasOwnProperty(mutationUrn);
+    const description = shouldUseEditedDescription ? editedDescriptions[mutationUrn] : displayedDescription;
+    const isUsingDocumentationAspect = !shouldUseEditedDescription && isUsingDocumentationAspectRaw;
+
+    const [updatedDescription, setUpdatedDescription] = useState(description);
+    // Key to force re-render of the editor when the description is updated from server data. Only needed for full page refreshes mid edit
+    const [editorKey, setEditorKey] = useState(0);
+    const [isDescriptionUpdated, setIsDescriptionUpdated] = useState(
+        editedDescriptions.hasOwnProperty(mutationUrn) || isUsingDocumentationAspect,
+    );
+    const hasUnsavedChangesRef = useRef(isDescriptionUpdated);
+    hasUnsavedChangesRef.current = isDescriptionUpdated;
+
+    /**
+     * Auto-Save the description edits to local storage every 5 seconds.
+     */
+    useEffect(() => {
+        let delayDebounceFn: ReturnType<typeof setTimeout>;
+        const editedDescriptionsLocal = (localStorageDictionary && JSON.parse(localStorageDictionary)) || {};
+
+        if (isDescriptionUpdated) {
+            delayDebounceFn = setTimeout(() => {
+                editedDescriptionsLocal[mutationUrn] = updatedDescription;
+                localStorage.setItem(EDITED_DESCRIPTIONS_CACHE_NAME, JSON.stringify(editedDescriptionsLocal));
+            }, 5000);
+        }
+        return () => clearTimeout(delayDebounceFn);
+    }, [mutationUrn, isDescriptionUpdated, updatedDescription, localStorageDictionary]);
+
+    /**
+     * If the documentation editor is refreshed mid edit, then this component will load without a description. if that description
+     * comes in on the next frame, we need to update updatedDescription
+     */
+    const hasInitializedDescriptionRef = useRef(!!updatedDescription);
+    useEffect(() => {
+        if (hasInitializedDescriptionRef.current) return;
+        if (updatedDescription) {
+            hasInitializedDescriptionRef.current = true;
+        } else if (description) {
+            setUpdatedDescription(description);
+            setEditorKey((prevKey) => prevKey + 1);
+            hasInitializedDescriptionRef.current = true;
+        }
+    }, [description, updatedDescription]);
+
+    const updateDescriptionLegacy = () => {
+        return updateEntity?.({
+            variables: { urn: mutationUrn, input: { editableProperties: { description: updatedDescription || '' } } },
+        });
+    };
+
+    const updateDescription = () => {
+        return updateDescriptionMutation({
+            variables: {
+                input: {
+                    description: updatedDescription,
+                    resourceUrn: mutationUrn,
+                },
+            },
+        });
+    };
+
+    const handleSave = async () => {
+        message.loading({ content: 'Saving...' });
+        try {
+            if (updateEntity) {
+                // Use the legacy update description path.
+                await updateDescriptionLegacy();
+            } else {
+                // Use the new update description path.
+                await updateDescription();
+            }
+            message.destroy();
+            analytics.event({
+                type: EventType.EntityActionEvent,
+                actionType: EntityActionType.UpdateDescription,
+                entityType,
+                entityUrn: mutationUrn,
+            });
+            message.success({ content: 'Description Updated', duration: 2 });
+            // Updating the localStorage after save
+            delete editedDescriptions[mutationUrn];
+            if (Object.keys(editedDescriptions).length === 0) {
+                localStorage.removeItem(EDITED_DESCRIPTIONS_CACHE_NAME);
+            } else {
+                localStorage.setItem(EDITED_DESCRIPTIONS_CACHE_NAME, JSON.stringify(editedDescriptions));
+            }
+            if (onComplete) onComplete();
+        } catch (e: unknown) {
+            message.destroy();
+            if (e instanceof Error) {
+                message.error({ content: `Failed to update description: \n ${e.message || ''}`, duration: 2 });
+            }
+        }
+        refetch?.();
+    };
+
+    function handleCancel() {
+        const onCancel = () => {
+            delete editedDescriptions[mutationUrn];
+            if (Object.keys(editedDescriptions).length === 0) {
+                localStorage.removeItem(EDITED_DESCRIPTIONS_CACHE_NAME);
+            } else {
+                localStorage.setItem(EDITED_DESCRIPTIONS_CACHE_NAME, JSON.stringify(editedDescriptions || description));
+            }
+            if (onComplete) onComplete();
+        };
+        if (!hasUnsavedChangesRef.current) {
+            onCancel();
+        } else {
+            Modal.confirm({
+                title: `Discard unsaved changes?`,
+                content: `Your changes will be lost.`,
+                onOk: onCancel,
+                onCancel() {},
+                okText: 'Yes',
+                maskClosable: true,
+                closable: true,
+            });
+        }
+    }
+
+    // Prevent closing tab by mistake
+    useEffect(() => {
+        function onBeforeUnload(e) {
+            if (hasUnsavedChangesRef.current) {
+                // This automatically shows the unsaved changes alert.
+                e.preventDefault();
+                e.returnValue = '';
+            }
+        }
+
+        window.addEventListener('beforeunload', onBeforeUnload);
+
+        return () => window.removeEventListener('beforeunload', onBeforeUnload);
+    }, []);
+
+    // Function to handle all changes in Editor
+    const handleEditorChange = (editedDescription: string) => {
+        setUpdatedDescription(editedDescription);
+        if (editedDescription === description) {
+            setIsDescriptionUpdated(false);
+        } else {
+            setIsDescriptionUpdated(true);
+        }
+    };
+
+    return !loading ? (
+        <>
+            <EditorSourceWrapper>
+                <EditorContainer>
+                    <Editor
+                        key={editorKey}
+                        content={updatedDescription}
+                        onChange={handleEditorChange}
+                        placeholder="Describe this asset to make it more discoverable. Tag @user or reference @asset to make your docs come to life!"
+                    />
+                </EditorContainer>
+                <SourceDescription />
+            </EditorSourceWrapper>
+            <DescriptionEditorToolbar onSave={handleSave} onCancel={handleCancel} disableSave={!isDescriptionUpdated} />
+        </>
+    ) : null;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionEditorToolbar.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionEditorToolbar.tsx
new file mode 100644
index 00000000000000..63a8db9fc22adf
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionEditorToolbar.tsx
@@ -0,0 +1,60 @@
+import styled from 'styled-components';
+import { Button } from 'antd';
+import React from 'react';
+import TabToolbar from '../../../components/styled/TabToolbar';
+import { REDESIGN_COLORS, ANTD_GRAY } from '../../../constants';
+
+const StyledTabToolbar = styled(TabToolbar)`
+    justify-content: flex-end !important;
+`;
+
+const SaveButton = styled(Button)`
+    background-color: #5c3fd1;
+    color: ${ANTD_GRAY[1]};
+    box-shadow: none;
+    border-color: ${REDESIGN_COLORS.DARK_PURPLE};
+    line-height: 0;
+
+    &:hover,
+    &:focus {
+        transition: 0.15s;
+        opacity: 0.9;
+        border-color: ${REDESIGN_COLORS.DARK_PURPLE};
+        background-color: ${REDESIGN_COLORS.HOVER_PURPLE};
+        color: ${ANTD_GRAY[1]};
+    }
+`;
+
+const StyledButton = styled(Button)`
+    margin-right: 10px;
+    box-shadow: none;
+    color: ${REDESIGN_COLORS.DARK_PURPLE};
+    border-color: ${REDESIGN_COLORS.DARK_PURPLE};
+    line-height: 0;
+
+    &:hover,
+    &:focus {
+        background-color: ${REDESIGN_COLORS.DARK_PURPLE};
+        color: #fff;
+        border-color: ${REDESIGN_COLORS.DARK_PURPLE};
+    }
+`;
+
+type DescriptionEditorToolbarProps = {
+    disableSave: boolean;
+    onSave: () => void;
+    onCancel: () => void;
+};
+
+export const DescriptionEditorToolbar = ({ disableSave, onSave, onCancel }: DescriptionEditorToolbarProps) => {
+    return (
+        <StyledTabToolbar>
+            <StyledButton data-testid="description-editor-cancel-button" onClick={onCancel}>
+                Cancel
+            </StyledButton>
+            <SaveButton data-testid="description-editor-save-button" onClick={onSave} disabled={disableSave}>
+                Publish
+            </SaveButton>
+        </StyledTabToolbar>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreview.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreview.tsx
new file mode 100644
index 00000000000000..90f887976e1d39
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreview.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Editor } from './editor/Editor';
+import { DescriptionPreviewToolbar } from './DescriptionPreviewToolbar';
+
+const EditorContainer = styled.div`
+    overflow: auto;
+    height: 100%;
+`;
+
+type DescriptionPreviewProps = {
+    description: string;
+    onEdit: () => void;
+};
+
+export const DescriptionPreview = ({ description, onEdit }: DescriptionPreviewProps) => {
+    return (
+        <>
+            <DescriptionPreviewToolbar onEdit={onEdit} />
+            <EditorContainer>
+                <Editor content={description} readOnly />
+            </EditorContainer>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx
new file mode 100644
index 00000000000000..bf346e24d05a1c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx
@@ -0,0 +1,76 @@
+import React from 'react';
+import { Modal } from 'antd';
+import ClickOutside from '../../../../../shared/ClickOutside';
+import { DescriptionEditor } from './DescriptionEditor';
+import { DescriptionPreview } from './DescriptionPreview';
+import { useRouteToTab } from '../../../../../entity/shared/EntityContext';
+
+const modalStyle = {
+    top: '5%',
+    maxWidth: 1400,
+};
+
+const bodyStyle = {
+    margin: 0,
+    padding: 0,
+    height: '90vh',
+    display: 'flex',
+    flexDirection: 'column' as any,
+};
+
+type DescriptionPreviewModalProps = {
+    description: string;
+    editMode: boolean;
+    onClose: (showConfirm?: boolean) => void;
+};
+
+export const DescriptionPreviewModal = ({ description, editMode, onClose }: DescriptionPreviewModalProps) => {
+    const routeToTab = useRouteToTab();
+
+    const onConfirmClose = () => {
+        if (editMode) {
+            Modal.confirm({
+                title: `Exit Editor`,
+                content: `Are you sure you want to exit the editor? Any unsaved changes will be lost.`,
+                onOk() {
+                    onClose();
+                },
+                onCancel() {},
+                okText: 'Yes',
+                maskClosable: true,
+                closable: true,
+            });
+        } else {
+            onClose(false);
+        }
+    };
+
+    return (
+        <ClickOutside onClickOutside={onConfirmClose} wrapperClassName="description-editor-wrapper">
+            <Modal
+                width="80%"
+                style={modalStyle}
+                bodyStyle={bodyStyle}
+                title={undefined}
+                visible
+                footer={null}
+                closable={false}
+                onCancel={onConfirmClose}
+                className="description-editor-wrapper"
+            >
+                {(editMode && (
+                    <DescriptionEditor
+                        onComplete={() => routeToTab({ tabName: 'Documentation', tabParams: { modal: true } })}
+                    />
+                )) || (
+                    <DescriptionPreview
+                        description={description}
+                        onEdit={() =>
+                            routeToTab({ tabName: 'Documentation', tabParams: { editing: true, modal: true } })
+                        }
+                    />
+                )}
+            </Modal>
+        </ClickOutside>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreviewToolbar.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreviewToolbar.tsx
new file mode 100644
index 00000000000000..590322190e7800
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DescriptionPreviewToolbar.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import { EditOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+import TabToolbar from '../../../components/styled/TabToolbar';
+
+type DescriptionPreviewToolbarProps = {
+    onEdit: () => void;
+};
+
+export const DescriptionPreviewToolbar = ({ onEdit }: DescriptionPreviewToolbarProps) => {
+    return (
+        <TabToolbar>
+            <Button type="text" onClick={onEdit}>
+                <EditOutlined /> Edit
+            </Button>
+        </TabToolbar>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx
new file mode 100644
index 00000000000000..ce54fe711da837
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import { Modal, Button } from 'antd';
+
+type Props = {
+    cancelModalVisible?: boolean;
+    onDiscard?: () => void;
+    onCancel?: () => void;
+};
+
+export const DiscardDescriptionModal = ({ cancelModalVisible, onDiscard, onCancel }: Props) => {
+    return (
+        <>
+            <Modal
+                title="Exit Editor"
+                visible={cancelModalVisible}
+                destroyOnClose
+                onCancel={onCancel}
+                footer={[
+                    <Button type="text" onClick={onCancel}>
+                        Cancel
+                    </Button>,
+                    <Button onClick={onDiscard}>Yes</Button>,
+                ]}
+            >
+                <p>Are you sure you want to close the documentation editor? Any unsaved changes will be lost.</p>
+            </Modal>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/LinkList.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/LinkList.tsx
new file mode 100644
index 00000000000000..a4cbc9b3856a21
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/LinkList.tsx
@@ -0,0 +1,96 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components/macro';
+import { message, Button, List, Typography } from 'antd';
+import { LinkOutlined, DeleteOutlined } from '@ant-design/icons';
+import { InstitutionalMemoryMetadata } from '../../../../../../types.generated';
+import { useEntityData } from '../../../../../entity/shared/EntityContext';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { ANTD_GRAY } from '../../../constants';
+import { formatDateString } from '../../../containers/profile/utils';
+import { useRemoveLinkMutation } from '../../../../../../graphql/mutations.generated';
+
+const LinkListItem = styled(List.Item)`
+    border-radius: 5px;
+    > .ant-btn {
+        opacity: 0;
+    }
+    &:hover {
+        background-color: ${ANTD_GRAY[2]};
+        > .ant-btn {
+            opacity: 1;
+        }
+    }
+`;
+
+const ListOffsetIcon = styled.span`
+    margin-left: -18px;
+    margin-right: 6px;
+`;
+
+type LinkListProps = {
+    refetch?: () => Promise<any>;
+};
+
+export const LinkList = ({ refetch }: LinkListProps) => {
+    const { urn: entityUrn, entityData } = useEntityData();
+    const entityRegistry = useEntityRegistry();
+    const [removeLinkMutation] = useRemoveLinkMutation();
+    const links = entityData?.institutionalMemory?.elements || [];
+
+    const handleDeleteLink = async (metadata: InstitutionalMemoryMetadata) => {
+        try {
+            await removeLinkMutation({
+                variables: { input: { linkUrl: metadata.url, resourceUrn: metadata.associatedUrn || entityUrn } },
+            });
+            message.success({ content: 'Link Removed', duration: 2 });
+        } catch (e: unknown) {
+            message.destroy();
+            if (e instanceof Error) {
+                message.error({ content: `Error removing link: \n ${e.message || ''}`, duration: 2 });
+            }
+        }
+        refetch?.();
+    };
+
+    return entityData ? (
+        <>
+            {links.length > 0 && (
+                <List
+                    size="large"
+                    dataSource={links}
+                    renderItem={(link) => (
+                        <LinkListItem
+                            extra={
+                                <Button onClick={() => handleDeleteLink(link)} type="text" shape="circle" danger>
+                                    <DeleteOutlined />
+                                </Button>
+                            }
+                        >
+                            <List.Item.Meta
+                                title={
+                                    <Typography.Title level={5}>
+                                        <a href={link.url} target="_blank" rel="noreferrer">
+                                            <ListOffsetIcon>
+                                                <LinkOutlined />
+                                            </ListOffsetIcon>
+                                            {link.description || link.label}
+                                        </a>
+                                    </Typography.Title>
+                                }
+                                description={
+                                    <>
+                                        Added {formatDateString(link.created.time)} by{' '}
+                                        <Link to={`${entityRegistry.getEntityUrl(link.actor.type, link.actor.urn)}`}>
+                                            {entityRegistry.getDisplayName(link.actor.type, link.actor)}
+                                        </Link>
+                                    </>
+                                }
+                            />
+                        </LinkListItem>
+                    )}
+                />
+            )}
+        </>
+    ) : null;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/SourceDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/SourceDescription.tsx
new file mode 100644
index 00000000000000..45608d6b8a8b10
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/SourceDescription.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import styled from 'styled-components';
+import { useEntityData } from '../../../../../entity/shared/EntityContext';
+import { ANTD_GRAY } from '../../../constants';
+import DescriptionSection from '../../../containers/profile/sidebar/AboutSection/DescriptionSection';
+import { getPlatformName } from '../../../utils';
+
+const LINE_LIMIT = 10;
+
+const SourceDescriptionWrapper = styled.div`
+    border-top: 1px solid ${ANTD_GRAY[4]};
+    padding: 16px 0 16px 32px;
+`;
+
+const Title = styled.div`
+    font-weight: 700;
+    padding-bottom: 16px;
+`;
+
+export default function SourceDescription() {
+    const { entityData } = useEntityData();
+    const platformName = getPlatformName(entityData);
+    const sourceDescription = entityData?.properties?.description;
+
+    if (!sourceDescription || !entityData?.platform) return null;
+
+    return (
+        <SourceDescriptionWrapper>
+            <Title>{platformName ? <span>{platformName}</span> : <>Source</>} Documentation:</Title>
+            <DescriptionSection description={sourceDescription} lineLimit={LINE_LIMIT} isExpandable />
+        </SourceDescriptionWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/Editor.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/Editor.tsx
new file mode 100644
index 00000000000000..6f96205b8ac9d1
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/Editor.tsx
@@ -0,0 +1,115 @@
+import React, { forwardRef, useEffect, useImperativeHandle } from 'react';
+import DOMPurify from 'dompurify';
+import {
+    BlockquoteExtension,
+    BoldExtension,
+    BulletListExtension,
+    CodeBlockExtension,
+    CodeExtension,
+    DropCursorExtension,
+    HardBreakExtension,
+    HeadingExtension,
+    HistoryExtension,
+    HorizontalRuleExtension,
+    ImageExtension,
+    ItalicExtension,
+    LinkExtension,
+    ListItemExtension,
+    MarkdownExtension,
+    OrderedListExtension,
+    StrikeExtension,
+    TableExtension,
+    UnderlineExtension,
+} from 'remirror/extensions';
+import { EditorComponent, Remirror, useRemirror, ThemeProvider, TableComponents } from '@remirror/react';
+import { useMount } from 'react-use';
+import { EditorContainer, EditorTheme } from './EditorTheme';
+import { htmlToMarkdown } from './extensions/htmlToMarkdown';
+import { markdownToHtml } from './extensions/markdownToHtml';
+import { CodeBlockToolbar } from './toolbar/CodeBlockToolbar';
+import { FloatingToolbar } from './toolbar/FloatingToolbar';
+import { Toolbar } from './toolbar/Toolbar';
+import { OnChangeMarkdown } from './OnChangeMarkdown';
+import { TableCellMenu } from './toolbar/TableCellMenu';
+import { DataHubMentionsExtension } from './extensions/mentions/DataHubMentionsExtension';
+import { MentionsComponent } from './extensions/mentions/MentionsComponent';
+
+type EditorProps = {
+    readOnly?: boolean;
+    content?: string;
+    onChange?: (md: string) => void;
+    className?: string;
+    doNotFocus?: boolean;
+    placeholder?: string;
+};
+
+export const Editor = forwardRef((props: EditorProps, ref) => {
+    const { content, readOnly, onChange, className, placeholder } = props;
+    const { manager, state, getContext } = useRemirror({
+        extensions: () => [
+            new BlockquoteExtension(),
+            new BoldExtension(),
+            new BulletListExtension(),
+            new CodeBlockExtension({ syntaxTheme: 'base16_ateliersulphurpool_light' }),
+            new CodeExtension(),
+            new DataHubMentionsExtension(),
+            new DropCursorExtension(),
+            new HardBreakExtension(),
+            new HeadingExtension(),
+            new HistoryExtension(),
+            new HorizontalRuleExtension(),
+            new ImageExtension({ enableResizing: !readOnly }),
+            new ItalicExtension(),
+            new LinkExtension({ autoLink: true, defaultTarget: '_blank' }),
+            new ListItemExtension(),
+            new MarkdownExtension({ htmlSanitizer: DOMPurify.sanitize, htmlToMarkdown, markdownToHtml }),
+            new OrderedListExtension(),
+            new UnderlineExtension(),
+            new StrikeExtension(),
+            new TableExtension({ resizable: false }),
+            ...(readOnly ? [] : [new HistoryExtension()]),
+        ],
+        content,
+        stringHandler: 'markdown',
+    });
+
+    useImperativeHandle(ref, () => getContext(), [getContext]);
+
+    useMount(() => {
+        if (!props.doNotFocus) {
+            manager.view.focus();
+        }
+    });
+    useEffect(() => {
+        if (readOnly && content) {
+            manager.store.commands.setContent(content);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [readOnly, content]);
+
+    return (
+        <EditorContainer className={className}>
+            <ThemeProvider theme={EditorTheme}>
+                <Remirror
+                    classNames={['ant-typography']}
+                    editable={!readOnly}
+                    manager={manager}
+                    initialContent={state}
+                    placeholder={placeholder || ''}
+                >
+                    {!readOnly && (
+                        <>
+                            <Toolbar />
+                            <CodeBlockToolbar />
+                            <FloatingToolbar />
+                            <TableComponents tableCellMenuProps={{ Component: TableCellMenu }} />
+                            <MentionsComponent />
+                            {onChange && <OnChangeMarkdown onChange={onChange} />}
+                        </>
+                    )}
+                    <EditorComponent />
+                </Remirror>
+            </ThemeProvider>
+        </EditorContainer>
+    );
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/EditorTheme.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/EditorTheme.tsx
new file mode 100644
index 00000000000000..d3e23b0993d231
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/EditorTheme.tsx
@@ -0,0 +1,133 @@
+import { defaultRemirrorTheme } from '@remirror/theme';
+import type { RemirrorThemeType } from '@remirror/theme';
+import styled from 'styled-components';
+
+import {
+    extensionBlockquoteStyledCss,
+    extensionCalloutStyledCss,
+    extensionCodeBlockStyledCss,
+    extensionCountStyledCss,
+    extensionGapCursorStyledCss,
+    extensionImageStyledCss,
+    extensionListStyledCss,
+    extensionMentionAtomStyledCss,
+    extensionPlaceholderStyledCss,
+    extensionPositionerStyledCss,
+    extensionTablesStyledCss,
+} from '@remirror/styles/styled-components';
+
+import { ANTD_GRAY } from '../../../../constants';
+
+export const EditorTheme: RemirrorThemeType = {
+    ...defaultRemirrorTheme,
+    fontSize: {
+        default: '14px',
+    },
+    color: {
+        border: 'none',
+        outline: 'none',
+        primary: '#00B14F',
+        table: {
+            ...defaultRemirrorTheme.color.table,
+            mark: ANTD_GRAY[6],
+            default: {
+                controller: ANTD_GRAY[3],
+                border: ANTD_GRAY[4.5],
+            },
+            selected: {
+                controller: ANTD_GRAY[4],
+                border: ANTD_GRAY[4.5],
+                cell: ANTD_GRAY[2.5],
+            },
+            preselect: {
+                controller: ANTD_GRAY[5],
+                border: ANTD_GRAY[6],
+            },
+        },
+    },
+};
+
+export const EditorContainer = styled.div`
+    ${extensionBlockquoteStyledCss}
+    ${extensionCalloutStyledCss}
+    ${extensionCodeBlockStyledCss}
+    ${extensionCountStyledCss}
+    ${extensionGapCursorStyledCss}
+    ${extensionImageStyledCss}
+    ${extensionListStyledCss}
+    ${extensionMentionAtomStyledCss}
+    ${extensionPlaceholderStyledCss}
+    ${extensionPositionerStyledCss}
+    ${extensionTablesStyledCss}
+
+    font-weight: 400;
+    display: flex;
+    flex: 1 1 auto;
+
+    .remirror-theme,
+    .remirror-editor-wrapper {
+        flex: 1 1 100%;
+        display: flex;
+        flex-direction: column;
+    }
+
+    .remirror-editor.ProseMirror {
+        flex: 1 1 100%;
+        border: 0;
+        font-size: 14px;
+        padding: 16px 32px;
+        position: relative;
+        outline: 0;
+        line-height: 1.5;
+        white-space: pre-wrap;
+        margin: 0;
+
+        a {
+            font-weight: 500;
+        }
+
+        li {
+            ~ li {
+                margin-top: 0.25em;
+            }
+            p {
+                margin: 0;
+            }
+        }
+
+        img {
+            margin: 0.25em 0;
+            &:not([width]) {
+                max-width: 100%;
+            }
+        }
+
+        hr {
+            margin: 2rem 0;
+            border-color: rgba(0, 0, 0, 0.06);
+        }
+
+        .autocomplete {
+            padding: 0.2rem;
+            background: ${ANTD_GRAY[4]};
+            border-radius: 4px;
+        }
+
+        table {
+            display: block;
+            th:not(.remirror-table-controller) {
+                background: ${ANTD_GRAY[2]};
+            }
+
+            th:not(.remirror-table-controller),
+            td {
+                padding: 16px;
+                min-width: 120px;
+            }
+        }
+    }
+
+    .remirror-floating-popover {
+        z-index: 100;
+    }
+`;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/OnChangeMarkdown.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/OnChangeMarkdown.tsx
new file mode 100644
index 00000000000000..b6a090f892440c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/OnChangeMarkdown.tsx
@@ -0,0 +1,24 @@
+import { useCallback } from 'react';
+import { useExtensionEvent, useHelpers } from '@remirror/react';
+import { DocChangedExtension } from '@remirror/core';
+
+export interface OnChangeMarkdownProps {
+    onChange: (md: string) => void;
+}
+
+export const OnChangeMarkdown = ({ onChange }: OnChangeMarkdownProps): null => {
+    const { getMarkdown } = useHelpers();
+
+    const onDocChanged = useCallback(
+        ({ state }) => {
+            let markdown = getMarkdown(state);
+            if (markdown === '&nbsp;') markdown = '';
+            onChange(markdown);
+        },
+        [onChange, getMarkdown],
+    );
+
+    useExtensionEvent(DocChangedExtension, 'docChanged', onDocChanged);
+
+    return null;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/__mocks__/Editor.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/__mocks__/Editor.tsx
new file mode 100644
index 00000000000000..f33c1db03804de
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/__mocks__/Editor.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+
+type EditorProps = {
+    content?: string;
+    // eslint-disable-next-line react/no-unused-prop-types
+    readOnly?: boolean;
+    // eslint-disable-next-line react/no-unused-prop-types
+    onChange?: (md: string) => void;
+    // eslint-disable-next-line react/no-unused-prop-types
+    className?: string;
+};
+
+/*
+We need to mock the Editor component as it causes significant delays all over our
+tests and causes CI failures due to timeouts. We test the Editor with tests for it
+by itself as well as tests for the specific pieces of functionality it uses.
+*/
+export const Editor = (props: EditorProps) => {
+    const { content } = props;
+
+    return <div>{content}</div>;
+};
+
+export default Editor;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/__tests__/Editor.test.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/__tests__/Editor.test.tsx
new file mode 100644
index 00000000000000..08be95192d7871
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/__tests__/Editor.test.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { Editor } from '../Editor';
+
+// setupTests mocks Editor for all tests. We want to use the actual editor for this test module
+vi.mock('../Editor', async () => vi.importActual('../Editor'));
+
+describe('Editor', () => {
+    it('should render the Editor and content without failure', () => {
+        const content = 'testing the editor out';
+        const { getByText } = render(<Editor content={content} />);
+
+        expect(getByText(content)).toBeInTheDocument();
+        // loading the Editor in CI can be slow, extend the timeout beyond its usual 5 seconds to 20 seconds
+    }, 20000);
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/htmlToMarkdown.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/htmlToMarkdown.tsx
new file mode 100644
index 00000000000000..45a9e8588243d7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/htmlToMarkdown.tsx
@@ -0,0 +1,117 @@
+import _TurndownService from 'turndown';
+import { gfm } from 'turndown-plugin-gfm';
+import { defaultImport, ErrorConstant, invariant, isElementDomNode } from '@remirror/core';
+import { DATAHUB_MENTION_ATTRS } from './mentions/DataHubMentionsExtension';
+
+const TurndownService = defaultImport(_TurndownService);
+
+/**
+ * Checks if the input HTML table could be parsed into a markdown table
+ * @param element - the HTML table element
+ * @returns true if the table is a valid markdown table, false otherwise
+ */
+function isValidMarkdownTable(element: HTMLElement): boolean {
+    let valid = true;
+
+    const invalidTags = ['ul', 'li', 'pre', 'table', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'];
+    invalidTags.forEach((tag) => {
+        if (element.getElementsByTagName(tag).length > 0) {
+            valid = false;
+        }
+    });
+
+    return valid;
+}
+
+const br = '<br />';
+const turndownService = new TurndownService({
+    codeBlockStyle: 'fenced',
+    headingStyle: 'atx',
+    blankReplacement(_, node: any) {
+        /** Replaces blank nodes in table to <br> to preserve line breaks */
+        if (node.closest('table')) {
+            return br;
+        }
+        /** Replaces all empty <p> tags to &nbsp; to preserve line breaks */
+        if (node.nodeName === 'P') {
+            return `\n\n&nbsp;\n\n`;
+        }
+        return node.isBlock ? '\n\n' : '';
+    },
+})
+    /* Adds GFM support */
+    .use(gfm)
+    /* Keep HTML format if table does not have a valid markdown structure */
+    .addRule('skipTable', {
+        filter: (node) => node.nodeName === 'TABLE' && !isValidMarkdownTable(node),
+        replacement: (_, node: any) => `${node.outerHTML}`,
+    })
+    /* Keep <br> tags in tables allowing line break within cells */
+    .addRule('keepBreaksinTables', {
+        filter: (node) => node.nodeName === 'BR' && !!node.closest('table'),
+        replacement: () => br,
+    })
+    /* Remove unnecessary child <p> tags within tables <th> and <td> */
+    .addRule('tableHeadingAndData', {
+        filter: (node) =>
+            !!(node.nodeName === 'P' && (node.parentNode?.nodeName === 'TH' || node.parentNode?.nodeName === 'TD')),
+        replacement: (content, node: any) =>
+            node?.previousElementSibling?.nodeName === 'P' ? `${br}${content}` : content,
+    })
+    /* Keep HTML format if image has an explicit width attribute */
+    .addRule('images', {
+        filter: (node) => node.nodeName === 'IMG' && node.hasAttribute('width'),
+        replacement: (_, node: any) => `${node.outerHTML}`,
+    })
+    /* Add improved code block support from html (snippet from Remirror). */
+    .addRule('fencedCodeBlock', {
+        filter: (node, options) => {
+            return !!(
+                options.codeBlockStyle === 'fenced' &&
+                node.nodeName === 'PRE' &&
+                node.firstChild &&
+                node.firstChild.nodeName === 'CODE'
+            );
+        },
+
+        replacement: (_, node, options) => {
+            invariant(isElementDomNode(node.firstChild), {
+                code: ErrorConstant.EXTENSION,
+                message: `Invalid node \`${node.firstChild?.nodeName}\` encountered for codeblock when converting html to markdown.`,
+            });
+
+            const className = node.firstChild.getAttribute('class') ?? '';
+            const language =
+                className.match(/(?:lang|language)-(\S+)/)?.[1] ??
+                node.firstChild.getAttribute('data-code-block-language') ??
+                '';
+
+            return `\n\n${options.fence}${language}\n${node.firstChild.textContent}\n${options.fence}\n\n`;
+        },
+    })
+    /* Formats HTML Datahub mention nodes to Markdown */
+    .addRule('mentions', {
+        filter: (node) => {
+            return node.hasAttribute(DATAHUB_MENTION_ATTRS.urn);
+        },
+        replacement: (_, node) => {
+            invariant(isElementDomNode(node), {
+                code: ErrorConstant.EXTENSION,
+                message: `Invalid node \`${node.nodeName}\` encountered for mentions when converting html to markdown.`,
+            });
+            const urn = node.getAttribute(DATAHUB_MENTION_ATTRS.urn);
+            if (!urn) return '';
+
+            return `[${node.textContent}](${urn})`;
+        },
+    });
+
+/**
+ * Converts the provided HTML to markdown.
+ * @param html - a html string of the content
+ * @returns parsed markdown string of the html content
+ */
+export function htmlToMarkdown(html: string): string {
+    const result = turndownService.turndown(html);
+    return result === br ? '' : result;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/markdownToHtml.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/markdownToHtml.tsx
new file mode 100644
index 00000000000000..07efa16a98df50
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/markdownToHtml.tsx
@@ -0,0 +1,27 @@
+import { marked } from 'marked';
+import { DATAHUB_MENTION_ATTRS } from './mentions/DataHubMentionsExtension';
+
+marked.use({
+    renderer: {
+        link(href, _, text) {
+            /* Checks if the markdown link is of a DataHub mention format and
+               parses it into the necessary DOM structure described in DataHubMentionsExtension */
+            if (text.startsWith('@') && href?.startsWith('urn')) {
+                return `<span ${DATAHUB_MENTION_ATTRS.urn}="${href}">${text}</span>`;
+            }
+
+            /* Returning false allows marked to use the default link parser */
+            return false;
+        },
+    },
+});
+
+export function markdownToHtml(markdown: string, sanitizer?: (html: string) => string): string {
+    return marked(markdown, {
+        gfm: true,
+        smartLists: true,
+        xhtml: true,
+        sanitizer,
+        breaks: true,
+    });
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension.tsx
new file mode 100644
index 00000000000000..ed7881b340c437
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/DataHubMentionsExtension.tsx
@@ -0,0 +1,138 @@
+/* eslint-disable class-methods-use-this */
+import React, { ComponentType } from 'react';
+import type { Plugin } from 'prosemirror-state';
+import {
+    ApplySchemaAttributes,
+    CommandFunction,
+    extension,
+    ExtensionTag,
+    FromToProps,
+    Handler,
+    isElementDomNode,
+    NodeExtension,
+    NodeExtensionSpec,
+    NodeSpecOverride,
+    omitExtraAttributes,
+    ProsemirrorAttributes,
+} from '@remirror/core';
+import { NodeViewComponentProps } from '@remirror/react';
+import autocomplete, {
+    ActiveAutocompleteState,
+    AutocompleteAction,
+    pluginKey as acPluginKey,
+} from 'prosemirror-autocomplete';
+import { MentionsNodeView } from './MentionsNodeView';
+
+export const DATAHUB_MENTION_ATTRS = {
+    urn: 'data-datahub-mention-urn',
+};
+
+type DataHubAtomNodeAttributes = ProsemirrorAttributes & {
+    name: string;
+    urn: string;
+};
+
+interface DataHubMentionsOptions {
+    handleEvents?: Handler<(action: AutocompleteAction) => boolean>;
+}
+
+/**
+ * The DataHub mentions extensions wraps @-mentions as a prosemirror node. It adds capability to
+ * use and render @-mentions within the editor. The implementation was inspired by Notion where a
+ * dedicated search bar is displayed for users to search. Mentions cannot be edited once being inserted
+ * into the document.
+ *
+ * This Remirror plugin is simply a wrapper on top of `prosemirror-autocomplete` which provides the
+ * suggestion engine, allowing spaces to be used within the search bar.
+ */
+class DataHubMentionsExtension extends NodeExtension<DataHubMentionsOptions> {
+    get name() {
+        return 'datahubMention' as const;
+    }
+
+    createTags() {
+        return [ExtensionTag.InlineNode, ExtensionTag.Behavior];
+    }
+
+    /**
+     * Add the 'prosemirror-autocomplete' plugin to the editor.
+     */
+    createExternalPlugins(): Plugin[] {
+        return autocomplete({
+            triggers: [{ name: 'mention', trigger: '@', cancelOnFirstSpace: false }],
+            reducer: (action) => this.options.handleEvents?.(action) || false,
+        });
+    }
+
+    createNodeSpec(extra: ApplySchemaAttributes, override: Partial<NodeSpecOverride>): NodeExtensionSpec {
+        return {
+            inline: true,
+            marks: '',
+            selectable: true,
+            draggable: true,
+            atom: true,
+            ...override,
+            attrs: {
+                ...extra.defaults(),
+                urn: {},
+                name: {},
+            },
+            parseDOM: [
+                {
+                    tag: `span[${DATAHUB_MENTION_ATTRS.urn}]`,
+                    getAttrs: (node: string | Node) => {
+                        if (!isElementDomNode(node)) {
+                            return false;
+                        }
+
+                        const urn = node.getAttribute(DATAHUB_MENTION_ATTRS.urn);
+                        const name = node.textContent?.replace(/^@/, '') || urn;
+
+                        return { ...extra.parse(node), urn, name };
+                    },
+                },
+                ...(override.parseDOM ?? []),
+            ],
+            toDOM: (node) => {
+                const { name, urn } = omitExtraAttributes(node.attrs, extra) as DataHubAtomNodeAttributes;
+
+                const attrs = {
+                    ...extra.dom(node),
+                    class: 'mentions',
+                    [DATAHUB_MENTION_ATTRS.urn]: urn,
+                };
+
+                return ['span', attrs, `@${name}`];
+            },
+        };
+    }
+
+    /**
+     * Renders a React Component in place of the dom node spec
+     */
+    ReactComponent: ComponentType<NodeViewComponentProps> = (props) => <MentionsNodeView {...props} />;
+
+    createCommands() {
+        return {
+            /**
+             * Creates a mention at the provided range.
+             *
+             * @param attrs - the attributes that should be passed through. Required values are 'name' and 'urn'.
+             * @param range - the range of the selection that would be replaced.
+             */
+            createDataHubMention: (attrs: DataHubAtomNodeAttributes, range?: FromToProps): CommandFunction => {
+                return ({ state, tr, dispatch }) => {
+                    const acState: ActiveAutocompleteState = acPluginKey.getState(state);
+                    const { from = 0, to = 0 } = range ?? acState.range ?? {};
+                    tr.replaceRangeWith(from, to, this.type.create(attrs));
+                    dispatch?.(tr);
+
+                    return true;
+                };
+            },
+        };
+    }
+}
+
+const decoratedExt = extension<DataHubMentionsOptions>({ handlerKeys: ['handleEvents'] })(DataHubMentionsExtension);
+export { decoratedExt as DataHubMentionsExtension };
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsComponent.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsComponent.tsx
new file mode 100644
index 00000000000000..e503dd60100768
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsComponent.tsx
@@ -0,0 +1,68 @@
+import React, { useEffect, useState } from 'react';
+import { useDebounce } from 'react-use';
+import { FloatingWrapper } from '@remirror/react';
+import { Empty, Spin } from 'antd';
+import styled from 'styled-components';
+import { LoadingOutlined } from '@ant-design/icons';
+import { Positioner, selectionPositioner } from 'remirror/extensions';
+import { useGetAutoCompleteMultipleResultsLazyQuery } from '../../../../../../../../../graphql/search.generated';
+import { MentionsDropdown } from './MentionsDropdown';
+import { useDataHubMentions } from './useDataHubMentions';
+import { useUserContext } from '../../../../../../../../context/useUserContext';
+
+const Container = styled.div`
+    position: relative;
+    top: 0;
+    left: 0;
+    .ant-spin-container {
+        overflow: auto;
+        max-height: 350px;
+    }
+`;
+
+const StyledEmpty = styled(Empty)`
+    margin: 16px;
+`;
+
+export const MentionsComponent = () => {
+    const userContext = useUserContext();
+    const [getAutoComplete, { data: autocompleteData, loading }] = useGetAutoCompleteMultipleResultsLazyQuery();
+    const { active, range, filter: query } = useDataHubMentions({});
+    const [suggestions, setSuggestions] = useState<any[]>([]);
+    const viewUrn = userContext.localState?.selectedViewUrn;
+
+    useEffect(() => {
+        if (query) {
+            getAutoComplete({ variables: { input: { query, viewUrn } } });
+        }
+    }, [getAutoComplete, query, viewUrn]);
+    useDebounce(() => setSuggestions(autocompleteData?.autoCompleteForMultiple?.suggestions || []), 250, [
+        autocompleteData,
+    ]);
+
+    if (!active) return null;
+    const mentionsPositioner = selectionPositioner.clone(() => ({
+        getActive: ({ view }) => {
+            try {
+                if (!range) return Positioner.EMPTY;
+                return [{ from: view.coordsAtPos(range.from), to: view.coordsAtPos(range.to) }];
+            } catch {
+                return Positioner.EMPTY;
+            }
+        },
+    }));
+
+    return (
+        <FloatingWrapper positioner={mentionsPositioner} enabled={active} placement="bottom-start">
+            <Container className="ant-select-dropdown">
+                <Spin spinning={loading} delay={100} indicator={<LoadingOutlined />}>
+                    {suggestions?.length > 0 ? (
+                        <MentionsDropdown suggestions={suggestions} />
+                    ) : (
+                        <StyledEmpty image={Empty.PRESENTED_IMAGE_SIMPLE} description="No results found" />
+                    )}
+                </Spin>
+            </Container>
+        </FloatingWrapper>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsDropdown.tsx
new file mode 100644
index 00000000000000..f4720f5e802567
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsDropdown.tsx
@@ -0,0 +1,114 @@
+import React, { useCallback, useMemo, useState } from 'react';
+import { Typography } from 'antd';
+import styled from 'styled-components';
+import { useDebounce } from 'react-use';
+import { useCommands } from '@remirror/react';
+import { AutoCompleteResultForEntity, Entity, EntityType } from '../../../../../../../../../types.generated';
+import { useEntityRegistry } from '../../../../../../../../useEntityRegistry';
+import { ANTD_GRAY } from '../../../../../../constants';
+import { useDataHubMentions } from './useDataHubMentions';
+import AutoCompleteItem from '../../../../../../../../search/autoComplete/AutoCompleteItem';
+
+const HeaderItem = styled(Typography.Text)`
+    display: block;
+    min-height: 32px;
+    padding: 5px 12px;
+`;
+
+const OptionItem = styled.div<{ readonly active?: boolean }>`
+    min-height: 32px;
+    padding: 5px 12px 5px 24px;
+    background: ${(props) => (props.active ? ANTD_GRAY[3] : ANTD_GRAY[1])};
+    transition: background 0.3s ease;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+
+    &:hover {
+        background: ${ANTD_GRAY[3]};
+    }
+`;
+
+type Props = {
+    suggestions: AutoCompleteResultForEntity[];
+};
+
+type Option = {
+    header: boolean;
+    type: EntityType;
+    entity?: Entity;
+    index?: number;
+};
+
+/** Flattens a nested entities list to a single level array */
+const flattenOptions = (suggestions: AutoCompleteResultForEntity[]): Option[] => {
+    let optOffset = 0;
+    return suggestions.reduce<Option[]>((acc, suggestion) => {
+        acc.push({ header: true, type: suggestion.type });
+
+        const options = suggestion.entities.map((entity) => {
+            return {
+                index: optOffset++,
+                header: false,
+                type: entity.type,
+                entity,
+            };
+        });
+
+        return [...acc, ...options];
+    }, []);
+};
+
+export const MentionsDropdown = ({ suggestions }: Props) => {
+    const entityRegistry = useEntityRegistry();
+    const [options, setOptions] = useState<Option[]>([]);
+    const { createDataHubMention } = useCommands();
+
+    useDebounce(() => setOptions(flattenOptions(suggestions)), 250, [suggestions]);
+    const onSubmit = useCallback(
+        (item: Option) => {
+            if (item.entity) {
+                createDataHubMention({
+                    name: entityRegistry.getDisplayName(item.type, item.entity),
+                    urn: item.entity.urn,
+                });
+                return true;
+            }
+            return false;
+        },
+        [createDataHubMention, entityRegistry],
+    );
+
+    /** Store a separate list of options without header items for arrow keys navigation  */
+    const items = useMemo(() => options.filter(({ header }) => !header), [options]);
+    const { selectedIndex, filter } = useDataHubMentions<Option>({ items, onEnter: onSubmit });
+
+    return (
+        <div role="menu">
+            {options.map((option) => {
+                const { header, type, entity, index = 0 } = option;
+                if (header) {
+                    const label = entityRegistry.getCollectionName(type);
+                    return (
+                        <HeaderItem key={`Header_${label}`} type="secondary">
+                            {label}
+                        </HeaderItem>
+                    );
+                }
+
+                if (!entity) return null;
+                const highlight = selectedIndex === index;
+                const onMouseDown = (e) => {
+                    e.preventDefault();
+                    onSubmit(option);
+                };
+
+                return (
+                    <OptionItem active={highlight} key={entity.urn} onMouseDown={onMouseDown} role="option">
+                        <AutoCompleteItem query={filter ?? ''} entity={entity} />
+                    </OptionItem>
+                );
+            })}
+        </div>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsNodeView.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsNodeView.tsx
new file mode 100644
index 00000000000000..e811cfeb090e55
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/MentionsNodeView.tsx
@@ -0,0 +1,69 @@
+import React from 'react';
+import { Typography } from 'antd';
+import { Tooltip } from '@components';
+import styled from 'styled-components';
+
+import { NodeViewComponentProps } from '@remirror/react';
+import { HoverEntityTooltip } from '../../../../../../../../recommendations/renderer/component/HoverEntityTooltip';
+import { useGetEntityMentionNodeQuery } from '../../../../../../../../../graphql/search.generated';
+import { useEntityRegistry } from '../../../../../../../../useEntityRegistry';
+import { IconStyleType } from '../../../../../../../Entity';
+import { ANTD_GRAY } from '../../../../../../constants';
+
+const { Text } = Typography;
+
+const InvalidEntityText = styled(Text)`
+    display: inline-block;
+    font-weight: 500;
+    color: ${ANTD_GRAY[7]};
+`;
+
+const ValidEntityText = styled(Text)`
+    display: inline-block;
+    font-weight: 500;
+    margin-left: 4px !important;
+    word-break: break-all;
+    color: ${(props) => props.theme.styles['primary-color']};
+`;
+
+// !important is needed to override inline styles
+const Container = styled.span`
+    & > .anticon {
+        color: ${(props) => props.theme.styles['primary-color']} !important;
+    }
+`;
+
+export const MentionsNodeView = ({ node }: NodeViewComponentProps) => {
+    const { urn, name } = node.attrs;
+
+    const registry = useEntityRegistry();
+    const { data, loading } = useGetEntityMentionNodeQuery({
+        variables: { urn },
+        fetchPolicy: 'cache-first',
+    });
+
+    if (loading) {
+        return <ValidEntityText>{name}</ValidEntityText>;
+    }
+
+    if (!data || !data.entity) {
+        return (
+            <Tooltip title="Failed to find entity">
+                <InvalidEntityText delete>{name}</InvalidEntityText>
+            </Tooltip>
+        );
+    }
+
+    const { entity } = data;
+    const entityName = registry.getDisplayName(entity.type, entity);
+    const entityType = registry.getIcon(entity.type, 14, IconStyleType.ACCENT);
+
+    return (
+        <HoverEntityTooltip entity={entity}>
+            <Container>
+                {entityType}
+                <ValidEntityText>{entityName}</ValidEntityText>
+            </Container>
+        </HoverEntityTooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/useDataHubMentions.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/useDataHubMentions.ts
new file mode 100644
index 00000000000000..8a4fd37b5eab58
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/extensions/mentions/useDataHubMentions.ts
@@ -0,0 +1,63 @@
+import { useCallback, useEffect, useState } from 'react';
+import { useRemirrorContext } from '@remirror/react';
+import { ActionKind, AutocompleteAction, FromTo } from 'prosemirror-autocomplete';
+import { DataHubMentionsExtension } from './DataHubMentionsExtension';
+
+type State = {
+    active: boolean;
+    range?: FromTo;
+    filter?: string;
+};
+
+type UseDataHubMentionsProps<T> = {
+    items?: T[];
+    onEnter?(item: T): boolean;
+};
+
+/**
+ * This hook is a helper utility to read actions from prosemirror-autocomplete, allowing components
+ * to react to these changes accordingly. It provides the postional and query metadata of the currently
+ * active autocomplete menu. In addition, this hooks stores the selected index triggered
+ * when using the arrow keys to navigate the autocomplete menu.
+ */
+export function useDataHubMentions<Item = any>(props: UseDataHubMentionsProps<Item>) {
+    const [index, selectedIndex] = useState(0);
+    const rmrCtx = useRemirrorContext();
+    const ext = rmrCtx.getExtension(DataHubMentionsExtension);
+    const [state, setState] = useState<State>({ active: false });
+    const { items, onEnter } = props;
+
+    const handleEvents = useCallback(
+        (action: AutocompleteAction) => {
+            const active = !(action.kind === ActionKind.close || action.kind === ActionKind.enter);
+            setState({ active, range: action.range, filter: action.filter });
+
+            if (!items) {
+                return false;
+            }
+
+            const maxIndex = items.length - 1;
+
+            switch (action.kind) {
+                case ActionKind.enter:
+                    return onEnter?.(items[index]) || true;
+                case ActionKind.up:
+                    selectedIndex((i) => (i - 1 < 0 ? maxIndex : i - 1));
+                    return true;
+                case ActionKind.down:
+                    selectedIndex((i) => (i + 1 > maxIndex ? 0 : i + 1));
+                    return true;
+                default:
+                    return false;
+            }
+        },
+        [items, onEnter, selectedIndex, index],
+    );
+
+    useEffect(() => {
+        const eventHandler = ext.addHandler('handleEvents', handleEvents);
+        return () => eventHandler();
+    }, [ext, handleEvents]);
+
+    return { ...state, selectedIndex: index };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/AddImageButton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/AddImageButton.tsx
new file mode 100644
index 00000000000000..0037677962155e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/AddImageButton.tsx
@@ -0,0 +1,56 @@
+import React, { useState } from 'react';
+import { Form, Input, Modal, Typography } from 'antd';
+import { PictureOutlined } from '@ant-design/icons';
+import { useCommands } from '@remirror/react';
+import { CommandButton } from './CommandButton';
+
+export const AddImageButton = () => {
+    const [isModalVisible, setModalVisible] = useState(false);
+    const [form] = Form.useForm();
+    const { insertImage } = useCommands();
+
+    const handleButtonClick = () => {
+        setModalVisible(true);
+    };
+
+    const handleOk = () => {
+        form.validateFields()
+            .then((values) => {
+                form.resetFields();
+                setModalVisible(false);
+                insertImage(values);
+            })
+            .catch((info) => {
+                console.log('Validate Failed:', info);
+            });
+    };
+
+    const handleCancel = () => {
+        setModalVisible(false);
+    };
+
+    return (
+        <>
+            <CommandButton
+                active={false}
+                icon={<PictureOutlined />}
+                commandName="insertImage"
+                onClick={handleButtonClick}
+            />
+            <Modal title="Add Image" visible={isModalVisible} okText="Save" onOk={handleOk} onCancel={handleCancel}>
+                <Form form={form} layout="vertical" colon={false} requiredMark={false}>
+                    <Form.Item
+                        name="src"
+                        label={<Typography.Text strong>Image URL</Typography.Text>}
+                        rules={[{ required: true }]}
+                    >
+                        <Input placeholder="http://www.example.com/image.jpg" autoFocus />
+                    </Form.Item>
+                    <Form.Item name="alt" label={<Typography.Text strong>Alt Text</Typography.Text>}>
+                        <Input />
+                    </Form.Item>
+                </Form>
+            </Modal>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/AddLinkButton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/AddLinkButton.tsx
new file mode 100644
index 00000000000000..4693ebbcb54c4a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/AddLinkButton.tsx
@@ -0,0 +1,30 @@
+import React, { useState } from 'react';
+import { LinkOutlined } from '@ant-design/icons';
+import { useActive } from '@remirror/react';
+
+import { CommandButton } from './CommandButton';
+import { LinkModal } from './LinkModal';
+
+export const AddLinkButton = () => {
+    const [isModalVisible, setModalVisible] = useState(false);
+
+    const active = useActive(true).link();
+
+    const handleButtonClick = () => {
+        setModalVisible(true);
+    };
+
+    const handleClose = () => setModalVisible(false);
+
+    return (
+        <>
+            <CommandButton
+                active={active}
+                icon={<LinkOutlined />}
+                commandName="insertLink"
+                onClick={handleButtonClick}
+            />
+            <LinkModal visible={isModalVisible} handleClose={handleClose} />
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CodeBlockToolbar.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CodeBlockToolbar.tsx
new file mode 100644
index 00000000000000..1aa7b0e514fa04
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CodeBlockToolbar.tsx
@@ -0,0 +1,85 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Select } from 'antd';
+import { findParentNodeOfType, isElementDomNode } from '@remirror/core';
+import { defaultAbsolutePosition, hasStateChanged, isPositionVisible, Positioner } from 'remirror/extensions';
+import { FloatingWrapper, useAttrs, useCommands } from '@remirror/react';
+import { listLanguages } from 'refractor';
+import { ToolbarContainer } from './FloatingToolbar';
+
+const StyledSelect = styled(Select)`
+    min-width: 120px;
+`;
+
+const codeBlockPositioner = Positioner.create<any>({
+    hasChanged: hasStateChanged,
+
+    getActive(props) {
+        const { selection } = props.state;
+        const codeBlock = findParentNodeOfType({ selection, types: 'codeBlock' });
+
+        if (!codeBlock) {
+            return Positioner.EMPTY;
+        }
+
+        return [codeBlock];
+    },
+
+    getPosition(props) {
+        const { view, data: codeBlock } = props;
+
+        const node = view.nodeDOM(codeBlock.pos);
+
+        if (!isElementDomNode(node)) {
+            return defaultAbsolutePosition;
+        }
+
+        const rect = node.getBoundingClientRect();
+        const editorRect = view.dom.getBoundingClientRect();
+
+        const { width, height } = rect;
+
+        const left = view.dom.scrollLeft + rect.left - editorRect.left - 1;
+        const top = view.dom.scrollTop + rect.top - editorRect.top - 1;
+
+        return {
+            x: left,
+            y: top,
+            height,
+            width,
+            rect,
+            visible: isPositionVisible(rect, view.dom),
+        };
+    },
+});
+
+export const CodeBlockMenu = () => {
+    const commands = useCommands();
+    const value = (useAttrs(true).codeBlock()?.language as string) ?? 'markup';
+
+    const options = listLanguages().map((language) => ({ value: language }));
+
+    const onChange = (language) => {
+        commands.updateCodeBlock({ language });
+        commands.focus();
+    };
+
+    return (
+        <ToolbarContainer>
+            <StyledSelect
+                value={value}
+                size="small"
+                options={options}
+                onChange={onChange}
+                dropdownMatchSelectWidth={100}
+                showSearch
+            />
+        </ToolbarContainer>
+    );
+};
+
+export const CodeBlockToolbar = () => (
+    <FloatingWrapper positioner={codeBlockPositioner} placement="top-start">
+        <CodeBlockMenu />
+    </FloatingWrapper>
+);
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CommandButton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CommandButton.tsx
new file mode 100644
index 00000000000000..caa382327a80f9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/CommandButton.tsx
@@ -0,0 +1,28 @@
+import React, { MouseEventHandler, useCallback } from 'react';
+import { Button, ButtonProps } from 'antd';
+import { Tooltip } from '@components';
+import { capitalCase } from '@remirror/core';
+import { useHelpers } from '@remirror/react';
+
+export interface CommandButtonProps extends Omit<ButtonProps, 'type'> {
+    active?: boolean;
+    children?: React.ReactNode;
+    commandName?: string;
+}
+
+export const CommandButton = ({ active, children, commandName, ...buttonProps }: CommandButtonProps) => {
+    const { getCommandOptions } = useHelpers();
+    const options = commandName ? getCommandOptions(commandName) : undefined;
+
+    const handleMouseDown: MouseEventHandler<HTMLButtonElement> = useCallback((e) => {
+        e.preventDefault();
+    }, []);
+
+    return (
+        <Tooltip title={options?.name ? capitalCase(options?.name) : null}>
+            <Button type={active ? 'link' : 'text'} onMouseDown={handleMouseDown} {...buttonProps}>
+                {children}
+            </Button>
+        </Tooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar.tsx
new file mode 100644
index 00000000000000..24e87853b58c7f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/FloatingToolbar.tsx
@@ -0,0 +1,118 @@
+import React, { useMemo, useState } from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import {
+    BoldOutlined,
+    DisconnectOutlined,
+    EditOutlined,
+    ItalicOutlined,
+    LinkOutlined,
+    UnderlineOutlined,
+} from '@ant-design/icons';
+import { FloatingWrapper, useActive, useAttrs, useCommands } from '@remirror/react';
+import { createMarkPositioner } from 'remirror/extensions';
+
+import { ANTD_GRAY } from '../../../../../constants';
+import { CommandButton } from './CommandButton';
+import { LinkModal } from './LinkModal';
+import { CodeIcon } from './Icons';
+
+const { Text } = Typography;
+
+export const ToolbarContainer = styled.span`
+    display: flex;
+    align-items: center;
+    padding: 2px;
+    background-color: ${ANTD_GRAY[1]};
+    border-radius: 4px;
+    box-shadow: 0 3px 6px -4px #0000001f, 0 6px 16px #00000014, 0 9px 28px 8px #0000000d;
+    overflow: hidden;
+    z-index: 300;
+`;
+
+const LinkText = styled(Text)`
+    padding-left: 4px;
+    max-width: 250px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+`;
+
+export const FloatingToolbar = () => {
+    const [isModalVisible, setModalVisible] = useState(false);
+    const commands = useCommands();
+    const active = useActive(true);
+
+    const linkPositioner = useMemo(() => createMarkPositioner({ type: 'link' }), []);
+    const href = (useAttrs().link()?.href as string) ?? '';
+
+    const handleEditLink = () => {
+        setModalVisible(true);
+    };
+
+    const handleClose = () => setModalVisible(false);
+
+    const linkCommmands = (
+        <ToolbarContainer>
+            <LinkText type="secondary">{href}</LinkText>
+            <CommandButton size="small" icon={<EditOutlined />} commandName="editLink" onClick={handleEditLink} />
+            <CommandButton
+                size="small"
+                icon={<DisconnectOutlined />}
+                commandName="toggleLink"
+                onClick={() => commands.removeLink()}
+            />
+        </ToolbarContainer>
+    );
+
+    const shouldShowFloatingToolbar = !(active.link() || active.codeBlock());
+
+    return (
+        <>
+            <FloatingWrapper positioner={linkPositioner} placement="bottom-start">
+                {linkCommmands}
+            </FloatingWrapper>
+            {shouldShowFloatingToolbar && (
+                <FloatingWrapper positioner="selection" placement="top-start">
+                    <ToolbarContainer>
+                        <CommandButton
+                            size="small"
+                            icon={<BoldOutlined />}
+                            commandName="toggleBold"
+                            active={active.bold()}
+                            onClick={() => commands.toggleBold()}
+                        />
+                        <CommandButton
+                            size="small"
+                            icon={<ItalicOutlined />}
+                            commandName="toggleItalic"
+                            active={active.italic()}
+                            onClick={() => commands.toggleItalic()}
+                        />
+                        <CommandButton
+                            size="small"
+                            icon={<UnderlineOutlined />}
+                            commandName="toggleUnderline"
+                            active={active.underline()}
+                            onClick={() => commands.toggleUnderline()}
+                        />
+                        <CommandButton
+                            size="small"
+                            icon={<LinkOutlined />}
+                            commandName="updateLink"
+                            onClick={handleEditLink}
+                        />
+                        <CommandButton
+                            size="small"
+                            icon={<CodeIcon />}
+                            commandName="toggleCode"
+                            active={active.code()}
+                            onClick={() => commands.toggleCode()}
+                        />
+                    </ToolbarContainer>
+                </FloatingWrapper>
+            )}
+            <LinkModal visible={isModalVisible} handleClose={handleClose} />
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/HeadingMenu.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/HeadingMenu.tsx
new file mode 100644
index 00000000000000..0c24aadfd1589b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/HeadingMenu.tsx
@@ -0,0 +1,66 @@
+import React, { MouseEventHandler, useCallback } from 'react';
+import { Select } from 'antd';
+import styled from 'styled-components';
+import { useActive, useCommands } from '@remirror/react';
+
+const { Option } = Select;
+
+const OPTIONS = [
+    { tag: 'h1', label: 'Heading 1', value: 1 },
+    { tag: 'h2', label: 'Heading 2', value: 2 },
+    { tag: 'h3', label: 'Heading 3', value: 3 },
+    { tag: 'h4', label: 'Heading 4', value: 4 },
+    { tag: 'h5', label: 'Heading 5', value: 5 },
+    { tag: 'p', label: 'Normal', value: 0 },
+];
+
+/* To mitigate overrides of the Select's width when using it in modals */
+const Wrapper = styled.div`
+    display: inline-block;
+    width: 120px;
+`;
+
+const StyledSelect = styled(Select)`
+    font-weight: 500;
+    width: 100%;
+`;
+
+export const HeadingMenu = () => {
+    const { toggleHeading } = useCommands();
+    const active = useActive(true);
+
+    const activeHeading = OPTIONS.map(({ value }) => value).filter((level) => active.heading({ level }))?.[0] || 0;
+
+    const handleMouseDown: MouseEventHandler<HTMLDivElement> = useCallback((e) => {
+        e.preventDefault();
+    }, []);
+
+    return (
+        <Wrapper>
+            <StyledSelect
+                defaultValue={0}
+                bordered={false}
+                dropdownMatchSelectWidth={false}
+                value={`${activeHeading}`}
+                optionLabelProp="label"
+                onChange={(value) => {
+                    const level = +`${value}`;
+                    if (level) {
+                        toggleHeading({ level });
+                    } else {
+                        toggleHeading();
+                    }
+                }}
+                onMouseDown={handleMouseDown}
+            >
+                {OPTIONS.map((option) => {
+                    return (
+                        <Option key={option.value} label={option.label} value={`${option.value}`}>
+                            {React.createElement(option.tag, null, option.label)}
+                        </Option>
+                    );
+                })}
+            </StyledSelect>
+        </Wrapper>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/Icons.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/Icons.tsx
new file mode 100644
index 00000000000000..b7954fd7b63c85
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/Icons.tsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import Icon from '@ant-design/icons';
+import { CustomIconComponentProps } from '@ant-design/icons/lib/components/Icon';
+
+export const CodeIcon = (props: Partial<CustomIconComponentProps>) => (
+    <Icon
+        component={() => (
+            <svg
+                width="1em"
+                height="1em"
+                fill="currentColor"
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 14 14"
+                {...props}
+            >
+                <path
+                    fillRule="evenodd"
+                    clipRule="evenodd"
+                    d="M8.737 2.048a.526.526 0 0 0-1.022-.246l-2.45 10.15a.526.526 0 1 0 1.022.246l2.45-10.15ZM4.035 3.643a.525.525 0 0 0-.742.022L.493 6.64a.525.525 0 0 0 0 .72l2.8 2.975a.525.525 0 0 0 .764-.72L1.597 7l2.46-2.615a.525.525 0 0 0-.022-.742Zm5.93 0a.525.525 0 0 1 .742.022l2.8 2.975a.525.525 0 0 1 0 .72l-2.8 2.975a.525.525 0 0 1-.764-.72L12.405 7 9.943 4.385a.525.525 0 0 1 .023-.742Z"
+                />
+            </svg>
+        )}
+    />
+);
+
+export const CodeBlockIcon = (props: Partial<CustomIconComponentProps>) => (
+    <Icon
+        component={() => (
+            <svg
+                width="1em"
+                height="1em"
+                fill="currentColor"
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 14 14"
+                {...props}
+            >
+                <path
+                    fillRule="evenodd"
+                    clipRule="evenodd"
+                    d="M6.448 1.916a.525.525 0 0 0-.996-.332l-1.75 5.25a.525.525 0 1 0 .996.332l1.75-5.25Zm4.227.185a.525.525 0 1 0 0 1.05h1.4a.175.175 0 0 1 .175.175v8.05a.175.175 0 0 1-.175.175h-9.1a.175.175 0 0 1-.175-.175v-2.45a.525.525 0 0 0-1.05 0v2.45c0 .677.549 1.225 1.225 1.225h9.1a1.225 1.225 0 0 0 1.225-1.225v-8.05a1.225 1.225 0 0 0-1.225-1.225h-1.4Zm-2.583.35a.525.525 0 1 0-.784.698l1.09 1.227L7.307 5.6a.525.525 0 1 0 .784.698l1.4-1.574a.525.525 0 0 0 0-.697l-1.4-1.577ZM2.799 6.342a.525.525 0 0 1-.74-.043l-1.4-1.574a.525.525 0 0 1 0-.697l1.4-1.577a.525.525 0 1 1 .784.698l-1.09 1.227L2.843 5.6a.525.525 0 0 1-.044.742v-.001Z"
+                />
+            </svg>
+        )}
+    />
+);
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/LinkModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/LinkModal.tsx
new file mode 100644
index 00000000000000..14698291575c4b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/LinkModal.tsx
@@ -0,0 +1,82 @@
+import React, { useEffect, useState } from 'react';
+import { Form, Input, Modal, Typography } from 'antd';
+import { FromToProps } from '@remirror/core-types';
+import { useAttrs, useCommands, useEditorState, useHelpers } from '@remirror/react';
+import { getMarkRange } from '@remirror/core-utils';
+
+type LinkModalProps = {
+    visible: boolean;
+    handleClose: () => void;
+};
+
+export const LinkModal = (props: LinkModalProps) => {
+    const { visible, handleClose } = props;
+
+    const [trPos, setTrPos] = useState<FromToProps>({ from: 0, to: 0 });
+    const [form] = Form.useForm();
+
+    const commands = useCommands();
+    const helpers = useHelpers();
+    const editorState = useEditorState();
+
+    const href = (useAttrs().link()?.href as string) ?? '';
+
+    useEffect(() => {
+        if (visible) {
+            const { from, to } = editorState.selection;
+            const pos = getMarkRange(editorState.doc.resolve(from), 'link') || { from, to };
+
+            form.setFieldsValue({
+                href,
+                text: helpers.getTextBetween(pos.from, pos.to, editorState.doc) || '',
+            });
+
+            setTrPos(pos);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [visible]);
+
+    const handleOk = async () => {
+        try {
+            const values = await form.validateFields();
+            const displayText = values.text || values.href;
+
+            commands.replaceText({
+                content: displayText,
+                selection: trPos,
+                type: 'link',
+                attrs: {
+                    href: values.href,
+                },
+            });
+
+            form.resetFields();
+            handleClose();
+        } catch (e) {
+            console.log('Validate Failed:', e);
+        }
+    };
+
+    return (
+        <Modal title="Add Link" okText="Save" onCancel={handleClose} onOk={handleOk} visible={visible}>
+            <Form
+                form={form}
+                layout="vertical"
+                colon={false}
+                requiredMark={false}
+                onKeyPress={(e) => e.key === 'Enter' && form.submit()}
+            >
+                <Form.Item
+                    name="href"
+                    label={<Typography.Text strong>Link URL</Typography.Text>}
+                    rules={[{ required: true }]}
+                >
+                    <Input placeholder="https://www.google.com" autoFocus />
+                </Form.Item>
+                <Form.Item name="text" label={<Typography.Text strong>Text</Typography.Text>}>
+                    <Input />
+                </Form.Item>
+            </Form>
+        </Modal>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/TableCellMenu.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/TableCellMenu.tsx
new file mode 100644
index 00000000000000..7460a3327612ba
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/TableCellMenu.tsx
@@ -0,0 +1,71 @@
+import React from 'react';
+import { Dropdown, Menu } from 'antd';
+import styled from 'styled-components';
+import { useActive, useCommands } from '@remirror/react';
+import { DeleteOutlined, DownOutlined, PlusOutlined } from '@ant-design/icons';
+
+const StyledDropdownButton = styled(Dropdown.Button)`
+    position: absolute;
+    right: 2px;
+    top: 50%;
+    transform: translateY(-50%);
+    .ant-btn {
+        height: auto;
+        padding: 0;
+        &.ant-btn.ant-btn-icon-only {
+            width: 16px;
+            height: 16px;
+            border-radius: 5px;
+        }
+    }
+`;
+
+export const TableCellMenu = () => {
+    const active = useActive();
+    const commands = useCommands();
+
+    const menu = (
+        <Menu>
+            <Menu.Item
+                icon={<PlusOutlined />}
+                disabled={active.tableHeaderCell()}
+                onClick={() => commands.addTableRowBefore()}
+            >
+                Insert row above
+            </Menu.Item>
+            <Menu.Item icon={<PlusOutlined />} onClick={() => commands.addTableRowAfter()}>
+                Insert row below
+            </Menu.Item>
+            <Menu.Item icon={<PlusOutlined />} onClick={() => commands.addTableColumnBefore()}>
+                Insert column left
+            </Menu.Item>
+            <Menu.Item icon={<PlusOutlined />} onClick={() => commands.addTableColumnAfter()}>
+                Insert column right
+            </Menu.Item>
+            <Menu.Divider />
+            <Menu.Item
+                icon={<DeleteOutlined />}
+                disabled={active.tableHeaderCell()}
+                onClick={() => commands.deleteTableRow()}
+            >
+                Delete row
+            </Menu.Item>
+            <Menu.Item icon={<DeleteOutlined />} onClick={() => commands.deleteTableColumn()}>
+                Delete column
+            </Menu.Item>
+            <Menu.Item icon={<DeleteOutlined />} onClick={() => commands.deleteTable()}>
+                Delete table
+            </Menu.Item>
+        </Menu>
+    );
+
+    return (
+        <StyledDropdownButton
+            size="small"
+            icon={<DownOutlined />}
+            placement="bottomLeft"
+            overlay={menu}
+            type="primary"
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/Toolbar.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/Toolbar.tsx
new file mode 100644
index 00000000000000..501e36ce20a11f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/toolbar/Toolbar.tsx
@@ -0,0 +1,133 @@
+import InfoPopover from '@app/sharedV2/icons/InfoPopover';
+import React from 'react';
+import { Divider } from 'antd';
+import {
+    BoldOutlined,
+    ItalicOutlined,
+    OrderedListOutlined,
+    StrikethroughOutlined,
+    TableOutlined,
+    UnderlineOutlined,
+    UnorderedListOutlined,
+} from '@ant-design/icons';
+import { useActive, useCommands } from '@remirror/react';
+import styled from 'styled-components';
+import { CommandButton } from './CommandButton';
+import { HeadingMenu } from './HeadingMenu';
+import { AddImageButton } from './AddImageButton';
+import { AddLinkButton } from './AddLinkButton';
+import { CodeBlockIcon, CodeIcon } from './Icons';
+import { REDESIGN_COLORS } from '../../../../../constants';
+
+const Container = styled.div`
+    position: sticky;
+    top: 0;
+    z-index: 99;
+    background-color: ${REDESIGN_COLORS.LIGHT_GREY};
+    border-top-left-radius: 4px;
+    border-bottom-left-radius: 4px;
+    border-left: 2px solid ${REDESIGN_COLORS.TITLE_PURPLE};
+    padding: 8px 20px !important;
+    margin: 2px 14px 2px 12px;
+    & button {
+        line-height: 0;
+    }
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+`;
+
+const PopoverContainer = styled.div`
+    display: flex;
+    max-width: 450px;
+    align-items: baseline;
+    strong {
+        font-size: 16px;
+    }
+`;
+
+const StyledInfoPopover = styled(InfoPopover)`
+    font-size: 14px;
+`;
+
+const PopoverContent = () => (
+    <PopoverContainer>
+        <span>
+            Reference users and assets using the <strong>@</strong> symbol.
+        </span>
+    </PopoverContainer>
+);
+
+export const Toolbar = () => {
+    const commands = useCommands();
+    const active = useActive(true);
+
+    return (
+        <Container>
+            <div>
+                <HeadingMenu />
+                <Divider type="vertical" />
+                <CommandButton
+                    icon={<BoldOutlined />}
+                    commandName="toggleBold"
+                    active={active.bold()}
+                    onClick={() => commands.toggleBold()}
+                />
+                <CommandButton
+                    icon={<ItalicOutlined />}
+                    commandName="toggleItalic"
+                    active={active.italic()}
+                    onClick={() => commands.toggleItalic()}
+                />
+                <CommandButton
+                    icon={<UnderlineOutlined />}
+                    commandName="toggleUnderline"
+                    active={active.underline()}
+                    onClick={() => commands.toggleUnderline()}
+                />
+                <CommandButton
+                    icon={<StrikethroughOutlined />}
+                    commandName="toggleStrike"
+                    active={active.strike()}
+                    onClick={() => commands.toggleStrike()}
+                />
+                <Divider type="vertical" />
+                <CommandButton
+                    icon={<UnorderedListOutlined />}
+                    commandName="toggleBulletList"
+                    active={active.bulletList()}
+                    onClick={() => commands.toggleBulletList()}
+                />
+                <CommandButton
+                    icon={<OrderedListOutlined />}
+                    commandName="toggleOrderedList"
+                    active={active.orderedList()}
+                    onClick={() => commands.toggleOrderedList()}
+                />
+                <Divider type="vertical" />
+                <CommandButton
+                    icon={<CodeIcon />}
+                    commandName="toggleCode"
+                    active={active.code()}
+                    onClick={() => commands.toggleCode()}
+                />
+                <CommandButton
+                    icon={<CodeBlockIcon />}
+                    commandName="toggleCodeBlock"
+                    active={active.codeBlock()}
+                    onClick={() => commands.toggleCodeBlock()}
+                />
+                <Divider type="vertical" />
+                <AddImageButton />
+                <AddLinkButton />
+                <CommandButton
+                    icon={<TableOutlined />}
+                    commandName="createTable"
+                    onClick={() => commands.createTable()}
+                    disabled={active.table()} /* Disables nested tables */
+                />
+            </div>
+            <StyledInfoPopover content={<PopoverContent />} />
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/utils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/utils.ts
new file mode 100644
index 00000000000000..8bbc0a92221f00
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/editor/utils.ts
@@ -0,0 +1,7 @@
+import DOMPurify from 'dompurify';
+
+export const sanitizeRichText = (content: string) => {
+    if (!content) return '';
+    const encoded = content.replace(/</g, '&lt;').replace(/>/g, '&gt;');
+    return DOMPurify.sanitize(encoded).replace(/&lt;/g, '<').replace(/&gt;/g, '>');
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/utils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/utils.ts
new file mode 100644
index 00000000000000..a0b2a4be086ebb
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/utils.ts
@@ -0,0 +1,31 @@
+import { GenericEntityProperties } from '@src/app/entity/shared/types';
+
+export function getAssetDescriptionDetails({
+    entityProperties,
+    defaultDescription,
+}: {
+    entityProperties?: GenericEntityProperties | null;
+    defaultDescription?: string | null;
+}) {
+    // get most recent documentation aspect
+    const sortedDocumentations = entityProperties?.documentation?.documentations.sort(
+        (doc1, doc2) => (doc2.attribution?.time || 0) - (doc1.attribution?.time || 0),
+    );
+    const documentation = sortedDocumentations?.[0];
+
+    // Check user set documentation
+    const editedDescription = entityProperties?.editableProperties?.description;
+    const originalDescription = entityProperties?.properties?.description;
+    const editableDescription = editedDescription || originalDescription || '';
+    const isUsingDocumentationAspect = !editableDescription && !!documentation;
+
+    const displayedDescription = editableDescription || documentation?.documentation || defaultDescription || '';
+
+    const sourceDetail = documentation?.attribution?.sourceDetail;
+
+    return {
+        displayedDescription,
+        isUsingDocumentationAspect,
+        sourceDetail,
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Embed/EmbedTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Embed/EmbedTab.tsx
new file mode 100644
index 00000000000000..30fc37bcdba569
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Embed/EmbedTab.tsx
@@ -0,0 +1,33 @@
+import { Empty } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../constants';
+import { useEntityData } from '../../../../entity/shared/EntityContext';
+
+const EmbedContainer = styled.div`
+    width: 100%;
+    height: 100%;
+`;
+
+const StyledIframe = styled.iframe`
+    width: 100%;
+    height: 100%;
+`;
+
+const StyledEmpty = styled(Empty)`
+    margin-top: 28px;
+    font-size: 16px;
+    color: ${ANTD_GRAY[8]};
+`;
+
+export const EmbedTab = () => {
+    const { entityData } = useEntityData();
+    const embedRenderUrl = entityData?.embed?.renderUrl;
+    return (
+        <EmbedContainer>
+            {(embedRenderUrl && <StyledIframe src={embedRenderUrl} title={entityData?.urn} frameBorder={0} />) || (
+                <StyledEmpty description="No preview was found." />
+            )}
+        </EmbedContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/ChartDashboardsTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/ChartDashboardsTab.tsx
new file mode 100644
index 00000000000000..cc6bde81e364ae
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/ChartDashboardsTab.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { useBaseEntity } from '../../../../entity/shared/EntityContext';
+import { EntityType } from '../../../../../types.generated';
+import { EntityList } from './components/EntityList';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+
+export const ChartDashboardsTab = () => {
+    const entity = useBaseEntity() as any;
+    const chart = entity && entity.chart;
+    const dashboards = chart?.dashboards?.relationships.map((relationship) => relationship.entity);
+    const entityRegistry = useEntityRegistry();
+    const totalDashboards = chart?.dashboards?.total || 0;
+    const title = `Found in ${totalDashboards} ${
+        totalDashboards === 1
+            ? entityRegistry.getEntityName(EntityType.Dashboard)
+            : entityRegistry.getCollectionName(EntityType.Dashboard)
+    }`;
+    return <EntityList title={title} type={EntityType.Dashboard} entities={dashboards || []} />;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/ColumnTabNameHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/ColumnTabNameHeader.tsx
new file mode 100644
index 00000000000000..52c477c76b724f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/ColumnTabNameHeader.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { useGetEntityWithSchema } from '../Dataset/Schema/useGetEntitySchema';
+import TabNameWithCount from './TabNameWithCount';
+
+const ColumnTabNameHeader = () => {
+    const { entityWithSchema, loading } = useGetEntityWithSchema();
+    const fieldsCount = entityWithSchema?.schemaMetadata?.fields?.length || 0;
+
+    return <TabNameWithCount name="Columns" count={fieldsCount} loading={loading} />;
+};
+
+export default ColumnTabNameHeader;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DashboardChartsTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DashboardChartsTab.tsx
new file mode 100644
index 00000000000000..b099957d0c93e8
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DashboardChartsTab.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { useBaseEntity } from '../../../../entity/shared/EntityContext';
+import { EntityType } from '../../../../../types.generated';
+import { EntityList } from './components/EntityList';
+
+export const DashboardChartsTab = () => {
+    const entity = useBaseEntity() as any;
+    const dashboard = entity && entity.dashboard;
+    const charts = dashboard?.charts?.relationships.map((relationship) => relationship.entity);
+    const totalCharts = dashboard?.charts?.total || 0;
+    const title = `Contains ${totalCharts} assets`;
+    return <EntityList title={title} type={EntityType.Chart} entities={charts || []} />;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DashboardDatasetsTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DashboardDatasetsTab.tsx
new file mode 100644
index 00000000000000..0fa6ec2fd5052b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DashboardDatasetsTab.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { useBaseEntity } from '../../../../entity/shared/EntityContext';
+import { EntityType } from '../../../../../types.generated';
+import { EntityList } from './components/EntityList';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+
+export const DashboardDatasetsTab = () => {
+    const entity = useBaseEntity() as any;
+    const dashboard = entity && entity.dashboard;
+    const datasets = dashboard?.datasets?.relationships.map((relationship) => relationship.entity);
+    const entityRegistry = useEntityRegistry();
+    const totalDatasets = dashboard?.datasets?.total || 0;
+    const title = `Consumes ${totalDatasets} ${
+        totalDatasets === 1
+            ? entityRegistry.getEntityName(EntityType.Dataset)
+            : entityRegistry.getCollectionName(EntityType.Dataset)
+    }`;
+    return <EntityList title={title} type={EntityType.Dataset} entities={datasets || []} />;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DataFlowJobsTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DataFlowJobsTab.tsx
new file mode 100644
index 00000000000000..36e8c035c0d236
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DataFlowJobsTab.tsx
@@ -0,0 +1,60 @@
+import React, { useState } from 'react';
+import { EntityType } from '../../../../../types.generated';
+import { EntityList } from './components/EntityList';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+import { useGetDataFlowChildJobsQuery } from '../../../../../graphql/dataFlow.generated';
+import { SearchCfg } from '../../../../../conf';
+
+interface Props {
+    properties?: {
+        urn: string;
+    };
+}
+
+export const DataFlowJobsTab = ({ properties = { urn: '' } }: Props) => {
+    const [page, setPage] = useState(1);
+    const [numResultsPerPage, setNumResultsPerPage] = useState(SearchCfg.RESULTS_PER_PAGE);
+
+    const start: number = (page - 1) * numResultsPerPage;
+
+    const { data, loading, error } = useGetDataFlowChildJobsQuery({
+        variables: {
+            urn: properties.urn,
+            start,
+            count: numResultsPerPage,
+        },
+    });
+
+    const onChangePage = (newPage: number) => {
+        setPage(newPage);
+    };
+
+    const dataFlow = data && data?.dataFlow;
+    const dataJobs = dataFlow?.childJobs?.relationships.map((relationship) => relationship.entity);
+    const entityRegistry = useEntityRegistry();
+    const totalJobs = dataFlow?.childJobs?.total || 0;
+    const pageSize = data?.dataFlow?.childJobs?.count || 0;
+    const pageStart = data?.dataFlow?.childJobs?.start || 0;
+    const lastResultIndex = pageStart + pageSize > totalJobs ? totalJobs : pageStart + pageSize;
+    const title = `Contains ${totalJobs} ${
+        totalJobs === 1
+            ? entityRegistry.getEntityName(EntityType.DataJob)
+            : entityRegistry.getCollectionName(EntityType.DataJob)
+    }`;
+    return (
+        <EntityList
+            title={title}
+            type={EntityType.DataJob}
+            entities={dataJobs || []}
+            showPagination
+            loading={loading}
+            error={error}
+            totalAssets={totalJobs}
+            page={page}
+            pageSize={numResultsPerPage}
+            lastResultIndex={lastResultIndex}
+            onChangePage={onChangePage}
+            setNumResultsPerPage={setNumResultsPerPage}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DataJobFlowTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DataJobFlowTab.tsx
new file mode 100644
index 00000000000000..8169dd869ac911
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/DataJobFlowTab.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import { useBaseEntity } from '../../../../entity/shared/EntityContext';
+import { EntityType } from '../../../../../types.generated';
+import { EntityList } from './components/EntityList';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+
+export const DataJobFlowTab = () => {
+    const entity = useBaseEntity() as any;
+    const dataJob = entity && entity.dataJob;
+    const dataFlow = dataJob?.dataFlow;
+    const entityRegistry = useEntityRegistry();
+    const title = `Part of ${entityRegistry.getEntityName(EntityType.DataFlow)}`;
+    return <EntityList title={title} type={EntityType.DataFlow} entities={dataFlow ? [dataFlow] : []} />;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/InputFieldsTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/InputFieldsTab.tsx
new file mode 100644
index 00000000000000..a90326b3342ba3
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/InputFieldsTab.tsx
@@ -0,0 +1,61 @@
+import { Empty } from 'antd';
+import React, { useMemo, useState } from 'react';
+import styled from 'styled-components';
+import { useLocation } from 'react-router';
+import { SchemaField } from '../../../../../types.generated';
+import SchemaEditableContext from '../../../../shared/SchemaEditableContext';
+import { groupByFieldPath } from '../../../dataset/profile/schema/utils/utils';
+import { useEntityData } from '../../../../entity/shared/EntityContext';
+import { ANTD_GRAY } from '../../constants';
+import SchemaTable from '../Dataset/Schema/SchemaTable';
+import getExpandedDrawerFieldPath from '../Dataset/Schema/utils/getExpandedDrawerFieldPath';
+
+const NoSchema = styled(Empty)`
+    color: ${ANTD_GRAY[6]};
+    padding-top: 60px;
+`;
+
+const SchemaTableContainer = styled.div`
+    overflow: auto;
+    height: 100%;
+`;
+export const InputFieldsTab = () => {
+    const { entityData } = useEntityData();
+    const inputFields = entityData?.inputFields || undefined;
+    const ungroupedRows = inputFields?.fields?.map((field) => field?.schemaField) as SchemaField[];
+
+    const rows = useMemo(() => {
+        return groupByFieldPath(ungroupedRows, { showKeySchema: false });
+    }, [ungroupedRows]);
+    const location = useLocation();
+
+    const expandedDrawerFieldPathFromUrl = getExpandedDrawerFieldPath(location);
+
+    const [expandedDrawerFieldPath, setExpandedDrawerFieldPath] = useState<string | null>(
+        expandedDrawerFieldPathFromUrl,
+    );
+
+    return (
+        <>
+            <SchemaTableContainer>
+                {rows && rows.length > 0 ? (
+                    <>
+                        <SchemaEditableContext.Provider value={false}>
+                            <SchemaTable
+                                schemaMetadata={null}
+                                rows={rows}
+                                editableSchemaMetadata={null}
+                                usageStats={null}
+                                expandedDrawerFieldPath={expandedDrawerFieldPath}
+                                setExpandedDrawerFieldPath={setExpandedDrawerFieldPath}
+                                inputFields={ungroupedRows}
+                            />
+                        </SchemaEditableContext.Provider>
+                    </>
+                ) : (
+                    <NoSchema />
+                )}
+            </SchemaTableContainer>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/TabNameWithCount.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/TabNameWithCount.tsx
new file mode 100644
index 00000000000000..1476d90000d461
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/TabNameWithCount.tsx
@@ -0,0 +1,29 @@
+import { Pill } from '@src/alchemy-components';
+import { formatNumber } from '@src/app/shared/formatNumber';
+import React from 'react';
+import styled from 'styled-components';
+
+const Container = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const TabName = styled.div`
+    margin-right: 8px;
+`;
+
+type Props = {
+    name: string;
+    count: number;
+    loading: boolean;
+};
+
+const TabNameWithCount = ({ name, count = 0, loading }: Props) => {
+    return (
+        <Container>
+            <TabName>{name}</TabName>
+            {!loading && <Pill label={formatNumber(count)} size="sm" />}
+        </Container>
+    );
+};
+export default TabNameWithCount;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx
new file mode 100644
index 00000000000000..8cf54b51fda5cd
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx
@@ -0,0 +1,42 @@
+import { MockedProvider } from '@apollo/client/testing';
+import { render } from '@testing-library/react';
+import React from 'react';
+import { dataJob1, mocks } from '../../../../../../Mocks';
+import { EntityType } from '../../../../../../types.generated';
+import TestPageContainer from '../../../../../../utils/test-utils/TestPageContainer';
+import { getDataForEntityType } from '../../../containers/profile/utils';
+import { EntityContext } from '../../../../../entity/shared/EntityContext';
+import { DataJobFlowTab } from '../DataJobFlowTab';
+
+describe('DataJobFlowTab', () => {
+    it('renders fields', async () => {
+        const { getByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
+                    <EntityContext.Provider
+                        value={{
+                            urn: 'urn:li:dataJob:1',
+                            entityType: EntityType.DataJob,
+                            entityData: getDataForEntityType({
+                                data: dataJob1,
+                                entityType: EntityType.DataJob,
+                                getOverrideProperties: () => ({}),
+                            }),
+                            baseEntity: { dataJob: dataJob1 },
+                            updateEntity: vi.fn(),
+                            routeToTab: vi.fn(),
+                            refetch: vi.fn(),
+                            lineage: undefined,
+                            loading: true,
+                            dataNotCombinedWithSiblings: null,
+                        }}
+                    >
+                        <DataJobFlowTab />
+                    </EntityContext.Provider>
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+        expect(getByText('DataFlowInfoName')).toBeInTheDocument();
+        expect(getByText('DataFlowInfo1 Description')).toBeInTheDocument();
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/components/EntityList.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/components/EntityList.tsx
new file mode 100644
index 00000000000000..9e07e928be55e4
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/components/EntityList.tsx
@@ -0,0 +1,139 @@
+import React from 'react';
+import { List, Pagination, Typography } from 'antd';
+import styled from 'styled-components';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { PreviewType } from '../../../../Entity';
+import { EntityType } from '../../../../../../types.generated';
+import { SearchCfg } from '../../../../../../conf';
+import { Message } from '../../../../../shared/Message';
+
+const ScrollWrapper = styled.div`
+    overflow: auto;
+    height: 100%;
+
+    &::-webkit-scrollbar {
+        height: 12px;
+        width: 5px;
+        background: #f2f2f2;
+    }
+    &::-webkit-scrollbar-thumb {
+        background: #cccccc;
+        -webkit-border-radius: 1ex;
+        -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.75);
+    }
+`;
+
+const StyledList = styled(List)`
+    padding-left: 40px;
+    padding-right: 40px;
+    .ant-list-items > .ant-list-item {
+        padding-right: 0px;
+        padding-left: 0px;
+    }
+    > .ant-list-header {
+        padding-right: 0px;
+        padding-left: 0px;
+        font-size: 14px;
+        font-weight: 600;
+        margin-left: -20px;
+        border-bottom: none;
+        padding-bottom: 0px;
+        padding-top: 15px;
+    }
+` as typeof List;
+
+const StyledListItem = styled(List.Item)`
+    padding-top: 20px;
+`;
+
+const PaginationInfoContainer = styled.span`
+    padding: 8px;
+    padding-left: 16px;
+    border-top: 1px solid;
+    border-color: ${(props) => props.theme.styles['border-color-base']};
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+`;
+
+const StyledPagination = styled(Pagination)`
+    padding: 12px 12px 12px 12px;
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+`;
+
+const PaginationInfo = styled(Typography.Text)`
+    padding: 0px;
+    width: 20%;
+`;
+
+type EntityListProps = {
+    type: EntityType;
+    entities: Array<any>;
+    title?: string;
+    totalAssets?: number;
+    pageSize?: any;
+    page?: number;
+    lastResultIndex?: any;
+    showPagination?: boolean;
+    loading?: boolean;
+    error?: any;
+    onChangePage?: (number: any) => void;
+    setNumResultsPerPage?: (number: any) => void;
+};
+
+export const EntityList = ({
+    type,
+    entities,
+    title,
+    totalAssets,
+    pageSize,
+    page,
+    lastResultIndex,
+    showPagination = false,
+    loading = false,
+    error = undefined,
+    onChangePage,
+    setNumResultsPerPage,
+}: EntityListProps) => {
+    const entityRegistry = useEntityRegistry();
+
+    return (
+        <>
+            <ScrollWrapper>
+                <StyledList
+                    bordered
+                    dataSource={entities}
+                    header={title || `${entities.length || 0} ${entityRegistry.getCollectionName(type)}`}
+                    renderItem={(item) => (
+                        <StyledListItem>{entityRegistry.renderPreview(type, PreviewType.PREVIEW, item)}</StyledListItem>
+                    )}
+                />
+            </ScrollWrapper>
+            {loading && <Message type="loading" content="Loading..." style={{ marginTop: '10%' }} />}
+            {error && <Message type="error" content="Failed to load results! An unexpected error occurred." />}
+            {showPagination && (
+                <PaginationInfoContainer>
+                    <PaginationInfo>
+                        <b>
+                            {lastResultIndex > 0 ? ((page as number) - 1) * pageSize + 1 : 0} - {lastResultIndex}
+                        </b>{' '}
+                        of <b>{totalAssets}</b>
+                    </PaginationInfo>
+                    <StyledPagination
+                        current={page}
+                        pageSize={pageSize}
+                        total={totalAssets}
+                        showLessItems
+                        onChange={onChangePage}
+                        showSizeChanger={(totalAssets as any) > SearchCfg.RESULTS_PER_PAGE}
+                        onShowSizeChange={(_currNum, newNum) => setNumResultsPerPage?.(newNum)}
+                        pageSizeOptions={['10', '20', '50', '100']}
+                    />
+                </PaginationInfoContainer>
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx
new file mode 100644
index 00000000000000..81a9398afa418d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx
@@ -0,0 +1,49 @@
+import React from 'react';
+import { Typography } from 'antd';
+import styled from 'styled-components';
+
+import { StyledTable } from '../../../components/styled/StyledTable';
+import { ANTD_GRAY } from '../../../constants';
+import TableValueElement from './TableValueElement';
+
+type Props = {
+    payload: string | undefined | null;
+};
+
+const NameText = styled(Typography.Text)`
+    font-weight: 600;
+    font-size: 12px;
+    color: ${ANTD_GRAY[9]};
+`;
+
+export default function DynamicTabularTab({ payload: rawPayload }: Props) {
+    const aspectData = JSON.parse(rawPayload || '{}');
+    const transformedRowData = Object.keys(aspectData).map((key) => ({ key, value: aspectData[key] }));
+
+    const propertyTableColumns = [
+        {
+            width: 210,
+            title: 'Name',
+            dataIndex: 'key',
+            sorter: (a, b) => a?.key.localeCompare(b?.key || '') || 0,
+            defaultSortOrder: 'ascend',
+            render: (name: string) => <NameText>{name}</NameText>,
+        },
+        {
+            title: 'Value',
+            dataIndex: 'value',
+            render: (value: string) => <TableValueElement value={value} />,
+        },
+    ];
+
+    return (
+        <StyledTable
+            pagination={false}
+            // typescript is complaining that default sort order is not a valid column field- overriding this here
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            columns={propertyTableColumns}
+            dataSource={transformedRowData}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicTab.tsx
new file mode 100644
index 00000000000000..4af9b559a59f1e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicTab.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+import { Typography } from 'antd';
+import styled from 'styled-components';
+
+import { ANTD_GRAY } from '../../../constants';
+import DynamicTabularTab from './DynamicTabularTab';
+import DynamicPropertiesTab from './DynamicPropertiesTab';
+import { AspectRenderSpec } from '../../../../../../types.generated';
+import { StyledSyntaxHighlighter } from '../../../StyledSyntaxHighlighter';
+
+type Props = {
+    payload: string | undefined | null;
+    type: string | undefined | null;
+    renderSpec: AspectRenderSpec | undefined | null;
+};
+
+const QueryText = styled(Typography.Paragraph)`
+    margin: 20px;
+    &&& pre {
+        background-color: ${ANTD_GRAY[2]};
+        border: none;
+    }
+`;
+
+// NOTE: Yes, using `!important` is a shame. However, the SyntaxHighlighter is applying styles directly
+// to the component, so there's no way around this
+const NestedSyntax = styled(StyledSyntaxHighlighter)`
+    background-color: transparent !important;
+    border: none !important;
+`;
+
+export default function DynamicTab({ renderSpec, payload, type }: Props) {
+    if (type === 'tabular') {
+        return <DynamicTabularTab payload={payload} tableKey={renderSpec?.key} />;
+    }
+    if (type === 'properties') {
+        return <DynamicPropertiesTab payload={payload} />;
+    }
+
+    // Default fallback behavior
+    return (
+        <>
+            <QueryText>
+                <pre>
+                    <NestedSyntax language="json">{JSON.stringify(JSON.parse(payload || '{}'), null, 2)}</NestedSyntax>
+                </pre>
+            </QueryText>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicTabularTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicTabularTab.tsx
new file mode 100644
index 00000000000000..ea30dcc0b46051
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/DynamicTabularTab.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import { StyledTable } from '../../../components/styled/StyledTable';
+import TableValueElement from './TableValueElement';
+
+type Props = {
+    payload: string | undefined | null;
+    tableKey: string | undefined | null;
+};
+
+export default function DynamicTabularTab({ payload: rawPayload, tableKey }: Props) {
+    const aspectData = JSON.parse(rawPayload || '{}');
+    const rowData = tableKey ? aspectData[tableKey] : aspectData[Object.keys(aspectData)[0]];
+    const columns = Object.keys(rowData[0]).map((columnName) => ({
+        title: columnName,
+        dataIndex: columnName,
+        render: (value: any) => <TableValueElement value={value} />,
+    }));
+
+    return (
+        <StyledTable
+            pagination={false}
+            // typescript is complaining that default sort order is not a valid column field- overriding this here
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            columns={columns}
+            dataSource={rowData}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/TableValueElement.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/TableValueElement.tsx
new file mode 100644
index 00000000000000..13532d10dbe59f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Entity/weaklyTypedAspects/TableValueElement.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+
+function isValidHttpUrl(string) {
+    let url;
+
+    try {
+        url = new URL(string);
+    } catch (_) {
+        return false;
+    }
+
+    return url.protocol === 'http:' || url.protocol === 'https:';
+}
+
+export default function TableValueElement({ value }: { value: any }) {
+    if (typeof value === 'boolean') {
+        return <span>{String(value)}</span>;
+    }
+    if (typeof value === 'string') {
+        if (isValidHttpUrl(value)) {
+            return <a href={value}>{value}</a>;
+        }
+        return <span>{value}</span>;
+    }
+    if (typeof value === 'number') {
+        return <span>{value}</span>;
+    }
+    return null;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentTab.tsx
new file mode 100644
index 00000000000000..4c46eb30aac667
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentTab.tsx
@@ -0,0 +1,157 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { Button, Empty, List, Select, Typography } from 'antd';
+import { Tooltip } from '@components';
+import { PlusOutlined } from '@ant-design/icons';
+import { useGetEntityIncidentsQuery } from '../../../../../graphql/incident.generated';
+import TabToolbar from '../../components/styled/TabToolbar';
+import { useEntityContext, useEntityData } from '../../../../entity/shared/EntityContext';
+import IncidentListItem from './components/IncidentListItem';
+import { INCIDENT_DISPLAY_STATES, PAGE_SIZE, getIncidentsStatusSummary } from './incidentUtils';
+import { Incident, IncidentState } from '../../../../../types.generated';
+import { IncidentSummary } from './components/IncidentSummary';
+import { AddIncidentModal } from './components/AddIncidentModal';
+import { IncidentsLoadingSection } from './components/IncidentsLoadingSection';
+import { ANTD_GRAY } from '../../constants';
+import { combineEntityDataWithSiblings } from '../../../../entity/shared/siblingUtils';
+import { useIsSeparateSiblingsMode } from '../../useIsSeparateSiblingsMode';
+
+const Header = styled.div`
+    border-bottom: 1px solid ${ANTD_GRAY[3]};
+    box-shadow: ${(props) => props.theme.styles['box-shadow']};
+`;
+
+const Summary = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+`;
+
+const IncidentList = styled.div`
+    flex: 1;
+    height: 100%;
+    overflow: scroll;
+`;
+
+const IncidentStyledList = styled(List)`
+    &&& {
+        width: 100%;
+        border-color: ${(props) => props.theme.styles['border-color-base']};
+        flex: 1;
+    }
+`;
+
+const IncidentStateSelect = styled(Select)`
+    width: 100px;
+    margin: 0px 40px;
+`;
+
+export const IncidentTab = () => {
+    const { refetch: refetchEntity } = useEntityContext();
+    const { urn, entityType } = useEntityData();
+    const incidentStates = INCIDENT_DISPLAY_STATES;
+    const [selectedIncidentState, setSelectedIncidentState] = useState<IncidentState | undefined>(IncidentState.Active);
+    const [isRaiseIncidentModalVisible, setIsRaiseIncidentModalVisible] = useState(false);
+    const isSeparateSiblingsMode = useIsSeparateSiblingsMode();
+
+    // Fetch filtered incidents.
+    const { loading, data, refetch } = useGetEntityIncidentsQuery({
+        variables: {
+            urn,
+            start: 0,
+            count: PAGE_SIZE,
+        },
+        fetchPolicy: 'cache-first',
+    });
+
+    const hasData = (data?.entity as any)?.incidents;
+    const combinedData = isSeparateSiblingsMode ? data : combineEntityDataWithSiblings(data);
+    const allIncidents =
+        (combinedData && (combinedData as any).entity?.incidents?.incidents?.map((incident) => incident as Incident)) ||
+        [];
+    const filteredIncidents = allIncidents.filter(
+        (incident) => !selectedIncidentState || incident.status?.state === selectedIncidentState,
+    );
+    const incidentList = filteredIncidents?.map((incident) => ({
+        urn: incident?.urn,
+        created: incident.created,
+        customType: incident.customType,
+        description: incident.description,
+        status: incident.status,
+        type: incident?.incidentType,
+        title: incident?.title,
+    }));
+
+    const canEditIncidents = (data?.entity as any)?.privileges?.canEditIncidents || false;
+
+    function handleRefetch() {
+        refetch();
+        refetchEntity();
+    }
+
+    return (
+        <>
+            <Header>
+                <TabToolbar>
+                    <Tooltip
+                        showArrow={false}
+                        title={!canEditIncidents && 'You do not have permission to create an incidents for this asset'}
+                    >
+                        <Button
+                            icon={<PlusOutlined />}
+                            onClick={() => canEditIncidents && setIsRaiseIncidentModalVisible(true)}
+                            type="text"
+                            disabled={!canEditIncidents}
+                        >
+                            Raise Incident
+                        </Button>
+                        <AddIncidentModal
+                            urn={urn}
+                            entityType={entityType}
+                            refetch={handleRefetch}
+                            visible={isRaiseIncidentModalVisible}
+                            onClose={() => setIsRaiseIncidentModalVisible(false)}
+                        />
+                    </Tooltip>
+                </TabToolbar>
+                <Summary>
+                    <IncidentSummary summary={getIncidentsStatusSummary(allIncidents)} />
+                    <IncidentStateSelect
+                        value={selectedIncidentState}
+                        onChange={(newState: any) => setSelectedIncidentState(newState)}
+                        autoFocus
+                    >
+                        {incidentStates.map((incidentType) => {
+                            return (
+                                <Select.Option key={incidentType.type} value={incidentType.type}>
+                                    <Typography.Text>{incidentType.name}</Typography.Text>
+                                </Select.Option>
+                            );
+                        })}
+                    </IncidentStateSelect>
+                </Summary>
+            </Header>
+
+            {(loading && !hasData && <IncidentsLoadingSection />) || null}
+            {hasData && (
+                <IncidentList>
+                    <IncidentStyledList
+                        bordered
+                        locale={{
+                            emptyText: (
+                                <Empty
+                                    description={`No${
+                                        selectedIncidentState ? ` ${selectedIncidentState.toLocaleLowerCase()} ` : ''
+                                    } incidents`}
+                                    image={Empty.PRESENTED_IMAGE_SIMPLE}
+                                />
+                            ),
+                        }}
+                        dataSource={incidentList}
+                        renderItem={(item: any) => <IncidentListItem refetch={refetch} incident={item} />}
+                    />
+                </IncidentList>
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/AddIncidentModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/AddIncidentModal.tsx
new file mode 100644
index 00000000000000..d15b7ab486bc44
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/AddIncidentModal.tsx
@@ -0,0 +1,202 @@
+import React, { useState } from 'react';
+import { message, Modal, Button, Form, Input, Typography, Select } from 'antd';
+import { useApolloClient } from '@apollo/client';
+import styled from 'styled-components';
+import { Editor } from '@src/app/entity/shared/tabs/Documentation/components/editor/Editor';
+import { ANTD_GRAY } from '@src/app/entity/shared/constants';
+import analytics, { EventType, EntityActionType } from '../../../../../analytics';
+import { EntityType, IncidentSourceType, IncidentState, IncidentType } from '../../../../../../types.generated';
+import { INCIDENT_DISPLAY_TYPES, PAGE_SIZE, addActiveIncidentToCache } from '../incidentUtils';
+import { useRaiseIncidentMutation } from '../../../../../../graphql/mutations.generated';
+import handleGraphQLError from '../../../../../shared/handleGraphQLError';
+import { useUserContext } from '../../../../../context/useUserContext';
+
+const StyledEditor = styled(Editor)`
+    border: 1px solid ${ANTD_GRAY[4.5]};
+`;
+
+type AddIncidentProps = {
+    urn: string;
+    entityType: EntityType;
+    visible: boolean;
+    onClose?: () => void;
+    refetch?: () => void;
+};
+
+export const AddIncidentModal = ({ urn, entityType, visible, onClose, refetch }: AddIncidentProps) => {
+    const { user } = useUserContext();
+    const incidentTypes = INCIDENT_DISPLAY_TYPES;
+    const [selectedIncidentType, setSelectedIncidentType] = useState<IncidentType>(IncidentType.Operational);
+    const [isOtherTypeSelected, setIsOtherTypeSelected] = useState<boolean>(false);
+    const [raiseIncidentMutation] = useRaiseIncidentMutation();
+
+    const client = useApolloClient();
+    const [form] = Form.useForm();
+
+    const handleClose = () => {
+        form.resetFields();
+        setIsOtherTypeSelected(false);
+        setSelectedIncidentType(IncidentType.Operational);
+        onClose?.();
+    };
+
+    const onSelectIncidentType = (newType) => {
+        if (newType === 'OTHER') {
+            setIsOtherTypeSelected(true);
+            setSelectedIncidentType(IncidentType.Custom);
+        } else {
+            setIsOtherTypeSelected(false);
+            setSelectedIncidentType(newType);
+        }
+    };
+
+    const handleAddIncident = async (formData: any) => {
+        raiseIncidentMutation({
+            variables: {
+                input: {
+                    type: selectedIncidentType,
+                    title: formData.title,
+                    description: formData.description,
+                    resourceUrn: urn,
+                    customType: formData.customType,
+                },
+            },
+        })
+            .then(({ data }) => {
+                const newIncident = {
+                    urn: data?.raiseIncident,
+                    type: EntityType.Incident,
+                    incidentType: selectedIncidentType,
+                    customType: formData.customType || null,
+                    title: formData.title,
+                    description: formData.description,
+                    startedAt: null,
+                    tags: null,
+                    status: {
+                        state: IncidentState.Active,
+                        message: null,
+                        lastUpdated: {
+                            __typename: 'AuditStamp',
+                            time: Date.now(),
+                            actor: user?.urn,
+                        },
+                    },
+                    source: {
+                        type: IncidentSourceType.Manual,
+                    },
+                    created: {
+                        time: Date.now(),
+                        actor: user?.urn,
+                    },
+                };
+                message.success({ content: 'Incident Added', duration: 2 });
+                analytics.event({
+                    type: EventType.EntityActionEvent,
+                    entityType,
+                    entityUrn: urn,
+                    actionType: EntityActionType.AddIncident,
+                });
+                addActiveIncidentToCache(client, urn, newIncident, PAGE_SIZE);
+                handleClose();
+                setTimeout(() => {
+                    refetch?.();
+                }, 2000);
+            })
+            .catch((error) => {
+                console.error(error);
+                handleGraphQLError({
+                    error,
+                    defaultMessage: 'Failed to raise incident! An unexpected error occurred',
+                    permissionMessage:
+                        'Unauthorized to raise incident for this asset. Please contact your DataHub administrator.',
+                });
+            });
+    };
+
+    return (
+        <>
+            <Modal
+                title="Raise Incident"
+                visible={visible}
+                destroyOnClose
+                onCancel={handleClose}
+                width={600}
+                footer={[
+                    <Button type="text" onClick={handleClose}>
+                        Cancel
+                    </Button>,
+                    <Button type="primary" form="addIncidentForm" key="submit" htmlType="submit">
+                        Raise
+                    </Button>,
+                ]}
+            >
+                <Form form={form} name="addIncidentForm" onFinish={handleAddIncident} layout="vertical">
+                    <Form.Item label={<Typography.Text strong>Type</Typography.Text>}>
+                        <Form.Item name="type" style={{ marginBottom: '0px' }}>
+                            <Select
+                                value={selectedIncidentType}
+                                onChange={onSelectIncidentType}
+                                defaultValue={IncidentType.Operational}
+                                autoFocus
+                            >
+                                {incidentTypes.map((incidentType) => (
+                                    <Select.Option key={incidentType.type} value={incidentType.type}>
+                                        <Typography.Text>{incidentType.name}</Typography.Text>
+                                    </Select.Option>
+                                ))}
+                            </Select>
+                        </Form.Item>
+                    </Form.Item>
+                    {isOtherTypeSelected && (
+                        <Form.Item
+                            name="customType"
+                            label="Custom Type"
+                            rules={[
+                                {
+                                    required: selectedIncidentType === IncidentType.Custom,
+                                    message: 'A custom type is required.',
+                                },
+                            ]}
+                        >
+                            <Input placeholder="Freshness" />
+                        </Form.Item>
+                    )}
+                    <Form.Item
+                        name="title"
+                        label="Title"
+                        rules={[
+                            {
+                                required: true,
+                                message: 'A title is required.',
+                            },
+                        ]}
+                    >
+                        <Input placeholder="What went wrong?" />
+                    </Form.Item>
+                    <Form.Item
+                        name="description"
+                        label="Description"
+                        rules={[
+                            {
+                                required: true,
+                                message: 'A description is required.',
+                            },
+                        ]}
+                    >
+                        <StyledEditor
+                            doNotFocus
+                            className="add-incident-description"
+                            onKeyDown={(e) => {
+                                // Preventing the modal from closing when the Enter key is pressed
+                                if (e.key === 'Enter') {
+                                    e.preventDefault();
+                                    e.stopPropagation();
+                                }
+                            }}
+                        />
+                    </Form.Item>
+                </Form>
+            </Modal>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentListItem.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentListItem.tsx
new file mode 100644
index 00000000000000..2875ada2cdd76f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentListItem.tsx
@@ -0,0 +1,330 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { Button, Dropdown, List, Menu, message, Tag, Typography } from 'antd';
+import { Tooltip, Popover } from '@components';
+import { CheckCircleFilled, CheckOutlined, MoreOutlined, WarningFilled } from '@ant-design/icons';
+import { Link } from 'react-router-dom';
+import { EntityType, IncidentState, IncidentType } from '../../../../../../types.generated';
+import { FAILURE_COLOR_HEX, getNameFromType, SUCCESS_COLOR_HEX } from '../incidentUtils';
+import { useGetUserQuery } from '../../../../../../graphql/user.generated';
+import { useEntityRegistry } from '../../../../../useEntityRegistry';
+import { toLocalDateTimeString, toRelativeTimeString } from '../../../../../shared/time/timeUtils';
+import { useEntityData, useRefetch } from '../../../../../entity/shared/EntityContext';
+import analytics, { EntityActionType, EventType } from '../../../../../analytics';
+import { useUpdateIncidentStatusMutation } from '../../../../../../graphql/mutations.generated';
+import { ResolveIncidentModal } from './ResolveIncidentModal';
+import handleGraphQLError from '../../../../../shared/handleGraphQLError';
+import CompactMarkdownViewer from '../../Documentation/components/CompactMarkdownViewer';
+
+type Props = {
+    incident: any;
+    refetch?: () => Promise<any>;
+};
+
+const IncidentListContainer = styled(List.Item)`
+    padding-top: 20px;
+    padding-bottom: 20px;
+`;
+
+const IncidentItemContainer = styled.div`
+    display: flex;
+    justify-content: space-between;
+    padding-left: 8px;
+    padding-right: 8px;
+    width: 100%;
+`;
+
+const IncidentHeaderContainer = styled.div`
+    display: flex;
+    justify-content: left;
+    align-items: center;
+`;
+
+const DescriptionContainer = styled.div`
+    margin-top: 8px;
+`;
+
+const TitleContainer = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const IncidentTitle = styled(Typography.Text)`
+    font-size: 14px;
+    font-weight: 700;
+    margin-right: 16px;
+    color: #000000;
+    line-height: 22px;
+    text-align: justify;
+    max-width: 500px;
+`;
+
+const IncidentTypeTag = styled(Tag)`
+    width: auto;
+    height: 26px;
+    text-align: center;
+    font-weight: 500;
+    font-size: 12px;
+    line-height: 20px;
+    color: #262626;
+    padding: 2px 15px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 500px;
+`;
+
+const IncidentDescriptionText = styled(Typography.Text)`
+    max-width: 500px;
+    font-weight: 500;
+    font-size: 12px;
+    line-height: 20px;
+    color: #262626;
+    display: block;
+    word-wrap: break-word;
+    white-space: normal;
+    text-align: justify;
+`;
+
+const IncidentDescriptionLabel = styled(Typography.Text)`
+    margin-top: 4px;
+    font-weight: 400;
+    font-size: 10px;
+    color: #8c8c8c;
+    display: block;
+    word-wrap: break-word;
+    white-space: normal;
+    text-align: justify;
+`;
+
+const IncidentCreatedTime = styled(Typography.Text)`
+    font-weight: 500;
+    font-size: 10px;
+    line-height: 20px;
+    color: #8c8c8c;
+`;
+
+const IncidentResolvedText = styled(Typography.Text)`
+    font-weight: 500;
+    font-size: 12px;
+    line-height: 20px;
+    color: #8c8c8c;
+`;
+
+const IncidentResolvedTextContainer = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const IncidentResolvedContainer = styled.div`
+    display: flex;
+    align-items: center;
+    margin-right: 30px;
+`;
+
+const IncidentResolvedButton = styled(Button)`
+    background: #ffffff;
+    border: 1px solid #d9d9d9;
+    box-sizing: border-box;
+    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.1);
+    border-radius: 5px;
+    color: #262626;
+    font-weight: 500;
+    font-size: 12px;
+    line-height: 20px;
+`;
+
+const MenuIcon = styled(MoreOutlined)`
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 25px;
+    height: 28px;
+    margin-left: 5px;
+`;
+
+const MenuItem = styled.div`
+    font-size: 12px;
+    padding-left: 12px;
+    padding-right: 12px;
+    color: rgba(0, 0, 0, 0.85);
+`;
+
+export default function IncidentListItem({ incident, refetch }: Props) {
+    const { entityType } = useEntityData();
+    const refetchEntity = useRefetch();
+    const entityRegistry = useEntityRegistry();
+    const [updateIncidentStatusMutation] = useUpdateIncidentStatusMutation();
+    const [isResolvedModalVisible, setIsResolvedModalVisible] = useState(false);
+
+    // Fetching the most recent actor's data.
+    const { data: createdActor } = useGetUserQuery({
+        variables: { urn: incident.created.actor, groupsCount: 0 },
+        fetchPolicy: 'cache-first',
+    });
+    const { data: lastUpdatedActor } = useGetUserQuery({
+        variables: { urn: incident.status.lastUpdated.actor, groupsCount: 0 },
+        fetchPolicy: 'cache-first',
+    });
+
+    // Converting the created time into UTC
+    const createdDate = incident.created.time && new Date(incident.created.time);
+    const lastModifiedDate = incident.status.lastUpdated.time && new Date(incident.status.lastUpdated.time);
+
+    // Updating the incident status on button click
+    const updateIncidentStatus = (state: IncidentState, resolvedMessage: string) => {
+        message.loading({ content: 'Updating...' });
+        updateIncidentStatusMutation({
+            variables: { urn: incident.urn, input: { state, message: resolvedMessage } },
+        })
+            .then(() => {
+                message.destroy();
+                analytics.event({
+                    type: EventType.EntityActionEvent,
+                    entityType,
+                    entityUrn: incident.urn,
+                    actionType: EntityActionType.ResolvedIncident,
+                });
+                message.success({ content: 'Incident updated!', duration: 2 });
+                setTimeout(() => {
+                    refetchEntity?.();
+                }, 3000);
+                refetch?.();
+                setIsResolvedModalVisible(false);
+            })
+            .catch((error) => {
+                handleGraphQLError({
+                    error,
+                    defaultMessage: 'Failed to update incident! An unexpected error occurred',
+                    permissionMessage:
+                        'Unauthorized to update incident for this asset. Please contact your DataHub administrator.',
+                });
+            });
+    };
+
+    // Handle the Resolved Modal visibility
+    const handleResolved = () => {
+        setIsResolvedModalVisible(!isResolvedModalVisible);
+    };
+
+    const menu = (
+        <Menu>
+            <Menu.Item key="0">
+                <MenuItem onClick={() => updateIncidentStatus(IncidentState.Active, '')} data-testid="reopen-incident">
+                    Reopen incident
+                </MenuItem>
+            </Menu.Item>
+        </Menu>
+    );
+
+    return (
+        <>
+            <IncidentListContainer>
+                <IncidentItemContainer>
+                    <IncidentHeaderContainer>
+                        <div>
+                            <TitleContainer>
+                                <IncidentTitle>{incident.title}</IncidentTitle>
+                                <IncidentTypeTag>
+                                    {incident.type === IncidentType.Custom
+                                        ? incident.customType
+                                        : getNameFromType(incident.type)}
+                                </IncidentTypeTag>
+                            </TitleContainer>
+                            <DescriptionContainer>
+                                <IncidentDescriptionLabel>Description</IncidentDescriptionLabel>
+                                <CompactMarkdownViewer content={incident?.description} />
+                                {incident.status.state === IncidentState.Resolved ? (
+                                    <>
+                                        <IncidentDescriptionLabel>Resolution Note</IncidentDescriptionLabel>
+                                        <IncidentDescriptionText>
+                                            {incident?.status.message || 'No additional details'}
+                                        </IncidentDescriptionText>
+                                    </>
+                                ) : null}
+                            </DescriptionContainer>
+                            <DescriptionContainer>
+                                <Tooltip placement="right" showArrow={false} title={toLocalDateTimeString(createdDate)}>
+                                    <IncidentCreatedTime>
+                                        Created {toRelativeTimeString(createdDate)} by{' '}
+                                    </IncidentCreatedTime>
+                                </Tooltip>
+                                {createdActor?.corpUser && (
+                                    <Link
+                                        to={entityRegistry.getEntityUrl(
+                                            EntityType.CorpUser,
+                                            createdActor?.corpUser?.urn,
+                                        )}
+                                    >
+                                        {entityRegistry.getDisplayName(EntityType.CorpUser, createdActor?.corpUser)}
+                                    </Link>
+                                )}
+                            </DescriptionContainer>
+                        </div>
+                    </IncidentHeaderContainer>
+                    {incident.status.state === IncidentState.Resolved ? (
+                        <IncidentResolvedTextContainer>
+                            <Popover
+                                overlayStyle={{ maxWidth: 240 }}
+                                placement="left"
+                                title={<Typography.Text strong>Note</Typography.Text>}
+                                content={
+                                    incident?.status.message === null ? (
+                                        <Typography.Text type="secondary">No additional details</Typography.Text>
+                                    ) : (
+                                        <Typography.Text type="secondary">{incident?.status.message}</Typography.Text>
+                                    )
+                                }
+                            >
+                                <IncidentResolvedText>
+                                    {incident?.status.lastUpdated && (
+                                        <Tooltip showArrow={false} title={toLocalDateTimeString(lastModifiedDate)}>
+                                            Resolved {toRelativeTimeString(lastModifiedDate)} by{' '}
+                                        </Tooltip>
+                                    )}
+                                    {lastUpdatedActor?.corpUser && (
+                                        <Link
+                                            to={entityRegistry.getEntityUrl(
+                                                EntityType.CorpUser,
+                                                lastUpdatedActor?.corpUser?.urn,
+                                            )}
+                                        >
+                                            {entityRegistry.getDisplayName(
+                                                EntityType.CorpUser,
+                                                lastUpdatedActor?.corpUser,
+                                            )}
+                                        </Link>
+                                    )}
+                                </IncidentResolvedText>
+                            </Popover>
+                            <CheckCircleFilled
+                                style={{ fontSize: '28px', color: SUCCESS_COLOR_HEX, marginLeft: '16px' }}
+                            />
+                            <Dropdown overlay={menu} trigger={['click']}>
+                                <MenuIcon data-testid="incident-menu" />
+                            </Dropdown>
+                        </IncidentResolvedTextContainer>
+                    ) : (
+                        <IncidentResolvedContainer>
+                            <IncidentResolvedButton
+                                icon={<CheckOutlined />}
+                                onClick={() => handleResolved()}
+                                data-testid="resolve-incident"
+                            >
+                                Resolve
+                            </IncidentResolvedButton>
+                            <WarningFilled style={{ fontSize: '28px', marginLeft: '16px', color: FAILURE_COLOR_HEX }} />
+                        </IncidentResolvedContainer>
+                    )}
+                </IncidentItemContainer>
+            </IncidentListContainer>
+            {isResolvedModalVisible && (
+                <ResolveIncidentModal
+                    handleResolved={handleResolved}
+                    isResolvedModalVisible={isResolvedModalVisible}
+                    updateIncidentStatus={updateIncidentStatus}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentSummary.tsx
new file mode 100644
index 00000000000000..deea514aa6a4c1
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentSummary.tsx
@@ -0,0 +1,86 @@
+import React from 'react';
+import { CheckCircleFilled, WarningFilled, StopOutlined } from '@ant-design/icons';
+import { Typography } from 'antd';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../constants';
+import { SUCCESS_COLOR_HEX, FAILURE_COLOR_HEX } from '../incidentUtils';
+
+const SummaryHeader = styled.div`
+    width: 100%;
+    height: 80px;
+    padding-left: 40px;
+    padding-top: 0px;
+    display: flex;
+    align-items: center;
+    padding-top: 20px;
+    padding-bottom: 20px;
+`;
+
+const SummaryContainer = styled.div``;
+
+const SummaryMessage = styled.div`
+    display: inline-block;
+    margin-left: 20px;
+`;
+
+const SummaryTitle = styled(Typography.Title)`
+    && {
+        padding-bottom: 0px;
+        margin-bottom: 0px;
+    }
+`;
+
+export type IncidentsSummary = {
+    totalIncident: number;
+    resolvedIncident: number;
+    activeIncident: number;
+};
+
+type Props = {
+    summary: IncidentsSummary;
+};
+
+const getSummaryIcon = (summary: IncidentsSummary) => {
+    if (summary.totalIncident === 0) {
+        return <StopOutlined style={{ color: ANTD_GRAY[6], fontSize: 28 }} />;
+    }
+    if (summary.resolvedIncident === summary.totalIncident) {
+        return <CheckCircleFilled style={{ color: SUCCESS_COLOR_HEX, fontSize: 28 }} />;
+    }
+    return <WarningFilled style={{ color: FAILURE_COLOR_HEX, fontSize: 28 }} />;
+};
+
+const getSummaryMessage = (summary: IncidentsSummary) => {
+    if (summary.totalIncident === 0) {
+        return 'No incidents have been raised';
+    }
+    if (summary.resolvedIncident === summary.totalIncident) {
+        return 'There are no active incidents';
+    }
+    if (summary.activeIncident === 1) {
+        return `There is ${summary.activeIncident} active incident`;
+    }
+    if (summary.activeIncident > 1) {
+        return `There are ${summary.activeIncident} active incidents`;
+    }
+    return null;
+};
+
+export const IncidentSummary = ({ summary }: Props) => {
+    const summaryIcon = getSummaryIcon(summary);
+    const summaryMessage = getSummaryMessage(summary);
+    const subtitleMessage = `${summary.activeIncident} active incidents, ${summary.resolvedIncident} resolved incidents`;
+    return (
+        <SummaryHeader>
+            <SummaryContainer>
+                <div style={{ display: 'flex', alignItems: 'center' }}>
+                    {summaryIcon}
+                    <SummaryMessage>
+                        <SummaryTitle level={5}>{summaryMessage}</SummaryTitle>
+                        <Typography.Text type="secondary">{subtitleMessage}</Typography.Text>
+                    </SummaryMessage>
+                </div>
+            </SummaryContainer>
+        </SummaryHeader>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentsLoadingSection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentsLoadingSection.tsx
new file mode 100644
index 00000000000000..fd5d31ac9e9819
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentsLoadingSection.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import { Divider, Skeleton } from 'antd';
+import styled from 'styled-components';
+
+const Container = styled.div`
+    display: flex;
+    flex-direction: column;
+    justify-content: start;
+    gap: 12px;
+    margin-top: 20px;
+`;
+
+const CardWrapper = styled.div`
+    padding: 0px 40px;
+`;
+
+const CardSkeleton = styled(Skeleton.Input)`
+    && {
+        padding: 0px 20px 20px 0px;
+        height: 100px;
+        border-radius: 8px;
+        width: 100%;
+    }
+`;
+
+export const IncidentsLoadingSection = () => {
+    return (
+        <Container>
+            <CardWrapper>
+                <CardSkeleton active size="large" />
+            </CardWrapper>
+            <Divider />
+            <CardWrapper>
+                <CardSkeleton active size="large" />
+            </CardWrapper>
+            <Divider />
+            <CardWrapper>
+                <CardSkeleton active size="large" />
+            </CardWrapper>
+            <Divider />
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/ResolveIncidentModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/ResolveIncidentModal.tsx
new file mode 100644
index 00000000000000..b915ef0a76a3f9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/ResolveIncidentModal.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+import { Modal, Button, Form, Input } from 'antd';
+import { IncidentState } from '../../../../../../types.generated';
+
+const { TextArea } = Input;
+
+type AddIncidentProps = {
+    handleResolved: () => void;
+    isResolvedModalVisible: boolean;
+    updateIncidentStatus: (state: IncidentState, resolvedMessage: string) => void;
+};
+
+export const ResolveIncidentModal = ({
+    handleResolved,
+    isResolvedModalVisible,
+    updateIncidentStatus,
+}: AddIncidentProps) => {
+    const [form] = Form.useForm();
+
+    const handleClose = () => {
+        form.resetFields();
+        handleResolved();
+    };
+
+    const onResolvedIncident = (formData: any) => {
+        updateIncidentStatus(IncidentState.Resolved, formData.message);
+        handleClose();
+    };
+
+    return (
+        <>
+            <Modal
+                title="Resolve Incident"
+                visible={isResolvedModalVisible}
+                destroyOnClose
+                onCancel={handleClose}
+                footer={[
+                    <Button type="text" onClick={handleClose}>
+                        Cancel
+                    </Button>,
+                    <Button form="resolveIncidentForm" key="submit" htmlType="submit" data-testid="confirm-resolve">
+                        Resolve
+                    </Button>,
+                ]}
+            >
+                <Form form={form} name="resolveIncidentForm" onFinish={onResolvedIncident} layout="vertical">
+                    <Form.Item name="message" label="Note (optional)">
+                        <TextArea rows={4} />
+                    </Form.Item>
+                </Form>
+            </Modal>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/incidentUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/incidentUtils.ts
new file mode 100644
index 00000000000000..69ca1874f269d9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/incidentUtils.ts
@@ -0,0 +1,143 @@
+import { GetEntityIncidentsDocument } from '../../../../../graphql/incident.generated';
+
+import { IncidentType, IncidentState, Incident } from '../../../../../types.generated';
+
+export const PAGE_SIZE = 100;
+
+export const INCIDENT_DISPLAY_TYPES = [
+    {
+        type: IncidentType.Operational,
+        name: 'Operational',
+    },
+    {
+        type: 'OTHER',
+        name: 'Custom',
+    },
+];
+
+export const INCIDENT_DISPLAY_STATES = [
+    {
+        type: undefined,
+        name: 'All',
+    },
+    {
+        type: IncidentState.Active,
+        name: 'Active',
+    },
+    {
+        type: IncidentState.Resolved,
+        name: 'Resolved',
+    },
+];
+
+const incidentTypeToDetails = new Map();
+INCIDENT_DISPLAY_TYPES.forEach((incidentDetails) => {
+    incidentTypeToDetails.set(incidentDetails.type, incidentDetails);
+});
+
+export const getNameFromType = (type: IncidentType) => {
+    return incidentTypeToDetails.get(type)?.name || type;
+};
+
+export const SUCCESS_COLOR_HEX = '#52C41A';
+export const FAILURE_COLOR_HEX = '#F5222D';
+export const WARNING_COLOR_HEX = '#FA8C16';
+
+// apollo caching
+export const addOrUpdateIncidentInList = (existingIncidents, newIncidents) => {
+    const incidents = [...existingIncidents];
+    let didUpdate = false;
+    const updatedIncidents = incidents.map((incident) => {
+        if (incident.urn === newIncidents.urn) {
+            didUpdate = true;
+            return newIncidents;
+        }
+        return { incident, siblings: null };
+    });
+    return didUpdate ? updatedIncidents : [newIncidents, ...existingIncidents];
+};
+
+/**
+ * Add an entry to the ListIncident cache.
+ */
+export const updateListIncidentsCache = (client, urn, incident, pageSize) => {
+    // Read the data from our cache for this query.
+    const currData: any = client.readQuery({
+        query: GetEntityIncidentsDocument,
+        variables: {
+            urn,
+            start: 0,
+            count: pageSize,
+        },
+    });
+
+    if (!currData) {
+        return;
+    }
+
+    // Add our new incidents into the existing list.
+    const existingIncidents = [...(currData?.entity?.incidents?.incidents || [])];
+    const newIncidents = addOrUpdateIncidentInList(existingIncidents, incident);
+    const didAddIncident = newIncidents.length > existingIncidents.length;
+
+    // Write our data back to the cache.
+    client.writeQuery({
+        query: GetEntityIncidentsDocument,
+        variables: {
+            urn,
+            start: 0,
+            count: pageSize,
+        },
+        data: {
+            entity: {
+                ...currData?.entity,
+                incidents: {
+                    __typename: 'EntityIncidentsResult',
+                    start: 0,
+                    count: didAddIncident
+                        ? (currData?.entity?.incidents?.count || 0) + 1
+                        : currData?.entity?.incidents?.count,
+                    total: didAddIncident
+                        ? (currData?.entity?.incidents?.total || 0) + 1
+                        : currData?.entity?.incidents?.total,
+                    incidents: newIncidents,
+                },
+                // Add the missing 'siblings' field with the appropriate data
+                siblings: currData?.entity?.siblings || null,
+                siblingsSearch: currData?.entity?.siblingsSearch || null,
+            },
+        },
+    });
+};
+
+/**
+ * Returns a status summary for the incidents
+ */
+export const getIncidentsStatusSummary = (incidents: Array<Incident>) => {
+    const summary = {
+        resolvedIncident: 0,
+        activeIncident: 0,
+        totalIncident: 0,
+    };
+    incidents.forEach((assertion) => {
+        if (incidents.length) {
+            const resultType = assertion.status.state;
+            if (IncidentState.Active === resultType) {
+                summary.activeIncident++;
+            }
+            if (IncidentState.Resolved === resultType) {
+                summary.resolvedIncident++;
+            }
+            summary.totalIncident++;
+        }
+    });
+    return summary;
+};
+
+/**
+ * Add raised incident to cache
+ */
+export const addActiveIncidentToCache = (client, urn, incident, pageSize) => {
+    // Add to active and overall list
+    updateListIncidentsCache(client, urn, incident, pageSize);
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ColumnLineageSelect.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ColumnLineageSelect.tsx
new file mode 100644
index 00000000000000..e6032f7db074c0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ColumnLineageSelect.tsx
@@ -0,0 +1,113 @@
+import * as React from 'react';
+import { Button, Select } from 'antd';
+import { Tooltip } from '@components';
+import { CaretDownOutlined } from '@ant-design/icons';
+import styled from 'styled-components/macro';
+import { blue } from '@ant-design/colors';
+import { useHistory, useLocation } from 'react-router';
+import { ImpactAnalysisIcon } from '../Dataset/Schema/components/MenuColumn';
+import updateQueryParams from '../../../../shared/updateQueryParams';
+import { downgradeV2FieldPath } from '../../../dataset/profile/schema/utils/utils';
+import { useEntityData } from '../../../../entity/shared/EntityContext';
+import { useGetEntityWithSchema } from '../Dataset/Schema/useGetEntitySchema';
+
+const StyledSelect = styled(Select)`
+    margin-right: 5px;
+    min-width: 140px;
+    max-width: 200px;
+`;
+
+const StyledButton = styled(Button)<{ $isSelected: boolean }>`
+    transition: color 0s;
+    display: flex;
+    align-items: center;
+
+    ${(props) =>
+        props.$isSelected &&
+        `
+        color: ${blue[5]};
+        &:focus, &:hover {
+            color: ${blue[5]};
+        }
+    `};
+`;
+
+const TextWrapper = styled.span`
+    margin-left: 8px;
+`;
+
+interface Props {
+    selectedColumn?: string;
+    isColumnLevelLineage: boolean;
+    setSelectedColumn: (column: any) => void;
+    setIsColumnLevelLineage: (isShowing: boolean) => void;
+}
+
+export default function ColumnsLineageSelect({
+    selectedColumn,
+    isColumnLevelLineage,
+    setSelectedColumn,
+    setIsColumnLevelLineage,
+}: Props) {
+    const { entityData } = useEntityData();
+    const location = useLocation();
+    const history = useHistory();
+    const { entityWithSchema } = useGetEntityWithSchema();
+
+    function selectColumn(column: any) {
+        updateQueryParams({ column }, location, history);
+        setSelectedColumn(column);
+    }
+
+    const columnButtonTooltip = isColumnLevelLineage ? 'Hide column level lineage' : 'Show column level lineage';
+
+    return (
+        <>
+            {isColumnLevelLineage && (
+                <StyledSelect
+                    value={selectedColumn}
+                    onChange={selectColumn}
+                    showSearch
+                    allowClear
+                    placeholder="Select column"
+                >
+                    {entityWithSchema?.schemaMetadata?.fields.map((field) => {
+                        const fieldPath = downgradeV2FieldPath(field.fieldPath);
+                        return (
+                            <Select.Option value={field.fieldPath}>
+                                <Tooltip title={fieldPath} showArrow={false}>
+                                    {fieldPath}
+                                </Tooltip>
+                            </Select.Option>
+                        );
+                    })}
+                    {entityData?.inputFields?.fields?.map((field, idx) => {
+                        const fieldPath = downgradeV2FieldPath(field?.schemaField?.fieldPath);
+                        const key = `${field?.schemaField?.fieldPath}-${idx}`;
+                        return (
+                            <Select.Option key={key} value={field?.schemaField?.fieldPath || ''}>
+                                <Tooltip title={fieldPath} showArrow={false}>
+                                    {fieldPath}
+                                </Tooltip>
+                            </Select.Option>
+                        );
+                    })}
+                </StyledSelect>
+            )}
+            <Tooltip title={columnButtonTooltip} showArrow={false}>
+                <StyledButton
+                    type="text"
+                    onClick={() => setIsColumnLevelLineage(!isColumnLevelLineage)}
+                    data-testid="column-lineage-toggle"
+                    $isSelected={isColumnLevelLineage}
+                >
+                    <ImpactAnalysisIcon />
+                    <TextWrapper>
+                        <b>Column Lineage</b>
+                        <CaretDownOutlined style={{ fontSize: '10px', marginLeft: 4 }} />
+                    </TextWrapper>
+                </StyledButton>
+            </Tooltip>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/CompactLineageTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/CompactLineageTab.tsx
new file mode 100644
index 00000000000000..1da9a6f21d5cb2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/CompactLineageTab.tsx
@@ -0,0 +1,253 @@
+import { ArrowDownOutlined, ArrowUpOutlined, SearchOutlined } from '@ant-design/icons';
+import { useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils';
+import { Button, Divider } from 'antd';
+import { Tooltip } from '@components';
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components/macro';
+import { LineageDirection } from '../../../../../types.generated';
+import { UnionType } from '../../../../search/utils/constants';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+import { useEntityData } from '../../../../entity/shared/EntityContext';
+import { ANTD_GRAY, SEARCH_COLORS } from '../../constants';
+import { ImpactAnalysis } from './ImpactAnalysis';
+import { LineageTabContext } from './LineageTabContext';
+
+// Unfortunately, we have to artificially bound the height.
+// Accounts for search bar, controls header, and padding.
+const Container = styled.div`
+    flex: 1;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+`;
+
+const LineageButton = styled(Button)<{ $isSelected: boolean }>`
+    &&& {
+        background-color: ${(props) => (props.$isSelected ? SEARCH_COLORS.TITLE_PURPLE : 'none')};
+        color: ${(props) => (props.$isSelected ? '#ffffff' : ANTD_GRAY[7])};
+        border-radius: 8px;
+        margin-right: 12px;
+        min-height: 32px;
+        ${(props) => props.$isSelected && `border-color: ${SEARCH_COLORS.TITLE_PURPLE}`};
+    }
+`;
+
+const ThinDivider = styled(Divider)`
+    && {
+        margin: 0px;
+        padding: 0px;
+    }
+`;
+
+const Actions = styled.div`
+    justify-content: space-between;
+    z-index: 2;
+    padding: 16px 20px;
+`;
+
+const Filters = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 12px 20px;
+`;
+
+const LevelFilters = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: start;
+`;
+
+const LevelFilter = styled.div<{ $isSelected: boolean }>`
+    font-size: 14px;
+    padding: 2px 8px;
+    margin-right: 12px;
+    border-radius: 8px;
+    color: ${(props) => (props.$isSelected ? SEARCH_COLORS.TITLE_PURPLE : ANTD_GRAY[7])};
+    border: 1px solid ${(props) => (props.$isSelected ? SEARCH_COLORS.TITLE_PURPLE : ANTD_GRAY[7])};
+    &:hover {
+        opacity: 0.8;
+        cursor: pointer;
+    }
+`;
+
+const AdvancedFiltersButton = styled(Button)<{ $isSelected: boolean }>`
+    && {
+        padding: 0px 4px;
+        font-size: 16px;
+        color: ${(props) => (props.$isSelected ? '#00615F' : ANTD_GRAY[7])};
+    }
+`;
+
+const StyledArrowDownOutlined = styled(ArrowDownOutlined)`
+    && {
+        margin-right: 4px;
+        font-size: 10px;
+    }
+`;
+
+const StyledArrowUpOutlined = styled(ArrowUpOutlined)`
+    && {
+        margin-right: 4px;
+        font-size: 10px;
+    }
+`;
+
+const Results = styled.div`
+    flex: 1;
+    overflow: auto;
+    display: flex;
+    & > div {
+        width: 100%;
+    }
+`;
+
+enum LevelFilterType {
+    DIRECT = 'DIRECT',
+    INDIRECT = 'INDIRECT',
+}
+
+const DEFAULT_SELECTED_LEVELS = new Set([LevelFilterType.DIRECT]);
+
+export const CompactLineageTab = ({ defaultDirection }: { defaultDirection: LineageDirection }) => {
+    const entityRegistry = useEntityRegistry();
+    const { urn, entityData, entityType } = useEntityData();
+    const onIndividualSiblingPage = useIsSeparateSiblingsMode();
+    const lineageUrn = (!onIndividualSiblingPage && entityData?.lineageUrn) || urn;
+    const [selectedDirection, setDirection] = useState<LineageDirection>(defaultDirection);
+    const [selectedLevels, setSelectedLevels] = useState<Set<LevelFilterType>>(DEFAULT_SELECTED_LEVELS);
+    const [showAdvancedFilters, setShowAdvancedFilters] = useState(false);
+    const entityName = (entityData && entityRegistry.getDisplayName(entityType, entityData)) || '-';
+
+    const toggleLevelFilter = (level: LevelFilterType) => {
+        if (selectedLevels.has(level)) {
+            const newLevels = new Set(selectedLevels);
+            newLevels.delete(level);
+            setSelectedLevels(newLevels);
+        } else {
+            const newLevels = new Set(selectedLevels);
+            newLevels.add(level);
+            setSelectedLevels(newLevels);
+        }
+    };
+
+    const directionOptions = [
+        {
+            label: (
+                <span data-testid="compact-lineage-tab-direction-select-option-upstream">
+                    <StyledArrowUpOutlined />
+                    <b>Upstreams</b>
+                </span>
+            ),
+            value: LineageDirection.Upstream,
+            tip: `View the data assets that ${entityName} depends on`,
+        },
+        {
+            label: (
+                <span data-testid="compact-lineage-tab-direction-select-option-downstream">
+                    <StyledArrowDownOutlined />
+                    <b>Downstreams</b>
+                </span>
+            ),
+            value: LineageDirection.Downstream,
+            tip: `View the data assets that depend on ${entityName}`,
+        },
+    ];
+
+    useEffect(() => {
+        setSelectedLevels(DEFAULT_SELECTED_LEVELS);
+    }, [selectedDirection]);
+
+    const getLevelFilterSet = (levels: Set<LevelFilterType>) => {
+        const levelFilters: string[] = [];
+        if (selectedLevels.size > 0) {
+            if (levels.has(LevelFilterType.DIRECT)) {
+                levelFilters.push('1');
+            }
+            if (levels.has(LevelFilterType.INDIRECT)) {
+                levelFilters.push('2');
+                levelFilters.push('3+');
+            }
+            return {
+                unionType: UnionType.OR,
+                filters: [
+                    {
+                        field: 'degree',
+                        values: levelFilters,
+                    },
+                ],
+            };
+        }
+        return undefined;
+    };
+
+    const levelFilters = getLevelFilterSet(selectedLevels);
+
+    return (
+        <Container>
+            <Actions>
+                {directionOptions.map((option) => (
+                    <Tooltip title={option.tip} placement="bottom" showArrow={false}>
+                        <LineageButton
+                            $isSelected={selectedDirection === option.value}
+                            onClick={() => setDirection(option.value)}
+                        >
+                            {option.label}
+                        </LineageButton>
+                    </Tooltip>
+                ))}
+            </Actions>
+            <ThinDivider />
+            <Filters>
+                <LevelFilters>
+                    <Tooltip title="Show directly related data assets" placement="bottom" showArrow={false}>
+                        <LevelFilter
+                            $isSelected={selectedLevels.has(LevelFilterType.DIRECT)}
+                            onClick={() => toggleLevelFilter(LevelFilterType.DIRECT)}
+                        >
+                            direct
+                        </LevelFilter>
+                    </Tooltip>
+                    <Tooltip title="Show indirectly related data assets" placement="bottom" showArrow={false}>
+                        <LevelFilter
+                            $isSelected={selectedLevels.has(LevelFilterType.INDIRECT)}
+                            onClick={() => toggleLevelFilter(LevelFilterType.INDIRECT)}
+                        >
+                            indirect
+                        </LevelFilter>
+                    </Tooltip>
+                </LevelFilters>
+                <Tooltip
+                    placement="left"
+                    title={!showAdvancedFilters ? 'Show search bar' : 'Hide search bar'}
+                    showArrow={false}
+                >
+                    <AdvancedFiltersButton
+                        type="link"
+                        $isSelected={showAdvancedFilters}
+                        onClick={() => setShowAdvancedFilters(!showAdvancedFilters)}
+                    >
+                        <SearchOutlined />
+                    </AdvancedFiltersButton>
+                </Tooltip>
+            </Filters>
+            <ThinDivider />
+            <Results>
+                <LineageTabContext.Provider
+                    value={{ isColumnLevelLineage: false, lineageDirection: selectedDirection }}
+                >
+                    <ImpactAnalysis
+                        type="compact"
+                        urn={lineageUrn}
+                        direction={selectedDirection as LineageDirection}
+                        skipCache={false}
+                        defaultShowFilters={false}
+                        defaultFilters={[]}
+                        showFilterBar={showAdvancedFilters}
+                        fixedFilters={levelFilters}
+                    />
+                </LineageTabContext.Provider>
+            </Results>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ImpactAnalysis.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ImpactAnalysis.tsx
new file mode 100644
index 00000000000000..c91b50509c694a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/ImpactAnalysis.tsx
@@ -0,0 +1,86 @@
+import React from 'react';
+import { FacetFilterInput, LineageDirection } from '../../../../../types.generated';
+import generateUseSearchResultsViaRelationshipHook, {
+    generateUseSearchResultsCountViaRelationshipHook,
+} from './generateUseSearchResultsViaRelationshipHook';
+import { EmbeddedListSearchSection } from '../../components/styled/search/EmbeddedListSearchSection';
+import { EmbeddedListSearchEmbed } from '../../components/styled/search/EmbeddedListSearchEmbed';
+import generateUseDownloadScrollAcrossLineageSearchResultsHook from './generateUseDownloadScrollAcrossLineageSearchResultsHook';
+import { FilterSet } from '../../components/styled/search/types';
+
+type Props = {
+    type?: 'default' | 'compact';
+    urn: string;
+    direction: LineageDirection;
+    shouldRefetch?: boolean;
+    startTimeMillis?: number;
+    endTimeMillis?: number;
+    skipCache?: boolean;
+    defaultShowFilters?: boolean;
+    fixedFilters?: FilterSet;
+    defaultFilters?: Array<FacetFilterInput>;
+    showFilterBar?: boolean;
+    setSkipCache?: (skipCache: boolean) => void;
+    resetShouldRefetch?: () => void;
+    setIsLoading?: React.Dispatch<React.SetStateAction<boolean>>;
+};
+
+export const ImpactAnalysis = ({
+    type = 'default',
+    urn,
+    direction,
+    startTimeMillis,
+    endTimeMillis,
+    shouldRefetch,
+    skipCache,
+    defaultShowFilters = true,
+    fixedFilters,
+    defaultFilters,
+    showFilterBar = true,
+    setSkipCache,
+    resetShouldRefetch,
+    setIsLoading,
+}: Props) => {
+    const finalStartTimeMillis = startTimeMillis || undefined;
+    const finalEndTimeMillis = endTimeMillis || undefined;
+
+    const Component = type === 'default' ? EmbeddedListSearchSection : EmbeddedListSearchEmbed;
+
+    return (
+        <Component
+            useGetSearchResults={generateUseSearchResultsViaRelationshipHook({
+                urn,
+                direction,
+                startTimeMillis: finalStartTimeMillis,
+                endTimeMillis: finalEndTimeMillis,
+                skipCache,
+                setSkipCache,
+                setIsLoading,
+            })}
+            useGetDownloadSearchResults={generateUseDownloadScrollAcrossLineageSearchResultsHook({
+                urn,
+                direction,
+                startTimeMillis: finalStartTimeMillis,
+                endTimeMillis: finalEndTimeMillis,
+                skipCache,
+                setSkipCache,
+            })}
+            useGetSearchCountResult={generateUseSearchResultsCountViaRelationshipHook({
+                urn,
+                direction,
+                startTimeMillis: finalStartTimeMillis,
+                endTimeMillis: finalEndTimeMillis,
+                skipCache,
+                setSkipCache,
+            })}
+            defaultShowFilters={defaultShowFilters}
+            fixedFilters={fixedFilters}
+            defaultFilters={defaultFilters || [{ field: 'degree', values: ['1'] }]}
+            shouldRefetch={shouldRefetch}
+            resetShouldRefetch={resetShouldRefetch}
+            placeholderText="Search related assets..."
+            showFilterBar={showFilterBar}
+            applyView
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageColumnView.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageColumnView.tsx
new file mode 100644
index 00000000000000..2b6525a7481954
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageColumnView.tsx
@@ -0,0 +1,209 @@
+import { useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils';
+import React, { useMemo, useState } from 'react';
+import { useLocation } from 'react-router';
+import styled from 'styled-components/macro';
+import * as QueryString from 'query-string';
+import {
+    ArrowDownOutlined,
+    ArrowUpOutlined,
+    CaretDownFilled,
+    CaretDownOutlined,
+    ReloadOutlined,
+    SubnodeOutlined,
+    LoadingOutlined,
+} from '@ant-design/icons';
+import { Button, Select, Typography } from 'antd';
+import { Tooltip } from '@components';
+import { GenericEntityProperties } from '@src/app/entity/shared/types';
+import { EntityType, LineageDirection } from '../../../../../types.generated';
+import ManageLineageMenu from '../../../../lineage/manage/ManageLineageMenu';
+import { useGetLineageTimeParams } from '../../../../lineage/utils/useGetLineageTimeParams';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+import { downgradeV2FieldPath } from '../../../dataset/profile/schema/utils/utils';
+import TabToolbar from '../../components/styled/TabToolbar';
+import { ANTD_GRAY } from '../../constants';
+import { useEntityData } from '../../../../entity/shared/EntityContext';
+import ColumnsLineageSelect from './ColumnLineageSelect';
+import { ImpactAnalysis } from './ImpactAnalysis';
+import { LineageTabContext } from './LineageTabContext';
+import LineageTabTimeSelector from './LineageTabTimeSelector';
+import { generateSchemaFieldUrn } from './utils';
+
+const StyledTabToolbar = styled(TabToolbar)`
+    justify-content: space-between;
+    z-index: 2;
+`;
+
+const LeftButtonsWrapper = styled.div`
+    align-items: center;
+    display: flex;
+`;
+
+const RightButtonsWrapper = styled.div`
+    align-items: center;
+    display: flex;
+`;
+
+const ManageLineageIcon = styled(SubnodeOutlined)`
+    &&& {
+        margin-right: -2px;
+    }
+`;
+
+const StyledCaretDown = styled(CaretDownFilled)`
+    &&& {
+        font-size: 10px;
+        margin-left: 4px;
+    }
+`;
+
+const StyledSelect = styled(Select)`
+    &:hover {
+        background-color: ${ANTD_GRAY[2]};
+    }
+`;
+
+const RefreshCacheButton = styled(Button)`
+    margin-left: 8px;
+`;
+
+interface SchemaFieldEntityData extends GenericEntityProperties {
+    fieldPath?: string;
+}
+
+interface Props {
+    defaultDirection: LineageDirection;
+}
+
+export function LineageColumnView({ defaultDirection }: Props) {
+    const { urn, entityType, entityData } = useEntityData();
+    const location = useLocation();
+    const entityRegistry = useEntityRegistry();
+    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
+    const [lineageDirection, setLineageDirection] = useState<LineageDirection>(defaultDirection);
+    const [selectedColumn, setSelectedColumn] = useState<string | undefined>(params?.column as string);
+    const [shouldRefetch, setShouldRefetch] = useState(false);
+    const [skipCache, setSkipCache] = useState(false);
+    const [isLoading, setIsLoading] = useState(false);
+    const { startTimeMillis, endTimeMillis } = useGetLineageTimeParams();
+    const entityName = (entityData && entityRegistry.getDisplayName(entityType, entityData)) || '-';
+
+    function resetShouldRefetch() {
+        setShouldRefetch(false);
+    }
+
+    const columnForLineage = useMemo(
+        () =>
+            entityType === EntityType.SchemaField ? (entityData as SchemaFieldEntityData)?.fieldPath : selectedColumn,
+        [entityType, selectedColumn, entityData],
+    );
+    const [isColumnLevelLineage, setIsColumnLevelLineage] = useState(!!columnForLineage);
+
+    const selectedV1FieldPath = downgradeV2FieldPath(selectedColumn);
+    const onIndividualSiblingPage = useIsSeparateSiblingsMode();
+    const lineageUrn = (!onIndividualSiblingPage && entityData?.lineageUrn) || urn;
+    const selectedColumnUrn = generateSchemaFieldUrn(selectedV1FieldPath, lineageUrn);
+    const impactAnalysisUrn = isColumnLevelLineage && selectedColumnUrn ? selectedColumnUrn : lineageUrn;
+    const canEditLineage = !!entityData?.privileges?.canEditLineage;
+
+    const directionOptions = [
+        {
+            label: (
+                <Tooltip
+                    placement="right"
+                    title={`View the data assets that depend on ${entityName}`}
+                    showArrow={false}
+                >
+                    <span data-testid="lineage-tab-direction-select-option-downstream">
+                        <ArrowDownOutlined style={{ marginRight: 4 }} />
+                        <b>Downstreams</b>
+                    </span>
+                </Tooltip>
+            ),
+            value: LineageDirection.Downstream,
+        },
+        {
+            label: (
+                <Tooltip
+                    placement="right"
+                    title={`View the data assets that ${entityName} depends on`}
+                    showArrow={false}
+                >
+                    <span data-testid="lineage-tab-direction-select-option-upstream">
+                        <ArrowUpOutlined style={{ marginRight: 4 }} />
+                        <b>Upstreams</b>
+                    </span>
+                </Tooltip>
+            ),
+            value: LineageDirection.Upstream,
+        },
+    ];
+
+    return (
+        <>
+            <StyledTabToolbar>
+                <LeftButtonsWrapper>
+                    <StyledSelect
+                        bordered={false}
+                        value={lineageDirection}
+                        options={directionOptions}
+                        onChange={(value) => setLineageDirection(value as LineageDirection)}
+                        suffixIcon={<CaretDownOutlined style={{ color: 'black' }} />}
+                        data-testid="lineage-tab-direction-select"
+                    />
+                </LeftButtonsWrapper>
+                <RightButtonsWrapper>
+                    <ManageLineageMenu
+                        entityUrn={urn}
+                        refetchEntity={() => setShouldRefetch(true)}
+                        setUpdatedLineages={() => {}}
+                        menuIcon={
+                            <Button type="text">
+                                <ManageLineageIcon />
+                                <Typography.Text>
+                                    <b>Edit</b>
+                                </Typography.Text>
+                                <StyledCaretDown />
+                            </Button>
+                        }
+                        showLoading
+                        entityType={entityType}
+                        entityPlatform={entityData?.platform?.name}
+                        canEditLineage={canEditLineage}
+                        disableDropdown={!canEditLineage}
+                    />
+                    {entityType !== EntityType.SchemaField && (
+                        <ColumnsLineageSelect
+                            selectedColumn={columnForLineage}
+                            isColumnLevelLineage={isColumnLevelLineage}
+                            setSelectedColumn={setSelectedColumn}
+                            setIsColumnLevelLineage={setIsColumnLevelLineage}
+                        />
+                    )}
+                    <LineageTabTimeSelector />
+                    <Tooltip title={isLoading ? 'Refreshing data' : 'Refresh lineage'} showArrow={false}>
+                        <RefreshCacheButton type="text" onClick={() => setSkipCache(true)} disabled={isLoading}>
+                            {isLoading ? <LoadingOutlined /> : <ReloadOutlined />}
+                            <Typography.Text>
+                                <b>Refresh</b>
+                            </Typography.Text>
+                        </RefreshCacheButton>
+                    </Tooltip>
+                </RightButtonsWrapper>
+            </StyledTabToolbar>
+            <LineageTabContext.Provider value={{ isColumnLevelLineage, selectedColumn, lineageDirection }}>
+                <ImpactAnalysis
+                    urn={impactAnalysisUrn}
+                    direction={lineageDirection as LineageDirection}
+                    startTimeMillis={startTimeMillis}
+                    endTimeMillis={endTimeMillis}
+                    skipCache={skipCache}
+                    setSkipCache={setSkipCache}
+                    shouldRefetch={shouldRefetch}
+                    resetShouldRefetch={resetShouldRefetch}
+                    setIsLoading={setIsLoading}
+                />
+            </LineageTabContext.Provider>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTab.tsx
new file mode 100644
index 00000000000000..f5de4024ead177
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTab.tsx
@@ -0,0 +1,96 @@
+import LineageGraph from '@app/lineageV2/LineageGraph';
+import React, { useContext } from 'react';
+import styled from 'styled-components';
+import { useLineageV2 } from '../../../../lineageV2/useLineageV2';
+import { LineageDirection } from '../../../../../types.generated';
+import { useEntityData } from '../../../../entity/shared/EntityContext';
+import { TabRenderType } from '../../types';
+import { CompactLineageTab } from './CompactLineageTab';
+import LineageExplorer from '../../../../lineage/LineageExplorer';
+import { LineageColumnView } from './LineageColumnView';
+import TabFullsizedContext from '../../../../shared/TabFullsizedContext';
+import { useLineageViewState } from './hooks';
+
+const LINEAGE_SWITCH_WIDTH = 90;
+
+const LineageTabWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+`;
+
+const LineageSwitchWrapper = styled.div`
+    border: 1px solid #5d09c9;
+    border-radius: 4.5px;
+    display: flex;
+    margin: 13px 11px;
+    width: ${LINEAGE_SWITCH_WIDTH * 2}px;
+`;
+
+const LineageViewSwitch = styled.div<{ selected: boolean }>`
+    background: ${({ selected }) => (selected ? '#5d09c9' : '#fff')};
+    border-radius: 3px;
+    color: ${({ selected }) => (selected ? '#fff' : '#5d09c9')};
+    cursor: pointer;
+    display: flex;
+    font-size: 10px;
+    justify-content: center;
+    line-height: 24px;
+    height: 24px;
+    width: ${LINEAGE_SWITCH_WIDTH}px;
+`;
+
+const VisualizationWrapper = styled.div`
+    display: flex;
+    height: 100%;
+`;
+
+const LineageTabHeader = styled.div`
+    display: flex;
+    justify-content: space-between;
+`;
+
+interface Props {
+    properties?: { defaultDirection: LineageDirection };
+    renderType: TabRenderType;
+}
+
+export function LineageTab({ properties, renderType }: Props) {
+    const defaultDirection = properties?.defaultDirection || LineageDirection.Downstream;
+
+    if (renderType === TabRenderType.COMPACT) {
+        return <CompactLineageTab defaultDirection={defaultDirection} />;
+    }
+    return <WideLineageTab defaultDirection={defaultDirection} />;
+}
+
+function WideLineageTab({ defaultDirection }: { defaultDirection: LineageDirection }) {
+    const { isTabFullsize } = useContext(TabFullsizedContext);
+    const { urn, entityType } = useEntityData();
+    const isLineageV2 = useLineageV2();
+    const { isVisualizeView, setVisualizeView } = useLineageViewState();
+
+    return (
+        <LineageTabWrapper>
+            {!isTabFullsize && (
+                <LineageTabHeader>
+                    <LineageSwitchWrapper>
+                        <LineageViewSwitch selected={isVisualizeView} onClick={() => setVisualizeView(true)}>
+                            Explorer
+                        </LineageViewSwitch>
+                        <LineageViewSwitch selected={!isVisualizeView} onClick={() => setVisualizeView(false)}>
+                            Impact Analysis
+                        </LineageViewSwitch>
+                    </LineageSwitchWrapper>
+                </LineageTabHeader>
+            )}
+            {!isVisualizeView && <LineageColumnView defaultDirection={defaultDirection} />}
+            {isVisualizeView && !isLineageV2 && <LineageExplorer urn={urn} type={entityType} />}
+            {isVisualizeView && isLineageV2 && (
+                <VisualizationWrapper>
+                    <LineageGraph />
+                </VisualizationWrapper>
+            )}
+        </LineageTabWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTabContext.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTabContext.tsx
new file mode 100644
index 00000000000000..4ef3728ebb9d29
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTabContext.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import { LineageDirection } from '../../../../../types.generated';
+
+export const LineageTabContext = React.createContext<LineageTabContextType>({
+    isColumnLevelLineage: false,
+    lineageDirection: LineageDirection.Downstream,
+    selectedColumn: undefined,
+});
+
+type LineageTabContextType = {
+    isColumnLevelLineage: boolean;
+    lineageDirection: LineageDirection;
+    selectedColumn?: string;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTabTimeSelector.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTabTimeSelector.tsx
new file mode 100644
index 00000000000000..10121d3b7d4885
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTabTimeSelector.tsx
@@ -0,0 +1,48 @@
+import React, { useCallback } from 'react';
+import { useHistory, useLocation } from 'react-router';
+import analytics, { EventType } from '../../../../analytics';
+import LineageTimeSelector, { Datetime } from '../../../../lineageV2/LineageTimeSelector';
+import { getTimeFromNow } from '../../../../shared/time/timeUtils';
+import updateQueryParams from '../../../../shared/updateQueryParams';
+import { useGetLineageTimeParams } from '../../../../lineage/utils/useGetLineageTimeParams';
+
+export default function LineageTabTimeSelector() {
+    const history = useHistory();
+    const location = useLocation();
+    const { startTimeMillis, endTimeMillis } = useGetLineageTimeParams();
+
+    const lineageTimeSelectorOnChange = useCallback(
+        (start: Datetime, end: Datetime) => {
+            const startTimeMillisValue = start?.valueOf();
+            const endTimeMillisValue = end?.valueOf();
+            const relativeStartDate = getTimeFromNow(startTimeMillisValue);
+            const relativeEndDate = getTimeFromNow(endTimeMillisValue);
+            analytics.event({
+                type: EventType.LineageGraphTimeRangeSelectionEvent,
+                relativeStartDate,
+                relativeEndDate,
+            });
+
+            const isAllTimeLineage = !start && !end;
+
+            updateQueryParams(
+                {
+                    start_time_millis: startTimeMillisValue?.toString(),
+                    end_time_millis: endTimeMillisValue?.toString(),
+                    show_all_time_lineage: isAllTimeLineage ? 'true' : undefined,
+                },
+                location,
+                history,
+            );
+        },
+        [history, location],
+    );
+
+    return (
+        <LineageTimeSelector
+            onChange={lineageTimeSelectorOnChange}
+            startTimeMillis={startTimeMillis}
+            endTimeMillis={endTimeMillis}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTable.tsx
new file mode 100644
index 00000000000000..a31b24b3a019e7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTable.tsx
@@ -0,0 +1,72 @@
+import React from 'react';
+import { List } from 'antd';
+import styled from 'styled-components';
+import VisiblitySensor from 'react-visibility-sensor';
+
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+import { PreviewType } from '../../../Entity';
+import { Entity } from '../../../../../types.generated';
+import { ANTD_GRAY } from '../../constants';
+
+const LineageList = styled(List)`
+    padding-left: 40px;
+    padding-right: 40px;
+    margin-top: -1px;
+    .ant-list-items > .ant-list-item {
+        padding-right: 0px;
+        padding-left: 0px;
+    }
+    > .ant-list-header {
+        padding-right: 0px;
+        padding-left: 0px;
+        font-size: 14px;
+        font-weight: 600;
+        margin-left: -20px;
+        border-bottom: none;
+        padding-bottom: 0px;
+        padding-top: 15px;
+    }
+` as typeof List;
+
+const ItemPlaceholder = styled.div`
+    min-height: 100px;
+    width: 100%;
+    background-color: ${ANTD_GRAY[2]};
+`;
+
+const ListItem = styled(List.Item)`
+    paddingtop: 20px;
+`;
+const TableTitle = styled.span`
+    font-size: 20px;
+`;
+
+type Props = {
+    title: string;
+    data?: Entity[];
+};
+
+export const LineageTable = ({ data, title }: Props) => {
+    const entityRegistry = useEntityRegistry();
+
+    return (
+        <LineageList
+            bordered
+            dataSource={data}
+            header={<TableTitle>{title}</TableTitle>}
+            renderItem={(item) => (
+                <ListItem>
+                    <VisiblitySensor partialVisibility>
+                        {({ isVisible }) =>
+                            isVisible && !!item.type ? (
+                                entityRegistry.renderPreview(item.type, PreviewType.PREVIEW, item)
+                            ) : (
+                                <ItemPlaceholder />
+                            )
+                        }
+                    </VisiblitySensor>
+                </ListItem>
+            )}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts
new file mode 100644
index 00000000000000..73cfd5fa70c408
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts
@@ -0,0 +1,66 @@
+import { useGetDownloadScrollAcrossLineageResultsQuery } from '../../../../../graphql/scroll.generated';
+import { LineageDirection } from '../../../../../types.generated';
+import {
+    DownloadSearchResults,
+    DownloadSearchResultsInput,
+    DownloadSearchResultsParams,
+} from '../../../../search/utils/types';
+
+/**
+ * Generates a hook which can be used to download Scroll Across Lineage Results to CSV inside the
+ * Download as CSV modal.
+ */
+export default function generateUseDownloadSearchAcrossLineageSearchResultsHook({
+    urn,
+    direction,
+    startTimeMillis,
+    endTimeMillis,
+}: {
+    urn: string;
+    direction: LineageDirection;
+    startTimeMillis?: number;
+    endTimeMillis?: number;
+    skipCache?: boolean;
+    setSkipCache?: (skipCache: boolean) => void;
+}) {
+    return function useDownloadSearchAcrossLineageSearchResults(params: DownloadSearchResultsParams) {
+        const { data, loading, error, refetch } = useGetDownloadScrollAcrossLineageResultsQuery({
+            ...params,
+            variables: {
+                input: {
+                    ...params.variables.input,
+                    urn,
+                    direction,
+                    startTimeMillis: startTimeMillis || undefined,
+                    endTimeMillis: endTimeMillis || undefined,
+                },
+            },
+        });
+
+        return {
+            searchResults: (data?.scrollAcrossLineage && {
+                ...data?.scrollAcrossLineage,
+                nextScrollId: data?.scrollAcrossLineage?.nextScrollId,
+                searchResults: data?.scrollAcrossLineage?.searchResults,
+            }) as DownloadSearchResults,
+            loading,
+            error,
+            refetch: (input: DownloadSearchResultsInput) => {
+                return refetch({
+                    input: {
+                        ...input,
+                        urn,
+                        direction,
+                        startTimeMillis: startTimeMillis || undefined,
+                        endTimeMillis: endTimeMillis || undefined,
+                    },
+                }).then((res) => {
+                    return (res.data?.scrollAcrossLineage && {
+                        ...res.data?.scrollAcrossLineage,
+                        nextScrollId: res.data?.scrollAcrossLineage?.nextScrollId,
+                    }) as DownloadSearchResults;
+                });
+            },
+        };
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/generateUseSearchResultsViaRelationshipHook.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/generateUseSearchResultsViaRelationshipHook.ts
new file mode 100644
index 00000000000000..aaef958ebd14b1
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/generateUseSearchResultsViaRelationshipHook.ts
@@ -0,0 +1,136 @@
+import React, { useEffect } from 'react';
+import { useSearchAcrossLineageCountQuery, useSearchAcrossLineageQuery } from '../../../../../graphql/search.generated';
+import { LineageDirection } from '../../../../../types.generated';
+import { GetSearchResultsParams } from '../../components/styled/search/types';
+
+const filtersExist = (filters, orFilters) => {
+    return filters?.length || orFilters?.length;
+};
+
+export function generateUseSearchResultsCountViaRelationshipHook({
+    urn,
+    direction,
+    startTimeMillis,
+    endTimeMillis,
+    skipCache,
+    setSkipCache,
+    setIsLoading,
+}: {
+    urn: string;
+    direction: LineageDirection;
+    startTimeMillis?: number;
+    endTimeMillis?: number;
+    skipCache?: boolean;
+    setSkipCache?: (skipCache: boolean) => void;
+    setIsLoading?: React.Dispatch<React.SetStateAction<boolean>>;
+}) {
+    return function useGetSearchResultsCountViaSearchAcrossLineage({ variables: { input } }: GetSearchResultsParams) {
+        const { filters, orFilters } = input;
+        const inputFields = {
+            ...input,
+            urn,
+            direction,
+            startTimeMillis: startTimeMillis || undefined,
+            endTimeMillis: endTimeMillis || undefined,
+        };
+
+        const { data, loading, error, refetch } = useSearchAcrossLineageCountQuery({
+            variables: {
+                input: inputFields,
+            },
+            fetchPolicy: 'cache-first',
+            skip: !filtersExist(filters, orFilters), // If you don't include any filters, we shouldn't return anything :). Might as well skip!
+        });
+
+        useEffect(() => {
+            if (skipCache) {
+                setIsLoading?.(true);
+                refetch({
+                    input: { ...inputFields, searchFlags: { skipCache: true, fulltext: true } },
+                }).finally(() => {
+                    setIsLoading?.(false);
+                });
+                setSkipCache?.(false);
+            }
+        });
+
+        return { total: data?.searchAcrossLineage?.total, loading, error };
+    };
+}
+
+export default function generateUseSearchResultsViaRelationshipHook({
+    urn,
+    direction,
+    startTimeMillis,
+    endTimeMillis,
+    skipCache,
+    setSkipCache,
+    setIsLoading,
+}: {
+    urn: string;
+    direction: LineageDirection;
+    startTimeMillis?: number;
+    endTimeMillis?: number;
+    skipCache?: boolean;
+    setSkipCache?: (skipCache: boolean) => void;
+    setIsLoading?: React.Dispatch<React.SetStateAction<boolean>>;
+}) {
+    return function useGetSearchResultsViaSearchAcrossLineage({ variables: { input } }: GetSearchResultsParams) {
+        const { filters, orFilters } = input;
+        const inputFields = {
+            ...input,
+            urn,
+            direction,
+            startTimeMillis: startTimeMillis || undefined,
+            endTimeMillis: endTimeMillis || undefined,
+        };
+
+        const { data, loading, error, refetch } = useSearchAcrossLineageQuery({
+            variables: { input: inputFields },
+            fetchPolicy: 'cache-first',
+            skip: !filtersExist(filters, orFilters), // If you don't include any filters, we shouldn't return anything :). Might as well skip!
+        });
+
+        useEffect(() => {
+            if (skipCache) {
+                setIsLoading?.(true);
+                refetch({
+                    input: { ...inputFields, searchFlags: { skipCache: true, fulltext: true } },
+                }).finally(() => {
+                    setIsLoading?.(false);
+                });
+                setSkipCache?.(false);
+            }
+        });
+
+        return {
+            data: data?.searchAcrossLineage,
+            loading,
+            error,
+            refetch: (refetchParams: GetSearchResultsParams['variables']) => {
+                const {
+                    input: {
+                        types: refetchTypes,
+                        query: refetchQuery,
+                        start: refetchStart,
+                        count: refetchCount,
+                        filters: refetchFilters,
+                        orFilters: refetchOrFilters,
+                    },
+                } = refetchParams;
+                return refetch({
+                    input: {
+                        urn,
+                        direction,
+                        types: refetchTypes,
+                        query: refetchQuery,
+                        start: refetchStart,
+                        count: refetchCount,
+                        filters: refetchFilters,
+                        orFilters: refetchOrFilters,
+                    },
+                }).then((res) => res.data.searchAcrossLineage);
+            },
+        };
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/hooks.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/hooks.ts
new file mode 100644
index 00000000000000..e7b72fd18e3f45
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/hooks.ts
@@ -0,0 +1,42 @@
+import { useCallback, useState } from 'react';
+import { useHistory, useLocation } from 'react-router-dom';
+
+const IS_VISUALIZE_VIEW_DEFAULT = true;
+
+export function useLineageViewState() {
+    const history = useHistory();
+    const location = useLocation();
+
+    // Read query parameter to determine the initial state
+    const initialView = new URLSearchParams(location.search).get('lineageView');
+    const [isVisualizeView, setIsVisualizeView] = useState(
+        initialView === 'impact' ? false : IS_VISUALIZE_VIEW_DEFAULT,
+    );
+
+    const setVisualizeView = useCallback(
+        (view: boolean) => {
+            setIsVisualizeView(view);
+
+            // Update the URL with the new view state
+            const newParam = `lineageView=${view ? 'explorer' : 'impact'}`;
+
+            let newSearch = location.search;
+            if (newSearch.includes('lineageView=')) {
+                // Replace the existing parameter
+                newSearch = newSearch.replace(/(lineageView=)[^&]+/, newParam);
+            } else {
+                // Add the new parameter
+                newSearch += (newSearch ? '&' : '?') + newParam;
+            }
+
+            // Update the URL without reloading the page
+            history.replace({ search: newSearch });
+        },
+        [location.search, history],
+    );
+
+    return {
+        isVisualizeView,
+        setVisualizeView,
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/utils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/utils.ts
new file mode 100644
index 00000000000000..9f4a06c77819a1
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/utils.ts
@@ -0,0 +1,6 @@
+import { encodeSchemaField } from '@app/lineage/utils/columnLineageUtils';
+
+export function generateSchemaFieldUrn(fieldPath: string | undefined | null, resourceUrn: string): string | null {
+    if (!fieldPath || !resourceUrn) return null;
+    return `urn:li:schemaField:(${resourceUrn},${encodeSchemaField(fieldPath)})`;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/ML/MlFeatureFeatureTableTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/ML/MlFeatureFeatureTableTab.tsx
new file mode 100644
index 00000000000000..7384c46a2b7bd7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/ML/MlFeatureFeatureTableTab.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import { useBaseEntity } from '../../../../entity/shared/EntityContext';
+import { EntityType } from '../../../../../types.generated';
+import { EntityList } from '../Entity/components/EntityList';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+import { GetMlFeatureQuery } from '../../../../../graphql/mlFeature.generated';
+
+export const FeatureTableTab = () => {
+    const entity = useBaseEntity() as GetMlFeatureQuery;
+    const entityRegistry = useEntityRegistry();
+
+    const feature = entity && entity.mlFeature;
+    const featureTables = feature?.featureTables?.relationships.map((relationship) => relationship.entity);
+
+    const title = `Part of ${entityRegistry.getEntityName(EntityType.MlfeatureTable)}`;
+    return <EntityList title={title} type={EntityType.MlfeatureTable} entities={featureTables || []} />;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx
new file mode 100644
index 00000000000000..d3148ff4ee6394
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import { useBaseEntity } from '../../../../entity/shared/EntityContext';
+import { EntityType } from '../../../../../types.generated';
+import { EntityList } from '../Entity/components/EntityList';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+import { GetMlPrimaryKeyQuery } from '../../../../../graphql/mlPrimaryKey.generated';
+
+export const FeatureTableTab = () => {
+    const entity = useBaseEntity() as GetMlPrimaryKeyQuery;
+    const entityRegistry = useEntityRegistry();
+
+    const feature = entity && entity.mlPrimaryKey;
+    const featureTables = feature?.featureTables?.relationships.map((relationship) => relationship.entity);
+
+    const title = `Part of ${entityRegistry.getEntityName(EntityType.MlfeatureTable)}`;
+    return <EntityList title={title} type={EntityType.MlfeatureTable} entities={featureTables || []} />;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/CardinalityLabel.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/CardinalityLabel.tsx
new file mode 100644
index 00000000000000..03cc595cb6b951
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/CardinalityLabel.tsx
@@ -0,0 +1,43 @@
+import { Tooltip } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import { PropertyCardinality, StructuredPropertyEntity } from '../../../../../types.generated';
+import { PropertyTypeBadge } from '../../../../entity/shared/tabs/Dataset/Schema/components/PropertyTypeLabel';
+import { getStructuredPropertyValue } from '../../../../entity/shared/utils';
+
+const Header = styled.div`
+    font-size: 10px;
+`;
+
+const List = styled.ul`
+    padding: 0 24px;
+    max-height: 500px;
+    overflow: auto;
+`;
+
+interface Props {
+    structuredProperty: StructuredPropertyEntity;
+}
+
+export default function CardinalityLabel({ structuredProperty }: Props) {
+    const labelText =
+        structuredProperty.definition.cardinality === PropertyCardinality.Single ? 'Single-Select' : 'Multi-Select';
+
+    return (
+        <Tooltip
+            color="#373D44"
+            title={
+                <>
+                    <Header>Property Options</Header>
+                    <List>
+                        {structuredProperty.definition.allowedValues?.map((value) => (
+                            <li>{getStructuredPropertyValue(value.value)}</li>
+                        ))}
+                    </List>
+                </>
+            }
+        >
+            <PropertyTypeBadge count={labelText} displayTransparent />
+        </Tooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/NameColumn.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/NameColumn.tsx
new file mode 100644
index 00000000000000..bd8b2275ef6490
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/NameColumn.tsx
@@ -0,0 +1,80 @@
+import { Typography } from 'antd';
+import { Tooltip } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import Highlight from 'react-highlighter';
+import { PropertyRow } from './types';
+import StructuredPropertyTooltip from './StructuredPropertyTooltip';
+
+const ParentNameText = styled(Typography.Text)`
+    color: #373d44;
+    font-size: 14px;
+    font-family: Manrope;
+    font-weight: 600;
+    line-height: 20px;
+    word-wrap: break-word;
+    padding-left: 4px;
+    display: flex;
+    align-items: center;
+`;
+
+const ChildNameText = styled(Typography.Text)`
+    align-self: stretch;
+    color: #373d44;
+    font-size: 12px;
+    font-family: Manrope;
+    font-weight: 500;
+    word-wrap: break-word;
+    display: flex;
+    align-items: center;
+`;
+
+const NameLabelWrapper = styled.span`
+    display: inline-flex;
+    align-items: center;
+    flex-wrap: wrap;
+`;
+
+const ChildCountText = styled.span`
+    color: #373d44;
+    font-size: 12px;
+`;
+
+interface Props {
+    propertyRow: PropertyRow;
+    filterText?: string;
+}
+
+export default function NameColumn({ propertyRow, filterText }: Props) {
+    const { structuredProperty } = propertyRow;
+
+    return (
+        <>
+            {propertyRow.children ? (
+                <NameLabelWrapper>
+                    <ParentNameText>
+                        <Highlight search={filterText}>{propertyRow.displayName}</Highlight>
+                    </ParentNameText>
+                    {propertyRow.childrenCount ? (
+                        <ChildCountText>&nbsp;({propertyRow.childrenCount})</ChildCountText>
+                    ) : (
+                        <span />
+                    )}
+                </NameLabelWrapper>
+            ) : (
+                <NameLabelWrapper>
+                    <Tooltip
+                        color="#373D44"
+                        placement="topRight"
+                        overlayStyle={{ minWidth: 'min-content' }}
+                        title={structuredProperty ? <StructuredPropertyTooltip propertyRow={propertyRow} /> : ''}
+                    >
+                        <ChildNameText>
+                            <Highlight search={filterText}>{propertyRow.displayName}</Highlight>
+                        </ChildNameText>
+                    </Tooltip>
+                </NameLabelWrapper>
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/PropertiesTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/PropertiesTab.tsx
new file mode 100644
index 00000000000000..4e816a11f8e437
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/PropertiesTab.tsx
@@ -0,0 +1,140 @@
+import { EditColumn } from '@src/app/entity/shared/tabs/Properties/Edit/EditColumn';
+import { Maybe, StructuredProperties } from '@src/types.generated';
+import { Empty, Table } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { useEntityData } from '../../../../entity/shared/EntityContext';
+import TabHeader from '../../../../entity/shared/tabs/Properties/TabHeader';
+import { PropertyRow } from '../../../../entity/shared/tabs/Properties/types';
+import useUpdateExpandedRowsFromFilter from '../../../../entity/shared/tabs/Properties/useUpdateExpandedRowsFromFilter';
+import {
+    getFilteredCustomProperties,
+    mapCustomPropertiesToPropertyRows,
+} from '../../../../entity/shared/tabs/Properties/utils';
+import { useEntityRegistryV2 } from '../../../../useEntityRegistry';
+import ExpandIcon from '../Dataset/Schema/components/ExpandIcon';
+import NameColumn from './NameColumn';
+import ValuesColumn from './ValuesColumn';
+import useStructuredProperties from './useStructuredProperties';
+
+const StyledTable = styled(Table)`
+    &&& .ant-table-cell-with-append {
+        padding: 16px;
+    }
+    &&& .ant-table-tbody > tr > td {
+        border: none;
+    }
+    &&& .row-icon-container {
+        margin-bottom: 4px;
+    }
+` as typeof Table;
+
+const EmptyText = styled(Empty)`
+    font-size: 14px;
+`;
+
+interface Props {
+    properties?: {
+        fieldPath?: string;
+        fieldUrn?: string;
+        fieldProperties?: Maybe<StructuredProperties>;
+        refetch?: () => void;
+    };
+}
+
+export const PropertiesTab = ({ properties }: Props) => {
+    const fieldPath = properties?.fieldPath;
+    const fieldUrn = properties?.fieldUrn;
+    const fieldProperties = properties?.fieldProperties;
+    const refetch = properties?.refetch;
+    const [filterText, setFilterText] = useState('');
+    const { entityData } = useEntityData();
+    const entityRegistry = useEntityRegistryV2();
+    const propertyTableColumns = [
+        {
+            width: 210,
+            title: 'Name',
+            render: (propertyRow: PropertyRow) => <NameColumn propertyRow={propertyRow} filterText={filterText} />,
+        },
+        {
+            title: 'Value',
+            ellipsis: true,
+            render: (propertyRow: PropertyRow) => <ValuesColumn propertyRow={propertyRow} filterText={filterText} />,
+        },
+    ];
+
+    const canEditProperties =
+        entityData?.parent?.privileges?.canEditProperties || entityData?.privileges?.canEditProperties;
+
+    if (canEditProperties) {
+        propertyTableColumns.push({
+            title: '',
+            width: '10%',
+            render: (propertyRow: PropertyRow) => (
+                <EditColumn
+                    structuredProperty={propertyRow.structuredProperty}
+                    associatedUrn={propertyRow.associatedUrn}
+                    values={propertyRow.values?.map((v) => v.value) || []}
+                    refetch={refetch}
+                />
+            ),
+        } as any);
+    }
+
+    const { structuredPropertyRows, expandedRowsFromFilter } = useStructuredProperties(
+        entityRegistry,
+        fieldPath || null,
+        filterText,
+    );
+
+    // only show entity custom properties on entity level, not on field level
+    const customProperties = !fieldPath ? getFilteredCustomProperties(filterText, entityData) || [] : [];
+    const customPropertyRows = mapCustomPropertiesToPropertyRows(customProperties);
+    const dataSource: PropertyRow[] = structuredPropertyRows
+        .concat(customPropertyRows)
+        .filter((row) => !row.structuredProperty?.settings?.isHidden);
+
+    const [expandedRows, setExpandedRows] = useState<Set<string>>(new Set());
+
+    useUpdateExpandedRowsFromFilter({ expandedRowsFromFilter, setExpandedRows });
+
+    return (
+        <>
+            <TabHeader
+                setFilterText={setFilterText}
+                fieldUrn={fieldUrn}
+                fieldProperties={fieldProperties}
+                refetch={refetch}
+            />
+            <StyledTable
+                pagination={false}
+                // typescript is complaining that default sort order is not a valid column field- overriding this here
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore
+                columns={propertyTableColumns}
+                dataSource={dataSource}
+                locale={{
+                    emptyText: <EmptyText description="No properties found" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
+                }}
+                rowKey="qualifiedName"
+                expandable={{
+                    expandedRowKeys: [...Array.from(expandedRows)],
+                    defaultExpandAllRows: false,
+                    expandRowByClick: false,
+                    expandIcon: (props) => <ExpandIcon {...props} isCompact />,
+                    onExpand: (expanded, record) => {
+                        if (expanded) {
+                            setExpandedRows((previousRows) => new Set(previousRows.add(record.qualifiedName)));
+                        } else {
+                            setExpandedRows((previousRows) => {
+                                previousRows.delete(record.qualifiedName);
+                                return new Set(previousRows);
+                            });
+                        }
+                    },
+                    indentSize: 16,
+                }}
+            />
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/StructuredPropertyTooltip.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/StructuredPropertyTooltip.tsx
new file mode 100644
index 00000000000000..891a33a1b27fc3
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/StructuredPropertyTooltip.tsx
@@ -0,0 +1,60 @@
+import React from 'react';
+import styled from 'styled-components';
+import CardinalityLabel from './CardinalityLabel';
+import { PropertyRow } from './types';
+import PropertyTypeLabel from '../../../../entity/shared/tabs/Dataset/Schema/components/PropertyTypeLabel';
+
+const ContentWrapper = styled.div`
+    font-size: 12px;
+`;
+
+const Header = styled.div`
+    font-size: 10px;
+`;
+
+const Description = styled.div`
+    padding-left: 16px;
+`;
+
+const NameWrapper = styled.span`
+    font-size: 14px;
+    font-weight: 600;
+`;
+
+const NameLabelWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    white-space: nowrap;
+`;
+
+interface Props {
+    propertyRow: PropertyRow;
+}
+
+export default function StructuredPropertyTooltip({ propertyRow }: Props) {
+    const { structuredProperty } = propertyRow;
+
+    if (!structuredProperty) return null;
+
+    return (
+        <ContentWrapper>
+            <Header>Structured Property</Header>
+            <NameLabelWrapper>
+                <NameWrapper>
+                    {structuredProperty.definition.displayName || structuredProperty.definition.qualifiedName}{' '}
+                </NameWrapper>
+                {propertyRow.type ? (
+                    <PropertyTypeLabel type={propertyRow.type} dataType={propertyRow.dataType} displayTransparent />
+                ) : (
+                    <span />
+                )}
+                {structuredProperty?.definition.allowedValues && (
+                    <CardinalityLabel structuredProperty={structuredProperty} />
+                )}
+            </NameLabelWrapper>
+            {structuredProperty.definition.description && (
+                <Description>{structuredProperty.definition.description}</Description>
+            )}
+        </ContentWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/StructuredPropertyValue.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/StructuredPropertyValue.tsx
new file mode 100644
index 00000000000000..adedb9c52b3f75
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/StructuredPropertyValue.tsx
@@ -0,0 +1,126 @@
+import Icon from '@ant-design/icons/lib/components/Icon';
+import { Entity, EntityType } from '@src/types.generated';
+import { getSchemaFieldParentLink } from '@src/app/entityV2/schemaField/utils';
+import { Typography } from 'antd';
+import React from 'react';
+import Highlight from 'react-highlighter';
+import styled from 'styled-components';
+import ExternalLink from '../../../../../images/link-out.svg?react';
+import EntityIcon from '../../../../entity/shared/components/styled/EntityIcon';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+import { ANTD_GRAY } from '../../constants';
+import CompactMarkdownViewer from '../Documentation/components/CompactMarkdownViewer';
+import { ValueColumnData } from './types';
+
+const ValueText = styled(Typography.Text)<{ size: number }>`
+    font-family: 'Manrope';
+    font-weight: 400;
+    font-size: ${(props) => props.size}px;
+    color: ${ANTD_GRAY[9]};
+    display: block;
+    width: 100%;
+    .remirror-editor.ProseMirror {
+        font-size: ${(props) => props.size}px;
+    }
+`;
+
+const StyledIcon = styled(Icon)`
+    margin-left: 6px;
+`;
+
+const IconWrapper = styled.span`
+    margin-right: 4px;
+    display: flex;
+`;
+
+const EntityWrapper = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const EntityName = styled(Typography.Text)`
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+`;
+
+const StyledHighlight = styled(Highlight)<{ truncateText?: boolean }>`
+    line-height: 1.5;
+    text-wrap: wrap;
+
+    ${(props) =>
+        props.truncateText &&
+        `
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        max-width: 100%;
+        display: block;
+    `}
+`;
+
+interface Props {
+    value: ValueColumnData;
+    isRichText?: boolean;
+    filterText?: string;
+    truncateText?: boolean;
+    isFieldColumn?: boolean;
+    size?: number;
+}
+
+export default function StructuredPropertyValue({
+    value,
+    isRichText,
+    filterText,
+    truncateText,
+    isFieldColumn,
+    size = 12,
+}: Props) {
+    const entityRegistry = useEntityRegistry();
+
+    const getEntityLink = (entity: Entity) =>
+        entity.type === EntityType.SchemaField
+            ? getSchemaFieldParentLink(entity.urn)
+            : entityRegistry.getEntityUrl(entity.type, entity.urn);
+
+    return (
+        <ValueText size={size}>
+            {value.entity ? (
+                <EntityWrapper>
+                    <IconWrapper>
+                        <EntityIcon entity={value.entity} size={size} />
+                    </IconWrapper>
+                    <EntityName ellipsis={{ tooltip: true }}>
+                        {entityRegistry.getDisplayName(value.entity.type, value.entity)}
+                    </EntityName>
+                    <Typography.Link href={getEntityLink(value.entity)} target="_blank" rel="noopener noreferrer">
+                        <StyledIcon component={ExternalLink} />
+                    </Typography.Link>
+                </EntityWrapper>
+            ) : (
+                <>
+                    {isRichText ? (
+                        <CompactMarkdownViewer
+                            content={value.value?.toString() ?? ''}
+                            lineLimit={isFieldColumn ? 1 : undefined}
+                            hideShowMore={isFieldColumn}
+                            scrollableY={!isFieldColumn}
+                        />
+                    ) : (
+                        <>
+                            {truncateText ? (
+                                <Typography.Text ellipsis={{ tooltip: true }}>
+                                    {value.value?.toString() || <div style={{ minHeight: 22 }} />}
+                                </Typography.Text>
+                            ) : (
+                                <StyledHighlight search={filterText} truncateText={truncateText}>
+                                    {value.value?.toString() || <div style={{ minHeight: 22 }} />}
+                                </StyledHighlight>
+                            )}
+                        </>
+                    )}
+                </>
+            )}
+        </ValueText>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/TabHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/TabHeader.tsx
new file mode 100644
index 00000000000000..9e0b4992d9c786
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/TabHeader.tsx
@@ -0,0 +1,32 @@
+import { SearchOutlined } from '@ant-design/icons';
+import { Input } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../constants';
+
+const StyledInput = styled(Input)`
+    border-radius: 70px;
+    max-width: 300px;
+`;
+
+const TableHeader = styled.div`
+    padding: 8px 16px;
+    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
+`;
+
+interface Props {
+    setFilterText: (text: string) => void;
+}
+
+export default function TabHeader({ setFilterText }: Props) {
+    return (
+        <TableHeader>
+            <StyledInput
+                placeholder="Search in properties..."
+                onChange={(e) => setFilterText(e.target.value)}
+                allowClear
+                prefix={<SearchOutlined />}
+            />
+        </TableHeader>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/ValuesColumn.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/ValuesColumn.tsx
new file mode 100644
index 00000000000000..19aa793e499fb8
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/ValuesColumn.tsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import { StdDataType } from '../../../../../types.generated';
+import StructuredPropertyValue from './StructuredPropertyValue';
+import { PropertyRow } from './types';
+
+interface Props {
+    propertyRow: PropertyRow;
+    filterText?: string;
+}
+
+export default function ValuesColumn({ propertyRow, filterText }: Props) {
+    const { values } = propertyRow;
+    const isRichText = propertyRow.dataType?.info.type === StdDataType.RichText;
+
+    return (
+        <>
+            {values ? (
+                values.map((v) => (
+                    <StructuredPropertyValue value={v} isRichText={isRichText} filterText={filterText} truncateText />
+                ))
+            ) : (
+                <span />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/__tests__/useStructuredProperties.test.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/__tests__/useStructuredProperties.test.ts
new file mode 100644
index 00000000000000..ff7c6e51a04a00
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/__tests__/useStructuredProperties.test.ts
@@ -0,0 +1,87 @@
+import { identifyAndAddParentRows } from '../useStructuredProperties';
+
+describe('identifyAndAddParentRows', () => {
+    it('should not return parent rows when there are none', () => {
+        const propertyRows = [
+            { displayName: 'test1', qualifiedName: 'test1' },
+            { displayName: 'test2', qualifiedName: 'test2' },
+        ];
+        expect(identifyAndAddParentRows(propertyRows)).toMatchObject([]);
+    });
+
+    it('should not return parent rows when another row starts with the same letters but is a different token', () => {
+        const propertyRows = [
+            { displayName: 'test1', qualifiedName: 'testing.one' },
+            { displayName: 'test2', qualifiedName: 'testingAgain.two' },
+        ];
+        expect(identifyAndAddParentRows(propertyRows)).toMatchObject([]);
+    });
+
+    it('should return parent rows properly', () => {
+        const propertyRows = [
+            { displayName: 'test1', qualifiedName: 'testing.one' },
+            { displayName: 'test2', qualifiedName: 'testing.two' },
+            { displayName: 'test3', qualifiedName: 'testing.three' },
+        ];
+        expect(identifyAndAddParentRows(propertyRows)).toMatchObject([
+            { displayName: 'testing', qualifiedName: 'testing', childrenCount: 3 },
+        ]);
+    });
+
+    it('should return parent rows properly with multiple layers of nesting', () => {
+        const propertyRows = [
+            { displayName: 'test1', qualifiedName: 'testing.one.two.a.1' },
+            { displayName: 'test1', qualifiedName: 'testing.one.two.a.2' },
+            { displayName: 'test1', qualifiedName: 'testing.one.two.b' },
+            { displayName: 'test1', qualifiedName: 'testing.one.three' },
+            { displayName: 'test2', qualifiedName: 'testing.two.c.d' },
+            { displayName: 'test3', qualifiedName: 'testing.three' },
+            { displayName: 'test3', qualifiedName: 'testParent' },
+        ];
+        expect(identifyAndAddParentRows(propertyRows)).toMatchObject([
+            { displayName: 'testing', qualifiedName: 'testing', isParentRow: true, childrenCount: 6 },
+            { displayName: 'testing.one', qualifiedName: 'testing.one', isParentRow: true, childrenCount: 4 },
+            { displayName: 'testing.one.two', qualifiedName: 'testing.one.two', isParentRow: true, childrenCount: 3 },
+            {
+                displayName: 'testing.one.two.a',
+                qualifiedName: 'testing.one.two.a',
+                isParentRow: true,
+                childrenCount: 2,
+            },
+        ]);
+    });
+
+    it('should return parent rows properly with multiple layers of nesting regardless of order', () => {
+        const propertyRows = [
+            { displayName: 'test1', qualifiedName: 'testing.one.two.a.1' },
+            { displayName: 'test3', qualifiedName: 'testParent' },
+            { displayName: 'test1', qualifiedName: 'testing.one.three' },
+            { displayName: 'test2', qualifiedName: 'testing.two.c.d' },
+            { displayName: 'test1', qualifiedName: 'testing.one.two.b' },
+            { displayName: 'test3', qualifiedName: 'testing.three' },
+            { displayName: 'test1', qualifiedName: 'testing.one.two.a.2' },
+        ];
+        expect(identifyAndAddParentRows(propertyRows)).toMatchObject([
+            { displayName: 'testing', qualifiedName: 'testing', isParentRow: true, childrenCount: 6 },
+            { displayName: 'testing.one', qualifiedName: 'testing.one', isParentRow: true, childrenCount: 4 },
+            { displayName: 'testing.one.two', qualifiedName: 'testing.one.two', isParentRow: true, childrenCount: 3 },
+            {
+                displayName: 'testing.one.two.a',
+                qualifiedName: 'testing.one.two.a',
+                isParentRow: true,
+                childrenCount: 2,
+            },
+        ]);
+    });
+
+    it('should return parent rows properly with simpler layers of nesting', () => {
+        const propertyRows = [
+            { displayName: 'test2', qualifiedName: 'testing.two.c.d' },
+            { displayName: 'test3', qualifiedName: 'testing.three' },
+            { displayName: 'test3', qualifiedName: 'testParent' },
+        ];
+        expect(identifyAndAddParentRows(propertyRows)).toMatchObject([
+            { displayName: 'testing', qualifiedName: 'testing', isParentRow: true, childrenCount: 2 },
+        ]);
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/__tests__/utils.test.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/__tests__/utils.test.ts
new file mode 100644
index 00000000000000..04c817f2f4fd5c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/__tests__/utils.test.ts
@@ -0,0 +1,86 @@
+import { globalEntityRegistryV2 } from '@app/EntityRegistryProvider';
+import { PropertyRow } from '../types';
+import { filterStructuredProperties } from '../utils';
+
+describe('filterSchemaRows', () => {
+    const rows = [
+        {
+            displayName: 'Has PII',
+            qualifiedName: 'io.acryl.ads.data_protection.has_pii',
+            values: [{ value: 'yes', entity: null }],
+        },
+        {
+            displayName: 'Discovery Date Utc',
+            qualifiedName: 'io.acryl.ads.change_management.discovery_date_utc',
+            values: [{ value: '2023-10-31', entity: null }],
+        },
+        {
+            displayName: 'Link Data Location',
+            qualifiedName: 'io.acryl.ads.context.data_location',
+            values: [{ value: 'New York City', entity: null }],
+        },
+        {
+            displayName: 'Number Prop',
+            qualifiedName: 'io.acryl.ads.number',
+            values: [{ value: 100, entity: null }],
+        },
+    ] as PropertyRow[];
+
+    it('should properly filter structured properties based on field name', () => {
+        const filterText = 'has pi';
+        const { filteredRows, expandedRowsFromFilter } = filterStructuredProperties(
+            globalEntityRegistryV2,
+            rows,
+            filterText,
+        );
+
+        expect(filteredRows).toMatchObject([
+            {
+                displayName: 'Has PII',
+                qualifiedName: 'io.acryl.ads.data_protection.has_pii',
+                values: [{ value: 'yes', entity: null }],
+            },
+        ]);
+        expect(expandedRowsFromFilter).toMatchObject(
+            new Set(['io', 'io.acryl', 'io.acryl.ads', 'io.acryl.ads.data_protection']),
+        );
+    });
+
+    it('should properly filter structured properties based on field value', () => {
+        const filterText = 'new york';
+        const { filteredRows, expandedRowsFromFilter } = filterStructuredProperties(
+            globalEntityRegistryV2,
+            rows,
+            filterText,
+        );
+
+        expect(filteredRows).toMatchObject([
+            {
+                displayName: 'Link Data Location',
+                qualifiedName: 'io.acryl.ads.context.data_location',
+                values: [{ value: 'New York City', entity: null }],
+            },
+        ]);
+        expect(expandedRowsFromFilter).toMatchObject(
+            new Set(['io', 'io.acryl', 'io.acryl.ads', 'io.acryl.ads.context']),
+        );
+    });
+
+    it('should properly filter structured properties based on field value even for numbers', () => {
+        const filterText = '100';
+        const { filteredRows, expandedRowsFromFilter } = filterStructuredProperties(
+            globalEntityRegistryV2,
+            rows,
+            filterText,
+        );
+
+        expect(filteredRows).toMatchObject([
+            {
+                displayName: 'Number Prop',
+                qualifiedName: 'io.acryl.ads.number',
+                values: [{ value: 100, entity: null }],
+            },
+        ]);
+        expect(expandedRowsFromFilter).toMatchObject(new Set(['io', 'io.acryl', 'io.acryl.ads']));
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/types.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/types.ts
new file mode 100644
index 00000000000000..b93ba886d5a642
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/types.ts
@@ -0,0 +1,25 @@
+import { DataTypeEntity, Entity, StructuredPropertyEntity } from '../../../../../types.generated';
+
+export interface ValueColumnData {
+    value: string | number | null;
+    entity: Entity | null;
+}
+
+export interface TypeData {
+    type: string;
+    nativeDataType: string;
+}
+
+export interface PropertyRow {
+    displayName: string;
+    qualifiedName: string;
+    values?: ValueColumnData[];
+    children?: PropertyRow[];
+    childrenCount?: number;
+    parent?: PropertyRow;
+    depth?: number;
+    type?: TypeData;
+    dataType?: DataTypeEntity;
+    isParentRow?: boolean;
+    structuredProperty?: StructuredPropertyEntity;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useStructuredProperties.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useStructuredProperties.tsx
new file mode 100644
index 00000000000000..b49e2fb3c8f85c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useStructuredProperties.tsx
@@ -0,0 +1,252 @@
+import { PropertyValue, StructuredPropertiesEntry } from '../../../../../types.generated';
+import { useEntityData } from '../../../../entity/shared/EntityContext';
+import { GenericEntityProperties } from '../../../../entity/shared/types';
+import { getStructuredPropertyValue } from '../../../../entity/shared/utils';
+import EntityRegistry from '../../../EntityRegistry';
+import { useGetEntityWithSchema } from '../Dataset/Schema/useGetEntitySchema';
+import { PropertyRow } from './types';
+import { filterStructuredProperties } from './utils';
+
+const typeNameToType = {
+    StringValue: { type: 'string', nativeDataType: 'text' },
+    NumberValue: { type: 'number', nativeDataType: 'float' },
+};
+
+export function mapStructuredPropertyValues(structuredPropertiesEntry: StructuredPropertiesEntry) {
+    return structuredPropertiesEntry.values
+        .filter((value) => !!value)
+        .map((value) => ({
+            value: getStructuredPropertyValue(value as PropertyValue),
+            entity:
+                structuredPropertiesEntry.valueEntities?.find(
+                    (entity) => entity?.urn === getStructuredPropertyValue(value as PropertyValue),
+                ) || null,
+        }));
+}
+
+export function mapStructuredPropertyToPropertyRow(structuredPropertiesEntry: StructuredPropertiesEntry) {
+    const { displayName, qualifiedName } = structuredPropertiesEntry.structuredProperty.definition;
+    return {
+        displayName: displayName || qualifiedName,
+        qualifiedName,
+        values: mapStructuredPropertyValues(structuredPropertiesEntry),
+        dataType: structuredPropertiesEntry.structuredProperty.definition.valueType,
+        structuredProperty: structuredPropertiesEntry.structuredProperty,
+        type:
+            structuredPropertiesEntry.values[0] && structuredPropertiesEntry.values[0].__typename
+                ? {
+                      type: typeNameToType[structuredPropertiesEntry.values[0].__typename].type,
+                      nativeDataType: typeNameToType[structuredPropertiesEntry.values[0].__typename].nativeDataType,
+                  }
+                : undefined,
+        associatedUrn: structuredPropertiesEntry.associatedUrn,
+    };
+}
+
+// map the properties map into a list of PropertyRow objects to render in a table
+function getStructuredPropertyRows(entityData?: GenericEntityProperties | null) {
+    const structuredPropertyRows: PropertyRow[] = [];
+
+    entityData?.structuredProperties?.properties
+        ?.filter((prop) => prop.structuredProperty.exists)
+        .forEach((structuredPropertiesEntry) => {
+            structuredPropertyRows.push(mapStructuredPropertyToPropertyRow(structuredPropertiesEntry));
+        });
+
+    return structuredPropertyRows;
+}
+
+function getFieldStructuredPropertyRows(fieldPath: string, entityData?: GenericEntityProperties | null) {
+    const structuredPropertyRows: PropertyRow[] = [];
+
+    const schemaFieldEntity = entityData?.schemaMetadata?.fields.find(
+        (f) => f.fieldPath === fieldPath,
+    )?.schemaFieldEntity;
+
+    schemaFieldEntity?.structuredProperties?.properties
+        ?.filter((prop) => prop.structuredProperty.exists)
+        .forEach((structuredPropertiesEntry) => {
+            structuredPropertyRows.push(mapStructuredPropertyToPropertyRow(structuredPropertiesEntry));
+        });
+
+    return structuredPropertyRows;
+}
+
+export function findAllSubstrings(s: string): Array<string> {
+    const substrings: Array<string> = [];
+
+    for (let i = 0; i < s.length; i++) {
+        if (s[i] === '.') {
+            substrings.push(s.substring(0, i));
+        }
+    }
+    substrings.push(s);
+    return substrings;
+}
+
+export function createParentPropertyRow(displayName: string, qualifiedName: string): PropertyRow {
+    return {
+        displayName,
+        qualifiedName,
+        isParentRow: true,
+    };
+}
+
+export function identifyAndAddParentRows(rows?: Array<PropertyRow>): Array<PropertyRow> {
+    /**
+     * This function takes in an array of PropertyRow objects and determines which rows are parents. These parents need
+     * to be extracted in order to organize the rows into a properly nested structure later on. The final product returned
+     * is a list of parent rows, without values or children assigned.
+     */
+    const qualifiedNames: Array<string> = [];
+
+    // Get list of fqns
+    if (rows) {
+        rows.forEach((row) => {
+            qualifiedNames.push(row.qualifiedName);
+        });
+    }
+
+    const finalParents: PropertyRow[] = [];
+    const finalParentNames = new Set();
+
+    // Loop through list of fqns and find all substrings.
+    // e.g. a.b.c.d becomes a, a.b, a.b.c, a.b.c.d
+    qualifiedNames.forEach((fqn) => {
+        let previousCount: number | null = null;
+        let previousParentName = '';
+
+        const substrings = findAllSubstrings(fqn);
+
+        // Loop through substrings and count how many other fqns have that substring in them. Use this to determine
+        // if a property should be nested. If the count is equal then we should not nest, because there's no split
+        // that would tell us to nest. If the count is not equal, we should nest the child properties.
+        for (let index = 0; index < substrings.length; index++) {
+            const token = substrings[index];
+            const currentCount = qualifiedNames.filter((name) => name.startsWith(`${token}.`)).length;
+
+            // If there's only one child, don't nest it
+            if (currentCount === 1) {
+                break;
+            }
+
+            // Add previous fqn, or,previousParentName, if we have found a viable parent path
+            if (previousCount !== null && previousCount !== currentCount) {
+                if (!finalParentNames.has(previousParentName)) {
+                    const parent: PropertyRow = createParentPropertyRow(previousParentName, previousParentName);
+                    parent.childrenCount = previousCount;
+                    finalParentNames.add(previousParentName);
+                    finalParents.push(parent);
+                }
+            }
+
+            previousCount = currentCount;
+            previousParentName = token;
+        }
+    });
+
+    return finalParents;
+}
+
+export function groupByParentProperty(rows?: Array<PropertyRow>): Array<PropertyRow> {
+    /**
+     * This function takes in an array of PropertyRow objects, representing parent and child properties. Parent properties
+     * will not have values, but child properties will. It organizes the rows into the parent and child structure and
+     * returns a list of PropertyRow objects representing it.
+     */
+    const outputRows: Array<PropertyRow> = [];
+    const outputRowByPath = {};
+
+    if (rows) {
+        // Iterate through all rows
+        for (let rowIndex = 0; rowIndex < rows.length; rowIndex++) {
+            let parentRow: null | PropertyRow = null;
+            const row = { children: undefined, ...rows[rowIndex], depth: 0 };
+
+            // Iterate through a row's characters, and split the row's path into tokens
+            // e.g. a, b, c for the example a.b.c
+            for (let j = rowIndex - 1; j >= 0; j--) {
+                const rowTokens = row.qualifiedName.split('.');
+                let parentPath: null | string = null;
+                let previousParentPath = rowTokens.slice(0, rowTokens.length - 1).join('.');
+
+                // Iterate through a row's path backwards, and check if the previous row's path has been seen. If it has,
+                // populate parentRow. If not, move on to the next path token.
+                // e.g. for a.b.c.d, first evaluate a.b.c to see if it has been seen. If it hasn't, move to a.b
+                for (
+                    let lastParentTokenIndex = rowTokens.length - 2;
+                    lastParentTokenIndex >= 0;
+                    --lastParentTokenIndex
+                ) {
+                    const lastParentToken: string = rowTokens[lastParentTokenIndex];
+                    if (lastParentToken && Object.keys(outputRowByPath).includes(previousParentPath)) {
+                        parentPath = rowTokens.slice(0, lastParentTokenIndex + 1).join('.');
+                        break;
+                    }
+                    previousParentPath = rowTokens.slice(0, lastParentTokenIndex).join('.');
+                }
+
+                if (parentPath && rows[j].qualifiedName === parentPath) {
+                    parentRow = outputRowByPath[rows[j].qualifiedName];
+                    break;
+                }
+            }
+
+            // If the parent row exists in the ouput, add the current row as a child. If not, add the current row
+            // to the final output.
+            if (parentRow) {
+                row.depth = (parentRow.depth || 0) + 1;
+                row.parent = parentRow;
+                if (row.isParentRow) {
+                    row.displayName = row.displayName.replace(`${parentRow.displayName}.`, '');
+                }
+                parentRow.children = [...(parentRow.children || []), row];
+            } else {
+                outputRows.push(row);
+            }
+            outputRowByPath[row.qualifiedName] = row;
+        }
+    }
+    return outputRows;
+}
+
+export default function useStructuredProperties(
+    entityRegistry: EntityRegistry,
+    fieldPath: string | null,
+    filterText?: string,
+) {
+    const { entityData } = useEntityData();
+    const { entityWithSchema } = useGetEntityWithSchema(!fieldPath);
+
+    let structuredPropertyRowsRaw: PropertyRow[] = [];
+    if (fieldPath) {
+        structuredPropertyRowsRaw = getFieldStructuredPropertyRows(
+            fieldPath,
+            entityWithSchema as GenericEntityProperties,
+        );
+    } else {
+        structuredPropertyRowsRaw = getStructuredPropertyRows(entityData);
+    }
+    const parentRows = identifyAndAddParentRows(structuredPropertyRowsRaw);
+
+    structuredPropertyRowsRaw = [...structuredPropertyRowsRaw, ...parentRows];
+
+    const { filteredRows, expandedRowsFromFilter } = filterStructuredProperties(
+        entityRegistry,
+        structuredPropertyRowsRaw,
+        filterText,
+    );
+
+    // Sort by fqn before nesting algorithm
+    const copy = [...filteredRows].sort((a, b) => {
+        return a.qualifiedName.localeCompare(b.qualifiedName);
+    });
+
+    // group properties by path
+    const structuredPropertyRows = groupByParentProperty(copy);
+
+    return {
+        structuredPropertyRows,
+        expandedRowsFromFilter: expandedRowsFromFilter as Set<string>,
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useUpdateExpandedRowsFromFilter.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useUpdateExpandedRowsFromFilter.ts
new file mode 100644
index 00000000000000..0dbe762c537db4
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useUpdateExpandedRowsFromFilter.ts
@@ -0,0 +1,23 @@
+import { useEffect } from 'react';
+import { isEqual } from 'lodash';
+import usePrevious from '../../../../shared/usePrevious';
+
+interface Props {
+    expandedRowsFromFilter: Set<string>;
+    setExpandedRows: React.Dispatch<React.SetStateAction<Set<string>>>;
+}
+
+export default function useUpdateExpandedRowsFromFilter({ expandedRowsFromFilter, setExpandedRows }: Props) {
+    const previousExpandedRowsFromFilter = usePrevious(expandedRowsFromFilter);
+
+    useEffect(() => {
+        if (!isEqual(expandedRowsFromFilter, previousExpandedRowsFromFilter)) {
+            setExpandedRows((previousRows) => {
+                const finalRowsSet = new Set();
+                expandedRowsFromFilter.forEach((row) => finalRowsSet.add(row));
+                previousRows.forEach((row) => finalRowsSet.add(row));
+                return finalRowsSet as Set<string>;
+            });
+        }
+    }, [expandedRowsFromFilter, previousExpandedRowsFromFilter, setExpandedRows]);
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/utils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/utils.ts
new file mode 100644
index 00000000000000..17305855003d93
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/utils.ts
@@ -0,0 +1,67 @@
+import { CustomPropertiesEntry } from '../../../../../types.generated';
+import EntityRegistry from '../../../EntityRegistry';
+import { GenericEntityProperties } from '../../../../entity/shared/types';
+import { PropertyRow, ValueColumnData } from './types';
+
+export function mapCustomPropertiesToPropertyRows(customProperties: CustomPropertiesEntry[]) {
+    return (customProperties?.map((customProp) => ({
+        displayName: customProp.key,
+        values: [{ value: customProp.value || '' }],
+    })) || []) as PropertyRow[];
+}
+
+function matchesName(name: string, filterText: string) {
+    return name.toLocaleLowerCase().includes(filterText.toLocaleLowerCase());
+}
+
+function matchesAnyFromValues(values: ValueColumnData[], filterText: string, entityRegistry: EntityRegistry) {
+    return values.some(
+        (value) =>
+            matchesName(value.value?.toString() || '', filterText) ||
+            matchesName(value.entity ? entityRegistry.getDisplayName(value.entity.type, value.entity) : '', filterText),
+    );
+}
+
+export function getFilteredCustomProperties(filterText: string, entityData?: GenericEntityProperties | null) {
+    return entityData?.customProperties?.filter(
+        (property) => matchesName(property.key, filterText) || matchesName(property.value || '', filterText),
+    );
+}
+
+export function filterStructuredProperties(
+    entityRegistry: EntityRegistry,
+    propertyRows: PropertyRow[],
+    filterText?: string,
+) {
+    if (!propertyRows) return { filteredRows: [], expandedRowsFromFilter: new Set() };
+    if (!filterText) return { filteredRows: propertyRows, expandedRowsFromFilter: new Set() };
+    const formattedFilterText = filterText.toLocaleLowerCase();
+
+    const finalQualifiedNames = new Set<string>();
+    const expandedRowsFromFilter = new Set<string>();
+
+    propertyRows.forEach((row) => {
+        // if we match on the qualified name (maybe from a parent) do not filter out
+        if (matchesName(row.qualifiedName, formattedFilterText)) {
+            finalQualifiedNames.add(row.qualifiedName);
+        }
+        // if we match specifically on this property (not just its parent), add and expand all parents
+        if (
+            matchesName(row.displayName, formattedFilterText) ||
+            matchesAnyFromValues(row.values || [], formattedFilterText, entityRegistry)
+        ) {
+            finalQualifiedNames.add(row.qualifiedName);
+
+            const splitFieldPath = row.qualifiedName.split('.');
+            splitFieldPath.reduce((previous, current) => {
+                finalQualifiedNames.add(previous);
+                expandedRowsFromFilter.add(previous);
+                return `${previous}.${current}`;
+            });
+        }
+    });
+
+    const filteredRows = propertyRows.filter((row) => finalQualifiedNames.has(row.qualifiedName));
+
+    return { filteredRows, expandedRowsFromFilter };
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/__tests__/utils.test.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/__tests__/utils.test.tsx
new file mode 100644
index 00000000000000..2d406f53e5fa75
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/__tests__/utils.test.tsx
@@ -0,0 +1,212 @@
+import {
+    decodeComma,
+    decodeUrn,
+    dictToQueryStringParams,
+    encodeComma,
+    getDataProduct,
+    getNumberWithOrdinal,
+    getPlatformName,
+    handleBatchError,
+    isListSubset,
+    notEmpty,
+    singularizeCollectionName,
+    summaryHasStats,
+    truncate,
+    urlEncodeUrn,
+} from '../../utils';
+
+describe('dictToQueryStringParams', () => {
+    it('should convert dictionary to query string', () => {
+        const params = { key1: 'value1', key2: true };
+        const queryString = dictToQueryStringParams(params);
+        expect(queryString).toBe('key1=value1&key2=true');
+    });
+});
+
+describe('urlEncodeUrn', () => {
+    it('should encode URN properly', () => {
+        const urn = 'urn:li:glossaryTerm?cb326461-7b05-4f07-9069-e139dd92f5ee%';
+        const encodedUrn = urlEncodeUrn(urn);
+        expect(encodedUrn).toBe('urn:li:glossaryTerm%3Fcb326461-7b05-4f07-9069-e139dd92f5ee{{encoded_percent}}');
+    });
+});
+
+describe('decodeUrn', () => {
+    it('should return the correct decoded URN', () => {
+        const encodedUrn = 'urn%3Aexample%3Aentity';
+        const expectedUrn = 'urn:example:entity';
+        expect(decodeUrn(encodedUrn)).toEqual(expectedUrn);
+    });
+});
+
+describe('getNumberWithOrdinal', () => {
+    it('should return the correct number with ordinal suffix', () => {
+        expect(getNumberWithOrdinal(1)).toEqual('1st');
+        expect(getNumberWithOrdinal(2)).toEqual('2nd');
+        expect(getNumberWithOrdinal(3)).toEqual('3rd');
+        expect(getNumberWithOrdinal(4)).toEqual('4th');
+    });
+});
+
+describe('encodeComma', () => {
+    it('should return the correct encoded string with commas replaced', () => {
+        const str = 'comma,separated,string';
+        const expectedEncodedString = 'comma%2Cseparated%2Cstring';
+        expect(encodeComma(str)).toEqual(expectedEncodedString);
+    });
+});
+
+describe('decodeComma', () => {
+    it('should return the correct decoded string with commas restored', () => {
+        const encodedStr = 'comma%2Cseparated%2Cstring';
+        const expectedDecodedString = 'comma,separated,string';
+        expect(decodeComma(encodedStr)).toEqual(expectedDecodedString);
+    });
+});
+
+describe('notEmpty', () => {
+    it('should return true for not empty values', () => {
+        expect(notEmpty('value')).toBe(true);
+        expect(notEmpty(0)).toBe(true);
+        expect(notEmpty(false)).toBe(true);
+    });
+
+    it('should return false for empty or null/undefined values', () => {
+        expect(notEmpty(null)).toBe(false);
+        expect(notEmpty(undefined)).toBe(false);
+    });
+});
+
+describe('truncate', () => {
+    it('should truncate string if it exceeds length', () => {
+        const input = 'This is a long string';
+        const length = 10;
+        const expectedOutput = 'This is a ...';
+        expect(truncate(length, input)).toEqual(expectedOutput);
+    });
+
+    it('should return original string if length is greater or equal to string length', () => {
+        const input = 'Short';
+        const length = 10;
+        expect(truncate(length, input)).toEqual(input);
+    });
+
+    it('should return empty string if input is null or undefined', () => {
+        expect(truncate(10, null)).toEqual('');
+        expect(truncate(10, undefined)).toEqual('');
+    });
+});
+
+describe('singularizeCollectionName', () => {
+    it('should singularize plural collection name', () => {
+        const pluralName = 'Entities';
+        const expectedSingularName = 'Entitie';
+        expect(singularizeCollectionName(pluralName)).toEqual(expectedSingularName);
+    });
+
+    it('should return the same name if it cannot be singularized', () => {
+        const singularName = 'Entity';
+        expect(singularizeCollectionName(singularName)).toEqual(singularName);
+    });
+});
+
+describe('getPlatformName', () => {
+    it('should return platform name or display name if available', () => {
+        const entityData: any = {
+            platform: {
+                properties: {
+                    displayName: 'Teradata',
+                },
+                name: 'teradata',
+            },
+        };
+        expect(getPlatformName(entityData)).toBe('Teradata');
+    });
+});
+
+describe('isListSubset', () => {
+    it('should return true if l1 is a subset of l2', () => {
+        const l1 = [1, 2];
+        const l2 = [1, 2, 3, 4];
+        expect(isListSubset(l1, l2)).toBe(true);
+    });
+
+    it('should return false if l1 is not a subset of l2', () => {
+        const l1 = [1, 5];
+        const l2 = [1, 2, 3, 4];
+        expect(isListSubset(l1, l2)).toBe(false);
+    });
+});
+
+describe('handleBatchError', () => {
+    it('should return custom error message for unauthorized bulk edit', () => {
+        const urns = ['urn1', 'urn2'];
+        const e = { graphQLErrors: [{ extensions: { code: 403 } }] };
+        const defaultMessage = 'Default error message';
+        const expectedErrorMessage = {
+            content:
+                'Your bulk edit selection included entities that you are unauthorized to update. The bulk edit being performed will not be saved.',
+            duration: 3,
+        };
+        expect(handleBatchError(urns, e, defaultMessage)).toEqual(expectedErrorMessage);
+    });
+
+    it('should return default message for other errors', () => {
+        const urns = ['urn1'];
+        const e = { graphQLErrors: [{ extensions: { code: 500 } }] };
+        const defaultMessage = 'Default error message';
+        expect(handleBatchError(urns, e, defaultMessage)).toEqual(defaultMessage);
+    });
+});
+
+describe('getDataProduct', () => {
+    it('should return data product properly if relationships exist', () => {
+        const dataProductResult: any = {
+            relationships: [{ entity: { id: 1, name: 'Data Product' } }],
+        };
+
+        const result = getDataProduct(dataProductResult);
+
+        expect(result).toEqual({ id: 1, name: 'Data Product' });
+    });
+
+    it('should return null if no relationships exist', () => {
+        const dataProductResult = {
+            relationships: [],
+        };
+
+        const result = getDataProduct(dataProductResult);
+
+        expect(result).toBeNull();
+    });
+});
+
+describe('summaryHasStats', () => {
+    it('should return true if statsSummary has stats', () => {
+        const statsSummary = {
+            queryCountLast30Days: 10,
+        };
+
+        const result = summaryHasStats(statsSummary);
+
+        expect(result).toBe(true);
+    });
+
+    it('should return false if statsSummary does not have stats', () => {
+        const statsSummary = {
+            queryCountLast30Days: null,
+        };
+
+        const result = summaryHasStats(statsSummary);
+
+        expect(result).toBe(false);
+    });
+
+    it('should return false if statsSummary is null or undefined', () => {
+        const result1 = summaryHasStats(null);
+        const result2 = summaryHasStats(undefined);
+
+        expect(result1).toBe(false);
+        expect(result2).toBe(false);
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/shared/types.ts b/datahub-web-react/src/app/entityV2/shared/types.ts
new file mode 100644
index 00000000000000..7a24d67de18e53
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/types.ts
@@ -0,0 +1,93 @@
+import { ReactElement } from 'react';
+
+export enum TabRenderType {
+    /**
+     * A default, full screen tab.
+     */
+    DEFAULT,
+    /**
+     * A compact tab
+     */
+    COMPACT,
+}
+
+export enum TabContextType {
+    /**
+     * A tab rendered horizontally in the main content.
+     */
+    PROFILE,
+    /**
+     * A tab rendered in the main profile sidebar.
+     */
+    PROFILE_SIDEBAR,
+    /**
+     * A tab rendered in the form sidebar.
+     */
+    FORM_SIDEBAR,
+    /**
+     * A tab rendered in the lineage sidebar
+     */
+    LINEAGE_SIDEBAR,
+    /**
+     * A tab rendered in the chrome extension sidebar
+     */
+    CHROME_SIDEBAR,
+    /**
+     * A tab rendered in the search sidebar
+     */
+    SEARCH_SIDEBAR,
+}
+
+export type EntityTabProps = {
+    /**
+     * The render type for the tab, e.g. whether it's full screen / horizontal or compact / vertical
+     */
+    renderType: TabRenderType;
+    /**
+     * The context type, detailing the scenario in which the tab is being rendered.
+     */
+    contextType: TabContextType;
+    /**
+     * Atr that can be provided from the outside.
+     */
+    properties?: any;
+};
+
+export type EntityTab = {
+    name: string;
+    component: React.FunctionComponent<EntityTabProps>;
+    icon?: React.FunctionComponent<any>;
+    display?: {
+        visible: (GenericEntityProperties, T) => boolean; // Whether the tab is visible on the UI. Defaults to true.
+        enabled: (GenericEntityProperties, T) => boolean; // Whether the tab is enabled on the UI. Defaults to true.
+    };
+    properties?: any;
+    id?: string;
+    getDynamicName?: (GenericEntityProperties, T, loading: boolean) => ReactElement;
+};
+
+export type EntitySidebarTab = {
+    name: string;
+    component: React.FunctionComponent<EntityTabProps>;
+    icon: React.FunctionComponent<any>;
+    display?: {
+        visible: (GenericEntityProperties, T) => boolean; // Whether the tab is visible on the UI. Defaults to true.
+        enabled: (GenericEntityProperties, T) => boolean; // Whether the tab is enabled on the UI. Defaults to true.
+    };
+    description?: string; // Used to power tooltip if present.
+    properties?: any;
+    id?: string;
+};
+
+export type EntitySidebarSection = {
+    component: React.FunctionComponent<{
+        properties?: any;
+        readOnly?: boolean;
+        renderType?: TabRenderType;
+        contexType?: TabContextType;
+    }>;
+    display?: {
+        visible: (GenericEntityProperties, T, contextType?: TabContextType | undefined) => boolean; // Whether the sidebar is visible on the UI. Defaults to true.
+    };
+    properties?: any;
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/useIsSeparateSiblingsMode.ts b/datahub-web-react/src/app/entityV2/shared/useIsSeparateSiblingsMode.ts
new file mode 100644
index 00000000000000..4c54c3f8dba3a8
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/useIsSeparateSiblingsMode.ts
@@ -0,0 +1,28 @@
+import * as QueryString from 'query-string';
+import { useContext } from 'react';
+import { useLocation } from 'react-router-dom';
+import { useIsShowSeparateSiblingsEnabled } from '@src/app/useAppConfig';
+import { useEntityData } from '@src/app/entity/shared/EntityContext';
+import EntitySidebarContext from '../../sharedV2/EntitySidebarContext';
+
+// used to determine whether sibling entities should be shown merged or not
+export const SEPARATE_SIBLINGS_URL_PARAM = 'separate_siblings';
+
+// used to determine whether sibling entities should be shown merged or not
+export function useIsSeparateSiblingsMode() {
+    const showSeparateSiblings = useIsShowSeparateSiblingsEnabled();
+    const { separateSiblings } = useContext(EntitySidebarContext);
+    const location = useLocation();
+    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
+
+    if (showSeparateSiblings) return true;
+
+    return separateSiblings ?? params[SEPARATE_SIBLINGS_URL_PARAM] === 'true';
+}
+
+// use to determine whether the current page is a siblings view
+export function useIsOnSiblingsView() {
+    const isSeparateSiblingsMode = useIsSeparateSiblingsMode();
+    const { entityData } = useEntityData();
+    return !isSeparateSiblingsMode && !!entityData?.siblingsSearch?.count;
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/useQueryParamValue.ts b/datahub-web-react/src/app/entityV2/shared/useQueryParamValue.ts
new file mode 100644
index 00000000000000..eac774c4eb320d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/useQueryParamValue.ts
@@ -0,0 +1,9 @@
+import * as QueryString from 'query-string';
+import { useLocation } from 'react-router-dom';
+
+export function useQueryParamValue(queryParam: string) {
+    const location = useLocation();
+    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
+
+    return params[queryParam];
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/utils.ts b/datahub-web-react/src/app/entityV2/shared/utils.ts
new file mode 100644
index 00000000000000..53e2b48398f3ef
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/utils.ts
@@ -0,0 +1,296 @@
+import { Maybe } from 'graphql/jsutils/Maybe';
+import {
+    ChartStatsSummary,
+    DashboardStatsSummary,
+    DataProduct,
+    DatasetProfile,
+    DatasetStatsSummary,
+    DateInterval,
+    Entity,
+    EntityRelationshipsResult,
+    EntityType,
+    SearchResult,
+    DatasetProperties,
+    ChartProperties,
+    Operation,
+} from '../../../types.generated';
+
+import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
+import { GenericEntityProperties } from '../../entity/shared/types';
+import { OUTPUT_PORTS_FIELD } from '../../search/utils/constants';
+import { TimeWindowSize } from '../../shared/time/timeUtils';
+
+export function dictToQueryStringParams(params: Record<string, string | boolean>) {
+    return Object.keys(params)
+        .map((key) => `${key}=${params[key]}`)
+        .join('&');
+}
+
+export function urlEncodeUrn(urn: string) {
+    return (
+        urn &&
+        urn
+            // Hack - React Router v5 does not like pre-url-encoded paths. Since URNs can contain free form IDs, there's nothing preventing them from having percentages.
+            // If we use double encoded paths, React ends up decoding them fully, which breaks our ability to read urns properly.
+            .replace(/%/g, '{{encoded_percent}}')
+            .replace(/\//g, '%2F')
+            .replace(/\?/g, '%3F')
+            .replace(/#/g, '%23')
+            .replace(/\[/g, '%5B')
+            .replace(/\]/g, '%5D')
+    );
+}
+
+export function decodeUrn(encodedUrn: string) {
+    // Hack-This is not ideal because it means that if you had the percent
+    // sequence in your urn things may not work as expected.
+    return decodeURIComponent(encodedUrn).replace(/{{encoded_percent}}/g, '%');
+}
+
+export function getNumberWithOrdinal(n) {
+    const suffixes = ['th', 'st', 'nd', 'rd'];
+    const v = n % 100;
+    return n + (suffixes[(v - 20) % 10] || suffixes[v] || suffixes[0]);
+}
+
+export const encodeComma = (str: string) => {
+    return str.replace(/,/g, '%2C');
+};
+
+export const decodeComma = (str: string) => {
+    return str.replace(/%2C/g, ',');
+};
+
+export function notEmpty<TValue>(value: TValue | null | undefined): value is TValue {
+    return value !== null && value !== undefined;
+}
+
+export const truncate = (length: number, input?: string | null) => {
+    if (!input) return '';
+    if (input.length > length) {
+        return `${input.substring(0, length)}...`;
+    }
+    return input;
+};
+
+export const singularizeCollectionName = (collectionName: string): string => {
+    if (!collectionName) {
+        return collectionName;
+    }
+
+    const lastChar = collectionName[collectionName.length - 1];
+    if (lastChar === 's') {
+        return collectionName.slice(0, -1);
+    }
+
+    return collectionName;
+};
+
+export function getPlatformName(entityData: GenericEntityProperties | null) {
+    const platformNames = entityData?.siblingPlatforms?.map(
+        (platform) => platform.properties?.displayName || capitalizeFirstLetterOnly(platform.name),
+    );
+    return (
+        platformNames?.[0] ||
+        entityData?.platform?.properties?.displayName ||
+        capitalizeFirstLetterOnly(entityData?.platform?.name)
+    );
+}
+
+export function getExternalUrlDisplayName(entity: GenericEntityProperties | null) {
+    // Scoping these constants
+    const GITHUB_LINK = 'github.com';
+    const GITHUB_NAME = 'GitHub';
+    const GITLAB_LINK = 'gitlab.com';
+    const GITLAB_NAME = 'GitLab';
+
+    const externalUrl = entity?.properties?.externalUrl;
+    if (externalUrl) {
+        if (externalUrl.toLocaleLowerCase().includes(GITHUB_LINK)) {
+            return GITHUB_NAME;
+        }
+        if (externalUrl.toLocaleLowerCase().includes(GITLAB_LINK)) {
+            return GITLAB_NAME;
+        }
+    }
+
+    return entity?.platform?.properties?.displayName || capitalizeFirstLetterOnly(entity?.platform?.name);
+}
+
+export const EDITED_DESCRIPTIONS_CACHE_NAME = 'editedDescriptions';
+
+export const FORBIDDEN_URN_CHARS_REGEX = /.*[(),\\].*/;
+
+export enum SidebarTitleActionType {
+    LineageExplore = 'Lineage Explore',
+}
+
+/**
+ * Utility function for checking whether a list is a subset of another.
+ */
+export const isListSubset = (l1, l2): boolean => {
+    return l1.every((result) => l2.indexOf(result) >= 0);
+};
+
+function getGraphqlErrorCode(e) {
+    if (e.graphQLErrors && e.graphQLErrors.length) {
+        const firstError = e.graphQLErrors[0];
+        const { extensions } = firstError;
+        const errorCode = extensions && (extensions.code as number);
+        return errorCode;
+    }
+    return undefined;
+}
+
+export const handleBatchError = (urns, e, defaultMessage) => {
+    if (urns.length > 1 && getGraphqlErrorCode(e) === 403) {
+        return {
+            content:
+                'Your bulk edit selection included entities that you are unauthorized to update. The bulk edit being performed will not be saved.',
+            duration: 3,
+        };
+    }
+    return defaultMessage;
+};
+
+// put all of the fineGrainedLineages for a given entity and its siblings into one array so we have all of it in one place
+export function getFineGrainedLineageWithSiblings(
+    entityData: GenericEntityProperties | null,
+    getGenericEntityProperties: (type: EntityType, data: Entity) => GenericEntityProperties | null,
+) {
+    const fineGrainedLineages = [
+        ...(entityData?.fineGrainedLineages || entityData?.inputOutput?.fineGrainedLineages || []),
+    ];
+    entityData?.siblingsSearch?.searchResults?.forEach((sibling) => {
+        if (sibling.entity) {
+            const genericSiblingProps = getGenericEntityProperties(sibling.entity.type, sibling.entity);
+            if (genericSiblingProps && genericSiblingProps.fineGrainedLineages) {
+                fineGrainedLineages.push(...genericSiblingProps.fineGrainedLineages);
+            }
+        }
+    });
+    return fineGrainedLineages;
+}
+export function getDataProduct(dataProductResult: Maybe<EntityRelationshipsResult> | undefined) {
+    if (dataProductResult?.relationships && dataProductResult.relationships.length > 0) {
+        return dataProductResult.relationships[0].entity as DataProduct;
+    }
+    return null;
+}
+
+export function summaryHasStats(
+    statsSummary: DatasetStatsSummary | ChartStatsSummary | DashboardStatsSummary | undefined | null,
+): boolean {
+    return !!Object.entries(statsSummary || {}).find(
+        ([key, value]) => !key.startsWith('__') && (Array.isArray(value) ? value.length : value),
+    );
+}
+
+export function isOutputPort(result: SearchResult) {
+    return result.extraProperties?.find((prop) => prop.name === OUTPUT_PORTS_FIELD)?.value === 'true';
+}
+
+export const computeChartTickInterval = (windowSize: TimeWindowSize): DateInterval => {
+    switch (windowSize.interval) {
+        case DateInterval.Day:
+            return DateInterval.Hour;
+        case DateInterval.Week:
+            return DateInterval.Day;
+        case DateInterval.Month:
+            return DateInterval.Week;
+        case DateInterval.Year:
+            return DateInterval.Month;
+        default:
+            throw new Error(`Unrecognized DateInterval provided ${windowSize.interval}`);
+    }
+};
+
+export const computeAllFieldPaths = (profiles: Array<DatasetProfile>): Set<string> => {
+    const uniqueFieldPaths = new Set<string>();
+    profiles.forEach((profile) => {
+        const fieldProfiles = profile.fieldProfiles || [];
+        fieldProfiles.forEach((fieldProfile) => {
+            uniqueFieldPaths.add(fieldProfile.fieldPath);
+        });
+    });
+    return uniqueFieldPaths;
+};
+
+const isPresent = (val: any) => {
+    return val !== undefined && val !== null;
+};
+
+/**
+ * Extracts a set of points used to render charts from a list of Dataset Profiles +
+ * a particular numeric statistic name to extract. Note that the stat *must* be numeric for this utility to work.
+ */
+export const extractChartValuesFromTableProfiles = (profiles: Array<any>, statName: string) => {
+    return profiles
+        .filter((profile) => isPresent(profile[statName]))
+        .map((profile) => ({
+            timeMs: profile.timestampMillis,
+            value: profile[statName] as number,
+        }));
+};
+
+/**
+ * Extracts a set of field-specific points used to render charts from a list of Dataset Profiles +
+ * a particular numeric statistic name to extract. Note that the stat *must* be numeric for this utility to work.
+ */
+export const extractChartValuesFromFieldProfiles = (profiles: Array<any>, fieldPath: string, statName: string) => {
+    return profiles
+        .filter((profile) => profile.fieldProfiles)
+        .map((profile) => {
+            const fieldProfiles = profile.fieldProfiles
+                ?.filter((field) => field.fieldPath === fieldPath)
+                .filter((field) => field[statName] !== null && field[statName] !== undefined);
+
+            if (fieldProfiles?.length === 1) {
+                const fieldProfile = fieldProfiles[0];
+                return {
+                    timeMs: profile.timestampMillis,
+                    value: fieldProfile[statName],
+                };
+            }
+            return null;
+        })
+        .filter((value) => value !== null);
+};
+
+// Dataset
+export type DatasetLastUpdatedMs = {
+    property: 'lastModified' | 'lastUpdated' | undefined;
+    lastUpdatedMs: number | undefined;
+};
+export function getDatasetLastUpdatedMs(
+    properties: Pick<DatasetProperties, 'lastModified'> | null | undefined,
+    operations: Pick<Operation, 'lastUpdatedTimestamp'>[] | null | undefined,
+): DatasetLastUpdatedMs {
+    const lastModified = properties?.lastModified?.time || 0;
+    const lastUpdated = (operations?.length && operations[0].lastUpdatedTimestamp) || 0;
+
+    const max = Math.max(lastModified, lastUpdated);
+
+    if (max === 0) return { property: undefined, lastUpdatedMs: undefined };
+    if (max === lastModified) return { property: 'lastModified', lastUpdatedMs: lastModified };
+    return { property: 'lastUpdated', lastUpdatedMs: lastUpdated };
+}
+
+// Chart & Dashboard
+export type DashboardLastUpdatedMs = {
+    property: 'lastModified' | 'lastRefreshed' | undefined;
+    lastUpdatedMs: number | undefined;
+};
+
+export function getDashboardLastUpdatedMs(
+    properties: Pick<ChartProperties, 'lastModified' | 'lastRefreshed'> | null | undefined,
+): DashboardLastUpdatedMs {
+    const lastModified = properties?.lastModified?.time || 0;
+    const lastRefreshed = properties?.lastRefreshed || 0;
+
+    const max = Math.max(lastModified, lastRefreshed);
+
+    if (max === 0) return { property: undefined, lastUpdatedMs: undefined };
+    if (max === lastModified) return { property: 'lastModified', lastUpdatedMs: lastModified };
+    return { property: 'lastRefreshed', lastUpdatedMs: lastRefreshed };
+}
diff --git a/datahub-web-react/src/app/entityV2/structuredProperty/StructuredPropertyEntity.tsx b/datahub-web-react/src/app/entityV2/structuredProperty/StructuredPropertyEntity.tsx
new file mode 100644
index 00000000000000..ec181981bcb9f6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/structuredProperty/StructuredPropertyEntity.tsx
@@ -0,0 +1,91 @@
+import TableIcon from '@src/images/table-icon.svg?react';
+import * as React from 'react';
+import styled from 'styled-components';
+import { EntityType, SearchResult, StructuredPropertyEntity as StructuredProperty } from '../../../types.generated';
+import DefaultPreviewCard from '../../previewV2/DefaultPreviewCard';
+import { Entity, IconStyleType, PreviewType } from '../Entity';
+import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import { urlEncodeUrn } from '../shared/utils';
+
+const PreviewPropIcon = styled(TableIcon)`
+    font-size: 20px;
+`;
+
+/**
+ * Definition of the DataHub Structured Property entity.
+ */
+export class StructuredPropertyEntity implements Entity<StructuredProperty> {
+    type: EntityType = EntityType.StructuredProperty;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <TableIcon className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return <TableIcon className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color: color || '#B37FEB' }} />;
+        }
+
+        return (
+            <TableIcon
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => false;
+
+    isBrowseEnabled = () => false;
+
+    isLineageEnabled = () => false;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getGraphName = () => 'structuredProperty';
+
+    getPathName: () => string = () => this.getGraphName();
+
+    getCollectionName: () => string = () => 'Structured Properties';
+
+    getEntityName: () => string = () => 'Structured Property';
+
+    renderProfile: (urn: string) => JSX.Element = (_urn) => <div />; // not used right now
+
+    renderPreview = (previewType: PreviewType, data: StructuredProperty) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <DefaultPreviewCard
+                data={genericProperties}
+                description={data.definition?.description || ''}
+                name={this.displayName(data)}
+                urn={data.urn}
+                url={`/${this.getPathName()}/${urlEncodeUrn(data.urn)}`}
+                logoComponent={<PreviewPropIcon />}
+                entityType={EntityType.StructuredProperty}
+                typeIcon={this.icon(14, IconStyleType.ACCENT)}
+                previewType={previewType}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        return this.renderPreview(PreviewType.SEARCH, result.entity as StructuredProperty);
+    };
+
+    displayName = (data: StructuredProperty) => {
+        return data?.definition?.displayName || data?.definition?.qualifiedName || data?.urn;
+    };
+
+    getGenericEntityProperties = (entity: StructuredProperty) => {
+        return getDataForEntityType({ data: entity, entityType: this.type, getOverrideProperties: (data) => data });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([]);
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/tag/CompactTagProfile.tsx b/datahub-web-react/src/app/entityV2/tag/CompactTagProfile.tsx
new file mode 100644
index 00000000000000..f09b7679c6a443
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/tag/CompactTagProfile.tsx
@@ -0,0 +1,70 @@
+import React, { useContext, useState } from 'react';
+
+import { matchPath, useLocation } from 'react-router';
+import { ReadOutlined } from '@ant-design/icons';
+import styled from 'styled-components';
+
+import { PageRoutes } from '../../../conf/Global';
+import EntitySidebarContext from '../../sharedV2/EntitySidebarContext';
+import TagStyleEntity from '../../shared/TagStyleEntity';
+import { StyledEntitySidebarContainer, StyledSidebar } from '../shared/containers/profile/sidebar/EntityProfileSidebar';
+import { EntitySidebarTab } from '../shared/types';
+import EntitySidebarSectionsTab from '../shared/containers/profile/sidebar/EntitySidebarSectionsTab';
+import { EntitySidebarTabs } from '../shared/containers/profile/sidebar/EntitySidebarTabs';
+import { defaultTabDisplayConfig } from '../shared/containers/profile/utils';
+
+const CompactEntityWrapper = styled.div<{ $isClosed: boolean }>`
+    ${(props) => !props.$isClosed && 'padding: 16px;'}
+    border-right: 1px solid #e8e8e8;
+    flex: 1;
+    overflow: inherit;
+`;
+
+const TabsContainer = styled.div``;
+
+interface Props {
+    urn: string;
+}
+
+/**
+ * Responsible for displaying metadata about a tag
+ */
+export default function CompactTagProfile({ urn }: Props) {
+    const location = useLocation();
+    const isInSearch = matchPath(location.pathname, PageRoutes.SEARCH_RESULTS) !== null;
+    const { isClosed, width } = useContext(EntitySidebarContext);
+
+    const tabs: EntitySidebarTab[] = [
+        {
+            name: 'About',
+            icon: ReadOutlined,
+            component: EntitySidebarSectionsTab,
+            display: defaultTabDisplayConfig,
+        },
+    ];
+
+    const [selectedTabName, setSelectedTabName] = useState(tabs[0].name);
+    const selectedTab = tabs.find((tab) => tab.name === selectedTabName);
+
+    return (
+        <StyledEntitySidebarContainer
+            isCollapsed={isClosed}
+            $width={width}
+            id="entity-profile-sidebar"
+            isFocused={isInSearch}
+        >
+            <StyledSidebar isCard={isInSearch} isFocused={isInSearch}>
+                <CompactEntityWrapper $isClosed={isClosed}>
+                    <TagStyleEntity urn={urn} />
+                </CompactEntityWrapper>
+                <TabsContainer>
+                    <EntitySidebarTabs
+                        tabs={tabs}
+                        selectedTab={selectedTab}
+                        onSelectTab={(name) => setSelectedTabName(name)}
+                    />
+                </TabsContainer>
+            </StyledSidebar>
+        </StyledEntitySidebarContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/tag/Tag.tsx b/datahub-web-react/src/app/entityV2/tag/Tag.tsx
new file mode 100644
index 00000000000000..e57c5ddc8bd5ae
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/tag/Tag.tsx
@@ -0,0 +1,92 @@
+import { TagOutlined, TagFilled } from '@ant-design/icons';
+import * as React from 'react';
+import styled from 'styled-components';
+import { Tag, EntityType, SearchResult } from '../../../types.generated';
+import DefaultPreviewCard from '../../previewV2/DefaultPreviewCard';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import { urlEncodeUrn } from '../shared/utils';
+import TagProfile from './TagProfile';
+import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+
+const PreviewTagIcon = styled(TagOutlined)`
+    font-size: 20px;
+`;
+
+/**
+ * Definition of the DataHub Tag entity.
+ */
+export class TagEntity implements Entity<Tag> {
+    type: EntityType = EntityType.Tag;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <TagFilled className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return <TagFilled className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color: color || '#B37FEB' }} />;
+        }
+
+        return (
+            <TagOutlined
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => false;
+
+    isLineageEnabled = () => false;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getGraphName = () => 'tag';
+
+    getPathName: () => string = () => this.getGraphName();
+
+    getCollectionName: () => string = () => 'Tags';
+
+    getEntityName: () => string = () => 'Tag';
+
+    renderProfile: (urn: string) => JSX.Element = (urn) => <TagProfile urn={urn} />;
+
+    renderPreview = (previewType: PreviewType, data: Tag) => {
+        const genericProperties = this.getGenericEntityProperties(data);
+        return (
+            <DefaultPreviewCard
+                data={genericProperties}
+                description={data.description || ''}
+                name={this.displayName(data)}
+                urn={data.urn}
+                url={`/${this.getPathName()}/${urlEncodeUrn(data.urn)}`}
+                logoComponent={<PreviewTagIcon />}
+                entityType={EntityType.Tag}
+                typeIcon={this.icon(14, IconStyleType.ACCENT)}
+                previewType={previewType}
+            />
+        );
+    };
+
+    renderSearch = (result: SearchResult) => {
+        return this.renderPreview(PreviewType.SEARCH, result.entity as Tag);
+    };
+
+    displayName = (data: Tag) => {
+        return data.properties?.name || data.name || data.urn;
+    };
+
+    getGenericEntityProperties = (tag: Tag) => {
+        return getDataForEntityType({ data: tag, entityType: this.type, getOverrideProperties: (data) => data });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([EntityCapabilityType.OWNERS]);
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/tag/TagProfile.tsx b/datahub-web-react/src/app/entityV2/tag/TagProfile.tsx
new file mode 100644
index 00000000000000..ece0532e8e2612
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/tag/TagProfile.tsx
@@ -0,0 +1,40 @@
+import React, { useContext } from 'react';
+import styled from 'styled-components';
+import { Message } from '../../shared/Message';
+import TagStyleEntity from '../../shared/TagStyleEntity';
+import { useGetTagQuery } from '../../../graphql/tag.generated';
+import CompactContext from '../../shared/CompactContext';
+import CompactTagProfile from './CompactTagProfile';
+
+const PageContainer = styled.div`
+    padding: 32px 100px;
+    background-color: white;
+    border-radius: 8px;
+`;
+
+const LoadingMessage = styled(Message)`
+    margin-top: 10%;
+`;
+
+interface Props {
+    urn: string;
+}
+
+/**
+ * Responsible for displaying metadata about a tag
+ */
+export default function TagProfile({ urn }: Props) {
+    const { loading } = useGetTagQuery({ variables: { urn } });
+    const isCompact = useContext(CompactContext);
+
+    if (isCompact) {
+        return <CompactTagProfile urn={urn} />;
+    }
+
+    return (
+        <PageContainer>
+            {loading && <LoadingMessage type="loading" content="Loading..." />}
+            <TagStyleEntity urn={urn} />
+        </PageContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/tag/__tests__/TagProfile.test.tsx b/datahub-web-react/src/app/entityV2/tag/__tests__/TagProfile.test.tsx
new file mode 100644
index 00000000000000..238af61bba31b6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/tag/__tests__/TagProfile.test.tsx
@@ -0,0 +1,58 @@
+import React from 'react';
+import { render, waitFor } from '@testing-library/react';
+import { MockedProvider } from '@apollo/client/testing';
+import { Route } from 'react-router';
+
+import TagProfile from '../TagProfile';
+import TestPageContainer from '../../../../utils/test-utils/TestPageContainer';
+import { mocks } from '../../../../Mocks';
+
+describe('TagProfile', () => {
+    it('renders tag details', async () => {
+        const { getByText, queryByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer initialEntries={['/tag/urn:li:tag:abc-sample-tag']}>
+                    <Route path="/tag/:urn" render={() => <TagProfile urn="urn:li:tag:abc-sample-tag" />} />
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+
+        await waitFor(() => expect(queryByText('abc-sample-tag')).toBeInTheDocument());
+
+        expect(getByText('abc-sample-tag')).toBeInTheDocument();
+        expect(getByText('sample tag description')).toBeInTheDocument();
+    });
+
+    it('renders tag ownership', async () => {
+        const { queryByText } = render(
+            <MockedProvider
+                mocks={mocks}
+                addTypename={false}
+                defaultOptions={{
+                    watchQuery: { fetchPolicy: 'no-cache' },
+                    query: { fetchPolicy: 'no-cache' },
+                }}
+            >
+                <TestPageContainer initialEntries={['/tag/urn:li:tag:abc-sample-tag']}>
+                    <Route path="/tag/:urn" render={() => <TagProfile urn="urn:li:tag:abc-sample-tag" />} />
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+
+        await waitFor(() => expect(queryByText('abc-sample-tag')).not.toBeInTheDocument());
+    });
+
+    it('renders stats', async () => {
+        const { queryByText } = render(
+            <MockedProvider mocks={mocks} addTypename={false}>
+                <TestPageContainer initialEntries={['/tag/urn:li:tag:abc-sample-tag']}>
+                    <Route path="/tag/:urn" render={() => <TagProfile urn="urn:li:tag:abc-sample-tag" />} />
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+
+        await waitFor(() => expect(queryByText('abc-sample-tag')).not.toBeInTheDocument());
+
+        await waitFor(() => expect(queryByText('Loading')).not.toBeInTheDocument());
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/user/User.tsx b/datahub-web-react/src/app/entityV2/user/User.tsx
new file mode 100644
index 00000000000000..b1265d28755de0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/user/User.tsx
@@ -0,0 +1,85 @@
+import { UserOutlined } from '@ant-design/icons';
+import * as React from 'react';
+import { CorpUser, EntityType, SearchResult } from '../../../types.generated';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import { Preview } from './preview/Preview';
+import UserProfile from './UserProfile';
+import { TYPE_ICON_CLASS_NAME } from '../shared/components/subtypes';
+
+/**
+ * Definition of the DataHub Dataset entity.
+ */
+export class UserEntity implements Entity<CorpUser> {
+    type: EntityType = EntityType.CorpUser;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <UserOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return <UserOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        return (
+            <UserOutlined
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => true;
+
+    isBrowseEnabled = () => false;
+
+    isLineageEnabled = () => false;
+
+    getAutoCompleteFieldName = () => 'username';
+
+    getGraphName: () => string = () => 'corpuser';
+
+    getPathName: () => string = () => 'user';
+
+    getEntityName = () => 'Person';
+
+    getCollectionName: () => string = () => 'People';
+
+    renderProfile = (urn: string) => <UserProfile urn={urn} />;
+
+    renderPreview = (_: PreviewType, data: CorpUser) => (
+        <Preview
+            urn={data.urn}
+            name={this.displayName(data)}
+            title={data.editableProperties?.title || data.info?.title || ''}
+        />
+    );
+
+    renderSearch = (result: SearchResult) => {
+        return this.renderPreview(PreviewType.SEARCH, result.entity as CorpUser);
+    };
+
+    displayName = (data: CorpUser) => {
+        return (
+            data.editableProperties?.displayName ||
+            data.properties?.displayName ||
+            data.properties?.fullName ||
+            data.info?.displayName || // Deprecated info field
+            data.info?.fullName || // Deprecated info field
+            data.username ||
+            data.urn
+        );
+    };
+
+    getGenericEntityProperties = (user: CorpUser) => {
+        return getDataForEntityType({ data: user, entityType: this.type, getOverrideProperties: (data) => data });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([EntityCapabilityType.ROLES]);
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/user/UserAssets.tsx b/datahub-web-react/src/app/entityV2/user/UserAssets.tsx
new file mode 100644
index 00000000000000..851c00fe8994a7
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/user/UserAssets.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import styled from 'styled-components';
+import { UnionType } from '../../search/utils/constants';
+import { EmbeddedListSearchSection } from '../shared/components/styled/search/EmbeddedListSearchSection';
+
+const UserAssetsWrapper = styled.div`
+    height: 100%;
+`;
+
+type Props = {
+    urn: string;
+};
+
+export const UserAssets = ({ urn }: Props) => {
+    return (
+        <UserAssetsWrapper>
+            <EmbeddedListSearchSection
+                skipCache
+                fixedFilters={{
+                    unionType: UnionType.AND,
+                    filters: [{ field: 'owners', values: [urn] }],
+                }}
+                emptySearchQuery="*"
+                placeholderText="Filter entities..."
+            />
+        </UserAssetsWrapper>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/user/UserBasicInfoContainer.tsx b/datahub-web-react/src/app/entityV2/user/UserBasicInfoContainer.tsx
new file mode 100644
index 00000000000000..e987265b90b2e8
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/user/UserBasicInfoContainer.tsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import { Divider } from 'antd';
+import { Tooltip } from '@components';
+import { PhoneOutlined, SlackOutlined } from '@ant-design/icons';
+import {
+    EmptyValue,
+    SocialDetails,
+    Name,
+    TitleRole,
+    RoleName,
+    BasicDetailsContainer,
+    DraftsOutlinedIconStyle,
+    BasicDetails,
+    NameTitleContainer,
+    SocialInfo,
+} from '../shared/SidebarStyledComponents';
+import { REDESIGN_COLORS } from '../shared/constants';
+
+type Props = {
+    name: string | undefined;
+    dataHubRoleName: string;
+    email: string | undefined;
+    role: string | undefined;
+    slack: string | undefined;
+    phone: string | undefined;
+};
+
+export const UserBasicInfoContainer = ({ name, dataHubRoleName, email, role, slack, phone }: Props) => {
+    return (
+        <BasicDetailsContainer>
+            <BasicDetails>
+                <NameTitleContainer>
+                    <Name>
+                        <Tooltip title={name}>
+                            <span>{name || <EmptyValue />}</span>
+                        </Tooltip>
+                        {dataHubRoleName ? <RoleName>{dataHubRoleName}</RoleName> : null}
+                    </Name>
+                    <TitleRole>{role || <EmptyValue color={REDESIGN_COLORS.WHITE} />}</TitleRole>
+                </NameTitleContainer>
+                <Divider />
+                <SocialInfo>
+                    <SocialDetails>
+                        <DraftsOutlinedIconStyle />
+                        <Tooltip title={email}>{email || <EmptyValue />}</Tooltip>
+                    </SocialDetails>
+                    <SocialDetails>
+                        <SlackOutlined />
+                        <Tooltip title={slack}>{slack || <EmptyValue />}</Tooltip>
+                    </SocialDetails>
+                    <SocialDetails>
+                        <PhoneOutlined />
+                        <Tooltip title={phone}>{phone || <EmptyValue />}</Tooltip>
+                    </SocialDetails>
+                </SocialInfo>
+            </BasicDetails>
+        </BasicDetailsContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/user/UserEditProfileModal.tsx b/datahub-web-react/src/app/entityV2/user/UserEditProfileModal.tsx
new file mode 100644
index 00000000000000..9b960f87dedcb0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/user/UserEditProfileModal.tsx
@@ -0,0 +1,277 @@
+import { MoreOutlined } from '@ant-design/icons';
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components';
+import { message, Button, Input, Modal, Typography, Form } from 'antd';
+import { Tooltip } from '@components';
+import { useUpdateCorpUserPropertiesMutation } from '../../../graphql/user.generated';
+import { useAppConfig } from '../../useAppConfig';
+
+const StyledInput = styled(Input)`
+    margin-bottom: 20px;
+`;
+
+const StyledText = styled(Typography.Text)`
+    display: block;
+    position: absolute;
+    bottom: 11.5rem;
+`;
+
+type PropsData = {
+    name: string | undefined;
+    title: string | undefined;
+    image: string | undefined;
+    team: string | undefined;
+    email: string | undefined;
+    slack: string | undefined;
+    phone: string | undefined;
+    urn: string | undefined;
+};
+
+type Props = {
+    visible: boolean;
+    onClose: () => void;
+    onSave: () => void;
+    editModalData: PropsData;
+};
+/** Regex Validations */
+export const USER_NAME_REGEX = new RegExp('^[a-zA-Z ]*$');
+
+export default function UserEditProfileModal({ visible, onClose, onSave, editModalData }: Props) {
+    const { config } = useAppConfig();
+    const { readOnlyModeEnabled } = config.featureFlags;
+    const [updateCorpUserPropertiesMutation] = useUpdateCorpUserPropertiesMutation();
+    const [form] = Form.useForm();
+
+    const [saveButtonEnabled, setSaveButtonEnabled] = useState(true);
+    const [data, setData] = useState<PropsData>({
+        name: editModalData.name,
+        title: editModalData.title,
+        image: editModalData.image,
+        team: editModalData.team,
+        email: editModalData.email,
+        slack: editModalData.slack,
+        phone: editModalData.phone,
+        urn: editModalData.urn,
+    });
+
+    useEffect(() => {
+        setData({ ...editModalData });
+    }, [editModalData]);
+
+    // save changes function
+    const onSaveChanges = () => {
+        updateCorpUserPropertiesMutation({
+            variables: {
+                urn: editModalData?.urn || '',
+                input: {
+                    displayName: data.name,
+                    title: data.title,
+                    pictureLink: data.image,
+                    teams: data.team?.split(','),
+                    email: data.email,
+                    slack: data.slack,
+                    phone: data.phone,
+                },
+            },
+        })
+            .then(() => {
+                message.success({
+                    content: `Changes saved.`,
+                    duration: 3,
+                });
+                onSave(); // call the refetch function once save
+                // clear the values from edit profile form
+                setData({
+                    name: '',
+                    title: '',
+                    image: '',
+                    team: '',
+                    email: '',
+                    slack: '',
+                    phone: '',
+                    urn: '',
+                });
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to Save changes!: \n ${e.message || ''}`, duration: 3 });
+            });
+        onClose();
+    };
+
+    return (
+        <Modal
+            title="Edit Profile"
+            open={visible}
+            onCancel={onClose}
+            footer={
+                <>
+                    <Button onClick={onClose} type="text">
+                        Cancel
+                    </Button>
+                    <Button type="primary" id="editUserButton" onClick={onSaveChanges} disabled={saveButtonEnabled}>
+                        Save Changes
+                    </Button>
+                </>
+            }
+        >
+            <Form
+                form={form}
+                initialValues={{ ...editModalData }}
+                autoComplete="off"
+                layout="vertical"
+                onFieldsChange={() =>
+                    setSaveButtonEnabled(form.getFieldsError().some((field) => field.errors.length > 0))
+                }
+                onKeyPress={(event) => {
+                    if (event.key === 'Enter') {
+                        event.preventDefault();
+                        onSaveChanges();
+                    }
+                }}
+            >
+                <Form.Item
+                    name="name"
+                    label={<Typography.Text strong>Name</Typography.Text>}
+                    rules={[
+                        {
+                            required: true,
+                            message: 'Enter a display name.',
+                        },
+                        { whitespace: true },
+                        { min: 2, max: 50 },
+                        {
+                            pattern: USER_NAME_REGEX,
+                            message: '',
+                        },
+                    ]}
+                    hasFeedback
+                >
+                    <Input
+                        placeholder="John Smith"
+                        value={data.name}
+                        onChange={(event) => setData({ ...data, name: event.target.value })}
+                        disabled={readOnlyModeEnabled}
+                    />
+                </Form.Item>
+                <Form.Item
+                    name="title"
+                    label={<Typography.Text strong>Title/Role</Typography.Text>}
+                    rules={[{ whitespace: true }, { min: 2, max: 50 }]}
+                    hasFeedback
+                >
+                    <Input
+                        placeholder="Data Analyst"
+                        value={data.title}
+                        onChange={(event) => setData({ ...data, title: event.target.value })}
+                        disabled={readOnlyModeEnabled}
+                    />
+                </Form.Item>
+                <Tooltip
+                    title="Editing image URL has been disabled."
+                    overlayStyle={readOnlyModeEnabled ? {} : { display: 'none' }}
+                    placement="bottom"
+                >
+                    <Form.Item
+                        name="image"
+                        label={<Typography.Text strong>Image URL</Typography.Text>}
+                        rules={[{ whitespace: true }, { type: 'url', message: 'not valid url' }]}
+                        hasFeedback
+                    >
+                        <Input
+                            placeholder="https://www.example.com/photo.png"
+                            value={data.image}
+                            onChange={(event) => setData({ ...data, image: event.target.value })}
+                            disabled={readOnlyModeEnabled}
+                        />
+                    </Form.Item>
+                </Tooltip>
+                <Form.Item
+                    name="team"
+                    label={<Typography.Text strong>Team</Typography.Text>}
+                    rules={[{ whitespace: true }, { min: 2, max: 50 }]}
+                >
+                    <Input
+                        placeholder="Product Engineering"
+                        value={data.team}
+                        onChange={(event) => setData({ ...data, team: event.target.value })}
+                        disabled={readOnlyModeEnabled}
+                    />
+                </Form.Item>
+                <Form.Item
+                    name="email"
+                    label={<Typography.Text strong>Email</Typography.Text>}
+                    rules={[
+                        {
+                            required: true,
+                            message: 'Enter your email',
+                        },
+                        {
+                            type: 'email',
+                            message: 'Please enter valid email',
+                        },
+                        { whitespace: true },
+                        { min: 2, max: 50 },
+                    ]}
+                    hasFeedback
+                >
+                    <Input
+                        placeholder="john.smith@example.com"
+                        value={data.email}
+                        onChange={(event) => setData({ ...data, email: event.target.value })}
+                        disabled={readOnlyModeEnabled}
+                    />
+                </Form.Item>
+                <Form.Item
+                    name="slack"
+                    label={
+                        <>
+                            <Typography.Text strong>Slack Member ID</Typography.Text>
+                        </>
+                    }
+                    rules={[{ whitespace: true }, { min: 2, max: 50 }]}
+                    hasFeedback
+                >
+                    <StyledInput
+                        placeholder="ABC12345678"
+                        value={data.slack}
+                        onChange={(event) => setData({ ...data, slack: event.target.value })}
+                        disabled={readOnlyModeEnabled}
+                    />
+                </Form.Item>
+                <StyledText type="secondary">
+                    Find your member ID from the <MoreOutlined /> menu in your Slack profile. More info{' '}
+                    <a
+                        href="https://slack.com/intl/en-ca/help/articles/212906697-Where-can-I-find-my-Slack-member-ID-"
+                        target="_blank"
+                        rel="noreferrer"
+                    >
+                        here.
+                    </a>
+                </StyledText>
+                <Form.Item
+                    name="phone"
+                    label={<Typography.Text strong>Phone</Typography.Text>}
+                    rules={[
+                        {
+                            pattern: new RegExp('^(?=.*[0-9])[- +()0-9]+$'),
+                            message: 'not valid phone number',
+                        },
+                        {
+                            min: 5,
+                            max: 15,
+                        },
+                    ]}
+                    hasFeedback
+                >
+                    <Input
+                        placeholder="444-999-9999"
+                        value={data.phone}
+                        onChange={(event) => setData({ ...data, phone: event.target.value })}
+                        disabled={readOnlyModeEnabled}
+                    />
+                </Form.Item>
+            </Form>
+        </Modal>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/user/UserGroups.tsx b/datahub-web-react/src/app/entityV2/user/UserGroups.tsx
new file mode 100644
index 00000000000000..94b9528e8b5f52
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/user/UserGroups.tsx
@@ -0,0 +1,142 @@
+import { Col, Pagination, Row } from 'antd';
+import { Tooltip } from '@components';
+import React, { useState } from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import { useGetUserGroupsLazyQuery } from '../../../graphql/user.generated';
+import { CorpGroup, EntityRelationship, EntityType } from '../../../types.generated';
+import { scrollToTop } from '../../shared/searchUtils';
+import { useEntityRegistry } from '../../useEntityRegistry';
+
+type Props = {
+    urn: string;
+    initialRelationships?: Array<EntityRelationship> | null;
+    pageSize: number;
+};
+
+const GroupsViewWrapper = styled.div`
+    height: calc(100vh - 173px);
+    overflow-y: auto;
+
+    .user-group-pagination {
+        justify-content: center;
+        bottom: 24px;
+        position: absolute;
+        width: 100%;
+        left: 50%;
+        -webkit-transform: translateX(-50%);
+        -moz-transform: translateX(-50%);
+        -webkit-transform: translateX(-50%);
+        -ms-transform: translateX(-50%);
+        transform: translateX(-50%);
+    }
+`;
+
+const GroupItemColumn = styled(Col)`
+    padding: 10px;
+`;
+
+const GroupItem = styled.div`
+    border: 1px solid #eaeaea;
+    padding: 10px;
+    min-height: 107px;
+    max-height: 107px;
+    border-radius: 5px;
+
+    .title-row {
+        padding: 9px 11px 9px 11px;
+    }
+    .description-row {
+        padding: 2px 13px;
+    }
+    overflow: hidden;
+`;
+
+const GroupTitle = styled.span`
+    font-size: 14px;
+    line-height: 22px;
+    font-weight: bold;
+    color: #262626;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+`;
+
+const GroupMember = styled.span`
+    font-weight: 500;
+    font-size: 12px;
+    line-height: 23px;
+    color: #8c8c8c;
+    padding-left: 7px;
+`;
+
+const GroupDescription = styled.span`
+    font-weight: 500;
+    font-size: 12px;
+    line-height: 20px;
+    color: #262626;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    max-width: 100%;
+`;
+
+export default function UserGroups({ urn, initialRelationships, pageSize }: Props) {
+    const [page, setPage] = useState(1);
+    const entityRegistry = useEntityRegistry();
+
+    const [getGroups, { data: groupsData }] = useGetUserGroupsLazyQuery();
+
+    const onChangeGroupsPage = (newPage: number) => {
+        scrollToTop();
+        setPage(newPage);
+        const start = (newPage - 1) * pageSize;
+        getGroups({ variables: { urn, start, count: pageSize } });
+    };
+
+    const relationships = groupsData ? groupsData.corpUser?.relationships?.relationships : initialRelationships;
+    const total = relationships?.length || 0;
+    const userGroups = relationships?.map((rel) => rel.entity as CorpGroup) || [];
+
+    return (
+        <GroupsViewWrapper>
+            <Row justify="start">
+                {userGroups &&
+                    userGroups.map((item) => {
+                        return (
+                            <GroupItemColumn xl={8} lg={8} md={12} sm={12} xs={24} key={item.urn}>
+                                <Link to={entityRegistry.getEntityUrl(EntityType.CorpGroup, item.urn)}>
+                                    <GroupItem>
+                                        <Row className="title-row">
+                                            <GroupTitle>{item.info?.displayName || item.name}</GroupTitle>
+                                            <GroupMember>
+                                                {item.relationships?.total}
+                                                {item.relationships?.total === 1 ? ' member' : ' members'}
+                                            </GroupMember>
+                                        </Row>
+                                        <Row className="description-row">
+                                            <GroupDescription>
+                                                <Tooltip title={item.info?.description}>
+                                                    {item.info?.description}
+                                                </Tooltip>
+                                            </GroupDescription>
+                                        </Row>
+                                    </GroupItem>
+                                </Link>
+                            </GroupItemColumn>
+                        );
+                    })}
+            </Row>
+            <Row className="user-group-pagination">
+                <Pagination
+                    current={page}
+                    pageSize={pageSize}
+                    total={total}
+                    showLessItems
+                    onChange={onChangeGroupsPage}
+                    showSizeChanger={false}
+                />
+            </Row>
+        </GroupsViewWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/user/UserHeader.tsx b/datahub-web-react/src/app/entityV2/user/UserHeader.tsx
new file mode 100644
index 00000000000000..06d88fcf14184a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/user/UserHeader.tsx
@@ -0,0 +1,100 @@
+// import { UserOutlined } from '@ant-design/icons';
+import styled from 'styled-components';
+import React from 'react';
+import { Space, Badge, Typography, Divider } from 'antd';
+import CustomAvatar from '../../shared/avatar/CustomAvatar';
+
+type Props = {
+    profileSrc?: string | null;
+    name: string;
+    title?: string | null;
+    skills?: string[] | null;
+    teams?: string[] | null;
+    email?: string | null;
+};
+
+const Row = styled.div`
+    display: inline-flex;
+`;
+
+const AvatarWrapper = styled.div`
+    margin-right: 32px;
+`;
+
+const Traits = styled.div`
+    display: inline-flex;
+    margin-top: 32px;
+`;
+
+const Skills = styled.div`
+    margin-right: 32px;
+`;
+
+const TitleContainer = styled.div`
+    display: flex;
+    justify-content: center;
+    align-items: center;
+`;
+
+const HeaderContainer = styled.div`
+    display: flex;
+    justify-content: center;
+    align-items: center;
+`;
+
+const NameContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: left;
+`;
+
+export default function UserHeader({ profileSrc, name, title, skills, teams, email }: Props) {
+    return (
+        <Row>
+            <div>
+                <HeaderContainer>
+                    <AvatarWrapper>
+                        <CustomAvatar size={100} photoUrl={profileSrc || undefined} name={name || undefined} />
+                    </AvatarWrapper>
+                    <NameContainer>
+                        <Typography.Title level={3}>{name}</Typography.Title>
+                        <TitleContainer>
+                            {title && (
+                                <>
+                                    <Typography.Text>{title}</Typography.Text>
+                                    <Divider type="vertical" />
+                                </>
+                            )}
+                            {email && (
+                                <a href={`mailto:${email}`}>
+                                    <Typography.Text strong>{email}</Typography.Text>
+                                </a>
+                            )}
+                        </TitleContainer>
+                    </NameContainer>
+                </HeaderContainer>
+                <div>
+                    <Traits>
+                        <Skills>
+                            <Typography.Title level={5}>Ask me about</Typography.Title>
+                            <Space>
+                                {skills?.map((skill) => (
+                                    <Badge style={{ backgroundColor: '#108ee9' }} count={skill} key={skill} />
+                                ))}
+                            </Space>
+                        </Skills>
+                        <div>
+                            <Typography.Title level={5}>Teams</Typography.Title>
+                            <Space>
+                                {teams?.map((team) => (
+                                    <Badge style={{ backgroundColor: '#87d068' }} count={team} key={team} />
+                                ))}
+                            </Space>
+                        </div>
+                    </Traits>
+                </div>
+            </div>
+        </Row>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/user/UserProfile.tsx b/datahub-web-react/src/app/entityV2/user/UserProfile.tsx
new file mode 100644
index 00000000000000..5ce5d921a48214
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/user/UserProfile.tsx
@@ -0,0 +1,229 @@
+import { Col } from 'antd';
+import React, { useContext, useState } from 'react';
+import { ReadOutlined } from '@ant-design/icons';
+import colors from '@src/alchemy-components/theme/foundations/colors';
+import { matchPath } from 'react-router';
+import { useLocation } from 'react-router-dom';
+import styled from 'styled-components';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { PageRoutes } from '../../../conf/Global';
+import { useGetUserOwnedAssetsQuery, useGetUserQuery } from '../../../graphql/user.generated';
+import { EntityRelationship, EntityType } from '../../../types.generated';
+import { EntityContext } from '../../entity/shared/EntityContext';
+import { EntityHead } from '../../shared/EntityHead';
+import { GenericEntityProperties } from '../../entity/shared/types';
+import UserGroups from './UserGroups';
+import { RoutedTabs } from '../../shared/RoutedTabs';
+import { UserAssets } from './UserAssets';
+import UserSideBar from './UserSidebar';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { ErrorSection } from '../../shared/error/ErrorSection';
+import { StyledEntitySidebarContainer, StyledSidebar } from '../shared/containers/profile/sidebar/EntityProfileSidebar';
+import CompactContext from '../../shared/CompactContext';
+import { EntitySidebarTabs } from '../shared/containers/profile/sidebar/EntitySidebarTabs';
+import EntitySidebarSectionsTab from '../shared/containers/profile/sidebar/EntitySidebarSectionsTab';
+import EntitySidebarContext from '../../sharedV2/EntitySidebarContext';
+import SidebarCollapsibleHeader from '../shared/containers/profile/sidebar/SidebarCollapsibleHeader';
+
+export interface Props {
+    urn: string;
+}
+
+export enum TabType {
+    Assets = 'Owner Of',
+    Groups = 'Groups',
+}
+
+const ENABLED_TAB_TYPES = [TabType.Assets, TabType.Groups];
+
+const GROUP_PAGE_SIZE = 20;
+
+const defaultTabDisplayConfig = {
+    visible: (_, _1) => true,
+    enabled: (_, _1) => true,
+};
+
+/**
+ * Styled Components
+ */
+const UserProfileWrapper = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    &&& .ant-tabs-nav {
+        margin: 0;
+    }
+    background-color: #fff;
+    height: 100%;
+    overflow: hidden;
+    display: flex;
+    &&& .ant-tabs > .ant-tabs-nav .ant-tabs-nav-wrap {
+        padding-left: 15px;
+    }
+
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        box-shadow: ${props.theme.styles['box-shadow-navbar-redesign']};
+        margin: 5px;
+    `}
+    border-radius: ${(props) =>
+        props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '8px'};
+`;
+
+export const EmptyValue = styled.div`
+    &:after {
+        content: 'None';
+        color: #b7b7b7;
+        font-style: italic;
+        font-weight: 100;
+    }
+`;
+
+const ContentContainer = styled.div<{ isVisible: boolean }>`
+    flex: 1;
+    ${(props) => props.isVisible && 'border-right: 1px solid #e8e8e8;'}
+    overflow: inherit;
+`;
+
+const TabsContainer = styled.div``;
+
+const Tabs = styled.div``;
+
+/**
+ * Responsible for reading & writing users.
+ */
+export default function UserProfile({ urn }: Props) {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    const entityRegistry = useEntityRegistry();
+    const location = useLocation();
+    const isCompact = React.useContext(CompactContext);
+    const isInSearch = matchPath(location.pathname, PageRoutes.SEARCH_RESULTS) !== null;
+
+    const { error, data, loading, refetch } = useGetUserQuery({ variables: { urn, groupsCount: GROUP_PAGE_SIZE } });
+
+    const castedCorpUser = data?.corpUser as any;
+
+    const userGroups: Array<EntityRelationship> =
+        castedCorpUser?.groups?.relationships.map((relationship) => relationship as EntityRelationship) || [];
+    const userRoles: Array<EntityRelationship> =
+        castedCorpUser?.roles?.relationships.map((relationship) => relationship as EntityRelationship) || [];
+
+    const { data: userOwnedAsset } = useGetUserOwnedAssetsQuery({ variables: { urn } });
+    // Routed Tabs Constants
+    const getTabs = () => {
+        return [
+            {
+                name: TabType.Assets,
+                path: TabType.Assets.toLocaleLowerCase(),
+                content: <UserAssets urn={urn} />,
+                display: {
+                    enabled: () => true,
+                },
+            },
+            {
+                name: TabType.Groups,
+                path: TabType.Groups.toLocaleLowerCase(),
+                content: <UserGroups urn={urn} initialRelationships={userGroups} pageSize={GROUP_PAGE_SIZE} />,
+                display: {
+                    enabled: () => userGroups?.length > 0,
+                },
+            },
+        ].filter((tab) => ENABLED_TAB_TYPES.includes(tab.name));
+    };
+    const defaultTabPath = getTabs() && getTabs()?.length > 0 ? getTabs()[0].path : '';
+    const onTabChange = () => null;
+
+    const displayName =
+        data?.corpUser?.editableProperties?.displayName ||
+        (data?.corpUser && entityRegistry.getDisplayName(EntityType.CorpUser, data?.corpUser)) ||
+        undefined;
+
+    // Side bar data
+    const sidebarData = {
+        photoUrl: data?.corpUser?.editableProperties?.pictureLink || undefined,
+        avatarName:
+            data?.corpUser?.editableProperties?.displayName ||
+            data?.corpUser?.info?.displayName ||
+            data?.corpUser?.info?.fullName ||
+            data?.corpUser?.urn,
+        name: displayName,
+        role: data?.corpUser?.editableProperties?.title || data?.corpUser?.info?.title || undefined,
+        team: data?.corpUser?.editableProperties?.teams?.join(',') || data?.corpUser?.info?.departmentName || undefined,
+        email: data?.corpUser?.editableProperties?.email || data?.corpUser?.info?.email || undefined,
+        slack: data?.corpUser?.editableProperties?.slack || undefined,
+        phone: data?.corpUser?.editableProperties?.phone || undefined,
+        aboutText: data?.corpUser?.editableProperties?.aboutMe || undefined,
+        groupsDetails: userGroups,
+        dataHubRoles: userRoles,
+        ownerships: userOwnedAsset?.searchAcrossEntities?.searchResults || undefined,
+        urn,
+    };
+
+    const finalTabs = [
+        {
+            name: 'About',
+            icon: ReadOutlined,
+            component: EntitySidebarSectionsTab,
+            display: {
+                ...defaultTabDisplayConfig,
+            },
+        },
+    ];
+
+    const [selectedTabName, setSelectedTabName] = useState(finalTabs[0].name);
+    const selectedTab = finalTabs.find((tab) => tab.name === selectedTabName);
+    const { width, isClosed } = useContext(EntitySidebarContext);
+
+    if (isCompact) {
+        return (
+            <StyledEntitySidebarContainer isCollapsed={isClosed} $width={width} isFocused={isInSearch}>
+                <StyledSidebar isCard={isInSearch} isFocused={isInSearch}>
+                    <ContentContainer isVisible={!isClosed}>
+                        <SidebarCollapsibleHeader currentTab={selectedTab} />
+                        {!isClosed && <UserSideBar sidebarData={sidebarData} refetch={refetch} />}
+                    </ContentContainer>
+                    <TabsContainer>
+                        <Tabs>
+                            <EntitySidebarTabs
+                                tabs={finalTabs}
+                                selectedTab={selectedTab}
+                                onSelectTab={(name) => setSelectedTabName(name)}
+                            />
+                        </Tabs>
+                    </TabsContainer>
+                </StyledSidebar>
+            </StyledEntitySidebarContainer>
+        );
+    }
+
+    return (
+        <EntityContext.Provider
+            value={{
+                urn,
+                loading,
+                refetch,
+                entityType: EntityType.CorpUser,
+                entityData: (data?.corpUser ?? null) as GenericEntityProperties | null,
+                routeToTab: () => {},
+                dataNotCombinedWithSiblings: null,
+                baseEntity: null,
+            }}
+        >
+            <EntityHead />
+            {error && <ErrorSection />}
+            <UserProfileWrapper $isShowNavBarRedesign={isShowNavBarRedesign}>
+                <Col xl={7} lg={7} md={7} sm={24} xs={24} style={{ height: '100%', overflow: 'auto' }}>
+                    <UserSideBar sidebarData={sidebarData} refetch={refetch} />
+                </Col>
+                <Col
+                    xl={17}
+                    lg={17}
+                    md={17}
+                    sm={24}
+                    xs={24}
+                    style={{ borderLeft: `1px solid ${colors.gray[100]}`, height: '100%' }}
+                >
+                    <RoutedTabs defaultPath={defaultTabPath} tabs={getTabs()} onTabChange={onTabChange} />
+                </Col>
+            </UserProfileWrapper>
+        </EntityContext.Provider>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/user/UserProfileInfoCard.tsx b/datahub-web-react/src/app/entityV2/user/UserProfileInfoCard.tsx
new file mode 100644
index 00000000000000..ab29142351a0bc
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/user/UserProfileInfoCard.tsx
@@ -0,0 +1,104 @@
+import React, { useState } from 'react';
+import { Col } from 'antd';
+import { EntityRelationship, SearchResult } from '../../../types.generated';
+import SectionActionButton from '../shared/containers/profile/sidebar/SectionActionButton';
+import UserEditProfileModal from './UserEditProfileModal';
+import CustomAvatar from '../../shared/avatar/CustomAvatar';
+
+import {
+    CustomAvatarContainer,
+    GradientContainer,
+    EditProfileButtonContainer,
+    WhiteEditOutlinedIconStyle,
+    UserInfo,
+} from '../shared/SidebarStyledComponents';
+import { UserBasicInfoContainer } from './UserBasicInfoContainer';
+
+const AVATAR_STYLE = {
+    marginRight: '0px',
+    borderRadius: '100%',
+    zIndex: '2',
+};
+
+export type SidebarData = {
+    photoUrl: string | undefined;
+    avatarName: string | undefined;
+    name: string | undefined;
+    role: string | undefined;
+    team: string | undefined;
+    email: string | undefined;
+    slack: string | undefined;
+    phone: string | undefined;
+    aboutText: string | undefined;
+    groupsDetails: Array<EntityRelationship>;
+    ownerships: Array<SearchResult> | undefined;
+    urn: string | undefined;
+    dataHubRoles: Array<EntityRelationship>;
+};
+
+type Props = {
+    sidebarData: SidebarData;
+    refetch: () => void;
+    dataHubRoleName: string;
+    isProfileOwner: boolean;
+};
+
+export const UserProfileInfoCard = ({ sidebarData, refetch, dataHubRoleName, isProfileOwner }: Props) => {
+    const { name, avatarName, email, phone, photoUrl, role, slack, team, urn } = sidebarData;
+
+    const [editProfileModal, showEditProfileModal] = useState(false);
+
+    const getEditModalData = {
+        urn,
+        name,
+        title: role,
+        team,
+        email,
+        image: photoUrl,
+        slack,
+        phone,
+    };
+
+    return (
+        <>
+            <CustomAvatarContainer>
+                <GradientContainer />
+                <UserInfo>
+                    <Col xxl={8} xl={10} lg={24} md={24} sm={24} xs={24}>
+                        <CustomAvatar size={113} photoUrl={photoUrl} name={avatarName} style={AVATAR_STYLE} />
+                    </Col>
+                    <Col xxl={14} xl={10} lg={18} md={18} sm={18} xs={18}>
+                        <UserBasicInfoContainer
+                            name={name}
+                            dataHubRoleName={dataHubRoleName}
+                            email={email}
+                            role={role}
+                            slack={slack}
+                            phone={phone}
+                        />
+                    </Col>
+                    {isProfileOwner && (
+                        <EditProfileButtonContainer className="edit-button-container">
+                            <SectionActionButton
+                                button={<WhiteEditOutlinedIconStyle />}
+                                onClick={(event) => {
+                                    showEditProfileModal(true);
+                                    event.stopPropagation();
+                                }}
+                            />
+                        </EditProfileButtonContainer>
+                    )}
+                </UserInfo>
+            </CustomAvatarContainer>
+            {/* Modal */}
+            <UserEditProfileModal
+                visible={editProfileModal}
+                onClose={() => showEditProfileModal(false)}
+                onSave={() => {
+                    refetch();
+                }}
+                editModalData={getEditModalData}
+            />
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/user/UserSidebar.tsx b/datahub-web-react/src/app/entityV2/user/UserSidebar.tsx
new file mode 100644
index 00000000000000..9e34e180d0972f
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/user/UserSidebar.tsx
@@ -0,0 +1,74 @@
+import { message } from 'antd';
+import React from 'react';
+import { useUpdateCorpUserPropertiesMutation } from '../../../graphql/user.generated';
+import { DataHubRole } from '../../../types.generated';
+import { SideBar, Content } from '../shared/SidebarStyledComponents';
+import { useUserContext } from '../../context/useUserContext';
+import { UserOwnershipSidebarSection } from '../shared/sidebarSection/UserOwnershipSideBarSection';
+import { AboutSidebarSection } from '../shared/sidebarSection/AboutSidebarSection';
+import { UserGroupSideBarSection } from '../shared/sidebarSection/UserGroupSidebarSection';
+import { SidebarData, UserProfileInfoCard } from './UserProfileInfoCard';
+
+type Props = {
+    sidebarData: SidebarData;
+    refetch: () => void;
+};
+
+/**
+ * UserSidebar- Sidebar section for users profiles.
+ */
+export default function UserSidebar({ sidebarData, refetch }: Props) {
+    const { aboutText, groupsDetails, dataHubRoles, urn, ownerships } = sidebarData;
+
+    const [updateCorpUserPropertiesMutation] = useUpdateCorpUserPropertiesMutation();
+
+    /* eslint-disable @typescript-eslint/no-unused-vars */
+    const me = useUserContext();
+    const isProfileOwner = me?.user?.urn === urn;
+
+    // About Text save
+    const onSaveAboutMe = (inputString) => {
+        updateCorpUserPropertiesMutation({
+            variables: {
+                urn: urn || '',
+                input: {
+                    aboutMe: inputString,
+                },
+            },
+        })
+            .then(() => {
+                message.success({
+                    content: `Changes saved.`,
+                    duration: 3,
+                });
+                refetch();
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to Save changes!: \n ${e.message || ''}`, duration: 3 });
+            });
+    };
+
+    const dataHubRoleName =
+        dataHubRoles && dataHubRoles.length > 0 ? (dataHubRoles[0]?.entity as DataHubRole).name : '';
+
+    return (
+        <SideBar>
+            <UserProfileInfoCard
+                sidebarData={sidebarData}
+                refetch={refetch}
+                dataHubRoleName={dataHubRoleName}
+                isProfileOwner={isProfileOwner}
+            />
+            <Content>
+                <AboutSidebarSection
+                    aboutText={aboutText || ''}
+                    isProfileOwner={isProfileOwner}
+                    onSaveAboutMe={onSaveAboutMe}
+                />
+                <UserOwnershipSidebarSection ownedEntities={ownerships} />
+                <UserGroupSideBarSection groupsDetails={groupsDetails} />
+            </Content>
+        </SideBar>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/user/__tests__/UserHeader.test.tsx b/datahub-web-react/src/app/entityV2/user/__tests__/UserHeader.test.tsx
new file mode 100644
index 00000000000000..c225d2c8ede69a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/user/__tests__/UserHeader.test.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import UserHeader from '../UserHeader';
+
+describe('UserHeader', () => {
+    it('renders name, title, skills, teams and email', () => {
+        const { getByText } = render(
+            <UserHeader
+                name="Jane Doe"
+                title="Software Engineer"
+                skills={['Pandas', 'Multivariate Calculus', 'Juggling']}
+                teams={['Product', 'Data Science']}
+                email="jane@datahub.ui"
+            />,
+        );
+        expect(getByText('Jane Doe')).toBeInTheDocument();
+        expect(getByText('Software Engineer')).toBeInTheDocument();
+        expect(getByText('Pandas')).toBeInTheDocument();
+        expect(getByText('Juggling')).toBeInTheDocument();
+        expect(getByText('Product')).toBeInTheDocument();
+        expect(getByText('Data Science')).toBeInTheDocument();
+        expect(getByText('jane@datahub.ui')).toBeInTheDocument();
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/user/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/user/preview/Preview.tsx
new file mode 100644
index 00000000000000..47d7b30d35f544
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/user/preview/Preview.tsx
@@ -0,0 +1,89 @@
+import React from 'react';
+import { Typography } from 'antd';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import { EntityType } from '../../../../types.generated';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { ANTD_GRAY } from '../../shared/constants';
+import { IconStyleType } from '../../Entity';
+import SearchTextHighlighter from '../../../searchV2/matches/SearchTextHighlighter';
+
+const PreviewContainer = styled.div`
+    display: flex;
+    width: 100%;
+    justify-content: space-between;
+    align-items: center;
+`;
+
+const PlatformInfo = styled.div`
+    margin-bottom: 8px;
+    display: flex;
+    align-items: center;
+    height: 24px;
+`;
+
+const TitleContainer = styled.div`
+    margin-bottom: 8px;
+`;
+
+const PreviewImage = styled.div`
+    max-height: 18px;
+    width: auto;
+    object-fit: contain;
+    margin-right: 10px;
+    background-color: transparent;
+`;
+
+const EntityTitle = styled(Typography.Text)`
+    &&& {
+        margin-bottom: 0;
+        font-size: 16px;
+        font-weight: 600;
+        vertical-align: middle;
+    }
+`;
+
+const PlatformText = styled(Typography.Text)`
+    font-size: 12px;
+    line-height: 20px;
+    font-weight: 700;
+    color: ${ANTD_GRAY[7]};
+`;
+
+export const Preview = ({
+    urn,
+    name,
+    title,
+}: {
+    urn: string;
+    name: string;
+    title?: string | undefined;
+}): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    const url = entityRegistry.getEntityUrl(EntityType.CorpUser, urn);
+
+    return (
+        <PreviewContainer>
+            <div>
+                <Link to={url}>
+                    <TitleContainer>
+                        <PlatformInfo>
+                            <PreviewImage>
+                                {entityRegistry.getIcon(EntityType.CorpUser, 20, IconStyleType.HIGHLIGHT)}
+                            </PreviewImage>
+                            <PlatformText>{entityRegistry.getEntityName(EntityType.CorpUser)}</PlatformText>
+                        </PlatformInfo>
+                        <Link to={url}>
+                            <EntityTitle>{name ? <SearchTextHighlighter field="name" text={name} /> : urn}</EntityTitle>
+                        </Link>
+                    </TitleContainer>
+                </Link>
+                {title && (
+                    <TitleContainer>
+                        <SearchTextHighlighter field="title" text={title} />
+                    </TitleContainer>
+                )}
+            </div>
+        </PreviewContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/ManageViews.tsx b/datahub-web-react/src/app/entityV2/view/ManageViews.tsx
new file mode 100644
index 00000000000000..f32c479e00bea4
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/ManageViews.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { ViewsList } from './ViewsList';
+
+const PageContainer = styled.div`
+    padding-top: 20px;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+`;
+
+const PageHeaderContainer = styled.div`
+    && {
+        padding-left: 24px;
+    }
+`;
+
+const PageTitle = styled(Typography.Title)`
+    && {
+        margin-bottom: 12px;
+    }
+`;
+
+const ListContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+`;
+
+/**
+ * Component used for displaying the 'Manage Views' experience.
+ */
+export const ManageViews = () => {
+    return (
+        <PageContainer>
+            <PageHeaderContainer>
+                <PageTitle level={3}>Manage Views</PageTitle>
+                <Typography.Paragraph type="secondary">
+                    Create, edit, and remove your Views. Views allow you to save and share sets of filters for reuse
+                    when browsing DataHub.
+                </Typography.Paragraph>
+            </PageHeaderContainer>
+            <ListContainer>
+                <ViewsList />
+            </ListContainer>
+        </PageContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/ViewTypeLabel.tsx b/datahub-web-react/src/app/entityV2/view/ViewTypeLabel.tsx
new file mode 100644
index 00000000000000..d3c3c414f0ade5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/ViewTypeLabel.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { GlobalOutlined, LockOutlined } from '@ant-design/icons';
+import { DataHubViewType } from '../../../types.generated';
+
+const StyledLockOutlined = styled(LockOutlined)<{ color }>`
+    color: ${(props) => props.color};
+    margin-right: 4px;
+`;
+
+const StyledGlobalOutlined = styled(GlobalOutlined)<{ color }>`
+    color: ${(props) => props.color};
+    margin-right: 4px;
+`;
+
+const StyledText = styled(Typography.Text)<{ color }>`
+    && {
+        color: ${(props) => props.color};
+    }
+`;
+
+type Props = {
+    type: DataHubViewType;
+    color: string;
+    onClick?: () => void;
+};
+
+/**
+ * Label used to describe View Types
+ *
+ * @param param0 the color of the text and iconography
+ */
+export const ViewTypeLabel = ({ type, color, onClick }: Props) => {
+    const copy =
+        type === DataHubViewType.Personal ? (
+            <>
+                <b>Private</b> - only visible to you.
+            </>
+        ) : (
+            <>
+                <b>Public</b> - visible to everyone.
+            </>
+        );
+    const Icon = type === DataHubViewType.Global ? StyledGlobalOutlined : StyledLockOutlined;
+
+    return (
+        // eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions
+        <div onClick={onClick}>
+            <Icon color={color} />
+            <StyledText color={color} type="secondary">
+                {copy}
+            </StyledText>
+        </div>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/ViewsList.tsx b/datahub-web-react/src/app/entityV2/view/ViewsList.tsx
new file mode 100644
index 00000000000000..2487783fff38b3
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/ViewsList.tsx
@@ -0,0 +1,144 @@
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components';
+import { useLocation } from 'react-router';
+import { Button, message, Pagination } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
+import * as QueryString from 'query-string';
+import { useListMyViewsQuery } from '../../../graphql/view.generated';
+import { SearchBar } from '../../search/SearchBar';
+import TabToolbar from '../shared/components/styled/TabToolbar';
+import { Message } from '../../shared/Message';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { scrollToTop } from '../../shared/searchUtils';
+import { ViewsTable } from './ViewsTable';
+import { DEFAULT_LIST_VIEWS_PAGE_SIZE, searchViews } from './utils';
+import { ViewBuilder } from './builder/ViewBuilder';
+import { ViewBuilderMode } from './builder/types';
+
+const PaginationContainer = styled.div`
+    display: flex;
+    justify-content: center;
+`;
+
+const StyledPagination = styled(Pagination)`
+    margin: 40px;
+`;
+
+const searchBarStyle = {
+    maxWidth: 220,
+    padding: 0,
+};
+
+const searchBarInputStyle = {
+    height: 32,
+    fontSize: 12,
+};
+
+/**
+ * This component renders a paginated, searchable list of Views.
+ */
+export const ViewsList = () => {
+    /**
+     * Context
+     */
+    const location = useLocation();
+    const entityRegistry = useEntityRegistry();
+
+    /**
+     * Query Params
+     */
+    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
+    const paramsQuery = (params?.query as string) || undefined;
+
+    /**
+     * State
+     */
+    const [page, setPage] = useState(1);
+    const [selectedViewUrn, setSelectedViewUrn] = useState<undefined | string>(undefined);
+    const [showViewBuilder, setShowViewBuilder] = useState<boolean>(false);
+    const [query, setQuery] = useState<undefined | string>(undefined);
+    useEffect(() => setQuery(paramsQuery), [paramsQuery]);
+
+    /**
+     * Queries
+     */
+    const pageSize = DEFAULT_LIST_VIEWS_PAGE_SIZE;
+    const start = (page - 1) * pageSize;
+    const { loading, error, data } = useListMyViewsQuery({
+        variables: {
+            start,
+            count: pageSize,
+        },
+        fetchPolicy: 'cache-first',
+    });
+
+    const onClickCreateView = () => {
+        setShowViewBuilder(true);
+    };
+
+    const onClickEditView = (urn: string) => {
+        setShowViewBuilder(true);
+        setSelectedViewUrn(urn);
+    };
+
+    const onCloseModal = () => {
+        setShowViewBuilder(false);
+        setSelectedViewUrn(undefined);
+    };
+
+    const onChangePage = (newPage: number) => {
+        scrollToTop();
+        setPage(newPage);
+    };
+
+    /**
+     * Render variables.
+     */
+    const totalViews = data?.listMyViews?.total || 0;
+    const views = searchViews(data?.listMyViews?.views || [], query);
+    const selectedView = (selectedViewUrn && views.find((view) => view.urn === selectedViewUrn)) || undefined;
+
+    return (
+        <>
+            {!data && loading && <Message type="loading" content="Loading Views..." />}
+            {error && message.error({ content: `Failed to load Views! An unexpected error occurred.`, duration: 3 })}
+            <TabToolbar>
+                <Button type="text" onClick={onClickCreateView}>
+                    <PlusOutlined /> Create new View
+                </Button>
+                <SearchBar
+                    initialQuery=""
+                    placeholderText="Search Views..."
+                    suggestions={[]}
+                    style={searchBarStyle}
+                    inputStyle={searchBarInputStyle}
+                    onSearch={() => null}
+                    onQueryChange={(q) => setQuery(q.length > 0 ? q : undefined)}
+                    entityRegistry={entityRegistry}
+                />
+            </TabToolbar>
+            <ViewsTable views={views} onEditView={onClickEditView} />
+            {totalViews >= pageSize && (
+                <PaginationContainer>
+                    <StyledPagination
+                        current={page}
+                        pageSize={pageSize}
+                        total={totalViews}
+                        showLessItems
+                        onChange={onChangePage}
+                        showSizeChanger={false}
+                    />
+                </PaginationContainer>
+            )}
+            {showViewBuilder && (
+                <ViewBuilder
+                    mode={ViewBuilderMode.EDITOR}
+                    urn={selectedViewUrn}
+                    initialState={selectedView}
+                    onSubmit={onCloseModal}
+                    onCancel={onCloseModal}
+                />
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/ViewsTable.tsx b/datahub-web-react/src/app/entityV2/view/ViewsTable.tsx
new file mode 100644
index 00000000000000..97d1fe18fe0695
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/ViewsTable.tsx
@@ -0,0 +1,61 @@
+import React from 'react';
+import { Empty } from 'antd';
+import { StyledTable } from '../shared/components/styled/StyledTable';
+import { ActionsColumn, DescriptionColumn, NameColumn, ViewTypeColumn } from './select/ViewsTableColumns';
+import { DataHubView } from '../../../types.generated';
+
+type ViewsTableProps = {
+    views: DataHubView[];
+    onEditView: (urn) => void;
+};
+
+/**
+ * This component renders a table of Views.
+ */
+export const ViewsTable = ({ views, onEditView }: ViewsTableProps) => {
+    const tableColumns = [
+        {
+            title: 'Name',
+            dataIndex: 'name',
+            key: 'name',
+            render: (name, record) => <NameColumn name={name} record={record} onEditView={onEditView} />,
+        },
+        {
+            title: 'Description',
+            dataIndex: 'description',
+            key: 'description',
+            render: (description) => <DescriptionColumn description={description} />,
+        },
+        {
+            title: 'Type',
+            dataIndex: 'viewType',
+            key: 'viewType',
+            render: (viewType) => <ViewTypeColumn viewType={viewType} />,
+        },
+        {
+            title: '',
+            dataIndex: '',
+            key: 'x',
+            render: (record) => <ActionsColumn record={record} />,
+        },
+    ];
+
+    /**
+     * The data for the Views List.
+     */
+    const tableData = views.map((view) => ({
+        ...view,
+    }));
+
+    return (
+        <StyledTable
+            columns={tableColumns}
+            dataSource={tableData}
+            rowKey="urn"
+            locale={{
+                emptyText: <Empty description="No Views found!" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
+            }}
+            pagination={false}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/__tests__/utils.test.ts b/datahub-web-react/src/app/entityV2/view/__tests__/utils.test.ts
new file mode 100644
index 00000000000000..6885e23fdfffc1
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/__tests__/utils.test.ts
@@ -0,0 +1,25 @@
+import { searchViewsMock, viewBuilderStateMock } from '../../../../Mocks';
+import { EntityType } from '../../../../types.generated';
+import { convertStateToUpdateInput, convertStateToView, searchViews } from '../utils';
+
+describe('Entity V2 views utils tests ->', () => {
+    it('should convert an instance of the View builder state into the input required to create or update a view in GraphQL', () => {
+        const result = convertStateToUpdateInput(viewBuilderStateMock);
+        expect(result).toStrictEqual(viewBuilderStateMock);
+    });
+    it('should convert ViewBuilderState and an URN into a DataHubView object.', () => {
+        const mockURN = 'test-urn';
+        const result = convertStateToView(mockURN, viewBuilderStateMock);
+        const expectedResult = {
+            urn: mockURN,
+            type: EntityType.DatahubView,
+            ...viewBuilderStateMock,
+        };
+        expect(result).toStrictEqual(expectedResult);
+    });
+    it('should search through a list of Views by a text string by comparing against View name and descriptions', () => {
+        const searchString = 'VIEW_BUILDER';
+        const result = searchViews(searchViewsMock, searchString);
+        expect(result).toStrictEqual([searchViewsMock[0]]);
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/view/builder/ViewBuilder.tsx b/datahub-web-react/src/app/entityV2/view/builder/ViewBuilder.tsx
new file mode 100644
index 00000000000000..a51a632db448df
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/builder/ViewBuilder.tsx
@@ -0,0 +1,127 @@
+import React from 'react';
+import { message } from 'antd';
+import { useApolloClient } from '@apollo/client';
+import { useCreateViewMutation, useUpdateViewMutation } from '../../../../graphql/view.generated';
+import { ViewBuilderState } from '../types';
+import { ViewBuilderModal } from './ViewBuilderModal';
+import { updateViewSelectCache, updateListMyViewsCache } from '../cacheUtils';
+import { convertStateToUpdateInput, DEFAULT_LIST_VIEWS_PAGE_SIZE } from '../utils';
+import { useUserContext } from '../../../context/useUserContext';
+import { ViewBuilderMode } from './types';
+import analytics, { EventType } from '../../../analytics';
+import { DataHubView } from '../../../../types.generated';
+import { useSearchVersion } from '../../../search/useSearchAndBrowseVersion';
+
+type Props = {
+    mode: ViewBuilderMode;
+    urn?: string | null; // When editing an existing view, this is provided.
+    initialState?: ViewBuilderState;
+    onSubmit?: (state: ViewBuilderState) => void;
+    onCancel?: () => void;
+};
+
+/**
+ * This component handles creating and editing DataHub Views.
+ */
+export const ViewBuilder = ({ mode, urn, initialState, onSubmit, onCancel }: Props) => {
+    const searchVersion = useSearchVersion();
+    const userContext = useUserContext();
+
+    const client = useApolloClient();
+    const [updateViewMutation] = useUpdateViewMutation();
+    const [createViewMutation] = useCreateViewMutation();
+
+    const emitTrackingEvent = (viewUrn: string, state: ViewBuilderState, isCreate: boolean) => {
+        const filterFields = Array.from(new Set(state.definition?.filter?.filters.map((filter) => filter.field) ?? []));
+        const entityTypes = Array.from(new Set(state.definition?.entityTypes ?? []));
+
+        analytics.event({
+            type: isCreate ? EventType.CreateViewEvent : EventType.UpdateViewEvent,
+            urn: viewUrn,
+            viewType: state.viewType,
+            filterFields,
+            entityTypes,
+            searchVersion,
+        });
+    };
+
+    /**
+     * Updates the selected View to a new urn. When a View is created or edited,
+     * we automatically update the currently applied View to be that view.
+     */
+    const updatedSelectedView = (viewUrn: string) => {
+        // Hack: Force a re-render of the pages dependent on the value of the currently selected View
+        // (e.g. Search results)
+        userContext.updateLocalState({
+            ...userContext.localState,
+            selectedViewUrn: undefined,
+        });
+        userContext.updateLocalState({
+            ...userContext.localState,
+            selectedViewUrn: viewUrn,
+        });
+    };
+
+    const addViewToCaches = (viewUrn: string, view: DataHubView) => {
+        updateListMyViewsCache(viewUrn, view, client, 1, DEFAULT_LIST_VIEWS_PAGE_SIZE, undefined, undefined);
+        updateViewSelectCache(viewUrn, view, client);
+    };
+
+    const updateViewInCaches = (viewUrn: string, view: DataHubView) => {
+        updateListMyViewsCache(viewUrn, view, client, 1, DEFAULT_LIST_VIEWS_PAGE_SIZE, undefined, undefined);
+        updateViewSelectCache(viewUrn, view, client);
+    };
+
+    /**
+     * Updates the caches that power the Manage My Views and Views Select
+     * experiences when a new View has been create or an existing View has been updated.
+     */
+    const updateViewCaches = (viewUrn: string, view: DataHubView, isCreate: boolean) => {
+        if (isCreate) {
+            addViewToCaches(viewUrn, view);
+        } else {
+            updateViewInCaches(viewUrn, view);
+        }
+    };
+
+    /**
+     * Create a new View, or update an existing one.
+     *
+     * @param state the state, which defines the fields of the new View.
+     */
+    const upsertView = (state: ViewBuilderState) => {
+        const viewInput = convertStateToUpdateInput(state);
+        const isCreate = urn === undefined;
+        const mutation = isCreate ? createViewMutation : updateViewMutation;
+        const variables = urn ? { urn, input: { ...viewInput, viewType: undefined } } : { input: viewInput };
+        (
+            mutation({
+                variables: variables as any,
+            }) as any
+        )
+            .then((res) => {
+                const updatedView = isCreate ? res.data?.createView : res.data?.updateView;
+                emitTrackingEvent(updatedView.urn, updatedView, isCreate);
+                updateViewCaches(updatedView.urn, updatedView, isCreate);
+                updatedSelectedView(updatedView.urn);
+                onSubmit?.(state);
+            })
+            .catch((_) => {
+                message.destroy();
+                message.error({
+                    content: `Failed to save View! An unexpected error occurred.`,
+                    duration: 3,
+                });
+            });
+    };
+
+    return (
+        <ViewBuilderModal
+            mode={mode}
+            urn={urn || undefined}
+            initialState={initialState}
+            onSubmit={upsertView}
+            onCancel={onCancel}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/builder/ViewBuilderForm.tsx b/datahub-web-react/src/app/entityV2/view/builder/ViewBuilderForm.tsx
new file mode 100644
index 00000000000000..4c28615b86af21
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/builder/ViewBuilderForm.tsx
@@ -0,0 +1,114 @@
+import React, { useEffect } from 'react';
+import styled from 'styled-components';
+import { Form, Input, Select, Typography } from 'antd';
+import { ViewBuilderState } from '../types';
+import { DataHubViewType } from '../../../../types.generated';
+import { ViewTypeLabel } from '../ViewTypeLabel';
+import { ViewDefinitionBuilder } from './ViewDefinitionBuilder';
+import { ANTD_GRAY } from '../../shared/constants';
+import { useUserContext } from '../../../context/useUserContext';
+import { ViewBuilderMode } from './types';
+
+const StyledFormItem = styled(Form.Item)`
+    margin-bottom: 8px;
+`;
+
+type Props = {
+    urn?: string;
+    mode: ViewBuilderMode;
+    state: ViewBuilderState;
+    updateState: (newState: ViewBuilderState) => void;
+};
+
+export const ViewBuilderForm = ({ urn, mode, state, updateState }: Props) => {
+    const userContext = useUserContext();
+    const [form] = Form.useForm();
+
+    useEffect(() => {
+        form.setFieldsValue(state);
+    }, [state, form]);
+
+    const setName = (name: string) => {
+        updateState({
+            ...state,
+            name,
+        });
+    };
+
+    const setDescription = (description: string) => {
+        updateState({
+            ...state,
+            description,
+        });
+    };
+
+    const setViewType = (viewType: DataHubViewType) => {
+        updateState({ ...state, viewType });
+    };
+
+    const canManageGlobalViews = userContext?.platformPrivileges?.manageGlobalViews || false;
+    const isEditing = urn !== undefined;
+
+    return (
+        <span data-testid="view-builder-form">
+            <Form form={form} initialValues={state} layout="vertical">
+                <StyledFormItem label={<Typography.Text strong>Name</Typography.Text>}>
+                    <Typography.Paragraph>Give your new View a name. </Typography.Paragraph>
+                    <Form.Item
+                        name="name"
+                        rules={[
+                            {
+                                required: true,
+                                message: 'Please enter a name for your View.',
+                            },
+                            { whitespace: true },
+                            { min: 1, max: 50 },
+                        ]}
+                        hasFeedback
+                    >
+                        <Input
+                            data-testid="view-name-input"
+                            placeholder="Data Analyst"
+                            onChange={(event) => setName(event.target.value)}
+                            disabled={mode === ViewBuilderMode.PREVIEW}
+                        />
+                    </Form.Item>
+                </StyledFormItem>
+                <StyledFormItem label={<Typography.Text strong>Description</Typography.Text>}>
+                    <Typography.Paragraph>Write a description for your View.</Typography.Paragraph>
+                    <Form.Item name="description" rules={[{ whitespace: true }, { min: 1, max: 500 }]} hasFeedback>
+                        <Input.TextArea
+                            data-testid="view-description-input"
+                            placeholder="This View is useful for Data Analysts"
+                            onChange={(event) => setDescription(event.target.value)}
+                            disabled={mode === ViewBuilderMode.PREVIEW}
+                        />
+                    </Form.Item>
+                </StyledFormItem>
+                <StyledFormItem label={<Typography.Text strong>Type</Typography.Text>}>
+                    <Typography.Paragraph>Select the type of your new View.</Typography.Paragraph>
+                    <Form.Item name="viewType">
+                        <Select
+                            onSelect={(value) => setViewType(value as DataHubViewType)}
+                            disabled={!canManageGlobalViews || isEditing || mode === ViewBuilderMode.PREVIEW}
+                        >
+                            <Select.Option value={DataHubViewType.Personal}>
+                                <ViewTypeLabel type={DataHubViewType.Personal} color={ANTD_GRAY[9]} />
+                            </Select.Option>
+                            <Select.Option value={DataHubViewType.Global}>
+                                <ViewTypeLabel type={DataHubViewType.Global} color={ANTD_GRAY[9]} />
+                            </Select.Option>
+                        </Select>
+                    </Form.Item>
+                </StyledFormItem>
+                <StyledFormItem label={<Typography.Text strong>Filters</Typography.Text>} style={{ marginBottom: 8 }}>
+                    <Typography.Paragraph>
+                        Select the filters that are applied when this View is selected. Assets that match these filters
+                        will be shown when the View is applied.
+                    </Typography.Paragraph>
+                </StyledFormItem>
+            </Form>
+            <ViewDefinitionBuilder mode={mode} state={state} updateState={updateState} />
+        </span>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/builder/ViewBuilderModal.tsx b/datahub-web-react/src/app/entityV2/view/builder/ViewBuilderModal.tsx
new file mode 100644
index 00000000000000..8491fdfea2675c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/builder/ViewBuilderModal.tsx
@@ -0,0 +1,103 @@
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components';
+import { Button, Modal, Typography } from 'antd';
+import { DEFAULT_BUILDER_STATE, ViewBuilderState } from '../types';
+import { ViewBuilderForm } from './ViewBuilderForm';
+import ClickOutside from '../../../shared/ClickOutside';
+import { ViewBuilderMode } from './types';
+
+const modalWidth = 700;
+const modalStyle = { top: 40 };
+const modalBodyStyle = { paddingRight: 60, paddingLeft: 60, paddingBottom: 40 };
+
+const TitleContainer = styled.div`
+    display: flex;
+    justify-content: space-between;
+`;
+
+const SaveButtonContainer = styled.div`
+    width: 100%;
+    display: flex;
+    justify-content: right;
+`;
+
+const CancelButton = styled(Button)`
+    margin-right: 12px;
+`;
+
+type Props = {
+    mode: ViewBuilderMode;
+    urn?: string;
+    initialState?: ViewBuilderState;
+    onSubmit: (input: ViewBuilderState) => void;
+    onCancel?: () => void;
+};
+
+const getTitleText = (mode, urn) => {
+    if (mode === ViewBuilderMode.PREVIEW) {
+        return 'Preview View';
+    }
+    return urn !== undefined ? 'Edit View' : 'Create new View';
+};
+
+export const ViewBuilderModal = ({ mode, urn, initialState, onSubmit, onCancel }: Props) => {
+    const [viewBuilderState, setViewBuilderState] = useState<ViewBuilderState>(initialState || DEFAULT_BUILDER_STATE);
+
+    useEffect(() => {
+        setViewBuilderState(initialState || DEFAULT_BUILDER_STATE);
+    }, [initialState]);
+
+    const confirmClose = () => {
+        Modal.confirm({
+            title: 'Exit View Editor',
+            content: `Are you sure you want to exit View editor? All changes will be lost`,
+            onOk() {
+                onCancel?.();
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
+    const canSave = viewBuilderState.name && viewBuilderState.viewType && viewBuilderState?.definition?.filter;
+    const titleText = getTitleText(mode, urn);
+
+    return (
+        <ClickOutside onClickOutside={confirmClose} wrapperClassName="test-builder-modal">
+            <Modal
+                wrapClassName="view-builder-modal"
+                footer={null}
+                title={
+                    <TitleContainer>
+                        <Typography.Text>{titleText}</Typography.Text>
+                    </TitleContainer>
+                }
+                style={modalStyle}
+                bodyStyle={modalBodyStyle}
+                visible
+                width={modalWidth}
+                onCancel={onCancel}
+                data-testid="view-modal"
+            >
+                <ViewBuilderForm urn={urn} mode={mode} state={viewBuilderState} updateState={setViewBuilderState} />
+                <SaveButtonContainer>
+                    <CancelButton data-testid="view-builder-cancel" onClick={onCancel}>
+                        Cancel
+                    </CancelButton>
+                    {mode === ViewBuilderMode.EDITOR && (
+                        <Button
+                            data-testid="view-builder-save"
+                            type="primary"
+                            disabled={!canSave}
+                            onClick={() => onSubmit(viewBuilderState)}
+                        >
+                            Save
+                        </Button>
+                    )}
+                </SaveButtonContainer>
+            </Modal>
+        </ClickOutside>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/builder/ViewDefinitionBuilder.tsx b/datahub-web-react/src/app/entityV2/view/builder/ViewDefinitionBuilder.tsx
new file mode 100644
index 00000000000000..93057aa5681d53
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/builder/ViewDefinitionBuilder.tsx
@@ -0,0 +1,117 @@
+import React from 'react';
+import styled from 'styled-components';
+import { LogicalOperator } from '../../../../types.generated';
+import { ENTITY_FILTER_NAME } from '../../../search/utils/constants';
+import { ANTD_GRAY } from '../../shared/constants';
+import { ViewBuilderState } from '../types';
+import { ViewBuilderMode } from './types';
+// eslint-disable-next-line import/no-cycle
+import SearchFiltersBuilder from '../../../searchV2/filters/SearchFiltersBuilder';
+import { FilterPredicate } from '../../../searchV2/filters/types';
+import { convertToSelectedFilterPredictes } from '../../../searchV2/filters/utils';
+import { convertFrontendToBackendOperatorType } from '../../../searchV2/filters/operator/operator';
+import { VIEW_BUILDER_FIELDS } from '../../../searchV2/filters/field/fields';
+import { fromUnionType, toUnionType } from './utils';
+
+const Container = styled.div`
+    border-radius: 4px;
+    padding: 12px;
+    box-shadow: ${(props) => props.theme.styles['box-shadow']};
+    border: 1px solid ${ANTD_GRAY[4]};
+    margin-bottom: 20px;
+`;
+
+type Props = {
+    mode: ViewBuilderMode;
+    state: ViewBuilderState;
+    updateState: (newState: ViewBuilderState) => void;
+};
+
+export const ViewDefinitionBuilder = ({ mode, state, updateState }: Props) => {
+    // The selected operator type.
+    const operatorType = state.definition?.filter?.operator || LogicalOperator.Or;
+
+    // The selected filters.
+    const selectedFilters = state.definition?.filter?.filters || [];
+
+    // The union type
+    const unionType = toUnionType(state?.definition?.filter?.operator || LogicalOperator.Or);
+
+    // Parse the default entity type filter from the state.
+    const entityTypeFilter = state?.definition?.entityTypes?.length && {
+        field: ENTITY_FILTER_NAME,
+        values: state?.definition?.entityTypes,
+    };
+
+    const filterPredicates: FilterPredicate[] = convertToSelectedFilterPredictes(
+        (entityTypeFilter && [entityTypeFilter, ...selectedFilters]) || selectedFilters,
+        [],
+    );
+
+    const updateFilters = (newFilters: FilterPredicate[]) => {
+        const backendFilters = newFilters.map((predicate) => {
+            const condition = convertFrontendToBackendOperatorType(predicate.operator);
+            return {
+                field: predicate.field.field,
+                values: predicate.values.map((value) => value.value),
+                condition: condition.operator,
+                negated: condition.negated,
+            };
+        });
+        const newDefinition = {
+            entityTypes: [], // Now we use the raw entity type filters.
+            filter: {
+                operator: operatorType,
+                filters: backendFilters || [],
+            },
+        };
+        updateState({
+            ...state,
+            definition: newDefinition,
+        });
+    };
+
+    const updateUnionType = (newUnionType) => {
+        const newDefinition = {
+            ...state.definition,
+            filter: {
+                operator: fromUnionType(newUnionType),
+                filters: state.definition?.filter?.filters || [],
+            },
+        };
+        updateState({
+            ...state,
+            definition: newDefinition,
+        });
+    };
+
+    const onClearFilters = () => {
+        const newDefinition = {
+            ...state.definition,
+            filter: {
+                operator: operatorType,
+                filters: [],
+            },
+        };
+        updateState({
+            ...state,
+            definition: newDefinition,
+        });
+    };
+
+    return (
+        <Container>
+            <SearchFiltersBuilder
+                fields={VIEW_BUILDER_FIELDS}
+                filters={filterPredicates}
+                onChangeFilters={updateFilters}
+                onClearFilters={onClearFilters}
+                disabled={mode === ViewBuilderMode.PREVIEW}
+                unionType={unionType}
+                onChangeUnionType={updateUnionType}
+                showUnionType
+                vertical
+            />
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/builder/__tests__/utils.test.ts b/datahub-web-react/src/app/entityV2/view/builder/__tests__/utils.test.ts
new file mode 100644
index 00000000000000..ee1c17a8ff49a2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/builder/__tests__/utils.test.ts
@@ -0,0 +1,23 @@
+import {
+    ENTITY_FILTER_NAME,
+    ENTITY_SUB_TYPE_FILTER_NAME,
+    TYPE_NAMES_FILTER_NAME,
+} from '../../../../search/utils/constants';
+import { convertNestedSubTypeFilter } from '../utils';
+
+describe('view builder utils', () => {
+    it('should convert the nested subtypes filter properly along with other filters', () => {
+        const filters = [
+            { field: 'platform', values: ['platform1', 'platform2'] },
+            { field: ENTITY_SUB_TYPE_FILTER_NAME, values: ['DATASETS', 'CONTAINERS␞schema'] },
+            { field: 'tag', values: ['tag1', 'tag2'] },
+        ];
+
+        expect(convertNestedSubTypeFilter(filters)).toMatchObject([
+            { field: 'platform', values: ['platform1', 'platform2'] },
+            { field: 'tag', values: ['tag1', 'tag2'] },
+            { field: ENTITY_FILTER_NAME, values: ['DATASETS'] },
+            { field: TYPE_NAMES_FILTER_NAME, values: ['schema'] },
+        ]);
+    });
+});
diff --git a/datahub-web-react/src/app/entityV2/view/builder/types.ts b/datahub-web-react/src/app/entityV2/view/builder/types.ts
new file mode 100644
index 00000000000000..1d3cf3875a8609
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/builder/types.ts
@@ -0,0 +1,10 @@
+export enum ViewBuilderMode {
+    /**
+     * See a View definition in Preview Mode.
+     */
+    PREVIEW,
+    /**
+     * Create or Edit a View.
+     */
+    EDITOR,
+}
diff --git a/datahub-web-react/src/app/entityV2/view/builder/utils.ts b/datahub-web-react/src/app/entityV2/view/builder/utils.ts
new file mode 100644
index 00000000000000..6f84dcef2d977d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/builder/utils.ts
@@ -0,0 +1,130 @@
+import {
+    DataHubViewType,
+    Entity,
+    EntityType,
+    FacetFilter,
+    FacetFilterInput,
+    LogicalOperator,
+} from '../../../../types.generated';
+import {
+    ENTITY_FILTER_NAME,
+    ENTITY_SUB_TYPE_FILTER_NAME,
+    UnionType,
+    FILTER_DELIMITER,
+    TYPE_NAMES_FILTER_NAME,
+} from '../../../search/utils/constants';
+
+/**
+ * Extract the special "Entity Type" filter values from a list
+ * of filters.
+ */
+export const extractEntityTypesFilterValues = (filters: Array<FacetFilterInput>) => {
+    // Currently we only support 1 entity type filter.
+    return filters
+        .filter((filter) => filter.field === ENTITY_FILTER_NAME)
+        .flatMap((filter) => filter.values as EntityType[]);
+};
+
+/**
+ * Converts the nested subtype filter to be split into entity type filters and subType filters.
+ * Right now we don't allow mixing of entity type and subType filters when creating a view since
+ * this filter requires an OR between entity type and subType but AND between other filter types (like tags).
+ * Example: { field: "_entityType␞typeNames" values: ["DATASETS␞table"] } -> { field: "typeNames", values: ["table"]}
+ * Example: { field: "_entityType␞typeNames" values: ["DATASETS", "CONTAINERS"] } -> { field: "_entityType", values: ["DATASETS", "CONTAINERS"]}
+ */
+export function convertNestedSubTypeFilter(filters: Array<FacetFilterInput>) {
+    const convertedFilters = filters.filter((f) => f.field !== ENTITY_SUB_TYPE_FILTER_NAME) || [];
+    const nestedSubTypeFilter = filters.find((f) => f.field === ENTITY_SUB_TYPE_FILTER_NAME);
+    if (nestedSubTypeFilter) {
+        const entityTypeFilterValues: string[] = [];
+        const subTypeFilterValues: string[] = [];
+        nestedSubTypeFilter.values?.forEach((value) => {
+            if (!value.includes(FILTER_DELIMITER)) {
+                entityTypeFilterValues.push(value);
+            } else {
+                const nestedValues = value.split(FILTER_DELIMITER);
+                subTypeFilterValues.push(nestedValues[nestedValues.length - 1]);
+            }
+        });
+        if (entityTypeFilterValues.length) {
+            convertedFilters.push({ field: ENTITY_FILTER_NAME, values: entityTypeFilterValues });
+        }
+        if (subTypeFilterValues.length) {
+            convertedFilters.push({ field: TYPE_NAMES_FILTER_NAME, values: subTypeFilterValues });
+        }
+    }
+    return convertedFilters;
+}
+
+/**
+ * Build an object representation of a View Definition, which consists of a list of entity types +
+ * a set of filters joined in either conjunction or disjunction.
+ *
+ * @param filters a list of Facet Filter Inputs representing the view filters. This can include the entity type filter.
+ * @param operatorType a logical operator to be used when joining the filters into the View definition.
+ */
+export const buildViewDefinition = (filters: Array<FacetFilterInput>, operatorType: LogicalOperator) => {
+    const convertedFilters = convertNestedSubTypeFilter(filters);
+    const entityTypes = extractEntityTypesFilterValues(convertedFilters);
+    const filteredFilters = convertedFilters.filter((filter) => filter.field !== ENTITY_FILTER_NAME);
+    return {
+        entityTypes,
+        filter: {
+            operator: operatorType,
+            filters: (filteredFilters.length > 0 ? filteredFilters : []) as FacetFilter[],
+        },
+    };
+};
+
+/**
+ * Build an object representation of a View Definition, which consists of a list of entity types +
+ * a set of filters joined in either conjunction or disjunction.
+ *
+ * @param filters a list of Facet Filter Inputs representing the view filters. This can include the entity type filter.
+ * @param operatorType a logical operator to be used when joining the filters into the View definition.
+ */
+export const buildInitialViewState = (filters: Array<FacetFilterInput>, operatorType: LogicalOperator) => {
+    return {
+        viewType: DataHubViewType.Personal,
+        name: '',
+        description: null,
+        definition: buildViewDefinition(filters, operatorType),
+    };
+};
+
+/**
+ * Convert a LogicalOperator to the equivalent UnionType.
+ */
+export const toUnionType = (operator: LogicalOperator) => {
+    if (operator === LogicalOperator.And) {
+        return UnionType.AND;
+    }
+    return UnionType.OR;
+};
+
+/**
+ * Convert a UnionType to the equivalent LogicalOperator.
+ */
+export const fromUnionType = (unionType: UnionType) => {
+    if (unionType === 0) {
+        return LogicalOperator.And;
+    }
+    return LogicalOperator.Or;
+};
+
+/**
+ * Returns a map of entity urn to entity from a list of entities.
+ */
+export const buildEntityCache = (entities: Entity[]) => {
+    const cache = new Map();
+    entities.forEach((entity) => cache.set(entity.urn, entity));
+    return cache;
+};
+
+/**
+ * Returns 'true' if any urns are not present in an entity cache, 'false' otherwise.
+ */
+export const isResolutionRequired = (urns: string[], cache: Map<string, Entity>) => {
+    const uncachedUrns = urns.filter((urn) => !cache.has(urn));
+    return uncachedUrns.length > 0;
+};
diff --git a/datahub-web-react/src/app/entityV2/view/cacheUtils.ts b/datahub-web-react/src/app/entityV2/view/cacheUtils.ts
new file mode 100644
index 00000000000000..c8f6d03ef98681
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/cacheUtils.ts
@@ -0,0 +1,250 @@
+import {
+    ListGlobalViewsDocument,
+    ListGlobalViewsQuery,
+    ListMyViewsDocument,
+    ListMyViewsQuery,
+} from '../../../graphql/view.generated';
+import { DataHubViewType, DataHubView } from '../../../types.generated';
+import { DEFAULT_LIST_VIEWS_PAGE_SIZE } from './utils';
+
+/**
+ * This file contains utility classes for manipulating the Apollo Cache
+ * when Views are added, updated, or removed.
+ */
+
+const addViewToList = (existingViews, newView) => {
+    return [newView, ...existingViews];
+};
+
+const addOrUpdateViewInList = (existingViews, newView) => {
+    const newViews = [...existingViews];
+    let didUpdate = false;
+    const updatedViews = newViews.map((view) => {
+        if (view.urn === newView.urn) {
+            didUpdate = true;
+            return newView;
+        }
+        return view;
+    });
+    return didUpdate ? updatedViews : addViewToList(existingViews, newView);
+};
+
+export const updateListMyViewsCache = (
+    urn: string,
+    newView: DataHubView,
+    client,
+    page,
+    pageSize,
+    viewType?: DataHubViewType,
+    query?: string,
+) => {
+    // Read the data from our cache for this query.
+    const currData: ListMyViewsQuery | null = client.readQuery({
+        query: ListMyViewsDocument,
+        variables: {
+            start: (page - 1) * pageSize,
+            count: pageSize,
+            viewType,
+            query,
+        },
+    });
+
+    if (currData === null) {
+        // If there's no cached data, the first load has not occurred. Let it occur naturally.
+        return;
+    }
+
+    const existingViews = currData?.listMyViews?.views || [];
+    const newViews = addOrUpdateViewInList(existingViews, newView);
+
+    const currCount = currData?.listMyViews?.count || 0;
+    const currTotal = currData?.listMyViews?.total || 0;
+    const didAdd = newViews.length > existingViews.length;
+
+    // Write our data back to the cache.
+    client.writeQuery({
+        query: ListMyViewsDocument,
+        variables: {
+            viewType,
+            start: (page - 1) * pageSize,
+            count: pageSize,
+            query,
+        },
+        data: {
+            listMyViews: {
+                __typename: 'ListViewsResult',
+                start: (page - 1) * pageSize,
+                count: currCount + (didAdd ? 1 : 0),
+                total: currTotal + (didAdd ? 1 : 0),
+                views: newViews,
+            },
+        },
+    });
+};
+
+const updateListGlobalViewsCache = (urn: string, newView: DataHubView, client, page, pageSize, query?: string) => {
+    // Read the data from our cache for this query.
+    const currData: ListGlobalViewsQuery | null = client.readQuery({
+        query: ListGlobalViewsDocument,
+        variables: {
+            start: (page - 1) * pageSize,
+            count: pageSize,
+            query,
+        },
+    });
+
+    if (currData === null) {
+        // If there's no cached data, the first load has not occurred. Let it occur naturally.
+        return;
+    }
+
+    const existingViews = currData?.listGlobalViews?.views || [];
+    const newViews = addOrUpdateViewInList(existingViews, newView);
+    const didAdd = newViews.length > existingViews.length;
+
+    const currCount = currData?.listGlobalViews?.count || 0;
+    const currTotal = currData?.listGlobalViews?.total || 0;
+
+    // Write our data back to the cache.
+    client.writeQuery({
+        query: ListGlobalViewsDocument,
+        variables: {
+            start: (page - 1) * pageSize,
+            count: pageSize,
+            query,
+        },
+        data: {
+            listGlobalViews: {
+                __typename: 'ListViewsResult',
+                start: (page - 1) * pageSize,
+                count: currCount + (didAdd ? 1 : 0),
+                total: currTotal + (didAdd ? 1 : 0),
+                views: newViews,
+            },
+        },
+    });
+};
+
+export const removeFromListMyViewsCache = (
+    urn: string,
+    client,
+    page: number,
+    pageSize: number,
+    viewType?: DataHubViewType,
+    query?: string,
+) => {
+    const currData: ListMyViewsQuery | null = client.readQuery({
+        query: ListMyViewsDocument,
+        variables: {
+            start: (page - 1) * pageSize,
+            count: pageSize,
+            viewType,
+            query,
+        },
+    });
+
+    if (currData === null) {
+        // If there's no cached data, the first load has not occurred. Let it occur naturally.
+        return;
+    }
+
+    const existingViews = currData?.listMyViews?.views || [];
+    const newViews = [...existingViews.filter((view) => view.urn !== urn)];
+    const didRemove = existingViews.length !== newViews.length;
+
+    const currCount = currData?.listMyViews?.count || 0;
+    const currTotal = currData?.listMyViews?.total || 0;
+
+    // Write our data back to the cache.
+    client.writeQuery({
+        query: ListMyViewsDocument,
+        variables: {
+            viewType,
+            start: (page - 1) * pageSize,
+            count: pageSize,
+            query,
+        },
+        data: {
+            listMyViews: {
+                __typename: 'ListViewsResult',
+                start: (page - 1) * pageSize,
+                count: didRemove ? currCount - 1 : currCount,
+                total: didRemove ? currTotal - 1 : currCount,
+                views: newViews,
+            },
+        },
+    });
+};
+
+const removeFromListGlobalViewsCache = (urn: string, client, page: number, pageSize: number, query?: string) => {
+    const currData: ListGlobalViewsQuery | null = client.readQuery({
+        query: ListGlobalViewsDocument,
+        variables: {
+            start: (page - 1) * pageSize,
+            count: pageSize,
+            query,
+        },
+    });
+
+    if (currData === null) {
+        // If there's no cached data, the first load has not occurred. Let it occur naturally.
+        return;
+    }
+
+    const existingViews = currData?.listGlobalViews?.views || [];
+    const newViews = [...existingViews.filter((view) => view.urn !== urn)];
+    const didRemove = existingViews.length !== newViews.length;
+
+    const currCount = currData?.listGlobalViews?.count || 0;
+    const currTotal = currData?.listGlobalViews?.total || 0;
+
+    // Write our data back to the cache.
+    client.writeQuery({
+        query: ListGlobalViewsDocument,
+        variables: {
+            start: (page - 1) * pageSize,
+            count: pageSize,
+            query,
+        },
+        data: {
+            listGlobalViews: {
+                __typename: 'ListViewsResult',
+                start: (page - 1) * pageSize,
+                count: didRemove ? currCount - 1 : currCount,
+                total: didRemove ? currTotal - 1 : currCount,
+                views: newViews,
+            },
+        },
+    });
+};
+
+/**
+ * Updates an entry in the list views caches, which are used
+ * to power the View Select component.
+ *
+ * @param urn the urn of the updated view
+ * @param view the updated view
+ * @param client the Apollo client
+ */
+export const updateViewSelectCache = (urn: string, view: DataHubView, client) => {
+    if (view.viewType === DataHubViewType.Personal) {
+        // Add or Update in Personal Views Cache, remove from the opposite.
+        updateListMyViewsCache(urn, view, client, 1, DEFAULT_LIST_VIEWS_PAGE_SIZE, DataHubViewType.Personal, undefined);
+        removeFromListGlobalViewsCache(urn, client, 1, DEFAULT_LIST_VIEWS_PAGE_SIZE, undefined);
+    } else {
+        // Add or Update in Global Views Cache, remove from the opposite.
+        updateListGlobalViewsCache(urn, view, client, 1, DEFAULT_LIST_VIEWS_PAGE_SIZE, undefined);
+        removeFromListMyViewsCache(urn, client, 1, DEFAULT_LIST_VIEWS_PAGE_SIZE, DataHubViewType.Personal, undefined);
+    }
+};
+
+/**
+ * Removes an URN from the queries used to power the View Select dropdown.
+ *
+ * @param urn the urn of the updated view
+ * @param client the Apollo client
+ */
+export const removeFromViewSelectCaches = (urn: string, client) => {
+    removeFromListMyViewsCache(urn, client, 1, DEFAULT_LIST_VIEWS_PAGE_SIZE, DataHubViewType.Personal, undefined);
+    removeFromListGlobalViewsCache(urn, client, 1, DEFAULT_LIST_VIEWS_PAGE_SIZE, undefined);
+};
diff --git a/datahub-web-react/src/app/entityV2/view/menu/ViewDropdownMenu.tsx b/datahub-web-react/src/app/entityV2/view/menu/ViewDropdownMenu.tsx
new file mode 100644
index 00000000000000..43f7d0fb02b1c5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/menu/ViewDropdownMenu.tsx
@@ -0,0 +1,297 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { useApolloClient } from '@apollo/client';
+import MoreVertIcon from '@mui/icons-material/MoreVert';
+import { Dropdown, Menu, message, Modal } from 'antd';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { colors } from '@src/alchemy-components';
+import { DataHubView, DataHubViewType } from '../../../../types.generated';
+import { useUserContext } from '../../../context/useUserContext';
+import { useUpdateCorpUserViewsSettingsMutation } from '../../../../graphql/user.generated';
+import { useUpdateGlobalViewsSettingsMutation } from '../../../../graphql/app.generated';
+import { useDeleteViewMutation } from '../../../../graphql/view.generated';
+import { removeFromListMyViewsCache, removeFromViewSelectCaches } from '../cacheUtils';
+import { DEFAULT_LIST_VIEWS_PAGE_SIZE } from '../utils';
+import { ViewBuilderMode } from '../builder/types';
+import { ViewBuilder } from '../builder/ViewBuilder';
+import { EditViewItem } from './item/EditViewItem';
+import { PreviewViewItem } from './item/PreviewViewItem';
+import { RemoveUserDefaultItem } from './item/RemoveUserDefaultItem';
+import { SetUserDefaultItem } from './item/SetUserDefaultItem';
+import { RemoveGlobalDefaultItem } from './item/RemoveGlobalDefaultItem';
+import { SetGlobalDefaultItem } from './item/SetGlobalDefaultItem';
+import { DeleteViewItem } from './item/DeleteViewItem';
+import analytics, { EventType } from '../../../analytics';
+
+const MenuButton = styled(MoreVertIcon)<{ $isShowNavBarRedesign?: boolean }>`
+    width: 20px;
+    ${(props) => props.$isShowNavBarRedesign && `color: ${colors.gray[1800]};`}
+    &&& {
+        padding-left: 0px;
+        padding-right: 0px;
+        font-size: 18px;
+    }
+    :hover {
+        cursor: pointer;
+    }
+`;
+
+const MenuStyled = styled(Menu)`
+    border-radius: 12px;
+    padding: 10px 0px;
+    &&& {
+        .ant-dropdown-menu-item:not(:hover) {
+            background: none;
+        }
+        .ant-dropdown-menu-item:hover {
+            background: #f5f5f5;
+        }
+    }
+`;
+
+const DEFAULT_VIEW_BUILDER_STATE = {
+    mode: ViewBuilderMode.EDITOR,
+    visible: false,
+};
+
+type Props = {
+    view: DataHubView;
+    visible?: boolean;
+    isOwnedByUser?: boolean;
+    trigger?: 'hover' | 'click';
+    // Custom Action Handlers - useful if you do NOT want the Menu to handle Modal rendering.
+    onClickEdit?: () => void;
+    onClickPreview?: () => void;
+    onClickDelete?: () => void;
+    selectView?: () => void;
+};
+
+export const ViewDropdownMenu = ({
+    view,
+    visible,
+    isOwnedByUser,
+    trigger = 'hover',
+    onClickEdit,
+    onClickPreview,
+    onClickDelete,
+    selectView,
+}: Props) => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    const userContext = useUserContext();
+    const client = useApolloClient();
+
+    const [updateUserViewSettingMutation] = useUpdateCorpUserViewsSettingsMutation();
+    const [updateGlobalViewSettingMutation] = useUpdateGlobalViewsSettingsMutation();
+    const [deleteViewMutation] = useDeleteViewMutation();
+
+    const [viewBuilderState, setViewBuilderState] = useState(DEFAULT_VIEW_BUILDER_STATE);
+
+    /**
+     * Updates the User's Personal Default View via mutation.
+     *
+     * Then updates the User Context state to contain the new default.
+     */
+    const setUserDefault = (viewUrn: string | null) => {
+        updateUserViewSettingMutation({
+            variables: {
+                input: {
+                    defaultView: viewUrn,
+                },
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    if (viewUrn && selectView) selectView();
+
+                    userContext.updateState({
+                        ...userContext.state,
+                        views: {
+                            ...userContext.state.views,
+                            personalDefaultViewUrn: viewUrn,
+                        },
+                    });
+                    analytics.event({
+                        type: EventType.SetUserDefaultViewEvent,
+                        urn: viewUrn,
+                        viewType: (viewUrn && view.viewType) || null,
+                    });
+                }
+            })
+            .catch((_) => {
+                message.destroy();
+                message.error({
+                    content: `Failed to make this your default view. An unexpected error occurred.`,
+                    duration: 3,
+                });
+            });
+    };
+
+    /**
+     * Updates the Global Default View via mutation.
+     *
+     * Then updates the User Context state to contain the new default.
+     */
+    const setGlobalDefault = (viewUrn: string | null) => {
+        updateGlobalViewSettingMutation({
+            variables: {
+                input: {
+                    defaultView: viewUrn,
+                },
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    userContext.updateState({
+                        ...userContext.state,
+                        views: {
+                            ...userContext.state.views,
+                            globalDefaultViewUrn: viewUrn,
+                        },
+                    });
+                    analytics.event({
+                        type: EventType.SetGlobalDefaultViewEvent,
+                        urn: viewUrn,
+                    });
+                }
+            })
+            .catch((_) => {
+                message.destroy();
+                message.error({
+                    content: `Failed to make this your organization's default view. An unexpected error occurred.`,
+                    duration: 3,
+                });
+            });
+    };
+
+    const onEditView = () => {
+        if (onClickEdit) {
+            onClickEdit?.();
+        } else {
+            setViewBuilderState({
+                mode: ViewBuilderMode.EDITOR,
+                visible: true,
+            });
+        }
+    };
+
+    const onPreviewView = () => {
+        if (onClickPreview) {
+            onClickPreview?.();
+        } else {
+            setViewBuilderState({
+                mode: ViewBuilderMode.PREVIEW,
+                visible: true,
+            });
+        }
+    };
+
+    const onViewBuilderClose = () => {
+        setViewBuilderState(DEFAULT_VIEW_BUILDER_STATE);
+    };
+
+    const deleteView = (viewUrn: string) => {
+        deleteViewMutation({
+            variables: { urn: viewUrn },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    removeFromViewSelectCaches(viewUrn, client);
+                    removeFromListMyViewsCache(viewUrn, client, 1, DEFAULT_LIST_VIEWS_PAGE_SIZE, undefined, undefined);
+                    /**
+                     * Clear the selected view urn from local state,
+                     * if the deleted view was that urn.
+                     */
+                    if (viewUrn === userContext.localState?.selectedViewUrn) {
+                        userContext.updateLocalState({
+                            ...userContext.localState,
+                            selectedViewUrn: undefined,
+                        });
+                    }
+                    message.success({ content: 'Removed View!', duration: 2 });
+                }
+            })
+            .catch(() => {
+                message.destroy();
+                message.error({
+                    content: `Failed to delete View. An unexpected error occurred.`,
+                    duration: 3,
+                });
+            });
+    };
+
+    const confirmDeleteView = () => {
+        if (onClickDelete) {
+            onClickDelete?.();
+        } else {
+            Modal.confirm({
+                title: `Confirm Remove ${view.name}`,
+                content: `Are you sure you want to remove this View?`,
+                onOk() {
+                    deleteView(view.urn);
+                },
+                onCancel() {},
+                okText: 'Yes',
+                maskClosable: true,
+                closable: true,
+            });
+        }
+    };
+
+    const canManageGlobalViews = userContext.platformPrivileges?.manageGlobalViews;
+    const canManageView = isOwnedByUser || canManageGlobalViews;
+
+    const maybePersonalDefaultViewUrn = userContext.state?.views?.personalDefaultViewUrn;
+    const maybeGlobalDefaultViewUrn = userContext.state?.views?.globalDefaultViewUrn;
+
+    const isGlobalView = view.viewType === DataHubViewType.Global;
+    const isUserDefault = view.urn === maybePersonalDefaultViewUrn;
+    const isGlobalDefault = view.urn === maybeGlobalDefaultViewUrn;
+
+    const showRemoveGlobalDefaultView = canManageGlobalViews && isGlobalView && isGlobalDefault;
+    const showSetGlobalDefaultView = canManageGlobalViews && isGlobalView && !isGlobalDefault;
+
+    const handleDropdownClick = (e) => {
+        e.stopPropagation();
+    };
+
+    return (
+        <>
+            <Dropdown
+                overlay={
+                    <MenuStyled>
+                        {(canManageView && <EditViewItem key="0" onClick={onEditView} />) || (
+                            <PreviewViewItem key="0" onClick={onPreviewView} />
+                        )}
+                        {(isUserDefault && <RemoveUserDefaultItem key="1" onClick={() => setUserDefault(null)} />) || (
+                            <SetUserDefaultItem key="1" onClick={() => setUserDefault(view.urn)} />
+                        )}
+                        {showRemoveGlobalDefaultView && (
+                            <RemoveGlobalDefaultItem key="2" onClick={() => setGlobalDefault(null)} />
+                        )}
+                        {showSetGlobalDefaultView && (
+                            <SetGlobalDefaultItem key="2" onClick={() => setGlobalDefault(view.urn)} />
+                        )}
+                        {canManageView && <DeleteViewItem key="3" onClick={confirmDeleteView} />}
+                    </MenuStyled>
+                }
+                trigger={[trigger]}
+            >
+                <MenuButton
+                    data-testid="views-table-dropdown"
+                    style={{ display: visible ? undefined : 'none' }}
+                    onClick={handleDropdownClick}
+                    $isShowNavBarRedesign={isShowNavBarRedesign}
+                />
+            </Dropdown>
+            {viewBuilderState.visible && (
+                <ViewBuilder
+                    mode={viewBuilderState.mode}
+                    urn={view.urn}
+                    initialState={view}
+                    onSubmit={onViewBuilderClose}
+                    onCancel={onViewBuilderClose}
+                />
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/menu/item/DeleteViewItem.tsx b/datahub-web-react/src/app/entityV2/view/menu/item/DeleteViewItem.tsx
new file mode 100644
index 00000000000000..91b147dac1af0c
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/menu/item/DeleteViewItem.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import styled from 'styled-components';
+import DeleteOutlineOutlinedIcon from '@mui/icons-material/DeleteOutlineOutlined';
+import { ViewItem } from './ViewItem';
+
+type Props = {
+    key: string;
+    onClick: () => void;
+};
+
+const DeleteOutlineOutlinedIconStyle = styled(DeleteOutlineOutlinedIcon)`
+    font-size: 14px !important;
+`;
+
+/**
+ * Delete a View Item
+ */
+export const DeleteViewItem = ({ key, onClick }: Props) => {
+    return (
+        <ViewItem
+            key={key}
+            onClick={onClick}
+            dataTestId="view-dropdown-delete"
+            tip="Delete this View"
+            title="Delete"
+            icon={<DeleteOutlineOutlinedIconStyle />}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/menu/item/EditViewItem.tsx b/datahub-web-react/src/app/entityV2/view/menu/item/EditViewItem.tsx
new file mode 100644
index 00000000000000..60a78b95ecb3fd
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/menu/item/EditViewItem.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
+import styled from 'styled-components';
+import { ViewItem } from './ViewItem';
+
+const EditOutlinedIconStyled = styled(EditOutlinedIcon)`
+    font-size: 14px !important;
+`;
+
+type Props = {
+    key: string;
+    onClick: () => void;
+};
+
+/**
+ * Edit View Menu Item
+ */
+export const EditViewItem = ({ key, onClick }: Props) => {
+    return (
+        <ViewItem
+            key={key}
+            onClick={onClick}
+            dataTestId="view-dropdown-edit"
+            tip="Edit this View"
+            title="Edit"
+            icon={<EditOutlinedIconStyled />}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/menu/item/IconItemTitle.tsx b/datahub-web-react/src/app/entityV2/view/menu/item/IconItemTitle.tsx
new file mode 100644
index 00000000000000..fe8a64fa4ca054
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/menu/item/IconItemTitle.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Tooltip } from '@components';
+import { ANTD_GRAY } from '../../../shared/constants';
+
+const TitleContainer = styled.span`
+    display: flex;
+    align-items: center;
+    justify-content: left;
+    padding-left: 0px;
+`;
+
+const IconContainer = styled.span`
+    && {
+        color: ${ANTD_GRAY[8]};
+        margin-right: 12px;
+        display: flex;
+        align-items: center;
+    }
+`;
+
+type Props = {
+    tip?: React.ReactNode;
+    title: string;
+    icon: React.ReactNode;
+};
+
+/**
+ * Base Item Title for the menu
+ */
+export const IconItemTitle = ({ tip, title, icon }: Props) => {
+    return (
+        <Tooltip title={tip} placement="right">
+            <TitleContainer>
+                <IconContainer>{icon}</IconContainer>
+                {title}
+            </TitleContainer>
+        </Tooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/menu/item/PreviewViewItem.tsx b/datahub-web-react/src/app/entityV2/view/menu/item/PreviewViewItem.tsx
new file mode 100644
index 00000000000000..c7ccaf40cbcfcc
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/menu/item/PreviewViewItem.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import { EyeOutlined } from '@ant-design/icons';
+import { ViewItem } from './ViewItem';
+
+type Props = {
+    key: string;
+    onClick: () => void;
+};
+
+/**
+ * Preview View Menu Item
+ */
+export const PreviewViewItem = ({ key, onClick }: Props) => {
+    return (
+        <ViewItem key={key} onClick={onClick} tip="See the View definition." title="Preview" icon={<EyeOutlined />} />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/menu/item/RemoveGlobalDefaultItem.tsx b/datahub-web-react/src/app/entityV2/view/menu/item/RemoveGlobalDefaultItem.tsx
new file mode 100644
index 00000000000000..03a36badc34791
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/menu/item/RemoveGlobalDefaultItem.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { StopOutlined } from '@ant-design/icons';
+import { ViewItem } from './ViewItem';
+
+type Props = {
+    key: string;
+    onClick: () => void;
+};
+
+/**
+ * Remove the Global View
+ */
+export const RemoveGlobalDefaultItem = ({ key, onClick }: Props) => {
+    return (
+        <ViewItem
+            key={key}
+            onClick={onClick}
+            tip="Remove this View as your organization's default."
+            title="Remove organization default"
+            icon={<StopOutlined />}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/menu/item/RemoveUserDefaultItem.tsx b/datahub-web-react/src/app/entityV2/view/menu/item/RemoveUserDefaultItem.tsx
new file mode 100644
index 00000000000000..079bbb237a4e54
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/menu/item/RemoveUserDefaultItem.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { StopOutlined } from '@ant-design/icons';
+import { ViewItem } from './ViewItem';
+
+type Props = {
+    key: string;
+    onClick: () => void;
+};
+
+/**
+ * Remove the User's default view item
+ */
+export const RemoveUserDefaultItem = ({ key, onClick }: Props) => {
+    return (
+        <ViewItem
+            key={key}
+            onClick={onClick}
+            dataTestId="view-dropdown-remove-user-default"
+            tip="Remove this View as your personal default."
+            title="Remove as default"
+            icon={<StopOutlined />}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/menu/item/SetGlobalDefaultItem.tsx b/datahub-web-react/src/app/entityV2/view/menu/item/SetGlobalDefaultItem.tsx
new file mode 100644
index 00000000000000..dccf772f7e153a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/menu/item/SetGlobalDefaultItem.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { GlobalDefaultViewIcon } from '../../shared/GlobalDefaultViewIcon';
+import { ViewItem } from './ViewItem';
+
+type Props = {
+    key: string;
+    onClick: () => void;
+};
+
+/**
+ * Set the Global Default Item
+ */
+export const SetGlobalDefaultItem = ({ key, onClick }: Props) => {
+    return (
+        <ViewItem
+            key={key}
+            onClick={onClick}
+            dataTestId="view-dropdown-set-global-default"
+            tip="Make this View your organization's default. All new users will have this View applied automatically."
+            title="Make organization default"
+            icon={<GlobalDefaultViewIcon />}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/menu/item/SetUserDefaultItem.tsx b/datahub-web-react/src/app/entityV2/view/menu/item/SetUserDefaultItem.tsx
new file mode 100644
index 00000000000000..f836631124e3bd
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/menu/item/SetUserDefaultItem.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { colors } from '@src/alchemy-components';
+import { UserDefaultViewIcon } from '../../shared/UserDefaultViewIcon';
+import { REDESIGN_COLORS } from '../../../shared/constants';
+import { ViewItem } from './ViewItem';
+
+type Props = {
+    key: string;
+    onClick: () => void;
+};
+
+/**
+ * Set the User's default view item
+ */
+export const SetUserDefaultItem = ({ key, onClick }: Props) => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+
+    return (
+        <ViewItem
+            key={key}
+            onClick={onClick}
+            dataTestId="view-dropdown-set-user-default"
+            tip="Make this View your personal default. You will have this View applied automatically."
+            title="Make my default"
+            icon={
+                <UserDefaultViewIcon
+                    color={isShowNavBarRedesign ? colors.violet[500] : REDESIGN_COLORS.TERTIARY_GREEN}
+                />
+            }
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/menu/item/ViewItem.tsx b/datahub-web-react/src/app/entityV2/view/menu/item/ViewItem.tsx
new file mode 100644
index 00000000000000..0ac607ce61bdc3
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/menu/item/ViewItem.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import { Menu } from 'antd';
+import { IconItemTitle } from './IconItemTitle';
+
+type Props = {
+    key: string;
+    onClick: () => void;
+    dataTestId?: string;
+    tip: string;
+    title: string;
+    icon: React.ReactNode;
+};
+
+export const ViewItem = ({ key, onClick, dataTestId, tip, title, icon }: Props) => {
+    const onClickHandler = (menuEvent) => {
+        menuEvent?.domEvent?.stopPropagation?.();
+        return onClick();
+    };
+
+    return (
+        <Menu.Item key={key} onClick={onClickHandler} data-testid={dataTestId}>
+            <IconItemTitle tip={tip} title={title} icon={icon} />
+        </Menu.Item>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/select/ViewOption.tsx b/datahub-web-react/src/app/entityV2/view/select/ViewOption.tsx
new file mode 100644
index 00000000000000..69bdc64da69690
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/select/ViewOption.tsx
@@ -0,0 +1,126 @@
+import React from 'react';
+import styled from 'styled-components';
+import CloseIcon from '@mui/icons-material/Close';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { DataHubView } from '../../../../types.generated';
+import { ViewOptionName } from './ViewOptionName';
+import { ANTD_GRAY, REDESIGN_COLORS, SEARCH_COLORS } from '../../shared/constants';
+
+const Container = styled.div`
+    display: flex;
+    width: 100%;
+    gap: 0.5rem;
+`;
+
+const ViewDetailsContainer = styled.div<{ selected: boolean; $isShowNavBarRedesign?: boolean }>`
+    display: flex;
+    align-items: center;
+    position: relative;
+    background: ${(props) => (props.selected ? SEARCH_COLORS.TITLE_PURPLE : '')};
+    ${(props) => !props.$isShowNavBarRedesign && 'padding: 10px;'}
+    border-radius: 16px;
+    ${(props) =>
+        !props.$isShowNavBarRedesign &&
+        `
+        border: 1px solid ${props.selected ? SEARCH_COLORS.TITLE_PURPLE : REDESIGN_COLORS.BORDER_1};
+    `}
+
+    &:hover {
+        ${(props) =>
+            !props.$isShowNavBarRedesign &&
+            `
+            border: ${`1px solid ${SEARCH_COLORS.TITLE_PURPLE}`};
+            padding: 10px;
+        `}
+        border-radius: 16px;
+        & .create-view-icon {
+            background: ${SEARCH_COLORS.TITLE_PURPLE} !important;
+            border: ${(props) => (!props.selected ? `1px solid ${SEARCH_COLORS.TITLE_PURPLE} !important` : '')};
+        }
+    }
+    & .default-view-icon-container {
+        border: 1px solid
+            ${(props) => (props.selected ? SEARCH_COLORS.TITLE_PURPLE : REDESIGN_COLORS.BACKGROUND_OVERLAY_BLACK)};
+        border-radius: 100%;
+    }
+    & .close-container {
+        position: absolute;
+        top: -10px;
+        right: -5px;
+        background-color: ${ANTD_GRAY[1]};
+        display: flex;
+        align-items: center;
+        border-radius: 100%;
+        padding: 5px;
+        cursor: pointer;
+    }
+`;
+
+const CloseIconStyle = styled(CloseIcon)`
+    font-size: 14px !important;
+    color: ${SEARCH_COLORS.TITLE_PURPLE};
+`;
+
+type Props = {
+    selectedUrn: boolean;
+    view: DataHubView;
+    showOptions: boolean;
+    isGlobalDefault: boolean;
+    isUserDefault: boolean;
+    isOwnedByUser?: boolean;
+    scrollToRef?: any;
+    onClickEdit: () => void;
+    onClickPreview: () => void;
+    onClickClear: () => void;
+    selectView: () => void;
+};
+
+export const ViewOption = ({
+    selectedUrn,
+    view,
+    showOptions,
+    isGlobalDefault,
+    isUserDefault,
+    isOwnedByUser,
+    scrollToRef,
+    onClickEdit,
+    onClickPreview,
+    onClickClear,
+    selectView,
+}: Props) => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    const onClear = (e) => {
+        e.stopPropagation();
+        onClickClear();
+    };
+
+    return (
+        <Container>
+            <ViewDetailsContainer
+                selected={selectedUrn}
+                ref={selectedUrn ? scrollToRef : null}
+                $isShowNavBarRedesign={isShowNavBarRedesign}
+            >
+                <ViewOptionName
+                    name={view.name}
+                    description={view.description}
+                    type={view.viewType}
+                    isUserDefault={isUserDefault}
+                    isGlobalDefault={isGlobalDefault}
+                    view={view}
+                    isOwnedByUser={isOwnedByUser}
+                    visible={showOptions}
+                    onClickEdit={onClickEdit}
+                    onClickPreview={onClickPreview}
+                    selected={selectedUrn}
+                    selectView={selectView}
+                />
+                {selectedUrn && (
+                    <div className="close-container" onClick={(e) => onClear(e)} role="none">
+                        <CloseIconStyle />
+                    </div>
+                )}
+            </ViewDetailsContainer>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/select/ViewOptionName.tsx b/datahub-web-react/src/app/entityV2/view/select/ViewOptionName.tsx
new file mode 100644
index 00000000000000..72e4f68b9249cd
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/select/ViewOptionName.tsx
@@ -0,0 +1,213 @@
+import React from 'react';
+import styled from 'styled-components';
+import { colors, Tooltip } from '@components';
+import FilterCenterFocusOutlinedIcon from '@mui/icons-material/FilterCenterFocusOutlined';
+import LockOutlinedIcon from '@mui/icons-material/LockOutlined';
+import PublicIcon from '@mui/icons-material/Public';
+import { GlobeHemisphereEast, Lock } from '@phosphor-icons/react';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { ANTD_GRAY, REDESIGN_COLORS, SEARCH_COLORS } from '../../shared/constants';
+import { ViewOptionTooltipTitle } from './ViewOptionTooltipTitle';
+import { UserDefaultViewIcon } from '../shared/UserDefaultViewIcon';
+import { GlobalDefaultViewIcon } from '../shared/GlobalDefaultViewIcon';
+import { ViewDropdownMenu } from '../menu/ViewDropdownMenu';
+import { DataHubView } from '../../../../types.generated';
+import {
+    ViewContainer,
+    ViewContent,
+    ViewDescription,
+    ViewIcon,
+    ViewIconNavBarRedesign,
+    ViewLabel,
+} from './styledComponents';
+
+const ICON_WIDTH = 30;
+
+const IconPlaceholder = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    width: ${ICON_WIDTH}px;
+    display: flex;
+    align-items: center;
+    justify-content: end;
+    position: absolute;
+    right: 5px;
+    top: ${(props) => (props.$isShowNavBarRedesign ? '0px' : '-5px')};
+    gap: 0.2rem;
+`;
+
+const ViewType = styled.span`
+    position: absolute;
+    bottom: 0px;
+    right: 0px;
+    background-color: ${ANTD_GRAY[1]};
+    color: ${REDESIGN_COLORS.BLACK};
+    display: flex;
+    align-items: center;
+    border-radius: 8px 1px;
+    padding: 5px 4px;
+`;
+
+const DefaultViewIconContainer = styled.div<{ selected?: boolean; $isShowNavBarRedesign?: boolean }>`
+    border: 1px solid
+        ${(props) => {
+            if (props.$isShowNavBarRedesign) {
+                return props.selected ? colors.violet[500] : 'transparent';
+            }
+            return props.selected ? SEARCH_COLORS.TITLE_PURPLE : REDESIGN_COLORS.BACKGROUND_OVERLAY_BLACK;
+        }};
+    border-radius: 100%;
+`;
+
+const ViewDropdownMenuContainer = styled.div`
+    display: flex;
+    justify-content: end;
+    align-item: center;
+`;
+
+const PublicIconStyle = styled(PublicIcon)`
+    font-size: 12px !important;
+`;
+
+const LockOutlinedIconStyle = styled(LockOutlinedIcon)`
+    font-size: 12px !important;
+`;
+
+const FilterCenterFocusOutlinedIconStyle = styled(FilterCenterFocusOutlinedIcon)`
+    font-size: 18px !important;
+`;
+
+type Props = {
+    name: string;
+    type: string;
+    isGlobalDefault: boolean;
+    isUserDefault: boolean;
+    description?: string | null;
+    view: DataHubView;
+    visible?: boolean;
+    isOwnedByUser?: boolean;
+    selected?: boolean;
+    // Custom Action Handlers - useful if you do NOT want the Menu to handle Modal rendering.
+    onClickEdit?: () => void;
+    onClickPreview?: () => void;
+    selectView: () => void;
+};
+
+const ViewIconContainerNavBarRedesign = styled.div`
+    display: flex;
+    position: relative;
+`;
+
+export const ViewOptionName = ({
+    name,
+    description,
+    type,
+    isGlobalDefault,
+    isUserDefault,
+    view,
+    visible,
+    isOwnedByUser,
+    selected,
+    onClickEdit,
+    onClickPreview,
+    selectView,
+}: Props) => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+
+    const renderViewIcon = () => {
+        if (isShowNavBarRedesign) {
+            return (
+                <ViewIconContainerNavBarRedesign>
+                    {(isUserDefault || isGlobalDefault) && (
+                        <IconPlaceholder $isShowNavBarRedesign={isShowNavBarRedesign}>
+                            {isGlobalDefault && (
+                                <DefaultViewIconContainer
+                                    selected={selected}
+                                    $isShowNavBarRedesign={isShowNavBarRedesign}
+                                >
+                                    <GlobalDefaultViewIcon
+                                        title="Your organization's default View."
+                                        color={colors.gray[200]}
+                                        size={5}
+                                    />
+                                </DefaultViewIconContainer>
+                            )}
+                            {isUserDefault && (
+                                <DefaultViewIconContainer
+                                    selected={selected}
+                                    $isShowNavBarRedesign={isShowNavBarRedesign}
+                                >
+                                    <UserDefaultViewIcon
+                                        title="Your default View."
+                                        color={colors.violet[500]}
+                                        size={5}
+                                    />
+                                </DefaultViewIconContainer>
+                            )}
+                        </IconPlaceholder>
+                    )}
+                    <Tooltip placement="bottom" showArrow title={type === 'GLOBAL' ? 'Public' : 'Private'}>
+                        <ViewIconNavBarRedesign $selected={selected}>
+                            {type === 'GLOBAL' && <GlobeHemisphereEast size={22} />}
+                            {type === 'PERSONAL' && <Lock size={22} />}
+                        </ViewIconNavBarRedesign>
+                    </Tooltip>
+                </ViewIconContainerNavBarRedesign>
+            );
+        }
+
+        return (
+            <ViewIcon className="create-view-icon" $selected={selected}>
+                <FilterCenterFocusOutlinedIconStyle />
+                {(isUserDefault || isGlobalDefault) && (
+                    <IconPlaceholder>
+                        {isGlobalDefault && (
+                            <DefaultViewIconContainer selected={selected}>
+                                <GlobalDefaultViewIcon title="Your organization's default View." size={10} />
+                            </DefaultViewIconContainer>
+                        )}
+                        {isUserDefault && (
+                            <DefaultViewIconContainer selected={selected}>
+                                <UserDefaultViewIcon
+                                    title="Your default View."
+                                    color={REDESIGN_COLORS.TERTIARY_GREEN}
+                                    size={10}
+                                />
+                            </DefaultViewIconContainer>
+                        )}
+                    </IconPlaceholder>
+                )}
+                <Tooltip placement="bottom" showArrow title={type === 'GLOBAL' ? 'Public' : 'Private'}>
+                    <ViewType>
+                        {type === 'GLOBAL' && <PublicIconStyle />}
+                        {type === 'PERSONAL' && <LockOutlinedIconStyle />}
+                    </ViewType>
+                </Tooltip>
+            </ViewIcon>
+        );
+    };
+
+    return (
+        <ViewContainer role="row" $selected={selected} $isShowNavBarRedesign={isShowNavBarRedesign}>
+            {renderViewIcon()}
+            <Tooltip
+                placement="bottom"
+                showArrow
+                title={<ViewOptionTooltipTitle name={name} description={description} />}
+            >
+                <ViewContent $isShowNavBarRedesign={isShowNavBarRedesign}>
+                    <ViewLabel $isShowNavBarRedesign={isShowNavBarRedesign}>{name}</ViewLabel>
+                    <ViewDescription $isShowNavBarRedesign={isShowNavBarRedesign}>{description}</ViewDescription>
+                </ViewContent>
+            </Tooltip>
+            <ViewDropdownMenuContainer>
+                <ViewDropdownMenu
+                    view={view}
+                    isOwnedByUser={isOwnedByUser}
+                    visible={visible}
+                    onClickEdit={onClickEdit}
+                    onClickPreview={onClickPreview}
+                    selectView={selectView}
+                />
+            </ViewDropdownMenuContainer>
+        </ViewContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/select/ViewOptionTooltipTitle.tsx b/datahub-web-react/src/app/entityV2/view/select/ViewOptionTooltipTitle.tsx
new file mode 100644
index 00000000000000..4949dc9d7d7ce2
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/select/ViewOptionTooltipTitle.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import styled from 'styled-components';
+
+const NameContainer = styled.div`
+    margin-bottom: 8px;
+`;
+
+type Props = {
+    name: string;
+    description?: string | null;
+};
+
+export const ViewOptionTooltipTitle = ({ name, description }: Props) => {
+    return (
+        <>
+            <NameContainer>
+                <b>{name}</b>
+            </NameContainer>
+            <div>{description}</div>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/select/ViewSelect.tsx b/datahub-web-react/src/app/entityV2/view/select/ViewSelect.tsx
new file mode 100644
index 00000000000000..400d0a0ee0d23e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/select/ViewSelect.tsx
@@ -0,0 +1,372 @@
+import React, { useEffect, useRef, useState } from 'react';
+import { createPortal } from 'react-dom';
+import { useHistory } from 'react-router';
+import { colors, Popover } from '@components';
+import styled from 'styled-components';
+import { debounce } from 'lodash';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { useListMyViewsQuery, useListGlobalViewsQuery } from '../../../../graphql/view.generated';
+import { useUserContext } from '../../../context/useUserContext';
+import { DataHubView, DataHubViewType } from '../../../../types.generated';
+import { ViewBuilder } from '../builder/ViewBuilder';
+import { DEFAULT_LIST_VIEWS_PAGE_SIZE } from '../utils';
+import { PageRoutes } from '../../../../conf/Global';
+import { ViewBuilderMode } from '../builder/types';
+import { renderViewOptionGroup } from './renderViewOptionGroup';
+import { renderSelectedView } from './renderSelectedView';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../../shared/constants';
+import { HALF_SECOND_IN_MS, MAX_ROWS_BEFORE_DEBOUNCE } from '../../shared/tabs/Dataset/Queries/utils/constants';
+import { filterViews } from './utils';
+import { ViewSelectPopoverContent } from './ViewSelectPopoverContent';
+import './style.css';
+
+type ViewBuilderDisplayState = {
+    mode: ViewBuilderMode;
+    visible: boolean;
+    view?: DataHubView;
+};
+
+const DEFAULT_VIEW_BUILDER_DISPLAY_STATE = {
+    mode: ViewBuilderMode.EDITOR,
+    visible: false,
+    view: undefined,
+};
+
+const ViewSelectContainer = styled.div`
+    &&& {
+        display: flex;
+        align-items: center;
+        padding: 0px 0px;
+
+        & .close-container {
+            position: absolute;
+            top: -10px;
+            right: -5px;
+            background-color: ${ANTD_GRAY[1]};
+            display: flex;
+            align-items: center;
+            border-radius: 100%;
+            padding: 5px;
+        }
+
+        .ant-select {
+            .ant-select-selection-search {
+                position: absolute;
+            }
+
+            &.ant-select-open {
+                .ant-select-selection-placeholder,
+                .ant-select-selection-item {
+                    color: ${ANTD_GRAY[1]};
+                }
+            }
+
+            &:not(.ant-select-open) {
+                .ant-select-selection-placeholder,
+                .ant-select-selection-item {
+                    color: #fff;
+                }
+            }
+
+            .ant-select-selection-placeholder {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                height: 100%;
+            }
+
+            .ant-select-selection-item {
+                font-weight: 700;
+                font-size: 14px;
+                text-align: right;
+                padding: 0px;
+            }
+        }
+    }
+`;
+
+const overlayInnerStyle = {
+    background: 'transparent',
+    display: 'flex',
+    width: '100%',
+};
+
+const getOverlayInnerStyle = (isShowNavBarRedesign?: boolean) => {
+    if (isShowNavBarRedesign)
+        return {
+            display: 'flex',
+            width: '100%',
+            opacity: 0.97,
+            backgroundColor: colors.gray[1600],
+            borderRadius: '0 0 12px 12px',
+            paddingTop: '1px',
+            boxShadow: '0px 525px 20px 500px rgba(0, 0, 0, 0.12), 0px 65px 60px 0px rgba(0, 0, 0, 0.12)',
+        };
+
+    return overlayInnerStyle;
+};
+
+const overlayStyle = {
+    left: '0px',
+    backgroundColor: REDESIGN_COLORS.BACKGROUND_OVERLAY_BLACK,
+    backdropFilter: 'blur(5px)',
+    opacity: 0.97,
+    zIndex: 13,
+    'transform-origin': '0',
+};
+
+const getOverlayStyle = (isShowNavBarRedesign?: boolean) => {
+    if (isShowNavBarRedesign)
+        return {
+            left: '0px',
+            zIndex: 13,
+            paddingTop: '5px',
+            'transform-origin': '0',
+        };
+
+    return overlayStyle;
+};
+
+const Blur = styled.div<{ $isOpen?: boolean }>`
+    position: absolute;
+    top: 69px;
+    left: 0;
+    width: 100%;
+    height: calc(100vh - 69px);
+    z-index: 12;
+    backdrop-filter: blur(2px);
+    ${(props) => !props.$isOpen && 'display: none;'}
+`;
+
+/**
+ * The View Select component allows you to select a View to apply to query on the current page. For example,
+ * search, recommendations, and browse.
+ *
+ * The current state of the View select includes an urn that must be forwarded with search, browse, and recommendations
+ * requests. As we navigate around the app, the state of the selected View should not change.
+ *
+ * In the event that a user refreshes their browser, the state of the view should be saved as well.
+ */
+export const ViewSelect = () => {
+    const history = useHistory();
+    const userContext = useUserContext();
+    const [viewBuilderDisplayState, setViewBuilderDisplayState] = useState<ViewBuilderDisplayState>(
+        DEFAULT_VIEW_BUILDER_DISPLAY_STATE,
+    );
+    const [selectedUrn, setSelectedUrn] = useState<string | undefined>(
+        userContext.localState?.selectedViewUrn || undefined,
+    );
+    const [hoverViewUrn, setHoverViewUrn] = useState<string | undefined>(undefined);
+    const [privateView, setPrivateView] = useState<boolean>(true);
+    const [publicView, setPublicView] = useState<boolean>(true);
+
+    const [filterText, setFilterText] = useState('');
+    const [isOpen, setIsOpen] = useState(false);
+    const [selectedViewName, setSelectedView] = useState<string>('');
+
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+
+    const selectRef = useRef(null);
+
+    const scrollToRef = useRef<HTMLDivElement>(null);
+    /**
+     * Queries - Notice, each of these queries is cached. Here we fetch both the user's private views,
+     * along with all public views.
+     */
+
+    const { data: privateViewsData } = useListMyViewsQuery({
+        variables: {
+            start: 0,
+            count: DEFAULT_LIST_VIEWS_PAGE_SIZE,
+            viewType: DataHubViewType.Personal,
+        },
+        fetchPolicy: 'cache-first',
+    });
+
+    // Fetch Public Views
+    const { data: publicViewsData } = useListGlobalViewsQuery({
+        variables: {
+            start: 0,
+            count: DEFAULT_LIST_VIEWS_PAGE_SIZE,
+        },
+        fetchPolicy: 'cache-first',
+    });
+
+    useEffect(() => {
+        setSelectedUrn(userContext.localState?.selectedViewUrn || undefined);
+        const selectedView =
+            privateViewsData?.listMyViews?.views?.find(
+                (view) => view?.urn === userContext.localState?.selectedViewUrn,
+            ) ||
+            publicViewsData?.listGlobalViews?.views?.find(
+                (view) => view?.urn === userContext.localState?.selectedViewUrn,
+            );
+        if (selectedView === undefined) {
+            setSelectedView('');
+        } else {
+            setSelectedView(selectedView.name);
+        }
+    }, [userContext.localState?.selectedViewUrn, setSelectedUrn, privateViewsData, publicViewsData]);
+
+    const highlightedPublicViewData = filterViews(filterText, publicViewsData?.listGlobalViews?.views || []);
+    const highlightedPrivateViewData = filterViews(filterText, privateViewsData?.listMyViews?.views || []);
+
+    const debouncedSetFilterText = debounce(
+        (e: React.ChangeEvent<HTMLInputElement>) => setFilterText(e.target.value),
+        (highlightedPublicViewData.length || highlightedPrivateViewData.length) > MAX_ROWS_BEFORE_DEBOUNCE
+            ? HALF_SECOND_IN_MS
+            : 0,
+    );
+
+    /**
+     * Event Handlers
+     */
+
+    const onSelectView = (newUrn) => {
+        const selectedView =
+            highlightedPrivateViewData?.find((view) => view?.urn === selectedUrn) ||
+            highlightedPublicViewData?.find((view) => view?.urn === selectedUrn);
+        setSelectedView(selectedView?.name ?? '');
+        userContext.updateLocalState({
+            ...userContext.localState,
+            selectedViewUrn: newUrn,
+        });
+        setTimeout(() => {
+            setIsOpen(false);
+        }, 250);
+    };
+
+    const onClickCreateView = () => {
+        setViewBuilderDisplayState({
+            visible: true,
+            mode: ViewBuilderMode.EDITOR,
+            view: undefined,
+        });
+    };
+
+    const onClickEditView = (view) => {
+        setViewBuilderDisplayState({
+            visible: true,
+            mode: ViewBuilderMode.EDITOR,
+            view,
+        });
+    };
+
+    const onCloseViewBuilder = () => {
+        setViewBuilderDisplayState(DEFAULT_VIEW_BUILDER_DISPLAY_STATE);
+    };
+
+    const onClickPreviewView = (view) => {
+        setViewBuilderDisplayState({
+            visible: true,
+            mode: ViewBuilderMode.PREVIEW,
+            view,
+        });
+    };
+
+    const onClear = () => {
+        setSelectedUrn(undefined);
+        setSelectedView('');
+        userContext.updateLocalState({
+            ...userContext.localState,
+            selectedViewUrn: undefined,
+        });
+        setIsOpen(false);
+    };
+
+    const onClickManageViews = () => {
+        history.push(PageRoutes.SETTINGS_VIEWS);
+        setIsOpen(false);
+    };
+
+    const onClickViewTypeFilter = (type: string) => {
+        setPrivateView(type === 'private' || type === 'all');
+        setPublicView(type === 'public' || type === 'all');
+    };
+
+    /**
+     * Render variables
+     */
+    const privateViews = highlightedPrivateViewData || [];
+    const publicViews = highlightedPublicViewData || [];
+    const privateViewCount = privateViews?.length || 0;
+    const publicViewCount = publicViews?.length || 0;
+    const hasViews = privateViewCount > 0 || publicViewCount > 0 || false;
+
+    return (
+        <>
+            {isShowNavBarRedesign && createPortal(<Blur $isOpen={isOpen} />, document.body)}
+            <ViewSelectContainer>
+                <Popover
+                    open={isOpen}
+                    onOpenChange={() => {
+                        scrollToRef?.current?.scrollIntoView({ behavior: 'smooth', block: 'end' });
+                        setIsOpen(!isOpen);
+                    }}
+                    content={
+                        <>
+                            <ViewSelectPopoverContent
+                                privateView={privateView}
+                                publicView={publicView}
+                                onClickCreateView={onClickCreateView}
+                                onClickManageViews={onClickManageViews}
+                                onClickViewTypeFilter={onClickViewTypeFilter}
+                                onChangeSearch={debouncedSetFilterText}
+                            >
+                                {hasViews &&
+                                    privateViewCount > 0 &&
+                                    privateView &&
+                                    renderViewOptionGroup({
+                                        selectedUrn,
+                                        views: highlightedPrivateViewData,
+                                        isOwnedByUser: true,
+                                        userContext,
+                                        hoverViewUrn,
+                                        scrollToRef,
+                                        setHoverViewUrn,
+                                        onClickEditView,
+                                        onClickPreviewView,
+                                        onClickClear: onClear,
+                                        onSelectView,
+                                    })}
+                                {hasViews &&
+                                    publicViewCount > 0 &&
+                                    publicView &&
+                                    renderViewOptionGroup({
+                                        selectedUrn,
+                                        views: highlightedPublicViewData,
+                                        userContext,
+                                        hoverViewUrn,
+                                        scrollToRef,
+                                        setHoverViewUrn,
+                                        onClickEditView,
+                                        onClickPreviewView,
+                                        onClickClear: onClear,
+                                        onSelectView,
+                                    })}
+                            </ViewSelectPopoverContent>
+                        </>
+                    }
+                    trigger="click"
+                    overlayClassName="view-select-popover"
+                    overlayInnerStyle={getOverlayInnerStyle(isShowNavBarRedesign)}
+                    overlayStyle={getOverlayStyle(isShowNavBarRedesign)}
+                    showArrow={false}
+                    popupVisible={false}
+                    ref={selectRef}
+                >
+                    {renderSelectedView({ selectedViewName, onClear, isShowNavBarRedesign })}
+                </Popover>
+                {viewBuilderDisplayState.visible && (
+                    <ViewBuilder
+                        urn={viewBuilderDisplayState.view?.urn || undefined}
+                        initialState={viewBuilderDisplayState.view}
+                        mode={viewBuilderDisplayState.mode}
+                        onSubmit={onCloseViewBuilder}
+                        onCancel={onCloseViewBuilder}
+                    />
+                )}
+            </ViewSelectContainer>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/select/ViewSelectContent.tsx b/datahub-web-react/src/app/entityV2/view/select/ViewSelectContent.tsx
new file mode 100644
index 00000000000000..d5cd11a8484cc8
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/select/ViewSelectContent.tsx
@@ -0,0 +1,94 @@
+import React from 'react';
+import styled from 'styled-components';
+import AddOutlinedIcon from '@mui/icons-material/AddOutlined';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { Tooltip } from '@components';
+import { ANTD_GRAY } from '../../shared/constants';
+import {
+    ViewContainer,
+    ViewContent,
+    ViewDescription,
+    ViewIcon,
+    ViewIconNavBarRedesign,
+    ViewLabel,
+} from './styledComponents';
+import { Carousel } from '../../../sharedV2/carousel/Carousel';
+import { ViewOptionTooltipTitle } from './ViewOptionTooltipTitle';
+
+const StyledCarousel = styled(Carousel)<{ $isShowNavBarRedesign?: boolean }>`
+    gap: ${(props) => (props.$isShowNavBarRedesign ? '8px' : '10px')};
+    padding: ${(props) => (props.$isShowNavBarRedesign ? '12px 8px 0 0' : '20px 0')};
+
+    .rc-virtual-list-holder-inner {
+        display: flex;
+        flex-direction: row !important;
+        gap: 1rem;
+        .ant-select-item-option-content {
+            display: flex;
+            gap: 1rem;
+            color: ${ANTD_GRAY[1]};
+            padding: 10px 0px;
+        }
+        .ant-select-item,
+        .ant-select-item-option-active:not(.ant-select-item-option-disabled),
+        .ant-select-item-option-selected:not(.ant-select-item-option-disabled) {
+            background: unset;
+            padding: unset;
+        }
+    }
+`;
+
+const AddOutlinedIconStyle = styled(AddOutlinedIcon)`
+    font-size: 18px !important;
+`;
+
+type Props = {
+    children: React.ReactNode;
+    onClickCreateView: () => void;
+};
+
+export const ViewSelectContent = ({ children, onClickCreateView }: Props) => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    const IconWrapper = isShowNavBarRedesign ? ViewIconNavBarRedesign : ViewIcon;
+
+    const renderCreateItem = () => {
+        const name = 'Create a View';
+        const description = isShowNavBarRedesign ? 'Create a set of saved search filters' : 'Create view';
+        const ViewContentWrapper = isShowNavBarRedesign
+            ? ({ children: tooltipChildren }) => (
+                  <Tooltip
+                      placement="bottom"
+                      showArrow
+                      title={<ViewOptionTooltipTitle name={name} description={description} />}
+                  >
+                      {tooltipChildren}
+                  </Tooltip>
+              )
+            : React.Fragment;
+
+        return (
+            <ViewContainer onClick={() => onClickCreateView()} role="none" $isShowNavBarRedesign={isShowNavBarRedesign}>
+                <IconWrapper>
+                    <AddOutlinedIconStyle />
+                </IconWrapper>
+                <ViewContentWrapper>
+                    <ViewContent $isShowNavBarRedesign={isShowNavBarRedesign}>
+                        <ViewLabel className="static" $isShowNavBarRedesign={isShowNavBarRedesign}>
+                            Create a View
+                        </ViewLabel>
+                        <ViewDescription $isShowNavBarRedesign={isShowNavBarRedesign}>
+                            {isShowNavBarRedesign ? 'Create a set of saved search filters' : 'Create view'}
+                        </ViewDescription>
+                    </ViewContent>
+                </ViewContentWrapper>
+            </ViewContainer>
+        );
+    };
+
+    return (
+        <StyledCarousel $isShowNavBarRedesign={isShowNavBarRedesign}>
+            {renderCreateItem()}
+            {children}
+        </StyledCarousel>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/select/ViewSelectDropdown.tsx b/datahub-web-react/src/app/entityV2/view/select/ViewSelectDropdown.tsx
new file mode 100644
index 00000000000000..428750c0ea2db6
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/select/ViewSelectDropdown.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import styled from 'styled-components';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { ViewSelectContent } from './ViewSelectContent';
+import { ViewSelectHeader } from './ViewSelectHeader';
+import { ANTD_GRAY } from '../../shared/constants';
+
+type Props = {
+    children: React.ReactNode;
+    privateView: boolean;
+    publicView: boolean;
+    onClickCreateView: () => void;
+    onClickManageViews: () => void;
+    onClickViewTypeFilter: (type: string) => void;
+    onChangeSearch: (text: any) => void;
+};
+
+const Container = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    display: flex;
+    width: 100%;
+    padding: ${(props) => (props.$isShowNavBarRedesign ? '0 8px 8px 8px' : '0px 20px 0px 80px')};
+    color: ${ANTD_GRAY[1]};
+    gap: ${(props) => (props.$isShowNavBarRedesign ? '4px' : '0.5rem')};
+    flex-direction: column;
+    position: relative;
+    &:hover {
+        .hover-btn {
+            display: flex;
+        }
+    }
+`;
+
+export const ViewSelectDropdown = ({
+    children,
+    publicView,
+    privateView,
+    onClickCreateView,
+    onClickManageViews,
+    onClickViewTypeFilter,
+    onChangeSearch,
+}: Props) => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    return (
+        <Container $isShowNavBarRedesign={isShowNavBarRedesign}>
+            <ViewSelectHeader
+                onClickViewTypeFilter={onClickViewTypeFilter}
+                publicView={publicView}
+                privateView={privateView}
+                onClickManageViews={onClickManageViews}
+                onChangeSearch={onChangeSearch}
+            />
+            <ViewSelectContent onClickCreateView={onClickCreateView}>{children} </ViewSelectContent>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/select/ViewSelectHeader.tsx b/datahub-web-react/src/app/entityV2/view/select/ViewSelectHeader.tsx
new file mode 100644
index 00000000000000..2dd44435d68fc0
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/select/ViewSelectHeader.tsx
@@ -0,0 +1,189 @@
+import React from 'react';
+import styled from 'styled-components';
+import GridViewIcon from '@mui/icons-material/GridView';
+import LockOutlinedIcon from '@mui/icons-material/LockOutlined';
+import PublicIcon from '@mui/icons-material/Public';
+import { Input } from 'antd';
+import { Tooltip } from '@components';
+import { SearchOutlined } from '@ant-design/icons';
+import { colors } from '@src/alchemy-components';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { MagnifyingGlass } from '@phosphor-icons/react';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../../shared/constants';
+
+const StyledInput = styled(Input)<{ $isShowNavBarRedesign?: boolean }>`
+    ${(props) => !props.$isShowNavBarRedesign && 'max-width: 330px;'}
+    background-color: ${(props) =>
+        props.$isShowNavBarRedesign ? 'white' : REDESIGN_COLORS.BACKGROUND_OVERLAY_BLACK_SEARCH};
+    border-radius: ${(props) => (props.$isShowNavBarRedesign ? '8px' : '7px')};
+
+    ${(props) => !props.$isShowNavBarRedesign && 'border: unset;'}
+
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        min-width: 431px;
+        height: 40px;
+        border: 1px solid;
+        border-color: ${colors.gray[100]};
+        box-shadow: 0px 1px 2px 0px rgba(33, 23, 95, 0.07);
+
+        &&:hover {
+            border-color: ${colors.violet[500]};
+        }
+
+        &.ant-input-affix-wrapper-focused {
+            border-color: ${colors.violet[500]};
+        }
+        
+        & .ant-input::placeholder {
+            color: ${colors.gray[1800]};
+        }
+
+        & .ant-input-prefix {
+            margin-right: 8px;
+            svg {
+                color: ${colors.gray[1800]}
+            }
+        }
+    `}
+
+    & .ant-input {
+        background-color: transparent;
+        ${(props) => !props.$isShowNavBarRedesign && `color: ${colors.gray[1800]};`}
+        ${(props) => props.$isShowNavBarRedesign && 'font-size: 14px;'}
+    }
+`;
+
+const ViewHeader = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    display: flex;
+    justify-content: space-between;
+    width: 100%;
+    align-items: center;
+    .select-container {
+        display: flex;
+        gap: 1rem;
+        align-items: center;
+        .select-view-icon {
+            color: ${(props) => (props.$isShowNavBarRedesign ? colors.gray[1800] : REDESIGN_COLORS.BLACK)};
+            display: flex;
+            gap: 0.5rem;
+            background: ${(props) => (props.$isShowNavBarRedesign ? colors.white : ANTD_GRAY[1])};
+            border-radius: 30px;
+            padding: ${(props) => (props.$isShowNavBarRedesign ? '4px' : '2px')};
+            > div {
+                padding: ${(props) => (props.$isShowNavBarRedesign ? '3px' : '5px 4px')};
+                display: flex;
+                align-item: center;
+                border-radius: 100px;
+                cursor: pointer;
+                &.active {
+                    background: #533fd1;
+                    color: ${ANTD_GRAY[1]};
+                }
+            }
+        }
+        .select-view-label {
+            font-size: 14px;
+            font-weight: 700;
+        }
+    }
+    .search-manage-container {
+        display: flex;
+        gap: 1rem;
+        align-items: center;
+        .manage {
+            color: ${(props) => (props.$isShowNavBarRedesign ? colors.gray[1700] : REDESIGN_COLORS.VIEW_PURPLE)};
+            font-size: 12px;
+            font-weight: 700;
+            cursor: pointer;
+        }
+    }
+`;
+
+const GridViewIconStyle = styled(GridViewIcon)<{ $isShowNavBarRedesign?: boolean }>`
+    font-size: ${(props) => (props.$isShowNavBarRedesign ? '14px' : '13px')} !important;
+`;
+
+const LockOutlinedIconStyle = styled(LockOutlinedIcon)<{ $isShowNavBarRedesign?: boolean }>`
+    font-size: ${(props) => (props.$isShowNavBarRedesign ? '14px' : '13px')} !important;
+`;
+
+const PublicIconStyle = styled(PublicIcon)<{ $isShowNavBarRedesign?: boolean }>`
+    font-size: ${(props) => (props.$isShowNavBarRedesign ? '14px' : '13px')} !important;
+`;
+
+const SearchOutlinedStyle = styled(SearchOutlined)`
+    color: ${ANTD_GRAY[5]};
+`;
+
+type Props = {
+    privateView: boolean;
+    publicView: boolean;
+    onClickViewTypeFilter: (type: string) => void;
+    onClickManageViews: () => void;
+    onChangeSearch: (text: any) => void;
+};
+
+export const ViewSelectHeader = ({
+    publicView,
+    privateView,
+    onClickViewTypeFilter,
+    onChangeSearch,
+    onClickManageViews,
+}: Props) => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+
+    return (
+        <ViewHeader $isShowNavBarRedesign={isShowNavBarRedesign}>
+            <div className="select-container">
+                <div className="select-view-icon">
+                    <div
+                        className={`${publicView && privateView ? 'active' : ''}`}
+                        onClick={() => onClickViewTypeFilter('all')}
+                        role="none"
+                    >
+                        <Tooltip placement="bottom" showArrow title="All">
+                            <GridViewIconStyle $isShowNavBarRedesign={isShowNavBarRedesign} />
+                        </Tooltip>
+                    </div>
+                    <div
+                        className={`${!publicView && privateView ? 'active' : ''}`}
+                        onClick={() => onClickViewTypeFilter('private')}
+                        role="none"
+                    >
+                        <Tooltip placement="bottom" showArrow title="Private">
+                            <LockOutlinedIconStyle $isShowNavBarRedesign={isShowNavBarRedesign} />
+                        </Tooltip>
+                    </div>
+                    <div
+                        className={`${publicView && !privateView ? 'active' : ''}`}
+                        onClick={() => onClickViewTypeFilter('public')}
+                        role="none"
+                    >
+                        <Tooltip placement="bottom" showArrow title="Public">
+                            <PublicIconStyle $isShowNavBarRedesign={isShowNavBarRedesign} />
+                        </Tooltip>
+                    </div>
+                </div>
+                {!isShowNavBarRedesign && <div className="select-view-label">Select Your View</div>}
+            </div>
+            <div className="search-manage-container">
+                <div>
+                    <StyledInput
+                        className="style-input-container"
+                        placeholder={isShowNavBarRedesign ? 'Search views...' : 'Search'}
+                        onChange={onChangeSearch}
+                        allowClear
+                        prefix={isShowNavBarRedesign ? <MagnifyingGlass size={20} /> : <SearchOutlinedStyle />}
+                        data-testid="search-overlay-input"
+                        $isShowNavBarRedesign={isShowNavBarRedesign}
+                    />
+                </div>
+                <div className="manage" onClick={() => onClickManageViews()} role="none">
+                    Manage all
+                </div>
+            </div>
+        </ViewHeader>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/select/ViewSelectPopoverContent.tsx b/datahub-web-react/src/app/entityV2/view/select/ViewSelectPopoverContent.tsx
new file mode 100644
index 00000000000000..d44c451ea6d498
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/select/ViewSelectPopoverContent.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import { ViewSelectDropdown } from './ViewSelectDropdown';
+
+interface Props {
+    children: React.ReactNode;
+    privateView: boolean;
+    publicView: boolean;
+    onClickCreateView: () => void;
+    onClickManageViews: () => void;
+    onClickViewTypeFilter: (type: string) => void;
+    onChangeSearch: (text: any) => void;
+}
+
+export const ViewSelectPopoverContent = ({
+    privateView,
+    publicView,
+    onClickCreateView,
+    onClickManageViews,
+    onClickViewTypeFilter,
+    onChangeSearch,
+    children,
+}: Props) => {
+    return (
+        <ViewSelectDropdown
+            privateView={privateView}
+            publicView={publicView}
+            onClickCreateView={onClickCreateView}
+            onClickManageViews={onClickManageViews}
+            onClickViewTypeFilter={onClickViewTypeFilter}
+            onChangeSearch={onChangeSearch}
+        >
+            {children}
+        </ViewSelectDropdown>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/select/ViewsTableColumns.tsx b/datahub-web-react/src/app/entityV2/view/select/ViewsTableColumns.tsx
new file mode 100644
index 00000000000000..48eb3b9add87fb
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/select/ViewsTableColumns.tsx
@@ -0,0 +1,92 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Button, Typography } from 'antd';
+import { DataHubViewType } from '../../../../types.generated';
+import { ANTD_GRAY } from '../../shared/constants';
+import { ViewTypeLabel } from '../ViewTypeLabel';
+import { ViewDropdownMenu } from '../menu/ViewDropdownMenu';
+import { UserDefaultViewIcon } from '../shared/UserDefaultViewIcon';
+import { GlobalDefaultViewIcon } from '../shared/GlobalDefaultViewIcon';
+import { useUserContext } from '../../../context/useUserContext';
+
+const StyledDescription = styled.div`
+    max-width: 300px;
+`;
+
+const ActionButtonsContainer = styled.div`
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding-right: 8px;
+`;
+
+const NameContainer = styled.span`
+    display: flex;
+    align-items: center;
+    justify-content: left;
+`;
+
+const IconPlaceholder = styled.span`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+`;
+
+type NameColumnProps = {
+    name: string;
+    record: any;
+    onEditView: (urn) => void;
+};
+
+export function NameColumn({ name, record, onEditView }: NameColumnProps) {
+    const userContext = useUserContext();
+    const maybePersonalDefaultViewUrn = userContext.state?.views?.personalDefaultViewUrn;
+    const maybeGlobalDefaultViewUrn = userContext.state?.views?.globalDefaultViewUrn;
+
+    const isUserDefault = record.urn === maybePersonalDefaultViewUrn;
+    const isGlobalDefault = record.urn === maybeGlobalDefaultViewUrn;
+
+    return (
+        <NameContainer>
+            <IconPlaceholder>
+                {isUserDefault && <UserDefaultViewIcon title="Your default View." />}
+                {isGlobalDefault && <GlobalDefaultViewIcon title="Your organization's default View." />}
+            </IconPlaceholder>
+            <Button type="text" onClick={() => onEditView(record.urn)}>
+                <Typography.Text strong>{name}</Typography.Text>
+            </Button>
+        </NameContainer>
+    );
+}
+
+type DescriptionColumnProps = {
+    description: string;
+};
+
+export function DescriptionColumn({ description }: DescriptionColumnProps) {
+    return (
+        <StyledDescription>
+            {description || <Typography.Text type="secondary">No description</Typography.Text>}
+        </StyledDescription>
+    );
+}
+
+type ViewTypeColumnProps = {
+    viewType: DataHubViewType;
+};
+
+export function ViewTypeColumn({ viewType }: ViewTypeColumnProps) {
+    return <ViewTypeLabel color={ANTD_GRAY[8]} type={viewType} />;
+}
+
+type ActionColumnProps = {
+    record: any;
+};
+
+export function ActionsColumn({ record }: ActionColumnProps) {
+    return (
+        <ActionButtonsContainer>
+            <ViewDropdownMenu view={record} visible />
+        </ActionButtonsContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/view/select/renderSelectedView.tsx b/datahub-web-react/src/app/entityV2/view/select/renderSelectedView.tsx
new file mode 100644
index 00000000000000..97cd77d19a38a1
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/select/renderSelectedView.tsx
@@ -0,0 +1,139 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Button } from 'antd';
+import { Tooltip } from '@components';
+import { colors } from '@src/alchemy-components';
+import { FadersHorizontal } from '@phosphor-icons/react';
+import CloseIcon from '@mui/icons-material/Close';
+import { ANTD_GRAY, REDESIGN_COLORS, SEARCH_COLORS } from '../../shared/constants';
+import { ViewLabel } from './styledComponents';
+
+const SelectButton = styled(Button)<{ $selectedViewName: string; $isShowNavBarRedesign?: boolean }>`
+    background-color: ${(props) => {
+        if (props.$isShowNavBarRedesign) {
+            return props.$selectedViewName ? colors.gray[1000] : 'transparent';
+        }
+        return props.$selectedViewName ? SEARCH_COLORS.TITLE_PURPLE : 'transparent';
+    }};
+    border-color: ${(props) => {
+        if (props.$isShowNavBarRedesign) {
+            return props.$selectedViewName ? 'transparent' : colors.gray[100];
+        }
+        return props.$selectedViewName ? SEARCH_COLORS.TITLE_PURPLE : 'transparent';
+    }};
+    color: ${(props) => (props.$isShowNavBarRedesign ? colors.violet[500] : ANTD_GRAY[1])};
+    max-width: ${(props) => (props.$isShowNavBarRedesign ? '120px' : '150px')};
+
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        height: 28px;
+        padding: 3px 8px;
+        display: flex;
+        box-shadow: none;
+        line-height: 20px;
+
+        & svg {
+            color: ${REDESIGN_COLORS.GREY_300};
+            transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+        }
+    `}
+
+    &: hover {
+        background: ${(props) => {
+            if (props.$isShowNavBarRedesign) {
+                return props.$selectedViewName ? colors.gray[1000] : 'transparent';
+            }
+            return SEARCH_COLORS.TITLE_PURPLE;
+        }};
+        color: ${(props) => (props.$isShowNavBarRedesign ? colors.violet[500] : ANTD_GRAY[1])};
+
+        border-color: ${(props) => {
+            if (props.$isShowNavBarRedesign) return colors.violet[500];
+            return props.$selectedViewName ? SEARCH_COLORS.TITLE_PURPLE : 'transparent';
+        }};
+    }
+
+    &: focus {
+        background-color: ${(props) => (props.$selectedViewName ? SEARCH_COLORS.TITLE_PURPLE : 'transparent')};
+        color: ${(props) => (props.$isShowNavBarRedesign ? colors.violet[500] : ANTD_GRAY[1])};
+        border-color: ${(props) => (props.$selectedViewName ? SEARCH_COLORS.TITLE_PURPLE : 'transparent')};
+
+        ${(props) =>
+            props.$isShowNavBarRedesign &&
+            `
+            background-color: ${colors.gray[1000]};
+
+            & svg {
+                color: ${REDESIGN_COLORS.GREY_300};
+            }
+        `}
+    }
+`;
+
+const SelectButtonContainer = styled.div`
+    position: relative;
+
+    &&&& .close-container {
+        display: none;
+    }
+
+    &:hover,
+    &:focus {
+        &&&& .close-container {
+            display: flex;
+        }
+    }
+`;
+
+const CloseButtonContainer = styled.div`
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    background-color: ${ANTD_GRAY[1]};
+    align-items: center;
+    border-radius: 100%;
+    padding: 5px;
+    cursor: pointer;
+`;
+
+const CloseIconStyle = styled(CloseIcon)`
+    font-size: 10px !important;
+    color: ${SEARCH_COLORS.TITLE_PURPLE};
+`;
+
+const StyledViewIcon = styled(FadersHorizontal)<{ $isShowNavBarRedesign?: boolean }>`
+    font-size: ${(props) => (props.$isShowNavBarRedesign ? '20px' : '18px')} !important;
+    color: ${ANTD_GRAY[1]};
+`;
+
+type Props = {
+    selectedViewName: string;
+    isShowNavBarRedesign?: boolean;
+    onClear: () => void;
+};
+
+export const renderSelectedView = ({ selectedViewName, isShowNavBarRedesign, onClear }: Props) => {
+    return (
+        <SelectButtonContainer>
+            <SelectButton $selectedViewName={selectedViewName} $isShowNavBarRedesign={isShowNavBarRedesign}>
+                <Tooltip showArrow={false} title={selectedViewName} placement="bottom">
+                    <ViewLabel data-testid="views-icon">
+                        {selectedViewName || <StyledViewIcon $isShowNavBarRedesign={isShowNavBarRedesign} />}
+                    </ViewLabel>
+                </Tooltip>
+            </SelectButton>
+            {selectedViewName && (
+                <CloseButtonContainer
+                    className="close-container"
+                    onClick={(e) => {
+                        e.stopPropagation();
+                        onClear();
+                    }}
+                >
+                    <CloseIconStyle />
+                </CloseButtonContainer>
+            )}
+        </SelectButtonContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/select/renderViewOptionGroup.tsx b/datahub-web-react/src/app/entityV2/view/select/renderViewOptionGroup.tsx
new file mode 100644
index 00000000000000..8b35474d1b8708
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/select/renderViewOptionGroup.tsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import { DataHubView } from '../../../../types.generated';
+import { ViewOption } from './ViewOption';
+import { UserContextType } from '../../../context/userContext';
+
+const selectOptionStyle = { paddingLeft: 0 };
+
+type Args = {
+    selectedUrn: string | undefined;
+    views: Array<DataHubView>;
+    userContext: UserContextType;
+    hoverViewUrn?: string;
+    isOwnedByUser?: boolean;
+    scrollToRef?: any;
+    setHoverViewUrn: (viewUrn: string) => void;
+    onClickEditView: (view: DataHubView) => void;
+    onClickPreviewView: (view: DataHubView) => void;
+    onClickClear: () => void;
+    onSelectView: (newURn: string) => void;
+};
+
+export const renderViewOptionGroup = ({
+    selectedUrn,
+    views,
+    userContext,
+    hoverViewUrn,
+    isOwnedByUser,
+    scrollToRef,
+    setHoverViewUrn,
+    onClickEditView,
+    onClickPreviewView,
+    onClickClear,
+    onSelectView,
+}: Args) => {
+    const maybePersonalDefaultViewUrn = userContext.state?.views?.personalDefaultViewUrn;
+    const maybeGlobalDefaultViewUrn = userContext.state?.views?.globalDefaultViewUrn;
+
+    return views.map((view) => (
+        <div
+            onMouseEnter={() => setHoverViewUrn(view.urn)}
+            key={view.urn}
+            style={selectOptionStyle}
+            data-testid="view-select-item"
+            onClick={() => onSelectView(view.urn)}
+            role="none"
+        >
+            <ViewOption
+                selectedUrn={selectedUrn === view.urn}
+                scrollToRef={scrollToRef}
+                view={view}
+                showOptions={view.urn === hoverViewUrn}
+                isOwnedByUser={isOwnedByUser}
+                isUserDefault={view.urn === maybePersonalDefaultViewUrn}
+                isGlobalDefault={view.urn === maybeGlobalDefaultViewUrn}
+                onClickEdit={() => onClickEditView(view)}
+                onClickPreview={() => onClickPreviewView(view)}
+                onClickClear={onClickClear}
+                selectView={() => onSelectView(view.urn)}
+            />
+        </div>
+    ));
+};
diff --git a/datahub-web-react/src/app/entityV2/view/select/style.css b/datahub-web-react/src/app/entityV2/view/select/style.css
new file mode 100644
index 00000000000000..74a0744794c4bb
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/select/style.css
@@ -0,0 +1,10 @@
+.view-select-popover.ant-popover.ant-popover-placement-bottom,
+.view-select-popover .ant-popover-content,
+.view-select-popover .ant-popover-inner-content {
+    width: 100%;
+}
+
+.view-select-popover .ant-popover.ant-popover-placement-bottom {
+    left: 0px !important; /* dynamically changing so added important */
+    transform-origin: 0% !important; /* dynamically changing so added important */
+}
diff --git a/datahub-web-react/src/app/entityV2/view/select/styledComponents.tsx b/datahub-web-react/src/app/entityV2/view/select/styledComponents.tsx
new file mode 100644
index 00000000000000..7dbff2d78a7f4a
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/select/styledComponents.tsx
@@ -0,0 +1,107 @@
+import { RightOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+import styled from 'styled-components';
+import { colors } from '@src/alchemy-components';
+import { ANTD_GRAY, REDESIGN_COLORS, SEARCH_COLORS } from '../../shared/constants';
+
+export const NoMarginButton = styled(Button)`
+    && {
+        margin: 0px;
+    }
+`;
+
+export const StyledRightOutlined = styled(RightOutlined)`
+    && {
+        font-size: 8px;
+        color: ${ANTD_GRAY[7]};
+    }
+`;
+
+export const ViewContainer = styled.div<{ $selected?: boolean; $isShowNavBarRedesign?: boolean }>`
+    ${(props) =>
+        !props.$isShowNavBarRedesign &&
+        `
+        display: grid;
+        grid-template-columns: 0.5fr 90px 20px;
+        gap: 10px;
+    `}
+    cursor: pointer;
+    align-items: center;
+
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        padding: 8px;
+        border-radius: 8px;
+        display: flex;
+        background-color: white;
+        gap: 8px;
+        width: 100%;
+        width: 260px;
+        height: 64px;
+        border: 1px solid ${props.$selected ? colors.violet[500] : colors.gray[100]};
+
+        :hover {
+            border: 1px solid ${colors.violet[500]};
+            box-shadow: 0px 1px 2px 0px rgba(33, 23, 95, 0.07);
+        }
+    `}
+`;
+
+export const ViewIcon = styled.div<{ $selected?: boolean }>`
+    border: 1px solid ${REDESIGN_COLORS.BORDER_1};
+    display: flex;
+    align-items: center;
+    border-radius: 10px;
+    padding: 20px;
+    position: relative;
+    border: ${(props) => (props.$selected ? `1px solid ${ANTD_GRAY[1]} !important` : '')};
+    background: ${(props) => (props.$selected ? SEARCH_COLORS.TITLE_PURPLE : REDESIGN_COLORS.BORDER_1)};
+    &.static {
+        border: 1px solid ${ANTD_GRAY[1]};
+    }
+`;
+
+export const ViewIconNavBarRedesign = styled.div<{ $selected?: boolean }>`
+    background-color: ${(props) => (props.$selected ? colors.gray[1000] : colors.gray[1500])};
+    border-radius: 200px;
+    height: 32px;
+    width: 32px;
+    padding: 0 6px 0 4px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    svg {
+        color: ${(props) => (props.$selected ? '#705EE4' : colors.gray[1800])};
+    }
+`;
+
+export const ViewContent = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    ${(props) => !props.$isShowNavBarRedesign && 'min-width: 100px;'}
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        color: black;
+        min-width: 160px;
+    `}
+`;
+
+export const ViewLabel = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    ${(props) => props.$isShowNavBarRedesign && `color: ${colors.gray[600]};`}
+    font-size: 14px;
+    font-weight: 400;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    line-height: 18px;
+`;
+
+export const ViewDescription = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    font-weight: 400;
+    ${(props) => !props.$isShowNavBarRedesign && 'opacity: 0.5;'}
+    ${(props) => props.$isShowNavBarRedesign && `color: ${colors.gray[1700]};`}
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+`;
diff --git a/datahub-web-react/src/app/entityV2/view/select/utils.ts b/datahub-web-react/src/app/entityV2/view/select/utils.ts
new file mode 100644
index 00000000000000..e734ac1062d628
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/select/utils.ts
@@ -0,0 +1,14 @@
+import { DataHubView } from '@types';
+
+/**
+ * Filter views by a search string. Compares name.
+ *
+ * @param filterText the search text
+ * @param views the views to filter
+ */
+export const filterViews = (filterText, views: DataHubView[]) => {
+    const lowerFilterText = filterText.toLowerCase();
+    return views.filter((view) => {
+        return view.name?.toLowerCase()?.includes(lowerFilterText);
+    });
+};
diff --git a/datahub-web-react/src/app/entityV2/view/shared/DefaultViewIcon.tsx b/datahub-web-react/src/app/entityV2/view/shared/DefaultViewIcon.tsx
new file mode 100644
index 00000000000000..20751d95541241
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/shared/DefaultViewIcon.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Tooltip } from '@components';
+
+const CircleContainer = styled.span<{ size?: number }>`
+    width: ${(props) => (props.size ? props.size : 10)}px;
+    height: ${(props) => (props.size ? props.size : 10)}px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+`;
+
+const Circle = styled.span<{ color: string; size?: number }>`
+    width: ${(props) => (props.size ? props.size : 6)}px;
+    height: ${(props) => (props.size ? props.size : 6)}px;
+    border-radius: 50%;
+    padding: 0px;
+    margin: 0px;
+    background-color: ${(props) => props.color};
+    opacity: 1;
+`;
+
+type Props = {
+    title?: React.ReactNode;
+    color: string;
+    size?: number;
+};
+
+export const DefaultViewIcon = ({ title, color, size }: Props) => {
+    return (
+        <Tooltip title={title}>
+            <CircleContainer size={size}>
+                <Circle color={color} size={size} />
+            </CircleContainer>
+        </Tooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/view/shared/GlobalDefaultViewIcon.tsx b/datahub-web-react/src/app/entityV2/view/shared/GlobalDefaultViewIcon.tsx
new file mode 100644
index 00000000000000..d5d645cd3a389e
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/shared/GlobalDefaultViewIcon.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { ANTD_GRAY } from '../../shared/constants';
+import { DefaultViewIcon } from './DefaultViewIcon';
+
+type Props = {
+    title?: React.ReactNode;
+    size?: number;
+    color?: string;
+};
+
+export const GlobalDefaultViewIcon = ({ title, color, size }: Props) => {
+    return <DefaultViewIcon title={title} color={color || ANTD_GRAY[6]} size={size} />;
+};
diff --git a/datahub-web-react/src/app/entityV2/view/shared/UserDefaultViewIcon.tsx b/datahub-web-react/src/app/entityV2/view/shared/UserDefaultViewIcon.tsx
new file mode 100644
index 00000000000000..e80f6cf2b53833
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/shared/UserDefaultViewIcon.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { REDESIGN_COLORS } from '../../shared/constants';
+import { DefaultViewIcon } from './DefaultViewIcon';
+
+type Props = {
+    title?: React.ReactNode;
+    size?: number;
+    color?: string;
+};
+
+export const UserDefaultViewIcon = ({ title, color, size }: Props) => {
+    return <DefaultViewIcon title={title} color={color || REDESIGN_COLORS.BLUE} size={size} />;
+};
diff --git a/datahub-web-react/src/app/entityV2/view/types.ts b/datahub-web-react/src/app/entityV2/view/types.ts
new file mode 100644
index 00000000000000..7cb89869d3c0a9
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/types.ts
@@ -0,0 +1,52 @@
+import { DataHubViewFilter, DataHubViewType, EntityType, LogicalOperator } from '../../../types.generated';
+
+/**
+ * Default builder state when creating a new View.
+ */
+export const DEFAULT_BUILDER_STATE = {
+    viewType: DataHubViewType.Personal,
+    name: '',
+    description: null,
+    definition: {
+        entityTypes: [],
+        filter: {
+            operator: LogicalOperator.And,
+            filters: [],
+        },
+    },
+} as ViewBuilderState;
+
+/**
+ * The object represents the state of the Test Builder form.
+ */
+export interface ViewBuilderState {
+    /**
+     * The type of the View
+     */
+    viewType?: DataHubViewType;
+
+    /**
+     * The name of the View.
+     */
+    name?: string;
+
+    /**
+     * An optional description for the View.
+     */
+    description?: string | null;
+
+    /**
+     * The definition of the View
+     */
+    definition?: {
+        /**
+         * The Entity Types in scope for the View.
+         */
+        entityTypes?: EntityType[] | null;
+
+        /**
+         * The Filter for the View.
+         */
+        filter?: DataHubViewFilter;
+    };
+}
diff --git a/datahub-web-react/src/app/entityV2/view/utils.ts b/datahub-web-react/src/app/entityV2/view/utils.ts
new file mode 100644
index 00000000000000..68b64714c7ce99
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/view/utils.ts
@@ -0,0 +1,83 @@
+import { DataHubView, DataHubViewType, EntityType, LogicalOperator } from '../../../types.generated';
+import { ViewBuilderState } from './types';
+
+/**
+ *  The max single-page results in both the View Select and Manage Views list.
+ *
+ *  The explicit assumption is that the number of public + personal views for a user
+ *  will not exceed this number.
+ *
+ *  In the future, we will need to consider pagination, or bumping this
+ *  limit if we find that this maximum is reached.
+ */
+export const DEFAULT_LIST_VIEWS_PAGE_SIZE = 1000;
+
+/**
+ * Converts an instance of the View builder state
+ * into the input required to create or update a View in
+ * GraphQL.
+ *
+ * @param state the builder state
+ */
+export const convertStateToUpdateInput = (state: ViewBuilderState) => {
+    return {
+        viewType: state.viewType,
+        name: state.name as string,
+        description: state.description as string,
+        definition: {
+            entityTypes: state?.definition?.entityTypes,
+            filter: {
+                operator: state?.definition?.filter?.operator,
+                filters: state?.definition?.filter?.filters.map((filter) => ({
+                    field: filter.field,
+                    condition: filter.condition,
+                    values: filter.values,
+                    negated: filter.negated,
+                })),
+            },
+        },
+    };
+};
+
+/**
+ * Convert ViewBuilderState and an URN into a DataHubView object.
+ *
+ * @param urn urn of the View
+ * @param state state of the View
+ */
+export const convertStateToView = (urn: string, state: ViewBuilderState): DataHubView => {
+    return {
+        urn,
+        type: EntityType.DatahubView,
+        viewType: state.viewType as DataHubViewType,
+        name: state.name as string,
+        description: state.description,
+        definition: {
+            entityTypes: state.definition?.entityTypes || [],
+            filter: {
+                operator: state?.definition?.filter?.operator as LogicalOperator,
+                filters: state?.definition?.filter?.filters?.map((filter) => ({
+                    field: filter.field,
+                    condition: filter.condition,
+                    values: filter.values,
+                    negated: filter.negated || false,
+                })) as any,
+            },
+        },
+    };
+};
+
+/**
+ * Search through a list of Views by a text string by comparing
+ * against View name and descriptions.
+ *
+ * @param views: A list of DataHub View objects.
+ * @param q: An optional search query.
+ */
+export const searchViews = (views: Array<DataHubView>, q?: string) => {
+    if (q && q.length > 0) {
+        const qLower = q.toLowerCase();
+        return views.filter((view) => view.name.toLowerCase().includes(qLower) || view.description?.includes(qLower));
+    }
+    return views;
+};
diff --git a/datahub-web-react/src/app/glossary/GlossaryBrowser/GlossaryBrowser.tsx b/datahub-web-react/src/app/glossary/GlossaryBrowser/GlossaryBrowser.tsx
index 38e68ff08976d3..53390d359f0ed1 100644
--- a/datahub-web-react/src/app/glossary/GlossaryBrowser/GlossaryBrowser.tsx
+++ b/datahub-web-react/src/app/glossary/GlossaryBrowser/GlossaryBrowser.tsx
@@ -1,5 +1,7 @@
 import React, { useEffect } from 'react';
 import styled from 'styled-components/macro';
+import { LoadingOutlined } from '@ant-design/icons';
+import { ANTD_GRAY } from '@src/app/entity/shared/constants';
 import { useGetRootGlossaryNodesQuery, useGetRootGlossaryTermsQuery } from '../../../graphql/glossary.generated';
 import { ChildGlossaryTermFragment } from '../../../graphql/glossaryNode.generated';
 import { GlossaryNode } from '../../../types.generated';
@@ -19,6 +21,18 @@ const BrowserWrapper = styled.div`
     overflow: auto;
 `;
 
+const LoadingWrapper = styled.div`
+    padding: 8px;
+    display: flex;
+    justify-content: center;
+
+    svg {
+        height: 15px;
+        width: 15px;
+        color: ${ANTD_GRAY[8]};
+    }
+`;
+
 interface Props {
     rootNodes?: GlossaryNode[];
     rootTerms?: ChildGlossaryTermFragment[];
@@ -27,6 +41,7 @@ interface Props {
     openToEntity?: boolean;
     refreshBrowser?: boolean;
     nodeUrnToHide?: string;
+    termUrnToHide?: string;
     selectTerm?: (urn: string, displayName: string) => void;
     selectNode?: (urn: string, displayName: string) => void;
 }
@@ -40,14 +55,24 @@ function GlossaryBrowser(props: Props) {
         refreshBrowser,
         openToEntity,
         nodeUrnToHide,
+        termUrnToHide,
         selectTerm,
         selectNode,
     } = props;
 
     const { urnsToUpdate, setUrnsToUpdate } = useGlossaryEntityData();
 
-    const { data: nodesData, refetch: refetchNodes } = useGetRootGlossaryNodesQuery({ skip: !!rootNodes });
-    const { data: termsData, refetch: refetchTerms } = useGetRootGlossaryTermsQuery({ skip: !!rootTerms });
+    const {
+        data: nodesData,
+        refetch: refetchNodes,
+        loading: nodesLoading,
+    } = useGetRootGlossaryNodesQuery({ skip: !!rootNodes });
+    const {
+        data: termsData,
+        refetch: refetchTerms,
+        loading: termsLoading,
+    } = useGetRootGlossaryTermsQuery({ skip: !!rootTerms });
+    const loading = nodesLoading || termsLoading;
 
     const displayedNodes = rootNodes || nodesData?.getRootGlossaryNodes?.nodes || [];
     const displayedTerms = rootTerms || termsData?.getRootGlossaryTerms?.terms || [];
@@ -77,6 +102,11 @@ function GlossaryBrowser(props: Props) {
 
     return (
         <BrowserWrapper>
+            {loading && (
+                <LoadingWrapper>
+                    <LoadingOutlined />
+                </LoadingWrapper>
+            )}
             {sortedNodes.map((node) => (
                 <NodeItem
                     key={node.urn}
@@ -88,6 +118,7 @@ function GlossaryBrowser(props: Props) {
                     nodeUrnToHide={nodeUrnToHide}
                     selectTerm={selectTerm}
                     selectNode={selectNode}
+                    termUrnToHide={termUrnToHide}
                 />
             ))}
             {!hideTerms &&
diff --git a/datahub-web-react/src/app/glossary/GlossaryBrowser/NodeItem.tsx b/datahub-web-react/src/app/glossary/GlossaryBrowser/NodeItem.tsx
index a01c6712cc71f7..643d478f1ee69e 100644
--- a/datahub-web-react/src/app/glossary/GlossaryBrowser/NodeItem.tsx
+++ b/datahub-web-react/src/app/glossary/GlossaryBrowser/NodeItem.tsx
@@ -1,6 +1,7 @@
-import { FolderOutlined, RightOutlined, DownOutlined, LoadingOutlined } from '@ant-design/icons';
+import { RightOutlined, DownOutlined, LoadingOutlined } from '@ant-design/icons';
 import styled from 'styled-components/macro';
 import React, { useState, useEffect } from 'react';
+import { BookmarksSimple } from '@phosphor-icons/react';
 import { ANTD_GRAY } from '../../entity/shared/constants';
 import { EntityType, GlossaryNode, GlossaryTerm } from '../../../types.generated';
 import { useEntityRegistry } from '../../useEntityRegistry';
@@ -35,7 +36,7 @@ const StyledDownOutlined = styled(DownOutlined)`
     font-size: 10px;
 `;
 
-const StyledFolderOutlined = styled(FolderOutlined)`
+const StyledGlossaryNodeIcon = styled(BookmarksSimple)`
     margin-right: 6px;
 `;
 
@@ -63,12 +64,23 @@ interface Props {
     openToEntity?: boolean;
     refreshBrowser?: boolean;
     nodeUrnToHide?: string;
+    termUrnToHide?: string;
     selectTerm?: (urn: string, displayName: string) => void;
     selectNode?: (urn: string, displayName: string) => void;
 }
 
 function NodeItem(props: Props) {
-    const { node, isSelecting, hideTerms, openToEntity, refreshBrowser, nodeUrnToHide, selectTerm, selectNode } = props;
+    const {
+        node,
+        isSelecting,
+        hideTerms,
+        openToEntity,
+        refreshBrowser,
+        nodeUrnToHide,
+        termUrnToHide,
+        selectTerm,
+        selectNode,
+    } = props;
     const shouldHideNode = nodeUrnToHide === node.urn;
 
     const [areChildrenVisible, setAreChildrenVisible] = useState(false);
@@ -131,15 +143,15 @@ function NodeItem(props: Props) {
                 {!isSelecting && (
                     <NodeLink
                         to={`${entityRegistry.getEntityUrl(node.type, node.urn)}`}
-                        isSelected={entityData?.urn === node.urn}
+                        $isSelected={entityData?.urn === node.urn}
                     >
-                        <StyledFolderOutlined />
+                        <StyledGlossaryNodeIcon />
                         {entityRegistry.getDisplayName(node.type, isOnEntityPage ? entityData : node)}
                     </NodeLink>
                 )}
                 {isSelecting && (
                     <NameWrapper showSelectStyles={!!selectNode} onClick={handleSelectNode}>
-                        <StyledFolderOutlined />
+                        <StyledGlossaryNodeIcon />
                         {entityRegistry.getDisplayName(node.type, isOnEntityPage ? entityData : node)}
                     </NameWrapper>
                 )}
@@ -171,6 +183,7 @@ function NodeItem(props: Props) {
                                         isSelecting={isSelecting}
                                         selectTerm={selectTerm}
                                         includeActiveTabPath
+                                        termUrnToHide={termUrnToHide}
                                     />
                                 ))}
                         </ChildrenWrapper>
diff --git a/datahub-web-react/src/app/glossary/GlossaryBrowser/TermItem.tsx b/datahub-web-react/src/app/glossary/GlossaryBrowser/TermItem.tsx
index 56495b53eded35..381d8a3980a5cd 100644
--- a/datahub-web-react/src/app/glossary/GlossaryBrowser/TermItem.tsx
+++ b/datahub-web-react/src/app/glossary/GlossaryBrowser/TermItem.tsx
@@ -14,19 +14,20 @@ const TermWrapper = styled.div`
 
 const nameStyles = `
     color: #262626;
-    display: inline-block;
+    display: inline-flex;
     height: 100%;
     padding: 3px 4px;
     width: 100%;
+    align-items: center;
 `;
 
-export const TermLink = styled(Link)<{ isSelected }>`
+export const TermLink = styled(Link)<{ $isSelected }>`
     ${nameStyles}
 
-    ${(props) => props.isSelected && `background-color: #F0FFFB;`}
+    ${(props) => props.$isSelected && `background-color: #F0FFFB;`}
 
     &:hover {
-        ${(props) => !props.isSelected && `background-color: ${ANTD_GRAY[3]};`}
+        ${(props) => !props.$isSelected && `background-color: ${ANTD_GRAY[3]};`}
         color: #262626;
     }
 `;
@@ -49,10 +50,12 @@ interface Props {
     isSelecting?: boolean;
     selectTerm?: (urn: string, displayName: string) => void;
     includeActiveTabPath?: boolean;
+    termUrnToHide?: string;
 }
 
 function TermItem(props: Props) {
-    const { term, isSelecting, selectTerm, includeActiveTabPath } = props;
+    const { term, isSelecting, selectTerm, includeActiveTabPath, termUrnToHide } = props;
+    const shouldHideTerm = termUrnToHide === term.urn;
 
     const { entityData } = useGlossaryEntityData();
     const entityRegistry = useEntityRegistry();
@@ -67,6 +70,7 @@ function TermItem(props: Props) {
 
     const isOnEntityPage = entityData && entityData.urn === term.urn;
 
+    if (shouldHideTerm) return null;
     return (
         <TermWrapper>
             {!isSelecting && (
@@ -74,7 +78,7 @@ function TermItem(props: Props) {
                     to={`${entityRegistry.getEntityUrl(term.type, term.urn)}${
                         includeActiveTabPath ? `/${activeTabPath}` : ''
                     }`}
-                    isSelected={entityData?.urn === term.urn}
+                    $isSelected={entityData?.urn === term.urn}
                 >
                     {entityRegistry.getDisplayName(term.type, isOnEntityPage ? entityData : term)}
                 </TermLink>
diff --git a/datahub-web-react/src/app/glossary/GlossaryRoutes.tsx b/datahub-web-react/src/app/glossary/GlossaryRoutes.tsx
index 0062cefee067f5..ad6a1d75d4443e 100644
--- a/datahub-web-react/src/app/glossary/GlossaryRoutes.tsx
+++ b/datahub-web-react/src/app/glossary/GlossaryRoutes.tsx
@@ -1,14 +1,18 @@
 import React, { useState } from 'react';
 import styled from 'styled-components/macro';
-import { Switch, Route } from 'react-router-dom';
+import { Switch, Route, Redirect } from 'react-router-dom';
 import { PageRoutes } from '../../conf/Global';
 import { GlossaryEntityContext } from '../entity/shared/GlossaryEntityContext';
 import { GenericEntityProperties } from '../entity/shared/types';
 import BusinessGlossaryPage from './BusinessGlossaryPage';
-import GlossaryEntitiesPath from './GlossaryEntitiesPath';
+import BusinessGlossaryPageV2 from '../glossaryV2/BusinessGlossaryPage';
 import { EntityPage } from '../entity/EntityPage';
 import GlossarySidebar from './GlossarySidebar';
 import { useEntityRegistry } from '../useEntityRegistry';
+import { useAppConfig } from '../useAppConfig';
+import { useGetAuthenticatedUser } from '../useGetAuthenticatedUser';
+import { shouldShowGlossary } from '../identity/user/UserUtils';
+import { useIsThemeV2 } from '../useIsThemeV2';
 
 const ContentWrapper = styled.div`
     display: flex;
@@ -22,7 +26,25 @@ export default function GlossaryRoutes() {
     const [urnsToUpdate, setUrnsToUpdate] = useState<string[]>([]);
     const [isSidebarOpen, setIsSidebarOpen] = useState<boolean>(true);
 
-    const isAtRootGlossary = window.location.pathname === PageRoutes.GLOSSARY;
+    const appConfig = useAppConfig();
+    const authenticatedUser = useGetAuthenticatedUser();
+    const isThemeV2 = useIsThemeV2();
+    const canManageGlossary = authenticatedUser?.platformPrivileges.manageGlossaries || false;
+    const hideGlossary = !!appConfig?.config?.visualConfig?.hideGlossary;
+    const showGlossary = shouldShowGlossary(canManageGlossary, hideGlossary);
+
+    const renderPage = (type1: boolean, type2: boolean) => {
+        if (type1) {
+            if (type2) {
+                return <BusinessGlossaryPageV2 />;
+            }
+            return <Redirect to="/" />;
+        }
+        if (type2) {
+            return <BusinessGlossaryPage />;
+        }
+        return <Redirect to="/" />;
+    };
 
     return (
         <GlossaryEntityContext.Provider
@@ -36,7 +58,6 @@ export default function GlossaryRoutes() {
                 setIsSidebarOpen,
             }}
         >
-            {!isAtRootGlossary && <GlossaryEntitiesPath />}
             <ContentWrapper>
                 <GlossarySidebar />
                 <Switch>
@@ -47,7 +68,7 @@ export default function GlossaryRoutes() {
                             render={() => <EntityPage entityType={entity.type} />}
                         />
                     ))}
-                    <Route path={PageRoutes.GLOSSARY} render={() => <BusinessGlossaryPage />} />
+                    <Route path={PageRoutes.GLOSSARY} render={() => renderPage(isThemeV2, showGlossary)} />
                 </Switch>
             </ContentWrapper>
         </GlossaryEntityContext.Provider>
diff --git a/datahub-web-react/src/app/glossaryV2/BusinessGlossaryPage.tsx b/datahub-web-react/src/app/glossaryV2/BusinessGlossaryPage.tsx
new file mode 100644
index 00000000000000..994479ddfcfbe7
--- /dev/null
+++ b/datahub-web-react/src/app/glossaryV2/BusinessGlossaryPage.tsx
@@ -0,0 +1,131 @@
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components/macro';
+import { useGetRootGlossaryNodesQuery, useGetRootGlossaryTermsQuery } from '../../graphql/glossary.generated';
+import CreateGlossaryEntityModal from '../entityV2/shared/EntityDropdown/CreateGlossaryEntityModal';
+import { EntityType } from '../../types.generated';
+import { Message } from '../shared/Message';
+import { sortGlossaryTerms } from '../entityV2/glossaryTerm/utils';
+import { useEntityRegistry } from '../useEntityRegistry';
+import { sortGlossaryNodes } from '../entityV2/glossaryNode/utils';
+import {
+    BUSINESS_GLOSSARY_INTRO_ID,
+    BUSINESS_GLOSSARY_CREATE_TERM_ID,
+    BUSINESS_GLOSSARY_CREATE_TERM_GROUP_ID,
+} from '../onboarding/config/BusinessGlossaryOnboardingConfig';
+import { OnboardingTour } from '../onboarding/OnboardingTour';
+import { useGlossaryEntityData } from '../entityV2/shared/GlossaryEntityContext';
+import { useUserContext } from '../context/useUserContext';
+import GlossaryContentProvider from './GlossaryContentProvider';
+import { useShowNavBarRedesign } from '../useShowNavBarRedesign';
+
+const GlossaryWrapper = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    display: flex;
+    flex: 1;
+    height: 100%;
+    background-color: white;
+    border-radius: ${(props) =>
+        props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '8px'};
+    ${(props) => props.$isShowNavBarRedesign && `box-shadow: ${props.theme.styles['box-shadow-navbar-redesign']}`}
+`;
+
+const MainWrapper = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    flex: 1;
+    margin: ${(props) => (props.$isShowNavBarRedesign ? '0' : '0 16px 12px 12px')};
+`;
+
+const BusinessGlossaryPage = () => {
+    const {
+        data: termsData,
+        refetch: refetchForTerms,
+        loading: termsLoading,
+        error: termsError,
+    } = useGetRootGlossaryTermsQuery();
+    const {
+        data: nodesData,
+        refetch: refetchForNodes,
+        loading: nodesLoading,
+        error: nodesError,
+    } = useGetRootGlossaryNodesQuery();
+    const entityRegistry = useEntityRegistry();
+    const { setEntityData } = useGlossaryEntityData();
+
+    useEffect(() => {
+        setEntityData(null);
+    }, [setEntityData]);
+
+    const terms = termsData?.getRootGlossaryTerms?.terms.sort((termA, termB) =>
+        sortGlossaryTerms(entityRegistry, termA, termB),
+    );
+    const nodes = nodesData?.getRootGlossaryNodes?.nodes.sort((nodeA, nodeB) =>
+        sortGlossaryNodes(entityRegistry, nodeA, nodeB),
+    );
+
+    const hasTermsOrNodes = !!nodes?.length || !!terms?.length;
+
+    const [isCreateTermModalVisible, setIsCreateTermModalVisible] = useState(false);
+    const [isCreateNodeModalVisible, setIsCreateNodeModalVisible] = useState(false);
+
+    const user = useUserContext();
+    const canManageGlossaries = user?.platformPrivileges?.manageGlossaries;
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+
+    return (
+        <>
+            <OnboardingTour
+                stepIds={[
+                    BUSINESS_GLOSSARY_INTRO_ID,
+                    BUSINESS_GLOSSARY_CREATE_TERM_ID,
+                    BUSINESS_GLOSSARY_CREATE_TERM_GROUP_ID,
+                ]}
+            />
+            <MainWrapper $isShowNavBarRedesign={isShowNavBarRedesign}>
+                {/* TODO: Once the api for getting the stats data is available, we need to change this condition accordingly */}
+                {/* {termsData?.getRootGlossaryTerms?.total !== 0 && (
+                    <GlossaryStatsProvider
+                        totalGlossaryTerms={200}
+                        activeGlossaryTerms={90}
+                        owners={10}
+                        approvedGlossaryTerms={2}
+                    />
+                )} */}
+                <GlossaryWrapper $isShowNavBarRedesign={isShowNavBarRedesign}>
+                    {(termsLoading || nodesLoading) && (
+                        <Message type="loading" content="Loading Glossary..." style={{ marginTop: '10%' }} />
+                    )}
+                    {(termsError || nodesError) && (
+                        <Message type="error" content="Failed to load glossary! An unexpected error occurred." />
+                    )}
+                    <GlossaryContentProvider
+                        setIsCreateNodeModalVisible={setIsCreateNodeModalVisible}
+                        hasTermsOrNodes={hasTermsOrNodes}
+                        nodes={nodes || []}
+                        terms={terms || []}
+                        termsLoading={termsLoading}
+                        nodesLoading={nodesLoading}
+                        refetchForNodes={refetchForNodes}
+                        refetchForTerms={refetchForTerms}
+                    />
+                </GlossaryWrapper>
+            </MainWrapper>
+            {isCreateTermModalVisible && (
+                <CreateGlossaryEntityModal
+                    entityType={EntityType.GlossaryTerm}
+                    canCreateGlossaryEntity={!!canManageGlossaries}
+                    onClose={() => setIsCreateTermModalVisible(false)}
+                    refetchData={refetchForTerms}
+                />
+            )}
+            {isCreateNodeModalVisible && (
+                <CreateGlossaryEntityModal
+                    entityType={EntityType.GlossaryNode}
+                    canCreateGlossaryEntity={!!canManageGlossaries}
+                    onClose={() => setIsCreateNodeModalVisible(false)}
+                    refetchData={refetchForNodes}
+                    canSelectParentUrn={false}
+                />
+            )}
+        </>
+    );
+};
+
+export default BusinessGlossaryPage;
diff --git a/datahub-web-react/src/app/glossaryV2/EmptyGlossarySection.tsx b/datahub-web-react/src/app/glossaryV2/EmptyGlossarySection.tsx
new file mode 100644
index 00000000000000..0a87cfbe9ec3af
--- /dev/null
+++ b/datahub-web-react/src/app/glossaryV2/EmptyGlossarySection.tsx
@@ -0,0 +1,79 @@
+import { PlusOutlined } from '@ant-design/icons';
+import { Button, Empty, Typography } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components/macro';
+import { EntityType } from '../../types.generated';
+import { useEntityData } from '../entity/shared/EntityContext';
+import CreateGlossaryEntityModal from '../entityV2/shared/EntityDropdown/CreateGlossaryEntityModal';
+import { useUserContext } from '../context/useUserContext';
+
+const StyledEmpty = styled(Empty)`
+    padding: 80px 40px;
+    .ant-empty-footer {
+        .ant-btn:not(:last-child) {
+            margin-right: 8px;
+        }
+    }
+`;
+
+const StyledButton = styled(Button)`
+    margin-right: 8px;
+`;
+
+interface Props {
+    title?: string;
+    description?: string;
+    refetchForTerms?: () => void;
+    refetchForNodes?: () => void;
+}
+
+function EmptyGlossarySection(props: Props) {
+    const { title, description, refetchForTerms, refetchForNodes } = props;
+
+    const [isCreateTermModalVisible, setIsCreateTermModalVisible] = useState(false);
+    const [isCreateNodeModalVisible, setIsCreateNodeModalVisible] = useState(false);
+
+    const user = useUserContext();
+    const canManageGlossaries = user?.platformPrivileges?.manageGlossaries;
+    const { entityData } = useEntityData();
+    const canCreateGlossaryEntity = !!entityData?.privileges?.canManageChildren || canManageGlossaries;
+
+    return (
+        <>
+            <StyledEmpty
+                description={
+                    <>
+                        <Typography.Title level={4}>{title}</Typography.Title>
+                        <Typography.Paragraph type="secondary">{description}</Typography.Paragraph>
+                    </>
+                }
+            >
+                {/* not disabled on acryl-main due to ability to propose */}
+                <StyledButton onClick={() => setIsCreateTermModalVisible(true)}>
+                    <PlusOutlined /> Add Term
+                </StyledButton>
+                <StyledButton onClick={() => setIsCreateNodeModalVisible(true)}>
+                    <PlusOutlined /> Add Term Group
+                </StyledButton>
+            </StyledEmpty>
+            {isCreateTermModalVisible && (
+                <CreateGlossaryEntityModal
+                    entityType={EntityType.GlossaryTerm}
+                    canCreateGlossaryEntity={!!canCreateGlossaryEntity}
+                    onClose={() => setIsCreateTermModalVisible(false)}
+                    refetchData={refetchForTerms}
+                />
+            )}
+            {isCreateNodeModalVisible && (
+                <CreateGlossaryEntityModal
+                    entityType={EntityType.GlossaryNode}
+                    canCreateGlossaryEntity={!!canCreateGlossaryEntity}
+                    onClose={() => setIsCreateNodeModalVisible(false)}
+                    refetchData={refetchForNodes}
+                />
+            )}
+        </>
+    );
+}
+
+export default EmptyGlossarySection;
diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/GlossaryBrowser.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/GlossaryBrowser.tsx
new file mode 100644
index 00000000000000..e9e295c93cccd6
--- /dev/null
+++ b/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/GlossaryBrowser.tsx
@@ -0,0 +1,130 @@
+import React, { useEffect } from 'react';
+import styled from 'styled-components/macro';
+import { LoadingOutlined } from '@ant-design/icons';
+import { useGetRootGlossaryNodesQuery, useGetRootGlossaryTermsQuery } from '../../../graphql/glossary.generated';
+import { ChildGlossaryTermFragment } from '../../../graphql/glossaryNode.generated';
+import { GlossaryNodeFragment } from '../../../graphql/fragments.generated';
+import { sortGlossaryNodes } from '../../entityV2/glossaryNode/utils';
+import { sortGlossaryTerms } from '../../entityV2/glossaryTerm/utils';
+import { useGlossaryEntityData } from '../../entityV2/shared/GlossaryEntityContext';
+import { ANTD_GRAY } from '../../entityV2/shared/constants';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { ROOT_NODES, ROOT_TERMS } from '../utils';
+import NodeItem from './NodeItem';
+import TermItem from './TermItem';
+
+const BrowserWrapper = styled.div`
+    color: ${ANTD_GRAY[11]};
+    font-size: 12px;
+    max-height: calc(100% - 104px);
+    padding: 0;
+    overflow: auto;
+`;
+
+const LoadingWrapper = styled.div`
+    padding: 8px;
+    display: flex;
+    justify-content: center;
+
+    svg {
+        height: 15px;
+        width: 15px;
+        color: ${ANTD_GRAY[8]};
+    }
+`;
+
+interface Props {
+    rootNodes?: GlossaryNodeFragment[];
+    rootTerms?: ChildGlossaryTermFragment[];
+    isSelecting?: boolean;
+    hideTerms?: boolean;
+    openToEntity?: boolean;
+    refreshBrowser?: boolean;
+    nodeUrnToHide?: string;
+    selectTerm?: (urn: string, displayName: string) => void;
+    selectNode?: (urn: string, displayName: string) => void;
+}
+
+function GlossaryBrowser(props: Props) {
+    const {
+        rootNodes,
+        rootTerms,
+        isSelecting,
+        hideTerms,
+        refreshBrowser,
+        openToEntity,
+        nodeUrnToHide,
+        selectTerm,
+        selectNode,
+    } = props;
+
+    const { urnsToUpdate, setUrnsToUpdate } = useGlossaryEntityData();
+
+    const {
+        data: nodesData,
+        refetch: refetchNodes,
+        loading: nodesLoading,
+    } = useGetRootGlossaryNodesQuery({ skip: !!rootNodes });
+    const {
+        data: termsData,
+        refetch: refetchTerms,
+        loading: termsLoading,
+    } = useGetRootGlossaryTermsQuery({ skip: !!rootTerms });
+    const loading = nodesLoading || termsLoading;
+
+    const displayedNodes = rootNodes || nodesData?.getRootGlossaryNodes?.nodes || [];
+    const displayedTerms = rootTerms || termsData?.getRootGlossaryTerms?.terms || [];
+
+    const entityRegistry = useEntityRegistry();
+    const sortedNodes = displayedNodes.sort((nodeA, nodeB) => sortGlossaryNodes(entityRegistry, nodeA, nodeB));
+    const sortedTerms = displayedTerms.sort((termA, termB) => sortGlossaryTerms(entityRegistry, termA, termB));
+
+    useEffect(() => {
+        if (refreshBrowser) {
+            refetchNodes();
+            refetchTerms();
+        }
+    }, [refreshBrowser, refetchNodes, refetchTerms]);
+
+    // if node(s) or term(s) need to be refreshed at the root level, check if these special cases are in `urnsToUpdate`
+    useEffect(() => {
+        if (urnsToUpdate.includes(ROOT_NODES)) {
+            refetchNodes();
+            setUrnsToUpdate(urnsToUpdate.filter((urn) => urn !== ROOT_NODES));
+        }
+        if (urnsToUpdate.includes(ROOT_TERMS)) {
+            refetchTerms();
+            setUrnsToUpdate(urnsToUpdate.filter((urn) => urn !== ROOT_TERMS));
+        }
+    });
+
+    return (
+        <BrowserWrapper>
+            {sortedNodes.map((node) => (
+                <NodeItem
+                    key={node.urn}
+                    node={node}
+                    isSelecting={isSelecting}
+                    hideTerms={hideTerms}
+                    openToEntity={openToEntity}
+                    refreshBrowser={refreshBrowser}
+                    nodeUrnToHide={nodeUrnToHide}
+                    selectTerm={selectTerm}
+                    selectNode={selectNode}
+                    depth={0}
+                />
+            ))}
+            {!hideTerms &&
+                sortedTerms.map((term) => (
+                    <TermItem key={term.urn} term={term} isSelecting={isSelecting} selectTerm={selectTerm} depth={0} />
+                ))}
+            {loading && (
+                <LoadingWrapper>
+                    <LoadingOutlined />
+                </LoadingWrapper>
+            )}
+        </BrowserWrapper>
+    );
+}
+
+export default GlossaryBrowser;
diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/NodeItem.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/NodeItem.tsx
new file mode 100644
index 00000000000000..a53ed4506deb9c
--- /dev/null
+++ b/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/NodeItem.tsx
@@ -0,0 +1,270 @@
+import React, { useState, useEffect } from 'react';
+import { LoadingOutlined } from '@ant-design/icons';
+import { KeyboardArrowDownRounded, KeyboardArrowRightRounded } from '@mui/icons-material';
+import styled from 'styled-components/macro';
+import { Entity, EntityType, GlossaryNode, GlossaryTerm } from '../../../types.generated';
+import { GlossaryNodeFragment } from '../../../graphql/fragments.generated';
+import { REDESIGN_COLORS } from '../../entityV2/shared/constants';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { useGetGlossaryNodeQuery } from '../../../graphql/glossaryNode.generated';
+import TermItem, { TermLink as NodeLink, NameWrapper } from './TermItem';
+import { sortGlossaryNodes } from '../../entityV2/glossaryNode/utils';
+import { sortGlossaryTerms } from '../../entityV2/glossaryTerm/utils';
+import { useGlossaryEntityData } from '../../entityV2/shared/GlossaryEntityContext';
+import { generateColorFromPalette } from '../colorUtils';
+
+interface ItemWrapperProps {
+    $isSelected: boolean;
+    $isChildNode?: boolean;
+}
+
+const ItemWrapper = styled.div<ItemWrapperProps>`
+    display: flex;
+    flex-direction: column;
+    font-weight: 700;
+    position: relative;
+    overflow: ${(props) => !props.$isChildNode && 'hidden'};
+`;
+
+const NodeBadge = styled.span<{ color: string }>`
+    position: absolute;
+    height: 9px;
+    width: 50px;
+    background-color: ${({ color }) => color};
+    top: 0;
+    left: -15px;
+    transform: rotate(-45deg);
+    opacity: 1;
+`;
+
+const NodeWrapper = styled.div<{ $isSelected: boolean; $depth: number }>`
+    align-items: center;
+    display: flex;
+    font-size: 16px;
+    padding: 13px 0;
+    background-color: ${(props) => props.$isSelected && REDESIGN_COLORS.HIGHLIGHT_PURPLE};
+    padding-left: calc(${(props) => (props.$depth ? props.$depth * 18 + 12 : 12)}px);
+`;
+
+const StyledRightOutlined = styled(KeyboardArrowRightRounded)<{ isSelected: boolean }>`
+    color: ${(props) =>
+        props.isSelected ? `${REDESIGN_COLORS.TITLE_PURPLE}` : `${REDESIGN_COLORS.SECONDARY_LIGHT_GREY}`};
+    cursor: pointer;
+    margin-right: 6px;
+    line-height: 0;
+    :hover {
+        stroke: ${(props) =>
+            props.isSelected ? `${REDESIGN_COLORS.TITLE_PURPLE}` : `${REDESIGN_COLORS.SECONDARY_LIGHT_GREY}`};
+    }
+`;
+
+const StyledDownOutlined = styled(KeyboardArrowDownRounded)<{ isSelected: boolean }>`
+    color: ${(props) => (props.isSelected ? `${REDESIGN_COLORS.TITLE_PURPLE}` : `${REDESIGN_COLORS.HOVER_PURPLE_2}`)};
+    cursor: pointer;
+    margin-right: 6px;
+    line-height: 0;
+    :hover {
+        stroke: ${(props) =>
+            props.isSelected ? `${REDESIGN_COLORS.TITLE_PURPLE}` : `${REDESIGN_COLORS.HOVER_PURPLE_2}`};
+    }
+`;
+
+const ChildrenWrapper = styled.div``;
+
+const LoadingWrapper = styled.div`
+    padding: 8px;
+    display: flex;
+    justify-content: center;
+
+    svg {
+        height: 15px;
+        width: 15px;
+    }
+`;
+
+const ChildrenCount = styled.div`
+    padding: 1px 8px;
+    display: flex;
+    justify-content: center;
+    border-radius: 10px;
+    background-color: #eeecfa;
+    color: #434863;
+    font-size: 10px;
+    font-weight: 400;
+    margin-right: 13px;
+`;
+
+const StyledDivider = styled.div<{ depth: number }>`
+    width: calc(100% + 26px + ${(props) => props.depth * 18}px);
+    margin-left: calc(-13px - ${(props) => props.depth * 18}px);
+    border-bottom: 1px solid #eae8fb;
+`;
+
+interface Relationship {
+    entity?: Entity | null;
+}
+
+interface Props {
+    node: GlossaryNodeFragment;
+    isSelecting?: boolean;
+    hideTerms?: boolean;
+    openToEntity?: boolean;
+    refreshBrowser?: boolean;
+    nodeUrnToHide?: string;
+    selectTerm?: (urn: string, displayName: string) => void;
+    selectNode?: (urn: string, displayName: string) => void;
+    isChildNode?: boolean;
+    depth: number;
+}
+
+function NodeItem(props: Props) {
+    const {
+        node,
+        isSelecting,
+        hideTerms,
+        openToEntity,
+        refreshBrowser,
+        nodeUrnToHide,
+        selectTerm,
+        selectNode,
+        isChildNode,
+        depth,
+    } = props;
+    const shouldHideNode = nodeUrnToHide === node.urn;
+
+    const [areChildrenVisible, setAreChildrenVisible] = useState(false);
+    const entityRegistry = useEntityRegistry();
+    const { entityData, urnsToUpdate, setUrnsToUpdate } = useGlossaryEntityData();
+    const { data, loading, refetch } = useGetGlossaryNodeQuery({
+        variables: { urn: node.urn },
+        skip: !areChildrenVisible || shouldHideNode,
+    });
+
+    useEffect(() => {
+        if (openToEntity && entityData && entityData.parentNodes?.nodes.some((parent) => parent.urn === node.urn)) {
+            setAreChildrenVisible(true);
+        }
+    }, [entityData, node.urn, openToEntity]);
+
+    useEffect(() => {
+        if (refreshBrowser) {
+            setAreChildrenVisible(false);
+        }
+    }, [refreshBrowser]);
+
+    useEffect(() => {
+        if (urnsToUpdate.includes(node.urn)) {
+            refetch();
+            setUrnsToUpdate(urnsToUpdate.filter((urn) => urn !== node.urn));
+        }
+    });
+
+    const children: Relationship[] | undefined = data?.glossaryNode?.children?.relationships;
+    const noOfChildren = node.children?.total;
+
+    function handleSelectNode() {
+        if (selectNode) {
+            const displayName = entityRegistry.getDisplayName(node.type, node);
+            selectNode(node.urn, displayName);
+        }
+    }
+
+    const childNodes =
+        children
+            ?.filter((child) => child.entity?.type === EntityType.GlossaryNode)
+            .sort((nodeA, nodeB) => sortGlossaryNodes(entityRegistry, nodeA.entity, nodeB.entity))
+            .map((child) => child.entity) || [];
+    const childTerms =
+        children
+            ?.filter((child) => child.entity?.type === EntityType.GlossaryTerm)
+            .sort((termA, termB) => sortGlossaryTerms(entityRegistry, termA.entity, termB.entity))
+            .map((child) => child.entity) || [];
+
+    if (shouldHideNode) return null;
+
+    const glossaryColor = node.displayProperties?.colorHex || generateColorFromPalette(node.urn);
+
+    return (
+        <ItemWrapper $isSelected={entityData?.urn === node.urn} $isChildNode={isChildNode}>
+            {!isChildNode && <NodeBadge color={glossaryColor} />}
+            <NodeWrapper $isSelected={entityData?.urn === node.urn} $depth={depth}>
+                {areChildrenVisible && (
+                    <StyledDownOutlined
+                        fontSize="inherit"
+                        viewBox="2 2 18 18"
+                        onClick={() => setAreChildrenVisible(false)}
+                        isSelected={entityData?.urn === node.urn}
+                    />
+                )}
+                {!areChildrenVisible && (
+                    <StyledRightOutlined
+                        fontSize="inherit"
+                        viewBox="2 2 18 18"
+                        onClick={() => setAreChildrenVisible(true)}
+                        isSelected={entityData?.urn === node.urn}
+                    />
+                )}
+                {!isSelecting && (
+                    <NodeLink
+                        to={`${entityRegistry.getEntityUrl(node.type, node.urn)}`}
+                        $isSelected={entityData?.urn === node.urn}
+                        $areChildrenVisible={areChildrenVisible}
+                        $isChildNode
+                    >
+                        {entityRegistry.getDisplayName(node.type, node)}
+                    </NodeLink>
+                )}
+                {isSelecting && (
+                    <NameWrapper showSelectStyles={!!selectNode} onClick={handleSelectNode}>
+                        {entityRegistry.getDisplayName(node.type, node)}
+                    </NameWrapper>
+                )}
+                {!!noOfChildren && <ChildrenCount>{noOfChildren}</ChildrenCount>}
+            </NodeWrapper>
+            <StyledDivider depth={depth} />
+            {areChildrenVisible && (
+                <>
+                    {!data && loading && (
+                        <LoadingWrapper>
+                            <LoadingOutlined />
+                        </LoadingWrapper>
+                    )}
+                    {data && data.glossaryNode && (
+                        <ChildrenWrapper>
+                            {(childNodes as GlossaryNode[]).map((child) => (
+                                <NodeItem
+                                    node={child}
+                                    isSelecting={isSelecting}
+                                    hideTerms={hideTerms}
+                                    openToEntity={openToEntity}
+                                    nodeUrnToHide={nodeUrnToHide}
+                                    selectTerm={selectTerm}
+                                    selectNode={selectNode}
+                                    isChildNode
+                                    key={child.urn}
+                                    depth={depth + 1}
+                                />
+                            ))}
+                            {!hideTerms &&
+                                (childTerms as GlossaryTerm[]).map((child) => (
+                                    <>
+                                        <TermItem
+                                            term={child}
+                                            isSelecting={isSelecting}
+                                            selectTerm={selectTerm}
+                                            includeActiveTabPath
+                                            key={child.urn}
+                                            depth={depth + 1}
+                                        />
+                                        <StyledDivider depth={depth + 1} />
+                                    </>
+                                ))}
+                        </ChildrenWrapper>
+                    )}
+                </>
+            )}
+        </ItemWrapper>
+    );
+}
+
+export default NodeItem;
diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/TermItem.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/TermItem.tsx
new file mode 100644
index 00000000000000..07585dc4902bad
--- /dev/null
+++ b/datahub-web-react/src/app/glossaryV2/GlossaryBrowser/TermItem.tsx
@@ -0,0 +1,113 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components/macro';
+import { ChildGlossaryTermFragment } from '../../../graphql/glossaryNode.generated';
+import { useGlossaryEntityData } from '../../entityV2/shared/GlossaryEntityContext';
+import { ANTD_GRAY, EDITING_DOCUMENTATION_URL_PARAM, REDESIGN_COLORS } from '../../entityV2/shared/constants';
+import { useGlossaryActiveTabPath } from '../../entityV2/shared/containers/profile/utils';
+import { useEntityRegistry } from '../../useEntityRegistry';
+
+const TermWrapper = styled.div<{ $isSelected: boolean; $depth: number }>`
+    padding: 13px 0;
+    padding-left: calc(${(props) => (props.$depth ? props.$depth * 18 + 12 : 18)}px);
+    background-color: ${(props) => props.$isSelected && REDESIGN_COLORS.HIGHLIGHT_PURPLE};
+    display: flex;
+`;
+
+const nameStyles = `
+    display: inline-block;
+    height: 100%;
+    width: 100%;
+    font-size: 12px;
+    font-weight: 400;
+    line-height: normal;
+    color: ${REDESIGN_COLORS.TEXT_HEADING};
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+
+    &:hover {
+        color: ${REDESIGN_COLORS.HOVER_PURPLE_2};
+        opacity: 1;
+    }
+`;
+
+interface TermLinkProps {
+    $isSelected: boolean;
+    $areChildrenVisible?: boolean;
+    $isChildNode?: boolean;
+    $entityType?: string;
+}
+
+export const TermLink = styled(Link)<TermLinkProps>`
+    ${nameStyles}
+
+    ${(props) => props.$isChildNode && `opacity: 1;`}
+    ${(props) => props.$areChildrenVisible && `color: ${REDESIGN_COLORS.HOVER_PURPLE_2}; font-weight: 500; opacity: 1;`}
+    ${(props) => props.$isSelected && `color: ${REDESIGN_COLORS.HOVER_PURPLE}; font-weight: 700; opacity: 1;`}
+`;
+
+export const NameWrapper = styled.span<{ showSelectStyles?: boolean }>`
+    ${nameStyles}
+
+    &:hover {
+        ${(props) =>
+            props.showSelectStyles &&
+            `
+        background-color: ${ANTD_GRAY[3]};
+        cursor: pointer;
+        `}
+    }
+`;
+
+interface Props {
+    term: ChildGlossaryTermFragment;
+    isSelecting?: boolean;
+    selectTerm?: (urn: string, displayName: string) => void;
+    includeActiveTabPath?: boolean;
+    areChildrenVisible?: boolean;
+    depth: number;
+}
+
+function TermItem(props: Props) {
+    const { term, isSelecting, selectTerm, includeActiveTabPath, areChildrenVisible } = props;
+
+    const { entityData } = useGlossaryEntityData();
+    const entityRegistry = useEntityRegistry();
+    const activeTabPath = useGlossaryActiveTabPath();
+
+    function handleSelectTerm() {
+        if (selectTerm) {
+            const displayName = entityRegistry.getDisplayName(term.type, term);
+            selectTerm(term.urn, displayName);
+        }
+    }
+
+    const isOnEntityPage = entityData && entityData.urn === term.urn;
+
+    const isActivelyEditing = activeTabPath.includes(EDITING_DOCUMENTATION_URL_PARAM);
+
+    return (
+        <TermWrapper $isSelected={entityData?.urn === term.urn} $depth={props.depth}>
+            {!isSelecting && (
+                <TermLink
+                    to={`${entityRegistry.getEntityUrl(term.type, term.urn)}${
+                        includeActiveTabPath && !isActivelyEditing ? `/${activeTabPath}` : ''
+                    }`}
+                    $isSelected={entityData?.urn === term.urn}
+                    $areChildrenVisible={areChildrenVisible}
+                    $entityType={term.type}
+                >
+                    {entityRegistry.getDisplayName(term.type, isOnEntityPage ? entityData : term)}
+                </TermLink>
+            )}
+            {isSelecting && (
+                <NameWrapper showSelectStyles={!!selectTerm} onClick={handleSelectTerm}>
+                    {entityRegistry.getDisplayName(term.type, isOnEntityPage ? entityData : term)}
+                </NameWrapper>
+            )}
+        </TermWrapper>
+    );
+}
+
+export default TermItem;
diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryContentProvider.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryContentProvider.tsx
new file mode 100644
index 00000000000000..8bd52b6ee43242
--- /dev/null
+++ b/datahub-web-react/src/app/glossaryV2/GlossaryContentProvider.tsx
@@ -0,0 +1,93 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { PageTitle } from '@src/alchemy-components/components/PageTitle';
+import { Button } from '@components';
+import { GlossaryNodeFragment } from '../../graphql/fragments.generated';
+import { ChildGlossaryTermFragment } from '../../graphql/glossaryNode.generated';
+import { GlossaryNode, GlossaryTerm } from '../../types.generated';
+import { BUSINESS_GLOSSARY_CREATE_TERM_GROUP_ID } from '../onboarding/config/BusinessGlossaryOnboardingConfig';
+import EmptyGlossarySection from './EmptyGlossarySection';
+import GlossaryEntitiesList from './GlossaryEntitiesList';
+
+const MainContentWrapper = styled.div`
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+`;
+
+export const HeaderWrapper = styled.div`
+    padding: 16px 20px 12px 20px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+`;
+
+const ButtonContainer = styled.div`
+    display: flex;
+    gap: 9px;
+`;
+
+const ListWrapper = styled.div`
+    padding: 4px 12px 12px 12px;
+    overflow: auto;
+`;
+
+interface Props {
+    setIsCreateNodeModalVisible: React.Dispatch<React.SetStateAction<boolean>>;
+    hasTermsOrNodes: boolean;
+    nodes: (GlossaryNode | GlossaryNodeFragment)[];
+    terms: (GlossaryTerm | ChildGlossaryTermFragment)[];
+    termsLoading: boolean;
+    nodesLoading: boolean;
+    refetchForTerms: () => void;
+    refetchForNodes: () => void;
+}
+
+const GlossaryContentProvider = (props: Props) => {
+    const {
+        setIsCreateNodeModalVisible,
+        hasTermsOrNodes,
+        nodes,
+        terms,
+        termsLoading,
+        nodesLoading,
+        refetchForTerms,
+        refetchForNodes,
+    } = props;
+
+    return (
+        <MainContentWrapper data-testid="glossary-entities-list">
+            <HeaderWrapper data-testid="glossaryPageV2">
+                <PageTitle
+                    title="Business Glossary"
+                    subTitle="Classify your data assets and columns using data dictionaries"
+                />
+                <ButtonContainer>
+                    <Button
+                        data-testid="add-term-group-button-v2"
+                        id={BUSINESS_GLOSSARY_CREATE_TERM_GROUP_ID}
+                        size="lg"
+                        icon="Add"
+                        // can not be disabled on acryl-main due to ability to propose
+                        onClick={() => setIsCreateNodeModalVisible(true)}
+                    >
+                        Create Glossary
+                    </Button>
+                </ButtonContainer>
+            </HeaderWrapper>
+            <ListWrapper>
+                {hasTermsOrNodes && <GlossaryEntitiesList nodes={nodes || []} terms={terms || []} />}
+            </ListWrapper>
+            {!(termsLoading || nodesLoading) && !hasTermsOrNodes && (
+                <EmptyGlossarySection
+                    title="Empty Glossary"
+                    description="Create Terms and Term Groups to organize data assets using a shared vocabulary."
+                    refetchForTerms={refetchForTerms}
+                    refetchForNodes={refetchForNodes}
+                />
+            )}
+        </MainContentWrapper>
+    );
+};
+
+export default GlossaryContentProvider;
diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryEntitiesList.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryEntitiesList.tsx
new file mode 100644
index 00000000000000..4e1746a34d19ea
--- /dev/null
+++ b/datahub-web-react/src/app/glossaryV2/GlossaryEntitiesList.tsx
@@ -0,0 +1,96 @@
+import { Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components/macro';
+import { GlossaryNodeFragment } from '../../graphql/fragments.generated';
+import { ChildGlossaryTermFragment } from '../../graphql/glossaryNode.generated';
+import { GlossaryNode, GlossaryTerm } from '../../types.generated';
+import { useEntityData } from '../entity/shared/EntityContext';
+import { REDESIGN_COLORS } from '../entityV2/shared/constants';
+import { useEntityRegistry } from '../useEntityRegistry';
+import GlossaryEntityItem from './GlossaryEntityItem';
+
+const SectionTitle = styled(Typography)`
+    margin: 12px 0 12px 16px;
+    font-size: 12px;
+    font-weight: 400;
+    color: ${REDESIGN_COLORS.SUBTITLE};
+`;
+
+const GlossaryNodes = styled.div<{ isGrid?: boolean }>`
+    display: flex;
+    ${(props) =>
+        props.isGrid
+            ? `
+        display: grid;
+        grid-template-columns: repeat(auto-fill, minmax(24%, 1fr));
+        gap: 8px; /* Adjust gap as needed */
+        `
+            : `
+        display: flex;
+        flex-direction: column;
+        gap: 12px; /* Adjust gap as needed */
+        `}
+    width: 100%;
+    margin-bottom: 20px;
+`;
+
+const GlossaryTerms = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+    margin-bottom: 20px;
+`;
+
+interface Props {
+    nodes: (GlossaryNode | GlossaryNodeFragment)[];
+    terms: (GlossaryTerm | ChildGlossaryTermFragment)[];
+}
+
+function GlossaryEntitiesList(props: Props) {
+    const { nodes, terms } = props;
+    const entityRegistry = useEntityRegistry();
+    const { entityData } = useEntityData();
+    const isGlossaryEntityPage = !!entityData;
+
+    return (
+        <>
+            {nodes.length > 0 && isGlossaryEntityPage ? <SectionTitle>Term Groups</SectionTitle> : null}
+            {nodes.length ? (
+                <GlossaryNodes isGrid={!isGlossaryEntityPage}>
+                    {nodes.map((node) => (
+                        <GlossaryEntityItem
+                            key={node.urn}
+                            name={node.properties?.name || ''}
+                            description={node.properties?.description || ''}
+                            urn={node.urn}
+                            type={node.type}
+                            descendants={
+                                (node as GlossaryNodeFragment).children?.relationships
+                                    ?.map((child) => child.entity)
+                                    .filter((child) => child !== null) as (GlossaryNode | GlossaryTerm)[]
+                            }
+                            displayProperties={node.displayProperties}
+                            showAsCard={!isGlossaryEntityPage}
+                        />
+                    ))}
+                </GlossaryNodes>
+            ) : null}
+            {terms.length > 0 && isGlossaryEntityPage ? <SectionTitle>Glossary Terms</SectionTitle> : null}
+            {terms.length ? (
+                <GlossaryTerms>
+                    {terms.map((term) => (
+                        <GlossaryEntityItem
+                            key={term.urn}
+                            name={entityRegistry.getDisplayName(term.type, term)}
+                            urn={term.urn}
+                            type={term.type}
+                            description={term.properties?.description || ''}
+                        />
+                    ))}
+                </GlossaryTerms>
+            ) : null}
+        </>
+    );
+}
+
+export default GlossaryEntitiesList;
diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryEntityItem.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryEntityItem.tsx
new file mode 100644
index 00000000000000..fda25594154723
--- /dev/null
+++ b/datahub-web-react/src/app/glossaryV2/GlossaryEntityItem.tsx
@@ -0,0 +1,114 @@
+import { Maybe } from 'graphql/jsutils/Maybe';
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { Tooltip } from 'antd';
+import { GlossaryNodeFragment } from '../../graphql/fragments.generated';
+import { ChildGlossaryTermFragment } from '../../graphql/glossaryNode.generated';
+import { DisplayProperties, EntityType, GlossaryNode, GlossaryTerm } from '../../types.generated';
+import { useEntityData } from '../entity/shared/EntityContext';
+import { useEntityRegistry } from '../useEntityRegistry';
+import GlossaryNodeCard from './GlossaryNodeCard';
+import GlossaryListCard from './GlossaryListCard';
+
+interface Props {
+    name: string;
+    description?: string;
+    urn: string;
+    type: EntityType;
+    descendants?: (GlossaryNode | GlossaryNodeFragment | GlossaryTerm | ChildGlossaryTermFragment)[];
+    displayProperties?: Maybe<DisplayProperties>;
+    showAsCard?: boolean; // Currently only supported for Nodes!
+}
+
+// iterates through the layers of descendents and counts the max number of layers
+function countMaxDepth(
+    descendents: (GlossaryNode | GlossaryNodeFragment | GlossaryTerm | ChildGlossaryTermFragment | undefined | null)[],
+    depth = 1,
+): number {
+    let maxDepth = depth;
+
+    descendents.forEach((desc) => {
+        if (!desc) return;
+        if (desc.type === EntityType.GlossaryNode) {
+            const subNode = desc as unknown as GlossaryNodeFragment;
+            if (subNode?.children?.relationships) {
+                const subDepth = countMaxDepth(
+                    subNode?.children?.relationships?.map(
+                        (rel) => rel?.entity as GlossaryNodeFragment | ChildGlossaryTermFragment,
+                    ),
+                    depth + 1,
+                );
+                maxDepth = Math.max(maxDepth, subDepth);
+            }
+        }
+    });
+
+    return maxDepth;
+}
+
+function countTermsAndNodes(
+    descendents: (GlossaryNode | GlossaryNodeFragment | GlossaryTerm | ChildGlossaryTermFragment)[],
+): {
+    termCount: number;
+    nodeCount: number;
+} {
+    let termCount = 0;
+    let nodeCount = 0; // Counting the root node itself
+
+    function traverse(entity: GlossaryNodeFragment | ChildGlossaryTermFragment) {
+        if (entity.type === EntityType.GlossaryTerm) {
+            termCount++;
+        } else if (entity.type === EntityType.GlossaryNode) {
+            nodeCount++;
+            const subNode = entity as unknown as GlossaryNodeFragment;
+            if (subNode?.children?.relationships) {
+                subNode.children.relationships.forEach((rel) =>
+                    traverse(rel?.entity as GlossaryNodeFragment | ChildGlossaryTermFragment),
+                );
+            }
+        }
+    }
+
+    descendents.forEach((desc) => traverse(desc));
+
+    return { termCount, nodeCount };
+}
+
+function GlossaryEntityItem(props: Props) {
+    const { name, description, urn, type, descendants, displayProperties } = props;
+    const entityRegistry = useEntityRegistry();
+    const entityData = useEntityData();
+
+    const { termCount, nodeCount } = countTermsAndNodes(descendants || []);
+    const maxDepth = countMaxDepth(descendants || []);
+
+    return (
+        <Tooltip title={name} showArrow={false} placement="top">
+            <Link to={`${entityRegistry.getEntityUrl(type, urn)}`}>
+                {type === EntityType.GlossaryNode && props.showAsCard ? (
+                    <GlossaryNodeCard
+                        name={name}
+                        description={description}
+                        displayProperties={displayProperties}
+                        urn={urn}
+                        termCount={termCount}
+                        nodeCount={nodeCount}
+                        maxDepth={maxDepth}
+                    />
+                ) : (
+                    <GlossaryListCard
+                        name={name}
+                        description={description}
+                        type={type}
+                        urn={urn}
+                        entityData={entityData}
+                        termCount={termCount}
+                        nodeCount={nodeCount}
+                    />
+                )}
+            </Link>
+        </Tooltip>
+    );
+}
+
+export default GlossaryEntityItem;
diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryListCard.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryListCard.tsx
new file mode 100644
index 00000000000000..e39df988f48973
--- /dev/null
+++ b/datahub-web-react/src/app/glossaryV2/GlossaryListCard.tsx
@@ -0,0 +1,238 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { colors } from '@src/alchemy-components';
+import { Tooltip } from 'antd';
+import { BookmarkSimple, BookmarksSimple } from '@phosphor-icons/react';
+import { ANTD_GRAY_V2, REDESIGN_COLORS } from '../entityV2/shared/constants';
+import { EntityType, Maybe } from '../../types.generated';
+import { generateColorFromPalette } from './colorUtils';
+import { GenericEntityProperties } from '../entity/shared/types';
+
+const SmallDescription = styled.div`
+    color: ${REDESIGN_COLORS.SUB_TEXT};
+    overflow: hidden;
+`;
+
+const EntityDetailsLeftColumn = styled.div`
+    display: flex;
+    gap: 15px;
+    align-items: center;
+`;
+
+const EntityDetailsRightColumn = styled.div`
+    margin-right: 5px;
+    svg {
+        display: none;
+    }
+`;
+
+const BookmarkIconWrapper = styled.div<{ urnText: string }>`
+    width: 40px;
+    height: 40px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-color: ${(props) => generateColorFromPalette(props.urnText)};
+    border-radius: 11px;
+    margin-right: 12px;
+    position: relative;
+    overflow: hidden;
+    flex-shrink: 0; /* Prevents the icon from being squashed */
+`;
+
+const EntityDetails = styled.div`
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 1px solid ${REDESIGN_COLORS.LIGHT_GREY};
+    padding: 20px 0 20px 0;
+    margin: 0 23px 0 19px;
+`;
+
+const EntityDetailsWrapper = styled.div<{ type: EntityType }>`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 16px 16px;
+    border: 1px solid #ebecf0;
+    margin: 0px 12px;
+    border-radius: 16px;
+    position: relative;
+    overflow: hidden;
+
+    &:hover > ${EntityDetails} > ${EntityDetailsLeftColumn} > ${BookmarkIconWrapper} > svg > g > path {
+        transition: 0.15s;
+        fill: rgba(216, 160, 75, 1);
+    }
+
+    &:hover > ${EntityDetails} > ${EntityDetailsRightColumn} > svg {
+        transition: 0.15s;
+        display: block;
+    }
+
+    &:hover {
+        transition: 0.15s;
+        background-color: ${colors.gray[100]};
+    }
+`;
+
+const EntityName = styled.div`
+    color: ${REDESIGN_COLORS.SUBTITLE};
+    font-size: 14px;
+    font-weight: 400;
+    font-weight: bold;
+`;
+
+const EntityTitleWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    align-items: center;
+`;
+
+const NameAndDescription = styled.div`
+    display: flex;
+    flex-direction: column;
+    overflow hidden;
+`;
+
+const BookmarkRibbon = styled.span<{ urnText: string }>`
+    position: absolute;
+    left: -11px;
+    top: 7px;
+    width: 40px;
+    transform: rotate(-45deg);
+    padding: 4px;
+    opacity: 1;
+    background-color: rgba(0, 0, 0, 0.2);
+`;
+
+const GlossaryItemCount = styled.span<{ count: number }>`
+    display: flex;
+    align-items: center;
+    gap: 5px;
+    border-radius: 20px;
+    background: ${ANTD_GRAY_V2[14]};
+    color: ${(props) => (props.count > 0 ? REDESIGN_COLORS.SUB_TEXT : colors.gray[400])};
+    padding: 5px 10px;
+    width: max-content;
+    svg {
+        height: 14px;
+        width: 14px;
+        path {
+            fill: ${(props) => (props.count > 0 ? REDESIGN_COLORS.SUB_TEXT : colors.gray[400])};
+        }
+    }
+    border: 1px solid transparent;
+    :hover {
+        border: 1px solid ${(props) => (props.count > 0 ? ANTD_GRAY_V2[13] : 'transparent')};
+    }
+`;
+
+const CountText = styled.span`
+    font-size: 10px;
+    font-weight: 400;
+`;
+
+const Icons = styled.div`
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 5px;
+`;
+
+const MAX_DESCRIPTION_LENGTH = 100;
+const MAX_DEPTH_QUERIED = 4;
+
+interface Props {
+    name: string;
+    description: string | undefined;
+    type: EntityType;
+    urn: string;
+    entityData: GenericEntityProperties | null;
+    nodeCount?: Maybe<number>;
+    termCount?: Maybe<number>;
+    maxDepth?: number;
+}
+
+const GlossaryListCard = (props: Props) => {
+    const { name, description, type, entityData } = props;
+    const isDescriptionTruncated = description && description.length > MAX_DESCRIPTION_LENGTH;
+    const truncatedDescription = description?.slice(0, MAX_DESCRIPTION_LENGTH);
+    const isExceedingMaxDepth = (props.maxDepth || 0) > MAX_DEPTH_QUERIED;
+
+    return (
+        <EntityDetailsWrapper type={props.type}>
+            {type === EntityType.GlossaryNode ? (
+                <EntityTitleWrapper>
+                    <BookmarkIconWrapper urnText={entityData?.urn || ''}>
+                        <BookmarkRibbon urnText={entityData?.urn || ''} />
+                        <BookmarksSimple color="white" size="16px" weight="bold" />
+                    </BookmarkIconWrapper>
+                    <NameAndDescription>
+                        <EntityName>{name}</EntityName>
+                        {description && (
+                            <SmallDescription>
+                                <>
+                                    {truncatedDescription}
+                                    {isDescriptionTruncated ? '...' : null}
+                                </>
+                            </SmallDescription>
+                        )}
+                    </NameAndDescription>
+                </EntityTitleWrapper>
+            ) : (
+                <EntityTitleWrapper>
+                    <BookmarkIconWrapper urnText={entityData?.urn || ''}>
+                        <BookmarkRibbon urnText={entityData?.urn || ''} />
+                        <BookmarkSimple color="white" size="16px" weight="bold" />
+                    </BookmarkIconWrapper>
+                    <NameAndDescription>
+                        <EntityName>{name}</EntityName>
+                        {description && (
+                            <SmallDescription>
+                                <>
+                                    {truncatedDescription}
+                                    {isDescriptionTruncated ? '...' : null}
+                                </>
+                            </SmallDescription>
+                        )}
+                    </NameAndDescription>
+                </EntityTitleWrapper>
+            )}
+            {type === EntityType.GlossaryNode ? (
+                <Icons>
+                    <Tooltip
+                        title={`Contains ${props.nodeCount} ${props.nodeCount === 1 ? 'term group' : 'term groups'}`}
+                        placement="top"
+                        showArrow={false}
+                    >
+                        <GlossaryItemCount count={props.nodeCount || 0}>
+                            <BookmarksSimple />
+                            <CountText>
+                                {' '}
+                                {props.nodeCount}
+                                {isExceedingMaxDepth && `+`}
+                            </CountText>
+                        </GlossaryItemCount>
+                    </Tooltip>
+                    <Tooltip
+                        title={`Contains ${props.termCount} ${props.termCount === 1 ? 'term' : 'terms'}`}
+                        placement="top"
+                        showArrow={false}
+                    >
+                        <GlossaryItemCount count={props.termCount || 0}>
+                            <BookmarkSimple />
+                            <CountText>
+                                {' '}
+                                {props.termCount}
+                                {isExceedingMaxDepth && `+`}
+                            </CountText>
+                        </GlossaryItemCount>
+                    </Tooltip>
+                </Icons>
+            ) : null}
+        </EntityDetailsWrapper>
+    );
+};
+
+export default GlossaryListCard;
diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryNodeCard.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryNodeCard.tsx
new file mode 100644
index 00000000000000..d0b124a4713193
--- /dev/null
+++ b/datahub-web-react/src/app/glossaryV2/GlossaryNodeCard.tsx
@@ -0,0 +1,207 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { Tooltip, Typography } from 'antd';
+import { Maybe } from 'graphql/jsutils/Maybe';
+import { colors } from '@src/alchemy-components';
+import { BookmarkSimple, BookmarksSimple } from '@phosphor-icons/react';
+import { DisplayProperties } from '../../types.generated';
+import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '../entityV2/shared/constants';
+import { generateColorFromPalette } from './colorUtils';
+
+interface GlossaryItemCardHeaderProps {
+    color: string;
+}
+
+// there may be a good constant for this but I couldn't find one --Gabe
+// feel free to replace this color at a later date
+const DISABLED_TEXT_COLOR = '#c5c6c9';
+
+const GlossaryItemCardHeader = styled.div<GlossaryItemCardHeaderProps>`
+    display: flex;
+    padding: 20px 20px 20px 30px;
+    justify-content: start;
+    border-radius: 12px 12px 0px 0px;
+    position: relative;
+    overflow: hidden;
+    gap: 5px;
+    background-color: ${(props) => props.color};
+
+    svg {
+        height: 22px;
+        width: 22px;
+        path {
+            fill: white;
+        }
+    }
+`;
+
+const GlossaryItemCardWrapper = styled.div`
+    padding: 12px;
+    border-radius: 13px;
+
+    &:hover {
+        transition: 0.15s;
+        background-color: ${colors.gray[100]};
+    }
+`;
+
+const GlossaryItemCard = styled.div`
+    display: flex;
+    flex-direction: column;
+    border-radius: 13px;
+    border: 1px solid ${REDESIGN_COLORS.LIGHT_GREY_BORDER};
+    background: ${ANTD_GRAY[1]};
+    transition: 0.15s;
+    height: 100%;
+    width: 100%;
+
+    &:hover {
+        transition: 0.15s;
+        border-color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    }
+
+    &:hover > ${GlossaryItemCardHeader} {
+        transition: 0.15s;
+        opacity: 0.9 !important;
+    }
+`;
+
+const GlossaryItemCount = styled.span<{ count: number }>`
+    display: flex;
+    align-items: center;
+    gap: 5px;
+    border-radius: 20px;
+    background: ${(props) => (props.count > 0 ? ANTD_GRAY_V2[14] : ANTD_GRAY_V2[14])};
+    color: ${(props) => (props.count > 0 ? REDESIGN_COLORS.SUB_TEXT : DISABLED_TEXT_COLOR)};
+    padding: 5px 10px;
+    width: max-content;
+    svg {
+        height: 14px;
+        width: 14px;
+        path {
+            fill: ${(props) => (props.count > 0 ? REDESIGN_COLORS.SUB_TEXT : DISABLED_TEXT_COLOR)};
+        }
+    }
+    border: 1px solid transparent;
+    :hover {
+        border: 1px solid ${(props) => (props.count > 0 ? ANTD_GRAY_V2[13] : 'transparent')};
+    }
+`;
+
+const GlossaryItemBadge = styled.span`
+    position: absolute;
+    left: -35px;
+    top: 8px;
+    width: 100px;
+    transform: rotate(-45deg);
+    padding: 8px;
+    opacity: 1;
+    background-color: rgba(0, 0, 0, 0.17);
+`;
+
+const GlossaryItemCardDetails = styled.div`
+    display: flex;
+    flex-direction: column;
+    padding: 13px 16px;
+    gap: 10px;
+`;
+
+const GlossaryCardHeader = styled(Typography)`
+    color: #f9fafc;
+    font-size: 16px;
+    font-weight: 500;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+`;
+
+const GlossaryItemCardDescription = styled(Typography)`
+    color: ${REDESIGN_COLORS.SUB_TEXT};
+    font-size: 12px;
+    font-weight: 400;
+    margin-top: 1px;
+    width: 100%;
+    min-height: 30px;
+    overflow: hidden;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+`;
+
+const CountText = styled.span`
+    font-size: 10px;
+    font-weight: 400;
+`;
+
+interface Props {
+    name: string;
+    description: string | undefined;
+    termCount: number;
+    nodeCount: number;
+    displayProperties?: Maybe<DisplayProperties>;
+    urn: string;
+    maxDepth?: number;
+}
+
+const Icons = styled.div`
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 5px;
+`;
+
+const MAX_DEPTH_QUERIED = 4;
+
+const GlossaryNodeCard = (props: Props) => {
+    const { name, description, termCount, nodeCount, displayProperties, urn, maxDepth } = props;
+    const glossaryColor = displayProperties?.colorHex || generateColorFromPalette(urn);
+
+    const isExceedingMaxDepth = (maxDepth || 0) > MAX_DEPTH_QUERIED;
+
+    return (
+        <GlossaryItemCardWrapper>
+            <GlossaryItemCard>
+                <GlossaryItemCardHeader color={glossaryColor}>
+                    <BookmarksSimple style={{ flexShrink: 0 }} />
+                    <GlossaryCardHeader>{name}</GlossaryCardHeader>
+                    <GlossaryItemBadge />
+                </GlossaryItemCardHeader>
+                <GlossaryItemCardDetails>
+                    <GlossaryItemCardDescription>{description || '--'}</GlossaryItemCardDescription>
+                    <Icons>
+                        <Tooltip
+                            title={`Contains ${nodeCount} ${props.nodeCount === 1 ? 'term group' : 'term groups'}`}
+                            placement="top"
+                            showArrow={false}
+                        >
+                            <GlossaryItemCount count={nodeCount}>
+                                <BookmarksSimple />
+                                <CountText>
+                                    {' '}
+                                    {nodeCount}
+                                    {isExceedingMaxDepth && `+`}
+                                </CountText>
+                            </GlossaryItemCount>
+                        </Tooltip>
+                        <Tooltip
+                            title={`Contains ${termCount} ${props.termCount === 1 ? 'term' : 'terms'}`}
+                            placement="top"
+                            showArrow={false}
+                        >
+                            <GlossaryItemCount count={termCount}>
+                                <BookmarkSimple />
+                                <CountText>
+                                    {' '}
+                                    {termCount}
+                                    {isExceedingMaxDepth && `+`}
+                                </CountText>
+                            </GlossaryItemCount>
+                        </Tooltip>
+                    </Icons>
+                </GlossaryItemCardDetails>
+            </GlossaryItemCard>
+        </GlossaryItemCardWrapper>
+    );
+};
+
+export default GlossaryNodeCard;
diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryRoutes.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryRoutes.tsx
new file mode 100644
index 00000000000000..2c9a7d0d0e34bf
--- /dev/null
+++ b/datahub-web-react/src/app/glossaryV2/GlossaryRoutes.tsx
@@ -0,0 +1,73 @@
+import React, { useState } from 'react';
+import styled from 'styled-components/macro';
+import { Switch, Route, Redirect, useLocation, matchPath } from 'react-router-dom';
+import { PageRoutes } from '../../conf/Global';
+import { GlossaryEntityContext } from '../entityV2/shared/GlossaryEntityContext';
+import { GenericEntityProperties } from '../entity/shared/types';
+import BusinessGlossaryPage from './BusinessGlossaryPage';
+import { EntityPage as EntityPageV2 } from '../entityV2/EntityPage';
+import GlossarySidebar from './GlossarySidebar';
+import { useEntityRegistry } from '../useEntityRegistry';
+import { useAppConfig } from '../useAppConfig';
+import { useGetAuthenticatedUser } from '../useGetAuthenticatedUser';
+import { shouldShowGlossary } from '../identity/user/UserUtils';
+import { useShowNavBarRedesign } from '../useShowNavBarRedesign';
+
+const ContentWrapper = styled.div<{ $isShowNavBarRedesign?: boolean; $isEntityProfile?: boolean }>`
+    display: flex;
+    flex: 1;
+    overflow: hidden;
+    gap: ${(props) => (props.$isShowNavBarRedesign ? '12px' : '0')};
+    ${(props) => !props.$isEntityProfile && props.$isShowNavBarRedesign && 'padding: 5px;'}
+`;
+
+export default function GlossaryRoutes() {
+    const entityRegistry = useEntityRegistry();
+    const [entityData, setEntityData] = useState<GenericEntityProperties | null>(null);
+    const [urnsToUpdate, setUrnsToUpdate] = useState<string[]>([]);
+    const [isSidebarOpen, setIsSidebarOpen] = useState<boolean>(true);
+
+    const appConfig = useAppConfig();
+    const authenticatedUser = useGetAuthenticatedUser();
+    const canManageGlossary = authenticatedUser?.platformPrivileges.manageGlossaries || false;
+    const hideGlossary = !!appConfig?.config?.visualConfig?.hideGlossary;
+    const showGlossary = shouldShowGlossary(canManageGlossary, hideGlossary);
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    const location = useLocation();
+    const isEntityProfile =
+        matchPath(
+            location.pathname,
+            entityRegistry.getGlossaryEntities().map((entity) => `/${entityRegistry.getPathName(entity.type)}/:urn`),
+        ) !== null;
+
+    return (
+        <GlossaryEntityContext.Provider
+            value={{
+                isInGlossaryContext: true,
+                entityData,
+                setEntityData,
+                urnsToUpdate,
+                setUrnsToUpdate,
+                isSidebarOpen,
+                setIsSidebarOpen,
+            }}
+        >
+            <ContentWrapper $isShowNavBarRedesign={isShowNavBarRedesign} $isEntityProfile={isEntityProfile}>
+                <GlossarySidebar isEntityProfile={isEntityProfile} />
+                <Switch>
+                    {entityRegistry.getGlossaryEntities().map((entity) => (
+                        <Route
+                            key={entity.getPathName()}
+                            path={`/${entity.getPathName()}/:urn`}
+                            render={() => <EntityPageV2 entityType={entity.type} />}
+                        />
+                    ))}
+                    <Route
+                        path={PageRoutes.GLOSSARY}
+                        render={() => (showGlossary ? <BusinessGlossaryPage /> : <Redirect to="/" />)}
+                    />
+                </Switch>
+            </ContentWrapper>
+        </GlossaryEntityContext.Provider>
+    );
+}
diff --git a/datahub-web-react/src/app/glossaryV2/GlossarySearch.tsx b/datahub-web-react/src/app/glossaryV2/GlossarySearch.tsx
new file mode 100644
index 00000000000000..8774b1dc33f2c1
--- /dev/null
+++ b/datahub-web-react/src/app/glossaryV2/GlossarySearch.tsx
@@ -0,0 +1,124 @@
+import { LoadingOutlined } from '@ant-design/icons';
+import React, { useState } from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components/macro';
+import { useGetAutoCompleteMultipleResultsQuery } from '../../graphql/search.generated';
+import { EntityType } from '../../types.generated';
+import { IconStyleType } from '../entityV2/Entity';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../entityV2/shared/constants';
+import { SearchBar } from '../searchV2/SearchBar';
+import ClickOutside from '../shared/ClickOutside';
+import { useEntityRegistry } from '../useEntityRegistry';
+
+const GlossarySearchWrapper = styled.div`
+    position: relative;
+    border-bottom: 1px solid ${REDESIGN_COLORS.BORDER_3};
+`;
+
+const ResultsWrapper = styled.div`
+    background-color: white;
+    border-radius: 5px;
+    box-shadow: 0 3px 6px -4px rgb(0 0 0 / 12%), 0 6px 16px 0 rgb(0 0 0 / 8%), 0 9px 28px 8px rgb(0 0 0 / 5%);
+    padding: 8px;
+    position: absolute;
+    max-height: 210px;
+    overflow: auto;
+    width: calc(100% - 24px);
+    left: 12px;
+    top: 45px;
+    z-index: 1;
+`;
+
+const LoadingWrapper = styled.div`
+    display: flex;
+    justify-content: center;
+    padding: 4px 0;
+    font-size: 16px;
+`;
+
+const SearchResult = styled(Link)`
+    color: ${ANTD_GRAY[11]};
+    display: inline-block;
+    height: 100%;
+    padding: 6px 8px;
+    width: 100%;
+
+    &:hover {
+        background-color: ${ANTD_GRAY[3]};
+        color: ${ANTD_GRAY[11]};
+    }
+`;
+
+const IconWrapper = styled.span`
+    margin-right: 8px;
+`;
+
+function GlossarySearch() {
+    const [query, setQuery] = useState('');
+    const [isSearchBarFocused, setIsSearchBarFocused] = useState(false);
+    const entityRegistry = useEntityRegistry();
+
+    const { data, loading } = useGetAutoCompleteMultipleResultsQuery({
+        variables: {
+            input: {
+                types: [EntityType.GlossaryTerm, EntityType.GlossaryNode],
+                query,
+                limit: 50,
+            },
+        },
+        skip: !query,
+    });
+
+    const searchResults = data?.autoCompleteForMultiple?.suggestions?.flatMap((suggestion) => suggestion.entities);
+
+    return (
+        <GlossarySearchWrapper>
+            <ClickOutside onClickOutside={() => setIsSearchBarFocused(false)}>
+                <SearchBar
+                    initialQuery={query || ''}
+                    placeholderText="Search"
+                    suggestions={[]}
+                    hideRecommendations
+                    style={{ padding: 9 }}
+                    inputStyle={{
+                        height: 30,
+                        fontSize: 10,
+                        fontWeight: 500,
+                        backgroundColor: ANTD_GRAY[3],
+                    }}
+                    textColor={ANTD_GRAY[10]}
+                    placeholderColor={REDESIGN_COLORS.PLACEHOLDER_PURPLE}
+                    onSearch={() => null}
+                    onQueryChange={(q) => setQuery(q)}
+                    entityRegistry={entityRegistry}
+                    onFocus={() => setIsSearchBarFocused(true)}
+                />
+                {isSearchBarFocused && (loading || !!searchResults?.length) && (
+                    <ResultsWrapper>
+                        {loading && (
+                            <LoadingWrapper>
+                                <LoadingOutlined />
+                            </LoadingWrapper>
+                        )}
+                        {!loading &&
+                            searchResults?.map((result) => {
+                                return (
+                                    <SearchResult
+                                        to={`${entityRegistry.getEntityUrl(result.type, result.urn)}`}
+                                        onClick={() => setIsSearchBarFocused(false)}
+                                    >
+                                        <IconWrapper>
+                                            {entityRegistry.getIcon(result.type, 12, IconStyleType.ACCENT)}
+                                        </IconWrapper>
+                                        {entityRegistry.getDisplayName(result.type, result)}
+                                    </SearchResult>
+                                );
+                            })}
+                    </ResultsWrapper>
+                )}
+            </ClickOutside>
+        </GlossarySearchWrapper>
+    );
+}
+
+export default GlossarySearch;
diff --git a/datahub-web-react/src/app/glossaryV2/GlossarySidebar.tsx b/datahub-web-react/src/app/glossaryV2/GlossarySidebar.tsx
new file mode 100644
index 00000000000000..490957b66f5004
--- /dev/null
+++ b/datahub-web-react/src/app/glossaryV2/GlossarySidebar.tsx
@@ -0,0 +1,96 @@
+import React, { useState } from 'react';
+import { Button } from 'antd';
+import { Tooltip } from '@components';
+import { PlusCircleOutlined } from '@ant-design/icons';
+import styled from 'styled-components/macro';
+import { REDESIGN_COLORS } from '../entityV2/shared/constants';
+import useSidebarWidth from '../sharedV2/sidebar/useSidebarWidth';
+import GlossarySearch from './GlossarySearch';
+import GlossaryBrowser from './GlossaryBrowser/GlossaryBrowser';
+import { SidebarWrapper } from '../sharedV2/sidebar/components';
+import CreateGlossaryEntityModal from '../entityV2/shared/EntityDropdown/CreateGlossaryEntityModal';
+import { EntityType } from '../../types.generated';
+import { useUserContext } from '../context/useUserContext';
+import { useGetRootGlossaryNodesQuery } from '../../graphql/glossary.generated';
+import { useShowNavBarRedesign } from '../useShowNavBarRedesign';
+
+const StyledSidebarWrapper = styled(SidebarWrapper)<{ $isEntityProfile?: boolean }>`
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        margin: ${props.$isEntityProfile ? '5px 0px 6px 5px' : '0px 4px 0px 0px'};
+    `}
+`;
+
+const SidebarTitleWrapper = styled.div`
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 15px 12px 10px 12px;
+    border-bottom: 1px solid ${REDESIGN_COLORS.BORDER_3};
+    height: 50px;
+
+    color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    font-size: 20px;
+`;
+
+const StyledButton = styled(Button)`
+    padding: 0;
+    border: none;
+    box-shadow: none;
+    color: inherit;
+    font-size: inherit;
+`;
+
+const GlossaryTitle = styled.div`
+    font-size: 16px;
+    font-weight: bold;
+    color: #374066;
+`;
+
+type Props = {
+    isEntityProfile?: boolean;
+};
+
+export default function GlossarySidebar({ isEntityProfile }: Props) {
+    const [isCreateNodeModalVisible, setIsCreateNodeModalVisible] = useState(false);
+
+    const { refetch: refetchForNodes } = useGetRootGlossaryNodesQuery();
+
+    const user = useUserContext();
+    const canManageGlossaries = user?.platformPrivileges?.manageGlossaries;
+
+    const width = useSidebarWidth(0.2);
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+
+    return (
+        <>
+            <StyledSidebarWrapper
+                width={width}
+                data-testid="glossary-browser-sidebar"
+                $isShowNavBarRedesign={isShowNavBarRedesign}
+                $isEntityProfile={isEntityProfile}
+            >
+                <SidebarTitleWrapper>
+                    <GlossaryTitle>Business Glossary</GlossaryTitle>
+                    <Tooltip title="Create Glossary" placement="left" showArrow={false}>
+                        <StyledButton onClick={() => setIsCreateNodeModalVisible(true)}>
+                            <PlusCircleOutlined style={{ fontSize: 'inherit' }} />
+                        </StyledButton>
+                    </Tooltip>
+                </SidebarTitleWrapper>
+                <GlossarySearch />
+                <GlossaryBrowser openToEntity />
+            </StyledSidebarWrapper>
+            {isCreateNodeModalVisible && (
+                <CreateGlossaryEntityModal
+                    entityType={EntityType.GlossaryNode}
+                    canCreateGlossaryEntity={!!canManageGlossaries}
+                    onClose={() => setIsCreateNodeModalVisible(false)}
+                    refetchData={refetchForNodes}
+                    canSelectParentUrn={false}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryStatsProvider.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryStatsProvider.tsx
new file mode 100644
index 00000000000000..09e78c20659a29
--- /dev/null
+++ b/datahub-web-react/src/app/glossaryV2/GlossaryStatsProvider.tsx
@@ -0,0 +1,91 @@
+import React from 'react';
+import Icon from '@ant-design/icons';
+import styled from 'styled-components/macro';
+import { Typography } from 'antd';
+import { BookmarksSimple } from '@phosphor-icons/react';
+import ActiveGlossaryTermIcon from '../../../src/images/glossary_bookmark_added.svg?react';
+import ApprovedGlossaryTermIcon from '../../../src/images/glossary_verified.svg?react';
+import OwnersIcon from '../../../src/images/glossary_account_circle.svg?react';
+import { REDESIGN_COLORS, ANTD_GRAY } from '../entityV2/shared/constants';
+
+const StatusWrapper = styled.div`
+    background-color: ${REDESIGN_COLORS.BACKGROUND_PURPLE_2};
+    border-radius: 9px;
+    border: 1px solid ${ANTD_GRAY[1]};
+    background: ${ANTD_GRAY[1]};
+    margin-bottom: 10px;
+    display: flex;
+    justify-content: space-around;
+    padding: 18px;
+`;
+
+const IconWrapper = styled.div`
+    display: flex;
+    margin-bottom: 5px;
+`;
+
+const CountTerms = styled.div`
+    color: ${REDESIGN_COLORS.BACKGROUND_OVERLAY_BLACK};
+    font-family: Mulish;
+    font-size: 20px;
+    font-style: normal;
+    font-weight: 700;
+    line-height: normal;
+    margin-left: 5px;
+`;
+
+const HeaderTitle = styled(Typography)`
+    color: ${REDESIGN_COLORS.BACKGROUND_OVERLAY_BLACK};
+    text-align: center;
+    font-family: Mulish;
+    font-size: 12px;
+    font-style: normal;
+    font-weight: 300;
+    line-height: normal;
+`;
+
+interface Props {
+    totalGlossaryTerms: number;
+    activeGlossaryTerms: number;
+    owners: number;
+    approvedGlossaryTerms: number;
+}
+
+const GlossaryStatsProvider = (props: Props) => {
+    const { totalGlossaryTerms, activeGlossaryTerms, owners, approvedGlossaryTerms } = props;
+
+    return (
+        <StatusWrapper>
+            <div>
+                <IconWrapper>
+                    <BookmarksSimple style={{ fontSize: 26 }} />
+                    <CountTerms>{totalGlossaryTerms} +</CountTerms>
+                </IconWrapper>
+                <HeaderTitle>Total Glossary Terms</HeaderTitle>
+            </div>
+            <div>
+                <IconWrapper>
+                    <Icon style={{ fontSize: 26 }} component={ActiveGlossaryTermIcon} />
+                    <CountTerms>{activeGlossaryTerms} +</CountTerms>
+                </IconWrapper>
+                <HeaderTitle>Active Glossary Terms</HeaderTitle>
+            </div>
+            <div>
+                <IconWrapper>
+                    <Icon style={{ fontSize: 26 }} component={OwnersIcon} />
+                    <CountTerms>{owners}</CountTerms>
+                </IconWrapper>
+                <HeaderTitle>Owners?</HeaderTitle>
+            </div>
+            <div>
+                <IconWrapper>
+                    <Icon style={{ fontSize: 26 }} component={ApprovedGlossaryTermIcon} />
+                    <CountTerms>{approvedGlossaryTerms}</CountTerms>
+                </IconWrapper>
+                <HeaderTitle>Approved Glossary</HeaderTitle>
+            </div>
+        </StatusWrapper>
+    );
+};
+
+export default GlossaryStatsProvider;
diff --git a/datahub-web-react/src/app/glossaryV2/__tests__/utils.test.ts b/datahub-web-react/src/app/glossaryV2/__tests__/utils.test.ts
new file mode 100644
index 00000000000000..8f3f474eba87c6
--- /dev/null
+++ b/datahub-web-react/src/app/glossaryV2/__tests__/utils.test.ts
@@ -0,0 +1,55 @@
+import { EntityType } from '../../../types.generated';
+import { glossaryNode1, glossaryNode3, glossaryTerm1 } from '../../../Mocks';
+import {
+    getParentNodeToUpdate,
+    getGlossaryRootToUpdate,
+    ROOT_NODES,
+    ROOT_TERMS,
+    updateGlossarySidebar,
+} from '../utils';
+
+const glossaryTermWithParent = {
+    ...glossaryTerm1,
+    parentNodes: {
+        count: 1,
+        nodes: [glossaryNode1],
+    },
+};
+
+describe('glossary utils tests', () => {
+    it('should get the direct parent node urn in getParentNodeToUpdate for glossary nodes', () => {
+        const parentNode = getParentNodeToUpdate(glossaryNode3 as any, EntityType.GlossaryNode);
+        expect(parentNode).toBe(glossaryNode3.parentNodes?.nodes[0].urn);
+    });
+
+    it('should get the direct parent node urn in getParentNodeToUpdate for glossary terms', () => {
+        const parentNode = getParentNodeToUpdate(glossaryTermWithParent as any, EntityType.GlossaryTerm);
+        expect(parentNode).toBe(glossaryNode1.urn);
+    });
+
+    it('should return ROOT_NODES for glossary node with no parent nodes', () => {
+        const parentNode = getParentNodeToUpdate(glossaryNode1 as any, EntityType.GlossaryNode);
+        expect(parentNode).toBe(ROOT_NODES);
+    });
+
+    it('should return ROOT_TERMS for glossary term with no parent nodes', () => {
+        const parentNode = getParentNodeToUpdate(glossaryTerm1 as any, EntityType.GlossaryTerm);
+        expect(parentNode).toBe(ROOT_TERMS);
+    });
+
+    it('should return ROOT_NODES for glossary node', () => {
+        expect(getGlossaryRootToUpdate(EntityType.GlossaryNode)).toBe(ROOT_NODES);
+    });
+
+    it('should return ROOT_TERMS for glossary term', () => {
+        expect(getGlossaryRootToUpdate(EntityType.GlossaryTerm)).toBe(ROOT_TERMS);
+    });
+
+    it('should return updateGlossarySidebar for glossary', () => {
+        const parentNodesToUpdate = ['sampleParentNode1', 'sampleParentNode2'];
+        const urnsToUpdate = ['urnsSample1'];
+        const setUrnsToUpdate = vi.fn();
+        updateGlossarySidebar(parentNodesToUpdate, urnsToUpdate, setUrnsToUpdate);
+        expect(setUrnsToUpdate).toHaveBeenCalledWith([...urnsToUpdate, ...parentNodesToUpdate]);
+    });
+});
diff --git a/datahub-web-react/src/app/glossaryV2/cacheUtils.ts b/datahub-web-react/src/app/glossaryV2/cacheUtils.ts
new file mode 100644
index 00000000000000..f70901bf71f2f0
--- /dev/null
+++ b/datahub-web-react/src/app/glossaryV2/cacheUtils.ts
@@ -0,0 +1,36 @@
+import { ApolloClient } from '@apollo/client';
+import { GetGlossaryNodeDocument, GetGlossaryNodeQuery } from '../../graphql/glossaryNode.generated';
+
+export function removeTermFromGlossaryNode(
+    client: ApolloClient<object>,
+    glossaryNodeUrn: string,
+    glossaryTermUrn: string,
+) {
+    // Read the data from our cache for this query.
+    const currData: GetGlossaryNodeQuery | null = client.readQuery({
+        query: GetGlossaryNodeDocument,
+        variables: { urn: glossaryNodeUrn },
+    });
+
+    // Remove the term from the existing children set.
+    const newTermChildren = {
+        relationships: [
+            ...(currData?.glossaryNode?.children?.relationships || []).filter(
+                (relationship) => relationship.entity?.urn !== glossaryTermUrn,
+            ),
+        ],
+        total: (currData?.glossaryNode?.children?.total || 1) - 1,
+    };
+
+    // Write our data back to the cache.
+    client.writeQuery({
+        query: GetGlossaryNodeDocument,
+        variables: { urn: glossaryNodeUrn },
+        data: {
+            glossaryNode: {
+                ...currData?.glossaryNode,
+                children: newTermChildren,
+            },
+        },
+    });
+}
diff --git a/datahub-web-react/src/app/glossaryV2/colorUtils.ts b/datahub-web-react/src/app/glossaryV2/colorUtils.ts
new file mode 100644
index 00000000000000..71b2216b22f9e2
--- /dev/null
+++ b/datahub-web-react/src/app/glossaryV2/colorUtils.ts
@@ -0,0 +1,30 @@
+export const GlossaryV2PaletteColors = {
+    PASTEL_LAVENDER: '#9386E2',
+    PURPLE: '#9254DE',
+    LIGHT_BLUE: '#85A5FF',
+    BLUE: '#378BF2',
+    FRESH_TEAL: '#40B0A9',
+    GREEN: '#5EAA32',
+    GREENISH_LIME: '#9BB832',
+    LIGHT_ORANGE: '#D8A42C',
+    PASTEL_MUSTARD: '#E1AF63',
+    ORANGE: '#E5993E',
+    PEACH_ORANGE: '#E58356',
+    RED: '#C06F6F',
+    PASTEL_MAGENTA: '#D885AD',
+    COLD_GREY: '#81879F',
+};
+
+const getStringHash = (str: string) => {
+    let hash = 0;
+    for (let i = 0; i < str.length; i++) {
+        /* eslint-disable no-bitwise */
+        hash = str.charCodeAt(i) + ((hash << 5) - hash);
+    }
+    return hash;
+};
+
+export const generateColorFromPalette = (text: string) => {
+    const colorIndex = Math.abs(getStringHash(text)) % Object.values(GlossaryV2PaletteColors).length;
+    return Object.values(GlossaryV2PaletteColors)[colorIndex];
+};
diff --git a/datahub-web-react/src/app/glossaryV2/utils.ts b/datahub-web-react/src/app/glossaryV2/utils.ts
new file mode 100644
index 00000000000000..9b09d2cdf35a6e
--- /dev/null
+++ b/datahub-web-react/src/app/glossaryV2/utils.ts
@@ -0,0 +1,27 @@
+import { EntityType } from '../../types.generated';
+import { GenericEntityProperties } from '../entity/shared/types';
+
+export const ROOT_NODES = 'rootNodes';
+export const ROOT_TERMS = 'rootTerms';
+
+export function getGlossaryRootToUpdate(entityType: EntityType) {
+    return entityType === EntityType.GlossaryTerm ? ROOT_TERMS : ROOT_NODES;
+}
+
+// Get the urns or special constants for root nodes or terms (above) that need to be refreshed in the Glossary
+// sidebar when making updates (edit name, create term/term group, delete term/term group, move entity)
+export function getParentNodeToUpdate(entityData: GenericEntityProperties | null, entityType: EntityType) {
+    return entityData?.parentNodes?.nodes?.length
+        ? entityData?.parentNodes?.nodes[0]?.urn
+        : getGlossaryRootToUpdate(entityType);
+}
+
+// Add the parent nodes that need to refetch from the glossary sidebar to `urnsToUpdate` state.
+// This could also include ROOT_NODES or ROOT_TERMS if the item(s) that need updating don't have parents.
+export function updateGlossarySidebar(
+    parentNodesToUpdate: string[],
+    urnsToUpdate: string[],
+    setUrnsToUpdate: (updatdUrns: string[]) => void,
+) {
+    setUrnsToUpdate([...urnsToUpdate, ...parentNodesToUpdate]);
+}
diff --git a/datahub-web-react/src/app/govern/structuredProperties/StructuredProperties.tsx b/datahub-web-react/src/app/govern/structuredProperties/StructuredProperties.tsx
index ef1c495e0efa9e..06d610a8162e30 100644
--- a/datahub-web-react/src/app/govern/structuredProperties/StructuredProperties.tsx
+++ b/datahub-web-react/src/app/govern/structuredProperties/StructuredProperties.tsx
@@ -1,6 +1,7 @@
 import { Button, PageTitle, SearchBar, Tooltip } from '@components';
 import analytics, { EventType } from '@src/app/analytics';
 import { useUserContext } from '@src/app/context/useUserContext';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
 import { useGetSearchResultsForMultipleQuery } from '@src/graphql/search.generated';
 import { EntityType, SearchResult, StructuredPropertyEntity } from '@src/types.generated';
 import React, { useState } from 'react';
@@ -10,6 +11,7 @@ import { ButtonContainer, HeaderContainer, HeaderContent, PageContainer, TableCo
 import ViewStructuredPropsDrawer from './ViewStructuredPropsDrawer';
 
 const StructuredProperties = () => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
     const [searchQuery, setSearchQuery] = useState<string>('');
     const [isDrawerOpen, setIsDrawerOpen] = useState<boolean>(false);
     const [isViewDrawerOpen, setIsViewDrawerOpen] = useState<boolean>(false);
@@ -44,7 +46,7 @@ const StructuredProperties = () => {
     )?.entity;
 
     return (
-        <PageContainer>
+        <PageContainer $isShowNavBarRedesign={isShowNavBarRedesign}>
             <HeaderContainer>
                 <HeaderContent>
                     <PageTitle
diff --git a/datahub-web-react/src/app/home/HomePagePosts.tsx b/datahub-web-react/src/app/home/HomePagePosts.tsx
index a969f55ed5c297..c3d3d4344b9d15 100644
--- a/datahub-web-react/src/app/home/HomePagePosts.tsx
+++ b/datahub-web-react/src/app/home/HomePagePosts.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { Divider, Typography } from 'antd';
 import styled from 'styled-components/macro';
+import { getHomePagePostsFilters } from '@app/utils/queryUtils';
 import { useListPostsQuery } from '../../graphql/post.generated';
 import { Post, PostContentType } from '../../types.generated';
 import { PostTextCard } from '../search/PostTextCard';
@@ -47,6 +48,7 @@ export const HomePagePosts = () => {
             input: {
                 start: 0,
                 count: 10,
+                orFilters: getHomePagePostsFilters(),
             },
         },
         fetchPolicy: 'cache-first',
diff --git a/datahub-web-react/src/app/homeV2/HomePage.tsx b/datahub-web-react/src/app/homeV2/HomePage.tsx
new file mode 100644
index 00000000000000..71fc87194d6da2
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/HomePage.tsx
@@ -0,0 +1,73 @@
+import React, { useEffect } from 'react';
+import styled from 'styled-components';
+import analytics, { EventType } from '../analytics';
+import {
+    GLOBAL_WELCOME_TO_ACRYL_ID,
+    V2_HOME_PAGE_MOST_POPULAR_ID,
+    V2_SEARCH_BAR_ID,
+    V2_SEARCH_BAR_VIEWS,
+    V2_HOME_PAGE_DISCOVER_ID,
+    V2_HOME_PAGE_PERSONAL_SIDEBAR_ID,
+    V2_HOME_PAGE_PENDING_TASKS_ID,
+    V2_HOME_PAGE_ANNOUNCEMENTS_ID,
+} from '../onboarding/configV2/HomePageOnboardingConfig';
+import { OnboardingTour } from '../onboarding/OnboardingTour';
+import { HOME_PAGE_DOMAINS_ID, HOME_PAGE_PLATFORMS_ID } from '../onboarding/config/HomePageOnboardingConfig';
+import { LeftSidebar } from './layout/LeftSidebar';
+import { CenterContent } from './layout/CenterContent';
+import { RightSidebar } from './layout/RightSidebar';
+import { useRedirectToIntroduceYourself } from './introduce/useRedirectToIntroduceYourself';
+import { SearchablePage } from '../searchV2/SearchablePage';
+import PersonalizationLoadingModal from './persona/PersonalizationLoadingModal';
+import { useShowNavBarRedesign } from '../useShowNavBarRedesign';
+import { NavBarStateType, useNavBarContext } from './layout/navBarRedesign/NavBarContext';
+
+const Container = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    flex: 1;
+    display: flex;
+    overflow: hidden;
+    ${(props) => props.$isShowNavBarRedesign && 'gap: 6px;'}
+`;
+
+export const HomePage = () => {
+    useRedirectToIntroduceYourself();
+
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    const { setDefaultNavBarState } = useNavBarContext();
+
+    useEffect(() => {
+        analytics.event({ type: EventType.HomePageViewEvent });
+    }, []);
+
+    useEffect(() => {
+        setDefaultNavBarState(NavBarStateType.Opened);
+        return () => setDefaultNavBarState(NavBarStateType.Collapsed);
+    });
+
+    return (
+        <>
+            <OnboardingTour
+                stepIds={[
+                    GLOBAL_WELCOME_TO_ACRYL_ID,
+                    V2_HOME_PAGE_PERSONAL_SIDEBAR_ID,
+                    V2_SEARCH_BAR_ID,
+                    V2_SEARCH_BAR_VIEWS,
+                    V2_HOME_PAGE_DISCOVER_ID,
+                    V2_HOME_PAGE_ANNOUNCEMENTS_ID,
+                    HOME_PAGE_DOMAINS_ID,
+                    V2_HOME_PAGE_MOST_POPULAR_ID,
+                    HOME_PAGE_PLATFORMS_ID,
+                    V2_HOME_PAGE_PENDING_TASKS_ID,
+                ]}
+            />
+            <SearchablePage>
+                <Container data-testid="home-page-content-container" $isShowNavBarRedesign={isShowNavBarRedesign}>
+                    <LeftSidebar />
+                    <CenterContent />
+                    <RightSidebar />
+                </Container>
+            </SearchablePage>
+            <PersonalizationLoadingModal />
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/action/announcement/Announcement.tsx b/datahub-web-react/src/app/homeV2/action/announcement/Announcement.tsx
new file mode 100644
index 00000000000000..a17d56e81de90f
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/action/announcement/Announcement.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { ANTD_GRAY } from '../../../entityV2/shared/constants';
+import { Post } from '../../../../types.generated';
+import { Editor } from '../../../entityV2/shared/tabs/Documentation/components/editor/Editor';
+import { toRelativeTimeString } from '../../../shared/time/timeUtils';
+
+const Content = styled.div`
+    max-height: 368px;
+    overflow: auto;
+    /* Hide scrollbar for Chrome, Safari, and Opera */
+    &::-webkit-scrollbar {
+        display: none;
+    }
+`;
+
+const Text = styled.div`
+    display: flex;
+    justify-content: center;
+    align-items: start;
+    flex-direction: column;
+    padding: 0px;
+    &&&&& .remirror-editor.ProseMirror {
+        padding: 0px;
+    }
+`;
+
+const Title = styled.div`
+    font-size: 20px;
+    word-break: break-word;
+    margin-bottom: 10px;
+    font-weight: 600;
+`;
+
+const Time = styled.div`
+    font-size: 12px;
+    color: ${ANTD_GRAY[7]};
+`;
+
+type Props = {
+    announcement: Post;
+};
+
+export const Announcement = ({ announcement }: Props) => {
+    const timestamp = announcement?.lastModified?.time;
+    return (
+        <Content>
+            <Text>
+                <Title>{announcement?.content?.title}</Title>
+                <Editor className="test-editor" content={announcement?.content?.description || ''} readOnly />
+                {timestamp && <Time>{toRelativeTimeString(timestamp)}</Time>}
+            </Text>
+        </Content>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/action/announcement/Announcements.tsx b/datahub-web-react/src/app/homeV2/action/announcement/Announcements.tsx
new file mode 100644
index 00000000000000..1d06d26d728063
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/action/announcement/Announcements.tsx
@@ -0,0 +1,130 @@
+import React, { useContext, useEffect, useState } from 'react';
+import styled from 'styled-components';
+import { Carousel, Button } from 'antd';
+import { Tooltip } from '@components';
+import { NotificationOutlined, CloseOutlined } from '@ant-design/icons';
+import AnnouncementsSkeleton from '../../content/tabs/announcements/AnnouncementsSkeleton';
+import { Announcement } from './Announcement';
+import { ANTD_GRAY } from '../../../entity/shared/constants';
+import { useUserContext } from '../../../context/useUserContext';
+import { useUpdateLastViewedAnnouncementTime } from '../../shared/updateLastViewedAnnouncementTime';
+import { useGetUnseenAnnouncements } from './useGetUnseenAnnouncements';
+import OnboardingContext from '../../../onboarding/OnboardingContext';
+
+const Card = styled.div`
+    border: 1px solid ${ANTD_GRAY[4]};
+    border-radius: 11px;
+    background-color: #ffffff;
+    overflow: hidden;
+    padding: 16px 20px 8px 20px;
+    width: 380px;
+`;
+
+const Header = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+`;
+
+const Title = styled.div`
+    font-weight: 600;
+    font-size: 14px;
+    color: #434863;
+    display: flex;
+    align-items: center;
+    justify-content: start;
+`;
+
+const Icon = styled(NotificationOutlined)`
+    margin-right: 8px;
+    color: #3cb47a;
+    font-size: 16px;
+`;
+
+const StyledCloseOutlined = styled(CloseOutlined)`
+    color: ${ANTD_GRAY[8]};
+    font-size: 12px;
+`;
+
+const StyledCarousel = styled(Carousel)`
+    padding: 12px 0px 20px 0px;
+    font-weight: 600;
+    font-size: 14px;
+    overflow: hidden;
+
+    > .slick-dots li button {
+        background-color: #d9d9d9;
+    }
+
+    > .slick-dots li.slick-active button {
+        background-color: #5c3fd1;
+    }
+`;
+
+const CloseButton = styled(Button)`
+    margin: 0px;
+    padding: 2px;
+`;
+
+type Props = {
+    setHasAnnouncements?: (value: boolean) => void;
+};
+
+export const Announcements = ({ setHasAnnouncements }: Props) => {
+    const { user } = useUserContext();
+    const { announcements, loading } = useGetUnseenAnnouncements();
+    const { updateLastViewedAnnouncementTime } = useUpdateLastViewedAnnouncementTime();
+
+    const { isUserInitializing } = useContext(OnboardingContext);
+
+    const sortedAnnouncements = announcements.sort((a, b) => {
+        return b?.lastModified?.time - a?.lastModified?.time;
+    });
+
+    const [hidden, setHidden] = useState(false);
+
+    const hideAnnouncements = () => {
+        if (!user?.urn) return;
+        updateLastViewedAnnouncementTime(user?.urn);
+        setHidden(true);
+    };
+
+    useEffect(() => {
+        setHasAnnouncements?.(!hidden && !!sortedAnnouncements.length);
+    }, [setHasAnnouncements, hidden, sortedAnnouncements.length]);
+
+    if (hidden || !sortedAnnouncements.length) {
+        return null;
+    }
+
+    if (isUserInitializing || loading) {
+        return (
+            <Card>
+                <AnnouncementsSkeleton />
+            </Card>
+        );
+    }
+
+    return (
+        <Card>
+            <Header>
+                <Title>
+                    <Icon /> Announcements
+                </Title>
+                <Tooltip placement="left" showArrow={false} title="Hide announcements">
+                    <CloseButton type="text" onClick={hideAnnouncements}>
+                        <StyledCloseOutlined />
+                    </CloseButton>
+                </Tooltip>
+            </Header>
+            <StyledCarousel autoplaySpeed={8000} autoplay>
+                {sortedAnnouncements.map((announcement) => (
+                    <Announcement
+                        key={`${announcement.content.title}-${announcement.content.description}`}
+                        announcement={announcement}
+                    />
+                ))}
+            </StyledCarousel>
+        </Card>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/action/announcement/useGetUnseenAnnouncements.tsx b/datahub-web-react/src/app/homeV2/action/announcement/useGetUnseenAnnouncements.tsx
new file mode 100644
index 00000000000000..752170453ba672
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/action/announcement/useGetUnseenAnnouncements.tsx
@@ -0,0 +1,32 @@
+import { getHomePagePostsFilters } from '@app/utils/queryUtils';
+import { useListPostsQuery } from '../../../../graphql/post.generated';
+import { Post, PostContentType, PostType } from '../../../../types.generated';
+import { useGetLastViewedAnnouncementTime } from '../../shared/useGetLastViewedAnnouncementTime';
+import { hasViewedAnnouncement } from '../../shared/utils';
+
+export const useGetUnseenAnnouncements = () => {
+    const { time: lastViewedAnnouncementsTime } = useGetLastViewedAnnouncementTime();
+    const {
+        data: postsData,
+        loading,
+        error,
+    } = useListPostsQuery({
+        variables: {
+            input: {
+                start: 0,
+                count: 30,
+                orFilters: getHomePagePostsFilters(),
+            },
+        },
+        fetchPolicy: 'cache-first',
+    });
+
+    const announcements: Post[] =
+        postsData?.listPosts?.posts
+            .filter((post) => post.postType === PostType.HomePageAnnouncement)
+            .filter((post) => post.content.contentType === PostContentType.Text)
+            .filter((post) => !hasViewedAnnouncement(lastViewedAnnouncementsTime, post.lastModified?.time))
+            .map((post) => post as Post) || [];
+
+    return { announcements, loading, error };
+};
diff --git a/datahub-web-react/src/app/homeV2/action/learn/Resources.tsx b/datahub-web-react/src/app/homeV2/action/learn/Resources.tsx
new file mode 100644
index 00000000000000..fbcd1fc17b66bf
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/action/learn/Resources.tsx
@@ -0,0 +1,198 @@
+import React, { useContext } from 'react';
+import { Col, Row, Skeleton } from 'antd';
+import styled from 'styled-components';
+import { ApiOutlined } from '@ant-design/icons';
+import AutoStoriesOutlinedIcon from '@mui/icons-material/AutoStoriesOutlined';
+import { HelpCenterOutlined, OndemandVideoOutlined } from '@mui/icons-material';
+import { BookmarkSimple } from '@phosphor-icons/react';
+import { ANTD_GRAY } from '../../../entity/shared/constants';
+import { PersonaType } from '../../shared/types';
+import { useUserPersona } from '../../persona/useUserPersona';
+import { useAppConfig } from '../../../useAppConfig';
+import OnboardingContext from '../../../onboarding/OnboardingContext';
+
+const Header = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    margin: 8px 0px 20px 0px;
+`;
+
+const Title = styled.div`
+    font-weight: 600;
+    font-size: 14px;
+    color: #434863;
+    word-break: break-word;
+    display: flex;
+    align-items: center;
+`;
+
+const Icon = styled(BookmarkSimple)`
+    margin-right: 8px;
+    color: #9884d4;
+    font-size: 16px;
+`;
+
+const Section = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+    padding: 12px 0px;
+`;
+
+const Card = styled.div`
+    border: 1px solid ${ANTD_GRAY[4]};
+    border-radius: 8px;
+    background-color: #ffffff;
+    overflow: hidden;
+    padding: 12px 20px 20px 20px;
+`;
+
+const ResourceLink = styled.a`
+    color: ${ANTD_GRAY[8]};
+    padding: 0px 16px;
+    font-size: 14px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    opacity: 0.9;
+    transition: transform 0.3s ease, color 0.3s ease, opacity 0.3s ease;
+    :hover {
+        transform: scale(1.05); // Slightly scale up the link on hover
+        opacity: 1;
+        color: #9884d4;
+        text-decoration: underline;
+    }
+`;
+
+const ResourceTitle = styled.div`
+    margin-top: 8px;
+    color: ${ANTD_GRAY[7]};
+    text-align: center;
+    opacity: 0.9;
+    :hover {
+        opacity: 1;
+        color: #9884d4;
+        text-decoration: underline;
+    }
+`;
+
+const Container = styled(Row)`
+    display: flex;
+    flex-direction: column;
+    justify-content: start;
+    gap: 8px;
+    margin: 12px 0;
+    width: 100%;
+`;
+
+const SkeletonCol = styled(Col)`
+    margin-bottom: 5px;
+    display: flex;
+    align-items: center;
+    gap: 1rem;
+`;
+const SkeletonButton = styled(Skeleton.Button)<{ width?: string }>`
+    &&& {
+        width: ${(props) => (props.width ? props.width : '100%')};
+        border-radius: 4px;
+        height: 63px;
+    }
+`;
+
+const ALL_GUIDES = [
+    {
+        id: 'integrations',
+        title: 'Connect Sources',
+        url: 'https://datahubproject.io/docs/ui-ingestion',
+        icon: ApiOutlined,
+        personas: [PersonaType.TECHNICAL_USER, PersonaType.DATA_ENGINEER],
+    },
+    {
+        id: 'features',
+        title: 'Feature Guides',
+        url: 'https://datahubproject.io/docs/category/features?utm_source=acryl_datahub_app',
+        icon: HelpCenterOutlined,
+        personas: [
+            PersonaType.TECHNICAL_USER,
+            PersonaType.BUSINESS_USER,
+            PersonaType.DATA_STEWARD,
+            PersonaType.DATA_ENGINEER,
+            PersonaType.DATA_LEADER,
+        ],
+    },
+    {
+        id: 'tutorials',
+        title: 'How-To Tutorials',
+        url: 'https://youtube.com/playlist?list=PLdCtLs64vZvErAXMiqUYH9e63wyDaMBgg&utm_source=acryl_datahub_app&utm_content=tutorials',
+        icon: OndemandVideoOutlined,
+        personas: [PersonaType.TECHNICAL_USER, PersonaType.DATA_ENGINEER, PersonaType.DATA_STEWARD],
+    },
+    {
+        id: 'case-studies',
+        title: 'Case Studies',
+        url: 'https://www.acryldata.io/customer-stories?utm_source=acryl_datahub_app&utm_content=case_studies',
+        icon: OndemandVideoOutlined,
+        personas: [PersonaType.BUSINESS_USER, PersonaType.DATA_LEADER],
+    },
+    {
+        id: 'blog',
+        title: 'Subscribe to the Blog',
+        url: 'https://www.acryldata.io/blog?utm_source=acryl_datahub_app&utm_content=blog',
+        icon: AutoStoriesOutlinedIcon,
+        personas: [
+            PersonaType.TECHNICAL_USER,
+            PersonaType.DATA_ENGINEER,
+            PersonaType.BUSINESS_USER,
+            PersonaType.DATA_STEWARD,
+            PersonaType.DATA_LEADER,
+        ],
+    },
+];
+
+export const Resources = () => {
+    const currentUserPersona = useUserPersona();
+    const selectedGuides = ALL_GUIDES.filter(
+        (guide) => !guide.personas || guide.personas.includes(currentUserPersona),
+    ).slice(0, 3);
+    const appConfig = useAppConfig();
+    const { isUserInitializing } = useContext(OnboardingContext);
+
+    if (isUserInitializing || !appConfig.loaded) {
+        return (
+            <Card>
+                <Container>
+                    <SkeletonCol>
+                        <Skeleton.Avatar active size="small" shape="circle" />
+                        <SkeletonButton active size="small" shape="square" block width="10rem" />
+                    </SkeletonCol>
+                    <SkeletonCol>
+                        <SkeletonButton active size="small" shape="square" block />
+                        <SkeletonButton active size="small" shape="square" block />
+                        <SkeletonButton active size="small" shape="square" block />
+                    </SkeletonCol>
+                </Container>
+            </Card>
+        );
+    }
+
+    if (!selectedGuides.length) return null;
+    return (
+        <Card>
+            <Header>
+                <Title>
+                    <Icon /> Resources
+                </Title>
+            </Header>
+            <Section>
+                {selectedGuides.map((guide) => (
+                    <ResourceLink target="_blank" rel="noreferrer noopener" href={guide.url} key={guide.title}>
+                        <guide.icon style={{ fontSize: 16, width: 18, height: 18 }} />
+                        <ResourceTitle>{guide.title}</ResourceTitle>
+                    </ResourceLink>
+                ))}
+            </Section>
+        </Card>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/action/nudge/Domains.tsx b/datahub-web-react/src/app/homeV2/action/nudge/Domains.tsx
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/datahub-web-react/src/app/homeV2/action/nudge/Glossary.tsx b/datahub-web-react/src/app/homeV2/action/nudge/Glossary.tsx
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/datahub-web-react/src/app/homeV2/action/nudge/Ingestion.tsx b/datahub-web-react/src/app/homeV2/action/nudge/Ingestion.tsx
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/datahub-web-react/src/app/homeV2/action/nudge/MetadataTests.tsx b/datahub-web-react/src/app/homeV2/action/nudge/MetadataTests.tsx
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/datahub-web-react/src/app/homeV2/action/nudge/UserProfile.tsx b/datahub-web-react/src/app/homeV2/action/nudge/UserProfile.tsx
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/datahub-web-react/src/app/homeV2/content/HorizontalListSkeletons.tsx b/datahub-web-react/src/app/homeV2/content/HorizontalListSkeletons.tsx
new file mode 100644
index 00000000000000..c2e0aef93c6ccb
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/HorizontalListSkeletons.tsx
@@ -0,0 +1,69 @@
+import { Skeleton } from 'antd';
+import { SkeletonButtonProps } from 'antd/lib/skeleton/Button';
+import React from 'react';
+import styled from 'styled-components';
+
+const SkeletonContainer = styled.div`
+    && {
+        display: flex;
+        flex-direction: column;
+
+        .ant-skeleton-button-sm {
+            border-radius: 4px;
+        }
+    }
+`;
+
+const SectionHeader = styled.div`
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 12px;
+
+    .ant-skeleton {
+        width: auto;
+    }
+
+    .ant-skeleton-button {
+        height: 100%;
+        border-radius: 12px;
+        background-color: #f8f9fa;
+    }
+`;
+
+const HorizontalList = styled.div`
+    display: flex;
+    margin-bottom: 12px;
+    gap: 12px;
+    flex-wrap: nowrap;
+    overflow: hidden;
+`;
+
+const HeaderSkeleton = styled(Skeleton.Button)<{ width?: string }>`
+    &&& {
+        height: 24px;
+        width: ${(props) => props?.width};
+    }
+`;
+
+interface Props {
+    Component: React.FC<SkeletonButtonProps>;
+    showHeader?: boolean;
+    count?: number;
+}
+
+export const HorizontalListSkeletons = ({ Component, showHeader = true, count = 3 }: Props) => {
+    return (
+        <SkeletonContainer>
+            {showHeader && (
+                <SectionHeader>
+                    <HeaderSkeleton active size="small" shape="square" block width="10rem" />
+                </SectionHeader>
+            )}
+            <HorizontalList>
+                {Array.from({ length: count }, (_, index) => (
+                    <Component active shape="square" block key={index} />
+                ))}
+            </HorizontalList>
+        </SkeletonContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/recent/EntityCard.tsx b/datahub-web-react/src/app/homeV2/content/recent/EntityCard.tsx
new file mode 100644
index 00000000000000..dbb6c4be509938
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/recent/EntityCard.tsx
@@ -0,0 +1,106 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import { GenericEntityProperties } from '../../../entity/shared/types';
+import { Entity, EntityType } from '../../../../types.generated';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { getDisplayedEntityType } from '../../../entityV2/shared/containers/profile/header/utils';
+import { ANTD_GRAY } from '../../../entity/shared/constants';
+import { HoverEntityTooltip } from '../../../recommendations/renderer/component/HoverEntityTooltip';
+import { SEARCH_COLORS } from '../../../entityV2/shared/constants';
+import PlatformIcon from '../../../sharedV2/icons/PlatformIcon';
+
+const Container = styled.div`
+    display: flex;
+    flex-direction: row;
+    padding: 10px 12px 10px 12px;
+    background-color: #ffffff;
+    border-radius: 10px;
+    min-width: 200px;
+    max-width: 260px;
+    border: 1.5px solid #0000001a;
+    gap: 12px;
+
+    :hover {
+        border: 1.5px solid ${SEARCH_COLORS.LINK_BLUE};
+    }
+`;
+
+const Name = styled.div`
+    font-size: 14px;
+    color: #565657;
+    margin-bottom: 4px;
+    font-weight: 500;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+`;
+
+const Context = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 8px;
+`;
+
+const SubHeader = styled.div`
+    font-size: 14px;
+    color: ${ANTD_GRAY[5]};
+    margin-top: 4px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+`;
+
+const Type = styled.div`
+    font-size: 14px;
+    color: ${ANTD_GRAY[7]};
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+`;
+
+const Text = styled.div`
+    display: flex;
+    flex-direction: column;
+    max-width: 140px;
+`;
+
+type Props = {
+    entity: Entity;
+    subHeader?: React.ReactNode;
+    render?: (entity: Entity) => React.ReactNode;
+    className?: string;
+};
+
+export const EntityCard = ({ entity, subHeader, render, className }: Props) => {
+    const entityRegistry = useEntityRegistry();
+    const displayName = entityRegistry.getDisplayName(entity?.type as EntityType, entity);
+    const displayType = getDisplayedEntityType(entity, entityRegistry, entity.type);
+
+    const defaultRender = (e: GenericEntityProperties) => {
+        return (
+            <HoverEntityTooltip placement="bottom" entity={entity} showArrow={false}>
+                <Container className={className}>
+                    <Context>
+                        <PlatformIcon
+                            platform={e?.platform}
+                            size={28}
+                            alt={displayName}
+                            entityType={e.type as EntityType}
+                        />
+                    </Context>
+                    <Text>
+                        <Type>{displayType}</Type>
+                        <Name>{displayName}</Name>
+                        {subHeader && <SubHeader>{subHeader}</SubHeader>}
+                    </Text>
+                </Container>
+            </HoverEntityTooltip>
+        );
+    };
+
+    return (
+        <Link to={entityRegistry.getEntityUrl(entity.type, entity.urn)}>
+            {render ? render(entity) : defaultRender(entity)}
+        </Link>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/recent/EntityCardList.tsx b/datahub-web-react/src/app/homeV2/content/recent/EntityCardList.tsx
new file mode 100644
index 00000000000000..0a3465eb6d1259
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/recent/EntityCardList.tsx
@@ -0,0 +1,67 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Tooltip } from '@components';
+import { HorizontalList } from '../../../entityV2/shared/summary/ListComponents';
+import { EntityCard } from './EntityCard';
+import { Entity } from '../../../../types.generated';
+
+const MAX_ASSETS_TO_SHOW = 5;
+
+const Container = styled.div`
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    overflow: hidden;
+`;
+
+const Title = styled.div`
+    color: #403d5c;
+    margin: 0px;
+    font-size: 18px;
+    font-weight: 600;
+`;
+
+const Logo = styled.div`
+    margin-right: 8px;
+    display: flex;
+`;
+
+const Header = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    margin-bottom: 16px;
+`;
+
+type Props = {
+    title: string;
+    logo?: React.ReactNode;
+    tip?: React.ReactNode;
+    entities: Entity[];
+    max?: number;
+};
+
+export const EntityCardList = ({ title, logo, tip, entities, max }: Props) => {
+    if (entities.length === 0) {
+        return null;
+    }
+    const visibleEntities = max ? entities.slice(0, MAX_ASSETS_TO_SHOW) : entities;
+
+    return (
+        <Container>
+            <Header>
+                {logo && <Logo>{logo}</Logo>}
+                <Title>
+                    <Tooltip title={tip} showArrow={false} placement="right">
+                        {title}
+                    </Tooltip>
+                </Title>
+            </Header>
+            <HorizontalList>
+                {visibleEntities.map((entity) => (
+                    <EntityCard key={`${title}-${entity.urn}`} entity={entity} />
+                ))}
+            </HorizontalList>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/recent/RecentActions.tsx b/datahub-web-react/src/app/homeV2/content/recent/RecentActions.tsx
new file mode 100644
index 00000000000000..10f0d39a3202f1
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/recent/RecentActions.tsx
@@ -0,0 +1,51 @@
+import OnboardingContext from '@app/onboarding/OnboardingContext';
+import React, { useContext } from 'react';
+import styled from 'styled-components';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { RecentlyEditedOrViewed } from './RecentlyEditedOrViewed';
+import { useGetRecentActions } from './useGetRecentActions';
+import { useUserContext } from '../../../context/useUserContext';
+
+const Container = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    display: flex;
+    align-items: start;
+    justify-content: start;
+    padding: ${(props) => (props.$isShowNavBarRedesign ? '16px 20px' : '16px 24px 24px 24px')};
+    background-color: #fff;
+
+    ${(props) =>
+        !props.$isShowNavBarRedesign &&
+        `
+        margin-top: 24px;
+        overflow: hidden;
+        border-radius: 10px;
+        border: 1.5px solid #ecf2f9;
+    `}
+
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        border-radius: ${props.theme.styles['border-radius-navbar-redesign']};
+        box-shadow: ${props.theme.styles['box-shadow-navbar-redesign']};
+        margin: 0 5px;
+    `}
+`;
+
+/**
+ * Component for displaying recent actions, e.g. things recently viewed or edited for a given user.
+ */
+export const RecentActions = () => {
+    const { user, loaded } = useUserContext();
+    const { viewed, loading } = useGetRecentActions(user);
+    const { isUserInitializing } = useContext(OnboardingContext);
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+
+    if (!loaded || loading || isUserInitializing) return null;
+    if (!viewed.length) return null;
+
+    return (
+        <Container $isShowNavBarRedesign={isShowNavBarRedesign}>
+            <RecentlyEditedOrViewed entities={viewed} />
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/recent/RecentlyEditedOrViewed.tsx b/datahub-web-react/src/app/homeV2/content/recent/RecentlyEditedOrViewed.tsx
new file mode 100644
index 00000000000000..508aa791a95094
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/recent/RecentlyEditedOrViewed.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+// import styled from 'styled-components';
+// import { BulbTwoTone } from '@ant-design/icons';
+import { Entity } from '../../../../types.generated';
+import { EntityCardList } from './EntityCardList';
+
+// const BULB_COLOR = '#EEAD1C';
+
+// const StyledBulb = styled(BulbTwoTone)`
+//     font-size: 20px;
+// `;
+
+type Props = {
+    entities: Entity[];
+};
+
+// TODO: Decide whether we want the lightbulb or not.
+export const RecentlyEditedOrViewed = ({ entities }: Props) => {
+    return <EntityCardList title="You recently viewed" entities={entities} />;
+};
diff --git a/datahub-web-react/src/app/homeV2/content/recent/constants.ts b/datahub-web-react/src/app/homeV2/content/recent/constants.ts
new file mode 100644
index 00000000000000..adee621ff0a265
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/recent/constants.ts
@@ -0,0 +1,19 @@
+import { EntityType } from '../../../../types.generated';
+
+export const ENTITY_TYPES = [
+    EntityType.Dataset,
+    EntityType.Chart,
+    EntityType.Dashboard,
+    EntityType.DataFlow,
+    EntityType.DataJob,
+    EntityType.Container,
+    EntityType.Domain,
+    EntityType.GlossaryTerm,
+    EntityType.GlossaryNode,
+    EntityType.Notebook,
+    EntityType.Mlfeature,
+    EntityType.MlfeatureTable,
+    EntityType.Mlmodel,
+    EntityType.MlmodelGroup,
+    EntityType.MlprimaryKey,
+];
diff --git a/datahub-web-react/src/app/homeV2/content/recent/useGetRecentActions.tsx b/datahub-web-react/src/app/homeV2/content/recent/useGetRecentActions.tsx
new file mode 100644
index 00000000000000..cf642c20dfb33a
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/recent/useGetRecentActions.tsx
@@ -0,0 +1,46 @@
+import { useListRecommendationsQuery } from '../../../../graphql/recommendations.generated';
+import { CorpUser, Entity, EntityType, ScenarioType } from '../../../../types.generated';
+import { ASSET_ENTITY_TYPES } from '../../../searchV2/utils/constants';
+
+const SUPPORTED_ENTITY_TYPES = [
+    ...ASSET_ENTITY_TYPES,
+    EntityType.Domain,
+    EntityType.GlossaryNode,
+    EntityType.GlossaryTerm,
+];
+
+const RECENTLY_VIEWED_MODULE_ID = 'RecentlyViewedEntities';
+const RECENTLY_EDITED_MODULE_ID = 'RecentlyEditedEntities';
+
+export const useGetRecentActions = (user?: CorpUser | null) => {
+    const { data, loading, error } = useListRecommendationsQuery({
+        variables: {
+            input: {
+                userUrn: user?.urn as string,
+                requestContext: {
+                    scenario: ScenarioType.Home,
+                },
+                limit: 10,
+            },
+        },
+        fetchPolicy: 'cache-first',
+        skip: !user?.urn,
+    });
+
+    const viewedModule = data?.listRecommendations?.modules?.find(
+        (module) => module.moduleId === RECENTLY_VIEWED_MODULE_ID,
+    );
+    const viewed =
+        viewedModule?.content
+            ?.filter((content) => content.entity && SUPPORTED_ENTITY_TYPES.includes(content.entity.type))
+            .map((content) => content.entity) || [];
+    const editedModule = data?.listRecommendations?.modules?.find(
+        (module) => module.moduleId === RECENTLY_EDITED_MODULE_ID,
+    );
+    const edited =
+        editedModule?.content
+            ?.filter((content) => content.entity && SUPPORTED_ENTITY_TYPES.includes(content.entity.type))
+            .map((content) => content.entity) || [];
+
+    return { viewed: viewed as Entity[], edited: edited as Entity[], loading, error };
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/CenterTab.tsx b/datahub-web-react/src/app/homeV2/content/tabs/CenterTab.tsx
new file mode 100644
index 00000000000000..3a66852ed3f1e2
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/CenterTab.tsx
@@ -0,0 +1,63 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { Tooltip } from '@components';
+import { ANTD_GRAY } from '../../../entity/shared/constants';
+import { CountBadge } from './CountBadge';
+
+const Tab = styled.div<{ selected: boolean; disabled: boolean }>`
+    font-size: 14px;
+    line-height: 22px;
+    padding: 10px 16px;
+    border-radius: 6px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    ${(props) => !props.selected && `color: ${ANTD_GRAY[9]};`}
+    ${(props) => props.disabled && `color: ${ANTD_GRAY[6]};`}
+    ${(props) => props.selected && 'background-color: #3F54D1;'}
+    ${(props) => props.selected && 'color: #ffffff;'}
+    ${(props) =>
+        !props.disabled &&
+        `:hover {
+            cursor: pointer;
+            ${!props.selected && 'color: #3F54D1;'}
+        }`}
+`;
+
+const Name = styled.div`
+    font-size: 14px;
+`;
+
+const tabIconStyle = {
+    fontSize: '16px',
+    marginRight: '10px',
+};
+
+type Props = {
+    id?: string;
+    name: string;
+    description?: string;
+    icon?: any;
+    onClick: () => void;
+    selected: boolean;
+    count?: number;
+    disabled?: boolean;
+};
+
+export const CenterTab = ({ id, name, description, icon: Icon, selected, count, disabled = false, onClick }: Props) => {
+    return (
+        <Tooltip title={description} placement="bottom" showArrow={false}>
+            <Tab
+                id={id}
+                key={name}
+                onClick={() => (!disabled ? onClick() : () => null)}
+                selected={selected}
+                disabled={disabled}
+            >
+                {Icon && <Icon style={tabIconStyle} />}
+                <Name>{name}</Name>
+                {(count && <CountBadge count={count} />) || null}
+            </Tab>
+        </Tooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/CenterTabs.tsx b/datahub-web-react/src/app/homeV2/content/tabs/CenterTabs.tsx
new file mode 100644
index 00000000000000..46d214848118d8
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/CenterTabs.tsx
@@ -0,0 +1,93 @@
+import React, { useContext, useState } from 'react';
+import styled from 'styled-components';
+import { Skeleton } from 'antd';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import OnboardingContext from '../../../onboarding/OnboardingContext';
+import { useGetActiveTabs } from './useGetVisibleTabs';
+import { DEFAULT_TAB, TAB_NAME_DETAILS, TabType } from './tabs';
+import { CenterTab } from './CenterTab';
+import { useAppConfig } from '../../../useAppConfig';
+
+const Container = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    flex: 1;
+    border-radius: 8px;
+    padding: 0px 0px 0px 0px;
+    ${(props) => !props.$isShowNavBarRedesign && 'margin-top: 18px;'}
+`;
+
+const Tabs = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    gap: 0px;
+    width: auto;
+    background-color: #ffffff;
+    border-radius: 8px;
+    padding: 1px;
+`;
+
+const Body = styled.div`
+    margin-top: 20px;
+    flex: 1;
+`;
+
+const SkeletonButton = styled(Skeleton.Button)`
+    &&& {
+        width: 100%;
+        height: 44px;
+        border-radius: 8px;
+    }
+`;
+
+export const CenterTabs = () => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    const activeTabs = useGetActiveTabs();
+    const [selectedTab, setSelectedTab] = useState<TabType>(activeTabs[0].type || DEFAULT_TAB);
+    const selectedTabDetails = TAB_NAME_DETAILS.get(selectedTab);
+    const { isUserInitializing } = useContext(OnboardingContext);
+    const { loaded } = useAppConfig();
+
+    if (!selectedTabDetails) return null;
+
+    const TabContent = selectedTabDetails.component;
+
+    const updateSelectedTab = (tab: TabType, onSelectTab?: any) => {
+        setSelectedTab(tab);
+        onSelectTab?.();
+    };
+
+    const showSkeleton = isUserInitializing || !loaded;
+    return (
+        <Container $isShowNavBarRedesign={isShowNavBarRedesign}>
+            {showSkeleton ? (
+                <SkeletonButton shape="square" size="large" active />
+            ) : (
+                <Tabs>
+                    {activeTabs.map((tab) => {
+                        const details = TAB_NAME_DETAILS.get(tab.type);
+                        if (!details) return null;
+
+                        const { name, description, type, icon, id } = details;
+                        const { count, onSelectTab } = tab;
+                        const selected = selectedTab === type;
+                        return (
+                            <CenterTab
+                                id={id}
+                                name={name}
+                                description={description}
+                                icon={icon}
+                                key={type}
+                                selected={selected}
+                                count={count}
+                                onClick={() => updateSelectedTab(type, onSelectTab)}
+                            />
+                        );
+                    })}
+                </Tabs>
+            )}
+            <Body>
+                <TabContent />
+            </Body>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/CountBadge.tsx b/datahub-web-react/src/app/homeV2/content/tabs/CountBadge.tsx
new file mode 100644
index 00000000000000..dbe9e842af6ed9
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/CountBadge.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import styled from 'styled-components';
+
+const DEFAULT_BADGE_COLOR = '#3CB47A';
+
+const Badge = styled.div<{ color: string }>`
+    height: 16px;
+    width: 16px;
+    border-radius: 50%;
+    background-color: ${(props) => props.color};
+    font-size: 10px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #ffffff;
+    margin-left: -4px;
+    margin-top: -12px;
+    border: 1px solid #ffffff;
+`;
+
+type Props = {
+    count: number;
+    color?: string;
+};
+
+export const CountBadge = ({ count, color = DEFAULT_BADGE_COLOR }: Props) => {
+    if (!count) {
+        return null;
+    }
+    return <Badge color={color}>{count}</Badge>;
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/activity/ActivityTab.tsx b/datahub-web-react/src/app/homeV2/content/tabs/activity/ActivityTab.tsx
new file mode 100644
index 00000000000000..a11b466863d47e
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/activity/ActivityTab.tsx
@@ -0,0 +1,5 @@
+import React from 'react';
+
+export const ActivityTab = () => {
+    return <>Activate things here.</>;
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/activity/cards/AssertionResult.tsx b/datahub-web-react/src/app/homeV2/content/tabs/activity/cards/AssertionResult.tsx
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/activity/cards/DocumentationEdit.tsx b/datahub-web-react/src/app/homeV2/content/tabs/activity/cards/DocumentationEdit.tsx
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/activity/cards/DomainCreate.tsx b/datahub-web-react/src/app/homeV2/content/tabs/activity/cards/DomainCreate.tsx
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/activity/cards/IncidentStatus.tsx b/datahub-web-react/src/app/homeV2/content/tabs/activity/cards/IncidentStatus.tsx
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementCard.tsx
new file mode 100644
index 00000000000000..f24b8e9dff2c16
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementCard.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { ANTD_GRAY } from '../../../../entity/shared/constants';
+import { Post } from '../../../../../types.generated';
+import { toRelativeTimeString } from '../../../../shared/time/timeUtils';
+import { Editor } from '../../../../entityV2/shared/tabs/Documentation/components/editor/Editor';
+
+const Card = styled.div`
+    border: 1px solid ${ANTD_GRAY[4]};
+    border-radius: 8px;
+    background-color: #ffffff;
+    overflow: auto;
+`;
+
+const Text = styled.div`
+    display: flex;
+    justify-content: center;
+    align-items: start;
+    flex-direction: column;
+    padding: 20px;
+    &&&&& .remirror-editor.ProseMirror {
+        padding: 0px;
+    }
+`;
+
+const Title = styled.div`
+    font-size: 20px;
+    word-break: break-word;
+    margin-bottom: 10px;
+    font-weight: 600;
+`;
+
+const Time = styled.div`
+    font-size: 12px;
+    color: ${ANTD_GRAY[7]};
+`;
+
+type Props = {
+    announcement: Post;
+};
+
+export const AnnouncementCard = ({ announcement }: Props) => {
+    const timestamp = announcement?.lastModified?.time;
+    return (
+        <Card>
+            <Text>
+                <Title>{announcement?.content?.title}</Title>
+                <Editor className="test-editor" content={announcement?.content?.description || ''} readOnly />
+                {timestamp && <Time>{toRelativeTimeString(timestamp)}</Time>}
+            </Text>
+        </Card>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementsSkeleton.tsx b/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementsSkeleton.tsx
new file mode 100644
index 00000000000000..1302fcb2440a0b
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementsSkeleton.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import { Col, Row, Skeleton } from 'antd';
+import styled from 'styled-components';
+
+const Container = styled(Row)`
+    display: flex;
+    flex-direction: column;
+    justify-content: start;
+    gap: 8px;
+    margin-left: 12px 0px 12px 0px;
+`;
+
+const SkeletonCol = styled(Col)`
+    margin-bottom: 5px;
+    display: flex;
+    align-items: center;
+    gap: 1rem;
+`;
+
+const SkeletonButton = styled(Skeleton.Button)<{ width?: string }>`
+    &&& {
+        width: ${(props) => (props.width ? props.width : '100%')};
+        border-radius: 4px;
+        height: 63px;
+    }
+`;
+
+export default function AnnouncementsSkeleton() {
+    return (
+        <Container>
+            <SkeletonCol>
+                <Skeleton.Avatar active size="small" shape="circle" />
+                <SkeletonButton active size="small" shape="square" block width="10rem" />
+            </SkeletonCol>
+            <SkeletonCol>
+                <SkeletonButton active size="small" shape="square" block />
+            </SkeletonCol>
+            <SkeletonCol>
+                <SkeletonButton active size="small" shape="square" block />
+            </SkeletonCol>
+            <SkeletonCol>
+                <SkeletonButton active size="small" shape="square" block />
+            </SkeletonCol>
+        </Container>
+    );
+}
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementsTab.tsx b/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementsTab.tsx
new file mode 100644
index 00000000000000..4cecb92023dcca
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/announcements/AnnouncementsTab.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import styled from 'styled-components';
+import { useGetAnnouncements } from './useGetAnnouncements';
+import AnnouncementsSkeleton from './AnnouncementsSkeleton';
+import { AnnouncementCard } from './AnnouncementCard';
+import { V2_HOME_PAGE_ANNOUNCEMENTS_ID } from '../../../../onboarding/configV2/HomePageOnboardingConfig';
+import { EmptyAnnouncements } from './EmptyAnnouncements';
+
+const List = styled.div`
+    display: flex;
+    flex-direction: column;
+    padding: 0px 0px 0px 0px;
+    gap: 16px;
+`;
+
+export const AnnouncementsTab = () => {
+    const { announcements, loading } = useGetAnnouncements();
+    const sortedAnnouncements = announcements.sort((a, b) => {
+        return b?.lastModified?.time - a?.lastModified?.time;
+    });
+
+    return (
+        <>
+            {loading && <AnnouncementsSkeleton />}
+            <List id={V2_HOME_PAGE_ANNOUNCEMENTS_ID}>
+                {sortedAnnouncements?.length ? (
+                    sortedAnnouncements.map((announcement) => (
+                        <AnnouncementCard
+                            key={`${announcement.content.title}-${announcement.content.description}`}
+                            announcement={announcement}
+                        />
+                    ))
+                ) : (
+                    <EmptyAnnouncements />
+                )}
+            </List>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/announcements/EmptyAnnouncements.tsx b/datahub-web-react/src/app/homeV2/content/tabs/announcements/EmptyAnnouncements.tsx
new file mode 100644
index 00000000000000..6b4cc815a67118
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/announcements/EmptyAnnouncements.tsx
@@ -0,0 +1,6 @@
+import { Empty } from 'antd';
+import React from 'react';
+
+export const EmptyAnnouncements = () => {
+    return <Empty description="No Announcements Yet!" />;
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/announcements/useGetAnnouncements.tsx b/datahub-web-react/src/app/homeV2/content/tabs/announcements/useGetAnnouncements.tsx
new file mode 100644
index 00000000000000..4ed30830ff811a
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/announcements/useGetAnnouncements.tsx
@@ -0,0 +1,28 @@
+import { getHomePagePostsFilters } from '@app/utils/queryUtils';
+import { useListPostsQuery } from '../../../../../graphql/post.generated';
+import { Post, PostContentType, PostType } from '../../../../../types.generated';
+
+export const useGetAnnouncements = () => {
+    const {
+        data: postsData,
+        loading,
+        error,
+    } = useListPostsQuery({
+        variables: {
+            input: {
+                start: 0,
+                count: 30,
+                orFilters: getHomePagePostsFilters(),
+            },
+        },
+        fetchPolicy: 'cache-first',
+    });
+
+    const announcements: Post[] =
+        postsData?.listPosts?.posts
+            .filter((post) => post.postType === PostType.HomePageAnnouncement)
+            .filter((post) => post.content.contentType === PostContentType.Text)
+            .map((post) => post as Post) || [];
+
+    return { announcements, loading, error };
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/DiscoveryTab.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/DiscoveryTab.tsx
new file mode 100644
index 00000000000000..cf2275351854bc
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/DiscoveryTab.tsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import styled from 'styled-components';
+import { PinnedLinks } from '@src/app/homeV2/reference/sections/pinned/PinnedLinks';
+import { Domains } from './sections/domains/Domains';
+import { DataProducts } from './sections/dataProducts/DataProducts';
+import { Insights } from './sections/insight/Insights';
+import { Platforms } from './sections/platform/Platforms';
+
+const Container = styled.div`
+    display: flex;
+    flex-direction: column;
+    justify-content: start;
+    gap: 8px;
+`;
+
+export const DiscoveryTab = () => {
+    return (
+        <Container>
+            <PinnedLinks hideIfEmpty />
+            <Domains />
+            <DataProducts />
+            <Insights />
+            <Platforms />
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/Section.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/Section.tsx
new file mode 100644
index 00000000000000..e7e14f84c46050
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/Section.tsx
@@ -0,0 +1,61 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { Tooltip } from '@components';
+import { ANTD_GRAY } from '../../../../../entity/shared/constants';
+
+const Header = styled.div`
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+`;
+
+const Title = styled.div`
+    color: #403d5c;
+    margin: 0px;
+    font-size: 18px;
+    font-weight: 600;
+    margin-bottom: 8px;
+`;
+
+const Content = styled.div`
+    margin-bottom: 12px;
+    position: relative;
+    &:hover {
+        .hover-btn {
+            display: flex;
+        }
+    }
+`;
+
+const Action = styled.div`
+    color: ${ANTD_GRAY[8]};
+    font-size: 12px;
+    font-weight: 700;
+    :hover {
+        cursor: pointer;
+        text-decoration: underline;
+    }
+    white-space: nowrap;
+`;
+
+type Props = {
+    title: string;
+    tip?: string;
+    children: React.ReactNode;
+    actionText?: string;
+    onClickAction?: () => void;
+};
+
+export const Section = ({ title, tip, actionText, onClickAction, children }: Props) => {
+    return (
+        <>
+            <Header>
+                <Tooltip title={tip}>
+                    <Title>{title}</Title>
+                </Tooltip>
+                {actionText && <Action onClick={onClickAction}>{actionText}</Action>}
+            </Header>
+            <Content>{children}</Content>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/DataProductCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/DataProductCard.tsx
new file mode 100644
index 00000000000000..35c1c4711d82c1
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/DataProductCard.tsx
@@ -0,0 +1,86 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components/macro';
+import { colors } from '@src/alchemy-components';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { DataProduct, Domain, EntityType } from '../../../../../../../types.generated';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+import { ANTD_GRAY } from '../../../../../../entity/shared/constants';
+import { DomainColoredIcon } from '../../../../../../entityV2/shared/links/DomainColoredIcon';
+import { HoverEntityTooltip } from '../../../../../../recommendations/renderer/component/HoverEntityTooltip';
+import { SEARCH_COLORS } from '../../../../../../entityV2/shared/constants';
+
+const Card = styled(Link)<{ $isShowNavBarRedesign?: boolean }>`
+    border-radius: ${(props) => (props.$isShowNavBarRedesign ? '8px' : '10px')};
+    background-color: #ffffff;
+    padding: 10px 16px;
+    border: ${(props) => (props.$isShowNavBarRedesign ? `1px solid ${colors.gray[100]}` : '2px solid transparent')};
+
+    :hover {
+        border: ${(props) => (props.$isShowNavBarRedesign ? '1px' : '2px')} solid ${SEARCH_COLORS.LINK_BLUE};
+    }
+
+    display: flex;
+    justify-content: start;
+    align-items: center;
+    max-width: 428px;
+`;
+
+const Text = styled.div`
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+`;
+
+const Name = styled.div`
+    font-size: 16px;
+    color: ${ANTD_GRAY[9]};
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    max-width: 150px;
+`;
+
+const Section = styled.div`
+    margin-top: 5px;
+    display: flex;
+    align-items: center;
+    justify-content: start;
+`;
+
+const SectionName = styled.div`
+    font-size: 14px;
+    margin-left: 10px;
+    color: ${ANTD_GRAY[7]};
+    overflow: hidden;
+    text-overflow: ellipsis;
+`;
+
+type Props = {
+    dataProduct: DataProduct;
+    domain: Domain;
+};
+
+export const DataProductCard = ({ dataProduct, domain }: Props) => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    const entityRegistry = useEntityRegistry();
+    const domainName = entityRegistry.getDisplayName(EntityType.Domain, domain);
+
+    return (
+        <HoverEntityTooltip placement="bottom" showArrow={false} entity={dataProduct}>
+            <Card
+                key={dataProduct.urn}
+                to={entityRegistry.getEntityUrl(dataProduct.type, dataProduct.urn)}
+                $isShowNavBarRedesign={isShowNavBarRedesign}
+            >
+                <Text>
+                    <Name>{dataProduct.properties?.name}</Name>
+                    <Section>
+                        <DomainColoredIcon domain={domain} size={26} />
+                        <SectionName>{domainName}</SectionName>
+                    </Section>
+                </Text>
+            </Card>
+        </HoverEntityTooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/DataProducts.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/DataProducts.tsx
new file mode 100644
index 00000000000000..e363e950e6e847
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/DataProducts.tsx
@@ -0,0 +1,43 @@
+import { Skeleton } from 'antd';
+import React from 'react';
+import { useHistory } from 'react-router';
+import styled from 'styled-components';
+import { Section } from '../Section';
+import { DataProductCard } from './DataProductCard';
+import { useGetDataProducts } from './useGetDataProducts';
+import { PageRoutes } from '../../../../../../../conf/Global';
+import { HOME_PAGE_DATA_PRODUCTS_ID } from '../../../../../../onboarding/config/HomePageOnboardingConfig';
+import { Carousel } from '../../../../../../sharedV2/carousel/Carousel';
+import { HorizontalListSkeletons } from '../../../../HorizontalListSkeletons';
+
+const SkeletonCard = styled(Skeleton.Button)<{ width: string }>`
+    &&& {
+        height: 83px;
+        width: 287px;
+    }
+`;
+
+export const DataProducts = () => {
+    const history = useHistory();
+    const { dataProducts, loading } = useGetDataProducts();
+
+    const navigateToDataProducts = () => {
+        history.push(PageRoutes.DATA_PRODUCTS);
+    };
+
+    return (
+        <div id={HOME_PAGE_DATA_PRODUCTS_ID}>
+            {loading && <HorizontalListSkeletons Component={SkeletonCard} />}
+            {!loading && dataProducts && !!dataProducts.length && (
+                <Section title="Data Products" actionText="View all" onClickAction={navigateToDataProducts}>
+                    <Carousel>
+                        {dataProducts.map((item) => {
+                            const { dataProduct, domain } = item;
+                            return <DataProductCard key={dataProduct.urn} dataProduct={dataProduct} domain={domain} />;
+                        })}
+                    </Carousel>
+                </Section>
+            )}
+        </div>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/useGetDataProducts.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/useGetDataProducts.tsx
new file mode 100644
index 00000000000000..bb13adf0543063
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/dataProducts/useGetDataProducts.tsx
@@ -0,0 +1,46 @@
+import { useUserContext } from '@src/app/context/useUserContext';
+import { useGetDataProductsListQuery } from '@src/graphql/dataProduct.generated';
+import { DataProduct, Domain, EntityType } from '../../../../../../../types.generated';
+
+const FETCH_COUNT = 100;
+const sortDataProducts = (a, b) => {
+    return b.dataProduct?.properties?.numAssets - a.dataProduct?.properties?.numAssets;
+};
+
+export const useGetDataProducts = (): {
+    dataProducts: { dataProduct: DataProduct | any; domain: Domain }[];
+    loading: boolean;
+} => {
+    const { localState } = useUserContext();
+    const { selectedViewUrn } = localState;
+
+    const { data, loading } = useGetDataProductsListQuery({
+        variables: {
+            input: {
+                types: [EntityType.DataProduct],
+                query: '*',
+                start: 0,
+                count: FETCH_COUNT,
+                viewUrn: selectedViewUrn,
+            },
+        },
+        fetchPolicy: 'cache-first',
+    });
+
+    const results = data?.searchAcrossEntities?.searchResults || [];
+
+    const dataProducts = results
+        .map((item): { dataProduct: DataProduct; domain: Domain } => {
+            const dataProduct = item.entity as any;
+            const { domain } = dataProduct;
+            return {
+                dataProduct,
+                domain: domain ? domain.domain : null,
+            };
+        })
+        .filter((item) => item.domain)
+        // Sorting based on popularity
+        .sort(sortDataProducts);
+
+    return { dataProducts, loading };
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/DomainCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/DomainCard.tsx
new file mode 100644
index 00000000000000..a2cacf57414874
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/DomainCard.tsx
@@ -0,0 +1,90 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components/macro';
+import { Divider } from 'antd';
+import { colors } from '@src/alchemy-components';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { Domain, EntityType } from '../../../../../../../types.generated';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+import { ANTD_GRAY } from '../../../../../../entity/shared/constants';
+import { formatNumber } from '../../../../../../shared/formatNumber';
+import { DomainColoredIcon } from '../../../../../../entityV2/shared/links/DomainColoredIcon';
+import { HoverEntityTooltip } from '../../../../../../recommendations/renderer/component/HoverEntityTooltip';
+import { SEARCH_COLORS } from '../../../../../../entityV2/shared/constants';
+
+const Card = styled(Link)<{ $isShowNavBarRedesign?: boolean }>`
+    border-radius: ${(props) => (props.$isShowNavBarRedesign ? '8px' : '10px')};
+    background-color: #ffffff;
+    padding: 16px;
+    border: ${(props) => (props.$isShowNavBarRedesign ? `1px solid ${colors.gray[100]}` : '2px solid transparent')};
+
+    :hover {
+        border: ${(props) => (props.$isShowNavBarRedesign ? '1px' : '2px')} solid ${SEARCH_COLORS.LINK_BLUE};
+    }
+
+    display: flex;
+    justify-content: start;
+    align-items: center;
+    max-width: 428px;
+`;
+
+const Text = styled.div`
+    margin-left: 12px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+`;
+
+const Name = styled.div`
+    font-size: 16px;
+    color: ${ANTD_GRAY[9]};
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    max-width: 150px;
+`;
+
+const Counts = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: start;
+`;
+
+const Count = styled.div`
+    font-size: 14px;
+    color: ${ANTD_GRAY[7]};
+    overflow: hidden;
+    text-overflow: ellipsis;
+`;
+
+type Props = {
+    domain: Domain;
+    assetCount: number;
+};
+
+export const DomainCard = ({ domain, assetCount }: Props) => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    const entityRegistry = useEntityRegistry();
+    const name = entityRegistry.getDisplayName(EntityType.Domain, domain);
+    const dataProductCount = (domain as any).dataProducts?.total || 0;
+
+    return (
+        <HoverEntityTooltip placement="bottom" showArrow={false} entity={domain}>
+            <Card
+                key={domain.urn}
+                to={entityRegistry.getEntityUrl(domain.type, domain.urn)}
+                $isShowNavBarRedesign={isShowNavBarRedesign}
+            >
+                <DomainColoredIcon domain={domain} size={46} />
+                <Text>
+                    <Name>{name}</Name>
+                    <Counts>
+                        <Count>{formatNumber(assetCount)} assets</Count>
+                        <Divider type="vertical" />
+                        <Count>{formatNumber(dataProductCount)} data products</Count>
+                    </Counts>
+                </Text>
+            </Card>
+        </HoverEntityTooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/Domains.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/Domains.tsx
new file mode 100644
index 00000000000000..f7c7602742cf13
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/Domains.tsx
@@ -0,0 +1,50 @@
+import { Skeleton } from 'antd';
+import React, { useContext } from 'react';
+import { useHistory } from 'react-router';
+import styled from 'styled-components';
+import { Section } from '../Section';
+import { DomainCard } from './DomainCard';
+import { useGetDomains } from './useGetDomains';
+import { useUserContext } from '../../../../../../context/useUserContext';
+import { PageRoutes } from '../../../../../../../conf/Global';
+import { HOME_PAGE_DOMAINS_ID } from '../../../../../../onboarding/config/HomePageOnboardingConfig';
+import { useUpdateEducationStepsAllowList } from '../../../../../../onboarding/useUpdateEducationStepsAllowList';
+import { Carousel } from '../../../../../../sharedV2/carousel/Carousel';
+import { HorizontalListSkeletons } from '../../../../HorizontalListSkeletons';
+import OnboardingContext from '../../../../../../onboarding/OnboardingContext';
+
+const SkeletonCard = styled(Skeleton.Button)<{ width: string }>`
+    &&& {
+        height: 83px;
+        width: 287px;
+    }
+`;
+
+export const Domains = () => {
+    const history = useHistory();
+    const { user } = useUserContext();
+    const { isUserInitializing } = useContext(OnboardingContext);
+    const { domains, loading } = useGetDomains(user);
+
+    useUpdateEducationStepsAllowList(!!domains.length, HOME_PAGE_DOMAINS_ID);
+
+    const navigateToDomains = () => {
+        history.push(PageRoutes.DOMAINS);
+    };
+
+    const showSkeleton = isUserInitializing || !user || loading;
+    return (
+        <div id={HOME_PAGE_DOMAINS_ID}>
+            {showSkeleton && <HorizontalListSkeletons Component={SkeletonCard} />}
+            {!showSkeleton && !!domains.length && (
+                <Section title="Domains" actionText="View all" onClickAction={navigateToDomains}>
+                    <Carousel>
+                        {domains.map((domain) => (
+                            <DomainCard key={domain.entity.urn} domain={domain.entity} assetCount={domain.assetCount} />
+                        ))}
+                    </Carousel>
+                </Section>
+            )}
+        </div>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/useGetDomains.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/useGetDomains.tsx
new file mode 100644
index 00000000000000..d6c821f95a1715
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/domains/useGetDomains.tsx
@@ -0,0 +1,38 @@
+import { useListRecommendationsQuery } from '../../../../../../../graphql/recommendations.generated';
+import { CorpUser, Domain, ScenarioType } from '../../../../../../../types.generated';
+import { useUserContext } from '../../../../../../context/useUserContext';
+
+const DOMAINS_MODULE_ID = 'Domains';
+const MAX_DOMAINS = 5;
+
+export const useGetDomains = (
+    user?: CorpUser | null,
+): { domains: { entity: Domain; assetCount: number }[]; loading: boolean } => {
+    const { localState } = useUserContext();
+    const { selectedViewUrn } = localState;
+    const { data, loading } = useListRecommendationsQuery({
+        variables: {
+            input: {
+                userUrn: user?.urn as string,
+                requestContext: {
+                    scenario: ScenarioType.Home,
+                },
+                limit: 10,
+                viewUrn: selectedViewUrn,
+            },
+        },
+        fetchPolicy: 'cache-first',
+        skip: !user?.urn,
+    });
+
+    const domainsModule = data?.listRecommendations?.modules?.find((module) => module.moduleId === DOMAINS_MODULE_ID);
+    const domains =
+        domainsModule?.content
+            ?.filter((content) => content.entity)
+            .map((content) => ({
+                entity: content.entity as Domain,
+                assetCount: content.params?.contentParams?.count || 0,
+            }))
+            ?.slice(0, MAX_DOMAINS) || [];
+    return { domains, loading };
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/InsightStatusProvider.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/InsightStatusProvider.tsx
new file mode 100644
index 00000000000000..7954df363d70eb
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/InsightStatusProvider.tsx
@@ -0,0 +1,72 @@
+import React, { createContext, useContext, useEffect, useState } from 'react';
+
+type InsightStatusContextType = {
+    insightStatuses: Map<string, boolean>;
+    registerInsight: (id: string, isPresent: boolean) => void;
+};
+
+const InsightStatusContext = createContext<InsightStatusContextType>({
+    insightStatuses: new Map(),
+    registerInsight: () => null,
+});
+
+export const useInsightStatusContext = () => {
+    return useContext(InsightStatusContext);
+};
+
+export const useRegisterInsight = (id, isPresent) => {
+    // TODO: Determine why this input is changing on each render.
+    const { registerInsight } = useInsightStatusContext();
+
+    useEffect(() => {
+        if (isPresent !== undefined) {
+            // Only register the insight once it's a true or false value, not during loading.
+            registerInsight(id, isPresent);
+        }
+        return () => registerInsight(id, false); // Cleanup
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [id, isPresent]);
+};
+
+/**
+ * Used for insight modules to communicate their status to the parent
+ * Insights coordinator module.
+ */
+export const InsightStatusProvider = ({
+    children,
+    displayedInsightIds,
+}: {
+    children: React.ReactNode;
+    displayedInsightIds: string[];
+}) => {
+    const [insightStatuses, setInsightStatuses] = useState(new Map());
+    const [displayInsights, setDisplayInsights] = useState(true);
+
+    const registerInsight = (id: string, isPresent: boolean) => {
+        setInsightStatuses((prevStatuses) => {
+            const currentIsPresent = prevStatuses.get(id);
+            if (!prevStatuses.has(id) || isPresent !== currentIsPresent) {
+                const newStatuses = new Map(prevStatuses);
+                newStatuses.set(id, isPresent);
+                return newStatuses;
+            }
+            return prevStatuses;
+        });
+    };
+
+    useEffect(() => {
+        // If all insights have been registerd, and all are hidden, we can remove un-render the entire for you section.
+        const allInsightsHidden = displayedInsightIds.every(
+            (id) => insightStatuses.has(id) && !insightStatuses.get(id),
+        );
+        if (allInsightsHidden) {
+            setDisplayInsights(false);
+        }
+    }, [insightStatuses, displayedInsightIds, setDisplayInsights]);
+
+    return (
+        <InsightStatusContext.Provider value={{ insightStatuses, registerInsight }}>
+            {displayInsights ? children : undefined}
+        </InsightStatusContext.Provider>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/Insights.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/Insights.tsx
new file mode 100644
index 00000000000000..f912330a5ebc36
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/Insights.tsx
@@ -0,0 +1,137 @@
+import React, { useContext, useMemo } from 'react';
+import styled from 'styled-components';
+import { useUserContext } from '../../../../../../context/useUserContext';
+import { HOME_PAGE_INSIGHTS_ID } from '../../../../../../onboarding/config/HomePageOnboardingConfig';
+import OnboardingContext from '../../../../../../onboarding/OnboardingContext';
+import HorizontalScroller from '../../../../../../sharedV2/carousel/HorizontalScroller';
+
+import { useUserPersona } from '../../../../../persona/useUserPersona';
+import { PersonaType } from '../../../../../shared/types';
+import { HorizontalListSkeletons } from '../../../../HorizontalListSkeletons';
+import { Section } from '../Section';
+import { INSIGHT_CARD_MIN_WIDTH } from './cards/SearchListInsightCard';
+import { InsightStatusProvider } from './InsightStatusProvider';
+import { MOST_FREQUENTLY_UPDATED_ID, MostFrequentlyUpdated } from './cards/MostFrequentlyUpdated';
+import { MOST_QUERIED_ID, MostQueriedCard } from './cards/MostQueriedCard';
+import { MOST_ROWS_ID, MostRowsCard } from './cards/MostRowsCard';
+import { MOST_USERS_ID, MostUsersCard } from './cards/MostUsersCard';
+import { MOST_VIEWED_DASHBOARDS_ID, MostViewedDashboardsCard } from './cards/MostViewedDashboards';
+import { POPULAR_GLOSSARY_TERMS_ID, PopularGlossaryTerms } from './cards/PopularGlossaryTerms';
+import { RECENTLY_CREATED_DATASETS_ID, RecentlyCreatedDatasetsCard } from './cards/RecentlyCreatedDatasetsCard';
+import { RECENTLY_UPDATED_ID, RecentlyUpdatedDatasetsCard } from './cards/RecentlyUpdatedDatasetsCard';
+import InsightCardSkeleton from './shared/InsightCardSkeleton';
+
+const GAP_PX = 12;
+
+type InsightSection = {
+    id: string;
+    component: React.ComponentType;
+    personas?: PersonaType[];
+};
+
+const ALL_INSIGHTS: InsightSection[] = [
+    {
+        id: MOST_USERS_ID,
+        component: MostUsersCard,
+        personas: [
+            PersonaType.TECHNICAL_USER,
+            PersonaType.DATA_ENGINEER,
+            PersonaType.DATA_STEWARD,
+            PersonaType.DATA_LEADER,
+        ],
+    },
+    {
+        id: MOST_VIEWED_DASHBOARDS_ID,
+        component: MostViewedDashboardsCard,
+        personas: [
+            PersonaType.BUSINESS_USER,
+            PersonaType.DATA_STEWARD,
+            PersonaType.DATA_LEADER,
+            PersonaType.TECHNICAL_USER,
+            PersonaType.DATA_ENGINEER,
+        ],
+    },
+    {
+        id: POPULAR_GLOSSARY_TERMS_ID,
+        component: PopularGlossaryTerms,
+        personas: [
+            PersonaType.TECHNICAL_USER,
+            PersonaType.DATA_ENGINEER,
+            PersonaType.DATA_STEWARD,
+            PersonaType.DATA_LEADER,
+            PersonaType.BUSINESS_USER,
+        ],
+    },
+    {
+        id: MOST_QUERIED_ID,
+        component: MostQueriedCard,
+        personas: [
+            PersonaType.BUSINESS_USER,
+            PersonaType.TECHNICAL_USER,
+            PersonaType.DATA_ENGINEER,
+            PersonaType.DATA_STEWARD,
+            PersonaType.DATA_LEADER,
+        ],
+    },
+    {
+        id: MOST_FREQUENTLY_UPDATED_ID,
+        component: MostFrequentlyUpdated,
+        personas: [
+            PersonaType.TECHNICAL_USER,
+            PersonaType.DATA_ENGINEER,
+            PersonaType.DATA_STEWARD,
+            PersonaType.DATA_LEADER,
+        ],
+    },
+    {
+        id: RECENTLY_UPDATED_ID,
+        component: RecentlyUpdatedDatasetsCard,
+        personas: [PersonaType.TECHNICAL_USER, PersonaType.DATA_ENGINEER],
+    },
+    {
+        id: RECENTLY_CREATED_DATASETS_ID,
+        component: RecentlyCreatedDatasetsCard,
+        personas: [PersonaType.TECHNICAL_USER, PersonaType.DATA_ENGINEER],
+    },
+    {
+        id: MOST_ROWS_ID,
+        component: MostRowsCard,
+        personas: [PersonaType.TECHNICAL_USER, PersonaType.DATA_ENGINEER],
+    },
+];
+
+const StyledCarousel = styled(HorizontalScroller)`
+    display: flex;
+    align-items: stretch;
+    gap: ${GAP_PX}px;
+`;
+
+export const Insights = () => {
+    const { loaded } = useUserContext();
+    const { isUserInitializing } = useContext(OnboardingContext);
+    const currentUserPersona = useUserPersona();
+    const filteredInsights = useMemo(
+        () => ALL_INSIGHTS.filter((section) => !section.personas || section.personas.includes(currentUserPersona)),
+        [currentUserPersona],
+    );
+
+    if (!loaded || isUserInitializing) {
+        return <HorizontalListSkeletons Component={InsightCardSkeleton} />;
+    }
+
+    if (!filteredInsights.length) return null;
+
+    return (
+        <InsightStatusProvider displayedInsightIds={filteredInsights.map((insight) => insight.id)}>
+            <div id={HOME_PAGE_INSIGHTS_ID}>
+                <Section title="For you">
+                    <StyledCarousel scrollDistance={INSIGHT_CARD_MIN_WIDTH + GAP_PX}>
+                        {filteredInsights.map((section) => (
+                            <section.component key={section.id} />
+                        ))}
+                    </StyledCarousel>
+                </Section>
+            </div>
+        </InsightStatusProvider>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/FoundationalAssetsCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/FoundationalAssetsCard.tsx
new file mode 100644
index 00000000000000..3c55c27f2bb004
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/FoundationalAssetsCard.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import { buildFoundationalAssetsFilters, buildFoundationalAssetsSort } from './useGetFoundationalAssets';
+import { SearchListInsightCard } from './SearchListInsightCard';
+import { ASSET_ENTITY_TYPES } from '../../../../../../../searchV2/utils/constants';
+
+export const FoundationalAssetsCard = () => {
+    return (
+        <SearchListInsightCard
+            id="FoundationalAssets"
+            types={[...ASSET_ENTITY_TYPES] as any}
+            title="Foundational Assets"
+            tip="Key data assets for your organization based popularity, freshness, and impact"
+            filters={buildFoundationalAssetsFilters()}
+            sort={buildFoundationalAssetsSort()}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/InsightLoadingCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/InsightLoadingCard.tsx
new file mode 100644
index 00000000000000..28f7a4a3568569
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/InsightLoadingCard.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { Skeleton } from 'antd';
+import styled from 'styled-components';
+
+const Container = styled.div``;
+
+const CardSkeleton = styled(Skeleton.Input)`
+    && {
+        width: 340px;
+        height: 270px;
+        border-radius: 10px;
+    }
+`;
+
+export const InsightLoadingCard = () => {
+    return (
+        <Container>
+            <CardSkeleton active size="large" />
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostFrequentlyUpdated.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostFrequentlyUpdated.tsx
new file mode 100644
index 00000000000000..46dbb1323a8cdb
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostFrequentlyUpdated.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { buildMostUpdatedFilters, buildMostUpdatedSort } from './useGetMostUpdated';
+import { SearchListInsightCard } from './SearchListInsightCard';
+import { EntityType } from '../../../../../../../../types.generated';
+
+export const MOST_FREQUENTLY_UPDATED_ID = 'MostFrequentlyUpdated';
+
+export const MostFrequentlyUpdated = () => {
+    return (
+        <SearchListInsightCard
+            id={MOST_FREQUENTLY_UPDATED_ID}
+            tip="Tables with the most changes in the past month"
+            title="Most Updated"
+            types={[EntityType.Dataset]}
+            filters={buildMostUpdatedFilters()}
+            sort={buildMostUpdatedSort()}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostQueriedCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostQueriedCard.tsx
new file mode 100644
index 00000000000000..621671e18166e0
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostQueriedCard.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { buildMostQueriedFilters, buildMostQueriedSort } from './useGetMostQueried';
+import { SearchListInsightCard } from './SearchListInsightCard';
+import { EntityType } from '../../../../../../../../types.generated';
+
+export const MOST_QUERIED_ID = 'MostQueried';
+
+export const MostQueriedCard = () => {
+    return (
+        <SearchListInsightCard
+            id={MOST_QUERIED_ID}
+            tip="Tables with the most queries in the past month"
+            title="Most Queried"
+            types={[EntityType.Dataset]}
+            filters={buildMostQueriedFilters()}
+            sort={buildMostQueriedSort()}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostRowsCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostRowsCard.tsx
new file mode 100644
index 00000000000000..2ad6d7543227ca
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostRowsCard.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import { SearchListInsightCard } from './SearchListInsightCard';
+import { buildMostRowsFilters, buildMostRowsSort } from './useGetMostRows';
+import { EntityType } from '../../../../../../../../types.generated';
+
+export const MOST_ROWS_ID = 'MostRows';
+
+export const MostRowsCard = () => {
+    return (
+        <SearchListInsightCard
+            id={MOST_ROWS_ID}
+            title="Largest Tables by Rows"
+            types={[EntityType.Dataset]}
+            filters={buildMostRowsFilters()}
+            sort={buildMostRowsSort()}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostUsersCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostUsersCard.tsx
new file mode 100644
index 00000000000000..5f498ac0a38126
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostUsersCard.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { EntityType } from '../../../../../../../../types.generated';
+import { SearchListInsightCard } from './SearchListInsightCard';
+import { buildMostUsersFilters, buildMostUsersSort } from './useGetMostUsers';
+
+export const MOST_USERS_ID = 'MostUsers';
+
+export const MostUsersCard = () => {
+    return (
+        <SearchListInsightCard
+            id={MOST_USERS_ID}
+            tip="Tables with the most unique users in the past month"
+            types={[EntityType.Dataset]}
+            title="Most Popular Tables"
+            filters={buildMostUsersFilters()}
+            sort={buildMostUsersSort()}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostViewedDashboards.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostViewedDashboards.tsx
new file mode 100644
index 00000000000000..2f1d1040ac93bf
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/MostViewedDashboards.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { EntityType } from '../../../../../../../../types.generated';
+import { SearchListInsightCard } from './SearchListInsightCard';
+import { buildMostViewedDashboardsFilter, buildMostViewedDashboardsSort } from './useGetMostViewedDashboards';
+
+export const MOST_VIEWED_DASHBOARDS_ID = 'MostViewedDashboards';
+
+export const MostViewedDashboardsCard = () => {
+    return (
+        <SearchListInsightCard
+            id={MOST_VIEWED_DASHBOARDS_ID}
+            tip="Dashboards with the most views in the past month"
+            types={[EntityType.Dashboard]}
+            title="Most Viewed Dashboards"
+            filters={buildMostViewedDashboardsFilter()}
+            sort={buildMostViewedDashboardsSort()}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/NewAssetsGraphCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/NewAssetsGraphCard.tsx
new file mode 100644
index 00000000000000..81cccda220c03c
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/NewAssetsGraphCard.tsx
@@ -0,0 +1,6 @@
+import React from 'react';
+
+// Ideally these sections are rendered from the backend, and are simply groups of entities.
+export const NewAssetsGraphCard = () => {
+    return <>New Assets</>;
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/PopularGlossaryTerms.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/PopularGlossaryTerms.tsx
new file mode 100644
index 00000000000000..8a8558fe361e81
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/PopularGlossaryTerms.tsx
@@ -0,0 +1,118 @@
+import React, { useContext, useEffect, useMemo, useState } from 'react';
+
+import { Tooltip } from '@components';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import { PageRoutes } from '../../../../../../../../conf/Global';
+import { useListRecommendationsQuery } from '../../../../../../../../graphql/recommendations.generated';
+import { useUserContext } from '../../../../../../../context/useUserContext';
+import { ANTD_GRAY } from '../../../../../../../entity/shared/constants';
+import OnboardingContext from '../../../../../../../onboarding/OnboardingContext';
+import { EntityLinkList } from '../../../../../../reference/sections/EntityLinkList';
+import { RecommendationRenderType, ScenarioType } from '../../../../../../../../types.generated';
+import { useRegisterInsight } from '../InsightStatusProvider';
+import { InsightCard } from '../shared/InsightCard';
+import InsightCardSkeleton from '../shared/InsightCardSkeleton';
+
+const Header = styled.div`
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 12px;
+`;
+
+const Title = styled.div`
+    font-size: 16px;
+    font-weight: bold;
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    color: ${ANTD_GRAY[9]};
+    white-space: nowrap;
+    margin-right: 20px;
+`;
+
+const ShowAll = styled(Link)`
+    color: ${ANTD_GRAY[8]};
+    font-size: 12px;
+    font-weight: 700;
+
+    :hover {
+        cursor: pointer;
+        text-decoration: underline;
+    }
+
+    white-space: nowrap;
+`;
+
+export const POPULAR_GLOSSARY_TERMS_ID = 'PopularGlossaryTerms';
+
+export const PopularGlossaryTerms = () => {
+    const [loaded, setLoaded] = useState(false);
+    const { isUserInitializing } = useContext(OnboardingContext);
+    const userContext = useUserContext();
+    const userUrn = userContext?.user?.urn;
+
+    const { loading, data } = useListRecommendationsQuery({
+        variables: {
+            input: {
+                userUrn: userUrn || '',
+                requestContext: {
+                    scenario: ScenarioType.Home,
+                },
+                limit: 10,
+            },
+        },
+        fetchPolicy: 'no-cache',
+        skip: !userUrn,
+    });
+    const recommendationModules = data?.listRecommendations?.modules;
+    const glossaryRecommendationModules = recommendationModules?.filter(
+        (module) => module.renderType === RecommendationRenderType.GlossaryTermSearchList,
+    );
+    const glossaryRecommendationModule = glossaryRecommendationModules?.[0] || null;
+    const recommendedGlossaryTerms = useMemo(
+        () =>
+            glossaryRecommendationModule?.content
+                ?.map((contentItem) => {
+                    return contentItem?.entity;
+                })
+                ?.slice(0, 5) || [],
+        [glossaryRecommendationModule],
+    );
+
+    useEffect(() => {
+        if (!loading && recommendationModules && !loaded) {
+            setLoaded(true);
+        }
+    }, [loaded, loading, recommendationModules, setLoaded]);
+
+    // Register the insight module with parent component. Important that undefined is used before loading
+    const isPresent = useMemo(
+        () => (loaded ? !!recommendedGlossaryTerms?.length : undefined),
+        [recommendedGlossaryTerms, loaded],
+    );
+    useRegisterInsight(POPULAR_GLOSSARY_TERMS_ID, isPresent);
+
+    const showSkeleton = !userContext.loaded || loading || isUserInitializing;
+    return (
+        <>
+            {showSkeleton && <InsightCardSkeleton />}
+            {!showSkeleton && !!recommendedGlossaryTerms.length && (
+                <InsightCard id={POPULAR_GLOSSARY_TERMS_ID} minWidth={340} maxWidth={500}>
+                    <Header>
+                        <Tooltip title="Commonly used glossary terms" showArrow={false} placement="top">
+                            <Title>Popular Glossary Terms</Title>
+                        </Tooltip>
+                        <ShowAll to={PageRoutes.GLOSSARY}>View all</ShowAll>
+                    </Header>
+                    <EntityLinkList
+                        entities={recommendedGlossaryTerms}
+                        loading={false}
+                        empty={recommendedGlossaryTerms?.length === 0 || 'No assets found'}
+                    />
+                </InsightCard>
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/RecentlyCreatedDatasetsCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/RecentlyCreatedDatasetsCard.tsx
new file mode 100644
index 00000000000000..b5a870f5ed920d
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/RecentlyCreatedDatasetsCard.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { SearchListInsightCard } from './SearchListInsightCard';
+import { EntityType } from '../../../../../../../../types.generated';
+import { buildRecentlyCreatedDatasetsFilters, buildRecentlyCreatedDatasetsSort } from './useRecentlyCreatedDatasets';
+
+const MAX_AGE_DAYS = 14;
+
+export const RECENTLY_CREATED_DATASETS_ID = 'RecentlyCreatedDatasets';
+
+export const RecentlyCreatedDatasetsCard = () => {
+    return (
+        <SearchListInsightCard
+            id={RECENTLY_CREATED_DATASETS_ID}
+            types={[EntityType.Dataset]}
+            tip="Tables created in the last 2 weeks"
+            title="Recently Created Tables"
+            filters={buildRecentlyCreatedDatasetsFilters(MAX_AGE_DAYS)}
+            sort={buildRecentlyCreatedDatasetsSort()}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/RecentlyUpdatedDatasetsCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/RecentlyUpdatedDatasetsCard.tsx
new file mode 100644
index 00000000000000..eae3f73e3cfaf4
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/RecentlyUpdatedDatasetsCard.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { SearchListInsightCard } from './SearchListInsightCard';
+import { EntityType } from '../../../../../../../../types.generated';
+import { buildRecentlyUpdatedDatasetsFilters, buildRecentlyUpdatedDatasetsSort } from './useRecentlyUpdatedDatasets';
+
+const MAX_AGE_DAYS = 14;
+
+export const RECENTLY_UPDATED_ID = 'RecentlyUpdatedDatasets';
+
+export const RecentlyUpdatedDatasetsCard = () => {
+    return (
+        <SearchListInsightCard
+            id={RECENTLY_UPDATED_ID}
+            types={[EntityType.Dataset]}
+            tip="Tables updated in the last 2 weeks"
+            title="Recently Updated Tables"
+            filters={buildRecentlyUpdatedDatasetsFilters(MAX_AGE_DAYS)}
+            sort={buildRecentlyUpdatedDatasetsSort()}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/SearchListInsightCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/SearchListInsightCard.tsx
new file mode 100644
index 00000000000000..edf79bc2e5b058
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/SearchListInsightCard.tsx
@@ -0,0 +1,118 @@
+import React, { useContext, useEffect, useMemo, useState } from 'react';
+import styled from 'styled-components';
+import { Tooltip } from '@components';
+import { InsightCard } from '../shared/InsightCard';
+import { EntityLinkList } from '../../../../../../reference/sections/EntityLinkList';
+import { EmbeddedListSearchModal } from '../../../../../../../entityV2/shared/components/styled/search/EmbeddedListSearchModal';
+import { ANTD_GRAY } from '../../../../../../../entity/shared/constants';
+import { EntityType, SortCriterion } from '../../../../../../../../types.generated';
+import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types';
+import { useGetSearchAssets } from './useGetSearchAssets';
+import { useRegisterInsight } from '../InsightStatusProvider';
+import { useUserContext } from '../../../../../../../context/useUserContext';
+import OnboardingContext from '../../../../../../../onboarding/OnboardingContext';
+import InsightCardSkeleton from '../shared/InsightCardSkeleton';
+
+export const INSIGHT_CARD_MIN_WIDTH = 340;
+
+const Header = styled.div`
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 12px;
+`;
+
+const Title = styled.div`
+    font-size: 16px;
+    font-weight: bold;
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    color: ${ANTD_GRAY[9]};
+    white-space: nowrap;
+    margin-right: 20px;
+`;
+
+const Icon = styled.div`
+    display: flex;
+    margin-right: 8px;
+`;
+
+const ShowAll = styled.div`
+    color: ${ANTD_GRAY[8]};
+    font-size: 12px;
+    font-weight: 700;
+
+    :hover {
+        cursor: pointer;
+        text-decoration: underline;
+    }
+
+    white-space: nowrap;
+`;
+
+type Props = {
+    id: string;
+    title: React.ReactNode;
+    icon?: React.ReactNode;
+    tip?: React.ReactNode;
+    types?: [EntityType];
+    query?: string;
+    filters?: FilterSet;
+    empty?: React.ReactNode;
+    sort?: SortCriterion;
+};
+
+export const SearchListInsightCard = ({ id, title, icon, tip, query, types, filters, sort, empty }: Props) => {
+    const [loaded, setLoaded] = useState(false);
+    const { localState } = useUserContext();
+    const { selectedViewUrn } = localState;
+    const { assets, loading } = useGetSearchAssets(types, query, filters, sort, selectedViewUrn);
+    const [showModal, setShowModal] = useState(false);
+    const { isUserInitializing } = useContext(OnboardingContext);
+
+    useEffect(() => {
+        if (!loading && assets && !loaded) {
+            setLoaded(true);
+        }
+    }, [loaded, loading, assets, setLoaded]);
+
+    // Register the insight module with parent component.
+    const isPresent = useMemo(() => (loaded ? !!assets?.length : undefined), [assets, loaded]);
+    useRegisterInsight(id, isPresent);
+
+    if (loading || isUserInitializing) {
+        return <InsightCardSkeleton />;
+    }
+
+    if (!assets.length) {
+        return null;
+    }
+
+    return (
+        <>
+            <InsightCard id={id} minWidth={INSIGHT_CARD_MIN_WIDTH} maxWidth={500}>
+                <Header>
+                    <Tooltip title={tip} showArrow={false} placement="top">
+                        <Title>
+                            {icon && <Icon>{icon}</Icon>}
+                            {title}
+                        </Title>
+                    </Tooltip>
+                    <ShowAll onClick={() => setShowModal(true)}>View all</ShowAll>
+                </Header>
+                <EntityLinkList entities={assets} loading={false} empty={empty || 'No assets found'} />
+            </InsightCard>
+            {showModal && (
+                <EmbeddedListSearchModal
+                    title={title}
+                    height="80vh"
+                    fixedFilters={filters}
+                    onClose={() => setShowModal(false)}
+                    sort={sort}
+                    entityTypes={types}
+                />
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetFoundationalAssets.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetFoundationalAssets.tsx
new file mode 100644
index 00000000000000..264ab41c902b15
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetFoundationalAssets.tsx
@@ -0,0 +1,35 @@
+import { FilterOperator, SortCriterion, SortOrder } from '../../../../../../../../types.generated';
+import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types';
+import { LAST_MODIFIED_TIME_FIELD } from '../../../../../../../searchV2/context/constants';
+import { UnionType } from '../../../../../../../searchV2/utils/constants';
+
+const FOUNDATIONAL_ASSET_TAGS = ['urn:li:tag:__default_large_table', 'urn:li:tag:__default_high_queries'];
+
+const FOUNDATIONAL_ASSET_EXCLUDE_TAGS = ['urn:li:tag:__default_no_queries', 'urn:li:tag:__default_low_changes'];
+
+export const buildFoundationalAssetsFilters = (): FilterSet => {
+    return {
+        unionType: UnionType.AND,
+        filters: [
+            {
+                field: 'tags',
+                values: FOUNDATIONAL_ASSET_TAGS,
+                condition: FilterOperator.Equal,
+                negated: false,
+            },
+            {
+                field: 'tags',
+                values: FOUNDATIONAL_ASSET_EXCLUDE_TAGS,
+                condition: FilterOperator.Equal,
+                negated: true,
+            },
+        ],
+    };
+};
+
+export const buildFoundationalAssetsSort = (): SortCriterion => {
+    return {
+        field: LAST_MODIFIED_TIME_FIELD,
+        sortOrder: SortOrder.Descending,
+    };
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostQueried.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostQueried.tsx
new file mode 100644
index 00000000000000..5e0a1b01f7710a
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostQueried.tsx
@@ -0,0 +1,26 @@
+import { FilterOperator, SortCriterion, SortOrder } from '../../../../../../../../types.generated';
+import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types';
+import { UnionType } from '../../../../../../../searchV2/utils/constants';
+
+const MIN_QUERIES = '10';
+
+export const buildMostQueriedFilters = (): FilterSet => {
+    return {
+        unionType: UnionType.AND,
+        filters: [
+            {
+                field: 'usageCountLast30DaysFeature',
+                values: [MIN_QUERIES],
+                condition: FilterOperator.GreaterThanOrEqualTo,
+                negated: false,
+            },
+        ],
+    };
+};
+
+export const buildMostQueriedSort = (): SortCriterion => {
+    return {
+        field: 'usageCountLast30DaysFeature',
+        sortOrder: SortOrder.Descending,
+    };
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostRows.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostRows.tsx
new file mode 100644
index 00000000000000..de648ccc00297e
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostRows.tsx
@@ -0,0 +1,26 @@
+import { FilterOperator, SortCriterion, SortOrder } from '../../../../../../../../types.generated';
+import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types';
+import { UnionType } from '../../../../../../../searchV2/utils/constants';
+
+const MIN_ROWS = '100';
+
+export const buildMostRowsFilters = (): FilterSet => {
+    return {
+        unionType: UnionType.AND,
+        filters: [
+            {
+                field: 'rowCount',
+                values: [MIN_ROWS],
+                condition: FilterOperator.GreaterThanOrEqualTo,
+                negated: false,
+            },
+        ],
+    };
+};
+
+export const buildMostRowsSort = (): SortCriterion => {
+    return {
+        field: 'rowCount',
+        sortOrder: SortOrder.Descending,
+    };
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostUpdated.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostUpdated.tsx
new file mode 100644
index 00000000000000..597c3611aca885
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostUpdated.tsx
@@ -0,0 +1,26 @@
+import { FilterOperator, SortCriterion, SortOrder } from '../../../../../../../../types.generated';
+import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types';
+import { UnionType } from '../../../../../../../searchV2/utils/constants';
+
+const MIN_UPDATES = '10';
+
+export const buildMostUpdatedFilters = (): FilterSet => {
+    return {
+        unionType: UnionType.AND,
+        filters: [
+            {
+                field: 'writeCountLast30DaysFeature',
+                values: [MIN_UPDATES],
+                condition: FilterOperator.GreaterThanOrEqualTo,
+                negated: false,
+            },
+        ],
+    };
+};
+
+export const buildMostUpdatedSort = (): SortCriterion => {
+    return {
+        field: 'writeCountLast30DaysFeature',
+        sortOrder: SortOrder.Descending,
+    };
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostUsers.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostUsers.tsx
new file mode 100644
index 00000000000000..358f07644e6f31
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostUsers.tsx
@@ -0,0 +1,26 @@
+import { FilterOperator, SortCriterion, SortOrder } from '../../../../../../../../types.generated';
+import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types';
+import { UnionType } from '../../../../../../../searchV2/utils/constants';
+
+const MIN_USERS = '2';
+
+export const buildMostUsersFilters = (): FilterSet => {
+    return {
+        unionType: UnionType.AND,
+        filters: [
+            {
+                field: 'uniqueUserCountLast30DaysFeature',
+                values: [MIN_USERS],
+                condition: FilterOperator.GreaterThanOrEqualTo,
+                negated: false,
+            },
+        ],
+    };
+};
+
+export const buildMostUsersSort = (): SortCriterion => {
+    return {
+        field: 'uniqueUserCountLast30DaysFeature',
+        sortOrder: SortOrder.Descending,
+    };
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostViewedDashboards.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostViewedDashboards.tsx
new file mode 100644
index 00000000000000..624624ba1ddcfe
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetMostViewedDashboards.tsx
@@ -0,0 +1,26 @@
+import { FilterOperator, SortCriterion, SortOrder } from '../../../../../../../../types.generated';
+import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types';
+import { UnionType } from '../../../../../../../searchV2/utils/constants';
+
+const MIN_QUERIES = '1';
+
+export const buildMostViewedDashboardsFilter = (): FilterSet => {
+    return {
+        unionType: UnionType.AND,
+        filters: [
+            {
+                field: 'viewCountLast30DaysFeature',
+                values: [MIN_QUERIES],
+                condition: FilterOperator.GreaterThanOrEqualTo,
+                negated: false,
+            },
+        ],
+    };
+};
+
+export const buildMostViewedDashboardsSort = (): SortCriterion => {
+    return {
+        field: 'viewCountLast30DaysFeature',
+        sortOrder: SortOrder.Descending,
+    };
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetSearchAssets.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetSearchAssets.tsx
new file mode 100644
index 00000000000000..8155ff7e9a9653
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetSearchAssets.tsx
@@ -0,0 +1,61 @@
+import { useIsShowSeparateSiblingsEnabled } from '@src/app/useAppConfig';
+import { combineSiblingsInSearchResults } from '@src/app/search/utils/combineSiblingsInSearchResults';
+import { useGetSearchResultsForMultipleQuery } from '../../../../../../../../graphql/search.generated';
+import { EntityType, SortCriterion } from '../../../../../../../../types.generated';
+import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types';
+import { UnionType } from '../../../../../../../searchV2/utils/constants';
+
+const buildOrFilters = (filters: FilterSet) => {
+    if (filters.unionType === UnionType.AND) {
+        return [
+            {
+                and: filters.filters,
+            },
+        ];
+    }
+    return filters.filters.map((filter) => {
+        return {
+            and: [filter],
+        };
+    });
+};
+
+export const useGetSearchAssets = (
+    types?: [EntityType],
+    query?: string,
+    filters?: FilterSet,
+    sort?: SortCriterion,
+    viewUrn?: string | null,
+): any => {
+    const { data, loading } = useGetSearchResultsForMultipleQuery({
+        variables: {
+            input: {
+                types: types || [],
+                query: query || '*',
+                start: 0,
+                count: 5,
+                orFilters: (filters && buildOrFilters(filters)) || null,
+                sortInput:
+                    (sort && {
+                        sortCriterion: sort,
+                    }) ||
+                    null,
+                viewUrn,
+                searchFlags: {
+                    skipAggregates: true,
+                },
+            },
+        },
+        fetchPolicy: 'cache-first',
+    });
+
+    const showSeparateSiblings = useIsShowSeparateSiblingsEnabled();
+    const searchResults = combineSiblingsInSearchResults(
+        showSeparateSiblings,
+        data?.searchAcrossEntities?.searchResults,
+    );
+
+    const assets = searchResults?.filter((result) => result.entity).map((result) => result.entity) || [];
+
+    return { assets, loading };
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useRecentlyCreatedDatasets.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useRecentlyCreatedDatasets.tsx
new file mode 100644
index 00000000000000..0d3f0e3d32968c
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useRecentlyCreatedDatasets.tsx
@@ -0,0 +1,31 @@
+import moment from 'moment/moment';
+import { FilterOperator, SortCriterion, SortOrder } from '../../../../../../../../types.generated';
+import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types';
+import { UnionType } from '../../../../../../../searchV2/utils/constants';
+
+export const buildRecentlyCreatedDatasetsFilters = (sinceDays: number): FilterSet => {
+    const startDate = moment().utcOffset(0).subtract(sinceDays, 'days').set({
+        hour: 0,
+        minute: 0,
+        second: 0,
+        millisecond: 0,
+    });
+    return {
+        unionType: UnionType.AND,
+        filters: [
+            {
+                field: 'createdAt',
+                values: [startDate.valueOf().toString()],
+                condition: FilterOperator.GreaterThanOrEqualTo,
+                negated: false,
+            },
+        ],
+    };
+};
+
+export const buildRecentlyCreatedDatasetsSort = (): SortCriterion => {
+    return {
+        field: 'createdAt',
+        sortOrder: SortOrder.Descending,
+    };
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useRecentlyUpdatedDatasets.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useRecentlyUpdatedDatasets.tsx
new file mode 100644
index 00000000000000..9794d2b40050c5
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useRecentlyUpdatedDatasets.tsx
@@ -0,0 +1,31 @@
+import moment from 'moment';
+import { FilterOperator, SortCriterion, SortOrder } from '../../../../../../../../types.generated';
+import { FilterSet } from '../../../../../../../entityV2/shared/components/styled/search/types';
+import { UnionType } from '../../../../../../../searchV2/utils/constants';
+
+export const buildRecentlyUpdatedDatasetsFilters = (sinceDays: number): FilterSet => {
+    const startDate = moment().utcOffset(0).subtract(sinceDays, 'days').set({
+        hour: 0,
+        minute: 0,
+        second: 0,
+        millisecond: 0,
+    });
+    return {
+        unionType: UnionType.AND,
+        filters: [
+            {
+                field: 'lastModifiedAt',
+                values: [startDate.valueOf().toString()],
+                condition: FilterOperator.GreaterThanOrEqualTo,
+                negated: false,
+            },
+        ],
+    };
+};
+
+export const buildRecentlyUpdatedDatasetsSort = (): SortCriterion => {
+    return {
+        field: 'lastModifiedAt',
+        sortOrder: SortOrder.Descending,
+    };
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCard.tsx
new file mode 100644
index 00000000000000..7e600823c3f1b5
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCard.tsx
@@ -0,0 +1,60 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { colors } from '@src/alchemy-components';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { REDESIGN_COLORS } from '../../../../../../../entity/shared/constants';
+
+const Card = styled.div<{
+    clickable: boolean;
+    maxWidth: number;
+    minWidth: number;
+    height?: number;
+    $isShowNavBarRedesign?: boolean;
+}>`
+    border-radius: 10px;
+    background-color: #ffffff;
+    padding: 16px;
+    border: ${(props) => (props.$isShowNavBarRedesign ? `1px solid ${colors.gray[100]}` : '2px solid transparent')};
+    ${(props) => props.$isShowNavBarRedesign && 'border-radius: 8px;'}
+    max-width: ${(props) => props.maxWidth}px;
+    min-width: ${(props) => props.minWidth}px;
+    :hover {
+        ${(props) => props.clickable && `border: 2px solid ${REDESIGN_COLORS.BLUE};`}
+        ${(props) => props.clickable && 'cursor: pointer;'}
+    }
+    overflow: hidden;
+`;
+
+const Title = styled.div`
+    font-size: 16px;
+    color: #403d5c;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+`;
+
+type Props = {
+    id?: string;
+    title?: React.ReactNode;
+    children?: React.ReactNode;
+    maxWidth?: number;
+    minWidth?: number;
+    onClick?: () => void;
+};
+
+export const InsightCard = ({ id, title, children, maxWidth = 300, minWidth = 300, onClick }: Props) => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    return (
+        <Card
+            id={id}
+            maxWidth={maxWidth}
+            minWidth={minWidth}
+            clickable={onClick !== undefined}
+            onClick={onClick}
+            $isShowNavBarRedesign={isShowNavBarRedesign}
+        >
+            <Title>{title}</Title>
+            {children}
+        </Card>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCardSkeleton.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCardSkeleton.tsx
new file mode 100644
index 00000000000000..34a420581d3c1f
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/shared/InsightCardSkeleton.tsx
@@ -0,0 +1,92 @@
+import React from 'react';
+import { Skeleton } from 'antd';
+import styled from 'styled-components';
+
+const CardHeader = styled.div`
+    display: flex;
+    gap: 16px;
+    padding: 16px 0;
+
+    .ant-skeleton {
+        width: auto;
+        height: 16px;
+    }
+
+    .ant-skeleton-button {
+        height: 16px;
+        background-color: #ebecf0;
+    }
+`;
+
+const CardContent = styled.div`
+    display: flex;
+    gap: 10px;
+    flex-direction: column;
+
+    .ant-skeleton-button {
+        height: 16px;
+        background-color: #ebecf0;
+    }
+
+    .ant-skeleton-avatar-square {
+        height: 24px;
+        width: 24px;
+    }
+`;
+
+const Row = styled.div`
+    display: flex;
+    gap: 10px;
+    align-items: center;
+`;
+
+const CardSkeleton = styled.div`
+    flex-shrink: 0;
+
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    border-radius: 12px;
+    background-color: #f8f9fa;
+    padding: 16px;
+    width: 340px;
+    height: 275px;
+`;
+
+const SkeletonButton = styled(Skeleton.Button)<{ width: string }>`
+    &&& {
+        height: 25px;
+        width: ${(props) => props.width};
+    }
+`;
+
+const InsightCardSkeleton = () => {
+    return (
+        <CardSkeleton>
+            <CardHeader>
+                <SkeletonButton active size="small" shape="square" block width="8rem" />
+                <Skeleton.Avatar active size="small" shape="circle" />
+            </CardHeader>
+            <CardContent>
+                <Row>
+                    <Skeleton.Avatar active size="small" shape="square" />
+                    <SkeletonButton active size="small" shape="square" block width="8rem" />
+                </Row>
+                <Row>
+                    <Skeleton.Avatar active size="small" shape="square" />
+                    <SkeletonButton active size="small" shape="square" block width="5rem" />
+                </Row>
+                <Row>
+                    <Skeleton.Avatar active size="small" shape="square" />
+                    <SkeletonButton active size="small" shape="square" block width="6rem" />
+                </Row>
+                <Row>
+                    <Skeleton.Avatar active size="small" shape="square" />
+                    <SkeletonButton active size="small" shape="square" block width="7rem" />
+                </Row>
+            </CardContent>
+        </CardSkeleton>
+    );
+};
+
+export default InsightCardSkeleton;
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/PlatformCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/PlatformCard.tsx
new file mode 100644
index 00000000000000..8423022d8a3628
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/PlatformCard.tsx
@@ -0,0 +1,96 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { useHistory } from 'react-router';
+import { colors } from '@src/alchemy-components';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { Tooltip } from '@components';
+import { DataPlatform, EntityType } from '../../../../../../../types.generated';
+import { useEntityRegistry } from '../../../../../../useEntityRegistry';
+import { ANTD_GRAY } from '../../../../../../entity/shared/constants';
+import { navigateToSearchUrl } from '../../../../../../searchV2/utils/navigateToSearchUrl';
+import { PLATFORM_FILTER_NAME } from '../../../../../../searchV2/utils/constants';
+import { formatNumber, formatNumberWithoutAbbreviation } from '../../../../../../shared/formatNumber';
+import { SEARCH_COLORS } from '../../../../../../entityV2/shared/constants';
+import PlatformIcon from '../../../../../../sharedV2/icons/PlatformIcon';
+
+const Card = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    border-radius: 10px;
+    background-color: #ffffff;
+    padding: 16px;
+    min-width: 180px;
+    border: ${(props) => (props.$isShowNavBarRedesign ? `1px solid ${colors.gray[100]}` : '2px solid transparent')};
+    ${(props) => props.$isShowNavBarRedesign && 'border-radius: 8px;'}
+    :hover {
+        border: ${(props) => (props.$isShowNavBarRedesign ? '1px' : '2px')} solid ${SEARCH_COLORS.LINK_BLUE};
+        cursor: pointer;
+    }
+    display: flex;
+    justify-content: start;
+    align-items: center;
+    gap: 14px;
+`;
+
+const Text = styled.div``;
+
+const Name = styled.div`
+    font-size: 16px;
+    color: ${ANTD_GRAY[7]};
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 160px;
+    white-space: nowrap;
+`;
+
+const Count = styled.div`
+    font-size: 16px;
+    color: #56668e;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+`;
+
+type Props = {
+    platform: DataPlatform;
+    count?: number;
+};
+
+export const PlatformCard = ({ platform, count }: Props) => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    const history = useHistory();
+    const entityRegistry = useEntityRegistry();
+    const name = entityRegistry.getDisplayName(EntityType.DataPlatform, platform);
+
+    const navigateToPlatformSearch = () => {
+        navigateToSearchUrl({
+            history,
+            filters: [
+                {
+                    field: PLATFORM_FILTER_NAME,
+                    values: [platform.urn],
+                },
+            ],
+        });
+    };
+
+    return (
+        <Tooltip
+            title={`View ${formatNumberWithoutAbbreviation(count)} ${name} assets`}
+            showArrow={false}
+            placement="bottom"
+        >
+            <Card key={platform.urn} onClick={navigateToPlatformSearch} $isShowNavBarRedesign={isShowNavBarRedesign}>
+                <PlatformIcon
+                    platform={platform}
+                    size={30}
+                    styles={{
+                        padding: '10px',
+                    }}
+                />
+                <Text>
+                    <Name>{name}</Name>
+                    {(count !== undefined && <Count>{formatNumber(count)}</Count>) || null}
+                </Text>
+            </Card>
+        </Tooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/Platforms.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/Platforms.tsx
new file mode 100644
index 00000000000000..31993d835ccdfd
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/Platforms.tsx
@@ -0,0 +1,47 @@
+import { Skeleton } from 'antd';
+import React, { useContext } from 'react';
+import styled from 'styled-components';
+import { Section } from '../Section';
+import { PlatformCard } from './PlatformCard';
+import { useGetPlatforms } from './useGetPlatforms';
+import { useUserContext } from '../../../../../../context/useUserContext';
+import { HOME_PAGE_PLATFORMS_ID } from '../../../../../../onboarding/config/HomePageOnboardingConfig';
+import { useUpdateEducationStepsAllowList } from '../../../../../../onboarding/useUpdateEducationStepsAllowList';
+import { Carousel } from '../../../../../../sharedV2/carousel/Carousel';
+import { HorizontalListSkeletons } from '../../../../HorizontalListSkeletons';
+import OnboardingContext from '../../../../../../onboarding/OnboardingContext';
+
+const SkeletonCard = styled(Skeleton.Button)<{ width: string }>`
+    &&& {
+        height: 83px;
+        width: 180px;
+    }
+`;
+
+export const Platforms = () => {
+    const { user } = useUserContext();
+    const { platforms, loading } = useGetPlatforms(user);
+    const { isUserInitializing } = useContext(OnboardingContext);
+
+    useUpdateEducationStepsAllowList(!!platforms.length, HOME_PAGE_PLATFORMS_ID);
+
+    const showSkeleton = isUserInitializing || !user || loading;
+    return (
+        <div id={HOME_PAGE_PLATFORMS_ID}>
+            {showSkeleton && <HorizontalListSkeletons Component={SkeletonCard} />}
+            {!showSkeleton && !!platforms.length && (
+                <Section title="Platforms">
+                    <Carousel>
+                        {platforms.map((platform) => (
+                            <PlatformCard
+                                key={platform.platform.urn}
+                                platform={platform.platform}
+                                count={platform.count}
+                            />
+                        ))}
+                    </Carousel>
+                </Section>
+            )}
+        </div>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetDataPlatforms.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetDataPlatforms.tsx
new file mode 100644
index 00000000000000..e22b39a98b18a4
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetDataPlatforms.tsx
@@ -0,0 +1,30 @@
+import { useGetDataPlatformsQuery } from '../../../../../../../graphql/dataPlatform.generated';
+import { DataPlatform } from '../../../../../../../types.generated';
+
+export const DATA_PLATFORMS_URNS = [
+    'urn:li:dataPlatform:snowflake',
+    'urn:li:dataPlatform:bigquery',
+    'urn:li:dataPlatform:redshift',
+    'urn:li:dataPlatform:databricks',
+    'urn:li:dataPlatform:hive',
+    'urn:li:dataPlatform:tableau',
+    'urn:li:dataPlatform:looker',
+    'urn:li:dataPlatform:powerbi',
+    'urn:li:dataPlatform:kafka',
+];
+
+export const useGetDataPlatforms = () => {
+    const { data } = useGetDataPlatformsQuery({
+        variables: {
+            urns: DATA_PLATFORMS_URNS,
+        },
+        fetchPolicy: 'no-cache',
+    });
+
+    const platforms =
+        data?.entities?.map((content) => ({
+            platform: content as DataPlatform,
+        })) || [];
+
+    return platforms;
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetPlatforms.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetPlatforms.tsx
new file mode 100644
index 00000000000000..66a9b7bb28649d
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetPlatforms.tsx
@@ -0,0 +1,41 @@
+import { useListRecommendationsQuery } from '../../../../../../../graphql/recommendations.generated';
+import { CorpUser, DataPlatform, ScenarioType } from '../../../../../../../types.generated';
+import { useUserContext } from '../../../../../../context/useUserContext';
+
+export const PLATFORMS_MODULE_ID = 'Platforms';
+
+export type PlatformAndCount = {
+    platform: DataPlatform;
+    count: number;
+};
+
+export const useGetPlatforms = (user?: CorpUser | null): { platforms: PlatformAndCount[]; loading: boolean } => {
+    const { localState } = useUserContext();
+    const { selectedViewUrn } = localState;
+    const { data, loading } = useListRecommendationsQuery({
+        variables: {
+            input: {
+                userUrn: user?.urn as string,
+                requestContext: {
+                    scenario: ScenarioType.Home,
+                },
+                limit: 10,
+                viewUrn: selectedViewUrn,
+            },
+        },
+        fetchPolicy: 'cache-first',
+        skip: !user?.urn,
+    });
+
+    const platformsModule = data?.listRecommendations?.modules?.find(
+        (module) => module.moduleId === PLATFORMS_MODULE_ID,
+    );
+    const platforms =
+        platformsModule?.content
+            ?.filter((content) => content.entity)
+            .map((content) => ({
+                count: content.params?.contentParams?.count || 0,
+                platform: content.entity as DataPlatform,
+            })) || [];
+    return { platforms, loading };
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/tabs.tsx b/datahub-web-react/src/app/homeV2/content/tabs/tabs.tsx
new file mode 100644
index 00000000000000..c9f383f0b83960
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/tabs.tsx
@@ -0,0 +1,52 @@
+import {
+    V2_HOME_PAGE_ANNOUNCEMENTS_ID,
+    V2_HOME_PAGE_DISCOVER_ID,
+} from '../../../onboarding/configV2/HomePageOnboardingConfig';
+import { DiscoveryTab } from './discovery/DiscoveryTab';
+import { ActivityTab } from './activity/ActivityTab';
+import { AnnouncementsTab } from './announcements/AnnouncementsTab';
+
+// todo: decide whether we want icons for each tab!
+
+export enum TabType {
+    Discover = 'Discover',
+    Activity = 'Activity',
+    Announcements = 'Announcements',
+}
+
+interface TabData {
+    type: TabType;
+    name: string;
+    description: string;
+    component: any;
+    id?: string;
+    icon?: JSX.Element;
+}
+
+export const tabs: TabData[] = [
+    {
+        type: TabType.Discover,
+        name: 'Discover',
+        description: 'Explore your data', // icon: CompassOutlined,
+        component: DiscoveryTab,
+        id: V2_HOME_PAGE_DISCOVER_ID,
+    },
+    {
+        type: TabType.Activity,
+        name: 'Activity',
+        description: 'Recent activity for you', // icon: RocketOutlined,
+        component: ActivityTab,
+    },
+    {
+        type: TabType.Announcements,
+        name: 'Announcements',
+        description: 'Announcements from your organization', // icon: NotificationOutlined,
+        component: AnnouncementsTab,
+        id: V2_HOME_PAGE_ANNOUNCEMENTS_ID,
+    },
+];
+
+export const TAB_NAME_DETAILS = new Map<TabType, TabData>();
+tabs.forEach((tab) => TAB_NAME_DETAILS.set(tab.type, tab));
+
+export const DEFAULT_TAB = TabType.Discover;
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/types.ts b/datahub-web-react/src/app/homeV2/content/tabs/types.ts
new file mode 100644
index 00000000000000..3d031f2d0fdca3
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/types.ts
@@ -0,0 +1,3 @@
+export type CenterTabProps = {
+    something?: string;
+};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/useGetVisibleTabs.tsx b/datahub-web-react/src/app/homeV2/content/tabs/useGetVisibleTabs.tsx
new file mode 100644
index 00000000000000..64df478ad4893a
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/content/tabs/useGetVisibleTabs.tsx
@@ -0,0 +1,83 @@
+import { getHomePagePostsFilters } from '@app/utils/queryUtils';
+import { useListPostsQuery } from '../../../../graphql/post.generated';
+import { PostContentType, PostType } from '../../../../types.generated';
+import { useUserContext } from '../../../context/useUserContext';
+import { useUpdateLastViewedAnnouncementTime } from '../../shared/updateLastViewedAnnouncementTime';
+import { useGetLastViewedAnnouncementTime } from '../../shared/useGetLastViewedAnnouncementTime';
+import { hasViewedAnnouncement } from '../../shared/utils';
+import { TabType } from './tabs';
+
+const useGetAnnouncementsExists = (): ActiveTab | null => {
+    const { user } = useUserContext();
+    const { time: lastViewedAnnouncementsTime, refetch } = useGetLastViewedAnnouncementTime();
+    const { updateLastViewedAnnouncementTime } = useUpdateLastViewedAnnouncementTime();
+    const { data } = useListPostsQuery({
+        variables: {
+            input: {
+                start: 0,
+                count: 30,
+                orFilters: getHomePagePostsFilters(),
+            },
+        },
+        fetchPolicy: 'cache-first',
+    });
+
+    const onSelectTab = () => {
+        if (user?.urn) {
+            updateLastViewedAnnouncementTime(user?.urn).then(() => {
+                refetch();
+            });
+        }
+    };
+
+    const activePosts = data?.listPosts?.posts?.filter(
+        (post) => post.postType === PostType.HomePageAnnouncement && post.content.contentType === PostContentType.Text,
+    );
+    const activePostsCount = activePosts?.length || 0;
+
+    const unseenPosts = activePosts?.filter(
+        (post) => !hasViewedAnnouncement(lastViewedAnnouncementsTime, post.lastModified?.time),
+    );
+    const unseenPostsCount = unseenPosts?.length || 0;
+
+    if (activePostsCount >= 0) {
+        return {
+            type: TabType.Announcements,
+            count: unseenPostsCount,
+            onSelectTab,
+        };
+    }
+    return null;
+};
+
+const useGetActivityExists = (): ActiveTab | null => {
+    // TODO: Activity tab
+    return null;
+};
+
+export type ActiveTab = {
+    type: TabType;
+    count?: number;
+    onSelectTab?: () => void; // Refetch count, etc
+};
+
+export const useGetActiveTabs = (): ActiveTab[] => {
+    const activeTabs = [
+        {
+            type: TabType.Discover,
+        },
+    ];
+
+    const activityTab = useGetActivityExists();
+    const announcementsTab = useGetAnnouncementsExists();
+
+    if (activityTab) {
+        activeTabs.push(activityTab);
+    }
+
+    if (announcementsTab) {
+        activeTabs.push(announcementsTab);
+    }
+
+    return activeTabs;
+};
diff --git a/datahub-web-react/src/app/homeV2/introduce/IntroduceYourself.tsx b/datahub-web-react/src/app/homeV2/introduce/IntroduceYourself.tsx
new file mode 100644
index 00000000000000..b195b177e5e628
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/introduce/IntroduceYourself.tsx
@@ -0,0 +1,26 @@
+import React, { useEffect } from 'react';
+import styled from 'styled-components';
+import analytics, { EventType } from '../../analytics';
+import { IntroduceYourselfLeftSidebar } from './IntroduceYourselfLeftSidebar';
+import { IntroduceYourselfMainContent } from './IntroduceYourselfMainContent';
+
+const Container = styled.div`
+    display: flex;
+    height: 100vh;
+    background-color: #fff;
+`;
+
+export const IntroduceYourself = () => {
+    useEffect(() => {
+        analytics.event({ type: EventType.IntroduceYourselfViewEvent });
+    }, []);
+
+    return (
+        <>
+            <Container>
+                <IntroduceYourselfLeftSidebar />
+                <IntroduceYourselfMainContent />
+            </Container>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/introduce/IntroduceYourselfLeftSidebar.tsx b/datahub-web-react/src/app/homeV2/introduce/IntroduceYourselfLeftSidebar.tsx
new file mode 100644
index 00000000000000..ad46b2d47a55b5
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/introduce/IntroduceYourselfLeftSidebar.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Image } from 'antd';
+import dataHubIcon from '../../../images/datahublogo.png';
+import datahubPlatforms from '../../../images/datahub-platforms.svg';
+
+const Container = styled.div`
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    max-width: 470px;
+    padding: 52px 65px 65px 52px;
+    background: #191d2e url(${datahubPlatforms}) no-repeat bottom left;
+`;
+
+const Title = styled.div`
+    max-width: 240px;
+    margin-bottom: 30px;
+    color: #374066;
+    font: 700 35px/44px Mulish;
+`;
+
+const Subtitle = styled.div`
+    width: 371px;
+    color: #5f6685;
+    font: 400 16px/24px Mulish;
+`;
+
+const AcrylTitle = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    font: 700 14px Mulish;
+    color: #fff;
+    letter-spacing: 1px;
+`;
+
+export const IntroduceYourselfLeftSidebar = () => {
+    return (
+        <Container>
+            <AcrylTitle>
+                <Image src={dataHubIcon} preview={false} style={{ width: 36 }} />
+            </AcrylTitle>
+            <div>
+                <Title>Start your data journey</Title>
+                <Subtitle>
+                    Thousands of data professionals use Acryl to discover trusted data, ensure data quality and
+                    collaborate with their colleagues
+                </Subtitle>
+            </div>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/introduce/IntroduceYourselfMainContent.tsx b/datahub-web-react/src/app/homeV2/introduce/IntroduceYourselfMainContent.tsx
new file mode 100644
index 00000000000000..00fc1443fcac45
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/introduce/IntroduceYourselfMainContent.tsx
@@ -0,0 +1,553 @@
+import { Tooltip } from '@components';
+import AccountCircleOutlinedIcon from '@mui/icons-material/AccountCircleOutlined';
+import CheckIcon from '@mui/icons-material/Check';
+import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined';
+import SettingsOutlinedIcon from '@mui/icons-material/SettingsOutlined';
+import colors from '@src/alchemy-components/theme/foundations/colors';
+import { useEntityRegistry } from '@src/app/useEntityRegistry';
+import { useListGlobalViewsQuery } from '@src/graphql/view.generated';
+import { Button, Select, message } from 'antd';
+import { orderBy } from 'lodash';
+import React, { useContext, useState } from 'react';
+import { useHistory } from 'react-router';
+import styled from 'styled-components';
+import { useListRecommendationsQuery } from '../../../graphql/recommendations.generated';
+import {
+    useUpdateCorpUserPropertiesMutation,
+    useUpdateCorpUserViewsSettingsMutation,
+} from '../../../graphql/user.generated';
+import { DataHubViewType, DataPlatform, EntityType, ScenarioType } from '../../../types.generated';
+import analytics, { EventType } from '../../analytics';
+import { useUserContext } from '../../context/useUserContext';
+import OnboardingContext from '../../onboarding/OnboardingContext';
+import Loading from '../../shared/Loading';
+import PlatformIcon from '../../sharedV2/icons/PlatformIcon';
+import { useGetDataPlatforms } from '../content/tabs/discovery/sections/platform/useGetDataPlatforms';
+import { PLATFORMS_MODULE_ID } from '../content/tabs/discovery/sections/platform/useGetPlatforms';
+import { PERSONA_TYPE_TO_VIEW_URN, PersonaType, ROLE_TO_PERSONA_TYPE } from '../shared/types';
+
+const Container = styled.div`
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 52px;
+`;
+
+const Content = styled.div`
+    background-color: #ffffff;
+    padding: 20px;
+
+    .ant-select-selection-item {
+        align-items: center;
+        gap: 4px;
+        height: 42px !important;
+    }
+
+    .ant-select-selection-overflow-item-rest {
+        .ant-select-selection-item {
+            background-color: #fff !important;
+            border: none !important;
+            padding: 0 0 0 5px !important;
+            height: auto !important;
+            font-size: 12px;
+            line-height: 20px;
+        }
+    }
+`;
+
+const Title = styled.div`
+    color: #374066;
+    text-align: center;
+    font: 700 35px Mulish;
+    line-height: 44px;
+    margin-bottom: 3px;
+`;
+
+const Subtitle = styled.div`
+    color: #5f6685;
+    width: 268px;
+    text-align: center;
+    font: 400 13px Mulish;
+    line-height: 21px;
+    margin-bottom: 28px;
+`;
+
+const DoneButton = styled(Button)`
+    width: 290px;
+    height: 45px;
+    flex-shrink: 0;
+    background-color: #3f54d1;
+    color: #fff;
+    margin-top: 12px;
+`;
+
+const PsuedoCheckBox = styled.div<{ checked?: boolean }>`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 12px;
+    height: 12px;
+    border-radius: 4px;
+    border: 1px solid #cfd1da;
+    background: #fff;
+    color: #fff;
+
+    ${(props) =>
+        props.checked &&
+        `
+        background: #533fd1;
+        border: none;
+    `}
+
+    & svg {
+        width: 10px;
+        height: 10px;
+    }
+`;
+
+const SelectWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    position: relative;
+
+    & + & {
+        margin-top: 12px;
+    }
+
+    & svg {
+        position: absolute;
+        left: 10px;
+        z-index: 99;
+        fill: #a9adbd;
+    }
+
+    .ant-select-arrow {
+        & svg {
+            position: relative;
+            margin-right: 5px;
+        }
+    }
+
+    .ant-select-selection-item,
+    .ant-select-selection-placeholder,
+    .ant-select-selection-search {
+        padding-left: 30px !important;
+    }
+
+    .ant-select-selection-overflow {
+        padding-left: 30px !important;
+
+        .ant-select-selection-search {
+            padding-left: 0px !important;
+        }
+    }
+`;
+
+const SelectGrid = styled.div`
+    .rc-virtual-list-holder-inner {
+        max-width: 290px;
+        display: grid !important;
+        grid-template-columns: repeat(4, 1fr);
+        grid-gap: 10px;
+        padding: 10px;
+    }
+
+    .ant-select-item {
+        padding: 0;
+        margin: 0;
+
+        &:hover,
+        &:focus,
+        &:active {
+            background-color: #fff !important;
+        }
+    }
+
+    .ant-select-item-option-active:not(.ant-select-item-option-disabled) {
+        background-color: #fff !important;
+    }
+
+    .ant-select-item-option-content {
+        display: flex;
+        justify-content: center;
+        background-color: #fff !important;
+
+        &:hover,
+        &:focus,
+        &:active {
+            background-color: #fff !important;
+        }
+    }
+`;
+
+const SelectOption = styled.div`
+    display: flex;
+    position: relative;
+    overflow: hidden;
+    width: 40px;
+    height: 40px;
+`;
+
+const SelectTag = styled.div`
+    margin-right: 4px;
+`;
+
+const Footer = styled.div`
+    margin-top: 16px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+`;
+
+const SkipButton = styled.div`
+    color: ${colors.gray[400]};
+    font-weight: 700;
+    :hover {
+        cursor: pointer;
+    }
+`;
+
+const DEFAULT_PERSONA = PersonaType.TECHNICAL_USER;
+
+// const RoleCard = styled.div`
+//     border: 1px solid #828da7;
+//     border-radius: 7px;
+//     height: 144px;
+//     width: 112px;
+//     display: flex;
+//     flex-direction: column;
+//     align-items: center;
+// `;
+
+// // this styled div is a 14x14 circle
+// const RoleCardCircle = styled.div`
+//     border-radius: 50%;
+//     height: 14px;
+//     width: 14px;
+//     border: 1px solid #828da7;
+//     // margin-top: 12px;
+//     // margin-bottom: 12px;
+//     background-color: #fff;
+// `;
+
+// const RoleCardComponent = ({
+//     role,
+//     prompt,
+//     onSelect,
+//     isSelected,
+//     emoji,
+// }: {
+//     role: string;
+//     prompt: string;
+//     onSelect: (role: string) => void;
+//     isSelected: boolean;
+//     emoji: string;
+// }) => {
+//     return (
+//         <RoleCard onClick={() => onSelect(role)}>
+//             <div>
+//                 <RoleCardCircle />
+//             </div>
+//             <div>{emoji}</div>
+//             <div>{prompt}</div>
+//         </RoleCard>
+//     );
+// };
+
+// TODO: Make section ordering dynamic based on populated data.
+export const IntroduceYourselfMainContent = () => {
+    const userContext = useUserContext();
+    const { refetchUser, user } = userContext;
+    const defaultDataPlatforms = useGetDataPlatforms();
+    const [updateCorpUserMutation, { loading }] = useUpdateCorpUserPropertiesMutation();
+    const [updateUserViewSettingMutation] = useUpdateCorpUserViewsSettingsMutation();
+    const history = useHistory();
+    const authenticatedUser = useUserContext();
+    const currentUserUrn = authenticatedUser?.user?.urn || '';
+    const entityRegistry = useEntityRegistry();
+
+    // commented out for now, but may be brought back in the future
+    // const [selectedPersona, setSelectedPersona] = useState<string>(PersonaType.TECHNICAL_USER);
+    const selectedPersona = PersonaType.TECHNICAL_USER;
+    const [selectedPlatforms, setSelectedPlatforms] = useState<string[]>([]);
+    const [selectedTitle, setSelectedTitle] = useState('');
+
+    const { loading: viewsLoading, data: globalViewsData } = useListGlobalViewsQuery({
+        variables: {
+            start: 0,
+            count: 100,
+        },
+        fetchPolicy: 'no-cache',
+    });
+
+    const globalViews = globalViewsData?.listGlobalViews?.views || [];
+
+    const { data, loading: reccosLoading } = useListRecommendationsQuery({
+        variables: {
+            input: {
+                userUrn: currentUserUrn as string,
+                requestContext: {
+                    scenario: ScenarioType.Home,
+                },
+                limit: 10,
+            },
+        },
+        fetchPolicy: 'no-cache',
+        skip: !currentUserUrn,
+    });
+
+    const platformsModule = data?.listRecommendations?.modules?.find(
+        (module) => module.moduleId === PLATFORMS_MODULE_ID,
+    );
+
+    const getPlatformList = () => {
+        if (platformsModule && platformsModule.content.length) {
+            return platformsModule?.content
+                ?.filter((content) => content.entity)
+                .map((content) => ({
+                    count: content.params?.contentParams?.count || 0,
+                    platform: content.entity as DataPlatform,
+                }));
+        }
+        return defaultDataPlatforms;
+    };
+
+    const platforms = getPlatformList();
+
+    const handleRoleChange = (value: string) => {
+        setSelectedTitle(value);
+    };
+
+    const { setIsUserInitializing } = useContext(OnboardingContext);
+
+    /**
+     * Updates the User's Personal Default View via mutation.
+     *
+     * Then updates the User Context state to contain the new default.
+     */
+    const setUserDefault = (viewUrn: string | null) => {
+        return updateUserViewSettingMutation({
+            variables: {
+                input: {
+                    defaultView: viewUrn,
+                },
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    userContext.updateState({
+                        ...userContext.state,
+                        views: {
+                            ...userContext.state.views,
+                            personalDefaultViewUrn: viewUrn,
+                        },
+                    });
+                    userContext.updateLocalState({
+                        ...userContext.localState,
+                        selectedViewUrn: viewUrn,
+                    });
+                    analytics.event({
+                        type: EventType.SetUserDefaultViewEvent,
+                        urn: viewUrn,
+                        viewType: (viewUrn && DataHubViewType.Global) || null,
+                    });
+                }
+            })
+            .catch((_) => {
+                message.destroy();
+                message.error({
+                    content: `Failed to provision a default view. An unexpected error occurred.`,
+                    duration: 3,
+                });
+            });
+    };
+
+    const onSubmitDetails = () => {
+        setIsUserInitializing(true);
+
+        // The default views for each persona needs to be created prior
+        const personaDefaultView = globalViews.find((view) => view.urn === PERSONA_TYPE_TO_VIEW_URN[selectedPersona]);
+        const { globalDefaultViewUrn } = userContext.state.views;
+
+        if (personaDefaultView && !globalDefaultViewUrn) {
+            setUserDefault(personaDefaultView.urn);
+        }
+
+        updateCorpUserMutation({
+            variables: {
+                urn: user?.urn as string,
+                input: {
+                    personaUrn: selectedPersona,
+                    platformUrns: selectedPlatforms,
+                    title: selectedTitle,
+                },
+            },
+        })
+            .then(async () => {
+                analytics.event({
+                    type: EventType.IntroduceYourselfSubmitEvent,
+                    role: selectedPersona,
+                    platformUrns: selectedPlatforms || [],
+                });
+                await refetchUser();
+                history.push('/');
+            })
+            .catch((err) => {
+                console.error(err);
+                message.error('Failed to save user details. :(');
+            });
+    };
+
+    const onSkip = () => {
+        setIsUserInitializing(true);
+
+        updateCorpUserMutation({
+            variables: {
+                urn: user?.urn as string,
+                input: {
+                    personaUrn: DEFAULT_PERSONA,
+                    platformUrns: [],
+                },
+            },
+        })
+            .then(async () => {
+                analytics.event({
+                    type: EventType.IntroduceYourselfSkipEvent,
+                });
+                await refetchUser();
+                history.push('/');
+            })
+            .catch((err) => {
+                console.error(err);
+                message.error('Failed to save user details. :(');
+            });
+    };
+
+    const hasPersona = !!selectedPersona;
+    // Possibly needed in the future
+    // const hasPlatforms = selectedPlatforms.length > 0;
+    // const canSubmit = hasPersona && hasPlatforms;
+
+    const selectStyles = {
+        width: 290,
+        borderRadius: '8px',
+        borderColor: '#5F6685',
+        color: '#81879f',
+    };
+
+    // Sort Roles Alphabetically
+    const sortedRoles = orderBy(Object.keys(ROLE_TO_PERSONA_TYPE), (role) => role);
+
+    // Move 'Other' to the end of the list
+    const updatedRoles = sortedRoles.filter((role) => role !== 'Other');
+    updatedRoles.push('Other');
+
+    // Get window height
+    const windowHeight = window.innerHeight;
+    const smallWindow = windowHeight <= 719;
+
+    // Show loading state
+    const isLoading = loading && reccosLoading && viewsLoading;
+    if (isLoading) return <Loading />;
+
+    return (
+        <Container>
+            <Content>
+                <Title>Before we begin</Title>
+                <Subtitle>Tell us more about yourself, so we can personalize your experience</Subtitle>
+                <SelectWrapper>
+                    <AccountCircleOutlinedIcon />
+                    <Select
+                        placeholder="Select your Role"
+                        suffixIcon={<KeyboardArrowDownOutlinedIcon />}
+                        data-testid="introduce-role-select"
+                        size="large"
+                        style={selectStyles}
+                        onChange={handleRoleChange}
+                        showSearch
+                        autoFocus
+                    >
+                        {updatedRoles.map((role) => (
+                            <Select.Option key={role} value={role} data-testid={`role-option-${role}`}>
+                                {role}
+                            </Select.Option>
+                        ))}
+                    </Select>
+                </SelectWrapper>
+                <SelectWrapper>
+                    <SettingsOutlinedIcon />
+                    <Select
+                        placeholder="Optional - Select your Data Tools"
+                        size="large"
+                        style={selectStyles}
+                        onChange={(value) => setSelectedPlatforms(value)}
+                        options={platforms.map((platform) => {
+                            const { urn } = platform.platform;
+                            const isChecked = !!selectedPlatforms.includes(urn);
+
+                            const displayName = entityRegistry.getDisplayName(
+                                EntityType.DataPlatform,
+                                platform.platform,
+                            );
+                            return {
+                                value: platform.platform.urn,
+                                label: (
+                                    <SelectOption>
+                                        <Tooltip title={displayName} placement="left" mouseEnterDelay={0.5}>
+                                            <PsuedoCheckBox checked={isChecked}>
+                                                {isChecked && <CheckIcon />}
+                                            </PsuedoCheckBox>
+                                            <PlatformIcon
+                                                platform={platform.platform}
+                                                size={24}
+                                                styles={{ width: '40px', height: '40px' }}
+                                            />
+                                        </Tooltip>
+                                    </SelectOption>
+                                ),
+                            };
+                        })}
+                        dropdownRender={(menu) => <SelectGrid>{menu}</SelectGrid>}
+                        tagRender={(props: any) => {
+                            const { value } = props;
+                            const platform = platforms.find((p) => p.platform.urn === value);
+                            return (
+                                <SelectTag>
+                                    <PlatformIcon platform={platform?.platform as DataPlatform} size={14} />
+                                </SelectTag>
+                            );
+                        }}
+                        mode="multiple"
+                        maxTagCount={5}
+                        maxTagPlaceholder={(values) => `${values.length}+`}
+                        virtual={false}
+                        listHeight={smallWindow ? 100 : 300}
+                        placement="bottomLeft"
+                        menuItemSelectedIcon
+                    />
+                </SelectWrapper>
+                {/* Note: This is commented out for now, but may be brought back in the future. As of today, it causes more confusion than it helps */}
+                {/* <PersonaSelector selectedPersona={selectedPersona} onSelect={setSelectedPersona} /> */}
+                <DoneButton
+                    type="primary"
+                    size="large"
+                    onClick={onSubmitDetails}
+                    loading={loading}
+                    disabled={!hasPersona}
+                >
+                    Get Started
+                </DoneButton>
+                <Footer>
+                    <Tooltip placement="bottom" title="Continue to DataHub">
+                        <SkipButton onClick={onSkip}>Skip</SkipButton>
+                    </Tooltip>
+                </Footer>
+            </Content>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/introduce/PersonaSelector.tsx b/datahub-web-react/src/app/homeV2/introduce/PersonaSelector.tsx
new file mode 100644
index 00000000000000..98cfe5368353b3
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/introduce/PersonaSelector.tsx
@@ -0,0 +1,79 @@
+import React from 'react';
+import styled from 'styled-components';
+import colors from '@src/alchemy-components/theme/foundations/colors';
+import { Heading } from '@src/alchemy-components';
+import {
+    PERSONA_TYPE_TO_DESCRIPTION,
+    PERSONA_TYPE_TO_LABEL,
+    PERSONA_TYPE_TO_VIEW_ICON,
+    PERSONA_TYPES_TO_DISPLAY,
+} from '../shared/types';
+
+const PersonaCard = styled.div<{ selected: boolean }>`
+    border: 1px rgb(217, 217, 217) solid;
+    border-radius: 5px;
+    padding: 12px;
+    margin: 12px 0;
+    display: flex;
+    height: 88px;
+    font-family: Mulish;
+
+    &:hover {
+        cursor: pointer;
+        ${(props) => !props.selected && `border: 1.5px ${colors.violet[200]} solid;`}
+    }
+
+    ${(props) => props.selected && `border: 1.5px ${colors.violet[500]} solid;`}
+`;
+const StyledIcon = styled.div`
+    display: flex;
+    align-items: center;
+    font-size: 20px;
+    margin-left: 8px;
+    margin-right: 20px;
+`;
+
+const PersonaSelectorContainer = styled.div`
+    margin-top: 10px;
+    max-width: 290px;
+`;
+
+const Content = styled.div`
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    font-size: 11px;
+`;
+
+const Text = styled.div`
+    color: rgb(129, 135, 159);
+    line-height: 16px;
+    font-size: 12px;
+    margin-bottom: 4px;
+`;
+
+type Props = {
+    onSelect: (urn: string) => void;
+    selectedPersona: string;
+};
+
+export const PersonaSelector = ({ onSelect, selectedPersona }: Props) => {
+    return (
+        <PersonaSelectorContainer>
+            <Heading size="md" type="h4" color="gray">
+                Select a Persona
+            </Heading>
+            {PERSONA_TYPES_TO_DISPLAY.map((urn) => (
+                <PersonaCard onClick={() => onSelect(urn)} key={urn} selected={urn === selectedPersona}>
+                    <StyledIcon>{PERSONA_TYPE_TO_VIEW_ICON[urn]}</StyledIcon>
+                    <Content>
+                        <Heading size="md" type="h5" weight="semiBold">
+                            {PERSONA_TYPE_TO_LABEL[urn]}
+                        </Heading>
+                        <Text>{PERSONA_TYPE_TO_DESCRIPTION[urn]}</Text>
+                    </Content>
+                </PersonaCard>
+            ))}
+        </PersonaSelectorContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/introduce/useRedirectToIntroduceYourself.tsx b/datahub-web-react/src/app/homeV2/introduce/useRedirectToIntroduceYourself.tsx
new file mode 100644
index 00000000000000..fe15ffb9343e31
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/introduce/useRedirectToIntroduceYourself.tsx
@@ -0,0 +1,19 @@
+import { useEffect } from 'react';
+import { useHistory } from 'react-router';
+import { PageRoutes } from '../../../conf/Global';
+import { useLoadUserPersona } from '../persona/useLoadUserPersona';
+
+const SKIP_INTRODUCE_PAGE_KEY = 'skipAcrylIntroducePage';
+
+export const useRedirectToIntroduceYourself = () => {
+    const history = useHistory();
+    const { persona } = useLoadUserPersona();
+    // this is only used in cypress tests right now
+    const shouldSkipRedirect = localStorage.getItem(SKIP_INTRODUCE_PAGE_KEY);
+
+    useEffect(() => {
+        if (!persona && !shouldSkipRedirect) {
+            history.replace(PageRoutes.INTRODUCE);
+        }
+    }, [persona, history, shouldSkipRedirect]);
+};
diff --git a/datahub-web-react/src/app/homeV2/layout/CenterContent.tsx b/datahub-web-react/src/app/homeV2/layout/CenterContent.tsx
new file mode 100644
index 00000000000000..96f74b9cade434
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/CenterContent.tsx
@@ -0,0 +1,68 @@
+import React from 'react';
+import styled from 'styled-components';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { RecentActions } from '../content/recent/RecentActions';
+import { CenterTabs } from '../content/tabs/CenterTabs';
+
+const Container = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    flex: 1;
+    overflow: hidden;
+    overflow-y: auto;
+    padding: ${(props) => (props.$isShowNavBarRedesign ? '16px 20px' : '10px')};
+    ${(props) =>
+        !props.$isShowNavBarRedesign &&
+        `
+        margin-top: 8px;
+        height: 100%;
+    `}
+
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        margin: 0 5px 0 5px;
+        border-radius: ${props.theme.styles['border-radius-navbar-redesign']};
+        box-shadow: ${props.theme.styles['box-shadow-navbar-redesign']};
+        height: calc(100vh - 87px);
+        background-color: white;
+    `}
+
+    display: flex;
+    flex-direction: column;
+    /* Hide scrollbar for Chrome, Safari, and Opera */
+    &::-webkit-scrollbar {
+        display: none;
+    }
+`;
+
+const Content = styled.div`
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+`;
+
+const Wrapper = styled.div`
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    overflow: hidden;
+    padding: 5px 0 5px 0;
+`;
+
+export const CenterContent = () => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+
+    const FinalWrapper = isShowNavBarRedesign ? Wrapper : React.Fragment;
+
+    return (
+        <FinalWrapper>
+            {isShowNavBarRedesign && <RecentActions />}
+            <Container $isShowNavBarRedesign={isShowNavBarRedesign}>
+                <Content>
+                    {!isShowNavBarRedesign && <RecentActions />}
+                    <CenterTabs />
+                </Content>
+            </Container>
+        </FinalWrapper>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/layout/CustomNavLink.tsx b/datahub-web-react/src/app/homeV2/layout/CustomNavLink.tsx
new file mode 100644
index 00000000000000..361b59bf693129
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/CustomNavLink.tsx
@@ -0,0 +1,90 @@
+import { Pill } from '@src/alchemy-components';
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import { NavMenuItem } from './types';
+
+const OptionContainer = styled.div``;
+
+const LinkTitle = styled.span`
+    display: block;
+    color: #fff;
+    font: 700 12px/20px Mulish;
+    white-space: break-spaces;
+`;
+
+const TitleWrapper = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const DescriptionWrapper = styled.span`
+    display: block;
+    color: #fff;
+    white-space: break-spaces;
+
+    display: block;
+    font: 600 10px/12px Mulish;
+`;
+
+const PillWrapper = styled.span`
+    margin: 4px 0 4px 6px;
+`;
+
+interface Props {
+    menuItem: NavMenuItem;
+    key: string;
+}
+
+const CustomNavLink: React.FC<Props> = ({
+    menuItem: { title, showNewTag, description, link, target, rel, isHidden, onClick },
+    key,
+}) => {
+    if (isHidden) {
+        return null;
+    }
+
+    if (link === null) {
+        return <LinkTitle key={key}>{title}</LinkTitle>;
+    }
+
+    if (onClick) {
+        return (
+            <OptionContainer onClick={onClick} key={key}>
+                <TitleWrapper>
+                    <LinkTitle>{title}</LinkTitle>
+                </TitleWrapper>
+                {description && <DescriptionWrapper>{description}</DescriptionWrapper>}
+            </OptionContainer>
+        );
+    }
+
+    const isExternalLink = target === '_blank';
+
+    const linkProps = {
+        to: isExternalLink ? undefined : link,
+        href: isExternalLink ? link : undefined,
+        target: isExternalLink ? '_blank' : undefined,
+        rel: isExternalLink ? 'noopener noreferrer' : rel,
+        'aria-label': title,
+        key,
+    };
+
+    const LinkComponent = linkProps.target === '_blank' ? 'a' : Link;
+
+    return (
+        <LinkComponent {...linkProps}>
+            <TitleWrapper>
+                <LinkTitle>{title}</LinkTitle>
+                {showNewTag && (
+                    <PillWrapper>
+                        <Pill label="New" size="xs" clickable={false} colorScheme="blue" />
+                    </PillWrapper>
+                )}
+            </TitleWrapper>
+            {description && <DescriptionWrapper>{description}</DescriptionWrapper>}
+        </LinkComponent>
+    );
+};
+
+export default CustomNavLink;
diff --git a/datahub-web-react/src/app/homeV2/layout/LeftSidebar.tsx b/datahub-web-react/src/app/homeV2/layout/LeftSidebar.tsx
new file mode 100644
index 00000000000000..00a437ae9e74ae
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/LeftSidebar.tsx
@@ -0,0 +1,127 @@
+import React from 'react';
+import styled from 'styled-components';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { AssetsYouOwn } from '../reference/sections/assets/AssetsYouOwn';
+import { GroupsYouAreIn } from '../reference/sections/groups/GroupsYouAreIn';
+import { TagsYouOwn } from '../reference/sections/tags/TagsYouOwn';
+import { GlossaryNodesYouOwn } from '../reference/sections/glossary/GlossaryNodesYouOwn';
+import { DomainsYouOwn } from '../reference/sections/domains/DomainsYouOwn';
+import { ReferenceSectionProps } from '../reference/types';
+import { PersonaType } from '../shared/types';
+import { useUserPersona } from '../persona/useUserPersona';
+import { UserHeader } from '../reference/header/UserHeader';
+import { V2_HOME_PAGE_PERSONAL_SIDEBAR_ID } from '../../onboarding/configV2/HomePageOnboardingConfig';
+
+const Container = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    flex: 1;
+    max-width: 380px;
+    overflow-y: auto;
+    ${(props) => !props.$isShowNavBarRedesign && 'padding: 0px 12px 12px 0px;'}
+    height: ${(props) => (props.$isShowNavBarRedesign ? 'calc(100vh - 88px)' : 'calc(100vh - 72px)')};
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        margin: 5px;
+        border-radius: ${props.theme.styles['border-radius-navbar-redesign']};
+        box-shadow: ${props.theme.styles['box-shadow-navbar-redesign']};
+    `}
+
+    /* Hide scrollbar for Chrome, Safari, and Opera */
+    &::-webkit-scrollbar {
+        display: none;
+    }
+`;
+
+const Content = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    background-color: #ffffff;
+    border-radius: ${(props) =>
+        props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '18px'};
+    min-height: 100%;
+    ${(props) => !props.$isShowNavBarRedesign && 'border: 1.5px solid #efefef;'}
+`;
+
+const Body = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    padding: ${(props) => (props.$isShowNavBarRedesign ? '16px 20px' : '12px 20px 0px 20px')};
+`;
+
+type ReferenceSection = {
+    id: string;
+    component: React.ComponentType<ReferenceSectionProps>;
+    hideIfEmpty?: boolean;
+    personas?: PersonaType[];
+};
+
+const ALL_SECTIONS: ReferenceSection[] = [
+    {
+        id: 'AssetsYouOwn',
+        component: AssetsYouOwn,
+        personas: [
+            PersonaType.BUSINESS_USER,
+            PersonaType.TECHNICAL_USER,
+            PersonaType.DATA_STEWARD,
+            PersonaType.DATA_LEADER,
+            PersonaType.DATA_ENGINEER,
+        ],
+    },
+    {
+        id: 'DomainsYouOwn',
+        component: DomainsYouOwn,
+        hideIfEmpty: true,
+        personas: [
+            PersonaType.DATA_STEWARD,
+            PersonaType.DATA_LEADER,
+            PersonaType.TECHNICAL_USER,
+            PersonaType.DATA_ENGINEER,
+        ],
+    },
+    {
+        id: 'GlossaryNodesYouOwn',
+        component: GlossaryNodesYouOwn,
+        hideIfEmpty: true,
+        personas: [PersonaType.DATA_STEWARD, PersonaType.DATA_LEADER],
+    },
+    {
+        id: 'TagsYouOwn',
+        component: TagsYouOwn,
+        hideIfEmpty: true,
+        personas: [
+            PersonaType.BUSINESS_USER,
+            PersonaType.TECHNICAL_USER,
+            PersonaType.DATA_STEWARD,
+            PersonaType.DATA_LEADER,
+            PersonaType.DATA_ENGINEER,
+        ],
+    },
+    {
+        id: 'GroupsYouAreIn',
+        component: GroupsYouAreIn,
+        hideIfEmpty: true,
+        personas: [
+            PersonaType.BUSINESS_USER,
+            PersonaType.TECHNICAL_USER,
+            PersonaType.DATA_ENGINEER,
+            PersonaType.DATA_STEWARD,
+        ],
+    },
+];
+
+// TODO: Make section ordering dynamic based on populated data.
+export const LeftSidebar = () => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    const currentUserPersona = useUserPersona();
+
+    return (
+        <Container id={V2_HOME_PAGE_PERSONAL_SIDEBAR_ID} $isShowNavBarRedesign={isShowNavBarRedesign}>
+            <Content $isShowNavBarRedesign={isShowNavBarRedesign}>
+                <UserHeader />
+                <Body $isShowNavBarRedesign={isShowNavBarRedesign}>
+                    {ALL_SECTIONS.filter(
+                        (section) => !section.personas || section.personas.includes(currentUserPersona),
+                    ).map((section) => (
+                        <section.component key={section.id} hideIfEmpty={section.hideIfEmpty} />
+                    ))}
+                </Body>
+            </Content>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/layout/NavLinks.tsx b/datahub-web-react/src/app/homeV2/layout/NavLinks.tsx
new file mode 100644
index 00000000000000..6f2b49d50b956b
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/NavLinks.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import styled from 'styled-components';
+import { NavLinksMenu } from './NavLinksMenu';
+
+const Container = styled.div`
+    border-radius: 47px;
+    background-color: #7262d9;
+    box-shadow: 0px 8px 8px 4px rgba(0, 0, 0, 0.25);
+`;
+
+export const NavLinks = () => {
+    return (
+        <Container>
+            <NavLinksMenu />
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/layout/NavLinksMenu.tsx b/datahub-web-react/src/app/homeV2/layout/NavLinksMenu.tsx
new file mode 100644
index 00000000000000..3f7ab1074051c4
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/NavLinksMenu.tsx
@@ -0,0 +1,295 @@
+import React, { useState } from 'react';
+import styled, { useTheme } from 'styled-components/macro';
+
+import { Tooltip } from '@components';
+import { Link } from 'react-router-dom';
+
+import { HelpLinkRoutes, PageRoutes } from '../../../conf/Global';
+import { useUserContext } from '../../context/useUserContext';
+import { HOME_PAGE_INGESTION_ID } from '../../onboarding/config/HomePageOnboardingConfig';
+import { useUpdateEducationStepsAllowList } from '../../onboarding/useUpdateEducationStepsAllowList';
+import { useAppConfig } from '../../useAppConfig';
+
+import AnalyticsMenuIcon from '../../../images/analyticsMenuIcon.svg?react';
+import GovernMenuIcon from '../../../images/governMenuIcon.svg?react';
+import HelpMenuIcon from '../../../images/help-icon.svg?react';
+import IngestionMenuIcon from '../../../images/ingestionMenuIcon.svg?react';
+import SettingsMenuIcon from '../../../images/settingsMenuIcon.svg?react';
+import { useHandleOnboardingTour } from '../../onboarding/useHandleOnboardingTour';
+import CustomNavLink from './CustomNavLink';
+import { NavMenuItem, NavSubMenuItem } from './types';
+
+const LinksWrapper = styled.div<{ areLinksHidden?: boolean }>`
+    opacity: 1;
+    transition: opacity 0.5s;
+
+    ${(props) =>
+        props.areLinksHidden &&
+        `
+        opacity: 0;
+        width: 0;
+    `}
+`;
+
+const LinkWrapper = styled.span`
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 47px;
+    height: 52px;
+    width: 52px;
+    line-height: 0;
+    box-shadow: 0px 0px 8px 4px rgba(0, 0, 0, 0);
+    transition: all 200ms ease;
+    color: #f9fafc;
+
+    &:hover {
+        cursor: pointer;
+        background-color: #4b39bc;
+        box-shadow: 0px 0px 8px 4px rgba(0, 0, 0, 0.15);
+    }
+
+    & svg {
+        width: 24px;
+        height: 24px;
+        fill: #f9fafc;
+    }
+`;
+
+// Use to position the submenu
+const SubMenu = styled.div`
+    position: absolute;
+    top: 3px;
+    left: 50px;
+    width: 220px;
+    padding-left: 10px;
+`;
+
+// Used to style the submenu
+const SubMenuContent = styled.div`
+    border-radius: 12px;
+    background: rgba(92, 63, 209, 0.95);
+    box-shadow: 0px 8px 8px 4px rgba(0, 0, 0, 0.25);
+    padding: 8px;
+`;
+
+const SubMenuTitle = styled.div`
+    border-radius: 12px;
+    background: #2f2477;
+    padding: 8px 12px;
+    font: 700 12px/20px Mulish;
+    margin-bottom: 4px;
+`;
+
+const SubMenuLink = styled.div`
+    border-radius: 12px;
+    padding: 4px 12px 12px 12px;
+
+    &:hover {
+        background-color: #4b39bc;
+    }
+`;
+
+interface Props {
+    areLinksHidden?: boolean;
+}
+
+export function NavLinksMenu(props: Props) {
+    const { areLinksHidden } = props;
+    const me = useUserContext();
+    const { config } = useAppConfig();
+    const themeConfig = useTheme();
+    const version = config?.appVersion;
+
+    // Submenu states
+    const [showGovernMenu, setShowGovernMenu] = useState(false);
+    const [showHelpMenu, setShowHelpMenu] = useState(false);
+
+    // Flags to show/hide menu items
+    const isAnalyticsEnabled = config?.analyticsConfig?.enabled;
+    const isIngestionEnabled = config?.managedIngestionConfig?.enabled;
+
+    const showSettings = true;
+    const showAnalytics = (isAnalyticsEnabled && me && me?.platformPrivileges?.viewAnalytics) || false;
+    const showIngestion =
+        isIngestionEnabled && me && me.platformPrivileges?.manageIngestion && me.platformPrivileges?.manageSecrets;
+
+    const showStructuredProperties =
+        config?.featureFlags?.showManageStructuredProperties &&
+        (me.platformPrivileges?.manageStructuredProperties || me.platformPrivileges?.viewStructuredPropertiesPage);
+
+    // Update education steps allow list
+    useUpdateEducationStepsAllowList(!!showIngestion, HOME_PAGE_INGESTION_ID);
+
+    const { showOnboardingTour } = useHandleOnboardingTour();
+
+    // Help menu options
+    const HelpContentMenuItems = themeConfig.content.menu.items.map((value) => ({
+        title: value.label,
+        description: value.description || '',
+        link: value.path || null,
+        isHidden: false,
+        target: '_blank',
+        rel: 'noopener noreferrer',
+    })) as NavSubMenuItem[];
+
+    // Menu Items
+    const menuItems: Array<NavMenuItem> = [
+        {
+            icon: AnalyticsMenuIcon,
+            title: 'Analytics',
+            description: 'Explore data usage and trends',
+            link: PageRoutes.ANALYTICS,
+            isHidden: !showAnalytics,
+        },
+        {
+            icon: GovernMenuIcon,
+            title: 'Govern',
+            description: 'Manage data access and quality',
+            link: null,
+            subMenu: {
+                isOpen: showGovernMenu,
+                open: () => setShowGovernMenu(true),
+                close: () => setShowGovernMenu(false),
+                items: [
+                    {
+                        title: 'Glossary',
+                        description: 'View and modify your business glossary',
+                        link: PageRoutes.GLOSSARY,
+                        isHidden: false,
+                    },
+                    {
+                        title: 'Domains',
+                        description: 'Manage related groups of data assets',
+                        link: PageRoutes.DOMAINS,
+                        isHidden: false,
+                    },
+                    {
+                        title: 'Structured Properties',
+                        showNewTag: true,
+                        description: `Manage custom properties for your data assets`,
+                        link: PageRoutes.STRUCTURED_PROPERTIES,
+                        isHidden: !showStructuredProperties,
+                    },
+                ],
+            },
+        },
+        {
+            icon: IngestionMenuIcon,
+            title: 'Ingestion',
+            description: 'Manage data integrations and pipelines',
+            link: PageRoutes.INGESTION,
+            isHidden: !showIngestion,
+        },
+        {
+            icon: SettingsMenuIcon,
+            title: 'Settings',
+            description: 'Manage your account and preferences',
+            link: PageRoutes.SETTINGS,
+            isHidden: !showSettings,
+        },
+        {
+            icon: HelpMenuIcon,
+            title: 'Help',
+            description: 'Explore help resources and documentation',
+            link: null,
+            isHidden: false,
+            subMenu: {
+                isOpen: showHelpMenu,
+                open: () => setShowHelpMenu(true),
+                close: () => setShowHelpMenu(false),
+                items: [
+                    {
+                        title: 'Product Tour',
+                        description: 'Take a quick tour of this page',
+                        isHidden: false,
+                        rel: 'noopener noreferrer',
+                        onClick: showOnboardingTour,
+                    },
+                    {
+                        title: 'GraphiQL',
+                        description: 'Explore the GraphQL API',
+                        link: HelpLinkRoutes.GRAPHIQL || null,
+                        isHidden: false,
+                        target: '_blank',
+                        rel: 'noopener noreferrer',
+                    },
+                    {
+                        title: 'OpenAPI',
+                        description: 'Explore the OpenAPI endpoints',
+                        link: HelpLinkRoutes.OPENAPI,
+                        isHidden: false,
+                        target: '_blank',
+                        rel: 'noopener noreferrer',
+                    },
+                    ...HelpContentMenuItems,
+                    {
+                        title: version || '',
+                        description: '',
+                        link: null,
+                        isHidden: !version,
+                    },
+                ],
+            },
+        },
+    ];
+
+    return (
+        <LinksWrapper areLinksHidden={areLinksHidden} data-testid="nav-menu-links">
+            {menuItems.map((menuItem) => {
+                // If menu is hidden, don't show it
+                if (menuItem.isHidden) return null;
+
+                // Menu item has sub menu items
+                const hasSubMenu = menuItem.subMenu?.items && menuItem.subMenu?.items.length > 0;
+
+                // Return a menu item with a submenu
+                if (hasSubMenu) {
+                    const subMenu = (
+                        <SubMenu>
+                            <SubMenuContent>
+                                <SubMenuTitle>{menuItem.title}</SubMenuTitle>
+                                {menuItem.subMenu?.items.map((subMenuItem) => {
+                                    if (subMenuItem.isHidden) return null;
+                                    return (
+                                        <SubMenuLink>
+                                            <CustomNavLink
+                                                menuItem={subMenuItem}
+                                                key={subMenuItem.title.toLowerCase()}
+                                            />
+                                        </SubMenuLink>
+                                    );
+                                })}
+                            </SubMenuContent>
+                        </SubMenu>
+                    );
+
+                    return (
+                        <LinkWrapper
+                            aria-label={menuItem.title}
+                            aria-describedby={menuItem.description}
+                            onMouseEnter={menuItem.subMenu?.open}
+                            onMouseLeave={menuItem.subMenu?.close}
+                            key={menuItem.title.toLowerCase()}
+                        >
+                            {menuItem.icon && <menuItem.icon />}
+                            {menuItem.subMenu?.isOpen && subMenu}
+                        </LinkWrapper>
+                    );
+                }
+
+                // Render a single menu item
+                return (
+                    <LinkWrapper key={menuItem.title.toLowerCase()}>
+                        <Link to={menuItem.link} aria-label={menuItem.title} aria-describedby={menuItem.description}>
+                            <Tooltip placement="right" title={menuItem.title} showArrow={false}>
+                                {menuItem.icon && <menuItem.icon />}
+                            </Tooltip>
+                        </Link>
+                    </LinkWrapper>
+                );
+            })}
+        </LinksWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/homeV2/layout/NavSidebar.tsx b/datahub-web-react/src/app/homeV2/layout/NavSidebar.tsx
new file mode 100644
index 00000000000000..48a12f98af5433
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/NavSidebar.tsx
@@ -0,0 +1,142 @@
+import React, { useContext } from 'react';
+import styled from 'styled-components';
+import { Link } from 'react-router-dom';
+import { Skeleton } from 'antd';
+
+import { NavLinks } from './NavLinks';
+import { useAppConfig } from '../../useAppConfig';
+import { useUserContext } from '../../context/useUserContext';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { EntityType } from '../../../types.generated';
+
+import CustomAvatar from '../../shared/avatar/CustomAvatar';
+import AcrylIcon from '../../../images/acryl-light-mark.svg?react';
+import OnboardingContext from '../../onboarding/OnboardingContext';
+
+const Container = styled.div`
+    height: 100vh;
+    padding: 12px;
+    background-color: none;
+`;
+
+const Content = styled.div`
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-between;
+    background-color: #3b2d94;
+    border-radius: 32px;
+    height: 100%;
+    width: 52px;
+`;
+
+const Icon = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 3px;
+    width: 44px;
+    height: 44px;
+    border-radius: 38px;
+    border: 1px solid #32267d;
+    background: #4c39be;
+    box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
+    margin-bottom: 10px;
+
+    & svg {
+        height: 22px;
+    }
+`;
+
+const CustomLogo = styled.img`
+    object-fit: contain;
+    max-height: 26px;
+    max-width: 26px;
+    min-height: 20px;
+    min-width: 20px;
+`;
+
+const Spacer = styled.div`
+    flex: 1;
+`;
+
+const UserIcon = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 44px;
+    height: 44px;
+    border-radius: 38px;
+    overflow: hidden;
+    margin-bottom: 3px;
+    box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
+
+    .ant-avatar {
+        margin: 0;
+    }
+`;
+
+const SkeletonButton = styled(Skeleton.Button)`
+    &&& {
+        margin-top: 3px;
+        width: 44px;
+        height: 44px;
+        margin-bottom: 10px;
+    }
+`;
+
+const DEFAULT_LOGO = '/assets/logos/acryl-dark-mark.svg';
+
+const NavSkeleton = () => {
+    return (
+        <>
+            <SkeletonButton active shape="circle" />
+            <SkeletonButton active shape="circle" style={{ height: '380px', borderRadius: '48px' }} />
+            <Spacer />
+            <UserIcon>
+                <SkeletonButton active shape="circle" />
+            </UserIcon>
+        </>
+    );
+};
+
+export const NavSidebar = () => {
+    const appConfig = useAppConfig();
+    const entityRegistry = useEntityRegistry();
+    const userContext = useUserContext();
+    const { urn, user } = userContext;
+    const { isUserInitializing } = useContext(OnboardingContext);
+
+    const customLogoUrl = appConfig.config.visualConfig.logoUrl;
+    const hasCustomLogo = customLogoUrl && customLogoUrl !== DEFAULT_LOGO;
+
+    const logoComponent = hasCustomLogo ? <CustomLogo alt="logo" src={customLogoUrl} /> : <AcrylIcon />;
+
+    return (
+        <Container>
+            <Content>
+                {isUserInitializing || !appConfig.loaded || !userContext.loaded ? (
+                    <NavSkeleton />
+                ) : (
+                    <>
+                        <Link to="/">
+                            <Icon>{appConfig.loaded ? logoComponent : undefined}</Icon>
+                        </Link>
+                        <NavLinks />
+                        <Spacer />
+                        <UserIcon>
+                            <Link to={`/${entityRegistry.getPathName(EntityType.CorpUser)}/${urn}`}>
+                                <CustomAvatar
+                                    photoUrl={user?.editableProperties?.pictureLink || undefined}
+                                    name={user?.editableProperties?.displayName || ''}
+                                    size={44}
+                                    hideTooltip
+                                />
+                            </Link>
+                        </UserIcon>
+                    </>
+                )}
+            </Content>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/layout/RightSidebar.tsx b/datahub-web-react/src/app/homeV2/layout/RightSidebar.tsx
new file mode 100644
index 00000000000000..779f59e3cbb7a5
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/RightSidebar.tsx
@@ -0,0 +1,55 @@
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { Announcements } from '../action/announcement/Announcements';
+
+const Container = styled.div<{ $isHidden?: boolean; $isShowNavBarRedesign?: boolean }>`
+    overflow-y: auto;
+
+    padding: ${(props) => (props.$isShowNavBarRedesign ? '16px 20px' : '0px 12px 12px 12px')};
+
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        margin: 5px;
+        border-radius: ${props.theme.styles['border-radius-navbar-redesign']};
+        box-shadow: ${props.theme.styles['box-shadow-navbar-redesign']};
+        background-color: white;
+    `}
+
+    /* Hide scrollbar for Chrome, Safari, and Opera */
+    &::-webkit-scrollbar {
+        display: none;
+    }
+
+    ${(props) => props.$isHidden && props.$isShowNavBarRedesign && 'display: none;'}
+`;
+
+const Content = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+    min-height: 100%;
+`;
+
+export const RightSidebar = () => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    const [hasAnnouncements, setHasAnnouncements] = useState<boolean | null>(null);
+
+    const [isSidebarHidden, setIsSidebarHidden] = useState<boolean>(true);
+
+    useEffect(() => {
+        if (!isShowNavBarRedesign) return;
+
+        const hasData = hasAnnouncements;
+        setIsSidebarHidden(!hasData);
+    }, [isShowNavBarRedesign, hasAnnouncements, setIsSidebarHidden]);
+
+    return (
+        <Container $isHidden={isSidebarHidden} $isShowNavBarRedesign={isShowNavBarRedesign}>
+            <Content>
+                <Announcements setHasAnnouncements={setHasAnnouncements} />
+            </Content>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarContext.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarContext.tsx
new file mode 100644
index 00000000000000..2cfe482a19e549
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarContext.tsx
@@ -0,0 +1,111 @@
+import React, { useContext, useState, ReactNode, useMemo, useCallback, useEffect } from 'react';
+
+export enum NavBarStateType {
+    Collapsed = 'COLLAPSED',
+    Opened = 'OPENED',
+    Floating = 'FLOATING',
+}
+
+/**
+ * Key used when writing user state to local browser state.
+ */
+const LOCAL_STATE_KEY = 'navBarState';
+
+/**
+ * Local State is persisted to local storage.
+ */
+export type LocalState = {
+    state?: NavBarStateType | null;
+};
+
+/**
+ * Loads a persisted object from the local browser storage.
+ */
+const loadLocalState = () => {
+    return JSON.parse(localStorage.getItem(LOCAL_STATE_KEY) || '{}') as LocalState;
+};
+
+/**
+ * Saves an object to local browser storage.
+ */
+const saveLocalState = (newState: LocalState) => {
+    return localStorage.setItem(LOCAL_STATE_KEY, JSON.stringify(newState));
+};
+
+export interface NavBarContextType {
+    state: NavBarStateType;
+    isCollapsed: boolean;
+    toggle: () => void;
+    selectedKey: string;
+    setSelectedKey: (key: string) => void;
+    setDefaultNavBarState: (state: NavBarStateType) => void;
+}
+
+export const NavBarContext = React.createContext<NavBarContextType>({
+    state: NavBarStateType.Collapsed,
+    isCollapsed: true,
+    toggle: () => {},
+    selectedKey: '',
+    setSelectedKey: () => {},
+    setDefaultNavBarState: () => {},
+});
+
+export const useNavBarContext = () => useContext(NavBarContext);
+
+interface Props {
+    children?: ReactNode | undefined;
+}
+
+export const NavBarProvider = ({ children }: Props) => {
+    // Default state of the nav bar (if there are no state in local storage)
+    const [defaultState, setDefaultState] = useState<NavBarStateType>(NavBarStateType.Collapsed);
+    const [localState, setLocalState] = useState<LocalState>(loadLocalState());
+    const [selectedKey, setSelectedKey] = useState<string>('');
+
+    useEffect(() => {
+        saveLocalState(localState);
+    }, [localState]);
+
+    const state = useMemo(() => {
+        return localState.state || defaultState || NavBarStateType.Collapsed;
+    }, [defaultState, localState.state]);
+
+    const updateState = useCallback((newState: NavBarStateType) => {
+        setLocalState((currentState) => ({ ...currentState, state: newState }));
+    }, []);
+
+    const getNewState = useCallback((currentState: NavBarStateType): NavBarStateType => {
+        switch (currentState) {
+            case NavBarStateType.Collapsed:
+                return NavBarStateType.Opened;
+            case NavBarStateType.Opened:
+                return NavBarStateType.Collapsed;
+            case NavBarStateType.Floating:
+                return NavBarStateType.Collapsed;
+            default:
+                return NavBarStateType.Collapsed;
+        }
+    }, []);
+
+    const isCollapsed = useMemo(() => state === NavBarStateType.Collapsed, [state]);
+
+    const toggle = useCallback(() => {
+        const newState = getNewState(state);
+        updateState(newState);
+    }, [state, getNewState, updateState]);
+
+    return (
+        <NavBarContext.Provider
+            value={{
+                state,
+                isCollapsed,
+                toggle,
+                selectedKey,
+                setSelectedKey,
+                setDefaultNavBarState: setDefaultState,
+            }}
+        >
+            {children}
+        </NavBarContext.Provider>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarHeader.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarHeader.tsx
new file mode 100644
index 00000000000000..78a631055c029e
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarHeader.tsx
@@ -0,0 +1,71 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import { colors } from '@src/alchemy-components';
+import NavBarToggler from './NavBarToggler';
+import { useNavBarContext } from './NavBarContext';
+
+const Container = styled.div`
+    display: flex;
+    width: 100%;
+    height: 40px;
+    min-height: 40px;
+    align-items: center;
+    gap: 8px;
+    padding-left: 4px;
+    transition: padding 250ms ease-in-out;
+`;
+
+const Logotype = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 28px;
+    height: 28px;
+    border-radius: 4px;
+    background: ${colors.white};
+    padding: 4px;
+    position: relative;
+
+    & svg {
+        height: 20px;
+        width: 20px;
+    }
+`;
+
+const Title = styled.div`
+    color: #374066;
+    font-style: normal;
+    font: 700 16px/40px Mulish;
+    text-wrap: nowrap;
+    white-space: nowrap;
+    overflow: hidden;
+    max-width: calc(100% - 30px);
+    text-overflow: ellipsis;
+`;
+
+const StyledLink = styled(Link)`
+    display: flex
+    height: 40px;
+    align-items: center;
+    gap: 8px;
+    max-width: calc(100% - 40px);
+`;
+
+type Props = {
+    logotype?: React.ReactElement;
+};
+
+export default function NavBarHeader({ logotype }: Props) {
+    const { isCollapsed } = useNavBarContext();
+
+    return (
+        <Container>
+            <StyledLink to="/">
+                <Logotype>{logotype}</Logotype>
+                {!isCollapsed ? <Title>DataHub</Title> : null}
+            </StyledLink>
+            {!isCollapsed && <NavBarToggler />}
+        </Container>
+    );
+}
diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenu.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenu.tsx
new file mode 100644
index 00000000000000..52335ca7b01699
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenu.tsx
@@ -0,0 +1,77 @@
+import React from 'react';
+import { Menu, MenuProps } from 'antd';
+import styled from 'styled-components';
+import NavBarMenuItem from './NavBarMenuItem';
+import NavBarMenuItemDropdown from './NavBarMenuItemDropdown';
+import { AnyMenuItem, NavBarMenuItems, NavBarMenuItemTypes } from './types';
+import NavBarMenuItemGroup from './NavBarMenuItemGroup';
+
+const StyledMenu = styled(Menu)`
+    && {
+        background: none;
+        padding: 0;
+        margin: 0;
+        border: 0;
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+    }
+
+    && .ant-menu-item-group {
+        width: 100%;
+    }
+`;
+
+type Props = {
+    menu: NavBarMenuItems;
+    selectedKey: string;
+    isCollapsed: boolean;
+    style?: any;
+    iconSize?: number;
+} & Omit<MenuProps, 'items'>;
+
+export default function NavBarMenu({ menu, selectedKey, isCollapsed, iconSize, style }: Props) {
+    const renderMenuItem = (item: AnyMenuItem) => {
+        if (item.isHidden) return null;
+
+        const isSelected = selectedKey === item.key;
+
+        if (item.type === NavBarMenuItemTypes.Group && item.items?.filter((candidate) => !candidate.isHidden)?.length) {
+            return (
+                <NavBarMenuItemGroup title={!isCollapsed && item.title} key={item.key}>
+                    {item.items?.map((subItem) => renderMenuItem(subItem))}
+                </NavBarMenuItemGroup>
+            );
+        }
+
+        if (item.type === NavBarMenuItemTypes.Item) {
+            return (
+                <NavBarMenuItem
+                    item={item}
+                    key={item.key}
+                    isCollapsed={isCollapsed}
+                    isSelected={isSelected}
+                    iconSize={iconSize}
+                />
+            );
+        }
+
+        if (item.type === NavBarMenuItemTypes.Dropdown) {
+            return (
+                <NavBarMenuItemDropdown item={item} key={item.key} isCollapsed={isCollapsed} isSelected={isSelected} />
+            );
+        }
+
+        if (item.type === NavBarMenuItemTypes.Custom) {
+            return item.render();
+        }
+
+        return null;
+    };
+
+    return (
+        <StyledMenu selectedKeys={selectedKey ? [selectedKey] : []} style={style} data-testid="nav-menu-links">
+            {menu.items.map((item) => renderMenuItem(item))}
+        </StyledMenu>
+    );
+}
diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItem.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItem.tsx
new file mode 100644
index 00000000000000..5e73f75de4b418
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItem.tsx
@@ -0,0 +1,147 @@
+import React from 'react';
+import { Menu, MenuItemProps, Tooltip } from 'antd';
+import { useHistory } from 'react-router-dom';
+import styled from 'styled-components';
+import { colors, Badge, Text } from '@src/alchemy-components';
+import { NavBarMenuBaseItem } from './types';
+
+const StyledMenuItem = styled(Menu.Item)<{ isCollapsed?: boolean }>`
+    &&& {
+        position: relative;
+        padding: 4px 8px;
+        margin: 8px 0;
+        margin-bottom: 0;
+        height: 36px;
+        min-height: 36px;
+        border-radius: 6px;
+        border: 0;
+        display: flex;
+        align-items: center;
+        ${(props) => props.isCollapsed && 'width: 36px;'}
+    }
+
+    && svg {
+        color: ${colors.gray[1800]};
+        width: 20px;
+        height: 20px;
+    }
+
+    && .ant-menu-title-content {
+        width: 100%;
+        color: ${colors.gray[1700]};
+        font-family: Mulish;
+        font-size: 14px;
+        font-style: normal;
+        font-weight: 500;
+        line-height: 36px;
+        display: flex;
+        gap: 8px;
+        align-items: center;
+        height: 36px;
+        line-height: 24px;
+    }
+
+    &:hover,
+    &.ant-menu-item-active {
+        background: linear-gradient(
+            180deg,
+            rgba(243, 244, 246, 0.5) -3.99%,
+            rgba(235, 236, 240, 0.5) 53.04%,
+            rgba(235, 236, 240, 0.5) 100%
+        );
+        box-shadow: 0px 0px 0px 1px rgba(139, 135, 157, 0.08);
+    }
+
+    &&.ant-menu-item-selected {
+        background: linear-gradient(
+            180deg,
+            rgba(83, 63, 209, 0.04) -3.99%,
+            rgba(112, 94, 228, 0.04) 53.04%,
+            rgba(112, 94, 228, 0.04) 100%
+        );
+        box-shadow: 0px 0px 0px 1px rgba(108, 71, 255, 0.08);
+    }
+`;
+
+const Icon = styled.div<{ $isSelected?: boolean; $size?: number }>`
+    width: ${(props) => props.$size ?? 20}px;
+    height: ${(props) => props.$size ?? 20}px;
+
+    && svg {
+        ${(props) => (props.$isSelected ? 'fill: url(#menu-item-selected-gradient) #533fd1;' : 'color: #8088a3;')}
+        width: ${(props) => props.$size ?? 20}px;
+        height: ${(props) => props.$size ?? 20}px;
+    }
+`;
+
+const StyledText = styled(Text)<{ $isSelected?: boolean }>`
+    ${(props) =>
+        props.$isSelected &&
+        `
+        background: linear-gradient(#7565d6 20%, #5340cc 80%);
+        background-clip: text;
+        -webkit-text-fill-color: transparent;
+    `}
+`;
+
+const ItemTitleContentWrapper = styled.div`
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+`;
+
+const PillDot = styled.div<{ $isSelected?: boolean }>`
+    position: absolute;
+    width: 10px;
+    height: 10px;
+    background: ${colors.violet[500]};
+    border-radius: 6px;
+    border: 2px solid ${(props) => (props.$isSelected ? '#f9fafc' : '#f2f3fa')};
+    top: 6px;
+    left: 22px;
+`;
+
+type Props = {
+    item: NavBarMenuBaseItem;
+    isCollapsed?: boolean;
+    isSelected?: boolean;
+    iconSize?: number;
+} & MenuItemProps;
+
+export default function NavBarMenuItem({ item, isCollapsed, isSelected, iconSize, ...props }: Props) {
+    const history = useHistory();
+
+    const onClick = () => {
+        if (item.link) return history.push(item.link);
+        if (item.onClick) return item.onClick();
+        return null;
+    };
+
+    const component = (
+        <Tooltip title={isCollapsed ? item.title : null} placement="right" showArrow={false}>
+            <StyledMenuItem isCollapsed={isCollapsed} onClick={onClick} aria-label={item.title} {...props}>
+                {item.icon || item.selectedIcon ? (
+                    <Icon $size={iconSize} $isSelected={isSelected}>
+                        {isSelected ? item.selectedIcon || item.icon : item.icon}
+                    </Icon>
+                ) : null}
+                {isCollapsed ? (
+                    <>{item?.badge?.show && <PillDot />}</>
+                ) : (
+                    <ItemTitleContentWrapper>
+                        <StyledText size="md" type="div" weight="semiBold" $isSelected={isSelected}>
+                            {item.title}
+                        </StyledText>
+                        {item?.badge?.show && <Badge count={item.badge.count} clickable={false} colorScheme="violet" />}
+                    </ItemTitleContentWrapper>
+                )}
+            </StyledMenuItem>
+        </Tooltip>
+    );
+
+    if (item.href) {
+        return <a href={item.href}>{component}</a>;
+    }
+
+    return component;
+}
diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItemDropdown.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItemDropdown.tsx
new file mode 100644
index 00000000000000..6f97d0f0f40ea4
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItemDropdown.tsx
@@ -0,0 +1,90 @@
+import React from 'react';
+import { Dropdown, MenuItemProps } from 'antd';
+import { useHistory } from 'react-router';
+import styled from 'styled-components';
+import { colors, Text } from '@src/alchemy-components';
+import NavBarMenuItem from './NavBarMenuItem';
+import { NavBarMenuDropdownItem } from './types';
+
+const StyledDropdownContentWrapper = styled.div`
+    background-color: white;
+    border-radius: ${(props) => props.theme.styles['border-radius-navbar-redesign']};
+    box-shadow: 0px 0px 14px 0px rgba(0, 0, 0, 0.15);
+    padding: 8px;
+`;
+
+const StyledDropDownOption = styled.div<{ $disabled?: boolean }>`
+    padding: 8px;
+    border-radius: ${(props) => props.theme.styles['border-radius-navbar-redesign']};
+    ${(props) =>
+        props.$disabled
+            ? `color: ${colors.gray[1800]};`
+            : `
+                cursor: pointer;
+                &:hover {
+                    background: linear-gradient(
+                        180deg,
+                        rgba(243, 244, 246, 0.5) -3.99%,
+                        rgba(235, 236, 240, 0.5) 53.04%,
+                        rgba(235, 236, 240, 0.5) 100%
+                    );
+                }
+    `}
+`;
+
+type Props = {
+    item: NavBarMenuDropdownItem;
+    isCollapsed?: boolean;
+    isSelected?: boolean;
+} & MenuItemProps;
+
+export default function NavBarMenuItemDropdown({ item, isCollapsed, isSelected, ...props }: Props) {
+    const history = useHistory();
+
+    const dropdownItems = item.items?.filter((subItem) => !subItem.isHidden);
+
+    const onItemClick = (key) => {
+        const clickedItem = item.items?.filter((dropdownItem) => dropdownItem.key === key)?.[0];
+        if (!clickedItem) return null;
+
+        if (clickedItem.disabled) return null;
+
+        if (clickedItem.onClick) return clickedItem.onClick();
+
+        if (clickedItem.link && clickedItem.isExternalLink)
+            return window.open(clickedItem.link, '_blank', 'noopener,noreferrer');
+        if (clickedItem.link && !clickedItem.isExternalLink) return history.push(clickedItem.link);
+
+        return null;
+    };
+
+    return (
+        <Dropdown
+            dropdownRender={() => {
+                return (
+                    <StyledDropdownContentWrapper>
+                        {dropdownItems?.map((dropdownItem) => {
+                            return (
+                                <StyledDropDownOption
+                                    key={dropdownItem.key}
+                                    $disabled={dropdownItem.disabled}
+                                    role="menuitem"
+                                    aria-label={dropdownItem.title}
+                                    aria-disabled={dropdownItem.disabled}
+                                    onClick={() => onItemClick(dropdownItem.key)}
+                                >
+                                    <Text>{dropdownItem.title}</Text>
+                                    <Text size="sm" color="gray">
+                                        {dropdownItem.description}
+                                    </Text>
+                                </StyledDropDownOption>
+                            );
+                        })}
+                    </StyledDropdownContentWrapper>
+                );
+            }}
+        >
+            <NavBarMenuItem item={item} isCollapsed={isCollapsed} isSelected={isSelected} {...props} />
+        </Dropdown>
+    );
+}
diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItemGroup.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItemGroup.tsx
new file mode 100644
index 00000000000000..f9a1b2bafb8e19
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItemGroup.tsx
@@ -0,0 +1,18 @@
+import { Menu } from 'antd';
+import styled from 'styled-components';
+
+const NavBarMenuItemGroup = styled(Menu.ItemGroup)`
+    .ant-menu-item-group-title {
+        margin-top: 8px;
+        padding: 8px 0;
+        color: #8088a3;
+        font-family: Mulish;
+        font-size: 14px;
+        font-style: normal;
+        font-weight: 700;
+        line-height: normal;
+        min-height: 38px;
+    }
+`;
+
+export default NavBarMenuItemGroup;
diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarSkeleton.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarSkeleton.tsx
new file mode 100644
index 00000000000000..e379247f610454
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarSkeleton.tsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import SkeletonButton from 'antd/lib/skeleton/Button';
+import styled from 'styled-components';
+
+const Spacer = styled.div`
+    flex: 1;
+`;
+
+const FlexWrapper = styled.div`
+    display: flex;
+    gap: 8px;
+    width: 100%;
+    justify-content: center;
+`;
+
+const HeaderWrapper = styled.div`
+    margin-top: 10px;
+`;
+
+const MainMenuWrapper = styled.div`
+    margin-top: 40px;
+    display: flex;
+    gap: 8px;
+    flex-direction: column;
+    height: 100%;
+`;
+
+type Props = {
+    isCollapsed?: boolean;
+};
+
+export default function NavSkeleton({ isCollapsed }: Props) {
+    const menuItem = (
+        <FlexWrapper>
+            <SkeletonButton
+                active
+                style={{ width: isCollapsed ? '24px' : '235px', height: '24px', minWidth: '24px' }}
+            />
+        </FlexWrapper>
+    );
+
+    return (
+        <>
+            <HeaderWrapper>{menuItem}</HeaderWrapper>
+            <MainMenuWrapper>
+                {menuItem}
+                {menuItem}
+                {menuItem}
+                {menuItem}
+                {menuItem}
+                {menuItem}
+                <Spacer />
+                {menuItem}
+                {menuItem}
+                {menuItem}
+            </MainMenuWrapper>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarToggler.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarToggler.tsx
new file mode 100644
index 00000000000000..387ca5a7011fea
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarToggler.tsx
@@ -0,0 +1,37 @@
+import { Sidebar } from '@phosphor-icons/react';
+import React from 'react';
+import styled from 'styled-components';
+import { colors } from '@src/alchemy-components';
+import { useNavBarContext } from './NavBarContext';
+
+const Toggler = styled.button<{ $isCollapsed?: boolean }>`
+    cursor: pointer;
+    margin: 0 0 0 auto;
+    padding: 4px;
+    border-radius: 6px;
+    border: none;
+    display: flex;
+    transition: left 250ms ease-in-out;
+    transition: background 300ms ease-in;
+    background: ${colors.gray[1600]};
+
+    &: hover {
+        background: #ebecf080;
+    }
+
+    & svg {
+        height: 20px;
+        width: 20px;
+        color: ${colors.gray[1800]};
+    }
+`;
+
+export default function NavBarToggler() {
+    const { toggle } = useNavBarContext();
+
+    return (
+        <Toggler onClick={toggle} aria-label="Navbar toggler">
+            <Sidebar />
+        </Toggler>
+    );
+}
diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavSidebar.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavSidebar.tsx
new file mode 100644
index 00000000000000..d2341bd9f67a97
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavSidebar.tsx
@@ -0,0 +1,294 @@
+import React, { useContext, useEffect } from 'react';
+import { HOME_PAGE_INGESTION_ID } from '@src/app/onboarding/config/HomePageOnboardingConfig';
+import { useHandleOnboardingTour } from '@src/app/onboarding/useHandleOnboardingTour';
+import { useUpdateEducationStepsAllowList } from '@src/app/onboarding/useUpdateEducationStepsAllowList';
+import { useEntityRegistry } from '@src/app/useEntityRegistry';
+import { HelpLinkRoutes, PageRoutes } from '@src/conf/Global';
+import { EntityType } from '@src/types.generated';
+import {
+    BookBookmark,
+    Gear,
+    Globe,
+    Plugs,
+    Question,
+    SignOut,
+    SquaresFour,
+    TextColumns,
+    TrendUp,
+    UserCircle,
+} from '@phosphor-icons/react';
+import styled, { useTheme } from 'styled-components';
+import useGetLogoutHandler from '@src/app/auth/useGetLogoutHandler';
+import { colors } from '@src/alchemy-components';
+import AcrylIcon from '../../../../images/acryl-light-mark.svg?react';
+import { useUserContext } from '../../../context/useUserContext';
+import OnboardingContext from '../../../onboarding/OnboardingContext';
+import { useAppConfig } from '../../../useAppConfig';
+import NavBarHeader from './NavBarHeader';
+import NavBarMenu from './NavBarMenu';
+import NavSkeleton from './NavBarSkeleton';
+import { NavBarMenuDropdownItemElement, NavBarMenuItems, NavBarMenuItemTypes } from './types';
+import { useNavBarContext } from './NavBarContext';
+import useSelectedKey from './useSelectedKey';
+
+const Container = styled.div`
+    height: 100vh;
+    background-color: ${colors.gray[1600]};
+    display: flex;
+    flex: column;
+    align-items: center;
+`;
+
+const Content = styled.div<{ isCollapsed: boolean }>`
+    display: flex;
+    flex-direction: column;
+    padding: 17px 8px 17px 16px;
+    height: 100%;
+    width: ${(props) => (props.isCollapsed ? '60px' : '264px')};
+    transition: width 250ms ease-in-out;
+    overflow-x: hidden;
+`;
+
+const CustomLogo = styled.img`
+    object-fit: contain;
+    max-height: 26px;
+    max-width: 26px;
+    min-height: 20px;
+    min-width: 20px;
+`;
+
+const Spacer = styled.div`
+    flex: 1;
+`;
+
+const DEFAULT_LOGO = '/assets/logos/acryl-dark-mark.svg';
+
+const MenuWrapper = styled.div`
+    margin-top: 14px;
+    height: 100%;
+`;
+
+export const NavSidebar = () => {
+    const entityRegistry = useEntityRegistry();
+    const themeConfig = useTheme();
+
+    const { isCollapsed, selectedKey, setSelectedKey } = useNavBarContext();
+    const appConfig = useAppConfig();
+    const userContext = useUserContext();
+    const me = useUserContext();
+
+    const { isUserInitializing } = useContext(OnboardingContext);
+    const { showOnboardingTour } = useHandleOnboardingTour();
+    const { config } = useAppConfig();
+    const logout = useGetLogoutHandler();
+
+    const showAnalytics = (config?.analyticsConfig.enabled && me && me?.platformPrivileges?.viewAnalytics) || false;
+    const showStructuredProperties =
+        config?.featureFlags?.showManageStructuredProperties &&
+        (me.platformPrivileges?.manageStructuredProperties || me.platformPrivileges?.viewStructuredPropertiesPage);
+
+    const showDataSources =
+        config.managedIngestionConfig.enabled &&
+        me &&
+        me.platformPrivileges?.manageIngestion &&
+        me.platformPrivileges?.manageSecrets;
+
+    // Update education steps allow list
+    useUpdateEducationStepsAllowList(!!showDataSources, HOME_PAGE_INGESTION_ID);
+
+    const customLogoUrl = appConfig.config.visualConfig.logoUrl;
+    const hasCustomLogo = customLogoUrl && customLogoUrl !== DEFAULT_LOGO;
+    const logoComponent = hasCustomLogo ? <CustomLogo alt="logo" src={customLogoUrl} /> : <AcrylIcon />;
+
+    const HelpContentMenuItems = themeConfig.content.menu.items.map((value) => ({
+        title: value.label,
+        description: value.description || '',
+        link: value.path,
+        isHidden: false,
+        isExternalLink: true,
+        key: `helpMenu${value.label}`,
+    })) as NavBarMenuDropdownItemElement[];
+
+    const mainMenu: NavBarMenuItems = {
+        items: [
+            {
+                type: NavBarMenuItemTypes.Item,
+                title: 'Home',
+                icon: <SquaresFour />,
+                selectedIcon: <SquaresFour weight="fill" />,
+                key: 'home',
+                link: PageRoutes.ROOT,
+                onlyExactPathMapping: true,
+            },
+            {
+                type: NavBarMenuItemTypes.Group,
+                key: 'govern',
+                title: 'Govern',
+                items: [
+                    {
+                        type: NavBarMenuItemTypes.Item,
+                        title: 'Glossary',
+                        key: 'glossary',
+                        icon: <BookBookmark />,
+                        selectedIcon: <BookBookmark weight="fill" />,
+                        link: PageRoutes.GLOSSARY,
+                        additionalLinksForPathMatching: entityRegistry
+                            .getGlossaryEntities()
+                            .map((entity) => `/${entity.getPathName()}/:urn`),
+                    },
+                    {
+                        type: NavBarMenuItemTypes.Item,
+                        title: 'Domains',
+                        key: 'domains',
+                        icon: <Globe />,
+                        selectedIcon: <Globe weight="fill" />,
+                        link: PageRoutes.DOMAINS,
+                        additionalLinksForPathMatching: [`/${entityRegistry.getPathName(EntityType.Domain)}/:urn`],
+                    },
+                    {
+                        type: NavBarMenuItemTypes.Item,
+                        title: 'Structured Properties',
+                        key: 'structuredProperties',
+                        isHidden: !showStructuredProperties,
+                        icon: <TextColumns />,
+                        selectedIcon: <TextColumns weight="fill" />,
+                        link: PageRoutes.STRUCTURED_PROPERTIES,
+                    },
+                ],
+            },
+            {
+                type: NavBarMenuItemTypes.Group,
+                key: 'admin',
+                title: 'Admin',
+                items: [
+                    {
+                        type: NavBarMenuItemTypes.Item,
+                        title: 'Data Sources',
+                        key: 'dataSources',
+                        isHidden: !showDataSources,
+                        icon: <Plugs />,
+                        selectedIcon: <Plugs weight="fill" />,
+                        link: PageRoutes.INGESTION,
+                    },
+                    {
+                        type: NavBarMenuItemTypes.Item,
+                        title: 'Analytics',
+                        icon: <TrendUp />,
+                        selectedIcon: <TrendUp weight="fill" />,
+                        key: 'analytics',
+                        isHidden: !showAnalytics,
+                        link: PageRoutes.ANALYTICS,
+                    },
+                ],
+            },
+            {
+                type: NavBarMenuItemTypes.Custom,
+                key: 'spacer',
+                render: () => <Spacer />,
+            },
+            {
+                type: NavBarMenuItemTypes.Item,
+                title: 'Profile',
+                icon: <UserCircle />,
+                selectedIcon: <UserCircle weight="fill" />,
+                key: 'profile',
+                link: `/${entityRegistry.getPathName(EntityType.CorpUser)}/${userContext.urn}`,
+            },
+            {
+                type: NavBarMenuItemTypes.Item,
+                title: 'Settings',
+                icon: <Gear />,
+                selectedIcon: <Gear weight="fill" />,
+                key: 'settings',
+                link: '/settings',
+            },
+            {
+                type: NavBarMenuItemTypes.Dropdown,
+                title: 'Help',
+                icon: <Question />,
+                selectedIcon: <Question weight="fill" />,
+                key: 'help',
+                items: [
+                    {
+                        type: NavBarMenuItemTypes.DropdownElement,
+                        title: 'Product Tour',
+                        description: 'Take a quick tour of this page',
+                        key: 'helpProductTour',
+                        onClick: showOnboardingTour,
+                    },
+                    {
+                        type: NavBarMenuItemTypes.DropdownElement,
+                        title: 'GraphQL',
+                        description: 'Explore the GraphQL API',
+                        link: HelpLinkRoutes.GRAPHIQL || null,
+                        isExternalLink: true,
+                        key: 'helpGraphQL',
+                    },
+                    {
+                        type: NavBarMenuItemTypes.DropdownElement,
+                        title: 'OpenAPI',
+                        description: 'Explore the OpenAPI endpoints',
+                        link: HelpLinkRoutes.OPENAPI,
+                        isExternalLink: true,
+                        key: 'helpOpenAPI',
+                    },
+                    ...HelpContentMenuItems,
+                    {
+                        type: NavBarMenuItemTypes.DropdownElement,
+                        title: config?.appVersion || '',
+                        isHidden: !config?.appVersion,
+                        isExternalLink: true,
+                        key: 'helpAppVersion',
+                        disabled: true,
+                    },
+                ],
+            },
+            {
+                type: NavBarMenuItemTypes.Item,
+                title: 'Sign out',
+                icon: <SignOut data-testid="log-out-menu-item" />,
+                key: 'signOut',
+                onClick: logout,
+                href: '/logOut',
+            },
+        ],
+    };
+    const sk = useSelectedKey(mainMenu);
+
+    useEffect(() => setSelectedKey(sk), [sk, setSelectedKey]);
+
+    const showSkeleton = isUserInitializing || !appConfig.loaded || !userContext.loaded;
+
+    const renderSvgSelectedGradientForReusingInIcons = () => {
+        return (
+            <svg
+                style={{ width: 0, height: 0, position: 'absolute', visibility: 'hidden' }}
+                aria-hidden="true"
+                focusable="false"
+            >
+                <linearGradient id="menu-item-selected-gradient" x2="1" y2="1">
+                    <stop offset="20%" stopColor="#7565d6" />
+                    <stop offset="80%" stopColor="#5340cc" />
+                </linearGradient>
+            </svg>
+        );
+    };
+
+    return (
+        <Container>
+            {renderSvgSelectedGradientForReusingInIcons()}
+            <Content isCollapsed={isCollapsed}>
+                {showSkeleton ? (
+                    <NavSkeleton isCollapsed={isCollapsed} />
+                ) : (
+                    <>
+                        <NavBarHeader logotype={logoComponent} />
+                        <MenuWrapper>
+                            <NavBarMenu selectedKey={selectedKey} isCollapsed={isCollapsed} menu={mainMenu} />
+                        </MenuWrapper>
+                    </>
+                )}
+            </Content>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/types.ts b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/types.ts
new file mode 100644
index 00000000000000..2d3aea79f64109
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/types.ts
@@ -0,0 +1,69 @@
+import React from 'react';
+
+export enum NavBarMenuItemTypes {
+    Group = 'SECTION',
+    Item = 'ITEM',
+    Dropdown = 'DROPDOWN',
+    DropdownElement = 'DROPDOWN_ELEMENT',
+    Custom = 'CUSTOM',
+}
+
+export interface NavBarMenuBaseElement {
+    type: NavBarMenuItemTypes;
+    key: string;
+    description?: string;
+    link?: string;
+    // Additional links to detect selected menu item (for subroutes)
+    additionalLinksForPathMatching?: string[];
+    //
+    onlyExactPathMapping?: boolean;
+    isExternalLink?: boolean;
+    isHidden?: boolean;
+    onClick?: () => void;
+    disabled?: boolean;
+    href?: string;
+}
+
+export type Badge = {
+    count: number;
+    show?: boolean;
+};
+
+export interface NavBarMenuBaseItem extends NavBarMenuBaseElement {
+    icon: React.ReactNode;
+    selectedIcon?: React.ReactNode;
+    title: string;
+    badge?: Badge;
+}
+
+export type NavBarMenuLinkItem = NavBarMenuBaseItem & {
+    type: NavBarMenuItemTypes.Item;
+    title: string;
+};
+
+export type NavBarMenuDropdownItem = NavBarMenuBaseItem & {
+    type: NavBarMenuItemTypes.Dropdown;
+    items?: NavBarMenuDropdownItemElement[];
+};
+
+export type NavBarMenuDropdownItemElement = NavBarMenuBaseElement & {
+    type: NavBarMenuItemTypes.DropdownElement;
+    title: string;
+};
+
+export type NavBarMenuGroup = NavBarMenuBaseElement & {
+    title?: string;
+    type: NavBarMenuItemTypes.Group;
+    items?: Array<NavBarMenuLinkItem | NavBarMenuDropdownItem>;
+};
+
+export type NavBarCustomElement = NavBarMenuBaseElement & {
+    type: NavBarMenuItemTypes.Custom;
+    render: () => React.ReactNode;
+};
+
+export type AnyMenuItem = NavBarMenuGroup | NavBarMenuLinkItem | NavBarMenuDropdownItem | NavBarCustomElement;
+
+export interface NavBarMenuItems {
+    items: AnyMenuItem[];
+}
diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/useSelectedKey.ts b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/useSelectedKey.ts
new file mode 100644
index 00000000000000..1821929090a5b1
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/useSelectedKey.ts
@@ -0,0 +1,42 @@
+import { useMemo } from 'react';
+import { matchPath, useLocation } from 'react-router';
+import { NavBarMenuItems, NavBarMenuItemTypes } from './types';
+
+export default function useSelectedKey(menu: NavBarMenuItems) {
+    const location = useLocation();
+
+    return useMemo(() => {
+        const createItem = (item) => ({
+            item,
+            key: item.key,
+            links: [item.link, ...(item.additionalLinksForPathMatching || [])],
+        });
+
+        const allItems = menu.items.flatMap((item) => {
+            const baseItem = createItem(item);
+            if (item.type === NavBarMenuItemTypes.Group && item.items) {
+                const subItems = item.items.map(createItem);
+                return [baseItem, ...subItems];
+            }
+            return [baseItem];
+        });
+
+        const matchedItems = allItems
+            .map((currentItem) => {
+                const match = matchPath(location.pathname, currentItem.links);
+                return {
+                    ...currentItem,
+                    path: match?.path,
+                    exact: match?.isExact,
+                };
+            })
+            .filter((currentItem) => {
+                const isPathMatched = Boolean(currentItem.path);
+                const isExactMatch = !currentItem.item.onlyExactPathMapping || currentItem.exact;
+                return isPathMatched && isExactMatch;
+            })
+            .sort((a, b) => (b.path?.length ?? 0) - (a.path?.length ?? 0));
+
+        return matchedItems[0]?.key;
+    }, [location.pathname, menu]);
+}
diff --git a/datahub-web-react/src/app/homeV2/layout/shared/styledComponents.tsx b/datahub-web-react/src/app/homeV2/layout/shared/styledComponents.tsx
new file mode 100644
index 00000000000000..46dc01974262dc
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/shared/styledComponents.tsx
@@ -0,0 +1,25 @@
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import React from 'react';
+import styled from 'styled-components';
+
+const ReferenceSectionContainer = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    ${(props) => !props.$isShowNavBarRedesign && 'padding: 0px 12px 0px 12px;'}
+    overflow: wrap;
+`;
+
+export const ReferenceSectionDivider = styled.hr`
+    height: 1px;
+    opacity: 0.1;
+    width: 100%;
+    margin: 20px 0px;
+`;
+
+export const ReferenceSection = ({ children }: { children: React.ReactNode }) => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    return (
+        <ReferenceSectionContainer $isShowNavBarRedesign={isShowNavBarRedesign}>
+            {children}
+            <ReferenceSectionDivider />
+        </ReferenceSectionContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/layout/types.ts b/datahub-web-react/src/app/homeV2/layout/types.ts
new file mode 100644
index 00000000000000..83ef7feccd5d43
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/layout/types.ts
@@ -0,0 +1,30 @@
+export interface NavMenuItem {
+    icon?: React.FunctionComponent<React.SVGProps<SVGSVGElement> & { title?: string }>;
+    title: string;
+    showNewTag?: boolean;
+    description: string;
+    link?: string | null;
+    subMenu?: NavSubMenu;
+    isHidden?: boolean;
+    target?: string;
+    rel?: string;
+    onClick?: () => void;
+}
+
+export interface NavSubMenuItem {
+    title: string;
+    showNewTag?: boolean;
+    description: string;
+    link?: string | null;
+    isHidden?: boolean;
+    target?: string;
+    rel?: string;
+    onClick?: () => void;
+}
+
+export interface NavSubMenu {
+    isOpen: boolean;
+    open: () => void;
+    close: () => void;
+    items: NavSubMenuItem[];
+}
diff --git a/datahub-web-react/src/app/homeV2/persona/PersonalizationLoadingModal.tsx b/datahub-web-react/src/app/homeV2/persona/PersonalizationLoadingModal.tsx
new file mode 100644
index 00000000000000..b9947177dc455c
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/persona/PersonalizationLoadingModal.tsx
@@ -0,0 +1,80 @@
+import React, { useCallback, useContext, useEffect } from 'react';
+import { Modal, Progress } from 'antd';
+import styled from 'styled-components';
+import OnboardingContext from '../../onboarding/OnboardingContext';
+import { REDESIGN_COLORS } from '../../entityV2/shared/constants';
+
+const ModalStyle = styled(Modal)`
+    .ant-modal-content {
+        border-radius: 8px;
+        border: 1px solid #c1c4d0;
+        border-bottom: unset;
+    }
+
+    .ant-modal-body {
+        padding: 0;
+    }
+`;
+
+const ProgressStyle = styled(Progress)`
+    .ant-progress-inner {
+        border-radius: 12px;
+        vertical-align: bottom;
+    }
+
+    .ant-progress-bg {
+        border-radius: 12px;
+        background-color: ${REDESIGN_COLORS.TITLE_PURPLE};
+        height: 4px !important;
+    }
+`;
+
+const ModalContent = styled.span`
+    font-weight: 700;
+    display: flex;
+    justify-content: center;
+    color: ${REDESIGN_COLORS.TEXT_HEADING};
+    padding: 25px 0 0;
+    font-size: 16px;
+`;
+
+const modalMaskStyle = {
+    backgroundColor: 'rgba(0, 0, 0, 0.05)',
+};
+
+export default function PersonalizationLoadingModal() {
+    const { isUserInitializing, setIsUserInitializing } = useContext(OnboardingContext);
+    const [percent, setPercent] = React.useState(0);
+
+    const increaseProgress = useCallback(
+        (intervalId: NodeJS.Timeout) => {
+            const newPercent = Math.min(percent + 20, 100);
+            setPercent(newPercent);
+            if (newPercent === 100) {
+                clearInterval(intervalId);
+                setIsUserInitializing(false);
+            }
+        },
+        [percent, setIsUserInitializing],
+    );
+
+    useEffect(() => {
+        const intervalId = setInterval(() => increaseProgress(intervalId), 1000);
+        return () => clearInterval(intervalId);
+    }, [increaseProgress]);
+
+    return (
+        <ModalStyle
+            open={isUserInitializing}
+            footer={null}
+            title={null}
+            wrapClassName="popup-modal"
+            centered
+            closable={false}
+            maskStyle={modalMaskStyle}
+        >
+            <ModalContent>{`Hang tight! We're getting everything ready for you.`}</ModalContent>
+            <ProgressStyle percent={percent} showInfo={false} />
+        </ModalStyle>
+    );
+}
diff --git a/datahub-web-react/src/app/homeV2/persona/useLoadUserPersona.tsx b/datahub-web-react/src/app/homeV2/persona/useLoadUserPersona.tsx
new file mode 100644
index 00000000000000..c5606b5fa4353a
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/persona/useLoadUserPersona.tsx
@@ -0,0 +1,16 @@
+import { useUserContext } from '../../context/useUserContext';
+import { PersonaType } from '../shared/types';
+
+export const useLoadUserPersona = () => {
+    const user = useUserContext();
+    const userUrn = user.user?.urn;
+    if (!userUrn) {
+        return { persona: PersonaType.BUSINESS_USER, role: undefined };
+    }
+    const persona = user.user?.editableProperties?.persona?.urn;
+    const title = user.user?.editableProperties?.title;
+    return {
+        persona,
+        title,
+    };
+};
diff --git a/datahub-web-react/src/app/homeV2/persona/useUserPersona.ts b/datahub-web-react/src/app/homeV2/persona/useUserPersona.ts
new file mode 100644
index 00000000000000..713b45d2c06df3
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/persona/useUserPersona.ts
@@ -0,0 +1,41 @@
+import { useEffect } from 'react';
+import { useUserContext } from '../../context/useUserContext';
+import { PersonaType } from '../shared/types';
+import { useLoadUserPersona } from './useLoadUserPersona';
+
+const DEFAULT_PERSONA = PersonaType.BUSINESS_USER;
+
+export const useUserPersona = (): PersonaType => {
+    const user = useUserContext();
+    const loadedPersona = useLoadUserPersona()?.persona;
+    return (user?.user as any)?.persona || loadedPersona || DEFAULT_PERSONA;
+};
+
+export const useUserPersonaTitle = (): string | null => {
+    return useLoadUserPersona()?.title || null;
+};
+
+const USER_PERSONA_KEY = 'acrylUserPersona';
+
+export function useSetUserPersona() {
+    const userPersona = useUserPersona();
+    useEffect(() => {
+        setUserPersonaLocalStorage(userPersona);
+    }, [userPersona]);
+}
+
+export function loadUserPersonaFromLocalStorage(): PersonaType | null {
+    const userPersona = localStorage.getItem(USER_PERSONA_KEY);
+    const isInEnum = userPersona && (Object.values(PersonaType) as string[]).includes(userPersona);
+    return userPersona && isInEnum ? (userPersona as PersonaType) : null;
+}
+
+function setUserPersonaLocalStorage(userPersona: PersonaType) {
+    if (loadUserPersonaFromLocalStorage() !== userPersona) {
+        saveToLocalStorage(userPersona);
+    }
+}
+
+function saveToLocalStorage(userPersona: PersonaType) {
+    localStorage.setItem(USER_PERSONA_KEY, String(userPersona));
+}
diff --git a/datahub-web-react/src/app/homeV2/reference/header/GreetingText.tsx b/datahub-web-react/src/app/homeV2/reference/header/GreetingText.tsx
new file mode 100644
index 00000000000000..cd2830e586e9c7
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/header/GreetingText.tsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import styled from 'styled-components';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { EntityType } from '../../../../types.generated';
+import { useUserContext } from '../../../context/useUserContext';
+import { getGreetingText } from './getGreetingText';
+
+const Text = styled.div`
+    font-size: 20px;
+    padding: 0 17px 19px 17px;
+    display: flex;
+    flex-direction: column;
+    align-items: start;
+    justify-content: end;
+    width: auto;
+    overflow: hidden;
+`;
+
+const Name = styled.div`
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+`;
+
+const Role = styled.div`
+    font-size: 12px;
+`;
+
+export const GreetingText = ({ role }: { role?: string | null }) => {
+    const entityRegistry = useEntityRegistry();
+    const userContext = useUserContext();
+    const greetingText = getGreetingText();
+    const { user } = userContext;
+    return (
+        <Text>
+            {!!user && (
+                <>
+                    {greetingText},<Name>{entityRegistry.getDisplayName(EntityType.CorpUser, user)}!</Name>
+                    {(role && <Role>{role}</Role>) || null}
+                </>
+            )}{' '}
+        </Text>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/header/UserHeader.tsx b/datahub-web-react/src/app/homeV2/reference/header/UserHeader.tsx
new file mode 100644
index 00000000000000..34cc792bda6477
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/header/UserHeader.tsx
@@ -0,0 +1,63 @@
+import React, { useContext } from 'react';
+import styled from 'styled-components';
+import { Skeleton } from 'antd';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { useUserContext } from '../../../context/useUserContext';
+import { GreetingText } from './GreetingText';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { EntityType } from '../../../../types.generated';
+import { UserHeaderImage } from './UserHeaderImage';
+import { useUserPersonaTitle } from '../../persona/useUserPersona';
+import OnboardingContext from '../../../onboarding/OnboardingContext';
+
+const Container = styled.div`
+    min-height: 240px;
+    position: relative;
+    display: flex;
+`;
+
+const GreetingTextWrapper = styled.div`
+    color: #ffffff;
+    position: absolute;
+    background: linear-gradient(180deg, rgba(0, 0, 0, 0) 7%, #000 88.79%);
+    width: 100%;
+    height: 100%;
+    display: flex;
+    opacity: 0.8;
+`;
+
+const SkeletonButton = styled(Skeleton.Button)<{ $isShowNavBarRedesign?: boolean }>`
+    &&& {
+        width: 100%;
+        min-height: 240px;
+        border-top-left-radius: ${(props) =>
+            props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '16px'};
+        border-top-right-radius: ${(props) =>
+            props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '16px'};
+    }
+`;
+
+export const UserHeader = () => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    const entityRegistry = useEntityRegistry();
+    const { user } = useUserContext();
+    const photoUrl = user?.editableProperties?.pictureLink || undefined;
+    const displayName = user && entityRegistry.getDisplayName(EntityType.CorpUser, user);
+    const maybeRole = useUserPersonaTitle();
+    const { isUserInitializing } = useContext(OnboardingContext);
+
+    return (
+        <Container>
+            {isUserInitializing || !user ? (
+                <SkeletonButton shape="square" size="large" active block $isShowNavBarRedesign={isShowNavBarRedesign} />
+            ) : (
+                <>
+                    <UserHeaderImage photoUrl={photoUrl} displayName={displayName || undefined} />
+                    <GreetingTextWrapper>
+                        <GreetingText role={maybeRole} />
+                    </GreetingTextWrapper>
+                </>
+            )}
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/header/UserHeaderImage.tsx b/datahub-web-react/src/app/homeV2/reference/header/UserHeaderImage.tsx
new file mode 100644
index 00000000000000..3ca96c3357ab1f
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/header/UserHeaderImage.tsx
@@ -0,0 +1,57 @@
+import React from 'react';
+import styled from 'styled-components';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import getAvatarColor from '../../../shared/avatar/getAvatarColor';
+
+const PreviewImage = styled.img<{ $isShowNavBarRedesign?: boolean }>`
+    color: white;
+    width: 100%;
+    min-height: 240px;
+    max-height: 260px;
+    height: auto;
+    object-fit: cover;
+    background-color: transparent;
+    border-top-left-radius: ${(props) =>
+        props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '16px'};
+    border-top-right-radius: ${(props) =>
+        props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '16px'};
+    ${(props) => !props.$isShowNavBarRedesign && 'border: 2px solid #ffffff;'}
+`;
+
+const PreviewLetter = styled.div<{ color: string; $isShowNavBarRedesign?: boolean }>`
+    background-color: ${(props) => props.color};
+    font-size: 52px;
+    color: white;
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-top-left-radius: ${(props) =>
+        props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '16px'};
+    border-top-right-radius: ${(props) =>
+        props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '16px'};
+    ${(props) => !props.$isShowNavBarRedesign && 'border: 2px solid #ffffff;'}
+`;
+
+type Props = {
+    photoUrl?: string;
+    displayName?: string;
+};
+
+export const UserHeaderImage = ({ photoUrl, displayName }: Props) => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    const hasPhoto = !!photoUrl;
+    const firstLetter = displayName?.[0] || '';
+    return (
+        <>
+            {(hasPhoto && (
+                <PreviewImage src={photoUrl} alt={displayName} $isShowNavBarRedesign={isShowNavBarRedesign} />
+            )) || (
+                <PreviewLetter color={getAvatarColor(displayName)} $isShowNavBarRedesign={isShowNavBarRedesign}>
+                    {' '}
+                    {firstLetter}{' '}
+                </PreviewLetter>
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/header/getGreetingText.ts b/datahub-web-react/src/app/homeV2/reference/header/getGreetingText.ts
new file mode 100644
index 00000000000000..9eb9237e1d1d2d
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/header/getGreetingText.ts
@@ -0,0 +1,10 @@
+export const getGreetingText = () => {
+    const currentHour = new Date().getHours(); // gets the current hour (0-23)
+    if (currentHour < 12) {
+        return 'Good morning';
+    }
+    if (currentHour < 17) {
+        return 'Good afternoon';
+    }
+    return 'Good evening';
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/DefaultEmptyEntityList.tsx b/datahub-web-react/src/app/homeV2/reference/sections/DefaultEmptyEntityList.tsx
new file mode 100644
index 00000000000000..f367955b3b70f2
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/DefaultEmptyEntityList.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../entity/shared/constants';
+
+const Text = styled.div`
+    font-size: 14px;
+    color: ${ANTD_GRAY[7]};
+`;
+
+export const DefaultEmptyEntityList = () => {
+    return <Text>None found 😞</Text>;
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/EntityLink.tsx b/datahub-web-react/src/app/homeV2/reference/sections/EntityLink.tsx
new file mode 100644
index 00000000000000..715fdb4a43f11e
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/EntityLink.tsx
@@ -0,0 +1,150 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled, { CSSObject } from 'styled-components';
+import HealthIcon from '@src/app/previewV2/HealthIcon';
+import { useEmbeddedProfileLinkProps } from '@src/app/shared/useEmbeddedProfileLinkProps';
+import PlatformHeaderIcons from '@src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformHeaderIcons';
+import { getEntityPlatforms } from '@src/app/entityV2/shared/containers/profile/header/utils';
+import { Entity, EntityType } from '../../../../types.generated';
+import { GenericEntityProperties } from '../../../entity/shared/types';
+import { HoverEntityTooltip } from '../../../recommendations/renderer/component/HoverEntityTooltip';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { GlossaryPreviewCardDecoration } from '../../../entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration';
+
+const Container = styled.div<{ showHover: boolean; entity: GenericEntityProperties }>`
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    overflow: hidden;
+    border-radius: 8px;
+    cursor: pointer;
+    width: ${(props) => props.entity.type === EntityType.GlossaryTerm && 'fit-content'};
+    border: ${(props) => (props.entity.type === EntityType.GlossaryTerm ? '1px solid #C1C4D0' : 'none')};
+
+    :hover {
+        ${(props) => props.showHover && 'background-color: #f5f7fa;'}
+    }
+
+    > a {
+        margin: ${(props) => props.entity.type === EntityType.GlossaryTerm && '0px'};
+    }
+`;
+
+const IconWrapper = styled.div`
+    padding-right: 4px;
+`;
+
+const LinkButton = styled(Link)<{ includePadding: boolean }>`
+    padding: ${(props) => (props.includePadding ? '2px 4px' : '0px')};
+    height: auto;
+    margin: 4px 0px 4px 0px;
+    max-width: 100%; /* Ensure the grid container does not exceed its parent's width */
+    overflow-x: hidden;
+    width: 100%;
+
+    &&& {
+        display: flex;
+        align-items: center;
+        gap: 4px;
+    }
+`;
+
+const DisplayNameText = styled.span<{ entity: GenericEntityProperties }>`
+    color: #52596c;
+    font-family: Mulish;
+    font-size: 12px;
+    font-style: normal;
+    font-weight: 600;
+    line-height: normal;
+    padding: ${(props) => props.entity.type === EntityType.GlossaryTerm && '8px 10px 8px 0px'};
+
+    overflow: hidden;
+    text-overflow: ellipsis;
+`;
+
+const RibbonDecoration = styled.div`
+    width: 22px;
+    height: 32px;
+    position: relative;
+    overflow: hidden;
+
+    > span {
+        top: -10px;
+        padding: 5px;
+    }
+`;
+
+type Props = {
+    entity: GenericEntityProperties | null;
+    styles?: CSSObject;
+    displayTextStyle?: CSSObject;
+    render?: (entity: GenericEntityProperties) => React.ReactNode;
+    onClick?: (e) => void;
+    showHealthIcon?: boolean;
+};
+
+export const EntityLink = ({ entity, styles, render, displayTextStyle, onClick, showHealthIcon = false }: Props) => {
+    const entityRegistry = useEntityRegistry();
+    const linkProps = useEmbeddedProfileLinkProps();
+
+    if (!entity?.urn || !entity.type) return null;
+
+    const displayName = entityRegistry.getDisplayName(entity.type, entity);
+
+    const getPlatformIcon = (entityData: GenericEntityProperties) => {
+        if (entityData.type === EntityType.GlossaryTerm) {
+            return (
+                <RibbonDecoration>
+                    <GlossaryPreviewCardDecoration urn={entity.urn || ''} entityData={entity} />
+                </RibbonDecoration>
+            );
+        }
+        const { platform, platforms } = getEntityPlatforms(entityData.type || null, entityData);
+        return platform || !!platforms?.length ? (
+            <PlatformHeaderIcons
+                platform={platform || undefined}
+                platforms={platforms || undefined}
+                size={17}
+                styles={{
+                    padding: '4px',
+                    borderRadius: '8px',
+                    ...styles,
+                }}
+            />
+        ) : null;
+    };
+
+    return (
+        <Container showHover={!render} entity={entity}>
+            {render ? (
+                render(entity)
+            ) : (
+                <>
+                    <HoverEntityTooltip entity={entity as Entity} showArrow={false} placement="bottom">
+                        <LinkButton
+                            includePadding={entity.type !== EntityType.GlossaryTerm}
+                            to={!onClick ? entityRegistry.getEntityUrl(entity.type, entity.urn) : undefined}
+                            onClick={onClick}
+                            {...linkProps}
+                        >
+                            {getPlatformIcon(entity)}
+                            <DisplayNameText entity={entity} style={{ ...displayTextStyle }}>
+                                {displayName}
+                            </DisplayNameText>
+                        </LinkButton>
+                    </HoverEntityTooltip>
+                    {entity?.health && showHealthIcon && (
+                        <IconWrapper>
+                            <HealthIcon
+                                urn={entity?.urn}
+                                health={entity.health}
+                                baseUrl={entityRegistry.getEntityUrl(entity.type, entity.urn)}
+                            />
+                        </IconWrapper>
+                    )}
+                </>
+            )}
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/EntityLinkList.tsx b/datahub-web-react/src/app/homeV2/reference/sections/EntityLinkList.tsx
new file mode 100644
index 00000000000000..9ce5a3150c845e
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/EntityLinkList.tsx
@@ -0,0 +1,108 @@
+import React, { useContext } from 'react';
+import styled from 'styled-components';
+import { Tooltip } from '@components';
+import { useEntityRegistryV2 } from '@src/app/useEntityRegistry';
+import { Entity, EntityType } from '../../../../types.generated';
+import { EntityLink } from './EntityLink';
+import { EntityLinkListSkeleton } from './EntityLinkListSkeleton';
+import { DefaultEmptyEntityList } from './DefaultEmptyEntityList';
+import { ANTD_GRAY } from '../../../entity/shared/constants';
+import { GenericEntityProperties } from '../../../entity/shared/types';
+import OnboardingContext from '../../../onboarding/OnboardingContext';
+
+const Title = styled.div<{ hasAction: boolean }>`
+    ${(props) => props.hasAction && `:hover { cursor: pointer; }`}
+    color: #403d5c;
+    font-weight: 600;
+    font-size: 16px;
+    margin-bottom: 8px;
+`;
+
+const List = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+`;
+
+const ShowMoreButton = styled.div`
+    margin-top: 12px;
+    padding: 0px;
+    color: ${ANTD_GRAY[7]};
+    :hover {
+        cursor: pointer;
+        color: ${ANTD_GRAY[8]};
+        text-decoration: underline;
+    }
+`;
+
+type Props = {
+    loading: boolean;
+    title?: string;
+    tip?: React.ReactNode;
+    entities: (Entity | GenericEntityProperties | null | undefined)[];
+    showMore?: boolean;
+    showMoreComponent?: React.ReactNode;
+    showMoreCount?: number;
+    showHealthIcon?: boolean;
+    empty?: React.ReactNode;
+    onClickMore?: () => void;
+    onClickTitle?: () => void;
+    render?: (entity: GenericEntityProperties) => React.ReactNode;
+};
+
+export const EntityLinkList = ({
+    loading,
+    title,
+    tip,
+    entities,
+    showMoreComponent,
+    showMore = false,
+    showMoreCount,
+    showHealthIcon = false,
+    empty,
+    onClickMore,
+    onClickTitle,
+    render,
+}: Props) => {
+    const entityRegistry = useEntityRegistryV2();
+    const isEmpty = entities.length === 0 && !loading;
+    const { isUserInitializing } = useContext(OnboardingContext);
+
+    if (isUserInitializing || loading) {
+        return <EntityLinkListSkeleton />;
+    }
+
+    return (
+        <>
+            {title && (
+                <Title hasAction={onClickTitle !== undefined} onClick={onClickTitle}>
+                    <Tooltip title={tip} showArrow={false} placement="right">
+                        {title}
+                    </Tooltip>
+                </Title>
+            )}
+            <List data-testid="test">
+                {(!isEmpty &&
+                    entities.map((entity) => {
+                        return (
+                            <EntityLink
+                                key={`${title}-${entity?.urn}`}
+                                entity={
+                                    entity
+                                        ? entityRegistry.getGenericEntityProperties(entity.type as EntityType, entity)
+                                        : null
+                                }
+                                render={render}
+                                showHealthIcon={showHealthIcon}
+                            />
+                        );
+                    })) || <>{empty || <DefaultEmptyEntityList />}</>}
+            </List>
+            {showMore && (
+                <ShowMoreButton onClick={onClickMore}>
+                    {showMoreComponent || (showMoreCount && <>show {showMoreCount} more</>) || <>show more</>}
+                </ShowMoreButton>
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/EntityLinkListSkeleton.tsx b/datahub-web-react/src/app/homeV2/reference/sections/EntityLinkListSkeleton.tsx
new file mode 100644
index 00000000000000..01913403b7ab1f
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/EntityLinkListSkeleton.tsx
@@ -0,0 +1,50 @@
+import { Col, Row, Skeleton } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+
+const SkeletonContainer = styled(Row)`
+    && {
+        margin-bottom: 20px;
+        border-bottom: 1px solid #ebecf0;
+        .ant-skeleton-button-sm {
+            height: 16px;
+        }
+        .ant-skeleton-avatar-circle {
+            height: 16px;
+            width: 16px;
+        }
+    }
+`;
+const SkeletonCol = styled(Col)`
+    margin-bottom: 20px;
+    width: 100%;
+    display: flex;
+    align-items: center;
+    gap: 1rem;
+`;
+
+const SkeletonButton = styled(Skeleton.Button)<{ width?: string }>`
+    &&& {
+        width: ${(props) => props.width && props.width};
+    }
+`;
+
+export const EntityLinkListSkeleton = () => {
+    return (
+        <SkeletonContainer>
+            <SkeletonCol>
+                <SkeletonButton active size="small" shape="square" width="10rem" />
+                <Skeleton.Avatar active size="small" shape="circle" />
+            </SkeletonCol>
+
+            <SkeletonCol>
+                <Skeleton.Avatar active size="small" shape="square" />
+                <SkeletonButton active size="small" shape="square" block width="12rem" />
+            </SkeletonCol>
+            <SkeletonCol>
+                <Skeleton.Avatar active size="small" shape="square" />
+                <SkeletonButton active size="small" shape="square" block width="5rem" />
+            </SkeletonCol>
+        </SkeletonContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/assets/AssetsYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/assets/AssetsYouOwn.tsx
new file mode 100644
index 00000000000000..89ebccc18f6bd7
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/assets/AssetsYouOwn.tsx
@@ -0,0 +1,63 @@
+import React, { useState } from 'react';
+import { useUserContext } from '../../../../context/useUserContext';
+import { EntityLinkList } from '../EntityLinkList';
+import { EmbeddedListSearchModal } from '../../../../entityV2/shared/components/styled/search/EmbeddedListSearchModal';
+import {
+    ASSET_ENTITY_TYPES,
+    ENTITY_FILTER_NAME,
+    OWNERS_FILTER_NAME,
+    UnionType,
+} from '../../../../searchV2/utils/constants';
+import { useGetAssetsYouOwn } from './useGetAssetsYouOwn';
+import { EmptyAssetsYouOwn } from './EmptyAssetsYouOwn';
+import { ReferenceSectionProps } from '../../types';
+import { ReferenceSection } from '../../../layout/shared/styledComponents';
+
+const DEFAULT_MAX_ENTITIES_TO_SHOW = 5;
+
+// TODO: Add group ownership into this.
+export const AssetsYouOwn = ({ hideIfEmpty }: ReferenceSectionProps) => {
+    const userContext = useUserContext();
+    const { user } = userContext;
+    const [entityCount, setEntityCount] = useState(DEFAULT_MAX_ENTITIES_TO_SHOW);
+    const [showModal, setShowModal] = useState(false);
+    const { entities, loading } = useGetAssetsYouOwn(user);
+
+    if (hideIfEmpty && entities.length === 0) {
+        return null;
+    }
+
+    return (
+        <ReferenceSection>
+            <EntityLinkList
+                loading={loading || !user}
+                entities={entities.slice(0, entityCount)}
+                title="Your assets"
+                tip="Things you are an owner of"
+                showMore={entities.length > entityCount}
+                showMoreCount={
+                    entityCount + DEFAULT_MAX_ENTITIES_TO_SHOW > entities.length
+                        ? entities.length - entityCount
+                        : DEFAULT_MAX_ENTITIES_TO_SHOW
+                }
+                onClickMore={() => setEntityCount(entityCount + DEFAULT_MAX_ENTITIES_TO_SHOW)}
+                onClickTitle={() => setShowModal(true)}
+                empty={<EmptyAssetsYouOwn />}
+            />
+            {showModal && (
+                <EmbeddedListSearchModal
+                    title="Your assets"
+                    fixedFilters={{
+                        unionType: UnionType.AND,
+                        filters: [
+                            { field: OWNERS_FILTER_NAME, values: [user?.urn as string] },
+                            { field: ENTITY_FILTER_NAME, values: [...ASSET_ENTITY_TYPES] },
+                        ],
+                    }}
+                    onClose={() => setShowModal(false)}
+                    placeholderText="Filter assets you own..."
+                />
+            )}
+        </ReferenceSection>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/assets/EmptyAssetsYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/assets/EmptyAssetsYouOwn.tsx
new file mode 100644
index 00000000000000..acbb04acc0be74
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/assets/EmptyAssetsYouOwn.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../../entity/shared/constants';
+
+const Text = styled.div`
+    font-size: 14px;
+    color: ${ANTD_GRAY[7]};
+`;
+
+export const EmptyAssetsYouOwn = () => {
+    return (
+        <Text>
+            You do not own any assets yet.
+            <br />
+            <a
+                target="_blank"
+                rel="noreferrer noopener"
+                href="https://datahubproject.io/docs/ownership/ownership-types"
+            >
+                Learn more
+            </a>{' '}
+            about ownership.
+        </Text>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/assets/useGetAssetsYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/assets/useGetAssetsYouOwn.tsx
new file mode 100644
index 00000000000000..ac2bf35c58a93c
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/assets/useGetAssetsYouOwn.tsx
@@ -0,0 +1,41 @@
+import { useGetSearchResultsForMultipleQuery } from '../../../../../graphql/search.generated';
+import { CorpUser } from '../../../../../types.generated';
+import { ASSET_ENTITY_TYPES, OWNERS_FILTER_NAME } from '../../../../searchV2/utils/constants';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+
+const MAX_ASSETS_TO_FETCH = 50;
+
+// TODO: Add Group Ownership here as well.
+export const useGetAssetsYouOwn = (user?: CorpUser | null, count = MAX_ASSETS_TO_FETCH) => {
+    const { loading, data, error } = useGetSearchResultsForMultipleQuery({
+        variables: {
+            input: {
+                query: '*',
+                start: 0,
+                count,
+                types: ASSET_ENTITY_TYPES,
+                filters: [
+                    {
+                        field: OWNERS_FILTER_NAME,
+                        value: user?.urn,
+                        values: [user?.urn as string],
+                    },
+                ],
+                searchFlags: {
+                    skipCache: true,
+                },
+            },
+        },
+        skip: !user?.urn,
+        fetchPolicy: 'cache-first',
+    });
+
+    const entityRegistry = useEntityRegistry();
+    const entities =
+        data?.searchAcrossEntities?.searchResults?.map((result) =>
+            entityRegistry.getGenericEntityProperties(result.entity.type, result.entity),
+        ) || [];
+    const total = data?.searchAcrossEntities?.total || 0;
+
+    return { entities, loading, error, total };
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/domains/DataProductsYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/domains/DataProductsYouOwn.tsx
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/domains/DomainsYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/domains/DomainsYouOwn.tsx
new file mode 100644
index 00000000000000..48539877831b1c
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/domains/DomainsYouOwn.tsx
@@ -0,0 +1,60 @@
+import React, { useState } from 'react';
+import { useUserContext } from '../../../../context/useUserContext';
+import { EntityLinkList } from '../EntityLinkList';
+import { EmbeddedListSearchModal } from '../../../../entityV2/shared/components/styled/search/EmbeddedListSearchModal';
+import { ENTITY_FILTER_NAME, OWNERS_FILTER_NAME, UnionType } from '../../../../searchV2/utils/constants';
+import { Domain, EntityType } from '../../../../../types.generated';
+import { EmptyDomainsYouOwn } from './EmptyDomainsYouOwn';
+import { useGetDomainsYouOwn } from './useGetDomainsYouOwn';
+import { ReferenceSectionProps } from '../../types';
+import { ReferenceSection } from '../../../layout/shared/styledComponents';
+import { DomainMiniPreview } from '../../../../entityV2/shared/links/DomainMiniPreview';
+
+const DEFAULT_MAX_ENTITIES_TO_SHOW = 5;
+
+export const DomainsYouOwn = ({ hideIfEmpty }: ReferenceSectionProps) => {
+    const userContext = useUserContext();
+    const { user } = userContext;
+    const [entityCount, setEntityCount] = useState(DEFAULT_MAX_ENTITIES_TO_SHOW);
+    const [showModal, setShowModal] = useState(false);
+    const { entities, loading } = useGetDomainsYouOwn(user);
+
+    if (hideIfEmpty && entities.length === 0) {
+        return null;
+    }
+
+    return (
+        <ReferenceSection>
+            <EntityLinkList
+                loading={loading || !user}
+                entities={entities.slice(0, entityCount)}
+                title="Your domains"
+                tip="Domains that you are an owner of"
+                showMore={entities.length > entityCount}
+                showMoreCount={
+                    entityCount + DEFAULT_MAX_ENTITIES_TO_SHOW > entities.length
+                        ? entities.length - entityCount
+                        : DEFAULT_MAX_ENTITIES_TO_SHOW
+                }
+                onClickMore={() => setEntityCount(entityCount + DEFAULT_MAX_ENTITIES_TO_SHOW)}
+                onClickTitle={() => setShowModal(true)}
+                empty={<EmptyDomainsYouOwn />}
+                render={(entity) => <DomainMiniPreview domain={entity as Domain} />}
+            />
+            {showModal && (
+                <EmbeddedListSearchModal
+                    title="Your domains"
+                    fixedFilters={{
+                        unionType: UnionType.AND,
+                        filters: [
+                            { field: OWNERS_FILTER_NAME, values: [user?.urn as string] },
+                            { field: ENTITY_FILTER_NAME, values: [EntityType.Domain] },
+                        ],
+                    }}
+                    onClose={() => setShowModal(false)}
+                    placeholderText="Filter domains you own..."
+                />
+            )}
+        </ReferenceSection>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/domains/EmptyDomainsYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/domains/EmptyDomainsYouOwn.tsx
new file mode 100644
index 00000000000000..83f00ada7662e2
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/domains/EmptyDomainsYouOwn.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../../entity/shared/constants';
+
+const Text = styled.div`
+    font-size: 14px;
+    color: ${ANTD_GRAY[7]};
+`;
+
+export const EmptyDomainsYouOwn = () => {
+    return (
+        <Text>
+            You are not the owner of any domains yet.
+            <br />
+            <a target="_blank" rel="noreferrer noopener" href="https://datahubproject.io/docs/domains">
+                Learn more
+            </a>{' '}
+            about domains.
+        </Text>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/domains/useGetDomainsYouOwn.ts b/datahub-web-react/src/app/homeV2/reference/sections/domains/useGetDomainsYouOwn.ts
new file mode 100644
index 00000000000000..7653ce68dcbc1e
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/domains/useGetDomainsYouOwn.ts
@@ -0,0 +1,40 @@
+import { useGetSearchResultsForMultipleQuery } from '../../../../../graphql/search.generated';
+import { CorpUser, EntityType } from '../../../../../types.generated';
+import { OWNERS_FILTER_NAME } from '../../../../searchV2/utils/constants';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+
+const MAX_ASSETS_TO_FETCH = 50;
+
+// TODO: Add Group Ownership here as well.
+export const useGetDomainsYouOwn = (user?: CorpUser | null, count = MAX_ASSETS_TO_FETCH) => {
+    const { loading, data, error } = useGetSearchResultsForMultipleQuery({
+        variables: {
+            input: {
+                query: '*',
+                start: 0,
+                count,
+                types: [EntityType.Domain],
+                searchFlags: {
+                    skipCache: true,
+                },
+                filters: [
+                    {
+                        field: OWNERS_FILTER_NAME,
+                        value: user?.urn,
+                        values: [user?.urn as string],
+                    },
+                ],
+            },
+        },
+        skip: !user?.urn,
+        fetchPolicy: 'cache-first',
+    });
+
+    const entityRegistry = useEntityRegistry();
+    const entities =
+        data?.searchAcrossEntities?.searchResults?.map((result) =>
+            entityRegistry.getGenericEntityProperties(result.entity.type, result.entity),
+        ) || [];
+
+    return { entities, loading, error };
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/glossary/EmptyGlossaryNodesYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/glossary/EmptyGlossaryNodesYouOwn.tsx
new file mode 100644
index 00000000000000..93c8f03f7d3ef7
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/glossary/EmptyGlossaryNodesYouOwn.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../../entity/shared/constants';
+
+const Text = styled.div`
+    font-size: 14px;
+    color: ${ANTD_GRAY[7]};
+`;
+
+export const EmptyGlossaryNodesYouOwn = () => {
+    return (
+        <Text>
+            You have not created any glossary terms or groups yet. <br />
+            <a
+                target="_blank"
+                rel="noreferrer noopener"
+                href="https://datahubproject.io/docs/glossary/business-glossary/"
+            >
+                Learn more
+            </a>{' '}
+            about glossary items.
+        </Text>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/glossary/GlossaryNodesYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/glossary/GlossaryNodesYouOwn.tsx
new file mode 100644
index 00000000000000..fdf023d7eb36fe
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/glossary/GlossaryNodesYouOwn.tsx
@@ -0,0 +1,60 @@
+import React, { useState } from 'react';
+import { useUserContext } from '../../../../context/useUserContext';
+import { EntityLinkList } from '../EntityLinkList';
+import { EmbeddedListSearchModal } from '../../../../entityV2/shared/components/styled/search/EmbeddedListSearchModal';
+import { ENTITY_FILTER_NAME, OWNERS_FILTER_NAME, UnionType } from '../../../../searchV2/utils/constants';
+import { useGetGlossaryNodesYouOwn } from './useGetGlossaryNodesYouOwn';
+import { EmptyGlossaryNodesYouOwn } from './EmptyGlossaryNodesYouOwn';
+import { EntityType, GlossaryTerm } from '../../../../../types.generated';
+import { ReferenceSectionProps } from '../../types';
+import { ReferenceSection } from '../../../layout/shared/styledComponents';
+import { GlossaryTermMiniPreview } from '../../../../entityV2/shared/links/GlossaryTermMiniPreview';
+
+const DEFAULT_MAX_ENTITIES_TO_SHOW = 5;
+
+export const GlossaryNodesYouOwn = ({ hideIfEmpty }: ReferenceSectionProps) => {
+    const userContext = useUserContext();
+    const { user } = userContext;
+    const [entityCount, setEntityCount] = useState(DEFAULT_MAX_ENTITIES_TO_SHOW);
+    const [showModal, setShowModal] = useState(false);
+    const { entities, loading } = useGetGlossaryNodesYouOwn(user);
+
+    if (hideIfEmpty && entities.length === 0) {
+        return null;
+    }
+
+    return (
+        <ReferenceSection>
+            <EntityLinkList
+                loading={loading || !user}
+                entities={entities.slice(0, entityCount)}
+                title="Your glossary terms"
+                tip="Glossary Terms that you own"
+                showMore={entities.length > entityCount}
+                showMoreCount={
+                    entityCount + DEFAULT_MAX_ENTITIES_TO_SHOW > entities.length
+                        ? entities.length - entityCount
+                        : DEFAULT_MAX_ENTITIES_TO_SHOW
+                }
+                onClickMore={() => setEntityCount(entityCount + DEFAULT_MAX_ENTITIES_TO_SHOW)}
+                onClickTitle={() => setShowModal(true)}
+                empty={<EmptyGlossaryNodesYouOwn />}
+                render={(entity) => <GlossaryTermMiniPreview glossaryTerm={entity as GlossaryTerm} />}
+            />
+            {showModal && (
+                <EmbeddedListSearchModal
+                    title="Your glossary"
+                    fixedFilters={{
+                        unionType: UnionType.AND,
+                        filters: [
+                            { field: OWNERS_FILTER_NAME, values: [user?.urn as string] },
+                            { field: ENTITY_FILTER_NAME, values: [EntityType.GlossaryNode, EntityType.GlossaryTerm] },
+                        ],
+                    }}
+                    onClose={() => setShowModal(false)}
+                    placeholderText="Filter glossary terms and groups..."
+                />
+            )}
+        </ReferenceSection>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/glossary/useGetGlossaryNodesYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/glossary/useGetGlossaryNodesYouOwn.tsx
new file mode 100644
index 00000000000000..86fe77123faa5f
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/glossary/useGetGlossaryNodesYouOwn.tsx
@@ -0,0 +1,40 @@
+import { useGetSearchResultsForMultipleQuery } from '../../../../../graphql/search.generated';
+import { CorpUser, EntityType } from '../../../../../types.generated';
+import { OWNERS_FILTER_NAME } from '../../../../searchV2/utils/constants';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+
+const MAX_ASSETS_TO_FETCH = 50;
+
+// TODO: Add Group Ownership here as well.
+export const useGetGlossaryNodesYouOwn = (user?: CorpUser | null, count = MAX_ASSETS_TO_FETCH) => {
+    const { loading, data, error } = useGetSearchResultsForMultipleQuery({
+        variables: {
+            input: {
+                query: '*',
+                start: 0,
+                count,
+                types: [EntityType.GlossaryTerm],
+                filters: [
+                    {
+                        field: OWNERS_FILTER_NAME,
+                        value: user?.urn,
+                        values: [user?.urn as string],
+                    },
+                ],
+                searchFlags: {
+                    skipCache: true,
+                },
+            },
+        },
+        skip: !user,
+        fetchPolicy: 'cache-first',
+    });
+
+    const entityRegistry = useEntityRegistry();
+    const entities =
+        data?.searchAcrossEntities?.searchResults?.map((result) =>
+            entityRegistry.getGenericEntityProperties(result.entity.type, result.entity),
+        ) || [];
+
+    return { entities, loading, error };
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/groups/EmptyGroupsYouAreIn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/groups/EmptyGroupsYouAreIn.tsx
new file mode 100644
index 00000000000000..9f2db59c3b0336
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/groups/EmptyGroupsYouAreIn.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../../entity/shared/constants';
+
+const Text = styled.div`
+    font-size: 14px;
+    color: ${ANTD_GRAY[7]};
+`;
+
+export const EmptyGroupsYouAreIn = () => {
+    return <Text>You are not part of any groups yet.</Text>;
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/groups/GroupsYouAreIn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/groups/GroupsYouAreIn.tsx
new file mode 100644
index 00000000000000..171a11a3456f32
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/groups/GroupsYouAreIn.tsx
@@ -0,0 +1,49 @@
+import React, { useState } from 'react';
+import { useHistory } from 'react-router';
+import { useUserContext } from '../../../../context/useUserContext';
+import { EntityLinkList } from '../EntityLinkList';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+import { EntityType } from '../../../../../types.generated';
+import { useGetGroupsYouAreIn } from './useGetGroupsYouAreIn';
+import { EmptyGroupsYouAreIn } from './EmptyGroupsYouAreIn';
+import { ReferenceSectionProps } from '../../types';
+import { ReferenceSection } from '../../../layout/shared/styledComponents';
+
+const DEFAULT_MAX_ENTITIES_TO_SHOW = 5;
+
+export const GroupsYouAreIn = ({ hideIfEmpty }: ReferenceSectionProps) => {
+    const history = useHistory();
+    const entityRegistry = useEntityRegistry();
+    const userContext = useUserContext();
+    const { user } = userContext;
+    const [entityCount, setEntityCount] = useState(DEFAULT_MAX_ENTITIES_TO_SHOW);
+    const { entities, loading } = useGetGroupsYouAreIn(user);
+
+    if (hideIfEmpty && entities.length === 0) {
+        return null;
+    }
+
+    const navigateToUserGroupsTab = () => {
+        history.push(`${entityRegistry.getEntityUrl(EntityType.CorpUser, user?.urn as string)}/groups`);
+    };
+
+    return (
+        <ReferenceSection>
+            <EntityLinkList
+                loading={loading || !user}
+                entities={entities.slice(0, entityCount)}
+                title="Your groups"
+                tip="The groups or teams you are part of"
+                showMore={entities.length > entityCount}
+                showMoreCount={
+                    entityCount + DEFAULT_MAX_ENTITIES_TO_SHOW > entities.length
+                        ? entities.length - entityCount
+                        : DEFAULT_MAX_ENTITIES_TO_SHOW
+                }
+                onClickMore={() => setEntityCount(entityCount + DEFAULT_MAX_ENTITIES_TO_SHOW)}
+                onClickTitle={navigateToUserGroupsTab}
+                empty={<EmptyGroupsYouAreIn />}
+            />
+        </ReferenceSection>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/groups/useGetGroupsYouAreIn.ts b/datahub-web-react/src/app/homeV2/reference/sections/groups/useGetGroupsYouAreIn.ts
new file mode 100644
index 00000000000000..560f087c87b2e9
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/groups/useGetGroupsYouAreIn.ts
@@ -0,0 +1,31 @@
+import { useGetUserGroupsQuery } from '../../../../../graphql/user.generated';
+import { CorpUser, EntityType } from '../../../../../types.generated';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+
+const MAX_ASSETS_TO_FETCH = 50;
+
+// TODO: Add Group subscriptions here as well.
+export const useGetGroupsYouAreIn = (user?: CorpUser | null, count = MAX_ASSETS_TO_FETCH) => {
+    const { loading, data, error } = useGetUserGroupsQuery({
+        variables: {
+            urn: user?.urn as string,
+            start: 0,
+            count,
+        },
+        skip: !user?.urn,
+        fetchPolicy: 'cache-first',
+    });
+
+    const entityRegistry = useEntityRegistry();
+    const entities =
+        data?.corpUser?.relationships?.relationships
+            ?.filter((relationship) => relationship.entity)
+            .map((relationship) =>
+                entityRegistry.getGenericEntityProperties(
+                    (relationship.entity as any).type as EntityType,
+                    relationship.entity,
+                ),
+            ) || [];
+
+    return { entities, loading, error };
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLink.tsx b/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLink.tsx
new file mode 100644
index 00000000000000..4ab42fb9b31568
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLink.tsx
@@ -0,0 +1,89 @@
+import React from 'react';
+import styled from 'styled-components';
+import { colors } from '@src/alchemy-components';
+import { SEARCH_COLORS } from '@src/app/entityV2/shared/constants';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { Tooltip } from '@components';
+import { PostContent } from '../../../../../types.generated';
+import { PinnedLinkLogo } from './PinnedLinkLogo';
+import { ANTD_GRAY } from '../../../../entity/shared/constants';
+
+const LinkButton = styled.a<{ $isShowNavBarRedesign?: boolean }>`
+    padding: 16px;
+    height: auto;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    line-height: 16px;
+    background-color: #fff;
+
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        border: 1px solid ${colors.gray[100]};
+        border-radius: 8px;
+
+        :hover {
+            border: 1px solid ${SEARCH_COLORS.LINK_BLUE};
+        }
+    `}
+`;
+
+const IconColumn = styled.div`
+    margin-right: 4px;
+    display: flex;
+`;
+
+const TextColumn = styled.div`
+    flex: 1;
+    display: flex;
+    align-items: flex-start;
+    flex-direction: column;
+    justify-content: center;
+    > div {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        text-wrap: nowrap;
+        font-size: 14px;
+        font-weight: 400;
+        max-width: 220px;
+    }
+`;
+
+const Title = styled.div``;
+
+const Description = styled.div`
+    color: ${ANTD_GRAY[7]};
+    padding-top: 4px;
+`;
+
+type Props = {
+    link: PostContent;
+};
+
+export const PinnedLink = ({ link }: Props) => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    if (!link || !link.link) return null;
+
+    const { title } = link;
+    const { description } = link;
+
+    return (
+        <LinkButton
+            href={link.link}
+            target="_blank"
+            rel="noopener noreferrer"
+            $isShowNavBarRedesign={isShowNavBarRedesign}
+        >
+            <IconColumn>
+                <PinnedLinkLogo link={link} />
+            </IconColumn>
+            <Tooltip showArrow={false} title={description || title} placement="right">
+                <TextColumn>
+                    <Title>{title}</Title>
+                    {description && <Description>{description}</Description>}
+                </TextColumn>
+            </Tooltip>
+        </LinkButton>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinkList.tsx b/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinkList.tsx
new file mode 100644
index 00000000000000..0ff62daab3bc52
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinkList.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Carousel } from '@src/app/sharedV2/carousel/Carousel';
+import { Tooltip } from '@components';
+import { PinnedLink } from './PinnedLink';
+
+const Title = styled.div<{ hasAction: boolean }>`
+    ${(props) => props.hasAction && `:hover { cursor: pointer; }`}
+    margin-bottom: 8px;
+    color: #403d5c;
+    font-weight: 600;
+    font-size: 16px;
+`;
+
+type Props = {
+    title?: string;
+    tip?: React.ReactNode;
+    links: any[];
+    onClickTitle?: () => void;
+};
+
+export const PinnedLinkList = ({ title, tip, links, onClickTitle }: Props) => {
+    return (
+        <>
+            {title ? (
+                <Title hasAction={onClickTitle !== undefined} onClick={onClickTitle}>
+                    <Tooltip title={tip} showArrow={false} placement="right">
+                        {title}
+                    </Tooltip>
+                </Title>
+            ) : null}
+            <Carousel>
+                {links.map((link) => {
+                    return <PinnedLink key={`${title}-${link.link}`} link={link} />;
+                })}
+            </Carousel>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinkLogo.tsx b/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinkLogo.tsx
new file mode 100644
index 00000000000000..97d7739ac64d3d
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinkLogo.tsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import styled from 'styled-components';
+import { PostContent } from '../../../../../types.generated';
+import getAvatarColor from '../../../../shared/avatar/getAvatarColor';
+
+const PreviewImage = styled.img`
+    color: white;
+    height: 40px;
+    width: 40px;
+    border-radius: 11px;
+    object-fit: contain;
+    background-color: transparent;
+    margin-right: 4px;
+    margin-right: 8px;
+`;
+
+const PreviewLetter = styled.div<{ color: string }>`
+    background-color: ${(props) => props.color};
+    font-size: 18px;
+    color: white;
+    height: 40px;
+    width: 40px;
+    border-radius: 11px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 8px;
+`;
+
+type Props = {
+    link: PostContent;
+};
+
+export const PinnedLinkLogo = ({ link }: Props) => {
+    if (!link || !link.link) return null;
+
+    const hasPhoto = !!link?.media?.location;
+    const firstLetter = link.title[0] || link.description?.[0] || '';
+
+    return (
+        <>
+            {(hasPhoto && <PreviewImage src={link.media?.location || undefined} alt={link.title} />) || (
+                <PreviewLetter color={getAvatarColor(firstLetter)}> {firstLetter} </PreviewLetter>
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinks.tsx b/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinks.tsx
new file mode 100644
index 00000000000000..1689a74468b37d
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/pinned/PinnedLinks.tsx
@@ -0,0 +1,28 @@
+import React, { useContext } from 'react';
+import { Section } from '@src/app/homeV2/content/tabs/discovery/sections/Section';
+import OnboardingContext from '../../../../onboarding/OnboardingContext';
+import { ReferenceSectionProps } from '../../types';
+import { useGetPinnedLinks } from './useGetPinnedLinks';
+import { PinnedLinkList } from './PinnedLinkList';
+import { useAppConfig } from '../../../../useAppConfig';
+import { EntityLinkListSkeleton } from '../EntityLinkListSkeleton';
+
+export const PinnedLinks = ({ hideIfEmpty }: ReferenceSectionProps) => {
+    const { isUserInitializing } = useContext(OnboardingContext);
+    const { links, loading } = useGetPinnedLinks();
+    const appConfig = useAppConfig();
+
+    if (!appConfig.loaded || isUserInitializing || loading) {
+        return <EntityLinkListSkeleton />;
+    }
+
+    if (hideIfEmpty && links.length === 0) {
+        return null;
+    }
+
+    return (
+        <Section title="Pinned Links" tip="Links pinned by your DataHub admins">
+            <PinnedLinkList links={links} />
+        </Section>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/pinned/useGetPinnedLinks.tsx b/datahub-web-react/src/app/homeV2/reference/sections/pinned/useGetPinnedLinks.tsx
new file mode 100644
index 00000000000000..bbb7f2812f8115
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/pinned/useGetPinnedLinks.tsx
@@ -0,0 +1,28 @@
+import { getHomePagePostsFilters } from '@app/utils/queryUtils';
+import { useListPostsQuery } from '../../../../../graphql/post.generated';
+import { PostContent, PostContentType, PostType } from '../../../../../types.generated';
+
+export const useGetPinnedLinks = () => {
+    const {
+        data: postsData,
+        loading,
+        error,
+    } = useListPostsQuery({
+        variables: {
+            input: {
+                start: 0,
+                count: 30,
+                orFilters: getHomePagePostsFilters(),
+            },
+        },
+        fetchPolicy: 'cache-first',
+    });
+
+    const links: PostContent[] =
+        postsData?.listPosts?.posts
+            .filter((post) => post.postType === PostType.HomePageAnnouncement)
+            .filter((post) => post.content.contentType === PostContentType.Link)
+            .map((post) => post.content as PostContent) || [];
+
+    return { links, loading, error };
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/tags/EmptyTagsYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/tags/EmptyTagsYouOwn.tsx
new file mode 100644
index 00000000000000..81d6c28363a18f
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/tags/EmptyTagsYouOwn.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../../../entity/shared/constants';
+
+const Text = styled.div`
+    font-size: 14px;
+    color: ${ANTD_GRAY[7]};
+`;
+
+export const EmptyTagsYouOwn = () => {
+    return (
+        <Text>
+            You have not created any tags yet.
+            <br />
+            <a target="_blank" rel="noreferrer noopener" href="https://datahubproject.io/docs/tags">
+                Learn more
+            </a>{' '}
+            about tags.
+        </Text>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/tags/TagsYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/tags/TagsYouOwn.tsx
new file mode 100644
index 00000000000000..2e71658dc762bf
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/tags/TagsYouOwn.tsx
@@ -0,0 +1,65 @@
+import React, { useState } from 'react';
+import { useUserContext } from '../../../../context/useUserContext';
+import { EntityLinkList } from '../EntityLinkList';
+import { EmbeddedListSearchModal } from '../../../../entityV2/shared/components/styled/search/EmbeddedListSearchModal';
+import { ENTITY_FILTER_NAME, OWNERS_FILTER_NAME, UnionType } from '../../../../searchV2/utils/constants';
+import { useGetTagsYouOwn } from './useGetTagsYouOwn';
+import { EmptyTagsYouOwn } from './EmptyTagsYouOwn';
+import { EntityType } from '../../../../../types.generated';
+import TagLink from '../../../../sharedV2/tags/TagLink';
+import { ReferenceSectionProps } from '../../types';
+import { ReferenceSection } from '../../../layout/shared/styledComponents';
+
+const DEFAULT_MAX_ENTITIES_TO_SHOW = 10;
+
+// TODO: Add group ownership into this.
+export const TagsYouOwn = ({ hideIfEmpty }: ReferenceSectionProps) => {
+    const userContext = useUserContext();
+    const { user } = userContext;
+    const [entityCount, setEntityCount] = useState(DEFAULT_MAX_ENTITIES_TO_SHOW);
+    const [showModal, setShowModal] = useState(false);
+    const { entities, loading } = useGetTagsYouOwn(user);
+
+    if (hideIfEmpty && entities.length === 0) {
+        return null;
+    }
+
+    const renderTag = (tag: any) => {
+        return <TagLink tag={tag} />;
+    };
+
+    return (
+        <ReferenceSection>
+            <EntityLinkList
+                loading={loading || !user}
+                entities={entities.slice(0, entityCount)}
+                title="Your tags"
+                tip="Tags that you created"
+                showMore={entities.length > entityCount}
+                onClickMore={() => setEntityCount(entityCount + DEFAULT_MAX_ENTITIES_TO_SHOW)}
+                onClickTitle={() => setShowModal(true)}
+                showMoreCount={
+                    entityCount + DEFAULT_MAX_ENTITIES_TO_SHOW > entities.length
+                        ? entities.length - entityCount
+                        : DEFAULT_MAX_ENTITIES_TO_SHOW
+                }
+                empty={<EmptyTagsYouOwn />}
+                render={renderTag}
+            />
+            {showModal && (
+                <EmbeddedListSearchModal
+                    title="Your tags"
+                    fixedFilters={{
+                        unionType: UnionType.AND,
+                        filters: [
+                            { field: OWNERS_FILTER_NAME, values: [user?.urn as string] },
+                            { field: ENTITY_FILTER_NAME, values: [EntityType.Tag] },
+                        ],
+                    }}
+                    onClose={() => setShowModal(false)}
+                    placeholderText="Filter tags you own..."
+                />
+            )}
+        </ReferenceSection>
+    );
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/tags/useGetTagsYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/tags/useGetTagsYouOwn.tsx
new file mode 100644
index 00000000000000..7ef00ff972d0cb
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/sections/tags/useGetTagsYouOwn.tsx
@@ -0,0 +1,37 @@
+import { useGetSearchResultsForMultipleQuery } from '../../../../../graphql/search.generated';
+import { CorpUser, EntityType } from '../../../../../types.generated';
+import { OWNERS_FILTER_NAME } from '../../../../searchV2/utils/constants';
+import { useEntityRegistry } from '../../../../useEntityRegistry';
+
+const MAX_ASSETS_TO_FETCH = 50;
+
+// TODO: Add Group Ownership here as well.
+export const useGetTagsYouOwn = (user?: CorpUser | null, count = MAX_ASSETS_TO_FETCH) => {
+    const { loading, data, error } = useGetSearchResultsForMultipleQuery({
+        variables: {
+            input: {
+                query: '*',
+                start: 0,
+                count,
+                types: [EntityType.Tag],
+                filters: [
+                    {
+                        field: OWNERS_FILTER_NAME,
+                        value: user?.urn,
+                        values: [user?.urn as string],
+                    },
+                ],
+            },
+        },
+        skip: !user?.urn,
+        fetchPolicy: 'cache-first',
+    });
+
+    const entityRegistry = useEntityRegistry();
+    const entities =
+        data?.searchAcrossEntities?.searchResults?.map((result) =>
+            entityRegistry.getGenericEntityProperties(result.entity.type, result.entity),
+        ) || [];
+
+    return { entities, loading, error };
+};
diff --git a/datahub-web-react/src/app/homeV2/reference/types.ts b/datahub-web-react/src/app/homeV2/reference/types.ts
new file mode 100644
index 00000000000000..ac68145215b21b
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/reference/types.ts
@@ -0,0 +1,3 @@
+export type ReferenceSectionProps = {
+    hideIfEmpty?: boolean;
+};
diff --git a/datahub-web-react/src/app/homeV2/shared/__tests__/utils.test.ts b/datahub-web-react/src/app/homeV2/shared/__tests__/utils.test.ts
new file mode 100644
index 00000000000000..5e8c0174b0b2e6
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/shared/__tests__/utils.test.ts
@@ -0,0 +1,16 @@
+import { hasViewedAnnouncement } from '../utils';
+
+describe('home V2 utils test ->', () => {
+    it('should return whether user has viewed announcement for valid input - true', () => {
+        const lastViewedAnnouncementsTime = 1714037282159; // Greater
+        const lastModifiedTime = 1714037281109;
+        const result = hasViewedAnnouncement(lastViewedAnnouncementsTime, lastModifiedTime);
+        expect(result).toBe(true);
+    });
+    it('should return whether user has viewed announcement for invalid input - false', () => {
+        const lastViewedAnnouncementsTime = 1714037281109;
+        const lastModifiedTime = 1714037282159; // Greater
+        const result = hasViewedAnnouncement(lastViewedAnnouncementsTime, lastModifiedTime);
+        expect(result).toBe(false);
+    });
+});
diff --git a/datahub-web-react/src/app/homeV2/shared/types.ts b/datahub-web-react/src/app/homeV2/shared/types.ts
new file mode 100644
index 00000000000000..ca95b3ca286864
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/shared/types.ts
@@ -0,0 +1,88 @@
+/**
+ * A persona type captured for the user.
+ */
+export enum PersonaType {
+    TECHNICAL_USER = 'urn:li:dataHubPersona:technicalUser',
+    BUSINESS_USER = 'urn:li:dataHubPersona:businessUser',
+    DATA_STEWARD = 'urn:li:dataHubPersona:dataSteward',
+    DATA_ENGINEER = 'urn:li:dataHubPersona:dataEngineer',
+    DATA_LEADER = 'urn:li:dataHubPersona:dataLeader', // Deprecated symbol.
+}
+
+export const PERSONA_TYPE_TO_LABEL: Record<PersonaType, string> = {
+    [PersonaType.TECHNICAL_USER]: 'Data Expert',
+    [PersonaType.BUSINESS_USER]: 'Data User',
+    [PersonaType.DATA_STEWARD]: 'Data Steward',
+    [PersonaType.DATA_ENGINEER]: 'Data Engineer',
+    [PersonaType.DATA_LEADER]: 'Data Leader', // Deprecated symbol.
+};
+
+export const PERSONA_TYPE_TO_VIEW_ICON = {
+    [PersonaType.TECHNICAL_USER]: '💡',
+    [PersonaType.BUSINESS_USER]: '📊',
+    [PersonaType.DATA_STEWARD]: '📖',
+    [PersonaType.DATA_ENGINEER]: '🔧',
+};
+
+/**
+ * The default view names associated with each persona type
+ */
+export const PERSONA_TYPE_TO_VIEW_NAME = {
+    [PersonaType.TECHNICAL_USER]: '💡  Data Expert',
+    [PersonaType.DATA_ENGINEER]: '🔧  Data Engineer',
+    [PersonaType.DATA_STEWARD]: '📖  Data Steward',
+    [PersonaType.BUSINESS_USER]: '📊  Data User',
+};
+
+/**
+ * The default view urns associated with each persona type
+ */
+export const PERSONA_TYPE_TO_VIEW_URN = {
+    [PersonaType.TECHNICAL_USER]: 'urn:li:dataHubView:__default_technicalUser',
+    [PersonaType.DATA_ENGINEER]: 'urn:li:dataHubView:__default_dataEngineer',
+    [PersonaType.DATA_STEWARD]: 'urn:li:dataHubView:__default_dataSteward',
+    [PersonaType.BUSINESS_USER]: 'urn:li:dataHubView:__default_businessUser',
+};
+
+export const PERSONA_TYPE_TO_DESCRIPTION: Record<PersonaType, string> = {
+    [PersonaType.TECHNICAL_USER]: 'Explore tables, topics, databases, data pipelines, dashboards, and more',
+    [PersonaType.BUSINESS_USER]: 'Explore tables, dashboards, and reports',
+    [PersonaType.DATA_STEWARD]: 'Explore tables, data domains, data products, and data dictionaries',
+    [PersonaType.DATA_ENGINEER]: 'Explore tables, topics, databases, and data pipelines',
+    [PersonaType.DATA_LEADER]: 'Explore tables, topics, databases, data pipelines, dashboards, and more', // Deprecated symbol.
+};
+
+/**
+ * Standard Persona Types To Display When User is Selecting.
+ */
+export const PERSONA_TYPES_TO_DISPLAY = [
+    PersonaType.TECHNICAL_USER, // Data Expert
+    PersonaType.DATA_ENGINEER, // Data Engineer
+    PersonaType.DATA_STEWARD, // Data Steward
+    PersonaType.BUSINESS_USER, // Data User
+];
+
+// For when we enabling fetching custom personas.
+export const LOAD_CUSTOM_PERSONAS = false;
+
+export const ROLE_TO_PERSONA_TYPE: Record<string, PersonaType> = {
+    'Data Analyst': PersonaType.TECHNICAL_USER,
+    'Data Engineer': PersonaType.TECHNICAL_USER,
+    'Data Scientist': PersonaType.TECHNICAL_USER,
+    'Business Intelligence (BI) Analyst': PersonaType.BUSINESS_USER,
+    'ML Engineer': PersonaType.TECHNICAL_USER,
+    'Software Engineer': PersonaType.TECHNICAL_USER,
+    'Product Manager': PersonaType.BUSINESS_USER,
+    'Data Steward': PersonaType.DATA_STEWARD,
+    'Data Governance Lead': PersonaType.DATA_STEWARD,
+    'Database Administrator': PersonaType.TECHNICAL_USER,
+    'Head of Data': PersonaType.TECHNICAL_USER,
+    'Head of Engineering': PersonaType.TECHNICAL_USER,
+    'Marketing Manager': PersonaType.BUSINESS_USER,
+    'Chief Executive Officer (CEO)': PersonaType.BUSINESS_USER,
+    'Project Manager': PersonaType.BUSINESS_USER,
+    'Legal Counsel / Compliance Officer': PersonaType.BUSINESS_USER,
+    'Sales Manager': PersonaType.BUSINESS_USER,
+    'Customer Success Manager': PersonaType.BUSINESS_USER,
+    Other: PersonaType.BUSINESS_USER,
+};
diff --git a/datahub-web-react/src/app/homeV2/shared/updateLastViewedAnnouncementTime.tsx b/datahub-web-react/src/app/homeV2/shared/updateLastViewedAnnouncementTime.tsx
new file mode 100644
index 00000000000000..a87840bb1d72c9
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/shared/updateLastViewedAnnouncementTime.tsx
@@ -0,0 +1,33 @@
+import { useCallback } from 'react';
+import { useBatchUpdateStepStatesMutation } from '../../../graphql/step.generated';
+import { LAST_VIEWED_ANNOUNCEMENT_TIME_STEP } from './utils';
+
+export const useUpdateLastViewedAnnouncementTime = () => {
+    const [updateStepState] = useBatchUpdateStepStatesMutation();
+    const updateLastViewedAnnouncementTime = useCallback(
+        async (userUrn: string) => {
+            const currentTimestamp = new Date().getTime();
+            const finalStepId = `${userUrn}-${LAST_VIEWED_ANNOUNCEMENT_TIME_STEP}`;
+            await updateStepState({
+                variables: {
+                    input: {
+                        states: [
+                            {
+                                id: finalStepId,
+                                properties: [
+                                    {
+                                        key: LAST_VIEWED_ANNOUNCEMENT_TIME_STEP,
+                                        value: currentTimestamp.toString(),
+                                    },
+                                ],
+                            },
+                        ],
+                    },
+                },
+            });
+        },
+        [updateStepState],
+    );
+
+    return { updateLastViewedAnnouncementTime };
+};
diff --git a/datahub-web-react/src/app/homeV2/shared/useGetLastViewedAnnouncementTime.tsx b/datahub-web-react/src/app/homeV2/shared/useGetLastViewedAnnouncementTime.tsx
new file mode 100644
index 00000000000000..ea30232bb12099
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/shared/useGetLastViewedAnnouncementTime.tsx
@@ -0,0 +1,19 @@
+import { useBatchGetStepStatesQuery } from '../../../graphql/step.generated';
+import { useUserContext } from '../../context/useUserContext';
+import { LAST_VIEWED_ANNOUNCEMENT_TIME_STEP } from './utils';
+
+export const useGetLastViewedAnnouncementTime = () => {
+    const { user } = useUserContext();
+    const finalStepId = `${user?.urn}-${LAST_VIEWED_ANNOUNCEMENT_TIME_STEP}`;
+    const { data, refetch } = useBatchGetStepStatesQuery({
+        skip: !user?.urn,
+        variables: { input: { ids: [finalStepId] } },
+    });
+    const lastViewedAnnouncementTimeProperty = data?.batchGetStepStates?.results?.[0]?.properties?.find(
+        (property) => property.key === LAST_VIEWED_ANNOUNCEMENT_TIME_STEP,
+    );
+    return {
+        time: (lastViewedAnnouncementTimeProperty?.value && Number(lastViewedAnnouncementTimeProperty?.value)) || null,
+        refetch,
+    };
+};
diff --git a/datahub-web-react/src/app/homeV2/shared/utils.ts b/datahub-web-react/src/app/homeV2/shared/utils.ts
new file mode 100644
index 00000000000000..c4896b9fe511e2
--- /dev/null
+++ b/datahub-web-react/src/app/homeV2/shared/utils.ts
@@ -0,0 +1,8 @@
+export const LAST_VIEWED_ANNOUNCEMENT_TIME_STEP = 'lastViewedAnnouncementTimeMs';
+
+export const hasViewedAnnouncement = (
+    lastViewedAnnouncementsTime: number | null,
+    lastModifiedTime?: number | null,
+): boolean => {
+    return lastModifiedTime && lastViewedAnnouncementsTime ? lastModifiedTime <= lastViewedAnnouncementsTime : true;
+};
diff --git a/datahub-web-react/src/app/identity/user/UserUtils.tsx b/datahub-web-react/src/app/identity/user/UserUtils.tsx
index 8578bbcbe02a66..fbbbd274413445 100644
--- a/datahub-web-react/src/app/identity/user/UserUtils.tsx
+++ b/datahub-web-react/src/app/identity/user/UserUtils.tsx
@@ -14,3 +14,7 @@ export const mapRoleIcon = (roleName) => {
     }
     return icon;
 };
+
+export const shouldShowGlossary = (canManageGlossary: boolean, hideGlossary: boolean) => {
+    return canManageGlossary || !hideGlossary;
+};
diff --git a/datahub-web-react/src/app/identity/user/useUserTitle.ts b/datahub-web-react/src/app/identity/user/useUserTitle.ts
new file mode 100644
index 00000000000000..059c97e356898e
--- /dev/null
+++ b/datahub-web-react/src/app/identity/user/useUserTitle.ts
@@ -0,0 +1,30 @@
+import { useEffect } from 'react';
+import { useUserContext } from '../../context/useUserContext';
+
+export const useUserTitle = () => {
+    const user = useUserContext();
+    return user.user?.editableProperties?.title || user.user?.info?.title || '';
+};
+
+const USER_TITLE_KEY = 'acrylUserTitle';
+
+export function useSetUserTitle() {
+    const userTitle = useUserTitle();
+    useEffect(() => {
+        setUserTitleLocalStorage(userTitle);
+    }, [userTitle]);
+}
+
+export function loadUserTitleFromLocalStorage(): string | null {
+    return localStorage.getItem(USER_TITLE_KEY);
+}
+
+function setUserTitleLocalStorage(userTitle: string) {
+    if (loadUserTitleFromLocalStorage() !== userTitle) {
+        saveToLocalStorage(userTitle);
+    }
+}
+
+function saveToLocalStorage(userTitle: string) {
+    localStorage.setItem(USER_TITLE_KEY, userTitle);
+}
diff --git a/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx b/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx
index 48dd2ae78ffc48..9785fc47a921f0 100644
--- a/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx
+++ b/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx
@@ -10,9 +10,21 @@ import {
     INGESTION_CREATE_SOURCE_ID,
     INGESTION_REFRESH_SOURCES_ID,
 } from '../onboarding/config/IngestionOnboardingConfig';
+import { useShowNavBarRedesign } from '../useShowNavBarRedesign';
 
-const PageContainer = styled.div`
+const PageContainer = styled.div<{ $isShowNavBarRedesign?: boolean }>`
     padding-top: 20px;
+    background-color: white;
+    border-radius: ${(props) =>
+        props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '8px'};
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        overflow: hidden;
+        margin: 5px;
+        box-shadow: ${props.theme.styles['box-shadow-navbar-redesign']};
+        height: 100%;
+    `}
 `;
 
 const PageHeaderContainer = styled.div`
@@ -56,6 +68,7 @@ export const ManageIngestionPage = () => {
     const showIngestionTab = isIngestionEnabled && me && me.platformPrivileges?.manageIngestion;
     const showSecretsTab = isIngestionEnabled && me && me.platformPrivileges?.manageSecrets;
     const [selectedTab, setSelectedTab] = useState<TabType>(TabType.Sources);
+    const isShowNavBarRedesign = useShowNavBarRedesign();
 
     // defaultTab might not be calculated correctly on mount, if `config` or `me` haven't been loaded yet
     useEffect(() => {
@@ -69,7 +82,7 @@ export const ManageIngestionPage = () => {
     };
 
     return (
-        <PageContainer>
+        <PageContainer $isShowNavBarRedesign={isShowNavBarRedesign}>
             <OnboardingTour stepIds={[INGESTION_CREATE_SOURCE_ID, INGESTION_REFRESH_SOURCES_ID]} />
             <PageHeaderContainer>
                 <PageTitle level={3}>Manage Data Sources</PageTitle>
diff --git a/datahub-web-react/src/app/ingest/secret/SecretsList.tsx b/datahub-web-react/src/app/ingest/secret/SecretsList.tsx
index 145bf3dd029fbc..cd5a4c2a0af853 100644
--- a/datahub-web-react/src/app/ingest/secret/SecretsList.tsx
+++ b/datahub-web-react/src/app/ingest/secret/SecretsList.tsx
@@ -5,6 +5,7 @@ import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
 import * as QueryString from 'query-string';
 import { useLocation } from 'react-router';
 import styled from 'styled-components';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
 import {
     useCreateSecretMutation,
     useDeleteSecretMutation,
@@ -36,9 +37,19 @@ const SourcePaginationContainer = styled.div`
     justify-content: center;
 `;
 
+const StyledTableWithNavBarRedesign = styled(StyledTable)`
+    overflow: hidden;
+
+    &&& .ant-table-body {
+        overflow-y: auto;
+        height: calc(100vh - 450px);
+    }
+` as typeof StyledTable;
+
 const DEFAULT_PAGE_SIZE = 25;
 
 export const SecretsList = () => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
     const entityRegistry = useEntityRegistry();
     const location = useLocation();
     const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
@@ -236,6 +247,8 @@ export const SecretsList = () => {
         description: secret.description,
     }));
 
+    const FinalStyledTable = isShowNavBarRedesign ? StyledTableWithNavBarRedesign : StyledTable;
+
     return (
         <>
             {!data && loading && <Message type="loading" content="Loading secrets..." />}
@@ -272,9 +285,10 @@ export const SecretsList = () => {
                         hideRecommendations
                     />
                 </TabToolbar>
-                <StyledTable
+                <FinalStyledTable
                     columns={tableColumns}
                     dataSource={tableData}
+                    scroll={isShowNavBarRedesign ? { y: 'max-content' } : {}}
                     rowKey="urn"
                     locale={{
                         emptyText: <Empty description="No Secrets found!" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
diff --git a/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx b/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx
index edb01a5acb07e0..b27707a84357dd 100644
--- a/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx
+++ b/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx
@@ -106,7 +106,7 @@ export const IngestionSourceList = () => {
     // Ingestion Source Default Filters
     const filters = hideSystemSources
         ? [{ field: 'sourceType', values: [SYSTEM_INTERNAL_SOURCE_TYPE], negated: true }]
-        : [];
+        : [{ field: 'sourceType', values: [SYSTEM_INTERNAL_SOURCE_TYPE] }];
     if (sourceFilter !== IngestionSourceType.ALL) {
         filters.push({
             field: 'sourceExecutorId',
@@ -452,7 +452,7 @@ export const IngestionSourceList = () => {
                 />
                 <SourcePaginationContainer>
                     <Pagination
-                        style={{ margin: 40 }}
+                        style={{ margin: 15 }}
                         current={page}
                         pageSize={pageSize}
                         total={totalSources}
diff --git a/datahub-web-react/src/app/ingest/source/IngestionSourceTable.tsx b/datahub-web-react/src/app/ingest/source/IngestionSourceTable.tsx
index 2d785d71648533..1519204e2e426f 100644
--- a/datahub-web-react/src/app/ingest/source/IngestionSourceTable.tsx
+++ b/datahub-web-react/src/app/ingest/source/IngestionSourceTable.tsx
@@ -2,6 +2,7 @@ import { Empty, Typography } from 'antd';
 import React from 'react';
 import styled from 'styled-components/macro';
 import { SorterResult } from 'antd/lib/table/interface';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
 import { StyledTable } from '../../entity/shared/components/styled/StyledTable';
 import { ANTD_GRAY } from '../../entity/shared/constants';
 import { CLI_EXECUTOR_ID, getIngestionSourceStatus } from './utils';
@@ -15,6 +16,9 @@ import {
 import { IngestionSource } from '../../../types.generated';
 import { IngestionSourceExecutionList } from './executions/IngestionSourceExecutionList';
 
+const MIN_EXECUTION_COLUMN_WIDTH = 125;
+const PAGE_HEADER_HEIGHT = 395;
+
 const StyledSourceTable = styled(StyledTable)`
     .cliIngestion {
         td {
@@ -23,6 +27,15 @@ const StyledSourceTable = styled(StyledTable)`
     }
 ` as typeof StyledTable;
 
+const StyledSourceTableWithNavBarRedesign = styled(StyledSourceTable)`
+    overflow: hidden;
+
+    &&& .ant-table-body {
+        overflow-y: auto;
+        height: calc(100vh - ${PAGE_HEADER_HEIGHT}px);
+    }
+` as typeof StyledSourceTable;
+
 interface Props {
     lastRefresh: number;
     sources: IngestionSource[];
@@ -46,6 +59,8 @@ function IngestionSourceTable({
     onRefresh,
     onChangeSort,
 }: Props) {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+
     const tableColumns = [
         {
             title: 'Type',
@@ -71,6 +86,7 @@ function IngestionSourceTable({
             title: 'Execution Count',
             dataIndex: 'execCount',
             key: 'execCount',
+            width: isShowNavBarRedesign ? MIN_EXECUTION_COLUMN_WIDTH : undefined,
             render: (execCount: any) => <Typography.Text>{execCount || '0'}</Typography.Text>,
         },
         {
@@ -134,11 +150,14 @@ function IngestionSourceTable({
         onChangeSort(field, order);
     };
 
+    const FinalStyledSourceTable = isShowNavBarRedesign ? StyledSourceTableWithNavBarRedesign : StyledSourceTable;
+
     return (
-        <StyledSourceTable
+        <FinalStyledSourceTable
             columns={tableColumns}
             onChange={handleTableChange}
             dataSource={tableData}
+            scroll={isShowNavBarRedesign ? { y: 'max-content', x: 'max-content' } : {}}
             rowKey="urn"
             rowClassName={(record, _) => (record.cliIngestion ? 'cliIngestion' : '')}
             locale={{
diff --git a/datahub-web-react/src/app/ingest/source/IngestionSourceTableColumns.tsx b/datahub-web-react/src/app/ingest/source/IngestionSourceTableColumns.tsx
index 4b7fb472226172..bb895882934a2b 100644
--- a/datahub-web-react/src/app/ingest/source/IngestionSourceTableColumns.tsx
+++ b/datahub-web-react/src/app/ingest/source/IngestionSourceTableColumns.tsx
@@ -1,6 +1,7 @@
 import { blue } from '@ant-design/colors';
 import { CodeOutlined, CopyOutlined, DeleteOutlined } from '@ant-design/icons';
-import { Button, Image, Tooltip, Typography } from 'antd';
+import { Button, Image, Typography } from 'antd';
+import { Tooltip } from '@components';
 import cronstrue from 'cronstrue';
 import React from 'react';
 import styled from 'styled-components/macro';
@@ -202,7 +203,13 @@ export function ActionsColumn({
                     DETAILS
                 </Button>
             )}
-            <Button data-testid="delete-button" onClick={() => onDelete(record.urn)} type="text" shape="circle" danger>
+            <Button
+                data-testid={`delete-ingestion-source-${record.name}`}
+                onClick={() => onDelete(record.urn)}
+                type="text"
+                shape="circle"
+                danger
+            >
                 <DeleteOutlined />
             </Button>
         </ActionButtonContainer>
diff --git a/datahub-web-react/src/app/lineage/types.ts b/datahub-web-react/src/app/lineage/types.ts
index 8a25ba202a085d..669243b13cf62a 100644
--- a/datahub-web-react/src/app/lineage/types.ts
+++ b/datahub-web-react/src/app/lineage/types.ts
@@ -1,3 +1,4 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
 import { FullLineageResultsFragment } from '../../graphql/lineage.generated';
 import {
     Chart,
@@ -18,6 +19,7 @@ import {
     MlModelGroup,
     MlPrimaryKey,
     SchemaMetadata,
+    ScrollResults,
     SiblingProperties,
     Status,
     StructuredProperties,
@@ -42,6 +44,7 @@ export type FetchedEntity = {
     type: EntityType;
     subtype?: string;
     icon?: string;
+    siblingIcon?: string;
     // children?: Array<string>;
     upstreamChildren?: Array<EntityAndType>;
     upstreamRelationships?: Array<LineageRelationship>;
@@ -55,11 +58,14 @@ export type FetchedEntity = {
     siblingPlatforms?: Maybe<DataPlatform[]>;
     fineGrainedLineages?: FineGrainedLineage[];
     siblings?: Maybe<SiblingProperties>;
+    siblingsSearch?: Maybe<ScrollResults>;
     schemaMetadata?: SchemaMetadata;
     inputFields?: InputFields;
     canEditLineage?: boolean;
     health?: Maybe<Health[]>;
     structuredProperties?: Maybe<StructuredProperties>;
+    parents?: GenericEntityProperties[];
+    parent?: GenericEntityProperties;
 };
 
 export type NodeData = {
diff --git a/datahub-web-react/src/app/lineage/utils/constructTree.ts b/datahub-web-react/src/app/lineage/utils/constructTree.ts
index 4e94ad2813674e..6118b24f853b7c 100644
--- a/datahub-web-react/src/app/lineage/utils/constructTree.ts
+++ b/datahub-web-react/src/app/lineage/utils/constructTree.ts
@@ -83,7 +83,7 @@ export default function constructTree(
     });
 
     const fetchedEntity = entityRegistry.getLineageVizConfig(entityAndType.type, entityAndType.entity);
-    const sibling = fetchedEntity?.siblings?.siblings?.[0];
+    const sibling = fetchedEntity?.siblingsSearch?.searchResults?.[0]?.entity;
     const fetchedSiblingEntity = sibling ? entityRegistry.getLineageVizConfig(sibling.type, sibling) : null;
 
     const root: NodeData = {
diff --git a/datahub-web-react/src/app/lineage/utils/extendAsyncEntities.ts b/datahub-web-react/src/app/lineage/utils/extendAsyncEntities.ts
index 7deca50b154c7b..2eb9b14bcfce0c 100644
--- a/datahub-web-react/src/app/lineage/utils/extendAsyncEntities.ts
+++ b/datahub-web-react/src/app/lineage/utils/extendAsyncEntities.ts
@@ -116,8 +116,8 @@ export function extendColumnLineage(
                     // if this upstreamEntityUrn is a sibling of one of the already rendered nodes,
                     // update the fine grained map with the rendered node instead of its sibling
                     Array.from(fetchedEntities.keys()).forEach((urn) => {
-                        fetchedEntities.get(urn)?.siblings?.siblings?.forEach((sibling) => {
-                            if (sibling && sibling.urn === upstreamEntityUrn) {
+                        fetchedEntities.get(urn)?.siblingsSearch?.searchResults.forEach((sibling) => {
+                            if (sibling && sibling.entity.urn === upstreamEntityUrn) {
                                 updateFineGrainedMap(
                                     fineGrainedMap,
                                     urn,
@@ -147,9 +147,9 @@ export function extendColumnLineage(
 
     // if we've seen fineGrainedMappings for this current entity's siblings, update the
     // fine grained map with the rendered urn instead of the "hidden" sibling urn
-    lineageVizConfig.siblings?.siblings?.forEach((sibling) => {
-        if (sibling && fineGrainedMapForSiblings[sibling.urn]) {
-            fineGrainedMapForSiblings[sibling.urn].forEach((entry) => {
+    lineageVizConfig.siblingsSearch?.searchResults?.forEach((sibling) => {
+        if (sibling && fineGrainedMapForSiblings[sibling.entity.urn]) {
+            fineGrainedMapForSiblings[sibling.entity.urn].forEach((entry) => {
                 updateFineGrainedMap(
                     fineGrainedMap,
                     lineageVizConfig.urn,
diff --git a/datahub-web-react/src/app/lineage/utils/useGetLineageTimeParams.ts b/datahub-web-react/src/app/lineage/utils/useGetLineageTimeParams.ts
index 9e9e3804f037c6..6a11b218e69a12 100644
--- a/datahub-web-react/src/app/lineage/utils/useGetLineageTimeParams.ts
+++ b/datahub-web-react/src/app/lineage/utils/useGetLineageTimeParams.ts
@@ -1,17 +1,34 @@
 import * as QueryString from 'query-string';
 import { useLocation } from 'react-router-dom';
+import { useMemo } from 'react';
 
 export const START_TIME_MILLIS_URL_PARAM = 'start_time_millis';
 export const END_TIME_MILLIS_URL_PARAM = 'end_time_millis';
+export const SHOW_ALL_TIME_LINEAGE_URL_PARAM = 'show_all_time_lineage';
+
+export function useGetDefaultLineageStartTimeMillis() {
+    return useMemo(() => null, []);
+}
 
 export function useGetLineageTimeParams() {
+    const startTimeMillisDefault = useGetDefaultLineageStartTimeMillis();
+
     const location = useLocation();
     const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
     const startTimeMillisString = params[START_TIME_MILLIS_URL_PARAM] as string;
     const endTimeMillisString = params[END_TIME_MILLIS_URL_PARAM] as string;
+    const showAllTimeLineage = (params[SHOW_ALL_TIME_LINEAGE_URL_PARAM] as string) === 'true';
 
-    const startTimeMillis: number | undefined = startTimeMillisString ? parseInt(startTimeMillisString, 10) : undefined;
+    let startTimeMillis: number | undefined = startTimeMillisString ? parseInt(startTimeMillisString, 10) : undefined;
     const endTimeMillis: number | undefined = endTimeMillisString ? parseInt(endTimeMillisString, 10) : undefined;
 
-    return { startTimeMillis, endTimeMillis };
+    // if show all time or start/end times are not explicitly set, use defaults from instance configuration
+    if (!showAllTimeLineage && !startTimeMillis && !endTimeMillis && startTimeMillisDefault) {
+        startTimeMillis = startTimeMillisDefault;
+    }
+
+    const isDefault = showAllTimeLineage
+        ? !startTimeMillisDefault
+        : (startTimeMillis ?? null) === (startTimeMillisDefault ?? null) && !endTimeMillis;
+    return { startTimeMillis, endTimeMillis, isDefault };
 }
diff --git a/datahub-web-react/src/app/lineageV2/LineageDisplay.tsx b/datahub-web-react/src/app/lineageV2/LineageDisplay.tsx
new file mode 100644
index 00000000000000..9b0e9df76b0937
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageDisplay.tsx
@@ -0,0 +1,127 @@
+import useComputeGraph from '@app/lineageV2/useComputeGraph/useComputeGraph';
+import React, { useContext, useEffect, useMemo, useState } from 'react';
+import { useReactFlow } from 'reactflow';
+import { EntityType } from '@types';
+
+import { ColumnRef, LineageDisplayContext, LineageNodesContext } from './common';
+import LineageSidebar from './LineageSidebar';
+import LineageVisualization from './LineageVisualization';
+import useColumnHighlighting from './useColumnHighlighting';
+import useBulkEntityLineage from './useBulkEntityLineage';
+import { LINEAGE_FILTER_NODE_NAME } from './LineageFilterNode/LineageFilterNodeBasic';
+import useNodeHighlighting from './useNodeHighlighting';
+
+type Props = {
+    urn: string;
+    type: EntityType;
+    initialized: boolean;
+};
+
+export default function LineageDisplay({ urn, type, initialized }: Props) {
+    const { getEdge, setNodes, setEdges } = useReactFlow();
+
+    const [selectedColumn, setSelectedColumn] = useState<ColumnRef | null>(null);
+    const [hoveredColumn, setHoveredColumn] = useState<ColumnRef | null>(null);
+    const [hoveredNode, setHoveredNode] = useState<string | null>(null);
+    const [displayedMenuNode, setDisplayedMenuNode] = useState<string | null>(null);
+
+    const { fineGrainedLineage, flowNodes, flowEdges, resetPositions } = useComputeGraph(urn, type);
+    const shownUrns = useMemo(
+        () => flowNodes.filter((node) => node.type !== LINEAGE_FILTER_NODE_NAME).map((node) => node.id),
+        [flowNodes],
+    );
+    const refetchUrn = useBulkEntityLineage(shownUrns);
+
+    const { highlightedNodes, highlightedEdges } = useNodeHighlighting(hoveredNode);
+
+    const { cllHighlightedNodes, highlightedColumns } = useColumnHighlighting(
+        selectedColumn,
+        hoveredColumn,
+        fineGrainedLineage.indirect,
+        shownUrns,
+    );
+
+    useEffect(() => {
+        const newNodeMap = new Map(flowNodes.map((node) => [node.id, node]));
+        setNodes((oldNodes) => {
+            const oldNodeIds = new Set(oldNodes.map((n) => n.id));
+            const nodesToAdd = flowNodes.filter((n) => !oldNodeIds.has(n.id));
+            const nodesToResetPosition = resetPositions ? flowNodes : nodesToAdd;
+            nodesToResetPosition.forEach((n) => {
+                // eslint-disable-next-line no-param-reassign
+                n.data.dragged = false;
+            });
+            return [
+                ...oldNodes
+                    .filter((n) => newNodeMap.has(n.id))
+                    .map((n) => ({
+                        ...n,
+                        position: (!n.data.dragged && newNodeMap.get(n.id)?.position) || n.position,
+                        data: newNodeMap.get(n.id)?.data ?? n.data,
+                        selectable: newNodeMap.get(n.id)?.selectable ?? n.selectable,
+                    })),
+                ...nodesToAdd.map((n) => ({ ...n, data: { ...n.data, dragged: false } })),
+            ];
+        });
+    }, [flowNodes, setNodes, resetPositions]);
+
+    useEffect(() => setEdges(flowEdges), [flowEdges, getEdge, setEdges]);
+
+    useFitView(initialized);
+
+    return (
+        <LineageDisplayContext.Provider
+            value={{
+                hoveredNode,
+                setHoveredNode,
+                displayedMenuNode,
+                setDisplayedMenuNode,
+                selectedColumn,
+                setSelectedColumn,
+                hoveredColumn,
+                setHoveredColumn,
+                highlightedNodes,
+                cllHighlightedNodes,
+                highlightedColumns,
+                highlightedEdges,
+                fineGrainedLineage: fineGrainedLineage.indirect,
+                fineGrainedOperations: fineGrainedLineage.fineGrainedOperations,
+                shownUrns,
+                refetchUrn,
+            }}
+        >
+            <LineageVisualization initialNodes={flowNodes} initialEdges={flowEdges} />
+            <LineageSidebar />
+        </LineageDisplayContext.Provider>
+    );
+}
+
+function useFitView(loaded: boolean) {
+    const { fitView } = useReactFlow();
+    const { displayVersion } = useContext(LineageNodesContext);
+    const [, displayVersionNodes] = displayVersion;
+
+    useEffect(() => {
+        if (!loaded) return () => {};
+        const timeout = setTimeout(() => fitView({ duration: 1000, maxZoom: 2 }), 1000);
+        return () => {
+            clearTimeout(timeout);
+        };
+    }, [loaded, fitView]);
+
+    useEffect(() => {
+        if (!loaded || !displayVersionNodes.length) return () => {};
+        const timeout = setTimeout(
+            () =>
+                fitView({
+                    duration: 1000,
+                    nodes: displayVersionNodes.map((urn) => ({ id: urn })),
+                    maxZoom: 1,
+                }),
+            100,
+        );
+        return () => {
+            clearTimeout(timeout);
+        };
+    }, [loaded, displayVersionNodes, fitView]);
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageEdge/LineageTableEdge.tsx b/datahub-web-react/src/app/lineageV2/LineageEdge/LineageTableEdge.tsx
new file mode 100644
index 00000000000000..1b4b9c7c691a3d
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageEdge/LineageTableEdge.tsx
@@ -0,0 +1,80 @@
+import React, { useContext, useMemo, useState } from 'react';
+import { useDebounce } from 'react-use';
+import { EdgeLabelRenderer, EdgeProps, getBezierPath } from 'reactflow';
+import styled from 'styled-components';
+import { LineageDisplayContext, LineageTableEdgeData } from '../common';
+import { LINEAGE_COLORS } from '../../entityV2/shared/constants';
+
+export const LINEAGE_TABLE_EDGE_NAME = 'table-table';
+
+const StyledPath = styled.path<{ isHighlighted: boolean; isColumnSelected: boolean; isManual?: boolean }>`
+    ${({ isHighlighted }) => (isHighlighted ? `stroke: ${LINEAGE_COLORS.BLUE_2};` : '')};
+    stroke-opacity: ${({ isColumnSelected }) => (isColumnSelected ? 0.5 : 1)};
+    stroke-dasharray: ${({ isManual }) => (isManual ? '5,2' : 'none')};
+`;
+
+const InteractionPath = styled.path`
+    stroke-width: 15;
+    stroke-opacity: 0;
+`;
+
+const EdgeDetails = styled.div<{ labelX: number; labelY: number }>`
+    position: absolute;
+    transform: ${({ labelX, labelY }) => `translate(-50%, -50%) translate(${labelX}px, ${labelY}px);`};
+    pointer-events: all;
+`;
+
+export function LineageTableEdge({
+    id,
+    data,
+    sourceX,
+    sourceY,
+    sourcePosition,
+    targetX,
+    targetY,
+    targetPosition,
+    markerStart,
+    markerEnd,
+}: EdgeProps<LineageTableEdgeData>) {
+    const { isManual, originalId } = data || { isManual: false, originalId: '' };
+
+    const { selectedColumn, highlightedEdges } = useContext(LineageDisplayContext);
+
+    const isHighlighted = useMemo(
+        () => !selectedColumn && (highlightedEdges.has(id) || highlightedEdges.has(originalId)),
+        [id, originalId, selectedColumn, highlightedEdges],
+    );
+
+    const [edgePath, labelX, labelY] = getBezierPath({
+        sourceX,
+        sourceY,
+        sourcePosition,
+        targetX,
+        targetY,
+        targetPosition,
+    });
+
+    const [debouncedLabelPosition, setDebouncedLabelPosition] = useState({ labelX, labelY });
+    useDebounce(() => setDebouncedLabelPosition({ labelX, labelY }), 10, [labelX, labelY]);
+
+    return (
+        <>
+            <StyledPath
+                id={id}
+                d={edgePath}
+                fill="none"
+                className="react-flow__edge-path"
+                markerEnd={markerEnd}
+                markerStart={markerStart}
+                isHighlighted={isHighlighted}
+                isColumnSelected={!!selectedColumn}
+                isManual={isManual}
+            />
+            <InteractionPath d={edgePath} fill="none" className="react-flow__edge-interaction" />
+            <EdgeLabelRenderer>
+                {/* TODO: Add edge details to show edge information (on hover) */}
+                <EdgeDetails labelX={debouncedLabelPosition.labelX} labelY={debouncedLabelPosition.labelY} />
+            </EdgeLabelRenderer>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageEdge/TentativeEdge.tsx b/datahub-web-react/src/app/lineageV2/LineageEdge/TentativeEdge.tsx
new file mode 100644
index 00000000000000..17233abb4354a2
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageEdge/TentativeEdge.tsx
@@ -0,0 +1,52 @@
+import React from 'react';
+import { EdgeProps, getBezierPath } from 'reactflow';
+import styled from 'styled-components';
+
+export const TENTATIVE_EDGE_NAME = 'tentative';
+
+const StyledPath = styled.path`
+    stroke-dasharray: 3, 2;
+    // animation: dash-move 300ms linear infinite;
+    @keyframes dash-move {
+        0% {
+            stroke-dashoffset: 0;
+        }
+        100% {
+            stroke-dashoffset: -10; /* negative value moves dashes forward */
+        }
+    }
+`;
+
+export default function TentativeEdge({
+    id,
+    sourceX,
+    sourceY,
+    sourcePosition,
+    targetX,
+    targetY,
+    targetPosition,
+    markerStart,
+    markerEnd,
+    style,
+}: EdgeProps<void>) {
+    const [edgePath] = getBezierPath({
+        sourceX,
+        sourceY,
+        sourcePosition,
+        targetX,
+        targetY,
+        targetPosition,
+    });
+
+    return (
+        <StyledPath
+            id={id}
+            d={edgePath}
+            fill="none"
+            className="react-flow__edge-path"
+            markerEnd={markerEnd}
+            markerStart={markerStart}
+            style={style}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/Column.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/Column.tsx
new file mode 100644
index 00000000000000..ddd6f6d9306467
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/Column.tsx
@@ -0,0 +1,286 @@
+import { LoadingOutlined } from '@ant-design/icons';
+import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams';
+import { useGetLineageUrl } from '@app/lineageV2/lineageUtils';
+import { ColumnAsset } from '@app/lineageV2/types';
+import { useAppConfig } from '@app/useAppConfig';
+import { useGetLineageCountsLazyQuery } from '@graphql/lineage.generated';
+import LinkOut from '@images/link-out.svg?react';
+import { Spin, Typography } from 'antd';
+import { Tooltip } from '@components';
+import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
+import { Link } from 'react-router-dom';
+import { Handle, Position } from 'reactflow';
+import styled from 'styled-components';
+import { EntityType } from '../../../types.generated';
+import { EventType } from '../../analytics';
+import analytics from '../../analytics/analytics';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../../entityV2/shared/constants';
+import { generateSchemaFieldUrn } from '../../entityV2/shared/tabs/Lineage/utils';
+import { CompactFieldIconWithTooltip } from '../../sharedV2/icons/CompactFieldIcon';
+import {
+    createColumnRef,
+    HOVER_COLOR,
+    LineageDisplayContext,
+    LineageNodesContext,
+    onClickPreventSelect,
+    SELECT_COLOR,
+    useIgnoreSchemaFieldStatus,
+} from '../common';
+import { LineageDisplayColumn } from './useDisplayedColumns';
+
+const HOVER_REQUEST_DELAY = 300;
+
+const LinkOutIcon = styled(LinkOut)``;
+
+const ColumnWrapper = styled.div<{
+    selected: boolean;
+    highlighted: boolean;
+    fromSelect?: boolean;
+    disabled: boolean;
+}>`
+    border: 1px solid transparent;
+
+    ${({ selected, highlighted, fromSelect }) => {
+        if (selected) {
+            return `border: ${SELECT_COLOR} 1px solid; background-color: ${SELECT_COLOR}20;`;
+        }
+        if (highlighted) {
+            if (fromSelect) {
+                return `background-color: ${SELECT_COLOR}20;`;
+            }
+            return `background-color: ${HOVER_COLOR}20;`;
+        }
+        return 'background-color: white;';
+    }}
+    border-radius: 4px;
+    color: ${({ disabled }) => (disabled ? ANTD_GRAY[11] : ANTD_GRAY[7])};
+    display: flex;
+    font-size: 10px;
+    gap: 4px;
+    max-height: 20.5px;
+    padding: 3px;
+    position: relative;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    width: 100%;
+
+    ${LinkOutIcon} {
+        display: none;
+    }
+
+    :hover {
+        ${LinkOutIcon} {
+            display: inline;
+        }
+    }
+`;
+
+const CustomHandle = styled(Handle)<{ position: Position }>`
+    background: initial;
+    border: initial;
+    ${({ position }) => (position === Position.Left ? 'left: -15px;' : 'right: -12px;')}
+    top: 50%;
+`;
+
+const TypeWrapper = styled.div`
+    color: ${ANTD_GRAY[7]};
+    width: 11px;
+`;
+
+const ColumnLinkWrapper = styled(Link)`
+    display: flex;
+    margin-left: auto;
+
+    color: inherit;
+
+    :hover {
+        color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    }
+`;
+
+const ColumnText = styled(Typography.Text)`
+    color: inherit;
+`;
+
+const StyledLoadingIndicator = styled(LoadingOutlined)`
+    display: flex;
+    font-size: inherit;
+`;
+
+type Props = LineageDisplayColumn & { parentUrn: string; entityType: EntityType; allNeighborsFetched: boolean };
+
+export default function Column({
+    parentUrn,
+    entityType,
+    fieldPath,
+    highlighted,
+    hasLineage,
+    type,
+    nativeDataType,
+    lineageAsset,
+    allNeighborsFetched,
+}: Props) {
+    const { config } = useAppConfig();
+    const { selectedColumn, hoveredColumn, setSelectedColumn, setHoveredColumn } = useContext(LineageDisplayContext);
+    const id = useMemo(() => createColumnRef(parentUrn, fieldPath), [parentUrn, fieldPath]);
+    const selected = selectedColumn === id;
+
+    let columnName = fieldPath;
+    try {
+        columnName = decodeURI(columnName);
+    } catch (e) {
+        console.error(`Failed to decode URI for fieldPath: ${fieldPath}`);
+    }
+
+    const schemaFieldUrn = generateSchemaFieldUrn(fieldPath, parentUrn) || '';
+    const lineageUrl = useGetLineageUrl(schemaFieldUrn, EntityType.SchemaField);
+
+    const [showDisabledTooltipOnHover, setShowDisabledTooltipOnHover] = useState(false);
+    const [showDisabledTooltipOnSelect, setShowDisabledTooltipOnSelect] = useState(false);
+    const turnOnDisabledTooltipOnHover = useCallback(() => setShowDisabledTooltipOnHover(true), []);
+
+    const { initiateRequest, cancelRequest, loading } = useFetchColumnCounts(
+        schemaFieldUrn,
+        lineageAsset,
+        turnOnDisabledTooltipOnHover,
+    );
+    const isFullyFetched = lineageAsset.lineageCountsFetched || allNeighborsFetched;
+    const showAsDisabled = !hasLineage && isFullyFetched;
+
+    useEffect(() => {
+        // Deselect if we queried lineage counts and found out it has none
+        if (id === selectedColumn && isFullyFetched && !hasLineage) {
+            setSelectedColumn(null);
+            setShowDisabledTooltipOnSelect(true);
+            setTimeout(() => setShowDisabledTooltipOnSelect(false), 3000);
+        }
+    }, [selectedColumn, id, hasLineage, isFullyFetched, setSelectedColumn]);
+
+    const handleMouseEnter = useCallback(() => {
+        if (!selectedColumn && !showAsDisabled) {
+            setHoveredColumn(id);
+            if (!allNeighborsFetched) {
+                initiateRequest(HOVER_REQUEST_DELAY);
+            }
+        }
+    }, [allNeighborsFetched, showAsDisabled, id, selectedColumn, initiateRequest, setHoveredColumn]);
+    const handleMouseLeave = useCallback(() => {
+        setHoveredColumn(null);
+        if (!selectedColumn) {
+            setShowDisabledTooltipOnHover(false);
+            cancelRequest();
+        }
+    }, [selectedColumn, cancelRequest, setHoveredColumn]);
+
+    // TODO: Add hover text if overflowed
+    const contents = (
+        <ColumnWrapper
+            highlighted={highlighted && !showAsDisabled}
+            fromSelect={!!selectedColumn}
+            selected={selected}
+            disabled={!showAsDisabled}
+            onClick={(e) => {
+                if (!showAsDisabled) {
+                    onClickPreventSelect(e);
+                    if (selectedColumn !== id && !allNeighborsFetched) {
+                        initiateRequest();
+                    }
+                    // Toggle if already selected
+                    setSelectedColumn((v) => (v === id ? null : id));
+                    analytics.event({
+                        type: EventType.DrillDownLineageEvent,
+                        action: selectedColumn === id ? 'deselect' : 'select',
+                        parentUrn,
+                        parentEntityType: entityType,
+                        entityUrn: schemaFieldUrn,
+                        entityType: EntityType.SchemaField,
+                        dataType: type,
+                    });
+                }
+            }}
+            onMouseEnter={handleMouseEnter}
+            onMouseLeave={handleMouseLeave}
+        >
+            <CustomHandle id={id} type="target" position={Position.Left} isConnectable={false} />
+            {type && (
+                <TypeWrapper>
+                    <CompactFieldIconWithTooltip type={type} nativeDataType={nativeDataType} />
+                </TypeWrapper>
+            )}
+            <ColumnText ellipsis={{ tooltip: { showArrow: false } }}>{columnName}</ColumnText>
+            {loading && !hasLineage && <Spin indicator={<StyledLoadingIndicator />} />}
+            {config.featureFlags.schemaFieldCLLEnabled && (
+                <ColumnLinkWrapper
+                    to={lineageUrl}
+                    onClick={(e) => e.stopPropagation()}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                >
+                    <Tooltip title="Explore complete column lineage" mouseEnterDelay={0.3}>
+                        <LinkOutIcon />
+                    </Tooltip>
+                </ColumnLinkWrapper>
+            )}
+            <CustomHandle id={id} type="source" position={Position.Right} isConnectable={false} />
+        </ColumnWrapper>
+    );
+
+    return (
+        <Tooltip
+            title="Column has no lineage"
+            open={(showDisabledTooltipOnHover && hoveredColumn === id) || showDisabledTooltipOnSelect}
+            placement="right"
+            showArrow={false}
+        >
+            {contents}
+        </Tooltip>
+    );
+}
+
+function useFetchColumnCounts(schemaFieldUrn: string, lineageAsset: ColumnAsset, onDisabled: () => void) {
+    const { showGhostEntities, setColumnEdgeVersion } = useContext(LineageNodesContext);
+    const { startTimeMillis, endTimeMillis } = useGetLineageTimeParams();
+    const ignoreSchemaFieldStatus = useIgnoreSchemaFieldStatus();
+
+    const assetToWrite = lineageAsset;
+    const [fetchCounts, { loading }] = useGetLineageCountsLazyQuery({
+        variables: {
+            urn: schemaFieldUrn,
+            startTimeMillis,
+            endTimeMillis,
+            separateSiblings: true,
+            includeGhostEntities: showGhostEntities || ignoreSchemaFieldStatus,
+        },
+        onCompleted: (data) => {
+            assetToWrite.lineageCountsFetched = true;
+            if (data.entity && 'upstream' in data?.entity && data.entity.upstream?.total !== undefined) {
+                assetToWrite.numUpstream = (data.entity.upstream.total || 0) - (data.entity.upstream.filtered || 0);
+            }
+            if (data.entity && 'downstream' in data?.entity && data.entity.downstream?.total !== undefined) {
+                assetToWrite.numDownstream =
+                    (data.entity.downstream.total || 0) - (data.entity.downstream.filtered || 0);
+            }
+            if (!assetToWrite.numUpstream && !assetToWrite.numDownstream) {
+                onDisabled();
+            }
+            setColumnEdgeVersion((v) => v + 1);
+        },
+    });
+
+    const timeoutRef = useRef<NodeJS.Timeout | null>(null);
+    const initiateRequest = useCallback(
+        (delay = 0) => {
+            if (!lineageAsset.lineageCountsFetched && !loading) {
+                timeoutRef.current = setTimeout(() => fetchCounts(), delay);
+            }
+        },
+        [lineageAsset.lineageCountsFetched, fetchCounts, loading],
+    );
+    const cancelRequest = useCallback(() => {
+        if (timeoutRef.current) {
+            clearTimeout(timeoutRef.current);
+        }
+    }, []);
+    return { initiateRequest, cancelRequest, loading };
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/ColumnSearch.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ColumnSearch.tsx
new file mode 100644
index 00000000000000..7ab9fa5380cde0
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ColumnSearch.tsx
@@ -0,0 +1,39 @@
+import { Input } from 'antd';
+import React, { Dispatch, SetStateAction } from 'react';
+import styled from 'styled-components';
+import { onClickPreventSelect } from '../common';
+
+const SearchInput = styled(Input)`
+    border-radius: 4px;
+    border: 0.5px solid #d9d9d9;
+    cursor: text;
+    font-size: 10px;
+    height: 22px;
+    padding: 8px;
+    width: 100%;
+
+    :focus,
+    :hover {
+        border: 0.5px solid #1890ff;
+        box-shadow: none;
+        outline: none;
+    }
+`;
+
+interface Props {
+    searchText: string;
+    setSearchText: Dispatch<SetStateAction<string>>;
+}
+
+export default function ColumnSearch({ searchText, setSearchText }: Props) {
+    // Add nodrag class to prevent node from being selected on click
+    // See https://reactflow.dev/api-reference/types/node-props#notes
+    return (
+        <SearchInput
+            defaultValue={searchText}
+            placeholder="Find column"
+            onChange={(e) => setSearchText(e.target.value.trim())}
+            onClick={onClickPreventSelect}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/Columns.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/Columns.tsx
new file mode 100644
index 00000000000000..a5d00102ec690b
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/Columns.tsx
@@ -0,0 +1,235 @@
+import { LineageAssetType } from '@app/lineageV2/types';
+import React, { Dispatch, SetStateAction, useCallback, useContext, useEffect, useMemo, useState } from 'react';
+import { useDebounce } from 'react-use';
+import { useUpdateNodeInternals } from 'reactflow';
+import { Pagination } from 'antd';
+import { Tooltip } from '@components';
+import { PartitionOutlined } from '@ant-design/icons';
+import styled from 'styled-components';
+import { EventType } from '../../analytics';
+import analytics from '../../analytics/analytics';
+import { NUM_COLUMNS_PER_PAGE } from '../constants';
+import Column from './Column';
+import ColumnSearch from './ColumnSearch';
+import { FetchedEntity } from '../../lineage/types';
+import { LineageDisplayColumn } from './useDisplayedColumns';
+import { LINEAGE_COLORS, REDESIGN_COLORS } from '../../entityV2/shared/constants';
+import { LineageNodesContext, onClickPreventSelect, TRANSITION_DURATION_MS } from '../common';
+
+const MainColumnsWrapper = styled.div<{ isGhost: boolean }>`
+    align-items: center;
+    display: flex;
+    flex-direction: column;
+    font: 12px 'Roboto Mono', monospace;
+    width: 100%;
+    padding: 8px 11px;
+    opacity: ${({ isGhost }) => (isGhost ? 0.5 : 1)};
+`;
+
+const SearchBarWrapper = styled.div`
+    align-items: center;
+    display: flex;
+    gap: 8px;
+    margin-bottom: 8px;
+    width: 100%;
+`;
+
+const FilterLineageIcon = styled(PartitionOutlined)<{ count: number; selected: boolean }>`
+    ${({ selected }) => (selected ? `color: ${LINEAGE_COLORS.BLUE_1};` : '')};
+    padding-right: 4px;
+
+    :hover {
+        color: ${REDESIGN_COLORS.BLUE};
+    }
+
+    ::after {
+        content: '${({ count }) => count}';
+        font-size: 6px;
+        margin-left: 2px;
+        position: absolute;
+    }
+`;
+
+// Wrap pagination and stop click propagation so that changing page doesn't cause node to be selected
+const ColumnPaginationWrapper = styled.div``;
+
+const ColumnPagination = styled(Pagination)`
+    display: flex;
+    justify-content: center;
+    margin-top: 8px;
+    overflow: hidden;
+    width: 100%;
+`;
+
+const HorizontalDivider = styled.hr<{ margin: number }>`
+    margin: ${({ margin }) => margin}px 0;
+    opacity: 0.1;
+    width: 100%;
+`;
+
+interface Props {
+    entity: FetchedEntity;
+    isGhost: boolean;
+    showAllColumns: boolean;
+    paginatedColumns: LineageDisplayColumn[];
+    highlightedColumns: LineageDisplayColumn[];
+    numFiltered: number;
+    pageIndex: number;
+    setPageIndex: Dispatch<SetStateAction<number>>;
+    filterText: string;
+    setFilterText: Dispatch<SetStateAction<string>>;
+    numColumnsWithLineage: number;
+    onlyWithLineage: boolean;
+    setOnlyWithLineage: Dispatch<SetStateAction<boolean>>;
+}
+
+export default function DelayedColumns(props: Props) {
+    // TODO: Only delay some props: contents should be immediate
+    const [delayedProps, setDelayedProps] = useState<Props>(props);
+    useEffect(() => {
+        if (
+            delayedProps.paginatedColumns.length > props.paginatedColumns.length ||
+            delayedProps.highlightedColumns.length > props.highlightedColumns.length ||
+            delayedProps.showAllColumns > props.showAllColumns
+        ) {
+            // Delay removal of columns to allow for transition to complete
+            const timeout = setTimeout(() => setDelayedProps(props), TRANSITION_DURATION_MS);
+            return () => clearTimeout(timeout);
+        }
+        setDelayedProps(props);
+        return () => null;
+    }, [
+        props,
+        delayedProps.paginatedColumns.length,
+        delayedProps.highlightedColumns.length,
+        delayedProps.showAllColumns,
+    ]);
+
+    return Columns(delayedProps);
+}
+
+function Columns(props: Props) {
+    const {
+        entity,
+        isGhost,
+        showAllColumns,
+        paginatedColumns,
+        highlightedColumns,
+        numFiltered,
+        pageIndex,
+        setPageIndex,
+        filterText,
+        setFilterText,
+        numColumnsWithLineage,
+        onlyWithLineage,
+        setOnlyWithLineage,
+    } = props;
+
+    const updateNodeInternals = useUpdateNodeInternals();
+    useEffect(() => {
+        updateNodeInternals(entity.urn); // Register new column handle positions with React Flow
+    }, [entity.urn, updateNodeInternals, showAllColumns, paginatedColumns, highlightedColumns]);
+
+    const allNeighborsFetched = useComputeAllNeighborsFetched(entity);
+    const hasColumnPagination = showAllColumns && numFiltered > NUM_COLUMNS_PER_PAGE;
+
+    useDebounce(
+        () => {
+            if (filterText) {
+                analytics.event({
+                    type: EventType.SearchLineageColumnsEvent,
+                    entityUrn: entity.urn,
+                    entityType: entity.type,
+                    searchTextLength: filterText.length,
+                });
+            }
+        },
+        1000,
+        [filterText],
+    );
+
+    const enableDisableColumnsFilter = useCallback(
+        (e: React.MouseEvent<HTMLSpanElement, MouseEvent>) => {
+            onClickPreventSelect(e);
+            analytics.event({
+                type: EventType.FilterLineageColumnsEvent,
+                action: onlyWithLineage ? 'disable' : 'enable',
+                entityUrn: entity.urn,
+                entityType: entity.type,
+                shownCount: numColumnsWithLineage,
+            });
+            setOnlyWithLineage((prevOnlyWithLineage) => !prevOnlyWithLineage);
+        },
+        [onlyWithLineage, setOnlyWithLineage, entity.urn, entity.type, numColumnsWithLineage],
+    );
+
+    const columnProps = {
+        parentUrn: entity.urn,
+        entityType: entity.type,
+        allNeighborsFetched,
+    };
+
+    return (
+        <MainColumnsWrapper isGhost={isGhost}>
+            {showAllColumns && (
+                <SearchBarWrapper>
+                    <ColumnSearch searchText={filterText} setSearchText={setFilterText} />
+                    <Tooltip title="Only show columns with lineage" placement="right" mouseEnterDelay={0.5}>
+                        <FilterLineageIcon
+                            count={numColumnsWithLineage}
+                            selected={onlyWithLineage}
+                            onClick={enableDisableColumnsFilter}
+                        />
+                    </Tooltip>
+                </SearchBarWrapper>
+            )}
+            {showAllColumns && paginatedColumns.map((col) => <Column key={col.fieldPath} {...col} {...columnProps} />)}
+            {showAllColumns && !!paginatedColumns.length && !!highlightedColumns.length && (
+                <HorizontalDivider margin={4} />
+            )}
+            {highlightedColumns.map((col) => (
+                <Column key={col.fieldPath} {...col} {...columnProps} />
+            ))}
+            {hasColumnPagination && (
+                <ColumnPaginationWrapper onClick={(e) => e.stopPropagation()}>
+                    <ColumnPagination
+                        className="nodrag"
+                        current={pageIndex + 1}
+                        onChange={(page) => setPageIndex(page - 1)}
+                        total={numFiltered}
+                        pageSize={NUM_COLUMNS_PER_PAGE}
+                        size="small"
+                        simple
+                        showLessItems
+                        showSizeChanger={false}
+                    />
+                </ColumnPaginationWrapper>
+            )}
+        </MainColumnsWrapper>
+    );
+}
+
+function useComputeAllNeighborsFetched(entity: FetchedEntity): boolean {
+    const { nodes, dataVersion } = useContext(LineageNodesContext);
+    const allNeighborsFetched = useMemo(
+        () =>
+            [...(entity.upstreamRelationships || []), ...(entity.downstreamRelationships || [])].every(
+                (child) => child.entity?.urn && !!nodes.get(child.entity.urn)?.entity,
+            ),
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+        [entity.upstreamChildren, entity.downstreamChildren, nodes, dataVersion],
+    );
+    useEffect(() => {
+        if (allNeighborsFetched) {
+            const node = nodes.get(entity.urn);
+            node?.entity?.lineageAssets?.forEach((asset) => {
+                if (asset.type === LineageAssetType.Column) {
+                    // eslint-disable-next-line no-param-reassign
+                    asset.lineageCountsFetched = true;
+                }
+            });
+        }
+    }, [allNeighborsFetched, nodes, entity.urn]);
+
+    return allNeighborsFetched;
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/ContainerPath.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ContainerPath.tsx
new file mode 100644
index 00000000000000..47ec4d1a475242
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ContainerPath.tsx
@@ -0,0 +1,88 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
+import { ContainerIconBase } from '@app/entityV2/shared/containers/profile/header/PlatformContent/ContainerIcon';
+import MatchTextSizeWrapper from '@app/sharedV2/text/MatchTextSizeWrapper';
+import { useEntityRegistry } from '@app/useEntityRegistry';
+import { Container } from '@types';
+import { Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+
+const ContainerPathWrapper = styled.div`
+    display: flex;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    width: 100%;
+
+    flex: 1 1 10px;
+    min-height: 8px;
+    max-height: 12px;
+`;
+
+const EmptyContainer = styled.div`
+    height: 8px;
+`;
+
+// TODO: Put ellipsis on last item correctly
+const ContainerEntry = styled(MatchTextSizeWrapper)<{ numItems?: number; isLast: boolean }>`
+    align-items: center;
+    color: ${REDESIGN_COLORS.TEXT_GREY};
+    display: flex;
+    flex-direction: row;
+    max-width: ${({ numItems, isLast }) => (numItems && !isLast ? 100 / numItems : 100)}%;
+`;
+
+const ContainerText = styled(Typography.Text)`
+    color: inherit;
+    margin-left: 4px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+`;
+
+const VerticalDivider = styled.hr<{ margin: number }>`
+    align-self: stretch;
+    height: auto;
+    margin: 0 ${({ margin }) => margin}px;
+    border: 0.5px solid;
+    opacity: 0.1;
+    vertical-align: text-top;
+`;
+
+interface Props {
+    parents?: Container[] | GenericEntityProperties[];
+    className?: string;
+}
+
+export default function ContainerPath({ parents, className }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const containers = parents?.slice(0, 1);
+
+    if (!containers?.length) {
+        return <EmptyContainer />;
+    }
+
+    return (
+        <ContainerPathWrapper className={className}>
+            {containers?.map((container, i) => (
+                <ContainerEntry
+                    key={container.urn}
+                    isLast={i === containers.length - 1}
+                    numItems={containers.length}
+                    defaultHeight={10}
+                >
+                    {i > 0 && <VerticalDivider margin={4} />}
+                    <ContainerIconBase container={container} />
+                    <ContainerText ellipsis={{ tooltip: { showArrow: false } }}>
+                        {/*
+                            Browse paths with no entity are stored as { name: ... }, with no type.
+                            Entity registry will return empty string display name for undefined type.
+                         */}
+                        {entityRegistry.getDisplayName(container.type, container) || container.name}
+                    </ContainerText>
+                </ContainerEntry>
+            ))}
+        </ContainerPathWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/ContractLineageButton.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ContractLineageButton.tsx
new file mode 100644
index 00000000000000..4df6a0b177663e
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ContractLineageButton.tsx
@@ -0,0 +1,45 @@
+import React, { useContext } from 'react';
+import { KeyboardArrowLeft } from '@mui/icons-material';
+import { LineageDirection } from '../../../types.generated';
+import { UpstreamWrapper, DownstreamWrapper, Button } from './components';
+import { LineageNodesContext, onClickPreventSelect } from '../common';
+import analytics, { EventType } from '../../analytics';
+
+interface Props {
+    urn: string;
+    direction: LineageDirection;
+}
+
+export function ContractLineageButton({ urn, direction }: Props) {
+    const context = useContext(LineageNodesContext);
+    const { nodes, setDisplayVersion } = context;
+
+    const contractLineage = (e: React.MouseEvent<HTMLSpanElement, MouseEvent>) => {
+        e.stopPropagation();
+        const node = nodes.get(urn);
+        if (node) {
+            node.isExpanded = { ...node.isExpanded, [direction]: false };
+            setDisplayVersion(([version, n]) => [version + 1, n]);
+            analytics.event({
+                type: EventType.ContractLineageEvent,
+                direction,
+                entityUrn: urn,
+                entityType: node.type,
+            });
+        }
+    };
+
+    const Wrapper = direction === LineageDirection.Upstream ? UpstreamWrapper : DownstreamWrapper;
+
+    return (
+        <Wrapper>
+            <Button
+                onClick={(e) => onClickPreventSelect(e) && contractLineage(e)}
+                onMouseEnter={(e) => e.stopPropagation()}
+                onMouseLeave={(e) => e.stopPropagation()}
+            >
+                <KeyboardArrowLeft viewBox="4 3 18 18" fontSize="inherit" />
+            </Button>
+        </Wrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/ExpandLineageButton.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ExpandLineageButton.tsx
new file mode 100644
index 00000000000000..0705f4406a171f
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ExpandLineageButton.tsx
@@ -0,0 +1,86 @@
+import React from 'react';
+import styled from 'styled-components';
+import { KeyboardArrowRight, KeyboardDoubleArrowRight } from '@mui/icons-material';
+import { EntityType, LineageDirection } from '../../../types.generated';
+import { FetchStatus, onClickPreventSelect } from '../common';
+import { ANTD_GRAY } from '../../entityV2/shared/constants';
+import { UpstreamWrapper, DownstreamWrapper, Button } from './components';
+import { useOnClickExpandLineage } from './useOnClickExpandLineage';
+import analytics, { EventType } from '../../analytics';
+
+const VerticalDivider = styled.hr<{ margin: number }>`
+    align-self: stretch;
+    height: auto;
+    margin: 0 ${({ margin }) => margin}px;
+    border: 0.5px solid ${ANTD_GRAY[5]};
+    vertical-align: text-top;
+`;
+
+interface Props {
+    urn: string;
+    type: EntityType;
+    direction: LineageDirection;
+    display: boolean;
+    fetchStatus: Record<LineageDirection, FetchStatus>;
+    ignoreSchemaFieldStatus: boolean;
+}
+
+export function ExpandLineageButton({ urn, type, direction, display, fetchStatus, ignoreSchemaFieldStatus }: Props) {
+    const expandOneLevel = useOnClickExpandLineage(urn, type, direction, false);
+    const expandAll = useOnClickExpandLineage(urn, type, direction, true);
+    const isFetchComplete = fetchStatus[direction] === FetchStatus.COMPLETE;
+    const showExpandAll = !isFetchComplete && (type === EntityType.SchemaField ? !ignoreSchemaFieldStatus : true);
+
+    const handleExpandOneLevel = (e: React.MouseEvent<HTMLSpanElement, MouseEvent>) => {
+        expandOneLevel(e);
+        analytics.event({
+            type: EventType.ExpandLineageEvent,
+            direction,
+            entityUrn: urn,
+            entityType: type,
+            levelsExpanded: '1',
+        });
+    };
+
+    const handleExpandAll = (e: React.MouseEvent<HTMLSpanElement, MouseEvent>) => {
+        expandAll(e);
+        analytics.event({
+            type: EventType.ExpandLineageEvent,
+            direction,
+            entityUrn: urn,
+            entityType: type,
+            levelsExpanded: 'all',
+        });
+    };
+
+    // Still have to render this component while request is loading, otherwise it gets cancelled
+    // But don't render the buttons while the request is in progress
+    // TODO: Reset fetch status if the request fails
+    if (!display) return null;
+
+    const Wrapper = direction === LineageDirection.Upstream ? UpstreamWrapper : DownstreamWrapper;
+
+    return (
+        <Wrapper expandOnHover={showExpandAll}>
+            <Button
+                onClick={(e) => onClickPreventSelect(e) && handleExpandOneLevel(e)}
+                onMouseEnter={(e) => e.stopPropagation()}
+                onMouseLeave={(e) => e.stopPropagation()}
+            >
+                <KeyboardArrowRight viewBox="3 3 18 18" fontSize="inherit" />
+            </Button>
+            {showExpandAll && (
+                <>
+                    <VerticalDivider margin={2} />
+                    <Button
+                        onClick={(e) => onClickPreventSelect(e) && handleExpandAll(e)}
+                        onMouseEnter={(e) => e.stopPropagation()}
+                        onMouseLeave={(e) => e.stopPropagation()}
+                    >
+                        <KeyboardDoubleArrowRight viewBox="3 3 18 18" fontSize="inherit" />
+                    </Button>
+                </>
+            )}
+        </Wrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/GhostEntityMenu.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/GhostEntityMenu.tsx
new file mode 100644
index 00000000000000..d8a468607ec94d
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/GhostEntityMenu.tsx
@@ -0,0 +1,82 @@
+import { MoreOutlined } from '@ant-design/icons';
+import { LineageDisplayContext, onClickPreventSelect } from '@app/lineageV2/common';
+import Colors from '@components/theme/foundations/colors';
+import { Button, Dropdown } from 'antd';
+import React, { useContext } from 'react';
+import styled from 'styled-components';
+
+const DROPDOWN_Z_INDEX = 100;
+
+const Wrapper = styled.div`
+    border-radius: 4px;
+    position: absolute;
+    right: 3px;
+    top: 8px;
+
+    :hover {
+        color: ${Colors.violet[500]};
+    }
+`;
+
+const StyledIcon = styled(MoreOutlined)`
+    background: transparent;
+`;
+
+const StyledButton = styled(Button)`
+    height: min-content;
+    padding: 0;
+    border: none;
+    box-shadow: none;
+    transition: none;
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .ant-dropdown {
+        top: 20px !important;
+        left: auto !important;
+        right: 0 !important;
+    }
+`;
+
+interface Props {
+    urn: string;
+}
+
+export default function GhostEntityMenu({ urn }: Props) {
+    const { displayedMenuNode, setDisplayedMenuNode } = useContext(LineageDisplayContext);
+    const isMenuVisible = displayedMenuNode === urn;
+
+    function handleMenuClick(e: React.MouseEvent<HTMLElement, MouseEvent>) {
+        onClickPreventSelect(e);
+        if (isMenuVisible) {
+            setDisplayedMenuNode(null);
+        } else {
+            setDisplayedMenuNode(urn);
+        }
+    }
+
+    return (
+        <Wrapper>
+            <StyledButton onClick={handleMenuClick} type="text">
+                <Dropdown
+                    open={isMenuVisible}
+                    overlayStyle={{ zIndex: DROPDOWN_Z_INDEX }}
+                    getPopupContainer={(t) => t.parentElement || t}
+                    menu={{
+                        items: [
+                            {
+                                key: 'copyUrn',
+                                label: 'Copy URN',
+                                onClick: () => navigator.clipboard.writeText(urn),
+                            },
+                        ],
+                    }}
+                >
+                    <StyledIcon style={{ fontSize: 'inherit' }} />
+                </Dropdown>
+            </StyledButton>
+        </Wrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/LineageEntityNode.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/LineageEntityNode.tsx
new file mode 100644
index 00000000000000..4d36ec6d8681d3
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/LineageEntityNode.tsx
@@ -0,0 +1,147 @@
+import { HomeOutlined } from '@ant-design/icons';
+import LineageVisualizationContext from '@app/lineageV2/LineageVisualizationContext';
+import React, { useContext, useEffect, useMemo, useState } from 'react';
+import { NodeProps } from 'reactflow';
+import styled from 'styled-components';
+import { EntityType, LineageDirection } from '../../../types.generated';
+import { LINEAGE_COLORS } from '../../entityV2/shared/constants';
+import {
+    LineageDisplayContext,
+    LineageEntity,
+    LineageNodesContext,
+    TRANSITION_DURATION_MS,
+    useIgnoreSchemaFieldStatus,
+} from '../common';
+import useSearchAcrossLineage from '../useSearchAcrossLineage';
+import NodeContents from './NodeContents';
+import useDisplayedColumns from './useDisplayedColumns';
+
+export const LINEAGE_ENTITY_NODE_NAME = 'lineage-entity';
+const MAX_NODES_FOR_TRANSITION = 50;
+
+const HomeNodeBubble = styled.div`
+    align-items: center;
+    background-color: ${LINEAGE_COLORS.PURPLE_3};
+    border-radius: 10px;
+    color: white;
+    display: flex;
+    font-size: 10px;
+    font-weight: 600;
+    height: 22px;
+    justify-content: center;
+    left: 1px;
+    padding: 4px 8px;
+    position: absolute;
+    top: -26px;
+`;
+
+export default function LineageEntityNode(props: NodeProps<LineageEntity>) {
+    const { data, selected, dragging } = props;
+    const { urn, type, entity, id, fetchStatus, isExpanded, filters } = data;
+    const ignoreSchemaFieldStatus = useIgnoreSchemaFieldStatus();
+    const { rootUrn } = useContext(LineageNodesContext);
+    const { shownUrns, setHoveredNode } = useContext(LineageDisplayContext);
+    const { searchQuery, searchedEntity } = useContext(LineageVisualizationContext);
+
+    const [showColumns, setShowColumns] = useState(false);
+    const [onlyWithLineage, setOnlyWithLineage] = useState(false);
+    const [pageIndex, setPageIndex] = useState(0);
+    const [filterText, setFilterText] = useState('');
+
+    useEffect(() => {
+        setPageIndex(0);
+    }, [filterText, onlyWithLineage, setPageIndex]);
+
+    const transitionDuration = shownUrns.length <= MAX_NODES_FOR_TRANSITION ? TRANSITION_DURATION_MS : 0;
+
+    const { paginatedColumns, extraHighlightedColumns, numFilteredColumns, numColumnsWithLineage, numColumnsTotal } =
+        useDisplayedColumns({
+            urn,
+            entity,
+            showColumns,
+            filterText,
+            pageIndex,
+            onlyWithLineage,
+        });
+
+    const refetch = useRefetchLineage(urn, type);
+
+    return (
+        <>
+            {urn === rootUrn && (
+                <HomeNodeBubble>
+                    <HomeOutlined style={{ marginRight: 4 }} />
+                    Home
+                </HomeNodeBubble>
+            )}
+            <NodeContents
+                id={id}
+                urn={urn}
+                type={type}
+                selected={selected}
+                dragging={dragging}
+                isSearchedEntity={searchedEntity === urn}
+                entity={entity}
+                fetchStatus={fetchStatus}
+                isExpanded={isExpanded}
+                filters={filters}
+                transitionDuration={transitionDuration}
+                rootUrn={rootUrn}
+                searchQuery={searchQuery}
+                setHoveredNode={setHoveredNode}
+                showColumns={showColumns}
+                setShowColumns={setShowColumns}
+                onlyWithLineage={onlyWithLineage}
+                setOnlyWithLineage={setOnlyWithLineage}
+                pageIndex={pageIndex}
+                setPageIndex={setPageIndex}
+                filterText={filterText}
+                setFilterText={setFilterText}
+                paginatedColumns={paginatedColumns}
+                extraHighlightedColumns={extraHighlightedColumns}
+                numFilteredColumns={numFilteredColumns}
+                numColumnsWithLineage={numColumnsWithLineage}
+                numColumnsTotal={numColumnsTotal}
+                refetch={refetch}
+                ignoreSchemaFieldStatus={ignoreSchemaFieldStatus}
+            />
+        </>
+    );
+}
+
+function useRefetchLineage(urn: string, type: EntityType) {
+    const nodeContext = useContext(LineageNodesContext);
+
+    const { fetchLineage: fetchLineageUpstream } = useSearchAcrossLineage(
+        urn,
+        type,
+        nodeContext,
+        LineageDirection.Upstream,
+        true,
+        false,
+        true,
+    );
+    const { fetchLineage: fetchLineageDownstream } = useSearchAcrossLineage(
+        urn,
+        type,
+        nodeContext,
+        LineageDirection.Downstream,
+        true,
+        false,
+        true,
+    );
+
+    return useMemo(
+        () => ({
+            [LineageDirection.Upstream]: () => {
+                const timeout = setTimeout(fetchLineageUpstream, 7000);
+                return () => clearTimeout(timeout);
+            },
+            [LineageDirection.Downstream]: () => {
+                const timeout = setTimeout(fetchLineageDownstream, 7000);
+                return () => clearTimeout(timeout);
+            },
+        }),
+        [fetchLineageUpstream, fetchLineageDownstream],
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/ManageLineageMenu.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ManageLineageMenu.tsx
new file mode 100644
index 00000000000000..dac251e0480856
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/ManageLineageMenu.tsx
@@ -0,0 +1,174 @@
+import { ArrowLeftOutlined, ArrowRightOutlined, MoreOutlined } from '@ant-design/icons';
+import Colors from '@components/theme/foundations/colors';
+import { Button, Dropdown, Menu } from 'antd';
+import { Popover } from '@components';
+import styled from 'styled-components';
+import React, { useCallback, useContext, useState } from 'react';
+import { EntityType, LineageDirection } from '../../../types.generated';
+import ManageLineageModal from '../manualLineage/ManageLineageModal';
+import { LineageDisplayContext, LineageEntity, onClickPreventSelect } from '../common';
+import { ENTITY_TYPES_WITH_MANUAL_LINEAGE } from '../../entityV2/shared/constants';
+
+const DROPDOWN_Z_INDEX = 100;
+const POPOVER_Z_INDEX = 101;
+const UNAUTHORIZED_TEXT = "You aren't authorized to edit lineage for this entity.";
+const DOWNSTREAM_DISABLED_TEXT = 'Make this entity your home to make downstream edits.';
+const UPSTREAM_DISABLED_TEXT = 'Make this entity your home to make upstream edits.';
+
+const Wrapper = styled.div`
+    border-radius: 4px;
+    position: absolute;
+    right: 3px;
+    top: 8px;
+
+    :hover {
+        color: ${Colors.violet[500]};
+    }
+`;
+
+const StyledIcon = styled(MoreOutlined)`
+    background: transparent;
+`;
+
+const StyledMenuItem = styled(Menu.Item)`
+    padding: 0;
+`;
+
+const MenuItemContent = styled.div`
+    padding: 5px 12px;
+`;
+
+const StyledButton = styled(Button)`
+    height: min-content;
+    padding: 0;
+    border: none;
+    box-shadow: none;
+    transition: none;
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .ant-dropdown {
+        top: 20px !important;
+        left: auto !important;
+        right: 0 !important;
+    }
+`;
+
+const PopoverContent = styled.span`
+    z-index: ${POPOVER_Z_INDEX};
+`;
+
+interface Props {
+    node: LineageEntity;
+    refetch: Record<LineageDirection, () => void>;
+}
+
+export default function ManageLineageMenu({ node, refetch }: Props) {
+    const { displayedMenuNode, setDisplayedMenuNode } = useContext(LineageDisplayContext);
+    const isMenuVisible = displayedMenuNode === node.urn;
+    const [isModalVisible, setIsModalVisible] = useState(false);
+    const [lineageDirection, setLineageDirection] = useState<LineageDirection>(LineageDirection.Upstream);
+
+    function manageLineage(direction: LineageDirection) {
+        setLineageDirection(direction);
+        setIsModalVisible(true);
+    }
+
+    function handleMenuClick(e: React.MouseEvent<HTMLElement, MouseEvent>) {
+        onClickPreventSelect(e);
+        if (isMenuVisible) {
+            setDisplayedMenuNode(null);
+        } else {
+            setDisplayedMenuNode(node.urn);
+        }
+    }
+
+    const hideMenu = useCallback(() => setIsModalVisible(false), []);
+
+    const canEditLineage = !!node.entity?.canEditLineage;
+    const disableUpstream = node.direction === LineageDirection.Downstream;
+    const disableDownstream = node.direction === LineageDirection.Upstream;
+    const isDashboard = node.type === EntityType.Dashboard;
+    const isDownstreamDisabled = disableDownstream || isDashboard || !canEditLineage;
+    const isUpstreamDisabled = disableUpstream || !canEditLineage;
+    const isManualLineageSupported = ENTITY_TYPES_WITH_MANUAL_LINEAGE.has(node.type);
+
+    if (!isManualLineageSupported) return null;
+
+    return (
+        <Wrapper>
+            <StyledButton onClick={handleMenuClick} type="text">
+                <Dropdown
+                    open={isMenuVisible}
+                    overlayStyle={{ zIndex: DROPDOWN_Z_INDEX }}
+                    getPopupContainer={(t) => t.parentElement || t}
+                    overlay={
+                        <Menu>
+                            {isManualLineageSupported && (
+                                <>
+                                    <StyledMenuItem
+                                        key="0"
+                                        onClick={() => manageLineage(LineageDirection.Upstream)}
+                                        disabled={isUpstreamDisabled}
+                                    >
+                                        <Popover
+                                            content={!canEditLineage ? UNAUTHORIZED_TEXT : UPSTREAM_DISABLED_TEXT}
+                                            overlayStyle={
+                                                isUpstreamDisabled ? { zIndex: POPOVER_Z_INDEX } : { display: 'none' }
+                                            }
+                                        >
+                                            <MenuItemContent>
+                                                <ArrowLeftOutlined />
+                                                &nbsp; Edit Upstream
+                                            </MenuItemContent>
+                                        </Popover>
+                                    </StyledMenuItem>
+                                    <StyledMenuItem
+                                        key="1"
+                                        onClick={() => manageLineage(LineageDirection.Downstream)}
+                                        disabled={isDownstreamDisabled}
+                                    >
+                                        <Popover
+                                            placement="bottom"
+                                            content={getDownstreamDisabledPopoverContent(!!canEditLineage, isDashboard)}
+                                            overlayStyle={!isDownstreamDisabled ? { display: 'none' } : undefined}
+                                        >
+                                            <MenuItemContent>
+                                                <ArrowRightOutlined />
+                                                &nbsp; Edit Downstream
+                                            </MenuItemContent>
+                                        </Popover>
+                                    </StyledMenuItem>
+                                </>
+                            )}
+                        </Menu>
+                    }
+                >
+                    <StyledIcon style={{ fontSize: 'inherit' }} />
+                </Dropdown>
+            </StyledButton>
+            {isModalVisible && (
+                <ManageLineageModal
+                    node={node}
+                    direction={lineageDirection}
+                    closeModal={hideMenu}
+                    refetch={refetch[lineageDirection]}
+                />
+            )}
+        </Wrapper>
+    );
+}
+
+function getDownstreamDisabledPopoverContent(canEditLineage: boolean, isDashboard: boolean) {
+    let text = '';
+    if (!canEditLineage) {
+        text = UNAUTHORIZED_TEXT;
+    } else if (isDashboard) {
+        text = 'Dashboard entities have no downstream lineage';
+    } else {
+        text = DOWNSTREAM_DISABLED_TEXT;
+    }
+    return <PopoverContent>{text}</PopoverContent>;
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/NodeContents.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/NodeContents.tsx
new file mode 100644
index 00000000000000..d735bced034a5f
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/NodeContents.tsx
@@ -0,0 +1,511 @@
+import { LoadingOutlined } from '@ant-design/icons';
+import ContainerPath from '@app/lineageV2/LineageEntityNode/ContainerPath';
+import GhostEntityMenu from '@app/lineageV2/LineageEntityNode/GhostEntityMenu';
+import SchemaFieldNodeContents from '@app/lineageV2/LineageEntityNode/SchemaFieldNodeContents';
+import MatchTextSizeWrapper from '@app/sharedV2/text/MatchTextSizeWrapper';
+import { DeprecationIcon } from '@src/app/entityV2/shared/components/styled/DeprecationIcon';
+import { KeyboardArrowDown, KeyboardArrowUp } from '@mui/icons-material';
+import StructuredPropertyBadge from '@src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge';
+import { Skeleton, Spin } from 'antd';
+import { Tooltip } from '@components';
+import React, { Dispatch, SetStateAction, useCallback } from 'react';
+import { Handle, Position } from 'reactflow';
+import styled from 'styled-components';
+import { EntityType, LineageDirection } from '../../../types.generated';
+import { EventType } from '../../analytics';
+import analytics from '../../analytics/analytics';
+import { ANTD_GRAY, LINEAGE_COLORS, REDESIGN_COLORS } from '../../entityV2/shared/constants';
+import HealthIcon from '../../previewV2/HealthIcon';
+import getTypeIcon from '../../sharedV2/icons/getTypeIcon';
+import OverflowTitle from '../../sharedV2/text/OverflowTitle';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { FetchStatus, getNodeColor, isGhostEntity, LineageEntity, onClickPreventSelect } from '../common';
+import { NUM_COLUMNS_PER_PAGE } from '../constants';
+import { FetchedEntityV2 } from '../types';
+import Columns from './Columns';
+import { ContractLineageButton } from './ContractLineageButton';
+import { ExpandLineageButton } from './ExpandLineageButton';
+import ManageLineageMenu from './ManageLineageMenu';
+import NodeSkeleton from './NodeSkeleton';
+import useAvoidIntersections from './useAvoidIntersections';
+import { DisplayedColumns, LINEAGE_NODE_HEIGHT, LINEAGE_NODE_WIDTH } from './useDisplayedColumns';
+
+const NodeWrapper = styled.div<{
+    selected: boolean;
+    dragging: boolean;
+    expandHeight?: number;
+    color: string;
+    $transitionDuration: number;
+    isGhost: boolean;
+    isSearchedEntity: boolean;
+}>`
+    align-items: center;
+    background-color: white;
+    border: 1px solid
+        ${({ color, selected, isGhost }) => {
+            if (selected) return color;
+            if (isGhost) return `${LINEAGE_COLORS.NODE_BORDER}50`;
+            return LINEAGE_COLORS.NODE_BORDER;
+        }};
+    box-shadow: ${({ isSearchedEntity }) =>
+        isSearchedEntity ? `0 0 4px 4px ${REDESIGN_COLORS.TITLE_PURPLE}95` : 'none'};
+    outline: ${({ color, selected }) => (selected ? `1px solid ${color}` : 'none')};
+    border-left: none;
+    border-radius: 6px;
+    display: flex;
+    flex-direction: column;
+    max-height: ${({ expandHeight }) => expandHeight}px;
+    overflow-y: hidden;
+    transition: max-height ${({ $transitionDuration }) => $transitionDuration}ms ease-in-out;
+    width: ${LINEAGE_NODE_WIDTH}px;
+    cursor: ${({ isGhost, dragging }) => {
+        if (isGhost) return 'not-allowed';
+        if (dragging) return 'grabbing';
+        return 'pointer';
+    }};
+`;
+
+const CARD_HEIGHT = LINEAGE_NODE_HEIGHT - 2; // Inside border
+
+// Maintains height of node as CardWrapper has position: absolute
+// Also allows the expand lineage buttons to not be children of CardWrapper
+const FakeCard = styled.div`
+    min-height: ${CARD_HEIGHT}px;
+    max-height: ${CARD_HEIGHT}px;
+    width: 100%;
+`;
+
+const CardWrapper = styled.div<{ isGhost: boolean }>`
+    align-items: center;
+    display: flex;
+    flex-direction: row;
+    height: ${CARD_HEIGHT}px;
+    position: absolute;
+    padding: 8px 11px;
+    width: 100%;
+    ${({ isGhost }) => isGhost && 'opacity: 0.5;'}
+`;
+
+const EntityTypeShadow = styled.div<{ color: string; isGhost: boolean }>`
+    background: ${({ color }) => color};
+    opacity: ${({ isGhost }) => (isGhost ? 0.5 : 1)};
+    border-radius: 6px;
+    position: absolute;
+
+    height: 100%;
+    width: 22px;
+
+    left: -3px;
+    top: 0;
+    z-index: -1;
+`;
+
+export const LoadingWrapper = styled.div`
+    color: ${LINEAGE_COLORS.PURPLE_3};
+    font-size: 32px;
+    line-height: 0;
+    pointer-events: none;
+    position: absolute;
+    top: 10px;
+    transform: translateY(-50%);
+`;
+
+const CustomHandle = styled(Handle)<{ position: Position }>`
+    background: initial;
+    border: initial;
+    top: 50%;
+    ${({ position }) => (position === Position.Left ? 'left: -3px;' : 'right: 0;')}
+`;
+
+const IconsWrapper = styled.div`
+    align-items: center;
+    color: ${ANTD_GRAY[10]};
+    display: flex;
+    flex-direction: column;
+    font-size: 24px;
+    gap: 4px;
+`;
+
+const PlatformIcon = styled.img`
+    height: 1em;
+    width: 1em;
+`;
+
+const PlatformIconWithSibling = styled.img`
+    height: 0.9em;
+    width: 0.9em;
+    //clip-path: polygon(0 0, 100% 0, 100% 0%, 0% 100%, 0 100%);
+
+    margin-bottom: 0.8em;
+`;
+
+const SiblingPlatformIcon = styled.img`
+    height: 0.9em;
+    width: 0.9em;
+    //clip-path: polygon(100% 0, 100% 0, 100% 100%, 0 100%, 0 100%);
+
+    position: absolute;
+    top: 1.1em;
+`;
+
+const HorizontalDivider = styled.hr<{ margin: number }>`
+    border: 0.5px solid;
+    margin: ${({ margin }) => margin}px 0;
+    opacity: 0.1;
+    width: 100%;
+`;
+
+const VerticalDivider = styled.hr<{ margin: number }>`
+    align-self: stretch;
+    height: auto;
+    margin: 0 ${({ margin }) => margin}px;
+    border: 0.5px solid;
+    opacity: 0.1;
+    vertical-align: text-top;
+`;
+
+const MainTextWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+    justify-content: center;
+    gap: 4px;
+    height: 100%;
+    min-width: 0;
+`;
+
+// Expands to fit vertical space
+const TitleWrapper = styled.div`
+    overflow: hidden;
+    flex: 1 0 fit-content;
+    min-height: 12px;
+`;
+
+// Positions and aligns title text with health icon
+// Can't be combined with TitleWrapper, or else centered health icon will not align with text when wrapper expands
+const TitleLine = styled.span`
+    font-size: 14px;
+    font-weight: 600;
+
+    display: flex;
+    align-items: center;
+    height: min-content;
+    gap: 4px;
+`;
+
+const ExpandColumnsWrapper = styled(MatchTextSizeWrapper)`
+    align-items: center;
+    border: 0.5px solid ${LINEAGE_COLORS.BLUE_1}50;
+    border-radius: 10px;
+    color: ${LINEAGE_COLORS.BLUE_1};
+    display: flex;
+    justify-content: center;
+    width: 100%;
+
+    flex: 1 1 16px;
+    min-height: 12px;
+    max-height: 16px;
+
+    :hover {
+        background-color: ${LINEAGE_COLORS.BLUE_1}20;
+        cursor: pointer;
+    }
+`;
+
+const SkeletonImage = styled(Skeleton.Avatar)`
+    line-height: 0;
+`;
+
+const PropertyBadgeWrapper = styled.div`
+    position: absolute;
+    right: 12px;
+    top: -16px;
+`;
+
+interface Props {
+    urn: string;
+    type: EntityType;
+    selected: boolean;
+    dragging: boolean;
+    isSearchedEntity: boolean;
+    entity?: FetchedEntityV2;
+    transitionDuration: number;
+    rootUrn: string;
+    searchQuery: string;
+    setHoveredNode: (urn: string | null) => void;
+    showColumns: boolean;
+    setShowColumns: Dispatch<SetStateAction<boolean>>;
+    onlyWithLineage: boolean;
+    setOnlyWithLineage: Dispatch<SetStateAction<boolean>>;
+    filterText: string;
+    setFilterText: Dispatch<SetStateAction<string>>;
+    pageIndex: number;
+    setPageIndex: Dispatch<SetStateAction<number>>;
+    refetch: Record<LineageDirection, () => void>;
+    ignoreSchemaFieldStatus: boolean;
+}
+
+const MemoizedNodeContents = React.memo(NodeContents);
+export default MemoizedNodeContents;
+
+function NodeContents(props: Props & LineageEntity & DisplayedColumns) {
+    const {
+        urn,
+        type,
+        selected,
+        dragging,
+        isSearchedEntity,
+        entity,
+        fetchStatus,
+        isExpanded,
+        transitionDuration,
+        rootUrn,
+        searchQuery,
+        setHoveredNode,
+        showColumns,
+        setShowColumns,
+        onlyWithLineage,
+        setOnlyWithLineage,
+        filterText,
+        setFilterText,
+        pageIndex,
+        setPageIndex,
+        paginatedColumns,
+        extraHighlightedColumns,
+        numColumnsTotal,
+        numFilteredColumns,
+        numColumnsWithLineage,
+        refetch,
+        ignoreSchemaFieldStatus,
+    } = props;
+
+    const entityRegistry = useEntityRegistry();
+
+    const isGhost = isGhostEntity(entity, ignoreSchemaFieldStatus);
+
+    const numDisplayedColumns = extraHighlightedColumns.length + (showColumns ? paginatedColumns.length : 0);
+    const expandHeight =
+        LINEAGE_NODE_HEIGHT +
+        (numDisplayedColumns || onlyWithLineage ? 17 : 0) + // Expansion base
+        (showColumns && numColumnsTotal ? 30 : 0) + // Search bar
+        20.5 * numDisplayedColumns + // Columns
+        (showColumns && paginatedColumns.length && extraHighlightedColumns.length ? 9 : 0) + // Column divider
+        (showColumns && numFilteredColumns > NUM_COLUMNS_PER_PAGE ? 38 : 0); // Pagination
+
+    useAvoidIntersections(urn, expandHeight);
+
+    const platformName = entityRegistry.getDisplayName(EntityType.DataPlatform, entity?.platform);
+    const [nodeColor] = getNodeColor(type);
+    const highlightColor = isSearchedEntity ? REDESIGN_COLORS.YELLOW_500 : REDESIGN_COLORS.YELLOW_200;
+    const hasUpstreamChildren = !!entity?.numUpstreamChildren;
+    const hasDownstreamChildren = !!entity?.numDownstreamChildren;
+    const isExpandedDownstream = isExpanded[LineageDirection.Downstream];
+    const isExpandedUpstream = isExpanded[LineageDirection.Upstream];
+    const isDownstreamHidden =
+        fetchStatus[LineageDirection.Downstream] === FetchStatus.COMPLETE && !isExpandedDownstream;
+    const isUpstreamHidden = fetchStatus[LineageDirection.Upstream] === FetchStatus.COMPLETE && !isExpandedUpstream;
+
+    const showHideColumns = useCallback(
+        (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
+            onClickPreventSelect(e);
+            analytics.event({
+                type: EventType.ShowHideLineageColumnsEvent,
+                action: showColumns ? 'hide' : 'show',
+                entityUrn: urn,
+                entityType: type,
+                entityPlatformUrn: entity?.platform?.urn,
+            });
+            setShowColumns((prevShowColumns) => !prevShowColumns);
+        },
+        [showColumns, setShowColumns, urn, type, entity?.platform?.urn],
+    );
+
+    // TODO: Refactor into separate node, that doesn't have columns, with shared code?
+    if (type === EntityType.SchemaField) {
+        return (
+            <SchemaFieldNodeContents
+                urn={urn}
+                type={type}
+                rootUrn={rootUrn}
+                selected={selected}
+                dragging={dragging}
+                isGhost={isGhost}
+                isSearchedEntity={isSearchedEntity}
+                hasUpstreamChildren={hasUpstreamChildren}
+                hasDownstreamChildren={hasDownstreamChildren}
+                isExpanded={isExpanded}
+                fetchStatus={fetchStatus}
+                entity={entity}
+                platformName={platformName}
+                platformIcon={entity?.icon}
+                searchQuery={searchQuery}
+                setHoveredNode={setHoveredNode}
+                ignoreSchemaFieldStatus={ignoreSchemaFieldStatus}
+            />
+        );
+    }
+
+    const contents = (
+        <NodeWrapper
+            selected={selected}
+            dragging={dragging}
+            expandHeight={expandHeight}
+            color={nodeColor}
+            $transitionDuration={transitionDuration}
+            data-testid={`lineage-node-${urn}`}
+            isGhost={isGhost}
+            isSearchedEntity={isSearchedEntity}
+        >
+            <EntityTypeShadow color={nodeColor} isGhost={isGhost} />
+            <FakeCard />
+            <FakeCard style={{ position: 'absolute' }}>
+                {hasUpstreamChildren &&
+                    ([FetchStatus.UNFETCHED, FetchStatus.LOADING].includes(fetchStatus[LineageDirection.Upstream]) ||
+                        isUpstreamHidden) && (
+                        <ExpandLineageButton
+                            urn={urn}
+                            type={type}
+                            direction={LineageDirection.Upstream}
+                            display={
+                                fetchStatus[LineageDirection.Upstream] === FetchStatus.UNFETCHED || !isExpandedUpstream
+                            }
+                            fetchStatus={fetchStatus}
+                            ignoreSchemaFieldStatus={ignoreSchemaFieldStatus}
+                        />
+                    )}
+                {hasDownstreamChildren &&
+                    ([FetchStatus.UNFETCHED, FetchStatus.LOADING].includes(fetchStatus[LineageDirection.Downstream]) ||
+                        isDownstreamHidden) && (
+                        <ExpandLineageButton
+                            urn={urn}
+                            type={type}
+                            direction={LineageDirection.Downstream}
+                            display={
+                                fetchStatus[LineageDirection.Downstream] === FetchStatus.UNFETCHED ||
+                                !isExpandedDownstream
+                            }
+                            fetchStatus={fetchStatus}
+                            ignoreSchemaFieldStatus={ignoreSchemaFieldStatus}
+                        />
+                    )}
+                {fetchStatus[LineageDirection.Upstream] === FetchStatus.COMPLETE &&
+                    isExpandedUpstream &&
+                    hasUpstreamChildren && <ContractLineageButton urn={urn} direction={LineageDirection.Upstream} />}
+                {fetchStatus[LineageDirection.Downstream] === FetchStatus.COMPLETE &&
+                    isExpandedDownstream &&
+                    hasDownstreamChildren && (
+                        <ContractLineageButton urn={urn} direction={LineageDirection.Downstream} />
+                    )}
+                {fetchStatus[LineageDirection.Upstream] === FetchStatus.LOADING && (
+                    <LoadingWrapper className="nodrag" style={{ left: -30 }}>
+                        <Spin delay={urn === rootUrn ? undefined : 500} indicator={<LoadingOutlined />} />
+                    </LoadingWrapper>
+                )}
+                {fetchStatus[LineageDirection.Downstream] === FetchStatus.LOADING && (
+                    <LoadingWrapper className="nodrag" style={{ right: -30 }}>
+                        <Spin delay={urn === rootUrn ? undefined : 500} indicator={<LoadingOutlined />} />
+                    </LoadingWrapper>
+                )}
+            </FakeCard>
+            <CardWrapper
+                isGhost={isGhost}
+                onMouseEnter={() => setHoveredNode(urn)}
+                onMouseLeave={() => setHoveredNode(null)}
+            >
+                <CustomHandle type="target" position={Position.Left} isConnectable={false} />
+                <CustomHandle type="source" position={Position.Right} isConnectable={false} />
+                <IconsWrapper>
+                    {entity?.icon && entity.lineageSiblingIcon && (
+                        <>
+                            <PlatformIconWithSibling src={entity.lineageSiblingIcon} />
+                            <SiblingPlatformIcon src={entity.icon} />
+                        </>
+                    )}
+                    {entity?.icon && !entity.lineageSiblingIcon && (
+                        <PlatformIcon src={entity.icon} alt={platformName || 'platform'} title={platformName} />
+                    )}
+                    {!entity && <SkeletonImage size="small" shape="square" style={{ borderRadius: '20%' }} />}
+                    {entity ? (
+                        getTypeIcon(entityRegistry, entity.type, entity.subtype, true)
+                    ) : (
+                        <SkeletonImage size="small" shape="square" style={{ borderRadius: '20%' }} />
+                    )}
+                </IconsWrapper>
+                <VerticalDivider margin={8} />
+                {entity && (
+                    <MainTextWrapper>
+                        <ContainerPath parents={entity?.containers} />
+                        <TitleWrapper>
+                            <TitleLine>
+                                <OverflowTitle
+                                    title={entity?.name}
+                                    highlightText={searchQuery}
+                                    highlightColor={highlightColor}
+                                />
+                                {entity?.deprecation?.deprecated && (
+                                    <DeprecationIcon
+                                        urn={urn}
+                                        deprecation={entity?.deprecation}
+                                        showText={false}
+                                        showUndeprecate={false}
+                                    />
+                                )}
+                                {entity?.health && (
+                                    <HealthIcon
+                                        urn={urn}
+                                        health={entity.health}
+                                        baseUrl={entityRegistry.getEntityUrl(type, urn)}
+                                    />
+                                )}
+                            </TitleLine>
+                        </TitleWrapper>
+                        {!!numColumnsTotal && !isGhost && (
+                            <ExpandColumnsWrapper onClick={showHideColumns} defaultHeight={10}>
+                                {numColumnsTotal} columns
+                                {showColumns && <KeyboardArrowUp fontSize="inherit" style={{ marginLeft: 3 }} />}
+                                {!showColumns && <KeyboardArrowDown fontSize="inherit" style={{ marginLeft: 3 }} />}
+                            </ExpandColumnsWrapper>
+                        )}
+                        {isGhost ? <GhostEntityMenu urn={urn} /> : <ManageLineageMenu node={props} refetch={refetch} />}
+                        {entity && (
+                            <PropertyBadgeWrapper>
+                                <StructuredPropertyBadge structuredProperties={entity.structuredProperties} />
+                            </PropertyBadgeWrapper>
+                        )}
+                    </MainTextWrapper>
+                )}
+                {!entity && <NodeSkeleton />}
+            </CardWrapper>
+            {!!entity && !!numColumnsTotal && (
+                <>
+                    <HorizontalDivider margin={0} />
+                    <Columns
+                        entity={entity}
+                        isGhost={isGhost}
+                        showAllColumns={showColumns}
+                        paginatedColumns={paginatedColumns}
+                        highlightedColumns={extraHighlightedColumns}
+                        numFiltered={numFilteredColumns}
+                        pageIndex={pageIndex}
+                        setPageIndex={setPageIndex}
+                        filterText={filterText}
+                        setFilterText={setFilterText}
+                        numColumnsWithLineage={numColumnsWithLineage}
+                        onlyWithLineage={onlyWithLineage}
+                        setOnlyWithLineage={setOnlyWithLineage}
+                    />
+                </>
+            )}
+        </NodeWrapper>
+    );
+
+    if (isGhost) {
+        const message = entity?.status?.removed ? 'has been deleted' : 'does not exist in DataHub';
+        return (
+            <Tooltip title={`This entity ${message}`} mouseEnterDelay={0.3}>
+                {contents}
+            </Tooltip>
+        );
+    }
+    return contents;
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/NodeSkeleton.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/NodeSkeleton.tsx
new file mode 100644
index 00000000000000..1846e1929a9a9e
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/NodeSkeleton.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import { Skeleton } from 'antd';
+import styled from 'styled-components';
+
+const Wrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    height: 100%;
+    width: 100%;
+
+    &&& {
+        ul {
+            margin: 0;
+        }
+
+        li {
+            height: 1em;
+            :not(:first-child) {
+                margin-top: 4px;
+            }
+        }
+    }
+`;
+
+interface Props {
+    numRows?: number;
+    className?: string;
+}
+
+export default function NodeSkeleton({ numRows = 3, className }: Props) {
+    return (
+        <Wrapper className={className}>
+            <Skeleton active title={false} paragraph={{ rows: numRows }} />
+        </Wrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/SchemaFieldNodeContents.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/SchemaFieldNodeContents.tsx
new file mode 100644
index 00000000000000..f0b7339882877f
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/SchemaFieldNodeContents.tsx
@@ -0,0 +1,394 @@
+import { LoadingOutlined } from '@ant-design/icons';
+import { ANTD_GRAY, LINEAGE_COLORS, REDESIGN_COLORS } from '@app/entityV2/shared/constants';
+import { FetchStatus } from '@app/lineageV2/common';
+import ContainerPath from '@app/lineageV2/LineageEntityNode/ContainerPath';
+import { ContractLineageButton } from '@app/lineageV2/LineageEntityNode/ContractLineageButton';
+import { ExpandLineageButton } from '@app/lineageV2/LineageEntityNode/ExpandLineageButton';
+import { LoadingWrapper } from '@app/lineageV2/LineageEntityNode/NodeContents';
+import NodeSkeleton from '@app/lineageV2/LineageEntityNode/NodeSkeleton';
+import { FetchedEntityV2 } from '@app/lineageV2/types';
+import { COLORS } from '@app/sharedV2/colors';
+import getTypeIcon from '@app/sharedV2/icons/getTypeIcon';
+import OverflowTitle from '@app/sharedV2/text/OverflowTitle';
+import { useEntityRegistryV2 } from '@app/useEntityRegistry';
+import { EntityType, LineageDirection } from '@types';
+import { Skeleton, Spin } from 'antd';
+import { Tooltip } from '@components';
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { Handle, Position } from 'reactflow';
+import styled from 'styled-components';
+import LinkOut from '@images/link-out.svg?react';
+import { downgradeV2FieldPath, useGetLineageUrl } from '../lineageUtils';
+
+export const SCHEMA_FIELD_NODE_HEIGHT = 80;
+export const SCHEMA_FIELD_NODE_WIDTH = 240;
+const NODE_COLOR = COLORS.blue_7;
+
+const NodeWrapper = styled.div<{
+    selected: boolean;
+    dragging: boolean;
+    color: string;
+    isGhost: boolean;
+    isSearchedEntity: boolean;
+}>`
+    align-items: center;
+    background-color: white;
+    border: 1px solid
+        ${({ color, selected, isGhost }) => {
+            if (selected) return color;
+            if (isGhost) return `${LINEAGE_COLORS.NODE_BORDER}50`;
+            return LINEAGE_COLORS.NODE_BORDER;
+        }};
+    box-shadow: ${({ isSearchedEntity }) =>
+        isSearchedEntity ? `0 0 4px 4px ${REDESIGN_COLORS.TITLE_PURPLE}95` : 'none'};
+    outline: ${({ color, selected }) => (selected ? `1px solid ${color}` : 'none')};
+    border-left: none;
+    border-radius: 6px;
+    display: flex;
+    flex-direction: column;
+    overflow-y: hidden;
+    width: ${SCHEMA_FIELD_NODE_WIDTH}px;
+    cursor: ${({ isGhost, dragging }) => {
+        if (isGhost) return 'not-allowed';
+        if (dragging) return 'grabbing';
+        return 'grab';
+    }};
+`;
+
+const CARD_HEIGHT = SCHEMA_FIELD_NODE_HEIGHT - 2; // Inside border
+
+// Maintains height of node as CardWrapper has position: absolute
+// Also allows the expand lineage buttons to not be children of CardWrapper
+const FakeCard = styled.div`
+    min-height: ${CARD_HEIGHT}px;
+    max-height: ${CARD_HEIGHT}px;
+    width: 100%;
+`;
+
+const CardWrapper = styled.div<{ isGhost: boolean }>`
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    height: ${CARD_HEIGHT}px;
+    position: absolute;
+    padding: 8px 11px;
+    width: 100%;
+    ${({ isGhost }) => isGhost && 'opacity: 0.5;'}
+`;
+
+const EntityTypeShadow = styled.div<{ color: string }>`
+    background: ${({ color }) => color};
+    border-radius: 6px;
+    position: absolute;
+
+    height: 100%;
+    width: 22px;
+
+    left: -3px;
+    top: 0;
+    z-index: -1;
+`;
+
+const CustomHandle = styled(Handle)<{ position: Position }>`
+    background: initial;
+    border: initial;
+    top: 50%;
+    ${({ position }) => (position === Position.Left ? 'left: -3px;' : 'right: 0;')}
+`;
+
+const IconsWrapper = styled.div`
+    align-items: center;
+    color: ${ANTD_GRAY[10]};
+    display: flex;
+    flex-direction: column;
+    font-size: 24px;
+    gap: 4px;
+`;
+
+const PlatformIcon = styled.img`
+    height: 1em;
+    width: 1em;
+`;
+
+const VerticalDivider = styled.hr<{ margin: number }>`
+    align-self: stretch;
+    height: auto;
+    margin: 0 ${({ margin }) => margin}px;
+    border: 0.5px solid;
+    opacity: 0.1;
+    vertical-align: text-top;
+`;
+
+const MainTextWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    flex-grow: 1;
+    height: 100%;
+    min-width: 0;
+`;
+
+const TitleWrapper = styled.div`
+    overflow: hidden;
+    flex: 1 0 fit-content;
+    min-height: 12px;
+`;
+
+const ParentLine = styled.span`
+    display: flex;
+    align-items: center;
+    height: min-content;
+    gap: 4px;
+
+    color: ${REDESIGN_COLORS.SUBTITLE};
+    font-weight: 600;
+`;
+
+const InvalidSchemaFieldLine = styled.span`
+    display: flex;
+    align-items: center;
+    height: min-content;
+    gap: 4px;
+
+    font-size: 1.1em;
+    font-weight: 700;
+    color: inherit;
+`;
+
+const SchemaFieldLine = styled(Link)`
+    display: flex;
+    align-items: center;
+    height: min-content;
+    width: max-content;
+    gap: 4px;
+
+    font-size: 1.1em;
+    font-weight: 700;
+    color: inherit;
+
+    :hover {
+        color: inherit;
+        text-decoration: underline;
+    }
+`;
+
+const SkeletonImage = styled(Skeleton.Avatar)`
+    line-height: 0;
+`;
+
+const StyledNodeSkeleton = styled(NodeSkeleton)`
+    font-size: 10px;
+`;
+
+const ParentContainerPath = styled(ContainerPath)`
+    font-size: 10px;
+`;
+
+const ColumnLinkWrapper = styled(Link)`
+    display: flex;
+    color: inherit;
+
+    :hover {
+        color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    }
+`;
+
+interface Props {
+    urn: string;
+    type: EntityType;
+    rootUrn: string;
+    selected: boolean;
+    dragging: boolean;
+    isSearchedEntity: boolean;
+    isGhost: boolean;
+    hasUpstreamChildren: boolean;
+    hasDownstreamChildren: boolean;
+    isExpanded?: Record<LineageDirection, boolean>;
+    fetchStatus: Record<LineageDirection, FetchStatus>;
+    entity?: FetchedEntityV2;
+    platformName?: string;
+    platformIcon?: string;
+    searchQuery: string;
+    setHoveredNode: (urn: string | null) => void;
+    ignoreSchemaFieldStatus: boolean;
+}
+
+export default function SchemaFieldNodeContents({
+    urn,
+    type,
+    rootUrn,
+    selected,
+    dragging,
+    isSearchedEntity,
+    isGhost,
+    hasUpstreamChildren,
+    hasDownstreamChildren,
+    isExpanded,
+    fetchStatus,
+    entity,
+    platformName,
+    platformIcon,
+    searchQuery,
+    setHoveredNode,
+    ignoreSchemaFieldStatus,
+}: Props) {
+    const entityRegistry = useEntityRegistryV2();
+
+    const isExpandedDownstream = isExpanded?.[LineageDirection.Downstream];
+    const isExpandedUpstream = isExpanded?.[LineageDirection.Upstream];
+    const isDownstreamHidden =
+        fetchStatus[LineageDirection.Downstream] === FetchStatus.COMPLETE && !isExpandedDownstream;
+    const isUpstreamHidden = fetchStatus[LineageDirection.Upstream] === FetchStatus.COMPLETE && !isExpandedUpstream;
+
+    const parent = entity?.parent;
+    const parentLineageUrl = useGetLineageUrl(parent?.urn, parent?.type);
+    const lineageUrl = useGetLineageUrl(urn, EntityType.SchemaField);
+
+    const highlightColor = isSearchedEntity ? REDESIGN_COLORS.YELLOW_500 : REDESIGN_COLORS.YELLOW_200;
+    const contents = (
+        <NodeWrapper
+            selected={selected}
+            dragging={dragging}
+            isGhost={isGhost}
+            isSearchedEntity={isSearchedEntity}
+            color={NODE_COLOR}
+        >
+            <EntityTypeShadow color={NODE_COLOR} />
+            <FakeCard />
+            <FakeCard style={{ position: 'absolute' }}>
+                {hasUpstreamChildren &&
+                    ([FetchStatus.UNFETCHED, FetchStatus.LOADING].includes(fetchStatus[LineageDirection.Upstream]) ||
+                        isUpstreamHidden) && (
+                        <ExpandLineageButton
+                            urn={urn}
+                            type={type}
+                            direction={LineageDirection.Upstream}
+                            display={
+                                fetchStatus[LineageDirection.Upstream] === FetchStatus.UNFETCHED || !isExpandedUpstream
+                            }
+                            fetchStatus={fetchStatus}
+                            ignoreSchemaFieldStatus={ignoreSchemaFieldStatus}
+                        />
+                    )}
+                {hasDownstreamChildren &&
+                    ([FetchStatus.UNFETCHED, FetchStatus.LOADING].includes(fetchStatus[LineageDirection.Downstream]) ||
+                        isDownstreamHidden) && (
+                        <ExpandLineageButton
+                            urn={urn}
+                            type={type}
+                            direction={LineageDirection.Downstream}
+                            display={
+                                fetchStatus[LineageDirection.Downstream] === FetchStatus.UNFETCHED ||
+                                !isExpandedDownstream
+                            }
+                            fetchStatus={fetchStatus}
+                            ignoreSchemaFieldStatus={ignoreSchemaFieldStatus}
+                        />
+                    )}
+                {fetchStatus[LineageDirection.Upstream] === FetchStatus.COMPLETE &&
+                    isExpandedUpstream &&
+                    hasUpstreamChildren && <ContractLineageButton urn={urn} direction={LineageDirection.Upstream} />}
+                {fetchStatus[LineageDirection.Downstream] === FetchStatus.COMPLETE &&
+                    isExpandedDownstream &&
+                    hasDownstreamChildren && (
+                        <ContractLineageButton urn={urn} direction={LineageDirection.Downstream} />
+                    )}
+                {fetchStatus[LineageDirection.Upstream] === FetchStatus.LOADING && (
+                    <LoadingWrapper className="nodrag" style={{ left: -30 }}>
+                        <Spin delay={urn === rootUrn ? undefined : 500} indicator={<LoadingOutlined />} />
+                    </LoadingWrapper>
+                )}
+                {fetchStatus[LineageDirection.Downstream] === FetchStatus.LOADING && (
+                    <LoadingWrapper className="nodrag" style={{ right: -30 }}>
+                        <Spin delay={urn === rootUrn ? undefined : 500} indicator={<LoadingOutlined />} />
+                    </LoadingWrapper>
+                )}
+            </FakeCard>
+            <CardWrapper
+                isGhost={isGhost}
+                onMouseEnter={() => setHoveredNode(urn)}
+                onMouseLeave={() => setHoveredNode(null)}
+            >
+                <CustomHandle type="target" position={Position.Left} isConnectable={false} />
+                <CustomHandle type="source" position={Position.Right} isConnectable={false} />
+                <IconsWrapper>
+                    {platformIcon ? (
+                        <PlatformIcon src={platformIcon} alt={platformName || 'platform'} title={platformName} />
+                    ) : (
+                        <SkeletonImage size="small" shape="square" style={{ borderRadius: '20%' }} />
+                    )}
+                    {parent?.type ? (
+                        getTypeIcon(entityRegistry, parent.type, parent.subTypes?.[0], true)
+                    ) : (
+                        <SkeletonImage size="small" shape="square" style={{ borderRadius: '20%' }} />
+                    )}
+                </IconsWrapper>
+                <VerticalDivider margin={8} />
+                <MainTextWrapper>
+                    <ParentContainerPath parents={parent?.parentContainers?.containers} />
+                    {!!parent && (
+                        <TitleWrapper>
+                            <ParentLine>
+                                <OverflowTitle
+                                    title={parent?.name ?? undefined}
+                                    highlightText={searchQuery}
+                                    highlightColor={highlightColor}
+                                />
+                                {!!parent.urn && !!parent.type && (
+                                    <ColumnLinkWrapper
+                                        to={parentLineageUrl}
+                                        onClick={(e) => e.stopPropagation()}
+                                        target="_blank"
+                                        rel="noopener noreferrer"
+                                    >
+                                        <Tooltip title="Explore parent lineage" mouseEnterDelay={0.5}>
+                                            <LinkOut />
+                                        </Tooltip>
+                                    </ColumnLinkWrapper>
+                                )}
+                            </ParentLine>
+                        </TitleWrapper>
+                    )}
+                    {!!entity && (
+                        <TitleWrapper>
+                            {isGhost || urn === rootUrn ? (
+                                <InvalidSchemaFieldLine>
+                                    <OverflowTitle
+                                        title={downgradeV2FieldPath(entity.name)}
+                                        highlightText={searchQuery}
+                                        highlightColor={highlightColor}
+                                    />
+                                </InvalidSchemaFieldLine>
+                            ) : (
+                                <Tooltip title="Change home node" mouseEnterDelay={0.3}>
+                                    <SchemaFieldLine to={lineageUrl}>
+                                        <OverflowTitle
+                                            title={downgradeV2FieldPath(entity.name)}
+                                            highlightText={searchQuery}
+                                            highlightColor={highlightColor}
+                                        />
+                                    </SchemaFieldLine>
+                                </Tooltip>
+                            )}
+                        </TitleWrapper>
+                    )}
+                </MainTextWrapper>
+                {!entity && <StyledNodeSkeleton numRows={2} />}
+            </CardWrapper>
+        </NodeWrapper>
+    );
+
+    if (isGhost) {
+        const message =
+            entity?.status?.removed || entity?.parent?.status?.removed
+                ? 'has been deleted'
+                : 'does not exist in DataHub';
+        return (
+            <Tooltip title={`This entity ${message}`} mouseEnterDelay={0.3}>
+                {contents}
+            </Tooltip>
+        );
+    }
+    return contents;
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/components.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/components.tsx
new file mode 100644
index 00000000000000..6216520b99850b
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/components.tsx
@@ -0,0 +1,42 @@
+import styled from 'styled-components';
+import { ANTD_GRAY, LINEAGE_COLORS } from '../../entityV2/shared/constants';
+
+export const ExpandContractButton = styled.div<{ expandOnHover?: boolean }>`
+    background-color: white;
+    border: 1px solid ${ANTD_GRAY[5]};
+    border-radius: 10px;
+    color: ${LINEAGE_COLORS.BLUE_1};
+    cursor: pointer;
+    display: flex;
+    font-size: 18px;
+    padding: 3px;
+    position: absolute;
+    top: 50%;
+
+    max-width: 25px;
+    overflow: hidden;
+    transition: max-width 0.3s ease-in-out;
+
+    :hover {
+        ${(props) => props.expandOnHover && `max-width: 50px;`}
+    }
+`;
+
+export const UpstreamWrapper = styled(ExpandContractButton)`
+    right: calc(100% - 5px);
+    transform: translateY(-50%) rotate(180deg);
+`;
+
+export const DownstreamWrapper = styled(ExpandContractButton)`
+    left: calc(100% - 5px);
+    transform: translateY(-50%);
+`;
+
+export const Button = styled.span`
+    border-radius: 20%;
+    line-height: 0;
+
+    :hover {
+        background-color: ${LINEAGE_COLORS.BLUE_1}30;
+    }
+`;
diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/useAvoidIntersections.ts b/datahub-web-react/src/app/lineageV2/LineageEntityNode/useAvoidIntersections.ts
new file mode 100644
index 00000000000000..91c06e511962a0
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/useAvoidIntersections.ts
@@ -0,0 +1,96 @@
+import { ReactFlowInstance } from '@reactflow/core/dist/esm/types';
+import { useContext, useEffect } from 'react';
+import { Node, useReactFlow } from 'reactflow';
+import { isTransformational, LineageNode, LineageNodesContext } from '../common';
+import { LINEAGE_NODE_HEIGHT, LINEAGE_NODE_WIDTH } from './useDisplayedColumns';
+
+export default function useAvoidIntersections(id: string, expandHeight: number) {
+    const { getNode, getNodes, setNodes } = useReactFlow();
+
+    useEffect(() => {
+        return avoidIntersections({ id, expandHeight, getNode, getNodes, setNodes });
+    }, [id, expandHeight, getNode, getNodes, setNodes]);
+}
+
+// Required because NodeBuilder cannot properly place Lineage Filter nodes
+// TODO: Find a cleaner way to do this
+export function useAvoidIntersectionsOften(id: string, expandHeight: number) {
+    const { getNode, getNodes, setNodes } = useReactFlow();
+    const { nodeVersion, displayVersion } = useContext(LineageNodesContext);
+
+    const displayVersionNumber = displayVersion[0];
+    useEffect(() => {
+        const timeout = setTimeout(() => avoidIntersections({ id, expandHeight, getNode, getNodes, setNodes }), 0);
+        return () => clearTimeout(timeout);
+    }, [id, expandHeight, getNode, getNodes, setNodes, nodeVersion, displayVersionNumber]);
+}
+
+type Arguments = { id: string; expandHeight: number } & Pick<
+    ReactFlowInstance<LineageNode>,
+    'getNode' | 'getNodes' | 'setNodes'
+>;
+
+function avoidIntersections({ id, expandHeight, getNode, getNodes, setNodes }: Arguments) {
+    const self = getNode(id);
+    if (!self) {
+        return () => {};
+    }
+
+    const nodesToMove: Map<string, number> = new Map();
+    // Iterate nodes top down
+    const nodes = getNodes()
+        .filter((node) => !isTransformational(node.data))
+        .filter((node) => node.id !== self.id && node.position.y >= self.position.y && overlapsX(self, node));
+    nodes.sort((a, b) => a.position.y - b.position.y);
+
+    let newY = self.position.y + expandHeight;
+    // eslint-disable-next-line no-restricted-syntax -- so I can break
+    for (const node of nodes) {
+        const distance = pushDownDistance(newY, node.position.y);
+        if (pushDownDistance(newY, node.position.y)) {
+            nodesToMove.set(node.id, distance);
+            newY = node.position.y + distance + (node.height || LINEAGE_NODE_HEIGHT);
+        } else {
+            break;
+        }
+    }
+    if (nodesToMove.size) {
+        moveNodes(setNodes, nodesToMove, true);
+        return function moveBack() {
+            moveNodes(setNodes, nodesToMove, false);
+        };
+    }
+    return () => {};
+}
+
+function overlapsX(a: Node, b: Node): boolean {
+    return (
+        Math.min(a.position.x + (a.width || LINEAGE_NODE_WIDTH), b.position.x + (b.width || LINEAGE_NODE_WIDTH)) >
+        Math.max(a.position.x, b.position.x)
+    );
+}
+
+const MIN_SEPARATION = 10;
+
+function pushDownDistance(newY: number, nodeY: number): number {
+    return Math.max(0, newY + MIN_SEPARATION - nodeY);
+}
+
+function moveNodes(setNodes: ReactFlowInstance['setNodes'], nodesToMove: Map<string, number>, down: boolean) {
+    setNodes((nodes) =>
+        nodes.map((node) => {
+            const moveAmount = nodesToMove.get(node.id);
+            // TODO: Improve interaction with selected nodes? Lacking transition
+            if (moveAmount) {
+                return {
+                    ...node,
+                    position: {
+                        ...node.position,
+                        y: node.position.y + (down ? moveAmount : -moveAmount),
+                    },
+                };
+            }
+            return node;
+        }),
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/useDisplayedColumns.ts b/datahub-web-react/src/app/lineageV2/LineageEntityNode/useDisplayedColumns.ts
new file mode 100644
index 00000000000000..55487810669a38
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/useDisplayedColumns.ts
@@ -0,0 +1,151 @@
+import { useContext, useMemo, useRef } from 'react';
+import { SchemaFieldDataType } from '@types';
+import { createColumnRef, FineGrainedLineage, LineageDisplayContext } from '../common';
+import { NUM_COLUMNS_PER_PAGE } from '../constants';
+import { ColumnAsset, FetchedEntityV2, LineageAssetType } from '../types';
+
+export const LINEAGE_NODE_WIDTH = 240;
+export const LINEAGE_NODE_HEIGHT = 80;
+
+type FieldPath = string;
+
+export interface LineageDisplayColumn {
+    fieldPath: FieldPath;
+    highlighted: boolean;
+    hasLineage: boolean;
+    connectedToHomeNode: boolean;
+    type?: SchemaFieldDataType;
+    nativeDataType?: string | null;
+    lineageAsset: ColumnAsset;
+}
+
+interface Arguments {
+    urn: string;
+    entity?: FetchedEntityV2;
+    showColumns: boolean;
+    pageIndex: number;
+    filterText: string;
+    onlyWithLineage: boolean;
+}
+
+export interface DisplayedColumns {
+    paginatedColumns: LineageDisplayColumn[];
+    extraHighlightedColumns: LineageDisplayColumn[];
+    numFilteredColumns: number;
+    numColumnsWithLineage: number;
+    numColumnsTotal: number;
+}
+
+interface NormalizedReturn {
+    plainColumns: string[];
+    highlightedColumns: string[];
+    extraHighlightedColumns: string[];
+    numFilteredColumns: number;
+    numColumnsWithLineage: number;
+    numColumnsTotal: number;
+}
+
+export default function useDisplayedColumns(args: Arguments): DisplayedColumns {
+    // Prevent unnecessary NodeContents rerenders
+    const oldVals = useRef<DisplayedColumns>({
+        paginatedColumns: [],
+        extraHighlightedColumns: [],
+        numFilteredColumns: 0,
+        numColumnsWithLineage: 0,
+        numColumnsTotal: 0,
+    });
+    const vals = useComputeValues(args);
+    // TODO: Consider using comparison method instead
+    if (JSON.stringify(normalize(oldVals.current)) !== JSON.stringify(normalize(vals))) {
+        oldVals.current = vals;
+    }
+    return oldVals.current;
+}
+
+function normalize(val: DisplayedColumns): NormalizedReturn {
+    return {
+        plainColumns: val.paginatedColumns.filter((col) => !col.highlighted).map((col) => col.fieldPath),
+        highlightedColumns: val.paginatedColumns.filter((col) => col.highlighted).map((col) => col.fieldPath),
+        extraHighlightedColumns: val.extraHighlightedColumns.map((col) => col.fieldPath),
+        numFilteredColumns: val.numFilteredColumns,
+        numColumnsWithLineage: val.numColumnsWithLineage,
+        numColumnsTotal: val.numColumnsTotal,
+    };
+}
+
+function useComputeValues({
+    urn,
+    entity,
+    showColumns,
+    pageIndex,
+    filterText,
+    onlyWithLineage,
+}: Arguments): DisplayedColumns {
+    const { highlightedColumns, fineGrainedLineage } = useContext(LineageDisplayContext);
+
+    return useMemo(() => {
+        if (!entity) {
+            return {
+                paginatedColumns: [],
+                extraHighlightedColumns: [],
+                numFilteredColumns: 0,
+                numColumnsWithLineage: 0,
+                numColumnsTotal: 0,
+            };
+        }
+
+        const columnHighlights = highlightedColumns.get(urn) || new Set<string>();
+        const columns = getDisplayColumns(urn, entity, columnHighlights, fineGrainedLineage);
+
+        const columnsWithLineage = columns.filter((field) => field.hasLineage);
+        const filteredColumns = filterColumnsByText(onlyWithLineage ? columnsWithLineage : columns, filterText);
+        const paginatedColumns = filteredColumns.slice(
+            pageIndex * NUM_COLUMNS_PER_PAGE,
+            pageIndex * NUM_COLUMNS_PER_PAGE + NUM_COLUMNS_PER_PAGE,
+        );
+        const paginatedFields = new Set(paginatedColumns.map((column) => column.fieldPath));
+        const extraHighlightedColumns = columns.filter(
+            (column) =>
+                columnHighlights.has(column.fieldPath) && (!showColumns || !paginatedFields.has(column.fieldPath)),
+        );
+        return {
+            paginatedColumns,
+            extraHighlightedColumns,
+            numFilteredColumns: filteredColumns.length,
+            numColumnsTotal: columns.length,
+            numColumnsWithLineage: columnsWithLineage.length,
+        };
+    }, [urn, entity, showColumns, pageIndex, filterText, highlightedColumns, onlyWithLineage, fineGrainedLineage]);
+}
+
+function getDisplayColumns(
+    urn: string,
+    entity: FetchedEntityV2,
+    columnHighlights: Set<string>,
+    fineGrainedLineage: FineGrainedLineage,
+): LineageDisplayColumn[] {
+    if (!entity.lineageAssets) return [];
+
+    return Array.from(entity.lineageAssets.values())
+        .filter((asset): asset is ColumnAsset => asset.type === LineageAssetType.Column)
+        .map((columnAsset) => {
+            const columnRef = createColumnRef(urn, columnAsset.name);
+            const connectedToHomeNode =
+                fineGrainedLineage.upstream.has(columnRef) || fineGrainedLineage.downstream.has(columnRef);
+
+            return {
+                fieldPath: columnAsset.name,
+                type: columnAsset.dataType,
+                nativeDataType: columnAsset.nativeDataType,
+                highlighted: columnHighlights.has(columnAsset.name),
+                hasLineage: !!columnAsset.numUpstream || !!columnAsset.numDownstream || connectedToHomeNode,
+                connectedToHomeNode,
+                lineageAsset: columnAsset,
+            };
+        });
+}
+
+function filterColumnsByText(fields: LineageDisplayColumn[], filterText: string): LineageDisplayColumn[] {
+    const formattedFilterText = filterText.toLocaleLowerCase();
+    return fields?.filter((field) => field.fieldPath.toLocaleLowerCase().includes(formattedFilterText));
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/useOnClickExpandLineage.ts b/datahub-web-react/src/app/lineageV2/LineageEntityNode/useOnClickExpandLineage.ts
new file mode 100644
index 00000000000000..3807f5116d693c
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/useOnClickExpandLineage.ts
@@ -0,0 +1,26 @@
+import { useContext } from 'react';
+import { EntityType, LineageDirection } from '../../../types.generated';
+import { FetchStatus, LineageNodesContext } from '../common';
+import useSearchAcrossLineage from '../useSearchAcrossLineage';
+
+export function useOnClickExpandLineage(urn: string, type: EntityType, direction: LineageDirection, maxDepth: boolean) {
+    const context = useContext(LineageNodesContext);
+    const { nodes, adjacencyList, setDataVersion, setDisplayVersion } = context;
+    const { fetchLineage } = useSearchAcrossLineage(urn, type, context, direction, true, maxDepth);
+
+    return function onClick(e?: React.MouseEvent<HTMLDivElement | HTMLSpanElement, MouseEvent>) {
+        e?.stopPropagation();
+        const node = nodes.get(urn);
+        const fetchStatus = node?.fetchStatus?.[direction];
+        if (node && fetchStatus !== FetchStatus.COMPLETE) {
+            node.fetchStatus = { ...node.fetchStatus, [direction]: FetchStatus.LOADING };
+            node.isExpanded = { ...node.isExpanded, [direction]: true };
+            setDataVersion((v) => v + 1);
+            fetchLineage();
+        } else if (node && !node.isExpanded[direction]) {
+            node.isExpanded = { ...node.isExpanded, [direction]: true };
+            setDataVersion((v) => v + 1);
+            setDisplayVersion(([version]) => [version + 1, [urn, ...(adjacencyList[direction].get(urn) || [])]]);
+        }
+    };
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageExplorer.tsx b/datahub-web-react/src/app/lineageV2/LineageExplorer.tsx
new file mode 100644
index 00000000000000..d9f64696625ca6
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageExplorer.tsx
@@ -0,0 +1,137 @@
+import useShouldHideTransformations from '@app/lineageV2/useShouldHideTransformations';
+import React, { useContext, useEffect, useState } from 'react';
+import { ReactFlowProvider } from 'reactflow';
+import { EntityType, LineageDirection } from '../../types.generated';
+import { useGetLineageTimeParams } from '../lineage/utils/useGetLineageTimeParams';
+import TabFullsizedContext from '../shared/TabFullsizedContext';
+import {
+    EdgeId,
+    FetchStatus,
+    LINEAGE_FILTER_PAGINATION,
+    LineageEdge,
+    LineageEntity,
+    LineageNodesContext,
+    NodeContext,
+    useIgnoreSchemaFieldStatus,
+} from './common';
+import LineageDisplay from './LineageDisplay';
+import useSearchAcrossLineage from './useSearchAcrossLineage';
+
+type Props = {
+    urn: string;
+    type: EntityType;
+};
+
+export default function LineageExplorer(props: Props) {
+    const { urn, type } = props;
+
+    const [nodes] = useState(new Map<string, LineageEntity>());
+    const [edges] = useState(new Map<EdgeId, LineageEdge>());
+    const [adjacencyList] = useState({
+        [LineageDirection.Upstream]: new Map(),
+        [LineageDirection.Downstream]: new Map(),
+    });
+    const [nodeVersion, setNodeVersion] = useState(0);
+    const [dataVersion, setDataVersion] = useState(0);
+    const [columnEdgeVersion, setColumnEdgeVersion] = useState(0);
+    const [displayVersion, setDisplayVersion] = useState<[number, string[]]>([0, []]);
+    const [hideTransformations, setHideTransformations] = useShouldHideTransformations();
+
+    const [showGhostEntities, setShowGhostEntities] = useState(false);
+
+    const context = {
+        rootUrn: urn,
+        rootType: type,
+        nodes,
+        edges,
+        adjacencyList,
+        nodeVersion,
+        setNodeVersion,
+        dataVersion,
+        setDataVersion,
+        displayVersion,
+        setDisplayVersion,
+        columnEdgeVersion,
+        setColumnEdgeVersion,
+        hideTransformations,
+        setHideTransformations,
+        showGhostEntities,
+        setShowGhostEntities,
+    };
+
+    const initialized = useInitializeNodes(context, urn, type);
+
+    const { setTabFullsize } = useContext(TabFullsizedContext);
+    useEffect(() => {
+        return () => {
+            setTabFullsize?.(false);
+        };
+    }, [setTabFullsize]);
+
+    return (
+        <LineageNodesContext.Provider value={context}>
+            <ReactFlowProvider>
+                <LineageDisplay {...props} initialized={initialized} />
+            </ReactFlowProvider>
+        </LineageNodesContext.Provider>
+    );
+}
+
+/**
+ * Initialize lineage node context with upstreams and downstreams of the given urn.
+ */
+function useInitializeNodes(context: NodeContext, urn: string, type: EntityType): boolean {
+    const { startTimeMillis, endTimeMillis } = useGetLineageTimeParams();
+    const { nodes, adjacencyList, edges, setNodeVersion, setDisplayVersion, showGhostEntities } = context;
+    const ignoreSchemaFieldStatus = useIgnoreSchemaFieldStatus();
+
+    useEffect(() => {
+        // Reset graph if home node or time range changes
+        nodes.clear();
+        adjacencyList[LineageDirection.Upstream].clear();
+        adjacencyList[LineageDirection.Downstream].clear();
+        edges.clear();
+        nodes.set(urn, makeInitialNode(urn, type));
+        setNodeVersion(0);
+        setDisplayVersion([0, []]);
+    }, [urn, type, startTimeMillis, endTimeMillis, nodes, adjacencyList, edges, setNodeVersion, setDisplayVersion]);
+
+    useEffect(() => {
+        // Reset edges if showGhostEntities changes. Not necessary if on schema field page and ignoring status
+        if (!(type === EntityType.SchemaField && ignoreSchemaFieldStatus)) {
+            adjacencyList[LineageDirection.Upstream].clear();
+            adjacencyList[LineageDirection.Downstream].clear();
+            edges.clear();
+            nodes.forEach((node) => {
+                // eslint-disable-next-line no-param-reassign
+                node.entity = undefined;
+            });
+            setDisplayVersion([0, []]);
+        }
+    }, [showGhostEntities, ignoreSchemaFieldStatus, type, nodes, adjacencyList, edges, setDisplayVersion]);
+
+    const { processed: upstreamProcessed } = useSearchAcrossLineage(urn, type, context, LineageDirection.Upstream);
+    const { processed: downstreamProcessed } = useSearchAcrossLineage(urn, type, context, LineageDirection.Downstream);
+
+    return upstreamProcessed && downstreamProcessed;
+}
+
+function makeInitialNode(urn: string, type: EntityType): LineageEntity {
+    return {
+        id: urn,
+        urn,
+        type,
+        isExpanded: {
+            [LineageDirection.Upstream]: true,
+            [LineageDirection.Downstream]: true,
+        },
+        fetchStatus: {
+            [LineageDirection.Upstream]: FetchStatus.LOADING,
+            [LineageDirection.Downstream]: FetchStatus.LOADING,
+        },
+        filters: {
+            [LineageDirection.Upstream]: { limit: LINEAGE_FILTER_PAGINATION, facetFilters: new Map() },
+            [LineageDirection.Downstream]: { limit: LINEAGE_FILTER_PAGINATION, facetFilters: new Map() },
+        },
+    };
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageFilterNode/LineageFilterNodeBasic.tsx b/datahub-web-react/src/app/lineageV2/LineageFilterNode/LineageFilterNodeBasic.tsx
new file mode 100644
index 00000000000000..b8b72bf577da18
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageFilterNode/LineageFilterNodeBasic.tsx
@@ -0,0 +1,174 @@
+import { EntityType } from '@types';
+import React, { useContext, useState } from 'react';
+import { Handle, NodeProps, Position } from 'reactflow';
+import styled from 'styled-components';
+import { LINEAGE_COLORS } from '../../entityV2/shared/constants';
+import { getFilterIconAndLabel } from '../../searchV2/filters/utils';
+import { ENTITY_SUB_TYPE_FILTER_NAME, PLATFORM_FILTER_NAME } from '../../searchV2/utils/constants';
+import { useEntityRegistryV2 } from '../../useEntityRegistry';
+import { LineageFilter, LineageNodesContext, useIgnoreSchemaFieldStatus } from '../common';
+import { useAvoidIntersectionsOften } from '../LineageEntityNode/useAvoidIntersections';
+import { LINEAGE_NODE_WIDTH } from '../LineageEntityNode/useDisplayedColumns';
+import { ShowMoreButton } from './ShowMoreButton';
+import useFetchFilterNodeContents, { PlatformAggregate, SubtypeAggregate } from './useFetchFilterNodeContents';
+import LineageFilterSearch from './LineageFilterSearch';
+
+export const LINEAGE_FILTER_NODE_NAME = 'lineage-filter';
+
+const NodeWrapper = styled.div`
+    background-color: white;
+    border: 1px solid ${LINEAGE_COLORS.NODE_BORDER};
+    border-radius: 12px;
+    cursor: pointer;
+    padding: 8px;
+    width: ${LINEAGE_NODE_WIDTH}px;
+`;
+
+const ExtraCard = styled.div<{ bottom: number }>`
+    background-color: white;
+    border: 1px solid #eee;
+    border-radius: 12px;
+    bottom: ${({ bottom }) => bottom}px;
+    height: 40px;
+    left: 0;
+    position: absolute;
+    width: ${LINEAGE_NODE_WIDTH}px;
+    z-index: ${({ bottom }) => bottom};
+`;
+
+const TitleWrapper = styled.div`
+    align-items: center;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    height: 20px;
+`;
+
+const Title = styled.div`
+    flex-shrink: 1;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+`;
+
+const TitleCount = styled.span`
+    font-weight: bold;
+    margin: 0 1px;
+`;
+
+const CustomHandle = styled(Handle)<{ position: Position }>`
+    background: initial;
+    border: initial;
+    ${({ position }) => (position === Position.Left ? 'left: 0px; top: 50%;' : 'right: 0; top: 50%;')}
+`;
+
+const PillsWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+    margin-top: 6px;
+`;
+
+const PillColumn = styled.div`
+    display: flex;
+    flex-direction: row;
+`;
+
+export default function LineageFilterNode(props: NodeProps<LineageFilter>) {
+    const { id, data } = props;
+    const { parent, direction, shown, allChildren, numShown } = data;
+
+    const ignoreSchemaFieldStatus = useIgnoreSchemaFieldStatus();
+    const { showGhostEntities, rootType } = useContext(LineageNodesContext);
+    const { total, platforms, subtypes } = useFetchFilterNodeContents(
+        parent,
+        direction,
+        showGhostEntities && ignoreSchemaFieldStatus && rootType === EntityType.SchemaField,
+    );
+
+    // If a user has searched, result list may be limited to the number of matches
+    const [numMatches, setNumMatches] = useState<number>(0);
+
+    useAvoidIntersectionsOften(id, numMatches ? 133 : 117);
+
+    const numerator = numShown ?? shown.size;
+    const denominator = showGhostEntities ? allChildren.size : total ?? allChildren.size;
+    return (
+        <NodeWrapper>
+            <ExtraCard className="extra-card" bottom={-3} />
+            <ExtraCard className="extra-card" bottom={-6} />
+            <CustomHandle type="target" position={Position.Left} isConnectable={false} />
+            <CustomHandle type="source" position={Position.Right} isConnectable={false} />
+            <TitleWrapper>
+                <Title>
+                    <TitleCount>{Math.min(numerator, denominator)}</TitleCount> of{' '}
+                    <TitleCount>
+                        {denominator}
+                        {showGhostEntities && '+'}
+                    </TitleCount>{' '}
+                    shown
+                </Title>
+                <ShowMoreButton data={data} numMatches={numMatches} />
+            </TitleWrapper>
+            <LineageFilterSearch data={data} numMatches={numMatches} setNumMatches={setNumMatches} />
+            <PillsWrapper>
+                <PillColumn>
+                    {platforms?.map((agg, index) => (
+                        <PlatformEntry agg={agg} key={agg[0]} index={index} />
+                    ))}
+                </PillColumn>
+                <PillColumn>
+                    {subtypes
+                        ?.filter(([filterValue]) => !filterValue.toLocaleLowerCase().endsWith('query'))
+                        .map((agg, index) => (
+                            <SubtypeEntry agg={agg} key={agg[0]} index={index} />
+                        ))}
+                </PillColumn>
+            </PillsWrapper>
+        </NodeWrapper>
+    );
+}
+
+interface EntryProps<T> {
+    agg: T;
+    index: number;
+}
+
+function PlatformEntry({ agg, index }: EntryProps<PlatformAggregate>) {
+    return LineageFilterEntry(PLATFORM_FILTER_NAME, agg, index);
+}
+
+function SubtypeEntry({ agg, index }: EntryProps<SubtypeAggregate>) {
+    return LineageFilterEntry(ENTITY_SUB_TYPE_FILTER_NAME, agg, index);
+}
+
+const EntryWrapper = styled.span<{ includeBefore: boolean }>`
+    align-items: center;
+    display: flex;
+
+    ${({ includeBefore }) =>
+        includeBefore &&
+        `::before {
+             content: ',';
+             margin-right: 4px;
+         }`})
+`;
+
+const CountWrapper = styled.span`
+    margin-left: 4px;
+`;
+
+function LineageFilterEntry(
+    filterName: string,
+    [filterValue, count, entity]: PlatformAggregate | SubtypeAggregate,
+    index: number,
+) {
+    const entityRegistry = useEntityRegistryV2();
+    const { icon, label } = getFilterIconAndLabel(filterName, filterValue, entityRegistry, entity || null, 12);
+
+    return (
+        <EntryWrapper title={label} includeBefore={index > 0}>
+            {icon}
+            <CountWrapper>{count}</CountWrapper>
+        </EntryWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageFilterNode/LineageFilterSearch.tsx b/datahub-web-react/src/app/lineageV2/LineageFilterNode/LineageFilterSearch.tsx
new file mode 100644
index 00000000000000..ae61c508994000
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageFilterNode/LineageFilterSearch.tsx
@@ -0,0 +1,118 @@
+import { LoadingOutlined } from '@ant-design/icons';
+import { DBT_URN } from '@app/ingest/source/builder/constants';
+import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams';
+import { LineageFilter, LineageNodesContext, useIgnoreSchemaFieldStatus } from '@app/lineageV2/common';
+import computeOrFilters from '@app/lineageV2/LineageFilterNode/computeOrFilters';
+import { DEGREE_FILTER_NAME } from '@app/search/utils/constants';
+import { Input, Text } from '@components';
+import { useSearchAcrossLineageNamesQuery } from '@graphql/lineage.generated';
+import { EntityType } from '@types';
+import { Spin } from 'antd';
+import React, { useContext, useEffect, useState } from 'react';
+import { usePrevious } from 'react-js-cron/dist/cjs/utils';
+import { useDebounce } from 'react-use';
+import styled from 'styled-components';
+
+const SearchLine = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 8px;
+    margin-top: 2px;
+`;
+
+const SearchInput = styled(Input)`
+    height: 2em;
+`;
+
+const LoadingWrapper = styled.div`
+    min-width: 20px;
+`;
+
+const SearchMatchesText = styled(Text)``;
+
+interface Props {
+    data: LineageFilter;
+    numMatches: number;
+    setNumMatches: (numMatches: number) => void;
+}
+
+export default function LineageFilterSearch({ data, numMatches, setNumMatches }: Props) {
+    const { id, direction, parent, limit } = data;
+
+    const { startTimeMillis, endTimeMillis } = useGetLineageTimeParams();
+    const { nodes, setDisplayVersion, rootType, showGhostEntities } = useContext(LineageNodesContext);
+    const ignoreSchemaFieldStatus = useIgnoreSchemaFieldStatus();
+
+    const [inputValue, setInputValue] = useState('');
+    const [searchQuery, setSearchQuery] = useState('');
+    const oldSearchQuery = usePrevious(searchQuery);
+
+    useDebounce(() => setSearchQuery(inputValue), 300, [inputValue]);
+    useEffect(() => {
+        const filters = nodes.get(parent)?.filters[direction];
+        if (filters && searchQuery.length < 3 && oldSearchQuery?.length >= 3) {
+            filters.searchUrns = undefined;
+            setNumMatches(0);
+            setDisplayVersion(([prev]) => [prev + 1, [id]]);
+        }
+    }, [searchQuery, oldSearchQuery, id, parent, direction, nodes, setNumMatches, setDisplayVersion]);
+
+    const orFilters = computeOrFilters([{ field: DEGREE_FILTER_NAME, values: ['1'] }]);
+    const { loading } = useSearchAcrossLineageNamesQuery({
+        skip: searchQuery.length < 3,
+        variables: {
+            input: {
+                query: searchQuery,
+                urn: parent,
+                direction,
+                count: searchQuery ? limit : 0,
+                orFilters,
+                lineageFlags: {
+                    startTimeMillis,
+                    endTimeMillis,
+                    ignoreAsHops: [
+                        {
+                            entityType: EntityType.Dataset,
+                            platforms: [DBT_URN],
+                        },
+                        { entityType: EntityType.DataJob },
+                    ],
+                },
+                searchFlags: {
+                    includeSoftDeleted:
+                        showGhostEntities || (rootType === EntityType.SchemaField && ignoreSchemaFieldStatus),
+                },
+            },
+        },
+        onCompleted: (queryData) => {
+            setNumMatches(queryData.searchAcrossLineage?.total || 0);
+            const filters = nodes.get(parent)?.filters[direction];
+            if (filters) {
+                filters.searchUrns = new Set(
+                    queryData.searchAcrossLineage?.searchResults?.map((result) => result.entity.urn),
+                );
+                setDisplayVersion(([prev]) => [prev + 1, [id]]);
+            }
+        },
+    });
+
+    return (
+        <>
+            <SearchLine>
+                <SearchInput
+                    label=""
+                    placeholder="Search children"
+                    error={!!inputValue && inputValue.length < 3 ? 'Minimum 3 characters required' : undefined}
+                    errorOnHover
+                    value={inputValue}
+                    setValue={setInputValue}
+                />
+                <LoadingWrapper>{loading && <Spin indicator={<LoadingOutlined />} />}</LoadingWrapper>
+            </SearchLine>
+            <SearchMatchesText type="div" size="xs" color="gray">
+                {searchQuery.length >= 3 && (!loading || !!numMatches) && `${numMatches} matches`}
+            </SearchMatchesText>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageFilterNode/ShowMoreButton.tsx b/datahub-web-react/src/app/lineageV2/LineageFilterNode/ShowMoreButton.tsx
new file mode 100644
index 00000000000000..e058e7e6b93eed
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageFilterNode/ShowMoreButton.tsx
@@ -0,0 +1,138 @@
+import { applyOpacity } from '@app/sharedV2/colors/colorUtils';
+import React, { useCallback, useContext, useMemo } from 'react';
+import styled from 'styled-components';
+import KeyboardDoubleArrowDownIcon from '@mui/icons-material/KeyboardDoubleArrowDown';
+import { LineageFilter, LineageNodesContext, LINEAGE_FILTER_PAGINATION } from '../common';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../../entityV2/shared/constants';
+
+const MAX_INCREASE = 100;
+const LINE_HEIGHT = '1.5em';
+
+const ExtraButtons = styled.div`
+    display: none;
+    position: absolute;
+    top: calc(${LINE_HEIGHT} + 1px);
+
+    flex-direction: column;
+    align-items: end;
+    background-color: ${REDESIGN_COLORS.WHITE};
+`;
+
+const Wrapper = styled.div`
+    position: relative;
+    flex-shrink: 0;
+
+    display: flex;
+    align-items: center;
+    justify-content: right;
+    min-width: 71px;
+
+    :hover {
+        ${ExtraButtons} {
+            display: flex;
+        }
+    }
+`;
+
+const Button = styled.div`
+    all: unset;
+    align-items: center;
+    border-radius: 20px;
+    background-color: ${REDESIGN_COLORS.WHITE};
+    color: ${ANTD_GRAY[9]};
+    cursor: pointer;
+    display: flex;
+    font-size: 10px;
+    padding: 2px 4px;
+    width: fit-content;
+
+    :hover {
+        background-color: ${applyOpacity(REDESIGN_COLORS.TITLE_PURPLE, REDESIGN_COLORS.WHITE, 10)};
+        color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    }
+`;
+
+const Text = styled.span`
+    margin-right: 2px;
+    line-height: ${LINE_HEIGHT};
+`;
+
+interface Props {
+    data: LineageFilter;
+    numMatches: number;
+}
+
+export function ShowMoreButton({ data, numMatches }: Props) {
+    const { direction, contents, limit, parent } = data;
+    const { nodes, setDisplayVersion } = useContext(LineageNodesContext);
+
+    const maximum = numMatches || contents.length;
+
+    const setPagination = useCallback(
+        (value: number) => {
+            const filters = nodes.get(parent)?.filters[direction];
+            if (filters?.limit) {
+                // To zoom in on newly added nodes on click, uncomment below and pass into setDisplayVersion
+                // Should match useProcessData.applyFilters logic
+                // const newNodes = [
+                //     id,
+                //     ...contents.slice(maximum - filters.limit - increment, maximum - filters.limit),
+                // ];
+                filters.limit = value;
+                setDisplayVersion(([v, n]) => [v + 1, n]);
+            }
+        },
+        [direction, parent, nodes, setDisplayVersion],
+    );
+
+    const buttons = useMemo(() => {
+        const list: JSX.Element[] = [];
+        if (limit < maximum) {
+            list.push(
+                <Button
+                    key="show-more"
+                    onClick={() => setPagination(Math.min(limit + LINEAGE_FILTER_PAGINATION, maximum))}
+                >
+                    <Text>{limit + LINEAGE_FILTER_PAGINATION >= maximum ? 'Show All' : 'Show More'}</Text>
+                    <KeyboardDoubleArrowDownIcon fontSize="inherit" />
+                </Button>,
+            );
+        }
+        if (limit > LINEAGE_FILTER_PAGINATION) {
+            list.push(
+                <Button
+                    key="show-less"
+                    onClick={() => setPagination(Math.min(maximum, limit) - LINEAGE_FILTER_PAGINATION)}
+                >
+                    <Text>Show Less</Text>
+                    <KeyboardDoubleArrowDownIcon fontSize="inherit" />
+                </Button>,
+            );
+        }
+        if (limit + LINEAGE_FILTER_PAGINATION < maximum && limit + MAX_INCREASE >= maximum) {
+            list.push(
+                <Button key="show-all" onClick={() => setPagination(maximum)}>
+                    <Text>Show All</Text>
+                    <KeyboardDoubleArrowDownIcon fontSize="inherit" />
+                </Button>,
+            );
+        }
+        if (limit + MAX_INCREASE < maximum) {
+            list.push(
+                <Button key="show-max" onClick={() => setPagination(limit + MAX_INCREASE)}>
+                    <Text>Show +{MAX_INCREASE}</Text>
+                    <KeyboardDoubleArrowDownIcon fontSize="inherit" />
+                </Button>,
+            );
+        }
+        return list;
+    }, [limit, maximum, setPagination]);
+
+    if (!buttons.length) return null;
+    return (
+        <Wrapper className="show-more">
+            {buttons[0]}
+            {buttons.length > 1 && <ExtraButtons>{buttons.slice(1)}</ExtraButtons>}
+        </Wrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageFilterNode/computeOrFilters.ts b/datahub-web-react/src/app/lineageV2/LineageFilterNode/computeOrFilters.ts
new file mode 100644
index 00000000000000..252f1d2054ea38
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageFilterNode/computeOrFilters.ts
@@ -0,0 +1,43 @@
+import { DBT_URN } from '@app/ingest/source/builder/constants';
+import { ENTITY_FILTER_NAME, PLATFORM_FILTER_NAME } from '@app/searchV2/utils/constants';
+import { AndFilterInput, EntityType, FacetFilterInput } from '@types';
+
+/**
+ * Returns or filters for getting related entities at depth 1, potentially filtering out transformations.
+ * Transformations are defined as (type = dataset ^ platform = dbt) v (type = datajob).
+ * We can transform this into the correct format via logical equivalence:
+ * (depth = 1) ^ ~((type = dataset ^ platform = dbt) v (type = datajob))
+ * = (depth = 1) ^ ((type != dataset v platform != dbt) ^ (type != datajob)) // De Morgan's Law
+ * = (depth = 1 ^ type != dataset ^ type != datajob) v (depth = 1 ^ platform != dbt ^ type != datajob) // Distributive Law
+ */
+export default function computeOrFilters(
+    defaultFilters: FacetFilterInput[],
+    hideTransformations = true,
+): AndFilterInput[] {
+    if (!hideTransformations) {
+        return [{ and: defaultFilters }];
+    }
+    return [
+        {
+            and: [
+                ...defaultFilters,
+                {
+                    field: ENTITY_FILTER_NAME,
+                    values: [EntityType.Dataset, EntityType.DataJob],
+                    negated: true,
+                },
+            ],
+        },
+        {
+            and: [
+                ...defaultFilters,
+                {
+                    field: ENTITY_FILTER_NAME,
+                    values: [EntityType.DataJob],
+                    negated: true,
+                },
+                { field: PLATFORM_FILTER_NAME, values: [DBT_URN], negated: true },
+            ],
+        },
+    ];
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageFilterNode/useFetchFilterNodeContents.ts b/datahub-web-react/src/app/lineageV2/LineageFilterNode/useFetchFilterNodeContents.ts
new file mode 100644
index 00000000000000..bab6e1dc4705bf
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageFilterNode/useFetchFilterNodeContents.ts
@@ -0,0 +1,81 @@
+import { DBT_URN } from '@app/ingest/source/builder/constants';
+import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams';
+import { LineageNodesContext } from '@app/lineageV2/common';
+import computeOrFilters from '@app/lineageV2/LineageFilterNode/computeOrFilters';
+import { DEGREE_FILTER_NAME } from '@app/search/utils/constants';
+import { useContext } from 'react';
+import { PlatformFieldsFragment } from '../../../graphql/fragments.generated';
+import { useAggregateAcrossLineageQuery } from '../../../graphql/search.generated';
+import { AggregationMetadata, EntityType, LineageDirection } from '../../../types.generated';
+import { ENTITY_SUB_TYPE_FILTER_NAME, FILTER_DELIMITER, PLATFORM_FILTER_NAME } from '../../searchV2/utils/constants';
+
+export type PlatformAggregate = readonly [string, number, PlatformFieldsFragment];
+export type SubtypeAggregate = readonly [string, number];
+
+interface Return {
+    platforms: PlatformAggregate[];
+    subtypes: SubtypeAggregate[];
+    total?: number;
+}
+
+export default function useFetchFilterNodeContents(parent: string, direction: LineageDirection, skip: boolean): Return {
+    const { startTimeMillis, endTimeMillis } = useGetLineageTimeParams();
+    const { hideTransformations } = useContext(LineageNodesContext);
+
+    const orFilters = computeOrFilters([{ field: DEGREE_FILTER_NAME, values: ['1'] }], hideTransformations);
+    const { data } = useAggregateAcrossLineageQuery({
+        skip,
+        fetchPolicy: 'cache-first',
+        variables: {
+            input: {
+                urn: parent,
+                query: '*',
+                direction,
+                orFilters,
+                lineageFlags: {
+                    startTimeMillis,
+                    endTimeMillis,
+                    ignoreAsHops: [
+                        {
+                            entityType: EntityType.Dataset,
+                            platforms: [DBT_URN],
+                        },
+                        { entityType: EntityType.DataJob },
+                    ],
+                },
+                searchFlags: {
+                    skipCache: true, // TODO: Figure how to get around not needing this
+                },
+            },
+        },
+    });
+
+    const platformAgg =
+        data?.searchAcrossLineage?.facets?.find((facet) => facet.field === PLATFORM_FILTER_NAME)?.aggregations || [];
+    const platforms = platformAgg
+        .filter((agg): agg is AggregationMetadata & { entity: PlatformFieldsFragment } => {
+            return agg?.entity?.__typename === 'DataPlatform' && !!agg.count;
+        })
+        .map((agg) => [agg.value, agg.count, agg.entity] as const);
+    platforms.sort(sortByCount);
+
+    const subtypeAgg =
+        data?.searchAcrossLineage?.facets?.find((facet) => facet.field === ENTITY_SUB_TYPE_FILTER_NAME)?.aggregations ||
+        [];
+    const subtypesMap = new Map(subtypeAgg.map((agg) => [agg.value, agg.count]));
+    Array.from(subtypesMap).forEach(([filterValue, count]) => {
+        if (filterValue.includes(FILTER_DELIMITER)) {
+            const [platform] = filterValue.split(FILTER_DELIMITER);
+            subtypesMap.set(platform, (subtypesMap.get(platform) || 0) - count);
+        }
+    });
+
+    const subtypes = Array.from(subtypesMap).filter(([, count]) => count > 0);
+    subtypes.sort(sortByCount);
+
+    return { total: data?.searchAcrossLineage?.total, platforms, subtypes };
+}
+
+function sortByCount(a: readonly [string, number, any?], b: readonly [string, number, any?]) {
+    return b[1] - a[1];
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageGraph.tsx b/datahub-web-react/src/app/lineageV2/LineageGraph.tsx
new file mode 100644
index 00000000000000..bc286fe28f6d75
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageGraph.tsx
@@ -0,0 +1,27 @@
+import { useEntityData } from '@app/entity/shared/EntityContext';
+import { useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils';
+import LineageExplorerV2 from '@app/lineageV2/LineageExplorer';
+import React from 'react';
+import styled from 'styled-components/macro';
+
+const LineageFullscreenWrapper = styled.div`
+    background-color: white;
+    height: 100%;
+    display: flex;
+`;
+
+interface Props {
+    isFullscreen?: boolean;
+}
+
+export default function LineageGraph({ isFullscreen }: Props) {
+    const { urn, entityType, entityData } = useEntityData();
+    const onIndividualSiblingPage = useIsSeparateSiblingsMode();
+
+    const lineageUrn = (!onIndividualSiblingPage && entityData?.lineageUrn) || urn;
+    const explorer = <LineageExplorerV2 urn={lineageUrn} type={entityType} />;
+    if (isFullscreen) {
+        return <LineageFullscreenWrapper>{explorer}</LineageFullscreenWrapper>;
+    }
+    return explorer;
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageSidebar.tsx b/datahub-web-react/src/app/lineageV2/LineageSidebar.tsx
new file mode 100644
index 00000000000000..ecc7a8c2157173
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageSidebar.tsx
@@ -0,0 +1,107 @@
+import React, { useCallback, useContext, useState } from 'react';
+import { useOnSelectionChange, useStore } from 'reactflow';
+import styled from 'styled-components/macro';
+import translateFieldPath from '../entityV2/dataset/profile/schema/utils/translateFieldPath';
+import EntitySidebarContext, { FineGrainedOperation } from '../sharedV2/EntitySidebarContext';
+import CompactContext from '../shared/CompactContext';
+import useSidebarWidth from '../sharedV2/sidebar/useSidebarWidth';
+import { useEntityRegistry } from '../useEntityRegistry';
+import { LineageDisplayContext, LineageEntity, LineageNodesContext } from './common';
+
+const SidebarWrapper = styled.div<{ $distanceFromTop: number }>`
+    position: absolute;
+    right: 0;
+    top: 0;
+    display: flex;
+    flex-direction: column;
+    z-index: 1;
+    height: 100vh;
+
+    && {
+        &::-webkit-scrollbar {
+            display: none;
+        }
+    }
+`;
+
+export default function LineageSidebar() {
+    const entityRegistry = useEntityRegistry();
+    const [selectedEntity, setSelectedEntity] = useSelectedNode();
+    const resetSelectedElements = useStore((actions) => actions.resetSelectedElements);
+    const queryDetails = useQueryDetails(selectedEntity);
+    const width = useSidebarWidth();
+
+    const setSidebarClosed = useCallback(
+        (closed) => {
+            if (closed) {
+                resetSelectedElements();
+                setSelectedEntity(null);
+            }
+        },
+        [resetSelectedElements, setSelectedEntity],
+    );
+
+    // This manages closing, rather than isClosed
+    if (!selectedEntity) {
+        return null;
+    }
+
+    return (
+        <EntitySidebarContext.Provider
+            value={{
+                width,
+                isClosed: false,
+                setSidebarClosed,
+                forLineage: true,
+                separateSiblings: !selectedEntity.entity?.lineageSiblingIcon,
+                fineGrainedOperations: queryDetails,
+            }}
+        >
+            <SidebarWrapper $distanceFromTop={0}>
+                <CompactContext.Provider key={selectedEntity.urn} value>
+                    {entityRegistry.renderProfile(selectedEntity.type, selectedEntity.urn)}
+                </CompactContext.Provider>
+            </SidebarWrapper>
+        </EntitySidebarContext.Provider>
+    );
+}
+
+function useSelectedNode(): [LineageEntity | null, (v: LineageEntity | null) => void] {
+    // Entity Profile sidebar, not lineage sidebar
+    const { setSidebarClosed } = useContext(EntitySidebarContext);
+    const [selectedNode, setSelectedNode] = useState<LineageEntity | null>(null);
+
+    useOnSelectionChange({
+        onChange: ({ nodes }) => {
+            if (nodes.length) setSidebarClosed(true);
+            setSelectedNode(nodes.length ? nodes[nodes.length - 1].data : null);
+        },
+    });
+
+    return [selectedNode, setSelectedNode];
+}
+
+function useQueryDetails(selectedNode: LineageEntity | null): FineGrainedOperation[] | undefined {
+    const { nodes } = useContext(LineageNodesContext);
+    const { cllHighlightedNodes, fineGrainedOperations } = useContext(LineageDisplayContext);
+
+    if (selectedNode) {
+        return Array.from(cllHighlightedNodes.get(selectedNode.urn) || []).map((ref) => {
+            const data = fineGrainedOperations.get(ref);
+            return {
+                inputColumns: getColumnNames(nodes, data?.inputColumns),
+                outputColumns: getColumnNames(nodes, data?.outputColumns),
+                transformOperation: data?.transformOperation,
+            };
+        });
+    }
+    return [];
+}
+
+// TODO: Clean this up
+function getColumnNames(
+    nodes: Map<string, LineageEntity>,
+    columns?: Array<[string, string]>,
+): Array<[string, string]> | undefined {
+    return columns?.map(([urn, column]) => [nodes.get(urn)?.entity?.name || urn, translateFieldPath(column)]);
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageTimeSelector.tsx b/datahub-web-react/src/app/lineageV2/LineageTimeSelector.tsx
new file mode 100644
index 00000000000000..6ff7af1fad9e85
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageTimeSelector.tsx
@@ -0,0 +1,148 @@
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import styled from 'styled-components';
+import moment from 'moment';
+import { DatePicker, Space, Button, Typography } from 'antd';
+import { Tooltip } from '@components';
+import { CalendarOutlined, CaretDownOutlined } from '@ant-design/icons';
+import { REDESIGN_COLORS } from '../entityV2/shared/constants';
+
+const { RangePicker } = DatePicker;
+
+export type Datetime = moment.Moment | null;
+
+const ConfirmButtonWrapper = styled.div`
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+`;
+
+const ConfirmButton = styled(Button)`
+    border-radius: 15px;
+    border: 1px solid ${REDESIGN_COLORS.BLACK};
+
+    position: absolute;
+    right: 10px;
+    bottom: 13px;
+    text-align: right;
+
+    :hover {
+        border-color: ${REDESIGN_COLORS.BLUE};
+        color: ${REDESIGN_COLORS.BLUE};
+    }
+`;
+
+export type Props = {
+    onChange: (start: Datetime, end: Datetime) => void;
+    startTimeMillis?: number;
+    endTimeMillis?: number;
+};
+
+export default function LineageTimeSelector({ onChange, startTimeMillis, endTimeMillis }: Props) {
+    const [startDate, setStartDate] = useState<Datetime>(startTimeMillis ? moment(startTimeMillis) : null);
+    const [endDate, setEndDate] = useState<Datetime>(endTimeMillis ? moment(endTimeMillis) : null);
+    const [isOpen, setIsOpen] = useState<boolean>(false);
+    const ref = useRef<any>(null);
+
+    useEffect(() => {
+        setStartDate(startTimeMillis ? moment(startTimeMillis) : null);
+    }, [startTimeMillis]);
+
+    useEffect(() => {
+        setEndDate(endTimeMillis ? moment(endTimeMillis) : null);
+    }, [endTimeMillis]);
+
+    const handleOpenChange = useCallback(
+        (open: boolean) => {
+            setIsOpen(open);
+            if (!open) {
+                ref.current?.blur();
+                onChange(startDate, endDate);
+            }
+        },
+        [onChange, startDate, endDate],
+    );
+
+    const handleRangeChange = useCallback((dates: [Datetime, Datetime] | null) => {
+        const [start, end] = dates || [null, null];
+
+        start?.set({ hour: 0, minute: 0, second: 0, millisecond: 0 });
+        end?.set({ hour: 23, minute: 59, second: 59, millisecond: 999 });
+
+        setStartDate(start);
+        setEndDate(end);
+    }, []);
+
+    const showText = !isOpen && (startDate === null || endDate === null);
+
+    const [ranges] = useState<Array<[Datetime, Datetime]>>([
+        [moment().subtract(7, 'days'), null],
+        [moment().subtract(14, 'days'), null],
+        [moment().subtract(28, 'days'), null],
+        [null, null],
+    ]);
+
+    return (
+        <>
+            {showText ? ( // Conditionally render All Time selection
+                <Tooltip title="Filter lineage edges by observed date" placement="topLeft" showArrow={false}>
+                    <Button type="text" onClick={() => handleOpenChange(true)}>
+                        <CalendarOutlined style={{ marginRight: '4px' }} />
+                        <Typography.Text>
+                            <b>{getTimeRangeDescription(startDate, endDate)}</b>
+                        </Typography.Text>
+                        <CaretDownOutlined style={{ fontSize: '10px' }} />
+                    </Button>
+                </Tooltip>
+            ) : (
+                <Space direction="vertical" size={12}>
+                    <RangePicker
+                        ref={ref}
+                        open={isOpen}
+                        allowClear
+                        allowEmpty={[true, true]}
+                        bordered={false}
+                        value={[startDate, endDate]}
+                        disabledDate={(current: any) => {
+                            return current && current > moment().endOf('day');
+                        }}
+                        renderExtraFooter={() => (
+                            <ConfirmButtonWrapper>
+                                <ConfirmButton type="text" onClick={() => handleOpenChange(false)}>
+                                    <b>Confirm</b>
+                                </ConfirmButton>
+                            </ConfirmButtonWrapper>
+                        )}
+                        format="ll"
+                        ranges={Object.fromEntries(
+                            ranges.map(([start, end]) => [getTimeRangeDescription(start, end), [start, end]]),
+                        )}
+                        onChange={handleRangeChange}
+                        onOpenChange={handleOpenChange}
+                        onCalendarChange={() => handleOpenChange(true)}
+                    />
+                </Space>
+            )}
+        </>
+    );
+}
+
+function getTimeRangeDescription(startDate: moment.Moment | null, endDate: moment.Moment | null): string {
+    if (!startDate && !endDate) {
+        return 'All Time';
+    }
+
+    if (!startDate && endDate) {
+        return `Until ${endDate.format('ll')}`;
+    }
+
+    if (startDate && !endDate) {
+        const dayDiff = moment().diff(startDate, 'days');
+        if (dayDiff <= 30) {
+            return `Last ${dayDiff} days`;
+        }
+        return `From ${startDate.format('ll')}`;
+    }
+
+    return 'Unknown time range';
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageTransformationNode/LineageTransformationNode.tsx b/datahub-web-react/src/app/lineageV2/LineageTransformationNode/LineageTransformationNode.tsx
new file mode 100644
index 00000000000000..84e4b8fb39a883
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageTransformationNode/LineageTransformationNode.tsx
@@ -0,0 +1,166 @@
+import { ConsoleSqlOutlined, HomeOutlined, LoadingOutlined } from '@ant-design/icons';
+import LineageVisualizationContext from '@app/lineageV2/LineageVisualizationContext';
+import { Skeleton, Spin } from 'antd';
+import { Tooltip } from '@components';
+import React, { useContext } from 'react';
+import { Handle, NodeProps, Position } from 'reactflow';
+import styled from 'styled-components';
+import { useGetQueryQuery } from '../../../graphql/query.generated';
+import { EntityType, LineageDirection } from '../../../types.generated';
+import { LINEAGE_COLORS, REDESIGN_COLORS } from '../../entityV2/shared/constants';
+import {
+    FetchStatus,
+    isGhostEntity,
+    LineageDisplayContext,
+    LineageEntity,
+    LineageNodesContext,
+    useIgnoreSchemaFieldStatus,
+} from '../common';
+import { LoadingWrapper } from '../LineageEntityNode/NodeContents';
+
+export const LINEAGE_TRANSFORMATION_NODE_NAME = 'lineage-transformation';
+export const TRANSFORMATION_NODE_SIZE = 30;
+
+// TODO: Share with LineageEntityNode
+const HomeNodeBubble = styled.div`
+    align-items: center;
+    background-color: ${LINEAGE_COLORS.PURPLE_3};
+    border-radius: 10px;
+    color: white;
+    display: flex;
+    font-size: 10px;
+    font-weight: 600;
+    height: 22px;
+    justify-content: center;
+    left: -50%;
+    padding: 4px 8px;
+    position: absolute;
+    top: -26px;
+`;
+
+const NodeWrapper = styled.div<{
+    selected: boolean;
+    dragging: boolean;
+    opacity: number;
+    isGhost: boolean;
+    isSearchedEntity: boolean;
+    type: EntityType;
+}>`
+    background-color: white;
+    border: ${({ selected }) => (selected ? 2 : 1)}px solid;
+    border-color: ${({ selected }) => (selected ? LINEAGE_COLORS.PURPLE_3 : LINEAGE_COLORS.NODE_BORDER)};
+    border-radius: 50%;
+    box-shadow: ${({ isSearchedEntity }) =>
+        isSearchedEntity ? `0 0 3px 3px ${REDESIGN_COLORS.TITLE_PURPLE}95` : 'none'};
+    opacity: ${({ opacity }) => opacity};
+
+    align-items: center;
+    display: flex;
+    justify-content: center;
+    height: ${TRANSFORMATION_NODE_SIZE}px;
+    width: ${TRANSFORMATION_NODE_SIZE}px;
+    cursor: ${({ isGhost, dragging, type }) => {
+        if (isGhost) return 'not-allowed';
+        if (dragging) return 'grabbing';
+        if (type === EntityType.SchemaField) return 'grab';
+        return 'pointer';
+    }};
+`;
+
+const IconWrapper = styled.div<{ isGhost: boolean }>`
+    opacity: ${({ isGhost }) => (isGhost ? 0.5 : 1)};
+`;
+
+const CustomHandle = styled(Handle)<{ position: Position; $onEdge: boolean }>`
+    background: initial;
+    border: initial;
+    top: 50%;
+    left: 50%;
+
+    ${({ position, $onEdge }) => {
+        if ($onEdge && position === Position.Left) return 'left: 0;';
+        if ($onEdge && position === Position.Right) return 'right: 0;';
+        return '';
+    }};
+`;
+
+const CustomIcon = styled.img`
+    height: 18px;
+    width: 18px;
+`;
+
+export default function LineageTransformationNode(props: NodeProps<LineageEntity>) {
+    const { data, selected, dragging } = props;
+    const { urn, type, entity, fetchStatus } = data;
+    const isQuery = type === EntityType.Query;
+
+    const { rootUrn } = useContext(LineageNodesContext);
+    const { cllHighlightedNodes, setHoveredNode } = useContext(LineageDisplayContext);
+    const { searchedEntity } = useContext(LineageVisualizationContext);
+
+    // TODO: Support ghost queries and schema fields, once they are supported in the backend
+    const ignoreSchemaFieldStatus = useIgnoreSchemaFieldStatus();
+    const isGhost = isGhostEntity(entity, ignoreSchemaFieldStatus);
+    const isSearchedEntity = searchedEntity === urn;
+
+    const name = type === EntityType.SchemaField ? entity?.expandedName : entity?.name;
+    const backupLogoUrl = useFetchQuery(urn); // TODO: Remove when query nodes not instantiated on column select
+    const icon = entity?.icon || backupLogoUrl;
+
+    const { selectedColumn } = useContext(LineageDisplayContext);
+    const opacity = selectedColumn && !cllHighlightedNodes.has(urn) ? 0.3 : 1;
+
+    // TODO: Combine home node code with LineageEntityNode
+    const contents = (
+        <NodeWrapper
+            opacity={opacity}
+            selected={selected}
+            dragging={dragging}
+            onMouseEnter={() => setHoveredNode(urn)}
+            onMouseLeave={() => setHoveredNode(null)}
+            data-testid={`lineage-node-${urn}`}
+            isGhost={isGhost}
+            isSearchedEntity={isSearchedEntity}
+            type={type}
+        >
+            {urn === rootUrn && (
+                <HomeNodeBubble>
+                    <HomeOutlined style={{ marginRight: 4 }} />
+                    Home
+                </HomeNodeBubble>
+            )}
+            <IconWrapper isGhost={isGhost}>
+                {icon && <CustomIcon src={icon} />}
+                {!icon && isQuery && <ConsoleSqlOutlined />}
+                {!icon && !isQuery && <Skeleton.Avatar active shape="circle" size={TRANSFORMATION_NODE_SIZE} />}
+            </IconWrapper>
+            {fetchStatus[LineageDirection.Upstream] === FetchStatus.LOADING && (
+                <LoadingWrapper className="nodrag" style={{ left: -30 }}>
+                    <Spin delay={urn === rootUrn ? undefined : 500} indicator={<LoadingOutlined />} />
+                </LoadingWrapper>
+            )}
+            {fetchStatus[LineageDirection.Downstream] === FetchStatus.LOADING && (
+                <LoadingWrapper className="nodrag" style={{ right: -30 }}>
+                    <Spin delay={urn === rootUrn ? undefined : 500} indicator={<LoadingOutlined />} />
+                </LoadingWrapper>
+            )}
+            <CustomHandle type="target" position={Position.Left} isConnectable={false} $onEdge={!isQuery} />
+            <CustomHandle type="source" position={Position.Right} isConnectable={false} $onEdge={!isQuery} />
+        </NodeWrapper>
+    );
+
+    if (isQuery) {
+        return contents;
+    }
+    return <Tooltip title={name || urn}>{contents}</Tooltip>;
+}
+
+function useFetchQuery(urn: string) {
+    const { nodes } = useContext(LineageNodesContext);
+    const { data } = useGetQueryQuery({
+        skip: nodes.has(urn),
+        variables: { urn },
+    });
+
+    return data?.entity?.__typename === 'QueryEntity' && data.entity.platform?.properties?.logoUrl;
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageVisualization.tsx b/datahub-web-react/src/app/lineageV2/LineageVisualization.tsx
new file mode 100644
index 00000000000000..dfb58def3db550
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageVisualization.tsx
@@ -0,0 +1,127 @@
+import SearchControl from '@app/lineageV2/controls/SearchControl';
+import TentativeEdge, { TENTATIVE_EDGE_NAME } from '@app/lineageV2/LineageEdge/TentativeEdge';
+import React, { useContext, useEffect, useState } from 'react';
+import ReactFlow, { Background, BackgroundVariant, Edge, EdgeTypes, MiniMap, NodeTypes, useReactFlow } from 'reactflow';
+import styled from 'styled-components';
+
+import 'reactflow/dist/style.css';
+import { LineageDisplayContext, TRANSITION_DURATION_MS } from './common';
+import { LINEAGE_TABLE_EDGE_NAME, LineageTableEdge } from './LineageEdge/LineageTableEdge';
+import LineageEntityNode, { LINEAGE_ENTITY_NODE_NAME } from './LineageEntityNode/LineageEntityNode';
+import LineageFilterNodeBasic, { LINEAGE_FILTER_NODE_NAME } from './LineageFilterNode/LineageFilterNodeBasic';
+import LineageTransformationNode, {
+    LINEAGE_TRANSFORMATION_NODE_NAME,
+} from './LineageTransformationNode/LineageTransformationNode';
+import { LineageVisualizationNode } from './NodeBuilder';
+import LineageControls from './controls/LineageControls';
+import ZoomControls from './controls/ZoomControls';
+import LineageVisualizationContext from './LineageVisualizationContext';
+
+const StyledReactFlow = styled(ReactFlow)<{ $edgesOnTop: boolean }>`
+    .react-flow__node-lineage-entity:not(.dragging) {
+        transition: transform ${TRANSITION_DURATION_MS}ms ease-in-out;
+    }
+
+    ${({ $edgesOnTop }) =>
+        $edgesOnTop &&
+        `.react-flow__node-lineage-entity:not(.selected) {
+            z-index: -1 !important;
+        }`}
+`;
+
+const nodeTypes: NodeTypes = {
+    [LINEAGE_ENTITY_NODE_NAME]: LineageEntityNode,
+    [LINEAGE_TRANSFORMATION_NODE_NAME]: LineageTransformationNode,
+    [LINEAGE_FILTER_NODE_NAME]: LineageFilterNodeBasic,
+};
+
+const edgeTypes: EdgeTypes = {
+    [LINEAGE_TABLE_EDGE_NAME]: LineageTableEdge,
+    [TENTATIVE_EDGE_NAME]: TentativeEdge,
+};
+
+interface Props {
+    initialNodes: LineageVisualizationNode[];
+    initialEdges: Edge[];
+}
+
+// React flow doesn't always emit events if it re-renders at the same time
+const MemoizedLineageVisualization = React.memo(LineageVisualization);
+export default MemoizedLineageVisualization;
+
+function LineageVisualization({ initialNodes, initialEdges }: Props) {
+    const [searchQuery, setSearchQuery] = useState('');
+    const [isFocused, setIsFocused] = useState(false);
+    const [searchedEntity, setSearchedEntity] = useState<string | null>(null);
+    const { highlightedEdges, setSelectedColumn, setDisplayedMenuNode } = useContext(LineageDisplayContext);
+
+    useFitView(searchedEntity);
+    useHandleKeyboardDeselect(setSelectedColumn);
+
+    return (
+        <LineageVisualizationContext.Provider
+            value={{ searchQuery, setSearchQuery, searchedEntity, setSearchedEntity, isFocused }}
+        >
+            <StyledReactFlow
+                defaultNodes={initialNodes}
+                defaultEdges={initialEdges}
+                // Selection change event does not get emitted without timeout
+                onPaneClick={() => setTimeout(() => setSelectedColumn(null), 0)}
+                onClick={() => setDisplayedMenuNode(null)}
+                onNodeDragStart={(_e, node) => {
+                    // eslint-disable-next-line no-param-reassign
+                    node.data.dragged = true;
+                }}
+                nodeTypes={nodeTypes}
+                edgeTypes={edgeTypes}
+                proOptions={{ hideAttribution: true }}
+                nodesDraggable
+                nodeDragThreshold={3}
+                selectNodesOnDrag={false}
+                nodesConnectable={false}
+                minZoom={0.3}
+                maxZoom={5}
+                fitView
+                fitViewOptions={{ maxZoom: 1, duration: 0 }}
+                $edgesOnTop={!!highlightedEdges.size}
+                tabIndex={0} // Allow focus for keyboard shortcuts
+                onFocus={() => setIsFocused(true)}
+                onBlur={() => setIsFocused(false)}
+            >
+                <Background variant={BackgroundVariant.Lines} />
+                <ZoomControls />
+                <SearchControl />
+                <LineageControls />
+                <MiniMap position="bottom-right" ariaLabel={null} pannable zoomable />
+            </StyledReactFlow>
+        </LineageVisualizationContext.Provider>
+    );
+}
+
+function useFitView(searchedEntity: string | null) {
+    const { fitView } = useReactFlow();
+
+    useEffect(() => {
+        if (searchedEntity) {
+            fitView({ duration: 600, maxZoom: 1, nodes: [{ id: searchedEntity }] });
+        }
+    }, [searchedEntity, fitView]);
+}
+
+function useHandleKeyboardDeselect(setSelectedColumn: (value: string | null) => void) {
+    useEffect(() => {
+        function handleKeyPress(e: KeyboardEvent) {
+            if (e.key === 'Escape') {
+                // Prevents conflicts with React Flow escape handler
+                const timeout = setTimeout(() => setSelectedColumn(null), 0);
+                return () => clearTimeout(timeout);
+            }
+            return () => {};
+        }
+
+        document.addEventListener('keydown', handleKeyPress);
+        return () => {
+            document.removeEventListener('keydown', handleKeyPress);
+        };
+    }, [setSelectedColumn]);
+}
diff --git a/datahub-web-react/src/app/lineageV2/LineageVisualizationContext.tsx b/datahub-web-react/src/app/lineageV2/LineageVisualizationContext.tsx
new file mode 100644
index 00000000000000..45389ede894be3
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/LineageVisualizationContext.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+
+type Urn = string;
+
+interface VisualizationContext {
+    searchQuery: string;
+    setSearchQuery: (query: string) => void;
+    searchedEntity: Urn | null;
+    setSearchedEntity: (entity: Urn | null) => void;
+    isFocused: boolean;
+}
+
+const LineageVisualizationContext = React.createContext<VisualizationContext>({
+    searchQuery: '',
+    setSearchQuery: () => {},
+    searchedEntity: null,
+    setSearchedEntity: () => {},
+    isFocused: false,
+});
+
+export default LineageVisualizationContext;
diff --git a/datahub-web-react/src/app/lineageV2/NodeBuilder.ts b/datahub-web-react/src/app/lineageV2/NodeBuilder.ts
new file mode 100644
index 00000000000000..f369f95ceefc4f
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/NodeBuilder.ts
@@ -0,0 +1,494 @@
+import {
+    SCHEMA_FIELD_NODE_HEIGHT,
+    SCHEMA_FIELD_NODE_WIDTH,
+} from '@app/lineageV2/LineageEntityNode/SchemaFieldNodeContents';
+import { EdgeMarker } from '@reactflow/core/dist/esm/types/edges';
+import { Edge, MarkerType, Node } from 'reactflow';
+import { EntityType, LineageDirection } from '../../types.generated';
+import {
+    createEdgeId,
+    EdgeId,
+    getEdgeId,
+    getParents,
+    isGhostEntity,
+    isTransformational,
+    LINEAGE_FILTER_TYPE,
+    LineageEntity,
+    LineageFilter,
+    LineageNode,
+    LineageTableEdgeData,
+    NodeContext,
+    parseEdgeId,
+    setDefault,
+} from './common';
+import { LINEAGE_TABLE_EDGE_NAME } from './LineageEdge/LineageTableEdge';
+import { LINEAGE_ENTITY_NODE_NAME } from './LineageEntityNode/LineageEntityNode';
+import { LINEAGE_NODE_HEIGHT, LINEAGE_NODE_WIDTH } from './LineageEntityNode/useDisplayedColumns';
+import { LINEAGE_FILTER_NODE_NAME } from './LineageFilterNode/LineageFilterNodeBasic';
+import {
+    LINEAGE_TRANSFORMATION_NODE_NAME,
+    TRANSFORMATION_NODE_SIZE,
+} from './LineageTransformationNode/LineageTransformationNode';
+
+const MAIN_X_SEP_RATIO = 0.75;
+const MAIN_TO_MINI_X_SEP_RATIO = 0.375;
+const MINI_X_SEP_RATIO = 0.1875;
+const MAIN_Y_SEP_RATIO = 0.8;
+const MINI_Y_SEP_RATIO = MAIN_Y_SEP_RATIO / 2;
+const TRANSFORMATIONAL_LEAF_OFFSET = 25;
+
+export type LineageVisualizationNode = Node<LineageEntity | LineageFilter>;
+type BaseEdge<T> = Pick<Edge<T>, 'source' | 'target' | 'markerEnd' | 'data'>;
+
+type Layer = string; // [main (entity) layer, mini (transformation) layer]
+const defaultLayer = '0.0';
+
+function createLayer(main: number, mini: number): Layer {
+    // toLocaleString preserves negative 0, used for transformational nodes directly upstream of home node
+    return `${main.toLocaleString()}.${mini}`;
+}
+
+function parseLayer(layer?: Layer): { main: number; mini: number } {
+    if (!layer) {
+        return parseLayer(defaultLayer);
+    }
+    const [main, mini] = layer.split('.');
+    return { main: parseInt(main, 10), mini: parseInt(mini, 10) };
+}
+
+interface NodeInformation {
+    urn?: string;
+    type: EntityType | typeof LINEAGE_FILTER_TYPE;
+    direction?: LineageDirection;
+    inCycle?: boolean;
+    layer?: Layer;
+    positionalParents?: Set<string>;
+    y?: number;
+}
+
+export default class NodeBuilder {
+    homeUrn: string;
+
+    isHomeTransformational: boolean;
+
+    parents: Map<string, Set<string>>;
+
+    nodeWidth: number;
+
+    nodeHeight: number;
+
+    separationNodeHeight: number;
+
+    transformationalOffset: number; // Offset transformation nodes, not sure why this is needed
+
+    // Must set node layers in rough topological order
+    // A node must be preceded by all its min-parents, the parents along the shortest paths from the home node to it
+    // TODO: Memoize this min-parent calculation?
+    topologicalNodes: LineageNode[] = [];
+
+    entities: LineageEntity[] = [];
+
+    transformations: LineageEntity[] = [];
+
+    filterNodes: LineageFilter[] = [];
+
+    layerPositions = new Map<Layer, number>();
+
+    layerNodes = new Map<Layer, Set<string>>();
+
+    nodeInformation: Record<string, NodeInformation> = {};
+
+    // Note: Relies on the fact that transformation node id == urn
+    transformationChildren = new Map<string, Set<string>>();
+
+    // Note: nodes must be provided in shortest-path order
+    constructor(homeUrn: string, homeType: EntityType, nodes: LineageNode[], parents: Map<string, Set<string>>) {
+        this.homeUrn = homeUrn;
+        this.parents = parents;
+        this.nodeHeight = homeType === EntityType.SchemaField ? SCHEMA_FIELD_NODE_HEIGHT : LINEAGE_NODE_HEIGHT;
+        this.nodeWidth = homeType === EntityType.SchemaField ? SCHEMA_FIELD_NODE_WIDTH : LINEAGE_NODE_WIDTH;
+        this.transformationalOffset = (this.nodeHeight - 30) / 2;
+        // +15 accounts for column footer
+        this.separationNodeHeight = this.nodeHeight + (homeType === EntityType.SchemaField ? 15 : 0);
+
+        this.isHomeTransformational = isTransformational({ urn: homeUrn, type: homeType });
+        nodes.forEach((node) => {
+            this.nodeInformation[node.id] = {
+                urn: node.urn,
+                type: node.type,
+                direction: node.direction,
+                inCycle: node.inCycle,
+            };
+            this.#getNodeList(node).push(node);
+            this.topologicalNodes.push(node);
+        });
+        this.nodeInformation[homeUrn] = { urn: homeUrn, type: homeType, y: 0 };
+    }
+
+    #getNodeList(node: LineageNode): LineageNode[] {
+        if (node.type === LINEAGE_FILTER_TYPE) return this.filterNodes;
+        if (isTransformational(node)) return this.transformations;
+        return this.entities;
+    }
+
+    #isMainNode(node: Pick<LineageNode, 'urn' | 'type'>): boolean {
+        return !isTransformational(node);
+    }
+
+    #getMarker(information?: NodeInformation): EdgeMarker | undefined {
+        return information && this.#isMainNode(information) ? { type: MarkerType.ArrowClosed } : undefined;
+    }
+
+    createNodes(
+        context: Pick<NodeContext, 'adjacencyList' | 'edges'>,
+        ignoreSchemaFieldStatus: boolean,
+    ): LineageVisualizationNode[] {
+        this.computeNodeX(context);
+        this.computeNodeY();
+
+        const nodes: LineageVisualizationNode[] = [];
+        nodes.push(
+            ...this.entities.map((n) =>
+                this.createNode(n, LINEAGE_ENTITY_NODE_NAME, !isGhostEntity(n.entity, ignoreSchemaFieldStatus)),
+            ),
+        );
+        nodes.push(
+            ...this.transformations.map((n) =>
+                this.createNode(n, LINEAGE_TRANSFORMATION_NODE_NAME, !isGhostEntity(n.entity, ignoreSchemaFieldStatus)),
+            ),
+        );
+        nodes.push(...this.filterNodes.map((n) => this.createFilterNode(n)));
+        return nodes;
+    }
+
+    #addEdge(
+        edgeMap: Map<EdgeId, BaseEdge<LineageTableEdgeData>>,
+        source: string,
+        target: string,
+        data?: LineageTableEdgeData,
+    ): void {
+        const edge = setDefault(edgeMap, createEdgeId(source, target), {
+            source,
+            target,
+            markerEnd: this.#getMarker(this.nodeInformation[target]),
+        });
+        if (data) {
+            edge.data = { ...edge.data, ...data };
+        }
+    }
+
+    createEdges(edges: NodeContext['edges']): Edge<LineageTableEdgeData>[] {
+        const baseEdges = new Map<EdgeId, BaseEdge<LineageTableEdgeData>>();
+        edges.forEach((edge, edgeId) => {
+            if (!edge.isDisplayed) return;
+            const [upstream, downstream] = parseEdgeId(edgeId);
+            if (upstream in this.nodeInformation && downstream in this.nodeInformation) {
+                const upstreamDirection = this.nodeInformation[upstream].direction;
+                const downstreamDirection = this.nodeInformation[downstream].direction;
+                if (
+                    !this.nodeInformation[upstream].inCycle &&
+                    !this.nodeInformation[downstream].inCycle &&
+                    upstreamDirection &&
+                    downstreamDirection &&
+                    upstreamDirection !== downstreamDirection
+                ) {
+                    // Don't render edges between nodes upstream of home node and nodes downstream of home node
+                    return;
+                }
+
+                const originalId = createEdgeId(upstream, downstream);
+                const edgeData = { ...edge, originalId };
+                if (edge.via) {
+                    this.#addEdge(baseEdges, upstream, edge.via, edgeData);
+                    this.#addEdge(baseEdges, edge.via, downstream, edgeData);
+                } else {
+                    this.#addEdge(baseEdges, upstream, downstream, edgeData);
+                }
+            }
+        });
+        this.filterNodes.forEach((node) => {
+            if (node.direction === LineageDirection.Upstream) {
+                this.#addEdge(baseEdges, node.id, node.parent);
+            } else {
+                this.#addEdge(baseEdges, node.parent, node.id);
+            }
+        });
+        return Array.from(baseEdges.values()).map(createEdge);
+    }
+
+    #isLayerMini(layer?: Layer): boolean {
+        const { main, mini } = parseLayer(layer);
+        return !!mini || (!main && !mini && this.isHomeTransformational);
+    }
+
+    #getLayerSeparation(layer: Layer, prevLayer?: Layer): number {
+        const isCurrentLayerMini = this.#isLayerMini(layer);
+        const wasLastLayerMini = this.#isLayerMini(prevLayer);
+        if (isCurrentLayerMini && wasLastLayerMini) {
+            return this.nodeWidth * MINI_X_SEP_RATIO;
+        }
+        if (isCurrentLayerMini || wasLastLayerMini) {
+            return this.nodeWidth * MAIN_TO_MINI_X_SEP_RATIO;
+        }
+        return this.nodeWidth * MAIN_X_SEP_RATIO;
+    }
+
+    #getNodeSize(layer: Layer): number {
+        return this.#isLayerMini(layer) ? TRANSFORMATION_NODE_SIZE : this.nodeWidth;
+    }
+
+    /**
+     * Computes the x position of each node, by organizing them into layers.
+     */
+    computeNodeX({ adjacencyList, edges }: Pick<NodeContext, 'adjacencyList' | 'edges'>): void {
+        this.topologicalNodes.forEach((node) => {
+            // Filter out parents that are in the opposite direction
+            // Exemptions for lineage filter node and queries because they aren't fully in the adjacency list
+            const minParentLayer = getParents(node, adjacencyList)
+                .map<NodeInformation | undefined>((parent) => this.nodeInformation[parent])
+                .filter(
+                    (parent) =>
+                        node.type === LINEAGE_FILTER_TYPE ||
+                        (node.type === EntityType.Query && [node.direction, undefined].includes(parent?.direction)) ||
+                        (parent?.urn && node.direction && edges.has(getEdgeId(parent.urn, node.id, node.direction))),
+                )
+                .map((parent) => parent?.layer)
+                .filter((layer): layer is Layer => layer !== undefined)
+                .sort(compareLayers)?.[0];
+            const { main: parentMain, mini: parentMini } = parseLayer(minParentLayer);
+            if (this.#isMainNode(node)) {
+                const factor = node.direction === LineageDirection.Upstream ? -1 : 1;
+                const mainLayer = minParentLayer ? factor + parentMain : 0;
+                this.addNodeToLayer(node, createLayer(mainLayer, 0));
+            } else {
+                this.addNodeToLayer(
+                    node,
+                    createLayer(
+                        parentMain === 0 && node.direction === LineageDirection.Upstream ? -0 : parentMain,
+                        parentMini + 1,
+                    ),
+                );
+            }
+
+            if (node.type === LINEAGE_FILTER_TYPE) {
+                this.nodeInformation[node.id].positionalParents = new Set([node.parent]);
+            } else {
+                const positionalParents = Array.from(this.parents.get(node.id) || [])
+                    .map((p) => [p, this.nodeInformation[p].layer])
+                    .filter(([_p, l]) => parseLayer(l).main === parseLayer(minParentLayer).main)
+                    .map(([p]) => p)
+                    .filter((p): p is string => !!p);
+                this.nodeInformation[node.id].positionalParents = new Set(positionalParents);
+            }
+        });
+
+        const nextLayerMap = this.#computeLayerPositions();
+        this.transformations.forEach((node) => {
+            const nextLayer = nextLayerMap.get(this.nodeInformation[node.id].layer || '');
+            if (node.direction) {
+                const children = Array.from(adjacencyList[node.direction].get(node.urn) || []).filter(
+                    (child) => !nextLayer || this.nodeInformation[child]?.layer === nextLayer,
+                );
+                this.transformationChildren.set(node.urn, new Set(children));
+            }
+        });
+
+        console.debug(this);
+    }
+
+    addNodeToLayer(node: LineageNode, layer: Layer): void {
+        this.nodeInformation[node.id].layer = layer;
+        setDefault(this.layerNodes, layer, new Set()).add(node.id);
+    }
+
+    /**
+     * Computes the x position of each layer, based on the type (main or mini) of adjacent layers.
+     * Returns a map of each layer to the next layer in the same direction.
+     */
+    #computeLayerPositions(): Map<Layer, Layer> {
+        const nextLayerMap = new Map<Layer, Layer>();
+        const upstreamLayers = Array.from(this.layerNodes.keys())
+            .filter((layer) => layer.startsWith('-'))
+            .sort(compareLayers);
+        const downstreamLayers = Array.from(this.layerNodes.keys())
+            .filter((layer) => !layer.startsWith('-'))
+            .sort(compareLayers);
+
+        this.layerPositions.set(defaultLayer, 0);
+        upstreamLayers.forEach((layer, i) => {
+            const prevLayer = upstreamLayers[i - 1];
+            const separation = this.#getLayerSeparation(layer, prevLayer);
+            this.layerPositions.set(
+                layer,
+                (this.layerPositions.get(prevLayer) || 0) - this.#getNodeSize(layer) - separation,
+            );
+
+            if (prevLayer !== defaultLayer) nextLayerMap.set(prevLayer, layer);
+        });
+        downstreamLayers.forEach((layer, i) => {
+            if (i === 0) {
+                return;
+            }
+            const prevLayer = downstreamLayers[i - 1];
+            const separation = this.#getLayerSeparation(layer, prevLayer);
+            this.layerPositions.set(
+                layer,
+                (this.layerPositions.get(prevLayer) || 0) + this.#getNodeSize(prevLayer) + separation,
+            );
+
+            if (prevLayer !== defaultLayer) nextLayerMap.set(prevLayer, layer);
+        });
+
+        return nextLayerMap;
+    }
+
+    /**
+     * Computes the y position of each node, placing them between their parents' y positions,
+     *   while maintaining a minimum separation between nodes. Results in a tree-like structure.
+     * Must be called after computeNodeX.
+     */
+    computeNodeY(): void {
+        const sortedLayers = Array.from(this.layerPositions.keys()).sort(compareLayersMinisLast);
+        sortedLayers.forEach((layer) => {
+            const { mini } = parseLayer(layer);
+            const nodeHeight = mini
+                ? this.separationNodeHeight * MINI_Y_SEP_RATIO + TRANSFORMATION_NODE_SIZE
+                : this.separationNodeHeight * MAIN_Y_SEP_RATIO + this.separationNodeHeight;
+            const nodes = this.layerNodes.get(layer) || new Set();
+            const goalY: Record<string, number> = {};
+
+            // Set initial position
+            nodes.forEach((id) => {
+                let nodeY: number;
+                if (layer === defaultLayer) {
+                    nodeY = 0;
+                } else {
+                    const relatives: string[] = Array.from(this.nodeInformation[id].positionalParents || []);
+                    if (mini) {
+                        relatives.push(...(this.transformationChildren.get(id) || []));
+                    }
+                    if (!relatives.length && id !== this.homeUrn) {
+                        console.debug(`MISSING RELATIVES: ${id}`);
+                    }
+                    const relativesY = relatives
+                        .map((p) => this.nodeInformation[p]?.y)
+                        .filter((y): y is number => y !== undefined);
+                    nodeY = relativesY.length ? relativesY.reduce((a, b) => a + b) / relativesY.length : 0;
+                    if (mini && !this.transformationChildren.get(id)?.size) {
+                        nodeY += TRANSFORMATIONAL_LEAF_OFFSET;
+                    }
+                }
+                goalY[id] = nodeY;
+                this.nodeInformation[id].y = nodeY;
+            });
+
+            if (nodes.size < 2) {
+                return;
+            }
+
+            const sortedNodes = Array.from(nodes).sort((idA, idB) => goalY[idA] - goalY[idB] || idA.localeCompare(idB));
+            const getY = (idx: number): number => {
+                const id = sortedNodes[idx];
+                const val = this.nodeInformation[id].y;
+                if (val === undefined) {
+                    console.warn(`Node at ${idx} has no y position`);
+                    return 0;
+                }
+                return val;
+            };
+
+            // Create separation between nodes
+            // TODO: Clean this up a bit
+            let i = 0;
+            let j = 1;
+            let ySum = goalY[sortedNodes[0]];
+            // eslint-disable-next-line no-constant-condition
+            while (true) {
+                const n = j - i;
+                const groupHeight = n * nodeHeight;
+                const avg = ySum / n + nodeHeight / 2;
+                const leftBound = avg - groupHeight / 2;
+                const rightBound = avg + groupHeight / 2;
+
+                if (i > 0 && getY(i - 1) + nodeHeight > leftBound) {
+                    ySum += goalY[sortedNodes[i - 1]];
+                    i--;
+                } else if (j === sortedNodes.length) {
+                    for (let k = i; k < j; k++) {
+                        this.nodeInformation[sortedNodes[k]].y = leftBound + (k - i) * nodeHeight;
+                    }
+                    break;
+                } else if (getY(j) < rightBound) {
+                    ySum += goalY[sortedNodes[j]];
+                    j++;
+                } else {
+                    for (let k = i; k < j; k++) {
+                        this.nodeInformation[sortedNodes[k]].y = leftBound + (k - i) * nodeHeight;
+                    }
+                    i = j;
+                    j = i + 1;
+                    ySum = goalY[sortedNodes[i]];
+                }
+            }
+        });
+
+        // Offset transformation nodes
+        this.transformations.forEach((node) => {
+            const info = this.nodeInformation[node.id];
+            if (info.y !== undefined) info.y += this.transformationalOffset;
+        });
+    }
+
+    createNode<T extends LineageNode>(
+        node: T,
+        type: string,
+        selectable: boolean,
+        transformData = (v: T) => v,
+    ): LineageVisualizationNode {
+        const info = this.nodeInformation[node.id];
+        const layer = info.layer || '';
+        return {
+            type,
+            id: node.id,
+            position: {
+                x: this.layerPositions.get(layer) || 0,
+                y: info.y || 0,
+            },
+            data: transformData(node),
+            selectable: selectable && node.type !== EntityType.SchemaField,
+        };
+    }
+
+    createFilterNode(filter: LineageFilter): LineageVisualizationNode {
+        return this.createNode(filter, LINEAGE_FILTER_NODE_NAME, false, (node) => ({
+            ...node,
+            numShown: Array.from(node.allChildren).filter((urn) => urn in this.nodeInformation).length,
+        }));
+    }
+}
+
+function compareLayers(a: Layer, b: Layer): number {
+    const { main: aMain, mini: aMini } = parseLayer(a);
+    const { main: bMain, mini: bMini } = parseLayer(b);
+    return Math.abs(aMain) - Math.abs(bMain) || aMini - bMini;
+}
+
+function compareLayersMinisLast(a: Layer, b: Layer): number {
+    const { mini: aMini } = parseLayer(a);
+    const { mini: bMini } = parseLayer(b);
+    if (aMini && !bMini) {
+        return 1;
+    }
+    if (bMini && !aMini) {
+        return -1;
+    }
+    return compareLayers(a, b);
+}
+
+function createEdge<T>(edge: BaseEdge<T>): Edge {
+    return {
+        ...edge,
+        id: createEdgeId(edge.source, edge.target),
+        type: LINEAGE_TABLE_EDGE_NAME,
+    };
+}
diff --git a/datahub-web-react/src/app/lineageV2/common.ts b/datahub-web-react/src/app/lineageV2/common.ts
new file mode 100644
index 00000000000000..1110460a6a0537
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/common.ts
@@ -0,0 +1,355 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import { LINEAGE_COLORS } from '@app/entityV2/shared/constants';
+import { useAppConfig } from '@app/useAppConfig';
+import { Maybe } from 'graphql/jsutils/Maybe';
+import React, { Dispatch, SetStateAction } from 'react';
+import { Entity, EntityType, LineageDirection, SchemaFieldRef } from '../../types.generated';
+import EntityRegistry from '../entityV2/EntityRegistry';
+import { DBT_CLOUD_URN } from '../ingest/source/builder/constants';
+import { hashString } from '../shared/avatar/getAvatarColor';
+import { FineGrainedOperation } from '../sharedV2/EntitySidebarContext';
+import { getEntityTypeFromEntityUrn, getPlatformUrnFromEntityUrn } from './lineageUtils';
+import { FetchedEntityV2 } from './types';
+
+export const TRANSITION_DURATION_MS = 200;
+export const LINEAGE_FILTER_PAGINATION = 4;
+
+export const HOVER_COLOR = LINEAGE_COLORS.BLUE_2;
+export const SELECT_COLOR = LINEAGE_COLORS.PURPLE_3;
+
+type Urn = string;
+
+/**
+ * Used to determine when and what to query for extra data.
+ */
+export enum FetchStatus {
+    UNNEEDED = 'UNNEEDED',
+    UNFETCHED = 'UNFETCHED',
+    LOADING = 'LOADING',
+    COMPLETE = 'COMPLETE',
+}
+
+export interface Filters {
+    display?: boolean; // undefined == display
+    limit?: number; // undefined == no limit
+    facetFilters: Map<string, Set<string>>;
+    searchUrns?: Set<string>;
+}
+
+export interface NodeBase {
+    id: string;
+    isExpanded: Record<LineageDirection, boolean>;
+    direction?: LineageDirection; // Root node has no direction. One day can try to support cycles in the same way.
+    dragged?: boolean;
+    inCycle?: boolean;
+}
+
+export interface LineageEntity extends NodeBase {
+    urn: Urn;
+    type: EntityType;
+    entity?: FetchedEntityV2;
+    rawEntity?: Entity; // TODO: Don't store this -- waste of memory? Currently used for manual lineage modal
+    fetchStatus: Record<LineageDirection, FetchStatus>;
+    filters: Record<LineageDirection, Filters>;
+}
+
+export const LINEAGE_FILTER_TYPE = 'lineage-filter';
+export const LINEAGE_FILTER_ID_PREFIX = 'lf:';
+
+export function createLineageFilterNodeId(urn: Urn, direction: LineageDirection): string {
+    const dir = direction === LineageDirection.Upstream ? 'u:' : 'd:';
+    return `${LINEAGE_FILTER_ID_PREFIX}${dir}${urn}`;
+}
+
+export interface LineageFilter extends NodeBase {
+    urn?: never;
+    type: typeof LINEAGE_FILTER_TYPE;
+    direction: LineageDirection;
+    parent: Urn; // TODO: Consider removing in favor of parents
+    contents: Urn[]; // Paginated nodes in order. Includes non-transformational nodes and transformational leaves
+    allChildren: Set<Urn>; // Includes all transformational children
+    shown: Set<Urn>;
+    limit: number;
+    numShown?: number; // Includes nodes in contents shown due to a different path, not through `parent`
+}
+
+export type LineageNode = LineageEntity | LineageFilter;
+
+const TRANSFORMATION_TYPES: string[] = [EntityType.Query, EntityType.DataJob];
+
+export function useIgnoreSchemaFieldStatus(): boolean {
+    return useAppConfig().config.featureFlags.schemaFieldLineageIgnoreStatus;
+}
+
+export function isGhostEntity(
+    node: FetchedEntityV2 | GenericEntityProperties | undefined | null,
+    ignoreSchemaFieldStatus: boolean,
+): boolean {
+    return (
+        !!node &&
+        (!node?.exists || !!node.status?.removed) &&
+        node.type !== EntityType.Query &&
+        !(
+            ignoreSchemaFieldStatus &&
+            node.type === EntityType.SchemaField &&
+            !isGhostEntity(node.parent, ignoreSchemaFieldStatus)
+        )
+    );
+}
+
+export function isDbt(node: Pick<LineageNode, 'urn' | 'type'>): boolean {
+    return (
+        (node.type === EntityType.Dataset || node.type === EntityType.SchemaField) &&
+        !!node.urn &&
+        getPlatformUrnFromEntityUrn(node.urn) === DBT_CLOUD_URN
+    );
+}
+
+export function isQuery(node: Pick<LineageNode, 'type'>): boolean {
+    return node.type === EntityType.Query;
+}
+
+// TODO: Replace with value from search-across-lineage, once it's available
+// Must be kept in sync with useSearchAcrossLineage
+export function isTransformational(node: Pick<LineageNode, 'urn' | 'type'>): boolean {
+    return TRANSFORMATION_TYPES.includes(node.type) || isDbt(node);
+}
+
+export function isUrnDbt(urn: string, entityRegistry: EntityRegistry): boolean {
+    const type = getEntityTypeFromEntityUrn(urn, entityRegistry);
+    return (
+        (type === EntityType.Dataset || type === EntityType.SchemaField) &&
+        getPlatformUrnFromEntityUrn(urn) === DBT_CLOUD_URN
+    );
+}
+
+export function isUrnQuery(urn: string, entityRegistry: EntityRegistry): boolean {
+    const type = getEntityTypeFromEntityUrn(urn, entityRegistry);
+    return type === EntityType.Query;
+}
+
+export function isUrnTransformational(urn: string, entityRegistry: EntityRegistry): boolean {
+    const type = getEntityTypeFromEntityUrn(urn, entityRegistry);
+    return (!!type && TRANSFORMATION_TYPES.includes(type)) || isUrnDbt(urn, entityRegistry);
+}
+
+export type ColumnRef = string;
+export type FineGrainedOperationRef = string;
+
+export function createColumnRef(urn: Urn, field: string): ColumnRef {
+    return `${urn}::${field}`;
+}
+
+export function parseColumnRef(columnRef: ColumnRef): [Urn, string] {
+    const [urn, field] = columnRef.split('::', 2);
+    return [urn, field];
+}
+
+export function createFineGrainedOperationRef(
+    queryUrn: Urn,
+    upstreams: Maybe<SchemaFieldRef[]>,
+    downstreams: Maybe<SchemaFieldRef[]>,
+): FineGrainedOperationRef {
+    const upstreamsUrn = upstreams?.map((r) => `${r.urn}:${r.path}`).join('␞');
+    const downstreamsUrn = downstreams?.map((r) => `${r.urn}:${r.path}`).join('␞');
+    return createColumnRef(queryUrn, hashString([upstreamsUrn, downstreamsUrn].join('::')).toString());
+}
+
+export interface LineageAuditStamp {
+    timestamp: number;
+    actor?: Entity;
+}
+
+export interface LineageEdge {
+    isDisplayed: boolean;
+    isManual?: boolean;
+    created?: LineageAuditStamp;
+    updated?: LineageAuditStamp;
+    via?: Urn;
+}
+
+export interface LineageTableEdgeData extends LineageEdge {
+    originalId: string; // For edges to via nodes, stores table->table edge id. Otherwise, identical to edge id.
+}
+
+export type EdgeId = string;
+
+export function createEdgeId(upstream: Urn, downstream: Urn): EdgeId {
+    return `${upstream}-:-${downstream}`;
+}
+
+export function parseEdgeId(edgeId: EdgeId): [Urn, Urn] {
+    const [upstream, downstream] = edgeId.split('-:-', 2);
+    return [upstream, downstream];
+}
+
+export function getEdgeId(parent: Urn, child: Urn, direction: LineageDirection | string) {
+    const upstream = direction === LineageDirection.Downstream ? parent : child;
+    const downstream = direction === LineageDirection.Downstream ? child : parent;
+    return createEdgeId(upstream, downstream);
+}
+
+export function reverseDirection(direction: LineageDirection): LineageDirection {
+    return direction === LineageDirection.Upstream ? LineageDirection.Downstream : LineageDirection.Upstream;
+}
+
+export type NeighborMap = Map<Urn, Set<Urn>>;
+
+export interface NodeContext {
+    rootUrn: string;
+    rootType: EntityType;
+    nodes: Map<Urn, LineageEntity>;
+    edges: Map<EdgeId, LineageEdge>;
+    adjacencyList: Record<LineageDirection, NeighborMap>;
+    nodeVersion: number;
+    setNodeVersion: Dispatch<SetStateAction<number>>;
+    dataVersion: number;
+    setDataVersion: Dispatch<SetStateAction<number>>;
+    displayVersion: [number, Urn[]];
+    setDisplayVersion: Dispatch<SetStateAction<[number, Urn[]]>>;
+    columnEdgeVersion: number; // Used to force recalculation of column->column edges
+    setColumnEdgeVersion: Dispatch<SetStateAction<number>>;
+    hideTransformations: boolean;
+    setHideTransformations: (hide: boolean) => void;
+    showGhostEntities: boolean;
+    setShowGhostEntities: (hide: boolean) => void;
+}
+
+export const LineageNodesContext = React.createContext<NodeContext>({
+    rootUrn: '',
+    rootType: EntityType.Dataset,
+    nodes: new Map(),
+    edges: new Map(),
+    adjacencyList: {
+        [LineageDirection.Upstream]: new Map(),
+        [LineageDirection.Downstream]: new Map(),
+    },
+    nodeVersion: 0,
+    setNodeVersion: () => {},
+    dataVersion: 0,
+    setDataVersion: () => {},
+    displayVersion: [0, []],
+    setDisplayVersion: () => {},
+    columnEdgeVersion: 0,
+    setColumnEdgeVersion: () => {},
+    hideTransformations: false,
+    setHideTransformations: () => {},
+    showGhostEntities: false,
+    setShowGhostEntities: () => {},
+});
+
+export function getParents(node: LineageNode, adjacencyList: NodeContext['adjacencyList']): string[] {
+    if (node.type === LINEAGE_FILTER_TYPE) return [node.parent];
+    if (!node.direction) return [];
+    return Array.from(adjacencyList[reverseDirection(node.direction)].get(node.id) || []);
+}
+
+export function addToAdjacencyList(
+    adjacencyList: NodeContext['adjacencyList'],
+    direction: LineageDirection,
+    parent: Urn,
+    child: Urn,
+): void {
+    setDefault(adjacencyList[direction], parent, new Set()).add(child);
+    setDefault(adjacencyList[reverseDirection(direction)], child, new Set()).add(parent);
+}
+
+export function removeFromAdjacencyList(
+    adjacencyList: NodeContext['adjacencyList'],
+    direction: LineageDirection,
+    parent: Urn,
+    child: Urn,
+): void {
+    adjacencyList[direction].get(parent)?.delete(child);
+    adjacencyList[reverseDirection(direction)].get(child)?.delete(parent);
+}
+
+export function clearEdges(urn: Urn, context: Pick<NodeContext, 'edges' | 'adjacencyList'>): void {
+    const { edges, adjacencyList } = context;
+    adjacencyList[LineageDirection.Upstream].get(urn)?.forEach((upstream) => edges.delete(createEdgeId(upstream, urn)));
+    adjacencyList[LineageDirection.Downstream]
+        .get(urn)
+        ?.forEach((downstream) => edges.delete(createEdgeId(urn, downstream)));
+    adjacencyList[LineageDirection.Upstream].delete(urn);
+    adjacencyList[LineageDirection.Downstream].delete(urn);
+}
+
+// Mapping fromRef -> toRef -> operationRef represents a column-level edge (fromRef -> toRef)
+// with an operationRef attached if this is an edge to that operation's query node
+export type FineGrainedLineageMap = Map<ColumnRef, Map<ColumnRef, FineGrainedOperationRef | null>>;
+export type FineGrainedLineage = { downstream: FineGrainedLineageMap; upstream: FineGrainedLineageMap };
+export type HighlightedColumns = Map<Urn, Set<string>>;
+
+interface DisplayContext {
+    // Params
+    hoveredNode: Urn | null;
+    setHoveredNode: Dispatch<SetStateAction<Urn | null>>;
+    displayedMenuNode: Urn | null;
+    setDisplayedMenuNode: Dispatch<SetStateAction<Urn | null>>;
+    hoveredColumn: ColumnRef | null;
+    setHoveredColumn: Dispatch<SetStateAction<ColumnRef | null>>;
+    selectedColumn: ColumnRef | null;
+    setSelectedColumn: Dispatch<SetStateAction<ColumnRef | null>>;
+    // Outputs
+    highlightedNodes: Set<Urn>; // TODO: Remove? Not currently used
+    cllHighlightedNodes: Map<Urn, Set<FineGrainedOperationRef> | null>;
+    highlightedColumns: HighlightedColumns;
+    highlightedEdges: Set<string>;
+    fineGrainedLineage: FineGrainedLineage;
+    fineGrainedOperations: Map<FineGrainedOperationRef, FineGrainedOperation>;
+    shownUrns: string[];
+    refetchUrn: (urn: string) => void;
+}
+
+export const LineageDisplayContext = React.createContext<DisplayContext>({
+    hoveredNode: null,
+    setHoveredNode: () => {},
+    displayedMenuNode: null,
+    setDisplayedMenuNode: () => {},
+    hoveredColumn: null,
+    setHoveredColumn: () => {},
+    selectedColumn: null,
+    setSelectedColumn: () => {},
+    highlightedNodes: new Set(),
+    cllHighlightedNodes: new Map(),
+    highlightedColumns: new Map(),
+    highlightedEdges: new Set(),
+    fineGrainedLineage: {
+        downstream: new Map(),
+        upstream: new Map(),
+    },
+    fineGrainedOperations: new Map(),
+    shownUrns: [],
+    refetchUrn: () => {},
+});
+
+export function setDefault<K, V>(map: Map<K, V>, key: K, defaultValue: V): V {
+    if (!map.has(key)) {
+        map.set(key, defaultValue);
+    }
+    return map.get(key) as V;
+}
+
+export function setDifference(setA: Set<string>, setB: Set<string>): string[] {
+    return Array.from(setA).filter((x) => !setB.has(x));
+}
+
+export function onClickPreventSelect(event: React.MouseEvent): true {
+    event.preventDefault(); // Prevents selecting node in React Flow
+    event.stopPropagation(); // Prevents focusing node
+    return true;
+}
+
+const DATA_STORE_COLOR = '#ffd279';
+const BI_TOOL_COLOR = '#8682a2';
+const DEFAULT_COLOR = '#ff7979';
+
+export function getNodeColor(type?: EntityType): [string, string] {
+    if (type === EntityType.Chart || type === EntityType.Dashboard) {
+        return [BI_TOOL_COLOR, 'Field'];
+    }
+    if (type === EntityType.Dataset) {
+        return [DATA_STORE_COLOR, 'Column'];
+    }
+    return [DEFAULT_COLOR, 'Column'];
+}
diff --git a/datahub-web-react/src/app/lineageV2/constants.ts b/datahub-web-react/src/app/lineageV2/constants.ts
new file mode 100644
index 00000000000000..8915bdd79b90de
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/constants.ts
@@ -0,0 +1 @@
+export const NUM_COLUMNS_PER_PAGE = 5;
diff --git a/datahub-web-react/src/app/lineageV2/controls/DownloadLineageScreenshotButton.tsx b/datahub-web-react/src/app/lineageV2/controls/DownloadLineageScreenshotButton.tsx
new file mode 100644
index 00000000000000..950226b6f04c4b
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/controls/DownloadLineageScreenshotButton.tsx
@@ -0,0 +1,64 @@
+import React from 'react';
+import { getRectOfNodes, getTransformForBounds, useReactFlow } from 'reactflow';
+import { CameraOutlined } from '@ant-design/icons';
+import { toPng } from 'html-to-image';
+import { StyledPanelButton } from './StyledPanelButton';
+
+type Props = {
+    showExpandedText: boolean;
+};
+
+function downloadImage(dataUrl: string, name?: string) {
+    const now = new Date();
+    const dateStr = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(
+        now.getDate(),
+    ).padStart(2, '0')}`;
+
+    const timeStr = `${String(now.getHours()).padStart(2, '0')}${String(now.getMinutes()).padStart(2, '0')}${String(
+        now.getSeconds(),
+    ).padStart(2, '0')}`;
+
+    const fileNamePrefix = name ? `${name}_` : 'reactflow_';
+    const fileName = `${fileNamePrefix}${dateStr}_${timeStr}.png`;
+
+    const a = document.createElement('a');
+    a.setAttribute('download', fileName);
+    a.setAttribute('href', dataUrl);
+    a.click();
+}
+
+export default function DownloadLineageScreenshotButton({ showExpandedText }: Props) {
+    const { getNodes } = useReactFlow();
+
+    const getPreviewImage = () => {
+        const nodesBounds = getRectOfNodes(getNodes());
+        const imageWidth = nodesBounds.width + 200;
+        const imageHeight = nodesBounds.height + 200;
+        const transform = getTransformForBounds(nodesBounds, imageWidth, imageHeight, 0.5, 2);
+
+        toPng(document.querySelector('.react-flow__viewport') as HTMLElement, {
+            backgroundColor: '#f8f8f8',
+            width: imageWidth,
+            height: imageHeight,
+            style: {
+                width: String(imageWidth),
+                height: String(imageHeight),
+                transform: `translate(${transform[0]}px, ${transform[1]}px) scale(${transform[2]})`,
+            },
+        }).then((dataUrl) => {
+            downloadImage(dataUrl);
+        });
+    };
+
+    return (
+        <StyledPanelButton
+            type="text"
+            onClick={() => {
+                getPreviewImage();
+            }}
+        >
+            <CameraOutlined />
+            {showExpandedText ? 'Screenshot' : null}
+        </StyledPanelButton>
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/controls/LineageControls.tsx b/datahub-web-react/src/app/lineageV2/controls/LineageControls.tsx
new file mode 100644
index 00000000000000..4dfde23ea3427c
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/controls/LineageControls.tsx
@@ -0,0 +1,140 @@
+import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
+import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams';
+import React, { useContext, useEffect, useState } from 'react';
+import { Panel, useReactFlow } from 'reactflow';
+import styled from 'styled-components';
+import {
+    ArrowsAltOutlined,
+    CalendarOutlined,
+    FilterOutlined,
+    HomeOutlined,
+    ShrinkOutlined,
+    VerticalLeftOutlined,
+} from '@ant-design/icons';
+import { Button, Divider } from 'antd';
+import { LineageNodesContext, TRANSITION_DURATION_MS } from '../common';
+
+import LineageSearchFilters from './LineageSearchFilters';
+import { StyledPanelButton } from './StyledPanelButton';
+import DownloadLineageScreenshotButton from './DownloadLineageScreenshotButton';
+import LineageTimeRangeControls from './LineageTimeRangeControls';
+import TabFullsizedContext from '../../shared/TabFullsizedContext';
+import { ControlPanel } from './common';
+
+const StyledPanel = styled(Panel)`
+    margin-top: 80px;
+    display: flex;
+    flex-direction: row;
+    gap: 10px;
+    height: 0; // Allow pointer events in gaps
+`;
+
+const StyledControlsPanel = styled(ControlPanel)<{ isExpanded: boolean }>`
+    padding: 2px;
+    width: ${({ isExpanded }) => (isExpanded ? '150px' : '50px')};
+    transition: width ${TRANSITION_DURATION_MS}ms ease-in-out;
+`;
+
+const StyledExpandContractButton = styled(Button)`
+    border-radius: 8px;
+    height: 56px;
+    width: 56px;
+    margin-top: 8px;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    display: flex;
+`;
+
+const StyledDivider = styled(Divider)`
+    margin-top: 1px;
+    margin-bottom: 1px;
+`;
+
+const ControlsColumn = styled.div``;
+
+type PanelType = 'filters' | 'timeRange';
+
+export default function LineageControls() {
+    const { rootUrn, hideTransformations, showGhostEntities } = useContext(LineageNodesContext);
+    const { isTabFullsize, setTabFullsize } = useContext(TabFullsizedContext);
+    const { isDefault: isLineageTimeUnchanged } = useGetLineageTimeParams();
+    const { fitView } = useReactFlow();
+
+    const [isExpanded, setIsExpanded] = useState(false);
+    const [visiblePanel, setVisiblePanel] = useState<PanelType | null>(null);
+
+    // showExpandedText is a delayed version of isExpanded by .3 seconds
+    const [showExpandedText, setShowExpandedText] = useState(false);
+    useEffect(() => {
+        if (isExpanded) {
+            setShowExpandedText(true);
+            return () => {};
+        }
+        const timeout = setTimeout(() => {
+            setShowExpandedText(false);
+        }, TRANSITION_DURATION_MS);
+        return () => clearTimeout(timeout);
+    }, [isExpanded]);
+
+    return (
+        <StyledPanel position="top-left">
+            <ControlsColumn>
+                <StyledControlsPanel isExpanded={isExpanded}>
+                    <StyledPanelButton type="text" onClick={() => setIsExpanded(!isExpanded)}>
+                        <VerticalLeftOutlined rotate={isExpanded ? 180 : 0} />
+                        {showExpandedText ? 'Hide Menu' : null}
+                    </StyledPanelButton>
+                    <StyledDivider />
+                    <StyledPanelButton
+                        type="text"
+                        onClick={() => {
+                            fitView({ duration: 1000, nodes: [{ id: rootUrn }], maxZoom: 1 });
+                        }}
+                    >
+                        <HomeOutlined />
+                        {showExpandedText ? 'Focus on Home' : null}
+                    </StyledPanelButton>
+                    <StyledDivider />
+                    <StyledPanelButton
+                        type="text"
+                        onClick={() =>
+                            visiblePanel === 'filters' ? setVisiblePanel(null) : setVisiblePanel('filters')
+                        }
+                    >
+                        <FilterOutlined
+                            style={{
+                                color: hideTransformations || showGhostEntities ? REDESIGN_COLORS.BLUE : undefined,
+                            }}
+                        />
+                        {showExpandedText ? 'Filter' : null}
+                    </StyledPanelButton>
+                    <StyledPanelButton
+                        type="text"
+                        onClick={() =>
+                            visiblePanel === 'timeRange' ? setVisiblePanel(null) : setVisiblePanel('timeRange')
+                        }
+                    >
+                        <CalendarOutlined
+                            style={{ color: isLineageTimeUnchanged ? undefined : REDESIGN_COLORS.BLUE }}
+                        />
+                        {showExpandedText ? 'Time Range' : null}
+                    </StyledPanelButton>
+                    <StyledDivider />
+                    <DownloadLineageScreenshotButton showExpandedText={showExpandedText} />
+                </StyledControlsPanel>
+                {setTabFullsize && (
+                    <StyledExpandContractButton onClick={() => setTabFullsize((v) => !v)}>
+                        {isTabFullsize ? (
+                            <ShrinkOutlined style={{ fontSize: '150%' }} />
+                        ) : (
+                            <ArrowsAltOutlined style={{ fontSize: '150%' }} />
+                        )}
+                    </StyledExpandContractButton>
+                )}
+            </ControlsColumn>
+            {visiblePanel === 'filters' && <LineageSearchFilters />}
+            {visiblePanel === 'timeRange' && <LineageTimeRangeControls />}
+        </StyledPanel>
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/controls/LineageSearchFilters.tsx b/datahub-web-react/src/app/lineageV2/controls/LineageSearchFilters.tsx
new file mode 100644
index 00000000000000..59d4a801a5147c
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/controls/LineageSearchFilters.tsx
@@ -0,0 +1,95 @@
+import { ANTD_GRAY } from '@app/entityV2/shared/constants';
+import { isTransformational, LineageNodesContext } from '@app/lineageV2/common';
+import { ControlPanel, ControlPanelSubtext, ControlPanelTitle } from '@app/lineageV2/controls/common';
+import InfoPopover from '@app/sharedV2/icons/InfoPopover';
+import { Switch } from 'antd';
+import { Tooltip } from '@components';
+import React, { useContext, useMemo } from 'react';
+import styled from 'styled-components';
+
+const ToggleWrapper = styled.div`
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    gap: 10px;
+`;
+
+const ToggleLabel = styled.span`
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    color: ${ANTD_GRAY[9]};
+`;
+
+const StyledInfoPopover = styled(InfoPopover)`
+    position: relative;
+    color: ${ANTD_GRAY[7]};
+`;
+
+const PopoverWrapper = styled.div`
+    max-width: 200px;
+`;
+
+const StyledSwitch = styled(Switch)``;
+
+export default function LineageSearchFilters() {
+    const {
+        nodes,
+        rootUrn,
+        nodeVersion,
+        hideTransformations,
+        setHideTransformations,
+        showGhostEntities,
+        setShowGhostEntities,
+    } = useContext(LineageNodesContext);
+
+    const hasTransformations = useMemo(
+        () => Array.from(nodes.values()).some((node) => node.urn !== rootUrn && isTransformational(node)), // eslint-disable-next-line react-hooks/exhaustive-deps
+        [nodes, nodeVersion],
+    );
+    return (
+        <ControlPanel>
+            <ControlPanelTitle>Filters</ControlPanelTitle>
+            <ControlPanelSubtext>Hide or show assets on the graph.</ControlPanelSubtext>
+            <ToggleWrapper>
+                <span>
+                    <ToggleLabel>
+                        Hide Transformations
+                        <StyledInfoPopover
+                            content={
+                                <PopoverWrapper>
+                                    Hide queries and transforms (circular nodes). Will not hide home node.
+                                </PopoverWrapper>
+                            }
+                        />
+                    </ToggleLabel>
+                </span>
+                <Tooltip title={hasTransformations ? undefined : 'No transformations to hide'}>
+                    <StyledSwitch
+                        disabled={!hasTransformations}
+                        size="small"
+                        checked={hideTransformations}
+                        onChange={setHideTransformations}
+                    />
+                </Tooltip>
+            </ToggleWrapper>
+            <ToggleWrapper>
+                <span>
+                    <ToggleLabel>
+                        Show Hidden Edges
+                        <StyledInfoPopover
+                            content={
+                                <PopoverWrapper>
+                                    Show assets that have been deleted or do not exist in DataHub
+                                </PopoverWrapper>
+                            }
+                        />
+                    </ToggleLabel>
+                </span>
+                <StyledSwitch size="small" checked={showGhostEntities} onChange={setShowGhostEntities} />
+            </ToggleWrapper>
+        </ControlPanel>
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/controls/LineageTimeRangeControls.tsx b/datahub-web-react/src/app/lineageV2/controls/LineageTimeRangeControls.tsx
new file mode 100644
index 00000000000000..81a0932a097256
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/controls/LineageTimeRangeControls.tsx
@@ -0,0 +1,15 @@
+import { ControlPanel, ControlPanelSubtext, ControlPanelTitle } from '@app/lineageV2/controls/common';
+import React from 'react';
+import LineageTabTimeSelector from '../../entityV2/shared/tabs/Lineage/LineageTabTimeSelector';
+
+const LineageTimeRangeControls = () => {
+    return (
+        <ControlPanel>
+            <ControlPanelTitle>Time Range</ControlPanelTitle>
+            <ControlPanelSubtext>Show lineage observed between start and end dates.</ControlPanelSubtext>
+            <LineageTabTimeSelector />
+        </ControlPanel>
+    );
+};
+
+export default LineageTimeRangeControls;
diff --git a/datahub-web-react/src/app/lineageV2/controls/SearchControl.tsx b/datahub-web-react/src/app/lineageV2/controls/SearchControl.tsx
new file mode 100644
index 00000000000000..5ce3d5b1ffe2e0
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/controls/SearchControl.tsx
@@ -0,0 +1,197 @@
+import { SearchOutlined } from '@ant-design/icons';
+import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants';
+import { LineageDisplayContext, LineageNodesContext } from '@app/lineageV2/common';
+import LineageVisualizationContext from '@app/lineageV2/LineageVisualizationContext';
+import { Button } from '@components';
+import { Input, InputRef } from 'antd';
+import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
+import { useDebounce } from 'react-use';
+import { Panel } from 'reactflow';
+import styled from 'styled-components';
+
+const StyledPanel = styled(Panel)`
+    margin-top: 20px;
+`;
+
+const StyledInput = styled(Input)<{ width: number }>`
+    min-width: 50px;
+    min-height: 50px;
+    width: ${({ width }) => width}px;
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    font-size: 14px;
+
+    border-color: ${ANTD_GRAY[5]} !important;
+    box-shadow: none !important;
+`;
+
+const ClosedSearchIcon = styled(SearchOutlined)`
+    margin-left: 5px;
+    font-size: 16px;
+`;
+
+const OpenSearchIcon = styled(SearchOutlined)`
+    color: ${REDESIGN_COLORS.PLACEHOLDER_PURPLE};
+`;
+
+const VerticalDivider = styled.hr<{ margin: number }>`
+    align-self: stretch;
+    height: auto;
+    margin: 0 ${({ margin }) => margin}px;
+    border: 0.5px solid ${ANTD_GRAY[5]};
+    vertical-align: text-top;
+`;
+
+export default function SearchControl() {
+    const { searchQuery, setSearchQuery, setSearchedEntity } = useContext(LineageVisualizationContext);
+    const [isFocused, setIsFocused] = useState(false);
+
+    const inputRef = useRef<InputRef>(null);
+    useCaptureKeyboardSearch(inputRef, setIsFocused);
+
+    const matchedNodes = useComputeMatchedNodes();
+    const searchIndex = useAssignSearchedEntity(matchedNodes);
+
+    const prev = useCallback(
+        () => setSearchedEntity(matchedNodes[(searchIndex - 1 + matchedNodes.length) % matchedNodes.length]),
+        [matchedNodes, searchIndex, setSearchedEntity],
+    );
+    const next = useCallback(
+        () => setSearchedEntity(matchedNodes[(searchIndex + 1) % matchedNodes.length]),
+        [matchedNodes, searchIndex, setSearchedEntity],
+    );
+
+    const isOpen = isFocused || !!searchQuery;
+    const close = useCallback(() => {
+        setSearchQuery('');
+        setIsFocused(false);
+        setTimeout(() => inputRef.current?.blur(), 0);
+    }, [setSearchQuery]);
+    useCaptureEscape(isOpen, close);
+
+    return (
+        <StyledPanel position="top-left">
+            <StyledInput
+                ref={inputRef}
+                value={searchQuery}
+                onChange={(e) => setSearchQuery(e.target.value)}
+                onPressEnter={(e) => {
+                    if (e.shiftKey) prev();
+                    else next();
+                }}
+                placeholder={isOpen ? 'Search Graph' : undefined}
+                width={isOpen ? 330 : 40}
+                prefix={isOpen ? <OpenSearchIcon /> : <ClosedSearchIcon />}
+                suffix={
+                    isOpen &&
+                    searchQuery && (
+                        <>
+                            <span>
+                                {matchedNodes.length ? searchIndex + 1 : 0} / {matchedNodes.length}
+                            </span>
+                            <VerticalDivider margin={8} />
+                            <Button icon="KeyboardArrowUp" variant="outline" size="sm" onClick={prev} />
+                            <Button icon="KeyboardArrowDown" variant="outline" size="sm" onClick={next} />
+                            <Button icon="Close" variant="outline" size="sm" onClick={close} />
+                        </>
+                    )
+                }
+                onBlur={() => setIsFocused(false)}
+                onFocus={() => setIsFocused(true)}
+            />
+        </StyledPanel>
+    );
+}
+
+function useComputeMatchedNodes() {
+    const { nodes } = useContext(LineageNodesContext);
+    const { shownUrns } = useContext(LineageDisplayContext);
+    const { searchQuery } = useContext(LineageVisualizationContext);
+
+    return useMemo(() => {
+        if (!searchQuery) return [];
+
+        return shownUrns.filter((urn) => {
+            const entity = nodes.get(urn)?.entity;
+            return (
+                entity?.name.toLowerCase()?.includes(searchQuery.toLowerCase()) ||
+                entity?.parent?.name?.toLowerCase().includes(searchQuery.toLowerCase())
+            );
+        });
+    }, [searchQuery, shownUrns, nodes]);
+}
+
+function useAssignSearchedEntity(matchedNodes: string[]) {
+    const { searchQuery, searchedEntity, setSearchedEntity } = useContext(LineageVisualizationContext);
+
+    const [searchIndex, newSearchedEntity] = useMemo(() => {
+        if (!searchedEntity) {
+            // No previously selected entity, default to first matched node
+            return [0, matchedNodes.length ? matchedNodes[0] : null];
+        }
+        const index = matchedNodes.indexOf(searchedEntity);
+        if (index === -1) {
+            // Previously selected entity no longer in search list, default to first matched node
+            return [0, matchedNodes[0]];
+        }
+        // Previously selected entity still in search list, keep it selected and recalculate index
+        return [index, searchedEntity];
+    }, [searchedEntity, matchedNodes]);
+
+    // Add debounce so graph doesn't jump around while user is typing
+    useDebounce(() => setSearchedEntity(newSearchedEntity), 300, [searchQuery]);
+
+    return searchIndex;
+}
+
+function useCaptureKeyboardSearch(inputRef: React.RefObject<InputRef>, setIsFocused: (value: boolean) => void) {
+    const { isFocused } = useContext(LineageVisualizationContext);
+
+    const handleKeyPress = useCallback(
+        (e: KeyboardEvent) => {
+            // Capture ctrl-f or cmd-f
+            if ((e.ctrlKey || e.metaKey) && e.key === 'f') {
+                e.preventDefault();
+                inputRef.current?.focus();
+                setIsFocused(true);
+            }
+        },
+        [inputRef, setIsFocused],
+    );
+
+    useEffect(() => {
+        if (isFocused) {
+            document.addEventListener('keydown', handleKeyPress);
+            return () => {
+                document.removeEventListener('keydown', handleKeyPress);
+            };
+        }
+        return () => {};
+    }, [handleKeyPress, isFocused]);
+}
+
+function useCaptureEscape(isOpen: boolean, close: () => void) {
+    const { isFocused } = useContext(LineageVisualizationContext);
+
+    const handleKeyPress = useCallback(
+        (e: KeyboardEvent) => {
+            if (e.key === 'Escape') {
+                close();
+            }
+        },
+        [close],
+    );
+
+    useEffect(() => {
+        if (isFocused && isOpen) {
+            document.addEventListener('keydown', handleKeyPress);
+            return () => {
+                document.removeEventListener('keydown', handleKeyPress);
+            };
+        }
+        return () => {};
+    }, [isOpen, handleKeyPress, isFocused]);
+}
diff --git a/datahub-web-react/src/app/lineageV2/controls/StyledPanelButton.tsx b/datahub-web-react/src/app/lineageV2/controls/StyledPanelButton.tsx
new file mode 100644
index 00000000000000..b5ebfa8dcd33e6
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/controls/StyledPanelButton.tsx
@@ -0,0 +1,14 @@
+import styled from 'styled-components';
+import { Button } from 'antd';
+
+export const StyledPanelButton = styled(Button)`
+    margin: 2px 0;
+    padding: 8px 13px;
+    display: flex;
+    align-items: center;
+    width: 100%;
+
+    .anticon {
+        margin-bottom: -2px;
+    }
+`;
diff --git a/datahub-web-react/src/app/lineageV2/controls/ZoomControls.tsx b/datahub-web-react/src/app/lineageV2/controls/ZoomControls.tsx
new file mode 100644
index 00000000000000..0b8b10e7dd6b59
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/controls/ZoomControls.tsx
@@ -0,0 +1,40 @@
+import { ZoomInOutlined, ZoomOutOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+import React from 'react';
+import { Panel, useReactFlow } from 'reactflow';
+import styled from 'styled-components';
+import { TRANSITION_DURATION_MS } from '../common';
+
+const StyledZoomButton = styled(Button)`
+    border-radius: 8px;
+    border: 1px solid #00000015;
+    box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, 0.02);
+    height: 40px;
+    width: 40px;
+    margin-bottom: 8px;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    display: flex;
+    &:focus {
+        color: unset;
+        border-color: #00000015;
+    }
+`;
+
+const ZoomControls: React.FC = () => {
+    const { zoomIn, zoomOut } = useReactFlow();
+
+    return (
+        <Panel position="bottom-left">
+            <StyledZoomButton tabIndex={-1} onClick={() => zoomIn({ duration: TRANSITION_DURATION_MS })}>
+                <ZoomInOutlined />
+            </StyledZoomButton>
+            <StyledZoomButton tabIndex={-1} onClick={() => zoomOut({ duration: TRANSITION_DURATION_MS })}>
+                <ZoomOutOutlined />
+            </StyledZoomButton>
+        </Panel>
+    );
+};
+
+export default ZoomControls;
diff --git a/datahub-web-react/src/app/lineageV2/controls/common.tsx b/datahub-web-react/src/app/lineageV2/controls/common.tsx
new file mode 100644
index 00000000000000..b035af935c7232
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/controls/common.tsx
@@ -0,0 +1,32 @@
+import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants';
+import styled from 'styled-components';
+
+export const ControlPanel = styled.div`
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+
+    background: #fff;
+    border-radius: 8px;
+    border: 1px solid ${ANTD_GRAY[5]};
+    box-shadow: 0 4px 4px 0 ${REDESIGN_COLORS.BOX_SHADOW};
+    padding: 16px;
+    gap: 2px;
+
+    height: fit-content;
+    max-width: 255px;
+    overflow: hidden;
+`;
+
+export const ControlPanelTitle = styled.div`
+    font-size: 14px;
+    font-weight: 700;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+`;
+
+export const ControlPanelSubtext = styled.div`
+    color: ${REDESIGN_COLORS.TEXT_GREY};
+    font-size: 10px;
+    font-weight: 500;
+    margin-bottom: 8px;
+`;
diff --git a/datahub-web-react/src/app/lineageV2/lineageUtils.ts b/datahub-web-react/src/app/lineageV2/lineageUtils.ts
new file mode 100644
index 00000000000000..9ea2d67efeb0c2
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/lineageUtils.ts
@@ -0,0 +1,111 @@
+import { useEntityRegistry } from '@app/useEntityRegistry';
+import { useLocation } from 'react-router-dom';
+import { EntityType, SchemaField } from '../../types.generated';
+import { KEY_SCHEMA_PREFIX, VERSION_PREFIX } from '../entity/dataset/profile/schema/utils/constants';
+import EntityRegistry from '../entityV2/EntityRegistry';
+import { getFieldPathFromSchemaFieldUrn } from '../entityV2/schemaField/utils';
+
+export function downgradeV2FieldPath(fieldPath: string): string;
+export function downgradeV2FieldPath(fieldPath?: string | null) {
+    if (!fieldPath) {
+        return fieldPath;
+    }
+
+    const cleanedFieldPath = fieldPath.replace(KEY_SCHEMA_PREFIX, '').replace(VERSION_PREFIX, '');
+
+    // strip out all annotation segments
+    return cleanedFieldPath
+        .split('.')
+        .map((segment) => (segment.startsWith('[') ? null : segment))
+        .filter(Boolean)
+        .join('.');
+}
+
+export function processDocumentationString(docString): string {
+    if (!docString) {
+        return '';
+    }
+    const fieldRegex = /'(\[version=2\.0\](?:\.\[key=True\])?\.\[type=[^\]]+\]\.[^']+)'/g;
+    return docString.replace(fieldRegex, (_, fieldPath) => `'${downgradeV2FieldPath(fieldPath)}'`);
+}
+
+export function convertFieldsToV1FieldPath(fields: SchemaField[]) {
+    return fields.map((field) => ({
+        ...field,
+        fieldPath: downgradeV2FieldPath(field.fieldPath) || '',
+    }));
+}
+
+export function getV1FieldPathFromSchemaFieldUrn(schemaFieldUrn: string) {
+    return downgradeV2FieldPath(getFieldPathFromSchemaFieldUrn(schemaFieldUrn)) as string;
+}
+
+export function getEntityTypeFromEntityUrn(urn: string, registry: EntityRegistry): EntityType | undefined {
+    const [, , entityType] = urn.split(':');
+    return registry.getTypeFromGraphName(entityType);
+}
+
+const PLATFORM_URN_TYPES = ['dataset', 'mlModel', 'mlModelGroup', 'mlFeatureTable'];
+const TRUNCATED_PLATFORM_TYPES = ['dataFlow', 'dataJob', 'chart', 'dashboard'];
+const NESTED_URN_TYPES = ['schemaField'];
+
+// TODO: Add tests
+export function getPlatformUrnFromEntityUrn(urn: string): string | undefined {
+    const [, , entityType, ...entityIdsStr] = urn.split(':');
+    const entityIds = splitEntityId(entityIdsStr.join(':'));
+    if (PLATFORM_URN_TYPES.includes(entityType)) {
+        return entityIds[0];
+    }
+    if (TRUNCATED_PLATFORM_TYPES.includes(entityType)) {
+        return `urn:li:dataPlatform:${entityIds[0]}`;
+    }
+    if (NESTED_URN_TYPES.includes(entityType)) {
+        return getPlatformUrnFromEntityUrn(entityIds[0]);
+    }
+    return undefined;
+}
+
+/** Mimics metadata-ingestion function in _urn_base.py */
+function splitEntityId(entity_id: string): string[] {
+    if (!(entity_id.startsWith('(') && entity_id.endsWith(')'))) {
+        return [entity_id];
+    }
+    const parts: string[] = [];
+    let startParentCount = 1;
+    let partStart = 1;
+    for (let i = 1; i < entity_id.length; i++) {
+        const c = entity_id[i];
+        if (c === '(') {
+            startParentCount += 1;
+        } else if (c === ')') {
+            startParentCount -= 1;
+            if (startParentCount < 0) {
+                throw new Error(`${entity_id}, mismatched paren nesting`);
+            }
+        } else if (c === ',' && startParentCount === 1) {
+            if (i - partStart <= 0) {
+                throw new Error(`${entity_id}, empty part disallowed`);
+            }
+            parts.push(entity_id.slice(partStart, i));
+            partStart = i + 1;
+        }
+    }
+
+    if (startParentCount !== 0) {
+        throw new Error(`${entity_id}, mismatched paren nesting`);
+    }
+
+    parts.push(entity_id.slice(partStart, -1));
+
+    return parts;
+}
+
+export function useGetLineageUrl(urn?: string, type?: EntityType) {
+    const location = useLocation();
+    const entityRegistry = useEntityRegistry();
+
+    if (!urn || !type) {
+        return '';
+    }
+    return `${entityRegistry.getEntityUrl(type, urn)}/Lineage${location.search}`;
+}
diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/AddEntityEdge.tsx b/datahub-web-react/src/app/lineageV2/manualLineage/AddEntityEdge.tsx
new file mode 100644
index 00000000000000..790fb12e3aa613
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/manualLineage/AddEntityEdge.tsx
@@ -0,0 +1,157 @@
+import React, { useState } from 'react';
+import { useDebounce } from 'react-use';
+import styled from 'styled-components/macro';
+import { AutoComplete, Empty } from 'antd';
+import { LoadingOutlined, SubnodeOutlined } from '@ant-design/icons';
+import { toTitleCase } from '../../../graphql-mock/helper';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { useGetAutoCompleteMultipleResultsLazyQuery } from '../../../graphql/search.generated';
+import { Entity, EntityType, LineageDirection } from '../../../types.generated';
+import LineageEntityView from './LineageEntityView';
+import EntityRegistry from '../../entity/EntityRegistry';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import { getValidEntityTypes } from './utils';
+
+const DEBOUNCE_WAIT_MS = 200;
+
+const AddEdgeWrapper = styled.div`
+    padding: 15px 20px;
+    display: flex;
+    align-items: center;
+`;
+
+const AddLabel = styled.span`
+    font-size: 12px;
+    font-weight: bold;
+    display: flex;
+    align-items: center;
+    white-space: nowrap;
+`;
+
+const AddIcon = styled(SubnodeOutlined)`
+    margin-right: 5px;
+    font-size: 16px;
+`;
+
+const StyledAutoComplete = styled(AutoComplete<string>)`
+    margin-left: 10px;
+    flex: 1;
+`;
+
+const LoadingWrapper = styled.div`
+    padding: 8px;
+    display: flex;
+    justify-content: center;
+
+    svg {
+        height: 15px;
+        width: 15px;
+        color: ${ANTD_GRAY[8]};
+    }
+`;
+
+interface Props {
+    direction: LineageDirection;
+    setEntitiesToAdd: React.Dispatch<React.SetStateAction<Entity[]>>;
+    entitiesToAdd: Entity[];
+    entityUrn: string;
+    entityType?: EntityType;
+}
+
+export default function AddEntityEdge({ direction, setEntitiesToAdd, entitiesToAdd, entityUrn, entityType }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const [getAutoCompleteResults, { data: autoCompleteResults, loading }] =
+        useGetAutoCompleteMultipleResultsLazyQuery();
+    const [queryText, setQueryText] = useState<string>('');
+
+    const validEntityTypes = getValidEntityTypes(direction, entityType);
+
+    useDebounce(
+        () => {
+            if (queryText.trim()) {
+                getAutoCompleteResults({
+                    variables: {
+                        input: {
+                            types: validEntityTypes,
+                            query: queryText,
+                            limit: 15,
+                        },
+                    },
+                });
+            }
+        },
+        DEBOUNCE_WAIT_MS,
+        [queryText],
+    );
+
+    const selectEntity = (urn: string) => {
+        const resultEntities = autoCompleteResults?.autoCompleteForMultiple?.suggestions.flatMap(
+            (suggestion) => suggestion.entities || [],
+        );
+        const selectedEntity = resultEntities?.find((entity) => entity.urn === urn);
+        if (selectedEntity) {
+            setEntitiesToAdd((existingEntities) => [...existingEntities, selectedEntity]);
+        }
+    };
+
+    const renderSearchResult = (entity: Entity) => (
+        <AutoComplete.Option value={entity.urn} key={entity.urn}>
+            <LineageEntityView entity={entity} displaySearchResult />
+        </AutoComplete.Option>
+    );
+
+    const searchResults = autoCompleteResults?.autoCompleteForMultiple?.suggestions
+        .flatMap((suggestion) => suggestion.entities || [])
+        .filter((entity) => entity && !existsInEntitiesToAdd(entity, entitiesToAdd) && entity.urn !== entityUrn)
+        .map((entity) => renderSearchResult(entity));
+
+    const placeholderText = getPlaceholderText(validEntityTypes, entityRegistry);
+
+    return (
+        <AddEdgeWrapper>
+            <AddLabel>
+                <AddIcon />
+                Add {toTitleCase(direction.toLocaleLowerCase())}
+            </AddLabel>
+            <StyledAutoComplete
+                autoFocus
+                showSearch
+                placeholder={placeholderText}
+                value={queryText}
+                onSearch={(value) => setQueryText(value)}
+                onSelect={(urn: string) => selectEntity(urn)}
+                filterOption={false}
+                notFoundContent={queryText.length > 3 && <Empty description="No Assets Found" />}
+            >
+                {loading && (
+                    <AutoComplete.Option value="loading">
+                        <LoadingWrapper>
+                            <LoadingOutlined />
+                        </LoadingWrapper>
+                    </AutoComplete.Option>
+                )}
+                {!!queryText && searchResults}
+            </StyledAutoComplete>
+        </AddEdgeWrapper>
+    );
+}
+
+function existsInEntitiesToAdd(result: Entity, entitiesAlreadyAdded: Entity[]) {
+    return !!entitiesAlreadyAdded.find((entity) => entity.urn === result.urn);
+}
+
+function getPlaceholderText(validEntityTypes: EntityType[], entityRegistry: EntityRegistry) {
+    let placeholderText = 'Search for ';
+    if (!validEntityTypes.length) {
+        placeholderText = `${placeholderText} entities to add...`;
+    } else if (validEntityTypes.length === 1) {
+        placeholderText = `${placeholderText} ${entityRegistry.getCollectionName(validEntityTypes[0])}...`;
+    } else {
+        validEntityTypes.forEach((type, index) => {
+            placeholderText = `${placeholderText} ${entityRegistry.getCollectionName(type)}${
+                index !== validEntityTypes.length - 1 ? ', ' : '...'
+            }`;
+        });
+    }
+    return placeholderText;
+}
diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/EntityEdge.tsx b/datahub-web-react/src/app/lineageV2/manualLineage/EntityEdge.tsx
new file mode 100644
index 00000000000000..cad48bd9b99842
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/manualLineage/EntityEdge.tsx
@@ -0,0 +1,65 @@
+import { CloseOutlined } from '@ant-design/icons';
+import Text from 'antd/lib/typography/Text';
+import React from 'react';
+import styled from 'styled-components/macro';
+import { CorpUser, Entity } from '../../../types.generated';
+import { ANTD_GRAY, DEFAULT_SYSTEM_ACTOR_URNS } from '../../entity/shared/constants';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import UserAvatar from './UserAvatar';
+
+const EntityItem = styled.div`
+    border-bottom: 1px solid ${ANTD_GRAY[4]};
+    display: flex;
+    align-items: center;
+    padding: 12px 0;
+    justify-content: space-between;
+`;
+const PlatformLogo = styled.img`
+    height: 16px;
+    margin-right: 8px;
+`;
+
+const NameAndLogoWrapper = styled.span`
+    display: flex;
+    align-items: center;
+    max-width: 85%;
+`;
+
+const StyledClose = styled(CloseOutlined)`
+    cursor: pointer;
+`;
+
+const EntityName = styled(Text)`
+    font-size: 14px;
+    font-weight: bold;
+`;
+
+interface Props {
+    entity: Entity;
+    removeEntity: (removedEntity: Entity) => void;
+    createdOn?: number;
+    createdActor?: CorpUser;
+}
+
+export default function EntityEdge({ entity, removeEntity, createdOn, createdActor }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const genericProps = entityRegistry.getGenericEntityProperties(entity.type, entity);
+    const platformLogoUrl = genericProps?.platform?.properties?.logoUrl;
+    const shouldDisplayAvatar =
+        createdActor && !DEFAULT_SYSTEM_ACTOR_URNS.includes(createdActor.urn) && createdActor.properties !== null;
+
+    return (
+        <EntityItem data-testid="lineage-entity-item">
+            <NameAndLogoWrapper>
+                {platformLogoUrl && <PlatformLogo src={platformLogoUrl} alt="platform logo" />}{' '}
+                <EntityName ellipsis={{ tooltip: entityRegistry.getDisplayName(entity.type, entity) }}>
+                    {entityRegistry.getDisplayName(entity.type, entity)}
+                </EntityName>
+            </NameAndLogoWrapper>
+            <span>
+                {shouldDisplayAvatar && <UserAvatar createdActor={createdActor} createdOn={createdOn} />}
+                <StyledClose onClick={() => removeEntity(entity)} />
+            </span>
+        </EntityItem>
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/LineageEdges.tsx b/datahub-web-react/src/app/lineageV2/manualLineage/LineageEdges.tsx
new file mode 100644
index 00000000000000..29f910d41718e7
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/manualLineage/LineageEdges.tsx
@@ -0,0 +1,86 @@
+import { Empty } from 'antd';
+import React, { useContext, useMemo } from 'react';
+import styled from 'styled-components/macro';
+import { CorpUser, Entity, LineageDirection } from '../../../types.generated';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import { getEdgeId, LineageNodesContext, setDifference } from '../common';
+import EntityEdge from './EntityEdge';
+
+const LineageEdgesWrapper = styled.div`
+    height: 225px;
+    overflow: auto;
+    padding: 0 20px 10px 20px;
+`;
+
+const EmptyWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    background-color: ${ANTD_GRAY[3]};
+`;
+
+interface Props {
+    parentUrn: string;
+    direction: LineageDirection;
+    entitiesToAdd: Entity[];
+    entitiesToRemove: Entity[];
+    setEntitiesToAdd: React.Dispatch<React.SetStateAction<Entity[]>>;
+    setEntitiesToRemove: React.Dispatch<React.SetStateAction<Entity[]>>;
+}
+
+export default function LineageEdges({
+    parentUrn,
+    direction,
+    entitiesToAdd,
+    entitiesToRemove,
+    setEntitiesToAdd,
+    setEntitiesToRemove,
+}: Props) {
+    const { nodes, edges, adjacencyList } = useContext(LineageNodesContext);
+
+    const children = adjacencyList[direction].get(parentUrn) || new Set();
+    const urnsToRemove = useMemo(
+        () => new Set(entitiesToRemove.map((entityToRemove) => entityToRemove.urn)),
+        [entitiesToRemove],
+    );
+    const filteredChildren = setDifference(children, urnsToRemove);
+
+    function removeEntity(removedEntity: Entity) {
+        if (children.has(removedEntity.urn)) {
+            setEntitiesToRemove((existingEntitiesToRemove) => [...existingEntitiesToRemove, removedEntity]);
+        } else {
+            setEntitiesToAdd((existingEntitiesToAdd) =>
+                existingEntitiesToAdd.filter((addedEntity) => addedEntity.urn !== removedEntity.urn),
+            );
+        }
+    }
+
+    return (
+        <LineageEdgesWrapper>
+            {!filteredChildren?.length && !entitiesToAdd.length && (
+                <EmptyWrapper data-testid="empty-lineage">
+                    <Empty description={`No ${direction.toLocaleLowerCase()} entities`} />
+                </EmptyWrapper>
+            )}
+            {filteredChildren?.map((childUrn) => {
+                const edge = edges.get(getEdgeId(parentUrn, childUrn, direction));
+                const childNode = nodes.get(childUrn);
+                if (!childNode) return null;
+                const backupEntity = { urn: childUrn, type: childNode.type };
+                return (
+                    <EntityEdge
+                        key={childUrn}
+                        entity={childNode.rawEntity || backupEntity}
+                        removeEntity={removeEntity}
+                        createdOn={edge?.created?.timestamp}
+                        createdActor={edge?.created?.actor as CorpUser | undefined}
+                    />
+                );
+            })}
+            {entitiesToAdd.map((addedEntity) => (
+                <EntityEdge key={addedEntity.urn} entity={addedEntity} removeEntity={removeEntity} />
+            ))}
+        </LineageEdgesWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/LineageEntityView.tsx b/datahub-web-react/src/app/lineageV2/manualLineage/LineageEntityView.tsx
new file mode 100644
index 00000000000000..f0e8a91ccaf874
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/manualLineage/LineageEntityView.tsx
@@ -0,0 +1,67 @@
+import { Divider } from 'antd';
+import React from 'react';
+import styled from 'styled-components/macro';
+import { Entity } from '../../../types.generated';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import { getPlatformName } from '../../entity/shared/utils';
+import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
+import { useEntityRegistry } from '../../useEntityRegistry';
+
+const EntityWrapper = styled.div<{ shrinkPadding?: boolean }>`
+    border-bottom: 1px solid ${ANTD_GRAY[4]};
+    padding: ${(props) => (props.shrinkPadding ? '4px 6px' : '12px 20px')};
+`;
+
+const PlatformContent = styled.div<{ removeMargin?: boolean }>`
+    display: flex;
+    align-items: center;
+    font-size: 10px;
+    color: ${ANTD_GRAY[7]};
+    margin-bottom: ${(props) => (props.removeMargin ? '0' : '5px')};
+`;
+
+const StyledDivider = styled(Divider)`
+    margin: 0 5px;
+`;
+
+const PlatformLogo = styled.img`
+    height: 14px;
+    margin-right: 5px;
+`;
+
+export const EntityName = styled.span<{ shrinkSize?: boolean }>`
+    font-size: ${(props) => (props.shrinkSize ? '12px' : '14px')};
+    font-weight: bold;
+`;
+
+interface Props {
+    entity: Entity;
+    displaySearchResult?: boolean;
+}
+
+export default function LineageEntityView({ entity, displaySearchResult }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const genericProps = entityRegistry.getGenericEntityProperties(entity.type, entity);
+
+    const platformLogoUrl = genericProps?.platform?.properties?.logoUrl;
+    const platformName = getPlatformName(genericProps);
+
+    return (
+        <EntityWrapper shrinkPadding={displaySearchResult}>
+            <PlatformContent removeMargin={displaySearchResult}>
+                {platformLogoUrl && (
+                    <PlatformLogo src={platformLogoUrl} alt="platform logo" data-testid="platform-logo" />
+                )}
+                <span>{platformName}</span>
+                {platformName && <StyledDivider type="vertical" data-testid="divider" />}
+                <span>
+                    {capitalizeFirstLetterOnly(genericProps?.subTypes?.typeNames?.[0]) ||
+                        entityRegistry.getEntityName(entity.type)}
+                </span>
+            </PlatformContent>
+            <EntityName shrinkSize={displaySearchResult}>
+                {entityRegistry.getDisplayName(entity.type, entity)}
+            </EntityName>
+        </EntityWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/ManageLineageModal.tsx b/datahub-web-react/src/app/lineageV2/manualLineage/ManageLineageModal.tsx
new file mode 100644
index 00000000000000..9f70de2b6f675e
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/manualLineage/ManageLineageModal.tsx
@@ -0,0 +1,204 @@
+import { LoadingOutlined } from '@ant-design/icons';
+import React, { useContext, useEffect, useState } from 'react';
+import { Button, message, Modal } from 'antd';
+import styled from 'styled-components/macro';
+import { toTitleCase } from '../../../graphql-mock/helper';
+import { EventType } from '../../analytics';
+import analytics from '../../analytics/analytics';
+import { useUserContext } from '../../context/useUserContext';
+import EntityRegistry from '../../entity/EntityRegistry';
+import { Direction } from '../../lineage/types';
+import { FetchStatus, LineageEntity, LineageNodesContext } from '../common';
+import AddEntityEdge from './AddEntityEdge';
+import LineageEntityView from './LineageEntityView';
+import LineageEdges from './LineageEdges';
+import { Entity, EntityType, LineageDirection, LineageEdge } from '../../../types.generated';
+import { useUpdateLineageMutation } from '../../../graphql/mutations.generated';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import updateNodeContext from './updateNodeContext';
+import { useOnClickExpandLineage } from '../LineageEntityNode/useOnClickExpandLineage';
+
+const ModalFooter = styled.div`
+    display: flex;
+    justify-content: space-between;
+`;
+
+const TitleText = styled.div`
+    font-weight: bold;
+`;
+
+const StyledModal = styled(Modal)`
+    .ant-modal-body {
+        padding: 0;
+    }
+`;
+
+const LoadingWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 225px;
+    font-size: 30px;
+`;
+
+interface Props {
+    node: LineageEntity;
+    direction: LineageDirection;
+    closeModal: () => void;
+    refetch?: () => void;
+}
+
+export default function ManageLineageModal({ node, direction, closeModal, refetch }: Props) {
+    const nodeContext = useContext(LineageNodesContext);
+    const expandOneLevel = useOnClickExpandLineage(node.urn, node.type, direction, false);
+    const { user } = useUserContext();
+    const entityRegistry = useEntityRegistry();
+    const [entitiesToAdd, setEntitiesToAdd] = useState<Entity[]>([]);
+    const [entitiesToRemove, setEntitiesToRemove] = useState<Entity[]>([]);
+    const [updateLineage] = useUpdateLineageMutation();
+    const fetchStatus = node.fetchStatus[direction];
+    const loading = node.fetchStatus[direction] === FetchStatus.LOADING;
+
+    useEffect(() => {
+        if (fetchStatus === FetchStatus.UNFETCHED) {
+            expandOneLevel();
+        }
+    }, [fetchStatus, expandOneLevel]);
+
+    function saveLineageChanges() {
+        const payload = buildUpdateLineagePayload(direction, entitiesToAdd, entitiesToRemove, node.urn);
+        updateLineage({ variables: { input: payload } })
+            .then((res) => {
+                if (res.data?.updateLineage) {
+                    closeModal();
+                    message.success('Updated lineage, refetching graph!');
+                    updateNodeContext(node.urn, direction, user, nodeContext, entitiesToAdd, entitiesToRemove);
+                    refetch?.();
+
+                    recordAnalyticsEvents({
+                        direction,
+                        entitiesToAdd,
+                        entitiesToRemove,
+                        entityRegistry,
+                        entityType: node.type,
+                        entityPlatform: entityRegistry.getDisplayName(EntityType.DataPlatform, node.entity?.platform),
+                    });
+                }
+            })
+            .catch((e) => {
+                message.error('Error updating lineage');
+                console.warn(e);
+            });
+    }
+
+    const isSaveDisabled = !entitiesToAdd.length && !entitiesToRemove.length;
+
+    return (
+        <StyledModal
+            title={<TitleText>Manage {toTitleCase(direction.toLocaleLowerCase())} Lineage</TitleText>}
+            onCancel={closeModal}
+            keyboard
+            open
+            footer={
+                <ModalFooter>
+                    <Button onClick={closeModal} type="text">
+                        Cancel
+                    </Button>
+                    <Button onClick={saveLineageChanges} disabled={isSaveDisabled}>
+                        Save Changes
+                    </Button>
+                </ModalFooter>
+            }
+        >
+            {node.entity && <LineageEntityView entity={node.entity} />}
+            <AddEntityEdge
+                direction={direction}
+                setEntitiesToAdd={setEntitiesToAdd}
+                entitiesToAdd={entitiesToAdd}
+                entityUrn={node.urn}
+                entityType={node.type}
+            />
+            {!loading && (
+                <LineageEdges
+                    parentUrn={node.urn}
+                    direction={direction}
+                    entitiesToAdd={entitiesToAdd}
+                    entitiesToRemove={entitiesToRemove}
+                    setEntitiesToAdd={setEntitiesToAdd}
+                    setEntitiesToRemove={setEntitiesToRemove}
+                />
+            )}
+            {loading && (
+                <LoadingWrapper>
+                    <LoadingOutlined />
+                </LoadingWrapper>
+            )}
+        </StyledModal>
+    );
+}
+
+interface AnalyticsEventsProps {
+    direction: LineageDirection;
+    entitiesToAdd: Entity[];
+    entitiesToRemove: Entity[];
+    entityRegistry: EntityRegistry;
+    entityType?: EntityType;
+    entityPlatform?: string;
+}
+
+function recordAnalyticsEvents({
+    direction,
+    entitiesToAdd,
+    entitiesToRemove,
+    entityRegistry,
+    entityType,
+    entityPlatform,
+}: AnalyticsEventsProps) {
+    entitiesToAdd.forEach((entityToAdd) => {
+        const genericProps = entityRegistry.getGenericEntityProperties(entityToAdd.type, entityToAdd);
+        analytics.event({
+            type: EventType.ManuallyCreateLineageEvent,
+            direction: directionFromLineageDirection(direction),
+            sourceEntityType: entityType,
+            sourceEntityPlatform: entityPlatform,
+            destinationEntityType: entityToAdd.type,
+            destinationEntityPlatform: genericProps?.platform?.name,
+        });
+    });
+    entitiesToRemove.forEach((entityToRemove) => {
+        const genericProps = entityRegistry.getGenericEntityProperties(entityToRemove.type, entityToRemove);
+        analytics.event({
+            type: EventType.ManuallyDeleteLineageEvent,
+            direction: directionFromLineageDirection(direction),
+            sourceEntityType: entityType,
+            sourceEntityPlatform: entityPlatform,
+            destinationEntityType: entityToRemove.type,
+            destinationEntityPlatform: genericProps?.platform?.name,
+        });
+    });
+}
+
+function buildUpdateLineagePayload(
+    lineageDirection: LineageDirection,
+    entitiesToAdd: Entity[],
+    entitiesToRemove: Entity[],
+    entityUrn: string,
+) {
+    let edgesToAdd: LineageEdge[] = [];
+    let edgesToRemove: LineageEdge[] = [];
+
+    if (lineageDirection === LineageDirection.Upstream) {
+        edgesToAdd = entitiesToAdd.map((entity) => ({ upstreamUrn: entity.urn, downstreamUrn: entityUrn }));
+        edgesToRemove = entitiesToRemove.map((entity) => ({ upstreamUrn: entity.urn, downstreamUrn: entityUrn }));
+    }
+    if (lineageDirection === LineageDirection.Downstream) {
+        edgesToAdd = entitiesToAdd.map((entity) => ({ upstreamUrn: entityUrn, downstreamUrn: entity.urn }));
+        edgesToRemove = entitiesToRemove.map((entity) => ({ upstreamUrn: entityUrn, downstreamUrn: entity.urn }));
+    }
+
+    return { edgesToAdd, edgesToRemove };
+}
+
+function directionFromLineageDirection(lineageDirection: LineageDirection): Direction {
+    return lineageDirection === LineageDirection.Upstream ? Direction.Upstream : Direction.Downstream;
+}
diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/UserAvatar.tsx b/datahub-web-react/src/app/lineageV2/manualLineage/UserAvatar.tsx
new file mode 100644
index 00000000000000..290f2f9b72b263
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/manualLineage/UserAvatar.tsx
@@ -0,0 +1,62 @@
+import { PartitionOutlined } from '@ant-design/icons';
+import { Avatar } from 'antd';
+import { Popover } from '@components';
+import React from 'react';
+import styled from 'styled-components/macro';
+import { CorpUser, EntityType } from '../../../types.generated';
+import getAvatarColor from '../../shared/avatar/getAvatarColor';
+import { toLocalDateTimeString } from '../../shared/time/timeUtils';
+import { useEntityRegistry } from '../../useEntityRegistry';
+
+const StyledAvatar = styled(Avatar)<{ $backgroundColor: string }>`
+    color: #fff;
+    background-color: ${(props) => props.$backgroundColor};
+    margin-right: 20px;
+    height: 22px;
+    width: 22px;
+
+    .ant-avatar-string {
+        text-align: center;
+        line-height: 22px;
+    }
+`;
+
+const LineageIcon = styled(PartitionOutlined)`
+    font-size: 16px;
+    margin-right: 4px;
+`;
+
+const PopoverWrapper = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+interface Props {
+    createdActor?: CorpUser | null;
+    createdOn?: number | null;
+}
+
+export default function UserAvatar({ createdActor, createdOn }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const avatarPhotoUrl = createdActor?.editableProperties?.pictureLink;
+    const userName = entityRegistry.getDisplayName(EntityType.CorpUser, createdActor);
+
+    return (
+        <Popover
+            content={
+                <PopoverWrapper>
+                    <LineageIcon /> Relationship added by&nbsp;<strong>{userName}</strong>&nbsp;
+                    {createdOn && (
+                        <>
+                            on <strong>{toLocalDateTimeString(createdOn)}</strong>
+                        </>
+                    )}
+                </PopoverWrapper>
+            }
+        >
+            <StyledAvatar src={avatarPhotoUrl} $backgroundColor={getAvatarColor(userName)}>
+                {userName.charAt(0).toUpperCase()}
+            </StyledAvatar>
+        </Popover>
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/_test_/utils.test.ts b/datahub-web-react/src/app/lineageV2/manualLineage/_test_/utils.test.ts
new file mode 100644
index 00000000000000..21b0a876d028f3
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/manualLineage/_test_/utils.test.ts
@@ -0,0 +1,58 @@
+import { EntityType, LineageDirection } from '../../../../types.generated';
+import { getValidEntityTypes } from '../utils';
+
+describe('getValidEntityTypes', () => {
+    describe('For Downstream', () => {
+        it('should return DASHBOARD if Chart Entity type is passed', () => {
+            const result = getValidEntityTypes(LineageDirection.Downstream, EntityType.Chart);
+            expect(result).toStrictEqual(['DASHBOARD']);
+        });
+
+        it('should return DATASET,CHART,DASHBOARD, DATA_JOB if Dataset Entity type is passed', () => {
+            const result = getValidEntityTypes(LineageDirection.Downstream, EntityType.Dataset);
+            expect(result).toStrictEqual(['DATASET', 'CHART', 'DASHBOARD', 'DATA_JOB']);
+        });
+
+        it('should return DATASET, DATA_JOB if DataJob Entity type is passed', () => {
+            const result = getValidEntityTypes(LineageDirection.Downstream, EntityType.DataJob);
+            expect(result).toStrictEqual(['DATA_JOB', 'DATASET']);
+        });
+
+        it('should return empty Array if DataJob Entity type is passed', () => {
+            const result = getValidEntityTypes(LineageDirection.Downstream, EntityType.Dashboard);
+            expect(result).toStrictEqual([]);
+        });
+
+        it('should return empty Array if empty Entity type is passed', () => {
+            const result = getValidEntityTypes(LineageDirection.Downstream);
+            expect(result).toStrictEqual([]);
+        });
+    });
+
+    describe('For UpStream', () => {
+        it('should return DATASET if Chart Entity type is passed', () => {
+            const result = getValidEntityTypes(LineageDirection.Upstream, EntityType.Chart);
+            expect(result).toStrictEqual(['DATASET']);
+        });
+
+        it('should return DATASET and DATA_JOB if Dataset Entity type is passed', () => {
+            const result = getValidEntityTypes(LineageDirection.Upstream, EntityType.Dataset);
+            expect(result).toStrictEqual(['DATASET', 'DATA_JOB']);
+        });
+
+        it('should return DATASET and DATA_JOB if DataJob Entity type is passed', () => {
+            const result = getValidEntityTypes(LineageDirection.Upstream, EntityType.DataJob);
+            expect(result).toStrictEqual(['DATA_JOB', 'DATASET']);
+        });
+
+        it('should return CHART and DATASET Array if DataJob Entity type is passed', () => {
+            const result = getValidEntityTypes(LineageDirection.Upstream, EntityType.Dashboard);
+            expect(result).toStrictEqual(['CHART', 'DATASET']);
+        });
+
+        it('should return empty Array if empty Entity type is passed', () => {
+            const result = getValidEntityTypes(LineageDirection.Upstream);
+            expect(result).toStrictEqual([]);
+        });
+    });
+});
diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/updateNodeContext.ts b/datahub-web-react/src/app/lineageV2/manualLineage/updateNodeContext.ts
new file mode 100644
index 00000000000000..ee2f47eee281cf
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/manualLineage/updateNodeContext.ts
@@ -0,0 +1,52 @@
+import { CorpUser, Entity, LineageDirection } from '../../../types.generated';
+import {
+    addToAdjacencyList,
+    FetchStatus,
+    getEdgeId,
+    isTransformational,
+    NodeContext,
+    removeFromAdjacencyList,
+    setDefault,
+} from '../common';
+import { entityNodeDefault } from '../useSearchAcrossLineage';
+
+export default function updateNodeContext(
+    urn: string,
+    direction: LineageDirection,
+    user: CorpUser | null | undefined,
+    context: NodeContext,
+    entitiesToAdd: Entity[],
+    entitiesToRemove: Entity[],
+) {
+    const { nodes, edges, adjacencyList, setNodeVersion } = context;
+
+    const node = nodes.get(urn);
+    if (node) {
+        node.fetchStatus = { ...node.fetchStatus, [direction]: FetchStatus.LOADING };
+    }
+
+    entitiesToRemove.forEach((entity) => {
+        removeFromAdjacencyList(adjacencyList, direction, urn, entity.urn);
+        edges.delete(getEdgeId(urn, entity.urn, direction));
+    });
+    setNodeVersion((v) => v + 1);
+
+    // TODO: Remove separate section when bulk entity lineage is broken up into edges vs data
+    setTimeout(() => {
+        entitiesToAdd.forEach((entity) => {
+            const n = setDefault(nodes, entity.urn, entityNodeDefault(entity.urn, entity.type, direction));
+            if (isTransformational(entity)) n.fetchStatus[direction] = FetchStatus.LOADING;
+            addToAdjacencyList(adjacencyList, direction, urn, entity.urn);
+            edges.set(getEdgeId(urn, entity.urn, direction), {
+                isManual: true,
+                isDisplayed: true,
+                created: { timestamp: Date.now(), actor: user ?? undefined },
+                updated: { timestamp: Date.now(), actor: user ?? undefined },
+            });
+        });
+        if (node) {
+            node.fetchStatus = { ...node.fetchStatus, [direction]: FetchStatus.COMPLETE };
+        }
+        setNodeVersion((v) => v + 1);
+    }, 5000);
+}
diff --git a/datahub-web-react/src/app/lineageV2/manualLineage/utils.ts b/datahub-web-react/src/app/lineageV2/manualLineage/utils.ts
new file mode 100644
index 00000000000000..798df101723f9d
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/manualLineage/utils.ts
@@ -0,0 +1,34 @@
+import { EntityType, LineageDirection } from '../../../types.generated';
+
+export function getValidEntityTypes(lineageDirection: LineageDirection, entityType?: EntityType) {
+    if (lineageDirection === LineageDirection.Upstream) {
+        switch (entityType) {
+            case EntityType.Dataset:
+                return [EntityType.Dataset, EntityType.DataJob];
+            case EntityType.Chart:
+                return [EntityType.Dataset];
+            case EntityType.Dashboard:
+                return [EntityType.Chart, EntityType.Dataset];
+            case EntityType.DataJob:
+                return [EntityType.DataJob, EntityType.Dataset];
+            default:
+                console.warn('Unexpected entity type to get valid upstream entity types for');
+                return [];
+        }
+    } else {
+        switch (entityType) {
+            case EntityType.Dataset:
+                return [EntityType.Dataset, EntityType.Chart, EntityType.Dashboard, EntityType.DataJob];
+            case EntityType.Chart:
+                return [EntityType.Dashboard];
+            case EntityType.Dashboard:
+                console.warn('There are no valid lineage entities downstream of Dashboard entities');
+                return [];
+            case EntityType.DataJob:
+                return [EntityType.DataJob, EntityType.Dataset];
+            default:
+                console.warn('Unexpected entity type to get valid downstream entity types for');
+                return [];
+        }
+    }
+}
diff --git a/datahub-web-react/src/app/lineageV2/types.ts b/datahub-web-react/src/app/lineageV2/types.ts
new file mode 100644
index 00000000000000..4a2d41bb4b8020
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/types.ts
@@ -0,0 +1,76 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import {
+    DataPlatform,
+    Deprecation,
+    EntityType,
+    FineGrainedLineage,
+    Health,
+    InputFields,
+    LineageRelationship,
+    SchemaFieldDataType,
+    SchemaMetadata,
+    Status,
+    StructuredProperties,
+} from '@types';
+
+export enum LineageAssetType {
+    Column,
+    Entity,
+    DataProduct,
+}
+
+interface LineageAssetBase {
+    name: string;
+    numUpstream?: number;
+    numDownstream?: number;
+    lineageCountsFetched?: boolean;
+}
+
+export interface ColumnAsset extends LineageAssetBase {
+    type: LineageAssetType.Column;
+    dataType?: SchemaFieldDataType;
+    nativeDataType?: string | null;
+}
+
+export interface EntityAsset extends LineageAssetBase {
+    type: LineageAssetType.Entity;
+    entityType: EntityType;
+}
+
+export interface DataProductAsset extends LineageAssetBase {
+    type: LineageAssetType.DataProduct;
+    size?: number;
+}
+
+export type LineageAsset = ColumnAsset | EntityAsset | DataProductAsset;
+
+export type FetchedEntityV2Relationship = LineageRelationship & { urn: string }; // Destination urn
+
+export interface FetchedEntityV2 {
+    urn: string;
+    type: EntityType;
+    exists?: boolean;
+    name: string;
+    // name to be shown on expansion if available
+    expandedName?: string;
+    subtype?: string;
+    icon?: string;
+    numUpstreamChildren?: number;
+    numDownstreamChildren?: number;
+    upstreamRelationships?: FetchedEntityV2Relationship[];
+    downstreamRelationships?: FetchedEntityV2Relationship[];
+    fullyFetched?: boolean;
+    platform?: DataPlatform;
+    status?: Status;
+    fineGrainedLineages?: FineGrainedLineage[];
+    schemaMetadata?: SchemaMetadata;
+    inputFields?: InputFields;
+    canEditLineage?: boolean;
+    health?: Health[];
+    lineageAssets?: Map<string, LineageAsset>;
+    lineageSiblingIcon?: string;
+    containers?: GenericEntityProperties[];
+    parent?: GenericEntityProperties; // Schema field parent
+    structuredProperties?: StructuredProperties;
+    deprecation?: Deprecation;
+}
diff --git a/datahub-web-react/src/app/lineageV2/useAvoidIntersections.ts b/datahub-web-react/src/app/lineageV2/useAvoidIntersections.ts
new file mode 100644
index 00000000000000..332c9191a36208
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/useAvoidIntersections.ts
@@ -0,0 +1,87 @@
+import { useCallback, useEffect, useState } from 'react';
+import { Node, useReactFlow } from 'reactflow';
+import { NodeBase } from './common';
+import { LINEAGE_NODE_WIDTH } from './LineageEntityNode/useDisplayedColumns';
+
+interface ReturnType {
+    onNodeHeightChange: (id: string, height: number) => void;
+}
+
+/**
+ * Pushes down nodes when node height changes, to avoid overlapping nodes.
+ * Returns function onNodeHeightChange(id, y, height) to be called when a node's height changes.
+ * TODO: Consider using over per-node useAvoidIntersections for performance. Not complete.
+ */
+export default function useAvoidIntersections(vizVersion: number): ReturnType {
+    const { getNodes, setNodes } = useReactFlow<NodeBase & { offset?: number }>();
+
+    // Build up tree of dependencies, where nodes a -> b means b may need to be pushed down if a's height increases
+    const [dependencies] = useState(new Map<string, Set<string>>());
+
+    useEffect(() => {
+        // Reminder: Could optimize by calculating minYIntervals: [number, number][]
+        // of shape [(x, y)] that states the minimum y value for each x interval
+        // to run in O(n) time instead of O(n^2)
+        const nodes = getNodes().sort((a, b) => a.position.y - b.position.y);
+        nodes.forEach((node, i) => {
+            const overlaps = nodes.slice(i + 1).filter((n) => overlapsX(node, n));
+            dependencies.set(node.id, new Set(overlaps.map((n) => n.id)));
+        });
+    }, [vizVersion, dependencies, getNodes]);
+
+    const onNodeHeightChange = useCallback(
+        (id: string, height: number) => {
+            const allNodes = getNodes();
+            const y = allNodes.find((n) => n.id === id)?.position.y || 0;
+            const mayOverlapNodes = allNodes
+                .filter((n) => dependencies.get(id)?.has(n.id))
+                .sort((a, b) => a.position.y - b.position.y);
+            let currentY = y + height;
+
+            const offsets = new Map<string, number>();
+            mayOverlapNodes.forEach((node) => {
+                const distance = pushDownDistance(currentY, node.position.y);
+                if (distance) {
+                    currentY = node.position.y + distance + (node.height || 0);
+                }
+                offsets.set(node.id, distance);
+            });
+
+            setNodes((oldNodes) =>
+                oldNodes.map((node) => {
+                    const newOffset = offsets.get(node.id) || 0;
+                    const changeInY = newOffset - (node.data.offset || 0);
+                    if (changeInY) {
+                        return {
+                            ...node,
+                            position: {
+                                ...node.position,
+                                y: node.position.y + changeInY,
+                            },
+                            data: {
+                                ...node.data,
+                                offset: newOffset,
+                            },
+                        };
+                    }
+                    return node;
+                }),
+            );
+        },
+        [dependencies, getNodes, setNodes],
+    );
+    return { onNodeHeightChange };
+}
+
+const MIN_Y_SEP = 10;
+
+function pushDownDistance(newY: number, nodeY: number): number {
+    return Math.max(0, newY + MIN_Y_SEP - nodeY);
+}
+
+function overlapsX(a: Node, b: Node): boolean {
+    return (
+        Math.min(a.position.x + (a.width || LINEAGE_NODE_WIDTH), b.position.x + (b.width || LINEAGE_NODE_WIDTH)) >
+        Math.max(a.position.x, b.position.x)
+    );
+}
diff --git a/datahub-web-react/src/app/lineageV2/useBulkEntityLineage.ts b/datahub-web-react/src/app/lineageV2/useBulkEntityLineage.ts
new file mode 100644
index 00000000000000..1cfc6c892fc3e4
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/useBulkEntityLineage.ts
@@ -0,0 +1,188 @@
+import { useAppConfig } from '@app/useAppConfig';
+import { useCallback, useContext, useEffect, useState } from 'react';
+import { useGetBulkEntityLineageV2Query } from '../../graphql/lineage.generated';
+import { EntityType, LineageDirection } from '../../types.generated';
+import { useGetLineageTimeParams } from '../lineage/utils/useGetLineageTimeParams';
+import usePrevious from '../shared/usePrevious';
+import { useEntityRegistryV2 } from '../useEntityRegistry';
+import {
+    addToAdjacencyList,
+    FetchStatus,
+    getEdgeId,
+    isQuery,
+    isTransformational,
+    LineageEdge,
+    LineageEntity,
+    LineageNodesContext,
+    NodeContext,
+    useIgnoreSchemaFieldStatus,
+} from './common';
+import { FetchedEntityV2Relationship } from './types';
+import { addQueryNodes, pruneDuplicateEdges, setEntityNodeDefault } from './useSearchAcrossLineage';
+
+const BATCH_SIZE = 10;
+
+export default function useBulkEntityLineage(shownUrns: string[]): (urn: string) => void {
+    const flags = useAppConfig().config.featureFlags;
+    const ignoreSchemaFieldStatus = useIgnoreSchemaFieldStatus();
+    const {
+        rootType,
+        nodes,
+        edges,
+        adjacencyList,
+        hideTransformations,
+        showGhostEntities,
+        dataVersion,
+        setDataVersion,
+        setDisplayVersion,
+    } = useContext(LineageNodesContext);
+    const prevShownUrns = usePrevious(shownUrns);
+
+    const [memoizedShownUrns, setMemoizedShownUrns] = useState<string[]>([]);
+    useEffect(() => {
+        // TODO: Implement string[] equality?
+        const sortedShownUrns = shownUrns.slice().sort();
+        const prevSortedShownUrns = prevShownUrns?.slice()?.sort();
+        if (JSON.stringify(prevSortedShownUrns) !== JSON.stringify(sortedShownUrns)) {
+            setMemoizedShownUrns(shownUrns);
+        }
+    }, [prevShownUrns, shownUrns]);
+
+    const [urnsToFetch, setUrnsToFetch] = useState<string[]>([]);
+    useEffect(() => {
+        setUrnsToFetch((oldUrnsToFetch) => {
+            let newUrnsToFetch = memoizedShownUrns
+                .filter((urn) => {
+                    const node = nodes.get(urn);
+                    return !node?.entity;
+                })
+                .slice(0, BATCH_SIZE);
+            if (
+                !newUrnsToFetch.length &&
+                rootType === EntityType.SchemaField &&
+                ignoreSchemaFieldStatus &&
+                hideTransformations
+            ) {
+                newUrnsToFetch = Array.from(nodes.values())
+                    .filter((node) => isTransformational(node) && !node.entity)
+                    .map((node) => node.urn);
+            }
+            if (JSON.stringify(oldUrnsToFetch) !== JSON.stringify(newUrnsToFetch)) {
+                return newUrnsToFetch;
+            }
+            return oldUrnsToFetch;
+        });
+    }, [
+        nodes,
+        dataVersion,
+        memoizedShownUrns,
+        showGhostEntities,
+        rootType,
+        ignoreSchemaFieldStatus,
+        hideTransformations,
+    ]);
+
+    const { startTimeMillis, endTimeMillis } = useGetLineageTimeParams();
+
+    const { data, refetch } = useGetBulkEntityLineageV2Query({
+        skip: !urnsToFetch?.length,
+        fetchPolicy: 'cache-first',
+        variables: {
+            urns: urnsToFetch,
+            startTimeMillis,
+            endTimeMillis,
+            separateSiblings: true,
+            showColumns: true,
+            includeGhostEntities: showGhostEntities || (rootType === EntityType.SchemaField && ignoreSchemaFieldStatus),
+        },
+    });
+
+    const entityRegistry = useEntityRegistryV2();
+
+    useEffect(() => {
+        const smallContext = { nodes, edges, adjacencyList };
+        let changed = false;
+        data?.entities?.forEach((rawEntity) => {
+            if (!rawEntity) return;
+            const config = entityRegistry.getLineageVizConfigV2(rawEntity.type, rawEntity, flags);
+            if (!config) return;
+            const entity = { ...config, lineageAssets: entityRegistry.getLineageAssets(rawEntity.type, rawEntity) };
+
+            const node = nodes.get(entity.urn);
+            if (node) {
+                node.entity = entity;
+                node.rawEntity = rawEntity;
+                changed = true;
+
+                // TODO: Remove once using bulk edges query
+                if (!isQuery(node)) {
+                    entity.downstreamRelationships?.forEach((relationship) =>
+                        processEdge(node, relationship, LineageDirection.Downstream, smallContext),
+                    );
+                    entity.upstreamRelationships?.forEach((relationship) => {
+                        processEdge(node, relationship, LineageDirection.Upstream, smallContext);
+                    });
+                    pruneDuplicateEdges(node.urn, null, smallContext, entityRegistry);
+                }
+            }
+        });
+        if (changed) {
+            setDataVersion((version) => version + 1);
+            setDisplayVersion(([version, n]) => [version + 1, n]); // TODO: Also remove with above todo
+        }
+    }, [data, nodes, edges, adjacencyList, entityRegistry, setDataVersion, setDisplayVersion, flags]);
+
+    return useCallback(
+        (urn: string) =>
+            refetch({
+                urns: [urn],
+                startTimeMillis,
+                endTimeMillis,
+                separateSiblings: true,
+                showColumns: true,
+            }),
+        [refetch, startTimeMillis, endTimeMillis],
+    );
+}
+
+function processEdge(
+    node: LineageEntity,
+    relationship: FetchedEntityV2Relationship,
+    direction: LineageDirection,
+    context: Pick<NodeContext, 'adjacencyList' | 'nodes' | 'edges'>,
+): void {
+    const { adjacencyList, nodes, edges } = context;
+
+    if (relationship.entity && !isQuery(relationship.entity)) {
+        if (node.fetchStatus[direction] !== FetchStatus.UNNEEDED) {
+            // Add nodes that should be in the graph
+            // TODO: Bust search across lineage cache?
+            setEntityNodeDefault(relationship.urn, relationship.entity.type, direction, nodes);
+        }
+
+        if (nodes.has(relationship.urn)) {
+            const edgeId = getEdgeId(node.urn, relationship.urn, direction);
+            edges.set(edgeId, { ...edges.get(edgeId), ...makeLineageEdge(relationship) });
+            addToAdjacencyList(adjacencyList, direction, node.urn, relationship.urn);
+
+            relationship.paths?.forEach((path) => {
+                addQueryNodes(path?.path, direction, context);
+            });
+        }
+    }
+}
+
+function makeLineageEdge({
+    createdOn,
+    createdActor,
+    updatedOn,
+    updatedActor,
+    isManual,
+}: FetchedEntityV2Relationship): LineageEdge {
+    return {
+        created: createdOn ? { timestamp: createdOn, actor: createdActor ?? undefined } : undefined,
+        updated: updatedOn ? { timestamp: updatedOn, actor: updatedActor ?? undefined } : undefined,
+        isManual: isManual ?? undefined,
+        isDisplayed: true,
+    };
+}
diff --git a/datahub-web-react/src/app/lineageV2/useColumnHighlighting.ts b/datahub-web-react/src/app/lineageV2/useColumnHighlighting.ts
new file mode 100644
index 00000000000000..cd44609e0630df
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/useColumnHighlighting.ts
@@ -0,0 +1,312 @@
+import EntityRegistry from '@app/entityV2/EntityRegistry';
+import { TENTATIVE_EDGE_NAME } from '@app/lineageV2/LineageEdge/TentativeEdge';
+import { useContext, useEffect, useMemo } from 'react';
+import { Edge, MarkerType, useReactFlow } from 'reactflow';
+import { EntityType, LineageDirection } from '@types';
+import {
+    ColumnRef,
+    createLineageFilterNodeId,
+    FineGrainedLineage,
+    FineGrainedLineageMap,
+    FineGrainedOperationRef,
+    HighlightedColumns,
+    HOVER_COLOR,
+    isTransformational,
+    isUrnQuery,
+    LineageNodesContext,
+    NodeContext,
+    parseColumnRef,
+    SELECT_COLOR,
+    setDefault,
+    setDifference,
+} from './common';
+import { useEntityRegistryV2 } from '../useEntityRegistry';
+
+export default function useColumnHighlighting(
+    selectedColumn: ColumnRef | null,
+    hoveredColumn: ColumnRef | null,
+    fineGrainedLineage: FineGrainedLineage,
+    shownUrns: string[],
+): {
+    cllHighlightedNodes: Map<string, Set<FineGrainedOperationRef> | null>;
+    highlightedColumns: HighlightedColumns;
+} {
+    const entityRegistry = useEntityRegistryV2();
+    const { setEdges } = useReactFlow();
+    const { nodes, adjacencyList, edges, rootUrn, rootType, nodeVersion, columnEdgeVersion, hideTransformations } =
+        useContext(LineageNodesContext);
+
+    const { cllHighlightedNodes, highlightedColumns, columnEdges } = useMemo(() => {
+        const displayedNodeIds = new Set(shownUrns);
+        const validQueryIds = new Set(
+            Array.from(edges.values())
+                .map((edge) => edge.via)
+                .filter((via): via is string => !!via),
+        );
+        return processColumnHighlights(selectedColumn, hoveredColumn, {
+            fineGrainedLineage,
+            nodes,
+            adjacencyList,
+            displayedNodeIds,
+            validQueryIds,
+            entityRegistry,
+            rootUrn,
+            rootType,
+        });
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [columnEdgeVersion, selectedColumn, hoveredColumn, nodes, edges, fineGrainedLineage, shownUrns, entityRegistry]);
+
+    useEffect(() => {
+        // TODO: Figure out how to only add edges once columns are rendered? For now, just use timeout
+        setTimeout(
+            () =>
+                setEdges((oldEdges) => {
+                    const currentEdgeIds = new Set(columnEdges.keys());
+                    const oldEdgeIds = new Set(oldEdges.map((edge) => edge.id));
+                    const addIds = setDifference(currentEdgeIds, oldEdgeIds);
+                    return [
+                        ...oldEdges
+                            .filter((edge) => !edge.data?.isColumnEdge || currentEdgeIds.has(edge.id))
+                            .map((edge) => columnEdges.get(edge.id) || edge),
+                        ...addIds.map((id) => columnEdges.get(id) as Edge),
+                    ];
+                }),
+            0,
+        );
+    }, [nodeVersion, hideTransformations, columnEdges, setEdges]);
+
+    return { cllHighlightedNodes, highlightedColumns };
+}
+
+interface ArgumentBundle {
+    fineGrainedLineage: FineGrainedLineage;
+    nodes: NodeContext['nodes'];
+    adjacencyList: NodeContext['adjacencyList'];
+    displayedNodeIds: Set<string>;
+    validQueryIds: Set<string>;
+    entityRegistry: EntityRegistry;
+    rootUrn: string;
+    rootType: EntityType;
+}
+
+function processColumnHighlights(
+    selectedColumn: ColumnRef | null,
+    hoveredColumn: ColumnRef | null,
+    argumentBundle: ArgumentBundle,
+) {
+    if (selectedColumn) {
+        return computeSingleColumnHighlights(selectedColumn, argumentBundle, SELECT_COLOR);
+    }
+    return computeSingleColumnHighlights(hoveredColumn, argumentBundle, HOVER_COLOR);
+}
+
+function computeSingleColumnHighlights(
+    column: ColumnRef | null,
+    {
+        fineGrainedLineage,
+        nodes,
+        adjacencyList,
+        displayedNodeIds,
+        validQueryIds,
+        entityRegistry,
+        rootUrn,
+        rootType,
+    }: ArgumentBundle,
+    stroke: string,
+): {
+    cllHighlightedNodes: Map<string, Set<FineGrainedOperationRef> | null>;
+    highlightedColumns: HighlightedColumns;
+    columnEdges: Map<string, Edge>;
+} {
+    const cllHighlightedNodes = new Map<string, Set<FineGrainedOperationRef> | null>();
+    const highlightedColumns = new Map<string, Set<string>>();
+    const columnEdges = new Map<string, Edge>();
+
+    if (column === null) {
+        return { cllHighlightedNodes, highlightedColumns, columnEdges };
+    }
+
+    const [urn, field] = parseColumnRef(column);
+    cllHighlightedNodes.set(urn, null);
+    highlightedColumns.set(urn, new Set([field]));
+
+    const lineages: Array<[LineageDirection, FineGrainedLineageMap]> = [
+        [LineageDirection.Downstream, fineGrainedLineage.downstream],
+        [LineageDirection.Upstream, fineGrainedLineage.upstream],
+    ];
+    lineages.forEach(([direction, fgl]) => {
+        // We want to show all CLL edges between displayed nodes,
+        //   even if they go through a node that is not displayed, i.e. a missing node
+        // To do this, we compute each missing node's direct parents
+        //   i.e. the missing node's upstreams when searching downstream, and vice versa
+        const missingNodeParents = new Map<string, Set<ColumnRef>>();
+
+        function addEdge(ref: ColumnRef, childRef: ColumnRef, isTentative = false) {
+            const fromRef = direction === LineageDirection.Downstream ? ref : childRef;
+            const toRef = direction === LineageDirection.Downstream ? childRef : ref;
+            const [fromUrn, fromField] = parseColumnRef(fromRef);
+            const [toUrn, toField] = parseColumnRef(toRef);
+            const fromDirection = nodes.get(fromUrn)?.direction;
+            const toDirection = nodes.get(toUrn)?.direction;
+            if (fromDirection && toDirection && fromDirection !== toDirection) {
+                const isRootTransformation = isTransformational({ urn: rootUrn, type: rootType });
+                const throughRoot =
+                    adjacencyList.UPSTREAM.get(rootUrn)?.has(fromUrn) &&
+                    adjacencyList.DOWNSTREAM.get(rootUrn)?.has(toUrn);
+                if (!(isRootTransformation && throughRoot)) {
+                    // Don't render edges between nodes upstream of home node and nodes downstream of home node
+                    // Exception for edges through the root if it's a transformation
+                    return;
+                }
+            }
+            const id = `${fromRef}-${toRef}`;
+            columnEdges.set(id, {
+                id,
+                source: fromUrn,
+                target: toUrn,
+                sourceHandle: fromField ? fromRef : undefined,
+                targetHandle: toField ? toRef : undefined,
+                type: isTentative ? TENTATIVE_EDGE_NAME : 'default',
+                markerEnd: { type: MarkerType.ArrowClosed },
+                style: { stroke, strokeWidth: 1.25 },
+                data: { isColumnEdge: true }, // Used to hide column edges
+            });
+        }
+
+        const seen = new Set<ColumnRef>();
+        const toVisit = [column];
+        while (toVisit.length) {
+            const ref = toVisit.pop();
+            if (ref === undefined) {
+                break;
+            }
+            const { filterNodeRef, showFilterNodeEdge, isTentative } = addEdgeToLineageFilterNode(
+                ref,
+                direction,
+                fgl,
+                nodes,
+                displayedNodeIds,
+            );
+            const [currentUrn] = parseColumnRef(ref);
+            if (displayedNodeIds.has(currentUrn) && showFilterNodeEdge) {
+                addEdge(ref, filterNodeRef, isTentative);
+            }
+
+            fgl.get(ref)?.forEach((fineGrainedOperationRef, childRef) => {
+                const [childUrn, childField] = parseColumnRef(childRef);
+                if (!seen.has(childRef)) {
+                    seen.add(childRef);
+                    toVisit.push(childRef);
+                }
+
+                const queryRefsOnChild = setDefault(cllHighlightedNodes, childUrn, null);
+                if (fineGrainedOperationRef) {
+                    if (queryRefsOnChild === null) {
+                        cllHighlightedNodes.set(childUrn, new Set());
+                    }
+                    cllHighlightedNodes.get(childUrn)?.add(fineGrainedOperationRef);
+                }
+                setDefault(highlightedColumns, childUrn, new Set()).add(childField);
+
+                if (displayedNodeIds.has(childUrn)) {
+                    addEdge(ref, childRef);
+                } else if (!isUrnQuery(childUrn, entityRegistry) || validQueryIds.has(childUrn)) {
+                    // Compute parents of missing nodes; don't add any edges through them
+                    setDefault(missingNodeParents, childRef, new Set()).add(ref);
+                }
+            });
+        }
+
+        // To handle chains of missing nodes, e.g. t1 -> m1 -> m2 -> m3 -> t2, we traverse just the missing nodes
+        //   and build up the missingNodeParents map to include not just direct parents but any ancestor
+        //   that can be reached exclusively through missing nodes
+        // When a missing node is visited, we try to add edges from its parents to its children
+        // If its children are missing as well, its parents get added to each child's `missingNodeParents` set
+        // We have to traverse in topological order so that we can be confident we're passing all of a node's parents
+        //   e.g. we don't want to copy m1's parents to m2, and then add more parents to m1
+        const orderedMissingNodes = getTopologicalOrder(new Set(missingNodeParents.keys()), fgl);
+        orderedMissingNodes.forEach((ref) => {
+            fgl.get(ref)?.forEach((_, childRef) => {
+                const childParents = missingNodeParents.get(childRef);
+                if (childParents) {
+                    // `ref` is a missing node
+                    missingNodeParents.get(ref)?.forEach((parentRef) => childParents.add(parentRef));
+                } else {
+                    missingNodeParents.get(ref)?.forEach((parentRef) => {
+                        const [parentUrn] = parseColumnRef(childRef);
+                        if (displayedNodeIds.has(parentUrn)) {
+                            addEdge(parentRef, childRef);
+                        }
+                    });
+                }
+            });
+        });
+    });
+
+    return { cllHighlightedNodes, highlightedColumns, columnEdges };
+}
+
+function getTopologicalOrder(missingNodes: Set<ColumnRef>, fgl: FineGrainedLineageMap) {
+    const topologicalOrder: ColumnRef[] = [];
+
+    // Attempt to visit missing nodes in topological order
+    // There can be cycles in the fgl graph... not sure about behavior when there is a cycle of missing nodes
+    const temporaryMarkedNodes = new Set<ColumnRef>();
+    const permanentMarkedNodes = new Set<ColumnRef>();
+    const toVisit = Array.from(missingNodes);
+    /* eslint-disable no-continue */
+    while (toVisit.length) {
+        const ref = toVisit.pop();
+        if (ref === undefined) break;
+        if (permanentMarkedNodes.has(ref)) continue;
+        if (temporaryMarkedNodes.has(ref)) continue; // Cycle detected
+        temporaryMarkedNodes.add(ref);
+        fgl.get(ref)?.forEach((_operationRef, childRef) => {
+            if (
+                missingNodes.has(childRef) &&
+                !permanentMarkedNodes.has(childRef) &&
+                !temporaryMarkedNodes.has(childRef)
+            ) {
+                toVisit.push(childRef);
+            }
+        });
+        permanentMarkedNodes.add(ref);
+        topologicalOrder.push(ref);
+    }
+    /* eslint-disable-enable no-continue */
+
+    topologicalOrder.reverse();
+    return topologicalOrder;
+}
+
+function addEdgeToLineageFilterNode(
+    ref: ColumnRef,
+    direction: LineageDirection,
+    fgl: FineGrainedLineageMap,
+    nodes: NodeContext['nodes'],
+    displayedNodeIds: Set<string>,
+): {
+    filterNodeRef: ColumnRef;
+    showFilterNodeEdge: boolean;
+    isTentative: boolean;
+} {
+    const [urn, field] = parseColumnRef(ref);
+    const filterNodeRef = createLineageFilterNodeId(urn, direction);
+
+    const entity = nodes.get(urn)?.entity;
+    const lineageAsset = entity?.lineageAssets?.get(field);
+
+    const cachedNumRelated =
+        direction === LineageDirection.Downstream ? lineageAsset?.numDownstream : lineageAsset?.numUpstream;
+    const numRelatedOnGraph = Array.from(fgl.get(ref)?.keys() || []).filter((neighbor) =>
+        displayedNodeIds.has(neighbor),
+    ).length;
+
+    // Show tentative edge if we haven't fetched counts yet, even if we have cached value
+    const isTentative = !lineageAsset?.lineageCountsFetched;
+    return {
+        filterNodeRef,
+        showFilterNodeEdge: (cachedNumRelated ?? 0) > numRelatedOnGraph || isTentative,
+        isTentative,
+    };
+}
diff --git a/datahub-web-react/src/app/lineageV2/useComputeGraph/filterNodes.ts b/datahub-web-react/src/app/lineageV2/useComputeGraph/filterNodes.ts
new file mode 100644
index 00000000000000..224986962b89aa
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/useComputeGraph/filterNodes.ts
@@ -0,0 +1,140 @@
+import {
+    addToAdjacencyList,
+    EdgeId,
+    getEdgeId,
+    isGhostEntity,
+    isTransformational,
+    LineageAuditStamp,
+    LineageEdge,
+    NodeContext,
+    parseEdgeId,
+    setDefault,
+} from '@app/lineageV2/common';
+import { LineageDirection } from '@types';
+
+export interface HideNodesConfig {
+    hideTransformations: boolean;
+    hideGhostEntities: boolean;
+    ignoreSchemaFieldStatus: boolean;
+}
+
+type ContextSubset = Pick<NodeContext, 'nodes' | 'edges' | 'adjacencyList'>;
+
+/**
+ * Hide nodes from the graph, connecting edges through the removed nodes.
+ */
+export default function hideNodes(
+    rootUrn: string,
+    { hideTransformations, hideGhostEntities, ignoreSchemaFieldStatus }: HideNodesConfig,
+    { nodes, edges, adjacencyList }: ContextSubset,
+): ContextSubset {
+    let newNodes = nodes;
+    let newEdges = edges;
+    let newAdjacencyList = adjacencyList;
+    if (hideGhostEntities) {
+        newNodes = new Map(
+            Array.from(newNodes).filter(
+                ([urn, node]) => urn === rootUrn || !isGhostEntity(node.entity, ignoreSchemaFieldStatus),
+            ),
+        );
+        ({ newEdges, newAdjacencyList } = pruneEdges({
+            nodes: newNodes,
+            edges: newEdges,
+            adjacencyList: newAdjacencyList,
+        }));
+    }
+    if (hideTransformations) {
+        newNodes = new Map(Array.from(newNodes).filter(([urn, node]) => urn === rootUrn || !isTransformational(node)));
+        ({ newEdges, newAdjacencyList } = connectEdges(rootUrn, {
+            nodes: newNodes,
+            edges: newEdges,
+            adjacencyList: newAdjacencyList,
+        }));
+    }
+
+    return { nodes: newNodes, edges: newEdges, adjacencyList: newAdjacencyList };
+}
+
+/**
+ * Return new adjacency list and edge map, with edges pruned to only connect nodes that are still present.
+ */
+function pruneEdges({ nodes, edges }: ContextSubset) {
+    const newEdges = new Map<EdgeId, LineageEdge>();
+    const newAdjacencyList: NodeContext['adjacencyList'] = {
+        [LineageDirection.Upstream]: new Map(),
+        [LineageDirection.Downstream]: new Map(),
+    };
+
+    edges.forEach((edge, edgeId) => {
+        const [upstream, downstream] = parseEdgeId(edgeId);
+        if (nodes.has(upstream) && nodes.has(downstream)) {
+            newEdges.set(edgeId, edge);
+            addToAdjacencyList(newAdjacencyList, LineageDirection.Upstream, downstream, upstream);
+            addToAdjacencyList(newAdjacencyList, LineageDirection.Downstream, upstream, downstream);
+            if (edge.via) {
+                setDefault(newAdjacencyList[LineageDirection.Upstream], edge.via, new Set()).add(upstream);
+                setDefault(newAdjacencyList[LineageDirection.Downstream], edge.via, new Set()).add(downstream);
+            }
+        }
+    });
+
+    return { newEdges, newAdjacencyList };
+}
+
+/**
+ * Return new adjacency list and edge map, connecting edges through the removed nodes.
+ */
+function connectEdges(rootUrn: string, { nodes, edges, adjacencyList }: ContextSubset) {
+    const seen = new Set<string>();
+    const newAdjacencyList: NodeContext['adjacencyList'] = {
+        [LineageDirection.Upstream]: new Map(),
+        [LineageDirection.Downstream]: new Map(),
+    };
+    const newEdges = new Map<EdgeId, LineageEdge>();
+
+    function buildNewAdjacencyList(id: string, direction: LineageDirection): Set<string> | undefined {
+        if (seen.has(id)) {
+            return newAdjacencyList[direction].get(id);
+        }
+        seen.add(id);
+
+        adjacencyList[direction].get(id)?.forEach((neighbor) => {
+            if (nodes.has(neighbor)) {
+                addToAdjacencyList(newAdjacencyList, direction, id, neighbor);
+                const edgeId = getEdgeId(id, neighbor, direction);
+                // isDisplayed always true -- only set to false right now to deduplicate edges through dbt
+                newEdges.set(edgeId, { ...edges.get(edgeId), via: undefined, isDisplayed: true });
+                buildNewAdjacencyList(neighbor, direction);
+            } else {
+                buildNewAdjacencyList(neighbor, direction)?.forEach((child) => {
+                    addToAdjacencyList(newAdjacencyList, direction, id, child);
+                    const edgeId = getEdgeId(id, child, direction);
+                    const firstEdge = edges.get(getEdgeId(id, neighbor, direction));
+                    const secondEdge = edges.get(getEdgeId(neighbor, child, direction));
+                    newEdges.set(edgeId, {
+                        isManual: (firstEdge?.isManual || secondEdge?.isManual) ?? false,
+                        created: getLatestTimestamp(firstEdge?.created, secondEdge?.created),
+                        updated: getLatestTimestamp(firstEdge?.updated, secondEdge?.updated),
+                        isDisplayed: true,
+                    });
+                });
+            }
+        });
+        return newAdjacencyList[direction].get(id);
+    }
+
+    buildNewAdjacencyList(rootUrn, LineageDirection.Upstream);
+    seen.clear();
+    buildNewAdjacencyList(rootUrn, LineageDirection.Downstream);
+    return { newAdjacencyList, newEdges };
+}
+
+function getLatestTimestamp(
+    a: LineageAuditStamp | undefined,
+    b: LineageAuditStamp | undefined,
+): LineageAuditStamp | undefined {
+    if (a?.timestamp && b?.timestamp) {
+        return a.timestamp > b.timestamp ? a : b;
+    }
+    return a ?? b;
+}
diff --git a/datahub-web-react/src/app/lineageV2/useComputeGraph/getDisplayedNodes.ts b/datahub-web-react/src/app/lineageV2/useComputeGraph/getDisplayedNodes.ts
new file mode 100644
index 00000000000000..81d213a158cd53
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/useComputeGraph/getDisplayedNodes.ts
@@ -0,0 +1,268 @@
+import { SubType } from '@app/entityV2/shared/components/subtypes';
+import {
+    createLineageFilterNodeId,
+    getEdgeId,
+    getParents,
+    isDbt,
+    isQuery,
+    isTransformational,
+    LINEAGE_FILTER_PAGINATION,
+    LINEAGE_FILTER_TYPE,
+    LineageEntity,
+    LineageFilter,
+    LineageNode,
+    NodeContext,
+    setDefault,
+} from '@app/lineageV2/common';
+import { ENTITY_SUB_TYPE_FILTER_NAME, FILTER_DELIMITER, PLATFORM_FILTER_NAME } from '@app/searchV2/utils/constants';
+import { LineageDirection } from '@types';
+
+interface Output {
+    displayedNodes: LineageNode[];
+    parents: Map<string, Set<string>>;
+}
+
+/**
+ * Filters nodes based on per-node filters.
+ * @param urn The urn of the root node.
+ * @param orderedNodes Nodes ordered by `orderNodes`, in BFS order.
+ * @param context Lineage node context.
+ * @returns A list of nodes to display in rough topological order,
+ *          and a map of nodes to their non-transformational parents.
+ */
+export default function getDisplayedNodes(
+    urn: string,
+    orderedNodes: Record<LineageDirection, LineageEntity[]>,
+    context: Pick<NodeContext, 'adjacencyList' | 'nodes' | 'edges'>,
+): Output {
+    const parents = new Map<string, Set<string>>();
+
+    const { nodes } = context;
+    const rootNode = nodes.get(urn);
+    if (!rootNode) {
+        return { displayedNodes: [], parents };
+    }
+
+    const displayedNodes: LineageNode[] = [rootNode];
+    const addedNodes = new Set<string>([urn]);
+
+    function traverseTree(direction: LineageDirection) {
+        if (!rootNode?.isExpanded[direction]) {
+            return;
+        }
+        const seenNodes = new Set<string>([urn]);
+        const queue = [urn]; // Note: uses array for queue, slow for large graphs
+        while (queue.length > 0) {
+            const current = queue.shift() as string; // Just checked length
+            const filteredChildren = applyFilters(current, direction, orderedNodes[direction], parents, context);
+            filteredChildren.forEach((child) => {
+                if (!seenNodes.has(child.id)) {
+                    seenNodes.add(child.id);
+
+                    if (!addedNodes.has(child.id)) {
+                        addedNodes.add(child.id);
+                        displayedNodes.push(child);
+                        if (child?.inCycle) {
+                            // Set direction deterministically, to first direction detected
+                            // eslint-disable-next-line no-param-reassign
+                            child.direction = direction;
+                        }
+                    }
+
+                    if (!isTransformational(child) && child.isExpanded[direction]) {
+                        queue.push(child.id);
+                    }
+                }
+            });
+        }
+    }
+
+    traverseTree(LineageDirection.Upstream);
+    traverseTree(LineageDirection.Downstream);
+
+    return { displayedNodes, parents };
+}
+
+function applyFilters(
+    urn: string,
+    direction: LineageDirection,
+    orderedNodes: LineageEntity[],
+    parents: Map<string, Set<string>>,
+    context: Pick<NodeContext, 'adjacencyList' | 'nodes' | 'edges'>,
+): LineageNode[] {
+    const { adjacencyList, nodes } = context;
+    const node = nodes.get(urn);
+    const filters = node?.filters?.[direction];
+    const children = adjacencyList[direction].get(urn);
+    if (!node || !children?.size || filters?.display === false) {
+        return [];
+    }
+
+    const { allChildren, childrenToFilter } = getChildrenToFilter(node, direction, context);
+    const contents = orderedNodes.filter((n) => childrenToFilter?.has(n.urn));
+    let filteredChildren = contents.slice();
+
+    if (filters?.searchUrns) {
+        filteredChildren = filteredChildren.filter(
+            (n) =>
+                filters.searchUrns?.has(n.urn) ||
+                // Required until search results include schema fields
+                (n.entity?.parent?.urn && filters.searchUrns?.has(n.entity.parent.urn)),
+        );
+    }
+
+    filters?.facetFilters?.forEach((values, facet) => {
+        if (!values.size) {
+            return;
+        }
+        if (facet === PLATFORM_FILTER_NAME) {
+            filteredChildren = filteredChildren.filter((n) => {
+                const platform = n.entity?.platform?.urn;
+                return platform && values.has(platform);
+            });
+        } else if (facet === ENTITY_SUB_TYPE_FILTER_NAME) {
+            filteredChildren = filteredChildren.filter((n) => {
+                const subtype = n.entity?.subtype;
+                const selectedSubtypes = Array.from(values).map((v) => v.split(FILTER_DELIMITER)[1]);
+                return subtype && selectedSubtypes.includes(subtype);
+            });
+        }
+    });
+
+    const limit = filters?.limit || filteredChildren.length;
+    const shownNodes = filteredChildren.slice(Math.max(0, filteredChildren.length - limit));
+    const allShownNodes = [...getTransformationalNodes(node, shownNodes, direction, context), ...shownNodes];
+
+    // Build parent map
+    allShownNodes.forEach((child) => setDefault(parents, child.urn, new Set<string>()).add(urn));
+
+    const result: LineageNode[] = [];
+    if (childrenToFilter.size > LINEAGE_FILTER_PAGINATION && (!node?.direction || node.direction === direction)) {
+        const filterNode: LineageFilter = {
+            // id starts with 's' so it is always sorted first, before urn:li:...
+            id: createLineageFilterNodeId(urn, direction),
+            type: LINEAGE_FILTER_TYPE,
+            parent: urn,
+            direction,
+            limit,
+            isExpanded: {
+                [LineageDirection.Upstream]: false,
+                [LineageDirection.Downstream]: false,
+            },
+            allChildren,
+            contents: contents.map((n) => n.urn),
+            shown: new Set(allShownNodes.map((n) => n.urn)),
+        };
+        result.push(filterNode);
+    }
+    if (node) {
+        result.push(...allShownNodes);
+    }
+
+    return result;
+}
+
+/**
+ * Returns the set of children to filter for the given parent node.
+ * This is calculated as: all adjacent non-transformational nodes and any transformational leaves.
+ * Drops DBT sources that are transformational leaves, because they add no information.
+ * Loop invariant: all nodes in `queue` are transformational.
+ * @param parent The parent node, whose children are to be filtered.
+ * @param direction Direction of children.
+ * @param context Lineage node context.
+ */
+function getChildrenToFilter(
+    parent: LineageEntity,
+    direction: LineageDirection,
+    context: Pick<NodeContext, 'adjacencyList' | 'nodes'>,
+): {
+    allChildren: Set<string>;
+    childrenToFilter: Set<string>;
+} {
+    const { adjacencyList, nodes } = context;
+    const seen = new Set<string>();
+    const childrenToFilter = new Set<string>();
+    const queue = [parent];
+    for (let node = queue.pop(); node; node = queue.pop()) {
+        const children = adjacencyList[direction].get(node.urn);
+        // Include non-query transformational nodes if they have no children
+        if (
+            !children?.size &&
+            !isQuery(node) &&
+            !(direction === LineageDirection.Downstream && isDbt(node) && node.entity?.subtype === SubType.DbtSource)
+        ) {
+            childrenToFilter.add(node.urn);
+        }
+        children?.forEach((childUrn) => {
+            const child = nodes.get(childUrn);
+            if (!child || seen.has(childUrn)) return;
+
+            if (isTransformational(child)) {
+                queue.push(child);
+                seen.add(childUrn);
+            } else {
+                childrenToFilter.add(childUrn);
+                seen.add(childUrn);
+            }
+        });
+    }
+
+    return { allChildren: seen, childrenToFilter };
+}
+
+/**
+ * Return all transformational nodes between `root` and `leaves`, in rough topological order.
+ * @param root The node from which all `leaves` are (indirect) children.
+ * @param leaves Set of non-transformational children of `parentUrn` to render.
+ * @param direction Direction to search for transformational nodes.
+ * @param context Lineage node context.
+ */
+function getTransformationalNodes(
+    root: LineageEntity,
+    leaves: LineageEntity[],
+    direction: LineageDirection,
+    context: Pick<NodeContext, 'adjacencyList' | 'nodes' | 'edges'>,
+): LineageEntity[] {
+    const { nodes, edges, adjacencyList } = context;
+
+    const leafUrns = new Set<string>(leaves.map((leaf) => leaf.urn));
+    const nodesInBetween = new Set<string>();
+    const nodesToRoot = [...leaves];
+    for (let node = nodesToRoot.pop(); node; node = nodesToRoot.pop()) {
+        getParents(node, adjacencyList).forEach((parentUrn) => {
+            const parent = nodes.get(parentUrn);
+            if (parentUrn !== root.urn && !nodesInBetween.has(parentUrn) && parent && isTransformational(parent)) {
+                nodesToRoot.push(parent);
+                nodesInBetween.add(parentUrn);
+            }
+        });
+    }
+
+    // Order in rough topological order
+    const result: LineageEntity[] = [];
+    const nodesToLeaves = [root];
+    for (let node = nodesToLeaves.shift(); node; node = nodesToLeaves.shift()) {
+        const { urn } = node;
+        if (urn !== root.urn) {
+            result.push(node);
+        }
+        adjacencyList[direction].get(urn)?.forEach((child) => {
+            const childNode = nodes.get(child);
+            if (nodesInBetween.has(child) && childNode) {
+                nodesToLeaves.push(childNode);
+                nodesInBetween.delete(child);
+            }
+            if (nodesInBetween.has(child) || leafUrns.has(child)) {
+                const edge = edges.get(getEdgeId(urn, child, direction));
+                if (edge?.isDisplayed && edge?.via) {
+                    const queryNode = nodes.get(edge.via);
+                    if (queryNode) {
+                        result.push(queryNode);
+                    }
+                }
+            }
+        });
+    }
+
+    return result;
+}
diff --git a/datahub-web-react/src/app/lineageV2/useComputeGraph/getFineGrainedLineage.ts b/datahub-web-react/src/app/lineageV2/useComputeGraph/getFineGrainedLineage.ts
new file mode 100644
index 00000000000000..859ec5612378f8
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/useComputeGraph/getFineGrainedLineage.ts
@@ -0,0 +1,171 @@
+import EntityRegistry from '@app/entityV2/EntityRegistry';
+import {
+    ColumnRef,
+    createColumnRef,
+    createEdgeId,
+    createFineGrainedOperationRef,
+    FineGrainedLineage,
+    FineGrainedLineageMap,
+    FineGrainedOperationRef,
+    isUrnTransformational,
+    NodeContext,
+    parseColumnRef,
+    setDefault,
+} from '@app/lineageV2/common';
+import { getFieldPathFromSchemaFieldUrn, getSourceUrnFromSchemaFieldUrn } from '@src/app/entityV2/schemaField/utils';
+import { FineGrainedOperation } from '@app/sharedV2/EntitySidebarContext';
+import { EntityType } from '@types';
+
+export interface FineGrainedLineageData {
+    indirect: FineGrainedLineage;
+    fineGrainedOperations: Map<FineGrainedOperationRef, FineGrainedOperation>;
+}
+
+interface TentativeEdge {
+    upstreamRef: ColumnRef;
+    downstreamRef: ColumnRef;
+    queryRef?: ColumnRef;
+    operationRef?: FineGrainedOperationRef;
+}
+
+/**
+ * Piece together column-level lineage directly from aspects,
+ * e.g. dataset upstreamLineage, chart inputFields, and datajob dataJobInputOutput
+ *
+ *
+ * @param context
+ * @param entityRegistry
+ * @return A map of column -> column edges, enhanced with information about the query for each edge.
+ */
+export default function getFineGrainedLineage(
+    context: Pick<NodeContext, 'nodes' | 'edges'>,
+    entityRegistry: EntityRegistry,
+): FineGrainedLineageData {
+    const { nodes, edges } = context;
+
+    const indirect: FineGrainedLineage = { downstream: new Map(), upstream: new Map() };
+    const fineGrainedOperations: Map<FineGrainedOperationRef, FineGrainedOperation> = new Map();
+    // CLL that may be deduplicated, if there exists a column-level path through transformational nodes
+    const tentativeEdges: TentativeEdge[] = [];
+
+    function processEdge(
+        upstreamUrn: string,
+        upstreamField: string,
+        downstreamUrn: string,
+        downstreamField: string,
+        intermediateIsQuery?: boolean,
+        intermediateRef?: ColumnRef,
+        operationRef?: FineGrainedOperationRef,
+    ) {
+        const upstreamRef = createColumnRef(upstreamUrn, upstreamField);
+        const downstreamRef = createColumnRef(downstreamUrn, downstreamField);
+        // Drop ghost edges and self edges
+        if (!nodes.has(upstreamUrn) || !nodes.has(downstreamUrn) || upstreamRef === downstreamRef) return;
+
+        if (
+            edges.get(createEdgeId(upstreamUrn, downstreamUrn))?.isDisplayed ||
+            (!intermediateIsQuery && intermediateRef)
+        ) {
+            addFineGrainedEdges(indirect, upstreamRef, downstreamRef, intermediateRef, operationRef);
+        } else {
+            tentativeEdges.push({ upstreamRef, downstreamRef, queryRef: intermediateRef, operationRef });
+        }
+    }
+
+    nodes.forEach((node) => {
+        node.entity?.fineGrainedLineages?.forEach((entry) => {
+            let operationRef: FineGrainedOperationRef | undefined;
+            let queryRef: ColumnRef | undefined;
+            const intermediateNode = entry.query || (node.entity?.type === EntityType.DataJob && node.entity.urn);
+            if (intermediateNode) {
+                operationRef = createFineGrainedOperationRef(intermediateNode, entry.upstreams, entry.downstreams);
+                queryRef = createColumnRef(intermediateNode, operationRef);
+                fineGrainedOperations.set(operationRef, {
+                    inputColumns: entry.upstreams?.map((ref) => [ref.urn, ref.path]) || undefined,
+                    outputColumns: entry.downstreams?.map((ref) => [ref.urn, ref.path]) || undefined,
+                    transformOperation: entry.transformOperation || undefined,
+                });
+            }
+            entry.upstreams?.forEach((upstream) => {
+                entry.downstreams?.forEach((downstream) => {
+                    processEdge(
+                        upstream.urn,
+                        upstream.path,
+                        downstream.urn,
+                        downstream.path,
+                        !!entry.query,
+                        queryRef,
+                        operationRef,
+                    );
+                });
+            });
+        });
+        node.entity?.inputFields?.fields?.forEach((input) => {
+            // Upstream of chart's field `schemaField` comes in as `schemaFieldUrn`
+            if (input?.schemaFieldUrn && input?.schemaField) {
+                const upstreamUrn = getSourceUrnFromSchemaFieldUrn(input.schemaFieldUrn);
+                const upstreamField = getFieldPathFromSchemaFieldUrn(input.schemaFieldUrn);
+                processEdge(upstreamUrn, upstreamField, node.urn, input.schemaField.fieldPath);
+            }
+        });
+    });
+
+    tentativeEdges
+        .filter(
+            ({ upstreamRef, downstreamRef }) =>
+                !isTransformationalPath(indirect.downstream, upstreamRef, downstreamRef, entityRegistry),
+        )
+        .forEach(({ upstreamRef, downstreamRef, queryRef, operationRef }) => {
+            addFineGrainedEdges(indirect, upstreamRef, downstreamRef, queryRef, operationRef);
+        });
+
+    return {
+        indirect,
+        fineGrainedOperations,
+    };
+}
+
+function addFineGrainedEdges(
+    fgl: FineGrainedLineage,
+    upstreamRef: ColumnRef,
+    downstreamRef: ColumnRef,
+    queryRef?: ColumnRef,
+    operationRef?: FineGrainedOperationRef,
+) {
+    if (queryRef) {
+        setDefault(fgl.upstream, downstreamRef, new Map()).set(queryRef, operationRef);
+        setDefault(fgl.upstream, queryRef, new Map()).set(upstreamRef, null);
+        setDefault(fgl.downstream, upstreamRef, new Map()).set(queryRef, operationRef);
+        setDefault(fgl.downstream, queryRef, new Map()).set(downstreamRef, null);
+    } else {
+        setDefault(fgl.upstream, downstreamRef, new Map()).set(upstreamRef, null);
+        setDefault(fgl.downstream, upstreamRef, new Map()).set(downstreamRef, null);
+    }
+}
+
+function isTransformationalPath(
+    downstreamMap: FineGrainedLineageMap,
+    upstreamRef: ColumnRef,
+    downstreamRef: ColumnRef,
+    entityRegistry: EntityRegistry,
+): boolean {
+    const stack = [upstreamRef];
+    const seen = new Set<string>(stack);
+    for (let node = stack.pop(); node; node = stack.pop()) {
+        const found = Array.from(downstreamMap.get(node)?.keys() || []).some((childRef) => {
+            if (childRef === downstreamRef) return true;
+            if (!seen.has(childRef)) {
+                const [childUrn] = parseColumnRef(childRef);
+                if (isUrnTransformational(childUrn, entityRegistry)) {
+                    stack.push(childRef);
+                    seen.add(childRef);
+                }
+            }
+            return false;
+        });
+        if (found) {
+            return true;
+        }
+    }
+    return false;
+}
diff --git a/datahub-web-react/src/app/lineageV2/useComputeGraph/orderNodes.ts b/datahub-web-react/src/app/lineageV2/useComputeGraph/orderNodes.ts
new file mode 100644
index 00000000000000..200a358699db8b
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/useComputeGraph/orderNodes.ts
@@ -0,0 +1,41 @@
+import { globalEntityRegistryV2 } from '@app/EntityRegistryProvider';
+import { isUrnTransformational, LineageEntity, NodeContext } from '@app/lineageV2/common';
+import { LineageDirection } from '@types';
+
+/**
+ * Orders nodes in BFS order, starting from the root node.
+ * Within a single node, children are ordered transformations last, then alphabetically.
+ * Note: Transformations should be put first once show more is put at the bottom.
+ * @param urn Root node urn.
+ * @param direction Direction in which to perform BFS.
+ * @param context Lineage node context.
+ */
+export default function orderNodes(
+    urn: string,
+    direction: LineageDirection,
+    { nodes, adjacencyList }: Pick<NodeContext, 'adjacencyList' | 'nodes'>,
+): LineageEntity[] {
+    const orderedNodes: string[] = [];
+    const seenNodes = new Set<string>([urn]);
+    const queue = [urn]; // Note: uses array for queue, slow for large graphs
+    while (queue.length > 0) {
+        const current = queue.shift() as string; // Just checked length
+        const children = Array.from(adjacencyList[direction].get(current) || []).sort(compareNodes);
+        children?.forEach((child) => {
+            if (!seenNodes.has(child)) {
+                queue.push(child);
+                seenNodes.add(child);
+                orderedNodes.push(child);
+            }
+        });
+    }
+    return orderedNodes.map((id) => nodes.get(id)).filter((node): node is LineageEntity => !!node);
+}
+
+function compareNodes(a: string, b: string): number {
+    const isATransformation = isUrnTransformational(a, globalEntityRegistryV2);
+    const isBTransformation = isUrnTransformational(b, globalEntityRegistryV2);
+    if (isATransformation && !isBTransformation) return 1;
+    if (!isATransformation && isBTransformation) return -1;
+    return a.localeCompare(b);
+}
diff --git a/datahub-web-react/src/app/lineageV2/useComputeGraph/useComputeGraph.tsx b/datahub-web-react/src/app/lineageV2/useComputeGraph/useComputeGraph.tsx
new file mode 100644
index 00000000000000..eebcc84b3d9bda
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/useComputeGraph/useComputeGraph.tsx
@@ -0,0 +1,98 @@
+import { LineageNodesContext, useIgnoreSchemaFieldStatus } from '@app/lineageV2/common';
+import NodeBuilder, { LineageVisualizationNode } from '@app/lineageV2/NodeBuilder';
+import hideNodes, { HideNodesConfig } from '@app/lineageV2/useComputeGraph/filterNodes';
+import getDisplayedNodes from '@app/lineageV2/useComputeGraph/getDisplayedNodes';
+import getFineGrainedLineage, { FineGrainedLineageData } from '@app/lineageV2/useComputeGraph/getFineGrainedLineage';
+import orderNodes from '@app/lineageV2/useComputeGraph/orderNodes';
+import usePrevious from '@app/shared/usePrevious';
+import { useEntityRegistryV2 } from '@app/useEntityRegistry';
+import { EntityType, LineageDirection } from '@types';
+import { useContext, useMemo } from 'react';
+import { Edge } from 'reactflow';
+
+interface ProcessedData {
+    fineGrainedLineage: FineGrainedLineageData;
+    flowNodes: LineageVisualizationNode[];
+    flowEdges: Edge[];
+    resetPositions: boolean;
+}
+
+export default function useComputeGraph(urn: string, type: EntityType): ProcessedData {
+    const ignoreSchemaFieldStatus = useIgnoreSchemaFieldStatus();
+    const {
+        nodes,
+        edges,
+        adjacencyList,
+        nodeVersion,
+        dataVersion,
+        displayVersion,
+        hideTransformations,
+        showGhostEntities,
+    } = useContext(LineageNodesContext);
+    const entityRegistry = useEntityRegistryV2();
+    const displayVersionNumber = displayVersion[0];
+
+    const fineGrainedLineage = useMemo(
+        () => {
+            const fgl = getFineGrainedLineage({ nodes, edges }, entityRegistry);
+            console.debug(fgl);
+            return fgl;
+        }, // eslint-disable-next-line react-hooks/exhaustive-deps
+        [nodes, dataVersion],
+    );
+
+    const prevHideTransformations = usePrevious(hideTransformations);
+    const { flowNodes, flowEdges, resetPositions } = useMemo(
+        () => {
+            const smallContext = { nodes, edges, adjacencyList };
+            console.debug(smallContext);
+
+            // Computed before nodes are hidden by `hideNodes`, to keep node order consistent.
+            // Includes nodes that will be hidden, but they'll be filtered out by `getDisplayedNodes`.
+            const orderedNodes = {
+                [LineageDirection.Upstream]: orderNodes(urn, LineageDirection.Upstream, smallContext),
+                [LineageDirection.Downstream]: orderNodes(urn, LineageDirection.Downstream, smallContext),
+            };
+
+            const config: HideNodesConfig = {
+                hideTransformations,
+                hideGhostEntities: !showGhostEntities,
+                ignoreSchemaFieldStatus,
+            };
+            const newSmallContext = hideNodes(urn, config, smallContext);
+            console.debug(newSmallContext);
+
+            const { displayedNodes, parents } = getDisplayedNodes(urn, orderedNodes, newSmallContext);
+            const nodeBuilder = new NodeBuilder(urn, type, displayedNodes, parents);
+
+            const orderIndices = {
+                [urn]: 0,
+                ...Object.fromEntries(orderedNodes[LineageDirection.Downstream].map((e, idx) => [e.id, idx + 1])),
+                ...Object.fromEntries(orderedNodes[LineageDirection.Upstream].map((e, idx) => [e.id, -idx - 1])),
+            };
+            return {
+                flowNodes: nodeBuilder
+                    .createNodes(newSmallContext, ignoreSchemaFieldStatus)
+                    .sort((a, b) => (orderIndices[a.id] || 0) - (orderIndices[b.id] || 0)),
+                flowEdges: nodeBuilder.createEdges(newSmallContext.edges),
+                resetPositions: prevHideTransformations !== hideTransformations,
+            };
+        }, // eslint-disable-next-line react-hooks/exhaustive-deps
+        [
+            urn,
+            type,
+            nodes,
+            edges,
+            adjacencyList,
+            nodeVersion,
+            displayVersionNumber,
+            hideTransformations,
+            prevHideTransformations,
+            showGhostEntities,
+            ignoreSchemaFieldStatus,
+            dataVersion,
+        ],
+    );
+
+    return { flowNodes, flowEdges, fineGrainedLineage, resetPositions };
+}
diff --git a/datahub-web-react/src/app/lineageV2/useLineageV2.ts b/datahub-web-react/src/app/lineageV2/useLineageV2.ts
new file mode 100644
index 00000000000000..10b6c3dc3cee5b
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/useLineageV2.ts
@@ -0,0 +1,6 @@
+import { useAppConfig } from '../useAppConfig';
+
+export function useLineageV2(): boolean {
+    const appConfig = useAppConfig();
+    return appConfig.config.featureFlags.lineageGraphV2;
+}
diff --git a/datahub-web-react/src/app/lineageV2/useNodeHighlighting.ts b/datahub-web-react/src/app/lineageV2/useNodeHighlighting.ts
new file mode 100644
index 00000000000000..495fa322986692
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/useNodeHighlighting.ts
@@ -0,0 +1,57 @@
+import { useContext, useMemo } from 'react';
+import { Node, useReactFlow } from 'reactflow';
+import { LineageDirection } from '../../types.generated';
+import { createEdgeId, LineageNode, LineageNodesContext, NodeContext } from './common';
+
+export default function useNodeHighlighting(hoveredNode: string | null): {
+    highlightedNodes: Set<string>;
+    highlightedEdges: Set<string>;
+} {
+    const { adjacencyList } = useContext(LineageNodesContext);
+    const { getNode } = useReactFlow<LineageNode>();
+    const { highlightedNodes, highlightedEdges } = useMemo(() => {
+        const node = hoveredNode ? getNode(hoveredNode) : null;
+        return computeHighlights(node, adjacencyList);
+    }, [hoveredNode, adjacencyList, getNode]);
+
+    return { highlightedNodes, highlightedEdges };
+}
+
+/** Compute highlighted nodes and table->table edges. */
+function computeHighlights(
+    node: Node<LineageNode> | undefined | null,
+    adjacencyList: NodeContext['adjacencyList'],
+): {
+    highlightedNodes: Set<string>;
+    highlightedEdges: Set<string>;
+} {
+    const highlightedNodes = new Set<string>();
+    const highlightedEdges = new Set<string>();
+    if (!node) {
+        return { highlightedNodes, highlightedEdges };
+    }
+    Object.entries(adjacencyList).forEach(([direction, neighborMap]) => {
+        const seen = new Set<string>();
+        const toVisit = [node.id];
+        while (toVisit.length) {
+            const urn = toVisit.pop();
+            if (urn === undefined) {
+                break;
+            }
+            highlightedNodes.add(urn);
+            neighborMap.get(urn)?.forEach((childUrn) => {
+                if (!seen.has(childUrn)) {
+                    seen.add(childUrn);
+                    toVisit.push(childUrn);
+                }
+                if (direction === LineageDirection.Downstream) {
+                    highlightedEdges.add(createEdgeId(urn, childUrn));
+                } else {
+                    highlightedEdges.add(createEdgeId(childUrn, urn));
+                }
+            });
+        }
+    });
+
+    return { highlightedNodes, highlightedEdges };
+}
diff --git a/datahub-web-react/src/app/lineageV2/useSearchAcrossLineage.ts b/datahub-web-react/src/app/lineageV2/useSearchAcrossLineage.ts
new file mode 100644
index 00000000000000..f114eac6288ee3
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/useSearchAcrossLineage.ts
@@ -0,0 +1,333 @@
+import { useEffect, useState } from 'react';
+import { useSearchAcrossLineageStructureLazyQuery } from '../../graphql/search.generated';
+import { Entity, EntityType, LineageDirection, Maybe, SearchAcrossLineageInput } from '../../types.generated';
+import EntityRegistry from '../entityV2/EntityRegistry';
+import { DBT_URN } from '../ingest/source/builder/constants';
+import { useGetLineageTimeParams } from '../lineage/utils/useGetLineageTimeParams';
+import { DEGREE_FILTER_NAME } from '../search/utils/constants';
+import { useEntityRegistryV2 } from '../useEntityRegistry';
+import {
+    addToAdjacencyList,
+    createEdgeId,
+    FetchStatus,
+    Filters,
+    getEdgeId,
+    isQuery,
+    isTransformational,
+    isUrnTransformational,
+    LINEAGE_FILTER_PAGINATION,
+    LineageEntity,
+    NodeContext,
+    reverseDirection,
+    setDefault,
+} from './common';
+
+const PER_HOP_LIMIT = 2;
+
+/**
+ * Fetches the lineage structure for a given urn and direction, and updates the nodes map with the results.
+ * @param urn Urn for which to fetch lineage
+ * @param type EntityType of the urn
+ * @param context LineageExploreContext storing a map of urn to LineageNode
+ * @param direction Direction for which to fetch lineage
+ * @param lazy Whether to fetch the lineage immediately
+ * @param maxDepth Whether to fetch all lineage, default depth 1
+ * @param skipCache Whether to bypass Apollo and Elasticsearch caches
+ */
+export default function useSearchAcrossLineage(
+    urn: string,
+    type: EntityType,
+    context: NodeContext,
+    direction: LineageDirection,
+    lazy?: boolean,
+    maxDepth?: boolean,
+    skipCache?: boolean,
+): {
+    fetchLineage: () => void;
+    processed: boolean;
+} {
+    const entityRegistry = useEntityRegistryV2();
+    const { startTimeMillis, endTimeMillis } = useGetLineageTimeParams();
+    const { nodes, edges, adjacencyList, rootUrn, setNodeVersion, setDisplayVersion } = context;
+
+    const input: SearchAcrossLineageInput = {
+        urn,
+        direction,
+        types: type === EntityType.SchemaField ? [EntityType.SchemaField] : undefined,
+        start: 0,
+        count: 10000,
+        orFilters: [
+            {
+                and: [
+                    {
+                        field: DEGREE_FILTER_NAME,
+                        values: maxDepth ? ['1', '2', '3+'] : ['1'],
+                    },
+                ],
+            },
+        ],
+        lineageFlags: {
+            startTimeMillis,
+            endTimeMillis,
+            entitiesExploredPerHopLimit: PER_HOP_LIMIT,
+            ignoreAsHops: [
+                {
+                    entityType: EntityType.Dataset,
+                    platforms: [DBT_URN],
+                },
+                {
+                    entityType: EntityType.SchemaField,
+                    platforms: [DBT_URN],
+                },
+                { entityType: EntityType.DataJob },
+            ],
+        },
+        searchFlags: {
+            skipCache: !!skipCache,
+            groupingSpec: { groupingCriteria: [] },
+        },
+    };
+
+    const [processed] = useState(new Set<string>());
+
+    const [fetchLineage, { data }] = useSearchAcrossLineageStructureLazyQuery({
+        variables: { input },
+        fetchPolicy: skipCache ? 'no-cache' : undefined,
+    });
+    useEffect(() => {
+        if (!lazy) {
+            fetchLineage();
+        }
+    }, [fetchLineage, lazy]);
+
+    useEffect(() => {
+        const smallContext = { nodes, edges, adjacencyList };
+        let addedNode = false;
+
+        data?.searchAcrossLineage?.searchResults.forEach((result) => {
+            addedNode = addedNode || !nodes.has(result.entity.urn);
+            const node = setEntityNodeDefault(result.entity.urn, result.entity.type, direction, nodes);
+            if (result.explored || result.ignoredAsHop) {
+                node.fetchStatus = { ...node.fetchStatus, [direction]: FetchStatus.COMPLETE };
+                node.isExpanded = { ...node.isExpanded, [direction]: true };
+            }
+
+            result.paths?.forEach((path) => {
+                if (!path) return;
+                const parent = path.path[path.path.length - 2];
+                if (!parent) return;
+                if (isQuery(parent)) {
+                    const grandparent = path.path[path.path.length - 3];
+                    if (grandparent) {
+                        edges.set(getEdgeId(grandparent.urn, result.entity.urn, direction), { isDisplayed: true });
+                        addToAdjacencyList(adjacencyList, direction, grandparent.urn, result.entity.urn);
+                    }
+                } else {
+                    edges.set(getEdgeId(parent.urn, result.entity.urn, direction), { isDisplayed: true });
+                    addToAdjacencyList(adjacencyList, direction, parent.urn, result.entity.urn);
+                }
+
+                addQueryNodes(path.path, direction, smallContext);
+            });
+        });
+
+        const node = nodes.get(urn);
+        if (data && node) {
+            node.fetchStatus = { ...node.fetchStatus, [direction]: FetchStatus.COMPLETE };
+        }
+
+        if (data) {
+            pruneDuplicateEdges(urn, direction, smallContext, entityRegistry);
+            processed.add(urn);
+            if (addedNode) setNodeVersion((version) => version + 1);
+
+            const nodesToZoom = urn === rootUrn ? [] : [urn, ...(adjacencyList[direction].get(urn) || [])];
+            setDisplayVersion(([version]) => [version + 1, nodesToZoom]);
+        }
+    }, [
+        urn,
+        data,
+        direction,
+        nodes,
+        edges,
+        adjacencyList,
+        rootUrn,
+        setNodeVersion,
+        setDisplayVersion,
+        maxDepth,
+        entityRegistry,
+        processed,
+    ]);
+
+    return { fetchLineage, processed: processed.has(urn) };
+}
+
+/**
+ * Remove direct edges between non-transformational nodes, if there is a path between them through only transformational nodes.
+ * This prevents the graph from being cluttered with effectively duplicate edges.
+ * @param urn Urn for which to remove parent edges.
+ * @param direction Direction to look for parents.
+ * @param context Lineage node context.
+ * @param entityRegistry EntityRegistry, used to get EntityType from an urn.
+ */
+export function pruneDuplicateEdges(
+    urn: string,
+    direction: LineageDirection | null,
+    context: Pick<NodeContext, 'adjacencyList' | 'edges'>,
+    entityRegistry: EntityRegistry,
+) {
+    const { edges } = context;
+    const neighbors: Record<LineageDirection, Set<string>> = {
+        [LineageDirection.Downstream]: new Set(),
+        [LineageDirection.Upstream]: new Set(),
+    };
+
+    const urnIsTransformational = isUrnTransformational(urn, entityRegistry);
+    function getNeighbors(d: LineageDirection) {
+        return getNonTransformationalNeighbors(urn, d, urnIsTransformational, context, entityRegistry);
+    }
+
+    if (direction) {
+        neighbors[direction] = getNeighbors(direction);
+    } else {
+        neighbors[LineageDirection.Upstream] = getNeighbors(LineageDirection.Upstream);
+        neighbors[LineageDirection.Downstream] = getNeighbors(LineageDirection.Downstream);
+    }
+
+    if (urnIsTransformational) {
+        neighbors[LineageDirection.Upstream].forEach((source) => {
+            neighbors[LineageDirection.Downstream].forEach((destination) => {
+                const edge = edges.get(createEdgeId(source, destination));
+                if (edge?.isDisplayed) {
+                    edge.isDisplayed = false;
+                }
+            });
+        });
+    } else {
+        Object.values(LineageDirection).forEach((d) => {
+            neighbors[d].forEach((source) => {
+                const edge = edges.get(getEdgeId(urn, source, d));
+                if (edge?.isDisplayed) {
+                    edge.isDisplayed = false;
+                }
+            });
+        });
+    }
+}
+
+/**
+ * Get the non-transformational nodes that are reachable from `urn` in `direction` via a transformational path.
+ * @param urn Urn for which to get neighbors.
+ * @param direction Direction to look for neighbors.
+ * @param includeDirect If false, only include non-transformational neighbors through a transformational node.
+ * @param adjacencyList Adjacency list of the lineage graph.
+ * @param entityRegistry EntityRegistry, used to get EntityType from an urn.
+ */
+function getNonTransformationalNeighbors(
+    urn: string,
+    direction: LineageDirection,
+    includeDirect: boolean,
+    { adjacencyList }: Pick<NodeContext, 'adjacencyList'>,
+    entityRegistry: EntityRegistry,
+) {
+    const neighbors = new Set<string>();
+    const stack = includeDirect
+        ? [urn]
+        : Array.from(adjacencyList[direction].get(urn) || []).filter((p) => isUrnTransformational(p, entityRegistry));
+    const seen = new Set<string>(stack);
+    for (let u = stack.pop(); u; u = stack.pop()) {
+        Array.from(adjacencyList[direction].get(u) || []).forEach((parent) => {
+            if (isUrnTransformational(parent, entityRegistry)) {
+                if (!seen.has(parent)) {
+                    stack.push(parent);
+                    seen.add(parent);
+                }
+            } else {
+                neighbors.add(parent);
+            }
+        });
+    }
+    return neighbors;
+}
+
+export function setEntityNodeDefault(
+    urn: string,
+    type: EntityType,
+    direction: LineageDirection,
+    nodes: NodeContext['nodes'],
+): LineageEntity {
+    const node = setDefault(nodes, urn, entityNodeDefault(urn, type, direction));
+    if (node.direction && node.direction !== direction && !node.inCycle) {
+        // Node is both upstream and downstream
+        node.inCycle = true;
+        if (node.fetchStatus[direction] === FetchStatus.UNNEEDED) {
+            node.fetchStatus[direction] = FetchStatus.UNFETCHED;
+        }
+    }
+    return node;
+}
+
+function defaultLineageFilter(): Filters {
+    return { limit: LINEAGE_FILTER_PAGINATION, facetFilters: new Map() };
+}
+
+export function entityNodeDefault(urn: string, type: EntityType, direction: LineageDirection): LineageEntity {
+    const otherDirection =
+        direction === LineageDirection.Upstream ? LineageDirection.Downstream : LineageDirection.Upstream;
+    return {
+        id: urn,
+        urn,
+        type,
+        direction, // TODO: Handle a node that is both upstream and downstream?
+        isExpanded: {
+            [direction]: isTransformational({ urn, type }),
+            [otherDirection]: false,
+        } as Record<LineageDirection, boolean>,
+        fetchStatus: {
+            [direction]: FetchStatus.UNFETCHED,
+            [otherDirection]: FetchStatus.UNNEEDED,
+        } as Record<LineageDirection, FetchStatus>,
+        filters: {
+            [LineageDirection.Upstream]: defaultLineageFilter(),
+            [LineageDirection.Downstream]: defaultLineageFilter(),
+        },
+    };
+}
+
+export function addQueryNodes(
+    maybePath: Array<Maybe<Pick<Entity, 'urn' | 'type'>>> | undefined,
+    direction: LineageDirection,
+    context: Pick<NodeContext, 'nodes' | 'edges' | 'adjacencyList'>,
+) {
+    const { nodes, edges, adjacencyList } = context;
+
+    const path = maybePath?.filter((p): p is Pick<Entity, 'urn' | 'type'> => !!p) || [];
+    path.forEach((node, i) => {
+        if (!node || node.type !== EntityType.Query || i === 0 || i === path.length - 1) return;
+        setDefault(nodes, node.urn, {
+            id: node.urn,
+            urn: node.urn,
+            type: node.type,
+            direction,
+            isExpanded: {
+                [LineageDirection.Upstream]: true,
+                [LineageDirection.Downstream]: true,
+            },
+            fetchStatus: {
+                [LineageDirection.Upstream]: FetchStatus.UNNEEDED,
+                [LineageDirection.Downstream]: FetchStatus.UNNEEDED,
+            },
+            filters: {
+                [LineageDirection.Upstream]: defaultLineageFilter(),
+                [LineageDirection.Downstream]: defaultLineageFilter(),
+            },
+        });
+        edges.set(getEdgeId(path[i - 1].urn, path[i + 1].urn, direction), {
+            isDisplayed: true,
+            isManual: false,
+            via: node.urn,
+        });
+        setDefault(adjacencyList[direction], node.urn, new Set()).add(path[i + 1].urn);
+        setDefault(adjacencyList[reverseDirection(direction)], node.urn, new Set()).add(path[i - 1].urn);
+    });
+}
diff --git a/datahub-web-react/src/app/lineageV2/useShouldHideTransformations.ts b/datahub-web-react/src/app/lineageV2/useShouldHideTransformations.ts
new file mode 100644
index 00000000000000..c5ab97d41a6b6b
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/useShouldHideTransformations.ts
@@ -0,0 +1,21 @@
+import { useCallback, useState } from 'react';
+
+export default function useShouldHideTransformations(): [boolean, (value: boolean) => void] {
+    const [hideTransformations, setHideTransformations] = useState(loadFromLocalStorage());
+    const setter = useCallback((value: boolean) => {
+        setHideTransformations(value);
+        saveToLocalStorage(value);
+    }, []);
+
+    return [hideTransformations, setter];
+}
+
+const HIDE_TRANSFORMATIONS_KEY = 'lineageV2__hideTransformations';
+
+function loadFromLocalStorage(): boolean {
+    return localStorage.getItem(HIDE_TRANSFORMATIONS_KEY) === 'true';
+}
+
+function saveToLocalStorage(hideTransformations: boolean) {
+    localStorage.setItem(HIDE_TRANSFORMATIONS_KEY, String(hideTransformations));
+}
diff --git a/datahub-web-react/src/app/onboarding/OnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/OnboardingConfig.tsx
index 7cc382fe8f2798..024ee7f60711e6 100644
--- a/datahub-web-react/src/app/onboarding/OnboardingConfig.tsx
+++ b/datahub-web-react/src/app/onboarding/OnboardingConfig.tsx
@@ -9,6 +9,7 @@ import { PoliciesOnboardingConfig } from './config/PoliciesOnboardingConfig';
 import { RolesOnboardingConfig } from './config/RolesOnboardingConfig';
 import { SearchOnboardingConfig } from './config/SearchOnboardingConfig';
 import { UsersOnboardingConfig } from './config/UsersOnboardingConfig';
+import { ALL_V2_ONBOARDING_CONFIGS } from './configV2';
 import { OnboardingStep } from './OnboardingStep';
 
 const ALL_ONBOARDING_CONFIGS: OnboardingStep[][] = [
@@ -23,6 +24,7 @@ const ALL_ONBOARDING_CONFIGS: OnboardingStep[][] = [
     RolesOnboardingConfig,
     PoliciesOnboardingConfig,
     LineageGraphOnboardingConfig,
+    ...ALL_V2_ONBOARDING_CONFIGS,
 ];
 export const OnboardingConfig: OnboardingStep[] = ALL_ONBOARDING_CONFIGS.reduce(
     (acc, config) => [...acc, ...config],
diff --git a/datahub-web-react/src/app/onboarding/OnboardingContext.tsx b/datahub-web-react/src/app/onboarding/OnboardingContext.tsx
new file mode 100644
index 00000000000000..78efb49f96d4f4
--- /dev/null
+++ b/datahub-web-react/src/app/onboarding/OnboardingContext.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+
+interface Props {
+    tourReshow: boolean;
+    setTourReshow: React.Dispatch<React.SetStateAction<boolean>>;
+    isTourOpen: boolean;
+    setIsTourOpen: React.Dispatch<React.SetStateAction<boolean>>;
+    isUserInitializing: boolean;
+    setIsUserInitializing: React.Dispatch<React.SetStateAction<boolean>>;
+}
+
+const OnboardingContext = React.createContext<Props>({
+    tourReshow: false,
+    setTourReshow: () => {},
+    isTourOpen: false,
+    setIsTourOpen: () => {},
+    isUserInitializing: false,
+    setIsUserInitializing: () => {},
+});
+
+export default OnboardingContext;
diff --git a/datahub-web-react/src/app/onboarding/OnboardingContextProvider.tsx b/datahub-web-react/src/app/onboarding/OnboardingContextProvider.tsx
new file mode 100644
index 00000000000000..a9b9741e227725
--- /dev/null
+++ b/datahub-web-react/src/app/onboarding/OnboardingContextProvider.tsx
@@ -0,0 +1,23 @@
+import React, { useState } from 'react';
+import OnboardingContext from './OnboardingContext';
+
+export const OnboardingContextProvider = ({ children }: { children: React.ReactNode }) => {
+    const [isOpen, setIsOpen] = useState(false);
+    const [reshow, setReshow] = useState(false);
+    const [isNewlyIntroducedUser, setIsNewlyIntroducedUser] = useState(false);
+
+    return (
+        <OnboardingContext.Provider
+            value={{
+                isTourOpen: isOpen,
+                setIsTourOpen: setIsOpen,
+                tourReshow: reshow,
+                setTourReshow: setReshow,
+                isUserInitializing: isNewlyIntroducedUser,
+                setIsUserInitializing: setIsNewlyIntroducedUser,
+            }}
+        >
+            {children}
+        </OnboardingContext.Provider>
+    );
+};
diff --git a/datahub-web-react/src/app/onboarding/OnboardingTour.tsx b/datahub-web-react/src/app/onboarding/OnboardingTour.tsx
index e738cbab6b6bec..4038ee686352ae 100644
--- a/datahub-web-react/src/app/onboarding/OnboardingTour.tsx
+++ b/datahub-web-react/src/app/onboarding/OnboardingTour.tsx
@@ -5,7 +5,10 @@ import { useBatchUpdateStepStatesMutation } from '../../graphql/step.generated';
 import { EducationStepsContext } from '../../providers/EducationStepsContext';
 import { StepStateResult } from '../../types.generated';
 import { useUserContext } from '../context/useUserContext';
+import { REDESIGN_COLORS } from '../entityV2/shared/constants';
+import { useIsThemeV2 } from '../useIsThemeV2';
 import { convertStepId, getConditionalStepIdsToAdd, getStepsToRender } from './utils';
+import useShouldSkipOnboardingTour from './useShouldSkipOnboardingTour';
 
 type Props = {
     stepIds: string[];
@@ -16,7 +19,8 @@ export const OnboardingTour = ({ stepIds }: Props) => {
     const userUrn = useUserContext()?.user?.urn;
     const [isOpen, setIsOpen] = useState(true);
     const [reshow, setReshow] = useState(false);
-    const accentColor = '#5cb7b7';
+    const isThemeV2 = useIsThemeV2();
+    const accentColor = isThemeV2 ? REDESIGN_COLORS.BACKGROUND_PURPLE : '#5cb7b7';
 
     useEffect(() => {
         function handleKeyDown(e) {
@@ -53,7 +57,9 @@ export const OnboardingTour = ({ stepIds }: Props) => {
         });
     }
 
-    if (!filteredSteps.length) return null;
+    const shouldSkipOnboardingTour = useShouldSkipOnboardingTour();
+
+    if (!filteredSteps.length || shouldSkipOnboardingTour) return null;
 
     return (
         <Tour
diff --git a/datahub-web-react/src/app/onboarding/config/EntityProfileOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/config/EntityProfileOnboardingConfig.tsx
index 5aa2a8fdfd30a9..000e045d145daa 100644
--- a/datahub-web-react/src/app/onboarding/config/EntityProfileOnboardingConfig.tsx
+++ b/datahub-web-react/src/app/onboarding/config/EntityProfileOnboardingConfig.tsx
@@ -14,6 +14,7 @@ export const ENTITY_PROFILE_OWNERS_ID = 'entity-profile-owners';
 export const ENTITY_PROFILE_TAGS_ID = 'entity-profile-tags';
 export const ENTITY_PROFILE_GLOSSARY_TERMS_ID = 'entity-profile-glossary-terms';
 export const ENTITY_PROFILE_DOMAINS_ID = 'entity-profile-domains';
+export const ENTITY_PROFILE_V2_SIDEBAR_ID = 'entity-profile-v2-sidebar';
 
 export const EntityProfileOnboardingConfig: OnboardingStep[] = [
     {
@@ -185,4 +186,18 @@ export const EntityProfileOnboardingConfig: OnboardingStep[] = [
             </Typography.Paragraph>
         ),
     },
+    {
+        id: ENTITY_PROFILE_V2_SIDEBAR_ID,
+        selector: `#${ENTITY_PROFILE_V2_SIDEBAR_ID}`,
+        title: 'Introducing the Asset Sidebar',
+        content: (
+            <Typography.Paragraph>
+                <p>
+                    The asset sidebar is a vertically organized set of important information about an asset. It shows up
+                    on the right side of the screen when you view an asset, a search result, a lineage entry and a host
+                    of other places.
+                </p>
+            </Typography.Paragraph>
+        ),
+    },
 ];
diff --git a/datahub-web-react/src/app/onboarding/config/HomePageOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/config/HomePageOnboardingConfig.tsx
index 65c703db38fe9b..b85a918d3fcf16 100644
--- a/datahub-web-react/src/app/onboarding/config/HomePageOnboardingConfig.tsx
+++ b/datahub-web-react/src/app/onboarding/config/HomePageOnboardingConfig.tsx
@@ -7,6 +7,8 @@ import dataHubFlowDiagram from '../../../images/datahub-flow-diagram-light.png';
 export const GLOBAL_WELCOME_TO_DATAHUB_ID = 'global-welcome-to-datahub';
 export const HOME_PAGE_INGESTION_ID = 'home-page-ingestion';
 export const HOME_PAGE_DOMAINS_ID = 'home-page-domains';
+export const HOME_PAGE_DATA_PRODUCTS_ID = 'home-page-data-products';
+export const HOME_PAGE_INSIGHTS_ID = 'home-page-insights';
 export const HOME_PAGE_PLATFORMS_ID = 'home-page-platforms';
 export const HOME_PAGE_MOST_POPULAR_ID = 'home-page-most-popular';
 export const HOME_PAGE_SEARCH_BAR_ID = 'home-page-search-bar';
diff --git a/datahub-web-react/src/app/onboarding/configV2/EntityProfileOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/configV2/EntityProfileOnboardingConfig.tsx
new file mode 100644
index 00000000000000..4dbe362c6d9f41
--- /dev/null
+++ b/datahub-web-react/src/app/onboarding/configV2/EntityProfileOnboardingConfig.tsx
@@ -0,0 +1,175 @@
+import React from 'react';
+import { Typography } from 'antd';
+import { OnboardingStep } from '../OnboardingStep';
+
+export const ENTITY_PROFILE_V2_COLUMNS_ID = 'entity-profile-v2-columns';
+export const ENTITY_PROFILE_V2_CONTENTS_ID = 'entity-profile-v2-contents';
+export const ENTITY_PROFILE_V2_SUBSCRIPTION_ID = 'entity-profile-v2-subscriptions';
+export const ENTITY_PROFILE_V2_DOCUMENTATION_ID = 'entity-profile-v2-documentation';
+export const ENTITY_PROFILE_V2_SIDEBAR_ID = 'entity-profile-v2-sidebar';
+export const ENTITY_SIDEBAR_V2_ABOUT_TAB_ID = 'entity-profile-v2-about';
+export const ENTITY_SIDEBAR_V2_COLUMNS_TAB_ID = 'entity-sidebar-v2-columns-tab';
+export const ENTITY_SIDEBAR_V2_LINEAGE_TAB_ID = 'entity-profile-v2-lineage-tab';
+export const ENTITY_SIDEBAR_V2_PROPERTIES_ID = 'entity-sidebar-v2-properties';
+export const ENTITY_PROFILE_V2_QUERIES_ID = 'entity-profile-v2-queries';
+export const ENTITY_PROFILE_V2_VALIDATION_ID = 'entity-profile-v2-validation';
+export const ENTITY_PROFILE_V2_INCIDENTS_ID = 'entity-profile-v2-incidents';
+
+const EntityProfileOnboardingConfig: OnboardingStep[] = [
+    {
+        id: ENTITY_PROFILE_V2_COLUMNS_ID,
+        selector: `[id^='rc-tabs'][id$='Columns']`,
+        title: 'Columns 🧮',
+        content: (
+            <Typography.Paragraph>
+                <p>
+                    You can view an asset&apos;s <strong>Fields</strong> on this tab.
+                </p>
+                <p>
+                    You can also view or add <strong>Documentation</strong>, <strong>Tags</strong>, and{' '}
+                    <strong>Glossary Terms</strong> for specific fields.
+                </p>
+                <p>Click on individual fields to view more details such as statistics and properties.</p>
+            </Typography.Paragraph>
+        ),
+    },
+    {
+        id: ENTITY_PROFILE_V2_CONTENTS_ID,
+        selector: `[id^='rc-tabs'][id$='Contents']`,
+        title: 'Contents 📦',
+        content: (
+            <Typography.Paragraph>
+                <p>
+                    You can view the child <strong>Assets</strong> that belong to this <strong>Asset</strong> on this
+                    tab.
+                </p>
+            </Typography.Paragraph>
+        ),
+    },
+    {
+        id: ENTITY_PROFILE_V2_DOCUMENTATION_ID,
+        selector: `[id^='rc-tabs'][id$='Documentation']`,
+        title: 'Documentation 📖',
+        content: (
+            <Typography.Paragraph>
+                <p>
+                    You can view and edit rich <strong>Documentation</strong> on this tab.
+                </p>
+                <p>
+                    <strong>Documentation</strong> should provide descriptive information about this data asset to help
+                    your data explorers understand it better. It can also contain links to external resources.
+                </p>
+            </Typography.Paragraph>
+        ),
+    },
+    {
+        id: ENTITY_PROFILE_V2_SIDEBAR_ID,
+        selector: `#${ENTITY_PROFILE_V2_SIDEBAR_ID}`,
+        title: 'Introducing the Asset Sidebar',
+        content: (
+            <Typography.Paragraph>
+                <p>
+                    The asset sidebar is a vertically organized set of important information about an asset. It appears
+                    on the right side of the screen when viewing an asset, a search result, a lineage entry, and many
+                    other places.
+                </p>
+            </Typography.Paragraph>
+        ),
+    },
+    {
+        id: ENTITY_SIDEBAR_V2_ABOUT_TAB_ID,
+        selector: `[id^='entity-sidebar-tabs'][id$='About']`,
+        title: 'Summary',
+        content: (
+            <Typography.Paragraph>
+                <p>Quick access to at-a-glance information about the asset.</p>
+            </Typography.Paragraph>
+        ),
+    },
+    {
+        id: ENTITY_SIDEBAR_V2_COLUMNS_TAB_ID,
+        selector: `[id^='entity-sidebar-tabs'][id$='Columns']`,
+        title: 'Columns',
+        content: (
+            <Typography.Paragraph>
+                <p>
+                    Quick access to an asset&apos;s <strong>Fields</strong> on this tab.
+                </p>
+            </Typography.Paragraph>
+        ),
+    },
+    {
+        id: ENTITY_SIDEBAR_V2_LINEAGE_TAB_ID,
+        selector: `[id^='entity-sidebar-tabs'][id$='Lineage']`,
+        title: 'Lineage 🕸️',
+        content: (
+            <Typography.Paragraph>
+                <p>Quick access to upstream and downstream lineage, both direct and indirect.</p>
+            </Typography.Paragraph>
+        ),
+    },
+    {
+        id: ENTITY_SIDEBAR_V2_PROPERTIES_ID,
+        selector: `[id^='entity-sidebar-tabs'][id$='Properties']`,
+        title: 'Properties 📑',
+        content: (
+            <Typography.Paragraph>
+                <p>
+                    Properties have moved to the asset sidebar! You can view and (soon) edit <strong>Properties</strong>{' '}
+                    on this tab.
+                </p>
+                <p>
+                    Properties are key value pairs that provide additional information about an asset. Some properties
+                    are ingested from the source data platform, while others are added by users.
+                </p>
+            </Typography.Paragraph>
+        ),
+    },
+    {
+        id: ENTITY_PROFILE_V2_QUERIES_ID,
+        selector: `[id^='rc-tabs'][id$='Queries']`,
+        title: 'Queries 🖥️',
+        content: (
+            <Typography.Paragraph>
+                <p>
+                    View highlighted and relevant <strong>Queries</strong> on this tab.
+                </p>
+                <p>Highlighted queries are handpicked by your data experts to help you get started with this asset.</p>
+                <p>Relevant queries are computed based on recency, popularity, and other factors.</p>
+            </Typography.Paragraph>
+        ),
+    },
+    {
+        id: ENTITY_PROFILE_V2_VALIDATION_ID,
+        selector: `[id^='rc-tabs'][id$='Quality']`,
+        title: 'Quality ✔️ ',
+        content: (
+            <Typography.Paragraph>
+                <p>
+                    View <strong>Quality</strong> information on this tab.
+                </p>
+                <p>
+                    Quality information includes <strong>data contracts</strong>and data quality test results.
+                </p>
+            </Typography.Paragraph>
+        ),
+    },
+    {
+        id: ENTITY_PROFILE_V2_INCIDENTS_ID,
+        selector: `[id^='rc-tabs'][id$='Incidents']`,
+        title: 'Incidents ⚠️',
+        content: (
+            <Typography.Paragraph>
+                <p>
+                    View and manage <strong>Incidents</strong> on this tab.
+                </p>
+                <p>
+                    Incidents are issues or events that require attention. They can be related to data quality,
+                    governance, schema changes, and more.
+                </p>
+            </Typography.Paragraph>
+        ),
+    },
+];
+
+export default EntityProfileOnboardingConfig;
diff --git a/datahub-web-react/src/app/onboarding/configV2/HomePageOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/configV2/HomePageOnboardingConfig.tsx
new file mode 100644
index 00000000000000..21f5d36f46eb55
--- /dev/null
+++ b/datahub-web-react/src/app/onboarding/configV2/HomePageOnboardingConfig.tsx
@@ -0,0 +1,158 @@
+import React from 'react';
+import { Image, Typography } from 'antd';
+import { OnboardingStep } from '../OnboardingStep';
+import dataHubFlowDiagram from '../../../images/datahub-flow-diagram-light.png';
+import { ANTD_GRAY } from '../../entityV2/shared/constants';
+
+export const V2_SEARCH_BAR_ID = 'v2-search-bar';
+export const V2_HOME_PAGE_MOST_POPULAR_ID = 'v2-home-page-most-popular';
+export const V2_SEARCH_BAR_VIEWS = 'v2-search-bar-views';
+export const V2_HOME_PAGE_DISCOVER_ID = 'v2-home-page-discover';
+export const V2_HOME_PAGE_ANNOUNCEMENTS_ID = 'v2-home-page-announcements';
+export const V2_HOME_PAGE_PERSONAL_SIDEBAR_ID = 'v2-home-page-personal-sidebar';
+export const V2_HOME_PAGE_PENDING_TASKS_ID = 'v2-home-page-pending-tasks';
+export const V2_HOME_PAGE_LEARNING_CENTER_ID = 'v2-home-page-learning-center';
+export const GLOBAL_WELCOME_TO_ACRYL_ID = 'global-welcome-to-acryl';
+
+const HomePageOnboardingConfig: OnboardingStep[] = [
+    {
+        id: GLOBAL_WELCOME_TO_ACRYL_ID,
+        content: (
+            <div>
+                <div
+                    style={{
+                        width: '540px', // Adjusted width to be wider than the image
+                        borderRadius: '10px',
+                        display: 'flex',
+                        justifyContent: 'center',
+                        alignItems: 'center',
+                        margin: '0 auto 20px auto',
+                    }}
+                >
+                    <Image preview={false} height={184} width={500} src={dataHubFlowDiagram} />
+                </div>
+                <Typography.Title level={3}>Welcome to DataHub! </Typography.Title>
+                <Typography.Paragraph style={{ lineHeight: '22px' }}>
+                    <strong>DataHub</strong> helps you discover, govern and ensure high quality for the important data
+                    within your organization. You can:
+                </Typography.Paragraph>
+                <Typography.Paragraph style={{ lineHeight: '24px' }}>
+                    <ul>
+                        <li>
+                            Quickly <strong>search</strong> for Tables, Dashboards, Data Pipelines, and more
+                        </li>
+                        <li>
+                            Understand <strong>quality</strong> and trustworthiness of data using operational and social
+                            signals
+                        </li>
+                        <li>
+                            View and understand the full <strong>end-to-end lineage</strong> of how data is created,
+                            transformed, and consumed
+                        </li>
+                        <li>
+                            Gain <strong>insights</strong> about how others within your organization are using data
+                        </li>
+                        <li>
+                            Define <strong>ownership</strong> and capture <strong>knowledge</strong> to empower others
+                        </li>
+                        <li>
+                            Create and manage <strong>central governance standards</strong> for data assets to drive
+                            accountability and trust
+                        </li>
+                    </ul>
+                    <p>Let&apos;s get started! 🚀</p>
+                    <div
+                        style={{
+                            backgroundColor: ANTD_GRAY[4],
+                            opacity: '0.7',
+                            borderRadius: '4px',
+                            height: '40px',
+                            display: 'flex',
+                            alignItems: 'center',
+                        }}
+                    >
+                        <span style={{ paddingLeft: '5px' }}>💡</span>
+                        <span style={{ paddingLeft: '10px' }}>
+                            Press <strong>Cmd + Ctrl + T</strong> to open up this tutorial at any time.
+                        </span>
+                    </div>
+                </Typography.Paragraph>
+            </div>
+        ),
+        style: { minWidth: '650px' },
+    },
+    {
+        id: V2_SEARCH_BAR_ID,
+        selector: `#${V2_SEARCH_BAR_ID}`,
+        title: 'Find your Data 🔍',
+        content: (
+            <Typography.Paragraph>
+                <p>
+                    This is the <strong>Search Bar</strong>. It will serve as your launch point for discovering and
+                    collaborating around the data most important to you.
+                </p>
+            </Typography.Paragraph>
+        ),
+    },
+    {
+        id: V2_SEARCH_BAR_VIEWS,
+        selector: `#${V2_SEARCH_BAR_VIEWS}`,
+        title: 'Only the stuff you need 📷',
+        content: (
+            <Typography.Paragraph>
+                <p>
+                    Views help you focus on the assets that you care about. You can switch between views using the
+                    dropdown. Your admin will configure the views that make sense for your organization. You can
+                    customize and create your own views as well.
+                </p>
+            </Typography.Paragraph>
+        ),
+    },
+    {
+        id: V2_HOME_PAGE_MOST_POPULAR_ID,
+        selector: `#${V2_HOME_PAGE_MOST_POPULAR_ID}`,
+        title: 'Explore Most Popular',
+        content: "Here you'll find the assets that are viewed most frequently within your organization.",
+    },
+    {
+        id: V2_HOME_PAGE_DISCOVER_ID,
+        selector: `#${V2_HOME_PAGE_DISCOVER_ID}`,
+        title: 'Discover 🔍',
+        content: (
+            <Typography.Paragraph>
+                <p>
+                    The <strong> Discover</strong> section serves as your exploration center for discovering new areas
+                    of your data estate. You can explore Domains, Platforms, and more.
+                </p>
+            </Typography.Paragraph>
+        ),
+    },
+    {
+        id: V2_HOME_PAGE_ANNOUNCEMENTS_ID,
+        selector: `#${V2_HOME_PAGE_ANNOUNCEMENTS_ID}`,
+        title: 'Announcements 📣',
+        content: (
+            <Typography.Paragraph>
+                <p>
+                    The <strong> Announcements</strong> tab contains important updates and information from your
+                    organization. Be sure to check it out frequently!
+                </p>
+            </Typography.Paragraph>
+        ),
+    },
+    {
+        id: V2_HOME_PAGE_PERSONAL_SIDEBAR_ID,
+        selector: `#${V2_HOME_PAGE_PERSONAL_SIDEBAR_ID}`,
+        title: 'Your Personal Sidebar 📌',
+        content: (
+            <Typography.Paragraph>
+                <p>
+                    This is your <strong> Personal Sidebar</strong>. It contains links to assets you own, groups you are
+                    in, your subscriptions and more.
+                </p>
+            </Typography.Paragraph>
+        ),
+    },
+];
+
+export default HomePageOnboardingConfig;
diff --git a/datahub-web-react/src/app/onboarding/configV2/index.ts b/datahub-web-react/src/app/onboarding/configV2/index.ts
new file mode 100644
index 00000000000000..783a2333871af2
--- /dev/null
+++ b/datahub-web-react/src/app/onboarding/configV2/index.ts
@@ -0,0 +1,5 @@
+import { OnboardingStep } from '../OnboardingStep';
+import EntityProfileOnboardingConfig from './EntityProfileOnboardingConfig';
+import HomePageOnboardingConfig from './HomePageOnboardingConfig';
+
+export const ALL_V2_ONBOARDING_CONFIGS: OnboardingStep[][] = [EntityProfileOnboardingConfig, HomePageOnboardingConfig];
diff --git a/datahub-web-react/src/app/onboarding/useHandleOnboardingTour.ts b/datahub-web-react/src/app/onboarding/useHandleOnboardingTour.ts
new file mode 100644
index 00000000000000..b8601713ef4f14
--- /dev/null
+++ b/datahub-web-react/src/app/onboarding/useHandleOnboardingTour.ts
@@ -0,0 +1,34 @@
+import { useContext, useEffect } from 'react';
+import OnboardingContext from './OnboardingContext';
+
+export const useHandleOnboardingTour = () => {
+    const { setTourReshow, setIsTourOpen } = useContext(OnboardingContext);
+
+    const showOnboardingTour = () => {
+        setTourReshow(true);
+        setIsTourOpen(true);
+    };
+
+    const hideOnboardingTour = () => {
+        setTourReshow(false);
+        setIsTourOpen(false);
+    };
+
+    function handleKeyDown(e) {
+        // Allow reshow if Cmnd + Ctrl + T is pressed
+        if (e.metaKey && e.ctrlKey && e.key === 't') {
+            showOnboardingTour();
+        }
+        if (e.metaKey && e.ctrlKey && e.key === 'h') {
+            hideOnboardingTour();
+        }
+    }
+
+    useEffect(() => {
+        document.addEventListener('keydown', handleKeyDown);
+
+        return () => document.removeEventListener('keydown', handleKeyDown);
+    });
+
+    return { showOnboardingTour };
+};
diff --git a/datahub-web-react/src/app/onboarding/useShouldSkipOnboardingTour.ts b/datahub-web-react/src/app/onboarding/useShouldSkipOnboardingTour.ts
new file mode 100644
index 00000000000000..112c82bf65e993
--- /dev/null
+++ b/datahub-web-react/src/app/onboarding/useShouldSkipOnboardingTour.ts
@@ -0,0 +1,8 @@
+// this key is used in commands.js to turn off onboarding tours in cypress tests
+const SKIP_ONBOARDING_TOUR_KEY = 'skipOnboardingTour';
+
+export default function useShouldSkipOnboardingTour() {
+    const shouldSkipOnboardingTour = localStorage.getItem(SKIP_ONBOARDING_TOUR_KEY);
+
+    return shouldSkipOnboardingTour === 'true';
+}
diff --git a/datahub-web-react/src/app/onboarding/useUpdateEducationStepsAllowList.tsx b/datahub-web-react/src/app/onboarding/useUpdateEducationStepsAllowList.tsx
index 86b9000205b8b5..43c2ba6616603e 100644
--- a/datahub-web-react/src/app/onboarding/useUpdateEducationStepsAllowList.tsx
+++ b/datahub-web-react/src/app/onboarding/useUpdateEducationStepsAllowList.tsx
@@ -1,22 +1,38 @@
-import { useContext } from 'react';
+import { useContext, useEffect } from 'react';
 import { EducationStepsContext } from '../../providers/EducationStepsContext';
 
 // function use
 
-export function useUpdateEducationStepsAllowList() {
+export function useUpdateEducationStepsAllowList(condition?: boolean, id?: string) {
     const { educationStepIdsAllowlist, setEducationStepIdsAllowlist } = useContext(EducationStepsContext);
 
-    function removeIdFromAllowList(id: string) {
+    function removeIdFromAllowList(newId: string) {
         const newStepdIdsAllowlist: Set<string> = new Set(educationStepIdsAllowlist);
-        newStepdIdsAllowlist.delete(id);
+        newStepdIdsAllowlist.delete(newId);
         setEducationStepIdsAllowlist(newStepdIdsAllowlist);
     }
 
-    function addIdToAllowList(id: string) {
+    function addIdToAllowList(newId: string) {
         const newStepdIdsAllowlist: Set<string> = new Set(educationStepIdsAllowlist);
-        newStepdIdsAllowlist.add(id);
+        newStepdIdsAllowlist.add(newId);
         setEducationStepIdsAllowlist(newStepdIdsAllowlist);
     }
 
+    useEffect(() => {
+        if (!id) return;
+
+        const allowlistIncludesStepId = educationStepIdsAllowlist.has(id);
+
+        if (condition && !allowlistIncludesStepId) {
+            const newStepdIdsAllowlist: Set<string> = new Set(educationStepIdsAllowlist);
+            newStepdIdsAllowlist.add(id);
+            setEducationStepIdsAllowlist(newStepdIdsAllowlist);
+        } else if (!condition && allowlistIncludesStepId) {
+            const newStepdIdsAllowlist: Set<string> = new Set(educationStepIdsAllowlist);
+            newStepdIdsAllowlist.delete(id);
+            setEducationStepIdsAllowlist(newStepdIdsAllowlist);
+        }
+    }, [condition, id, educationStepIdsAllowlist, setEducationStepIdsAllowlist]);
+
     return { removeIdFromAllowList, addIdToAllowList };
 }
diff --git a/datahub-web-react/src/app/permissions/policy/PolicyPrivilegeForm.tsx b/datahub-web-react/src/app/permissions/policy/PolicyPrivilegeForm.tsx
index 414346c2776db8..619a4b9a7ecc8a 100644
--- a/datahub-web-react/src/app/permissions/policy/PolicyPrivilegeForm.tsx
+++ b/datahub-web-react/src/app/permissions/policy/PolicyPrivilegeForm.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { Link } from 'react-router-dom';
-import { Form, Select, Tag, Tooltip, Typography, Tag as CustomTag } from 'antd';
+import { Form, Select, Tag, Typography, Tag as CustomTag } from 'antd';
+import { Tooltip } from '@components';
 import styled from 'styled-components/macro';
 
 import { useEntityRegistry } from '../../useEntityRegistry';
@@ -92,8 +93,9 @@ export default function PolicyPrivilegeForm({
     const [isFocusedOnInput, setIsFocusedOnInput] = useState(false);
     const [inputValue, setInputValue] = useState('');
     const [tagTermSearch, { data: tagTermSearchData }] = useGetSearchResultsLazyQuery();
-    const [recommendedData] = useGetRecommendations([EntityType.Tag]);
-    const tagSearchResults = tagTermSearchData?.search?.searchResults?.map((searchResult) => searchResult.entity) || [];
+    const { recommendedData } = useGetRecommendations([EntityType.Tag]);
+    const tagSearchResults: Array<Entity> =
+        tagTermSearchData?.search?.searchResults?.map((searchResult) => searchResult.entity) || [];
 
     const inputEl = useRef(null);
 
@@ -620,6 +622,9 @@ export default function PolicyPrivilegeForm({
                             {tagProps.label}
                         </Tag>
                     )}
+                    filterOption={(input, option) => {
+                        return !!option?.children?.toString().toLowerCase().includes(input.toLowerCase());
+                    }}
                 >
                     {privilegeOptions.map((priv, index) => {
                         const key = `${priv.type}-${index}`;
diff --git a/datahub-web-react/src/app/previewV2/BrowsePaths.tsx b/datahub-web-react/src/app/previewV2/BrowsePaths.tsx
new file mode 100644
index 00000000000000..81de58c403d77f
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/BrowsePaths.tsx
@@ -0,0 +1,113 @@
+import { Maybe } from 'graphql/jsutils/Maybe';
+import React from 'react';
+import styled from 'styled-components';
+import { BrowsePathEntry, BrowsePathV2 } from '../../types.generated';
+import { REDESIGN_COLORS } from '../entityV2/shared/constants';
+import { Ellipsis, StyledTooltip } from '../entityV2/shared/containers/profile/header/PlatformContent/ParentNodesView';
+import ContextPathEntityLink from './ContextPathEntityLink';
+import { PreviewType } from '../entityV2/Entity';
+import { ContextPathSeparator } from './ContextPathSeparator';
+
+export const PlatformText = styled.div<{
+    $maxWidth?: number;
+    $previewType?: Maybe<PreviewType>;
+    $isCompactView?: boolean;
+}>`
+    color: ${REDESIGN_COLORS.TEXT_GREY};
+    white-space: nowrap;
+    font-family: Mulish;
+    font-style: normal;
+    font-weight: 500;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    display: flex;
+    align-items: center;
+    ${(props) => (props.$isCompactView ? '12px' : '13px')}
+    ${(props) => props.$maxWidth && `max-width: ${props.$maxWidth}px;`}
+`;
+
+export function getParentBrowsePathNames(browsePaths?: Maybe<BrowsePathEntry>[] | null) {
+    let parentNames = '';
+    if (browsePaths) {
+        [...browsePaths].reverse().forEach((path, index) => {
+            if (path?.name) {
+                if (index !== 0) {
+                    parentNames += ' > ';
+                }
+                parentNames += path.name;
+            }
+        });
+    }
+    return parentNames;
+}
+
+const PlatFormTitle = styled.span`
+    display: inline-block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    color: ${REDESIGN_COLORS.TEXT_GREY};
+`;
+
+const ParentNodesWrapper = styled.div`
+    align-items: center;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    display: flex;
+    max-width: 460px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+`;
+
+interface Props {
+    previewType?: Maybe<PreviewType>;
+    browsePaths?: Maybe<BrowsePathV2> | undefined;
+    contentRef: React.RefObject<HTMLDivElement>;
+    isContentTruncated: boolean;
+}
+
+const BrowsePathSection = ({ path }: { path: BrowsePathEntry }) => {
+    if (!path.entity) {
+        return <PlatFormTitle>{path.name}</PlatFormTitle>;
+    }
+    return <ContextPathEntityLink key={path?.entity?.urn} entity={path?.entity} style={{ fontSize: '12px' }} />;
+};
+
+function BrowsePaths(props: Props) {
+    const { previewType, browsePaths, contentRef, isContentTruncated } = props;
+
+    const parentPath = browsePaths?.path?.[0];
+    const remainingParentPaths = browsePaths?.path && browsePaths.path.slice(1, browsePaths.path.length);
+
+    return (
+        <StyledTooltip
+            title={getParentBrowsePathNames(browsePaths?.path)}
+            overlayStyle={isContentTruncated ? {} : { display: 'none' }}
+            maxWidth={previewType === PreviewType.HOVER_CARD ? 300 : 620}
+        >
+            {isContentTruncated && <Ellipsis>...</Ellipsis>}
+            {/* To avoid rendering a empty div */}
+            {(parentPath || remainingParentPaths) && (
+                <ParentNodesWrapper ref={contentRef}>
+                    {parentPath && (
+                        <PlatformText>
+                            <BrowsePathSection path={parentPath} />
+                            {remainingParentPaths && remainingParentPaths?.length > 0 && <ContextPathSeparator />}
+                        </PlatformText>
+                    )}
+                    {remainingParentPaths &&
+                        remainingParentPaths.map((container, index) => {
+                            return (
+                                <PlatformText>
+                                    <BrowsePathSection path={container} />
+                                    {index < remainingParentPaths.length - 1 && <ContextPathSeparator />}
+                                </PlatformText>
+                            );
+                        })}
+                </ParentNodesWrapper>
+            )}
+        </StyledTooltip>
+    );
+}
+
+export default BrowsePaths;
diff --git a/datahub-web-react/src/app/previewV2/CardActionCircle.tsx b/datahub-web-react/src/app/previewV2/CardActionCircle.tsx
new file mode 100644
index 00000000000000..93fa8176f206f0
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/CardActionCircle.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../entityV2/shared/constants';
+
+type Props = {
+    icon: any;
+    onClick?: () => void;
+    enabled?: boolean;
+};
+
+const IconContainer = styled.div<{ enabled?: boolean }>`
+    width: 28px;
+    height: 28px;
+    background-color: #f7f7f7;
+    cursor: pointer;
+    border-radius: 50%;
+    text-align: center;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    & svg {
+        font-size: 14px;
+        color: #5d668b;
+    }
+    border: 1px solid #eee;
+    :hover {
+        border: 1px solid ${({ enabled }) => (enabled ? '#3F54D1' : ANTD_GRAY['4'])};
+    }
+`;
+
+const CardActionCircle = ({ icon, onClick, enabled }: Props) => {
+    return (
+        <IconContainer enabled={enabled} onClick={onClick}>
+            {icon}
+        </IconContainer>
+    );
+};
+
+export default CardActionCircle;
diff --git a/datahub-web-react/src/app/previewV2/ColoredBackgroundPlatformIconGroup.tsx b/datahub-web-react/src/app/previewV2/ColoredBackgroundPlatformIconGroup.tsx
new file mode 100644
index 00000000000000..c67defc5a759cd
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/ColoredBackgroundPlatformIconGroup.tsx
@@ -0,0 +1,100 @@
+import { Tooltip } from '@components';
+import { Maybe } from 'graphql/jsutils/Maybe';
+import OutputIcon from '@mui/icons-material/Output';
+import React from 'react';
+import styled from 'styled-components';
+import ImageWithColoredBackground, { Icon } from './ImageWIthColoredBackground';
+import { ANTD_GRAY } from '../entityV2/shared/constants';
+import { useIsShowSeparateSiblingsEnabled } from '../useAppConfig';
+
+const LogoIcon = styled.span`
+    display: flex;
+    gap: 5px;
+    margin-right: 8px;
+`;
+
+export const PlatformContentWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    margin: 0 8px 8px 0;
+    flex-wrap: nowrap;
+    flex: 1;
+`;
+
+interface Props {
+    platformName?: string;
+    platformLogoUrl?: Maybe<string>;
+    platformNames?: Maybe<string>[];
+    platformLogoUrls?: Maybe<string>[];
+    entityLogoComponent?: JSX.Element;
+    isOutputPort?: boolean;
+    icon?: React.ReactNode;
+    backgroundSize?: number;
+    imgSize?: number;
+}
+
+export default function ColoredBackgroundPlatformIconGroup(props: Props) {
+    const {
+        platformName,
+        platformLogoUrl,
+        platformNames,
+        platformLogoUrls,
+        entityLogoComponent,
+        isOutputPort,
+        icon,
+        imgSize = 18,
+        backgroundSize = 32,
+    } = props;
+
+    const shouldShowSeparateSiblings = useIsShowSeparateSiblingsEnabled();
+    const showSiblingPlatformLogos = !shouldShowSeparateSiblings && !!platformLogoUrls;
+
+    const renderLogoIcon = () => {
+        if (icon) {
+            // Render only the provided icon
+            return <LogoIcon>{icon}</LogoIcon>;
+        }
+
+        // Render other icons
+        return (
+            <>
+                {platformName && (
+                    <LogoIcon>
+                        {!platformLogoUrl && !showSiblingPlatformLogos && entityLogoComponent}
+                        {!!platformLogoUrl && !showSiblingPlatformLogos && (
+                            <ImageWithColoredBackground
+                                src={platformLogoUrl}
+                                alt={platformName || ''}
+                                borderRadius={10}
+                                backgroundSize={backgroundSize}
+                                imgSize={imgSize}
+                            />
+                        )}
+                        {!!showSiblingPlatformLogos &&
+                            [...new Set(platformLogoUrls)]
+                                .slice(0, 2)
+                                .map((url, idx) => (
+                                    <ImageWithColoredBackground
+                                        key={url}
+                                        borderRadius={10}
+                                        backgroundSize={backgroundSize}
+                                        imgSize={imgSize}
+                                        src={url || ''}
+                                        alt={platformNames?.[idx] || ''}
+                                    />
+                                ))}
+                        {isOutputPort && (
+                            <Tooltip title="This asset is an output port for this Data Product" placement="topLeft">
+                                <Icon size={backgroundSize} background={ANTD_GRAY[4]} borderRadius={10}>
+                                    <OutputIcon style={{ fontSize: imgSize }} htmlColor={ANTD_GRAY[8]} />
+                                </Icon>
+                            </Tooltip>
+                        )}
+                    </LogoIcon>
+                )}
+            </>
+        );
+    };
+
+    return <PlatformContentWrapper>{renderLogoIcon()}</PlatformContentWrapper>;
+}
diff --git a/datahub-web-react/src/app/previewV2/CompactView.tsx b/datahub-web-react/src/app/previewV2/CompactView.tsx
new file mode 100644
index 00000000000000..13248760f818ca
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/CompactView.tsx
@@ -0,0 +1,170 @@
+import ViewInPlatform from '@app/entityV2/shared/externalUrl/ViewInPlatform';
+import { ActionsAndStatusSection } from '@app/previewV2/shared';
+import React from 'react';
+import styled from 'styled-components';
+import { Maybe } from 'graphql/jsutils/Maybe';
+import ColoredBackgroundPlatformIconGroup, { PlatformContentWrapper } from './ColoredBackgroundPlatformIconGroup';
+import MoreOptionsMenuAction from '../entityV2/shared/EntityDropdown/MoreOptionsMenuAction';
+import EntityHeader from './EntityHeader';
+import { PreviewType } from '../entity/Entity';
+import { BrowsePathV2, Deprecation, Entity, EntityType, Health } from '../../types.generated';
+import { EntityMenuActions } from '../entityV2/Entity';
+import { EntityMenuItems } from '../entityV2/shared/EntityDropdown/EntityMenuActions';
+import { GenericEntityProperties } from '../entity/shared/types';
+import ContextPath from './ContextPath';
+import { REDESIGN_COLORS } from '../entityV2/shared/constants';
+
+const RowContainer = styled.div`
+    display: flex;
+    flex-direction: row;
+    width: 100%;
+    align-items: self-start;
+    justify-content: space-between;
+
+    ${PlatformContentWrapper} {
+        max-width: fit-content;
+        margin: 0px;
+        margin-right: 5px;
+    }
+`;
+
+const CompactActionsAndStatusSection = styled(ActionsAndStatusSection)`
+    justify-content: end;
+    margin-right: -0.3rem;
+`;
+
+const PlatformDivider = styled.div`
+    font-size: 16px;
+    margin-right: 0.5rem;
+    margin-top: -3px;
+    color: ${REDESIGN_COLORS.TEXT_GREY};
+`;
+
+interface Props {
+    name: string;
+    urn: string;
+    data: GenericEntityProperties | null;
+    isIconPresent: boolean;
+    url: string;
+    entityType: EntityType;
+    platform?: string;
+    platforms?: Maybe<string | undefined>[];
+    deprecation?: Deprecation | null;
+    titleSizePx?: number;
+    onClick?: () => void;
+    // this is provided by the impact analysis view. it is used to display
+    // how the listed node is connected to the source node
+    degree?: number;
+    previewType?: Maybe<PreviewType>;
+    health?: Health[];
+    // eslint-disable-next-line react/no-unused-prop-types
+    description?: string;
+    // eslint-disable-next-line react/no-unused-prop-types
+    qualifier?: string | null;
+    isOutputPort?: boolean;
+    headerDropdownItems?: Set<EntityMenuItems>;
+    actions?: EntityMenuActions;
+    entityIcon?: JSX.Element;
+    logoUrls?: Maybe<string | undefined>[];
+    logoUrl?: string;
+    previewData: GenericEntityProperties | null;
+    platformInstanceId?: string;
+    typeIcon?: JSX.Element;
+    finalType?: string | undefined;
+    parentEntities?: Entity[] | null;
+    contentRef: React.RefObject<HTMLDivElement>;
+    browsePaths?: BrowsePathV2 | undefined;
+}
+
+export const CompactView = ({
+    data,
+    name,
+    onClick,
+    titleSizePx,
+    url,
+    degree,
+    deprecation,
+    actions,
+    health,
+    previewData,
+    isIconPresent,
+    platform,
+    logoUrl,
+    platforms,
+    logoUrls,
+    isOutputPort,
+    entityIcon,
+    headerDropdownItems,
+    previewType,
+    urn,
+    entityType,
+    platformInstanceId,
+    typeIcon,
+    finalType,
+    parentEntities, // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    contentRef,
+    browsePaths,
+}: Props) => {
+    return (
+        <>
+            <RowContainer>
+                <EntityHeader
+                    name={name}
+                    onClick={onClick}
+                    previewType={previewType}
+                    titleSizePx={titleSizePx}
+                    url={url}
+                    urn={urn}
+                    deprecation={deprecation}
+                    health={health}
+                    degree={degree}
+                    connectionName={previewData?.name}
+                />
+                <CompactActionsAndStatusSection>
+                    <ViewInPlatform data={data} urn={urn} />
+                    {headerDropdownItems && previewType !== PreviewType.HOVER_CARD && (
+                        <MoreOptionsMenuAction
+                            menuItems={headerDropdownItems}
+                            urn={urn}
+                            entityType={entityType}
+                            entityData={previewData}
+                            triggerType={['click']}
+                            actions={actions}
+                        />
+                    )}
+                </CompactActionsAndStatusSection>
+            </RowContainer>
+            <RowContainer>
+                {isIconPresent ? (
+                    <div style={{ display: 'flex', alignItems: 'center' }}>
+                        <ColoredBackgroundPlatformIconGroup
+                            platformName={platform}
+                            platformLogoUrl={logoUrl}
+                            platformNames={platforms}
+                            platformLogoUrls={logoUrls}
+                            isOutputPort={isOutputPort}
+                            icon={entityIcon}
+                            imgSize={10}
+                            backgroundSize={20}
+                        />
+                        <PlatformDivider> | </PlatformDivider>
+                    </div>
+                ) : (
+                    <div />
+                )}
+                <ContextPath
+                    instanceId={platformInstanceId}
+                    typeIcon={typeIcon}
+                    type={finalType}
+                    entityType={entityType}
+                    browsePaths={browsePaths}
+                    parentEntities={parentEntities}
+                    contentRef={contentRef}
+                    entityTitleWidth={previewType === PreviewType.HOVER_CARD ? 150 : 200}
+                    previewType={previewType}
+                    isCompactView
+                />
+            </RowContainer>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/previewV2/ContextPath.tsx b/datahub-web-react/src/app/previewV2/ContextPath.tsx
new file mode 100644
index 00000000000000..65c31a0100c315
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/ContextPath.tsx
@@ -0,0 +1,157 @@
+import { Maybe } from 'graphql/jsutils/Maybe';
+import React from 'react';
+import styled from 'styled-components';
+import { BrowsePathEntry, BrowsePathV2, Entity, EntityType } from '../../types.generated';
+import { getSubTypeIcon } from '../entityV2/shared/components/subtypes';
+import { REDESIGN_COLORS } from '../entityV2/shared/constants';
+import ParentEntities from '../searchV2/filters/ParentEntities';
+import { capitalizeFirstLetterOnly } from '../shared/textUtil';
+import { useEntityRegistryV2 } from '../useEntityRegistry';
+import { IconStyleType, PreviewType } from '../entityV2/Entity';
+import BrowsePaths from './BrowsePaths';
+import { ANTD_GRAY } from '../entity/shared/constants';
+import { isDefaultBrowsePath } from './utils';
+
+const PlatformContentWrapper = styled.div`
+    display: flex;
+    flex-wrap: nowrap;
+    flex: 1;
+    align-items: center;
+    max-width: 100%;
+    line-height: 22px;
+    overflow: hidden;
+`;
+
+export const PlatformText = styled.div<{
+    $maxWidth?: number;
+    $previewType?: Maybe<PreviewType>;
+    $isCompactView?: boolean;
+}>`
+    color: ${REDESIGN_COLORS.TEXT_GREY};
+    white-space: nowrap;
+    font-family: Mulish;
+    font-style: normal;
+    font-weight: 500;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    display: flex;
+    align-items: center;
+    ${(props) => (props.$isCompactView ? '12px' : '13px')}
+    ${(props) => props.$maxWidth && `max-width: ${props.$maxWidth}px;`}
+`;
+
+const PlatformDivider = styled.div`
+    padding-left: 6px;
+    margin-right: 6px;
+    font-size: 16px;
+    margin-top: -3px;
+    color: ${ANTD_GRAY[6]};
+`;
+
+export function getParentBrowsePathNames(browsePaths?: Maybe<BrowsePathEntry>[] | null) {
+    let parentNames = '';
+    if (browsePaths) {
+        [...browsePaths].reverse().forEach((path, index) => {
+            if (path?.name) {
+                if (index !== 0) {
+                    parentNames += ' > ';
+                }
+                parentNames += path.name;
+            }
+        });
+    }
+    return parentNames;
+}
+
+const TypeIconWrapper = styled.span`
+    margin-right: 4px;
+    display: flex;
+    svg {
+        font-size: 16px;
+    }
+`;
+
+const PlatFormTitle = styled.span`
+    display: inline-block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    color: ${REDESIGN_COLORS.TEXT_GREY};
+`;
+
+interface Props {
+    // eslint-disable-next-line react/no-unused-prop-types
+    entityLogoComponent?: JSX.Element;
+    instanceId?: string;
+    // eslint-disable-next-line react/no-unused-prop-types
+    typeIcon?: JSX.Element;
+    type?: string;
+    entityType: EntityType;
+    parentEntities?: Entity[] | null;
+    entityTitleWidth?: number;
+    previewType?: Maybe<PreviewType>;
+    isCompactView?: boolean;
+    browsePaths?: Maybe<BrowsePathV2> | undefined;
+    contentRef: React.RefObject<HTMLDivElement>;
+    isContentTruncated?: boolean;
+}
+
+function ContextPath(props: Props) {
+    const {
+        type,
+        entityType,
+        parentEntities,
+        browsePaths,
+        instanceId,
+        entityTitleWidth = 200,
+        previewType,
+        isCompactView,
+        contentRef,
+        isContentTruncated = false,
+    } = props;
+
+    const entityRegistry = useEntityRegistryV2();
+    const entityTypeIcon =
+        getSubTypeIcon(type) || entityRegistry.getIcon(entityType, 16, IconStyleType.ACCENT, '#8d95b1');
+
+    const divider = <PlatformDivider>|</PlatformDivider>;
+
+    const hasPlatformInstance = !!instanceId;
+    const hasBrowsePath = !!browsePaths?.path?.length && !isDefaultBrowsePath(browsePaths);
+    const hasParentEntities = !!parentEntities?.length;
+
+    const showInstanceIdDivider = hasBrowsePath || hasParentEntities;
+    const showEntityTypeDivider = hasPlatformInstance || hasBrowsePath || hasParentEntities;
+
+    return (
+        <PlatformContentWrapper>
+            <PlatformText
+                $maxWidth={entityTitleWidth}
+                $isCompactView={isCompactView}
+                title={capitalizeFirstLetterOnly(type)}
+            >
+                {entityTypeIcon && <TypeIconWrapper>{entityTypeIcon}</TypeIconWrapper>}
+                <PlatFormTitle>{capitalizeFirstLetterOnly(type)}</PlatFormTitle>
+                {showEntityTypeDivider && divider}
+            </PlatformText>
+            {instanceId && (
+                <PlatformText>
+                    {instanceId}
+                    {showInstanceIdDivider && divider}
+                </PlatformText>
+            )}
+            {hasBrowsePath ? (
+                <BrowsePaths
+                    browsePaths={browsePaths}
+                    previewType={previewType}
+                    contentRef={contentRef}
+                    isContentTruncated={isContentTruncated}
+                />
+            ) : (
+                <ParentEntities parentEntities={parentEntities || []} numVisible={3} />
+            )}
+        </PlatformContentWrapper>
+    );
+}
+
+export default ContextPath;
diff --git a/datahub-web-react/src/app/previewV2/ContextPathEntityIcon.tsx b/datahub-web-react/src/app/previewV2/ContextPathEntityIcon.tsx
new file mode 100644
index 00000000000000..2e12169fe3f355
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/ContextPathEntityIcon.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import styled from 'styled-components';
+import { FolderOpenOutlined } from '@ant-design/icons';
+import { Maybe } from 'graphql/jsutils/Maybe';
+import { Entity } from '@types';
+
+const IconWrapper = styled.span`
+    img,
+    svg {
+        height: 12px;
+    }
+`;
+
+const DefaultIcon = styled(FolderOpenOutlined)`
+    &&& {
+        font-size: 14px;
+    }
+`;
+
+interface Props {
+    entity: Maybe<Entity>;
+}
+
+function ContextPathEntityIcon({ entity }: Props) {
+    if (!entity) return null;
+
+    // For now, we keep it simple - each parent shares the same icon within the context path.
+    return (
+        <IconWrapper>
+            <DefaultIcon />
+        </IconWrapper>
+    );
+}
+
+export default ContextPathEntityIcon;
diff --git a/datahub-web-react/src/app/previewV2/ContextPathEntityLink.tsx b/datahub-web-react/src/app/previewV2/ContextPathEntityLink.tsx
new file mode 100644
index 00000000000000..3dce233504dfba
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/ContextPathEntityLink.tsx
@@ -0,0 +1,80 @@
+import { Maybe } from 'graphql/jsutils/Maybe';
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import { Entity } from '@types';
+import { colors } from '@src/alchemy-components';
+import { REDESIGN_COLORS } from '../entityV2/shared/constants';
+import { useEntityRegistry } from '../useEntityRegistry';
+import ContextPathEntityIcon from './ContextPathEntityIcon';
+import { useEmbeddedProfileLinkProps } from '../shared/useEmbeddedProfileLinkProps';
+
+const Path = styled.div`
+    white-space: nowrap;
+    font-size: 13px;
+    font-style: normal;
+    font-weight: 500;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    display: flex;
+    align-items: center;
+`;
+
+const ContainerText = styled.span`
+    display: inline-block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 150px; // TODO: Remove in favor of smart truncation
+`;
+
+const StyledLink = styled(Link)`
+    white-space: nowrap;
+    border-radius: 4px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: flex;
+    gap: 4px;
+    align-items: center;
+    line-height: 22px;
+    color: ${REDESIGN_COLORS.LINK_GREY};
+
+    && svg {
+        color: ${REDESIGN_COLORS.LINK_GREY};
+    }
+
+    :hover {
+        color: ${colors.violet[500]};
+
+        && svg {
+            color: ${colors.violet[500]};
+        }
+    }
+`;
+
+interface Props {
+    entity: Maybe<Entity>;
+    style?: React.CSSProperties;
+}
+
+function ContextPathEntityLink(props: Props) {
+    const { entity, style } = props;
+    const entityRegistry = useEntityRegistry();
+    const linkProps = useEmbeddedProfileLinkProps();
+
+    if (!entity) return null;
+
+    const containerUrl = entityRegistry.getEntityUrl(entity.type, entity.urn);
+    const containerName = entityRegistry.getDisplayName(entity.type, entity);
+
+    return (
+        <Path style={style}>
+            <StyledLink to={containerUrl} data-testid="container" {...linkProps}>
+                <ContextPathEntityIcon entity={entity} />
+                <ContainerText title={containerName}>{containerName}</ContainerText>
+            </StyledLink>
+        </Path>
+    );
+}
+
+export default ContextPathEntityLink;
diff --git a/datahub-web-react/src/app/previewV2/ContextPathSeparator.tsx b/datahub-web-react/src/app/previewV2/ContextPathSeparator.tsx
new file mode 100644
index 00000000000000..f2e276bec79fcc
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/ContextPathSeparator.tsx
@@ -0,0 +1,10 @@
+import styled from 'styled-components';
+import { RightOutlined } from '@ant-design/icons';
+import { ANTD_GRAY } from '../entity/shared/constants';
+
+export const ContextPathSeparator = styled(RightOutlined)`
+    color: ${ANTD_GRAY[6]};
+    font-size: 10px;
+    font-weight: normal;
+    padding: 0px 4px 0px 4px;
+`;
diff --git a/datahub-web-react/src/app/previewV2/DefaultPreviewCard.tsx b/datahub-web-react/src/app/previewV2/DefaultPreviewCard.tsx
new file mode 100644
index 00000000000000..5de5cdf03285a3
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/DefaultPreviewCard.tsx
@@ -0,0 +1,412 @@
+import { CloseOutlined } from '@ant-design/icons';
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import ViewInPlatform from '@app/entityV2/shared/externalUrl/ViewInPlatform';
+import { useSearchCardContext } from '@app/entityV2/shared/SearchCardContext';
+import { ActionsAndStatusSection } from '@app/previewV2/shared';
+import { Button, Typography } from 'antd';
+import React, { ReactNode } from 'react';
+import styled from 'styled-components';
+import {
+    BrowsePathV2,
+    Container,
+    CorpUser,
+    DataProduct,
+    Deprecation,
+    Domain,
+    Entity,
+    EntityPath,
+    EntityType,
+    GlobalTags,
+    GlossaryTerms,
+    Health,
+    Maybe,
+    Owner,
+    SearchInsight,
+} from '../../types.generated';
+import { EntityMenuActions, PreviewType } from '../entityV2/Entity';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../entityV2/shared/constants';
+import { GlossaryPreviewCardDecoration } from '../entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration';
+import { PopularityTier } from '../entityV2/shared/containers/profile/sidebar/shared/utils';
+import { EntityMenuItems } from '../entityV2/shared/EntityDropdown/EntityMenuActions';
+import MoreOptionsMenuAction from '../entityV2/shared/EntityDropdown/MoreOptionsMenuAction';
+import { usePreviewData } from '../entityV2/shared/PreviewContext';
+import { useSearchContext } from '../search/context/SearchContext';
+import useContentTruncation from '../shared/useContentTruncation';
+import { useEntityRegistryV2 } from '../useEntityRegistry';
+import ColoredBackgroundPlatformIconGroup from './ColoredBackgroundPlatformIconGroup';
+import { CompactView } from './CompactView';
+import ContextPath from './ContextPath';
+import DefaultPreviewCardFooter from './DefaultPreviewCardFooter';
+import EntityHeader from './EntityHeader';
+
+import { useEntityContext, useEntityData } from '../entity/shared/EntityContext';
+import { removeMarkdown } from '../entityV2/shared/components/styled/StripMarkdownText';
+import { DashboardLastUpdatedMs, DatasetLastUpdatedMs } from '../entityV2/shared/utils';
+import { useRemoveDataProductAssets, useRemoveDomainAssets, useRemoveGlossaryTermAssets } from './utils';
+
+const TransparentButton = styled(Button)`
+    color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    font-size: 12px;
+    box-shadow: none;
+    border: none;
+    padding: 0px 10px;
+    display: none;
+
+    &&& span {
+        font-size: 12px;
+    }
+
+    &:hover {
+        display: flex;
+        align-items: center;
+        opacity: 0.9;
+        color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    }
+`;
+
+const PreviewContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    justify-content: space-between;
+    align-items: start;
+
+    .entityCount {
+        margin-bottom: 2px;
+    }
+
+    &:hover ${TransparentButton} {
+        display: inline-block;
+    }
+`;
+
+interface RowContainerProps {
+    hidden?: boolean;
+    alignment?: 'flex-start' | 'center' | 'flex-end' | 'self-start';
+}
+
+const RowContainer = styled.div<RowContainerProps>`
+    align-items: ${(props) => props.alignment || 'center'};
+    display: ${(props) => (props.hidden ? 'none' : 'flex')};
+    flex-direction: row;
+    justify-content: space-between;
+    width: 100%;
+`;
+
+const InsightsText = styled(Typography.Text)`
+    font-size: 12px;
+    line-height: 20px;
+    font-weight: 600;
+    color: ${ANTD_GRAY[7]};
+`;
+
+const InsightIconContainer = styled.span`
+    margin-right: 4px;
+`;
+
+const Documentation = styled.div`
+    width: 90%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    font-size: 12px;
+    font-weight: 500;
+    color: ${REDESIGN_COLORS.SUB_TEXT};
+    margin-top: 8px;
+`;
+
+const ENTITY_TYPES_WITH_DESCRIPTION_PREVIEW = new Set([
+    EntityType.GlossaryTerm,
+    EntityType.GlossaryNode,
+    EntityType.DataProduct,
+    EntityType.Domain,
+    EntityType.Tag,
+]);
+
+interface Props {
+    name: string;
+    urn: string;
+    data: GenericEntityProperties | null;
+    logoUrl?: string;
+    logoComponent?: JSX.Element;
+    url: string;
+    entityType: EntityType;
+    type?: string | null;
+    typeIcon?: JSX.Element;
+    platform?: string;
+    platformInstanceId?: string;
+    platforms?: Maybe<string | undefined>[];
+    logoUrls?: Maybe<string | undefined>[];
+    tags?: GlobalTags;
+    owners?: Array<Owner> | null;
+    deprecation?: Deprecation | null;
+    topUsers?: Array<CorpUser> | null;
+    entityTitleSuffix?: React.ReactNode;
+    subHeader?: React.ReactNode;
+    snippet?: React.ReactNode;
+    insights?: Array<SearchInsight> | null;
+    glossaryTerms?: GlossaryTerms;
+    container?: Container;
+    domain?: Domain | undefined | null;
+    dataProduct?: DataProduct | undefined | null;
+    entityCount?: number;
+    dataTestID?: string;
+    titleSizePx?: number;
+    onClick?: () => void;
+    // this is provided by the impact analysis view. it is used to display
+    // how the listed node is connected to the source node
+    degree?: number;
+    parentEntities?: Entity[] | null;
+    previewType?: Maybe<PreviewType>;
+    paths?: EntityPath[];
+    health?: Health[];
+    lastUpdatedMs?: DatasetLastUpdatedMs | DashboardLastUpdatedMs;
+    description?: string;
+    // eslint-disable-next-line react/no-unused-prop-types
+    qualifier?: string | null;
+    // eslint-disable-next-line react/no-unused-prop-types
+    externalUrl?: string | null;
+    tier?: PopularityTier;
+    isOutputPort?: boolean;
+    entityIcon?: JSX.Element;
+    headerDropdownItems?: Set<EntityMenuItems>;
+    statsSummary?: any;
+    actions?: EntityMenuActions;
+    browsePaths?: BrowsePathV2 | undefined;
+}
+
+export default function DefaultPreviewCard({
+    name,
+    urn,
+    data,
+    logoUrl, // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    logoComponent,
+    url,
+    entityType,
+    type,
+    typeIcon,
+    platform,
+    platformInstanceId,
+    tags,
+    owners, // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    topUsers,
+    glossaryTerms,
+    paths, // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    subHeader,
+    snippet,
+    insights, // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    domain, // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    dataProduct,
+    container,
+    deprecation, // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    entityCount,
+    titleSizePx,
+    dataTestID,
+    entityTitleSuffix,
+    onClick,
+    degree,
+    parentEntities,
+    platforms,
+    logoUrls,
+    previewType,
+    health,
+    lastUpdatedMs,
+    tier,
+    isOutputPort,
+    entityIcon,
+    headerDropdownItems,
+    statsSummary,
+    actions,
+    browsePaths,
+    description,
+}: Props) {
+    const entityRegistry = useEntityRegistryV2();
+    const supportedCapabilities = entityRegistry.getSupportedEntityCapabilities(entityType);
+
+    // sometimes these lists will be rendered inside an entity container (for example, in the case of impact analysis)
+    // in those cases, we may want to enrich the preview w/ context about the container entity
+    const previewData = usePreviewData();
+    const insightViews: Array<ReactNode> =
+        insights?.map((insight) => (
+            <>
+                <InsightIconContainer>{insight.icon}</InsightIconContainer>
+                <InsightsText>{insight.text}</InsightsText>
+            </>
+        )) || [];
+
+    if (snippet) {
+        insightViews.push(snippet);
+    }
+    const { contentRef } = useContentTruncation(container);
+
+    // TODO: Replace with something less hacky
+    const finalType = type || entityRegistry.getEntityName(entityType);
+    const hasPlatformIcons = logoUrl || (logoUrls && logoUrls.length) || isOutputPort;
+    const isIconPresent = !!hasPlatformIcons || !!entityIcon;
+
+    const { isFullViewCard } = useSearchContext();
+
+    const { removeRelationship, removeButtonText } = useRemoveRelationship(entityType);
+
+    const entityHeader = (
+        <EntityHeader
+            name={name}
+            onClick={onClick}
+            previewType={previewType}
+            titleSizePx={titleSizePx}
+            url={url}
+            urn={urn}
+            deprecation={deprecation}
+            health={health}
+            degree={degree}
+            connectionName={previewData?.name}
+            previewData={previewData}
+        />
+    );
+    return (
+        <PreviewContainer data-testid={dataTestID ?? `preview-${urn}`}>
+            {(entityType === EntityType.GlossaryNode || entityType === EntityType.GlossaryTerm) && (
+                <GlossaryPreviewCardDecoration urn={urn} entityData={previewData} displayProperties={undefined} />
+            )}
+            {isFullViewCard || previewType === PreviewType.HOVER_CARD ? (
+                <>
+                    <RowContainer alignment="self-start">
+                        {isIconPresent ? (
+                            <ColoredBackgroundPlatformIconGroup
+                                platformName={platform}
+                                platformLogoUrl={logoUrl}
+                                platformNames={platforms}
+                                platformLogoUrls={logoUrls}
+                                isOutputPort={isOutputPort}
+                                icon={entityIcon}
+                            />
+                        ) : (
+                            entityHeader
+                        )}
+                        <ActionsAndStatusSection>
+                            {removeButtonText && (
+                                <TransparentButton size="small" onClick={removeRelationship}>
+                                    <CloseOutlined size={5} /> {removeButtonText}
+                                </TransparentButton>
+                            )}
+                            <ViewInPlatform urn={urn} data={data} />
+                            {headerDropdownItems && previewType !== PreviewType.HOVER_CARD && (
+                                <MoreOptionsMenuAction
+                                    menuItems={headerDropdownItems}
+                                    urn={urn}
+                                    entityType={entityType}
+                                    entityData={previewData}
+                                    triggerType={['click']}
+                                    actions={actions}
+                                />
+                            )}
+                        </ActionsAndStatusSection>
+                    </RowContainer>
+                    {isIconPresent && <RowContainer>{entityHeader}</RowContainer>}
+                    <RowContainer style={{ marginTop: 8 }}>
+                        <ContextPath
+                            type={finalType}
+                            entityType={entityType}
+                            instanceId={platformInstanceId}
+                            typeIcon={typeIcon}
+                            browsePaths={browsePaths}
+                            parentEntities={parentEntities}
+                            entityTitleWidth={previewType === PreviewType.HOVER_CARD ? 150 : 200}
+                            previewType={previewType}
+                            contentRef={contentRef}
+                        />
+                    </RowContainer>
+                    {(previewType === PreviewType.HOVER_CARD ||
+                        ENTITY_TYPES_WITH_DESCRIPTION_PREVIEW.has(entityType)) &&
+                    description ? (
+                        <RowContainer>
+                            <Documentation>{removeMarkdown(description)}</Documentation>
+                        </RowContainer>
+                    ) : null}
+                </>
+            ) : (
+                <CompactView
+                    data={data}
+                    name={name}
+                    onClick={onClick}
+                    titleSizePx={titleSizePx}
+                    url={url}
+                    degree={degree}
+                    deprecation={deprecation}
+                    actions={actions}
+                    health={health}
+                    previewData={previewData}
+                    isIconPresent={isIconPresent}
+                    platform={platform}
+                    logoUrl={logoUrl}
+                    platforms={platforms}
+                    logoUrls={logoUrls}
+                    isOutputPort={isOutputPort}
+                    entityIcon={entityIcon}
+                    headerDropdownItems={headerDropdownItems}
+                    previewType={previewType}
+                    urn={urn}
+                    entityType={entityType}
+                    platformInstanceId={platformInstanceId}
+                    typeIcon={typeIcon}
+                    finalType={finalType}
+                    parentEntities={parentEntities}
+                    contentRef={contentRef}
+                    browsePaths={browsePaths}
+                />
+            )}
+            <DefaultPreviewCardFooter
+                glossaryTerms={glossaryTerms}
+                tags={tags}
+                owners={owners}
+                entityCapabilities={supportedCapabilities}
+                tier={tier}
+                previewType={previewType}
+                entityTitleSuffix={entityTitleSuffix}
+                entityType={entityType}
+                urn={urn}
+                entityRegistry={entityRegistry}
+                lastUpdatedMs={lastUpdatedMs}
+                statsSummary={statsSummary}
+                paths={paths}
+                isFullViewCard={isFullViewCard}
+            />
+        </PreviewContainer>
+    );
+}
+
+function useRemoveRelationship(entityType: EntityType) {
+    const { setShouldRefetchEmbeddedListSearch } = useEntityContext();
+    const { showRemovalFromList } = useSearchCardContext();
+    const { removeDomain } = useRemoveDomainAssets(setShouldRefetchEmbeddedListSearch);
+    const { removeTerm } = useRemoveGlossaryTermAssets(setShouldRefetchEmbeddedListSearch);
+    const { removeDataProduct } = useRemoveDataProductAssets(setShouldRefetchEmbeddedListSearch);
+
+    const previewData = usePreviewData();
+    const entityData = useEntityData();
+    const pageEntityType = entityData.entityType;
+
+    if (pageEntityType === EntityType.Domain) {
+        return {
+            removeRelationship: () => removeDomain(previewData?.urn),
+            removeButtonText:
+                showRemovalFromList && entityType !== EntityType.DataProduct ? 'Remove from Domain' : null,
+        };
+    }
+    if (pageEntityType === EntityType.GlossaryTerm) {
+        return {
+            removeRelationship: () => removeTerm(previewData, entityData.urn),
+            removeButtonText: showRemovalFromList ? 'Remove Glossary Term' : null,
+        };
+    }
+    if (pageEntityType === EntityType.DataProduct) {
+        return {
+            removeRelationship: () => removeDataProduct(previewData?.urn),
+            removeButtonText: showRemovalFromList ? 'Remove from Data Product' : null,
+        };
+    }
+    return {
+        removeRelationship: () => {},
+        removeButtonText: null,
+    };
+}
diff --git a/datahub-web-react/src/app/previewV2/DefaultPreviewCardFooter.tsx b/datahub-web-react/src/app/previewV2/DefaultPreviewCardFooter.tsx
new file mode 100644
index 00000000000000..cf3f15ce407570
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/DefaultPreviewCardFooter.tsx
@@ -0,0 +1,146 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Divider } from 'antd';
+import Pills from './Pills';
+import { REDESIGN_COLORS } from '../entityV2/shared/constants';
+import { PopularityTier } from '../entityV2/shared/containers/profile/sidebar/shared/utils';
+import {
+    DatasetStatsSummary,
+    EntityPath,
+    EntityType,
+    GlobalTags,
+    GlossaryTerms,
+    Maybe,
+    Owner,
+} from '../../types.generated';
+import { EntityCapabilityType, PreviewType } from '../entityV2/Entity';
+import PreviewCardFooterRightSection from './PreviewCardFooterRightSection';
+import EntityRegistry from '../entityV2/EntityRegistry';
+import { entityHasCapability } from './utils';
+
+import { DatasetLastUpdatedMs, DashboardLastUpdatedMs } from '../entityV2/shared/utils';
+
+interface DefaultPreviewCardFooterProps {
+    glossaryTerms?: GlossaryTerms;
+    tags?: GlobalTags;
+    owners?: Array<Owner> | null;
+    entityCapabilities: Set<EntityCapabilityType>;
+    tier?: PopularityTier;
+    entityTitleSuffix?: React.ReactNode;
+    previewType: Maybe<PreviewType> | undefined;
+    entityType: EntityType;
+    urn: string;
+    entityRegistry: EntityRegistry;
+    lastUpdatedMs?: DatasetLastUpdatedMs | DashboardLastUpdatedMs;
+    statsSummary?: DatasetStatsSummary | null;
+    paths?: EntityPath[];
+    isFullViewCard?: boolean;
+}
+
+const Container = styled.div`
+    margin-bottom: -6px;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .ant-btn-link {
+        padding: inherit;
+    }
+`;
+
+const RightSection = styled.div<{ isFullViewCard?: boolean }>`
+    display: flex;
+    justify-content: flex-end;
+    width: 100%;
+    padding: ${(props) => (props.isFullViewCard ? '0 10px' : '0 5px')};
+`;
+
+const EntityLink = styled.div`
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    .ant-btn-link {
+        display: flex;
+        align-items: center;
+        color: ${REDESIGN_COLORS.TITLE_PURPLE};
+        height: 100%;
+
+        :hover {
+            color: ${REDESIGN_COLORS.HOVER_PURPLE};
+        }
+
+        > span:first-child {
+            display: flex;
+            align-items: center;
+            height: 100%;
+            line-height: normal;
+        }
+    }
+`;
+
+const HorizontalDivider = styled(Divider)`
+    color: ${REDESIGN_COLORS.FOUNDATION_BLUE_2};
+    margin-top: 14px;
+    margin-bottom: 8px;
+    width: calc(100% + 40px) !important;
+    margin-left: -20px;
+`;
+
+const DefaultPreviewCardFooter: React.FC<DefaultPreviewCardFooterProps> = ({
+    glossaryTerms,
+    tags,
+    owners,
+    entityCapabilities,
+    tier,
+    entityTitleSuffix,
+    previewType,
+    entityType,
+    urn,
+    entityRegistry,
+    lastUpdatedMs,
+    statsSummary,
+    paths,
+    isFullViewCard,
+}) => {
+    const shouldRenderPillsRow = [glossaryTerms?.terms, tags?.tags, owners?.length].some(Boolean);
+    const shouldRenderEntityLink = previewType === PreviewType.HOVER_CARD && entityTitleSuffix;
+    const shouldRenderRightSection =
+        tier !== undefined ||
+        lastUpdatedMs?.lastUpdatedMs ||
+        statsSummary?.queryCountLast30Days ||
+        entityHasCapability(entityCapabilities, EntityCapabilityType.LINEAGE);
+
+    return shouldRenderPillsRow || shouldRenderRightSection || shouldRenderEntityLink ? (
+        <>
+            {isFullViewCard && <HorizontalDivider />}
+
+            <Container>
+                {isFullViewCard && (
+                    <Pills
+                        glossaryTerms={glossaryTerms}
+                        tags={tags}
+                        owners={owners}
+                        entityCapabilities={entityCapabilities}
+                        paths={paths}
+                        entityType={entityType}
+                    />
+                )}
+                <RightSection isFullViewCard={isFullViewCard}>
+                    <PreviewCardFooterRightSection
+                        entityType={entityType}
+                        urn={urn}
+                        entityRegistry={entityRegistry}
+                        entityCapabilities={entityCapabilities}
+                        lastUpdatedMs={lastUpdatedMs}
+                        tier={tier}
+                        statsSummary={statsSummary}
+                    />
+                    {previewType === PreviewType.HOVER_CARD && <EntityLink>{entityTitleSuffix}</EntityLink>}
+                </RightSection>
+            </Container>
+        </>
+    ) : null;
+};
+
+export default DefaultPreviewCardFooter;
diff --git a/datahub-web-react/src/app/previewV2/EntityHeader.tsx b/datahub-web-react/src/app/previewV2/EntityHeader.tsx
new file mode 100644
index 00000000000000..be986d6293eac2
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/EntityHeader.tsx
@@ -0,0 +1,126 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { Tooltip } from '@components';
+import styled from 'styled-components';
+import { Deprecation, Health, Maybe } from '../../types.generated';
+import { GenericEntityProperties } from '../entity/shared/types';
+import { PreviewType } from '../entityV2/Entity';
+import { DeprecationIcon } from '../entityV2/shared/components/styled/DeprecationIcon';
+import { REDESIGN_COLORS, SEARCH_COLORS } from '../entityV2/shared/constants';
+import StructuredPropertyBadge from '../entityV2/shared/containers/profile/header/StructuredPropertyBadge';
+import { getNumberWithOrdinal } from '../entityV2/shared/utils';
+import SearchTextHighlighter from '../searchV2/matches/SearchTextHighlighter';
+import { useEmbeddedProfileLinkProps } from '../shared/useEmbeddedProfileLinkProps';
+import HealthIcon from './HealthIcon';
+
+const EntityTitleContainer = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    font-size: 16px;
+    min-width: 15em;
+`;
+
+export const StyledLink = styled(Link)`
+    min-width: 0;
+`;
+
+const EntityTitle = styled.div<{ $titleSizePx?: number }>`
+    &&& {
+        font-size: ${(props) => props.$titleSizePx || 16}px;
+        font-weight: 700;
+        vertical-align: middle;
+
+        :hover {
+            color: ${REDESIGN_COLORS.HOVER_PURPLE};
+        }
+    }
+
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    font-size: 13px;
+    color: ${SEARCH_COLORS.TITLE_PURPLE};
+    height: 100%;
+`;
+
+const CardEntityTitle = styled(EntityTitle)<{ $previewType?: Maybe<PreviewType> }>`
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: ${(props) => (props.$previewType === PreviewType.HOVER_CARD ? `100px` : '250px')};
+`;
+
+const DegreeText = styled.div`
+    border-radius: 18px;
+    background: ${REDESIGN_COLORS.COLD_GREY_TEXT_BLUE_1};
+    padding: 3px 5px;
+    font-size: 12px;
+    font-weight: 700;
+    width: fit-content;
+    color: ${REDESIGN_COLORS.SUB_TEXT};
+`;
+
+interface EntityHeaderProps {
+    name: string;
+    onClick?: () => void;
+    previewType?: Maybe<PreviewType>;
+    titleSizePx?: number;
+    url: string;
+    urn: string;
+    deprecation: Deprecation | null | undefined;
+    health: Health[] | undefined;
+    degree?: number;
+    connectionName?: Maybe<string>;
+    previewData?: GenericEntityProperties | null;
+}
+
+const EntityHeader: React.FC<EntityHeaderProps> = ({
+    name,
+    onClick,
+    previewType,
+    titleSizePx,
+    url,
+    urn,
+    deprecation,
+    health,
+    degree,
+    connectionName,
+    previewData,
+}) => {
+    const linkProps = useEmbeddedProfileLinkProps();
+
+    return (
+        <EntityTitleContainer>
+            <StyledLink to={`${url}/`} {...linkProps}>
+                {previewType === PreviewType.HOVER_CARD ? (
+                    <Tooltip title={name}>
+                        <CardEntityTitle onClick={onClick} $titleSizePx={titleSizePx} data-testid="entity-title">
+                            {name || ''}
+                        </CardEntityTitle>
+                    </Tooltip>
+                ) : (
+                    <EntityTitle title={name} onClick={onClick} $titleSizePx={titleSizePx} data-testid="entity-title">
+                        <SearchTextHighlighter field="name" text={name || ''} />
+                    </EntityTitle>
+                )}
+            </StyledLink>
+            {degree !== undefined && (
+                <Tooltip
+                    title={`This entity is a ${getNumberWithOrdinal(degree)} degree connection to ${
+                        connectionName || 'the source entity'
+                    }`}
+                >
+                    <DegreeText>{getNumberWithOrdinal(degree)}</DegreeText>
+                </Tooltip>
+            )}
+            {deprecation?.deprecated && (
+                <DeprecationIcon urn={urn} deprecation={deprecation} showUndeprecate showText={false} />
+            )}
+            {health && <HealthIcon urn={urn} health={health} baseUrl={url} />}
+            <StructuredPropertyBadge structuredProperties={previewData?.structuredProperties} />
+        </EntityTitleContainer>
+    );
+};
+
+export default EntityHeader;
diff --git a/datahub-web-react/src/app/previewV2/EntityPaths/ColumnPathsText.tsx b/datahub-web-react/src/app/previewV2/EntityPaths/ColumnPathsText.tsx
new file mode 100644
index 00000000000000..26891a7dfd722e
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/EntityPaths/ColumnPathsText.tsx
@@ -0,0 +1,70 @@
+import { Tooltip } from '@components';
+import React, { useContext } from 'react';
+import styled from 'styled-components/macro';
+import { EntityPath, EntityType, LineageDirection, SchemaFieldEntity } from '../../../types.generated';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import ColumnsRelationshipText from './ColumnsRelationshipText';
+import DisplayedColumns from './DisplayedColumns';
+import { LineageTabContext } from '../../entityV2/shared/tabs/Lineage/LineageTabContext';
+
+export const ResultText = styled.span`
+    white-space: nowrap;
+    &:hover {
+        border-bottom: 1px solid black;
+        cursor: pointer;
+    }
+`;
+
+const DescriptionWrapper = styled.span`
+    color: ${ANTD_GRAY[8]};
+    white-space: nowrap;
+`;
+
+export function getDisplayedColumns(paths: EntityPath[], resultEntityUrn: string) {
+    return paths
+        .map((path) =>
+            path.path?.filter(
+                (entity) =>
+                    entity?.type === EntityType.SchemaField &&
+                    (entity as SchemaFieldEntity).parent.urn === resultEntityUrn,
+            ),
+        )
+        .flat();
+}
+
+interface Props {
+    paths: EntityPath[];
+    resultEntityUrn: string;
+    openModal: () => void;
+}
+
+export default function ColumnPathsText({ paths, resultEntityUrn, openModal }: Props) {
+    const { lineageDirection } = useContext(LineageTabContext);
+
+    const displayedColumns = getDisplayedColumns(paths, resultEntityUrn);
+
+    if (!displayedColumns.length) return null;
+
+    return (
+        <>
+            <DescriptionWrapper>
+                {lineageDirection === LineageDirection.Downstream ? 'Downstream' : 'Upstream'} column
+                {displayedColumns.length > 1 && 's'}:&nbsp;
+            </DescriptionWrapper>
+            <ResultText onClick={openModal}>
+                <Tooltip
+                    title={
+                        <span>
+                            Click to see column path{paths.length > 1 && 's'} from{' '}
+                            <ColumnsRelationshipText displayedColumns={displayedColumns} />
+                        </span>
+                    }
+                >
+                    <span>
+                        <DisplayedColumns displayedColumns={displayedColumns} />
+                    </span>
+                </Tooltip>
+            </ResultText>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/previewV2/EntityPaths/ColumnsRelationshipText.tsx b/datahub-web-react/src/app/previewV2/EntityPaths/ColumnsRelationshipText.tsx
new file mode 100644
index 00000000000000..1da1bf49ef343c
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/EntityPaths/ColumnsRelationshipText.tsx
@@ -0,0 +1,39 @@
+import { Maybe } from 'graphql/jsutils/Maybe';
+import React, { useContext } from 'react';
+import styled from 'styled-components/macro';
+import { Entity, LineageDirection } from '../../../types.generated';
+import { downgradeV2FieldPath } from '../../entity/dataset/profile/schema/utils/utils';
+import { decodeSchemaField } from '../../lineage/utils/columnLineageUtils';
+import DisplayedColumns from './DisplayedColumns';
+import { LineageTabContext } from '../../entityV2/shared/tabs/Lineage/LineageTabContext';
+
+const ColumnNameWrapper = styled.span<{ isBlack?: boolean }>`
+    font-weight: bold;
+    ${(props) => props.isBlack && 'color: black;'}
+`;
+
+interface Props {
+    displayedColumns: (Maybe<Entity> | undefined)[];
+}
+
+export default function ColumnsRelationshipText({ displayedColumns }: Props) {
+    const { selectedColumn, lineageDirection } = useContext(LineageTabContext);
+
+    const displayedFieldPath = decodeSchemaField(downgradeV2FieldPath(selectedColumn) || '');
+
+    return (
+        <>
+            {lineageDirection === LineageDirection.Downstream ? (
+                <span>
+                    <ColumnNameWrapper>{displayedFieldPath}</ColumnNameWrapper> to&nbsp;
+                    <DisplayedColumns displayedColumns={displayedColumns} />
+                </span>
+            ) : (
+                <span>
+                    <DisplayedColumns displayedColumns={displayedColumns} /> to{' '}
+                    <ColumnNameWrapper>{displayedFieldPath}</ColumnNameWrapper>
+                </span>
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/previewV2/EntityPaths/DisplayedColumns.tsx b/datahub-web-react/src/app/previewV2/EntityPaths/DisplayedColumns.tsx
new file mode 100644
index 00000000000000..c707ef3013f200
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/EntityPaths/DisplayedColumns.tsx
@@ -0,0 +1,37 @@
+import { Maybe } from 'graphql/jsutils/Maybe';
+import React from 'react';
+import styled from 'styled-components/macro';
+import { Entity, EntityType, SchemaFieldEntity } from '../../../types.generated';
+import { downgradeV2FieldPath } from '../../entity/dataset/profile/schema/utils/utils';
+import { decodeSchemaField } from '../../lineage/utils/columnLineageUtils';
+import { useEntityRegistry } from '../../useEntityRegistry';
+
+const ColumnNameWrapper = styled.span<{ isBlack?: boolean }>`
+    font-weight: bold;
+`;
+
+interface Props {
+    displayedColumns: (Maybe<Entity> | undefined)[];
+}
+
+export default function DisplayedColumns({ displayedColumns }: Props) {
+    const entityRegistry = useEntityRegistry();
+
+    return (
+        <span>
+            {displayedColumns.map((entity, index) => {
+                if (entity) {
+                    return (
+                        <ColumnNameWrapper key={entity.urn}>
+                            {entity.type === EntityType.SchemaField
+                                ? decodeSchemaField(downgradeV2FieldPath((entity as SchemaFieldEntity).fieldPath) || '')
+                                : entityRegistry.getDisplayName(entity.type, entity)}
+                            {index !== displayedColumns.length - 1 && ', '}
+                        </ColumnNameWrapper>
+                    );
+                }
+                return null;
+            })}
+        </span>
+    );
+}
diff --git a/datahub-web-react/src/app/previewV2/EntityPaths/EntityPaths.tsx b/datahub-web-react/src/app/previewV2/EntityPaths/EntityPaths.tsx
new file mode 100644
index 00000000000000..c94a437240f144
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/EntityPaths/EntityPaths.tsx
@@ -0,0 +1,37 @@
+import React, { useState } from 'react';
+import styled from 'styled-components/macro';
+import { EntityPath } from '../../../types.generated';
+import ColumnPathsText from './ColumnPathsText';
+import EntityPathsModal from './EntityPathsModal';
+
+const EntityPathsWrapper = styled.div`
+    padding-bottom: 10px;
+`;
+
+interface Props {
+    paths: EntityPath[];
+    resultEntityUrn: string;
+}
+
+export default function EntityPaths({ paths, resultEntityUrn }: Props) {
+    const [isPathsModalVisible, setIsPathsModalVisible] = useState(false);
+
+    return (
+        <>
+            <EntityPathsWrapper>
+                <ColumnPathsText
+                    paths={paths}
+                    resultEntityUrn={resultEntityUrn}
+                    openModal={() => setIsPathsModalVisible(true)}
+                />
+            </EntityPathsWrapper>
+            {isPathsModalVisible && (
+                <EntityPathsModal
+                    paths={paths}
+                    resultEntityUrn={resultEntityUrn}
+                    hideModal={() => setIsPathsModalVisible(false)}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/previewV2/EntityPaths/EntityPathsModal.tsx b/datahub-web-react/src/app/previewV2/EntityPaths/EntityPathsModal.tsx
new file mode 100644
index 00000000000000..3d86a2a0d98fa7
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/EntityPaths/EntityPathsModal.tsx
@@ -0,0 +1,103 @@
+import { Modal, Skeleton } from 'antd';
+import React, { useContext } from 'react';
+import styled from 'styled-components/macro';
+import { useGetEntitiesQuery } from '@src/graphql/entity.generated';
+import { Entity, EntityPath, LineageDirection } from '../../../types.generated';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import { CompactEntityNameList } from '../../recommendations/renderer/component/CompactEntityNameList';
+import { getDisplayedColumns } from './ColumnPathsText';
+import ColumnsRelationshipText from './ColumnsRelationshipText';
+import { LineageTabContext } from '../../entityV2/shared/tabs/Lineage/LineageTabContext';
+
+const StyledModal = styled(Modal)`
+    width: 70vw;
+    max-width: 850px;
+`;
+
+const PathWrapper = styled.div`
+    display: inline-block;
+    margin: 15px 0 15px -4px;
+    padding: 20px;
+    border: 1px solid ${ANTD_GRAY[4]};
+    border-radius: 8px;
+    box-shadow: 1px 1px 12px 4px #0000000d;
+    width: 100%;
+`;
+
+const Header = styled.div`
+    font-size: 16px;
+    padding-top: 8px;
+`;
+
+const ErrorContainer = styled.div`
+    font-size: 14px;
+    padding: 8px 0px;
+    color: ${ANTD_GRAY[7]};
+`;
+
+interface Props {
+    paths: EntityPath[];
+    resultEntityUrn: string;
+    hideModal: () => void;
+}
+
+export default function EntityPathsModal({ paths, resultEntityUrn, hideModal }: Props) {
+    const { lineageDirection } = useContext(LineageTabContext);
+    const displayedColumns = getDisplayedColumns(paths, resultEntityUrn);
+
+    // We need to fetch the below urns before loading the content of this modal
+    const entityUrnsToFetch: string[] = paths
+        .flatMap((path) => path.path ?? [])
+        .map((entity) => entity?.urn)
+        .filter((urn): urn is string => !!urn);
+    const {
+        data: result,
+        loading,
+        error,
+    } = useGetEntitiesQuery({
+        variables: { urns: entityUrnsToFetch },
+    });
+    const fetchedEntities = result?.entities;
+
+    const loadedState = error ? (
+        <ErrorContainer>Encountered an error while trying to fetch paths. Please try again later.</ErrorContainer>
+    ) : (
+        paths.map((path, i) => {
+            const entities: Entity[] = (
+                lineageDirection === LineageDirection.Upstream ? [...path.path].reverse() : path.path
+            )
+                .map(
+                    (bareEntity) =>
+                        fetchedEntities?.find(
+                            (hydratedEntity) => hydratedEntity && hydratedEntity.urn === bareEntity?.urn,
+                        ) as Entity | undefined,
+                )
+                .filter((entity): entity is Entity => !!entity);
+            const key = `${i}`;
+            return (
+                <PathWrapper key={key}>
+                    <CompactEntityNameList entities={entities} showArrows />
+                </PathWrapper>
+            );
+        })
+    );
+    return (
+        <StyledModal
+            data-testid="entity-paths-modal"
+            title={
+                <Header>
+                    Column path{paths.length > 1 && 's'} from{' '}
+                    <ColumnsRelationshipText displayedColumns={displayedColumns} />
+                </Header>
+            }
+            width="75vw"
+            visible
+            onCancel={hideModal}
+            onOk={hideModal}
+            footer={null}
+            bodyStyle={{ padding: '16px 24px' }}
+        >
+            {loading ? <Skeleton /> : loadedState}
+        </StyledModal>
+    );
+}
diff --git a/datahub-web-react/src/app/previewV2/Freshness.tsx b/datahub-web-react/src/app/previewV2/Freshness.tsx
new file mode 100644
index 00000000000000..812b30cd4796e7
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/Freshness.tsx
@@ -0,0 +1,94 @@
+import React from 'react';
+
+import { Popover } from '@components';
+import UpdateOutlinedIcon from '@mui/icons-material/UpdateOutlined';
+import styled from 'styled-components';
+
+import { ANTD_GRAY } from '../entity/shared/constants';
+import { getLastIngestedColor } from '../entity/shared/containers/profile/sidebar/LastIngested';
+import { REDESIGN_COLORS } from '../entityV2/shared/constants';
+
+import { toLocalDateString, toRelativeTimeString } from '../shared/time/timeUtils';
+
+const LastUpdatedContainer = styled.div<{ color: string }>`
+    align-items: center;
+    color: ${ANTD_GRAY[7]};
+    display: flex;
+    flex-direction: row;
+    gap: 5px;
+    svg {
+        font-size: 16px;
+        color: ${(props) => props.color};
+    }
+`;
+
+const PopoverContent = styled.div`
+    align-items: center;
+    display: flex;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+`;
+
+type Props = {
+    time?: number; // Milliseconds
+    showDate?: boolean;
+    timeProperty?: 'lastModified' | 'lastRefreshed' | 'lastUpdated';
+};
+
+const descriptors = {
+    lastModified: {
+        sectionTitle: 'Last Modified',
+        tooltip: 'Last modified',
+    },
+    lastRefreshed: {
+        sectionTitle: 'Data Last Refreshed',
+        tooltip: 'Data last refreshed',
+    },
+    lastUpdated: {
+        sectionTitle: 'Last Updated',
+        tooltip: 'Last updated',
+    },
+};
+
+export const getFreshnessTitle = (property: string | undefined) => {
+    switch (property) {
+        case 'lastModified':
+            return descriptors.lastModified.sectionTitle;
+        case 'lastRefreshed':
+            return descriptors.lastRefreshed.sectionTitle;
+        default: // default to "lastUpdated"
+            return descriptors.lastUpdated.sectionTitle;
+    }
+};
+
+const Freshness = ({ time, timeProperty, showDate = true }: Props) => {
+    const lastUpdatedAgo = toRelativeTimeString(time);
+
+    if (!time || time === 0) return null;
+
+    let updateType;
+    switch (timeProperty) {
+        case 'lastModified':
+            updateType = descriptors.lastModified.tooltip;
+            break;
+        case 'lastRefreshed':
+            updateType = descriptors.lastRefreshed.tooltip;
+            break;
+        default: // default to "lastUpdated"
+            updateType = descriptors.lastUpdated.tooltip;
+            break;
+    }
+
+    return (
+        <Popover
+            content={<PopoverContent>{`${updateType} ${lastUpdatedAgo}`}</PopoverContent>}
+            placement="bottom"
+            showArrow={false}
+        >
+            <LastUpdatedContainer color={getLastIngestedColor(time)}>
+                <UpdateOutlinedIcon /> {showDate && toLocalDateString(time)}
+            </LastUpdatedContainer>
+        </Popover>
+    );
+};
+
+export default Freshness;
diff --git a/datahub-web-react/src/app/previewV2/HealthIcon.tsx b/datahub-web-react/src/app/previewV2/HealthIcon.tsx
new file mode 100644
index 00000000000000..9c141a816ab9b5
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/HealthIcon.tsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import { Popover } from '@components';
+import styled from 'styled-components';
+import { CheckCircleOutlined } from '@ant-design/icons';
+import AmbulanceIcon from '../../images/ambulance-icon.svg?react';
+import { isHealthy, isUnhealthy } from '../shared/health/healthUtils';
+import { COLORS } from '../sharedV2/colors';
+import HealthPopover from './HealthPopover';
+import { Health } from '../../types.generated';
+
+const IconContainer = styled.div`
+    display: flex;
+    align-items: center;
+    font-size: 112.5%;
+`;
+
+const HealthyIcon = styled(CheckCircleOutlined)`
+    color: ${COLORS.green_6};
+`;
+
+interface Props {
+    urn: string;
+    health: Health[];
+    baseUrl: string;
+    className?: string;
+}
+
+const HealthIcon = ({ urn, health, baseUrl, className }: Props) => {
+    let icon: JSX.Element;
+    if (isUnhealthy(health)) {
+        icon = <AmbulanceIcon />;
+    } else if (isHealthy(health)) {
+        icon = <HealthyIcon />;
+    } else {
+        return null;
+    }
+
+    return (
+        <Popover content={<HealthPopover health={health} baseUrl={baseUrl} />} placement="bottom" showArrow={false}>
+            <IconContainer className={className} data-testid={`${urn}-health-icon`}>
+                {icon}
+            </IconContainer>
+        </Popover>
+    );
+};
+
+export default HealthIcon;
diff --git a/datahub-web-react/src/app/previewV2/HealthPopover.tsx b/datahub-web-react/src/app/previewV2/HealthPopover.tsx
new file mode 100644
index 00000000000000..ffabbae2169bf0
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/HealthPopover.tsx
@@ -0,0 +1,113 @@
+import ErrorOutlineOutlinedIcon from '@mui/icons-material/ErrorOutlineOutlined';
+import ReportProblemOutlinedIcon from '@mui/icons-material/ReportProblemOutlined';
+import { Typography } from 'antd';
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import { Health, HealthStatus, HealthStatusType } from '../../types.generated';
+import { REDESIGN_COLORS } from '../entityV2/shared/constants';
+import { useEmbeddedProfileLinkProps } from '../shared/useEmbeddedProfileLinkProps';
+
+const Content = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    min-width: 180px;
+
+    color: ${REDESIGN_COLORS.TEXT_HEADING};
+    font-size: 16px;
+`;
+
+const Message = styled(Typography.Text)`
+    font-size: 12px;
+    margin: 5px;
+    line-height: 12px;
+    font-weight: 400;
+    text-align: center;
+    display: flex;
+`;
+
+const StyledLink = styled(Link)`
+    display: flex;
+    align-items: center;
+    gap: 3px;
+
+    border-radius: 14px;
+
+    :hover {
+        background-color: ${REDESIGN_COLORS.BACKGROUND_SECONDARY_GRAY};
+
+        ${Message} {
+            text-decoration: underline;
+        }
+    }
+`;
+
+const Icon = styled.div`
+    height: 28px;
+    width: 28px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 50%;
+    padding: 5px;
+    background: #f7f7f7;
+    border: 1px solid #eeeeee;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+`;
+
+interface Props {
+    health: Health[];
+    baseUrl: string;
+}
+
+export default function HealthPopover({ health, baseUrl }: Props) {
+    const linkProps = useEmbeddedProfileLinkProps();
+    return (
+        <Content data-testid="assertions-details">
+            {health.map((item) => (
+                <StyledLink key={item.type} to={`${baseUrl}${healthUrlSuffix(item)}`} {...linkProps}>
+                    <Icon>{healthIcon(item)}</Icon>
+                    <Message>{healthMessage(item)}</Message>
+                </StyledLink>
+            ))}
+        </Content>
+    );
+}
+
+function healthIcon({ type }: Health) {
+    switch (type) {
+        case HealthStatusType.Incidents:
+            return <ReportProblemOutlinedIcon fontSize="inherit" />;
+        case HealthStatusType.Assertions:
+            return <ErrorOutlineOutlinedIcon fontSize="inherit" />;
+        default:
+            return null;
+    }
+}
+
+function healthUrlSuffix({ type }: Health) {
+    switch (type) {
+        case HealthStatusType.Incidents:
+            return '/Incidents';
+        case HealthStatusType.Assertions:
+            return '/Quality/List';
+        default:
+            return null;
+    }
+}
+
+function healthMessage({ message, status, type }: Health) {
+    if (message) return message;
+    if (status === HealthStatus.Pass) {
+        switch (type) {
+            case HealthStatusType.Assertions:
+                return 'All assertions are passing';
+            case HealthStatusType.Incidents:
+                return 'No active incidents';
+            default:
+                return null;
+        }
+    }
+    return null;
+}
diff --git a/datahub-web-react/src/app/previewV2/ImageWIthColoredBackground.tsx b/datahub-web-react/src/app/previewV2/ImageWIthColoredBackground.tsx
new file mode 100644
index 00000000000000..89d5ad725bd275
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/ImageWIthColoredBackground.tsx
@@ -0,0 +1,77 @@
+import ColorThief from 'colorthief';
+import React from 'react';
+import styled from 'styled-components';
+import { getLighterRGBColor } from '../sharedV2/icons/colorUtils';
+import { REDESIGN_COLORS } from '../entityV2/shared/constants';
+
+type Props = {
+    src: string;
+    alt?: string;
+    imgSize?: number;
+    backgroundSize?: number;
+    borderRadius?: number;
+};
+
+export const Icon = styled.div<{ background?: string; size: number; borderRadius: number }>`
+    width: ${({ size }) => size}px;
+    height: ${({ size }) => size}px;
+    display: flex;
+    background-color: ${({ background }) => background || 'transparent'};
+    align-items: center;
+    justify-content: center;
+    border-radius: ${({ borderRadius }) => borderRadius}px;
+    flex-shrink: 0;
+`;
+
+const PreviewImage = styled.img<{ size: number }>`
+    max-height: ${({ size }) => size}px;
+    width: auto;
+    object-fit: contain;
+    background-color: transparent;
+`;
+
+const DEFAULT_SIZE = 17;
+const DEFAULT_BACKGROUND_SIZE = 25;
+const DEFAULT_BORDER_RADIUS = 4;
+
+// TODO: Make this the default component for platform icons
+const ImageWithColoredBackground = ({ src, alt, imgSize, backgroundSize, borderRadius }: Props) => {
+    const imgRef = React.useRef<HTMLImageElement>(null);
+    const [platformBackground, setPlatformBackground] = React.useState<string | undefined>(undefined);
+
+    const logo = (
+        <PreviewImage
+            crossOrigin="anonymous"
+            size={imgSize || DEFAULT_SIZE}
+            src={src}
+            alt={alt}
+            ref={imgRef}
+            onLoad={() => {
+                const img = imgRef.current;
+                if (img && img.width > 0 && img.height > 0) {
+                    const colorThief = new ColorThief();
+                    const [r, g, b] = colorThief.getColor(img, 25);
+                    setPlatformBackground(`rgb(${getLighterRGBColor(r, g, b).join(', ')})`);
+                }
+            }}
+            onError={() => {
+                const img = imgRef.current;
+                if (img) {
+                    img.removeAttribute('crossOrigin');
+                    setPlatformBackground(REDESIGN_COLORS.BACKGROUND_GREY);
+                }
+            }}
+        />
+    );
+    return (
+        <Icon
+            size={backgroundSize || DEFAULT_BACKGROUND_SIZE}
+            background={platformBackground}
+            borderRadius={borderRadius || DEFAULT_BORDER_RADIUS}
+        >
+            {logo}
+        </Icon>
+    );
+};
+
+export default ImageWithColoredBackground;
diff --git a/datahub-web-react/src/app/previewV2/LineageBadge.tsx b/datahub-web-react/src/app/previewV2/LineageBadge.tsx
new file mode 100644
index 00000000000000..4f3910f4441c2d
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/LineageBadge.tsx
@@ -0,0 +1,70 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Link } from 'react-router-dom';
+import { Popover } from '@components';
+import { EntityType } from '../../types.generated';
+import EntityRegistry from '../entityV2/EntityRegistry';
+import LineageStatusIcon from '../../images/lineage-status.svg?react';
+import { ANTD_GRAY, REDESIGN_COLORS, SEARCH_COLORS } from '../entityV2/shared/constants';
+import { pluralize } from '../shared/textUtil';
+import { isNullOrUndefined } from './utils';
+import { useEmbeddedProfileLinkProps } from '../shared/useEmbeddedProfileLinkProps';
+
+const Icon = styled(LineageStatusIcon)<{ highlighted?: boolean }>`
+    display: flex;
+    color: ${({ highlighted }) => (highlighted ? SEARCH_COLORS.SUBTEXT_PURPPLE : ANTD_GRAY[5.5])};
+    font-size: 16px;
+
+    :hover {
+        ${({ highlighted }) => highlighted && `color: ${SEARCH_COLORS.LINK_BLUE};`}
+`;
+
+const PopoverContent = styled.div`
+    align-items: center;
+    display: flex;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+`;
+
+interface Props {
+    upstreamTotal: number | null | undefined;
+    downstreamTotal: number | null | undefined;
+    entityRegistry: EntityRegistry;
+    entityType: EntityType;
+    urn: string;
+}
+
+export default function LineageBadge({ upstreamTotal, downstreamTotal, entityRegistry, entityType, urn }: Props) {
+    const hasLineage = !!upstreamTotal || !!downstreamTotal;
+    const linkProps = useEmbeddedProfileLinkProps();
+
+    const upstreamContent = upstreamTotal ? `${upstreamTotal} ${pluralize(upstreamTotal, 'upstream')}` : '';
+    const downstreamContent = downstreamTotal ? `${downstreamTotal} ${pluralize(downstreamTotal, 'downstream')}` : '';
+    const separator = upstreamContent && downstreamContent ? ', ' : '';
+
+    if (isNullOrUndefined(upstreamTotal) && isNullOrUndefined(downstreamTotal)) {
+        return null;
+    }
+
+    return (
+        <Popover
+            content={
+                hasLineage && (
+                    <PopoverContent>
+                        {upstreamContent}
+                        {separator}
+                        {downstreamContent}
+                    </PopoverContent>
+                )
+            }
+            showArrow={false}
+            placement="bottom"
+        >
+            {hasLineage && (
+                <Link to={`${entityRegistry.getEntityUrl(entityType, urn)}/Lineage`} {...linkProps}>
+                    <Icon highlighted />
+                </Link>
+            )}
+            {!hasLineage && <Icon highlighted={false} />}
+        </Popover>
+    );
+}
diff --git a/datahub-web-react/src/app/previewV2/NotesIcon.tsx b/datahub-web-react/src/app/previewV2/NotesIcon.tsx
new file mode 100644
index 00000000000000..99f5dc95696661
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/NotesIcon.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Popover } from '@components';
+import { CampaignOutlined } from '@mui/icons-material';
+import { Post } from '../../types.generated';
+import { pluralize } from '../shared/textUtil';
+import { COLORS } from '../sharedV2/colors';
+
+const IconWrapper = styled.div<{ count: number }>`
+    display: flex;
+    color: ${COLORS.blue_6};
+    font-size: 20px;
+    line-height: 1;
+`;
+
+const Count = styled.div`
+    position: relative;
+    left: -1px;
+    font-size: 8px;
+`;
+
+interface Props {
+    notes: Post[];
+    className?: string;
+}
+
+export default function NotesIcon({ notes, className }: Props) {
+    return (
+        <Popover content={() => <div>{`${notes.length} ${pluralize(notes.length, 'note')}`}</div>} placement="bottom">
+            <IconWrapper count={notes.length} className={className}>
+                <CampaignOutlined fontSize="inherit" />
+                <Count>{notes.length}</Count>
+            </IconWrapper>
+        </Popover>
+    );
+}
diff --git a/datahub-web-react/src/app/previewV2/Pills.tsx b/datahub-web-react/src/app/previewV2/Pills.tsx
new file mode 100644
index 00000000000000..5af1a05290500a
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/Pills.tsx
@@ -0,0 +1,119 @@
+import { LayoutOutlined } from '@ant-design/icons';
+import React, { useContext } from 'react';
+import AccountCircleOutlinedIcon from '@mui/icons-material/AccountCircleOutlined';
+import FindInPageOutlinedIcon from '@mui/icons-material/FindInPageOutlined';
+import SellOutlinedIcon from '@mui/icons-material/SellOutlined';
+import styled from 'styled-components';
+import { BookmarkSimple } from '@phosphor-icons/react';
+import { useMatchedFieldsForList } from '../search/context/SearchResultContext';
+import { EntityPath, EntityType, GlobalTags, GlossaryTerms, LineageDirection, Owner } from '../../types.generated';
+import { EntityCapabilityType } from '../entityV2/Entity';
+import MatchesContext, { PreviewSection } from '../shared/MatchesContext';
+import SearchPill from './SearchPill';
+import { entityHasCapability, getHighlightedTag } from './utils';
+import { LineageTabContext } from '../entityV2/shared/tabs/Lineage/LineageTabContext';
+
+const PillsContainer = styled.div`
+    gap: 5px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    height: 30px;
+`;
+
+interface Props {
+    glossaryTerms?: GlossaryTerms;
+    tags?: GlobalTags;
+    owners?: Array<Owner> | null;
+    entityCapabilities: Set<EntityCapabilityType>;
+    paths?: EntityPath[];
+    entityType: EntityType;
+}
+
+const Pills = ({ glossaryTerms, tags, owners, entityCapabilities, paths, entityType }: Props) => {
+    const { lineageDirection, isColumnLevelLineage, selectedColumn } = useContext(LineageTabContext);
+    const lineageDirectionText = lineageDirection === LineageDirection.Downstream ? 'downstream' : 'upstream';
+    const { setExpandedSection, expandedSection } = useContext(MatchesContext);
+    const groupedMatches = useMatchedFieldsForList('fieldLabels');
+    const showGlossaryTermsBadge = entityHasCapability(entityCapabilities, EntityCapabilityType.GLOSSARY_TERMS);
+    const showTagsBadge = entityHasCapability(entityCapabilities, EntityCapabilityType.TAGS);
+    const showOwnersBadge = entityHasCapability(entityCapabilities, EntityCapabilityType.OWNERS);
+    const highlightedTag = getHighlightedTag(tags);
+
+    const handlePillClick = (section: PreviewSection | undefined, data) => (e) => {
+        if (!data?.length) return;
+        setExpandedSection(expandedSection === section ? undefined : section);
+        e.preventDefault();
+        e.stopPropagation();
+    };
+
+    return (
+        <PillsContainer>
+            {showGlossaryTermsBadge && glossaryTerms && (
+                <SearchPill
+                    icon={<BookmarkSimple />}
+                    count={glossaryTerms.terms?.length || 0}
+                    enabled={!!glossaryTerms.terms?.length}
+                    active={expandedSection === PreviewSection.GLOSSARY_TERMS}
+                    label=""
+                    countLabel="term"
+                    onClick={handlePillClick(PreviewSection.GLOSSARY_TERMS, glossaryTerms.terms)}
+                    highlightedText={glossaryTerms.terms?.length ? glossaryTerms?.terms[0].term.properties?.name : ''}
+                />
+            )}
+            {showTagsBadge && tags && (
+                <SearchPill
+                    icon={<SellOutlinedIcon />}
+                    count={tags.tags?.length || 0}
+                    enabled={!!tags.tags?.length}
+                    active={expandedSection === PreviewSection.TAGS}
+                    label=""
+                    countLabel="tag"
+                    onClick={handlePillClick(PreviewSection.TAGS, tags.tags)}
+                    highlightedText={highlightedTag}
+                />
+            )}
+            {showOwnersBadge && owners && (
+                <SearchPill
+                    icon={<AccountCircleOutlinedIcon />}
+                    count={owners.length || 0}
+                    enabled={!!owners.length}
+                    active={expandedSection === PreviewSection.OWNERS}
+                    label=""
+                    countLabel="owner"
+                    onClick={handlePillClick(PreviewSection.OWNERS, owners)}
+                />
+            )}
+
+            {groupedMatches.length > 0 && (
+                <SearchPill
+                    icon={<FindInPageOutlinedIcon />}
+                    count={groupedMatches?.length || 0}
+                    enabled
+                    active={expandedSection === PreviewSection.MATCHES}
+                    label=""
+                    countLabel="match"
+                    onClick={handlePillClick(PreviewSection.MATCHES, groupedMatches)}
+                />
+            )}
+            {/* only show the column paths pill on datasets who actually have columns to show */}
+            {paths &&
+                paths.length > 0 &&
+                entityType === EntityType.Dataset &&
+                isColumnLevelLineage &&
+                selectedColumn && (
+                    <SearchPill
+                        icon={<LayoutOutlined />}
+                        count={paths.length || 0}
+                        enabled={!!paths.length}
+                        active={expandedSection === PreviewSection.COLUMN_PATHS}
+                        label=""
+                        countLabel={`${lineageDirectionText} column`}
+                        onClick={handlePillClick(PreviewSection.COLUMN_PATHS, paths)}
+                    />
+                )}
+        </PillsContainer>
+    );
+};
+
+export default Pills;
diff --git a/datahub-web-react/src/app/previewV2/PreviewCardFooterRightSection.tsx b/datahub-web-react/src/app/previewV2/PreviewCardFooterRightSection.tsx
new file mode 100644
index 00000000000000..349a0b0dfa8748
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/PreviewCardFooterRightSection.tsx
@@ -0,0 +1,103 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Divider } from 'antd';
+import { DatasetStatsSummary, EntityType } from '../../types.generated';
+import { REDESIGN_COLORS } from '../entityV2/shared/constants';
+import { EntityCapabilityType } from '../entityV2/Entity';
+import { usePreviewData } from '../entityV2/shared/PreviewContext';
+import { entityHasCapability } from './utils';
+import EntityRegistry from '../entityV2/EntityRegistry';
+import LineageBadge from './LineageBadge';
+import Freshness from './Freshness';
+import {
+    PopularityTier,
+    getBarsStatusFromPopularityTier,
+} from '../entityV2/shared/containers/profile/sidebar/shared/utils';
+import QueryStat from './QueryStat';
+import SidebarPopularityHeaderSection from '../entityV2/shared/containers/profile/sidebar/shared/SidebarPopularityHeaderSection';
+
+import { DatasetLastUpdatedMs, DashboardLastUpdatedMs } from '../entityV2/shared/utils';
+
+const Container = styled.div`
+    text-align: center;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: end;
+`;
+
+const StyledDivider = styled(Divider)`
+    height: 16px;
+    color: ${REDESIGN_COLORS.FOUNDATION_BLUE_2};
+`;
+
+interface Props {
+    entityType: EntityType;
+    urn: string;
+    entityRegistry: EntityRegistry;
+    entityCapabilities: Set<EntityCapabilityType>;
+    lastUpdatedMs?: DatasetLastUpdatedMs | DashboardLastUpdatedMs;
+    tier?: PopularityTier;
+    statsSummary?: DatasetStatsSummary | null;
+}
+
+const PreviewCardFooterRightSection = ({
+    entityType,
+    urn,
+    entityRegistry,
+    entityCapabilities,
+    lastUpdatedMs,
+    tier,
+    statsSummary,
+}: Props) => {
+    const previewData = usePreviewData();
+
+    const status = tier !== undefined ? getBarsStatusFromPopularityTier(tier) : 0;
+    const showLineageBadge = entityHasCapability(entityCapabilities, EntityCapabilityType.LINEAGE);
+
+    return (
+        <>
+            <Container>
+                {!!statsSummary?.queryCountLast30Days && (
+                    <>
+                        <QueryStat queryCountLast30Days={statsSummary?.queryCountLast30Days} />
+                        {showLineageBadge && <StyledDivider type="vertical" />}
+                    </>
+                )}
+                {showLineageBadge && (
+                    <>
+                        <LineageBadge
+                            upstreamTotal={previewData?.upstream?.total}
+                            downstreamTotal={previewData?.downstream?.total}
+                            entityRegistry={entityRegistry}
+                            entityType={entityType}
+                            urn={urn}
+                        />
+                    </>
+                )}
+                {!!lastUpdatedMs?.lastUpdatedMs && (
+                    <>
+                        <StyledDivider type="vertical" />
+                        <Freshness
+                            time={lastUpdatedMs.lastUpdatedMs}
+                            timeProperty={lastUpdatedMs.property}
+                            showDate={false}
+                        />
+                    </>
+                )}
+                {!!(tier !== undefined && status) && (
+                    <>
+                        <StyledDivider type="vertical" />
+                        <SidebarPopularityHeaderSection
+                            statsSummary={statsSummary}
+                            entityType={entityType}
+                            size="small"
+                        />
+                    </>
+                )}
+            </Container>
+        </>
+    );
+};
+
+export default PreviewCardFooterRightSection;
diff --git a/datahub-web-react/src/app/previewV2/QueryStat.tsx b/datahub-web-react/src/app/previewV2/QueryStat.tsx
new file mode 100644
index 00000000000000..21b0313841bff9
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/QueryStat.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import styled from 'styled-components';
+import { formatNumber } from '../shared/formatNumber';
+import { REDESIGN_COLORS } from '../entityV2/shared/constants';
+
+const Container = styled.div`
+    color: ${REDESIGN_COLORS.FOUNDATION_BLUE_4};
+    font-size: 12px;
+    white-space: nowrap;
+`;
+
+interface Props {
+    queryCountLast30Days?: number | null;
+}
+
+const QueryStat = ({ queryCountLast30Days }: Props) => {
+    return <Container>{formatNumber(queryCountLast30Days)} queries</Container>;
+};
+
+export default QueryStat;
diff --git a/datahub-web-react/src/app/previewV2/SearchPill.tsx b/datahub-web-react/src/app/previewV2/SearchPill.tsx
new file mode 100644
index 00000000000000..4b5250e4590e80
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/SearchPill.tsx
@@ -0,0 +1,126 @@
+import { Tooltip } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import { pluralize } from '../shared/textUtil';
+import { REDESIGN_COLORS } from '../entityV2/shared/constants';
+
+type Props = {
+    icon: any;
+    count: number;
+    label: string;
+    onClick?: (e: React.MouseEvent) => void;
+    enabled?: boolean;
+    countLabel: string;
+    active?: boolean;
+    highlightedText?: string;
+};
+
+const getColor = (enabled?: boolean, active?: boolean) => {
+    let color = '#b0a2c2';
+    if (enabled) {
+        if (active) {
+            color = 'white';
+        } else {
+            color = '#81879F';
+        }
+    }
+    return color;
+};
+
+export const PillContainer = styled.div<{ enabled?: boolean; active?: boolean; isHighlightedTextPresent: boolean }>`
+    height: 24px;
+    padding-left: 8px;
+    padding-right: ${({ isHighlightedTextPresent }) => (isHighlightedTextPresent ? '0px' : '8px')};
+    background-color: ${({ active }) => (active ? `${REDESIGN_COLORS.TITLE_PURPLE}` : '#f7f7f7')};
+    cursor: pointer;
+    border-radius: 20px;
+    text-align: center;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    gap: 6px;
+    color: ${(props) => getColor(props.enabled, props.active)};
+    font-size: 10px;
+    font-weight: 400;
+
+    & svg {
+        font-size: 12px;
+        color: ${(props) => getColor(props.enabled, props.active)};
+        fill: ${(props) => getColor(props.enabled, props.active)};
+    }
+
+    :hover {
+        color: ${({ enabled }) => (enabled ? 'white' : '#b0a2c2')};
+        background-color: ${({ enabled }) => (enabled ? `${REDESIGN_COLORS.TITLE_PURPLE}` : '#f7f7f7')};
+
+        svg {
+            color: ${({ enabled }) => (enabled ? 'white' : '#b0a2c2')};
+            fill: ${({ enabled }) => (enabled ? 'white' : '#b0a2c2')};
+        }
+
+        >div: last-child {
+            color: white;
+            background-color: rgba(255, 255, 255, 0.2);
+        }
+    }
+`;
+
+const Container = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 5px;
+`;
+
+const CountContainer = styled.div<{ active?: boolean }>`
+    background-color: ${({ active }) => (active ? 'rgba(255, 255, 255, 0.2)' : '#eee')};
+    border-radius: 20px;
+    height: 24px;
+    min-width: 35px;
+    padding: 4px 8px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+`;
+
+const HighlightedText = styled.div`
+    max-width: 100px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+`;
+
+// pluralize
+
+const SearchPill = ({ icon, onClick, enabled, label, count, countLabel, active, highlightedText }: Props) => {
+    const isHighlightedTextPresent = !!highlightedText;
+    return (
+        <Tooltip
+            title={`${count} ${pluralize(count, countLabel, countLabel === 'match' ? 'es' : 's')}`}
+            showArrow={false}
+        >
+            <PillContainer
+                active={active}
+                enabled={enabled}
+                onClick={onClick}
+                isHighlightedTextPresent={isHighlightedTextPresent}
+            >
+                {isHighlightedTextPresent ? (
+                    <>
+                        <Container>
+                            {icon} {label}
+                            <HighlightedText>{highlightedText}</HighlightedText>
+                        </Container>
+                        <CountContainer active={active}>{count}</CountContainer>
+                    </>
+                ) : (
+                    <>
+                        {icon} {label} {count}
+                    </>
+                )}
+            </PillContainer>
+        </Tooltip>
+    );
+};
+
+export default SearchPill;
diff --git a/datahub-web-react/src/app/previewV2/SeeSummaryButton.tsx b/datahub-web-react/src/app/previewV2/SeeSummaryButton.tsx
new file mode 100644
index 00000000000000..f98ccb2b97d227
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/SeeSummaryButton.tsx
@@ -0,0 +1,42 @@
+import { FileTextOutlined } from '@ant-design/icons';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+
+const SummaryButton = styled.div<{ maxWidth: number }>`
+    align-items: center;
+    border: 1px solid #328980;
+    border-radius: 4px;
+    background: #328980;
+    color: white;
+    display: flex;
+    max-width: ${(props) => props.maxWidth}px;
+    padding: 6px;
+    position: relative;
+    overflow: hidden;
+    transition: max-width 0.4s ease-in-out;
+    white-space: nowrap;
+
+    :hover {
+        cursor: pointer;
+    }
+`;
+
+const SummaryButtonText = styled.span`
+    font-size: 10px;
+    font-weight: 600;
+    margin-left: 8px;
+`;
+
+export default function SeeSummaryButton() {
+    const [summaryButtonExpanded, setSummaryButtonExpanded] = useState(false);
+    return (
+        <SummaryButton
+            onMouseEnter={() => setSummaryButtonExpanded(true)}
+            onMouseLeave={() => setSummaryButtonExpanded(false)}
+            maxWidth={summaryButtonExpanded ? 102 : 26}
+        >
+            <FileTextOutlined />
+            <SummaryButtonText>View summary</SummaryButtonText>
+        </SummaryButton>
+    );
+}
diff --git a/datahub-web-react/src/app/previewV2/__tests__/utils.test.ts b/datahub-web-react/src/app/previewV2/__tests__/utils.test.ts
new file mode 100644
index 00000000000000..e3208fabfc37c2
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/__tests__/utils.test.ts
@@ -0,0 +1,33 @@
+import { entityCapabilities, globalTags, owners } from '../../../Mocks';
+import { EntityCapabilityType } from '../../entityV2/Entity';
+import { entityHasCapability, getHighlightedTag, getUniqueOwners } from '../utils';
+
+describe('Preview V2 utils tests', () => {
+    it('getUniqueOwners -> should return all unique owners based on URN', () => {
+        const result = getUniqueOwners(owners);
+        const expectedResult = [owners[0], owners[2]];
+        expect(result).toMatchObject(expectedResult);
+    });
+    it('getUniqueOwners -> should return null when no owners are passed', () => {
+        const result = getUniqueOwners(null);
+        expect(result).toStrictEqual(undefined);
+    });
+    it('entityHasCapability -> check if entity has the provided capability', () => {
+        const capabilityToCheck: EntityCapabilityType = EntityCapabilityType.OWNERS;
+        const result = entityHasCapability(entityCapabilities, capabilityToCheck);
+        expect(result).toBe(true);
+    });
+    it('entityHasCapability -> check if entity does not have the provided capability', () => {
+        const capabilityToCheck = 'DELEGATE';
+        const result = entityHasCapability(entityCapabilities, capabilityToCheck as any);
+        expect(result).toBe(false);
+    });
+    it('getHighlightedTag -> get name of the tag', () => {
+        const result = getHighlightedTag(globalTags);
+        expect(result).toMatch('abc-sample-tag');
+    });
+    it('getHighlightedTag -> get empty output for empty tag', () => {
+        const result = getHighlightedTag();
+        expect(result).toMatch('');
+    });
+});
diff --git a/datahub-web-react/src/app/previewV2/shared.tsx b/datahub-web-react/src/app/previewV2/shared.tsx
new file mode 100644
index 00000000000000..2acf749af498bc
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/shared.tsx
@@ -0,0 +1,10 @@
+import styled from 'styled-components';
+
+export const ActionsAndStatusSection = styled.div`
+    flex: 0 0 auto;
+
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 5px;
+`;
diff --git a/datahub-web-react/src/app/previewV2/utils.ts b/datahub-web-react/src/app/previewV2/utils.ts
new file mode 100644
index 00000000000000..8413d5bd812598
--- /dev/null
+++ b/datahub-web-react/src/app/previewV2/utils.ts
@@ -0,0 +1,157 @@
+import { Modal, message } from 'antd';
+import { useBatchSetDataProductMutation } from '@src/graphql/dataProduct.generated';
+import { useRemoveTermMutation, useUnsetDomainMutation } from '../../graphql/mutations.generated';
+import { BrowsePathV2, GlobalTags, Owner } from '../../types.generated';
+import { EntityCapabilityType } from '../entityV2/Entity';
+import { useEntityContext } from '../entity/shared/EntityContext';
+
+export function getUniqueOwners(owners?: Owner[] | null) {
+    const uniqueOwnerUrns = new Set();
+    return owners?.filter((owner) => !uniqueOwnerUrns.has(owner.owner.urn) && uniqueOwnerUrns.add(owner.owner.urn));
+}
+
+export const entityHasCapability = (
+    capabilities: Set<EntityCapabilityType>,
+    capabilityToCheck: EntityCapabilityType,
+): boolean => capabilities.has(capabilityToCheck);
+
+export const getHighlightedTag = (tags?: GlobalTags) => {
+    if (tags && tags.tags?.length) {
+        if (tags?.tags[0].tag.properties) return tags?.tags[0]?.tag?.properties?.name;
+        return tags?.tags[0]?.tag?.name;
+    }
+    return '';
+};
+
+export const isNullOrUndefined = (value: any) => {
+    return value === null || value === undefined;
+};
+
+export function useRemoveDomainAssets(setShouldRefetchEmbeddedListSearch) {
+    const { entityState, refetch } = useEntityContext();
+    const [unsetDomainMutation] = useUnsetDomainMutation();
+
+    const handleRemoveDomain = (urnToRemoveFrom) => {
+        message.loading({ content: 'Removing Domain...', duration: 2 });
+        unsetDomainMutation({ variables: { entityUrn: urnToRemoveFrom } })
+            .then(() => {
+                setTimeout(() => {
+                    setShouldRefetchEmbeddedListSearch(true);
+                    entityState?.setShouldRefetchContents(true);
+                    refetch();
+                    message.success({ content: 'Domain Removed!', duration: 2 });
+                }, 2000);
+            })
+            .catch((e: unknown) => {
+                message.destroy();
+                if (e instanceof Error) {
+                    message.error({ content: `Failed to remove domain: \n ${e.message || ''}`, duration: 3 });
+                }
+            });
+    };
+
+    const removeDomain = (urnToRemoveFrom) => {
+        Modal.confirm({
+            title: `Confirm Domain Removal`,
+            content: `Are you sure you want to remove this domain?`,
+            onOk() {
+                handleRemoveDomain(urnToRemoveFrom);
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
+    return { removeDomain };
+}
+
+export function useRemoveGlossaryTermAssets(setShouldRefetchEmbeddedListSearch) {
+    const [removeTermMutation] = useRemoveTermMutation();
+
+    const handleRemoveTerm = (previewData, termUrn) => {
+        if (termUrn) {
+            message.loading({ content: 'Removing Term...', duration: 2 });
+            removeTermMutation({
+                variables: {
+                    input: {
+                        termUrn,
+                        resourceUrn: previewData?.urn,
+                    },
+                },
+            })
+                .then(({ errors }) => {
+                    if (!errors) {
+                        setTimeout(() => {
+                            setShouldRefetchEmbeddedListSearch(true);
+                            message.success({ content: 'Term Removed!', duration: 2 });
+                        }, 2000);
+                    }
+                })
+                .catch((e) => {
+                    message.destroy();
+                    message.error({ content: `Failed to remove Term: \n ${e.message || ''}`, duration: 3 });
+                });
+        }
+    };
+
+    const removeTerm = (previewData, termUrn) => {
+        Modal.confirm({
+            title: `Do you want to remove ${previewData.name} term?`,
+            content: `Are you sure you want to remove the ${previewData.name} term?`,
+            onOk() {
+                handleRemoveTerm(previewData, termUrn);
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
+    return { removeTerm };
+}
+
+export function useRemoveDataProductAssets(setShouldRefetchEmbeddedListSearch) {
+    const [batchSetDataProductMutation] = useBatchSetDataProductMutation();
+
+    function handleDataProduct(urn) {
+        batchSetDataProductMutation({ variables: { input: { resourceUrns: [urn] } } })
+            .then(() => {
+                setTimeout(() => {
+                    setShouldRefetchEmbeddedListSearch(true);
+                    message.success({ content: 'Removed Data Product.', duration: 2 });
+                }, 2000);
+            })
+            .catch((e: unknown) => {
+                message.destroy();
+                if (e instanceof Error) {
+                    message.error({
+                        content: `Failed to remove data product. An unknown error occurred.`,
+                        duration: 3,
+                    });
+                }
+            });
+    }
+
+    const removeDataProduct = (urn) => {
+        Modal.confirm({
+            title: `Confirm Data Product Removal`,
+            content: `Are you sure you want to remove this data product?`,
+            onOk() {
+                handleDataProduct(urn);
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
+    return { removeDataProduct };
+}
+
+export const isDefaultBrowsePath = (browsePaths: BrowsePathV2) => {
+    return browsePaths.path?.length === 1 && browsePaths?.path[0].name === 'Default';
+};
diff --git a/datahub-web-react/src/app/recommendations/HoverEntityTooltipContext.tsx b/datahub-web-react/src/app/recommendations/HoverEntityTooltipContext.tsx
new file mode 100644
index 00000000000000..e0b41e9bfb7f29
--- /dev/null
+++ b/datahub-web-react/src/app/recommendations/HoverEntityTooltipContext.tsx
@@ -0,0 +1,14 @@
+import React, { useContext } from 'react';
+
+export interface HoverEntityTooltipContextType {
+    entityCount: number | undefined;
+}
+
+export const HoverEntityTooltipContext = React.createContext<HoverEntityTooltipContextType>({
+    entityCount: undefined,
+});
+
+export const useHoverEntityTooltipContext = () => {
+    const { entityCount } = useContext(HoverEntityTooltipContext);
+    return { entityCount };
+};
diff --git a/datahub-web-react/src/app/recommendations/renderer/component/CompactEntityNameList.tsx b/datahub-web-react/src/app/recommendations/renderer/component/CompactEntityNameList.tsx
index dc52ee737fe3a1..ec84ec6c3bfb0c 100644
--- a/datahub-web-react/src/app/recommendations/renderer/component/CompactEntityNameList.tsx
+++ b/datahub-web-react/src/app/recommendations/renderer/component/CompactEntityNameList.tsx
@@ -1,7 +1,7 @@
 import { ArrowRightOutlined } from '@ant-design/icons';
 import React from 'react';
 import styled from 'styled-components/macro';
-import { useHistory } from 'react-router';
+import { TooltipPlacement } from 'antd/es/tooltip';
 import { Entity, EntityType, SchemaFieldEntity } from '../../../../types.generated';
 import { IconStyleType } from '../../../entity/Entity';
 import { useEntityRegistry } from '../../../useEntityRegistry';
@@ -12,6 +12,7 @@ import { ANTD_GRAY } from '../../../entity/shared/constants';
 const NameWrapper = styled.span<{ addMargin }>`
     display: inline-flex;
     align-items: center;
+    max-width: 100%;
     ${(props) => props.addMargin && 'margin: 2px 0;'}
 `;
 
@@ -26,10 +27,17 @@ type Props = {
     linkUrlParams?: Record<string, string | boolean>;
     showTooltips?: boolean;
     showArrows?: boolean;
+    placement?: TooltipPlacement;
 };
-export const CompactEntityNameList = ({ entities, onClick, linkUrlParams, showTooltips = true, showArrows }: Props) => {
+export const CompactEntityNameList = ({
+    entities,
+    onClick,
+    linkUrlParams,
+    showTooltips = true,
+    showArrows,
+    placement,
+}: Props) => {
     const entityRegistry = useEntityRegistry();
-    const history = useHistory();
 
     return (
         <>
@@ -52,29 +60,25 @@ export const CompactEntityNameList = ({ entities, onClick, linkUrlParams, showTo
                 const url = entityRegistry.getEntityUrl(entity.type, entity.urn, linkUrlParams);
                 return (
                     <NameWrapper addMargin={showArrow}>
-                        <span
-                            onClickCapture={(e) => {
-                                // prevents the search links from taking over
-                                e.preventDefault();
-                                history.push(url);
-                            }}
+                        <HoverEntityTooltip
+                            entity={entity}
+                            canOpen={showTooltips}
+                            placement={placement}
+                            showArrow={false}
                         >
-                            <HoverEntityTooltip entity={entity} canOpen={showTooltips}>
-                                <span data-testid={`compact-entity-link-${entity.urn}`}>
-                                    <EntityPreviewTag
-                                        displayName={displayName}
-                                        url={url}
-                                        platformLogoUrl={platformLogoUrl || undefined}
-                                        platformLogoUrls={genericProps?.siblingPlatforms?.map(
-                                            (platform) => platform.properties?.logoUrl,
-                                        )}
-                                        logoComponent={fallbackIcon}
-                                        onClick={() => onClick?.(index)}
-                                        columnName={columnName}
-                                    />
-                                </span>
-                            </HoverEntityTooltip>
-                        </span>
+                            <EntityPreviewTag
+                                displayName={displayName}
+                                url={url}
+                                platformLogoUrl={platformLogoUrl || undefined}
+                                platformLogoUrls={genericProps?.siblingPlatforms?.map(
+                                    (platform) => platform.properties?.logoUrl,
+                                )}
+                                logoComponent={fallbackIcon}
+                                onClick={() => onClick?.(index)}
+                                columnName={columnName}
+                                dataTestId={`compact-entity-link-${entity.urn}`}
+                            />
+                        </HoverEntityTooltip>
                         {showArrow && <StyledArrow />}
                     </NameWrapper>
                 );
diff --git a/datahub-web-react/src/app/recommendations/renderer/component/EntityPreviewTag.tsx b/datahub-web-react/src/app/recommendations/renderer/component/EntityPreviewTag.tsx
index c930ba0bf5d388..489b33630bb20c 100644
--- a/datahub-web-react/src/app/recommendations/renderer/component/EntityPreviewTag.tsx
+++ b/datahub-web-react/src/app/recommendations/renderer/component/EntityPreviewTag.tsx
@@ -1,12 +1,15 @@
 import React from 'react';
 import { Divider, Image, Tag } from 'antd';
+import { Tooltip } from '@components';
 import styled from 'styled-components';
 import { Link } from 'react-router-dom';
 import { Maybe } from 'graphql/jsutils/Maybe';
+import { useEmbeddedProfileLinkProps } from '@src/app/shared/useEmbeddedProfileLinkProps';
 import { ANTD_GRAY } from '../../../entity/shared/constants';
 
 const EntityTag = styled(Tag)`
     margin: 4px;
+    max-width: inherit;
 `;
 
 const TitleContainer = styled.div`
@@ -14,6 +17,7 @@ const TitleContainer = styled.div`
     align-items: center;
     justify-content: space-between;
     padding: 4px;
+    max-width: inherit;
 `;
 
 const IconContainer = styled.span`
@@ -33,6 +37,13 @@ const PlatformLogo = styled(Image)`
 const DisplayNameContainer = styled.span`
     padding-left: 4px;
     padding-right: 4px;
+    overflow: hidden;
+    display: flex;
+    align-items: center;
+    span {
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
 `;
 
 const ColumnName = styled.span`
@@ -45,6 +56,10 @@ export const StyledDivider = styled(Divider)`
     margin: 0 7px;
 `;
 
+const StyledLink = styled(Link)`
+    max-width: inherit;
+`;
+
 type Props = {
     displayName: string;
     url: string;
@@ -53,6 +68,16 @@ type Props = {
     logoComponent?: React.ReactNode;
     onClick?: () => void;
     columnName?: string;
+    dataTestId?: string;
+};
+
+const constructExternalUrl = (url) => {
+    if (!url) return null;
+
+    const [baseUrl, queryString] = url.split('?');
+    const newBaseUrl = `${baseUrl}/`;
+
+    return queryString ? `${newBaseUrl}?${queryString}` : newBaseUrl;
 };
 
 export const EntityPreviewTag = ({
@@ -63,9 +88,13 @@ export const EntityPreviewTag = ({
     logoComponent,
     onClick,
     columnName,
+    dataTestId,
 }: Props) => {
+    const externalUrl = constructExternalUrl(url);
+    const linkProps = useEmbeddedProfileLinkProps();
+
     return (
-        <Link to={url} onClick={onClick}>
+        <StyledLink to={externalUrl} {...linkProps} onClick={onClick} data-testid={dataTestId}>
             <EntityTag>
                 <TitleContainer>
                     <IconContainer>
@@ -81,16 +110,18 @@ export const EntityPreviewTag = ({
                             logoComponent}
                     </IconContainer>
                     <DisplayNameContainer>
-                        <span className="test-mini-preview-class">{displayName}</span>
+                        <Tooltip title={displayName} showArrow={false}>
+                            <span className="test-mini-preview-class">{displayName}</span>
+                        </Tooltip>
                         {columnName && (
-                            <>
+                            <Tooltip title={columnName} showArrow={false}>
                                 <StyledDivider type="vertical" />
                                 <ColumnName>{columnName}</ColumnName>
-                            </>
+                            </Tooltip>
                         )}
                     </DisplayNameContainer>
                 </TitleContainer>
             </EntityTag>
-        </Link>
+        </StyledLink>
     );
 };
diff --git a/datahub-web-react/src/app/recommendations/renderer/component/HoverEntityTooltip.tsx b/datahub-web-react/src/app/recommendations/renderer/component/HoverEntityTooltip.tsx
index 9ff0a1a2f940bf..afa1edca05dda3 100644
--- a/datahub-web-react/src/app/recommendations/renderer/component/HoverEntityTooltip.tsx
+++ b/datahub-web-react/src/app/recommendations/renderer/component/HoverEntityTooltip.tsx
@@ -1,9 +1,11 @@
+import { Tooltip } from '@components';
 import { TooltipPlacement } from 'antd/es/tooltip';
-import { Tooltip } from 'antd';
 import React from 'react';
 import { Entity } from '../../../../types.generated';
 import { PreviewType } from '../../../entity/Entity';
 import { useEntityRegistry } from '../../../useEntityRegistry';
+import { useEmbeddedProfileLinkProps } from '../../../shared/useEmbeddedProfileLinkProps';
+import { HoverEntityTooltipContext } from '../../HoverEntityTooltipContext';
 
 type Props = {
     entity?: Entity;
@@ -11,10 +13,24 @@ type Props = {
     canOpen?: boolean;
     children: React.ReactNode;
     placement?: TooltipPlacement;
+    showArrow?: boolean;
+    width?: number;
+    maxWidth?: number;
+    entityCount?: number;
 };
 
-export const HoverEntityTooltip = ({ entity, canOpen = true, children, placement }: Props) => {
+export const HoverEntityTooltip = ({
+    entity,
+    canOpen = true,
+    children,
+    placement,
+    showArrow,
+    width = 360,
+    maxWidth = 450,
+    entityCount = undefined,
+}: Props) => {
     const entityRegistry = useEntityRegistry();
+    const linkProps = useEmbeddedProfileLinkProps();
 
     if (!entity || !entity.type || !entity.urn) {
         return <>{children}</>;
@@ -22,15 +38,23 @@ export const HoverEntityTooltip = ({ entity, canOpen = true, children, placement
 
     const url = entityRegistry.getEntityUrl(entity.type, entity.urn);
     return (
-        <Tooltip
-            visible={canOpen ? undefined : false}
-            color="white"
-            placement={placement || 'topRight'}
-            overlayStyle={{ minWidth: 300, maxWidth: 600, width: 'fit-content' }}
-            overlayInnerStyle={{ padding: 12 }}
-            title={<a href={url}>{entityRegistry.renderPreview(entity.type, PreviewType.HOVER_CARD, entity)}</a>}
-        >
-            {children}
-        </Tooltip>
+        <HoverEntityTooltipContext.Provider value={{ entityCount }}>
+            <Tooltip
+                showArrow={showArrow}
+                open={canOpen ? undefined : false}
+                color="white"
+                placement={placement || 'bottom'}
+                overlayStyle={{ minWidth: width, maxWidth, zIndex: 1100 }}
+                overlayInnerStyle={{ padding: 20, borderRadius: 20, overflow: 'hidden', position: 'relative' }}
+                title={
+                    <a href={url} {...linkProps}>
+                        {entityRegistry.renderPreview(entity.type, PreviewType.HOVER_CARD, entity)}
+                    </a>
+                }
+                zIndex={1000}
+            >
+                {children}
+            </Tooltip>
+        </HoverEntityTooltipContext.Provider>
     );
 };
diff --git a/datahub-web-react/src/app/search/context/SearchContext.tsx b/datahub-web-react/src/app/search/context/SearchContext.tsx
index 656c57b0b22d02..ab398aa38f813b 100644
--- a/datahub-web-react/src/app/search/context/SearchContext.tsx
+++ b/datahub-web-react/src/app/search/context/SearchContext.tsx
@@ -4,12 +4,16 @@ export type SearchContextType = {
     query: string | undefined;
     selectedSortOption: string | undefined;
     setSelectedSortOption: (sortOption: string) => void;
+    isFullViewCard: boolean;
+    setIsFullViewCard: (isFullViewCard: boolean) => void;
 };
 
-export const DEFAULT_CONTEXT = {
+const DEFAULT_CONTEXT = {
     query: undefined,
     selectedSortOption: undefined,
+    isFullViewCard: false,
     setSelectedSortOption: (_: string) => null,
+    setIsFullViewCard: (_: boolean) => null,
 };
 
 export const SearchContext = React.createContext<SearchContextType>(DEFAULT_CONTEXT);
diff --git a/datahub-web-react/src/app/search/context/SearchContextProvider.tsx b/datahub-web-react/src/app/search/context/SearchContextProvider.tsx
index 5ad9667ab1fc09..5b412c41145af4 100644
--- a/datahub-web-react/src/app/search/context/SearchContextProvider.tsx
+++ b/datahub-web-react/src/app/search/context/SearchContextProvider.tsx
@@ -1,6 +1,6 @@
 import * as QueryString from 'query-string';
 import { useHistory, useLocation } from 'react-router';
-import React, { useMemo } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import { SearchContext } from './SearchContext';
 import { updateUrlParam } from '../../shared/updateUrlParam';
 
@@ -15,8 +15,26 @@ export default function SearchContextProvider({ children }: { children: React.Re
         updateUrlParam(history, 'sortOption', selectedOption);
     }
 
+    const localStorageIsFullCardView = localStorage.getItem('isFullViewCard');
+    const [isFullViewCard, setIsFullViewCardState] = useState(
+        localStorageIsFullCardView === null ? true : localStorageIsFullCardView === 'true',
+    );
+
+    const setIsFullViewCard = useCallback((value: boolean) => {
+        setIsFullViewCardState(value);
+        localStorage.setItem('isFullViewCard', value.toString());
+    }, []);
+
     return (
-        <SearchContext.Provider value={{ query, selectedSortOption, setSelectedSortOption }}>
+        <SearchContext.Provider
+            value={{
+                query,
+                selectedSortOption,
+                isFullViewCard,
+                setSelectedSortOption,
+                setIsFullViewCard,
+            }}
+        >
             {children}
         </SearchContext.Provider>
     );
diff --git a/datahub-web-react/src/app/search/context/SearchResultContext.tsx b/datahub-web-react/src/app/search/context/SearchResultContext.tsx
index 961a50c1d4bfe9..0e69e6894fc97a 100644
--- a/datahub-web-react/src/app/search/context/SearchResultContext.tsx
+++ b/datahub-web-react/src/app/search/context/SearchResultContext.tsx
@@ -1,5 +1,5 @@
 import React, { ReactNode, createContext, useContext, useMemo } from 'react';
-import { SearchResult } from '../../../types.generated';
+import { EntityType, MatchedField, SearchResult } from '../../../types.generated';
 import {
     getMatchedFieldsByUrn,
     getMatchedFieldNames,
@@ -47,6 +47,11 @@ export const useMatchedFields = () => {
     return useSearchResult()?.matchedFields ?? [];
 };
 
+export function getMatchedFieldsForList(primaryField: string, entityType: EntityType, matchedFields: MatchedField[]) {
+    const showableFields = matchedFields.filter((field) => shouldShowInMatchedFieldList(entityType, field));
+    return getMatchesPrioritized(entityType, showableFields, primaryField);
+}
+
 export const useMatchedFieldsForList = (primaryField: MatchedFieldName) => {
     const entityType = useEntityType();
     const matchedFields = useMatchedFields();
diff --git a/datahub-web-react/src/app/search/filters/utils.tsx b/datahub-web-react/src/app/search/filters/utils.tsx
index 6aea405d0465c9..7300ed2218359c 100644
--- a/datahub-web-react/src/app/search/filters/utils.tsx
+++ b/datahub-web-react/src/app/search/filters/utils.tsx
@@ -13,22 +13,9 @@ import {
 } from '@ant-design/icons';
 import { removeMarkdown } from '@src/app/entity/shared/components/styled/StripMarkdownText';
 import { DATE_TYPE_URN } from '@src/app/shared/constants';
-import React, { useLayoutEffect, useState } from 'react';
 import styled from 'styled-components';
-import {
-    AggregationMetadata,
-    DataPlatform,
-    DataPlatformInstance,
-    Domain,
-    Entity,
-    EntityType,
-    FacetFilterInput,
-    FacetMetadata,
-    GlossaryTerm,
-    Container,
-    StructuredPropertyEntity,
-} from '../../../types.generated';
-import { IconStyleType } from '../../entity/Entity';
+import { STRUCTURED_PROPERTY_FILTER } from '@src/app/searchV2/filters/field/fields';
+import React, { useLayoutEffect, useState } from 'react';
 import {
     BROWSE_PATH_V2_FILTER_NAME,
     CONTAINER_FILTER_NAME,
@@ -45,6 +32,21 @@ import {
     TYPE_NAMES_FILTER_NAME,
     UNIT_SEPARATOR,
 } from '../utils/constants';
+
+import {
+    AggregationMetadata,
+    DataPlatform,
+    DataPlatformInstance,
+    Domain,
+    Entity,
+    EntityType,
+    FacetFilterInput,
+    FacetMetadata,
+    GlossaryTerm,
+    Container,
+    StructuredPropertyEntity,
+} from '../../../types.generated';
+import { IconStyleType } from '../../entity/Entity';
 import EntityRegistry from '../../entity/EntityRegistry';
 import { ANTD_GRAY } from '../../entity/shared/constants';
 import DomainsIcon from '../../../images/domain.svg?react';
@@ -146,10 +148,7 @@ function getFilterWithEntityIconAndLabel(
     let icon: React.ReactNode = null;
     let label: React.ReactNode = null;
 
-    if (entityRegistry.hasEntity(filterEntity.type)) {
-        icon = entityRegistry.getIcon(filterEntity.type, size || 12, IconStyleType.ACCENT, ANTD_GRAY[9]);
-        label = entityRegistry.getDisplayName(filterEntity.type, filterEntity);
-    } else if (filterEntity.type === EntityType.DataPlatformInstance) {
+    if (filterEntity.type === EntityType.DataPlatformInstance) {
         const { icon: newIcon, label: newLabel } = getDataPlatformInstanceIconAndLabel(
             filterEntity,
             entityRegistry,
@@ -157,6 +156,9 @@ function getFilterWithEntityIconAndLabel(
         );
         icon = newIcon;
         label = newLabel;
+    } else if (entityRegistry.hasEntity(filterEntity.type)) {
+        icon = entityRegistry.getIcon(filterEntity.type, size || 12, IconStyleType.ACCENT, ANTD_GRAY[9]);
+        label = entityRegistry.getDisplayName(filterEntity.type, filterEntity);
     } else {
         label = filterValue;
     }
@@ -279,6 +281,9 @@ export function sortFacets(facetA: FacetMetadata, facetB: FacetMetadata, sortedF
 }
 
 export function getFilterDropdownIcon(field: string) {
+    if (field.startsWith(STRUCTURED_PROPERTIES_FILTER_NAME)) {
+        return STRUCTURED_PROPERTY_FILTER.icon as JSX.Element;
+    }
     if (field.startsWith(STRUCTURED_PROPERTIES_FILTER_NAME)) {
         return <Icon component={TableIcon} />;
     }
diff --git a/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.test.ts b/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.test.ts
index e3bfb59b3675ed..5c1ad3263d94ac 100644
--- a/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.test.ts
+++ b/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.test.ts
@@ -138,34 +138,44 @@ const searchResultWithSiblings = [
                 siblings: [
                     {
                         urn: 'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
-                        exists: true,
                         type: 'DATASET',
-                        platform: {
-                            urn: 'urn:li:dataPlatform:dbt',
-                            type: 'DATA_PLATFORM',
-                            name: 'dbt',
+                    },
+                ],
+                __typename: 'SiblingProperties',
+            },
+            siblingsSearch: {
+                searchResults: [
+                    {
+                        entity: {
+                            urn: 'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
+                            exists: true,
+                            type: 'DATASET',
+                            platform: {
+                                urn: 'urn:li:dataPlatform:dbt',
+                                type: 'DATA_PLATFORM',
+                                name: 'dbt',
+                                properties: {
+                                    type: 'OTHERS',
+                                    displayName: 'dbt',
+                                    datasetNameDelimiter: '.',
+                                    logoUrl: '/assets/platforms/dbtlogo.png',
+                                    __typename: 'DataPlatformProperties',
+                                },
+                                displayName: null,
+                                info: null,
+                                __typename: 'DataPlatform',
+                            },
+                            name: 'cypress_project.jaffle_shop.raw_orders',
                             properties: {
-                                type: 'OTHERS',
-                                displayName: 'dbt',
-                                datasetNameDelimiter: '.',
-                                logoUrl: '/assets/platforms/dbtlogo.png',
-                                __typename: 'DataPlatformProperties',
+                                name: 'raw_orders',
+                                description: '',
+                                qualifiedName: null,
+                                __typename: 'DatasetProperties',
                             },
-                            displayName: null,
-                            info: null,
-                            __typename: 'DataPlatform',
-                        },
-                        name: 'cypress_project.jaffle_shop.raw_orders',
-                        properties: {
-                            name: 'raw_orders',
-                            description: '',
-                            qualifiedName: null,
-                            __typename: 'DatasetProperties',
+                            __typename: 'Dataset',
                         },
-                        __typename: 'Dataset',
                     },
                 ],
-                __typename: 'SiblingProperties',
             },
             __typename: 'Dataset',
         },
@@ -277,34 +287,44 @@ const searchResultWithSiblings = [
                 isPrimary: true,
                 siblings: [
                     {
-                        urn: 'urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.raw_orders,PROD)',
+                        urn: 'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
                         type: 'DATASET',
-                        platform: {
-                            urn: 'urn:li:dataPlatform:bigquery',
-                            type: 'DATA_PLATFORM',
-                            name: 'bigquery',
+                    },
+                ],
+                __typename: 'SiblingProperties',
+            },
+            siblingsSearch: {
+                searchResults: [
+                    {
+                        entity: {
+                            urn: 'urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.raw_orders,PROD)',
+                            type: 'DATASET',
+                            platform: {
+                                urn: 'urn:li:dataPlatform:bigquery',
+                                type: 'DATA_PLATFORM',
+                                name: 'bigquery',
+                                properties: {
+                                    type: 'RELATIONAL_DB',
+                                    displayName: 'BigQuery',
+                                    datasetNameDelimiter: '.',
+                                    logoUrl: '/assets/platforms/bigquerylogo.png',
+                                    __typename: 'DataPlatformProperties',
+                                },
+                                displayName: null,
+                                info: null,
+                                __typename: 'DataPlatform',
+                            },
+                            name: 'cypress_project.jaffle_shop.raw_orders',
                             properties: {
-                                type: 'RELATIONAL_DB',
-                                displayName: 'BigQuery',
-                                datasetNameDelimiter: '.',
-                                logoUrl: '/assets/platforms/bigquerylogo.png',
-                                __typename: 'DataPlatformProperties',
+                                name: 'raw_orders',
+                                description: null,
+                                qualifiedName: null,
+                                __typename: 'DatasetProperties',
                             },
-                            displayName: null,
-                            info: null,
-                            __typename: 'DataPlatform',
+                            __typename: 'Dataset',
                         },
-                        name: 'cypress_project.jaffle_shop.raw_orders',
-                        properties: {
-                            name: 'raw_orders',
-                            description: null,
-                            qualifiedName: null,
-                            __typename: 'DatasetProperties',
-                        },
-                        __typename: 'Dataset',
                     },
                 ],
-                __typename: 'SiblingProperties',
             },
             __typename: 'Dataset',
         },
@@ -463,12 +483,22 @@ const searchResultWithGhostSiblings = [
                 siblings: [
                     {
                         urn: 'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
-                        exists: false,
                         type: 'DATASET',
                     },
                 ],
                 __typename: 'SiblingProperties',
             },
+            siblingsSearch: {
+                searchResults: [
+                    {
+                        entity: {
+                            urn: 'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
+                            exists: false,
+                            type: 'DATASET',
+                        },
+                    },
+                ],
+            },
             __typename: 'Dataset',
         },
         matchedFields: [
diff --git a/datahub-web-react/src/app/search/utils/constants.ts b/datahub-web-react/src/app/search/utils/constants.ts
index 7aa416e12c954f..6a06ef68f7e14f 100644
--- a/datahub-web-react/src/app/search/utils/constants.ts
+++ b/datahub-web-react/src/app/search/utils/constants.ts
@@ -30,6 +30,14 @@ export const ENTITY_TYPES_FILTER_NAME = 'entityTypes';
 export const IS_HIDDEN_PROPERTY_FILTER_NAME = 'isHidden';
 export const SHOW_IN_COLUMNS_TABLE_PROPERTY_FILTER_NAME = 'showInColumnsTable';
 export const SHOW_IN_ASSET_SUMMARY_PROPERTY_FILTER_NAME = 'showInAssetSummary';
+export const HAS_ACTIVE_INCIDENTS_FILTER_NAME = 'hasActiveIncidents';
+export const HAS_FAILING_ASSERTIONS_FILTER_NAME = 'hasFailingAssertions';
+export const OUTPUT_PORTS_FIELD = 'isOutputPort';
+export const COMPLETED_FORMS_FILTER_NAME = 'completedForms';
+export const INCOMPLETE_FORMS_FILTER_NAME = 'incompleteForms';
+export const VERIFIED_FORMS_FILTER_NAME = 'verifiedForms';
+export const COMPLETED_FORMS_COMPLETED_PROMPT_IDS_FILTER_NAME = 'completedFormsCompletedPromptIds';
+export const INCOMPLETE_FORMS_COMPLETED_PROMPT_IDS_FILTER_NAME = 'incompleteFormsCompletedPromptIds';
 
 export const LEGACY_ENTITY_FILTER_FIELDS = [ENTITY_FILTER_NAME, LEGACY_ENTITY_FILTER_NAME];
 
@@ -71,6 +79,8 @@ export const ORDERED_FIELDS = [
     TYPE_NAMES_FILTER_NAME,
     ORIGIN_FILTER_NAME,
     DEGREE_FILTER_NAME,
+    HAS_ACTIVE_INCIDENTS_FILTER_NAME,
+    HAS_FAILING_ASSERTIONS_FILTER_NAME,
 ];
 
 export const FIELD_TO_LABEL = {
@@ -93,6 +103,8 @@ export const FIELD_TO_LABEL = {
     origin: 'Environment',
     degree: 'Degree',
     [BROWSE_PATH_V2_FILTER_NAME]: 'Browse',
+    hasActiveIncidents: 'Incidents',
+    hasFailingAssertions: 'Assertions',
 };
 
 export const FIELDS_THAT_USE_CONTAINS_OPERATOR = [
diff --git a/datahub-web-react/src/app/searchV2/AdvancedSearchFilterOverallUnionTypeSelect.tsx b/datahub-web-react/src/app/searchV2/AdvancedSearchFilterOverallUnionTypeSelect.tsx
new file mode 100644
index 00000000000000..a37605182f3814
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/AdvancedSearchFilterOverallUnionTypeSelect.tsx
@@ -0,0 +1,46 @@
+import { Select } from 'antd';
+import React from 'react';
+import styled from 'styled-components/macro';
+
+import { ANTD_GRAY } from '../entity/shared/constants';
+import { UnionType } from './utils/constants';
+
+type Props = {
+    unionType: UnionType;
+    onUpdate: (newValue: UnionType) => void;
+    disabled?: boolean;
+};
+
+const { Option } = Select;
+
+const StyledSelect = styled(Select)`
+    border-radius: 5px;
+    background: ${ANTD_GRAY[4]};
+    :hover {
+        background: ${ANTD_GRAY[4.5]};
+    }
+`;
+
+export const AdvancedSearchFilterOverallUnionTypeSelect = ({ unionType, onUpdate, disabled = false }: Props) => {
+    return (
+        <>
+            <StyledSelect
+                showArrow={false}
+                bordered={false}
+                disabled={disabled}
+                // these values are just for display purposes- the actual value is the unionType prop
+                value={unionType === UnionType.AND ? 'all filters' : 'any filter'}
+                onChange={(newValue) => {
+                    if ((newValue as any) !== unionType) {
+                        onUpdate(newValue as any);
+                    }
+                }}
+                size="small"
+                dropdownMatchSelectWidth={false}
+            >
+                <Option value={UnionType.AND}>all filters</Option>
+                <Option value={UnionType.OR}>any filter</Option>
+            </StyledSelect>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/AnalyticsLink.tsx b/datahub-web-react/src/app/searchV2/AnalyticsLink.tsx
new file mode 100644
index 00000000000000..fc675b4da9f4a3
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/AnalyticsLink.tsx
@@ -0,0 +1,25 @@
+import * as React from 'react';
+import { Typography } from 'antd';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+
+const StyledAnalyticsLink = styled(Typography.Text)`
+    display: flex;
+    margin-right: 20px;
+    text-decoration: none;
+    && {
+        font-size: 14px;
+        color: ${(props) => props.theme.styles['layout-header-color']};
+    }
+    &&:hover {
+        color: #000;
+    }
+`;
+
+export default function AnalyticsLink() {
+    return (
+        <Link to="/analytics">
+            <StyledAnalyticsLink strong>Analytics</StyledAnalyticsLink>
+        </Link>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/BrowseEntityCard.tsx b/datahub-web-react/src/app/searchV2/BrowseEntityCard.tsx
new file mode 100644
index 00000000000000..50abfc062118cc
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/BrowseEntityCard.tsx
@@ -0,0 +1,65 @@
+import styled from 'styled-components';
+import React from 'react';
+import { useHistory } from 'react-router-dom';
+import { useEntityRegistry } from '../useEntityRegistry';
+import { PageRoutes } from '../../conf/Global';
+import { IconStyleType } from '../entity/Entity';
+import { EntityType } from '../../types.generated';
+import { LogoCountCard } from '../shared/LogoCountCard';
+import { EventType } from '../analytics/event';
+import analytics from '../analytics';
+import { navigateToSearchUrl } from './utils/navigateToSearchUrl';
+import { ENTITY_SUB_TYPE_FILTER_NAME } from './utils/constants';
+import { useIsBrowseV2 } from './useSearchAndBrowseVersion';
+
+const BrowseEntityCardWrapper = styled.div``;
+
+export const BrowseEntityCard = ({
+    entityType,
+    count,
+    showGlossary,
+}: {
+    entityType: EntityType;
+    count: number;
+    showGlossary?: boolean;
+}) => {
+    const history = useHistory();
+    const entityRegistry = useEntityRegistry();
+    const showBrowseV2 = useIsBrowseV2();
+    const isGlossaryEntityCard = entityType === EntityType.GlossaryTerm;
+    const entityPathName = entityRegistry.getPathName(entityType);
+    const url = isGlossaryEntityCard ? PageRoutes.GLOSSARY : `${PageRoutes.BROWSE}/${entityPathName}`;
+    const onBrowseEntityCardClick = () => {
+        analytics.event({
+            type: EventType.HomePageBrowseResultClickEvent,
+            entityType,
+        });
+    };
+
+    function browse() {
+        if (showBrowseV2 && !isGlossaryEntityCard) {
+            navigateToSearchUrl({
+                query: '*',
+                filters: [{ field: ENTITY_SUB_TYPE_FILTER_NAME, values: [entityType] }],
+                history,
+            });
+        } else {
+            history.push(url);
+        }
+    }
+
+    if (isGlossaryEntityCard && !showGlossary) {
+        return null;
+    }
+
+    return (
+        <BrowseEntityCardWrapper onClick={browse} data-testid={`entity-type-browse-card-${entityType}`}>
+            <LogoCountCard
+                logoComponent={entityRegistry.getIcon(entityType, 18, IconStyleType.HIGHLIGHT)}
+                name={entityRegistry.getCollectionName(entityType)}
+                count={count}
+                onClick={onBrowseEntityCardClick}
+            />
+        </BrowseEntityCardWrapper>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/ChooseEntityTypeModal.tsx b/datahub-web-react/src/app/searchV2/ChooseEntityTypeModal.tsx
new file mode 100644
index 00000000000000..1e31bd74ee06f2
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/ChooseEntityTypeModal.tsx
@@ -0,0 +1,66 @@
+import { Button, Modal, Select } from 'antd';
+import React, { useState } from 'react';
+import { EntityType } from '../../types.generated';
+import { useEntityRegistry } from '../useEntityRegistry';
+
+type Props = {
+    onCloseModal: () => void;
+    onOk?: (results: string[]) => void;
+    title?: string;
+    defaultValues?: string[];
+};
+
+const { Option } = Select;
+
+export const ChooseEntityTypeModal = ({ defaultValues, onCloseModal, onOk, title }: Props) => {
+    const entityRegistry = useEntityRegistry();
+    const entityTypes = entityRegistry.getSearchEntityTypes();
+
+    const [stagedValues, setStagedValues] = useState(defaultValues || []);
+
+    const addEntityType = (newType) => {
+        setStagedValues([...stagedValues, newType]);
+    };
+
+    const removeEntityType = (type) => {
+        setStagedValues(stagedValues.filter((stagedValue) => stagedValue !== type));
+    };
+
+    return (
+        <Modal
+            title={title}
+            visible
+            onCancel={onCloseModal}
+            keyboard
+            footer={
+                <>
+                    <Button onClick={onCloseModal} type="text">
+                        Cancel
+                    </Button>
+                    <Button disabled={stagedValues.length === 0} onClick={() => onOk?.(stagedValues)}>
+                        Done
+                    </Button>
+                </>
+            }
+        >
+            <Select
+                mode="multiple"
+                style={{ width: '100%' }}
+                placeholder="Datasets, Dashboards, Charts, and more..."
+                onSelect={(newValue) => addEntityType(newValue)}
+                onDeselect={(newValue) => removeEntityType(newValue)}
+                value={stagedValues.map((stagedEntityType) => ({
+                    value: stagedEntityType,
+                    label: entityRegistry.getCollectionName(stagedEntityType as EntityType),
+                }))}
+                dropdownMatchSelectWidth={false}
+            >
+                {entityTypes.map((type) => (
+                    <Option key={type} value={type}>
+                        {entityRegistry.getCollectionName(type)}
+                    </Option>
+                ))}
+            </Select>
+        </Modal>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/CommandK.tsx b/datahub-web-react/src/app/searchV2/CommandK.tsx
new file mode 100644
index 00000000000000..69d749fed64d3f
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/CommandK.tsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import styled from 'styled-components';
+import { colors } from '@src/alchemy-components';
+import { useShowNavBarRedesign } from '../useShowNavBarRedesign';
+
+const Container = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    color: ${(props) => (props.$isShowNavBarRedesign ? colors.gray[1700] : '#dcdcdc')};
+    background-color: ${(props) => (props.$isShowNavBarRedesign ? colors.white : '#171723')};
+    opacity: 0.9;
+    border-color: black;
+    border-radius: 6px;
+    border: 1px solid ${(props) => (props.$isShowNavBarRedesign ? colors.gray[1700] : '#dcdcdc')};
+    padding-right: 6px;
+    padding-left: 6px;
+    margin-right: 4px;
+    margin-left: 4px;
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        height: 28px;
+        display: flex;
+    `}
+`;
+
+const Letter = styled.span<{ $isShowNavBarRedesign?: boolean }>`
+    padding: 2px;
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        color: ${colors.gray[1700]};
+        text-align: center;
+        line-height: 23px;
+    `}
+`;
+
+export const CommandK = () => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+
+    return (
+        <Container $isShowNavBarRedesign={isShowNavBarRedesign}>
+            <Letter $isShowNavBarRedesign={isShowNavBarRedesign}>⌘</Letter>
+            <Letter $isShowNavBarRedesign={isShowNavBarRedesign}>K</Letter>
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/EditTextModal.tsx b/datahub-web-react/src/app/searchV2/EditTextModal.tsx
new file mode 100644
index 00000000000000..43580d2e2b497e
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/EditTextModal.tsx
@@ -0,0 +1,37 @@
+import { Button, Input, Modal } from 'antd';
+import React, { useState } from 'react';
+
+type Props = {
+    onCloseModal: () => void;
+    onOk?: (result: string) => void;
+    title?: string;
+    defaultValue?: string;
+};
+
+export const EditTextModal = ({ defaultValue, onCloseModal, onOk, title }: Props) => {
+    const [stagedValue, setStagedValue] = useState(defaultValue || '');
+    return (
+        <Modal
+            title={title}
+            visible
+            onCancel={onCloseModal}
+            keyboard
+            footer={
+                <>
+                    <Button onClick={onCloseModal} type="text">
+                        Cancel
+                    </Button>
+                    <Button
+                        data-testid="edit-text-done-btn"
+                        disabled={stagedValue.trim().length === 0}
+                        onClick={() => onOk?.(stagedValue)}
+                    >
+                        Done
+                    </Button>
+                </>
+            }
+        >
+            <Input data-testid="edit-text-input" onChange={(e) => setStagedValue(e.target.value)} value={stagedValue} />
+        </Modal>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/EmbeddedSearchBar.tsx b/datahub-web-react/src/app/searchV2/EmbeddedSearchBar.tsx
new file mode 100644
index 00000000000000..0de4f67d1280db
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/EmbeddedSearchBar.tsx
@@ -0,0 +1,68 @@
+import React, { useEffect, useState } from 'react';
+import { Input } from 'antd';
+import styled from 'styled-components/macro';
+import * as QueryString from 'query-string';
+import { useHistory, useLocation } from 'react-router';
+import { SearchOutlined } from '@ant-design/icons';
+import filterSearchQuery from './utils/filterSearchQuery';
+import useGetSearchQueryInputs from './useGetSearchQueryInputs';
+
+const SearchIcon = styled(SearchOutlined)`
+    color: #8088a3;
+`;
+
+const SearchInput = styled(Input)`
+    width: 400px;
+    box-shadow: 0px 1px 2px 0px rgba(33, 23, 95, 0.07);
+    border-radius: 70px;
+`;
+
+interface Props {
+    style?: React.CSSProperties;
+}
+
+export const EmbeddedSearchBar = ({ style }: Props) => {
+    const history = useHistory();
+    const location = useLocation();
+    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
+    const { query: urlQuery } = useGetSearchQueryInputs();
+
+    const [searchQuery, setSearchQuery] = useState<string>(urlQuery);
+
+    useEffect(() => {
+        setSearchQuery(urlQuery);
+    }, [urlQuery]);
+
+    function handleSearch(query: string) {
+        const search = QueryString.stringify(
+            {
+                ...params,
+                query: encodeURIComponent(filterSearchQuery(query) || ''),
+                page: 1,
+            },
+            { arrayFormat: 'comma' },
+        );
+
+        history.push({ search });
+    }
+
+    return (
+        <SearchInput
+            placeholder="Search Assets..."
+            onChange={(e) => setSearchQuery(e.target.value)}
+            onPressEnter={() => {
+                handleSearch(searchQuery || '');
+            }}
+            value={searchQuery}
+            allowClear
+            style={style}
+            prefix={
+                <SearchIcon
+                    onClick={() => {
+                        handleSearch(searchQuery);
+                    }}
+                />
+            }
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/EmptySearchResults.tsx b/datahub-web-react/src/app/searchV2/EmptySearchResults.tsx
new file mode 100644
index 00000000000000..cde61f746d35bd
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/EmptySearchResults.tsx
@@ -0,0 +1,90 @@
+import { RocketOutlined } from '@ant-design/icons';
+import { useHistory } from 'react-router';
+import { Button } from 'antd';
+import React, { useCallback } from 'react';
+import styled from 'styled-components';
+import { ANTD_GRAY_V2 } from '../entity/shared/constants';
+import { navigateToSearchUrl } from './utils/navigateToSearchUrl';
+import analytics, { EventType } from '../analytics';
+import { SuggestedText } from './suggestions/SearchQuerySugggester';
+import useGetSearchQueryInputs from './useGetSearchQueryInputs';
+import { FacetFilterInput, SearchSuggestion } from '../../types.generated';
+import { useUserContext } from '../context/useUserContext';
+
+const NoDataContainer = styled.div`
+    margin: 40px auto;
+    font-size: 16px;
+    color: ${ANTD_GRAY_V2[8]};
+`;
+
+const Section = styled.div`
+    margin-bottom: 16px;
+`;
+
+function getRefineSearchText(filters: FacetFilterInput[], viewUrn?: string | null) {
+    let text = '';
+    if (filters.length && viewUrn) {
+        text = 'clearing all filters and selected view';
+    } else if (filters.length) {
+        text = 'clearing all filters';
+    } else if (viewUrn) {
+        text = 'clearing the selected view';
+    }
+
+    return text;
+}
+
+interface Props {
+    suggestions: SearchSuggestion[];
+}
+
+export default function EmptySearchResults({ suggestions }: Props) {
+    const { query, filters, viewUrn } = useGetSearchQueryInputs();
+    const history = useHistory();
+    const userContext = useUserContext();
+    const suggestText = suggestions.length > 0 ? suggestions[0].text : '';
+    const refineSearchText = getRefineSearchText(filters, viewUrn);
+
+    const onClickExploreAll = useCallback(() => {
+        analytics.event({ type: EventType.SearchResultsExploreAllClickEvent });
+        navigateToSearchUrl({ query: '*', history });
+    }, [history]);
+
+    const searchForSuggestion = () => {
+        navigateToSearchUrl({ query: suggestText, history });
+    };
+
+    const clearFiltersAndView = () => {
+        navigateToSearchUrl({ query, history });
+        userContext.updateLocalState({
+            ...userContext.localState,
+            selectedViewUrn: undefined,
+        });
+    };
+
+    return (
+        <NoDataContainer>
+            <Section>No results found for &quot;{query}&quot;</Section>
+            {refineSearchText && (
+                <>
+                    Try <SuggestedText onClick={clearFiltersAndView}>{refineSearchText}</SuggestedText>{' '}
+                    {suggestText && (
+                        <>
+                            or searching for <SuggestedText onClick={searchForSuggestion}>{suggestText}</SuggestedText>
+                        </>
+                    )}
+                </>
+            )}
+            {!refineSearchText && suggestText && (
+                <>
+                    Did you mean <SuggestedText onClick={searchForSuggestion}>{suggestText}</SuggestedText>
+                </>
+            )}
+            {!refineSearchText && !suggestText && (
+                <Button onClick={onClickExploreAll}>
+                    <RocketOutlined /> Explore all
+                </Button>
+            )}
+        </NoDataContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/SaveAsViewButton.tsx b/datahub-web-react/src/app/searchV2/SaveAsViewButton.tsx
new file mode 100644
index 00000000000000..15d328bdf1092b
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/SaveAsViewButton.tsx
@@ -0,0 +1,52 @@
+import { FilterOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+import { Tooltip } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+
+const StyledButton = styled(Button)`
+    && {
+        margin: 0px;
+        margin-left: 6px;
+        padding: 0px;
+    }
+`;
+
+const StyledFilterOutlined = styled(FilterOutlined)`
+    && {
+        font-size: 12px;
+    }
+`;
+
+const SaveAsViewText = styled.span`
+    &&& {
+        margin-left: 4px;
+    }
+`;
+
+const ToolTipHeader = styled.div`
+    margin-bottom: 12px;
+`;
+
+type Props = {
+    onClick: () => void;
+};
+
+export const SaveAsViewButton = ({ onClick }: Props) => {
+    return (
+        <Tooltip
+            placement="right"
+            title={
+                <>
+                    <ToolTipHeader>Save these filters as a new View.</ToolTipHeader>
+                    <div>Views allow you to easily save or share search filters.</div>
+                </>
+            }
+        >
+            <StyledButton type="link" onClick={onClick}>
+                <StyledFilterOutlined />
+                <SaveAsViewText>Save as View</SaveAsViewText>
+            </StyledButton>
+        </Tooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/SearchBar.tsx b/datahub-web-react/src/app/searchV2/SearchBar.tsx
new file mode 100644
index 00000000000000..cbcfdd8bcbdca0
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/SearchBar.tsx
@@ -0,0 +1,531 @@
+import React, { useEffect, useMemo, useState, useRef, useCallback } from 'react';
+import { Input, AutoComplete, Button, Skeleton } from 'antd';
+import { CloseCircleFilled, SearchOutlined } from '@ant-design/icons';
+import styled from 'styled-components/macro';
+import { useHistory } from 'react-router';
+import { colors } from '@src/alchemy-components';
+import { AutoCompleteResultForEntity, FacetFilterInput, ScenarioType } from '../../types.generated';
+import { EntityRegistry } from '../../entityRegistryContext';
+import filterSearchQuery from './utils/filterSearchQuery';
+import { ANTD_GRAY_V2 } from '../entity/shared/constants';
+import { getEntityPath } from '../entity/shared/containers/profile/utils';
+import { EXACT_SEARCH_PREFIX } from './utils/constants';
+import { useListRecommendationsQuery } from '../../graphql/recommendations.generated';
+import AutoCompleteItem from './autoComplete/AutoCompleteItem';
+import { useQuickFiltersContext } from '../../providers/QuickFiltersContext';
+import QuickFilters from './autoComplete/quickFilters/QuickFilters';
+import { getFiltersWithQuickFilter } from './utils/filterUtils';
+import usePrevious from '../shared/usePrevious';
+import analytics, { Event, EventType } from '../analytics';
+import RecommendedOption from './autoComplete/RecommendedOption';
+import SectionHeader, { EntityTypeLabel } from './autoComplete/SectionHeader';
+import { useUserContext } from '../context/useUserContext';
+import ViewAllSearchItem from './ViewAllSearchItem';
+import { ViewSelect } from '../entityV2/view/select/ViewSelect';
+import { combineSiblingsInAutoComplete } from './utils/combineSiblingsInAutoComplete';
+import { CommandK } from './CommandK';
+import { V2_SEARCH_BAR_VIEWS } from '../onboarding/configV2/HomePageOnboardingConfig';
+import { REDESIGN_COLORS } from '../entityV2/shared/constants';
+import useSearchViewAll from './useSearchViewAll';
+import { useAppConfig, useIsShowSeparateSiblingsEnabled } from '../useAppConfig';
+
+const StyledAutoComplete = styled(AutoComplete)<{ $isShowNavBarRedesign?: boolean }>`
+    width: 100%;
+    max-width: ${(props) => (props.$isShowNavBarRedesign ? '423px' : '540px')};
+`;
+
+const SkeletonContainer = styled.div`
+    height: 40px;
+    width: 100%;
+    max-width: 620px;
+`;
+
+const SkeletonButton = styled(Skeleton.Button)`
+    &&& {
+        height: inherit;
+        width: inherit;
+    }
+`;
+
+const AutoCompleteContainer = styled.div<{ viewsEnabled?: boolean; $isShowNavBarRedesign?: boolean }>`
+    padding: 0 30px;
+    align-items: center;
+    border: ${(props) => (props.$isShowNavBarRedesign ? `2px solid ${colors.gray[100]}` : '2px solid transparent')};
+    ${(props) => props.$isShowNavBarRedesign && 'box-shadow: 0px 1px 2px 0px rgba(33, 23, 95, 0.07)'};
+
+    transition: border-color 0.3s ease;
+
+    ${(props) =>
+        props.viewsEnabled &&
+        `
+        border-radius: 8px;
+        &:focus-within {
+            border-color: ${props.$isShowNavBarRedesign ? colors.violet[500] : props.theme.styles['primary-color']};
+        }
+    `}
+`;
+
+const StyledSearchBar = styled(Input)<{
+    $textColor?: string;
+    $placeholderColor?: string;
+    viewsEnabled?: boolean;
+    $isShowNavBarRedesign?: boolean;
+}>`
+    &&& {
+        border-radius: 8px;
+        height: 40px;
+        font-size: 14px;
+        color: #dcdcdc;
+        background-color: ${ANTD_GRAY_V2[2]};
+        border: 2px solid transparent;
+        padding-right: 2.5px;
+        ${(props) =>
+            !props.viewsEnabled &&
+            `
+        &:focus-within {
+            border-color: ${props.theme.styles['primary-color']};
+        }`}
+    }
+
+    > .ant-input::placeholder {
+        color: ${(props) =>
+            props.$placeholderColor || (props.$isShowNavBarRedesign ? REDESIGN_COLORS.GREY_300 : '#dcdcdc')};
+    }
+
+    > .ant-input {
+        color: ${(props) => props.$textColor || (props.$isShowNavBarRedesign ? '#000' : '#fff')};
+    }
+
+    .ant-input-clear-icon {
+        height: 15px;
+        width: 15px;
+    }
+`;
+
+const ClearIcon = styled(CloseCircleFilled)`
+    svg {
+        height: 15px;
+        width: 15px;
+    }
+`;
+
+const ViewSelectContainer = styled.div`
+    color: #fff;
+    line-height: 20px;
+    padding-right: 5.6px;
+
+    &&& {
+        border-left: 0px solid ${ANTD_GRAY_V2[5]};
+    }
+`;
+
+const SearchIcon = styled(SearchOutlined)<{ $isShowNavBarRedesign?: boolean }>`
+    color: ${(props) => (props.$isShowNavBarRedesign ? colors.gray[1800] : '#dcdcdc')};
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        && svg {
+            width: 16px;
+            height: 16px;
+        }    
+    `}
+`;
+
+const EXACT_AUTOCOMPLETE_OPTION_TYPE = 'exact_query';
+const RELEVANCE_QUERY_OPTION_TYPE = 'recommendation';
+
+const renderRecommendedQuery = (query: string) => {
+    return {
+        value: query,
+        label: <RecommendedOption text={query} />,
+        type: RELEVANCE_QUERY_OPTION_TYPE,
+    };
+};
+
+interface Props {
+    id?: string;
+    isLoading?: boolean;
+    initialQuery?: string;
+    placeholderText: string;
+    suggestions: Array<AutoCompleteResultForEntity>;
+    onSearch: (query: string, filters?: FacetFilterInput[]) => void;
+    onQueryChange?: (query: string) => void;
+    style?: React.CSSProperties;
+    inputStyle?: React.CSSProperties;
+    autoCompleteStyle?: React.CSSProperties;
+    entityRegistry: EntityRegistry;
+    fixAutoComplete?: boolean;
+    hideRecommendations?: boolean;
+    showQuickFilters?: boolean;
+    showCommandK?: boolean;
+    viewsEnabled?: boolean;
+    combineSiblings?: boolean;
+    setIsSearchBarFocused?: (isSearchBarFocused: boolean) => void;
+    onFocus?: () => void;
+    onBlur?: () => void;
+    showViewAllResults?: boolean;
+    textColor?: string;
+    placeholderColor?: string;
+    isShowNavBarRedesign?: boolean;
+}
+
+const defaultProps = {
+    style: undefined,
+};
+
+/**
+ * Represents the search bar appearing in the default header view.
+ */
+export const SearchBar = ({
+    id,
+    isLoading,
+    initialQuery,
+    placeholderText,
+    suggestions,
+    onSearch,
+    onQueryChange,
+    entityRegistry,
+    style,
+    inputStyle,
+    autoCompleteStyle,
+    fixAutoComplete,
+    hideRecommendations,
+    showQuickFilters,
+    showCommandK = false,
+    viewsEnabled = false,
+    combineSiblings = false,
+    setIsSearchBarFocused,
+    onFocus,
+    onBlur,
+    showViewAllResults = false,
+    textColor,
+    placeholderColor,
+    isShowNavBarRedesign,
+}: Props) => {
+    const history = useHistory();
+    const [searchQuery, setSearchQuery] = useState<string | undefined>(initialQuery);
+    const [selected, setSelected] = useState<string>();
+    const [isDropdownVisible, setIsDropdownVisible] = useState(false);
+    const appConfig = useAppConfig();
+    const [isFocused, setIsFocused] = useState(false);
+    const { quickFilters, selectedQuickFilter, setSelectedQuickFilter } = useQuickFiltersContext();
+    const isShowSeparateSiblingsEnabled = useIsShowSeparateSiblingsEnabled();
+    const userUrn = useUserContext().user?.urn;
+    const finalCombineSiblings = isShowSeparateSiblingsEnabled ? false : combineSiblings;
+    const searchViewAll = useSearchViewAll();
+    const effectiveQuery = searchQuery !== undefined ? searchQuery : initialQuery || '';
+    const showAutoCompleteResults = appConfig?.config?.featureFlags?.showAutoCompleteResults;
+
+    useEffect(() => setSelected(initialQuery), [initialQuery]);
+
+    const { data: recommendationData } = useListRecommendationsQuery({
+        variables: {
+            input: {
+                userUrn: userUrn as string,
+                requestContext: {
+                    scenario: ScenarioType.SearchBar,
+                },
+                limit: 1,
+            },
+        },
+        skip: hideRecommendations || !userUrn,
+    });
+
+    const quickFilterAutoCompleteOption = useMemo(() => {
+        if (!showQuickFilters) {
+            return null;
+        }
+        if (!showAutoCompleteResults) {
+            // If we've disabled showing any autocomplete results, we also hide the "Filter By" flow.
+            return null;
+        }
+        if (!quickFilters?.length) {
+            return null;
+        }
+        return {
+            label: <EntityTypeLabel>Filter by</EntityTypeLabel>,
+            options: [
+                {
+                    value: 'quick-filter-unique-key',
+                    type: '',
+                    label: <QuickFilters searchQuery={searchQuery} setIsDropdownVisible={setIsDropdownVisible} />,
+                    style: { padding: '8px', cursor: 'auto' },
+                    disabled: true,
+                },
+            ],
+        };
+    }, [searchQuery, quickFilters, showAutoCompleteResults, showQuickFilters]);
+
+    const emptyQueryOptions = useMemo(() => {
+        const moduleOptions =
+            recommendationData?.listRecommendations?.modules.map((module) => ({
+                label: <EntityTypeLabel>{module.title}</EntityTypeLabel>,
+                options: [...module.content.map((content) => renderRecommendedQuery(content.value))],
+            })) || [];
+
+        return moduleOptions;
+    }, [recommendationData?.listRecommendations?.modules]);
+
+    const autoCompleteQueryOptions = useMemo(() => {
+        if (effectiveQuery === '' || !showViewAllResults) return [];
+
+        return [
+            {
+                value: `${EXACT_SEARCH_PREFIX}${effectiveQuery}`,
+                label: <ViewAllSearchItem searchTarget={effectiveQuery} />,
+                type: EXACT_AUTOCOMPLETE_OPTION_TYPE,
+            },
+        ];
+    }, [effectiveQuery, showViewAllResults]);
+
+    const autoCompleteEntityOptions = useMemo(() => {
+        return suggestions.map((suggestion: AutoCompleteResultForEntity) => {
+            const combinedSuggestion = combineSiblingsInAutoComplete(suggestion, {
+                combineSiblings: finalCombineSiblings,
+            });
+            return {
+                label: <SectionHeader entityType={combinedSuggestion.type} />,
+                options: combinedSuggestion.combinedEntities.map((combinedEntity) => ({
+                    value: combinedEntity.entity.urn,
+                    label: (
+                        <AutoCompleteItem
+                            query={effectiveQuery}
+                            entity={combinedEntity.entity}
+                            siblings={finalCombineSiblings ? combinedEntity.matchedEntities : undefined}
+                        />
+                    ),
+                    type: combinedEntity.entity.type,
+                    style: { padding: '12px 12px 12px 16px' },
+                })),
+            };
+        });
+    }, [finalCombineSiblings, effectiveQuery, suggestions]);
+
+    const previousSelectedQuickFilterValue = usePrevious(selectedQuickFilter?.value);
+
+    useEffect(() => {
+        // if we change the selected quick filter, re-issue auto-complete
+        if (searchQuery && selectedQuickFilter?.value !== previousSelectedQuickFilterValue) {
+            onQueryChange?.(searchQuery);
+        }
+    });
+
+    // clear quick filters when this search bar is unmounted (ie. going from search results to home page)
+    useEffect(() => {
+        return () => {
+            setSelectedQuickFilter(null);
+        };
+    }, [setSelectedQuickFilter]);
+
+    const onClickExploreAll = useCallback(() => {
+        searchViewAll();
+        setIsDropdownVisible(false);
+    }, [searchViewAll]);
+
+    const options = useMemo(() => {
+        const autoCompleteOptions =
+            showAutoCompleteResults && autoCompleteEntityOptions.length ? autoCompleteEntityOptions : emptyQueryOptions;
+        const quickFilterOptions = quickFilterAutoCompleteOption ? [quickFilterAutoCompleteOption] : [];
+        const baseOptions: any[] = [...autoCompleteQueryOptions, ...quickFilterOptions, ...autoCompleteOptions];
+
+        if (showViewAllResults) {
+            baseOptions.push({
+                value: 'explore-all-unique-key',
+                type: '',
+                label: (
+                    <Button type="link" onClick={onClickExploreAll}>
+                        Explore all →
+                    </Button>
+                ),
+                style: { marginLeft: 'auto', cursor: 'auto' },
+                disabled: true,
+            });
+        }
+        return baseOptions;
+    }, [
+        emptyQueryOptions,
+        autoCompleteEntityOptions,
+        autoCompleteQueryOptions,
+        quickFilterAutoCompleteOption,
+        showViewAllResults,
+        showAutoCompleteResults,
+        onClickExploreAll,
+    ]);
+
+    const searchBarWrapperRef = useRef<HTMLDivElement>(null);
+
+    function handleSearchBarClick(isSearchBarFocused: boolean) {
+        if (
+            setIsSearchBarFocused &&
+            (!isSearchBarFocused ||
+                (searchBarWrapperRef && searchBarWrapperRef.current && searchBarWrapperRef.current.clientWidth < 650))
+        ) {
+            setIsSearchBarFocused(isSearchBarFocused);
+        }
+    }
+
+    function handleFocus() {
+        if (onFocus) onFocus();
+        handleSearchBarClick(true);
+        setIsFocused(true);
+    }
+
+    function handleBlur() {
+        if (onBlur) onBlur();
+        handleSearchBarClick(false);
+        setIsFocused(false);
+    }
+
+    function handleSearch(query: string, appliedQuickFilters?: FacetFilterInput[]) {
+        onSearch(query, appliedQuickFilters);
+        if (selectedQuickFilter) {
+            setSelectedQuickFilter(null);
+        }
+    }
+
+    const searchInputRef = useRef(null);
+
+    useEffect(() => {
+        if (showCommandK) {
+            const handleKeyDown = (event) => {
+                const isMac = (navigator as any).userAgentData
+                    ? (navigator as any).userAgentData.platform.toLowerCase().includes('mac')
+                    : navigator.userAgent.toLowerCase().includes('mac');
+
+                // Support command-k to select the search bar on all platforms
+                // Support ctrl-k to select the search bar on non-Mac platforms
+                // 75 is the keyCode for 'k'
+                if ((event.metaKey || (!isMac && event.ctrlKey)) && event.keyCode === 75) {
+                    (searchInputRef?.current as any)?.focus();
+                }
+            };
+            document.addEventListener('keydown', handleKeyDown);
+            return () => {
+                document.removeEventListener('keydown', handleKeyDown);
+            };
+        }
+        return () => null;
+    }, [showCommandK]);
+
+    const viewsEnabledStyle = {
+        ...style,
+        backgroundColor: inputStyle?.backgroundColor,
+    };
+
+    return (
+        <AutoCompleteContainer
+            viewsEnabled={viewsEnabled}
+            $isShowNavBarRedesign={isShowNavBarRedesign}
+            id={id}
+            style={viewsEnabled ? viewsEnabledStyle : style}
+            ref={searchBarWrapperRef}
+        >
+            {isLoading ? (
+                <SkeletonContainer>
+                    <SkeletonButton shape="square" active block />
+                </SkeletonContainer>
+            ) : (
+                <StyledAutoComplete
+                    data-testid="search-bar"
+                    $isShowNavBarRedesign={isShowNavBarRedesign}
+                    defaultActiveFirstOption={false}
+                    style={autoCompleteStyle}
+                    options={options}
+                    filterOption={false}
+                    onSelect={(value, option) => {
+                        // If the autocomplete option type is NOT an entity, then render as a normal search query.
+                        if (
+                            option.type === EXACT_AUTOCOMPLETE_OPTION_TYPE ||
+                            option.type === RELEVANCE_QUERY_OPTION_TYPE
+                        ) {
+                            handleSearch(
+                                `${filterSearchQuery(value as string)}`,
+                                getFiltersWithQuickFilter(selectedQuickFilter),
+                            );
+                            analytics.event({
+                                type: EventType.SelectAutoCompleteOption,
+                                optionType: option.type,
+                            } as Event);
+                        } else {
+                            // Navigate directly to the entity profile.
+                            history.push(getEntityPath(option.type, value as string, entityRegistry, false, false));
+                            setSelected('');
+                            analytics.event({
+                                type: EventType.SelectAutoCompleteOption,
+                                optionType: option.type,
+                                entityType: option.type,
+                                entityUrn: value,
+                            } as Event);
+                        }
+                    }}
+                    onSearch={showAutoCompleteResults ? onQueryChange : undefined}
+                    defaultValue={initialQuery || undefined}
+                    value={selected}
+                    onChange={(v) => setSelected(filterSearchQuery(v as string))}
+                    dropdownStyle={{
+                        maxHeight: 1000,
+                        overflowY: 'visible',
+                        position: (fixAutoComplete && 'fixed') || 'relative',
+                        ...(isShowNavBarRedesign ? { minWidth: '435px' } : {}),
+                    }}
+                    onDropdownVisibleChange={(isOpen) => {
+                        if (!isOpen) {
+                            setIsDropdownVisible(isOpen);
+                        } else {
+                            // set timeout so that we allow search bar to grow in width and therefore allow autocomplete to grow
+                            setTimeout(() => {
+                                setIsDropdownVisible(isOpen);
+                            }, 0);
+                        }
+                    }}
+                    open={isDropdownVisible}
+                    listHeight={480}
+                >
+                    <StyledSearchBar
+                        bordered={false}
+                        placeholder={placeholderText}
+                        onPressEnter={() => {
+                            handleSearch(
+                                filterSearchQuery(searchQuery || ''),
+                                getFiltersWithQuickFilter(selectedQuickFilter),
+                            );
+                        }}
+                        style={{ ...inputStyle, color: '#fff' }}
+                        value={searchQuery}
+                        onChange={(e) => setSearchQuery(e.target.value)}
+                        data-testid="search-input"
+                        onFocus={handleFocus}
+                        onBlur={handleBlur}
+                        viewsEnabled={viewsEnabled}
+                        $isShowNavBarRedesign={isShowNavBarRedesign}
+                        allowClear={(isFocused && { clearIcon: <ClearIcon /> }) || false}
+                        prefix={
+                            <>
+                                <SearchIcon
+                                    $isShowNavBarRedesign={isShowNavBarRedesign}
+                                    onClick={() => {
+                                        handleSearch(
+                                            filterSearchQuery(searchQuery || ''),
+                                            getFiltersWithQuickFilter(selectedQuickFilter),
+                                        );
+                                    }}
+                                />
+                            </>
+                        }
+                        ref={searchInputRef}
+                        suffix={<>{(showCommandK && !isFocused && <CommandK />) || null}</>}
+                        $textColor={textColor}
+                        $placeholderColor={placeholderColor}
+                    />
+                </StyledAutoComplete>
+            )}
+            {viewsEnabled && (
+                <ViewSelectContainer id={V2_SEARCH_BAR_VIEWS}>
+                    <ViewSelect />
+                </ViewSelectContainer>
+            )}
+        </AutoCompleteContainer>
+    );
+};
+
+SearchBar.defaultProps = defaultProps;
diff --git a/datahub-web-react/src/app/searchV2/SearchEntitySidebarContainer.tsx b/datahub-web-react/src/app/searchV2/SearchEntitySidebarContainer.tsx
new file mode 100644
index 00000000000000..009dc33f21f579
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/SearchEntitySidebarContainer.tsx
@@ -0,0 +1,43 @@
+import React, { useState } from 'react';
+import styled from 'styled-components/macro';
+import { EntityAndType } from '../entity/shared/types';
+import CompactContext from '../shared/CompactContext';
+import EntitySidebarContext from '../sharedV2/EntitySidebarContext';
+import useSidebarWidth from '../sharedV2/sidebar/useSidebarWidth';
+import { useEntityRegistry } from '../useEntityRegistry';
+
+const SidebarContainer = styled.div<{ height: string }>`
+    max-height: ${(props) => props.height};
+    display: flex;
+    flex-direction: column;
+    position: sticky;
+    top: 0;
+`;
+
+interface Props {
+    height: string;
+    highlightedIndex: number | null;
+    selectedEntity?: EntityAndType | null;
+}
+
+export const SearchEntitySidebarContainer = ({ height, highlightedIndex, selectedEntity }: Props) => {
+    const entityRegistry = useEntityRegistry();
+    const [isClosed, setIsClosed] = useState(false);
+    const width = useSidebarWidth();
+
+    if (highlightedIndex === null) {
+        return null;
+    }
+
+    return (
+        <EntitySidebarContext.Provider value={{ width, isClosed, setSidebarClosed: setIsClosed }}>
+            <SidebarContainer key={selectedEntity?.urn || ''} height={height}>
+                {selectedEntity && (
+                    <CompactContext.Provider value>
+                        {entityRegistry.renderProfile(selectedEntity.type, selectedEntity.urn)}
+                    </CompactContext.Provider>
+                )}
+            </SidebarContainer>
+        </EntitySidebarContext.Provider>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/SearchFilterLabel.tsx b/datahub-web-react/src/app/searchV2/SearchFilterLabel.tsx
new file mode 100644
index 00000000000000..6a74abf8318e09
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/SearchFilterLabel.tsx
@@ -0,0 +1,226 @@
+import * as React from 'react';
+import { Tag } from 'antd';
+import { Tooltip } from '@components';
+import styled from 'styled-components';
+import { BookmarkSimple } from '@phosphor-icons/react';
+import {
+    Domain,
+    Container,
+    DataPlatform,
+    EntityType,
+    GlossaryTerm,
+    Tag as TagType,
+    CorpUser,
+    CorpGroup,
+    DataPlatformInstance,
+    Entity,
+} from '../../types.generated';
+import { StyledTag } from '../entityV2/shared/components/styled/StyledTag';
+import { capitalizeFirstLetterOnly } from '../shared/textUtil';
+import { DomainLink } from '../sharedV2/tags/DomainLink';
+import { useEntityRegistry } from '../useEntityRegistry';
+import { BROWSE_PATH_V2_FILTER_NAME, ENTITY_FILTER_NAME, MAX_COUNT_VAL } from './utils/constants';
+import CustomAvatar from '../shared/avatar/CustomAvatar';
+import { IconStyleType } from '../entity/Entity';
+import { formatNumber } from '../shared/formatNumber';
+import useGetBrowseV2LabelOverride from './filters/useGetBrowseV2LabelOverride';
+
+type Props = {
+    field: string;
+    value: string;
+    count?: number;
+    entity?: Entity | null; // TODO: If the entity is not provided, we should hydrate it.
+    hideCount?: boolean;
+};
+
+const PreviewImage = styled.img`
+    max-height: 18px;
+    width: auto;
+    object-fit: contain;
+    background-color: transparent;
+    margin-right: 4px;
+`;
+
+// SearchFilterLabel renders custom labels for entity, tag, term & data platform filters. All other filters use the default behavior.
+export const SearchFilterLabel = ({ field, value, entity, count, hideCount }: Props) => {
+    const entityRegistry = useEntityRegistry();
+    const filterLabelOverride = useGetBrowseV2LabelOverride(field, value, entityRegistry);
+    const countText = hideCount ? '' : ` (${count === MAX_COUNT_VAL ? '10k+' : formatNumber(count)})`;
+
+    if (field === ENTITY_FILTER_NAME) {
+        const entityType = value.toUpperCase() as EntityType;
+        return (
+            <span>
+                {entityType ? entityRegistry.getCollectionName(entityType) : value}
+                {countText}
+            </span>
+        );
+    }
+
+    if (entity?.type === EntityType.Tag) {
+        const tag = entity as TagType;
+        const displayName = entityRegistry.getDisplayName(EntityType.Tag, tag);
+        const truncatedDisplayName = displayName.length > 25 ? `${displayName.slice(0, 25)}...` : displayName;
+        return (
+            <Tooltip title={displayName}>
+                <StyledTag $colorHash={tag?.urn} $color={tag?.properties?.colorHex} fontSize={10}>
+                    {truncatedDisplayName}
+                </StyledTag>
+                {countText}
+            </Tooltip>
+        );
+    }
+
+    if (entity?.type === EntityType.CorpUser) {
+        const user = entity as CorpUser;
+        const displayName = entityRegistry.getDisplayName(EntityType.CorpUser, user);
+        const truncatedDisplayName = displayName.length > 25 ? `${displayName.slice(0, 25)}...` : displayName;
+        return (
+            <Tooltip title={displayName}>
+                <CustomAvatar
+                    size={18}
+                    name={truncatedDisplayName}
+                    photoUrl={user.editableProperties?.pictureLink || undefined}
+                    useDefaultAvatar={false}
+                    style={{
+                        marginRight: 8,
+                    }}
+                />
+                {displayName}
+                {countText}
+            </Tooltip>
+        );
+    }
+
+    if (entity?.type === EntityType.CorpGroup) {
+        const group = entity as CorpGroup;
+        const displayName = entityRegistry.getDisplayName(EntityType.CorpGroup, group);
+        const truncatedDisplayName = displayName.length > 25 ? `${displayName.slice(0, 25)}...` : displayName;
+        return (
+            <Tooltip title={displayName}>
+                <span style={{ marginRight: 8 }}>
+                    {entityRegistry.getIcon(EntityType.CorpGroup, 16, IconStyleType.ACCENT)}
+                </span>
+                {truncatedDisplayName}
+                {countText}
+            </Tooltip>
+        );
+    }
+
+    if (entity?.type === EntityType.GlossaryTerm) {
+        const term = entity as GlossaryTerm;
+        const displayName = entityRegistry.getDisplayName(EntityType.GlossaryTerm, term);
+        const truncatedDisplayName = displayName.length > 25 ? `${displayName.slice(0, 25)}...` : displayName;
+        return (
+            <Tooltip title={displayName}>
+                <Tag closable={false}>
+                    <BookmarkSimple style={{ marginRight: '4px' }} />
+                    {truncatedDisplayName}
+                </Tag>
+                {countText}
+            </Tooltip>
+        );
+    }
+
+    if (entity?.type === EntityType.DataPlatform) {
+        const platform = entity as DataPlatform;
+        const displayName =
+            platform.properties?.displayName ||
+            platform.info?.displayName ||
+            capitalizeFirstLetterOnly(platform.name) ||
+            '';
+        const truncatedDisplayName = displayName.length > 25 ? `${displayName.slice(0, 25)}...` : displayName;
+        return (
+            <Tooltip title={displayName}>
+                {!!platform.properties?.logoUrl && (
+                    <PreviewImage src={platform.properties?.logoUrl} alt={displayName} />
+                )}
+                <span>
+                    {truncatedDisplayName}
+                    {countText}
+                </span>
+            </Tooltip>
+        );
+    }
+
+    if (entity?.type === EntityType.DataPlatformInstance) {
+        const platform = entity as DataPlatformInstance;
+        const displayName = platform.instanceId;
+        const truncatedDisplayName = displayName.length > 25 ? `${displayName.slice(0, 25)}...` : displayName;
+        return (
+            <Tooltip title={displayName}>
+                {truncatedDisplayName}
+                {countText}
+            </Tooltip>
+        );
+    }
+
+    if (entity?.type === EntityType.Container) {
+        const container = entity as Container;
+        const displayName = entityRegistry.getDisplayName(EntityType.Container, container);
+        const truncatedDisplayName = displayName.length > 25 ? `${displayName.slice(0, 25)}...` : displayName;
+        return (
+            <Tooltip title={displayName}>
+                {!!container.platform?.properties?.logoUrl && (
+                    <PreviewImage src={container.platform?.properties?.logoUrl} alt={container.properties?.name} />
+                )}
+                <span>
+                    {truncatedDisplayName}
+                    {countText}
+                </span>
+            </Tooltip>
+        );
+    }
+
+    if (entity?.type === EntityType.Domain) {
+        const domain = entity as Domain;
+        const displayName = entityRegistry.getDisplayName(EntityType.Domain, domain);
+        const truncatedDomainName = displayName.length > 25 ? `${displayName.slice(0, 25)}...` : displayName;
+        return (
+            <Tooltip title={displayName}>
+                <DomainLink domain={domain} name={truncatedDomainName} tagStyle={{ fontSize: 10 }} fontSize={10} />
+                {countText}
+            </Tooltip>
+        );
+    }
+
+    if (entity?.type === EntityType.DataProduct) {
+        const displayName = entityRegistry.getDisplayName(EntityType.DataProduct, entity);
+        const truncatedName = displayName.length > 25 ? `${displayName.slice(0, 25)}...` : displayName;
+        return (
+            <Tooltip title={displayName}>
+                {truncatedName}
+                {countText}
+            </Tooltip>
+        );
+    }
+
+    // Warning: Special casing for Sub-Types
+    if (field === 'typeNames') {
+        const displayName = capitalizeFirstLetterOnly(value) || '';
+        const truncatedDomainName = displayName.length > 25 ? `${displayName.slice(0, 25)}...` : displayName;
+        return (
+            <Tooltip title={displayName}>
+                <span>
+                    {truncatedDomainName}
+                    {countText}
+                </span>
+            </Tooltip>
+        );
+    }
+
+    if (field === 'degree') {
+        return <>{value}</>;
+    }
+
+    if (field === BROWSE_PATH_V2_FILTER_NAME) {
+        return <>{filterLabelOverride || value}</>;
+    }
+
+    return (
+        <>
+            {value}
+            {countText}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/SearchHeader.tsx b/datahub-web-react/src/app/searchV2/SearchHeader.tsx
new file mode 100644
index 00000000000000..6b23037a71aef9
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/SearchHeader.tsx
@@ -0,0 +1,176 @@
+import React, { useContext, useState } from 'react';
+import { Button, Layout } from 'antd';
+import styled from 'styled-components';
+import { ArrowRight } from '@phosphor-icons/react';
+import { V2_SEARCH_BAR_ID } from '../onboarding/configV2/HomePageOnboardingConfig';
+import { SearchBar } from './SearchBar';
+import { AutoCompleteResultForEntity } from '../../types.generated';
+import { EntityRegistry } from '../../entityRegistryContext';
+import { useAppConfig } from '../useAppConfig';
+import OnboardingContext from '../onboarding/OnboardingContext';
+import { useNavBarContext } from '../homeV2/layout/navBarRedesign/NavBarContext';
+import NavBarToggler from '../homeV2/layout/navBarRedesign/NavBarToggler';
+import { REDESIGN_COLORS } from '../entityV2/shared/constants';
+import useSearchViewAll from './useSearchViewAll';
+import { useShowNavBarRedesign } from '../useShowNavBarRedesign';
+
+const getStyles = ($isShowNavBarRedesign?: boolean) => {
+    return {
+        input: {
+            backgroundColor: $isShowNavBarRedesign ? 'white' : '#343444',
+        },
+        searchBox: {
+            maxWidth: $isShowNavBarRedesign ? '100%' : 620,
+            minWidth: $isShowNavBarRedesign ? 300 : 400,
+        },
+        searchBoxContainer: {
+            padding: 0,
+            display: 'flex',
+            justifyContent: 'center',
+            width: $isShowNavBarRedesign ? '439px' : '620px',
+            minWidth: '400px',
+        },
+    };
+};
+
+const Wrapper = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    position: fixed;
+    width: 100%;
+    ${(props) =>
+        !props.$isShowNavBarRedesign &&
+        `
+        line-height: 20px;
+        padding: 0px 12px;
+    `}
+`;
+
+const Header = styled(Layout)<{ $isNavBarCollapsed?: boolean; $isShowNavBarRedesign?: boolean }>`
+    background-color: transparent;
+    height: ${(props) => (props.$isShowNavBarRedesign ? '56px' : '72px')};
+    display: flex;
+    ${(props) => {
+        if (!props.$isShowNavBarRedesign) return '';
+        return `padding-left: ${props.$isNavBarCollapsed ? '68px;' : '270px'};`;
+    }}
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        margin-top: 8px;
+        gap: 16px;
+        flex-direction: row;
+        transition: padding 250ms ease-in-out;
+    `}
+    ${(props) => props.$isShowNavBarRedesign && !props.$isNavBarCollapsed && 'justify-content: space-between;'}
+    align-items: center;
+`;
+
+const HeaderBackground = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    ${(props) => !props.$isShowNavBarRedesign && 'background-color: #171723;'}
+    position: fixed;
+    height: 100px;
+    width: 100%;
+    z-index: -1;
+`;
+
+const SearchBarContainer = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    display: flex;
+    flex: 1;
+    align-items: center;
+    ${(props) =>
+        !props.$isShowNavBarRedesign &&
+        `
+        justify-content: center;
+        margin-left: 80px;
+        margin-top: 6px;
+    `}
+`;
+
+const StyledButton = styled(Button)`
+    color: ${REDESIGN_COLORS.BODY_TEXT_GREY};
+    text-align: center;
+
+    font-family: Mulish;
+    font-size: 12px;
+    font-style: normal;
+    font-weight: 700;
+    line-height: normal;
+
+    display: flex;
+    gap: 4px;
+    align-items: center;
+
+    &:hover,
+    :active,
+    :focus {
+        color: ${REDESIGN_COLORS.GREY_300};
+    }
+`;
+
+type Props = {
+    initialQuery: string;
+    placeholderText: string;
+    suggestions: Array<AutoCompleteResultForEntity>;
+    onSearch: (query: string) => void;
+    onQueryChange: (query: string) => void;
+    entityRegistry: EntityRegistry;
+};
+
+/**
+ * A header containing a Logo, Search Bar view, & an account management dropdown.
+ */
+export const SearchHeader = ({
+    initialQuery,
+    placeholderText,
+    suggestions,
+    onSearch,
+    onQueryChange,
+    entityRegistry,
+}: Props) => {
+    const [, setIsSearchBarFocused] = useState(false);
+    const appConfig = useAppConfig();
+    const viewsEnabled = appConfig.config?.viewsConfig?.enabled || false;
+    const { isUserInitializing } = useContext(OnboardingContext);
+    const { isCollapsed } = useNavBarContext();
+    const searchViewAll = useSearchViewAll();
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    const styles = getStyles(isShowNavBarRedesign);
+
+    return (
+        <>
+            <HeaderBackground $isShowNavBarRedesign={isShowNavBarRedesign} />
+            <Wrapper $isShowNavBarRedesign={isShowNavBarRedesign}>
+                <Header $isShowNavBarRedesign={isShowNavBarRedesign} $isNavBarCollapsed={isCollapsed}>
+                    {isShowNavBarRedesign && isCollapsed && <NavBarToggler />}
+                    <SearchBarContainer $isShowNavBarRedesign={isShowNavBarRedesign}>
+                        <SearchBar
+                            isLoading={isUserInitializing || !appConfig.loaded}
+                            id={V2_SEARCH_BAR_ID}
+                            style={styles.searchBoxContainer}
+                            autoCompleteStyle={styles.searchBox}
+                            inputStyle={styles.input}
+                            initialQuery={initialQuery}
+                            placeholderText={placeholderText}
+                            suggestions={suggestions}
+                            onSearch={onSearch}
+                            onQueryChange={onQueryChange}
+                            entityRegistry={entityRegistry}
+                            setIsSearchBarFocused={setIsSearchBarFocused}
+                            viewsEnabled={viewsEnabled}
+                            isShowNavBarRedesign={isShowNavBarRedesign}
+                            combineSiblings
+                            fixAutoComplete
+                            showQuickFilters
+                            showViewAllResults
+                            showCommandK
+                        />
+                        {isShowNavBarRedesign && (
+                            <StyledButton type="link" onClick={searchViewAll}>
+                                View all <ArrowRight />
+                            </StyledButton>
+                        )}
+                    </SearchBarContainer>
+                </Header>
+            </Wrapper>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/SearchPage.tsx b/datahub-web-react/src/app/searchV2/SearchPage.tsx
new file mode 100644
index 00000000000000..e5b68374d17bfe
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/SearchPage.tsx
@@ -0,0 +1,267 @@
+import React, { useEffect, useState } from 'react';
+import { useHistory } from 'react-router';
+import styled from 'styled-components';
+import { FacetFilterInput } from '../../types.generated';
+import { navigateToSearchUrl } from './utils/navigateToSearchUrl';
+import { SearchResults } from './SearchResults';
+import analytics, { EventType } from '../analytics';
+import { useGetSearchResultsForMultipleQuery } from '../../graphql/search.generated';
+import { SearchCfg } from '../../conf';
+import { ENTITY_SUB_TYPE_FILTER_FIELDS, UnionType } from './utils/constants';
+import { EntityAndType } from '../entity/shared/types';
+import { scrollToTop } from '../shared/searchUtils';
+import { OnboardingTour } from '../onboarding/OnboardingTour';
+import {
+    SEARCH_RESULTS_BROWSE_SIDEBAR_ID,
+    SEARCH_RESULTS_FILTERS_ID,
+    SEARCH_RESULTS_FILTERS_V2_INTRO,
+} from '../onboarding/config/SearchOnboardingConfig';
+import { useDownloadScrollAcrossEntitiesSearchResults } from './utils/useDownloadScrollAcrossEntitiesSearchResults';
+import { DownloadSearchResults, DownloadSearchResultsInput } from './utils/types';
+import SearchFiltersSection from './filters/SearchFiltersSection';
+import useGetSearchQueryInputs from './useGetSearchQueryInputs';
+import useSearchFilterAnalytics from './filters/useSearchFilterAnalytics';
+import { useIsBrowseV2, useIsSearchV2, useSearchVersion } from './useSearchAndBrowseVersion';
+import useFilterMode from './filters/useFilterMode';
+import { useSelectedSortOption } from '../search/context/SearchContext';
+import { useUpdateEducationStepsAllowList } from '../onboarding/useUpdateEducationStepsAllowList';
+import { ENTITY_PROFILE_V2_SIDEBAR_ID } from '../onboarding/config/EntityProfileOnboardingConfig';
+import {
+    ENTITY_SIDEBAR_V2_ABOUT_TAB_ID,
+    ENTITY_SIDEBAR_V2_COLUMNS_TAB_ID,
+    ENTITY_SIDEBAR_V2_LINEAGE_TAB_ID,
+    ENTITY_SIDEBAR_V2_PROPERTIES_ID,
+} from '../onboarding/configV2/EntityProfileOnboardingConfig';
+
+const Container = styled.span`
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow: auto;
+`;
+
+/**
+ * A search results page.
+ */
+export const SearchPage = () => {
+    const { trackClearAllFiltersEvent } = useSearchFilterAnalytics();
+    const showSearchFiltersV2 = useIsSearchV2();
+    const showBrowseV2 = useIsBrowseV2();
+    const searchVersion = useSearchVersion();
+    const history = useHistory();
+    const { query, unionType, filters, orFilters, viewUrn, page, sortInput } = useGetSearchQueryInputs();
+    const { filterModeRef } = useFilterMode(filters, unionType);
+    const selectedSortOption = useSelectedSortOption();
+
+    const [numResultsPerPage, setNumResultsPerPage] = useState(SearchCfg.RESULTS_PER_PAGE);
+    const [isSelectMode, setIsSelectMode] = useState(false);
+    const [selectedEntities, setSelectedEntities] = useState<EntityAndType[]>([]);
+
+    const {
+        data,
+        loading,
+        error,
+        refetch: realRefetch,
+    } = useGetSearchResultsForMultipleQuery({
+        variables: {
+            input: {
+                types: [],
+                query,
+                start: (page - 1) * numResultsPerPage,
+                count: numResultsPerPage,
+                filters: [],
+                orFilters,
+                viewUrn,
+                sortInput,
+                searchFlags: { getSuggestions: true, includeStructuredPropertyFacets: true },
+            },
+        },
+        fetchPolicy: 'cache-and-network',
+    });
+
+    const total = data?.searchAcrossEntities?.total || 0;
+
+    const searchResultEntities =
+        data?.searchAcrossEntities?.searchResults?.map((result) => ({
+            urn: result.entity.urn,
+            type: result.entity.type,
+        })) || [];
+    const searchResultUrns = searchResultEntities.map((entity) => entity.urn);
+
+    // This hook is simply used to generate a refetch callback that the DownloadAsCsv component can use to
+    // download the correct results given the current context.
+    // TODO: Use the loading indicator to log a message to the user should download to CSV fail.
+    // TODO: Revisit this pattern -- what can we push down?
+    const { refetch: refetchForDownload } = useDownloadScrollAcrossEntitiesSearchResults({
+        variables: {
+            input: {
+                types: [],
+                query,
+                count: SearchCfg.RESULTS_PER_PAGE,
+                orFilters,
+                scrollId: null,
+            },
+        },
+        skip: true,
+    });
+
+    const downloadSearchResults = (
+        input: DownloadSearchResultsInput,
+    ): Promise<DownloadSearchResults | null | undefined> => {
+        return refetchForDownload(input);
+    };
+
+    const onChangeFilters = (newFilters: Array<FacetFilterInput>) => {
+        navigateToSearchUrl({
+            query,
+            selectedSortOption,
+            page: 1,
+            filters: newFilters,
+            history,
+            unionType,
+        });
+    };
+
+    const onClearFilters = () => {
+        trackClearAllFiltersEvent(total);
+        onChangeFilters([]);
+    };
+
+    const onChangeUnionType = (newUnionType: UnionType) => {
+        navigateToSearchUrl({
+            query,
+            selectedSortOption,
+            page: 1,
+            filters,
+            history,
+            unionType: newUnionType,
+        });
+    };
+
+    const onChangePage = (newPage: number) => {
+        scrollToTop();
+        navigateToSearchUrl({
+            query,
+            selectedSortOption,
+            page: newPage,
+            filters,
+            history,
+            unionType,
+        });
+    };
+
+    /**
+     * Invoked when the "select all" checkbox is clicked.
+     *
+     * This method either adds the entire current page of search results to
+     * the list of selected entities, or removes the current page from the set of selected entities.
+     */
+    const onChangeSelectAll = (selected: boolean) => {
+        if (selected) {
+            // Add current page of urns to the master selected entity list
+            const entitiesToAdd = searchResultEntities.filter(
+                (entity) =>
+                    selectedEntities.findIndex(
+                        (element) => element.urn === entity.urn && element.type === entity.type,
+                    ) < 0,
+            );
+            setSelectedEntities(Array.from(new Set(selectedEntities.concat(entitiesToAdd))));
+        } else {
+            // Filter out the current page of entity urns from the list
+            setSelectedEntities(selectedEntities.filter((entity) => searchResultUrns.indexOf(entity.urn) === -1));
+        }
+    };
+
+    useEffect(() => {
+        if (loading) return;
+
+        const entityTypes = Array.from(
+            new Set(
+                filters
+                    .filter((filter) => ENTITY_SUB_TYPE_FILTER_FIELDS.includes(filter.field))
+                    .flatMap((filter) => filter.values ?? []),
+            ),
+        );
+
+        const filterFields = Array.from(new Set(filters.map((filter) => filter.field)));
+
+        analytics.event({
+            type: EventType.SearchResultsViewEvent,
+            query,
+            total,
+            entityTypes,
+            filterFields,
+            filterCount: filters.length, // Only track changes to the filters, ignore toggling the mode by itself
+            filterMode: filterModeRef.current,
+            searchVersion,
+        });
+    }, [filters, filterModeRef, loading, query, searchVersion, total]);
+
+    useEffect(() => {
+        // When the query changes, then clear the select mode state
+        setIsSelectMode(false);
+    }, [query]);
+
+    useEffect(() => {
+        if (!isSelectMode) {
+            setSelectedEntities([]);
+        }
+    }, [isSelectMode]);
+
+    // Render new search filters v2 onboarding step if the feature flag is on
+    useUpdateEducationStepsAllowList(showSearchFiltersV2, SEARCH_RESULTS_FILTERS_V2_INTRO);
+
+    // Render new browse v2 onboarding step if the feature flag is on
+    useUpdateEducationStepsAllowList(showBrowseV2, SEARCH_RESULTS_BROWSE_SIDEBAR_ID);
+
+    return (
+        <Container>
+            {!loading && (
+                <OnboardingTour
+                    stepIds={[
+                        SEARCH_RESULTS_FILTERS_ID,
+                        SEARCH_RESULTS_BROWSE_SIDEBAR_ID,
+                        SEARCH_RESULTS_FILTERS_V2_INTRO,
+                        ENTITY_PROFILE_V2_SIDEBAR_ID,
+                        ENTITY_SIDEBAR_V2_ABOUT_TAB_ID,
+                        ENTITY_SIDEBAR_V2_LINEAGE_TAB_ID,
+                        ENTITY_SIDEBAR_V2_COLUMNS_TAB_ID,
+                        ENTITY_SIDEBAR_V2_PROPERTIES_ID,
+                    ]}
+                />
+            )}
+            <SearchFiltersSection
+                loading={loading}
+                availableFilters={data?.searchAcrossEntities?.facets || []}
+                activeFilters={filters}
+                unionType={unionType}
+                onChangeFilters={onChangeFilters}
+                onClearFilters={onClearFilters}
+                onChangeUnionType={onChangeUnionType}
+            />
+            <SearchResults
+                unionType={unionType}
+                downloadSearchResults={downloadSearchResults}
+                page={page}
+                query={query}
+                viewUrn={viewUrn || undefined}
+                error={error}
+                searchResponse={data?.searchAcrossEntities}
+                suggestions={data?.searchAcrossEntities?.suggestions || []}
+                availableFilters={data?.searchAcrossEntities?.facets || []}
+                selectedFilters={filters}
+                loading={loading}
+                onChangeFilters={onChangeFilters}
+                onChangePage={onChangePage}
+                numResultsPerPage={numResultsPerPage}
+                setNumResultsPerPage={setNumResultsPerPage}
+                isSelectMode={isSelectMode}
+                selectedEntities={selectedEntities}
+                setSelectedEntities={setSelectedEntities}
+                setIsSelectMode={setIsSelectMode}
+                onChangeSelectAll={onChangeSelectAll}
+                refetch={realRefetch}
+            />
+        </Container>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/SearchResultList.tsx b/datahub-web-react/src/app/searchV2/SearchResultList.tsx
new file mode 100644
index 00000000000000..bb84c4e0947c6e
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/SearchResultList.tsx
@@ -0,0 +1,291 @@
+import { Checkbox, Divider, List, ListProps } from 'antd';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import styled from 'styled-components';
+import { SearchResult, SearchSuggestion } from '../../types.generated';
+import analytics, { EventType } from '../analytics';
+import { ANTD_GRAY } from '../entity/shared/constants';
+import { EntityAndType } from '../entity/shared/types';
+import { SEARCH_COLORS } from '../entityV2/shared/constants';
+import { PreviewSection } from '../shared/MatchesContext';
+import { useEntityRegistry } from '../useEntityRegistry';
+import EmptySearchResults from './EmptySearchResults';
+import { MatchContextContainer } from './matches/MatchContextContainer';
+import { useIsSearchV2 } from './useSearchAndBrowseVersion';
+import { CombinedSearchResult } from './utils/combineSiblingsInSearchResults';
+import { PreviewType } from '../entity/Entity';
+import { useInitializeSearchResultCards } from '../entityV2/shared/components/styled/search/useInitializeSearchResultCards';
+import { useSearchContext } from '../search/context/SearchContext';
+import { useShowNavBarRedesign } from '../useShowNavBarRedesign';
+
+export const MATCHES_CONTAINER_HEIGHT = 52;
+
+const ResultList = styled(List)<{ $isShowNavBarRedesign?: boolean }>`
+    &&& {
+        margin-top: 8px;
+        width: 100%;
+        border-color: ${(props) => props.theme.styles['border-color-base']};
+        padding: ${(props) => (props.$isShowNavBarRedesign ? '0px 3px 0px 12px' : '0px 12px 0px 16px')};
+        border-radius: 0px;
+    }
+`;
+
+const StyledCheckbox = styled(Checkbox)`
+    margin-right: 12px;
+`;
+
+const ThinDivider = styled(Divider)`
+    margin-top: 16px;
+    margin-bottom: 16px;
+`;
+
+export const ResultWrapper = styled.div<{
+    showUpdatedStyles: boolean;
+    selected: boolean;
+    areMatchesExpanded: boolean;
+    isFullViewCard: boolean;
+    $isShowNavBarRedesign?: boolean;
+}>`
+    // z-index: 2;
+    ${(props) =>
+        props.showUpdatedStyles &&
+        `    
+        background-color: white;
+        border-radius: ${props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '8px'};
+        padding: 16px 20px;
+        box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.08);
+        border-bottom: 1px solid ${ANTD_GRAY[5]};
+        cursor: pointer;
+        :hover {
+            ${!props.selected && `outline: 1px solid ${SEARCH_COLORS.TITLE_PURPLE};}`};
+        }
+    `}
+    position: relative;
+    overflow: hidden;
+    ${(props) =>
+        props.selected &&
+        `
+        outline: 1px solid ${SEARCH_COLORS.TITLE_PURPLE};
+        border-left: 5px solid ${SEARCH_COLORS.TITLE_PURPLE};
+        left: -5px;
+        width: calc(100% + 5px);
+        position: relative;
+    `}
+    margin-bottom: ${(props) => {
+        let marginBottomValue;
+        if (props.areMatchesExpanded) {
+            marginBottomValue = MATCHES_CONTAINER_HEIGHT + 20;
+        } else if (props.isFullViewCard) {
+            marginBottomValue = props.$isShowNavBarRedesign ? 16 : 20;
+        } else {
+            marginBottomValue = 10;
+        }
+        return marginBottomValue;
+    }}px;
+    transition: margin-bottom 0.3s ease;
+    ${(props) =>
+        props.areMatchesExpanded &&
+        `
+        -webkit-box-shadow: 0px 0px 24px 0px rgba(0, 0, 0, 0.15);
+        -moz-box-shadow: 0px 0px 24px 0px rgba(0, 0, 0, 0.15);
+         box-shadow: 0px 0px 24px 0px rgba(0, 0, 0, 0.15);
+    `}
+`;
+
+const ListItem = styled.div<{ isSelectMode: boolean }>`
+    display: flex;
+    align-items: center;
+`;
+
+function useSearchKeyboardControls(
+    highlightedIndex: number | null,
+    setHighlightedIndex: (i: number | null) => void,
+    setHighlightedByKeyboardIndex: (v: [number | null]) => void,
+    searchResults: CombinedSearchResult[],
+) {
+    return useCallback(
+        (event: KeyboardEvent) => {
+            const prevIndex = highlightedIndex;
+            let newIndex: number | null | undefined;
+            if (event.key === 'ArrowDown') {
+                event.preventDefault();
+                newIndex = prevIndex === null ? null : Math.min(prevIndex + 1, searchResults.length - 1);
+                setHighlightedByKeyboardIndex([newIndex]);
+            } else if (event.key === 'ArrowUp') {
+                event.preventDefault();
+                newIndex = prevIndex === null ? null : Math.max(prevIndex - 1, 0);
+                setHighlightedByKeyboardIndex([newIndex]);
+            } else if (event.key === 'Escape') {
+                newIndex = null;
+            }
+            if (newIndex !== undefined) {
+                setHighlightedIndex(newIndex);
+            }
+        },
+        [highlightedIndex, setHighlightedIndex, setHighlightedByKeyboardIndex, searchResults.length],
+    );
+}
+
+type Props = {
+    loading: boolean;
+    query: string;
+    searchResults: CombinedSearchResult[];
+    totalResultCount: number;
+    isSelectMode: boolean;
+    selectedEntities: EntityAndType[];
+    setSelectedEntities: (entities: EntityAndType[]) => any;
+    suggestions: SearchSuggestion[];
+    highlightedIndex: number | null;
+    setHighlightedIndex: (val: number | null) => void;
+    pageNumber: number;
+    previewType?: PreviewType;
+    onCardClick?: (any: any) => any;
+    setAreAllEntitiesSelected?: (areAllSelected: boolean) => void;
+};
+
+export const SearchResultList = ({
+    loading,
+    query,
+    searchResults,
+    totalResultCount,
+    isSelectMode,
+    selectedEntities,
+    setSelectedEntities,
+    suggestions,
+    highlightedIndex,
+    setHighlightedIndex,
+    pageNumber,
+    previewType,
+    onCardClick,
+    setAreAllEntitiesSelected,
+}: Props) => {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    const entityRegistry = useEntityRegistry();
+    const selectedEntityUrns = selectedEntities.map((entity) => entity.urn);
+    const showSearchFiltersV2 = useIsSearchV2();
+    const refs = useMemo(
+        () => Array.from({ length: searchResults.length }).map(() => React.createRef<HTMLDivElement>()),
+        [searchResults.length],
+    );
+    // Used to scroll on arrow key up / down, but not on mouse scrolling
+    // Stores a pointer to a number, rather than number directly, so we scroll even if you hit up at the top of the page
+    const [highlightedByKeyboardIndex, setHighlightedByKeyboardIndex] = useState<[number | null]>([highlightedIndex]);
+
+    const onKeyPress = useSearchKeyboardControls(
+        highlightedIndex,
+        setHighlightedIndex,
+        setHighlightedByKeyboardIndex,
+        searchResults,
+    );
+
+    useEffect(() => {
+        document.addEventListener('keydown', onKeyPress);
+        return () => {
+            document.removeEventListener('keydown', onKeyPress);
+        };
+    }, [onKeyPress]);
+
+    useEffect(() => {
+        if (highlightedByKeyboardIndex[0] !== null) {
+            refs[highlightedByKeyboardIndex[0]]?.current?.scrollIntoView({
+                behavior: 'smooth',
+                block: 'center',
+            });
+        }
+    }, [highlightedByKeyboardIndex, refs]);
+
+    const onClickResult = (result: SearchResult, index: number) => {
+        analytics.event({
+            type: EventType.SearchResultClickEvent,
+            query,
+            entityUrn: result.entity.urn,
+            entityType: result.entity.type,
+            index,
+            total: totalResultCount,
+            pageNumber,
+        });
+        setHighlightedIndex(index);
+    };
+
+    /**
+     * Invoked when a new entity is selected. Simply updates the state of the list of selected entities.
+     */
+    const onSelectEntity = (selectedEntity: EntityAndType, selected: boolean) => {
+        if (selected) {
+            setSelectedEntities?.([...selectedEntities, selectedEntity]);
+        } else {
+            setSelectedEntities?.(selectedEntities?.filter((entity) => entity.urn !== selectedEntity.urn) || []);
+            setAreAllEntitiesSelected?.(false);
+        }
+    };
+
+    const [urnToExpandedSection, setUrnToExpandedSection] = React.useState<Record<string, PreviewSection>>({});
+    // default open the matches section if there are matches
+    useInitializeSearchResultCards(searchResults, setUrnToExpandedSection);
+    const { isFullViewCard } = useSearchContext();
+
+    return (
+        <ResultList<React.FC<ListProps<CombinedSearchResult>>>
+            id="search-result-list"
+            $isShowNavBarRedesign={isShowNavBarRedesign}
+            dataSource={searchResults}
+            split={false}
+            locale={{ emptyText: (!loading && <EmptySearchResults suggestions={suggestions} />) || <></> }}
+            renderItem={(item, index) => {
+                const expandedSection = isFullViewCard ? urnToExpandedSection[item.entity.urn] : undefined;
+                return (
+                    <div style={{ position: 'relative' }}>
+                        <MatchContextContainer
+                            item={item}
+                            selected={highlightedIndex === index}
+                            onClick={() => onClickResult(item, index)}
+                            urnToExpandedSection={urnToExpandedSection}
+                            setUrnToExpandedSection={setUrnToExpandedSection}
+                        >
+                            <ResultWrapper
+                                showUpdatedStyles={showSearchFiltersV2}
+                                className={`entityUrn-${item.entity.urn}`}
+                                selected={highlightedIndex === index}
+                                areMatchesExpanded={!!expandedSection}
+                                onClick={() => onClickResult(item, index)}
+                                ref={refs[index]}
+                                isFullViewCard={isFullViewCard}
+                                $isShowNavBarRedesign={isShowNavBarRedesign}
+                            >
+                                <ListItem
+                                    isSelectMode={isSelectMode}
+                                    // class name for counting in test purposes only
+                                    className="test-search-result"
+                                >
+                                    {isSelectMode && (
+                                        <StyledCheckbox
+                                            checked={selectedEntityUrns.indexOf(item.entity.urn) >= 0}
+                                            onChange={(e) =>
+                                                onSelectEntity(
+                                                    {
+                                                        urn: item.entity.urn,
+                                                        type: item.entity.type,
+                                                    },
+                                                    e.target.checked,
+                                                )
+                                            }
+                                            onClick={(e) => e.stopPropagation()}
+                                        />
+                                    )}
+                                    {entityRegistry.renderSearchResult(
+                                        item.entity.type,
+                                        item,
+                                        previewType,
+                                        onCardClick,
+                                    )}
+                                </ListItem>
+                                {/* an entity is always going to be inserted in the sibling group, so if the sibling group is just one do not
+                        render. */}
+                                {!showSearchFiltersV2 && <ThinDivider />}
+                            </ResultWrapper>
+                        </MatchContextContainer>
+                    </div>
+                );
+            }}
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/SearchResults.tsx b/datahub-web-react/src/app/searchV2/SearchResults.tsx
new file mode 100644
index 00000000000000..30eceba3fa0d52
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/SearchResults.tsx
@@ -0,0 +1,418 @@
+import React, { useState } from 'react';
+import { Pagination, Typography } from 'antd';
+import { Tooltip } from '@components';
+import ViewHeadlineOutlinedIcon from '@mui/icons-material/ViewHeadlineOutlined';
+import ViewDayOutlinedIcon from '@mui/icons-material/ViewDayOutlined';
+import styled from 'styled-components/macro';
+import { Entity, FacetFilterInput, MatchedField, SearchSuggestion, FacetMetadata } from '../../types.generated';
+import { SearchCfg } from '../../conf';
+import { SearchSelectBar } from '../entityV2/shared/components/styled/search/SearchSelectBar';
+import { SearchResultList } from './SearchResultList';
+import { isListSubset } from '../entity/shared/utils';
+import { EntityAndType } from '../entity/shared/types';
+import { ErrorSection } from '../shared/error/ErrorSection';
+import { UnionType } from './utils/constants';
+import { generateOrFilters } from './utils/generateOrFilters';
+import { DownloadSearchResults, DownloadSearchResultsInput } from './utils/types';
+import { SidebarProvider } from './sidebar/SidebarContext';
+import { BrowseProvider } from './sidebar/BrowseContext';
+import { useIsBrowseV2, useIsSearchV2 } from './useSearchAndBrowseVersion';
+import SearchSortSelect from './sorting/SearchSortSelect';
+import { combineSiblingsInSearchResults } from './utils/combineSiblingsInSearchResults';
+import SearchQuerySuggester from './suggestions/SearchQuerySugggester';
+import { formatNumberWithoutAbbreviation } from '../shared/formatNumber';
+import BrowseSidebar from './sidebar';
+import SearchResultsLoadingSection from './SearchResultsLoadingSection';
+import { SearchEntitySidebarContainer } from './SearchEntitySidebarContainer';
+import SearchMenuItems from '../sharedV2/search/SearchMenuItems';
+import { RecommendedFilters } from './recommendation/RecommendedFilters';
+import { ANTD_GRAY, REDESIGN_COLORS } from '../entityV2/shared/constants';
+import { PreviewType } from '../entity/Entity';
+import { useSearchContext } from '../search/context/SearchContext';
+import { useIsShowSeparateSiblingsEnabled } from '../useAppConfig';
+import { useShowNavBarRedesign } from '../useShowNavBarRedesign';
+
+const SearchResultsWrapper = styled.div<{ v2Styles: boolean }>`
+    display: flex;
+    flex: 1;
+
+    ${(props) =>
+        props.v2Styles &&
+        `
+        overflow: hidden;
+    `}
+`;
+
+const SearchBody = styled.div`
+    display: flex;
+    flex-direction: row;
+    min-height: 100%;
+    flex: 1;
+    overflow: auto;
+`;
+
+const ResultContainer = styled.div<{ v2Styles: boolean }>`
+    flex: 1;
+    overflow: auto;
+
+    ${(props) =>
+        props.v2Styles
+            ? `
+        display: flex;
+        flex-direction: column;
+    `
+            : `
+        max-width: calc(100% - 260px);
+    `}
+`;
+
+const PaginationControlContainer = styled.div`
+    padding-top: 16px;
+    padding-bottom: 16px;
+    text-align: center;
+`;
+
+const PaginationInfoContainer = styled.div<{ v2Styles: boolean }>`
+    padding: 12px 24px 14px 24px;
+    min-height: 47px;
+    border-color: ${(props) => props.theme.styles['border-color-base']};
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+`;
+
+const SearchResultsContainer = styled.div`
+    display: flex;
+    height: 100%;
+`;
+
+const SearchResultsScrollContainer = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    ${(props) => !props.$isShowNavBarRedesign && 'overflow-y: scroll;'}
+`;
+
+const LeftControlsContainer = styled.div`
+    display: flex;
+    gap: 12px;
+`;
+
+const StyledTabToolbar = styled.div`
+    background-color: #fff;
+    border-radius: 12px;
+    margin: 4px 16px 4px 8px;
+    padding: 12px 24px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border: 1.5px solid ${ANTD_GRAY[4]};
+`;
+
+const SearchMenuContainer = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const SearchResultListContainer = styled.div<{ v2Styles: boolean; $isShowNavBarRedesign?: boolean }>`
+    display: flex;
+    flex-direction: column;
+    ${({ v2Styles, $isShowNavBarRedesign }) =>
+        v2Styles &&
+        `
+        flex: 1;
+        overflow-x: hidden;        
+        overflow-y: auto;
+        ${$isShowNavBarRedesign ? 'scrollbar-width: none;' : ''}
+    `}
+    margin: ${(props) => (props.$isShowNavBarRedesign ? '5px 4px 5px 0px' : '4px 12px 4px 0px')};
+`;
+
+const CustomSwitch = styled.div`
+    background: #F6F6F6;
+    border: 1px solid #EBECF0;
+    border-radius: 30px;
+    display: flex;
+    gap: 2px;
+    align-items: center;
+    padding: 2px;
+    width: fit-content;
+    justify-content: space-between;
+    margin-left: 8px;
+}
+`;
+
+const IconContainer = styled.div<{ isActive?: boolean }>`
+    cursor: pointer;
+    align-items: center;
+    display: flex;
+    padding: 4px;
+    transition: left 0.5s ease;
+
+    ${(props) =>
+        props.isActive &&
+        `
+        background: ${REDESIGN_COLORS.TITLE_PURPLE};
+        border-radius: 100%;
+        color: white;
+    `}
+`;
+
+interface Props {
+    loading: boolean;
+    unionType?: UnionType;
+    query: string;
+    viewUrn?: string;
+    page: number;
+    searchResponse?: {
+        start: number;
+        count: number;
+        total: number;
+        searchResults?: {
+            entity: Entity;
+            matchedFields: MatchedField[];
+        }[];
+    } | null;
+    availableFilters: Array<FacetMetadata> | null;
+    selectedFilters: Array<FacetFilterInput>;
+    error: any;
+    onChangeFilters: (filters: Array<FacetFilterInput>) => void;
+    onChangePage: (page: number) => void;
+    downloadSearchResults: (input: DownloadSearchResultsInput) => Promise<DownloadSearchResults | null | undefined>;
+    numResultsPerPage: number;
+    setNumResultsPerPage: (numResults: number) => void;
+    isSelectMode: boolean;
+    selectedEntities: EntityAndType[];
+    suggestions: SearchSuggestion[];
+    setSelectedEntities: (entities: EntityAndType[]) => void;
+    areAllEntitiesSelected?: boolean;
+    setAreAllEntitiesSelected?: (areAllSelected: boolean) => void;
+    setIsSelectMode: (showSelectMode: boolean) => any;
+    onChangeSelectAll: (selected: boolean) => void;
+    refetch: () => void;
+    previewType?: PreviewType;
+    onCardClick?: (any: any) => any;
+}
+
+export const SearchResults = ({
+    loading,
+    unionType = UnionType.AND,
+    query,
+    viewUrn,
+    page,
+    searchResponse,
+    availableFilters,
+    selectedFilters,
+    error,
+    onChangeFilters,
+    onChangePage,
+    downloadSearchResults,
+    numResultsPerPage,
+    setNumResultsPerPage,
+    isSelectMode,
+    selectedEntities,
+    areAllEntitiesSelected,
+    setAreAllEntitiesSelected,
+    suggestions,
+    setIsSelectMode,
+    setSelectedEntities,
+    onChangeSelectAll,
+    refetch,
+    previewType,
+    onCardClick,
+}: Props) => {
+    const showSearchFiltersV2 = useIsSearchV2();
+    const showBrowseV2 = useIsBrowseV2();
+    const pageStart = searchResponse?.start || 0;
+    const pageSize = searchResponse?.count || 0;
+    const totalResults = searchResponse?.total || 0;
+    const lastResultIndex = pageStart + pageSize > totalResults ? totalResults : pageStart + pageSize;
+    const showSeparateSiblings = useIsShowSeparateSiblingsEnabled();
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    const combinedSiblingSearchResults = combineSiblingsInSearchResults(
+        showSeparateSiblings,
+        searchResponse?.searchResults,
+    );
+    const { selectedSortOption, setSelectedSortOption } = useSearchContext();
+    // For vertical sidebar
+    const [highlightedIndex, setHighlightedIndex] = useState<number | null>(0);
+    const { isFullViewCard, setIsFullViewCard } = useSearchContext();
+
+    const searchResultUrns = combinedSiblingSearchResults.map((result) => result.entity.urn) || [];
+    const selectedEntityUrns = selectedEntities.map((entity) => entity.urn);
+
+    const [resultsHeight, setResultsHeight] = useState('calc(100vh - 155px)');
+    const resultsRef = React.useCallback((node: HTMLDivElement) => {
+        if (node !== null) {
+            const resizeObserver = new ResizeObserver(() => {
+                setResultsHeight(`${node.offsetHeight}px`);
+            });
+            resizeObserver.observe(node);
+        }
+    }, []);
+
+    function handlePageChange(p: number) {
+        onChangePage(p);
+        setAreAllEntitiesSelected?.(false);
+    }
+
+    return (
+        <>
+            <SearchResultsWrapper v2Styles={showSearchFiltersV2}>
+                <SearchBody>
+                    {showBrowseV2 && (
+                        <SidebarProvider selectedFilters={selectedFilters} onChangeFilters={onChangeFilters}>
+                            <BrowseProvider>
+                                <BrowseSidebar visible />
+                            </BrowseProvider>
+                        </SidebarProvider>
+                    )}
+                    <ResultContainer v2Styles={showSearchFiltersV2} ref={resultsRef}>
+                        {(error && <ErrorSection />) ||
+                            (loading && !combinedSiblingSearchResults.length && <SearchResultsLoadingSection />) ||
+                            (combinedSiblingSearchResults && (
+                                <SearchResultsScrollContainer $isShowNavBarRedesign={isShowNavBarRedesign}>
+                                    <SearchResultsContainer>
+                                        <SearchResultListContainer
+                                            v2Styles={showSearchFiltersV2}
+                                            $isShowNavBarRedesign={isShowNavBarRedesign}
+                                        >
+                                            <PaginationInfoContainer v2Styles={showSearchFiltersV2}>
+                                                <LeftControlsContainer>
+                                                    <Typography.Text>
+                                                        Showing{' '}
+                                                        <b>
+                                                            {lastResultIndex > 0 ? (page - 1) * pageSize + 1 : 0} -{' '}
+                                                            {lastResultIndex}
+                                                        </b>{' '}
+                                                        of{' '}
+                                                        <b>
+                                                            {totalResults >= 10000
+                                                                ? `${formatNumberWithoutAbbreviation(10000)}+`
+                                                                : formatNumberWithoutAbbreviation(totalResults)}
+                                                        </b>{' '}
+                                                        results
+                                                    </Typography.Text>
+                                                </LeftControlsContainer>
+                                                <SearchMenuContainer>
+                                                    <SearchSortSelect
+                                                        selectedSortOption={selectedSortOption}
+                                                        setSelectedSortOption={setSelectedSortOption}
+                                                    />
+                                                    <SearchMenuItems
+                                                        downloadSearchResults={downloadSearchResults}
+                                                        filters={generateOrFilters(unionType, selectedFilters)}
+                                                        query={query}
+                                                        viewUrn={viewUrn}
+                                                        setShowSelectMode={setIsSelectMode}
+                                                        totalResults={totalResults}
+                                                    />
+                                                    <CustomSwitch>
+                                                        <IconContainer
+                                                            isActive={isFullViewCard}
+                                                            onClick={() => setIsFullViewCard(true)}
+                                                        >
+                                                            <Tooltip showArrow={false} title="Full Card View">
+                                                                <ViewDayOutlinedIcon
+                                                                    style={{
+                                                                        fontSize: '16px',
+                                                                    }}
+                                                                />
+                                                            </Tooltip>
+                                                        </IconContainer>
+                                                        <IconContainer
+                                                            isActive={!isFullViewCard}
+                                                            onClick={() => setIsFullViewCard(false)}
+                                                        >
+                                                            <Tooltip showArrow={false} title="Compact Card View">
+                                                                <ViewHeadlineOutlinedIcon
+                                                                    style={{
+                                                                        fontSize: '16px',
+                                                                    }}
+                                                                />
+                                                            </Tooltip>
+                                                        </IconContainer>
+                                                    </CustomSwitch>
+                                                </SearchMenuContainer>
+                                            </PaginationInfoContainer>
+                                            {totalResults > 0 && <SearchQuerySuggester suggestions={suggestions} />}
+                                            <RecommendedFilters
+                                                availableFilters={availableFilters || []}
+                                                selectedFilters={selectedFilters}
+                                                onChangeFilters={onChangeFilters}
+                                            />
+                                            {isSelectMode && (
+                                                <StyledTabToolbar>
+                                                    <SearchSelectBar
+                                                        isSelectAll={
+                                                            selectedEntities.length > 0 &&
+                                                            isListSubset(searchResultUrns, selectedEntityUrns)
+                                                        }
+                                                        totalResults={totalResults}
+                                                        selectedEntities={selectedEntities}
+                                                        setSelectedEntities={setSelectedEntities}
+                                                        onChangeSelectAll={onChangeSelectAll}
+                                                        onCancel={() => setIsSelectMode(false)}
+                                                        refetch={refetch}
+                                                        areAllEntitiesSelected={areAllEntitiesSelected}
+                                                        setAreAllEntitiesSelected={setAreAllEntitiesSelected}
+                                                    />
+                                                </StyledTabToolbar>
+                                            )}
+                                            <SearchResultList
+                                                setHighlightedIndex={setHighlightedIndex}
+                                                highlightedIndex={highlightedIndex}
+                                                loading={loading}
+                                                query={query}
+                                                searchResults={combinedSiblingSearchResults}
+                                                totalResultCount={totalResults}
+                                                isSelectMode={isSelectMode}
+                                                selectedEntities={selectedEntities}
+                                                setSelectedEntities={setSelectedEntities}
+                                                suggestions={suggestions}
+                                                pageNumber={page}
+                                                previewType={previewType}
+                                                onCardClick={onCardClick}
+                                                setAreAllEntitiesSelected={setAreAllEntitiesSelected}
+                                            />
+                                            {totalResults > 0 && (
+                                                <PaginationControlContainer id="search-pagination">
+                                                    <Pagination
+                                                        current={page}
+                                                        pageSize={numResultsPerPage}
+                                                        total={totalResults}
+                                                        showLessItems
+                                                        onChange={handlePageChange}
+                                                        showSizeChanger={totalResults > SearchCfg.RESULTS_PER_PAGE}
+                                                        onShowSizeChange={(_currNum, newNum) =>
+                                                            setNumResultsPerPage(newNum)
+                                                        }
+                                                        pageSizeOptions={['10', '20', '50', '100']}
+                                                    />
+                                                </PaginationControlContainer>
+                                            )}
+                                        </SearchResultListContainer>
+                                        <SearchEntitySidebarContainer
+                                            height={resultsHeight}
+                                            highlightedIndex={highlightedIndex}
+                                            selectedEntity={
+                                                highlightedIndex !== null &&
+                                                combinedSiblingSearchResults?.length > highlightedIndex
+                                                    ? {
+                                                          urn: combinedSiblingSearchResults[highlightedIndex]?.entity
+                                                              .urn,
+                                                          type: combinedSiblingSearchResults[highlightedIndex]?.entity
+                                                              .type,
+                                                      }
+                                                    : null
+                                            }
+                                        />
+                                    </SearchResultsContainer>
+                                </SearchResultsScrollContainer>
+                            ))}
+                    </ResultContainer>
+                </SearchBody>
+            </SearchResultsWrapper>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/SearchResultsLoadingSection.tsx b/datahub-web-react/src/app/searchV2/SearchResultsLoadingSection.tsx
new file mode 100644
index 00000000000000..d669044b7c1b1e
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/SearchResultsLoadingSection.tsx
@@ -0,0 +1,33 @@
+import * as React from 'react';
+import { Skeleton } from 'antd';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../entity/shared/constants';
+
+const Container = styled.div`
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    padding: 24px 0px 20px 40px;
+    overflow: auto;
+    flex: 1;
+`;
+
+const cardStyle = {
+    backgroundColor: ANTD_GRAY[2],
+    height: 120,
+    minWidth: '98%',
+    borderRadius: 8,
+    marginBottom: 20,
+};
+
+export default function SearchResultsLoadingSection() {
+    return (
+        <Container>
+            <Skeleton.Input active style={cardStyle} />
+            <Skeleton.Input active style={cardStyle} />
+            <Skeleton.Input active style={cardStyle} />
+            <Skeleton.Input active style={cardStyle} />
+            <Skeleton.Input active style={cardStyle} />
+        </Container>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/SearchResultsRecommendations.tsx b/datahub-web-react/src/app/searchV2/SearchResultsRecommendations.tsx
new file mode 100644
index 00000000000000..617e2adefd3422
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/SearchResultsRecommendations.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Divider, Typography } from 'antd';
+import {
+    FacetFilterInput,
+    RecommendationModule as RecommendationModuleType,
+    ScenarioType,
+} from '../../types.generated';
+import { useListRecommendationsQuery } from '../../graphql/recommendations.generated';
+import { RecommendationModule } from '../recommendations/RecommendationModule';
+import { ANTD_GRAY } from '../entity/shared/constants';
+
+const RecommendationsContainer = styled.div`
+    margin-left: 40px;
+    margin-right: 40px;
+`;
+
+const RecommendationContainer = styled.div`
+    margin-bottom: 20px;
+`;
+
+const ThinDivider = styled(Divider)`
+    margin-top: 12px;
+    margin-bottom: 12px;
+`;
+
+const RecommendationTitle = styled(Typography.Title)`
+    color: ${ANTD_GRAY[7]};
+`;
+
+type Props = {
+    userUrn: string;
+    query: string;
+    filters: Array<FacetFilterInput>;
+};
+
+export const SearchResultsRecommendations = ({ userUrn, query, filters }: Props) => {
+    const scenario = ScenarioType.SearchResults;
+    const { data } = useListRecommendationsQuery({
+        variables: {
+            input: {
+                userUrn,
+                requestContext: {
+                    scenario,
+                    searchRequestContext: {
+                        query,
+                        filters,
+                    },
+                },
+                limit: 3,
+            },
+        },
+    });
+    const recommendationModules = data?.listRecommendations?.modules;
+    return (
+        <>
+            {!!recommendationModules?.length && (
+                <RecommendationsContainer data-testid="recommendation-container-id">
+                    <RecommendationTitle level={3}>More you may be interested in</RecommendationTitle>
+                    {recommendationModules.map((module) => (
+                        <RecommendationContainer key={module.moduleId}>
+                            <RecommendationTitle level={5}>{module.title}</RecommendationTitle>
+                            <ThinDivider />
+                            <RecommendationModule
+                                module={module as RecommendationModuleType}
+                                scenarioType={scenario}
+                                showTitle={false}
+                            />
+                        </RecommendationContainer>
+                    ))}
+                </RecommendationsContainer>
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/SearchablePage.tsx b/datahub-web-react/src/app/searchV2/SearchablePage.tsx
new file mode 100644
index 00000000000000..35b4f18f62915c
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/SearchablePage.tsx
@@ -0,0 +1,174 @@
+import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
+import React, { useEffect, useState } from 'react';
+import { useHistory, useLocation } from 'react-router';
+import { debounce } from 'lodash';
+import * as QueryString from 'query-string';
+import styled, { useTheme } from 'styled-components';
+import { colors } from '@src/alchemy-components';
+import { SearchHeader } from './SearchHeader';
+import { useEntityRegistry } from '../useEntityRegistry';
+import { FacetFilterInput } from '../../types.generated';
+import {
+    GetAutoCompleteMultipleResultsQuery,
+    useGetAutoCompleteMultipleResultsLazyQuery,
+} from '../../graphql/search.generated';
+import { navigateToSearchUrl } from './utils/navigateToSearchUrl';
+import analytics, { EventType } from '../analytics';
+import useFilters from './utils/useFilters';
+import { PageRoutes } from '../../conf/Global';
+import { getAutoCompleteInputFromQuickFilter } from './utils/filterUtils';
+import { useQuickFiltersContext } from '../../providers/QuickFiltersContext';
+import { useUserContext } from '../context/useUserContext';
+import { useSelectedSortOption } from '../search/context/SearchContext';
+import { NavSidebar as NavSidebarRedesign } from '../homeV2/layout/navBarRedesign/NavSidebar';
+import { NavSidebar } from '../homeV2/layout/NavSidebar';
+import { useShowNavBarRedesign } from '../useShowNavBarRedesign';
+
+const Body = styled.div`
+    display: flex;
+    flex-direction: row;
+    flex: 1;
+`;
+
+const BodyBackground = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    background-color: ${(props) => (props.$isShowNavBarRedesign ? colors.gray[1600] : REDESIGN_COLORS.BACKGROUND)};
+    position: fixed;
+    height: 100%;
+    width: 100%;
+    z-index: -2;
+`;
+
+const Navigation = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    z-index: ${(props) => (props.$isShowNavBarRedesign ? 0 : 200)};
+`;
+
+const Content = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    border-radius: ${(props) =>
+        props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '8px'};
+    margin-top: ${(props) => (props.$isShowNavBarRedesign ? '56px' : '72px')};
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        padding: 11px 15px 11px 3px;
+    `}
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    max-height: ${(props) => (props.$isShowNavBarRedesign ? 'calc(100vh - 56px)' : 'calc(100vh - 72px)')};
+    width: 100%;
+    overflow: ${(props) => (props.$isShowNavBarRedesign ? 'hidden' : 'auto')};
+`;
+
+const FIFTH_SECOND_IN_MS = 100;
+
+type Props = React.PropsWithChildren<any>;
+
+const isSearchResultPage = (path: string) => {
+    return path.startsWith(PageRoutes.SEARCH);
+};
+
+/**
+ * A page that includes a sticky search header (nav bar)
+ */
+export const SearchablePage = ({ children }: Props) => {
+    const location = useLocation();
+    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
+    const paramFilters: Array<FacetFilterInput> = useFilters(params);
+    const filters = isSearchResultPage(location.pathname) ? paramFilters : [];
+    const currentQuery: string = isSearchResultPage(location.pathname)
+        ? decodeURIComponent(params.query ? (params.query as string) : '')
+        : '';
+    const selectedSortOption = useSelectedSortOption();
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+
+    const history = useHistory();
+    const entityRegistry = useEntityRegistry();
+    const themeConfig = useTheme();
+    const { selectedQuickFilter } = useQuickFiltersContext();
+
+    const [getAutoCompleteResults, { data: suggestionsData }] = useGetAutoCompleteMultipleResultsLazyQuery();
+    const userContext = useUserContext();
+    const [newSuggestionData, setNewSuggestionData] = useState<GetAutoCompleteMultipleResultsQuery | undefined>();
+    const viewUrn = userContext.localState?.selectedViewUrn;
+
+    useEffect(() => {
+        if (suggestionsData !== undefined) {
+            setNewSuggestionData(suggestionsData);
+        }
+    }, [suggestionsData]);
+
+    const search = (query: string, quickFilters?: FacetFilterInput[]) => {
+        analytics.event({
+            type: EventType.SearchEvent,
+            query,
+            pageNumber: 1,
+            originPath: window.location.pathname,
+            selectedQuickFilterTypes: selectedQuickFilter ? [selectedQuickFilter.field] : undefined,
+            selectedQuickFilterValues: selectedQuickFilter ? [selectedQuickFilter.value] : undefined,
+        });
+
+        const appliedFilters = quickFilters && quickFilters?.length > 0 ? quickFilters : filters;
+
+        navigateToSearchUrl({
+            query,
+            filters: appliedFilters,
+            history,
+            selectedSortOption,
+        });
+    };
+
+    const autoComplete = debounce((query: string) => {
+        if (query && query.trim() !== '') {
+            getAutoCompleteResults({
+                variables: {
+                    input: {
+                        query,
+                        viewUrn,
+                        ...getAutoCompleteInputFromQuickFilter(selectedQuickFilter),
+                    },
+                },
+            });
+        }
+    }, FIFTH_SECOND_IN_MS);
+
+    // Load correct autocomplete results on initial page load.
+    useEffect(() => {
+        if (currentQuery && currentQuery.trim() !== '') {
+            getAutoCompleteResults({
+                variables: {
+                    input: {
+                        query: currentQuery,
+                        viewUrn,
+                    },
+                },
+            });
+        }
+    }, [currentQuery, getAutoCompleteResults, viewUrn]);
+
+    const FinalNavBar = isShowNavBarRedesign ? NavSidebarRedesign : NavSidebar;
+
+    return (
+        <>
+            <SearchHeader
+                initialQuery={currentQuery as string}
+                placeholderText={themeConfig.content.search.searchbarMessage}
+                suggestions={
+                    (newSuggestionData &&
+                        newSuggestionData?.autoCompleteForMultiple &&
+                        newSuggestionData.autoCompleteForMultiple.suggestions) ||
+                    []
+                }
+                onSearch={search}
+                onQueryChange={autoComplete}
+                entityRegistry={entityRegistry}
+            />
+            <BodyBackground $isShowNavBarRedesign={isShowNavBarRedesign} />
+            <Body>
+                <Navigation $isShowNavBarRedesign={isShowNavBarRedesign}>
+                    <FinalNavBar />
+                </Navigation>
+                <Content $isShowNavBarRedesign={isShowNavBarRedesign}>{children}</Content>
+            </Body>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/SimpleSearchFilter.tsx b/datahub-web-react/src/app/searchV2/SimpleSearchFilter.tsx
new file mode 100644
index 00000000000000..e8ed79f3406813
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/SimpleSearchFilter.tsx
@@ -0,0 +1,132 @@
+import { DownOutlined, UpOutlined } from '@ant-design/icons';
+import { Button, Checkbox } from 'antd';
+import { CheckboxChangeEvent } from 'antd/lib/checkbox';
+import * as React from 'react';
+import { useState, useEffect } from 'react';
+import styled from 'styled-components';
+
+import { FacetFilterInput, FacetMetadata } from '../../types.generated';
+import { SearchFilterLabel } from './SearchFilterLabel';
+import { TRUNCATED_FILTER_LENGTH } from './utils/constants';
+
+const GRAPH_DEGREE_FILTER_FIELD = 'degree';
+
+const isGraphDegreeFilter = (field: string) => {
+    return GRAPH_DEGREE_FILTER_FIELD === field;
+};
+
+type Props = {
+    facet: FacetMetadata;
+    selectedFilters: Array<FacetFilterInput>;
+    onFilterSelect: (selected: boolean, field: string, value: string) => void;
+    defaultDisplayFilters: boolean;
+};
+
+const SearchFilterWrapper = styled.div`
+    padding: 0 25px 15px 25px;
+`;
+
+const Title = styled.div`
+    align-items: center;
+    font-weight: bold;
+    margin-bottom: 10px;
+    display: flex;
+    justify-content: space-between;
+    cursor: pointer;
+`;
+
+const CheckBox = styled(Checkbox)`
+    margin: 5px 0;
+`;
+
+const ExpandButton = styled(Button)`
+    &&& {
+        padding: 4px;
+        font-size: 12px;
+    }
+`;
+
+const StyledUpOutlined = styled(UpOutlined)`
+    font-size: 10px;
+`;
+
+const StyledDownOutlined = styled(DownOutlined)`
+    font-size: 10px;
+`;
+
+export const SimpleSearchFilter = ({ facet, selectedFilters, onFilterSelect, defaultDisplayFilters }: Props) => {
+    const [areFiltersVisible, setAreFiltersVisible] = useState(defaultDisplayFilters);
+    const [expanded, setExpanded] = useState(false);
+
+    const isFacetSelected = (field, value) => {
+        return selectedFilters.find((f) => f.field === field && f.values?.includes(value)) !== undefined;
+    };
+
+    // Aggregations filtered for count > 0 or selected = true
+    const filteredAggregations = facet.aggregations.filter(
+        (agg) => agg.count > 0 || isFacetSelected(facet.field, agg.value) || isGraphDegreeFilter(facet.field),
+    );
+
+    // By default, render a Filter as open if it is selected
+    const isFilterSelected = !!filteredAggregations.find((agg) => isFacetSelected(facet.field, agg.value));
+    useEffect(() => {
+        if (isFilterSelected) {
+            setAreFiltersVisible(true);
+        }
+    }, [isFilterSelected]);
+
+    const shouldTruncate = filteredAggregations.length > TRUNCATED_FILTER_LENGTH;
+
+    return (
+        <SearchFilterWrapper key={facet.field}>
+            <Title onClick={() => setAreFiltersVisible((prevState) => !prevState)}>
+                {facet?.displayName}
+                {areFiltersVisible ? (
+                    <StyledUpOutlined />
+                ) : (
+                    <StyledDownOutlined data-testid={`expand-facet-${facet.field}`} />
+                )}
+            </Title>
+            {areFiltersVisible && (
+                <>
+                    {facet.aggregations
+                        .filter(
+                            (agg) =>
+                                agg.count > 0 ||
+                                isFacetSelected(facet.field, agg.value) ||
+                                isGraphDegreeFilter(facet.field),
+                        )
+                        .map((aggregation, i) => {
+                            if (i >= TRUNCATED_FILTER_LENGTH && !expanded) {
+                                return null;
+                            }
+                            return (
+                                <span key={`${facet.field}-${aggregation.value}`}>
+                                    <CheckBox
+                                        data-testid={`facet-${facet.field}-${aggregation.value}`}
+                                        checked={isFacetSelected(facet.field, aggregation.value)}
+                                        onChange={(e: CheckboxChangeEvent) =>
+                                            onFilterSelect(e.target.checked, facet.field, aggregation.value)
+                                        }
+                                    >
+                                        <SearchFilterLabel
+                                            field={facet.field}
+                                            value={aggregation.value}
+                                            count={aggregation.count}
+                                            entity={aggregation.entity}
+                                        />
+                                    </CheckBox>
+                                    <br />
+                                </span>
+                            );
+                        })}
+                    {shouldTruncate && (
+                        <ExpandButton type="text" onClick={() => setExpanded(!expanded)}>
+                            {expanded ? '- Less' : '+ More'}
+                        </ExpandButton>
+                    )}
+                </>
+            )}
+        </SearchFilterWrapper>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/SimpleSearchFilters.tsx b/datahub-web-react/src/app/searchV2/SimpleSearchFilters.tsx
new file mode 100644
index 00000000000000..bfb4c661860277
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/SimpleSearchFilters.tsx
@@ -0,0 +1,97 @@
+import * as React from 'react';
+import { useEffect, useState } from 'react';
+import { FacetFilterInput, FacetMetadata } from '../../types.generated';
+import { FilterScenarioType } from './filters/render/types';
+import { useFilterRendererRegistry } from './filters/render/useFilterRenderer';
+import { SimpleSearchFilter } from './SimpleSearchFilter';
+import {
+    ENTITY_FILTER_NAME,
+    ENTITY_INDEX_FILTER_NAME,
+    LEGACY_ENTITY_FILTER_NAME,
+    ENTITY_SUB_TYPE_FILTER_NAME,
+    DEGREE_FILTER_NAME,
+} from './utils/constants';
+
+const TOP_FILTERS = ['degree', ENTITY_FILTER_NAME, 'platform', 'tags', 'glossaryTerms', 'domains', 'owners'];
+
+const FILTERS_TO_EXCLUDE = [LEGACY_ENTITY_FILTER_NAME, ENTITY_INDEX_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_NAME];
+
+interface Props {
+    facets: Array<FacetMetadata>;
+    selectedFilters: Array<FacetFilterInput>;
+    onFilterSelect: (newFilters: Array<FacetFilterInput>) => void;
+    loading: boolean;
+}
+
+export const SimpleSearchFilters = ({ facets, selectedFilters, onFilterSelect, loading }: Props) => {
+    const [cachedProps, setCachedProps] = useState<{
+        facets: Array<FacetMetadata>;
+        selectedFilters: Array<FacetFilterInput>;
+    }>({
+        facets,
+        selectedFilters,
+    });
+
+    // we want to persist the selected filters through the loading jitter
+    useEffect(() => {
+        if (!loading) {
+            setCachedProps({ facets, selectedFilters });
+        }
+    }, [facets, selectedFilters, loading]);
+
+    const onFilterSelectAndSetCache = (selected: boolean, field: string, value: string) => {
+        const newFilters = selected
+            ? [...selectedFilters, { field, values: [value] }]
+            : selectedFilters
+                  .map((filter) =>
+                      filter.field === field
+                          ? { ...filter, values: filter.values?.filter((val) => val !== value) }
+                          : filter,
+                  )
+                  .filter((filter) => filter.field !== field || !(filter.values?.length === 0));
+
+        // Do not let user unselect all degree filters
+        if (field === DEGREE_FILTER_NAME && !selected) {
+            const hasDegreeFilter = newFilters.find((filter) => filter.field === DEGREE_FILTER_NAME);
+            if (!hasDegreeFilter) {
+                return;
+            }
+        }
+
+        setCachedProps({ ...cachedProps, selectedFilters: newFilters });
+        onFilterSelect(newFilters);
+    };
+
+    const filteredFacets = cachedProps.facets.filter((facet) => !FILTERS_TO_EXCLUDE.includes(facet.field));
+
+    const sortedFacets = filteredFacets.sort((facetA, facetB) => {
+        if (TOP_FILTERS.indexOf(facetA.field) === -1) return 1;
+        if (TOP_FILTERS.indexOf(facetB.field) === -1) return -1;
+        return TOP_FILTERS.indexOf(facetA.field) - TOP_FILTERS.indexOf(facetB.field);
+    });
+
+    const filterRendererRegistry = useFilterRendererRegistry();
+
+    return (
+        <>
+            {sortedFacets.map((facet) => {
+                return filterRendererRegistry.hasRenderer(facet.field) ? (
+                    filterRendererRegistry.render(facet.field, {
+                        scenario: FilterScenarioType.SEARCH_V1,
+                        filter: facet,
+                        activeFilters: selectedFilters,
+                        onChangeFilters: onFilterSelect,
+                    })
+                ) : (
+                    <SimpleSearchFilter
+                        key={`${facet.displayName}-${facet.field}`}
+                        facet={facet}
+                        selectedFilters={cachedProps.selectedFilters}
+                        onFilterSelect={onFilterSelectAndSetCache}
+                        defaultDisplayFilters={TOP_FILTERS.includes(facet.field)}
+                    />
+                );
+            })}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/ToggleSidebarButton.tsx b/datahub-web-react/src/app/searchV2/ToggleSidebarButton.tsx
new file mode 100644
index 00000000000000..8a8a5285570f9c
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/ToggleSidebarButton.tsx
@@ -0,0 +1,50 @@
+import React, { memo, useState } from 'react';
+import Icon from '@ant-design/icons/lib/components/Icon';
+import { Button } from 'antd';
+import { Tooltip } from '@components';
+import styled from 'styled-components';
+import ExpandIcon from '../../images/expand.svg?react';
+import CollapseIcon from '../../images/collapse.svg?react';
+
+const ToggleIcon = styled(Icon)`
+    color: ${(props) => props.theme.styles['primary-color']};
+    &&& {
+        font-size: 16px;
+    }
+`;
+
+type Props = {
+    isOpen: boolean;
+    onClick: () => void;
+};
+
+const ToggleSidebarButton = ({ isOpen, onClick }: Props) => {
+    const [pauseTooltip, setPauseTooltip] = useState(false);
+    const title = isOpen ? 'Hide the navigation panel' : 'Open the navigation panel';
+    const placement = isOpen ? 'bottom' : 'bottomRight';
+
+    const onClickButton = () => {
+        setPauseTooltip(true);
+        window.setTimeout(() => setPauseTooltip(false), 250);
+        onClick();
+    };
+
+    const button = (
+        <Button
+            data-testid="browse-v2-toggle"
+            size="small"
+            onClick={onClickButton}
+            icon={<ToggleIcon component={isOpen ? CollapseIcon : ExpandIcon} />}
+        />
+    );
+
+    if (pauseTooltip) return button;
+
+    return (
+        <Tooltip title={title} placement={placement} arrowPointAtCenter mouseEnterDelay={1}>
+            {button}
+        </Tooltip>
+    );
+};
+
+export default memo(ToggleSidebarButton);
diff --git a/datahub-web-react/src/app/searchV2/ViewAllSearchItem.tsx b/datahub-web-react/src/app/searchV2/ViewAllSearchItem.tsx
new file mode 100644
index 00000000000000..208fe3c92146d4
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/ViewAllSearchItem.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { Typography } from 'antd';
+import { SearchOutlined } from '@ant-design/icons';
+
+const ExploreForEntity = styled.span`
+    font-weight: light;
+    font-size: 16px;
+    padding: 5px 0;
+`;
+
+const ExploreForEntityText = styled.span`
+    margin-left: 10px;
+`;
+
+const ViewAllContainer = styled.div`
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 100%;
+`;
+
+const ReturnKey = styled(Typography.Text)`
+    & kbd {
+        border: none;
+    }
+    font-size: 12px;
+`;
+
+function ViewAllSearchItem({ searchTarget: searchText }: { searchTarget?: string }) {
+    return (
+        <ViewAllContainer>
+            <ExploreForEntity>
+                <SearchOutlined />
+                <ExploreForEntityText>
+                    View all results for <Typography.Text strong>{searchText}</Typography.Text>
+                </ExploreForEntityText>
+            </ExploreForEntity>
+            <ReturnKey keyboard disabled>
+                ⮐ return
+            </ReturnKey>
+        </ViewAllContainer>
+    );
+}
+
+export default ViewAllSearchItem;
diff --git a/datahub-web-react/src/app/searchV2/__tests__/SearchPage.test.tsx b/datahub-web-react/src/app/searchV2/__tests__/SearchPage.test.tsx
new file mode 100644
index 00000000000000..222d4cc56c8c24
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/__tests__/SearchPage.test.tsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import { render, waitFor } from '@testing-library/react';
+import { InMemoryCache } from '@apollo/client';
+import { MockedProvider } from '@apollo/client/testing';
+import { Route } from 'react-router';
+import { SearchPage } from '../SearchPage';
+import TestPageContainer from '../../../utils/test-utils/TestPageContainer';
+import { mocksWithSearchFlagsOff } from '../../../Mocks';
+import { PageRoutes } from '../../../conf/Global';
+import possibleTypesResult from '../../../possibleTypes.generated';
+
+const cache = new InMemoryCache({
+    // need to define possibleTypes to allow us to use Apollo cache with union types
+    possibleTypes: possibleTypesResult.possibleTypes,
+});
+
+describe('SearchPage', () => {
+    const URL =
+        '/search' +
+        '?filter__entityType␞typeNames___false___EQUAL___0=DATASET' +
+        '&filter_platform___false___EQUAL___1=urn%3Ali%3AdataPlatform%3Asnowflake,urn%3Ali%3AdataPlatform%3Atableau' +
+        '&page=1' +
+        '&query=test';
+
+    it('renders the selected filters as checked', async () => {
+        const { getByTestId, queryByTestId } = render(
+            <MockedProvider mocks={mocksWithSearchFlagsOff} addTypename cache={cache}>
+                <TestPageContainer initialEntries={[URL]}>
+                    <Route path={PageRoutes.SEARCH_RESULTS} render={() => <SearchPage />} />
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+
+        await waitFor(() => expect(queryByTestId('active-filter-_entityType␞typeNames')).toBeInTheDocument());
+        const datasetEntityValue = getByTestId('active-filter-value-_entityType␞typeNames-DATASET');
+        expect(datasetEntityValue).toBeInTheDocument();
+        const chartEntityValue = queryByTestId('active-filter-value-_entityType␞typeNames-CHART');
+        expect(chartEntityValue).not.toBeInTheDocument();
+    });
+
+    it('renders multiple checked filters at once', async () => {
+        const { getByTestId, queryByTestId } = render(
+            <MockedProvider mocks={mocksWithSearchFlagsOff} addTypename cache={cache}>
+                <TestPageContainer initialEntries={[URL]}>
+                    <Route path={PageRoutes.SEARCH_RESULTS} render={() => <SearchPage />} />
+                </TestPageContainer>
+            </MockedProvider>,
+        );
+
+        await waitFor(() => expect(queryByTestId('active-filter-_entityType␞typeNames')).toBeInTheDocument());
+        const datasetEntityValue = getByTestId('active-filter-value-_entityType␞typeNames-DATASET');
+        expect(datasetEntityValue).toBeInTheDocument();
+
+        await waitFor(() => expect(queryByTestId('active-filter-platform')).toBeInTheDocument());
+        const snowflakePlatformValue = getByTestId('active-filter-value-platform-urn:li:dataPlatform:snowflake');
+        const tableauPlatformValue = getByTestId('active-filter-value-platform-urn:li:dataPlatform:tableau');
+        expect(snowflakePlatformValue).toBeInTheDocument();
+        expect(tableauPlatformValue).toBeInTheDocument();
+        const bigqueryPlatformValue = queryByTestId('active-filter-value-platform-urn:li:dataPlatform:bigquery');
+        expect(bigqueryPlatformValue).not.toBeInTheDocument();
+    });
+});
diff --git a/datahub-web-react/src/app/searchV2/__tests__/constants.test.tsx b/datahub-web-react/src/app/searchV2/__tests__/constants.test.tsx
new file mode 100644
index 00000000000000..ad5f38e94483eb
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/__tests__/constants.test.tsx
@@ -0,0 +1,7 @@
+import { FIELD_TO_LABEL, ORDERED_FIELDS } from '../utils/constants';
+
+describe('constants', () => {
+    it('ensure that all ordered fields have a corresponding label', () => {
+        expect(ORDERED_FIELDS.filter((field) => !Object.keys(FIELD_TO_LABEL).includes(field)).length).toEqual(0);
+    });
+});
diff --git a/datahub-web-react/src/app/searchV2/__tests__/filterUtils.test.tsx b/datahub-web-react/src/app/searchV2/__tests__/filterUtils.test.tsx
new file mode 100644
index 00000000000000..e71bace738b97e
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/__tests__/filterUtils.test.tsx
@@ -0,0 +1,303 @@
+import { FilterOperator } from '@src/types.generated';
+import { UnionType } from '../utils/constants';
+import { combineOrFilters, mergeFilterSets } from '../utils/filterUtils';
+
+describe('filterUtils', () => {
+    describe('mergeFilterSets', () => {
+        it('merge conjunction and conjunction', () => {
+            const conjunction1 = {
+                unionType: UnionType.AND,
+                filters: [
+                    {
+                        field: 'a',
+                        values: ['1', '2'],
+                    },
+                    {
+                        field: 'b',
+                        values: ['1', '2'],
+                    },
+                ],
+            };
+            const conjunction2 = {
+                unionType: UnionType.AND,
+                filters: [
+                    {
+                        field: 'c',
+                        values: ['1', '2'],
+                    },
+                    {
+                        field: 'd',
+                        values: ['1', '2'],
+                    },
+                ],
+            };
+            const expectedResult = [
+                {
+                    and: [
+                        {
+                            field: 'a',
+                            values: ['1', '2'],
+                        },
+                        {
+                            field: 'b',
+                            values: ['1', '2'],
+                        },
+                        {
+                            field: 'c',
+                            values: ['1', '2'],
+                        },
+                        {
+                            field: 'd',
+                            values: ['1', '2'],
+                        },
+                    ],
+                },
+            ];
+            expect(mergeFilterSets(conjunction1, conjunction2)).toEqual(expectedResult);
+        });
+        it('merge conjunction and disjunction', () => {
+            const conjunction = {
+                unionType: UnionType.AND,
+                filters: [
+                    {
+                        field: 'a',
+                        values: ['1', '2'],
+                    },
+                    {
+                        field: 'b',
+                        values: ['1', '2'],
+                    },
+                ],
+            };
+            const disjunction = {
+                unionType: UnionType.OR,
+                filters: [
+                    {
+                        field: 'c',
+                        values: ['1', '2'],
+                    },
+                    {
+                        field: 'd',
+                        values: ['1', '2'],
+                    },
+                ],
+            };
+            const expectedResult = [
+                {
+                    and: [
+                        {
+                            field: 'c',
+                            values: ['1', '2'],
+                        },
+                        {
+                            field: 'a',
+                            values: ['1', '2'],
+                        },
+                        {
+                            field: 'b',
+                            values: ['1', '2'],
+                        },
+                    ],
+                },
+                {
+                    and: [
+                        {
+                            field: 'd',
+                            values: ['1', '2'],
+                        },
+                        {
+                            field: 'a',
+                            values: ['1', '2'],
+                        },
+                        {
+                            field: 'b',
+                            values: ['1', '2'],
+                        },
+                    ],
+                },
+            ];
+            expect(mergeFilterSets(conjunction, disjunction)).toEqual(expectedResult);
+        });
+        it('merge disjunction and disjunction', () => {
+            const disjunction1 = {
+                unionType: UnionType.OR,
+                filters: [
+                    {
+                        field: 'a',
+                        values: ['1', '2'],
+                    },
+                    {
+                        field: 'b',
+                        values: ['1', '2'],
+                    },
+                ],
+            };
+            const disjunction2 = {
+                unionType: UnionType.OR,
+                filters: [
+                    {
+                        field: 'c',
+                        values: ['1', '2'],
+                    },
+                    {
+                        field: 'd',
+                        values: ['1', '2'],
+                    },
+                ],
+            };
+            const expectedResult = [
+                {
+                    and: [
+                        {
+                            field: 'a',
+                            values: ['1', '2'],
+                        },
+                        {
+                            field: 'c',
+                            values: ['1', '2'],
+                        },
+                    ],
+                },
+                {
+                    and: [
+                        {
+                            field: 'a',
+                            values: ['1', '2'],
+                        },
+                        {
+                            field: 'd',
+                            values: ['1', '2'],
+                        },
+                    ],
+                },
+                {
+                    and: [
+                        {
+                            field: 'b',
+                            values: ['1', '2'],
+                        },
+                        {
+                            field: 'c',
+                            values: ['1', '2'],
+                        },
+                    ],
+                },
+                {
+                    and: [
+                        {
+                            field: 'b',
+                            values: ['1', '2'],
+                        },
+                        {
+                            field: 'd',
+                            values: ['1', '2'],
+                        },
+                    ],
+                },
+            ];
+            expect(mergeFilterSets(disjunction1, disjunction2)).toEqual(expectedResult);
+        });
+        it('bad arguments', () => {
+            expect(
+                mergeFilterSets(
+                    {
+                        unionType: UnionType.OR,
+                        filters: [{ field: 'field', values: [] }],
+                    },
+                    null!,
+                ),
+            ).toEqual([]);
+            expect(
+                mergeFilterSets(null!, {
+                    unionType: UnionType.OR,
+                    filters: [{ field: 'field', values: [] }],
+                }),
+            ).toEqual([]);
+            expect(mergeFilterSets(null!, null!)).toEqual([]);
+        });
+    });
+
+    describe('combineOrFilters', () => {
+        it('should combine two basic orFilters', () => {
+            const orFilter1 = [
+                {
+                    and: [
+                        { field: 'test1', condition: FilterOperator.Equal, values: ['dataset1'] },
+                        { field: 'test2', condition: FilterOperator.Equal, values: ['dataset2'] },
+                    ],
+                },
+            ];
+            const orFilter2 = [
+                {
+                    and: [
+                        { field: 'test3', condition: FilterOperator.Equal, values: ['dataset3'] },
+                        { field: 'test4', condition: FilterOperator.Equal, values: ['dataset4'] },
+                    ],
+                },
+            ];
+            const expectedOrFilter = [
+                {
+                    and: [
+                        { field: 'test1', condition: FilterOperator.Equal, values: ['dataset1'] },
+                        { field: 'test2', condition: FilterOperator.Equal, values: ['dataset2'] },
+                        { field: 'test3', condition: FilterOperator.Equal, values: ['dataset3'] },
+                        { field: 'test4', condition: FilterOperator.Equal, values: ['dataset4'] },
+                    ],
+                },
+            ];
+
+            expect(combineOrFilters(orFilter1, orFilter2)).toEqual(expectedOrFilter);
+        });
+        it('should combine more complex orFilters', () => {
+            const orFilter1 = [
+                {
+                    and: [{ field: 'test1', condition: FilterOperator.Equal, values: ['dataset1'] }],
+                },
+                {
+                    and: [{ field: 'test2', condition: FilterOperator.Equal, values: ['dataset2'] }],
+                },
+            ];
+            const orFilter2 = [
+                {
+                    and: [
+                        { field: 'test3', condition: FilterOperator.Equal, values: ['dataset3'] },
+                        { field: 'test4', condition: FilterOperator.Equal, values: ['dataset4'] },
+                    ],
+                },
+                {
+                    and: [{ field: 'test5', condition: FilterOperator.Equal, values: ['dataset5'] }],
+                },
+            ];
+            const expectedOrFilter = [
+                {
+                    and: [
+                        { field: 'test1', condition: FilterOperator.Equal, values: ['dataset1'] },
+                        { field: 'test3', condition: FilterOperator.Equal, values: ['dataset3'] },
+                        { field: 'test4', condition: FilterOperator.Equal, values: ['dataset4'] },
+                    ],
+                },
+                {
+                    and: [
+                        { field: 'test1', condition: FilterOperator.Equal, values: ['dataset1'] },
+                        { field: 'test5', condition: FilterOperator.Equal, values: ['dataset5'] },
+                    ],
+                },
+                {
+                    and: [
+                        { field: 'test2', condition: FilterOperator.Equal, values: ['dataset2'] },
+                        { field: 'test3', condition: FilterOperator.Equal, values: ['dataset3'] },
+                        { field: 'test4', condition: FilterOperator.Equal, values: ['dataset4'] },
+                    ],
+                },
+                {
+                    and: [
+                        { field: 'test2', condition: FilterOperator.Equal, values: ['dataset2'] },
+                        { field: 'test5', condition: FilterOperator.Equal, values: ['dataset5'] },
+                    ],
+                },
+            ];
+
+            expect(combineOrFilters(orFilter1, orFilter2)).toEqual(expectedOrFilter);
+        });
+    });
+});
diff --git a/datahub-web-react/src/app/searchV2/advanced/AdvancedFilterCloseButton.tsx b/datahub-web-react/src/app/searchV2/advanced/AdvancedFilterCloseButton.tsx
new file mode 100644
index 00000000000000..8173231d0dd495
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/advanced/AdvancedFilterCloseButton.tsx
@@ -0,0 +1,31 @@
+import { CloseOutlined } from '@ant-design/icons';
+import React from 'react';
+import styled from 'styled-components';
+
+const CloseSpan = styled.span`
+    :hover {
+        color: black;
+        cursor: pointer;
+    }
+`;
+
+interface Props {
+    onClose: () => void;
+}
+
+export default function AdvancedFilterCloseButton({ onClose }: Props) {
+    return (
+        <CloseSpan
+            role="button"
+            onClick={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                onClose();
+            }}
+            tabIndex={0}
+            onKeyPress={onClose}
+        >
+            <CloseOutlined />
+        </CloseSpan>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/advanced/EntitySubTypeAdvancedFilterLabel.tsx b/datahub-web-react/src/app/searchV2/advanced/EntitySubTypeAdvancedFilterLabel.tsx
new file mode 100644
index 00000000000000..1f07af03a65846
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/advanced/EntitySubTypeAdvancedFilterLabel.tsx
@@ -0,0 +1,105 @@
+import React, { useMemo } from 'react';
+import styled from 'styled-components';
+import { FILTER_DELIMITER } from '../utils/constants';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { EntityType, FacetFilterInput } from '../../../types.generated';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import AdvancedFilterCloseButton from './AdvancedFilterCloseButton';
+import { FilterContainer } from './styles';
+import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
+
+const FilterFieldLabel = styled.span`
+    font-weight: 600;
+    margin-right: 4px;
+`;
+
+const FilterWrapper = styled.span`
+    padding: 2px 4px;
+    display: flex;
+    align-items: center;
+`;
+
+const FilterValuesWrapper = styled.div`
+    color: ${ANTD_GRAY[9]};
+    margin: 4px;
+`;
+
+const ConditionWrapper = styled.div`
+    padding: 0 7px;
+    border-radius: 5px;
+    height: 24px;
+    display: flex;
+    align-items: center;
+    color: ${ANTD_GRAY[9]};
+    background: ${ANTD_GRAY[2]};
+`;
+
+function getEntityTypeToSubType(nestedSubTypes?: string[]): { [key: string]: string[] } {
+    const entityTypeToSubTypes = {};
+    nestedSubTypes?.forEach((nestedSubType) => {
+        const [entityType, subType] = nestedSubType.split(FILTER_DELIMITER);
+        entityTypeToSubTypes[entityType] = [...(entityTypeToSubTypes[entityType] || []), subType];
+    });
+    return entityTypeToSubTypes;
+}
+
+interface Props {
+    filter: FacetFilterInput;
+    isCompact: boolean;
+    disabled: boolean;
+    onClose: () => void;
+}
+
+export default function EntitySubTypeAdvancedFilterLabel({ filter, isCompact, disabled, onClose }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const entityTypes = useMemo(
+        () => filter.values?.filter((value) => !value.includes(FILTER_DELIMITER)),
+        [filter.values],
+    );
+    const nestedSubTypes = useMemo(
+        () => filter.values?.filter((value) => value.includes(FILTER_DELIMITER)),
+        [filter.values],
+    );
+    const entityTypeToSubTypes = useMemo(() => getEntityTypeToSubType(nestedSubTypes), [nestedSubTypes]);
+
+    return (
+        <FilterContainer $isCompact={isCompact} isDisabled>
+            <FilterWrapper>
+                {entityTypes && entityTypes.length > 0 && (
+                    <>
+                        <FilterFieldLabel>Type</FilterFieldLabel>
+                        <ConditionWrapper>is any of</ConditionWrapper>
+                        <FilterValuesWrapper>
+                            {entityTypes?.map((entityType, index) => (
+                                <>
+                                    {entityRegistry.getCollectionName(entityType as EntityType)}
+                                    {index !== entityTypes.length - 1 && ', '}
+                                </>
+                            ))}
+                        </FilterValuesWrapper>
+                    </>
+                )}
+                {Object.entries(entityTypeToSubTypes).map(([entityType, subTypes]) => (
+                    <>
+                        <FilterFieldLabel>Type</FilterFieldLabel>
+                        <ConditionWrapper>is</ConditionWrapper>
+                        <FilterValuesWrapper>
+                            {entityRegistry.getCollectionName(entityType as EntityType)}
+                        </FilterValuesWrapper>
+                        <FilterFieldLabel>SubType</FilterFieldLabel>
+                        <ConditionWrapper>is any of</ConditionWrapper>
+                        <FilterValuesWrapper>
+                            {subTypes.map((v, index) => (
+                                <>
+                                    {capitalizeFirstLetterOnly(v)}
+                                    {index !== subTypes.length - 1 && ', '}
+                                </>
+                            ))}
+                        </FilterValuesWrapper>
+                    </>
+                ))}
+                {!disabled && <AdvancedFilterCloseButton onClose={onClose} />}
+            </FilterWrapper>
+        </FilterContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/advanced/styles.ts b/datahub-web-react/src/app/searchV2/advanced/styles.ts
new file mode 100644
index 00000000000000..8109f5c5d83466
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/advanced/styles.ts
@@ -0,0 +1,20 @@
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+
+export const FilterContainer = styled.div<{ $isCompact: boolean; isDisabled?: boolean }>`
+    box-shadow: 0px 0px 4px 0px #00000010;
+    border-radius: 10px;
+    border: 1px solid ${ANTD_GRAY[4]};
+    padding: ${(props) => (props.$isCompact ? '0 4px' : '4px')};
+    margin: ${(props) => (props.$isCompact ? '2px 4px 2px 4px' : '4px')};
+
+    ${(props) =>
+        props.isDisabled
+            ? `background: ${ANTD_GRAY[4]};`
+            : `
+            :hover {
+                cursor: pointer;
+                background: ${ANTD_GRAY[2]};
+            }
+    `}
+`;
diff --git a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteEntity.tsx b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteEntity.tsx
new file mode 100644
index 00000000000000..4443980d425ed1
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteEntity.tsx
@@ -0,0 +1,126 @@
+import { Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components/macro';
+import { Entity, EntityType } from '../../../types.generated';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { getAutoCompleteEntityText } from './utils';
+import { ANTD_GRAY_V2 } from '../../entity/shared/constants';
+import AutoCompleteEntityIcon from './AutoCompleteEntityIcon';
+import { SuggestionText } from './styledComponents';
+import AutoCompletePlatformNames from './AutoCompletePlatformNames';
+import { getPlatformName } from '../../entity/shared/utils';
+import { getParentEntities } from '../filters/utils';
+import ParentEntities from '../filters/ParentEntities';
+
+const AutoCompleteEntityWrapper = styled.div`
+    display: flex;
+    justify-content: space-between;
+    width: 100%;
+    align-items: center;
+`;
+
+const IconsContainer = styled.div`
+    display: flex;
+    gap: 4px;
+`;
+
+const ContentWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    overflow: hidden;
+`;
+
+const Subtype = styled.span`
+    color: ${ANTD_GRAY_V2[8]};
+    border: 1px solid ${ANTD_GRAY_V2[6]};
+    border-radius: 16px;
+    padding: 4px 8px;
+    line-height: 12px;
+    font-size: 12px;
+    margin-right: 8px;
+`;
+
+const ItemHeader = styled.div`
+    display: flex;
+    align-items: center;
+    margin-bottom: 3px;
+    gap: 8px;
+`;
+
+const Divider = styled.div`
+    border-right: 1px solid ${ANTD_GRAY_V2[6]};
+    height: 12px;
+`;
+
+interface Props {
+    query: string;
+    entity: Entity;
+    siblings?: Array<Entity>;
+    hasParentTooltip: boolean;
+}
+
+// TODO: Migrate from using parent entities to using BrowsePathsV2 to mimic search card
+export default function AutoCompleteEntity({ query, entity, siblings, hasParentTooltip }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const genericEntityProps = entityRegistry.getGenericEntityProperties(entity.type, entity);
+    const displayName = entityRegistry.getDisplayName(entity.type, entity);
+    const { matchedText, unmatchedText } = getAutoCompleteEntityText(displayName, query);
+    const entities = siblings?.length ? siblings : [entity];
+    const platformsToShow =
+        /* Only show sibling platforms if there are > 0 explicitly included siblings */
+        siblings?.length
+            ? genericEntityProps?.siblingPlatforms
+            : (genericEntityProps?.platform && [genericEntityProps?.platform]) || undefined;
+    const platforms =
+        platformsToShow
+            ?.map(
+                (platform) =>
+                    getPlatformName(entityRegistry.getGenericEntityProperties(EntityType.DataPlatform, platform)) || '',
+            )
+            .filter(Boolean) ?? [];
+
+    const parentContainers = genericEntityProps?.parentContainers?.containers || [];
+    // Need to reverse parentContainers since it returns direct parent first.
+    const orderedParentContainers = [...parentContainers].reverse();
+
+    const subtype = genericEntityProps?.subTypes?.typeNames?.[0];
+
+    // Parent entities are either a) containers or b) entity-type specific parents (glossary nodes, domains, etc)
+    const parentEntities =
+        (orderedParentContainers?.length && orderedParentContainers) || getParentEntities(entity) || [];
+
+    const showPlatforms = !!platforms.length;
+    const showPlatformDivider = !!platforms.length && !!parentContainers.length;
+    const showParentEntities = !!parentEntities?.length;
+    const showHeader = showPlatforms || showParentEntities;
+
+    return (
+        <AutoCompleteEntityWrapper data-testid={`auto-complete-entity-name-${displayName}`}>
+            <ContentWrapper>
+                <SuggestionText>
+                    {showHeader && (
+                        <ItemHeader>
+                            <IconsContainer>
+                                {entities.map((ent) => (
+                                    <AutoCompleteEntityIcon key={ent.urn} entity={ent} />
+                                ))}
+                            </IconsContainer>
+                            {showPlatforms && <AutoCompletePlatformNames platforms={platforms} />}
+                            {showPlatformDivider && <Divider />}
+                            {showParentEntities && <ParentEntities parentEntities={parentEntities} />}
+                        </ItemHeader>
+                    )}
+                    <Typography.Text
+                        ellipsis={
+                            hasParentTooltip ? {} : { tooltip: { title: displayName, color: 'rgba(0, 0, 0, 0.9)' } }
+                        }
+                    >
+                        <Typography.Text strong>{matchedText}</Typography.Text>
+                        {unmatchedText}
+                    </Typography.Text>
+                </SuggestionText>
+            </ContentWrapper>
+            {subtype && <Subtype>{subtype.toLocaleLowerCase()}</Subtype>}
+        </AutoCompleteEntityWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteEntityIcon.tsx b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteEntityIcon.tsx
new file mode 100644
index 00000000000000..da37106a9d864f
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteEntityIcon.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Image } from 'antd';
+import { Entity } from '../../../types.generated';
+import { getPlatformName } from '../../entity/shared/utils';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { IconStyleType } from '../../entity/Entity';
+
+const PreviewImage = styled(Image)`
+    height: 16px;
+    width: 16px;
+    object-fit: contain;
+    background-color: transparent;
+`;
+
+type Props = {
+    entity: Entity;
+};
+
+const AutoCompleteEntityIcon = ({ entity }: Props) => {
+    const entityRegistry = useEntityRegistry();
+
+    const genericEntityProps = entityRegistry.getGenericEntityProperties(entity.type, entity);
+    const platformLogoUrl = genericEntityProps?.platform?.properties?.logoUrl;
+    const platformName = getPlatformName(genericEntityProps);
+    return (
+        (platformLogoUrl && <PreviewImage preview={false} src={platformLogoUrl} alt={platformName || ''} />) ||
+        entityRegistry.getIcon(entity.type, 12, IconStyleType.ACCENT)
+    );
+};
+
+export default AutoCompleteEntityIcon;
diff --git a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteItem.tsx b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteItem.tsx
new file mode 100644
index 00000000000000..6486f6df195560
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteItem.tsx
@@ -0,0 +1,59 @@
+import { Tooltip } from '@components';
+import React from 'react';
+import styled from 'styled-components/macro';
+import { CorpUser, Entity, EntityType, Tag } from '../../../types.generated';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import AutoCompleteEntity from './AutoCompleteEntity';
+import AutoCompleteTag from './AutoCompleteTag';
+import AutoCompleteTooltipContent from './AutoCompleteTooltipContent';
+import AutoCompleteUser from './AutoCompleteUser';
+import { getShouldDisplayTooltip } from './utils';
+
+export const SuggestionContainer = styled.div`
+    display: flex;
+    justify-content: left;
+    align-items: center;
+`;
+
+interface Props {
+    query: string;
+    entity: Entity;
+    siblings?: Array<Entity>;
+}
+
+export default function AutoCompleteItem({ query, entity, siblings }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const displayTooltip = getShouldDisplayTooltip(entity, entityRegistry);
+    let componentToRender: React.ReactNode = null;
+
+    switch (entity.type) {
+        case EntityType.CorpUser:
+            componentToRender = <AutoCompleteUser query={query} user={entity as CorpUser} />;
+            break;
+        case EntityType.Tag:
+            componentToRender = <AutoCompleteTag tag={entity as Tag} />;
+            break;
+        default:
+            componentToRender = (
+                <AutoCompleteEntity
+                    query={query}
+                    entity={entity}
+                    siblings={siblings}
+                    hasParentTooltip={displayTooltip}
+                />
+            );
+            break;
+    }
+
+    return (
+        <Tooltip
+            overlayStyle={{ maxWidth: 750, visibility: displayTooltip ? 'visible' : 'hidden' }}
+            style={{ width: '100%' }}
+            title={<AutoCompleteTooltipContent entity={entity} />}
+            placement="top"
+            color="rgba(0, 0, 0, 0.9)"
+        >
+            <SuggestionContainer data-testid="auto-complete-option">{componentToRender}</SuggestionContainer>
+        </Tooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompletePlatformNames.tsx b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompletePlatformNames.tsx
new file mode 100644
index 00000000000000..61fe6bcae71d0b
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompletePlatformNames.tsx
@@ -0,0 +1,22 @@
+import { Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { ANTD_GRAY_V2 } from '../../entity/shared/constants';
+
+const PlatformText = styled(Typography.Text)`
+    font-size: 12px;
+    line-height: 20px;
+    font-weight: 500;
+    color: ${ANTD_GRAY_V2[8]};
+    white-space: nowrap;
+`;
+
+type Props = {
+    platforms: Array<string>;
+};
+
+const AutoCompletePlatformNames = ({ platforms }: Props) => {
+    return <PlatformText>{platforms.join(' & ')}</PlatformText>;
+};
+
+export default AutoCompletePlatformNames;
diff --git a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteTag.tsx b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteTag.tsx
new file mode 100644
index 00000000000000..b58a58c7ff671f
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteTag.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import { EntityType, Tag } from '../../../types.generated';
+import { StyledTag } from '../../entityV2/shared/components/styled/StyledTag';
+import { useEntityRegistry } from '../../useEntityRegistry';
+
+interface Props {
+    tag: Tag;
+}
+
+export default function AutoCompleteTag({ tag }: Props) {
+    const entityRegistry = useEntityRegistry();
+
+    return (
+        <StyledTag $colorHash={tag?.urn} $color={tag?.properties?.colorHex}>
+            {entityRegistry.getDisplayName(EntityType.Tag, tag)}
+        </StyledTag>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteTooltipContent.tsx b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteTooltipContent.tsx
new file mode 100644
index 00000000000000..dfe32c7805a9bf
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteTooltipContent.tsx
@@ -0,0 +1,61 @@
+import { FolderOpenOutlined } from '@ant-design/icons';
+import React from 'react';
+import styled from 'styled-components';
+import { Dataset, Entity, EntityType } from '../../../types.generated';
+import { DatasetStatsSummary } from '../../entity/dataset/shared/DatasetStatsSummary';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { ArrowWrapper } from './ParentContainers';
+
+const ContentWrapper = styled.div`
+    font-size: 12px;
+    color: white;
+`;
+
+const Container = styled.span`
+    margin-left: 4px;
+`;
+
+const EntityName = styled.div`
+    font-size: 14px;
+`;
+
+interface Props {
+    entity: Entity;
+}
+
+export default function AutoCompleteTooltipContent({ entity }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const genericEntityProps = entityRegistry.getGenericEntityProperties(entity.type, entity);
+    const displayName = entityRegistry.getDisplayName(entity.type, entity);
+    const parentContainers = genericEntityProps?.parentContainers?.containers || [];
+
+    return (
+        <ContentWrapper>
+            {parentContainers.length > 0 && (
+                <>
+                    {[...parentContainers].reverse().map((container, index) => (
+                        <>
+                            <FolderOpenOutlined />
+                            <Container>{entityRegistry.getDisplayName(EntityType.Container, container)}</Container>
+                            {index !== parentContainers.length - 1 && <ArrowWrapper>{'>'}</ArrowWrapper>}
+                        </>
+                    ))}
+                </>
+            )}
+            <EntityName>{displayName}</EntityName>
+            {entity.type === EntityType.Dataset && (
+                <DatasetStatsSummary
+                    rowCount={(entity as any).lastProfile?.length && (entity as any).lastProfile[0].rowCount}
+                    columnCount={(entity as any).lastProfile?.length && (entity as any).lastProfile[0].columnCount}
+                    sizeInBytes={(entity as any).lastProfile?.length && (entity as any).lastProfile[0].sizeInBytes}
+                    lastUpdatedMs={
+                        (entity as any).lastOperation?.length && (entity as any).lastOperation[0].lastUpdatedTimestamp
+                    }
+                    queryCountLast30Days={(entity as Dataset).statsSummary?.queryCountLast30Days}
+                    uniqueUserCountLast30Days={(entity as Dataset).statsSummary?.uniqueUserCountLast30Days}
+                    mode="tooltip-content"
+                />
+            )}
+        </ContentWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteUser.tsx b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteUser.tsx
new file mode 100644
index 00000000000000..53b4d53ef46d4c
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteUser.tsx
@@ -0,0 +1,36 @@
+import { Typography } from 'antd';
+import React from 'react';
+import { CorpUser, EntityType } from '../../../types.generated';
+import { CustomAvatar } from '../../shared/avatar';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { getAutoCompleteEntityText } from './utils';
+import { SuggestionText } from './styledComponents';
+
+interface Props {
+    query: string;
+    user: CorpUser;
+}
+
+export default function AutoCompleteUser({ query, user }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const displayName = entityRegistry.getDisplayName(EntityType.CorpUser, user);
+    const { matchedText, unmatchedText } = getAutoCompleteEntityText(displayName, query);
+
+    return (
+        <>
+            <CustomAvatar
+                size={20}
+                name={displayName}
+                photoUrl={user.editableProperties?.pictureLink || undefined}
+                useDefaultAvatar={false}
+                style={{
+                    marginRight: 0,
+                }}
+            />
+            <SuggestionText>
+                <Typography.Text strong>{matchedText}</Typography.Text>
+                {unmatchedText}
+            </SuggestionText>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/autoComplete/ParentContainers.tsx b/datahub-web-react/src/app/searchV2/autoComplete/ParentContainers.tsx
new file mode 100644
index 00000000000000..98a4f5aa214bb9
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/autoComplete/ParentContainers.tsx
@@ -0,0 +1,58 @@
+import { FolderOpenOutlined } from '@ant-design/icons';
+import { Typography } from 'antd';
+import React, { Fragment } from 'react';
+import styled from 'styled-components/macro';
+import { Container, EntityType } from '../../../types.generated';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { ANTD_GRAY_V2 } from '../../entity/shared/constants';
+
+const NUM_VISIBLE_CONTAINERS = 2;
+
+const ParentContainersWrapper = styled.div`
+    font-size: 12px;
+    color: ${ANTD_GRAY_V2[8]};
+    display: flex;
+    align-items: center;
+`;
+
+const ParentContainer = styled(Typography.Text)`
+    color: ${ANTD_GRAY_V2[8]};
+    margin-left: 4px;
+    font-weight: 500;
+`;
+
+export const ArrowWrapper = styled.span`
+    margin: 0 3px;
+`;
+
+interface Props {
+    parentContainers: Container[];
+}
+
+export default function ParentContainers({ parentContainers }: Props) {
+    const entityRegistry = useEntityRegistry();
+
+    const visibleIndex = Math.max(parentContainers.length - NUM_VISIBLE_CONTAINERS, 0);
+    const visibleContainers = parentContainers.slice(visibleIndex);
+    const hiddenContainers = parentContainers.slice(0, visibleIndex);
+
+    return (
+        <ParentContainersWrapper>
+            {hiddenContainers.map((container) => (
+                <Fragment key={container.urn}>
+                    <FolderOpenOutlined />
+                    <ArrowWrapper>{'>'}</ArrowWrapper>
+                </Fragment>
+            ))}
+            {visibleContainers.map((container, index) => (
+                <Fragment key={container.urn}>
+                    <FolderOpenOutlined />
+                    <ParentContainer ellipsis={{ tooltip: '' }}>
+                        {entityRegistry.getDisplayName(EntityType.Container, container)}
+                    </ParentContainer>
+                    {index !== visibleContainers.length - 1 && <ArrowWrapper>{'>'}</ArrowWrapper>}
+                </Fragment>
+            ))}
+        </ParentContainersWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/autoComplete/RecommendedOption.tsx b/datahub-web-react/src/app/searchV2/autoComplete/RecommendedOption.tsx
new file mode 100644
index 00000000000000..f4c31b18c99b27
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/autoComplete/RecommendedOption.tsx
@@ -0,0 +1,29 @@
+import { SearchOutlined } from '@ant-design/icons';
+import React from 'react';
+import styled from 'styled-components/macro';
+import { SuggestionText } from './styledComponents';
+
+const TextWrapper = styled.span``;
+
+const RecommendedOptionWrapper = styled(SuggestionText)`
+    margin-left: 0;
+    display: flex;
+    align-items: center;
+
+    ${TextWrapper} {
+        margin-left: 8px;
+    }
+`;
+
+interface Props {
+    text: string;
+}
+
+export default function RecommendedOption({ text }: Props) {
+    return (
+        <RecommendedOptionWrapper>
+            <SearchOutlined />
+            <TextWrapper>{text}</TextWrapper>
+        </RecommendedOptionWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/autoComplete/SectionHeader.tsx b/datahub-web-react/src/app/searchV2/autoComplete/SectionHeader.tsx
new file mode 100644
index 00000000000000..2f20f130bfdc3f
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/autoComplete/SectionHeader.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { EntityType } from '../../../types.generated';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import { useEntityRegistry } from '../../useEntityRegistry';
+
+export const EntityTypeLabel = styled.div<{ showBorder?: boolean }>`
+    font-size: 14px;
+    color: ${ANTD_GRAY[8]};
+    ${(props) =>
+        props.showBorder &&
+        `
+        border-bottom: 1px solid ${ANTD_GRAY[4]};
+        padding-bottom: 2px;
+        `}
+`;
+
+const SubtypesDescription = styled.span`
+    font-size: 12px;
+    font-weight: 400;
+    margin-left: 8px;
+    color: ${ANTD_GRAY[7]};
+`;
+
+interface Props {
+    entityType: EntityType;
+}
+
+export default function SectionHeader({ entityType }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const isDatasetType = entityType === EntityType.Dataset;
+
+    return (
+        <EntityTypeLabel showBorder>
+            {entityRegistry.getCollectionName(entityType)}
+            {isDatasetType && <SubtypesDescription>tables, topics, views, and more</SubtypesDescription>}
+        </EntityTypeLabel>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/autoComplete/__tests__/utils.test.ts b/datahub-web-react/src/app/searchV2/autoComplete/__tests__/utils.test.ts
new file mode 100644
index 00000000000000..05ac92bd84c2a6
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/autoComplete/__tests__/utils.test.ts
@@ -0,0 +1,27 @@
+import { getAutoCompleteEntityText } from '../utils';
+
+describe('utils tests', () => {
+    it('should return matched and unmatched text when the name begins with the query', () => {
+        const { matchedText, unmatchedText } = getAutoCompleteEntityText('testing123', 'test');
+        expect(matchedText).toBe('test');
+        expect(unmatchedText).toBe('ing123');
+    });
+
+    it('should return matched and unmatched text when the name begins with the query regardless of casing', () => {
+        const { matchedText, unmatchedText } = getAutoCompleteEntityText('TESTING123', 'test');
+        expect(matchedText).toBe('TEST');
+        expect(unmatchedText).toBe('ING123');
+    });
+
+    it('should return matched and unmatched text when the name is the same as the query', () => {
+        const { matchedText, unmatchedText } = getAutoCompleteEntityText('testing123', 'testing123');
+        expect(matchedText).toBe('testing123');
+        expect(unmatchedText).toBe('');
+    });
+
+    it('should return matched and unmatched text when there is no overlap', () => {
+        const { matchedText, unmatchedText } = getAutoCompleteEntityText('testing123', 'query');
+        expect(matchedText).toBe('');
+        expect(unmatchedText).toBe('testing123');
+    });
+});
diff --git a/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/QuickFilter.tsx b/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/QuickFilter.tsx
new file mode 100644
index 00000000000000..24381bfd1c01db
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/QuickFilter.tsx
@@ -0,0 +1,99 @@
+import { Button } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { useHistory } from 'react-router';
+import { useQuickFiltersContext } from '../../../../providers/QuickFiltersContext';
+import { QuickFilter as QuickFilterType } from '../../../../types.generated';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { getQuickFilterDetails } from './utils';
+import { ANTD_GRAY } from '../../../entity/shared/constants';
+import analytics, { Event, EventType } from '../../../analytics';
+import { navigateToSearchUrl } from '../../utils/navigateToSearchUrl';
+
+const QuickFilterWrapper = styled(Button)<{ selected: boolean }>`
+    border: 1px solid ${ANTD_GRAY[4]};
+    border-radius: 16px;
+    box-shadow: none;
+    font-weight: 400;
+    color: black;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    padding: 2px 10px;
+    font-size: 14px;
+    margin: 4px;
+
+    &:hover {
+        color: black;
+    }
+
+    ${(props) =>
+        props.selected &&
+        `
+        border: 1px solid ${props.theme.styles['primary-color-dark']};
+        background-color: ${props.theme.styles['primary-color-light']};
+        &:hover {
+            background-color: ${props.theme.styles['primary-color-light']};
+        }
+    `}
+`;
+
+const LabelWrapper = styled.span`
+    margin-left: 4px;
+`;
+
+interface Props {
+    quickFilter: QuickFilterType;
+    searchQuery?: string;
+    setIsDropdownVisible: React.Dispatch<React.SetStateAction<boolean>>;
+}
+
+export default function QuickFilter({ quickFilter, searchQuery, setIsDropdownVisible }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const history = useHistory();
+    const { selectedQuickFilter, setSelectedQuickFilter } = useQuickFiltersContext();
+
+    const isSelected = selectedQuickFilter?.value === quickFilter.value;
+    const { label, icon } = getQuickFilterDetails(quickFilter, entityRegistry);
+
+    function emitTrackingEvent(isSelecting: boolean) {
+        analytics.event({
+            type: isSelecting ? EventType.SelectQuickFilterEvent : EventType.DeselectQuickFilterEvent,
+            quickFilterType: quickFilter.field,
+            quickFilterValue: quickFilter.value,
+        } as Event);
+    }
+
+    function handleClick() {
+        if (isSelected) {
+            setSelectedQuickFilter(null);
+            emitTrackingEvent(false);
+        } else {
+            setSelectedQuickFilter(quickFilter);
+            emitTrackingEvent(true);
+
+            navigateToSearchUrl({
+                query: searchQuery || '*',
+                filters: [
+                    {
+                        field: quickFilter.field,
+                        values: [quickFilter.value],
+                    },
+                ],
+                history,
+            });
+            setIsDropdownVisible(false);
+        }
+    }
+
+    return (
+        <QuickFilterWrapper
+            onClick={handleClick}
+            selected={isSelected}
+            data-testid={`quick-filter-${quickFilter.value}`}
+        >
+            {icon}
+            <LabelWrapper>{label}</LabelWrapper>
+        </QuickFilterWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/QuickFilters.tsx b/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/QuickFilters.tsx
new file mode 100644
index 00000000000000..d67e248459974a
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/QuickFilters.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import styled from 'styled-components';
+import { useQuickFiltersContext } from '../../../../providers/QuickFiltersContext';
+import QuickFilter from './QuickFilter';
+
+const QuickFiltersWrapper = styled.div`
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-flow: wrap;
+`;
+
+interface Props {
+    searchQuery?: string;
+    setIsDropdownVisible: React.Dispatch<React.SetStateAction<boolean>>;
+}
+export default function QuickFilters({ searchQuery, setIsDropdownVisible }: Props) {
+    const { quickFilters } = useQuickFiltersContext();
+
+    return (
+        <QuickFiltersWrapper>
+            {quickFilters?.map((quickFilter) => (
+                <QuickFilter
+                    key={quickFilter.value}
+                    quickFilter={quickFilter}
+                    searchQuery={searchQuery}
+                    setIsDropdownVisible={setIsDropdownVisible}
+                />
+            ))}
+        </QuickFiltersWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/utils.tsx b/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/utils.tsx
new file mode 100644
index 00000000000000..928db12d266fce
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/autoComplete/quickFilters/utils.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import styled from 'styled-components';
+import { EntityType, QuickFilter } from '../../../../types.generated';
+import { IconStyleType } from '../../../entity/Entity';
+import { EntityRegistry } from '../../../../entityRegistryContext';
+
+const StyledIcon = styled.img`
+    width: 14px;
+    height: 14px;
+`;
+
+export enum QuickFilterField {
+    Platform = 'platform',
+    Entity = '_entityType',
+}
+
+export function getQuickFilterDetails(quickFilter: QuickFilter, entityRegistry: EntityRegistry) {
+    let label = '';
+    let icon: JSX.Element | null = null;
+    if (quickFilter.field === QuickFilterField.Platform) {
+        label = entityRegistry.getDisplayName(EntityType.DataPlatform, quickFilter.entity);
+        const genericProps = entityRegistry.getGenericEntityProperties(EntityType.DataPlatform, quickFilter.entity);
+        const logoUrl = genericProps?.platform?.properties?.logoUrl || '';
+        if (logoUrl) {
+            icon = <StyledIcon alt="icon" src={logoUrl} />;
+        } else {
+            icon = entityRegistry.getIcon(EntityType.DataPlatform, 14, IconStyleType.ACCENT, 'black');
+        }
+    } else if (quickFilter.field === QuickFilterField.Entity) {
+        label = entityRegistry.getCollectionName(quickFilter.value as EntityType);
+        icon = entityRegistry.getIcon(quickFilter.value as EntityType, 14, IconStyleType.ACCENT, 'black');
+    }
+
+    return { label, icon };
+}
diff --git a/datahub-web-react/src/app/searchV2/autoComplete/styledComponents.tsx b/datahub-web-react/src/app/searchV2/autoComplete/styledComponents.tsx
new file mode 100644
index 00000000000000..9e4b084ab3889b
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/autoComplete/styledComponents.tsx
@@ -0,0 +1,11 @@
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+
+export const SuggestionText = styled.div`
+    margin-left: 12px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+    color: ${ANTD_GRAY[9]};
+    font-size: 16px;
+    overflow: hidden;
+`;
diff --git a/datahub-web-react/src/app/searchV2/autoComplete/utils.ts b/datahub-web-react/src/app/searchV2/autoComplete/utils.ts
new file mode 100644
index 00000000000000..c85f7990fb5221
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/autoComplete/utils.ts
@@ -0,0 +1,19 @@
+import { Entity } from '../../../types.generated';
+import { EntityRegistry } from '../../../entityRegistryContext';
+
+export function getAutoCompleteEntityText(displayName: string, query: string) {
+    const isPrefixMatch = displayName.toLowerCase().startsWith(query.toLowerCase());
+    const matchedText = isPrefixMatch ? displayName.substring(0, query.length) : '';
+    const unmatchedText = isPrefixMatch ? displayName.substring(query.length, displayName.length) : displayName;
+
+    return { matchedText, unmatchedText };
+}
+
+export function getShouldDisplayTooltip(entity: Entity, entityRegistry: EntityRegistry) {
+    const hasDatasetStats = (entity as any).lastProfile?.length > 0 || (entity as any).statsSummary?.length > 0;
+    const genericEntityProps = entityRegistry.getGenericEntityProperties(entity.type, entity);
+    const parentContainers = genericEntityProps?.parentContainers?.containers;
+    const hasMoreThanTwoContainers = parentContainers && parentContainers.length > 2;
+
+    return hasDatasetStats || !!hasMoreThanTwoContainers;
+}
diff --git a/datahub-web-react/src/app/searchV2/context/constants.ts b/datahub-web-react/src/app/searchV2/context/constants.ts
new file mode 100644
index 00000000000000..fd873040b7f7c5
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/context/constants.ts
@@ -0,0 +1,55 @@
+import { SortOrder } from '../../../types.generated';
+
+export const RELEVANCE = 'relevance';
+export const ENTITY_NAME_FIELD = '_entityName';
+export const LAST_MODIFIED_TIME_FIELD = 'lastModifiedAt';
+
+export const DEFAULT_SORT_OPTION = RELEVANCE;
+
+export const SORT_OPTIONS = {
+    [RELEVANCE]: { label: 'Relevance (Default)', field: RELEVANCE, sortOrder: SortOrder.Descending },
+    [`${ENTITY_NAME_FIELD}_${SortOrder.Ascending}`]: {
+        label: 'Name A to Z',
+        field: ENTITY_NAME_FIELD,
+        sortOrder: SortOrder.Ascending,
+    },
+    [`${ENTITY_NAME_FIELD}_${SortOrder.Descending}`]: {
+        label: 'Name Z to A',
+        field: ENTITY_NAME_FIELD,
+        sortOrder: SortOrder.Descending,
+    },
+    [`${LAST_MODIFIED_TIME_FIELD}_${SortOrder.Descending}`]: {
+        label: 'Last Modified Time (In Source)',
+        field: LAST_MODIFIED_TIME_FIELD,
+        sortOrder: SortOrder.Descending,
+    },
+};
+
+// Extensions
+export const ROW_COUNT_FIELD = 'rowCountFeature';
+export const SIZE_IN_BYTES_FIELD = 'sizeInBytesFeature';
+export const QUERY_COUNT = 'queryCountLast30DaysFeature';
+export const UPDATE_COUNT = 'writeCountLast30DaysFeature';
+
+export const DATASET_FEATURES_SORT_OPTIONS = {
+    [`${ROW_COUNT_FIELD}_${SortOrder.Descending}`]: {
+        label: 'Table Row Count',
+        field: ROW_COUNT_FIELD,
+        sortOrder: SortOrder.Descending,
+    },
+    [`${SIZE_IN_BYTES_FIELD}_${SortOrder.Descending}`]: {
+        label: 'Table Size (Bytes)',
+        field: SIZE_IN_BYTES_FIELD,
+        sortOrder: SortOrder.Descending,
+    },
+    [`${QUERY_COUNT}_${SortOrder.Descending}`]: {
+        label: 'Table Query Count (Last 30 Days)',
+        field: QUERY_COUNT,
+        sortOrder: SortOrder.Descending,
+    },
+    [`${UPDATE_COUNT}_${SortOrder.Descending}`]: {
+        label: 'Table Update Count (Last 30 Days)',
+        field: UPDATE_COUNT,
+        sortOrder: SortOrder.Descending,
+    },
+};
diff --git a/datahub-web-react/src/app/searchV2/filters/ActiveFilter.tsx b/datahub-web-react/src/app/searchV2/filters/ActiveFilter.tsx
new file mode 100644
index 00000000000000..29789f872e51d3
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/ActiveFilter.tsx
@@ -0,0 +1,103 @@
+import { CloseCircleOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { FacetFilterInput, FacetMetadata } from '../../../types.generated';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { getFilterEntity, getFilterIconAndLabel, getNewFilters } from './utils';
+import useGetBrowseV2LabelOverride from './useGetBrowseV2LabelOverride';
+import { useFilterRendererRegistry } from './render/useFilterRenderer';
+import { IconSpacer, Label } from './styledComponents';
+
+const ActiveFilterWrapper = styled.div`
+    border: 1px solid ${ANTD_GRAY[5]};
+    border-radius: 4px;
+    padding: 2px 8px;
+    display: flex;
+    align-items: center;
+    font-size: 14px;
+    height: 24px;
+    margin: 8px 8px 0 0;
+`;
+
+const StyledButton = styled(Button)`
+    border: none;
+    box-shadow: none;
+    padding: 0;
+    margin-left: 6px;
+    height: 16px;
+    width: 11px;
+`;
+
+interface ActiveFilterProps {
+    filterFacet: FacetFilterInput;
+    filterValue: string;
+    availableFilters: FacetMetadata[] | null;
+    activeFilters: FacetFilterInput[];
+    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
+}
+
+function ActiveFilter({
+    filterFacet,
+    filterValue,
+    availableFilters,
+    activeFilters,
+    onChangeFilters,
+}: ActiveFilterProps) {
+    const entityRegistry = useEntityRegistry();
+    const filterEntity = getFilterEntity(filterFacet.field, filterValue, availableFilters);
+    const filterLabelOverride = useGetBrowseV2LabelOverride(filterFacet.field, filterValue, entityRegistry);
+    const filterRenderer = useFilterRendererRegistry();
+
+    const { icon, label } = !filterRenderer.hasRenderer(filterFacet.field)
+        ? getFilterIconAndLabel(filterFacet.field, filterValue, entityRegistry, filterEntity, 12, filterLabelOverride)
+        : {
+              icon: filterRenderer.getIcon(filterFacet.field),
+              label: filterRenderer.getValueLabel(filterFacet.field, filterValue),
+          };
+
+    function removeFilter() {
+        const newFilterValues = filterFacet.values?.filter((value) => value !== filterValue) || [];
+        onChangeFilters(getNewFilters(filterFacet.field, activeFilters, newFilterValues));
+    }
+
+    return (
+        <ActiveFilterWrapper data-testid={`active-filter-${label}`}>
+            {icon}
+            {icon && <IconSpacer />}
+            <Label ellipsis={{ tooltip: label }} style={{ maxWidth: 150 }}>
+                {label}
+            </Label>
+            <StyledButton
+                icon={<CloseCircleOutlined />}
+                onClick={removeFilter}
+                data-testid={`remove-filter-${label}`}
+            />
+        </ActiveFilterWrapper>
+    );
+}
+
+interface Props {
+    filter: FacetFilterInput;
+    availableFilters: FacetMetadata[] | null;
+    activeFilters: FacetFilterInput[];
+    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
+}
+
+export default function ActiveFilterContainer({ filter, availableFilters, activeFilters, onChangeFilters }: Props) {
+    return (
+        <>
+            {filter.values?.map((value) => (
+                <ActiveFilter
+                    key={value}
+                    filterFacet={filter}
+                    filterValue={value}
+                    availableFilters={availableFilters}
+                    activeFilters={activeFilters}
+                    onChangeFilters={onChangeFilters}
+                />
+            ))}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/AddFilterDropdown.tsx b/datahub-web-react/src/app/searchV2/filters/AddFilterDropdown.tsx
new file mode 100644
index 00000000000000..af856f5dde42b3
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/AddFilterDropdown.tsx
@@ -0,0 +1,160 @@
+/* eslint-disable import/no-cycle */
+import { PlusOutlined } from '@ant-design/icons';
+import { Button, Dropdown, Menu } from 'antd';
+import { Popover } from '@components';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { IconStyleType } from '../../entity/Entity';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { DEFAULT_FILTER_FIELDS } from './field/fields';
+import { FieldType, FilterField, FilterPredicate } from './types';
+import { getDefaultFieldOperatorType } from './value/utils';
+import ValueMenu from './value/ValueMenu';
+
+const StyledPlusOutlined = styled(PlusOutlined)`
+    && {
+        font-size: 12px;
+    }
+`;
+
+const FieldMenu = styled(Menu)`
+    max-height: 400px;
+    overflow: auto;
+    border-radius: 8px;
+
+    &&& {
+        .ant-dropdown-menu-item {
+            border-radius: 8px;
+            margin: 4px 8px;
+        }
+
+        .ant-dropdown-menu-submenu-expand-icon {
+            display: none;
+        }
+    }
+`;
+
+const ValueMenuWrapper = styled.div``;
+
+const Icon = styled.div`
+    margin-right: 8px;
+
+    && {
+        color: ${ANTD_GRAY[7]};
+    }
+`;
+
+const Text = styled.div`
+    font-size: 14px;
+`;
+
+const Option = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    padding: 2px 0px;
+`;
+
+const AddFilterButton = styled(Button)`
+    margin: 0px;
+    padding: 4px;
+    width: fit-content;
+`;
+
+const overlayStyle = { borderRadius: 8, overflow: 'hidden', marginLeft: 12 };
+
+interface Props {
+    fields?: FilterField[];
+    onAddFilter: (predicate: FilterPredicate) => void;
+    includeCount?: boolean;
+}
+
+export default function AddFilterDropdown({ fields = DEFAULT_FILTER_FIELDS, onAddFilter, includeCount }: Props) {
+    const [dropdownOpen, setDropdownOpen] = useState(false);
+
+    const items = fields.map((field) => {
+        return {
+            key: field.field,
+            label: (
+                <FilterPopover
+                    field={field}
+                    onAddFilter={onAddFilter}
+                    setDropdownOpen={setDropdownOpen}
+                    includeCount={includeCount}
+                />
+            ),
+        };
+    });
+
+    return (
+        <Dropdown
+            open={dropdownOpen}
+            onOpenChange={setDropdownOpen}
+            trigger={['click']}
+            menu={{ items }}
+            dropdownRender={(menu) => <FieldMenu>{menu}</FieldMenu>}
+        >
+            <AddFilterButton type="text" icon={<StyledPlusOutlined />}>
+                Add filter
+            </AddFilterButton>
+        </Dropdown>
+    );
+}
+
+interface PopoverProps {
+    field: FilterField;
+    onAddFilter: (predicate: FilterPredicate) => void;
+    setDropdownOpen: (open: boolean) => void;
+    includeCount?: boolean;
+}
+
+function FilterPopover({ field, onAddFilter, setDropdownOpen, includeCount }: PopoverProps) {
+    const [popoverOpen, setPopoverOpen] = useState(false);
+    const entityRegistry = useEntityRegistry();
+
+    const icon =
+        field.icon ||
+        (field.type === FieldType.ENTITY &&
+            field.entityTypes?.length &&
+            entityRegistry.getIcon(field.entityTypes[0], 12, IconStyleType.ACCENT, ANTD_GRAY[7]));
+
+    return (
+        <Popover
+            open={popoverOpen}
+            onOpenChange={setPopoverOpen}
+            showArrow={false}
+            placement="rightTop"
+            trigger="click"
+            overlayClassName="search-filter-popover"
+            overlayInnerStyle={overlayStyle}
+            content={
+                <ValueMenuWrapper onClick={(e) => e?.stopPropagation()}>
+                    <ValueMenu
+                        field={field}
+                        values={[]}
+                        defaultOptions={[]}
+                        includeCount={includeCount}
+                        onChangeValues={(values) => {
+                            onAddFilter({
+                                field,
+                                operator: getDefaultFieldOperatorType(field),
+                                values,
+                                defaultValueOptions: [],
+                            });
+                            setDropdownOpen(false);
+                            setPopoverOpen(false);
+                        }}
+                        type="default"
+                        visible
+                    />
+                </ValueMenuWrapper>
+            }
+        >
+            <Option onClick={(e) => e?.stopPropagation()}>
+                {icon && <Icon>{icon}</Icon>}
+                <Text>{field.displayName}</Text>
+            </Option>
+        </Popover>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/FilterOption.tsx b/datahub-web-react/src/app/searchV2/filters/FilterOption.tsx
new file mode 100644
index 00000000000000..9134c9d53c4de4
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/FilterOption.tsx
@@ -0,0 +1,218 @@
+import { CaretUpOutlined } from '@ant-design/icons';
+import { Button, Checkbox } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { Entity, EntityType } from '../../../types.generated';
+import { generateColor } from '../../entityV2/shared/components/styled/StyledTag';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import { SEARCH_COLORS } from '../../entityV2/shared/constants';
+import { formatNumber } from '../../shared/formatNumber';
+import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import {
+    DOMAINS_FILTER_NAME,
+    ENTITY_SUB_TYPE_FILTER_NAME,
+    MAX_COUNT_VAL,
+    TYPE_NAMES_FILTER_NAME,
+} from '../utils/constants';
+import ParentEntities from './ParentEntities';
+import { Label } from './styledComponents';
+import { FilterOptionType } from './types';
+import {
+    FilterEntityIcon,
+    getFilterIconAndLabel,
+    getParentEntities,
+    isAnyOptionSelected,
+    isFilterOptionSelected,
+} from './utils';
+
+const FilterOptionWrapper = styled.div<{ addPadding?: boolean }>`
+    display: flex;
+    align-items: center;
+    border-radius: 8px;
+    margin: 0px 4px;
+    label {
+        padding: 12px;
+        width: 100%;
+        height: 100%;
+        display: flex;
+        align-items: center;
+    }
+    ${(props) => props.addPadding && 'padding-left: 16px;'}
+
+    &:hover {
+        background-color: ${ANTD_GRAY[3]};
+    }
+`;
+
+const StyledCheckbox = styled(Checkbox)`
+    font-size: 14px;
+    .ant-checkbox-inner {
+        border-color: ${ANTD_GRAY[7]};
+    }
+    .ant-checkbox-checked {
+        .ant-checkbox-inner {
+            border-color: ${SEARCH_COLORS.TITLE_PURPLE};
+        }
+    }
+`;
+
+const CheckboxContent = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 8px;
+`;
+
+export const TagColor = styled.span<{ color: string; colorHash?: string | null }>`
+    height: 8px;
+    width: 8px;
+    border-radius: 50%;
+    background-color: ${(props) => (props.color ? props.color : generateColor.hex(props.colorHash))};
+    margin-right: 3px;
+`;
+
+const CountText = styled.span`
+    font-size: 12px;
+    margin-left: 6px;
+    color: ${ANTD_GRAY[8]};
+`;
+
+const LabelCountWrapper = styled.div`
+    display: flex;
+    align-items: baseline;
+`;
+
+const ArrowButton = styled(Button)<{ isOpen: boolean }>`
+    margin-left: 4px;
+    background-color: transparent;
+    height: 24px;
+
+    svg {
+        height: 12px;
+        width: 12px;
+    }
+
+    &:hover,
+    &:focus,
+    &:active {
+        background-color: transparent;
+    }
+
+    ${(props) =>
+        props.isOpen &&
+        `
+        transform: rotate(180deg);
+    `}
+`;
+
+const ParentWrapper = styled.div`
+    max-width: 220px;
+`;
+
+const LabelWrapper = styled.div`
+    line-height: normal;
+`;
+interface Props {
+    filterOption: FilterOptionType;
+    selectedFilterOptions: FilterOptionType[];
+    setSelectedFilterOptions: (filterValues: FilterOptionType[]) => void;
+    nestedOptions?: FilterOptionType[];
+    addPadding?: boolean;
+    includeCount?: boolean;
+}
+
+export default function FilterOption({
+    filterOption,
+    selectedFilterOptions,
+    setSelectedFilterOptions,
+    nestedOptions,
+    addPadding,
+    includeCount = true,
+}: Props) {
+    const [areChildrenVisible, setAreChildrenVisible] = useState(true);
+    const { field, value, count, entity } = filterOption;
+    const entityRegistry = useEntityRegistry();
+    const { icon, label } = getFilterIconAndLabel(
+        field,
+        value,
+        entityRegistry,
+        entity || null,
+        14,
+        filterOption.displayName,
+    );
+    const showParentEntityPath = field === DOMAINS_FILTER_NAME && entity?.type === EntityType.Domain;
+    const isSubTypeFilter = field === TYPE_NAMES_FILTER_NAME;
+    const parentEntities: Entity[] = getParentEntities(entity as Entity) || [];
+
+    const getCountText = () => {
+        // only entity type filters return 10,000 max aggs
+        return count === MAX_COUNT_VAL && field === ENTITY_SUB_TYPE_FILTER_NAME ? '10k+' : formatNumber(count);
+    };
+
+    function updateFilterValues() {
+        if (isFilterOptionSelected(selectedFilterOptions, value)) {
+            setSelectedFilterOptions(selectedFilterOptions.filter((option) => option.value !== value));
+        } else {
+            // if selecting parent filter, remove nested filter values
+            const filteredSelectedOptions = selectedFilterOptions.filter(
+                (o) => !nestedOptions?.some((nestedOption) => nestedOption.value === o.value),
+            );
+            setSelectedFilterOptions([...filteredSelectedOptions, filterOption]);
+        }
+    }
+
+    return (
+        <>
+            <FilterOptionWrapper addPadding={addPadding}>
+                <StyledCheckbox
+                    checked={isFilterOptionSelected(selectedFilterOptions, value)}
+                    // show indeterminate if a nested option is selected
+                    indeterminate={isAnyOptionSelected(
+                        selectedFilterOptions,
+                        nestedOptions?.map((o) => o.value),
+                    )}
+                    onClick={updateFilterValues}
+                    data-testid={`filter-option-${label}`}
+                >
+                    <CheckboxContent>
+                        <FilterEntityIcon field={field} entity={entity} icon={icon} />
+                        <LabelWrapper className="test-label">
+                            {!showParentEntityPath && parentEntities.length > 0 && (
+                                <ParentWrapper>
+                                    <ParentEntities parentEntities={parentEntities} />
+                                </ParentWrapper>
+                            )}
+                            <LabelCountWrapper>
+                                <Label ellipsis={{ tooltip: label }} style={{ maxWidth: 150 }}>
+                                    {isSubTypeFilter ? capitalizeFirstLetterOnly(label as string) : label}
+                                </Label>
+                                {includeCount && <CountText>{getCountText()}</CountText>}
+                                {nestedOptions && nestedOptions.length > 0 && (
+                                    <ArrowButton
+                                        icon={<CaretUpOutlined />}
+                                        type="text"
+                                        onClick={() => setAreChildrenVisible(!areChildrenVisible)}
+                                        isOpen={areChildrenVisible}
+                                    />
+                                )}
+                            </LabelCountWrapper>
+                        </LabelWrapper>
+                    </CheckboxContent>
+                </StyledCheckbox>
+            </FilterOptionWrapper>
+            {areChildrenVisible && (
+                <>
+                    {nestedOptions?.map((option) => (
+                        <FilterOption
+                            key={option.value}
+                            filterOption={option}
+                            selectedFilterOptions={selectedFilterOptions}
+                            setSelectedFilterOptions={setSelectedFilterOptions}
+                            addPadding
+                        />
+                    ))}
+                </>
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/MoreFilterOption.tsx b/datahub-web-react/src/app/searchV2/filters/MoreFilterOption.tsx
new file mode 100644
index 00000000000000..d5fa2cb71d4974
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/MoreFilterOption.tsx
@@ -0,0 +1,78 @@
+import { RightOutlined } from '@ant-design/icons';
+import React, { useRef } from 'react';
+import styled from 'styled-components';
+import { FacetFilterInput, FacetMetadata } from '../../../types.generated';
+import { IconWrapper } from './SearchFilterView';
+import { MoreFilterOptionLabel } from './styledComponents';
+import { FilterPredicate } from './types';
+import useSearchFilterDropdown from './useSearchFilterDropdown';
+import { getFilterDropdownIcon, useElementDimensions, useFilterDisplayName } from './utils';
+import ValueSelector from './value/ValueSelector';
+
+const IconNameWrapper = styled.span`
+    display: flex;
+    align-items: center;
+`;
+
+const StyledValueSelector = styled(ValueSelector)<{ width: number; height: number; isElementOutsideWindow: boolean }>`
+    position: absolute;
+    top: -${(props) => props.height}px;
+    ${(props) => (props.isElementOutsideWindow ? 'right' : 'left')}: ${(props) => props.width}px;
+`;
+
+const StyledRightOutlined = styled(RightOutlined)`
+    font-size: 12px;
+    height: 12px;
+`;
+
+interface Props {
+    filter: FacetMetadata;
+    activeFilters: FacetFilterInput[];
+    filterPredicates: FilterPredicate[];
+    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
+}
+
+export default function MoreFilterOption({ filter, filterPredicates, activeFilters, onChangeFilters }: Props) {
+    const { finalAggregations, updateFilters, numActiveFilters, manuallyUpdateFilters } = useSearchFilterDropdown({
+        filter,
+        activeFilters,
+        onChangeFilters,
+    });
+    const displayName = useFilterDisplayName(filter);
+    const filterIcon = getFilterDropdownIcon(filter.field);
+    const labelRef = useRef<HTMLDivElement>(null);
+    const elementDimensions = useElementDimensions(labelRef);
+
+    const onChangeFilterValues = (currentFilterPredicate: FilterPredicate, newValues) => {
+        if (currentFilterPredicate.values !== newValues) {
+            updateFilters(newValues);
+        }
+    };
+
+    const currentFilterPredicate = filterPredicates?.find((obj) =>
+        obj.field.field.includes(filter.field),
+    ) as FilterPredicate;
+
+    return (
+        <StyledValueSelector
+            field={currentFilterPredicate?.field}
+            values={currentFilterPredicate?.values}
+            defaultOptions={finalAggregations}
+            onChangeValues={(newValues) => onChangeFilterValues(currentFilterPredicate, newValues)}
+            manuallyUpdateFilters={manuallyUpdateFilters}
+            {...elementDimensions}
+        >
+            <MoreFilterOptionLabel
+                $isActive={!!numActiveFilters}
+                data-testid={`more-filter-${displayName?.replace(/\s/g, '-')}`}
+                ref={labelRef}
+            >
+                <IconNameWrapper>
+                    {filterIcon && <IconWrapper>{filterIcon}</IconWrapper>}
+                    {displayName} {numActiveFilters ? `(${numActiveFilters}) ` : ''}
+                </IconNameWrapper>
+                <StyledRightOutlined />
+            </MoreFilterOptionLabel>
+        </StyledValueSelector>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/MoreFilters.tsx b/datahub-web-react/src/app/searchV2/filters/MoreFilters.tsx
new file mode 100644
index 00000000000000..86cbfeb366b5d2
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/MoreFilters.tsx
@@ -0,0 +1,82 @@
+import { CaretDownFilled } from '@ant-design/icons';
+import { Dropdown } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { FacetFilterInput, FacetMetadata } from '../../../types.generated';
+import MoreFilterOption from './MoreFilterOption';
+import { getNumActiveFiltersForGroupOfFilters } from './utils';
+import { SearchFilterLabel } from './styledComponents';
+import useSearchFilterAnalytics from './useSearchFilterAnalytics';
+import { useFilterRendererRegistry } from './render/useFilterRenderer';
+import { FilterScenarioType } from './render/types';
+import { FilterPredicate } from './types';
+
+const DropdownMenu = styled.div<{ padding?: string }>`
+    background-color: white;
+    border-radius: 5px;
+    box-shadow: ${(props) => props.theme.styles['box-shadow']};
+    overflow: hidden;
+    min-width: 200px;
+    max-width: 240px;
+
+    ${(props) => props.padding !== undefined && `padding: ${props.padding};`}
+`;
+
+interface Props {
+    filters: FacetMetadata[];
+    activeFilters: FacetFilterInput[];
+    filterPredicates: FilterPredicate[];
+    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
+}
+
+export default function MoreFilters({ filters, filterPredicates, activeFilters, onChangeFilters }: Props) {
+    const { trackShowMoreEvent } = useSearchFilterAnalytics();
+    const [isMenuOpen, setIsMenuOpen] = useState(false);
+    const numActiveFilters = getNumActiveFiltersForGroupOfFilters(activeFilters, filters);
+    const filterRendererRegistry = useFilterRendererRegistry();
+
+    function updateFiltersAndClose(newFilters: FacetFilterInput[]) {
+        onChangeFilters(newFilters);
+        setIsMenuOpen(false);
+    }
+
+    function onOpenChange(isOpen: boolean) {
+        if (isOpen) trackShowMoreEvent(activeFilters.length, filters.length);
+        setIsMenuOpen(isOpen);
+    }
+
+    return (
+        <Dropdown
+            trigger={['click']}
+            dropdownRender={() => (
+                <DropdownMenu padding="4px 0px">
+                    {filters.map((filter) => {
+                        return filterRendererRegistry.hasRenderer(filter.field) ? (
+                            filterRendererRegistry.render(filter.field, {
+                                scenario: FilterScenarioType.SEARCH_V2_SECONDARY,
+                                filter,
+                                activeFilters,
+                                onChangeFilters: updateFiltersAndClose,
+                            })
+                        ) : (
+                            <MoreFilterOption
+                                key={filter.field}
+                                filter={filter}
+                                activeFilters={activeFilters}
+                                filterPredicates={filterPredicates}
+                                onChangeFilters={updateFiltersAndClose}
+                            />
+                        );
+                    })}
+                </DropdownMenu>
+            )}
+            open={isMenuOpen}
+            onOpenChange={onOpenChange}
+        >
+            <SearchFilterLabel data-testid="more-filters-dropdown" $isActive={!!numActiveFilters}>
+                More {numActiveFilters ? `(${numActiveFilters}) ` : ''}
+                <CaretDownFilled style={{ fontSize: '12px', height: '12px' }} />
+            </SearchFilterLabel>
+        </Dropdown>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/OperatorSelector.tsx b/datahub-web-react/src/app/searchV2/filters/OperatorSelector.tsx
new file mode 100644
index 00000000000000..f4053469287acf
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/OperatorSelector.tsx
@@ -0,0 +1,67 @@
+import { Dropdown } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { SEARCH_COLORS } from '../../entityV2/shared/constants';
+import { SEARCH_FILTER_CONDITION_TYPE_TO_INFO, getOperatorOptionsForPredicate } from './operator/operator';
+import { FilterOperatorType, FilterPredicate } from './types';
+
+const OptionContainer = styled.div`
+    display: flex;
+    align-items: center;
+    justify-content: start;
+`;
+
+const Icon = styled.div`
+    margin-right: 8px;
+`;
+
+const SelectedOperatorText = styled.div`
+    cursor: pointer;
+    border-radius: 6px;
+    border: 1.5px solid transparent;
+    padding: 2px;
+    :hover {
+        border: 1.5px solid ${SEARCH_COLORS.TITLE_PURPLE};
+        background-color: ${SEARCH_COLORS.TITLE_PURPLE};
+        color: #fff;
+    }
+`;
+
+const Text = styled.div``;
+
+interface Props {
+    predicate: FilterPredicate;
+    onChangeOperator: (operator: FilterOperatorType) => void;
+}
+
+export default function OperatorSelector({ predicate, onChangeOperator }: Props) {
+    const isPlural = predicate.values?.length > 1;
+    const operatorOptions = getOperatorOptionsForPredicate(predicate, isPlural);
+    const selectedOperator = SEARCH_FILTER_CONDITION_TYPE_TO_INFO.get(predicate.operator);
+    const selectedOperatorText = (isPlural && selectedOperator?.pluralText) || selectedOperator?.text;
+
+    const items = [
+        ...operatorOptions
+            .filter((op) => op)
+            .map((operatorOption) => {
+                return {
+                    key: operatorOption.type,
+                    label: (
+                        <OptionContainer
+                            key={operatorOption.type}
+                            onClick={() => onChangeOperator(operatorOption.type)}
+                        >
+                            <Icon>{operatorOption.icon}</Icon>
+                            <Text>{(isPlural && operatorOption.pluralText) || operatorOption.text}</Text>
+                        </OptionContainer>
+                    ),
+                };
+            }),
+    ];
+
+    return (
+        <Dropdown trigger={['click']} menu={{ items }}>
+            <SelectedOperatorText>{selectedOperatorText}</SelectedOperatorText>
+        </Dropdown>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/OptionsDropdownMenu.tsx b/datahub-web-react/src/app/searchV2/filters/OptionsDropdownMenu.tsx
new file mode 100644
index 00000000000000..ffdcaa40194a29
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/OptionsDropdownMenu.tsx
@@ -0,0 +1,119 @@
+import { LoadingOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+import React from 'react';
+import styled from 'styled-components/macro';
+import { ANTD_GRAY, SEARCH_COLORS } from '../../entityV2/shared/constants';
+import { useEnterKeyListener } from '../../shared/useEnterKeyListener';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { SearchBar } from '../SearchBar';
+
+const StyledButton = styled(Button)`
+    width: 100%;
+    text-align: center;
+    background-color: ${SEARCH_COLORS.TITLE_PURPLE};
+    color: white;
+    border-radius: 0;
+`;
+
+export const DropdownMenu = styled.div<{ type: 'card' | 'default' }>`
+    background-color: white;
+    ${(props) => props.type === 'card' && 'border-radius: 5px;'}
+    ${(props) =>
+        props.type === 'card' &&
+        'box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);'}
+    overflow: hidden;
+    min-width: 200px;
+
+    .ant-dropdown-menu-title-content {
+        background-color: white;
+        &:hover {
+            background-color: white;
+        }
+    }
+    .ant-dropdown-menu {
+        padding: 7px;
+    }
+`;
+
+const ScrollableContent = styled.div`
+    max-height: 380px;
+    overflow: auto;
+    min-width: 260px;
+`;
+
+const LoadingWrapper = styled.div`
+    display: flex;
+    justify-content: center;
+    padding: 9px;
+
+    svg {
+        height: 16px;
+        width: 16px;
+    }
+`;
+
+interface Props {
+    menu: React.ReactNode;
+    updateFilters: () => void;
+    isLoading?: boolean;
+    searchQuery?: string;
+    updateSearchQuery?: (query: string) => void;
+    searchPlaceholder?: string;
+    showSearchBar?: boolean;
+    type?: 'card' | 'default';
+    className?: string;
+}
+
+export default function OptionsDropdownMenu({
+    menu,
+    updateFilters,
+    isLoading,
+    searchQuery,
+    updateSearchQuery,
+    searchPlaceholder,
+    showSearchBar = true,
+    type = 'card',
+    className,
+}: Props) {
+    const entityRegistry = useEntityRegistry();
+
+    useEnterKeyListener({ querySelectorToExecuteClick: '#updateFiltersButton' });
+
+    return (
+        <DropdownMenu type={type} data-testid="filter-dropdown" className={className}>
+            <ScrollableContent>
+                {showSearchBar && (
+                    <SearchBar
+                        initialQuery={searchQuery}
+                        placeholderText={searchPlaceholder || ''}
+                        suggestions={[]}
+                        hideRecommendations
+                        style={{
+                            padding: 12,
+                            paddingBottom: 5,
+                        }}
+                        inputStyle={{
+                            height: 30,
+                            fontSize: 12,
+                            borderRadius: 8,
+                        }}
+                        onSearch={() => null}
+                        onQueryChange={updateSearchQuery}
+                        entityRegistry={entityRegistry}
+                        textColor={ANTD_GRAY[9]}
+                        placeholderColor={ANTD_GRAY[6]}
+                    />
+                )}
+                {React.cloneElement(menu as React.ReactElement, { style: { boxShadow: 'none' } })}
+                {isLoading && (
+                    <LoadingWrapper>
+                        <LoadingOutlined />
+                    </LoadingWrapper>
+                )}
+            </ScrollableContent>
+            <StyledButton id="updateFiltersButton" type="text" onClick={updateFilters} data-testid="update-filters">
+                Update
+            </StyledButton>
+        </DropdownMenu>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/ParentEntities.tsx b/datahub-web-react/src/app/searchV2/filters/ParentEntities.tsx
new file mode 100644
index 00000000000000..1803ca044c874e
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/ParentEntities.tsx
@@ -0,0 +1,84 @@
+import React from 'react';
+import styled from 'styled-components';
+import { FolderOpenOutlined } from '@ant-design/icons';
+import { Tooltip } from '@components';
+import { ContextPathSeparator } from '@src/app/previewV2/ContextPathSeparator';
+import ContextPathEntityLink from '@src/app/previewV2/ContextPathEntityLink';
+import { Entity } from '../../../types.generated';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import { useEntityRegistry } from '../../useEntityRegistry';
+
+const ParentNodesWrapper = styled.div`
+    font-size: 12px;
+    color: ${ANTD_GRAY[7]};
+    display: flex;
+    align-items: center;
+    overflow: hidden;
+    line-height: 20px;
+`;
+
+const StyledTooltip = styled(Tooltip)`
+    display: flex;
+    white-space: nowrap;
+    overflow: hidden;
+`;
+
+const DEFAULT_NUM_VISIBLE = 2;
+
+interface Props {
+    parentEntities: Entity[];
+    numVisible?: number;
+}
+
+export default function ParentEntities({ parentEntities, numVisible = DEFAULT_NUM_VISIBLE }: Props) {
+    const entityRegistry = useEntityRegistry();
+
+    // parent nodes/domains are returned with direct parent first
+    const orderedParentEntities = [...parentEntities].reverse();
+    const numHiddenEntities = orderedParentEntities.length - numVisible;
+    const hasHiddenEntities = numHiddenEntities > 0;
+    const visibleNodes = hasHiddenEntities ? orderedParentEntities.slice(numHiddenEntities) : orderedParentEntities;
+
+    if (!parentEntities.length) return null;
+
+    return (
+        <StyledTooltip
+            showArrow={false}
+            overlayStyle={hasHiddenEntities ? { maxWidth: 450 } : { display: 'none' }}
+            placement="top"
+            title={
+                <>
+                    {orderedParentEntities.map((parentEntity, index) => (
+                        <React.Fragment key={parentEntity.urn}>
+                            <ContextPathEntityLink entity={parentEntity} />
+                            {index !== orderedParentEntities.length - 1 && <ContextPathSeparator />}
+                        </React.Fragment>
+                    ))}
+                </>
+            }
+        >
+            <ParentNodesWrapper>
+                {hasHiddenEntities &&
+                    [...Array(numHiddenEntities)].map((index) => (
+                        <React.Fragment key={`icons-${index || 0}`}>
+                            <FolderOpenOutlined />
+                            <ContextPathSeparator />
+                        </React.Fragment>
+                    ))}
+                {visibleNodes.map((parentEntity, index) => {
+                    const displayName = entityRegistry.getDisplayName(parentEntity.type, parentEntity);
+                    return (
+                        <React.Fragment key={displayName}>
+                            <ContextPathEntityLink
+                                key={parentEntity.urn}
+                                entity={parentEntity}
+                                style={{ fontSize: '12px' }}
+                            />
+                            {index !== visibleNodes.length - 1 && <ContextPathSeparator />}
+                        </React.Fragment>
+                    );
+                })}
+            </ParentNodesWrapper>
+        </StyledTooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/SaveViewButton.tsx b/datahub-web-react/src/app/searchV2/filters/SaveViewButton.tsx
new file mode 100644
index 00000000000000..a302ea67387d9c
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/SaveViewButton.tsx
@@ -0,0 +1,69 @@
+import { Tooltip } from '@components';
+import React, { useMemo, useState } from 'react';
+import styled from 'styled-components';
+import { ViewBuilderMode } from '../../entityV2/view/builder/types';
+import { ViewBuilder } from '../../entityV2/view/builder/ViewBuilder';
+import { buildInitialViewState, fromUnionType } from '../../entity/view/builder/utils';
+import { FacetFilterInput } from '../../../types.generated';
+import { UnionType } from '../utils/constants';
+import { TextButton } from './styledComponents';
+import { Message } from '../../shared/Message';
+import { canCreateViewFromFilters } from './utils';
+
+const ToolTipHeader = styled.div`
+    margin-bottom: 12px;
+`;
+
+interface Props {
+    activeFilters: FacetFilterInput[];
+    unionType: UnionType;
+}
+
+export default function SaveViewButton({ activeFilters, unionType }: Props) {
+    const [isViewModalVisible, setIsViewModalVisible] = useState(false);
+    const isValidViewDefiniton = useMemo(() => canCreateViewFromFilters(activeFilters), [activeFilters]);
+
+    function toggleViewBuilder() {
+        setIsViewModalVisible(true);
+        if (!isValidViewDefiniton) {
+            // TODO: fire off analytics event
+            setTimeout(() => setIsViewModalVisible(false), 3000);
+        }
+    }
+
+    return (
+        <>
+            <Tooltip
+                placement="right"
+                title={
+                    <>
+                        <ToolTipHeader>Save these filters as a new View.</ToolTipHeader>
+                        <div>Views allow you to easily save or share search filters.</div>
+                    </>
+                }
+            >
+                <TextButton type="text" onClick={toggleViewBuilder} marginTop={0} data-testid="save-as-view">
+                    Save as a View
+                </TextButton>
+            </Tooltip>
+            {isViewModalVisible && (
+                <>
+                    {isValidViewDefiniton && (
+                        <ViewBuilder
+                            mode={ViewBuilderMode.EDITOR}
+                            initialState={buildInitialViewState(activeFilters, fromUnionType(unionType))}
+                            onSubmit={() => setIsViewModalVisible(false)}
+                            onCancel={() => setIsViewModalVisible(false)}
+                        />
+                    )}
+                    {!isValidViewDefiniton && (
+                        <Message
+                            type="error"
+                            content="This combination of filters cannot be saved as a View at this time."
+                        />
+                    )}
+                </>
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/SearchFilter.tsx b/datahub-web-react/src/app/searchV2/filters/SearchFilter.tsx
new file mode 100644
index 00000000000000..a8455df9543aeb
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/SearchFilter.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import { CSSProperties } from 'styled-components';
+import { FacetFilterInput, FacetMetadata } from '../../../types.generated';
+import useSearchFilterDropdown from './useSearchFilterDropdown';
+import { getFilterDropdownIcon, useFilterDisplayName } from './utils';
+import SearchFilterView from './SearchFilterView';
+import { FilterPredicate } from './types';
+
+interface Props {
+    filter: FacetMetadata;
+    activeFilters: FacetFilterInput[];
+    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
+    filterPredicates: FilterPredicate[];
+    labelStyle?: CSSProperties;
+}
+
+export default function SearchFilter({ filter, filterPredicates, activeFilters, onChangeFilters, labelStyle }: Props) {
+    const { finalAggregations, updateFilters, numActiveFilters, manuallyUpdateFilters } = useSearchFilterDropdown({
+        filter,
+        activeFilters,
+        onChangeFilters,
+    });
+    const filterIcon = getFilterDropdownIcon(filter.field);
+
+    const currentFilterPredicate = filterPredicates?.find((obj) =>
+        obj.field.field.includes(filter.field),
+    ) as FilterPredicate;
+
+    const displayName = useFilterDisplayName(filter, currentFilterPredicate?.field?.displayName);
+
+    return (
+        <SearchFilterView
+            filterPredicate={currentFilterPredicate}
+            numActiveFilters={numActiveFilters}
+            filterOptions={finalAggregations}
+            filterIcon={filterIcon}
+            displayName={displayName}
+            onChangeValues={updateFilters}
+            labelStyle={labelStyle}
+            manuallyUpdateFilters={manuallyUpdateFilters}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/SearchFilterOptions.tsx b/datahub-web-react/src/app/searchV2/filters/SearchFilterOptions.tsx
new file mode 100644
index 00000000000000..7443462a949f0a
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/SearchFilterOptions.tsx
@@ -0,0 +1,159 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Divider } from 'antd';
+import { SlidersOutlined } from '@ant-design/icons';
+import { FacetFilterInput, FacetMetadata } from '../../../types.generated';
+import { useUserContext } from '../../context/useUserContext';
+import { ORIGIN_FILTER_NAME, UnionType } from '../utils/constants';
+import { FILTERS_TO_REMOVE, NON_FACET_FILTER_FIELDS, SORTED_FILTERS } from './constants';
+import MoreFilters from './MoreFilters';
+import SaveViewButton from './SaveViewButton';
+import SearchFilter from './SearchFilter';
+import { convertToAvailableFilterPredictes, sortFacets } from './utils';
+import { useFilterRendererRegistry } from './render/useFilterRenderer';
+import { FilterScenarioType } from './render/types';
+import SearchFiltersLoadingSection from './SearchFiltersLoadingSection';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import { FilterPredicate } from './types';
+
+const NUM_VISIBLE_FILTER_DROPDOWNS = 6;
+
+const FiltersText = styled.div`
+    font-size: 16px;
+    color: ${ANTD_GRAY[8]};
+`;
+
+const StyledSlidersOutlined = styled(SlidersOutlined)`
+    margin-right: 8px;
+`;
+
+const VerticalDivider = styled(Divider)`
+    && {
+        padding: 12px 0px;
+        margin: 0px 32px;
+    }
+`;
+
+export const FlexWrapper = styled.div`
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+`;
+
+export const FlexSpacer = styled.div`
+    display: flex;
+    justify-content: space-between;
+`;
+
+export const FilterButtonsWrapper = styled.div`
+    display: flex;
+    flex-wrap: nowrap;
+`;
+
+interface Props {
+    loading: boolean;
+    availableFilters: FacetMetadata[];
+    activeFilters: FacetFilterInput[];
+    unionType: UnionType;
+    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
+}
+
+export default function SearchFilterOptions({
+    loading,
+    availableFilters,
+    activeFilters,
+    unionType,
+    onChangeFilters,
+}: Props) {
+    // If we move view select down, then move this down into a sibling component.
+    const userContext = useUserContext();
+    const filterRendererRegistry = useFilterRendererRegistry();
+    const fieldsWithCustomRenderers = Array.from(filterRendererRegistry.fieldNameToRenderer.keys());
+    const selectedViewUrn = userContext?.localState?.selectedViewUrn;
+    const showSaveViewButton = activeFilters?.length > 0 && selectedViewUrn === undefined;
+
+    let filterSet = availableFilters;
+    if (filterSet.length) {
+        // Include non-facet filters and remove any duplicates in filterSet
+        const nonFacetFilters = NON_FACET_FILTER_FIELDS.map(
+            ({ field, displayName }): FacetMetadata => ({
+                field,
+                displayName,
+                aggregations: [],
+            }),
+        );
+        const nonFacetFilterKeys = new Set(nonFacetFilters.map((f) => f.field));
+        filterSet = [...filterSet.filter((f) => !nonFacetFilterKeys.has(f.field)), ...nonFacetFilters];
+    }
+
+    // These are the filter options that originate in the backend
+    // They are shown to the user by default.
+    const dynamicFilterOptions = filterSet
+        ?.filter((f) => (f.field === ORIGIN_FILTER_NAME ? f.aggregations.length >= 2 : true)) // only want Environment filter if there's 2 or more envs
+        .filter((f) => !FILTERS_TO_REMOVE.includes(f.field))
+        .filter((f) => {
+            if (fieldsWithCustomRenderers.includes(f.field)) {
+                // If there are no true aggregations, these fields needn't be rendered
+                return !!f.aggregations.find((agg) => agg.value === 'true');
+            }
+            return true;
+        })
+        .sort((facetA, facetB) => sortFacets(facetA, facetB, SORTED_FILTERS));
+
+    // if there will only be one filter in the "More Filters" dropdown, show that filter instead
+    const shouldShowMoreDropdown =
+        dynamicFilterOptions && dynamicFilterOptions.length > NUM_VISIBLE_FILTER_DROPDOWNS + 1;
+    const visibleFilters = shouldShowMoreDropdown
+        ? dynamicFilterOptions?.slice(0, NUM_VISIBLE_FILTER_DROPDOWNS)
+        : dynamicFilterOptions;
+    const hiddenFilters = shouldShowMoreDropdown ? dynamicFilterOptions?.slice(NUM_VISIBLE_FILTER_DROPDOWNS) : [];
+
+    const filterPredicates: FilterPredicate[] = convertToAvailableFilterPredictes(activeFilters, visibleFilters || []);
+
+    const hiddenFilterPredicates: FilterPredicate[] = convertToAvailableFilterPredictes(
+        activeFilters,
+        hiddenFilters || [],
+    );
+
+    return (
+        <FlexSpacer>
+            <FlexWrapper>
+                <FiltersText>
+                    <StyledSlidersOutlined />
+                    Filters
+                </FiltersText>
+                <VerticalDivider type="vertical" />
+                {loading && !visibleFilters?.length && <SearchFiltersLoadingSection />}
+                {visibleFilters?.map((filter) => {
+                    return filterRendererRegistry.hasRenderer(filter.field) ? (
+                        filterRendererRegistry.render(filter.field, {
+                            scenario: FilterScenarioType.SEARCH_V2_PRIMARY,
+                            filter,
+                            activeFilters,
+                            onChangeFilters,
+                        })
+                    ) : (
+                        <SearchFilter
+                            key={filter.field}
+                            filter={filter}
+                            activeFilters={activeFilters}
+                            onChangeFilters={onChangeFilters}
+                            filterPredicates={filterPredicates}
+                        />
+                    );
+                })}
+                {hiddenFilters && hiddenFilters.length > 0 && (
+                    <MoreFilters
+                        filters={hiddenFilters}
+                        activeFilters={activeFilters}
+                        onChangeFilters={onChangeFilters}
+                        filterPredicates={hiddenFilterPredicates}
+                    />
+                )}
+            </FlexWrapper>
+            <FilterButtonsWrapper>
+                {showSaveViewButton && <SaveViewButton activeFilters={activeFilters} unionType={unionType} />}
+            </FilterButtonsWrapper>
+        </FlexSpacer>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/SearchFilterView.tsx b/datahub-web-react/src/app/searchV2/filters/SearchFilterView.tsx
new file mode 100644
index 00000000000000..f178a8516449f1
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/SearchFilterView.tsx
@@ -0,0 +1,58 @@
+import { FacetFilterInput, AggregationMetadata } from '@src/types.generated';
+import { CaretDownFilled } from '@ant-design/icons';
+import React from 'react';
+import styled, { CSSProperties } from 'styled-components';
+import { SearchFilterLabel } from './styledComponents';
+import { FilterPredicate, FilterValue } from './types';
+import ValueSelector from './value/ValueSelector';
+
+export const IconWrapper = styled.div`
+    margin-right: 8px;
+    display: flex;
+    svg {
+        height: 14px;
+        width: 14px;
+    }
+`;
+
+interface Props {
+    numActiveFilters: number;
+    filterIcon?: JSX.Element;
+    displayName: string;
+    filterPredicate: FilterPredicate;
+    onChangeValues: (newValues: FilterValue[]) => void;
+    labelStyle?: CSSProperties;
+    filterOptions: AggregationMetadata[];
+    manuallyUpdateFilters: (newValues: FacetFilterInput[]) => void;
+}
+
+export default function SearchFilterView({
+    numActiveFilters,
+    filterIcon,
+    displayName,
+    filterPredicate,
+    onChangeValues,
+    labelStyle,
+    filterOptions,
+    manuallyUpdateFilters,
+}: Props) {
+    return (
+        <ValueSelector
+            field={filterPredicate?.field}
+            values={filterPredicate?.values}
+            defaultOptions={filterOptions}
+            onChangeValues={onChangeValues}
+            manuallyUpdateFilters={manuallyUpdateFilters}
+        >
+            <SearchFilterLabel
+                $isActive={!!numActiveFilters}
+                style={labelStyle}
+                data-testid={`filter-dropdown-${displayName?.replace(/\s/g, '-')}`}
+            >
+                {filterIcon && <IconWrapper>{filterIcon}</IconWrapper>}
+                {displayName} {numActiveFilters ? `(${numActiveFilters}) ` : ''}
+                <CaretDownFilled style={{ fontSize: '12px', height: '12px' }} />
+            </SearchFilterLabel>
+        </ValueSelector>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/SearchFilters.tsx b/datahub-web-react/src/app/searchV2/filters/SearchFilters.tsx
new file mode 100644
index 00000000000000..7d1a4b3fa231b8
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/SearchFilters.tsx
@@ -0,0 +1,108 @@
+import React from 'react';
+import styled from 'styled-components';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { FacetFilterInput, FacetMetadata } from '../../../types.generated';
+import { SEARCH_RESULTS_FILTERS_ID } from '../../onboarding/config/SearchOnboardingConfig';
+import SearchFilterOptions from './SearchFilterOptions';
+import SelectedSearchFilters from './SelectedSearchFilters';
+import {
+    ENTITY_INDEX_FILTER_NAME,
+    TYPE_NAMES_FILTER_NAME,
+    UnionType,
+    LEGACY_ENTITY_FILTER_NAME,
+    BROWSE_PATH_V2_FILTER_NAME,
+    COMPLETED_FORMS_FILTER_NAME,
+    INCOMPLETE_FORMS_FILTER_NAME,
+    VERIFIED_FORMS_FILTER_NAME,
+    COMPLETED_FORMS_COMPLETED_PROMPT_IDS_FILTER_NAME,
+    INCOMPLETE_FORMS_COMPLETED_PROMPT_IDS_FILTER_NAME,
+    ENTITY_SUB_TYPE_FILTER_NAME,
+    PROPOSED_GLOSSARY_TERMS_FILTER_NAME,
+    PROPOSED_SCHEMA_GLOSSARY_TERMS_FILTER_NAME,
+    PROPOSED_SCHEMA_TAGS_FILTER_NAME,
+} from '../utils/constants';
+
+const Container = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    background-color: #ffffff;
+    border-radius: ${(props) =>
+        props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '8px'};
+    padding: 16px 24px 16px 32px;
+    border: 1px solid #e8e8e8;
+    box-shadow: ${(props) =>
+        props.$isShowNavBarRedesign ? props.theme.styles['box-shadow-navbar-redesign'] : '0px 4px 10px 0px #a8a8a840'};
+`;
+
+const FilterSpacer = styled.div`
+    margin: 16px 0px;
+`;
+
+// remove legacy filter options as well as new _index and browsePathV2 filter from dropdowns
+const FILTERS_TO_REMOVE = [
+    TYPE_NAMES_FILTER_NAME,
+    LEGACY_ENTITY_FILTER_NAME,
+    ENTITY_INDEX_FILTER_NAME,
+    BROWSE_PATH_V2_FILTER_NAME,
+    ENTITY_SUB_TYPE_FILTER_NAME,
+    // remove form-related filters for bulk form search and browse experience
+    COMPLETED_FORMS_FILTER_NAME,
+    INCOMPLETE_FORMS_FILTER_NAME,
+    VERIFIED_FORMS_FILTER_NAME,
+    COMPLETED_FORMS_COMPLETED_PROMPT_IDS_FILTER_NAME,
+    INCOMPLETE_FORMS_COMPLETED_PROMPT_IDS_FILTER_NAME,
+    PROPOSED_GLOSSARY_TERMS_FILTER_NAME,
+    PROPOSED_SCHEMA_GLOSSARY_TERMS_FILTER_NAME,
+    PROPOSED_SCHEMA_TAGS_FILTER_NAME,
+];
+
+interface Props {
+    loading: boolean;
+    availableFilters: FacetMetadata[];
+    activeFilters: FacetFilterInput[];
+    unionType: UnionType;
+    basicFilters?: boolean;
+    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
+    onChangeUnionType: (unionType: UnionType) => void;
+    onClearFilters: () => void;
+}
+
+export default function SearchFilters({
+    loading,
+    availableFilters,
+    activeFilters,
+    unionType,
+    basicFilters = false,
+    onChangeFilters,
+    onChangeUnionType,
+    onClearFilters,
+}: Props) {
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    // Filter out the available filters if `basicFilters` is true
+    const filteredFilters = (availableFilters || []).filter((f) => !FILTERS_TO_REMOVE.includes(f.field));
+    const filters = basicFilters ? filteredFilters : availableFilters;
+
+    return (
+        <Container id={SEARCH_RESULTS_FILTERS_ID} $isShowNavBarRedesign={isShowNavBarRedesign}>
+            <SearchFilterOptions
+                loading={loading}
+                availableFilters={filters}
+                activeFilters={activeFilters}
+                unionType={unionType}
+                onChangeFilters={onChangeFilters}
+            />
+            {activeFilters.length > 0 && (
+                <>
+                    <FilterSpacer />
+                    <SelectedSearchFilters
+                        availableFilters={filters}
+                        selectedFilters={activeFilters}
+                        unionType={unionType}
+                        onChangeFilters={onChangeFilters}
+                        onChangeUnionType={onChangeUnionType}
+                        onClearFilters={onClearFilters}
+                        showUnionType
+                    />
+                </>
+            )}
+        </Container>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/SearchFiltersBuilder.tsx b/datahub-web-react/src/app/searchV2/filters/SearchFiltersBuilder.tsx
new file mode 100644
index 00000000000000..6abdd0a5101757
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/SearchFiltersBuilder.tsx
@@ -0,0 +1,159 @@
+import React from 'react';
+import styled from 'styled-components';
+import { TextButton } from './styledComponents';
+// eslint-disable-next-line import/no-cycle
+import SelectedFilter from './SelectedFilter';
+import { FilterField, FilterPredicate } from './types';
+import AddFilterDropdown from './AddFilterDropdown';
+import { useHydrateFilters } from './useHydrateFilters';
+import { AdvancedSearchFilterOverallUnionTypeSelect } from '../AdvancedSearchFilterOverallUnionTypeSelect';
+import { UnionType } from '../utils/constants';
+
+const Container = styled.div``;
+
+const HorizontalWrapper = styled.div`
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 4px;
+`;
+
+const VerticalWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+`;
+
+export const FlexSpacer = styled.div`
+    display: flex;
+    justify-content: space-between;
+`;
+
+export const FilterButtonsWrapper = styled.div`
+    display: flex;
+    flex-wrap: nowrap;
+`;
+
+const AnyAllToggle = styled.div`
+    margin-top: 8px;
+`;
+
+interface Props {
+    fields?: FilterField[];
+    filters: FilterPredicate[];
+    unionType: UnionType;
+    onChangeFilters: (newFilters: FilterPredicate[]) => void;
+    onChangeUnionType?: (unionType: UnionType) => void;
+    onClearFilters: () => void;
+    disabled?: boolean;
+    vertical?: boolean;
+    showUnionType?: boolean;
+    showAddFilter?: boolean;
+    showClearAll?: boolean;
+    isCompact?: boolean;
+    isOperatorDisabled?: boolean;
+    includeCount?: boolean;
+}
+
+export default function SearchFiltersBuilder({
+    fields,
+    filters,
+    onChangeFilters,
+    onClearFilters,
+    unionType,
+    onChangeUnionType,
+    vertical,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    disabled = false,
+    showUnionType = false,
+    showAddFilter = true,
+    showClearAll = true,
+    isCompact = false,
+    includeCount = false,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    isOperatorDisabled = false,
+}: Props) {
+    const hydratedFilters = useHydrateFilters(filters);
+
+    const onChangeFilterOperator = (index, newOperator) => {
+        const newFilters = filters.map((filter, i) => {
+            if (i === index) {
+                return {
+                    ...filter,
+                    operator: newOperator,
+                };
+            }
+            return filter;
+        });
+        onChangeFilters(newFilters);
+    };
+
+    const onChangeFilterValues = (index, newValues) => {
+        const newFilters = filters.map((filter, i) => {
+            if (i === index) {
+                return {
+                    ...filter,
+                    values: newValues,
+                };
+            }
+            return filter;
+        });
+        onChangeFilters(newFilters);
+    };
+
+    const onAddFilter = (predicate: FilterPredicate) => {
+        const newFilters = [
+            ...filters,
+            {
+                field: predicate.field,
+                operator: predicate.operator,
+                values: predicate.values,
+                defaultValueOptions: predicate.defaultValueOptions,
+            },
+        ];
+        onChangeFilters(newFilters);
+    };
+
+    const onRemoveFilter = (indexToRemove: number) => {
+        const newFilters = filters.filter((_, index) => index !== indexToRemove);
+        onChangeFilters(newFilters);
+    };
+
+    const Wrapper = vertical ? VerticalWrapper : HorizontalWrapper;
+
+    const addFilter = <AddFilterDropdown fields={fields} onAddFilter={onAddFilter} includeCount={includeCount} />;
+    return (
+        <Container>
+            <FlexSpacer>
+                <Wrapper>
+                    {showAddFilter && vertical && addFilter}
+                    {hydratedFilters.map((predicate, index) => (
+                        <SelectedFilter
+                            predicate={predicate}
+                            onChangeOperator={(operator) => onChangeFilterOperator(index, operator)}
+                            onChangeValues={(newValues) => onChangeFilterValues(index, newValues)}
+                            onRemoveFilter={() => onRemoveFilter(index)}
+                            isCompact={isCompact}
+                            // isOperatorDisabled={isOperatorDisabled}
+                        />
+                    ))}
+                    {showAddFilter && !vertical && addFilter}
+                </Wrapper>
+                {showClearAll && (
+                    <TextButton type="text" onClick={onClearFilters} height={14} data-testid="clear-all-filters">
+                        clear all
+                    </TextButton>
+                )}
+            </FlexSpacer>
+            {showUnionType && hydratedFilters?.length >= 2 && (
+                <AnyAllToggle>
+                    Show results that match{' '}
+                    <AdvancedSearchFilterOverallUnionTypeSelect
+                        unionType={unionType}
+                        onUpdate={(newValue) => onChangeUnionType?.(newValue)}
+                    />
+                </AnyAllToggle>
+            )}
+        </Container>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/SearchFiltersLoadingSection.tsx b/datahub-web-react/src/app/searchV2/filters/SearchFiltersLoadingSection.tsx
new file mode 100644
index 00000000000000..59b4fb433e29d3
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/SearchFiltersLoadingSection.tsx
@@ -0,0 +1,27 @@
+import * as React from 'react';
+import { Skeleton } from 'antd';
+import styled from 'styled-components';
+
+const Container = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
+const CardSkeleton = styled(Skeleton.Input)`
+    && {
+        padding: 2px 12px 2px 0px;
+        height: 32px;
+        border-radius: 8px;
+    }
+`;
+
+export default function SearchFiltersLoadingSection() {
+    return (
+        <Container>
+            <CardSkeleton active size="default" />
+            <CardSkeleton active size="default" />
+            <CardSkeleton active size="default" />
+            <CardSkeleton active size="default" />
+        </Container>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/SearchFiltersSection.tsx b/datahub-web-react/src/app/searchV2/filters/SearchFiltersSection.tsx
new file mode 100644
index 00000000000000..0a3b8d03c58ff0
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/SearchFiltersSection.tsx
@@ -0,0 +1,67 @@
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import { FacetFilterInput, FacetMetadata } from '../../../types.generated';
+import { UnionType } from '../utils/constants';
+import { SEARCH_RESULTS_FILTERS_V2_INTRO } from '../../onboarding/config/SearchOnboardingConfig';
+import SearchFilters from './SearchFilters';
+
+const Section = styled.div<{ removePadding?: boolean; $isShowNavBarRedesign?: boolean }>`
+    padding: ${(props) => {
+        if (props.$isShowNavBarRedesign) {
+            return props.removePadding ? '8px 20px 4px 20px' : '5px 5px 8px 5px';
+        }
+        return props.removePadding ? '8px 20px 4px 20px' : '8px 12px 0px 12px';
+    }};
+    position: relative;
+`;
+
+interface Props {
+    loading: boolean;
+    availableFilters: FacetMetadata[];
+    activeFilters: FacetFilterInput[];
+    unionType: UnionType;
+    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
+    onClearFilters: () => void;
+    onChangeUnionType: (unionType: UnionType) => void;
+}
+
+export default function SearchFiltersSection({
+    loading,
+    availableFilters,
+    activeFilters,
+    unionType,
+    onChangeFilters,
+    onClearFilters,
+    onChangeUnionType,
+}: Props) {
+    const [finalAvailableFilters, setFinalAvailableFilters] = useState(availableFilters);
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+
+    /**
+     * Only update the active filters if we are done loading. Prevents jitter!
+     */
+    useEffect(() => {
+        if (!loading && finalAvailableFilters !== availableFilters) {
+            setFinalAvailableFilters(availableFilters);
+        }
+    }, [availableFilters, loading, finalAvailableFilters]);
+
+    return (
+        <Section
+            id={SEARCH_RESULTS_FILTERS_V2_INTRO}
+            data-testid="search-filters-v2"
+            $isShowNavBarRedesign={isShowNavBarRedesign}
+        >
+            <SearchFilters
+                loading={loading}
+                availableFilters={finalAvailableFilters}
+                activeFilters={activeFilters}
+                unionType={unionType}
+                onChangeFilters={onChangeFilters}
+                onChangeUnionType={onChangeUnionType}
+                onClearFilters={onClearFilters}
+            />
+        </Section>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/SelectedFilter.tsx b/datahub-web-react/src/app/searchV2/filters/SelectedFilter.tsx
new file mode 100644
index 00000000000000..70bc33b69dcf97
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/SelectedFilter.tsx
@@ -0,0 +1,138 @@
+/* eslint-disable import/no-cycle */
+import { CloseOutlined } from '@ant-design/icons';
+import { Button, DatePicker } from 'antd';
+import moment from 'moment';
+import React from 'react';
+import styled from 'styled-components/macro';
+import { SEARCH_COLORS } from '../../entityV2/shared/constants';
+import OperatorSelector from './OperatorSelector';
+import { operatorRequiresValues } from './operator/operator';
+import { FilterOperatorType, FilterPredicate, FilterValue } from './types';
+import ValueSelector from './value/ValueSelector';
+import ValueName from './value/ValueName';
+import { getIsDateRangeFilter, useFilterDisplayName } from './utils';
+
+const Values = styled.div`
+    border: 1.5px solid transparent;
+    border-radius: 6px;
+    padding: 2px;
+
+    :hover {
+        cursor: pointer;
+        border: 1.5px solid ${SEARCH_COLORS.TITLE_PURPLE};
+        background-color: ${SEARCH_COLORS.TITLE_PURPLE};
+        color: #fff;
+    }
+`;
+
+const Value = styled.span``;
+
+const Container = styled.div<{ $isCompact?: boolean }>`
+    border-radius: 4px;
+    padding: 4px 10px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 14px;
+    margin-right: 8px;
+    background-color: ${SEARCH_COLORS.BACKGROUND_PURPLE};
+
+    ${(props) =>
+        props.$isCompact &&
+        `
+        font-size: 12px;
+        padding: 0 6px;
+    `}
+`;
+
+const Icon = styled.div`
+    margin-right: 4px;
+    display: flex;
+    align-items: center;
+`;
+
+const FilterName = styled.div`
+    margin-right: 2px;
+    color: ${SEARCH_COLORS.LINK_BLUE};
+    display: flex;
+    align-items: center;
+`;
+
+const RemoveButton = styled(Button)`
+    padding: 0px;
+    margin: 0px;
+    width: 20px;
+    height: 20px;
+    margin-left: 0px;
+`;
+
+interface SelectedFilterProps {
+    predicate: FilterPredicate;
+    onChangeOperator: (operator: FilterOperatorType) => void;
+    onChangeValues: (newValues: FilterValue[]) => void;
+    onRemoveFilter: () => void;
+    isCompact?: boolean;
+}
+
+export default function SelectedFilter({
+    predicate,
+    onChangeOperator,
+    onChangeValues,
+    onRemoveFilter,
+    isCompact,
+}: SelectedFilterProps) {
+    moment.tz.setDefault('GMT');
+    const { field, operator, values, defaultValueOptions } = predicate;
+    const showValueSelector = operatorRequiresValues(predicate.operator) || false;
+    const displayName = useFilterDisplayName(predicate.field);
+    const isDateRangeFilter = getIsDateRangeFilter(predicate.field);
+
+    const useDatePicker = field.useDatePicker || isDateRangeFilter;
+
+    return (
+        <Container
+            $isCompact={isCompact}
+            data-testid={`active-filter-${field.field}`}
+            key={`${field.field}-${operator}-${values.map((value) => value.value).join('-')}`}
+        >
+            <FilterName>
+                {(field.icon && <Icon>{field.icon}</Icon>) || null}
+                {displayName || field.field}
+            </FilterName>
+            <OperatorSelector predicate={predicate} onChangeOperator={onChangeOperator} />
+            {showValueSelector && useDatePicker && (
+                <DatePicker
+                    defaultValue={moment(Number(values[0].value))}
+                    disabledDate={isDateRangeFilter ? undefined : (current) => current > moment().startOf('day')}
+                    format="ll"
+                    showToday={false}
+                    allowClear={false}
+                    onChange={(v) => onChangeValues(v ? [{ value: v.valueOf().toString(), entity: null }] : [])}
+                />
+            )}
+            {showValueSelector && !useDatePicker && (
+                <ValueSelector
+                    field={field}
+                    values={values}
+                    defaultOptions={defaultValueOptions}
+                    onChangeValues={onChangeValues}
+                >
+                    <Values>
+                        {values.map((value, index) => (
+                            <Value data-testid={`active-filter-value-${field.field}-${value.value}`}>
+                                <ValueName field={field} value={value} />
+                                {index < values.length - 1 ? ', ' : ''}
+                            </Value>
+                        ))}
+                    </Values>
+                </ValueSelector>
+            )}
+            <RemoveButton
+                type="text"
+                icon={<CloseOutlined style={{ fontSize: 12 }} />}
+                onClick={onRemoveFilter}
+                data-testid={`remove-filter-${field.field}`}
+            />
+        </Container>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/SelectedSearchFilters.tsx b/datahub-web-react/src/app/searchV2/filters/SelectedSearchFilters.tsx
new file mode 100644
index 00000000000000..4968a44bcd190d
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/SelectedSearchFilters.tsx
@@ -0,0 +1,76 @@
+import React from 'react';
+import { FacetFilterInput, FacetMetadata } from '../../../types.generated';
+import { FilterPredicate } from './types';
+import { convertToSelectedFilterPredictes } from './utils';
+import { convertFrontendToBackendOperatorType } from './operator/operator';
+import SearchFiltersBuilder from './SearchFiltersBuilder';
+import { UnionType } from '../utils/constants';
+import { EXCLUDED_ACTIVE_FILTERS } from './constants';
+
+interface Props {
+    availableFilters: FacetMetadata[];
+    selectedFilters: FacetFilterInput[];
+    unionType: UnionType;
+    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
+    onChangeUnionType?: (unionType: UnionType) => void;
+    onClearFilters: () => void;
+    disabled?: boolean;
+    showUnionType?: boolean;
+    showAddFilter?: boolean;
+    showClearAll?: boolean;
+    isCompact?: boolean;
+    isOperatorDisabled?: boolean;
+}
+
+export default function SelectedSearchFilters({
+    availableFilters,
+    selectedFilters,
+    unionType,
+    onChangeFilters,
+    onChangeUnionType,
+    onClearFilters,
+    disabled = false,
+    showUnionType,
+    showAddFilter,
+    showClearAll,
+    isCompact,
+    isOperatorDisabled,
+}: Props) {
+    // Create the final filter predicates required to render a selected filter option.
+    const finalSelectedFilters = selectedFilters.filter((filter) => !EXCLUDED_ACTIVE_FILTERS.includes(filter.field));
+
+    const filterPredicates: FilterPredicate[] = convertToSelectedFilterPredictes(
+        finalSelectedFilters,
+        availableFilters || [],
+    );
+
+    const updateFilters = (newFilters: FilterPredicate[]) => {
+        const newSelectedFilters = newFilters.map((filter) => {
+            const condition = convertFrontendToBackendOperatorType(filter.operator);
+            return {
+                field: filter.field.field,
+                values: filter.values.map((value) => value.value),
+                condition: condition.operator,
+                negated: condition.negated,
+            };
+        });
+        onChangeFilters(newSelectedFilters);
+    };
+
+    return (
+        <SearchFiltersBuilder
+            filters={filterPredicates}
+            onChangeFilters={updateFilters}
+            onClearFilters={onClearFilters}
+            unionType={unionType}
+            onChangeUnionType={onChangeUnionType}
+            showUnionType={showUnionType}
+            disabled={disabled}
+            showAddFilter={showAddFilter}
+            showClearAll={showClearAll}
+            isCompact={isCompact}
+            isOperatorDisabled={isOperatorDisabled}
+            includeCount={false}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/__tests__/operator.test.tsx b/datahub-web-react/src/app/searchV2/filters/__tests__/operator.test.tsx
new file mode 100644
index 00000000000000..a70a1b5dd52c7c
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/__tests__/operator.test.tsx
@@ -0,0 +1,79 @@
+import { EntityType } from '@src/types.generated';
+import { ENTITY_SUB_TYPE_FILTER_NAME } from '@src/app/search/utils/constants';
+import {
+    ALL_EQUALS_OPERATOR,
+    EQUALS_OPERATOR,
+    EXISTS_OPERATOR,
+    getOperatorOptionsForPredicate,
+    NOT_EQUALS_OPERATOR,
+    NOT_EXISTS_OPERATOR,
+} from '../operator/operator';
+import { FieldType, FilterOperatorType, FilterPredicate } from '../types';
+
+describe('operator', () => {
+    const tagPredicate = {
+        field: {
+            field: 'tags',
+            displayName: 'Tags',
+            entityTypes: [EntityType.Tag],
+            type: FieldType.ENUM,
+        },
+        operator: FilterOperatorType.EQUALS,
+        values: [{ value: 'urn:li:tag:test1', count: 17, entity: null }],
+        defaultValueOptions: [],
+    } as FilterPredicate;
+
+    const platformPredicate = {
+        field: {
+            field: 'platform',
+            displayName: 'Platform',
+            entityTypes: [],
+            type: FieldType.ENUM,
+        },
+        operator: FilterOperatorType.EQUALS,
+        values: [],
+        defaultValueOptions: [],
+    } as FilterPredicate;
+
+    const entitySubtypePredicate = {
+        field: {
+            field: ENTITY_SUB_TYPE_FILTER_NAME,
+            displayName: 'Type',
+            entityTypes: [],
+            type: FieldType.ENUM,
+        },
+        operator: FilterOperatorType.EQUALS,
+        values: [],
+        defaultValueOptions: [],
+    } as FilterPredicate;
+
+    const expectedEnumOptions = [EQUALS_OPERATOR, NOT_EQUALS_OPERATOR, EXISTS_OPERATOR, NOT_EXISTS_OPERATOR];
+
+    const pluralExpectedEnumOptions = [
+        EQUALS_OPERATOR,
+        ALL_EQUALS_OPERATOR,
+        NOT_EQUALS_OPERATOR,
+        EXISTS_OPERATOR,
+        NOT_EXISTS_OPERATOR,
+    ];
+
+    it('should return the expected operator options for a given enum field', () => {
+        const options = getOperatorOptionsForPredicate(tagPredicate, false);
+        expect(options).toMatchObject(expectedEnumOptions);
+    });
+
+    it('should return the expected operator options for a plural enum field', () => {
+        const options = getOperatorOptionsForPredicate(tagPredicate, true);
+        expect(options).toMatchObject(pluralExpectedEnumOptions);
+    });
+
+    it('should not include allEquals if filter is a platform filter', () => {
+        const options = getOperatorOptionsForPredicate(platformPredicate, true);
+        expect(options).toMatchObject(expectedEnumOptions);
+    });
+
+    it('should not include allEquals if filter is in an entity subtype filter', () => {
+        const options = getOperatorOptionsForPredicate(entitySubtypePredicate, true);
+        expect(options).toMatchObject(expectedEnumOptions);
+    });
+});
diff --git a/datahub-web-react/src/app/searchV2/filters/__tests__/utils.test.tsx b/datahub-web-react/src/app/searchV2/filters/__tests__/utils.test.tsx
new file mode 100644
index 00000000000000..2ee8b5bee69ade
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/__tests__/utils.test.tsx
@@ -0,0 +1,469 @@
+import { FolderFilled } from '@ant-design/icons';
+import { DATE_TYPE_URN } from '@src/app/shared/constants';
+import React from 'react';
+import { dataPlatform, dataPlatformInstance, dataset1, glossaryTerm1, user1 } from '../../../../Mocks';
+import { EntityType } from '../../../../types.generated';
+import { getTestEntityRegistry } from '../../../../utils/test-utils/TestPageContainer';
+import { IconStyleType } from '../../../entity/Entity';
+import { ANTD_GRAY } from '../../../entity/shared/constants';
+import {
+    getFilterEntity,
+    getNewFilters,
+    isFilterOptionSelected,
+    getFilterIconAndLabel,
+    PlatformIcon,
+    getNumActiveFiltersForFilter,
+    getNumActiveFiltersForGroupOfFilters,
+    combineAggregations,
+    filterEmptyAggregations,
+    getFilterOptions,
+    filterOptionsWithSearch,
+    canCreateViewFromFilters,
+    isAnyOptionSelected,
+    getStructuredPropFilterDisplayName,
+} from '../utils';
+import { ENTITY_SUB_TYPE_FILTER_NAME } from '../../utils/constants';
+
+describe('filter utils - getNewFilters', () => {
+    it('should get the correct list of filters when adding filters where the filter field did not already exist', () => {
+        const activeFilters = [{ field: 'entity', values: ['test'] }];
+        const selectedFilterValues = ['one', 'two'];
+        const newFilters = getNewFilters('platform', activeFilters, selectedFilterValues);
+        expect(newFilters).toMatchObject([
+            { field: 'entity', values: ['test'] },
+            { field: 'platform', values: ['one', 'two'] },
+        ]);
+    });
+
+    it('should get the correct list of filters when adding filters where the filter field does already exist', () => {
+        const activeFilters = [{ field: 'entity', values: ['test'] }];
+        const selectedFilterValues = ['one', 'two'];
+        const newFilters = getNewFilters('entity', activeFilters, selectedFilterValues);
+        expect(newFilters).toMatchObject([{ field: 'entity', values: ['one', 'two'] }]);
+    });
+
+    it('should get the correct list of filters when adding filters where the filter field does already exist with other filters', () => {
+        const activeFilters = [
+            { field: 'entity', values: ['test'] },
+            { field: 'platform', values: ['one'] },
+        ];
+        const selectedFilterValues = ['one', 'two'];
+        const newFilters = getNewFilters('platform', activeFilters, selectedFilterValues);
+        expect(newFilters).toMatchObject([
+            { field: 'entity', values: ['test'] },
+            { field: 'platform', values: ['one', 'two'] },
+        ]);
+    });
+
+    it('should get the correct list of filters when removing filters all of the filters for a filter type', () => {
+        const activeFilters = [
+            { field: 'entity', values: ['test'] },
+            { field: 'platform', values: ['one'] },
+        ];
+        const selectedFilterValues = [];
+        const newFilters = getNewFilters('platform', activeFilters, selectedFilterValues);
+        expect(newFilters).toMatchObject([{ field: 'entity', values: ['test'] }]);
+    });
+
+    it('should get the correct list of filters when removing filters one of multiple of the filters for a filter type', () => {
+        const activeFilters = [
+            { field: 'entity', values: ['test'] },
+            { field: 'platform', values: ['one', 'two'] },
+        ];
+        const selectedFilterValues = ['two'];
+        const newFilters = getNewFilters('platform', activeFilters, selectedFilterValues);
+        expect(newFilters).toMatchObject([
+            { field: 'entity', values: ['test'] },
+            { field: 'platform', values: ['two'] },
+        ]);
+    });
+});
+
+describe('filter utils - isFilterOptionSelected', () => {
+    const selectedFilterOptions = [
+        { value: 'one', field: 'test' },
+        { value: 'two', field: 'test' },
+        { value: 'DATASETS', field: 'test' },
+    ];
+    it('should return true if the given filter value exists in the list', () => {
+        expect(isFilterOptionSelected(selectedFilterOptions, 'two')).toBe(true);
+    });
+
+    it('should return false if the given filter value does not exist in the list', () => {
+        expect(isFilterOptionSelected(selectedFilterOptions, 'testing123')).toBe(false);
+    });
+
+    it('should return false if the given filter value does not exist in the list, even if values are similar', () => {
+        expect(isFilterOptionSelected(selectedFilterOptions, 'tw')).toBe(false);
+    });
+
+    it('should return true if a parent filter is selected', () => {
+        expect(isFilterOptionSelected(selectedFilterOptions, 'DATASETS␞view')).toBe(true);
+    });
+});
+
+describe('filter utils - isAnyOptionSelected', () => {
+    const selectedFilterOptions = [
+        { value: 'one', field: 'test' },
+        { value: 'two', field: 'test' },
+        { value: 'DATASETS', field: 'test' },
+    ];
+    it('should return true if any of the given filter values exists in the selected values list', () => {
+        expect(isAnyOptionSelected(selectedFilterOptions, ['two', 'four'])).toBe(true);
+    });
+
+    it('should return false if none of the given filter values exists in the selected values list', () => {
+        expect(isAnyOptionSelected(selectedFilterOptions, ['three', 'four'])).toBe(false);
+    });
+});
+
+describe('filter utils - getFilterIconAndLabel', () => {
+    const mockEntityRegistry = getTestEntityRegistry();
+
+    it('should get the correct icon and label for entity filters', () => {
+        const { icon, label } = getFilterIconAndLabel('entity', EntityType.Dataset, mockEntityRegistry, dataset1);
+
+        expect(icon).toMatchObject(
+            mockEntityRegistry.getIcon(EntityType.Dataset, 12, IconStyleType.ACCENT, ANTD_GRAY[9]),
+        );
+        expect(label).toBe(mockEntityRegistry.getCollectionName(EntityType.Dataset));
+    });
+
+    it('should get the correct icon and label for platform filters', () => {
+        const { icon, label } = getFilterIconAndLabel('platform', dataPlatform.urn, mockEntityRegistry, dataPlatform);
+
+        expect(icon).toMatchObject(<PlatformIcon src={dataPlatform.properties.logoUrl} />);
+        expect(label).toBe(mockEntityRegistry.getDisplayName(EntityType.DataPlatform, dataPlatform));
+    });
+
+    it('should get the correct icon and label for filters with associated entity', () => {
+        const { icon, label } = getFilterIconAndLabel('domains', glossaryTerm1.urn, mockEntityRegistry, glossaryTerm1);
+
+        expect(icon).toMatchObject(
+            mockEntityRegistry.getIcon(EntityType.GlossaryTerm, 12, IconStyleType.ACCENT, ANTD_GRAY[9]),
+        );
+        expect(label).toBe(mockEntityRegistry.getDisplayName(EntityType.GlossaryTerm, glossaryTerm1));
+    });
+
+    it('should get the correct icon and label for filters with associated data platform instance entity', () => {
+        const { icon, label } = getFilterIconAndLabel(
+            'domains',
+            glossaryTerm1.urn,
+            mockEntityRegistry,
+            dataPlatformInstance,
+        );
+
+        expect(icon).toMatchObject(<PlatformIcon src={dataPlatformInstance.platform.properties.logoUrl} />);
+        expect(label).toBe(dataPlatformInstance.instanceId);
+    });
+
+    it('should get the correct icon and label for filters with no associated entity', () => {
+        const { icon, label } = getFilterIconAndLabel('origin', 'PROD', mockEntityRegistry, null);
+
+        expect(icon).toBe(null);
+        expect(label).toBe('PROD');
+    });
+
+    it('should get the correct icon and label for browse v2 filters', () => {
+        const { icon, label } = getFilterIconAndLabel(
+            'browsePathV2',
+            '␟long-tail-companions␟view',
+            mockEntityRegistry,
+            null,
+        );
+
+        expect(icon).toMatchObject(<FolderFilled color="black" />);
+        expect(label).toBe('view');
+    });
+
+    it('should override the filter label if we provide an override', () => {
+        const { icon, label } = getFilterIconAndLabel(
+            'browsePathV2',
+            '␟long-tail-companions␟view',
+            mockEntityRegistry,
+            null,
+            12,
+            'TESTING',
+        );
+
+        expect(icon).toMatchObject(<FolderFilled size={12} color="black" />);
+        expect(label).toBe('TESTING');
+    });
+});
+
+describe('filter utils - getFilterEntity', () => {
+    const availableFilters = [
+        {
+            field: 'owners',
+            aggregations: [{ value: 'chris', count: 15 }],
+        },
+        {
+            field: 'platform',
+            aggregations: [
+                { value: 'snowflake', count: 12 },
+                { value: 'dbt', count: 4, entity: dataPlatform },
+            ],
+        },
+    ];
+
+    it('should find and return the filter entity given a filter field and value and availableFilters', () => {
+        expect(getFilterEntity('platform', 'dbt', availableFilters)).toMatchObject(dataPlatform);
+    });
+
+    it('should return null if the given filter has no associated entity in availableFilters', () => {
+        expect(getFilterEntity('platform', 'nonExistent', availableFilters)).toBe(null);
+    });
+});
+
+describe('filter utils - getNumActiveFiltersForFilter', () => {
+    const activeFilters = [
+        { field: 'owners', values: ['chris', 'john'] },
+        { field: 'platform', values: ['dbt'] },
+    ];
+
+    it('should get the number of active filters for a given filter group when there are active filters', () => {
+        const filter = {
+            field: 'owners',
+            aggregations: [
+                { value: 'chris', count: 15 },
+                { value: 'john', count: 11 },
+            ],
+        };
+
+        expect(getNumActiveFiltersForFilter(activeFilters, filter)).toBe(2);
+    });
+
+    it('should get the number of active filters for a given filter group when there are no active filters', () => {
+        const filter = {
+            field: 'tags',
+            aggregations: [{ value: 'tag', count: 15 }],
+        };
+
+        expect(getNumActiveFiltersForFilter(activeFilters, filter)).toBe(0);
+    });
+});
+
+describe('filter utils - getNumActiveFiltersForGroupOfFilters', () => {
+    const activeFilters = [
+        { field: 'owners', values: ['chris', 'john'] },
+        { field: 'platform', values: ['dbt'] },
+    ];
+
+    it('should get the number of active filters for a given filter group when there are active filters', () => {
+        const filters = [
+            {
+                field: 'owners',
+                aggregations: [
+                    { value: 'chris', count: 15 },
+                    { value: 'john', count: 11 },
+                ],
+            },
+            {
+                field: 'tags',
+                aggregations: [{ value: 'tag1', count: 15 }],
+            },
+        ];
+
+        expect(getNumActiveFiltersForGroupOfFilters(activeFilters, filters)).toBe(2);
+    });
+
+    it('should get the number of active filters for a given filter group when there are no active filters', () => {
+        const filters = [
+            {
+                field: 'tags',
+                aggregations: [{ value: 'tag', count: 15 }],
+            },
+            {
+                field: 'origin',
+                aggregations: [
+                    { value: 'prod', count: 15 },
+                    { value: 'dev', count: 15 },
+                ],
+            },
+        ];
+
+        expect(getNumActiveFiltersForGroupOfFilters(activeFilters, filters)).toBe(0);
+    });
+});
+
+describe('filter utils - combineAggregations', () => {
+    const originalAggs = [
+        { value: 'aditya', count: 10 },
+        { value: 'maggie', count: 5 },
+        { value: 'brittanie', count: 500 },
+    ];
+
+    it('should combine aggregations given some original aggregations, a list of new facets, and a filter field', () => {
+        const newFacets = [
+            {
+                field: 'platform',
+                aggregations: [{ value: 'dbt', count: 15 }],
+            },
+            {
+                field: 'owners',
+                aggregations: [
+                    { value: 'chris', count: 15 },
+                    { value: 'john', count: 20 },
+                ],
+            },
+        ];
+
+        const combinedAggregations = combineAggregations('owners', originalAggs, newFacets);
+
+        expect(combinedAggregations).toMatchObject([
+            { value: 'aditya', count: 10 },
+            { value: 'maggie', count: 5 },
+            { value: 'brittanie', count: 500 },
+            { value: 'chris', count: 15 },
+            { value: 'john', count: 20 },
+        ]);
+    });
+
+    it('should return the original aggs when newFacets are not provided', () => {
+        const combinedAggregations = combineAggregations('owners', originalAggs);
+
+        expect(combinedAggregations).toMatchObject([
+            { value: 'aditya', count: 10 },
+            { value: 'maggie', count: 5 },
+            { value: 'brittanie', count: 500 },
+        ]);
+    });
+});
+
+describe('filter utils - filterEmptyAggregations', () => {
+    const originalAggs = [
+        { value: 'aditya', count: 10 },
+        { value: 'maggie', count: 5 },
+        { value: 'brittanie', count: 0 },
+        { value: 'john', count: 0 },
+    ];
+
+    it('should filter out empty aggregations unless they are in activeFilters', () => {
+        const activeFilters = [
+            { field: 'owners', values: ['chris', 'john'] },
+            { field: 'platform', values: ['dbt'] },
+        ];
+
+        const filteredAggregations = filterEmptyAggregations(originalAggs, activeFilters);
+
+        expect(filteredAggregations).toMatchObject([
+            { value: 'aditya', count: 10 },
+            { value: 'maggie', count: 5 },
+            { value: 'john', count: 0 },
+        ]);
+    });
+});
+
+describe('filter utils - getFilterOptions', () => {
+    const originalAggs = [
+        { value: 'aditya', count: 10 },
+        { value: 'maggie', count: 5 },
+        { value: 'brittanie', count: 0 },
+        { value: 'john', count: 0 },
+    ];
+    const selectedFilterOptions = [
+        { value: 'aditya', field: 'owners' },
+        { value: 'chris', field: 'owners' },
+    ];
+
+    it('should convert aggregations into filterOptions while adding missing filterOptions to the beginning', () => {
+        const filterOptions = getFilterOptions('glossaryTerms', originalAggs, selectedFilterOptions);
+
+        expect(filterOptions).toMatchObject([
+            { value: 'chris' },
+            { value: 'aditya', count: 10 },
+            { value: 'maggie', count: 5 },
+            { value: 'brittanie', count: 0 },
+            { value: 'john', count: 0 },
+        ]);
+    });
+
+    it('should add auto complete results to the returned list', () => {
+        const autoCompleteResults = {
+            autoCompleteForMultiple: { suggestions: [{ type: EntityType.CorpUser, entities: [user1] }] },
+        };
+        const filterOptions = getFilterOptions(
+            'owners',
+            originalAggs,
+            selectedFilterOptions,
+            autoCompleteResults as any,
+        );
+
+        expect(filterOptions).toMatchObject([
+            { value: 'chris', field: 'owners' },
+            { value: 'aditya', count: 10, field: 'owners' },
+            { value: 'maggie', count: 5, field: 'owners' },
+            { value: 'brittanie', count: 0, field: 'owners' },
+            { value: 'john', count: 0, field: 'owners' },
+            { value: user1.urn, entity: user1, field: 'owners' },
+        ]);
+    });
+});
+
+describe('filter utils - filterOptionsWithSearch', () => {
+    it('should return true if the name includes the search query', () => {
+        expect(filterOptionsWithSearch('test', 'testing123')).toBe(true);
+    });
+
+    it('should return false if the name includes the search query', () => {
+        expect(filterOptionsWithSearch('test', 'hello')).toBe(false);
+    });
+
+    it('should return true if there is no search query', () => {
+        expect(filterOptionsWithSearch('', 'hello')).toBe(true);
+    });
+});
+
+describe('filter utils - canCreateViewFromFilters', () => {
+    it('should return false if there is mixing of entity type and subtypes in the nested subtypes filter', () => {
+        const activeFilters = [
+            { field: 'platform', values: ['one', 'two'] },
+            { field: ENTITY_SUB_TYPE_FILTER_NAME, values: ['DATASETS', 'CONTAINERS␞schema'] },
+        ];
+        expect(canCreateViewFromFilters(activeFilters)).toBe(false);
+    });
+
+    it('should return true if there is no mixing of entity type and subtypes in the nested subtypes filter', () => {
+        const activeFilters = [
+            { field: 'platform', values: ['one', 'two'] },
+            { field: ENTITY_SUB_TYPE_FILTER_NAME, values: ['DATASETS', 'CONTAINERS'] },
+        ];
+        expect(canCreateViewFromFilters(activeFilters)).toBe(true);
+    });
+});
+
+describe('filter utils - getStructuredPropFilterDisplayName', () => {
+    it('should return undefined if the field is not a structured property filter', () => {
+        expect(getStructuredPropFilterDisplayName('test', 'test')).toBe(undefined);
+    });
+
+    it('should return undefined if the value is an entity since those are handled separately', () => {
+        expect(getStructuredPropFilterDisplayName('structuredProperties.steward', 'urn:li:corpuser:admin')).toBe(
+            undefined,
+        );
+    });
+
+    it('should return a formatted date if the structured property has type date', () => {
+        const structuredProperty = { definition: { valueType: { urn: DATE_TYPE_URN } } } as any;
+        expect(
+            getStructuredPropFilterDisplayName(
+                'structuredProperties.deprecationDate',
+                '1727740800000',
+                structuredProperty,
+            ),
+        ).toBe('10/01/2024');
+    });
+
+    it('should return a properly formatted number if it is a number type', () => {
+        expect(getStructuredPropFilterDisplayName('structuredProperties.retentionTime', '90.0')).toBe('90');
+    });
+
+    it('should strip rich text formatting to be displayed', () => {
+        expect(
+            getStructuredPropFilterDisplayName(
+                'structuredProperties.retentionTime',
+                '`test` _value_ for a [rich](www.google.com) text **situation** right here!',
+            ),
+        ).toBe('test value for a rich text situation right here!');
+    });
+});
diff --git a/datahub-web-react/src/app/searchV2/filters/constants.ts b/datahub-web-react/src/app/searchV2/filters/constants.ts
new file mode 100644
index 00000000000000..c78390964bb35c
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/constants.ts
@@ -0,0 +1,57 @@
+import { LAST_MODIFIED_FILTER } from '@app/searchV2/filters/field/fields';
+import { FilterField } from '@app/searchV2/filters/types';
+import { EntityType } from '../../../types.generated';
+import {
+    BROWSE_PATH_V2_FILTER_NAME,
+    CHART_TYPE_FILTER_NAME,
+    CONTAINER_FILTER_NAME,
+    DOMAINS_FILTER_NAME,
+    ENTITY_FILTER_NAME,
+    ENTITY_INDEX_FILTER_NAME,
+    ENTITY_SUB_TYPE_FILTER_NAME,
+    GLOSSARY_TERMS_FILTER_NAME,
+    LAST_MODIFIED_FILTER_NAME,
+    LEGACY_ENTITY_FILTER_NAME,
+    ORIGIN_FILTER_NAME,
+    OWNERS_FILTER_NAME,
+    PLATFORM_FILTER_NAME,
+    TAGS_FILTER_NAME,
+    TYPE_NAMES_FILTER_NAME,
+} from '../utils/constants';
+
+export const SORTED_FILTERS = [
+    ENTITY_SUB_TYPE_FILTER_NAME,
+    PLATFORM_FILTER_NAME,
+    ORIGIN_FILTER_NAME,
+    OWNERS_FILTER_NAME,
+    GLOSSARY_TERMS_FILTER_NAME,
+    TAGS_FILTER_NAME,
+    DOMAINS_FILTER_NAME,
+    LAST_MODIFIED_FILTER_NAME,
+    CONTAINER_FILTER_NAME,
+];
+
+export const FACETS_TO_ENTITY_TYPES = {
+    [DOMAINS_FILTER_NAME]: [EntityType.Domain],
+    [GLOSSARY_TERMS_FILTER_NAME]: [EntityType.GlossaryTerm],
+    [OWNERS_FILTER_NAME]: [EntityType.CorpUser, EntityType.CorpGroup],
+    [TAGS_FILTER_NAME]: [EntityType.Tag],
+    [CONTAINER_FILTER_NAME]: [EntityType.Container],
+};
+
+// remove legacy filter options as well as new _index and browsePathV2 filter from dropdowns
+export const FILTERS_TO_REMOVE = [
+    ENTITY_FILTER_NAME, // Use _entityType > typeNames as the default.
+    TYPE_NAMES_FILTER_NAME,
+    LEGACY_ENTITY_FILTER_NAME,
+    ENTITY_INDEX_FILTER_NAME,
+    BROWSE_PATH_V2_FILTER_NAME,
+    CONTAINER_FILTER_NAME,
+    CHART_TYPE_FILTER_NAME,
+];
+
+// filters that should not be shown in the active filters section
+export const EXCLUDED_ACTIVE_FILTERS = [BROWSE_PATH_V2_FILTER_NAME];
+
+// Filters not based on facets
+export const NON_FACET_FILTER_FIELDS: FilterField[] = [LAST_MODIFIED_FILTER];
diff --git a/datahub-web-react/src/app/searchV2/filters/field/fields.tsx b/datahub-web-react/src/app/searchV2/filters/field/fields.tsx
new file mode 100644
index 00000000000000..a658bf0610096b
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/field/fields.tsx
@@ -0,0 +1,305 @@
+import Icon from '@ant-design/icons/lib/components/Icon';
+import { TimerOutlined } from '@mui/icons-material';
+import TableIcon from '@src/images/table-icon.svg?react';
+import React from 'react';
+import {
+    CloseCircleOutlined,
+    EnvironmentOutlined,
+    DatabaseOutlined,
+    DeleteOutlined,
+    FileOutlined,
+    FileTextOutlined,
+    FolderOutlined,
+    LayoutOutlined,
+    TagOutlined,
+    UserOutlined,
+    WarningOutlined,
+} from '@ant-design/icons';
+import { BookmarkSimple, Globe } from '@phosphor-icons/react';
+import { EntityType } from '../../../../types.generated';
+import {
+    BROWSE_PATH_V2_FILTER_NAME,
+    CONTAINER_FILTER_NAME,
+    DATA_PLATFORM_INSTANCE_FILTER_NAME,
+    DATA_PRODUCT_FILTER_NAME,
+    DESCRIPTION_FILTER_NAME,
+    DOMAINS_FILTER_NAME,
+    ENTITY_FILTER_NAME,
+    ENTITY_SUB_TYPE_FILTER_NAME,
+    FIELD_DESCRIPTIONS_FILTER_NAME,
+    FIELD_GLOSSARY_TERMS_FILTER_NAME,
+    FIELD_PATHS_FILTER_NAME,
+    FIELD_TAGS_FILTER_NAME,
+    FIELD_TO_LABEL,
+    GLOSSARY_TERMS_FILTER_NAME,
+    HAS_ACTIVE_INCIDENTS_FILTER_NAME,
+    HAS_FAILING_ASSERTIONS_FILTER_NAME,
+    LAST_MODIFIED_FILTER_NAME,
+    ORIGIN_FILTER_NAME,
+    OWNERS_FILTER_NAME,
+    PLATFORM_FILTER_NAME,
+    REMOVED_FILTER_NAME,
+    STRUCTURED_PROPERTIES_FILTER_NAME,
+    TAGS_FILTER_NAME,
+    TYPE_NAMES_FILTER_NAME,
+} from '../../utils/constants';
+import { FieldType, FilterField } from '../types';
+
+export const ENTITY_SUB_TYPE_FILTER: FilterField = {
+    field: ENTITY_SUB_TYPE_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[ENTITY_SUB_TYPE_FILTER_NAME],
+    type: FieldType.NESTED_ENTITY_TYPE,
+    icon: <FileOutlined />,
+};
+
+export const ENTITY_TYPE_FILTER: FilterField = {
+    field: ENTITY_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[ENTITY_FILTER_NAME],
+    type: FieldType.ENTITY_TYPE,
+    icon: <FileOutlined />,
+};
+
+export const TYPE_NAMES_FILTER: FilterField = {
+    field: TYPE_NAMES_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[TYPE_NAMES_FILTER_NAME],
+    type: FieldType.ENUM,
+    icon: <FileOutlined />,
+};
+
+export const PLATFORM_FILTER: FilterField = {
+    field: PLATFORM_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[PLATFORM_FILTER_NAME],
+    type: FieldType.ENTITY,
+    entityTypes: [EntityType.DataPlatform],
+    icon: <DatabaseOutlined />,
+};
+
+export const OWNERS_FILTER: FilterField = {
+    field: OWNERS_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[OWNERS_FILTER_NAME],
+    type: FieldType.ENTITY,
+    entityTypes: [EntityType.CorpUser, EntityType.CorpGroup],
+    icon: <UserOutlined />,
+};
+
+export const DOMAINS_FILTER: FilterField = {
+    field: DOMAINS_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[DOMAINS_FILTER_NAME],
+    type: FieldType.ENTITY,
+    entityTypes: [EntityType.Domain],
+    icon: <Globe />,
+};
+
+export const TAGS_FILTER: FilterField = {
+    field: TAGS_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[TAGS_FILTER_NAME],
+    type: FieldType.ENTITY,
+    entityTypes: [EntityType.Tag],
+    icon: <TagOutlined />,
+};
+
+export const GLOSSARY_TERMS_FILTER: FilterField = {
+    field: GLOSSARY_TERMS_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[GLOSSARY_TERMS_FILTER_NAME],
+    type: FieldType.ENTITY,
+    entityTypes: [EntityType.GlossaryTerm],
+    icon: <BookmarkSimple />,
+};
+
+export const CONTAINER_FILTER: FilterField = {
+    field: CONTAINER_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[CONTAINER_FILTER_NAME],
+    type: FieldType.ENTITY,
+    entityTypes: [EntityType.Container],
+    icon: <FolderOutlined />,
+};
+
+export const FIELD_PATHS_FILTER: FilterField = {
+    field: FIELD_PATHS_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[FIELD_PATHS_FILTER_NAME],
+    type: FieldType.TEXT,
+    icon: <LayoutOutlined />,
+};
+
+export const FIELD_TAGS_FILTER: FilterField = {
+    field: FIELD_TAGS_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[FIELD_TAGS_FILTER_NAME],
+    type: FieldType.ENTITY,
+    entityTypes: [EntityType.Tag],
+    icon: <TagOutlined />,
+};
+
+export const FIELD_GLOSSARY_TERMS_FILTER: FilterField = {
+    field: FIELD_GLOSSARY_TERMS_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[FIELD_GLOSSARY_TERMS_FILTER_NAME],
+    type: FieldType.ENTITY,
+    entityTypes: [EntityType.GlossaryTerm],
+    icon: <BookmarkSimple />,
+};
+
+export const DESCRIPTION_FILTER: FilterField = {
+    field: DESCRIPTION_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[DESCRIPTION_FILTER_NAME],
+    type: FieldType.TEXT,
+    icon: <FileTextOutlined />,
+};
+
+export const FIELD_DESCRIPTIONS_FILTER: FilterField = {
+    field: FIELD_DESCRIPTIONS_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[FIELD_DESCRIPTIONS_FILTER_NAME],
+    type: FieldType.TEXT,
+    icon: <FileTextOutlined />,
+};
+
+export const REMOVED_FILTER: FilterField = {
+    field: REMOVED_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[REMOVED_FILTER_NAME],
+    type: FieldType.BOOLEAN,
+    icon: <DeleteOutlined />,
+};
+
+export const HAS_ACTIVE_INCIDENTS_FILTER: FilterField = {
+    field: HAS_ACTIVE_INCIDENTS_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[HAS_ACTIVE_INCIDENTS_FILTER_NAME],
+    type: FieldType.BOOLEAN,
+    icon: <WarningOutlined />,
+};
+
+export const HAS_FAILING_ASSERTIONS_FILTER: FilterField = {
+    field: HAS_FAILING_ASSERTIONS_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[HAS_FAILING_ASSERTIONS_FILTER_NAME],
+    type: FieldType.BOOLEAN,
+    icon: <CloseCircleOutlined />,
+};
+
+export const ORIGIN_FILTER: FilterField = {
+    field: ORIGIN_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[ORIGIN_FILTER_NAME],
+    type: FieldType.ENUM,
+    icon: <EnvironmentOutlined />,
+};
+
+export const DATA_PLATFORM_INSTANCE_FILTER: FilterField = {
+    field: DATA_PLATFORM_INSTANCE_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[DATA_PLATFORM_INSTANCE_FILTER_NAME],
+    type: FieldType.ENTITY,
+    icon: <DatabaseOutlined />,
+    entityTypes: [EntityType.DataPlatformInstance],
+};
+
+export const DATA_PRODUCT_FILTER: FilterField = {
+    field: DATA_PRODUCT_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[DATA_PRODUCT_FILTER_NAME],
+    type: FieldType.ENTITY,
+    entityTypes: [EntityType.DataProduct],
+};
+
+export const STRUCTURED_PROPERTY_FILTER: FilterField = {
+    field: STRUCTURED_PROPERTIES_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[STRUCTURED_PROPERTIES_FILTER_NAME],
+    type: FieldType.TEXT,
+    icon: <Icon component={TableIcon} />,
+};
+
+const DAY_IN_MILLIS = 24 * 60 * 60 * 1000;
+
+export const LAST_MODIFIED_FILTER: FilterField = {
+    field: LAST_MODIFIED_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[LAST_MODIFIED_FILTER_NAME],
+    type: FieldType.BUCKETED_TIMESTAMP,
+    icon: <TimerOutlined fontSize="inherit" color="inherit" />,
+    useDatePicker: true,
+    options: [
+        {
+            label: 'Last 1 day',
+            startOffsetMillis: DAY_IN_MILLIS,
+        },
+        {
+            label: 'Last 3 days',
+            startOffsetMillis: 3 * DAY_IN_MILLIS,
+        },
+        {
+            label: 'Last week',
+            startOffsetMillis: 7 * DAY_IN_MILLIS,
+        },
+        {
+            label: 'Last two weeks',
+            startOffsetMillis: 14 * DAY_IN_MILLIS,
+        },
+        {
+            label: 'Last month',
+            startOffsetMillis: 31 * DAY_IN_MILLIS,
+        },
+        {
+            label: 'Last 3 months',
+            startOffsetMillis: 92 * DAY_IN_MILLIS,
+        },
+        {
+            label: 'Last 6 months',
+            startOffsetMillis: 184 * DAY_IN_MILLIS,
+        },
+        {
+            label: 'Last year',
+            startOffsetMillis: 365 * DAY_IN_MILLIS,
+        },
+    ],
+};
+
+export const BROWSE_FILTER: FilterField = {
+    field: BROWSE_PATH_V2_FILTER_NAME,
+    displayName: FIELD_TO_LABEL[BROWSE_PATH_V2_FILTER_NAME],
+    type: FieldType.BROWSE_PATH,
+    icon: <FolderOutlined />,
+};
+
+export const DEFAULT_FILTER_FIELDS: FilterField[] = [
+    ENTITY_SUB_TYPE_FILTER,
+    PLATFORM_FILTER,
+    OWNERS_FILTER,
+    DOMAINS_FILTER,
+    DATA_PRODUCT_FILTER,
+    LAST_MODIFIED_FILTER,
+    TAGS_FILTER,
+    GLOSSARY_TERMS_FILTER,
+    CONTAINER_FILTER,
+    FIELD_PATHS_FILTER,
+    FIELD_TAGS_FILTER,
+    FIELD_GLOSSARY_TERMS_FILTER,
+    DESCRIPTION_FILTER,
+    FIELD_DESCRIPTIONS_FILTER,
+    REMOVED_FILTER,
+    HAS_ACTIVE_INCIDENTS_FILTER,
+    HAS_FAILING_ASSERTIONS_FILTER,
+    ORIGIN_FILTER,
+    DATA_PLATFORM_INSTANCE_FILTER,
+];
+
+export const VIEW_BUILDER_FIELDS: FilterField[] = [
+    ENTITY_TYPE_FILTER,
+    TYPE_NAMES_FILTER,
+    PLATFORM_FILTER,
+    OWNERS_FILTER,
+    DOMAINS_FILTER,
+    DATA_PRODUCT_FILTER,
+    LAST_MODIFIED_FILTER,
+    TAGS_FILTER,
+    GLOSSARY_TERMS_FILTER,
+    CONTAINER_FILTER,
+    FIELD_PATHS_FILTER,
+    FIELD_TAGS_FILTER,
+    FIELD_GLOSSARY_TERMS_FILTER,
+    DESCRIPTION_FILTER,
+    FIELD_DESCRIPTIONS_FILTER,
+    REMOVED_FILTER,
+    HAS_ACTIVE_INCIDENTS_FILTER,
+    HAS_FAILING_ASSERTIONS_FILTER,
+    ORIGIN_FILTER,
+    DATA_PLATFORM_INSTANCE_FILTER,
+];
+
+export const ALL_FILTER_FIELDS: FilterField[] = [
+    ...DEFAULT_FILTER_FIELDS,
+    ENTITY_TYPE_FILTER,
+    TYPE_NAMES_FILTER,
+    BROWSE_FILTER,
+];
diff --git a/datahub-web-react/src/app/searchV2/filters/mapFilterOption.tsx b/datahub-web-react/src/app/searchV2/filters/mapFilterOption.tsx
new file mode 100644
index 00000000000000..f8456a9dea4887
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/mapFilterOption.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import { EntityRegistry } from '../../../entityRegistryContext';
+import FilterOption from './FilterOption';
+import { FilterOptionType } from './types';
+import { getFilterIconAndLabel } from './utils';
+
+export interface DisplayedFilterOption {
+    key: string;
+    label: React.ReactNode;
+    style: any;
+    displayName?: string | null;
+    nestedOptions?: FilterOptionType[];
+}
+
+interface CreateFilterOptionProps {
+    filterOption: FilterOptionType;
+    entityRegistry: EntityRegistry;
+    selectedFilterOptions: FilterOptionType[];
+    setSelectedFilterOptions: (values: FilterOptionType[]) => void;
+    nestedOptions?: FilterOptionType[];
+    includeCount?: boolean;
+}
+
+export function mapFilterOption({
+    filterOption,
+    entityRegistry,
+    selectedFilterOptions,
+    setSelectedFilterOptions,
+    nestedOptions,
+    includeCount = true,
+}: CreateFilterOptionProps): DisplayedFilterOption {
+    const { label: displayName } = getFilterIconAndLabel(
+        filterOption.field,
+        filterOption.value,
+        entityRegistry,
+        filterOption.entity || null,
+        undefined,
+        filterOption.displayName,
+    );
+
+    return {
+        key: filterOption.value,
+        label: (
+            <FilterOption
+                filterOption={filterOption}
+                selectedFilterOptions={selectedFilterOptions}
+                setSelectedFilterOptions={setSelectedFilterOptions}
+                nestedOptions={nestedOptions}
+                includeCount={includeCount}
+            />
+        ),
+        style: { padding: 0 },
+        displayName: displayName as string,
+        nestedOptions,
+    };
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/operator/operator.tsx b/datahub-web-react/src/app/searchV2/filters/operator/operator.tsx
new file mode 100644
index 00000000000000..fe537aceced2ae
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/operator/operator.tsx
@@ -0,0 +1,264 @@
+import React from 'react';
+import { CheckCircleOutlined, PlusCircleOutlined, PlusOutlined, StopOutlined } from '@ant-design/icons';
+import { ENTITY_SUB_TYPE_FILTER_NAME, PLATFORM_FILTER_NAME } from '@src/app/search/utils/constants';
+import { FilterOperator } from '../../../../types.generated';
+import { FieldType, FilterOperatorInfo, FilterOperatorType, FilterPredicate, FrontendFilterOperator } from '../types';
+import { getIsDateRangeFilter } from '../utils';
+
+/**
+ * This is a flat version of the supported search filtering operations that can be applied
+ * for a given field. It dictates what options are shown to the user.
+ *
+ * We map these into the backend model, which is split into 2 fields:
+ *
+ * - operator: the operator to apply
+ * - negated: whether to negate the operator
+ *
+ */
+export const EQUALS_OPERATOR = {
+    type: FilterOperatorType.EQUALS,
+    text: 'equals',
+    pluralText: 'is any of',
+    filter: {
+        operator: FilterOperator.Equal,
+        negated: false,
+    },
+    icon: <PlusOutlined />,
+};
+
+export const ALL_EQUALS_OPERATOR = {
+    type: FilterOperatorType.ALL_EQUALS,
+    text: 'equals',
+    pluralText: 'is all of',
+    filter: {
+        operator: FrontendFilterOperator.AllEqual,
+        negated: false,
+    },
+    icon: <PlusCircleOutlined />,
+};
+
+export const EXISTS_OPERATOR = {
+    type: FilterOperatorType.EXISTS,
+    text: 'exists',
+    filter: {
+        operator: FilterOperator.Exists,
+        negated: false,
+    },
+    icon: <CheckCircleOutlined />,
+};
+
+export const NOT_EQUALS_OPERATOR = {
+    type: FilterOperatorType.NOT_EQUALS,
+    text: 'does not equal',
+    pluralText: 'is not any of',
+    filter: {
+        operator: FilterOperator.Equal,
+        negated: true,
+    },
+    icon: <StopOutlined />,
+};
+
+export const NOT_EXISTS_OPERATOR = {
+    type: FilterOperatorType.NOT_EXISTS,
+    text: 'does not exist',
+    filter: {
+        operator: FilterOperator.Exists,
+        negated: true,
+    },
+    icon: <StopOutlined />,
+};
+
+export const CONTAINS_OPERATOR = {
+    type: FilterOperatorType.CONTAINS,
+    text: 'contains',
+    pluralText: 'contains any of',
+    filter: {
+        operator: FilterOperator.Contain,
+        negated: false,
+    },
+};
+
+export const NOT_CONTAINS_OPERATOR = {
+    type: FilterOperatorType.NOT_CONTAINS,
+    text: 'does not contain',
+    pluralText: 'does not contain any of',
+    filter: {
+        operator: FilterOperator.Contain,
+        negated: true,
+    },
+};
+
+export const GREATER_THAN_OPERATOR = {
+    type: FilterOperatorType.GREATER_THAN,
+    text: 'is greater than',
+    filter: {
+        operator: FilterOperator.GreaterThan,
+        negated: false,
+    },
+};
+
+export const GREATER_THAN_OR_EQUALS_OPERATOR = {
+    type: FilterOperatorType.GREATER_THAN_OR_EQUALS,
+    text: 'is greater than or equal to',
+    filter: {
+        operator: FilterOperator.GreaterThanOrEqualTo,
+        negated: false,
+    },
+};
+
+export const LESS_THAN_OPERATOR = {
+    type: FilterOperatorType.LESS_THAN,
+    text: 'is less than',
+    filter: {
+        operator: FilterOperator.LessThan,
+        negated: false,
+    },
+};
+
+export const LESS_THAN_OR_EQUALS_OPERATOR = {
+    type: FilterOperatorType.LESS_THAN_OR_EQUALS,
+    text: 'is less than or equal to',
+    filter: {
+        operator: FilterOperator.LessThanOrEqualTo,
+        negated: false,
+    },
+};
+
+export const SUPPORTED_OPERATORS: FilterOperatorInfo[] = [
+    EQUALS_OPERATOR,
+    ALL_EQUALS_OPERATOR,
+    NOT_EQUALS_OPERATOR,
+    EXISTS_OPERATOR,
+    NOT_EXISTS_OPERATOR,
+    CONTAINS_OPERATOR,
+    NOT_CONTAINS_OPERATOR,
+    GREATER_THAN_OPERATOR,
+    GREATER_THAN_OR_EQUALS_OPERATOR,
+    LESS_THAN_OPERATOR,
+    LESS_THAN_OR_EQUALS_OPERATOR,
+];
+
+export const SEARCH_FILTER_CONDITION_TYPE_TO_INFO = new Map<FilterOperatorType, FilterOperatorInfo>(
+    SUPPORTED_OPERATORS.map((condition) => [condition.type, condition]),
+);
+
+// Fallback used when we don't know the type of the field.
+export const BASE_CONDITION_TYPES = [
+    FilterOperatorType.EQUALS,
+    FilterOperatorType.ALL_EQUALS,
+    FilterOperatorType.NOT_EQUALS,
+    FilterOperatorType.EXISTS,
+    FilterOperatorType.NOT_EXISTS,
+];
+
+export const TEXT_CONDITION_TYPES = [
+    FilterOperatorType.CONTAINS,
+    FilterOperatorType.NOT_CONTAINS,
+    ...BASE_CONDITION_TYPES,
+];
+
+export const BUCKETED_TIMESTAMP_CONDITION_TYPES = [FilterOperatorType.GREATER_THAN, FilterOperatorType.LESS_THAN];
+
+export const NUMBER_CONDITION_TYPES = [
+    ...BASE_CONDITION_TYPES,
+    FilterOperatorType.GREATER_THAN,
+    FilterOperatorType.GREATER_THAN_OR_EQUALS,
+    FilterOperatorType.LESS_THAN,
+    FilterOperatorType.LESS_THAN_OR_EQUALS,
+    FilterOperatorType.IS_ANY_OF,
+    FilterOperatorType.IS_NOT_ANY_OF,
+];
+
+export const BROWSE_CONDITION_TYPES = [FilterOperatorType.EQUALS];
+
+export const BOOLEAN_CONDITION_TYPES = [FilterOperatorType.EQUALS, FilterOperatorType.NOT_EQUALS];
+
+// todo
+export const DATE_CONDITION_TYPES = [...BASE_CONDITION_TYPES];
+
+export const PLURAL_ONLY_CONDITION_TYPES = [FilterOperatorType.ALL_EQUALS];
+
+export const FIELDS_WITHOUT_ALL_EQUALS_OPERATOR = [PLATFORM_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_NAME];
+
+const applyFiltersToOperatorOptions = (fieldName: string, operatorOptions: FilterOperatorInfo[], isPlural: boolean) => {
+    const excludePluralConditions = FIELDS_WITHOUT_ALL_EQUALS_OPERATOR.includes(fieldName);
+    return isPlural && !excludePluralConditions
+        ? operatorOptions
+        : operatorOptions.filter((o) => !PLURAL_ONLY_CONDITION_TYPES.includes(o.type));
+};
+
+/**
+ * How we determine which condition options to show after a user has selected a specific field to filter on?
+ * We do this using the type of the field, which we can determine from the predicate.
+ *
+ * @param predicate
+ * @returns
+ */
+export const getOperatorOptionsForPredicate = (predicate: FilterPredicate, isPlural: boolean): FilterOperatorInfo[] => {
+    const isDateRangeFilter = getIsDateRangeFilter(predicate.field);
+    if (isDateRangeFilter) {
+        return BUCKETED_TIMESTAMP_CONDITION_TYPES.map((type) => SEARCH_FILTER_CONDITION_TYPE_TO_INFO.get(type)!);
+    }
+    let operatorOptions: FilterOperatorInfo[] = [];
+    switch (predicate.field.type) {
+        /* eslint-disable @typescript-eslint/no-non-null-assertion */
+        case FieldType.TEXT:
+            operatorOptions = TEXT_CONDITION_TYPES.map((type) => SEARCH_FILTER_CONDITION_TYPE_TO_INFO.get(type)!);
+            break;
+        case FieldType.BOOLEAN:
+            operatorOptions = BOOLEAN_CONDITION_TYPES.map((type) => SEARCH_FILTER_CONDITION_TYPE_TO_INFO.get(type)!);
+            break;
+        case FieldType.BROWSE_PATH:
+            operatorOptions = BROWSE_CONDITION_TYPES.map((type) => SEARCH_FILTER_CONDITION_TYPE_TO_INFO.get(type)!);
+            break;
+        case FieldType.BUCKETED_TIMESTAMP:
+            operatorOptions = BUCKETED_TIMESTAMP_CONDITION_TYPES.map(
+                (type) => SEARCH_FILTER_CONDITION_TYPE_TO_INFO.get(type)!,
+            );
+            break;
+        // case FieldType.NUMBER:
+        //     return NUMBER_CONDITION_TYPES.map((type) => SEARCH_FILTER_CONDITION_TYPE_TO_INFO.get(type)!);
+        // case FieldType.DATE:
+        //     return DATE_CONDITION_TYPES.map((type) => SEARCH_FILTER_CONDITION_TYPE_TO_INFO.get(type)!);
+        default:
+            operatorOptions = BASE_CONDITION_TYPES.map((type) => SEARCH_FILTER_CONDITION_TYPE_TO_INFO.get(type)!);
+            break;
+        /* eslint-enable @typescript-eslint/no-non-null-assertion */
+    }
+    return applyFiltersToOperatorOptions(predicate.field.field, operatorOptions, isPlural);
+};
+
+export const convertBackendToFrontendOperatorInfo = ({
+    operator,
+    negated,
+}: {
+    operator: FilterOperator;
+    negated: boolean;
+}): FilterOperatorInfo | undefined => {
+    return SUPPORTED_OPERATORS.find((info) => {
+        return info.filter.operator === operator && info.filter.negated === negated;
+    });
+};
+
+export const convertBackendToFrontendOperatorType = ({
+    operator,
+    negated,
+}: {
+    operator: FilterOperator;
+    negated: boolean;
+}): FilterOperatorType | undefined => {
+    return SUPPORTED_OPERATORS.find((info) => {
+        return info.filter.operator === operator && info.filter.negated === negated;
+    })?.type;
+};
+
+export const convertFrontendToBackendOperatorType = (
+    type: FilterOperatorType,
+): { operator: FilterOperator; negated: boolean } => {
+    return SEARCH_FILTER_CONDITION_TYPE_TO_INFO.get(type)?.filter as any;
+};
+
+// Returns true if the operator accepts values.
+export const operatorRequiresValues = (type: FilterOperatorType): boolean => {
+    return type !== FilterOperatorType.EXISTS && type !== FilterOperatorType.NOT_EXISTS;
+};
diff --git a/datahub-web-react/src/app/searchV2/filters/render/FilterRenderer.tsx b/datahub-web-react/src/app/searchV2/filters/render/FilterRenderer.tsx
new file mode 100644
index 00000000000000..bf1aa347f92c52
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/render/FilterRenderer.tsx
@@ -0,0 +1,29 @@
+import { FilterRenderProps } from './types';
+
+/**
+ * Base interface used for custom search filter renderers
+ *
+ */
+export interface FilterRenderer {
+    /**
+     * The filter field that is rendered by this renderer
+     */
+    field: string;
+
+    /**
+     * Renders the filter
+     */
+    render: (props: FilterRenderProps) => JSX.Element;
+
+    /**
+     * Ant-design icon associated with the Entity. For a list of all candidate icons, see
+     * https://ant.design/components/icon/
+     */
+    icon: () => JSX.Element;
+
+    /**
+     * Returns a label for rendering the value of a particular field, e.g. for rendering the selected set of filters.
+     * Currently only for rendering the selected value set below Search V2 top-bar.
+     */
+    valueLabel: (value: string) => JSX.Element;
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/render/FilterRendererRegistry.tsx b/datahub-web-react/src/app/searchV2/filters/render/FilterRendererRegistry.tsx
new file mode 100644
index 00000000000000..0ceed3af25d621
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/render/FilterRendererRegistry.tsx
@@ -0,0 +1,42 @@
+import { FilterRenderer } from './FilterRenderer';
+import { FilterRenderProps } from './types';
+
+function validatedGet<K, V>(key: K, map: Map<K, V>): V {
+    if (map.has(key)) {
+        return map.get(key) as V;
+    }
+    throw new Error(`Unrecognized key ${key} provided in map ${JSON.stringify(map)}`);
+}
+
+/**
+ * Serves as a singleton registry for custom filter renderers.
+ */
+export default class FilterRendererRegistry {
+    renderers: Array<FilterRenderer> = new Array<FilterRenderer>();
+
+    fieldNameToRenderer: Map<string, FilterRenderer> = new Map<string, FilterRenderer>();
+
+    register(renderer: FilterRenderer) {
+        this.renderers.push(renderer);
+        this.fieldNameToRenderer.set(renderer.field, renderer);
+    }
+
+    hasRenderer(field: string): boolean {
+        return this.fieldNameToRenderer.has(field);
+    }
+
+    render(field: string, props: FilterRenderProps): React.ReactNode {
+        const renderer = validatedGet(field, this.fieldNameToRenderer);
+        return renderer.render(props);
+    }
+
+    getValueLabel(field: string, value: string): React.ReactNode {
+        const renderer = validatedGet(field, this.fieldNameToRenderer);
+        return renderer.valueLabel(value);
+    }
+
+    getIcon(field: string): React.ReactNode {
+        const renderer = validatedGet(field, this.fieldNameToRenderer);
+        return renderer.icon();
+    }
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/render/__tests__/FilterRendererRegistry.test.tsx b/datahub-web-react/src/app/searchV2/filters/render/__tests__/FilterRendererRegistry.test.tsx
new file mode 100644
index 00000000000000..757ef444dc938d
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/render/__tests__/FilterRendererRegistry.test.tsx
@@ -0,0 +1,80 @@
+import React from 'react';
+import FilterRendererRegistry from '../FilterRendererRegistry';
+
+describe('FilterRendererRegistry', () => {
+    let registry;
+    let renderer;
+    let props;
+
+    beforeEach(() => {
+        registry = new FilterRendererRegistry();
+
+        // Mock a FilterRenderer instance
+        renderer = {
+            field: 'mockField',
+            render: vi.fn().mockReturnValue(<div>Rendered</div>),
+            valueLabel: vi.fn().mockReturnValue(<div>ValueLabel</div>),
+            icon: vi.fn().mockReturnValue(<div>Icon</div>),
+        };
+
+        // Mock FilterRenderProps
+        props = {
+            /* assuming some props here */
+        };
+    });
+
+    describe('register', () => {
+        it('should register a new FilterRenderer', () => {
+            registry.register(renderer);
+            expect(registry.renderers).toContain(renderer);
+            expect(registry.fieldNameToRenderer.get(renderer.field)).toBe(renderer);
+        });
+    });
+
+    describe('hasRenderer', () => {
+        it('should return true if the renderer for a field is registered', () => {
+            registry.register(renderer);
+            expect(registry.hasRenderer(renderer.field)).toBe(true);
+        });
+
+        it('should return false if the renderer for a field is not registered', () => {
+            expect(registry.hasRenderer('nonexistentField')).toBe(false);
+        });
+    });
+
+    describe('render', () => {
+        it('should return the result of the renderer render method', () => {
+            registry.register(renderer);
+            expect(registry.render(renderer.field, props)).toEqual(<div>Rendered</div>);
+            expect(renderer.render).toHaveBeenCalledWith(props);
+        });
+
+        it('should throw an error if the renderer for a field is not registered', () => {
+            expect(() => registry.render('nonexistentField', props)).toThrow();
+        });
+    });
+
+    describe('getValueLabel', () => {
+        it('should return the result of the renderer valueLabel method', () => {
+            registry.register(renderer);
+            expect(registry.getValueLabel(renderer.field, 'mockValue')).toEqual(<div>ValueLabel</div>);
+            expect(renderer.valueLabel).toHaveBeenCalledWith('mockValue');
+        });
+
+        it('should throw an error if the renderer for a field is not registered', () => {
+            expect(() => registry.getValueLabel('nonexistentField', 'mockValue')).toThrow();
+        });
+    });
+
+    describe('getIcon', () => {
+        it('should return the result of the renderer icon method', () => {
+            registry.register(renderer);
+            expect(registry.getIcon(renderer.field)).toEqual(<div>Icon</div>);
+            expect(renderer.icon).toHaveBeenCalled();
+        });
+
+        it('should throw an error if the renderer for a field is not registered', () => {
+            expect(() => registry.getIcon('nonexistentField')).toThrow();
+        });
+    });
+});
diff --git a/datahub-web-react/src/app/searchV2/filters/render/acrylRenderers.ts b/datahub-web-react/src/app/searchV2/filters/render/acrylRenderers.ts
new file mode 100644
index 00000000000000..4c3fa10798946d
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/render/acrylRenderers.ts
@@ -0,0 +1,5 @@
+import { HasFailingAssertionsRenderer } from './assertion/HasFailingAssertionsRenderer';
+import { FilterRenderer } from './FilterRenderer';
+import { HasActiveIncidentsRenderer } from './incident/HasActiveIncidentsRenderer';
+
+export const renderers: Array<FilterRenderer> = [new HasFailingAssertionsRenderer(), new HasActiveIncidentsRenderer()];
diff --git a/datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsFilter.tsx b/datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsFilter.tsx
new file mode 100644
index 00000000000000..9f6c6c26fae1ae
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsFilter.tsx
@@ -0,0 +1,69 @@
+import React from 'react';
+import { FilterScenarioType } from '../types';
+import { BooleanSimpleSearchFilter } from '../shared/BooleanSimpleSearchFilter';
+import BooleanMoreFilter from '../shared/BooleanMoreFilter';
+import { FacetFilterInput, FacetMetadata, FacetFilter } from '../../../../../types.generated';
+import BooleanSearchFilter from '../shared/BooleanSearchFilter';
+
+export interface Props {
+    scenario: FilterScenarioType;
+    filter: FacetMetadata;
+    activeFilters: FacetFilterInput[];
+    onChangeFilters: (newFilters: FacetFilter[]) => void;
+    icon?: React.ReactNode;
+}
+
+export function HasFailingAssertionsFilter({ icon, scenario, filter, activeFilters, onChangeFilters }: Props) {
+    const isSelected = activeFilters?.find((f) => f.field === 'hasFailingAssertions')?.values?.includes('true');
+
+    const toggleFilter = () => {
+        let newFilters;
+        if (isSelected) {
+            newFilters = activeFilters.filter((f) => f.field !== 'hasFailingAssertions');
+        } else {
+            newFilters = [...activeFilters, { field: 'hasFailingAssertions', values: ['true'] }];
+        }
+        onChangeFilters(newFilters);
+    };
+
+    const aggregateCount = filter.aggregations.find((agg) => agg.value === 'true')?.count;
+
+    if (!aggregateCount) {
+        return null;
+    }
+
+    return (
+        <>
+            {scenario === FilterScenarioType.SEARCH_V1 && (
+                <BooleanSimpleSearchFilter
+                    title="Assertions"
+                    option="Has failing assertions"
+                    isSelected={isSelected || false}
+                    onSelect={toggleFilter}
+                    defaultDisplayFilters
+                    count={aggregateCount}
+                />
+            )}
+            {scenario === FilterScenarioType.SEARCH_V2_PRIMARY && (
+                <BooleanSearchFilter
+                    icon={icon}
+                    title="Assertions"
+                    option="Has failing assertions"
+                    initialSelected={isSelected || false}
+                    onUpdate={toggleFilter}
+                    count={aggregateCount}
+                />
+            )}
+            {scenario === FilterScenarioType.SEARCH_V2_SECONDARY && (
+                <BooleanMoreFilter
+                    icon={icon}
+                    title="Assertions"
+                    option="Has failing assertions"
+                    initialSelected={isSelected || false}
+                    onUpdate={toggleFilter}
+                    count={aggregateCount}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsRenderer.tsx b/datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsRenderer.tsx
new file mode 100644
index 00000000000000..eb94d77ff121d8
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsRenderer.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import { CloseCircleOutlined } from '@ant-design/icons';
+import { FilterRenderer } from '../FilterRenderer';
+import { FilterRenderProps } from '../types';
+import { HasFailingAssertionsFilter } from './HasFailingAssertionsFilter';
+
+export class HasFailingAssertionsRenderer implements FilterRenderer {
+    field = 'hasFailingAssertions';
+
+    render = (props: FilterRenderProps) => <HasFailingAssertionsFilter {...props} icon={this.icon()} />;
+
+    icon = () => <CloseCircleOutlined />;
+
+    valueLabel = (value: string) => {
+        if (value === 'true') {
+            return <>Has Failing Assertions</>;
+        }
+        return <>Has Passing Assertions</>;
+    };
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsFilter.tsx b/datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsFilter.tsx
new file mode 100644
index 00000000000000..a2a6bc3068d429
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsFilter.tsx
@@ -0,0 +1,69 @@
+import React from 'react';
+import { FilterScenarioType } from '../types';
+import { BooleanSimpleSearchFilter } from '../shared/BooleanSimpleSearchFilter';
+import BooleanMoreFilter from '../shared/BooleanMoreFilter';
+import { FacetFilterInput, FacetMetadata, FacetFilter } from '../../../../../types.generated';
+import BooleanSearchFilter from '../shared/BooleanSearchFilter';
+
+export interface Props {
+    scenario: FilterScenarioType;
+    filter: FacetMetadata;
+    activeFilters: FacetFilterInput[];
+    onChangeFilters: (newFilters: FacetFilter[]) => void;
+    icon?: React.ReactNode;
+}
+
+export function HasActiveIncidentsFilter({ scenario, filter, activeFilters, icon, onChangeFilters }: Props) {
+    const isSelected = activeFilters?.find((f) => f.field === 'hasActiveIncidents')?.values?.includes('true');
+
+    const toggleFilter = () => {
+        let newFilters;
+        if (isSelected) {
+            newFilters = activeFilters.filter((f) => f.field !== 'hasActiveIncidents');
+        } else {
+            newFilters = [...activeFilters, { field: 'hasActiveIncidents', values: ['true'] }];
+        }
+        onChangeFilters(newFilters);
+    };
+
+    const aggregateCount = filter.aggregations.find((agg) => agg.value === 'true')?.count;
+
+    if (!aggregateCount) {
+        return null;
+    }
+
+    return (
+        <>
+            {scenario === FilterScenarioType.SEARCH_V1 && (
+                <BooleanSimpleSearchFilter
+                    title="Incidents"
+                    option="Has active incidents"
+                    isSelected={isSelected || false}
+                    onSelect={toggleFilter}
+                    defaultDisplayFilters
+                    count={aggregateCount}
+                />
+            )}
+            {scenario === FilterScenarioType.SEARCH_V2_PRIMARY && (
+                <BooleanSearchFilter
+                    icon={icon}
+                    title="Incidents"
+                    option="Has active incidents"
+                    initialSelected={isSelected || false}
+                    onUpdate={toggleFilter}
+                    count={aggregateCount}
+                />
+            )}
+            {scenario === FilterScenarioType.SEARCH_V2_SECONDARY && (
+                <BooleanMoreFilter
+                    icon={icon}
+                    title="Incidents"
+                    option="Has active incidents"
+                    initialSelected={isSelected || false}
+                    onUpdate={toggleFilter}
+                    count={aggregateCount}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsRenderer.tsx b/datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsRenderer.tsx
new file mode 100644
index 00000000000000..cc2e373b2527cf
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsRenderer.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import { WarningOutlined } from '@ant-design/icons';
+import { FilterRenderer } from '../FilterRenderer';
+import { FilterRenderProps } from '../types';
+import { HasActiveIncidentsFilter } from './HasActiveIncidentsFilter';
+
+export class HasActiveIncidentsRenderer implements FilterRenderer {
+    field = 'hasActiveIncidents';
+
+    render = (props: FilterRenderProps) => <HasActiveIncidentsFilter {...props} icon={this.icon()} />;
+
+    icon = () => <WarningOutlined />;
+
+    valueLabel = (value: string) => {
+        if (value === 'true') {
+            return <>Has Active Incidents</>;
+        }
+        return <>Has Resolved Incidents</>;
+    };
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilter.tsx b/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilter.tsx
new file mode 100644
index 00000000000000..c3d6e05176352d
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilter.tsx
@@ -0,0 +1,88 @@
+import { RightOutlined } from '@ant-design/icons';
+import { Dropdown } from 'antd';
+import React, { useRef, useState } from 'react';
+import styled from 'styled-components';
+import FilterOption from '../../FilterOption';
+import { MoreFilterOptionLabel } from '../../styledComponents';
+import { useElementDimensions } from '../../utils';
+import BooleanSearchFilterMenu from './BooleanMoreFilterMenu';
+
+const IconNameWrapper = styled.span`
+    display: flex;
+    align-items: center;
+`;
+
+const IconWrapper = styled.span`
+    margin-right: 8px;
+`;
+
+interface Props {
+    icon?: React.ReactNode;
+    title: string;
+    option: string;
+    count: number;
+    initialSelected: boolean;
+    onUpdate: (newValue: boolean) => void;
+}
+
+export default function BooleanMoreFilter({ icon, title, option, count, initialSelected, onUpdate }: Props) {
+    const [isMenuOpen, setIsMenuOpen] = useState(false);
+    const [isSelected, setIsSelected] = useState<boolean>(initialSelected);
+    const labelRef = useRef<HTMLDivElement>(null);
+    const { width, height, isElementOutsideWindow } = useElementDimensions(labelRef);
+
+    function updateSelected() {
+        onUpdate(isSelected);
+        setIsMenuOpen(false);
+    }
+
+    const filterOptions = [
+        {
+            key: option,
+            // Re-use the Normal Filter object
+            label: (
+                <FilterOption
+                    filterOption={{ field: title, value: option, count }}
+                    selectedFilterOptions={isSelected ? [{ field: title, value: option }] : []}
+                    setSelectedFilterOptions={() => setIsSelected(!isSelected)}
+                />
+            ),
+            style: { padding: 0 },
+            displayName: title,
+        },
+    ];
+
+    return (
+        <Dropdown
+            trigger={['click']}
+            menu={{ items: filterOptions }}
+            open={isMenuOpen}
+            onOpenChange={(open) => setIsMenuOpen(open)}
+            dropdownRender={(menuOption) => (
+                <BooleanSearchFilterMenu
+                    menuOption={menuOption}
+                    onUpdate={updateSelected}
+                    style={{
+                        position: 'absolute',
+                        top: -height,
+                        [isElementOutsideWindow ? 'right' : 'left']: width,
+                    }}
+                />
+            )}
+        >
+            <MoreFilterOptionLabel
+                onClick={() => setIsMenuOpen(!isMenuOpen)}
+                isOpen={isMenuOpen}
+                $isActive={isSelected}
+                data-testid={`more-filter-${title.replace(/\s/g, '-')}`}
+                ref={labelRef}
+            >
+                <IconNameWrapper>
+                    {icon && <IconWrapper>{icon}</IconWrapper>}
+                    {title} {isSelected ? `(1) ` : ''}
+                </IconNameWrapper>
+                <RightOutlined style={{ fontSize: '12px', height: '12px' }} />
+            </MoreFilterOptionLabel>
+        </Dropdown>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilterMenu.tsx b/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilterMenu.tsx
new file mode 100644
index 00000000000000..b12e1ddce4e4c4
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilterMenu.tsx
@@ -0,0 +1,50 @@
+import React, { CSSProperties } from 'react';
+import { Button } from 'antd';
+import styled from 'styled-components/macro';
+
+const StyledButton = styled(Button)`
+    width: 100%;
+    text-align: center;
+    background-color: ${(props) => props.theme.styles['primary-color']};
+    color: white;
+    border-radius: 0;
+`;
+
+export const DropdownMenu = styled.div`
+    background-color: white;
+    border-radius: 5px;
+    box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
+    overflow: hidden;
+    min-width: 200px;
+
+    .ant-dropdown-menu-title-content {
+        background-color: white;
+        &:hover {
+            background-color: white;
+        }
+    }
+`;
+
+const ScrollableContent = styled.div`
+    max-height: 312px;
+    overflow: auto;
+`;
+
+interface Props {
+    menuOption: React.ReactNode;
+    onUpdate: () => void;
+    style?: CSSProperties;
+}
+
+export default function BooleanMoreFilterMenu({ menuOption, onUpdate, style }: Props) {
+    return (
+        <DropdownMenu data-testid="filter-dropdown" style={style}>
+            <ScrollableContent>
+                {React.cloneElement(menuOption as React.ReactElement, { style: { boxShadow: 'none' } })}
+            </ScrollableContent>
+            <StyledButton type="text" onClick={onUpdate} data-testid="update-filters">
+                Update
+            </StyledButton>
+        </DropdownMenu>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanSearchFilter.tsx b/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanSearchFilter.tsx
new file mode 100644
index 00000000000000..f4522bc29a8611
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanSearchFilter.tsx
@@ -0,0 +1,77 @@
+import { CaretDownFilled } from '@ant-design/icons';
+import { Dropdown } from 'antd';
+import React, { useEffect, useState } from 'react';
+import styled from 'styled-components';
+import FilterOption from '../../FilterOption';
+import { SearchFilterLabel } from '../../styledComponents';
+import BooleanSearchFilterMenu from './BooleanMoreFilterMenu';
+
+const IconNameWrapper = styled.span`
+    display: flex;
+    align-items: center;
+`;
+
+const IconWrapper = styled.span`
+    margin-right: 8px;
+`;
+
+interface Props {
+    icon?: React.ReactNode;
+    title: string;
+    option: string;
+    count: number;
+    initialSelected: boolean;
+    onUpdate: (newValue: boolean) => void;
+}
+
+export default function BooleanSearchFilter({ icon, title, option, count, initialSelected, onUpdate }: Props) {
+    const [isMenuOpen, setIsMenuOpen] = useState(false);
+    const [isSelected, setIsSelected] = useState<boolean>(initialSelected);
+
+    useEffect(() => setIsSelected(initialSelected), [initialSelected]);
+
+    function updateSelected() {
+        onUpdate(isSelected);
+        setIsMenuOpen(false);
+    }
+
+    const filterOptions = [
+        {
+            key: option,
+            // Re-use the Normal Filter object
+            label: (
+                <FilterOption
+                    filterOption={{ field: title, value: option, count }}
+                    selectedFilterOptions={isSelected ? [{ field: title, value: option }] : []}
+                    setSelectedFilterOptions={() => setIsSelected(!isSelected)}
+                />
+            ),
+            style: { padding: 0 },
+            displayName: title,
+        },
+    ];
+
+    return (
+        <Dropdown
+            trigger={['click']}
+            menu={{ items: filterOptions }}
+            open={isMenuOpen}
+            onOpenChange={(open) => setIsMenuOpen(open)}
+            dropdownRender={(menuOption) => (
+                <BooleanSearchFilterMenu menuOption={menuOption} onUpdate={updateSelected} />
+            )}
+        >
+            <SearchFilterLabel
+                onClick={() => setIsMenuOpen(!isMenuOpen)}
+                $isActive={isSelected}
+                data-testid={`filter-dropdown-${title.replace(/\s/g, '-')}`}
+            >
+                <IconNameWrapper>
+                    {icon && <IconWrapper>{icon}</IconWrapper>}
+                    {title} {isSelected ? `(1) ` : ''}
+                </IconNameWrapper>
+                <CaretDownFilled style={{ fontSize: '12px', height: '12px' }} />
+            </SearchFilterLabel>
+        </Dropdown>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanSimpleSearchFilter.tsx b/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanSimpleSearchFilter.tsx
new file mode 100644
index 00000000000000..f252409e1368f2
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanSimpleSearchFilter.tsx
@@ -0,0 +1,75 @@
+import * as React from 'react';
+import { DownOutlined, UpOutlined } from '@ant-design/icons';
+import { Checkbox } from 'antd';
+import { useState, useEffect } from 'react';
+import styled from 'styled-components';
+import { SearchFilterLabel } from '../../../SearchFilterLabel';
+
+const SearchFilterWrapper = styled.div`
+    padding: 0 25px 15px 25px;
+`;
+
+const Title = styled.div`
+    align-items: center;
+    font-weight: bold;
+    margin-bottom: 10px;
+    display: flex;
+    justify-content: space-between;
+    cursor: pointer;
+`;
+
+const StyledUpOutlined = styled(UpOutlined)`
+    font-size: 10px;
+`;
+
+const StyledDownOutlined = styled(DownOutlined)`
+    font-size: 10px;
+`;
+
+const StyledCheckbox = styled(Checkbox)`
+    margin-right: 8px;
+`;
+
+type Props = {
+    title: string;
+    option: string;
+    count: number;
+    isSelected: boolean;
+    onSelect: () => void;
+    defaultDisplayFilters: boolean;
+};
+
+export const BooleanSimpleSearchFilter = ({
+    title,
+    option,
+    count,
+    isSelected,
+    onSelect,
+    defaultDisplayFilters,
+}: Props) => {
+    const [areFiltersVisible, setAreFiltersVisible] = useState(defaultDisplayFilters);
+
+    useEffect(() => {
+        if (isSelected) {
+            setAreFiltersVisible(true);
+        }
+    }, [isSelected]);
+
+    return (
+        <SearchFilterWrapper key={title}>
+            <Title onClick={() => setAreFiltersVisible((prevState) => !prevState)}>
+                {title}
+                {areFiltersVisible ? (
+                    <StyledUpOutlined />
+                ) : (
+                    <StyledDownOutlined data-testid={`expand-facet-${title}`} />
+                )}
+            </Title>
+            {areFiltersVisible && (
+                <StyledCheckbox checked={isSelected} onChange={onSelect}>
+                    <SearchFilterLabel field={title} value={option} count={count} />
+                </StyledCheckbox>
+            )}
+        </SearchFilterWrapper>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/filters/render/shared/styledComponents.tsx b/datahub-web-react/src/app/searchV2/filters/render/shared/styledComponents.tsx
new file mode 100644
index 00000000000000..ea18d1f84691b5
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/render/shared/styledComponents.tsx
@@ -0,0 +1,21 @@
+import styled from 'styled-components';
+import { MoreFilterOptionLabel } from '../../styledComponents';
+
+export const SearchFilterWrapper = styled.div`
+    padding: 0 25px 15px 25px;
+    display: flex;
+    align-items: center;
+    justify-content: left;
+`;
+
+export const Title = styled.div`
+    align-items: center;
+    font-weight: bold;
+    display: flex;
+    justify-content: left;
+    cursor: pointer;
+`;
+
+export const StyledMoreFilterOptionLabel = styled(MoreFilterOptionLabel)`
+    justify-content: left;
+`;
diff --git a/datahub-web-react/src/app/searchV2/filters/render/types.ts b/datahub-web-react/src/app/searchV2/filters/render/types.ts
new file mode 100644
index 00000000000000..1f619193092607
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/render/types.ts
@@ -0,0 +1,29 @@
+import { FacetFilter, FacetFilterInput, FacetMetadata } from '../../../../types.generated';
+
+/**
+ * The scenario in which filter rendering is required.
+ */
+export enum FilterScenarioType {
+    /**
+     * The V1 search experience, including embedded list search.
+     */
+    SEARCH_V1,
+    /**
+     * The V2 search + browse experience, NOT inside the "More" dropdown.
+     */
+    SEARCH_V2_PRIMARY,
+    /**
+     * The V2 search + browse experience, inside the "More" dropdown.
+     */
+    SEARCH_V2_SECONDARY,
+}
+
+/**
+ * Props passed to every filter renderer
+ */
+export interface FilterRenderProps {
+    scenario: FilterScenarioType;
+    filter: FacetMetadata;
+    activeFilters: FacetFilterInput[];
+    onChangeFilters: (newFilters: FacetFilter[]) => void;
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/render/useFilterRenderer.tsx b/datahub-web-react/src/app/searchV2/filters/render/useFilterRenderer.tsx
new file mode 100644
index 00000000000000..74f8de9514c1b0
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/render/useFilterRenderer.tsx
@@ -0,0 +1,16 @@
+import { renderers as acrylRenderers } from './acrylRenderers';
+import FilterRendererRegistry from './FilterRendererRegistry';
+
+/**
+ * Configure the render registry.
+ */
+const RENDERERS = [...acrylRenderers];
+const REGISTRY = new FilterRendererRegistry();
+RENDERERS.forEach((renderer) => REGISTRY.register(renderer));
+
+/**
+ * Used to render custom filter views for a particular facet field.
+ */
+export const useFilterRendererRegistry = () => {
+    return REGISTRY;
+};
diff --git a/datahub-web-react/src/app/searchV2/filters/styledComponents.ts b/datahub-web-react/src/app/searchV2/filters/styledComponents.ts
new file mode 100644
index 00000000000000..b17b4f79ccc4c3
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/styledComponents.ts
@@ -0,0 +1,57 @@
+import { Button, Typography } from 'antd';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import { REDESIGN_COLORS, SEARCH_COLORS } from '../../entityV2/shared/constants';
+
+export const SearchFilterLabel = styled(Button)<{ $isActive: boolean }>`
+    font-size: 14px;
+    font-weight: 700;
+    border: none;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    box-shadow: none;
+    color: ${REDESIGN_COLORS.TEXT_HEADING};
+    ${(props) =>
+        props.$isActive &&
+        `
+        background-color: ${SEARCH_COLORS.TITLE_PURPLE};
+        border: 1px solid ${SEARCH_COLORS.BACKGROUND_PURPLE};
+        color: white;
+    `}
+`;
+
+export const MoreFilterOptionLabel = styled.div<{ $isActive: boolean; isOpen?: boolean }>`
+    padding: 5px 12px;
+    font-size: 14px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    cursor: pointer;
+
+    &:hover {
+        background-color: ${ANTD_GRAY[3]};
+    }
+
+    ${(props) => props.$isActive && `color: ${SEARCH_COLORS.TITLE_PURPLE};`}
+    ${(props) => props.isOpen && `background-color: ${ANTD_GRAY[3]};`}
+`;
+
+export const TextButton = styled(Button)<{ marginTop?: number; height?: number }>`
+    color: ${SEARCH_COLORS.TITLE_PURPLE};
+    padding: 0px 6px;
+    margin-top: ${(props) => (props.marginTop !== undefined ? `${props.marginTop}px` : '8px')};
+    ${(props) => props.height !== undefined && `height: ${props.height}px;`}
+
+    &:hover {
+        background-color: white;
+    }
+`;
+
+export const Label = styled(Typography.Text)`
+    max-width: 125px;
+`;
+
+export const IconSpacer = styled.span`
+    width: 4px;
+`;
diff --git a/datahub-web-react/src/app/searchV2/filters/types.ts b/datahub-web-react/src/app/searchV2/filters/types.ts
new file mode 100644
index 00000000000000..54d8f1e1507e9a
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/types.ts
@@ -0,0 +1,114 @@
+import { Entity, EntityType, FacetFilterInput, FilterOperator } from '../../../types.generated';
+
+export interface FilterOptionType {
+    field: string;
+    value: string;
+    count?: number;
+    entity?: Entity | null;
+    displayName?: string | null;
+}
+
+export interface Filter {
+    field: string;
+    displayName: string;
+    options?: FilterOptionType[];
+}
+
+export interface FilterValue {
+    value: string;
+    entity: Entity | null;
+    count?: number;
+    displayName?: string | null;
+}
+
+export enum FieldType {
+    ENUM,
+    TEXT,
+    BOOLEAN,
+    ENTITY,
+    ENTITY_TYPE,
+    NESTED_ENTITY_TYPE,
+    BROWSE_PATH,
+    BUCKETED_TIMESTAMP, // NUMBER,
+    // DATE,
+}
+
+export interface FilterValueOption {
+    value: string;
+    entity?: Entity | null;
+    icon?: React.ReactNode;
+    count?: number;
+    displayName?: string | null;
+}
+
+interface TimeBucket {
+    label: string;
+    startOffsetMillis: number;
+}
+
+interface FilterFieldBase {
+    field: string;
+    displayName: string;
+    icon?: JSX.Element;
+    useDatePicker?: boolean; // In advanced filter section, don't use dropdown
+    entity?: Entity; // if the filter itself is an entity ie. Structured Properties
+}
+
+export interface BasicFilterField extends FilterFieldBase {
+    type: Exclude<FieldType, FieldType.BUCKETED_TIMESTAMP | FieldType.ENTITY>;
+}
+
+export interface TimeBucketFilterField extends FilterFieldBase {
+    type: FieldType.BUCKETED_TIMESTAMP;
+    options: TimeBucket[];
+}
+
+export interface EntityFilterField extends FilterFieldBase {
+    type: FieldType.ENTITY;
+    entityTypes: EntityType[]; // The entity types that this field is applicable to.
+}
+
+export type FilterField = BasicFilterField | TimeBucketFilterField | EntityFilterField;
+
+export interface FilterPredicate {
+    field: FilterField;
+    operator: FilterOperatorType;
+    values: FilterValue[];
+    defaultValueOptions: FilterValueOption[];
+}
+
+// The final type of conditions that are shown to the user.
+export enum FilterOperatorType {
+    EQUALS,
+    NOT_EQUALS,
+    IS_ANY_OF,
+    IS_NOT_ANY_OF,
+    EXISTS,
+    NOT_EXISTS,
+    CONTAINS,
+    NOT_CONTAINS,
+    GREATER_THAN,
+    GREATER_THAN_OR_EQUALS,
+    LESS_THAN,
+    LESS_THAN_OR_EQUALS,
+    ALL_EQUALS, // used for splitting criterion values into multiple AND criterions
+}
+
+export enum FrontendFilterOperator {
+    AllEqual = 'ALL_EQUAL', // used for splitting criterion values into multiple AND criterions
+}
+
+export type FrontendFacetFilterInput = Omit<FacetFilterInput, 'condition'> & {
+    condition: FrontendFilterOperator;
+};
+
+export type FilterOperatorInfo = {
+    type: FilterOperatorType;
+    text: string;
+    pluralText?: string; // Optional: Used when multiple values are selected
+    filter: {
+        negated: boolean;
+        operator: FilterOperator | FrontendFilterOperator;
+    };
+    icon?: React.ReactNode;
+};
diff --git a/datahub-web-react/src/app/searchV2/filters/useFilterMode.ts b/datahub-web-react/src/app/searchV2/filters/useFilterMode.ts
new file mode 100644
index 00000000000000..994bd06c87d0ba
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/useFilterMode.ts
@@ -0,0 +1,16 @@
+import { useState } from 'react';
+import { FacetFilterInput } from '../../../types.generated';
+import { FilterMode, FilterModes, UnionType } from '../utils/constants';
+import { hasAdvancedFilters } from '../utils/hasAdvancedFilters';
+import useLatest from '../../shared/useLatest';
+
+const useFilterMode = (filters: Array<FacetFilterInput>, unionType: UnionType) => {
+    const onlyShowAdvancedFilters = hasAdvancedFilters(filters, unionType);
+    const [filterMode, setFilterMode] = useState<FilterMode>(
+        onlyShowAdvancedFilters ? FilterModes.ADVANCED : FilterModes.BASIC,
+    );
+    const filterModeRef = useLatest(filterMode);
+    return { filterMode, filterModeRef, setFilterMode } as const;
+};
+
+export default useFilterMode;
diff --git a/datahub-web-react/src/app/searchV2/filters/useGetBrowseV2LabelOverride.ts b/datahub-web-react/src/app/searchV2/filters/useGetBrowseV2LabelOverride.ts
new file mode 100644
index 00000000000000..574c55ff029912
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/useGetBrowseV2LabelOverride.ts
@@ -0,0 +1,32 @@
+import { useEffect } from 'react';
+import { useGetEntityDisplayNameLazyQuery } from '../../../graphql/search.generated';
+import { getLastBrowseEntryFromFilterValue } from './utils';
+import { BROWSE_PATH_V2_FILTER_NAME } from '../utils/constants';
+import { EntityRegistry } from '../../../entityRegistryContext';
+
+function isEntityUrn(string: string) {
+    return string.includes('urn:li:');
+}
+
+export default function useGetBrowseV2LabelOverride(
+    filterField: string,
+    filterValue: string,
+    entityRegistry: EntityRegistry,
+) {
+    const [getEntityDisplayName, { data, loading }] = useGetEntityDisplayNameLazyQuery();
+
+    useEffect(() => {
+        if (filterField === BROWSE_PATH_V2_FILTER_NAME) {
+            const lastBrowseEntry = getLastBrowseEntryFromFilterValue(filterValue);
+            if (isEntityUrn(lastBrowseEntry)) {
+                getEntityDisplayName({ variables: { urn: lastBrowseEntry } });
+            }
+        }
+    }, [filterField, filterValue, getEntityDisplayName]);
+
+    if (loading) {
+        return '...';
+    }
+
+    return data?.entity && entityRegistry.getDisplayName(data.entity.type, data.entity);
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/useHydrateFilters.tsx b/datahub-web-react/src/app/searchV2/filters/useHydrateFilters.tsx
new file mode 100644
index 00000000000000..5ddb0c96ee30b4
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/useHydrateFilters.tsx
@@ -0,0 +1,71 @@
+import { useEffect, useMemo, useState } from 'react';
+import { FieldType, FilterPredicate } from './types';
+import { Entity } from '../../../types.generated';
+import { useGetEntitiesLazyQuery } from '../../../graphql/entity.generated';
+import { buildEntityCache, isResolutionRequired } from '../../entityV2/view/builder/utils';
+
+export const useHydrateFilters = (filters: FilterPredicate[]): FilterPredicate[] => {
+    // Stores an URN to the resolved entity.
+    const [entityCache, setEntityCache] = useState<Map<string, Entity>>(new Map());
+
+    // Find the filters requiring entity resolution.
+    const filtersToResolve = useMemo(
+        () => filters.filter((filter) => filter.field.type === FieldType.ENTITY) || [],
+        [filters],
+    );
+
+    // Create an array of all urns requiring resolution
+    const urnsToResolve: string[] = useMemo(() => {
+        return filtersToResolve.flatMap((filter) => {
+            return filter.values.filter((value) => !value.entity).map((value) => value.value);
+        });
+    }, [filtersToResolve]);
+
+    /**
+     * Bootstrap by resolving all URNs that are not in the cache yet.
+     */
+    const [getEntities, { data: resolvedEntitiesData }] = useGetEntitiesLazyQuery();
+
+    useEffect(() => {
+        if (isResolutionRequired(urnsToResolve, entityCache)) {
+            getEntities({ variables: { urns: urnsToResolve } });
+        }
+    }, [urnsToResolve, entityCache, getEntities]);
+
+    /**
+     * If some entities need to be resolved, simply build the cache from them.
+     *
+     * This should only happen once at component bootstrap. Typically
+     * all URNs will be missing from the cache.
+     */
+    useEffect(() => {
+        if (resolvedEntitiesData && resolvedEntitiesData.entities?.length) {
+            const entities: Entity[] = (resolvedEntitiesData?.entities as Entity[]) || [];
+            setEntityCache(buildEntityCache(entities));
+        }
+    }, [resolvedEntitiesData]);
+
+    /**
+     * Replace the  with the resolved entity.
+     */
+    return useMemo(() => {
+        return filters.map((filter) => {
+            if (filter.field.type === FieldType.ENTITY) {
+                return {
+                    ...filter,
+                    values: filter.values.map((value) => {
+                        if (value.entity) {
+                            return value;
+                        }
+                        const entity = entityCache.get(value.value);
+                        return {
+                            ...value,
+                            entity: entity || null,
+                        };
+                    }),
+                };
+            }
+            return filter;
+        });
+    }, [filters, entityCache]);
+};
diff --git a/datahub-web-react/src/app/searchV2/filters/useSearchFilterAnalytics.ts b/datahub-web-react/src/app/searchV2/filters/useSearchFilterAnalytics.ts
new file mode 100644
index 00000000000000..f696d61cb84ca1
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/useSearchFilterAnalytics.ts
@@ -0,0 +1,23 @@
+import { EventType } from '../../analytics';
+import analytics from '../../analytics/analytics';
+
+const useSearchFilterAnalytics = () => {
+    const trackClearAllFiltersEvent = (total: number) => {
+        analytics.event({
+            type: EventType.SearchFiltersClearAllEvent,
+            total,
+        });
+    };
+
+    const trackShowMoreEvent = (activeFilterCount: number, hiddenFilterCount: number) => {
+        analytics.event({
+            type: EventType.SearchFiltersShowMoreEvent,
+            activeFilterCount,
+            hiddenFilterCount,
+        });
+    };
+
+    return { trackClearAllFiltersEvent, trackShowMoreEvent } as const;
+};
+
+export default useSearchFilterAnalytics;
diff --git a/datahub-web-react/src/app/searchV2/filters/useSearchFilterDropdown.tsx b/datahub-web-react/src/app/searchV2/filters/useSearchFilterDropdown.tsx
new file mode 100644
index 00000000000000..646682f8d1c2d1
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/useSearchFilterDropdown.tsx
@@ -0,0 +1,73 @@
+import { useEffect, useMemo } from 'react';
+import { useAggregateAcrossEntitiesLazyQuery } from '@src/graphql/search.generated';
+import { FacetFilterInput, FacetMetadata } from '../../../types.generated';
+import { filterEmptyAggregations, getNewFilters, getNumActiveFiltersForFilter } from './utils';
+import useGetSearchQueryInputs from '../useGetSearchQueryInputs';
+import { ENTITY_FILTER_NAME } from '../utils/constants';
+
+interface Props {
+    filter: FacetMetadata;
+    activeFilters: FacetFilterInput[];
+    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
+}
+
+export default function useSearchFilterDropdown({ filter, activeFilters, onChangeFilters }: Props) {
+    const numActiveFilters = getNumActiveFiltersForFilter(activeFilters, filter);
+    const shouldFetchAggregations: boolean = !!filter.field && numActiveFilters > 0;
+
+    const { entityFilters, query, orFilters, viewUrn } = useGetSearchQueryInputs(
+        useMemo(() => [filter.field], [filter.field]),
+    );
+
+    const [aggregateAcrossEntities, { data, loading }] = useAggregateAcrossEntitiesLazyQuery();
+
+    useEffect(() => {
+        // Fetch the aggregates of the current facet only if there are active filters
+        // Otherwise, the aggregates are already fetched by the search query
+        if (shouldFetchAggregations) {
+            aggregateAcrossEntities({
+                variables: {
+                    input: {
+                        types: filter.field === ENTITY_FILTER_NAME ? null : entityFilters,
+                        query,
+                        orFilters,
+                        viewUrn,
+                        facets: [filter.field],
+                    },
+                },
+            });
+        }
+    }, [aggregateAcrossEntities, entityFilters, filter.field, orFilters, query, viewUrn, shouldFetchAggregations]);
+
+    const aggregations = shouldFetchAggregations
+        ? data?.aggregateAcrossEntities?.facets?.[0]?.aggregations
+        : filter.aggregations;
+
+    const finalAggregations = filterEmptyAggregations(aggregations || [], activeFilters);
+
+    function updateFilters(newFilters) {
+        onChangeFilters(
+            getNewFilters(
+                filter.field,
+                activeFilters,
+                newFilters.map((f) => f.value),
+            ),
+        );
+    }
+
+    function manuallyUpdateFilters(newFilters: FacetFilterInput[]) {
+        // remove any filters that are in newFilters to overwrite them
+        const filtersNotInNewFilters = activeFilters.filter(
+            (f) => !newFilters.find((newFilter) => newFilter.field === f.field),
+        );
+        onChangeFilters([...filtersNotInNewFilters, ...newFilters]);
+    }
+
+    return {
+        updateFilters,
+        finalAggregations,
+        numActiveFilters,
+        areFiltersLoading: loading,
+        manuallyUpdateFilters,
+    };
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/utils.tsx b/datahub-web-react/src/app/searchV2/filters/utils.tsx
new file mode 100644
index 00000000000000..32064a38ac8ce5
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/utils.tsx
@@ -0,0 +1,674 @@
+import moment from 'moment-timezone';
+import { removeMarkdown } from '@src/app/entity/shared/components/styled/StripMarkdownText';
+import { useEntityRegistryV2 } from '@src/app/useEntityRegistry';
+import { FolderFilled } from '@ant-design/icons';
+import { DATE_TYPE_URN } from '@src/app/shared/constants';
+import React, { useLayoutEffect, useState } from 'react';
+import styled from 'styled-components';
+import {
+    AggregationMetadata,
+    DataPlatform,
+    DataPlatformInstance,
+    Domain,
+    Entity,
+    EntityType,
+    FacetFilterInput,
+    FacetMetadata,
+    FilterOperator,
+    GlossaryTerm,
+    StructuredPropertyEntity,
+    Tag,
+} from '../../../types.generated';
+import { IconStyleType } from '../../entity/Entity';
+import {
+    BOOLEAN_FIELDS,
+    BROWSE_PATH_V2_FILTER_NAME,
+    CONTAINER_FILTER_NAME,
+    DOMAINS_FILTER_NAME,
+    ENTITY_FIELDS,
+    ENTITY_FILTER_NAME,
+    ENTITY_SUB_TYPE_FILTER_NAME,
+    FILTER_DELIMITER,
+    GLOSSARY_TERMS_FILTER_NAME,
+    LEGACY_ENTITY_FILTER_NAME,
+    OWNERS_FILTER_NAME,
+    PLATFORM_FILTER_NAME,
+    TEXT_FIELDS,
+    TAGS_FILTER_NAME,
+    TYPE_NAMES_FILTER_NAME,
+    UNIT_SEPARATOR,
+    ENTITY_TYPE_FIELDS,
+    DATA_PLATFORM_INSTANCE_FILTER_NAME,
+    FIELD_TAGS_FILTER_NAME,
+    FIELD_GLOSSARY_TERMS_FILTER_NAME,
+    PROPOSED_TAGS_FILTER_NAME,
+    PROPOSED_SCHEMA_TAGS_FILTER_NAME,
+    PROPOSED_GLOSSARY_TERMS_FILTER_NAME,
+    PROPOSED_SCHEMA_GLOSSARY_TERMS_FILTER_NAME,
+    LAST_MODIFIED_FILTER_NAME,
+    STRUCTURED_PROPERTIES_FILTER_NAME,
+} from '../utils/constants';
+import { EntityRegistry } from '../../../entityRegistryContext';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import { GetAutoCompleteMultipleResultsQuery } from '../../../graphql/search.generated';
+import { FACETS_TO_ENTITY_TYPES } from './constants';
+import { FieldType, FilterField, FilterOperatorType, FilterOptionType, FilterPredicate } from './types';
+import { capitalizeFirstLetterOnly, forcePluralize, pluralizeIfIrregular } from '../../shared/textUtil';
+import { convertBackendToFrontendOperatorType } from './operator/operator';
+import { ALL_FILTER_FIELDS, STRUCTURED_PROPERTY_FILTER } from './field/fields';
+import { getSubTypeIcon } from '../../entityV2/shared/components/subtypes';
+import getTypeIcon from '../../sharedV2/icons/getTypeIcon';
+import { DomainColoredIcon } from '../../entityV2/shared/links/DomainColoredIcon';
+import { TagColor } from './FilterOption';
+
+// either adds or removes selectedFilterValues to/from activeFilters for a given filterField
+export function getNewFilters(
+    filterField: string,
+    activeFilters: FacetFilterInput[],
+    selectedFilterValues: string[],
+): FacetFilterInput[] {
+    if (activeFilters.find((activeFilter) => activeFilter.field === filterField)) {
+        return activeFilters
+            .map((f) => (f.field === filterField ? { ...f, values: selectedFilterValues } : f))
+            .filter((f) => !(f.values?.length === 0));
+    }
+
+    return [
+        ...activeFilters,
+        {
+            field: filterField,
+            values: selectedFilterValues,
+            // TODO: Define on filter field instead
+            condition: filterField === LAST_MODIFIED_FILTER_NAME ? FilterOperator.GreaterThan : undefined,
+        },
+    ].filter((f) => !(f.values?.length === 0));
+}
+
+export function isFilterOptionSelected(selectedFilterOptions: FilterOptionType[], filterValue: string) {
+    const parentFilterValues = filterValue.includes(FILTER_DELIMITER)
+        ? filterValue.split(FILTER_DELIMITER).slice(0, -1)
+        : [];
+    return !!selectedFilterOptions.find(
+        (option) => option.value === filterValue || parentFilterValues.includes(option.value),
+    );
+}
+
+export function isAnyOptionSelected(selectedFilterOptions: FilterOptionType[], filterValues?: string[]) {
+    return selectedFilterOptions.some((option) => filterValues?.some((filterValue) => filterValue === option.value));
+}
+
+export function getFilterEntity(filterField: string, filterValue: string, availableFilters: FacetMetadata[] | null) {
+    return (
+        availableFilters
+            ?.find((facet) => facet.field === filterField)
+            ?.aggregations.find((agg) => agg.value === filterValue)?.entity || null
+    );
+}
+
+export const PlatformIcon = styled.img<{ size?: number }>`
+    max-height: ${(props) => (props.size ? props.size : 12)}px;
+    width: auto;
+    object-fit: contain;
+    background-color: transparent;
+`;
+
+function getDataPlatformInstanceIconAndLabel(
+    filterEntity: Entity | null,
+    entityRegistry: EntityRegistry,
+    size?: number,
+) {
+    let icon: React.ReactNode = null;
+    let label: string | null = null;
+    const logoUrl = (filterEntity as DataPlatformInstance)?.platform.properties?.logoUrl;
+    icon = logoUrl ? (
+        <PlatformIcon src={logoUrl} size={size} />
+    ) : (
+        entityRegistry.getIcon(EntityType.DataPlatform, size || 12, IconStyleType.ACCENT, ANTD_GRAY[9])
+    );
+    label = (filterEntity as DataPlatformInstance).instanceId
+        ? (filterEntity as DataPlatformInstance).instanceId
+        : (filterEntity as DataPlatformInstance).urn;
+
+    return { icon, label };
+}
+
+export function getLastBrowseEntryFromFilterValue(filterValue: string) {
+    const browseEntries = filterValue.split(UNIT_SEPARATOR);
+    return browseEntries[browseEntries.length - 1] || '';
+}
+
+const SubTypeIcon = styled.span<{ $fontSize?: number }>`
+    display: inline-flex;
+    color: ${ANTD_GRAY[9]};
+    font-size: ${({ $fontSize }) => $fontSize || 12}px;
+`;
+
+function getEntitySubtypeFilterIconAndLabel(filterValue: string, entityRegistry: EntityRegistry, size?: number) {
+    let icon: React.ReactNode;
+    let label: string | undefined;
+
+    // If this includes a delimiter, it is a subType
+    if (filterValue.includes(FILTER_DELIMITER)) {
+        const [type, subType] = filterValue.split(FILTER_DELIMITER);
+        label = capitalizeFirstLetterOnly(pluralizeIfIrregular(subType));
+        icon = <SubTypeIcon $fontSize={size}>{getTypeIcon(entityRegistry, type as EntityType, subType)}</SubTypeIcon>;
+    } else {
+        icon = entityRegistry.getIcon(filterValue as EntityType, size || 12, IconStyleType.ACCENT, ANTD_GRAY[9]);
+        label = entityRegistry.getCollectionName(filterValue.toUpperCase() as EntityType);
+    }
+
+    return { icon, label };
+}
+
+function getFilterWithEntityIconAndLabel(
+    filterValue: string,
+    entityRegistry: EntityRegistry,
+    filterEntity: Entity,
+    size?: number,
+) {
+    let icon: React.ReactNode = null;
+    let label: string | undefined;
+
+    if (filterEntity.type === EntityType.DataPlatformInstance) {
+        const { icon: newIcon, label: newLabel } = getDataPlatformInstanceIconAndLabel(
+            filterEntity,
+            entityRegistry,
+            size,
+        );
+        icon = newIcon;
+        label = newLabel;
+    } else if (entityRegistry.hasEntity(filterEntity.type)) {
+        icon = entityRegistry.getIcon(filterEntity.type, size || 12, IconStyleType.ACCENT, ANTD_GRAY[9]);
+        label = entityRegistry.getDisplayName(filterEntity.type, filterEntity);
+    } else {
+        label = filterValue;
+    }
+
+    return { icon, label };
+}
+
+export function getFilterIconAndLabel(
+    filterField: string,
+    filterValue: string,
+    entityRegistry: EntityRegistry,
+    filterEntity: Entity | null,
+    size?: number,
+    filterLabelOverride?: string | null,
+) {
+    let icon: React.ReactNode = null;
+    let label: string | undefined;
+
+    if (filterField === ENTITY_FILTER_NAME || filterField === LEGACY_ENTITY_FILTER_NAME) {
+        icon = entityRegistry.getIcon(filterValue as EntityType, size || 12, IconStyleType.ACCENT, ANTD_GRAY[9]);
+        label = entityRegistry.getCollectionName(filterValue.toUpperCase() as EntityType);
+    } else if (filterField === ENTITY_SUB_TYPE_FILTER_NAME) {
+        const { icon: newIcon, label: newLabel } = getEntitySubtypeFilterIconAndLabel(
+            filterValue,
+            entityRegistry,
+            size,
+        );
+        icon = newIcon;
+        label = newLabel;
+    } else if (filterField === TYPE_NAMES_FILTER_NAME) {
+        icon = getSubTypeIcon(filterValue);
+        label = capitalizeFirstLetterOnly(forcePluralize(filterValue));
+    } else if (filterField === PLATFORM_FILTER_NAME) {
+        const logoUrl = (filterEntity as DataPlatform)?.properties?.logoUrl;
+        icon = logoUrl ? (
+            <PlatformIcon src={logoUrl} size={size} />
+        ) : (
+            entityRegistry.getIcon(EntityType.DataPlatform, size || 12, IconStyleType.ACCENT, ANTD_GRAY[9])
+        );
+        label = filterEntity ? entityRegistry.getDisplayName(EntityType.DataPlatform, filterEntity) : filterValue;
+    } else if (filterField === BROWSE_PATH_V2_FILTER_NAME) {
+        icon = <FolderFilled size={size} color="black" />;
+        label = getLastBrowseEntryFromFilterValue(filterValue);
+    } else if (filterEntity) {
+        const { icon: newIcon, label: newLabel } = getFilterWithEntityIconAndLabel(
+            filterValue,
+            entityRegistry,
+            filterEntity,
+            size,
+        );
+        icon = newIcon;
+        label = newLabel;
+    } else {
+        label = filterValue;
+    }
+
+    if (filterLabelOverride) {
+        label = filterLabelOverride;
+    }
+
+    return { icon, label };
+}
+
+export function getNumActiveFiltersForFilter(activeFilters: FacetFilterInput[], filter: FacetMetadata) {
+    return activeFilters.find((f) => f.field === filter.field)?.values?.length || 0;
+}
+
+export function getNumActiveFiltersForGroupOfFilters(activeFilters: FacetFilterInput[], filters: FacetMetadata[]) {
+    let numActiveFilters = 0;
+    filters.forEach((filter) => {
+        numActiveFilters += getNumActiveFiltersForFilter(activeFilters, filter);
+    });
+    return numActiveFilters;
+}
+
+// combine existing aggs from search response with new aggregateAcrossEntities response
+export function combineAggregations(
+    filterField: string,
+    originalAggs: AggregationMetadata[],
+    newFacets?: FacetMetadata[] | null,
+) {
+    const combinedAggregations = [...originalAggs];
+    if (newFacets) {
+        const newAggregations = newFacets.find((facet) => facet.field === filterField)?.aggregations;
+        newAggregations?.forEach((agg) => {
+            // only add the new aggregations if it is not already in the original to avoid dupes
+            if (!originalAggs.find((existingAgg) => existingAgg.value === agg.value)) {
+                combinedAggregations.push(agg);
+            }
+        });
+    }
+    return combinedAggregations;
+}
+
+// filter out any aggregations with a count of 0 unless it's already selected and in activeFilters
+export function filterEmptyAggregations(aggregations: AggregationMetadata[], activeFilters: FacetFilterInput[]) {
+    return aggregations.filter((agg) => {
+        if (agg.count === 0) {
+            return activeFilters.find((activeFilter) => activeFilter.values?.includes(agg.value));
+        }
+        return true;
+    });
+}
+
+export function sortFacets(facetA: FacetMetadata, facetB: FacetMetadata, sortedFacetFields: string[]) {
+    if (sortedFacetFields.indexOf(facetA.field) === -1) return 1;
+    if (sortedFacetFields.indexOf(facetB.field) === -1) return -1;
+    return sortedFacetFields.indexOf(facetA.field) - sortedFacetFields.indexOf(facetB.field);
+}
+
+export function getFilterDropdownIcon(field: string) {
+    if (field.startsWith(STRUCTURED_PROPERTIES_FILTER_NAME)) {
+        return STRUCTURED_PROPERTY_FILTER.icon;
+    }
+    return ALL_FILTER_FIELDS.find((filterField) => filterField.field === field)?.icon;
+}
+
+// maps aggregations and auto complete results to FilterOptionType[] and adds selected filter options if not already there
+export function getFilterOptions(
+    filterField: string,
+    aggregations: AggregationMetadata[],
+    selectedFilterOptions: FilterOptionType[],
+    autoCompleteResults?: GetAutoCompleteMultipleResultsQuery,
+) {
+    const aggregationFilterOptions = aggregations.map((agg) => ({ field: filterField, ...agg }));
+
+    const searchResults = autoCompleteResults?.autoCompleteForMultiple?.suggestions.find((suggestion) =>
+        FACETS_TO_ENTITY_TYPES[filterField]?.includes(suggestion.type),
+    );
+    const searchFilterOptions = searchResults?.entities
+        .filter((entity) => !aggregations.find((agg) => agg.value === entity.urn))
+        .map((entity) => ({ field: filterField, value: entity.urn, entity }));
+
+    let filterOptions: FilterOptionType[] = searchFilterOptions
+        ? [...aggregationFilterOptions, ...searchFilterOptions]
+        : aggregationFilterOptions;
+
+    // if a selected filter option is not in this list (because search results have changed) then insert at the beginning of the list
+    selectedFilterOptions.forEach((selectedOption) => {
+        if (!filterOptions.find((option) => option.value === selectedOption.value)) {
+            filterOptions = [selectedOption, ...filterOptions];
+        }
+    });
+
+    return filterOptions;
+}
+
+export function filterOptionsWithSearch(searchQuery: string, name: string, nestedOptions: FilterOptionType[] = []) {
+    if (searchQuery) {
+        return (
+            name.toLocaleLowerCase().includes(searchQuery.toLocaleLowerCase()) ||
+            !!nestedOptions.find((option) => option.value.toLocaleLowerCase().includes(searchQuery.toLocaleLowerCase()))
+        );
+    }
+    return true;
+}
+
+export const createBrowseV2SearchFilter = (path: Array<string>) => `${UNIT_SEPARATOR}${path.join(UNIT_SEPARATOR)}`;
+
+export function canCreateViewFromFilters(activeFilters: FacetFilterInput[]) {
+    const nestedSubTypeFilter = activeFilters?.find((f) => f.field === ENTITY_SUB_TYPE_FILTER_NAME);
+    if (nestedSubTypeFilter) {
+        const entityTypes = nestedSubTypeFilter.values?.filter((value) => !value.includes(FILTER_DELIMITER));
+        const subTypes = nestedSubTypeFilter.values?.filter((value) => value.includes(FILTER_DELIMITER));
+
+        if (entityTypes?.length && subTypes?.length) {
+            return false;
+        }
+    }
+    return true;
+}
+
+export function getParentEntities(entity: Entity): Entity[] | null {
+    if (!entity) {
+        return null;
+    }
+    if (entity.type === EntityType.GlossaryTerm || entity.type === EntityType.GlossaryNode) {
+        return (entity as GlossaryTerm).parentNodes?.nodes || [];
+    }
+    if (entity.type === EntityType.Domain) {
+        return (entity as Domain).parentDomains?.domains || [];
+    }
+    return null;
+}
+
+const getInferredFieldType = (_: string, aggregationMetadata: AggregationMetadata[]) => {
+    const entityAggregation = aggregationMetadata.find((agg) => agg.entity);
+    if (entityAggregation) {
+        return FieldType.ENTITY;
+    }
+    return undefined;
+};
+
+const getFilterFieldType = (field: string, aggregationMetadata: AggregationMetadata[]) => {
+    if (ENTITY_TYPE_FIELDS.has(field)) {
+        return FieldType.ENTITY_TYPE;
+    }
+    if (BOOLEAN_FIELDS.has(field)) {
+        return FieldType.BOOLEAN;
+    }
+    if (TEXT_FIELDS.has(field)) {
+        return FieldType.TEXT;
+    }
+    if (ENTITY_FIELDS.has(field)) {
+        return FieldType.ENTITY;
+    }
+    const inferredType = getInferredFieldType(field, aggregationMetadata);
+    if (inferredType) {
+        // Inference - If there is an entity, we infer it as an entity type field.
+        return inferredType;
+    }
+    // Select one of a few options.
+    return FieldType.ENUM;
+};
+
+const getInferredFilterEntityTypes = (aggregationMetadata?: AggregationMetadata[]) => {
+    const entityTypes = new Set<EntityType>();
+    aggregationMetadata?.forEach((agg) => {
+        const maybeEntity = agg.entity;
+        if (maybeEntity) {
+            entityTypes.add(maybeEntity.type);
+        }
+    });
+    return Array.from(entityTypes);
+};
+
+const getFilterEntityTypes = (field: string, aggregationMetadata?: AggregationMetadata[]): EntityType[] => {
+    if (OWNERS_FILTER_NAME === field) {
+        return [EntityType.CorpUser, EntityType.CorpGroup];
+    }
+    if (DATA_PLATFORM_INSTANCE_FILTER_NAME === field) {
+        return [EntityType.DataPlatformInstance];
+    }
+    if (DOMAINS_FILTER_NAME === field) {
+        return [EntityType.Domain];
+    }
+    if (CONTAINER_FILTER_NAME === field) {
+        return [EntityType.Container];
+    }
+    if (PLATFORM_FILTER_NAME === field) {
+        return [EntityType.DataPlatform];
+    }
+    if (
+        TAGS_FILTER_NAME === field ||
+        FIELD_TAGS_FILTER_NAME === field ||
+        PROPOSED_TAGS_FILTER_NAME === field ||
+        PROPOSED_SCHEMA_TAGS_FILTER_NAME === field
+    ) {
+        return [EntityType.Tag];
+    }
+    if (
+        GLOSSARY_TERMS_FILTER_NAME === field ||
+        FIELD_GLOSSARY_TERMS_FILTER_NAME === field ||
+        PROPOSED_GLOSSARY_TERMS_FILTER_NAME === field ||
+        PROPOSED_SCHEMA_GLOSSARY_TERMS_FILTER_NAME === field
+    ) {
+        return [EntityType.GlossaryTerm];
+    }
+    const inferredTypes = getInferredFilterEntityTypes(aggregationMetadata);
+    if (inferredTypes) {
+        // Inference - If there is an entity, we infer it as an entity type field.
+        return inferredTypes;
+    }
+    return [];
+};
+
+function getKnownFilterField(field: string): FilterField | undefined {
+    return ALL_FILTER_FIELDS.find((filterField) => filterField.field === field);
+}
+
+function getDynamicFilterField(field: string, availableFilters: FacetMetadata[]): FilterField {
+    const associatedAvailableFilter = availableFilters?.find((availableFilter) => availableFilter.field === field);
+    const filterDisplayName = associatedAvailableFilter?.displayName;
+    const filterAggregations = availableFilters?.find(
+        (availableFilter) => availableFilter.field === field,
+    )?.aggregations;
+    return {
+        field,
+        displayName: filterDisplayName || field,
+        type: getFilterFieldType(field, filterAggregations || []),
+        entityTypes: getFilterEntityTypes(field, filterAggregations),
+        icon: getFilterDropdownIcon(field),
+        entity: associatedAvailableFilter?.entity || undefined,
+    };
+}
+
+function getFilterValues(filter: FacetFilterInput, availableFilters: FacetMetadata[]) {
+    const filterAggregations = availableFilters?.find((availableFilter) =>
+        availableFilter.field.includes(filter?.field),
+    )?.aggregations;
+    return (
+        filter?.values?.map((value) => {
+            // IMPORTANT CODE ALERT: This code assumes that the applied filter value has an aggregation returned as part of the available filters.
+            const filterAggregation = filterAggregations?.find((agg) => agg.value === value);
+            return {
+                value,
+                entity: filterAggregation?.entity || null,
+                count: filterAggregation?.count,
+                displayName: filterAggregation?.displayName || undefined,
+            };
+        }) || []
+    );
+}
+
+function getDefaultFilterOptions(filter: FacetFilterInput, availableFilters: FacetMetadata[]) {
+    const currentFilter = availableFilters?.find((availableFilter) => availableFilter.field.includes(filter?.field));
+    const filterAggregations = currentFilter?.aggregations;
+    return (
+        filterAggregations?.map((agg) => {
+            return {
+                value: agg.value,
+                entity: agg.entity || null,
+                count: agg.count,
+                displayName:
+                    agg.displayName ||
+                    getStructuredPropFilterDisplayName(filter.field, agg.value, currentFilter?.entity),
+            };
+        }) || []
+    );
+}
+
+export function getStructuredPropFilterDisplayName(field: string, value: string, entity?: Entity | null) {
+    const isStructuredPropertyValue = field.startsWith('structuredProperties.');
+    if (!isStructuredPropertyValue) return undefined;
+
+    // check for structured prop entity values
+    if (value.startsWith('urn:li:')) {
+        // this value is an urn, handle entity display names elsewhere
+        return undefined;
+    }
+
+    // check for structured prop date values
+    if (entity && (entity as StructuredPropertyEntity).definition?.valueType?.urn === DATE_TYPE_URN) {
+        return moment(parseInt(value, 10)).tz('GMT').format('MM/DD/YYYY').toString();
+    }
+
+    // check for structured prop number values
+    if (!Number.isNaN(parseFloat(value))) {
+        return parseFloat(value).toString();
+    }
+
+    return removeMarkdown(value);
+}
+
+/**
+ * Converts a FacetFilterInput to a FilterPredicate for easier handling.
+ *
+ * @param filter - The selected filter  object to be converted.
+ * @param availableFilters - An array of available facet filters metadata.
+ * @returns The resulting FilterPredicate.
+ */
+export function convertToFilterPredicate(filter: FacetFilterInput, availableFilters: FacetMetadata[]): FilterPredicate {
+    // First, check whether this is a well-supported filter field.
+    const field = getKnownFilterField(filter.field) || getDynamicFilterField(filter.field, availableFilters);
+    const operator =
+        (filter.condition &&
+            convertBackendToFrontendOperatorType({
+                operator: filter.condition,
+                negated: filter.negated || false,
+            })) ||
+        FilterOperatorType.EQUALS;
+
+    const values = getFilterValues(filter, availableFilters);
+    const defaultOptions = getDefaultFilterOptions(filter, availableFilters);
+
+    return {
+        field,
+        operator,
+        values,
+        defaultValueOptions: defaultOptions,
+    };
+}
+
+/**
+ * Converts an array of selected facet filters to an array of FilterPredicates based on available filters metadata.
+ * Here, we employ strict checking for the field value to differentiate between '_entityType␞typeNames' (recommended filter)
+ * and '_entityType' filters. This strict checking ensures complete decoupling of these filters,
+ * opting for direct equality comparison over 'includes'.
+ *
+ * @param selectedFilters - The array of selected facet filters to be converted.
+ * @param availableFilters - An array of available facet filters metadata.
+ * @returns An array of resulting FilterPredicates.
+ */
+export const convertToAvailableFilterPredictes = (
+    selectedFilters: FacetFilterInput[],
+    availableFilters: FacetMetadata[],
+): FilterPredicate[] => {
+    return availableFilters.map((filter) => {
+        const selectedFilterObj = selectedFilters.find((obj) => obj.field === filter.field);
+        return convertToFilterPredicate(selectedFilterObj || filter, availableFilters);
+    });
+};
+
+/**
+ * Converts an array of selected facet filters to an array of FilterPredicates based on available filters metadata.
+ *
+ * @param selectedFilters - The array of selected facet filters to be converted.
+ * @param availableFilters - An array of available facet filters metadata.
+ * @returns An array of resulting FilterPredicates.
+ */
+
+export const convertToSelectedFilterPredictes = (
+    selectedFilters: FacetFilterInput[],
+    availableFilters: FacetMetadata[],
+): FilterPredicate[] => {
+    return selectedFilters.map((filter) => {
+        return convertToFilterPredicate(filter, availableFilters);
+    });
+};
+
+interface FilterEntityIconProps {
+    field: string;
+    entity: Entity | null | undefined;
+    icon: React.ReactNode | null;
+}
+
+export const FilterEntityIcon: React.FC<FilterEntityIconProps> = ({ field, entity, icon }) => {
+    switch (true) {
+        case field === PLATFORM_FILTER_NAME && entity !== null:
+            return <>{icon}</>;
+
+        case field === TAGS_FILTER_NAME && entity?.type === EntityType.Tag:
+            return <TagColor color={(entity as Tag).properties?.colorHex || ''} colorHash={entity?.urn} />;
+
+        case field === DOMAINS_FILTER_NAME && entity?.type === EntityType.Domain:
+            return <DomainColoredIcon domain={entity as Domain} size={28} />;
+
+        default:
+            return null; // default
+    }
+};
+
+/**
+ * Custom hook to track dimensions of a DOM element.
+ * @param {object} ref - Reference to the DOM element.
+ * @returns {object} - Object containing width, height, and whether the element is outside the window.
+ */
+export function useElementDimensions(ref) {
+    const [dimensions, setDimensions] = useState({ width: 0, height: 0, isElementOutsideWindow: false });
+
+    useLayoutEffect(() => {
+        const updateDimensions = () => {
+            if (ref.current) {
+                const { offsetWidth, offsetHeight } = ref.current;
+                // Using data-testid to locate the "More Filters" dropdown button accurately, considering z-index and styling complexities of antd.
+                const dropdownButton = document.querySelector('[data-testid="more-filters-dropdown"]');
+
+                if (dropdownButton) {
+                    const { left } = dropdownButton.getBoundingClientRect();
+                    const windowWidth = window.innerWidth;
+                    const isElementOutsideWindow = left + offsetWidth * 2 > windowWidth;
+
+                    setDimensions({
+                        width: offsetWidth,
+                        height: offsetHeight,
+                        isElementOutsideWindow,
+                    });
+                }
+            }
+        };
+
+        updateDimensions();
+
+        const handleResize = () => {
+            updateDimensions();
+        };
+        window.addEventListener('resize', handleResize);
+
+        return () => {
+            window.removeEventListener('resize', handleResize);
+        };
+    }, [ref]);
+
+    return dimensions;
+}
+
+export function useFilterDisplayName(filter: FacetMetadata | FilterField, predicateDisplayName?: string) {
+    const entityRegistry = useEntityRegistryV2();
+
+    if (filter.entity) {
+        return entityRegistry.getDisplayName(filter.entity.type, filter.entity);
+    }
+
+    return predicateDisplayName || filter.displayName || filter.field;
+}
+
+export function getIsDateRangeFilter(field: FilterField | FacetMetadata) {
+    if (field.entity && field.entity.type === EntityType.StructuredProperty) {
+        return (field.entity as StructuredPropertyEntity).definition?.valueType?.urn === DATE_TYPE_URN;
+    }
+    return false;
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/value/BooleanValueMenu.tsx b/datahub-web-react/src/app/searchV2/filters/value/BooleanValueMenu.tsx
new file mode 100644
index 00000000000000..2f1ae7f64890e5
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/value/BooleanValueMenu.tsx
@@ -0,0 +1,62 @@
+import React, { useState } from 'react';
+import { FilterField, FilterValue } from '../types';
+import { mapFilterOption } from '../mapFilterOption';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import OptionsDropdownMenu from '../OptionsDropdownMenu';
+import { OptionMenu } from './styledComponents';
+
+// Since we are working with a boolean field, always simply have the base options.
+const OPTIONS = [
+    { value: 'true', count: undefined, entity: null },
+    { value: 'false', count: undefined, entity: null },
+];
+
+interface Props {
+    field: FilterField;
+    values: FilterValue[];
+    onChangeValues: (newValues: FilterValue[]) => void;
+    onApply: () => void;
+    type?: 'card' | 'default';
+    className?: string;
+}
+
+export default function BooleanValueMenu({ field, values, type = 'card', onChangeValues, onApply, className }: Props) {
+    const entityRegistry = useEntityRegistry();
+
+    // Ideally we would not have staged values, and filters would update automatically.
+    const [searchQuery, setSearchQuery] = useState<string | undefined>(undefined);
+
+    const filterMenuOptions = OPTIONS.map((option) =>
+        mapFilterOption({
+            filterOption: {
+                field: field.field,
+                value: option.value,
+                count: option.count,
+                entity: option.entity,
+            },
+            entityRegistry,
+            selectedFilterOptions: values.map((value) => {
+                return { field: field.field, value: value.value };
+            }),
+            setSelectedFilterOptions: (newOptions) =>
+                onChangeValues(
+                    newOptions.map((op) => {
+                        return { field: field.field, value: op.value, entity: null };
+                    }),
+                ),
+        }),
+    );
+
+    return (
+        <OptionsDropdownMenu
+            menu={<OptionMenu items={filterMenuOptions} />}
+            updateFilters={onApply}
+            searchQuery={searchQuery || ''}
+            updateSearchQuery={setSearchQuery}
+            isLoading={false}
+            showSearchBar={false}
+            type={type}
+            className={className}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/value/DateRangeMenu.tsx b/datahub-web-react/src/app/searchV2/filters/value/DateRangeMenu.tsx
new file mode 100644
index 00000000000000..3d3fc864df5747
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/value/DateRangeMenu.tsx
@@ -0,0 +1,90 @@
+import moment from 'moment';
+import { Text } from '@src/alchemy-components';
+import React, { useCallback, useRef, useState } from 'react';
+import { DatePicker } from 'antd';
+import styled from 'styled-components';
+import { FacetFilterInput, FacetMetadata, FilterOperator } from '@src/types.generated';
+import { Datetime } from '@src/app/lineageV2/LineageTimeSelector';
+import { FilterField } from '../types';
+import { useFilterDisplayName } from '../utils';
+import useDateRangeFilterValues from './useDateRangeFilterValues';
+
+const { RangePicker } = DatePicker;
+
+const Container = styled.div`
+    padding: 16px;
+    background-color: #ffffff;
+    box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
+    border-radius: 8px;
+    min-width: 225px;
+`;
+
+interface Props {
+    field: FilterField | FacetMetadata;
+    manuallyUpdateFilters: (newValues: FacetFilterInput[]) => void;
+}
+
+export default function DateRangeMenu({ field, manuallyUpdateFilters }: Props) {
+    const displayName = useFilterDisplayName(field);
+    moment.tz.setDefault('GMT');
+
+    const [startDate, setStartDate] = useState<Datetime>(null);
+    const [endDate, setEndDate] = useState<Datetime>(null);
+    const [isOpen, setIsOpen] = useState<boolean>(false);
+    const ref = useRef<any>(null);
+
+    useDateRangeFilterValues({ filterField: field.field, setStartDate, setEndDate });
+
+    const handleOpenChange = useCallback(
+        (open: boolean) => {
+            setIsOpen(open);
+            if (!open) {
+                ref.current?.blur();
+                if (startDate && endDate) {
+                    manuallyUpdateFilters([
+                        {
+                            field: field.field,
+                            values: [startDate.valueOf().toString()],
+                            condition: FilterOperator.GreaterThan,
+                        },
+                        {
+                            field: field.field,
+                            values: [endDate.valueOf().toString()],
+                            condition: FilterOperator.LessThan,
+                        },
+                    ]);
+                }
+            }
+        },
+        [startDate, endDate, field.field, manuallyUpdateFilters],
+    );
+
+    const handleRangeChange = useCallback((dates: [Datetime, Datetime] | null) => {
+        const [start, end] = dates || [null, null];
+
+        start?.set({ hour: 0, minute: 0, second: 0, millisecond: 0 });
+        end?.set({ hour: 23, minute: 59, second: 59, millisecond: 999 });
+
+        setStartDate(start);
+        setEndDate(end);
+    }, []);
+
+    return (
+        <Container>
+            <Text weight="bold">Filter by {displayName}</Text>
+            <RangePicker
+                ref={ref}
+                open={isOpen}
+                allowClear
+                allowEmpty={[true, true]}
+                bordered={false}
+                value={[startDate, endDate]}
+                format="ll"
+                onChange={handleRangeChange}
+                onOpenChange={handleOpenChange}
+                onCalendarChange={() => handleOpenChange(true)}
+                style={{ paddingLeft: 0, paddingRight: 0 }}
+            />
+        </Container>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/value/EntityTypeMenu.tsx b/datahub-web-react/src/app/searchV2/filters/value/EntityTypeMenu.tsx
new file mode 100644
index 00000000000000..31394ccc2d8cae
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/value/EntityTypeMenu.tsx
@@ -0,0 +1,96 @@
+/* eslint-disable import/no-cycle */
+import React, { useState } from 'react';
+import { FilterField, FilterValue, FilterValueOption } from '../types';
+import { mapFilterOption } from '../mapFilterOption';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import OptionsDropdownMenu from '../OptionsDropdownMenu';
+import { deduplicateOptions, useFilterOptionsBySearchQuery, useLoadAggregationOptions } from './utils';
+import { ENTITY_SUB_TYPE_FILTER_NAME, FILTER_DELIMITER } from '../../utils/constants';
+import { OptionMenu } from './styledComponents';
+
+interface Props {
+    field: FilterField;
+    values: FilterValue[];
+    defaultOptions: FilterValueOption[];
+    onChangeValues: (newValues: FilterValue[]) => void;
+    onApply: () => void;
+    type?: 'card' | 'default';
+    includeSubTypes?: boolean;
+    includeCount?: boolean;
+    className?: string;
+}
+
+export default function EntityTypeMenu({
+    field,
+    values,
+    defaultOptions,
+    type = 'card',
+    onChangeValues,
+    onApply,
+    includeSubTypes = true,
+    includeCount = false,
+    className,
+}: Props) {
+    const entityRegistry = useEntityRegistry();
+    const { displayName } = field;
+
+    // Ideally we would not have staged values, and filters would update automatically.
+    const [searchQuery, setSearchQuery] = useState<string | undefined>(undefined);
+
+    // Here we optionally load the aggregation options, which are the options that are displayed by default.
+    const { options: aggOptions, loading: aggLoading } = useLoadAggregationOptions(field, true, includeCount);
+
+    const allOptions = [...defaultOptions, ...deduplicateOptions(defaultOptions, aggOptions)];
+
+    const localSearchOptions = useFilterOptionsBySearchQuery(allOptions, searchQuery);
+
+    // Compute the final options to show to the user.
+    const finalOptions = searchQuery ? localSearchOptions : allOptions;
+
+    const filterMenuOptions = finalOptions
+        .filter((option) => !option.value.includes(FILTER_DELIMITER)) // remove nested options
+        .map((option) => {
+            const nestedOptions = includeSubTypes
+                ? aggOptions
+                      .filter(
+                          (aggOption) =>
+                              aggOption.value.includes(FILTER_DELIMITER) && aggOption.value.includes(option.value),
+                      )
+                      .map((aggOption) => ({ field: ENTITY_SUB_TYPE_FILTER_NAME, ...aggOption }))
+                : undefined;
+            return mapFilterOption({
+                filterOption: {
+                    field: field.field,
+                    value: option.value,
+                    count: option.count,
+                    entity: option.entity,
+                    displayName: option.displayName,
+                },
+                includeCount,
+                entityRegistry,
+                selectedFilterOptions: values.map((value) => {
+                    return { field: field.field, value: value.value };
+                }),
+                setSelectedFilterOptions: (newOptions) =>
+                    onChangeValues(
+                        newOptions.map((op) => {
+                            return { field: field.field, value: op.value, entity: null };
+                        }),
+                    ),
+                nestedOptions,
+            });
+        });
+
+    return (
+        <OptionsDropdownMenu
+            menu={<OptionMenu items={filterMenuOptions} />}
+            updateFilters={onApply}
+            searchQuery={searchQuery || ''}
+            updateSearchQuery={setSearchQuery}
+            isLoading={aggLoading}
+            searchPlaceholder={displayName}
+            type={type}
+            className={className}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/value/EntityValueMenu.tsx b/datahub-web-react/src/app/searchV2/filters/value/EntityValueMenu.tsx
new file mode 100644
index 00000000000000..d370f6bcf5f450
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/value/EntityValueMenu.tsx
@@ -0,0 +1,85 @@
+import React, { useState } from 'react';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import OptionsDropdownMenu from '../OptionsDropdownMenu';
+import { mapFilterOption } from '../mapFilterOption';
+import { EntityFilterField, FilterValue, FilterValueOption } from '../types';
+import { OptionMenu } from './styledComponents';
+import { deduplicateOptions, useFilterOptionsBySearchQuery, useLoadSearchOptions } from './utils';
+
+interface Props {
+    field: EntityFilterField;
+    values: FilterValue[];
+    defaultOptions: FilterValueOption[];
+    onChangeValues: (newValues: FilterValue[]) => void;
+    onApply: () => void;
+    type?: 'card' | 'default';
+    includeCount?: boolean;
+    className?: string;
+}
+
+export default function EntityValueMenu({
+    field,
+    values,
+    defaultOptions,
+    type = 'card',
+    includeCount = false,
+    onChangeValues,
+    onApply,
+    className,
+}: Props) {
+    const entityRegistry = useEntityRegistry();
+    const isSearchable =
+        field.entityTypes?.length && field.entityTypes.every((t) => entityRegistry.getEntity(t).isSearchEnabled());
+    const { displayName } = field;
+
+    // Ideally we would not have staged values, and filters would update automatically.
+    const [searchQuery, setSearchQuery] = useState<string | undefined>(undefined);
+
+    // Here we optionally load the search options, which are the options that are displayed when the user searches.
+    const { options: searchOptions, loading: searchLoading } = useLoadSearchOptions(field, searchQuery, !isSearchable);
+
+    const localSearchOptions = useFilterOptionsBySearchQuery(defaultOptions, searchQuery);
+
+    const finalSearchOptions = [...localSearchOptions, ...deduplicateOptions(localSearchOptions, searchOptions)];
+
+    // Compute the final options to show to the user.
+    const finalOptions = searchQuery ? finalSearchOptions : defaultOptions;
+
+    // Finally, create the option set.
+    // TODO: Add an option set for "no x".
+    const filterMenuOptions = finalOptions.map((option) =>
+        mapFilterOption({
+            filterOption: {
+                field: field.field,
+                value: option.value,
+                count: option.count,
+                entity: option.entity,
+                displayName: option.displayName,
+            },
+            entityRegistry,
+            includeCount,
+            selectedFilterOptions: values.map((value) => {
+                return { field: field.field, value: value.value, entity: value.entity };
+            }),
+            setSelectedFilterOptions: (newOptions) =>
+                onChangeValues(
+                    newOptions.map((op) => {
+                        return { field: field.field, value: op.value, entity: op.entity || null };
+                    }),
+                ),
+        }),
+    );
+
+    return (
+        <OptionsDropdownMenu
+            menu={<OptionMenu items={filterMenuOptions} />}
+            updateFilters={onApply}
+            searchQuery={searchQuery || ''}
+            updateSearchQuery={setSearchQuery}
+            isLoading={searchLoading}
+            searchPlaceholder={`Search for ${displayName}`}
+            type={type}
+            className={className}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/value/EnumValueMenu.tsx b/datahub-web-react/src/app/searchV2/filters/value/EnumValueMenu.tsx
new file mode 100644
index 00000000000000..85106088891f8e
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/value/EnumValueMenu.tsx
@@ -0,0 +1,85 @@
+import React, { useState } from 'react';
+import { FilterField, FilterValue, FilterValueOption } from '../types';
+import { mapFilterOption } from '../mapFilterOption';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import OptionsDropdownMenu from '../OptionsDropdownMenu';
+import { deduplicateOptions, useFilterOptionsBySearchQuery, useLoadAggregationOptions } from './utils';
+import { OptionMenu } from './styledComponents';
+import { getStructuredPropFilterDisplayName, useFilterDisplayName } from '../utils';
+import { STRUCTURED_PROPERTIES_FILTER_NAME } from '../../utils/constants';
+
+interface Props {
+    field: FilterField;
+    values: FilterValue[];
+    defaultOptions: FilterValueOption[];
+    onChangeValues: (newValues: FilterValue[]) => void;
+    onApply: () => void;
+    type?: 'card' | 'default';
+    includeCount?: boolean;
+    className?: string;
+}
+
+export default function EnumValueMenu({
+    field,
+    values,
+    includeCount = false,
+    defaultOptions,
+    type = 'card',
+    onChangeValues,
+    onApply,
+    className,
+}: Props) {
+    const entityRegistry = useEntityRegistry();
+    const displayName = useFilterDisplayName(field);
+
+    // Ideally we would not have staged values, and filters would update automatically.
+    const [searchQuery, setSearchQuery] = useState<string | undefined>(undefined);
+
+    // Here we optionally load the aggregation options, which are the options that are displayed by default.
+    const { options: aggOptions, loading: aggLoading } = useLoadAggregationOptions(field, true, includeCount);
+
+    const allOptions = [...defaultOptions, ...deduplicateOptions(defaultOptions, aggOptions)];
+
+    const localSearchOptions = useFilterOptionsBySearchQuery(allOptions, searchQuery);
+
+    // Compute the final options to show to the user.
+    const finalOptions = searchQuery ? localSearchOptions : allOptions;
+
+    const filterMenuOptions = finalOptions.map((option) =>
+        mapFilterOption({
+            filterOption: {
+                field: field.field,
+                value: option.value,
+                count: option.count,
+                entity: option.entity,
+                displayName:
+                    option.displayName || field.field.startsWith(STRUCTURED_PROPERTIES_FILTER_NAME)
+                        ? getStructuredPropFilterDisplayName(field.field, option.value)
+                        : undefined,
+            },
+            entityRegistry,
+            selectedFilterOptions: values.map((value) => {
+                return { field: field.field, value: value.value };
+            }),
+            setSelectedFilterOptions: (newOptions) =>
+                onChangeValues(
+                    newOptions.map((op) => {
+                        return { field: field.field, value: op.value, entity: null };
+                    }),
+                ),
+        }),
+    );
+
+    return (
+        <OptionsDropdownMenu
+            menu={<OptionMenu items={filterMenuOptions} />}
+            updateFilters={onApply}
+            searchQuery={searchQuery || ''}
+            updateSearchQuery={setSearchQuery}
+            isLoading={aggLoading}
+            searchPlaceholder={displayName}
+            type={type}
+            className={className}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/value/TextValueInput.tsx b/datahub-web-react/src/app/searchV2/filters/value/TextValueInput.tsx
new file mode 100644
index 00000000000000..087250cda88dea
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/value/TextValueInput.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { Input } from 'antd';
+
+interface Props {
+    name: string;
+    value: string;
+    onChangeValue: (newValue: string) => void;
+}
+
+export default function TextValueInput({ name, value, onChangeValue }: Props) {
+    return (
+        <Input
+            placeholder={`Enter ${name.toLocaleLowerCase()}`}
+            data-testid="edit-text-input"
+            onChange={(e) => onChangeValue(e.target.value)}
+            value={value}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/value/TextValueMenu.tsx b/datahub-web-react/src/app/searchV2/filters/value/TextValueMenu.tsx
new file mode 100644
index 00000000000000..3e55fb82c39278
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/value/TextValueMenu.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import { Button, Typography } from 'antd';
+import styled from 'styled-components';
+import { FilterField, FilterValue } from '../types';
+import TextValueInput from './TextValueInput';
+
+const Container = styled.div`
+    padding: 16px;
+    background-color: #ffffff;
+    box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
+    border-radius: 8px;
+`;
+
+const Title = styled(Typography.Title)`
+    padding-bottom: 4px;
+`;
+
+const UpdateButton = styled(Button)`
+    margin-top: 12px;
+`;
+
+interface Props {
+    field: FilterField;
+    values: FilterValue[];
+    onChangeValues: (newValues: FilterValue[]) => void;
+    onApply: () => void;
+}
+
+export default function TextValueMenu({ field, values, onChangeValues, onApply }: Props) {
+    const { displayName } = field;
+    const value = values.length > 0 ? values[0].displayName || values[0].value : '';
+
+    return (
+        <Container>
+            <Title level={5}>{`Filter by ${displayName}`}</Title>
+            <TextValueInput
+                name={displayName}
+                value={value}
+                onChangeValue={(v) => onChangeValues([{ value: v, entity: null }])}
+            />
+            <UpdateButton type="primary" onClick={onApply}>
+                Apply
+            </UpdateButton>
+        </Container>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/value/TimeBucketMenu.tsx b/datahub-web-react/src/app/searchV2/filters/value/TimeBucketMenu.tsx
new file mode 100644
index 00000000000000..1a93fa2b73f326
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/value/TimeBucketMenu.tsx
@@ -0,0 +1,72 @@
+import { ANTD_GRAY } from '@app/entity/shared/constants';
+import OptionsDropdownMenu from '@app/searchV2/filters/OptionsDropdownMenu';
+import { FilterValue, TimeBucketFilterField } from '@app/searchV2/filters/types';
+import { OptionMenu } from '@app/searchV2/filters/value/styledComponents';
+import type { ItemType } from 'antd/lib/menu/hooks/useItems';
+import moment from 'moment';
+import React, { useMemo } from 'react';
+import styled from 'styled-components';
+
+const FilterOptionWrapper = styled.div`
+    display: flex;
+    align-items: center;
+
+    margin: 0 4px;
+    padding: 10px;
+
+    border-radius: 8px;
+
+    font-size: 14px;
+
+    &:hover {
+        background-color: ${ANTD_GRAY[3]};
+    }
+`;
+
+interface Props {
+    field: TimeBucketFilterField;
+    values: FilterValue[];
+    onChangeValues: (newValues: FilterValue[]) => void;
+    onApply: () => void;
+    type?: 'card' | 'default';
+    className?: string;
+}
+
+export default function TimeBucketMenu({ field, values, type = 'card', onChangeValues, onApply, className }: Props) {
+    const filterMenuOptions = useMemo(
+        () =>
+            field.options.map(({ label, startOffsetMillis }): ItemType => {
+                const timestamp = moment()
+                    .subtract(startOffsetMillis, 'milliseconds')
+                    .set({ hour: 0, minute: 0, second: 0, millisecond: 0 })
+                    .valueOf()
+                    .toString();
+                return {
+                    key: timestamp,
+                    label: <FilterOptionWrapper>{label}</FilterOptionWrapper>,
+                    onClick: () => onChangeValues([{ value: timestamp, entity: null }]),
+                };
+            }),
+        [field.options, onChangeValues],
+    );
+
+    const selectedKey = useMemo(
+        () => filterMenuOptions.find((option) => values.length && option?.key === values[0].value)?.key,
+        [filterMenuOptions, values],
+    );
+
+    return (
+        <OptionsDropdownMenu
+            menu={
+                <OptionMenu
+                    items={filterMenuOptions}
+                    selectedKeys={selectedKey ? [selectedKey.toString()] : undefined}
+                />
+            }
+            updateFilters={onApply}
+            showSearchBar={false}
+            type={type}
+            className={className}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/value/ValueMenu.tsx b/datahub-web-react/src/app/searchV2/filters/value/ValueMenu.tsx
new file mode 100644
index 00000000000000..792bc2ef3a31c3
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/value/ValueMenu.tsx
@@ -0,0 +1,156 @@
+/* eslint-disable import/no-cycle */
+import TimeBucketMenu from '@app/searchV2/filters/value/TimeBucketMenu';
+import { FacetFilterInput } from '@src/types.generated';
+import React, { useEffect, useRef, useState } from 'react';
+import { FilterField, FilterValueOption, FilterValue, FieldType } from '../types';
+import TextValueMenu from './TextValueMenu';
+import BooleanValueMenu from './BooleanValueMenu';
+import EntityValueMenu from './EntityValueMenu';
+import EntityTypeMenu from './EntityTypeMenu';
+import EnumValueMenu from './EnumValueMenu';
+import DateRangeMenu from './DateRangeMenu';
+import { getIsDateRangeFilter } from '../utils';
+
+interface Props {
+    field: FilterField;
+    values: FilterValue[];
+    defaultOptions: FilterValueOption[];
+    onChangeValues: (newValues: FilterValue[]) => void;
+    type?: 'card' | 'default';
+    visible: boolean;
+    includeCount?: boolean;
+    className?: string;
+    manuallyUpdateFilters?: (newValues: FacetFilterInput[]) => void;
+}
+
+export default function ValueMenu({
+    field,
+    values,
+    defaultOptions,
+    type = 'card',
+    onChangeValues,
+    visible,
+    includeCount,
+    className,
+    manuallyUpdateFilters,
+}: Props) {
+    const [stagedSelectedValues, setStagedSelectedValues] = useState<FilterValue[]>(values || []);
+    const visibilityRef = useRef<boolean>(visible);
+    const isDateRangeFilter = getIsDateRangeFilter(field);
+
+    /**
+     * Synchronize stagedSelectedValues with the values prop
+     * NOTE: Callback with useState not feasible due to its initialization behavior.
+     */
+    useEffect(() => {
+        setStagedSelectedValues(values);
+    }, [values]);
+
+    /**
+     * If the visibility of the menu changes in the parent component, we can dump off the staged values before closing
+     * to make the UI feel more responsive.
+     */
+    useEffect(() => {
+        const previouslyVisible = visibilityRef.current;
+        visibilityRef.current = visible;
+
+        if (!visible && previouslyVisible !== visible && !isDateRangeFilter) {
+            onChangeValues(stagedSelectedValues);
+        }
+    }, [visible, stagedSelectedValues, onChangeValues, isDateRangeFilter]);
+
+    if (isDateRangeFilter && manuallyUpdateFilters) {
+        return <DateRangeMenu field={field} manuallyUpdateFilters={manuallyUpdateFilters} />;
+    }
+
+    switch (field.type) {
+        case FieldType.TEXT:
+            return (
+                <TextValueMenu
+                    field={field}
+                    values={stagedSelectedValues}
+                    onChangeValues={setStagedSelectedValues}
+                    onApply={() => onChangeValues(stagedSelectedValues)}
+                />
+            );
+        case FieldType.BOOLEAN:
+            return (
+                <BooleanValueMenu
+                    field={field}
+                    values={stagedSelectedValues}
+                    type={type}
+                    className={className}
+                    onChangeValues={setStagedSelectedValues}
+                    onApply={() => onChangeValues(stagedSelectedValues)}
+                />
+            );
+        case FieldType.ENTITY:
+            return (
+                <EntityValueMenu
+                    field={field}
+                    includeCount={includeCount}
+                    values={stagedSelectedValues}
+                    defaultOptions={defaultOptions}
+                    type={type}
+                    className={className}
+                    onChangeValues={setStagedSelectedValues}
+                    onApply={() => onChangeValues(stagedSelectedValues)}
+                />
+            );
+        case FieldType.NESTED_ENTITY_TYPE:
+            return (
+                <EntityTypeMenu
+                    field={field}
+                    includeCount={includeCount}
+                    values={stagedSelectedValues}
+                    defaultOptions={defaultOptions}
+                    type={type}
+                    className={className}
+                    onChangeValues={setStagedSelectedValues}
+                    onApply={() => onChangeValues(stagedSelectedValues)}
+                />
+            );
+        case FieldType.ENTITY_TYPE:
+            return (
+                <EntityTypeMenu
+                    field={field}
+                    includeCount={includeCount}
+                    values={stagedSelectedValues}
+                    defaultOptions={defaultOptions}
+                    type={type}
+                    className={className}
+                    onChangeValues={setStagedSelectedValues}
+                    onApply={() => onChangeValues(stagedSelectedValues)}
+                />
+            );
+        case FieldType.ENUM:
+            return (
+                <EnumValueMenu
+                    field={field}
+                    includeCount={includeCount}
+                    values={stagedSelectedValues}
+                    defaultOptions={defaultOptions}
+                    type={type}
+                    className={className}
+                    onChangeValues={setStagedSelectedValues}
+                    onApply={() => onChangeValues(stagedSelectedValues)}
+                />
+            );
+        case FieldType.BUCKETED_TIMESTAMP:
+            return (
+                <TimeBucketMenu
+                    field={field}
+                    values={stagedSelectedValues}
+                    type={type}
+                    className={className}
+                    onChangeValues={setStagedSelectedValues}
+                    onApply={() => onChangeValues(stagedSelectedValues)}
+                />
+            );
+        case FieldType.BROWSE_PATH:
+            return <></>;
+        default:
+            console.error(`Unknown field type: ${field}`);
+            return null;
+    }
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/value/ValueName.tsx b/datahub-web-react/src/app/searchV2/filters/value/ValueName.tsx
new file mode 100644
index 00000000000000..0d69537af3e8d4
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/value/ValueName.tsx
@@ -0,0 +1,63 @@
+import moment from 'moment';
+import React from 'react';
+import { Typography } from 'antd';
+import { FilterField, FilterValue, FieldType } from '../types';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { getEntityTypeFilterValueDisplayName } from './utils';
+import { UNIT_SEPARATOR } from '../../utils/constants';
+import { getV1FieldPathFromSchemaFieldUrn } from '../../../lineageV2/lineageUtils';
+import { getStructuredPropFilterDisplayName } from '../utils';
+
+function getTextFieldName(field: FilterField, value: FilterValue) {
+    let textFieldName = value.displayName || value.value;
+    if (textFieldName.startsWith('urn:li:schemaField:')) {
+        textFieldName = getV1FieldPathFromSchemaFieldUrn(textFieldName);
+    }
+    return getStructuredPropFilterDisplayName(field.field, value.value, field.entity) || textFieldName;
+}
+
+interface Props {
+    field: FilterField;
+    value: FilterValue;
+}
+
+export default function ValueName({ field, value }: Props) {
+    const entityRegistry = useEntityRegistry();
+
+    switch (field.type) {
+        case FieldType.TEXT:
+        case FieldType.BOOLEAN:
+        case FieldType.ENUM:
+            return <>{getTextFieldName(field, value)}</>;
+        case FieldType.ENTITY:
+            return (
+                <>{(value.entity && entityRegistry.getDisplayName(value.entity?.type, value.entity)) || undefined}</>
+            );
+        case FieldType.ENTITY_TYPE:
+        case FieldType.NESTED_ENTITY_TYPE:
+            return <> {getEntityTypeFilterValueDisplayName(value.value, entityRegistry)}</>;
+        case FieldType.BROWSE_PATH: {
+            // TODO: Break this into a separate component.
+            const pathParts = value.value.split(UNIT_SEPARATOR).filter((part) => part);
+            return (
+                <>
+                    {pathParts.map((part, index) => (
+                        <>
+                            {part}
+                            {(index < pathParts.length - 1 && (
+                                <Typography.Text type="secondary"> / </Typography.Text>
+                            )) ||
+                                undefined}
+                        </>
+                    ))}
+                </>
+            );
+        }
+        case FieldType.BUCKETED_TIMESTAMP:
+            // Note: Currently unused, as SelectedFilter.tsx renders DatePicker instead
+            return <>{moment(value.value).format('YYYY-MM-DD')}</>;
+        default:
+            console.error(`Unknown field type: ${field}`);
+            return <>n/a</>;
+    }
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/value/ValueSelector.tsx b/datahub-web-react/src/app/searchV2/filters/value/ValueSelector.tsx
new file mode 100644
index 00000000000000..faed298a47783a
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/value/ValueSelector.tsx
@@ -0,0 +1,61 @@
+/* eslint-disable import/no-cycle */
+import { Dropdown } from 'antd';
+import React, { useState } from 'react';
+import { FacetFilterInput } from '@src/types.generated';
+import { FilterField, FilterValue, FilterValueOption } from '../types';
+import ValueMenu from './ValueMenu';
+
+interface Props {
+    field: FilterField;
+    values: FilterValue[];
+    defaultOptions: FilterValueOption[];
+    onChangeValues: (newValues: FilterValue[]) => void;
+    children?: any;
+    className?: string;
+    manuallyUpdateFilters?: (newValues: FacetFilterInput[]) => void;
+}
+
+export default function ValueSelector({
+    field,
+    values,
+    defaultOptions,
+    onChangeValues,
+    children,
+    className,
+    manuallyUpdateFilters,
+}: Props) {
+    const [isMenuOpen, setIsMenuOpen] = useState(false);
+
+    const onUpdateValues = (newValues: FilterValue[]) => {
+        setIsMenuOpen(false);
+        onChangeValues(newValues);
+    };
+
+    const onManuallyUpdateFilters = (newValues: FacetFilterInput[]) => {
+        setIsMenuOpen(false);
+        manuallyUpdateFilters?.(newValues);
+    };
+
+    return (
+        <Dropdown
+            key={field.field}
+            trigger={['click']}
+            open={isMenuOpen}
+            onOpenChange={setIsMenuOpen}
+            dropdownRender={(_) => (
+                <ValueMenu
+                    field={field}
+                    values={values}
+                    defaultOptions={defaultOptions}
+                    onChangeValues={onUpdateValues}
+                    visible={isMenuOpen}
+                    includeCount
+                    className={className}
+                    manuallyUpdateFilters={onManuallyUpdateFilters}
+                />
+            )}
+        >
+            {children}
+        </Dropdown>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/value/styledComponents.tsx b/datahub-web-react/src/app/searchV2/filters/value/styledComponents.tsx
new file mode 100644
index 00000000000000..fc3ffc2d70ad89
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/value/styledComponents.tsx
@@ -0,0 +1,15 @@
+import { Menu } from 'antd';
+import styled from 'styled-components';
+
+export const OptionMenu = styled(Menu)`
+    &&& .ant-menu-item {
+        height: auto;
+        line-height: 22px;
+        height: auto;
+        padding: 0;
+    }
+
+    &&& .ant-dropdown-menu-item {
+        padding: 0;
+    }
+`;
diff --git a/datahub-web-react/src/app/searchV2/filters/value/useDateRangeFilterValues.ts b/datahub-web-react/src/app/searchV2/filters/value/useDateRangeFilterValues.ts
new file mode 100644
index 00000000000000..5360be4f2cefd5
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/value/useDateRangeFilterValues.ts
@@ -0,0 +1,47 @@
+import { useEffect, useMemo } from 'react';
+import { FilterOperator } from '@src/types.generated';
+import moment from 'moment';
+import { Datetime } from '@src/app/lineageV2/LineageTimeSelector';
+import useGetSearchQueryInputs from '../../useGetSearchQueryInputs';
+
+interface Props {
+    filterField: string;
+    setStartDate: React.Dispatch<React.SetStateAction<Datetime>>;
+    setEndDate: React.Dispatch<React.SetStateAction<Datetime>>;
+}
+
+export default function useDateRangeFilterValues({ filterField, setStartDate, setEndDate }: Props) {
+    const { filters: activeFilters } = useGetSearchQueryInputs();
+    const matchingFilters = useMemo(
+        () => activeFilters.filter((f) => f.field === filterField),
+        [activeFilters, filterField],
+    );
+    const startDateFromFilter = useMemo(
+        () => matchingFilters.find((f) => f.condition === FilterOperator.GreaterThan)?.values?.[0],
+        [matchingFilters],
+    );
+    const endDateFromFilter = useMemo(
+        () => matchingFilters.find((f) => f.condition === FilterOperator.LessThan)?.values?.[0],
+        [matchingFilters],
+    );
+
+    useEffect(() => {
+        if (startDateFromFilter) {
+            setStartDate(
+                moment(parseInt(startDateFromFilter, 10)).set({ hour: 0, minute: 0, second: 0, millisecond: 0 }),
+            );
+        } else {
+            setStartDate(null);
+        }
+    }, [startDateFromFilter, setStartDate]);
+
+    useEffect(() => {
+        if (endDateFromFilter) {
+            setEndDate(
+                moment(parseInt(endDateFromFilter, 10)).set({ hour: 23, minute: 59, second: 59, millisecond: 999 }),
+            );
+        } else {
+            setEndDate(null);
+        }
+    }, [endDateFromFilter, setEndDate]);
+}
diff --git a/datahub-web-react/src/app/searchV2/filters/value/utils.tsx b/datahub-web-react/src/app/searchV2/filters/value/utils.tsx
new file mode 100644
index 00000000000000..1cdde2b052f984
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/filters/value/utils.tsx
@@ -0,0 +1,143 @@
+import { useMemo } from 'react';
+import { ENTITY_FILTER_NAME } from '@src/app/search/utils/constants';
+import useGetSearchQueryInputs from '@src/app/search/useGetSearchQueryInputs';
+import { EntityRegistry } from '../../../../entityRegistryContext';
+import {
+    useAggregateAcrossEntitiesQuery,
+    useGetAutoCompleteMultipleResultsQuery,
+} from '../../../../graphql/search.generated';
+import { EntityType } from '../../../../types.generated';
+import { capitalizeFirstLetterOnly } from '../../../shared/textUtil';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { FILTER_DELIMITER } from '../../utils/constants';
+import { EntityFilterField, FieldType, FilterField, FilterOperatorType, FilterValueOption } from '../types';
+import { filterOptionsWithSearch, getStructuredPropFilterDisplayName } from '../utils';
+
+const MAX_AGGREGATION_COUNT = 40;
+
+/**
+ * Simply removes the baseOptions from moreOptions parameters in case the same filter option
+ * appears in both lists.
+ */
+export const deduplicateOptions = (baseOptions: FilterValueOption[], moreOptions: FilterValueOption[]) => {
+    const baseValues = baseOptions.map((op) => op.value);
+    return moreOptions.filter((op) => !baseValues.includes(op.value));
+};
+
+export const mapFilterCountsToZero = (options: FilterValueOption[]) => {
+    return options.map((option) => {
+        return {
+            ...option,
+            count: 0,
+        };
+    });
+};
+
+/**
+ * Hook used to load the default set of options for a selector dropdown
+ * by using an aggregation query to the backend.
+ *
+ * TODO: Determine if we need to provide an option context that would help with filtering.
+ */
+export const useLoadAggregationOptions = (field: FilterField, visible: boolean, includeCounts: boolean) => {
+    const { entityFilters, query, orFilters, viewUrn } = useGetSearchQueryInputs(
+        useMemo(() => [field.field], [field.field]),
+    );
+    const { data, loading } = useAggregateAcrossEntitiesQuery({
+        skip: !visible,
+        variables: {
+            input: {
+                query,
+                facets: [field.field],
+                searchFlags: {
+                    maxAggValues: MAX_AGGREGATION_COUNT,
+                },
+                types: field.field === ENTITY_FILTER_NAME ? null : entityFilters,
+                orFilters,
+                viewUrn,
+            },
+        },
+        fetchPolicy: 'cache-first',
+    });
+
+    if (!visible) {
+        return { loading: false, options: [] };
+    }
+
+    const requestedAgg = data?.aggregateAcrossEntities?.facets?.find((facet: any) => facet.field === field.field);
+    const options = requestedAgg?.aggregations?.map((aggregation): FilterValueOption => {
+        return {
+            value: aggregation.value,
+            entity: aggregation.entity,
+            icon: field.icon,
+            count: includeCounts ? aggregation.count : undefined,
+            displayName: getStructuredPropFilterDisplayName(field.field, aggregation.value, field.entity),
+        };
+    });
+    return { options: options || [], loading };
+};
+
+/**
+ * Hook used to load autocomplete / search options when a user types into a selector dropdown
+ * search bar.
+ */
+export const useLoadSearchOptions = (field: EntityFilterField, query?: string, skip?: boolean) => {
+    const { data, loading } = useGetAutoCompleteMultipleResultsQuery({
+        skip: skip || !query,
+        variables: {
+            input: {
+                query: query || '',
+                types: field.entityTypes,
+                limit: 20,
+            },
+        },
+        fetchPolicy: 'cache-first',
+    });
+
+    if (skip) {
+        return { loading: false, options: [] };
+    }
+
+    const options = data?.autoCompleteForMultiple?.suggestions
+        ?.flatMap((suggestion) => suggestion.entities)
+        .map((entity): FilterValueOption => {
+            return {
+                value: entity.urn,
+                entity,
+                icon: field.icon,
+            };
+        });
+    return { options: options || [], loading };
+};
+
+/**
+ * Hook used to filter selector options by a raw search query string. This uses the name of the filter value
+ * to match against the search query.
+ */
+export const useFilterOptionsBySearchQuery = (
+    options: FilterValueOption[],
+    searchQuery?: string,
+): FilterValueOption[] => {
+    const entityRegistry = useEntityRegistry();
+    if (!searchQuery) {
+        return options;
+    }
+    return options.filter((option) => {
+        const optionName = option.entity
+            ? entityRegistry.getDisplayName(option.entity.type, option.entity)
+            : option.displayName || option.value;
+        return filterOptionsWithSearch(searchQuery, optionName, []);
+    });
+};
+
+export const getEntityTypeFilterValueDisplayName = (value: string, entityRegistry: EntityRegistry) => {
+    if (value.includes(FILTER_DELIMITER)) {
+        const subType = value.split(FILTER_DELIMITER)[1];
+        return capitalizeFirstLetterOnly(subType);
+    }
+    return entityRegistry.getCollectionName(value.toUpperCase() as EntityType);
+};
+
+export const getDefaultFieldOperatorType = (field: FilterField) => {
+    return field.type === FieldType.TEXT ? FilterOperatorType.CONTAINS : FilterOperatorType.EQUALS;
+};
diff --git a/datahub-web-react/src/app/searchV2/matches/GroupedMatch.tsx b/datahub-web-react/src/app/searchV2/matches/GroupedMatch.tsx
new file mode 100644
index 00000000000000..401fe76205d91f
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/matches/GroupedMatch.tsx
@@ -0,0 +1,75 @@
+import React, { useState } from 'react';
+
+import styled from 'styled-components';
+
+import { MatchedField } from '../../../types.generated';
+import { useSearchQuery } from '../../search/context/SearchContext';
+import { useEntityRegistry } from '../../useEntityRegistry';
+
+import { MatchesGroupedByFieldName } from './constants';
+import { getDescriptionSlice, isDescriptionField, isHighlightableEntityField } from './utils';
+
+const FieldWrapper = styled.div<{ $isClickable: boolean; $color?: string }>`
+    border-radius: 50px;
+    padding: 5px 8px;
+    &:hover {
+        background: #c3b8ee;
+    }
+
+    ${(props) => props.$isClickable && `cursor: pointer;`}
+    ${(props) => props.$color && `color: ${props.$color};`}
+`;
+
+type CustomFieldRenderer = (field: MatchedField) => JSX.Element | null;
+
+const RenderedField = ({
+    customFieldRenderer,
+    field,
+}: {
+    customFieldRenderer?: CustomFieldRenderer;
+    field: MatchedField;
+}) => {
+    const entityRegistry = useEntityRegistry();
+    const query = useSearchQuery()?.trim()?.toLowerCase();
+    const customRenderedField = customFieldRenderer?.(field);
+    if (customRenderedField) return <>{customRenderedField}</>;
+    if (isHighlightableEntityField(field)) {
+        return field.entity ? <>{entityRegistry.getDisplayName(field.entity.type, field.entity)}</> : <></>;
+    }
+    if (isDescriptionField(field) && query) return <>{getDescriptionSlice(field.value, query)}</>;
+    return <>{field.value}</>;
+};
+
+interface Props {
+    groupedMatch: MatchesGroupedByFieldName;
+    limit: number;
+    customFieldRenderer?: CustomFieldRenderer;
+    onClick?: (query?: string) => void;
+    isClickable: boolean;
+}
+
+export const GroupedMatch = ({ groupedMatch, limit, customFieldRenderer, onClick, isClickable }: Props) => {
+    const [isShowingMore, setIsShowingMore] = useState(false);
+    const count = groupedMatch.matchedFields.length;
+    const moreCount = Math.max(count - limit, 0);
+    const fields = isShowingMore ? groupedMatch.matchedFields : groupedMatch.matchedFields.slice(0, limit);
+    return (
+        <>
+            {fields.map((field) => (
+                <FieldWrapper onClick={() => onClick?.(field.value)} $isClickable={isClickable}>
+                    <RenderedField field={field} customFieldRenderer={customFieldRenderer} />
+                </FieldWrapper>
+            ))}
+            {!!moreCount && !isShowingMore && (
+                <FieldWrapper $isClickable onClick={() => setIsShowingMore(true)} $color="#5C3FD1">
+                    + {moreCount} more
+                </FieldWrapper>
+            )}
+            {isShowingMore && (
+                <FieldWrapper $isClickable onClick={() => setIsShowingMore(false)} $color="#5C3FD1">
+                    Show less
+                </FieldWrapper>
+            )}
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/matches/MatchContextContainer.tsx b/datahub-web-react/src/app/searchV2/matches/MatchContextContainer.tsx
new file mode 100644
index 00000000000000..cc1d85836386b7
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/matches/MatchContextContainer.tsx
@@ -0,0 +1,127 @@
+import React from 'react';
+import styled from 'styled-components';
+import { SEARCH_COLORS } from '../../entityV2/shared/constants';
+import MatchContext, { PreviewSection } from '../../shared/MatchesContext';
+import { SearchCardSlideoutContent } from '../searchSlideout/SearchCardSlideoutContent';
+import { CombinedSearchResult } from '../utils/combineSiblingsInSearchResults';
+import HorizontalScroller from '../../sharedV2/carousel/HorizontalScroller';
+import { useSearchContext } from '../../search/context/SearchContext';
+
+const MATCHES_CONTAINER_HEIGHT = 52;
+
+const MatchesContainer = styled.div<{ expanded: boolean; selected: boolean; compactUserSearchCardStyle: boolean }>`
+    z-index: 1;
+    border-radius: 10px;
+    margin: 0 auto 12px auto;
+    padding: 4px;
+    :hover {
+        ${(props) => !props.selected && `outline: 1px solid ${SEARCH_COLORS.TITLE_PURPLE};}`};
+    }
+
+    position: absolute;
+    height: ${(props) =>
+        !props.expanded || props.compactUserSearchCardStyle ? '100%' : `calc(100% + ${MATCHES_CONTAINER_HEIGHT}px)`};
+    transition: height 0.3s ease;
+
+    // height: 100%;
+    width: 100%;
+    background-color: #ffffff;
+    display: flex;
+    flex-direction: column;
+
+    ${(props) =>
+        props.selected &&
+        `
+        outline: 1px solid ${SEARCH_COLORS.TITLE_PURPLE};
+        left: -5px;
+        width: calc(100% + 5px);
+    `}
+`;
+
+const MatchesBottomGroup = styled.div`
+    margin-top: auto;
+    margin-bottom: 8px;
+    /* The following div ensures that Tags, Terms, etc., override their default flex-wrap: wrap; with flex-wrap: nowrap; 
+    and maintain alignment as needed, making them scrollable horizontally */
+    div {
+        display: flex;
+        flex-wrap: nowrap;
+        align-items: center;
+        height: 100%;
+    }
+`;
+
+type Props = {
+    item: CombinedSearchResult;
+    selected: boolean;
+    onClick: (e: React.MouseEvent) => void;
+    children: React.ReactNode;
+    urnToExpandedSection: Record<string, PreviewSection>;
+    setUrnToExpandedSection: (urnToExpandedSection: Record<string, PreviewSection>) => void;
+    compactUserSearchCardStyle?: boolean;
+};
+
+/**
+ * This component is a wrapper around the search results that provides the context for
+ * rendering the matches. It also handles the logic for expanding and collapsing the
+ * search result match drawer.
+ *
+ * You can wrap it around any search result in a search list to enable the match drawer.
+ * The state is managed in the parent component in order to enable expand all and collapse all in the future.
+ */
+export const MatchContextContainer = ({
+    item,
+    selected,
+    onClick,
+    children,
+    urnToExpandedSection,
+    setUrnToExpandedSection,
+    compactUserSearchCardStyle,
+}: Props) => {
+    const { isFullViewCard } = useSearchContext();
+    const expandedSection = isFullViewCard ? urnToExpandedSection[item.entity.urn] : undefined;
+
+    return (
+        <MatchContext.Provider
+            value={{
+                expandedSection,
+                setExpandedSection: (section?: PreviewSection) => {
+                    if (section) {
+                        setUrnToExpandedSection({
+                            ...urnToExpandedSection,
+                            [item.entity.urn]: section,
+                        });
+                    } else {
+                        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                        const { [item.entity.urn]: removedElement, ...newUrnToExpandedSection } = urnToExpandedSection;
+                        setUrnToExpandedSection(newUrnToExpandedSection);
+                    }
+                },
+            }}
+        >
+            {isFullViewCard && (
+                <MatchesContainer
+                    expanded={!!expandedSection}
+                    selected={selected}
+                    onClick={onClick}
+                    compactUserSearchCardStyle={compactUserSearchCardStyle || false}
+                >
+                    <MatchesBottomGroup>
+                        <MatchContext.Provider
+                            value={{
+                                expandedSection: undefined,
+                                setExpandedSection: () => {},
+                            }}
+                        >
+                            <HorizontalScroller alwaysVisible scrollDistance={300}>
+                                <SearchCardSlideoutContent item={item} expandedSection={expandedSection} />
+                            </HorizontalScroller>
+                        </MatchContext.Provider>
+                    </MatchesBottomGroup>
+                </MatchesContainer>
+            )}
+            {/* {children} */}
+            <div style={{ position: 'relative', zIndex: 6 }}>{children}</div>
+        </MatchContext.Provider>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/matches/MatchedFieldList.tsx b/datahub-web-react/src/app/searchV2/matches/MatchedFieldList.tsx
new file mode 100644
index 00000000000000..c87aa1e649edbd
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/matches/MatchedFieldList.tsx
@@ -0,0 +1,137 @@
+import React from 'react';
+
+import { Typography } from 'antd';
+import { Tooltip } from '@components';
+import styled from 'styled-components';
+import * as QueryString from 'query-string';
+import { useHistory } from 'react-router';
+
+import { useEntityType, useMatchedFieldsForList, useSearchResult } from '../../search/context/SearchResultContext';
+import { MatchedField } from '../../../types.generated';
+import { useSearchContext } from '../../search/context/SearchContext';
+import { useEntityRegistry } from '../../useEntityRegistry';
+
+import { getColumnsTabUrlPath, getMatchedFieldLabel } from './utils';
+import { pluralize } from '../../shared/textUtil';
+import { SchemaFilterType } from '../../entityV2/shared/tabs/Dataset/Schema/utils/filterSchemaRows';
+import { GroupedMatch } from './GroupedMatch';
+
+const MatchesContainer = styled.div`
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+`;
+
+const MatchContainer = styled.div`
+    display: flex;
+    padding: 0px 2px;
+    align-items: center;
+    border-radius: 30px;
+    background: #ebe9f4;
+    margin-right: 4px;
+    white-space: nowrap;
+`;
+
+const MatchHeader = styled(Typography.Text)`
+    display: flex;
+    padding: 4px 2px 4px 10px;
+    align-items: center;
+    gap: 4px;
+    color: #6c6b88;
+    font-family: Mulish;
+    font-size: 12px;
+    font-style: normal;
+    line-height: normal;
+`;
+
+const MatchText = styled(Typography.Text)`
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 50px;
+    background: #ebe9f4;
+    color: #374066;
+    font-family: Mulish;
+    font-size: 12px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: normal;
+`;
+
+const MATCH_GROUP_LIMIT = 3;
+
+const CLICKABLE_FIELDS = {
+    fieldPaths: SchemaFilterType.FieldPath,
+    fieldDescriptions: SchemaFilterType.Documentation,
+    fieldTags: SchemaFilterType.Tags,
+    fieldGlossaryTerms: SchemaFilterType.Terms,
+};
+
+type CustomFieldRenderer = (field: MatchedField) => JSX.Element | null;
+
+type Props = {
+    customFieldRenderer?: CustomFieldRenderer;
+    matchSuffix?: string;
+};
+
+export const MatchedFieldList = ({ customFieldRenderer, matchSuffix }: Props) => {
+    const history = useHistory();
+    const entityRegistry = useEntityRegistry();
+    const searchContext = useSearchContext();
+    const result = useSearchResult();
+    const groupedMatches = useMatchedFieldsForList('fieldLabels');
+    const entityType = useEntityType();
+
+    if (!groupedMatches) return null;
+
+    return (
+        <MatchesContainer>
+            {groupedMatches.map((groupedMatch) => {
+                const label = getMatchedFieldLabel(entityType, groupedMatch.fieldName);
+                const isClickable = Object.keys(CLICKABLE_FIELDS).includes(groupedMatch.fieldName);
+                const onClick = (query?: string) => {
+                    if (result?.entity?.type && result?.entity?.urn && isClickable) {
+                        let matchedText = query;
+                        if (!query || query.startsWith('urn:li:')) {
+                            matchedText = searchContext.query || '';
+                        }
+                        const columnsTabPath = getColumnsTabUrlPath(result.entity.type);
+                        history.push(
+                            `${entityRegistry.getEntityUrl(
+                                result.entity.type,
+                                result.entity.urn,
+                            )}/${columnsTabPath}?${QueryString.stringify({
+                                matchedText,
+                            })}`,
+                        );
+                    }
+                };
+                return (
+                    <Tooltip
+                        title={
+                            matchSuffix
+                                ? `Matches ${pluralize(groupedMatch.matchedFields.length, label)} ${matchSuffix}`
+                                : undefined
+                        }
+                    >
+                        <MatchContainer>
+                            <MatchHeader>
+                                <b>Matches:</b>
+                                {pluralize(groupedMatch.matchedFields.length, label)}
+                            </MatchHeader>
+                            <MatchText key={groupedMatch.fieldName}>
+                                <GroupedMatch
+                                    groupedMatch={groupedMatch}
+                                    limit={MATCH_GROUP_LIMIT}
+                                    customFieldRenderer={customFieldRenderer}
+                                    onClick={onClick}
+                                    isClickable={isClickable}
+                                />
+                            </MatchText>
+                        </MatchContainer>
+                    </Tooltip>
+                );
+            })}
+        </MatchesContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/matches/SearchTextHighlighter.tsx b/datahub-web-react/src/app/searchV2/matches/SearchTextHighlighter.tsx
new file mode 100644
index 00000000000000..5fdf4f6e543614
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/matches/SearchTextHighlighter.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import Highlight from 'react-highlighter';
+import styled from 'styled-components';
+import { MatchedFieldName } from './constants';
+import { useAppConfig } from '../../useAppConfig';
+import { useMatchedFieldsByGroup } from '../../search/context/SearchResultContext';
+import { useSearchQuery } from '../../search/context/SearchContext';
+
+type Props = {
+    field: MatchedFieldName;
+    text: string;
+    enableFullHighlight?: boolean;
+};
+
+const HIGHLIGHT_ALL_PATTERN = /.*/;
+
+const StyledHighlight = styled(Highlight).attrs((props) => ({
+    matchStyle: { background: props.theme.styles['highlight-color'] },
+}))``;
+
+const SearchTextHighlighter = ({ field, text, enableFullHighlight = false }: Props) => {
+    const appConfig = useAppConfig();
+    const enableNameHighlight = appConfig.config.visualConfig.searchResult?.enableNameHighlight;
+    const matchedFields = useMatchedFieldsByGroup(field);
+    const hasMatchedField = !!matchedFields?.length;
+    const normalizedSearchQuery = useSearchQuery()?.trim()?.toLowerCase();
+    const normalizedText = text.trim().toLowerCase();
+    const hasSubstring = hasMatchedField && !!normalizedSearchQuery && normalizedText.includes(normalizedSearchQuery);
+    const pattern = enableFullHighlight ? HIGHLIGHT_ALL_PATTERN : undefined;
+
+    return (
+        <>
+            {enableNameHighlight && hasMatchedField ? (
+                <StyledHighlight search={hasSubstring ? normalizedSearchQuery : pattern}>{text}</StyledHighlight>
+            ) : (
+                text
+            )}
+        </>
+    );
+};
+
+export default SearchTextHighlighter;
diff --git a/datahub-web-react/src/app/searchV2/matches/constants.ts b/datahub-web-react/src/app/searchV2/matches/constants.ts
new file mode 100644
index 00000000000000..25ca82eef95978
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/matches/constants.ts
@@ -0,0 +1,129 @@
+import { EntityType, MatchedField } from '../../../types.generated';
+
+export type MatchedFieldName =
+    | 'urn'
+    | 'name'
+    | 'displayName'
+    | 'title'
+    | 'description'
+    | 'editedDescription'
+    | 'editedFieldDescriptions'
+    | 'fieldDescriptions'
+    | 'tags'
+    | 'fieldTags'
+    | 'editedFieldTags'
+    | 'glossaryTerms'
+    | 'fieldGlossaryTerms'
+    | 'editedFieldGlossaryTerms'
+    | 'fieldLabels'
+    | 'fieldPaths';
+
+export type MatchedFieldConfig = {
+    name: MatchedFieldName;
+    groupInto?: MatchedFieldName;
+    label: string;
+    showInMatchedFieldList?: boolean;
+};
+
+const DEFAULT_MATCHED_FIELD_CONFIG: Array<MatchedFieldConfig> = [
+    {
+        name: 'urn',
+        label: 'urn',
+    },
+    {
+        name: 'title',
+        label: 'title',
+    },
+    {
+        name: 'displayName',
+        groupInto: 'name',
+        label: 'display name',
+    },
+    {
+        name: 'name',
+        groupInto: 'name',
+        label: 'name',
+    },
+    {
+        name: 'editedDescription',
+        groupInto: 'description',
+        label: 'description',
+    },
+    {
+        name: 'description',
+        groupInto: 'description',
+        label: 'description',
+    },
+    {
+        name: 'editedFieldDescriptions',
+        groupInto: 'fieldDescriptions',
+        label: 'column description',
+        showInMatchedFieldList: true,
+    },
+    {
+        name: 'fieldDescriptions',
+        groupInto: 'fieldDescriptions',
+        label: 'column description',
+        showInMatchedFieldList: true,
+    },
+    {
+        name: 'tags',
+        label: 'tag',
+    },
+    {
+        name: 'editedFieldTags',
+        groupInto: 'fieldTags',
+        label: 'column tag',
+        showInMatchedFieldList: true,
+    },
+    {
+        name: 'fieldTags',
+        groupInto: 'fieldTags',
+        label: 'column tag',
+        showInMatchedFieldList: true,
+    },
+    {
+        name: 'glossaryTerms',
+        label: 'term',
+    },
+    {
+        name: 'editedFieldGlossaryTerms',
+        groupInto: 'fieldGlossaryTerms',
+        label: 'column term',
+        showInMatchedFieldList: true,
+    },
+    {
+        name: 'fieldGlossaryTerms',
+        groupInto: 'fieldGlossaryTerms',
+        label: 'column term',
+        showInMatchedFieldList: true,
+    },
+    {
+        name: 'fieldLabels',
+        label: 'label',
+        showInMatchedFieldList: true,
+    },
+    {
+        name: 'fieldPaths',
+        label: 'column',
+        showInMatchedFieldList: true,
+    },
+];
+
+export const CHART_DASHBOARD_FIELD_CONFIG: Array<MatchedFieldConfig> = DEFAULT_MATCHED_FIELD_CONFIG.map((config) => {
+    if (config.name === 'title') return { ...config, groupInto: 'name' };
+    return config;
+});
+
+export const MATCHED_FIELD_CONFIG = {
+    [EntityType.Chart]: CHART_DASHBOARD_FIELD_CONFIG,
+    [EntityType.Dashboard]: CHART_DASHBOARD_FIELD_CONFIG,
+    DEFAULT: DEFAULT_MATCHED_FIELD_CONFIG,
+} as const;
+
+export type MatchesGroupedByFieldName = {
+    fieldName: string;
+    matchedFields: Array<MatchedField>;
+};
+
+export const HIGHLIGHTABLE_ENTITY_TYPES = [EntityType.Tag, EntityType.GlossaryTerm];
diff --git a/datahub-web-react/src/app/searchV2/matches/matchedFieldPathsRenderer.tsx b/datahub-web-react/src/app/searchV2/matches/matchedFieldPathsRenderer.tsx
new file mode 100644
index 00000000000000..e14b9d6107e03a
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/matches/matchedFieldPathsRenderer.tsx
@@ -0,0 +1,8 @@
+import React from 'react';
+
+import { MatchedField } from '../../../types.generated';
+import { downgradeV2FieldPath } from '../../entityV2/dataset/profile/schema/utils/utils';
+
+export const matchedFieldPathsRenderer = (matchedField: MatchedField) => {
+    return matchedField?.name === 'fieldPaths' ? <>{downgradeV2FieldPath(matchedField.value)}</> : null;
+};
diff --git a/datahub-web-react/src/app/searchV2/matches/matchedInputFieldRenderer.tsx b/datahub-web-react/src/app/searchV2/matches/matchedInputFieldRenderer.tsx
new file mode 100644
index 00000000000000..25634c9e8b80e7
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/matches/matchedInputFieldRenderer.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+
+import { Chart, Dashboard, EntityType, GlossaryTerm, MatchedField } from '../../../types.generated';
+import { useEntityRegistry } from '../../useEntityRegistry';
+
+const LABEL_INDEX_NAME = 'fieldLabels';
+const TYPE_PROPERTY_KEY_NAME = 'type';
+
+const TermName = ({ term }: { term: GlossaryTerm }) => {
+    const entityRegistry = useEntityRegistry();
+    return <>{entityRegistry.getDisplayName(EntityType.GlossaryTerm, term)}</>;
+};
+
+export const matchedInputFieldRenderer = (matchedField: MatchedField, entity: Chart | Dashboard) => {
+    if (matchedField?.name === LABEL_INDEX_NAME) {
+        const matchedSchemaField = entity.inputFields?.fields?.find(
+            (field) => field?.schemaField?.label === matchedField.value,
+        );
+        const matchedGlossaryTerm = matchedSchemaField?.schemaField?.glossaryTerms?.terms?.find(
+            (term) => term?.term?.name === matchedField.value,
+        );
+
+        if (matchedGlossaryTerm) {
+            let termType = 'term';
+            const typeProperty = matchedGlossaryTerm.term.properties?.customProperties?.find(
+                (property) => property.key === TYPE_PROPERTY_KEY_NAME,
+            );
+            if (typeProperty) {
+                termType = typeProperty.value || termType;
+            }
+
+            return (
+                <>
+                    {termType} <TermName term={matchedGlossaryTerm.term} />
+                </>
+            );
+        }
+    }
+    return null;
+};
diff --git a/datahub-web-react/src/app/searchV2/matches/utils.test.ts b/datahub-web-react/src/app/searchV2/matches/utils.test.ts
new file mode 100644
index 00000000000000..bc1843b44ff1a0
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/matches/utils.test.ts
@@ -0,0 +1,234 @@
+import { EntityType } from '../../../types.generated';
+import {
+    getDescriptionSlice,
+    getGroupedFieldName,
+    getMatchedFieldLabel,
+    getMatchedFieldNames,
+    getMatchedFieldsByNames,
+    getMatchedFieldsByUrn,
+    getMatchesPrioritized,
+    isDescriptionField,
+    isHighlightableEntityField,
+    shouldShowInMatchedFieldList,
+} from './utils';
+
+const mapping = new Map();
+mapping.set('fieldPaths', 'column');
+mapping.set('fieldDescriptions', 'column description');
+mapping.set('fieldTags', 'column tag');
+
+const MOCK_MATCHED_FIELDS = [
+    {
+        name: 'fieldPaths',
+        value: 'rain',
+    },
+    {
+        name: 'fieldDescriptions',
+        value: 'rainbow',
+    },
+    {
+        name: 'fieldPaths',
+        value: 'rainbow',
+    },
+    {
+        name: 'fieldPaths',
+        value: 'rainbows',
+    },
+];
+
+const MOCK_MATCHED_DESCRIPTION_FIELDS = [
+    {
+        name: 'editedDescription',
+        value: 'edited description value',
+    },
+    {
+        name: 'description',
+        value: 'description value',
+    },
+    {
+        name: 'fieldDescriptions',
+        value: 'field descriptions value',
+    },
+    {
+        name: 'editedFieldDescriptions',
+        value: 'edited field descriptions value',
+    },
+];
+
+describe('utils', () => {
+    describe('getMatchPrioritizingPrimary', () => {
+        it('prioritizes exact match', () => {
+            global.window.location.search = 'query=rainbow';
+            const groupedMatches = getMatchesPrioritized(EntityType.Dataset, MOCK_MATCHED_FIELDS, 'fieldPaths');
+            expect(groupedMatches).toEqual([
+                {
+                    fieldName: 'fieldPaths',
+                    matchedFields: [
+                        { name: 'fieldPaths', value: 'rainbow' },
+                        { name: 'fieldPaths', value: 'rainbows' },
+                        { name: 'fieldPaths', value: 'rain' },
+                    ],
+                },
+                {
+                    fieldName: 'fieldDescriptions',
+                    matchedFields: [{ name: 'fieldDescriptions', value: 'rainbow' }],
+                },
+            ]);
+        });
+        it('will accept first contains match', () => {
+            global.window.location.search = 'query=bow';
+            const groupedMatches = getMatchesPrioritized(EntityType.Dataset, MOCK_MATCHED_FIELDS, 'fieldPaths');
+            expect(groupedMatches).toEqual([
+                {
+                    fieldName: 'fieldPaths',
+                    matchedFields: [
+                        { name: 'fieldPaths', value: 'rainbow' },
+                        { name: 'fieldPaths', value: 'rainbows' },
+                        { name: 'fieldPaths', value: 'rain' },
+                    ],
+                },
+                {
+                    fieldName: 'fieldDescriptions',
+                    matchedFields: [{ name: 'fieldDescriptions', value: 'rainbow' }],
+                },
+            ]);
+        });
+        it('will group by field name', () => {
+            global.window.location.search = '';
+            const groupedMatches = getMatchesPrioritized(
+                EntityType.Dataset,
+                MOCK_MATCHED_DESCRIPTION_FIELDS,
+                'fieldPaths',
+            );
+            expect(groupedMatches).toEqual([
+                {
+                    fieldName: 'description',
+                    matchedFields: [
+                        { name: 'editedDescription', value: 'edited description value' },
+                        { name: 'description', value: 'description value' },
+                    ],
+                },
+                {
+                    fieldName: 'fieldDescriptions',
+                    matchedFields: [
+                        { name: 'fieldDescriptions', value: 'field descriptions value' },
+                        { name: 'editedFieldDescriptions', value: 'edited field descriptions value' },
+                    ],
+                },
+            ]);
+        });
+    });
+
+    describe('shouldShowInMatchedFieldList', () => {
+        it('should return true if field should show in matched field list', () => {
+            const field = { name: 'fieldPaths', value: 'rainbow' };
+            const show = shouldShowInMatchedFieldList(EntityType.Dashboard, field);
+            expect(show).toBe(true);
+        });
+
+        it('should return false if field should not show in matched field list', () => {
+            const field = { name: 'description', value: 'edited description value' };
+            const show = shouldShowInMatchedFieldList(EntityType.Dashboard, field);
+            expect(show).toBe(false);
+        });
+    });
+
+    describe('getMatchedFieldLabel', () => {
+        it('should return label for matched field', () => {
+            const label = getMatchedFieldLabel(EntityType.Chart, 'fieldPaths');
+            expect(label).toBe('column');
+        });
+
+        it('should return empty string if field name is not found', () => {
+            const label = getMatchedFieldLabel(EntityType.Chart, 'unknownField');
+            expect(label).toBe('');
+        });
+    });
+
+    describe('getGroupedFieldName', () => {
+        it('should return grouped field name for EntityType and fieldName', () => {
+            const groupedFieldName = getGroupedFieldName(EntityType.Dashboard, 'name');
+            console.log(groupedFieldName);
+            expect(groupedFieldName).toBe('name');
+        });
+
+        it('should return undefined if field name is not found', () => {
+            const groupedFieldName = getGroupedFieldName(EntityType.Dashboard, 'fieldPaths');
+            expect(groupedFieldName).toBeUndefined();
+        });
+    });
+
+    describe('getMatchedFieldNames', () => {
+        it('should return matched field names for grouped field name', () => {
+            const matchedFieldNames = getMatchedFieldNames(EntityType.Chart, 'fieldPaths');
+            expect(matchedFieldNames).toContain('fieldPaths');
+        });
+    });
+
+    describe('getMatchedFieldsByNames', () => {
+        it('should return matched fields by names', () => {
+            const fields = [
+                { name: 'fieldPaths', value: 'rainbow' },
+                { name: 'fieldDescriptions', value: 'rainbow' },
+            ];
+            const matchedFields = getMatchedFieldsByNames(fields, ['fieldPaths']);
+            expect(matchedFields.length).toBe(1);
+        });
+    });
+
+    describe('getMatchedFieldsByUrn', () => {
+        it('should return matched fields by URN', () => {
+            const fields = [
+                { name: 'fieldPaths', value: 'urn:example:1' },
+                { name: 'fieldPaths2', value: 'urn:example:2' },
+            ];
+            const matchedFields = getMatchedFieldsByUrn(fields, 'urn:example:1');
+            expect(matchedFields.length).toBe(1);
+        });
+    });
+
+    describe('isHighlightableEntityField', () => {
+        it('should return true if field is highlightable', () => {
+            const field = {
+                name: 'fieldName',
+                value: 'fieldValue',
+                entity: { type: EntityType.GlossaryTerm, urn: 'GlossaryTermUrn' },
+            };
+            const isHighlightable = isHighlightableEntityField(field);
+            expect(isHighlightable).toBe(true);
+        });
+
+        it('should return false if field is not highlightable', () => {
+            const field = {
+                name: 'fieldName',
+                value: 'fieldValue',
+                entity: { type: EntityType.Chart, urn: 'folderUrn' },
+            };
+            const isHighlightable = isHighlightableEntityField(field);
+            expect(isHighlightable).toBe(false);
+        });
+    });
+
+    describe('isDescriptionField', () => {
+        it('should return true if field name contains "description"', () => {
+            const field = { name: 'fieldDescriptions', value: 'description value' };
+            const isDescField = isDescriptionField(field);
+            expect(isDescField).toBe(true);
+        });
+
+        it('should return false if field name does not contain "description"', () => {
+            const field = { name: 'fieldPaths', value: 'path value' };
+            const isDescField = isDescriptionField(field);
+            expect(isDescField).toBe(false);
+        });
+    });
+
+    describe('getDescriptionSlice', () => {
+        it('should return slice of text surrounding the target', () => {
+            const text = 'This is a sample description text value';
+            const target = 'description';
+            const slice = getDescriptionSlice(text, target);
+            expect(slice).toBe('... a sample description text valu...');
+        });
+    });
+});
diff --git a/datahub-web-react/src/app/searchV2/matches/utils.ts b/datahub-web-react/src/app/searchV2/matches/utils.ts
new file mode 100644
index 00000000000000..e7796bddff656a
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/matches/utils.ts
@@ -0,0 +1,143 @@
+import * as QueryString from 'query-string';
+import { EntityType, MatchedField } from '../../../types.generated';
+import {
+    HIGHLIGHTABLE_ENTITY_TYPES,
+    MATCHED_FIELD_CONFIG,
+    MatchedFieldConfig,
+    MatchedFieldName,
+    MatchesGroupedByFieldName,
+} from './constants';
+
+const getFieldConfigsByEntityType = (entityType: EntityType | undefined): Array<MatchedFieldConfig> => {
+    return entityType && entityType in MATCHED_FIELD_CONFIG
+        ? MATCHED_FIELD_CONFIG[entityType]
+        : MATCHED_FIELD_CONFIG.DEFAULT;
+};
+
+export const shouldShowInMatchedFieldList = (entityType: EntityType | undefined, field: MatchedField): boolean => {
+    const configs = getFieldConfigsByEntityType(entityType);
+    return configs.some((config) => config.name === field.name && config.showInMatchedFieldList);
+};
+
+export const getMatchedFieldLabel = (entityType: EntityType | undefined, fieldName: string): string => {
+    const configs = getFieldConfigsByEntityType(entityType);
+    return configs.find((config) => config.name === fieldName)?.label ?? '';
+};
+
+export const getGroupedFieldName = (
+    entityType: EntityType | undefined,
+    fieldName: string,
+): MatchedFieldName | undefined => {
+    const configs = getFieldConfigsByEntityType(entityType);
+    const fieldConfig = configs.find((config) => config.name === fieldName);
+    return fieldConfig?.groupInto;
+};
+
+export const getMatchedFieldNames = (
+    entityType: EntityType | undefined,
+    fieldName: MatchedFieldName,
+): Array<MatchedFieldName> => {
+    return getFieldConfigsByEntityType(entityType)
+        .filter((config) => fieldName === config.groupInto || fieldName === config.name)
+        .map((field) => field.name);
+};
+
+export const getMatchedFieldsByNames = (fields: Array<MatchedField>, names: Array<string>): Array<MatchedField> => {
+    return fields.filter((field) => names.includes(field.name));
+};
+
+export const getMatchedFieldsByUrn = (fields: Array<MatchedField>, urn: string): Array<MatchedField> => {
+    return fields.filter((field) => field.value === urn);
+};
+
+function normalize(value: string) {
+    return value.trim().toLowerCase();
+}
+
+function fromQueryGetBestMatch(
+    selectedMatchedFields: MatchedField[],
+    rawQuery: string,
+    prioritizedField: string,
+): Array<MatchedField> {
+    const query = normalize(rawQuery);
+    const priorityMatches: Array<MatchedField> = selectedMatchedFields.filter(
+        (field) => field.name === prioritizedField,
+    );
+    const nonPriorityMatches: Array<MatchedField> = selectedMatchedFields.filter(
+        (field) => field.name !== prioritizedField,
+    );
+    const exactMatches: Array<MatchedField> = [];
+    const containedMatches: Array<MatchedField> = [];
+    const rest: Array<MatchedField> = [];
+
+    [...priorityMatches, ...nonPriorityMatches].forEach((field) => {
+        const normalizedValue = normalize(field.value);
+        if (normalizedValue === query) exactMatches.push(field);
+        else if (normalizedValue.includes(query)) containedMatches.push(field);
+        else rest.push(field);
+    });
+
+    return [...exactMatches, ...containedMatches, ...rest];
+}
+
+const getMatchesGroupedByFieldName = (
+    entityType: EntityType,
+    matchedFields: Array<MatchedField>,
+): Array<MatchesGroupedByFieldName> => {
+    const fieldNameToMatches = new Map<string, Array<MatchedField>>();
+    const fieldNames: Array<string> = [];
+    matchedFields.forEach((field) => {
+        const groupedFieldName = getGroupedFieldName(entityType, field.name) || field.name;
+        const matchesInMap = fieldNameToMatches.get(groupedFieldName);
+        if (matchesInMap) {
+            matchesInMap.push(field);
+        } else {
+            fieldNameToMatches.set(groupedFieldName, [field]);
+            fieldNames.push(groupedFieldName);
+        }
+    });
+    return fieldNames.map((fieldName) => ({
+        fieldName,
+        matchedFields: fieldNameToMatches.get(fieldName) ?? [],
+    }));
+};
+
+export const getMatchesPrioritized = (
+    entityType: EntityType,
+    matchedFields: MatchedField[],
+    prioritizedField: string,
+): Array<MatchesGroupedByFieldName> => {
+    const { location } = window;
+    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
+    const query: string = decodeURIComponent(params.query ? (params.query as string) : '');
+    const matches = fromQueryGetBestMatch(matchedFields, query, prioritizedField);
+    return getMatchesGroupedByFieldName(entityType, matches);
+};
+
+export const isHighlightableEntityField = (field: MatchedField) =>
+    !!field.entity && HIGHLIGHTABLE_ENTITY_TYPES.includes(field.entity.type);
+
+export const isDescriptionField = (field: MatchedField) => field.name.toLowerCase().includes('description');
+
+const SURROUNDING_DESCRIPTION_CHARS = 10;
+const MAX_DESCRIPTION_CHARS = 50;
+
+export const getDescriptionSlice = (text: string, target: string) => {
+    const queryIndex = text.indexOf(target);
+    const start = Math.max(0, queryIndex - SURROUNDING_DESCRIPTION_CHARS);
+    const end = Math.min(
+        start + MAX_DESCRIPTION_CHARS,
+        text.length,
+        queryIndex + target.length + SURROUNDING_DESCRIPTION_CHARS,
+    );
+    const startEllipsis = start > 0 ? '...' : '';
+    const endEllipsis = end < text.length ? '...' : '';
+    return `${startEllipsis}${text.slice(start, end)}${endEllipsis}`;
+};
+
+export const getColumnsTabUrlPath = (entityType: EntityType) => {
+    if (entityType === EntityType.Chart) {
+        return 'Fields';
+    }
+    return 'Columns';
+};
diff --git a/datahub-web-react/src/app/searchV2/recommendation/FilterPill.tsx b/datahub-web-react/src/app/searchV2/recommendation/FilterPill.tsx
new file mode 100644
index 00000000000000..f4e564e388df62
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/recommendation/FilterPill.tsx
@@ -0,0 +1,61 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Tooltip } from '@components';
+import { RecommendedFilter } from './types';
+import { getFilterColor } from './utils';
+
+const Pill = styled.div<{ color: string }>`
+    border-radius: 20px;
+    padding: 6px 10px;
+    background-color: white;
+    margin-right: 0px;
+    border: 2px solid white;
+    :hover {
+        opacity: 1;
+        cursor: pointer;
+        border-color: ${(props) => props.color};
+    }
+    font-size: 14px;
+    display: flex;
+    align-items: center;
+    box-shadow: ${(props) => props.theme.styles['box-shadow']};
+`;
+
+const Icon = styled.div`
+    margin-right: 4px;
+    &&&& {
+        color: #ffffff;
+    }
+    display: flex;
+`;
+
+const Text = styled.div`
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+`;
+
+type Props = {
+    filter: RecommendedFilter;
+    onToggle: () => void;
+};
+
+export const FilterPill = ({ filter, onToggle }: Props) => {
+    const color = getFilterColor(filter.field, filter.value);
+    return (
+        <Tooltip
+            showArrow={false}
+            placement="top"
+            title={
+                <>
+                    View results in <b>{filter.label}</b>
+                </>
+            }
+        >
+            <Pill onClick={onToggle} color={color}>
+                {filter.icon && <Icon>{filter.icon}</Icon>}
+                <Text>{filter.label}</Text>
+            </Pill>
+        </Tooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/recommendation/RecommendedFilters.tsx b/datahub-web-react/src/app/searchV2/recommendation/RecommendedFilters.tsx
new file mode 100644
index 00000000000000..0e9ab9b3631861
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/recommendation/RecommendedFilters.tsx
@@ -0,0 +1,64 @@
+import React from 'react';
+import styled from 'styled-components';
+import { FacetFilterInput, FacetMetadata, FilterOperator } from '../../../types.generated';
+import { FilterPill } from './FilterPill';
+import { useGetRecommendedFilters } from './useGetRecommendedFilters';
+import { RecommendedFilter } from './types';
+
+const FilterPills = styled.div`
+    display: flex;
+    flex-direction: row;
+    margin-bottom: 8px;
+    margin-left: 20px;
+    padding-right: 20px;
+    gap: 8px;
+    flex-shrink: 0;
+    overflow-x: auto;
+    /* Hide scrollbar for Chrome, Safari, and Opera */
+
+    &::-webkit-scrollbar {
+        display: none;
+    }
+
+    mask-image: linear-gradient(to right, rgba(0, 0, 0, 1) 95%, rgba(255, 0, 0, 0.5) 100%, rgba(255, 0, 0, 0) 100%);
+`;
+
+type Props = {
+    availableFilters: FacetMetadata[];
+    selectedFilters: FacetFilterInput[];
+    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
+};
+
+export const RecommendedFilters = ({ availableFilters, selectedFilters, onChangeFilters }: Props) => {
+    const recommendedFilters = useGetRecommendedFilters(availableFilters, selectedFilters);
+
+    if (!recommendedFilters.length) return null;
+
+    const toggleFilter = (filter: RecommendedFilter) => {
+        if (selectedFilters.find((f) => f.field === filter.field)) {
+            // Remove the filter
+            const newFilters = selectedFilters.filter((f) => f.field !== filter.field);
+            onChangeFilters(newFilters);
+        } else {
+            // Add the filter
+            const newFilters = [
+                ...selectedFilters,
+                {
+                    field: filter.field,
+                    values: [filter.value],
+                    condition: FilterOperator.Equal,
+                    negated: false,
+                },
+            ];
+            onChangeFilters(newFilters);
+        }
+    };
+
+    return (
+        <FilterPills>
+            {recommendedFilters.map((filter) => (
+                <FilterPill filter={filter} onToggle={() => toggleFilter(filter)} />
+            ))}
+        </FilterPills>
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/recommendation/types.ts b/datahub-web-react/src/app/searchV2/recommendation/types.ts
new file mode 100644
index 00000000000000..c32e1f9ead75e4
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/recommendation/types.ts
@@ -0,0 +1,6 @@
+export type RecommendedFilter = {
+    field: string;
+    value: string;
+    label: React.ReactNode;
+    icon: any;
+};
diff --git a/datahub-web-react/src/app/searchV2/recommendation/useGetRecommendedFilters.tsx b/datahub-web-react/src/app/searchV2/recommendation/useGetRecommendedFilters.tsx
new file mode 100644
index 00000000000000..45427eb0f02e7b
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/recommendation/useGetRecommendedFilters.tsx
@@ -0,0 +1,98 @@
+import { AggregationMetadata, FacetFilterInput, FacetMetadata } from '../../../types.generated';
+import { EntityRegistry } from '../../../entityRegistryContext';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { getFilterIconAndLabel } from '../filters/utils';
+import {
+    DOMAINS_FILTER_NAME,
+    ENTITY_FILTER_NAME,
+    ENTITY_SUB_TYPE_FILTER_FIELDS,
+    PLATFORM_FILTER_NAME,
+} from '../../search/utils/constants';
+import { RecommendedFilter } from './types';
+import { ENTITY_SUB_TYPE_FILTER_NAME, FILTER_DELIMITER } from '../utils/constants';
+
+// Maximum number of recommended filters to show.
+const MAX_FILTERS = 6;
+
+const toRecommendedFilter = (
+    field: string,
+    aggregation: AggregationMetadata,
+    entityRegistry: EntityRegistry,
+): RecommendedFilter => {
+    const { icon, label } = getFilterIconAndLabel(
+        field,
+        aggregation.value,
+        entityRegistry,
+        aggregation.entity ?? null,
+        14,
+    );
+    return {
+        field,
+        value: aggregation.value,
+        label,
+        icon,
+    };
+};
+
+/**
+ * Strategy for recommending search filters:
+ * If there is no platform filter selected, recommend the top 3 platforms.
+ * If there is a platform filter selected, recommend the top 3 sub types. (If not, fall back to entity types).
+ * If there is a sub type filter selected, recommend the top 3 domains.
+ */
+export const useGetRecommendedFilters = (
+    availableFilters: FacetMetadata[],
+    selectedFilters: FacetFilterInput[],
+): RecommendedFilter[] => {
+    const entityRegistry = useEntityRegistry();
+    const isPlatformFilterApplied = selectedFilters.find((filter) => filter.field === PLATFORM_FILTER_NAME);
+    const isTypeFilterApplied = selectedFilters.find((filter) => ENTITY_SUB_TYPE_FILTER_FIELDS.includes(filter.field));
+    const isDomainFilterApplied = selectedFilters.find((filter) => filter.field === DOMAINS_FILTER_NAME);
+
+    const platformAggregations: AggregationMetadata[] =
+        availableFilters.find((filter) => filter.field === PLATFORM_FILTER_NAME)?.aggregations || [];
+    const subTypeAggregations: AggregationMetadata[] =
+        availableFilters
+            .find((filter) => filter.field === ENTITY_SUB_TYPE_FILTER_NAME)
+            ?.aggregations?.filter((agg) => agg.value.split(FILTER_DELIMITER).length > 1) || [];
+    const entityTypeAggregations: AggregationMetadata[] =
+        availableFilters.find((filter) => filter.field === ENTITY_FILTER_NAME)?.aggregations || [];
+    const domainAggregations: AggregationMetadata[] =
+        availableFilters.find((filter) => filter.field === DOMAINS_FILTER_NAME)?.aggregations || [];
+
+    const recommendedFilters: RecommendedFilter[] = [];
+
+    if (!isPlatformFilterApplied && platformAggregations?.length > 1) {
+        recommendedFilters.push(
+            ...platformAggregations
+                .filter((agg) => agg.count > 0)
+                .slice(0, MAX_FILTERS)
+                .map((agg) => toRecommendedFilter(PLATFORM_FILTER_NAME, agg, entityRegistry)),
+        );
+    } else if (!isTypeFilterApplied) {
+        if (subTypeAggregations?.length > 1) {
+            recommendedFilters.push(
+                ...subTypeAggregations
+                    .filter((agg) => agg.count > 0)
+                    .slice(0, MAX_FILTERS)
+                    .map((agg) => toRecommendedFilter(ENTITY_SUB_TYPE_FILTER_NAME, agg, entityRegistry)),
+            );
+        } else if (entityTypeAggregations?.length > 1) {
+            recommendedFilters.push(
+                ...entityTypeAggregations
+                    .filter((agg) => agg.count > 0)
+                    .slice(0, MAX_FILTERS - recommendedFilters.length)
+                    .map((agg) => toRecommendedFilter(ENTITY_FILTER_NAME, agg, entityRegistry)),
+            );
+        }
+    } else if (!isDomainFilterApplied && domainAggregations.length > 1) {
+        recommendedFilters.push(
+            ...domainAggregations
+                .filter((agg) => agg.count > 0)
+                .slice(0, MAX_FILTERS)
+                .map((agg) => toRecommendedFilter(DOMAINS_FILTER_NAME, agg, entityRegistry)),
+        );
+    }
+
+    return recommendedFilters;
+};
diff --git a/datahub-web-react/src/app/searchV2/recommendation/utils.ts b/datahub-web-react/src/app/searchV2/recommendation/utils.ts
new file mode 100644
index 00000000000000..4731c017c3ddfc
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/recommendation/utils.ts
@@ -0,0 +1,16 @@
+const colors = ['#3a9c7b', '#487a56', '#3a829c', '#3a4c9c', '#783a9c', '#d15858'];
+
+export const getFilterColor = (field: string, value: string) => {
+    const typeStr = field + value;
+
+    let hash = 0;
+    for (let i = 0; i < typeStr.length; i++) {
+        /* eslint-disable no-bitwise */
+        hash = (hash << 5) - hash + typeStr.charCodeAt(i);
+        /* eslint-disable no-bitwise */
+        hash |= 0; // Convert to 32bit integer
+    }
+
+    const colorIndex = Math.abs(hash) % colors.length;
+    return colors[colorIndex];
+};
diff --git a/datahub-web-react/src/app/searchV2/searchSlideout/SearchCardSlideoutContent.tsx b/datahub-web-react/src/app/searchV2/searchSlideout/SearchCardSlideoutContent.tsx
new file mode 100644
index 00000000000000..e1912cded77611
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/searchSlideout/SearchCardSlideoutContent.tsx
@@ -0,0 +1,94 @@
+import React, { useEffect, useState } from 'react';
+
+import styled from 'styled-components';
+import { ExpandedOwner } from '../../entity/shared/components/styled/ExpandedOwner/ExpandedOwner';
+import { PreviewSection } from '../../shared/MatchesContext';
+import TagTermGroup from '../../sharedV2/tags/TagTermGroup';
+import { useEntityRegistryV2 } from '../../useEntityRegistry';
+import { CombinedSearchResult } from '../utils/combineSiblingsInSearchResults';
+import EntityPaths from '../../previewV2/EntityPaths/EntityPaths';
+import { useSearchContext } from '../../search/context/SearchContext';
+
+type Props = {
+    item?: CombinedSearchResult | null;
+    expandedSection?: PreviewSection;
+};
+
+const PaddingContainer = styled.div`
+    padding: 0px 8px;
+`;
+
+const OwnersContainer = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 8px;
+`;
+
+// slide out preview content for search cards
+export const SearchCardSlideoutContent = ({ item, expandedSection }: Props) => {
+    // we cache the expanded section so that we can keep the expanded section open when the user collapses the slideout
+    const [cachedExpandedSection, setCachedExpandedSection] = useState<PreviewSection | undefined>(expandedSection);
+    useEffect(() => {
+        if (!expandedSection) return;
+        setCachedExpandedSection(expandedSection);
+    }, [expandedSection]);
+
+    const entityRegistry = useEntityRegistryV2();
+    const { isFullViewCard } = useSearchContext();
+
+    if (!item || !item.entity || !cachedExpandedSection || !isFullViewCard) return <></>;
+
+    const genericProps = entityRegistry.getGenericEntityProperties(item?.entity?.type, item?.entity);
+
+    let content: JSX.Element;
+    switch (cachedExpandedSection) {
+        case PreviewSection.MATCHES:
+            content = entityRegistry.renderSearchMatches(item.entity.type, item);
+            break;
+        case PreviewSection.TAGS:
+            content = (
+                <TagTermGroup
+                    editableTags={genericProps?.globalTags}
+                    showEmptyMessage
+                    entityUrn={genericProps?.urn || ''}
+                    entityType={genericProps?.type}
+                    readOnly
+                    fontSize={12}
+                />
+            );
+            break;
+        case PreviewSection.GLOSSARY_TERMS:
+            content = (
+                <TagTermGroup
+                    editableGlossaryTerms={genericProps?.glossaryTerms}
+                    showEmptyMessage
+                    entityUrn={genericProps?.urn || ''}
+                    entityType={genericProps?.type}
+                    readOnly
+                    fontSize={12}
+                />
+            );
+            break;
+        case PreviewSection.OWNERS:
+            content = (
+                <OwnersContainer>
+                    {genericProps?.ownership?.owners?.map((owner) => (
+                        <ExpandedOwner
+                            key={owner.owner.urn}
+                            entityUrn={genericProps?.urn || ''}
+                            owner={owner}
+                            readOnly
+                        />
+                    ))}
+                </OwnersContainer>
+            );
+            break;
+        case PreviewSection.COLUMN_PATHS:
+            content = <EntityPaths paths={item.paths || []} resultEntityUrn={item.entity.urn} />;
+            break;
+        default:
+            content = <></>;
+            break;
+    }
+    return <PaddingContainer>{content}</PaddingContainer>;
+};
diff --git a/datahub-web-react/src/app/searchV2/sidebar/BrowseContext.tsx b/datahub-web-react/src/app/searchV2/sidebar/BrowseContext.tsx
new file mode 100644
index 00000000000000..7556a6da373b51
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/BrowseContext.tsx
@@ -0,0 +1,247 @@
+import React, { ReactNode, createContext, useContext, useMemo } from 'react';
+import {
+    AggregationMetadata,
+    BrowseResultGroupV2,
+    EntityType,
+    FacetFilterInput,
+    FilterOperator,
+} from '../../../types.generated';
+import { createBrowseV2SearchFilter } from '../filters/utils';
+import {
+    BROWSE_PATH_V2_FILTER_NAME,
+    ENTITY_SUB_TYPE_FILTER_NAME,
+    ORIGIN_FILTER_NAME,
+    PLATFORM_FILTER_NAME,
+} from '../utils/constants';
+import { useHasFilterValue, useOnChangeFilters, useSelectedFilters } from './SidebarContext';
+import { applyFacetFilterOverrides } from '../utils/applyFilterOverrides';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { BrowseMode } from './types';
+import { getEntitySubtypeFiltersForEntity } from './browseContextUtils';
+import { useIsPlatformBrowseV2 } from '../useSearchAndBrowseVersion';
+
+type BrowseContextValue = {
+    entityAggregation?: AggregationMetadata;
+    environmentAggregation?: AggregationMetadata;
+    platformAggregation?: AggregationMetadata;
+    browseResultGroup?: BrowseResultGroupV2;
+    path: Array<string>;
+    mode: BrowseMode;
+};
+
+const BrowseContext = createContext<BrowseContextValue | null>(null);
+
+type Props = {
+    children: ReactNode;
+    entityAggregation?: AggregationMetadata;
+    environmentAggregation?: AggregationMetadata;
+    platformAggregation?: AggregationMetadata;
+    browseResultGroup?: BrowseResultGroupV2;
+    parentPath?: Array<string>;
+};
+
+export const BrowseProvider = ({
+    children,
+    entityAggregation,
+    environmentAggregation,
+    platformAggregation,
+    browseResultGroup,
+    parentPath,
+}: Props) => {
+    const path = useMemo(() => {
+        const basePath = parentPath ? [...parentPath] : [];
+        return browseResultGroup ? [...basePath, browseResultGroup.name] : basePath;
+    }, [browseResultGroup, parentPath]);
+    const isPlatformBrowse = useIsPlatformBrowseV2();
+    return (
+        <BrowseContext.Provider
+            value={{
+                entityAggregation,
+                environmentAggregation,
+                platformAggregation,
+                browseResultGroup,
+                path,
+                mode: isPlatformBrowse ? BrowseMode.PLATFORM : BrowseMode.ENTITY_TYPE,
+            }}
+        >
+            {children}
+        </BrowseContext.Provider>
+    );
+};
+
+const useBrowseContext = () => {
+    const context = useContext(BrowseContext);
+    if (context === null) throw new Error(`${useBrowseContext.name} must be used under a ${BrowseProvider.name}`);
+    return context;
+};
+
+export const useBrowseMode = () => {
+    const { mode } = useBrowseContext();
+    return mode;
+};
+
+export const useIsPlatformBrowseMode = () => {
+    const { mode } = useBrowseContext();
+    return mode === BrowseMode.PLATFORM;
+};
+
+export const useMaybeEntityAggregation = () => {
+    return useBrowseContext().entityAggregation;
+};
+
+export const useMaybeEntityType = () => {
+    const entityAggregation = useMaybeEntityAggregation();
+    return entityAggregation ? (entityAggregation.value as EntityType) : null;
+};
+
+export const useEntityAggregation = () => {
+    const entityAggregation = useMaybeEntityAggregation();
+    return entityAggregation;
+};
+
+export const useEntityType = () => {
+    return useEntityAggregation()?.value as EntityType;
+};
+
+export const useMaybeEnvironmentAggregation = () => {
+    return useBrowseContext().environmentAggregation;
+};
+
+export const useEnvironmentAggregation = () => {
+    const environmentAggregation = useMaybeEnvironmentAggregation();
+    if (!environmentAggregation) throw new Error('environmentAggregation is missing in context');
+    return environmentAggregation;
+};
+
+export const useMaybePlatformAggregation = () => {
+    return useBrowseContext().platformAggregation;
+};
+
+export const usePlatformAggregation = () => {
+    const platformAggregation = useMaybePlatformAggregation();
+    if (!platformAggregation) throw new Error('platformAggregation is missing in context');
+    return platformAggregation;
+};
+
+export const useMaybeBrowseResultGroup = () => {
+    return useBrowseContext().browseResultGroup;
+};
+
+export const useBrowseResultGroup = () => {
+    const browseResultGroup = useMaybeBrowseResultGroup();
+    if (!browseResultGroup) throw new Error('browseResultGroup is missing in context');
+    return browseResultGroup;
+};
+
+export const useBrowseDisplayName = () => {
+    const entityRegistry = useEntityRegistry();
+    const browseResultGroup = useBrowseResultGroup();
+    const { entity } = browseResultGroup;
+    return entity ? entityRegistry.getDisplayName(entity.type, entity) : browseResultGroup.name;
+};
+
+export const useBrowsePath = () => {
+    const context = useBrowseContext();
+    if (!context.path) throw new Error('path is missing in context');
+    return context.path;
+};
+
+export const useBrowsePathLength = () => {
+    return useBrowsePath().length;
+};
+
+export const useBrowseSearchFilter = () => {
+    return createBrowseV2SearchFilter(useBrowsePath());
+};
+
+export const useIsEntitySelected = () => {
+    return useHasFilterValue(ENTITY_SUB_TYPE_FILTER_NAME, useEntityAggregation()?.value, { prefix: true });
+};
+
+export const useIsEnvironmentSelected = () => {
+    const environmentAggregation = useMaybeEnvironmentAggregation();
+    const isEntitySelected = useIsEntitySelected();
+    const isEnvironmentSelected = useHasFilterValue(ORIGIN_FILTER_NAME, environmentAggregation?.value);
+    return isEntitySelected && (!environmentAggregation || isEnvironmentSelected);
+};
+
+export const useIsPlatformSelected = () => {
+    const isPlatformBrowse = useIsPlatformBrowseMode();
+    const isEntitySelected = useIsEntitySelected();
+    const isEnvironmentSelected = useIsEnvironmentSelected();
+    const isPlatformSelected = useHasFilterValue(PLATFORM_FILTER_NAME, usePlatformAggregation().value);
+    return isPlatformBrowse ? isPlatformSelected : isEntitySelected && isEnvironmentSelected && isPlatformSelected;
+};
+
+export const useIsBrowsePathPrefix = () => {
+    const isPlatformBrowse = useIsPlatformBrowseMode();
+    const isEntitySelected = useIsEntitySelected();
+    const isEnvironmentSelected = useIsEnvironmentSelected();
+    const isPlatformSelected = useIsPlatformSelected();
+    const isBrowsePathPrefix = useHasFilterValue(BROWSE_PATH_V2_FILTER_NAME, useBrowseSearchFilter(), {
+        prefix: true,
+    });
+    return isPlatformBrowse
+        ? isPlatformSelected && isBrowsePathPrefix
+        : isEntitySelected && isEnvironmentSelected && isPlatformSelected && isBrowsePathPrefix;
+};
+
+export const useIsBrowsePathSelected = () => {
+    const isPlatformBrowse = useIsPlatformBrowseMode();
+    const isEntitySelected = useIsEntitySelected();
+    const isEnvironmentSelected = useIsEnvironmentSelected();
+    const isPlatformSelected = useIsPlatformSelected();
+    const isBrowsePathSelected = useHasFilterValue(BROWSE_PATH_V2_FILTER_NAME, useBrowseSearchFilter());
+    return isPlatformBrowse
+        ? isPlatformSelected && isBrowsePathSelected
+        : isEntitySelected && isEnvironmentSelected && isPlatformSelected && isBrowsePathSelected;
+};
+
+export const useOnSelectBrowsePath = () => {
+    const entityAggregation = useEntityAggregation();
+    const environmentAggregation = useMaybeEnvironmentAggregation();
+    const platformAggregation = usePlatformAggregation();
+    const browseSearchFilter = useBrowseSearchFilter();
+    const selectedFilters = useSelectedFilters();
+    const onChangeFilters = useOnChangeFilters();
+
+    return (isSelected: boolean, removeFilters: string[] = []) => {
+        const overrides: Array<FacetFilterInput> = [];
+
+        if (entityAggregation) {
+            // keep entity and subType filters for this given entity only if they exist, otherwise apply this entity filter
+            const entitySubtypeFilters = getEntitySubtypeFiltersForEntity(entityAggregation.value, selectedFilters);
+            overrides.push({
+                field: ENTITY_SUB_TYPE_FILTER_NAME,
+                condition: FilterOperator.Equal,
+                values: entitySubtypeFilters || [entityAggregation.value],
+            });
+        }
+
+        if (environmentAggregation) {
+            overrides.push({
+                field: ORIGIN_FILTER_NAME,
+                condition: FilterOperator.Equal,
+                values: [environmentAggregation.value],
+            });
+        }
+
+        overrides.push({
+            field: PLATFORM_FILTER_NAME,
+            condition: FilterOperator.Equal,
+            values: [platformAggregation.value],
+        });
+
+        overrides.push({
+            field: BROWSE_PATH_V2_FILTER_NAME,
+            condition: FilterOperator.Equal,
+            values: [browseSearchFilter],
+        });
+
+        const filtersWithOverrides = applyFacetFilterOverrides(selectedFilters, overrides)
+            .filter((filter) => !removeFilters.includes(filter.field))
+            .filter((filter) => isSelected || !overrides.some((override) => override.field === filter.field));
+
+        onChangeFilters(filtersWithOverrides);
+    };
+};
diff --git a/datahub-web-react/src/app/searchV2/sidebar/BrowseNode.tsx b/datahub-web-react/src/app/searchV2/sidebar/BrowseNode.tsx
new file mode 100644
index 00000000000000..9f55538a7370f5
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/BrowseNode.tsx
@@ -0,0 +1,127 @@
+import { FolderOutlined } from '@ant-design/icons';
+import { Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { EntityType } from '../../../types.generated';
+import { formatNumber } from '../../shared/formatNumber';
+import useToggle from '../../shared/useToggle';
+import {
+    BrowseProvider,
+    useBrowseDisplayName,
+    useBrowseResultGroup,
+    useEntityAggregation,
+    useIsBrowsePathPrefix,
+    useIsBrowsePathSelected,
+    useMaybeEnvironmentAggregation,
+    useOnSelectBrowsePath,
+    usePlatformAggregation,
+} from './BrowseContext';
+import EntityLink from './EntityLink';
+import ExpandableNode from './ExpandableNode';
+import SidebarLoadingError from './SidebarLoadingError';
+import useBrowsePagination from './useBrowsePagination';
+import useSidebarAnalytics from './useSidebarAnalytics';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+
+const FolderStyled = styled(FolderOutlined)`
+    font-size: 16px;
+    color: #374066;
+    margin-right: 4px;
+`;
+
+const Count = styled(Typography.Text)`
+    font-size: 10px;
+    color: ${(props) => props.color};
+    padding: 2px 8px;
+    margin-left: 8px;
+    border-radius: 12px;
+    background-color: ${ANTD_GRAY[1]};
+    display: block;
+    flex-grow: 0;
+`;
+
+const BrowseNode = () => {
+    const isBrowsePathPrefix = useIsBrowsePathPrefix();
+    const isBrowsePathSelected = useIsBrowsePathSelected();
+    const onSelectBrowsePath = useOnSelectBrowsePath();
+    const entityAggregation = useEntityAggregation();
+    const environmentAggregation = useMaybeEnvironmentAggregation();
+    const platformAggregation = usePlatformAggregation();
+    const browseResultGroup = useBrowseResultGroup();
+    const { count, entity } = browseResultGroup;
+    const hasEntityLink = !!entity && entity.type !== EntityType.DataPlatformInstance;
+    const displayName = useBrowseDisplayName();
+    const { trackSelectNodeEvent, trackToggleNodeEvent } = useSidebarAnalytics();
+
+    const { isOpen, isClosing, toggle } = useToggle({
+        initialValue: isBrowsePathPrefix && !isBrowsePathSelected,
+        closeDelay: 250,
+        onToggle: (isNowOpen: boolean) => trackToggleNodeEvent(isNowOpen, 'browse'),
+    });
+
+    const onClickTriangle = () => {
+        if (count) toggle();
+    };
+
+    const onClickBrowseHeader = () => {
+        const isNowSelected = !isBrowsePathSelected;
+        onSelectBrowsePath(isNowSelected);
+        trackSelectNodeEvent(isNowSelected ? 'select' : 'deselect', 'browse');
+    };
+
+    const { error, groups, loaded, observable, path, retry } = useBrowsePagination({
+        skip: !isOpen || !browseResultGroup.hasSubGroups,
+    });
+
+    const color = '#374066';
+
+    return (
+        <ExpandableNode
+            isOpen={isOpen && !isClosing && loaded}
+            header={
+                <ExpandableNode.SelectableHeader
+                    isOpen={isOpen}
+                    $isSelected={isBrowsePathSelected}
+                    onClick={onClickBrowseHeader}
+                    data-testid={`browse-node-${displayName}`}
+                >
+                    <ExpandableNode.HeaderLeft>
+                        <ExpandableNode.TriangleButton
+                            isOpen={isOpen && !isClosing}
+                            isVisible={browseResultGroup.hasSubGroups}
+                            onClick={onClickTriangle}
+                            dataTestId={`browse-node-expand-${displayName}`}
+                            style={{ display: 'block', width: 18 }}
+                        />
+                        <FolderStyled />
+                        <ExpandableNode.Title color={color} size={12} dynamicWidth padLeft>
+                            {displayName}
+                        </ExpandableNode.Title>
+                        {hasEntityLink && <EntityLink entity={entity} targetNode="browse" />}
+                    </ExpandableNode.HeaderLeft>
+                    <Count color={color}>{formatNumber(count)}</Count>
+                </ExpandableNode.SelectableHeader>
+            }
+            body={
+                <ExpandableNode.Body>
+                    {groups.map((group) => (
+                        <BrowseProvider
+                            key={group.name}
+                            entityAggregation={entityAggregation}
+                            environmentAggregation={environmentAggregation}
+                            platformAggregation={platformAggregation}
+                            browseResultGroup={group}
+                            parentPath={path}
+                        >
+                            <BrowseNode />
+                        </BrowseProvider>
+                    ))}
+                    {error && <SidebarLoadingError onClickRetry={retry} />}
+                    {observable}
+                </ExpandableNode.Body>
+            }
+        />
+    );
+};
+
+export default BrowseNode;
diff --git a/datahub-web-react/src/app/searchV2/sidebar/BrowseSidebar.tsx b/datahub-web-react/src/app/searchV2/sidebar/BrowseSidebar.tsx
new file mode 100644
index 00000000000000..66d01f84f540a0
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/BrowseSidebar.tsx
@@ -0,0 +1,189 @@
+import React, { useCallback, useState } from 'react';
+import styled from 'styled-components';
+import { Button, Divider, Typography } from 'antd';
+import { Tooltip } from '@components';
+import { ProfileSidebarResizer } from '@src/app/entityV2/shared/containers/profile/sidebar/ProfileSidebarResizer';
+import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
+import EntityBrowse from './EntityBrowse';
+import PlatformBrowse from './PlatformBrowse';
+import { useIsPlatformBrowseMode } from './BrowseContext';
+import { ANTD_GRAY } from '../../entityV2/shared/constants';
+import SidebarBackArrow from '../../../images/sidebarBackArrow.svg?react';
+import { SEARCH_RESULTS_BROWSE_SIDEBAR_ID } from '../../onboarding/config/SearchOnboardingConfig';
+
+const PLATFORM_BROWSE_TRANSITION_MS = 200;
+export const MAX_BROWSER_WIDTH = 500;
+export const MIN_BROWSWER_WIDTH = 260;
+
+const StyledEntitySidebarContainer = styled.div<{
+    isCollapsed: boolean;
+    isHidden: boolean;
+    $width?: number;
+    backgroundColor?: string;
+    $isShowNavBarRedesign?: boolean;
+}>`
+    flex: 1;
+    overflow: hidden;
+    display: ${(props) => (props.isHidden ? 'none' : undefined)};
+
+    ${(props) => !props.isCollapsed && props.$width && `max-width: ${props.$width}px;`}
+    ${(props) => props.isCollapsed && 'min-width: 63px; max-width: 63px;'}
+    &::-webkit-scrollbar {
+        display: none;
+    }
+
+    margin: ${(props) => {
+        if (props.$isShowNavBarRedesign) {
+            return props.isCollapsed ? '8px 4px 5px 5px' : '8px 0px 5px 5px';
+        }
+        return props.isCollapsed ? '12px' : '12px 0 12px 12px';
+    }};
+    transition: max-width ${PLATFORM_BROWSE_TRANSITION_MS}ms ease-in-out,
+        min-width ${PLATFORM_BROWSE_TRANSITION_MS}ms ease-in-out;
+
+    background-color: #ffffff;
+    border-radius: ${(props) =>
+        props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '8px'};
+    box-shadow: ${(props) =>
+        props.$isShowNavBarRedesign
+            ? props.theme.styles['box-shadow-navbar-redesign']
+            : '0px 0px 5px rgba(0, 0, 0, 0.08)'};
+`;
+
+export const StyledSidebar = styled.div`
+    overflow: auto;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+`;
+
+const Controls = styled.div<{ isCollapsed: boolean }>`
+    display: flex;
+    align-items: center;
+    justify-content: ${(props) => (props.isCollapsed ? 'center' : 'space-between')};
+    height: 40px;
+    padding: 8px;
+    overflow: hidden;
+`;
+
+const NavigateTitle = styled(Typography.Title)<{ isClosed: boolean }>`
+    && {
+        padding: 0px;
+        margin: 4px 0px 4px 8px;
+        min-width: 140px;
+        opacity: ${(props) => (props.isClosed ? '0' : '1')};
+    }
+`;
+
+const CloseButton = styled(Button)<{ $isActive }>`
+    margin: 0px;
+    padding: 2px 6px;
+    display: flex;
+    align-items: center;
+
+    transform: ${(props) => (props.$isActive ? 'translateX(0)' : 'translateX(-75px)')};
+    transition: transform ${PLATFORM_BROWSE_TRANSITION_MS}ms ease;
+
+    && {
+        color: ${(props) => (props.$isActive ? ANTD_GRAY[9] : ANTD_GRAY[8])};
+    }
+`;
+
+const ThinDivider = styled(Divider)`
+    margin: 0px;
+    padding: 0px;
+`;
+
+const SidebarBody = styled.div`
+    height: calc(100% - 47px);
+    overflow: auto;
+    white-space: nowrap;
+    /* Hide scrollbar altoghether for Chrome, Safari, and Opera */
+    &::-webkit-scrollbar {
+        display: none;
+    }
+    scrollbar-gutter: stable;
+    -moz-scrollbar-gutter: stable;
+    -webkit-scrollbar-gutter: stable;
+`;
+
+const StyledSidebarBackArrow = styled(SidebarBackArrow)<{ direction: 'left' | 'right' }>`
+    cursor: pointer;
+    ${(props) => (props.direction === 'right' && 'transform: scaleX(-1);') || undefined}
+`;
+
+type Props = {
+    visible: boolean;
+};
+
+const BrowseSidebar = ({ visible }: Props) => {
+    const isPlatformBrowseMode = useIsPlatformBrowseMode();
+    const [isClosed, setIsClosed] = useState(false);
+    const [isHidden, setIsHidden] = useState(false);
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+
+    const [sidebarWidth, setSidebarWidth] = useState(MIN_BROWSWER_WIDTH);
+
+    const hideSidebar = useCallback(() => {
+        setIsHidden(true);
+        setIsClosed(true);
+    }, []);
+
+    const unhideSidebar = useCallback(() => setIsHidden(false), []);
+
+    return (
+        <>
+            <StyledEntitySidebarContainer
+                isCollapsed={isClosed}
+                isHidden={isHidden}
+                $width={sidebarWidth}
+                $isShowNavBarRedesign={isShowNavBarRedesign}
+                id="browse-v2"
+            >
+                <Controls isCollapsed={isClosed}>
+                    <NavigateTitle level={5} isClosed={isClosed}>
+                        Navigate
+                    </NavigateTitle>
+                    <Tooltip
+                        placement="left"
+                        showArrow={false}
+                        title={!isClosed ? 'Close navigator' : 'Open navigator'}
+                        mouseEnterDelay={0.7}
+                        mouseLeaveDelay={0}
+                    >
+                        <CloseButton $isActive={!isClosed} type="link" onClick={() => setIsClosed(!isClosed)}>
+                            <StyledSidebarBackArrow direction={isClosed ? 'left' : 'right'} />
+                        </CloseButton>
+                    </Tooltip>
+                </Controls>
+                <StyledSidebar id={SEARCH_RESULTS_BROWSE_SIDEBAR_ID}>
+                    <ThinDivider />
+                    <SidebarBody>
+                        {!isPlatformBrowseMode ? (
+                            <EntityBrowse visible={visible} />
+                        ) : (
+                            <PlatformBrowse
+                                collapsed={isClosed}
+                                expand={() => setIsClosed(false)}
+                                visible={visible}
+                                hideSidebar={hideSidebar}
+                                unhideSidebar={unhideSidebar}
+                            />
+                        )}
+                    </SidebarBody>
+                </StyledSidebar>
+            </StyledEntitySidebarContainer>
+            {!isClosed && (
+                <ProfileSidebarResizer
+                    setSidePanelWidth={(widthProp) => {
+                        setSidebarWidth(Math.min(Math.max(widthProp, MIN_BROWSWER_WIDTH), MAX_BROWSER_WIDTH));
+                    }}
+                    initialSize={sidebarWidth}
+                    isSidebarOnLeft
+                />
+            )}
+        </>
+    );
+};
+
+export default BrowseSidebar;
diff --git a/datahub-web-react/src/app/searchV2/sidebar/EntityBrowse.tsx b/datahub-web-react/src/app/searchV2/sidebar/EntityBrowse.tsx
new file mode 100644
index 00000000000000..961e761fd4b371
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/EntityBrowse.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import EntityNode from './EntityNode';
+import { BrowseProvider } from './BrowseContext';
+import SidebarLoadingError from './SidebarLoadingError';
+import useSidebarEntities from './useSidebarEntities';
+
+type Props = {
+    visible: boolean;
+};
+
+const EntityBrowse = ({ visible }: Props) => {
+    const { error, entityAggregations, retry } = useSidebarEntities({
+        skip: !visible,
+    });
+
+    return (
+        <>
+            {entityAggregations && !entityAggregations.length && <div>No results found</div>}
+            {entityAggregations?.map((entityAggregation) => (
+                <BrowseProvider key={entityAggregation.value} entityAggregation={entityAggregation}>
+                    <EntityNode />
+                </BrowseProvider>
+            ))}
+            {error && <SidebarLoadingError onClickRetry={retry} />}
+        </>
+    );
+};
+
+export default EntityBrowse;
diff --git a/datahub-web-react/src/app/searchV2/sidebar/EntityLink.tsx b/datahub-web-react/src/app/searchV2/sidebar/EntityLink.tsx
new file mode 100644
index 00000000000000..afed5e5f1d1a2d
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/EntityLink.tsx
@@ -0,0 +1,61 @@
+import { Tooltip } from '@components';
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import Icon from '@ant-design/icons/lib/components/Icon';
+import { useBrowseDisplayName, useIsBrowsePathSelected } from './BrowseContext';
+import ExpandableNode from './ExpandableNode';
+import ExternalLink from '../../../images/link-out.svg?react';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { Entity, Maybe } from '../../../types.generated';
+import useSidebarAnalytics from './useSidebarAnalytics';
+import { BrowseV2EntityLinkClickEvent } from '../../analytics';
+
+const Linkicon = styled(Icon)<{ $isSelected: boolean }>`
+    && {
+        color: ${(props) => props.theme.styles['primary-color']};
+        ${(props) => !props.$isSelected && 'display: none;'}
+        ${ExpandableNode.SelectableHeader}:hover & {
+            display: inherit;
+        }
+    }
+`;
+
+type Props = {
+    entity?: Maybe<Entity>;
+    targetNode: BrowseV2EntityLinkClickEvent['targetNode'];
+};
+
+// The tooltip needs some text to hold onto
+const EmptySpace = styled.span`
+    display: 'none';
+    content: ' ';
+`;
+
+const EntityLink = ({ entity, targetNode }: Props) => {
+    const registry = useEntityRegistry();
+    const isBrowsePathSelected = useIsBrowsePathSelected();
+    const displayName = useBrowseDisplayName();
+    const { trackEntityLinkClickEvent } = useSidebarAnalytics();
+    const entityUrl = entity ? registry.getEntityUrl(entity.type, entity.urn) : null;
+
+    const onClickButton = () => {
+        trackEntityLinkClickEvent(targetNode);
+    };
+
+    if (!entityUrl) return null;
+
+    return (
+        <Tooltip placement="top" title={`View ${displayName} profile`} mouseEnterDelay={1}>
+            <Link to={entityUrl}>
+                <ExpandableNode.StaticButton
+                    icon={<Linkicon $isSelected={isBrowsePathSelected} component={ExternalLink} />}
+                    onClick={onClickButton}
+                />
+            </Link>
+            <EmptySpace />
+        </Tooltip>
+    );
+};
+
+export default EntityLink;
diff --git a/datahub-web-react/src/app/searchV2/sidebar/EntityNode.tsx b/datahub-web-react/src/app/searchV2/sidebar/EntityNode.tsx
new file mode 100644
index 00000000000000..50358a2f227696
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/EntityNode.tsx
@@ -0,0 +1,104 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { IconStyleType } from '../../entity/Entity';
+import { formatNumber } from '../../shared/formatNumber';
+import ExpandableNode from './ExpandableNode';
+import EnvironmentNode from './EnvironmentNode';
+import useAggregationsQuery from './useAggregationsQuery';
+import { MAX_COUNT_VAL, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME } from '../utils/constants';
+import PlatformNode from './PlatformNode';
+import SidebarLoadingError from './SidebarLoadingError';
+import useToggle from '../../shared/useToggle';
+import { BrowseProvider, useEntityAggregation, useEntityType, useIsEntitySelected } from './BrowseContext';
+import useSidebarAnalytics from './useSidebarAnalytics';
+import { useHasFilterField } from './SidebarContext';
+
+const Count = styled(Typography.Text)`
+    font-size: 12px;
+    color: ${(props) => props.color};
+    padding-left: 4px;
+`;
+
+const EntityNode = () => {
+    const isSelected = useIsEntitySelected();
+    const entityType = useEntityType();
+    const entityAggregation = useEntityAggregation();
+    const hasEnvironmentFilter = useHasFilterField(ORIGIN_FILTER_NAME);
+    const { count } = entityAggregation || { count: 0 };
+    const countText = count === MAX_COUNT_VAL ? '10k+' : formatNumber(count);
+    const registry = useEntityRegistry();
+    const { trackToggleNodeEvent } = useSidebarAnalytics();
+
+    const { isOpen, isClosing, toggle } = useToggle({
+        initialValue: isSelected,
+        closeDelay: 250,
+        onToggle: (isNowOpen: boolean) => trackToggleNodeEvent(isNowOpen, 'entity'),
+    });
+
+    const onClickHeader = () => {
+        if (count) toggle();
+    };
+
+    const { loaded, error, environmentAggregations, platformAggregations, retry } = useAggregationsQuery({
+        skip: !isOpen,
+        facets: [ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME],
+    });
+
+    const showEnvironments =
+        environmentAggregations &&
+        (environmentAggregations.length > 1 || (hasEnvironmentFilter && !!environmentAggregations.length));
+    const color = count > 0 ? '#000' : ANTD_GRAY[8];
+
+    return (
+        <ExpandableNode
+            isOpen={isOpen && !isClosing && loaded}
+            header={
+                <ExpandableNode.Header
+                    isOpen={isOpen}
+                    showBorder
+                    onClick={onClickHeader}
+                    style={{ paddingTop: '16px' }}
+                    data-testid={`browse-entity-${registry.getCollectionName(entityType)}`}
+                >
+                    <ExpandableNode.HeaderLeft>
+                        {registry.getIcon(entityType, 16, IconStyleType.HIGHLIGHT, color)}
+                        <ExpandableNode.Title color={color} size={16} padLeft>
+                            {registry.getCollectionName(entityType)}
+                        </ExpandableNode.Title>
+                        <Count color={color}>{countText}</Count>
+                    </ExpandableNode.HeaderLeft>
+                    <ExpandableNode.CircleButton isOpen={isOpen && !isClosing} color={color} />
+                </ExpandableNode.Header>
+            }
+            body={
+                <ExpandableNode.Body>
+                    {showEnvironments
+                        ? environmentAggregations?.map((environmentAggregation) => (
+                              <BrowseProvider
+                                  key={environmentAggregation.value}
+                                  entityAggregation={entityAggregation}
+                                  environmentAggregation={environmentAggregation}
+                              >
+                                  <EnvironmentNode />
+                              </BrowseProvider>
+                          ))
+                        : platformAggregations?.map((platformAggregation) => (
+                              <BrowseProvider
+                                  key={platformAggregation.value}
+                                  entityAggregation={entityAggregation}
+                                  platformAggregation={platformAggregation}
+                              >
+                                  <PlatformNode />
+                              </BrowseProvider>
+                          ))}
+                    {error && <SidebarLoadingError onClickRetry={retry} />}
+                </ExpandableNode.Body>
+            }
+        />
+    );
+};
+
+export default EntityNode;
diff --git a/datahub-web-react/src/app/searchV2/sidebar/EnvironmentNode.tsx b/datahub-web-react/src/app/searchV2/sidebar/EnvironmentNode.tsx
new file mode 100644
index 00000000000000..1673f497696baf
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/EnvironmentNode.tsx
@@ -0,0 +1,85 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { formatNumber } from '../../shared/formatNumber';
+import ExpandableNode from './ExpandableNode';
+import useAggregationsQuery from './useAggregationsQuery';
+import { PLATFORM_FILTER_NAME } from '../utils/constants';
+import PlatformNode from './PlatformNode';
+import SidebarLoadingError from './SidebarLoadingError';
+import useToggle from '../../shared/useToggle';
+import {
+    BrowseProvider,
+    useEntityAggregation,
+    useEnvironmentAggregation,
+    useIsEnvironmentSelected,
+} from './BrowseContext';
+import useSidebarAnalytics from './useSidebarAnalytics';
+
+const Count = styled(Typography.Text)`
+    font-size: 12px;
+    color: ${(props) => props.color};
+    padding-right: 8px;
+`;
+
+const EnvironmentNode = () => {
+    const isSelected = useIsEnvironmentSelected();
+    const entityAggregation = useEntityAggregation();
+    const environmentAggregation = useEnvironmentAggregation();
+    const { count } = environmentAggregation;
+    const { trackToggleNodeEvent } = useSidebarAnalytics();
+    const { isOpen, isClosing, toggle } = useToggle({
+        initialValue: isSelected,
+        closeDelay: 250,
+        onToggle: (isNowOpen: boolean) => trackToggleNodeEvent(isNowOpen, 'environment'),
+    });
+
+    const onClickHeader = () => {
+        if (count) toggle();
+    };
+
+    const { loaded, error, platformAggregations, retry } = useAggregationsQuery({
+        skip: !isOpen,
+        facets: [PLATFORM_FILTER_NAME],
+    });
+
+    const color = '#000';
+
+    return (
+        <ExpandableNode
+            isOpen={isOpen && !isClosing && loaded}
+            header={
+                <ExpandableNode.Header isOpen={isOpen} showBorder onClick={onClickHeader}>
+                    <ExpandableNode.HeaderLeft>
+                        <ExpandableNode.TriangleButton
+                            isOpen={isOpen && !isClosing}
+                            isVisible={!!count}
+                            onClick={onClickHeader}
+                        />
+                        <ExpandableNode.Title color={color} size={14}>
+                            {environmentAggregation?.value}
+                        </ExpandableNode.Title>
+                    </ExpandableNode.HeaderLeft>
+                    <Count color={color}>{formatNumber(count)}</Count>
+                </ExpandableNode.Header>
+            }
+            body={
+                <ExpandableNode.Body>
+                    {platformAggregations?.map((platformAggregation) => (
+                        <BrowseProvider
+                            key={platformAggregation.value}
+                            entityAggregation={entityAggregation}
+                            environmentAggregation={environmentAggregation}
+                            platformAggregation={platformAggregation}
+                        >
+                            <PlatformNode />
+                        </BrowseProvider>
+                    ))}
+                    {error && <SidebarLoadingError onClickRetry={retry} />}
+                </ExpandableNode.Body>
+            }
+        />
+    );
+};
+
+export default EnvironmentNode;
diff --git a/datahub-web-react/src/app/searchV2/sidebar/ExpandableNode.tsx b/datahub-web-react/src/app/searchV2/sidebar/ExpandableNode.tsx
new file mode 100644
index 00000000000000..8f99d134f7cfa9
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/ExpandableNode.tsx
@@ -0,0 +1,187 @@
+import { UpCircleOutlined } from '@ant-design/icons';
+import { Typography } from 'antd';
+import React, { MouseEventHandler, ReactNode } from 'react';
+import ChevronRightIcon from '@mui/icons-material/ChevronRight';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import { SEARCH_COLORS } from '../../entityV2/shared/constants';
+import { BaseButton, BodyContainer, BodyGridExpander, RotatingButton } from '../../shared/components';
+
+const Layout = styled.div`
+    margin-left: 8px;
+`;
+
+const HeaderContainer = styled.div``;
+
+type ExpandableNodeProps = {
+    isOpen: boolean;
+    header: ReactNode;
+    body: ReactNode;
+    style?: any;
+};
+
+const ExpandableNode = ({ isOpen, header, body, style }: ExpandableNodeProps) => {
+    return (
+        <Layout style={style}>
+            <HeaderContainer>{header}</HeaderContainer>
+            <BodyGridExpander isOpen={isOpen}>
+                <BodyContainer>{body}</BodyContainer>
+            </BodyGridExpander>
+        </Layout>
+    );
+};
+
+ExpandableNode.Header = styled.div<{
+    isOpen: boolean;
+    isSelected?: boolean;
+    showBorder?: boolean;
+}>`
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    cursor: pointer;
+    user-select: none;
+    padding: 4px;
+    gap: 4px;
+    border-bottom: 1px solid ${(props) => (props.isOpen || !props.showBorder ? 'transparent' : ANTD_GRAY[4])};
+`;
+
+ExpandableNode.SelectableHeader = styled(ExpandableNode.Header)<{ $isSelected: boolean }>`
+    & {
+        border: 1px solid ${(props) => (props.$isSelected ? SEARCH_COLORS.BACKGROUND_PURPLE : 'transparent')};
+        background-color: ${(props) => (props.$isSelected ? SEARCH_COLORS.BACKGROUND_PURPLE : 'transparent')};
+        border-radius: 8px;
+        overflow: hidden;
+    }
+
+    &:hover {
+        background-color: ${SEARCH_COLORS.BACKGROUND_PURPLE};
+    }
+`;
+
+ExpandableNode.HeaderLeft = styled.div`
+    display: flex;
+    align-items: center;
+    flex-grow: 1;
+    overflow: hidden;
+
+    > span > a {
+        display: none;
+    }
+    &:hover > span > a {
+        display: block;
+    }
+`;
+
+const ChevronRightIconStyle = styled(ChevronRightIcon)<{ isVisible?: boolean }>`
+    &&& {
+        color: ${ANTD_GRAY[6]};
+        visibility: ${(props) => (props.isVisible ? 'visible' : 'hidden')};
+        font-size: 18px;
+    }
+`;
+
+ExpandableNode.StaticButton = ({ icon, onClick }: { icon: JSX.Element; onClick?: () => void }) => {
+    const onClickButton: MouseEventHandler = (e) => {
+        e.stopPropagation();
+        onClick?.();
+    };
+    return <BaseButton ghost size="small" type="ghost" icon={icon} onClick={onClickButton} />;
+};
+
+ExpandableNode.TriangleButton = ({
+    isOpen,
+    isVisible,
+    onClick,
+    dataTestId,
+    style,
+}: {
+    isOpen: boolean;
+    isVisible: boolean;
+    onClick?: () => void;
+    dataTestId?: string;
+    style?: any;
+}) => {
+    const onClickButton: MouseEventHandler = (e) => {
+        e.stopPropagation();
+        onClick?.();
+    };
+
+    return (
+        <RotatingButton
+            ghost
+            size="small"
+            type="ghost"
+            deg={isOpen ? 90 : 0}
+            icon={<ChevronRightIconStyle isVisible={isVisible} />}
+            onClick={onClickButton}
+            data-testid={dataTestId}
+            style={style}
+        />
+    );
+};
+
+ExpandableNode.CircleButton = ({ isOpen, color }: { isOpen: boolean; color: string }) => {
+    return (
+        <RotatingButton
+            ghost
+            size="small"
+            type="ghost"
+            deg={isOpen ? 0 : 180}
+            icon={<UpCircleOutlined style={{ color }} />}
+        />
+    );
+};
+
+// Reduce the ellipsis tolerance the deeper we get into the browse path
+const BaseTitleContainer = styled.div<{ depth: number; maxWidth: number; padLeft: boolean; dynamicWidth?: boolean }>`
+    ${(props) =>
+        props.dynamicWidth
+            ? `
+    flex-shrink: 1;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    `
+            : `
+    max-width: ${props.maxWidth - props.depth * 8}px;
+    `}
+    padding-left: ${(props) => (props.padLeft ? 8 : 0)}px;
+`;
+
+const BaseTitle = styled(Typography.Text)<{ color: string; size: number }>`
+    font-size: ${(props) => props.size}px;
+    color: ${(props) => props.color};
+`;
+
+ExpandableNode.Title = ({
+    color,
+    size,
+    depth = 0,
+    children,
+    maxWidth = 200,
+    padLeft = false,
+    dynamicWidth,
+}: {
+    color: string;
+    size: number;
+    depth?: number;
+    children: ReactNode;
+    maxWidth?: number;
+    padLeft?: boolean;
+    dynamicWidth?: boolean;
+}) => {
+    return (
+        <BaseTitleContainer depth={depth} maxWidth={maxWidth} padLeft={padLeft} dynamicWidth={dynamicWidth}>
+            <BaseTitle ellipsis={{ tooltip: { mouseEnterDelay: 1 } }} color={color} size={size}>
+                {children}
+            </BaseTitle>
+        </BaseTitleContainer>
+    );
+};
+
+ExpandableNode.Body = styled.div`
+    width: 100%;
+`;
+
+export default ExpandableNode;
diff --git a/datahub-web-react/src/app/searchV2/sidebar/PlatformBrowse.tsx b/datahub-web-react/src/app/searchV2/sidebar/PlatformBrowse.tsx
new file mode 100644
index 00000000000000..c65affe57268fe
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/PlatformBrowse.tsx
@@ -0,0 +1,64 @@
+import React, { useEffect } from 'react';
+import styled from 'styled-components';
+import { Divider, Empty } from 'antd';
+import { BrowseProvider } from './BrowseContext';
+import SidebarLoadingError from './SidebarLoadingError';
+import useSidebarPlatforms from './useSidebarPlatforms';
+import PlatformNode from './PlatformNode';
+
+const BrowsePlatformIcons = styled.div`
+    display: flex;
+    flex-direction: column;
+`;
+
+const DividerStyle = styled(Divider)`
+    margin: unset;
+`;
+
+type Props = {
+    visible: boolean;
+    collapsed?: boolean;
+    expand: () => void;
+    hideSidebar: () => void;
+    unhideSidebar: () => void;
+};
+
+const PlatformBrowse = ({ visible, collapsed = false, expand, hideSidebar, unhideSidebar }: Props) => {
+    const { error, platformAggregations, retry } = useSidebarPlatforms({
+        skip: !visible,
+    });
+    const isEmpty =
+        (platformAggregations === null || (platformAggregations && !platformAggregations.length)) && !collapsed;
+
+    useEffect(() => {
+        if (platformAggregations === null || platformAggregations?.length === 0) {
+            hideSidebar();
+        } else {
+            unhideSidebar();
+        }
+    }, [platformAggregations, hideSidebar, unhideSidebar]);
+
+    return (
+        <>
+            {isEmpty && <Empty description="No matching platforms found" image={Empty.PRESENTED_IMAGE_SIMPLE} />}
+            <BrowsePlatformIcons>
+                {platformAggregations
+                    ?.sort((a, b) => b.count - a.count)
+                    ?.map((platformAggregation, i, lst) => (
+                        <BrowseProvider key={platformAggregation.value} platformAggregation={platformAggregation}>
+                            <PlatformNode
+                                iconSize={24}
+                                hasOnlyOnePlatform={lst.length === 1}
+                                toggleCollapse={expand}
+                                collapsed={collapsed}
+                            />
+                            {platformAggregation && i < platformAggregations.length - 1 && <DividerStyle />}
+                        </BrowseProvider>
+                    ))}
+            </BrowsePlatformIcons>
+            {error && <SidebarLoadingError onClickRetry={retry} />}
+        </>
+    );
+};
+
+export default PlatformBrowse;
diff --git a/datahub-web-react/src/app/searchV2/sidebar/PlatformNode.tsx b/datahub-web-react/src/app/searchV2/sidebar/PlatformNode.tsx
new file mode 100644
index 00000000000000..d52fe14b4c7978
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/PlatformNode.tsx
@@ -0,0 +1,178 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Typography } from 'antd';
+import { REDESIGN_COLORS } from '../../entityV2/shared/constants';
+import { formatNumber } from '../../shared/formatNumber';
+import ExpandableNode from './ExpandableNode';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { getFilterIconAndLabel } from '../filters/utils';
+import { BROWSE_PATH_V2_FILTER_NAME, PLATFORM_FILTER_NAME } from '../utils/constants';
+import useBrowsePagination from './useBrowsePagination';
+import BrowseNode from './BrowseNode';
+import SidebarLoadingError from './SidebarLoadingError';
+import useToggle from '../../shared/useToggle';
+import {
+    BrowseProvider,
+    useEntityAggregation,
+    useIsPlatformSelected,
+    useMaybeEnvironmentAggregation,
+    useOnSelectBrowsePath,
+    usePlatformAggregation,
+    useIsPlatformBrowseMode,
+} from './BrowseContext';
+import useSidebarAnalytics from './useSidebarAnalytics';
+import { useHasFilterField } from './SidebarContext';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import PlatformIcon from '../../sharedV2/icons/PlatformIcon';
+import { DataPlatform } from '../../../types.generated';
+
+const Count = styled(Typography.Text)<{ $isPlatformBrowse: boolean; isOpen: boolean }>`
+    font-size: 10px;
+    color: ${(props) => props.color};
+    padding: 2px 8px;
+    margin-left: 8px;
+    ${(props) => props.$isPlatformBrowse && `border-radius: 8px;`}
+    ${(props) => props.$isPlatformBrowse && `background-color: ${props.isOpen ? '#fff' : ANTD_GRAY[3]};`}
+`;
+
+type Props = {
+    iconSize?: number;
+    hasOnlyOnePlatform?: boolean;
+    toggleCollapse?: () => void;
+    collapsed?: boolean;
+};
+
+const PlatformNode = ({ iconSize = 20, hasOnlyOnePlatform = false, toggleCollapse, collapsed = true }: Props) => {
+    const isPlatformBrowse = useIsPlatformBrowseMode();
+    const isPlatformSelected = useIsPlatformSelected();
+    const hasBrowseFilter = useHasFilterField(BROWSE_PATH_V2_FILTER_NAME);
+    const isPlatformAndPathSelected = isPlatformSelected && hasBrowseFilter;
+    const isPlatformOnlySelected = isPlatformSelected && !hasBrowseFilter;
+    const entityAggregation = useEntityAggregation();
+    const environmentAggregation = useMaybeEnvironmentAggregation();
+    const platformAggregation = usePlatformAggregation();
+    const { count } = platformAggregation;
+    const registry = useEntityRegistry();
+    const { trackToggleNodeEvent, trackSelectNodeEvent } = useSidebarAnalytics();
+    const onSelectBrowsePath = useOnSelectBrowsePath();
+
+    const { label } = getFilterIconAndLabel(
+        PLATFORM_FILTER_NAME,
+        platformAggregation.value,
+        registry,
+        platformAggregation.entity ?? null,
+        iconSize,
+    );
+
+    const { isOpen, isClosing, toggle } = useToggle({
+        initialValue: hasOnlyOnePlatform || isPlatformAndPathSelected,
+        closeDelay: 250,
+        onToggle: (isNowOpen: boolean) => trackToggleNodeEvent(isNowOpen, 'platform'),
+    });
+
+    const onClickTriangle = () => {
+        if (count) toggle();
+    };
+
+    const onClickHeader = () => {
+        const isNowPlatformOnlySelected = !isPlatformOnlySelected;
+        onSelectBrowsePath(isNowPlatformOnlySelected, [BROWSE_PATH_V2_FILTER_NAME]);
+        trackSelectNodeEvent(isNowPlatformOnlySelected ? 'select' : 'deselect', 'platform');
+    };
+
+    const { error, groups, loaded, observable, path, retry } = useBrowsePagination({ skip: !isOpen });
+
+    const color = REDESIGN_COLORS.TEXT_HEADING;
+
+    const nodeStyle = {
+        padding: '4px',
+        margin: '0px',
+        background: collapsed ? '#fff' : isOpen && REDESIGN_COLORS.BACKGROUND_GRAY_4,
+        borderLeft: isOpen && '1px solid #fff',
+        borderRight: isOpen && '1px solid #fff',
+        justifyContent: collapsed ? 'center' : 'start',
+        display: 'flex',
+        flexDirection: 'column',
+    };
+
+    const onClick = () => {
+        if (toggleCollapse) toggleCollapse();
+        onClickHeader();
+    };
+
+    return (
+        <ExpandableNode
+            isOpen={!collapsed && isOpen && !isClosing && loaded}
+            style={(isPlatformBrowse && { ...nodeStyle }) || undefined}
+            header={
+                <ExpandableNode.SelectableHeader
+                    isOpen={isOpen}
+                    $isSelected={isPlatformOnlySelected}
+                    showBorder
+                    onClick={onClick}
+                    style={{ justifyContent: collapsed ? 'center' : 'start' }}
+                >
+                    <ExpandableNode.HeaderLeft style={{ justifyContent: collapsed ? 'center' : 'start' }}>
+                        <ExpandableNode.TriangleButton
+                            isOpen={isOpen && !isClosing}
+                            isVisible={!!platformAggregation.count}
+                            onClick={onClickTriangle}
+                            dataTestId={`browse-platform-${label}`}
+                            style={{
+                                marginRight: 4,
+                                transform: isOpen && 'rotate(90deg)',
+                                transition: 'transform 200ms ease',
+                                ...(collapsed && { display: 'none' }),
+                            }}
+                        />
+                        <PlatformIcon
+                            platform={platformAggregation.entity as DataPlatform}
+                            size={iconSize}
+                            color={REDESIGN_COLORS.BORDER_1}
+                        />
+                        {!collapsed && (
+                            <ExpandableNode.Title
+                                color={color}
+                                size={isPlatformBrowse ? 14 : 12}
+                                maxWidth={125}
+                                padLeft
+                            >
+                                {label}
+                            </ExpandableNode.Title>
+                        )}
+                        {!collapsed && isPlatformBrowse && (
+                            <Count color={color} isOpen={isOpen} $isPlatformBrowse>
+                                {formatNumber(platformAggregation.count)}
+                            </Count>
+                        )}
+                    </ExpandableNode.HeaderLeft>
+                    {!collapsed && !isPlatformBrowse && (
+                        <Count color={color} isOpen={isOpen} $isPlatformBrowse={false}>
+                            {formatNumber(platformAggregation.count)}
+                        </Count>
+                    )}
+                </ExpandableNode.SelectableHeader>
+            }
+            body={
+                <ExpandableNode.Body>
+                    {groups.map((group) => (
+                        <BrowseProvider
+                            key={group.name}
+                            entityAggregation={entityAggregation}
+                            environmentAggregation={environmentAggregation}
+                            platformAggregation={platformAggregation}
+                            browseResultGroup={group}
+                            parentPath={path}
+                        >
+                            <BrowseNode />
+                        </BrowseProvider>
+                    ))}
+                    {error && <SidebarLoadingError onClickRetry={retry} />}
+                    {observable}
+                </ExpandableNode.Body>
+            }
+        />
+    );
+};
+
+export default PlatformNode;
diff --git a/datahub-web-react/src/app/searchV2/sidebar/SidebarContext.tsx b/datahub-web-react/src/app/searchV2/sidebar/SidebarContext.tsx
new file mode 100644
index 00000000000000..924f954b5f224e
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/SidebarContext.tsx
@@ -0,0 +1,63 @@
+import React, { ReactNode, createContext, useContext } from 'react';
+import { FacetFilterInput, FilterOperator } from '../../../types.generated';
+
+type SidebarContextValue = {
+    selectedFilters: Array<FacetFilterInput>;
+    onChangeFilters: (filters: Array<FacetFilterInput>) => void;
+};
+
+const SidebarContext = createContext<SidebarContextValue | null>(null);
+
+type Props = {
+    children: ReactNode;
+    selectedFilters: Array<FacetFilterInput>;
+    onChangeFilters: (filters: Array<FacetFilterInput>) => void;
+};
+
+export const SidebarProvider = ({ children, selectedFilters, onChangeFilters }: Props) => {
+    return (
+        <SidebarContext.Provider
+            value={{
+                selectedFilters,
+                onChangeFilters,
+            }}
+        >
+            {children}
+        </SidebarContext.Provider>
+    );
+};
+
+const useSidebarContext = () => {
+    const context = useContext(SidebarContext);
+    if (context === null) throw new Error(`${useSidebarContext.name} must be used under a ${SidebarProvider.name}`);
+    return context;
+};
+
+export const useSelectedFilters = () => {
+    return useSidebarContext().selectedFilters;
+};
+
+export const useHasFilterField = (field: string) => {
+    const selectedFilters = useSelectedFilters();
+    return selectedFilters.some(
+        (filter) => filter.field === field && filter.condition === FilterOperator.Equal && !filter.negated,
+    );
+};
+
+export const useHasFilterValue = (field: string, value: string | undefined, { prefix = false } = {}) => {
+    const selectedFilters = useSelectedFilters();
+    return (
+        !!value &&
+        selectedFilters.some(
+            (filter) =>
+                filter.field === field &&
+                filter.condition === FilterOperator.Equal &&
+                !filter.negated &&
+                (prefix ? filter.values?.some((f) => f.startsWith(value)) : filter.values?.includes(value)),
+        )
+    );
+};
+
+export const useOnChangeFilters = () => {
+    return useSidebarContext().onChangeFilters;
+};
diff --git a/datahub-web-react/src/app/searchV2/sidebar/SidebarLoadingError.tsx b/datahub-web-react/src/app/searchV2/sidebar/SidebarLoadingError.tsx
new file mode 100644
index 00000000000000..412332ce5fd854
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/SidebarLoadingError.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { Alert, Button } from 'antd';
+import styled from 'styled-components';
+
+const StyledAlert = styled(Alert)`
+    white-space: normal;
+`;
+
+type Props = {
+    onClickRetry?: () => void;
+};
+
+const SidebarLoadingError = ({ onClickRetry }: Props) => {
+    return (
+        <StyledAlert
+            message="The sidebar failed to load."
+            showIcon
+            type="error"
+            action={
+                onClickRetry && (
+                    <Button size="small" danger onClick={onClickRetry}>
+                        Retry
+                    </Button>
+                )
+            }
+        />
+    );
+};
+
+export default SidebarLoadingError;
diff --git a/datahub-web-react/src/app/searchV2/sidebar/__tests__/browseContextUtils.test.ts b/datahub-web-react/src/app/searchV2/sidebar/__tests__/browseContextUtils.test.ts
new file mode 100644
index 00000000000000..efabe1b1377fdd
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/__tests__/browseContextUtils.test.ts
@@ -0,0 +1,20 @@
+import { ENTITY_SUB_TYPE_FILTER_NAME, TAGS_FILTER_NAME } from '../../utils/constants';
+import { getEntitySubtypeFiltersForEntity } from '../browseContextUtils';
+
+describe('browseContextUtils', () => {
+    it('should remove any different entity types from the filter and keep anything related to our given entityType', () => {
+        const existingFilters = [
+            {
+                field: ENTITY_SUB_TYPE_FILTER_NAME,
+                values: ['DATASET␞table', 'CONTAINER', 'DATASET', 'CHART', 'DATASET␞view'],
+            },
+            {
+                field: TAGS_FILTER_NAME,
+                values: ['urn:li:tag:test'],
+            },
+        ];
+        const entitySubtypeFilters = getEntitySubtypeFiltersForEntity('DATASET', existingFilters);
+
+        expect(entitySubtypeFilters).toMatchObject(['DATASET␞table', 'DATASET', 'DATASET␞view']);
+    });
+});
diff --git a/datahub-web-react/src/app/searchV2/sidebar/browseContextUtils.ts b/datahub-web-react/src/app/searchV2/sidebar/browseContextUtils.ts
new file mode 100644
index 00000000000000..1fcda04063aa59
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/browseContextUtils.ts
@@ -0,0 +1,8 @@
+import { FacetFilterInput } from '../../../types.generated';
+import { ENTITY_SUB_TYPE_FILTER_NAME } from '../utils/constants';
+
+export function getEntitySubtypeFiltersForEntity(entityType: string, existingFilters: FacetFilterInput[]) {
+    return existingFilters
+        .find((f) => f.field === ENTITY_SUB_TYPE_FILTER_NAME)
+        ?.values?.filter((value) => value.includes(entityType));
+}
diff --git a/datahub-web-react/src/app/searchV2/sidebar/constants.ts b/datahub-web-react/src/app/searchV2/sidebar/constants.ts
new file mode 100644
index 00000000000000..a215f56bf1aaa8
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/constants.ts
@@ -0,0 +1,4 @@
+export const BROWSE_PAGE_SIZE = 20;
+export const MAX_AGGREGATION_VALUES = 100;
+
+export const BROWSE_LOAD_MORE_MARGIN = '200px';
diff --git a/datahub-web-react/src/app/searchV2/sidebar/index.tsx b/datahub-web-react/src/app/searchV2/sidebar/index.tsx
new file mode 100644
index 00000000000000..552f7a89a49e3f
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/index.tsx
@@ -0,0 +1,3 @@
+import BrowseSidebar from './BrowseSidebar';
+
+export default BrowseSidebar;
diff --git a/datahub-web-react/src/app/searchV2/sidebar/types.ts b/datahub-web-react/src/app/searchV2/sidebar/types.ts
new file mode 100644
index 00000000000000..91abd9d295f531
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/types.ts
@@ -0,0 +1,17 @@
+import useGetSearchQueryInputs from '../useGetSearchQueryInputs';
+
+export type SidebarFilters = Pick<
+    ReturnType<typeof useGetSearchQueryInputs>,
+    'entityFilters' | 'query' | 'orFilters' | 'viewUrn'
+>;
+
+export enum BrowseMode {
+    /**
+     * Browse by entity type
+     */
+    ENTITY_TYPE = 'ENTITY_TYPE',
+    /**
+     * Browse by platform
+     */
+    PLATFORM = 'PLATFORM',
+}
diff --git a/datahub-web-react/src/app/searchV2/sidebar/useAggregationsQuery.ts b/datahub-web-react/src/app/searchV2/sidebar/useAggregationsQuery.ts
new file mode 100644
index 00000000000000..47e8ba33e2ae71
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/useAggregationsQuery.ts
@@ -0,0 +1,91 @@
+import { useAggregateAcrossEntitiesQuery } from '../../../graphql/search.generated';
+import { EntityType } from '../../../types.generated';
+import { GLOSSARY_ENTITY_TYPES } from '../../entity/shared/constants';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { ENTITY_FILTER_NAME, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME } from '../utils/constants';
+import { MAX_AGGREGATION_VALUES } from './constants';
+import { useSidebarFilters } from './useSidebarFilters';
+
+type Props = {
+    facets: string[];
+    skip: boolean;
+    excludeFilters?: boolean;
+};
+
+const useAggregationsQuery = ({ facets, excludeFilters = false, skip }: Props) => {
+    const registry = useEntityRegistry();
+    const sidebarFilters = useSidebarFilters();
+
+    const {
+        data: newData,
+        previousData,
+        loading,
+        error,
+        refetch,
+    } = useAggregateAcrossEntitiesQuery({
+        skip,
+        fetchPolicy: 'cache-first',
+        variables: {
+            input: {
+                ...(excludeFilters ? {} : { types: sidebarFilters.entityFilters || [] }),
+                facets,
+                ...(excludeFilters ? {} : { orFilters: sidebarFilters.orFilters }),
+                ...(excludeFilters ? {} : { viewUrn: sidebarFilters.viewUrn }),
+                query: excludeFilters ? '*' : sidebarFilters.query,
+                searchFlags: {
+                    maxAggValues: MAX_AGGREGATION_VALUES,
+                },
+            },
+        },
+    });
+
+    const retry = () => {
+        if (refetch) refetch();
+    };
+
+    // This approach of falling back to previousData is needed to avoid a full re-mount of the sidebar entities
+    const data = error ? null : newData ?? previousData;
+    const loaded = !!data || !!error;
+
+    const entityAggregations = data?.aggregateAcrossEntities?.facets
+        ?.find((facet) => facet.field === ENTITY_FILTER_NAME)
+        ?.aggregations.filter((aggregation) => {
+            const type = aggregation.value as EntityType;
+            return (
+                registry.getEntity(type).isBrowseEnabled() &&
+                !GLOSSARY_ENTITY_TYPES.includes(type) &&
+                EntityType.BusinessAttribute !== type
+            );
+        })
+        .sort((a, b) => {
+            const nameA = registry.getCollectionName(a.value as EntityType);
+            const nameB = registry.getCollectionName(b.value as EntityType);
+            return nameA.localeCompare(nameB);
+        });
+
+    const environmentAggregations = data?.aggregateAcrossEntities?.facets
+        ?.find((facet) => facet.field === ORIGIN_FILTER_NAME)
+        ?.aggregations.filter((aggregation) => aggregation.count)
+        .sort((a, b) => a.value.localeCompare(b.value));
+
+    const platformAggregations = data?.aggregateAcrossEntities?.facets
+        ?.find((facet) => facet.field === PLATFORM_FILTER_NAME)
+        ?.aggregations.filter((aggregation) => aggregation.count)
+        .sort((a, b) => {
+            const nameA = a.entity ? registry.getDisplayName(EntityType.DataPlatform, a.entity) : a.value;
+            const nameB = b.entity ? registry.getDisplayName(EntityType.DataPlatform, b.entity) : b.value;
+            return nameA.localeCompare(nameB);
+        });
+
+    return {
+        loading,
+        loaded,
+        error,
+        entityAggregations,
+        environmentAggregations,
+        platformAggregations,
+        retry,
+    } as const;
+};
+
+export default useAggregationsQuery;
diff --git a/datahub-web-react/src/app/searchV2/sidebar/useBrowsePagination.tsx b/datahub-web-react/src/app/searchV2/sidebar/useBrowsePagination.tsx
new file mode 100644
index 00000000000000..cadecdb318532a
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/useBrowsePagination.tsx
@@ -0,0 +1,107 @@
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import useIntersect from '../../shared/useIntersect';
+import { BROWSE_LOAD_MORE_MARGIN, BROWSE_PAGE_SIZE } from './constants';
+import { GetBrowseResultsV2Query, useGetBrowseResultsV2LazyQuery } from '../../../graphql/browseV2.generated';
+import { useSidebarFilters } from './useSidebarFilters';
+import { useBrowsePath, useEntityType } from './BrowseContext';
+
+type Props = {
+    skip: boolean;
+};
+
+const useBrowsePagination = ({ skip }: Props) => {
+    const initializing = useRef(true);
+    const type = useEntityType();
+    const path = useBrowsePath();
+    const sidebarFilters = useSidebarFilters();
+    const [startToBrowseMap, setStartToBrowseMap] = useState<Record<number, GetBrowseResultsV2Query | undefined>>({});
+    const startList = useMemo(
+        () =>
+            Object.keys(startToBrowseMap)
+                .map(Number)
+                .sort((a, b) => a - b),
+        [startToBrowseMap],
+    );
+    const groups = useMemo(
+        () => startList.flatMap((start) => startToBrowseMap[start]?.browseV2?.groups ?? []),
+        [startList, startToBrowseMap],
+    );
+    const latestStart = startList.length ? startList[startList.length - 1] : -1;
+    const latestData = latestStart >= 0 ? startToBrowseMap[latestStart] : null;
+    const total = latestData?.browseV2?.total ?? -1;
+    const done = !!latestData && groups.length >= total;
+
+    const [getBrowseResultsV2, { data, error, refetch }] = useGetBrowseResultsV2LazyQuery({
+        fetchPolicy: 'cache-first',
+    });
+
+    const retry = () => {
+        if (refetch) refetch();
+    };
+
+    const getBrowseResultsV2WithDeps = useCallback(
+        (start: number) => {
+            if (skip) return;
+            getBrowseResultsV2({
+                variables: {
+                    input: {
+                        type,
+                        path,
+                        start,
+                        count: BROWSE_PAGE_SIZE,
+                        orFilters: sidebarFilters.orFilters,
+                        viewUrn: sidebarFilters.viewUrn,
+                        query: sidebarFilters.query,
+                    },
+                },
+            });
+        },
+        [getBrowseResultsV2, path, sidebarFilters.orFilters, sidebarFilters.query, sidebarFilters.viewUrn, skip, type],
+    );
+
+    useEffect(() => {
+        initializing.current = true;
+        getBrowseResultsV2WithDeps(0);
+    }, [getBrowseResultsV2WithDeps]);
+
+    useEffect(() => {
+        const newStart = data?.browseV2?.start ?? -1;
+        if (newStart === 0) initializing.current = false;
+        if (initializing.current || !data || newStart < 0) return;
+
+        setStartToBrowseMap((previousMap) => {
+            const newMap: typeof previousMap = { [newStart]: data };
+
+            Object.keys(previousMap)
+                .map(Number)
+                .forEach((previousStart) => {
+                    if (previousStart < newStart) newMap[previousStart] = previousMap[previousStart];
+                });
+
+            return newMap;
+        });
+    }, [data]);
+
+    const advancePage = useCallback(() => {
+        const newStart = latestStart + BROWSE_PAGE_SIZE;
+        if (initializing.current || error || done || latestStart < 0 || total <= 0 || newStart >= total) return;
+        getBrowseResultsV2WithDeps(newStart);
+    }, [done, error, getBrowseResultsV2WithDeps, latestStart, total]);
+
+    const { observableRef } = useIntersect({
+        skip,
+        options: { rootMargin: BROWSE_LOAD_MORE_MARGIN },
+        onIntersect: advancePage,
+    });
+
+    return {
+        loaded: !!latestData || !!error,
+        error,
+        groups,
+        path: latestData?.browseV2?.metadata?.path,
+        observable: <div ref={observableRef} style={{ width: '1px', height: '1px' }} />,
+        retry,
+    } as const;
+};
+
+export default useBrowsePagination;
diff --git a/datahub-web-react/src/app/searchV2/sidebar/useSidebarAnalytics.ts b/datahub-web-react/src/app/searchV2/sidebar/useSidebarAnalytics.ts
new file mode 100644
index 00000000000000..5e0b7e9c26b8bf
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/useSidebarAnalytics.ts
@@ -0,0 +1,70 @@
+import { EntityType } from '../../../types.generated';
+import {
+    BrowseV2EntityLinkClickEvent,
+    BrowseV2SelectNodeEvent,
+    BrowseV2ToggleNodeEvent,
+    EventType,
+} from '../../analytics';
+import analytics from '../../analytics/analytics';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import {
+    useBrowsePathLength,
+    useEntityType,
+    useMaybeEnvironmentAggregation,
+    useMaybePlatformAggregation,
+} from './BrowseContext';
+
+const useSidebarAnalytics = () => {
+    const registry = useEntityRegistry();
+    const entityType = useEntityType();
+    const environmentAggregation = useMaybeEnvironmentAggregation();
+    const platformAggregation = useMaybePlatformAggregation();
+    const entityDisplayName = entityType && registry.getCollectionName(entityType);
+    const environmentDisplayName = environmentAggregation?.value;
+    const platformDisplayName = platformAggregation?.entity
+        ? registry.getDisplayName(EntityType.DataPlatform, platformAggregation.entity)
+        : platformAggregation?.value;
+    const targetDepth = (environmentAggregation ? 1 : 0) + (platformAggregation ? 1 : 0) + useBrowsePathLength();
+
+    const trackToggleNodeEvent = (isOpen: boolean, targetNode: BrowseV2ToggleNodeEvent['targetNode']) => {
+        analytics.event({
+            type: EventType.BrowseV2ToggleNodeEvent,
+            targetNode,
+            action: isOpen ? 'open' : 'close',
+            entity: entityDisplayName,
+            environment: environmentDisplayName,
+            platform: platformDisplayName,
+            targetDepth,
+        });
+    };
+
+    const trackSelectNodeEvent = (
+        action: BrowseV2SelectNodeEvent['action'],
+        targetNode: BrowseV2SelectNodeEvent['targetNode'],
+    ) => {
+        analytics.event({
+            type: EventType.BrowseV2SelectNodeEvent,
+            targetNode,
+            action,
+            entity: entityDisplayName,
+            environment: environmentDisplayName,
+            platform: platformDisplayName,
+            targetDepth,
+        });
+    };
+
+    const trackEntityLinkClickEvent = (targetNode: BrowseV2EntityLinkClickEvent['targetNode']) => {
+        analytics.event({
+            type: EventType.BrowseV2EntityLinkClickEvent,
+            targetNode,
+            entity: entityDisplayName,
+            environment: environmentDisplayName,
+            platform: platformDisplayName,
+            targetDepth,
+        });
+    };
+
+    return { trackToggleNodeEvent, trackSelectNodeEvent, trackEntityLinkClickEvent } as const;
+};
+
+export default useSidebarAnalytics;
diff --git a/datahub-web-react/src/app/searchV2/sidebar/useSidebarEntities.ts b/datahub-web-react/src/app/searchV2/sidebar/useSidebarEntities.ts
new file mode 100644
index 00000000000000..08150a671a9c58
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/useSidebarEntities.ts
@@ -0,0 +1,34 @@
+import { useMemo } from 'react';
+import { ENTITY_FILTER_NAME } from '../utils/constants';
+import useAggregationsQuery from './useAggregationsQuery';
+
+type Props = {
+    skip: boolean;
+};
+
+const useSidebarEntities = ({ skip }: Props) => {
+    const {
+        error: filteredError,
+        entityAggregations: filteredAggs,
+        retry: retryFilteredAggs,
+    } = useAggregationsQuery({
+        skip,
+        facets: [ENTITY_FILTER_NAME],
+    });
+
+    const { error: baseError, entityAggregations: baseAggs } = useAggregationsQuery({
+        skip,
+        facets: [ENTITY_FILTER_NAME],
+        excludeFilters: true,
+    });
+
+    const result = useMemo(() => {
+        if (filteredError || baseError) return filteredAggs; // Fallback to filtered aggs on any error
+        if (!filteredAggs || !baseAggs) return null; // If we're loading one of the queries, wait to render
+        return filteredAggs.filter((agg) => baseAggs.some((base) => base.value === agg.value && !!base.count));
+    }, [baseAggs, baseError, filteredAggs, filteredError]);
+
+    return { error: filteredError, entityAggregations: result, retry: retryFilteredAggs } as const;
+};
+
+export default useSidebarEntities;
diff --git a/datahub-web-react/src/app/searchV2/sidebar/useSidebarFilters.ts b/datahub-web-react/src/app/searchV2/sidebar/useSidebarFilters.ts
new file mode 100644
index 00000000000000..17aecc5edf1679
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/useSidebarFilters.ts
@@ -0,0 +1,51 @@
+import isEqual from 'lodash/isEqual';
+import { useEffect, useMemo, useState } from 'react';
+import useGetSearchQueryInputs from '../useGetSearchQueryInputs';
+import { ENTITY_FILTER_NAME, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME } from '../utils/constants';
+import { useMaybeEntityType, useMaybeEnvironmentAggregation, useMaybePlatformAggregation } from './BrowseContext';
+import { applyOrFilterOverrides } from '../utils/applyFilterOverrides';
+import { SidebarFilters } from './types';
+
+export const useSidebarFilters = (): SidebarFilters => {
+    const entityType = useMaybeEntityType();
+    const environment = useMaybeEnvironmentAggregation()?.value;
+    const platform = useMaybePlatformAggregation()?.value;
+
+    const filterOverrides = useMemo(
+        () => [
+            ...(entityType ? [{ field: ENTITY_FILTER_NAME, value: entityType }] : []),
+            ...(environment ? [{ field: ORIGIN_FILTER_NAME, value: environment }] : []),
+            ...(platform ? [{ field: PLATFORM_FILTER_NAME, value: platform }] : []),
+        ],
+        [entityType, environment, platform],
+    );
+
+    const excludedFilterFields = useMemo(() => filterOverrides.map((filter) => filter.field), [filterOverrides]);
+
+    const {
+        entityFilters: latestEntityFilters,
+        query: latestQuery,
+        orFilters: latestOrFilters,
+        viewUrn: latestViewUrn,
+    } = useGetSearchQueryInputs(excludedFilterFields);
+
+    const latestSidebarFilters = useMemo(
+        () => ({
+            // todo(josh): remove this and move it to a normal filterOverride when _entityType is fully wired up on the backend
+            entityFilters: entityType ? [entityType] : latestEntityFilters,
+            query: latestQuery,
+            orFilters: applyOrFilterOverrides(latestOrFilters, filterOverrides),
+            viewUrn: latestViewUrn,
+        }),
+        [entityType, filterOverrides, latestEntityFilters, latestOrFilters, latestQuery, latestViewUrn],
+    );
+
+    const [sidebarFilters, setSidebarFilters] = useState(latestSidebarFilters);
+
+    // Ensures we only trigger filter updates in the sidebar if they truly changed (clicking browse could trigger this when we don't want)
+    useEffect(() => {
+        if (!isEqual(latestSidebarFilters, sidebarFilters)) setSidebarFilters(latestSidebarFilters);
+    }, [latestSidebarFilters, sidebarFilters]);
+
+    return sidebarFilters;
+};
diff --git a/datahub-web-react/src/app/searchV2/sidebar/useSidebarPlatforms.tsx b/datahub-web-react/src/app/searchV2/sidebar/useSidebarPlatforms.tsx
new file mode 100644
index 00000000000000..30795701da2cb5
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sidebar/useSidebarPlatforms.tsx
@@ -0,0 +1,34 @@
+import { useMemo } from 'react';
+import { PLATFORM_FILTER_NAME } from '../utils/constants';
+import useAggregationsQuery from './useAggregationsQuery';
+
+type Props = {
+    skip: boolean;
+};
+
+const useSidebarPlatforms = ({ skip }: Props) => {
+    const {
+        error: filteredError,
+        platformAggregations: filteredAggs,
+        retry: retryFilteredAggs,
+    } = useAggregationsQuery({
+        skip,
+        facets: [PLATFORM_FILTER_NAME],
+    });
+
+    const { error: baseError, platformAggregations: baseAggs } = useAggregationsQuery({
+        skip,
+        facets: [PLATFORM_FILTER_NAME],
+        excludeFilters: true,
+    });
+
+    const result = useMemo(() => {
+        if (filteredError || baseError) return filteredAggs; // Fallback to filtered aggs on any error
+        if (!filteredAggs || !baseAggs) return null; // If we're loading one of the queries, wait to render
+        return filteredAggs.filter((agg) => baseAggs.some((base) => base.value === agg.value && !!base.count));
+    }, [baseAggs, baseError, filteredAggs, filteredError]);
+
+    return { error: filteredError, platformAggregations: result, retry: retryFilteredAggs } as const;
+};
+
+export default useSidebarPlatforms;
diff --git a/datahub-web-react/src/app/searchV2/sorting/SearchSortSelect.tsx b/datahub-web-react/src/app/searchV2/sorting/SearchSortSelect.tsx
new file mode 100644
index 00000000000000..54141055005f4b
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sorting/SearchSortSelect.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import { CaretDownFilled } from '@ant-design/icons';
+import { Select } from 'antd';
+import { Tooltip } from '@components';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import { DEFAULT_SORT_OPTION } from '../context/constants';
+import useGetSortOptions from './useGetSortOptions';
+
+const SelectWrapper = styled.span`
+    display: inline-flex;
+    align-items: center;
+    margin-right: 0px;
+    && {
+        padding: 0px;
+        margin: 0px;
+    }
+    .ant-select-selection-item {
+        // !important is necessary because updating Select styles for antd is impossible
+        color: ${ANTD_GRAY[8]} !important;
+        font-weight: 700;
+    }
+
+    .ant-select-selection-placeholder {
+        color: ${ANTD_GRAY[8]};
+        font-weight: 700;
+    }
+`;
+
+type Props = {
+    selectedSortOption: string | undefined;
+    setSelectedSortOption: (option: string) => void;
+};
+
+export default function SearchSortSelect({ selectedSortOption, setSelectedSortOption }: Props) {
+    const sortOptions = useGetSortOptions();
+    const options = Object.entries(sortOptions).map(([value, option]) => ({ value, label: option.label }));
+
+    return (
+        <Tooltip title="Sort search results" showArrow={false} placement="left">
+            <SelectWrapper>
+                <Select
+                    placeholder="Sort by"
+                    value={selectedSortOption === DEFAULT_SORT_OPTION ? null : selectedSortOption}
+                    options={options}
+                    bordered={false}
+                    onChange={(option) => setSelectedSortOption(option)}
+                    dropdownStyle={{ minWidth: 'max-content' }}
+                    placement="bottomRight"
+                    suffixIcon={<CaretDownFilled />}
+                />
+            </SelectWrapper>
+        </Tooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/sorting/useGetSortOptions.tsx b/datahub-web-react/src/app/searchV2/sorting/useGetSortOptions.tsx
new file mode 100644
index 00000000000000..edeb31fda801e2
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sorting/useGetSortOptions.tsx
@@ -0,0 +1,7 @@
+import { SORT_OPTIONS } from '../context/constants';
+
+export default function useGetSortOptions() {
+    // TODO: Add a new endpoint showSortFields() that passes the list of potential sort fields, and verifies
+    // whether there are any entries matching that sort field.
+    return SORT_OPTIONS;
+}
diff --git a/datahub-web-react/src/app/searchV2/sorting/useSortInput.ts b/datahub-web-react/src/app/searchV2/sorting/useSortInput.ts
new file mode 100644
index 00000000000000..69ba53d60a86c2
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/sorting/useSortInput.ts
@@ -0,0 +1,13 @@
+import { RELEVANCE } from '../context/constants';
+import useGetSortOptions from './useGetSortOptions';
+
+export default function useSortInput(selectedSortOption: string | undefined) {
+    const sortOptions = useGetSortOptions();
+
+    // do not return a sortInput if the option is our default/recommended
+    if (!selectedSortOption || selectedSortOption === RELEVANCE) return undefined;
+
+    const sortOption = selectedSortOption in sortOptions ? sortOptions[selectedSortOption] : null;
+
+    return sortOption ? { sortCriterion: { field: sortOption.field, sortOrder: sortOption.sortOrder } } : undefined;
+}
diff --git a/datahub-web-react/src/app/searchV2/suggestions/SearchQuerySugggester.tsx b/datahub-web-react/src/app/searchV2/suggestions/SearchQuerySugggester.tsx
new file mode 100644
index 00000000000000..4f14b8ed3455b6
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/suggestions/SearchQuerySugggester.tsx
@@ -0,0 +1,39 @@
+import styled from 'styled-components';
+import React from 'react';
+import { useHistory } from 'react-router';
+import { SearchSuggestion } from '../../../types.generated';
+import { navigateToSearchUrl } from '../utils/navigateToSearchUrl';
+import { ANTD_GRAY_V2 } from '../../entity/shared/constants';
+
+const TextWrapper = styled.div`
+    font-size: 14px;
+    color: ${ANTD_GRAY_V2[8]};
+    margin: -8px 0px 16px 24px;
+`;
+
+export const SuggestedText = styled.span`
+    color: ${(props) => props.theme.styles['primary-color']};
+    text-decoration: underline ${(props) => props.theme.styles['primary-color']};
+    cursor: pointer;
+`;
+
+interface Props {
+    suggestions: SearchSuggestion[];
+}
+
+export default function SearchQuerySuggester({ suggestions }: Props) {
+    const history = useHistory();
+
+    if (suggestions.length === 0) return null;
+    const suggestText = suggestions[0].text;
+
+    function searchForSuggestion() {
+        navigateToSearchUrl({ query: suggestText, history });
+    }
+
+    return (
+        <TextWrapper>
+            Did you mean <SuggestedText onClick={searchForSuggestion}>{suggestText}</SuggestedText>?
+        </TextWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/searchV2/useAdvancedSearchSelectFilters.tsx b/datahub-web-react/src/app/searchV2/useAdvancedSearchSelectFilters.tsx
new file mode 100644
index 00000000000000..886d83cf5cd9cf
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/useAdvancedSearchSelectFilters.tsx
@@ -0,0 +1,29 @@
+import { useState } from 'react';
+import { FacetFilterInput, FilterOperator } from '../../types.generated';
+import { TEXT_FIELDS } from './utils/constants';
+
+interface Props {
+    selectedFilters: FacetFilterInput[];
+    onFilterSelect: (newFilters: FacetFilterInput[]) => void;
+}
+
+export default function useAdvancedSearchSelectFilters({ selectedFilters, onFilterSelect }: Props) {
+    const [filterField, setFilterField] = useState<null | string>(null);
+
+    const onFilterFieldSelect = (value) => {
+        setFilterField(value.value);
+    };
+
+    const onSelectValueFromModal = (values) => {
+        if (!filterField) return;
+
+        const newFilter: FacetFilterInput = {
+            field: filterField,
+            values: values as string[],
+            condition: TEXT_FIELDS.has(filterField) ? FilterOperator.Contain : FilterOperator.Equal,
+        };
+        onFilterSelect([...selectedFilters, newFilter]);
+    };
+
+    return { filterField, setFilterField, onFilterFieldSelect, onSelectValueFromModal };
+}
diff --git a/datahub-web-react/src/app/searchV2/useGetSearchQueryInputs.ts b/datahub-web-react/src/app/searchV2/useGetSearchQueryInputs.ts
new file mode 100644
index 00000000000000..81657a3ce5c92c
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/useGetSearchQueryInputs.ts
@@ -0,0 +1,40 @@
+import * as QueryString from 'query-string';
+import { useLocation } from 'react-router';
+import { useMemo } from 'react';
+import { FacetFilterInput, EntityType } from '../../types.generated';
+import { ENTITY_FILTER_NAME, UnionType } from './utils/constants';
+import { useUserContext } from '../context/useUserContext';
+import useFilters from './utils/useFilters';
+import { generateOrFilters } from './utils/generateOrFilters';
+import useSortInput from './sorting/useSortInput';
+import { useSelectedSortOption } from '../search/context/SearchContext';
+
+export default function useGetSearchQueryInputs(excludedFilterFields?: Array<string>) {
+    const userContext = useUserContext();
+    const location = useLocation();
+
+    const params = useMemo(() => QueryString.parse(location.search, { arrayFormat: 'comma' }), [location.search]);
+    const query: string = decodeURIComponent(params.query ? (params.query as string) : '');
+    const page: number = params.page && Number(params.page as string) > 0 ? Number(params.page as string) : 1;
+    const unionType: UnionType = Number(params.unionType as any as UnionType) || UnionType.AND;
+    const viewUrn = userContext.localState?.selectedViewUrn;
+    const selectedSortOption = useSelectedSortOption();
+    const sortInput = useSortInput(selectedSortOption);
+
+    const filters: Array<FacetFilterInput> = useFilters(params);
+    const entityFilters: Array<EntityType> = useMemo(
+        () =>
+            filters
+                .filter((filter) => filter.field === ENTITY_FILTER_NAME)
+                .flatMap((filter) => (filter.values || []).map((value) => value?.toUpperCase() as EntityType))
+                .sort((a, b) => a.localeCompare(b)),
+        [filters],
+    );
+
+    const orFilters = useMemo(
+        () => generateOrFilters(unionType, filters, excludedFilterFields),
+        [filters, excludedFilterFields, unionType],
+    );
+
+    return { entityFilters, query, unionType, filters, orFilters, viewUrn, page, sortInput };
+}
diff --git a/datahub-web-react/src/app/searchV2/useSearchAndBrowseVersion.ts b/datahub-web-react/src/app/searchV2/useSearchAndBrowseVersion.ts
new file mode 100644
index 00000000000000..bd7db84f51c79f
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/useSearchAndBrowseVersion.ts
@@ -0,0 +1,34 @@
+import { useAppConfig } from '../useAppConfig';
+
+const useSearchAndBrowseVersion = () => {
+    const appConfig = useAppConfig();
+    const searchVersion = appConfig.config.featureFlags.showSearchFiltersV2 ? 'v2' : 'v1';
+    const browseVersion = appConfig.config.featureFlags.showBrowseV2 ? 'v2' : 'v1';
+    const isPlatformBrowse = appConfig.config.featureFlags.platformBrowseV2;
+    return { searchVersion, browseVersion, isPlatformBrowse } as const;
+};
+
+export const useSearchVersion = () => {
+    return useSearchAndBrowseVersion().searchVersion;
+};
+
+export const useBrowseVersion = () => {
+    return useSearchAndBrowseVersion().browseVersion;
+};
+
+export const useIsSearchV2 = () => {
+    return useSearchVersion() === 'v2';
+};
+
+// only show browseV2 if search filtersV2 is also enabled
+export const useIsBrowseV2 = () => {
+    const browseVersion = useBrowseVersion();
+    const searchFiltersVersion = useSearchVersion();
+
+    return browseVersion === 'v2' && searchFiltersVersion === 'v2';
+};
+
+export const useIsPlatformBrowseV2 = () => {
+    const { isPlatformBrowse } = useSearchAndBrowseVersion();
+    return isPlatformBrowse;
+};
diff --git a/datahub-web-react/src/app/searchV2/useSearchViewAll.ts b/datahub-web-react/src/app/searchV2/useSearchViewAll.ts
new file mode 100644
index 00000000000000..9c6eb563a281c3
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/useSearchViewAll.ts
@@ -0,0 +1,16 @@
+import { useQuickFiltersContext } from '@src/providers/QuickFiltersContext';
+import { useCallback } from 'react';
+import { useHistory } from 'react-router';
+import analytics, { EventType } from '../analytics';
+import { navigateToSearchUrl } from './utils/navigateToSearchUrl';
+
+export default function useSearchViewAll() {
+    const history = useHistory();
+    const { setSelectedQuickFilter } = useQuickFiltersContext();
+
+    return useCallback(() => {
+        analytics.event({ type: EventType.SearchBarExploreAllClickEvent });
+        setSelectedQuickFilter(null);
+        navigateToSearchUrl({ query: '*', history });
+    }, [history, setSelectedQuickFilter]);
+}
diff --git a/datahub-web-react/src/app/searchV2/useToggleSidebar.ts b/datahub-web-react/src/app/searchV2/useToggleSidebar.ts
new file mode 100644
index 00000000000000..dfe3f68f6c1987
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/useToggleSidebar.ts
@@ -0,0 +1,23 @@
+import { EventType } from '../analytics';
+import analytics from '../analytics/analytics';
+import { useUserContext } from '../context/useUserContext';
+import useToggle from '../shared/useToggle';
+
+const useToggleSidebar = () => {
+    const { localState, updateLocalState } = useUserContext();
+
+    const { isOpen: isSidebarOpen, toggle: toggleSidebar } = useToggle({
+        initialValue: localState.showBrowseV2Sidebar ?? true,
+        onToggle: (isNowOpen: boolean) => {
+            analytics.event({
+                type: EventType.BrowseV2ToggleSidebarEvent,
+                action: isNowOpen ? 'open' : 'close',
+            });
+            updateLocalState({ ...localState, showBrowseV2Sidebar: isNowOpen });
+        },
+    });
+
+    return { isSidebarOpen, toggleSidebar } as const;
+};
+
+export default useToggleSidebar;
diff --git a/datahub-web-react/src/app/searchV2/utils/__tests__/applyFilterOverrides.test.ts b/datahub-web-react/src/app/searchV2/utils/__tests__/applyFilterOverrides.test.ts
new file mode 100644
index 00000000000000..1baf4c3248b286
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/utils/__tests__/applyFilterOverrides.test.ts
@@ -0,0 +1,105 @@
+import { applyFacetFilterOverrides, applyOrFilterOverrides } from '../applyFilterOverrides';
+import { CONTAINER_FILTER_NAME, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME, UnionType } from '../constants';
+import { generateOrFilters } from '../generateOrFilters';
+
+describe('applyFacetFilterOverrides', () => {
+    it('should concatenate overrides to an empty list', () => {
+        const filterOverrides = [
+            { field: PLATFORM_FILTER_NAME, value: 'looker' },
+            { field: CONTAINER_FILTER_NAME, value: 'parent' },
+        ];
+        const baseFilters = [];
+        const orFiltersWithOverrides = applyFacetFilterOverrides(baseFilters, filterOverrides);
+
+        expect(orFiltersWithOverrides).toMatchObject([
+            { field: PLATFORM_FILTER_NAME, value: 'looker' },
+            { field: CONTAINER_FILTER_NAME, value: 'parent' },
+        ]);
+    });
+
+    it('should apply new overrides to the end of the list', () => {
+        const filterOverrides = [{ field: ORIGIN_FILTER_NAME, value: 'PROD' }];
+        const baseFilters = [
+            { field: PLATFORM_FILTER_NAME, value: 'looker' },
+            { field: CONTAINER_FILTER_NAME, value: 'parent' },
+        ];
+        const orFiltersWithOverrides = applyFacetFilterOverrides(baseFilters, filterOverrides);
+
+        expect(orFiltersWithOverrides).toMatchObject([
+            { field: PLATFORM_FILTER_NAME, value: 'looker' },
+            { field: CONTAINER_FILTER_NAME, value: 'parent' },
+            { field: ORIGIN_FILTER_NAME, value: 'PROD' },
+        ]);
+    });
+
+    it('should replace existing filters and concatenate new ones', () => {
+        const filterOverrides = [
+            { field: PLATFORM_FILTER_NAME, value: 'hive' },
+            { field: ORIGIN_FILTER_NAME, value: 'PROD' },
+        ];
+        const baseFilters = [
+            { field: PLATFORM_FILTER_NAME, value: 'looker' },
+            { field: CONTAINER_FILTER_NAME, value: 'parent' },
+        ];
+        const orFiltersWithOverrides = applyFacetFilterOverrides(baseFilters, filterOverrides);
+
+        expect(orFiltersWithOverrides).toMatchObject([
+            { field: PLATFORM_FILTER_NAME, value: 'hive' },
+            { field: CONTAINER_FILTER_NAME, value: 'parent' },
+            { field: ORIGIN_FILTER_NAME, value: 'PROD' },
+        ]);
+    });
+});
+
+describe('applyOrFilterOverrides', () => {
+    it('should apply overrides to each OR block of orFilters', () => {
+        const filterOverrides = [{ field: ORIGIN_FILTER_NAME, value: 'PROD' }];
+        const baseFilters = [
+            { field: PLATFORM_FILTER_NAME, value: 'looker' },
+            { field: CONTAINER_FILTER_NAME, value: 'parent' },
+        ];
+        const orFiltersWithoutOverrides = generateOrFilters(UnionType.OR, baseFilters);
+        const orFiltersWithOverrides = applyOrFilterOverrides(orFiltersWithoutOverrides, filterOverrides);
+
+        expect(orFiltersWithOverrides).toMatchObject([
+            {
+                and: [
+                    { field: PLATFORM_FILTER_NAME, value: 'looker' },
+                    { field: ORIGIN_FILTER_NAME, value: 'PROD' },
+                ],
+            },
+            {
+                and: [
+                    { field: CONTAINER_FILTER_NAME, value: 'parent' },
+                    { field: ORIGIN_FILTER_NAME, value: 'PROD' },
+                ],
+            },
+        ]);
+    });
+
+    it('should apply overrides to empty orFilters', () => {
+        const filterOverrides = [{ field: ORIGIN_FILTER_NAME, value: 'PROD' }];
+        const baseFilters = [];
+        const orFiltersWithoutOverrides = generateOrFilters(UnionType.OR, baseFilters);
+        const orFiltersWithOverrides = applyOrFilterOverrides(orFiltersWithoutOverrides, filterOverrides);
+
+        expect(orFiltersWithOverrides).toMatchObject([
+            {
+                and: [{ field: ORIGIN_FILTER_NAME, value: 'PROD' }],
+            },
+        ]);
+    });
+
+    it('should not modify orFilters on empty overrides', () => {
+        const filterOverrides = [];
+        const baseFilters = [{ field: PLATFORM_FILTER_NAME, value: 'looker' }];
+        const orFiltersWithoutOverrides = generateOrFilters(UnionType.OR, baseFilters);
+        const orFiltersWithOverrides = applyOrFilterOverrides(orFiltersWithoutOverrides, filterOverrides);
+
+        expect(orFiltersWithOverrides).toMatchObject([
+            {
+                and: [{ field: PLATFORM_FILTER_NAME, value: 'looker' }],
+            },
+        ]);
+    });
+});
diff --git a/datahub-web-react/src/app/searchV2/utils/__tests__/filterUtils.test.ts b/datahub-web-react/src/app/searchV2/utils/__tests__/filterUtils.test.ts
new file mode 100644
index 00000000000000..b32adfe30ec964
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/utils/__tests__/filterUtils.test.ts
@@ -0,0 +1,45 @@
+import { QuickFilterField } from '../../autoComplete/quickFilters/utils';
+import { getAutoCompleteInputFromQuickFilter, getFiltersWithQuickFilter } from '../filterUtils';
+
+describe('getAutoCompleteInputFromQuickFilter', () => {
+    it('should create a platform filter if the selected quick filter is a platform', () => {
+        const selectedQuickFilter = { field: QuickFilterField.Platform, value: 'urn:li:dataPlatform:dbt' };
+        const filterResult = getAutoCompleteInputFromQuickFilter(selectedQuickFilter);
+
+        expect(filterResult).toMatchObject({
+            filters: [{ field: selectedQuickFilter.field, values: [selectedQuickFilter.value] }],
+            types: [],
+        });
+    });
+
+    it('should create an entity type filter if the selected quick filter is an entity', () => {
+        const selectedQuickFilter = { field: QuickFilterField.Entity, value: 'DASHBOARD' };
+        const filterResult = getAutoCompleteInputFromQuickFilter(selectedQuickFilter);
+
+        expect(filterResult).toMatchObject({
+            filters: [],
+            types: [selectedQuickFilter.value],
+        });
+    });
+
+    it('should return empty filters if there is no selected quick filter', () => {
+        const filterResult = getAutoCompleteInputFromQuickFilter(null);
+
+        expect(filterResult).toMatchObject({ filters: [], types: [] });
+    });
+});
+
+describe('getFiltersWithQuickFilter', () => {
+    it('should create a filters list with a quick filter as a FacetFilter when there is a quick filter', () => {
+        const selectedQuickFilter = { field: QuickFilterField.Platform, value: 'urn:li:dataPlatform:dbt' };
+        const filterResult = getFiltersWithQuickFilter(selectedQuickFilter);
+
+        expect(filterResult).toMatchObject([{ field: selectedQuickFilter.field, values: [selectedQuickFilter.value] }]);
+    });
+
+    it('should return empty filters if there is no selected quick filter', () => {
+        const filterResult = getFiltersWithQuickFilter(null);
+
+        expect(filterResult).toMatchObject([]);
+    });
+});
diff --git a/datahub-web-react/src/app/searchV2/utils/__tests__/generateOrFilters.test.ts b/datahub-web-react/src/app/searchV2/utils/__tests__/generateOrFilters.test.ts
new file mode 100644
index 00000000000000..a5d3389f1a7f01
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/utils/__tests__/generateOrFilters.test.ts
@@ -0,0 +1,168 @@
+import { FilterOperator } from '@src/types.generated';
+import { FrontendFilterOperator } from '../../filters/types';
+import {
+    DOMAINS_FILTER_NAME,
+    ENTITY_SUB_TYPE_FILTER_NAME,
+    ENTITY_FILTER_NAME,
+    TAGS_FILTER_NAME,
+    UnionType,
+} from '../constants';
+import { generateOrFilters } from '../generateOrFilters';
+
+describe('generateOrFilters', () => {
+    it('should generate orFilters with UnionType.AND', () => {
+        const filters = [
+            { field: ENTITY_FILTER_NAME, values: ['DATASET', 'CONTAINER'] },
+            { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] },
+        ];
+        const orFilters = generateOrFilters(UnionType.AND, filters);
+
+        expect(orFilters).toMatchObject([
+            {
+                and: filters,
+            },
+        ]);
+    });
+
+    it('should generate orFilters with UnionType.OR', () => {
+        const filters = [
+            { field: ENTITY_FILTER_NAME, values: ['DATASET', 'CONTAINER'] },
+            { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] },
+        ];
+        const orFilters = generateOrFilters(UnionType.OR, filters);
+
+        expect(orFilters).toMatchObject([
+            {
+                and: [filters[0]],
+            },
+            {
+                and: [filters[1]],
+            },
+        ]);
+    });
+
+    it('should generate orFilters with UnionType.AND and nestedFilters', () => {
+        const filters = [
+            { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] },
+            { field: DOMAINS_FILTER_NAME, values: ['urn:li:domains:domain1'] },
+            { field: ENTITY_SUB_TYPE_FILTER_NAME, values: ['CONTAINER', 'DATASET␞table'] },
+        ];
+        // const nestedFilters = [{ field: ENTITY_SUB_TYPE_FILTER_NAME, values: ['CONTAINER', 'DATASET␞table'] }];
+        const orFilters = generateOrFilters(UnionType.AND, filters);
+
+        expect(orFilters).toMatchObject([
+            {
+                and: [
+                    { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] },
+                    { field: DOMAINS_FILTER_NAME, values: ['urn:li:domains:domain1'] },
+                    { field: '_entityType', values: ['CONTAINER'] },
+                ],
+            },
+            {
+                and: [
+                    { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] },
+                    { field: DOMAINS_FILTER_NAME, values: ['urn:li:domains:domain1'] },
+                    { field: '_entityType', values: ['DATASET'] },
+                    { field: 'typeNames', values: ['table'] },
+                ],
+            },
+        ]);
+    });
+
+    it('should generate orFilters with UnionType.OR and nestedFilters', () => {
+        const filters = [
+            { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] },
+            { field: DOMAINS_FILTER_NAME, values: ['urn:li:domains:domain1'] },
+            { field: ENTITY_SUB_TYPE_FILTER_NAME, values: ['CONTAINER', 'DATASET␞table'] },
+        ];
+        const orFilters = generateOrFilters(UnionType.OR, filters);
+
+        expect(orFilters).toMatchObject([
+            {
+                and: [{ field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] }],
+            },
+            {
+                and: [{ field: DOMAINS_FILTER_NAME, values: ['urn:li:domains:domain1'] }],
+            },
+            {
+                and: [{ field: '_entityType', values: ['CONTAINER'] }],
+            },
+            {
+                and: [
+                    { field: '_entityType', values: ['DATASET'] },
+                    { field: 'typeNames', values: ['table'] },
+                ],
+            },
+        ]);
+    });
+
+    it('should generate orFilters and exclude filters with a provided exclude field', () => {
+        const filters = [
+            { field: ENTITY_FILTER_NAME, values: ['DATASET', 'CONTAINER'] },
+            { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] },
+        ];
+        const orFilters = generateOrFilters(UnionType.AND, filters, [ENTITY_FILTER_NAME]);
+
+        expect(orFilters).toMatchObject([
+            {
+                and: [{ field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] }],
+            },
+        ]);
+    });
+
+    it('should split a criterion if the operator is ALL_EQUALS', () => {
+        const filters = [
+            {
+                field: TAGS_FILTER_NAME,
+                values: ['urn:li:tag:tag1', 'urn:li:tag:tag2', 'urn:li:tag:tag3'],
+                condition: FrontendFilterOperator.AllEqual,
+            },
+        ];
+        const orFilters = generateOrFilters(UnionType.AND, filters);
+
+        expect(orFilters).toMatchObject([
+            {
+                and: [
+                    { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'], condition: FilterOperator.Equal },
+                    { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag2'], condition: FilterOperator.Equal },
+                    { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag3'], condition: FilterOperator.Equal },
+                ],
+            },
+        ]);
+    });
+
+    it('should split a criterion if the operator is ALL_EQUALS along with other filters', () => {
+        const filters = [
+            { field: ENTITY_FILTER_NAME, values: ['DATASET', 'CONTAINER'] },
+            {
+                field: TAGS_FILTER_NAME,
+                values: ['urn:li:tag:tag1', 'urn:li:tag:tag2', 'urn:li:tag:tag3'],
+                condition: FrontendFilterOperator.AllEqual,
+            },
+        ];
+        const orFilters = generateOrFilters(UnionType.AND, filters);
+
+        expect(orFilters).toMatchObject([
+            {
+                and: [
+                    { field: ENTITY_FILTER_NAME, values: ['DATASET', 'CONTAINER'] },
+                    {
+                        field: TAGS_FILTER_NAME,
+                        values: ['urn:li:tag:tag1'],
+                        condition: FilterOperator.Equal,
+                    },
+                    {
+                        field: TAGS_FILTER_NAME,
+                        values: ['urn:li:tag:tag2'],
+                        condition: FilterOperator.Equal,
+                    },
+                    {
+                        field: TAGS_FILTER_NAME,
+                        values: ['urn:li:tag:tag3'],
+                        condition: FilterOperator.Equal,
+                    },
+                ],
+            },
+        ]);
+    });
+});
diff --git a/datahub-web-react/src/app/searchV2/utils/applyFilterOverrides.ts b/datahub-web-react/src/app/searchV2/utils/applyFilterOverrides.ts
new file mode 100644
index 00000000000000..035a272328c3fe
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/utils/applyFilterOverrides.ts
@@ -0,0 +1,31 @@
+import { AndFilterInput, FacetFilterInput } from '../../../types.generated';
+import { UnionType } from './constants';
+import { generateOrFilters } from './generateOrFilters';
+
+// Swap in new overrides at the same filter positions, with the remainder at the end
+// Assumes we find matches just by field name, so if multiple filters for the same field were passed, we replace those
+export const applyFacetFilterOverrides = (filters: Array<FacetFilterInput>, overrides: Array<FacetFilterInput>) => {
+    const added = new Set<string>();
+    const overrideMap = new Map<string, FacetFilterInput>();
+
+    overrides.forEach((override) => {
+        if (!overrideMap.has(override.field)) overrideMap.set(override.field, override);
+    });
+
+    return filters
+        .map((filter) => {
+            const override = overrideMap.get(filter.field);
+            if (!override) return filter;
+            added.add(override.field);
+            return override;
+        })
+        .concat(overrides.filter((override) => !added.has(override.field)));
+};
+
+export const applyOrFilterOverrides = (orFilters: Array<AndFilterInput>, overrides: Array<FacetFilterInput>) => {
+    if (!orFilters.length) return generateOrFilters(UnionType.AND, overrides);
+
+    return orFilters.map((orFilter) => ({
+        and: applyFacetFilterOverrides(orFilter.and ?? [], overrides),
+    }));
+};
diff --git a/datahub-web-react/src/app/searchV2/utils/combineSiblingsInAutoComplete.ts b/datahub-web-react/src/app/searchV2/utils/combineSiblingsInAutoComplete.ts
new file mode 100644
index 00000000000000..e8e64559e67a00
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/utils/combineSiblingsInAutoComplete.ts
@@ -0,0 +1,31 @@
+import { AutoCompleteResultForEntity, EntityType } from '../../../types.generated';
+import { CombinedEntity, createSiblingEntityCombiner } from '../../entity/shared/siblingUtils';
+
+export type CombinedSuggestion = {
+    type: EntityType;
+    combinedEntities: Array<CombinedEntity>;
+    suggestions?: AutoCompleteResultForEntity['suggestions'];
+};
+
+export function combineSiblingsInAutoComplete(
+    autoCompleteResultForEntity: AutoCompleteResultForEntity,
+    { combineSiblings = false } = {},
+): CombinedSuggestion {
+    const combine = createSiblingEntityCombiner();
+    const combinedEntities: Array<CombinedEntity> = [];
+
+    autoCompleteResultForEntity.entities.forEach((entity) => {
+        if (!combineSiblings) {
+            combinedEntities.push({ entity });
+            return;
+        }
+        const combinedResult = combine(entity);
+        if (!combinedResult.skipped) combinedEntities.push(combinedResult.combinedEntity);
+    });
+
+    return {
+        type: autoCompleteResultForEntity.type,
+        suggestions: autoCompleteResultForEntity.suggestions,
+        combinedEntities,
+    };
+}
diff --git a/datahub-web-react/src/app/searchV2/utils/combineSiblingsInSearchResults.test.ts b/datahub-web-react/src/app/searchV2/utils/combineSiblingsInSearchResults.test.ts
new file mode 100644
index 00000000000000..5c1ad3263d94ac
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/utils/combineSiblingsInSearchResults.test.ts
@@ -0,0 +1,551 @@
+import { combineSiblingsInSearchResults } from './combineSiblingsInSearchResults';
+
+const searchResultWithSiblings = [
+    {
+        entity: {
+            urn: 'urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.raw_orders,PROD)',
+            exists: true,
+            type: 'DATASET',
+            name: 'cypress_project.jaffle_shop.raw_orders',
+            origin: 'PROD',
+            uri: null,
+            platform: {
+                urn: 'urn:li:dataPlatform:bigquery',
+                type: 'DATA_PLATFORM',
+                name: 'bigquery',
+                properties: {
+                    type: 'RELATIONAL_DB',
+                    displayName: 'BigQuery',
+                    datasetNameDelimiter: '.',
+                    logoUrl: '/assets/platforms/bigquerylogo.png',
+                    __typename: 'DataPlatformProperties',
+                },
+                displayName: null,
+                info: null,
+                __typename: 'DataPlatform',
+            },
+            dataPlatformInstance: null,
+            editableProperties: null,
+            platformNativeType: null,
+            properties: {
+                name: 'raw_orders',
+                description: null,
+                qualifiedName: null,
+                customProperties: [],
+                __typename: 'DatasetProperties',
+            },
+            ownership: null,
+            globalTags: null,
+            glossaryTerms: null,
+            subTypes: {
+                typeNames: ['table'],
+                __typename: 'SubTypes',
+            },
+            domain: null,
+            container: {
+                urn: 'urn:li:container:348c96555971d3f5c1ffd7dd2e7446cb',
+                platform: {
+                    urn: 'urn:li:dataPlatform:bigquery',
+                    type: 'DATA_PLATFORM',
+                    name: 'bigquery',
+                    properties: {
+                        type: 'RELATIONAL_DB',
+                        displayName: 'BigQuery',
+                        datasetNameDelimiter: '.',
+                        logoUrl: '/assets/platforms/bigquerylogo.png',
+                        __typename: 'DataPlatformProperties',
+                    },
+                    displayName: null,
+                    info: null,
+                    __typename: 'DataPlatform',
+                },
+                properties: {
+                    name: 'jaffle_shop',
+                    __typename: 'ContainerProperties',
+                },
+                subTypes: {
+                    typeNames: ['Dataset'],
+                    __typename: 'SubTypes',
+                },
+                deprecation: null,
+                __typename: 'Container',
+            },
+            parentContainers: {
+                count: 2,
+                containers: [
+                    {
+                        urn: 'urn:li:container:348c96555971d3f5c1ffd7dd2e7446cb',
+                        platform: {
+                            urn: 'urn:li:dataPlatform:bigquery',
+                            type: 'DATA_PLATFORM',
+                            name: 'bigquery',
+                            properties: {
+                                type: 'RELATIONAL_DB',
+                                displayName: 'BigQuery',
+                                datasetNameDelimiter: '.',
+                                logoUrl: '/assets/platforms/bigquerylogo.png',
+                                __typename: 'DataPlatformProperties',
+                            },
+                            displayName: null,
+                            info: null,
+                            __typename: 'DataPlatform',
+                        },
+                        properties: {
+                            name: 'jaffle_shop',
+                            __typename: 'ContainerProperties',
+                        },
+                        subTypes: {
+                            typeNames: ['Dataset'],
+                            __typename: 'SubTypes',
+                        },
+                        deprecation: null,
+                        __typename: 'Container',
+                    },
+                    {
+                        urn: 'urn:li:container:b5e95fce839e7d78151ed7e0a7420d84',
+                        platform: {
+                            urn: 'urn:li:dataPlatform:bigquery',
+                            type: 'DATA_PLATFORM',
+                            name: 'bigquery',
+                            properties: {
+                                type: 'RELATIONAL_DB',
+                                displayName: 'BigQuery',
+                                datasetNameDelimiter: '.',
+                                logoUrl: '/assets/platforms/bigquerylogo.png',
+                                __typename: 'DataPlatformProperties',
+                            },
+                            displayName: null,
+                            info: null,
+                            __typename: 'DataPlatform',
+                        },
+                        properties: {
+                            name: 'cypress_project',
+                            __typename: 'ContainerProperties',
+                        },
+                        subTypes: {
+                            typeNames: ['Project'],
+                            __typename: 'SubTypes',
+                        },
+                        deprecation: null,
+                        __typename: 'Container',
+                    },
+                ],
+                __typename: 'ParentContainersResult',
+            },
+            deprecation: null,
+            siblings: {
+                isPrimary: false,
+                siblings: [
+                    {
+                        urn: 'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
+                        type: 'DATASET',
+                    },
+                ],
+                __typename: 'SiblingProperties',
+            },
+            siblingsSearch: {
+                searchResults: [
+                    {
+                        entity: {
+                            urn: 'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
+                            exists: true,
+                            type: 'DATASET',
+                            platform: {
+                                urn: 'urn:li:dataPlatform:dbt',
+                                type: 'DATA_PLATFORM',
+                                name: 'dbt',
+                                properties: {
+                                    type: 'OTHERS',
+                                    displayName: 'dbt',
+                                    datasetNameDelimiter: '.',
+                                    logoUrl: '/assets/platforms/dbtlogo.png',
+                                    __typename: 'DataPlatformProperties',
+                                },
+                                displayName: null,
+                                info: null,
+                                __typename: 'DataPlatform',
+                            },
+                            name: 'cypress_project.jaffle_shop.raw_orders',
+                            properties: {
+                                name: 'raw_orders',
+                                description: '',
+                                qualifiedName: null,
+                                __typename: 'DatasetProperties',
+                            },
+                            __typename: 'Dataset',
+                        },
+                    },
+                ],
+            },
+            __typename: 'Dataset',
+        },
+        matchedFields: [
+            {
+                name: 'name',
+                value: 'raw_orders',
+                __typename: 'MatchedField',
+            },
+            {
+                name: 'id',
+                value: 'cypress_project.jaffle_shop.raw_orders',
+                __typename: 'MatchedField',
+            },
+        ],
+        insights: [],
+        __typename: 'SearchResult',
+    },
+    {
+        entity: {
+            urn: 'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
+            exists: true,
+            type: 'DATASET',
+            name: 'cypress_project.jaffle_shop.raw_orders',
+            origin: 'PROD',
+            uri: null,
+            platform: {
+                urn: 'urn:li:dataPlatform:dbt',
+                type: 'DATA_PLATFORM',
+                name: 'dbt',
+                properties: {
+                    type: 'OTHERS',
+                    displayName: 'dbt',
+                    datasetNameDelimiter: '.',
+                    logoUrl: '/assets/platforms/dbtlogo.png',
+                    __typename: 'DataPlatformProperties',
+                },
+                displayName: null,
+                info: null,
+                __typename: 'DataPlatform',
+            },
+            dataPlatformInstance: null,
+            editableProperties: null,
+            platformNativeType: null,
+            properties: {
+                name: 'raw_orders',
+                description: '',
+                qualifiedName: null,
+                customProperties: [
+                    {
+                        key: 'catalog_version',
+                        value: '1.0.4',
+                        __typename: 'StringMapEntry',
+                    },
+                    {
+                        key: 'node_type',
+                        value: 'seed',
+                        __typename: 'StringMapEntry',
+                    },
+                    {
+                        key: 'materialization',
+                        value: 'seed',
+                        __typename: 'StringMapEntry',
+                    },
+                    {
+                        key: 'dbt_file_path',
+                        value: 'data/raw_orders.csv',
+                        __typename: 'StringMapEntry',
+                    },
+                    {
+                        key: 'catalog_schema',
+                        value: 'https://schemas.getdbt.com/dbt/catalog/v1.json',
+                        __typename: 'StringMapEntry',
+                    },
+                    {
+                        key: 'catalog_type',
+                        value: 'table',
+                        __typename: 'StringMapEntry',
+                    },
+                    {
+                        key: 'manifest_version',
+                        value: '1.0.4',
+                        __typename: 'StringMapEntry',
+                    },
+                    {
+                        key: 'manifest_schema',
+                        value: 'https://schemas.getdbt.com/dbt/manifest/v4.json',
+                        __typename: 'StringMapEntry',
+                    },
+                ],
+                __typename: 'DatasetProperties',
+            },
+            ownership: null,
+            globalTags: null,
+            glossaryTerms: null,
+            subTypes: {
+                typeNames: ['seed'],
+                __typename: 'SubTypes',
+            },
+            domain: null,
+            container: null,
+            parentContainers: {
+                count: 0,
+                containers: [],
+                __typename: 'ParentContainersResult',
+            },
+            deprecation: null,
+            siblings: {
+                isPrimary: true,
+                siblings: [
+                    {
+                        urn: 'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
+                        type: 'DATASET',
+                    },
+                ],
+                __typename: 'SiblingProperties',
+            },
+            siblingsSearch: {
+                searchResults: [
+                    {
+                        entity: {
+                            urn: 'urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.raw_orders,PROD)',
+                            type: 'DATASET',
+                            platform: {
+                                urn: 'urn:li:dataPlatform:bigquery',
+                                type: 'DATA_PLATFORM',
+                                name: 'bigquery',
+                                properties: {
+                                    type: 'RELATIONAL_DB',
+                                    displayName: 'BigQuery',
+                                    datasetNameDelimiter: '.',
+                                    logoUrl: '/assets/platforms/bigquerylogo.png',
+                                    __typename: 'DataPlatformProperties',
+                                },
+                                displayName: null,
+                                info: null,
+                                __typename: 'DataPlatform',
+                            },
+                            name: 'cypress_project.jaffle_shop.raw_orders',
+                            properties: {
+                                name: 'raw_orders',
+                                description: null,
+                                qualifiedName: null,
+                                __typename: 'DatasetProperties',
+                            },
+                            __typename: 'Dataset',
+                        },
+                    },
+                ],
+            },
+            __typename: 'Dataset',
+        },
+        matchedFields: [
+            {
+                name: 'name',
+                value: 'raw_orders',
+                __typename: 'MatchedField',
+            },
+            {
+                name: 'id',
+                value: 'cypress_project.jaffle_shop.raw_orders',
+                __typename: 'MatchedField',
+            },
+        ],
+        insights: [],
+        __typename: 'SearchResult',
+    },
+];
+
+const searchResultWithGhostSiblings = [
+    {
+        entity: {
+            urn: 'urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.raw_orders,PROD)',
+            exists: true,
+            type: 'DATASET',
+            name: 'cypress_project.jaffle_shop.raw_orders',
+            origin: 'PROD',
+            uri: null,
+            platform: {
+                urn: 'urn:li:dataPlatform:bigquery',
+                type: 'DATA_PLATFORM',
+                name: 'bigquery',
+                properties: {
+                    type: 'RELATIONAL_DB',
+                    displayName: 'BigQuery',
+                    datasetNameDelimiter: '.',
+                    logoUrl: '/assets/platforms/bigquerylogo.png',
+                    __typename: 'DataPlatformProperties',
+                },
+                displayName: null,
+                info: null,
+                __typename: 'DataPlatform',
+            },
+            dataPlatformInstance: null,
+            editableProperties: null,
+            platformNativeType: null,
+            properties: {
+                name: 'raw_orders',
+                description: null,
+                qualifiedName: null,
+                customProperties: [],
+                __typename: 'DatasetProperties',
+            },
+            ownership: null,
+            globalTags: null,
+            glossaryTerms: null,
+            subTypes: {
+                typeNames: ['table'],
+                __typename: 'SubTypes',
+            },
+            domain: null,
+            container: {
+                urn: 'urn:li:container:348c96555971d3f5c1ffd7dd2e7446cb',
+                platform: {
+                    urn: 'urn:li:dataPlatform:bigquery',
+                    type: 'DATA_PLATFORM',
+                    name: 'bigquery',
+                    properties: {
+                        type: 'RELATIONAL_DB',
+                        displayName: 'BigQuery',
+                        datasetNameDelimiter: '.',
+                        logoUrl: '/assets/platforms/bigquerylogo.png',
+                        __typename: 'DataPlatformProperties',
+                    },
+                    displayName: null,
+                    info: null,
+                    __typename: 'DataPlatform',
+                },
+                properties: {
+                    name: 'jaffle_shop',
+                    __typename: 'ContainerProperties',
+                },
+                subTypes: {
+                    typeNames: ['Dataset'],
+                    __typename: 'SubTypes',
+                },
+                deprecation: null,
+                __typename: 'Container',
+            },
+            parentContainers: {
+                count: 2,
+                containers: [
+                    {
+                        urn: 'urn:li:container:348c96555971d3f5c1ffd7dd2e7446cb',
+                        platform: {
+                            urn: 'urn:li:dataPlatform:bigquery',
+                            type: 'DATA_PLATFORM',
+                            name: 'bigquery',
+                            properties: {
+                                type: 'RELATIONAL_DB',
+                                displayName: 'BigQuery',
+                                datasetNameDelimiter: '.',
+                                logoUrl: '/assets/platforms/bigquerylogo.png',
+                                __typename: 'DataPlatformProperties',
+                            },
+                            displayName: null,
+                            info: null,
+                            __typename: 'DataPlatform',
+                        },
+                        properties: {
+                            name: 'jaffle_shop',
+                            __typename: 'ContainerProperties',
+                        },
+                        subTypes: {
+                            typeNames: ['Dataset'],
+                            __typename: 'SubTypes',
+                        },
+                        deprecation: null,
+                        __typename: 'Container',
+                    },
+                    {
+                        urn: 'urn:li:container:b5e95fce839e7d78151ed7e0a7420d84',
+                        platform: {
+                            urn: 'urn:li:dataPlatform:bigquery',
+                            type: 'DATA_PLATFORM',
+                            name: 'bigquery',
+                            properties: {
+                                type: 'RELATIONAL_DB',
+                                displayName: 'BigQuery',
+                                datasetNameDelimiter: '.',
+                                logoUrl: '/assets/platforms/bigquerylogo.png',
+                                __typename: 'DataPlatformProperties',
+                            },
+                            displayName: null,
+                            info: null,
+                            __typename: 'DataPlatform',
+                        },
+                        properties: {
+                            name: 'cypress_project',
+                            __typename: 'ContainerProperties',
+                        },
+                        subTypes: {
+                            typeNames: ['Project'],
+                            __typename: 'SubTypes',
+                        },
+                        deprecation: null,
+                        __typename: 'Container',
+                    },
+                ],
+                __typename: 'ParentContainersResult',
+            },
+            deprecation: null,
+            siblings: {
+                isPrimary: false,
+                siblings: [
+                    {
+                        urn: 'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
+                        type: 'DATASET',
+                    },
+                ],
+                __typename: 'SiblingProperties',
+            },
+            siblingsSearch: {
+                searchResults: [
+                    {
+                        entity: {
+                            urn: 'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
+                            exists: false,
+                            type: 'DATASET',
+                        },
+                    },
+                ],
+            },
+            __typename: 'Dataset',
+        },
+        matchedFields: [
+            {
+                name: 'name',
+                value: 'raw_orders',
+                __typename: 'MatchedField',
+            },
+            {
+                name: 'id',
+                value: 'cypress_project.jaffle_shop.raw_orders',
+                __typename: 'MatchedField',
+            },
+        ],
+        insights: [],
+        __typename: 'SearchResult',
+    },
+];
+
+describe('siblingUtils', () => {
+    describe('combineSiblingsInSearchResults', () => {
+        it('combines search results to deduplicate siblings', () => {
+            const result = combineSiblingsInSearchResults(false, searchResultWithSiblings as any);
+
+            expect(result).toHaveLength(1);
+            expect(result?.[0]?.matchedEntities?.[0]?.urn).toEqual(
+                'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
+            );
+            expect(result?.[0]?.matchedEntities?.[1]?.urn).toEqual(
+                'urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.raw_orders,PROD)',
+            );
+
+            expect(result?.[0]?.matchedEntities).toHaveLength(2);
+
+            expect(result?.[0]?.matchedFields).toHaveLength(2);
+        });
+
+        it('will not combine an entity with a ghost node', () => {
+            const result = combineSiblingsInSearchResults(false, searchResultWithGhostSiblings as any);
+
+            expect(result).toHaveLength(1);
+            expect(result?.[0]?.matchedEntities?.[0]?.urn).toEqual(
+                'urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.raw_orders,PROD)',
+            );
+            expect(result?.[0]?.matchedEntities).toHaveLength(1);
+
+            expect(result?.[0]?.matchedFields).toHaveLength(2);
+        });
+    });
+});
diff --git a/datahub-web-react/src/app/searchV2/utils/combineSiblingsInSearchResults.ts b/datahub-web-react/src/app/searchV2/utils/combineSiblingsInSearchResults.ts
new file mode 100644
index 00000000000000..14c5cb8efe2506
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/utils/combineSiblingsInSearchResults.ts
@@ -0,0 +1,34 @@
+import { Entity, EntityPath, MatchedField } from '../../../types.generated';
+import { CombinedEntity, createSiblingEntityCombiner } from '../../entity/shared/siblingUtils';
+
+type UncombinedSeaerchResults = {
+    entity: Entity;
+    matchedFields: Array<MatchedField>;
+    paths?: EntityPath[];
+};
+
+export type CombinedSearchResult = CombinedEntity &
+    Pick<UncombinedSeaerchResults, 'matchedFields'> &
+    Pick<UncombinedSeaerchResults, 'paths'>;
+
+export function combineSiblingsInSearchResults(
+    showSeparateSiblings: boolean,
+    searchResults: Array<UncombinedSeaerchResults> | undefined = [],
+): Array<CombinedSearchResult> {
+    const combine = createSiblingEntityCombiner();
+    const combinedSearchResults: Array<CombinedSearchResult> = [];
+
+    searchResults.forEach((searchResult) => {
+        const combinedResult = showSeparateSiblings
+            ? { combinedEntity: searchResult.entity, skipped: false }
+            : combine(searchResult.entity);
+        if (!combinedResult.skipped) {
+            combinedSearchResults.push({
+                ...searchResult,
+                ...combinedResult.combinedEntity,
+            });
+        }
+    });
+
+    return combinedSearchResults;
+}
diff --git a/datahub-web-react/src/app/searchV2/utils/constants.ts b/datahub-web-react/src/app/searchV2/utils/constants.ts
new file mode 100644
index 00000000000000..6c70bd73e297f0
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/utils/constants.ts
@@ -0,0 +1,187 @@
+import { EntityType } from '../../../types.generated';
+
+export const FILTER_URL_PREFIX = 'filter_';
+export const SEARCH_FOR_ENTITY_PREFIX = 'SEARCH__';
+export const EXACT_SEARCH_PREFIX = 'EXACT__';
+
+export const ENTITY_FILTER_NAME = '_entityType';
+export const LEGACY_ENTITY_FILTER_NAME = 'entity';
+export const ENTITY_INDEX_FILTER_NAME = '_index';
+export const ENTITY_SUB_TYPE_FILTER_NAME = '_entityType␞typeNames';
+export const TAGS_FILTER_NAME = 'tags';
+export const PROPOSED_TAGS_FILTER_NAME = 'proposedTags';
+export const PROPOSED_SCHEMA_TAGS_FILTER_NAME = 'proposedSchemaTags';
+export const GLOSSARY_TERMS_FILTER_NAME = 'glossaryTerms';
+export const PROPOSED_GLOSSARY_TERMS_FILTER_NAME = 'proposedGlossaryTerms';
+export const PROPOSED_SCHEMA_GLOSSARY_TERMS_FILTER_NAME = 'proposedSchemaGlossaryTerms';
+export const CONTAINER_FILTER_NAME = 'container';
+export const DOMAINS_FILTER_NAME = 'domains';
+export const DATA_PRODUCT_FILTER_NAME = 'dataProduct';
+export const OWNERS_FILTER_NAME = 'owners';
+export const TYPE_NAMES_FILTER_NAME = 'typeNames';
+export const PLATFORM_FILTER_NAME = 'platform';
+export const DATA_PLATFORM_INSTANCE_FILTER_NAME = 'platformInstance';
+export const FIELD_TAGS_FILTER_NAME = 'fieldTags';
+export const EDITED_FIELD_TAGS_FILTER_NAME = 'editedFieldTags';
+export const FIELD_GLOSSARY_TERMS_FILTER_NAME = 'fieldGlossaryTerms';
+export const EDITED_FIELD_GLOSSARY_TERMS_FILTER_NAME = 'editedFieldGlossaryTerms';
+export const FIELD_PATHS_FILTER_NAME = 'fieldPaths';
+export const FIELD_DESCRIPTIONS_FILTER_NAME = 'fieldDescriptions';
+export const EDITED_FIELD_DESCRIPTIONS_FILTER_NAME = 'editedFieldDescriptions';
+export const DESCRIPTION_FILTER_NAME = 'description';
+export const REMOVED_FILTER_NAME = 'removed';
+export const ORIGIN_FILTER_NAME = 'origin';
+export const DEGREE_FILTER_NAME = 'degree';
+export const BROWSE_PATH_V2_FILTER_NAME = 'browsePathV2';
+export const HAS_ACTIVE_INCIDENTS_FILTER_NAME = 'hasActiveIncidents';
+export const HAS_FAILING_ASSERTIONS_FILTER_NAME = 'hasFailingAssertions';
+export const CHART_TYPE_FILTER_NAME = 'type';
+export const LAST_MODIFIED_FILTER_NAME = 'lastModifiedAt';
+export const STRUCTURED_PROPERTIES_FILTER_NAME = 'structuredProperties.';
+export const ENTITY_TYPES_FILTER_NAME = 'entityTypes';
+export const IS_HIDDEN_PROPERTY_FILTER_NAME = 'isHidden';
+export const SHOW_IN_COLUMNS_TABLE_PROPERTY_FILTER_NAME = 'showInColumnsTable';
+export const SHOW_IN_ASSET_SUMMARY_PROPERTY_FILTER_NAME = 'showInAssetSummary';
+export const COMPLETED_FORMS_FILTER_NAME = 'completedForms';
+export const INCOMPLETE_FORMS_FILTER_NAME = 'incompleteForms';
+export const VERIFIED_FORMS_FILTER_NAME = 'verifiedForms';
+export const COMPLETED_FORMS_COMPLETED_PROMPT_IDS_FILTER_NAME = 'completedFormsCompletedPromptIds';
+export const INCOMPLETE_FORMS_COMPLETED_PROMPT_IDS_FILTER_NAME = 'incompleteFormsCompletedPromptIds';
+
+export const LEGACY_ENTITY_FILTER_FIELDS = [ENTITY_FILTER_NAME, LEGACY_ENTITY_FILTER_NAME];
+
+export const FILTER_DELIMITER = '␞';
+
+export const ENTITY_SUB_TYPE_FILTER_FIELDS = [
+    ENTITY_FILTER_NAME,
+    ENTITY_SUB_TYPE_FILTER_NAME,
+    LEGACY_ENTITY_FILTER_NAME,
+    TYPE_NAMES_FILTER_NAME,
+];
+
+export const FILTERS_TO_TRUNCATE = [
+    TAGS_FILTER_NAME,
+    GLOSSARY_TERMS_FILTER_NAME,
+    CONTAINER_FILTER_NAME,
+    DOMAINS_FILTER_NAME,
+    OWNERS_FILTER_NAME,
+    ENTITY_FILTER_NAME,
+    TYPE_NAMES_FILTER_NAME,
+    PLATFORM_FILTER_NAME,
+];
+export const TRUNCATED_FILTER_LENGTH = 5;
+
+export const ORDERED_FIELDS = [
+    ENTITY_FILTER_NAME,
+    PLATFORM_FILTER_NAME,
+    OWNERS_FILTER_NAME,
+    TAGS_FILTER_NAME,
+    GLOSSARY_TERMS_FILTER_NAME,
+    DOMAINS_FILTER_NAME,
+    FIELD_TAGS_FILTER_NAME,
+    FIELD_GLOSSARY_TERMS_FILTER_NAME,
+    FIELD_PATHS_FILTER_NAME,
+    FIELD_DESCRIPTIONS_FILTER_NAME,
+    DESCRIPTION_FILTER_NAME,
+    CONTAINER_FILTER_NAME,
+    REMOVED_FILTER_NAME,
+    TYPE_NAMES_FILTER_NAME,
+    ORIGIN_FILTER_NAME,
+    DEGREE_FILTER_NAME,
+];
+
+export const FIELD_TO_LABEL = {
+    owners: 'Owner',
+    tags: 'Tag',
+    domains: 'Domain',
+    dataProduct: 'Data Product',
+    platform: 'Platform',
+    fieldTags: 'Column Tag',
+    glossaryTerms: 'Glossary Term',
+    fieldGlossaryTerms: 'Column Term',
+    fieldPaths: 'Column Name',
+    description: 'Description',
+    fieldDescriptions: 'Column Description',
+    removed: 'Soft Deleted',
+    entity: 'Entity Type',
+    entityType: 'Entity Type',
+    _entityType: 'Entity Type',
+    container: 'Container',
+    typeNames: 'Sub Type',
+    origin: 'Environment',
+    degree: 'Degree',
+    '_entityType␞typeNames': 'Type',
+    platformInstance: 'Platform Instance',
+    hasActiveIncidents: 'Has Active Incidents',
+    hasFailingAssertions: 'Has Failing Assertions',
+    [BROWSE_PATH_V2_FILTER_NAME]: 'Path',
+    [LAST_MODIFIED_FILTER_NAME]: 'Last Modified (In Source)',
+    [STRUCTURED_PROPERTIES_FILTER_NAME]: 'Structured Property',
+};
+
+export const ADVANCED_SEARCH_ONLY_FILTERS = [
+    FIELD_GLOSSARY_TERMS_FILTER_NAME,
+    EDITED_FIELD_GLOSSARY_TERMS_FILTER_NAME,
+    FIELD_TAGS_FILTER_NAME,
+    EDITED_FIELD_TAGS_FILTER_NAME,
+    FIELD_PATHS_FILTER_NAME,
+    DESCRIPTION_FILTER_NAME,
+    FIELD_DESCRIPTIONS_FILTER_NAME,
+    EDITED_FIELD_DESCRIPTIONS_FILTER_NAME,
+    REMOVED_FILTER_NAME,
+];
+
+export const ENTITY_TYPE_FIELDS = new Set([ENTITY_SUB_TYPE_FILTER_NAME]);
+
+export const BOOLEAN_FIELDS = new Set([
+    HAS_ACTIVE_INCIDENTS_FILTER_NAME,
+    HAS_FAILING_ASSERTIONS_FILTER_NAME,
+    REMOVED_FILTER_NAME,
+]);
+
+export const TEXT_FIELDS = new Set([DESCRIPTION_FILTER_NAME, FIELD_DESCRIPTIONS_FILTER_NAME, FIELD_PATHS_FILTER_NAME]);
+
+export const ENTITY_FIELDS = new Set([
+    CONTAINER_FILTER_NAME,
+    TAGS_FILTER_NAME,
+    OWNERS_FILTER_NAME,
+    FIELD_TAGS_FILTER_NAME,
+    FIELD_GLOSSARY_TERMS_FILTER_NAME,
+    PROPOSED_GLOSSARY_TERMS_FILTER_NAME,
+    PROPOSED_SCHEMA_GLOSSARY_TERMS_FILTER_NAME,
+    PROPOSED_TAGS_FILTER_NAME,
+    PROPOSED_SCHEMA_GLOSSARY_TERMS_FILTER_NAME,
+    DOMAINS_FILTER_NAME,
+    GLOSSARY_TERMS_FILTER_NAME,
+    DATA_PRODUCT_FILTER_NAME,
+]);
+
+export enum UnionType {
+    AND,
+    OR,
+}
+
+export const UNIT_SEPARATOR = '␟';
+
+export const FilterModes = {
+    BASIC: 'basic',
+    ADVANCED: 'advanced',
+} as const;
+
+export type FilterMode = (typeof FilterModes)[keyof typeof FilterModes];
+
+export const MAX_COUNT_VAL = 10000;
+
+export const ASSET_ENTITY_TYPES = [
+    EntityType.Dataset,
+    EntityType.Chart,
+    EntityType.Dashboard,
+    EntityType.DataFlow,
+    EntityType.DataJob,
+    EntityType.Mlfeature,
+    EntityType.MlfeatureTable,
+    EntityType.Mlmodel,
+    EntityType.MlmodelGroup,
+    EntityType.MlprimaryKey,
+    EntityType.Container,
+];
diff --git a/datahub-web-react/src/app/searchV2/utils/csvUtils.ts b/datahub-web-react/src/app/searchV2/utils/csvUtils.ts
new file mode 100644
index 00000000000000..f701b90ab78e4c
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/utils/csvUtils.ts
@@ -0,0 +1,25 @@
+export function downloadFile(data: string, title: string) {
+    const blobx = new Blob([data], { type: 'text/plain' }); // ! Blob
+    const elemx = window.document.createElement('a');
+    elemx.href = window.URL.createObjectURL(blobx); // ! createObjectURL
+    elemx.download = title;
+    elemx.style.display = 'none';
+    document.body.appendChild(elemx);
+    elemx.click();
+    document.body.removeChild(elemx);
+}
+
+function createCsvContents(fieldNames: string[], rows: string[][]): string {
+    let contents = `${fieldNames.join(',')}\n`;
+    rows.forEach((row) => {
+        // quotes need to be escaped for csvs -> " becomes ""
+        contents = contents.concat(`${row.map((rowEl) => `"${rowEl.replace(/"/g, '""')}"`).join(',')}\n`);
+    });
+
+    return contents;
+}
+
+export function downloadRowsAsCsv(fieldNames: string[], rows: string[][], title: string) {
+    const csvFileContents = createCsvContents(fieldNames, rows);
+    downloadFile(csvFileContents, title);
+}
diff --git a/datahub-web-react/src/app/searchV2/utils/filterSearchQuery.ts b/datahub-web-react/src/app/searchV2/utils/filterSearchQuery.ts
new file mode 100644
index 00000000000000..48df97dc77788f
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/utils/filterSearchQuery.ts
@@ -0,0 +1,5 @@
+import { SEARCH_FOR_ENTITY_PREFIX, EXACT_SEARCH_PREFIX } from './constants';
+
+export default function filterSearchQuery(v: string) {
+    return (v && v.startsWith(SEARCH_FOR_ENTITY_PREFIX)) || v.startsWith(EXACT_SEARCH_PREFIX) ? v.split('__')[1] : v;
+}
diff --git a/datahub-web-react/src/app/searchV2/utils/filterUtils.ts b/datahub-web-react/src/app/searchV2/utils/filterUtils.ts
new file mode 100644
index 00000000000000..9633788218f3f1
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/utils/filterUtils.ts
@@ -0,0 +1,215 @@
+import { FacetFilterInput, AndFilterInput, QuickFilter, EntityType } from '../../../types.generated';
+import { FilterSet } from '../../entity/shared/components/styled/search/types';
+import { QuickFilterField } from '../autoComplete/quickFilters/utils';
+import { UnionType } from './constants';
+
+/**
+ * Combines 2 sets of conjunctive filters in Disjunctive Normal Form
+ *
+ * Input:
+ *
+ *     conjunction1 -> [a, b]
+ *     conjunction2 -> [c, d]
+ *
+ * Output:
+ *
+ *   or: [{
+ *      and: [a, b, c, d]
+ *   }]
+ *
+ * @param conjunction1 a conjunctive set of filters
+ * @param conjunction2 a conjunctive set of filters
+ */
+const mergeConjunctions = (conjunction1: FacetFilterInput[], conjunction2: FacetFilterInput[]): AndFilterInput[] => {
+    return [
+        {
+            and: [...conjunction1, ...conjunction2],
+        },
+    ];
+};
+
+/**
+ * Combines 2 sets of disjunctive filters in Disjunctive Normal Form
+ *
+ * Input:
+ *
+ *     disjunction1 -> [a, b]
+ *     disjunction2 -> [c, d]
+ *
+ * Output:
+ *
+ *   or: [
+ *      {
+ *          and: [a, c]
+ *      },
+ *      {
+ *          and: [a, d]
+ *      },
+ *      {
+ *          and: [b, c]
+ *      },
+ *      {
+ *          and: [b, d]
+ *      }
+ *   ]
+ *
+ * @param disjunction1 a disjunctive set of filters
+ * @param disjunction2 a disjunctive set of filters
+ */
+const mergeDisjunctions = (disjunction1: FacetFilterInput[], disjunction2: FacetFilterInput[]): AndFilterInput[] => {
+    const finalOrFilters: AndFilterInput[] = [];
+
+    disjunction1.forEach((d1) => {
+        disjunction2.forEach((d2) => {
+            const andFilters = [d1, d2];
+            finalOrFilters.push({ and: andFilters });
+        });
+    });
+
+    return finalOrFilters;
+};
+
+/**
+ * Combines 2 sets of filters, one conjunctive and the other disjunctive in Disjunctive Normal Form
+ *
+ * Input:
+ *
+ *     conjunction -> [a, b]
+ *     disjunction -> [c, d]
+ *
+ * Output:
+ *
+ *   or: [
+ *      {
+ *        and: [a, b, c]
+ *      },
+ *      {
+ *        and: [a, b, d]
+ *      }
+ *   ]
+ *
+ * @param conjunction a conjunctive set of filters
+ * @param disjunction a disjunctive set of filters
+ */
+const mergeConjunctionDisjunction = (
+    conjunction: FacetFilterInput[],
+    disjunction: FacetFilterInput[],
+): AndFilterInput[] => {
+    const finalOrFilters: AndFilterInput[] = [];
+
+    disjunction.forEach((filter) => {
+        const andFilters = [filter, ...conjunction];
+        finalOrFilters.push({ and: andFilters });
+    });
+
+    return finalOrFilters;
+};
+
+/**
+ * Merges the "fixed" set of disjunctive (OR) filters with a
+ * set of base filters that are themselves joined by a logical operator (AND, OR)
+ *
+ * It does this by producing a set of filters that model the Disjunctive Normal Form,
+ * which is a way of representing any boolean logical operator as an OR (disjunction) performed
+ * across a set of AND (conjunctions) conditions.
+ *
+ * @param orFilters the fixed set of filters in disjunction
+ * @param baseFilters a base set of filters in either conjunction or disjunction
+ */
+const mergeOrFilters = (orFilters: FacetFilterInput[], baseFilters: FilterSet): AndFilterInput[] => {
+    // If the user-provided union type is AND, we need to treat differenty
+    // than if user-provided union type is OR.
+    if (baseFilters.unionType === UnionType.AND) {
+        return mergeConjunctionDisjunction(baseFilters.filters, orFilters);
+    }
+    return mergeDisjunctions(orFilters, baseFilters.filters);
+};
+
+/**
+ * Merges the "fixed" set of conjunctive (AND) filters with a
+ * set of base filters that are themselves joined by a logical operator (AND, OR)
+ *
+ * It does this by producing a set of filters that model the Disjunctive Normal Form,
+ * which is a way of representing any boolean logical operator as an OR (disjunction) performed
+ * across a set of AND (conjunctions) conditions.
+ *
+ * @param andFilters the fixed set of filters in conjunction
+ * @param baseFilters a base set of filters in either conjunction or disjunction
+ */
+const mergeAndFilters = (andFilters: FacetFilterInput[], baseFilters: FilterSet): AndFilterInput[] => {
+    // If the user-provided union type is AND, we need to treat differenty
+    // than if user-provided union type is OR.
+    if (baseFilters.unionType === UnionType.AND) {
+        return mergeConjunctions(andFilters, baseFilters.filters);
+    }
+    return mergeConjunctionDisjunction(andFilters, baseFilters.filters);
+};
+
+/**
+ * Merges in a set of Fixed Filters with user-provided base filters.
+ * Both arguments are required.
+ *
+ * @param filterSet1 the fixed set of filters to be merged.
+ * @param filterSet2 the set of base filters to merge into.
+ */
+export const mergeFilterSets = (filterSet1: FilterSet, filterSet2: FilterSet): AndFilterInput[] => {
+    if (filterSet1 && filterSet2) {
+        if (filterSet1.unionType === UnionType.AND) {
+            // Inject fixed AND filters.
+            return mergeAndFilters(filterSet1.filters, filterSet2);
+        }
+        // Inject fixed OR filters.
+        return mergeOrFilters(filterSet1.filters, filterSet2);
+    }
+    return [];
+};
+
+function generateFilterInputFromQuickFilter(selectedQuickFilter: QuickFilter) {
+    return { field: selectedQuickFilter.field, values: [selectedQuickFilter.value] };
+}
+
+/**
+ * Generates a list of a singular facet filter with the selected quick filter.
+ * If no selected quick filter, return an empty list
+ */
+export function getFiltersWithQuickFilter(selectedQuickFilter: QuickFilter | null) {
+    const filters: FacetFilterInput[] = [];
+    if (selectedQuickFilter) {
+        filters.push(generateFilterInputFromQuickFilter(selectedQuickFilter));
+    }
+    return filters;
+}
+
+export function getAutoCompleteInputFromQuickFilter(selectedQuickFilter: QuickFilter | null) {
+    const filters: FacetFilterInput[] = [];
+    const types: EntityType[] = [];
+    if (selectedQuickFilter) {
+        if (selectedQuickFilter.field === QuickFilterField.Entity) {
+            types.push(selectedQuickFilter.value as EntityType);
+        } else if (selectedQuickFilter.field === QuickFilterField.Platform) {
+            filters.push(generateFilterInputFromQuickFilter(selectedQuickFilter));
+        }
+    }
+
+    return { filters, types };
+}
+
+/**
+ * Takes in two different orFilters inputs and combines them into a singular orFilters
+ */
+export function combineOrFilters(orFilter1: AndFilterInput[], orFilter2: AndFilterInput[]): AndFilterInput[] {
+    if (orFilter1.length === 0) return orFilter2;
+    if (orFilter2.length === 0) return orFilter1;
+
+    const mergedFilter: AndFilterInput[] = [];
+
+    orFilter1.forEach((filter1And) => {
+        orFilter2.forEach((filter2And) => {
+            mergedFilter.push({
+                and: [...(filter1And.and || []), ...(filter2And.and || [])],
+            });
+        });
+    });
+
+    return mergedFilter;
+}
diff --git a/datahub-web-react/src/app/searchV2/utils/filtersToQueryStringParams.ts b/datahub-web-react/src/app/searchV2/utils/filtersToQueryStringParams.ts
new file mode 100644
index 00000000000000..fc34dad1467a36
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/utils/filtersToQueryStringParams.ts
@@ -0,0 +1,36 @@
+import { FacetFilterInput, FilterOperator } from '../../../types.generated';
+import { encodeComma } from '../../entity/shared/utils';
+import { DEGREE_FILTER_NAME, FILTER_URL_PREFIX } from './constants';
+
+export const URL_PARAM_SEPARATOR = '___';
+
+// In the checkbox-based filter view, usually, selecting two facets ANDs them together.
+// E.g., if you select the checkbox for tagA and tagB, that means "has tagA AND tagB"
+// we need to special case `degree` filter since it is a OR grouping vs the others which are ANDS by default
+function reduceFiltersToCombineDegreeFilters(acc: FacetFilterInput[], filter: FacetFilterInput) {
+    // if we see a `degree` filter and we already have one, combine it with the other degree filter
+    if (filter.field === DEGREE_FILTER_NAME && acc.filter((f) => f.field === DEGREE_FILTER_NAME).length > 0) {
+        // instead of appending this new degree filter, combine it with the previous one and continue
+        return acc.map((f) =>
+            f.field === DEGREE_FILTER_NAME ? { ...f, values: [...(f.values || []), ...(filter.values || [])] } : f,
+        ) as FacetFilterInput[];
+    }
+    return [...acc, filter] as FacetFilterInput[];
+}
+
+// we need to reformat our list of filters into a dict
+function reduceFiltersIntoQueryStringDict(acc, filter, idx) {
+    acc[
+        `${FILTER_URL_PREFIX}${filter.field}${URL_PARAM_SEPARATOR}${String(!!filter.negated)}${URL_PARAM_SEPARATOR}${
+            filter.condition || FilterOperator.Equal
+        }${URL_PARAM_SEPARATOR}${idx}`
+    ] = [...filter.values.map((value) => encodeComma(value))];
+    return acc;
+}
+
+// transform filters from [{ filter, value }, { filter, value }] to { filter: [value, value ] } that QueryString can parse
+export default function filtersToQueryStringParams(filters: Array<FacetFilterInput> = []) {
+    return filters
+        .reduce(reduceFiltersToCombineDegreeFilters, [])
+        .reduce(reduceFiltersIntoQueryStringDict, {} as Record<string, string[]>);
+}
diff --git a/datahub-web-react/src/app/searchV2/utils/generateOrFilters.ts b/datahub-web-react/src/app/searchV2/utils/generateOrFilters.ts
new file mode 100644
index 00000000000000..f8cf754fcbc6d9
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/utils/generateOrFilters.ts
@@ -0,0 +1,81 @@
+import { FacetFilterInput, AndFilterInput, FilterOperator } from '../../../types.generated';
+import { FrontendFacetFilterInput, FrontendFilterOperator } from '../filters/types';
+import { FILTER_DELIMITER, UnionType } from './constants';
+
+// Generates a list of AND filter inputs to be combined in orFilters. This is used when unionType is OR or AND.
+// When unionType = OR, pass in empty `filters` so the nested filters live alone in their AND statement.
+// When unionType = AND, pass in all filters to combine with each nested filter to get AND between filter types,
+// but OR within a nested filter.
+function generateInputWithNestedFilters(filters: FacetFilterInput[], nestedFilters: FacetFilterInput[]) {
+    const filtersWithNestedFilters: AndFilterInput[] = [];
+
+    nestedFilters.forEach((nestedFilter) => {
+        const [entity, subType] = nestedFilter.field.split(FILTER_DELIMITER);
+        nestedFilter.values?.forEach((value) => {
+            const [entityValue, subTypeValue] = value.split(FILTER_DELIMITER);
+            const andFilters = [...filters, { field: entity, values: [entityValue] }];
+            if (subTypeValue) {
+                andFilters.push({
+                    field: subType,
+                    values: [subTypeValue],
+                    condition: nestedFilter.condition,
+                    negated: nestedFilter.negated,
+                });
+            }
+            filtersWithNestedFilters.push({ and: andFilters });
+        });
+    });
+
+    return filtersWithNestedFilters;
+}
+
+function isAllEqualsFilter(filter: FacetFilterInput | FrontendFacetFilterInput) {
+    return (filter.condition as any) === FrontendFilterOperator.AllEqual;
+}
+
+function filterOutAllEqualsFilters(filters: (FacetFilterInput | FrontendFacetFilterInput)[]): FacetFilterInput[] {
+    return filters.filter((f) => f.condition !== FrontendFilterOperator.AllEqual) as FacetFilterInput[];
+}
+
+export function generateOrFilters(
+    unionType: UnionType,
+    filters: (FacetFilterInput | FrontendFacetFilterInput)[],
+    excludedFilterFields: string[] = [],
+): AndFilterInput[] {
+    if ((filters?.length || 0) === 0) {
+        return [];
+    }
+
+    const finalFilters: FacetFilterInput[] = filterOutAllEqualsFilters(filters);
+    filters.filter(isAllEqualsFilter).forEach((filterToSplit) => {
+        filterToSplit.values?.forEach((value) => {
+            finalFilters.push({ ...filterToSplit, value, values: [value], condition: FilterOperator.Equal });
+        });
+    });
+
+    const nonNestedFilters = finalFilters.filter(
+        (f) => !f.field.includes(FILTER_DELIMITER) && !excludedFilterFields?.includes(f.field),
+    );
+    const nestedFilters = finalFilters.filter(
+        (f) => f.field.includes(FILTER_DELIMITER) && !excludedFilterFields?.includes(f.field),
+    );
+
+    if (unionType === UnionType.OR) {
+        const orFiltersWithNestedFilters = generateInputWithNestedFilters([], nestedFilters);
+        const orFilters = nonNestedFilters.map((filter) => ({
+            and: [filter],
+        }));
+        return [...orFilters, ...orFiltersWithNestedFilters];
+    }
+    const andFiltersWithNestedFilters = generateInputWithNestedFilters(nonNestedFilters, nestedFilters);
+
+    if (andFiltersWithNestedFilters.length) {
+        return andFiltersWithNestedFilters;
+    }
+
+    return [
+        {
+            and: nonNestedFilters,
+        },
+    ];
+}
diff --git a/datahub-web-react/src/app/searchV2/utils/hasAdvancedFilters.ts b/datahub-web-react/src/app/searchV2/utils/hasAdvancedFilters.ts
new file mode 100644
index 00000000000000..e1b7c104b974b4
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/utils/hasAdvancedFilters.ts
@@ -0,0 +1,12 @@
+import { FacetFilterInput } from '../../../types.generated';
+import { ADVANCED_SEARCH_ONLY_FILTERS, UnionType } from './constants';
+
+// utility method that looks at the set of filters and determines if the filters can be represented by simple search
+export const hasAdvancedFilters = (filters: FacetFilterInput[], unionType: UnionType) => {
+    return (
+        filters.filter(
+            (filter) =>
+                ADVANCED_SEARCH_ONLY_FILTERS.indexOf(filter.field) >= 0 || filter.negated || unionType === UnionType.OR,
+        ).length > 0
+    );
+};
diff --git a/datahub-web-react/src/app/searchV2/utils/navigateToSearchUrl.ts b/datahub-web-react/src/app/searchV2/utils/navigateToSearchUrl.ts
new file mode 100644
index 00000000000000..ad5536ff04c52d
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/utils/navigateToSearchUrl.ts
@@ -0,0 +1,38 @@
+import * as QueryString from 'query-string';
+import { RouteComponentProps } from 'react-router-dom';
+import filtersToQueryStringParams from './filtersToQueryStringParams';
+import { FacetFilterInput } from '../../../types.generated';
+import { PageRoutes } from '../../../conf/Global';
+import { UnionType } from './constants';
+
+export const navigateToSearchUrl = ({
+    query,
+    filters,
+    page = 1,
+    unionType = UnionType.AND,
+    selectedSortOption,
+    history,
+}: {
+    query?: string;
+    page?: number;
+    filters?: Array<FacetFilterInput>;
+    history: RouteComponentProps['history'];
+    selectedSortOption?: string;
+    unionType?: UnionType;
+}) => {
+    const search = QueryString.stringify(
+        {
+            ...filtersToQueryStringParams(filters || []),
+            query: encodeURIComponent(query || ''),
+            page,
+            unionType,
+            sortOption: selectedSortOption,
+        },
+        { arrayFormat: 'comma' },
+    );
+
+    history.push({
+        pathname: `${PageRoutes.SEARCH}`,
+        search,
+    });
+};
diff --git a/datahub-web-react/src/app/searchV2/utils/types.ts b/datahub-web-react/src/app/searchV2/utils/types.ts
new file mode 100644
index 00000000000000..7631bf095a4bb7
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/utils/types.ts
@@ -0,0 +1,35 @@
+import { AndFilterInput, EntityType, FacetMetadata, SearchFlags } from '../../../types.generated';
+import { SearchResultInterface } from '../../entity/shared/components/styled/search/types';
+
+/**
+ * Input required to download a specific page of search results.
+ */
+export type DownloadSearchResultsInput = {
+    scrollId: string | null | undefined;
+    types?: Array<EntityType> | null;
+    query: string;
+    count?: number | null;
+    orFilters?: Array<AndFilterInput> | null;
+    viewUrn?: string | null;
+    searchFlags?: SearchFlags | null;
+};
+
+/**
+ * Params required to use GraphQL to fetch a specific page of search results.
+ */
+export type DownloadSearchResultsParams = {
+    variables: {
+        input: DownloadSearchResultsInput;
+    };
+} & Record<string, any>;
+
+/**
+ * The result of downloading a specific page of search results.
+ */
+export type DownloadSearchResults = {
+    nextScrollId: string | undefined | null;
+    count: number;
+    total: number;
+    searchResults: Array<SearchResultInterface>;
+    facets?: Array<FacetMetadata>;
+};
diff --git a/datahub-web-react/src/app/searchV2/utils/useDownloadScrollAcrossEntitiesSearchResults.ts b/datahub-web-react/src/app/searchV2/utils/useDownloadScrollAcrossEntitiesSearchResults.ts
new file mode 100644
index 00000000000000..dd71834b29d2ab
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/utils/useDownloadScrollAcrossEntitiesSearchResults.ts
@@ -0,0 +1,51 @@
+import { useGetDownloadScrollResultsQuery } from '../../../graphql/scroll.generated';
+import { DownloadSearchResults, DownloadSearchResultsInput, DownloadSearchResultsParams } from './types';
+
+/**
+ * Hook for use in downloading a single page of search results via the Scroll API.
+ *
+ * @param params the param to be fed into the GraphQL query
+ */
+export function useDownloadScrollAcrossEntitiesSearchResults(params: DownloadSearchResultsParams) {
+    const { data, loading, error, refetch } = useGetDownloadScrollResultsQuery({
+        ...params,
+        variables: {
+            input: {
+                types: params.variables.input.types,
+                orFilters: params.variables.input.orFilters,
+                query: params.variables.input.query,
+                scrollId: params.variables.input.scrollId,
+                count: params.variables.input.count,
+                viewUrn: params.variables.input.viewUrn,
+                searchFlags: params.variables.input.searchFlags,
+            },
+        },
+    });
+    return {
+        searchResults:
+            ((data?.scrollAcrossEntities && {
+                ...data?.scrollAcrossEntities,
+                nextScrollId: data?.scrollAcrossEntities?.nextScrollId,
+            }) as DownloadSearchResults) || undefined,
+        loading,
+        error,
+        refetch: (input: DownloadSearchResultsInput) =>
+            refetch({
+                input: {
+                    types: input.types,
+                    orFilters: input.orFilters,
+                    query: input.query,
+                    scrollId: input.scrollId,
+                    count: input.count,
+                    viewUrn: input.viewUrn,
+                    searchFlags: input.searchFlags,
+                },
+            }).then(
+                (res) =>
+                    ((res.data?.scrollAcrossEntities && {
+                        ...res.data?.scrollAcrossEntities,
+                        nextScrollId: res.data?.scrollAcrossEntities?.nextScrollId,
+                    }) as DownloadSearchResults) || undefined,
+            ),
+    };
+}
diff --git a/datahub-web-react/src/app/searchV2/utils/useFilters.ts b/datahub-web-react/src/app/searchV2/utils/useFilters.ts
new file mode 100644
index 00000000000000..31ff653c9dd315
--- /dev/null
+++ b/datahub-web-react/src/app/searchV2/utils/useFilters.ts
@@ -0,0 +1,45 @@
+import { useMemo } from 'react';
+import * as QueryString from 'query-string';
+
+import { ENTITY_FILTER_NAME, FILTER_URL_PREFIX, LEGACY_ENTITY_FILTER_NAME } from './constants';
+import { FacetFilterInput, FilterOperator } from '../../../types.generated';
+import { decodeComma } from '../../entity/shared/utils';
+import { URL_PARAM_SEPARATOR } from './filtersToQueryStringParams';
+
+function ifLegacyFieldNameTranslate(fieldName) {
+    if (fieldName === LEGACY_ENTITY_FILTER_NAME) {
+        return ENTITY_FILTER_NAME;
+    }
+    return fieldName;
+}
+
+export default function useFilters(params: QueryString.ParsedQuery<string>): Array<FacetFilterInput> {
+    return useMemo(() => {
+        return (
+            Object.entries(params)
+                // select only the ones with the `filter_` prefix
+                .filter(([key, _]) => key.indexOf(FILTER_URL_PREFIX) >= 0)
+                // transform the filters currently in format [key, [value1, value2]] to [{key: key, value: value1}, { key: key, value: value2}] format that graphql expects
+                .map(([key, value]) => {
+                    // remove the `filter_` prefix
+                    const fieldIndex = key.replace(FILTER_URL_PREFIX, '');
+                    const fieldParts = fieldIndex.split(URL_PARAM_SEPARATOR);
+                    const field = ifLegacyFieldNameTranslate(fieldParts[0]);
+                    const negated = fieldParts[1] === 'true';
+                    const condition = fieldParts[2] || FilterOperator.Equal;
+                    if (!value) return null;
+
+                    if (Array.isArray(value)) {
+                        return {
+                            field,
+                            condition,
+                            negated,
+                            values: value.map((distinctValue) => decodeComma(distinctValue)),
+                        };
+                    }
+                    return { field, condition, values: [decodeComma(value)], negated };
+                })
+                .filter((val) => !!val) as Array<FacetFilterInput>
+        );
+    }, [params]);
+}
diff --git a/datahub-web-react/src/app/settings/Preferences.tsx b/datahub-web-react/src/app/settings/Preferences.tsx
index 6bba1b18294eaa..728958629b6713 100644
--- a/datahub-web-react/src/app/settings/Preferences.tsx
+++ b/datahub-web-react/src/app/settings/Preferences.tsx
@@ -1,12 +1,12 @@
+import { Card, Divider, message, Switch, Typography } from 'antd';
 import React from 'react';
 import styled from 'styled-components';
-import { Divider, Typography, Switch, Card, message } from 'antd';
-
 import { useUpdateUserSettingMutation } from '../../graphql/me.generated';
 import { UserSetting } from '../../types.generated';
-import { ANTD_GRAY } from '../entity/shared/constants';
 import analytics, { EventType } from '../analytics';
 import { useUserContext } from '../context/useUserContext';
+import { ANTD_GRAY } from '../entity/shared/constants';
+import { useIsThemeV2, useIsThemeV2EnabledForUser, useIsThemeV2Toggleable } from '../useIsThemeV2';
 
 const Page = styled.div`
     width: 100%;
@@ -54,10 +54,15 @@ const SettingText = styled(Typography.Text)`
 export const Preferences = () => {
     // Current User Urn
     const { user, refetchUser } = useUserContext();
-
+    const isThemeV2 = useIsThemeV2();
+    const [isThemeV2Toggleable] = useIsThemeV2Toggleable();
+    const [isThemeV2EnabledForUser] = useIsThemeV2EnabledForUser();
     const showSimplifiedHomepage = !!user?.settings?.appearance?.showSimplifiedHomepage;
+
     const [updateUserSettingMutation] = useUpdateUserSettingMutation();
 
+    const showSimplifiedHomepageSetting = !isThemeV2;
+
     return (
         <Page>
             <SourceContainer>
@@ -68,39 +73,83 @@ export const Preferences = () => {
                     </TokensHeaderContainer>
                 </TokensContainer>
                 <Divider />
-                <Card>
-                    <UserSettingRow>
-                        <span>
-                            <SettingText>Show simplified homepage </SettingText>
-                            <div>
-                                <DescriptionText>
-                                    Limits entity browse cards on homepage to Domains, Charts, Datasets, Dashboards and
-                                    Glossary Terms
-                                </DescriptionText>
-                            </div>
-                        </span>
-                        <Switch
-                            checked={showSimplifiedHomepage}
-                            onChange={async () => {
-                                await updateUserSettingMutation({
-                                    variables: {
-                                        input: {
-                                            name: UserSetting.ShowSimplifiedHomepage,
-                                            value: !showSimplifiedHomepage,
+                {showSimplifiedHomepageSetting && (
+                    <Card>
+                        <UserSettingRow>
+                            <span>
+                                <SettingText>Show simplified homepage </SettingText>
+                                <div>
+                                    <DescriptionText>
+                                        Limits entity browse cards on homepage to Domains, Charts, Datasets, Dashboards
+                                        and Glossary Terms
+                                    </DescriptionText>
+                                </div>
+                            </span>
+                            <Switch
+                                checked={showSimplifiedHomepage}
+                                onChange={async () => {
+                                    await updateUserSettingMutation({
+                                        variables: {
+                                            input: {
+                                                name: UserSetting.ShowSimplifiedHomepage,
+                                                value: !showSimplifiedHomepage,
+                                            },
                                         },
-                                    },
-                                });
-                                analytics.event({
-                                    type: showSimplifiedHomepage
-                                        ? EventType.ShowStandardHomepageEvent
-                                        : EventType.ShowSimplifiedHomepageEvent,
-                                });
-                                message.success({ content: 'Setting updated!', duration: 2 });
-                                refetchUser?.();
-                            }}
-                        />
-                    </UserSettingRow>
-                </Card>
+                                    });
+                                    analytics.event({
+                                        type: showSimplifiedHomepage
+                                            ? EventType.ShowStandardHomepageEvent
+                                            : EventType.ShowSimplifiedHomepageEvent,
+                                    });
+                                    message.success({ content: 'Setting updated!', duration: 2 });
+                                    refetchUser?.();
+                                }}
+                            />
+                        </UserSettingRow>
+                    </Card>
+                )}
+                {isThemeV2Toggleable && (
+                    <>
+                        <Card style={{ marginTop: 20 }}>
+                            <UserSettingRow>
+                                <span>
+                                    <SettingText>Try New User Experience</SettingText>
+                                    <div>
+                                        <DescriptionText>
+                                            Enable an early preview of the new DataHub UX - a complete makeover for your
+                                            app with a sleek new design and advanced features. Flip the switch and
+                                            refresh your browser to try it out!
+                                        </DescriptionText>
+                                    </div>
+                                </span>
+                                <Switch
+                                    checked={isThemeV2EnabledForUser}
+                                    onChange={async () => {
+                                        await updateUserSettingMutation({
+                                            variables: {
+                                                input: {
+                                                    name: UserSetting.ShowThemeV2,
+                                                    value: !isThemeV2EnabledForUser,
+                                                },
+                                            },
+                                        });
+                                        // clicking this button toggles, so event is whatever is opposite to what isThemeV2EnabledForUser currently is
+                                        analytics.event({
+                                            type: isThemeV2EnabledForUser
+                                                ? EventType.RevertV2ThemeEvent
+                                                : EventType.ShowV2ThemeEvent,
+                                        });
+                                        message.success({ content: 'Setting updated!', duration: 2 });
+                                        refetchUser?.();
+                                    }}
+                                />
+                            </UserSettingRow>
+                        </Card>
+                    </>
+                )}
+                {!showSimplifiedHomepageSetting && !isThemeV2Toggleable && (
+                    <div style={{ color: ANTD_GRAY[7] }}>No appearance settings found.</div>
+                )}
             </SourceContainer>
         </Page>
     );
diff --git a/datahub-web-react/src/app/settings/posts/PostsList.tsx b/datahub-web-react/src/app/settings/posts/PostsList.tsx
index b71f06c83c17fc..ae9835359d5307 100644
--- a/datahub-web-react/src/app/settings/posts/PostsList.tsx
+++ b/datahub-web-react/src/app/settings/posts/PostsList.tsx
@@ -5,6 +5,7 @@ import styled from 'styled-components';
 import * as QueryString from 'query-string';
 import { PlusOutlined } from '@ant-design/icons';
 import { AlignType } from 'rc-table/lib/interface';
+import { getHomePagePostsFilters } from '@app/utils/queryUtils';
 import CreatePostModal from './CreatePostModal';
 import { PostColumn, PostEntry, PostListMenuColumn } from './PostsListColumns';
 import { useEntityRegistry } from '../../useEntityRegistry';
@@ -62,6 +63,7 @@ export const PostList = () => {
                 start,
                 count: pageSize,
                 query,
+                orFilters: getHomePagePostsFilters(),
             },
         },
         fetchPolicy: query && query.length > 0 ? 'no-cache' : 'cache-first',
@@ -145,12 +147,12 @@ export const PostList = () => {
             {error && <Message type="error" content="Failed to load Posts! An unexpected error occurred." />}
             <PostsContainer>
                 <TabToolbar>
-                    <Button id="posts-create-post" type="text" onClick={() => setIsCreatingPost(true)}>
-                        <PlusOutlined /> New Post
+                    <Button data-testid="posts-create-post" type="text" onClick={() => setIsCreatingPost(true)}>
+                        <PlusOutlined /> New
                     </Button>
                     <SearchBar
                         initialQuery={query || ''}
-                        placeholderText="Search posts..."
+                        placeholderText="Search..."
                         suggestions={[]}
                         style={{
                             maxWidth: 220,
diff --git a/datahub-web-react/src/app/settings/posts/PostsListColumns.tsx b/datahub-web-react/src/app/settings/posts/PostsListColumns.tsx
index ee680cbec7396c..17c56b84131af1 100644
--- a/datahub-web-react/src/app/settings/posts/PostsListColumns.tsx
+++ b/datahub-web-react/src/app/settings/posts/PostsListColumns.tsx
@@ -1,16 +1,15 @@
 import React from 'react';
-// import { Typography } from 'antd';
 import styled from 'styled-components/macro';
 import { Maybe } from 'graphql/jsutils/Maybe';
 import PostItemMenu from './PostItemMenu';
 
 export interface PostEntry {
+    urn: string;
     title: string;
     contentType: string;
-    description: Maybe<string>;
-    urn: string;
-    link: string;
-    imageUrl: string;
+    description?: Maybe<string>;
+    link?: string | null;
+    imageUrl?: string;
 }
 
 const PostText = styled.div<{ minWidth?: number }>`
diff --git a/datahub-web-react/src/app/settingsV2/AccessTokenModal.tsx b/datahub-web-react/src/app/settingsV2/AccessTokenModal.tsx
new file mode 100644
index 00000000000000..10427210d06928
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/AccessTokenModal.tsx
@@ -0,0 +1,106 @@
+import React from 'react';
+import { Alert, Button, Modal, Typography } from 'antd';
+import styled from 'styled-components';
+import { InfoCircleOutlined } from '@ant-design/icons';
+
+const ModalSection = styled.div`
+    display: flex;
+    flex-direction: column;
+    padding-bottom: 12px;
+`;
+
+const ModalSectionHeader = styled(Typography.Text)`
+    &&&& {
+        padding: 0px;
+        margin: 0px;
+        margin-bottom: 4px;
+    }
+`;
+
+const ModalSectionParagraph = styled(Typography.Paragraph)`
+    &&&& {
+        padding: 0px;
+        margin: 0px;
+    }
+`;
+
+const StyledAlert = styled(Alert)`
+    padding-top: 12px;
+    padding-bottom: 12px;
+    margin-bottom: 20px;
+`;
+
+const StyledInfoCircleOutlined = styled(InfoCircleOutlined)`
+    margin-right: 8px;
+`;
+
+type Props = {
+    visible: boolean;
+    onClose: () => void;
+    accessToken: string;
+    expiresInText: string;
+};
+
+export const AccessTokenModal = ({ visible, onClose, accessToken, expiresInText }: Props) => {
+    const baseUrl = window.location.origin;
+    const accessTokenCurl = `curl -X POST '${baseUrl}/api/graphql' \\
+--header 'Authorization: Bearer ${accessToken}' \\
+--header 'Content-Type: application/json' \\
+--data-raw '{"query":"{\\n  me {\\n    corpUser {\\n        username\\n    }\\n  }\\n}","variables":{}}'`;
+
+    return (
+        <Modal
+            width={700}
+            title={
+                <Typography.Text>
+                    <b> New Personal Access Token</b>
+                </Typography.Text>
+            }
+            visible={visible}
+            onCancel={onClose}
+            footer={
+                <>
+                    <Button id="createTokenButton" onClick={onClose} data-testid="access-token-modal-close-button">
+                        Close
+                    </Button>
+                </>
+            }
+        >
+            <ModalSection>
+                <StyledAlert
+                    type="info"
+                    message={
+                        <span>
+                            <StyledInfoCircleOutlined />
+                            Make sure to copy your personal access token now. You won’t be able to see it again.
+                        </span>
+                    }
+                />
+            </ModalSection>
+            <ModalSection>
+                <ModalSectionHeader strong>Token</ModalSectionHeader>
+                <ModalSectionParagraph>{expiresInText}</ModalSectionParagraph>
+                <Typography.Paragraph copyable={{ text: accessToken }}>
+                    <pre data-testid="access-token-value">{accessToken}</pre>
+                </Typography.Paragraph>
+            </ModalSection>
+            <ModalSection>
+                <ModalSectionHeader strong>Usage</ModalSectionHeader>
+                <ModalSectionParagraph>
+                    To use the token, provide it as a <Typography.Text keyboard>Bearer</Typography.Text> token in the{' '}
+                    <Typography.Text keyboard>Authorization</Typography.Text> header when making API requests:
+                </ModalSectionParagraph>
+                <Typography.Paragraph copyable={{ text: accessTokenCurl }}>
+                    <pre>{accessTokenCurl}</pre>
+                </Typography.Paragraph>
+            </ModalSection>
+            <ModalSection>
+                <ModalSectionHeader strong>Learn More</ModalSectionHeader>
+                <ModalSectionParagraph>
+                    To learn more about the DataHub APIs, check out the
+                    <a href="https://www.datahubproject.io/docs/"> DataHub Docs.</a>
+                </ModalSectionParagraph>
+            </ModalSection>
+        </Modal>
+    );
+};
diff --git a/datahub-web-react/src/app/settingsV2/AccessTokens.tsx b/datahub-web-react/src/app/settingsV2/AccessTokens.tsx
new file mode 100644
index 00000000000000..7e2d5fdeffdcd7
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/AccessTokens.tsx
@@ -0,0 +1,451 @@
+import React, { useState, useMemo, useEffect } from 'react';
+import styled from 'styled-components';
+import { Alert, Button, Divider, Dropdown, Empty, message, Modal, Pagination, Select, Typography } from 'antd';
+import { DeleteOutlined, InfoCircleOutlined, PlusOutlined } from '@ant-design/icons';
+import { red } from '@ant-design/colors';
+import { EntityType, FacetFilterInput } from '../../types.generated';
+import { useListAccessTokensQuery, useRevokeAccessTokenMutation } from '../../graphql/auth.generated';
+import { Message } from '../shared/Message';
+import TabToolbar from '../entity/shared/components/styled/TabToolbar';
+import { StyledTable } from '../entity/shared/components/styled/StyledTable';
+import CreateTokenModal from './CreateTokenModal';
+import { getLocaleTimezone } from '../shared/time/timeUtils';
+import { scrollToTop } from '../shared/searchUtils';
+import analytics, { EventType } from '../analytics';
+import { useUserContext } from '../context/useUserContext';
+import { useAppConfig } from '../useAppConfig';
+import { useListUsersQuery } from '../../graphql/user.generated';
+import { OwnerLabel } from '../shared/OwnerLabel';
+import { useEntityRegistry } from '../useEntityRegistry';
+
+const SourceContainer = styled.div`
+    width: 100%;
+    padding-top: 20px;
+    padding-right: 40px;
+    padding-left: 40px;
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+`;
+
+const TokensContainer = styled.div`
+    padding-top: 0px;
+`;
+
+const TokensHeaderContainer = styled.div`
+    && {
+        padding-left: 0px;
+    }
+`;
+
+const TokensTitle = styled(Typography.Title)`
+    && {
+        margin-bottom: 8px;
+    }
+`;
+
+const StyledAlert = styled(Alert)`
+    padding-top: 12px;
+    padding-bottom: 12px;
+    margin-bottom: 20px;
+`;
+
+const StyledSelectOwner = styled(Select)`
+    margin-right: 15px;
+    width: 200px;
+`;
+
+const StyledSelect = styled(Select)`
+    margin-right: 15px;
+    min-width: 75px;
+`;
+
+const StyledInfoCircleOutlined = styled(InfoCircleOutlined)`
+    margin-right: 8px;
+`;
+
+const PersonTokenDescriptionText = styled(Typography.Paragraph)`
+    && {
+        max-width: 700px;
+        margin-top: 12px;
+        margin-bottom: 16px;
+    }
+`;
+
+const ActionButtonContainer = styled.div`
+    display: flex;
+    justify-content: right;
+`;
+
+const PaginationContainer = styled.div`
+    display: flex;
+    justify-content: center;
+`;
+
+const NeverExpireText = styled.span`
+    color: ${red[5]};
+`;
+
+const SelectContainer = styled.div`
+    display: flex;
+    align-items: flex-start;
+`;
+
+const DEFAULT_PAGE_SIZE = 10;
+
+export enum StatusType {
+    ALL,
+    EXPIRED,
+}
+
+export const AccessTokens = () => {
+    const [createTokenFor, setCreateTokenFor] = useState<'personal' | 'remote-executor' | undefined>(undefined);
+    const [removedTokens, setRemovedTokens] = useState<string[]>([]);
+    const [statusFilter, setStatusFilter] = useState(StatusType.ALL);
+    const [owner, setOwner] = useState('All');
+    const [filters, setFilters] = useState<Array<FacetFilterInput> | null>(null);
+    const [query, setQuery] = useState<undefined | string>(undefined);
+    // Current User Urn
+    const authenticatedUser = useUserContext();
+    const entityRegistry = useEntityRegistry();
+    const currentUserUrn = authenticatedUser?.user?.urn || '';
+
+    useEffect(() => {
+        if (currentUserUrn) {
+            setFilters([
+                {
+                    field: 'ownerUrn',
+                    values: [currentUserUrn],
+                },
+            ]);
+        }
+    }, [currentUserUrn]);
+
+    const isTokenAuthEnabled = useAppConfig().config?.authConfig?.tokenAuthEnabled;
+    const canGeneratePersonalAccessTokens =
+        isTokenAuthEnabled && authenticatedUser?.platformPrivileges?.generatePersonalAccessTokens;
+
+    const canManageToken = authenticatedUser?.platformPrivileges?.manageTokens;
+
+    // Access Tokens list paging.
+    const [page, setPage] = useState(1);
+    const pageSize = DEFAULT_PAGE_SIZE;
+    const start = (page - 1) * pageSize;
+
+    // Call list Access Token Mutation
+    const {
+        loading: tokensLoading,
+        error: tokensError,
+        data: tokensData,
+        refetch: tokensRefetch,
+    } = useListAccessTokensQuery({
+        skip: !canGeneratePersonalAccessTokens || !filters,
+        variables: {
+            input: {
+                start,
+                count: pageSize,
+                filters,
+            },
+        },
+    });
+
+    const { data: usersData } = useListUsersQuery({
+        skip: !canGeneratePersonalAccessTokens || !canManageToken,
+        variables: {
+            input: {
+                start,
+                count: 10,
+                query: (query?.length && query) || undefined,
+            },
+        },
+        fetchPolicy: 'no-cache',
+    });
+
+    useEffect(() => {
+        const timestamp = Date.now();
+        const lessThanStatus = { field: 'expiresAt', values: [`${timestamp}`], condition: 'LESS_THAN' };
+        if (canManageToken) {
+            const newFilters: any = owner && owner !== 'All' ? [{ field: 'ownerUrn', values: [owner] }] : [];
+            if (statusFilter === StatusType.EXPIRED) {
+                newFilters.push(lessThanStatus);
+            }
+            setFilters(newFilters);
+        } else if (filters && statusFilter === StatusType.EXPIRED) {
+            const currentUserFilters: any = [...filters];
+            currentUserFilters.push(lessThanStatus);
+            setFilters(currentUserFilters);
+        } else if (filters) {
+            setFilters(filters.filter((filter) => filter?.field !== 'expiresAt'));
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [canManageToken, owner, statusFilter]);
+
+    const renderSearchResult = (entity: any) => {
+        const { editableProperties } = entity;
+        const displayNameSearchResult = entityRegistry.getDisplayName(EntityType.CorpUser, entity);
+        const avatarUrl = editableProperties?.pictureLink || undefined;
+        return (
+            <Select.Option value={entity.urn} key={entity.urn}>
+                <OwnerLabel name={displayNameSearchResult} avatarUrl={avatarUrl} type={entity.type} />
+            </Select.Option>
+        );
+    };
+    const ownerResult = usersData?.listUsers?.users;
+
+    const ownerSearchOptions = ownerResult?.map((result) => {
+        return renderSearchResult(result);
+    });
+
+    const totalTokens = tokensData?.listAccessTokens.total || 0;
+    const tokens = useMemo(() => tokensData?.listAccessTokens.tokens || [], [tokensData]);
+    const filteredTokens = tokens.filter((token) => !removedTokens.includes(token.id));
+
+    const [revokeAccessToken, { error: revokeTokenError }] = useRevokeAccessTokenMutation();
+
+    // Revoke token Handler
+    const onRemoveToken = (token: any) => {
+        Modal.confirm({
+            title: 'Are you sure you want to revoke this token?',
+            content: `Anyone using this token will no longer be able to access the DataHub API. You cannot undo this action.`,
+            onOk() {
+                // Hack to deal with eventual consistency.
+                const newTokenIds = [...removedTokens, token.id];
+                setRemovedTokens(newTokenIds);
+
+                revokeAccessToken({ variables: { tokenId: token.id } })
+                    .then(({ errors }) => {
+                        if (!errors) {
+                            analytics.event({ type: EventType.RevokeAccessTokenEvent });
+                        }
+                    })
+                    .catch((e) => {
+                        message.destroy();
+                        message.error({ content: `Failed to revoke Token!: \n ${e.message || ''}`, duration: 3 });
+                    })
+                    .finally(() => {
+                        setTimeout(() => {
+                            tokensRefetch?.();
+                        }, 3000);
+                    });
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
+    const tableData = filteredTokens?.map((token) => ({
+        urn: token.urn,
+        type: token.type,
+        id: token.id,
+        name: token.name,
+        description: token.description,
+        actorUrn: token.actorUrn,
+        ownerUrn: token.ownerUrn,
+        createdAt: token.createdAt,
+        expiresAt: token.expiresAt,
+    }));
+
+    const tableColumns = [
+        {
+            title: 'Name',
+            dataIndex: 'name',
+            key: 'name',
+            render: (name: string) => <b>{name}</b>,
+        },
+        {
+            title: 'Description',
+            dataIndex: 'description',
+            key: 'description',
+            render: (description: string) => description || '',
+        },
+        {
+            title: 'Expires At',
+            dataIndex: 'expiresAt',
+            key: 'expiresAt',
+            render: (expiresAt: string) => {
+                if (expiresAt === null) return <NeverExpireText>Never</NeverExpireText>;
+                const localeTimezone = getLocaleTimezone();
+                const formattedExpireAt = new Date(expiresAt);
+                return (
+                    <span>{`${formattedExpireAt.toLocaleDateString()} at ${formattedExpireAt.toLocaleTimeString()} (${localeTimezone})`}</span>
+                );
+            },
+        },
+        {
+            title: 'Owner',
+            dataIndex: 'ownerUrn',
+            key: 'ownerUrn',
+            render: (ownerUrn: string) => {
+                if (!ownerUrn) return '';
+                const displayName = ownerUrn?.replace('urn:li:corpuser:', '');
+                const link = `/user/${ownerUrn}/owner of`;
+                const ownerName = displayName || '';
+                return <a href={link}>{ownerName}</a>;
+            },
+        },
+        {
+            title: '',
+            dataIndex: '',
+            key: 'x',
+            render: (_, record: any) => (
+                <ActionButtonContainer>
+                    <Button
+                        onClick={() => onRemoveToken(record)}
+                        icon={<DeleteOutlined />}
+                        danger
+                        data-testid="revoke-token-button"
+                    >
+                        Revoke
+                    </Button>
+                </ActionButtonContainer>
+            ),
+        },
+    ];
+
+    const filterColumns = canManageToken ? tableColumns : tableColumns.filter((column) => column.key !== 'ownerUrn');
+
+    const onChangePage = (newPage: number) => {
+        scrollToTop();
+        setPage(newPage);
+    };
+
+    return (
+        <SourceContainer>
+            {tokensLoading && !tokensData && (
+                <Message type="loading" content="Loading tokens..." style={{ marginTop: '10%' }} />
+            )}
+            {tokensError && message.error('Failed to load tokens :(')}
+            {revokeTokenError && message.error('Failed to update the Token :(')}
+            <TokensContainer>
+                <TokensHeaderContainer>
+                    <TokensTitle level={2}>Manage Access Tokens</TokensTitle>
+                    <Typography.Paragraph type="secondary">
+                        Manage Access Tokens for use with DataHub APIs.
+                    </Typography.Paragraph>
+                </TokensHeaderContainer>
+            </TokensContainer>
+            <Divider />
+            {isTokenAuthEnabled === false && (
+                <StyledAlert
+                    type="error"
+                    message={
+                        <span>
+                            <StyledInfoCircleOutlined />
+                            Token based authentication is currently disabled. Contact your DataHub administrator to
+                            enable this feature.
+                        </span>
+                    }
+                />
+            )}
+            <Typography.Title level={5}>Personal Access Tokens</Typography.Title>
+            <PersonTokenDescriptionText type="secondary">
+                Personal Access Tokens allow you to make programmatic requests to DataHub&apos;s APIs. They inherit your
+                privileges and have a finite lifespan. Do not share Personal Access Tokens.
+            </PersonTokenDescriptionText>
+            <TabToolbar>
+                <div>
+                    {/* NOTE: only for SaaS. If this is brought into OSS, we will need to disable the dropdown and have the button onClick open the personal token modal */}
+                    <Dropdown
+                        disabled={!canGeneratePersonalAccessTokens}
+                        placement="bottom"
+                        menu={{
+                            items: [
+                                {
+                                    key: 'personal',
+                                    className: 'personal-token-dropdown-option',
+                                    label: 'Personal Token',
+                                    onClick: () => setCreateTokenFor('personal'),
+                                },
+                                {
+                                    key: 'remote-executor',
+                                    className: 'remote-executor-dropdown-option',
+                                    label: 'Remote Executor',
+                                    onClick: () => setCreateTokenFor('remote-executor'),
+                                },
+                            ],
+                        }}
+                    >
+                        <Button type="text" data-testid="add-token-button" disabled={!canGeneratePersonalAccessTokens}>
+                            <PlusOutlined /> Generate new token
+                        </Button>
+                    </Dropdown>
+                </div>
+                <SelectContainer>
+                    {canGeneratePersonalAccessTokens && canManageToken && (
+                        <>
+                            <StyledSelectOwner
+                                showSearch
+                                placeholder="Search for owner"
+                                optionFilterProp="children"
+                                allowClear
+                                filterOption={false}
+                                defaultActiveFirstOption={false}
+                                onSelect={(ownerData: any) => {
+                                    setOwner(ownerData);
+                                }}
+                                onClear={() => {
+                                    setQuery('');
+                                    setOwner('All');
+                                }}
+                                onSearch={(value: string) => {
+                                    setQuery(value.trim());
+                                }}
+                                style={{ width: 200 }}
+                            >
+                                {ownerSearchOptions}
+                            </StyledSelectOwner>
+                        </>
+                    )}
+                    {canGeneratePersonalAccessTokens && (
+                        <StyledSelect
+                            value={statusFilter}
+                            onChange={(selection) => setStatusFilter(selection as StatusType)}
+                            style={{ width: 100 }}
+                        >
+                            <Select.Option value={StatusType.ALL} key="ALL">
+                                All
+                            </Select.Option>
+                            <Select.Option value={StatusType.EXPIRED} key="EXPIRED">
+                                Expired
+                            </Select.Option>
+                        </StyledSelect>
+                    )}
+                </SelectContainer>
+            </TabToolbar>
+            <StyledTable
+                columns={filterColumns}
+                dataSource={tableData}
+                rowKey="urn"
+                locale={{
+                    emptyText: <Empty description="No Access Tokens!" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
+                }}
+                pagination={false}
+            />
+            <PaginationContainer>
+                <Pagination
+                    style={{ margin: 40 }}
+                    current={page}
+                    pageSize={pageSize}
+                    total={totalTokens}
+                    showLessItems
+                    onChange={onChangePage}
+                    showSizeChanger={false}
+                />
+            </PaginationContainer>
+            <CreateTokenModal
+                currentUserUrn={currentUserUrn}
+                visible={!!createTokenFor}
+                forRemoteExecutor={createTokenFor === 'remote-executor'}
+                onClose={() => setCreateTokenFor(undefined)}
+                onCreateToken={() => {
+                    // Hack to deal with eventual consistency.
+                    setTimeout(() => {
+                        tokensRefetch?.();
+                    }, 3000);
+                }}
+            />
+        </SourceContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/settingsV2/CreateTokenModal.tsx b/datahub-web-react/src/app/settingsV2/CreateTokenModal.tsx
new file mode 100644
index 00000000000000..53c877629d1a27
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/CreateTokenModal.tsx
@@ -0,0 +1,217 @@
+import React, { useState, useEffect } from 'react';
+import { message, Button, Input, Modal, Typography, Form, Select } from 'antd';
+import styled from 'styled-components';
+import { red } from '@ant-design/colors';
+
+import { useEnterKeyListener } from '../shared/useEnterKeyListener';
+import { ACCESS_TOKEN_DURATIONS, getTokenExpireDate } from './utils';
+import { useCreateAccessTokenMutation } from '../../graphql/auth.generated';
+import { AccessTokenDuration, AccessTokenType, CreateAccessTokenInput } from '../../types.generated';
+import { AccessTokenModal } from './AccessTokenModal';
+import analytics, { EventType } from '../analytics';
+
+type Props = {
+    currentUserUrn: string;
+    visible: boolean;
+    forRemoteExecutor?: boolean;
+    onClose: () => void;
+    onCreateToken: () => void;
+};
+
+type FormProps = {
+    name: string;
+    description?: string;
+    duration: AccessTokenDuration;
+};
+
+const ExpirationSelectContainer = styled.div`
+    padding: 1px;
+`;
+
+const ExpirationDurationSelect = styled(Select)`
+    && {
+        width: 100%;
+        margin-top: 1em;
+        margin-bottom: 1em;
+    }
+`;
+
+const OptionText = styled.span<{ isRed: boolean }>`
+    ${(props) => props.isRed && `color: ${red[5]}`}
+`;
+
+export default function CreateTokenModal({
+    currentUserUrn,
+    forRemoteExecutor,
+    visible,
+    onClose,
+    onCreateToken,
+}: Props) {
+    const [selectedTokenDuration, setSelectedTokenDuration] = useState<AccessTokenDuration | null>(null);
+
+    const [showModal, setShowModal] = useState(false);
+    const [createButtonEnabled, setCreateButtonEnabled] = useState(true);
+
+    const [createAccessToken, { data }] = useCreateAccessTokenMutation();
+
+    const [form] = Form.useForm<FormProps>();
+
+    // For remote executors they default to never
+    useEffect(() => {
+        if (forRemoteExecutor) {
+            form.setFieldValue('duration', AccessTokenDuration.NoExpiry);
+        }
+    }, [forRemoteExecutor, form]);
+
+    // Check and show the modal once the data for createAccessToken will generate
+    useEffect(() => {
+        if (data && data.createAccessToken?.accessToken) {
+            setShowModal(true);
+        }
+    }, [data, setShowModal]);
+
+    // Function to handle the close or cross button of Access Token Modal
+    const onDetailModalClose = () => {
+        setSelectedTokenDuration(null);
+        setShowModal(false);
+        onClose();
+    };
+
+    // Function to handle the close or cross button of Create Token Modal
+    const onModalClose = () => {
+        form.resetFields();
+        onClose();
+    };
+
+    const onCreateNewToken = () => {
+        const { duration, name, description } = form.getFieldsValue();
+        const input: CreateAccessTokenInput = {
+            actorUrn: currentUserUrn,
+            type: AccessTokenType.Personal,
+            duration,
+            name,
+            description,
+        };
+        createAccessToken({ variables: { input } })
+            .then(({ errors }) => {
+                if (!errors) {
+                    setSelectedTokenDuration(duration);
+                    analytics.event({
+                        type: EventType.CreateAccessTokenEvent,
+                        accessTokenType: AccessTokenType.Personal,
+                        duration,
+                    });
+                }
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to create Token!: \n ${e.message || ''}`, duration: 3 });
+            })
+            .finally(() => {
+                onCreateToken();
+            });
+        onModalClose();
+    };
+
+    const accessToken = data && data.createAccessToken?.accessToken;
+    const selectedExpiresInText = selectedTokenDuration && getTokenExpireDate(selectedTokenDuration);
+
+    // Handle the Enter press
+    useEnterKeyListener({
+        querySelectorToExecuteClick: '#createTokenButton',
+    });
+
+    const hasSelectedNoExpiration = selectedTokenDuration === AccessTokenDuration.NoExpiry;
+
+    return (
+        <>
+            <Modal
+                title={forRemoteExecutor ? 'Create new Token for Remote Executor' : 'Create new Token'}
+                visible={visible}
+                onCancel={onModalClose}
+                footer={
+                    <>
+                        <Button onClick={onModalClose} type="text" data-testid="cancel-create-access-token-button">
+                            Cancel
+                        </Button>
+                        <Button
+                            type="primary"
+                            id="createTokenButton"
+                            onClick={onCreateNewToken}
+                            disabled={createButtonEnabled}
+                            data-testid="create-access-token-button"
+                        >
+                            Create
+                        </Button>
+                    </>
+                }
+            >
+                <Form
+                    form={form}
+                    initialValues={{ duration: ACCESS_TOKEN_DURATIONS[2].duration }}
+                    layout="vertical"
+                    onFieldsChange={() =>
+                        setCreateButtonEnabled(form.getFieldsError().some((field) => field.errors.length > 0))
+                    }
+                >
+                    <Form.Item label={<Typography.Text strong>Name</Typography.Text>}>
+                        <Typography.Paragraph>Give your new token a name. </Typography.Paragraph>
+                        <Form.Item
+                            name="name"
+                            rules={[
+                                {
+                                    required: true,
+                                    message: 'Enter a token name.',
+                                },
+                                { whitespace: true },
+                                { min: 1, max: 50 },
+                            ]}
+                            hasFeedback
+                        >
+                            <Input placeholder="A name for your token" data-testid="create-access-token-name" />
+                        </Form.Item>
+                    </Form.Item>
+                    <Form.Item label={<Typography.Text strong>Description</Typography.Text>}>
+                        <Typography.Paragraph>An optional description for your new token.</Typography.Paragraph>
+                        <Form.Item name="description" rules={[{ whitespace: true }, { min: 1, max: 500 }]} hasFeedback>
+                            <Input
+                                placeholder="A description for your token"
+                                data-testid="create-access-token-description"
+                            />
+                        </Form.Item>
+                    </Form.Item>
+                    <ExpirationSelectContainer>
+                        <Typography.Text strong>Expires in</Typography.Text>
+                        <Form.Item name="duration" data-testid="create-access-token-duration" noStyle>
+                            <ExpirationDurationSelect disabled={forRemoteExecutor}>
+                                {ACCESS_TOKEN_DURATIONS.map((duration) => (
+                                    <Select.Option key={duration.text} value={duration.duration}>
+                                        <OptionText isRed={duration.duration === AccessTokenDuration.NoExpiry}>
+                                            {duration.text}
+                                        </OptionText>
+                                    </Select.Option>
+                                ))}
+                            </ExpirationDurationSelect>
+                        </Form.Item>
+                        <Form.Item shouldUpdate={(prev, cur) => prev.duration !== cur.duration} noStyle>
+                            {({ getFieldValue }) => (
+                                <Typography.Text
+                                    type="secondary"
+                                    style={hasSelectedNoExpiration ? { color: `${red[5]}` } : {}}
+                                >
+                                    {getFieldValue('duration') && getTokenExpireDate(getFieldValue('duration'))}
+                                </Typography.Text>
+                            )}
+                        </Form.Item>
+                    </ExpirationSelectContainer>
+                </Form>
+            </Modal>
+            <AccessTokenModal
+                visible={showModal}
+                onClose={onDetailModalClose}
+                accessToken={accessToken || ''}
+                expiresInText={selectedExpiresInText || ''}
+            />
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/settingsV2/Preferences.tsx b/datahub-web-react/src/app/settingsV2/Preferences.tsx
new file mode 100644
index 00000000000000..728958629b6713
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/Preferences.tsx
@@ -0,0 +1,156 @@
+import { Card, Divider, message, Switch, Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+import { useUpdateUserSettingMutation } from '../../graphql/me.generated';
+import { UserSetting } from '../../types.generated';
+import analytics, { EventType } from '../analytics';
+import { useUserContext } from '../context/useUserContext';
+import { ANTD_GRAY } from '../entity/shared/constants';
+import { useIsThemeV2, useIsThemeV2EnabledForUser, useIsThemeV2Toggleable } from '../useIsThemeV2';
+
+const Page = styled.div`
+    width: 100%;
+    display: flex;
+    justify-content: center;
+`;
+
+const SourceContainer = styled.div`
+    width: 80%;
+    padding-top: 20px;
+    padding-right: 40px;
+    padding-left: 40px;
+`;
+
+const TokensContainer = styled.div`
+    padding-top: 0px;
+`;
+
+const TokensHeaderContainer = styled.div`
+    && {
+        padding-left: 0px;
+    }
+`;
+
+const TokensTitle = styled(Typography.Title)`
+    && {
+        margin-bottom: 8px;
+    }
+`;
+
+const UserSettingRow = styled.div`
+    display: flex;
+    justify-content: space-between;
+`;
+
+const DescriptionText = styled(Typography.Text)`
+    color: ${ANTD_GRAY[7]};
+    font-size: 11px;
+`;
+
+const SettingText = styled(Typography.Text)`
+    font-size: 14px;
+`;
+
+export const Preferences = () => {
+    // Current User Urn
+    const { user, refetchUser } = useUserContext();
+    const isThemeV2 = useIsThemeV2();
+    const [isThemeV2Toggleable] = useIsThemeV2Toggleable();
+    const [isThemeV2EnabledForUser] = useIsThemeV2EnabledForUser();
+    const showSimplifiedHomepage = !!user?.settings?.appearance?.showSimplifiedHomepage;
+
+    const [updateUserSettingMutation] = useUpdateUserSettingMutation();
+
+    const showSimplifiedHomepageSetting = !isThemeV2;
+
+    return (
+        <Page>
+            <SourceContainer>
+                <TokensContainer>
+                    <TokensHeaderContainer>
+                        <TokensTitle level={2}>Appearance</TokensTitle>
+                        <Typography.Paragraph type="secondary">Manage your appearance settings.</Typography.Paragraph>
+                    </TokensHeaderContainer>
+                </TokensContainer>
+                <Divider />
+                {showSimplifiedHomepageSetting && (
+                    <Card>
+                        <UserSettingRow>
+                            <span>
+                                <SettingText>Show simplified homepage </SettingText>
+                                <div>
+                                    <DescriptionText>
+                                        Limits entity browse cards on homepage to Domains, Charts, Datasets, Dashboards
+                                        and Glossary Terms
+                                    </DescriptionText>
+                                </div>
+                            </span>
+                            <Switch
+                                checked={showSimplifiedHomepage}
+                                onChange={async () => {
+                                    await updateUserSettingMutation({
+                                        variables: {
+                                            input: {
+                                                name: UserSetting.ShowSimplifiedHomepage,
+                                                value: !showSimplifiedHomepage,
+                                            },
+                                        },
+                                    });
+                                    analytics.event({
+                                        type: showSimplifiedHomepage
+                                            ? EventType.ShowStandardHomepageEvent
+                                            : EventType.ShowSimplifiedHomepageEvent,
+                                    });
+                                    message.success({ content: 'Setting updated!', duration: 2 });
+                                    refetchUser?.();
+                                }}
+                            />
+                        </UserSettingRow>
+                    </Card>
+                )}
+                {isThemeV2Toggleable && (
+                    <>
+                        <Card style={{ marginTop: 20 }}>
+                            <UserSettingRow>
+                                <span>
+                                    <SettingText>Try New User Experience</SettingText>
+                                    <div>
+                                        <DescriptionText>
+                                            Enable an early preview of the new DataHub UX - a complete makeover for your
+                                            app with a sleek new design and advanced features. Flip the switch and
+                                            refresh your browser to try it out!
+                                        </DescriptionText>
+                                    </div>
+                                </span>
+                                <Switch
+                                    checked={isThemeV2EnabledForUser}
+                                    onChange={async () => {
+                                        await updateUserSettingMutation({
+                                            variables: {
+                                                input: {
+                                                    name: UserSetting.ShowThemeV2,
+                                                    value: !isThemeV2EnabledForUser,
+                                                },
+                                            },
+                                        });
+                                        // clicking this button toggles, so event is whatever is opposite to what isThemeV2EnabledForUser currently is
+                                        analytics.event({
+                                            type: isThemeV2EnabledForUser
+                                                ? EventType.RevertV2ThemeEvent
+                                                : EventType.ShowV2ThemeEvent,
+                                        });
+                                        message.success({ content: 'Setting updated!', duration: 2 });
+                                        refetchUser?.();
+                                    }}
+                                />
+                            </UserSettingRow>
+                        </Card>
+                    </>
+                )}
+                {!showSimplifiedHomepageSetting && !isThemeV2Toggleable && (
+                    <div style={{ color: ANTD_GRAY[7] }}>No appearance settings found.</div>
+                )}
+            </SourceContainer>
+        </Page>
+    );
+};
diff --git a/datahub-web-react/src/app/settingsV2/SettingsPage.tsx b/datahub-web-react/src/app/settingsV2/SettingsPage.tsx
new file mode 100644
index 00000000000000..1ede1846e07026
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/SettingsPage.tsx
@@ -0,0 +1,278 @@
+import React from 'react';
+import { useHistory, useLocation, useRouteMatch, Redirect, Route, Switch } from 'react-router';
+import { colors } from '@src/alchemy-components';
+import { Button } from 'antd';
+import {
+    Bank,
+    Bell,
+    Funnel,
+    House,
+    ShieldCheck,
+    Star,
+    ToggleRight,
+    Users,
+    Wrench,
+    UsersThree,
+} from '@phosphor-icons/react';
+import styled from 'styled-components';
+import { useUserContext } from '../context/useUserContext';
+import { PATHS, DEFAULT_PATH } from './settingsPaths';
+import { NavBarMenuItems, NavBarMenuItemTypes } from '../homeV2/layout/navBarRedesign/types';
+import NavBarMenu from '../homeV2/layout/navBarRedesign/NavBarMenu';
+import { useIsThemeV2 } from '../useIsThemeV2';
+import { useShowNavBarRedesign } from '../useShowNavBarRedesign';
+import useGetLogoutHandler from '../auth/useGetLogoutHandler';
+import { useAppConfig } from '../useAppConfig';
+
+const PageContainer = styled.div`
+    display: flex;
+    overflow: auto;
+    flex: 1;
+    border-radius: ${(props) => props.theme.styles['border-radius-navbar-redesign']};
+    gap: 16px;
+    padding: 5px;
+`;
+
+const NavBarContainer = styled.div`
+    padding: 20px 20px;
+    background-color: white;
+    display: flex;
+    flex-direction: column;
+    border-radius: ${(props) => props.theme.styles['border-radius-navbar-redesign']};
+    box-shadow: ${(props) => props.theme.styles['box-shadow-navbar-redesign']};
+    align-items: start;
+    overflow: auto;
+    width: 20%;
+    min-width: 180px;
+`;
+
+const NavBarHeader = styled.div`
+    margin-bottom: 4px;
+    display: flex;
+    width: 100%;
+    align-items: center;
+    justify-content: space-between;
+`;
+
+const NavBarTitle = styled.div`
+    font-size: 16px;
+    font-weight: 700;
+    margin-bottom: 4px;
+`;
+
+const NavBarSubTitle = styled.div`
+    font-size: 14px;
+    color: ${colors.gray[1700]};
+    margin-bottom: 8px;
+`;
+
+const NavBarMenuContainer = styled.div`
+    padding-bottom: 8px; // Adds space below nav bar items on overflow.
+    width: 100%;
+`;
+
+const ContentContainer = styled.div`
+    border-radius: ${(props) => props.theme.styles['border-radius-navbar-redesign']};
+    flex: 1;
+    display: flex;
+    overflow: auto;
+    background-color: white;
+    box-shadow: ${(props) => props.theme.styles['box-shadow-navbar-redesign']};
+`;
+
+export const SettingsPage = () => {
+    const { path, url } = useRouteMatch();
+    const { pathname } = useLocation();
+    const history = useHistory();
+    const subscriptionsEnabled = false;
+    const me = useUserContext();
+    const isThemeV2 = useIsThemeV2();
+    const isShowNavBarRedesign = useShowNavBarRedesign();
+    const { config } = useAppConfig();
+
+    const subRoutes = PATHS.map((p) => p.path.replace('/', ''));
+    const currPathName = pathname.replace(path, '');
+    const trimmedPathName = currPathName.endsWith('/') ? pathname.slice(0, pathname.length - 1) : currPathName;
+    const splitPathName = trimmedPathName.split('/');
+    const providedPath = splitPathName[1];
+    const activePath = subRoutes.includes(providedPath) ? providedPath : DEFAULT_PATH.path.replace('/', '');
+
+    const isViewsEnabled = config?.viewsConfig?.enabled;
+    const isPoliciesEnabled = config?.policiesConfig?.enabled;
+    const isIdentityManagementEnabled = config?.identityManagementConfig?.enabled;
+    const { readOnlyModeEnabled } = config.featureFlags;
+
+    const showViews = isViewsEnabled || false;
+    const showPolicies = (isPoliciesEnabled && me && me?.platformPrivileges?.managePolicies) || false;
+    const showUsersGroups = (isIdentityManagementEnabled && me && me?.platformPrivileges?.manageIdentities) || false;
+    const showOwnershipTypes = me && me?.platformPrivileges?.manageOwnershipTypes;
+    const showHomePagePosts = me && me?.platformPrivileges?.manageGlobalAnnouncements && !readOnlyModeEnabled;
+    const showAccessTokens = me && me?.platformPrivileges?.generatePersonalAccessTokens;
+    const showFeatures = me?.platformPrivileges?.manageIngestion; // TODO: Add feature flag for this
+
+    // Menu Items based on PATHS
+    const menuItems: NavBarMenuItems = {
+        items: [
+            // Personal Section
+            {
+                type: NavBarMenuItemTypes.Group,
+                title: 'Personal',
+                key: 'personal',
+                items: [
+                    {
+                        type: NavBarMenuItemTypes.Item,
+                        title: 'My Views',
+                        key: 'views',
+                        link: `${url}/views`,
+                        isHidden: !showViews,
+                        icon: <Funnel />,
+                    },
+                    {
+                        type: NavBarMenuItemTypes.Item,
+                        title: 'My Notifications',
+                        key: 'personal-notifications',
+                        link: `${url}/personal-notifications`,
+                        isHidden: !subscriptionsEnabled,
+                        icon: <Bell />,
+                    },
+                    {
+                        type: NavBarMenuItemTypes.Item,
+                        title: 'My Subscriptions',
+                        key: 'personal-subscriptions',
+                        link: `${url}/personal-subscriptions`,
+                        isHidden: !subscriptionsEnabled,
+                        icon: <Star />,
+                    },
+                ],
+            },
+            // Developer Section
+            {
+                type: NavBarMenuItemTypes.Group,
+                title: 'Developer',
+                key: 'developer',
+                items: [
+                    {
+                        type: NavBarMenuItemTypes.Item,
+                        title: 'Access Tokens',
+                        key: 'tokens',
+                        link: `${url}/tokens`,
+                        isHidden: !showAccessTokens,
+                        icon: <ShieldCheck />,
+                    },
+                ],
+            },
+            // Access Section
+            {
+                type: NavBarMenuItemTypes.Group,
+                title: 'Access',
+                key: 'access',
+                items: [
+                    {
+                        type: NavBarMenuItemTypes.Item,
+                        title: 'Users & Groups',
+                        key: 'identities',
+                        link: `${url}/identities`,
+                        isHidden: !showUsersGroups,
+                        icon: <UsersThree />,
+                    },
+                    {
+                        type: NavBarMenuItemTypes.Item,
+                        title: 'Permissions',
+                        key: 'permissions',
+                        link: `${url}/permissions`,
+                        isHidden: !showPolicies,
+                        icon: <Bank />,
+                    },
+                ],
+            },
+            // Manage Section
+            {
+                type: NavBarMenuItemTypes.Group,
+                title: 'Manage',
+                key: 'manage',
+                items: [
+                    {
+                        type: NavBarMenuItemTypes.Item,
+                        title: 'Features',
+                        key: 'features',
+                        link: `${url}/features`,
+                        isHidden: !showFeatures,
+                        icon: <ToggleRight />,
+                    },
+                    {
+                        type: NavBarMenuItemTypes.Item,
+                        title: 'Home Page',
+                        key: 'posts',
+                        link: `${url}/posts`,
+                        isHidden: !showHomePagePosts,
+                        icon: <House />,
+                    },
+                    {
+                        type: NavBarMenuItemTypes.Item,
+                        title: 'Ownership Types',
+                        key: 'ownership',
+                        link: `${url}/ownership`,
+                        isHidden: !showOwnershipTypes,
+                        icon: <Users />,
+                    },
+                ],
+            },
+            // Preferences Section
+            {
+                type: NavBarMenuItemTypes.Group,
+                title: 'Preferences',
+                key: 'preferences',
+                items: [
+                    {
+                        type: NavBarMenuItemTypes.Item,
+                        title: 'Appearance',
+                        key: 'preferences',
+                        link: `${url}/preferences`,
+                        icon: <Wrench />,
+                    },
+                ],
+            },
+        ],
+    };
+
+    const handleLogout = useGetLogoutHandler();
+
+    return (
+        <PageContainer>
+            {/* Sidebar with NavBarMenu */}
+            <NavBarContainer>
+                <NavBarHeader>
+                    <div>
+                        <NavBarTitle>Settings</NavBarTitle>
+                        <NavBarSubTitle>Manage your settings</NavBarSubTitle>
+                    </div>
+                    {isThemeV2 && !isShowNavBarRedesign && (
+                        <Button href="/logOut" onClick={handleLogout} data-testid="log-out-menu-item" danger>
+                            Log Out
+                        </Button>
+                    )}
+                </NavBarHeader>
+                <NavBarMenuContainer>
+                    <NavBarMenu
+                        isCollapsed={false}
+                        selectedKey={activePath}
+                        menu={menuItems}
+                        iconSize={16}
+                        onSelect={(key) => history.push(`${url}/${key}`)}
+                    />
+                </NavBarMenuContainer>
+            </NavBarContainer>
+            {/* Main Content */}
+            <ContentContainer>
+                <Switch>
+                    <Route exact path={path}>
+                        <Redirect to={`${pathname}${pathname.endsWith('/') ? '' : '/'}${DEFAULT_PATH.path}`} />
+                    </Route>
+                    {PATHS.map((p) => (
+                        <Route path={`${path}/${p.path}`} key={p.path} render={() => p.content} />
+                    ))}
+                </Switch>
+            </ContentContainer>
+        </PageContainer>
+    );
+};
diff --git a/datahub-web-react/src/app/settingsV2/features/Feature.tsx b/datahub-web-react/src/app/settingsV2/features/Feature.tsx
new file mode 100644
index 00000000000000..13453cf8f73252
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/features/Feature.tsx
@@ -0,0 +1,184 @@
+import React from 'react';
+
+import styled from 'styled-components';
+
+import { Divider, Typography, Switch, Card, Button, Tooltip } from 'antd';
+import { ArrowRightOutlined } from '@ant-design/icons';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+
+const Title = styled(Typography.Title)`
+    && {
+        margin-bottom: 8px;
+    }
+`;
+
+const FeatureRow = styled.div`
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
+`;
+
+const FeatureOptionRow = styled.div`
+    display: flex;
+    justify-content: space-between;
+
+    &:not(:last-child) {
+        margin-bottom: 8px;
+    }
+`;
+
+const SettingsOptionRow = styled.div`
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 16px;
+
+    &:not(:last-child) {
+        margin-bottom: 8px;
+    }
+`;
+
+const DescriptionText = styled(Typography.Text)`
+    color: ${ANTD_GRAY[7]};
+    font-size: 11px;
+`;
+
+const SettingTitle = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    font-size: 14px;
+    margin-bottom: 4px;
+`;
+
+const OptionTitle = styled(Typography.Text)`
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    font-size: 12px;
+`;
+
+const learnMoreLinkStyle = {
+    flex: 1,
+    display: 'flex',
+    alignItems: 'center',
+    gap: '8px',
+    color: '#1890FF',
+    fontSize: '12px',
+    cursor: 'pointer',
+};
+
+const NewTag = styled.div`
+    padding: 4px 8px;
+
+    border-radius: 24px;
+    background: #f1fbfe;
+
+    color: #09739a;
+    font-size: 12px;
+`;
+
+const DataHubOnlyTag = styled.div`
+    padding: 2px 8px;
+
+    border-radius: 24px;
+    background: #c9fff2;
+
+    color: #50a494;
+    font-size: 12px;
+`;
+
+export interface FeatureType {
+    key: string;
+    title: string;
+    description: string;
+    settings: Array<{
+        key: string;
+        title: string;
+        isAvailable: boolean;
+        buttonText: string;
+        onClick?: () => void;
+    }>;
+    options: Array<{
+        key: string;
+        title: string;
+        description: string;
+        isAvailable: boolean;
+        isDisabled: boolean;
+        disabledMessage?: string;
+        checked: boolean;
+        onChange?: (checked: boolean) => void;
+    }>;
+    isNew: boolean;
+    learnMoreLink?: string;
+}
+
+export const Feature = ({ key, title, description, settings, options, isNew, learnMoreLink }: FeatureType) => (
+    <Card style={{ marginBottom: '1rem' }} key={key}>
+        <FeatureRow>
+            <div style={{ flex: 1 }}>
+                <SettingTitle>
+                    <Title level={5} style={{ marginBottom: 0 }}>
+                        {title}
+                    </Title>
+                    {isNew && <NewTag>New!</NewTag>}
+                </SettingTitle>
+                <div>
+                    <Typography.Paragraph type="secondary">{description}</Typography.Paragraph>
+                </div>
+            </div>
+            <div>
+                {learnMoreLink && (
+                    <a href={learnMoreLink} target="_blank" style={learnMoreLinkStyle} rel="noreferrer">
+                        Learn more <ArrowRightOutlined />
+                    </a>
+                )}
+            </div>
+        </FeatureRow>
+        <Divider style={{ margin: `8px 0 24px 0` }} />
+        <Card style={{ margin: `16px auto` }}>
+            {options.map((option, index) => (
+                <>
+                    <FeatureOptionRow key={option.key}>
+                        <span>
+                            <OptionTitle>
+                                <span>{option.title}</span>
+                                {!option.isAvailable && (
+                                    <DataHubOnlyTag>Only available on DataHub Cloud</DataHubOnlyTag>
+                                )}
+                            </OptionTitle>
+                            <div>
+                                <DescriptionText>{option.description}</DescriptionText>
+                            </div>
+                        </span>
+                        <Tooltip title={option.disabledMessage}>
+                            <Switch
+                                checked={option.checked}
+                                onChange={(checked) => (option.onChange ? option.onChange(checked) : null)}
+                                disabled={!option.isAvailable || option.isDisabled}
+                            />
+                        </Tooltip>
+                    </FeatureOptionRow>
+                    {index !== options.length - 1 && <Divider />}
+                </>
+            ))}
+        </Card>
+        {settings.map((option) => (
+            <>
+                <SettingsOptionRow key={option.key}>
+                    <span>
+                        <OptionTitle>
+                            <span>{option.title}</span>
+                            <DataHubOnlyTag>Only available on DataHub Cloud</DataHubOnlyTag>
+                        </OptionTitle>
+                    </span>
+                    <Tooltip title={option.isAvailable ? '' : 'Only available on DataHub Cloud'}>
+                        <Button onClick={option.onClick} disabled={!option.isAvailable}>
+                            {option.buttonText}
+                        </Button>
+                    </Tooltip>
+                </SettingsOptionRow>
+            </>
+        ))}
+    </Card>
+);
diff --git a/datahub-web-react/src/app/settingsV2/features/Features.tsx b/datahub-web-react/src/app/settingsV2/features/Features.tsx
new file mode 100644
index 00000000000000..7f39fcc6d72855
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/features/Features.tsx
@@ -0,0 +1,116 @@
+import React from 'react';
+
+import styled from 'styled-components';
+
+import { Divider, Typography } from 'antd';
+import { v4 as uuidv4 } from 'uuid';
+
+import { Feature, FeatureType } from './Feature';
+
+import { useGetDocPropagationSettings, useUpdateDocPropagationSettings } from './useDocPropagationSettings';
+
+const Page = styled.div`
+    width: 100%;
+    display: flex;
+    justify-content: center;
+`;
+
+const SourceContainer = styled.div`
+    width: 80%;
+    padding-top: 20px;
+    padding-right: 40px;
+    padding-left: 40px;
+`;
+const Container = styled.div`
+    padding-top: 0px;
+`;
+
+const Title = styled(Typography.Title)`
+    && {
+        margin-bottom: 8px;
+    }
+`;
+
+export const Features = () => {
+    /*
+     * Note: When adding new features, make sure to update the features array below
+     * and create a hook file for the new feature in the same directory
+     */
+
+    // Hooks to get and update the document propagation settings
+    const { isColPropagateChecked, setIsColPropagateChecked } = useGetDocPropagationSettings();
+    const { updateDocPropagation } = useUpdateDocPropagationSettings();
+
+    // Features to display
+    const features: FeatureType[] = [
+        {
+            key: uuidv4(),
+            title: 'Documentation Propagation',
+            description: 'Automatically propagate documentation from upstream to downstream columns and assets.',
+            settings: [
+                {
+                    key: uuidv4(),
+                    title: 'Rollback Propagation Changes',
+                    isAvailable: false,
+                    buttonText: 'Rollback',
+                },
+                {
+                    key: uuidv4(),
+                    title: 'Backfill existing documentation from upstream to downstream columns/assets',
+                    isAvailable: false,
+                    buttonText: 'Initialize',
+                },
+            ],
+            options: [
+                {
+                    key: uuidv4(),
+                    title: 'Column Level Propagation',
+                    description:
+                        'Propagate new documentation from upstream to downstream columns based on column-level lineage relationships.',
+                    isAvailable: true,
+                    checked: isColPropagateChecked,
+                    onChange: (checked: boolean) => {
+                        setIsColPropagateChecked(checked);
+                        updateDocPropagation(checked);
+                    },
+                    isDisabled: false,
+                    disabledMessage: undefined,
+                },
+                {
+                    key: uuidv4(),
+                    title: 'Asset Level Propagation',
+                    description:
+                        'Propagate new documentation from upstream to downstream assets based on data lineage relationships.',
+                    checked: false,
+                    onChange: (_: boolean) => null,
+                    isAvailable: true,
+                    isDisabled: true,
+                    disabledMessage: 'Coming soon!',
+                },
+            ],
+            isNew: true,
+            learnMoreLink:
+                'https://datahubproject.io/docs/automations/docs-propagation?utm_source=datahub_core&utm_medium=docs&utm_campaign=features',
+        },
+    ];
+
+    // Render
+    return (
+        <Page>
+            <SourceContainer>
+                <Container>
+                    <div>
+                        <Title level={2}>Features</Title>
+                        <Typography.Paragraph type="secondary">
+                            Explore and configure specific features
+                        </Typography.Paragraph>
+                    </div>
+                </Container>
+                <Divider />
+                {features.map((feature) => (
+                    <Feature {...feature} />
+                ))}
+            </SourceContainer>
+        </Page>
+    );
+};
diff --git a/datahub-web-react/src/app/settingsV2/features/useDocPropagationSettings.ts b/datahub-web-react/src/app/settingsV2/features/useDocPropagationSettings.ts
new file mode 100644
index 00000000000000..c93b610cff9d1b
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/features/useDocPropagationSettings.ts
@@ -0,0 +1,50 @@
+import { useEffect, useState } from 'react';
+
+import { message } from 'antd';
+
+import {
+    useGetDocPropagationSettingsQuery,
+    useUpdateDocPropagationSettingsMutation,
+} from '../../../graphql/app.generated';
+
+// Hook to get the document propagation settings & manage state
+export const useGetDocPropagationSettings = () => {
+    const { data, refetch } = useGetDocPropagationSettingsQuery();
+    const [isColPropagateChecked, setIsColPropagateChecked] = useState<boolean>(false);
+
+    useEffect(() => {
+        const docPropSetting = data?.docPropagationSettings?.docColumnPropagation;
+        if (docPropSetting !== undefined) setIsColPropagateChecked(!!docPropSetting);
+    }, [data]);
+
+    return {
+        isColPropagateChecked,
+        setIsColPropagateChecked,
+        refetch,
+    };
+};
+
+// Hook to update the document propagation settings
+export const useUpdateDocPropagationSettings = () => {
+    const [updateDocPropagationSettings] = useUpdateDocPropagationSettingsMutation();
+    const { refetch } = useGetDocPropagationSettingsQuery();
+
+    const updateDocPropagation = async (checked: boolean) => {
+        try {
+            await updateDocPropagationSettings({
+                variables: {
+                    input: {
+                        docColumnPropagation: checked,
+                    },
+                },
+            });
+            refetch();
+            message.success('Successfully updated documentation propagation settings');
+        } catch (e) {
+            message.error('Failed to update documentation propagation settings');
+            refetch();
+        }
+    };
+
+    return { updateDocPropagation };
+};
diff --git a/datahub-web-react/src/app/settingsV2/personal/utils.tsx b/datahub-web-react/src/app/settingsV2/personal/utils.tsx
new file mode 100644
index 00000000000000..6c8d32a183347f
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/personal/utils.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { Entity, EntityType } from '../../../types.generated';
+import EntityRegistry from '../../entity/EntityRegistry';
+
+const StyledIcon = styled.img`
+    width: 28px;
+    height: 28px;
+`;
+
+export function getEntityNameAndLogo(entity: Entity, entityType: EntityType, entityRegistry: EntityRegistry) {
+    const genericProps = entityRegistry.getGenericEntityProperties(entityType, entity);
+    const platform = genericProps?.platform;
+    const logoUrl = platform?.properties?.logoUrl || '';
+    const label = entityRegistry.getDisplayName(EntityType.DataPlatform, platform);
+    const icon: JSX.Element | null = <StyledIcon alt="icon" src={logoUrl} />;
+
+    return { label, icon };
+}
diff --git a/datahub-web-react/src/app/settingsV2/posts/CreatePostForm.tsx b/datahub-web-react/src/app/settingsV2/posts/CreatePostForm.tsx
new file mode 100644
index 00000000000000..d5565f25195f58
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/posts/CreatePostForm.tsx
@@ -0,0 +1,134 @@
+import React, { useEffect, useState } from 'react';
+import { Form, Input, Typography, FormInstance, Radio } from 'antd';
+import styled from 'styled-components';
+import { Editor } from '@src/app/entity/shared/tabs/Documentation/components/editor/Editor';
+import { ANTD_GRAY } from '@src/app/entity/shared/constants';
+import {
+    DESCRIPTION_FIELD_NAME,
+    LINK_FIELD_NAME,
+    LOCATION_FIELD_NAME,
+    TITLE_FIELD_NAME,
+    TYPE_FIELD_NAME,
+} from './constants';
+import { PostContentType } from '../../../types.generated';
+import { PostEntry } from './PostsListColumns';
+
+const TopFormItem = styled(Form.Item)`
+    margin-bottom: 24px;
+`;
+
+const SubFormItem = styled(Form.Item)`
+    margin-bottom: 0;
+`;
+
+const StyledEditor = styled(Editor)`
+    border: 1px solid ${ANTD_GRAY[4.5]};
+`;
+
+type Props = {
+    setCreateButtonEnabled: (isEnabled: boolean) => void;
+    form: FormInstance;
+    contentType: PostContentType;
+    editData?: PostEntry;
+};
+
+export default function CreatePostForm({ setCreateButtonEnabled, form, editData, contentType }: Props) {
+    const [postType, setPostType] = useState<PostContentType>(PostContentType.Text);
+
+    useEffect(() => {
+        if (contentType) {
+            setPostType(contentType);
+        }
+    }, [contentType]);
+
+    return (
+        <Form
+            form={form}
+            initialValues={{}}
+            layout="vertical"
+            onFieldsChange={() => {
+                setCreateButtonEnabled(!form.getFieldsError().some((field) => field.errors.length > 0));
+            }}
+        >
+            <TopFormItem name={TYPE_FIELD_NAME} label={<Typography.Text strong>Content Type</Typography.Text>}>
+                <Radio.Group
+                    onChange={(e) => setPostType(e.target.value)}
+                    value={postType}
+                    defaultValue={postType}
+                    optionType="button"
+                    buttonStyle="solid"
+                >
+                    <Radio value={PostContentType.Text}>Announcement</Radio>
+                    <Radio value={PostContentType.Link}>Pinned Link</Radio>
+                </Radio.Group>
+            </TopFormItem>
+
+            <TopFormItem label={<Typography.Text strong>Title</Typography.Text>}>
+                <Typography.Paragraph>The title for your announcement or link.</Typography.Paragraph>
+                <SubFormItem name={TITLE_FIELD_NAME} rules={[{ required: true }]} hasFeedback>
+                    <Input data-testid="create-post-title" placeholder="Your title" />
+                </SubFormItem>
+            </TopFormItem>
+            {postType === PostContentType.Text && (
+                <TopFormItem label={<Typography.Text strong>Description</Typography.Text>}>
+                    <Typography.Paragraph>The main content for your announcement.</Typography.Paragraph>
+                    <SubFormItem name={DESCRIPTION_FIELD_NAME} rules={[{ min: 0, max: 500 }]} hasFeedback>
+                        <StyledEditor
+                            className="create-post-description"
+                            doNotFocus
+                            content={editData?.description || undefined}
+                            onKeyDown={(e) => {
+                                // Preventing the modal from closing when the Enter key is pressed
+                                if (e.key === 'Enter') {
+                                    e.preventDefault();
+                                    e.stopPropagation();
+                                }
+                            }}
+                        />
+                    </SubFormItem>
+                </TopFormItem>
+            )}
+            {postType === PostContentType.Link && (
+                <>
+                    <TopFormItem label={<Typography.Text strong>Link URL</Typography.Text>}>
+                        <Typography.Paragraph>
+                            Where users will be redirected when they click the link.
+                        </Typography.Paragraph>
+                        <SubFormItem name={LINK_FIELD_NAME} rules={[{ type: 'url', warningOnly: true }]} hasFeedback>
+                            <Input data-testid="create-post-link" placeholder="Your link URL" />
+                        </SubFormItem>
+                    </TopFormItem>
+                    <TopFormItem label={<Typography.Text strong>Image URL (Optional)</Typography.Text>}>
+                        <Typography.Paragraph>
+                            An optional URL to an image you want to display on your link.
+                        </Typography.Paragraph>
+                        <SubFormItem
+                            name={LOCATION_FIELD_NAME}
+                            rules={[{ type: 'url', warningOnly: true }]}
+                            hasFeedback
+                        >
+                            <Input data-testid="create-post-media-location" placeholder="Your image URL" />
+                        </SubFormItem>
+                    </TopFormItem>
+                    <SubFormItem label={<Typography.Text strong>Description</Typography.Text>}>
+                        <Typography.Paragraph>A description for your link.</Typography.Paragraph>
+                        <SubFormItem name={DESCRIPTION_FIELD_NAME} rules={[{ min: 0, max: 500 }]} hasFeedback>
+                            <StyledEditor
+                                doNotFocus
+                                content={editData?.description || undefined}
+                                className="create-post-description"
+                                onKeyDown={(e) => {
+                                    // Preventing the modal from closing when the Enter key is pressed
+                                    if (e.key === 'Enter') {
+                                        e.preventDefault();
+                                        e.stopPropagation();
+                                    }
+                                }}
+                            />
+                        </SubFormItem>
+                    </SubFormItem>
+                </>
+            )}
+        </Form>
+    );
+}
diff --git a/datahub-web-react/src/app/settingsV2/posts/CreatePostModal.tsx b/datahub-web-react/src/app/settingsV2/posts/CreatePostModal.tsx
new file mode 100644
index 00000000000000..cda7ab131c46aa
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/posts/CreatePostModal.tsx
@@ -0,0 +1,183 @@
+import React, { useEffect, useState } from 'react';
+import { Button, Form, message, Modal } from 'antd';
+import CreatePostForm from './CreatePostForm';
+import {
+    CREATE_POST_BUTTON_ID,
+    DESCRIPTION_FIELD_NAME,
+    LINK_FIELD_NAME,
+    LOCATION_FIELD_NAME,
+    TYPE_FIELD_NAME,
+    TITLE_FIELD_NAME,
+} from './constants';
+import { useEnterKeyListener } from '../../shared/useEnterKeyListener';
+import { MediaType, PostContentType, PostType } from '../../../types.generated';
+import { useCreatePostMutation, useUpdatePostMutation } from '../../../graphql/mutations.generated';
+import { PostEntry } from './PostsListColumns';
+import handleGraphQLError from '../../shared/handleGraphQLError';
+
+type Props = {
+    editData: PostEntry;
+    onClose: () => void;
+    onCreate: (
+        contentType: string,
+        title: string,
+        description: string | undefined,
+        link: string | undefined,
+        location: string | undefined,
+    ) => void;
+    onEdit: () => void;
+};
+
+export default function CreatePostModal({ onClose, onCreate, editData, onEdit }: Props) {
+    const [createPostMutation] = useCreatePostMutation();
+    const [updatePostMutation] = useUpdatePostMutation();
+    const [createButtonEnabled, setCreateButtonEnabled] = useState(false);
+    const [form] = Form.useForm();
+
+    useEffect(() => {
+        if (editData) {
+            form.setFieldsValue({
+                description: editData.description,
+                title: editData.title,
+                link: editData.link,
+                location: editData.imageUrl,
+                type: editData.contentType,
+            });
+        }
+    }, [editData, form]);
+
+    const onCreatePost = () => {
+        const contentTypeValue = form.getFieldValue(TYPE_FIELD_NAME) ?? PostContentType.Text;
+        const mediaValue =
+            form.getFieldValue(TYPE_FIELD_NAME) && form.getFieldValue(LOCATION_FIELD_NAME)
+                ? {
+                      type: MediaType.Image,
+                      location: form.getFieldValue(LOCATION_FIELD_NAME) ?? null,
+                  }
+                : null;
+        createPostMutation({
+            variables: {
+                input: {
+                    postType: PostType.HomePageAnnouncement,
+                    content: {
+                        contentType: contentTypeValue,
+                        title: form.getFieldValue(TITLE_FIELD_NAME),
+                        description: form.getFieldValue(DESCRIPTION_FIELD_NAME) ?? null,
+                        link: form.getFieldValue(LINK_FIELD_NAME) ?? null,
+                        media: mediaValue,
+                    },
+                },
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.success({
+                        content: `Created Post!`,
+                        duration: 3,
+                    });
+                    onCreate(
+                        form.getFieldValue(TYPE_FIELD_NAME) ?? PostContentType.Text,
+                        form.getFieldValue(TITLE_FIELD_NAME),
+                        form.getFieldValue(DESCRIPTION_FIELD_NAME),
+                        form.getFieldValue(LINK_FIELD_NAME),
+                        form.getFieldValue(LOCATION_FIELD_NAME),
+                    );
+                    form.resetFields();
+                }
+            })
+            .catch((error) => {
+                handleGraphQLError({
+                    error,
+                    defaultMessage: 'Failed to create Post! An unexpected error occurred',
+                    permissionMessage: 'Unauthorized to create Post. Please contact your DataHub administrator.',
+                });
+            });
+        onClose();
+    };
+
+    const onUpdatePost = () => {
+        const contentTypeValue = form.getFieldValue(TYPE_FIELD_NAME) ?? PostContentType.Text;
+        const mediaValue =
+            form.getFieldValue(TYPE_FIELD_NAME) && form.getFieldValue(LOCATION_FIELD_NAME)
+                ? {
+                      type: MediaType.Image,
+                      location: form.getFieldValue(LOCATION_FIELD_NAME) ?? null,
+                  }
+                : null;
+        updatePostMutation({
+            variables: {
+                input: {
+                    urn: editData?.urn,
+                    postType: PostType.HomePageAnnouncement,
+                    content: {
+                        contentType: contentTypeValue,
+                        title: form.getFieldValue(TITLE_FIELD_NAME),
+                        description: form.getFieldValue(DESCRIPTION_FIELD_NAME) ?? null,
+                        link: form.getFieldValue(LINK_FIELD_NAME) ?? null,
+                        media: mediaValue,
+                    },
+                },
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.success({
+                        content: `Updated Post!`,
+                        duration: 3,
+                    });
+                    onEdit();
+                    form.resetFields();
+                }
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: 'Failed to update Post! An unknown error occured.', duration: 3 });
+                console.error('Failed to update Post:', e.message);
+            });
+        onClose();
+    };
+
+    // Handle the Enter press
+    useEnterKeyListener({
+        querySelectorToExecuteClick: '#createPostButton',
+    });
+
+    const onCloseModal = () => {
+        form.resetFields();
+        onClose();
+    };
+
+    const titleText = editData ? 'Edit' : 'Create';
+
+    return (
+        <Modal
+            title={titleText}
+            open
+            onCancel={onCloseModal}
+            width={700}
+            footer={
+                <>
+                    <Button onClick={onCloseModal} type="text">
+                        Cancel
+                    </Button>
+                    <Button
+                        type="primary"
+                        id={CREATE_POST_BUTTON_ID}
+                        data-testid={!editData ? 'create-post-button' : 'update-post-button'}
+                        onClick={!editData ? onCreatePost : onUpdatePost}
+                        disabled={!createButtonEnabled}
+                    >
+                        {!editData ? 'Create' : 'Update'}
+                    </Button>
+                </>
+            }
+        >
+            <CreatePostForm
+                setCreateButtonEnabled={setCreateButtonEnabled}
+                form={form}
+                editData={editData}
+                contentType={editData?.contentType as PostContentType}
+            />
+        </Modal>
+    );
+}
diff --git a/datahub-web-react/src/app/settingsV2/posts/ManagePosts.tsx b/datahub-web-react/src/app/settingsV2/posts/ManagePosts.tsx
new file mode 100644
index 00000000000000..41b4ea68e909ed
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/posts/ManagePosts.tsx
@@ -0,0 +1,46 @@
+import { Typography } from 'antd';
+import React from 'react';
+import styled from 'styled-components/macro';
+import { PostList } from './PostsList';
+
+export const PageContainer = styled.div`
+    padding-top: 20px;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+`;
+
+export const PageHeaderContainer = styled.div`
+    && {
+        padding-left: 24px;
+    }
+`;
+
+export const PageTitle = styled(Typography.Title)`
+    && {
+        margin-bottom: 12px;
+    }
+`;
+
+const ListContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+`;
+
+export default function ManagePosts() {
+    return (
+        <PageContainer>
+            <PageHeaderContainer data-testid="managePostsV2">
+                <PageTitle level={3}>Home Page</PageTitle>
+                <Typography.Paragraph type="secondary">
+                    View and manage pinned announcements and links that appear to all users on the landing page.
+                </Typography.Paragraph>
+            </PageHeaderContainer>
+            <ListContainer>
+                <PostList />
+            </ListContainer>
+        </PageContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/settingsV2/posts/PostItemMenu.tsx b/datahub-web-react/src/app/settingsV2/posts/PostItemMenu.tsx
new file mode 100644
index 00000000000000..10e2996c36f69f
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/posts/PostItemMenu.tsx
@@ -0,0 +1,70 @@
+import React from 'react';
+import { DeleteOutlined, EditOutlined } from '@ant-design/icons';
+import { Dropdown, Menu, message, Modal } from 'antd';
+import { MenuIcon } from '../../entity/shared/EntityDropdown/EntityDropdown';
+import { useDeletePostMutation } from '../../../graphql/post.generated';
+import handleGraphQLError from '../../shared/handleGraphQLError';
+
+type Props = {
+    urn: string;
+    title: string;
+    onDelete?: () => void;
+    onEdit?: () => void;
+};
+
+export default function PostItemMenu({ title, urn, onDelete, onEdit }: Props) {
+    const [deletePostMutation] = useDeletePostMutation();
+
+    const deletePost = () => {
+        deletePostMutation({
+            variables: {
+                urn,
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.success('Deleted Post!');
+                    onDelete?.();
+                }
+            })
+            .catch((error) => {
+                handleGraphQLError({
+                    error,
+                    defaultMessage: 'Failed to delete Post! An unexpected error occurred',
+                    permissionMessage: 'Unauthorized to delete Post. Please contact your DataHub administrator.',
+                });
+            });
+    };
+
+    const onConfirmDelete = () => {
+        Modal.confirm({
+            title: `Delete Post '${title}'`,
+            content: `Are you sure you want to remove this Post?`,
+            onOk() {
+                deletePost();
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
+    return (
+        <Dropdown
+            trigger={['click']}
+            overlay={
+                <Menu>
+                    <Menu.Item onClick={onConfirmDelete} key="delete">
+                        <DeleteOutlined /> &nbsp;Delete
+                    </Menu.Item>
+                    <Menu.Item onClick={onEdit} key="edit">
+                        <EditOutlined /> &nbsp;Edit
+                    </Menu.Item>
+                </Menu>
+            }
+        >
+            <MenuIcon data-testid={`dropdown-menu-${urn}`} fontSize={20} />
+        </Dropdown>
+    );
+}
diff --git a/datahub-web-react/src/app/settingsV2/posts/PostsList.tsx b/datahub-web-react/src/app/settingsV2/posts/PostsList.tsx
new file mode 100644
index 00000000000000..597323f01eecb8
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/posts/PostsList.tsx
@@ -0,0 +1,221 @@
+import React, { useEffect, useState } from 'react';
+import { Button, Empty, Pagination, Typography } from 'antd';
+import { useLocation } from 'react-router';
+import styled from 'styled-components';
+import * as QueryString from 'query-string';
+import { PlusOutlined } from '@ant-design/icons';
+import { AlignType } from 'rc-table/lib/interface';
+import { getHomePagePostsFilters } from '@app/utils/queryUtils';
+import CreatePostModal from './CreatePostModal';
+import { PostColumn, PostEntry, PostListMenuColumn } from './PostsListColumns';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { useListPostsQuery } from '../../../graphql/post.generated';
+import { scrollToTop } from '../../shared/searchUtils';
+import { addToListPostCache, removeFromListPostCache } from './utils';
+import { Message } from '../../shared/Message';
+import TabToolbar from '../../entity/shared/components/styled/TabToolbar';
+import { SearchBar } from '../../search/SearchBar';
+import { StyledTable } from '../../entity/shared/components/styled/StyledTable';
+import { POST_TYPE_TO_DISPLAY_TEXT } from './constants';
+
+const PostsContainer = styled.div`
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+`;
+
+export const PostsPaginationContainer = styled.div`
+    display: flex;
+    justify-content: center;
+    padding: 12px;
+    padding-left: 16px;
+    border-bottom: 1px solid;
+    border-color: ${(props) => props.theme.styles['border-color-base']};
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+`;
+
+const PaginationInfo = styled(Typography.Text)`
+    padding: 0px;
+`;
+
+const DEFAULT_PAGE_SIZE = 10;
+
+export const PostList = () => {
+    const entityRegistry = useEntityRegistry();
+    const location = useLocation();
+    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
+    const paramsQuery = (params?.query as string) || undefined;
+    const [query, setQuery] = useState<undefined | string>(undefined);
+    useEffect(() => setQuery(paramsQuery), [paramsQuery]);
+
+    const [page, setPage] = useState(1);
+    const [isCreatingPost, setIsCreatingPost] = useState(false);
+    const [editData, setEditData] = useState<PostEntry | undefined>(undefined);
+
+    const pageSize = DEFAULT_PAGE_SIZE;
+    const start = (page - 1) * pageSize;
+
+    const { loading, error, data, client, refetch } = useListPostsQuery({
+        variables: {
+            input: {
+                start,
+                count: pageSize,
+                query,
+                orFilters: getHomePagePostsFilters(),
+            },
+        },
+        fetchPolicy: query && query.length > 0 ? 'no-cache' : 'cache-first',
+    });
+
+    const totalPosts = data?.listPosts?.total || 0;
+    const lastResultIndex = start + pageSize > totalPosts ? totalPosts : start + pageSize;
+    const posts = data?.listPosts?.posts || [];
+
+    const onChangePage = (newPage: number) => {
+        scrollToTop();
+        setPage(newPage);
+    };
+
+    const handleDelete = (urn: string) => {
+        removeFromListPostCache(client, urn, page, pageSize);
+        setTimeout(() => {
+            refetch?.();
+        }, 2000);
+    };
+
+    const handleEdit = (post: PostEntry) => {
+        setEditData(post);
+        setIsCreatingPost(true);
+    };
+
+    const handleClose = () => {
+        setEditData(undefined);
+        setIsCreatingPost(false);
+    };
+
+    const allColumns = [
+        {
+            title: 'Title',
+            dataIndex: '',
+            key: 'title',
+            sorter: (sourceA, sourceB) => {
+                return sourceA.title.localeCompare(sourceB.title);
+            },
+            render: (record: PostEntry) => PostColumn(record.title, 200),
+            width: '20%',
+        },
+        {
+            title: 'Description',
+            dataIndex: '',
+            key: 'description',
+            render: (record: PostEntry) => PostColumn(record.description || ''),
+        },
+        {
+            title: 'Type',
+            dataIndex: '',
+            key: 'type',
+            render: (record: PostEntry) => PostColumn(POST_TYPE_TO_DISPLAY_TEXT[record.contentType]),
+            style: { minWidth: 100 },
+            width: '10%',
+        },
+        {
+            title: '',
+            dataIndex: '',
+            width: '5%',
+            align: 'right' as AlignType,
+            key: 'menu',
+            render: PostListMenuColumn(handleDelete, handleEdit),
+        },
+    ];
+
+    const tableData = posts.map((post) => {
+        return {
+            urn: post.urn,
+            title: post.content.title,
+            description: post.content.description,
+            contentType: post.content.contentType,
+            link: post.content.link,
+            imageUrl: post.content.media?.location,
+        };
+    });
+
+    return (
+        <>
+            {!data && loading && <Message type="loading" content="Loading posts..." />}
+            {error && <Message type="error" content="Failed to load Posts! An unexpected error occurred." />}
+            <PostsContainer>
+                <TabToolbar>
+                    <Button data-testid="posts-create-post-v2" type="text" onClick={() => setIsCreatingPost(true)}>
+                        <PlusOutlined /> New
+                    </Button>
+                    <SearchBar
+                        initialQuery={query || ''}
+                        placeholderText="Search..."
+                        suggestions={[]}
+                        style={{
+                            maxWidth: 220,
+                            padding: 0,
+                        }}
+                        inputStyle={{
+                            height: 32,
+                            fontSize: 12,
+                        }}
+                        onSearch={() => null}
+                        onQueryChange={(q) => setQuery(q && q.length > 0 ? q : undefined)}
+                        entityRegistry={entityRegistry}
+                        hideRecommendations
+                    />
+                </TabToolbar>
+                <StyledTable
+                    columns={allColumns}
+                    dataSource={tableData}
+                    rowKey="urn"
+                    pagination={false}
+                    locale={{ emptyText: <Empty description="No posts!" image={Empty.PRESENTED_IMAGE_SIMPLE} /> }}
+                />
+                {totalPosts > pageSize && (
+                    <PostsPaginationContainer>
+                        <PaginationInfo>
+                            <b>
+                                {lastResultIndex > 0 ? (page - 1) * pageSize + 1 : 0} - {lastResultIndex}
+                            </b>{' '}
+                            of <b>{totalPosts}</b>
+                        </PaginationInfo>
+                        <Pagination
+                            current={page}
+                            pageSize={pageSize}
+                            total={totalPosts}
+                            showLessItems
+                            onChange={onChangePage}
+                            showSizeChanger={false}
+                        />
+                        <span />
+                    </PostsPaginationContainer>
+                )}
+                {isCreatingPost && (
+                    <CreatePostModal
+                        editData={editData as PostEntry}
+                        onClose={handleClose}
+                        onEdit={() => setTimeout(() => refetch(), 2000)}
+                        onCreate={(urn, title, description) => {
+                            addToListPostCache(
+                                client,
+                                {
+                                    urn,
+                                    properties: {
+                                        title,
+                                        description: description || null,
+                                    },
+                                },
+                                pageSize,
+                            );
+                            setTimeout(() => refetch(), 2000);
+                        }}
+                    />
+                )}
+            </PostsContainer>
+        </>
+    );
+};
diff --git a/datahub-web-react/src/app/settingsV2/posts/PostsListColumns.tsx b/datahub-web-react/src/app/settingsV2/posts/PostsListColumns.tsx
new file mode 100644
index 00000000000000..17c56b84131af1
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/posts/PostsListColumns.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { Maybe } from 'graphql/jsutils/Maybe';
+import PostItemMenu from './PostItemMenu';
+
+export interface PostEntry {
+    urn: string;
+    title: string;
+    contentType: string;
+    description?: Maybe<string>;
+    link?: string | null;
+    imageUrl?: string;
+}
+
+const PostText = styled.div<{ minWidth?: number }>`
+    ${(props) => props.minWidth !== undefined && `min-width: ${props.minWidth}px;`}
+`;
+
+export function PostListMenuColumn(handleDelete: (urn: string) => void, handleEdit: (urn: PostEntry) => void) {
+    return (record: PostEntry) => (
+        <PostItemMenu
+            title={record.title}
+            urn={record.urn}
+            onDelete={() => handleDelete(record.urn)}
+            onEdit={() => handleEdit(record)}
+        />
+    );
+}
+
+export function PostColumn(text: string, minWidth?: number) {
+    return <PostText minWidth={minWidth}>{text}</PostText>;
+}
diff --git a/datahub-web-react/src/app/settingsV2/posts/constants.ts b/datahub-web-react/src/app/settingsV2/posts/constants.ts
new file mode 100644
index 00000000000000..5a164019fe2e55
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/posts/constants.ts
@@ -0,0 +1,13 @@
+import { PostContentType } from '../../../types.generated';
+
+export const TITLE_FIELD_NAME = 'title';
+export const DESCRIPTION_FIELD_NAME = 'description';
+export const LINK_FIELD_NAME = 'link';
+export const LOCATION_FIELD_NAME = 'location';
+export const TYPE_FIELD_NAME = 'type';
+export const CREATE_POST_BUTTON_ID = 'createPostButton';
+
+export const POST_TYPE_TO_DISPLAY_TEXT = {
+    [PostContentType.Link]: 'Link',
+    [PostContentType.Text]: 'Announcement',
+};
diff --git a/datahub-web-react/src/app/settingsV2/posts/utils.ts b/datahub-web-react/src/app/settingsV2/posts/utils.ts
new file mode 100644
index 00000000000000..9958a0e8d9f0e8
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/posts/utils.ts
@@ -0,0 +1,77 @@
+import { ListPostsDocument, ListPostsQuery } from '../../../graphql/post.generated';
+
+/**
+ * Add an entry to the list posts cache.
+ */
+export const addToListPostCache = (client, newPost, pageSize) => {
+    // Read the data from our cache for this query.
+    const currData: ListPostsQuery | null = client.readQuery({
+        query: ListPostsDocument,
+        variables: {
+            input: {
+                start: 0,
+                count: pageSize,
+            },
+        },
+    });
+
+    // Add our new post into the existing list.
+    const newPosts = [...(currData?.listPosts?.posts || [])];
+
+    // Write our data back to the cache.
+    client.writeQuery({
+        query: ListPostsDocument,
+        variables: {
+            input: {
+                start: 0,
+                count: pageSize,
+            },
+        },
+        data: {
+            listPosts: {
+                start: 0,
+                count: (currData?.listPosts?.count || 0) + 1,
+                total: (currData?.listPosts?.total || 0) + 1,
+                posts: newPosts,
+            },
+        },
+    });
+};
+
+/**
+ * Remove an entry from the list posts cache.
+ */
+export const removeFromListPostCache = (client, urn, page, pageSize) => {
+    // Read the data from our cache for this query.
+    const currData: ListPostsQuery | null = client.readQuery({
+        query: ListPostsDocument,
+        variables: {
+            input: {
+                start: (page - 1) * pageSize,
+                count: pageSize,
+            },
+        },
+    });
+
+    // Remove the post from the existing posts set.
+    const newPosts = [...(currData?.listPosts?.posts || []).filter((post) => post.urn !== urn)];
+
+    // Write our data back to the cache.
+    client.writeQuery({
+        query: ListPostsDocument,
+        variables: {
+            input: {
+                start: (page - 1) * pageSize,
+                count: pageSize,
+            },
+        },
+        data: {
+            listPosts: {
+                start: currData?.listPosts?.start || 0,
+                count: (currData?.listPosts?.count || 1) - 1,
+                total: (currData?.listPosts?.total || 1) - 1,
+                posts: newPosts,
+            },
+        },
+    });
+};
diff --git a/datahub-web-react/src/app/settingsV2/settingsPaths.tsx b/datahub-web-react/src/app/settingsV2/settingsPaths.tsx
new file mode 100644
index 00000000000000..adfaf48277b63d
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/settingsPaths.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import { ManageIdentities } from '../identity/ManageIdentities';
+import { ManagePermissions } from '../permissions/ManagePermissions';
+import { AccessTokens } from './AccessTokens';
+import { Preferences } from './Preferences';
+import { ManagePolicies } from '../permissions/policy/ManagePolicies';
+import { ManageViews } from '../entity/view/ManageViews';
+import { ManageOwnership } from '../entityV2/ownership/ManageOwnership';
+import ManagePosts from './posts/ManagePosts';
+import { Features } from './features/Features';
+
+/**
+ * URL Paths for each settings page.
+ */
+export const PATHS = [
+    { path: 'views', content: <ManageViews /> },
+    { path: 'tokens', content: <AccessTokens /> },
+    { path: 'identities', content: <ManageIdentities /> },
+    { path: 'policies', content: <ManagePolicies /> },
+    { path: 'preferences', content: <Preferences /> },
+    { path: 'permissions', content: <ManagePermissions /> },
+    { path: 'ownership', content: <ManageOwnership /> },
+    { path: 'posts', content: <ManagePosts /> },
+    { path: 'features', content: <Features /> },
+];
+
+export const DEFAULT_PATH = PATHS[0];
diff --git a/datahub-web-react/src/app/settingsV2/utils.ts b/datahub-web-react/src/app/settingsV2/utils.ts
new file mode 100644
index 00000000000000..a017f8ed6d3f1c
--- /dev/null
+++ b/datahub-web-react/src/app/settingsV2/utils.ts
@@ -0,0 +1,42 @@
+import { AccessTokenDuration, AccessTokenType } from '../../types.generated';
+
+/** A type of DataHub Access Token. */
+export const ACCESS_TOKEN_TYPES = [{ text: 'Personal', type: AccessTokenType.Personal }];
+
+/** The duration for which an Access Token is valid. */
+export const ACCESS_TOKEN_DURATIONS = [
+    { text: '1 hour', duration: AccessTokenDuration.OneHour },
+    { text: '1 day', duration: AccessTokenDuration.OneDay },
+    { text: '1 month', duration: AccessTokenDuration.OneMonth },
+    { text: '3 months', duration: AccessTokenDuration.ThreeMonths },
+    { text: 'Never', duration: AccessTokenDuration.NoExpiry },
+];
+
+const addHours = (hour: number) => {
+    const result = new Date();
+    result.setHours(result.getHours() + hour);
+    return `The token will expire on ${result.toLocaleDateString()} at ${result.toLocaleTimeString()}.`;
+};
+
+const addDays = (days: number) => {
+    const result = new Date();
+    result.setDate(result.getDate() + days);
+    return `The token will expire on ${result.toLocaleDateString()} at ${result.toLocaleTimeString()}.`;
+};
+
+export const getTokenExpireDate = (duration: AccessTokenDuration) => {
+    switch (duration) {
+        case AccessTokenDuration.OneHour:
+            return addHours(1);
+        case AccessTokenDuration.OneDay:
+            return addDays(1);
+        case AccessTokenDuration.OneMonth:
+            return addDays(30);
+        case AccessTokenDuration.ThreeMonths:
+            return addDays(90);
+        case AccessTokenDuration.NoExpiry:
+            return 'This token will never expire.';
+        default:
+            return AccessTokenDuration.OneMonth;
+    }
+};
diff --git a/datahub-web-react/src/app/shared/LastUpdated.tsx b/datahub-web-react/src/app/shared/LastUpdated.tsx
new file mode 100644
index 00000000000000..c0890aca378cc6
--- /dev/null
+++ b/datahub-web-react/src/app/shared/LastUpdated.tsx
@@ -0,0 +1,107 @@
+import { green, orange, red } from '@ant-design/colors';
+import { ClockCircleOutlined } from '@ant-design/icons';
+import { Image } from 'antd';
+import { Popover } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import { ANTD_GRAY } from '../entity/shared/constants';
+import { getLastIngestedColor } from '../entity/shared/containers/profile/sidebar/LastIngested';
+import { toRelativeTimeString } from './time/timeUtils';
+
+const LastUpdatedContainer = styled.div`
+    align-items: center;
+    color: ${ANTD_GRAY[7]};
+    display: flex;
+    flex-direction: row;
+    gap: 5px;
+`;
+
+const StyledDot = styled.div<{ color: string }>`
+    border-radius: 50%;
+    background-color: ${(props) => props.color};
+    width: 6px;
+    height: 6px;
+    margin-right: 4px;
+    vertical-align: middle;
+`;
+
+const PopoverTitle = styled.div`
+    margin-bottom: 5px;
+    max-width: 250px;
+`;
+
+const PopoverContentSection = styled.div`
+    align-items: center;
+    display: flex;
+    margin-bottom: 5px;
+`;
+
+const PreviewImage = styled(Image)`
+    max-height: 9px;
+    width: auto;
+    object-fit: contain;
+    background-color: transparent;
+    padding-left: 1px;
+`;
+
+function PopoverContent() {
+    return (
+        <div>
+            <PopoverContentSection>
+                <StyledDot color={green[5]} /> Updated in the&nbsp;<b>past week</b>
+            </PopoverContentSection>
+            <PopoverContentSection>
+                <StyledDot color={orange[5]} /> Updated in the&nbsp;<b>past month</b>
+            </PopoverContentSection>
+            <PopoverContentSection>
+                <StyledDot color={red[5]} /> Updated&nbsp;<b>more than a month ago</b>
+            </PopoverContentSection>
+        </div>
+    );
+}
+
+type Props = {
+    time: number; // Milliseconds
+    typeName?: string;
+    platformName?: string;
+    platformLogoUrl?: string;
+    noLabel?: boolean;
+};
+
+export default function LastUpdated({ time, typeName, platformName, platformLogoUrl, noLabel }: Props) {
+    return (
+        <Popover
+            title={
+                <PopoverTitle>
+                    The time that this {typeName?.toLocaleLowerCase() || 'asset'} last changed inside{' '}
+                    {platformName ? (
+                        <strong>
+                            {platformLogoUrl && (
+                                <>
+                                    <PreviewImage preview={false} src={platformLogoUrl} alt={platformName} />
+                                    &nbsp;
+                                </>
+                            )}
+                            {platformName}
+                        </strong>
+                    ) : (
+                        <>the source platform</>
+                    )}
+                </PopoverTitle>
+            }
+            content={PopoverContent}
+            placement="bottom"
+            showArrow={false}
+        >
+            <LastUpdatedContainer>
+                <StyledDot color={getLastIngestedColor(time)} />
+                {!noLabel && (
+                    <>
+                        <ClockCircleOutlined />
+                        Updated {toRelativeTimeString(time)}
+                    </>
+                )}
+            </LastUpdatedContainer>
+        </Popover>
+    );
+}
diff --git a/datahub-web-react/src/app/shared/LinkWrapper.tsx b/datahub-web-react/src/app/shared/LinkWrapper.tsx
new file mode 100644
index 00000000000000..685df463f6d75d
--- /dev/null
+++ b/datahub-web-react/src/app/shared/LinkWrapper.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { Link, LinkProps } from 'react-router-dom';
+
+/**
+ * Wrapper around React Router's Link component to support relative AND absolute URLs. If it is an external URL,
+ * a normal HTML anchor tag will be rendered. If no URL is present, only the contents will be rendered to avoid
+ * displaying blank anchor tags.
+ */
+export const LinkWrapper = ({ to, children, ...props }: LinkProps) => {
+    const regex = /^http/;
+    const isExternalLink = regex.test(to);
+
+    if (!to) return <>{children}</>;
+
+    return isExternalLink ? (
+        <a href={to} rel="noreferrer noopener" {...props}>
+            {children}
+        </a>
+    ) : (
+        <Link to={to} {...props}>
+            {children}
+        </Link>
+    );
+};
diff --git a/datahub-web-react/src/app/shared/MatchesContext.tsx b/datahub-web-react/src/app/shared/MatchesContext.tsx
new file mode 100644
index 00000000000000..d7705b73b188b6
--- /dev/null
+++ b/datahub-web-react/src/app/shared/MatchesContext.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+
+export enum PreviewSection {
+    MATCHES = 'matches',
+    OWNERS = 'owners',
+    GLOSSARY_TERMS = 'glossaryTerms',
+    TAGS = 'tags',
+    COLUMN_PATHS = 'columnPaths',
+}
+
+interface MatchesContextProps {
+    expandedSection?: PreviewSection;
+    setExpandedSection: (section?: PreviewSection) => void;
+}
+
+const MatchContext = React.createContext<MatchesContextProps>({
+    expandedSection: undefined,
+    setExpandedSection: () => {},
+});
+
+export default MatchContext;
diff --git a/datahub-web-react/src/app/shared/ShowMoreSection.tsx b/datahub-web-react/src/app/shared/ShowMoreSection.tsx
index d315dd5b8d1ce7..d9e690d25ec06b 100644
--- a/datahub-web-react/src/app/shared/ShowMoreSection.tsx
+++ b/datahub-web-react/src/app/shared/ShowMoreSection.tsx
@@ -1,12 +1,15 @@
 import React from 'react';
+import colors from '@src/alchemy-components/theme/foundations/colors';
 import styled from 'styled-components';
 import { ANTD_GRAY } from '../entity/shared/constants';
 
 export const ShowMoreButton = styled.div`
-    margin-top: 12px;
-    padding: 0px;
-    color: ${ANTD_GRAY[7]};
+    padding: 4px;
+    color: ${colors.gray[1700]};
     text-align: left;
+    font-weight: 700;
+    font-size: 12px;
+    font-family: 'Mulish';
     :hover {
         cursor: pointer;
         color: ${ANTD_GRAY[8]};
diff --git a/datahub-web-react/src/app/shared/TabFullsizedContext.tsx b/datahub-web-react/src/app/shared/TabFullsizedContext.tsx
new file mode 100644
index 00000000000000..7afc1ab484d949
--- /dev/null
+++ b/datahub-web-react/src/app/shared/TabFullsizedContext.tsx
@@ -0,0 +1,13 @@
+import React, { Dispatch, SetStateAction } from 'react';
+
+interface EntityHeaderContextProps {
+    setTabFullsize?: Dispatch<SetStateAction<boolean>>; // If undefined, isTabFullsize is fixed
+    isTabFullsize: boolean;
+}
+
+// context controlling the main entity header on entity full screen pages.
+const TabFullsizedContext = React.createContext<EntityHeaderContextProps>({
+    isTabFullsize: false,
+});
+
+export default TabFullsizedContext;
diff --git a/datahub-web-react/src/app/shared/TruncatedTextWithTooltip.tsx b/datahub-web-react/src/app/shared/TruncatedTextWithTooltip.tsx
new file mode 100644
index 00000000000000..edb91d35a3c2d1
--- /dev/null
+++ b/datahub-web-react/src/app/shared/TruncatedTextWithTooltip.tsx
@@ -0,0 +1,31 @@
+/**
+ * Generic Component that truncates text and shows a tooltip with the full text when hovered over using Ant Design's Tooltip component
+ */
+
+import React from 'react';
+import { TooltipProps, Typography } from 'antd';
+import { Tooltip } from '@components';
+
+type Props = {
+    text: string;
+    style?: React.CSSProperties;
+    maxLength: number;
+    tooltipOptions?: TooltipProps;
+    renderText?: (truncatedText: string) => React.ReactNode;
+};
+
+export const TruncatedTextWithTooltip = ({ text, maxLength, tooltipOptions, renderText, ...props }: Props) => {
+    const truncatedText = text.length > maxLength ? `${text.substring(0, maxLength)}...` : text;
+
+    return (
+        <Tooltip title={text.length > maxLength ? text : undefined} {...tooltipOptions}>
+            {renderText ? (
+                renderText(truncatedText)
+            ) : (
+                <Typography.Text style={props.style} {...props}>
+                    {truncatedText}
+                </Typography.Text>
+            )}
+        </Tooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/shared/__tests__/LinkWrapper.test.tsx b/datahub-web-react/src/app/shared/__tests__/LinkWrapper.test.tsx
new file mode 100644
index 00000000000000..6d48bf8d55d6c7
--- /dev/null
+++ b/datahub-web-react/src/app/shared/__tests__/LinkWrapper.test.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { BrowserRouter } from 'react-router-dom';
+import { LinkWrapper } from '../LinkWrapper';
+
+describe('LinkWrapper', () => {
+    it('renders absolute URLs', () => {
+        const { getByRole } = render(<LinkWrapper to="https://datahubproject.io/" />);
+
+        const link = getByRole('link');
+        expect(link).toBeInTheDocument();
+        expect(link).toHaveAttribute('href', 'https://datahubproject.io/');
+    });
+
+    it('renders relative URLs', () => {
+        const { getByRole } = render(
+            <BrowserRouter>
+                <LinkWrapper to="/some/relative/path" />
+            </BrowserRouter>,
+        );
+
+        const link = getByRole('link');
+        expect(link).toBeInTheDocument();
+        expect(link).toHaveAttribute('href', '/some/relative/path');
+    });
+
+    it('renders children when URL is falsy', () => {
+        const { queryByRole, getByTestId } = render(
+            <LinkWrapper to={null}>
+                <div data-testid="child-element" />
+            </LinkWrapper>,
+        );
+
+        expect(queryByRole('link')).not.toBeInTheDocument();
+        expect(getByTestId('child-element')).toBeInTheDocument();
+    });
+});
diff --git a/datahub-web-react/src/app/shared/__tests__/TruncatedTextWithTooltip.test.tsx b/datahub-web-react/src/app/shared/__tests__/TruncatedTextWithTooltip.test.tsx
new file mode 100644
index 00000000000000..8848084304d5f0
--- /dev/null
+++ b/datahub-web-react/src/app/shared/__tests__/TruncatedTextWithTooltip.test.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { TruncatedTextWithTooltip } from '../TruncatedTextWithTooltip';
+
+describe('TruncatedTextWithTooltip', () => {
+    it('renders truncated text when text is longer than maxLength', () => {
+        const { getByText } = render(<TruncatedTextWithTooltip text="This is some long text" maxLength={10} />);
+        expect(getByText('This is so...')).toBeInTheDocument();
+    });
+
+    it('renders full text when text is shorter than maxLength', () => {
+        const { getByText } = render(<TruncatedTextWithTooltip text="This is some short text" maxLength={23} />);
+        expect(getByText('This is some short text')).toBeInTheDocument();
+    });
+
+    it('renders custom text when renderText is provided', () => {
+        const { getByText, getByTestId } = render(
+            <TruncatedTextWithTooltip
+                text="This is some long text"
+                maxLength={10}
+                renderText={(truncatedText) => <span data-testid="render-text-span">{truncatedText}</span>}
+            />,
+        );
+        expect(getByText('This is so...')).toBeInTheDocument();
+        expect(getByTestId('render-text-span')).toBeInTheDocument();
+    });
+});
diff --git a/datahub-web-react/src/app/shared/__tests__/pluralize.test.ts b/datahub-web-react/src/app/shared/__tests__/pluralize.test.ts
new file mode 100644
index 00000000000000..a3c366addfd5ff
--- /dev/null
+++ b/datahub-web-react/src/app/shared/__tests__/pluralize.test.ts
@@ -0,0 +1,34 @@
+import { pluralize } from '../textUtil';
+
+describe('pluralize text based on the count', () => {
+    it('pluralize regular word with count greater than 1', () => {
+        expect(pluralize(2, 'User')).toEqual('Users');
+    });
+    it('pluralize regular word with count equal to 1', () => {
+        expect(pluralize(1, 'User')).toEqual('User');
+    });
+    it('pluralize regular word with lower case with count greater than 1', () => {
+        expect(pluralize(25, 'column')).toEqual('columns');
+    });
+    it('pluralize regular word with lower case with count equal to 1', () => {
+        expect(pluralize(1, 'row')).toEqual('row');
+    });
+    it('pluralize regular word with suffix provded as es', () => {
+        expect(pluralize(20, 'tax', 'es')).toEqual('taxes');
+    });
+    it('pluralize regular word with suffix provded as ren', () => {
+        expect(pluralize(100, 'child', 'ren')).toEqual('children');
+    });
+    it('pluralize regular word with suffix provded as ren with count equal to 1', () => {
+        expect(pluralize(1, 'child', 'ren')).toEqual('child');
+    });
+    it('pluralize irregular word present in the list', () => {
+        expect(pluralize(5, 'query')).toEqual('queries');
+    });
+    it('pluralize irregular word present in the list with capital first letter', () => {
+        expect(pluralize(50, 'Query')).toEqual('queries');
+    });
+    it('pluralize irregular word present in the list with count equal to 1', () => {
+        expect(pluralize(1, 'query')).toEqual('query');
+    });
+});
diff --git a/datahub-web-react/src/app/shared/avatar/getAvatarColor.ts b/datahub-web-react/src/app/shared/avatar/getAvatarColor.ts
index 21dec2c3c4b854..4cc1bdc8ff029c 100644
--- a/datahub-web-react/src/app/shared/avatar/getAvatarColor.ts
+++ b/datahub-web-react/src/app/shared/avatar/getAvatarColor.ts
@@ -1,7 +1,7 @@
 import { lineColors } from '../../analyticsDashboard/components/lineColors';
 import { ANTD_GRAY } from '../../entity/shared/constants';
 
-function hashString(str: string) {
+export function hashString(str: string) {
     let hash = 0;
     if (str.length === 0) {
         return hash;
diff --git a/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx b/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx
index 51b96b14126b32..885ce756b2534a 100644
--- a/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx
+++ b/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx
@@ -86,7 +86,7 @@ export default function EditBusinessAttributeModal({
     const inputEl = useRef(null);
     const [urn, setUrn] = useState<string>('');
     const [disableAction, setDisableAction] = useState(false);
-    const [recommendedData] = useGetRecommendations([EntityType.BusinessAttribute]);
+    const { recommendedData } = useGetRecommendations([EntityType.BusinessAttribute]);
     const [selectedAttribute, setSelectedAttribute] = useState<any>('');
     const [attributeSearch, { data: attributeSearchData }] = useGetSearchResultsLazyQuery();
     const attributeSearchResults =
diff --git a/datahub-web-react/src/app/shared/error/ErrorSection.tsx b/datahub-web-react/src/app/shared/error/ErrorSection.tsx
index 9faf36cf88473e..d5e5ace945bbe3 100644
--- a/datahub-web-react/src/app/shared/error/ErrorSection.tsx
+++ b/datahub-web-react/src/app/shared/error/ErrorSection.tsx
@@ -43,6 +43,7 @@ const resources = [
         label: 'DataHub Project',
         path: 'https://datahubproject.io',
         shouldOpenInNewTab: true,
+        description: 'DataHub Project website',
     },
     {
         label: 'DataHub Docs',
diff --git a/datahub-web-react/src/app/shared/recommendation.tsx b/datahub-web-react/src/app/shared/recommendation.tsx
index 19a30877961526..e616b5da0483b4 100644
--- a/datahub-web-react/src/app/shared/recommendation.tsx
+++ b/datahub-web-react/src/app/shared/recommendation.tsx
@@ -1,18 +1,19 @@
 import { useGetSearchResultsForMultipleQuery } from '../../graphql/search.generated';
-import { EntityType } from '../../types.generated';
+import { Entity, EntityType } from '../../types.generated';
 
 export const useGetRecommendations = (types: Array<EntityType>) => {
-    const { data } = useGetSearchResultsForMultipleQuery({
+    const { data, loading } = useGetSearchResultsForMultipleQuery({
         variables: {
             input: {
                 types,
                 query: '*',
                 start: 0,
-                count: 5,
+                count: 10,
             },
         },
     });
 
-    const recommendedData = data?.searchAcrossEntities?.searchResults?.map((searchResult) => searchResult.entity) || [];
-    return [recommendedData];
+    const recommendedData: Entity[] =
+        data?.searchAcrossEntities?.searchResults?.map((searchResult) => searchResult.entity) || [];
+    return { recommendedData, loading };
 };
diff --git a/datahub-web-react/src/app/shared/share/v2/ShareButtonMenu.tsx b/datahub-web-react/src/app/shared/share/v2/ShareButtonMenu.tsx
new file mode 100644
index 00000000000000..332451c38d7e6e
--- /dev/null
+++ b/datahub-web-react/src/app/shared/share/v2/ShareButtonMenu.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { EntityType } from '../../../../types.generated';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import CopyLinkMenuItem from './items/CopyLinkMenuItem';
+import CopyUrnMenuItem from './items/CopyUrnMenuItem';
+import EmailMenuItem from './items/EmailMenuItem';
+
+interface ShareButtonMenuProps {
+    urn: string;
+    entityType: EntityType;
+    subType?: string | null;
+    name?: string | null;
+}
+
+export default function ShareButtonMenu({ urn, entityType, subType, name }: ShareButtonMenuProps) {
+    const entityRegistry = useEntityRegistry();
+
+    const displayName = name || urn;
+    const displayType = subType || entityRegistry.getEntityName(entityType) || entityType;
+
+    return (
+        <>
+            {navigator.clipboard && <CopyLinkMenuItem key="0" urn={urn} entityType={entityType} />}
+
+            {navigator.clipboard && <CopyUrnMenuItem key="1" urn={urn} type={displayType} />}
+
+            <EmailMenuItem key="2" urn={urn} name={displayName} type={displayType} />
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/shared/share/v2/ShareMenuAction.tsx b/datahub-web-react/src/app/shared/share/v2/ShareMenuAction.tsx
new file mode 100644
index 00000000000000..5610ab124a36b1
--- /dev/null
+++ b/datahub-web-react/src/app/shared/share/v2/ShareMenuAction.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import { Dropdown } from 'antd';
+import { ShareAltOutlined } from '@ant-design/icons';
+import { ActionMenuItem } from '../../../entityV2/shared/EntityDropdown/styledComponents';
+import { useEntityData } from '../../../entity/shared/EntityContext';
+import ShareButtonMenu from './ShareButtonMenu';
+import { StyledMenu } from './styledComponents';
+
+export default function ShareMenuAction() {
+    const { urn, entityType, entityData } = useEntityData();
+    const subType = (entityData?.subTypes?.typeNames?.length && entityData?.subTypes?.typeNames?.[0]) || undefined;
+    const name = entityData?.name;
+
+    return (
+        <ActionMenuItem key="share">
+            <Dropdown
+                trigger={['hover']}
+                overlay={
+                    <StyledMenu selectable={false}>
+                        <ShareButtonMenu urn={urn} entityType={entityType} subType={subType} name={name} />
+                    </StyledMenu>
+                }
+            >
+                <ShareAltOutlined style={{ display: 'flex' }} />
+            </Dropdown>
+        </ActionMenuItem>
+    );
+}
diff --git a/datahub-web-react/src/app/shared/share/v2/items/CopyLinkMenuItem.tsx b/datahub-web-react/src/app/shared/share/v2/items/CopyLinkMenuItem.tsx
new file mode 100644
index 00000000000000..5e4088ab8a09fd
--- /dev/null
+++ b/datahub-web-react/src/app/shared/share/v2/items/CopyLinkMenuItem.tsx
@@ -0,0 +1,51 @@
+import React, { useState } from 'react';
+import styled from 'styled-components/macro';
+import { CheckOutlined, LinkOutlined } from '@ant-design/icons';
+import { Tooltip } from '@components';
+import { StyledMenuItem } from '../styledComponents';
+import { EntityType } from '../../../../../types.generated';
+import { useEntityRegistryV2 } from '../../../../useEntityRegistry';
+
+interface CopyLinkMenuItemProps {
+    key: string;
+    urn: string;
+    entityType: EntityType;
+}
+
+const TextSpan = styled.span`
+    padding-left: 12px;
+    margin-left: 0px !important;
+`;
+
+const StyledLinkOutlined = styled(LinkOutlined)`
+    font-size: 14px;
+`;
+
+export default function CopyLinkMenuItem({ key, urn, entityType }: CopyLinkMenuItemProps) {
+    /**
+     * Whether button has been clicked
+     */
+    const { origin } = window.location;
+    const entityRegistry = useEntityRegistryV2();
+
+    const [isClicked, setIsClicked] = useState(false);
+
+    const copyUrl = `${origin}${entityRegistry.getEntityUrl(entityType, urn)}/`;
+
+    return (
+        <StyledMenuItem
+            key={key}
+            onClick={() => {
+                navigator.clipboard.writeText(copyUrl);
+                setIsClicked(true);
+            }}
+        >
+            <Tooltip title="Copy a shareable link to this entity.">
+                {isClicked ? <CheckOutlined /> : <StyledLinkOutlined />}
+                <TextSpan>
+                    <b>Copy Link</b>
+                </TextSpan>
+            </Tooltip>
+        </StyledMenuItem>
+    );
+}
diff --git a/datahub-web-react/src/app/shared/share/v2/items/CopyUrnMenuItem.tsx b/datahub-web-react/src/app/shared/share/v2/items/CopyUrnMenuItem.tsx
new file mode 100644
index 00000000000000..c5f2d172ec0bb2
--- /dev/null
+++ b/datahub-web-react/src/app/shared/share/v2/items/CopyUrnMenuItem.tsx
@@ -0,0 +1,40 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { CheckOutlined, CopyOutlined } from '@ant-design/icons';
+import { Tooltip } from '@components';
+import { StyledMenuItem } from '../styledComponents';
+
+interface CopyUrnMenuItemProps {
+    urn: string;
+    key: string;
+    type: string;
+}
+
+const TextSpan = styled.span`
+    padding-left: 12px;
+    margin-left: 0px !important;
+`;
+
+export default function CopyUrnMenuItem({ urn, key, type }: CopyUrnMenuItemProps) {
+    /**
+     * Whether button has been clicked
+     */
+    const [isClicked, setIsClicked] = useState(false);
+
+    return (
+        <StyledMenuItem
+            key={key}
+            onClick={() => {
+                navigator.clipboard.writeText(urn);
+                setIsClicked(true);
+            }}
+        >
+            <Tooltip title={`Copy the URN for this ${type}. An URN uniquely identifies an entity on DataHub.`}>
+                {isClicked ? <CheckOutlined /> : <CopyOutlined />}
+                <TextSpan>
+                    <b>Copy URN</b>
+                </TextSpan>
+            </Tooltip>
+        </StyledMenuItem>
+    );
+}
diff --git a/datahub-web-react/src/app/shared/share/v2/items/EmailMenuItem.tsx b/datahub-web-react/src/app/shared/share/v2/items/EmailMenuItem.tsx
new file mode 100644
index 00000000000000..2b8e3da047e7c2
--- /dev/null
+++ b/datahub-web-react/src/app/shared/share/v2/items/EmailMenuItem.tsx
@@ -0,0 +1,52 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { Tooltip } from '@components';
+import { CheckOutlined, MailOutlined } from '@ant-design/icons';
+import qs from 'query-string';
+import { StyledMenuItem } from '../styledComponents';
+
+interface EmailMenuItemProps {
+    urn: string;
+    name: string;
+    type: string;
+    key: string;
+}
+
+const TextSpan = styled.span`
+    padding-left: 12px;
+    margin-left: 0px !important;
+`;
+
+export default function EmailMenuItem({ urn, name, type, key }: EmailMenuItemProps) {
+    /**
+     * Whether button has been clicked
+     */
+    const [isClicked, setIsClicked] = useState(false);
+    const linkText = window.location.href;
+
+    const link = qs.stringifyUrl({
+        url: 'mailto:',
+        query: {
+            subject: `${name} | ${type}`,
+            body: `Check out this ${type} on DataHub: ${linkText}. Urn: ${urn}`,
+        },
+    });
+
+    return (
+        <StyledMenuItem
+            key={key}
+            onClick={() => {
+                setIsClicked(true);
+            }}
+        >
+            <Tooltip title={`Share this ${type} via email`}>
+                {isClicked ? <CheckOutlined /> : <MailOutlined />}
+                <TextSpan>
+                    <a href={link} target="_blank" rel="noreferrer" style={{ color: 'inherit' }}>
+                        <b>Email</b>
+                    </a>
+                </TextSpan>
+            </Tooltip>
+        </StyledMenuItem>
+    );
+}
diff --git a/datahub-web-react/src/app/shared/share/v2/styledComponents.tsx b/datahub-web-react/src/app/shared/share/v2/styledComponents.tsx
new file mode 100644
index 00000000000000..e0661833a68ccb
--- /dev/null
+++ b/datahub-web-react/src/app/shared/share/v2/styledComponents.tsx
@@ -0,0 +1,144 @@
+import { Button, Checkbox, Form, Menu, Modal, Typography } from 'antd';
+import styled from 'styled-components';
+import { REDESIGN_COLORS } from '../../../entityV2/shared/constants';
+
+export const StyledMenuItem = styled(Menu.Item)`
+    min-width: 120px;
+    background-color: #fff !important;
+    height: 28px;
+    font-size: 12px;
+    font-weight: 300;
+    padding: 12px;
+    color: #46507b;
+    :hover {
+        background-color: transparent;
+    }
+`;
+
+export const StyledMenu = styled(Menu)`
+    border-radius: 4px;
+    min-width: 140px;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 5px;
+    border-right: none;
+`;
+
+export const StyledCheckbox = styled(Checkbox)<{ $color?: string }>`
+    .ant-checkbox-inner,
+    .ant-checkbox-input {
+        border-radius: 2px;
+        width: 18px !important;
+        height: 18px !important;
+    }
+
+    .ant-checkbox-checked .ant-checkbox-inner {
+        background-color: ${(props) => props.$color};
+        border-color: ${(props) => props.$color} !important;
+    }
+
+    .ant-checkbox-checked::after {
+        border-radius: 2px;
+        border-color: ${(props) => props.$color} !important;
+    }
+`;
+
+export const StyledButton = styled(Button)<{ $type?: string; $color?: string; $hoverColor?: string }>`
+    && {
+        font-size: 14px;
+        border-radius: 6px;
+        height: auto;
+        width: max-content;
+        display: flex;
+        align-items: center;
+        gap: 5px;
+        box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.05);
+        border-color: ${(props) => props.$color};
+        color: ${(props) => (props.$type === 'filled' ? 'white' : props.$color)};
+        background-color: ${(props) => (props.$type === 'filled' ? props.$color : 'transparent')};
+
+        :hover {
+            border-color: ${(props) => (props.$hoverColor ? props.$hoverColor : props.$color)};
+            background-color: ${(props) => (props.$hoverColor ? props.$hoverColor : props.$color)};
+            color: ${(props) => !(props.$type === 'filled') && 'white'};
+        }
+    }
+`;
+
+export const StyledModal = styled(Modal)`
+    font-family: Mulish;
+    width: 580px !important;
+    max-width: 680px;
+
+    &&& .ant-modal-content {
+        box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25), 0px 4px 8px 3px rgba(0, 0, 0, 0.15);
+        border-radius: 12px;
+    }
+
+    .ant-modal-header {
+        border-bottom: 0;
+        padding-top: 24px;
+        border-radius: 12px !important;
+    }
+
+    .ant-modal-footer {
+        border-top: 0;
+    }
+
+    .ant-modal-body {
+        padding: 12px 24px;
+    }
+
+    .ant-modal-close-x {
+        color: ${REDESIGN_COLORS.TITLE_PURPLE};
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding-right: 9px;
+        padding-top: 20px;
+
+        :hover {
+            stroke: ${REDESIGN_COLORS.TITLE_PURPLE};
+        }
+    }
+`;
+
+export const ModalTitle = styled.span`
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    font-size: 22px;
+    font-weight: 700;
+    color: ${REDESIGN_COLORS.TEXT_HEADING_SUB_LINK};
+`;
+
+export const StyledFormItem = styled(Form.Item)`
+    margin-bottom: 8px;
+
+    .ant-input {
+        font-size: 14px;
+        font-weight: 500;
+        border-radius: 8px;
+        color: ${REDESIGN_COLORS.FOUNDATION_BLUE_5};
+
+        &:hover,
+        &:focus,
+        &:active {
+            border-color: ${REDESIGN_COLORS.TITLE_PURPLE};
+        }
+
+        &:focus,
+        &:active {
+            color: ${REDESIGN_COLORS.TITLE_PURPLE};
+            box-shadow: 0px 0px 4px 0px rgba(83, 63, 209, 0.5);
+        }
+    }
+`;
+
+export const FormItemTitle = styled(Typography.Text)`
+    margin-bottom: 8px;
+    font-size: 14px;
+    font-weight: 500;
+    color: ${REDESIGN_COLORS.TEXT_HEADING};
+`;
diff --git a/datahub-web-react/src/app/shared/styleUtils.ts b/datahub-web-react/src/app/shared/styleUtils.ts
index 21bc866218cb87..cd3a9ab6d9b060 100644
--- a/datahub-web-react/src/app/shared/styleUtils.ts
+++ b/datahub-web-react/src/app/shared/styleUtils.ts
@@ -5,3 +5,20 @@ export function applyOpacity(hexColor: string, opacity: number) {
 
     return hexColor + updatedOpacity.toString(16).padStart(2, '0');
 }
+
+/**
+ * TODO: merge this with {@link #applyOpacity} above
+ */
+export function applyOpacityToHexColor(hex, opacity) {
+    // Ensure the hex color is valid and remove any leading #
+    const finalHex = hex.replace(/^#/, '');
+
+    // Convert opacity from 0-1 range to 0-255 range
+    const alpha = Math.round(opacity * 255);
+
+    // Convert the alpha value to a hex string and ensure it's 2 characters long
+    const alphaHex = (alpha + 0x100).toString(16).substr(-2);
+
+    // Return the original hex color with the alpha opacity appended
+    return `#${finalHex}${alphaHex}`;
+}
diff --git a/datahub-web-react/src/app/shared/subscribe/drawer/utils.tsx b/datahub-web-react/src/app/shared/subscribe/drawer/utils.tsx
new file mode 100644
index 00000000000000..907f41ff7682c2
--- /dev/null
+++ b/datahub-web-react/src/app/shared/subscribe/drawer/utils.tsx
@@ -0,0 +1,37 @@
+import _ from 'lodash';
+
+/**
+ * Remove the GraphQL __typename fields from any object
+ * @param obj
+ * @returns {T}
+ */
+export function removeNestedTypeNames<T>(obj: T): T {
+    // Check if the argument is an object and not null
+    if (typeof obj !== 'object' || obj === null) return obj;
+    // Shallow clone object so we're not modifying it directly
+    // NOTE: the recursive call below will effectively do a deep clone where necessary
+    const clonedObj = _.clone(obj as object);
+
+    // Iterate over object properties
+    Object.keys(clonedObj).forEach((prop) => {
+        if (prop === '__typename') {
+            // Remove __typename property
+            delete clonedObj[prop];
+        } else if (typeof clonedObj[prop] === 'object' && clonedObj[prop] !== null) {
+            // Recurse for nested objects and arrays
+            clonedObj[prop] = removeNestedTypeNames(clonedObj[prop]);
+        }
+    });
+    return clonedObj as T;
+}
+
+export function cleanAssertionDescription(builderStateData) {
+    const newBuilderStateData = { ...builderStateData };
+    // Create a shallow copy of the assertion to avoid modifying the original object
+    const assertion = { ...newBuilderStateData.assertion };
+    // Description support not added in backend for testAssertion api, so deleting it here won't reflect in the original assertion
+    delete assertion.description;
+    newBuilderStateData.assertion = assertion;
+    const { type } = assertion;
+    return { newBuilderStateData, type };
+}
diff --git a/datahub-web-react/src/app/shared/tags/AddTagsTermsModal.tsx b/datahub-web-react/src/app/shared/tags/AddTagsTermsModal.tsx
index cd233552e68aa6..3457086a654b34 100644
--- a/datahub-web-react/src/app/shared/tags/AddTagsTermsModal.tsx
+++ b/datahub-web-react/src/app/shared/tags/AddTagsTermsModal.tsx
@@ -1,8 +1,9 @@
 import React, { useRef, useState } from 'react';
-import { message, Button, Modal, Select, Typography, Tag as CustomTag } from 'antd';
+import { message, Button, Modal, Select, Typography, Tag as CustomTag, Form, Empty } from 'antd';
+import { LoadingOutlined } from '@ant-design/icons';
 import styled from 'styled-components';
 
-import { useGetSearchResultsLazyQuery } from '../../../graphql/search.generated';
+import { useGetAutoCompleteResultsLazyQuery } from '../../../graphql/search.generated';
 import { EntityType, Tag, Entity, ResourceRefInput } from '../../../types.generated';
 import CreateTagModal from './CreateTagModal';
 import {
@@ -22,6 +23,7 @@ import { ENTER_KEY_CODE } from '../constants';
 import { getModalDomContainer } from '../../../utils/focus';
 import ParentEntities from '../../search/filters/ParentEntities';
 import { getParentEntities } from '../../search/filters/utils';
+import { ANTD_GRAY } from '../../entity/shared/constants';
 
 export enum OperationType {
     ADD,
@@ -38,10 +40,6 @@ type EditTagsModalProps = {
     onOkOverride?: (result: string[]) => void;
 };
 
-const TagSelect = styled(Select)`
-    width: 480px;
-`;
-
 const StyleTag = styled(CustomTag)`
     margin: 2px;
     display: flex;
@@ -53,7 +51,13 @@ const StyleTag = styled(CustomTag)`
     line-height: 16px;
 `;
 
-export const BrowserWrapper = styled.div<{ isHidden: boolean; width?: string; maxHeight?: number }>`
+export const BrowserWrapper = styled.div<{
+    isHidden: boolean;
+    width?: string;
+    maxHeight?: number;
+    minWidth?: number;
+    maxWidth?: number;
+}>`
     background-color: white;
     border-radius: 5px;
     box-shadow: 0 3px 6px -4px rgb(0 0 0 / 12%), 0 6px 16px 0 rgb(0 0 0 / 8%), 0 9px 28px 8px rgb(0 0 0 / 5%);
@@ -61,7 +65,9 @@ export const BrowserWrapper = styled.div<{ isHidden: boolean; width?: string; ma
     overflow: auto;
     position: absolute;
     transition: opacity 0.2s;
-    width: ${(props) => (props.width ? props.width : '480px')};
+    width: ${(props) => (props.width ? props.width : '100%')};
+    ${(props) => props.minWidth !== undefined && `min-width: ${props.minWidth}px;`}
+    ${(props) => props.maxWidth !== undefined && `max-width: ${props.maxWidth}px;`}
     z-index: 1051;
     ${(props) =>
         props.isHidden &&
@@ -77,6 +83,18 @@ const SearchResultContainer = styled.div`
     justify-content: center;
 `;
 
+const LoadingWrapper = styled.div`
+    padding: 8px;
+    display: flex;
+    justify-content: center;
+
+    svg {
+        height: 15px;
+        width: 15px;
+        color: ${ANTD_GRAY[8]};
+    }
+`;
+
 const CREATE_TAG_VALUE = '____reserved____.createTagValue';
 
 const isValidTagName = (tagName: string) => {
@@ -121,9 +139,11 @@ export default function EditTagTermsModal({
     const [batchAddTermsMutation] = useBatchAddTermsMutation();
     const [batchRemoveTermsMutation] = useBatchRemoveTermsMutation();
 
-    const [tagTermSearch, { data: tagTermSearchData }] = useGetSearchResultsLazyQuery();
-    const tagSearchResults = tagTermSearchData?.search?.searchResults?.map((searchResult) => searchResult.entity) || [];
-    const [recommendedData] = useGetRecommendations([EntityType.Tag]);
+    const [tagTermSearch, { data: tagsSearchData, loading: searchLoading }] = useGetAutoCompleteResultsLazyQuery();
+
+    const tagSearchResults: Array<Entity> = tagsSearchData?.autoComplete?.entities || [];
+    const { recommendedData, loading: recommendationsLoading } = useGetRecommendations([EntityType.Tag]);
+    const loading = (recommendationsLoading as boolean) || searchLoading;
     const inputEl = useRef(null);
 
     const handleSearch = (text: string) => {
@@ -133,8 +153,7 @@ export default function EditTagTermsModal({
                     input: {
                         type,
                         query: text,
-                        start: 0,
-                        count: 10,
+                        limit: 10,
                     },
                 },
             });
@@ -451,50 +470,74 @@ export default function EditTagTermsModal({
                         Cancel
                     </Button>
                     <Button
+                        type="primary"
                         id="addTagButton"
                         data-testid="add-tag-term-from-modal-btn"
                         onClick={onOk}
                         disabled={urns.length === 0 || disableAction}
                     >
-                        Done
+                        Add
                     </Button>
                 </>
             }
             getContainer={getModalDomContainer}
         >
-            <ClickOutside onClickOutside={() => setIsFocusedOnInput(false)}>
-                <TagSelect
-                    data-testid="tag-term-modal-input"
-                    autoFocus
-                    defaultOpen
-                    mode="multiple"
-                    ref={inputEl}
-                    filterOption={false}
-                    placeholder={`Search for ${entityRegistry.getEntityName(type)?.toLowerCase()}...`}
-                    showSearch
-                    defaultActiveFirstOption={false}
-                    onSelect={(asset: any) => onSelectValue(asset)}
-                    onDeselect={(asset: any) => onDeselectValue(asset)}
-                    onSearch={(value: string) => {
-                        // eslint-disable-next-line react/prop-types
-                        handleSearch(value.trim());
-                        // eslint-disable-next-line react/prop-types
-                        setInputValue(value.trim());
-                    }}
-                    tagRender={tagRender}
-                    value={urns}
-                    onClear={clearInput}
-                    onFocus={() => setIsFocusedOnInput(true)}
-                    onBlur={handleBlur}
-                    onInputKeyDown={handleKeyDown}
-                    dropdownStyle={isShowingGlossaryBrowser ? { display: 'none' } : {}}
-                >
-                    {tagSearchOptions}
-                </TagSelect>
-                <BrowserWrapper isHidden={!isShowingGlossaryBrowser}>
-                    <GlossaryBrowser isSelecting selectTerm={selectTermFromBrowser} />
-                </BrowserWrapper>
-            </ClickOutside>
+            <Form component={false}>
+                <Form.Item>
+                    <ClickOutside onClickOutside={() => setIsFocusedOnInput(false)}>
+                        <Select
+                            data-testid="tag-term-modal-input"
+                            autoFocus
+                            defaultOpen
+                            mode="multiple"
+                            ref={inputEl}
+                            filterOption={false}
+                            placeholder={`Search for ${entityRegistry.getEntityName(type)?.toLowerCase()}...`}
+                            showSearch
+                            defaultActiveFirstOption={false}
+                            onSelect={(asset: any) => onSelectValue(asset)}
+                            onDeselect={(asset: any) => onDeselectValue(asset)}
+                            onSearch={(value: string) => {
+                                // eslint-disable-next-line react/prop-types
+                                handleSearch(value.trim());
+                                // eslint-disable-next-line react/prop-types
+                                setInputValue(value.trim());
+                            }}
+                            style={{ width: '100%' }}
+                            tagRender={tagRender}
+                            value={urns}
+                            onClear={clearInput}
+                            onFocus={() => setIsFocusedOnInput(true)}
+                            onBlur={handleBlur}
+                            onInputKeyDown={handleKeyDown}
+                            dropdownStyle={isShowingGlossaryBrowser ? { display: 'none' } : {}}
+                            loading={loading}
+                            notFoundContent={
+                                !loading ? (
+                                    <Empty
+                                        description={`No ${type === EntityType.GlossaryTerm ? 'Terms' : 'Tags'} found`}
+                                        image={Empty.PRESENTED_IMAGE_SIMPLE}
+                                        style={{ color: ANTD_GRAY[7] }}
+                                    />
+                                ) : null
+                            }
+                        >
+                            {loading ? (
+                                <Select.Option value="loading">
+                                    <LoadingWrapper>
+                                        <LoadingOutlined />
+                                    </LoadingWrapper>
+                                </Select.Option>
+                            ) : (
+                                tagSearchOptions
+                            )}
+                        </Select>
+                        <BrowserWrapper isHidden={!isShowingGlossaryBrowser}>
+                            <GlossaryBrowser isSelecting selectTerm={selectTermFromBrowser} />
+                        </BrowserWrapper>
+                    </ClickOutside>
+                </Form.Item>
+            </Form>
         </Modal>
     );
 }
diff --git a/datahub-web-react/src/app/shared/textUtil.ts b/datahub-web-react/src/app/shared/textUtil.ts
index ea8522683e83e5..e5c104708dcd3c 100644
--- a/datahub-web-react/src/app/shared/textUtil.ts
+++ b/datahub-web-react/src/app/shared/textUtil.ts
@@ -29,5 +29,20 @@ export function validateCustomUrnId(str: string) {
 }
 
 export function pluralize(count: number, noun: string, suffix = 's') {
-    return `${noun}${count !== 1 ? suffix : ''}`;
+    return count !== 1 ? pluralizeIfIrregular(noun, suffix) : noun;
+}
+
+export function forcePluralize(noun: string, suffix = 's') {
+    return `${noun}${suffix}`;
+}
+
+export function pluralizeIfIrregular(noun: string, suffix = 's'): string {
+    const irregularPlurals: Record<string, string> = {
+        query: 'queries',
+    };
+
+    if (irregularPlurals.hasOwnProperty(noun.toLowerCase())) {
+        return irregularPlurals[noun.toLowerCase()];
+    }
+    return `${noun}${suffix}`;
 }
diff --git a/datahub-web-react/src/app/shared/time/timeUtils.tsx b/datahub-web-react/src/app/shared/time/timeUtils.tsx
index 4ff6ffedf65337..c4fa12a6be5bf0 100644
--- a/datahub-web-react/src/app/shared/time/timeUtils.tsx
+++ b/datahub-web-react/src/app/shared/time/timeUtils.tsx
@@ -129,12 +129,18 @@ export const getLocaleTimezone = () => {
     return Intl.DateTimeFormat().resolvedOptions().timeZone;
 };
 
-export const toRelativeTimeString = (timeMs: number) => {
+export const toRelativeTimeString = (timeMs: number | undefined) => {
     const rtf = new Intl.RelativeTimeFormat('en', { numeric: 'auto' });
 
+    if (!timeMs) return null;
     const diffInMs = timeMs - new Date().getTime();
 
     const diffInSeconds = Math.round(diffInMs / INTERVAL_TO_MS[DateInterval.Second]);
+
+    if (Math.abs(diffInSeconds) === 0) {
+        return 'just now';
+    }
+
     if (Math.abs(diffInSeconds) > 0 && Math.abs(diffInSeconds) <= 60) {
         return rtf.format(diffInSeconds, 'second');
     }
diff --git a/datahub-web-react/src/app/shared/useEmbeddedProfileLinkProps.tsx b/datahub-web-react/src/app/shared/useEmbeddedProfileLinkProps.tsx
new file mode 100644
index 00000000000000..4917b64c18579c
--- /dev/null
+++ b/datahub-web-react/src/app/shared/useEmbeddedProfileLinkProps.tsx
@@ -0,0 +1,14 @@
+import { useMemo } from 'react';
+import { PageRoutes } from '../../conf/Global';
+
+// Function to check if the current page is an embedded profile
+const isEmbeddedProfile = () => window.location.pathname.startsWith(PageRoutes.EMBED);
+
+export const useIsEmbeddedProfile = () => {
+    return useMemo(() => isEmbeddedProfile(), []);
+};
+
+export const useEmbeddedProfileLinkProps = () => {
+    const isEmbedded = useIsEmbeddedProfile();
+    return useMemo(() => (isEmbedded ? { target: '_blank', rel: 'noreferrer noopener' } : {}), [isEmbedded]);
+};
diff --git a/datahub-web-react/src/app/shared/usePrevious.ts b/datahub-web-react/src/app/shared/usePrevious.ts
index 74a05833331f14..211ae0e4ae8bb4 100644
--- a/datahub-web-react/src/app/shared/usePrevious.ts
+++ b/datahub-web-react/src/app/shared/usePrevious.ts
@@ -1,7 +1,7 @@
 import { useEffect, useRef } from 'react';
 
-export default function usePrevious(value) {
-    const ref = useRef();
+export default function usePrevious<T>(value: T): T | undefined {
+    const ref = useRef<T>();
     useEffect(() => {
         ref.current = value;
     });
diff --git a/datahub-web-react/src/app/sharedV2/EntitySidebarContext.tsx b/datahub-web-react/src/app/sharedV2/EntitySidebarContext.tsx
new file mode 100644
index 00000000000000..6b023fe2808111
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/EntitySidebarContext.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+
+export interface FineGrainedOperation {
+    inputColumns?: Array<[string, string]>; // [table, column]
+    outputColumns?: Array<[string, string]>;
+    transformOperation?: string;
+}
+
+interface EntitySidebarContextProps {
+    width: number;
+    setSidebarClosed: (isClosed: boolean) => void;
+    isClosed: boolean;
+    fineGrainedOperations?: FineGrainedOperation[]; // For query entities in lineage, when a column is selected
+    forLineage?: boolean;
+    separateSiblings?: boolean;
+}
+
+export const entitySidebarContextDefaults: EntitySidebarContextProps = {
+    width: window.innerWidth * 0.3,
+    setSidebarClosed: () => {},
+    isClosed: false,
+};
+
+const EntitySidebarContext = React.createContext<EntitySidebarContextProps>({
+    ...entitySidebarContextDefaults,
+});
+
+export default EntitySidebarContext;
diff --git a/datahub-web-react/src/app/sharedV2/__tests__/utils.test.tsx b/datahub-web-react/src/app/sharedV2/__tests__/utils.test.tsx
new file mode 100644
index 00000000000000..8fc178933a1316
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/__tests__/utils.test.tsx
@@ -0,0 +1,50 @@
+import { render } from '@testing-library/react';
+import { ColumnTypeIcon, TypeTooltipTitle } from '../utils';
+import { SchemaFieldDataType } from '../../../types.generated';
+
+describe('ColumnTypeIcon', () => {
+    it('should return FontColorsOutlined for String type', () => {
+        const { container } = render(ColumnTypeIcon(SchemaFieldDataType.String) as JSX.Element);
+        expect(container.querySelector('.anticon-font-colors')).toBeInTheDocument();
+    });
+
+    it('should return CalendarOutlined for Date type', () => {
+        const { container } = render(ColumnTypeIcon(SchemaFieldDataType.Date) as JSX.Element);
+        expect(container.querySelector('.anticon-calendar')).toBeInTheDocument();
+    });
+
+    it('should return ClockCircleOutlined for Time type', () => {
+        const { container } = render(ColumnTypeIcon(SchemaFieldDataType.Time) as JSX.Element);
+        expect(container.querySelector('.anticon-clock-circle')).toBeInTheDocument();
+    });
+
+    it('should return BoldOutlined for Boolean type', () => {
+        const { container } = render(ColumnTypeIcon(SchemaFieldDataType.Boolean) as JSX.Element);
+        expect(container.querySelector('.anticon-bold')).toBeInTheDocument();
+    });
+
+    it('should return FieldBinaryOutlined for Bytes type', () => {
+        const { container } = render(ColumnTypeIcon(SchemaFieldDataType.Bytes) as JSX.Element);
+        expect(container.querySelector('.anticon-field-binary')).toBeInTheDocument();
+    });
+
+    it('should return ProfileOutlined for unknown type', () => {
+        const { container } = render(ColumnTypeIcon(undefined) as JSX.Element);
+        expect(container.querySelector('.anticon-profile')).toBeInTheDocument();
+    });
+});
+
+describe('TypeTooltipTitle', () => {
+    it('should display type and nativeDataType in tooltip title', () => {
+        const type = SchemaFieldDataType.String;
+        const nativeDataType = 'VARCHAR';
+        const { container } = render(TypeTooltipTitle(type, nativeDataType) as JSX.Element);
+        expect(container.textContent).toBe(`${type} | ${nativeDataType.toLowerCase()}`);
+    });
+
+    it('should display only type if nativeDataType is null', () => {
+        const type = SchemaFieldDataType.Date;
+        const { container } = render(TypeTooltipTitle(type, null) as JSX.Element);
+        expect(container.textContent).toBe(type);
+    });
+});
diff --git a/datahub-web-react/src/app/sharedV2/ant/OptionalTooltip.tsx b/datahub-web-react/src/app/sharedV2/ant/OptionalTooltip.tsx
new file mode 100644
index 00000000000000..a4b321f931ff1c
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/ant/OptionalTooltip.tsx
@@ -0,0 +1,16 @@
+import { Tooltip } from '@components';
+import { TooltipProps } from 'antd/lib/tooltip';
+import React from 'react';
+
+interface Props {
+    tooltipProps: TooltipProps;
+    children: React.ReactNode;
+    enabled: boolean;
+}
+
+export default function OptionalTooltip({ tooltipProps, children, enabled }: Props) {
+    if (!enabled) {
+        return <>{children}</>;
+    }
+    return <Tooltip {...tooltipProps}>{children}</Tooltip>;
+}
diff --git a/datahub-web-react/src/app/sharedV2/buttons/BackButton.tsx b/datahub-web-react/src/app/sharedV2/buttons/BackButton.tsx
new file mode 100644
index 00000000000000..704914f008ff11
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/buttons/BackButton.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Button } from 'antd';
+import { Tooltip } from '@components';
+import KeyboardBackspaceIcon from '@mui/icons-material/KeyboardBackspace';
+import { REDESIGN_COLORS } from '../../entityV2/shared/constants';
+
+const StyledButton = styled(Button)`
+    height: 25px;
+    width: 25px;
+    color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    padding: 0px;
+    border-radius: 20px;
+    border: 1px solid ${REDESIGN_COLORS.TITLE_PURPLE};
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-left: -4px;
+    margin-right: 10px;
+    margin-top: 2px;
+
+    &:hover {
+        color: ${REDESIGN_COLORS.TITLE_PURPLE};
+        border-color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    }
+`;
+
+const StyledLeftOutlined = styled(KeyboardBackspaceIcon)`
+    && {
+        font-size: 20px;
+        margin: 0px;
+        padding 0px;
+    }
+`;
+
+interface Props {
+    onGoBack?: () => void;
+}
+
+export const BackButton = ({ onGoBack }: Props) => {
+    return (
+        <Tooltip title="Go back" showArrow={false} placement="bottom">
+            <StyledButton onClick={onGoBack}>
+                <StyledLeftOutlined />
+            </StyledButton>
+        </Tooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/sharedV2/cards/EntityCountCard.tsx b/datahub-web-react/src/app/sharedV2/cards/EntityCountCard.tsx
new file mode 100644
index 00000000000000..7355bfb55b8b67
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/cards/EntityCountCard.tsx
@@ -0,0 +1,94 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { Link } from 'react-router-dom';
+import { Tooltip } from '@components';
+import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '../../entityV2/shared/constants';
+import { formatNumber, formatNumberWithoutAbbreviation } from '../../shared/formatNumber';
+import { generateColor } from '../../entityV2/shared/components/styled/StyledTag';
+
+const Card = styled(Link)`
+    align-items: center;
+    background-color: ${ANTD_GRAY[1]};
+    border: 1.5px solid ${ANTD_GRAY_V2[5]};
+    border-radius: 10px;
+    display: flex;
+    justify-content: start;
+    min-width: 180px;
+    padding: 16px;
+    :hover {
+        border: 1.5px solid ${REDESIGN_COLORS.BLUE};
+        cursor: pointer;
+    }
+`;
+
+const Text = styled.div`
+    overflow: hidden;
+`;
+
+const Name = styled.div`
+    font-size: 16px;
+    color: ${ANTD_GRAY[7]};
+    overflow: hidden;
+    text-overflow: ellipsis;
+    text-transform: capitalize;
+    max-width: 160px;
+    white-space: nowrap;
+`;
+
+const IconWrapper = styled.div<{ color?: string; backgroundColor?: string }>`
+    align-items: center;
+    border-radius: 12px;
+    background-color: ${({ backgroundColor }) => backgroundColor || ANTD_GRAY[3]};
+    display: flex;
+    height: 50px;
+    justify-content: center;
+    margin-right: 14px;
+    min-width: 50px;
+    padding: 6px;
+
+    && {
+        font-size: 30px;
+    }
+`;
+
+const Count = styled.div`
+    font-size: 20px;
+    color: ${ANTD_GRAY[10]};
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+`;
+
+type Props = {
+    icon: JSX.Element;
+    type: string;
+    name: string;
+    tooltipDescriptor?: string;
+    count: number;
+    link: string;
+};
+
+export function EntityCountCard({ icon, name, type, tooltipDescriptor, count, link }: Props) {
+    const card = (
+        <Card to={link}>
+            <IconWrapper backgroundColor={`${generateColor.hex(type)}30`}>{icon}</IconWrapper>
+            <Text>
+                <Name>{name}</Name>
+                {(count !== undefined && <Count>{formatNumber(count)}</Count>) || null}
+            </Text>
+        </Card>
+    );
+
+    if (tooltipDescriptor) {
+        return (
+            <Tooltip
+                title={`View ${formatNumberWithoutAbbreviation(count)} ${tooltipDescriptor}`}
+                showArrow={false}
+                placement="bottom"
+            >
+                {card}
+            </Tooltip>
+        );
+    }
+    return card;
+}
diff --git a/datahub-web-react/src/app/sharedV2/cards/SummaryEntityCard.tsx b/datahub-web-react/src/app/sharedV2/cards/SummaryEntityCard.tsx
new file mode 100644
index 00000000000000..c434d778983baf
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/cards/SummaryEntityCard.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import styled from 'styled-components/macro';
+import { EntityCard } from '../../homeV2/content/recent/EntityCard';
+import { Entity } from '../../../types.generated';
+
+const StyledEntityCard = styled(EntityCard)`
+    min-width: 150px;
+    max-width: 220px;
+`;
+
+interface Props {
+    entity: Entity;
+}
+
+export default function SummaryEntityCard({ entity }: Props) {
+    return <StyledEntityCard entity={entity} />;
+}
diff --git a/datahub-web-react/src/app/sharedV2/cards/components.tsx b/datahub-web-react/src/app/sharedV2/cards/components.tsx
new file mode 100644
index 00000000000000..b1ef4b4febdf9a
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/cards/components.tsx
@@ -0,0 +1,16 @@
+import styled from 'styled-components';
+import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '../../entity/shared/constants';
+
+export const Card = styled.div`
+    background-color: ${ANTD_GRAY[1]};
+    border: 2px solid ${ANTD_GRAY_V2[5]};
+    border-radius: 8px;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+
+    :hover {
+        border: 2px solid ${REDESIGN_COLORS.BLUE};
+        cursor: pointer;
+    }
+`;
diff --git a/datahub-web-react/src/app/sharedV2/cards/filterFromHex.ts b/datahub-web-react/src/app/sharedV2/cards/filterFromHex.ts
new file mode 100644
index 00000000000000..9c2612dad47020
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/cards/filterFromHex.ts
@@ -0,0 +1,313 @@
+// eslint-disable-next-line max-classes-per-file
+import { hexToRgb } from '../colors/colorUtils';
+
+// Taken from https://stackoverflow.com/questions/42966641/how-to-transform-black-into-any-given-color-using-only-css-filters/43960991#43960991
+export default function getFilterFromHex(hex): string {
+    const [r, g, b] = hexToRgb(hex);
+    const color = new Color(r, g, b);
+    const solver = new Solver(color);
+    return solver.solve().filter;
+}
+
+class Color {
+    r: number;
+
+    g: number;
+
+    b: number;
+
+    constructor(r, g, b) {
+        this.r = this.clamp(r);
+        this.g = this.clamp(g);
+        this.b = this.clamp(b);
+    }
+
+    toString() {
+        return `rgb(${Math.round(this.r)}, ${Math.round(this.g)}, ${Math.round(this.b)})`;
+    }
+
+    set(r, g, b) {
+        this.r = this.clamp(r);
+        this.g = this.clamp(g);
+        this.b = this.clamp(b);
+    }
+
+    hueRotate(angle = 0) {
+        // eslint-disable-next-line no-param-reassign
+        angle = (angle / 180) * Math.PI;
+        const sin = Math.sin(angle);
+        const cos = Math.cos(angle);
+
+        this.multiply([
+            0.213 + cos * 0.787 - sin * 0.213,
+            0.715 - cos * 0.715 - sin * 0.715,
+            0.072 - cos * 0.072 + sin * 0.928,
+            0.213 - cos * 0.213 + sin * 0.143,
+            0.715 + cos * 0.285 + sin * 0.14,
+            0.072 - cos * 0.072 - sin * 0.283,
+            0.213 - cos * 0.213 - sin * 0.787,
+            0.715 - cos * 0.715 + sin * 0.715,
+            0.072 + cos * 0.928 + sin * 0.072,
+        ]);
+    }
+
+    grayscale(value = 1) {
+        this.multiply([
+            0.2126 + 0.7874 * (1 - value),
+            0.7152 - 0.7152 * (1 - value),
+            0.0722 - 0.0722 * (1 - value),
+            0.2126 - 0.2126 * (1 - value),
+            0.7152 + 0.2848 * (1 - value),
+            0.0722 - 0.0722 * (1 - value),
+            0.2126 - 0.2126 * (1 - value),
+            0.7152 - 0.7152 * (1 - value),
+            0.0722 + 0.9278 * (1 - value),
+        ]);
+    }
+
+    sepia(value = 1) {
+        this.multiply([
+            0.393 + 0.607 * (1 - value),
+            0.769 - 0.769 * (1 - value),
+            0.189 - 0.189 * (1 - value),
+            0.349 - 0.349 * (1 - value),
+            0.686 + 0.314 * (1 - value),
+            0.168 - 0.168 * (1 - value),
+            0.272 - 0.272 * (1 - value),
+            0.534 - 0.534 * (1 - value),
+            0.131 + 0.869 * (1 - value),
+        ]);
+    }
+
+    saturate(value = 1) {
+        this.multiply([
+            0.213 + 0.787 * value,
+            0.715 - 0.715 * value,
+            0.072 - 0.072 * value,
+            0.213 - 0.213 * value,
+            0.715 + 0.285 * value,
+            0.072 - 0.072 * value,
+            0.213 - 0.213 * value,
+            0.715 - 0.715 * value,
+            0.072 + 0.928 * value,
+        ]);
+    }
+
+    multiply(matrix) {
+        const newR = this.clamp(this.r * matrix[0] + this.g * matrix[1] + this.b * matrix[2]);
+        const newG = this.clamp(this.r * matrix[3] + this.g * matrix[4] + this.b * matrix[5]);
+        const newB = this.clamp(this.r * matrix[6] + this.g * matrix[7] + this.b * matrix[8]);
+        this.r = newR;
+        this.g = newG;
+        this.b = newB;
+    }
+
+    brightness(value = 1) {
+        this.linear(value);
+    }
+
+    contrast(value = 1) {
+        this.linear(value, -(0.5 * value) + 0.5);
+    }
+
+    linear(slope = 1, intercept = 0) {
+        this.r = this.clamp(this.r * slope + intercept * 255);
+        this.g = this.clamp(this.g * slope + intercept * 255);
+        this.b = this.clamp(this.b * slope + intercept * 255);
+    }
+
+    invert(value = 1) {
+        this.r = this.clamp((value + (this.r / 255) * (1 - 2 * value)) * 255);
+        this.g = this.clamp((value + (this.g / 255) * (1 - 2 * value)) * 255);
+        this.b = this.clamp((value + (this.b / 255) * (1 - 2 * value)) * 255);
+    }
+
+    hsl() {
+        // Code taken from https://stackoverflow.com/a/9493060/2688027, licensed under CC BY-SA.
+        const r = this.r / 255;
+        const g = this.g / 255;
+        const b = this.b / 255;
+        const max = Math.max(r, g, b);
+        const min = Math.min(r, g, b);
+        let h = (max + min) / 2;
+        let s = (max + min) / 2;
+        const l = (max + min) / 2;
+
+        if (max === min) {
+            // eslint-disable-next-line no-multi-assign
+            h = s = 0;
+        } else {
+            const d = max - min;
+            s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+            switch (max) {
+                case r:
+                    h = (g - b) / d + (g < b ? 6 : 0);
+                    break;
+                case g:
+                    h = (b - r) / d + 2;
+                    break;
+                case b:
+                    h = (r - g) / d + 4;
+                    break;
+                default:
+                    break;
+            }
+            h /= 6;
+        }
+
+        return {
+            h: h * 100,
+            s: s * 100,
+            l: l * 100,
+        };
+    }
+
+    clamp(value) {
+        if (value > 255) {
+            return 255;
+        }
+        if (value < 0) {
+            return 0;
+        }
+        return value;
+    }
+}
+
+class Solver {
+    target: Color;
+
+    targetHSL: { h: number; s: number; l: number };
+
+    reusedColor: Color;
+
+    constructor(target) {
+        this.target = target;
+        this.targetHSL = target.hsl();
+        this.reusedColor = new Color(0, 0, 0); // Object pool
+    }
+
+    solve() {
+        const result = this.solveNarrow(this.solveWide());
+        return {
+            values: result.values,
+            loss: result.loss,
+            filter: this.css(result.values),
+        };
+    }
+
+    solveWide() {
+        const A = 5;
+        const c = 15;
+        const a = [60, 180, 18000, 600, 1.2, 1.2];
+
+        let best = { loss: Infinity };
+        for (let i = 0; best.loss > 25 && i < 3; i++) {
+            const initial = [50, 20, 3750, 50, 100, 100];
+            const result = this.spsa(A, a, c, initial, 1000);
+            if (result.loss < best.loss) {
+                best = result;
+            }
+        }
+        return best;
+    }
+
+    solveNarrow(wide) {
+        const A = wide.loss;
+        const c = 2;
+        const A1 = A + 1;
+        const a = [0.25 * A1, 0.25 * A1, A1, 0.25 * A1, 0.2 * A1, 0.2 * A1];
+        return this.spsa(A, a, c, wide.values, 500);
+    }
+
+    spsa(A, a, c, values, iters) {
+        const alpha = 1;
+        const gamma = 0.16666666666666666;
+
+        let best = null;
+        let bestLoss = Infinity;
+        const deltas = new Array(6);
+        const highArgs = new Array(6);
+        const lowArgs = new Array(6);
+
+        for (let k = 0; k < iters; k++) {
+            const ck = c / (k + 1) ** gamma;
+            for (let i = 0; i < 6; i++) {
+                deltas[i] = Math.random() > 0.5 ? 1 : -1;
+                highArgs[i] = values[i] + ck * deltas[i];
+                lowArgs[i] = values[i] - ck * deltas[i];
+            }
+
+            const lossDiff = this.loss(highArgs) - this.loss(lowArgs);
+            for (let i = 0; i < 6; i++) {
+                const g = (lossDiff / (2 * ck)) * deltas[i];
+                const ak = a[i] / (A + k + 1) ** alpha;
+                // eslint-disable-next-line no-param-reassign
+                values[i] = fix(values[i] - ak * g, i);
+            }
+
+            const loss = this.loss(values);
+            if (loss < bestLoss) {
+                best = values.slice(0);
+                bestLoss = loss;
+            }
+        }
+        return { values: best, loss: bestLoss };
+
+        function fix(value, idx) {
+            let max = 100;
+            if (idx === 2 /* saturate */) {
+                max = 7500;
+            } else if (idx === 4 /* brightness */ || idx === 5 /* contrast */) {
+                max = 200;
+            }
+
+            if (idx === 3 /* hue-rotate */) {
+                if (value > max) {
+                    return value % max;
+                }
+                if (value < 0) {
+                    return max + (value % max);
+                }
+            } else if (value < 0) {
+                return 0;
+            } else if (value > max) {
+                return max;
+            }
+            return value;
+        }
+    }
+
+    loss(filters) {
+        // Argument is array of percentages.
+        const color = this.reusedColor;
+        color.set(0, 0, 0);
+
+        color.invert(filters[0] / 100);
+        color.sepia(filters[1] / 100);
+        color.saturate(filters[2] / 100);
+        color.hueRotate(filters[3] * 3.6);
+        color.brightness(filters[4] / 100);
+        color.contrast(filters[5] / 100);
+
+        const colorHSL = color.hsl();
+        return (
+            Math.abs(color.r - this.target.r) +
+            Math.abs(color.g - this.target.g) +
+            Math.abs(color.b - this.target.b) +
+            Math.abs(colorHSL.h - this.targetHSL.h) +
+            Math.abs(colorHSL.s - this.targetHSL.s) +
+            Math.abs(colorHSL.l - this.targetHSL.l)
+        );
+    }
+
+    css(filters) {
+        function fmt(idx, multiplier = 1) {
+            return Math.round(filters[idx] * multiplier);
+        }
+
+        return `brightness(0) saturate(100%) invert(${fmt(0)}%) sepia(${fmt(1)}%) saturate(${fmt(2)}%) hue-rotate(${fmt(
+            3,
+            3.6,
+        )}deg) brightness(${fmt(4)}%) contrast(${fmt(5)}%);`;
+    }
+}
diff --git a/datahub-web-react/src/app/sharedV2/carousel/Carousel.tsx b/datahub-web-react/src/app/sharedV2/carousel/Carousel.tsx
new file mode 100644
index 00000000000000..8788e0815877e6
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/carousel/Carousel.tsx
@@ -0,0 +1,157 @@
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import NavigateNextOutlinedIcon from '@mui/icons-material/NavigateNextOutlined';
+import NavigateBeforeOutlinedIcon from '@mui/icons-material/NavigateBeforeOutlined';
+import styled from 'styled-components';
+import { REDESIGN_COLORS, SEARCH_COLORS } from '../../entityV2/shared/constants';
+import { HorizontalList } from '../../entityV2/shared/summary/ListComponents';
+
+const Wrapper = styled.div`
+    position: relative;
+
+    :hover {
+        .scroll-btn {
+            display: flex;
+            cursor: pointer;
+        }
+    }
+`;
+
+const CarouselHorizontalList = styled(HorizontalList)<{ hideMask?: boolean }>`
+    align-items: center;
+    padding-right: 0;
+    ${({ hideMask }) => hideMask && 'mask-image: none;'}
+`;
+
+const ButtonContainer = styled.div<{ left?: boolean; right?: boolean }>`
+    display: none;
+    align-items: center;
+    justify-content: center;
+    position: absolute;
+
+    margin: 0;
+    padding: 0;
+    width: 30px;
+    height: 30px;
+
+    top: 50%;
+    transform: translateY(-50%);
+    z-index: 2;
+
+    border-radius: 100px;
+    box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.1);
+    color: ${REDESIGN_COLORS.BLACK};
+    background-color: ${REDESIGN_COLORS.WHITE};
+
+    :hover {
+        color: ${REDESIGN_COLORS.WHITE};
+        background-color: ${SEARCH_COLORS.TITLE_PURPLE};
+    }
+
+    ${({ left }) => left && 'left: -10px;'}
+    ${({ right }) => right && 'right: -10px;'}
+`;
+
+const NavigateBeforeOutlinedIconStyle = styled(NavigateBeforeOutlinedIcon)`
+    font-size: 14px !important;
+`;
+const NavigateNextOutlinedIconStyle = styled(NavigateNextOutlinedIcon)`
+    font-size: 14px !important;
+`;
+
+type Props = {
+    children: React.ReactNode;
+    className?: string;
+};
+
+export function Carousel({ children, className }: Props) {
+    const [showPrevButton, setShowPrevButton] = useState<boolean>(false);
+    const [showNextButton, setShowNextButton] = useState<boolean>(false);
+    const scrollRef = useRef<HTMLDivElement>(null);
+    const arrayOfChildren = React.Children.toArray(children);
+
+    const numChildren = arrayOfChildren.length;
+    const childRefs = useMemo(
+        () => Array.from({ length: numChildren }).map(() => React.createRef<HTMLDivElement>()),
+        [numChildren],
+    );
+
+    const handleScroll = useCallback(() => {
+        if (!scrollRef.current) return;
+        setShowPrevButton(scrollRef.current.scrollLeft > 0);
+        setShowNextButton(
+            scrollRef.current.scrollLeft + scrollRef.current.clientWidth + 1 < scrollRef.current.scrollWidth,
+        );
+    }, []);
+
+    useEffect(() => {
+        handleScroll();
+    }, [handleScroll]);
+
+    useEffect(() => {
+        if (!scrollRef.current) return () => {};
+        const div = scrollRef.current;
+        new ResizeObserver(handleScroll).observe(div);
+        div.addEventListener('scroll', handleScroll);
+        return () => {
+            div.removeEventListener('scroll', handleScroll);
+        };
+    }, [handleScroll]);
+
+    const next = useCallback(() => {
+        if (scrollRef.current) {
+            const scrollDiv = scrollRef.current;
+            const nextRef = childRefs.find(
+                (ref) =>
+                    ref.current &&
+                    ref.current.offsetLeft + ref.current.scrollWidth > scrollDiv.scrollLeft + scrollDiv.clientWidth,
+            );
+
+            if (nextRef?.current) {
+                nextRef.current.scrollIntoView({ behavior: 'smooth', block: 'nearest', inline: 'start' });
+            } else {
+                scrollDiv.scrollTo({
+                    left: scrollDiv.offsetLeft + scrollDiv.clientWidth,
+                    behavior: 'smooth',
+                });
+            }
+        }
+    }, [childRefs]);
+
+    const prev = useCallback(() => {
+        if (scrollRef.current) {
+            const scrollDiv = scrollRef.current;
+            const prevRef = childRefs.find(
+                (ref) => ref.current && ref.current.offsetLeft > scrollDiv.scrollLeft - scrollDiv.clientWidth,
+            );
+
+            if (prevRef?.current) {
+                prevRef.current.scrollIntoView({ behavior: 'smooth', block: 'nearest', inline: 'start' });
+            } else {
+                scrollDiv.scrollTo({
+                    left: scrollDiv.offsetLeft - scrollDiv.clientWidth,
+                    behavior: 'smooth',
+                });
+            }
+        }
+    }, [childRefs]);
+
+    return (
+        <Wrapper>
+            {showPrevButton && (
+                <ButtonContainer className="scroll-btn" left onClick={prev}>
+                    <NavigateBeforeOutlinedIconStyle />
+                </ButtonContainer>
+            )}
+            {showNextButton && (
+                <ButtonContainer className="scroll-btn" right onClick={next}>
+                    <NavigateNextOutlinedIconStyle />
+                </ButtonContainer>
+            )}
+            <CarouselHorizontalList ref={scrollRef} hideMask={!showNextButton} className={className}>
+                {arrayOfChildren.map((child, index) => (
+                    <div ref={childRefs[index]}>{child}</div>
+                ))}
+            </CarouselHorizontalList>
+        </Wrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/carousel/HorizontalScroller.tsx b/datahub-web-react/src/app/sharedV2/carousel/HorizontalScroller.tsx
new file mode 100644
index 00000000000000..1f57d8f20abf0a
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/carousel/HorizontalScroller.tsx
@@ -0,0 +1,160 @@
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import styled from 'styled-components/macro';
+import NavigateNextOutlinedIcon from '@mui/icons-material/NavigateNextOutlined';
+import NavigateBeforeOutlinedIcon from '@mui/icons-material/NavigateBeforeOutlined';
+import { REDESIGN_COLORS } from '../../entityV2/shared/constants';
+
+const ScrollButton = styled.button<{
+    alwaysVisible: boolean;
+    size: number;
+    offset: number;
+    left?: boolean;
+    right?: boolean;
+}>`
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+    z-index: 2;
+    ${({ left, offset }) => left && `left: -${offset}px;`}
+    ${({ right, offset }) => right && `right: -${offset}px;`}
+
+    display: ${({ alwaysVisible }) => (alwaysVisible ? 'flex' : 'none')};
+
+    border: none;
+    cursor: pointer;
+    align-items: center;
+    justify-content: center;
+    width: ${({ size }) => size + 6}px;
+    height: ${({ size }) => size + 6}px;
+    border-radius: 50%;
+    color: ${REDESIGN_COLORS.BLACK};
+    background-color: ${REDESIGN_COLORS.WHITE};
+    transition: background-color 0.3s ease-in-out, color 0.3s ease-in-out;
+    box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.3);
+
+    &:hover {
+        color: ${REDESIGN_COLORS.WHITE};
+        background-color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    }
+`;
+
+const ScrollContainerWrapper = styled.div`
+    overflow-x: auto;
+    scrollbar-width: none;
+    width: 100%;
+`;
+
+const Wrapper = styled.div`
+    position: relative;
+
+    &:hover ${ScrollButton} {
+        display: flex;
+    }
+`;
+
+const StyledNavigateBeforeOutlinedIcon = styled(NavigateBeforeOutlinedIcon)<{ buttonSize: number }>`
+    font-size: ${(props) => props.buttonSize}px !important;
+`;
+
+const StyledNavigateNextOutlinedIcon = styled(NavigateNextOutlinedIcon)<{ buttonSize: number }>`
+    font-size: ${(props) => props.buttonSize}px !important;
+`;
+
+type Props = {
+    children: React.ReactNode;
+    scrollDistance?: number;
+    scrollButtonSize?: number;
+    scrollButtonOffset?: number;
+    alwaysVisible?: boolean;
+    className?: string;
+};
+
+const HorizontalScroller: React.FC<Props> = ({
+    children,
+    className,
+    scrollButtonOffset = 0,
+    scrollDistance = 150,
+    scrollButtonSize = 14,
+    alwaysVisible = false,
+}) => {
+    const contentRef = useRef<HTMLDivElement>(null);
+    const [showScrollLeft, setShowScrollLeft] = useState(false);
+    const [showScrollRight, setShowScrollRight] = useState(false);
+
+    const updateScrollButtons = useCallback(() => {
+        if (contentRef.current) {
+            const { scrollLeft, scrollWidth, clientWidth } = contentRef.current;
+            setShowScrollLeft(scrollLeft > 0);
+            setShowScrollRight(scrollWidth > clientWidth + scrollLeft + 1);
+        }
+    }, []);
+
+    useEffect(() => {
+        updateScrollButtons();
+    }, [updateScrollButtons]);
+
+    useEffect(() => {
+        if (!contentRef.current) return () => {};
+        const div = contentRef.current;
+        const child = contentRef.current.children[0];
+        new ResizeObserver(updateScrollButtons).observe(div);
+        if (child) {
+            // the child may change size by something like "see more" and we should react
+            new ResizeObserver(updateScrollButtons).observe(child);
+        }
+        div.addEventListener('scroll', updateScrollButtons);
+        return () => {
+            div.removeEventListener('scroll', updateScrollButtons);
+        };
+    }, [updateScrollButtons]);
+
+    const scrollLeft = () => {
+        if (contentRef.current) {
+            contentRef.current.scrollTo({
+                left: contentRef.current.scrollLeft - scrollDistance,
+                behavior: 'smooth',
+            });
+        }
+    };
+
+    const scrollRight = () => {
+        if (contentRef.current) {
+            contentRef.current.scrollTo({
+                left: contentRef.current.scrollLeft + scrollDistance,
+                behavior: 'smooth',
+            });
+        }
+    };
+
+    return (
+        <Wrapper>
+            {showScrollLeft && (
+                <ScrollButton
+                    onClick={scrollLeft}
+                    alwaysVisible={alwaysVisible}
+                    size={scrollButtonSize}
+                    offset={scrollButtonOffset}
+                    left
+                >
+                    <StyledNavigateBeforeOutlinedIcon buttonSize={scrollButtonSize} />
+                </ScrollButton>
+            )}
+            <ScrollContainerWrapper ref={contentRef} className={className}>
+                {children}
+            </ScrollContainerWrapper>
+            {showScrollRight && (
+                <ScrollButton
+                    onClick={scrollRight}
+                    alwaysVisible={alwaysVisible}
+                    size={scrollButtonSize}
+                    offset={scrollButtonOffset}
+                    right
+                >
+                    <StyledNavigateNextOutlinedIcon buttonSize={scrollButtonSize} />
+                </ScrollButton>
+            )}
+        </Wrapper>
+    );
+};
+
+export default HorizontalScroller;
diff --git a/datahub-web-react/src/app/sharedV2/colors.ts b/datahub-web-react/src/app/sharedV2/colors.ts
new file mode 100644
index 00000000000000..30d10e5bf182d8
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/colors.ts
@@ -0,0 +1,34 @@
+export const COLORS = {
+    blue_1: '#EFF8FC',
+    blue_2: '#D7EFF8',
+    blue_3: '#B8E3F2',
+    blue_4: '#97D5EC',
+    blue_5: '#78C9E6',
+    blue_6: '#5ABDE1',
+    blue_7: '#4DA1BF',
+    blue_8: '#4086A0',
+    blue_9: '#336C80',
+    blue_10: '#285565',
+
+    yellow_1: '#FEF9ED',
+    yellow_2: '#FCF1D3',
+    yellow_3: '#FAE6B1',
+    yellow_4: '#F8DA8C',
+    yellow_5: '#F6CF6A',
+    yellow_6: '#F4C449',
+    yellow_7: '#CFA73E',
+    yellow_8: '#AD8B34',
+    yellow_9: '#8B702A',
+    yellow_10: '#6E5821',
+
+    green_1: '#F1F8EE',
+    green_2: '#DEEED5',
+    green_3: '#C5E0B4',
+    green_4: '#A9D291',
+    green_5: '#8FC470',
+    green_6: '#77B750',
+    green_7: '#659C44',
+    green_8: '#548239',
+    green_9: '#44682E',
+    green_10: '#365224',
+};
diff --git a/datahub-web-react/src/app/sharedV2/colors/colorUtils.ts b/datahub-web-react/src/app/sharedV2/colors/colorUtils.ts
new file mode 100644
index 00000000000000..06fe330450e303
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/colors/colorUtils.ts
@@ -0,0 +1,34 @@
+export function hexToRgba(rawHex: string, opacity: number): string {
+    const [r, g, b] = hexToRgb(rawHex);
+
+    // Ensure opacity is a value between 0 and 1
+    const resultOpacity = Math.min(1, Math.max(0, opacity));
+
+    // Create the RGBA color string
+    const rgba = `rgba(${r}, ${g}, ${b}, ${resultOpacity})`;
+
+    return rgba;
+}
+
+export function hexToRgb(rawHex: string): [number, number, number] {
+    let hex = rawHex.replace('#', '');
+    if (hex.length === 3) {
+        hex += hex;
+    }
+    return [parseInt(hex.substring(0, 2), 16), parseInt(hex.substring(2, 4), 16), parseInt(hex.substring(4, 6), 16)];
+}
+
+/**
+ * Create an opaque color, that has the same hue as the input color with the specified opacity against the background color.
+ * @param hex The input color in hex format.
+ * @param backgroundHex The background color in hex format.
+ * @param opacity The opacity value between 0 and 100.
+ */
+export function applyOpacity(hex: string, backgroundHex: string, opacity: number) {
+    const [inputR, inputG, inputB] = hexToRgb(hex);
+    const [backgroundR, backgroundG, backgroundB] = hexToRgb(backgroundHex);
+    const r = Math.round((1 - opacity / 100) * backgroundR + (opacity / 100) * inputR);
+    const g = Math.round((1 - opacity / 100) * backgroundG + (opacity / 100) * inputG);
+    const b = Math.round((1 - opacity / 100) * backgroundB + (opacity / 100) * inputB);
+    return `rgb(${r}, ${g}, ${b})`;
+}
diff --git a/datahub-web-react/src/app/sharedV2/icons/CompactFieldIcon.tsx b/datahub-web-react/src/app/sharedV2/icons/CompactFieldIcon.tsx
new file mode 100644
index 00000000000000..7137dafa600166
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/icons/CompactFieldIcon.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import { Tooltip } from '@components';
+import {
+    BoldOutlined,
+    CalendarOutlined,
+    ClockCircleOutlined,
+    FieldBinaryOutlined,
+    FontColorsOutlined,
+    NumberOutlined,
+    ProfileOutlined,
+} from '@ant-design/icons';
+import { SchemaFieldDataType } from '../../../types.generated';
+
+export default function CompactFieldIcon(type?: SchemaFieldDataType): JSX.Element | null {
+    if (type === SchemaFieldDataType.Number) {
+        return <NumberOutlined />;
+    }
+    if (type === SchemaFieldDataType.String) {
+        return <FontColorsOutlined />;
+    }
+    if (type === SchemaFieldDataType.Date) {
+        return <CalendarOutlined />;
+    }
+    if (type === SchemaFieldDataType.Time) {
+        return <ClockCircleOutlined />;
+    }
+    if (type === SchemaFieldDataType.Boolean) {
+        return <BoldOutlined />;
+    }
+    if (type === SchemaFieldDataType.Bytes) {
+        return <FieldBinaryOutlined />;
+    }
+    return <ProfileOutlined />;
+}
+
+export function CompactFieldIconWithTooltip({
+    type,
+    nativeDataType,
+}: {
+    type: SchemaFieldDataType;
+    nativeDataType: string | null | undefined;
+}): JSX.Element {
+    return (
+        <Tooltip showArrow={false} placement="left" title={TypeTooltipTitle(type, nativeDataType)}>
+            {CompactFieldIcon(type)}
+        </Tooltip>
+    );
+}
+
+function TypeTooltipTitle(type: SchemaFieldDataType, nativeDataType: string | null | undefined) {
+    const label = (type === SchemaFieldDataType.Null && nativeDataType) || type;
+    return <span style={{ textTransform: 'capitalize' }}>{label.toLowerCase()}</span>;
+}
diff --git a/datahub-web-react/src/app/sharedV2/icons/ImageColoredBackground.tsx b/datahub-web-react/src/app/sharedV2/icons/ImageColoredBackground.tsx
new file mode 100644
index 00000000000000..37881ac26de00f
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/icons/ImageColoredBackground.tsx
@@ -0,0 +1,62 @@
+import React, { useCallback } from 'react';
+import styled from 'styled-components';
+import ColorThief from 'colorthief';
+import { REDESIGN_COLORS } from '../../entityV2/shared/constants';
+
+const Wrapper = styled.div<{ background?: string }>`
+    align-items: center;
+    background-color: ${({ background }) => background || 'transparent'};
+    display: flex;
+    justify-content: center;
+`;
+
+interface Props {
+    children?: JSX.Element;
+    className?: string;
+}
+
+export default function ImageColoredBackground({ children, className }: Props): JSX.Element {
+    const [background, setBackground] = React.useState<string | undefined>(undefined);
+
+    const ref = useCallback(
+        (node: HTMLDivElement) => {
+            if (node === null) {
+                return;
+            }
+            const image = node.getElementsByTagName('img')[0];
+            if (image) {
+                const colorThief = new ColorThief();
+                try {
+                    const [r, g, b] = colorThief.getColor(image, 25);
+                    setBackground(`rgb(${r}, ${g}, ${b}, .1)`);
+                } catch (_e) {
+                    image.onload = () => {
+                        if (background !== undefined) {
+                            return;
+                        }
+                        const [r, g, b] = colorThief.getColor(image, 25);
+                        setBackground(`rgb(${r}, ${g}, ${b}, .1)`);
+                        image.crossOrigin = 'anonymous';
+                    };
+                    image.onerror = () => {
+                        image.removeAttribute('crossOrigin');
+                        setBackground(REDESIGN_COLORS.BACKGROUND_GREY);
+                    };
+                }
+            }
+            const svg = node.getElementsByTagName('svg')[0];
+            if (svg) {
+                const color = window.getComputedStyle(svg).getPropertyValue('color');
+                const [, r, g, b] = color.match(/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/) || [0, 0, 0];
+                setBackground(`rgb(${r}, ${g}, ${b}, .1)`);
+            }
+        },
+        [background],
+    );
+
+    return (
+        <Wrapper ref={ref} background={background} className={className}>
+            {children}
+        </Wrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/icons/InfoPopover.tsx b/datahub-web-react/src/app/sharedV2/icons/InfoPopover.tsx
new file mode 100644
index 00000000000000..4f5a7c1e75fee9
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/icons/InfoPopover.tsx
@@ -0,0 +1,26 @@
+import { InfoCircleFilled, InfoCircleOutlined } from '@ant-design/icons';
+import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
+import { Popover } from '@components';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+
+const InfoWrapper = styled.div`
+    color: ${REDESIGN_COLORS.TITLE_PURPLE};
+`;
+
+interface Props {
+    content: React.ReactNode;
+    className?: string;
+}
+
+export default function InfoPopover({ content, className }: Props) {
+    const [showPopover, setShowPopover] = useState(false);
+
+    return (
+        <InfoWrapper className={className}>
+            <Popover placement="top" content={content} trigger="hover" open={showPopover} onOpenChange={setShowPopover}>
+                {showPopover ? <InfoCircleFilled /> : <InfoCircleOutlined />}
+            </Popover>
+        </InfoWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/icons/InfoTooltip.tsx b/datahub-web-react/src/app/sharedV2/icons/InfoTooltip.tsx
new file mode 100644
index 00000000000000..d0afef1e76ec66
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/icons/InfoTooltip.tsx
@@ -0,0 +1,33 @@
+import { InfoCircleFilled, InfoCircleOutlined } from '@ant-design/icons';
+import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
+import { Tooltip } from '@components';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+
+const InfoWrapper = styled.div`
+    color: ${REDESIGN_COLORS.TITLE_PURPLE};
+`;
+
+interface Props {
+    content: React.ReactNode;
+    className?: string;
+}
+
+export default function InfoTooltip({ content, className }: Props) {
+    const [showTooltip, setShowTooltip] = useState(false);
+
+    return (
+        <InfoWrapper className={className}>
+            <Tooltip
+                placement="top"
+                title={content}
+                trigger="hover"
+                open={showTooltip}
+                onOpenChange={setShowTooltip}
+                showArrow={false}
+            >
+                {showTooltip ? <InfoCircleFilled /> : <InfoCircleOutlined />}
+            </Tooltip>
+        </InfoWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/icons/PlatformIcon.tsx b/datahub-web-react/src/app/sharedV2/icons/PlatformIcon.tsx
new file mode 100644
index 00000000000000..cde4da172fef20
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/icons/PlatformIcon.tsx
@@ -0,0 +1,96 @@
+import React, { useCallback, useRef, useState } from 'react';
+import styled, { css, CSSObject } from 'styled-components/macro';
+import ColorThief from 'colorthief';
+import { DataPlatform, EntityType } from '../../../types.generated';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { IconStyleType } from '../../entityV2/Entity';
+import { getLighterRGBColor } from './colorUtils';
+import { REDESIGN_COLORS } from '../../entityV2/shared/constants';
+
+type PlatformIconProps = {
+    platform: DataPlatform | null | undefined;
+    size?: number;
+    color?: string;
+    alt?: string;
+    entityType?: EntityType;
+    styles?: CSSObject | undefined;
+    title?: string;
+    imageStyles?: CSSObject | undefined;
+    className?: string;
+    onError?: () => void;
+};
+
+const IconContainer = styled.div<{ background?: string; styles: CSSObject | undefined }>`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: auto;
+    padding: 6px;
+    border-radius: 8px;
+    background-color: ${(props) => props.background || 'transparent'};
+    ${({ styles }) => (styles ? css(styles) : undefined)};
+`;
+
+const PreviewImage = styled.img<{ size: number; imageStyles?: CSSObject | undefined }>`
+    height: ${(props) => props.size}px;
+    width: ${(props) => props.size}px;
+    min-width: ${(props) => props.size}px;
+    object-fit: contain;
+    background-color: transparent;
+    ${({ imageStyles }) => (imageStyles ? css(imageStyles) : undefined)};
+`;
+
+const PlatformIcon: React.FC<PlatformIconProps> = ({
+    platform,
+    size = 17,
+    alt = 'Platform Logo',
+    entityType = EntityType.DataPlatform,
+    color,
+    title,
+    styles,
+    imageStyles,
+    className,
+    onError,
+}) => {
+    const [background, setBackground] = useState<string | undefined>(undefined);
+    const imgRef = useRef<HTMLImageElement>(null);
+    const entityRegistry = useEntityRegistry();
+    const logoUrl = platform?.properties?.logoUrl;
+
+    const handleError = useCallback(() => {
+        const img = imgRef.current;
+        if (img) {
+            img.removeAttribute('crossOrigin');
+            setBackground(REDESIGN_COLORS.BACKGROUND_GREY);
+        }
+        onError?.();
+    }, [onError, setBackground]);
+
+    return (
+        <IconContainer background={background} styles={styles} title={title} className={className}>
+            {logoUrl ? (
+                <PreviewImage
+                    crossOrigin="anonymous"
+                    ref={imgRef}
+                    src={logoUrl}
+                    alt={alt}
+                    size={size}
+                    imageStyles={imageStyles}
+                    onLoad={() => {
+                        const img = imgRef.current;
+                        if (img && img.width > 0 && img.height > 0) {
+                            const colorThief = new ColorThief();
+                            const [r, g, b] = colorThief.getColor(img, 25);
+                            setBackground(`rgb(${getLighterRGBColor(r, g, b).join(', ')})`);
+                        }
+                    }}
+                    onError={handleError}
+                />
+            ) : (
+                entityRegistry.getIcon(entityType, size, IconStyleType.ACCENT, color)
+            )}
+        </IconContainer>
+    );
+};
+
+export default PlatformIcon;
diff --git a/datahub-web-react/src/app/sharedV2/icons/colorUtils.ts b/datahub-web-react/src/app/sharedV2/icons/colorUtils.ts
new file mode 100644
index 00000000000000..e352fa4d95a4f9
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/icons/colorUtils.ts
@@ -0,0 +1,7 @@
+export const getLighterRGBColor = (red, green, blue) => {
+    const lighterRed = red + 0.9 * (255 - red);
+    const lighterGreen = green + 0.9 * (255 - green);
+    const lighterBlue = blue + 0.9 * (255 - blue);
+
+    return [lighterRed, lighterGreen, lighterBlue];
+};
diff --git a/datahub-web-react/src/app/sharedV2/icons/customIcons/CustomIcon.tsx b/datahub-web-react/src/app/sharedV2/icons/customIcons/CustomIcon.tsx
new file mode 100644
index 00000000000000..350ce64d2dbf17
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/icons/customIcons/CustomIcon.tsx
@@ -0,0 +1,14 @@
+// this component can be use for added custom icon by just passing the svg file path
+import React from 'react';
+
+interface Props {
+    iconSvg: string;
+}
+
+export const CustomIcon = ({ iconSvg }: Props) => {
+    return (
+        <div>
+            <img src={iconSvg} alt="Icon" />
+        </div>
+    );
+};
diff --git a/datahub-web-react/src/app/sharedV2/icons/customIcons/add-term.svg b/datahub-web-react/src/app/sharedV2/icons/customIcons/add-term.svg
new file mode 100644
index 00000000000000..0e511c12d83674
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/icons/customIcons/add-term.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2.06674 11.2886H6.86222V12.4503H2.06674C1.67553 12.4503 1.3444 12.3148 1.07334 12.0437C0.80228 11.7727 0.666748 11.4415 0.666748 11.0503V2.23332C0.666748 1.84211 0.80228 1.51097 1.07334 1.23991C1.3444 0.968845 1.67553 0.833313 2.06674 0.833313H10.8837C11.2749 0.833313 11.6061 0.968845 11.8771 1.23991C12.1482 1.51097 12.2837 1.84211 12.2837 2.23332V7.02911H11.122V2.23332C11.122 2.17374 11.0972 2.11912 11.0476 2.06946C10.9979 2.01982 10.9433 1.995 10.8837 1.995H9.57311V6.46307C9.57311 6.60306 9.51478 6.70806 9.39811 6.77806C9.28144 6.84806 9.16354 6.84285 9.0444 6.76244L8.19248 6.26052C8.07333 6.18803 7.94946 6.15179 7.82089 6.15179C7.69231 6.15179 7.5749 6.18803 7.46866 6.26052L6.61674 6.76244C6.48965 6.84285 6.36976 6.84806 6.25706 6.77806C6.14438 6.70806 6.08803 6.60306 6.08803 6.46307V1.995H2.06674C2.00715 1.995 1.95254 2.01982 1.9029 2.06946C1.85324 2.11912 1.82841 2.17374 1.82841 2.23332V11.0503C1.82841 11.1099 1.85324 11.1645 1.9029 11.2142C1.95254 11.2638 2.00715 11.2886 2.06674 11.2886ZM8.48258 12.3682H11.0271V14.9127C11.0271 15.0775 11.0838 15.2166 11.1971 15.3299C11.3105 15.4433 11.4496 15.5 11.6144 15.5C11.7792 15.5 11.9183 15.4433 12.0317 15.3299C12.145 15.2166 12.2017 15.0775 12.2017 14.9127V12.3682H14.7462C14.911 12.3682 15.0501 12.3115 15.1635 12.1981C15.2769 12.0847 15.3335 11.9457 15.3335 11.7808C15.3335 11.616 15.2769 11.477 15.1635 11.3636C15.0501 11.2502 14.911 11.1935 14.7462 11.1935H12.2017V8.64903C12.2017 8.48421 12.145 8.34512 12.0317 8.23175C11.9183 8.11839 11.7792 8.06171 11.6144 8.06171C11.4496 8.06171 11.3105 8.11839 11.1971 8.23175C11.0838 8.34512 11.0271 8.48421 11.0271 8.64903V11.1935H8.48258C8.31777 11.1935 8.17868 11.2502 8.06531 11.3636C7.95195 11.477 7.89526 11.616 7.89526 11.7808C7.89526 11.9457 7.95195 12.0847 8.06531 12.1981C8.17868 12.3115 8.31777 12.3682 8.48258 12.3682Z" fill="#533FD1"/>
+</svg>
diff --git a/datahub-web-react/src/app/sharedV2/icons/getTypeIcon.tsx b/datahub-web-react/src/app/sharedV2/icons/getTypeIcon.tsx
new file mode 100644
index 00000000000000..f29f863d267ea3
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/icons/getTypeIcon.tsx
@@ -0,0 +1,36 @@
+import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
+import { Tooltip } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import { EntityType } from '../../../types.generated';
+import { getSubTypeIcon } from '../../entityV2/shared/components/subtypes';
+import { EntityRegistry } from '../../../entityRegistryContext';
+import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
+
+const StyledTooltip = styled(Tooltip)`
+    color: ${REDESIGN_COLORS.TEXT_GREY};
+`;
+
+export default function getTypeIcon(
+    entityRegistry: EntityRegistry,
+    type: EntityType,
+    subtype?: string,
+    includeTitle?: boolean,
+) {
+    // TODO: Remove type ignore once EntityRegistry V1 icon method has optional arguments
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    const icon = (subtype && getSubTypeIcon(subtype)) || entityRegistry.getIcon(type, '1em');
+    if (includeTitle) {
+        return (
+            <StyledTooltip
+                title={capitalizeFirstLetterOnly(subtype) || entityRegistry.getEntityName(type)}
+                mouseEnterDelay={0.3}
+                showArrow={false}
+            >
+                {icon}
+            </StyledTooltip>
+        );
+    }
+    return icon;
+}
diff --git a/datahub-web-react/src/app/sharedV2/pagination/usePagination.ts b/datahub-web-react/src/app/sharedV2/pagination/usePagination.ts
new file mode 100644
index 00000000000000..efa29ce51c043b
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/pagination/usePagination.ts
@@ -0,0 +1,19 @@
+import { useState } from 'react';
+
+export interface Pagination {
+    page: number;
+    setPage: React.Dispatch<React.SetStateAction<number>>;
+    pageSize: number;
+    setPageSize: React.Dispatch<React.SetStateAction<number>>;
+    start: number;
+    count: number;
+}
+
+export default function usePagination(defaultPageSize?: number) {
+    const [page, setPage] = useState(1);
+    const [pageSize, setPageSize] = useState(defaultPageSize || 10);
+
+    const start = (page - 1) * pageSize;
+
+    return { page, setPage, pageSize, setPageSize, start, count: pageSize } as Pagination;
+}
diff --git a/datahub-web-react/src/app/sharedV2/propagation/DocumentationPropagationDetails.tsx b/datahub-web-react/src/app/sharedV2/propagation/DocumentationPropagationDetails.tsx
new file mode 100644
index 00000000000000..2ab714c6ebde5b
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/propagation/DocumentationPropagationDetails.tsx
@@ -0,0 +1,109 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Popover } from '@components';
+import PropagationEntityLink from './PropagationEntityLink';
+import { usePropagationDetails } from './utils';
+import { PropagateThunderbolt, PropagateThunderboltFilled } from './PropagationIcon';
+import { StringMapEntry } from '../../../types.generated';
+
+const PopoverWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+`;
+
+const PopoverTitle = styled.div`
+    font-weight: bold;
+    font-size: 14px;
+    padding: 6px 0px;
+    color: #eeecfa;
+`;
+
+const PopoverDescription = styled.div`
+    max-width: 340px;
+    font-size: 14px;
+    color: #eeecfa;
+    display: inline;
+    padding: 0px 0px 8px 0px;
+`;
+
+const PopoverAttributes = styled.div`
+    display: flex;
+`;
+
+const PopoverAttribute = styled.div`
+    margin-right: 12px;
+    margin-bottom: 4px;
+`;
+
+const PopoverAttributeTitle = styled.div`
+    font-size: 14px;
+    color: #eeecfa;
+    font-weight: bold;
+    margin: 8px 0px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+`;
+
+const PopoverDocumentation = styled.a`
+    margin-top: 12px;
+`;
+
+interface Props {
+    sourceDetail?: StringMapEntry[] | null;
+}
+
+export default function DocumentationPropagationDetails({ sourceDetail }: Props) {
+    const {
+        isPropagated,
+        origin: { entity: originEntity },
+        via: { entity: viaEntity },
+    } = usePropagationDetails(sourceDetail);
+
+    if (!sourceDetail || !isPropagated) return null;
+
+    const popoverContent =
+        originEntity || viaEntity ? (
+            <PopoverWrapper>
+                <PopoverDescription>
+                    This description was automatically propagated from an upstream column.{' '}
+                    <PopoverDocumentation
+                        href="https://datahubproject.io/docs/automation/docs-propagation"
+                        target="_blank"
+                        rel="noopener noreferrer"
+                    >
+                        Learn more
+                    </PopoverDocumentation>
+                </PopoverDescription>
+                <PopoverAttributes>
+                    {originEntity && originEntity.urn !== viaEntity?.urn && (
+                        <PopoverAttribute>
+                            <PopoverAttributeTitle>Origin</PopoverAttributeTitle>
+                            <PropagationEntityLink entity={originEntity} />
+                        </PopoverAttribute>
+                    )}
+                    {viaEntity && (
+                        <PopoverAttribute>
+                            <PopoverAttributeTitle>Via</PopoverAttributeTitle>
+                            <PropagationEntityLink entity={viaEntity} />
+                        </PopoverAttribute>
+                    )}
+                </PopoverAttributes>
+            </PopoverWrapper>
+        ) : undefined;
+
+    return (
+        <Popover
+            overlayInnerStyle={{ backgroundColor: '#272D48' }}
+            showArrow={false}
+            title={
+                <PopoverTitle>
+                    <PropagateThunderboltFilled />
+                    Propagated Description
+                </PopoverTitle>
+            }
+            content={popoverContent}
+        >
+            <PropagateThunderbolt data-testid="docPropagationIndicator" />
+        </Popover>
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/propagation/LabelPropagationDetails.tsx b/datahub-web-react/src/app/sharedV2/propagation/LabelPropagationDetails.tsx
new file mode 100644
index 00000000000000..4253c3eb1ac5d1
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/propagation/LabelPropagationDetails.tsx
@@ -0,0 +1,94 @@
+import { Popover } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import { EntityType } from '@src/types.generated';
+import { usePropagationContextEntities, PropagationContext } from '../tags/usePropagationContextEntities';
+import PropagationEntityLink from './PropagationEntityLink';
+import { PropagateThunderbolt, PropagateThunderboltFilled } from './PropagationIcon';
+import { PropagationRelationshipType } from './utils';
+
+const PopoverWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+`;
+
+const PopoverTitle = styled.div`
+    font-weight: bold;
+    font-size: 14px;
+    padding: 6px 0px;
+    color: #eeecfa;
+`;
+
+const PopoverDescription = styled.div`
+    max-width: 340px;
+    font-size: 14px;
+    color: #eeecfa;
+    display: inline;
+    padding: 0px 0px 8px 0px;
+`;
+
+const PopoverAttributes = styled.div`
+    display: flex;
+`;
+
+const PopoverAttribute = styled.div`
+    margin-right: 12px;
+    margin-bottom: 4px;
+`;
+
+const PopoverAttributeTitle = styled.div`
+    font-size: 14px;
+    color: #eeecfa;
+    font-weight: bold;
+    margin: 8px 0px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+`;
+
+interface Props {
+    entityType: EntityType;
+    context?: string | null;
+}
+
+export default function LabelPropagationDetails({ entityType, context }: Props) {
+    const contextObj = context ? (JSON.parse(context) as PropagationContext) : null;
+    const isPropagated = contextObj?.propagated;
+    const { originEntity } = usePropagationContextEntities(contextObj);
+    const isSiblingsRelationship = contextObj?.relationship === PropagationRelationshipType.SIBLINGS;
+
+    if (!isPropagated || !originEntity || (EntityType.GlossaryTerm !== entityType && entityType !== EntityType.Tag))
+        return null;
+
+    const popoverContent = originEntity ? (
+        <PopoverWrapper>
+            <PopoverDescription>
+                This {EntityType.GlossaryTerm === entityType ? 'Glossary Term' : 'Tag'} was automatically propagated
+                from {isSiblingsRelationship ? 'a sibling' : 'an upstream'}.{' '}
+            </PopoverDescription>
+            <PopoverAttributes>
+                {originEntity && (
+                    <PopoverAttribute>
+                        <PopoverAttributeTitle>Origin</PopoverAttributeTitle>
+                        <PropagationEntityLink entity={originEntity} />
+                    </PopoverAttribute>
+                )}
+            </PopoverAttributes>
+        </PopoverWrapper>
+    ) : undefined;
+
+    return (
+        <Popover
+            overlayInnerStyle={{ backgroundColor: '#272D48' }}
+            showArrow={false}
+            title={
+                <PopoverTitle>
+                    <PropagateThunderboltFilled fontSize={16} />
+                    Propagated {EntityType.GlossaryTerm === entityType ? 'Glossary Term' : 'Tag'}
+                </PopoverTitle>
+            }
+            content={popoverContent}
+        >
+            <PropagateThunderbolt fontSize={14} data-testid="glossaryTermPropagationIndicator" />
+        </Popover>
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/propagation/PropagationEntityLink.tsx b/datahub-web-react/src/app/sharedV2/propagation/PropagationEntityLink.tsx
new file mode 100644
index 00000000000000..09c5173d431f34
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/propagation/PropagationEntityLink.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Link } from 'react-router-dom';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { Entity, EntityType, SchemaFieldEntity } from '../../../types.generated';
+import { GenericEntityProperties } from '../../entity/shared/types';
+
+const PreviewImage = styled.img<{ size: number }>`
+    height: ${(props) => props.size}px;
+    width: ${(props) => props.size}px;
+    min-width: ${(props) => props.size}px;
+    object-fit: contain;
+    background-color: transparent;
+    margin: 0px 4px 0px 0px;
+`;
+
+const StyledLink = styled(Link)`
+    margin-right: 4px;
+    display: flex;
+    align-items: center;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+`;
+
+interface Props {
+    entity: Entity;
+}
+
+export default function PropagationEntityLink({ entity }: Props) {
+    const entityRegistry = useEntityRegistry();
+
+    const isSchemaField = entity.type === EntityType.SchemaField;
+    const baseEntity = isSchemaField ? (entity as SchemaFieldEntity).parent : entity;
+
+    const logoUrl = (baseEntity as GenericEntityProperties)?.platform?.properties?.logoUrl || '';
+    let entityUrl = entityRegistry.getEntityUrl(baseEntity.type, baseEntity.urn);
+    let entityDisplayName = entityRegistry.getDisplayName(baseEntity.type, baseEntity);
+
+    if (isSchemaField) {
+        entityUrl = `${entityUrl}/${encodeURIComponent('Columns')}?schemaFilter=${encodeURIComponent(
+            (entity as SchemaFieldEntity).fieldPath,
+        )}`;
+        const schemaFieldName = entityRegistry.getDisplayName(entity.type, entity);
+        entityDisplayName = `${entityDisplayName}.${schemaFieldName}`;
+    }
+
+    return (
+        <>
+            <StyledLink to={entityUrl}>
+                <PreviewImage src={logoUrl} alt="test" size={14} />
+                {entityDisplayName}
+            </StyledLink>
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/propagation/PropagationIcon.tsx b/datahub-web-react/src/app/sharedV2/propagation/PropagationIcon.tsx
new file mode 100644
index 00000000000000..f3acdd910ac7e3
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/propagation/PropagationIcon.tsx
@@ -0,0 +1,22 @@
+import styled from 'styled-components';
+import { ThunderboltFilled } from '@ant-design/icons';
+import { REDESIGN_COLORS } from '../../entityV2/shared/constants';
+
+export const PropagateThunderbolt = styled(ThunderboltFilled)<{ fontSize?: number }>`
+    && {
+        color: #a7c7fa;
+    }
+    font-size: ${(props) => props.fontSize || 16}px;
+    &:hover {
+        color: ${REDESIGN_COLORS.BLUE};
+    }
+    margin-right: 4px;
+`;
+
+export const PropagateThunderboltFilled = styled(ThunderboltFilled)<{ fontSize?: number }>`
+    && {
+        color: ${REDESIGN_COLORS.BLUE};
+    }
+    font-size: ${(props) => props.fontSize || 16}px;
+    margin-right: 4px;
+`;
diff --git a/datahub-web-react/src/app/sharedV2/propagation/utils.ts b/datahub-web-react/src/app/sharedV2/propagation/utils.ts
new file mode 100644
index 00000000000000..8d667127c2b150
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/propagation/utils.ts
@@ -0,0 +1,30 @@
+import { StringMapEntry } from '../../../types.generated';
+import { useGetEntities } from '../useGetEntities';
+
+export enum PropagationRelationshipType {
+    LINEAGE = 'lineage',
+    HIERARCHY = 'hierarchy',
+    SIBLINGS = 'siblings',
+}
+
+export function usePropagationDetails(sourceDetail?: StringMapEntry[] | null) {
+    const isPropagated = !!sourceDetail?.find((mapEntry) => mapEntry.key === 'propagated' && mapEntry.value === 'true');
+    const originEntityUrn = sourceDetail?.find((mapEntry) => mapEntry.key === 'origin')?.value || '';
+    const viaEntityUrn = sourceDetail?.find((mapEntry) => mapEntry.key === 'via')?.value || '';
+
+    const entities = useGetEntities([originEntityUrn, viaEntityUrn]);
+    const originEntity = entities.find((e) => e.urn === originEntityUrn);
+    const viaEntity = entities.find((e) => e.urn === viaEntityUrn);
+
+    return {
+        isPropagated,
+        origin: {
+            urn: originEntityUrn,
+            entity: originEntity,
+        },
+        via: {
+            urn: viaEntityUrn,
+            entity: viaEntity,
+        },
+    };
+}
diff --git a/datahub-web-react/src/app/sharedV2/search/DownloadButton.tsx b/datahub-web-react/src/app/sharedV2/search/DownloadButton.tsx
new file mode 100644
index 00000000000000..677ff48e9abda5
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/search/DownloadButton.tsx
@@ -0,0 +1,42 @@
+import { DownloadOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+import { Tooltip } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import { SEARCH_COLORS } from '../../entityV2/shared/constants';
+
+const DownloadCsvButton = styled(Button)`
+    font-size: 8px;
+    padding-left: 12px;
+    padding-right: 12px;
+    background-color: ${SEARCH_COLORS.TITLE_PURPLE};
+    color: #ffffff;
+    :hover {
+        background-color: #ffffff;
+        color: ${SEARCH_COLORS.TITLE_PURPLE};
+        border: 1px solid ${SEARCH_COLORS.TITLE_PURPLE};
+    }
+    height: 28px;
+    margin: 0px 8px;
+`;
+
+type Props = {
+    setShowDownloadAsCsvModal: (showDownloadAsCsvModal: boolean) => any;
+    isDownloadingCsv: boolean;
+    disabled?: boolean;
+};
+
+export default function DownloadButton({ setShowDownloadAsCsvModal, isDownloadingCsv, disabled }: Props) {
+    return (
+        <Tooltip title="Download results..." showArrow={false} placement="top">
+            <DownloadCsvButton
+                type="text"
+                onClick={() => setShowDownloadAsCsvModal(true)}
+                disabled={isDownloadingCsv || disabled}
+            >
+                <DownloadOutlined />
+                {isDownloadingCsv ? 'Downloading...' : null}
+            </DownloadCsvButton>
+        </Tooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/search/EditButton.tsx b/datahub-web-react/src/app/sharedV2/search/EditButton.tsx
new file mode 100644
index 00000000000000..e8d2c84767f463
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/search/EditButton.tsx
@@ -0,0 +1,35 @@
+import { EditOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
+import { Tooltip } from '@components';
+import React from 'react';
+import styled from 'styled-components';
+import { SEARCH_COLORS } from '../../entityV2/shared/constants';
+
+const StyledButton = styled(Button)`
+    font-size: 8px;
+    padding-left: 12px;
+    padding-right: 12px;
+    background-color: ${SEARCH_COLORS.TITLE_PURPLE};
+    color: #ffffff;
+    :hover {
+        background-color: #ffffff;
+        color: ${SEARCH_COLORS.TITLE_PURPLE};
+        border: 1px solid ${SEARCH_COLORS.TITLE_PURPLE};
+    }
+    height: 28px;
+`;
+
+type Props = {
+    setShowSelectMode: (showSelectMode: boolean) => any;
+    disabled?: boolean;
+};
+
+export default function EditButton({ setShowSelectMode, disabled }: Props) {
+    return (
+        <Tooltip title="Edit..." showArrow={false} placement="top">
+            <StyledButton type="text" onClick={() => setShowSelectMode(true)} disabled={disabled}>
+                <EditOutlined />
+            </StyledButton>
+        </Tooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/search/SearchMenuItems.tsx b/datahub-web-react/src/app/sharedV2/search/SearchMenuItems.tsx
new file mode 100644
index 00000000000000..0745868985d87e
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/search/SearchMenuItems.tsx
@@ -0,0 +1,50 @@
+import React, { useState } from 'react';
+import { AndFilterInput } from '../../../types.generated';
+import { DownloadSearchResults, DownloadSearchResultsInput } from '../../searchV2/utils/types';
+import DownloadAsCsvModal from '../../entityV2/shared/components/styled/search/DownloadAsCsvModal';
+import EditButton from './EditButton';
+import DownloadButton from './DownloadButton';
+
+type Props = {
+    filters: AndFilterInput[];
+    query: string;
+    viewUrn?: string;
+    totalResults?: number;
+    setShowSelectMode?: (showSelectMode: boolean) => any;
+    downloadSearchResults: (input: DownloadSearchResultsInput) => Promise<DownloadSearchResults | null | undefined>;
+};
+
+export default function SearchMenuItems({
+    filters,
+    query,
+    viewUrn,
+    totalResults,
+    setShowSelectMode,
+    downloadSearchResults,
+}: Props) {
+    const [isDownloadingCsv, setIsDownloadingCsv] = useState(false);
+    const [showDownloadAsCsvModal, setShowDownloadAsCsvModal] = useState(false);
+
+    const totalResultsIsZero = totalResults === 0 || totalResults === undefined || totalResults === null;
+
+    return (
+        <>
+            <DownloadButton
+                disabled={totalResultsIsZero}
+                isDownloadingCsv={isDownloadingCsv}
+                setShowDownloadAsCsvModal={setShowDownloadAsCsvModal}
+            />
+            {setShowSelectMode && <EditButton setShowSelectMode={setShowSelectMode} disabled={totalResultsIsZero} />}
+            <DownloadAsCsvModal
+                downloadSearchResults={downloadSearchResults}
+                filters={filters}
+                query={query}
+                viewUrn={viewUrn}
+                setIsDownloadingCsv={setIsDownloadingCsv}
+                showDownloadAsCsvModal={showDownloadAsCsvModal}
+                setShowDownloadAsCsvModal={setShowDownloadAsCsvModal}
+                totalResults={totalResults}
+            />
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/sidebar/components.tsx b/datahub-web-react/src/app/sharedV2/sidebar/components.tsx
new file mode 100644
index 00000000000000..3b42abcc31066f
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/sidebar/components.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import ChevronRightIcon from '@mui/icons-material/ChevronRight';
+import styled from 'styled-components';
+import { RotatingButton } from '../../shared/components';
+
+export const SidebarWrapper = styled.div<{ width: number; $isShowNavBarRedesign?: boolean }>`
+    max-height: 100%;
+    width: ${(props) => props.width}px;
+    min-width: ${(props) => props.width}px;
+    display: ${(props) => (props.width ? 'block' : 'none')};
+    background-color: #fff;
+    border-radius: ${(props) =>
+        props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '8px'};
+    ${(props) => !props.$isShowNavBarRedesign && 'margin-bottom: 12px;'}
+    ${(props) =>
+        props.$isShowNavBarRedesign &&
+        `
+        box-shadow: ${props.theme.styles['box-shadow-navbar-redesign']};
+    `}
+`;
+
+export function RotatingTriangle({
+    isOpen,
+    onClick,
+    dataTestId,
+}: {
+    isOpen: boolean;
+    onClick?: () => void;
+    dataTestId?: string;
+}) {
+    return (
+        <RotatingButton
+            ghost
+            size="small"
+            type="ghost"
+            deg={isOpen ? 90 : 0}
+            icon={<ChevronRightIcon style={{ color: 'black' }} />}
+            onClick={onClick}
+            data-testid={dataTestId}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/sidebar/useSidebarWidth.ts b/datahub-web-react/src/app/sharedV2/sidebar/useSidebarWidth.ts
new file mode 100644
index 00000000000000..29e66f8a3da91a
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/sidebar/useSidebarWidth.ts
@@ -0,0 +1,22 @@
+import { useCallback, useEffect, useState } from 'react';
+
+export function useWindowResize(callback: () => void): void {
+    useEffect(() => {
+        window.addEventListener('resize', callback);
+
+        return () => {
+            window.removeEventListener('resize', callback);
+        };
+    }, [callback]);
+}
+
+export default function useSidebarWidth(ratio = 0.3): number {
+    const [width, setWidth] = useState(window.innerWidth * ratio);
+
+    const resize = useCallback(() => {
+        setWidth(window.innerWidth * ratio);
+    }, [ratio]);
+    useWindowResize(resize);
+
+    return width;
+}
diff --git a/datahub-web-react/src/app/sharedV2/sorting/useSorting.ts b/datahub-web-react/src/app/sharedV2/sorting/useSorting.ts
new file mode 100644
index 00000000000000..ab8cc5f25a5159
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/sorting/useSorting.ts
@@ -0,0 +1,29 @@
+import { useState } from 'react';
+import { SortOrder } from '../../../types.generated';
+
+export interface Sorting {
+    sortField: string | null;
+    setSortField: React.Dispatch<React.SetStateAction<string | null>>;
+    sortOrder: SortOrder;
+    setSortOrder: (sortOrder: string | SortOrder | null) => void;
+}
+
+export default function useSorting() {
+    const [sortField, setSortField] = useState<string | null>(null);
+    const [sortOrder, setSortOrder] = useState<SortOrder | null>(SortOrder.Ascending);
+
+    function handleSetSortOrder(newOrder: string | SortOrder | null) {
+        if (newOrder?.toLocaleLowerCase() === SortOrder.Ascending.toLocaleLowerCase() || newOrder === 'ascend') {
+            setSortOrder(SortOrder.Ascending);
+        } else if (
+            newOrder?.toLocaleLowerCase() === SortOrder.Descending.toLocaleLowerCase() ||
+            newOrder === 'descend'
+        ) {
+            setSortOrder(SortOrder.Descending);
+        } else {
+            setSortOrder(null);
+        }
+    }
+
+    return { sortField, setSortField, sortOrder, setSortOrder: handleSetSortOrder } as Sorting;
+}
diff --git a/datahub-web-react/src/app/sharedV2/tags/AddTagTerm.tsx b/datahub-web-react/src/app/sharedV2/tags/AddTagTerm.tsx
new file mode 100644
index 00000000000000..395de9ec7133af
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/tags/AddTagTerm.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+
+import { EntityType, SubResourceType } from '../../../types.generated';
+
+import EditTagTermsModal from '../../shared/tags/AddTagsTermsModal';
+
+type Props = {
+    onOpenModal?: () => void;
+    entityUrn?: string;
+    entityType?: EntityType;
+    entitySubresource?: string;
+    refetch?: () => Promise<any>;
+    showAddModal: boolean;
+    setShowAddModal: React.Dispatch<React.SetStateAction<boolean>>;
+    addModalType: any;
+};
+
+export default function AddTagTerm({
+    onOpenModal,
+    entityUrn,
+    entityType,
+    entitySubresource,
+    refetch,
+    showAddModal,
+    setShowAddModal,
+    addModalType,
+}: Props) {
+    return (
+        <>
+            {showAddModal && !!entityUrn && !!entityType && (
+                <EditTagTermsModal
+                    type={addModalType}
+                    open
+                    onCloseModal={() => {
+                        onOpenModal?.();
+                        setShowAddModal(false);
+                        setTimeout(() => refetch?.(), 2000);
+                    }}
+                    resources={[
+                        {
+                            resourceUrn: entityUrn,
+                            subResource: entitySubresource,
+                            subResourceType: entitySubresource ? SubResourceType.DatasetField : null,
+                        },
+                    ]}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/tags/DataProductLink.tsx b/datahub-web-react/src/app/sharedV2/tags/DataProductLink.tsx
new file mode 100644
index 00000000000000..1589720294109f
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/tags/DataProductLink.tsx
@@ -0,0 +1,131 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import { CloseOutlined } from '@ant-design/icons';
+import { DataProduct as DataProductEntity, EntityType } from '../../../types.generated';
+import { IconStyleType } from '../../entity/Entity';
+import { HoverEntityTooltip } from '../../recommendations/renderer/component/HoverEntityTooltip';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import { useEmbeddedProfileLinkProps } from '../../shared/useEmbeddedProfileLinkProps';
+
+const DataProductLinkContainer = styled(Link)`
+    display: inline-block;
+`;
+
+const DataProductWrapper = styled.span`
+    display: inline-block;
+    margin-bottom: 8px;
+`;
+
+const CloseButton = styled.div`
+    margin-left: 4px;
+    :hover {
+        cursor: pointer;
+    }
+    && {
+        color: ${ANTD_GRAY[7]};
+    }
+`;
+
+const StyledCloseOutlined = styled(CloseOutlined)`
+    && {
+        font-size: 10px;
+    }
+`;
+
+const IconWrapper = styled.span`
+    margin-right: 6px;
+`;
+
+const StyledTag = styled.div<{ fontSize?: number }>`
+    ${(props) => props.fontSize && `font-size: ${props.fontSize}px;`}
+    display: flex;
+    align-items: center;
+    justify-content: start;
+`;
+
+interface ContentProps {
+    dataProduct: DataProductEntity;
+    name?: string;
+    closable?: boolean;
+    onClose?: (e: any) => void;
+    tagStyle?: any | undefined;
+    fontSize?: number;
+}
+
+function DataProductContent({ dataProduct, name, closable, onClose, tagStyle, fontSize }: ContentProps) {
+    const entityRegistry = useEntityRegistry();
+
+    const displayName = name || entityRegistry.getDisplayName(EntityType.DataProduct, dataProduct);
+
+    return (
+        <StyledTag style={tagStyle} fontSize={fontSize}>
+            <IconWrapper>
+                {entityRegistry.getIcon(EntityType.DataProduct, fontSize || 10, IconStyleType.ACCENT, ANTD_GRAY[9])}
+            </IconWrapper>
+            {displayName}
+            {closable && (
+                <CloseButton onClick={onClose}>
+                    <StyledCloseOutlined />
+                </CloseButton>
+            )}
+        </StyledTag>
+    );
+}
+
+export type Props = {
+    dataProduct: DataProductEntity;
+    name?: string;
+    closable?: boolean;
+    onClose?: (e: any) => void;
+    tagStyle?: any | undefined;
+    readOnly?: boolean;
+    fontSize?: number;
+};
+
+export const DataProductLink = ({
+    dataProduct,
+    name,
+    closable,
+    onClose,
+    tagStyle,
+    readOnly,
+    fontSize,
+}: Props): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    const linkProps = useEmbeddedProfileLinkProps();
+    const urn = dataProduct?.urn;
+
+    if (readOnly) {
+        return (
+            <HoverEntityTooltip entity={dataProduct}>
+                <DataProductWrapper>
+                    <DataProductContent
+                        dataProduct={dataProduct}
+                        name={name}
+                        closable={closable}
+                        onClose={onClose}
+                        tagStyle={tagStyle}
+                        fontSize={fontSize}
+                    />
+                </DataProductWrapper>
+            </HoverEntityTooltip>
+        );
+    }
+
+    return (
+        <HoverEntityTooltip entity={dataProduct}>
+            <DataProductLinkContainer to={entityRegistry.getEntityUrl(EntityType.DataProduct, urn)} {...linkProps}>
+                <DataProductContent
+                    dataProduct={dataProduct}
+                    name={name}
+                    closable={closable}
+                    onClose={onClose}
+                    tagStyle={tagStyle}
+                    fontSize={fontSize}
+                />
+            </DataProductLinkContainer>
+        </HoverEntityTooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/sharedV2/tags/DomainLink.tsx b/datahub-web-react/src/app/sharedV2/tags/DomainLink.tsx
new file mode 100644
index 00000000000000..9368784544e45c
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/tags/DomainLink.tsx
@@ -0,0 +1,117 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { CloseOutlined } from '@ant-design/icons';
+import styled from 'styled-components';
+import { Domain as DomainEntity, EntityType } from '../../../types.generated';
+import { HoverEntityTooltip } from '../../recommendations/renderer/component/HoverEntityTooltip';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { ANTD_GRAY } from '../../entity/shared/constants';
+import { DomainColoredIcon } from '../../entityV2/shared/links/DomainColoredIcon';
+import { useEmbeddedProfileLinkProps } from '../../shared/useEmbeddedProfileLinkProps';
+
+const DomainLinkContainer = styled(Link)`
+    display: inline-block;
+`;
+
+const DomainWrapper = styled.span`
+    display: inline-block;
+    margin-bottom: 8px;
+`;
+
+const CloseButton = styled.div`
+    margin-left: 4px;
+    :hover {
+        cursor: pointer;
+    }
+    && {
+        color: ${ANTD_GRAY[7]};
+    }
+`;
+
+const StyledCloseOutlined = styled(CloseOutlined)`
+    && {
+        font-size: 10px;
+    }
+`;
+
+const StyledTag = styled.div<{ fontSize?: number }>`
+    ${(props) => props.fontSize && `font-size: ${props.fontSize}px;`}
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    gap: 5px;
+`;
+
+interface DomainContentProps {
+    domain: DomainEntity;
+    name?: string;
+    closable?: boolean;
+    onClose?: (e: any) => void;
+    tagStyle?: any | undefined;
+    fontSize?: number;
+}
+
+function DomainContent({ domain, name, closable, onClose, tagStyle, fontSize }: DomainContentProps) {
+    const entityRegistry = useEntityRegistry();
+    const displayName = name || entityRegistry.getDisplayName(EntityType.Domain, domain);
+
+    return (
+        <StyledTag style={tagStyle} fontSize={fontSize}>
+            <DomainColoredIcon domain={domain} size={28} />
+            {displayName}
+            {closable && (
+                <CloseButton onClick={onClose}>
+                    <StyledCloseOutlined />
+                </CloseButton>
+            )}
+        </StyledTag>
+    );
+}
+
+export type Props = {
+    domain: DomainEntity;
+    name?: string;
+    closable?: boolean;
+    onClose?: (e: any) => void;
+    tagStyle?: any | undefined;
+    readOnly?: boolean;
+    fontSize?: number;
+};
+
+export const DomainLink = ({ domain, name, closable, onClose, tagStyle, readOnly, fontSize }: Props): JSX.Element => {
+    const entityRegistry = useEntityRegistry();
+    const linkProps = useEmbeddedProfileLinkProps();
+    const urn = domain?.urn;
+
+    if (readOnly) {
+        return (
+            <HoverEntityTooltip entity={domain}>
+                <DomainWrapper>
+                    <DomainContent
+                        domain={domain}
+                        name={name}
+                        closable={closable}
+                        onClose={onClose}
+                        tagStyle={tagStyle}
+                        fontSize={fontSize}
+                    />
+                </DomainWrapper>
+            </HoverEntityTooltip>
+        );
+    }
+
+    return (
+        <HoverEntityTooltip entity={domain}>
+            <DomainLinkContainer to={entityRegistry.getEntityUrl(EntityType.Domain, urn)} {...linkProps}>
+                <DomainContent
+                    domain={domain}
+                    name={name}
+                    closable={closable}
+                    onClose={onClose}
+                    tagStyle={tagStyle}
+                    fontSize={fontSize}
+                />
+            </DomainLinkContainer>
+        </HoverEntityTooltip>
+    );
+};
diff --git a/datahub-web-react/src/app/sharedV2/tags/TagLink.tsx b/datahub-web-react/src/app/sharedV2/tags/TagLink.tsx
new file mode 100644
index 00000000000000..3b08e04f41a0bf
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/tags/TagLink.tsx
@@ -0,0 +1,69 @@
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { EntityType, Tag } from '../../../types.generated';
+import { StyledTag } from '../../entityV2/shared/components/styled/StyledTag';
+import { HoverEntityTooltip } from '../../recommendations/renderer/component/HoverEntityTooltip';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { TagProfileDrawer } from '../../shared/tags/TagProfileDrawer';
+
+const Container = styled.span`
+    display: block;
+    max-width: fit-content;
+`;
+
+const Name = styled.div`
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: block;
+`;
+
+const tagStyle = { cursor: 'pointer' };
+
+interface Props {
+    tag: Tag;
+    fontSize?: number;
+}
+
+export default function TagLink({ tag, fontSize }: Props) {
+    const entityRegistry = useEntityRegistry();
+
+    const [tagProfileDrawerVisible, setTagProfileDrawerVisible] = useState(false);
+    const [addTagUrn, setAddTagUrn] = useState('');
+
+    const showTagProfileDrawer = (urn: string) => {
+        setTagProfileDrawerVisible(true);
+        setAddTagUrn(urn);
+    };
+
+    const closeTagProfileDrawer = () => {
+        setTagProfileDrawerVisible(false);
+    };
+
+    const displayName = entityRegistry.getDisplayName(EntityType.Tag, tag);
+
+    return (
+        <>
+            <HoverEntityTooltip entity={tag}>
+                <Container data-testid={`tag-${displayName}`}>
+                    <StyledTag
+                        style={tagStyle}
+                        onClick={() => showTagProfileDrawer(tag.urn)}
+                        $colorHash={tag.urn}
+                        $color={tag.properties?.colorHex}
+                        closable={false}
+                        fontSize={fontSize}
+                    >
+                        <Name>{displayName}</Name>
+                    </StyledTag>
+                </Container>
+            </HoverEntityTooltip>
+            {tagProfileDrawerVisible && (
+                <TagProfileDrawer
+                    closeTagProfileDrawer={closeTagProfileDrawer}
+                    tagProfileDrawerVisible={tagProfileDrawerVisible}
+                    urn={addTagUrn}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/tags/TagTermGroup.tsx b/datahub-web-react/src/app/sharedV2/tags/TagTermGroup.tsx
new file mode 100644
index 00000000000000..f3c5e5fb619e88
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/tags/TagTermGroup.tsx
@@ -0,0 +1,294 @@
+import { PlusOutlined } from '@ant-design/icons';
+import { Typography } from 'antd';
+import React, { useState } from 'react';
+import Highlight from 'react-highlighter';
+import styled from 'styled-components';
+import { Domain as DomainEntity, EntityType, GlobalTags, GlossaryTerms } from '../../../types.generated';
+import { EMPTY_MESSAGES } from '../../entity/shared/constants';
+import { REDESIGN_COLORS } from '../../entityV2/shared/constants';
+import { useEntityRegistry } from '../../useEntityRegistry';
+import { DomainLink } from './DomainLink';
+import Tag from './tag/Tag';
+import Term from './term/Term';
+import AddTagTerm from './AddTagTerm';
+
+type Props = {
+    uneditableTags?: GlobalTags | null;
+    editableTags?: GlobalTags | null;
+    editableGlossaryTerms?: GlossaryTerms | null;
+    uneditableGlossaryTerms?: GlossaryTerms | null;
+    domain?: DomainEntity | undefined | null;
+    canRemove?: boolean;
+    canAddTag?: boolean;
+    canAddTerm?: boolean;
+    showEmptyMessage?: boolean;
+    buttonProps?: Record<string, unknown>;
+    onOpenModal?: () => void;
+    maxShow?: number;
+    entityUrn?: string;
+    entityType?: EntityType;
+    entitySubresource?: string;
+    highlightText?: string;
+    fontSize?: number;
+    refetch?: () => Promise<any>;
+    readOnly?: boolean;
+    showOneAndCount?: boolean;
+    showAddButton?: boolean;
+};
+
+const NoElementButton = styled.div`
+    :not(:last-child) {
+        margin-right: 8px;
+    }
+    margin: 0px;
+    padding: 0px;
+    flex-basis: 100%;
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    :hover {
+        cursor: pointer;
+        color: ${REDESIGN_COLORS.LINK_HOVER_BLUE};
+    }
+`;
+const TagTermWrapper = styled.div<{ $showOneAndCount?: boolean }>`
+    display: flex;
+    flex-wrap: ${(props) => (!props.$showOneAndCount ? 'wrap' : '')};
+    align-items: center;
+    row-gap: 4px;
+    column-gap: 8px;
+    max-width: 100%;
+`;
+
+const TagText = styled.span`
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    font-size: 10px;
+    font-weight: 400;
+    line-height: 8px;
+`;
+
+const StyledPlusOutlined = styled(PlusOutlined)`
+    && {
+        font-size: 10px;
+        margin-right: 8px;
+    }
+`;
+
+const EmptyText = styled(Typography.Text)`
+    && {
+        margin-right: 8px;
+    }
+`;
+
+const Count = styled(Typography.Text)`
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 24px;
+    overflow: hidden;
+    white-space: nowrap;
+`;
+
+const AddText = styled.span`
+    color: ${REDESIGN_COLORS.DARK_GREY};
+    font-size: 12px;
+    font-weight: 500;
+    line-height: 16px;
+    :hover {
+        color: ${REDESIGN_COLORS.LINK_HOVER_BLUE};
+    }
+`;
+
+const highlightMatchStyle = { background: '#ffe58f', padding: '0' };
+
+export default function TagTermGroup({
+    uneditableTags,
+    editableTags,
+    canRemove,
+    canAddTag,
+    canAddTerm,
+    showEmptyMessage,
+    buttonProps,
+    onOpenModal,
+    maxShow,
+    uneditableGlossaryTerms,
+    editableGlossaryTerms,
+    domain,
+    entityUrn,
+    entityType,
+    entitySubresource,
+    highlightText,
+    fontSize,
+    refetch,
+    readOnly,
+    showOneAndCount,
+    showAddButton = true,
+}: Props) {
+    const entityRegistry = useEntityRegistry();
+    const [showAddModal, setShowAddModal] = useState(false);
+    const [addModalType, setAddModalType] = useState(EntityType.Tag);
+
+    const tagsEmpty = !editableTags?.tags?.length && !uneditableTags?.tags?.length;
+
+    const termsEmpty = !editableGlossaryTerms?.terms?.length && !uneditableGlossaryTerms?.terms?.length;
+
+    const tagsLength = (editableTags?.tags?.length ?? 0) + (uneditableTags?.tags?.length ?? 0);
+    const termsLength = (editableGlossaryTerms?.terms?.length ?? 0) + (uneditableGlossaryTerms?.terms?.length ?? 0);
+
+    let renderedTags = 0;
+    let renderedTerms = 0;
+
+    return (
+        <TagTermWrapper $showOneAndCount={showOneAndCount}>
+            {domain && (
+                <DomainLink domain={domain} name={entityRegistry.getDisplayName(EntityType.Domain, domain) || ''} />
+            )}
+            {uneditableGlossaryTerms?.terms?.map((term) => {
+                renderedTerms += 1;
+                if (showOneAndCount && renderedTerms === 2) {
+                    return <Count>{`+${termsLength - 1}`}</Count>;
+                }
+                if (showOneAndCount && renderedTerms > 2) return null;
+                if (maxShow && renderedTerms === maxShow + 1)
+                    return (
+                        <TagText>
+                            <Highlight matchStyle={highlightMatchStyle} search={highlightText}>
+                                {uneditableGlossaryTerms?.terms
+                                    ? `+${uneditableGlossaryTerms?.terms?.length - maxShow}`
+                                    : null}
+                            </Highlight>
+                        </TagText>
+                    );
+                if (maxShow && renderedTerms > maxShow) return null;
+
+                return (
+                    <Term
+                        term={term}
+                        entityUrn={entityUrn}
+                        entitySubresource={entitySubresource}
+                        canRemove={false}
+                        readOnly={readOnly}
+                        highlightText={highlightText}
+                        onOpenModal={onOpenModal}
+                        refetch={refetch}
+                        fontSize={fontSize}
+                        showOneAndCount={showOneAndCount}
+                    />
+                );
+            })}
+            {editableGlossaryTerms?.terms?.map((term) => {
+                renderedTerms += 1;
+                if (showOneAndCount && renderedTerms === 2) {
+                    return <Count>{`+${termsLength - 1}`}</Count>;
+                }
+                if (showOneAndCount && renderedTerms > 2) return null;
+                return (
+                    <Term
+                        term={term}
+                        entityUrn={entityUrn}
+                        entitySubresource={entitySubresource}
+                        canRemove={canRemove}
+                        readOnly={readOnly}
+                        highlightText={highlightText}
+                        onOpenModal={onOpenModal}
+                        refetch={refetch}
+                        fontSize={fontSize}
+                        showOneAndCount={showOneAndCount}
+                    />
+                );
+            })}
+
+            {/* uneditable tags are provided by ingestion pipelines exclusively  */}
+
+            {uneditableTags?.tags?.map((tag) => {
+                renderedTags += 1;
+                if (showOneAndCount && renderedTags === 2) {
+                    return <Count>{`+${tagsLength - 1}`}</Count>;
+                }
+                if (showOneAndCount && renderedTags > 2) return null;
+                if (maxShow && renderedTags === maxShow + 1)
+                    return (
+                        <TagText>{uneditableTags?.tags ? `+${uneditableTags?.tags?.length - maxShow}` : null}</TagText>
+                    );
+                if (maxShow && renderedTags > maxShow) return null;
+
+                return (
+                    <Tag
+                        tag={tag}
+                        entityUrn={entityUrn}
+                        entitySubresource={entitySubresource}
+                        canRemove={false}
+                        readOnly={readOnly}
+                        highlightText={highlightText}
+                        onOpenModal={onOpenModal}
+                        refetch={refetch}
+                        fontSize={fontSize}
+                        showOneAndCount={showOneAndCount}
+                    />
+                );
+            })}
+            {/* editable tags may be provided by ingestion pipelines or the UI */}
+            {editableTags?.tags?.map((tag) => {
+                renderedTags += 1;
+                if (showOneAndCount && renderedTags === 2) {
+                    return <Count>{`+${tagsLength - 1}`}</Count>;
+                }
+                if (showOneAndCount && renderedTags > 2) return null;
+                if (maxShow && renderedTags > maxShow) return null;
+
+                return (
+                    <Tag
+                        tag={tag}
+                        entityUrn={entityUrn}
+                        entitySubresource={entitySubresource}
+                        canRemove={canRemove}
+                        readOnly={readOnly}
+                        highlightText={highlightText}
+                        onOpenModal={onOpenModal}
+                        refetch={refetch}
+                        fontSize={fontSize}
+                        showOneAndCount={showOneAndCount}
+                    />
+                );
+            })}
+            {showEmptyMessage && canAddTag && tagsEmpty && (
+                <EmptyText type="secondary">{EMPTY_MESSAGES.tags.title}.</EmptyText>
+            )}
+            {showEmptyMessage && canAddTerm && termsEmpty && (
+                <EmptyText type="secondary">{EMPTY_MESSAGES.terms.title}.</EmptyText>
+            )}
+            {canAddTag && !readOnly && showAddButton && (
+                <NoElementButton
+                    onClick={() => {
+                        setAddModalType(EntityType.Tag);
+                        setShowAddModal(true);
+                    }}
+                    {...buttonProps}
+                >
+                    <StyledPlusOutlined />
+                    <AddText>Add tags</AddText>
+                </NoElementButton>
+            )}
+            {canAddTerm && !readOnly && showAddButton && (
+                <NoElementButton
+                    onClick={() => {
+                        setAddModalType(EntityType.GlossaryTerm);
+                        setShowAddModal(true);
+                    }}
+                    {...buttonProps}
+                >
+                    <StyledPlusOutlined />
+                    <AddText>Add terms</AddText>
+                </NoElementButton>
+            )}
+            <AddTagTerm
+                onOpenModal={onOpenModal}
+                entityUrn={entityUrn}
+                entityType={entityType}
+                entitySubresource={entitySubresource}
+                showAddModal={showAddModal}
+                setShowAddModal={setShowAddModal}
+                addModalType={addModalType}
+                refetch={refetch}
+            />
+        </TagTermWrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/tags/tag/Tag.tsx b/datahub-web-react/src/app/sharedV2/tags/tag/Tag.tsx
new file mode 100644
index 00000000000000..931173dff86dbf
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/tags/tag/Tag.tsx
@@ -0,0 +1,193 @@
+import { message, Modal } from 'antd';
+import styled from 'styled-components';
+import React, { useState } from 'react';
+import Highlight from 'react-highlighter';
+import { useIsEmbeddedProfile } from '@src/app/shared/useEmbeddedProfileLinkProps';
+import { useRemoveTagMutation } from '../../../../graphql/mutations.generated';
+import { EntityType, SubResourceType, TagAssociation } from '../../../../types.generated';
+import { StyledTag } from '../../../entityV2/shared/components/styled/StyledTag';
+import { HoverEntityTooltip } from '../../../recommendations/renderer/component/HoverEntityTooltip';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { TagProfileDrawer } from '../../../shared/tags/TagProfileDrawer';
+import { useHasMatchedFieldByUrn } from '../../../search/context/SearchResultContext';
+import LabelPropagationDetails from '../../propagation/LabelPropagationDetails';
+
+const TagLink = styled.span<{ $showOneAndCount?: boolean; $shouldNotAddBottomMargin?: boolean }>`
+    display: flex;
+    cursor: pointer;
+    margin-bottom: ${(props) => `${props.$shouldNotAddBottomMargin ? '0px' : '4px'}`};
+    max-width: inherit;
+    ${(props) =>
+        props.$showOneAndCount &&
+        `
+           max-width: 200px;
+        `}
+`;
+
+const DisplayNameContainer = styled.span<{ maxWidth?: number }>`
+    padding-left: 4px;
+    padding-right: 4px;
+    overflow: hidden;
+    display: flex;
+    align-items: center;
+    width: 100%;
+    span {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        max-width: ${(props) => (props.maxWidth ? `${props.maxWidth}px` : '120px')};
+    }
+`;
+
+const highlightMatchStyle = { background: '#ffe58f', padding: '0' };
+
+interface Props {
+    tag: TagAssociation;
+    entityUrn?: string;
+    entitySubresource?: string;
+    canRemove?: boolean;
+    readOnly?: boolean;
+    highlightText?: string;
+    onOpenModal?: () => void;
+    refetch?: () => Promise<any>;
+    fontSize?: number;
+    showOneAndCount?: boolean;
+    context?: string | null;
+    maxWidth?: number;
+    tagStyle?: React.CSSProperties;
+    options?: {
+        shouldNotOpenDrawerOnClick?: boolean;
+        shouldNotAddBottomMargin?: boolean;
+        shouldShowEllipses?: boolean;
+    };
+}
+
+export default function Tag({
+    tag,
+    entityUrn,
+    entitySubresource,
+    canRemove,
+    readOnly,
+    highlightText,
+    onOpenModal,
+    refetch,
+    fontSize,
+    showOneAndCount,
+    context,
+    maxWidth,
+    tagStyle,
+    options,
+}: Props) {
+    const entityRegistry = useEntityRegistry();
+    const isEmbeddedProfile = useIsEmbeddedProfile();
+    const [removeTagMutation] = useRemoveTagMutation();
+    const highlightTag = useHasMatchedFieldByUrn(tag.tag.urn, 'tags');
+
+    const [tagProfileDrawerVisible, setTagProfileDrawerVisible] = useState(false);
+    const [addTagUrn, setAddTagUrn] = useState('');
+    const displayName = entityRegistry.getDisplayName(EntityType.Tag, tag.tag);
+
+    const showTagProfileDrawer = (urn: string) => {
+        if (!readOnly) {
+            setTagProfileDrawerVisible(true);
+            setAddTagUrn(urn);
+        }
+    };
+
+    const closeTagProfileDrawer = () => {
+        setTagProfileDrawerVisible(false);
+    };
+
+    const removeTag = (tagAssociationToRemove: TagAssociation) => {
+        const tagToRemove = tagAssociationToRemove.tag;
+        onOpenModal?.();
+        Modal.confirm({
+            title: `Do you want to remove ${displayName} tag?`,
+            content: `Are you sure you want to remove the ${displayName} tag?`,
+            onOk() {
+                if (tagAssociationToRemove.associatedUrn || entityUrn) {
+                    removeTagMutation({
+                        variables: {
+                            input: {
+                                tagUrn: tagToRemove.urn,
+                                resourceUrn: tagAssociationToRemove.associatedUrn || entityUrn || '',
+                                subResource: entitySubresource,
+                                subResourceType: entitySubresource ? SubResourceType.DatasetField : null,
+                            },
+                        },
+                    })
+                        .then(({ errors }) => {
+                            if (!errors) {
+                                message.success({ content: 'Removed Tag!', duration: 2 });
+                            }
+                        })
+                        .then(refetch)
+                        .catch((e) => {
+                            message.destroy();
+                            message.error({ content: `Failed to remove tag: \n ${e.message || ''}`, duration: 3 });
+                        });
+                }
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
+    return (
+        <>
+            <HoverEntityTooltip entity={tag.tag} width={250}>
+                <TagLink
+                    data-testid={`tag-${displayName}`}
+                    $showOneAndCount={showOneAndCount}
+                    $shouldNotAddBottomMargin={options?.shouldNotAddBottomMargin}
+                >
+                    <StyledTag
+                        onClick={() => {
+                            if (isEmbeddedProfile) {
+                                window.open(entityRegistry.getEntityUrl(EntityType.Tag, tag.tag.urn), '_blank');
+                            } else if (!options?.shouldNotOpenDrawerOnClick) {
+                                showTagProfileDrawer(tag?.tag?.urn);
+                            }
+                        }}
+                        style={{ cursor: 'pointer', display: 'flex', alignItems: 'center', ...tagStyle }}
+                        $colorHash={tag?.tag?.urn}
+                        $color={tag?.tag?.properties?.colorHex}
+                        closable={canRemove && !readOnly}
+                        onClose={(e) => {
+                            e.preventDefault();
+                            removeTag(tag);
+                        }}
+                        fontSize={fontSize}
+                        $highlightTag={highlightTag}
+                        $showOneAndCount={showOneAndCount}
+                    >
+                        <Highlight
+                            style={{ marginLeft: 0, fontSize, overflow: 'hidden', textOverflow: 'ellipsis' }}
+                            matchStyle={highlightMatchStyle}
+                            search={highlightText}
+                        >
+                            {options?.shouldShowEllipses ? (
+                                <DisplayNameContainer maxWidth={maxWidth}>
+                                    <span className="test-mini-preview-class">{displayName}</span>
+                                </DisplayNameContainer>
+                            ) : (
+                                <DisplayNameContainer maxWidth={maxWidth}>
+                                    <span>{displayName}</span>
+                                </DisplayNameContainer>
+                            )}
+                        </Highlight>
+                        <LabelPropagationDetails entityType={EntityType.Tag} context={context} />
+                    </StyledTag>
+                </TagLink>
+            </HoverEntityTooltip>
+            {tagProfileDrawerVisible && (
+                <TagProfileDrawer
+                    closeTagProfileDrawer={closeTagProfileDrawer}
+                    tagProfileDrawerVisible={tagProfileDrawerVisible}
+                    urn={addTagUrn}
+                />
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/tags/term/Term.tsx b/datahub-web-react/src/app/sharedV2/tags/term/Term.tsx
new file mode 100644
index 00000000000000..7c7698f4575b43
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/tags/term/Term.tsx
@@ -0,0 +1,74 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+
+import { EntityType, GlossaryTermAssociation } from '../../../../types.generated';
+import { HoverEntityTooltip } from '../../../recommendations/renderer/component/HoverEntityTooltip';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import TermContent from './TermContent';
+import { useEmbeddedProfileLinkProps } from '../../../shared/useEmbeddedProfileLinkProps';
+
+const TermLink = styled(Link)<{ $showOneAndCount?: boolean }>`
+    display: inline-block;
+    max-width: inherit;
+    ${(props) =>
+        props.$showOneAndCount &&
+        `
+            width: 90%;
+            max-width: max-content;
+        `}
+`;
+
+const TermWrapper = styled.span<{ $showOneAndCount?: boolean }>`
+    display: inline-block;
+    max-width: inherit;
+    ${(props) =>
+        props.$showOneAndCount &&
+        `
+            width: 90%;
+            max-width: max-content;
+        `}
+`;
+
+interface Props {
+    term: GlossaryTermAssociation;
+    entityUrn?: string;
+    entitySubresource?: string;
+    canRemove?: boolean;
+    readOnly?: boolean;
+    highlightText?: string;
+    fontSize?: number;
+    onOpenModal?: () => void;
+    refetch?: () => Promise<any>;
+    showOneAndCount?: boolean;
+    context?: string | null;
+}
+
+export default function Term(props: Props) {
+    const { term, readOnly, showOneAndCount } = props;
+    const entityRegistry = useEntityRegistry();
+    const linkProps = useEmbeddedProfileLinkProps();
+
+    if (readOnly) {
+        return (
+            <HoverEntityTooltip entity={term.term}>
+                <TermWrapper $showOneAndCount={showOneAndCount}>
+                    <TermContent {...props} />
+                </TermWrapper>
+            </HoverEntityTooltip>
+        );
+    }
+
+    return (
+        <HoverEntityTooltip entity={term.term} width={250}>
+            <TermLink
+                to={entityRegistry.getEntityUrl(EntityType.GlossaryTerm, term.term.urn)}
+                key={term.term.urn}
+                $showOneAndCount={showOneAndCount}
+                {...linkProps}
+            >
+                <TermContent {...props} />
+            </TermLink>
+        </HoverEntityTooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/tags/term/TermContent.tsx b/datahub-web-react/src/app/sharedV2/tags/term/TermContent.tsx
new file mode 100644
index 00000000000000..4c241d7417de6a
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/tags/term/TermContent.tsx
@@ -0,0 +1,211 @@
+import { ThunderboltOutlined } from '@ant-design/icons';
+import { message, Modal, Tag } from 'antd';
+import React from 'react';
+import Highlight from 'react-highlighter';
+import styled from 'styled-components';
+import CloseIcon from '@mui/icons-material/Close';
+import { useRemoveTermMutation } from '../../../../graphql/mutations.generated';
+import { EntityType, GlossaryTermAssociation, SubResourceType } from '../../../../types.generated';
+import { REDESIGN_COLORS } from '../../../entityV2/shared/constants';
+import { useHasMatchedFieldByUrn } from '../../../search/context/SearchResultContext';
+import { useEntityRegistry } from '../../../useEntityRegistry';
+import { generateColorFromPalette } from '../../../glossaryV2/colorUtils';
+import LabelPropagationDetails from '../../propagation/LabelPropagationDetails';
+
+const PROPAGATOR_URN = 'urn:li:corpuser:__datahub_propagator';
+
+const highlightMatchStyle = { background: '#ffe58f', padding: '0' };
+
+const TermContainer = styled.div`
+    position: relative;
+    max-width: 200px;
+
+    .ant-tag.ant-tag {
+        border-radius: 5px;
+        border: 1px solid #ccd1dd;
+    }
+
+    :hover {
+        .ant-tag.ant-tag {
+            border: 1px solid ${REDESIGN_COLORS.TITLE_PURPLE};
+        }
+    }
+`;
+
+const StyledTerm = styled(Tag)<{ fontSize?: number; highlightTerm?: boolean; showOneAndCount?: boolean }>`
+    &&& {
+        ${(props) =>
+            props.highlightTerm &&
+            `
+                background: ${props.theme.styles['highlight-color']};
+                border: 1px solid ${props.theme.styles['highlight-border-color']};
+            `}
+    }
+    ${(props) => props.fontSize && `font-size: ${props.fontSize}px;`}
+    color: ${REDESIGN_COLORS.TEXT_HEADING};
+    font-weight: 400;
+    padding: 3px 8px;
+    margin-right: 0;
+
+    display: flex;
+    position: relative;
+    overflow: hidden;
+
+    ${(props) =>
+        props.showOneAndCount &&
+        `
+            width: 100%;
+            max-width: max-content;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            vertical-align: middle;
+        `}
+`;
+
+const PropagateThunderbolt = styled(ThunderboltOutlined)`
+    color: rgba(0, 143, 100, 0.95);
+    margin-right: -4px;
+    font-weight: bold;
+`;
+
+const CloseButtonContainer = styled.div`
+    display: none;
+    position: absolute;
+    top: -10px;
+    right: -10px;
+    background-color: ${REDESIGN_COLORS.TITLE_PURPLE};
+    align-items: center;
+    border-radius: 100%;
+    padding: 5px;
+
+    ${TermContainer}:hover & {
+        display: flex;
+    }
+`;
+
+const CloseIconStyle = styled(CloseIcon)`
+    font-size: 10px !important;
+    color: white;
+`;
+
+export const TermRibbon = styled.span<{ color: string; opacity?: number }>`
+    position: absolute;
+    left: -20px;
+    top: 4px;
+    width: 50px;
+    transform: rotate(-45deg);
+    padding: 4px;
+    opacity: ${(props) => props.opacity || '1'};
+    background-color: ${(props) => `${props.color}`};
+`;
+
+const StyledHighlight = styled(Highlight)`
+    margin-left: 8px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+`;
+
+interface Props {
+    term: GlossaryTermAssociation;
+    entityUrn?: string;
+    entitySubresource?: string;
+    canRemove?: boolean;
+    readOnly?: boolean;
+    highlightText?: string;
+    fontSize?: number;
+    onOpenModal?: () => void;
+    refetch?: () => Promise<any>;
+    showOneAndCount?: boolean;
+    context?: string | null;
+}
+
+export default function TermContent({
+    term,
+    entityUrn,
+    entitySubresource,
+    canRemove,
+    readOnly,
+    highlightText,
+    fontSize,
+    onOpenModal,
+    refetch,
+    showOneAndCount,
+    context,
+}: Props) {
+    const entityRegistry = useEntityRegistry();
+    const [removeTermMutation] = useRemoveTermMutation();
+    const { parentNodes, urn, type } = term.term;
+
+    const highlightTerm = useHasMatchedFieldByUrn(urn, 'glossaryTerms');
+    const lastParentNode = parentNodes && parentNodes.count > 0 && parentNodes.nodes[parentNodes.count - 1];
+    const termColor = lastParentNode
+        ? lastParentNode.displayProperties?.colorHex || generateColorFromPalette(lastParentNode.urn)
+        : generateColorFromPalette(urn);
+    const displayName = entityRegistry.getDisplayName(type, term.term);
+    const removeTerm = (termToRemove: GlossaryTermAssociation) => {
+        onOpenModal?.();
+        const termName = termToRemove && entityRegistry.getDisplayName(termToRemove.term.type, termToRemove.term);
+        Modal.confirm({
+            title: `Do you want to remove ${termName} term?`,
+            content: `Are you sure you want to remove the ${termName} term?`,
+            onOk() {
+                if (termToRemove.associatedUrn || entityUrn) {
+                    removeTermMutation({
+                        variables: {
+                            input: {
+                                termUrn: termToRemove.term.urn,
+                                resourceUrn: termToRemove.associatedUrn || entityUrn || '',
+                                subResource: entitySubresource,
+                                subResourceType: entitySubresource ? SubResourceType.DatasetField : null,
+                            },
+                        },
+                    })
+                        .then(({ errors }) => {
+                            if (!errors) {
+                                message.success({ content: 'Removed Term!', duration: 2 });
+                            }
+                        })
+                        .then(refetch)
+                        .catch((e) => {
+                            message.destroy();
+                            message.error({ content: `Failed to remove term: \n ${e.message || ''}`, duration: 3 });
+                        });
+                }
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
+    return (
+        <TermContainer>
+            <StyledTerm
+                style={{ cursor: 'pointer' }}
+                fontSize={fontSize}
+                highlightTerm={highlightTerm}
+                showOneAndCount={showOneAndCount}
+            >
+                <TermRibbon color={termColor} />
+
+                <StyledHighlight matchStyle={highlightMatchStyle} search={highlightText}>
+                    {displayName}
+                </StyledHighlight>
+                <LabelPropagationDetails entityType={EntityType.GlossaryTerm} context={context} />
+
+                {term.actor?.urn === PROPAGATOR_URN && <PropagateThunderbolt />}
+            </StyledTerm>
+            {canRemove && !readOnly && (
+                <CloseButtonContainer
+                    onClick={(e) => {
+                        e.preventDefault();
+                        removeTerm(term);
+                    }}
+                >
+                    <CloseIconStyle />
+                </CloseButtonContainer>
+            )}
+        </TermContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/tags/usePropagationContextEntities.ts b/datahub-web-react/src/app/sharedV2/tags/usePropagationContextEntities.ts
new file mode 100644
index 00000000000000..197408da4c5418
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/tags/usePropagationContextEntities.ts
@@ -0,0 +1,25 @@
+import { useEffect, useState } from 'react';
+import { useGetEntitiesQuery } from '../../../graphql/entity.generated';
+
+export interface PropagationContext {
+    propagated?: boolean;
+    origin?: string;
+    actor?: string;
+    relationship?: string;
+}
+
+export function usePropagationContextEntities(contextObj?: PropagationContext | null) {
+    const [urns, setUrns] = useState<string[]>([]);
+    const propagationOriginUrn = contextObj?.origin;
+
+    useEffect(() => {
+        if (propagationOriginUrn && propagationOriginUrn.startsWith('urn:li') && !urns.includes(propagationOriginUrn)) {
+            setUrns([...urns, propagationOriginUrn]);
+        }
+    }, [propagationOriginUrn, urns]);
+
+    const { data } = useGetEntitiesQuery({ variables: { urns }, skip: !urns.length });
+    const originEntity = data?.entities?.find((e) => e?.urn === propagationOriginUrn);
+
+    return { originEntity };
+}
diff --git a/datahub-web-react/src/app/sharedV2/text/MatchTextSizeWrapper.tsx b/datahub-web-react/src/app/sharedV2/text/MatchTextSizeWrapper.tsx
new file mode 100644
index 00000000000000..d14efc0217feb5
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/text/MatchTextSizeWrapper.tsx
@@ -0,0 +1,32 @@
+import React, { useCallback, useState } from 'react';
+import styled from 'styled-components';
+
+const Wrapper = styled.div<{ height: number | undefined; defaultHeight: number }>`
+    font-size: ${({ height, defaultHeight }) => Math.min(height ?? defaultHeight, defaultHeight)}px;
+`;
+
+interface Props extends React.HTMLAttributes<HTMLDivElement> {
+    defaultHeight: number;
+    children: React.ReactNode;
+    className?: string;
+}
+
+export default function MatchTextSizeWrapper({ defaultHeight, children, className, ...rest }: Props) {
+    const [height, setHeight] = useState<number | undefined>(undefined);
+    const ref = useCallback((node: HTMLDivElement) => {
+        if (node) {
+            const resizeObserver = new ResizeObserver(() => {
+                setHeight(node.clientHeight);
+            });
+            resizeObserver.observe(node);
+            return () => resizeObserver.disconnect();
+        }
+        return () => {};
+    }, []);
+
+    return (
+        <Wrapper ref={ref} className={className} height={height} defaultHeight={defaultHeight} {...rest}>
+            {children}
+        </Wrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/text/OverflowTitle.tsx b/datahub-web-react/src/app/sharedV2/text/OverflowTitle.tsx
new file mode 100644
index 00000000000000..ef65834ff52b35
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/text/OverflowTitle.tsx
@@ -0,0 +1,66 @@
+import OptionalTooltip from '@app/sharedV2/ant/OptionalTooltip';
+import { TooltipProps } from 'antd';
+import React, { useEffect } from 'react';
+import styled from 'styled-components';
+import Highlight from 'react-highlighter';
+
+const Wrapper = styled.div<{ scale: number; computedRatio: boolean }>`
+    // Wrap up to two lines, shrinking text as needed
+    font-size: ${({ scale }) => `${scale}em`} !important;
+    line-height: 1.25;
+    max-height: 2.5em; // 2 lines with 1.25 line height
+    overflow: hidden;
+    white-space: ${({ computedRatio }) => (computedRatio ? 'normal' : 'nowrap')};
+    word-break: break-all;
+
+    // Position at start, vertically, as parent aligns center
+    display: flex;
+    align-items: start;
+    height: 100%;
+
+    mark {
+        padding: 0;
+    }
+`;
+
+const MIN_SCALE = 2 / 3;
+const TOOLTIP_THRESHOLD = 0.8; // Show tooltip if text is smaller than TOOLTIP_THRESHOLD em
+
+interface Props {
+    title?: string;
+    highlightText?: string;
+    highlightColor?: string;
+    className?: string;
+    placement?: TooltipProps['placement'];
+}
+
+export default function OverflowTitle({ title, highlightText, highlightColor, className, placement = 'top' }: Props) {
+    const [scale, setScale] = React.useState<number>(1);
+    const [ratio, setRatio] = React.useState<number | undefined>(undefined);
+
+    useEffect(() => {
+        setScale(1);
+    }, [title]);
+
+    useEffect(() => {
+        if (ratio && ratio > 1) {
+            setScale(Math.max(MIN_SCALE, Math.min(1, 2 / ratio - 0.03)));
+        }
+    }, [title, ratio]);
+
+    const ref = React.useCallback((node: HTMLDivElement) => {
+        if (node !== null) {
+            setRatio((oldRatio) => oldRatio ?? node.scrollWidth / node.clientWidth);
+        }
+    }, []);
+
+    return (
+        <OptionalTooltip tooltipProps={{ title, placement }} enabled={scale < TOOLTIP_THRESHOLD}>
+            <Wrapper className={className} ref={ref} scale={scale} computedRatio={!!ratio}>
+                <Highlight search={highlightText} matchStyle={{ backgroundColor: highlightColor }}>
+                    {title}
+                </Highlight>
+            </Wrapper>
+        </OptionalTooltip>
+    );
+}
diff --git a/datahub-web-react/src/app/sharedV2/useGetEntities.ts b/datahub-web-react/src/app/sharedV2/useGetEntities.ts
new file mode 100644
index 00000000000000..a19b36b3a41007
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/useGetEntities.ts
@@ -0,0 +1,18 @@
+import { useEffect, useState } from 'react';
+import { useGetEntitiesQuery } from '../../graphql/entity.generated';
+import { Entity } from '../../types.generated';
+
+export function useGetEntities(urns: string[]): Entity[] {
+    const [verifiedUrns, setVerifiedUrns] = useState<string[]>([]);
+
+    useEffect(() => {
+        urns.forEach((urn) => {
+            if (urn.startsWith('urn:li:') && !verifiedUrns.includes(urn)) {
+                setVerifiedUrns((prevUrns) => [...prevUrns, urn]);
+            }
+        });
+    }, [urns, verifiedUrns]);
+
+    const { data } = useGetEntitiesQuery({ variables: { urns: verifiedUrns }, skip: !verifiedUrns.length });
+    return (data?.entities || []) as Entity[];
+}
diff --git a/datahub-web-react/src/app/sharedV2/utils.tsx b/datahub-web-react/src/app/sharedV2/utils.tsx
new file mode 100644
index 00000000000000..e92496c87c183a
--- /dev/null
+++ b/datahub-web-react/src/app/sharedV2/utils.tsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import {
+    BoldOutlined,
+    CalendarOutlined,
+    ClockCircleOutlined,
+    FieldBinaryOutlined,
+    FontColorsOutlined,
+    NumberOutlined,
+    ProfileOutlined,
+} from '@ant-design/icons';
+import { SchemaFieldDataType } from '../../types.generated';
+
+export function ColumnTypeIcon(type?: SchemaFieldDataType): JSX.Element | null {
+    if (type === SchemaFieldDataType.Number) {
+        return <NumberOutlined />;
+    }
+    if (type === SchemaFieldDataType.String) {
+        return <FontColorsOutlined />;
+    }
+    if (type === SchemaFieldDataType.Date) {
+        return <CalendarOutlined />;
+    }
+    if (type === SchemaFieldDataType.Time) {
+        return <ClockCircleOutlined />;
+    }
+    if (type === SchemaFieldDataType.Boolean) {
+        return <BoldOutlined />;
+    }
+    if (type === SchemaFieldDataType.Bytes) {
+        return <FieldBinaryOutlined />;
+    }
+    return <ProfileOutlined />;
+}
+
+export function TypeTooltipTitle(type: SchemaFieldDataType, nativeDataType: string | null | undefined) {
+    const label = nativeDataType ? `${type} | ${nativeDataType.toLowerCase()}` : type;
+    return <span>{label}</span>;
+}
diff --git a/datahub-web-react/src/app/useBuildEntityRegistry.ts b/datahub-web-react/src/app/useBuildEntityRegistry.ts
index 2beb5edae8b02d..974dca57a66b94 100644
--- a/datahub-web-react/src/app/useBuildEntityRegistry.ts
+++ b/datahub-web-react/src/app/useBuildEntityRegistry.ts
@@ -1,8 +1,11 @@
 import { useMemo } from 'react';
 import buildEntityRegistry from './buildEntityRegistry';
+import buildEntityRegistryV2 from './buildEntityRegistryV2';
+import { useIsThemeV2 } from './useIsThemeV2';
 
 export default function useBuildEntityRegistry() {
+    const isThemeV2Enabled = useIsThemeV2();
     return useMemo(() => {
-        return buildEntityRegistry();
-    }, []);
+        return isThemeV2Enabled ? buildEntityRegistryV2() : buildEntityRegistry();
+    }, [isThemeV2Enabled]);
 }
diff --git a/datahub-web-react/src/app/useEntityRegistry.ts b/datahub-web-react/src/app/useEntityRegistry.ts
index eed200d4c6c710..888ca858a90c51 100644
--- a/datahub-web-react/src/app/useEntityRegistry.ts
+++ b/datahub-web-react/src/app/useEntityRegistry.ts
@@ -1,5 +1,6 @@
 import { useContext } from 'react';
 import { EntityRegistryContext } from '../entityRegistryContext';
+import EntityRegistryV2 from './entityV2/EntityRegistry';
 
 /**
  * Fetch an instance of EntityRegistry from the React context.
@@ -7,3 +8,7 @@ import { EntityRegistryContext } from '../entityRegistryContext';
 export function useEntityRegistry() {
     return useContext(EntityRegistryContext);
 }
+
+export function useEntityRegistryV2() {
+    return useContext(EntityRegistryContext) as any as EntityRegistryV2;
+}
diff --git a/datahub-web-react/src/app/useIsThemeV2.tsx b/datahub-web-react/src/app/useIsThemeV2.tsx
new file mode 100644
index 00000000000000..a126a84862ea8a
--- /dev/null
+++ b/datahub-web-react/src/app/useIsThemeV2.tsx
@@ -0,0 +1,78 @@
+import { useEffect } from 'react';
+import { useCustomTheme } from '../customThemeContext';
+import { useAppConfig } from './useAppConfig';
+import { useUserContext } from './context/useUserContext';
+
+/**
+ * Returns true if theme v2 should be enabled.
+ *
+ * There are 3 conditions in which theme v2 is enabled:
+ * 1. If theme v2 is enabled and toggleable, and the user has enabled theme v2.
+ * 2. If theme v2 is enabled and toggleable, the user has not set a preference, and v2 is the default theme.
+ * 3. If theme v2 is enabled not toggleable, and v2 is the default theme.
+ */
+export function useIsThemeV2() {
+    const appConfig = useAppConfig();
+    const { themeV2Enabled, themeV2Default, themeV2Toggleable } = appConfig.config.featureFlags;
+    const [isThemeV2EnabledForUser, isUserLoaded] = useIsThemeV2EnabledForUser();
+
+    if (appConfig.loaded && !themeV2Enabled) return false;
+    if (appConfig.loaded && !themeV2Toggleable) return themeV2Default;
+    if (appConfig.loaded && isUserLoaded) return isThemeV2EnabledForUser;
+
+    // Default before flags loaded is stored in local storage
+    return loadThemeV2FromLocalStorage();
+}
+
+/**
+ * Returns [isThemeV2Toggleable, isAppConfigLoaded]: whether the V2 theme can be toggled by users.
+ */
+export function useIsThemeV2Toggleable() {
+    const appConfig = useAppConfig();
+    return [
+        appConfig.config.featureFlags.themeV2Enabled && appConfig.config.featureFlags.themeV2Toggleable,
+        appConfig.loaded,
+    ];
+}
+
+/**
+ * Returns [isThemeV2EnabledForUser, isUserLoaded]: whether the V2 theme is turned on for the user.
+ */
+export function useIsThemeV2EnabledForUser(): [boolean, boolean] {
+    const appConfig = useAppConfig();
+    const { user } = useUserContext();
+    return [
+        user?.settings?.appearance?.showThemeV2 ?? appConfig.config.featureFlags.themeV2Default,
+        !!user && appConfig.loaded,
+    ];
+}
+
+export function useSetThemeIsV2() {
+    const isThemeV2 = useIsThemeV2();
+    const { updateTheme } = useCustomTheme();
+
+    useEffect(() => {
+        if (isThemeV2) {
+            import('../conf/theme/theme_v2.config.json').then((theme) => updateTheme(theme));
+        } else {
+            import('../conf/theme/theme_light.config.json').then((theme) => updateTheme(theme));
+        }
+        setThemeV2LocalStorage(isThemeV2);
+    }, [isThemeV2, updateTheme]);
+}
+
+function setThemeV2LocalStorage(isThemeV2: boolean) {
+    if (loadThemeV2FromLocalStorage() !== isThemeV2) {
+        saveToLocalStorage(isThemeV2);
+    }
+}
+
+const THEME_V2_STATUS_KEY = 'isThemeV2Enabled';
+
+export function loadThemeV2FromLocalStorage(): boolean {
+    return localStorage.getItem(THEME_V2_STATUS_KEY) === 'true';
+}
+
+function saveToLocalStorage(isThemeV2: boolean) {
+    localStorage.setItem(THEME_V2_STATUS_KEY, String(isThemeV2));
+}
diff --git a/datahub-web-react/src/app/useShowNavBarRedesign.tsx b/datahub-web-react/src/app/useShowNavBarRedesign.tsx
new file mode 100644
index 00000000000000..2fb1a23ea53745
--- /dev/null
+++ b/datahub-web-react/src/app/useShowNavBarRedesign.tsx
@@ -0,0 +1,38 @@
+import { useEffect } from 'react';
+import { useAppConfig } from './useAppConfig';
+import { useIsThemeV2 } from './useIsThemeV2';
+
+export function useShowNavBarRedesign() {
+    const appConfig = useAppConfig();
+    const isThemeV2Enabled = useIsThemeV2();
+
+    if (!appConfig.loaded) {
+        return loadFromLocalStorage();
+    }
+
+    return appConfig.config.featureFlags.showNavBarRedesign && isThemeV2Enabled;
+}
+
+export function useSetNavBarRedesignEnabled() {
+    const isNavBarRedesignEnabled = useShowNavBarRedesign();
+
+    useEffect(() => {
+        setThemeV2LocalStorage(isNavBarRedesignEnabled);
+    }, [isNavBarRedesignEnabled]);
+}
+
+function setThemeV2LocalStorage(isNavBarRedesignEnabled: boolean) {
+    if (loadFromLocalStorage() !== isNavBarRedesignEnabled) {
+        saveToLocalStorage(isNavBarRedesignEnabled);
+    }
+}
+
+const NAV_BAR_REDESIGN_STATUS_KEY = 'isNavBarRedesignEnabled';
+
+function loadFromLocalStorage(): boolean {
+    return localStorage.getItem(NAV_BAR_REDESIGN_STATUS_KEY) === 'true';
+}
+
+function saveToLocalStorage(isNavBarRedesignEnabled: boolean) {
+    localStorage.setItem(NAV_BAR_REDESIGN_STATUS_KEY, String(isNavBarRedesignEnabled));
+}
diff --git a/datahub-web-react/src/app/utils/navigateToUrl.ts b/datahub-web-react/src/app/utils/navigateToUrl.ts
new file mode 100644
index 00000000000000..f78d7f6b4644ed
--- /dev/null
+++ b/datahub-web-react/src/app/utils/navigateToUrl.ts
@@ -0,0 +1,22 @@
+import * as QueryString from 'query-string';
+import { RouteComponentProps } from 'react-router-dom';
+
+interface Args {
+    location: {
+        search: string;
+        pathname: string;
+    };
+    history: RouteComponentProps['history'];
+    urlParam: string;
+    value: string;
+}
+
+export default function navigateToUrl({ location, history, urlParam, value }: Args) {
+    const parsedSearch = QueryString.parse(location.search, { arrayFormat: 'comma' });
+    const newSearch = { ...parsedSearch, [urlParam]: value };
+
+    history.push({
+        pathname: location.pathname,
+        search: QueryString.stringify(newSearch, { arrayFormat: 'comma' }),
+    });
+}
diff --git a/datahub-web-react/src/app/utils/queryUtils.ts b/datahub-web-react/src/app/utils/queryUtils.ts
new file mode 100644
index 00000000000000..dc2b51c910e150
--- /dev/null
+++ b/datahub-web-react/src/app/utils/queryUtils.ts
@@ -0,0 +1,15 @@
+import { FilterOperator } from '../../types.generated';
+
+export function getHomePagePostsFilters() {
+    return [
+        {
+            and: [
+                {
+                    field: 'type',
+                    condition: FilterOperator.Equal,
+                    values: ['HOME_PAGE_ANNOUNCEMENT'],
+                },
+            ],
+        },
+    ];
+}
diff --git a/datahub-web-react/src/appConfigContext.tsx b/datahub-web-react/src/appConfigContext.tsx
index 8ac18d0142b4e9..be602f4d71e1ab 100644
--- a/datahub-web-react/src/appConfigContext.tsx
+++ b/datahub-web-react/src/appConfigContext.tsx
@@ -55,10 +55,23 @@ export const DEFAULT_APP_CONFIG = {
         businessAttributeEntityEnabled: false,
         dataContractsEnabled: false,
         editableDatasetNameEnabled: false,
+        themeV2Enabled: false,
+        themeV2Default: false,
+        themeV2Toggleable: false,
+        lineageGraphV2: false,
         showSeparateSiblings: false,
+        schemaFieldCLLEnabled: false,
+        schemaFieldLineageIgnoreStatus: false,
         showManageStructuredProperties: false,
+        hideDbtSourceInLineage: false,
+        showNavBarRedesign: false,
+        showAutoCompleteResults: false,
         entityVersioningEnabled: false,
     },
+    chromeExtensionConfig: {
+        enabled: false,
+        lineageEnabled: false,
+    },
 };
 
 export const AppConfigContext = React.createContext<{
diff --git a/datahub-web-react/src/conf/Global.ts b/datahub-web-react/src/conf/Global.ts
index 7b3925f8c6ba1c..869a8c656906c5 100644
--- a/datahub-web-react/src/conf/Global.ts
+++ b/datahub-web-react/src/conf/Global.ts
@@ -31,6 +31,14 @@ export enum PageRoutes {
     EMBED_LOOKUP = '/embed/lookup/:url',
     SETTINGS_POSTS = '/settings/posts',
     BUSINESS_ATTRIBUTE = '/business-attribute',
+    INTRODUCE = '/introduce',
+    // Temporary route to view all data products
+    DATA_PRODUCTS = '/search?filter__entityType___false___EQUAL___0=DATA_PRODUCT&page=1&query=%2A&unionType=0',
+}
+
+export enum HelpLinkRoutes {
+    GRAPHIQL = '/api/graphiql',
+    OPENAPI = '/openapi/swagger-ui/index.html',
 }
 
 /**
diff --git a/datahub-web-react/src/conf/theme/global-overrides-v2.less b/datahub-web-react/src/conf/theme/global-overrides-v2.less
new file mode 100644
index 00000000000000..13cbf4814456ef
--- /dev/null
+++ b/datahub-web-react/src/conf/theme/global-overrides-v2.less
@@ -0,0 +1,51 @@
+.ant-message-notice-content {
+    padding: 0;
+}
+
+.ant-message-custom-content {
+    font-size: 14px;
+    font-weight: 700;
+    font-family: Mulish;
+    padding: 10px 20px;
+    border-radius: 6px;
+}
+
+.ant-message-notice-content .ant-message-success {
+    background-color: #d5e9c9;
+    border-left: 5px solid #6ca749;
+    color: #548239;
+
+    .anticon {
+        color: #548239;
+    }
+}
+
+.ant-message-notice-content .ant-message-error {
+    background-color: #f6d5d5;
+    border-left: 5px solid #e37878;
+    color: #e37878;
+
+    .anticon {
+        color: #e37878;
+    }
+}
+
+.ant-message-notice-content .ant-message-warning {
+    background-color: #fcedc7;
+    border-left: 5px solid #eeae09;
+    color: #eeae09;
+
+    .anticon {
+        color: #eeae09;
+    }
+}
+
+.ant-message-notice-content .ant-message-info {
+    background-color: #d7eff8;
+    border-left: 5px solid #5abde1;
+    color: #5abde1;
+
+    .anticon {
+        color: #5abde1;
+    }
+}
diff --git a/datahub-web-react/src/conf/theme/global-overrides.less b/datahub-web-react/src/conf/theme/global-overrides.less
index 96e8937dbf19d7..c89eff54b1653a 100644
--- a/datahub-web-react/src/conf/theme/global-overrides.less
+++ b/datahub-web-react/src/conf/theme/global-overrides.less
@@ -8,6 +8,31 @@ body {
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
 }
+
+::-webkit-scrollbar {
+    height: 8px;
+    width: 8px;
+}
+
+*::-webkit-scrollbar-track {
+    background: rgba(193, 196, 208, 0);
+    border-radius: 10px;
+}
+
+*::-webkit-scrollbar-thumb {
+    background: rgba(193, 196, 208, 0);
+    border-radius: 10px;
+    transition: 0.3s;
+}
+
+*:hover::-webkit-scrollbar-track {
+    background: rgba(193, 196, 208, 0.3);
+}
+
+*:hover::-webkit-scrollbar-thumb {
+    background: rgba(193, 196, 208, 0.8);
+}
+
 .ant-modal-title {
     font-weight: 700;
 }
@@ -51,3 +76,7 @@ body {
         }
     }
 }
+
+.search-filter-popover .ant-popover-inner-content {
+    padding: 0 !important;
+}
diff --git a/datahub-web-react/src/conf/theme/global-variables-v2.less b/datahub-web-react/src/conf/theme/global-variables-v2.less
new file mode 100644
index 00000000000000..ae8573d259201a
--- /dev/null
+++ b/datahub-web-react/src/conf/theme/global-variables-v2.less
@@ -0,0 +1,2 @@
+@font-family-v2: 'Mulish', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans',
+    sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
diff --git a/datahub-web-react/src/conf/theme/theme_dark.config.json b/datahub-web-react/src/conf/theme/theme_dark.config.json
index d2c8912ac1f50d..1c3e5f74116c70 100644
--- a/datahub-web-react/src/conf/theme/theme_dark.config.json
+++ b/datahub-web-react/src/conf/theme/theme_dark.config.json
@@ -19,7 +19,9 @@
         "homepage-background-upper-fade": "#FFFFFF",
         "homepage-background-lower-fade": "#333E4C",
         "highlight-color": "#E6F4FF",
-        "highlight-border-color": "#BAE0FF"
+        "highlight-border-color": "#BAE0FF",
+        "box-shadow-navbar-redesign": "0 0 6px 0px rgba(93, 102, 139, 0.20)",
+        "border-radius-navbar-redesign": "12px"
     },
     "assets": {
         "logoUrl": "/assets/logo.png"
diff --git a/datahub-web-react/src/conf/theme/theme_light.config.json b/datahub-web-react/src/conf/theme/theme_light.config.json
index 9983c5a8b67b72..9e6b1208683ed7 100644
--- a/datahub-web-react/src/conf/theme/theme_light.config.json
+++ b/datahub-web-react/src/conf/theme/theme_light.config.json
@@ -21,6 +21,8 @@
         "homepage-text-color": "#434343",
         "box-shadow": "0px 0px 30px 0px rgb(239 239 239)",
         "box-shadow-hover": "0px 1px 0px 0.5px rgb(239 239 239)",
+        "box-shadow-navbar-redesign": "0 0 6px 0px rgba(93, 102, 139, 0.20)",
+        "border-radius-navbar-redesign": "12px",
         "highlight-color": "#E6F4FF",
         "highlight-border-color": "#BAE0FF"
     },
diff --git a/datahub-web-react/src/conf/theme/theme_v2.config.json b/datahub-web-react/src/conf/theme/theme_v2.config.json
new file mode 100644
index 00000000000000..c26439004bd1fb
--- /dev/null
+++ b/datahub-web-react/src/conf/theme/theme_v2.config.json
@@ -0,0 +1,57 @@
+{
+    "styles": {
+        "primary-color": "#5280E2",
+        "primary-color-dark": "#5C3FD1",
+        "primary-color-light": "#ece9f8",
+        "link-color": "#5280E2",
+        "layout-header-background": "white",
+        "layout-header-color": "#434343",
+        "layout-body-background": "white",
+        "component-background": "white",
+        "body-background": "white",
+        "border-color-base": "#ececec",
+        "text-color": "fade(black, 85%)",
+        "text-color-secondary": "fade(black, 45%)",
+        "heading-color": "fade(black, 85%)",
+        "background-color-light": "hsv(0, 0, 98%)",
+        "divider-color": "fade(black, 6%)",
+        "disabled-color": "fade(black, 25%)",
+        "steps-nav-arrow-color": "fade(black, 25%)",
+        "homepage-background-upper-fade": "#FFFFFF",
+        "homepage-background-lower-fade": "#FFFFFF",
+        "homepage-text-color": "#434343",
+        "box-shadow": "0px 0px 30px 0px rgb(239 239 239)",
+        "box-shadow-hover": "0px 1px 0px 0.5px rgb(239 239 239)",
+        "box-shadow-navbar-redesign": "0 0 6px 0px rgba(93, 102, 139, 0.20)",
+        "border-radius-navbar-redesign": "12px",
+        "highlight-color": "#ece9f8",
+        "highlight-border-color": "#07878180"
+    },
+    "assets": {
+        "logoUrl": "/assets/logo.png"
+    },
+    "content": {
+        "title": "DataHub",
+        "homepage": {
+            "homepageMessage": "Bring clarity to your data"
+        },
+        "search": {
+            "searchbarMessage": "Find tables, dashboards, people, and more"
+        },
+        "menu": {
+            "items": [
+                {
+                    "label": "DataHub Project",
+                    "path": "https://datahubproject.io",
+                    "shouldOpenInNewTab": true,
+                    "description": "Explore DataHub Project website"
+                },
+                {
+                    "label": "DataHub GitHub",
+                    "path": "https://github.com/linkedin/datahub",
+                    "shouldOpenInNewTab": true
+                }
+            ]
+        }
+    }
+}
diff --git a/datahub-web-react/src/conf/theme/types.ts b/datahub-web-react/src/conf/theme/types.ts
index 7d78230092700a..e92ceef93030ef 100644
--- a/datahub-web-react/src/conf/theme/types.ts
+++ b/datahub-web-react/src/conf/theme/types.ts
@@ -38,6 +38,7 @@ export type Theme = {
                 label: string;
                 path: string;
                 shouldOpenInNewTab: boolean;
+                description?: string;
             }[];
         };
     };
diff --git a/datahub-web-react/src/entityRegistryContext.tsx b/datahub-web-react/src/entityRegistryContext.tsx
index 2ee49be1f24eab..84d16a9fdcfb26 100644
--- a/datahub-web-react/src/entityRegistryContext.tsx
+++ b/datahub-web-react/src/entityRegistryContext.tsx
@@ -1,4 +1,7 @@
 import React from 'react';
-import EntityRegistry from './app/entity/EntityRegistry';
+import EntityRegistryV1 from './app/entity/EntityRegistry';
+import EntityRegistryV2 from './app/entityV2/EntityRegistry';
 
-export const EntityRegistryContext = React.createContext(new EntityRegistry());
+export type EntityRegistry = EntityRegistryV1 | EntityRegistryV2;
+
+export const EntityRegistryContext = React.createContext<EntityRegistryV1>(new EntityRegistryV1());
diff --git a/datahub-web-react/src/graphql/app.graphql b/datahub-web-react/src/graphql/app.graphql
index c1fe50d7620a3c..01487583e40b12 100644
--- a/datahub-web-react/src/graphql/app.graphql
+++ b/datahub-web-react/src/graphql/app.graphql
@@ -70,10 +70,23 @@ query appConfig {
             businessAttributeEntityEnabled
             dataContractsEnabled
             editableDatasetNameEnabled
+            themeV2Enabled
+            themeV2Default
+            themeV2Toggleable
+            lineageGraphV2
             showSeparateSiblings
             showManageStructuredProperties
+            schemaFieldCLLEnabled
+            hideDbtSourceInLineage
+            schemaFieldLineageIgnoreStatus
+            showNavBarRedesign
+            showAutoCompleteResults
             entityVersioningEnabled
         }
+        chromeExtensionConfig {
+            enabled
+            lineageEnabled
+        }
     }
 }
 
diff --git a/datahub-web-react/src/graphql/assertion.graphql b/datahub-web-react/src/graphql/assertion.graphql
index af4f0f73f90ce8..54fb0e91cbc70f 100644
--- a/datahub-web-react/src/graphql/assertion.graphql
+++ b/datahub-web-react/src/graphql/assertion.graphql
@@ -1,3 +1,5 @@
+#import "./assertion_monitor_shared.graphql"
+
 fragment assertionInfo on AssertionInfo {
     type
     description
@@ -159,6 +161,15 @@ fragment assertionInfo on AssertionInfo {
             }
         }
     }
+    customAssertion {
+        type
+        entityUrn
+        field {
+            urn
+            path
+        }
+        logic
+    }
     source {
         type
         created {
@@ -166,6 +177,7 @@ fragment assertionInfo on AssertionInfo {
             actor
         }
     }
+    externalUrl
 }
 
 fragment assertionDetails on Assertion {
@@ -173,6 +185,7 @@ fragment assertionDetails on Assertion {
     type
     platform {
         urn
+        name
         properties {
             displayName
             logoUrl
@@ -188,6 +201,14 @@ fragment assertionDetails on Assertion {
     info {
         ...assertionInfo
     }
+    actions {
+        onSuccess {
+            type
+        }
+        onFailure {
+            type
+        }
+    }
     tags {
         ...globalTagsFields
     }
@@ -220,6 +241,65 @@ fragment assertionStdParametersDetails on AssertionStdParameters {
     }
 }
 
+fragment assertionDetailsWithRunEvents on Assertion {
+    ...assertionDetails
+    runEvents(status: COMPLETE, limit: 1) {
+        total
+        failed
+        succeeded
+        runEvents {
+            ...assertionRunEventDetails
+        }
+    }
+}
+
+fragment incrementingSegmentSpecDetails on IncrementingSegmentSpec {
+    field {
+        path
+        type
+        nativeType
+    }
+    transformer {
+        type
+        nativeType
+    }
+}
+
+fragment assertionStdParametersDetails on AssertionStdParameters {
+    value {
+        value
+        type
+    }
+    minValue {
+        value
+        type
+    }
+    maxValue {
+        value
+        type
+    }
+}
+
+fragment assertionResultDetails on AssertionResult {
+    type
+    actualAggValue
+    rowCount
+    missingCount
+    unexpectedCount
+    externalUrl
+    nativeResults {
+        key
+        value
+    }
+    error {
+        type
+        properties {
+            key
+            value
+        }
+    }
+}
+
 fragment assertionRunEventDetails on AssertionRunEvent {
     timestampMillis
     lastObservedMillis
@@ -231,16 +311,7 @@ fragment assertionRunEventDetails on AssertionRunEvent {
         value
     }
     result {
-        type
-        actualAggValue
-        rowCount
-        missingCount
-        unexpectedCount
-        externalUrl
-        nativeResults {
-            key
-            value
-        }
+        ...assertionResultDetails
     }
 }
 
@@ -274,3 +345,10 @@ fragment assertionDetailsWithRunEvents on Assertion {
         }
     }
 }
+
+query getAssertionWithRunEvents($assertionUrn: String!) {
+    assertion(urn: $assertionUrn) {
+        urn
+        ...assertionDetailsWithRunEvents
+    }
+}
diff --git a/datahub-web-react/src/graphql/chart.graphql b/datahub-web-react/src/graphql/chart.graphql
index 04942a08dde7da..8916ae791661d2 100644
--- a/datahub-web-react/src/graphql/chart.graphql
+++ b/datahub-web-react/src/graphql/chart.graphql
@@ -119,6 +119,7 @@ query getChart($urn: String!) {
         forms {
             ...formsFields
         }
+        ...notes
     }
 }
 
diff --git a/datahub-web-react/src/graphql/container.graphql b/datahub-web-react/src/graphql/container.graphql
index 88ed7582e62c5f..0ae5e6bcadb80b 100644
--- a/datahub-web-react/src/graphql/container.graphql
+++ b/datahub-web-react/src/graphql/container.graphql
@@ -77,5 +77,25 @@ query getContainer($urn: String!) {
         forms {
             ...formsFields
         }
+        browsePathV2 {
+            ...browsePathV2Fields
+        }
+        ...notes
+    }
+}
+
+# We should replace this with a cached summary object on the container
+query getContainerEntitySummary($urn: String!) {
+    aggregateAcrossEntities(
+        input: {
+            types: []
+            query: "*"
+            facets: ["_entityType␞typeNames", "_entityType"]
+            orFilters: [{ and: [{ field: "container", values: [$urn], value: $urn }] }]
+        }
+    ) {
+        facets {
+            ...facetFields
+        }
     }
 }
diff --git a/datahub-web-react/src/graphql/dashboard.graphql b/datahub-web-react/src/graphql/dashboard.graphql
index 681c98f361ccbf..3c52aded80e62a 100644
--- a/datahub-web-react/src/graphql/dashboard.graphql
+++ b/datahub-web-react/src/graphql/dashboard.graphql
@@ -26,6 +26,7 @@ query getDashboard($urn: String!) {
         forms {
             ...formsFields
         }
+        ...notes
     }
 }
 
diff --git a/datahub-web-react/src/graphql/dataFlow.graphql b/datahub-web-react/src/graphql/dataFlow.graphql
index 199c47811ce08e..f01b2d115978fd 100644
--- a/datahub-web-react/src/graphql/dataFlow.graphql
+++ b/datahub-web-react/src/graphql/dataFlow.graphql
@@ -84,6 +84,7 @@ query getDataFlow($urn: String!) {
         forms {
             ...formsFields
         }
+        ...notes
     }
 }
 
diff --git a/datahub-web-react/src/graphql/dataJob.graphql b/datahub-web-react/src/graphql/dataJob.graphql
index 836aac35deaf51..27aed505de0142 100644
--- a/datahub-web-react/src/graphql/dataJob.graphql
+++ b/datahub-web-react/src/graphql/dataJob.graphql
@@ -22,6 +22,10 @@ query getDataJob($urn: String!) {
         forms {
             ...formsFields
         }
+        browsePathV2 {
+            ...browsePathV2Fields
+        }
+        ...notes
     }
 }
 
diff --git a/datahub-web-react/src/graphql/dataProduct.graphql b/datahub-web-react/src/graphql/dataProduct.graphql
index 623ece13dbfc18..dddab893f9511d 100644
--- a/datahub-web-react/src/graphql/dataProduct.graphql
+++ b/datahub-web-react/src/graphql/dataProduct.graphql
@@ -17,6 +17,28 @@ query getDataProduct($urn: String!) {
         forms {
             ...formsFields
         }
+        ...notes
+    }
+}
+
+query getDataProductsList($input: SearchAcrossEntitiesInput!) {
+    searchAcrossEntities(input: $input) {
+        searchResults {
+            entity {
+                ... on DataProduct {
+                    urn
+                    type
+                    properties {
+                        name
+                        description
+                        numAssets
+                    }
+                    domain {
+                        ...entityDomain
+                    }
+                }
+            }
+        }
     }
 }
 
diff --git a/datahub-web-react/src/graphql/dataset.graphql b/datahub-web-react/src/graphql/dataset.graphql
index 8bbeb304aae2cc..b3122332da3309 100644
--- a/datahub-web-react/src/graphql/dataset.graphql
+++ b/datahub-web-react/src/graphql/dataset.graphql
@@ -1,12 +1,20 @@
-query getDataProfiles($urn: String!, $limit: Int, $startTime: Long, $endTime: Long) {
+query getDataProfiles($urn: String!, $limit: Int, $startTime: Long, $endTime: Long, $filters: FilterInput) {
     dataset(urn: $urn) {
         urn
         type
-        datasetProfiles(limit: $limit, startTimeMillis: $startTime, endTimeMillis: $endTime) {
+        datasetProfiles(limit: $limit, startTimeMillis: $startTime, endTimeMillis: $endTime, filter: $filters) {
             rowCount
             columnCount
             sizeInBytes
             timestampMillis
+            partitionSpec {
+                type
+                partition
+                timePartition {
+                    startTimeMillis
+                    durationMillis
+                }
+            }
             fieldProfiles {
                 fieldPath
                 uniqueCount
@@ -35,6 +43,17 @@ query getDataset($urn: String!) {
                 ...nonSiblingDatasetFields
             }
         }
+        siblingsSearch(input: { query: "*", count: 5 }) {
+            count
+            total
+            searchResults {
+                entity {
+                    urn
+                    type
+                    ...nonSiblingDatasetFields
+                }
+            }
+        }
     }
 }
 
@@ -98,6 +117,20 @@ fragment nonSiblingDatasetFields on Dataset {
             sampleValues
         }
     }
+    latestFullTableProfile: datasetProfiles(
+        limit: 1
+        filter: { and: [{ field: "partitionSpec.partition", values: ["FULL_TABLE_SNAPSHOT", "SAMPLE"] }] }
+    ) {
+        ...datasetProfileFields
+    }
+    latestPartitionProfile: datasetProfiles(
+        limit: 1
+        filter: {
+            and: [{ field: "partitionSpec.partition", values: ["SAMPLE", "FULL_TABLE_SNAPSHOT"], negated: true }]
+        }
+    ) {
+        ...datasetProfileFields
+    }
     health {
         ...entityHealth
     }
@@ -172,6 +205,7 @@ fragment nonSiblingDatasetFields on Dataset {
     forms {
         ...formsFields
     }
+    ...notes
     ...entityProfileVersionProperties
 }
 
@@ -222,6 +256,46 @@ query getLastMonthUsageAggregations($urn: String!) {
     }
 }
 
+query getTimeRangeUsageAggregations($urn: String!, $timeRange: TimeRange!) {
+    dataset(urn: $urn) {
+        usageStats(range: $timeRange) {
+            aggregations {
+                uniqueUserCount
+                totalSqlQueries
+                users {
+                    user {
+                        urn
+                        type
+                        username
+                        properties {
+                            displayName
+                            firstName
+                            lastName
+                            fullName
+                        }
+                        editableProperties {
+                            displayName
+                            pictureLink
+                        }
+                    }
+                    count
+                    userEmail
+                }
+                fields {
+                    fieldName
+                    count
+                }
+            }
+            buckets {
+                bucket
+                metrics {
+                    totalSqlQueries
+                }
+            }
+        }
+    }
+}
+
 mutation updateDataset($urn: String!, $input: DatasetUpdateInput!) {
     updateDataset(urn: $urn, input: $input) {
         urn
@@ -243,7 +317,7 @@ fragment assertionsQuery on Dataset {
         count
         total
         assertions {
-            ...assertionDetails
+            ...assertionDetailsWithRunEvents
             runEvents(status: COMPLETE, limit: 1) {
                 total
                 failed
@@ -267,6 +341,17 @@ query getDatasetAssertions($urn: String!) {
                 ...assertionsQuery
             }
         }
+        siblingsSearch(input: { query: "*", count: 5 }) {
+            count
+            total
+            searchResults {
+                entity {
+                    urn
+                    type
+                    ...assertionsQuery
+                }
+            }
+        }
     }
 }
 
@@ -309,6 +394,17 @@ query getDatasetSchema($urn: String!) {
                 }
             }
         }
+        siblingsSearch(input: { query: "*", count: 5 }) {
+            count
+            total
+            searchResults {
+                entity {
+                    urn
+                    type
+                    ...datasetSchema
+                }
+            }
+        }
     }
 }
 
@@ -336,3 +432,34 @@ fragment getRoles on Access {
         }
     }
 }
+
+fragment assertionsQueryWithRunEvents on Dataset {
+    assertions(start: 0, count: 1000) {
+        start
+        count
+        total
+        assertions {
+            ...assertionDetailsWithRunEvents
+        }
+    }
+}
+
+query getDatasetAssertionsWithRunEvents($urn: String!) {
+    dataset(urn: $urn) {
+        ...assertionsQueryWithRunEvents
+        siblings {
+            isPrimary
+        }
+        siblingsSearch(input: { query: "*", count: 5 }) {
+            count
+            total
+            searchResults {
+                entity {
+                    urn
+                    type
+                    ...assertionsQueryWithRunEvents
+                }
+            }
+        }
+    }
+}
diff --git a/datahub-web-react/src/graphql/domain.graphql b/datahub-web-react/src/graphql/domain.graphql
index 2e96a78b0f44b4..1a26e6313916cf 100644
--- a/datahub-web-react/src/graphql/domain.graphql
+++ b/datahub-web-react/src/graphql/domain.graphql
@@ -41,6 +41,7 @@ query getDomain($urn: String!) {
             ...formsFields
         }
         ...domainEntitiesFields
+        ...notes
     }
 }
 
@@ -89,3 +90,27 @@ mutation moveDomain($input: MoveDomainInput!) {
 mutation deleteDomain($urn: String!) {
     deleteDomain(urn: $urn)
 }
+
+# We should replace this with a cached summary object on the domain
+query getDomainEntitySummary($urn: String!) {
+    aggregateAcrossEntities(
+        input: {
+            types: []
+            query: "*"
+            facets: ["_entityType␞typeNames", "_entityType"]
+            orFilters: [
+                {
+                    and: [
+                        { field: "_entityType", values: ["DATA_PRODUCT"], value: "DATA_PRODUCT", negated: true }
+                        { field: "domains", values: [$urn], value: $urn }
+                    ]
+                }
+            ]
+            searchFlags: { skipCache: true }
+        }
+    ) {
+        facets {
+            ...facetFields
+        }
+    }
+}
diff --git a/datahub-web-react/src/graphql/fragments.graphql b/datahub-web-react/src/graphql/fragments.graphql
index e94fc207fefd97..c78be584a81f10 100644
--- a/datahub-web-react/src/graphql/fragments.graphql
+++ b/datahub-web-react/src/graphql/fragments.graphql
@@ -14,14 +14,148 @@ fragment globalTagsFields on GlobalTags {
     }
 }
 
+fragment displayPropertiesFields on DisplayProperties {
+    colorHex
+    icon {
+        name
+        style
+        iconLibrary
+    }
+}
+
+fragment rootGlossaryNodeWithFourLayers on GlossaryNode {
+    urn
+    type
+    properties {
+        name
+        description
+    }
+    displayProperties {
+        ...displayPropertiesFields
+    }
+    children: relationships(input: { types: ["IsPartOf"], direction: INCOMING, start: 0, count: 500 }) {
+        total
+        relationships {
+            type
+            entity {
+                type
+                ... on GlossaryTerm {
+                    urn
+                }
+                ... on GlossaryNode {
+                    urn
+                    children: relationships(input: { types: ["IsPartOf"], direction: INCOMING, start: 0, count: 500 }) {
+                        total
+                        relationships {
+                            type
+                            entity {
+                                type
+                                ... on GlossaryTerm {
+                                    urn
+                                }
+                                ... on GlossaryNode {
+                                    urn
+                                    children: relationships(
+                                        input: { types: ["IsPartOf"], direction: INCOMING, start: 0, count: 500 }
+                                    ) {
+                                        total
+                                        relationships {
+                                            type
+                                            entity {
+                                                type
+                                                ... on GlossaryTerm {
+                                                    urn
+                                                }
+                                                ... on GlossaryNode {
+                                                    urn
+                                                    children: relationships(
+                                                        input: {
+                                                            types: ["IsPartOf"]
+                                                            direction: INCOMING
+                                                            start: 0
+                                                            count: 500
+                                                        }
+                                                    ) {
+                                                        total
+                                                        relationships {
+                                                            type
+                                                            entity {
+                                                                type
+                                                                ... on GlossaryTerm {
+                                                                    urn
+                                                                }
+                                                                ... on GlossaryNode {
+                                                                    urn
+                                                                    children: relationships(
+                                                                        input: {
+                                                                            types: ["IsPartOf"]
+                                                                            direction: INCOMING
+                                                                            start: 0
+                                                                            count: 500
+                                                                        }
+                                                                    ) {
+                                                                        total
+                                                                        relationships {
+                                                                            type
+                                                                            entity {
+                                                                                type
+                                                                                ... on GlossaryTerm {
+                                                                                    urn
+                                                                                }
+                                                                                ... on GlossaryNode {
+                                                                                    urn
+                                                                                }
+                                                                            }
+                                                                        }
+                                                                    }
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
 fragment glossaryNode on GlossaryNode {
     urn
     type
     properties {
         name
+        description
+    }
+    displayProperties {
+        ...displayPropertiesFields
     }
-    children: relationships(input: { types: ["IsPartOf"], direction: INCOMING, start: 0, count: 10000 }) {
+    children: relationships(input: { types: ["IsPartOf"], direction: INCOMING, start: 0, count: 1000 }) {
         total
+        relationships {
+            type
+            entity {
+                ... on GlossaryTerm {
+                    urn
+                    name
+                    type
+                    hierarchicalName
+                    properties {
+                        name
+                        description
+                    }
+                }
+                ... on GlossaryNode {
+                    urn
+                }
+            }
+        }
     }
 }
 
@@ -53,6 +187,9 @@ fragment glossaryTerms on GlossaryTerms {
         term {
             ...glossaryTerm
         }
+        actor {
+            urn
+        }
         associatedUrn
     }
 }
@@ -62,6 +199,19 @@ fragment deprecationFields on Deprecation {
     deprecated
     note
     decommissionTime
+    actorEntity {
+        urn
+        type
+        ...entityDisplayNameFields
+    }
+    replacement {
+        ...entityDisplayNameFields
+        ... on Dataset {
+            platform {
+                ...platformFields
+            }
+        }
+    }
 }
 
 fragment parentContainersFields on ParentContainersResult {
@@ -228,6 +378,28 @@ fragment institutionalMemoryFields on InstitutionalMemory {
     }
 }
 
+fragment documentationFields on Documentation {
+    documentations {
+        documentation
+        attribution {
+            time
+            actor {
+                urn
+                type
+                ...entityDisplayNameFields
+            }
+            source {
+                urn
+                type
+            }
+            sourceDetail {
+                key
+                value
+            }
+        }
+    }
+}
+
 fragment nonRecursiveDatasetFields on Dataset {
     urn
     name
@@ -735,7 +907,29 @@ fragment nonRecursiveMLFeatureTable on MLFeatureTable {
     }
 }
 
-fragment schemaFieldFields on SchemaField {
+fragment entitySchemaFieldEntityFields on SchemaFieldEntity {
+    deprecation {
+        ...deprecationFields
+    }
+    urn
+    fieldPath
+    type
+    structuredProperties {
+        properties {
+            ...structuredPropertiesFields
+        }
+    }
+    businessAttributes {
+        businessAttribute {
+            ...businessAttribute
+        }
+    }
+    documentation {
+        ...documentationFields
+    }
+}
+
+fragment entitySchemaFieldFields on SchemaField {
     fieldPath
     label
     jsonPath
@@ -753,39 +947,7 @@ fragment schemaFieldFields on SchemaField {
         ...glossaryTerms
     }
     schemaFieldEntity {
-        urn
-        type
-        structuredProperties {
-            properties {
-                ...structuredPropertiesFields
-            }
-        }
-        businessAttributes {
-            businessAttribute {
-                ...businessAttribute
-            }
-        }
-        documentation {
-            documentations {
-                documentation
-                attribution {
-                    time
-                    actor {
-                        urn
-                        type
-                        ...entityDisplayNameFields
-                    }
-                    source {
-                        urn
-                        type
-                    }
-                    sourceDetail {
-                        key
-                        value
-                    }
-                }
-            }
-        }
+        ...entitySchemaFieldEntityFields
     }
 }
 
@@ -808,7 +970,7 @@ fragment schemaMetadataFields on SchemaMetadata {
         }
     }
     fields {
-        ...schemaFieldFields
+        ...entitySchemaFieldFields
     }
     primaryKeys
     foreignKeys {
@@ -1116,7 +1278,7 @@ fragment inputFieldsFields on InputFields {
     fields {
         schemaFieldUrn
         schemaField {
-            ...schemaFieldFields
+            ...entitySchemaFieldFields
         }
     }
 }
@@ -1224,6 +1386,7 @@ fragment entityDisplayNameFields on Entity {
     ... on GlossaryNode {
         properties {
             name
+            description
         }
     }
     ... on Domain {
@@ -1275,6 +1438,11 @@ fragment entityDisplayNameFields on Entity {
             qualifiedName
         }
     }
+    ... on OwnershipTypeEntity {
+        info {
+            name
+        }
+    }
 }
 
 fragment ermodelrelationPropertiesFields on ERModelRelationshipProperties {
@@ -1522,11 +1690,27 @@ fragment formsFields on Forms {
 
 fragment entityPrivileges on EntityPrivileges {
     canEditLineage
+    canEditDomains
+    canEditDataProducts
+    canEditTags
+    canEditGlossaryTerms
+    canEditDescription
+    canEditLinks
+    canEditOwners
+    canEditAssertions
+    canEditIncidents
+    canEditDeprecation
+    canEditSchemaFieldTags
+    canEditSchemaFieldGlossaryTerms
+    canEditSchemaFieldDescription
     canEditQueries
     canEditEmbed
     canManageEntity
     canManageChildren
     canEditProperties
+    canViewDatasetUsage
+    canViewDatasetProfile
+    canViewDatasetOperations
 }
 
 fragment businessAttribute on BusinessAttributeAssociation {
@@ -1574,3 +1758,61 @@ fragment businessAttribute on BusinessAttributeAssociation {
     }
     associatedUrn
 }
+
+fragment datasetProfileFields on DatasetProfile {
+    rowCount
+    columnCount
+    sizeInBytes
+    timestampMillis
+    partitionSpec {
+        type
+        partition
+        timePartition {
+            startTimeMillis
+            durationMillis
+        }
+    }
+    fieldProfiles {
+        fieldPath
+        uniqueCount
+        uniqueProportion
+        nullCount
+        nullProportion
+        min
+        max
+        mean
+        median
+        stdev
+        sampleValues
+    }
+}
+
+fragment notes on Entity {
+    notes: relationships(input: { types: ["PostTarget"], direction: INCOMING, start: 0, count: 100 }) {
+        total
+        relationships {
+            type
+            entity {
+                ... on Post {
+                    urn
+                    type
+                    postType
+                    lastModified {
+                        time
+                        actor
+                    }
+                    content {
+                        contentType
+                        title
+                        description
+                        link
+                        media {
+                            type
+                            location
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/datahub-web-react/src/graphql/glossary.graphql b/datahub-web-react/src/graphql/glossary.graphql
index 27f26b88082de4..513e29b6cadc64 100644
--- a/datahub-web-react/src/graphql/glossary.graphql
+++ b/datahub-web-react/src/graphql/glossary.graphql
@@ -15,7 +15,7 @@ query getRootGlossaryNodes {
         start
         total
         nodes {
-            ...glossaryNode
+            ...rootGlossaryNodeWithFourLayers
         }
     }
 }
diff --git a/datahub-web-react/src/graphql/glossaryNode.graphql b/datahub-web-react/src/graphql/glossaryNode.graphql
index bc260c8d5365f5..38202872306fbd 100644
--- a/datahub-web-react/src/graphql/glossaryNode.graphql
+++ b/datahub-web-react/src/graphql/glossaryNode.graphql
@@ -5,6 +5,7 @@ fragment childGlossaryTerm on GlossaryTerm {
     hierarchicalName
     properties {
         name
+        description
     }
 }
 
@@ -53,5 +54,6 @@ query getGlossaryNode($urn: String!) {
                 }
             }
         }
+        ...notes
     }
 }
diff --git a/datahub-web-react/src/graphql/glossaryTerm.graphql b/datahub-web-react/src/graphql/glossaryTerm.graphql
index f0152e7e8df399..a0dc67d6738a95 100644
--- a/datahub-web-react/src/graphql/glossaryTerm.graphql
+++ b/datahub-web-react/src/graphql/glossaryTerm.graphql
@@ -98,6 +98,7 @@ query getGlossaryTerm($urn: String!, $start: Int, $count: Int) {
         forms {
             ...formsFields
         }
+        ...notes
     }
 }
 
diff --git a/datahub-web-react/src/graphql/incident.graphql b/datahub-web-react/src/graphql/incident.graphql
index c6708ab894e936..d8a6d4fd4305f1 100644
--- a/datahub-web-react/src/graphql/incident.graphql
+++ b/datahub-web-react/src/graphql/incident.graphql
@@ -43,6 +43,21 @@ fragment datasetSiblingIncidents on Dataset {
             }
         }
     }
+    siblingsSearch(input: { query: "*", count: 5 }) {
+        count
+        total
+        searchResults {
+            entity {
+                urn
+                type
+                ... on Dataset {
+                    incidents(start: $start, count: $count, state: $state) {
+                        ...incidentsFields
+                    }
+                }
+            }
+        }
+    }
 }
 
 query getEntityIncidents($urn: String!, $start: Int!, $count: Int!, $state: IncidentState) {
@@ -52,26 +67,41 @@ query getEntityIncidents($urn: String!, $start: Int!, $count: Int!, $state: Inci
                 ...incidentsFields
             }
             ...datasetSiblingIncidents
+            privileges {
+                canEditIncidents
+            }
         }
         ... on DataJob {
             incidents(start: $start, count: $count, state: $state) {
                 ...incidentsFields
             }
+            privileges {
+                canEditIncidents
+            }
         }
         ... on DataFlow {
             incidents(start: $start, count: $count, state: $state) {
                 ...incidentsFields
             }
+            privileges {
+                canEditIncidents
+            }
         }
         ... on Dashboard {
             incidents(start: $start, count: $count, state: $state) {
                 ...incidentsFields
             }
+            privileges {
+                canEditIncidents
+            }
         }
         ... on Chart {
             incidents(start: $start, count: $count, state: $state) {
                 ...incidentsFields
             }
+            privileges {
+                canEditIncidents
+            }
         }
     }
 }
diff --git a/datahub-web-react/src/graphql/lineage.graphql b/datahub-web-react/src/graphql/lineage.graphql
index f387c0c050668f..2a89789f1c50d1 100644
--- a/datahub-web-react/src/graphql/lineage.graphql
+++ b/datahub-web-react/src/graphql/lineage.graphql
@@ -4,6 +4,7 @@ fragment lineageNodeProperties on EntityWithRelationships {
     ... on DataJob {
         urn
         type
+        exists
         dataFlow {
             ...nonRecursiveDataFlowFields
         }
@@ -67,8 +68,12 @@ fragment lineageNodeProperties on EntityWithRelationships {
                 ...structuredPropertiesFields
             }
         }
+        browsePathV2 {
+            ...browsePathV2Fields
+        }
     }
     ... on DataFlow {
+        exists
         orchestrator
         flowId
         cluster
@@ -107,8 +112,12 @@ fragment lineageNodeProperties on EntityWithRelationships {
                 ...structuredPropertiesFields
             }
         }
+        browsePathV2 {
+            ...browsePathV2Fields
+        }
     }
     ... on Dashboard {
+        exists
         urn
         type
         tool
@@ -144,6 +153,9 @@ fragment lineageNodeProperties on EntityWithRelationships {
         parentContainers {
             ...parentContainersFields
         }
+        browsePathV2 {
+            ...browsePathV2Fields
+        }
         status {
             removed
         }
@@ -172,6 +184,7 @@ fragment lineageNodeProperties on EntityWithRelationships {
         }
     }
     ... on Chart {
+        exists
         tool
         chartId
         properties {
@@ -193,6 +206,9 @@ fragment lineageNodeProperties on EntityWithRelationships {
         parentContainers {
             ...parentContainersFields
         }
+        browsePathV2 {
+            ...browsePathV2Fields
+        }
         ...entityDataProduct
         status {
             removed
@@ -210,6 +226,7 @@ fragment lineageNodeProperties on EntityWithRelationships {
         }
     }
     ... on Dataset {
+        exists
         name
         properties {
             name
@@ -228,6 +245,9 @@ fragment lineageNodeProperties on EntityWithRelationships {
         parentContainers {
             ...parentContainersFields
         }
+        browsePathV2 {
+            ...browsePathV2Fields
+        }
         subTypes {
             typeNames
         }
@@ -254,6 +274,7 @@ fragment lineageNodeProperties on EntityWithRelationships {
         }
     }
     ... on MLModelGroup {
+        exists
         urn
         type
         name
@@ -271,6 +292,9 @@ fragment lineageNodeProperties on EntityWithRelationships {
         status {
             removed
         }
+        browsePathV2 {
+            ...browsePathV2Fields
+        }
         properties {
             propertiesName: name
             createdTS: created {
@@ -290,8 +314,12 @@ fragment lineageNodeProperties on EntityWithRelationships {
                 ...structuredPropertiesFields
             }
         }
+        browsePathV2 {
+            ...browsePathV2Fields
+        }
     }
     ... on MLModel {
+        exists
         urn
         type
         name
@@ -342,6 +370,9 @@ fragment lineageNodeProperties on EntityWithRelationships {
                 ...structuredPropertiesFields
             }
         }
+        browsePathV2 {
+            ...browsePathV2Fields
+        }
     }
     ... on MLFeatureTable {
         ...nonRecursiveMLFeatureTable
@@ -396,6 +427,20 @@ fragment lineageFields on EntityWithRelationships {
                 ...lineageNodeProperties
             }
         }
+        siblingsSearch(input: { query: "*", count: 5 }) {
+            count
+            total
+            searchResults {
+                entity {
+                    urn
+                    type
+                    ... on Dataset {
+                        exists
+                    }
+                    ...lineageNodeProperties
+                }
+            }
+        }
     }
     upstream: lineage(input: { direction: UPSTREAM, start: 0, count: 100, separateSiblings: $separateSiblings }) {
         ...leafLineageResults
@@ -508,6 +553,20 @@ fragment entityLineage on Entity {
                 ...lineageNodeProperties
             }
         }
+        siblingsSearch(input: { query: "*", count: 5 }) {
+            count
+            total
+            searchResults {
+                entity {
+                    urn
+                    type
+                    ... on Dataset {
+                        exists
+                    }
+                    ...lineageNodeProperties
+                }
+            }
+        }
     }
     ... on Chart {
         inputFields @include(if: $showColumns) {
@@ -542,6 +601,171 @@ fragment entityLineage on Entity {
     }
 }
 
+fragment lineageV2Result on EntityLineageResult {
+    filtered
+    total
+    relationships {
+        ...lineageRelationshipFields
+        paths {
+            path {
+                urn
+                type
+            }
+        }
+        entity {
+            urn
+            type
+        }
+    }
+}
+
+fragment lineageSchemaField on SchemaField {
+    fieldPath
+    type
+    nativeDataType
+}
+
+fragment entityLineageV2 on Entity {
+    urn
+    type
+    ...lineageNodeProperties
+    ...canEditLineageFragment
+    ... on Dataset {
+        schemaMetadata(version: 0) @include(if: $showColumns) {
+            fields {
+                ...lineageSchemaField
+            }
+        }
+        siblingsSearch(input: { query: "*", count: 1 }) {
+            count
+            total
+            searchResults {
+                entity {
+                    urn
+                    type
+                    ... on Dataset {
+                        exists
+                        subTypes {
+                            typeNames
+                        }
+                        platform {
+                            ...platformFields
+                        }
+                    }
+                }
+            }
+        }
+    }
+    ... on Chart {
+        inputFields @include(if: $showColumns) {
+            fields {
+                schemaFieldUrn
+                schemaField {
+                    ...lineageSchemaField
+                }
+            }
+        }
+    }
+    ... on EntityWithRelationships {
+        upstream: lineage(
+            input: {
+                direction: UPSTREAM
+                start: 0
+                count: 1000
+                separateSiblings: $separateSiblings
+                startTimeMillis: $startTimeMillis
+                endTimeMillis: $endTimeMillis
+                includeGhostEntities: $includeGhostEntities
+            }
+        ) @skip(if: $excludeUpstream) {
+            ...lineageV2Result
+        }
+        downstream: lineage(
+            input: {
+                direction: DOWNSTREAM
+                start: 0
+                count: 1000
+                separateSiblings: $separateSiblings
+                startTimeMillis: $startTimeMillis
+                endTimeMillis: $endTimeMillis
+                includeGhostEntities: $includeGhostEntities
+            }
+        ) @skip(if: $excludeDownstream) {
+            ...lineageV2Result
+        }
+    }
+    ... on SchemaFieldEntity {
+        fieldPath
+        parent {
+            urn
+            type
+            ...lineageNodeProperties
+        }
+        status {
+            removed
+        }
+    }
+    ... on QueryEntity {
+        properties {
+            origin {
+                urn
+                type
+            }
+        }
+        queryPlatform: platform {
+            ...platformFields
+        }
+    }
+    ... on Domain {
+        id
+        properties {
+            name
+            description
+        }
+        parentDomains {
+            ...parentDomainsFields
+        }
+        displayProperties {
+            ...displayPropertiesFields
+        }
+        dataProducts: entities(
+            input: { start: 0, count: 0, filters: [{ field: "_entityType", value: "DATA_PRODUCT" }] }
+        ) {
+            total
+            searchResults {
+                entity {
+                    ... on DataProduct {
+                        urn
+                        type
+                        properties {
+                            name
+                            description
+                        }
+                        domain {
+                            ...entityDomain
+                        }
+                        entities(input: { start: 0, count: 0, query: "*" }) {
+                            total
+                        }
+                    }
+                }
+            }
+        }
+    }
+    ... on DataProduct {
+        properties {
+            name
+            description
+        }
+        domain {
+            ...entityDomain
+        }
+        entities(input: { start: 0, count: 0, query: "*" }) {
+            total
+        }
+    }
+}
+
 query getEntityLineage(
     $urn: String!
     $separateSiblings: Boolean
@@ -556,7 +780,22 @@ query getEntityLineage(
     }
 }
 
-query getBulkEntityLineage(
+query getEntityLineageV2(
+    $urn: String!
+    $separateSiblings: Boolean
+    $showColumns: Boolean!
+    $startTimeMillis: Long
+    $endTimeMillis: Long
+    $excludeUpstream: Boolean = false
+    $excludeDownstream: Boolean = false
+    $includeGhostEntities: Boolean = false
+) {
+    entity(urn: $urn) {
+        ...entityLineageV2
+    }
+}
+
+query getBulkEntityLineageV2(
     $urns: [String!]!
     $separateSiblings: Boolean
     $showColumns: Boolean!
@@ -564,9 +803,10 @@ query getBulkEntityLineage(
     $endTimeMillis: Long
     $excludeUpstream: Boolean = false
     $excludeDownstream: Boolean = false
+    $includeGhostEntities: Boolean = false
 ) {
     entities(urns: $urns) {
-        ...entityLineage
+        ...entityLineageV2
     }
 }
 
@@ -600,6 +840,7 @@ query getLineageCounts(
     $endTimeMillis: Long
     $excludeUpstream: Boolean = false
     $excludeDownstream: Boolean = false
+    $includeGhostEntities: Boolean = false
 ) {
     entity(urn: $urn) {
         urn
@@ -613,6 +854,7 @@ query getLineageCounts(
                     separateSiblings: $separateSiblings
                     startTimeMillis: $startTimeMillis
                     endTimeMillis: $endTimeMillis
+                    includeGhostEntities: $includeGhostEntities
                 }
             ) @skip(if: $excludeUpstream) {
                 filtered
@@ -626,6 +868,7 @@ query getLineageCounts(
                     separateSiblings: $separateSiblings
                     startTimeMillis: $startTimeMillis
                     endTimeMillis: $endTimeMillis
+                    includeGhostEntities: $includeGhostEntities
                 }
             ) @skip(if: $excludeDownstream) {
                 filtered
@@ -637,6 +880,8 @@ query getLineageCounts(
 
 query getSearchAcrossLineageCounts(
     $urn: String!
+    $startTimeMillis: Long
+    $endTimeMillis: Long
     $excludeUpstream: Boolean = false
     $excludeDownstream: Boolean = false
 ) {
@@ -648,6 +893,7 @@ query getSearchAcrossLineageCounts(
             count: 10000
             filters: [{ field: "degree", value: "1", values: ["1"] }]
             direction: UPSTREAM
+            lineageFlags: { startTimeMillis: $startTimeMillis, endTimeMillis: $endTimeMillis }
         }
     ) @skip(if: $excludeUpstream) {
         start
@@ -665,6 +911,7 @@ query getSearchAcrossLineageCounts(
             count: 10000
             filters: [{ field: "degree", value: "1", values: ["1"] }]
             direction: DOWNSTREAM
+            lineageFlags: { startTimeMillis: $startTimeMillis, endTimeMillis: $endTimeMillis }
         }
     ) @skip(if: $excludeDownstream) {
         start
@@ -675,3 +922,18 @@ query getSearchAcrossLineageCounts(
         }
     }
 }
+
+query searchAcrossLineageNames($input: SearchAcrossLineageInput!) {
+    searchAcrossLineage(input: $input) {
+        start
+        count
+        total
+        searchResults {
+            entity {
+                urn
+                type
+                ...entityDisplayNameFields
+            }
+        }
+    }
+}
diff --git a/datahub-web-react/src/graphql/me.graphql b/datahub-web-react/src/graphql/me.graphql
index e02a480fffe765..2fdd6a1133ccc9 100644
--- a/datahub-web-react/src/graphql/me.graphql
+++ b/datahub-web-react/src/graphql/me.graphql
@@ -18,10 +18,17 @@ query getMe {
                 pictureLink
                 teams
                 skills
+                persona {
+                    urn
+                }
+                platforms {
+                    urn
+                }
             }
             settings {
                 appearance {
                     showSimplifiedHomepage
+                    showThemeV2
                 }
                 views {
                     defaultView {
diff --git a/datahub-web-react/src/graphql/mlFeature.graphql b/datahub-web-react/src/graphql/mlFeature.graphql
index 2ed5ecfb37fdae..685d5029fa8a85 100644
--- a/datahub-web-react/src/graphql/mlFeature.graphql
+++ b/datahub-web-react/src/graphql/mlFeature.graphql
@@ -20,5 +20,6 @@ query getMLFeature($urn: String!) {
         forms {
             ...formsFields
         }
+        ...notes
     }
 }
diff --git a/datahub-web-react/src/graphql/mlFeatureTable.graphql b/datahub-web-react/src/graphql/mlFeatureTable.graphql
index 02efbaf9766e1a..0dd43f26707e9c 100644
--- a/datahub-web-react/src/graphql/mlFeatureTable.graphql
+++ b/datahub-web-react/src/graphql/mlFeatureTable.graphql
@@ -17,5 +17,6 @@ query getMLFeatureTable($urn: String!) {
         forms {
             ...formsFields
         }
+        ...notes
     }
 }
diff --git a/datahub-web-react/src/graphql/mlModel.graphql b/datahub-web-react/src/graphql/mlModel.graphql
index ba10a243e6f9b3..46e28b47fb9ed8 100644
--- a/datahub-web-react/src/graphql/mlModel.graphql
+++ b/datahub-web-react/src/graphql/mlModel.graphql
@@ -51,6 +51,7 @@ query getMLModel($urn: String!) {
         forms {
             ...formsFields
         }
+        ...notes
         ...entityProfileVersionProperties
     }
 }
diff --git a/datahub-web-react/src/graphql/mlModelGroup.graphql b/datahub-web-react/src/graphql/mlModelGroup.graphql
index 4f11ed4984d37a..bd14b943792bb5 100644
--- a/datahub-web-react/src/graphql/mlModelGroup.graphql
+++ b/datahub-web-react/src/graphql/mlModelGroup.graphql
@@ -49,5 +49,6 @@ query getMLModelGroup($urn: String!) {
         forms {
             ...formsFields
         }
+        ...notes
     }
 }
diff --git a/datahub-web-react/src/graphql/mlPrimaryKey.graphql b/datahub-web-react/src/graphql/mlPrimaryKey.graphql
index d39f9d3fbdfa25..d6eb3a31d709f2 100644
--- a/datahub-web-react/src/graphql/mlPrimaryKey.graphql
+++ b/datahub-web-react/src/graphql/mlPrimaryKey.graphql
@@ -20,5 +20,6 @@ query getMLPrimaryKey($urn: String!) {
         forms {
             ...formsFields
         }
+        ...notes
     }
 }
diff --git a/datahub-web-react/src/graphql/mutations.graphql b/datahub-web-react/src/graphql/mutations.graphql
index adc78d684a86de..339e9ce5a644f9 100644
--- a/datahub-web-react/src/graphql/mutations.graphql
+++ b/datahub-web-react/src/graphql/mutations.graphql
@@ -147,3 +147,7 @@ mutation addBusinessAttribute($input: AddBusinessAttributeInput!) {
 mutation removeBusinessAttribute($input: AddBusinessAttributeInput!) {
     removeBusinessAttribute(input: $input)
 }
+
+mutation updateDisplayProperties($urn: String!, $input: DisplayPropertiesUpdateInput!) {
+    updateDisplayProperties(urn: $urn, input: $input)
+}
diff --git a/datahub-web-react/src/graphql/query.graphql b/datahub-web-react/src/graphql/query.graphql
index 0bb580f877cae3..4b35faa159540c 100644
--- a/datahub-web-react/src/graphql/query.graphql
+++ b/datahub-web-react/src/graphql/query.graphql
@@ -36,8 +36,14 @@ fragment query on QueryEntity {
     subjects {
         dataset {
             urn
+            type
             name
         }
+        schemaField {
+            urn
+            type
+            fieldPath
+        }
     }
 }
 
@@ -67,3 +73,29 @@ mutation updateQuery($urn: String!, $input: UpdateQueryInput!) {
 mutation deleteQuery($urn: String!) {
     deleteQuery(urn: $urn)
 }
+
+query searchAcrossLineageForQueries($input: SearchAcrossLineageInput!) {
+    searchAcrossLineage(input: $input) {
+        start
+        count
+        total
+        searchResults {
+            entity {
+                urn
+                type
+                ...searchResultFieldsNoLineage
+            }
+            paths {
+                path {
+                    urn
+                    type
+                    ... on QueryEntity {
+                        ...query
+                    }
+                }
+            }
+            explored
+            ignoredAsHop
+        }
+    }
+}
diff --git a/datahub-web-react/src/graphql/relationships.graphql b/datahub-web-react/src/graphql/relationships.graphql
index e2afff5dfa6d27..5a5b36091773e3 100644
--- a/datahub-web-react/src/graphql/relationships.graphql
+++ b/datahub-web-react/src/graphql/relationships.graphql
@@ -35,6 +35,17 @@ fragment relationshipFields on EntityWithRelationships {
                 ...lineageNodeProperties
             }
         }
+        siblingsSearch(input: { query: "*", count: 5 }) {
+            count
+            total
+            searchResults {
+                entity {
+                    urn
+                    type
+                    ...lineageNodeProperties
+                }
+            }
+        }
     }
     upstream: lineage(input: { direction: UPSTREAM, start: 0, count: 100 }) {
         ...leafLineageResults
@@ -43,3 +54,13 @@ fragment relationshipFields on EntityWithRelationships {
         ...leafLineageResults
     }
 }
+
+query getEntitiesNotes($urns: [String!]!) {
+    entities(urns: $urns) {
+        ... on EntityWithRelationships {
+            urn
+            type
+            ...notes
+        }
+    }
+}
diff --git a/datahub-web-react/src/graphql/schemaField.graphql b/datahub-web-react/src/graphql/schemaField.graphql
new file mode 100644
index 00000000000000..95e09721b5cb15
--- /dev/null
+++ b/datahub-web-react/src/graphql/schemaField.graphql
@@ -0,0 +1,61 @@
+query getSchemaField($urn: String!) {
+    entity(urn: $urn) {
+        urn
+        type
+        ... on SchemaFieldEntity {
+            ...schemaFieldEntityFields
+        }
+    }
+}
+
+fragment schemaFieldEntityFields on SchemaFieldEntity {
+    urn
+    fieldPath
+    type
+    structuredProperties {
+        properties {
+            ...structuredPropertiesFields
+        }
+    }
+    businessAttributes {
+        businessAttribute {
+            ...businessAttribute
+        }
+    }
+    documentation {
+        ...documentationFields
+    }
+    parent {
+        urn
+        type
+        ...entityDisplayNameFields
+        ... on Dataset {
+            platform {
+                ...platformFields
+            }
+            subTypes {
+                typeNames
+            }
+            privileges {
+                ...entityPrivileges
+            }
+        }
+        ... on Dashboard {
+            platform {
+                ...platformFields
+            }
+            subTypes {
+                typeNames
+            }
+        }
+        ... on Chart {
+            platform {
+                ...platformFields
+            }
+            subTypes {
+                typeNames
+            }
+        }
+    }
+    ...notes
+}
diff --git a/datahub-web-react/src/graphql/search.graphql b/datahub-web-react/src/graphql/search.graphql
index be72ff31a4f264..7c8d670b535e8c 100644
--- a/datahub-web-react/src/graphql/search.graphql
+++ b/datahub-web-react/src/graphql/search.graphql
@@ -51,10 +51,43 @@ fragment autoCompleteFields on Entity {
                 }
             }
         }
+        siblingsSearch(input: { query: "*", count: 1 }) {
+            count
+            total
+            searchResults {
+                entity {
+                    urn
+                    type
+                    ... on Dataset {
+                        exists
+                        platform {
+                            ...platformFields
+                        }
+                        parentContainers {
+                            ...parentContainersFields
+                        }
+                        name
+                        properties {
+                            name
+                            description
+                            qualifiedName
+                            externalUrl
+                            lastModified {
+                                time
+                                actor
+                            }
+                        }
+                    }
+                }
+            }
+        }
         ...datasetStatsFields
         access {
             ...getAccess
         }
+        browsePathV2 {
+            ...browsePathV2Fields
+        }
     }
     ... on Role {
         id
@@ -98,6 +131,9 @@ fragment autoCompleteFields on Entity {
         subTypes {
             typeNames
         }
+        browsePathV2 {
+            ...browsePathV2Fields
+        }
     }
     ... on Chart {
         chartId
@@ -116,6 +152,9 @@ fragment autoCompleteFields on Entity {
         subTypes {
             typeNames
         }
+        browsePathV2 {
+            ...browsePathV2Fields
+        }
     }
     ... on DataFlow {
         orchestrator
@@ -197,6 +236,9 @@ fragment autoCompleteFields on Entity {
         subTypes {
             typeNames
         }
+        browsePathV2 {
+            ...browsePathV2Fields
+        }
     }
     ... on Tag {
         name
@@ -410,6 +452,30 @@ fragment searchResultsWithoutSchemaField on Entity {
                 }
             }
         }
+        siblingsSearch(input: { query: "*", count: 1 }) {
+            count
+            total
+            searchResults {
+                entity {
+                    urn
+                    type
+                    ... on Dataset {
+                        ...nonSiblingsDatasetSearchFields
+                        siblings {
+                            isPrimary
+                        }
+                        structuredProperties {
+                            properties {
+                                ...structuredPropertiesFields
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        browsePathV2 {
+            ...browsePathV2Fields
+        }
         structuredProperties {
             properties {
                 ...structuredPropertiesFields
@@ -534,6 +600,9 @@ fragment searchResultsWithoutSchemaField on Entity {
                 ...structuredPropertiesFields
             }
         }
+        browsePathV2 {
+            ...browsePathV2Fields
+        }
     }
     ... on Chart {
         chartId
@@ -578,6 +647,9 @@ fragment searchResultsWithoutSchemaField on Entity {
         parentContainers {
             ...parentContainersFields
         }
+        browsePathV2 {
+            ...browsePathV2Fields
+        }
         statsSummary {
             viewCount
             uniqueUserCountLast30Days
@@ -968,13 +1040,25 @@ fragment searchResultsWithoutSchemaField on Entity {
     }
 }
 
-fragment searchResultFields on Entity {
+fragment searchResultFieldsNoLineage on Entity {
     ...searchResultsWithoutSchemaField
     ... on SchemaFieldEntity {
         ...entityField
     }
 }
 
+fragment searchResultFields on Entity {
+    ...searchResultFieldsNoLineage
+    ... on EntityWithRelationships {
+        upstream: lineage(input: { direction: UPSTREAM, start: 0, count: 0 }) {
+            total
+        }
+        downstream: lineage(input: { direction: DOWNSTREAM, start: 0, count: 0 }) {
+            total
+        }
+    }
+}
+
 fragment facetFields on FacetMetadata {
     field
     displayName
@@ -1128,7 +1212,7 @@ fragment entityField on SchemaFieldEntity {
     }
 }
 
-fragment schemaFieldEntityFields on SchemaFieldEntity {
+fragment schemaFieldEntitySearchFields on SchemaFieldEntity {
     urn
     type
     fieldPath
@@ -1168,7 +1252,7 @@ fragment searchAcrossRelationshipResults on SearchAcrossLineageResults {
             path {
                 ...searchResultsWithoutSchemaField
                 ... on SchemaFieldEntity {
-                    ...schemaFieldEntityFields
+                    ...schemaFieldEntitySearchFields
                 }
             }
         }
@@ -1191,12 +1275,57 @@ query getSearchResultsForMultiple($input: SearchAcrossEntitiesInput!) {
     }
 }
 
+query getSearchCount($input: SearchAcrossEntitiesInput!) {
+    searchAcrossEntities(input: $input) {
+        total
+    }
+}
+
 query searchAcrossLineage($input: SearchAcrossLineageInput!, $includeAssertions: Boolean = false) {
     searchAcrossLineage(input: $input) {
         ...searchAcrossRelationshipResults
     }
 }
 
+query searchAcrossLineageCount($input: SearchAcrossLineageInput!) {
+    searchAcrossLineage(input: $input) {
+        total
+    }
+}
+
+query searchAcrossLineageStructure($input: SearchAcrossLineageInput!) {
+    searchAcrossLineage(input: $input) {
+        start
+        count
+        total
+        searchResults {
+            entity {
+                urn
+                type
+            }
+            paths {
+                path {
+                    urn
+                    type
+                }
+            }
+            explored
+            ignoredAsHop
+        }
+    }
+}
+
+query aggregateAcrossLineage($input: SearchAcrossLineageInput!) {
+    searchAcrossLineage(input: $input) {
+        start
+        count
+        total
+        facets {
+            ...facetFields
+        }
+    }
+}
+
 query getEntityMentionNode($urn: String!) {
     entity(urn: $urn) {
         urn
diff --git a/datahub-web-react/src/graphql/timeline.graphql b/datahub-web-react/src/graphql/timeline.graphql
new file mode 100644
index 00000000000000..ebfa1e21c0ef64
--- /dev/null
+++ b/datahub-web-react/src/graphql/timeline.graphql
@@ -0,0 +1,25 @@
+query getTimeline($input: GetTimelineInput!) {
+    getTimeline(input: $input) {
+        changeTransactions {
+            timestampMillis
+            lastSemanticVersion
+            versionStamp
+            changeType
+            changes {
+                urn
+                category
+                operation
+                modifier
+                parameters {
+                    key
+                    value
+                }
+                auditStamp {
+                    actor
+                    time
+                }
+                description
+            }
+        }
+    }
+}
diff --git a/datahub-web-react/src/graphql/user.graphql b/datahub-web-react/src/graphql/user.graphql
index 030ef85df7124b..36036a5b088357 100644
--- a/datahub-web-react/src/graphql/user.graphql
+++ b/datahub-web-react/src/graphql/user.graphql
@@ -183,6 +183,43 @@ query listUsers($input: ListUsersInput!) {
     }
 }
 
+query getUsers($urns: [String!]!) {
+    entities(urns: $urns) {
+        ... on CorpUser {
+            urn
+            type
+            ...userFields
+        }
+    }
+}
+
+fragment userFields on CorpUser {
+    username
+    properties {
+        active
+        displayName
+        title
+        firstName
+        lastName
+        fullName
+        email
+    }
+    info {
+        active
+        displayName
+        title
+        firstName
+        lastName
+        fullName
+        email
+    }
+    editableProperties {
+        displayName
+        title
+        pictureLink
+    }
+}
+
 mutation removeUser($urn: String!) {
     removeUser(urn: $urn)
 }
@@ -206,3 +243,9 @@ mutation createNativeUserResetToken($input: CreateNativeUserResetTokenInput!) {
 mutation updateCorpUserViewsSettings($input: UpdateCorpUserViewsSettingsInput!) {
     updateCorpUserViewsSettings(input: $input)
 }
+
+query getUserOwnedAssets($urn: String!) {
+    searchAcrossEntities(input: { query: "", filters: [{ field: "owners", values: [$urn] }] }) {
+        ...searchResults
+    }
+}
diff --git a/datahub-web-react/src/images/acryl_hero.svg b/datahub-web-react/src/images/acryl_hero.svg
new file mode 100644
index 00000000000000..0fdc4d850d164e
--- /dev/null
+++ b/datahub-web-react/src/images/acryl_hero.svg
@@ -0,0 +1,497 @@
+<svg viewBox="0 0 968 968" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_67_611)">
+<path d="M483.69 614.64C557.972 614.64 618.19 554.422 618.19 480.14C618.19 405.858 557.972 345.64 483.69 345.64C409.408 345.64 349.19 405.858 349.19 480.14C349.19 554.422 409.408 614.64 483.69 614.64Z" stroke="#20D3BD" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M483.69 314.31C575.45 314.31 649.84 388.7 649.84 480.46C649.84 572.22 575.45 646.61 483.69 646.61C391.93 646.61 317.54 572.22 317.54 480.46C317.54 388.7 391.93 314.31 483.69 314.31V314.31ZM483.69 314.22C461.25 314.22 439.48 318.62 418.98 327.28C399.18 335.65 381.41 347.64 366.14 362.91C350.87 378.18 338.89 395.96 330.51 415.75C321.84 436.24 317.45 458.02 317.45 480.46C317.45 502.9 321.85 524.67 330.51 545.17C338.88 564.97 350.87 582.74 366.14 598.01C381.41 613.28 399.19 625.26 418.98 633.64C439.47 642.31 461.25 646.7 483.69 646.7C506.13 646.7 527.9 642.3 548.4 633.64C568.2 625.27 585.97 613.28 601.24 598.01C616.51 582.74 628.49 564.96 636.87 545.17C645.54 524.68 649.93 502.9 649.93 480.46C649.93 458.02 645.53 436.25 636.87 415.75C628.5 395.95 616.51 378.18 601.24 362.91C585.97 347.64 568.19 335.66 548.4 327.28C527.91 318.61 506.13 314.22 483.69 314.22V314.22Z" fill="#08303A"/>
+<path d="M483.69 646.61C575.452 646.61 649.84 572.222 649.84 480.46C649.84 388.698 575.452 314.31 483.69 314.31C391.928 314.31 317.54 388.698 317.54 480.46C317.54 572.222 391.928 646.61 483.69 646.61Z" stroke="#20D3BD" stroke-width="1.82" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M483.69 282.98C592.93 282.98 681.49 371.54 681.49 480.78C681.49 590.02 592.93 678.58 483.69 678.58C374.45 678.58 285.89 590.02 285.89 480.78C285.89 371.54 374.45 282.98 483.69 282.98ZM483.69 282.8C456.96 282.8 431.03 288.03 406.63 298.36C383.05 308.33 361.88 322.61 343.7 340.79C325.52 358.97 311.24 380.15 301.27 403.72C290.95 428.13 285.71 454.06 285.71 480.78C285.71 507.5 290.94 533.44 301.27 557.84C311.24 581.42 325.52 602.59 343.7 620.77C361.88 638.95 383.06 653.23 406.63 663.2C431.04 673.52 456.97 678.76 483.69 678.76C510.41 678.76 536.35 673.53 560.75 663.2C584.33 653.23 605.5 638.95 623.68 620.77C641.86 602.59 656.14 581.41 666.11 557.84C676.43 533.43 681.67 507.5 681.67 480.78C681.67 454.06 676.44 428.12 666.11 403.72C656.14 380.14 641.86 358.97 623.68 340.79C605.5 322.61 584.32 308.33 560.75 298.36C536.34 288.04 510.41 282.8 483.69 282.8Z" fill="#08303A"/>
+<path d="M483.69 678.58C592.932 678.58 681.49 590.022 681.49 480.78C681.49 371.538 592.932 282.98 483.69 282.98C374.448 282.98 285.89 371.538 285.89 480.78C285.89 590.022 374.448 678.58 483.69 678.58Z" stroke="#20D3BD" stroke-width="1.64" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M483.69 251.65C610.42 251.65 713.15 354.38 713.15 481.11C713.15 607.84 610.42 710.57 483.69 710.57C356.96 710.57 254.23 607.84 254.23 481.11C254.23 354.38 356.96 251.65 483.69 251.65V251.65ZM483.69 251.38C452.68 251.38 422.59 257.45 394.27 269.43C366.91 281 342.35 297.56 321.25 318.66C300.15 339.76 283.59 364.33 272.02 391.68C260.04 420 253.97 450.09 253.97 481.1C253.97 512.11 260.04 542.2 272.02 570.52C283.59 597.88 300.15 622.44 321.25 643.54C342.35 664.64 366.92 681.2 394.27 692.77C422.59 704.75 452.68 710.82 483.69 710.82C514.7 710.82 544.79 704.75 573.11 692.77C600.47 681.2 625.03 664.64 646.13 643.54C667.23 622.44 683.79 597.87 695.36 570.52C707.34 542.2 713.41 512.11 713.41 481.1C713.41 450.09 707.34 420 695.36 391.68C683.79 364.32 667.23 339.76 646.13 318.66C625.03 297.56 600.46 281 573.11 269.43C544.79 257.45 514.7 251.38 483.69 251.38V251.38Z" fill="#08303A"/>
+<path d="M483.69 710.57C610.417 710.57 713.15 607.837 713.15 481.11C713.15 354.383 610.417 251.65 483.69 251.65C356.963 251.65 254.23 354.383 254.23 481.11C254.23 607.837 356.963 710.57 483.69 710.57Z" stroke="#20D3BD" stroke-width="1.45" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M483.69 220.32C627.9 220.32 744.8 337.22 744.8 481.43C744.8 625.64 627.9 742.54 483.69 742.54C339.48 742.54 222.58 625.64 222.58 481.43C222.58 337.22 339.48 220.32 483.69 220.32ZM483.69 219.96C448.39 219.96 414.15 226.87 381.91 240.51C350.77 253.68 322.81 272.53 298.8 296.55C274.79 320.56 255.93 348.53 242.76 379.66C229.13 411.9 222.21 446.14 222.21 481.44C222.21 516.74 229.12 550.98 242.76 583.22C255.93 614.36 274.78 642.32 298.8 666.33C322.81 690.34 350.78 709.2 381.91 722.37C414.15 736 448.39 742.92 483.69 742.92C518.99 742.92 553.23 736.01 585.47 722.37C616.61 709.2 644.57 690.35 668.58 666.33C692.59 642.32 711.45 614.35 724.62 583.22C738.25 550.98 745.17 516.74 745.17 481.44C745.17 446.14 738.26 411.9 724.62 379.66C711.45 348.52 692.6 320.56 668.58 296.55C644.57 272.54 616.6 253.68 585.47 240.51C553.23 226.88 518.99 219.96 483.69 219.96V219.96Z" fill="#08303A"/>
+<path d="M483.69 742.54C627.897 742.54 744.8 625.637 744.8 481.43C744.8 337.223 627.897 220.32 483.69 220.32C339.483 220.32 222.58 337.223 222.58 481.43C222.58 625.637 339.483 742.54 483.69 742.54Z" stroke="#20D3BD" stroke-width="1.27" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M483.69 188.99C645.38 188.99 776.45 320.07 776.45 481.75C776.45 643.43 645.37 774.51 483.69 774.51C322.01 774.51 190.92 643.44 190.92 481.75C190.92 320.06 322 188.99 483.69 188.99ZM483.69 188.54C444.11 188.54 405.71 196.29 369.56 211.58C334.64 226.35 303.29 247.49 276.36 274.42C249.43 301.35 228.29 332.71 213.52 367.62C198.23 403.77 190.48 442.17 190.48 481.75C190.48 521.33 198.23 559.73 213.52 595.88C228.29 630.8 249.43 662.15 276.36 689.08C303.29 716.01 334.65 737.15 369.56 751.92C405.71 767.21 444.11 774.96 483.69 774.96C523.27 774.96 561.67 767.21 597.82 751.92C632.74 737.15 664.09 716.01 691.02 689.08C717.95 662.15 739.09 630.79 753.86 595.88C769.15 559.73 776.9 521.33 776.9 481.75C776.9 442.17 769.15 403.77 753.86 367.62C739.09 332.7 717.95 301.35 691.02 274.42C664.09 247.49 632.73 226.35 597.82 211.58C561.67 196.29 523.27 188.54 483.69 188.54V188.54Z" fill="#08303A"/>
+<path d="M483.69 774.51C645.377 774.51 776.45 643.437 776.45 481.75C776.45 320.063 645.377 188.99 483.69 188.99C322.003 188.99 190.93 320.063 190.93 481.75C190.93 643.437 322.003 774.51 483.69 774.51Z" stroke="#20D3BD" stroke-width="1.09" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M483.69 157.66C662.86 157.66 808.11 302.91 808.11 482.08C808.11 661.25 662.86 806.5 483.69 806.5C304.52 806.5 159.27 661.25 159.27 482.07C159.27 302.89 304.52 157.66 483.69 157.66ZM483.69 157.11C439.82 157.11 397.26 165.7 357.2 182.65C318.5 199.02 283.75 222.45 253.91 252.29C224.07 282.13 200.64 316.89 184.27 355.58C167.32 395.64 158.73 438.2 158.73 482.07C158.73 525.94 167.32 568.5 184.27 608.56C200.64 647.26 224.07 682.01 253.91 711.85C283.75 741.69 318.51 765.13 357.2 781.49C397.26 798.44 439.82 807.03 483.69 807.03C527.56 807.03 570.12 798.44 610.18 781.49C648.88 765.12 683.63 741.69 713.47 711.85C743.31 682.01 766.74 647.25 783.11 608.56C800.06 568.5 808.65 525.94 808.65 482.07C808.65 438.2 800.06 395.64 783.11 355.58C766.74 316.88 743.31 282.13 713.47 252.29C683.63 222.45 648.87 199.02 610.18 182.65C570.12 165.7 527.56 157.11 483.69 157.11V157.11Z" fill="#08303A"/>
+<path d="M483.69 806.49C662.862 806.49 808.11 661.242 808.11 482.07C808.11 302.898 662.862 157.65 483.69 157.65C304.518 157.65 159.27 302.898 159.27 482.07C159.27 661.242 304.518 806.49 483.69 806.49Z" stroke="#20D3BD" stroke-width="0.91" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M483.69 126.32C680.34 126.32 839.76 285.74 839.76 482.39C839.76 679.04 680.34 838.46 483.69 838.46C287.04 838.46 127.62 679.05 127.62 482.4C127.62 285.75 287.03 126.32 483.69 126.32ZM483.69 125.68C435.53 125.68 388.82 135.11 344.84 153.71C302.36 171.68 264.22 197.4 231.46 230.16C198.7 262.92 172.98 301.07 155.01 343.54C136.41 387.52 126.98 434.23 126.98 482.39C126.98 530.55 136.41 577.26 155.01 621.24C172.98 663.72 198.7 701.86 231.46 734.62C264.22 767.38 302.37 793.1 344.84 811.07C388.82 829.67 435.53 839.1 483.69 839.1C531.85 839.1 578.56 829.67 622.54 811.07C665.02 793.1 703.16 767.38 735.92 734.62C768.68 701.86 794.4 663.71 812.37 621.24C830.97 577.26 840.4 530.55 840.4 482.39C840.4 434.23 830.97 387.52 812.37 343.54C794.4 301.06 768.68 262.92 735.92 230.16C703.16 197.4 665.01 171.68 622.54 153.71C578.56 135.11 531.85 125.68 483.69 125.68V125.68Z" fill="#08303A"/>
+<path d="M483.69 838.47C680.342 838.47 839.76 679.052 839.76 482.4C839.76 285.748 680.342 126.33 483.69 126.33C287.038 126.33 127.62 285.748 127.62 482.4C127.62 679.052 287.038 838.47 483.69 838.47Z" stroke="#20D3BD" stroke-width="0.73" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M483.69 94.99C697.83 94.99 871.42 268.58 871.42 482.72C871.42 696.86 697.83 870.45 483.69 870.45C269.55 870.45 95.96 696.85 95.96 482.72C95.96 268.59 269.55 94.99 483.69 94.99ZM483.69 94.26C431.25 94.26 380.38 104.53 332.49 124.79C286.23 144.35 244.69 172.36 209.02 208.04C173.35 243.71 145.34 285.26 125.77 331.51C105.51 379.4 95.24 430.27 95.24 482.71C95.24 535.15 105.51 586.02 125.77 633.91C145.33 680.17 173.34 721.71 209.02 757.38C244.69 793.05 286.24 821.06 332.49 840.63C380.38 860.89 431.25 871.16 483.69 871.16C536.13 871.16 587 860.89 634.89 840.63C681.15 821.06 722.69 793.06 758.36 757.38C794.03 721.71 822.04 680.16 841.61 633.91C861.87 586.02 872.14 535.15 872.14 482.71C872.14 430.27 861.87 379.4 841.61 331.51C822.05 285.25 794.04 243.71 758.36 208.04C722.69 172.37 681.14 144.36 634.89 124.79C587 104.53 536.13 94.26 483.69 94.26Z" fill="#08303A"/>
+<path d="M483.69 870.45C697.827 870.45 871.42 696.857 871.42 482.72C871.42 268.583 697.827 94.99 483.69 94.99C269.553 94.99 95.96 268.583 95.96 482.72C95.96 696.857 269.553 870.45 483.69 870.45Z" stroke="#20D3BD" stroke-width="0.55" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M483.69 63.66C715.31 63.66 903.07 251.42 903.07 483.04C903.07 714.66 715.31 902.42 483.69 902.42C252.07 902.42 64.31 714.66 64.31 483.04C64.31 251.42 252.07 63.66 483.69 63.66ZM483.69 62.84C426.96 62.84 371.93 73.95 320.13 95.86C270.09 117.02 225.16 147.32 186.57 185.91C147.98 224.5 117.68 269.44 96.52 319.47C74.61 371.27 63.5 426.3 63.5 483.03C63.5 539.76 74.61 594.79 96.52 646.59C117.68 696.63 147.98 741.56 186.57 780.15C225.16 818.74 270.1 849.04 320.13 870.2C371.93 892.11 426.96 903.22 483.69 903.22C540.42 903.22 595.45 892.11 647.25 870.2C697.29 849.04 742.22 818.74 780.81 780.15C819.4 741.56 849.7 696.62 870.86 646.59C892.77 594.79 903.88 539.76 903.88 483.03C903.88 426.3 892.77 371.27 870.86 319.47C849.7 269.43 819.4 224.5 780.81 185.91C742.22 147.32 697.28 117.02 647.25 95.86C595.45 73.95 540.42 62.84 483.69 62.84V62.84Z" fill="#08303A"/>
+<path d="M483.69 902.42C715.307 902.42 903.07 714.657 903.07 483.04C903.07 251.423 715.307 63.66 483.69 63.66C252.073 63.66 64.3101 251.423 64.3101 483.04C64.3101 714.657 252.073 902.42 483.69 902.42Z" stroke="#20D3BD" stroke-width="0.36" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M483.69 32.33C732.79 32.33 934.72 234.26 934.72 483.36C934.72 732.46 732.78 934.39 483.69 934.39C234.6 934.39 32.65 732.46 32.65 483.36C32.65 234.26 234.59 32.33 483.69 32.33ZM483.69 31.42C422.68 31.42 363.49 43.37 307.77 66.94C253.95 89.7 205.62 122.29 164.12 163.79C122.61 205.3 90.03 253.63 67.27 307.45C43.7 363.17 31.75 422.36 31.75 483.37C31.75 544.38 43.7 603.57 67.27 659.29C90.03 713.11 122.62 761.44 164.12 802.95C205.63 844.46 253.96 877.04 307.77 899.8C363.49 923.37 422.68 935.32 483.69 935.32C544.7 935.32 603.89 923.37 659.61 899.8C713.43 877.04 761.76 844.45 803.27 802.95C844.78 761.44 877.36 713.11 900.12 659.29C923.69 603.57 935.64 544.38 935.64 483.37C935.64 422.36 923.69 363.17 900.12 307.45C877.36 253.63 844.77 205.3 803.27 163.79C761.76 122.28 713.43 89.7 659.61 66.94C603.89 43.37 544.7 31.42 483.69 31.42V31.42Z" fill="#08303A"/>
+<path d="M483.69 934.4C732.787 934.4 934.72 732.467 934.72 483.37C934.72 234.273 732.787 32.34 483.69 32.34C234.593 32.34 32.66 234.273 32.66 483.37C32.66 732.467 234.593 934.4 483.69 934.4Z" stroke="#20D3BD" stroke-width="0.18" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M483.69 1C750.27 1 966.38 217.11 966.38 483.69C966.38 750.27 750.27 966.38 483.69 966.38C217.11 966.38 1 750.27 1 483.69C1 217.11 217.11 1 483.69 1ZM483.69 0C418.39 0 355.05 12.79 295.42 38.01C237.82 62.37 186.1 97.25 141.67 141.67C97.25 186.09 62.37 237.82 38.01 295.42C12.79 355.05 0 418.39 0 483.69C0 548.99 12.79 612.33 38.01 671.96C62.37 729.56 97.25 781.28 141.67 825.71C186.09 870.13 237.82 905.01 295.42 929.37C355.05 954.59 418.4 967.38 483.69 967.38C548.98 967.38 612.33 954.59 671.96 929.37C729.56 905.01 781.28 870.13 825.71 825.71C870.13 781.29 905.01 729.56 929.37 671.96C954.59 612.33 967.38 548.98 967.38 483.69C967.38 418.4 954.59 355.05 929.37 295.42C905.01 237.82 870.13 186.1 825.71 141.67C781.29 97.25 729.56 62.37 671.96 38.01C612.33 12.79 548.98 0 483.69 0Z" fill="#08303A"/>
+</g>
+<line x1="337.718" y1="222.158" x2="319.402" y2="345.488" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="303.093" y1="403.203" x2="296.975" y2="546.364" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="162.668" y1="506.35" x2="123.451" y2="663.217" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="295.652" y1="609.154" x2="287.048" y2="821.793" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="199.331" y1="493.881" x2="279.714" y2="564.52" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="312.015" y1="869.139" x2="445.241" y2="898.807" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="322.12" y1="602.81" x2="454.4" y2="682.423" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="368.286" y1="750.675" x2="463.308" y2="698.291" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="514.164" y1="898.266" x2="629.509" y2="759.607" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="509.685" y1="687.389" x2="644.406" y2="608.063" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="360.622" y1="778.122" x2="457.257" y2="879.65" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="137.09" y1="697.942" x2="307.598" y2="738.422" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="70.0629" y1="519.574" x2="96.9724" y2="656.568" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="660.957" y1="119.414" x2="511.985" y2="259.526" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="630.281" y1="238.413" x2="515.556" y2="276.248" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="656.322" y1="116.241" x2="369.134" y2="200.608" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="662.139" y1="349.091" x2="658.492" y2="251.835" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="769.726" y1="469.424" x2="670.885" y2="402.31" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="809.961" y1="724.623" x2="654.126" y2="745.856" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="629.694" y1="740.335" x2="501.355" y2="706.111" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="779.575" y1="502.812" x2="678.219" y2="576.081" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="815.718" y1="738.558" x2="698.087" y2="846.387" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="799.599" y1="513.347" x2="837.636" y2="688.81" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="833.242" y1="264.031" x2="675.168" y2="238.298" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="311.394" y1="206.139" x2="144.576" y2="256.43" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="465.907" y1="72.3134" x2="349.456" y2="188.764" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="456.912" y1="280.713" x2="337.015" y2="356.566" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="483" y1="428.241" x2="483" y2="347" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="508.257" y1="434.74" x2="548.877" y2="364.384" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="416.391" y1="591.857" x2="457.011" y2="521.5" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="457.877" y1="435.24" x2="417.257" y2="364.884" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="548.011" y1="593.357" x2="507.391" y2="523" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="439.62" y1="453.863" x2="369.263" y2="413.243" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="596.736" y1="545.729" x2="526.38" y2="505.109" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="526.88" y1="452.997" x2="597.236" y2="412.377" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="368.763" y1="543.131" x2="439.12" y2="502.511" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="482" y1="610.241" x2="482" y2="529" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="533.88" y1="478.12" x2="615.12" y2="478.12" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="351.88" y1="477.12" x2="433.12" y2="477.12" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<line x1="277.916" y1="398.455" x2="97.441" y2="456.158" stroke="#315C64" stroke-width="2" stroke-linecap="round" stroke-dasharray="0.1 6"/>
+<g filter="url(#filter0_b_67_611)">
+<circle cx="486" cy="272.589" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter1_b_67_611)">
+<circle cx="621.589" cy="210.589" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter2_b_67_611)">
+<circle cx="679.589" cy="95.5892" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter3_b_67_611)">
+<circle cx="655.762" cy="379.647" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter4_b_67_611)">
+<circle cx="839.14" cy="723.709" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter5_b_67_611)">
+<circle cx="905.411" cy="481.323" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter6_b_67_611)">
+<circle cx="791.934" cy="478.323" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter7_b_67_611)">
+<circle cx="854.573" cy="281.603" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter8_b_67_611)">
+<circle cx="663.024" cy="588.445" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter9_b_67_611)">
+<circle cx="480.553" cy="690.589" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<path d="M499.258 672.437C500.222 673.363 500.852 674.587 501 675.921C501 676.477 500.852 676.848 500.518 677.552C500.184 678.257 496.07 685.374 494.846 687.339C494.142 688.488 493.771 689.86 493.771 691.194C493.771 692.566 494.142 693.901 494.846 695.05C496.07 697.014 500.184 704.169 500.518 704.873C500.852 705.578 501 705.911 501 706.467C500.852 707.802 500.259 709.025 499.295 709.915C498.368 710.879 497.145 711.509 495.847 711.62C495.291 711.62 494.92 711.472 494.253 711.138C493.586 710.805 486.32 706.801 484.355 705.578C484.207 705.504 484.059 705.392 483.873 705.318L474.161 699.572C474.383 701.426 475.199 703.205 476.533 704.503C476.793 704.762 477.052 704.985 477.349 705.207C477.127 705.318 476.867 705.429 476.645 705.578C474.68 706.801 467.525 710.916 466.821 711.25C466.117 711.583 465.783 711.731 465.19 711.731C463.855 711.583 462.632 710.99 461.742 710.026C460.778 709.099 460.148 707.876 460 706.542C460.037 705.986 460.185 705.429 460.482 704.948C460.816 704.243 464.93 697.089 466.154 695.124C466.858 693.975 467.229 692.64 467.229 691.269C467.229 689.897 466.858 688.562 466.154 687.413C464.93 685.374 460.778 678.22 460.482 677.515C460.185 677.033 460.037 676.477 460 675.921C460.148 674.587 460.741 673.363 461.705 672.437C462.632 671.473 463.855 670.88 465.19 670.731C465.746 670.769 466.302 670.917 466.821 671.213C467.414 671.473 472.641 674.513 475.421 676.144L476.052 676.514C476.274 676.663 476.459 676.774 476.608 676.848L476.904 677.033L486.802 682.891C486.58 680.666 485.43 678.627 483.651 677.256C483.873 677.145 484.133 677.033 484.355 676.885C486.32 675.662 493.475 671.51 494.179 671.213C494.661 670.917 495.217 670.769 495.81 670.731C497.108 670.88 498.331 671.473 499.258 672.437ZM481.019 693.863L483.132 691.75C483.429 691.454 483.429 691.009 483.132 690.712L481.019 688.599C480.722 688.303 480.278 688.303 479.981 688.599L477.868 690.712C477.571 691.009 477.571 691.454 477.868 691.75L479.981 693.863C480.241 694.123 480.722 694.123 481.019 693.863Z" fill="#FF694A"/>
+<g clip-path="url(#clip1_67_611)">
+<path d="M485.621 251.802C484.297 251.802 483.082 252.532 482.46 253.7C481.838 254.868 481.91 256.284 482.649 257.383L484.179 255.855C484.128 255.702 484.103 255.543 484.103 255.382C484.103 254.548 484.78 253.871 485.614 253.871C486.448 253.871 487.125 254.548 487.125 255.382C487.125 256.216 486.448 256.893 485.614 256.893C485.454 256.893 485.295 256.868 485.144 256.817L483.616 258.345C484.888 259.208 486.569 259.163 487.793 258.232C489.017 257.301 489.51 255.693 489.017 254.236C488.525 252.779 487.158 251.8 485.621 251.802Z" fill="#34A853"/>
+<path d="M484.196 262.236C484.198 261.027 483.807 259.85 483.08 258.883L481.095 260.866C481.716 262.002 481.492 263.413 480.551 264.302L481.63 266.939C483.229 265.909 484.195 264.138 484.196 262.236Z" fill="#FBBC04"/>
+<path d="M478.647 265.083H478.596C477.378 265.083 476.294 264.309 475.9 263.157C475.506 262.005 475.887 260.729 476.85 259.983C477.812 259.237 479.143 259.185 480.16 259.854L482.126 257.888C480.215 256.338 477.515 256.218 475.473 257.593C473.432 258.968 472.528 261.515 473.246 263.869C473.963 266.223 476.134 267.833 478.596 267.835C478.975 267.835 479.354 267.797 479.726 267.723L478.647 265.083Z" fill="#EA4335"/>
+<path d="M485.696 267.364C484.453 267.363 483.217 267.544 482.027 267.902L483.6 271.745C484.285 271.576 484.988 271.49 485.694 271.491C489.782 271.492 493.301 274.381 494.097 278.391C494.894 282.401 492.747 286.415 488.97 287.979C485.192 289.543 480.836 288.221 478.565 284.822C476.294 281.422 476.741 276.892 479.632 274.001C480.235 273.399 480.923 272.89 481.675 272.49L480.119 268.657C474.319 271.498 471.573 278.238 473.736 284.323C475.9 290.409 482.284 293.903 488.576 292.445C494.868 290.987 499.064 285.04 498.33 278.624C497.596 272.207 492.165 267.362 485.707 267.362L485.696 267.364Z" fill="#4285F4"/>
+</g>
+<g clip-path="url(#clip2_67_611)">
+<path d="M643.661 606.838L663.298 586.715C663.359 586.655 663.396 586.576 663.405 586.491C663.413 586.406 663.39 586.321 663.342 586.251C662.148 584.584 659.944 584.295 659.128 583.175C656.709 579.858 656.095 577.981 655.056 578.097C654.983 578.107 654.917 578.142 654.867 578.196L647.774 585.466C643.692 589.645 643.106 598.856 643 606.569C643 606.646 643.022 606.721 643.065 606.785C643.108 606.848 643.169 606.898 643.24 606.927C643.311 606.956 643.389 606.963 643.464 606.947C643.539 606.931 643.608 606.893 643.661 606.838V606.838Z" fill="#017CEE"/>
+<path d="M683.85 606.341L663.721 586.709C663.661 586.648 663.582 586.61 663.497 586.602C663.412 586.594 663.327 586.616 663.257 586.665C661.589 587.859 661.3 590.061 660.18 590.878C656.862 593.296 654.984 593.909 655.1 594.948C655.11 595.021 655.146 595.087 655.199 595.136L662.471 602.228C666.651 606.308 675.865 606.894 683.581 607C683.657 607 683.732 606.977 683.795 606.935C683.859 606.892 683.908 606.832 683.937 606.761C683.966 606.69 683.973 606.613 683.958 606.538C683.942 606.463 683.905 606.395 683.85 606.341Z" fill="#00AD46"/>
+<path d="M662.471 602.23C660.186 600.001 659.127 595.593 663.507 586.502C656.387 589.682 653.892 593.863 655.119 595.061L662.471 602.23Z" fill="#04D659"/>
+<path d="M683.353 566.165L663.716 586.288C663.656 586.348 663.618 586.427 663.61 586.512C663.602 586.597 663.624 586.682 663.672 586.752C664.867 588.418 667.069 588.707 667.887 589.827C670.305 593.145 670.92 595.022 671.959 594.906C672.031 594.896 672.098 594.86 672.147 594.806L679.241 587.537C683.322 583.358 683.909 574.147 684.015 566.434C684.015 566.357 683.992 566.282 683.949 566.218C683.906 566.155 683.845 566.105 683.774 566.076C683.703 566.047 683.625 566.04 683.55 566.056C683.475 566.072 683.406 566.11 683.353 566.165V566.165Z" fill="#00C7D4"/>
+<path d="M679.244 587.537C677.015 589.821 672.605 590.88 663.511 586.502C666.693 593.619 670.875 596.113 672.072 594.886L679.244 587.537Z" fill="#11E1EE"/>
+<path d="M643.163 566.662L663.292 586.292C663.352 586.353 663.431 586.39 663.516 586.398C663.601 586.406 663.686 586.384 663.756 586.336C665.423 585.142 665.712 582.939 666.832 582.123C670.151 579.705 672.029 579.091 671.913 578.052C671.902 577.98 671.867 577.913 671.813 577.864L664.541 570.772C660.361 566.692 651.147 566.106 643.432 566C643.355 566 643.28 566.022 643.216 566.065C643.152 566.108 643.102 566.168 643.073 566.24C643.044 566.311 643.037 566.389 643.053 566.464C643.069 566.54 643.107 566.608 643.163 566.662V566.662Z" fill="#E43921"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M664.545 570.773C666.83 573.002 667.889 577.41 663.509 586.502C670.629 583.321 673.124 579.139 671.897 577.943L664.545 570.773Z" fill="#FF7557"/>
+<path d="M647.774 585.467C650.003 583.182 654.413 582.124 663.507 586.502C660.326 579.385 656.143 576.891 654.946 578.117L647.774 585.467Z" fill="#0CB6FF"/>
+<path d="M663.51 587.376C663.995 587.376 664.388 586.983 664.388 586.498C664.388 586.014 663.995 585.621 663.51 585.621C663.025 585.621 662.632 586.014 662.632 586.498C662.632 586.983 663.025 587.376 663.51 587.376Z" fill="#4A4848"/>
+</g>
+<g filter="url(#filter10_b_67_611)">
+<circle cx="304.589" cy="579.589" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter11_b_67_611)">
+<circle cx="306.589" cy="377.589" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter12_b_67_611)">
+<circle cx="173.589" cy="476.589" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter13_b_67_611)">
+<circle cx="66.5892" cy="474.968" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter14_b_67_611)">
+<circle cx="120.15" cy="272.525" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter15_b_67_611)">
+<circle cx="111.98" cy="681.95" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter16_b_67_611)">
+<circle cx="270.589" cy="846.589" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter17_b_67_611)">
+<circle cx="329.589" cy="749.589" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter18_b_67_611)">
+<circle cx="481.589" cy="903.457" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter19_b_67_611)">
+<circle cx="678.589" cy="861.589" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter20_b_67_611)">
+<circle cx="623.589" cy="751.589" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter21_b_67_611)">
+<circle cx="332.589" cy="209.589" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter22_b_67_611)">
+<circle cx="484.184" cy="65.5431" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g filter="url(#filter23_b_67_611)">
+<circle cx="280.589" cy="118.589" r="33.5892" fill="#092125" fill-opacity="0.75"/>
+</g>
+<g opacity="0.33">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M914.681 491.526C917.814 488.505 919.761 484.268 919.761 479.572C919.761 470.404 912.311 462.955 903.105 462.955C893.9 462.955 886.449 470.404 886.449 479.572C886.449 488.311 893.218 495.488 901.824 496.141V505.138C907.803 499.023 912.089 494.486 914.681 491.526ZM892.651 481.779H895.111C895.706 481.781 896.187 482.219 896.189 482.76V484.983C896.187 485.524 895.706 485.962 895.111 485.964H892.651C892.057 485.962 891.576 485.524 891.574 484.983V482.76C891.576 482.219 892.057 481.78 892.651 481.779ZM898.344 476.875H900.786C901.38 476.877 901.861 477.315 901.863 477.856V484.983C901.861 485.524 901.38 485.962 900.786 485.964H898.344C897.749 485.962 897.268 485.524 897.266 484.983V477.856C897.268 477.315 897.749 476.877 898.344 476.875ZM904.018 479.572H906.478C907.072 479.574 907.553 480.012 907.555 480.553V484.983C907.553 485.524 907.072 485.962 906.478 485.964H904.018C903.424 485.962 902.942 485.524 902.94 484.983V480.553C902.942 480.012 903.423 479.574 904.018 479.572ZM909.836 473.181H912.278C912.872 473.182 913.353 473.621 913.355 474.162V484.983C913.353 485.524 912.872 485.962 912.278 485.964H909.836C909.241 485.962 908.76 485.524 908.758 484.983V474.162C908.76 473.621 909.241 473.182 909.836 473.181Z" fill="#20D3BD"/>
+<g clip-path="url(#clip3_67_611)">
+<path d="M285.519 844.717C285.451 844.109 285.384 843.365 285.114 842.554C284.911 841.743 284.573 840.864 284.1 839.918C283.627 838.972 283.018 838.026 282.275 837.08C282.005 836.742 281.667 836.336 281.261 835.998C281.802 833.836 280.585 832.011 280.585 832.011C278.558 831.876 277.206 832.619 276.733 833.025C276.665 833.025 276.598 832.957 276.463 832.889C276.125 832.754 275.787 832.619 275.381 832.484C274.976 832.349 274.638 832.281 274.232 832.146C273.827 832.078 273.421 832.011 273.084 831.943C273.016 831.943 272.948 831.943 272.881 831.943C272.002 829.105 269.434 827.888 269.434 827.888C266.595 829.713 266.055 832.214 266.055 832.214C266.055 832.214 266.055 832.281 266.055 832.349C265.92 832.416 265.717 832.416 265.582 832.484C265.379 832.552 265.176 832.619 264.906 832.687C264.703 832.754 264.5 832.822 264.23 832.957C263.824 833.16 263.351 833.363 262.946 833.565C262.54 833.768 262.135 834.038 261.729 834.309C261.662 834.309 261.662 834.241 261.662 834.241C257.674 832.754 254.16 834.579 254.16 834.579C253.822 838.769 255.714 841.473 256.12 841.946C256.052 842.216 255.917 842.486 255.849 842.757C255.579 843.703 255.309 844.717 255.174 845.731C255.174 845.866 255.106 846.001 255.106 846.136C251.456 847.961 250.375 851.678 250.375 851.678C253.416 855.192 256.998 855.395 256.998 855.395C257.471 856.206 257.945 856.949 258.553 857.693C258.823 857.963 259.094 858.301 259.296 858.572C258.215 861.748 259.431 864.384 259.431 864.384C262.811 864.519 265.041 862.897 265.514 862.491C265.852 862.627 266.19 862.694 266.528 862.829C267.542 863.1 268.623 863.235 269.704 863.302C269.975 863.302 270.245 863.302 270.515 863.302H270.65H270.718H270.853H270.988C272.61 865.6 275.381 865.938 275.381 865.938C277.409 863.843 277.476 861.748 277.476 861.275C277.476 861.207 277.476 861.207 277.476 861.207V861.14C277.882 860.869 278.287 860.532 278.693 860.194C279.504 859.45 280.18 858.639 280.788 857.761C280.856 857.693 280.923 857.625 280.923 857.49C283.221 857.625 284.776 856.071 284.776 856.071C284.37 853.705 283.018 852.557 282.748 852.354C282.748 852.354 282.748 852.354 282.68 852.354C282.68 852.219 282.68 852.083 282.68 851.948C282.68 851.678 282.68 851.408 282.68 851.205V850.867V850.799V850.732C282.68 850.664 282.68 850.664 282.68 850.664V850.529V850.326C282.68 850.259 282.68 850.191 282.68 850.123C282.68 850.056 282.68 849.988 282.68 849.921V849.718V849.515C282.613 849.245 282.613 848.975 282.545 848.772C282.275 847.758 281.937 846.812 281.396 845.933C280.856 845.055 280.247 844.311 279.504 843.635C278.761 842.96 277.95 842.486 277.071 842.081C276.192 841.675 275.314 841.473 274.368 841.338C273.894 841.27 273.489 841.27 273.016 841.27H272.881H272.813H272.746H272.678H272.543C272.475 841.27 272.408 841.27 272.34 841.27C272.137 841.27 271.867 841.338 271.664 841.338C270.786 841.473 269.907 841.811 269.164 842.284C268.42 842.757 267.744 843.297 267.204 843.906C266.663 844.514 266.257 845.257 265.987 846.001C265.717 846.744 265.582 847.488 265.514 848.231C265.514 848.434 265.514 848.569 265.514 848.772C265.514 848.839 265.514 848.839 265.514 848.907V849.042C265.514 849.11 265.514 849.245 265.514 849.313C265.582 849.65 265.649 850.056 265.717 850.394C265.92 851.07 266.257 851.678 266.595 852.219C267.001 852.759 267.474 853.165 267.947 853.503C268.42 853.841 268.961 854.111 269.502 854.246C270.042 854.381 270.515 854.449 271.056 854.449C271.123 854.449 271.191 854.449 271.259 854.449H271.326H271.394C271.461 854.449 271.529 854.449 271.529 854.449C271.529 854.449 271.529 854.449 271.597 854.449H271.664H271.732C271.799 854.449 271.867 854.449 271.935 854.449C272.002 854.449 272.07 854.449 272.137 854.381C272.272 854.381 272.34 854.314 272.475 854.314C272.678 854.246 272.881 854.179 273.084 854.043C273.286 853.976 273.421 853.841 273.624 853.705C273.692 853.705 273.692 853.638 273.759 853.57C273.962 853.435 273.962 853.165 273.827 853.03C273.692 852.895 273.489 852.827 273.354 852.962C273.286 852.962 273.286 853.03 273.219 853.03C273.084 853.097 272.948 853.165 272.746 853.232C272.61 853.3 272.408 853.3 272.272 853.367C272.205 853.367 272.07 853.367 272.002 853.367C271.935 853.367 271.935 853.367 271.867 853.367C271.799 853.367 271.799 853.367 271.732 853.367C271.664 853.367 271.664 853.367 271.597 853.367C271.529 853.367 271.461 853.367 271.461 853.367H271.394H271.326C271.259 853.367 271.259 853.367 271.191 853.367C270.786 853.3 270.448 853.232 270.042 853.03C269.637 852.895 269.299 852.624 268.961 852.354C268.623 852.083 268.353 851.678 268.15 851.34C267.947 851.002 267.744 850.529 267.677 850.056C267.609 849.853 267.609 849.583 267.609 849.38C267.609 849.313 267.609 849.245 267.609 849.177V849.11V849.042C267.609 848.907 267.609 848.772 267.677 848.637C267.879 847.623 268.353 846.677 269.164 845.866C269.366 845.663 269.569 845.528 269.772 845.325C269.975 845.19 270.245 845.055 270.448 844.92C270.718 844.784 270.988 844.717 271.191 844.649C271.461 844.582 271.732 844.514 272.002 844.514C272.137 844.514 272.272 844.514 272.408 844.514C272.475 844.514 272.475 844.514 272.475 844.514H272.61H272.678H272.813C273.084 844.514 273.421 844.582 273.692 844.649C274.3 844.784 274.841 844.987 275.381 845.325C276.463 845.933 277.341 846.88 277.95 847.961C278.22 848.501 278.423 849.11 278.558 849.718C278.558 849.853 278.625 850.056 278.625 850.191V850.326V850.461C278.625 850.529 278.625 850.529 278.625 850.597C278.625 850.664 278.625 850.664 278.625 850.732V850.867V851.002C278.625 851.07 278.625 851.205 278.625 851.272C278.625 851.475 278.625 851.61 278.558 851.813C278.558 851.948 278.49 852.151 278.49 852.286C278.49 852.421 278.423 852.624 278.355 852.759C278.287 853.097 278.152 853.435 278.017 853.705C277.747 854.314 277.409 854.922 277.003 855.53C276.192 856.612 275.111 857.558 273.827 858.098C273.219 858.369 272.543 858.572 271.867 858.707C271.529 858.774 271.191 858.774 270.853 858.842H270.786H270.718H270.583H270.448H270.38C270.448 858.842 270.38 858.842 270.38 858.842C270.177 858.842 270.042 858.842 269.839 858.842C269.096 858.774 268.353 858.639 267.677 858.436C267.001 858.234 266.257 857.963 265.649 857.625C264.365 856.949 263.216 856.003 262.27 854.854C261.797 854.314 261.391 853.705 261.121 853.03C260.783 852.354 260.513 851.678 260.31 851.002C260.107 850.326 259.972 849.583 259.972 848.907V848.772V848.704V848.569V848.164V848.096V847.961V847.893C259.972 847.826 259.972 847.69 259.972 847.623C259.972 847.285 260.04 846.88 260.04 846.542C260.107 846.204 260.175 845.798 260.242 845.46C260.31 845.122 260.378 844.717 260.513 844.379C260.716 843.703 260.986 843.027 261.256 842.351C261.864 841.067 262.608 839.918 263.554 839.04C263.757 838.837 264.027 838.567 264.298 838.364C264.568 838.161 264.838 837.958 265.109 837.823C265.379 837.62 265.649 837.485 265.92 837.35C266.055 837.282 266.19 837.215 266.325 837.147C266.393 837.147 266.46 837.08 266.528 837.08C266.595 837.08 266.663 837.012 266.731 837.012C267.001 836.877 267.339 836.809 267.609 836.674C267.677 836.674 267.744 836.607 267.812 836.607C267.879 836.607 267.947 836.539 268.015 836.539C268.15 836.471 268.353 836.471 268.488 836.404C268.555 836.404 268.623 836.336 268.758 836.336C268.826 836.336 268.893 836.336 269.028 836.269C269.096 836.269 269.164 836.269 269.299 836.201H269.434H269.569C269.637 836.201 269.704 836.201 269.839 836.134C269.907 836.134 270.042 836.134 270.11 836.066C270.177 836.066 270.313 836.066 270.38 836.066C270.448 836.066 270.515 836.066 270.583 836.066H270.718H270.786H270.853C270.921 836.066 271.056 836.066 271.123 836.066H271.259C271.259 836.066 271.326 836.066 271.259 836.066H271.326C271.394 836.066 271.461 836.066 271.529 836.066C271.867 836.066 272.137 836.066 272.475 836.066C273.084 836.066 273.692 836.134 274.3 836.269C275.449 836.471 276.53 836.877 277.544 837.35C278.558 837.823 279.436 838.431 280.18 839.107C280.247 839.175 280.247 839.175 280.315 839.242C280.383 839.31 280.383 839.31 280.45 839.378C280.518 839.445 280.653 839.513 280.72 839.648C280.788 839.783 280.923 839.783 280.991 839.918C281.058 840.053 281.194 840.121 281.261 840.189C281.599 840.527 281.869 840.864 282.14 841.27C282.68 841.946 283.154 842.689 283.491 843.365C283.491 843.433 283.559 843.433 283.559 843.5C283.559 843.568 283.627 843.568 283.627 843.635C283.694 843.703 283.694 843.771 283.762 843.906C283.829 843.973 283.829 844.041 283.897 844.176C283.965 844.244 283.965 844.311 284.032 844.446C284.167 844.784 284.303 845.055 284.37 845.325C284.505 845.798 284.64 846.204 284.708 846.542C284.776 846.677 284.911 846.812 285.046 846.744C285.181 846.744 285.316 846.609 285.316 846.474C285.587 845.663 285.587 845.19 285.519 844.717Z" fill="#20D3BD"/>
+</g>
+<path d="M476.876 895.707C476.46 895.647 476.082 895.703 475.891 895.851C475.784 895.935 475.751 896.032 475.742 896.099C475.718 896.276 475.838 896.472 475.912 896.573C476.121 896.859 476.427 897.055 476.73 897.098C476.774 897.105 476.817 897.108 476.861 897.108C477.365 897.108 477.824 896.703 477.864 896.404C477.915 896.03 477.388 895.78 476.876 895.707Z" fill="#20D3BD"/>
+<path d="M490.682 895.719H490.682C490.642 895.425 490.136 895.342 489.655 895.411C489.175 895.48 488.709 895.703 488.748 895.997C488.779 896.226 489.18 896.616 489.654 896.616C489.694 896.616 489.735 896.613 489.775 896.607C490.092 896.562 490.324 896.355 490.435 896.235C490.603 896.054 490.7 895.851 490.682 895.719Z" fill="#20D3BD"/>
+<path d="M498.604 908.284C498.427 907.734 497.86 907.557 496.917 907.758C494.117 908.353 493.114 907.941 492.785 907.691C494.961 904.275 496.751 900.147 497.717 896.294C498.175 894.469 498.428 892.775 498.448 891.394C498.471 889.877 498.22 888.763 497.703 888.083C495.619 885.339 492.561 883.867 488.858 883.827C486.313 883.798 484.163 884.469 483.746 884.657C482.868 884.432 481.911 884.294 480.869 884.277C478.958 884.245 477.306 884.716 475.939 885.677C475.345 885.449 473.81 884.906 471.932 884.595C468.687 884.056 466.108 884.464 464.267 885.808C462.071 887.411 461.057 890.276 461.254 894.324C461.32 895.686 462.073 899.876 463.262 903.889C464.826 909.17 466.527 912.16 468.316 912.774C468.526 912.846 468.767 912.897 469.034 912.897C469.687 912.897 470.487 912.594 471.32 911.562C472.703 909.848 473.994 908.411 474.47 907.889C475.174 908.278 475.946 908.495 476.737 908.517C476.738 908.539 476.74 908.56 476.742 908.581C476.584 908.775 476.454 908.945 476.343 909.09C475.795 909.806 475.681 909.955 473.918 910.329C473.417 910.436 472.085 910.719 472.065 911.68C472.044 912.731 473.64 913.173 473.821 913.22C474.455 913.383 475.065 913.464 475.647 913.464C477.063 913.463 478.308 912.984 479.304 912.057C479.273 915.803 479.425 919.495 479.862 920.62C480.219 921.541 481.093 923.792 483.852 923.791C484.257 923.791 484.703 923.743 485.193 923.635C488.073 922.998 489.324 921.687 489.808 918.796C490.066 917.251 490.511 913.561 490.72 911.581C491.161 911.723 491.728 911.788 492.342 911.788C493.622 911.788 495.099 911.508 496.026 911.065C497.066 910.567 498.944 909.345 498.604 908.284ZM491.745 894.909C491.736 895.493 491.658 896.024 491.575 896.578C491.486 897.173 491.394 897.789 491.37 898.536C491.348 899.264 491.436 900.02 491.521 900.751C491.693 902.228 491.87 903.749 491.186 905.249C491.079 905.055 490.977 904.842 490.882 904.607C490.797 904.395 490.613 904.053 490.357 903.581C489.362 901.743 487.032 897.437 488.225 895.68C488.58 895.157 489.482 894.62 491.745 894.909ZM489.002 885.01C492.319 885.086 494.943 886.364 496.801 888.81C498.226 890.687 496.657 899.224 492.114 906.589C492.069 906.53 492.024 906.471 491.976 906.41C491.958 906.386 491.938 906.361 491.919 906.336C493.093 904.338 492.863 902.362 492.659 900.61C492.575 899.891 492.496 899.212 492.516 898.574C492.537 897.898 492.624 897.318 492.707 896.757C492.811 896.066 492.916 895.351 492.887 894.508C492.908 894.42 492.917 894.316 492.906 894.192C492.832 893.383 491.936 890.964 490.11 888.775C489.112 887.577 487.656 886.237 485.667 885.333C486.523 885.151 487.692 884.98 489.002 885.01ZM470.438 910.807C469.521 911.944 468.887 911.726 468.679 911.654C467.321 911.188 465.746 908.232 464.358 903.544C463.156 899.488 462.454 895.409 462.398 894.265C462.223 890.648 463.074 888.127 464.928 886.772C467.945 884.568 472.906 885.887 474.899 886.557C474.87 886.586 474.841 886.613 474.812 886.643C471.541 890.046 471.619 895.861 471.627 896.217C471.627 896.354 471.638 896.548 471.653 896.815C471.709 897.793 471.814 899.613 471.534 901.675C471.274 903.59 471.847 905.465 473.106 906.819C473.237 906.959 473.373 907.091 473.513 907.214C472.953 907.833 471.735 909.2 470.438 910.807ZM473.934 906.002C472.919 904.911 472.458 903.394 472.669 901.838C472.965 899.661 472.856 897.764 472.797 896.745C472.789 896.603 472.782 896.478 472.777 896.379C473.255 895.943 475.47 894.72 477.049 895.093C477.769 895.263 478.208 895.768 478.391 896.638C479.336 901.141 478.516 903.017 477.857 904.525C477.722 904.836 477.593 905.129 477.484 905.433L477.399 905.668C477.184 906.262 476.984 906.814 476.86 907.338C475.781 907.335 474.732 906.86 473.934 906.002ZM474.099 912.074C473.784 911.993 473.501 911.852 473.335 911.735C473.474 911.668 473.721 911.577 474.149 911.486C476.223 911.046 476.543 910.735 477.243 909.82C477.403 909.611 477.585 909.373 477.837 909.083C477.837 909.083 477.837 909.083 477.837 909.083C478.212 908.65 478.384 908.723 478.695 908.856C478.947 908.964 479.192 909.289 479.292 909.648C479.339 909.817 479.392 910.138 479.219 910.388C477.757 912.495 475.628 912.468 474.099 912.074ZM484.953 922.48C482.416 923.04 481.518 921.706 480.926 920.182C480.544 919.197 480.356 914.758 480.489 909.857C480.491 909.791 480.482 909.728 480.464 909.669C480.449 909.555 480.426 909.439 480.393 909.323C480.195 908.61 479.712 908.013 479.133 907.766C478.903 907.667 478.481 907.487 477.973 907.621C478.081 907.161 478.269 906.643 478.473 906.081L478.558 905.844C478.654 905.578 478.775 905.302 478.902 905.01C479.592 903.432 480.536 901.271 479.511 896.389C479.127 894.56 477.846 893.667 475.903 893.874C474.738 893.999 473.673 894.483 473.141 894.76C473.027 894.82 472.922 894.878 472.825 894.934C472.973 893.091 473.533 889.648 475.63 887.47C476.95 886.098 478.708 885.421 480.85 885.457C485.07 885.529 487.776 887.76 489.304 889.619C490.62 891.222 491.332 892.836 491.617 893.706C489.478 893.482 488.023 893.917 487.286 895.004C485.681 897.366 488.163 901.952 489.356 904.156C489.575 904.56 489.764 904.909 489.823 905.057C490.212 906.027 490.714 906.675 491.082 907.148C491.194 907.293 491.303 907.433 491.386 907.556C490.739 907.748 489.575 908.193 489.681 910.415C489.596 911.53 488.987 916.751 488.678 918.595C488.271 921.032 487.4 921.94 484.953 922.48ZM495.543 909.994C494.881 910.311 493.772 910.548 492.719 910.599C491.556 910.655 490.964 910.465 490.825 910.348C490.759 908.963 491.26 908.818 491.789 908.665C491.872 908.641 491.953 908.618 492.032 908.59C492.08 908.63 492.134 908.671 492.192 908.711C493.127 909.346 494.794 909.415 497.148 908.914C497.157 908.912 497.166 908.911 497.174 908.909C496.857 909.215 496.314 909.625 495.543 909.994Z" fill="#20D3BD"/>
+<g clip-path="url(#clip4_67_611)">
+<path d="M84.011 488.441C81.6811 488.383 79.8755 488.616 78.361 489.257C77.9242 489.431 77.2251 489.431 77.1669 489.985C77.4 490.218 77.429 490.596 77.6329 490.917C77.9826 491.499 78.594 492.285 79.1474 492.693C79.7589 493.159 80.3706 493.625 81.0112 494.033C82.147 494.732 83.4285 495.139 84.5352 495.838C85.1761 496.246 85.8165 496.77 86.4572 497.207C86.7777 497.44 86.9814 497.819 87.3892 497.964V497.877C87.1853 497.615 87.127 497.236 86.9233 496.945C86.6323 496.654 86.3408 496.392 86.0496 496.1C85.205 494.965 84.1566 493.975 83.0207 493.159C82.0889 492.518 80.0501 491.645 79.6716 490.567C79.6716 490.567 79.6423 490.538 79.6133 490.509C80.254 490.451 81.0112 490.218 81.6229 490.043C82.6131 489.781 83.5159 489.839 84.5352 489.577C85.0011 489.46 85.4671 489.315 85.933 489.169V488.907C85.4091 488.383 85.0303 487.684 84.4769 487.189C82.9917 485.907 81.3607 484.655 79.6716 483.607C78.7686 483.024 77.6037 482.646 76.6427 482.151C76.2934 481.976 75.7107 481.888 75.507 481.597C74.9826 480.956 74.6914 480.112 74.3128 479.355C73.4686 477.753 72.6528 475.976 71.9247 474.287C71.4007 473.151 71.0802 472.016 70.4395 470.967C67.4398 466.016 64.178 463.017 59.1688 460.075C58.0912 459.464 56.8099 459.201 55.4411 458.881C54.7132 458.852 53.9849 458.794 53.2568 458.765C52.7909 458.561 52.3248 458.007 51.917 457.745C50.2574 456.697 45.976 454.425 44.7528 457.425C43.9665 459.318 45.9177 461.182 46.5875 462.143C47.0829 462.813 47.7234 463.57 48.0729 464.327C48.2768 464.822 48.3349 465.346 48.5388 465.871C49.0049 467.152 49.4416 468.579 50.0533 469.773C50.3737 470.385 50.7231 471.025 51.1309 471.579C51.3638 471.899 51.7714 472.045 51.8589 472.569C51.4513 473.151 51.4221 474.025 51.189 474.753C50.1406 478.044 50.5484 482.121 52.0336 484.539C52.4995 485.266 53.6063 486.869 55.0915 486.257C56.4021 485.733 56.1109 484.073 56.4894 482.616C56.5769 482.267 56.5186 482.034 56.6933 481.801C56.6935 481.83 56.6933 481.859 56.6933 481.859C57.1011 482.675 57.5087 483.461 57.8873 484.277C58.7902 485.703 60.3628 487.189 61.6733 488.179C62.3725 488.703 62.9257 489.606 63.7994 489.926V489.839H63.7412C63.5663 489.577 63.3043 489.46 63.0714 489.257C62.5472 488.732 61.9645 488.092 61.5569 487.509C60.3339 485.878 59.2561 484.073 58.2951 482.209C57.8292 481.306 57.4214 480.316 57.0428 479.413C56.868 479.063 56.868 478.539 56.5767 478.365C56.1399 479.005 55.4993 479.559 55.1789 480.345C54.6258 481.597 54.5674 483.141 54.3635 484.742C54.2471 484.772 54.3052 484.742 54.2469 484.801C53.3151 484.568 52.9946 483.607 52.6451 482.791C51.7714 480.723 51.6258 477.403 52.3831 475.015C52.587 474.404 53.4607 472.482 53.1112 471.899C52.9365 471.346 52.3539 471.025 52.0336 470.589C51.655 470.035 51.2472 469.336 50.9852 468.725C50.2862 467.094 49.9367 465.288 49.1796 463.657C48.8301 462.9 48.2185 462.114 47.7234 461.415C47.1702 460.628 46.5585 460.075 46.1216 459.143C45.9762 458.823 45.7721 458.299 46.0051 457.949C46.0633 457.716 46.1797 457.629 46.4129 457.571C46.7914 457.25 47.869 457.658 48.2476 457.833C49.3252 458.269 50.2279 458.677 51.1308 459.289C51.5385 459.58 51.9753 460.133 52.4995 460.279H53.1112C54.0432 460.483 55.0915 460.337 55.9652 460.599C57.5089 461.094 58.9066 461.822 60.159 462.609C63.9743 465.026 67.1194 468.463 69.2455 472.569C69.595 473.239 69.7405 473.85 70.0609 474.549C70.6726 475.976 71.4297 477.433 72.0413 478.83C72.6528 480.199 73.2352 481.597 74.1089 482.733C74.546 483.344 76.2932 483.665 77.0795 483.985C77.662 484.247 78.5649 484.48 79.0891 484.801C80.0792 485.412 81.0694 486.111 82.0014 486.781C82.4675 487.13 83.9235 487.859 84.011 488.441L84.011 488.441Z" fill="#20D3BD"/>
+<path d="M54.3052 463.133C53.8101 463.133 53.4607 463.191 53.1112 463.279C53.1112 463.278 53.1112 463.308 53.1112 463.337H53.1695C53.4026 463.803 53.8101 464.123 54.1013 464.531C54.3344 464.997 54.5381 465.463 54.7713 465.929C54.8003 465.9 54.8294 465.871 54.8294 465.871C55.2373 465.579 55.4411 465.113 55.4411 464.414C55.2662 464.211 55.2372 464.007 55.0915 463.803C54.9169 463.511 54.5381 463.366 54.3052 463.133Z" fill="#20D3BD"/>
+</g>
+<path d="M111.663 668.908H103.271C103.073 668.908 102.808 668.908 102.61 668.972C102.148 669.036 101.817 669.485 101.817 669.933C101.817 670.446 102.214 670.831 102.742 670.831C102.941 670.831 103.139 670.831 103.403 670.831H118.403C119.725 670.831 121.113 670.895 122.368 671.28C125.672 672.177 128.117 674.1 129.439 677.242C130.298 679.293 130.364 681.473 130.1 683.652C129.703 686.794 128.58 689.678 126.333 691.986C123.161 695.32 119.13 696.859 114.439 696.987C113.646 696.987 112.919 696.987 112.126 696.987C111.465 697.051 111.068 697.5 111.068 698.077C111.135 698.654 111.465 698.974 112.192 698.974C113.844 698.974 115.562 698.974 117.214 698.782C122.17 698.012 126.135 695.769 128.976 691.73C130.826 689.102 131.752 686.217 132.082 683.011C132.28 680.896 132.148 678.78 131.355 676.729C129.637 672.177 124.945 668.972 119.725 668.908H111.663ZM106.509 692.115H115.232C119.262 692.115 122.699 689.871 124.152 686.217C124.879 684.293 125.144 682.37 124.483 680.383C123.558 677.626 120.914 675.831 117.941 675.831H99.967C99.7688 675.831 99.6366 675.831 99.4384 675.831C98.9097 675.895 98.6454 676.344 98.7115 676.857C98.7776 677.37 99.0419 677.626 99.5045 677.69C100.099 677.754 100.694 677.819 101.289 677.819H118.007C119.593 677.819 120.848 678.46 121.84 679.678C122.699 680.768 122.897 681.986 122.765 683.396C122.566 685.127 121.906 686.665 120.716 687.883C119.328 689.358 117.478 690.127 115.43 690.127H97.7203C97.3899 690.127 97.0595 690.127 96.7291 690.191C96.2665 690.384 96.0022 690.704 96.0683 691.217C96.1344 691.73 96.4648 691.986 96.9934 692.05C97.1917 692.05 97.3899 692.05 97.5881 692.05L106.509 692.115ZM93.1608 677.69C93.8877 677.69 94.6806 677.69 95.4075 677.69C95.9361 677.69 96.2665 677.37 96.3326 676.857C96.3987 676.344 96.0683 675.959 95.5397 675.831C95.2753 675.767 94.9449 675.703 94.6806 675.767H91.9053C91.5749 675.767 91.2444 675.767 90.848 675.831C90.2532 675.959 89.9228 676.408 89.9889 676.857C90.055 677.306 90.5176 677.754 91.0462 677.754L93.1608 677.69ZM105.716 699.038H107.632C108.293 699.038 108.69 698.654 108.69 698.141V698.077C108.69 697.564 108.293 697.115 107.764 697.115C106.377 696.987 104.989 696.987 103.601 697.115C103.073 697.179 102.61 697.628 102.676 698.205C102.742 698.718 103.139 699.038 103.8 699.038H105.716Z" fill="#20D3BD"/>
+<g clip-path="url(#clip5_67_611)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M486.117 84.7115L485.028 84.3278C485.028 84.3278 485.161 78.603 483.167 78.1922C481.838 76.6035 483.38 10.8089 488.164 77.973C488.164 77.973 486.516 78.8221 486.224 80.2739C485.905 81.6984 486.117 84.7115 486.117 84.7115Z" fill="#20D3BD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M486.117 84.7115L485.028 84.3278C485.028 84.3278 485.161 78.603 483.167 78.1922C481.838 76.6035 483.38 10.8089 488.164 77.973C488.164 77.973 486.516 78.8221 486.224 80.2739C485.905 81.6984 486.117 84.7115 486.117 84.7115Z" fill="#20D3BD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M486.702 79.1784C486.702 79.1784 496.244 72.7139 494.011 59.2645C491.858 49.4858 486.782 46.281 486.224 45.0483C485.612 44.1718 485.028 42.638 485.028 42.638L485.426 69.8377C485.426 69.8651 484.602 78.1648 486.702 79.1784Z" fill="#20D3BD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M486.702 79.1784C486.702 79.1784 496.244 72.7139 494.011 59.2645C491.858 49.4858 486.782 46.281 486.224 45.0483C485.612 44.1718 485.028 42.638 485.028 42.638L485.426 69.8377C485.426 69.8651 484.602 78.1648 486.702 79.1784Z" fill="#20D3BD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M484.47 79.5343C484.47 79.5343 475.513 73.2341 476.044 62.1407C476.549 51.0471 482.875 45.5962 484.097 44.6101C484.895 43.7336 484.921 43.4048 484.975 42.5283C485.533 43.761 485.426 60.9629 485.506 62.9898C485.745 70.7964 485.081 78.0553 484.47 79.5343Z" fill="#20D3BD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M484.47 79.5343C484.47 79.5343 475.513 73.2341 476.044 62.1407C476.549 51.0471 482.875 45.5962 484.097 44.6101C484.895 43.7336 484.921 43.4048 484.975 42.5283C485.533 43.761 485.426 60.9629 485.506 62.9898C485.745 70.7964 485.081 78.0553 484.47 79.5343Z" fill="#20D3BD"/>
+</g>
+<g clip-path="url(#clip6_67_611)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M285.896 101.916C285.896 101.916 289.717 98.7939 292.264 99.4444C295.146 100.16 298.698 105.95 298.095 106.535L296.687 111.739C297.893 114.016 299.77 116.879 299.636 119.09C299.368 120.066 303.858 117.334 303.925 119.416C303.121 124.49 300.373 130.93 293.47 126.962L291.057 128.653C289.046 127.937 288.242 126.181 285.963 125.921L284.288 129.043L287.103 133.792C287.84 134.638 290.253 134.378 293.336 134.313L295.548 134.182C293.671 134.963 291.593 135.484 289.717 136.264C286.433 137.24 285.226 137.045 284.221 136.589C283.148 136.199 281.473 135.679 280.669 135.288C274.435 131.906 273.966 128.588 273.296 125.596C272.559 119.22 274.301 117.009 276.379 115.643C274.905 115.968 267.867 117.399 267.733 115.773C266.259 112.39 263.846 110.113 261.835 107.381C261.366 105.364 262.237 103.348 263.846 101.331L267.465 101.526C269.074 99.8347 270.079 97.1676 272.425 96.5821C272.626 96.0617 285.561 100.941 285.896 101.916Z" fill="#20D3BD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M297.29 112.975C298.43 114.667 299.301 116.488 299.569 118.44L298.966 119.741C298.43 119.546 297.692 119.35 297.29 119.09C297.558 118.765 297.692 118.44 297.692 118.18C297.692 118.049 297.625 117.984 297.424 117.854C297.893 117.919 298.363 117.919 298.832 117.919C298.966 117.854 299.167 117.789 298.966 116.748C298.765 116.293 298.564 115.903 298.296 115.447L296.955 114.992C297.156 114.927 297.424 114.927 297.424 114.602L297.29 112.975ZM303.054 119.22C303.456 118.96 303.255 118.895 303.054 119.025C301.647 119.741 300.574 119.806 299.837 119.546C300.306 120.066 301.178 120.847 303.054 119.22Z" fill="#20D3BD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M303.188 118.83C305.869 119.676 300.641 132.686 293.336 127.287L291.392 128.588C289.516 127.807 289.784 127.612 289.851 127.352L291.057 124.425C294.006 126.701 297.625 130.279 301.312 124.62C302.451 123.124 302.987 121.757 303.255 120.001C303.255 119.611 303.389 119.22 303.188 118.83ZM290.588 123.709L289.918 124.685C289.985 124.425 291.459 123.904 291.928 123.904L290.588 123.709ZM294.341 117.334C294.408 117.659 294.542 117.984 294.408 118.375L295.146 118.83C293.671 118.96 292.062 118.895 290.99 120.066L291.526 118.96C291.392 118.635 291.325 117.984 291.392 118.049C291.459 118.049 290.99 117.984 290.923 117.984L294.341 117.334ZM291.459 114.602C291.258 114.667 291.191 114.602 290.655 116.488C291.325 115.382 292.398 114.797 293.47 114.472C292.8 114.472 292.197 114.276 291.459 114.602Z" fill="#20D3BD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M287.639 136.394C285.762 136.98 282.478 136.134 281.339 135.223C280.266 134.443 280.669 133.727 279.127 132.881C275.91 131.19 275.91 128.068 275.374 126.181C274.771 122.798 275.374 118.31 276.714 115.773C274.704 116.488 273.095 119.416 273.363 124.49C273.43 128.003 274.637 131.645 280.87 135.484C283.349 136.264 286.298 137.825 287.639 136.394ZM289.583 112.91C286.433 107.251 286.902 106.015 281.875 105.885L274.502 104.193C277.25 105.169 279.395 106.275 282.813 107.121C282.88 107.446 282.947 107.771 282.746 107.901C282.009 108.227 281.339 108.357 280.602 108.552C284.221 108.682 287.371 109.853 289.583 112.91ZM289.918 104.388C284.489 100.42 278.39 98.0133 271.956 96.5821L270.012 98.9891C276.111 100.55 281.272 102.242 286.567 104.584C288.711 106.34 290.32 109.137 291.995 111.414C291.459 108.877 290.856 106.665 289.918 104.388ZM294.944 105.559L292.733 101.526C291.325 100.29 290.856 100.55 290.186 100.355C292.331 101.331 292.867 103.413 293.872 104.584C294.341 105.364 295.28 107.381 295.28 107.381L294.944 105.559ZM298.497 106.08C295.95 101.201 294.006 99.9649 292.196 99.5095C292.398 99.7046 292.532 99.9649 292.733 100.16L296.62 105.234C297.089 106.34 296.687 109.137 296.486 110.894L298.497 106.08Z" fill="#20D3BD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M288.778 111.089C288.108 109.658 287.706 107.511 286.366 106.405C284.757 105.885 282.344 106.015 280.132 105.95C282.009 106.405 284.824 106.405 286.164 107.251C286.164 107.316 286.164 107.381 286.03 107.381C285.695 107.316 285.36 107.251 285.025 107.316C284.489 107.446 284.02 107.771 283.551 108.031C284.891 107.771 285.293 108.096 286.299 108.161C287.371 108.552 288.041 110.503 288.778 111.089ZM292.733 101.591C292.8 102.046 292.867 102.502 293.269 103.022C294.006 103.803 294.274 104.388 294.408 104.649L295.347 107.381L294.81 104.518C294.676 104.063 293.068 101.591 292.733 101.591ZM298.363 115.382L297.558 115.187H298.229L298.363 115.382ZM293.537 114.537C292.197 114.732 291.861 114.797 290.99 115.708C291.124 115.382 291.124 114.992 291.392 114.602C292.13 114.406 292.8 114.406 293.537 114.537ZM302.116 119.676C300.507 120.196 300.44 119.741 299.837 119.546C300.239 120.001 300.708 120.326 301.58 120.131C302.719 119.806 302.786 119.481 303.188 119.22L302.116 119.676ZM298.966 119.676L298.698 120.326L298.363 120.196V119.936C297.759 119.676 296.553 119.611 296.553 119.676C296.151 120.066 295.816 120.586 295.481 121.042C295.95 120.717 296.285 120.131 296.955 120.001L297.96 120.196C297.759 120.261 297.357 120.261 297.357 120.326C296.888 120.912 296.553 121.627 296.084 122.213C296.62 121.627 296.821 121.042 297.826 120.521C297.893 120.456 298.497 120.456 298.765 120.652C298.698 120.977 298.497 121.367 298.296 121.692C298.028 122.213 297.625 122.733 297.29 123.254C298.363 121.953 298.095 122.473 298.765 121.627L299.636 119.416L298.966 119.676ZM291.928 123.904C290.655 123.904 290.655 123.904 289.784 124.75C289.784 124.425 289.851 124.099 290.387 123.709C290.387 123.709 291.794 123.839 291.928 123.904ZM290.923 117.854C292.197 117.074 293.068 116.813 294.609 117.204L294.006 117.399C294.073 117.399 294.408 118.44 294.14 118.505L295.146 118.765C293.872 118.83 292.666 118.765 291.526 119.285L292.062 118.83C292.062 118.96 291.861 118.114 291.928 117.789C291.861 117.724 290.923 117.854 290.923 117.854Z" fill="#020D10"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M299.703 119.351L298.966 119.676H298.698L297.29 119.155H297.558C297.625 118.895 297.692 118.505 297.893 118.44C298.095 118.18 297.625 118.18 297.491 118.049L297.961 118.18C298.564 118.18 299.234 118.115 299.301 118.765L299.502 118.635L299.703 119.351Z" fill="#020D10"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M292.867 118.18C292.934 118.375 292.934 118.505 292.867 118.635C292.599 118.635 292.331 118.7 292.129 118.83C291.995 118.96 291.928 118.245 291.995 118.115C292.196 117.984 292.8 117.984 292.867 118.18ZM298.296 119.285C298.229 119.351 297.625 119.285 297.625 119.155C297.558 119.025 297.692 118.635 297.826 118.57C297.826 118.57 298.363 118.505 298.43 118.765C298.43 118.83 298.363 119.22 298.296 119.285Z" fill="#20D3BD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M280.534 135.288C282.612 135.223 284.824 135.419 286.835 134.508L286.097 133.337C281.406 134.052 278.189 132.686 276.245 131.776H275.91L280.534 135.288ZM273.162 124.425C275.709 126.181 276.379 128.263 284.154 129.824L284.958 131.645C281.205 131.776 276.714 129.954 274.1 128.393L273.162 124.425ZM275.575 116.228C274.704 117.269 273.966 118.31 273.43 120.066C273.966 122.278 278.457 127.222 284.556 127.872C284.69 127.872 284.891 126.962 284.891 126.962C282.813 125.986 281.138 124.815 279.462 123.644C276.714 121.627 276.044 119.285 275.575 116.228ZM278.524 114.472C280.467 113.821 282.277 113.496 284.087 113.105C283.685 114.602 283.483 115.577 283.886 118.505C284.154 119.416 285.896 120.131 287.237 120.456C286.634 121.497 285.494 123.189 287.907 125.01C288.242 125.531 288.51 126.051 288.778 126.571C287.706 126.636 286.701 126.767 285.226 126.311C284.154 125.791 283.953 125.4 283.215 124.555C281.272 121.367 279.328 117.919 278.524 114.472Z" fill="#020D10"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M271.889 96.2568C275.441 96.517 279.261 97.8832 279.864 98.4036C281.138 98.989 282.344 99.5745 283.349 100.095C283.484 100.16 284.288 100.811 286.03 101.591C286.835 101.201 287.505 100.355 288.309 99.8998C288.845 99.5095 289.516 99.3794 290.253 99.2493C290.856 99.1192 292.733 99.3143 293.202 99.5095C294.877 100.225 295.749 101.396 296.821 102.892C297.29 103.608 297.625 104.258 297.96 104.844C298.229 105.429 298.631 106.015 298.631 106.47C298.631 106.73 298.43 106.925 298.296 107.251C297.826 108.552 297.357 109.593 297.156 111.089C297.156 111.284 297.022 111.544 297.022 111.935C297.022 112 297.022 112.13 297.022 112.13L296.955 112.52C296.888 112.78 296.955 112.975 296.955 113.366C296.955 113.366 296.285 111.935 296.486 110.829C296.486 110.568 297.223 108.487 297.357 108.161C297.491 107.641 297.625 107.186 297.759 106.665C297.893 106.015 297.759 105.624 297.491 105.039C296.285 102.762 294.207 100.55 293.403 99.9648C293.336 99.8998 292.666 99.7697 292.465 99.6396C292.264 99.6396 292.733 100.16 292.733 100.16C292.465 100.42 291.191 99.1192 289.046 100.03C288.577 100.225 288.242 100.485 287.907 100.745C287.572 101.006 287.103 101.461 286.835 101.786C286.835 101.851 287.036 102.047 287.438 102.242C288.443 102.827 290.186 104.063 290.588 104.584C290.722 104.714 291.258 107.511 291.794 109.332C291.928 109.918 293.202 110.503 293.202 110.503C292.934 110.503 292.264 110.308 291.928 110.243C291.861 110.438 292.129 111.739 292.129 111.739C292.129 111.739 291.861 111.154 291.526 109.658C291.057 108.227 290.588 106.665 289.918 105.299C289.247 104.388 286.969 102.697 286.164 102.437C285.293 101.981 284.355 101.526 283.349 101.006C280.87 99.7046 277.787 97.8181 272.827 97.0375C272.291 97.1025 272.023 97.2326 271.419 97.4928C270.012 98.7288 269.677 100.16 267.532 101.331C267.599 101.461 267.733 101.591 267.934 101.591C269.342 101.851 271.553 103.217 273.497 104.258C273.497 104.258 270.883 103.087 268.873 102.372C268.068 102.112 267.331 101.981 266.929 101.916C266.192 101.851 265.186 101.851 264.114 101.786C263.109 102.762 262.505 103.738 262.17 104.974C262.036 106.275 262.304 106.73 262.371 107.186C262.706 108.682 263.98 110.048 265.521 111.479C265.924 111.869 266.393 112.26 266.728 112.715C267.331 113.626 267.532 115.252 268.202 116.163C268.336 116.293 270.012 116.163 271.017 116.293C271.486 116.358 271.889 116.358 272.358 116.293C273.765 115.968 274.704 115.643 275.776 115.317C276.245 115.057 277.988 114.472 278.457 114.341L278.591 114.992C277.586 115.187 276.647 115.577 275.776 116.163C275.575 116.228 275.374 116.553 275.24 116.813C272.291 120.456 273.363 125.205 274.167 128.003C274.704 129.173 275.374 130.735 276.044 131.58C277.25 132.751 278.658 133.987 280.199 134.898L280.4 135.028C281.674 135.809 283.081 136.394 284.489 136.589C285.226 136.72 288.644 137.175 287.103 135.223C287.103 135.158 286.701 134.833 286.567 134.378L285.829 133.402C285.025 132.231 283.685 130.279 284.02 129.759C284.02 129.108 284.154 128.328 284.355 127.872C284.623 127.222 284.891 126.636 285.092 126.246L287.371 124.685C287.773 125.335 288.309 125.856 288.711 126.636C289.516 128.653 291.392 128.783 293.001 127.222L293.47 126.832C294.676 127.417 295.883 128.393 298.162 128.003C300.038 127.742 301.312 125.791 302.518 123.579C303.054 122.343 303.456 120.977 303.523 119.806C303.523 119.741 303.456 118.635 302.92 118.7C302.049 118.765 302.116 119.22 301.111 119.416C300.507 119.351 299.703 119.481 299.703 119.416C299.301 118.83 299.77 117.789 299.234 116.944C299.1 116.813 297.625 114.081 297.357 112.91C297.29 112.585 297.089 112.585 297.089 112.585L297.156 112.065C297.156 112.065 297.692 112.52 297.893 112.715C298.363 113.171 298.698 114.276 298.765 114.472C299.167 115.187 299.703 116.163 300.172 117.074C300.239 117.139 300.373 117.724 300.239 118.895C300.239 118.895 299.971 118.895 299.77 118.895C301.178 119.025 301.714 118.375 303.121 117.984C303.523 117.919 303.992 118.505 304.328 119.09C304.596 119.351 303.657 124.425 300.842 127.547C298.631 129.369 295.414 128.913 293.403 127.547C292.733 128.458 292.129 129.499 289.382 128.718C288.577 128.198 288.443 127.482 288.108 126.767C287.572 126.897 287.17 126.832 286.298 126.701C286.03 126.701 285.896 126.701 285.695 127.157L286.433 128.198C286.701 128.523 286.969 129.108 288.644 129.759C288.845 129.824 289.382 129.824 289.382 129.824L289.18 129.889C288.376 130.149 287.237 129.629 287.237 129.694C286.366 129.434 285.695 128.913 285.159 128.263C285.226 128.848 285.226 129.434 285.427 129.954C285.561 130.344 285.628 130.475 285.762 130.8C285.829 130.865 286.097 130.93 286.5 131.06C286.634 131.125 287.103 131.255 287.371 131.32C288.175 131.385 289.046 131.32 289.046 131.32C288.51 131.841 287.036 131.776 286.298 131.711C286.567 132.231 286.835 132.751 287.036 133.272C287.17 133.532 287.103 133.532 288.711 133.727C287.974 133.792 287.505 133.987 287.304 133.987C287.17 133.987 287.371 134.378 287.438 134.443C287.773 134.768 288.242 134.768 288.644 134.833C290.588 135.028 294.743 134.703 294.743 134.703C294.743 134.703 290.052 136.329 287.706 136.98C286.835 137.175 285.896 137.24 285.092 137.175C280.4 136.134 277.049 133.532 275.575 131.45C275.039 130.735 274.57 129.694 274.301 129.043C273.765 127.612 273.43 126.376 273.229 124.815C272.894 121.367 273.43 119.22 275.173 116.813C275.374 116.553 275.843 116.293 275.91 116.098C275.374 116.033 274.771 116.293 274.1 116.423C273.43 116.618 272.626 116.748 271.956 116.879C271.486 116.944 270.95 116.944 270.615 116.944C269.744 116.879 268.806 116.879 268.068 116.748C267.733 116.683 267.8 116.683 267.666 116.423C267.331 115.708 266.996 114.667 266.594 113.886C266.058 112.715 265.253 111.935 263.913 110.633C262.438 109.072 260.83 107.121 261.433 104.714C261.701 103.738 262.438 102.242 263.042 101.461C263.578 100.941 264.114 100.745 264.717 101.006C265.32 101.071 265.588 101.006 265.924 101.006C266.661 100.941 267.264 100.68 267.465 100.485C268.47 99.7697 269.208 98.7288 270.213 97.753C270.749 97.1676 271.352 96.6472 271.889 96.2568ZM293.001 127.157L292.599 126.636C292.398 126.767 292.264 126.897 291.995 127.352C291.861 127.547 291.727 127.677 291.593 127.677C291.057 127.742 290.521 127.612 289.918 127.222C289.985 127.482 290.521 127.742 290.856 128.003C290.521 128.003 289.985 128.003 289.851 127.807C289.315 127.092 289.382 126.897 289.516 126.701C290.052 125.986 290.722 125.335 290.923 124.36C291.526 125.205 292.398 125.986 293.403 126.767L293.001 127.157Z" fill="#020D10" stroke="#020D10" stroke-width="0.008" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<g clip-path="url(#clip7_67_611)">
+<path d="M692.909 82.2546L695.433 83.563V106.568L692.909 107.931V82.2546Z" fill="#20D3BD"/>
+<path d="M666.405 82.2546L663.881 83.563V106.568L666.405 107.931V82.2546Z" fill="#20D3BD"/>
+<path d="M683.022 113.11L688.071 110.493V79.7469L683.022 77.1302L681.445 94.2479L683.022 113.11Z" fill="#20D3BD"/>
+<path d="M676.291 113.11L671.243 110.493V79.7469L676.291 77.1302L677.869 94.1933L676.291 113.11Z" fill="#20D3BD"/>
+<path d="M683.075 77.1302H676.291V113.055H683.075V77.1302Z" fill="#20D3BD"/>
+</g>
+<path d="M675.441 859.199L684.131 863.167L692.903 855.485C693.029 854.851 693.092 854.206 693.089 853.56C693.089 851.468 692.419 849.43 691.177 847.746C689.935 846.062 688.187 844.819 686.189 844.2C684.19 843.581 682.045 843.618 680.069 844.305C678.093 844.993 676.388 846.294 675.205 848.02L673.744 855.577L675.441 859.199Z" fill="#20D3BD"/>
+<path d="M666.445 868.402C666.317 869.046 666.253 869.701 666.254 870.357C666.254 872.458 666.927 874.504 668.176 876.194C669.424 877.884 671.181 879.13 673.189 879.748C675.197 880.366 677.351 880.325 679.333 879.629C681.316 878.933 683.023 877.62 684.205 875.883L685.652 868.342L683.72 864.649L674.997 860.674L666.445 868.402Z" fill="#20D3BD"/>
+<path d="M666.392 853.364L672.348 854.77L673.652 847.997C672.842 847.383 671.855 847.048 670.838 847.041C669.822 847.035 668.83 847.358 668.013 847.963C667.196 848.567 666.596 849.42 666.304 850.394C666.012 851.367 666.043 852.409 666.392 853.364Z" fill="#20D3BD"/>
+<path d="M665.875 854.781C664.569 855.222 663.432 856.059 662.623 857.176C661.814 858.293 661.374 859.634 661.363 861.013C661.362 862.346 661.766 863.648 662.523 864.745C663.28 865.842 664.352 866.683 665.598 867.156L673.954 859.603L672.419 856.325L665.875 854.781Z" fill="#20D3BD"/>
+<path d="M685.733 875.883C686.542 876.494 687.527 876.827 688.54 876.833C689.554 876.838 690.542 876.515 691.357 875.913C692.172 875.311 692.77 874.46 693.063 873.49C693.355 872.519 693.326 871.48 692.979 870.528L687.028 869.143L685.733 875.883Z" fill="#20D3BD"/>
+<path d="M686.943 867.576L693.493 869.106C694.801 868.666 695.938 867.83 696.747 866.712C697.556 865.595 697.996 864.253 698.006 862.874C698.005 861.544 697.599 860.246 696.843 859.152C696.087 858.057 695.016 857.219 693.773 856.748L685.204 864.249L686.943 867.576Z" fill="#20D3BD"/>
+<g clip-path="url(#clip8_67_611)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M815.008 736.51L836.1 747.198V736.916L815.008 730.515V736.51Z" fill="#20D3BD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M857.191 736.51L836.1 747.198V736.916L857.191 730.541V736.51Z" fill="#20D3BD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M820.761 721.451H817.729V728.01L820.761 727.763V721.451Z" fill="#20D3BD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M826.081 714.269L822.802 713.89V729.075L826.081 728.701V714.269Z" fill="#20D3BD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M833.126 729.951V717.201L829.788 716.948V730.515L833.126 729.951Z" fill="#20D3BD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M836.1 731.759L839.438 731.079V707.077L836.1 706.022V731.759ZM847.357 729.534L842.411 730.541V712.45L847.357 713.452V729.534ZM852.984 728.353L849.398 729.107V706.265L852.984 707.704V728.353ZM857.202 727.536L854.476 728.063V705.015L857.191 706.386L857.202 727.536Z" fill="#20D3BD"/>
+</g>
+<g clip-path="url(#clip9_67_611)">
+<path d="M846.855 292.891C839.707 292.891 833.907 287.105 833.907 279.955C833.907 272.806 839.707 267 846.855 267H861.904C869.053 267 874.849 272.806 874.849 279.955C874.849 287.105 869.053 292.891 861.904 292.891H846.855ZM861.569 288.324C866.2 288.324 869.95 284.584 869.95 279.955C869.95 275.327 866.2 271.566 861.569 271.566H847.187C842.559 271.566 838.806 275.327 838.806 279.955C838.806 284.584 842.559 288.324 847.187 288.324H861.569Z" fill="#20D3BD"/>
+</g>
+<g clip-path="url(#clip10_67_611)">
+<path d="M122.049 259.536C120.327 256.954 119.955 253.503 119.874 252.085C115.5 253.031 111.156 254.727 111.407 255.977C111.438 256.134 111.636 256.322 111.965 256.506L111.451 257.426C110.823 257.074 110.469 256.668 110.373 256.183C110.09 254.769 111.691 253.491 115.267 252.273C117.709 251.441 120.172 250.945 120.276 250.924L120.906 250.798V251.442C120.906 251.486 120.933 255.963 122.926 258.952L122.049 259.536Z" fill="#20D3BD"/>
+<path d="M123.806 292.981H123.541C114.905 292.981 105.293 290.268 104.157 285.729C103.465 282.956 105.73 279.892 110.709 276.872L111.257 277.772C106.777 280.491 104.619 283.225 105.181 285.474C106.167 289.414 115.276 291.871 123.265 291.926C124.215 290.506 129.319 282.163 126.406 270.974L127.425 270.708C130.745 283.457 124.033 292.676 123.965 292.768L123.806 292.981Z" fill="#20D3BD"/>
+<path d="M108.182 289.087C107.613 289.087 107.332 289.024 107.285 289.013C107.1 288.968 106.954 288.825 106.904 288.642C106.852 288.458 106.905 288.261 107.04 288.127C107.116 288.051 114.628 280.528 115.642 274.445L116.681 274.618C115.809 279.851 110.656 285.817 108.61 288.014C110.654 287.897 115.816 286.94 125.725 281.394C117.992 280.546 116.769 274.355 116.756 274.289L117.793 274.098C117.842 274.357 119.085 280.435 127.538 280.435C127.542 280.435 127.544 280.435 127.547 280.435C127.786 280.435 127.994 280.595 128.055 280.825C128.118 281.055 128.017 281.299 127.811 281.419C115.966 288.281 110.223 289.086 108.182 289.087Z" fill="#20D3BD"/>
+<path d="M113.024 291.611C112.806 291.611 112.607 291.476 112.53 291.268C112.447 291.046 112.523 290.794 112.717 290.654C112.753 290.628 114.629 289.244 116.624 286.197C115.857 285.857 115.08 285.461 114.309 284.998C113.373 284.436 112.665 283.833 112.137 283.215C109.428 283.93 106.927 284.213 104.731 284.026L104.819 282.976C106.797 283.144 109.046 282.91 111.484 282.301C109.825 279.467 111.348 276.654 111.369 276.617L112.29 277.13C112.219 277.259 110.956 279.629 112.553 282.014C114.873 281.348 117.349 280.362 119.91 279.081C120.5 277.147 120.961 274.947 121.202 272.465C121.219 272.295 121.316 272.144 121.463 272.059C121.611 271.973 121.791 271.966 121.946 272.037C121.98 272.053 125.388 273.609 127.855 274.624C128.034 274.698 128.158 274.864 128.178 275.057C128.199 275.25 128.112 275.438 127.951 275.547C125.537 277.192 123.14 278.619 120.805 279.809C120.064 282.155 119.148 284.107 118.212 285.703C122.115 287.162 125.502 287.184 125.546 287.184C125.786 287.184 125.996 287.346 126.056 287.579C126.116 287.812 126.012 288.056 125.802 288.173C121.015 290.832 113.396 291.58 113.074 291.611C113.058 291.61 113.041 291.611 113.024 291.611ZM117.647 286.621C116.55 288.322 115.473 289.544 114.668 290.342C116.774 290.032 120.467 289.353 123.532 288.087C122.064 287.907 119.94 287.506 117.647 286.621ZM113.28 282.893C113.694 283.306 114.211 283.71 114.851 284.095C115.627 284.561 116.414 284.956 117.191 285.291C117.986 283.959 118.774 282.359 119.45 280.475C117.319 281.489 115.251 282.299 113.28 282.893ZM122.173 273.297C121.957 275.161 121.624 276.861 121.21 278.41C122.961 277.477 124.747 276.411 126.547 275.22C124.914 274.528 123.119 273.724 122.173 273.297Z" fill="#20D3BD"/>
+<path d="M116.609 258.822C116.485 258.822 116.363 258.778 116.266 258.696C114.568 257.243 112.571 254.287 112.486 254.161C112.35 253.96 112.371 253.691 112.535 253.512C112.697 253.332 112.965 253.289 113.176 253.404C113.187 253.407 114.165 253.81 120.785 254.913C120.975 254.945 121.133 255.077 121.196 255.259C121.26 255.44 121.219 255.643 121.09 255.786C119.237 257.845 116.895 258.752 116.796 258.789C116.735 258.811 116.671 258.822 116.609 258.822ZM114.208 254.759C114.873 255.654 115.832 256.863 116.709 257.678C117.247 257.433 118.456 256.816 119.602 255.783C116.878 255.318 115.217 254.987 114.208 254.759Z" fill="#20D3BD"/>
+<path d="M120.74 273.371C120.669 273.371 120.596 273.357 120.528 273.327C120.319 273.234 120.192 273.017 120.216 272.789C120.524 269.891 116.077 268.728 116.032 268.718C115.848 268.671 115.703 268.529 115.653 268.347C115.604 268.164 115.655 267.968 115.789 267.834C116.008 267.616 121.207 262.459 127.731 259.628C127.914 259.548 128.12 259.578 128.274 259.701C128.427 259.826 128.498 260.025 128.458 260.217C127.207 266.273 121.383 272.915 121.137 273.194C121.032 273.309 120.887 273.371 120.74 273.371ZM117.168 267.979C118.417 268.448 120.603 269.534 121.157 271.517C122.684 269.611 125.945 265.22 127.163 261.043C122.538 263.268 118.643 266.623 117.168 267.979Z" fill="#20D3BD"/>
+<path d="M111.5 277.546L111 276.619C112.985 275.548 115.259 273.579 117.122 271.29C115.536 272.376 114.628 273.119 114.6 273.144L113.926 272.332C113.967 272.298 115.786 270.806 118.809 268.937C119.638 267.602 120.276 266.23 120.604 264.914C120.66 264.69 120.709 264.474 120.748 264.265C118.718 263.541 116.846 263.112 115.559 262.928C115.364 262.9 115.202 262.766 115.137 262.582C115.071 262.397 115.115 262.191 115.246 262.047C115.336 261.95 117.477 259.656 120.153 258.396C120.361 258.298 120.609 258.347 120.766 258.516C120.836 258.593 122.284 260.219 121.916 263.582C123.133 264.057 124.388 264.633 125.596 265.32C128.505 264.012 131.808 262.836 135.326 262.125C135.508 262.089 135.709 262.155 135.833 262.302C135.957 262.45 135.991 262.653 135.921 262.833C134.55 266.346 130.875 270.098 130.719 270.256C130.613 270.364 130.467 270.417 130.315 270.412C130.165 270.404 130.025 270.332 129.93 270.214C128.75 268.729 127.206 267.5 125.541 266.5C123.248 267.558 121.218 268.69 119.549 269.714C117.419 273.038 114.205 276.09 111.5 277.546ZM126.696 265.987C128.056 266.864 129.322 267.895 130.369 269.095C131.242 268.148 133.337 265.755 134.525 263.379C131.731 264.022 129.087 264.953 126.696 265.987ZM121.748 264.644C121.713 264.816 121.673 264.992 121.629 265.171C121.408 266.056 121.055 266.964 120.604 267.871C121.76 267.211 123.039 266.53 124.419 265.87C123.535 265.402 122.634 264.995 121.748 264.644ZM116.739 262.061C117.911 262.291 119.354 262.666 120.894 263.206C121.054 261.263 120.529 260.073 120.212 259.545C118.761 260.302 117.491 261.367 116.739 262.061Z" fill="#20D3BD"/>
+<path d="M116.741 267.151C116.741 271.769 112.893 275.438 110.12 278.116C109.656 278.569 108.086 278.643 108.086 278.643C108.476 278.242 108.918 277.82 109.393 277.367C112.029 274.816 115.687 271.326 115.687 267.151C115.687 262.206 113.694 260.256 112.123 258.696C111.428 257.989 110.837 257.315 110.479 256.492L110.806 256.355C111.164 256.513 111.575 256.693 111.892 256.83C112.145 257.199 112.482 257.557 112.872 257.947C114.485 259.56 116.741 261.774 116.741 267.151Z" fill="#20D3BD"/>
+<path d="M142.977 268.515C142.977 268.515 142.339 268.606 142.16 268.627C132.925 269.65 123.394 272.307 117.943 274.489C115.972 275.28 113.926 276.239 112.06 277.315C112.05 277.325 112.039 277.325 112.018 277.336C110.922 277.968 108.254 279.275 106.093 280.425C109.256 277.061 115.181 274.468 117.543 273.519C122.888 271.379 132.071 268.796 141.106 267.689C140.041 266.445 137.437 263.809 132.313 261.848C129.319 260.688 124.764 260.035 120.748 259.455C114.359 258.538 110.721 257.926 110.373 256.187C110.3 255.839 110.352 255.491 110.51 255.153C110.858 255.723 111.354 256.123 111.681 256.355C111.839 256.461 111.955 256.524 111.997 256.545L112.008 256.556C113.505 257.346 117.543 257.926 120.906 258.411C124.975 259.002 129.583 259.666 132.693 260.857C139.936 263.651 142.434 267.647 142.54 267.815C142.635 267.974 142.977 268.515 142.977 268.515Z" fill="#20D3BD"/>
+</g>
+</g>
+<g opacity="0.66">
+<g clip-path="url(#clip11_67_611)">
+<path d="M342.357 198.589C338.741 198.589 335.409 200.624 332.189 204.18C329.025 200.568 325.637 198.589 321.853 198.589C315.586 198.589 311.013 203.062 311.013 209.082C311.013 215.103 315.586 219.519 321.853 219.519C325.704 219.519 328.689 217.713 332.021 214.113C335.241 217.724 338.517 219.53 342.357 219.53C348.624 219.519 353.197 215.119 353.197 209.082C353.197 203.045 348.624 198.589 342.357 198.589ZM321.897 213.202C319.242 213.202 317.66 211.452 317.66 209.138C317.66 206.824 319.242 205.024 321.897 205.024C324.133 205.024 325.961 206.824 327.94 209.25C326.073 211.508 324.1 213.202 321.897 213.202ZM342.167 213.202C339.965 213.202 338.103 211.452 336.124 209.138C338.159 206.712 339.909 205.024 342.167 205.024C344.823 205.024 346.388 206.846 346.388 209.138C346.388 211.43 344.823 213.202 342.167 213.202Z" fill="#20D3BD"/>
+<path d="M336.733 218.025L340.948 212.993C339.271 212.49 337.722 210.981 336.118 209.108L332.015 214.111C333.358 215.67 334.953 216.993 336.733 218.025Z" fill="#20D3BD"/>
+<path d="M332.176 204.171C330.842 202.59 329.257 201.238 327.486 200.169L323.266 205.256C324.87 205.815 326.29 207.257 327.799 209.096L327.967 209.214L332.176 204.171Z" fill="#20D3BD"/>
+</g>
+<path d="M605.838 196.501L603.026 197.866V221.818L605.838 223.175L605.855 223.155V196.52L605.838 196.501Z" fill="#20D3BD"/>
+<path d="M614.093 214.255L620.475 215.044L620.515 214.954L620.551 204.796L620.475 204.717L614.093 205.494V214.255Z" fill="#20D3BD"/>
+<path d="M626.86 214.255L620.475 215.044V204.717L626.86 205.494V214.255Z" fill="#20D3BD"/>
+<path d="M614.093 201.257L620.475 199.724L620.527 199.709V189.439L620.475 189.398L614.093 192.496V201.257Z" fill="#20D3BD"/>
+<path d="M626.86 201.257L620.475 199.724V189.398L626.86 192.496V201.257Z" fill="#20D3BD"/>
+<path d="M620.475 230.34L614.092 227.243V218.482L620.475 220.014L620.569 220.118L620.544 230.161L620.475 230.34Z" fill="#20D3BD"/>
+<path d="M620.475 230.34L626.859 227.243V218.482L620.475 220.014V230.34Z" fill="#20D3BD"/>
+<path d="M635.113 196.501L637.926 197.866V221.818L635.113 223.182V196.501Z" fill="#20D3BD"/>
+<g clip-path="url(#clip12_67_611)">
+<path d="M327.242 727.862C327.33 727.92 327.417 727.985 327.508 728.04C328.646 728.697 329.785 729.351 330.923 730.012C331.014 730.063 331.101 730.122 331.231 730.203C331.098 730.287 330.994 730.355 330.891 730.413C325.538 733.505 320.184 736.599 314.831 739.691C314.301 739.998 313.77 740.309 313.233 740.607C313.062 740.701 312.99 740.808 312.994 741.008C312.997 746.314 312.997 751.616 312.997 756.922C312.997 756.987 312.997 757.051 312.997 757.139C314.33 757.909 315.656 758.677 317.037 759.473C317.043 759.298 317.05 759.178 317.05 759.055C317.05 753.892 317.05 748.729 317.053 743.566C317.053 743.006 316.972 743.151 317.454 742.873C323.293 739.5 329.131 736.127 334.967 732.754C335.022 732.721 335.083 732.695 335.135 732.656C335.267 732.553 335.384 732.582 335.52 732.663C335.963 732.928 336.412 733.181 336.862 733.44C339.621 735.036 342.38 736.632 345.146 738.218C345.359 738.341 345.447 738.47 345.437 738.723C345.418 739.315 345.418 739.908 345.437 740.5C345.447 740.759 345.363 740.898 345.136 741.031C341.895 742.892 338.661 744.763 335.423 746.631C333.482 747.751 331.544 748.874 329.6 749.988C329.377 750.114 329.293 750.25 329.293 750.512C329.303 756.462 329.3 762.412 329.3 768.365C329.3 768.504 329.3 768.644 329.3 768.799C329.199 768.861 329.102 768.929 329.002 768.987C328.497 769.278 327.993 769.566 327.491 769.861C327.401 769.913 327.323 769.984 327.239 770.045C327.197 770.045 327.152 770.045 327.11 770.045C327.042 769.997 326.977 769.942 326.906 769.9C326.459 769.637 326.01 769.385 325.564 769.12C325.143 768.87 325.201 769 325.198 768.501C325.198 761.742 325.198 754.983 325.198 748.221C325.198 748.156 325.204 748.091 325.198 748.026C325.179 747.864 325.247 747.761 325.395 747.696C325.454 747.67 325.509 747.631 325.564 747.599C330.05 745.009 334.536 742.416 339.023 739.827C339.13 739.765 339.236 739.697 339.366 739.616C339.246 739.542 339.165 739.49 339.081 739.441C337.923 738.775 336.765 738.111 335.614 737.431C335.4 737.305 335.251 737.298 335.031 737.425C330.512 740.044 325.987 742.656 321.462 745.268C321.407 745.301 321.352 745.34 321.294 745.365C321.184 745.417 321.129 745.495 321.142 745.621C321.148 745.705 321.142 745.793 321.142 745.88C321.142 752.63 321.142 759.379 321.142 766.128C321.142 766.255 321.142 766.378 321.142 766.546C321.003 766.472 320.909 766.426 320.818 766.374C318.496 765.034 316.173 763.694 313.851 762.351C312.211 761.402 310.571 760.45 308.931 759.502C308.931 759.35 308.928 759.201 308.928 759.049C308.928 752.316 308.928 745.579 308.928 738.846C308.928 738.694 308.921 738.545 308.918 738.393C308.954 738.367 308.986 738.341 309.022 738.318C315.006 734.861 320.986 731.404 326.971 727.95C327.055 727.908 327.155 727.891 327.242 727.862Z" fill="#20D3BD"/>
+<path d="M333.385 766.436C333.385 764.856 333.385 763.309 333.385 761.732C336.018 760.211 338.664 758.683 341.326 757.145C341.326 755.663 341.326 754.18 341.326 752.643C338.68 754.161 336.063 755.685 333.404 757.21C333.388 757.119 333.368 757.064 333.368 757.006C333.365 755.582 333.372 754.161 333.362 752.736C333.359 752.532 333.462 752.455 333.608 752.371C335.539 751.257 337.47 750.14 339.398 749.027C341.29 747.932 343.182 746.842 345.078 745.747C345.178 745.689 345.282 745.637 345.417 745.566C345.424 745.709 345.434 745.812 345.434 745.912C345.434 750.331 345.434 754.75 345.44 759.169C345.44 759.402 345.375 759.531 345.168 759.651C341.332 761.859 337.502 764.073 333.669 766.287C333.582 766.342 333.498 766.381 333.385 766.436Z" fill="#20D3BD"/>
+</g>
+<path d="M178.202 459.218C178.094 459.218 177.985 459.272 177.877 459.326L174.038 461.652L170.198 459.381C169.981 459.272 169.711 459.272 169.549 459.381L161.761 464.14C161.545 464.248 161.437 464.464 161.437 464.68V469.44L157.759 471.603C157.543 471.711 157.435 471.927 157.435 472.144V479.931C157.435 480.148 157.543 480.364 157.759 480.472L161.437 482.581V487.449C161.437 487.665 161.545 487.881 161.761 487.989L169.603 492.803C169.819 492.911 170.09 492.911 170.252 492.803L174.092 490.531L177.877 492.857C178.094 492.965 178.364 492.965 178.526 492.857L186.368 488.043C186.584 487.935 186.692 487.719 186.692 487.503V482.744L190.37 480.634C190.586 480.526 190.694 480.31 190.694 480.094V472.198C190.694 471.981 190.586 471.765 190.37 471.657L186.692 469.548V464.735C186.692 464.518 186.584 464.302 186.368 464.194L178.58 459.326C178.472 459.272 178.31 459.218 178.202 459.218ZM178.202 460.624L185.395 465.059V466.627L183.556 466.681C183.285 465.978 182.582 465.438 181.771 465.438C180.744 465.438 179.878 466.303 179.878 467.33C179.878 468.358 180.744 469.223 181.771 469.223C182.582 469.223 183.231 468.737 183.502 468.034L185.395 467.979V469.872C185.395 470.089 185.503 470.305 185.719 470.413L189.397 472.522V478.904L186.855 477.444C186.855 477.335 186.909 477.227 186.909 477.119C186.909 476.037 186.044 475.172 184.962 475.172C183.88 475.172 183.015 476.037 183.015 477.119C183.015 478.201 183.88 479.066 184.962 479.066C185.449 479.066 185.881 478.904 186.26 478.579L188.748 479.985L185.719 481.716C185.503 481.824 185.395 482.04 185.395 482.257V487.016L178.202 491.397L174.687 489.233V485.772L177.823 485.826C178.094 486.529 178.797 487.016 179.554 487.016C180.581 487.016 181.447 486.151 181.447 485.123C181.447 484.096 180.581 483.23 179.554 483.23C178.743 483.23 178.04 483.771 177.769 484.474L174.632 484.42V476.146C174.632 475.929 174.524 475.713 174.308 475.605L170.468 473.279L169.819 474.415L173.334 476.524V479.336L170.63 480.905V478.633C170.63 478.417 170.522 478.201 170.36 478.093L166.683 475.713V472.522L170.36 470.467C170.576 470.359 170.685 470.143 170.685 469.926V466.141H169.387V469.548L166.034 471.441L162.735 469.44V465.059L165.439 463.383V467.385H166.737V462.571L169.873 460.624L173.443 462.734V470.197C173.443 470.413 173.551 470.629 173.767 470.738L177.769 473.225C177.715 473.388 177.715 473.55 177.715 473.712C177.715 474.794 178.58 475.605 179.662 475.605C180.744 475.605 181.609 474.74 181.609 473.712C181.609 472.684 180.744 471.765 179.662 471.765C179.229 471.765 178.851 471.927 178.526 472.144L174.795 469.818V462.679L178.202 460.624ZM181.771 466.736C182.096 466.736 182.366 467.006 182.366 467.33C182.366 467.655 182.096 467.925 181.771 467.925C181.447 467.925 181.176 467.655 181.176 467.33C181.23 467.006 181.447 466.736 181.771 466.736ZM162.14 470.575L165.493 472.522V475.713L161.815 477.714L162.41 478.85L166.088 476.849L169.441 479.012V481.716L165.276 484.15L165.925 485.285L173.389 480.905V489.504L169.873 491.559L167.061 489.828L170.09 487.989L169.441 486.908L165.871 489.071L162.735 487.124V482.635L166.142 480.688L165.493 479.553L162.086 481.5L158.733 479.607V476.47L162.248 474.307L161.599 473.225L158.787 474.956V472.576L162.14 470.575ZM179.554 473.171C179.932 473.171 180.203 473.442 180.203 473.82C180.203 474.145 179.932 474.469 179.554 474.469C179.229 474.469 178.905 474.199 178.905 473.82C178.959 473.442 179.229 473.171 179.554 473.171ZM184.962 476.524C185.34 476.524 185.611 476.795 185.611 477.173C185.611 477.552 185.34 477.822 184.962 477.822C184.583 477.822 184.313 477.552 184.313 477.173C184.313 476.795 184.583 476.524 184.962 476.524ZM179.608 484.745C179.932 484.745 180.203 485.015 180.203 485.339C180.203 485.664 179.932 485.934 179.608 485.934C179.283 485.934 179.013 485.664 179.013 485.339C179.013 485.015 179.283 484.745 179.608 484.745Z" fill="#20D3BD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M801.094 491.859C800.996 491.652 800.951 491.546 800.897 491.447C799.468 488.767 798.042 486.082 796.602 483.408C796.455 483.141 796.474 482.981 796.672 482.753C798.945 480.132 801.206 477.502 803.471 474.873C803.55 474.783 803.622 474.683 803.652 474.52C802.99 474.69 802.328 474.858 801.667 475.032C798.92 475.75 796.173 476.466 793.429 477.193C793.174 477.26 793.058 477.188 792.93 476.977C791.371 474.408 789.803 471.843 788.236 469.278C788.155 469.144 788.068 469.014 787.896 468.903C787.77 469.588 787.641 470.272 787.518 470.957L786.212 478.212C786.165 478.474 786.099 478.733 786.077 478.997C786.054 479.246 785.926 479.339 785.696 479.409C782.46 480.411 779.227 481.424 775.992 482.436C775.851 482.48 775.711 482.537 775.56 482.673L783.535 485.802C783.438 485.877 783.374 485.936 783.303 485.983C781.649 487.039 779.992 488.09 778.344 489.152C778.146 489.278 777.989 489.296 777.767 489.197C775.792 488.321 773.808 487.46 771.831 486.587C770.942 486.195 770.143 485.675 769.521 484.925C768.114 483.227 768.391 481.296 770.266 480.115C770.88 479.729 771.577 479.441 772.27 479.217C775.441 478.198 778.623 477.216 781.802 476.229C782.069 476.147 782.194 476.029 782.243 475.745C782.666 473.323 783.107 470.906 783.547 468.488C783.784 467.196 783.91 465.869 784.548 464.687C784.793 464.229 785.086 463.784 785.435 463.402C786.696 462.02 788.46 461.966 789.794 463.284C790.245 463.728 790.632 464.253 790.968 464.79C792.437 467.156 793.885 469.537 795.322 471.92C795.494 472.204 795.647 472.26 795.961 472.178C799.508 471.239 803.059 470.316 806.608 469.391C807.341 469.199 808.081 469.13 808.832 469.268C810.47 469.571 811.186 470.798 810.631 472.359C810.379 473.069 809.943 473.671 809.454 474.236C806.978 477.112 804.505 479.988 802.02 482.855C801.817 483.091 801.811 483.259 801.953 483.521C803.435 486.279 804.905 489.042 806.381 491.804C806.734 492.465 807.003 493.149 807.011 493.909C807.028 495.637 805.75 497.049 804.01 497.3C803.035 497.441 802.131 497.236 801.22 496.958C798.996 496.279 796.768 495.613 794.539 494.952C794.332 494.89 794.253 494.811 794.218 494.59C793.96 493.043 793.681 491.499 793.411 489.954C793.404 489.912 793.416 489.866 793.422 489.771L801.094 491.859" fill="#20D3BD"/>
+<path d="M610.492 739.826L615.32 740.752V748.519L610.492 748.262V739.826V739.826Z" fill="#20D3BD"/>
+<path d="M638.43 748.262L633.602 748.519V743.375L638.481 742.655V748.262H638.43Z" fill="#20D3BD"/>
+<path d="M624.461 751.092H607V757.316L624.461 761.792V751.092Z" fill="#20D3BD"/>
+<path d="M624.461 772.183L619.223 769.56V764.312L624.461 766.216V772.183Z" fill="#20D3BD"/>
+<path d="M624.461 746.873L619.223 747.388V732.624L624.461 730V746.873Z" fill="#20D3BD"/>
+<path d="M610.492 739.826L607 741.215V748.622L610.492 748.262V739.826Z" fill="#20D3BD"/>
+<path d="M624.461 761.792L641.922 757.316V751.092H624.461V761.792Z" fill="#20D3BD"/>
+<path d="M624.461 746.873L629.699 747.388V732.624L624.461 730V746.873Z" fill="#20D3BD"/>
+<path d="M638.43 748.262L641.922 748.622V743.632L638.43 742.604V748.262Z" fill="#20D3BD"/>
+<path d="M624.461 772.183L629.699 769.56V764.312L624.461 766.216V772.183Z" fill="#20D3BD"/>
+</g>
+<g clip-path="url(#clip13_67_611)">
+<path d="M652.062 363.643C651.597 363.189 650.949 362.909 650.227 362.909C649.509 362.909 648.865 363.189 648.406 363.643H648.393C647.929 364.094 647.64 364.724 647.64 365.421C647.64 366.121 647.929 366.746 648.393 367.195L648.406 367.205C648.865 367.656 649.509 367.934 650.227 367.934C650.949 367.934 651.597 367.656 652.062 367.205L652.069 367.195C652.535 366.746 652.821 366.121 652.821 365.421C652.821 364.724 652.535 364.094 652.069 363.643H652.062ZM650.227 398.034C650.949 398.034 651.597 397.749 652.062 397.303L652.069 397.289C652.535 396.844 652.821 396.214 652.821 395.522C652.821 394.822 652.535 394.194 652.069 393.741H652.062C651.597 393.282 650.949 393.004 650.227 393.004C649.509 393.004 648.865 393.282 648.406 393.741H648.393C647.929 394.194 647.64 394.822 647.64 395.522C647.64 396.214 647.929 396.844 648.393 397.289L648.406 397.303C648.865 397.749 649.509 398.034 650.227 398.034ZM664.331 390.422C664.972 390.259 665.553 389.859 665.907 389.255L665.955 389.167C666.27 388.594 666.328 387.933 666.16 387.347C665.99 386.72 665.573 386.165 664.952 385.818L664.916 385.794C664.311 385.472 663.622 385.402 662.989 385.568C662.345 385.724 661.767 386.141 661.415 386.741C661.058 387.334 660.983 388.018 661.154 388.649C661.33 389.268 661.743 389.828 662.36 390.178H662.364C662.982 390.523 663.682 390.585 664.331 390.422ZM652.884 377.897C652.204 377.238 651.266 376.826 650.227 376.826C649.193 376.826 648.258 377.238 647.579 377.897C646.903 378.553 646.486 379.46 646.486 380.466C646.486 381.475 646.903 382.385 647.579 383.048C648.258 383.702 649.193 384.111 650.227 384.111C651.266 384.111 652.204 383.702 652.884 383.048C653.561 382.385 653.978 381.475 653.978 380.466C653.978 379.46 653.561 378.553 652.884 377.897ZM651.39 373.614C652.896 373.855 654.25 374.555 655.284 375.566H655.292C655.456 375.727 655.617 375.901 655.765 376.077L658.349 374.625C658.002 373.606 657.986 372.541 658.265 371.543C658.634 370.205 659.527 369.007 660.867 368.255L660.911 368.229C662.236 367.501 663.742 367.35 665.102 367.708C666.479 368.066 667.721 368.937 668.494 370.236V370.239C669.264 371.53 669.42 373.013 669.053 374.345C668.687 375.682 667.789 376.888 666.451 377.635L666.098 377.837H666.062C664.824 378.41 663.463 378.498 662.213 378.179C661.186 377.915 660.244 377.36 659.507 376.569L656.927 378.016C657.223 378.778 657.388 379.6 657.388 380.466C657.388 381.329 657.223 382.162 656.927 382.929L659.507 384.371C660.244 383.57 661.186 383.025 662.213 382.76C663.59 382.395 665.116 382.551 666.451 383.305L666.536 383.344V383.349C667.825 384.106 668.691 385.278 669.053 386.6C669.42 387.925 669.264 389.408 668.494 390.702L668.448 390.793L668.442 390.785C667.669 392.032 666.451 392.877 665.106 393.235C663.726 393.588 662.2 393.437 660.867 392.693V392.683C659.527 391.931 658.634 390.73 658.265 389.395C657.986 388.4 658.002 387.334 658.349 386.315L655.765 384.868C655.617 385.045 655.456 385.211 655.292 385.372L655.284 385.379C654.25 386.385 652.896 387.085 651.39 387.318V390.217C652.463 390.435 653.425 390.956 654.178 391.687L654.182 391.695C655.192 392.67 655.817 394.028 655.817 395.522C655.817 397.01 655.192 398.36 654.182 399.34L654.178 399.356C653.162 400.336 651.766 400.942 650.227 400.942C648.697 400.942 647.3 400.336 646.286 399.356H646.282V399.34C645.271 398.36 644.645 397.01 644.645 395.522C644.645 394.028 645.271 392.67 646.282 391.695V391.687H646.286C647.038 390.956 648.001 390.435 649.071 390.217V387.318C647.564 387.085 646.214 386.385 645.182 385.379L645.171 385.372C643.881 384.114 643.074 382.385 643.074 380.466C643.074 378.553 643.881 376.824 645.171 375.566H645.182C646.214 374.555 647.564 373.855 649.071 373.614V370.728C648.001 370.503 647.038 369.982 646.286 369.256H646.282V369.248C645.271 368.263 644.645 366.915 644.645 365.421C644.645 363.935 645.271 362.574 646.282 361.594L646.286 361.589C647.3 360.607 648.697 360 650.227 360C651.766 360 653.162 360.607 654.178 361.589V361.594H654.182C655.192 362.574 655.817 363.935 655.817 365.421C655.817 366.915 655.192 368.263 654.182 369.248L654.178 369.256C653.425 369.982 652.463 370.503 651.39 370.728V373.614ZM665.907 371.69L665.886 371.659C665.529 371.076 664.96 370.687 664.331 370.518C663.682 370.352 662.982 370.423 662.36 370.767H662.364C661.743 371.109 661.328 371.67 661.154 372.297C660.983 372.919 661.058 373.606 661.415 374.205L661.426 374.221C661.784 374.812 662.353 375.208 662.989 375.369C663.628 375.543 664.339 375.47 664.952 375.123L664.986 375.107C665.589 374.757 665.991 374.205 666.16 373.598C666.33 372.974 666.263 372.289 665.907 371.69Z" fill="white"/>
+</g>
+<g clip-path="url(#clip14_67_611)">
+<path d="M320.083 388.202L311.444 383.209C310.23 382.51 308.678 382.926 307.976 384.14C307.704 384.618 307.597 385.144 307.649 385.656V395.413C307.649 396.807 308.781 397.94 310.179 397.94C311.573 397.94 312.705 396.807 312.705 395.413V389.802L317.545 392.598C318.759 393.301 320.314 392.881 321.013 391.667C321.716 390.453 321.3 388.901 320.083 388.202Z" fill="#29B5E8"/>
+<path d="M298.598 377.503C298.613 376.602 298.138 375.763 297.359 375.31L288.72 370.322C288.345 370.105 287.915 369.991 287.484 369.991C286.598 369.991 285.774 370.465 285.333 371.23C284.649 372.415 285.057 373.934 286.241 374.619L291.221 377.492L286.241 380.369C285.668 380.7 285.256 381.234 285.086 381.874C284.914 382.514 285.002 383.183 285.333 383.757C285.774 384.523 286.598 384.997 287.481 384.997C287.915 384.997 288.345 384.883 288.72 384.666L297.359 379.677C298.131 379.229 298.605 378.397 298.598 377.503Z" fill="#29B5E8"/>
+<path d="M290.68 366.786L299.319 371.775C300.327 372.36 301.57 372.169 302.364 371.392C302.868 370.929 303.18 370.266 303.18 369.531V359.531C303.18 358.133 302.048 357 300.654 357C299.256 357 298.124 358.133 298.124 359.531V365.223L293.218 362.39C292.004 361.687 290.452 362.103 289.75 363.317C289.047 364.531 289.466 366.083 290.68 366.786Z" fill="#29B5E8"/>
+<path d="M310.105 377.908C310.105 378.099 309.995 378.364 309.859 378.504L306.435 381.929C306.299 382.065 306.031 382.175 305.839 382.175H304.968C304.776 382.175 304.508 382.065 304.372 381.929L300.944 378.504C300.808 378.364 300.698 378.099 300.698 377.908V377.036C300.698 376.841 300.808 376.576 300.944 376.44L304.372 373.011C304.508 372.875 304.776 372.765 304.968 372.765H305.839C306.031 372.765 306.299 372.875 306.435 373.011L309.859 376.44C309.995 376.576 310.105 376.841 310.105 377.036V377.908ZM307.049 377.488V377.452C307.049 377.312 306.968 377.117 306.869 377.014L305.858 376.006C305.758 375.903 305.564 375.822 305.42 375.822H305.383C305.244 375.822 305.049 375.903 304.946 376.006L303.938 377.014C303.839 377.113 303.758 377.308 303.758 377.452V377.488C303.758 377.632 303.839 377.827 303.938 377.926L304.946 378.938C305.049 379.037 305.244 379.118 305.383 379.118H305.42C305.564 379.118 305.758 379.037 305.858 378.938L306.869 377.926C306.968 377.827 307.049 377.632 307.049 377.488Z" fill="#29B5E8"/>
+<path d="M311.444 371.775L320.083 366.786C321.296 366.087 321.716 364.531 321.013 363.317C320.311 362.103 318.759 361.687 317.545 362.39L312.705 365.186V359.531C312.705 358.133 311.573 357 310.179 357C308.781 357 307.649 358.133 307.649 359.531V369.332C307.601 369.84 307.7 370.369 307.976 370.848C308.678 372.062 310.23 372.478 311.444 371.775Z" fill="#29B5E8"/>
+<path d="M301.051 382.915C300.477 382.805 299.863 382.897 299.319 383.209L290.68 388.202C289.466 388.901 289.047 390.453 289.75 391.667C290.452 392.885 292.004 393.301 293.218 392.598L298.124 389.765V395.413C298.124 396.807 299.256 397.94 300.654 397.94C302.048 397.94 303.18 396.807 303.18 395.413V385.413C303.18 384.151 302.257 383.106 301.051 382.915Z" fill="#29B5E8"/>
+<path d="M325.482 371.201C324.783 369.983 323.227 369.567 322.014 370.27L313.375 375.259C312.547 375.737 312.091 376.613 312.106 377.503C312.099 378.39 312.555 379.254 313.375 379.725L322.014 384.718C323.227 385.417 324.779 385.001 325.482 383.787C326.184 382.573 325.765 381.02 324.551 380.318L319.66 377.492L324.551 374.667C325.768 373.968 326.184 372.415 325.482 371.201Z" fill="#29B5E8"/>
+</g>
+<g clip-path="url(#clip15_67_611)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M296.537 577.521V586.703C295.067 585.811 293.808 584.552 292.969 583.03V577.521H296.537Z" fill="#AECBFA"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M303.987 572.432V588.382C303.305 588.434 302.57 588.434 301.888 588.382C301.101 588.382 300.314 588.329 299.58 588.277V572.432H303.987Z" fill="#669DF6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M311.017 579.672V582.768C310.178 584.342 308.919 585.653 307.45 586.598V579.672H311.017Z" fill="#AECBFA"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M316.054 589.064C316.422 588.696 316.999 588.696 317.314 589.064L324.764 596.514C325.079 596.881 325.079 597.406 324.764 597.773L321.773 600.764C321.406 601.079 320.881 601.079 320.514 600.764L313.064 593.314C312.749 592.946 312.749 592.422 313.064 592.054L316.054 589.064Z" fill="#4285F4"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M301.888 559C312.329 559 320.776 567.447 320.776 577.888C320.776 588.329 312.329 596.776 301.888 596.776C291.447 596.776 283 588.329 283 577.888C283 567.447 291.447 559 301.888 559ZM301.888 591.949C301.888 591.949 301.941 591.949 301.888 591.949C309.653 591.949 315.949 585.653 315.949 577.888C315.949 570.176 309.653 563.879 301.941 563.879C294.228 563.879 287.879 570.176 287.879 577.888C287.879 585.601 294.176 591.897 301.888 591.949Z" fill="#669DF6"/>
+</g>
+<line x1="483.5" y1="306" x2="483.5" y2="344" stroke="white"/>
+<line x1="347.996" y1="478.5" x2="208.996" y2="477.5" stroke="white"/>
+<line x1="758" y1="478.5" x2="620" y2="478.478" stroke="white"/>
+<line x1="482.5" y1="657" x2="482.5" y2="615" stroke="white"/>
+<g opacity="0.5">
+<line x1="148.682" y1="288.812" x2="272.812" y2="359.318" stroke="white" stroke-linecap="round"/>
+<line x1="139" y1="475.5" x2="101" y2="475.5" stroke="white"/>
+<line x1="141.763" y1="668.56" x2="275.763" y2="596.56" stroke="white"/>
+<line x1="288.567" y1="818.751" x2="311.567" y2="778.751" stroke="white"/>
+<line x1="662.555" y1="830.227" x2="638.555" y2="783.227" stroke="white"/>
+<line x1="483.973" y1="725.508" x2="481.508" y2="869.668" stroke="white" stroke-linecap="round"/>
+<line x1="484.496" y1="99.5036" x2="483.504" y2="238.504" stroke="white" stroke-linecap="round"/>
+<line x1="298.671" y1="147.224" x2="315.224" y2="180.329" stroke="white" stroke-linecap="round"/>
+<line x1="672.209" y1="130.675" x2="643.675" y2="184.791" stroke="white" stroke-linecap="round"/>
+<line x1="870.489" y1="480.489" x2="826.489" y2="479.511" stroke="white" stroke-linecap="round"/>
+<line x1="814.301" y1="699.11" x2="690.11" y2="608.698" stroke="white" stroke-linecap="round"/>
+<line x1="820.78" y1="293.672" x2="687.535" y2="361.207" stroke="white" stroke-linecap="round"/>
+</g>
+<line x1="626.238" y1="398.44" x2="602.238" y2="411.44" stroke="white"/>
+<line x1="634.729" y1="570.42" x2="603.729" y2="550.42" stroke="white"/>
+<line x1="337.248" y1="394.566" x2="365.248" y2="410.566" stroke="white"/>
+<line x1="349.441" y1="238.765" x2="414.441" y2="360.765" stroke="white"/>
+<line x1="345.561" y1="721.245" x2="412.561" y2="598.76" stroke="white"/>
+<line x1="614.441" y1="244.236" x2="552.441" y2="360.236" stroke="white"/>
+<line x1="610.552" y1="719.222" x2="551.552" y2="600.222" stroke="white"/>
+<line x1="335.76" y1="569.061" x2="367.76" y2="551.561" stroke="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M499.172 439.043L511.205 455.88C515.397 461.743 515.952 469.455 512.643 475.857C509.333 482.259 502.716 486.274 495.501 486.259H471.463C464.254 486.261 457.649 482.24 454.349 475.841C451.049 469.442 451.607 461.738 455.795 455.88L467.85 439.043C471.464 433.995 477.297 431 483.511 431C489.725 431 495.557 433.995 499.172 439.043ZM471.492 480.441H495.53C500.555 480.442 505.161 477.64 507.462 473.178C509.764 468.717 509.375 463.346 506.456 459.262L494.423 442.417C491.903 438.893 487.833 436.801 483.496 436.801C479.16 436.801 475.09 438.893 472.57 442.417L460.566 459.262C457.647 463.346 457.258 468.717 459.56 473.178C461.861 477.64 466.466 480.442 471.492 480.441Z" fill="#08303A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M494.167 450.068L518.125 483.582C520.979 487.573 521.36 492.822 519.112 497.182C516.864 501.542 512.365 504.282 507.454 504.281H459.546C454.635 504.282 450.135 501.542 447.888 497.182C445.64 492.822 446.021 487.573 448.875 483.582L472.818 450.068C475.278 446.623 479.255 444.578 483.493 444.578C487.73 444.578 491.707 446.623 494.167 450.068ZM459.546 498.463H507.454C510.174 498.458 512.665 496.939 513.912 494.524C515.16 492.11 514.955 489.203 513.383 486.986L489.426 453.443C488.058 451.53 485.85 450.395 483.496 450.395C481.143 450.395 478.934 451.53 477.567 453.443L453.617 486.986C452.044 489.203 451.84 492.11 453.087 494.524C454.335 496.939 456.825 498.458 459.546 498.463Z" fill="#11696B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M489.477 461.247L524.637 510.449C526.232 512.683 526.443 515.62 525.186 518.059C523.928 520.498 521.412 522.033 518.664 522.035H448.336C445.588 522.033 443.072 520.498 441.814 518.059C440.557 515.62 440.768 512.683 442.363 510.449L477.523 461.247C478.899 459.316 481.126 458.169 483.5 458.169C485.874 458.169 488.101 459.316 489.477 461.247ZM448.336 516.217H518.664C519.232 516.216 519.751 515.899 520.01 515.395C520.27 514.891 520.225 514.285 519.895 513.824L484.727 464.622C484.446 464.222 483.986 463.986 483.496 463.989C483.008 463.989 482.55 464.225 482.265 464.622L447.105 513.824C446.775 514.285 446.73 514.891 446.99 515.395C447.249 515.899 447.769 516.216 448.336 516.217Z" fill="#20D3BD"/>
+<defs>
+<filter id="filter0_b_67_611" x="447.411" y="234" width="77.1783" height="77.1784" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter1_b_67_611" x="583" y="172" width="77.1783" height="77.1783" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter2_b_67_611" x="641" y="57" width="77.1783" height="77.1783" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter3_b_67_611" x="617.172" y="341.058" width="77.1783" height="77.1784" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter4_b_67_611" x="800.551" y="685.12" width="77.1783" height="77.1784" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter5_b_67_611" x="866.822" y="442.733" width="77.1783" height="77.1784" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter6_b_67_611" x="753.345" y="439.733" width="77.1783" height="77.1784" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter7_b_67_611" x="815.984" y="243.014" width="77.1783" height="77.1784" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter8_b_67_611" x="624.435" y="549.856" width="77.1783" height="77.1784" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter9_b_67_611" x="441.964" y="652" width="77.1783" height="77.1784" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter10_b_67_611" x="266" y="541" width="77.1783" height="77.1784" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter11_b_67_611" x="268" y="339" width="77.1783" height="77.1784" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter12_b_67_611" x="135" y="438" width="77.1783" height="77.1784" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter13_b_67_611" x="28" y="436.379" width="77.1783" height="77.1784" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter14_b_67_611" x="81.5612" y="233.936" width="77.1783" height="77.1784" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter15_b_67_611" x="73.3907" y="643.361" width="77.1783" height="77.1784" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter16_b_67_611" x="232" y="808" width="77.1783" height="77.1783" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter17_b_67_611" x="291" y="711" width="77.1783" height="77.1783" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter18_b_67_611" x="443" y="864.868" width="77.1783" height="77.1783" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter19_b_67_611" x="640" y="823" width="77.1783" height="77.1783" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter20_b_67_611" x="585" y="713" width="77.1783" height="77.1783" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter21_b_67_611" x="294" y="171" width="77.1783" height="77.1783" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter22_b_67_611" x="445.595" y="26.9539" width="77.1783" height="77.1783" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<filter id="filter23_b_67_611" x="242" y="80" width="77.1783" height="77.1783" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feGaussianBlur in="BackgroundImage" stdDeviation="2.5"/>
+<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_67_611"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_67_611" result="shape"/>
+</filter>
+<clipPath id="clip0_67_611">
+<rect width="967.38" height="967.38" fill="white"/>
+</clipPath>
+<clipPath id="clip1_67_611">
+<rect width="41" height="41" fill="white" transform="translate(473 251.802)"/>
+</clipPath>
+<clipPath id="clip2_67_611">
+<rect width="41" height="41" fill="white" transform="translate(643 566)"/>
+</clipPath>
+<clipPath id="clip3_67_611">
+<rect width="39.7018" height="39.7018" fill="white" transform="translate(247.894 827.888)"/>
+</clipPath>
+<clipPath id="clip4_67_611">
+<rect width="42.1832" height="42.1832" fill="white" transform="translate(44.5652 455.931)"/>
+</clipPath>
+<clipPath id="clip5_67_611">
+<rect width="40.9425" height="42.1832" fill="white" transform="translate(464.666 42.3635)"/>
+</clipPath>
+<clipPath id="clip6_67_611">
+<rect width="42.1832" height="40.9425" fill="white" transform="translate(261.797 96.2568)"/>
+</clipPath>
+<clipPath id="clip7_67_611">
+<rect width="34.7391" height="35.9798" fill="white" transform="translate(662.252 77.1302)"/>
+</clipPath>
+<clipPath id="clip8_67_611">
+<rect width="42.1832" height="42.1832" fill="white" transform="translate(815.008 705.015)"/>
+</clipPath>
+<clipPath id="clip9_67_611">
+<rect width="40.9425" height="40.9425" fill="white" transform="translate(833.907 259.483)"/>
+</clipPath>
+<clipPath id="clip10_67_611">
+<rect width="42.1832" height="42.1832" fill="white" transform="translate(102.387 250.798)"/>
+</clipPath>
+<clipPath id="clip11_67_611">
+<rect width="42.1832" height="42.1832" fill="white" transform="translate(311.013 188.044)"/>
+</clipPath>
+<clipPath id="clip12_67_611">
+<rect width="42.1832" height="42.1832" fill="white" transform="translate(308.921 727.862)"/>
+</clipPath>
+<clipPath id="clip13_67_611">
+<rect width="42.1832" height="40.9425" fill="white" transform="translate(635 360)"/>
+</clipPath>
+<clipPath id="clip14_67_611">
+<rect width="40.94" height="40.94" fill="white" transform="translate(285 357)"/>
+</clipPath>
+<clipPath id="clip15_67_611">
+<rect width="42" height="42" fill="white" transform="translate(283 559)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/datahub-web-react/src/images/ambulance-icon.svg b/datahub-web-react/src/images/ambulance-icon.svg
new file mode 100644
index 00000000000000..df6d397f8f87be
--- /dev/null
+++ b/datahub-web-react/src/images/ambulance-icon.svg
@@ -0,0 +1,8 @@
+<svg width="1em" height="1em" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.025 10.625H10.1V6.89998C10.1 5.07498 8.625 3.59998 6.8 3.59998C4.975 3.59998 3.5 5.07498 3.5 6.89998V10.625H2.625C2.475 10.625 2.375 10.725 2.375 10.875V12.75C2.375 12.9 2.475 13 2.625 13H11.05C11.2 13 11.3 12.9 11.3 12.75V10.875C11.275 10.75 11.175 10.625 11.025 10.625ZM4.025 6.89998C4.025 5.37498 5.275 4.09998 6.825 4.09998C8.35 4.09998 9.625 5.34998 9.625 6.89998V10.625H4.025V6.89998ZM10.775 12.5H2.875V11.125H3.8H9.875H10.8V12.5H10.775Z" fill="#ECB767" stroke="#ECB767" stroke-width="0.5"/>
+<path d="M6.82501 2.925C6.97501 2.925 7.07501 2.825 7.07501 2.675V1.25C7.07501 1.1 6.97501 1 6.82501 1C6.67501 1 6.57501 1.1 6.57501 1.25V2.675C6.57501 2.8 6.67501 2.925 6.82501 2.925Z" fill="#ECB767" stroke="#ECB767" stroke-width="0.5"/>
+<path d="M12.4 6.57501H10.975C10.825 6.57501 10.725 6.67501 10.725 6.82501C10.725 6.97501 10.825 7.07501 10.975 7.07501H12.4C12.55 7.07501 12.65 6.97501 12.65 6.82501C12.65 6.67501 12.525 6.57501 12.4 6.57501Z" fill="#ECB767" stroke="#ECB767" stroke-width="0.5"/>
+<path d="M2.925 6.82501C2.925 6.67501 2.825 6.57501 2.675 6.57501H1.25C1.1 6.57501 1 6.67501 1 6.82501C1 6.97501 1.1 7.07501 1.25 7.07501H2.675C2.825 7.07501 2.925 6.95001 2.925 6.82501Z" fill="#ECB767" stroke="#ECB767" stroke-width="0.5"/>
+<path d="M9.75 4.125C9.825 4.125 9.875 4.1 9.925 4.05L10.925 3.05C11.025 2.95 11.025 2.8 10.925 2.7C10.825 2.6 10.675 2.6 10.575 2.7L9.575 3.7C9.475 3.8 9.475 3.95 9.575 4.05C9.625 4.1 9.7 4.125 9.75 4.125Z" fill="#ECB767" stroke="#ECB767" stroke-width="0.5"/>
+<path d="M3.72502 4.05C3.77502 4.1 3.85002 4.125 3.90002 4.125C3.97502 4.125 4.02502 4.1 4.07502 4.05C4.17502 3.95 4.17502 3.8 4.07502 3.7L3.07502 2.7C2.97502 2.6 2.82502 2.6 2.72502 2.7C2.62502 2.8 2.62502 2.95 2.72502 3.05L3.72502 4.05Z" fill="#ECB767" stroke="#ECB767" stroke-width="0.5"/>
+</svg>
diff --git a/datahub-web-react/src/images/analyticsMenuIcon.svg b/datahub-web-react/src/images/analyticsMenuIcon.svg
new file mode 100644
index 00000000000000..d0b5978878ddb2
--- /dev/null
+++ b/datahub-web-react/src/images/analyticsMenuIcon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"><path d="M3 19.3448V18.4443L4.54281 16.9339V19.3448C4.54281 19.5588 4.46886 19.7381 4.32095 19.8829C4.17302 20.0276 3.98973 20.1 3.77107 20.1C3.5524 20.1 3.36922 20.0276 3.22153 19.8829C3.07384 19.7381 3 19.5588 3 19.3448ZM7.1143 19.3448V14.4163L8.65711 12.9059V19.3448C8.65711 19.5588 8.58315 19.7381 8.43524 19.8829C8.28732 20.0276 8.10403 20.1 7.88537 20.1C7.66669 20.1 7.48351 20.0276 7.33583 19.8829C7.18814 19.7381 7.1143 19.5588 7.1143 19.3448ZM11.2286 19.3448V12.9059L12.7714 14.4415V19.3448C12.7714 19.5588 12.6974 19.7381 12.5495 19.8829C12.4016 20.0276 12.2183 20.1 11.9997 20.1C11.781 20.1 11.5978 20.0276 11.4501 19.8829C11.3024 19.7381 11.2286 19.5588 11.2286 19.3448ZM15.3429 19.3448V14.4415L16.8857 12.9311V19.3448C16.8857 19.5588 16.8117 19.7381 16.6638 19.8829C16.5159 20.0276 16.3326 20.1 16.114 20.1C15.8953 20.1 15.7121 20.0276 15.5644 19.8829C15.4167 19.7381 15.3429 19.5588 15.3429 19.3448ZM19.4572 19.3448V10.3884L21 8.87791V19.3448C21 19.5588 20.926 19.7381 20.7781 19.8829C20.6302 20.0276 20.4469 20.1 20.2283 20.1C20.0096 20.1 19.8264 20.0276 19.6787 19.8829C19.531 19.7381 19.4572 19.5588 19.4572 19.3448ZM3.22945 12.1777L8.6255 6.89486C8.97978 6.54759 9.41878 6.37395 9.94252 6.37395C10.4662 6.37395 10.9055 6.54759 11.2602 6.89486L13.8297 9.41041C13.889 9.46851 13.9648 9.49757 14.0571 9.49757C14.1495 9.49757 14.2253 9.46851 14.2846 9.41041L19.6866 4.12175C19.8396 3.972 20.0229 3.89809 20.2365 3.90004C20.4501 3.90197 20.6334 3.98104 20.7864 4.13726C20.9288 4.287 20.9968 4.46523 20.9904 4.67195C20.9841 4.87867 20.9108 5.05094 20.7705 5.18877L15.3745 10.4716C15.0202 10.8189 14.5812 10.9925 14.0575 10.9925C13.5337 10.9925 13.0945 10.8189 12.7398 10.4716L10.1703 7.95606C10.111 7.89796 10.0352 7.8689 9.94285 7.8689C9.85054 7.8689 9.7747 7.89796 9.71536 7.95606L4.31336 13.2447C4.16041 13.3945 3.97712 13.4684 3.76348 13.4664C3.54987 13.4645 3.36658 13.3854 3.21361 13.2292C3.0712 13.0795 3.00319 12.9012 3.00957 12.6945C3.01593 12.4878 3.08922 12.3155 3.22945 12.1777Z" fill="current-color"/></svg>
\ No newline at end of file
diff --git a/datahub-web-react/src/images/assertion_error_dot.svg b/datahub-web-react/src/images/assertion_error_dot.svg
new file mode 100644
index 00000000000000..d6a26665aa8653
--- /dev/null
+++ b/datahub-web-react/src/images/assertion_error_dot.svg
@@ -0,0 +1,8 @@
+<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="16" height="16" rx="8" fill="#FFFDED"/>
+<rect x="0.5" y="0.5" width="16" height="16" rx="8" fill="#FFFDED"/>
+<rect x="0.5" y="0.5" width="16" height="16" rx="8" fill="#FFFDED"/>
+<rect x="0.5" y="0.5" width="16" height="16" rx="8" fill="#FFFDED"/>
+<rect x="0.5" y="0.5" width="16" height="16" rx="8" stroke="#EEAD1C"/>
+<circle cx="8.5" cy="8.5" r="4.5" fill="#EEAD1C"/>
+</svg>
diff --git a/datahub-web-react/src/images/assertion_failure_dot.svg b/datahub-web-react/src/images/assertion_failure_dot.svg
new file mode 100644
index 00000000000000..40399e84adab7e
--- /dev/null
+++ b/datahub-web-react/src/images/assertion_failure_dot.svg
@@ -0,0 +1,5 @@
+<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="16" height="16" rx="8" fill="#FFF0F0"/>
+<rect x="0.5" y="0.5" width="16" height="16" rx="8" stroke="#CF1322"/>
+<circle cx="8.5" cy="8.5" r="4.5" fill="#CF1322"/>
+</svg>
diff --git a/datahub-web-react/src/images/assertion_init_dot.svg b/datahub-web-react/src/images/assertion_init_dot.svg
new file mode 100644
index 00000000000000..d122ce2a09c65e
--- /dev/null
+++ b/datahub-web-react/src/images/assertion_init_dot.svg
@@ -0,0 +1,5 @@
+<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="16" height="16" rx="8" fill="#EDF8FF"/>
+<rect x="0.5" y="0.5" width="16" height="16" rx="8" stroke="#2F54EB"/>
+<circle cx="8.5" cy="8.5" r="4.5" fill="#2F54EB"/>
+</svg>
diff --git a/datahub-web-react/src/images/assertion_no_results_dot.svg b/datahub-web-react/src/images/assertion_no_results_dot.svg
new file mode 100644
index 00000000000000..706979e7ccd314
--- /dev/null
+++ b/datahub-web-react/src/images/assertion_no_results_dot.svg
@@ -0,0 +1,5 @@
+<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="16" height="16" rx="8" fill="#F3F3F3"/>
+<rect x="0.5" y="0.5" width="16" height="16" rx="8" stroke="#8A8A8A"/>
+<circle cx="8.5" cy="8.5" r="4.5" fill="#8A8A8A"/>
+</svg>
diff --git a/datahub-web-react/src/images/assertion_success_dot.svg b/datahub-web-react/src/images/assertion_success_dot.svg
new file mode 100644
index 00000000000000..8248a6c6090de9
--- /dev/null
+++ b/datahub-web-react/src/images/assertion_success_dot.svg
@@ -0,0 +1,5 @@
+<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="16" height="16" rx="8" fill="#EDFFF6"/>
+<rect x="0.5" y="0.5" width="16" height="16" rx="8" stroke="#389E0D"/>
+<circle cx="8.5" cy="8.5" r="4.5" fill="#389E0D"/>
+</svg>
diff --git a/datahub-web-react/src/images/assertion_v2_failure_dot.svg b/datahub-web-react/src/images/assertion_v2_failure_dot.svg
new file mode 100644
index 00000000000000..5b7183b8d07978
--- /dev/null
+++ b/datahub-web-react/src/images/assertion_v2_failure_dot.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="12" cy="12" r="7.5" fill="#C4360B" stroke="#F3DACE" stroke-width="3"/>
+</svg>
diff --git a/datahub-web-react/src/images/assertion_v2_success_dot.svg b/datahub-web-react/src/images/assertion_v2_success_dot.svg
new file mode 100644
index 00000000000000..e4f25d4441ca38
--- /dev/null
+++ b/datahub-web-react/src/images/assertion_v2_success_dot.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="12" cy="12" r="7.5" fill="#0D7543" stroke="#E1F0D6" stroke-width="3"/>
+</svg>
diff --git a/datahub-web-react/src/images/datahub-platforms.svg b/datahub-web-react/src/images/datahub-platforms.svg
new file mode 100644
index 00000000000000..f40f15394ee3e1
--- /dev/null
+++ b/datahub-web-react/src/images/datahub-platforms.svg
@@ -0,0 +1,317 @@
+<svg width="620" height="1024" viewBox="0 0 620 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="620" height="1024" fill="url(#paint0_linear_2_30132)"/>
+<g filter="url(#filter0_dd_2_30132)">
+<path d="M264 519C264 493.595 284.595 473 310 473V473C335.405 473 356 493.595 356 519V519C356 544.405 335.405 565 310 565V565C284.595 565 264 544.405 264 519V519Z" fill="white" shape-rendering="crispEdges"/>
+<path d="M310 563.5C285.423 563.5 265.5 543.577 265.5 519C265.5 494.423 285.423 474.5 310 474.5C334.577 474.5 354.5 494.423 354.5 519C354.5 543.577 334.577 563.5 310 563.5Z" stroke="url(#paint1_linear_2_30132)" stroke-width="3" shape-rendering="crispEdges"/>
+<path d="M314.744 533.854C312.366 534.687 309.823 534.946 307.324 534.608C304.826 534.269 302.444 533.344 300.377 531.909C298.309 530.474 296.616 528.57 295.436 526.355C294.256 524.139 293.624 521.676 293.592 519.17C293.56 516.663 294.129 514.185 295.252 511.94C296.375 509.696 298.019 507.75 300.049 506.263C302.079 504.776 304.436 503.791 306.925 503.39C309.414 502.989 311.964 503.183 314.362 503.956C314.713 504.068 315.094 504.044 315.429 503.89C315.764 503.736 316.028 503.463 316.169 503.124C316.25 502.934 316.289 502.73 316.286 502.524C316.283 502.318 316.236 502.115 316.15 501.927C316.063 501.74 315.938 501.573 315.783 501.436C315.628 501.3 315.446 501.197 315.248 501.134C313.438 500.551 311.55 500.246 309.647 500.23C306.377 500.195 303.155 501.006 300.296 502.585C297.438 504.164 295.042 506.456 293.344 509.234C291.647 512.013 290.706 515.183 290.615 518.433C290.524 521.683 291.286 524.9 292.825 527.769L286.998 531.43C286.239 530.901 285.31 530.665 284.388 530.769C283.657 530.852 282.965 531.143 282.396 531.608C281.827 532.072 281.405 532.69 281.181 533.387C280.957 534.084 280.94 534.831 281.133 535.537C281.325 536.244 281.719 536.88 282.267 537.369C282.814 537.858 283.492 538.18 284.22 538.295C284.947 538.41 285.692 538.314 286.365 538.018C287.038 537.722 287.611 537.239 288.015 536.627C288.419 536.015 288.636 535.3 288.641 534.568C288.639 534.359 288.62 534.151 288.584 533.945L294.425 530.272C296.834 533.444 300.194 535.773 304.021 536.921C307.848 538.07 311.943 537.979 315.715 536.661C315.909 536.593 316.087 536.485 316.238 536.345C316.389 536.205 316.508 536.035 316.589 535.847C316.671 535.658 316.711 535.455 316.709 535.25C316.708 535.045 316.663 534.842 316.578 534.655C316.429 534.317 316.158 534.047 315.818 533.899C315.479 533.75 315.095 533.734 314.744 533.854Z" fill="url(#paint2_linear_2_30132)"/>
+<path d="M309.456 529.991C309.457 529.631 309.59 529.283 309.829 529.013C310.069 528.744 310.4 528.57 310.759 528.525C313.082 528.211 315.212 527.072 316.754 525.316C318.296 523.561 319.146 521.31 319.146 518.979C319.146 516.648 318.296 514.397 316.754 512.642C315.212 510.886 313.082 509.747 310.759 509.433C310.4 509.387 310.07 509.213 309.83 508.944C309.591 508.674 309.458 508.327 309.456 507.967C309.455 507.758 309.499 507.552 309.584 507.361C309.67 507.17 309.795 507 309.952 506.861C310.109 506.722 310.293 506.617 310.494 506.555C310.694 506.492 310.906 506.472 311.114 506.497C314.162 506.894 316.961 508.379 318.988 510.675C321.016 512.972 322.134 515.923 322.134 518.979C322.134 522.035 321.016 524.986 318.988 527.283C316.961 529.579 314.162 531.064 311.114 531.461C310.906 531.486 310.694 531.466 310.494 531.403C310.293 531.341 310.109 531.236 309.952 531.097C309.795 530.958 309.67 530.788 309.584 530.597C309.499 530.406 309.455 530.2 309.456 529.991Z" fill="url(#paint3_linear_2_30132)"/>
+<path d="M334.914 497.449C334.371 497.488 333.842 497.641 333.364 497.899C332.885 498.158 332.468 498.514 332.139 498.946C331.811 499.378 331.579 499.874 331.459 500.402C331.339 500.93 331.334 501.477 331.445 502.007L328.931 503.588C326.766 500.878 324.053 498.65 320.968 497.048C317.882 495.446 314.493 494.506 311.019 494.289C310.818 494.278 310.617 494.308 310.428 494.377C310.239 494.446 310.066 494.552 309.92 494.69C309.774 494.828 309.657 494.993 309.578 495.177C309.498 495.361 309.457 495.559 309.456 495.759C309.459 496.137 309.606 496.501 309.869 496.775C310.132 497.048 310.49 497.212 310.87 497.233C316.364 497.592 321.521 499.993 325.318 503.957C329.114 507.921 331.273 513.16 331.364 518.633C331.552 530.598 321.526 540.74 309.487 540.756C304.206 540.777 299.098 538.887 295.117 535.438C294.874 535.225 294.567 535.097 294.244 535.073C293.92 535.049 293.598 535.13 293.325 535.305C293.131 535.43 292.969 535.597 292.851 535.795C292.734 535.993 292.664 536.215 292.648 536.444C292.631 536.674 292.669 536.903 292.757 537.116C292.846 537.328 292.983 537.517 293.157 537.667C297.799 541.691 303.785 543.845 309.942 543.707C314.328 543.626 318.614 542.393 322.366 540.133C326.118 537.873 329.202 534.666 331.304 530.839C333.407 527.011 334.454 522.699 334.339 518.339C334.224 513.979 332.952 509.727 330.65 506.015L333.145 504.446C333.655 504.765 334.235 504.96 334.836 505.014C335.437 505.068 336.042 504.98 336.602 504.757C337.162 504.534 337.66 504.182 338.057 503.73C338.454 503.278 338.738 502.74 338.885 502.158C339.032 501.576 339.039 500.968 338.904 500.384C338.77 499.799 338.498 499.254 338.111 498.794C337.724 498.334 337.233 497.972 336.678 497.737C336.123 497.502 335.52 497.4 334.918 497.442L334.914 497.449Z" fill="url(#paint4_linear_2_30132)"/>
+</g>
+<circle cx="309.5" cy="518.5" r="69" stroke="#5F6685" stroke-opacity="0.2" stroke-width="1.5" stroke-linecap="round" stroke-dasharray="0.29 3.44"/>
+<circle cx="308.5" cy="518.5" r="103.5" stroke="#5F6685" stroke-opacity="0.2" stroke-width="1.5" stroke-linecap="round" stroke-dasharray="0.29 3.44"/>
+<circle cx="309.25" cy="519.25" r="155.25" stroke="#5F6685" stroke-opacity="0.2" stroke-width="1.5" stroke-linecap="round" stroke-dasharray="0.29 3.44"/>
+<circle cx="309.5" cy="519.5" r="202.5" stroke="#5F6685" stroke-opacity="0.2" stroke-width="1.5" stroke-linecap="round" stroke-dasharray="0.29 3.44"/>
+<circle cx="309.5" cy="519.5" r="259.5" stroke="#5F6685" stroke-opacity="0.2" stroke-width="1.5" stroke-linecap="round" stroke-dasharray="0.29 3.44"/>
+<g filter="url(#filter1_dd_2_30132)">
+<path d="M402 416C402 404.954 410.954 396 422 396C433.046 396 442 404.954 442 416C442 427.046 433.046 436 422 436C410.954 436 402 427.046 402 416Z" fill="white"/>
+<path d="M402.75 416C402.75 405.369 411.369 396.75 422 396.75C432.631 396.75 441.25 405.369 441.25 416C441.25 426.631 432.631 435.25 422 435.25C411.369 435.25 402.75 426.631 402.75 416Z" stroke="url(#paint5_linear_2_30132)" stroke-width="1.5"/>
+<path d="M419.239 419.359C420.049 419.417 420.691 420.083 420.707 420.899L420.708 420.932V427.126C420.708 427.999 419.996 428.706 419.121 428.706C418.254 428.706 417.55 428.016 417.534 427.157L417.533 427.126V423.661L414.512 425.395C413.755 425.834 412.786 425.574 412.346 424.82C411.914 424.074 412.16 423.121 412.896 422.676L412.926 422.659L418.318 419.565C418.608 419.398 418.93 419.333 419.239 419.359ZM425.643 419.544L425.681 419.565L431.072 422.659C431.832 423.095 432.09 424.064 431.653 424.82C431.221 425.564 430.27 425.827 429.517 425.412L429.487 425.395L426.468 423.661V427.126C426.468 427.999 425.758 428.706 424.88 428.706C424.012 428.706 423.31 428.016 423.293 427.157L423.293 427.126V420.932C423.293 420.101 423.939 419.418 424.762 419.359C425.057 419.334 425.363 419.392 425.643 419.544ZM411.635 411.511L411.664 411.528L417.053 414.623C417.432 414.841 417.684 415.186 417.791 415.571C417.827 415.696 417.843 415.82 417.849 415.944C417.853 416.116 417.831 416.29 417.777 416.458C417.667 416.813 417.433 417.13 417.089 417.339L417.053 417.36L411.664 420.457C410.904 420.893 409.934 420.635 409.497 419.881C409.063 419.133 409.31 418.185 410.048 417.74L410.077 417.722L413.088 415.995L410.077 414.262C409.317 413.825 409.057 412.862 409.497 412.107C409.928 411.361 410.879 411.099 411.635 411.511ZM434.504 412.107C434.943 412.862 434.683 413.825 433.923 414.262L430.912 415.995L433.923 417.722C434.683 418.16 434.943 419.124 434.504 419.881C434.065 420.635 433.094 420.893 432.336 420.457L426.944 417.36C426.584 417.152 426.335 416.825 426.224 416.458C426.171 416.29 426.147 416.116 426.153 415.944C426.156 415.82 426.174 415.696 426.209 415.571C426.317 415.186 426.569 414.841 426.944 414.623L432.336 411.528C433.094 411.092 434.065 411.351 434.504 412.107ZM422.329 413.04C422.42 413.04 422.546 413.092 422.61 413.158L424.851 415.384C424.915 415.448 424.967 415.574 424.967 415.665V416.322C424.967 416.411 424.915 416.537 424.851 416.6L422.61 418.827C422.546 418.892 422.422 418.946 422.329 418.946H421.669C421.579 418.946 421.453 418.892 421.388 418.827L419.148 416.6C419.084 416.537 419.032 416.411 419.032 416.322V415.665C419.032 415.574 419.084 415.448 419.148 415.384L421.388 413.158C421.453 413.092 421.579 413.04 421.669 413.04H422.329ZM422.011 414.941H421.986C421.896 414.941 421.77 414.994 421.707 415.057L421.058 415.7C420.993 415.766 420.943 415.892 420.943 415.982V416.007C420.943 416.096 420.993 416.22 421.058 416.285L421.707 416.929C421.771 416.993 421.896 417.045 421.986 417.045H422.011C422.102 417.045 422.228 416.993 422.292 416.929L422.941 416.285C423.005 416.22 423.06 416.096 423.06 416.007V415.982C423.06 415.892 423.005 415.766 422.941 415.7L422.292 415.057C422.228 414.994 422.102 414.941 422.011 414.941ZM424.88 403.281C425.747 403.281 426.451 403.972 426.467 404.828L426.468 404.859V408.325L429.487 406.589C430.246 406.153 431.215 406.412 431.653 407.166C432.084 407.914 431.839 408.864 431.102 409.308L431.072 409.326L425.681 412.422C425.391 412.588 425.07 412.653 424.762 412.628C423.95 412.568 423.31 411.902 423.293 411.086L423.293 411.053V404.859C423.293 403.989 424.001 403.281 424.88 403.281ZM419.121 403.281C419.985 403.281 420.69 403.972 420.707 404.828L420.708 404.859V411.053C420.708 411.884 420.06 412.568 419.239 412.628C418.943 412.652 418.636 412.593 418.356 412.443L418.318 412.422L412.926 409.326C412.167 408.889 411.908 407.924 412.346 407.166C412.78 406.421 413.729 406.16 414.482 406.573L414.512 406.589L417.533 408.325V404.859C417.533 403.989 418.243 403.281 419.121 403.281Z" fill="#29B5E8"/>
+</g>
+<g filter="url(#filter2_dd_2_30132)">
+<path d="M332 774C332 762.954 340.954 754 352 754C363.046 754 372 762.954 372 774C372 785.046 363.046 794 352 794C340.954 794 332 785.046 332 774Z" fill="white"/>
+<path d="M332.75 774C332.75 763.369 341.369 754.75 352 754.75C362.631 754.75 371.25 763.369 371.25 774C371.25 784.631 362.631 793.25 352 793.25C341.369 793.25 332.75 784.631 332.75 774Z" stroke="url(#paint6_linear_2_30132)" stroke-width="1.5"/>
+<path d="M344.501 785.211L338.543 774.891C338.387 774.62 338.304 774.313 338.304 774C338.304 773.687 338.387 773.38 338.543 773.109L344.501 762.789C344.657 762.518 344.882 762.293 345.152 762.137C345.423 761.981 345.729 761.898 346.042 761.898H357.964C358.276 761.899 358.581 761.982 358.85 762.139C359.12 762.295 359.343 762.519 359.499 762.789L365.457 773.109C365.613 773.38 365.696 773.687 365.696 774C365.696 774.313 365.613 774.62 365.457 774.891L359.499 785.211C359.343 785.482 359.118 785.707 358.848 785.863C358.577 786.02 358.27 786.102 357.958 786.103H346.039C345.727 786.102 345.421 786.019 345.151 785.862C344.881 785.706 344.657 785.482 344.501 785.211Z" fill="#4386FA"/>
+<path opacity="0.1" d="M355.722 770.677C355.722 770.677 357.379 774.65 355.12 776.902C352.862 779.154 348.75 777.713 348.75 777.713C348.75 777.713 354.863 783.905 357.115 786.099H357.964C358.277 786.099 358.583 786.016 358.854 785.86C359.124 785.704 359.349 785.479 359.505 785.208L363.449 778.378L355.722 770.677Z" fill="black"/>
+<path d="M357.678 778.806L355.847 776.976C355.828 776.955 355.805 776.938 355.78 776.924C356.554 775.922 356.918 774.662 356.796 773.401C356.674 772.141 356.075 770.974 355.123 770.139C354.171 769.304 352.936 768.863 351.67 768.907C350.404 768.951 349.202 769.476 348.31 770.375C347.418 771.274 346.902 772.479 346.867 773.746C346.833 775.012 347.282 776.243 348.124 777.19C348.966 778.136 350.138 778.725 351.399 778.838C352.661 778.951 353.918 778.578 354.914 777.796C354.927 777.82 354.944 777.841 354.963 777.86L356.793 779.691C356.82 779.718 356.851 779.739 356.886 779.753C356.921 779.768 356.958 779.775 356.996 779.775C357.033 779.775 357.071 779.768 357.106 779.753C357.14 779.739 357.172 779.718 357.199 779.691L357.678 779.212C357.705 779.185 357.726 779.153 357.74 779.119C357.755 779.084 357.762 779.047 357.762 779.009C357.762 778.971 357.755 778.934 357.74 778.899C357.726 778.864 357.705 778.833 357.678 778.806ZM351.845 777.622C351.105 777.622 350.381 777.403 349.765 776.991C349.149 776.58 348.669 775.995 348.386 775.311C348.102 774.627 348.028 773.874 348.173 773.147C348.317 772.421 348.674 771.754 349.198 771.23C349.721 770.706 350.388 770.35 351.115 770.205C351.841 770.061 352.594 770.135 353.278 770.418C353.963 770.702 354.547 771.182 354.959 771.797C355.37 772.413 355.59 773.137 355.59 773.878C355.59 774.37 355.493 774.856 355.305 775.311C355.117 775.765 354.841 776.178 354.493 776.526C354.145 776.873 353.733 777.149 353.278 777.337C352.824 777.526 352.337 777.622 351.845 777.622Z" fill="white"/>
+<path d="M349.452 773.678V775.226C349.69 775.647 350.035 775.997 350.452 776.242V773.669L349.452 773.678Z" fill="white"/>
+<path d="M349.452 773.678V775.226C349.69 775.647 350.035 775.997 350.452 776.242V773.669L349.452 773.678Z" fill="white"/>
+<path d="M351.324 772.395V776.577C351.655 776.638 351.994 776.638 352.325 776.577V772.395H351.324Z" fill="white"/>
+<path d="M351.324 772.395V776.577C351.655 776.638 351.994 776.638 352.325 776.577V772.395H351.324Z" fill="white"/>
+<path d="M354.22 775.223V774.306H353.219V776.236C353.636 775.992 353.981 775.642 354.22 775.223Z" fill="white"/>
+<path d="M354.22 775.223V774.306H353.219V776.236C353.636 775.992 353.981 775.642 354.22 775.223Z" fill="white"/>
+</g>
+<g filter="url(#filter3_dd_2_30132)">
+<path d="M201 390C201 378.954 209.954 370 221 370C232.046 370 241 378.954 241 390C241 401.046 232.046 410 221 410C209.954 410 201 401.046 201 390Z" fill="white"/>
+<path d="M201.75 390C201.75 379.369 210.369 370.75 221 370.75C231.631 370.75 240.25 379.369 240.25 390C240.25 400.631 231.631 409.25 221 409.25C210.369 409.25 201.75 400.631 201.75 390Z" stroke="url(#paint7_linear_2_30132)" stroke-width="1.5"/>
+<path d="M221 396.73L231.682 399.033V380.916L221 383.219V396.73Z" fill="#205B97"/>
+<path d="M231.682 380.916L233.717 381.837V398.112L231.682 399.033V380.916ZM220.999 396.73L210.317 399.033V380.916L220.999 383.219V396.73Z" fill="#5193CE"/>
+<path d="M210.317 380.916L208.283 381.837V398.112L210.317 399.033V380.916Z" fill="#205B97"/>
+<path d="M223.713 402.717L227.783 400.875V379.125L223.713 377.283L222.469 389.36L223.713 402.717Z" fill="#5193CE"/>
+<path d="M218.286 402.717L214.216 400.875V379.125L218.286 377.283L219.53 389.36L218.286 402.717Z" fill="#205B97"/>
+<path d="M218.286 377.283H223.768V402.666H218.286V377.283Z" fill="#2E73B7"/>
+</g>
+<g filter="url(#filter4_dd_2_30132)">
+<path d="M196 642C196 630.954 204.954 622 216 622V622C227.046 622 236 630.954 236 642V642C236 653.046 227.046 662 216 662V662C204.954 662 196 653.046 196 642V642Z" fill="white"/>
+<path d="M216 661.25C205.369 661.25 196.75 652.631 196.75 642C196.75 631.369 205.369 622.75 216 622.75C226.631 622.75 235.25 631.369 235.25 642C235.25 652.631 226.631 661.25 216 661.25Z" stroke="url(#paint8_linear_2_30132)" stroke-width="1.5"/>
+<g clip-path="url(#clip0_2_30132)">
+<path d="M215.906 626.468L216.741 628.035C216.928 628.325 217.131 628.581 217.371 628.819C218.073 629.512 218.727 630.252 219.329 631.033C220.743 632.89 221.696 634.951 222.377 637.181C222.786 638.543 223.008 639.94 223.024 641.353C223.093 645.577 221.645 649.204 218.725 652.219C218.25 652.697 217.737 653.135 217.191 653.53C216.902 653.53 216.765 653.308 216.646 653.104C216.429 652.725 216.284 652.309 216.22 651.878C216.117 651.367 216.05 650.856 216.083 650.328V650.09C216.06 650.039 215.805 626.588 215.906 626.468Z" fill="#599636"/>
+<path d="M215.906 626.416C215.872 626.348 215.837 626.4 215.803 626.433C215.82 626.775 215.701 627.08 215.514 627.371C215.309 627.66 215.037 627.882 214.764 628.12C213.25 629.432 212.058 631.016 211.103 632.787C209.833 635.171 209.178 637.726 208.993 640.416C208.908 641.387 209.3 644.81 209.605 645.798C210.44 648.421 211.939 650.618 213.88 652.525C214.357 652.985 214.867 653.411 215.395 653.82C215.548 653.82 215.565 653.683 215.6 653.582C215.667 653.364 215.718 653.142 215.753 652.917L216.095 650.363L215.906 626.416Z" fill="#6CAC48"/>
+<path d="M216.74 654.568C216.775 654.177 216.962 653.852 217.167 653.529C216.961 653.444 216.809 653.275 216.69 653.086C216.587 652.908 216.502 652.72 216.436 652.524C216.197 651.809 216.146 651.059 216.078 650.328V649.885C215.993 649.954 215.975 650.532 215.975 650.618C215.926 651.391 215.823 652.159 215.669 652.917C215.618 653.224 215.584 653.53 215.395 653.803C215.395 653.837 215.395 653.871 215.412 653.922C215.718 654.825 215.802 655.744 215.854 656.681V657.023C215.854 657.431 215.838 657.345 216.177 657.482C216.313 657.533 216.466 657.551 216.603 657.652C216.705 657.652 216.722 657.567 216.722 657.499L216.671 656.937V655.37C216.655 655.096 216.705 654.825 216.74 654.569L216.74 654.568Z" fill="#C2BFBF"/>
+</g>
+</g>
+<g filter="url(#filter5_dd_2_30132)">
+<path d="M117 715C117 703.954 125.954 695 137 695C148.046 695 157 703.954 157 715C157 726.046 148.046 735 137 735C125.954 735 117 726.046 117 715Z" fill="white"/>
+<path d="M117.75 715C117.75 704.369 126.369 695.75 137 695.75C147.631 695.75 156.25 704.369 156.25 715C156.25 725.631 147.631 734.25 137 734.25C126.369 734.25 117.75 725.631 117.75 715Z" stroke="url(#paint9_linear_2_30132)" stroke-width="1.5"/>
+<path d="M144.888 703.863C142.233 705.806 139.673 707.675 136.974 709.662V706.486C134.133 706.534 131.929 707.694 130.246 709.869C127.924 712.876 127.949 715.927 130.268 720.566C128.967 721.511 127.643 722.483 126.337 723.454C122.853 719.997 121.788 712.048 126.289 706.464C130.79 700.831 139.06 699.582 144.888 703.863Z" fill="#45C8EB"/>
+<path d="M143.605 709.234C144.937 708.266 146.216 707.32 147.496 706.371C151.287 710.301 152.326 718.486 147.185 724.167C142.067 729.818 133.967 729.774 129.37 726.272L137.285 720.451V723.62C140.317 723.55 142.636 722.32 144.227 719.93C146.642 716.311 146.187 712.735 143.605 709.234Z" fill="#0494E0"/>
+</g>
+<g filter="url(#filter6_dd_2_30132)">
+<path d="M429 663C429 651.954 437.954 643 449 643C460.046 643 469 651.954 469 663C469 674.046 460.046 683 449 683C437.954 683 429 674.046 429 663Z" fill="white"/>
+<path d="M429.75 663C429.75 652.369 438.369 643.75 449 643.75C459.631 643.75 468.25 652.369 468.25 663C468.25 673.631 459.631 682.25 449 682.25C438.369 682.25 429.75 673.631 429.75 663Z" stroke="url(#paint10_linear_2_30132)" stroke-width="1.5"/>
+<path d="M436.283 665.259V669.498L449 676.151L461.718 669.498V665.259L457.231 662.969L461.718 660.617V656.409V656.378L461.687 656.409L449 649.849L436.314 656.378H436.283V660.617L440.769 662.969L436.283 665.259Z" fill="#DB1905"/>
+<path d="M436.283 665.259L449 671.911L461.718 665.259L457.231 662.969L449 667.27L440.769 662.969L436.283 665.259Z" fill="#FF5224"/>
+<path d="M461.718 656.409L449 663.062L436.283 656.409L449 649.849L461.718 656.409Z" fill="#FF5224"/>
+</g>
+<g filter="url(#filter7_dd_2_30132)">
+<path d="M86 527C86 515.954 94.9543 507 106 507C117.046 507 126 515.954 126 527C126 538.046 117.046 547 106 547C94.9543 547 86 538.046 86 527Z" fill="white"/>
+<path d="M86.75 527C86.75 516.369 95.3685 507.75 106 507.75C116.631 507.75 125.25 516.369 125.25 527C125.25 537.631 116.631 546.25 106 546.25C95.3685 546.25 86.75 537.631 86.75 527Z" stroke="url(#paint11_linear_2_30132)" stroke-width="1.5"/>
+<path d="M112.149 532.65C112.312 531.337 112.263 531.144 113.271 531.357L113.527 531.379C114.302 531.413 115.316 531.258 115.912 530.989C117.194 530.412 117.954 529.449 116.69 529.702C113.806 530.279 113.607 529.332 113.607 529.332C116.653 524.948 117.926 519.383 116.827 518.021C113.83 514.306 108.642 516.063 108.555 516.108L108.527 516.113C107.957 515.999 107.319 515.93 106.603 515.919C105.298 515.898 104.308 516.251 103.556 516.803C103.556 516.803 94.3008 513.104 94.7314 521.456C94.8229 523.232 97.3563 534.898 100.378 531.375C101.482 530.086 102.549 528.997 102.549 528.997C103.079 529.338 103.714 529.512 104.379 529.45L104.431 529.407C104.415 529.567 104.422 529.724 104.451 529.909C103.673 530.753 103.902 530.901 102.346 531.212C100.771 531.526 101.696 532.087 102.3 532.233C103.032 532.411 104.726 532.663 105.87 531.108L105.825 531.286C106.13 531.523 106.11 532.989 106.153 534.037C106.196 535.084 106.269 536.062 106.489 536.638C106.709 537.215 106.969 538.699 109.014 538.274C110.723 537.919 112.03 537.407 112.149 532.65Z" fill="black" stroke="black" stroke-width="2.50172"/>
+<path d="M116.69 529.702C113.806 530.279 113.608 529.331 113.608 529.331C116.653 524.947 117.926 519.383 116.828 518.021C113.83 514.306 108.642 516.063 108.555 516.108L108.527 516.113C107.958 515.998 107.32 515.93 106.603 515.919C105.298 515.898 104.308 516.251 103.557 516.803C103.557 516.803 94.3009 513.104 94.7314 521.455C94.8229 523.232 97.3563 534.898 100.378 531.375C101.482 530.086 102.549 528.997 102.549 528.997C103.079 529.338 103.714 529.512 104.379 529.45L104.431 529.407C104.415 529.567 104.422 529.724 104.451 529.909C103.673 530.753 103.902 530.901 102.346 531.212C100.771 531.526 101.696 532.087 102.3 532.233C103.032 532.411 104.726 532.663 105.87 531.108L105.825 531.286C106.13 531.523 106.344 532.827 106.308 534.01C106.272 535.192 106.248 536.004 106.489 536.638C106.729 537.273 106.968 538.699 109.014 538.274C110.723 537.919 111.609 536.998 111.732 535.462C111.82 534.37 112.018 534.531 112.03 533.555L112.189 533.093C112.372 531.612 112.218 531.135 113.271 531.357L113.527 531.379C114.302 531.413 115.317 531.258 115.912 530.989C117.194 530.412 117.954 529.448 116.69 529.702H116.69Z" fill="#336791"/>
+<path d="M105.994 530.55C105.914 533.305 106.014 536.078 106.292 536.752C106.57 537.427 107.165 538.738 109.21 538.313C110.919 537.957 111.541 537.269 111.811 535.751C112.01 534.634 112.393 531.531 112.442 530.896M103.542 516.742C103.542 516.742 94.2798 513.069 94.7104 521.421C94.8019 523.197 97.3354 534.864 100.357 531.34C101.461 530.051 102.46 529.041 102.46 529.041M108.545 516.071C108.224 516.169 113.697 514.131 116.807 517.986C117.905 519.348 116.632 524.913 113.587 529.297" stroke="white" stroke-width="0.833905" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M113.587 529.297C113.587 529.297 113.785 530.245 116.67 529.667C117.934 529.414 117.173 530.378 115.891 530.955C114.839 531.429 112.481 531.55 112.442 530.896C112.343 529.207 113.684 529.72 113.587 529.297ZM113.587 529.297C113.499 528.916 112.9 528.542 112.503 527.609C112.157 526.795 107.756 520.553 113.724 521.48C113.943 521.436 112.167 515.973 106.582 515.884C100.998 515.795 101.181 522.546 101.181 522.546" stroke="white" stroke-width="0.833905" stroke-linecap="round" stroke-linejoin="bevel"/>
+<path d="M104.431 529.874C103.652 530.718 103.881 530.866 102.325 531.177C100.751 531.492 101.676 532.052 102.279 532.199C103.012 532.376 104.705 532.628 105.85 531.073C106.198 530.6 105.848 529.845 105.369 529.652C105.138 529.559 104.828 529.443 104.431 529.874Z" stroke="white" stroke-width="0.833905" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M104.38 529.86C104.302 529.364 104.548 528.773 104.812 528.083C105.209 527.047 106.125 526.01 105.392 522.724C104.846 520.274 101.184 522.214 101.181 522.546C101.179 522.878 101.347 524.229 101.12 525.803C100.824 527.856 102.467 529.593 104.359 529.415" stroke="white" stroke-width="0.833905" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M103.509 522.496C103.492 522.61 103.723 522.912 104.023 522.953C104.323 522.993 104.58 522.757 104.597 522.643C104.613 522.53 104.383 522.405 104.082 522.364C103.782 522.324 103.525 522.383 103.509 522.496H103.509Z" fill="white" stroke="white" stroke-width="0.277966"/>
+<path d="M112.65 522.265C112.666 522.378 112.436 522.681 112.135 522.721C111.835 522.762 111.578 522.526 111.561 522.412C111.545 522.299 111.776 522.174 112.076 522.133C112.377 522.093 112.633 522.152 112.65 522.265V522.265Z" fill="white" stroke="white" stroke-width="0.138983"/>
+<path d="M113.724 521.48C113.774 522.37 113.526 522.976 113.495 523.923C113.449 525.299 114.172 526.875 113.083 528.453" stroke="white" stroke-width="0.833905" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<g filter="url(#filter8_dd_2_30132)">
+<path d="M481 333C481 321.954 489.954 313 501 313C512.046 313 521 321.954 521 333C521 344.046 512.046 353 501 353C489.954 353 481 344.046 481 333Z" fill="white"/>
+<path d="M481.75 333C481.75 322.369 490.369 313.75 501 313.75C511.631 313.75 520.25 322.369 520.25 333C520.25 343.631 511.631 352.25 501 352.25C490.369 352.25 481.75 343.631 481.75 333Z" stroke="url(#paint12_linear_2_30132)" stroke-width="1.5"/>
+<path d="M500.586 321.159V322.369H498.464V323.156H500.586V325.566H501.415V323.156H503.59V322.369H501.415V319.954H500.586V321.159Z" fill="#7099A6"/>
+<path d="M493.651 324.228V325.984H490.439V327.085H493.651V330.651H494.842V327.085H498.102V325.984H494.842V322.472H493.651V324.228Z" fill="#EB912C"/>
+<path d="M507.11 324.228V325.984H503.898V327.14H507.11V330.651H508.349V327.14H511.561V325.984H508.349V322.472H507.11V324.228Z" fill="#59879B"/>
+<path d="M500.277 330.208V332.176H496.704V333.641H500.277V337.576H501.723V333.641H505.296V332.176H501.723V328.241H500.277V330.208Z" fill="#E8762C"/>
+<path d="M510.784 331.202V332.436H508.609V333.435H510.784V335.899H511.869V333.435H514.044V332.436H511.869V329.972H510.784V331.202Z" fill="#5B6591"/>
+<path d="M490.078 331.31V332.49H487.957V333.326H490.078V335.687H490.908V333.326L493.082 333.248V332.49H490.908V330.13H490.078V331.31Z" fill="#7099A6"/>
+<path d="M493.651 336.867V338.623H490.439V339.779H493.651V343.29H494.89V339.779H498.102V338.623H494.89V335.112H493.651V336.867Z" fill="#C72035"/>
+<path d="M507.11 336.867V338.623H503.898V339.725H507.11V343.29H508.349V339.725H511.561V338.623H508.349V335.112H507.11V336.867Z" fill="#1F447E"/>
+<path d="M500.484 341.328V342.558H498.309V343.556H500.484V346.02H501.569V343.556H503.743V342.558H501.569V340.094H500.484V341.328Z" fill="#5B6591"/>
+</g>
+<g filter="url(#filter9_dd_2_30132)">
+<path d="M295 259C295 247.954 303.954 239 315 239C326.046 239 335 247.954 335 259C335 270.046 326.046 279 315 279C303.954 279 295 270.046 295 259Z" fill="white"/>
+<path d="M295.75 259C295.75 248.369 304.369 239.75 315 239.75C325.631 239.75 334.25 248.369 334.25 259C334.25 269.631 325.631 278.25 315 278.25C304.369 278.25 295.75 269.631 295.75 259Z" stroke="url(#paint13_linear_2_30132)" stroke-width="1.5"/>
+<path d="M325.741 248.237C326.293 248.768 326.654 249.469 326.739 250.233C326.739 250.551 326.654 250.764 326.463 251.167C326.272 251.57 323.915 255.646 323.215 256.771C322.811 257.429 322.599 258.215 322.599 258.979C322.599 259.764 322.811 260.528 323.215 261.187C323.915 262.312 326.272 266.409 326.463 266.812C326.654 267.215 326.739 267.406 326.739 267.725C326.654 268.489 326.314 269.189 325.762 269.699C325.231 270.251 324.531 270.612 323.788 270.675C323.469 270.675 323.257 270.591 322.875 270.399C322.493 270.208 318.332 267.916 317.207 267.215C317.122 267.173 317.037 267.109 316.931 267.067L311.369 263.776C311.497 264.838 311.964 265.857 312.728 266.6C312.877 266.748 313.025 266.876 313.195 267.003C313.068 267.067 312.919 267.13 312.792 267.215C311.667 267.916 307.57 270.272 307.166 270.463C306.763 270.654 306.572 270.739 306.232 270.739C305.468 270.654 304.767 270.315 304.258 269.763C303.706 269.232 303.345 268.531 303.26 267.767C303.281 267.449 303.366 267.13 303.536 266.854C303.727 266.451 306.084 262.354 306.784 261.229C307.187 260.571 307.4 259.807 307.4 259.021C307.4 258.236 307.187 257.472 306.784 256.813C306.084 255.646 303.706 251.549 303.536 251.146C303.366 250.87 303.281 250.551 303.26 250.233C303.345 249.469 303.685 248.768 304.237 248.237C304.767 247.685 305.468 247.346 306.232 247.261C306.551 247.282 306.869 247.367 307.166 247.537C307.506 247.685 310.499 249.426 312.091 250.36L312.452 250.572C312.579 250.657 312.686 250.721 312.77 250.764L312.94 250.87L318.608 254.224C318.481 252.95 317.823 251.782 316.804 250.997C316.931 250.933 317.08 250.87 317.207 250.785C318.332 250.084 322.429 247.707 322.833 247.537C323.109 247.367 323.427 247.282 323.767 247.261C324.51 247.346 325.21 247.685 325.741 248.237ZM315.297 260.507L316.507 259.297C316.676 259.127 316.676 258.873 316.507 258.703L315.297 257.493C315.127 257.323 314.872 257.323 314.702 257.493L313.492 258.703C313.322 258.873 313.322 259.127 313.492 259.297L314.702 260.507C314.851 260.656 315.127 260.656 315.297 260.507Z" fill="#FF694A"/>
+</g>
+<defs>
+<filter id="filter0_dd_2_30132" x="240" y="464" width="140" height="144" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="19"/>
+<feGaussianBlur stdDeviation="12"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.705882 0 0 0 0 1 0 0 0 0.03 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_2_30132"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="6.5"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.639216 0 0 0 0 1 0 0 0 0.06 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_2_30132" result="effect2_dropShadow_2_30132"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_2_30132" result="shape"/>
+</filter>
+<filter id="filter1_dd_2_30132" x="390" y="392" width="64" height="64" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="8"/>
+<feGaussianBlur stdDeviation="6"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.705882 0 0 0 0 1 0 0 0 0.12 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_2_30132"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="2"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.639216 0 0 0 0 1 0 0 0 0.17 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_2_30132" result="effect2_dropShadow_2_30132"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_2_30132" result="shape"/>
+</filter>
+<filter id="filter2_dd_2_30132" x="320" y="750" width="64" height="64" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="8"/>
+<feGaussianBlur stdDeviation="6"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.705882 0 0 0 0 1 0 0 0 0.12 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_2_30132"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="2"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.639216 0 0 0 0 1 0 0 0 0.17 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_2_30132" result="effect2_dropShadow_2_30132"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_2_30132" result="shape"/>
+</filter>
+<filter id="filter3_dd_2_30132" x="189" y="366" width="64" height="64" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="8"/>
+<feGaussianBlur stdDeviation="6"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.705882 0 0 0 0 1 0 0 0 0.12 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_2_30132"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="2"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.639216 0 0 0 0 1 0 0 0 0.17 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_2_30132" result="effect2_dropShadow_2_30132"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_2_30132" result="shape"/>
+</filter>
+<filter id="filter4_dd_2_30132" x="184" y="618" width="64" height="64" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="8"/>
+<feGaussianBlur stdDeviation="6"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.705882 0 0 0 0 1 0 0 0 0.12 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_2_30132"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="2"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.639216 0 0 0 0 1 0 0 0 0.17 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_2_30132" result="effect2_dropShadow_2_30132"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_2_30132" result="shape"/>
+</filter>
+<filter id="filter5_dd_2_30132" x="105" y="691" width="64" height="64" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="8"/>
+<feGaussianBlur stdDeviation="6"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.705882 0 0 0 0 1 0 0 0 0.12 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_2_30132"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="2"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.639216 0 0 0 0 1 0 0 0 0.17 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_2_30132" result="effect2_dropShadow_2_30132"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_2_30132" result="shape"/>
+</filter>
+<filter id="filter6_dd_2_30132" x="417" y="639" width="64" height="64" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="8"/>
+<feGaussianBlur stdDeviation="6"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.705882 0 0 0 0 1 0 0 0 0.12 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_2_30132"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="2"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.639216 0 0 0 0 1 0 0 0 0.17 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_2_30132" result="effect2_dropShadow_2_30132"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_2_30132" result="shape"/>
+</filter>
+<filter id="filter7_dd_2_30132" x="74" y="503" width="64" height="64" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="8"/>
+<feGaussianBlur stdDeviation="6"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.705882 0 0 0 0 1 0 0 0 0.12 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_2_30132"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="2"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.639216 0 0 0 0 1 0 0 0 0.17 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_2_30132" result="effect2_dropShadow_2_30132"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_2_30132" result="shape"/>
+</filter>
+<filter id="filter8_dd_2_30132" x="469" y="309" width="64" height="64" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="8"/>
+<feGaussianBlur stdDeviation="6"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.705882 0 0 0 0 1 0 0 0 0.12 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_2_30132"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="2"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.639216 0 0 0 0 1 0 0 0 0.17 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_2_30132" result="effect2_dropShadow_2_30132"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_2_30132" result="shape"/>
+</filter>
+<filter id="filter9_dd_2_30132" x="283" y="235" width="64" height="64" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="8"/>
+<feGaussianBlur stdDeviation="6"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.705882 0 0 0 0 1 0 0 0 0.12 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_2_30132"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="2"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0980392 0 0 0 0 0.639216 0 0 0 0 1 0 0 0 0.17 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_2_30132" result="effect2_dropShadow_2_30132"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_2_30132" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_2_30132" x1="310" y1="0" x2="310" y2="1024" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F9FAFC"/>
+<stop offset="1" stop-color="#F5F7FA"/>
+</linearGradient>
+<linearGradient id="paint1_linear_2_30132" x1="310" y1="473" x2="310" y2="565" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1890FF"/>
+<stop offset="1" stop-color="#B3E3FF"/>
+</linearGradient>
+<linearGradient id="paint2_linear_2_30132" x1="315.78" y1="542.343" x2="294.816" y2="513.366" gradientUnits="userSpaceOnUse">
+<stop stop-color="#EFAB00"/>
+<stop offset="1" stop-color="#EFB700"/>
+</linearGradient>
+<linearGradient id="paint3_linear_2_30132" x1="312.715" y1="520.403" x2="318.653" y2="509.659" gradientUnits="userSpaceOnUse">
+<stop stop-color="#DD3163"/>
+<stop offset="1" stop-color="#FF5663"/>
+</linearGradient>
+<linearGradient id="paint4_linear_2_30132" x1="300.168" y1="531.016" x2="335.984" y2="500.555" gradientUnits="userSpaceOnUse">
+<stop offset="0.03" stop-color="#1890FF"/>
+<stop offset="1" stop-color="#18B5FF"/>
+</linearGradient>
+<linearGradient id="paint5_linear_2_30132" x1="422" y1="396" x2="422" y2="436" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1890FF"/>
+<stop offset="1" stop-color="#B3E3FF"/>
+</linearGradient>
+<linearGradient id="paint6_linear_2_30132" x1="352" y1="754" x2="352" y2="794" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1890FF"/>
+<stop offset="1" stop-color="#B3E3FF"/>
+</linearGradient>
+<linearGradient id="paint7_linear_2_30132" x1="221" y1="370" x2="221" y2="410" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1890FF"/>
+<stop offset="1" stop-color="#B3E3FF"/>
+</linearGradient>
+<linearGradient id="paint8_linear_2_30132" x1="216" y1="622" x2="216" y2="662" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1890FF"/>
+<stop offset="1" stop-color="#B3E3FF"/>
+</linearGradient>
+<linearGradient id="paint9_linear_2_30132" x1="137" y1="695" x2="137" y2="735" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1890FF"/>
+<stop offset="1" stop-color="#B3E3FF"/>
+</linearGradient>
+<linearGradient id="paint10_linear_2_30132" x1="449" y1="643" x2="449" y2="683" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1890FF"/>
+<stop offset="1" stop-color="#B3E3FF"/>
+</linearGradient>
+<linearGradient id="paint11_linear_2_30132" x1="106" y1="507" x2="106" y2="547" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1890FF"/>
+<stop offset="1" stop-color="#B3E3FF"/>
+</linearGradient>
+<linearGradient id="paint12_linear_2_30132" x1="501" y1="313" x2="501" y2="353" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1890FF"/>
+<stop offset="1" stop-color="#B3E3FF"/>
+</linearGradient>
+<linearGradient id="paint13_linear_2_30132" x1="315" y1="239" x2="315" y2="279" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1890FF"/>
+<stop offset="1" stop-color="#B3E3FF"/>
+</linearGradient>
+<clipPath id="clip0_2_30132">
+<rect width="31.3043" height="31.3043" fill="white" transform="translate(200.348 626.348)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/datahub-web-react/src/images/deprecated-status.svg b/datahub-web-react/src/images/deprecated-status.svg
new file mode 100644
index 00000000000000..5334194499e9ef
--- /dev/null
+++ b/datahub-web-react/src/images/deprecated-status.svg
@@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path id="Vector" d="M12.4897 14L10.9455 12.4558C10.3911 12.8178 9.8 13.0949 9.17212 13.2873C8.54424 13.4796 7.89091 13.5758 7.21212 13.5758C6.27313 13.5758 5.39071 13.3976 4.56485 13.0412C3.73899 12.6848 3.02061 12.2012 2.4097 11.5903C1.79879 10.9794 1.31515 10.261 0.958788 9.43515C0.602424 8.60929 0.424242 7.72687 0.424242 6.78788C0.424242 6.10909 0.520404 5.45576 0.712727 4.82788C0.905051 4.2 1.18222 3.60889 1.54424 3.05455L0 1.5103L0.967273 0.54303L13.457 13.0327L12.4897 14ZM7.21212 12.2182C7.69859 12.2182 8.17091 12.156 8.62909 12.0315C9.08727 11.9071 9.53131 11.7204 9.96121 11.4715L2.52848 4.03879C2.2796 4.46869 2.09293 4.91273 1.96848 5.37091C1.84404 5.82909 1.78182 6.30141 1.78182 6.78788C1.78182 8.29253 2.31071 9.57374 3.36848 10.6315C4.42626 11.6893 5.70748 12.2182 7.21212 12.2182ZM12.88 10.5212L11.8958 9.53697C12.1446 9.10707 12.3313 8.66303 12.4558 8.20485C12.5802 7.74667 12.6424 7.27434 12.6424 6.78788C12.6424 5.28323 12.1135 4.00202 11.0558 2.94424C9.99798 1.88646 8.71677 1.35758 7.21212 1.35758C6.72566 1.35758 6.25333 1.4198 5.79515 1.54424C5.33697 1.66869 4.89293 1.85535 4.46303 2.10424L3.47879 1.12C4.03313 0.75798 4.62424 0.480808 5.25212 0.288485C5.88 0.0961616 6.53333 0 7.21212 0C8.15111 0 9.03354 0.178182 9.85939 0.534545C10.6853 0.890909 11.4036 1.37455 12.0145 1.98545C12.6255 2.59636 13.1091 3.31475 13.4655 4.14061C13.8218 4.96646 14 5.84889 14 6.78788C14 7.46667 13.9038 8.12 13.7115 8.74788C13.5192 9.37576 13.242 9.96687 12.88 10.5212Z" fill="#8088A3"/>
+</svg>
diff --git a/datahub-web-react/src/images/deprecation-icon.svg b/datahub-web-react/src/images/deprecation-icon.svg
new file mode 100644
index 00000000000000..d370f922413ce8
--- /dev/null
+++ b/datahub-web-react/src/images/deprecation-icon.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="20" height="20" rx="10" fill="#113633"/>
+<path d="M11.937 6.82025C11.9032 6.82455 9.21796 8.23058 9.21796 8.23058H5.62195C4.62241 8.23058 3.79309 9.06364 3.79309 10.064C3.79309 11.0644 4.62241 11.8974 5.62195 11.8974H6.07145L7.04977 14.8063C7.08669 14.9185 7.2005 15.0005 7.31859 15.0002H9.30169C9.48158 15.0017 9.62952 14.7955 9.57051 14.6256L8.65388 11.8974H9.22677L11.8401 13.2725C12.0103 13.3629 12.2527 13.2185 12.2543 13.0257V7.10231C12.2555 6.94211 12.0959 6.80024 11.937 6.82025ZM14.6384 7.52101C14.5844 7.52517 13.5014 8.28347 13.5014 8.28347C13.3688 8.36338 13.3274 8.56246 13.4171 8.68866C13.5069 8.81485 13.7086 8.84098 13.8276 8.74183L14.8147 8.03666C14.9169 7.96805 14.9642 7.82766 14.9244 7.7112C14.8845 7.59474 14.7612 7.5127 14.6384 7.52101ZM11.6902 7.56508V12.5585L9.57491 11.4435V8.68013L11.6902 7.56508ZM5.62195 8.79472H9.01083V11.3333H5.62195C4.93878 11.3333 4.35717 10.7506 4.35717 10.064C4.35717 9.37746 4.93879 8.79472 5.62195 8.79472ZM13.6381 9.78195C13.4902 9.78865 13.3619 9.92941 13.3688 10.0773C13.3757 10.2251 13.5167 10.3532 13.6645 10.3461H15.9208C16.0698 10.3482 16.2069 10.2131 16.2069 10.064C16.2069 9.91497 16.0698 9.77983 15.9208 9.78195C15.9208 9.78195 13.6469 9.78152 13.6381 9.78195ZM13.6425 11.3289C13.5256 11.3357 13.4177 11.4231 13.3869 11.5361C13.356 11.6491 13.4043 11.7792 13.5014 11.8445L14.4886 12.5497C14.6076 12.6489 14.8092 12.6228 14.899 12.4966C14.9888 12.3704 14.9474 12.1713 14.8147 12.0914L13.8276 11.3862C13.7751 11.3463 13.7083 11.3256 13.6425 11.3289ZM6.67078 11.8974H8.05454L8.90948 14.436H7.52572L6.67078 11.8974Z" fill="white"/>
+</svg>
diff --git a/datahub-web-react/src/images/governMenuIcon.svg b/datahub-web-react/src/images/governMenuIcon.svg
new file mode 100644
index 00000000000000..917b50be501f95
--- /dev/null
+++ b/datahub-web-react/src/images/governMenuIcon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"><path d="M15.6868 14.8125C14.994 14.8125 14.4051 14.5651 13.9202 14.0702C13.4353 13.5753 13.1928 12.9744 13.1928 12.2674C13.1928 11.5605 13.4353 10.9596 13.9202 10.4647C14.4051 9.96981 14.994 9.72237 15.6868 9.72237C16.3795 9.72237 16.9684 9.96981 17.4533 10.4647C17.9383 10.9596 18.1807 11.5605 18.1807 12.2674C18.1807 12.9744 17.9383 13.5753 17.4533 14.0702C16.9684 14.5651 16.3795 14.8125 15.6868 14.8125ZM15.6868 13.374C15.9892 13.374 16.2455 13.2667 16.4557 13.0522C16.666 12.8376 16.7711 12.5761 16.7711 12.2674C16.7711 11.9588 16.666 11.6973 16.4557 11.4827C16.2455 11.2682 15.9892 11.1609 15.6868 11.1609C15.3843 11.1609 15.128 11.2682 14.9178 11.4827C14.7075 11.6973 14.6024 11.9588 14.6024 12.2674C14.6024 12.5761 14.7075 12.8376 14.9178 13.0522C15.128 13.2667 15.3843 13.374 15.6868 13.374ZM11.2229 21C10.9822 21 10.7805 20.9169 10.6177 20.7508C10.4549 20.5847 10.3735 20.3788 10.3735 20.1332V18.5508C10.3735 18.2732 10.4383 18.0121 10.568 17.7675C10.6977 17.5229 10.8792 17.3278 11.1127 17.1824C11.5777 16.8972 11.975 16.6977 12.3045 16.584C12.634 16.4702 13.0681 16.3677 13.6067 16.2764C13.7813 16.246 13.9536 16.2497 14.1235 16.2874C14.2934 16.3252 14.4349 16.412 14.5482 16.548L15.6868 17.9847L16.8018 16.548C16.9151 16.4004 17.0567 16.3107 17.2265 16.2787C17.3964 16.2468 17.5694 16.246 17.7456 16.2764C18.2887 16.3677 18.7229 16.4699 19.0484 16.583C19.3737 16.6961 19.7731 16.8959 20.2464 17.1824C20.4801 17.3275 20.6626 17.5218 20.794 17.7652C20.9253 18.0086 20.994 18.2674 21 18.5416V20.1332C21 20.3788 20.9186 20.5847 20.7558 20.7508C20.593 20.9169 20.3913 21 20.1506 21H11.2229ZM11.7596 19.5615H15.1103L13.6518 17.6656C13.3198 17.7514 12.9971 17.8629 12.6836 18.0001C12.37 18.1373 12.062 18.2902 11.7596 18.4586V19.5615ZM16.2632 19.5615H19.5904V18.4586C19.2976 18.2803 18.9945 18.1266 18.6809 17.9975C18.3674 17.8684 18.0446 17.7609 17.7126 17.6748L16.2632 19.5615ZM4.40962 17.8648V4.43851V7.83382V7.43545V17.8648ZM4.70311 19.3033C4.23156 19.3033 3.82983 19.1335 3.49791 18.794C3.16597 18.4545 3 18.0464 3 17.5697V4.73362C3 4.25688 3.16635 3.84876 3.49904 3.50926C3.83171 3.16976 4.23164 3 4.69881 3H17.2771C17.7443 3 18.1442 3.16976 18.4769 3.50926C18.8095 3.84876 18.9759 4.25688 18.9759 4.73362V8.90162C18.7795 8.67416 18.5702 8.46115 18.3479 8.2626C18.1256 8.06404 17.8651 7.92603 17.5663 7.84857V4.73362C17.5663 4.64755 17.5392 4.57685 17.4849 4.52151C17.4307 4.46617 17.3614 4.43851 17.2771 4.43851H4.69881C4.61446 4.43851 4.54518 4.46617 4.49095 4.52151C4.43673 4.57685 4.40962 4.64755 4.40962 4.73362V17.5697C4.40962 17.6558 4.43673 17.7265 4.49095 17.7818C4.54518 17.8371 4.61446 17.8648 4.69881 17.8648H8.21927C8.19034 17.9791 8.16865 18.0935 8.15419 18.2078C8.13973 18.3222 8.13251 18.4365 8.13251 18.5508V19.3033H4.70311ZM7.2289 8.14548H13.3012C13.6181 7.91803 13.9606 7.74898 14.3286 7.63833C14.6967 7.52767 15.0711 7.4662 15.4518 7.45391V7.42624C15.4518 7.22245 15.3843 7.05162 15.2492 6.91376C15.1141 6.7759 14.9467 6.70698 14.747 6.70698H7.2289C7.0292 6.70698 6.86182 6.77594 6.72674 6.91386C6.59165 7.05178 6.52411 7.22268 6.52411 7.42655C6.52411 7.63044 6.59165 7.80123 6.72674 7.93893C6.86182 8.07663 7.0292 8.14548 7.2289 8.14548ZM7.2289 11.8709H10.997C11.009 11.6152 11.0428 11.369 11.0982 11.1323C11.1536 10.8956 11.2259 10.6623 11.3151 10.4324H7.2289C7.0292 10.4324 6.86182 10.5014 6.72674 10.6393C6.59165 10.7772 6.52411 10.9481 6.52411 11.152C6.52411 11.3559 6.59165 11.5266 6.72674 11.6643C6.86182 11.802 7.0292 11.8709 7.2289 11.8709ZM7.2289 15.5963H9.4582C9.62501 15.4586 9.80029 15.3323 9.98402 15.2173C10.1678 15.1024 10.3554 15 10.547 14.9102V14.748C10.547 14.5906 10.506 14.4529 10.4241 14.3349C10.3422 14.2168 10.1904 14.1578 9.96868 14.1578H7.2289C7.0292 14.1578 6.86182 14.2268 6.72674 14.3647C6.59165 14.5026 6.52411 14.6735 6.52411 14.8774C6.52411 15.0813 6.59165 15.2521 6.72674 15.3898C6.86182 15.5275 7.0292 15.5963 7.2289 15.5963Z" fill="current-color"/></svg>
\ No newline at end of file
diff --git a/datahub-web-react/src/images/help-icon.svg b/datahub-web-react/src/images/help-icon.svg
new file mode 100644
index 00000000000000..bbdcda5b83d591
--- /dev/null
+++ b/datahub-web-react/src/images/help-icon.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.9896 17.3198C12.2601 17.3198 12.4886 17.2264 12.675 17.0397C12.8614 16.8529 12.9546 16.6242 12.9546 16.3537C12.9546 16.0832 12.8613 15.8548 12.6745 15.6683C12.4877 15.4819 12.2591 15.3887 11.9886 15.3887C11.7181 15.3887 11.4896 15.4821 11.3032 15.6688C11.1167 15.8556 11.0235 16.0843 11.0235 16.3548C11.0235 16.6253 11.1169 16.8537 11.3037 17.0402C11.4904 17.2266 11.7191 17.3198 11.9896 17.3198ZM12.0016 21C10.7568 21 9.58677 20.7638 8.49148 20.2914C7.39618 19.8189 6.44342 19.1778 5.63322 18.368C4.82299 17.5581 4.18157 16.6058 3.70894 15.511C3.23631 14.4162 3 13.2464 3 12.0016C3 10.7568 3.23621 9.58677 3.70863 8.49148C4.18106 7.39618 4.82219 6.44343 5.63203 5.63322C6.44189 4.823 7.39423 4.18157 8.48904 3.70894C9.58384 3.23631 10.7536 3 11.9984 3C13.2432 3 14.4132 3.23621 15.5085 3.70863C16.6038 4.18106 17.5566 4.82219 18.3668 5.63203C19.177 6.44189 19.8184 7.39423 20.2911 8.48904C20.7637 9.58384 21 10.7536 21 11.9984C21 13.2432 20.7638 14.4132 20.2914 15.5085C19.8189 16.6038 19.1778 17.5566 18.368 18.3668C17.5581 19.177 16.6058 19.8184 15.511 20.2911C14.4162 20.7637 13.2464 21 12.0016 21ZM12 19.579C14.1158 19.579 15.9079 18.8448 17.3763 17.3763C18.8448 15.9079 19.579 14.1158 19.579 12C19.579 9.88421 18.8448 8.0921 17.3763 6.62367C15.9079 5.15525 14.1158 4.42103 12 4.42103C9.8842 4.42103 8.09209 5.15525 6.62367 6.62367C5.15525 8.0921 4.42103 9.88421 4.42103 12C4.42103 14.1158 5.15525 15.9079 6.62367 17.3763C8.09209 18.8448 9.8842 19.579 12 19.579ZM12.0767 7.94452C12.5138 7.94452 12.8921 8.08212 13.2115 8.35731C13.531 8.63251 13.6907 8.9765 13.6907 9.38928C13.6907 9.73665 13.5887 10.0476 13.3846 10.3221C13.1806 10.5966 12.9474 10.8522 12.685 11.0891C12.3411 11.3941 12.0384 11.7297 11.7767 12.0958C11.5151 12.4619 11.3751 12.8696 11.3569 13.319C11.3508 13.4915 11.4115 13.636 11.5391 13.7526C11.6666 13.8692 11.8154 13.9275 11.9854 13.9275C12.1676 13.9275 12.3219 13.8668 12.4482 13.7453C12.5745 13.6239 12.6552 13.4751 12.6905 13.299C12.7536 12.9735 12.8881 12.6835 13.094 12.4291C13.2999 12.1746 13.5229 11.9326 13.7631 11.7032C14.1083 11.3667 14.4097 10.9997 14.6672 10.6023C14.9247 10.205 15.0534 9.76175 15.0534 9.27269C15.0534 8.52208 14.7577 7.90538 14.1662 7.42259C13.5747 6.93979 12.8842 6.6984 12.0947 6.6984C11.5312 6.6984 10.9998 6.8232 10.5006 7.0728C10.0014 7.32238 9.61277 7.68645 9.33462 8.165C9.24839 8.31195 9.22071 8.46663 9.25158 8.62904C9.28245 8.79144 9.3658 8.91474 9.50162 8.99897C9.6745 9.0952 9.85203 9.12267 10.0342 9.08136C10.2164 9.04007 10.3712 8.93624 10.4988 8.76985C10.6907 8.52084 10.923 8.32104 11.1956 8.17044C11.4683 8.01983 11.762 7.94452 12.0767 7.94452Z" fill="white"/>
+</svg>
diff --git a/datahub-web-react/src/images/ingestionMenuIcon.svg b/datahub-web-react/src/images/ingestionMenuIcon.svg
new file mode 100644
index 00000000000000..bbe5b9bacd5f6b
--- /dev/null
+++ b/datahub-web-react/src/images/ingestionMenuIcon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"><path d="M11.3484 19.4118H12.6516V17.3308L16.2353 13.7471V9.14935C16.2353 9.06789 16.2014 8.99322 16.1335 8.92533C16.0656 8.85746 15.991 8.82352 15.9095 8.82352H8.09055C8.00909 8.82352 7.93442 8.85746 7.86653 8.92533C7.79866 8.99322 7.76473 9.06789 7.76473 9.14935V13.7471L11.3484 17.3308V19.4118ZM9.76024 20.043V18.0068L6.73444 14.981C6.56068 14.8072 6.42426 14.6034 6.32517 14.3693C6.22607 14.1353 6.17651 13.8892 6.17651 13.631V9.15163C6.17651 8.62465 6.36393 8.17352 6.73878 7.79823C7.1136 7.42295 7.56419 7.23531 8.09055 7.23531H9.27154L8.47745 8.02943V3.79412C8.47745 3.56912 8.55359 3.38052 8.70586 3.22831C8.85812 3.0761 9.04681 3 9.27191 3C9.497 3 9.68556 3.0761 9.83759 3.22831C9.98964 3.38052 10.0657 3.56912 10.0657 3.79412V7.23531H13.9344V3.79412C13.9344 3.56912 14.0105 3.38052 14.1628 3.22831C14.3151 3.0761 14.5038 3 14.7289 3C14.954 3 15.1425 3.0761 15.2946 3.22831C15.4466 3.38052 15.5226 3.56912 15.5226 3.79412V8.02943L14.7285 7.23531H15.9095C16.4359 7.23531 16.8865 7.42294 17.2613 7.79821C17.6361 8.17345 17.8236 8.62455 17.8236 9.15149V13.6306C17.8236 13.886 17.774 14.1315 17.6749 14.3671C17.5758 14.6026 17.4394 14.8072 17.2656 14.981L14.2398 18.0068V20.043C14.2398 20.3141 14.1481 20.5414 13.9647 20.7248C13.7813 20.9083 13.554 21 13.2828 21H10.7172C10.4461 21 10.2188 20.9083 10.0354 20.7248C9.85196 20.5414 9.76024 20.3141 9.76024 20.043Z" fill="current-color"/></svg>
\ No newline at end of file
diff --git a/datahub-web-react/src/images/introduceBg.svg b/datahub-web-react/src/images/introduceBg.svg
new file mode 100644
index 00000000000000..ba638b64809d09
--- /dev/null
+++ b/datahub-web-react/src/images/introduceBg.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="470" height="806" fill="none"><g opacity=".3"><g opacity=".5"><mask id="a" width="968" height="968" x="-20" y="0" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M947.38 0H-20v967.38h967.38V0Z"/></mask><g mask="url(#a)"><path stroke="#20D3BD" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2" d="M463.69 614.64c74.282 0 134.5-60.218 134.5-134.5s-60.218-134.5-134.5-134.5-134.5 60.218-134.5 134.5 60.218 134.5 134.5 134.5Z"/><path fill="#08303A" d="M463.69 314.31c91.76 0 166.15 74.39 166.15 166.15s-74.39 166.15-166.15 166.15-166.15-74.39-166.15-166.15 74.39-166.15 166.15-166.15Zm0-.09c-22.44 0-44.21 4.4-64.71 13.06-19.8 8.37-37.57 20.36-52.84 35.63-15.27 15.27-27.25 33.05-35.63 52.84-8.67 20.49-13.06 42.27-13.06 64.71 0 22.44 4.4 44.21 13.06 64.71 8.37 19.8 20.36 37.57 35.63 52.84 15.27 15.27 33.05 27.25 52.84 35.63 20.49 8.67 42.27 13.06 64.71 13.06 22.44 0 44.21-4.4 64.71-13.06 19.8-8.37 37.57-20.36 52.84-35.63 15.27-15.27 27.25-33.05 35.63-52.84 8.67-20.49 13.06-42.27 13.06-64.71 0-22.44-4.4-44.21-13.06-64.71-8.37-19.8-20.36-37.57-35.63-52.84-15.27-15.27-33.05-27.25-52.84-35.63-20.49-8.67-42.27-13.06-64.71-13.06Z"/><path stroke="#20D3BD" stroke-linecap="round" stroke-miterlimit="10" stroke-width="1.82" d="M463.69 646.61c91.762 0 166.15-74.388 166.15-166.15s-74.388-166.15-166.15-166.15-166.15 74.388-166.15 166.15 74.388 166.15 166.15 166.15Z"/><path fill="#08303A" d="M463.69 282.98c109.24 0 197.8 88.56 197.8 197.8 0 109.24-88.56 197.8-197.8 197.8-109.24 0-197.8-88.56-197.8-197.8 0-109.24 88.56-197.8 197.8-197.8Zm0-.18c-26.73 0-52.66 5.23-77.06 15.56-23.58 9.97-44.75 24.25-62.93 42.43s-32.46 39.36-42.43 62.93c-10.32 24.41-15.56 50.34-15.56 77.06s5.23 52.66 15.56 77.06c9.97 23.58 24.25 44.75 42.43 62.93s39.36 32.46 62.93 42.43c24.41 10.32 50.34 15.56 77.06 15.56s52.66-5.23 77.06-15.56c23.58-9.97 44.75-24.25 62.93-42.43s32.46-39.36 42.43-62.93c10.32-24.41 15.56-50.34 15.56-77.06s-5.23-52.66-15.56-77.06c-9.97-23.58-24.25-44.75-42.43-62.93s-39.36-32.46-62.93-42.43c-24.41-10.32-50.34-15.56-77.06-15.56Z"/><path stroke="#20D3BD" stroke-linecap="round" stroke-miterlimit="10" stroke-width="1.64" d="M463.69 678.58c109.242 0 197.8-88.558 197.8-197.8s-88.558-197.8-197.8-197.8-197.8 88.558-197.8 197.8 88.558 197.8 197.8 197.8Z"/><path fill="#08303A" d="M463.69 251.65c126.73 0 229.46 102.73 229.46 229.46S590.42 710.57 463.69 710.57 234.23 607.84 234.23 481.11s102.73-229.46 229.46-229.46Zm0-.27c-31.01 0-61.1 6.07-89.42 18.05-27.36 11.57-51.92 28.13-73.02 49.23-21.1 21.1-37.66 45.67-49.23 73.02-11.98 28.32-18.05 58.41-18.05 89.42 0 31.01 6.07 61.1 18.05 89.42 11.57 27.36 28.13 51.92 49.23 73.02 21.1 21.1 45.67 37.66 73.02 49.23 28.32 11.98 58.41 18.05 89.42 18.05 31.01 0 61.1-6.07 89.42-18.05 27.36-11.57 51.92-28.13 73.02-49.23 21.1-21.1 37.66-45.67 49.23-73.02 11.98-28.32 18.05-58.41 18.05-89.42 0-31.01-6.07-61.1-18.05-89.42-11.57-27.36-28.13-51.92-49.23-73.02-21.1-21.1-45.67-37.66-73.02-49.23-28.32-11.98-58.41-18.05-89.42-18.05Z"/><path stroke="#20D3BD" stroke-linecap="round" stroke-miterlimit="10" stroke-width="1.45" d="M463.69 710.57c126.727 0 229.46-102.733 229.46-229.46S590.417 251.65 463.69 251.65 234.23 354.383 234.23 481.11s102.733 229.46 229.46 229.46Z"/><path fill="#08303A" d="M463.69 220.32c144.21 0 261.11 116.9 261.11 261.11S607.9 742.54 463.69 742.54s-261.11-116.9-261.11-261.11 116.9-261.11 261.11-261.11Zm0-.36c-35.3 0-69.54 6.91-101.78 20.55-31.14 13.17-59.1 32.02-83.11 56.04-24.01 24.01-42.87 51.98-56.04 83.11-13.63 32.24-20.55 66.48-20.55 101.78s6.91 69.54 20.55 101.78c13.17 31.14 32.02 59.1 56.04 83.11 24.01 24.01 51.98 42.87 83.11 56.04 32.24 13.63 66.48 20.55 101.78 20.55s69.54-6.91 101.78-20.55c31.14-13.17 59.1-32.02 83.11-56.04 24.01-24.01 42.87-51.98 56.04-83.11 13.63-32.24 20.55-66.48 20.55-101.78s-6.91-69.54-20.55-101.78c-13.17-31.14-32.02-59.1-56.04-83.11-24.01-24.01-51.98-42.87-83.11-56.04-32.24-13.63-66.48-20.55-101.78-20.55Z"/><path stroke="#20D3BD" stroke-linecap="round" stroke-miterlimit="10" stroke-width="1.27" d="M463.69 742.54c144.207 0 261.11-116.903 261.11-261.11S607.897 220.32 463.69 220.32 202.58 337.223 202.58 481.43s116.903 261.11 261.11 261.11Z"/><path fill="#08303A" d="M463.69 188.99c161.69 0 292.76 131.08 292.76 292.76 0 161.68-131.08 292.76-292.76 292.76-161.68 0-292.77-131.07-292.77-292.76S302 188.99 463.69 188.99Zm0-.45c-39.58 0-77.98 7.75-114.13 23.04-34.92 14.77-66.27 35.91-93.2 62.84-26.93 26.93-48.07 58.29-62.84 93.2-15.29 36.15-23.04 74.55-23.04 114.13s7.75 77.98 23.04 114.13c14.77 34.92 35.91 66.27 62.84 93.2 26.93 26.93 58.29 48.07 93.2 62.84 36.15 15.29 74.55 23.04 114.13 23.04s77.98-7.75 114.13-23.04c34.92-14.77 66.27-35.91 93.2-62.84 26.93-26.93 48.07-58.29 62.84-93.2 15.29-36.15 23.04-74.55 23.04-114.13s-7.75-77.98-23.04-114.13c-14.77-34.92-35.91-66.27-62.84-93.2-26.93-26.93-58.29-48.07-93.2-62.84-36.15-15.29-74.55-23.04-114.13-23.04Z"/><path stroke="#20D3BD" stroke-linecap="round" stroke-miterlimit="10" stroke-width="1.09" d="M463.69 774.51c161.687 0 292.76-131.073 292.76-292.76 0-161.687-131.073-292.76-292.76-292.76-161.687 0-292.76 131.073-292.76 292.76 0 161.687 131.073 292.76 292.76 292.76Z"/><path fill="#08303A" d="M463.69 157.66c179.17 0 324.42 145.25 324.42 324.42 0 179.17-145.25 324.42-324.42 324.42-179.17 0-324.42-145.25-324.42-324.43s145.25-324.41 324.42-324.41Zm0-.55c-43.87 0-86.43 8.59-126.49 25.54-38.7 16.37-73.45 39.8-103.29 69.64-29.84 29.84-53.27 64.6-69.64 103.29-16.95 40.06-25.54 82.62-25.54 126.49 0 43.87 8.59 86.43 25.54 126.49 16.37 38.7 39.8 73.45 69.64 103.29 29.84 29.84 64.6 53.28 103.29 69.64 40.06 16.95 82.62 25.54 126.49 25.54 43.87 0 86.43-8.59 126.49-25.54 38.7-16.37 73.45-39.8 103.29-69.64 29.84-29.84 53.27-64.6 69.64-103.29 16.95-40.06 25.54-82.62 25.54-126.49 0-43.87-8.59-86.43-25.54-126.49-16.37-38.7-39.8-73.45-69.64-103.29-29.84-29.84-64.6-53.27-103.29-69.64-40.06-16.95-82.62-25.54-126.49-25.54Z"/><path stroke="#20D3BD" stroke-linecap="round" stroke-miterlimit="10" stroke-width=".91" d="M463.69 806.49c179.172 0 324.42-145.248 324.42-324.42 0-179.172-145.248-324.42-324.42-324.42-179.172 0-324.42 145.248-324.42 324.42 0 179.172 145.248 324.42 324.42 324.42Z"/><path fill="#08303A" d="M463.69 126.32c196.65 0 356.07 159.42 356.07 356.07S660.34 838.46 463.69 838.46 107.62 679.05 107.62 482.4s159.41-356.08 356.07-356.08Zm0-.64c-48.16 0-94.87 9.43-138.85 28.03-42.48 17.97-80.62 43.69-113.38 76.45-32.76 32.76-58.48 70.91-76.45 113.38-18.6 43.98-28.03 90.69-28.03 138.85s9.43 94.87 28.03 138.85c17.97 42.48 43.69 80.62 76.45 113.38 32.76 32.76 70.91 58.48 113.38 76.45 43.98 18.6 90.69 28.03 138.85 28.03s94.87-9.43 138.85-28.03c42.48-17.97 80.62-43.69 113.38-76.45 32.76-32.76 58.48-70.91 76.45-113.38 18.6-43.98 28.03-90.69 28.03-138.85s-9.43-94.87-28.03-138.85c-17.97-42.48-43.69-80.62-76.45-113.38-32.76-32.76-70.91-58.48-113.38-76.45-43.98-18.6-90.69-28.03-138.85-28.03Z"/><path stroke="#20D3BD" stroke-linecap="round" stroke-miterlimit="10" stroke-width=".73" d="M463.69 838.47c196.652 0 356.07-159.418 356.07-356.07S660.342 126.33 463.69 126.33 107.62 285.748 107.62 482.4s159.418 356.07 356.07 356.07Z"/><path fill="#08303A" d="M463.69 94.99c214.14 0 387.73 173.59 387.73 387.73 0 214.14-173.59 387.73-387.73 387.73-214.14 0-387.73-173.6-387.73-387.73 0-214.13 173.59-387.73 387.73-387.73Zm0-.73c-52.44 0-103.31 10.27-151.2 30.53-46.26 19.56-87.8 47.57-123.47 83.25-35.67 35.67-63.68 77.22-83.25 123.47-20.26 47.89-30.53 98.76-30.53 151.2 0 52.44 10.27 103.31 30.53 151.2 19.56 46.26 47.57 87.8 83.25 123.47 35.67 35.67 77.22 63.68 123.47 83.25 47.89 20.26 98.76 30.53 151.2 30.53 52.44 0 103.31-10.27 151.2-30.53 46.26-19.57 87.8-47.57 123.47-83.25 35.67-35.67 63.68-77.22 83.25-123.47 20.26-47.89 30.53-98.76 30.53-151.2 0-52.44-10.27-103.31-30.53-151.2-19.56-46.26-47.57-87.8-83.25-123.47-35.67-35.67-77.22-63.68-123.47-83.25-47.89-20.26-98.76-30.53-151.2-30.53Z"/><path stroke="#20D3BD" stroke-linecap="round" stroke-miterlimit="10" stroke-width=".55" d="M463.69 870.45c214.137 0 387.73-173.593 387.73-387.73 0-214.137-173.593-387.73-387.73-387.73-214.137 0-387.73 173.593-387.73 387.73 0 214.137 173.593 387.73 387.73 387.73Z"/><path fill="#08303A" d="M463.69 63.66c231.62 0 419.38 187.76 419.38 419.38S695.31 902.42 463.69 902.42 44.31 714.66 44.31 483.04 232.07 63.66 463.69 63.66Zm0-.82c-56.73 0-111.76 11.11-163.56 33.02-50.04 21.16-94.97 51.46-133.56 90.05-38.59 38.59-68.89 83.53-90.05 133.56C54.61 371.27 43.5 426.3 43.5 483.03c0 56.73 11.11 111.76 33.02 163.56 21.16 50.04 51.46 94.97 90.05 133.56 38.59 38.59 83.53 68.89 133.56 90.05 51.8 21.91 106.83 33.02 163.56 33.02 56.73 0 111.76-11.11 163.56-33.02 50.04-21.16 94.97-51.46 133.56-90.05 38.59-38.59 68.89-83.53 90.05-133.56 21.91-51.8 33.02-106.83 33.02-163.56 0-56.73-11.11-111.76-33.02-163.56-21.16-50.04-51.46-94.97-90.05-133.56-38.59-38.59-83.53-68.89-133.56-90.05-51.8-21.91-106.83-33.02-163.56-33.02Z"/><path stroke="#20D3BD" stroke-linecap="round" stroke-miterlimit="10" stroke-width=".36" d="M463.69 902.42c231.617 0 419.38-187.763 419.38-419.38S695.307 63.66 463.69 63.66 44.31 251.423 44.31 483.04s187.763 419.38 419.38 419.38Z"/><path fill="#08303A" d="M463.69 32.33c249.1 0 451.03 201.93 451.03 451.03 0 249.1-201.94 451.03-451.03 451.03-249.09 0-451.04-201.93-451.04-451.03 0-249.1 201.94-451.03 451.04-451.03Zm0-.91c-61.01 0-120.2 11.95-175.92 35.52-53.82 22.76-102.15 55.35-143.65 96.85-41.51 41.51-74.09 89.84-96.85 143.66-23.57 55.72-35.52 114.91-35.52 175.92 0 61.01 11.95 120.2 35.52 175.92 22.76 53.82 55.35 102.15 96.85 143.66 41.51 41.51 89.84 74.09 143.65 96.85 55.72 23.57 114.91 35.52 175.92 35.52 61.01 0 120.2-11.95 175.92-35.52 53.82-22.76 102.15-55.35 143.66-96.85 41.51-41.51 74.09-89.84 96.85-143.66 23.57-55.72 35.52-114.91 35.52-175.92 0-61.01-11.95-120.2-35.52-175.92-22.76-53.82-55.35-102.15-96.85-143.66-41.51-41.51-89.84-74.09-143.66-96.85-55.72-23.57-114.91-35.52-175.92-35.52Z"/><path stroke="#20D3BD" stroke-linecap="round" stroke-miterlimit="10" stroke-width=".18" d="M463.69 934.4c249.097 0 451.03-201.933 451.03-451.03 0-249.097-201.933-451.03-451.03-451.03-249.097 0-451.03 201.933-451.03 451.03 0 249.097 201.933 451.03 451.03 451.03Z"/><path fill="#08303A" d="M463.69 1c266.58 0 482.69 216.11 482.69 482.69S730.27 966.38 463.69 966.38-19 750.27-19 483.69 197.11 1 463.69 1Zm0-1c-65.3 0-128.64 12.79-188.27 38.01-57.6 24.36-109.32 59.24-153.75 103.66-44.42 44.42-79.3 96.15-103.66 153.75C-7.21 355.05-20 418.39-20 483.69c0 65.3 12.79 128.64 38.01 188.27 24.36 57.6 59.24 109.32 103.66 153.75 44.42 44.42 96.15 79.3 153.75 103.66 59.63 25.22 122.98 38.01 188.27 38.01s128.64-12.79 188.27-38.01c57.6-24.36 109.32-59.24 153.75-103.66 44.42-44.42 79.3-96.15 103.66-153.75 25.22-59.63 38.01-122.98 38.01-188.27s-12.79-128.64-38.01-188.27c-24.36-57.6-59.24-109.32-103.66-153.75-44.42-44.42-96.15-79.3-153.75-103.66C592.33 12.79 528.98 0 463.69 0Z"/></g></g><path stroke="#315C64" stroke-dasharray="0.1 6" stroke-linecap="round" stroke-width="2" d="m317.718 222.158-18.316 123.33M283.093 403.203l-6.118 143.161M142.668 506.35l-39.217 156.867M275.652 609.154l-8.604 212.639M179.331 493.881l80.383 70.639M302.12 602.81l132.28 79.613M348.286 750.675l95.022-52.384M340.622 778.122l96.635 101.528M117.09 697.942l170.508 40.48M50.063 519.574l26.91 136.994M636.322 116.241l-287.188 84.367M291.394 206.139 124.576 256.43M445.907 72.314l-116.451 116.45M436.912 280.713l-119.897 75.853M463 428.241V347M396.391 591.857l40.62-70.357M437.877 435.24l-40.62-70.356M419.62 453.863l-70.357-40.62M348.763 543.131l70.357-40.62M462 610.241V529M331.88 477.12h81.24M257.916 398.455 77.441 456.158"/><path fill="#092125" fill-opacity=".75" d="M466 306.178c18.551 0 33.589-15.038 33.589-33.589S484.551 239 466 239s-33.589 15.038-33.589 33.589 15.038 33.589 33.589 33.589ZM460.553 724.178c18.551 0 33.589-15.038 33.589-33.589S479.104 657 460.553 657s-33.589 15.038-33.589 33.589 15.038 33.589 33.589 33.589Z"/><path fill="#FF694A" d="M479.258 672.437a5.715 5.715 0 0 1 1.742 3.484c0 .556-.148.927-.482 1.631-.334.705-4.448 7.822-5.672 9.787a7.472 7.472 0 0 0-1.075 3.855c0 1.372.371 2.707 1.075 3.856 1.224 1.964 5.338 9.119 5.672 9.823.334.705.482 1.038.482 1.594-.148 1.335-.741 2.558-1.705 3.448-.927.964-2.15 1.594-3.448 1.705-.556 0-.927-.148-1.594-.482-.667-.333-7.933-4.337-9.898-5.56-.148-.074-.296-.186-.482-.26l-9.712-5.746c.222 1.854 1.038 3.633 2.372 4.931.26.259.519.482.816.704-.222.111-.482.222-.704.371-1.965 1.223-9.12 5.338-9.824 5.672-.704.333-1.038.481-1.631.481-1.335-.148-2.558-.741-3.448-1.705a5.717 5.717 0 0 1-1.742-3.484c.037-.556.185-1.113.482-1.594.334-.705 4.448-7.859 5.672-9.824a7.375 7.375 0 0 0 1.075-3.855 7.376 7.376 0 0 0-1.075-3.856c-1.224-2.039-5.376-9.193-5.672-9.898-.297-.482-.445-1.038-.482-1.594a5.668 5.668 0 0 1 1.705-3.484 5.677 5.677 0 0 1 3.485-1.706 3.786 3.786 0 0 1 1.631.482c.593.26 5.82 3.3 8.6 4.931l.631.37c.222.149.407.26.556.334l.296.185 9.898 5.858a8.157 8.157 0 0 0-3.151-5.635c.222-.111.482-.223.704-.371 1.965-1.223 9.12-5.375 9.824-5.672.482-.296 1.038-.444 1.631-.482a5.68 5.68 0 0 1 3.448 1.706Zm-18.239 21.426 2.113-2.113a.716.716 0 0 0 0-1.038l-2.113-2.113a.718.718 0 0 0-1.038 0l-2.113 2.113a.716.716 0 0 0 0 1.038l2.113 2.113c.26.26.741.26 1.038 0Z"/><mask id="b" width="41" height="42" x="453" y="251" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M494 251.802h-41v41h41v-41Z"/></mask><g mask="url(#b)"><path fill="#34A853" d="M465.621 251.802a3.58 3.58 0 0 0-2.972 5.581l1.53-1.528a1.512 1.512 0 1 1 .965.962l-1.528 1.528a3.58 3.58 0 0 0 4.177-.113c1.224-.931 1.717-2.539 1.224-3.996a3.579 3.579 0 0 0-3.396-2.434Z"/><path fill="#FBBC04" d="M464.196 262.236a5.563 5.563 0 0 0-1.116-3.353l-1.985 1.983a2.847 2.847 0 0 1-.544 3.436l1.079 2.637a5.597 5.597 0 0 0 2.566-4.703Z"/><path fill="#EA4335" d="M458.647 265.083h-.051a2.85 2.85 0 1 1 1.564-5.229l1.966-1.966a5.598 5.598 0 1 0-3.53 9.947c.379 0 .758-.038 1.13-.112l-1.079-2.64Z"/><path fill="#4285F4" d="M465.696 267.364a12.699 12.699 0 0 0-3.669.538l1.573 3.843a8.69 8.69 0 0 1 2.094-.254 8.57 8.57 0 0 1 3.276 16.488 8.57 8.57 0 0 1-7.295-15.489l-1.556-3.833a12.706 12.706 0 1 0 5.588-1.295l-.011.002Z"/></g><path fill="#092125" fill-opacity=".75" d="M284.589 613.178c18.551 0 33.589-15.038 33.589-33.589S303.14 546 284.589 546 251 561.038 251 579.589s15.038 33.589 33.589 33.589ZM286.589 411.178c18.551 0 33.589-15.038 33.589-33.589S305.14 344 286.589 344 253 359.038 253 377.589s15.038 33.589 33.589 33.589ZM153.589 510.178c18.551 0 33.589-15.038 33.589-33.589S172.14 443 153.589 443 120 458.038 120 476.589s15.038 33.589 33.589 33.589ZM46.59 508.557c18.55 0 33.588-15.038 33.588-33.589S65.14 441.379 46.59 441.379C28.04 441.379 13 456.417 13 474.968s15.038 33.589 33.59 33.589ZM100.15 306.114c18.551 0 33.589-15.038 33.589-33.589s-15.038-33.589-33.589-33.589c-18.55 0-33.59 15.038-33.59 33.589s15.04 33.589 33.59 33.589ZM91.98 715.539c18.551 0 33.589-15.038 33.589-33.589s-15.038-33.589-33.589-33.589c-18.55 0-33.59 15.038-33.59 33.589s15.04 33.589 33.59 33.589ZM309.589 783.178c18.551 0 33.589-15.038 33.589-33.589S328.14 716 309.589 716 276 731.038 276 749.589s15.038 33.589 33.589 33.589ZM312.589 243.178c18.551 0 33.589-15.038 33.589-33.589S331.14 176 312.589 176 279 191.038 279 209.589s15.038 33.589 33.589 33.589ZM464.184 99.132c18.551 0 33.589-15.038 33.589-33.589 0-18.55-15.038-33.59-33.589-33.59s-33.589 15.04-33.589 33.59c0 18.55 15.038 33.59 33.589 33.59ZM260.589 152.178c18.551 0 33.589-15.038 33.589-33.589s-15.038-33.59-33.589-33.59S227 100.039 227 118.59c0 18.551 15.038 33.589 33.589 33.589Z"/><g opacity=".33"><mask id="c" width="43" height="44" x="24" y="455" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M66.748 455.931H24.565v42.183h42.183v-42.183Z"/></mask><g fill="#20D3BD" mask="url(#c)"><path d="M64.011 488.441c-2.33-.058-4.135.175-5.65.816-.437.174-1.136.174-1.194.728.233.233.262.611.466.932.35.582.961 1.368 1.514 1.776.612.466 1.224.932 1.864 1.34 1.136.699 2.417 1.106 3.524 1.805.641.408 1.282.932 1.922 1.369.32.233.524.612.932.757v-.087c-.204-.262-.262-.641-.466-.932-.29-.291-.582-.553-.873-.845-.845-1.135-1.893-2.125-3.03-2.941-.931-.641-2.97-1.514-3.348-2.592l-.059-.058c.641-.058 1.398-.291 2.01-.466.99-.262 1.893-.204 2.912-.466.466-.117.932-.262 1.398-.408v-.262c-.524-.524-.903-1.223-1.456-1.718-1.485-1.282-3.116-2.534-4.805-3.582-.903-.583-2.068-.961-3.03-1.456-.349-.175-.931-.263-1.135-.554-.524-.641-.816-1.485-1.194-2.242-.844-1.602-1.66-3.379-2.388-5.068-.524-1.136-.845-2.271-1.485-3.32-3-4.951-6.262-7.95-11.271-10.892-1.078-.611-2.36-.874-3.728-1.194-.728-.029-1.456-.087-2.184-.116-.466-.204-.932-.758-1.34-1.02-1.66-1.048-5.941-3.32-7.164-.32-.787 1.893 1.165 3.757 1.834 4.718.496.67 1.136 1.427 1.486 2.184.204.495.262 1.019.466 1.544.466 1.281.903 2.708 1.514 3.902.32.612.67 1.252 1.078 1.806.233.32.64.466.728.99-.408.582-.437 1.456-.67 2.184-1.048 3.291-.64 7.368.845 9.786.465.727 1.572 2.33 3.058 1.718 1.31-.524 1.019-2.184 1.397-3.641.088-.349.03-.582.204-.815v.058c.408.816.816 1.602 1.194 2.418.903 1.426 2.476 2.912 3.786 3.902.7.524 1.253 1.427 2.126 1.747v-.087h-.058c-.175-.262-.437-.379-.67-.582-.524-.525-1.106-1.165-1.514-1.748-1.223-1.631-2.3-3.436-3.262-5.3-.466-.903-.874-1.893-1.252-2.796-.175-.35-.175-.874-.466-1.048-.437.64-1.078 1.194-1.398 1.98-.553 1.252-.612 2.796-.816 4.397-.116.03-.058 0-.116.059-.932-.233-1.252-1.194-1.602-2.01-.874-2.068-1.02-5.388-.262-7.776.204-.611 1.078-2.533.728-3.116-.174-.553-.757-.874-1.077-1.31a11.79 11.79 0 0 1-1.049-1.864c-.699-1.631-1.048-3.437-1.805-5.068-.35-.757-.962-1.543-1.457-2.242-.553-.787-1.165-1.34-1.601-2.272-.146-.32-.35-.844-.117-1.194.058-.233.175-.32.408-.378.378-.321 1.456.087 1.835.262 1.077.436 1.98.844 2.883 1.456.407.291.844.844 1.368.99h.612c.932.204 1.98.058 2.854.32 1.544.495 2.942 1.223 4.194 2.01 3.815 2.417 6.96 5.854 9.087 9.96.349.67.494 1.281.815 1.98.612 1.427 1.369 2.884 1.98 4.281.612 1.369 1.194 2.767 2.068 3.903.437.611 2.184.932 2.97 1.252.583.262 1.486.495 2.01.816.99.611 1.98 1.31 2.912 1.98.467.349 1.922 1.078 2.01 1.66Z"/><path d="M34.305 463.133a4.58 4.58 0 0 0-1.194.146v.058h.059c.233.466.64.786.931 1.194.233.466.437.932.67 1.398l.058-.058c.408-.292.612-.758.612-1.457-.175-.203-.204-.407-.35-.611-.174-.292-.553-.437-.786-.67Z"/></g><path fill="#20D3BD" d="M91.663 668.908h-8.392c-.198 0-.463 0-.661.064-.462.064-.793.513-.793.961 0 .513.397.898.925.898h15.661c1.322 0 2.71.064 3.965.449 3.304.897 5.749 2.82 7.071 5.962.859 2.051.925 4.231.661 6.41-.397 3.142-1.52 6.026-3.767 8.334-3.172 3.334-7.203 4.873-11.894 5.001h-2.313c-.661.064-1.058.513-1.058 1.09.067.577.397.897 1.124.897 1.652 0 3.37 0 5.022-.192 4.956-.77 8.921-3.013 11.762-7.052 1.85-2.628 2.776-5.513 3.106-8.719.198-2.115.066-4.231-.727-6.282-1.718-4.552-6.41-7.757-11.63-7.821h-8.062Zm-5.154 23.207h8.723c4.03 0 7.467-2.244 8.92-5.898.727-1.924.992-3.847.331-5.834-.925-2.757-3.569-4.552-6.542-4.552H79.438c-.528.064-.793.513-.727 1.026.067.513.33.769.793.833.595.064 1.19.129 1.785.129h16.718c1.586 0 2.841.641 3.833 1.859.859 1.09 1.057 2.308.925 3.718-.199 1.731-.859 3.269-2.049 4.487-1.388 1.475-3.238 2.244-5.286 2.244H77.72c-.33 0-.66 0-.99.064-.464.193-.728.513-.662 1.026.066.513.397.769.925.833h.595l8.921.065ZM73.161 677.69h2.246c.53 0 .86-.32.926-.833.066-.513-.265-.898-.793-1.026-.265-.064-.595-.128-.86-.064h-2.775c-.33 0-.66 0-1.057.064-.595.128-.925.577-.86 1.026.067.449.53.897 1.058.897l2.115-.064Zm12.555 21.348h1.916c.661 0 1.058-.384 1.058-.897v-.064c0-.513-.397-.962-.926-.962a22.614 22.614 0 0 0-4.163 0c-.528.064-.991.513-.925 1.09.066.513.463.833 1.124.833h1.916Z"/><mask id="d" width="42" height="43" x="444" y="42" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M485.609 42.364h-40.943v42.183h40.943V42.364Z"/></mask><g fill="#20D3BD" fill-rule="evenodd" clip-rule="evenodd" mask="url(#d)"><path d="m466.117 84.712-1.089-.384s.133-5.725-1.861-6.136c-1.329-1.588.213-67.383 4.997-.219 0 0-1.648.85-1.94 2.3-.319 1.425-.107 4.439-.107 4.439Z"/><path d="m466.117 84.712-1.089-.384s.133-5.725-1.861-6.136c-1.329-1.588.213-67.383 4.997-.219 0 0-1.648.85-1.94 2.3-.319 1.425-.107 4.439-.107 4.439Z"/><path d="M466.702 79.178s9.542-6.464 7.309-19.913c-2.153-9.78-7.229-12.984-7.787-14.217-.612-.876-1.196-2.41-1.196-2.41l.398 27.2c0 .027-.824 8.327 1.276 9.34Z"/><path d="M466.702 79.178s9.542-6.464 7.309-19.913c-2.153-9.78-7.229-12.984-7.787-14.217-.612-.876-1.196-2.41-1.196-2.41l.398 27.2c0 .027-.824 8.327 1.276 9.34Z"/><path d="M464.47 79.534s-8.957-6.3-8.426-17.393c.505-11.094 6.831-16.545 8.053-17.53.798-.877.824-1.206.878-2.083.558 1.233.451 18.435.531 20.462.239 7.806-.425 15.065-1.036 16.544Z"/><path d="M464.47 79.534s-8.957-6.3-8.426-17.393c.505-11.094 6.831-16.545 8.053-17.53.798-.877.824-1.206.878-2.083.558 1.233.451 18.435.531 20.462.239 7.806-.425 15.065-1.036 16.544Z"/></g><mask id="e" width="43" height="42" x="241" y="96" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M283.98 96.257h-42.183v40.942h42.183V96.257Z"/></mask><g fill-rule="evenodd" clip-rule="evenodd" mask="url(#e)"><path fill="#20D3BD" d="M265.896 101.916s3.821-3.122 6.368-2.472c2.882.716 6.434 6.506 5.831 7.091l-1.408 5.204c1.206 2.277 3.083 5.14 2.949 7.351-.268.976 4.222-1.756 4.289.326-.804 5.074-3.552 11.514-10.455 7.546l-2.413 1.691c-2.011-.716-2.815-2.472-5.094-2.732l-1.675 3.122 2.815 4.749c.737.846 3.15.586 6.233.521l2.212-.131c-1.877.781-3.955 1.302-5.831 2.082-3.284.976-4.491.781-5.496.325-1.073-.39-2.748-.91-3.552-1.301-6.234-3.382-6.703-6.7-7.373-9.692-.737-6.376 1.005-8.587 3.083-9.953-1.474.325-8.512 1.756-8.646.13-1.474-3.383-3.887-5.66-5.898-8.392-.469-2.017.402-4.033 2.011-6.05l3.619.195c1.609-1.691 2.614-4.358 4.96-4.944.201-.52 13.136 4.359 13.471 5.334Z"/><path fill="#20D3BD" d="M277.29 112.975c1.14 1.692 2.011 3.513 2.279 5.465l-.603 1.301c-.536-.195-1.274-.391-1.676-.651.268-.325.402-.65.402-.91 0-.131-.067-.196-.268-.326.469.065.939.065 1.408.065.134-.065.335-.13.134-1.171a12.085 12.085 0 0 0-.67-1.301l-1.341-.455c.201-.065.469-.065.469-.39l-.134-1.627Zm5.764 6.245c.402-.26.201-.325 0-.195-1.407.716-2.48.781-3.217.521.469.52 1.341 1.301 3.217-.326Z"/><path fill="#20D3BD" d="M283.188 118.83c2.681.846-2.547 13.856-9.852 8.457l-1.944 1.301c-1.876-.781-1.608-.976-1.541-1.236l1.206-2.927c2.949 2.276 6.568 5.854 10.255.195 1.139-1.496 1.675-2.863 1.943-4.619 0-.39.134-.781-.067-1.171Zm-12.6 4.879-.67.976c.067-.26 1.541-.781 2.01-.781l-1.34-.195Zm3.753-6.375c.067.325.201.65.067 1.041l.738.455c-1.475.13-3.084.065-4.156 1.236l.536-1.106c-.134-.325-.201-.976-.134-.911.067 0-.402-.065-.469-.065l3.418-.65Zm-2.882-2.732c-.201.065-.268 0-.804 1.886.67-1.106 1.743-1.691 2.815-2.016-.67 0-1.273-.196-2.011.13ZM267.639 136.394c-1.877.586-5.161-.26-6.3-1.171-1.073-.78-.67-1.496-2.212-2.342-3.217-1.691-3.217-4.813-3.753-6.7-.603-3.383 0-7.871 1.34-10.408-2.01.715-3.619 3.643-3.351 8.717.067 3.513 1.274 7.155 7.507 10.994 2.479.78 5.428 2.341 6.769.91Zm1.944-23.484c-3.15-5.659-2.681-6.895-7.708-7.025l-7.373-1.692c2.748.976 4.893 2.082 8.311 2.928.067.325.134.65-.067.78-.737.326-1.407.456-2.144.651 3.619.13 6.769 1.301 8.981 4.358Zm.335-8.522c-5.429-3.968-11.528-6.375-17.962-7.806l-1.944 2.407c6.099 1.561 11.26 3.253 16.555 5.595 2.144 1.756 3.753 4.553 5.428 6.83-.536-2.537-1.139-4.749-2.077-7.026Zm5.026 1.171-2.211-4.033c-1.408-1.236-1.877-.976-2.547-1.171 2.145.976 2.681 3.058 3.686 4.229.469.78 1.408 2.797 1.408 2.797l-.336-1.822Zm3.553.521c-2.547-4.879-4.491-6.115-6.301-6.57.202.195.336.455.537.65l3.887 5.074c.469 1.106.067 3.903-.134 5.66l2.011-4.814Z"/><path fill="#020D10" d="M268.778 111.089c-.67-1.431-1.072-3.578-2.412-4.684-1.609-.52-4.022-.39-6.234-.455 1.877.455 4.692.455 6.032 1.301 0 .065 0 .13-.134.13-.335-.065-.67-.13-1.005-.065-.536.13-1.005.455-1.474.715 1.34-.26 1.742.065 2.748.13 1.072.391 1.742 2.342 2.479 2.928Zm3.955-9.498c.067.455.134.911.536 1.431.737.781 1.005 1.366 1.139 1.627l.939 2.732-.537-2.863c-.134-.455-1.742-2.927-2.077-2.927Zm5.63 13.791-.805-.195h.671l.134.195Zm-4.826-.845c-1.34.195-1.676.26-2.547 1.171.134-.326.134-.716.402-1.106.738-.196 1.408-.196 2.145-.065Zm8.579 5.139c-1.609.52-1.676.065-2.279-.13.402.455.871.78 1.743.585 1.139-.325 1.206-.65 1.608-.911l-1.072.456Zm-3.15 0-.268.65-.335-.13v-.26c-.604-.26-1.81-.325-1.81-.26-.402.39-.737.91-1.072 1.366.469-.325.804-.911 1.474-1.041l1.005.195c-.201.065-.603.065-.603.13-.469.586-.804 1.301-1.273 1.887.536-.586.737-1.171 1.742-1.692.067-.065.671-.065.939.131-.067.325-.268.715-.469 1.04-.268.521-.671 1.041-1.006 1.562 1.073-1.301.805-.781 1.475-1.627l.871-2.211-.67.26Zm-7.038 4.228c-1.273 0-1.273 0-2.144.846 0-.325.067-.651.603-1.041 0 0 1.407.13 1.541.195Zm-1.005-6.05c1.274-.78 2.145-1.041 3.686-.65l-.603.195c.067 0 .402 1.041.134 1.106l1.006.26c-1.274.065-2.48 0-3.62.52l.536-.455c0 .13-.201-.716-.134-1.041-.067-.065-1.005.065-1.005.065Z"/><path fill="#020D10" d="m279.703 119.351-.737.325h-.268l-1.408-.521h.268c.067-.26.134-.65.335-.715.202-.26-.268-.26-.402-.391l.47.131c.603 0 1.273-.065 1.34.585l.201-.13.201.716Z"/><path fill="#20D3BD" d="M272.867 118.18c.067.195.067.325 0 .455-.268 0-.536.065-.738.195-.134.13-.201-.585-.134-.715.201-.131.805-.131.872.065Zm5.429 1.105c-.067.066-.671 0-.671-.13-.067-.13.067-.52.201-.585 0 0 .537-.065.604.195 0 .065-.067.455-.134.52Z"/><path fill="#020D10" d="M260.534 135.288c2.078-.065 4.29.131 6.301-.78l-.738-1.171c-4.691.715-7.908-.651-9.852-1.561h-.335l4.624 3.512Zm-7.372-10.863c2.547 1.756 3.217 3.838 10.992 5.399l.804 1.821c-3.753.131-8.244-1.691-10.858-3.252l-.938-3.968Zm2.413-8.197c-.871 1.041-1.609 2.082-2.145 3.838.536 2.212 5.027 7.156 11.126 7.806.134 0 .335-.91.335-.91-2.078-.976-3.753-2.147-5.429-3.318-2.748-2.017-3.418-4.359-3.887-7.416Zm2.949-1.756c1.943-.651 3.753-.976 5.563-1.367-.402 1.497-.604 2.472-.201 5.4.268.911 2.01 1.626 3.351 1.951-.603 1.041-1.743 2.733.67 4.554.335.521.603 1.041.871 1.561-1.072.065-2.077.196-3.552-.26-1.072-.52-1.273-.911-2.011-1.756-1.943-3.188-3.887-6.636-4.691-10.083Z"/><path fill="#020D10" stroke="#020D10" stroke-linecap="round" stroke-linejoin="round" stroke-width=".008" d="M251.889 96.257c3.552.26 7.372 1.626 7.975 2.147 1.274.585 2.48 1.17 3.485 1.691.135.065.939.716 2.681 1.496.805-.39 1.475-1.236 2.279-1.691.536-.39 1.207-.52 1.944-.65.603-.13 2.48.064 2.949.26 1.675.715 2.547 1.886 3.619 3.382.469.716.804 1.366 1.139 1.952.269.585.671 1.171.671 1.626 0 .26-.201.455-.335.781-.47 1.301-.939 2.342-1.14 3.838 0 .195-.134.455-.134.846v.195l-.067.39c-.067.26 0 .455 0 .846 0 0-.67-1.431-.469-2.537 0-.261.737-2.342.871-2.668.134-.52.268-.975.402-1.496.134-.65 0-1.041-.268-1.626-1.206-2.277-3.284-4.489-4.088-5.074-.067-.065-.737-.195-.938-.325-.201 0 .268.52.268.52-.268.26-1.542-1.04-3.687-.13-.469.195-.804.455-1.139.715a8.056 8.056 0 0 0-1.072 1.041c0 .065.201.261.603.456 1.005.585 2.748 1.821 3.15 2.342.134.13.67 2.927 1.206 4.748.134.586 1.408 1.171 1.408 1.171-.268 0-.938-.195-1.274-.26-.067.195.201 1.496.201 1.496s-.268-.585-.603-2.081c-.469-1.431-.938-2.993-1.608-4.359-.671-.911-2.949-2.602-3.754-2.862-.871-.456-1.809-.911-2.815-1.431-2.479-1.301-5.562-3.188-10.522-3.969-.536.066-.804.196-1.408.456-1.407 1.236-1.742 2.667-3.887 3.838.067.13.201.26.402.26 1.408.26 3.619 1.626 5.563 2.667 0 0-2.614-1.171-4.624-1.886a13.24 13.24 0 0 0-1.944-.456c-.737-.065-1.743-.065-2.815-.13-1.005.976-1.609 1.952-1.944 3.188-.134 1.301.134 1.756.201 2.212.335 1.496 1.609 2.862 3.15 4.293.403.39.872.781 1.207 1.236.603.911.804 2.537 1.474 3.448.134.13 1.81 0 2.815.13.469.065.872.065 1.341 0 1.407-.325 2.346-.65 3.418-.976.469-.26 2.212-.845 2.681-.976l.134.651a7.589 7.589 0 0 0-2.815 1.171c-.201.065-.402.39-.536.65-2.949 3.643-1.877 8.392-1.073 11.19.537 1.17 1.207 2.732 1.877 3.577 1.206 1.171 2.614 2.407 4.155 3.318l.201.13c1.274.781 2.681 1.366 4.089 1.561.737.131 4.155.586 2.614-1.366 0-.065-.402-.39-.536-.845l-.738-.976c-.804-1.171-2.144-3.123-1.809-3.643 0-.651.134-1.431.335-1.887.268-.65.536-1.236.737-1.626l2.279-1.561c.402.65.938 1.171 1.34 1.951.805 2.017 2.681 2.147 4.29.586l.469-.39c1.206.585 2.413 1.561 4.692 1.171 1.876-.261 3.15-2.212 4.356-4.424.536-1.236.938-2.602 1.005-3.773 0-.065-.067-1.171-.603-1.106-.871.065-.804.52-1.809.716-.604-.065-1.408.065-1.408 0-.402-.586.067-1.627-.469-2.472-.134-.131-1.609-2.863-1.877-4.034-.067-.325-.268-.325-.268-.325l.067-.52s.536.455.737.65c.47.456.805 1.561.872 1.757.402.715.938 1.691 1.407 2.602.067.065.201.65.067 1.821h-.469c1.408.13 1.944-.52 3.351-.911.402-.065.871.521 1.207 1.106.268.261-.671 5.335-3.486 8.457-2.211 1.822-5.428 1.366-7.439 0-.67.911-1.274 1.952-4.021 1.171-.805-.52-.939-1.236-1.274-1.951-.536.13-.938.065-1.81-.066-.268 0-.402 0-.603.456l.738 1.041c.268.325.536.91 2.211 1.561.201.065.738.065.738.065l-.202.065c-.804.26-1.943-.26-1.943-.195-.871-.26-1.542-.781-2.078-1.431.067.585.067 1.171.268 1.691.134.39.201.521.335.846.067.065.335.13.738.26.134.065.603.195.871.26.804.065 1.675 0 1.675 0-.536.521-2.01.456-2.748.391.269.52.537 1.04.738 1.561.134.26.067.26 1.675.455-.737.065-1.206.26-1.407.26-.134 0 .067.391.134.456.335.325.804.325 1.206.39 1.944.195 6.099-.13 6.099-.13s-4.691 1.626-7.037 2.277c-.871.195-1.81.26-2.614.195-4.692-1.041-8.043-3.643-9.517-5.725-.536-.715-1.005-1.756-1.274-2.407-.536-1.431-.871-2.667-1.072-4.228-.335-3.448.201-5.595 1.944-8.002.201-.26.67-.52.737-.715-.536-.065-1.139.195-1.81.325-.67.195-1.474.325-2.144.456-.47.065-1.006.065-1.341.065-.871-.065-1.809-.065-2.547-.196-.335-.065-.268-.065-.402-.325-.335-.715-.67-1.756-1.072-2.537-.536-1.171-1.341-1.951-2.681-3.253-1.475-1.561-3.083-3.512-2.48-5.919.268-.976 1.005-2.472 1.609-3.253.536-.52 1.072-.716 1.675-.455.603.065.871 0 1.207 0 .737-.065 1.34-.326 1.541-.521 1.005-.715 1.743-1.756 2.748-2.732a11.52 11.52 0 0 1 1.676-1.496Zm21.112 30.9-.402-.521c-.201.131-.335.261-.604.716-.134.195-.268.325-.402.325-.536.065-1.072-.065-1.675-.455.067.26.603.52.938.781-.335 0-.871 0-1.005-.196-.536-.715-.469-.91-.335-1.106.536-.715 1.206-1.366 1.407-2.341.603.845 1.475 1.626 2.48 2.407l-.402.39Z"/></g><mask id="f" width="43" height="43" x="82" y="250" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M124.57 250.798H82.387v42.183h42.183v-42.183Z"/></mask><g fill="#20D3BD" mask="url(#f)"><path d="M102.049 259.536c-1.722-2.582-2.094-6.033-2.175-7.451-4.374.946-8.718 2.642-8.467 3.892.031.157.229.345.558.529l-.514.92c-.628-.352-.982-.758-1.078-1.243-.283-1.414 1.318-2.692 4.894-3.91 2.442-.832 4.905-1.328 5.009-1.349l.63-.126v.644c0 .044.027 4.521 2.02 7.51l-.877.584ZM103.806 292.981h-.265c-8.636 0-18.248-2.713-19.384-7.252-.692-2.773 1.573-5.837 6.552-8.857l.548.9c-4.48 2.719-6.638 5.453-6.076 7.702.986 3.94 10.095 6.397 18.084 6.452.95-1.42 6.054-9.763 3.141-20.952l1.019-.266c3.32 12.749-3.392 21.968-3.46 22.06l-.159.213Z"/><path d="M88.182 289.087c-.569 0-.85-.063-.897-.074a.524.524 0 0 1-.381-.371.525.525 0 0 1 .136-.515c.076-.076 7.588-7.599 8.602-13.682l1.039.173c-.872 5.233-6.025 11.199-8.071 13.396 2.044-.117 7.206-1.074 17.115-6.62-7.733-.848-8.956-7.039-8.969-7.105l1.037-.191c.049.259 1.292 6.337 9.745 6.337h.009a.527.527 0 0 1 .264.984c-11.845 6.862-17.588 7.667-19.629 7.668Z"/><path d="M93.024 291.611a.527.527 0 0 1-.307-.957c.036-.026 1.912-1.41 3.907-4.457a21.113 21.113 0 0 1-2.315-1.199c-.936-.562-1.644-1.165-2.172-1.783-2.709.715-5.21.998-7.406.811l.088-1.05c1.978.168 4.227-.066 6.665-.675-1.659-2.834-.136-5.647-.115-5.684l.921.513c-.071.129-1.334 2.499.263 4.884 2.32-.666 4.796-1.652 7.357-2.933a33.835 33.835 0 0 0 1.292-6.616.53.53 0 0 1 .744-.428c.034.016 3.442 1.572 5.909 2.587a.527.527 0 0 1 .096.923 65.892 65.892 0 0 1-7.146 4.262 28.71 28.71 0 0 1-2.593 5.894c3.903 1.459 7.29 1.481 7.334 1.481a.526.526 0 0 1 .256.989c-4.787 2.659-12.406 3.407-12.728 3.438h-.05Zm4.623-4.99c-1.097 1.701-2.174 2.923-2.979 3.721 2.106-.31 5.799-.989 8.864-2.255a25.026 25.026 0 0 1-5.885-1.466Zm-4.367-3.728c.414.413.931.817 1.571 1.202.776.466 1.563.861 2.34 1.196a27.522 27.522 0 0 0 2.259-4.816c-2.131 1.014-4.199 1.824-6.17 2.418Zm8.893-9.596a35.675 35.675 0 0 1-.963 5.113 65.65 65.65 0 0 0 5.337-3.19 221.475 221.475 0 0 1-4.374-1.923ZM96.609 258.822a.532.532 0 0 1-.343-.126c-1.698-1.453-3.695-4.409-3.78-4.535a.527.527 0 0 1 .69-.757c.011.003.989.406 7.609 1.509a.526.526 0 0 1 .305.873c-1.853 2.059-4.195 2.966-4.294 3.003a.554.554 0 0 1-.187.033Zm-2.401-4.063c.665.895 1.624 2.104 2.501 2.919a11.786 11.786 0 0 0 2.893-1.895c-2.724-.465-4.385-.796-5.394-1.024Z"/><path d="M100.74 273.371a.527.527 0 0 1-.524-.582c.308-2.898-4.139-4.061-4.184-4.071a.529.529 0 0 1-.243-.884c.219-.218 5.418-5.375 11.942-8.206a.526.526 0 0 1 .727.589c-1.251 6.056-7.075 12.698-7.321 12.977a.538.538 0 0 1-.397.177Zm-3.572-5.392c1.249.469 3.435 1.555 3.989 3.538 1.527-1.906 4.788-6.297 6.006-10.474-4.625 2.225-8.52 5.58-9.995 6.936Z"/><path d="m91.5 277.546-.5-.927c1.985-1.071 4.259-3.04 6.122-5.329-1.586 1.086-2.494 1.829-2.522 1.854l-.674-.812c.041-.034 1.86-1.526 4.883-3.395.829-1.335 1.467-2.707 1.795-4.023.056-.224.105-.44.144-.649-2.03-.724-3.902-1.153-5.189-1.337a.527.527 0 0 1-.313-.881c.09-.097 2.231-2.391 4.907-3.651a.53.53 0 0 1 .613.12c.07.077 1.518 1.703 1.15 5.066a28.265 28.265 0 0 1 3.68 1.738c2.909-1.308 6.212-2.484 9.73-3.195a.528.528 0 0 1 .595.708c-1.371 3.513-5.046 7.265-5.202 7.423a.531.531 0 0 1-.789-.042c-1.18-1.485-2.724-2.714-4.389-3.714a57.982 57.982 0 0 0-5.992 3.214c-2.13 3.324-5.344 6.376-8.049 7.832Zm15.196-11.559c1.36.877 2.626 1.908 3.673 3.108.873-.947 2.968-3.34 4.156-5.716-2.794.643-5.438 1.574-7.829 2.608Zm-4.948-1.343c-.035.172-.075.348-.119.527-.221.885-.574 1.793-1.025 2.7a59.404 59.404 0 0 1 3.815-2.001 26.882 26.882 0 0 0-2.671-1.226Zm-5.009-2.583a30.65 30.65 0 0 1 4.155 1.145c.16-1.943-.365-3.133-.682-3.661-1.451.757-2.721 1.822-3.473 2.516Z"/><path d="M96.741 267.151c0 4.618-3.848 8.287-6.62 10.965-.465.453-2.035.527-2.035.527.39-.401.832-.823 1.307-1.276 2.636-2.551 6.294-6.041 6.294-10.216 0-4.945-1.993-6.895-3.564-8.455-.695-.707-1.286-1.381-1.644-2.204l.327-.137c.358.158.77.338 1.086.475.253.369.59.727.98 1.117 1.613 1.613 3.87 3.827 3.87 9.204Z"/><path d="M122.977 268.515s-.638.091-.817.112c-9.235 1.023-18.766 3.68-24.217 5.862-1.971.791-4.017 1.75-5.883 2.826-.01.01-.021.01-.042.021-1.096.632-3.764 1.939-5.925 3.089 3.163-3.364 9.088-5.957 11.45-6.906 5.345-2.14 14.528-4.723 23.563-5.83-1.065-1.244-3.669-3.88-8.793-5.841-2.994-1.16-7.549-1.813-11.565-2.393-6.389-.917-10.027-1.529-10.375-3.268a1.617 1.617 0 0 1 .137-1.034c.348.57.844.97 1.171 1.202.158.106.274.169.316.19l.011.011c1.497.79 5.535 1.37 8.898 1.855 4.069.591 8.677 1.255 11.787 2.446 7.243 2.794 9.741 6.79 9.847 6.958.095.159.437.7.437.7Z"/></g></g><g opacity=".66"><mask id="g" width="43" height="43" x="291" y="188" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M333.196 188.044h-42.183v42.183h42.183v-42.183Z"/></mask><g fill="#20D3BD" mask="url(#g)"><path d="M322.357 198.589c-3.616 0-6.948 2.035-10.168 5.591-3.164-3.612-6.552-5.591-10.336-5.591-6.267 0-10.84 4.473-10.84 10.493 0 6.021 4.573 10.437 10.84 10.437 3.851 0 6.836-1.806 10.168-5.406 3.22 3.611 6.496 5.417 10.336 5.417 6.267-.011 10.84-4.411 10.84-10.448 0-6.037-4.573-10.493-10.84-10.493Zm-20.46 14.613c-2.655 0-4.237-1.75-4.237-4.064s1.582-4.114 4.237-4.114c2.236 0 4.064 1.8 6.043 4.226-1.867 2.258-3.84 3.952-6.043 3.952Zm20.27 0c-2.202 0-4.064-1.75-6.043-4.064 2.035-2.426 3.785-4.114 6.043-4.114 2.656 0 4.221 1.822 4.221 4.114s-1.565 4.064-4.221 4.064Z"/><path d="m316.733 218.025 4.215-5.032c-1.677-.503-3.226-2.012-4.83-3.885l-4.103 5.003a18.425 18.425 0 0 0 4.718 3.914ZM312.176 204.171a18.95 18.95 0 0 0-4.69-4.002l-4.22 5.087c1.604.559 3.024 2.001 4.533 3.84l.168.118 4.209-5.043Z"/></g><mask id="h" width="44" height="44" x="288" y="727" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M331.104 727.862h-42.183v42.183h42.183v-42.183Z"/></mask><g fill="#20D3BD" mask="url(#h)"><path d="M307.242 727.862c.088.058.175.123.266.178 1.138.657 2.277 1.311 3.415 1.972.091.051.178.11.308.191-.133.084-.237.152-.34.21l-16.06 9.278c-.53.307-1.061.618-1.598.916-.171.094-.243.201-.239.401.003 5.306.003 10.608.003 15.914v.217c1.333.77 2.659 1.538 4.04 2.334.006-.175.013-.295.013-.418 0-5.163 0-10.326.003-15.489 0-.56-.081-.415.401-.693l17.513-10.119c.055-.033.116-.059.168-.098.132-.103.249-.074.385.007.443.265.892.518 1.342.777 2.759 1.596 5.518 3.192 8.284 4.778.213.123.301.252.291.505a27.707 27.707 0 0 0 0 1.777c.01.259-.074.398-.301.531-3.241 1.861-6.475 3.732-9.713 5.6-1.941 1.12-3.879 2.243-5.823 3.357-.223.126-.307.262-.307.524.01 5.95.007 11.9.007 17.853v.434c-.101.062-.198.13-.298.188-.505.291-1.009.579-1.511.874-.09.052-.168.123-.252.184h-.129c-.068-.048-.133-.103-.204-.145-.447-.263-.896-.515-1.342-.78-.421-.25-.363-.12-.366-.619v-20.28c0-.065.006-.13 0-.195-.019-.162.049-.265.197-.33.059-.026.114-.065.169-.097 4.486-2.59 8.972-5.183 13.459-7.772.107-.062.213-.13.343-.211-.12-.074-.201-.126-.285-.175-1.158-.666-2.316-1.33-3.467-2.01-.214-.126-.363-.133-.583-.006-4.519 2.619-9.044 5.231-13.569 7.843-.055.033-.11.072-.168.097-.11.052-.165.13-.152.256.006.084 0 .172 0 .259v20.666c-.139-.074-.233-.12-.324-.172-2.322-1.34-4.645-2.68-6.967-4.023-1.64-.949-3.28-1.901-4.92-2.849 0-.152-.003-.301-.003-.453v-20.203c0-.152-.007-.301-.01-.453.036-.026.068-.052.104-.075 5.984-3.457 11.964-6.914 17.949-10.368.084-.042.184-.059.271-.088Z"/><path d="M313.385 766.436v-4.704l7.941-4.587v-4.502c-2.646 1.518-5.263 3.042-7.922 4.567-.016-.091-.036-.146-.036-.204-.003-1.424.004-2.845-.006-4.27-.003-.204.1-.281.246-.365 1.931-1.114 3.862-2.231 5.79-3.344 1.892-1.095 3.784-2.185 5.68-3.28.1-.058.204-.11.339-.181.007.143.017.246.017.346 0 4.419 0 8.838.006 13.257 0 .233-.065.362-.272.482-3.836 2.208-7.666 4.422-11.499 6.636-.087.055-.171.094-.284.149Z"/></g><path fill="#20D3BD" d="M158.202 459.218c-.108 0-.217.054-.325.108l-3.839 2.326-3.84-2.271c-.217-.109-.487-.109-.649 0l-7.788 4.759a.594.594 0 0 0-.324.54v4.76l-3.678 2.163a.594.594 0 0 0-.324.541v7.787c0 .217.108.433.324.541l3.678 2.109v4.868c0 .216.108.432.324.54l7.842 4.814c.216.108.487.108.649 0l3.84-2.272 3.785 2.326c.217.108.487.108.649 0l7.842-4.814a.594.594 0 0 0 .324-.54v-4.759l3.678-2.11a.594.594 0 0 0 .324-.54v-7.896a.594.594 0 0 0-.324-.541l-3.678-2.109v-4.813a.594.594 0 0 0-.324-.541l-7.788-4.868a1.001 1.001 0 0 0-.378-.108Zm0 1.406 7.193 4.435v1.568l-1.839.054c-.271-.703-.974-1.243-1.785-1.243a1.916 1.916 0 0 0-1.893 1.892c0 1.028.866 1.893 1.893 1.893.811 0 1.46-.486 1.731-1.189l1.893-.055v1.893c0 .217.108.433.324.541l3.678 2.109v6.382l-2.542-1.46c0-.109.054-.217.054-.325a1.938 1.938 0 0 0-1.947-1.947 1.938 1.938 0 0 0-1.947 1.947c0 1.082.865 1.947 1.947 1.947.487 0 .919-.162 1.298-.487l2.488 1.406-3.029 1.731a.594.594 0 0 0-.324.541v4.759l-7.193 4.381-3.515-2.164v-3.461l3.136.054c.271.703.974 1.19 1.731 1.19a1.916 1.916 0 0 0 1.893-1.893 1.917 1.917 0 0 0-1.893-1.893c-.811 0-1.514.541-1.785 1.244l-3.137-.054v-8.274a.594.594 0 0 0-.324-.541l-3.84-2.326-.649 1.136 3.515 2.109v2.812l-2.704 1.569v-2.272a.665.665 0 0 0-.27-.54l-3.677-2.38v-3.191l3.677-2.055a.595.595 0 0 0 .325-.541v-3.785h-1.298v3.407l-3.353 1.893-3.299-2.001v-4.381l2.704-1.676v4.002h1.298v-4.814l3.136-1.947 3.57 2.11v7.463c0 .216.108.432.324.541l4.002 2.487c-.054.163-.054.325-.054.487 0 1.082.865 1.893 1.947 1.893s1.947-.865 1.947-1.893-.865-1.947-1.947-1.947c-.433 0-.811.162-1.136.379l-3.731-2.326v-7.139l3.407-2.055Zm3.569 6.112a.6.6 0 0 1 .595.594.6.6 0 0 1-.595.595.6.6 0 0 1-.595-.595c.054-.324.271-.594.595-.594Zm-19.631 3.839 3.353 1.947v3.191l-3.678 2.001.595 1.136 3.678-2.001 3.353 2.163v2.704l-4.165 2.434.649 1.135 7.464-4.38v8.599l-3.516 2.055-2.812-1.731 3.029-1.839-.649-1.081-3.57 2.163-3.136-1.947v-4.489l3.407-1.947-.649-1.135-3.407 1.947-3.353-1.893v-3.137l3.515-2.163-.649-1.082-2.812 1.731v-2.38l3.353-2.001Zm17.414 2.596c.378 0 .649.271.649.649a.658.658 0 0 1-.649.649.657.657 0 0 1-.649-.649c.054-.378.324-.649.649-.649Zm5.408 3.353c.378 0 .649.271.649.649a.625.625 0 0 1-.649.649.624.624 0 0 1-.649-.649c0-.378.27-.649.649-.649Zm-5.354 8.221a.6.6 0 0 1 .595.594.6.6 0 0 1-.595.595.6.6 0 0 1-.595-.595.6.6 0 0 1 .595-.594Z"/></g><mask id="i" width="41" height="41" x="265" y="357" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M305.94 357H265v40.94h40.94V357Z"/></mask><g fill="#29B5E8" mask="url(#i)"><path d="m300.083 388.202-8.639-4.993a2.542 2.542 0 0 0-3.795 2.447v9.757a2.53 2.53 0 0 0 5.056 0v-5.611l4.84 2.796a2.537 2.537 0 0 0 3.468-.931 2.531 2.531 0 0 0-.93-3.465ZM278.598 377.503a2.49 2.49 0 0 0-1.239-2.193l-8.639-4.988a2.487 2.487 0 0 0-3.387.908 2.484 2.484 0 0 0 .908 3.389l4.98 2.873-4.98 2.877a2.458 2.458 0 0 0-1.155 1.505 2.465 2.465 0 0 0 .247 1.883 2.484 2.484 0 0 0 3.387.909l8.639-4.989a2.493 2.493 0 0 0 1.239-2.174ZM270.68 366.786l8.639 4.989a2.536 2.536 0 0 0 3.045-.383 2.518 2.518 0 0 0 .816-1.861v-10a2.53 2.53 0 1 0-5.056 0v5.692l-4.906-2.833a2.537 2.537 0 1 0-2.538 4.396ZM290.105 377.908c0 .191-.11.456-.246.596l-3.424 3.425a.97.97 0 0 1-.596.246h-.871a.97.97 0 0 1-.596-.246l-3.428-3.425a.982.982 0 0 1-.246-.596v-.872c0-.195.11-.46.246-.596l3.428-3.429a.97.97 0 0 1 .596-.246h.871c.192 0 .46.11.596.246l3.424 3.429a.963.963 0 0 1 .246.596v.872Zm-3.056-.42v-.036a.727.727 0 0 0-.18-.438l-1.011-1.008a.693.693 0 0 0-.438-.184h-.037a.709.709 0 0 0-.437.184l-1.008 1.008a.708.708 0 0 0-.18.438v.036c0 .144.081.339.18.438l1.008 1.012c.103.099.298.18.437.18h.037a.71.71 0 0 0 .438-.18l1.011-1.012a.708.708 0 0 0 .18-.438ZM291.444 371.775l8.639-4.989a2.54 2.54 0 1 0-2.538-4.396l-4.84 2.796v-5.655a2.53 2.53 0 1 0-5.056 0v9.801a2.537 2.537 0 0 0 3.795 2.443ZM281.051 382.915a2.521 2.521 0 0 0-1.732.294l-8.639 4.993a2.534 2.534 0 0 0-.93 3.465 2.535 2.535 0 0 0 3.468.931l4.906-2.833v5.648a2.53 2.53 0 0 0 5.056 0v-10a2.53 2.53 0 0 0-2.129-2.498ZM305.482 371.201a2.534 2.534 0 0 0-3.468-.931l-8.639 4.989a2.54 2.54 0 0 0-1.269 2.244 2.534 2.534 0 0 0 1.269 2.222l8.639 4.993a2.54 2.54 0 0 0 2.537-4.4l-4.891-2.826 4.891-2.825a2.533 2.533 0 0 0 .931-3.466Z"/></g><mask id="j" width="42" height="42" x="263" y="559" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M305 559h-42v42h42v-42Z"/></mask><g fill-rule="evenodd" clip-rule="evenodd" mask="url(#j)"><path fill="#AECBFA" d="M276.537 577.521v9.182c-1.47-.892-2.729-2.151-3.568-3.673v-5.509h3.568Z"/><path fill="#669DF6" d="M283.987 572.432v15.95a14.14 14.14 0 0 1-2.099 0c-.787 0-1.574-.053-2.308-.105v-15.845h4.407Z"/><path fill="#AECBFA" d="M291.017 579.672v3.096c-.839 1.574-2.098 2.885-3.567 3.83v-6.926h3.567Z"/><path fill="#4285F4" d="M296.054 589.064c.368-.368.945-.368 1.26 0l7.45 7.45a.957.957 0 0 1 0 1.259l-2.991 2.991a.957.957 0 0 1-1.259 0l-7.45-7.45a.958.958 0 0 1 0-1.26l2.99-2.99Z"/><path fill="#669DF6" d="M281.888 559c10.441 0 18.888 8.447 18.888 18.888 0 10.441-8.447 18.888-18.888 18.888-10.441 0-18.888-8.447-18.888-18.888 0-10.441 8.447-18.888 18.888-18.888Zm0 32.949c7.765 0 14.061-6.296 14.061-14.061 0-7.712-6.296-14.009-14.008-14.009-7.713 0-14.062 6.297-14.062 14.009 0 7.713 6.297 14.009 14.009 14.061Z"/></g><path stroke="#fff" d="M463.5 306v38M327.996 478.5l-139-1M462.5 657v-42"/><g stroke="#fff" opacity=".5"><path stroke-linecap="round" d="m128.682 288.812 124.13 70.506"/><path d="M119 475.5H81M121.763 668.56l134-72M268.567 818.751l23-40"/><path stroke-linecap="round" d="m463.973 725.508-2.465 144.16M464.496 99.504l-.992 139M278.671 147.224l16.553 33.105"/></g><path stroke="#fff" d="m317.248 394.566 28 16M329.441 238.765l65 122M325.561 721.245l67-122.485M315.76 569.061l32-17.5"/><path fill="#08303A" fill-rule="evenodd" d="m479.172 439.043 12.033 16.837a19.19 19.19 0 0 1 1.438 19.977 19.25 19.25 0 0 1-17.142 10.402h-24.038a19.247 19.247 0 0 1-17.114-10.418 19.191 19.191 0 0 1 1.446-19.961l12.055-16.837A19.26 19.26 0 0 1 463.511 431a19.262 19.262 0 0 1 15.661 8.043Zm-27.68 41.398h24.038a13.42 13.42 0 0 0 11.932-7.263 13.378 13.378 0 0 0-1.006-13.916l-12.033-16.845a13.433 13.433 0 0 0-10.927-5.616 13.433 13.433 0 0 0-10.926 5.616l-12.004 16.845a13.378 13.378 0 0 0-1.006 13.916 13.419 13.419 0 0 0 11.932 7.263Z" clip-rule="evenodd"/><path fill="#11696B" fill-rule="evenodd" d="m474.167 450.068 23.958 33.514a13.075 13.075 0 0 1 .987 13.6 13.112 13.112 0 0 1-11.658 7.099h-47.908a13.11 13.11 0 0 1-11.658-7.099 13.075 13.075 0 0 1 .987-13.6l23.943-33.514a13.117 13.117 0 0 1 10.675-5.49c4.237 0 8.214 2.045 10.674 5.49Zm-34.621 48.395h47.908a7.283 7.283 0 0 0 6.458-3.939 7.263 7.263 0 0 0-.529-7.538l-23.957-33.543a7.289 7.289 0 0 0-11.859 0l-23.95 33.543a7.263 7.263 0 0 0-.53 7.538 7.284 7.284 0 0 0 6.459 3.939Z" clip-rule="evenodd"/><path fill="#20D3BD" fill-rule="evenodd" d="m469.477 461.247 35.16 49.202a7.322 7.322 0 0 1 .549 7.61 7.344 7.344 0 0 1-6.522 3.976h-70.328a7.344 7.344 0 0 1-6.522-3.976 7.322 7.322 0 0 1 .549-7.61l35.16-49.202a7.339 7.339 0 0 1 5.977-3.078 7.339 7.339 0 0 1 5.977 3.078Zm-41.141 54.97h70.328a1.515 1.515 0 0 0 1.231-2.393l-35.168-49.202a1.516 1.516 0 0 0-2.462 0l-35.16 49.202a1.51 1.51 0 0 0-.115 1.571c.259.504.779.821 1.346.822Z" clip-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/datahub-web-react/src/images/lineage-status.svg b/datahub-web-react/src/images/lineage-status.svg
new file mode 100644
index 00000000000000..40bca966db00a5
--- /dev/null
+++ b/datahub-web-react/src/images/lineage-status.svg
@@ -0,0 +1,6 @@
+<svg width="1em" height="1em" viewBox="1 1 10 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.91675 11.291C9.67614 11.291 10.2917 10.6754 10.2917 9.91602C10.2917 9.15662 9.67614 8.54102 8.91675 8.54102C8.15736 8.54102 7.54175 9.15662 7.54175 9.91602C7.54175 10.6754 8.15736 11.291 8.91675 11.291Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.41675 5.79102C4.17614 5.79102 4.79175 5.17541 4.79175 4.41602C4.79175 3.65662 4.17614 3.04102 3.41675 3.04102C2.65736 3.04102 2.04175 3.65662 2.04175 4.41602C2.04175 5.17541 2.65736 5.79102 3.41675 5.79102Z" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.625 4.41602H8C8.24312 4.41602 8.47627 4.51259 8.64818 4.6845C8.82009 4.85641 8.91667 5.08957 8.91667 5.33268V8.54102" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.41675 5.79102V11.291" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/datahub-web-react/src/images/no-docs.svg b/datahub-web-react/src/images/no-docs.svg
new file mode 100644
index 00000000000000..faab93c7a851fc
--- /dev/null
+++ b/datahub-web-react/src/images/no-docs.svg
@@ -0,0 +1,54 @@
+<svg width="83" height="87" viewBox="0 0 83 87" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="41.5" cy="43.5" r="41.5" fill="#DEE2EB"/>
+<mask id="mask0_5261_99528" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="2" width="83" height="83">
+<circle cx="41.5" cy="43.5" r="41.5" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask0_5261_99528)">
+<rect x="-16" y="23" width="70" height="31" rx="4" fill="#8998AE"/>
+<path d="M44 23H50C52.2091 23 54 24.7909 54 27V50C54 52.2091 52.2091 54 50 54H48C45.7909 54 44 52.2091 44 50V23Z" fill="#72839C"/>
+<path d="M-16 39H44L54 51H-6L-16 39Z" fill="#718093"/>
+<path d="M44 39L54 51H44V39Z" fill="#4B5869"/>
+<rect x="-3" y="50" width="60" height="31" rx="4" fill="#F5F6FA"/>
+<rect x="18" y="64" width="18" height="3" rx="1.5" fill="white"/>
+<path d="M-33 16H37L51 23H-19L-33 16Z" fill="#EBEDF6"/>
+<g filter="url(#filter0_d_5261_99528)">
+<path d="M36 47.9999C30.6667 46.8333 25.0001 40.4999 30 34.9999C37.7417 26.484 53.8609 35.8503 58.5 27.4999C61.0001 22.9999 54.8334 18.3333 52.5 18.4999" stroke="#606F84" stroke-linecap="round" stroke-dasharray="2 2"/>
+</g>
+</g>
+<circle cx="58" cy="54" r="2" fill="#6A708E"/>
+<circle cx="58" cy="54" r="2" fill="#6A708E"/>
+<circle cx="73" cy="1" r="1" fill="#6A708E"/>
+<path d="M49.0897 17.3861C49.8027 17.8921 50.2843 18.5451 50.5011 19.1714C50.7184 19.7988 50.6606 20.3562 50.3788 20.7533C50.0969 21.1505 49.5898 21.389 48.9259 21.3911C48.2632 21.3931 47.4878 21.1541 46.7748 20.6481C46.0618 20.1421 45.5802 19.4891 45.3634 18.8628C45.1461 18.2354 45.2039 17.678 45.4857 17.2809C45.7675 16.8837 46.2747 16.6452 46.9386 16.6432C47.6013 16.6411 48.3767 16.8801 49.0897 17.3861Z" fill="#FDCC4B" stroke="#606F84"/>
+<path d="M49.6711 12.6998C50.5427 12.7691 51.2908 13.0833 51.7979 13.5101C52.3058 13.9376 52.5418 14.4459 52.5032 14.9313C52.4646 15.4168 52.1513 15.8814 51.5821 16.2233C51.014 16.5645 50.2256 16.7565 49.3541 16.6872C48.4825 16.6179 47.7344 16.3037 47.2273 15.877C46.7194 15.4495 46.4834 14.9411 46.522 14.4557C46.5606 13.9703 46.874 13.5056 47.4431 13.1638C48.0112 12.8225 48.7996 12.6305 49.6711 12.6998Z" fill="#FDCC4B" stroke="#606F84"/>
+<circle cx="47.4587" cy="16.2285" r="3.5" transform="rotate(-54.6377 47.4587 16.2285)" fill="#606F84"/>
+<mask id="mask1_5261_99528" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="2" y="7" width="12" height="12">
+<rect x="4.86328" y="7" width="8.70389" height="8.70389" transform="rotate(19.2051 4.86328 7)" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask1_5261_99528)">
+<path d="M7.19517 12.7085L5.48278 12.112C5.41 12.0866 5.35757 12.0408 5.3255 11.9744C5.29342 11.908 5.29007 11.8383 5.31543 11.7655C5.34079 11.6927 5.38665 11.6403 5.45301 11.6083C5.51937 11.5763 5.58894 11.5729 5.66172 11.5983L7.37411 12.1948L7.9706 10.4824C7.99595 10.4096 8.04183 10.3572 8.10822 10.3251C8.17463 10.293 8.24423 10.2897 8.31704 10.315C8.38985 10.3404 8.44226 10.3862 8.47429 10.4526C8.50632 10.519 8.50965 10.5885 8.4843 10.6613L7.88781 12.3737L9.60021 12.9702C9.67298 12.9955 9.72541 13.0414 9.75749 13.1078C9.78956 13.1742 9.79292 13.2438 9.76756 13.3166C9.7422 13.3894 9.69633 13.4419 9.62997 13.4739C9.56361 13.5059 9.49404 13.5092 9.42127 13.4839L7.70887 12.8874L7.11238 14.5998C7.08703 14.6726 7.04116 14.725 6.97476 14.7571C6.90836 14.7892 6.83875 14.7925 6.76595 14.7672C6.69314 14.7418 6.64072 14.6959 6.60869 14.6296C6.57667 14.5632 6.57333 14.4936 6.59868 14.4209L7.19517 12.7085Z" fill="#1C1B1F"/>
+</g>
+<mask id="mask2_5261_99528" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="16" y="68" width="19" height="19">
+<rect x="16.9507" y="71.21" width="15.0924" height="15.0924" transform="rotate(-8.60942 16.9507 71.21)" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask2_5261_99528)">
+<path d="M25.1458 78.0783L22.037 78.549C21.9049 78.569 21.7874 78.541 21.6844 78.4651C21.5815 78.3893 21.5201 78.2852 21.5 78.1531C21.48 78.0209 21.508 77.9034 21.5838 77.8006C21.6597 77.6978 21.7637 77.6363 21.8958 77.6163L25.0046 77.1457L24.5339 74.0368C24.5139 73.9047 24.5418 73.7872 24.6177 73.6843C24.6936 73.5814 24.7976 73.5199 24.9298 73.4999C25.062 73.4799 25.1795 73.5078 25.2823 73.5837C25.3851 73.6595 25.4465 73.7635 25.4665 73.8956L25.9372 77.0045L29.046 76.5338C29.1782 76.5138 29.2957 76.5417 29.3986 76.6176C29.5015 76.6935 29.563 76.7975 29.583 76.9297C29.603 77.0619 29.5751 77.1794 29.4992 77.2822C29.4233 77.385 29.3194 77.4464 29.1872 77.4664L26.0784 77.9371L26.5491 81.0459C26.5691 81.178 26.5412 81.2955 26.4653 81.3984C26.3894 81.5014 26.2854 81.5628 26.1532 81.5828C26.021 81.6028 25.9035 81.5749 25.8007 81.4991C25.6979 81.4232 25.6365 81.3192 25.6165 81.1871L25.1458 78.0783Z" fill="#1C1B1F"/>
+</g>
+<mask id="mask3_5261_99528" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="61" y="7" width="12" height="12">
+<rect x="62.2092" y="7.00586" width="10.0392" height="10.0392" transform="rotate(6.88547 62.2092 7.00586)" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask3_5261_99528)">
+<path d="M66.2418 12.865L64.1654 12.6143C64.0772 12.6036 64.0068 12.5648 63.9543 12.4979C63.9018 12.431 63.8809 12.3534 63.8916 12.2651C63.9022 12.1768 63.941 12.1065 64.0079 12.054C64.0748 12.0016 64.1524 11.9807 64.2406 11.9914L66.317 12.2421L66.5678 10.1657C66.5784 10.0775 66.6172 10.0071 66.6842 9.95463C66.7511 9.90214 66.8287 9.88123 66.917 9.89189C67.0053 9.90255 67.0756 9.94133 67.128 10.0082C67.1805 10.0751 67.2013 10.1527 67.1907 10.2409L66.9399 12.3174L69.0164 12.5681C69.1046 12.5787 69.175 12.6175 69.2275 12.6845C69.2799 12.7514 69.3008 12.829 69.2902 12.9173C69.2795 13.0056 69.2407 13.0759 69.1739 13.1283C69.107 13.1808 69.0294 13.2016 68.9411 13.191L66.8647 12.9403L66.614 15.0167C66.6033 15.1049 66.5645 15.1753 66.4976 15.2278C66.4307 15.2802 66.3531 15.3012 66.2648 15.2905C66.1765 15.2798 66.1062 15.2411 66.0537 15.1742C66.0013 15.1073 65.9804 15.0297 65.9911 14.9414L66.2418 12.865Z" fill="#1C1B1F"/>
+</g>
+<defs>
+<filter id="filter0_d_5261_99528" x="23.5662" y="17.9956" width="39.9451" height="38.5044" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_5261_99528"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_5261_99528" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/datahub-web-react/src/images/no-stats-available.svg b/datahub-web-react/src/images/no-stats-available.svg
new file mode 100644
index 00000000000000..ed9ec3effb1e9e
--- /dev/null
+++ b/datahub-web-react/src/images/no-stats-available.svg
@@ -0,0 +1,50 @@
+<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="40" cy="40" r="40" fill="#C5C7E1"/>
+<mask id="mask0_6022_15508" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="80" height="80">
+<circle cx="40" cy="40" r="40" fill="#C5C7E1"/>
+</mask>
+<g mask="url(#mask0_6022_15508)">
+<rect x="-1" y="11" width="46" height="23" rx="3" fill="white"/>
+<rect x="3" y="15" width="6" height="6" rx="3" fill="#F0F0F9"/>
+<rect x="11" y="15" width="6" height="6" rx="3" fill="#F0F0F9"/>
+<rect x="3" y="23" width="20" height="2" rx="1" fill="#C5C7E1"/>
+<rect x="3" y="27" width="9" height="2" rx="1" fill="#C5C7E1"/>
+<rect x="47" y="11" width="46" height="23" rx="3" fill="white"/>
+<rect x="51" y="15" width="6" height="6" rx="3" fill="#F0F0F9"/>
+<rect x="59" y="15" width="6" height="6" rx="3" fill="#F0F0F9"/>
+<rect x="51" y="23" width="20" height="2" rx="1" fill="#C5C7E1"/>
+<rect x="51" y="27" width="9" height="2" rx="1" fill="#C5C7E1"/>
+<rect x="-23" y="36" width="46" height="23" rx="3" fill="white"/>
+<rect x="-19" y="48" width="20" height="2" rx="1" fill="#C5C7E1"/>
+<rect x="-16" y="61" width="46" height="23" rx="3" fill="white"/>
+<rect x="-4" y="65" width="6" height="6" rx="3" fill="#F0F0F9"/>
+<rect x="-12" y="73" width="20" height="2" rx="1" fill="#C5C7E1"/>
+<rect x="57" y="36" width="46" height="23" rx="3" fill="white"/>
+<rect x="61" y="40" width="6" height="6" rx="3" fill="#F0F0F9"/>
+<rect x="69" y="40" width="6" height="6" rx="3" fill="#F0F0F9"/>
+<rect x="61" y="48" width="20" height="2" rx="1" fill="#C5C7E1"/>
+<rect x="61" y="52" width="9" height="2" rx="1" fill="#C5C7E1"/>
+</g>
+<g filter="url(#filter0_d_6022_15508)">
+<rect x="25" y="36" width="29" height="23" rx="3" fill="white"/>
+<rect x="25.5" y="36.5" width="28" height="22" rx="2.5" stroke="#B1B4D9" stroke-dasharray="2 2"/>
+</g>
+<mask id="mask1_6022_15508" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="32" y="40" width="14" height="14">
+<rect x="32" y="40" width="14" height="14" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask1_6022_15508)">
+<path d="M32.998 49.5286L35.1328 46.106C35.2285 45.9557 35.3637 45.8741 35.5383 45.8614C35.7129 45.8487 35.8608 45.9078 35.982 46.0387L37.2664 47.5385L39.1522 44.4693C39.2516 44.3033 39.3995 44.2193 39.5958 44.2174C39.7921 44.2156 39.943 44.2946 40.0485 44.4547L40.9818 45.8603C40.8143 45.8737 40.657 45.8967 40.5101 45.9293C40.3631 45.9618 40.2167 46.0057 40.0709 46.0611L39.621 45.3891L37.7768 48.3955C37.6811 48.5458 37.5444 48.6289 37.3668 48.6446C37.1892 48.6603 37.0398 48.5997 36.9187 48.4628L35.6286 46.9574L33.7428 49.9986C33.6778 50.107 33.5817 50.1745 33.4545 50.2011C33.3274 50.2276 33.2126 50.2005 33.1102 50.1197C33.0137 50.0547 32.9561 49.9655 32.9374 49.8522C32.9187 49.7389 32.9389 49.631 32.998 49.5286ZM44.585 53.2091L42.6723 51.3077C42.4891 51.4401 42.2868 51.5403 42.0654 51.6083C41.8441 51.6764 41.6145 51.7104 41.3767 51.7104C40.726 51.7104 40.1745 51.4842 39.722 51.0317C39.2696 50.5793 39.0433 50.0277 39.0433 49.3771C39.0433 48.7265 39.2696 48.1749 39.722 47.7225C40.1745 47.27 40.726 47.0438 41.3767 47.0438C42.0273 47.0438 42.5788 47.27 43.0313 47.7225C43.4838 48.1749 43.71 48.7265 43.71 49.3771C43.71 49.6187 43.675 49.8511 43.6051 50.0743C43.5352 50.2975 43.4321 50.5038 43.296 50.693L45.2087 52.5854L44.585 53.2091ZM41.3767 50.8354C41.785 50.8354 42.1301 50.6945 42.4121 50.4125C42.694 50.1306 42.835 49.7854 42.835 49.3771C42.835 48.9688 42.694 48.6236 42.4121 48.3417C42.1301 48.0597 41.785 47.9188 41.3767 47.9188C40.9683 47.9188 40.6232 48.0597 40.3412 48.3417C40.0593 48.6236 39.9183 48.9688 39.9183 49.3771C39.9183 49.7854 40.0593 50.1306 40.3412 50.4125C40.6232 50.6945 40.9683 50.8354 41.3767 50.8354ZM42.5624 46.0678C42.4225 46.0125 42.2791 45.967 42.1322 45.9315C41.9852 45.896 41.8329 45.8734 41.6751 45.8636L44.2563 41.7702C44.3214 41.6678 44.416 41.6018 44.5401 41.5722C44.6643 41.5427 44.7776 41.5683 44.88 41.6491C44.9765 41.7141 45.0356 41.8033 45.0573 41.9166C45.079 42.0299 45.0603 42.1378 45.0012 42.2402L42.5624 46.0678Z" fill="#C5C7E1"/>
+</g>
+<defs>
+<filter id="filter0_d_6022_15508" x="16" y="33" width="47" height="41" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="6"/>
+<feGaussianBlur stdDeviation="4.5"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.603882 0 0 0 0 0.614383 0 0 0 0 0.750906 0 0 0 1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_6022_15508"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_6022_15508" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/datahub-web-react/src/images/row-icon.svg b/datahub-web-react/src/images/row-icon.svg
new file mode 100644
index 00000000000000..ed9f50a6c1fcba
--- /dev/null
+++ b/datahub-web-react/src/images/row-icon.svg
@@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.99999 7.97034C6.9017 7.97034 6.80619 7.95751 6.71346 7.93187C6.62073 7.90624 6.52863 7.86991 6.43718 7.8229L0.99616 4.92932C0.88676 4.86693 0.808132 4.79001 0.760277 4.69855C0.71241 4.60711 0.688477 4.50668 0.688477 4.39727C0.688477 4.28787 0.71241 4.18745 0.760277 4.096C0.808132 4.00455 0.88676 3.92762 0.99616 3.86524L6.43718 0.971652C6.52863 0.924641 6.62073 0.888318 6.71346 0.862685C6.80619 0.837041 6.9017 0.824219 6.99999 0.824219C7.09828 0.824219 7.19379 0.837041 7.28653 0.862685C7.37926 0.888318 7.47135 0.924641 7.56281 0.971652L13.0102 3.86524C13.1196 3.92762 13.1983 4.00455 13.2461 4.096C13.294 4.18745 13.3179 4.28787 13.3179 4.39727C13.3179 4.50668 13.294 4.60711 13.2461 4.69855C13.1983 4.79001 13.1196 4.86693 13.0102 4.92932L7.56281 7.8229C7.47135 7.86991 7.37926 7.90624 7.28653 7.93187C7.19379 7.95751 7.09828 7.97034 6.99999 7.97034ZM6.99999 6.98958L11.9154 4.39727L6.99999 1.80495L2.09099 4.39727L6.99999 6.98958ZM6.99999 9.59215L12.3359 6.7678C12.3624 6.75241 12.453 6.73745 12.6077 6.72292C12.741 6.73147 12.8502 6.78147 12.9352 6.87292C13.0203 6.96437 13.0628 7.07676 13.0628 7.21008C13.0628 7.3024 13.0425 7.38573 13.0019 7.46008C12.9613 7.53444 12.8949 7.59641 12.8026 7.64598L7.56281 10.4255C7.47135 10.4725 7.37926 10.5088 7.28653 10.5344C7.19379 10.5601 7.09828 10.5729 6.99999 10.5729C6.9017 10.5729 6.80619 10.5601 6.71346 10.5344C6.62073 10.5088 6.52863 10.4725 6.43718 10.4255L1.20384 7.64598C1.11154 7.59641 1.04403 7.53444 1.00129 7.46008C0.958549 7.38573 0.937177 7.3024 0.937177 7.21008C0.937177 7.07676 0.980766 6.96437 1.06794 6.87292C1.15512 6.78147 1.26538 6.73147 1.39871 6.72292C1.44572 6.71437 1.49102 6.71416 1.53461 6.72228C1.5782 6.73041 1.62349 6.74558 1.67049 6.7678L6.99999 9.59215ZM6.99999 12.1947L12.3359 9.37035C12.3624 9.35496 12.453 9.34001 12.6077 9.32548C12.741 9.33403 12.8502 9.38403 12.9352 9.47548C13.0203 9.56693 13.0628 9.67932 13.0628 9.81265C13.0628 9.90495 13.0425 9.98829 13.0019 10.0627C12.9613 10.137 12.8949 10.199 12.8026 10.2485L7.56281 13.028C7.47135 13.075 7.37926 13.1114 7.28653 13.137C7.19379 13.1626 7.09828 13.1755 6.99999 13.1755C6.9017 13.1755 6.80619 13.1626 6.71346 13.137C6.62073 13.1114 6.52863 13.075 6.43718 13.028L1.20384 10.2485C1.11154 10.199 1.04403 10.137 1.00129 10.0627C0.958549 9.98829 0.937177 9.90495 0.937177 9.81265C0.937177 9.67932 0.980766 9.56693 1.06794 9.47548C1.15512 9.38403 1.26538 9.33403 1.39871 9.32548C1.44572 9.31694 1.49102 9.31672 1.53461 9.32483C1.5782 9.33296 1.62349 9.34813 1.67049 9.37035L6.99999 12.1947Z" fill="#56668E"/>
+</svg>
diff --git a/datahub-web-react/src/images/settingsMenuIcon.svg b/datahub-web-react/src/images/settingsMenuIcon.svg
new file mode 100644
index 00000000000000..be62e4df8bb76e
--- /dev/null
+++ b/datahub-web-react/src/images/settingsMenuIcon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"><path d="M10.0848 21C9.87575 21 9.69481 20.9286 9.54193 20.7859C9.38906 20.6432 9.2971 20.4656 9.26605 20.253L8.99555 18.1142C8.74593 18.0291 8.49004 17.9101 8.22789 17.7571C7.96573 17.604 7.73134 17.4401 7.52471 17.2652L5.57918 18.0996C5.37973 18.1882 5.18177 18.1986 4.9853 18.1305C4.78883 18.0625 4.63446 17.935 4.52219 17.748L3.1213 15.2666C3.01499 15.0796 2.98215 14.8798 3.02276 14.6672C3.06336 14.4547 3.16786 14.2834 3.33626 14.1535L5.02026 12.8581C4.99875 12.7172 4.98352 12.5757 4.97456 12.4336C4.96561 12.2915 4.96113 12.15 4.96113 12.0091C4.96113 11.8743 4.96561 11.7373 4.97456 11.5983C4.98352 11.4592 4.99875 11.3071 5.02026 11.1419L3.33626 9.84653C3.16786 9.71658 3.06187 9.54533 3.01829 9.33277C2.97469 9.12023 3.00903 8.92044 3.1213 8.7334L4.52219 6.27028C4.63446 6.08323 4.78734 5.9557 4.98083 5.88768C5.1743 5.81966 5.37076 5.82999 5.57021 5.91866L7.51575 6.74396C7.74029 6.56298 7.98005 6.39749 8.23504 6.24749C8.49004 6.09748 8.74055 5.97692 8.98658 5.88583L9.26605 3.74698C9.2971 3.53442 9.38906 3.35679 9.54193 3.21408C9.69481 3.07136 9.87575 3 10.0848 3H12.9063C13.1153 3 13.2977 3.07136 13.4536 3.21408C13.6094 3.35679 13.7029 3.53442 13.734 3.74698L14.0045 5.89495C14.2839 5.99818 14.5368 6.11873 14.7632 6.25659C14.9895 6.39445 15.2179 6.5569 15.4484 6.74396L17.4298 5.91866C17.6292 5.82999 17.8257 5.81814 18.0192 5.88313C18.2127 5.94811 18.3655 6.07412 18.4778 6.26116L19.8787 8.7334C19.991 8.92044 20.0253 9.12023 19.9817 9.33277C19.9381 9.54533 19.8321 9.71658 19.6637 9.84653L17.9439 11.1692C17.9774 11.3223 17.9956 11.4653 17.9986 11.5983C18.0015 11.7313 18.003 11.8652 18.003 12C18.003 12.1287 18 12.2596 17.9941 12.3926C17.9881 12.5256 17.9666 12.6777 17.9296 12.849L19.6315 14.1535C19.7999 14.2834 19.9059 14.4547 19.9495 14.6672C19.9931 14.8798 19.9587 15.0796 19.8465 15.2666L18.4455 17.7334C18.3333 17.9204 18.1765 18.0489 17.9753 18.1187C17.774 18.1885 17.5737 18.1791 17.3742 18.0905L15.4484 17.256C15.2179 17.4431 14.9826 17.6086 14.7426 17.7525C14.5025 17.8964 14.2565 18.014 14.0045 18.105L13.734 20.253C13.7029 20.4656 13.6094 20.6432 13.4536 20.7859C13.2977 20.9286 13.1153 21 12.9063 21H10.0848ZM10.5684 19.579H12.3993L12.7343 17.0411C13.2097 16.9148 13.6441 16.7353 14.0376 16.5027C14.4311 16.2702 14.8106 15.9711 15.1761 15.6055L17.4907 16.5947L18.4079 14.9842L16.3872 13.4356C16.4648 13.1903 16.5176 12.9498 16.5457 12.7142C16.5738 12.4785 16.5878 12.2405 16.5878 12C16.5878 11.7534 16.5738 11.5154 16.5457 11.2858C16.5176 11.0563 16.4648 10.8219 16.3872 10.5826L18.4259 9.01578L17.5086 7.40525L15.1671 8.40911C14.8554 8.07024 14.4819 7.77084 14.0466 7.51093C13.6112 7.251 13.1708 7.06699 12.7254 6.9589L12.4316 4.42103H10.5828L10.2746 6.94978C9.79929 7.06395 9.36037 7.23885 8.95789 7.47448C8.5554 7.71011 8.17143 8.01376 7.80598 8.38543L5.49138 7.40525L4.57413 9.01578L6.58597 10.5407C6.50834 10.7654 6.454 10.9992 6.42295 11.2421C6.39189 11.485 6.37637 11.7407 6.37637 12.0091C6.37637 12.2557 6.39189 12.4974 6.42295 12.7342C6.454 12.9711 6.50535 13.2049 6.577 13.4356L4.57413 14.9842L5.49138 16.5947L7.79701 15.6C8.15053 15.9692 8.52853 16.2717 8.93101 16.5073C9.3335 16.7429 9.77838 16.9239 10.2657 17.0502L10.5684 19.579ZM11.5107 14.8421C12.2858 14.8421 12.9454 14.5655 13.4894 14.0122C14.0334 13.459 14.3054 12.7882 14.3054 12C14.3054 11.2118 14.0334 10.541 13.4894 9.98776C12.9454 9.43453 12.2858 9.15791 11.5107 9.15791C10.7261 9.15791 10.0641 9.43453 9.52491 9.98776C8.98569 10.541 8.71607 11.2118 8.71607 12C8.71607 12.7882 8.98569 13.459 9.52491 14.0122C10.0641 14.5655 10.7261 14.8421 11.5107 14.8421Z" fill="current-color"/></svg>
\ No newline at end of file
diff --git a/datahub-web-react/src/images/shield-check.svg b/datahub-web-react/src/images/shield-check.svg
new file mode 100644
index 00000000000000..1848dd4dd02bed
--- /dev/null
+++ b/datahub-web-react/src/images/shield-check.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Shield check">
+<path id="Icon" d="M9 12L11 14L15 10M20.6179 5.98434C20.4132 5.99472 20.2072 5.99997 20 5.99997C16.9265 5.99997 14.123 4.84453 11.9999 2.94434C9.87691 4.84446 7.07339 5.99985 4 5.99985C3.79277 5.99985 3.58678 5.9946 3.38213 5.98422C3.1327 6.94783 3 7.95842 3 9.00001C3 14.5915 6.82432 19.2898 12 20.622C17.1757 19.2898 21 14.5915 21 9.00001C21 7.95847 20.8673 6.94791 20.6179 5.98434Z" stroke="#77B750" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</svg>
diff --git a/datahub-web-react/src/images/shield-exclamation.svg b/datahub-web-react/src/images/shield-exclamation.svg
new file mode 100644
index 00000000000000..6b8666cf18edc9
--- /dev/null
+++ b/datahub-web-react/src/images/shield-exclamation.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Shield exclamation">
+<path id="Icon" d="M20.6179 5.98434C20.4132 5.99472 20.2072 5.99997 20 5.99997C16.9265 5.99997 14.123 4.84453 11.9999 2.94434C9.87691 4.84446 7.07339 5.99985 4 5.99985C3.79277 5.99985 3.58678 5.9946 3.38213 5.98422C3.1327 6.94783 3 7.95842 3 9.00001C3 14.5915 6.82432 19.2898 12 20.622C17.1757 19.2898 21 14.5915 21 9.00001C21 7.95847 20.8673 6.94791 20.6179 5.98434Z" stroke="#F4C449" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path id="Icon_2" d="M12 9V11M12 15H12.01" stroke="#F4C449" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</svg>
diff --git a/datahub-web-react/src/images/sidebarBackArrow.svg b/datahub-web-react/src/images/sidebarBackArrow.svg
new file mode 100644
index 00000000000000..581d70b264f650
--- /dev/null
+++ b/datahub-web-react/src/images/sidebarBackArrow.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="15" viewBox="0 0 15 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.14288 5.16666L4.26213 1.28593L5.44064 0.107422L11.3332 6L5.44064 11.8925L4.26213 10.714L8.14279 6.83333L0.49965 6.83341L0.499634 5.16675L8.14288 5.16666ZM12.9997 11.8332V0.166597H14.6664V11.8332H12.9997Z" fill="black"/>
+</svg>
diff --git a/datahub-web-react/src/images/tableau-embedded-data-source.svg b/datahub-web-react/src/images/tableau-embedded-data-source.svg
new file mode 100644
index 00000000000000..8ae1437da93d89
--- /dev/null
+++ b/datahub-web-react/src/images/tableau-embedded-data-source.svg
@@ -0,0 +1,8 @@
+<svg width="1em" height="1em" fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18">
+    <g fill="currentcolor">
+        <path fill-rule="evenodd" clip-rule="evenodd"
+              d="M14 3.5v4.885l-.299-.3-.701.701V5.154a6.84 6.84 0 0 1-.912.376C11.182 5.832 10.121 6 9 6s-2.182-.168-3.088-.47A6.838 6.838 0 0 1 5 5.153v4.174l-1 1V3.5C4 2.12 6.239 1 9 1s5 1.12 5 2.5Zm-1 0c0 .108-.113.474-.912.873C11.35 4.743 10.26 5 9 5c-1.26 0-2.35-.257-3.088-.627C5.113 3.974 5 3.608 5 3.5c0-.108.113-.474.912-.873C6.65 2.257 7.74 2 9 2c1.26 0 2.35.257 3.088.627.799.399.912.765.912.873Z"></path>
+        <path d="m13 11.627.918.918c-.327 1.068-1.595 1.938-3.27 2.288l.798-1.283c.21-.086.402-.182.575-.286.745-.447.979-.925.979-1.264v-.373ZM7.705 13.884l-.561.902a6.631 6.631 0 0 1-.132-.032l-1.598-1.598.169-.17c.112.093.243.186.396.278.455.273 1.045.494 1.726.62Z"></path>
+        <path d="M6.949 10.206 6.242 9.5l-2.95 2.949a1 1 0 0 0 0 1.414l2.95 2.949.707-.707L4 13.156l2.949-2.95ZM16.65 12.449 13.7 9.5l-.706.706 2.949 2.95-2.95 2.949.708.707 2.949-2.949.083-.094a1 1 0 0 0-.083-1.32ZM12.404 10.116l-.849-.528-4.083 6.566.849.528 4.083-6.566Z"></path>
+    </g>
+</svg>
diff --git a/datahub-web-react/src/images/tableau-published-data-source.svg b/datahub-web-react/src/images/tableau-published-data-source.svg
new file mode 100644
index 00000000000000..1fdcb16e3de0eb
--- /dev/null
+++ b/datahub-web-react/src/images/tableau-published-data-source.svg
@@ -0,0 +1,5 @@
+<svg viewBox="0 0 17 18" width="1em" height="1em" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M14 14.255h-.02C13.742 15.793 11.38 17 8.5 17c-2.88 0-5.242-1.207-5.48-2.743H3V3.763h.017C3.237 2.217 5.608 1 8.5 1c2.892 0 5.262 1.217 5.483 2.764H14v10.492ZM13 4c0 .29-.23.774-1.09 1.243-.732.4-1.768.688-2.965.746a10.102 10.102 0 0 1-.89 0c-1.197-.058-2.233-.346-2.965-.746C4.23 4.774 4 4.291 4 4c0-.29.23-.774 1.09-1.243C5.912 2.308 7.116 2 8.5 2c1.384 0 2.588.308 3.41.757C12.77 3.226 13 3.709 13 4ZM8.01 6.988a10.19 10.19 0 0 0 .98 0c1.223-.054 2.36-.31 3.278-.725.25-.113.497-.245.732-.396v8.184l-.008.051c-.047.304-.357.778-1.212 1.208-.818.413-1.97.689-3.28.689-1.31 0-2.462-.276-3.28-.689-.855-.43-1.165-.904-1.212-1.208L4 14.051V5.867c.235.151.483.283.732.396.917.416 2.055.671 3.278.725Z"
+          fill="currentcolor"></path>
+</svg>
diff --git a/datahub-web-react/src/images/tableau-view.svg b/datahub-web-react/src/images/tableau-view.svg
new file mode 100644
index 00000000000000..b1d53246e11841
--- /dev/null
+++ b/datahub-web-react/src/images/tableau-view.svg
@@ -0,0 +1,6 @@
+<svg viewBox="0 0 17 18" width="1em" height="1em" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <title id="View">View</title>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M15 1a1 1 0 0 1 1 1v13a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h13Zm0 1H2v13h13V2ZM6 8v5H5V8h1Zm3-4v9H8V4h1Zm3 2v7h-1V6h1Z"
+          fill="currentcolor"/>
+</svg>
diff --git a/datahub-web-react/src/images/tableau-workbook.svg b/datahub-web-react/src/images/tableau-workbook.svg
new file mode 100644
index 00000000000000..a5097ab4c57251
--- /dev/null
+++ b/datahub-web-react/src/images/tableau-workbook.svg
@@ -0,0 +1,7 @@
+<svg viewBox="0 0 18 18" width="1em" height="1em" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <g fill="currentColor">
+    <path d="M13 12H4v1h9v-1Z" />
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M15 2H2v14h13V2ZM6 8v3H5V8h1Zm3-4v7H8V4h1Zm3 2v5h-1V6h1Zm4 1.5h1V10h-1v2h1v2.5h-1V16a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h13a1 1 0 0 1 1 1v1h1v2.5h-1v2Z" />
+  </g>
+</svg>
diff --git a/datahub-web-react/src/images/timeline-icon.svg b/datahub-web-react/src/images/timeline-icon.svg
new file mode 100644
index 00000000000000..c8124d7347c45d
--- /dev/null
+++ b/datahub-web-react/src/images/timeline-icon.svg
@@ -0,0 +1,3 @@
+<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="4" cy="4" r="4" fill="#56668E"/>
+</svg>
diff --git a/datahub-web-react/src/images/trending-down-icon.svg b/datahub-web-react/src/images/trending-down-icon.svg
new file mode 100644
index 00000000000000..11a15b285b3e85
--- /dev/null
+++ b/datahub-web-react/src/images/trending-down-icon.svg
@@ -0,0 +1,8 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_2510_14706" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="14" height="14">
+<rect width="14" height="14" transform="matrix(1 0 0 -1 0 14)" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask0_2510_14706)">
+<path d="M1.57498 3.71986C1.45832 3.83652 1.40241 3.97506 1.40727 4.13548C1.41214 4.2959 1.46804 4.42958 1.57498 4.53652L4.65207 7.65736C4.87568 7.88097 5.15276 7.99277 5.48332 7.99277C5.81387 7.99277 6.09096 7.88097 6.31457 7.65736L7.81665 6.14069L10.85 9.14486H9.91665C9.75137 9.14486 9.61283 9.20076 9.50103 9.31257C9.38922 9.42437 9.33332 9.56291 9.33332 9.72819C9.33332 9.89347 9.38922 10.032 9.50103 10.1438C9.61283 10.2556 9.75137 10.3115 9.91665 10.3115H12.25C12.4153 10.3115 12.5538 10.2556 12.6656 10.1438C12.7774 10.032 12.8333 9.89347 12.8333 9.72819V7.39486C12.8333 7.22958 12.7774 7.09104 12.6656 6.97923C12.5538 6.86743 12.4153 6.81152 12.25 6.81152C12.0847 6.81152 11.9462 6.86743 11.8344 6.97923C11.7226 7.09104 11.6667 7.22958 11.6667 7.39486V8.32819L8.6479 5.30944C8.42429 5.08583 8.1472 4.97402 7.81665 4.97402C7.48609 4.97402 7.20901 5.08583 6.9854 5.30944L5.48332 6.81152L2.39165 3.71986C2.2847 3.61291 2.14859 3.55944 1.98332 3.55944C1.81804 3.55944 1.68193 3.61291 1.57498 3.71986Z" fill="#FFA39E"/>
+</g>
+</svg>
diff --git a/datahub-web-react/src/images/trending-up-icon.svg b/datahub-web-react/src/images/trending-up-icon.svg
new file mode 100644
index 00000000000000..7c4630b135b8f8
--- /dev/null
+++ b/datahub-web-react/src/images/trending-up-icon.svg
@@ -0,0 +1,8 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_2510_14700" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="14" height="14">
+<rect width="14" height="14" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask0_2510_14700)">
+<path d="M1.57498 10.2801C1.45832 10.1635 1.40241 10.0249 1.40727 9.86452C1.41214 9.7041 1.46804 9.57042 1.57498 9.46348L4.65207 6.34264C4.87568 6.11903 5.15276 6.00723 5.48332 6.00723C5.81387 6.00723 6.09096 6.11903 6.31457 6.34264L7.81665 7.85931L10.85 4.85514H9.91665C9.75137 4.85514 9.61283 4.79924 9.50103 4.68743C9.38922 4.57563 9.33332 4.43709 9.33332 4.27181C9.33332 4.10653 9.38922 3.96799 9.50103 3.85618C9.61283 3.74438 9.75137 3.68848 9.91665 3.68848H12.25C12.4153 3.68848 12.5538 3.74438 12.6656 3.85618C12.7774 3.96799 12.8333 4.10653 12.8333 4.27181V6.60514C12.8333 6.77042 12.7774 6.90896 12.6656 7.02077C12.5538 7.13257 12.4153 7.18848 12.25 7.18848C12.0847 7.18848 11.9462 7.13257 11.8344 7.02077C11.7226 6.90896 11.6667 6.77042 11.6667 6.60514V5.67181L8.6479 8.69056C8.42429 8.91417 8.1472 9.02598 7.81665 9.02598C7.48609 9.02598 7.20901 8.91417 6.9854 8.69056L5.48332 7.18848L2.39165 10.2801C2.2847 10.3871 2.14859 10.4406 1.98332 10.4406C1.81804 10.4406 1.68193 10.3871 1.57498 10.2801Z" fill="#3CB47A"/>
+</g>
+</svg>
diff --git a/datahub-web-react/src/setupTests.ts b/datahub-web-react/src/setupTests.ts
index b4729293a2f808..1167165feadcb8 100644
--- a/datahub-web-react/src/setupTests.ts
+++ b/datahub-web-react/src/setupTests.ts
@@ -17,7 +17,10 @@ global.matchMedia =
         };
     });
 
-window.location = { ...window.location, replace: () => {} };
+window.location = {
+    ...window.location,
+    replace: () => {},
+};
 
 // Suppress `Error: Not implemented: window.computedStyle(elt, pseudoElt)`.
 // From https://github.com/vitest-dev/vitest/issues/2061
@@ -31,3 +34,12 @@ vi.mock('js-cookie', () => ({
     },
 }));
 vi.mock('./app/entity/shared/tabs/Documentation/components/editor/Editor');
+
+vi.stubGlobal(
+    'ResizeObserver',
+    vi.fn(() => ({
+        observe: vi.fn(),
+        unobserve: vi.fn(),
+        disconnect: vi.fn(),
+    })),
+);
diff --git a/datahub-web-react/src/utils/test-utils/TestPageContainer.tsx b/datahub-web-react/src/utils/test-utils/TestPageContainer.tsx
index f03fc3b43f320f..0f749de9a62e1f 100644
--- a/datahub-web-react/src/utils/test-utils/TestPageContainer.tsx
+++ b/datahub-web-react/src/utils/test-utils/TestPageContainer.tsx
@@ -1,32 +1,39 @@
 import React, { useMemo } from 'react';
 import { MemoryRouter } from 'react-router';
-import { ThemeProvider } from 'styled-components';
+
+import { Remirror, useRemirror } from '@remirror/react';
+import { ItalicExtension, UnderlineExtension } from 'remirror/extensions';
 
 import { HelmetProvider } from 'react-helmet-async';
-import { CLIENT_AUTH_COOKIE } from '../../conf/Global';
-import { DatasetEntity } from '../../app/entity/dataset/DatasetEntity';
+import EntityRegistry from '../../app/entity/EntityRegistry';
 import { DataFlowEntity } from '../../app/entity/dataFlow/DataFlowEntity';
 import { DataJobEntity } from '../../app/entity/dataJob/DataJobEntity';
-import { UserEntity } from '../../app/entity/user/User';
+import { DatasetEntity } from '../../app/entity/dataset/DatasetEntity';
 import { GroupEntity } from '../../app/entity/group/Group';
-import EntityRegistry from '../../app/entity/EntityRegistry';
-import { EntityRegistryContext } from '../../entityRegistryContext';
 import { TagEntity } from '../../app/entity/tag/Tag';
+import { UserEntity } from '../../app/entity/user/User';
+import { CLIENT_AUTH_COOKIE } from '../../conf/Global';
+import { EntityRegistryContext } from '../../entityRegistryContext';
 
-import defaultThemeConfig from '../../conf/theme/theme_light.config.json';
+import AppConfigProvider from '../../AppConfigProvider';
+import CustomThemeProvider from '../../CustomThemeProvider';
+import UserContextProvider from '../../app/context/UserContextProvider';
+import { BusinessAttributeEntity } from '../../app/entity/businessAttribute/BusinessAttributeEntity';
+import { ChartEntity } from '../../app/entity/chart/ChartEntity';
+import { ContainerEntity } from '../../app/entity/container/ContainerEntity';
+import { DashboardEntity } from '../../app/entity/dashboard/DashboardEntity';
+import { DataPlatformEntity } from '../../app/entity/dataPlatform/DataPlatformEntity';
+import { DataPlatformInstanceEntity } from '../../app/entity/dataPlatformInstance/DataPlatformInstanceEntity';
+import { DataProductEntity } from '../../app/entity/dataProduct/DataProductEntity';
+import { DomainEntity } from '../../app/entity/domain/DomainEntity';
 import { GlossaryTermEntity } from '../../app/entity/glossaryTerm/GlossaryTermEntity';
 import { MLFeatureTableEntity } from '../../app/entity/mlFeatureTable/MLFeatureTableEntity';
 import { MLModelEntity } from '../../app/entity/mlModel/MLModelEntity';
 import { MLModelGroupEntity } from '../../app/entity/mlModelGroup/MLModelGroupEntity';
-import { ChartEntity } from '../../app/entity/chart/ChartEntity';
-import { DashboardEntity } from '../../app/entity/dashboard/DashboardEntity';
-import { LineageExplorerContext } from '../../app/lineage/utils/LineageExplorerContext';
-import UserContextProvider from '../../app/context/UserContextProvider';
-import { DataPlatformEntity } from '../../app/entity/dataPlatform/DataPlatformEntity';
-import { ContainerEntity } from '../../app/entity/container/ContainerEntity';
-import AppConfigProvider from '../../AppConfigProvider';
-import { BusinessAttributeEntity } from '../../app/entity/businessAttribute/BusinessAttributeEntity';
+import { QueryEntity } from '../../app/entity/query/QueryEntity';
 import { SchemaFieldPropertiesEntity } from '../../app/entity/schemaField/SchemaFieldPropertiesEntity';
+import { StructuredPropertyEntity } from '../../app/entity/structuredProperty/StructuredPropertyEntity';
+import { LineageExplorerContext } from '../../app/lineage/utils/LineageExplorerContext';
 
 type Props = {
     children: React.ReactNode;
@@ -51,6 +58,12 @@ export function getTestEntityRegistry() {
     entityRegistry.register(new ContainerEntity());
     entityRegistry.register(new BusinessAttributeEntity());
     entityRegistry.register(new SchemaFieldPropertiesEntity());
+    entityRegistry.register(new DomainEntity());
+    entityRegistry.register(new DataProductEntity());
+    entityRegistry.register(new DataPlatformInstanceEntity());
+    entityRegistry.register(new QueryEntity());
+    entityRegistry.register(new SchemaFieldPropertiesEntity());
+    entityRegistry.register(new StructuredPropertyEntity());
     return entityRegistry;
 }
 
@@ -62,38 +75,46 @@ export default ({ children, initialEntries }: Props) => {
     });
     vi.mock('js-cookie', () => ({ default: { get: () => 'urn:li:corpuser:2' } }));
 
+    // mock remirror
+    const extensions = () => [new ItalicExtension(), new UnderlineExtension()];
+    const { manager, state } = useRemirror({
+        extensions,
+    });
+
     return (
         <HelmetProvider>
-            <ThemeProvider theme={defaultThemeConfig}>
+            <CustomThemeProvider>
                 <MemoryRouter initialEntries={initialEntries}>
                     <EntityRegistryContext.Provider value={entityRegistry}>
                         <UserContextProvider>
                             <AppConfigProvider>
-                                <LineageExplorerContext.Provider
-                                    value={{
-                                        expandTitles: false,
-                                        showColumns: false,
-                                        collapsedColumnsNodes: {},
-                                        setCollapsedColumnsNodes: null,
-                                        fineGrainedMap: {},
-                                        selectedField: null,
-                                        setSelectedField: () => {},
-                                        highlightedEdges: [],
-                                        setHighlightedEdges: () => {},
-                                        visibleColumnsByUrn: {},
-                                        setVisibleColumnsByUrn: () => {},
-                                        columnsByUrn: {},
-                                        setColumnsByUrn: () => {},
-                                        refetchCenterNode: () => {},
-                                    }}
-                                >
-                                    {children}
-                                </LineageExplorerContext.Provider>
+                                <Remirror manager={manager} state={state}>
+                                    <LineageExplorerContext.Provider
+                                        value={{
+                                            expandTitles: false,
+                                            showColumns: false,
+                                            collapsedColumnsNodes: {},
+                                            setCollapsedColumnsNodes: null,
+                                            fineGrainedMap: {},
+                                            selectedField: null,
+                                            setSelectedField: () => {},
+                                            highlightedEdges: [],
+                                            setHighlightedEdges: () => {},
+                                            visibleColumnsByUrn: {},
+                                            setVisibleColumnsByUrn: () => {},
+                                            columnsByUrn: {},
+                                            setColumnsByUrn: () => {},
+                                            refetchCenterNode: () => {},
+                                        }}
+                                    >
+                                        {children}
+                                    </LineageExplorerContext.Provider>
+                                </Remirror>
                             </AppConfigProvider>
                         </UserContextProvider>
                     </EntityRegistryContext.Provider>
                 </MemoryRouter>
-            </ThemeProvider>
+            </CustomThemeProvider>
         </HelmetProvider>
     );
 };
diff --git a/datahub-web-react/yarn.lock b/datahub-web-react/yarn.lock
index 6e946e584f18a5..830a13937558cc 100644
--- a/datahub-web-react/yarn.lock
+++ b/datahub-web-react/yarn.lock
@@ -1035,6 +1035,13 @@
   resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.4.0.tgz#c3c5ae543c897caa9c2a68630bed355be5f9990f"
   integrity sha512-JZButFdZ1+/xAfpguQHoabIXkcqRRKpMrWKBkpEZZyxfY9C1DpADFB8PEqGSTeFr135SaTRfKqGKx5xSCLI7ZQ==
 
+"@emnapi/runtime@^1.2.0":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.3.1.tgz#0fcaa575afc31f455fd33534c19381cfce6c6f60"
+  integrity sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==
+  dependencies:
+    tslib "^2.4.0"
+
 "@emotion/babel-plugin@^11.10.5":
   version "11.10.5"
   resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz#65fa6e1790ddc9e23cc22658a4c5dea423c55c3c"
@@ -1954,6 +1961,119 @@
   resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8"
   integrity sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==
 
+"@img/sharp-darwin-arm64@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.5.tgz#ef5b5a07862805f1e8145a377c8ba6e98813ca08"
+  integrity sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==
+  optionalDependencies:
+    "@img/sharp-libvips-darwin-arm64" "1.0.4"
+
+"@img/sharp-darwin-x64@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.5.tgz#e03d3451cd9e664faa72948cc70a403ea4063d61"
+  integrity sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==
+  optionalDependencies:
+    "@img/sharp-libvips-darwin-x64" "1.0.4"
+
+"@img/sharp-libvips-darwin-arm64@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz#447c5026700c01a993c7804eb8af5f6e9868c07f"
+  integrity sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==
+
+"@img/sharp-libvips-darwin-x64@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz#e0456f8f7c623f9dbfbdc77383caa72281d86062"
+  integrity sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==
+
+"@img/sharp-libvips-linux-arm64@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz#979b1c66c9a91f7ff2893556ef267f90ebe51704"
+  integrity sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==
+
+"@img/sharp-libvips-linux-arm@1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz#99f922d4e15216ec205dcb6891b721bfd2884197"
+  integrity sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==
+
+"@img/sharp-libvips-linux-s390x@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.4.tgz#f8a5eb1f374a082f72b3f45e2fb25b8118a8a5ce"
+  integrity sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==
+
+"@img/sharp-libvips-linux-x64@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz#d4c4619cdd157774906e15770ee119931c7ef5e0"
+  integrity sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==
+
+"@img/sharp-libvips-linuxmusl-arm64@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.4.tgz#166778da0f48dd2bded1fa3033cee6b588f0d5d5"
+  integrity sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==
+
+"@img/sharp-libvips-linuxmusl-x64@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.4.tgz#93794e4d7720b077fcad3e02982f2f1c246751ff"
+  integrity sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==
+
+"@img/sharp-linux-arm64@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.5.tgz#edb0697e7a8279c9fc829a60fc35644c4839bb22"
+  integrity sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==
+  optionalDependencies:
+    "@img/sharp-libvips-linux-arm64" "1.0.4"
+
+"@img/sharp-linux-arm@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.5.tgz#422c1a352e7b5832842577dc51602bcd5b6f5eff"
+  integrity sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==
+  optionalDependencies:
+    "@img/sharp-libvips-linux-arm" "1.0.5"
+
+"@img/sharp-linux-s390x@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.5.tgz#f5c077926b48e97e4a04d004dfaf175972059667"
+  integrity sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==
+  optionalDependencies:
+    "@img/sharp-libvips-linux-s390x" "1.0.4"
+
+"@img/sharp-linux-x64@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.5.tgz#d806e0afd71ae6775cc87f0da8f2d03a7c2209cb"
+  integrity sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==
+  optionalDependencies:
+    "@img/sharp-libvips-linux-x64" "1.0.4"
+
+"@img/sharp-linuxmusl-arm64@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.5.tgz#252975b915894fb315af5deea174651e208d3d6b"
+  integrity sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==
+  optionalDependencies:
+    "@img/sharp-libvips-linuxmusl-arm64" "1.0.4"
+
+"@img/sharp-linuxmusl-x64@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.5.tgz#3f4609ac5d8ef8ec7dadee80b560961a60fd4f48"
+  integrity sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==
+  optionalDependencies:
+    "@img/sharp-libvips-linuxmusl-x64" "1.0.4"
+
+"@img/sharp-wasm32@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-wasm32/-/sharp-wasm32-0.33.5.tgz#6f44f3283069d935bb5ca5813153572f3e6f61a1"
+  integrity sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==
+  dependencies:
+    "@emnapi/runtime" "^1.2.0"
+
+"@img/sharp-win32-ia32@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.5.tgz#1a0c839a40c5351e9885628c85f2e5dfd02b52a9"
+  integrity sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==
+
+"@img/sharp-win32-x64@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz#56f00962ff0c4e0eb93d34a047d29fa995e3e342"
+  integrity sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==
+
 "@istanbuljs/schema@^0.1.2":
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
@@ -2062,6 +2182,11 @@
   resolved "https://registry.yarnpkg.com/@lingui/detect-locale/-/detect-locale-3.15.0.tgz#f496618e5d9cb5fc00a71c974034ddb87e6e96b3"
   integrity sha512-+4yLIAyk8asygMGLbR271qHCAT2HQ2AyjljH/xvwMua0sqVX+ES3fwStggJOsCk0zC1yfjMrjV4lAMTPHy5XoA==
 
+"@lokesh.dhakar/quantize@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@lokesh.dhakar/quantize/-/quantize-1.4.0.tgz#20bf62a8c34fa32d8e074bad1dacafd7dd5e026a"
+  integrity sha512-+//cqVWKis//t0YH62EDtwaFSPG/CDtYNg4CZmzNmG2d5W17Iu3fuDAdpQXCDHUDrrU9q0veze4A7tPZXlR/mg==
+
 "@mapbox/rehype-prism@0.6.0":
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/@mapbox/rehype-prism/-/rehype-prism-0.6.0.tgz#3d8a860870951d4354257d0ba908d11545bd5ed5"
@@ -2314,6 +2439,11 @@
     tslib "^2.5.0"
     webcrypto-core "^1.7.7"
 
+"@phosphor-icons/react@^2.1.7":
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/@phosphor-icons/react/-/react-2.1.7.tgz#b11a4b25849b7e3849970b688d9fe91e5d4fd8d7"
+  integrity sha512-g2e2eVAn1XG2a+LI09QU3IORLhnFNAFkNbo2iwbX6NOKSLOwvEMmTa7CgOzEbgNWR47z8i8kwjdvYZ5fkGx1mQ==
+
 "@popperjs/core@^2.11.6", "@popperjs/core@^2.9.2":
   version "2.11.6"
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45"
@@ -2428,6 +2558,72 @@
     "@react-spring/shared" "~9.7.3"
     "@react-spring/types" "~9.7.3"
 
+"@reactflow/background@11.3.14":
+  version "11.3.14"
+  resolved "https://registry.yarnpkg.com/@reactflow/background/-/background-11.3.14.tgz#778ca30174f3de77fc321459ab3789e66e71a699"
+  integrity sha512-Gewd7blEVT5Lh6jqrvOgd4G6Qk17eGKQfsDXgyRSqM+CTwDqRldG2LsWN4sNeno6sbqVIC2fZ+rAUBFA9ZEUDA==
+  dependencies:
+    "@reactflow/core" "11.11.4"
+    classcat "^5.0.3"
+    zustand "^4.4.1"
+
+"@reactflow/controls@11.2.14":
+  version "11.2.14"
+  resolved "https://registry.yarnpkg.com/@reactflow/controls/-/controls-11.2.14.tgz#508ed2c40d23341b3b0919dd11e76fd49cf850c7"
+  integrity sha512-MiJp5VldFD7FrqaBNIrQ85dxChrG6ivuZ+dcFhPQUwOK3HfYgX2RHdBua+gx+40p5Vw5It3dVNp/my4Z3jF0dw==
+  dependencies:
+    "@reactflow/core" "11.11.4"
+    classcat "^5.0.3"
+    zustand "^4.4.1"
+
+"@reactflow/core@11.11.4":
+  version "11.11.4"
+  resolved "https://registry.yarnpkg.com/@reactflow/core/-/core-11.11.4.tgz#89bd86d1862aa1416f3f49926cede7e8c2aab6a7"
+  integrity sha512-H4vODklsjAq3AMq6Np4LE12i1I4Ta9PrDHuBR9GmL8uzTt2l2jh4CiQbEMpvMDcp7xi4be0hgXj+Ysodde/i7Q==
+  dependencies:
+    "@types/d3" "^7.4.0"
+    "@types/d3-drag" "^3.0.1"
+    "@types/d3-selection" "^3.0.3"
+    "@types/d3-zoom" "^3.0.1"
+    classcat "^5.0.3"
+    d3-drag "^3.0.0"
+    d3-selection "^3.0.0"
+    d3-zoom "^3.0.0"
+    zustand "^4.4.1"
+
+"@reactflow/minimap@11.7.14":
+  version "11.7.14"
+  resolved "https://registry.yarnpkg.com/@reactflow/minimap/-/minimap-11.7.14.tgz#298d7a63cb1da06b2518c99744f716560c88ca73"
+  integrity sha512-mpwLKKrEAofgFJdkhwR5UQ1JYWlcAAL/ZU/bctBkuNTT1yqV+y0buoNVImsRehVYhJwffSWeSHaBR5/GJjlCSQ==
+  dependencies:
+    "@reactflow/core" "11.11.4"
+    "@types/d3-selection" "^3.0.3"
+    "@types/d3-zoom" "^3.0.1"
+    classcat "^5.0.3"
+    d3-selection "^3.0.0"
+    d3-zoom "^3.0.0"
+    zustand "^4.4.1"
+
+"@reactflow/node-resizer@2.2.14":
+  version "2.2.14"
+  resolved "https://registry.yarnpkg.com/@reactflow/node-resizer/-/node-resizer-2.2.14.tgz#1810c0ce51aeb936f179466a6660d1e02c7a77a8"
+  integrity sha512-fwqnks83jUlYr6OHcdFEedumWKChTHRGw/kbCxj0oqBd+ekfs+SIp4ddyNU0pdx96JIm5iNFS0oNrmEiJbbSaA==
+  dependencies:
+    "@reactflow/core" "11.11.4"
+    classcat "^5.0.4"
+    d3-drag "^3.0.0"
+    d3-selection "^3.0.0"
+    zustand "^4.4.1"
+
+"@reactflow/node-toolbar@1.3.14":
+  version "1.3.14"
+  resolved "https://registry.yarnpkg.com/@reactflow/node-toolbar/-/node-toolbar-1.3.14.tgz#c6ffc76f82acacdce654f2160dc9852162d6e7c9"
+  integrity sha512-rbynXQnH/xFNu4P9H+hVqlEUafDCkEoCy0Dg9mG22Sg+rY/0ck6KkrAQrYrTgXusd+cEJOMK0uOOFCK2/5rSGQ==
+  dependencies:
+    "@reactflow/core" "11.11.4"
+    classcat "^5.0.3"
+    zustand "^4.4.1"
+
 "@remirror/core-constants@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@remirror/core-constants/-/core-constants-2.0.0.tgz#a52f89059d93955e00810023cc76b4f7db9650bf"
@@ -3778,6 +3974,14 @@
     lodash "^4.17.15"
     redent "^3.0.0"
 
+"@testing-library/react-hooks@^8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/react-hooks/-/react-hooks-8.0.1.tgz#0924bbd5b55e0c0c0502d1754657ada66947ca12"
+  integrity sha512-Aqhl2IVmLt8IovEVarNDFuJDVWVvhnr9/GCU6UUnrYXwgDFF9h2L2o2P9KBni1AST5sT6riAyoukFLyjQUgD/g==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    react-error-boundary "^3.1.0"
+
 "@testing-library/react@^12.0.0":
   version "12.1.5"
   resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.5.tgz#bb248f72f02a5ac9d949dea07279095fa577963b"
@@ -3792,6 +3996,11 @@
   resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.5.2.tgz#db7257d727c891905947bd1c1a99da20e03c2ebd"
   integrity sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ==
 
+"@tokenizer/token@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276"
+  integrity sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==
+
 "@tommoor/remove-markdown@^0.3.2":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@tommoor/remove-markdown/-/remove-markdown-0.3.2.tgz#5288ddd0e26b6b173e76ebb31c94653b0dcff45d"
@@ -3877,26 +4086,126 @@
   dependencies:
     "@types/tern" "*"
 
+"@types/d3-array@*":
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-3.2.1.tgz#1f6658e3d2006c4fceac53fde464166859f8b8c5"
+  integrity sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==
+
 "@types/d3-array@3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-3.0.3.tgz#87d990bf504d14ad6b16766979d04e943c046dac"
   integrity sha512-Reoy+pKnvsksN0lQUlcH6dOGjRZ/3WRwXR//m+/8lt1BXeI4xyaUZoqULNjyXXRuh0Mj4LNpkCvhUpQlY3X5xQ==
 
+"@types/d3-axis@*":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@types/d3-axis/-/d3-axis-3.0.6.tgz#e760e5765b8188b1defa32bc8bb6062f81e4c795"
+  integrity sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==
+  dependencies:
+    "@types/d3-selection" "*"
+
+"@types/d3-brush@*":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@types/d3-brush/-/d3-brush-3.0.6.tgz#c2f4362b045d472e1b186cdbec329ba52bdaee6c"
+  integrity sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==
+  dependencies:
+    "@types/d3-selection" "*"
+
+"@types/d3-chord@*":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@types/d3-chord/-/d3-chord-3.0.6.tgz#1706ca40cf7ea59a0add8f4456efff8f8775793d"
+  integrity sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg==
+
 "@types/d3-color@*", "@types/d3-color@3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-3.1.0.tgz#6594da178ded6c7c3842f3cc0ac84b156f12f2d4"
   integrity sha512-HKuicPHJuvPgCD+np6Se9MQvS6OCbJmOjGvylzMJRlDwUXjKTTXs6Pwgk79O09Vj/ho3u1ofXnhFOaEWWPrlwA==
 
+"@types/d3-contour@*":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@types/d3-contour/-/d3-contour-3.0.6.tgz#9ada3fa9c4d00e3a5093fed0356c7ab929604231"
+  integrity sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==
+  dependencies:
+    "@types/d3-array" "*"
+    "@types/geojson" "*"
+
+"@types/d3-delaunay@*":
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz#185c1a80cc807fdda2a3fe960f7c11c4a27952e1"
+  integrity sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw==
+
+"@types/d3-delaunay@6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-delaunay/-/d3-delaunay-6.0.1.tgz#006b7bd838baec1511270cb900bf4fc377bbbf41"
+  integrity sha512-tLxQ2sfT0p6sxdG75c6f/ekqxjyYR0+LwPrsO1mbC9YDBzPJhs2HbJJRrn8Ez1DBoHRo2yx7YEATI+8V1nGMnQ==
+
+"@types/d3-dispatch@*":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@types/d3-dispatch/-/d3-dispatch-3.0.6.tgz#096efdf55eb97480e3f5621ff9a8da552f0961e7"
+  integrity sha512-4fvZhzMeeuBJYZXRXrRIQnvUYfyXwYmLsdiN7XXmVNQKKw1cM8a5WdID0g1hVFZDqT9ZqZEY5pD44p24VS7iZQ==
+
+"@types/d3-drag@*", "@types/d3-drag@^3.0.1":
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@types/d3-drag/-/d3-drag-3.0.7.tgz#b13aba8b2442b4068c9a9e6d1d82f8bcea77fc02"
+  integrity sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==
+  dependencies:
+    "@types/d3-selection" "*"
+
+"@types/d3-dsv@*":
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@types/d3-dsv/-/d3-dsv-3.0.7.tgz#0a351f996dc99b37f4fa58b492c2d1c04e3dac17"
+  integrity sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g==
+
+"@types/d3-ease@*":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-ease/-/d3-ease-3.0.2.tgz#e28db1bfbfa617076f7770dd1d9a48eaa3b6c51b"
+  integrity sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==
+
+"@types/d3-fetch@*":
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@types/d3-fetch/-/d3-fetch-3.0.7.tgz#c04a2b4f23181aa376f30af0283dbc7b3b569980"
+  integrity sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==
+  dependencies:
+    "@types/d3-dsv" "*"
+
+"@types/d3-force@*":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@types/d3-force/-/d3-force-3.0.10.tgz#6dc8fc6e1f35704f3b057090beeeb7ac674bff1a"
+  integrity sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw==
+
+"@types/d3-format@*":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/d3-format/-/d3-format-3.0.4.tgz#b1e4465644ddb3fdf3a263febb240a6cd616de90"
+  integrity sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==
+
 "@types/d3-format@3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@types/d3-format/-/d3-format-3.0.1.tgz#194f1317a499edd7e58766f96735bdc0216bb89d"
   integrity sha512-5KY70ifCCzorkLuIkDe0Z9YTf9RR2CjBX1iaJG+rgM/cPP+sO+q9YdQ9WdhQcgPj1EQiJ2/0+yUkkziTG6Lubg==
 
+"@types/d3-geo@*", "@types/d3-geo@3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@types/d3-geo/-/d3-geo-3.1.0.tgz#b9e56a079449174f0a2c8684a9a4df3f60522440"
+  integrity sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==
+  dependencies:
+    "@types/geojson" "*"
+
+"@types/d3-hierarchy@*":
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz#6023fb3b2d463229f2d680f9ac4b47466f71f17b"
+  integrity sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg==
+
 "@types/d3-hierarchy@^1.1.6":
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/@types/d3-hierarchy/-/d3-hierarchy-1.1.7.tgz#14a57b0539f8929015f8ad96490de50a16211040"
   integrity sha512-fvht6DOYKzqmXjMb/+xfgkmrWM4SD7rMA/ZbM+gGwr9ZTuIDfky95J8CARtaJo/ExeWyS0xGVdL2gqno2zrQ0Q==
 
+"@types/d3-interpolate@*":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz#412b90e84870285f2ff8a846c6eb60344f12a41c"
+  integrity sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==
+  dependencies:
+    "@types/d3-color" "*"
+
 "@types/d3-interpolate@3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@types/d3-interpolate/-/d3-interpolate-3.0.1.tgz#e7d17fa4a5830ad56fe22ce3b4fac8541a9572dc"
@@ -3904,11 +4213,43 @@
   dependencies:
     "@types/d3-color" "*"
 
+"@types/d3-path@*":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-3.1.0.tgz#2b907adce762a78e98828f0b438eaca339ae410a"
+  integrity sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ==
+
 "@types/d3-path@^1", "@types/d3-path@^1.0.8":
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-1.0.9.tgz#73526b150d14cd96e701597cbf346cfd1fd4a58c"
   integrity sha512-NaIeSIBiFgSC6IGUBjZWcscUJEq7vpVu7KthHN8eieTV9d9MqkSOZLH4chq1PmcKy06PNe3axLeKmRIyxJ+PZQ==
 
+"@types/d3-polygon@*":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-polygon/-/d3-polygon-3.0.2.tgz#dfae54a6d35d19e76ac9565bcb32a8e54693189c"
+  integrity sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA==
+
+"@types/d3-quadtree@*":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz#d4740b0fe35b1c58b66e1488f4e7ed02952f570f"
+  integrity sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg==
+
+"@types/d3-random@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/d3-random/-/d3-random-3.0.3.tgz#ed995c71ecb15e0cd31e22d9d5d23942e3300cfb"
+  integrity sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==
+
+"@types/d3-scale-chromatic@*":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz#dc6d4f9a98376f18ea50bad6c39537f1b5463c39"
+  integrity sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==
+
+"@types/d3-scale@*":
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-4.0.8.tgz#d409b5f9dcf63074464bf8ddfb8ee5a1f95945bb"
+  integrity sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==
+  dependencies:
+    "@types/d3-time" "*"
+
 "@types/d3-scale@4.0.2":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-4.0.2.tgz#41be241126af4630524ead9cb1008ab2f0f26e69"
@@ -3916,6 +4257,18 @@
   dependencies:
     "@types/d3-time" "*"
 
+"@types/d3-selection@*", "@types/d3-selection@^3.0.3":
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/@types/d3-selection/-/d3-selection-3.0.11.tgz#bd7a45fc0a8c3167a631675e61bc2ca2b058d4a3"
+  integrity sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==
+
+"@types/d3-shape@*":
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-3.1.7.tgz#2b7b423dc2dfe69c8c93596e673e37443348c555"
+  integrity sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg==
+  dependencies:
+    "@types/d3-path" "*"
+
 "@types/d3-shape@^1.3.1":
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-1.3.5.tgz#c0164c1be1429473016f855871d487f806c4e968"
@@ -3923,6 +4276,11 @@
   dependencies:
     "@types/d3-path" "^1"
 
+"@types/d3-time-format@*":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@types/d3-time-format/-/d3-time-format-4.0.3.tgz#d6bc1e6b6a7db69cccfbbdd4c34b70632d9e9db2"
+  integrity sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==
+
 "@types/d3-time-format@2.1.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@types/d3-time-format/-/d3-time-format-2.1.0.tgz#011e0fb7937be34a9a8f580ae1e2f2f1336a8a22"
@@ -3933,11 +4291,67 @@
   resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-3.0.0.tgz#e1ac0f3e9e195135361fa1a1d62f795d87e6e819"
   integrity sha512-sZLCdHvBUcNby1cB6Fd3ZBrABbjz3v1Vm90nysCQ6Vt7vd6e/h9Lt7SiJUoEX0l4Dzc7P5llKyhqSi1ycSf1Hg==
 
+"@types/d3-timer@*":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-timer/-/d3-timer-3.0.2.tgz#70bbda77dc23aa727413e22e214afa3f0e852f70"
+  integrity sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==
+
+"@types/d3-transition@*":
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/@types/d3-transition/-/d3-transition-3.0.9.tgz#1136bc57e9ddb3c390dccc9b5ff3b7d2b8d94706"
+  integrity sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==
+  dependencies:
+    "@types/d3-selection" "*"
+
 "@types/d3-voronoi@^1.1.9":
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/@types/d3-voronoi/-/d3-voronoi-1.1.9.tgz#7bbc210818a3a5c5e0bafb051420df206617c9e5"
   integrity sha512-DExNQkaHd1F3dFPvGA/Aw2NGyjMln6E9QzsiqOcBgnE+VInYnFBHBBySbZQts6z6xD+5jTfKCP7M4OqMyVjdwQ==
 
+"@types/d3-zoom@*", "@types/d3-zoom@^3.0.1":
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/@types/d3-zoom/-/d3-zoom-3.0.8.tgz#dccb32d1c56b1e1c6e0f1180d994896f038bc40b"
+  integrity sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==
+  dependencies:
+    "@types/d3-interpolate" "*"
+    "@types/d3-selection" "*"
+
+"@types/d3@^7.4.0":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@types/d3/-/d3-7.4.3.tgz#d4550a85d08f4978faf0a4c36b848c61eaac07e2"
+  integrity sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==
+  dependencies:
+    "@types/d3-array" "*"
+    "@types/d3-axis" "*"
+    "@types/d3-brush" "*"
+    "@types/d3-chord" "*"
+    "@types/d3-color" "*"
+    "@types/d3-contour" "*"
+    "@types/d3-delaunay" "*"
+    "@types/d3-dispatch" "*"
+    "@types/d3-drag" "*"
+    "@types/d3-dsv" "*"
+    "@types/d3-ease" "*"
+    "@types/d3-fetch" "*"
+    "@types/d3-force" "*"
+    "@types/d3-format" "*"
+    "@types/d3-geo" "*"
+    "@types/d3-hierarchy" "*"
+    "@types/d3-interpolate" "*"
+    "@types/d3-path" "*"
+    "@types/d3-polygon" "*"
+    "@types/d3-quadtree" "*"
+    "@types/d3-random" "*"
+    "@types/d3-scale" "*"
+    "@types/d3-scale-chromatic" "*"
+    "@types/d3-selection" "*"
+    "@types/d3-shape" "*"
+    "@types/d3-time" "*"
+    "@types/d3-time-format" "*"
+    "@types/d3-timer" "*"
+    "@types/d3-transition" "*"
+    "@types/d3-zoom" "*"
+
 "@types/diff@^5.0.0":
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/@types/diff/-/diff-5.0.0.tgz#eb71e94feae62548282c4889308a3dfb57e36020"
@@ -3965,6 +4379,11 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
   integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
 
+"@types/geojson@*":
+  version "7946.0.15"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.15.tgz#f9d55fd5a0aa2de9dc80b1b04e437538b7298868"
+  integrity sha512-9oSxFzDCT2Rj6DfcHF8G++jxBKS7mBqXl5xrRW+Kbvjry6Uduya2iiwqHPhVXpasAVMBYKkEPGgKhd3+/HZ6xA==
+
 "@types/graphql@^14.5.0":
   version "14.5.0"
   resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-14.5.0.tgz#a545fb3bc8013a3547cf2f07f5e13a33642b75d6"
@@ -4054,6 +4473,11 @@
   resolved "https://registry.yarnpkg.com/@types/min-document/-/min-document-2.19.0.tgz#4f9919e789917c00de967a2c38fa8d234cbcd7d6"
   integrity sha512-lsYeSW1zfNqHTL1RuaOgfAhoiOWV1RAQDKT0BZ26z4Faz8llVIj1r1ablUo5QY6yzHMketuvu4+N0sv0eZpXTg==
 
+"@types/ndarray@^1.0.14":
+  version "1.0.14"
+  resolved "https://registry.yarnpkg.com/@types/ndarray/-/ndarray-1.0.14.tgz#96b28c09a3587a76de380243f87bb7a2d63b4b23"
+  integrity sha512-oANmFZMnFQvb219SSBIhI1Ih/r4CvHDOzkWyJS/XRqkMrGH5/kaPSA1hQhdIBzouaE+5KpE/f5ylI9cujmckQg==
+
 "@types/node@*":
   version "20.8.10"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.10.tgz#a5448b895c753ae929c26ce85cab557c6d4a365e"
@@ -4497,6 +4921,14 @@
     "@types/d3-shape" "^1.3.1"
     d3-shape "^1.0.6"
 
+"@visx/curve@3.12.0":
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/@visx/curve/-/curve-3.12.0.tgz#e22e4b62a2ade29ffd6c87d627b7148d2ed6d2bb"
+  integrity sha512-Ng1mefXIzoIoAivw7dJ+ZZYYUbfuwXgZCgQynShr6ZIVw7P4q4HeQfJP3W24ON+1uCSrzoycHSXRelhR9SBPcw==
+  dependencies:
+    "@types/d3-shape" "^1.3.1"
+    d3-shape "^1.0.6"
+
 "@visx/drag@3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@visx/drag/-/drag-3.0.1.tgz#753d5f471d4e31679ca4fddcb476cf2d5c7eb6e4"
@@ -4558,6 +4990,15 @@
     classnames "^2.3.1"
     prop-types "^15.6.2"
 
+"@visx/group@3.12.0":
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/@visx/group/-/group-3.12.0.tgz#2c69b810b52f1c1e69bf6f2fe923d184e32078c7"
+  integrity sha512-Dye8iS1alVXPv7nj/7M37gJe6sSKqJLH7x6sEWAsRQ9clI0kFvjbKcKgF+U3aAVQr0NCohheFV+DtR8trfK/Ag==
+  dependencies:
+    "@types/react" "*"
+    classnames "^2.3.1"
+    prop-types "^15.6.2"
+
 "@visx/hierarchy@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@visx/hierarchy/-/hierarchy-3.0.0.tgz#77c25f7f653542295f6c124563440e1d491b0e36"
@@ -4581,6 +5022,17 @@
     classnames "^2.3.1"
     prop-types "^15.5.10"
 
+"@visx/marker@^3.5.0":
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/@visx/marker/-/marker-3.12.0.tgz#cd4d6fc302b07bd33569fe255af3063921646dcc"
+  integrity sha512-11aCWC13+PqbAatNgMVcm33J8PRNdyGiDbfMfwUXt5/FS2XLs2e1fjfhIwAxmCCLZ13FYlabrc1qnjnhwXbTVQ==
+  dependencies:
+    "@types/react" "*"
+    "@visx/group" "3.12.0"
+    "@visx/shape" "3.12.0"
+    classnames "^2.3.1"
+    prop-types "^15.6.2"
+
 "@visx/point@3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@visx/point/-/point-3.0.1.tgz#77587ddaabf6f3023f09f8a0ce33a2c27c9d64c8"
@@ -4609,6 +5061,13 @@
     lodash "^4.17.21"
     prop-types "^15.6.1"
 
+"@visx/scale@3.12.0":
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/@visx/scale/-/scale-3.12.0.tgz#1b6e8655e9be17ea73c59506b1aba9ad06825679"
+  integrity sha512-+ubijrZ2AwWCsNey0HGLJ0YKNeC/XImEFsr9rM+Uef1CM3PNM43NDdNTrdBejSlzRq0lcfQPWYMYQFSlkLcPOg==
+  dependencies:
+    "@visx/vendor" "3.12.0"
+
 "@visx/scale@3.2.0", "@visx/scale@^3.2.0":
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/@visx/scale/-/scale-3.2.0.tgz#a10a41e77331061819e4c9568e76158f3489a951"
@@ -4616,6 +5075,24 @@
   dependencies:
     "@visx/vendor" "3.2.0"
 
+"@visx/shape@3.12.0":
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/@visx/shape/-/shape-3.12.0.tgz#ce54491d2fb2d96a1f31095ff12218d85d3a2e15"
+  integrity sha512-/1l0lrpX9tPic6SJEalryBKWjP/ilDRnQA+BGJTI1tj7i23mJ/J0t4nJHyA1GrL4QA/bM/qTJ35eyz5dEhJc4g==
+  dependencies:
+    "@types/d3-path" "^1.0.8"
+    "@types/d3-shape" "^1.3.1"
+    "@types/lodash" "^4.14.172"
+    "@types/react" "*"
+    "@visx/curve" "3.12.0"
+    "@visx/group" "3.12.0"
+    "@visx/scale" "3.12.0"
+    classnames "^2.3.1"
+    d3-path "^1.0.5"
+    d3-shape "^1.2.0"
+    lodash "^4.17.21"
+    prop-types "^15.5.10"
+
 "@visx/shape@3.2.0", "@visx/shape@^3.2.0":
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/@visx/shape/-/shape-3.2.0.tgz#2ddc9bbb17bcea32835fea6d2a09b20a3d119791"
@@ -4657,6 +5134,31 @@
     prop-types "^15.5.10"
     react-use-measure "^2.0.4"
 
+"@visx/vendor@3.12.0":
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/@visx/vendor/-/vendor-3.12.0.tgz#36de9d513648b37e1569a963881261dce28b1354"
+  integrity sha512-SVO+G0xtnL9dsNpGDcjCgoiCnlB3iLSM9KLz1sLbSrV7RaVXwY3/BTm2X9OWN1jH2a9M+eHt6DJ6sE6CXm4cUg==
+  dependencies:
+    "@types/d3-array" "3.0.3"
+    "@types/d3-color" "3.1.0"
+    "@types/d3-delaunay" "6.0.1"
+    "@types/d3-format" "3.0.1"
+    "@types/d3-geo" "3.1.0"
+    "@types/d3-interpolate" "3.0.1"
+    "@types/d3-scale" "4.0.2"
+    "@types/d3-time" "3.0.0"
+    "@types/d3-time-format" "2.1.0"
+    d3-array "3.2.1"
+    d3-color "3.1.0"
+    d3-delaunay "6.0.2"
+    d3-format "3.1.0"
+    d3-geo "3.1.0"
+    d3-interpolate "3.0.1"
+    d3-scale "4.0.2"
+    d3-time "3.1.0"
+    d3-time-format "4.1.0"
+    internmap "2.0.3"
+
 "@visx/vendor@3.2.0":
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/@visx/vendor/-/vendor-3.2.0.tgz#05f1ab97ced594d456abe60d2136b298c08d6f1b"
@@ -5738,6 +6240,11 @@ chokidar@^3.5.3:
   optionalDependencies:
     fsevents "~2.3.2"
 
+classcat@^5.0.3, classcat@^5.0.4:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/classcat/-/classcat-5.0.5.tgz#8c209f359a93ac302404a10161b501eba9c09c77"
+  integrity sha512-JhZUT7JFcQy/EzW605k/ktHtncoo9vnyW/2GspNYwFlN1C/WmjuV/xtS04e9SOkL2sTdw0VAZ2UGCcQ9lR6p6w==
+
 classnames@2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
@@ -5849,21 +6356,47 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
-color-name@~1.1.4:
+color-name@^1.0.0, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+color-string@^1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
+  integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
+  dependencies:
+    color-name "^1.0.0"
+    simple-swizzle "^0.2.2"
+
 color2k@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/color2k/-/color2k-2.0.0.tgz#86992c82e248c29f524023ed0822bc152c4fa670"
   integrity sha512-DWX9eXOC4fbJNiuvdH4QSHvvfLWyFo9TuFp7V9OzdsbPAdrWAuYc8qvFP2bIQ/LKh4LrAVnJ6vhiQYPvAHdtTg==
 
+color@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a"
+  integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==
+  dependencies:
+    color-convert "^2.0.1"
+    color-string "^1.9.0"
+
 colorette@^2.0.16:
   version "2.0.20"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
+colorthief@^2.4.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/colorthief/-/colorthief-2.6.0.tgz#f5a7852cd66af31d9559a0341b05c5bb83281f03"
+  integrity sha512-yL3B7laeOr4kH9XasFF5rl+9Taz+Pmt/CRbaTI6XepZFyQvk4K/abaGKIAsngVpxKkgFeoJ2IwdRpS228icrig==
+  dependencies:
+    "@lokesh.dhakar/quantize" "^1.4.0"
+    file-type "^16.5.3"
+    ndarray-pixels "^4.1.0"
+    sharp "^0.33.5"
+
 combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -5981,6 +6514,13 @@ create-react-class@^15.6.2:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
+cron-parser@^4.8.1:
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-4.9.0.tgz#0340694af3e46a0894978c6f52a6dbb5c0f11ad5"
+  integrity sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==
+  dependencies:
+    luxon "^3.2.1"
+
 cronstrue@^1.122.0:
   version "1.122.0"
   resolved "https://registry.yarnpkg.com/cronstrue/-/cronstrue-1.122.0.tgz#bd6838077b476d28f61d381398b47b8c3912a126"
@@ -6060,7 +6600,14 @@ csstype@^3.1.3:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
   integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
-"d3-array@2 - 3", "d3-array@2.10.0 - 3":
+cwise-compiler@^1.0.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/cwise-compiler/-/cwise-compiler-1.1.3.tgz#f4d667410e850d3a313a7d2db7b1e505bb034cc5"
+  integrity sha512-WXlK/m+Di8DMMcCjcWr4i+XzcQra9eCdXIJrgh4TUgh0pIS/yJduLxS9JgefsHJ/YVLdgPtXm9r62W92MvanEQ==
+  dependencies:
+    uniq "^1.0.0"
+
+"d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3":
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.2.4.tgz#15fec33b237f97ac5d7c986dc77da273a8ed0bb5"
   integrity sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==
@@ -6079,11 +6626,43 @@ d3-array@3.2.1:
   resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2"
   integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==
 
+d3-delaunay@6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/d3-delaunay/-/d3-delaunay-6.0.2.tgz#7fd3717ad0eade2fc9939f4260acfb503f984e92"
+  integrity sha512-IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ==
+  dependencies:
+    delaunator "5"
+
+"d3-dispatch@1 - 3":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-3.0.1.tgz#5fc75284e9c2375c36c839411a0cf550cbfc4d5e"
+  integrity sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==
+
+"d3-drag@2 - 3", d3-drag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-3.0.0.tgz#994aae9cd23c719f53b5e10e3a0a6108c69607ba"
+  integrity sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==
+  dependencies:
+    d3-dispatch "1 - 3"
+    d3-selection "3"
+
+"d3-ease@1 - 3":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-3.0.1.tgz#9658ac38a2140d59d346160f1f6c30fda0bd12f4"
+  integrity sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==
+
 "d3-format@1 - 3", d3-format@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-3.1.0.tgz#9260e23a28ea5cb109e93b21a06e24e2ebd55641"
   integrity sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==
 
+d3-geo@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-3.1.0.tgz#74fd54e1f4cebd5185ac2039217a98d39b0a4c0e"
+  integrity sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==
+  dependencies:
+    d3-array "2.5.0 - 3"
+
 d3-hierarchy@^1.1.4:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz#2f6bee24caaea43f8dc37545fa01628559647a83"
@@ -6094,7 +6673,7 @@ d3-interpolate-path@2.2.1:
   resolved "https://registry.yarnpkg.com/d3-interpolate-path/-/d3-interpolate-path-2.2.1.tgz#fd8ff20a90aff3f380bcd1c15305e7b531e55d07"
   integrity sha512-6qLLh/KJVzls0XtMsMpcxhqMhgVEN7VIbR/6YGZe2qlS8KDgyyVB20XcmGnDyB051HcefQXM/Tppa9vcANEA4Q==
 
-"d3-interpolate@1.2.0 - 3", d3-interpolate@3.0.1:
+"d3-interpolate@1 - 3", "d3-interpolate@1.2.0 - 3", d3-interpolate@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz#3c47aa5b32c5b3dfb56ef3fd4342078a632b400d"
   integrity sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==
@@ -6122,6 +6701,11 @@ d3-scale@4.0.2, d3-scale@^4.0.2:
     d3-time "2.1.1 - 3"
     d3-time-format "2 - 4"
 
+"d3-selection@2 - 3", d3-selection@3, d3-selection@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-3.0.0.tgz#c25338207efa72cc5b9bd1458a1a41901f1e1b31"
+  integrity sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==
+
 d3-shape@^1.0.6, d3-shape@^1.2.0:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.7.tgz#df63801be07bc986bc54f63789b4fe502992b5d7"
@@ -6150,11 +6734,38 @@ d3-shape@^2.0.0:
   dependencies:
     d3-array "2 - 3"
 
+"d3-timer@1 - 3":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-3.0.1.tgz#6284d2a2708285b1abb7e201eda4380af35e63b0"
+  integrity sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==
+
+"d3-transition@2 - 3":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-3.0.1.tgz#6869fdde1448868077fdd5989200cb61b2a1645f"
+  integrity sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==
+  dependencies:
+    d3-color "1 - 3"
+    d3-dispatch "1 - 3"
+    d3-ease "1 - 3"
+    d3-interpolate "1 - 3"
+    d3-timer "1 - 3"
+
 d3-voronoi@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.4.tgz#dd3c78d7653d2bb359284ae478645d95944c8297"
   integrity sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg==
 
+d3-zoom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-3.0.0.tgz#d13f4165c73217ffeaa54295cd6969b3e7aee8f3"
+  integrity sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==
+  dependencies:
+    d3-dispatch "1 - 3"
+    d3-drag "2 - 3"
+    d3-interpolate "1 - 3"
+    d3-selection "2 - 3"
+    d3-transition "2 - 3"
+
 damerau-levenshtein@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
@@ -6316,6 +6927,13 @@ define-properties@^1.2.0:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
+delaunator@5:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/delaunator/-/delaunator-5.0.1.tgz#39032b08053923e924d6094fe2cde1a99cc51278"
+  integrity sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==
+  dependencies:
+    robust-predicates "^3.0.2"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -6336,6 +6954,11 @@ detect-indent@^6.0.0:
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd"
   integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==
 
+detect-libc@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700"
+  integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==
+
 detect-node-es@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.1.0.tgz#163acdf643330caa0b4cd7c21e7ee7755d6fa493"
@@ -7101,6 +7724,15 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
+file-type@^16.5.3:
+  version "16.5.4"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.5.4.tgz#474fb4f704bee427681f98dd390058a172a6c2fd"
+  integrity sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==
+  dependencies:
+    readable-web-to-node-stream "^3.0.0"
+    strtok3 "^6.2.4"
+    token-types "^4.1.1"
+
 filelist@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5"
@@ -7238,6 +7870,11 @@ functions-have-names@^1.2.2, functions-have-names@^1.2.3:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
+fuse.js@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-7.0.0.tgz#6573c9fcd4c8268e403b4fc7d7131ffcf99a9eb2"
+  integrity sha512-14F4hBIxqKvD4Zz/XjDc3y94mNZN6pRv3U13Udo0lNLCWRBUsrMv2xwcF/y/Z5sV6+FQW+/ow68cHpm4sunt8Q==
+
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -7669,6 +8306,11 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
+html-to-image@^1.11.11:
+  version "1.11.11"
+  resolved "https://registry.yarnpkg.com/html-to-image/-/html-to-image-1.11.11.tgz#c0f8a34dc9e4b97b93ff7ea286eb8562642ebbea"
+  integrity sha512-9gux8QhvjRO/erSnDPv28noDZcPZmYE7e1vFsBLKLlRlKDSqNJYebj6Qz1TGd5lsRV+X+xYyjCKjuZdABinWjA==
+
 html-void-elements@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483"
@@ -7733,7 +8375,7 @@ idb-keyval@^5.0.2:
   dependencies:
     safari-14-idb-fix "^1.0.6"
 
-ieee754@^1.1.13:
+ieee754@^1.1.13, ieee754@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
@@ -7853,6 +8495,11 @@ invariant@^2.2.4:
   dependencies:
     loose-envify "^1.0.0"
 
+iota-array@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/iota-array/-/iota-array-1.0.0.tgz#81ef57fe5d05814cd58c2483632a99c30a0e8087"
+  integrity sha512-pZ2xT+LOHckCatGQ3DcG/a+QuEqvoxqkiL7tvE8nn3uuu+f6i1TtpB5/FtWFbxUuVr5PZCx8KskuGatbJDXOWA==
+
 is-absolute@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
@@ -7896,6 +8543,11 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
+is-arrayish@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
+  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
+
 is-bigint@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
@@ -7915,6 +8567,11 @@ is-boolean-object@^1.1.0:
   dependencies:
     call-bind "^1.0.2"
 
+is-buffer@^1.0.2:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+
 is-buffer@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
@@ -8596,6 +9253,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+luxon@^3.2.1:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.5.0.tgz#6b6f65c5cd1d61d1fd19dbf07ee87a50bf4b8e20"
+  integrity sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==
+
 lz-string@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941"
@@ -8797,6 +9459,11 @@ mdurl@^1.0.0:
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
 
+"memoize-one@>=3.1.1 <6":
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
+  integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
+
 memoizerific@^1.11.3:
   version "1.11.3"
   resolved "https://registry.yarnpkg.com/memoizerific/-/memoizerific-1.11.3.tgz#7c87a4646444c32d75438570905f2dbd1b1a805a"
@@ -9030,6 +9697,31 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
+ndarray-ops@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/ndarray-ops/-/ndarray-ops-1.2.2.tgz#59e88d2c32a7eebcb1bc690fae141579557a614e"
+  integrity sha512-BppWAFRjMYF7N/r6Ie51q6D4fs0iiGmeXIACKY66fLpnwIui3Wc3CXiD/30mgLbDjPpSLrsqcp3Z62+IcHZsDw==
+  dependencies:
+    cwise-compiler "^1.0.0"
+
+ndarray-pixels@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ndarray-pixels/-/ndarray-pixels-4.1.0.tgz#6525d573347ec375aa1b690688a51d02fdca7fb7"
+  integrity sha512-xKPI4zXJ2pkUcVX24zIN1AWqqPWvRWWhRuO6PlY4EdB2VNRauNwA6rDdsAQG/ldQp0sU7nTXgPR/io1duy3Zyg==
+  dependencies:
+    "@types/ndarray" "^1.0.14"
+    ndarray "^1.0.19"
+    ndarray-ops "^1.2.2"
+    sharp "^0.33.4"
+
+ndarray@^1.0.19:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/ndarray/-/ndarray-1.0.19.tgz#6785b5f5dfa58b83e31ae5b2a058cfd1ab3f694e"
+  integrity sha512-B4JHA4vdyZU30ELBw3g7/p9bZupyew5a7tX1Y/gGeF2hafrPaQZhgrGQfsvgfYbgdFZjYwuEcnaobeM/WMW+HQ==
+  dependencies:
+    iota-array "^1.0.0"
+    is-buffer "^1.0.2"
+
 needle@^3.1.0:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/needle/-/needle-3.3.1.tgz#63f75aec580c2e77e209f3f324e2cdf3d29bd049"
@@ -9460,6 +10152,16 @@ pathval@^2.0.0:
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-2.0.0.tgz#7e2550b422601d4f6b8e26f1301bc8f15a741a25"
   integrity sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==
 
+peek-readable@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-4.1.0.tgz#4ece1111bf5c2ad8867c314c81356847e8a62e72"
+  integrity sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==
+
+phosphor-react@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/phosphor-react/-/phosphor-react-1.4.1.tgz#97b0e034d9937db9b97fe53b186e9646464fd4e7"
+  integrity sha512-gO5j7U0xZrdglTAYDYPACU4xDOFBTJmptrrB/GeR+tHhCZF3nUMyGmV/0hnloKjuTrOmpSFlbfOY78H39rgjUQ==
+
 picocolors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
@@ -10264,6 +10966,13 @@ react-dom@^17.0.0:
     object-assign "^4.1.1"
     scheduler "^0.20.2"
 
+react-error-boundary@^3.1.0:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-3.1.4.tgz#255db92b23197108757a888b01e5b729919abde0"
+  integrity sha512-uM9uPzZJTF6wRQORmSrvOIgt4lJ9MC1sNgEOj2XGsDTRE4kmpWxg7ENK9EWNKJRMAOY9z0MuF4yIfl6gp4sotA==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+
 react-fast-compare@^3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.1.tgz#53933d9e14f364281d6cba24bfed7a4afb808b5f"
@@ -10307,6 +11016,11 @@ react-icons@4.3.1:
   resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-4.3.1.tgz#2fa92aebbbc71f43d2db2ed1aed07361124e91ca"
   integrity sha512-cB10MXLTs3gVuXimblAdI71jrJx8njrJZmNMEMC+sQu5B/BIOmlsAjskdqpn81y8UBVEGuHODd7/ci5DvoSzTQ==
 
+react-intersection-observer@^8.26.2:
+  version "8.34.0"
+  resolved "https://registry.yarnpkg.com/react-intersection-observer/-/react-intersection-observer-8.34.0.tgz#6f6e67831c52e6233f6b6cc7eb55814820137c42"
+  integrity sha512-TYKh52Zc0Uptp5/b4N91XydfSGKubEhgZRtcg1rhTKABXijc4Sdr1uTp5lJ8TN27jwUsdXxjHXtHa0kPj704sw==
+
 react-intersection-observer@^9.5.3:
   version "9.5.3"
   resolved "https://registry.yarnpkg.com/react-intersection-observer/-/react-intersection-observer-9.5.3.tgz#f47a31ed3a0359cbbfdb91a53d7470ac2ab7b3c7"
@@ -10442,6 +11156,15 @@ react-use@^17.3.2:
     ts-easing "^0.2.0"
     tslib "^2.1.0"
 
+react-vertical-timeline-component@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/react-vertical-timeline-component/-/react-vertical-timeline-component-3.6.0.tgz#aeb4b56be3f397b493c847df79521f3bfb3aab71"
+  integrity sha512-l9zulqjIGlRuaQeplGzV4r/tG2RYBpYt84Il8w4IxnJze2cDIGI04MKo3F7f1sHT0Sih1ohEFts8UV23AJS15Q==
+  dependencies:
+    classnames "^2.2.6"
+    prop-types "^15.7.2"
+    react-intersection-observer "^8.26.2"
+
 react-visibility-sensor@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/react-visibility-sensor/-/react-visibility-sensor-5.1.1.tgz#5238380960d3a0b2be0b7faddff38541e337f5a9"
@@ -10449,6 +11172,14 @@ react-visibility-sensor@^5.1.1:
   dependencies:
     prop-types "^15.7.2"
 
+react-window@^1.8.10:
+  version "1.8.11"
+  resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.11.tgz#a857b48fa85bd77042d59cc460964ff2e0648525"
+  integrity sha512-+SRbUVT2scadgFSWx+R1P754xHPEqvcfSfVX10QYg6POOz+WNgkN48pS+BtZNIMGiL1HYrSEiCkwsMS15QogEQ==
+  dependencies:
+    "@babel/runtime" "^7.0.0"
+    memoize-one ">=3.1.1 <6"
+
 "react@^16.8.0 || ^17.0.0 || ^18.0.0":
   version "18.3.1"
   resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891"
@@ -10471,6 +11202,18 @@ reactcss@^1.2.0:
   dependencies:
     lodash "^4.0.1"
 
+reactflow@^11.10.1:
+  version "11.11.4"
+  resolved "https://registry.yarnpkg.com/reactflow/-/reactflow-11.11.4.tgz#e3593e313420542caed81aecbd73fb9bc6576653"
+  integrity sha512-70FOtJkUWH3BAOsN+LU9lCrKoKbtOPnz2uq0CV2PLdNSwxTXOhCbsZr50GmZ+Rtw3jx8Uv7/vBFtCGixLfd4Og==
+  dependencies:
+    "@reactflow/background" "11.3.14"
+    "@reactflow/controls" "11.2.14"
+    "@reactflow/core" "11.11.4"
+    "@reactflow/minimap" "11.7.14"
+    "@reactflow/node-resizer" "2.2.14"
+    "@reactflow/node-toolbar" "1.3.14"
+
 reactour@^1.19.3:
   version "1.19.3"
   resolved "https://registry.yarnpkg.com/reactour/-/reactour-1.19.3.tgz#d83877496a3af211a881fba3709276accf2ac3e7"
@@ -10485,7 +11228,7 @@ reactour@^1.19.3:
     scroll-smooth "1.1.1"
     scrollparent "2.0.1"
 
-readable-stream@^3.4.0:
+readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
   integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
@@ -10494,6 +11237,13 @@ readable-stream@^3.4.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readable-web-to-node-stream@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz#5d52bb5df7b54861fd48d015e93a2cb87b3ee0bb"
+  integrity sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==
+  dependencies:
+    readable-stream "^3.6.0"
+
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -10827,6 +11577,11 @@ rimraf@~2.6.2:
   dependencies:
     glob "^7.1.3"
 
+robust-predicates@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/robust-predicates/-/robust-predicates-3.0.2.tgz#d5b28528c4824d20fc48df1928d41d9efa1ad771"
+  integrity sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==
+
 rollup@^3.27.1:
   version "3.29.5"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.5.tgz#8a2e477a758b520fb78daf04bca4c522c1da8a54"
@@ -10986,7 +11741,7 @@ semver@^7.3.7:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^7.5.3, semver@^7.6.2:
+semver@^7.5.3, semver@^7.6.2, semver@^7.6.3:
   version "7.6.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
@@ -11058,6 +11813,35 @@ shallowequal@^1.1.0:
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
   integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
 
+sharp@^0.33.4, sharp@^0.33.5:
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.33.5.tgz#13e0e4130cc309d6a9497596715240b2ec0c594e"
+  integrity sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==
+  dependencies:
+    color "^4.2.3"
+    detect-libc "^2.0.3"
+    semver "^7.6.3"
+  optionalDependencies:
+    "@img/sharp-darwin-arm64" "0.33.5"
+    "@img/sharp-darwin-x64" "0.33.5"
+    "@img/sharp-libvips-darwin-arm64" "1.0.4"
+    "@img/sharp-libvips-darwin-x64" "1.0.4"
+    "@img/sharp-libvips-linux-arm" "1.0.5"
+    "@img/sharp-libvips-linux-arm64" "1.0.4"
+    "@img/sharp-libvips-linux-s390x" "1.0.4"
+    "@img/sharp-libvips-linux-x64" "1.0.4"
+    "@img/sharp-libvips-linuxmusl-arm64" "1.0.4"
+    "@img/sharp-libvips-linuxmusl-x64" "1.0.4"
+    "@img/sharp-linux-arm" "0.33.5"
+    "@img/sharp-linux-arm64" "0.33.5"
+    "@img/sharp-linux-s390x" "0.33.5"
+    "@img/sharp-linux-x64" "0.33.5"
+    "@img/sharp-linuxmusl-arm64" "0.33.5"
+    "@img/sharp-linuxmusl-x64" "0.33.5"
+    "@img/sharp-wasm32" "0.33.5"
+    "@img/sharp-win32-ia32" "0.33.5"
+    "@img/sharp-win32-x64" "0.33.5"
+
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -11099,6 +11883,13 @@ signedsource@^1.0.0:
   resolved "https://registry.yarnpkg.com/signedsource/-/signedsource-1.0.0.tgz#1ddace4981798f93bd833973803d80d52e93ad6a"
   integrity sha512-6+eerH9fEnNmi/hyM1DXcRK3pWdoMQtlkQ+ns0ntzunjKqp5i3sKCc80ym8Fib3iaYhdJUOPdhlJWj1tvge2Ww==
 
+simple-swizzle@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
+  integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==
+  dependencies:
+    is-arrayish "^0.3.1"
+
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -11382,6 +12173,14 @@ strip-literal@^1.0.1:
   dependencies:
     acorn "^8.10.0"
 
+strtok3@^6.2.4:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-6.3.0.tgz#358b80ffe6d5d5620e19a073aa78ce947a90f9a0"
+  integrity sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==
+  dependencies:
+    "@tokenizer/token" "^0.3.0"
+    peek-readable "^4.1.0"
+
 style-to-object@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46"
@@ -11576,6 +12375,14 @@ toggle-selection@^1.0.6:
   resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
   integrity sha1-bkWxJj8gF/oKzH2J14sVuL932jI=
 
+token-types@^4.1.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/token-types/-/token-types-4.2.1.tgz#0f897f03665846982806e138977dbe72d44df753"
+  integrity sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==
+  dependencies:
+    "@tokenizer/token" "^0.3.0"
+    ieee754 "^1.2.1"
+
 tough-cookie@^4.1.2:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
@@ -11792,6 +12599,11 @@ unified@^9.0.0:
     trough "^1.0.0"
     vfile "^4.0.0"
 
+uniq@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+  integrity sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==
+
 unist-builder@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436"
@@ -11951,6 +12763,11 @@ use-sidecar@^1.0.5:
     detect-node-es "^1.1.0"
     tslib "^2.0.0"
 
+use-sync-external-store@^1.2.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.4.0.tgz#adbc795d8eeb47029963016cefdf89dc799fcebc"
+  integrity sha512-9WXSPC5fMv61vaupRkCKCxsPxBocVnwakBEkMIHHpkTTg6icbJtg6jzgtLDm4bl3cSHAca52rYWih0k4K3PfHw==
+
 util-deprecate@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -12457,6 +13274,13 @@ zen-observable@^0.8.14:
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15"
   integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==
 
+zustand@^4.4.1:
+  version "4.5.6"
+  resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.5.6.tgz#6857d52af44874a79fb3408c9473f78367255c96"
+  integrity sha512-ibr/n1hBzLLj5Y+yUcU7dYw8p6WnIVzdJbnX+1YpaScvZVF2ziugqHs+LAmHw4lWO9c/zRj+K1ncgWDQuthEdQ==
+  dependencies:
+    use-sync-external-store "^1.2.2"
+
 zwitch@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 0cbb2aee903c84..2a4de1701eb52d 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -47,6 +47,10 @@ services:
     - SHOW_BROWSE_V2=true
     - ER_MODEL_RELATIONSHIP_FEATURE_ENABLED=false
     - KAFKA_CONSUMER_STOP_ON_DESERIALIZATION_ERROR=${KAFKA_CONSUMER_STOP_ON_DESERIALIZATION_ERROR:-true}
+    - THEME_V2_ENABLED=${THEME_V2_ENABLED:-true}
+    - THEME_V2_TOGGLEABLE=${THEME_V2_TOGGLEABLE:-true}
+    - SHOW_NAV_BAR_REDESIGN=${SHOW_NAV_BAR_REDESIGN:-true}
+    - PLATFORM_BROWSE_V2=${PLATFORM_BROWSE_V2:-true}
     volumes:
     - ./datahub-gms/start.sh:/datahub/datahub-gms/scripts/start.sh
     - ./monitoring/client-prometheus-config.yaml:/datahub/datahub-gms/scripts/prometheus-config.yaml
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/aspect/utils/DeprecationUtils.java b/metadata-io/src/main/java/com/linkedin/metadata/aspect/utils/DeprecationUtils.java
index cf7fd359af4e40..8e8a3e6ea96d41 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/aspect/utils/DeprecationUtils.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/aspect/utils/DeprecationUtils.java
@@ -7,6 +7,7 @@
 import com.linkedin.metadata.entity.EntityService;
 import com.linkedin.metadata.entity.EntityUtils;
 import io.datahubproject.metadata.context.OperationContext;
+import java.net.URISyntaxException;
 import java.util.Objects;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -23,7 +24,8 @@ public static Deprecation getDeprecation(
       Urn actor,
       @Nullable String note,
       boolean deprecated,
-      @Nullable Long decommissionTime) {
+      @Nullable Long decommissionTime,
+      @Nullable String replacementUrn) {
     Deprecation deprecation =
         (Deprecation)
             EntityUtils.getAspectFromEntity(
@@ -37,6 +39,13 @@ public static Deprecation getDeprecation(
     }
     deprecation.setActor(actor);
     deprecation.setDeprecated(deprecated);
+    try {
+      deprecation.setReplacement(
+          replacementUrn != null ? Urn.createFromString(replacementUrn) : null,
+          SetMode.REMOVE_IF_NULL);
+    } catch (URISyntaxException e) {
+      throw new RuntimeException(e);
+    }
     deprecation.setDecommissionTime(decommissionTime, SetMode.REMOVE_IF_NULL);
     deprecation.setNote(Objects.requireNonNullElse(note, ""));
     return deprecation;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/AggregationQueryBuilder.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/AggregationQueryBuilder.java
index 8ff0759b2e41a5..3d1c03524811c5 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/AggregationQueryBuilder.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/AggregationQueryBuilder.java
@@ -104,6 +104,10 @@ private Set<String> getDefaultFacetFields(final List<SearchableAnnotation> annot
             .flatMap(annotation -> getDefaultFacetFieldsFromAnnotation(annotation).stream())
             .collect(Collectors.toSet());
     facets.add(INDEX_VIRTUAL_FIELD);
+    // Entity Type > Sub-Type aggregations.
+    // TODO: Ideally we can avoid the index-virtual-fields aggregation.
+    facets.add(
+        String.format("%s%s%s", INDEX_VIRTUAL_FIELD, AGGREGATION_SEPARATOR_CHAR, "typeNames"));
     return facets;
   }
 
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AggregationQueryBuilderTest.java b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AggregationQueryBuilderTest.java
index d6f5f9c3eedbe7..2ba03665068fbf 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AggregationQueryBuilderTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AggregationQueryBuilderTest.java
@@ -267,9 +267,11 @@ public void testGetSpecificAggregationsHasFields() {
         builder.getAggregations(
             TestOperationContexts.systemContextNoSearchAuthorization(),
             ImmutableList.of("test1", "test2", "hasTest1"));
-    Assert.assertEquals(aggs.size(), 4);
+    Assert.assertEquals(aggs.size(), 5);
     Set<String> facets = aggs.stream().map(AggregationBuilder::getName).collect(Collectors.toSet());
-    Assert.assertEquals(ImmutableSet.of("test1", "test2", "hasTest1", "_entityType"), facets);
+    Assert.assertEquals(
+        ImmutableSet.of("test1", "test2", "hasTest1", "_entityType", "_entityType␞typeNames"),
+        facets);
 
     // Case 2: Ask for fields that should NOT exist.
     aggs =
@@ -277,7 +279,7 @@ public void testGetSpecificAggregationsHasFields() {
             TestOperationContexts.systemContextNoSearchAuthorization(),
             ImmutableList.of("hasTest2"));
     Assert.assertEquals(
-        aggs.size(), 1); // default has one field already, hasTest2 will not be in there
+        aggs.size(), 2); // default has two fields already, hasTest2 will not be in there
   }
 
   @Test
@@ -293,7 +295,7 @@ public void testAggregateOverStructuredProperty() {
         builder.getAggregations(
             TestOperationContexts.systemContextNoSearchAuthorization(aspectRetriever),
             List.of("structuredProperties.ab.fgh.ten"));
-    Assert.assertEquals(aggs.size(), 2);
+    Assert.assertEquals(aggs.size(), 3);
     AggregationBuilder aggBuilder = aggs.get(0);
     Assert.assertTrue(aggBuilder instanceof TermsAggregationBuilder);
     TermsAggregationBuilder agg = (TermsAggregationBuilder) aggBuilder;
@@ -309,7 +311,9 @@ public void testAggregateOverStructuredProperty() {
             TestOperationContexts.systemContextNoSearchAuthorization(aspectRetriever),
             List.of("structuredProperties.ab.fgh.ten", "structuredProperties.hello"));
     Assert.assertEquals(
-        aggs.size(), 3); // has one default filter (_entityType) both get mapped to _index
+        aggs.size(),
+        4); // has two default filters (_entityType, _entityType␞typeNames) both get mapped to
+    // _index
     Assert.assertEquals(
         aggs.stream()
             .map(aggr -> ((TermsAggregationBuilder) aggr).field())
@@ -333,7 +337,7 @@ public void testAggregateOverStructuredPropertyNamespaced() {
         builder.getAggregations(
             TestOperationContexts.systemContextNoSearchAuthorization(aspectRetriever),
             List.of("structuredProperties.under.scores.and.dots_make_a_mess"));
-    Assert.assertEquals(aggs.size(), 2);
+    Assert.assertEquals(aggs.size(), 3);
     Assert.assertEquals(
         aggs.stream()
             .map(aggr -> ((TermsAggregationBuilder) aggr).field())
@@ -346,7 +350,7 @@ public void testAggregateOverStructuredPropertyNamespaced() {
             List.of(
                 "structuredProperties.under.scores.and.dots_make_a_mess",
                 "structuredProperties.hello"));
-    Assert.assertEquals(aggs.size(), 3);
+    Assert.assertEquals(aggs.size(), 4);
     Assert.assertEquals(
         aggs.stream()
             .map(aggr -> ((TermsAggregationBuilder) aggr).field())
@@ -370,7 +374,7 @@ public void testAggregateOverStructuredPropertyV1() {
         builder.getAggregations(
             TestOperationContexts.systemContextNoSearchAuthorization(aspectRetrieverV1),
             List.of("structuredProperties.ab.fgh.ten"));
-    Assert.assertEquals(aggs.size(), 2);
+    Assert.assertEquals(aggs.size(), 3);
     AggregationBuilder aggBuilder = aggs.get(0);
     Assert.assertTrue(aggBuilder instanceof TermsAggregationBuilder);
     TermsAggregationBuilder agg = (TermsAggregationBuilder) aggBuilder;
@@ -388,7 +392,9 @@ public void testAggregateOverStructuredPropertyV1() {
                 "structuredProperties.ab.fgh.ten",
                 "structuredProperties._versioned.hello.00000000000001.string"));
     Assert.assertEquals(
-        aggs.size(), 3); // has two one filter (_entityType) both get mapped to _index
+        aggs.size(),
+        4); // has two default filters (_entityType, _entityType␞typeNames) both get mapped to
+    // _index
     Assert.assertEquals(
         aggs.stream()
             .map(aggr -> ((TermsAggregationBuilder) aggr).field())
@@ -412,7 +418,7 @@ public void testAggregateOverStructuredPropertyNamespacedV1() {
         builder.getAggregations(
             TestOperationContexts.systemContextNoSearchAuthorization(aspectRetrieverV1),
             List.of("structuredProperties.under.scores.and.dots_make_a_mess"));
-    Assert.assertEquals(aggs.size(), 2);
+    Assert.assertEquals(aggs.size(), 3);
     Assert.assertEquals(
         aggs.stream()
             .map(aggr -> ((TermsAggregationBuilder) aggr).field())
@@ -428,7 +434,7 @@ public void testAggregateOverStructuredPropertyNamespacedV1() {
             List.of(
                 "structuredProperties.under.scores.and.dots_make_a_mess",
                 "structuredProperties._versioned.hello.00000000000001.string"));
-    Assert.assertEquals(aggs.size(), 3);
+    Assert.assertEquals(aggs.size(), 4);
     Assert.assertEquals(
         aggs.stream()
             .map(aggr -> ((TermsAggregationBuilder) aggr).field())
@@ -493,7 +499,7 @@ public void testAggregateOverFieldsAndStructProp() {
                 "hasTest1",
                 "structuredProperties.ab.fgh.ten",
                 "structuredProperties.hello"));
-    Assert.assertEquals(aggs.size(), 6);
+    Assert.assertEquals(aggs.size(), 7);
     Set<String> facets =
         aggs.stream()
             .map(aggB -> ((TermsAggregationBuilder) aggB).field())
@@ -564,7 +570,9 @@ public void testAggregateOverFieldsAndStructPropV1() {
                 "structuredProperties.ab.fgh.ten",
                 "structuredProperties.hello"));
     Assert.assertEquals(
-        aggs.size(), 6); // has one default filter (_entityType) both get mapped to _index
+        aggs.size(),
+        7); // has two default filters (_entityType, _entityType␞typeNames) both get mapped to
+    // _index
     Set<String> facets =
         aggs.stream()
             .map(aggB -> ((TermsAggregationBuilder) aggB).field())
diff --git a/metadata-models/src/main/pegasus/com/linkedin/assertion/AssertionSource.pdl b/metadata-models/src/main/pegasus/com/linkedin/assertion/AssertionSource.pdl
index 734a48f7718863..0faa639c3edfcf 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/assertion/AssertionSource.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/assertion/AssertionSource.pdl
@@ -15,6 +15,7 @@ record AssertionSource {
     type:  enum AssertionSourceType {
       /**
        * The assertion was defined natively on DataHub by a user.
+       * DataHub Cloud only
        */
       NATIVE
       /**
@@ -23,6 +24,7 @@ record AssertionSource {
       EXTERNAL
       /**
        * The assertion was inferred, e.g. from offline AI / ML models.
+       * DataHub Cloud only
        */
       INFERRED
     }
diff --git a/metadata-models/src/main/pegasus/com/linkedin/common/Deprecation.pdl b/metadata-models/src/main/pegasus/com/linkedin/common/Deprecation.pdl
index f96b9da45cdf76..7c6f7d155a1781 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/common/Deprecation.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/common/Deprecation.pdl
@@ -31,4 +31,7 @@ record Deprecation {
    * The user URN which will be credited for modifying this deprecation content.
    */
   actor: Urn
+
+  replacement: optional Urn
+  
 }
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/common/DisplayProperties.pdl b/metadata-models/src/main/pegasus/com/linkedin/common/DisplayProperties.pdl
new file mode 100644
index 00000000000000..bf556d842ffb6c
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/common/DisplayProperties.pdl
@@ -0,0 +1,20 @@
+namespace com.linkedin.common
+
+/**
+ * Properties related to how the entity is displayed in the Datahub UI
+ */
+
+@Aspect = {
+  "name": "displayProperties"
+}
+record DisplayProperties {
+  /**
+   * The color associated with the entity in Hex. For example #FFFFFF.
+   */
+  colorHex: optional string
+
+  /**
+   * The icon associated with the entity
+   */
+  icon: optional IconProperties
+}
diff --git a/metadata-models/src/main/pegasus/com/linkedin/common/IconLibrary.pdl b/metadata-models/src/main/pegasus/com/linkedin/common/IconLibrary.pdl
new file mode 100644
index 00000000000000..a6650f5ef3a8e5
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/common/IconLibrary.pdl
@@ -0,0 +1,12 @@
+namespace com.linkedin.common
+
+/**
+ * Enum of possible icon sources
+ */
+enum IconLibrary {
+
+  /**
+   * Material UI
+   */
+   MATERIAL
+}
diff --git a/metadata-models/src/main/pegasus/com/linkedin/common/IconProperties.pdl b/metadata-models/src/main/pegasus/com/linkedin/common/IconProperties.pdl
new file mode 100644
index 00000000000000..e2ee3af8657013
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/common/IconProperties.pdl
@@ -0,0 +1,22 @@
+namespace com.linkedin.common
+
+/**
+ * Properties describing an icon associated with an entity
+ */
+
+record IconProperties {
+  /**
+   * The source of the icon: e.g. Antd, Material, etc
+   */
+  iconLibrary: IconLibrary
+
+  /**
+   * The name of the icon
+   */
+  name: string
+
+  /**
+   * Any modifier for the icon, this will be library-specific, e.g. filled/outlined, etc
+   */
+  style: string
+}
diff --git a/metadata-models/src/main/pegasus/com/linkedin/identity/CorpUserAppearanceSettings.pdl b/metadata-models/src/main/pegasus/com/linkedin/identity/CorpUserAppearanceSettings.pdl
index bb81b160746a2e..97d23fee453bbd 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/identity/CorpUserAppearanceSettings.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/identity/CorpUserAppearanceSettings.pdl
@@ -9,4 +9,9 @@ record CorpUserAppearanceSettings {
    * who have less operational use cases for the datahub tool.
    */
   showSimplifiedHomepage: optional boolean
+
+  /**
+   * Flag controlling whether the V2 UI for DataHub is shown.
+   */
+  showThemeV2: optional boolean
 }
diff --git a/metadata-models/src/main/pegasus/com/linkedin/post/PostInfo.pdl b/metadata-models/src/main/pegasus/com/linkedin/post/PostInfo.pdl
index 70ff38f3b7633c..87613347e364d1 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/post/PostInfo.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/post/PostInfo.pdl
@@ -13,6 +13,7 @@ record PostInfo {
   /**
    * Type of the Post.
    */
+  @Searchable = { }
   type: PostType
 
   /**
@@ -48,11 +49,12 @@ record PostInfo {
   auditStamp: optional AuditStamp
 
   /**
-   * Optional URN that the post is associated with.
+   * Optional Entity URN that the post is associated with.
    */
   @Relationship = {
     "name": "PostTarget",
-    "entityTypes": [ "dataset", "schemaField", "chart", "dashboard", "dataFlow", "dataJob", "dataProduct" ]
+    "entityTypes": [ "dataset", "schemaField", "chart", "container", "dashboard", "dataFlow", "dataJob", "dataProduct", "glossaryTerm", "glossaryNode", "mlModel", "mlFeature", "notebook", "mlFeatureTable", "mlPrimaryKey", "mlModelGroup", "domain", "dataProduct" ]
   }
+  @Searchable = {}
   target: optional Urn
-}
\ No newline at end of file
+}
diff --git a/metadata-models/src/main/pegasus/com/linkedin/post/PostType.pdl b/metadata-models/src/main/pegasus/com/linkedin/post/PostType.pdl
index 43aa851f0efeb5..f8a28f0d1850ae 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/post/PostType.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/post/PostType.pdl
@@ -8,4 +8,8 @@ enum PostType {
    * The Post is an Home Page announcement.
    */
   HOME_PAGE_ANNOUNCEMENT
+  /**
+   * The Post is an Entity level announcement.
+   */
+  ENTITY_ANNOUNCEMENT,
 }
\ No newline at end of file
diff --git a/metadata-models/src/main/resources/entity-registry.yml b/metadata-models/src/main/resources/entity-registry.yml
index 32f9d1b98db5df..96a1c4791f2102 100644
--- a/metadata-models/src/main/resources/entity-registry.yml
+++ b/metadata-models/src/main/resources/entity-registry.yml
@@ -490,6 +490,7 @@ entities:
       - schemaFieldAliases
       - documentation
       - testResults
+      - deprecation
   - name: globalSettings
     doc: Global settings for an the platform
     category: internal
diff --git a/metadata-service/configuration/src/main/java/com/linkedin/datahub/graphql/featureflags/FeatureFlags.java b/metadata-service/configuration/src/main/java/com/linkedin/datahub/graphql/featureflags/FeatureFlags.java
index eeb90d09204bb9..8df5b1ad768f0f 100644
--- a/metadata-service/configuration/src/main/java/com/linkedin/datahub/graphql/featureflags/FeatureFlags.java
+++ b/metadata-service/configuration/src/main/java/com/linkedin/datahub/graphql/featureflags/FeatureFlags.java
@@ -13,6 +13,7 @@ public class FeatureFlags {
   private boolean showSearchFiltersV2 = false;
   private boolean showBrowseV2 = false;
   private boolean platformBrowseV2 = false;
+  private boolean lineageGraphV2 = false;
   private PreProcessHooks preProcessHooks;
   private boolean showAcrylInfo = false;
   private boolean erModelRelationshipFeatureEnabled = false;
@@ -22,9 +23,17 @@ public class FeatureFlags {
   private boolean businessAttributeEntityEnabled = false;
   private boolean dataContractsEnabled = false;
   private boolean editableDatasetNameEnabled = false;
+  private boolean themeV2Enabled = false;
+  private boolean themeV2Default = false;
+  private boolean themeV2Toggleable = false;
   private boolean showSeparateSiblings = false;
   private boolean alternateMCPValidation = false;
   private boolean showManageStructuredProperties = false;
+  private boolean hideDbtSourceInLineage = false;
+  private boolean schemaFieldCLLEnabled = false;
+  private boolean schemaFieldLineageIgnoreStatus = false;
+  private boolean showNavBarRedesign = false;
+  private boolean showAutoCompleteResults = false;
   private boolean dataProcessInstanceEntityEnabled = true;
   private boolean entityVersioning = false;
 }
diff --git a/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/ChromeExtensionConfiguration.java b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/ChromeExtensionConfiguration.java
new file mode 100644
index 00000000000000..d6bbde9b7552c2
--- /dev/null
+++ b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/ChromeExtensionConfiguration.java
@@ -0,0 +1,13 @@
+package com.linkedin.metadata.config;
+
+import lombok.Data;
+
+/** POJO representing the ChromeExtension configuration block in application.yaml */
+@Data
+public class ChromeExtensionConfiguration {
+  /** Whether the extension is enabled */
+  public boolean enabled;
+
+  /** Whether lineage is enabled for the extension */
+  public boolean lineageEnabled;
+}
diff --git a/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/DataHubAppConfiguration.java b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/DataHubAppConfiguration.java
index fb7a5103952afe..3e46692bca6711 100644
--- a/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/DataHubAppConfiguration.java
+++ b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/DataHubAppConfiguration.java
@@ -50,6 +50,9 @@ public class DataHubAppConfiguration {
   /** Configuration for caching */
   private CacheConfiguration cache;
 
+  /** Configuration for the chrome extension */
+  private ChromeExtensionConfiguration chromeExtension;
+
   /** Ebean related configuration */
   private EbeanConfiguration ebean;
 
diff --git a/metadata-service/configuration/src/main/resources/application.yaml b/metadata-service/configuration/src/main/resources/application.yaml
index 59c57d575d801d..ab64c654c22304 100644
--- a/metadata-service/configuration/src/main/resources/application.yaml
+++ b/metadata-service/configuration/src/main/resources/application.yaml
@@ -474,7 +474,8 @@ featureFlags:
   showAccessManagement: ${SHOW_ACCESS_MANAGEMENT:false} #Whether we should show AccessManagement tab in the datahub UI.
   showSearchFiltersV2: ${SHOW_SEARCH_FILTERS_V2:true} # Enables showing the search filters V2 experience.
   showBrowseV2: ${SHOW_BROWSE_V2:true} # Enables showing the browse v2 sidebar experience.
-  platformBrowseV2: ${PLATFORM_BROWSE_V2:false} # Enables the platform browse experience, instead of the entity-oriented browse default.
+  platformBrowseV2: ${PLATFORM_BROWSE_V2:true} # Enables the platform browse experience, instead of the entity-oriented browse default.
+  lineageGraphV2: ${LINEAGE_GRAPH_V2:true} # Enables the new lineage visualization.
   preProcessHooks:
     uiEnabled: ${PRE_PROCESS_HOOKS_UI_ENABLED:true} # Circumvents Kafka for processing index updates for UI changes sourced from GraphQL to avoid processing delays
     reprocessEnabled: ${PRE_PROCESS_HOOKS_UI_ENABLED:false} # If enabled, will reprocess UI sourced events asynchronously when reading from Kafka after pre-processing them synchronously
@@ -485,9 +486,17 @@ featureFlags:
   businessAttributeEntityEnabled: ${BUSINESS_ATTRIBUTE_ENTITY_ENABLED:false} # Enables business attribute entity which can be associated with field of dataset
   dataContractsEnabled: ${DATA_CONTRACTS_ENABLED:true} # Enables the Data Contracts feature (Tab) in the UI
   alternateMCPValidation: ${ALTERNATE_MCP_VALIDATION:false} # Enables alternate MCP validation flow
+  themeV2Enabled: ${THEME_V2_ENABLED:true} # Allows theme v2 to be turned on. One of themeV2Default and themeV2Toggleable must be false for this to have any effect.
+  themeV2Default: ${THEME_V2_DEFAULT:false} # Sets the default theme for users. The default is the only available theme if theme is not toggleable.
+  themeV2Toggleable: ${THEME_V2_TOGGLEABLE:true} # Acryl only! Allows theme v2 to be toggled on / off by users.
+  schemaFieldCLLEnabled: ${SCHEMA_FIELD_CLL_ENABLED:false} # Enables links to schema field-level lineage on lineage explorer and columns tab
+  schemaFieldLineageIgnoreStatus: ${SCHEMA_FIELD_LINEAGE_IGNORE_STATUS:true} # If turned on, schema field lineage will always fetch ghost entities
   showSeparateSiblings: ${SHOW_SEPARATE_SIBLINGS:false} # If turned on, all siblings will be separated with no way to get to a "combined" sibling view
   editableDatasetNameEnabled: ${EDITABLE_DATASET_NAME_ENABLED:false} # Enables the ability to edit the dataset name in the UI
   showManageStructuredProperties: ${SHOW_MANAGE_STRUCTURED_PROPERTIES:true} # If turned on, show the manage structured properties button on the govern dropdown
+  hideDbtSourceInLineage: ${HIDE_DBT_SOURCE_IN_LINEAGE:false} # If turned on, dbt sources will not be shown in lineage
+  showNavBarRedesign: ${SHOW_NAV_BAR_REDESIGN:true} # If turned on, show the newly designed nav bar in the V2 experience
+  showAutoCompleteResults: ${SHOW_AUTO_COMPLETE_RESULTS:true} # If turned on, show the auto complete results in the search bar
   entityVersioning: ${ENTITY_VERSIONING_ENABLED:false} # Enables entity versioning APIs, validators, and side effects
 
 entityChangeEvents:
@@ -585,6 +594,10 @@ graphQL:
     depthLimit: ${GRAPHQL_QUERY_DEPTH_LIMIT:50}
     introspectionEnabled: ${GRAPHQL_QUERY_INTROSPECTION_ENABLED:true}
 
+chromeExtension:
+  enabled: ${CHROME_EXTENSION_ENABLED:true}
+  lineageEnabled: ${CHROME_EXTENSION_LINEAGE_ENABLED:true}
+
 forms:
   hook:
     enabled: ${FORMS_HOOK_ENABLED:true}
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/graphql/GraphQLEngineFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/graphql/GraphQLEngineFactory.java
index 8f389eccc4cf8f..bc977026f9361e 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/graphql/GraphQLEngineFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/graphql/GraphQLEngineFactory.java
@@ -257,6 +257,7 @@ protected GraphQLEngine graphQLEngine(
         configProvider.getGraphQL().getQuery().isIntrospectionEnabled());
     args.setGraphQLQueryDepthLimit(configProvider.getGraphQL().getQuery().getDepthLimit());
     args.setBusinessAttributeService(businessAttributeService);
+    args.setChromeExtensionConfiguration(configProvider.getChromeExtension());
     args.setEntityVersioningService(entityVersioningService);
     args.setConnectionService(_connectionService);
     args.setAssertionService(assertionService);
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
index bde79e4d475cc2..0be5314382f2d5 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
@@ -820,6 +820,10 @@
       "name" : "actor",
       "type" : "Urn",
       "doc" : "The user URN which will be credited for modifying this deprecation content."
+    }, {
+      "name" : "replacement",
+      "type" : "Urn",
+      "optional" : true
     } ],
     "Aspect" : {
       "name" : "deprecation"
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json
index b4ede3617cacfb..8976cae45f29a6 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json
@@ -820,6 +820,10 @@
       "name" : "actor",
       "type" : "Urn",
       "doc" : "The user URN which will be credited for modifying this deprecation content."
+    }, {
+      "name" : "replacement",
+      "type" : "Urn",
+      "optional" : true
     } ],
     "Aspect" : {
       "name" : "deprecation"
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/datahubusage/DataHubUsageEventType.java b/metadata-service/services/src/main/java/com/linkedin/metadata/datahubusage/DataHubUsageEventType.java
index 43d5e61c47bacb..d20130e483c0a9 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/datahubusage/DataHubUsageEventType.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/datahubusage/DataHubUsageEventType.java
@@ -86,7 +86,19 @@ public enum DataHubUsageEventType {
   VIEW_STRUCTURED_PROPERTY_EVENT("ViewStructuredPropertyEvent"),
   APPLY_STRUCTURED_PROPERTY_EVENT("ApplyStructuredPropertyEvent"),
   UPDATE_STRUCTURED_PROPERTY_ON_ASSET_EVENT("UpdateStructuredPropertyOnAssetEvent"),
-  REMOVE_STRUCTURED_PROPERTY_EVENT("RemoveStructuredPropertyEvent");
+  REMOVE_STRUCTURED_PROPERTY_EVENT("RemoveStructuredPropertyEvent"),
+  CLICK_DOC_REQUEST_CTA("ClickDocRequestCTA"),
+  SHOW_THEME_V2_EVENT("ShowV2ThemeEvent"),
+  REVERT_THEME_V2_EVENT("RevertV2ThemeEvent"),
+  INTRODUCE_YOURSELF_VIEW_EVENT("IntroduceYourselfViewEvent"),
+  INTRODUCE_YOURSELF_SUBMIT_EVENT("IntroduceYourselfSubmitEvent"),
+  INTRODUCE_YOURSELF_SKIP_EVENT("IntroduceYourselfSkipEvent"),
+  EXPAND_LINEAGE_EVENT("ExpandLineageEvent"),
+  CONTRACT_LINEAGE_EVENT("ContractLineageEvent"),
+  SHOW_HIDE_LINEAGE_COLUMNS_EVENT("ShowHideLineageColumnsEvent"),
+  SEARCH_LINEAGE_COLUMNS_EVENT("SearchLineageColumnsEvent"),
+  FILTER_LINEAGE_COLUMNS_EVENT("FilterLineageColumnsEvent"),
+  DRILL_DOWN_LINEAGE_EVENT("DrillDownLineageEvent");
 
   private final String type;
 
diff --git a/metadata-service/war/src/main/resources/boot/policies.json b/metadata-service/war/src/main/resources/boot/policies.json
index e01b4f6f47eaaf..5d4d0730f96a6c 100644
--- a/metadata-service/war/src/main/resources/boot/policies.json
+++ b/metadata-service/war/src/main/resources/boot/policies.json
@@ -62,6 +62,9 @@
       "privileges": [
         "EDIT_ENTITY",
         "VIEW_ENTITY_PAGE",
+        "VIEW_DATASET_USAGE",
+        "VIEW_DATASET_PROFILE",
+        "VIEW_DATASET_OPERATIONS",
         "EDIT_LINEAGE",
         "EDIT_ENTITY_ASSERTIONS",
         "SEARCH_PRIVILEGE",
@@ -138,7 +141,8 @@
       },
       "privileges": [
         "VIEW_DATASET_USAGE",
-        "VIEW_DATASET_PROFILE"
+        "VIEW_DATASET_PROFILE",
+        "VIEW_DATASET_OPERATIONS_PRIVILEGE"
       ],
       "displayName": "All Users - View Dataset Sensitive Information",
       "description": "Grants viewing privileges of usage and profile information of all datasets for all users",
@@ -230,6 +234,7 @@
         "EDIT_DATASET_COL_BUSINESS_ATTRIBUTE_PRIVILEGE",
         "VIEW_DATASET_USAGE",
         "VIEW_DATASET_PROFILE",
+        "VIEW_DATASET_OPERATIONS",
         "EDIT_TAG_COLOR",
         "EDIT_GROUP_MEMBERS",
         "EDIT_USER_PROFILE",
@@ -318,6 +323,7 @@
         "EDIT_DATASET_COL_BUSINESS_ATTRIBUTE_PRIVILEGE",
         "VIEW_DATASET_USAGE",
         "VIEW_DATASET_PROFILE",
+        "VIEW_DATASET_OPERATIONS",
         "EDIT_TAG_COLOR",
         "EDIT_LINEAGE",
         "EDIT_ENTITY_QUERIES",
@@ -425,6 +431,7 @@
         "VIEW_ENTITY_PAGE",
         "VIEW_DATASET_USAGE",
         "VIEW_DATASET_PROFILE",
+        "VIEW_DATASET_OPERATIONS",
         "SEARCH_PRIVILEGE",
         "GET_COUNTS_PRIVILEGE",
         "GET_TIMESERIES_ASPECT_PRIVILEGE",
@@ -470,6 +477,7 @@
         "EDIT_DATASET_COL_BUSINESS_ATTRIBUTE_PRIVILEGE",
         "VIEW_DATASET_USAGE",
         "VIEW_DATASET_PROFILE",
+        "VIEW_DATASET_OPERATIONS",
         "EDIT_TAG_COLOR",
         "EDIT_GROUP_MEMBERS",
         "EDIT_USER_PROFILE",
diff --git a/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java b/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java
index 3c623f8df7c1bf..d3236180917aa4 100644
--- a/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java
+++ b/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java
@@ -388,6 +388,12 @@ public class PoliciesConfig {
           "View Dataset Profile",
           "The ability to access dataset profile (snapshot statistics)");
 
+  public static final Privilege VIEW_DATASET_OPERATIONS_PRIVILEGE =
+      Privilege.of(
+          "VIEW_DATASET_OPERATIONS",
+          "View Dataset Operations",
+          "The ability to access dataset operations (changes to dataset)");
+
   public static final Privilege EDIT_QUERIES_PRIVILEGE =
       Privilege.of(
           "EDIT_ENTITY_QUERIES",
@@ -526,6 +532,7 @@ public class PoliciesConfig {
                   ImmutableList.of(
                       VIEW_DATASET_USAGE_PRIVILEGE,
                       VIEW_DATASET_PROFILE_PRIVILEGE,
+                      VIEW_DATASET_OPERATIONS_PRIVILEGE,
                       EDIT_DATASET_COL_DESCRIPTION_PRIVILEGE,
                       EDIT_DATASET_COL_TAGS_PRIVILEGE,
                       EDIT_DATASET_COL_GLOSSARY_TERMS_PRIVILEGE,
diff --git a/smoke-test/tests/cypress/cypress/e2e/auto_completeV2/v2_auto_complete.js b/smoke-test/tests/cypress/cypress/e2e/auto_completeV2/v2_auto_complete.js
new file mode 100644
index 00000000000000..fcd999e26c43b5
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/auto_completeV2/v2_auto_complete.js
@@ -0,0 +1,44 @@
+describe("auto-complete", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+    cy.skipIntroducePage();
+    cy.hideOnboardingTour();
+    cy.login();
+    cy.ignoreResizeObserverLoop();
+    // look for a dataset
+    cy.visit("/");
+    cy.wait(2000);
+  });
+
+  it("should see auto-complete results after typing in a search query", () => {
+    cy.get("input[data-testid=search-input]")
+      .should("be.visible")
+      .type("SampleCypressHive");
+    cy.contains("Datasets");
+    cy.contains("SampleCypressHiveDataset");
+    cy.focused().clear();
+
+    // look for a dashboard
+    cy.get("input[data-testid=search-input]").type("baz");
+    cy.contains("Dashboards");
+    cy.contains("Baz Dashboard");
+    cy.focused().clear();
+
+    // look for a dataflow
+    cy.get("input[data-testid=search-input]").type("dataflow user");
+    cy.contains("Pipelines").scrollIntoView();
+    cy.contains("Users");
+    cy.focused().clear();
+  });
+
+  it("should send you to the entity profile after clicking on an auto-complete option", () => {
+    cy.get("input[data-testid=search-input]")
+      .should("be.visible")
+      .type("SampleCypressHiveDataset");
+    cy.get('[data-testid^="auto-complete-option"]').first().click();
+    cy.url().should(
+      "include",
+      "dataset/urn:li:dataset:(urn:li:dataPlatform:hive,SampleCypressHiveDataset,PROD)",
+    );
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/containersV2/v2_containers.js b/smoke-test/tests/cypress/cypress/e2e/containersV2/v2_containers.js
new file mode 100644
index 00000000000000..01b06dde8bda21
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/containersV2/v2_containers.js
@@ -0,0 +1,16 @@
+describe("containers", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+  });
+
+  it("can see elements inside the container", () => {
+    cy.login();
+    cy.goToContainer("urn:li:container:348c96555971d3f5c1ffd7dd2e7446cb");
+    cy.contains("jaffle_shop");
+    cy.contains("customers");
+    cy.contains("customers_source");
+    cy.contains("orders");
+    cy.contains("raw_orders");
+    cy.contains("1 - 9 of 9");
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/domains/nested_domains.js b/smoke-test/tests/cypress/cypress/e2e/domains/nested_domains.js
index ed7522eb902073..4d8499d91e2b94 100644
--- a/smoke-test/tests/cypress/cypress/e2e/domains/nested_domains.js
+++ b/smoke-test/tests/cypress/cypress/e2e/domains/nested_domains.js
@@ -1,22 +1,5 @@
 const domainName = "CypressNestedDomain";
 
-// Delete Unecessary Existing Domains
-const deleteExisitingDomain = () => {
-  cy.get('a[href*="urn:li"] span[class^="ant-typography"]')
-    .should("be.visible")
-    .its("length")
-    .then((length) => {
-      for (let i = 0; i < length - 1; i++) {
-        cy.get('a[href*="urn:li"] span[class^="ant-typography"]')
-          .should("be.visible")
-          .first()
-          .click({ force: true });
-        deleteFromDomainDropdown();
-      }
-    });
-  cy.waitTextVisible("Marketing");
-};
-
 const createDomain = () => {
   cy.get(".anticon-plus").first().click();
   cy.waitTextVisible("Create New Domain");
@@ -44,6 +27,7 @@ const moveDomaintoParent = () => {
   cy.clickOptionWithText(domainName);
   cy.waitTextVisible(domainName);
   cy.openThreeDotDropdown();
+  cy.waitTextVisible("Filters");
   cy.clickOptionWithTestId("entity-menu-move-button");
   cy.clickOptionWithTestId("move-domain-modal-move-button");
 };
@@ -99,15 +83,12 @@ const clearAndDelete = () => {
 
 describe("Verify nested domains test functionalities", () => {
   beforeEach(() => {
+    cy.setIsThemeV2Enabled(false);
     cy.loginWithCredentials();
     cy.goToDomainList();
   });
 
   it("Verify Create a new domain", () => {
-    deleteExisitingDomain();
-    cy.get('a[href*="urn:li"] span[class^="ant-typography"]').should(
-      "be.visible",
-    );
     createDomain();
     cy.waitTextVisible("Domains");
   });
@@ -136,6 +117,7 @@ describe("Verify nested domains test functionalities", () => {
   it("Verify Right side panel functionalities", () => {
     cy.clickOptionWithText(domainName);
     cy.waitTextVisible("Filters");
+    cy.get('[data-node-key="Documentation"]').click();
     cy.clickOptionWithText("Add Documentation");
     clearAndType("Test documentation");
     cy.clickOptionWithTestId("description-editor-save-button");
@@ -202,34 +184,6 @@ describe("Verify nested domains test functionalities", () => {
     clearAndDelete();
   });
 
-  it("Verify Right side panel functionalities", () => {
-    cy.clickOptionWithText(domainName);
-    cy.waitTextVisible("Filters");
-    cy.clickOptionWithText("Add Documentation");
-    clearAndType("Test documentation");
-    cy.clickOptionWithTestId("description-editor-save-button");
-    cy.ensureTextNotPresent("Add Documentation");
-    cy.waitTextVisible("Test documentation");
-    cy.clickFirstOptionWithSpecificTestId("add-link-button", 1);
-    cy.waitTextVisible("URL");
-    cy.enterTextInTestId("add-link-modal-url", "www.test.com");
-    cy.enterTextInTestId("add-link-modal-label", "Test Label");
-    cy.clickOptionWithTestId("add-link-modal-add-button");
-    cy.waitTextVisible("Test Label");
-    cy.clickOptionWithTestId("add-owners-button");
-    cy.waitTextVisible("Find a user or group");
-    cy.clickTextOptionWithClass(".rc-virtual-list-holder-inner", "DataHub");
-    cy.clickOptionWithText("Find a user or group");
-    cy.clickOptionWithId("#addOwnerButton");
-    cy.waitTextVisible("DataHub");
-    cy.goToDomainList();
-    cy.waitTextVisible("Test documentation");
-    cy.waitTextVisible("DataHub");
-    cy.clickOptionWithText(domainName);
-    cy.clickOptionWithText("Documentation");
-    clearAndDelete();
-  });
-
   it("Verify Edit Domain Name", () => {
     cy.clickFirstOptionWithText(domainName);
     cy.clickOptionWithText("Filters");
diff --git a/smoke-test/tests/cypress/cypress/e2e/domainsV2/v2_domains.js b/smoke-test/tests/cypress/cypress/e2e/domainsV2/v2_domains.js
new file mode 100644
index 00000000000000..0811fa327887d1
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/domainsV2/v2_domains.js
@@ -0,0 +1,15 @@
+describe("domains", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+    Cypress.on("uncaught:exception", (err, runnable) => false);
+  });
+
+  it("can see elements inside the domain", () => {
+    cy.login();
+    cy.goToDomain("urn:li:domain:testing/Entities");
+    cy.contains("Testing");
+    cy.get('[data-node-key="Assets"]').click();
+    cy.contains("Baz Dashboard");
+    cy.contains("1 - 1 of 1");
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/domainsV2/v2_nested_domains.js b/smoke-test/tests/cypress/cypress/e2e/domainsV2/v2_nested_domains.js
new file mode 100644
index 00000000000000..10bcaac9687dc6
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/domainsV2/v2_nested_domains.js
@@ -0,0 +1,266 @@
+const domainName = "CypressNestedDomain";
+const handledResizeLoopErrors = () => {
+  const resizeObserverLoopLimitErrRe = "ResizeObserver loop limit exceeded";
+  const resizeObserverLoopErrRe =
+    "ResizeObserver loop completed with undelivered notifications.";
+
+  cy.on("uncaught:exception", (err) => {
+    if (
+      err.message.includes(resizeObserverLoopLimitErrRe) ||
+      err.message.includes(resizeObserverLoopErrRe)
+    ) {
+      return false; // Prevent Cypress from failing the test on these specific errors
+    }
+  });
+};
+
+const createDomain = (domain) => {
+  cy.get('[id="browse-v2"]').find('[type="button"]').first().click();
+  cy.waitTextVisible("Create New Domain");
+  cy.clickOptionWithText("Create New Domain");
+  if (domain === "sub domain") {
+    cy.get(".ant-select-selection-item").should("be.visible");
+    cy.mouseover(".ant-select-selection-item");
+    cy.get('[aria-label="close-circle"]').click();
+  }
+  cy.get('[data-testid="create-domain-name"]').click().type(domainName);
+  cy.clickOptionWithTestId("create-domain-button");
+  cy.waitTextVisible("Created domain!");
+};
+
+const moveDomaintoRootLevel = () => {
+  cy.clickOptionWithText(domainName);
+  cy.clickOptionWithTestId("entity-menu-move-button");
+  cy.get('[data-testid="move-domain-modal"]')
+    .contains("Marketing")
+    .click({ force: true });
+  cy.waitTextVisible("Marketing");
+  cy.clickOptionWithTestId("move-domain-modal-move-button");
+};
+
+const checkSubDomainCreated = () => {
+  cy.get('[data-testid="open-domain-item"]').click();
+  cy.waitTextVisible(domainName);
+};
+const moveDomaintoParent = () => {
+  checkSubDomainCreated();
+  cy.clickOptionWithText(domainName);
+  cy.waitTextVisible(domainName);
+  cy.wait(1000); // wait 1 second while domain data is set in context, otherwise this can flake with no urn in DomainsContext yet
+  cy.clickOptionWithTestId("entity-menu-move-button");
+  cy.clickOptionWithText("Move To");
+  cy.clickOptionWithTestId("move-domain-modal-move-button");
+};
+
+const getDomainList = (domainName) => {
+  cy.contains("span.ant-typography-ellipsis", domainName)
+    .parent('[data-testid="domain-list-item"]')
+    .find('[aria-label="right"]')
+    .click();
+};
+
+const deleteFromDomainDropdown = () => {
+  cy.clickOptionWithTestId("entity-menu-delete-button");
+  cy.waitTextVisible("Are you sure you want to remove this Domain?");
+  cy.clickOptionWithText("Yes");
+};
+
+const deleteDomain = () => {
+  cy.clickOptionWithText(domainName).waitTextVisible("Domains");
+  deleteFromDomainDropdown();
+};
+
+const verifyEditAndPerformAddAndRemoveActionForDomain = (
+  entity,
+  action,
+  text,
+  body,
+) => {
+  cy.clickOptionWithText(entity);
+  cy.clickOptionWithText(action);
+  cy.get('[data-testid="tag-term-modal-input"]').type(text);
+  cy.get('[data-testid="tag-term-option"]').contains(text).click();
+  cy.clickOptionWithText(body);
+  cy.get('[data-testid="add-tag-term-from-modal-btn"]').click();
+  cy.waitTextVisible(text);
+};
+
+const clearAndType = (text) => {
+  cy.get('[role="textbox"]').first().click().clear().type(text);
+};
+
+const clearAndDelete = () => {
+  cy.clickFirstOptionWithTestId("edit-documentation-button");
+  cy.get('[role="textbox"]').first().click().clear();
+  cy.clickOptionWithTestId("description-editor-save-button");
+  cy.waitTextVisible("No documentation");
+  cy.mouseover(".ant-list-item-meta-content");
+  cy.get(".ant-btn-circle").click();
+  cy.waitTextVisible("Link Removed");
+};
+
+describe("Verify nested domains test functionalities", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+    cy.loginWithCredentials();
+    cy.skipIntroducePage();
+    cy.goToDomainList();
+    cy.wait(2000);
+    handledResizeLoopErrors();
+  });
+  it("Verify Create a new domain", () => {
+    cy.waitTextVisible("Marketing");
+    createDomain();
+    cy.waitTextVisible("Domains");
+  });
+
+  it("verify Move domain root level to parent level", () => {
+    cy.waitTextVisible(domainName);
+    moveDomaintoRootLevel();
+    cy.goToDomainList();
+  });
+
+  it("Verify Move domain parent level to root level", () => {
+    moveDomaintoParent();
+    cy.waitTextVisible("Moved Domain!");
+    cy.goToDomainList();
+    cy.waitTextVisible(domainName);
+  });
+  it("Verify Documentation tab by adding editing Description and adding link", () => {
+    cy.clickOptionWithText(domainName);
+    cy.clickOptionWithId("#rc-tabs-0-tab-Documentation");
+    cy.clickFirstOptionWithText("Add Documentation");
+    clearAndType("Test added");
+    cy.clickOptionWithTestId("description-editor-save-button");
+    cy.waitTextVisible("Description Updated");
+    cy.get("Description Updated").should("not.exist");
+    cy.waitTextVisible("Test added");
+    cy.clickFirstOptionWithTestId("add-link-button");
+    cy.enterTextInTestId("add-link-modal-url", "www.test.com");
+    cy.enterTextInTestId("add-link-modal-label", "Test Label");
+    cy.clickOptionWithTestId("add-link-modal-add-button");
+    cy.waitTextVisible("Test Label");
+    cy.goToDomainList();
+    cy.clickOptionWithText(domainName);
+    cy.waitTextVisible("Test added");
+    cy.clickOptionWithText("Documentation");
+    clearAndDelete();
+  });
+  it("Verify Right side panel functionalities", () => {
+    cy.clickOptionWithText(domainName);
+    cy.clickOptionWithTestId("editDocumentation");
+    clearAndType("Test documentation");
+    cy.clickOptionWithTestId("description-editor-save-button");
+    cy.waitTextVisible("Description Updated");
+    cy.ensureTextNotPresent("Add Documentation");
+    cy.get("Description Updated").should("not.exist");
+    cy.get('[data-testid="edit-documentation-button"]').should("be.visible");
+    cy.waitTextVisible("Test documentation");
+    cy.clickOptionWithTestId("add-link-button");
+    cy.waitTextVisible("URL");
+    cy.enterTextInTestId("add-link-modal-url", "www.test.com");
+    cy.enterTextInTestId("add-link-modal-label", "Test Label");
+    cy.clickOptionWithTestId("add-link-modal-add-button");
+    cy.waitTextVisible("Link Added");
+    cy.contains("Link Added").should("not.exist");
+    cy.waitTextVisible("Test Label");
+    cy.clickOptionWithTestId("toggleSidebar");
+    cy.clickOptionWithTestId("addOwner");
+    cy.waitTextVisible("Find a user or group");
+    cy.clickTextOptionWithClass(
+      ".rc-virtual-list-holder-inner",
+      Cypress.env("ADMIN_DISPLAYNAME"),
+    );
+    cy.clickOptionWithText("Find a user or group");
+    cy.clickOptionWithId("#addOwnerButton");
+    cy.waitTextVisible(Cypress.env("ADMIN_DISPLAYNAME"));
+    cy.goToDomainList();
+    cy.clickOptionWithText(domainName);
+    cy.waitTextVisible("Test documentation");
+    cy.waitTextVisible(Cypress.env("ADMIN_DISPLAYNAME"));
+    cy.clickOptionWithText(domainName);
+    cy.clickOptionWithText("Documentation");
+    clearAndDelete();
+  });
+  it("Verify Edit Domain Name", () => {
+    cy.clickFirstOptionWithText(domainName);
+    // edit name
+    cy.get(".anticon-edit")
+      .eq(0)
+      .click()
+      .then(() => {
+        cy.get(".ant-typography-edit-content").type(" Edited").type("{enter}");
+      });
+    cy.waitTextVisible(`${domainName} Edited`);
+  });
+  it("Verify Remove the domain", () => {
+    deleteDomain();
+    cy.goToDomainList();
+    cy.ensureTextNotPresent(domainName);
+  });
+  it("Verify Add and delete parent domain from parent domain", () => {
+    cy.visit("domain/urn:li:domain:marketing/Documentation");
+    cy.get('[aria-label="edit"]').should("be.visible");
+    createDomain("sub domain");
+    cy.ensureTextNotPresent("Created domain!");
+    cy.goToDomainList();
+    cy.get('[class^="ManageDomainsPageV2__PageWrapper"]').should(
+      "contain.text",
+      domainName,
+    );
+    cy.clickOptionWithText(domainName);
+    deleteFromDomainDropdown();
+    cy.ensureTextNotPresent(domainName);
+  });
+  it("Verify Add and delete sub domain", () => {
+    cy.visit("domain/urn:li:domain:marketing/Documentation");
+    cy.get('[aria-label="edit"]').should("be.visible");
+    createDomain();
+    cy.ensureTextNotPresent("Created domain!");
+    cy.goToDomainList();
+    checkSubDomainCreated();
+    cy.should("contains.text", domainName);
+    cy.clickOptionWithText(domainName);
+    deleteFromDomainDropdown();
+    cy.ensureTextNotPresent(domainName);
+  });
+  it("Verify entities tab with adding and deleting assets and performing some actions", () => {
+    cy.clickFirstOptionWithText("Marketing");
+    cy.clickOptionWithText("Add to Assets");
+    cy.waitTextVisible("Add assets to Domain");
+    cy.enterTextInSpecificTestId("search-bar", 2, "Baz Chart 2");
+    cy.get('[data-testid="preview-urn:li:chart:(looker,cypress_baz2)"]');
+    cy.clickOptionWithSpecificClass(".ant-checkbox", 1);
+    cy.clickOptionWithId("#continueButton");
+    cy.waitTextVisible("Added assets to Domain!");
+    cy.get('[data-node-key="Assets"]').click();
+    cy.clickOptionWithSpecificClass(".anticon.anticon-edit", 1);
+    cy.clickOptionWithSpecificClass(".ant-checkbox", 1);
+    verifyEditAndPerformAddAndRemoveActionForDomain(
+      "Tags",
+      "Add tags",
+      "Cypress",
+      "Add Tags",
+    );
+    cy.clickOptionWithText("Baz Chart 2");
+    cy.waitTextVisible("Cypress");
+    cy.waitTextVisible("Marketing");
+    cy.go("back");
+    cy.clickOptionWithSpecificClass(".anticon.anticon-edit", 1);
+    cy.clickOptionWithSpecificClass(".ant-checkbox", 1);
+    verifyEditAndPerformAddAndRemoveActionForDomain(
+      "Tags",
+      "Remove tags",
+      "Cypress",
+      "Remove Tags",
+    );
+    cy.clickTextOptionWithClass(".ant-dropdown-trigger", "Domain");
+    cy.clickOptionWithText("Unset Domain");
+    cy.clickOptionWithText("Yes");
+    cy.clickOptionWithText("Baz Chart 2");
+    cy.waitTextVisible("Dashboards");
+    cy.reload();
+    cy.ensureTextNotPresent("Cypress");
+    cy.ensureTextNotPresent("Marketing");
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/glossaryV2/v2_glossary.js b/smoke-test/tests/cypress/cypress/e2e/glossaryV2/v2_glossary.js
new file mode 100644
index 00000000000000..2996b088bb3b0d
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/glossaryV2/v2_glossary.js
@@ -0,0 +1,73 @@
+const urn =
+  "dataset/urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.customers_source,PROD)/";
+const datasetName = "customers_source";
+const glossaryTerm = "CypressGlossaryTerm";
+const glossaryTermGroup = "CypressGlossaryGroup";
+let myUrl;
+
+const nevigateGlossaryPage = () => {
+  cy.visit("/glossary");
+  cy.get('[data-testid="glossaryPageV2"]').should("be.visible");
+};
+
+const addGlossaryTermToDataset = () => {
+  cy.visit(urn);
+  cy.waitTextVisible(datasetName);
+  cy.get("body").click();
+  cy.contains(".ant-collapse-header-text", "Terms")
+    .parent()
+    .find('[data-testid="AddRoundedIcon"]')
+    .click();
+  cy.selectOptionInTagTermModal(glossaryTerm);
+  cy.contains(glossaryTerm);
+};
+
+const deleteGlossary = (message) => {
+  cy.get(".anticon-edit").should("be.visible");
+  cy.get('[data-testid="MoreVertOutlinedIcon"]').should("be.visible").click();
+  cy.clickOptionWithText("Delete");
+  cy.clickOptionWithText("Yes");
+  cy.reload();
+  cy.ensureTextNotPresent(message);
+};
+
+describe("glossary", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+  });
+  it("go to glossary page, create terms, term group", () => {
+    cy.loginWithCredentials();
+    cy.skipIntroducePage();
+    nevigateGlossaryPage();
+    cy.clickOptionWithTestId("add-term-group-button-v2");
+    cy.addViaModal(
+      glossaryTermGroup,
+      "Create Glossary",
+      glossaryTermGroup,
+      "glossary-entity-modal-create-button",
+    );
+    cy.clickOptionWithText(glossaryTermGroup);
+    cy.clickOptionWithTestId("add-term-button");
+    cy.addViaModal(
+      glossaryTerm,
+      "Create Glossary Term",
+      glossaryTerm,
+      "glossary-entity-modal-create-button",
+    );
+    addGlossaryTermToDataset();
+    cy.waitTextVisible(glossaryTerm);
+    nevigateGlossaryPage();
+    cy.clickOptionWithText(glossaryTermGroup);
+    cy.clickOptionWithText(glossaryTerm);
+    deleteGlossary(glossaryTerm);
+    nevigateGlossaryPage();
+    cy.clickOptionWithText(glossaryTermGroup);
+    cy.ensureTextNotPresent(glossaryTerm);
+    nevigateGlossaryPage();
+    cy.clickOptionWithText(glossaryTermGroup);
+    deleteGlossary(glossaryTermGroup);
+    nevigateGlossaryPage();
+    cy.waitTextVisible("CypressNode");
+    cy.ensureTextNotPresent(glossaryTermGroup);
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/glossaryV2/v2_glossaryTerm.js b/smoke-test/tests/cypress/cypress/e2e/glossaryV2/v2_glossaryTerm.js
new file mode 100644
index 00000000000000..bd4973e2d52c72
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/glossaryV2/v2_glossaryTerm.js
@@ -0,0 +1,114 @@
+const nevigateGlossaryPage = () => {
+  cy.visit("/glossary");
+  cy.waitTextVisible("Business Glossary");
+};
+
+const applyAdvancedSearchFilter = (filterType, value) => {
+  cy.get('[aria-label="filter"]').first().click();
+  cy.clickOptionWithId("#search-results-advanced-search");
+  cy.clickOptionWithText("Add Filter");
+  cy.clickOptionWithText(filterType);
+  cy.get("div.ant-select-selection-overflow").click();
+  cy.get(".ant-select-item-option-content").contains(value).click();
+  cy.clickOptionWithText("Add Tags");
+  cy.clickOptionWithTestId("add-tag-term-from-modal-btn");
+};
+
+const createTerm = (glossaryTerm) => {
+  cy.clickOptionWithText("CypressNode");
+  cy.clickOptionWithTestId("add-term-button");
+  cy.waitTextVisible("Create Glossary Term");
+  cy.enterTextInTestId("create-glossary-entity-modal-name", glossaryTerm);
+  cy.clickOptionWithTestId("glossary-entity-modal-create-button");
+  cy.waitTextVisible(glossaryTerm);
+  cy.clickOptionWithText(glossaryTerm);
+};
+
+const invokeTextFromElement = (selector) =>
+  cy.get(selector).last().invoke("text");
+const deleteGlossary = (message) => {
+  cy.get(".anticon-edit").should("be.visible");
+  cy.get('[data-testid="MoreVertOutlinedIcon"]')
+    .first()
+    .should("be.visible")
+    .click();
+  cy.get('[data-testid="entity-menu-delete-button"]')
+    .should("be.visible")
+    .click();
+  cy.clickOptionWithText("Yes");
+  cy.waitTextVisible(message);
+};
+
+const elementVisibility = () => {
+  cy.get('[data-testid^="preview-urn:"]').should("be.visible");
+};
+
+const enterKeyInSearchBox = (text) => {
+  cy.get('[data-testid="search-input"]')
+    .eq(2)
+    .should("be.visible")
+    .click()
+    .type(`${text}{enter}`);
+};
+
+describe("glossaryTerm", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+    cy.loginWithCredentials();
+    cy.skipIntroducePage();
+    nevigateGlossaryPage();
+    cy.wait(1000); // adding waits because UI flickers with new UI and causes cypress to miss things
+  });
+
+  it("can search related entities by query", () => {
+    createTerm("GlossaryNewTerm");
+    cy.clickFirstOptionWithTestId("glossary-batch-add");
+    elementVisibility();
+    cy.get(".ant-checkbox-input").first().click();
+    cy.clickOptionWithId("#continueButton");
+    cy.waitTextVisible("Added Glossary Term to entities!");
+    cy.clickTextOptionWithClass(".ant-tabs-tab", "Related Assets");
+    invokeTextFromElement(
+      '[data-testid^="preview-urn:"] div[data-testid="entity-title"]',
+    ).then((assetText) => {
+      enterKeyInSearchBox(assetText);
+      cy.wait(2000);
+      cy.get('[data-testid^="preview-urn:"] div[data-testid="entity-title"]')
+        .first()
+        .should("have.text", assetText);
+    });
+  });
+
+  it("can apply filters on related entities", () => {
+    cy.clickOptionWithText("CypressNode");
+    cy.clickOptionWithText("GlossaryNewTerm");
+    cy.clickOptionWithSpecificClass(".anticon.anticon-appstore", 0);
+    elementVisibility();
+    cy.clickOptionWithSpecificClass(".anticon-filter", 0);
+    cy.waitTextVisible("Filter");
+    cy.get('input.ant-checkbox-input[data-testid^="facet-tags-urn:li:tag:"]')
+      .first()
+      .click();
+    cy.mouseHoverOnFirstElement(".ant-tag");
+    invokeTextFromElement(".ant-tooltip-inner").then((assetText) => {
+      cy.get('[data-testid^="preview-urn:"] div[data-testid="entity-title"]')
+        .first()
+        .should("be.visible")
+        .click();
+      cy.waitTextVisible(assetText);
+    });
+  });
+
+  it("can search related entities by a specific tag using advanced search", () => {
+    cy.clickOptionWithText("CypressNode");
+    cy.clickOptionWithText("GlossaryNewTerm");
+    cy.clickOptionWithSpecificClass(".anticon.anticon-appstore", 0);
+    elementVisibility();
+    applyAdvancedSearchFilter("Tag", "Cypress");
+    elementVisibility();
+    enterKeyInSearchBox("Baz Dashboard");
+    elementVisibility();
+    cy.contains("Baz Dashboard").should("exist");
+    deleteGlossary("Deleted Glossary Term!");
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/glossaryV2/v2_glossary_navigation.js b/smoke-test/tests/cypress/cypress/e2e/glossaryV2/v2_glossary_navigation.js
new file mode 100644
index 00000000000000..44d6e4a3a35ac9
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/glossaryV2/v2_glossary_navigation.js
@@ -0,0 +1,147 @@
+const glossaryTerm = "CypressGlosssaryNavigationTerm";
+const glossarySecondTerm = "CypressGlossarySecondTerm";
+const glossaryTermGroup = "CypressGlosssaryNavigationGroup";
+const glossaryParentGroup = "CypressNode";
+let myUrl;
+
+const nevigateGlossaryPage = () => {
+  cy.visit("/glossary");
+  cy.waitTextVisible("Business Glossary");
+  cy.wait(1000);
+};
+
+const createTerm = (glossaryTerm) => {
+  cy.waitTextVisible("Create Glossary Term");
+  cy.enterTextInTestId("create-glossary-entity-modal-name", glossaryTerm);
+  cy.clickOptionWithTestId("glossary-entity-modal-create-button");
+};
+
+const navigateToParentAndCheckTermGroup = (parentGroup, termGroup) => {
+  cy.get('[data-testid="glossary-browser-sidebar"]')
+    .contains(parentGroup)
+    .click();
+  cy.get('*[class^="GlossaryEntitiesList"]')
+    .contains(termGroup)
+    .should("be.visible");
+};
+
+const moveGlossaryEntityToGroup = (
+  sourceEntity,
+  targetEntity,
+  confirmationMsg,
+) => {
+  cy.clickOptionWithText(sourceEntity);
+  cy.contains("Created Glossary Term!").should("not.exist");
+  cy.get(".anticon-edit").should("be.visible");
+  cy.get('[data-testid="MoreVertOutlinedIcon"]').should("be.visible").click();
+  cy.clickOptionWithText("Move");
+  cy.get('[data-testid="move-glossary-entity-modal"]')
+    .contains(targetEntity)
+    .click({ force: true });
+  cy.get('[data-testid="move-glossary-entity-modal"]')
+    .contains(targetEntity)
+    .should("be.visible");
+  cy.clickOptionWithTestId("glossary-entity-modal-move-button");
+  cy.waitTextVisible(confirmationMsg);
+};
+const deleteGlossary = (message) => {
+  cy.get(".anticon-edit").should("be.visible");
+  cy.get('[data-testid="MoreVertOutlinedIcon"]').should("be.visible").click();
+  cy.clickOptionWithText("Delete");
+  cy.clickOptionWithText("Yes");
+  cy.waitTextVisible(message);
+};
+
+describe("glossary sidebar navigation test", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+    cy.loginWithCredentials();
+    cy.skipIntroducePage();
+  });
+
+  it("create term and term parent group, move and delete term group", () => {
+    nevigateGlossaryPage();
+    cy.clickOptionWithTestId("add-term-group-button-v2");
+    cy.waitTextVisible("Create Glossary");
+    cy.enterTextInTestId(
+      "create-glossary-entity-modal-name",
+      glossaryTermGroup,
+    );
+    cy.clickOptionWithTestId("glossary-entity-modal-create-button");
+    cy.get('[data-testid="glossary-browser-sidebar"]')
+      .contains(glossaryTermGroup)
+      .should("be.visible");
+    cy.waitTextVisible(`Created Term Group!`);
+    cy.clickOptionWithText(glossaryTermGroup);
+    cy.clickOptionWithTestId("add-term-button");
+    createTerm(glossaryTerm);
+    moveGlossaryEntityToGroup(
+      glossaryTerm,
+      glossaryTermGroup,
+      `Moved Glossary Term!`,
+    );
+    navigateToParentAndCheckTermGroup(glossaryTermGroup, glossaryTerm);
+
+    // Create another term and move it to the same term group
+    cy.clickOptionWithText(glossaryTermGroup);
+    cy.contains("Moved Glossary Term!").should("not.exist");
+    cy.clickOptionWithTestId("add-term-button");
+    createTerm(glossarySecondTerm);
+    moveGlossaryEntityToGroup(
+      glossarySecondTerm,
+      glossaryTermGroup,
+      `Moved Glossary Term!`,
+    );
+    navigateToParentAndCheckTermGroup(glossaryTermGroup, glossarySecondTerm);
+
+    // Switch between terms and ensure the "Properties" tab is active
+    cy.clickOptionWithText(glossaryTerm);
+    cy.clickTextOptionWithClass(".ant-tabs-tab", "Properties");
+    cy.get('[data-node-key="Properties"] .ant-tabs-tab-btn').should(
+      "have.attr",
+      "aria-selected",
+      "true",
+    );
+    cy.clickOptionWithText(glossarySecondTerm);
+    cy.get('[data-node-key="Properties"] .ant-tabs-tab-btn').should(
+      "have.attr",
+      "aria-selected",
+      "true",
+    );
+
+    // Move a term group from the root level to be under a parent term group
+    nevigateGlossaryPage();
+    moveGlossaryEntityToGroup(
+      glossaryTermGroup,
+      glossaryParentGroup,
+      "Moved Term Group!",
+    );
+    navigateToParentAndCheckTermGroup(glossaryParentGroup, glossaryTermGroup);
+
+    // Delete glossary terms and term group
+    nevigateGlossaryPage();
+    cy.clickOptionWithText(glossaryParentGroup);
+    cy.clickOptionWithText(glossaryTermGroup);
+    cy.clickOptionWithText(glossaryTerm);
+    deleteGlossary("Deleted Glossary Term!");
+    cy.clickOptionWithText(glossaryParentGroup);
+    cy.clickOptionWithText(glossaryTermGroup);
+    cy.ensureTextNotPresent(glossaryTerm);
+    nevigateGlossaryPage();
+    cy.clickOptionWithText(glossaryParentGroup);
+    cy.clickOptionWithText(glossaryTermGroup);
+    cy.clickOptionWithText(glossarySecondTerm);
+    deleteGlossary("Deleted Glossary Term!");
+    cy.clickOptionWithText(glossaryParentGroup);
+    cy.clickOptionWithText(glossaryTermGroup);
+    cy.ensureTextNotPresent(glossarySecondTerm);
+    nevigateGlossaryPage();
+    cy.clickOptionWithText(glossaryParentGroup);
+    cy.clickOptionWithText(glossaryTermGroup);
+    deleteGlossary("Deleted Term Group!");
+
+    // Ensure it is no longer in the sidebar navigator
+    cy.ensureTextNotPresent(glossaryTerm);
+    cy.ensureTextNotPresent(glossaryTermGroup);
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/homeV2/v2_home.js b/smoke-test/tests/cypress/cypress/e2e/homeV2/v2_home.js
new file mode 100644
index 00000000000000..14538e50587fb3
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/homeV2/v2_home.js
@@ -0,0 +1,14 @@
+describe("home", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+    cy.skipIntroducePage();
+    cy.on("uncaught:exception", (err, runnable) => false);
+  });
+  it("home page shows ", () => {
+    cy.login();
+    cy.visit("/");
+    cy.get('[xmlns="http://www.w3.org/2000/svg"]').should("exist");
+    cy.get('[data-testid="home-page-content-container"').should("exist");
+    cy.get('[data-testid="nav-menu-links"').should("exist");
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/incidentsV2/v2_incidents.js b/smoke-test/tests/cypress/cypress/e2e/incidentsV2/v2_incidents.js
new file mode 100644
index 00000000000000..e5dbf689092460
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/incidentsV2/v2_incidents.js
@@ -0,0 +1,35 @@
+describe("incidents", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+  });
+  it("can view incidents and resolve an incident", () => {
+    cy.login();
+    cy.visit(
+      "/dataset/urn:li:dataset:(urn:li:dataPlatform:kafka,incidents-sample-dataset,PROD)/Incidents",
+    );
+    cy.waitTextVisible("1 active incidents, 0 resolved incidents");
+    cy.get("body").click();
+    cy.clickOptionWithTestId("resolve-incident");
+    cy.waitTextVisible("Resolve Incident");
+    cy.clickOptionWithTestId("confirm-resolve");
+    cy.get(".ant-select-selection-item").click();
+    cy.get(".ant-typography").contains("All").click({ force: true });
+    cy.waitTextVisible("0 active incidents, 1 resolved incidents");
+  });
+
+  it("can re-open a closed incident", () => {
+    cy.login();
+    cy.visit(
+      "/dataset/urn:li:dataset:(urn:li:dataPlatform:kafka,incidents-sample-dataset,PROD)/Incidents",
+    );
+    cy.get(".ant-typography").should("be.visible");
+    cy.waitTextVisible("0 active incidents, 1 resolved incidents");
+    cy.get("body").click();
+    cy.get(".ant-select-selection-item").click();
+    cy.get(".ant-typography").contains("All").click({ force: true });
+    cy.waitTextVisible("0 active incidents, 1 resolved incidents");
+    cy.clickOptionWithTestId("incident-menu");
+    cy.clickOptionWithTestId("reopen-incident");
+    cy.waitTextVisible("1 active incidents, 0 resolved incidents");
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/lineage/download_lineage_results.js b/smoke-test/tests/cypress/cypress/e2e/lineage/download_lineage_results.js
index 325902cbc91ab9..6add8e01cf214e 100644
--- a/smoke-test/tests/cypress/cypress/e2e/lineage/download_lineage_results.js
+++ b/smoke-test/tests/cypress/cypress/e2e/lineage/download_lineage_results.js
@@ -72,7 +72,7 @@ describe("download lineage results to .csv file", () => {
 
     // Verify 1st 2nd and 3+ degree of dependencies(Verify multi page download)
     cy.get('[data-testid="facet-degree-3+"]').click().wait(5000);
-    cy.contains(/1 - 10 of 1[3-4]/);
+    cy.contains(/1 - 10 of 1[3-6]/);
     downloadCsvFile("third_plus_degree_results.csv");
     const third_degree_csv = cy.readFile(
       "cypress/downloads/third_plus_degree_results.csv",
diff --git a/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_download_lineage_results.js b/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_download_lineage_results.js
new file mode 100644
index 00000000000000..7794052ec2fb92
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_download_lineage_results.js
@@ -0,0 +1,92 @@
+const test_dataset =
+  "urn:li:dataset:(urn:li:dataPlatform:kafka,SampleCypressKafkaDataset,PROD)";
+const first_degree = [
+  "urn:li:chart:(looker,cypress_baz1)",
+  "urn:li:dataset:(urn:li:dataPlatform:hdfs,SampleCypressHdfsDataset,PROD)",
+  "urn:li:mlFeature:(cypress-test-2,some-cypress-feature-1)",
+];
+const second_degree = [
+  "urn:li:chart:(looker,cypress_baz2)",
+  "urn:li:dashboard:(looker,cypress_baz)",
+  "urn:li:dataset:(urn:li:dataPlatform:hive,SampleCypressHiveDataset,PROD)",
+  "urn:li:mlPrimaryKey:(cypress-test-2,some-cypress-feature-2)",
+];
+const third_degree_plus = [
+  "urn:li:dataJob:(urn:li:dataFlow:(airflow,cypress_dag_abc,PROD),cypress_task_123)",
+  "urn:li:dataJob:(urn:li:dataFlow:(airflow,cypress_dag_abc,PROD),cypress_task_456)",
+  "urn:li:dataset:(urn:li:dataPlatform:hive,cypress_logging_events,PROD)",
+  "urn:li:dataset:(urn:li:dataPlatform:hive,fct_cypress_users_created,PROD)",
+  "urn:li:dataset:(urn:li:dataPlatform:hive,fct_cypress_users_created_no_tag,PROD)",
+  "urn:li:dataset:(urn:li:dataPlatform:hive,fct_cypress_users_deleted,PROD)",
+];
+const downloadCsvFile = (filename) => {
+  cy.get(".ant-list-items").should("be.visible");
+  cy.get(".anticon-download").should("be.visible").click();
+  cy.get('[data-testid="download-as-csv-input"]').clear().type(filename);
+  cy.get('[data-testid="csv-modal-download-button"]').click().wait(5000);
+  cy.ensureTextNotPresent("Creating CSV");
+};
+
+describe("download lineage results to .csv file", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+    cy.on("uncaught:exception", (err, runnable) => false);
+  });
+
+  it("download and verify lineage results for 1st, 2nd and 3+ degree of dependencies", () => {
+    cy.loginWithCredentials();
+    cy.skipIntroducePage();
+    cy.goToDataset(test_dataset, "SampleCypressKafkaDataset");
+    cy.get('[data-node-key="Lineage"]').first().should("be.visible").click();
+
+    // Verify 1st degree of dependencies
+    cy.contains("Impact Analysis").click();
+    downloadCsvFile("first_degree_results.csv");
+    const first_degree_csv = cy.readFile(
+      "cypress/downloads/first_degree_results.csv",
+    );
+    first_degree.forEach((urn) => {
+      first_degree_csv.should("contain", urn);
+    });
+    second_degree.forEach((urn) => {
+      first_degree_csv.should("not.contain", urn);
+    });
+    third_degree_plus.forEach((urn) => {
+      first_degree_csv.should("not.contain", urn);
+    });
+
+    // Verify 1st and 2nd degree of dependencies
+    cy.get('[data-testid="facet-degree-2"]').click().wait(5000);
+    cy.contains(/1 - [7-8] of [7-8]/);
+    downloadCsvFile("second_degree_results.csv");
+    const second_degree_csv = cy.readFile(
+      "cypress/downloads/second_degree_results.csv",
+    );
+    first_degree.forEach((urn) => {
+      second_degree_csv.should("contain", urn);
+    });
+    second_degree.forEach((urn) => {
+      second_degree_csv.should("contain", urn);
+    });
+    third_degree_plus.forEach((urn) => {
+      second_degree_csv.should("not.contain", urn);
+    });
+
+    // Verify 1st 2nd and 3+ degree of dependencies(Verify multi page download)
+    cy.get('[data-testid="facet-degree-3+"]').click().wait(5000);
+    cy.contains(/1 - 10/);
+    downloadCsvFile("third_plus_degree_results.csv");
+    const third_degree_csv = cy.readFile(
+      "cypress/downloads/third_plus_degree_results.csv",
+    );
+    first_degree.forEach((urn) => {
+      third_degree_csv.should("contain", urn);
+    });
+    second_degree.forEach((urn) => {
+      third_degree_csv.should("contain", urn);
+    });
+    third_degree_plus.forEach((urn) => {
+      third_degree_csv.should("contain", urn);
+    });
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_impact_analysis.js b/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_impact_analysis.js
new file mode 100644
index 00000000000000..2822bedbb351a0
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_impact_analysis.js
@@ -0,0 +1,161 @@
+import { getTimestampMillisNumDaysAgo } from "../../support/commands";
+
+const JAN_1_2021_TIMESTAMP = 1609553357755;
+const JAN_1_2022_TIMESTAMP = 1641089357755;
+const DATASET_URN =
+  "urn:li:dataset:(urn:li:dataPlatform:kafka,SampleCypressKafkaDataset,PROD)";
+const TIMESTAMP_MILLIS_14_DAYS_AGO = getTimestampMillisNumDaysAgo(14);
+const TIMESTAMP_MILLIS_7_DAYS_AGO = getTimestampMillisNumDaysAgo(7);
+const TIMESTAMP_MILLIS_NOW = getTimestampMillisNumDaysAgo(0);
+const GNP_DATASET_URN =
+  "urn:li:dataset:(urn:li:dataPlatform:snowflake,economic_data.gnp,PROD)";
+const TRANSACTION_ETL_URN =
+  "urn:li:dataJob:(urn:li:dataFlow:(airflow,bq_etl,prod),transaction_etl)";
+const MONTHLY_TEMPERATURE_DATASET_URN =
+  "urn:li:dataset:(urn:li:dataPlatform:snowflake,climate.monthly_temperature,PROD)";
+
+const startAtDataSetLineage = () => {
+  cy.login();
+  cy.goToDataset(DATASET_URN, "SampleCypressKafkaDataset");
+  cy.get('[data-node-key="Lineage"]').first().should("be.visible").click();
+};
+
+describe("impact analysis", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+    cy.on("uncaught:exception", (err, runnable) => false);
+  });
+
+  it("can see 1 hop of lineage by default", () => {
+    startAtDataSetLineage();
+
+    cy.ensureTextNotPresent("User Creations");
+    cy.ensureTextNotPresent("User Deletions");
+  });
+
+  it("can see lineage multiple hops away", () => {
+    startAtDataSetLineage();
+    // click to show more relationships now that we default to 1 degree of dependency
+    cy.contains("Impact Analysis").click();
+    cy.clickOptionWithText("3+");
+
+    cy.contains("User Creations");
+    cy.contains("User Deletions");
+  });
+
+  it("can filter the lineage results as well", () => {
+    startAtDataSetLineage();
+    // click to show more relationships now that we default to 1 degree of dependency
+    cy.contains("Impact Analysis").click();
+    cy.clickOptionWithText("3+");
+
+    cy.clickOptionWithText("Advanced");
+
+    cy.clickOptionWithText("Add Filter");
+
+    cy.clickOptionWithTestId("adv-search-add-filter-description");
+
+    cy.get('[data-testid="edit-text-input"]').type("fct_users_deleted");
+
+    cy.clickOptionWithTestId("edit-text-done-btn");
+
+    cy.ensureTextNotPresent("User Creations");
+    cy.waitTextVisible("User Deletions");
+  });
+
+  it("can view column level impact analysis and turn it off", () => {
+    cy.login();
+    cy.visit(
+      `/dataset/${DATASET_URN}/Lineage?column=%5Bversion%3D2.0%5D.%5Btype%3Dboolean%5D.field_bar&is_lineage_mode=false`,
+    );
+
+    // impact analysis can take a beat- don't want to time out here
+    cy.wait(5000);
+    cy.contains("Impact Analysis").click();
+    cy.contains("SampleCypressHdfsDataset");
+    cy.contains("shipment_info");
+    cy.contains("some-cypress-feature-1").should("not.exist");
+    cy.contains("Baz Chart 1").should("not.exist");
+
+    // find button to turn off column-level impact analysis
+    cy.get('[data-testid="column-lineage-toggle"]').click({ force: true });
+
+    cy.wait(2000);
+
+    cy.contains("SampleCypressHdfsDataset");
+    cy.contains("shipment_info").should("not.exist");
+    cy.contains("some-cypress-feature-1");
+    cy.contains("Baz Chart 1");
+  });
+
+  it("can filter lineage edges by time", () => {
+    cy.login();
+    cy.visit(
+      `/dataset/${DATASET_URN}/Lineage?filter_degree___false___EQUAL___0=1&is_lineage_mode=false&page=1&unionType=0&start_time_millis=${JAN_1_2021_TIMESTAMP}&end_time_millis=${JAN_1_2022_TIMESTAMP}`,
+    );
+
+    // impact analysis can take a beat- don't want to time out here
+    cy.wait(5000);
+    cy.contains("Impact Analysis").click();
+    cy.contains("SampleCypressHdfsDataset").should("not.exist");
+    cy.contains("Downstream column: shipment_info").should("not.exist");
+    cy.contains("some-cypress-feature-1").should("not.exist");
+    cy.contains("Baz Chart 1").should("not.exist");
+  });
+
+  it("can see when the inputs to a data job change", () => {
+    cy.login();
+    // Between 14 days ago and 7 days ago, only transactions was an input
+    cy.visit(
+      `/tasks/${TRANSACTION_ETL_URN}/Lineage?filter_degree___false___EQUAL___0=1&is_lineage_mode=false&page=1&unionType=0&start_time_millis=${TIMESTAMP_MILLIS_14_DAYS_AGO}&end_time_millis=${TIMESTAMP_MILLIS_7_DAYS_AGO}`,
+    );
+    cy.wait(2000);
+    cy.get("#entity-sidebar-tabs-tab-Lineage").click();
+    // Downstream
+    cy.contains("aggregated");
+    // Upstream
+    cy.clickOptionWithTestId(
+      "compact-lineage-tab-direction-select-option-upstream",
+    );
+    cy.contains("transactions");
+    cy.contains("user_profile").should("not.exist");
+    // 1 day ago, factor_income was removed from the join
+    cy.visit(
+      `/tasks/${TRANSACTION_ETL_URN}/Lineage?filter_degree___false___EQUAL___0=1&is_lineage_mode=false&page=1&unionType=0&start_time_millis=${TIMESTAMP_MILLIS_7_DAYS_AGO}&end_time_millis=${TIMESTAMP_MILLIS_NOW}`,
+    );
+    // Downstream
+    cy.wait(2000);
+    cy.get("#entity-sidebar-tabs-tab-Lineage").click();
+    cy.contains("aggregated");
+    // Upstream
+    cy.clickOptionWithTestId(
+      "compact-lineage-tab-direction-select-option-upstream",
+    );
+    cy.contains("transactions");
+    cy.contains("user_profile");
+  });
+
+  it("can see when a data job is replaced", () => {
+    cy.login();
+    // Between 14 days ago and 7 days ago, only temperature_etl_1 was an iput
+    cy.visit(
+      `/dataset/${MONTHLY_TEMPERATURE_DATASET_URN}/Lineage?filter_degree___false___EQUAL___0=1&is_lineage_mode=false&page=1&unionType=0&start_time_millis=${TIMESTAMP_MILLIS_14_DAYS_AGO}&end_time_millis=${TIMESTAMP_MILLIS_7_DAYS_AGO}`,
+    );
+    cy.wait(2000);
+    cy.get("#entity-sidebar-tabs-tab-Lineage").click();
+    cy.clickOptionWithTestId(
+      "compact-lineage-tab-direction-select-option-upstream",
+    );
+    cy.contains("temperature_etl_1");
+    // Since 7 days ago, temperature_etl_1 has been replaced by temperature_etl_2
+    cy.visit(
+      `/dataset/${MONTHLY_TEMPERATURE_DATASET_URN}/Lineage?filter_degree___false___EQUAL___0=1&is_lineage_mode=false&page=1&unionType=0&start_time_millis=${TIMESTAMP_MILLIS_7_DAYS_AGO}&end_time_millis=${TIMESTAMP_MILLIS_NOW}`,
+    );
+    cy.wait(2000);
+    cy.get("#entity-sidebar-tabs-tab-Lineage").click();
+    cy.clickOptionWithTestId(
+      "compact-lineage-tab-direction-select-option-upstream",
+    );
+    cy.contains("temperature_etl_2");
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_lineage_column_level.js b/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_lineage_column_level.js
new file mode 100644
index 00000000000000..a82ac125bf820b
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_lineage_column_level.js
@@ -0,0 +1,58 @@
+const DATASET_ENTITY_TYPE = "dataset";
+const DATASET_URN =
+  "urn:li:dataset:(urn:li:dataPlatform:hive,SampleCypressHiveDataset,PROD)";
+
+const clickDownAndUpArrow = (asset, arrow) => {
+  cy.contains(".react-flow__node-lineage-entity", asset)
+    .find(`svg[data-testid="${arrow}"]`)
+    .click();
+};
+
+describe("column-level lineage graph test", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+  });
+  it("navigate to lineage graph view and verify that column-level lineage is showing correctly", () => {
+    cy.login();
+    cy.goToEntityLineageGraphV2(DATASET_ENTITY_TYPE, DATASET_URN);
+    cy.wait(2000);
+    // verify columns not shown by default
+    cy.waitTextVisible("SampleCypressHdfs");
+    cy.waitTextVisible("SampleCypressHive");
+    cy.waitTextVisible("cypress_logging");
+    cy.ensureTextNotPresent("shipment_info");
+    cy.ensureTextNotPresent("field_foo");
+    cy.ensureTextNotPresent("field_baz");
+    cy.ensureTextNotPresent("event_name");
+    cy.ensureTextNotPresent("event_data");
+    cy.ensureTextNotPresent("timestamp");
+    cy.ensureTextNotPresent("browser");
+    clickDownAndUpArrow("SampleCypressHdfsDataset", "KeyboardArrowDownIcon");
+    cy.waitTextVisible("shipment_info");
+    cy.waitTextVisible("shipment_info.date");
+    cy.waitTextVisible("shipment_info.target");
+    cy.waitTextVisible("shipment_info.destination");
+    cy.waitTextVisible("shipment_info.geo_info");
+    clickDownAndUpArrow("SampleCypressHiveDataset", "KeyboardArrowDownIcon");
+    cy.waitTextVisible("field_foo");
+    cy.waitTextVisible("field_baz");
+    clickDownAndUpArrow("cypress_logging_events", "KeyboardArrowDownIcon");
+    cy.waitTextVisible("event_name");
+    cy.waitTextVisible("event_data");
+    cy.waitTextVisible("timestamp");
+    cy.waitTextVisible("browser");
+    clickDownAndUpArrow("SampleCypressHiveDataset", "KeyboardArrowUpIcon");
+    cy.ensureTextNotPresent("field_foo");
+    cy.ensureTextNotPresent("field_baz");
+    cy.clickOptionWithTestId("KeyboardArrowUpIcon");
+    cy.clickOptionWithTestId("KeyboardArrowUpIcon");
+    clickDownAndUpArrow("SampleCypressHiveDataset", "KeyboardArrowDownIcon");
+    cy.waitTextVisible("field_foo");
+    cy.waitTextVisible("field_baz");
+    cy.ensureTextNotPresent("shipment_info");
+    cy.ensureTextNotPresent("event_name");
+    cy.ensureTextNotPresent("event_data");
+    cy.ensureTextNotPresent("timestamp");
+    cy.ensureTextNotPresent("browser");
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_lineage_column_path.js b/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_lineage_column_path.js
new file mode 100644
index 00000000000000..56423220a56659
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_lineage_column_path.js
@@ -0,0 +1,105 @@
+import { aliasQuery } from "../utils";
+
+const DATASET_ENTITY_TYPE = "dataset";
+const DATASET_URN =
+  "urn:li:dataset:(urn:li:dataPlatform:hdfs,SampleCypressHdfsDataset,PROD)";
+const DOWNSTREAM_DATASET_URN =
+  "urn:li:dataset:(urn:li:dataPlatform:kafka,SampleCypressKafkaDataset,PROD)";
+const upstreamColumn =
+  '[data-testid="rf__node-urn:li:dataset:(urn:li:dataPlatform:kafka,SampleCypressKafkaDataset,PROD)"]';
+const downstreamColumn =
+  '[data-testid="rf__node-urn:li:dataset:(urn:li:dataPlatform:hdfs,SampleCypressHdfsDataset,PROD)"]';
+
+const verifyColumnPathModal = (from, to) => {
+  cy.get('[data-testid="entity-paths-modal"]')
+    .contains(from)
+    .should("be.visible");
+  cy.get('[data-testid="entity-paths-modal"]')
+    .contains(to)
+    .should("be.visible");
+};
+
+const clickDownAndUpArrow = (asset, arrow) => {
+  cy.contains(".react-flow__node-lineage-entity", asset)
+    .find(`svg[data-testid="${arrow}"]`)
+    .click();
+};
+
+describe("column-Level lineage and impact analysis path test", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+    cy.on("uncaught:exception", (err, runnable) => false);
+    cy.intercept("POST", "/api/v2/graphql", (req) => {
+      aliasQuery(req, "appConfig");
+    });
+  });
+
+  it("verify column-level lineage path at lineage praph and impact analysis ", () => {
+    // Open dataset with column-level lineage configured an navigate to lineage tab -> visualize lineage
+    cy.loginWithCredentials();
+    cy.skipIntroducePage();
+    cy.goToEntityLineageGraphV2(DATASET_ENTITY_TYPE, DATASET_URN);
+
+    // Enable “show columns” toggle
+    cy.waitTextVisible("SampleCypressHdfs");
+    clickDownAndUpArrow("SampleCypressHdfsDataset", "KeyboardArrowDownIcon");
+    cy.waitTextVisible("shipment_info");
+
+    // Verify functionality of column lineage
+    clickDownAndUpArrow("SampleCypressKafkaDataset", "KeyboardArrowDownIcon");
+    cy.get(upstreamColumn).contains("field_bar").click();
+    cy.get(upstreamColumn)
+      .contains("field_bar")
+      .prev()
+      .should("not.have.attr", "fill", "white");
+    cy.get(downstreamColumn)
+      .contains("shipment_info")
+      .prev()
+      .should("not.have.attr", "stroke", "transparent");
+    cy.get(downstreamColumn).contains("shipment_info").click();
+    cy.get(downstreamColumn)
+      .contains("shipment_info")
+      .prev()
+      .should("not.have.attr", "fill", "white");
+    cy.get(upstreamColumn)
+      .contains("field_bar")
+      .prev()
+      .should("not.have.attr", "stroke", "transparent");
+
+    // Open dataset impact analysis view, enable column lineage
+    cy.goToDataset(DATASET_URN, "SampleCypressHdfsDataset");
+    cy.get('[data-node-key="Lineage"]').first().should("be.visible").click();
+    cy.contains("Impact Analysis").click();
+    cy.clickOptionWithText("Column Lineage");
+    cy.clickOptionWithText("Downstream");
+
+    // Verify upstream column lineage, test column path modal
+    cy.clickOptionWithText("Upstream");
+    cy.waitTextVisible("SampleCypressKafkaDataset");
+    cy.ensureTextNotPresent("field_bar");
+    cy.contains("Select column").click({ force: true }).wait(1000);
+    cy.get(".rc-virtual-list").contains("shipment_info").click();
+    cy.contains("field_bar").should("exist");
+    cy.get(".ant-list-items").find(".anticon-layout").click({ force: true });
+    cy.get('[class*="DisplayedColumns').first().click({ force: true });
+    verifyColumnPathModal("shipment_info", "field_bar");
+    cy.get('[data-testid="entity-paths-modal"] [data-icon="close"]').click();
+
+    // Verify downstream column lineage, test column path modal
+    cy.goToDataset(DOWNSTREAM_DATASET_URN, "SampleCypressKafkaDataset");
+    cy.get('[data-node-key="Lineage"]').first().should("be.visible").click();
+    cy.contains("Impact Analysis").click();
+    cy.clickOptionWithText("Column Lineage");
+    cy.ensureTextNotPresent("shipment_info");
+    cy.contains("Select column").click({ force: true }).wait(1000);
+    cy.get(".rc-virtual-list").contains("field_bar").click();
+    cy.contains("shipment_info").should("exist");
+    cy.get(".ant-list-items")
+      .find(".anticon-layout")
+      .first()
+      .click({ force: true });
+    cy.get('[class*="DisplayedColumns').first().click({ force: true });
+    verifyColumnPathModal("shipment_info", "field_bar");
+    cy.get('[data-testid="entity-paths-modal"] [data-icon="close"]').click();
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_lineage_graph.js b/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_lineage_graph.js
new file mode 100644
index 00000000000000..e5162fe59ddfd6
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_lineage_graph.js
@@ -0,0 +1,129 @@
+import { getTimestampMillisNumDaysAgo } from "../../support/commands";
+
+const DATASET_ENTITY_TYPE = "dataset";
+const TASKS_ENTITY_TYPE = "tasks";
+const DATASET_URN =
+  "urn:li:dataset:(urn:li:dataPlatform:kafka,SampleCypressKafkaDataset,PROD)";
+const JAN_1_2021_TIMESTAMP = 1609553357755;
+const JAN_1_2022_TIMESTAMP = 1641089357755;
+const TIMESTAMP_MILLIS_14_DAYS_AGO = getTimestampMillisNumDaysAgo(14);
+const TIMESTAMP_MILLIS_7_DAYS_AGO = getTimestampMillisNumDaysAgo(7);
+const TIMESTAMP_MILLIS_NOW = getTimestampMillisNumDaysAgo(0);
+const GNP_DATASET_URN =
+  "urn:li:dataset:(urn:li:dataPlatform:snowflake,economic_data.gnp,PROD)";
+const TRANSACTION_ETL_URN =
+  "urn:li:dataJob:(urn:li:dataFlow:(airflow,bq_etl,prod),transaction_etl)";
+const MONTHLY_TEMPERATURE_DATASET_URN =
+  "urn:li:dataset:(urn:li:dataPlatform:snowflake,climate.monthly_temperature,PROD)";
+
+describe("lineage_graph", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+    const resizeObserverLoopErrRe = "ResizeObserver loop limit exceeded";
+    cy.on("uncaught:exception", (err) => {
+      if (err.message.includes(resizeObserverLoopErrRe)) {
+        return false;
+      }
+    });
+  });
+  it("can see full history", () => {
+    cy.login();
+    cy.goToEntityLineageGraphV2(DATASET_ENTITY_TYPE, DATASET_URN);
+
+    cy.contains("SampleCypressKafka").should("be.visible");
+    cy.contains("SampleCypressHdfs");
+    cy.contains("Baz Chart 1");
+    cy.contains("some-cypress");
+  });
+
+  it("cannot see any lineage edges for 2021", () => {
+    cy.login();
+    cy.goToEntityLineageGraphV2(
+      DATASET_ENTITY_TYPE,
+      DATASET_URN,
+      JAN_1_2021_TIMESTAMP,
+      JAN_1_2022_TIMESTAMP,
+    );
+
+    cy.contains("SampleCypressKafka").should("be.visible");
+    cy.contains("SampleCypressHdfs").should("not.exist");
+    cy.contains("Baz Chart 1").should("not.exist");
+    cy.contains("some-cypress").should("not.exist");
+  });
+
+  it("can see when the inputs to a data job change", () => {
+    cy.login();
+    // Between 14 days ago and 7 days ago, only transactions was an input
+    cy.goToEntityLineageGraphV2(
+      TASKS_ENTITY_TYPE,
+      TRANSACTION_ETL_URN,
+      TIMESTAMP_MILLIS_14_DAYS_AGO,
+      TIMESTAMP_MILLIS_7_DAYS_AGO,
+    );
+    // cy.contains("transaction_etl");
+    cy.wait(3000);
+    cy.contains("aggregated").should("be.visible");
+    cy.contains("transactions");
+    cy.contains("user_profile").should("not.exist");
+    // 1 day ago, user_profile was also added as an input
+    cy.goToEntityLineageGraphV2(
+      TASKS_ENTITY_TYPE,
+      TRANSACTION_ETL_URN,
+      TIMESTAMP_MILLIS_7_DAYS_AGO,
+      TIMESTAMP_MILLIS_NOW,
+    );
+    // cy.contains("transaction_etl");
+    cy.wait(3000);
+    cy.contains("aggregated").should("be.visible");
+    cy.contains("transactions");
+    cy.contains("user_profile");
+  });
+
+  it("can see when a data job is replaced", () => {
+    cy.login();
+    // Between 14 days ago and 7 days ago, only temperature_etl_1 was an iput
+    cy.goToEntityLineageGraphV2(
+      DATASET_ENTITY_TYPE,
+      MONTHLY_TEMPERATURE_DATASET_URN,
+      TIMESTAMP_MILLIS_14_DAYS_AGO,
+      TIMESTAMP_MILLIS_7_DAYS_AGO,
+    );
+    cy.contains("monthly_temperature").should("be.visible");
+    // cy.contains("temperature_etl_1");
+    cy.contains("temperature_etl_2").should("not.exist");
+    // Since 7 days ago, temperature_etl_1 has been replaced by temperature_etl_2
+    cy.goToEntityLineageGraphV2(
+      DATASET_ENTITY_TYPE,
+      MONTHLY_TEMPERATURE_DATASET_URN,
+      TIMESTAMP_MILLIS_7_DAYS_AGO,
+      TIMESTAMP_MILLIS_NOW,
+    );
+    cy.contains("monthly_temperature");
+    cy.contains("temperature_etl_1").should("not.exist");
+    // cy.contains("temperature_etl_2");
+  });
+
+  it("can see when a dataset join changes", () => {
+    cy.login();
+    // 8 days ago, both gdp and factor_income were joined to create gnp
+    cy.goToEntityLineageGraphV2(
+      DATASET_ENTITY_TYPE,
+      GNP_DATASET_URN,
+      TIMESTAMP_MILLIS_14_DAYS_AGO,
+      TIMESTAMP_MILLIS_NOW,
+    );
+    cy.contains("gnp").should("be.visible");
+    cy.contains("gdp");
+    cy.contains("factor_income");
+    // 1 day ago, factor_income was removed from the join
+    cy.goToEntityLineageGraphV2(
+      DATASET_ENTITY_TYPE,
+      GNP_DATASET_URN,
+      TIMESTAMP_MILLIS_7_DAYS_AGO,
+      TIMESTAMP_MILLIS_NOW,
+    );
+    cy.contains("gnp");
+    cy.contains("gdp");
+    cy.contains("factor_income").should("not.exist");
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/loginV2/v2_login.js b/smoke-test/tests/cypress/cypress/e2e/loginV2/v2_login.js
new file mode 100644
index 00000000000000..40851a98b9aa0f
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/loginV2/v2_login.js
@@ -0,0 +1,14 @@
+describe("login", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+  });
+
+  it("logs in", () => {
+    cy.visit("/");
+    cy.get("input[data-testid=username]").type(Cypress.env("ADMIN_USERNAME"));
+    cy.get("input[data-testid=password]").type(Cypress.env("ADMIN_PASSWORD"));
+    cy.contains("Sign In").click();
+    cy.skipIntroducePage();
+    cy.contains("Discover");
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/mutations/add_users.js b/smoke-test/tests/cypress/cypress/e2e/mutations/add_users.js
index 411f7d574bf636..084b3c75d04e64 100644
--- a/smoke-test/tests/cypress/cypress/e2e/mutations/add_users.js
+++ b/smoke-test/tests/cypress/cypress/e2e/mutations/add_users.js
@@ -33,7 +33,7 @@ describe("add_user", () => {
         cy.visit(inviteLink);
         const { name, email } = tryToSignUp();
         registeredEmail = email;
-        cy.waitTextVisible("Welcome to DataHub");
+        cy.waitTextVisible("Welcome back");
         cy.hideOnboardingTour();
         cy.waitTextVisible(name);
       })
diff --git a/smoke-test/tests/cypress/cypress/e2e/mutations/dataset_ownership.js b/smoke-test/tests/cypress/cypress/e2e/mutations/dataset_ownership.js
index 9c42d8395e543c..3dbfe3ec74b828 100644
--- a/smoke-test/tests/cypress/cypress/e2e/mutations/dataset_ownership.js
+++ b/smoke-test/tests/cypress/cypress/e2e/mutations/dataset_ownership.js
@@ -57,25 +57,25 @@ describe("add, remove ownership for dataset", () => {
     addOwner(
       username,
       "Business Owner",
-      `[href="/user/urn:li:corpuser:example${test_id}@example.com"]`,
+      `[href="/user/urn:li:corpuser:example${test_id}@example.com/owner of"]`,
     );
     // data steward
     addOwner(
       username,
       "Data Steward",
-      `[href="/user/urn:li:corpuser:example${test_id}@example.com"]`,
+      `[href="/user/urn:li:corpuser:example${test_id}@example.com/owner of"]`,
     );
     // none
     addOwner(
       username,
       "None",
-      `[href="/user/urn:li:corpuser:example${test_id}@example.com"]`,
+      `[href="/user/urn:li:corpuser:example${test_id}@example.com/owner of"]`,
     );
     // technical owner
     addOwner(
       username,
       "Technical Owner",
-      `[href="/user/urn:li:corpuser:example${test_id}@example.com"]`,
+      `[href="/user/urn:li:corpuser:example${test_id}@example.com/owner of"]`,
     );
   });
 
@@ -89,21 +89,25 @@ describe("add, remove ownership for dataset", () => {
     addOwner(
       group_name,
       "Business Owner",
-      `[href="/group/urn:li:corpGroup:${test_id}"]`,
+      `[href="/group/urn:li:corpGroup:${test_id}/owner of"]`,
     );
     // data steward
     addOwner(
       group_name,
       "Data Steward",
-      `[href="/group/urn:li:corpGroup:${test_id}"]`,
+      `[href="/group/urn:li:corpGroup:${test_id}/owner of"]`,
     );
     // none
-    addOwner(group_name, "None", `[href="/group/urn:li:corpGroup:${test_id}"]`);
+    addOwner(
+      group_name,
+      "None",
+      `[href="/group/urn:li:corpGroup:${test_id}/owner of"]`,
+    );
     // technical owner
     addOwner(
       group_name,
       "Technical Owner",
-      `[href="/group/urn:li:corpGroup:${test_id}"]`,
+      `[href="/group/urn:li:corpGroup:${test_id}/owner of"]`,
     );
   });
 });
diff --git a/smoke-test/tests/cypress/cypress/e2e/mutations/ingestion_source.js b/smoke-test/tests/cypress/cypress/e2e/mutations/ingestion_source.js
index 9ed3ccdd26eeef..527fa6955f32b5 100644
--- a/smoke-test/tests/cypress/cypress/e2e/mutations/ingestion_source.js
+++ b/smoke-test/tests/cypress/cypress/e2e/mutations/ingestion_source.js
@@ -65,7 +65,9 @@ describe("ingestion source creation flow", () => {
     cy.waitTextVisible(`${ingestion_source_name} EDITED`);
 
     // Remove ingestion source
-    cy.get('[data-testid="delete-button"]').first().click();
+    cy.get(
+      `[data-testid="delete-ingestion-source-${ingestion_source_name} EDITED"]`,
+    ).click();
     cy.waitTextVisible("Confirm Ingestion Source Removal");
     cy.get("button").contains("Yes").click();
     cy.waitTextVisible("Removed ingestion source.");
diff --git a/smoke-test/tests/cypress/cypress/e2e/mutations/manage_ingestion_secret_privilege.js b/smoke-test/tests/cypress/cypress/e2e/mutations/manage_ingestion_secret_privilege.js
index a4d1e6ca375a4a..9a1b46d6adf00b 100644
--- a/smoke-test/tests/cypress/cypress/e2e/mutations/manage_ingestion_secret_privilege.js
+++ b/smoke-test/tests/cypress/cypress/e2e/mutations/manage_ingestion_secret_privilege.js
@@ -147,7 +147,7 @@ describe("Manage Ingestion and Secret Privileges", () => {
       cy.visit(inviteLink);
       const { name, email } = tryToSignUp();
       registeredEmail = email;
-      cy.waitTextVisible("Welcome to DataHub");
+      cy.waitTextVisible("Welcome back");
       cy.hideOnboardingTour();
       cy.waitTextVisible(name);
     });
@@ -164,7 +164,7 @@ describe("Manage Ingestion and Secret Privileges", () => {
     cy.clearCookies();
     cy.clearLocalStorage();
     signIn();
-    cy.waitTextVisible("Welcome to DataHub");
+    cy.waitTextVisible("Welcome back");
     cy.hideOnboardingTour();
     cy.waitTextVisible(name);
     cy.clickOptionWithText("Ingestion");
@@ -185,7 +185,7 @@ describe("Manage Ingestion and Secret Privileges", () => {
     editPolicy(platform_policy_name, "Secret", "Manage Secrets");
     cy.logout();
     signIn();
-    cy.waitTextVisible("Welcome to DataHub");
+    cy.waitTextVisible("Welcome back");
     cy.hideOnboardingTour();
     cy.waitTextVisible(name);
     cy.clickOptionWithText("Ingestion");
diff --git a/smoke-test/tests/cypress/cypress/e2e/mutationsV2/v2_ingestion_source.js b/smoke-test/tests/cypress/cypress/e2e/mutationsV2/v2_ingestion_source.js
new file mode 100644
index 00000000000000..e045dd93ac16d9
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/mutationsV2/v2_ingestion_source.js
@@ -0,0 +1,82 @@
+const number = Math.floor(Math.random() * 100000);
+const accound_id = `account${number}`;
+const warehouse_id = `warehouse${number}`;
+const username = `user${number}`;
+const password = `password${number}`;
+const role = `role${number}`;
+const ingestion_source_name = `ingestion source ${number}`;
+
+describe("ingestion source creation flow", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+  });
+  it("create a ingestion source using ui, verify ingestion source details saved correctly, remove ingestion source", () => {
+    // Go to ingestion page, create a snowflake source
+    cy.loginWithCredentials();
+    cy.skipIntroducePage();
+    cy.goToIngestionPage();
+    cy.get('[data-node-key="Sources"]').click();
+    cy.contains("Loading ingestion sources...").should("not.exist");
+    cy.clickOptionWithTestId("create-ingestion-source-button");
+    cy.get('[placeholder="Search data sources..."]').type("snowflake");
+    cy.clickOptionWithText("Snowflake");
+    cy.waitTextVisible("Account");
+    cy.get("#account_id").type(accound_id);
+    cy.get("#warehouse").type(warehouse_id);
+    cy.get("#username").type(username);
+    cy.get("#password").type(password);
+    cy.focused().blur();
+    cy.get("#role").type(role);
+
+    // Verify yaml recipe is generated correctly
+    cy.clickOptionWithTestId("recipe-builder-yaml-button");
+    cy.waitTextVisible("account_id");
+    cy.waitTextVisible(accound_id);
+    cy.waitTextVisible(warehouse_id);
+    cy.waitTextVisible(username);
+    cy.waitTextVisible(password);
+    cy.waitTextVisible(role);
+
+    // Finish creating source
+    cy.clickOptionWithTestId("recipe-builder-next-button");
+    cy.waitTextVisible("Configure an Ingestion Schedule");
+    cy.clickOptionWithTestId("ingestion-schedule-next-button");
+    cy.get(".ant-collapse-item").should("be.visible");
+    cy.get('[data-testid="source-name-input"]').type(ingestion_source_name);
+    cy.clickOptionWithTestId("ingestion-source-save-button");
+    cy.waitTextVisible("Successfully created ingestion source!").wait(5000);
+    cy.waitTextVisible(ingestion_source_name);
+    cy.get('[data-testid="ingestion-source-table-status"]')
+      .contains("Pending...")
+      .should("be.visible");
+
+    // Verify ingestion source details are saved correctly
+    cy.get('[data-testid="ingestion-source-table-edit-button"]')
+      .first()
+      .click();
+    cy.waitTextVisible("Account");
+    cy.get("#account_id").should("have.value", accound_id);
+    cy.get("#warehouse").should("have.value", warehouse_id);
+    cy.get("#username").should("have.value", username);
+    cy.get("#password").should("have.value", password);
+    cy.get("#role").should("have.value", role);
+    cy.get("button").contains("Next").click();
+    cy.waitTextVisible("Configure an Ingestion Schedule");
+    cy.clickOptionWithTestId("ingestion-schedule-next-button");
+    cy.get('[data-testid="source-name-input"]')
+      .clear()
+      .type(`${ingestion_source_name} EDITED`);
+    cy.clickOptionWithTestId("ingestion-source-save-button");
+    cy.waitTextVisible("Successfully updated ingestion source!");
+    cy.waitTextVisible(`${ingestion_source_name} EDITED`);
+
+    // Remove ingestion source
+    cy.get(
+      `[data-testid="delete-ingestion-source-${ingestion_source_name} EDITED"]`,
+    ).click();
+    cy.waitTextVisible("Confirm Ingestion Source Removal");
+    cy.get("button").contains("Yes").click();
+    cy.waitTextVisible("Removed ingestion source.");
+    cy.ensureTextNotPresent(`${ingestion_source_name} EDITED`);
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/mutationsV2/v2_managed_ingestion.js b/smoke-test/tests/cypress/cypress/e2e/mutationsV2/v2_managed_ingestion.js
new file mode 100644
index 00000000000000..4c5b29c9f51d99
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/mutationsV2/v2_managed_ingestion.js
@@ -0,0 +1,46 @@
+function readyToTypeEditor() {
+  return cy.get(".monaco-scrollable-element").first().click().focused();
+}
+
+describe("run managed ingestion", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+  });
+  it("create run managed ingestion source", () => {
+    const number = Math.floor(Math.random() * 100000);
+    const testName = `cypress test source ${number}`;
+    const cli_version = "0.12.0";
+    cy.login();
+    cy.goToIngestionPage();
+    cy.contains("Loading ingestion sources...").should("not.exist");
+    // cy.clickOptionWithText("Create new source");
+    cy.clickOptionWithTestId("create-ingestion-source-button");
+    cy.get('[placeholder="Search data sources..."]').type("other");
+    cy.clickOptionWithTextToScrollintoView("Other");
+
+    cy.waitTextVisible("source-type");
+    readyToTypeEditor().type("{ctrl}a").clear();
+    readyToTypeEditor().type("source:{enter}");
+    readyToTypeEditor().type("    type: demo-data");
+    readyToTypeEditor().type("{enter}");
+    // no space because the editor starts new line at same indentation
+    readyToTypeEditor().type("config: {}");
+    cy.clickOptionWithText("Next");
+    cy.clickOptionWithText("Next");
+
+    cy.enterTextInTestId("source-name-input", testName);
+    cy.clickOptionWithText("Advanced");
+    cy.enterTextInTestId("cli-version-input", cli_version);
+    cy.clickOptionWithTextToScrollintoView("Save & Run");
+    cy.waitTextVisible(testName);
+
+    cy.contains(testName)
+      .parent()
+      .within(() => {
+        cy.contains("Succeeded", { timeout: 180000 });
+        cy.clickOptionWithTestId(`delete-ingestion-source-${testName}`);
+      });
+    cy.clickOptionWithText("Yes");
+    cy.ensureTextNotPresent(testName);
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/mutationsV2/v2_managing_secrets.js b/smoke-test/tests/cypress/cypress/e2e/mutationsV2/v2_managing_secrets.js
new file mode 100644
index 00000000000000..e050993b0936cc
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/mutationsV2/v2_managing_secrets.js
@@ -0,0 +1,130 @@
+const number = Math.floor(Math.random() * 100000);
+const accound_id = `account${number}`;
+const warehouse_id = `warehouse${number}`;
+const username = `user${number}`;
+const password = `password${number}`;
+const role = `role${number}`;
+const ingestion_source_name = `ingestion source ${number}`;
+
+describe("managing secrets for ingestion creation", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+  });
+  it("create a secret, create ingestion source using a secret, remove a secret", () => {
+    // Navigate to the manage ingestion page → secrets
+    cy.loginWithCredentials();
+    cy.skipIntroducePage();
+    cy.goToIngestionPage();
+    // cy.openEntityTab("Secrets");
+
+    // Create a new secret
+    cy.get('[data-node-key="Secrets"]').click();
+    cy.clickOptionWithTestId("create-secret-button");
+    cy.enterTextInTestId("secret-modal-name-input", `secretname${number}`);
+    cy.enterTextInTestId("secret-modal-value-input", `secretvalue${number}`);
+    cy.enterTextInTestId(
+      "secret-modal-description-input",
+      `secretdescription${number}`,
+    );
+    cy.clickOptionWithTestId("secret-modal-create-button");
+    cy.waitTextVisible("Successfully created Secret!");
+    cy.waitTextVisible(`secretname${number}`);
+    cy.waitTextVisible(`secretdescription${number}`).wait(5000);
+
+    // Create an ingestion source using a secret
+    cy.goToIngestionPage();
+    cy.get('[data-node-key="Sources"]').click();
+    cy.get("#ingestion-create-source").click();
+    cy.get('[placeholder="Search data sources..."]').type("snowflake");
+    cy.clickOptionWithText("Snowflake");
+    cy.waitTextVisible("Account");
+    cy.get("#account_id").type(accound_id);
+    cy.get("#warehouse").type(warehouse_id);
+    cy.get("#username").type(username);
+    cy.get("#password").click().wait(1000);
+    cy.contains(`secretname${number}`).click({ force: true });
+    cy.focused().blur();
+    cy.get("#role").type(role);
+    cy.get("button").contains("Next").click();
+    cy.waitTextVisible("Configure an Ingestion Schedule");
+    cy.get("button").contains("Next").click();
+    cy.get(".ant-collapse-item").should("be.visible");
+    cy.get('[data-testid="source-name-input"]').type(ingestion_source_name);
+    cy.get("button").contains("Save").click();
+    cy.waitTextVisible("Successfully created ingestion source!").wait(5000);
+    cy.waitTextVisible(ingestion_source_name);
+    cy.get("button").contains("Pending...").should("be.visible");
+
+    // Remove a secret
+    cy.openEntityTab("Secrets");
+    cy.waitTextVisible(`secretname${number}`);
+    cy.get('[data-icon="delete"]').first().click();
+    cy.waitTextVisible("Confirm Secret Removal");
+    cy.get("button").contains("Yes").click();
+    cy.waitTextVisible("Removed secret.");
+    cy.ensureTextNotPresent(`secretname${number}`);
+    cy.ensureTextNotPresent(`secretdescription${number}`);
+
+    // Remove ingestion source
+    cy.goToIngestionPage();
+    cy.get('[data-node-key="Sources"]').click();
+    cy.get(
+      `[data-testid="delete-ingestion-source-${ingestion_source_name}"]`,
+    ).click();
+    cy.waitTextVisible("Confirm Ingestion Source Removal");
+    cy.get("button").contains("Yes").click();
+    cy.waitTextVisible("Removed ingestion source.");
+    cy.ensureTextNotPresent(ingestion_source_name);
+
+    // Verify secret is not present during ingestion source creation for password dropdown
+    cy.clickOptionWithText("Create new source");
+    cy.get('[placeholder="Search data sources..."]').type("snowflake");
+    cy.clickOptionWithText("Snowflake");
+    cy.waitTextVisible("Account");
+    cy.get("#account_id").type(accound_id);
+    cy.get("#warehouse").type(warehouse_id);
+    cy.get("#username").type(username);
+    cy.get("#password").click().wait(1000);
+    cy.ensureTextNotPresent(`secretname${number}`);
+
+    // Verify secret can be added during ingestion source creation and used successfully
+    cy.clickOptionWithText("Create Secret");
+    cy.enterTextInTestId("secret-modal-name-input", `secretname${number}`);
+    cy.enterTextInTestId("secret-modal-value-input", `secretvalue${number}`);
+    cy.enterTextInTestId(
+      "secret-modal-description-input",
+      `secretdescription${number}`,
+    );
+    cy.clickOptionWithTestId("secret-modal-create-button");
+    cy.waitTextVisible("Created secret!");
+    cy.get("#role").type(role);
+    cy.get("button").contains("Next").click();
+    cy.waitTextVisible("Configure an Ingestion Schedule");
+    cy.get("button").contains("Next").click();
+    cy.get(".ant-collapse-item").should("be.visible");
+    cy.get('[data-testid="source-name-input"]').type(ingestion_source_name);
+    cy.get("button").contains("Save").click();
+    cy.waitTextVisible("Successfully created ingestion source!").wait(5000); // prevent issue with missing form data
+    cy.waitTextVisible(ingestion_source_name);
+    cy.get("button").contains("Pending...").should("be.visible");
+
+    // Remove ingestion source and secret
+    cy.goToIngestionPage();
+    cy.get('[data-node-key="Sources"]').click();
+    cy.get(
+      `[data-testid="delete-ingestion-source-${ingestion_source_name}"]`,
+    ).click();
+    cy.waitTextVisible("Confirm Ingestion Source Removal");
+    cy.get("button").contains("Yes").click();
+    cy.waitTextVisible("Removed ingestion source.");
+    cy.ensureTextNotPresent(ingestion_source_name);
+    cy.clickOptionWithText("Secrets");
+    cy.waitTextVisible(`secretname${number}`);
+    cy.get('[data-icon="delete"]').first().click();
+    cy.waitTextVisible("Confirm Secret Removal");
+    cy.get("button").contains("Yes").click();
+    cy.waitTextVisible("Removed secret.");
+    cy.ensureTextNotPresent(`secretname${number}`);
+    cy.ensureTextNotPresent(`secretdescription${number}`);
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/operrationsV2/v2_operations.js b/smoke-test/tests/cypress/cypress/e2e/operrationsV2/v2_operations.js
new file mode 100644
index 00000000000000..c7c2693f30e0c5
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/operrationsV2/v2_operations.js
@@ -0,0 +1,15 @@
+describe("operations", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+  });
+  it("can visit dataset with operation aspect and verify last updated is present", () => {
+    cy.login();
+    cy.visit(
+      "/dataset/urn:li:dataset:(urn:li:dataPlatform:bigquery,test-project.bigquery_usage_logs.cypress_logging_events,PROD)/Stats?is_lineage_mode=false",
+    );
+    cy.contains("test-project.bigquery_usage_logs.cypress_logging_events");
+
+    // Last updated text is present
+    cy.contains("Last Updated");
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/ownershipV2/v2_manage_ownership.js b/smoke-test/tests/cypress/cypress/e2e/ownershipV2/v2_manage_ownership.js
new file mode 100644
index 00000000000000..599307b7ede9e6
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/ownershipV2/v2_manage_ownership.js
@@ -0,0 +1,45 @@
+describe("manage ownership", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+  });
+
+  it("go to ownership types settings page, create, edit, make default, delete a ownership type", () => {
+    const viewName = "Test View";
+    cy.login();
+    cy.goToOwnershipTypesSettings();
+    cy.waitTextVisible("Manage Ownership");
+    cy.clickOptionWithTestId("create-owner-type");
+    cy.get('[data-testid="ownership-type-name-input"]').clear("T");
+    cy.get('[data-testid="ownership-type-name-input"]').type(
+      "Test Ownership Type",
+    );
+    cy.get('[data-testid="ownership-type-description-input"]').clear("T");
+    cy.get('[data-testid="ownership-type-description-input"]').type(
+      "This is a test ownership type description.",
+    );
+    cy.get('[data-testid="ownership-builder-save"]').click();
+    cy.wait(3000);
+    cy.waitTextVisible("Test Ownership Type");
+
+    cy.get(
+      '[data-row-key="Test Ownership Type"] > :nth-child(3) > .anticon > svg',
+    ).click();
+    cy.clickOptionWithText("Edit");
+    cy.get('[data-testid="ownership-type-description-input"]').clear(
+      "This is an test ownership type description.",
+    );
+    cy.get('[data-testid="ownership-type-description-input"]').type(
+      "This is an edited test ownership type description.",
+    );
+    cy.get('[data-testid="ownership-builder-save"] > span').click();
+    cy.wait(3000);
+    cy.waitTextVisible("This is an edited test ownership type description.");
+    cy.get(
+      '[data-row-key="Test Ownership Type"] > :nth-child(3) > .anticon > svg',
+    ).click();
+    cy.clickOptionWithText("Delete");
+    cy.get(".ant-popover-buttons > .ant-btn-primary").click();
+    cy.wait(3000);
+    cy.ensureTextNotPresent("Test Ownership Type");
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/query/query_tab.js b/smoke-test/tests/cypress/cypress/e2e/query/query_tab.js
index f03aa6afda4a2f..09d0341cf9829c 100644
--- a/smoke-test/tests/cypress/cypress/e2e/query/query_tab.js
+++ b/smoke-test/tests/cypress/cypress/e2e/query/query_tab.js
@@ -50,7 +50,8 @@ describe("manage queries", () => {
   });
 
   it("go to queries tab on dataset page then create query and verify & view the card", () => {
-    cy.waitTextVisible("Highlighted Queries");
+    cy.wait(1000);
+    cy.url().should("include", "Queries");
     cy.ensureTextNotPresent("Recent Queries");
     addNewQuery();
     cy.waitTextVisible(`+ Test Query-${runId}`);
diff --git a/smoke-test/tests/cypress/cypress/e2e/schema_blameV2/v2_schema_blame.js b/smoke-test/tests/cypress/cypress/e2e/schema_blameV2/v2_schema_blame.js
new file mode 100644
index 00000000000000..8466b7106d76b9
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/schema_blameV2/v2_schema_blame.js
@@ -0,0 +1,59 @@
+const urn =
+  "urn:li:dataset:(urn:li:dataPlatform:hive,SampleCypressHiveDataset,PROD)";
+
+describe("schema blame", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+  });
+  Cypress.on("uncaught:exception", (err, runnable) => false);
+
+  it("can activate the blame view and verify for the latest version of a dataset", () => {
+    cy.login();
+    cy.visit(`/dataset/${urn}`);
+    cy.get("#column-field_baz").should("be.visible");
+    cy.get("body").click();
+
+    // Verify which fields are present, along with checking descriptions and tags
+    cy.contains("field_foo").should("be.visible");
+    cy.contains("field_baz").should("be.visible");
+    cy.contains("field_bar").should("not.exist");
+    cy.contains("Foo field description has changed");
+    cy.contains("Baz field description").should("exist");
+    cy.clickOptionWithText("field_foo").should("exist");
+    cy.contains("Legacy").should("exist");
+    cy.get(".ant-select-selection-item").click();
+    cy.contains(/1\.0\.0\s*-/).click({ force: true });
+
+    // Make sure the schema blame is accurate
+    cy.get('[data-testid="schema-blame-button"]').click({ force: true });
+    cy.contains("field_bar").should("be.visible");
+    cy.contains("field_foo").should("be.visible");
+    cy.contains("Bar field description").should("be.visible");
+    cy.contains("Foo field description").should("be.visible");
+
+    // Verify History table tab
+    cy.contains("History").should("be.visible");
+  });
+
+  it("can activate the blame view and verify for an older version of a dataset", () => {
+    cy.login();
+    cy.visit(`/dataset/${urn}`);
+    cy.get("#column-field_baz").should("be.visible");
+    cy.get("body").click();
+    cy.get(".ant-select-selection-item")
+      .should("be.visible")
+      .click({ force: true });
+    cy.contains(/0\.0\.0\s*-/).click({ force: true });
+    // Verify which fields are present, along with checking descriptions and tags
+    cy.contains("field_foo").should("be.visible");
+    cy.contains("field_bar").should("be.visible");
+    cy.contains("field_baz").should("not.exist");
+    cy.contains("Foo field description").should("exist");
+    cy.contains("Bar field description").should("exist");
+    cy.clickOptionWithText("field_foo");
+    cy.get('[data-testid="schema-field-field_foo-tags"]')
+      .contains("Legacy")
+      .should("not.exist");
+    cy.get(".anticon-file-text").click();
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/search/search.js b/smoke-test/tests/cypress/cypress/e2e/search/search.js
index cff48cbd8be715..fac936cc7d51bf 100644
--- a/smoke-test/tests/cypress/cypress/e2e/search/search.js
+++ b/smoke-test/tests/cypress/cypress/e2e/search/search.js
@@ -85,7 +85,7 @@ describe("search", () => {
     // has the term in non-editable metadata
     cy.contains("cypress_logging_events");
 
-    cy.contains("of 2 results");
+    cy.contains(/Showing 1 - [2-4] of [2-4]/);
   });
 
   it("can search by AND-ing two concepts using advanced search", () => {
diff --git a/smoke-test/tests/cypress/cypress/e2e/search/searchFilters.js b/smoke-test/tests/cypress/cypress/e2e/search/searchFilters.js
index 761901c0c1175c..59530333d66336 100644
--- a/smoke-test/tests/cypress/cypress/e2e/search/searchFilters.js
+++ b/smoke-test/tests/cypress/cypress/e2e/search/searchFilters.js
@@ -56,12 +56,12 @@ describe("search", () => {
       "include",
       "filter_tags___false___EQUAL___0=urn%3Ali%3Atag%3ACypress",
     );
-    cy.get("[data-testid=update-filters").should("not.exist");
+    cy.get("[data-testid=update-filters").should("not.be.visible");
 
     // select datasets filter
     cy.get("[data-testid=filter-dropdown-Type").click({ force: true });
     cy.get("[data-testid=filter-option-Datasets").click({ force: true });
-    cy.get("[data-testid=update-filters").click({ force: true });
+    cy.get("[data-testid=update-filters").eq(1).click({ force: true });
     cy.url().should(
       "include",
       "filter__entityType%E2%90%9EtypeNames___false___EQUAL___1=DATASET",
diff --git a/smoke-test/tests/cypress/cypress/e2e/settings/homePagePost.js b/smoke-test/tests/cypress/cypress/e2e/settings/homePagePost.js
index f9f76331ee7d7e..a78717d90eb262 100644
--- a/smoke-test/tests/cypress/cypress/e2e/settings/homePagePost.js
+++ b/smoke-test/tests/cypress/cypress/e2e/settings/homePagePost.js
@@ -23,7 +23,7 @@ const addOrEditLink = (text, title, url, imagesURL, testId) => {
 };
 
 const clickOnNewPost = () => {
-  cy.get('[id="posts-create-post"]').click({ force: true });
+  cy.get('[data-testid="posts-create-post"]').click({ force: true });
 };
 
 const clickOnMoreOption = () => {
diff --git a/smoke-test/tests/cypress/cypress/e2e/settings/manage_policies.js b/smoke-test/tests/cypress/cypress/e2e/settings/manage_policies.js
index 98d66f4fc5102c..a4dfe91cff40d2 100644
--- a/smoke-test/tests/cypress/cypress/e2e/settings/manage_policies.js
+++ b/smoke-test/tests/cypress/cypress/e2e/settings/manage_policies.js
@@ -4,9 +4,14 @@ const platform_policy_edited = `Platform test policy ${test_id} EDITED`;
 const metadata_policy_name = `Metadata test policy ${test_id}`;
 const metadata_policy_edited = `Metadata test policy ${test_id} EDITED`;
 
-function searchAndToggleMetadataPolicyStatus(metadataPolicyName, targetStatus) {
+function searchForPolicy(metadataPolicyName) {
   cy.get('[data-testid="search-input"]').should("be.visible");
   cy.get('[data-testid="search-input"]').eq(1).type(metadataPolicyName);
+  cy.get('[data-testid="search-input"]').eq(1).blur();
+}
+
+function searchAndToggleMetadataPolicyStatus(metadataPolicyName, targetStatus) {
+  searchForPolicy(metadataPolicyName);
   cy.contains("tr", metadataPolicyName).as("metadataPolicyRow");
   cy.contains(targetStatus).click();
 }
@@ -34,6 +39,7 @@ function createPolicy(decription, policyName) {
   updateAndSave("groups", "All", "All Groups");
   clickOnButton("saveButton");
   cy.waitTextVisible("Successfully saved policy.");
+  searchForPolicy(policyName);
   cy.waitTextVisible(policyName);
 }
 
diff --git a/smoke-test/tests/cypress/cypress/e2e/settings/managing_groups.js b/smoke-test/tests/cypress/cypress/e2e/settings/managing_groups.js
index 9a86f7e966e315..4bad0bf27931ce 100644
--- a/smoke-test/tests/cypress/cypress/e2e/settings/managing_groups.js
+++ b/smoke-test/tests/cypress/cypress/e2e/settings/managing_groups.js
@@ -22,7 +22,7 @@ describe("create and manage group", () => {
       cy.mouseover("#title").click();
       cy.waitTextVisible("Other").click();
       cy.get("[type=submit]").click();
-      cy.waitTextVisible("Welcome to DataHub");
+      cy.waitTextVisible("Welcome back");
       cy.hideOnboardingTour();
       cy.waitTextVisible(username);
     });
diff --git a/smoke-test/tests/cypress/cypress/e2e/settingsV2/v2_homePagePost.js b/smoke-test/tests/cypress/cypress/e2e/settingsV2/v2_homePagePost.js
new file mode 100644
index 00000000000000..94751d5cff636b
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/settingsV2/v2_homePagePost.js
@@ -0,0 +1,107 @@
+const homePageRedirection = () => {
+  cy.visit("/");
+  cy.get(`[data-testid="home-page-content-container"]`).should("be.visible");
+};
+
+const addOrEditAnnouncement = (text, title, description, testId) => {
+  cy.waitTextPresent(text);
+  cy.get('[data-testid="create-post-title"]').clear().type(title);
+  // cy.get(".create-post-description").clear().type(description);
+  cy.get(`[data-testid="${testId}-post-button"]`).click({ force: true });
+  cy.reload();
+  homePageRedirection();
+};
+
+const addOrEditLink = (text, title, url, imagesURL, testId) => {
+  cy.waitTextPresent(text);
+  cy.get('[data-testid="create-post-title"]').clear().type(title);
+  cy.get('[data-testid="create-post-link"]').clear().type(url);
+  cy.get('[data-testid="create-post-media-location"]').clear().type(imagesURL);
+  cy.get(`[data-testid="${testId}-post-button"]`).click({ force: true });
+  cy.reload();
+  homePageRedirection();
+};
+
+const clickOnNewPost = () => {
+  cy.get('[data-testid="posts-create-post-v2"]').click({ force: true });
+};
+
+const clickOnMoreOption = () => {
+  cy.get('[aria-label="more"]').first().click();
+};
+
+describe("create announcement and link post", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+    cy.loginWithCredentials();
+    cy.skipIntroducePage();
+    cy.goToHomePagePostSettingsV2();
+    cy.waitTestIdVisible("posts-create-post-v2");
+  });
+
+  it("Verify create, edit and delete announcement post", () => {
+    clickOnNewPost();
+    addOrEditAnnouncement(
+      "Create",
+      "Test Announcement Title",
+      "Add Description to post announcement",
+      "create",
+    );
+    cy.clickOptionWithId("#v2-home-page-announcements");
+    cy.waitTextPresent("Test Announcement Title");
+    cy.goToHomePagePostSettingsV2();
+    clickOnMoreOption();
+    cy.clickOptionWithText("Edit");
+    cy.contains("label", "Announcement").click();
+    addOrEditAnnouncement(
+      "Edit",
+      "Test Announcement Title Updated",
+      "Decription Updated",
+      "update",
+    );
+    cy.clickOptionWithId("#v2-home-page-announcements");
+    cy.waitTextPresent("Test Announcement Title Updated");
+    cy.goToHomePagePostSettingsV2();
+    clickOnMoreOption();
+    cy.clickOptionWithText("Delete");
+    cy.clickOptionWithText("Yes");
+    homePageRedirection();
+    cy.wait(500);
+    cy.reload();
+    cy.ensureTextNotPresent("Test Announcement Title Updated");
+  });
+
+  it("Verify create, edit and delete link post", () => {
+    clickOnNewPost();
+    cy.waitTextPresent("Create");
+    cy.contains("label", "Pinned Link").click();
+    addOrEditLink(
+      "Create",
+      "Test Link Title",
+      "https://www.example.com",
+      "https://www.example.com/images/example-image.jpg",
+      "create",
+    );
+    cy.waitTextPresent("Test Link Title");
+    cy.goToHomePagePostSettingsV2();
+    clickOnMoreOption();
+    cy.clickOptionWithText("Edit");
+    cy.contains("label", "Pinned Link").click();
+    addOrEditLink(
+      "Edit",
+      "Test Link Updated Title",
+      "https://www.updatedexample.com",
+      "https://www.updatedexample.com/images/example-image.jpg",
+      "update",
+    );
+    cy.waitTextPresent("Test Link Updated Title");
+    cy.goToHomePagePostSettingsV2();
+    clickOnMoreOption();
+    cy.clickOptionWithText("Delete");
+    cy.clickOptionWithText("Yes");
+    homePageRedirection();
+    cy.wait(500);
+    cy.reload();
+    cy.ensureTextNotPresent("Test Link Updated Title");
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/settingsV2/v2_manage_access_tokens.js b/smoke-test/tests/cypress/cypress/e2e/settingsV2/v2_manage_access_tokens.js
new file mode 100644
index 00000000000000..3ccbcc932cad91
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/settingsV2/v2_manage_access_tokens.js
@@ -0,0 +1,53 @@
+import { aliasQuery, hasOperationName } from "../utils";
+
+const test_id = Math.floor(Math.random() * 100000);
+
+describe("manage access tokens", () => {
+  before(() => {
+    cy.intercept("POST", "/api/v2/graphql", (req) => {
+      aliasQuery(req, "appConfig");
+    });
+  });
+
+  const setTokenAuthEnabledFlag = (isOn) => {
+    cy.intercept("POST", "/api/v2/graphql", (req) => {
+      if (hasOperationName(req, "appConfig")) {
+        req.reply((res) => {
+          res.body.data.appConfig.authConfig.tokenAuthEnabled = isOn;
+          res.body.data.appConfig.featureFlags.themeV2Enabled = true;
+          res.body.data.appConfig.featureFlags.themeV2Default = true;
+        });
+      }
+    });
+  };
+
+  it("create and revoke access token", () => {
+    // create access token, verify token on ui
+    setTokenAuthEnabledFlag(true);
+    cy.loginWithCredentials();
+    cy.skipIntroducePage();
+    cy.goToAccessTokenSettings();
+    cy.clickOptionWithTestId("add-token-button");
+    cy.clickOptionWithSpecificClass(".personal-token-dropdown-option", 0);
+    cy.enterTextInTestId("create-access-token-name", `Token Name${test_id}`);
+    cy.enterTextInTestId(
+      "create-access-token-description",
+      `Token Description${test_id}`,
+    );
+    cy.clickOptionWithTestId("create-access-token-button");
+    cy.waitTextVisible("New Personal Access Token");
+    cy.get('[data-testid="access-token-value"]').should("be.visible");
+    cy.get('[data-testid="access-token-value"]')
+      .invoke("text")
+      .should("match", /^[a-zA-Z0-9-_]+\.[a-zA-Z0-9-_]+\.[a-zA-Z0-9-_]+$/);
+    cy.clickOptionWithTestId("access-token-modal-close-button");
+    // revoke access token, verify token removed from ui
+    cy.waitTextVisible(`Token Name${test_id}`);
+    cy.waitTextVisible(`Token Description${test_id}`);
+    cy.clickOptionWithTestId("revoke-token-button");
+    cy.waitTextVisible("Are you sure you want to revoke this token?");
+    cy.clickOptionWithText("Yes");
+    cy.ensureTextNotPresent(`Token Name${test_id}`);
+    cy.ensureTextNotPresent(`Token Description${test_id}`);
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/settingsV2/v2_manage_policies.js b/smoke-test/tests/cypress/cypress/e2e/settingsV2/v2_manage_policies.js
new file mode 100644
index 00000000000000..f964742de993f3
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/settingsV2/v2_manage_policies.js
@@ -0,0 +1,143 @@
+const test_id = Math.floor(Math.random() * 100000);
+const platform_policy_name = `Platform test policy ${test_id}`;
+const platform_policy_edited = `Platform test policy ${test_id} EDITED`;
+const metadata_policy_name = `Metadata test policy ${test_id}`;
+const metadata_policy_edited = `Metadata test policy ${test_id} EDITED`;
+
+function searchAndToggleMetadataPolicyStatus(metadataPolicyName, targetStatus) {
+  cy.contains("Platform").should("be.visible");
+  cy.get('[data-testid="search-input"]').should("be.visible");
+  cy.get('[data-testid="search-input"]').eq(1).type(metadataPolicyName);
+  cy.contains("tr", metadataPolicyName).as("metadataPolicyRow");
+  cy.contains(targetStatus).click();
+}
+
+function clickFocusAndType(Id, text) {
+  cy.clickOptionWithTestId(Id).focused().clear().type(text);
+}
+
+function updateAndSave(Id, groupName, text) {
+  cy.clickOptionWithTestId(Id).type(groupName);
+  cy.get(`[title='${text}']`).click();
+  cy.focused().blur();
+}
+
+function clickOnButton(saveButton) {
+  cy.get(`#${saveButton}`).click();
+}
+
+function createPolicy(decription, policyName) {
+  clickFocusAndType("policy-description", decription);
+  clickOnButton("nextButton");
+  updateAndSave("privileges", "All", "All Privileges", "nextButton");
+  clickOnButton("nextButton");
+  updateAndSave("users", "All", "All Users");
+  updateAndSave("groups", "All", "All Groups");
+  clickOnButton("saveButton");
+  cy.waitTextVisible("Successfully saved policy.");
+  cy.contains("Successfully saved policy.").should("not.exist");
+  cy.get('[data-testid="search-input"]').eq(1).type(policyName);
+  cy.get(".ant-table-tbody").contains(policyName).should("be.visible");
+}
+
+function editPolicy(
+  policyName,
+  editPolicy,
+  description,
+  policyEdited,
+  visibleDiscription,
+) {
+  cy.visit("/settings/permissions/policies");
+  cy.waitTextVisible("Users & Groups");
+  searchAndToggleMetadataPolicyStatus(policyName, "EDIT");
+  cy.clickOptionWithTestId("policy-name");
+  cy.focused().clear().type(editPolicy);
+  cy.clickOptionWithTestId("policy-description");
+  cy.focused().clear().type(description);
+  clickOnButton("nextButton");
+  clickOnButton("nextButton");
+  clickOnButton("saveButton");
+  cy.waitTextVisible("Successfully saved policy.");
+  cy.contains("Successfully saved policy.").should("not.exist");
+  cy.waitTextVisible(policyEdited);
+  cy.waitTextVisible(visibleDiscription);
+}
+
+function deletePolicy(policyEdited, deletePolicy) {
+  cy.visit("/settings/permissions/policies");
+  cy.waitTextVisible("Users & Groups");
+  cy.get(".ant-select-selection-item").should("be.visible").click();
+  cy.get(".rc-virtual-list-holder-inner")
+    .contains("All")
+    .should("be.visible")
+    .click();
+  cy.get(".ant-select-selection-item").should("be.visible").click();
+  searchAndToggleMetadataPolicyStatus(policyEdited, "DEACTIVATE");
+  cy.waitTextVisible("Successfully deactivated policy.");
+  cy.contains("DEACTIVATE").should("not.exist");
+  cy.contains("ACTIVATE").click();
+  cy.waitTextVisible("Successfully activated policy.");
+  cy.get("[data-icon='delete']").click();
+  cy.waitTextVisible(deletePolicy);
+  cy.clickOptionWithText("Yes");
+  cy.waitTextVisible("Successfully removed policy.");
+  cy.waitTextVisible("Successfully removed policy.").should("not.exist");
+  cy.ensureTextNotPresent(policyEdited);
+}
+
+describe("create and manage platform and metadata policies", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+    cy.loginWithCredentials();
+    cy.skipIntroducePage();
+    cy.visit("/settings/permissions/policies");
+  });
+
+  it("verify create, edit, delete platform policy", () => {
+    cy.waitTextVisible("Users & Groups");
+    cy.clickOptionWithText("Create new policy");
+    clickFocusAndType("policy-name", platform_policy_name);
+    cy.get('[data-testid="policy-type"] [title="Metadata"]').click();
+    cy.clickOptionWithTestId("platform");
+    createPolicy(
+      `Platform policy description ${test_id}`,
+      platform_policy_name,
+    );
+    editPolicy(
+      `${platform_policy_name}`,
+      platform_policy_edited,
+      `Platform policy description ${test_id} EDITED`,
+      platform_policy_edited,
+      `Platform policy description ${test_id} EDITED`,
+    );
+    deletePolicy(
+      `${platform_policy_edited}`,
+      `Delete ${platform_policy_edited}`,
+      `${platform_policy_edited}`,
+    );
+  });
+
+  it("verify create, edit, delete metadata policy", () => {
+    cy.waitTextVisible("Users & Groups");
+    cy.clickOptionWithText("Create new policy");
+    clickFocusAndType("policy-name", metadata_policy_name);
+    cy.get('[data-testid="policy-type"]').should("have.text", "Metadata");
+    createPolicy(
+      `Metadata policy description ${test_id}`,
+      metadata_policy_name,
+    );
+    // cy.get('span[title="All"]').click()
+    editPolicy(
+      `${metadata_policy_name}`,
+      metadata_policy_edited,
+      `Metadata policy description ${test_id} EDITED`,
+      metadata_policy_edited,
+      `Metadata policy description ${test_id} EDITED`,
+    );
+    deletePolicy(
+      `${metadata_policy_name}`,
+      `Delete ${metadata_policy_name}`,
+      `${metadata_policy_edited}`,
+    );
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/settingsV2/v2_managing_groups.js b/smoke-test/tests/cypress/cypress/e2e/settingsV2/v2_managing_groups.js
new file mode 100644
index 00000000000000..3c92f7467e398d
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/settingsV2/v2_managing_groups.js
@@ -0,0 +1,154 @@
+const test_id = Math.floor(Math.random() * 100000);
+const username = `Example Name ${test_id}`;
+const email = `example${test_id}@example.com`;
+const password = "Example password";
+const group_name = `Test group ${test_id}`;
+
+describe("create and manage group", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+    cy.loginWithCredentials();
+    cy.skipIntroducePage();
+    cy.on("uncaught:exception", (err, runnable) => false);
+  });
+  it("add test user", () => {
+    cy.visit("/settings/identities/users");
+    cy.waitTextVisible("Settings");
+    cy.wait(1000);
+    cy.clickOptionWithText("Invite Users");
+    cy.waitTextVisible(/signup\?invite_token=\w{32}/).then(($elem) => {
+      const inviteLink = $elem.text();
+      cy.visit("/settings/identities/users");
+      cy.clickOptionWithTestId("log-out-menu-item");
+      cy.visit(inviteLink);
+      cy.enterTextInTestId("email", email);
+      cy.enterTextInTestId("name", username);
+      cy.enterTextInTestId("password", password);
+      cy.enterTextInTestId("confirmPassword", password);
+      cy.mouseover("#title").click();
+      cy.waitTextVisible("Other").click();
+      cy.get("[type=submit]").click();
+      cy.contains("Accepted invite!").should("not.exist");
+      cy.wait(5000);
+      // cy.hideOnboardingTour();
+      cy.skipIntroducePage();
+      cy.waitTextVisible(username);
+    });
+  });
+
+  it("create a group", () => {
+    cy.visit("/settings/identities/groups");
+    cy.waitTextVisible("Settings");
+    cy.wait(1000);
+    cy.clickOptionWithText("Create group");
+    cy.waitTextVisible("Create new group");
+    cy.get("#name").type(group_name);
+    cy.get("#description").type("Test group description");
+    cy.contains("Advanced").click();
+    cy.waitTextVisible("Group Id");
+    cy.get("#groupId").type(test_id);
+    cy.get("#createGroupButton").click();
+    // cy.waitTextVisible("Created group!");
+    cy.waitTextVisible(group_name);
+  });
+
+  it("add test user to a group", () => {
+    cy.visit("/settings/identities/users");
+    cy.waitTextVisible("Settings");
+    cy.wait(1000);
+    cy.get(".ant-tabs-tab-btn").contains("Groups").click();
+    cy.clickOptionWithText(group_name);
+    cy.clickTextOptionWithClass(".ant-typography", group_name);
+    // cy.get(".ant-typography").contains(group_name).should("be.visible");
+    cy.clickTextOptionWithClass(".ant-tabs-tab", "Members");
+    // cy.get(".ant-tabs-tab").contains("Members").click();
+    cy.waitTextVisible("No members in this group yet.");
+    cy.clickOptionWithText("Add Member");
+    // cy.clickOptionWithText('Search for users...')
+    cy.contains("Search for users...").click({ force: true });
+    cy.focused().type(username);
+    // cy.clickOptionWithText('Add group members')
+    // cy.clickTextOptionWithClass(".ant-select-item-option", username)
+    cy.get(".ant-select-item-option").contains(username).click();
+    cy.focused().blur();
+    cy.contains(username).should("have.length", 1);
+    cy.get('[role="dialog"] button').contains("Add").click({ force: true });
+    cy.waitTextVisible("Group members added!");
+    cy.contains(username, { timeout: 10000 }).should("be.visible");
+  });
+
+  it("update group info", () => {
+    cy.visit("/settings/identities/groups");
+    cy.waitTextVisible("Settings");
+    cy.wait(1000);
+    cy.clickOptionWithText(group_name);
+    cy.clickOptionWithSpecificClass(".ant-typography", 0);
+    cy.clickOptionWithTestId("EditOutlinedIcon");
+    cy.get("#email").type(`${test_id}@testemail.com`);
+    cy.get("#slack").type(`#${test_id}`);
+    cy.get(".ant-form-item-control-input-content")
+      .eq(0)
+      .clear()
+      .type(`Test group EDITED ${test_id}{enter}`);
+    cy.waitTextVisible("Name Updated");
+    cy.waitTextVisible(`${test_id}@testemail.com`);
+    cy.waitTextVisible(`#${test_id}`);
+    cy.contains("Changes saved.").should("not.exist");
+  });
+
+  it("user verify to edit the discription", () => {
+    cy.visit("/settings/identities/groups");
+    cy.waitTextVisible("Settings");
+    cy.wait(1000);
+    cy.contains(`Test group EDITED ${test_id}`).should("be.visible").click();
+    cy.get('[data-testid="EditOutlinedIcon"]').eq(1).click();
+    cy.contains("Test group description").should("be.visible").type(" EDITED");
+    cy.clickOptionWithText("Test group");
+    cy.get("body").click();
+    cy.waitTextVisible("Changes saved.");
+    cy.contains("Changes saved.").should("not.exist");
+    cy.contains("Test group description EDITED").should("be.visible");
+  });
+
+  it("user verify to add the owner", () => {
+    cy.visit("/settings/identities/groups");
+    cy.waitTextVisible("Settings");
+    cy.wait(1000);
+    cy.contains(`Test group EDITED ${test_id}`).should("be.visible").click();
+    cy.get(".anticon.anticon-plus").click();
+    cy.get('[aria-label="Close"]').should("be.visible");
+    cy.get('[id="owner"]').click();
+    cy.contains("Add Owners").click();
+    cy.get('[id="owner"]').click();
+    cy.focused().type(username);
+    cy.get(`[data-testid="owner-${username}"]`).click();
+    cy.focused().blur();
+    cy.contains(username, { matchCase: false }).should("have.length", 1);
+    cy.get('[role="dialog"] button').contains("Add").click();
+    cy.waitTextVisible("Owners Added");
+    cy.contains(username, { matchCase: false }).should("be.visible");
+  });
+
+  it("test User verify group participation", () => {
+    cy.visit("/settings/identities/groups");
+    cy.waitTextVisible("Settings");
+    cy.wait(1000);
+    cy.hideOnboardingTour();
+    cy.clickOptionWithText(`Test group EDITED ${test_id}`);
+    cy.get(".ant-tabs-tab").contains("Members").click();
+    cy.waitTextVisible(username);
+  });
+
+  it("remove group", () => {
+    cy.visit("/settings/identities/groups");
+    cy.waitTextVisible("Settings");
+    cy.wait(1000);
+    cy.get(
+      `[href="/group/urn:li:corpGroup:${test_id}"]`,
+    ).openThreeDotDropdown();
+    cy.clickOptionWithText("Delete");
+    cy.clickOptionWithText("Yes");
+    cy.waitTextVisible("Deleted Group!");
+    cy.ensureTextNotPresent(`Test group EDITED ${test_id}`);
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/siblingsV2/v2_siblings.js b/smoke-test/tests/cypress/cypress/e2e/siblingsV2/v2_siblings.js
new file mode 100644
index 00000000000000..d506b6b7e10d8b
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/siblingsV2/v2_siblings.js
@@ -0,0 +1,153 @@
+describe("siblings", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+    const resizeObserverLoopErrRe = "ResizeObserver loop limit exceeded";
+    cy.on("uncaught:exception", (err) => {
+      if (err.message.includes(resizeObserverLoopErrRe)) {
+        return false;
+      }
+    });
+  });
+
+  it("will merge metadata to non-primary sibling", () => {
+    cy.login();
+    cy.visit("/");
+    cy.skipIntroducePage();
+    cy.visit(
+      "/dataset/urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD)/?is_lineage_mode=false",
+    );
+    // check merged platforms
+    cy.get('[src*="dbtlogo"]').should("exist");
+    cy.get('[src*="bigquerylogo"]').should("exist");
+
+    // check merged schema (from dbt)
+    cy.contains("This is a unique identifier for a customer");
+
+    // check merged profile (from bigquery)
+    cy.contains("Stats").click({ force: true });
+    cy.get('[data-testid="table-stats-rowcount"]').contains("100");
+  });
+
+  it("will merge metadata to primary sibling", () => {
+    cy.login();
+    cy.visit("/");
+    cy.skipIntroducePage();
+    cy.visit(
+      "/dataset/urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.customers,PROD)/?is_lineage_mode=false",
+    );
+
+    // check merged platforms
+    cy.get('[src*="dbtlogo"]').should("exist");
+    cy.get('[src*="bigquerylogo"]').should("exist");
+
+    // check merged schema (from dbt)
+    cy.contains("This is a unique identifier for a customer");
+
+    // check merged profile (from bigquery)
+    cy.contains("Stats").click({ force: true });
+    cy.get('[data-testid="table-stats-rowcount"]').contains("100");
+  });
+
+  it("can view individual nodes", () => {
+    cy.login();
+    cy.visit("/");
+    cy.skipIntroducePage();
+    const resizeObserverLoopErrRe = /^[^(ResizeObserver loop limit exceeded)]/;
+    cy.on("uncaught:exception", (err) => {
+      /* returning false here prevents Cypress from failing the test */
+      if (resizeObserverLoopErrRe.test(err.message)) {
+        return false;
+      }
+    });
+
+    cy.visit(
+      "/dataset/urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.customers,PROD)/?is_lineage_mode=false",
+    );
+
+    // navigate to the bq entity
+    cy.clickOptionWithTestId(
+      "compact-entity-link-urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD)",
+    );
+
+    // check merged platforms is not shown
+    cy.get('[data-testid="entity-header-test-id"]')
+      .contains("dbt & BigQuery")
+      .should("not.exist");
+    cy.get('[src*="bigquerylogo"]').should("exist");
+    cy.get('[src*="bigquerylogo"]').should("exist");
+    // check dbt schema descriptions not shown
+    cy.contains("This is a unique identifier for a customer").should(
+      "not.exist",
+    );
+
+    // check merged profile still there (from bigquery)
+    cy.contains("Stats").click({ force: true });
+    cy.get('[data-testid="table-stats-rowcount"]').contains("100");
+  });
+
+  it("can mutate at individual node or combined node level", () => {
+    cy.login();
+    cy.visit("/");
+    cy.skipIntroducePage();
+    cy.visit(
+      "/dataset/urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.customers,PROD)/?is_lineage_mode=false",
+    );
+
+    // navigate to the bq entity
+    cy.clickOptionWithTestId(
+      "compact-entity-link-urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD)",
+    );
+    cy.contains(".ant-collapse-header-text", "Terms")
+      .parent()
+      .find('[data-testid="AddRoundedIcon"]')
+      .scrollIntoView()
+      .click();
+    cy.selectOptionInTagTermModal("CypressTerm");
+    cy.visit(
+      "/dataset/urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.customers,PROD)/?is_lineage_mode=false",
+    );
+    cy.get("#column-first_name").should("be.visible");
+  });
+
+  it("will combine results in search", () => {
+    cy.login();
+    cy.visit("/");
+    cy.skipIntroducePage();
+    cy.visit("/search?page=1&query=raw_orders");
+    cy.contains("Showing 1 - 2 of ");
+
+    cy.get(".test-search-result").should("have.length", 1);
+    cy.get('[data-testid="browse-platform-BigQuery"]').should("exist");
+    cy.get('[data-testid="browse-platform-dbt"]').should("exist");
+    cy.get('[data-testid^="browse-platform').should("have.length", 2);
+  });
+
+  it.only("separates siblings in lineage", () => {
+    Cypress.on("uncaught:exception", (err, runnable) => {
+      if (err.message.includes("ResizeObserver loop limit exceeded")) {
+        return false;
+      }
+    });
+
+    cy.login();
+    cy.visit("/");
+    cy.skipIntroducePage();
+    cy.goToEntityLineageGraphV2(
+      "dataset",
+      "urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.stg_orders,PROD)",
+    );
+    cy.wait(2000);
+    cy.get(".react-flow__node-lineage-entity").eq(0).click();
+
+    // check all siblings are present
+    cy.get(
+      '[data-testid="lineage-node-urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)"]',
+    ).should("have.length", 1);
+    cy.get(
+      '[data-testid="lineage-node-urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.stg_orders,PROD)"]',
+    ).should("have.length", 1);
+    cy.get(
+      '[data-testid="lineage-node-urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.stg_orders,PROD)"]',
+    ).should("have.length", 1);
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/task_runV2/v2_task_runs.js b/smoke-test/tests/cypress/cypress/e2e/task_runV2/v2_task_runs.js
new file mode 100644
index 00000000000000..b8e64bb153d775
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/task_runV2/v2_task_runs.js
@@ -0,0 +1,46 @@
+describe("task runs", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+  });
+
+  it("can visit dataset with runs aspect and verify the task run is present", () => {
+    cy.visit("/");
+    cy.login();
+    cy.visit(
+      "/dataset/urn:li:dataset:(urn:li:dataPlatform:hive,SampleCypressHiveDataset,PROD)/Runs",
+    );
+
+    // the run data should not be there since the run wrote
+    cy.contains("manual__2022-03-30T11:35:08.970522+00:00");
+    cy.contains("Failed");
+
+    // inputs
+    cy.contains("SampleCypressHiveDataset");
+
+    // outputs
+    cy.contains("fct_cypress_users_created_no_tag");
+    cy.contains("cypress_logging_events");
+
+    // task name
+    cy.contains("User Creations");
+  });
+
+  it("can visit task with runs aspect and verify the task run is present", () => {
+    cy.visit("/");
+    cy.login();
+    cy.visit(
+      "tasks/urn:li:dataJob:(urn:li:dataFlow:(airflow,cypress_dag_abc,PROD),cypress_task_123)/Runs",
+    );
+
+    // Verify the run data is there
+    cy.contains("manual__2022-03-30T11:35:08.970522+00:00");
+    cy.contains("Failed");
+
+    // inputs
+    cy.contains("fct_cypress_users_created_no_tag");
+
+    // outputs
+    cy.contains("SampleCypressHiveDataset");
+    cy.contains("cypress_logging_events");
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/viewV2/v2_manage_views.js b/smoke-test/tests/cypress/cypress/e2e/viewV2/v2_manage_views.js
new file mode 100644
index 00000000000000..26fc1252f5a401
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/viewV2/v2_manage_views.js
@@ -0,0 +1,48 @@
+describe("manage views", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+  });
+  it("go to views settings page, create, edit, make default, delete a view", () => {
+    const viewName = "Test View";
+
+    cy.login();
+    cy.goToViewsSettings();
+    cy.waitTextVisible("Settings");
+    cy.wait(1000);
+    cy.clickOptionWithText("Create new View");
+    cy.get(".ant-input-affix-wrapper > input[type='text']")
+      .first()
+      .type(viewName);
+    cy.clickOptionWithTestId("view-builder-save");
+
+    // Confirm that the test has been created.
+    cy.waitTextVisible("Test View");
+
+    // Now edit the View
+    cy.clickFirstOptionWithTestId("views-table-dropdown");
+    cy.get('[data-testid="view-dropdown-edit"]').click({ force: true });
+    cy.get(".ant-input-affix-wrapper > input[type='text']")
+      .first()
+      .clear()
+      .type("New View Name");
+    cy.clickOptionWithTestId("view-builder-save");
+    cy.waitTextVisible("New View Name");
+
+    // Now make the view the default
+    cy.clickFirstOptionWithTestId("views-table-dropdown");
+    cy.get('[data-testid="view-dropdown-set-user-default"]').click({
+      force: true,
+    });
+
+    // Now unset as the default
+    cy.clickFirstOptionWithTestId("views-table-dropdown");
+    cy.get('[data-testid="view-dropdown-remove-user-default"]').click({
+      force: true,
+    });
+
+    // Now delete the View
+    cy.clickFirstOptionWithTestId("views-table-dropdown");
+    cy.get('[data-testid="view-dropdown-delete"]').click({ force: true });
+    cy.clickOptionWithText("Yes");
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/viewV2/v2_view_select.js b/smoke-test/tests/cypress/cypress/e2e/viewV2/v2_view_select.js
new file mode 100644
index 00000000000000..063cbed3b62aac
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/viewV2/v2_view_select.js
@@ -0,0 +1,96 @@
+function openViewEditDropDownAndClickId(data_id) {
+  cy.get('[data-testid="views-table-dropdown"]').first().click({ force: true });
+  cy.clickOptionWithTestId(data_id);
+}
+
+describe("view select", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(true);
+  });
+
+  it("click view select, create view, clear view, make defaults, clear view", () => {
+    cy.login();
+    const randomNumber = Math.floor(Math.random() * 100000);
+    const viewName = `Test View ${randomNumber}`;
+    const newViewName = `New View Name ${randomNumber}`;
+
+    // Resize Observer Loop warning can be safely ignored - ref. https://github.com/cypress-io/cypress/issues/22113
+    const resizeObserverLoopErrRe = "ResizeObserver loop limit exceeded";
+    cy.on("uncaught:exception", (err) => {
+      if (err.message.includes(resizeObserverLoopErrRe)) {
+        return false;
+      }
+    });
+
+    cy.visit("/");
+    cy.skipIntroducePage();
+    cy.goToStarSearchList();
+    cy.ensureElementPresent("#browse-v2");
+    // Create a View from the select
+    cy.clickOptionWithTestId("views-icon");
+    cy.ensureElementPresent(".select-view-icon");
+    cy.clickOptionWithTestId("AddOutlinedIcon");
+    cy.ensureElementPresent('[data-testid="view-name-input"]');
+    cy.enterTextInTestId("view-name-input", viewName);
+
+    // Add Column Glossary Term Filter
+    cy.clickOptionWithText("Add filter");
+    cy.contains("Column Term").scrollIntoView();
+    cy.clickOptionWithText("Column Term");
+    cy.ensureElementPresent('[placeholder="Search for Column Term"]');
+    cy.get('[data-testid="search-input"]').last().type("CypressColumnInfoType");
+    cy.get(".ant-checkbox").should("be.visible").click();
+    cy.clickOptionWithTestId("update-filters");
+    cy.clickOptionWithText("Save");
+    cy.ensureTextNotPresent("Save");
+    cy.waitTextVisible(viewName);
+
+    // Ensure the View filter has been applied correctly.
+    cy.waitTextVisible("SampleCypressHdfsDataset");
+    cy.waitTextVisible("cypress_logging_events");
+    cy.waitTextVisible("of 3 results");
+    cy.get("[class*=dataset]").should("have.length", 3);
+    cy.get(".ant-btn.ant-btn-default")
+      .siblings(".close-container")
+      .click({ force: true });
+    cy.ensureTextNotPresent("of 3 results");
+
+    // Now edit the view
+    cy.clickOptionWithTestId("views-icon");
+    cy.ensureElementPresent(".select-view-icon");
+    openViewEditDropDownAndClickId("view-dropdown-edit");
+    cy.clickOptionWithTestId("view-name-input").clear().type(newViewName);
+
+    // Update the actual filters by adding another filter
+    cy.clickOptionWithText("Add filter");
+    cy.get(".anticon-file-text").eq(0).scrollIntoView().click();
+    cy.enterTextInTestId("edit-text-input", "log event");
+    cy.clickOptionWithText("Apply");
+    cy.clickOptionWithTestId("view-builder-save");
+    cy.waitTextVisible("cypress_logging_events");
+    cy.waitTextVisible("of 1 result");
+    cy.get("[class*=dataset]").should("have.length", 1);
+    cy.clickOptionWithId("#v2-search-bar-views");
+    openViewEditDropDownAndClickId("view-dropdown-set-user-default");
+    cy.waitTextVisible("of 1 result");
+    cy.get("[class*=dataset]").should("have.length", 1);
+    cy.clickOptionWithId("#v2-search-bar-views");
+    cy.get('[data-testid="CloseIcon"]').last().click({ force: true });
+    cy.clickOptionWithTestId("views-icon");
+    cy.ensureElementPresent(".select-view-icon");
+    openViewEditDropDownAndClickId("view-dropdown-remove-user-default");
+
+    // Now delete the View
+    cy.clickOptionWithId("#v2-search-bar-views");
+    cy.clickOptionWithTestId("views-icon");
+    cy.ensureElementPresent(".select-view-icon");
+    openViewEditDropDownAndClickId("view-dropdown-delete");
+    cy.clickOptionWithText("Yes");
+
+    // Ensure that the view was deleted
+    cy.goToViewsSettings();
+    cy.waitTextVisible("Permissions");
+    cy.ensureTextNotPresent(newViewName);
+    cy.ensureTextNotPresent("of 1 result");
+  });
+});
diff --git a/smoke-test/tests/cypress/cypress/e2e/views/view_select.js b/smoke-test/tests/cypress/cypress/e2e/views/view_select.js
index 09520818a2190b..8e10d676162e3a 100644
--- a/smoke-test/tests/cypress/cypress/e2e/views/view_select.js
+++ b/smoke-test/tests/cypress/cypress/e2e/views/view_select.js
@@ -41,11 +41,11 @@ describe("view select", () => {
     cy.log("Ensure the View filter has been applied correctly.");
     cy.contains("SampleCypressHdfsDataset");
     cy.contains("cypress_logging_events");
-    cy.contains("of 2 results");
+    cy.contains(/Showing 1 - [2-4] of [2-4]/);
 
     cy.log("Clear the selected view");
     cy.clearView(viewName);
-    cy.ensureTextNotPresent("of 2 results");
+    cy.ensureTextNotPresent(/Showing 1 - [2-4] of [2-4]/);
 
     cy.log("Now edit the view");
     openViewEditDropDownAndClickId("view-dropdown-edit");
diff --git a/smoke-test/tests/cypress/cypress/support/commands.js b/smoke-test/tests/cypress/cypress/support/commands.js
index 9b5065a7bdccfc..1771ad9f6f8618 100644
--- a/smoke-test/tests/cypress/cypress/support/commands.js
+++ b/smoke-test/tests/cypress/cypress/support/commands.js
@@ -12,6 +12,7 @@
 // -- This is a parent command --
 
 import dayjs from "dayjs";
+import { aliasQuery, hasOperationName } from "../e2e/utils";
 
 function selectorWithtestId(id) {
   return `[data-testid="${id}"]`;
@@ -21,6 +22,8 @@ export function getTimestampMillisNumDaysAgo(numDays) {
   return dayjs().subtract(numDays, "day").valueOf();
 }
 
+const SKIP_ONBOARDING_TOUR_KEY = "skipOnboardingTour";
+
 Cypress.Commands.add("login", () => {
   cy.request({
     method: "POST",
@@ -30,7 +33,7 @@ Cypress.Commands.add("login", () => {
       password: Cypress.env("ADMIN_PASSWORD"),
     },
     retryOnStatusCodeFailure: true,
-  });
+  }).then(() => localStorage.setItem(SKIP_ONBOARDING_TOUR_KEY, "true"));
 });
 
 Cypress.Commands.add("loginWithCredentials", (username, password) => {
@@ -43,7 +46,8 @@ Cypress.Commands.add("loginWithCredentials", (username, password) => {
     cy.get("input[data-testid=password]").type(Cypress.env("ADMIN_PASSWORD"));
   }
   cy.contains("Sign In").click();
-  cy.contains("Welcome back");
+  cy.get(".ant-avatar-circle").should("be.visible");
+  localStorage.setItem(SKIP_ONBOARDING_TOUR_KEY, "true");
 });
 
 Cypress.Commands.add("deleteUrn", (urn) => {
@@ -81,7 +85,6 @@ Cypress.Commands.add("goToBusinessAttributeList", () => {
 Cypress.Commands.add("goToDomainList", () => {
   cy.visit("/domains");
   cy.waitTextVisible("Domains");
-  cy.waitTextVisible("New Domain");
 });
 
 Cypress.Commands.add("goToViewsSettings", () => {
@@ -99,6 +102,11 @@ Cypress.Commands.add("goToHomePagePostSettings", () => {
   cy.waitTextVisible("Home Page Posts");
 });
 
+Cypress.Commands.add("goToHomePagePostSettingsV2", () => {
+  cy.visit("/settings/posts");
+  cy.waitTestIdVisible("managePostsV2");
+});
+
 Cypress.Commands.add("goToAccessTokenSettings", () => {
   cy.visit("/settings/tokens");
   cy.waitTextVisible("Manage Access Tokens");
@@ -107,11 +115,11 @@ Cypress.Commands.add("goToAccessTokenSettings", () => {
 
 Cypress.Commands.add("goToIngestionPage", () => {
   cy.visit("/ingestion");
-  cy.waitTextVisible("Manage Data Sources");
+  cy.waitTextVisible("Sources");
 });
 
 Cypress.Commands.add("goToDataset", (urn, dataset_name) => {
-  cy.visit(`/dataset/${urn}`);
+  cy.visit(`/dataset/${urn}/`);
   cy.wait(5000);
   cy.waitTextVisible(dataset_name);
 });
@@ -141,6 +149,19 @@ Cypress.Commands.add(
   },
 );
 
+Cypress.Commands.add("goToEntityLineageGraphV2", (entity_type, urn) => {
+  cy.visit(`/${entity_type}/${urn}/Lineage`);
+});
+
+Cypress.Commands.add(
+  "goToEntityLineageGraphV2",
+  (entity_type, urn, start_time_millis, end_time_millis) => {
+    cy.visit(
+      `/${entity_type}/${urn}/Lineage?start_time_millis=${start_time_millis}&end_time_millis=${end_time_millis}`,
+    );
+  },
+);
+
 Cypress.Commands.add("lineageTabClickOnUpstream", () => {
   cy.get(
     '[data-testid="lineage-tab-direction-select-option-downstream"] > b',
@@ -247,6 +268,10 @@ Cypress.Commands.add("ensureTextNotPresent", (text) => {
   cy.contains(text).should("not.exist");
 });
 
+Cypress.Commands.add("ensureElementPresent", (element) => {
+  cy.get(element).should("be.visible");
+});
+
 Cypress.Commands.add("waitTextPresent", (text) => {
   cy.contains(text).should("exist");
   cy.contains(text).should("have.length.above", 0);
@@ -260,6 +285,10 @@ Cypress.Commands.add("waitTextVisible", (text) => {
   return cy.contains(text);
 });
 
+Cypress.Commands.add("waitTestIdVisible", (testId) => {
+  cy.get(`[data-testid="${testId}"]`).should("exist");
+});
+
 Cypress.Commands.add("openMultiSelect", (data_id) => {
   const selector = `${selectorWithtestId(data_id)}`;
   cy.get(
@@ -321,7 +350,7 @@ Cypress.Commands.add("clearView", (viewName) => {
   cy.clickOptionWithTestId("view-select");
   cy.clickOptionWithTestId("view-select-clear");
   cy.get("input[data-testid='search-input']").click();
-  cy.contains(viewName).should("not.be.visible");
+  cy.get("[data-testid='view-select']").should("not.include.text", viewName);
 });
 
 Cypress.Commands.add("addTermToDataset", (urn, dataset_name, term) => {
@@ -400,6 +429,10 @@ Cypress.Commands.add("mouseover", (selector) =>
   cy.get(selector).trigger("mouseover", { force: true }),
 );
 
+Cypress.Commands.add("mouseHoverOnFirstElement", (selector) =>
+  cy.get(selector).first().trigger("mouseover", { force: true }),
+);
+
 Cypress.Commands.add("createUser", (name, password, email) => {
   cy.visit("/settings/identities/users");
   cy.clickOptionWithText("Invite Users");
@@ -415,7 +448,7 @@ Cypress.Commands.add("createUser", (name, password, email) => {
     cy.mouseover("#title").click();
     cy.waitTextVisible("Other").click();
     cy.get("[type=submit]").click();
-    cy.waitTextVisible("Welcome to DataHub");
+    cy.waitTextVisible("Welcome back");
     cy.hideOnboardingTour();
     cy.waitTextVisible(name);
     cy.logout();
@@ -465,6 +498,35 @@ Cypress.Commands.add("createGlossaryTermGroup", (term_group_name) => {
   cy.waitTextVisible(`Created Term Group!`);
 });
 
+const SKIP_INTRODUCE_PAGE_KEY = "skipAcrylIntroducePage";
+
+Cypress.Commands.add("skipIntroducePage", () => {
+  localStorage.setItem(SKIP_INTRODUCE_PAGE_KEY, "true");
+});
+
+Cypress.Commands.add("setIsThemeV2Enabled", (isEnabled) => {
+  // set the theme V2 enabled flag on/off to show the V2 UI or not
+  cy.intercept("POST", "/api/v2/graphql", (req) => {
+    if (hasOperationName(req, "appConfig")) {
+      req.alias = "gqlappConfigQuery";
+
+      req.on("response", (res) => {
+        res.body.data.appConfig.featureFlags.themeV2Enabled = isEnabled;
+        res.body.data.appConfig.featureFlags.themeV2Default = isEnabled;
+      });
+    }
+  });
+});
+
+Cypress.Commands.add("ignoreResizeObserverLoop", () => {
+  const resizeObserverLoopErrRe = "ResizeObserver loop limit exceeded";
+  cy.on("uncaught:exception", (err) => {
+    if (err.message.includes(resizeObserverLoopErrRe)) {
+      return false;
+    }
+  });
+});
+
 //
 //
 // -- This is a child command --
diff --git a/smoke-test/tests/cypress/data.json b/smoke-test/tests/cypress/data.json
index ce61f7c83a0389..8d4ab371d30bf9 100644
--- a/smoke-test/tests/cypress/data.json
+++ b/smoke-test/tests/cypress/data.json
@@ -572,6 +572,272 @@
     },
     "proposedDelta": null
   },
+  {
+    "auditHeader": null,
+    "proposedSnapshot": {
+      "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+        "urn": "urn:li:dataset:(urn:li:dataPlatform:hdfs,SampleCypressHdfsAssertionDataset,PROD)",
+        "aspects": [
+          {
+            "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+              "description": "my assertion dataset",
+              "uri": null,
+              "tags": [],
+              "customProperties": {
+                "encoding": "utf-8"
+              }
+            }
+          },
+          {
+            "com.linkedin.pegasus2avro.common.BrowsePaths": {
+              "paths": ["/prod/hdfs/SampleCypressHdfsAssertionDataset"]
+            }
+          },
+          {
+            "com.linkedin.pegasus2avro.common.Ownership": {
+              "owners": [
+                {
+                  "owner": "urn:li:corpuser:jdoe",
+                  "type": "DATAOWNER",
+                  "source": null
+                },
+                {
+                  "owner": "urn:li:corpuser:datahub",
+                  "type": "DATAOWNER",
+                  "source": null
+                }
+              ],
+              "lastModified": {
+                "time": 1581407189000,
+                "actor": "urn:li:corpuser:jdoe",
+                "impersonator": null
+              }
+            }
+          },
+          {
+            "com.linkedin.pegasus2avro.dataset.UpstreamLineage": {
+              "upstreams": [
+                {
+                  "auditStamp": {
+                    "time": 1581407189000,
+                    "actor": "urn:li:corpuser:jdoe",
+                    "impersonator": null
+                  },
+                  "dataset": "urn:li:dataset:(urn:li:dataPlatform:kafka,SampleCypressKafkaDataset,PROD)",
+                  "type": "TRANSFORMED"
+                }
+              ],
+              "fineGrainedLineages": [
+                {
+                  "upstreamType": "FIELD_SET",
+                  "upstreams": [
+                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:kafka,SampleCypressKafkaDataset,PROD),field_bar)"
+                  ],
+                  "downstreamType": "FIELD",
+                  "downstreams": [
+                    "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hdfs,SampleCypressHdfsAssertionDataset,PROD),shipment_info)"
+                  ],
+                  "confidenceScore": 1.0
+                }
+              ]
+            }
+          },
+          {
+            "com.linkedin.pegasus2avro.common.InstitutionalMemory": {
+              "elements": [
+                {
+                  "url": "https://www.linkedin.com",
+                  "description": "Sample doc",
+                  "createStamp": {
+                    "time": 1581407189000,
+                    "actor": "urn:li:corpuser:jdoe",
+                    "impersonator": null
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "com.linkedin.pegasus2avro.schema.EditableSchemaMetadata": {
+              "created": {
+                "time": 1581407189000,
+                "actor": "urn:li:corpuser:jdoe",
+                "impersonator": null
+              },
+              "lastModified": {
+                "time": 1581407189000,
+                "actor": "urn:li:corpuser:jdoe",
+                "impersonator": null
+              },
+              "deleted": null,
+              "editableSchemaFieldInfo": [
+                {
+                  "fieldPath": "shipment_info",
+                  "globalTags": { "tags": [{ "tag": "urn:li:tag:Legacy" }] },
+                  "glossaryTerms": {
+                    "terms": [
+                      {
+                        "urn": "urn:li:glossaryTerm:CypressNode.CypressColumnInfoType"
+                      }
+                    ],
+                    "auditStamp": {
+                      "time": 0,
+                      "actor": "urn:li:corpuser:jdoe",
+                      "impersonator": null
+                    }
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+              "schemaName": "SampleHdfsAssertionSchema",
+              "platform": "urn:li:dataPlatform:hdfs",
+              "version": 0,
+              "created": {
+                "time": 1581407189000,
+                "actor": "urn:li:corpuser:jdoe",
+                "impersonator": null
+              },
+              "lastModified": {
+                "time": 1581407189000,
+                "actor": "urn:li:corpuser:jdoe",
+                "impersonator": null
+              },
+              "deleted": null,
+              "dataset": null,
+              "cluster": null,
+              "hash": "",
+              "platformSchema": {
+                "com.linkedin.pegasus2avro.schema.KafkaSchema": {
+                  "documentSchema": "{\"type\":\"record\",\"name\":\"SampleHdfsAssertionSchema\",\"namespace\":\"com.linkedin.dataset\",\"doc\":\"Sample HDFS Assertion dataset\",\"fields\":[{\"name\":\"field_foo\",\"type\":[\"string\"]},{\"name\":\"field_bar\",\"type\":[\"boolean\"]}]}"
+                }
+              },
+              "fields": [
+                {
+                  "fieldPath": "shipment_info",
+                  "jsonPath": null,
+                  "nullable": false,
+                  "description": {
+                    "string": "Shipment info description"
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.pegasus2avro.schema.RecordType": {}
+                    }
+                  },
+                  "nativeDataType": "varchar(100)",
+                  "recursive": false
+                },
+                {
+                  "fieldPath": "shipment_info.date",
+                  "jsonPath": null,
+                  "nullable": false,
+                  "description": {
+                    "string": "Shipment info date description"
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.pegasus2avro.schema.DateType": {}
+                    }
+                  },
+                  "nativeDataType": "Date",
+                  "recursive": false
+                },
+                {
+                  "fieldPath": "shipment_info.target",
+                  "jsonPath": null,
+                  "nullable": false,
+                  "description": {
+                    "string": "Shipment info target description"
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.pegasus2avro.schema.StringType": {}
+                    }
+                  },
+                  "nativeDataType": "text",
+                  "recursive": false
+                },
+                {
+                  "fieldPath": "shipment_info.destination",
+                  "jsonPath": null,
+                  "nullable": false,
+                  "description": {
+                    "string": "Shipment info destination description"
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.pegasus2avro.schema.StringType": {}
+                    }
+                  },
+                  "nativeDataType": "varchar(100)",
+                  "recursive": false
+                },
+                {
+                  "fieldPath": "shipment_info.geo_info",
+                  "jsonPath": null,
+                  "nullable": false,
+                  "description": {
+                    "string": "Shipment info geo_info description"
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.pegasus2avro.schema.RecordType": {}
+                    }
+                  },
+                  "nativeDataType": "varchar(100)",
+                  "recursive": false
+                },
+                {
+                  "fieldPath": "shipment_info.geo_info.lat",
+                  "jsonPath": null,
+                  "nullable": false,
+                  "description": {
+                    "string": "Shipment info geo_info lat"
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.pegasus2avro.schema.NumberType": {}
+                    }
+                  },
+                  "nativeDataType": "float",
+                  "recursive": false
+                },
+                {
+                  "fieldPath": "shipment_info.geo_info.lng",
+                  "jsonPath": null,
+                  "nullable": false,
+                  "description": {
+                    "string": "Shipment info geo_info lng"
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.pegasus2avro.schema.NumberType": {}
+                    }
+                  },
+                  "nativeDataType": "float",
+                  "recursive": false
+                }
+              ],
+              "primaryKeys": null,
+              "foreignKeysSpecs": null
+            }
+          },
+          {
+            "com.linkedin.pegasus2avro.common.GlobalTags": {
+              "tags": [
+                { "tag": "urn:li:tag:Cypress" },
+                { "tag": "urn:li:tag:Cypress2" }
+              ]
+            }
+          }
+        ]
+      }
+    },
+    "proposedDelta": null
+  },
   {
     "auditHeader": null,
     "proposedSnapshot": {
@@ -2057,6 +2323,56 @@
     },
     "systemMetadata": null
   },
+  {
+    "auditHeader": null,
+    "entityType": "domain",
+    "entityUrn": "urn:li:domain:testing",
+    "changeType": "UPSERT",
+    "aspectName": "domainProperties",
+    "aspect": {
+      "value": "{\"name\": \"Testing\", \"description\": \"My testing domain\" }",
+      "contentType": "application/json"
+    },
+    "systemMetadata": null
+  },
+  {
+    "auditHeader": null,
+    "entityType": "dashboard",
+    "entityUrn": "urn:li:dashboard:(looker,cypress_baz)",
+    "changeType": "UPSERT",
+    "aspectName": "domains",
+    "aspect": {
+      "value": "{\"domains\": [\"urn:li:domain:testing\"] }",
+      "contentType": "application/json"
+    },
+    "systemMetadata": null
+  },
+  {
+    "auditHeader": null,
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:358c683782c93c2fc2bd4bdd4fdb0154",
+    "entityKeyAspect": null,
+    "changeType": "UPSERT",
+    "aspectName": "assertionInfo",
+    "aspect": {
+      "value": "{\"customProperties\": {\"expectation_suite_name\": \"test_suite\"}, \"type\": \"DATASET\", \"datasetAssertion\": {\"dataset\": \"urn:li:dataset:(urn:li:dataPlatform:hdfs,SampleCypressHdfsAssertionDataset,PROD)\", \"scope\": \"DATASET_COLUMN\", \"fields\": [\"urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hdfs,SampleCypressHdfsAssertionDataset,PROD),field_foo)\"], \"aggregation\": \"IDENTITY\", \"operator\": \"EQUAL_TO\", \"parameters\": {\"value\": {\"value\": \"true\", \"type\": \"UNKNOWN\"} }, \"nativeType\": \"expect_column_values_to_equal\", \"nativeParameters\": {\"column\": \"field_foo\", \"value\": \"true\"}}}",
+      "contentType": "application/json"
+    },
+    "systemMetadata": null
+  },
+  {
+    "auditHeader": null,
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:358c683782c93c2fc2bd4bdd4fdb0154",
+    "entityKeyAspect": null,
+    "changeType": "UPSERT",
+    "aspectName": "assertionRunEvent",
+    "aspect": {
+      "value": "{\"timestampMillis\": 1675155843000, \"partitionSpec\": {\"type\": \"PARTITION\", \"partition\": \"{\\\"category\\\": \\\"catA\\\"}\"}, \"runId\": \"2021-12-28T12:00:00Z\", \"assertionUrn\": \"urn:li:assertion:358c683782c93c2fc2bd4bdd4fdb0154\", \"asserteeUrn\": \"urn:li:dataset:(urn:li:dataPlatform:hdfs,SampleCypressHdfsAssertionDataset,PROD)\", \"batchSpec\": {\"customProperties\": {\"data_asset_name\": \"data__foo1__asset\", \"datasource_name\": \"my_hive_datasource\"}, \"nativeBatchId\": \"c8f12129f2e57412eee5fb8656154d05\", \"limit\": 10}, \"status\": \"COMPLETE\", \"result\": {\"type\": \"SUCCESS\", \"nativeResults\": {}}}",
+      "contentType": "application/json"
+    },
+    "systemMetadata": null
+  },
   {
     "auditHeader": null,
     "entityType": "query",
@@ -2081,6 +2397,56 @@
     },
     "systemMetadata": null
   },
+  {
+    "auditHeader": null,
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:358c683782c93c2fc2bd4bdd4fdb0153",
+    "entityKeyAspect": null,
+    "changeType": "UPSERT",
+    "aspectName": "assertionInfo",
+    "aspect": {
+      "value": "{\"customProperties\": {\"expectation_suite_name\": \"test_suite\"}, \"type\": \"DATASET\", \"datasetAssertion\": {\"dataset\": \"urn:li:dataset:(urn:li:dataPlatform:hdfs,SampleCypressHdfsDataset,PROD)\", \"scope\": \"DATASET_COLUMN\", \"fields\": [\"urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD),field_foo)\"], \"aggregation\": \"IDENTITY\", \"operator\": \"EQUAL_TO\", \"parameters\": {\"value\": {\"value\": \"true\", \"type\": \"UNKNOWN\"} }, \"nativeType\": \"expect_column_values_to_equal\", \"nativeParameters\": {\"column\": \"field_foo\", \"value\": \"true\"}}}",
+      "contentType": "application/json"
+    },
+    "systemMetadata": null
+  },
+  {
+    "auditHeader": null,
+    "entityType": "assertion",
+    "entityUrn": "urn:li:assertion:358c683782c93c2fc2bd4bdd4fdb0153",
+    "entityKeyAspect": null,
+    "changeType": "UPSERT",
+    "aspectName": "assertionRunEvent",
+    "aspect": {
+      "value": "{\"timestampMillis\": 1675155843000, \"partitionSpec\": {\"type\": \"PARTITION\", \"partition\": \"{\\\"category\\\": \\\"catA\\\"}\"}, \"runId\": \"2021-12-28T12:00:00Z\", \"assertionUrn\": \"urn:li:assertion:358c683782c93c2fc2bd4bdd4fdb0153\", \"asserteeUrn\": \"urn:li:dataset:(urn:li:dataPlatform:hdfs,SampleCypressHdfsDataset,PROD)\", \"batchSpec\": {\"customProperties\": {\"data_asset_name\": \"data__foo1__asset\", \"datasource_name\": \"my_hive_datasource\"}, \"nativeBatchId\": \"c8f12129f2e57412eee5fb8656154d05\", \"limit\": 10}, \"status\": \"COMPLETE\", \"result\": {\"type\": \"FAILURE\", \"nativeResults\": {}}}",
+      "contentType": "application/json"
+    },
+    "systemMetadata": null
+  },
+  {
+    "auditHeader": null,
+    "entityType": "incident",
+    "entityUrn": "urn:li:incident:test",
+    "changeType": "UPSERT",
+    "aspectName": "incidentInfo",
+    "aspect": {
+      "value": "{\"entities\":[\"urn:li:dataset:(urn:li:dataPlatform:hdfs,SampleCypressHdfsDataset,PROD)\"],\"created\":{\"actor\":\"urn:li:corpuser:admin\",\"time\":1692301854918},\"description\":\"test\",\"source\":{\"type\":\"MANUAL\"},\"title\":\"test\",\"type\":\"OPERATIONAL\",\"status\":{\"lastUpdated\":{\"actor\":\"urn:li:corpuser:admin\",\"time\":1692301854919},\"state\":\"ACTIVE\"}}",
+      "contentType": "application/json"
+    },
+    "systemMetadata": null
+  },
+  {
+    "auditHeader": null,
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:hdfs,SampleCypressHdfsDataset,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "incidentsSummary",
+    "aspect": {
+      "value": "{\"resolvedIncidentDetails\":[], \"activeIncidentDetails\": [{ \"urn\": \"urn:li:incident:test\", \"type\": \"OPERATIONAL\", \"createdAt\": 0 }]}",
+      "contentType": "application/json"
+    },
+    "systemMetadata": null
+  },
   {
     "auditHeader": null,
     "proposedSnapshot": {
diff --git a/smoke-test/tests/cypress/incidents_test.json b/smoke-test/tests/cypress/incidents_test.json
new file mode 100644
index 00000000000000..fb17215ec58894
--- /dev/null
+++ b/smoke-test/tests/cypress/incidents_test.json
@@ -0,0 +1,155 @@
+[
+  {
+    "auditHeader": null,
+    "proposedSnapshot": {
+      "com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
+        "urn": "urn:li:dataset:(urn:li:dataPlatform:kafka,incidents-sample-dataset,PROD)",
+        "aspects": [
+          {
+            "com.linkedin.pegasus2avro.common.BrowsePaths": {
+              "paths": ["/prod/kafka/SampleKafkaDataset"]
+            }
+          },
+          {
+            "com.linkedin.pegasus2avro.dataset.DatasetProperties": {
+              "description": null,
+              "uri": null,
+              "tags": [],
+              "customProperties": {
+                "prop1": "fakeprop",
+                "prop2": "pikachu"
+              }
+            }
+          },
+          {
+            "com.linkedin.pegasus2avro.common.Ownership": {
+              "owners": [
+                {
+                  "owner": "urn:li:corpuser:jdoe",
+                  "type": "DATAOWNER",
+                  "source": null
+                },
+                {
+                  "owner": "urn:li:corpuser:datahub",
+                  "type": "DATAOWNER",
+                  "source": null
+                }
+              ],
+              "lastModified": {
+                "time": 1581407189000,
+                "actor": "urn:li:corpuser:jdoe",
+                "impersonator": null
+              }
+            }
+          },
+          {
+            "com.linkedin.pegasus2avro.common.InstitutionalMemory": {
+              "elements": [
+                {
+                  "url": "https://www.linkedin.com",
+                  "description": "Sample doc",
+                  "createStamp": {
+                    "time": 1581407189000,
+                    "actor": "urn:li:corpuser:jdoe",
+                    "impersonator": null
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "com.linkedin.pegasus2avro.schema.SchemaMetadata": {
+              "schemaName": "SampleKafkaSchema",
+              "platform": "urn:li:dataPlatform:kafka",
+              "version": 0,
+              "created": {
+                "time": 1581407189000,
+                "actor": "urn:li:corpuser:jdoe",
+                "impersonator": null
+              },
+              "lastModified": {
+                "time": 1581407189000,
+                "actor": "urn:li:corpuser:jdoe",
+                "impersonator": null
+              },
+              "deleted": null,
+              "dataset": null,
+              "cluster": null,
+              "hash": "",
+              "platformSchema": {
+                "com.linkedin.pegasus2avro.schema.KafkaSchema": {
+                  "documentSchema": "{\"type\":\"record\",\"name\":\"SampleKafkaSchema\",\"namespace\":\"com.linkedin.dataset\",\"doc\":\"Sample Kafka dataset\",\"fields\":[{\"name\":\"field_foo\",\"type\":[\"string\"]},{\"name\":\"field_bar\",\"type\":[\"boolean\"]}]}"
+                }
+              },
+              "fields": [
+                {
+                  "fieldPath": "[version=2.0].[type=boolean].field_foo_2",
+                  "jsonPath": null,
+                  "nullable": false,
+                  "description": {
+                    "string": "Foo field description"
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.pegasus2avro.schema.BooleanType": {}
+                    }
+                  },
+                  "nativeDataType": "varchar(100)",
+                  "globalTags": {
+                    "tags": [{ "tag": "urn:li:tag:NeedsDocumentation" }]
+                  },
+                  "recursive": false
+                },
+                {
+                  "fieldPath": "[version=2.0].[type=boolean].field_bar",
+                  "jsonPath": null,
+                  "nullable": false,
+                  "description": {
+                    "string": "Bar field description"
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.pegasus2avro.schema.BooleanType": {}
+                    }
+                  },
+                  "nativeDataType": "boolean",
+                  "recursive": false
+                },
+                {
+                  "fieldPath": "[version=2.0].[key=True].[type=int].id",
+                  "jsonPath": null,
+                  "nullable": false,
+                  "description": {
+                    "string": "Id specifying which partition the message should go to"
+                  },
+                  "type": {
+                    "type": {
+                      "com.linkedin.pegasus2avro.schema.BooleanType": {}
+                    }
+                  },
+                  "nativeDataType": "boolean",
+                  "recursive": false
+                }
+              ],
+              "primaryKeys": null,
+              "foreignKeysSpecs": null
+            }
+          }
+        ]
+      }
+    },
+    "proposedDelta": null
+  },
+  {
+    "auditHeader": null,
+    "entityType": "incident",
+    "entityUrn": "urn:li:incident:test2",
+    "changeType": "UPSERT",
+    "aspectName": "incidentInfo",
+    "aspect": {
+      "value": "{\"type\": \"OPERATIONAL\", \"title\": \"test title\", \"description\": \"test description\", \"entities\": [\"urn:li:dataset:(urn:li:dataPlatform:kafka,incidents-sample-dataset,PROD)\"], \"status\": { \"state\": \"ACTIVE\", \"lastUpdated\": { \"time\": 0, \"actor\": \"urn:li:corpuser:admin\" } }, \"created\": { \"time\": 0, \"actor\": \"urn:li:corpuser:admin\" } }",
+      "contentType": "application/json"
+    },
+    "systemMetadata": null
+  }
+]
diff --git a/smoke-test/tests/cypress/integration_test.py b/smoke-test/tests/cypress/integration_test.py
index 36fdd53a30c361..3eae1622bed3b8 100644
--- a/smoke-test/tests/cypress/integration_test.py
+++ b/smoke-test/tests/cypress/integration_test.py
@@ -21,6 +21,7 @@
 CYPRESS_TEST_DATA_DIR = "tests/cypress"
 
 TEST_DATA_FILENAME = "data.json"
+INCIDENT_DATA_FILENAME = "incidents_test.json"
 TEST_DBT_DATA_FILENAME = "cypress_dbt_data.json"
 TEST_PATCH_DATA_FILENAME = "patch-data.json"
 TEST_ONBOARDING_DATA_FILENAME: str = "onboarding.json"
@@ -140,6 +141,9 @@ def ingest_data(auth_session, graph_client):
         auth_session, f"{CYPRESS_TEST_DATA_DIR}/{TEST_ONBOARDING_DATA_FILENAME}"
     )
     ingest_time_lineage(graph_client)
+    ingest_file_via_rest(
+        auth_session, f"{CYPRESS_TEST_DATA_DIR}/{INCIDENT_DATA_FILENAME}"
+    )
     print_now()
     print("completed ingesting test data")
 
@@ -161,6 +165,9 @@ def ingest_cleanup_data(auth_session, graph_client):
         graph_client, f"{CYPRESS_TEST_DATA_DIR}/{TEST_ONBOARDING_DATA_FILENAME}"
     )
     delete_urns(graph_client, get_time_lineage_urns())
+    delete_urns_from_file(
+        graph_client, f"{CYPRESS_TEST_DATA_DIR}/{INCIDENT_DATA_FILENAME}"
+    )
 
     print_now()
     print("deleting onboarding data file")

From ffce018cea369d7ddd9ea2b0739d8b96923e8469 Mon Sep 17 00:00:00 2001
From: Shirshanka Das <shirshanka@apache.org>
Date: Wed, 29 Jan 2025 17:53:34 -0800
Subject: [PATCH 184/249] =?UTF-8?q?feat(sdk):=20data=20process=20instance?=
 =?UTF-8?q?=20-=20container,=20subtype,=20dataplatformin=E2=80=A6=20(#1247?=
 =?UTF-8?q?6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataprocess/dataprocess_instance.py       | 115 +++++++++-
 .../dataprocess/test_data_process_instance.py | 214 ++++++++++++++++++
 2 files changed, 318 insertions(+), 11 deletions(-)
 create mode 100644 metadata-ingestion/tests/unit/api/entities/dataprocess/test_data_process_instance.py

diff --git a/metadata-ingestion/src/datahub/api/entities/dataprocess/dataprocess_instance.py b/metadata-ingestion/src/datahub/api/entities/dataprocess/dataprocess_instance.py
index d406fa36e00db6..82af9f127cdefa 100644
--- a/metadata-ingestion/src/datahub/api/entities/dataprocess/dataprocess_instance.py
+++ b/metadata-ingestion/src/datahub/api/entities/dataprocess/dataprocess_instance.py
@@ -5,7 +5,7 @@
 from datahub.api.entities.datajob import DataFlow, DataJob
 from datahub.emitter.generic_emitter import Emitter
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
-from datahub.emitter.mcp_builder import DatahubKey
+from datahub.emitter.mcp_builder import ContainerKey, DatahubKey
 from datahub.metadata.com.linkedin.pegasus2avro.dataprocess import (
     DataProcessInstanceInput,
     DataProcessInstanceOutput,
@@ -15,11 +15,15 @@
 )
 from datahub.metadata.schema_classes import (
     AuditStampClass,
+    ContainerClass,
+    DataPlatformInstanceClass,
     DataProcessInstanceRunEventClass,
     DataProcessInstanceRunResultClass,
     DataProcessRunStatusClass,
     DataProcessTypeClass,
+    SubTypesClass,
 )
+from datahub.metadata.urns import DataPlatformInstanceUrn, DataPlatformUrn
 from datahub.utilities.str_enum import StrEnum
 from datahub.utilities.urns.data_flow_urn import DataFlowUrn
 from datahub.utilities.urns.data_job_urn import DataJobUrn
@@ -42,7 +46,7 @@ class InstanceRunResult(StrEnum):
 
 @dataclass
 class DataProcessInstance:
-    """This is a DataProcessInstance class which represent an instance of a DataFlow or DataJob.
+    """This is a DataProcessInstance class which represents an instance of a DataFlow, DataJob, or a standalone process within a Container.
 
     Args:
         id: The id of the dataprocess instance execution.
@@ -71,6 +75,10 @@ class DataProcessInstance:
     _template_object: Optional[Union[DataJob, DataFlow]] = field(
         init=False, default=None, repr=False
     )
+    data_platform_instance: Optional[str] = None
+    subtype: Optional[str] = None
+    container_urn: Optional[str] = None
+    _platform: Optional[str] = field(init=False, repr=False, default=None)
 
     def __post_init__(self):
         self.urn = DataProcessInstanceUrn(
@@ -80,6 +88,28 @@ def __post_init__(self):
                 id=self.id,
             ).guid()
         )
+        self._platform = self.orchestrator
+
+        try:
+            # We first try to create from string assuming its an urn
+            self._platform = str(DataPlatformUrn.from_string(self._platform))
+        except Exception:
+            # If it fails, we assume its an id
+            self._platform = str(DataPlatformUrn(self._platform))
+
+        if self.data_platform_instance is not None:
+            try:
+                # We first try to create from string assuming its an urn
+                self.data_platform_instance = str(
+                    DataPlatformInstanceUrn.from_string(self.data_platform_instance)
+                )
+            except Exception:
+                # If it fails, we assume its an id
+                self.data_platform_instance = str(
+                    DataPlatformInstanceUrn(
+                        platform=self._platform, instance=self.data_platform_instance
+                    )
+                )
 
     def start_event_mcp(
         self, start_timestamp_millis: int, attempt: Optional[int] = None
@@ -269,6 +299,29 @@ def generate_mcp(
         )
         yield mcp
 
+        assert self._platform
+        if self.data_platform_instance:
+            mcp = MetadataChangeProposalWrapper(
+                entityUrn=str(self.urn),
+                aspect=DataPlatformInstanceClass(
+                    platform=self._platform, instance=self.data_platform_instance
+                ),
+            )
+            yield mcp
+
+        if self.subtype:
+            mcp = MetadataChangeProposalWrapper(
+                entityUrn=str(self.urn), aspect=SubTypesClass(typeNames=[self.subtype])
+            )
+            yield mcp
+
+        if self.container_urn:
+            mcp = MetadataChangeProposalWrapper(
+                entityUrn=str(self.urn),
+                aspect=ContainerClass(container=self.container_urn),
+            )
+            yield mcp
+
         yield from self.generate_inlet_outlet_mcp(materialize_iolets=materialize_iolets)
 
     @staticmethod
@@ -309,13 +362,20 @@ def from_datajob(
         clone_outlets: bool = False,
     ) -> "DataProcessInstance":
         """
-        Generates DataProcessInstance from a DataJob
+        Generates a DataProcessInstance from a given DataJob.
 
-        :param datajob: (DataJob) the datajob from generate the DataProcessInstance
-        :param id: (str) the id for the DataProcessInstance
-        :param clone_inlets: (bool) whether to clone datajob's inlets
-        :param clone_outlets: (bool) whether to clone datajob's outlets
-        :return: DataProcessInstance
+        This method creates a DataProcessInstance object using the provided DataJob
+        and assigns it a unique identifier. Optionally, it can clone the inlets and
+        outlets from the DataJob to the DataProcessInstance.
+
+        Args:
+            datajob (DataJob): The DataJob instance from which to generate the DataProcessInstance.
+            id (str): The unique identifier for the DataProcessInstance.
+            clone_inlets (bool, optional): If True, clones the inlets from the DataJob to the DataProcessInstance. Defaults to False.
+            clone_outlets (bool, optional): If True, clones the outlets from the DataJob to the DataProcessInstance. Defaults to False.
+
+        Returns:
+            DataProcessInstance: The generated DataProcessInstance object.
         """
         dpi: DataProcessInstance = DataProcessInstance(
             orchestrator=datajob.flow_urn.orchestrator,
@@ -332,14 +392,47 @@ def from_datajob(
         return dpi
 
     @staticmethod
-    def from_dataflow(dataflow: DataFlow, id: str) -> "DataProcessInstance":
+    def from_container(
+        container_key: ContainerKey,
+        id: str,
+    ) -> "DataProcessInstance":
         """
-        Generates DataProcessInstance from a DataFlow
+        Create a DataProcessInstance that is located within a Container.
+        Use this method when you need to represent a DataProcessInstance that
+        is not an instance of a DataJob or a DataFlow.
+        e.g. If recording an ad-hoc training run that is just associated with an Experiment.
 
-        :param dataflow: (DataFlow) the DataFlow from generate the DataProcessInstance
+        :param container_key: (ContainerKey) the container key to generate the DataProcessInstance
         :param id: (str) the id for the DataProcessInstance
         :return: DataProcessInstance
         """
+        dpi: DataProcessInstance = DataProcessInstance(
+            id=id,
+            orchestrator=DataPlatformUrn.from_string(
+                container_key.platform
+            ).platform_name,
+            template_urn=None,
+            container_urn=container_key.as_urn(),
+        )
+
+        return dpi
+
+    @staticmethod
+    def from_dataflow(dataflow: DataFlow, id: str) -> "DataProcessInstance":
+        """
+        Creates a DataProcessInstance from a given DataFlow.
+
+        This method generates a DataProcessInstance object using the provided DataFlow
+        and a specified id. The DataProcessInstance will inherit properties from the
+        DataFlow such as orchestrator, environment, and template URN.
+
+        Args:
+            dataflow (DataFlow): The DataFlow object from which to generate the DataProcessInstance.
+            id (str): The unique identifier for the DataProcessInstance.
+
+        Returns:
+            DataProcessInstance: The newly created DataProcessInstance object.
+        """
         dpi = DataProcessInstance(
             id=id,
             orchestrator=dataflow.orchestrator,
diff --git a/metadata-ingestion/tests/unit/api/entities/dataprocess/test_data_process_instance.py b/metadata-ingestion/tests/unit/api/entities/dataprocess/test_data_process_instance.py
new file mode 100644
index 00000000000000..04f4754d8e8832
--- /dev/null
+++ b/metadata-ingestion/tests/unit/api/entities/dataprocess/test_data_process_instance.py
@@ -0,0 +1,214 @@
+import time
+import unittest
+from unittest.mock import Mock
+
+import datahub.metadata.schema_classes as models
+from datahub.api.entities.datajob import DataFlow, DataJob
+from datahub.api.entities.dataprocess.dataprocess_instance import (
+    DataProcessInstance,
+    InstanceRunResult,
+)
+from datahub.emitter.mcp_builder import ContainerKey
+from datahub.metadata.com.linkedin.pegasus2avro.dataprocess import RunResultType
+from datahub.metadata.schema_classes import (
+    DataProcessRunStatusClass,
+    DataProcessTypeClass,
+)
+from datahub.metadata.urns import DataFlowUrn, DataJobUrn, DataPlatformUrn, DatasetUrn
+
+
+class TestDataProcessInstance(unittest.TestCase):
+    def setUp(self):
+        # Common test data
+        self.test_id = "test_process_123"
+        self.test_orchestrator = "airflow"
+        self.test_cluster = "prod"
+
+        # Create mock ContainerKey
+        self.mock_container_key = ContainerKey(
+            platform="urn:li:dataPlatform:mlflow", name="test_experiment", env="PROD"
+        )
+
+        # Create mock DataJob
+        self.mock_flow_urn = DataFlowUrn.create_from_ids(
+            orchestrator="airflow", flow_id="test_flow", env="prod"
+        )
+        self.mock_job_urn = DataJobUrn.create_from_ids(
+            job_id="test_job", data_flow_urn=str(self.mock_flow_urn)
+        )
+        self.mock_datajob = DataJob(
+            id="test_job",
+            flow_urn=self.mock_flow_urn,
+            inlets=[
+                DatasetUrn.from_string(
+                    "urn:li:dataset:(urn:li:dataPlatform:hive,test_input,PROD)"
+                )
+            ],
+            outlets=[
+                DatasetUrn.from_string(
+                    "urn:li:dataset:(urn:li:dataPlatform:hive,test_output,PROD)"
+                )
+            ],
+        )
+
+        # Create mock DataFlow
+        self.mock_dataflow = DataFlow(
+            orchestrator="airflow", id="test_flow", env="prod"
+        )
+
+    def test_basic_initialization(self):
+        """Test basic initialization of DataProcessInstance"""
+
+        instance = DataProcessInstance(
+            id=self.test_id,
+            orchestrator=self.test_orchestrator,
+            cluster=self.test_cluster,
+        )
+
+        self.assertEqual(instance.id, self.test_id)
+        self.assertEqual(instance.orchestrator, self.test_orchestrator)
+        self.assertEqual(instance.cluster, self.test_cluster)
+        self.assertEqual(instance.type, DataProcessTypeClass.BATCH_SCHEDULED)
+
+    def test_from_datajob_creation(self):
+        """Test creation of DataProcessInstance from DataJob"""
+
+        instance = DataProcessInstance.from_datajob(
+            datajob=self.mock_datajob,
+            id=self.test_id,
+            clone_inlets=True,
+            clone_outlets=True,
+        )
+
+        self.assertEqual(instance.id, self.test_id)
+        self.assertEqual(instance.orchestrator, "airflow")
+        self.assertEqual(instance.template_urn, self.mock_datajob.urn)
+        self.assertEqual(len(instance.inlets), 1)
+        self.assertEqual(len(instance.outlets), 1)
+
+    def test_from_dataflow_creation(self):
+        """Test creation of DataProcessInstance from DataFlow"""
+
+        instance = DataProcessInstance.from_dataflow(
+            dataflow=self.mock_dataflow, id=self.test_id
+        )
+
+        self.assertEqual(instance.id, self.test_id)
+        self.assertEqual(instance.orchestrator, "airflow")
+        self.assertEqual(instance.template_urn, self.mock_dataflow.urn)
+
+    def test_from_container_creation(self):
+        """Test creation of DataProcessInstance from ContainerKey"""
+
+        instance = DataProcessInstance.from_container(
+            container_key=self.mock_container_key, id=self.test_id
+        )
+
+        self.assertEqual(instance.id, self.test_id)
+        self.assertEqual(instance.orchestrator, "mlflow")  # Platform name from URN
+        self.assertIsNone(
+            instance.template_urn
+        )  # Should be None for container-based instances
+        self.assertEqual(instance.container_urn, self.mock_container_key.as_urn())
+
+        # Verify the platform is set correctly
+        expected_platform = str(
+            DataPlatformUrn.from_string(self.mock_container_key.platform)
+        )
+        self.assertEqual(instance._platform, expected_platform)
+
+    def test_start_event_generation(self):
+        """Test generation of start event MCPs"""
+
+        instance = DataProcessInstance(
+            id=self.test_id, orchestrator=self.test_orchestrator
+        )
+
+        start_time = int(time.time() * 1000)
+        mcps = list(instance.start_event_mcp(start_time, attempt=1))
+
+        self.assertEqual(len(mcps), 1)
+        start_event = mcps[0]
+        assert isinstance(start_event.aspect, models.DataProcessInstanceRunEventClass)
+        self.assertEqual(start_event.aspect.status, DataProcessRunStatusClass.STARTED)
+        self.assertEqual(start_event.aspect.timestampMillis, start_time)
+        self.assertEqual(start_event.aspect.attempt, 1)
+
+    def test_end_event_generation(self):
+        """Test generation of end event MCPs"""
+
+        instance = DataProcessInstance(
+            id=self.test_id, orchestrator=self.test_orchestrator
+        )
+
+        end_time = int(time.time() * 1000)
+        mcps = list(
+            instance.end_event_mcp(
+                end_time, result=InstanceRunResult.SUCCESS, attempt=1
+            )
+        )
+
+        self.assertEqual(len(mcps), 1)
+        end_event = mcps[0]
+        assert isinstance(end_event.aspect, models.DataProcessInstanceRunEventClass)
+        self.assertEqual(end_event.aspect.status, DataProcessRunStatusClass.COMPLETE)
+        self.assertEqual(end_event.aspect.timestampMillis, end_time)
+        assert end_event.aspect.result is not None
+        self.assertEqual(end_event.aspect.result.type, RunResultType.SUCCESS)
+
+    def test_emit_process_with_emitter(self):
+        """Test emitting process events with mock emitter"""
+
+        mock_emitter = Mock()
+        instance = DataProcessInstance(
+            id=self.test_id, orchestrator=self.test_orchestrator
+        )
+
+        # Test emit method
+        instance.emit(mock_emitter)
+        self.assertTrue(mock_emitter.emit.called)
+
+        # Test emit_process_start
+        start_time = int(time.time() * 1000)
+        instance.emit_process_start(mock_emitter, start_time)
+        self.assertTrue(mock_emitter.emit.called)
+
+        # Test emit_process_end
+        end_time = int(time.time() * 1000)
+        instance.emit_process_end(
+            mock_emitter, end_time, result=InstanceRunResult.SUCCESS
+        )
+        self.assertTrue(mock_emitter.emit.called)
+
+    def test_generate_mcp(self):
+        """Test generation of MCPs"""
+
+        instance = DataProcessInstance(
+            id=self.test_id,
+            orchestrator=self.test_orchestrator,
+            properties={"env": "prod"},
+            url="http://test.url",
+        )
+
+        created_time = int(time.time() * 1000)
+        mcps = list(instance.generate_mcp(created_time, materialize_iolets=True))
+
+        # Check if we have the basic MCPs generated
+        self.assertGreaterEqual(
+            len(mcps), 2
+        )  # Should at least have properties and relationships
+
+        # Verify the properties MCP
+        properties_mcp = next(
+            mcp for mcp in mcps if hasattr(mcp.aspect, "customProperties")
+        )
+        assert isinstance(
+            properties_mcp.aspect, models.DataProcessInstancePropertiesClass
+        )
+        self.assertEqual(properties_mcp.aspect.name, self.test_id)
+        self.assertEqual(properties_mcp.aspect.customProperties["env"], "prod")
+        self.assertEqual(properties_mcp.aspect.externalUrl, "http://test.url")
+
+
+if __name__ == "__main__":
+    unittest.main()

From 469e56fab103eaa3ad3862777ad400e72505e3a8 Mon Sep 17 00:00:00 2001
From: Hyejin Yoon <0327jane@gmail.com>
Date: Thu, 30 Jan 2025 13:59:23 +0900
Subject: [PATCH 185/249] docs: add ai integration tutorials and sample scripts
 (#12487)

---
 docs-website/sidebars.js                      |  11 +-
 docs/api/tutorials/ml.md                      | 867 ++++++++++--------
 docs/api/tutorials/ml_feature_store.md        | 505 ++++++++++
 .../examples/ai/dh_ai_client.py               | 446 +++++++++
 .../examples/ai/dh_ai_client_sample.py        | 134 +++
 5 files changed, 1602 insertions(+), 361 deletions(-)
 create mode 100644 docs/api/tutorials/ml_feature_store.md
 create mode 100644 metadata-ingestion/examples/ai/dh_ai_client.py
 create mode 100644 metadata-ingestion/examples/ai/dh_ai_client_sample.py

diff --git a/docs-website/sidebars.js b/docs-website/sidebars.js
index b53a7a4f2be56a..7638db168b641a 100644
--- a/docs-website/sidebars.js
+++ b/docs-website/sidebars.js
@@ -933,7 +933,16 @@ module.exports = {
         "docs/api/tutorials/domains",
         "docs/api/tutorials/forms",
         "docs/api/tutorials/lineage",
-        "docs/api/tutorials/ml",
+        {
+          type: "doc",
+          id: "docs/api/tutorials/ml",
+          label: "AI/ML Integration",
+        },
+        {
+          type: "doc",
+          id: "docs/api/tutorials/ml_feature_store",
+          label: "Feature Store",
+        },
         "docs/api/tutorials/owners",
         "docs/api/tutorials/structured-properties",
         "docs/api/tutorials/tags",
diff --git a/docs/api/tutorials/ml.md b/docs/api/tutorials/ml.md
index e88c941c904670..1a46f48d5aa4be 100644
--- a/docs/api/tutorials/ml.md
+++ b/docs/api/tutorials/ml.md
@@ -1,146 +1,230 @@
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# ML System
+# AI/ML Framework Integration with DataHub
 
-## Why Would You Integrate ML System with DataHub?
+## Why Integrate Your AI/ML System with DataHub?
 
-Machine learning systems have become a crucial feature in modern data stacks.
-However, the relationships between the different components of a machine learning system, such as features, models, and feature tables, can be complex.
-DataHub makes these relationships discoverable and facilitate utilization by other members of the organization.
+As a data practitioner, keeping track of your AI experiments, models, and their relationships can be challenging. 
+DataHub makes this easier by providing a central place to organize and track your AI assets.
 
-For technical details on ML entities, please refer to the following docs:
+This guide will show you how to integrate your AI workflows with DataHub. 
+With integrations for popular ML platforms like MLflow and Amazon SageMaker, DataHub enables you to easily find and share AI models across your organization, track how models evolve over time, and understand how training data connects to each model.
+Most importantly, it enables seamless collaboration on AI projects by making everything discoverable and connected.
 
-- [MlFeature](/docs/generated/metamodel/entities/mlFeature.md)
-- [MlPrimaryKey](/docs/generated/metamodel/entities/mlPrimaryKey.md)
-- [MlFeatureTable](/docs/generated/metamodel/entities/mlFeatureTable.md)
-- [MlModel](/docs/generated/metamodel/entities/mlModel.md)
-- [MlModelGroup](/docs/generated/metamodel/entities/mlModelGroup.md)
+## Goals Of This Guide
 
-### Goal Of This Guide
+In this guide, you'll learn how to:
+- Create your basic AI components (models, experiments, runs)
+- Connect these components to build a complete AI system
+- Track relationships between models, data, and experiments
 
-This guide will show you how to
+## Core AI Concepts
 
-- Create ML entities: MlFeature, MlFeatureTable, MlModel, MlModelGroup, MlPrimaryKey
-- Read ML entities: MlFeature, MlFeatureTable, MlModel, MlModelGroup, MlPrimaryKey
-- Attach MlModel to MlFeature
-- Attach MlFeatures to MlFeatureTable
-- Attached MlFeatures to upstream Datasets that power them
+Here's what you need to know about the key components in DataHub:
 
-## Prerequisites
+- **Experiments** are collections of training runs for the same project, like all attempts to build a churn predictor
+- **Training Runs** are attempts to train a model within an experiment, capturing parameters and results
+- **Model Groups** organize related models together, like all versions of your churn predictor
+- **Models** are successful training runs registered for production use
 
-For this tutorial, you need to deploy DataHub Quickstart and ingest sample data.
-For detailed steps, please refer to [Datahub Quickstart Guide](/docs/quickstart.md).
+<p align="center">
+  <img width="70%" src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/ml/concept-diagram-dh-term.png"/>
+</p>
 
-## Create ML Entities
+The hierarchy works like this:
+1. Every run belongs to an experiment
+2. Successful runs can be registered as models
+3. Models belong to a model group
+4. Not every run becomes a model
 
-### Create MlFeature
+:::note Terminology Mapping
+Different AI platforms (MLflow, Amazon SageMaker) have their own terminology. 
+To keep things consistent, we'll use DataHub's terms throughout this guide.
+Here's how DataHub's terminology maps to these platforms:
 
-An ML Feature represents an instance of a feature that can be used across different machine learning models. Features are organized into Feature Tables to be consumed by machine learning models. For example, if we were modeling features for a Users Feature Table, the Features would be `age`, `sign_up_date`, `active_in_past_30_days` and so forth.Using Features in DataHub allows users to see the sources a feature was generated from and how a feature is used to train models.
+| DataHub | Description                         | MLflow | SageMaker |
+|---------|-------------------------------------|---------|-----------|
+| ML Model Group | Collection of related models        | Model | Model Group |
+| ML Model | Versioned artifact in a model group | Model Version | Model Version |
+| ML Training Run | Single training attempt             | Run | Training Job |
+| ML Experiment | Collection of training runs         | Experiment | Experiment |
+:::
 
-<Tabs>
-<TabItem value="python" label="Python" default>
+For platform-specific details, see our integration guides for [MLflow](/docs/generated/ingestion/sources/mlflow.md) and [Amazon SageMaker](/docs/generated/ingestion/sources/sagemaker.md).
+
+## Basic Setup
+
+To follow this tutorial, you'll need DataHub Quickstart deployed locally.
+For detailed steps, see the [Datahub Quickstart Guide](/docs/quickstart.md).
+
+Next, set up the Python client for DataHub using `DatahubAIClient`defined in [here](https://github.com/datahub-project/datahub/blob/master/metadata-ingestion/examples/ai/dh_ai_client.py).
+
+Create a token in DataHub UI and replace `<your_token>` with your token:
 
 ```python
-{{ inline /metadata-ingestion/examples/library/create_mlfeature.py show_path_as_comment }}
+from dh_ai_client import DatahubAIClient
+
+client = DatahubAIClient(token="<your_token>", server_url="http://localhost:9002")
 ```
 
-Note that when creating a feature, you create upstream lineage to the data warehouse using `sources`.
+:::note Verifying via GraphQL
+Throughout this guide, we'll show how to verify changes using GraphQL queries.
+You can run these queries in the DataHub UI at `https://localhost:9002/api/graphiql`.
+:::
 
-</TabItem>
-</Tabs>
+## Create Simple AI Assets
 
-### Create MlPrimaryKey
+Let's create the basic building blocks of your ML system. These components will help you organize your AI work and make it discoverable by your team.
 
-An ML Primary Key represents a specific element of a Feature Table that indicates what group the other features belong to. For example, if a Feature Table contained features for Users, the ML Primary Key would likely be `user_id` or some similar unique identifier for a user. Using ML Primary Keys in DataHub allow users to indicate how ML Feature Tables are structured.
+### Create a Model Group
+
+A model group contains different versions of a similar model. For example, all versions of your "Customer Churn Predictor" would go in one group.
 
 <Tabs>
-<TabItem value="python" label="Python" default>
+<TabItem value="basic" label="Basic">
+Create a basic model group with just an identifier:
 
 ```python
-{{ inline /metadata-ingestion/examples/library/create_mlprimarykey.py show_path_as_comment }}
+client.create_model_group(
+    group_id="airline_forecast_models_group",
+)
 ```
 
-Note that when creating a primary key, you create upstream lineage to the data warehouse using `sources`.
+</TabItem>
+<TabItem value="advanced" label="Advanced">
+Add rich metadata like descriptions, creation timestamps, and team information:
+
+```python
+client.create_model_group(
+    group_id="airline_forecast_models_group",
+    properties=models.MLModelGroupPropertiesClass(
+        name="Airline Forecast Models Group",
+        description="Group of models for airline passenger forecasting",
+        created=models.TimeStampClass(
+            time=1628580000000, actor="urn:li:corpuser:datahub"
+        ),
+    ),
+)
+```
 
 </TabItem>
 </Tabs>
 
-### Create MlFeatureTable
-
-A feature table represents a group of similar Features that can all be used together to train a model. For example, if there was a Users Feature Table, it would contain documentation around how to use the Users collection of Features and references to each Feature and ML Primary Key contained within it.
+Let's verify that our model group was created:
 
 <Tabs>
-<TabItem value="python" label="Python" default>
+<TabItem value="UI" label="UI">
+See your new model group in the DataHub UI:
 
-```python
-{{ inline /metadata-ingestion/examples/library/create_mlfeature_table.py show_path_as_comment }}
+<p align="center">
+  <img width="70%" src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/ml/model-group-empty.png"/>
+</p>
+</TabItem>
+
+<TabItem value="graphql" label="GraphQL">
+Query your model group to check its properties:
+
+```graphql
+query {
+  mlModelGroup(
+    urn:"urn:li:mlModelGroup:(urn:li:dataPlatform:mlflow,airline_forecast_models_group,PROD)"
+  ) {
+    name
+    description
+  }
+}
 ```
 
-Note that when creating a feature table, you connect the table to its features and primary key using `mlFeatures` and `mlPrimaryKeys`.
+The response will show your model group's details:
+
+```json
+{
+  "data": {
+    "mlModelGroup": {
+      "name": "airline_forecast_models_group",
+      "description": "Group of models for airline passenger forecasting"
+    }
+  }
+}
+```
 
 </TabItem>
 </Tabs>
 
-### Create MlModel
+### Create a Model
 
-An ML Model in Acryl represents an individual version of a trained Machine Learning Model. Another way to think about the ML Model entity is as an istance of a training run. An ML Model entity tracks the exact ML Features used in that instance of training, along with the training results. This entity does not represents all versions of a ML Model. For example, if we train a model for homepage customization on a certain day, that would be a ML Model in DataHub. If you re-train the model the next day off of new data or with different parameters, that would produce a second ML Model entity.
+Next, let's create a specific model version that represents a trained model ready for deployment.
 
 <Tabs>
-<TabItem value="python" label="Python" default>
+<TabItem value="basic" label="Basic">
+Create a model with just the required version:
 
 ```python
-{{ inline /metadata-ingestion/examples/library/create_mlmodel.py show_path_as_comment }}
+client.create_model(
+    model_id="arima_model",
+    version="1.0",
+)
 ```
 
-Note that when creating a model, you link it to a list of features using `mlFeatures`. This indicates how the individual instance of the model was trained.
-Additionally, you can access the relationship to model groups with `groups`. An ML Model is connected to the warehouse tables it depends on via its dependency on the ML Features it reads from.
-
 </TabItem>
-</Tabs>
-
-### Create MlModelGroup
-
-An ML Model Group represents the grouping of all training runs of a single Machine Learning model category. It will store documentation about the group of ML Models, along with references to each individual ML Model instance.
-
-<Tabs>
-<TabItem value="python" label="Python" default>
+<TabItem value="advanced" label="Advanced">
+Include metrics, parameters, and metadata for production use:
 
 ```python
-{{ inline /metadata-ingestion/examples/library/create_mlmodel_group.py show_path_as_comment }}
+client.create_model(
+    model_id="arima_model",
+    properties=models.MLModelPropertiesClass(
+        name="ARIMA Model",
+        description="ARIMA model for airline passenger forecasting",
+        customProperties={"team": "forecasting"},
+        trainingMetrics=[
+            models.MLMetricClass(name="accuracy", value="0.9"),
+            models.MLMetricClass(name="precision", value="0.8"),
+        ],
+        hyperParams=[
+            models.MLHyperParamClass(name="learning_rate", value="0.01"),
+            models.MLHyperParamClass(name="batch_size", value="32"),
+        ],
+        externalUrl="https:localhost:5000",
+        created=models.TimeStampClass(
+            time=1628580000000, actor="urn:li:corpuser:datahub"
+        ),
+        lastModified=models.TimeStampClass(
+            time=1628580000000, actor="urn:li:corpuser:datahub"
+        ),
+        tags=["forecasting", "arima"],
+    ),
+    version="1.0",
+    alias="champion",
+)
 ```
 
 </TabItem>
 </Tabs>
 
-### Expected Outcome of creating entities
+Let's verify our model:
 
-You can search the entities in DataHub UI.
-
-<p align="center">
-  <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/feature-table-created.png"/>
-</p>
+<Tabs>
+<TabItem value="UI" label="UI">
+Check your model's details in the DataHub UI:
 
 <p align="center">
-  <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/model-group-created.png"/>
+  <img width="70%" src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/ml/model-empty.png"/>
 </p>
+</TabItem>
 
-## Read ML Entities
-
-### Read MLFeature
-
-<Tabs>
-<TabItem value="graphql" label="GraphQL" default>
+<TabItem value="graphql" label="GraphQL">
+Query your model's information:
 
-```json
+```graphql
 query {
-  mlFeature(urn: "urn:li:mlFeature:(test_feature_table_all_feature_dtypes,test_BOOL_LIST_feature)"){
+  mlModel(
+    urn:"urn:li:mlModel:(urn:li:dataPlatform:mlflow,arima_model,PROD)"
+  ) {
     name
-    featureNamespace
     description
-    properties {
-      description
-      dataType
+    versionProperties {
       version {
         versionTag
       }
@@ -149,472 +233,535 @@ query {
 }
 ```
 
-Expected response:
+The response will show your model's details:
 
 ```json
 {
   "data": {
-    "mlFeature": {
-      "name": "test_BOOL_LIST_feature",
-      "featureNamespace": "test_feature_table_all_feature_dtypes",
-      "description": null,
-      "properties": {
-        "description": null,
-        "dataType": "SEQUENCE",
-        "version": null
+    "mlModel": {
+      "name": "arima_model",
+      "description": "ARIMA model for airline passenger forecasting",
+      "versionProperties": {
+        "version": {
+          "versionTag": "1.0"
+        }
       }
     }
-  },
-  "extensions": {}
+  }
 }
 ```
 
 </TabItem>
-<TabItem value="curl" label="Curl" default>
+</Tabs>
 
-```json
-curl --location --request POST 'http://localhost:8080/api/graphql' \
---header 'Authorization: Bearer <my-access-token>' \
---header 'Content-Type: application/json' \
---data-raw '{
-    "query": "{ mlFeature(urn: \"urn:li:mlFeature:(test_feature_table_all_feature_dtypes,test_BOOL_LIST_feature)\") { name featureNamespace description properties { description dataType version { versionTag } } } }"
-}'
-```
+### Create an Experiment
 
-Expected response:
+An experiment helps organize multiple training runs for a specific project.
 
-```json
-{
-  "data": {
-    "mlFeature": {
-      "name": "test_BOOL_LIST_feature",
-      "featureNamespace": "test_feature_table_all_feature_dtypes",
-      "description": null,
-      "properties": {
-        "description": null,
-        "dataType": "SEQUENCE",
-        "version": null
-      }
-    }
-  },
-  "extensions": {}
-}
+<Tabs>
+<TabItem value="basic" label="Basic">
+Create a basic experiment:
+
+```python
+client.create_experiment(
+    experiment_id="airline_forecast_experiment",
+)
 ```
 
 </TabItem>
-<TabItem value="python" label="Python">
+<TabItem value="advanced" label="Advanced">
+Add context and metadata:
 
 ```python
-{{ inline /metadata-ingestion/examples/library/read_mlfeature.py show_path_as_comment }}
+client.create_experiment(
+    experiment_id="airline_forecast_experiment",
+    properties=models.ContainerPropertiesClass(
+        name="Airline Forecast Experiment",
+        description="Experiment to forecast airline passenger numbers",
+        customProperties={"team": "forecasting"},
+        created=models.TimeStampClass(
+            time=1628580000000, actor="urn:li:corpuser:datahub"
+        ),
+        lastModified=models.TimeStampClass(
+            time=1628580000000, actor="urn:li:corpuser:datahub"
+        ),
+    ),
+)
 ```
 
 </TabItem>
 </Tabs>
 
-### Read MlPrimaryKey
+Verify your experiment:
 
 <Tabs>
-<TabItem value="graphql" label="GraphQL" default>
+<TabItem value="UI" label="UI">
+See your experiment's details in the UI:
 
-```json
+<p align="center">
+  <img width="70%" src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/ml/experiment-empty.png"/>
+</p>
+</TabItem>
+
+<TabItem value="graphql" label="GraphQL">
+Query your experiment's information:
+
+```graphql
 query {
-  mlPrimaryKey(urn: "urn:li:mlPrimaryKey:(user_features,user_id)"){
+  container(
+    urn:"urn:li:container:airline_forecast_experiment"
+  ) {
     name
-    featureNamespace
     description
-    dataType
     properties {
-      description
-      dataType
-      version {
-        versionTag
-      }
+      customProperties
     }
   }
 }
 ```
 
-Expected response:
+Check the response:
 
 ```json
 {
   "data": {
-    "mlPrimaryKey": {
-      "name": "user_id",
-      "featureNamespace": "user_features",
-      "description": "User's internal ID",
-      "dataType": "ORDINAL",
+    "container": {
+      "name": "Airline Forecast Experiment",
+      "description": "Experiment to forecast airline passenger numbers",
       "properties": {
-        "description": "User's internal ID",
-        "dataType": "ORDINAL",
-        "version": null
+        "customProperties": {
+          "team": "forecasting"
+        }
       }
     }
-  },
-  "extensions": {}
+  }
 }
 ```
 
 </TabItem>
-<TabItem value="curl" label="Curl" default>
+</Tabs>
 
-```json
-curl --location --request POST 'http://localhost:8080/api/graphql' \
---header 'Authorization: Bearer <my-access-token>' \
---header 'Content-Type: application/json' \
---data-raw '{
-    "query": "query {  mlPrimaryKey(urn: \"urn:li:mlPrimaryKey:(user_features,user_id)\"){    name    featureNamespace    description    dataType    properties {      description      dataType      version {        versionTag      }    }  }}"
-}'
-```
+### Create a Training Run
 
-Expected response:
+A training run captures all details about a specific model training attempt.
 
-```json
-{
-  "data": {
-    "mlPrimaryKey": {
-      "name": "user_id",
-      "featureNamespace": "user_features",
-      "description": "User's internal ID",
-      "dataType": "ORDINAL",
-      "properties": {
-        "description": "User's internal ID",
-        "dataType": "ORDINAL",
-        "version": null
-      }
-    }
-  },
-  "extensions": {}
-}
+<Tabs>
+<TabItem value="basic" label="Basic">
+Create a basic training run:
+
+```python
+client.create_training_run(
+    run_id="simple_training_run_4",
+)
 ```
 
 </TabItem>
-<TabItem value="python" label="Python">
+<TabItem value="advanced" label="Advanced">
+Include metrics, parameters, and other important metadata:
 
 ```python
-{{ inline /metadata-ingestion/examples/library/read_mlprimarykey.py show_path_as_comment }}
+client.create_training_run(
+    run_id="simple_training_run_4",
+    properties=models.DataProcessInstancePropertiesClass(
+        name="Simple Training Run 4",
+        created=models.AuditStampClass(
+            time=1628580000000, actor="urn:li:corpuser:datahub"
+        ),
+        customProperties={"team": "forecasting"},
+    ),
+    training_run_properties=models.MLTrainingRunPropertiesClass(
+        id="simple_training_run_4",
+        outputUrls=["s3://my-bucket/output"],
+        trainingMetrics=[models.MLMetricClass(name="accuracy", value="0.9")],
+        hyperParams=[models.MLHyperParamClass(name="learning_rate", value="0.01")],
+        externalUrl="https:localhost:5000",
+    ),
+    run_result=RunResultType.FAILURE,
+    start_timestamp=1628580000000,
+    end_timestamp=1628580001000,
+)
 ```
 
 </TabItem>
 </Tabs>
 
-### Read MLFeatureTable
+Verify your training run:
 
 <Tabs>
-<TabItem value="graphql" label="GraphQL" default>
+<TabItem value="UI" label="UI">
+View the run details in the UI:
 
-```json
+<p align="center">
+  <img width="70%" src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/ml/run-empty.png"/>
+</p>
+</TabItem>
+
+<TabItem value="graphql" label="GraphQL">
+Query your training run:
+
+```graphql
 query {
-  mlFeatureTable(urn: "urn:li:mlFeatureTable:(urn:li:dataPlatform:feast,test_feature_table_all_feature_dtypes)"){
+  dataProcessInstance(
+    urn:"urn:li:dataProcessInstance:simple_training_run_4"
+  ) {
     name
-    description
-    platform {
-      name
+    created {
+      time
     }
     properties {
-      description
-      mlFeatures {
-        name
-      }
+      customProperties
     }
   }
 }
 ```
 
-Expected Response:
+Check the response:
 
 ```json
 {
   "data": {
-    "mlFeatureTable": {
-      "name": "test_feature_table_all_feature_dtypes",
-      "description": null,
-      "platform": {
-        "name": "feast"
+    "dataProcessInstance": {
+      "name": "Simple Training Run 4",
+      "created": {
+        "time": 1628580000000
       },
       "properties": {
-        "description": null,
-        "mlFeatures": [
-          {
-            "name": "test_BOOL_LIST_feature"
-          },
-          ...{
-            "name": "test_STRING_feature"
-          }
-        ]
+        "customProperties": {
+          "team": "forecasting"
+        }
       }
     }
-  },
-  "extensions": {}
+  }
 }
 ```
 
 </TabItem>
-<TabItem value="curl" label="Curl">
+</Tabs>
 
-```json
-curl --location --request POST 'http://localhost:8080/api/graphql' \
---header 'Authorization: Bearer <my-access-token>' \
---header 'Content-Type: application/json' \
---data-raw '{
-    "query": "{ mlFeatureTable(urn: \"urn:li:mlFeatureTable:(urn:li:dataPlatform:feast,test_feature_table_all_feature_dtypes)\") { name description platform { name } properties { description mlFeatures { name } } } }"
-}'
-```
+## Define Entity Relationships
 
-Expected Response:
+Now let's connect these components to create a comprehensive ML system. These connections enable you to track model lineage, monitor model evolution, understand dependencies, and search effectively across your ML assets.
 
-```json
-{
-  "data": {
-    "mlFeatureTable": {
-      "name": "test_feature_table_all_feature_dtypes",
-      "description": null,
-      "platform": {
-        "name": "feast"
-      },
-      "properties": {
-        "description": null,
-        "mlFeatures": [
-          {
-            "name": "test_BOOL_LIST_feature"
-          },
-          ...{
-            "name": "test_STRING_feature"
-          }
-        ]
-      }
-    }
-  },
-  "extensions": {}
-}
-```
+### Add Model To Model Group
 
-</TabItem>
-<TabItem value="python" label="Python">
+Connect your model to its group:
 
 ```python
-{{ inline /metadata-ingestion/examples/library/read_mlfeature_table.py show_path_as_comment }}
+client.add_model_to_model_group(model_urn=model_urn, group_urn=model_group_urn)
 ```
 
-</TabItem>
-</Tabs>
+<Tabs>
+<TabItem value="UI" label="UI">
 
-### Read MLModel
+View model versions in the **Model Group** under the **Models** section:
 
-<Tabs>
-<TabItem value="graphql" label="GraphQL" default>
+<p align="center">
+  <img width="70%" src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/ml/model-group-with-model.png"/>
+</p>
 
-```json
+Find group information in the **Model** page under the **Group** tab:
+<p align="center">
+  <img width="70%" src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/ml/model-with-model-group.png"/>
+</p>
+</TabItem>
+
+<TabItem value="graphql" label="GraphQL">
+Query the model-group relationship:
+
+```graphql
 query {
-  mlModel(urn: "urn:li:mlModel:(urn:li:dataPlatform:science,scienceModel,PROD)"){
+  mlModel(
+    urn:"urn:li:mlModel:(urn:li:dataPlatform:mlflow,arima_model,PROD)"
+  ) {
     name
-    description
     properties {
-      description
-      version
-      type
-      mlFeatures
       groups {
         urn
-        name
+        properties {
+          name
+        }
       }
     }
   }
 }
 ```
 
-Expected Response:
+Check the response:
 
 ```json
 {
   "data": {
     "mlModel": {
-      "name": "scienceModel",
-      "description": "A sample model for predicting some outcome.",
+      "name": "arima_model",
       "properties": {
-        "description": "A sample model for predicting some outcome.",
-        "version": null,
-        "type": "Naive Bayes classifier",
-        "mlFeatures": null,
-        "groups": []
+        "groups": [
+          {
+            "urn": "urn:li:mlModelGroup:(urn:li:dataPlatform:mlflow,airline_forecast_model_group,PROD)",
+            "properties": {
+              "name": "Airline Forecast Model Group"
+            }
+          }
+        ]
       }
     }
-  },
-  "extensions": {}
+  }
 }
 ```
 
 </TabItem>
-<TabItem value="curl" label="Curl" default>
+</Tabs>
 
-```json
-curl --location --request POST 'http://localhost:8080/api/graphql' \
---header 'Authorization: Bearer <my-access-token>' \
---header 'Content-Type: application/json' \
---data-raw '{
-    "query": "{ mlModel(urn: \"urn:li:mlModel:(urn:li:dataPlatform:science,scienceModel,PROD)\") { name description properties { description version type mlFeatures groups { urn name } } } }"
-}'
-```
+### Add Run To Experiment
 
-Expected Response:
+Connect a training run to its experiment:
 
-```json
-{
-  "data": {
-    "mlModel": {
-      "name": "scienceModel",
-      "description": "A sample model for predicting some outcome.",
-      "properties": {
-        "description": "A sample model for predicting some outcome.",
-        "version": null,
-        "type": "Naive Bayes classifier",
-        "mlFeatures": null,
-        "groups": []
-      }
-    }
-  },
-  "extensions": {}
-}
+```python
+client.add_run_to_experiment(run_urn=run_urn, experiment_urn=experiment_urn)
 ```
 
-</TabItem>
-<TabItem value="python" label="Python">
+<Tabs>
+<TabItem value="UI" label="UI">
 
-```python
-{{ inline /metadata-ingestion/examples/library/read_mlmodel.py show_path_as_comment }}
-```
+Find your runs in the **Experiment** page under the **Entities** tab:
 
-</TabItem>
-</Tabs>
+<p align="center">
+  <img width="70%" src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/ml/experiment-with-run.png"/>
+</p>
 
-### Read MLModelGroup
+See the experiment details in the **Run** page:
+<p align="center">
+  <img width="40%" src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/ml/run-with-experiment.png"/>
+</p>
+</TabItem>
 
-<Tabs>
-<TabItem value="graphql" label="GraphQL" default>
+<TabItem value="graphql" label="GraphQL">
+Query the run-experiment relationship:
 
-```json
+```graphql
 query {
-  mlModelGroup(urn: "urn:li:mlModelGroup:(urn:li:dataPlatform:science,my-model-group,PROD)"){
+  dataProcessInstance(
+    urn:"urn:li:dataProcessInstance:simple_training_run"
+  ) {
     name
-    description
-    platform {
-      name
-    }
-    properties {
-      description
+    parentContainers {
+      containers {
+        urn
+        properties {
+          name
+        }
+      }
     }
   }
 }
 ```
 
-Expected Response: (Note that this entity does not exist in the sample ingestion and you might want to create this entity first.)
+View the relationship details:
 
 ```json
 {
   "data": {
-    "mlModelGroup": {
-      "name": "my-model-group",
-      "description": "my model group",
-      "platform": {
-        "name": "science"
-      },
-      "properties": {
-        "description": "my model group"
+    "dataProcessInstance": {
+      "name": "Simple Training Run",
+      "parentContainers": {
+        "containers": [
+          {
+            "urn": "urn:li:container:airline_forecast_experiment",
+            "properties": {
+              "name": "Airline Forecast Experiment"
+            }
+          }
+        ]
       }
     }
-  },
-  "extensions": {}
+  }
 }
 ```
 
 </TabItem>
-<TabItem value="curl" label="Curl">
+</Tabs>
 
-```json
-curl --location --request POST 'http://localhost:8080/api/graphql' \
---header 'Authorization: Bearer <my-access-token>' \
---header 'Content-Type: application/json' \
---data-raw '{
-    "query": "{ mlModelGroup(urn: \"urn:li:mlModelGroup:(urn:li:dataPlatform:science,my-model-group,PROD)\") { name description platform { name } properties { description } } }"
-}'
+### Add Run To Model
+
+Connect a training run to its resulting model:
+
+```python
+client.add_run_to_model(model_urn=model_urn, run_urn=run_urn)
+```
+
+This relationship enables you to:
+- Track which runs produced each model
+- Understand model provenance
+- Debug model issues
+- Monitor model evolution
+
+<Tabs>
+<TabItem value="UI" label="UI">
+
+Find the source run in the **Model** page under the **Summary** tab:
+
+<p align="center">
+  <img width="70%" src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/ml/model-with-source-run.png"/>
+</p>
+
+See related models in the **Run** page under the **Lineage** tab:
+
+<p align="center">
+  <img width="70%" src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/ml/run-lineage-model.png"/>
+</p>
+<p align="center">
+  <img width="50%" src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/ml/run-lineage-model-graph.png"/>
+</p>
+
+</TabItem>
+
+<TabItem value="graphql" label="GraphQL">
+Query the model's training jobs:
+
+```graphql
+query {
+  mlModel(
+    urn:"urn:li:mlModel:(urn:li:dataPlatform:mlflow,arima_model,PROD)"
+  ) {
+    name
+    properties {
+      mlModelLineageInfo {
+        trainingJobs
+      }
+    }
+  }
+}
 ```
 
-Expected Response: (Note that this entity does not exist in the sample ingestion and you might want to create this entity first.)
+View the relationship:
 
 ```json
 {
   "data": {
-    "mlModelGroup": {
-      "name": "my-model-group",
-      "description": "my model group",
-      "platform": {
-        "name": "science"
-      },
+    "mlModel": {
+      "name": "arima_model",
       "properties": {
-        "description": "my model group"
+        "mlModelLineageInfo": {
+          "trainingJobs": [
+            "urn:li:dataProcessInstance:simple_training_run_test"
+          ]
+        }
       }
     }
-  },
-  "extensions": {}
+  }
 }
 ```
 
 </TabItem>
-<TabItem value="python" label="Python">
+</Tabs>
 
-```python
-{{ inline /metadata-ingestion/examples/library/read_mlmodel_group.py show_path_as_comment }}
-```
+### Add Run To Model Group
 
-</TabItem>
-</Tabs>
+Create a direct connection between a run and a model group:
 
-## Add ML Entities
+```python
+client.add_run_to_model_group(model_group_urn=model_group_urn, run_urn=run_urn)
+```
 
-### Add MlFeature to MlFeatureTable
+This connection lets you:
+- View model groups in the run's lineage
+- Query training jobs at the group level
+- Track training history for model families
 
 <Tabs>
-<TabItem value="python" label="Python">
+<TabItem value="UI" label="UI">
 
-```python
-{{ inline /metadata-ingestion/examples/library/add_mlfeature_to_mlfeature_table.py show_path_as_comment }}
-```
+See model groups in the **Run** page under the **Lineage** tab:
 
+<p align="center">
+  <img width="70%" src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/ml/run-lineage-model-group.png"/>
+</p>
+<p align="center">
+  <img width="50%" src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/ml/run-lineage-model-group-graph.png"/>
+</p>
 </TabItem>
-</Tabs>
 
-### Add MlFeature to MLModel
+<TabItem value="graphql" label="GraphQL">
+Query the model group's training jobs:
 
-<Tabs>
-<TabItem value="python" label="Python">
+```graphql
+query {
+  mlModelGroup(
+    urn:"urn:li:mlModelGroup:(urn:li:dataPlatform:mlflow,airline_forecast_model_group,PROD)"
+  ) {
+    name
+    properties {
+      mlModelLineageInfo {
+        trainingJobs
+      }
+    }
+  }
+}
+```
 
-```python
-{{ inline /metadata-ingestion/examples/library/add_mlfeature_to_mlmodel.py show_path_as_comment }}
+Check the relationship:
+
+```json
+{
+  "data": {
+    "mlModelGroup": {
+      "name": "airline_forecast_model_group",
+      "properties": {
+        "mlModelLineageInfo": {
+          "trainingJobs": [
+            "urn:li:dataProcessInstance:simple_training_run_test"
+          ]
+        }
+      }
+    }
+  }
+}
 ```
 
 </TabItem>
 </Tabs>
 
-### Add MLGroup To MLModel
+### Add Dataset To Run
 
-<Tabs>
-<TabItem value="python" label="Python">
+Track input and output datasets for your training runs:
 
 ```python
-{{ inline /metadata-ingestion/examples/library/add_mlgroup_to_mlmodel.py show_path_as_comment }}
-```
+client.add_input_datasets_to_run(
+    run_urn=run_urn, 
+    dataset_urns=[str(input_dataset_urn)]
+)
 
-</TabItem>
-</Tabs>
-
-### Expected Outcome of Adding ML Entities
+client.add_output_datasets_to_run(
+    run_urn=run_urn, 
+    dataset_urns=[str(output_dataset_urn)]
+)
+```
 
-You can access to `Features` or `Group` Tab of each entity to view the added entities.
+These connections help you:
+- Track data lineage
+- Understand data dependencies
+- Ensure reproducibility
+- Monitor data quality impacts
 
+Find dataset relationships in the **Lineage** tab of either the **Dataset** or **Run** page:
 <p align="center">
-  <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/feature-added-to-model.png"/>
+  <img width="70%" src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/ml/run-lineage-dataset-graph.png"/>
 </p>
 
+## Full Overview
+
+Here's your complete ML system with all components connected:
+
 <p align="center">
-  <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/model-group-added-to-model.png"/>
+  <img width="70%" src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/ml/lineage-full.png"/>
 </p>
+
+You now have a complete lineage view of your ML assets, from training data through runs to production models!
+
+You can check out the full code for this tutorial [here](https://github.com/datahub-project/datahub/blob/master/metadata-ingestion/examples/ai/dh_ai_client_sample.py).
+## What's Next?
+
+To see these integrations in action:
+- Watch our [Townhall demo](https://youtu.be/_WUoVqkF2Zo?feature=shared&t=1932) showcasing the MLflow integration
+- Explore our detailed documentation:
+  - [MLflow Integration Guide](/docs/generated/ingestion/sources/mlflow.md)
+  - [Amazon SageMaker Integration Guide](/docs/generated/ingestion/sources/sagemaker.md)
\ No newline at end of file
diff --git a/docs/api/tutorials/ml_feature_store.md b/docs/api/tutorials/ml_feature_store.md
new file mode 100644
index 00000000000000..ef84f19b03fc5f
--- /dev/null
+++ b/docs/api/tutorials/ml_feature_store.md
@@ -0,0 +1,505 @@
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# Feature Store Integration With DataHub
+
+## Why Would You Integrate Feature Store with DataHub?
+
+Feature Store is a data management layer that stores, organizes, and manages features for machine learning models. It is a centralized repository for features that can be used across different AI/ML models. 
+By integrating Feature Store with DataHub, you can track the lineage of features used in AI/ML models, understand how features are generated, and how they are used to train models.
+
+For technical details on feature store entities, please refer to the following docs:
+
+- [MlFeature](/docs/generated/metamodel/entities/mlFeature.md)
+- [MlPrimaryKey](/docs/generated/metamodel/entities/mlPrimaryKey.md)
+- [MlFeatureTable](/docs/generated/metamodel/entities/mlFeatureTable.md)
+
+### Goal Of This Guide
+
+This guide will show you how to
+
+- Create feature store entities: MlFeature, MlFeatureTable, MlPrimaryKey
+- Read feature store entities: MlFeature, MlFeatureTable, MlPrimaryKey
+- Attach MlModel to MlFeature
+- Attach MlFeatures to MlFeatureTable
+- Attached MlFeatures to upstream Datasets that power them
+
+## Prerequisites
+
+For this tutorial, you need to deploy DataHub Quickstart and ingest sample data.
+For detailed steps, please refer to [Datahub Quickstart Guide](/docs/quickstart.md).
+
+## Create ML Entities
+
+:::note 
+For creating MLModels and MLGroups, please refer to [AI/ML Integration Guide](/docs/api/tutorials/ml.md).
+:::
+
+### Create MlFeature
+
+An ML Feature represents an instance of a feature that can be used across different machine learning models. Features are organized into Feature Tables to be consumed by machine learning models. For example, if we were modeling features for a Users Feature Table, the Features would be `age`, `sign_up_date`, `active_in_past_30_days` and so forth.Using Features in DataHub allows users to see the sources a feature was generated from and how a feature is used to train models.
+
+<Tabs>
+<TabItem value="python" label="Python" default>
+
+```python
+{{ inline /metadata-ingestion/examples/library/create_mlfeature.py show_path_as_comment }}
+```
+
+Note that when creating a feature, you create upstream lineage to the data warehouse using `sources`.
+
+</TabItem>
+</Tabs>
+
+### Create MlPrimaryKey
+
+An ML Primary Key represents a specific element of a Feature Table that indicates what group the other features belong to. For example, if a Feature Table contained features for Users, the ML Primary Key would likely be `user_id` or some similar unique identifier for a user. Using ML Primary Keys in DataHub allow users to indicate how ML Feature Tables are structured.
+
+<Tabs>
+<TabItem value="python" label="Python" default>
+
+```python
+{{ inline /metadata-ingestion/examples/library/create_mlprimarykey.py show_path_as_comment }}
+```
+
+Note that when creating a primary key, you create upstream lineage to the data warehouse using `sources`.
+
+</TabItem>
+</Tabs>
+
+### Create MlFeatureTable
+
+A feature table represents a group of similar Features that can all be used together to train a model. For example, if there was a Users Feature Table, it would contain documentation around how to use the Users collection of Features and references to each Feature and ML Primary Key contained within it.
+
+<Tabs>
+<TabItem value="python" label="Python" default>
+
+```python
+{{ inline /metadata-ingestion/examples/library/create_mlfeature_table.py show_path_as_comment }}
+```
+
+Note that when creating a feature table, you connect the table to its features and primary key using `mlFeatures` and `mlPrimaryKeys`.
+
+</TabItem>
+</Tabs>
+
+
+### Expected Outcome of creating entities
+
+You can search the entities in DataHub UI.
+
+<p align="center">
+  <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/feature-table-created.png"/>
+</p>
+
+## Read ML Entities
+
+### Read MLFeature
+
+<Tabs>
+<TabItem value="graphql" label="GraphQL" default>
+
+```json
+query {
+  mlFeature(urn: "urn:li:mlFeature:(test_feature_table_all_feature_dtypes,test_BOOL_LIST_feature)"){
+    name
+    featureNamespace
+    description
+    properties {
+      description
+      dataType
+      version {
+        versionTag
+      }
+    }
+  }
+}
+```
+
+Expected response:
+
+```json
+{
+  "data": {
+    "mlFeature": {
+      "name": "test_BOOL_LIST_feature",
+      "featureNamespace": "test_feature_table_all_feature_dtypes",
+      "description": null,
+      "properties": {
+        "description": null,
+        "dataType": "SEQUENCE",
+        "version": null
+      }
+    }
+  },
+  "extensions": {}
+}
+```
+
+</TabItem>
+<TabItem value="curl" label="Curl" default>
+
+```json
+curl --location --request POST 'http://localhost:8080/api/graphql' \
+--header 'Authorization: Bearer <my-access-token>' \
+--header 'Content-Type: application/json' \
+--data-raw '{
+    "query": "{ mlFeature(urn: \"urn:li:mlFeature:(test_feature_table_all_feature_dtypes,test_BOOL_LIST_feature)\") { name featureNamespace description properties { description dataType version { versionTag } } } }"
+}'
+```
+
+Expected response:
+
+```json
+{
+  "data": {
+    "mlFeature": {
+      "name": "test_BOOL_LIST_feature",
+      "featureNamespace": "test_feature_table_all_feature_dtypes",
+      "description": null,
+      "properties": {
+        "description": null,
+        "dataType": "SEQUENCE",
+        "version": null
+      }
+    }
+  },
+  "extensions": {}
+}
+```
+
+</TabItem>
+<TabItem value="python" label="Python">
+
+```python
+{{ inline /metadata-ingestion/examples/library/read_mlfeature.py show_path_as_comment }}
+```
+
+</TabItem>
+</Tabs>
+
+### Read MlPrimaryKey
+
+<Tabs>
+<TabItem value="graphql" label="GraphQL" default>
+
+```json
+query {
+  mlPrimaryKey(urn: "urn:li:mlPrimaryKey:(user_features,user_id)"){
+    name
+    featureNamespace
+    description
+    dataType
+    properties {
+      description
+      dataType
+      version {
+        versionTag
+      }
+    }
+  }
+}
+```
+
+Expected response:
+
+```json
+{
+  "data": {
+    "mlPrimaryKey": {
+      "name": "user_id",
+      "featureNamespace": "user_features",
+      "description": "User's internal ID",
+      "dataType": "ORDINAL",
+      "properties": {
+        "description": "User's internal ID",
+        "dataType": "ORDINAL",
+        "version": null
+      }
+    }
+  },
+  "extensions": {}
+}
+```
+
+</TabItem>
+<TabItem value="curl" label="Curl" default>
+
+```json
+curl --location --request POST 'http://localhost:8080/api/graphql' \
+--header 'Authorization: Bearer <my-access-token>' \
+--header 'Content-Type: application/json' \
+--data-raw '{
+    "query": "query {  mlPrimaryKey(urn: \"urn:li:mlPrimaryKey:(user_features,user_id)\"){    name    featureNamespace    description    dataType    properties {      description      dataType      version {        versionTag      }    }  }}"
+}'
+```
+
+Expected response:
+
+```json
+{
+  "data": {
+    "mlPrimaryKey": {
+      "name": "user_id",
+      "featureNamespace": "user_features",
+      "description": "User's internal ID",
+      "dataType": "ORDINAL",
+      "properties": {
+        "description": "User's internal ID",
+        "dataType": "ORDINAL",
+        "version": null
+      }
+    }
+  },
+  "extensions": {}
+}
+```
+
+</TabItem>
+<TabItem value="python" label="Python">
+
+```python
+{{ inline /metadata-ingestion/examples/library/read_mlprimarykey.py show_path_as_comment }}
+```
+
+</TabItem>
+</Tabs>
+
+### Read MLFeatureTable
+
+<Tabs>
+<TabItem value="graphql" label="GraphQL" default>
+
+```json
+query {
+  mlFeatureTable(urn: "urn:li:mlFeatureTable:(urn:li:dataPlatform:feast,test_feature_table_all_feature_dtypes)"){
+    name
+    description
+    platform {
+      name
+    }
+    properties {
+      description
+      mlFeatures {
+        name
+      }
+    }
+  }
+}
+```
+
+Expected Response:
+
+```json
+{
+  "data": {
+    "mlFeatureTable": {
+      "name": "test_feature_table_all_feature_dtypes",
+      "description": null,
+      "platform": {
+        "name": "feast"
+      },
+      "properties": {
+        "description": null,
+        "mlFeatures": [
+          {
+            "name": "test_BOOL_LIST_feature"
+          },
+          ...{
+            "name": "test_STRING_feature"
+          }
+        ]
+      }
+    }
+  },
+  "extensions": {}
+}
+```
+
+</TabItem>
+<TabItem value="curl" label="Curl">
+
+```json
+curl --location --request POST 'http://localhost:8080/api/graphql' \
+--header 'Authorization: Bearer <my-access-token>' \
+--header 'Content-Type: application/json' \
+--data-raw '{
+    "query": "{ mlFeatureTable(urn: \"urn:li:mlFeatureTable:(urn:li:dataPlatform:feast,test_feature_table_all_feature_dtypes)\") { name description platform { name } properties { description mlFeatures { name } } } }"
+}'
+```
+
+Expected Response:
+
+```json
+{
+  "data": {
+    "mlFeatureTable": {
+      "name": "test_feature_table_all_feature_dtypes",
+      "description": null,
+      "platform": {
+        "name": "feast"
+      },
+      "properties": {
+        "description": null,
+        "mlFeatures": [
+          {
+            "name": "test_BOOL_LIST_feature"
+          },
+          ...{
+            "name": "test_STRING_feature"
+          }
+        ]
+      }
+    }
+  },
+  "extensions": {}
+}
+```
+
+</TabItem>
+<TabItem value="python" label="Python">
+
+```python
+{{ inline /metadata-ingestion/examples/library/read_mlfeature_table.py show_path_as_comment }}
+```
+
+</TabItem>
+</Tabs>
+
+### Read MLModel
+
+<Tabs>
+<TabItem value="graphql" label="GraphQL" default>
+
+```json
+query {
+  mlModel(urn: "urn:li:mlModel:(urn:li:dataPlatform:science,scienceModel,PROD)"){
+    name
+    description
+    properties {
+      description
+      version
+      type
+      mlFeatures
+      groups {
+        urn
+        name
+      }
+    }
+  }
+}
+```
+
+Expected Response:
+
+```json
+{
+  "data": {
+    "mlModel": {
+      "name": "scienceModel",
+      "description": "A sample model for predicting some outcome.",
+      "properties": {
+        "description": "A sample model for predicting some outcome.",
+        "version": null,
+        "type": "Naive Bayes classifier",
+        "mlFeatures": null,
+        "groups": []
+      }
+    }
+  },
+  "extensions": {}
+}
+```
+
+</TabItem>
+<TabItem value="curl" label="Curl" default>
+
+```json
+curl --location --request POST 'http://localhost:8080/api/graphql' \
+--header 'Authorization: Bearer <my-access-token>' \
+--header 'Content-Type: application/json' \
+--data-raw '{
+    "query": "{ mlModel(urn: \"urn:li:mlModel:(urn:li:dataPlatform:science,scienceModel,PROD)\") { name description properties { description version type mlFeatures groups { urn name } } } }"
+}'
+```
+
+Expected Response:
+
+```json
+{
+  "data": {
+    "mlModel": {
+      "name": "scienceModel",
+      "description": "A sample model for predicting some outcome.",
+      "properties": {
+        "description": "A sample model for predicting some outcome.",
+        "version": null,
+        "type": "Naive Bayes classifier",
+        "mlFeatures": null,
+        "groups": []
+      }
+    }
+  },
+  "extensions": {}
+}
+```
+
+</TabItem>
+<TabItem value="python" label="Python">
+
+```python
+{{ inline /metadata-ingestion/examples/library/read_mlmodel.py show_path_as_comment }}
+```
+
+</TabItem>
+</Tabs>
+
+## Add ML Entities
+
+### Add MlFeature to MlFeatureTable
+
+<Tabs>
+<TabItem value="python" label="Python">
+
+```python
+{{ inline /metadata-ingestion/examples/library/add_mlfeature_to_mlfeature_table.py show_path_as_comment }}
+```
+
+</TabItem>
+</Tabs>
+
+### Add MlFeature to MLModel
+
+<Tabs>
+<TabItem value="python" label="Python">
+
+```python
+{{ inline /metadata-ingestion/examples/library/add_mlfeature_to_mlmodel.py show_path_as_comment }}
+```
+
+</TabItem>
+</Tabs>
+
+### Add MLGroup To MLModel
+
+<Tabs>
+<TabItem value="python" label="Python">
+
+```python
+{{ inline /metadata-ingestion/examples/library/add_mlgroup_to_mlmodel.py show_path_as_comment }}
+```
+
+</TabItem>
+</Tabs>
+
+### Expected Outcome of Adding ML Entities
+
+You can access to `Features` or `Group` Tab of each entity to view the added entities.
+
+<p align="center">
+  <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/feature-added-to-model.png"/>
+</p>
+
+<p align="center">
+  <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/apis/tutorials/model-group-added-to-model.png"/>
+</p>
diff --git a/metadata-ingestion/examples/ai/dh_ai_client.py b/metadata-ingestion/examples/ai/dh_ai_client.py
new file mode 100644
index 00000000000000..96adb260da4c45
--- /dev/null
+++ b/metadata-ingestion/examples/ai/dh_ai_client.py
@@ -0,0 +1,446 @@
+import logging
+import time
+from typing import Any, Dict, List, Optional, Union
+
+import datahub.metadata.schema_classes as models
+from datahub.api.entities.dataset.dataset import Dataset
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.ingestion.graph.client import DatahubClientConfig, DataHubGraph
+from datahub.metadata.com.linkedin.pegasus2avro.dataprocess import (
+    DataProcessInstanceInput,
+    DataProcessInstanceOutput,
+)
+from datahub.metadata.schema_classes import (
+    ChangeTypeClass,
+    DataProcessInstanceRunResultClass,
+    DataProcessRunStatusClass,
+)
+from datahub.metadata.urns import (
+    ContainerUrn,
+    DataPlatformUrn,
+    MlModelGroupUrn,
+    MlModelUrn,
+    VersionSetUrn,
+)
+
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
+
+class DatahubAIClient:
+    """Client for creating and managing MLflow metadata in DataHub."""
+
+    def __init__(
+        self,
+        token: str,
+        server_url: str = "http://localhost:8080",
+        platform: str = "mlflow",
+    ) -> None:
+        """Initialize the DataHub AI client.
+
+        Args:
+            token: DataHub access token
+            server_url: DataHub server URL (defaults to http://localhost:8080)
+            platform: Platform name (defaults to mlflow)
+        """
+        self.token = token
+        self.server_url = server_url
+        self.platform = platform
+        self.graph = DataHubGraph(
+            DatahubClientConfig(
+                server=server_url,
+                token=token,
+                extra_headers={"Authorization": f"Bearer {token}"},
+            )
+        )
+
+    def _create_timestamp(
+        self, timestamp: Optional[int] = None
+    ) -> models.TimeStampClass:
+        """Helper to create timestamp with current time if not provided"""
+        return models.TimeStampClass(
+            time=timestamp or int(time.time() * 1000), actor="urn:li:corpuser:datahub"
+        )
+
+    def _emit_mcps(self, mcps: Union[MetadataChangeProposalWrapper, List[Any]]) -> None:
+        """Helper to emit MCPs with proper connection handling"""
+        if not isinstance(mcps, list):
+            mcps = [mcps]
+        with self.graph:
+            for mcp in mcps:
+                self.graph.emit(mcp)
+
+    def _get_aspect(
+        self, entity_urn: str, aspect_type: Any, default_constructor: Any = None
+    ) -> Any:
+        """Helper to safely get an aspect with fallback"""
+        try:
+            return self.graph.get_aspect(entity_urn=entity_urn, aspect_type=aspect_type)
+        except Exception as e:
+            logger.warning(f"Could not fetch aspect for {entity_urn}: {e}")
+            return default_constructor() if default_constructor else None
+
+    def _create_properties_class(
+        self, props_class: Any, props_dict: Optional[Dict[str, Any]] = None
+    ) -> Any:
+        """Helper to create properties class with provided values"""
+        if props_dict is None:
+            props_dict = {}
+
+        filtered_props = {k: v for k, v in props_dict.items() if v is not None}
+
+        if hasattr(props_class, "created"):
+            filtered_props.setdefault("created", self._create_timestamp())
+        if hasattr(props_class, "lastModified"):
+            filtered_props.setdefault("lastModified", self._create_timestamp())
+
+        return props_class(**filtered_props)
+
+    def _update_list_property(
+        self, existing_list: Optional[List[str]], new_item: str
+    ) -> List[str]:
+        """Helper to update a list property while maintaining uniqueness"""
+        items = set(existing_list if existing_list else [])
+        items.add(new_item)
+        return list(items)
+
+    def _create_mcp(
+        self,
+        entity_urn: str,
+        aspect: Any,
+        entity_type: Optional[str] = None,
+        aspect_name: Optional[str] = None,
+        change_type: str = ChangeTypeClass.UPSERT,
+    ) -> MetadataChangeProposalWrapper:
+        """Helper to create an MCP with standard parameters"""
+        mcp_args = {"entityUrn": entity_urn, "aspect": aspect}
+        if entity_type:
+            mcp_args["entityType"] = entity_type
+        if aspect_name:
+            mcp_args["aspectName"] = aspect_name
+        mcp_args["changeType"] = change_type
+        return MetadataChangeProposalWrapper(**mcp_args)
+
+    def _update_entity_properties(
+        self,
+        entity_urn: str,
+        aspect_type: Any,
+        updates: Dict[str, Any],
+        entity_type: str,
+        skip_properties: Optional[List[str]] = None,
+    ) -> None:
+        """Helper to update entity properties while preserving existing ones"""
+        existing_props = self._get_aspect(entity_urn, aspect_type, aspect_type)
+        skip_list = [] if skip_properties is None else skip_properties
+        props = self._copy_existing_properties(existing_props, skip_list) or {}
+
+        for key, value in updates.items():
+            if isinstance(value, str) and hasattr(existing_props, key):
+                existing_value = getattr(existing_props, key, [])
+                props[key] = self._update_list_property(existing_value, value)
+            else:
+                props[key] = value
+
+        updated_props = self._create_properties_class(aspect_type, props)
+        mcp = self._create_mcp(
+            entity_urn, updated_props, entity_type, f"{entity_type}Properties"
+        )
+        self._emit_mcps(mcp)
+
+    def _copy_existing_properties(
+        self, existing_props: Any, skip_properties: Optional[List[str]] = None
+    ) -> Dict[str, Any]:
+        """Helper to copy existing properties while skipping specified ones"""
+        skip_list = [] if skip_properties is None else skip_properties
+
+        internal_props = {
+            "ASPECT_INFO",
+            "ASPECT_NAME",
+            "ASPECT_TYPE",
+            "RECORD_SCHEMA",
+        }
+        skip_list.extend(internal_props)
+
+        props: Dict[str, Any] = {}
+        if existing_props:
+            for prop in dir(existing_props):
+                if (
+                    prop.startswith("_")
+                    or callable(getattr(existing_props, prop))
+                    or prop in skip_list
+                ):
+                    continue
+
+                value = getattr(existing_props, prop)
+                if value is not None:
+                    props[prop] = value
+
+            if hasattr(existing_props, "created"):
+                props.setdefault("created", self._create_timestamp())
+            if hasattr(existing_props, "lastModified"):
+                props.setdefault("lastModified", self._create_timestamp())
+
+        return props
+
+    def _create_run_event(
+        self,
+        status: str,
+        timestamp: int,
+        result: Optional[str] = None,
+        duration_millis: Optional[int] = None,
+    ) -> models.DataProcessInstanceRunEventClass:
+        """Helper to create run event with common parameters."""
+        event_args: Dict[str, Any] = {
+            "timestampMillis": timestamp,
+            "status": status,
+            "attempt": 1,
+        }
+
+        if result:
+            event_args["result"] = DataProcessInstanceRunResultClass(
+                type=result, nativeResultType=str(result)
+            )
+        if duration_millis:
+            event_args["durationMillis"] = duration_millis
+
+        return models.DataProcessInstanceRunEventClass(**event_args)
+
+    def create_model_group(
+        self,
+        group_id: str,
+        properties: Optional[models.MLModelGroupPropertiesClass] = None,
+        **kwargs: Any,
+    ) -> str:
+        """Create an ML model group with either property class or kwargs."""
+        model_group_urn = MlModelGroupUrn(platform=self.platform, name=group_id)
+
+        if properties is None:
+            properties = self._create_properties_class(
+                models.MLModelGroupPropertiesClass, kwargs
+            )
+
+        mcp = self._create_mcp(
+            str(model_group_urn), properties, "mlModelGroup", "mlModelGroupProperties"
+        )
+        self._emit_mcps(mcp)
+        logger.info(f"Created model group: {model_group_urn}")
+        return str(model_group_urn)
+
+    def create_model(
+        self,
+        model_id: str,
+        version: str,
+        alias: Optional[str] = None,
+        properties: Optional[models.MLModelPropertiesClass] = None,
+        **kwargs: Any,
+    ) -> str:
+        """Create an ML model with either property classes or kwargs."""
+        model_urn = MlModelUrn(platform=self.platform, name=model_id)
+        version_set_urn = VersionSetUrn(
+            id=f"mlmodel_{model_id}_versions", entity_type="mlModel"
+        )
+
+        # Handle model properties
+        if properties is None:
+            # If no properties provided, create from kwargs
+            properties = self._create_properties_class(
+                models.MLModelPropertiesClass, kwargs
+            )
+
+        # Ensure version is set in model properties
+        version_tag = models.VersionTagClass(versionTag=str(version))
+        properties.version = version_tag
+
+        # Create version properties
+        version_props = {
+            "version": version_tag,
+            "versionSet": str(version_set_urn),
+            "sortId": "AAAAAAAA",
+        }
+
+        # Add alias if provided
+        if alias:
+            version_props["aliases"] = [models.VersionTagClass(versionTag=alias)]
+
+        version_properties = self._create_properties_class(
+            models.VersionPropertiesClass, version_props
+        )
+
+        # Create version set properties
+        version_set_properties = models.VersionSetPropertiesClass(
+            latest=str(model_urn),
+            versioningScheme="ALPHANUMERIC_GENERATED_BY_DATAHUB",
+        )
+
+        mcps = [
+            self._create_mcp(
+                str(model_urn), properties, "mlModel", "mlModelProperties"
+            ),
+            self._create_mcp(
+                str(version_set_urn),
+                version_set_properties,
+                "versionSet",
+                "versionSetProperties",
+            ),
+            self._create_mcp(
+                str(model_urn), version_properties, "mlModel", "versionProperties"
+            ),
+        ]
+        self._emit_mcps(mcps)
+        logger.info(f"Created model: {model_urn}")
+        return str(model_urn)
+
+    def create_experiment(
+        self,
+        experiment_id: str,
+        properties: Optional[models.ContainerPropertiesClass] = None,
+        **kwargs: Any,
+    ) -> str:
+        """Create an ML experiment with either property class or kwargs."""
+        container_urn = ContainerUrn(guid=experiment_id)
+        platform_urn = DataPlatformUrn(platform_name=self.platform)
+
+        if properties is None:
+            properties = self._create_properties_class(
+                models.ContainerPropertiesClass, kwargs
+            )
+
+        container_subtype = models.SubTypesClass(typeNames=["ML Experiment"])
+        browse_path = models.BrowsePathsV2Class(path=[])
+        platform_instance = models.DataPlatformInstanceClass(platform=str(platform_urn))
+
+        mcps = MetadataChangeProposalWrapper.construct_many(
+            entityUrn=str(container_urn),
+            aspects=[container_subtype, properties, browse_path, platform_instance],
+        )
+        self._emit_mcps(mcps)
+        logger.info(f"Created experiment: {container_urn}")
+        return str(container_urn)
+
+    def create_training_run(
+        self,
+        run_id: str,
+        properties: Optional[models.DataProcessInstancePropertiesClass] = None,
+        training_run_properties: Optional[models.MLTrainingRunPropertiesClass] = None,
+        run_result: Optional[str] = None,
+        start_timestamp: Optional[int] = None,
+        end_timestamp: Optional[int] = None,
+        **kwargs: Any,
+    ) -> str:
+        """Create a training run with properties and events."""
+        dpi_urn = f"urn:li:dataProcessInstance:{run_id}"
+
+        # Create basic properties and aspects
+        aspects = [
+            (
+                properties
+                or self._create_properties_class(
+                    models.DataProcessInstancePropertiesClass, kwargs
+                )
+            ),
+            models.SubTypesClass(typeNames=["ML Training Run"]),
+        ]
+
+        # Add training run properties if provided
+        if training_run_properties:
+            aspects.append(training_run_properties)
+
+        # Handle run events
+        current_time = int(time.time() * 1000)
+        start_ts = start_timestamp or current_time
+        end_ts = end_timestamp or current_time
+
+        # Create events
+        aspects.append(
+            self._create_run_event(
+                status=DataProcessRunStatusClass.STARTED, timestamp=start_ts
+            )
+        )
+
+        if run_result:
+            aspects.append(
+                self._create_run_event(
+                    status=DataProcessRunStatusClass.COMPLETE,
+                    timestamp=end_ts,
+                    result=run_result,
+                    duration_millis=end_ts - start_ts,
+                )
+            )
+
+        # Create and emit MCPs
+        mcps = [self._create_mcp(dpi_urn, aspect) for aspect in aspects]
+        self._emit_mcps(mcps)
+        logger.info(f"Created training run: {dpi_urn}")
+        return dpi_urn
+
+    def create_dataset(self, name: str, platform: str, **kwargs: Any) -> str:
+        """Create a dataset with flexible properties."""
+        dataset = Dataset(id=name, platform=platform, name=name, **kwargs)
+        mcps = list(dataset.generate_mcp())
+        self._emit_mcps(mcps)
+        if dataset.urn is None:
+            raise ValueError(f"Failed to create dataset URN for {name}")
+        return dataset.urn
+
+    def add_run_to_model(self, model_urn: str, run_urn: str) -> None:
+        """Add a run to a model while preserving existing properties."""
+        self._update_entity_properties(
+            entity_urn=model_urn,
+            aspect_type=models.MLModelPropertiesClass,
+            updates={"trainingJobs": run_urn},
+            entity_type="mlModel",
+            skip_properties=["trainingJobs"],
+        )
+        logger.info(f"Added run {run_urn} to model {model_urn}")
+
+    def add_run_to_model_group(self, model_group_urn: str, run_urn: str) -> None:
+        """Add a run to a model group while preserving existing properties."""
+        self._update_entity_properties(
+            entity_urn=model_group_urn,
+            aspect_type=models.MLModelGroupPropertiesClass,
+            updates={"trainingJobs": run_urn},
+            entity_type="mlModelGroup",
+            skip_properties=["trainingJobs"],
+        )
+        logger.info(f"Added run {run_urn} to model group {model_group_urn}")
+
+    def add_model_to_model_group(self, model_urn: str, group_urn: str) -> None:
+        """Add a model to a group while preserving existing properties"""
+        self._update_entity_properties(
+            entity_urn=model_urn,
+            aspect_type=models.MLModelPropertiesClass,
+            updates={"groups": group_urn},
+            entity_type="mlModel",
+            skip_properties=["groups"],
+        )
+        logger.info(f"Added model {model_urn} to group {group_urn}")
+
+    def add_run_to_experiment(self, run_urn: str, experiment_urn: str) -> None:
+        """Add a run to an experiment"""
+        mcp = self._create_mcp(
+            entity_urn=run_urn, aspect=models.ContainerClass(container=experiment_urn)
+        )
+        self._emit_mcps(mcp)
+        logger.info(f"Added run {run_urn} to experiment {experiment_urn}")
+
+    def add_input_datasets_to_run(self, run_urn: str, dataset_urns: List[str]) -> None:
+        """Add input datasets to a run"""
+        mcp = self._create_mcp(
+            entity_urn=run_urn,
+            entity_type="dataProcessInstance",
+            aspect_name="dataProcessInstanceInput",
+            aspect=DataProcessInstanceInput(inputs=dataset_urns),
+        )
+        self._emit_mcps(mcp)
+        logger.info(f"Added input datasets to run {run_urn}")
+
+    def add_output_datasets_to_run(self, run_urn: str, dataset_urns: List[str]) -> None:
+        """Add output datasets to a run"""
+        mcp = self._create_mcp(
+            entity_urn=run_urn,
+            entity_type="dataProcessInstance",
+            aspect_name="dataProcessInstanceOutput",
+            aspect=DataProcessInstanceOutput(outputs=dataset_urns),
+        )
+        self._emit_mcps(mcp)
+        logger.info(f"Added output datasets to run {run_urn}")
diff --git a/metadata-ingestion/examples/ai/dh_ai_client_sample.py b/metadata-ingestion/examples/ai/dh_ai_client_sample.py
new file mode 100644
index 00000000000000..291cfb2ff1d619
--- /dev/null
+++ b/metadata-ingestion/examples/ai/dh_ai_client_sample.py
@@ -0,0 +1,134 @@
+import argparse
+
+from dh_ai_client import DatahubAIClient
+
+import datahub.metadata.schema_classes as models
+from datahub.metadata.com.linkedin.pegasus2avro.dataprocess import RunResultType
+
+if __name__ == "__main__":
+    # Example usage
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--token", required=True, help="DataHub access token")
+    parser.add_argument(
+        "--server_url",
+        required=False,
+        default="http://localhost:8080",
+        help="DataHub server URL (defaults to http://localhost:8080)",
+    )
+    args = parser.parse_args()
+
+    client = DatahubAIClient(token=args.token, server_url=args.server_url)
+
+    # Create model group
+    model_group_urn = client.create_model_group(
+        group_id="airline_forecast_models_group",
+        properties=models.MLModelGroupPropertiesClass(
+            name="Airline Forecast Models Group",
+            description="Group of models for airline passenger forecasting",
+            created=models.TimeStampClass(
+                time=1628580000000, actor="urn:li:corpuser:datahub"
+            ),
+        ),
+    )
+
+    # Creating a model with property classes
+    model_urn = client.create_model(
+        model_id="arima_model",
+        properties=models.MLModelPropertiesClass(
+            name="ARIMA Model",
+            description="ARIMA model for airline passenger forecasting",
+            customProperties={"team": "forecasting"},
+            trainingMetrics=[
+                models.MLMetricClass(name="accuracy", value="0.9"),
+                models.MLMetricClass(name="precision", value="0.8"),
+            ],
+            hyperParams=[
+                models.MLHyperParamClass(name="learning_rate", value="0.01"),
+                models.MLHyperParamClass(name="batch_size", value="32"),
+            ],
+            externalUrl="https:localhost:5000",
+            created=models.TimeStampClass(
+                time=1628580000000, actor="urn:li:corpuser:datahub"
+            ),
+            lastModified=models.TimeStampClass(
+                time=1628580000000, actor="urn:li:corpuser:datahub"
+            ),
+            tags=["forecasting", "arima"],
+        ),
+        version="1.0",
+        alias="champion",
+    )
+
+    # Creating an experiment with property class
+    experiment_urn = client.create_experiment(
+        experiment_id="airline_forecast_experiment",
+        properties=models.ContainerPropertiesClass(
+            name="Airline Forecast Experiment",
+            description="Experiment to forecast airline passenger numbers",
+            customProperties={"team": "forecasting"},
+            created=models.TimeStampClass(
+                time=1628580000000, actor="urn:li:corpuser:datahub"
+            ),
+            lastModified=models.TimeStampClass(
+                time=1628580000000, actor="urn:li:corpuser:datahub"
+            ),
+        ),
+    )
+
+    run_urn = client.create_training_run(
+        run_id="simple_training_run",
+        properties=models.DataProcessInstancePropertiesClass(
+            name="Simple Training Run",
+            created=models.AuditStampClass(
+                time=1628580000000, actor="urn:li:corpuser:datahub"
+            ),
+            customProperties={"team": "forecasting"},
+        ),
+        training_run_properties=models.MLTrainingRunPropertiesClass(
+            id="simple_training_run",
+            outputUrls=["s3://my-bucket/output"],
+            trainingMetrics=[models.MLMetricClass(name="accuracy", value="0.9")],
+            hyperParams=[models.MLHyperParamClass(name="learning_rate", value="0.01")],
+            externalUrl="https:localhost:5000",
+        ),
+        run_result=RunResultType.FAILURE,
+        start_timestamp=1628580000000,
+        end_timestamp=1628580001000,
+    )
+    # Create datasets
+    input_dataset_urn = client.create_dataset(
+        platform="snowflake",
+        name="iris_input",
+    )
+
+    output_dataset_urn = client.create_dataset(
+        platform="snowflake",
+        name="iris_ouptut",
+    )
+
+    # Add run to experiment
+    client.add_run_to_experiment(run_urn=run_urn, experiment_urn=experiment_urn)
+
+    # Add model to model group
+    client.add_model_to_model_group(model_urn=model_urn, group_urn=model_group_urn)
+
+    # Add run to model
+    client.add_run_to_model(
+        model_urn=model_urn,
+        run_urn=run_urn,
+    )
+
+    # add run to model group
+    client.add_run_to_model_group(
+        model_group_urn=model_group_urn,
+        run_urn=run_urn,
+    )
+
+    # Add input and output datasets to run
+    client.add_input_datasets_to_run(
+        run_urn=run_urn, dataset_urns=[str(input_dataset_urn)]
+    )
+
+    client.add_output_datasets_to_run(
+        run_urn=run_urn, dataset_urns=[str(output_dataset_urn)]
+    )

From bc09b28a649d591a45ec28008d3b6038ecb5fcd8 Mon Sep 17 00:00:00 2001
From: cccs-cat001 <56204545+cccs-cat001@users.noreply.github.com>
Date: Thu, 30 Jan 2025 00:56:35 -0500
Subject: [PATCH 186/249] refactor(operation_config): change logging on
 is_profiling_enabled (#12416)

Co-authored-by: Harshal Sheth <hsheth2@gmail.com>
---
 metadata-ingestion/setup.py                          | 12 +++++++-----
 .../src/datahub/ingestion/source/sql/sql_config.py   | 10 ----------
 .../ingestion/source_config/operation_config.py      |  9 +++++++++
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py
index e603b5f6ac1d30..f7e6482fd26f87 100644
--- a/metadata-ingestion/setup.py
+++ b/metadata-ingestion/setup.py
@@ -251,6 +251,7 @@
     # Iceberg Python SDK
     # Kept at 0.4.0 due to higher versions requiring pydantic>2, as soon as we are fine with it, bump this dependency
     "pyiceberg>=0.4.0",
+    *cachetools_lib,
 }
 
 mssql_common = {
@@ -407,13 +408,14 @@
     # UnsupportedProductError
     # https://www.elastic.co/guide/en/elasticsearch/client/python-api/current/release-notes.html#rn-7-14-0
     # https://github.com/elastic/elasticsearch-py/issues/1639#issuecomment-883587433
-    "elasticsearch": {"elasticsearch==7.13.4"},
+    "elasticsearch": {"elasticsearch==7.13.4", *cachetools_lib},
     "cassandra": {
         "cassandra-driver>=3.28.0",
         # We were seeing an error like this `numpy.dtype size changed, may indicate binary incompatibility. Expected 96 from C header, got 88 from PyObject`
         # with numpy 2.0. This likely indicates a mismatch between scikit-learn and numpy versions.
         # https://stackoverflow.com/questions/40845304/runtimewarning-numpy-dtype-size-changed-may-indicate-binary-incompatibility
         "numpy<2",
+        *cachetools_lib,
     },
     "feast": {
         "feast>=0.34.0,<1",
@@ -425,7 +427,7 @@
         "numpy<2",
     },
     "grafana": {"requests"},
-    "glue": aws_common,
+    "glue": aws_common | cachetools_lib,
     # hdbcli is supported officially by SAP, sqlalchemy-hana is built on top but not officially supported
     "hana": sql_common
     | {
@@ -482,11 +484,11 @@
     | classification_lib
     | {"db-dtypes"}  # Pandas extension data types
     | cachetools_lib,
-    "s3": {*s3_base, *data_lake_profiling},
+    "s3": {*s3_base, *data_lake_profiling, *cachetools_lib},
     "gcs": {*s3_base, *data_lake_profiling},
-    "abs": {*abs_base, *data_lake_profiling},
+    "abs": {*abs_base, *data_lake_profiling, *cachetools_lib},
     "sagemaker": aws_common,
-    "salesforce": {"simple-salesforce"},
+    "salesforce": {"simple-salesforce", *cachetools_lib},
     "snowflake": snowflake_common | usage_common | sqlglot_lib,
     "snowflake-summary": snowflake_common | usage_common | sqlglot_lib,
     "snowflake-queries": snowflake_common | usage_common | sqlglot_lib,
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/sql_config.py b/metadata-ingestion/src/datahub/ingestion/source/sql/sql_config.py
index 7d82d99412ffe8..3ead59eed2d39a 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/sql_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/sql_config.py
@@ -2,8 +2,6 @@
 from abc import abstractmethod
 from typing import Any, Dict, Optional
 
-import cachetools
-import cachetools.keys
 import pydantic
 from pydantic import Field
 from sqlalchemy.engine import URL
@@ -29,7 +27,6 @@
     StatefulIngestionConfigBase,
 )
 from datahub.ingestion.source_config.operation_config import is_profiling_enabled
-from datahub.utilities.cachetools_keys import self_methodkey
 
 logger: logging.Logger = logging.getLogger(__name__)
 
@@ -118,13 +115,6 @@ class SQLCommonConfig(
     # Custom Stateful Ingestion settings
     stateful_ingestion: Optional[StatefulStaleMetadataRemovalConfig] = None
 
-    # TRICKY: The operation_config is time-dependent. Because we don't want to change
-    # whether or not we're running profiling mid-ingestion, we cache the result of this method.
-    # TODO: This decorator should be moved to the is_profiling_enabled(operation_config) method.
-    @cachetools.cached(
-        cache=cachetools.LRUCache(maxsize=1),
-        key=self_methodkey,
-    )
     def is_profiling_enabled(self) -> bool:
         return self.profiling.enabled and is_profiling_enabled(
             self.profiling.operation_config
diff --git a/metadata-ingestion/src/datahub/ingestion/source_config/operation_config.py b/metadata-ingestion/src/datahub/ingestion/source_config/operation_config.py
index a670173aa47519..1846dcb4fdd3d0 100644
--- a/metadata-ingestion/src/datahub/ingestion/source_config/operation_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source_config/operation_config.py
@@ -2,10 +2,12 @@
 import logging
 from typing import Any, Dict, Optional
 
+import cachetools
 import pydantic
 from pydantic.fields import Field
 
 from datahub.configuration.common import ConfigModel
+from datahub.utilities.cachetools_keys import self_methodkey
 
 logger = logging.getLogger(__name__)
 
@@ -62,6 +64,13 @@ def validate_profile_date_of_month(cls, v: Optional[int]) -> Optional[int]:
         return profile_date_of_month
 
 
+# TRICKY: The operation_config is time-dependent. Because we don't want to change
+# whether or not we're running profiling mid-ingestion, we cache the result of this method.
+# An additional benefit is that we only print the log lines on the first call.
+@cachetools.cached(
+    cache=cachetools.LRUCache(maxsize=1),
+    key=self_methodkey,
+)
 def is_profiling_enabled(operation_config: OperationConfig) -> bool:
     if operation_config.lower_freq_profile_enabled is False:
         return True

From 6acd94b436647c5c309317b8a1f58319c13ef82f Mon Sep 17 00:00:00 2001
From: Jay <159848059+jayacryl@users.noreply.github.com>
Date: Thu, 30 Jan 2025 03:13:25 -0500
Subject: [PATCH 187/249] feat(docs) assertion execution behavior (#12484)

---
 docs/managed-datahub/observe/assertions.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/managed-datahub/observe/assertions.md b/docs/managed-datahub/observe/assertions.md
index e63d051a0096b2..b8789bb92e858f 100644
--- a/docs/managed-datahub/observe/assertions.md
+++ b/docs/managed-datahub/observe/assertions.md
@@ -46,3 +46,21 @@ With Acryl Observe, you can get the Assertion Change event by getting API events
 ## Cost
 
 We provide a plethora of ways to run your assertions, aiming to allow you to use the cheapest possible means to do so and/or the most accurate means to do so, depending on your use case. For example, for Freshness (SLA) assertions, it is relatively cheap to use either their Audit Log or Information Schema as a means to run freshness checks, and we support both of those as well as Last Modified Column, High Watermark Column, and DataHub Operation ([see the docs for more details](/docs/managed-datahub/observe/freshness-assertions.md#3-change-source)).
+
+## Execution details - Where and How
+
+There are a few ways DataHub Cloud assertions can be executed:
+1. Directly query the source system:
+  a. `Information Schema` tables are used by default to power cheap, fast checks on a table's freshness or row count.
+  b. `Audit log` or `Operation log` tables can be used to granularly monitor table operations.
+  c. The table itself can also be queried directly. This is useful for freshness checks referencing `last_updated` columns, row count checks targetting a subset of the data, and column value checks. We offer several optimizations to reduce query costs for these checks.
+2. Reference DataHub profiling information
+  a. `Operation`s that are reported via ingestion or our SDKs can power monitoring table freshness.
+  b. `DatasetProfile` and `SchemaFieldProfile` ingested or reported via SDKs can power monitoring table metrics and column metrics.
+
+### Privacy: Execute In-Network, avoid exposing data externally
+As a part of DataHub Cloud, we offer a [Remote Executor](/docs/managed-datahub/operator-guide/setting-up-remote-ingestion-executor.md) deployment model. If this model is used, assertions will execute within your network, and only the results will be sent back to DataHub Cloud. Neither your actual credentials, nor your source data will leave your network.
+
+### Source system selection
+Assertions will execute queries using the same source system that was used to initially ingest the table.
+There are some scenarios where customers may have multiple ingestion sources for, i.e. a BigQuery table. In this case, by default the executor will take the ingestion source that was used to ingest the table's `DatasetProperties`. This behavior can be modified by your customer success rep.

From c8e88aef097c043ee4f9515e46db9f7505d1725d Mon Sep 17 00:00:00 2001
From: hao zhang <haon85@gmail.com>
Date: Thu, 30 Jan 2025 16:13:47 +0800
Subject: [PATCH 188/249] feat(ingest/dbt-core): support fetching using the s3a
 protocol (#12465)

Co-authored-by: hzhang <hzhang@ssnc-corp.global>
---
 metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_core.py b/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_core.py
index 04de763370c951..fbb54d211e1b21 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_core.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_core.py
@@ -488,7 +488,7 @@ def load_file_as_json(
     ) -> Dict:
         if re.match("^https?://", uri):
             return json.loads(requests.get(uri).text)
-        elif re.match("^s3://", uri):
+        elif is_s3_uri(uri):
             u = urlparse(uri)
             assert aws_connection
             response = aws_connection.get_s3_client().get_object(

From aaaa655c21bf66e38a318043942e36fee8a01c30 Mon Sep 17 00:00:00 2001
From: Andrew Sikowitz <andrew.sikowitz@acryl.io>
Date: Thu, 30 Jan 2025 00:39:56 -0800
Subject: [PATCH 189/249] feat(dataProcessInstance): Support data process
 instance entity page and lineage (#12499)

---
 .../datahub/graphql/GmsGraphQLEngine.java     |  20 +-
 .../DataPlatformInstanceAspectMapper.java     |   1 +
 .../DataProcessInstanceType.java              |   3 +-
 .../mappers/DataProcessInstanceMapper.java    |  41 ++++-
 .../src/main/resources/entity.graphql         |  29 ++-
 .../DataProcessInstanceTypeTest.java          |   7 +-
 .../DataProcessInstanceMapperTest.java        |  23 ++-
 .../DataProcessInstanceEntity.tsx             |  42 ++---
 .../DataProcessInstanceEntity.tsx             | 173 +++++-------------
 .../dataProcessInstance/preview/Preview.tsx   |  28 +--
 .../search/EmbeddedListSearchSection.tsx      |  27 ++-
 .../profile/header/DefaultEntityHeader.tsx    |  15 +-
 .../profile/sidebar/SidebarEntityHeader.tsx   |  16 +-
 .../app/ingest/source/builder/constants.ts    |   4 +-
 .../src/app/lineageV2/LineageExplorer.tsx     |   5 +-
 .../LineageFilterNode/computeOrFilters.ts     |  19 +-
 .../useFetchFilterNodeContents.ts             |   8 +-
 .../LineageTransformationNode.tsx             |   9 +-
 .../src/app/lineageV2/NodeBuilder.ts          |   1 -
 datahub-web-react/src/app/lineageV2/common.ts |  23 ++-
 .../lineageV2/controls/LineageControls.tsx    |   8 +-
 .../controls/LineageSearchFilters.tsx         |  13 ++
 .../app/lineageV2/pruneAllDuplicateEdges.ts   | 135 ++++++++++++++
 .../src/app/lineageV2/useBulkEntityLineage.ts |   7 +-
 .../app/lineageV2/useColumnHighlighting.ts    |  15 +-
 .../lineageV2/useComputeGraph/filterNodes.ts  |  85 ++++++++-
 .../useComputeGraph/getDisplayedNodes.ts      |   2 +-
 .../useComputeGraph/useComputeGraph.tsx       |   3 +
 .../app/lineageV2/useSearchAcrossLineage.ts   |  97 +---------
 .../src/app/previewV2/EntityHeader.tsx        |   4 +-
 .../src/graphql/dataProcessInstance.graphql   | 103 ++++++-----
 datahub-web-react/src/graphql/lineage.graphql |   3 +
 datahub-web-react/src/images/mlflowlogo2.png  | Bin 0 -> 20876 bytes
 .../openapi/openapi_mces_golden.json          |   6 +-
 .../integration/openapi/openapi_to_file.yml   |   5 +-
 .../bootstrap_mcps/data-platforms.yaml        |   2 +-
 .../e2e/lineageV2/v2_lineage_column_level.js  |   2 +-
 37 files changed, 611 insertions(+), 373 deletions(-)
 create mode 100644 datahub-web-react/src/app/lineageV2/pruneAllDuplicateEdges.ts
 create mode 100644 datahub-web-react/src/images/mlflowlogo2.png

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
index 68f1d851420258..c142dbf7eeb229 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
@@ -3141,13 +3141,26 @@ private void configureDataProcessInstanceResolvers(final RuntimeWiring.Builder b
         "DataProcessInstance",
         typeWiring ->
             typeWiring
+                .dataFetcher("exists", new EntityExistsResolver(entityService))
+                .dataFetcher(
+                    "platform",
+                    new LoadableTypeResolver<>(
+                        dataPlatformType,
+                        (env) -> {
+                          final DataProcessInstance dataProcessInstance = env.getSource();
+                          return dataProcessInstance != null
+                                  && dataProcessInstance.getPlatform() != null
+                              ? dataProcessInstance.getPlatform().getUrn()
+                              : null;
+                        }))
                 .dataFetcher(
                     "dataPlatformInstance",
                     new LoadableTypeResolver<>(
                         dataPlatformInstanceType,
                         (env) -> {
                           final DataProcessInstance dataProcessInstance = env.getSource();
-                          return dataProcessInstance.getDataPlatformInstance() != null
+                          return dataProcessInstance != null
+                                  && dataProcessInstance.getDataPlatformInstance() != null
                               ? dataProcessInstance.getDataPlatformInstance().getUrn()
                               : null;
                         }))
@@ -3160,6 +3173,11 @@ private void configureDataProcessInstanceResolvers(final RuntimeWiring.Builder b
                           final DataProcessInstance dpi = env.getSource();
                           return dpi.getContainer() != null ? dpi.getContainer().getUrn() : null;
                         }))
+                .dataFetcher(
+                    "parentTemplate",
+                    new EntityTypeResolver(
+                        entityTypes,
+                        (env) -> ((DataProcessInstance) env.getSource()).getParentTemplate()))
                 .dataFetcher("relationships", new EntityRelationshipsResultResolver(graphClient))
                 .dataFetcher(
                     "lineage",
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DataPlatformInstanceAspectMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DataPlatformInstanceAspectMapper.java
index ab3127a3ae232b..7355b19762924c 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DataPlatformInstanceAspectMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/DataPlatformInstanceAspectMapper.java
@@ -29,6 +29,7 @@ public DataPlatformInstance apply(
       result.setType(EntityType.DATA_PLATFORM_INSTANCE);
       result.setUrn(input.getInstance().toString());
     }
+    // Warning: This often cannot be read properly: overwritten by LoadableTypeResolver
     result.setPlatform(
         DataPlatform.builder()
             .setUrn(input.getPlatform().toString())
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/DataProcessInstanceType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/DataProcessInstanceType.java
index eeaaaa96f51704..0b79d6ee220ebf 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/DataProcessInstanceType.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/DataProcessInstanceType.java
@@ -41,7 +41,8 @@ public class DataProcessInstanceType
           DATA_PROCESS_INSTANCE_RELATIONSHIPS_ASPECT_NAME,
           ML_TRAINING_RUN_PROPERTIES_ASPECT_NAME,
           SUB_TYPES_ASPECT_NAME,
-          CONTAINER_ASPECT_NAME);
+          CONTAINER_ASPECT_NAME,
+          STATUS_ASPECT_NAME);
 
   private final EntityClient _entityClient;
   private final FeatureFlags _featureFlags;
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapper.java
index d721f5a5fb522d..66aae8d555c431 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapper.java
@@ -3,6 +3,7 @@
 import static com.linkedin.metadata.Constants.*;
 
 import com.linkedin.common.DataPlatformInstance;
+import com.linkedin.common.Status;
 import com.linkedin.common.SubTypes;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.data.DataMap;
@@ -13,12 +14,15 @@
 import com.linkedin.datahub.graphql.types.common.mappers.AuditStampMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.CustomPropertiesMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.DataPlatformInstanceAspectMapper;
+import com.linkedin.datahub.graphql.types.common.mappers.StatusMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.SubTypesMapper;
+import com.linkedin.datahub.graphql.types.common.mappers.UrnToEntityMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.util.MappingHelper;
 import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
 import com.linkedin.datahub.graphql.types.mlmodel.mappers.MLHyperParamMapper;
 import com.linkedin.datahub.graphql.types.mlmodel.mappers.MLMetricMapper;
 import com.linkedin.dataprocess.DataProcessInstanceProperties;
+import com.linkedin.dataprocess.DataProcessInstanceRelationships;
 import com.linkedin.entity.EntityResponse;
 import com.linkedin.entity.EnvelopedAspectMap;
 import com.linkedin.ml.metadata.MLTrainingRunProperties;
@@ -68,7 +72,7 @@ public DataProcessInstance apply(
     mappingHelper.mapToResult(
         DATA_PROCESS_INSTANCE_PROPERTIES_ASPECT_NAME,
         (dataProcessInstance, dataMap) ->
-            mapDataProcessProperties(context, dataProcessInstance, dataMap, entityUrn));
+            mapDataProcessInstanceProperties(context, dataProcessInstance, dataMap, entityUrn));
     mappingHelper.mapToResult(
         ML_TRAINING_RUN_PROPERTIES_ASPECT_NAME,
         (dataProcessInstance, dataMap) ->
@@ -77,8 +81,10 @@ public DataProcessInstance apply(
         DATA_PLATFORM_INSTANCE_ASPECT_NAME,
         (dataProcessInstance, dataMap) -> {
           DataPlatformInstance dataPlatformInstance = new DataPlatformInstance(dataMap);
-          dataProcessInstance.setDataPlatformInstance(
-              DataPlatformInstanceAspectMapper.map(context, dataPlatformInstance));
+          com.linkedin.datahub.graphql.generated.DataPlatformInstance value =
+              DataPlatformInstanceAspectMapper.map(context, dataPlatformInstance);
+          dataProcessInstance.setPlatform(value.getPlatform());
+          dataProcessInstance.setDataPlatformInstance(value);
         });
     mappingHelper.mapToResult(
         SUB_TYPES_ASPECT_NAME,
@@ -87,6 +93,14 @@ public DataProcessInstance apply(
     mappingHelper.mapToResult(
         CONTAINER_ASPECT_NAME,
         (dataProcessInstance, dataMap) -> mapContainers(context, dataProcessInstance, dataMap));
+    mappingHelper.mapToResult(
+        STATUS_ASPECT_NAME,
+        (dataProcessInstance, dataMap) ->
+            dataProcessInstance.setStatus(StatusMapper.map(context, new Status(dataMap))));
+    mappingHelper.mapToResult(
+        DATA_PROCESS_INSTANCE_RELATIONSHIPS_ASPECT_NAME,
+        (dataProcessInstance, dataMap) ->
+            mapDataProcessInstanceRelationships(context, dataProcessInstance, dataMap));
 
     return mappingHelper.getResult();
   }
@@ -124,8 +138,8 @@ private void mapTrainingRunProperties(
     dpi.setMlTrainingRunProperties(properties);
   }
 
-  private void mapDataProcessProperties(
-      @Nonnull QueryContext context,
+  private void mapDataProcessInstanceProperties(
+      @Nullable QueryContext context,
       @Nonnull DataProcessInstance dpi,
       @Nonnull DataMap dataMap,
       @Nonnull Urn entityUrn) {
@@ -146,9 +160,20 @@ private void mapDataProcessProperties(
           CustomPropertiesMapper.map(
               dataProcessInstanceProperties.getCustomProperties(), entityUrn));
     }
-    if (dataProcessInstanceProperties.hasCreated()) {
-      dpi.setCreated(AuditStampMapper.map(context, dataProcessInstanceProperties.getCreated()));
-    }
+    dpi.setCreated(AuditStampMapper.map(context, dataProcessInstanceProperties.getCreated()));
+    properties.setCreated(
+        AuditStampMapper.map(context, dataProcessInstanceProperties.getCreated()));
     dpi.setProperties(properties);
   }
+
+  private void mapDataProcessInstanceRelationships(
+      @Nullable QueryContext context, @Nonnull DataProcessInstance dpi, @Nonnull DataMap dataMap) {
+    DataProcessInstanceRelationships dataProcessInstanceRelationships =
+        new DataProcessInstanceRelationships(dataMap);
+
+    if (dataProcessInstanceRelationships.getParentTemplate() != null) {
+      dpi.setParentTemplate(
+          UrnToEntityMapper.map(context, dataProcessInstanceRelationships.getParentTemplate()));
+    }
+  }
 }
diff --git a/datahub-graphql-core/src/main/resources/entity.graphql b/datahub-graphql-core/src/main/resources/entity.graphql
index f6adf884b2badc..25615d9b6aa4fe 100644
--- a/datahub-graphql-core/src/main/resources/entity.graphql
+++ b/datahub-graphql-core/src/main/resources/entity.graphql
@@ -6733,6 +6733,16 @@ type DataProcessInstance implements EntityWithRelationships & Entity {
     """
     type: EntityType!
 
+    """
+    Whether or not this entity exists on DataHub
+    """
+    exists: Boolean
+
+    """
+    Status metadata of the data process instance
+    """
+    status: Status
+
     """
     The history of state changes for the run
     """
@@ -6741,12 +6751,12 @@ type DataProcessInstance implements EntityWithRelationships & Entity {
     """
     When the run was kicked off
     """
-    created: AuditStamp
+    created: AuditStamp @deprecated(reason: "Use `properties.created`")
 
     """
     The name of the data process
     """
-    name: String
+    name: String @deprecated(reason: "Use `properties.name`")
 
     """
     Edges extending from this entity.
@@ -13154,7 +13164,7 @@ type DataProcessInstanceProperties {
     """
     When this process instance was created
     """
-    created: AuditStamp
+    created: AuditStamp!
 
     """
     Additional custom properties specific to this process instance
@@ -13188,9 +13198,8 @@ type MLTrainingRunProperties {
 }
 
 extend type DataProcessInstance {
-
     """
-    Additional read only properties associated with the Data Job
+    Additional read only properties associated with the Data Process Instance
     """
     properties: DataProcessInstanceProperties
 
@@ -13209,6 +13218,11 @@ extend type DataProcessInstance {
     """
     container: Container
 
+    """
+    Standardized platform urn where the data process instance is defined
+    """
+    platform: DataPlatform
+
     """
     Recursively get the lineage of containers for this entity
     """
@@ -13218,4 +13232,9 @@ extend type DataProcessInstance {
     Additional properties when subtype is Training Run
     """
     mlTrainingRunProperties: MLTrainingRunProperties
+
+    """
+    The parent entity whose run instance it is
+    """
+    parentTemplate: Entity
 }
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/DataProcessInstanceTypeTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/DataProcessInstanceTypeTest.java
index 437c74ab669146..9535830407117f 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/DataProcessInstanceTypeTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/DataProcessInstanceTypeTest.java
@@ -7,6 +7,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.linkedin.common.AuditStamp;
 import com.linkedin.common.DataPlatformInstance;
 import com.linkedin.common.FabricType;
 import com.linkedin.common.Status;
@@ -61,7 +62,11 @@ public class DataProcessInstanceTypeTest {
   private static final DataProcessInstanceKey TEST_DPI_1_KEY =
       new DataProcessInstanceKey().setId("id-1");
   private static final DataProcessInstanceProperties TEST_DPI_1_PROPERTIES =
-      new DataProcessInstanceProperties().setName("Test DPI").setType(DataProcessType.STREAMING);
+      new DataProcessInstanceProperties()
+          .setName("Test DPI")
+          .setType(DataProcessType.STREAMING)
+          .setCreated(
+              new AuditStamp().setTime(1234L).setActor(UrnUtils.getUrn("urn:li:corpuser:1")));
   private static final DataProcessInstanceInput TEST_DPI_1_DPI_INPUT =
       new DataProcessInstanceInput().setInputs(new UrnArray(ImmutableList.of(DATASET_URN)));
   private static final DataProcessInstanceOutput TEST_DPI_1_DPI_OUTPUT =
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapperTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapperTest.java
index cd9d58b54e6b3a..cac3c6f594932c 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapperTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapperTest.java
@@ -3,6 +3,7 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
+import com.linkedin.common.AuditStamp;
 import com.linkedin.common.DataPlatformInstance;
 import com.linkedin.common.url.Url;
 import com.linkedin.common.urn.Urn;
@@ -12,6 +13,7 @@
 import com.linkedin.datahub.graphql.generated.DataProcessInstance;
 import com.linkedin.datahub.graphql.generated.EntityType;
 import com.linkedin.dataprocess.DataProcessInstanceProperties;
+import com.linkedin.dataprocess.DataProcessInstanceRelationships;
 import com.linkedin.entity.Aspect;
 import com.linkedin.entity.EntityResponse;
 import com.linkedin.entity.EnvelopedAspect;
@@ -28,6 +30,7 @@ public class DataProcessInstanceMapperTest {
   private static final String TEST_INSTANCE_URN =
       "urn:li:dataProcessInstance:(test-workflow,test-instance)";
   private static final String TEST_CONTAINER_URN = "urn:li:container:testContainer";
+  private static final String TEST_USER_URN = "urn:li:corpuser:test";
   private static final String TEST_EXTERNAL_URL = "https://example.com/process";
   private static final String TEST_NAME = "Test Process Instance";
 
@@ -52,11 +55,15 @@ public void testMapBasicFields() throws Exception {
   }
 
   @Test
-  public void testMapDataProcessProperties() throws Exception {
+  public void testMapDataProcessInstanceProperties() throws Exception {
     // Create DataProcessInstanceProperties
     DataProcessInstanceProperties properties = new DataProcessInstanceProperties();
     properties.setName(TEST_NAME);
     properties.setExternalUrl(new Url(TEST_EXTERNAL_URL));
+    AuditStamp created = new AuditStamp();
+    created.setTime(123456789L);
+    created.setActor(Urn.createFromString(TEST_USER_URN));
+    properties.setCreated(created);
 
     // Add properties aspect
     addAspect(Constants.DATA_PROCESS_INSTANCE_PROPERTIES_ASPECT_NAME, properties);
@@ -66,6 +73,20 @@ public void testMapDataProcessProperties() throws Exception {
     assertNotNull(instance.getProperties());
     assertEquals(instance.getName(), TEST_NAME);
     assertEquals(instance.getExternalUrl(), TEST_EXTERNAL_URL);
+    assertEquals(instance.getCreated().getTime(), 123456789L);
+    assertEquals(instance.getCreated().getActor(), TEST_USER_URN);
+  }
+
+  @Test
+  public void testMapDataProcessInstanceRelationships() throws Exception {
+    DataProcessInstanceRelationships relationships = new DataProcessInstanceRelationships();
+    relationships.setParentTemplate(Urn.createFromString(TEST_INSTANCE_URN));
+
+    addAspect(Constants.DATA_PROCESS_INSTANCE_RELATIONSHIPS_ASPECT_NAME, relationships);
+
+    DataProcessInstance instance = DataProcessInstanceMapper.map(null, entityResponse);
+    assertNotNull(instance.getParentTemplate());
+    assertEquals(instance.getParentTemplate().getUrn(), TEST_INSTANCE_URN);
   }
 
   @Test
diff --git a/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx b/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx
index bdf77959e97c7f..239681609323eb 100644
--- a/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx
+++ b/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx
@@ -5,7 +5,10 @@ import { DataProcessInstance, EntityType, OwnershipType, SearchResult } from '..
 import { Preview } from './preview/Preview';
 import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
 import { EntityProfile } from '../shared/containers/profile/EntityProfile';
-import { useGetDataProcessInstanceQuery } from '../../../graphql/dataProcessInstance.generated';
+import {
+    GetDataProcessInstanceQuery,
+    useGetDataProcessInstanceQuery,
+} from '../../../graphql/dataProcessInstance.generated';
 import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
 import { LineageTab } from '../shared/tabs/Lineage/LineageTab';
 import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
@@ -15,7 +18,6 @@ import { GenericEntityProperties } from '../shared/types';
 import { getDataForEntityType } from '../shared/containers/profile/utils';
 import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection';
 import { EntityMenuItems } from '../shared/EntityDropdown/EntityDropdown';
-import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
 import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection';
 import { getDataProduct } from '../shared/utils';
 import SummaryTab from './profile/DataProcessInstanceSummary';
@@ -58,9 +60,9 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
         );
     };
 
-    isSearchEnabled = () => true;
+    isSearchEnabled = () => false;
 
-    isBrowseEnabled = () => true;
+    isBrowseEnabled = () => false;
 
     isLineageEnabled = () => true;
 
@@ -127,12 +129,9 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
     ];
 
     getOverridePropertiesFromEntity = (processInstance?: DataProcessInstance | null): GenericEntityProperties => {
-        const name = processInstance?.name;
-        const externalUrl = processInstance?.externalUrl;
         return {
-            name,
-            externalUrl,
-            platform: processInstance?.dataPlatformInstance?.platform,
+            name: processInstance && this.displayName(processInstance),
+            platform: (processInstance as GetDataProcessInstanceQuery['dataProcessInstance'])?.optionalPlatform,
         };
     };
 
@@ -142,14 +141,11 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
         return (
             <Preview
                 urn={data.urn}
-                name={data.properties?.name || data.name || ''}
+                name={this.displayName(data)}
                 subType={data.subTypes?.typeNames?.[0]}
                 description=""
-                platformName={
-                    data?.dataPlatformInstance?.platform?.properties?.displayName ||
-                    capitalizeFirstLetterOnly(data?.dataPlatformInstance?.platform?.name)
-                }
-                platformLogo={data?.dataPlatformInstance?.platform?.properties?.logoUrl}
+                platformName={genericProperties?.platform?.properties?.displayName ?? undefined}
+                platformLogo={genericProperties?.platform?.properties?.logoUrl}
                 owners={null}
                 globalTags={null}
                 dataProduct={getDataProduct(genericProperties?.dataProduct)}
@@ -171,15 +167,12 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
         return (
             <Preview
                 urn={data.urn}
-                name={data.properties?.name || data.name || ''}
+                name={this.displayName(data)}
                 subType={data.subTypes?.typeNames?.[0]}
                 description=""
-                platformName={
-                    data?.dataPlatformInstance?.platform?.properties?.displayName ||
-                    capitalizeFirstLetterOnly(data?.dataPlatformInstance?.platform?.name)
-                }
-                platformLogo={data.dataPlatformInstance?.platform?.properties?.logoUrl}
-                platformInstanceId={data.dataPlatformInstance?.instanceId}
+                platformName={genericProperties?.platform?.properties?.displayName ?? undefined}
+                platformLogo={genericProperties?.platform?.properties?.logoUrl}
+                platformInstanceId={genericProperties?.dataPlatformInstance?.instanceId}
                 owners={null}
                 globalTags={null}
                 dataProduct={getDataProduct(genericProperties?.dataProduct)}
@@ -198,13 +191,14 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
     };
 
     getLineageVizConfig = (entity: DataProcessInstance) => {
+        const properties = this.getGenericEntityProperties(entity);
         return {
             urn: entity?.urn,
             name: this.displayName(entity),
             type: EntityType.DataProcessInstance,
             subtype: entity?.subTypes?.typeNames?.[0],
-            icon: entity?.dataPlatformInstance?.platform?.properties?.logoUrl || undefined,
-            platform: entity?.dataPlatformInstance?.platform,
+            icon: properties?.platform?.properties?.logoUrl ?? undefined,
+            platform: properties?.platform ?? undefined,
             container: entity?.container,
         };
     };
diff --git a/datahub-web-react/src/app/entityV2/dataProcessInstance/DataProcessInstanceEntity.tsx b/datahub-web-react/src/app/entityV2/dataProcessInstance/DataProcessInstanceEntity.tsx
index 3ab8c2b268aac3..09301b101b259c 100644
--- a/datahub-web-react/src/app/entityV2/dataProcessInstance/DataProcessInstanceEntity.tsx
+++ b/datahub-web-react/src/app/entityV2/dataProcessInstance/DataProcessInstanceEntity.tsx
@@ -1,36 +1,18 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import { globalEntityRegistryV2 } from '@app/EntityRegistryProvider';
+import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity';
+import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile';
+import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader';
+import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils';
+import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions';
+import { LineageTab } from '@app/entityV2/shared/tabs/Lineage/LineageTab';
+import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab';
+import { getDataProduct } from '@app/entityV2/shared/utils';
+import { GetDataProcessInstanceQuery, useGetDataProcessInstanceQuery } from '@graphql/dataProcessInstance.generated';
+import { ArrowsClockwise } from 'phosphor-react';
 import React from 'react';
-import { ApiOutlined } from '@ant-design/icons';
-import { GenericEntityProperties } from '@src/app/entity/shared/types';
-import {
-    DataProcessInstance,
-    Entity as GeneratedEntity,
-    EntityType,
-    OwnershipType,
-    SearchResult,
-} from '../../../types.generated';
-import { Preview } from './preview/Preview';
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
-import { EntityProfile } from '../shared/containers/profile/EntityProfile';
-import { useGetDataProcessInstanceQuery } from '../../../graphql/dataProcessInstance.generated';
-import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
-import { LineageTab } from '../shared/tabs/Lineage/LineageTab';
-import { SidebarAboutSection } from '../shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection';
-import { SidebarOwnerSection } from '../shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { getDataForEntityType } from '../shared/containers/profile/utils';
-import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection';
-import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
-import DataProductSection from '../shared/containers/profile/sidebar/DataProduct/DataProductSection';
-import { getDataProduct } from '../shared/utils';
-// import SummaryTab from './profile/DataProcessInstaceSummary';
-
-// const getProcessPlatformName = (data?: DataProcessInstance): string => {
-//     return (
-//         data?.dataPlatformInstance?.platform?.properties?.displayName ||
-//         capitalizeFirstLetterOnly(data?.dataPlatformInstance?.platform?.name) ||
-//         ''
-//     );
-// };
+import { DataProcessInstance, Entity as GeneratedEntity, EntityType, SearchResult } from '../../../types.generated';
+import Preview from './preview/Preview';
 
 const getParentEntities = (data: DataProcessInstance): GeneratedEntity[] => {
     const parentEntity = data?.relationships?.relationships?.find(
@@ -48,6 +30,7 @@ const getParentEntities = (data: DataProcessInstance): GeneratedEntity[] => {
         },
     ];
 };
+
 /**
  * Definition of the DataHub DataProcessInstance entity.
  */
@@ -56,15 +39,15 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
 
     icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
         if (styleType === IconStyleType.TAB_VIEW) {
-            return <ApiOutlined style={{ fontSize, color }} />;
+            return <ArrowsClockwise style={{ fontSize, color }} />;
         }
 
         if (styleType === IconStyleType.HIGHLIGHT) {
-            return <ApiOutlined style={{ fontSize, color: color || '#B37FEB' }} />;
+            return <ArrowsClockwise style={{ fontSize, color: color || '#B37FEB' }} />;
         }
 
         return (
-            <ApiOutlined
+            <ArrowsClockwise
                 style={{
                     fontSize,
                     color: color || '#BFBFBF',
@@ -73,9 +56,9 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
         );
     };
 
-    isSearchEnabled = () => true;
+    isSearchEnabled = () => false;
 
-    isBrowseEnabled = () => true;
+    isBrowseEnabled = () => false;
 
     isLineageEnabled = () => true;
 
@@ -98,15 +81,10 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
             useEntityQuery={this.useEntityQuery}
             // useUpdateQuery={useUpdateDataProcessInstanceMutation}
             getOverrideProperties={this.getOverridePropertiesFromEntity}
+            headerDropdownItems={
+                new Set([EntityMenuItems.UPDATE_DEPRECATION, EntityMenuItems.RAISE_INCIDENT, EntityMenuItems.SHARE])
+            }
             tabs={[
-                // {
-                //     name: 'Documentation',
-                //     component: DocumentationTab,
-                // },
-                // {
-                //     name: 'Summary',
-                //     component: SummaryTab,
-                // },
                 {
                     name: 'Lineage',
                     component: LineageTab,
@@ -115,51 +93,26 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
                     name: 'Properties',
                     component: PropertiesTab,
                 },
-                // {
-                //     name: 'Incidents',
-                //     component: IncidentTab,
-                //     getDynamicName: (_, processInstance) => {
-                //         const activeIncidentCount = processInstance?.dataProcessInstance?.activeIncidents.total;
-                //         return `Incidents${(activeIncidentCount && ` (${activeIncidentCount})`) || ''}`;
-                //     },
-                // },
             ]}
             sidebarSections={this.getSidebarSections()}
         />
     );
 
-    getSidebarSections = () => [
-        {
-            component: SidebarAboutSection,
-        },
-        {
-            component: SidebarOwnerSection,
-            properties: {
-                defaultOwnerType: OwnershipType.TechnicalOwner,
-            },
-        },
-        {
-            component: SidebarTagsSection,
-            properties: {
-                hasTags: true,
-                hasTerms: true,
-            },
-        },
-        {
-            component: SidebarDomainSection,
-        },
-        {
-            component: DataProductSection,
-        },
-    ];
+    getSidebarSections = () => [{ component: SidebarEntityHeader }];
 
     getOverridePropertiesFromEntity = (processInstance?: DataProcessInstance | null): GenericEntityProperties => {
-        const name = processInstance?.name;
-        const externalUrl = processInstance?.externalUrl;
+        const parent =
+            processInstance?.parentTemplate &&
+            globalEntityRegistryV2.getGenericEntityProperties(
+                processInstance.parentTemplate.type,
+                processInstance.parentTemplate,
+            );
         return {
-            name,
-            externalUrl,
-            platform: processInstance?.dataPlatformInstance?.platform,
+            name: processInstance && this.displayName(processInstance),
+            platform:
+                (processInstance as GetDataProcessInstanceQuery['dataProcessInstance'])?.optionalPlatform ||
+                parent?.platform,
+            parent,
         };
     };
 
@@ -169,73 +122,35 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
         return (
             <Preview
                 urn={data.urn}
-                name={data.properties?.name || data.name || ''}
+                data={genericProperties}
+                name={this.displayName(data)}
                 subType={data.subTypes?.typeNames?.[0]}
                 description=""
-                platformName={
-                    data?.dataPlatformInstance?.platform?.properties?.displayName ||
-                    capitalizeFirstLetterOnly(data?.dataPlatformInstance?.platform?.name)
-                }
-                platformLogo={data?.dataPlatformInstance?.platform?.properties?.logoUrl}
+                platformName={genericProperties?.platform?.properties?.displayName ?? undefined}
+                platformLogo={genericProperties?.platform?.properties?.logoUrl}
                 owners={null}
                 globalTags={null}
-                // domain={data.domain?.domain}
                 dataProduct={getDataProduct(genericProperties?.dataProduct)}
                 externalUrl={data.properties?.externalUrl}
-                parentContainers={data.parentContainers}
                 parentEntities={parentEntities}
                 container={data.container || undefined}
-                // health={data.health}
             />
         );
     };
 
-    renderSearch = (result: SearchResult) => {
-        const data = result.entity as DataProcessInstance;
-        const genericProperties = this.getGenericEntityProperties(data);
-        const parentEntities = getParentEntities(data);
-        return (
-            <Preview
-                urn={data.urn}
-                name={data.properties?.name || data.name || ''}
-                subType={data.subTypes?.typeNames?.[0]}
-                description=""
-                platformName={
-                    data?.dataPlatformInstance?.platform?.properties?.displayName ||
-                    capitalizeFirstLetterOnly(data?.dataPlatformInstance?.platform?.name)
-                }
-                platformLogo={data.dataPlatformInstance?.platform?.properties?.logoUrl}
-                platformInstanceId={data.dataPlatformInstance?.instanceId}
-                owners={null}
-                globalTags={null}
-                //                domain={data.domain?.domain}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                //                deprecation={data.deprecation}
-                insights={result.insights}
-                externalUrl={data.properties?.externalUrl}
-                degree={(result as any).degree}
-                paths={(result as any).paths}
-                parentContainers={data.parentContainers}
-                parentEntities={parentEntities}
-                container={data.container || undefined}
-                // duration={data?.state?.[0]?.durationMillis}
-                // status={data?.state?.[0]?.result?.resultType}
-                // startTime={data?.state?.[0]?.timestampMillis}
-                //                health={data.health}
-            />
-        );
-    };
+    renderSearch = (result: SearchResult) =>
+        this.renderPreview(PreviewType.SEARCH, result.entity as DataProcessInstance);
 
     getLineageVizConfig = (entity: DataProcessInstance) => {
+        const properties = this.getGenericEntityProperties(entity);
         return {
             urn: entity?.urn,
             name: this.displayName(entity),
             type: EntityType.DataProcessInstance,
             subtype: entity?.subTypes?.typeNames?.[0],
-            icon: entity?.dataPlatformInstance?.platform?.properties?.logoUrl || undefined,
-            platform: entity?.dataPlatformInstance?.platform,
+            icon: properties?.platform?.properties?.logoUrl ?? undefined,
+            platform: properties?.platform ?? undefined,
             container: entity?.container,
-            //            health: entity?.health || undefined,
         };
     };
 
diff --git a/datahub-web-react/src/app/entityV2/dataProcessInstance/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/dataProcessInstance/preview/Preview.tsx
index 3a3b0340695d96..4f95d13600374a 100644
--- a/datahub-web-react/src/app/entityV2/dataProcessInstance/preview/Preview.tsx
+++ b/datahub-web-react/src/app/entityV2/dataProcessInstance/preview/Preview.tsx
@@ -1,3 +1,5 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
+import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard';
 import React from 'react';
 import {
     DataProduct,
@@ -11,15 +13,14 @@ import {
     Owner,
     SearchInsight,
     Container,
-    ParentContainersResult,
 } from '../../../../types.generated';
-import DefaultPreviewCard from '../../../preview/DefaultPreviewCard';
 import { useEntityRegistry } from '../../../useEntityRegistry';
 import { IconStyleType } from '../../Entity';
 
-export const Preview = ({
+export default function Preview({
     urn,
     name,
+    data,
     subType,
     description,
     platformName,
@@ -38,13 +39,10 @@ export const Preview = ({
     paths,
     health,
     parentEntities,
-    parentContainers,
-}: // duration,
-// status,
-// startTime,
-{
+}: {
     urn: string;
     name: string;
+    data: GenericEntityProperties | null;
     subType?: string | null;
     description?: string | null;
     platformName?: string;
@@ -63,17 +61,15 @@ export const Preview = ({
     paths?: EntityPath[];
     health?: Health[] | null;
     parentEntities?: Array<GeneratedEntity> | null;
-    parentContainers?: ParentContainersResult | null;
-    // duration?: number | null;
-    // status?: string | null;
-    // startTime?: number | null;
-}): JSX.Element => {
+}): JSX.Element {
     const entityRegistry = useEntityRegistry();
     return (
         <DefaultPreviewCard
+            entityType={EntityType.DataProcessInstance}
             url={entityRegistry.getEntityUrl(EntityType.DataProcessInstance, urn)}
             name={name}
             urn={urn}
+            data={data}
             description={description || ''}
             type={subType || 'Process Instance'}
             typeIcon={entityRegistry.getIcon(EntityType.DataProcessInstance, 14, IconStyleType.ACCENT)}
@@ -81,7 +77,6 @@ export const Preview = ({
             logoUrl={platformLogo || undefined}
             platformInstanceId={platformInstanceId}
             container={container}
-            parentContainers={parentContainers}
             owners={owners}
             tags={globalTags || undefined}
             domain={domain}
@@ -95,9 +90,6 @@ export const Preview = ({
             paths={paths}
             health={health || undefined}
             parentEntities={parentEntities}
-            // duration={duration}
-            // status={status}
-            // startTime={startTime}
         />
     );
-};
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchSection.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchSection.tsx
index a9601cc12df30b..2dd17f21e8e0eb 100644
--- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchSection.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearchSection.tsx
@@ -4,7 +4,7 @@ import { useHistory, useLocation } from 'react-router';
 import { ApolloError } from '@apollo/client';
 import useSortInput from '@src/app/searchV2/sorting/useSortInput';
 import { useSelectedSortOption } from '@src/app/search/context/SearchContext';
-import { FacetFilterInput } from '../../../../../../types.generated';
+import { EntityType, FacetFilterInput } from '../../../../../../types.generated';
 import useFilters from '../../../../../search/utils/useFilters';
 import { navigateToEntitySearchUrl } from './navigateToEntitySearchUrl';
 import { FilterSet, GetSearchResultsParams, SearchResultsInterface } from './types';
@@ -19,6 +19,30 @@ import {
 import { decodeComma } from '../../../utils';
 
 const FILTER = 'filter';
+const SEARCH_ENTITY_TYPES = [
+    EntityType.Dataset,
+    EntityType.Dashboard,
+    EntityType.Chart,
+    EntityType.Mlmodel,
+    EntityType.MlmodelGroup,
+    EntityType.MlfeatureTable,
+    EntityType.Mlfeature,
+    EntityType.MlprimaryKey,
+    EntityType.DataFlow,
+    EntityType.DataJob,
+    EntityType.GlossaryTerm,
+    EntityType.GlossaryNode,
+    EntityType.Tag,
+    EntityType.Role,
+    EntityType.CorpUser,
+    EntityType.CorpGroup,
+    EntityType.Container,
+    EntityType.Domain,
+    EntityType.DataProduct,
+    EntityType.Notebook,
+    EntityType.BusinessAttribute,
+    EntityType.DataProcessInstance,
+];
 
 function getParamsWithoutFilters(params: QueryString.ParsedQuery<string>) {
     const paramsCopy = { ...params };
@@ -146,6 +170,7 @@ export const EmbeddedListSearchSection = ({
 
     return (
         <EmbeddedListSearch
+            entityTypes={SEARCH_ENTITY_TYPES}
             query={query || ''}
             page={page}
             unionType={unionType}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx
index 8faf069c68b022..1569b047429775 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx
@@ -6,6 +6,7 @@ import {
     DataPlatform,
     DisplayProperties,
     Domain,
+    Entity,
     EntityType,
     Post,
 } from '../../../../../../types.generated';
@@ -148,6 +149,14 @@ export const DefaultEntityHeader = ({
     const displayedEntityType = getDisplayedEntityType(entityData, entityRegistry, entityType);
     const { platform, platforms } = getEntityPlatforms(entityType, entityData);
 
+    const containerPath =
+        entityData?.parentContainers?.containers ||
+        entityData?.parentDomains?.domains ||
+        entityData?.parentNodes?.nodes ||
+        [];
+    const parentPath: Entity[] = entityData?.parent ? [entityData.parent as Entity] : [];
+    const parentEntities = containerPath.length ? containerPath : parentPath;
+
     return (
         <>
             <Row>
@@ -222,11 +231,7 @@ export const DefaultEntityHeader = ({
                                             type={displayedEntityType}
                                             entityType={entityType}
                                             browsePaths={entityData?.browsePathV2}
-                                            parentEntities={
-                                                entityData?.parentContainers?.containers ||
-                                                entityData?.parentDomains?.domains ||
-                                                entityData?.parentNodes?.nodes
-                                            }
+                                            parentEntities={parentEntities}
                                             contentRef={contentRef}
                                             isContentTruncated={isContentTruncated}
                                         />
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader.tsx
index 4d8eeba24408c7..eaef45ad00dcbd 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
-import { Container, DataPlatform, EntityType, Post } from '../../../../../../types.generated';
 import { useEntityData, useRefetch } from '../../../../../entity/shared/EntityContext';
+import { Container, DataPlatform, EntityType, Post, Entity } from '../../../../../../types.generated';
 import ContextPath from '../../../../../previewV2/ContextPath';
 import HealthIcon from '../../../../../previewV2/HealthIcon';
 import NotesIcon from '../../../../../previewV2/NotesIcon';
@@ -56,6 +56,14 @@ const SidebarEntityHeader = () => {
     const platforms =
         entityType === EntityType.SchemaField ? entityData?.parent?.siblingPlatforms : entityData?.siblingPlatforms;
 
+    const containerPath =
+        entityData?.parentContainers?.containers ||
+        entityData?.parentDomains?.domains ||
+        entityData?.parentNodes?.nodes ||
+        [];
+    const parentPath: Entity[] = entityData?.parent ? [entityData.parent as Entity] : [];
+    const parentEntities = containerPath.length ? containerPath : parentPath;
+
     if (loading) {
         return <EntityTitleLoadingSection />;
     }
@@ -90,11 +98,7 @@ const SidebarEntityHeader = () => {
                     type={displayedEntityType}
                     entityType={entityType}
                     browsePaths={entityData?.browsePathV2}
-                    parentEntities={
-                        entityData?.parentContainers?.containers ||
-                        entityData?.parentDomains?.domains ||
-                        entityData?.parentNodes?.nodes
-                    }
+                    parentEntities={parentEntities}
                     contentRef={contentRef}
                     isContentTruncated={isContentTruncated}
                 />
diff --git a/datahub-web-react/src/app/ingest/source/builder/constants.ts b/datahub-web-react/src/app/ingest/source/builder/constants.ts
index 58525b3e88f975..9711dfe2f03d73 100644
--- a/datahub-web-react/src/app/ingest/source/builder/constants.ts
+++ b/datahub-web-react/src/app/ingest/source/builder/constants.ts
@@ -29,7 +29,7 @@ import powerbiLogo from '../../../../images/powerbilogo.png';
 import modeLogo from '../../../../images/modelogo.png';
 import databricksLogo from '../../../../images/databrickslogo.png';
 import verticaLogo from '../../../../images/verticalogo.png';
-import mlflowLogo from '../../../../images/mlflowlogo.png';
+import mlflowLogo2 from '../../../../images/mlflowlogo2.png';
 import dynamodbLogo from '../../../../images/dynamodblogo.png';
 import fivetranLogo from '../../../../images/fivetranlogo.png';
 import csvLogo from '../../../../images/csv-logo.png';
@@ -159,7 +159,7 @@ export const PLATFORM_URN_TO_LOGO = {
     [LOOKER_URN]: lookerLogo,
     [MARIA_DB_URN]: mariadbLogo,
     [METABASE_URN]: metabaseLogo,
-    [MLFLOW_URN]: mlflowLogo,
+    [MLFLOW_URN]: mlflowLogo2,
     [MODE_URN]: modeLogo,
     [MONGO_DB_URN]: mongodbLogo,
     [MSSQL_URN]: mssqlLogo,
diff --git a/datahub-web-react/src/app/lineageV2/LineageExplorer.tsx b/datahub-web-react/src/app/lineageV2/LineageExplorer.tsx
index d9f64696625ca6..ff30a54dc36db9 100644
--- a/datahub-web-react/src/app/lineageV2/LineageExplorer.tsx
+++ b/datahub-web-react/src/app/lineageV2/LineageExplorer.tsx
@@ -36,10 +36,11 @@ export default function LineageExplorer(props: Props) {
     const [columnEdgeVersion, setColumnEdgeVersion] = useState(0);
     const [displayVersion, setDisplayVersion] = useState<[number, string[]]>([0, []]);
     const [hideTransformations, setHideTransformations] = useShouldHideTransformations();
+    const [showDataProcessInstances, setShowDataProcessInstances] = useState(false);
 
     const [showGhostEntities, setShowGhostEntities] = useState(false);
 
-    const context = {
+    const context: NodeContext = {
         rootUrn: urn,
         rootType: type,
         nodes,
@@ -55,6 +56,8 @@ export default function LineageExplorer(props: Props) {
         setColumnEdgeVersion,
         hideTransformations,
         setHideTransformations,
+        showDataProcessInstances,
+        setShowDataProcessInstances,
         showGhostEntities,
         setShowGhostEntities,
     };
diff --git a/datahub-web-react/src/app/lineageV2/LineageFilterNode/computeOrFilters.ts b/datahub-web-react/src/app/lineageV2/LineageFilterNode/computeOrFilters.ts
index 252f1d2054ea38..44b523efe49acb 100644
--- a/datahub-web-react/src/app/lineageV2/LineageFilterNode/computeOrFilters.ts
+++ b/datahub-web-react/src/app/lineageV2/LineageFilterNode/computeOrFilters.ts
@@ -13,10 +13,27 @@ import { AndFilterInput, EntityType, FacetFilterInput } from '@types';
 export default function computeOrFilters(
     defaultFilters: FacetFilterInput[],
     hideTransformations = true,
+    hideDataProcessInstances = true,
 ): AndFilterInput[] {
-    if (!hideTransformations) {
+    if (!hideTransformations && !hideDataProcessInstances) {
         return [{ and: defaultFilters }];
     }
+
+    if (!hideTransformations) {
+        return [
+            {
+                and: [
+                    ...defaultFilters,
+                    {
+                        field: ENTITY_FILTER_NAME,
+                        values: [EntityType.DataProcessInstance],
+                        negated: true,
+                    },
+                ],
+            },
+        ];
+    }
+
     return [
         {
             and: [
diff --git a/datahub-web-react/src/app/lineageV2/LineageFilterNode/useFetchFilterNodeContents.ts b/datahub-web-react/src/app/lineageV2/LineageFilterNode/useFetchFilterNodeContents.ts
index bab6e1dc4705bf..cdfd7f66f3a1ff 100644
--- a/datahub-web-react/src/app/lineageV2/LineageFilterNode/useFetchFilterNodeContents.ts
+++ b/datahub-web-react/src/app/lineageV2/LineageFilterNode/useFetchFilterNodeContents.ts
@@ -20,9 +20,13 @@ interface Return {
 
 export default function useFetchFilterNodeContents(parent: string, direction: LineageDirection, skip: boolean): Return {
     const { startTimeMillis, endTimeMillis } = useGetLineageTimeParams();
-    const { hideTransformations } = useContext(LineageNodesContext);
+    const { hideTransformations, showDataProcessInstances } = useContext(LineageNodesContext);
 
-    const orFilters = computeOrFilters([{ field: DEGREE_FILTER_NAME, values: ['1'] }], hideTransformations);
+    const orFilters = computeOrFilters(
+        [{ field: DEGREE_FILTER_NAME, values: ['1'] }],
+        hideTransformations,
+        showDataProcessInstances,
+    );
     const { data } = useAggregateAcrossLineageQuery({
         skip,
         fetchPolicy: 'cache-first',
diff --git a/datahub-web-react/src/app/lineageV2/LineageTransformationNode/LineageTransformationNode.tsx b/datahub-web-react/src/app/lineageV2/LineageTransformationNode/LineageTransformationNode.tsx
index 84e4b8fb39a883..aef9ecf9833f28 100644
--- a/datahub-web-react/src/app/lineageV2/LineageTransformationNode/LineageTransformationNode.tsx
+++ b/datahub-web-react/src/app/lineageV2/LineageTransformationNode/LineageTransformationNode.tsx
@@ -2,6 +2,7 @@ import { ConsoleSqlOutlined, HomeOutlined, LoadingOutlined } from '@ant-design/i
 import LineageVisualizationContext from '@app/lineageV2/LineageVisualizationContext';
 import { Skeleton, Spin } from 'antd';
 import { Tooltip } from '@components';
+import { useEntityRegistryV2 } from '@app/useEntityRegistry';
 import React, { useContext } from 'react';
 import { Handle, NodeProps, Position } from 'reactflow';
 import styled from 'styled-components';
@@ -68,6 +69,7 @@ const NodeWrapper = styled.div<{
 `;
 
 const IconWrapper = styled.div<{ isGhost: boolean }>`
+    display: flex;
     opacity: ${({ isGhost }) => (isGhost ? 0.5 : 1)};
 `;
 
@@ -92,7 +94,9 @@ const CustomIcon = styled.img`
 export default function LineageTransformationNode(props: NodeProps<LineageEntity>) {
     const { data, selected, dragging } = props;
     const { urn, type, entity, fetchStatus } = data;
+    const entityRegistry = useEntityRegistryV2();
     const isQuery = type === EntityType.Query;
+    const isDataProcessInstance = type === EntityType.DataProcessInstance;
 
     const { rootUrn } = useContext(LineageNodesContext);
     const { cllHighlightedNodes, setHoveredNode } = useContext(LineageDisplayContext);
@@ -131,8 +135,11 @@ export default function LineageTransformationNode(props: NodeProps<LineageEntity
             )}
             <IconWrapper isGhost={isGhost}>
                 {icon && <CustomIcon src={icon} />}
+                {!icon && isDataProcessInstance && entityRegistry.getIcon(EntityType.DataProcessInstance, 18)}
                 {!icon && isQuery && <ConsoleSqlOutlined />}
-                {!icon && !isQuery && <Skeleton.Avatar active shape="circle" size={TRANSFORMATION_NODE_SIZE} />}
+                {!icon && !isQuery && !isDataProcessInstance && (
+                    <Skeleton.Avatar active shape="circle" size={TRANSFORMATION_NODE_SIZE} />
+                )}
             </IconWrapper>
             {fetchStatus[LineageDirection.Upstream] === FetchStatus.LOADING && (
                 <LoadingWrapper className="nodrag" style={{ left: -30 }}>
diff --git a/datahub-web-react/src/app/lineageV2/NodeBuilder.ts b/datahub-web-react/src/app/lineageV2/NodeBuilder.ts
index f369f95ceefc4f..07eacabc974f1e 100644
--- a/datahub-web-react/src/app/lineageV2/NodeBuilder.ts
+++ b/datahub-web-react/src/app/lineageV2/NodeBuilder.ts
@@ -180,7 +180,6 @@ export default class NodeBuilder {
     createEdges(edges: NodeContext['edges']): Edge<LineageTableEdgeData>[] {
         const baseEdges = new Map<EdgeId, BaseEdge<LineageTableEdgeData>>();
         edges.forEach((edge, edgeId) => {
-            if (!edge.isDisplayed) return;
             const [upstream, downstream] = parseEdgeId(edgeId);
             if (upstream in this.nodeInformation && downstream in this.nodeInformation) {
                 const upstreamDirection = this.nodeInformation[upstream].direction;
diff --git a/datahub-web-react/src/app/lineageV2/common.ts b/datahub-web-react/src/app/lineageV2/common.ts
index 1110460a6a0537..65ae9736f2cbb2 100644
--- a/datahub-web-react/src/app/lineageV2/common.ts
+++ b/datahub-web-react/src/app/lineageV2/common.ts
@@ -75,7 +75,7 @@ export interface LineageFilter extends NodeBase {
 
 export type LineageNode = LineageEntity | LineageFilter;
 
-const TRANSFORMATION_TYPES: string[] = [EntityType.Query, EntityType.DataJob];
+const TRANSFORMATION_TYPES: string[] = [EntityType.Query, EntityType.DataJob, EntityType.DataProcessInstance];
 
 export function useIgnoreSchemaFieldStatus(): boolean {
     return useAppConfig().config.featureFlags.schemaFieldLineageIgnoreStatus;
@@ -128,6 +128,11 @@ export function isUrnQuery(urn: string, entityRegistry: EntityRegistry): boolean
     return type === EntityType.Query;
 }
 
+export function isUrnDataProcessInstance(urn: string, entityRegistry: EntityRegistry): boolean {
+    const type = getEntityTypeFromEntityUrn(urn, entityRegistry);
+    return type === EntityType.DataProcessInstance;
+}
+
 export function isUrnTransformational(urn: string, entityRegistry: EntityRegistry): boolean {
     const type = getEntityTypeFromEntityUrn(urn, entityRegistry);
     return (!!type && TRANSFORMATION_TYPES.includes(type)) || isUrnDbt(urn, entityRegistry);
@@ -211,6 +216,8 @@ export interface NodeContext {
     setColumnEdgeVersion: Dispatch<SetStateAction<number>>;
     hideTransformations: boolean;
     setHideTransformations: (hide: boolean) => void;
+    showDataProcessInstances: boolean;
+    setShowDataProcessInstances: (hide: boolean) => void;
     showGhostEntities: boolean;
     setShowGhostEntities: (hide: boolean) => void;
 }
@@ -234,6 +241,8 @@ export const LineageNodesContext = React.createContext<NodeContext>({
     setColumnEdgeVersion: () => {},
     hideTransformations: false,
     setHideTransformations: () => {},
+    showDataProcessInstances: false,
+    setShowDataProcessInstances: () => {},
     showGhostEntities: false,
     setShowGhostEntities: () => {},
 });
@@ -342,6 +351,7 @@ export function onClickPreventSelect(event: React.MouseEvent): true {
 
 const DATA_STORE_COLOR = '#ffd279';
 const BI_TOOL_COLOR = '#8682a2';
+const ML_COLOR = '#206de8';
 const DEFAULT_COLOR = '#ff7979';
 
 export function getNodeColor(type?: EntityType): [string, string] {
@@ -351,5 +361,14 @@ export function getNodeColor(type?: EntityType): [string, string] {
     if (type === EntityType.Dataset) {
         return [DATA_STORE_COLOR, 'Column'];
     }
-    return [DEFAULT_COLOR, 'Column'];
+    if (
+        type === EntityType.Mlmodel ||
+        type === EntityType.MlmodelGroup ||
+        type === EntityType.Mlfeature ||
+        type === EntityType.MlfeatureTable ||
+        type === EntityType.MlprimaryKey
+    ) {
+        return [ML_COLOR, ''];
+    }
+    return [DEFAULT_COLOR, ''];
 }
diff --git a/datahub-web-react/src/app/lineageV2/controls/LineageControls.tsx b/datahub-web-react/src/app/lineageV2/controls/LineageControls.tsx
index 4dfde23ea3427c..df306d5759869b 100644
--- a/datahub-web-react/src/app/lineageV2/controls/LineageControls.tsx
+++ b/datahub-web-react/src/app/lineageV2/controls/LineageControls.tsx
@@ -56,7 +56,8 @@ const ControlsColumn = styled.div``;
 type PanelType = 'filters' | 'timeRange';
 
 export default function LineageControls() {
-    const { rootUrn, hideTransformations, showGhostEntities } = useContext(LineageNodesContext);
+    const { rootUrn, hideTransformations, showDataProcessInstances, showGhostEntities } =
+        useContext(LineageNodesContext);
     const { isTabFullsize, setTabFullsize } = useContext(TabFullsizedContext);
     const { isDefault: isLineageTimeUnchanged } = useGetLineageTimeParams();
     const { fitView } = useReactFlow();
@@ -104,7 +105,10 @@ export default function LineageControls() {
                     >
                         <FilterOutlined
                             style={{
-                                color: hideTransformations || showGhostEntities ? REDESIGN_COLORS.BLUE : undefined,
+                                color:
+                                    hideTransformations || showDataProcessInstances || showGhostEntities
+                                        ? REDESIGN_COLORS.BLUE
+                                        : undefined,
                             }}
                         />
                         {showExpandedText ? 'Filter' : null}
diff --git a/datahub-web-react/src/app/lineageV2/controls/LineageSearchFilters.tsx b/datahub-web-react/src/app/lineageV2/controls/LineageSearchFilters.tsx
index 59d4a801a5147c..25a34748bf9c43 100644
--- a/datahub-web-react/src/app/lineageV2/controls/LineageSearchFilters.tsx
+++ b/datahub-web-react/src/app/lineageV2/controls/LineageSearchFilters.tsx
@@ -41,6 +41,8 @@ export default function LineageSearchFilters() {
         nodeVersion,
         hideTransformations,
         setHideTransformations,
+        showDataProcessInstances,
+        setShowDataProcessInstances,
         showGhostEntities,
         setShowGhostEntities,
     } = useContext(LineageNodesContext);
@@ -75,6 +77,17 @@ export default function LineageSearchFilters() {
                     />
                 </Tooltip>
             </ToggleWrapper>
+            <ToggleWrapper>
+                <span>
+                    <ToggleLabel>
+                        Show Process Instances
+                        <StyledInfoPopover
+                            content={<PopoverWrapper>Show task runs. Will not hide home node.</PopoverWrapper>}
+                        />
+                    </ToggleLabel>
+                </span>
+                <StyledSwitch size="small" checked={showDataProcessInstances} onChange={setShowDataProcessInstances} />
+            </ToggleWrapper>
             <ToggleWrapper>
                 <span>
                     <ToggleLabel>
diff --git a/datahub-web-react/src/app/lineageV2/pruneAllDuplicateEdges.ts b/datahub-web-react/src/app/lineageV2/pruneAllDuplicateEdges.ts
new file mode 100644
index 00000000000000..9873b5906ac44a
--- /dev/null
+++ b/datahub-web-react/src/app/lineageV2/pruneAllDuplicateEdges.ts
@@ -0,0 +1,135 @@
+import EntityRegistry from '@app/entityV2/EntityRegistry';
+import {
+    createEdgeId,
+    getEdgeId,
+    isUrnDataProcessInstance,
+    isUrnTransformational,
+    NodeContext,
+} from '@app/lineageV2/common';
+import { LineageDirection } from '@types';
+
+enum HideOption {
+    TRANSFORMATIONS = 'transformations',
+    DATA_PROCESS_INSTANCES = 'dataProcessInstances',
+}
+
+const hideOptionIncludeUrnFunctions: Record<HideOption, (urn: string, entityRegistry: EntityRegistry) => boolean> = {
+    [HideOption.TRANSFORMATIONS]: isUrnTransformational,
+    [HideOption.DATA_PROCESS_INSTANCES]: isUrnDataProcessInstance,
+};
+
+/**
+ * Remove direct edges between non-transformational nodes, if there is a path between them through a transformational node.
+ * Remove direct edges between non-data process instances, if there is a path between them through data process instances.
+ * This prevents the graph from being cluttered with effectively duplicate edges.
+ * @param urn Urn for which to remove parent edges.
+ * @param direction Direction to look for parents.
+ * @param context Lineage node context.
+ * @param entityRegistry EntityRegistry, used to get EntityType from an urn.
+ */
+export default function pruneAllDuplicateEdges(
+    urn: string,
+    direction: LineageDirection | null,
+    context: Pick<NodeContext, 'adjacencyList' | 'edges' | 'setDisplayVersion'>,
+    entityRegistry: EntityRegistry,
+) {
+    let changed = false;
+    Object.values(HideOption).forEach((hideOption) => {
+        changed ||= pruneDuplicateEdges(urn, direction, hideOption, context, entityRegistry);
+    });
+    if (changed) {
+        context.setDisplayVersion(([version, nodes]) => [version + 1, nodes]);
+    }
+}
+
+/**
+ * Remove direct edges between a certain set of "excluded" nodes, if there is a path between them through only "included" nodes.
+ */
+export function pruneDuplicateEdges(
+    urn: string,
+    direction: LineageDirection | null,
+    hideOption: HideOption,
+    context: Pick<NodeContext, 'adjacencyList' | 'edges'>,
+    entityRegistry: EntityRegistry,
+): boolean {
+    const { edges } = context;
+    const neighbors: Record<LineageDirection, Set<string>> = {
+        [LineageDirection.Downstream]: new Set(),
+        [LineageDirection.Upstream]: new Set(),
+    };
+
+    const includeUrn = hideOptionIncludeUrnFunctions[hideOption];
+    const isUrnIncluded = includeUrn(urn, entityRegistry);
+
+    function getNeighbors(d: LineageDirection) {
+        return getNeighborsByFunction(urn, d, includeUrn, context, entityRegistry);
+    }
+
+    if (direction) {
+        neighbors[direction] = getNeighbors(direction);
+    } else {
+        neighbors[LineageDirection.Upstream] = getNeighbors(LineageDirection.Upstream);
+        neighbors[LineageDirection.Downstream] = getNeighbors(LineageDirection.Downstream);
+    }
+
+    let changed = false;
+    if (isUrnIncluded) {
+        neighbors[LineageDirection.Upstream].forEach((source) => {
+            neighbors[LineageDirection.Downstream].forEach((destination) => {
+                const edge = edges.get(createEdgeId(source, destination));
+                if (edge?.isDisplayed) {
+                    edge.isDisplayed = false;
+                    changed = true;
+                }
+            });
+        });
+    } else {
+        Object.values(LineageDirection).forEach((d) => {
+            neighbors[d].forEach((source) => {
+                const edge = edges.get(getEdgeId(urn, source, d));
+                if (edge?.isDisplayed) {
+                    edge.isDisplayed = false;
+                    changed = true;
+                }
+            });
+        });
+    }
+
+    return changed;
+}
+
+/**
+ * Get the non-transformational nodes that are reachable from `urn` in `direction` via a transformational path.
+ * @param urn Urn for which to get neighbors.
+ * @param direction Direction to look for neighbors.
+ * @param includeUrn Function to determine if a node should be included, based on its urn.
+ * @param adjacencyList Adjacency list of the lineage graph.
+ * @param entityRegistry EntityRegistry, used to get EntityType from an urn.
+ */
+function getNeighborsByFunction(
+    urn: string,
+    direction: LineageDirection,
+    includeUrn: (urn: string, entityRegistry: EntityRegistry) => boolean,
+    { adjacencyList }: Pick<NodeContext, 'adjacencyList'>,
+    entityRegistry: EntityRegistry,
+) {
+    const neighbors = new Set<string>();
+    // If urn is included, then direct neighbors can be included
+    const stack = includeUrn(urn, entityRegistry)
+        ? [urn]
+        : Array.from(adjacencyList[direction].get(urn) || []).filter((p) => includeUrn(p, entityRegistry));
+    const seen = new Set<string>(stack);
+    for (let u = stack.pop(); u; u = stack.pop()) {
+        Array.from(adjacencyList[direction].get(u) || []).forEach((parent) => {
+            if (includeUrn(parent, entityRegistry)) {
+                if (!seen.has(parent)) {
+                    stack.push(parent);
+                    seen.add(parent);
+                }
+            } else {
+                neighbors.add(parent);
+            }
+        });
+    }
+    return neighbors;
+}
diff --git a/datahub-web-react/src/app/lineageV2/useBulkEntityLineage.ts b/datahub-web-react/src/app/lineageV2/useBulkEntityLineage.ts
index 1cfc6c892fc3e4..54769a0a1243fe 100644
--- a/datahub-web-react/src/app/lineageV2/useBulkEntityLineage.ts
+++ b/datahub-web-react/src/app/lineageV2/useBulkEntityLineage.ts
@@ -1,3 +1,4 @@
+import pruneAllDuplicateEdges from '@app/lineageV2/pruneAllDuplicateEdges';
 import { useAppConfig } from '@app/useAppConfig';
 import { useCallback, useContext, useEffect, useState } from 'react';
 import { useGetBulkEntityLineageV2Query } from '../../graphql/lineage.generated';
@@ -18,7 +19,7 @@ import {
     useIgnoreSchemaFieldStatus,
 } from './common';
 import { FetchedEntityV2Relationship } from './types';
-import { addQueryNodes, pruneDuplicateEdges, setEntityNodeDefault } from './useSearchAcrossLineage';
+import { addQueryNodes, setEntityNodeDefault } from './useSearchAcrossLineage';
 
 const BATCH_SIZE = 10;
 
@@ -100,7 +101,7 @@ export default function useBulkEntityLineage(shownUrns: string[]): (urn: string)
     const entityRegistry = useEntityRegistryV2();
 
     useEffect(() => {
-        const smallContext = { nodes, edges, adjacencyList };
+        const smallContext = { nodes, edges, adjacencyList, setDisplayVersion };
         let changed = false;
         data?.entities?.forEach((rawEntity) => {
             if (!rawEntity) return;
@@ -122,7 +123,7 @@ export default function useBulkEntityLineage(shownUrns: string[]): (urn: string)
                     entity.upstreamRelationships?.forEach((relationship) => {
                         processEdge(node, relationship, LineageDirection.Upstream, smallContext);
                     });
-                    pruneDuplicateEdges(node.urn, null, smallContext, entityRegistry);
+                    pruneAllDuplicateEdges(node.urn, null, smallContext, entityRegistry);
                 }
             }
         });
diff --git a/datahub-web-react/src/app/lineageV2/useColumnHighlighting.ts b/datahub-web-react/src/app/lineageV2/useColumnHighlighting.ts
index cd44609e0630df..82de5330346429 100644
--- a/datahub-web-react/src/app/lineageV2/useColumnHighlighting.ts
+++ b/datahub-web-react/src/app/lineageV2/useColumnHighlighting.ts
@@ -33,8 +33,17 @@ export default function useColumnHighlighting(
 } {
     const entityRegistry = useEntityRegistryV2();
     const { setEdges } = useReactFlow();
-    const { nodes, adjacencyList, edges, rootUrn, rootType, nodeVersion, columnEdgeVersion, hideTransformations } =
-        useContext(LineageNodesContext);
+    const {
+        nodes,
+        adjacencyList,
+        edges,
+        rootUrn,
+        rootType,
+        nodeVersion,
+        columnEdgeVersion,
+        hideTransformations,
+        showDataProcessInstances,
+    } = useContext(LineageNodesContext);
 
     const { cllHighlightedNodes, highlightedColumns, columnEdges } = useMemo(() => {
         const displayedNodeIds = new Set(shownUrns);
@@ -73,7 +82,7 @@ export default function useColumnHighlighting(
                 }),
             0,
         );
-    }, [nodeVersion, hideTransformations, columnEdges, setEdges]);
+    }, [nodeVersion, hideTransformations, showDataProcessInstances, columnEdges, setEdges]);
 
     return { cllHighlightedNodes, highlightedColumns };
 }
diff --git a/datahub-web-react/src/app/lineageV2/useComputeGraph/filterNodes.ts b/datahub-web-react/src/app/lineageV2/useComputeGraph/filterNodes.ts
index 224986962b89aa..edfd36dd53e0ea 100644
--- a/datahub-web-react/src/app/lineageV2/useComputeGraph/filterNodes.ts
+++ b/datahub-web-react/src/app/lineageV2/useComputeGraph/filterNodes.ts
@@ -1,19 +1,22 @@
+import { globalEntityRegistryV2 } from '@app/EntityRegistryProvider';
 import {
     addToAdjacencyList,
     EdgeId,
     getEdgeId,
     isGhostEntity,
     isTransformational,
+    isUrnQuery,
     LineageAuditStamp,
     LineageEdge,
     NodeContext,
     parseEdgeId,
     setDefault,
 } from '@app/lineageV2/common';
-import { LineageDirection } from '@types';
+import { EntityType, LineageDirection } from '@types';
 
 export interface HideNodesConfig {
     hideTransformations: boolean;
+    hideDataProcessInstances: boolean;
     hideGhostEntities: boolean;
     ignoreSchemaFieldStatus: boolean;
 }
@@ -25,7 +28,7 @@ type ContextSubset = Pick<NodeContext, 'nodes' | 'edges' | 'adjacencyList'>;
  */
 export default function hideNodes(
     rootUrn: string,
-    { hideTransformations, hideGhostEntities, ignoreSchemaFieldStatus }: HideNodesConfig,
+    { hideTransformations, hideDataProcessInstances, hideGhostEntities, ignoreSchemaFieldStatus }: HideNodesConfig,
     { nodes, edges, adjacencyList }: ContextSubset,
 ): ContextSubset {
     let newNodes = nodes;
@@ -51,6 +54,25 @@ export default function hideNodes(
             adjacencyList: newAdjacencyList,
         }));
     }
+    if (hideDataProcessInstances) {
+        // Note: Will only pick one query node if there is lineage t1 -> q1 -> dpi1 -> q2 -> t2
+        // Currently data process instances can't have lineage to queries so this is fine
+        newNodes = new Map(
+            Array.from(newNodes).filter(
+                ([urn, node]) => urn === rootUrn || node?.entity?.type !== EntityType.DataProcessInstance,
+            ),
+        );
+        ({ newEdges, newAdjacencyList } = connectEdges(rootUrn, {
+            nodes: newNodes,
+            edges: newEdges,
+            adjacencyList: newAdjacencyList,
+        }));
+    }
+    ({ newEdges, newAdjacencyList } = removeHiddenEdges({
+        nodes: newNodes,
+        adjacencyList: newAdjacencyList,
+        edges: newEdges,
+    }));
 
     return { nodes: newNodes, edges: newEdges, adjacencyList: newAdjacencyList };
 }
@@ -99,24 +121,30 @@ function connectEdges(rootUrn: string, { nodes, edges, adjacencyList }: ContextS
         seen.add(id);
 
         adjacencyList[direction].get(id)?.forEach((neighbor) => {
+            if (isUrnQuery(neighbor, globalEntityRegistryV2)) {
+                return;
+            }
             if (nodes.has(neighbor)) {
                 addToAdjacencyList(newAdjacencyList, direction, id, neighbor);
                 const edgeId = getEdgeId(id, neighbor, direction);
-                // isDisplayed always true -- only set to false right now to deduplicate edges through dbt
-                newEdges.set(edgeId, { ...edges.get(edgeId), via: undefined, isDisplayed: true });
+                const existingEdge = newEdges.get(edgeId);
+                newEdges.set(edgeId, mergeEdges(edges.get(edgeId), existingEdge));
                 buildNewAdjacencyList(neighbor, direction);
             } else {
                 buildNewAdjacencyList(neighbor, direction)?.forEach((child) => {
                     addToAdjacencyList(newAdjacencyList, direction, id, child);
                     const edgeId = getEdgeId(id, child, direction);
                     const firstEdge = edges.get(getEdgeId(id, neighbor, direction));
-                    const secondEdge = edges.get(getEdgeId(neighbor, child, direction));
-                    newEdges.set(edgeId, {
+                    const secondEdge = newEdges.get(getEdgeId(neighbor, child, direction));
+                    const existingEdge = newEdges.get(edgeId);
+                    const newEdge = {
                         isManual: (firstEdge?.isManual || secondEdge?.isManual) ?? false,
                         created: getLatestTimestamp(firstEdge?.created, secondEdge?.created),
                         updated: getLatestTimestamp(firstEdge?.updated, secondEdge?.updated),
-                        isDisplayed: true,
-                    });
+                        isDisplayed: (firstEdge?.isDisplayed && secondEdge?.isDisplayed) ?? false,
+                        via: firstEdge?.via || secondEdge?.via,
+                    };
+                    newEdges.set(edgeId, mergeEdges(newEdge, existingEdge));
                 });
             }
         });
@@ -126,9 +154,50 @@ function connectEdges(rootUrn: string, { nodes, edges, adjacencyList }: ContextS
     buildNewAdjacencyList(rootUrn, LineageDirection.Upstream);
     seen.clear();
     buildNewAdjacencyList(rootUrn, LineageDirection.Downstream);
+
+    newEdges.forEach((edge, edgeId) => {
+        const [upstream, downstream] = parseEdgeId(edgeId);
+        if (edge.via && nodes.has(edge.via) && nodes.get(edge.via)?.type === EntityType.Query) {
+            setDefault(newAdjacencyList[LineageDirection.Upstream], edge.via, new Set()).add(upstream);
+            setDefault(newAdjacencyList[LineageDirection.Downstream], edge.via, new Set()).add(downstream);
+        }
+    });
+
     return { newAdjacencyList, newEdges };
 }
 
+/** Merge two edges, each representing a different path between two nodes. */
+function mergeEdges(edgeA?: LineageEdge, edgeB?: LineageEdge): LineageEdge {
+    return {
+        isManual: edgeA?.isManual && edgeB?.isManual,
+        created: getLatestTimestamp(edgeA?.created, edgeB?.created),
+        updated: getLatestTimestamp(edgeA?.updated, edgeB?.updated),
+        isDisplayed: (edgeA?.isDisplayed || edgeB?.isDisplayed) ?? false,
+        via: edgeA?.via || edgeB?.via,
+    };
+}
+
+function removeHiddenEdges({ edges }: ContextSubset) {
+    const newEdges = new Map<EdgeId, LineageEdge>();
+    const newAdjacencyList: NodeContext['adjacencyList'] = {
+        [LineageDirection.Upstream]: new Map(),
+        [LineageDirection.Downstream]: new Map(),
+    };
+
+    edges.forEach((edge, edgeId) => {
+        const [upstream, downstream] = parseEdgeId(edgeId);
+        if (edge.isDisplayed) {
+            addToAdjacencyList(newAdjacencyList, LineageDirection.Upstream, downstream, upstream);
+            newEdges.set(edgeId, edge);
+            if (edge.via) {
+                setDefault(newAdjacencyList[LineageDirection.Upstream], edge.via, new Set()).add(upstream);
+                setDefault(newAdjacencyList[LineageDirection.Downstream], edge.via, new Set()).add(downstream);
+            }
+        }
+    });
+    return { newEdges, newAdjacencyList };
+}
+
 function getLatestTimestamp(
     a: LineageAuditStamp | undefined,
     b: LineageAuditStamp | undefined,
diff --git a/datahub-web-react/src/app/lineageV2/useComputeGraph/getDisplayedNodes.ts b/datahub-web-react/src/app/lineageV2/useComputeGraph/getDisplayedNodes.ts
index 81d213a158cd53..cfe4e442884b0b 100644
--- a/datahub-web-react/src/app/lineageV2/useComputeGraph/getDisplayedNodes.ts
+++ b/datahub-web-react/src/app/lineageV2/useComputeGraph/getDisplayedNodes.ts
@@ -254,7 +254,7 @@ function getTransformationalNodes(
             }
             if (nodesInBetween.has(child) || leafUrns.has(child)) {
                 const edge = edges.get(getEdgeId(urn, child, direction));
-                if (edge?.isDisplayed && edge?.via) {
+                if (edge?.via) {
                     const queryNode = nodes.get(edge.via);
                     if (queryNode) {
                         result.push(queryNode);
diff --git a/datahub-web-react/src/app/lineageV2/useComputeGraph/useComputeGraph.tsx b/datahub-web-react/src/app/lineageV2/useComputeGraph/useComputeGraph.tsx
index eebcc84b3d9bda..4d1040ded3896d 100644
--- a/datahub-web-react/src/app/lineageV2/useComputeGraph/useComputeGraph.tsx
+++ b/datahub-web-react/src/app/lineageV2/useComputeGraph/useComputeGraph.tsx
@@ -27,6 +27,7 @@ export default function useComputeGraph(urn: string, type: EntityType): Processe
         dataVersion,
         displayVersion,
         hideTransformations,
+        showDataProcessInstances,
         showGhostEntities,
     } = useContext(LineageNodesContext);
     const entityRegistry = useEntityRegistryV2();
@@ -56,6 +57,7 @@ export default function useComputeGraph(urn: string, type: EntityType): Processe
 
             const config: HideNodesConfig = {
                 hideTransformations,
+                hideDataProcessInstances: !showDataProcessInstances,
                 hideGhostEntities: !showGhostEntities,
                 ignoreSchemaFieldStatus,
             };
@@ -88,6 +90,7 @@ export default function useComputeGraph(urn: string, type: EntityType): Processe
             displayVersionNumber,
             hideTransformations,
             prevHideTransformations,
+            showDataProcessInstances,
             showGhostEntities,
             ignoreSchemaFieldStatus,
             dataVersion,
diff --git a/datahub-web-react/src/app/lineageV2/useSearchAcrossLineage.ts b/datahub-web-react/src/app/lineageV2/useSearchAcrossLineage.ts
index f114eac6288ee3..a1eba9ba01e5f3 100644
--- a/datahub-web-react/src/app/lineageV2/useSearchAcrossLineage.ts
+++ b/datahub-web-react/src/app/lineageV2/useSearchAcrossLineage.ts
@@ -1,20 +1,18 @@
+import pruneAllDuplicateEdges from '@app/lineageV2/pruneAllDuplicateEdges';
 import { useEffect, useState } from 'react';
 import { useSearchAcrossLineageStructureLazyQuery } from '../../graphql/search.generated';
 import { Entity, EntityType, LineageDirection, Maybe, SearchAcrossLineageInput } from '../../types.generated';
-import EntityRegistry from '../entityV2/EntityRegistry';
 import { DBT_URN } from '../ingest/source/builder/constants';
 import { useGetLineageTimeParams } from '../lineage/utils/useGetLineageTimeParams';
 import { DEGREE_FILTER_NAME } from '../search/utils/constants';
 import { useEntityRegistryV2 } from '../useEntityRegistry';
 import {
     addToAdjacencyList,
-    createEdgeId,
     FetchStatus,
     Filters,
     getEdgeId,
     isQuery,
     isTransformational,
-    isUrnTransformational,
     LINEAGE_FILTER_PAGINATION,
     LineageEntity,
     NodeContext,
@@ -80,6 +78,7 @@ export default function useSearchAcrossLineage(
                     platforms: [DBT_URN],
                 },
                 { entityType: EntityType.DataJob },
+                { entityType: EntityType.DataProcessInstance },
             ],
         },
         searchFlags: {
@@ -101,7 +100,7 @@ export default function useSearchAcrossLineage(
     }, [fetchLineage, lazy]);
 
     useEffect(() => {
-        const smallContext = { nodes, edges, adjacencyList };
+        const smallContext = { nodes, edges, adjacencyList, setDisplayVersion };
         let addedNode = false;
 
         data?.searchAcrossLineage?.searchResults.forEach((result) => {
@@ -137,7 +136,7 @@ export default function useSearchAcrossLineage(
         }
 
         if (data) {
-            pruneDuplicateEdges(urn, direction, smallContext, entityRegistry);
+            pruneAllDuplicateEdges(urn, direction, smallContext, entityRegistry);
             processed.add(urn);
             if (addedNode) setNodeVersion((version) => version + 1);
 
@@ -162,94 +161,6 @@ export default function useSearchAcrossLineage(
     return { fetchLineage, processed: processed.has(urn) };
 }
 
-/**
- * Remove direct edges between non-transformational nodes, if there is a path between them through only transformational nodes.
- * This prevents the graph from being cluttered with effectively duplicate edges.
- * @param urn Urn for which to remove parent edges.
- * @param direction Direction to look for parents.
- * @param context Lineage node context.
- * @param entityRegistry EntityRegistry, used to get EntityType from an urn.
- */
-export function pruneDuplicateEdges(
-    urn: string,
-    direction: LineageDirection | null,
-    context: Pick<NodeContext, 'adjacencyList' | 'edges'>,
-    entityRegistry: EntityRegistry,
-) {
-    const { edges } = context;
-    const neighbors: Record<LineageDirection, Set<string>> = {
-        [LineageDirection.Downstream]: new Set(),
-        [LineageDirection.Upstream]: new Set(),
-    };
-
-    const urnIsTransformational = isUrnTransformational(urn, entityRegistry);
-    function getNeighbors(d: LineageDirection) {
-        return getNonTransformationalNeighbors(urn, d, urnIsTransformational, context, entityRegistry);
-    }
-
-    if (direction) {
-        neighbors[direction] = getNeighbors(direction);
-    } else {
-        neighbors[LineageDirection.Upstream] = getNeighbors(LineageDirection.Upstream);
-        neighbors[LineageDirection.Downstream] = getNeighbors(LineageDirection.Downstream);
-    }
-
-    if (urnIsTransformational) {
-        neighbors[LineageDirection.Upstream].forEach((source) => {
-            neighbors[LineageDirection.Downstream].forEach((destination) => {
-                const edge = edges.get(createEdgeId(source, destination));
-                if (edge?.isDisplayed) {
-                    edge.isDisplayed = false;
-                }
-            });
-        });
-    } else {
-        Object.values(LineageDirection).forEach((d) => {
-            neighbors[d].forEach((source) => {
-                const edge = edges.get(getEdgeId(urn, source, d));
-                if (edge?.isDisplayed) {
-                    edge.isDisplayed = false;
-                }
-            });
-        });
-    }
-}
-
-/**
- * Get the non-transformational nodes that are reachable from `urn` in `direction` via a transformational path.
- * @param urn Urn for which to get neighbors.
- * @param direction Direction to look for neighbors.
- * @param includeDirect If false, only include non-transformational neighbors through a transformational node.
- * @param adjacencyList Adjacency list of the lineage graph.
- * @param entityRegistry EntityRegistry, used to get EntityType from an urn.
- */
-function getNonTransformationalNeighbors(
-    urn: string,
-    direction: LineageDirection,
-    includeDirect: boolean,
-    { adjacencyList }: Pick<NodeContext, 'adjacencyList'>,
-    entityRegistry: EntityRegistry,
-) {
-    const neighbors = new Set<string>();
-    const stack = includeDirect
-        ? [urn]
-        : Array.from(adjacencyList[direction].get(urn) || []).filter((p) => isUrnTransformational(p, entityRegistry));
-    const seen = new Set<string>(stack);
-    for (let u = stack.pop(); u; u = stack.pop()) {
-        Array.from(adjacencyList[direction].get(u) || []).forEach((parent) => {
-            if (isUrnTransformational(parent, entityRegistry)) {
-                if (!seen.has(parent)) {
-                    stack.push(parent);
-                    seen.add(parent);
-                }
-            } else {
-                neighbors.add(parent);
-            }
-        });
-    }
-    return neighbors;
-}
-
 export function setEntityNodeDefault(
     urn: string,
     type: EntityType,
diff --git a/datahub-web-react/src/app/previewV2/EntityHeader.tsx b/datahub-web-react/src/app/previewV2/EntityHeader.tsx
index be986d6293eac2..9ebf30732b9d7b 100644
--- a/datahub-web-react/src/app/previewV2/EntityHeader.tsx
+++ b/datahub-web-react/src/app/previewV2/EntityHeader.tsx
@@ -96,12 +96,12 @@ const EntityHeader: React.FC<EntityHeaderProps> = ({
                 {previewType === PreviewType.HOVER_CARD ? (
                     <Tooltip title={name}>
                         <CardEntityTitle onClick={onClick} $titleSizePx={titleSizePx} data-testid="entity-title">
-                            {name || ''}
+                            {name || urn}
                         </CardEntityTitle>
                     </Tooltip>
                 ) : (
                     <EntityTitle title={name} onClick={onClick} $titleSizePx={titleSizePx} data-testid="entity-title">
-                        <SearchTextHighlighter field="name" text={name || ''} />
+                        <SearchTextHighlighter field="name" text={name || urn} />
                     </EntityTitle>
                 )}
             </StyledLink>
diff --git a/datahub-web-react/src/graphql/dataProcessInstance.graphql b/datahub-web-react/src/graphql/dataProcessInstance.graphql
index 442f8db0a933b2..548aa746b3a85b 100644
--- a/datahub-web-react/src/graphql/dataProcessInstance.graphql
+++ b/datahub-web-react/src/graphql/dataProcessInstance.graphql
@@ -67,6 +67,10 @@ fragment processInstanceRelationshipResults on EntityRelationshipsResult {
 fragment dataProcessInstanceFields on DataProcessInstance {
     urn
     type
+    exists
+    status {
+        removed
+    }
     parentContainers {
         ...parentContainersFields
     }
@@ -78,7 +82,7 @@ fragment dataProcessInstanceFields on DataProcessInstance {
     }
     properties {
         name
-        createdTS: created {
+        created {
             time
             actor
         }
@@ -88,6 +92,7 @@ fragment dataProcessInstanceFields on DataProcessInstance {
         }
     }
     mlTrainingRunProperties {
+        id
         outputUrls
         trainingMetrics {
             name
@@ -100,67 +105,79 @@ fragment dataProcessInstanceFields on DataProcessInstance {
             value
         }
     }
+    optionalPlatform: platform {
+        ...platformFields
+    }
     dataPlatformInstance {
         ...dataPlatformInstanceFields
     }
-    state(startTimeMillis: null, endTimeMillis: null, limit: 1) {
-        status
-        attempt
-        result {
-            resultType
-            nativeResultType
-        }
-        timestampMillis
-        durationMillis
-    }
-    relationships(input: { types: ["InstanceOf", "Consumes", "Produces"], direction: OUTGOING, start: 0, count: 50 }) {
-        ...processInstanceRelationshipResults
-    }
-}
-
-query getDataProcessInstance($urn: String!) {
-    dataProcessInstance(urn: $urn) {
+    parentTemplate {
         urn
         type
-        parentContainers {
-            ...parentContainersFields
-        }
-        subTypes {
-            typeNames
-        }
-        container {
-            ...entityContainer
-        }
-        name
-        properties {
+        # TODO: Clean up fields below; support DataFlow
+        ... on Dataset {
             name
-            created {
-                time
-                actor
+            properties {
+                name
+                description
+                qualifiedName
+            }
+            editableProperties {
+                description
+            }
+            platform {
+                ...platformFields
+            }
+            subTypes {
+                typeNames
+            }
+            status {
+                removed
             }
         }
-        mlTrainingRunProperties {
-            id
-            outputUrls
-            trainingMetrics {
+        ... on DataJob {
+            urn
+            type
+            dataFlow {
+                ...nonRecursiveDataFlowFields
+            }
+            jobId
+            properties {
                 name
                 description
-                value
+                externalUrl
+                customProperties {
+                    key
+                    value
+                }
             }
-            hyperParams {
-                name
+            deprecation {
+                ...deprecationFields
+            }
+            dataPlatformInstance {
+                ...dataPlatformInstanceFields
+            }
+            subTypes {
+                typeNames
+            }
+            editableProperties {
                 description
-                value
+            }
+            status {
+                removed
             }
         }
+    }
+}
+
+query getDataProcessInstance($urn: String!) {
+    dataProcessInstance(urn: $urn) {
+        ...dataProcessInstanceFields
         relationships(
             input: { types: ["InstanceOf", "Consumes", "Produces"], direction: OUTGOING, start: 0, count: 50 }
         ) {
             ...processInstanceRelationshipResults
         }
-        dataPlatformInstance {
-            ...dataPlatformInstanceFields
-        }
         state(startTimeMillis: null, endTimeMillis: null, limit: 1) {
             status
             attempt
diff --git a/datahub-web-react/src/graphql/lineage.graphql b/datahub-web-react/src/graphql/lineage.graphql
index 2a89789f1c50d1..5daf200fef5fc7 100644
--- a/datahub-web-react/src/graphql/lineage.graphql
+++ b/datahub-web-react/src/graphql/lineage.graphql
@@ -716,6 +716,9 @@ fragment entityLineageV2 on Entity {
             ...platformFields
         }
     }
+    ... on DataProcessInstance {
+        ...dataProcessInstanceFields
+    }
     ... on Domain {
         id
         properties {
diff --git a/datahub-web-react/src/images/mlflowlogo2.png b/datahub-web-react/src/images/mlflowlogo2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2b7dbea783415f85d60e3386fcca732d32107c8
GIT binary patch
literal 20876
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
V@w%;YR<{5E002ovPDHLkV1noI;4lCH

literal 0
HcmV?d00001

diff --git a/metadata-ingestion/tests/integration/openapi/openapi_mces_golden.json b/metadata-ingestion/tests/integration/openapi/openapi_mces_golden.json
index ffa8d43a6a5ab4..f74a0bb9e0102d 100755
--- a/metadata-ingestion/tests/integration/openapi/openapi_mces_golden.json
+++ b/metadata-ingestion/tests/integration/openapi/openapi_mces_golden.json
@@ -20,7 +20,7 @@
                     "com.linkedin.pegasus2avro.common.InstitutionalMemory": {
                         "elements": [
                             {
-                                "url": "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/tests/",
+                                "url": "https://raw.githubusercontent.com/OAI/learn.openapis.org/refs/heads/main/examples/",
                                 "description": "Link to call for the dataset.",
                                 "createStamp": {
                                     "time": 1586847600,
@@ -96,7 +96,7 @@
                     "com.linkedin.pegasus2avro.common.InstitutionalMemory": {
                         "elements": [
                             {
-                                "url": "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/tests/v2",
+                                "url": "https://raw.githubusercontent.com/OAI/learn.openapis.org/refs/heads/main/examples/v2",
                                 "description": "Link to call for the dataset.",
                                 "createStamp": {
                                     "time": 1586847600,
@@ -183,4 +183,4 @@
         "lastRunId": "no-run-id-provided"
     }
 }
-]
\ No newline at end of file
+]
diff --git a/metadata-ingestion/tests/integration/openapi/openapi_to_file.yml b/metadata-ingestion/tests/integration/openapi/openapi_to_file.yml
index 8575c23239461e..937ec54e9f1c27 100644
--- a/metadata-ingestion/tests/integration/openapi/openapi_to_file.yml
+++ b/metadata-ingestion/tests/integration/openapi/openapi_to_file.yml
@@ -2,12 +2,11 @@ source:
   type: openapi
   config:
     name: test_openapi
-    url: https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/tests/
-    swagger_file: v3.0/pass/api-with-examples.yaml
+    url: https://raw.githubusercontent.com/OAI/learn.openapis.org/refs/heads/main/examples/
+    swagger_file: v3.0/api-with-examples.yaml
 
 
 sink:
   type: file
   config:
     filename: "/tmp/openapi_mces.json"
-
diff --git a/metadata-service/configuration/src/main/resources/bootstrap_mcps/data-platforms.yaml b/metadata-service/configuration/src/main/resources/bootstrap_mcps/data-platforms.yaml
index 2230d552ed4c0e..4c4a7c2183073c 100644
--- a/metadata-service/configuration/src/main/resources/bootstrap_mcps/data-platforms.yaml
+++ b/metadata-service/configuration/src/main/resources/bootstrap_mcps/data-platforms.yaml
@@ -417,7 +417,7 @@
     name: mlflow
     displayName: MLflow
     type: OTHERS
-    logoUrl: "/assets/platforms/mlflowlogo.png"
+    logoUrl: "/assets/platforms/mlflowlogo2.png"
 - entityUrn: urn:li:dataPlatform:glue
   entityType: dataPlatform
   aspectName: dataPlatformInfo
diff --git a/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_lineage_column_level.js b/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_lineage_column_level.js
index a82ac125bf820b..10fcce58f8d2b9 100644
--- a/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_lineage_column_level.js
+++ b/smoke-test/tests/cypress/cypress/e2e/lineageV2/v2_lineage_column_level.js
@@ -5,7 +5,7 @@ const DATASET_URN =
 const clickDownAndUpArrow = (asset, arrow) => {
   cy.contains(".react-flow__node-lineage-entity", asset)
     .find(`svg[data-testid="${arrow}"]`)
-    .click();
+    .click({ force: true });
 };
 
 describe("column-level lineage graph test", () => {

From ddb3db9c6fceda70b9156a04caf85ee53203e3a2 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Thu, 30 Jan 2025 15:27:20 +0530
Subject: [PATCH 190/249] docs: change heading of ingestion page (#12501)

---
 docs/ui-ingestion.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ui-ingestion.md b/docs/ui-ingestion.md
index 521d8db26011cf..1706d86c657f4c 100644
--- a/docs/ui-ingestion.md
+++ b/docs/ui-ingestion.md
@@ -3,7 +3,7 @@ import FeatureAvailability from '@site/src/components/FeatureAvailability';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# Ingestion
+# UI Based Ingestion / Managed Ingestion
 
 <FeatureAvailability/>
 

From f527c5ed5564b068a5243c5069f959708327aa0e Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Thu, 30 Jan 2025 04:08:15 -0600
Subject: [PATCH 191/249] feat(iceberg-rest): implement iceberg REST catalog
 api (#12500)

Co-authored-by: ksrinath <ksrinath@users.noreply.github.com>
Co-authored-by: Chakravarthy Racharla <chakru.racharla@acryl.io>
---
 .../graphql/resolvers/search/SearchUtils.java |   3 +-
 datahub-web-react/src/graphql/search.graphql  |   3 +
 docs/advanced/mcp-mcl.md                      |   6 +
 .../java/com/linkedin/metadata/Constants.java |   7 +
 .../com/datahub/authorization/AuthUtil.java   |   3 +-
 .../examples/iceberg/constants.py             |   3 +
 .../examples/iceberg/create_table.py          | 108 +++
 .../examples/iceberg/drop_table.py            |  10 +
 .../examples/iceberg/folder_operations.py     | 218 ++++++
 .../examples/iceberg/provision_warehouse.py   |  48 ++
 .../examples/iceberg/read_table.py            |  15 +
 .../examples/iceberg/requirements.txt         |   3 +
 metadata-ingestion/setup.py                   |   3 +
 .../src/datahub/cli/iceberg_cli.py            | 707 ++++++++++++++++++
 metadata-ingestion/src/datahub/entrypoints.py |  12 +
 .../metadata/entity/EntityServiceImpl.java    |  32 +-
 .../metadata/entity/EntityServiceTest.java    |  91 +++
 .../IcebergWarehouseInfo.pdl                  |  48 ++
 .../linkedin/dataset/IcebergCatalogInfo.pdl   |  25 +
 .../src/main/resources/entity-registry.yml    |   2 +
 .../src/main/resources/application.yaml       |   6 +-
 metadata-service/iceberg-catalog/build.gradle |  84 +++
 .../iceberg-catalog/pyproject.toml            |  46 ++
 .../iceberg-catalog/requirements.txt          |  16 +
 .../src/integrationTest/integration_test.py   | 243 ++++++
 .../catalog/DataHubIcebergWarehouse.java      | 275 +++++++
 .../iceberg/catalog/DataHubRestCatalog.java   | 487 ++++++++++++
 .../iceberg/catalog/DataHubTableOps.java      |  54 ++
 .../iceberg/catalog/DataHubViewOps.java       |  61 ++
 .../iceberg/catalog/DataOperation.java        |  31 +
 .../iceberg/catalog/FileIOFactory.java        |  14 +
 .../catalog/TableOrViewOpsDelegate.java       | 478 ++++++++++++
 .../datahubproject/iceberg/catalog/Utils.java | 110 +++
 .../CachingCredentialProvider.java            |  32 +
 .../credentials/CredentialProvider.java       |  30 +
 .../credentials/S3CredentialProvider.java     | 148 ++++
 .../common/IcebergExceptionHandlerAdvice.java |  74 ++
 .../rest/common/IcebergJsonConverter.java     |  83 ++
 .../rest/common/IcebergSpringWebConfig.java   |  22 +
 .../rest/open/PublicIcebergApiController.java | 107 +++
 .../secure/AbstractIcebergController.java     | 188 +++++
 .../rest/secure/IcebergApiController.java     |  24 +
 .../secure/IcebergConfigApiController.java    |  25 +
 .../secure/IcebergNamespaceApiController.java | 171 +++++
 .../secure/IcebergTableApiController.java     | 323 ++++++++
 .../rest/secure/IcebergViewApiController.java | 213 ++++++
 .../CachingCredentialProviderTest.java        | 107 +++
 .../catalog/DataHubIcebergWarehouseTest.java  | 428 +++++++++++
 .../catalog/DataHubRestCatalogTest.java       | 394 ++++++++++
 .../catalog/S3CredentialProviderTest.java     | 126 ++++
 .../iceberg/catalog/UtilsTest.java            | 143 ++++
 .../IcebergExceptionHandlerAdviceTest.java    | 147 ++++
 .../open/PublicIcebergApiControllerTest.java  | 141 ++++
 .../rest/secure/AbstractControllerTest.java   | 161 ++++
 .../IcebergConfigApiControllerTest.java       |  56 ++
 .../IcebergNamespaceApiControllerTest.java    |  92 +++
 .../GlobalControllerExceptionHandler.java     |   3 +-
 .../config/SpringWebSchemaRegistryConfig.java |  17 +-
 metadata-service/war/build.gradle             |   2 +
 .../java/com/linkedin/gms/ServletConfig.java  |  16 +
 .../servlet/IcebergCatalogServletConfig.java  |  10 +
 .../authorization/PoliciesConfig.java         |  46 +-
 settings.gradle                               |   5 +-
 63 files changed, 6552 insertions(+), 34 deletions(-)
 create mode 100644 metadata-ingestion/examples/iceberg/constants.py
 create mode 100644 metadata-ingestion/examples/iceberg/create_table.py
 create mode 100644 metadata-ingestion/examples/iceberg/drop_table.py
 create mode 100644 metadata-ingestion/examples/iceberg/folder_operations.py
 create mode 100644 metadata-ingestion/examples/iceberg/provision_warehouse.py
 create mode 100644 metadata-ingestion/examples/iceberg/read_table.py
 create mode 100644 metadata-ingestion/examples/iceberg/requirements.txt
 create mode 100644 metadata-ingestion/src/datahub/cli/iceberg_cli.py
 create mode 100644 metadata-models/src/main/pegasus/com/linkedin/dataplatforminstance/IcebergWarehouseInfo.pdl
 create mode 100644 metadata-models/src/main/pegasus/com/linkedin/dataset/IcebergCatalogInfo.pdl
 create mode 100644 metadata-service/iceberg-catalog/build.gradle
 create mode 100644 metadata-service/iceberg-catalog/pyproject.toml
 create mode 100644 metadata-service/iceberg-catalog/requirements.txt
 create mode 100644 metadata-service/iceberg-catalog/src/integrationTest/integration_test.py
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataHubIcebergWarehouse.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataHubRestCatalog.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataHubTableOps.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataHubViewOps.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataOperation.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/FileIOFactory.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/TableOrViewOpsDelegate.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/Utils.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/credentials/CachingCredentialProvider.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/credentials/CredentialProvider.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/credentials/S3CredentialProvider.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/common/IcebergExceptionHandlerAdvice.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/common/IcebergJsonConverter.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/common/IcebergSpringWebConfig.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/open/PublicIcebergApiController.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/AbstractIcebergController.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergApiController.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergConfigApiController.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergNamespaceApiController.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergTableApiController.java
 create mode 100644 metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergViewApiController.java
 create mode 100644 metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/CachingCredentialProviderTest.java
 create mode 100644 metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/DataHubIcebergWarehouseTest.java
 create mode 100644 metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/DataHubRestCatalogTest.java
 create mode 100644 metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/S3CredentialProviderTest.java
 create mode 100644 metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/UtilsTest.java
 create mode 100644 metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/common/IcebergExceptionHandlerAdviceTest.java
 create mode 100644 metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/open/PublicIcebergApiControllerTest.java
 create mode 100644 metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/secure/AbstractControllerTest.java
 create mode 100644 metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergConfigApiControllerTest.java
 create mode 100644 metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergNamespaceApiControllerTest.java
 create mode 100644 metadata-service/war/src/main/java/com/linkedin/gms/servlet/IcebergCatalogServletConfig.java

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java
index fbcce1a5e6b065..1591b206d99b90 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java
@@ -91,7 +91,8 @@ private SearchUtils() {}
           EntityType.DATA_PRODUCT,
           EntityType.NOTEBOOK,
           EntityType.BUSINESS_ATTRIBUTE,
-          EntityType.SCHEMA_FIELD);
+          EntityType.SCHEMA_FIELD,
+          EntityType.DATA_PLATFORM_INSTANCE);
 
   /** Entities that are part of autocomplete by default in Auto Complete Across Entities */
   public static final List<EntityType> AUTO_COMPLETE_ENTITY_TYPES =
diff --git a/datahub-web-react/src/graphql/search.graphql b/datahub-web-react/src/graphql/search.graphql
index 7c8d670b535e8c..c36e3038adca55 100644
--- a/datahub-web-react/src/graphql/search.graphql
+++ b/datahub-web-react/src/graphql/search.graphql
@@ -482,6 +482,9 @@ fragment searchResultsWithoutSchemaField on Entity {
             }
         }
     }
+    ... on DataPlatformInstance {
+        ...dataPlatformInstanceFields
+    }
     ... on Role {
         id
         properties {
diff --git a/docs/advanced/mcp-mcl.md b/docs/advanced/mcp-mcl.md
index 3a06b2abadc115..df8305b2f494fd 100644
--- a/docs/advanced/mcp-mcl.md
+++ b/docs/advanced/mcp-mcl.md
@@ -210,6 +210,7 @@ A writer can specify that the aspect must NOT have been modified after a specifi
 `If-Modified-Since`
 A writer can specify that the aspect must have been modified after a specific time, following [If-Modified-Since](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/If-Modified-Since) http headers.
 
+
 #### Change Types: [`CREATE`, `CREATE_ENTITY`]
 
 Another form of conditional writes which considers the existence of an aspect or entity uses the following Change Types.
@@ -221,3 +222,8 @@ Another form of conditional writes which considers the existence of an aspect or
 By default, a validation exception is thrown if the `CREATE`/`CREATE_ENTITY` constraint is violated. If the write operation
 should be dropped without considering it an exception, then add the following header: `If-None-Match: *` to the MCP.
 
+### Synchronous ElasticSearch Updates
+
+The writes to the elasticsearch are asynchronous by default. A writer can add a custom header
+`X-DataHub-Sync-Index-Update` to the MCP `headers` with value set to `true` to enable a synchronous update of
+elasticsearch for specific MCPs that may benefit from it.
diff --git a/li-utils/src/main/java/com/linkedin/metadata/Constants.java b/li-utils/src/main/java/com/linkedin/metadata/Constants.java
index 463376edcdf259..80012bc24724cb 100644
--- a/li-utils/src/main/java/com/linkedin/metadata/Constants.java
+++ b/li-utils/src/main/java/com/linkedin/metadata/Constants.java
@@ -10,6 +10,9 @@ public class Constants {
   public static final String INTERNAL_DELEGATED_FOR_ACTOR_HEADER_NAME = "X-DataHub-Delegated-For";
   public static final String INTERNAL_DELEGATED_FOR_ACTOR_TYPE = "X-DataHub-Delegated-For-";
 
+  // Use on specific MCP to request an synchronous index update avoid the kafka lag.
+  public static final String SYNC_INDEX_UPDATE_HEADER_NAME = "X-DataHub-Sync-Index-Update";
+
   public static final String URN_LI_PREFIX = "urn:li:";
   public static final String DATAHUB_ACTOR = "urn:li:corpuser:datahub"; // Super user.
   public static final String SYSTEM_ACTOR =
@@ -103,6 +106,7 @@ public class Constants {
   public static final String FORM_ENTITY_NAME = "form";
   public static final String RESTRICTED_ENTITY_NAME = "restricted";
   public static final String BUSINESS_ATTRIBUTE_ENTITY_NAME = "businessAttribute";
+  public static final String PLATFORM_RESOURCE_ENTITY_NAME = "platformResource";
 
   /** Aspects */
   // Common
@@ -211,6 +215,9 @@ public class Constants {
   public static final String DATA_PLATFORM_INSTANCE_PROPERTIES_ASPECT_NAME =
       "dataPlatformInstanceProperties";
 
+  // PlatformResource
+  public static final String PLATFORM_RESOURCE_INFO_ASPECT_NAME = "platformResourceInfo";
+
   // ML Feature
   public static final String ML_FEATURE_KEY_ASPECT_NAME = "mlFeatureKey";
   public static final String ML_FEATURE_PROPERTIES_ASPECT_NAME = "mlFeatureProperties";
diff --git a/metadata-auth/auth-api/src/main/java/com/datahub/authorization/AuthUtil.java b/metadata-auth/auth-api/src/main/java/com/datahub/authorization/AuthUtil.java
index 4f1f0686e76869..e1e2c46e9030ef 100644
--- a/metadata-auth/auth-api/src/main/java/com/datahub/authorization/AuthUtil.java
+++ b/metadata-auth/auth-api/src/main/java/com/datahub/authorization/AuthUtil.java
@@ -561,8 +561,7 @@ public static DisjunctivePrivilegeGroup buildDisjunctivePrivilegeGroup(
     return buildDisjunctivePrivilegeGroup(lookupAPIPrivilege(apiGroup, apiOperation, entityType));
   }
 
-  @VisibleForTesting
-  static DisjunctivePrivilegeGroup buildDisjunctivePrivilegeGroup(
+  public static DisjunctivePrivilegeGroup buildDisjunctivePrivilegeGroup(
       final Disjunctive<Conjunctive<PoliciesConfig.Privilege>> privileges) {
     return new DisjunctivePrivilegeGroup(
         privileges.stream()
diff --git a/metadata-ingestion/examples/iceberg/constants.py b/metadata-ingestion/examples/iceberg/constants.py
new file mode 100644
index 00000000000000..183291a84fec2b
--- /dev/null
+++ b/metadata-ingestion/examples/iceberg/constants.py
@@ -0,0 +1,3 @@
+warehouse = "arctic_warehouse"
+namespace = "alpine_db"
+table_name = "resort_metrics"
diff --git a/metadata-ingestion/examples/iceberg/create_table.py b/metadata-ingestion/examples/iceberg/create_table.py
new file mode 100644
index 00000000000000..c2cf823c724158
--- /dev/null
+++ b/metadata-ingestion/examples/iceberg/create_table.py
@@ -0,0 +1,108 @@
+from datetime import datetime
+
+import pyarrow as pa
+import pyiceberg
+from constants import namespace, table_name, warehouse
+from pyiceberg.catalog import load_catalog
+from pyiceberg.schema import Schema
+from pyiceberg.types import LongType, NestedField, StringType, TimestampType
+
+from datahub.ingestion.graph.client import get_default_graph
+
+# Define a more comprehensive schema for ski resort data
+schema = Schema(
+    NestedField(
+        field_id=1,
+        name="resort_id",
+        field_type=LongType(),
+        required=True,
+        doc="Unique identifier for each ski resort",
+        initial_default=None,
+    ),
+    NestedField(
+        field_id=2,
+        name="resort_name",
+        field_type=StringType(),
+        required=True,
+        doc="Official name of the ski resort",
+        initial_default=None,
+    ),
+    NestedField(
+        field_id=3,
+        name="daily_snowfall",
+        field_type=LongType(),
+        required=False,
+        doc="Amount of new snow in inches during the last 24 hours. Null if no measurement available",
+        initial_default=0,
+    ),
+    NestedField(
+        field_id=4,
+        name="conditions",
+        field_type=StringType(),
+        required=False,
+        doc="Current snow conditions description (e.g., 'Powder', 'Packed Powder', 'Groomed'). Null if not reported",
+        initial_default=None,
+    ),
+    NestedField(
+        field_id=5,
+        name="last_updated",
+        field_type=TimestampType(),
+        required=False,
+        doc="Timestamp of when the snow report was last updated",
+        initial_default=None,
+    ),
+)
+
+# Load the catalog with new warehouse name
+graph = get_default_graph()
+catalog = load_catalog("local_datahub", warehouse=warehouse, token=graph.config.token)
+
+# Create namespace (database)
+try:
+    catalog.create_namespace(namespace)
+except Exception as e:
+    print(f"Namespace creation error (might already exist): {e}")
+
+full_table_name = f"{namespace}.{table_name}"
+try:
+    catalog.create_table(full_table_name, schema)
+except pyiceberg.exceptions.TableAlreadyExistsError:
+    print(f"Table {full_table_name} already exists")
+
+# Create sample data with explicit PyArrow schema to match required fields
+pa_schema = pa.schema(
+    [
+        ("resort_id", pa.int64(), False),  # False means not nullable
+        ("resort_name", pa.string(), False),  # False means not nullable
+        ("daily_snowfall", pa.int64(), True),
+        ("conditions", pa.string(), True),
+        ("last_updated", pa.timestamp("us"), True),
+    ]
+)
+# Create sample data
+sample_data = pa.Table.from_pydict(
+    {
+        "resort_id": [1, 2, 3],
+        "resort_name": ["Snowpeak Resort", "Alpine Valley", "Glacier Heights"],
+        "daily_snowfall": [12, 8, 15],
+        "conditions": ["Powder", "Packed", "Fresh Powder"],
+        "last_updated": [
+            pa.scalar(datetime.now()),
+            pa.scalar(datetime.now()),
+            pa.scalar(datetime.now()),
+        ],
+    },
+    schema=pa_schema,
+)
+
+# Write data to table
+table = catalog.load_table(full_table_name)
+table.overwrite(sample_data)
+
+table.refresh()
+# Read and verify data
+con = table.scan().to_duckdb(table_name=f"{table_name}")
+print("\nResort Metrics Data:")
+print("-" * 50)
+for row in con.execute(f"SELECT * FROM {table_name}").fetchall():
+    print(row)
diff --git a/metadata-ingestion/examples/iceberg/drop_table.py b/metadata-ingestion/examples/iceberg/drop_table.py
new file mode 100644
index 00000000000000..a4a60dd94aca48
--- /dev/null
+++ b/metadata-ingestion/examples/iceberg/drop_table.py
@@ -0,0 +1,10 @@
+from constants import namespace, table_name, warehouse
+from pyiceberg.catalog import load_catalog
+
+# Load the catalog
+from datahub.ingestion.graph.client import get_default_graph
+
+graph = get_default_graph()
+catalog = load_catalog("local_datahub", warehouse=warehouse, token=graph.config.token)
+# Append the data to the Iceberg table
+catalog.drop_table(f"{namespace}.{table_name}")
diff --git a/metadata-ingestion/examples/iceberg/folder_operations.py b/metadata-ingestion/examples/iceberg/folder_operations.py
new file mode 100644
index 00000000000000..306fb3ff4d205f
--- /dev/null
+++ b/metadata-ingestion/examples/iceberg/folder_operations.py
@@ -0,0 +1,218 @@
+"""
+This script is designed to manage and clean up contents in an S3 bucket, specifically targeting orphaned files and folders.
+It provides functionality to list, delete, or simulate deletion of all objects under a specified S3 prefix using AWS assumed role credentials.
+
+The script supports the following operations:
+- Listing all files and folders under a specified S3 path.
+- Deleting all contents under a specified S3 path.
+- Performing a dry run to show what would be deleted without actually deleting the objects.
+
+Environment variables required:
+- DH_ICEBERG_AWS_ROLE: The ARN of the AWS role to assume.
+- DH_ICEBERG_CLIENT_ID: The AWS client ID.
+- DH_ICEBERG_CLIENT_SECRET: The AWS client secret.
+
+Usage:
+    python folder_operations.py s3://bucket/prefix --list
+    python folder_operations.py s3://bucket/prefix --nuke
+    python folder_operations.py s3://bucket/prefix --dry-run
+
+Arguments:
+- s3_path: The S3 path to operate on (e.g., s3://bucket/prefix).
+- --list: List all folders and files.
+- --nuke: Delete all contents.
+- --dry-run: Show what would be deleted without actually deleting.
+- --region: AWS region (default: us-east-1).
+
+Note: Only one action (--list, --nuke, or --dry-run) can be specified at a time.
+
+"""
+
+import argparse
+import os
+from datetime import datetime
+from typing import Optional, Tuple
+
+import boto3
+from mypy_boto3_s3 import S3Client
+
+
+def get_s3_client_with_role(
+    client_id: str,
+    client_secret: str,
+    role_arn: str,
+    region: str = "us-east-1",
+    session_name: str = "IcebergSession",
+) -> Tuple[S3Client, datetime]:  # type: ignore
+    """
+    Create an S3 client with assumed role credentials.
+    """
+    session = boto3.Session(
+        aws_access_key_id=client_id,
+        aws_secret_access_key=client_secret,
+        region_name=region,
+    )
+
+    sts_client = session.client("sts")
+
+    assumed_role_object = sts_client.assume_role(
+        RoleArn=role_arn, RoleSessionName=session_name
+    )
+
+    credentials = assumed_role_object["Credentials"]
+
+    s3_client: S3Client = boto3.client(
+        "s3",
+        region_name=region,
+        aws_access_key_id=credentials["AccessKeyId"],
+        aws_secret_access_key=credentials["SecretAccessKey"],
+        aws_session_token=credentials["SessionToken"],
+    )
+
+    return s3_client, credentials["Expiration"]
+
+
+def delete_s3_objects(
+    s3_client: S3Client, bucket_name: str, prefix: str, dry_run: bool = False
+) -> None:
+    """
+    Delete all objects under the specified prefix.
+    """
+    paginator = s3_client.get_paginator("list_objects_v2")
+
+    for page in paginator.paginate(Bucket=bucket_name, Prefix=prefix):
+        objects_to_delete = []
+        for obj in page.get("Contents", []):
+            objects_to_delete.append({"Key": obj["Key"]})
+            if dry_run:
+                print(f"Would delete: {obj['Key']}")
+                print(f"   Size: {obj['Size'] / (1024 * 1024):.2f} MB")
+                print(f"   Last Modified: {obj['LastModified']}")
+
+        if objects_to_delete and not dry_run:
+            s3_client.delete_objects(
+                Bucket=bucket_name,
+                Delete={"Objects": objects_to_delete},  # type: ignore
+            )
+            print(f"Deleted {len(objects_to_delete)} objects")
+
+
+def list_s3_contents(
+    s3_path: str,
+    client_id: str,
+    client_secret: str,
+    role_arn: str,
+    region: str = "us-east-1",
+    delimiter: Optional[str] = None,
+    nuke: bool = False,
+    dry_run: bool = False,
+) -> None:
+    """
+    List or delete contents of an S3 path using assumed role credentials.
+    """
+    if not s3_path.startswith("s3://"):
+        raise ValueError("S3 path must start with 's3://'")
+
+    bucket_name = s3_path.split("/")[2]
+    prefix = "/".join(s3_path.split("/")[3:])
+    if prefix and not prefix.endswith("/"):
+        prefix += "/"
+
+    s3_client, expiration = get_s3_client_with_role(
+        client_id=client_id,
+        client_secret=client_secret,
+        role_arn=role_arn,
+        region=region,
+    )
+
+    operation = "Deleting" if nuke else "Would delete" if dry_run else "Listing"
+    print(f"\n{operation} contents of {s3_path}")
+    print(f"Using role: {role_arn}")
+    print(f"Credentials expire at: {expiration}")
+    print("-" * 60)
+
+    if nuke or dry_run:
+        delete_s3_objects(s3_client, bucket_name, prefix, dry_run)
+        return
+
+    paginator = s3_client.get_paginator("list_objects_v2")
+
+    list_params = {"Bucket": bucket_name, "Prefix": prefix}
+    if delimiter:
+        list_params["Delimiter"] = delimiter
+
+    try:
+        pages = paginator.paginate(**list_params)  # type: ignore
+        found_contents = False
+
+        for page in pages:
+            if delimiter and "CommonPrefixes" in page:
+                for common_prefix in page.get("CommonPrefixes", []):
+                    found_contents = True
+                    folder_name = common_prefix["Prefix"][len(prefix) :].rstrip("/")
+                    print(f"📁 {folder_name}/")
+
+            for obj in page.get("Contents", []):
+                found_contents = True
+                file_path = obj["Key"][len(prefix) :]
+                if file_path:
+                    size_mb = obj["Size"] / (1024 * 1024)
+                    print(f"📄 {file_path}")
+                    print(f"   Size: {size_mb:.2f} MB")
+                    print(f"   Last Modified: {obj['LastModified']}")
+
+        if not found_contents:
+            print("No contents found in the specified path.")
+
+    except Exception as e:
+        print(f"Error accessing contents: {str(e)}")
+
+
+def main():
+    parser = argparse.ArgumentParser(description="S3 Content Manager")
+    parser.add_argument(
+        "s3_path", help="S3 path to operate on (e.g., s3://bucket/prefix)"
+    )
+    parser.add_argument(
+        "--list", action="store_true", help="List all folders and files"
+    )
+    parser.add_argument("--nuke", action="store_true", help="Delete all contents")
+    parser.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="Show what would be deleted without actually deleting",
+    )
+    parser.add_argument(
+        "--region", default="us-east-1", help="AWS region (default: us-east-1)"
+    )
+
+    args = parser.parse_args()
+
+    # Get environment variables
+    role_arn = os.environ.get("DH_ICEBERG_AWS_ROLE")
+    client_id = os.environ.get("DH_ICEBERG_CLIENT_ID")
+    client_secret = os.environ.get("DH_ICEBERG_CLIENT_SECRET")
+
+    if not all([role_arn, client_id, client_secret]):
+        raise ValueError(
+            "Missing required environment variables. Please set DH_ICEBERG_AWS_ROLE, DH_ICEBERG_CLIENT_ID, and DH_ICEBERG_CLIENT_SECRET"
+        )
+
+    # Validate arguments
+    if sum([args.list, args.nuke, args.dry_run]) != 1:
+        parser.error("Please specify exactly one action: --list, --nuke, or --dry-run")
+
+    list_s3_contents(
+        args.s3_path,
+        client_id=client_id,  # type: ignore
+        client_secret=client_secret,  # type: ignore
+        role_arn=role_arn,  # type: ignore
+        region=args.region,
+        # delimiter='/' if args.list else None,
+        nuke=args.nuke,
+        dry_run=args.dry_run,
+    )
+
+
+if __name__ == "__main__":
+    main()
diff --git a/metadata-ingestion/examples/iceberg/provision_warehouse.py b/metadata-ingestion/examples/iceberg/provision_warehouse.py
new file mode 100644
index 00000000000000..58cc1e850680e7
--- /dev/null
+++ b/metadata-ingestion/examples/iceberg/provision_warehouse.py
@@ -0,0 +1,48 @@
+"""
+A script to provision a warehouse on DataHub (and Iceberg).
+
+This script uses environment variables to configure the Iceberg client and
+provision a warehouse on DataHub. The required environment variables are:
+- DH_ICEBERG_CLIENT_ID: The client ID for the Icebreaker service.
+- DH_ICEBERG_CLIENT_SECRET: The client secret for the Icebreaker service.
+- DH_ICEBERG_AWS_ROLE: The test role for the Icebreaker service.
+- DH_ICEBERG_DATA_ROOT: The root directory for Icebreaker data.
+
+The script asserts the presence of these environment variables and then
+executes a system command to create the warehouse using the DataHub Iceberg CLI.
+
+Usage:
+    Ensure the required environment variables are set, then run the script.
+
+Example:
+    $ export DH_ICEBERG_CLIENT_ID="your_client_id"
+    $ export DH_ICEBERG_CLIENT_SECRET="your_client_secret"
+    $ export DH_ICEBERG_AWS_ROLE="your_test_role"
+    $ export DH_ICEBERG_DATA_ROOT="your_data_root"
+    $ python provision_warehouse.py
+"""
+
+import os
+
+from constants import warehouse
+
+# Assert that env variables are present
+
+assert os.environ.get("DH_ICEBERG_CLIENT_ID"), (
+    "DH_ICEBERG_CLIENT_ID variable is not present"
+)
+assert os.environ.get("DH_ICEBERG_CLIENT_SECRET"), (
+    "DH_ICEBERG_CLIENT_SECRET variable is not present"
+)
+assert os.environ.get("DH_ICEBERG_AWS_ROLE"), (
+    "DH_ICEBERG_AWS_ROLE variable is not present"
+)
+assert os.environ.get("DH_ICEBERG_DATA_ROOT"), (
+    "DH_ICEBERG_DATA_ROOT variable is not present"
+)
+
+assert os.environ.get("DH_ICEBERG_DATA_ROOT", "").startswith("s3://")
+
+os.system(
+    f"datahub iceberg create --warehouse {warehouse} --data_root $DH_ICEBERG_DATA_ROOT/{warehouse} --client_id $DH_ICEBERG_CLIENT_ID --client_secret $DH_ICEBERG_CLIENT_SECRET --region 'us-east-1' --role $DH_ICEBERG_AWS_ROLE"
+)
diff --git a/metadata-ingestion/examples/iceberg/read_table.py b/metadata-ingestion/examples/iceberg/read_table.py
new file mode 100644
index 00000000000000..3678951cd5710f
--- /dev/null
+++ b/metadata-ingestion/examples/iceberg/read_table.py
@@ -0,0 +1,15 @@
+from constants import namespace, table_name, warehouse
+from pyiceberg.catalog import load_catalog
+
+# Load the catalog
+from datahub.ingestion.graph.client import get_default_graph
+
+graph = get_default_graph()
+
+catalog = load_catalog("local_datahub", warehouse=warehouse, token=graph.config.token)
+# Append the data to the Iceberg table
+table = catalog.load_table(f"{namespace}.{table_name}")
+con = table.scan().to_duckdb(table_name=f"{table_name}")
+
+for row in con.execute(f"SELECT * FROM {table_name}").fetchall():
+    print(row)
diff --git a/metadata-ingestion/examples/iceberg/requirements.txt b/metadata-ingestion/examples/iceberg/requirements.txt
new file mode 100644
index 00000000000000..be79cbc80c647b
--- /dev/null
+++ b/metadata-ingestion/examples/iceberg/requirements.txt
@@ -0,0 +1,3 @@
+# The code in this directory requires the latest pyiceberg
+pyiceberg >= 0.8.1
+pyarrow >= 19.0.0
\ No newline at end of file
diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py
index f7e6482fd26f87..628c7156dadd5c 100644
--- a/metadata-ingestion/setup.py
+++ b/metadata-ingestion/setup.py
@@ -448,6 +448,7 @@
     | pyhive_common
     | {"psycopg2-binary", "pymysql>=1.0.2"},
     "iceberg": iceberg_common,
+    "iceberg-catalog": aws_common,
     "json-schema": set(),
     "kafka": kafka_common | kafka_protobuf,
     "kafka-connect": sql_common | {"requests", "JPype1"},
@@ -631,6 +632,7 @@
             "elasticsearch",
             "feast",
             "iceberg",
+            "iceberg-catalog",
             "mlflow",
             "json-schema",
             "ldap",
@@ -693,6 +695,7 @@
             "hana",
             "hive",
             "iceberg",
+            "iceberg-catalog",
             "kafka-connect",
             "ldap",
             "mongodb",
diff --git a/metadata-ingestion/src/datahub/cli/iceberg_cli.py b/metadata-ingestion/src/datahub/cli/iceberg_cli.py
new file mode 100644
index 00000000000000..f3552f34f2b5bd
--- /dev/null
+++ b/metadata-ingestion/src/datahub/cli/iceberg_cli.py
@@ -0,0 +1,707 @@
+import json
+import logging
+import sys
+from datetime import datetime
+from typing import Any, Dict, Iterator, List, Optional, Tuple, Union
+from urllib.parse import urlparse
+
+import boto3
+import botocore
+import click
+
+import datahub.metadata.schema_classes
+from datahub.cli.cli_utils import post_entity
+from datahub.configuration.common import GraphError
+from datahub.ingestion.graph.client import DataHubGraph, get_default_graph
+from datahub.metadata.schema_classes import SystemMetadataClass
+
+logger = logging.getLogger(__name__)
+
+DEFAULT_CREDS_EXPIRY_DURATION_SECONDS = 60 * 60
+DEFAULT_FABRIC_TYPE = datahub.metadata.schema_classes.FabricTypeClass.PROD
+
+DATA_PLATFORM_INSTANCE_WAREHOUSE_ASPECT = "icebergWarehouseInfo"
+
+
+@click.group()
+def iceberg() -> None:
+    """A group of commands to manage Iceberg warehouses using DataHub as the Iceberg Catalog."""
+    pass
+
+
+def validate_creds(client_id: str, client_secret: str, region: str) -> Any:
+    try:
+        # Create a boto3 client with the provided credentials
+        # Using STS (Security Token Service) for validation
+        sts_client = boto3.client(
+            "sts",
+            aws_access_key_id=client_id,
+            aws_secret_access_key=client_secret,
+            region_name=region,
+        )
+
+        # Try to get caller identity
+        sts_client.get_caller_identity()
+
+        # If successful, return True and the account info
+        return sts_client
+
+    except (
+        botocore.exceptions.ClientError,
+        botocore.exceptions.NoCredentialsError,
+    ):
+        # If credentials are invalid, return False with error message
+        click.secho(
+            "Invalid credentials",
+            fg="red",
+            err=True,
+        )
+        sys.exit(1)
+
+
+def validate_role(role: str, sts_client: Any, duration_seconds: Optional[int]) -> None:
+    try:
+        session_name = (
+            f"datahub-cli-iceberg-validation-{datetime.now().strftime('%Y%m%d%H%M%S')}"
+        )
+        # Assume the IAM role to ensure the settings we have are valid and if not, can report them at config time.
+
+        # If duration_seconds is not specified, datahub will attempt to default to an internal default
+        # defined in S3CredentialProvider.java DEFAULT_CREDS_DURATION_SECS. However, it is not possible to know for sure
+        # if that value is permitted based on how the role is configured. So, during the configuration of the warehouse
+        # we must attempt to use the intended expiration duration (default or explicitly supplied) to ensure it
+        # actually does work.
+        if duration_seconds is None:
+            duration_seconds = DEFAULT_CREDS_EXPIRY_DURATION_SECONDS
+
+        assumed_role = sts_client.assume_role(
+            RoleArn=role,
+            RoleSessionName=session_name,
+            DurationSeconds=duration_seconds,
+        )
+
+        # Extract the temporary credentials
+        credentials = assumed_role["Credentials"]
+        return credentials
+
+    except Exception as e:
+        click.secho(
+            f"Failed to assume role using '{role}' with error: {e}",
+            fg="red",
+            err=True,
+        )
+        sys.exit(1)
+
+
+def validate_warehouse(data_root: str) -> None:
+    # validate data_root location
+    scheme = urlparse(data_root).scheme
+    if scheme != "s3":
+        click.secho(
+            f"Unsupported warehouse location '{data_root}', supported schemes: s3",
+            fg="red",
+            err=True,
+        )
+        sys.exit(1)
+
+
+@iceberg.command()
+@click.option(
+    "-w", "--warehouse", required=True, type=str, help="The name of the warehouse"
+)
+@click.option(
+    "-p", "--description", required=False, type=str, help="Description of the warehouse"
+)
+@click.option(
+    "-d",
+    "--data_root",
+    required=True,
+    type=str,
+    help="The path to the data root for the warehouse data",
+)
+@click.option(
+    "-i",
+    "--client_id",
+    required=True,
+    type=str,
+    help="Client ID to authenticate with the storage provider of the data root",
+)
+@click.option(
+    "-s",
+    "--client_secret",
+    required=True,
+    type=str,
+    help="Client Secret to authenticate with the storage provider of the data root",
+)
+@click.option(
+    "-g",
+    "--region",
+    required=True,
+    type=str,
+    help="Storage provider specific region where the warehouse data root is located",
+)
+@click.option(
+    "-r",
+    "--role",
+    required=True,
+    type=str,
+    help="Storage provider specific role to be used when vending credentials",
+)
+@click.option(
+    "-e",
+    "--env",
+    required=False,
+    type=str,
+    help=f"Environment where all assets stored in this warehouse belong to. Defaults to {DEFAULT_FABRIC_TYPE} if unspecified",
+)
+@click.option(
+    "-x",
+    "--duration_seconds",
+    required=False,
+    type=int,
+    help=f"Expiration duration for temporary credentials used for role. Defaults to {DEFAULT_CREDS_EXPIRY_DURATION_SECONDS} seconds if unspecified",
+)
+def create(
+    warehouse: str,
+    description: Optional[str],
+    data_root: str,
+    client_id: str,
+    client_secret: str,
+    region: str,
+    role: str,
+    duration_seconds: Optional[int],
+    env: Optional[str],
+) -> None:
+    """
+    Create an iceberg warehouse.
+    """
+
+    client = get_default_graph()
+
+    urn = iceberg_data_platform_instance_urn(warehouse)
+
+    if client.exists(urn):
+        click.secho(
+            f"Warehouse with name {warehouse} already exists",
+            fg="red",
+            err=True,
+        )
+        sys.exit(1)
+
+    # will throw an actionable error message if invalid.
+    validate_warehouse(data_root)
+    storage_client = validate_creds(client_id, client_secret, region)
+    validate_role(role, storage_client, duration_seconds)
+
+    client_id_urn, client_secret_urn = create_iceberg_secrets(
+        client, warehouse, client_id, client_secret
+    )
+
+    if env is None:
+        env = DEFAULT_FABRIC_TYPE
+
+    warehouse_aspect = DATA_PLATFORM_INSTANCE_WAREHOUSE_ASPECT
+    warehouse_aspect_obj: Dict[str, Any] = {
+        "dataRoot": data_root,
+        "clientId": client_id_urn,
+        "clientSecret": client_secret_urn,
+        "region": region,
+        "role": role,
+        "env": env,
+    }
+
+    if duration_seconds:
+        warehouse_aspect_obj["tempCredentialExpirationSeconds"] = duration_seconds
+
+    data_platform_instance_properties_aspect_obj = {
+        "name": warehouse,
+    }
+
+    if description:
+        data_platform_instance_properties_aspect_obj["description"] = description
+
+    data_platform_instance_properties_aspect = "dataPlatformInstanceProperties"
+
+    entity_type = "dataPlatformInstance"
+    system_metadata: Union[None, SystemMetadataClass] = None
+
+    post_entity(
+        client._session,
+        client.config.server,
+        urn=urn,
+        aspect_name=data_platform_instance_properties_aspect,
+        entity_type=entity_type,
+        aspect_value=data_platform_instance_properties_aspect_obj,
+        system_metadata=system_metadata,
+    )
+
+    # If status is non 200, post_entity will raise an exception.
+
+    post_entity(
+        client._session,
+        client.config.server,
+        urn=urn,
+        aspect_name=warehouse_aspect,
+        entity_type=entity_type,
+        aspect_value=warehouse_aspect_obj,
+        system_metadata=system_metadata,
+    )
+
+    click.secho(
+        f"✅ Created warehouse with urn {urn}, clientID: {client_id_urn}, and clientSecret: {client_secret_urn}",
+        fg="green",
+    )
+
+
+@iceberg.command()
+@click.option(
+    "-w", "--warehouse", required=True, type=str, help="The name of the warehouse"
+)
+@click.option(
+    "-p",
+    "--description",
+    required=False,
+    type=str,
+    help="Description of the warehouse",
+)
+@click.option(
+    "-d",
+    "--data_root",
+    required=True,
+    type=str,
+    help="The path to the data root for the warehouse data",
+)
+@click.option(
+    "-i",
+    "--client_id",
+    required=True,
+    type=str,
+    help="Client ID to authenticate with the storage provider of the data root",
+)
+@click.option(
+    "-s",
+    "--client_secret",
+    required=True,
+    type=str,
+    help="Client Secret to authenticate with the storage provider of the data root",
+)
+@click.option(
+    "-g",
+    "--region",
+    required=True,
+    type=str,
+    help="Storage provider specific region where the warehouse data root is located",
+)
+@click.option(
+    "-r",
+    "--role",
+    required=True,
+    type=str,
+    help="Storage provider specific role to be used when vending credentials",
+)
+@click.option(
+    "-e",
+    "--env",
+    required=False,
+    type=str,
+    help=f"Environment where all assets stored in this warehouse belong to. Defaults to {DEFAULT_FABRIC_TYPE} if unspecified",
+)
+@click.option(
+    "-x",
+    "--duration_seconds",
+    required=False,
+    type=int,
+    help=f"Expiration duration for temporary credentials used for role. Defaults to {DEFAULT_CREDS_EXPIRY_DURATION_SECONDS} seconds if unspecified",
+)
+def update(
+    warehouse: str,
+    data_root: str,
+    description: Optional[str],
+    client_id: str,
+    client_secret: str,
+    region: str,
+    role: str,
+    env: Optional[str],
+    duration_seconds: Optional[int],
+) -> None:
+    """
+    Update iceberg warehouses. Can only update credentials, and role. Cannot update region
+    """
+
+    client = get_default_graph()
+
+    urn = iceberg_data_platform_instance_urn(warehouse)
+
+    if not client.exists(urn):
+        raise click.ClickException(f"Warehouse with name {warehouse} does not exist")
+
+    validate_warehouse(data_root)
+    storage_client = validate_creds(client_id, client_secret, region)
+    validate_role(role, storage_client, duration_seconds)
+
+    client_id_urn, client_secret_urn = update_iceberg_secrets(
+        client, warehouse, client_id, client_secret
+    )
+
+    if env is None:
+        env = DEFAULT_FABRIC_TYPE
+
+    warehouse_aspect = DATA_PLATFORM_INSTANCE_WAREHOUSE_ASPECT
+    warehouse_aspect_obj: Dict[str, Any] = {
+        "dataRoot": data_root,
+        "clientId": client_id_urn,
+        "clientSecret": client_secret_urn,
+        "region": region,
+        "role": role,
+        "env": env,
+    }
+    if duration_seconds:
+        warehouse_aspect_obj["tempCredentialExpirationSeconds"] = duration_seconds
+
+    data_platform_instance_properties_aspect_obj = {
+        "name": warehouse,
+    }
+
+    if description:
+        data_platform_instance_properties_aspect_obj["description"] = description
+
+    data_platform_instance_properties_aspect = "dataPlatformInstanceProperties"
+
+    entity_type = "dataPlatformInstance"
+    system_metadata: Union[None, SystemMetadataClass] = None
+
+    post_entity(
+        client._session,
+        client.config.server,
+        urn=urn,
+        aspect_name=data_platform_instance_properties_aspect,
+        entity_type=entity_type,
+        aspect_value=data_platform_instance_properties_aspect_obj,
+        system_metadata=system_metadata,
+    )
+
+    # If status is non 200, post_entity will raise an exception.
+    post_entity(
+        client._session,
+        client.config.server,
+        urn=urn,
+        aspect_name=warehouse_aspect,
+        entity_type=entity_type,
+        aspect_value=warehouse_aspect_obj,
+        system_metadata=system_metadata,
+    )
+
+    click.secho(
+        f"✅ Updated warehouse with urn {urn}, clientID: {client_id_urn}, and clientSecret: {client_secret_urn}",
+        fg="green",
+    )
+
+
+@iceberg.command()
+def list() -> None:
+    """
+    List iceberg warehouses
+    """
+
+    client = get_default_graph()
+
+    for warehouse in get_all_warehouses(client):
+        click.echo(warehouse)
+
+
+@iceberg.command()
+@click.option(
+    "-w", "--warehouse", required=True, type=str, help="The name of the warehouse"
+)
+def get(warehouse: str) -> None:
+    """Fetches the details of the specified iceberg warehouse"""
+    client = get_default_graph()
+    urn = iceberg_data_platform_instance_urn(warehouse)
+
+    if client.exists(urn):
+        warehouse_aspect = client.get_aspect(
+            entity_urn=urn,
+            aspect_type=datahub.metadata.schema_classes.IcebergWarehouseInfoClass,
+        )
+        click.echo(urn)
+        if warehouse_aspect:
+            click.echo(json.dumps(warehouse_aspect.to_obj(), sort_keys=True, indent=2))
+    else:
+        raise click.ClickException(f"Iceberg warehouse {warehouse} does not exist")
+
+
+@iceberg.command()
+@click.option(
+    "-w", "--warehouse", required=True, type=str, help="The name of the warehouse"
+)
+@click.option("-n", "--dry-run", required=False, is_flag=True)
+@click.option(
+    "-f",
+    "--force",
+    required=False,
+    is_flag=True,
+    help="force the delete if set without confirmation",
+)
+def delete(warehouse: str, dry_run: bool, force: bool) -> None:
+    """
+    Delete warehouse
+    """
+
+    urn = iceberg_data_platform_instance_urn(warehouse)
+
+    client = get_default_graph()
+
+    if not client.exists(urn):
+        raise click.ClickException(f"urn {urn} not found")
+
+    # Confirm this is a managed warehouse by checking for presence of IcebergWarehouse aspect
+    aspect = client.get_aspect(
+        entity_urn=urn,
+        aspect_type=datahub.metadata.schema_classes.IcebergWarehouseInfoClass,
+    )
+    if aspect:
+        warehouse_aspect: datahub.metadata.schema_classes.IcebergWarehouseInfoClass = (
+            aspect
+        )
+
+        urns_to_delete: List = []
+        resource_names_to_be_deleted: List = []
+        for entity in get_related_entities_for_platform_instance(client, urn):
+            # Do we really need this double-check?
+            if "__typename" in entity and "urn" in entity:
+                if entity["__typename"] in ["Container", "Dataset"]:
+                    urns_to_delete.append(entity["urn"])
+                    resource_names_to_be_deleted.append(
+                        entity.get("name", entity.get("urn"))
+                    )
+            # TODO: PlatformResource associated with datasets need to be deleted.
+
+        if dry_run:
+            click.echo(
+                f"[Dry-run] Would delete warehouse {urn} and the following datasets and namespaces"
+            )
+            for resource in resource_names_to_be_deleted:
+                click.echo(f"   {resource}")
+        else:
+            if not force:
+                click.confirm(
+                    f"This will delete {warehouse} warehouse, credentials, and {len(urns_to_delete)} datasets and namespaces from DataHub. Do you want to continue?",
+                    abort=True,
+                )
+            client.hard_delete_entity(urn)
+            client.hard_delete_entity(warehouse_aspect.clientId)
+            client.hard_delete_entity(warehouse_aspect.clientSecret)
+
+            for urn_to_delete in urns_to_delete:
+                client.hard_delete_entity(urn_to_delete)
+
+            click.echo(
+                f"✅ Successfully deleted iceberg warehouse {warehouse} and associated credentials, {len(urns_to_delete)} datasets and namespaces"
+            )
+
+
+def iceberg_data_platform_instance_urn(warehouse: str) -> str:
+    return f"urn:li:dataPlatformInstance:({iceberg_data_platform()},{warehouse})"
+
+
+def iceberg_data_platform() -> str:
+    return "urn:li:dataPlatform:iceberg"
+
+
+def iceberg_client_id_urn(warehouse):
+    return f"urn:li:dataHubSecret:{warehouse}-client_id"
+
+
+def iceberg_client_secret_urn(warehouse):
+    return f"urn:li:dataHubSecret:{warehouse}-client_secret"
+
+
+def create_iceberg_secrets(
+    client: DataHubGraph, warehouse: str, client_id: str, client_secret: str
+) -> Tuple[str, str]:
+    graphql_query = """
+        mutation createIcebergSecrets($clientIdName: String!, $clientId: String!, $clientSecretName: String!, $clientSecret: String!) {
+            createClientId: createSecret(
+                input: {name: $clientIdName, value: $clientId}
+            )
+            createClientSecret: createSecret(
+                input: {name: $clientSecretName, value: $clientSecret}
+            )
+        }
+    """
+    variables = {
+        "clientIdName": f"{warehouse}-client_id",
+        "clientId": client_id,
+        "clientSecretName": f"{warehouse}-client_secret",
+        "clientSecret": client_secret,
+    }
+    try:
+        response = client.execute_graphql(
+            graphql_query, variables=variables, format_exception=False
+        )
+    except GraphError as graph_error:
+        try:
+            error = json.loads(str(graph_error).replace('"', '\\"').replace("'", '"'))
+            click.secho(
+                f"Failed to save Iceberg warehouse credentials :{error[0]['message']}",
+                fg="red",
+                err=True,
+            )
+        except Exception:
+            click.secho(
+                f"Failed to save Iceberg warehouse credentials :\n{graph_error}",
+                fg="red",
+                err=True,
+            )
+        sys.exit(1)
+
+    if "createClientId" in response and "createClientSecret" in response:
+        return response["createClientId"], response["createClientSecret"]
+
+    click.secho(
+        f"Internal error: Unexpected response saving credentials:\n{response}",
+        fg="red",
+        err=True,
+    )
+    sys.exit(1)
+
+
+def update_iceberg_secrets(
+    client: DataHubGraph, warehouse: str, client_id: str, client_secret: str
+) -> Tuple[str, str]:
+    graphql_query = """
+        mutation updateIcebergSecrets($clientIdUrn: String!, $clientIdName: String!, $clientId: String!, $clientSecretUrn: String!, $clientSecretName: String!, $clientSecret: String!) {
+            updateClientId: updateSecret(
+                input: {urn: $clientIdUrn, name: $clientIdName, value: $clientId}
+            )
+            updateClientSecret: updateSecret(
+                input: {urn: $clientSecretUrn, name: $clientSecretName, value: $clientSecret}
+            )
+        }
+    """
+    variables = {
+        "clientIdUrn": iceberg_client_id_urn(warehouse),
+        "clientIdName": f"{warehouse}-client_id",
+        "clientId": client_id,
+        "clientSecretUrn": iceberg_client_secret_urn(warehouse),
+        "clientSecretName": f"{warehouse}-client_secret",
+        "clientSecret": client_secret,
+    }
+    try:
+        response = client.execute_graphql(
+            graphql_query, variables=variables, format_exception=False
+        )
+    except GraphError as graph_error:
+        try:
+            error = json.loads(str(graph_error).replace('"', '\\"').replace("'", '"'))
+            click.secho(
+                f"Failed to save Iceberg warehouse credentials :{error[0]['message']}",
+                fg="red",
+                err=True,
+            )
+        except Exception:
+            click.secho(
+                f"Failed to save Iceberg warehouse credentials :\n{graph_error}",
+                fg="red",
+                err=True,
+            )
+        sys.exit(1)
+
+    if "updateClientId" in response and "updateClientSecret" in response:
+        return response["updateClientId"], response["updateClientSecret"]
+
+    click.secho(
+        f"Internal error: Unexpected response saving credentials:\n{response}",
+        fg="red",
+        err=True,
+    )
+    sys.exit(1)
+
+
+def get_all_warehouses(client: DataHubGraph) -> Iterator[str]:
+    start: int = 0
+    total = None
+    graph_query = """
+        query getIcebergWarehouses($start: Int, $count: Int) {
+          search(
+            input: {type: DATA_PLATFORM_INSTANCE, query: "*", start: $start, count: $count}
+          ) {
+            start
+            total
+            searchResults {
+              entity {
+                urn
+                ... on DataPlatformInstance {
+                  instanceId
+                }
+              }
+            }
+          }
+        }
+        """
+    count = 10
+    variables = {"start": start, "count": count}
+    while total is None or start < total:
+        response = client.execute_graphql(
+            graph_query, variables=variables, format_exception=True
+        )
+        if "search" in response and "total" in response["search"]:
+            total = response["search"]["total"]
+            search_results = response["search"].get("searchResults", [])
+            for result in search_results:
+                yield result["entity"]["instanceId"]
+            start += count
+            variables = {"start": start, "count": count}
+            # if total is not None and
+        else:
+            break
+
+
+def get_related_entities_for_platform_instance(
+    client: DataHubGraph, data_platform_instance_urn: str
+) -> Iterator[Dict]:
+    start: int = 0
+    total = None
+
+    graph_query = """
+        query getIcebergResources($platformInstanceUrn: String!, $start: Int!, $count: Int!) {
+          searchAcrossEntities(
+            input: {types: [DATASET, CONTAINER], query: "*", start: $start, count: $count, orFilters: [{and: [{field: "platformInstance", values: [$platformInstanceUrn]}]}]}
+          ) {
+            start
+            total
+            searchResults {
+              entity {
+                __typename
+                urn
+                ... on Dataset {
+                  urn
+                  name
+                }
+              }
+            }
+          }
+        }
+    """
+    count = 10
+    variables = {
+        "start": start,
+        "count": count,
+        "platformInstanceUrn": data_platform_instance_urn,
+    }
+    while total is None or start < total:
+        response = client.execute_graphql(
+            graph_query, variables=variables, format_exception=True
+        )
+        if (
+            "searchAcrossEntities" in response
+            and "total" in response["searchAcrossEntities"]
+        ):
+            total = response["searchAcrossEntities"]["total"]
+            search_results = response["searchAcrossEntities"].get("searchResults", [])
+            for result in search_results:
+                yield result["entity"]
+            start += count
+            variables["start"] = start
+        else:
+            break
diff --git a/metadata-ingestion/src/datahub/entrypoints.py b/metadata-ingestion/src/datahub/entrypoints.py
index 73d35381d5df29..5ae465bbc89eea 100644
--- a/metadata-ingestion/src/datahub/entrypoints.py
+++ b/metadata-ingestion/src/datahub/entrypoints.py
@@ -183,6 +183,18 @@ def init(use_password: bool = False) -> None:
 datahub.add_command(assertions)
 datahub.add_command(container)
 
+try:
+    from datahub.cli.iceberg_cli import iceberg
+
+    datahub.add_command(iceberg)
+except ImportError as e:
+    logger.debug(f"Failed to load datahub iceberg command: {e}")
+    datahub.add_command(
+        make_shim_command(
+            "iceberg", "run `pip install 'acryl-datahub[iceberg-catalog]'`"
+        )
+    )
+
 try:
     from datahub.cli.lite_cli import lite
 
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
index 153aa0685f9b26..7de32f7faa328e 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
@@ -1,11 +1,6 @@
 package com.linkedin.metadata.entity;
 
-import static com.linkedin.metadata.Constants.APP_SOURCE;
-import static com.linkedin.metadata.Constants.ASPECT_LATEST_VERSION;
-import static com.linkedin.metadata.Constants.FORCE_INDEXING_KEY;
-import static com.linkedin.metadata.Constants.STATUS_ASPECT_NAME;
-import static com.linkedin.metadata.Constants.SYSTEM_ACTOR;
-import static com.linkedin.metadata.Constants.UI_SOURCE;
+import static com.linkedin.metadata.Constants.*;
 import static com.linkedin.metadata.entity.TransactionContext.DEFAULT_MAX_TRANSACTION_RETRY;
 import static com.linkedin.metadata.utils.PegasusUtils.constructMCL;
 import static com.linkedin.metadata.utils.PegasusUtils.getDataTemplateClassFromSchema;
@@ -1502,20 +1497,37 @@ public String batchApplyRetention(
 
   private boolean preprocessEvent(
       @Nonnull OperationContext opContext, MetadataChangeLog metadataChangeLog) {
+    if (updateIndicesService == null) {
+      return false;
+    }
+
+    boolean syncIndexUpdate = false;
+
     if (preProcessHooks.isUiEnabled()) {
       if (metadataChangeLog.getSystemMetadata() != null) {
         if (metadataChangeLog.getSystemMetadata().getProperties() != null) {
           if (UI_SOURCE.equals(
               metadataChangeLog.getSystemMetadata().getProperties().get(APP_SOURCE))) {
             // Pre-process the update indices hook for UI updates to avoid perceived lag from Kafka
-            if (updateIndicesService != null) {
-              updateIndicesService.handleChangeEvent(opContext, metadataChangeLog);
-            }
-            return true;
+            syncIndexUpdate = true;
           }
         }
       }
     }
+    if (!syncIndexUpdate && metadataChangeLog.getHeaders() != null) {
+      if (metadataChangeLog
+          .getHeaders()
+          .getOrDefault(SYNC_INDEX_UPDATE_HEADER_NAME, "false")
+          .equalsIgnoreCase(Boolean.toString(true))) {
+        // A specific MCP requested a sync index update.
+        syncIndexUpdate = true;
+      }
+    }
+
+    if (syncIndexUpdate) {
+      updateIndicesService.handleChangeEvent(opContext, metadataChangeLog);
+      return true;
+    }
     return false;
   }
 
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/entity/EntityServiceTest.java b/metadata-io/src/test/java/com/linkedin/metadata/entity/EntityServiceTest.java
index dabdf493fa1f99..f2726af772f94f 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/entity/EntityServiceTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/entity/EntityServiceTest.java
@@ -2006,6 +2006,97 @@ public void testUIPreProcessedProposal() throws Exception {
             "datasetKey"));
   }
 
+  @Test
+  public void testSyncHeaderPreProcessedProposal() throws Exception {
+    Urn entityUrn = UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:foo,bar,PROD)");
+    EditableDatasetProperties datasetProperties = new EditableDatasetProperties();
+    datasetProperties.setDescription("Foo Bar");
+    MetadataChangeProposal gmce = new MetadataChangeProposal();
+    gmce.setEntityUrn(entityUrn);
+    gmce.setChangeType(ChangeType.UPSERT);
+    gmce.setEntityType("dataset");
+    gmce.setAspectName("editableDatasetProperties");
+
+    JacksonDataTemplateCodec dataTemplateCodec = new JacksonDataTemplateCodec();
+    byte[] datasetPropertiesSerialized = dataTemplateCodec.dataTemplateToBytes(datasetProperties);
+    GenericAspect genericAspect = new GenericAspect();
+    genericAspect.setValue(ByteString.unsafeWrap(datasetPropertiesSerialized));
+    genericAspect.setContentType("application/json");
+    gmce.setAspect(genericAspect);
+
+    // verify with sync header
+    StringMap headers = new StringMap();
+    headers.put(SYNC_INDEX_UPDATE_HEADER_NAME, "true");
+    gmce.setHeaders(headers);
+
+    ArgumentCaptor<MetadataChangeLog> mceCaptor = ArgumentCaptor.forClass(MetadataChangeLog.class);
+    _entityServiceImpl.ingestProposal(opContext, gmce, TEST_AUDIT_STAMP, false);
+
+    verify(_mockUpdateIndicesService, times(1))
+        .handleChangeEvent(eq(opContext), mceCaptor.capture());
+    assertTrue(
+        mceCaptor
+            .getValue()
+            .getHeaders()
+            .get(SYNC_INDEX_UPDATE_HEADER_NAME)
+            .equalsIgnoreCase("true"));
+    assertEquals(mceCaptor.getValue().getEntityUrn(), entityUrn);
+  }
+
+  @Test
+  public void testWithoutSyncHeaderOrUISourcePreProcessedProposal() throws Exception {
+    Urn entityUrn = UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:foo,bar,PROD)");
+    EditableDatasetProperties datasetProperties = new EditableDatasetProperties();
+    datasetProperties.setDescription("Foo Bar");
+    MetadataChangeProposal gmce = new MetadataChangeProposal();
+    gmce.setEntityUrn(entityUrn);
+    gmce.setChangeType(ChangeType.UPSERT);
+    gmce.setEntityType("dataset");
+    gmce.setAspectName("editableDatasetProperties");
+
+    JacksonDataTemplateCodec dataTemplateCodec = new JacksonDataTemplateCodec();
+    byte[] datasetPropertiesSerialized = dataTemplateCodec.dataTemplateToBytes(datasetProperties);
+    GenericAspect genericAspect = new GenericAspect();
+    genericAspect.setValue(ByteString.unsafeWrap(datasetPropertiesSerialized));
+    genericAspect.setContentType("application/json");
+    gmce.setAspect(genericAspect);
+
+    ArgumentCaptor<MetadataChangeLog> mceCaptor = ArgumentCaptor.forClass(MetadataChangeLog.class);
+    _entityServiceImpl.ingestProposal(opContext, gmce, TEST_AUDIT_STAMP, false);
+
+    verify(_mockUpdateIndicesService, never()).handleChangeEvent(any(), any());
+  }
+
+  @Test
+  public void testWithNullUpdateIndicesServicePreProcessedProposal() throws Exception {
+    _entityServiceImpl.setUpdateIndicesService(
+        null); // this should cause skipping of the sync index update
+    Urn entityUrn = UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:foo,bar,PROD)");
+    EditableDatasetProperties datasetProperties = new EditableDatasetProperties();
+    datasetProperties.setDescription("Foo Bar");
+    MetadataChangeProposal gmce = new MetadataChangeProposal();
+    gmce.setEntityUrn(entityUrn);
+    gmce.setChangeType(ChangeType.UPSERT);
+    gmce.setEntityType("dataset");
+    gmce.setAspectName("editableDatasetProperties");
+
+    StringMap headers = new StringMap();
+    headers.put(SYNC_INDEX_UPDATE_HEADER_NAME, "true");
+    gmce.setHeaders(headers);
+
+    JacksonDataTemplateCodec dataTemplateCodec = new JacksonDataTemplateCodec();
+    byte[] datasetPropertiesSerialized = dataTemplateCodec.dataTemplateToBytes(datasetProperties);
+    GenericAspect genericAspect = new GenericAspect();
+    genericAspect.setValue(ByteString.unsafeWrap(datasetPropertiesSerialized));
+    genericAspect.setContentType("application/json");
+    gmce.setAspect(genericAspect);
+
+    ArgumentCaptor<MetadataChangeLog> mceCaptor = ArgumentCaptor.forClass(MetadataChangeLog.class);
+    _entityServiceImpl.ingestProposal(opContext, gmce, TEST_AUDIT_STAMP, false);
+
+    verify(_mockUpdateIndicesService, never()).handleChangeEvent(any(), any());
+  }
+
   @Test
   public void testStructuredPropertyIngestProposal() throws Exception {
     String urnStr = "urn:li:dataset:(urn:li:dataPlatform:looker,sample_dataset_unique,PROD)";
diff --git a/metadata-models/src/main/pegasus/com/linkedin/dataplatforminstance/IcebergWarehouseInfo.pdl b/metadata-models/src/main/pegasus/com/linkedin/dataplatforminstance/IcebergWarehouseInfo.pdl
new file mode 100644
index 00000000000000..0bd914dc71da4c
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/dataplatforminstance/IcebergWarehouseInfo.pdl
@@ -0,0 +1,48 @@
+namespace com.linkedin.dataplatforminstance
+
+import com.linkedin.common.Urn
+import com.linkedin.common.FabricType
+
+/**
+ * An Iceberg warehouse location and credentails whose read/writes are governed by datahub catalog.
+ */
+@Aspect = {
+  "name": "icebergWarehouseInfo"
+}
+record  IcebergWarehouseInfo {
+
+  /**
+   * Path of the root for the backing store of the tables in the warehouse.
+   */
+  dataRoot: string
+
+  /**
+   * clientId to be used to authenticate with storage hosting this warehouse
+   */
+  clientId: Urn
+
+  /**
+   * client secret to authenticate with storage hosting this warehouse
+   */
+  clientSecret: Urn
+
+  /**
+   * region where the warehouse is located.
+   */
+  region: string
+
+  /*
+   * Role to be used when vending credentials to writers.
+   */
+  role: optional string
+
+  /*
+   * Expiration for temporary credentials created to access this warehouse.
+   */
+  tempCredentialExpirationSeconds: optional int
+
+  /*
+   * Environment where all assets stored in this warehouse belong to
+   */
+  env: FabricType
+}
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/dataset/IcebergCatalogInfo.pdl b/metadata-models/src/main/pegasus/com/linkedin/dataset/IcebergCatalogInfo.pdl
new file mode 100644
index 00000000000000..085192b51a90a4
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/dataset/IcebergCatalogInfo.pdl
@@ -0,0 +1,25 @@
+namespace com.linkedin.dataset
+
+import com.linkedin.common.Uri
+import com.linkedin.common.CustomProperties
+import com.linkedin.common.ExternalReference
+import com.linkedin.common.TimeStamp
+
+/**
+ * Iceberg Catalog metadata associated with an Iceberg table/view
+ */
+@Aspect = {
+  "name": "icebergCatalogInfo"
+}
+record IcebergCatalogInfo {
+
+  /**
+   * When Datahub is the REST Catalog for an Iceberg Table, stores the current metadata pointer.
+   * If the Iceberg table is managed by an external catalog, the metadata pointer is not set.
+   */
+  metadataPointer: optional string
+
+  view: optional boolean
+
+  // tableProperties: map[string, string] = { }
+}
diff --git a/metadata-models/src/main/resources/entity-registry.yml b/metadata-models/src/main/resources/entity-registry.yml
index 96a1c4791f2102..493b17c7c3d861 100644
--- a/metadata-models/src/main/resources/entity-registry.yml
+++ b/metadata-models/src/main/resources/entity-registry.yml
@@ -47,6 +47,7 @@ entities:
       - forms
       - partitionsSummary
       - versionProperties
+      - icebergCatalogInfo
   - name: dataHubPolicy
     doc: DataHub Policies represent access policies granted to users or groups on metadata operations like edit, view etc.
     category: internal
@@ -337,6 +338,7 @@ entities:
       - institutionalMemory
       - deprecation
       - status
+      - icebergWarehouseInfo
   - name: mlModel
     category: core
     keyAspect: mlModelKey
diff --git a/metadata-service/configuration/src/main/resources/application.yaml b/metadata-service/configuration/src/main/resources/application.yaml
index ab64c654c22304..4f6bf8d1240033 100644
--- a/metadata-service/configuration/src/main/resources/application.yaml
+++ b/metadata-service/configuration/src/main/resources/application.yaml
@@ -8,7 +8,7 @@ baseUrl: ${DATAHUB_BASE_URL:http://localhost:9002}
 authentication:
   # Enable if you want all requests to the Metadata Service to be authenticated.
   enabled: ${METADATA_SERVICE_AUTH_ENABLED:true}
-  excludedPaths: /schema-registry/*,/health,/config,/config/search/export
+  excludedPaths: /schema-registry/*,/health,/config,/config/search/export,/public-iceberg/*
 
   # Disable if you want to skip validation of deleted user's tokens
   enforceExistenceEnabled: ${METADATA_SERVICE_AUTH_ENFORCE_EXISTENCE_ENABLED:true}
@@ -649,3 +649,7 @@ metadataChangeProposal:
       initialIntervalMs: ${MCP_TIMESERIES_INITIAL_INTERVAL_MS:100}
       multiplier: ${MCP_TIMESERIES_MULTIPLIER:10}
       maxIntervalMs:  ${MCP_TIMESERIES_MAX_INTERVAL_MS:30000}
+
+icebergCatalog:
+      enablePublicRead: ${ENABLE_PUBLIC_READ:false}
+      publiclyReadableTag: ${PUBLICLY_READABLE_TAG:PUBLICLY_READABLE}
\ No newline at end of file
diff --git a/metadata-service/iceberg-catalog/build.gradle b/metadata-service/iceberg-catalog/build.gradle
new file mode 100644
index 00000000000000..f5fa8c32e479c7
--- /dev/null
+++ b/metadata-service/iceberg-catalog/build.gradle
@@ -0,0 +1,84 @@
+plugins {
+    id 'java'
+}
+apply from: '../../gradle/coverage/java-coverage.gradle'
+
+ext {
+    python_executable = 'python3'
+    venv_name = 'venv'
+}
+
+dependencies {
+    implementation project(':metadata-service:services')
+    implementation project(':metadata-models')
+    implementation project(':metadata-utils')
+    implementation project(':metadata-operation-context')
+    implementation project(':metadata-integration:java:datahub-schematron:lib')
+    implementation 'org.apache.iceberg:iceberg-core:1.6.1'
+    implementation 'org.apache.iceberg:iceberg-aws:1.6.1'
+    implementation 'software.amazon.awssdk:sts:2.26.12'
+    implementation 'software.amazon.awssdk:iam-policy-builder:2.26.12'
+    implementation externalDependency.awsS3
+
+    implementation externalDependency.reflections
+    implementation externalDependency.springBoot
+    implementation externalDependency.springCore
+    implementation(externalDependency.springDocUI) {
+        exclude group: 'org.springframework.boot'
+    }
+    implementation externalDependency.springWeb
+    implementation externalDependency.springWebMVC
+    implementation externalDependency.springBeans
+    implementation externalDependency.springContext
+    implementation externalDependency.springBootAutoconfigure
+    implementation externalDependency.servletApi
+    implementation externalDependency.slf4jApi
+    compileOnly externalDependency.lombok
+    implementation externalDependency.antlr4Runtime
+    implementation externalDependency.antlr4
+    implementation externalDependency.javaxInject
+    implementation externalDependency.avro
+    implementation externalDependency.guava
+
+    annotationProcessor externalDependency.lombok
+
+    testImplementation externalDependency.springBootTest
+    testImplementation project(':mock-entity-registry')
+    testImplementation externalDependency.springBoot
+    testImplementation externalDependency.testContainers
+    testImplementation externalDependency.testContainersKafka
+    testImplementation externalDependency.springKafka
+    testImplementation externalDependency.testng
+    testImplementation externalDependency.mockito
+    testImplementation externalDependency.logbackClassic
+    testImplementation externalDependency.jacksonCore
+    testImplementation externalDependency.jacksonDataBind
+    testImplementation externalDependency.springBootStarterWeb
+}
+
+task installDev(type: Exec) {
+    inputs.file file('pyproject.toml')
+    inputs.file file('requirements.txt')
+    outputs.file("${venv_name}/.build_install_dev_sentinel")
+    commandLine 'bash', '-c',
+        "set -x && " +
+            "${python_executable} -m venv ${venv_name} && " +
+            "${venv_name}/bin/python -m pip install --upgrade uv && " +
+            "set +x && source ${venv_name}/bin/activate && set -x && " +
+            "uv pip install -r requirements.txt && " +
+            "touch ${venv_name}/.build_install_dev_sentinel"
+}
+
+task integrationTestQuick(type: Exec, dependsOn: installDev) {
+    workingDir = project.projectDir
+    commandLine 'bash', '-c',
+        "source ${venv_name}/bin/activate && set -x && " +
+            "pytest -m quick"
+}
+
+task integrationTest(type: Exec, dependsOn: installDev) {
+    workingDir = project.projectDir
+    commandLine 'bash', '-c',
+        "source ${venv_name}/bin/activate && set -x && " +
+            "pytest"
+}
diff --git a/metadata-service/iceberg-catalog/pyproject.toml b/metadata-service/iceberg-catalog/pyproject.toml
new file mode 100644
index 00000000000000..3115f1d7d91c04
--- /dev/null
+++ b/metadata-service/iceberg-catalog/pyproject.toml
@@ -0,0 +1,46 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "iceberg-catalog-integration-test"
+version = "0.0.0"
+description = ""
+authors = [
+	{ name="Acryl Data", email="eng@acryl.io" },
+]
+requires-python = ">=3.9"
+
+
+[tool.black]
+extend-exclude = '''
+# A regex preceded with ^/ will apply only to files and directories
+# in the root of the project.
+tmp
+venv
+'''
+include = '\.pyi?$'
+target-version = ['py310']
+
+[tool.isort]
+profile = 'black'
+
+[tool.ruff]
+ignore = [
+	'E501', # Ignore line length, since black handles that.
+	'D203', # Ignore 1 blank line required before class docstring.
+]
+
+[tool.mypy]
+exclude = "^(venv/|build/|dist/)"
+ignore_missing_imports = true
+namespace_packages = false
+check_untyped_defs = true
+disallow_untyped_decorators = true
+warn_unused_configs = true
+# eventually we'd like to enable these
+disallow_incomplete_defs = false
+disallow_untyped_defs = false
+
+[tool.pyright]
+extraPaths = ['tests']
diff --git a/metadata-service/iceberg-catalog/requirements.txt b/metadata-service/iceberg-catalog/requirements.txt
new file mode 100644
index 00000000000000..de0d0e77672fd2
--- /dev/null
+++ b/metadata-service/iceberg-catalog/requirements.txt
@@ -0,0 +1,16 @@
+pytest>=6.2
+pytest-dependency>=0.5.1
+pyspark==3.5.3
+-e ../../metadata-ingestion[iceberg-catalog]
+# libaries for linting below this
+black==23.7.0
+isort==5.12.0
+mypy==1.5.1
+ruff==0.0.287
+# stub version are copied from metadata-ingestion/setup.py and that should be the source of truth
+types-requests>=2.28.11.6,<=2.31.0.3
+types-PyYAML
+# https://github.com/docker/docker-py/issues/3256
+requests<=2.31.0
+# Missing numpy requirement in 8.0.0
+deepdiff!=8.0.0
\ No newline at end of file
diff --git a/metadata-service/iceberg-catalog/src/integrationTest/integration_test.py b/metadata-service/iceberg-catalog/src/integrationTest/integration_test.py
new file mode 100644
index 00000000000000..afcb74d5c1923a
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/integrationTest/integration_test.py
@@ -0,0 +1,243 @@
+from pyspark.sql import SparkSession
+import os
+from urllib.parse import urlparse
+import pytest
+from datahub.cli import cli_utils, env_utils, iceberg_cli
+from datahub.ingestion.graph.client import DataHubGraph, get_default_graph
+
+
+def get_gms_url():
+    return os.getenv("DATAHUB_GMS_URL") or "http://localhost:8080"
+
+
+@pytest.fixture
+def personal_access_token():
+    username = "datahub"
+    password = "datahub"
+    token_name, token = cli_utils.generate_access_token(
+        username, password, get_gms_url()
+    )
+
+    # Setting this env var makes get_default_graph use these env vars to create a graphql client.
+    os.environ["DATAHUB_GMS_TOKEN"] = token
+    os.environ["DATAHUB_GMS_HOST"] = urlparse(get_gms_url()).hostname
+    os.environ["DATAHUB_GMS_PORT"] = str(urlparse(get_gms_url()).port)
+
+    yield token
+
+    # revoke token
+
+
+def give_all_permissions(username, policy_name):
+    client = get_default_graph()
+    query = """
+        mutation createAdminRole($policyName: String!, $user: String!) {
+          createPolicy(
+            input: {
+                name: $policyName, 
+                description: "For Testing", 
+                state: ACTIVE, 
+                type: METADATA, 
+                privileges: ["DATA_READ_WRITE", "DATA_MANAGE_NAMESPACES", "DATA_MANAGE_TABLES", "DATA_MANAGE_VIEWS", "DATA_MANAGE_NAMESPACES", "DATA_LIST_ENTITIES"], 
+                actors: {users: [$user], 
+                allUsers: false, 
+                resourceOwners: true, 
+                allGroups: false}}
+          )
+        }
+        """
+    variables = {"user": f"urn:li:corpuser:{username}", "policyName": policy_name}
+
+    response = client.execute_graphql(
+        query, variables=variables, format_exception=False
+    )
+
+
+@pytest.fixture
+def spark_session(personal_access_token, warehouse):
+    # Create a Spark session
+
+    spark = (
+        SparkSession.builder.appName("Simple Example")
+        .config(
+            "spark.jars.packages",
+            "org.apache.iceberg:iceberg-spark-runtime-3.5_2.12:1.6.1,org.apache.iceberg:iceberg-aws-bundle:1.6.1",
+        )
+        .config("spark.sql.catalog.test", "org.apache.iceberg.spark.SparkCatalog")
+        .config(
+            "spark.sql.catalog.spark_catalog",
+            "org.apache.iceberg.spark.SparkSessionCatalog",
+        )
+        .config(
+            "spark.sql.extensions",
+            "org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions",
+        )
+        .config("spark.sql.catalog.test.type", "rest")
+        .config("spark.sql.catalog.test.uri", f"{get_gms_url()}/iceberg")
+        .config("spark.sql.catalog.test.warehouse", warehouse)
+        .config("spark.sql.catalog.test.token", personal_access_token)
+        .config("spark.sql.defaultCatalog", "test")
+        .config("spark.sql.catalog.test.default-namespace", "default")
+        .config(
+            "spark.sql.catalog.test.header.X-Iceberg-Access-Delegation",
+            "vended-credentials",
+        )
+        .config("spark.sql.catalog.test.rest-metrics-reporting-enabled", False)
+        .master("local[*]")
+        .getOrCreate()
+    )
+
+    # ensure default namespace
+    spark.sql("create namespace if not exists default")
+
+    yield spark
+
+    # Stop the Spark session
+    spark.stop()
+
+
+@pytest.fixture(params=[f"test_wh_{index}" for index in range(4)])
+def warehouse(request, personal_access_token):
+    warehouse_name = request.param
+    # PAT dependency just to ensure env vars are setup with token
+    give_all_permissions("datahub", "test-policy")
+
+    data_root = os.getenv(
+        "ICEBERG_DATA_ROOT", f"s3://srinath-dev/test/{warehouse_name}"
+    )
+    client_id = os.getenv("ICEBERG_CLIENT_ID")
+    client_secret = os.getenv("ICEBERG_CLIENT_SECRET")
+    region = os.getenv("ICEBERG_REGION")
+    role = os.getenv("ICEBERG_ROLE")
+
+    if not all((data_root, client_id, client_secret, region, role)):
+        pytest.fail(
+            "Must set ICEBERG_DATA_ROOT, ICEBERG_CLIENT_ID, ICEBERG_CLIENT_SECRET, ICEBERG_REGION, ICEBERG_ROLE"
+        )
+
+    try:
+        iceberg_cli.delete.callback(warehouse_name, dry_run=False, force=True)
+        print(
+            f"Deleted warehouse {warehouse_name}"
+        )  # This ensures we are starting with a new warehouse.
+    except Exception as e:
+        print(e)
+
+    iceberg_cli.create.callback(
+        warehouse=warehouse_name,
+        description="",
+        data_root=data_root,
+        client_id=client_id,
+        client_secret=client_secret,
+        region=region,
+        role=role,
+        env="PROD",
+        duration_seconds=60 * 60,
+    )
+
+    yield warehouse_name
+
+
+def cleanup(session):
+    # Cleanup any remnants of past test runs
+    session.sql("drop table if exists test_table")
+    session.sql("drop view if exists test_view")
+
+
+def _test_basic_table_ops(spark_session):
+    spark_session.sql("create table test_table (id int, name string)")
+
+    spark_session.sql("insert into test_table values(1, 'foo' ) ")
+    result = spark_session.sql("SELECT * FROM test_table")
+    assert result.count() == 1
+
+    spark_session.sql("update test_table set name='bar' where id=1")
+    result = spark_session.sql("SELECT * FROM test_table where name='bar'")
+    assert result.count() == 1
+
+    spark_session.sql("delete from test_table")
+    result = spark_session.sql("SELECT * FROM test_table")
+    assert result.count() == 0
+
+    spark_session.sql("drop table test_table")
+    try:
+        spark_session.sql("select * from test_table")
+        assert False, "Table must not exist"
+    except:
+        pass  # Exception is expected
+
+    # TODO: Add dataset verification
+
+
+def _test_basic_view_ops(spark_session):
+    spark_session.sql("create table test_table (id int, name string)")
+    spark_session.sql("insert into test_table values(1, 'foo' ) ")
+
+    spark_session.sql("create view test_view AS select * from test_table")
+    result = spark_session.sql("SELECT * FROM test_view")
+    assert result.count() == 1
+
+    spark_session.sql("DROP VIEW test_view")
+    try:
+        spark_session.sql("SELECT * FROM test_view")
+        assert False, "test_view must not exist"
+    except:
+        pass  # Exception is expected
+
+    spark_session.sql("drop table test_table")
+
+
+def _test_rename_ops(spark_session):
+    spark_session.sql("create table test_table (id int, name string)")
+    spark_session.sql("insert into test_table values(1, 'foo' ) ")
+
+    spark_session.sql("alter table test_table rename to test_table_renamed")
+
+    try:
+        spark_session.sql("SELECT * FROM test_table")
+        assert False, "test_table must not exist"
+    except:
+        pass  # Exception is expected
+
+    spark_session.sql("insert into test_table_renamed values(2, 'bar' ) ")
+    result = spark_session.sql("SELECT * FROM test_table_renamed")
+    assert result.count() == 2
+
+    spark_session.sql("create view test_view as select * from test_table_renamed")
+    result = spark_session.sql("SELECT * FROM test_view")
+    assert result.count() == 2
+
+    spark_session.sql("alter view test_view rename to test_view_renamed")
+    result = spark_session.sql("SELECT * FROM test_view_renamed")
+    assert result.count() == 2
+
+    spark_session.sql("drop view test_view_renamed")
+    spark_session.sql("drop view test_table_renamed")
+
+
+@pytest.mark.quick
+@pytest.mark.parametrize("warehouse", ["test_wh_0"], indirect=True)
+def test_iceberg_quick(spark_session, warehouse):
+    spark_session.sql("use namespace default")
+    _test_basic_table_ops(spark_session)
+    _test_basic_view_ops(spark_session)
+    _test_rename_ops(spark_session)
+
+
+def _create_table(spark_session, ns, table_name):
+    spark_session.sql("create namespace if not exists default")
+    spark_session.sql(f"create namespace if not exists {ns}")
+    spark_session.sql(f"drop table if exists {ns}.{table_name}")
+    spark_session.sql(f"create table {ns}.{table_name} (id int, name string)")
+
+    spark_session.sql(f"insert into {ns}.{table_name} values (1, 'foo' ) ")
+
+
+def test_load_tables(spark_session, warehouse):
+    namespace_count = 3
+    table_count = 4
+    for ns_index in range(namespace_count):
+        ns = f"default_ns{ns_index}"
+        for table_index in range(table_count):
+            table_name = f"table_{table_index}"
+            _create_table(spark_session, ns, table_name)
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataHubIcebergWarehouse.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataHubIcebergWarehouse.java
new file mode 100644
index 00000000000000..2615ae670a7864
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataHubIcebergWarehouse.java
@@ -0,0 +1,275 @@
+package io.datahubproject.iceberg.catalog;
+
+import static com.linkedin.metadata.Constants.*;
+import static com.linkedin.metadata.utils.GenericRecordUtils.serializeAspect;
+import static io.datahubproject.iceberg.catalog.Utils.*;
+
+import com.google.common.util.concurrent.Striped;
+import com.linkedin.common.AuditStamp;
+import com.linkedin.common.FabricType;
+import com.linkedin.common.urn.DatasetUrn;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.dataplatforminstance.IcebergWarehouseInfo;
+import com.linkedin.dataset.IcebergCatalogInfo;
+import com.linkedin.entity.EnvelopedAspect;
+import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.mxe.MetadataChangeProposal;
+import com.linkedin.platformresource.PlatformResourceInfo;
+import com.linkedin.secret.DataHubSecretValue;
+import com.linkedin.util.Pair;
+import io.datahubproject.iceberg.catalog.credentials.CredentialProvider;
+import io.datahubproject.metadata.context.OperationContext;
+import io.datahubproject.metadata.services.SecretService;
+import java.net.URISyntaxException;
+import java.util.*;
+import java.util.concurrent.locks.Lock;
+import lombok.Getter;
+import lombok.SneakyThrows;
+import org.apache.iceberg.CatalogUtil;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.exceptions.*;
+
+public class DataHubIcebergWarehouse {
+
+  public static final String DATASET_ICEBERG_METADATA_ASPECT_NAME = "icebergCatalogInfo";
+  public static final String DATAPLATFORM_INSTANCE_ICEBERG_WAREHOUSE_ASPECT_NAME =
+      "icebergWarehouseInfo";
+
+  private final EntityService entityService;
+
+  private final SecretService secretService;
+
+  private final OperationContext operationContext;
+
+  private final IcebergWarehouseInfo icebergWarehouse;
+
+  @Getter private final String platformInstance;
+
+  // TODO: Need to handle locks for deployments with multiple GMS replicas.
+  private static final Striped<Lock> resourceLocks =
+      Striped.lazyWeakLock(Runtime.getRuntime().availableProcessors() * 2);
+
+  private DataHubIcebergWarehouse(
+      String platformInstance,
+      IcebergWarehouseInfo icebergWarehouse,
+      EntityService entityService,
+      SecretService secretService,
+      OperationContext operationContext) {
+    this.platformInstance = platformInstance;
+    this.icebergWarehouse = icebergWarehouse;
+    this.entityService = entityService;
+    this.secretService = secretService;
+    this.operationContext = operationContext;
+  }
+
+  public static DataHubIcebergWarehouse of(
+      String platformInstance,
+      EntityService entityService,
+      SecretService secretService,
+      OperationContext operationContext) {
+    Urn platformInstanceUrn = Utils.platformInstanceUrn(platformInstance);
+    RecordTemplate warehouseAspect =
+        entityService.getLatestAspect(
+            operationContext,
+            platformInstanceUrn,
+            DATAPLATFORM_INSTANCE_ICEBERG_WAREHOUSE_ASPECT_NAME);
+
+    if (warehouseAspect == null) {
+      throw new NotFoundException("Unknown warehouse " + platformInstance);
+    }
+
+    IcebergWarehouseInfo icebergWarehouse = new IcebergWarehouseInfo(warehouseAspect.data());
+    return new DataHubIcebergWarehouse(
+        platformInstance, icebergWarehouse, entityService, secretService, operationContext);
+  }
+
+  public CredentialProvider.StorageProviderCredentials getStorageProviderCredentials() {
+
+    Urn clientIdUrn, clientSecretUrn;
+    String role, region;
+    Integer expirationSeconds;
+
+    clientIdUrn = icebergWarehouse.getClientId();
+    clientSecretUrn = icebergWarehouse.getClientSecret();
+    role = icebergWarehouse.getRole();
+    region = icebergWarehouse.getRegion();
+    expirationSeconds = icebergWarehouse.getTempCredentialExpirationSeconds();
+
+    Map<Urn, List<RecordTemplate>> credsMap =
+        entityService.getLatestAspects(
+            operationContext,
+            Set.of(clientIdUrn, clientSecretUrn),
+            Set.of("dataHubSecretValue"),
+            false);
+
+    DataHubSecretValue clientIdValue =
+        new DataHubSecretValue(credsMap.get(clientIdUrn).get(0).data());
+
+    String clientId = secretService.decrypt(clientIdValue.getValue());
+
+    DataHubSecretValue clientSecretValue =
+        new DataHubSecretValue(credsMap.get(clientSecretUrn).get(0).data());
+    String clientSecret = secretService.decrypt(clientSecretValue.getValue());
+
+    return new CredentialProvider.StorageProviderCredentials(
+        clientId, clientSecret, role, region, expirationSeconds);
+  }
+
+  public String getDataRoot() {
+    return icebergWarehouse.getDataRoot();
+  }
+
+  public Optional<DatasetUrn> getDatasetUrn(TableIdentifier tableIdentifier) {
+    Urn resourceUrn = resourceUrn(tableIdentifier);
+    PlatformResourceInfo platformResourceInfo =
+        (PlatformResourceInfo)
+            entityService.getLatestAspect(
+                operationContext, resourceUrn, PLATFORM_RESOURCE_INFO_ASPECT_NAME);
+    if (platformResourceInfo == null) {
+      return Optional.empty();
+    }
+    try {
+      return Optional.of(DatasetUrn.createFromString(platformResourceInfo.getPrimaryKey()));
+    } catch (URISyntaxException e) {
+      throw new RuntimeException("Invalid dataset urn " + platformResourceInfo.getPrimaryKey(), e);
+    }
+  }
+
+  public IcebergCatalogInfo getIcebergMetadata(TableIdentifier tableIdentifier) {
+    Optional<DatasetUrn> datasetUrn = getDatasetUrn(tableIdentifier);
+    if (datasetUrn.isEmpty()) {
+      return null;
+    }
+
+    IcebergCatalogInfo icebergMeta =
+        (IcebergCatalogInfo)
+            entityService.getLatestAspect(
+                operationContext, datasetUrn.get(), DATASET_ICEBERG_METADATA_ASPECT_NAME);
+
+    if (icebergMeta == null) {
+      throw new IllegalStateException(
+          String.format(
+              "IcebergMetadata not found for resource %s, dataset %s",
+              resourceUrn(tableIdentifier), datasetUrn.get()));
+    }
+    return icebergMeta;
+  }
+
+  public Pair<EnvelopedAspect, DatasetUrn> getIcebergMetadataEnveloped(
+      TableIdentifier tableIdentifier) {
+    Optional<DatasetUrn> datasetUrn = getDatasetUrn(tableIdentifier);
+    if (datasetUrn.isEmpty()) {
+      return null;
+    }
+
+    try {
+      EnvelopedAspect existingEnveloped =
+          entityService.getLatestEnvelopedAspect(
+              operationContext,
+              DATASET_ENTITY_NAME,
+              datasetUrn.get(),
+              DATASET_ICEBERG_METADATA_ASPECT_NAME);
+      if (existingEnveloped == null) {
+        throw new IllegalStateException(
+            String.format(
+                "IcebergMetadata not found for resource %s, dataset %s",
+                resourceUrn(tableIdentifier), datasetUrn.get()));
+      }
+      return Pair.of(existingEnveloped, datasetUrn.get());
+    } catch (Exception e) {
+      throw new RuntimeException(
+          "Error fetching IcebergMetadata aspect for dataset " + datasetUrn.get(), e);
+    }
+  }
+
+  public boolean deleteDataset(TableIdentifier tableIdentifier) {
+    Urn resourceUrn = resourceUrn(tableIdentifier);
+
+    // guard against concurrent modifications that depend on the resource (rename table/view)
+    Lock lock = resourceLocks.get(resourceUrn);
+    lock.lock();
+    try {
+      if (!entityService.exists(operationContext, resourceUrn)) {
+        return false;
+      }
+      Optional<DatasetUrn> urn = getDatasetUrn(tableIdentifier);
+      entityService.deleteUrn(operationContext, resourceUrn);
+      urn.ifPresent(x -> entityService.deleteUrn(operationContext, x));
+      return true;
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  public DatasetUrn createDataset(
+      TableIdentifier tableIdentifier, boolean view, AuditStamp auditStamp) {
+    String datasetName = platformInstance + "." + UUID.randomUUID();
+    DatasetUrn datasetUrn = new DatasetUrn(platformUrn(), datasetName, fabricType());
+    createResource(datasetUrn, tableIdentifier, view, auditStamp);
+    return datasetUrn;
+  }
+
+  public DatasetUrn renameDataset(
+      TableIdentifier fromTableId, TableIdentifier toTableId, boolean view, AuditStamp auditStamp) {
+
+    // guard against concurrent modifications to the resource (other renames, deletion)
+    Lock lock = resourceLocks.get(resourceUrn(fromTableId));
+    lock.lock();
+
+    try {
+      Optional<DatasetUrn> optDatasetUrn = getDatasetUrn(fromTableId);
+      if (optDatasetUrn.isEmpty()) {
+        if (view) {
+          throw new NoSuchViewException(
+              "No such view %s", fullTableName(platformInstance, fromTableId));
+        } else {
+          throw new NoSuchTableException(
+              "No such table %s", fullTableName(platformInstance, fromTableId));
+        }
+      }
+
+      DatasetUrn datasetUrn = optDatasetUrn.get();
+      try {
+        createResource(datasetUrn, toTableId, view, auditStamp);
+      } catch (ValidationException e) {
+        throw new AlreadyExistsException(
+            "%s already exists: %s",
+            view ? "View" : "Table", fullTableName(platformInstance, toTableId));
+      }
+      entityService.deleteUrn(operationContext, resourceUrn(fromTableId));
+      return datasetUrn;
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  private void createResource(
+      DatasetUrn datasetUrn, TableIdentifier tableIdentifier, boolean view, AuditStamp auditStamp) {
+    PlatformResourceInfo resourceInfo =
+        new PlatformResourceInfo().setPrimaryKey(datasetUrn.toString());
+    resourceInfo.setResourceType(view ? "icebergView" : "icebergTable");
+
+    MetadataChangeProposal mcp = new MetadataChangeProposal();
+    mcp.setEntityUrn(resourceUrn(tableIdentifier));
+    mcp.setEntityType(PLATFORM_RESOURCE_ENTITY_NAME);
+    mcp.setAspectName(PLATFORM_RESOURCE_INFO_ASPECT_NAME);
+    mcp.setChangeType(ChangeType.CREATE_ENTITY);
+    mcp.setAspect(serializeAspect(resourceInfo));
+
+    entityService.ingestProposal(operationContext, mcp, auditStamp, false);
+  }
+
+  private FabricType fabricType() {
+    return icebergWarehouse.getEnv();
+  }
+
+  @SneakyThrows
+  private Urn resourceUrn(TableIdentifier tableIdentifier) {
+    return Urn.createFromString(
+        String.format(
+            "urn:li:platformResource:%s.%s",
+            PLATFORM_NAME, CatalogUtil.fullTableName(platformInstance, tableIdentifier)));
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataHubRestCatalog.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataHubRestCatalog.java
new file mode 100644
index 00000000000000..cbe58bf70546b5
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataHubRestCatalog.java
@@ -0,0 +1,487 @@
+package io.datahubproject.iceberg.catalog;
+
+import static com.linkedin.metadata.Constants.*;
+import static com.linkedin.metadata.utils.GenericRecordUtils.serializeAspect;
+import static io.datahubproject.iceberg.catalog.Utils.*;
+
+import com.google.common.base.Joiner;
+import com.linkedin.common.AuditStamp;
+import com.linkedin.common.SubTypes;
+import com.linkedin.common.urn.DatasetUrn;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.container.Container;
+import com.linkedin.container.ContainerProperties;
+import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.data.template.StringArray;
+import com.linkedin.data.template.StringMap;
+import com.linkedin.dataset.DatasetProperties;
+import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.metadata.authorization.PoliciesConfig;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.query.filter.Condition;
+import com.linkedin.metadata.query.filter.Criterion;
+import com.linkedin.metadata.query.filter.Filter;
+import com.linkedin.metadata.search.EntitySearchService;
+import com.linkedin.metadata.search.SearchEntity;
+import com.linkedin.metadata.search.SearchEntityArray;
+import com.linkedin.metadata.search.SearchResult;
+import com.linkedin.metadata.search.utils.QueryUtils;
+import com.linkedin.metadata.utils.CriterionUtils;
+import com.linkedin.mxe.MetadataChangeProposal;
+import io.datahubproject.iceberg.catalog.credentials.CredentialProvider;
+import io.datahubproject.iceberg.catalog.credentials.S3CredentialProvider;
+import io.datahubproject.metadata.context.OperationContext;
+import java.io.IOException;
+import java.util.*;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import org.apache.iceberg.*;
+import org.apache.iceberg.aws.s3.S3FileIO;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.SupportsNamespaces;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.exceptions.AlreadyExistsException;
+import org.apache.iceberg.exceptions.NamespaceNotEmptyException;
+import org.apache.iceberg.exceptions.NoSuchNamespaceException;
+import org.apache.iceberg.io.CloseableGroup;
+import org.apache.iceberg.io.FileIO;
+import org.apache.iceberg.io.InputFile;
+import org.apache.iceberg.rest.requests.UpdateNamespacePropertiesRequest;
+import org.apache.iceberg.rest.responses.UpdateNamespacePropertiesResponse;
+import org.apache.iceberg.view.BaseMetastoreViewCatalog;
+import org.apache.iceberg.view.ViewOperations;
+
+public class DataHubRestCatalog extends BaseMetastoreViewCatalog implements SupportsNamespaces {
+  private final CredentialProvider credentialProvider;
+
+  static final int PAGE_SIZE = 100;
+
+  // Upper bound for results on list namespaces/tables/views. Must use pagination for anything more
+  // than that.
+  static final int MAX_LIST_SIZE = 1000;
+
+  private final EntityService entityService;
+
+  private final EntitySearchService searchService;
+
+  private final OperationContext operationContext;
+
+  private final CloseableGroup closeableGroup;
+
+  private final DataHubIcebergWarehouse warehouse;
+
+  private final String warehouseRoot;
+
+  private static final String CONTAINER_SUB_TYPE = "Namespace";
+
+  public DataHubRestCatalog(
+      EntityService entityService,
+      EntitySearchService searchService,
+      OperationContext operationContext,
+      DataHubIcebergWarehouse warehouse,
+      CredentialProvider credentialProvider) {
+    this.entityService = entityService;
+    this.searchService = searchService;
+    this.operationContext = operationContext;
+    this.credentialProvider = credentialProvider;
+    this.warehouse = warehouse;
+
+    if (warehouse.getDataRoot().endsWith("/")) {
+      this.warehouseRoot = warehouse.getDataRoot();
+    } else {
+      this.warehouseRoot = warehouse.getDataRoot() + "/";
+    }
+
+    this.closeableGroup = new CloseableGroup();
+    this.closeableGroup.setSuppressCloseFailure(true);
+  }
+
+  @Override
+  public void renameView(TableIdentifier fromTableId, TableIdentifier toTableId) {
+    renameTableOrView(fromTableId, toTableId, true);
+  }
+
+  @Override
+  public void initialize(String name, Map<String, String> properties) {}
+
+  @Override
+  protected TableOperations newTableOps(TableIdentifier tableIdentifier) {
+    return new DataHubTableOps(
+        warehouse, tableIdentifier, entityService, operationContext, new S3FileIOFactory());
+  }
+
+  @Override
+  protected String defaultWarehouseLocation(TableIdentifier tableIdentifier) {
+    return warehouseRoot + tableIdentifier.toString().replaceAll("\\.", "/");
+  }
+
+  @Override
+  public List<TableIdentifier> listTables(Namespace namespace) {
+    return listTablesOrViews(namespace, "Table");
+  }
+
+  @Override
+  public boolean dropTable(TableIdentifier tableIdentifier, boolean purge) {
+    if (purge) {
+      throw new UnsupportedOperationException();
+    }
+
+    return warehouse.deleteDataset(tableIdentifier);
+  }
+
+  @Override
+  public Table registerTable(TableIdentifier identifier, String metadataFileLocation) {
+    if (tableExists(identifier)) {
+      throw new AlreadyExistsException("Table already exists: %s", identifier);
+    }
+
+    FileIO io =
+        new S3FileIOFactory()
+            .createIO(
+                platformInstance(),
+                PoliciesConfig.DATA_READ_ONLY_PRIVILEGE,
+                Set.of(parentDir(metadataFileLocation)));
+    InputFile metadataFile = io.newInputFile(metadataFileLocation);
+    TableMetadata metadata = TableMetadataParser.read(io, metadataFile);
+
+    TableOperations ops = newTableOps(identifier);
+    ops.commit(null, metadata);
+
+    return new BaseTable(ops, fullTableName(name(), identifier), metricsReporter());
+  }
+
+  @Override
+  public void renameTable(TableIdentifier fromTableId, TableIdentifier toTableId) {
+    renameTableOrView(fromTableId, toTableId, false);
+  }
+
+  private void renameTableOrView(
+      TableIdentifier fromTableId, TableIdentifier toTableId, boolean view) {
+    if (!fromTableId.namespace().equals(toTableId.namespace())) {
+      // check target namespace exists
+      if (!entityService.exists(
+          operationContext, containerUrn(platformInstance(), toTableId.namespace()))) {
+        throw new NoSuchNamespaceException("Namespace does not exist: " + toTableId.namespace());
+      }
+    }
+    AuditStamp auditStamp = auditStamp();
+    DatasetUrn datasetUrn = warehouse.renameDataset(fromTableId, toTableId, false, auditStamp);
+    DatasetProperties datasetProperties = new DatasetProperties();
+    datasetProperties.setName(toTableId.name());
+    datasetProperties.setQualifiedName(fullTableName(platformInstance(), toTableId));
+
+    MetadataChangeProposal mcp = new MetadataChangeProposal();
+    mcp.setEntityType(DATASET_ENTITY_NAME);
+    mcp.setAspectName(DATASET_PROPERTIES_ASPECT_NAME);
+    mcp.setEntityUrn(datasetUrn);
+    mcp.setAspect(serializeAspect(datasetProperties));
+    mcp.setChangeType(ChangeType.UPSERT);
+    ingestMcp(mcp, auditStamp);
+
+    if (!fromTableId.namespace().equals(toTableId.namespace())) {
+      Container container = new Container();
+      container.setContainer(containerUrn(platformInstance(), toTableId.namespace()));
+
+      MetadataChangeProposal containerMcp = new MetadataChangeProposal();
+      containerMcp.setEntityType(DATASET_ENTITY_NAME);
+      containerMcp.setAspectName(CONTAINER_ASPECT_NAME);
+      containerMcp.setEntityUrn(datasetUrn);
+      containerMcp.setAspect(serializeAspect(container));
+      containerMcp.setChangeType(ChangeType.UPSERT);
+      StringMap headers =
+          new StringMap(
+              Collections.singletonMap(SYNC_INDEX_UPDATE_HEADER_NAME, Boolean.toString(true)));
+      mcp.setHeaders(headers);
+      containerMcp.setHeaders(headers);
+      ingestMcp(containerMcp, auditStamp);
+    }
+  }
+
+  @Override
+  public void createNamespace(Namespace namespace, Map<String, String> properties) {
+    AuditStamp auditStamp = auditStamp();
+    Urn containerUrn = containerUrn(platformInstance(), namespace);
+
+    int nLevels = namespace.length();
+    if (nLevels > 1) {
+      String[] parentLevels = Arrays.copyOfRange(namespace.levels(), 0, nLevels - 1);
+      Urn parentContainerUrn = containerUrn(platformInstance(), parentLevels);
+      if (!entityService.exists(operationContext, parentContainerUrn)) {
+        throw new NoSuchNamespaceException(
+            "Parent namespace %s does not exist in platformInstance-catalog %s",
+            Joiner.on(".").join(parentLevels), platformInstance());
+      }
+      ingestContainerAspect(
+          containerUrn,
+          CONTAINER_ASPECT_NAME,
+          new Container().setContainer(parentContainerUrn),
+          auditStamp);
+    }
+
+    ingestContainerAspect(
+        containerUrn,
+        SUB_TYPES_ASPECT_NAME,
+        new SubTypes().setTypeNames(new StringArray(CONTAINER_SUB_TYPE)),
+        auditStamp);
+
+    ingestContainerProperties(namespace, properties, auditStamp);
+
+    MetadataChangeProposal platformInstanceMcp =
+        platformInstanceMcp(platformInstance(), containerUrn, CONTAINER_ENTITY_NAME);
+    ingestMcp(platformInstanceMcp, auditStamp);
+  }
+
+  @Override
+  public List<Namespace> listNamespaces(Namespace namespace) throws NoSuchNamespaceException {
+    Filter filter;
+    if (namespace.isEmpty()) {
+      Criterion noParentCriterion = CriterionUtils.buildCriterion("container", Condition.IS_NULL);
+      Criterion subTypeCriterion =
+          CriterionUtils.buildCriterion("typeNames", Condition.EQUAL, CONTAINER_SUB_TYPE);
+      Criterion dataPlatformInstanceCriterion =
+          CriterionUtils.buildCriterion(
+              "platformInstance",
+              Condition.EQUAL,
+              platformInstanceUrn(platformInstance()).toString());
+      filter =
+          QueryUtils.getFilterFromCriteria(
+              List.of(noParentCriterion, subTypeCriterion, dataPlatformInstanceCriterion));
+    } else {
+      filter =
+          QueryUtils.newFilter(
+              "container.keyword", containerUrn(platformInstance(), namespace).toString());
+    }
+
+    SearchResult searchResult = search(filter, CONTAINER_ENTITY_NAME);
+
+    return searchResult.getEntities().stream()
+        .map(
+            x -> {
+              String namespaceName = namespaceNameFromContainerUrn(x.getEntity());
+              return Namespace.of(namespaceName.split("\\."));
+            })
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public Map<String, String> loadNamespaceMetadata(Namespace namespace)
+      throws NoSuchNamespaceException {
+
+    ContainerProperties containerProperties =
+        (ContainerProperties)
+            entityService.getLatestAspect(
+                operationContext,
+                containerUrn(platformInstance(), namespace),
+                CONTAINER_PROPERTIES_ASPECT_NAME);
+
+    if (containerProperties == null) {
+      throw new NoSuchNamespaceException("Namespace does not exist: " + namespace);
+    }
+
+    return new HashMap<>(containerProperties.getCustomProperties());
+  }
+
+  @Override
+  public boolean dropNamespace(Namespace namespace) throws NamespaceNotEmptyException {
+    Urn containerUrn = containerUrn(platformInstance(), namespace);
+    if (!entityService.exists(operationContext, containerUrn)) {
+      return false;
+    }
+
+    Filter filter = QueryUtils.newFilter("container.keyword", containerUrn.toString());
+
+    if (searchIsEmpty(filter, CONTAINER_ENTITY_NAME, DATASET_ENTITY_NAME)) {
+      // TODO handle race conditions
+      entityService.deleteUrn(operationContext, containerUrn);
+      return true;
+    } else {
+      throw new NamespaceNotEmptyException("Namespace %s is not empty", namespace);
+    }
+  }
+
+  @Override
+  public boolean setProperties(Namespace namespace, Map<String, String> map)
+      throws NoSuchNamespaceException {
+    // not required for our purposes currently
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public boolean removeProperties(Namespace namespace, Set<String> set)
+      throws NoSuchNamespaceException {
+    // not required for our purposes currently
+    throw new UnsupportedOperationException();
+  }
+
+  private void ingestContainerProperties(
+      Namespace namespace, Map<String, String> properties, AuditStamp auditStamp) {
+    ingestContainerAspect(
+        containerUrn(platformInstance(), namespace),
+        CONTAINER_PROPERTIES_ASPECT_NAME,
+        new ContainerProperties()
+            .setName(namespace.levels()[namespace.length() - 1])
+            .setCustomProperties(new StringMap(properties)),
+        auditStamp);
+  }
+
+  public UpdateNamespacePropertiesResponse updateNamespaceProperties(
+      Namespace namespace, UpdateNamespacePropertiesRequest request) {
+
+    Map<String, String> properties = loadNamespaceMetadata(namespace);
+
+    Set<String> missing = new HashSet<>();
+    request.removals().stream()
+        .filter(Predicate.not(properties::containsKey))
+        .forEach(missing::add);
+
+    UpdateNamespacePropertiesResponse.Builder responseBuilder =
+        UpdateNamespacePropertiesResponse.builder();
+
+    request.removals().stream()
+        .filter(Predicate.not(missing::contains))
+        .forEach(responseBuilder::addRemoved);
+
+    responseBuilder.addUpdated(request.updates().keySet());
+    responseBuilder.addMissing(missing);
+
+    properties.putAll(request.updates());
+    properties.keySet().removeAll(request.removals());
+
+    ingestContainerProperties(namespace, properties, auditStamp());
+
+    return responseBuilder.build();
+  }
+
+  @Override
+  public void close() throws IOException {
+    super.close();
+    this.closeableGroup.close();
+  }
+
+  private void ingestContainerAspect(
+      Urn containerUrn, String aspectName, RecordTemplate aspect, AuditStamp auditStamp) {
+    MetadataChangeProposal mcp = new MetadataChangeProposal();
+
+    mcp.setEntityUrn(containerUrn);
+    mcp.setEntityType(CONTAINER_ENTITY_NAME);
+    mcp.setAspectName(aspectName);
+    mcp.setAspect(serializeAspect(aspect));
+    mcp.setChangeType(ChangeType.UPSERT);
+
+    StringMap headers =
+        new StringMap(
+            Collections.singletonMap(SYNC_INDEX_UPDATE_HEADER_NAME, Boolean.toString(true)));
+    mcp.setHeaders(headers);
+
+    ingestMcp(mcp, auditStamp);
+  }
+
+  private void ingestMcp(MetadataChangeProposal mcp, AuditStamp auditStamp) {
+    entityService.ingestProposal(operationContext, mcp, auditStamp, false);
+  }
+
+  private List<TableIdentifier> listTablesOrViews(Namespace namespace, String typeName) {
+    Filter filter =
+        QueryUtils.newFilter(
+            Map.of(
+                "container.keyword",
+                containerUrn(platformInstance(), namespace).toString(),
+                "typeNames",
+                typeName));
+
+    SearchResult searchResult = search(filter, DATASET_ENTITY_NAME);
+
+    Set<Urn> urns =
+        searchResult.getEntities().stream()
+            .map(SearchEntity::getEntity)
+            .collect(Collectors.toSet());
+
+    Map<Urn, List<RecordTemplate>> aspects =
+        entityService.getLatestAspects(
+            operationContext, urns, Set.of(DATASET_PROPERTIES_ASPECT_NAME), false);
+
+    return aspects.values().stream()
+        .filter(x -> x != null && !x.isEmpty())
+        .map(x -> (DatasetProperties) x.get(0))
+        .map(DatasetProperties::getQualifiedName)
+        .map(
+            x -> {
+              String[] parts = x.split("\\.");
+              // ignore first part which is the warehouse name
+              return TableIdentifier.of(Arrays.copyOfRange(parts, 1, parts.length));
+            })
+        .toList();
+  }
+
+  private SearchResult search(Filter filter, String entityName) {
+    // Go through pages.
+    SearchEntityArray allEntities = new SearchEntityArray();
+    int startIndex = 0;
+    int totalCount;
+
+    do {
+      SearchResult pageResult =
+          searchService.search(
+              operationContext, List.of(entityName), "*", filter, List.of(), startIndex, PAGE_SIZE);
+      totalCount = pageResult.getNumEntities();
+      if (totalCount > MAX_LIST_SIZE) {
+        totalCount = MAX_LIST_SIZE;
+      }
+      allEntities.addAll(pageResult.getEntities());
+      startIndex += PAGE_SIZE;
+    } while (startIndex < totalCount);
+
+    SearchResult allResults = new SearchResult();
+    allResults.setEntities(allEntities);
+    return allResults;
+  }
+
+  private boolean searchIsEmpty(Filter filter, String... entityNames) {
+    SearchResult searchResult =
+        searchService.search(operationContext, List.of(entityNames), "*", filter, List.of(), 0, 1);
+
+    return searchResult.getEntities().isEmpty();
+  }
+
+  private class S3FileIOFactory implements FileIOFactory {
+    @Override
+    public FileIO createIO(
+        String platformInstance, PoliciesConfig.Privilege privilege, Set<String> locations) {
+
+      FileIO io = new S3FileIO();
+      Map<String, String> creds =
+          credentialProvider.getCredentials(
+              new S3CredentialProvider.CredentialsCacheKey(platformInstance, privilege, locations),
+              warehouse.getStorageProviderCredentials());
+      io.initialize(creds);
+      closeableGroup.addCloseable(io);
+      return io;
+    }
+
+    @Override
+    public FileIO createIO(
+        String platformInstance, PoliciesConfig.Privilege privilege, TableMetadata tableMetadata) {
+      return createIO(platformInstance, privilege, locations(tableMetadata));
+    }
+  }
+
+  @Override
+  protected ViewOperations newViewOps(TableIdentifier tableIdentifier) {
+    return new DataHubViewOps(
+        warehouse, tableIdentifier, entityService, operationContext, new S3FileIOFactory());
+  }
+
+  @Override
+  public List<TableIdentifier> listViews(Namespace namespace) {
+    return listTablesOrViews(namespace, "View");
+  }
+
+  @Override
+  public boolean dropView(TableIdentifier tableIdentifier) {
+    return warehouse.deleteDataset(tableIdentifier);
+  }
+
+  private String platformInstance() {
+    return warehouse.getPlatformInstance();
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataHubTableOps.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataHubTableOps.java
new file mode 100644
index 00000000000000..12101d198b33cd
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataHubTableOps.java
@@ -0,0 +1,54 @@
+package io.datahubproject.iceberg.catalog;
+
+import com.linkedin.metadata.entity.EntityService;
+import io.datahubproject.metadata.context.OperationContext;
+import lombok.SneakyThrows;
+import org.apache.iceberg.BaseMetastoreTableOperations;
+import org.apache.iceberg.TableMetadata;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.io.FileIO;
+
+public class DataHubTableOps extends BaseMetastoreTableOperations {
+
+  private final TableOrViewOpsDelegate<TableMetadata> delegate;
+
+  public DataHubTableOps(
+      DataHubIcebergWarehouse warehouse,
+      TableIdentifier tableIdentifier,
+      EntityService entityService,
+      OperationContext operationContext,
+      FileIOFactory fileIOFactory) {
+    this.delegate =
+        new TableOpsDelegate(
+            warehouse, tableIdentifier, entityService, operationContext, fileIOFactory);
+  }
+
+  @Override
+  public TableMetadata refresh() {
+    return delegate.refresh();
+  }
+
+  @Override
+  public TableMetadata current() {
+    return delegate.current();
+  }
+
+  @SneakyThrows
+  @Override
+  protected void doCommit(TableMetadata base, TableMetadata metadata) {
+    delegate.doCommit(
+        base == null ? null : new MetadataWrapper<>(base),
+        new MetadataWrapper<>(metadata),
+        () -> writeNewMetadataIfRequired(base == null, metadata));
+  }
+
+  @Override
+  protected String tableName() {
+    return delegate.name();
+  }
+
+  @Override
+  public FileIO io() {
+    return delegate.io();
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataHubViewOps.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataHubViewOps.java
new file mode 100644
index 00000000000000..ae292ba7f044fa
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataHubViewOps.java
@@ -0,0 +1,61 @@
+package io.datahubproject.iceberg.catalog;
+
+import com.linkedin.metadata.entity.EntityService;
+import io.datahubproject.metadata.context.OperationContext;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.io.FileIO;
+import org.apache.iceberg.view.BaseViewOperations;
+import org.apache.iceberg.view.ViewMetadata;
+
+@Slf4j
+public class DataHubViewOps extends BaseViewOperations {
+
+  private final TableOrViewOpsDelegate<ViewMetadata> delegate;
+
+  public DataHubViewOps(
+      DataHubIcebergWarehouse warehouse,
+      TableIdentifier tableIdentifier,
+      EntityService entityService,
+      OperationContext operationContext,
+      FileIOFactory fileIOFactory) {
+    this.delegate =
+        new ViewOpsDelegate(
+            warehouse, tableIdentifier, entityService, operationContext, fileIOFactory);
+  }
+
+  @Override
+  public ViewMetadata refresh() {
+    return delegate.refresh();
+  }
+
+  @Override
+  public ViewMetadata current() {
+    return delegate.current();
+  }
+
+  @Override
+  protected void doRefresh() {
+    throw new UnsupportedOperationException();
+  }
+
+  @SneakyThrows
+  @Override
+  protected void doCommit(ViewMetadata base, ViewMetadata metadata) {
+    delegate.doCommit(
+        base == null ? null : new MetadataWrapper<>(base),
+        new MetadataWrapper<>(metadata),
+        () -> writeNewMetadataIfRequired(metadata));
+  }
+
+  @Override
+  protected String viewName() {
+    return delegate.name();
+  }
+
+  @Override
+  public FileIO io() {
+    return delegate.io();
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataOperation.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataOperation.java
new file mode 100644
index 00000000000000..9999cb5761fb16
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/DataOperation.java
@@ -0,0 +1,31 @@
+package io.datahubproject.iceberg.catalog;
+
+import static com.linkedin.metadata.authorization.PoliciesConfig.*;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.linkedin.metadata.authorization.PoliciesConfig;
+import java.util.List;
+
+public enum DataOperation {
+  READ_ONLY(
+      DATA_READ_ONLY_PRIVILEGE,
+      DATA_MANAGE_VIEWS_PRIVILEGE,
+      DATA_READ_WRITE_PRIVILEGE,
+      DATA_MANAGE_TABLES_PRIVILEGE),
+
+  READ_WRITE(DATA_READ_WRITE_PRIVILEGE, DATA_MANAGE_TABLES_PRIVILEGE),
+  MANAGE_VIEWS(DATA_MANAGE_VIEWS_PRIVILEGE, DATA_MANAGE_TABLES_PRIVILEGE),
+  MANAGE_TABLES(DATA_MANAGE_TABLES_PRIVILEGE),
+  MANAGE_NAMESPACES(DATA_MANAGE_NAMESPACES_PRIVILEGE),
+
+  LIST(DATA_LIST_ENTITIES_PRIVILEGE);
+
+  public final List<PoliciesConfig.Privilege> ascendingPrivileges;
+  public final List<PoliciesConfig.Privilege> descendingPrivileges;
+
+  DataOperation(PoliciesConfig.Privilege... ascendingPrivileges) {
+    this.ascendingPrivileges = ImmutableList.copyOf(ascendingPrivileges);
+    this.descendingPrivileges = Lists.reverse(this.ascendingPrivileges);
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/FileIOFactory.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/FileIOFactory.java
new file mode 100644
index 00000000000000..c3b8b28d01eb23
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/FileIOFactory.java
@@ -0,0 +1,14 @@
+package io.datahubproject.iceberg.catalog;
+
+import com.linkedin.metadata.authorization.PoliciesConfig;
+import java.util.Set;
+import org.apache.iceberg.TableMetadata;
+import org.apache.iceberg.io.FileIO;
+
+interface FileIOFactory {
+  FileIO createIO(
+      String platformInstance, PoliciesConfig.Privilege privilege, Set<String> locations);
+
+  FileIO createIO(
+      String platformInstance, PoliciesConfig.Privilege privilege, TableMetadata tableMetadata);
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/TableOrViewOpsDelegate.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/TableOrViewOpsDelegate.java
new file mode 100644
index 00000000000000..9f3ddc01d3fc41
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/TableOrViewOpsDelegate.java
@@ -0,0 +1,478 @@
+package io.datahubproject.iceberg.catalog;
+
+import static com.linkedin.metadata.Constants.*;
+import static com.linkedin.metadata.Constants.VIEW_PROPERTIES_ASPECT_NAME;
+import static com.linkedin.metadata.aspect.validation.ConditionalWriteValidator.HTTP_HEADER_IF_VERSION_MATCH;
+import static com.linkedin.metadata.utils.GenericRecordUtils.serializeAspect;
+import static io.datahubproject.iceberg.catalog.DataHubIcebergWarehouse.DATASET_ICEBERG_METADATA_ASPECT_NAME;
+import static io.datahubproject.iceberg.catalog.Utils.*;
+import static io.datahubproject.iceberg.catalog.Utils.platformInstanceMcp;
+import static org.apache.commons.lang3.StringUtils.capitalize;
+
+import com.linkedin.common.AuditStamp;
+import com.linkedin.common.SubTypes;
+import com.linkedin.common.urn.DatasetUrn;
+import com.linkedin.container.Container;
+import com.linkedin.data.template.StringArray;
+import com.linkedin.data.template.StringMap;
+import com.linkedin.dataset.DatasetProfile;
+import com.linkedin.dataset.DatasetProperties;
+import com.linkedin.dataset.IcebergCatalogInfo;
+import com.linkedin.dataset.ViewProperties;
+import com.linkedin.entity.EnvelopedAspect;
+import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.metadata.authorization.PoliciesConfig;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.mxe.MetadataChangeProposal;
+import com.linkedin.schema.SchemaMetadata;
+import com.linkedin.util.Pair;
+import io.datahubproject.metadata.context.OperationContext;
+import io.datahubproject.schematron.converters.avro.AvroSchemaConverter;
+import java.util.Set;
+import java.util.function.Supplier;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.avro.Schema;
+import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.SnapshotSummary;
+import org.apache.iceberg.TableMetadata;
+import org.apache.iceberg.TableMetadataParser;
+import org.apache.iceberg.avro.AvroSchemaUtil;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.exceptions.*;
+import org.apache.iceberg.io.FileIO;
+import org.apache.iceberg.view.*;
+
+@Slf4j
+abstract class TableOrViewOpsDelegate<M> {
+
+  private final DataHubIcebergWarehouse warehouse;
+  private FileIO io;
+  private final TableIdentifier tableIdentifier;
+  private final EntityService entityService;
+  private final OperationContext operationContext;
+  private final FileIOFactory fileIOFactory;
+  private volatile M currentMetadata = null;
+  private volatile boolean shouldRefresh = true;
+
+  TableOrViewOpsDelegate(
+      DataHubIcebergWarehouse warehouse,
+      TableIdentifier tableIdentifier,
+      EntityService entityService,
+      OperationContext operationContext,
+      FileIOFactory fileIOFactory) {
+    this.warehouse = warehouse;
+    this.tableIdentifier = tableIdentifier;
+    this.entityService = entityService;
+    this.operationContext = operationContext;
+    this.fileIOFactory = fileIOFactory;
+  }
+
+  public M refresh() {
+    IcebergCatalogInfo icebergMeta = warehouse.getIcebergMetadata(tableIdentifier);
+
+    if (icebergMeta == null || !isExpectedType(icebergMeta.isView())) {
+      return null;
+    }
+
+    String location = icebergMeta.getMetadataPointer();
+    if (io == null) {
+      String locationDir = location.substring(0, location.lastIndexOf("/"));
+      io =
+          fileIOFactory.createIO(
+              platformInstance(), PoliciesConfig.DATA_READ_ONLY_PRIVILEGE, Set.of(locationDir));
+    }
+
+    currentMetadata = readMetadata(io, location);
+    shouldRefresh = false;
+    return currentMetadata;
+  }
+
+  M current() {
+    if (shouldRefresh) {
+      return refresh();
+    }
+    return currentMetadata;
+  }
+
+  protected void doCommit(
+      MetadataWrapper<M> base, MetadataWrapper<M> metadata, Supplier<String> metadataWriter) {
+
+    Pair<EnvelopedAspect, DatasetUrn> existingDatasetAspect =
+        warehouse.getIcebergMetadataEnveloped(tableIdentifier);
+
+    boolean creation = base == null;
+
+    if (existingDatasetAspect != null) {
+      if (creation) {
+        throw new AlreadyExistsException("%s already exists: %s", capitalize(type()), name());
+      }
+      IcebergCatalogInfo existingMetadata =
+          new IcebergCatalogInfo(existingDatasetAspect.getFirst().getValue().data());
+      if (!isExpectedType(existingMetadata.isView())) {
+        throw noSuchEntityException();
+      }
+      if (!existingMetadata.getMetadataPointer().equals(base.metadataFileLocation())) {
+        throw new CommitFailedException("Cannot commit to %s %s: stale metadata", type(), name());
+      }
+    }
+
+    if (!creation && existingDatasetAspect == null) {
+      throw new IllegalStateException(
+          "Iceberg metadata aspect not found for "
+              + tableIdentifier
+              + " with base metadata-file "
+              + base.location());
+    }
+
+    DatasetUrn datasetUrn;
+    AuditStamp auditStamp = auditStamp();
+    // attempt to commit
+    io =
+        fileIOFactory.createIO(
+            platformInstance(),
+            PoliciesConfig.DATA_READ_WRITE_PRIVILEGE,
+            Set.of(metadata.location()));
+    String newMetadataLocation = metadataWriter.get();
+
+    if (creation) {
+      try {
+        datasetUrn = warehouse.createDataset(tableIdentifier, isView(), auditStamp);
+      } catch (ValidationException e) {
+        throw new AlreadyExistsException("%s already exists: %s", capitalize(type()), name());
+      }
+    } else {
+      datasetUrn = existingDatasetAspect.getSecond();
+    }
+
+    MetadataChangeProposal icebergMcp = newMcp(DATASET_ICEBERG_METADATA_ASPECT_NAME, datasetUrn);
+    icebergMcp.setAspect(
+        serializeAspect(
+            new IcebergCatalogInfo().setMetadataPointer(newMetadataLocation).setView(isView())));
+
+    if (creation) {
+      icebergMcp.setChangeType(ChangeType.CREATE_ENTITY);
+    } else {
+      String existingVersion = existingDatasetAspect.getFirst().getSystemMetadata().getVersion();
+      StringMap headers = icebergMcp.getHeaders();
+      if (headers == null) {
+        headers = new StringMap();
+        icebergMcp.setHeaders(headers);
+      }
+      headers.put(HTTP_HEADER_IF_VERSION_MATCH, existingVersion);
+      icebergMcp.setChangeType(
+          ChangeType.UPSERT); // ideally should be UPDATE, but seems not supported yet.
+    }
+    try {
+      ingestMcp(icebergMcp, auditStamp);
+    } catch (ValidationException e) {
+      if (creation) {
+        // this is likely because table/view already exists i.e. created concurrently in a race
+        // condition
+        throw new AlreadyExistsException("%s already exists: %s", capitalize(type()), name());
+      } else {
+        throw new CommitFailedException(
+            "Cannot commit to %s %s: stale metadata", capitalize(type()), name());
+      }
+    }
+
+    if (base == null || (base.currentSchemaId() != metadata.currentSchemaId())) {
+      // schema changed
+      Schema avroSchema = AvroSchemaUtil.convert(metadata.schema(), name());
+      AvroSchemaConverter converter = AvroSchemaConverter.builder().build();
+      SchemaMetadata schemaMetadata =
+          converter.toDataHubSchema(avroSchema, false, false, platformUrn(), null);
+      MetadataChangeProposal schemaMcp = newMcp(SCHEMA_METADATA_ASPECT_NAME, datasetUrn);
+      schemaMcp.setAspect(serializeAspect(schemaMetadata));
+      schemaMcp.setChangeType(ChangeType.UPSERT);
+      ingestMcp(schemaMcp, auditStamp);
+    }
+
+    if (creation) {
+      DatasetProperties datasetProperties = new DatasetProperties();
+      datasetProperties.setName(tableIdentifier.name());
+      datasetProperties.setQualifiedName(name());
+
+      MetadataChangeProposal datasetPropertiesMcp =
+          newMcp(DATASET_PROPERTIES_ASPECT_NAME, datasetUrn, true);
+      datasetPropertiesMcp.setAspect(serializeAspect(datasetProperties));
+      datasetPropertiesMcp.setChangeType(ChangeType.UPSERT);
+
+      ingestMcp(datasetPropertiesMcp, auditStamp);
+
+      MetadataChangeProposal platformInstanceMcp =
+          platformInstanceMcp(platformInstance(), datasetUrn, DATASET_ENTITY_NAME);
+      ingestMcp(platformInstanceMcp, auditStamp);
+
+      Container container = new Container();
+      container.setContainer(containerUrn(platformInstance(), tableIdentifier.namespace()));
+
+      MetadataChangeProposal containerMcp = newMcp(CONTAINER_ASPECT_NAME, datasetUrn, true);
+      containerMcp.setAspect(serializeAspect(container));
+      containerMcp.setChangeType(ChangeType.UPSERT);
+      ingestMcp(containerMcp, auditStamp);
+
+      SubTypes subTypes = new SubTypes().setTypeNames(new StringArray(capitalize(type())));
+      MetadataChangeProposal subTypesMcp = newMcp(SUB_TYPES_ASPECT_NAME, datasetUrn, true);
+      subTypesMcp.setAspect(serializeAspect(subTypes));
+      subTypesMcp.setChangeType(ChangeType.UPSERT);
+      ingestMcp(subTypesMcp, auditStamp);
+    }
+
+    sendProfileUpdate(metadata, auditStamp, datasetUrn);
+    onCommit(metadata.metadata(), auditStamp, datasetUrn);
+  }
+
+  protected abstract DatasetProfile getDataSetProfile(M metadata);
+
+  private void sendProfileUpdate(
+      MetadataWrapper<M> metadata, AuditStamp auditStamp, DatasetUrn datasetUrn) {
+
+    DatasetProfile dataSetProfile = getDataSetProfile(metadata.metadata());
+    if (dataSetProfile != null) {
+      dataSetProfile.setTimestampMillis(auditStamp.getTime());
+
+      MetadataChangeProposal dataSetProfileMcp = newMcp(DATASET_PROFILE_ASPECT_NAME, datasetUrn);
+      dataSetProfileMcp.setAspect(serializeAspect(dataSetProfile));
+      dataSetProfileMcp.setChangeType(ChangeType.UPSERT);
+      ingestMcp(dataSetProfileMcp, auditStamp);
+    }
+  }
+
+  FileIO io() {
+    return io;
+  }
+
+  String name() {
+    return fullTableName(platformInstance(), tableIdentifier);
+  }
+
+  private String platformInstance() {
+    return warehouse.getPlatformInstance();
+  }
+
+  protected MetadataChangeProposal newMcp(String aspectName, DatasetUrn datasetUrn) {
+    return newMcp(aspectName, datasetUrn, false); // Default to async index update
+  }
+
+  protected MetadataChangeProposal newMcp(
+      String aspectName, DatasetUrn datasetUrn, boolean syncIndexUpdate) {
+    MetadataChangeProposal mcp = new MetadataChangeProposal();
+    mcp.setEntityUrn(datasetUrn);
+    mcp.setEntityType(DATASET_ENTITY_NAME);
+    mcp.setAspectName(aspectName);
+
+    if (syncIndexUpdate) {
+      StringMap headers = new StringMap();
+      headers.put(SYNC_INDEX_UPDATE_HEADER_NAME, Boolean.toString(true));
+      mcp.setHeaders(headers);
+    }
+
+    return mcp;
+  }
+
+  protected void ingestMcp(MetadataChangeProposal mcp, AuditStamp auditStamp) {
+    entityService.ingestProposal(operationContext, mcp, auditStamp, false);
+  }
+
+  abstract boolean isView();
+
+  abstract boolean isExpectedType(boolean view);
+
+  abstract M readMetadata(FileIO io, String location);
+
+  abstract String type();
+
+  abstract RuntimeException noSuchEntityException();
+
+  void onCommit(M metadata, AuditStamp auditStamp, DatasetUrn datasetUrn) {}
+}
+
+@Slf4j
+class ViewOpsDelegate extends TableOrViewOpsDelegate<ViewMetadata> {
+
+  ViewOpsDelegate(
+      DataHubIcebergWarehouse warehouse,
+      TableIdentifier tableIdentifier,
+      EntityService entityService,
+      OperationContext operationContext,
+      FileIOFactory fileIOFactory) {
+    super(warehouse, tableIdentifier, entityService, operationContext, fileIOFactory);
+  }
+
+  @Override
+  boolean isView() {
+    return true;
+  }
+
+  @Override
+  boolean isExpectedType(boolean view) {
+    return view;
+  }
+
+  @Override
+  ViewMetadata readMetadata(FileIO io, String location) {
+    return ViewMetadataParser.read(io.newInputFile(location));
+  }
+
+  @Override
+  String type() {
+    return "view";
+  }
+
+  @Override
+  RuntimeException noSuchEntityException() {
+    return new NoSuchViewException("No such view %s", name());
+  }
+
+  @Override
+  void onCommit(ViewMetadata metadata, AuditStamp auditStamp, DatasetUrn datasetUrn) {
+    SQLViewRepresentation sqlViewRepresentation = null;
+    for (ViewRepresentation representation : metadata.currentVersion().representations()) {
+      if (representation instanceof SQLViewRepresentation) {
+        sqlViewRepresentation = (SQLViewRepresentation) representation;
+        // use only first representation, as DataHub model currently supports one SQL.
+        break;
+      }
+    }
+    if (sqlViewRepresentation == null) {
+      // base class is ensuring that a representation has been specified in case of replace-view.
+      // so, this shouldn't occur.
+      log.warn("No SQL representation for view {}", name());
+    } else {
+      ViewProperties viewProperties =
+          new ViewProperties()
+              .setViewLogic(sqlViewRepresentation.sql())
+              .setMaterialized(false)
+              .setViewLanguage(sqlViewRepresentation.dialect());
+      MetadataChangeProposal viewPropertiesMcp = newMcp(VIEW_PROPERTIES_ASPECT_NAME, datasetUrn);
+      viewPropertiesMcp.setAspect(serializeAspect(viewProperties));
+      viewPropertiesMcp.setChangeType(ChangeType.UPSERT);
+
+      ingestMcp(viewPropertiesMcp, auditStamp);
+    }
+  }
+
+  @Override
+  protected DatasetProfile getDataSetProfile(ViewMetadata metadata) {
+    long columnCount = metadata.schema().columns().size();
+    DatasetProfile datasetProfile = new DatasetProfile();
+    datasetProfile.setColumnCount(columnCount);
+    return datasetProfile;
+  }
+}
+
+class TableOpsDelegate extends TableOrViewOpsDelegate<TableMetadata> {
+
+  TableOpsDelegate(
+      DataHubIcebergWarehouse warehouse,
+      TableIdentifier tableIdentifier,
+      EntityService entityService,
+      OperationContext operationContext,
+      FileIOFactory fileIOFactory) {
+    super(warehouse, tableIdentifier, entityService, operationContext, fileIOFactory);
+  }
+
+  @Override
+  protected DatasetProfile getDataSetProfile(TableMetadata metadata) {
+    Snapshot currentSnapshot = metadata.currentSnapshot();
+    if (currentSnapshot == null) {
+      return null;
+    }
+
+    DatasetProfile dataSetProfile = new DatasetProfile();
+    if (currentSnapshot.summary() != null) {
+      String totalRecordsStr = currentSnapshot.summary().get(SnapshotSummary.TOTAL_RECORDS_PROP);
+      if (totalRecordsStr != null) {
+        dataSetProfile.setRowCount(Long.parseLong(totalRecordsStr));
+      }
+    }
+
+    long colCount = metadata.schema().columns().size();
+    dataSetProfile.setColumnCount(colCount);
+
+    return dataSetProfile;
+  }
+
+  @Override
+  boolean isView() {
+    return false;
+  }
+
+  @Override
+  boolean isExpectedType(boolean view) {
+    return !view;
+  }
+
+  @Override
+  TableMetadata readMetadata(FileIO io, String location) {
+    return TableMetadataParser.read(io, location);
+  }
+
+  @Override
+  String type() {
+    return "table";
+  }
+
+  @Override
+  RuntimeException noSuchEntityException() {
+    return new NoSuchTableException("No such table %s", name());
+  }
+}
+
+class MetadataWrapper<M> {
+  final TableMetadata tableMetadata;
+  final ViewMetadata viewMetadata;
+  final boolean view;
+
+  MetadataWrapper(TableMetadata metadata) {
+    this.tableMetadata = metadata;
+    viewMetadata = null;
+    view = false;
+  }
+
+  MetadataWrapper(ViewMetadata metadata) {
+    this.viewMetadata = metadata;
+    tableMetadata = null;
+    view = true;
+  }
+
+  int currentSchemaId() {
+    if (view) {
+      return viewMetadata.currentSchemaId();
+    } else {
+      return tableMetadata.currentSchemaId();
+    }
+  }
+
+  org.apache.iceberg.Schema schema() {
+    if (view) {
+      return viewMetadata.schema();
+    } else {
+      return tableMetadata.schema();
+    }
+  }
+
+  String location() {
+    if (view) {
+      return viewMetadata.location();
+    } else {
+      return tableMetadata.location();
+    }
+  }
+
+  String metadataFileLocation() {
+    if (view) {
+      return viewMetadata.metadataFileLocation();
+    } else {
+      return tableMetadata.metadataFileLocation();
+    }
+  }
+
+  M metadata() {
+    if (view) {
+      return (M) viewMetadata;
+    } else {
+      return (M) tableMetadata;
+    }
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/Utils.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/Utils.java
new file mode 100644
index 00000000000000..767f30acdef25a
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/Utils.java
@@ -0,0 +1,110 @@
+package io.datahubproject.iceberg.catalog;
+
+import static com.linkedin.metadata.Constants.*;
+import static com.linkedin.metadata.utils.GenericRecordUtils.serializeAspect;
+
+import com.linkedin.common.AuditStamp;
+import com.linkedin.common.DataPlatformInstance;
+import com.linkedin.common.urn.DataPlatformUrn;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.metadata.Constants;
+import com.linkedin.metadata.key.DataPlatformInstanceKey;
+import com.linkedin.metadata.utils.EntityKeyUtils;
+import com.linkedin.mxe.MetadataChangeProposal;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.util.HashSet;
+import java.util.Set;
+import lombok.SneakyThrows;
+import org.apache.iceberg.CatalogUtil;
+import org.apache.iceberg.TableMetadata;
+import org.apache.iceberg.TableProperties;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.rest.RESTUtil;
+
+public class Utils {
+  public static final String PLATFORM_NAME = "iceberg";
+
+  private static final String NAMESPACE_CONTAINER_PREFIX = "urn:li:container:iceberg__";
+
+  @SneakyThrows
+  public static AuditStamp auditStamp() {
+    return new AuditStamp()
+        .setActor(Urn.createFromString(Constants.SYSTEM_ACTOR))
+        .setTime(System.currentTimeMillis());
+  }
+
+  public static MetadataChangeProposal platformInstanceMcp(
+      String platformInstanceName, Urn urn, String entityType) {
+    DataPlatformInstance platformInstance = new DataPlatformInstance();
+    platformInstance.setPlatform(platformUrn());
+    platformInstance.setInstance(platformInstanceUrn(platformInstanceName));
+
+    MetadataChangeProposal mcp = new MetadataChangeProposal();
+    mcp.setEntityUrn(urn);
+    mcp.setEntityType(entityType);
+    mcp.setAspectName(DATA_PLATFORM_INSTANCE_ASPECT_NAME);
+    mcp.setAspect(serializeAspect(platformInstance));
+    mcp.setChangeType(ChangeType.UPSERT);
+
+    return mcp;
+  }
+
+  public static DataPlatformUrn platformUrn() {
+    return new DataPlatformUrn(PLATFORM_NAME);
+  }
+
+  public static Urn platformInstanceUrn(String platformInstance) {
+    DataPlatformInstanceKey platformInstanceKey =
+        new DataPlatformInstanceKey().setInstance(platformInstance).setPlatform(platformUrn());
+    return EntityKeyUtils.convertEntityKeyToUrn(
+        platformInstanceKey, DATA_PLATFORM_INSTANCE_ENTITY_NAME);
+  }
+
+  public static Urn containerUrn(String platformInstance, Namespace ns) {
+    return containerUrn(platformInstance, ns.levels());
+  }
+
+  @SneakyThrows
+  public static Urn containerUrn(String platformInstance, String[] levels) {
+    StringBuilder containerFullName = new StringBuilder(platformInstance);
+    for (String level : levels) {
+      containerFullName.append(".").append(level);
+    }
+    return Urn.createFromString(NAMESPACE_CONTAINER_PREFIX + containerFullName);
+  }
+
+  public static String fullTableName(String platformInstance, TableIdentifier tableIdentifier) {
+    return CatalogUtil.fullTableName(platformInstance, tableIdentifier);
+  }
+
+  public static Set<String> locations(TableMetadata tableMetadata) {
+    Set<String> locations = new HashSet<>();
+    locations.add(tableMetadata.location());
+    if (tableMetadata.properties().containsKey(TableProperties.WRITE_DATA_LOCATION)) {
+      locations.add(tableMetadata.properties().get(TableProperties.WRITE_DATA_LOCATION));
+    }
+    if (tableMetadata.properties().containsKey(TableProperties.WRITE_METADATA_LOCATION)) {
+      locations.add(tableMetadata.properties().get(TableProperties.WRITE_METADATA_LOCATION));
+    }
+    return locations;
+  }
+
+  public static Namespace namespaceFromString(String namespace) {
+    return RESTUtil.decodeNamespace(URLEncoder.encode(namespace, Charset.defaultCharset()));
+  }
+
+  public static TableIdentifier tableIdFromString(String namespace, String table) {
+    return TableIdentifier.of(namespaceFromString(namespace), RESTUtil.decodeString(table));
+  }
+
+  public static String parentDir(String fileLocation) {
+    return fileLocation.substring(0, fileLocation.lastIndexOf("/"));
+  }
+
+  public static String namespaceNameFromContainerUrn(Urn urn) {
+    return urn.toString().substring(NAMESPACE_CONTAINER_PREFIX.length());
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/credentials/CachingCredentialProvider.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/credentials/CachingCredentialProvider.java
new file mode 100644
index 00000000000000..7aa57df101d669
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/credentials/CachingCredentialProvider.java
@@ -0,0 +1,32 @@
+package io.datahubproject.iceberg.catalog.credentials;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+public class CachingCredentialProvider implements CredentialProvider {
+  // this should be lesser than the actual token/cred expiration
+  private static final int EXPIRATION_MINUTES = 5;
+
+  private final Cache<CredentialsCacheKey, Map<String, String>> credentialCache;
+
+  private final CredentialProvider credentialProvider;
+
+  public CachingCredentialProvider(CredentialProvider credentialProvider) {
+    this.credentialProvider = credentialProvider;
+    this.credentialCache =
+        CacheBuilder.newBuilder().expireAfterWrite(EXPIRATION_MINUTES, TimeUnit.MINUTES).build();
+  }
+
+  public Map<String, String> getCredentials(
+      CredentialsCacheKey key, StorageProviderCredentials storageProviderCredentials) {
+    try {
+      return credentialCache.get(
+          key, () -> credentialProvider.getCredentials(key, storageProviderCredentials));
+    } catch (ExecutionException e) {
+      throw new RuntimeException("Error during cache lookup for credentials", e);
+    }
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/credentials/CredentialProvider.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/credentials/CredentialProvider.java
new file mode 100644
index 00000000000000..3a0992c25a1ff1
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/credentials/CredentialProvider.java
@@ -0,0 +1,30 @@
+package io.datahubproject.iceberg.catalog.credentials;
+
+import com.linkedin.metadata.authorization.PoliciesConfig;
+import java.util.Map;
+import java.util.Set;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+
+public interface CredentialProvider {
+
+  @EqualsAndHashCode
+  @AllArgsConstructor
+  class CredentialsCacheKey {
+    public final String platformInstance;
+    public final PoliciesConfig.Privilege privilege;
+    public final Set<String> locations;
+  }
+
+  @AllArgsConstructor
+  class StorageProviderCredentials {
+    public final String clientId;
+    public final String clientSecret;
+    public final String role;
+    public final String region;
+    public final Integer tempCredentialExpirationSeconds;
+  }
+
+  Map<String, String> getCredentials(
+      CredentialsCacheKey key, StorageProviderCredentials storageProviderCredentials);
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/credentials/S3CredentialProvider.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/credentials/S3CredentialProvider.java
new file mode 100644
index 00000000000000..66d2166e48ae90
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/credentials/S3CredentialProvider.java
@@ -0,0 +1,148 @@
+package io.datahubproject.iceberg.catalog.credentials;
+
+import static com.linkedin.metadata.authorization.PoliciesConfig.*;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import lombok.EqualsAndHashCode;
+import org.apache.iceberg.exceptions.BadRequestException;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.policybuilder.iam.IamConditionOperator;
+import software.amazon.awssdk.policybuilder.iam.IamEffect;
+import software.amazon.awssdk.policybuilder.iam.IamPolicy;
+import software.amazon.awssdk.policybuilder.iam.IamStatement;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.sts.StsClient;
+import software.amazon.awssdk.services.sts.model.AssumeRoleRequest;
+import software.amazon.awssdk.services.sts.model.AssumeRoleResponse;
+
+public class S3CredentialProvider implements CredentialProvider {
+  private static final int DEFAULT_CREDS_DURATION_SECS = 60 * 60;
+
+  public Map<String, String> getCredentials(
+      CredentialsCacheKey key, StorageProviderCredentials storageProviderCredentials) {
+
+    int expiration =
+        storageProviderCredentials.tempCredentialExpirationSeconds == null
+            ? DEFAULT_CREDS_DURATION_SECS
+            : storageProviderCredentials.tempCredentialExpirationSeconds;
+    try (StsClient stsClient = stsClient(storageProviderCredentials)) {
+      String sessionPolicy = policyString(key);
+      AssumeRoleResponse response =
+          stsClient.assumeRole(
+              AssumeRoleRequest.builder()
+                  .roleArn(storageProviderCredentials.role)
+                  .roleSessionName("DataHubIcebergSession")
+                  .durationSeconds(expiration)
+                  .policy(sessionPolicy)
+                  .build());
+
+      return Map.of(
+          "client.region",
+          storageProviderCredentials.region,
+          "s3.access-key-id",
+          response.credentials().accessKeyId(),
+          "s3.secret-access-key",
+          response.credentials().secretAccessKey(),
+          "s3.session-token",
+          response.credentials().sessionToken());
+    }
+  }
+
+  private StsClient stsClient(StorageProviderCredentials storageProviderCredentials) {
+    AwsBasicCredentials credentials =
+        AwsBasicCredentials.create(
+            storageProviderCredentials.clientId, storageProviderCredentials.clientSecret);
+    return StsClient.builder()
+        .region(Region.of(storageProviderCredentials.region))
+        .credentialsProvider(StaticCredentialsProvider.create(credentials))
+        .region(Region.of(storageProviderCredentials.region))
+        .build();
+  }
+
+  private String policyString(CredentialsCacheKey key) {
+    if (key.locations == null || key.locations.isEmpty()) {
+      throw new BadRequestException("Unspecified locations for credential vending.");
+    }
+    if (!Set.of(DATA_READ_WRITE_PRIVILEGE, DATA_READ_ONLY_PRIVILEGE).contains(key.privilege)) {
+      throw new IllegalStateException("Unsupported credential vending privilege " + key.privilege);
+    }
+
+    Map<String, IamStatement.Builder> bucketListPolicy = new HashMap<>();
+    IamStatement.Builder objectsPolicy =
+        IamStatement.builder()
+            .effect(IamEffect.ALLOW)
+            .addAction("s3:GetObject")
+            .addAction("s3:GetObjectVersion");
+
+    if (DATA_READ_WRITE_PRIVILEGE.equals(key.privilege)) {
+      objectsPolicy.addAction("s3:PutObject").addAction("s3:DeleteObject");
+    }
+
+    key.locations.forEach(
+        location -> {
+          S3Location s3Location = new S3Location(location);
+          objectsPolicy.addResource(s3Location.objectsArn());
+          bucketListPolicy
+              .computeIfAbsent(
+                  s3Location.bucketArn(),
+                  bucketArn ->
+                      IamStatement.builder()
+                          .effect(IamEffect.ALLOW)
+                          .addAction("s3:ListBucket")
+                          .addResource(bucketArn))
+              .addCondition(
+                  IamConditionOperator.STRING_LIKE, "s3:prefix", s3Location.objectsPathPrefix());
+        });
+
+    IamPolicy.Builder sessionPolicyBuilder = IamPolicy.builder();
+    sessionPolicyBuilder.addStatement(objectsPolicy.build());
+
+    for (Map.Entry<String, IamStatement.Builder> bucketListStatement :
+        bucketListPolicy.entrySet()) {
+      sessionPolicyBuilder.addStatement(bucketListStatement.getValue().build());
+
+      String bucketArn = bucketListStatement.getKey();
+      sessionPolicyBuilder.addStatement(
+          IamStatement.builder()
+              .effect(IamEffect.ALLOW)
+              .addAction("s3:GetBucketLocation")
+              .addResource(bucketArn)
+              .build());
+    }
+    return sessionPolicyBuilder.build().toJson();
+  }
+
+  @EqualsAndHashCode
+  private static class S3Location {
+    private final String bucket;
+    private final String path;
+    private final String s3ArnPrefix;
+
+    S3Location(String location) {
+      URI uri = URI.create(location);
+      this.bucket = uri.getAuthority();
+      String path = uri.getPath();
+      if (path.startsWith("/")) {
+        path = path.substring(1);
+      }
+      this.path = path;
+      this.s3ArnPrefix = "arn:aws:s3:::";
+    }
+
+    String objectsArn() {
+      return bucketArn() + "/" + objectsPathPrefix();
+    }
+
+    String bucketArn() {
+      return s3ArnPrefix + bucket;
+    }
+
+    String objectsPathPrefix() {
+      return path + "/*";
+    }
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/common/IcebergExceptionHandlerAdvice.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/common/IcebergExceptionHandlerAdvice.java
new file mode 100644
index 00000000000000..d34bf45566e690
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/common/IcebergExceptionHandlerAdvice.java
@@ -0,0 +1,74 @@
+package io.datahubproject.iceberg.catalog.rest.common;
+
+import io.datahubproject.iceberg.catalog.rest.open.PublicIcebergApiController;
+import io.datahubproject.iceberg.catalog.rest.secure.AbstractIcebergController;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.iceberg.exceptions.*;
+import org.apache.iceberg.rest.responses.ErrorResponse;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
+
+@ControllerAdvice(
+    basePackageClasses = {AbstractIcebergController.class, PublicIcebergApiController.class})
+@Slf4j
+public class IcebergExceptionHandlerAdvice extends ResponseEntityExceptionHandler {
+
+  @ExceptionHandler(AlreadyExistsException.class)
+  public ResponseEntity<?> handle(AlreadyExistsException e) {
+    return err(e, HttpStatus.CONFLICT);
+  }
+
+  @ExceptionHandler(NoSuchNamespaceException.class)
+  public ResponseEntity<?> handle(NoSuchNamespaceException e) {
+    return err(e, HttpStatus.NOT_FOUND);
+  }
+
+  @ExceptionHandler(NamespaceNotEmptyException.class)
+  public ResponseEntity<?> handle(NamespaceNotEmptyException e) {
+    return err(e, HttpStatus.BAD_REQUEST);
+  }
+
+  @ExceptionHandler(NoSuchTableException.class)
+  public ResponseEntity<?> handle(NoSuchTableException e) {
+    return err(e, HttpStatus.NOT_FOUND);
+  }
+
+  @ExceptionHandler(NoSuchViewException.class)
+  public ResponseEntity<?> handle(NoSuchViewException e) {
+    return err(e, HttpStatus.NOT_FOUND);
+  }
+
+  @ExceptionHandler(NotFoundException.class)
+  public ResponseEntity<?> handle(NotFoundException e) {
+    return err(e, HttpStatus.NOT_FOUND);
+  }
+
+  @ExceptionHandler(ForbiddenException.class)
+  public ResponseEntity<?> handle(ForbiddenException e) {
+    return err(e, HttpStatus.FORBIDDEN);
+  }
+
+  @ExceptionHandler(BadRequestException.class)
+  public ResponseEntity<?> handle(BadRequestException e) {
+    return err(e, HttpStatus.BAD_REQUEST);
+  }
+
+  @ExceptionHandler(Exception.class)
+  public ResponseEntity<?> handle(Exception e) throws Exception {
+    log.error("Server exception", e);
+    throw e;
+  }
+
+  private ResponseEntity<?> err(Exception e, HttpStatus errCode) {
+    ErrorResponse err =
+        ErrorResponse.builder()
+            .responseCode(errCode.value())
+            .withMessage(e.getMessage())
+            .withType(e.getClass().getSimpleName())
+            .build();
+    return new ResponseEntity<>(err, errCode);
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/common/IcebergJsonConverter.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/common/IcebergJsonConverter.java
new file mode 100644
index 00000000000000..4936f09fc42c3e
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/common/IcebergJsonConverter.java
@@ -0,0 +1,83 @@
+package io.datahubproject.iceberg.catalog.rest.common;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.WildcardType;
+import javax.annotation.Nonnull;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+
+public class IcebergJsonConverter extends MappingJackson2HttpMessageConverter {
+  private static final String ICEBERG_PACKAGE_PREFIX = "org.apache.iceberg.";
+
+  public IcebergJsonConverter(ObjectMapper objectMapper) {
+    super(objectMapper);
+  }
+
+  @Override
+  protected boolean supports(@Nonnull Class<?> clazz) {
+    return isClassInPackage(clazz);
+  }
+
+  @Override
+  public boolean canRead(@Nonnull Type type, Class<?> contextClass, MediaType mediaType) {
+    return hasTypeInPackage(type) && super.canRead(type, contextClass, mediaType);
+  }
+
+  @Override
+  public boolean canWrite(@Nonnull Class<?> clazz, MediaType mediaType) {
+    return isClassInPackage(clazz) && super.canWrite(clazz, mediaType);
+  }
+
+  private boolean hasTypeInPackage(Type type) {
+    if (type instanceof Class<?>) {
+      return isClassInPackage((Class<?>) type);
+    }
+
+    if (type instanceof ParameterizedType) {
+      ParameterizedType paramType = (ParameterizedType) type;
+
+      // Check raw type
+      Type rawType = paramType.getRawType();
+      if (rawType instanceof Class<?> && isClassInPackage((Class<?>) rawType)) {
+        return true;
+      }
+
+      // Recursively check type arguments
+      for (Type typeArg : paramType.getActualTypeArguments()) {
+        if (hasTypeInPackage(typeArg)) {
+          return true;
+        }
+      }
+    }
+
+    if (type instanceof WildcardType) {
+      WildcardType wildcardType = (WildcardType) type;
+      // Check upper bounds
+      for (Type bound : wildcardType.getUpperBounds()) {
+        if (hasTypeInPackage(bound)) {
+          return true;
+        }
+      }
+      // Check lower bounds
+      for (Type bound : wildcardType.getLowerBounds()) {
+        if (hasTypeInPackage(bound)) {
+          return true;
+        }
+      }
+    }
+
+    if (type instanceof GenericArrayType) {
+      GenericArrayType arrayType = (GenericArrayType) type;
+      return hasTypeInPackage(arrayType.getGenericComponentType());
+    }
+
+    return false;
+  }
+
+  private static boolean isClassInPackage(@Nonnull Class<?> clazz) {
+    return clazz.getName().startsWith(ICEBERG_PACKAGE_PREFIX);
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/common/IcebergSpringWebConfig.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/common/IcebergSpringWebConfig.java
new file mode 100644
index 00000000000000..79ee41417d878f
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/common/IcebergSpringWebConfig.java
@@ -0,0 +1,22 @@
+package io.datahubproject.iceberg.catalog.rest.common;
+
+import io.datahubproject.iceberg.catalog.credentials.CachingCredentialProvider;
+import io.datahubproject.iceberg.catalog.credentials.CredentialProvider;
+import io.datahubproject.iceberg.catalog.credentials.S3CredentialProvider;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.*;
+
+@Configuration
+public class IcebergSpringWebConfig {
+
+  @Bean
+  public CredentialProvider credentialProvider() {
+    return new S3CredentialProvider();
+  }
+
+  @Bean
+  public CredentialProvider cachingCredentialProvider(CredentialProvider credentialProvider) {
+    return new CachingCredentialProvider(credentialProvider);
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/open/PublicIcebergApiController.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/open/PublicIcebergApiController.java
new file mode 100644
index 00000000000000..fd72abeb777da6
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/open/PublicIcebergApiController.java
@@ -0,0 +1,107 @@
+package io.datahubproject.iceberg.catalog.rest.open;
+
+import static com.linkedin.metadata.Constants.GLOBAL_TAGS_ASPECT_NAME;
+import static io.datahubproject.iceberg.catalog.Utils.*;
+
+import com.google.common.base.Strings;
+import com.linkedin.common.GlobalTags;
+import com.linkedin.common.TagAssociation;
+import com.linkedin.common.urn.DatasetUrn;
+import com.linkedin.common.urn.TagUrn;
+import io.datahubproject.iceberg.catalog.DataHubIcebergWarehouse;
+import io.datahubproject.iceberg.catalog.rest.secure.AbstractIcebergController;
+import java.net.URISyntaxException;
+import java.util.Optional;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.iceberg.exceptions.NoSuchTableException;
+import org.apache.iceberg.exceptions.NotFoundException;
+import org.apache.iceberg.rest.CatalogHandlers;
+import org.apache.iceberg.rest.responses.ConfigResponse;
+import org.apache.iceberg.rest.responses.LoadTableResponse;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping("/public-iceberg")
+public class PublicIcebergApiController extends AbstractIcebergController {
+
+  @Value("${icebergCatalog.enablePublicRead}")
+  private boolean isPublicReadEnabled;
+
+  @Value("${icebergCatalog.publiclyReadableTag}")
+  private String publiclyReadableTag;
+
+  private static final String ACCESS_TYPE_KEY = "access-type";
+  private static final String ACCESS_TYPE_PUBLIC_READ = "PUBLIC_READ";
+
+  @GetMapping(value = "/v1/config", produces = MediaType.APPLICATION_JSON_VALUE)
+  public ConfigResponse getConfig(
+      @RequestParam(value = "warehouse", required = true) String warehouse) {
+    log.info("GET CONFIG for warehouse {}", warehouse);
+
+    checkPublicEnabled();
+
+    // check that warehouse exists
+    warehouse(warehouse, systemOperationContext);
+    ConfigResponse response = ConfigResponse.builder().withOverride("prefix", warehouse).build();
+    log.info("GET CONFIG response: {}", response);
+    return response;
+  }
+
+  @GetMapping(
+      value = "/v1/{prefix}/namespaces/{namespace}/tables/{table}",
+      produces = MediaType.APPLICATION_JSON_VALUE)
+  public LoadTableResponse loadTable(
+      @PathVariable("prefix") String platformInstance,
+      @PathVariable("namespace") String namespace,
+      @PathVariable("table") String table,
+      @RequestHeader(value = "X-Iceberg-Access-Delegation", required = false)
+          String xIcebergAccessDelegation,
+      @RequestParam(value = "snapshots", required = false) String snapshots) {
+    log.info("GET TABLE REQUEST {}.{}.{}", platformInstance, namespace, table);
+
+    checkPublicEnabled();
+
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, systemOperationContext);
+    Optional<DatasetUrn> datasetUrn = warehouse.getDatasetUrn(tableIdFromString(namespace, table));
+    if (datasetUrn.isPresent()) {
+      GlobalTags tags =
+          (GlobalTags)
+              entityService.getLatestAspect(
+                  systemOperationContext, datasetUrn.get(), GLOBAL_TAGS_ASPECT_NAME);
+      if (tags != null && tags.hasTags()) {
+        for (TagAssociation tag : tags.getTags()) {
+          if (publicTag().equals(tag.getTag())) {
+            LoadTableResponse getTableResponse =
+                catalogOperation(
+                    platformInstance,
+                    catalog ->
+                        CatalogHandlers.loadTable(catalog, tableIdFromString(namespace, table)));
+
+            log.info("GET TABLE RESPONSE {}", getTableResponse);
+            return getTableResponse;
+          }
+        }
+      }
+    }
+
+    throw new NoSuchTableException(
+        "No such table %s", fullTableName(platformInstance, tableIdFromString(namespace, table)));
+  }
+
+  void checkPublicEnabled() {
+    if (!isPublicReadEnabled || Strings.isNullOrEmpty(publiclyReadableTag)) {
+      throw new NotFoundException("No endpoint GET /v1/config");
+    }
+  }
+
+  TagUrn publicTag() {
+    try {
+      return TagUrn.createFromString("urn:li:tag:" + publiclyReadableTag);
+    } catch (URISyntaxException e) {
+      throw new RuntimeException("Invalid public tag " + publiclyReadableTag, e);
+    }
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/AbstractIcebergController.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/AbstractIcebergController.java
new file mode 100644
index 00000000000000..00f999be5f4d19
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/AbstractIcebergController.java
@@ -0,0 +1,188 @@
+package io.datahubproject.iceberg.catalog.rest.secure;
+
+import static com.linkedin.metadata.Constants.DATASET_ENTITY_NAME;
+import static com.linkedin.metadata.Constants.DATA_PLATFORM_INSTANCE_ENTITY_NAME;
+import static io.datahubproject.iceberg.catalog.Utils.*;
+
+import com.datahub.authentication.Authentication;
+import com.datahub.authentication.AuthenticationContext;
+import com.datahub.authorization.AuthUtil;
+import com.datahub.authorization.EntitySpec;
+import com.datahub.plugins.auth.authorization.Authorizer;
+import com.linkedin.common.urn.DatasetUrn;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.metadata.authorization.PoliciesConfig;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.search.EntitySearchService;
+import io.datahubproject.iceberg.catalog.DataHubIcebergWarehouse;
+import io.datahubproject.iceberg.catalog.DataHubRestCatalog;
+import io.datahubproject.iceberg.catalog.DataOperation;
+import io.datahubproject.iceberg.catalog.credentials.CredentialProvider;
+import io.datahubproject.metadata.context.OperationContext;
+import io.datahubproject.metadata.context.RequestContext;
+import io.datahubproject.metadata.services.SecretService;
+import jakarta.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+import javax.inject.Inject;
+import javax.inject.Named;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.exceptions.ForbiddenException;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@Slf4j
+public class AbstractIcebergController {
+  @Autowired protected EntityService entityService;
+  @Autowired private EntitySearchService searchService;
+  @Autowired private SecretService secretService;
+
+  @Inject
+  @Named("cachingCredentialProvider")
+  private CredentialProvider cachingCredentialProvider;
+
+  @Inject
+  @Named("authorizerChain")
+  private Authorizer authorizer;
+
+  @Inject
+  @Named("systemOperationContext")
+  protected OperationContext systemOperationContext;
+
+  protected PoliciesConfig.Privilege authorize(
+      OperationContext operationContext,
+      DataHubIcebergWarehouse warehouse,
+      TableIdentifier tableIdentifier,
+      DataOperation operation,
+      boolean returnHighestPrivilege) {
+    Optional<DatasetUrn> urn = warehouse.getDatasetUrn(tableIdentifier);
+    if (urn.isEmpty()) {
+      throw noSuchEntityException(warehouse.getPlatformInstance(), tableIdentifier);
+    }
+
+    EntitySpec entitySpec = new EntitySpec(DATASET_ENTITY_NAME, urn.get().toString());
+    try {
+      return authorize(
+          operationContext,
+          entitySpec,
+          platformInstanceEntitySpec(warehouse.getPlatformInstance()),
+          operation,
+          returnHighestPrivilege);
+    } catch (ForbiddenException e) {
+      // specify table id in error message instead of dataset-urn
+      throw new ForbiddenException(
+          "Data operation %s not authorized on %s",
+          operation, fullTableName(warehouse.getPlatformInstance(), tableIdentifier));
+    }
+  }
+
+  protected PoliciesConfig.Privilege authorize(
+      OperationContext operationContext,
+      String platformInstance,
+      DataOperation operation,
+      boolean returnHighestPrivilege) {
+    EntitySpec entitySpec = platformInstanceEntitySpec(platformInstance);
+    return authorize(operationContext, entitySpec, entitySpec, operation, returnHighestPrivilege);
+  }
+
+  private EntitySpec platformInstanceEntitySpec(String platformInstance) {
+    Urn urn = platformInstanceUrn(platformInstance);
+    return new EntitySpec(DATA_PLATFORM_INSTANCE_ENTITY_NAME, urn.toString());
+  }
+
+  private PoliciesConfig.Privilege authorize(
+      OperationContext operationContext,
+      EntitySpec entitySpec,
+      EntitySpec platformInstanceEntitySpec,
+      DataOperation operation,
+      boolean returnHighestPrivilege) {
+    List<PoliciesConfig.Privilege> privileges =
+        returnHighestPrivilege ? operation.descendingPrivileges : operation.ascendingPrivileges;
+
+    for (PoliciesConfig.Privilege privilege : privileges) {
+      if ((entitySpec.getType().equals(DATASET_ENTITY_NAME)
+              && PoliciesConfig.DATASET_PRIVILEGES.getPrivileges().contains(privilege)
+          || (entitySpec.getType().equals(DATA_PLATFORM_INSTANCE_ENTITY_NAME)
+              && PoliciesConfig.PLATFORM_INSTANCE_PRIVILEGES
+                  .getPrivileges()
+                  .contains(privilege)))) {
+        if (AuthUtil.isAuthorized(operationContext, privilege, entitySpec)) {
+          return privilege;
+        }
+      } else if (entitySpec.getType().equals(DATASET_ENTITY_NAME)
+          && PoliciesConfig.PLATFORM_INSTANCE_PRIVILEGES.getPrivileges().contains(privilege)) {
+        if (AuthUtil.isAuthorized(operationContext, privilege, platformInstanceEntitySpec)) {
+          return privilege;
+        }
+      }
+    }
+
+    throw new ForbiddenException("Data operation %s not authorized on %s", operation, entitySpec);
+  }
+
+  @Data
+  @AllArgsConstructor
+  protected static class CatalogOperationResult<R> {
+    private R response;
+    private PoliciesConfig.Privilege privilege;
+    private CredentialProvider.StorageProviderCredentials storageProviderCredentials;
+  }
+
+  protected <R> R catalogOperation(
+      String platformInstance, Function<DataHubRestCatalog, R> function) {
+    DataHubIcebergWarehouse warehouse =
+        DataHubIcebergWarehouse.of(
+            platformInstance, entityService, secretService, systemOperationContext);
+    return catalogOperation(warehouse, systemOperationContext, function);
+  }
+
+  protected <R> R catalogOperation(
+      DataHubIcebergWarehouse warehouse,
+      OperationContext operationContext,
+      Function<DataHubRestCatalog, R> function) {
+    DataHubRestCatalog catalog = catalog(operationContext, warehouse);
+    try {
+      return function.apply(catalog);
+    } finally {
+      try {
+        catalog.close();
+      } catch (IOException e) {
+        log.error("Error while closing catalog", e);
+      }
+    }
+  }
+
+  protected OperationContext opContext(HttpServletRequest request) {
+    Authentication auth = AuthenticationContext.getAuthentication();
+    return OperationContext.asSession(
+        systemOperationContext,
+        RequestContext.builder()
+            .buildOpenapi(auth.getActor().toUrnStr(), request, "icebergDataAction", "dataset"),
+        authorizer,
+        auth,
+        true);
+  }
+
+  protected DataHubRestCatalog catalog(
+      OperationContext operationContext, DataHubIcebergWarehouse warehouse) {
+    DataHubRestCatalog catalog =
+        new DataHubRestCatalog(
+            entityService, searchService, operationContext, warehouse, cachingCredentialProvider);
+    return catalog;
+  }
+
+  protected DataHubIcebergWarehouse warehouse(
+      String platformInstance, OperationContext operationContext) {
+    return DataHubIcebergWarehouse.of(
+        platformInstance, entityService, secretService, operationContext);
+  }
+
+  protected RuntimeException noSuchEntityException(
+      String platformInstance, TableIdentifier tableIdentifier) {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergApiController.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergApiController.java
new file mode 100644
index 00000000000000..ab83e3da8c2be3
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergApiController.java
@@ -0,0 +1,24 @@
+package io.datahubproject.iceberg.catalog.rest.secure;
+
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.iceberg.rest.requests.CommitTransactionRequest;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping("/iceberg")
+public class IcebergApiController extends AbstractIcebergController {
+
+  @PostMapping(
+      value = "/v1/{prefix}/transactions/commit",
+      consumes = MediaType.APPLICATION_JSON_VALUE)
+  public void commit(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @RequestBody CommitTransactionRequest commitTransactionRequest) {
+    log.info("COMMIT REQUEST {} ", commitTransactionRequest);
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergConfigApiController.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergConfigApiController.java
new file mode 100644
index 00000000000000..5cb489dd4b5478
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergConfigApiController.java
@@ -0,0 +1,25 @@
+package io.datahubproject.iceberg.catalog.rest.secure;
+
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.iceberg.rest.responses.ConfigResponse;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping("/iceberg")
+public class IcebergConfigApiController extends AbstractIcebergController {
+  @GetMapping(value = "/v1/config", produces = MediaType.APPLICATION_JSON_VALUE)
+  public ConfigResponse getConfig(
+      HttpServletRequest request,
+      @RequestParam(value = "warehouse", required = true) String warehouse) {
+    log.info("GET CONFIG for warehouse {}", warehouse);
+
+    // check that warehouse exists
+    warehouse(warehouse, opContext(request));
+    ConfigResponse response = ConfigResponse.builder().withOverride("prefix", warehouse).build();
+    log.info("GET CONFIG response: {}", response);
+    return response;
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergNamespaceApiController.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergNamespaceApiController.java
new file mode 100644
index 00000000000000..b947c348d9d49d
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergNamespaceApiController.java
@@ -0,0 +1,171 @@
+package io.datahubproject.iceberg.catalog.rest.secure;
+
+import static io.datahubproject.iceberg.catalog.Utils.*;
+
+import io.datahubproject.iceberg.catalog.DataHubIcebergWarehouse;
+import io.datahubproject.iceberg.catalog.DataOperation;
+import io.datahubproject.metadata.context.OperationContext;
+import jakarta.servlet.http.HttpServletRequest;
+import javax.annotation.Nonnull;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.rest.CatalogHandlers;
+import org.apache.iceberg.rest.requests.CreateNamespaceRequest;
+import org.apache.iceberg.rest.requests.UpdateNamespacePropertiesRequest;
+import org.apache.iceberg.rest.responses.CreateNamespaceResponse;
+import org.apache.iceberg.rest.responses.GetNamespaceResponse;
+import org.apache.iceberg.rest.responses.ListNamespacesResponse;
+import org.apache.iceberg.rest.responses.UpdateNamespacePropertiesResponse;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping("/iceberg")
+public class IcebergNamespaceApiController extends AbstractIcebergController {
+
+  @GetMapping(
+      value = "/v1/{prefix}/namespaces/{namespace}",
+      produces = MediaType.APPLICATION_JSON_VALUE)
+  public GetNamespaceResponse getNamespace(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @PathVariable("namespace") String namespace) {
+    log.info("GET NAMESPACE REQUEST {}.{}", platformInstance, namespace);
+
+    OperationContext operationContext = opContext(request);
+    // not authorizing get/use namespace operation currently
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, operationContext);
+
+    GetNamespaceResponse getNamespaceResponse =
+        catalogOperation(
+            warehouse,
+            operationContext,
+            catalog -> CatalogHandlers.loadNamespace(catalog, namespaceFromString(namespace)));
+
+    log.info("GET NAMESPACE RESPONSE {}", getNamespaceResponse);
+    return getNamespaceResponse;
+  }
+
+  @PostMapping(
+      value = "/v1/{prefix}/namespaces",
+      consumes = MediaType.APPLICATION_JSON_VALUE,
+      produces = MediaType.APPLICATION_JSON_VALUE)
+  public CreateNamespaceResponse createNamespace(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @RequestBody @Nonnull CreateNamespaceRequest createNamespaceRequest) {
+    log.info(
+        "CREATE NAMESPACE REQUEST in platformInstance {}, body {}",
+        platformInstance,
+        createNamespaceRequest);
+
+    OperationContext operationContext = opContext(request);
+
+    authorize(operationContext, platformInstance, DataOperation.MANAGE_NAMESPACES, false);
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, operationContext);
+    CreateNamespaceResponse createNamespaceResponse =
+        catalogOperation(
+            warehouse,
+            operationContext,
+            catalog -> {
+              CatalogHandlers.createNamespace(catalog, createNamespaceRequest);
+              return CreateNamespaceResponse.builder()
+                  .withNamespace(createNamespaceRequest.namespace())
+                  .build();
+            });
+
+    log.info("CREATE NAMESPACE RESPONSE {}", createNamespaceResponse);
+    return createNamespaceResponse;
+  }
+
+  @PostMapping(
+      value = "/v1/{prefix}/namespaces/{namespace}",
+      consumes = MediaType.APPLICATION_JSON_VALUE,
+      produces = MediaType.APPLICATION_JSON_VALUE)
+  public UpdateNamespacePropertiesResponse updateNamespace(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @PathVariable("namespace") String namespace,
+      @RequestBody @Nonnull UpdateNamespacePropertiesRequest updateNamespacePropertiesRequest) {
+    log.info(
+        "UPDATE NAMESPACE REQUEST {}.{}, body {}",
+        platformInstance,
+        namespace,
+        updateNamespacePropertiesRequest);
+
+    OperationContext operationContext = opContext(request);
+
+    authorize(operationContext, platformInstance, DataOperation.MANAGE_NAMESPACES, false);
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, operationContext);
+    UpdateNamespacePropertiesResponse updateNamespaceResponse =
+        catalogOperation(
+            warehouse,
+            operationContext,
+            catalog ->
+                catalog.updateNamespaceProperties(
+                    namespaceFromString(namespace), updateNamespacePropertiesRequest));
+
+    log.info("UPDATE NAMESPACE RESPONSE {}", updateNamespaceResponse);
+    return updateNamespaceResponse;
+  }
+
+  @DeleteMapping(
+      value = "/v1/{prefix}/namespaces/{namespace}",
+      consumes = MediaType.APPLICATION_JSON_VALUE,
+      produces = MediaType.APPLICATION_JSON_VALUE)
+  public void dropNamespace(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @PathVariable("namespace") String namespace) {
+    log.info("DROP NAMESPACE REQUEST {}.{}", platformInstance, namespace);
+
+    OperationContext operationContext = opContext(request);
+
+    authorize(operationContext, platformInstance, DataOperation.MANAGE_NAMESPACES, false);
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, operationContext);
+    catalogOperation(
+        warehouse,
+        operationContext,
+        catalog -> {
+          CatalogHandlers.dropNamespace(catalog, namespaceFromString(namespace));
+          return null;
+        });
+
+    log.info("DROPPED NAMESPACE {}", namespace);
+  }
+
+  @GetMapping(value = "/v1/{prefix}/namespaces", produces = MediaType.APPLICATION_JSON_VALUE)
+  public ListNamespacesResponse listNamespaces(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @RequestParam(value = "parent", required = false) String parent,
+      @RequestParam(value = "pageToken", required = false) String pageToken,
+      @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+    log.info("LIST NAMESPACES REQUEST for {}.{}", platformInstance, parent);
+
+    OperationContext operationContext = opContext(request);
+    authorize(operationContext, platformInstance, DataOperation.LIST, false);
+
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, operationContext);
+
+    ListNamespacesResponse listNamespacesResponse =
+        catalogOperation(
+            warehouse,
+            operationContext,
+            catalog -> {
+              Namespace ns;
+              if (StringUtils.isEmpty(parent)) {
+                ns = Namespace.empty();
+              } else {
+                ns = namespaceFromString(parent);
+                // ensure namespace exists
+                catalog.loadNamespaceMetadata(ns);
+              }
+              return CatalogHandlers.listNamespaces(catalog, ns);
+            });
+    log.info("LIST NAMESPACES RESPONSE {}", listNamespacesResponse);
+    return listNamespacesResponse;
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergTableApiController.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergTableApiController.java
new file mode 100644
index 00000000000000..023e4e38a2ad5e
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergTableApiController.java
@@ -0,0 +1,323 @@
+package io.datahubproject.iceberg.catalog.rest.secure;
+
+import static io.datahubproject.iceberg.catalog.Utils.*;
+
+import com.linkedin.metadata.authorization.PoliciesConfig;
+import io.datahubproject.iceberg.catalog.DataHubIcebergWarehouse;
+import io.datahubproject.iceberg.catalog.DataOperation;
+import io.datahubproject.iceberg.catalog.credentials.CredentialProvider;
+import io.datahubproject.metadata.context.OperationContext;
+import jakarta.servlet.http.HttpServletRequest;
+import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.exceptions.NoSuchTableException;
+import org.apache.iceberg.rest.CatalogHandlers;
+import org.apache.iceberg.rest.requests.CreateTableRequest;
+import org.apache.iceberg.rest.requests.RegisterTableRequest;
+import org.apache.iceberg.rest.requests.RenameTableRequest;
+import org.apache.iceberg.rest.requests.UpdateTableRequest;
+import org.apache.iceberg.rest.responses.ListTablesResponse;
+import org.apache.iceberg.rest.responses.LoadTableResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping("/iceberg")
+public class IcebergTableApiController extends AbstractIcebergController {
+
+  @Autowired private CredentialProvider credentialProvider;
+
+  @PostMapping(
+      value = "/v1/{prefix}/namespaces/{namespace}/tables",
+      produces = MediaType.APPLICATION_JSON_VALUE,
+      consumes = MediaType.APPLICATION_JSON_VALUE)
+  public LoadTableResponse createTable(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @PathVariable("namespace") String namespace,
+      @RequestBody CreateTableRequest createTableRequest,
+      @RequestHeader(value = "X-Iceberg-Access-Delegation") String xIcebergAccessDelegation) {
+    log.info(
+        "CREATE TABLE REQUEST in {}.{}, body {}", platformInstance, namespace, createTableRequest);
+
+    OperationContext operationContext = opContext(request);
+    PoliciesConfig.Privilege privilege =
+        authorize(operationContext, platformInstance, DataOperation.MANAGE_TABLES, false);
+
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, operationContext);
+    LoadTableResponse createTableResponse =
+        catalogOperation(
+            warehouse,
+            operationContext,
+            catalog -> {
+              // ensure namespace exists
+              Namespace ns = namespaceFromString(namespace);
+              catalog.loadNamespaceMetadata(ns);
+              if (createTableRequest.stageCreate()) {
+                return CatalogHandlers.stageTableCreate(catalog, ns, createTableRequest);
+              } else {
+                return CatalogHandlers.createTable(catalog, ns, createTableRequest);
+              }
+            });
+    log.info("CREATE TABLE RESPONSE, excluding creds, {}", createTableResponse);
+    return includeCreds(
+        platformInstance,
+        xIcebergAccessDelegation,
+        createTableResponse,
+        PoliciesConfig.DATA_READ_WRITE_PRIVILEGE,
+        warehouse.getStorageProviderCredentials());
+  }
+
+  private LoadTableResponse includeCreds(
+      String platformInstance,
+      String xIcebergAccessDelegation,
+      LoadTableResponse loadTableResponse,
+      PoliciesConfig.Privilege privilege,
+      CredentialProvider.StorageProviderCredentials storageProviderCredentials) {
+    if ("vended-credentials".equals(xIcebergAccessDelegation)) {
+      CredentialProvider.CredentialsCacheKey cacheKey =
+          new CredentialProvider.CredentialsCacheKey(
+              platformInstance, privilege, locations(loadTableResponse.tableMetadata()));
+      Map<String, String> creds =
+          credentialProvider.getCredentials(cacheKey, storageProviderCredentials);
+      /* log.info(
+      "STS creds {} for primary table location {}",
+      creds,
+      loadTableResponse.tableMetadata().location()); */
+
+      return LoadTableResponse.builder()
+          .withTableMetadata(loadTableResponse.tableMetadata())
+          .addAllConfig(creds)
+          .build();
+    } else {
+      return loadTableResponse;
+    }
+  }
+
+  @GetMapping(
+      value = "/v1/{prefix}/namespaces/{namespace}/tables/{table}",
+      produces = MediaType.APPLICATION_JSON_VALUE)
+  public LoadTableResponse loadTable(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @PathVariable("namespace") String namespace,
+      @PathVariable("table") String table,
+      @RequestHeader(value = "X-Iceberg-Access-Delegation", required = false)
+          String xIcebergAccessDelegation,
+      @RequestParam(value = "snapshots", required = false) String snapshots) {
+    log.info(
+        "GET TABLE REQUEST {}.{}.{}, access-delegation {}",
+        platformInstance,
+        namespace,
+        table,
+        xIcebergAccessDelegation);
+
+    OperationContext operationContext = opContext(request);
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, operationContext);
+
+    PoliciesConfig.Privilege privilege =
+        authorize(
+            operationContext,
+            warehouse,
+            tableIdFromString(namespace, table),
+            DataOperation.READ_ONLY,
+            true);
+
+    LoadTableResponse getTableResponse =
+        catalogOperation(
+            warehouse,
+            operationContext,
+            catalog -> CatalogHandlers.loadTable(catalog, tableIdFromString(namespace, table)));
+    log.info("GET TABLE RESPONSE, excluding creds, {}", getTableResponse);
+
+    if (privilege == PoliciesConfig.DATA_MANAGE_TABLES_PRIVILEGE) {
+      privilege = PoliciesConfig.DATA_READ_WRITE_PRIVILEGE;
+    } else if (privilege == PoliciesConfig.DATA_MANAGE_VIEWS_PRIVILEGE) {
+      privilege = PoliciesConfig.DATA_READ_ONLY_PRIVILEGE;
+    }
+    return includeCreds(
+        platformInstance,
+        xIcebergAccessDelegation,
+        getTableResponse,
+        privilege,
+        warehouse.getStorageProviderCredentials());
+  }
+
+  @PostMapping(
+      value = "/v1/{prefix}/namespaces/{namespace}/tables/{table}",
+      produces = MediaType.APPLICATION_JSON_VALUE,
+      consumes = MediaType.APPLICATION_JSON_VALUE)
+  public LoadTableResponse updateTable(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @PathVariable("namespace") String namespace,
+      @PathVariable("table") String table,
+      @RequestBody UpdateTableRequest updateTableRequest) {
+
+    log.info(
+        "UPDATE TABLE REQUEST {}.{}.{}, body {} ",
+        platformInstance,
+        namespace,
+        table,
+        updateTableRequest);
+
+    OperationContext operationContext = opContext(request);
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, operationContext);
+    authorize(
+        operationContext,
+        warehouse,
+        tableIdFromString(namespace, table),
+        DataOperation.READ_WRITE,
+        false);
+    LoadTableResponse updateTableResponse =
+        catalogOperation(
+            warehouse,
+            operationContext,
+            catalog ->
+                CatalogHandlers.updateTable(
+                    catalog, tableIdFromString(namespace, table), updateTableRequest));
+
+    // not refreshing credentials here.
+    log.info("UPDATE TABLE RESPONSE {}", updateTableResponse);
+
+    return updateTableResponse;
+  }
+
+  @DeleteMapping(value = "/v1/{prefix}/namespaces/{namespace}/tables/{table}")
+  public void dropTable(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @PathVariable("namespace") String namespace,
+      @PathVariable("table") String table,
+      @RequestParam(value = "purgeRequested", defaultValue = "false") Boolean purgeRequested) {
+
+    log.info(
+        "DROP TABLE REQUEST {}.{}.{}, purge = {}",
+        platformInstance,
+        namespace,
+        table,
+        purgeRequested);
+
+    OperationContext operationContext = opContext(request);
+    authorize(operationContext, platformInstance, DataOperation.MANAGE_TABLES, false);
+
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, operationContext);
+
+    catalogOperation(
+        warehouse,
+        operationContext,
+        catalog -> {
+          TableIdentifier tableIdentifier = tableIdFromString(namespace, table);
+          if (purgeRequested) {
+            CatalogHandlers.purgeTable(catalog, tableIdentifier);
+            log.info("PURGED TABLE {}", tableIdentifier);
+          } else {
+            CatalogHandlers.dropTable(catalog, tableIdentifier);
+            log.info("DROPPED TABLE {}", tableIdentifier);
+          }
+          return null;
+        });
+  }
+
+  @PostMapping(
+      value = "/v1/{prefix}/tables/rename",
+      produces = MediaType.APPLICATION_JSON_VALUE,
+      consumes = MediaType.APPLICATION_JSON_VALUE)
+  public void renameTable(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @RequestBody RenameTableRequest renameTableRequest) {
+    log.info(
+        "RENAME TABLE REQUEST in platformInstance {}, body {}",
+        platformInstance,
+        renameTableRequest);
+
+    OperationContext operationContext = opContext(request);
+    authorize(operationContext, platformInstance, DataOperation.MANAGE_TABLES, false);
+
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, operationContext);
+
+    catalogOperation(
+        warehouse,
+        operationContext,
+        catalog -> {
+          CatalogHandlers.renameTable(catalog, renameTableRequest);
+          return null;
+        });
+
+    log.info(
+        "RENAMED TABLE {} to {} ", renameTableRequest.source(), renameTableRequest.destination());
+  }
+
+  @PostMapping(
+      value = "/v1/{prefix}/namespaces/{namespace}/register",
+      produces = MediaType.APPLICATION_JSON_VALUE,
+      consumes = MediaType.APPLICATION_JSON_VALUE)
+  public LoadTableResponse registerTable(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @PathVariable("namespace") String namespace,
+      @RequestBody RegisterTableRequest registerTableRequest) {
+    log.info(
+        "REGISTER TABLE REQUEST {}.{}, body {}", platformInstance, namespace, registerTableRequest);
+
+    OperationContext operationContext = opContext(request);
+    authorize(operationContext, platformInstance, DataOperation.MANAGE_TABLES, false);
+
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, operationContext);
+
+    LoadTableResponse registerTableResponse =
+        catalogOperation(
+            warehouse,
+            operationContext,
+            catalog -> {
+              // ensure namespace exists
+              Namespace ns = namespaceFromString(namespace);
+              catalog.loadNamespaceMetadata(ns);
+              return CatalogHandlers.registerTable(catalog, ns, registerTableRequest);
+            });
+
+    log.info("REGISTER TABLE RESPONSE {}", registerTableResponse);
+    return registerTableResponse;
+  }
+
+  @GetMapping(
+      value = "/v1/{prefix}/namespaces/{namespace}/tables",
+      produces = MediaType.APPLICATION_JSON_VALUE)
+  public ListTablesResponse listTables(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @PathVariable("namespace") String namespace,
+      @RequestParam(value = "pageToken", required = false) String pageToken,
+      @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+    log.info("LIST TABLES REQUEST for {}.{}", platformInstance, namespace);
+
+    OperationContext operationContext = opContext(request);
+    authorize(operationContext, platformInstance, DataOperation.LIST, false);
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, operationContext);
+
+    ListTablesResponse listTablesResponse =
+        catalogOperation(
+            warehouse,
+            operationContext,
+            catalog -> {
+              // ensure namespace exists
+              Namespace ns = namespaceFromString(namespace);
+              catalog.loadNamespaceMetadata(ns);
+              return CatalogHandlers.listTables(catalog, ns);
+            });
+    log.info("LIST TABLES RESPONSE {}", listTablesResponse);
+    return listTablesResponse;
+  }
+
+  @Override
+  protected NoSuchTableException noSuchEntityException(
+      String platformInstance, TableIdentifier tableIdentifier) {
+    return new NoSuchTableException(
+        "No such table %s", fullTableName(platformInstance, tableIdentifier));
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergViewApiController.java b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergViewApiController.java
new file mode 100644
index 00000000000000..6a40a8012bb003
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/main/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergViewApiController.java
@@ -0,0 +1,213 @@
+package io.datahubproject.iceberg.catalog.rest.secure;
+
+import static io.datahubproject.iceberg.catalog.Utils.*;
+
+import io.datahubproject.iceberg.catalog.DataHubIcebergWarehouse;
+import io.datahubproject.iceberg.catalog.DataOperation;
+import io.datahubproject.metadata.context.OperationContext;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.exceptions.NoSuchViewException;
+import org.apache.iceberg.rest.CatalogHandlers;
+import org.apache.iceberg.rest.requests.CreateViewRequest;
+import org.apache.iceberg.rest.requests.RenameTableRequest;
+import org.apache.iceberg.rest.requests.UpdateTableRequest;
+import org.apache.iceberg.rest.responses.ListTablesResponse;
+import org.apache.iceberg.rest.responses.LoadViewResponse;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping("/iceberg")
+public class IcebergViewApiController extends AbstractIcebergController {
+
+  @PostMapping(
+      value = "/v1/{prefix}/namespaces/{namespace}/views",
+      produces = MediaType.APPLICATION_JSON_VALUE,
+      consumes = MediaType.APPLICATION_JSON_VALUE)
+  public LoadViewResponse createView(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @PathVariable("namespace") String namespace,
+      @RequestBody CreateViewRequest createViewRequest) {
+    log.info(
+        "CREATE VIEW REQUEST in {}.{}, body {}", platformInstance, namespace, createViewRequest);
+
+    OperationContext operationContext = opContext(request);
+    authorize(operationContext, platformInstance, DataOperation.MANAGE_VIEWS, false);
+
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, operationContext);
+
+    LoadViewResponse createViewResponse =
+        catalogOperation(
+            warehouse,
+            operationContext,
+            catalog -> {
+              // ensure namespace exists
+              Namespace ns = namespaceFromString(namespace);
+              catalog.loadNamespaceMetadata(ns);
+              return CatalogHandlers.createView(catalog, ns, createViewRequest);
+            });
+
+    log.info("CREATE VIEW RESPONSE {}", createViewResponse);
+    return createViewResponse;
+  }
+
+  @PostMapping(
+      value = "/v1/{prefix}/namespaces/{namespace}/views/{view}",
+      produces = MediaType.APPLICATION_JSON_VALUE,
+      consumes = MediaType.APPLICATION_JSON_VALUE)
+  public LoadViewResponse updateView(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @PathVariable("namespace") String namespace,
+      @PathVariable("view") String view,
+      @RequestBody UpdateTableRequest updateViewRequest) {
+    log.info(
+        "UPDATE VIEW REQUEST {}.{}.{}, body {} ",
+        platformInstance,
+        namespace,
+        view,
+        updateViewRequest);
+
+    OperationContext operationContext = opContext(request);
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, operationContext);
+    authorize(
+        operationContext,
+        warehouse,
+        tableIdFromString(namespace, view),
+        DataOperation.MANAGE_VIEWS,
+        false);
+
+    LoadViewResponse updateViewResponse =
+        catalogOperation(
+            warehouse,
+            operationContext,
+            catalog ->
+                CatalogHandlers.updateView(
+                    catalog, tableIdFromString(namespace, view), updateViewRequest));
+
+    log.info("UPDATE VIEW RESPONSE {}", updateViewResponse);
+    return updateViewResponse;
+  }
+
+  @GetMapping(
+      value = "/v1/{prefix}/namespaces/{namespace}/views/{view}",
+      produces = MediaType.APPLICATION_JSON_VALUE)
+  public LoadViewResponse loadView(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @PathVariable("namespace") String namespace,
+      @PathVariable("view") String view) {
+    log.info("GET VIEW REQUEST {}.{}.{}", platformInstance, namespace, view);
+
+    OperationContext operationContext = opContext(request);
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, operationContext);
+
+    authorize(
+        operationContext,
+        warehouse,
+        tableIdFromString(namespace, view),
+        DataOperation.READ_ONLY,
+        false);
+
+    LoadViewResponse getViewResponse =
+        catalogOperation(
+            warehouse,
+            operationContext,
+            catalog -> CatalogHandlers.loadView(catalog, tableIdFromString(namespace, view)));
+    log.info("LOAD VIEW RESPONSE {}", getViewResponse);
+    return getViewResponse;
+  }
+
+  @DeleteMapping(value = "/v1/{prefix}/namespaces/{namespace}/views/{view}")
+  public void dropView(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @PathVariable("namespace") String namespace,
+      @PathVariable("view") String view) {
+    log.info("DROP VIEW REQUEST {}.{}.{}", platformInstance, namespace, view);
+
+    OperationContext operationContext = opContext(request);
+    authorize(operationContext, platformInstance, DataOperation.MANAGE_VIEWS, false);
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, operationContext);
+
+    catalogOperation(
+        warehouse,
+        operationContext,
+        catalog -> {
+          CatalogHandlers.dropView(catalog, tableIdFromString(namespace, view));
+          return null;
+        });
+    log.info("DROPPED VIEW {}", tableIdFromString(namespace, view));
+  }
+
+  @PostMapping(
+      value = "/v1/{prefix}/views/rename",
+      produces = MediaType.APPLICATION_JSON_VALUE,
+      consumes = MediaType.APPLICATION_JSON_VALUE)
+  public void renameView(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @RequestBody RenameTableRequest renameTableRequest) {
+    log.info(
+        "RENAME VIEW REQUEST in platformInstance {}, body {}",
+        platformInstance,
+        renameTableRequest);
+
+    OperationContext operationContext = opContext(request);
+    authorize(operationContext, platformInstance, DataOperation.MANAGE_VIEWS, false);
+
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, operationContext);
+
+    catalogOperation(
+        warehouse,
+        operationContext,
+        catalog -> {
+          CatalogHandlers.renameView(catalog, renameTableRequest);
+          return null;
+        });
+
+    log.info(
+        "RENAMED VIEW {} to {} ", renameTableRequest.source(), renameTableRequest.destination());
+  }
+
+  @GetMapping(
+      value = "/v1/{prefix}/namespaces/{namespace}/views",
+      produces = MediaType.APPLICATION_JSON_VALUE)
+  public ListTablesResponse listViews(
+      HttpServletRequest request,
+      @PathVariable("prefix") String platformInstance,
+      @PathVariable("namespace") String namespace,
+      @RequestParam(value = "pageToken", required = false) String pageToken,
+      @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+    log.info("LIST VIEWS REQUEST for {}.{}", platformInstance, namespace);
+
+    OperationContext operationContext = opContext(request);
+    authorize(operationContext, platformInstance, DataOperation.LIST, false);
+    DataHubIcebergWarehouse warehouse = warehouse(platformInstance, operationContext);
+
+    ListTablesResponse listTablesResponse =
+        catalogOperation(
+            warehouse,
+            operationContext,
+            catalog -> {
+              // ensure namespace exists
+              Namespace ns = namespaceFromString(namespace);
+              catalog.loadNamespaceMetadata(ns);
+              return CatalogHandlers.listViews(catalog, ns);
+            });
+    log.info("LIST VIEWS RESPONSE {}", listTablesResponse);
+    return listTablesResponse;
+  }
+
+  @Override
+  protected NoSuchViewException noSuchEntityException(
+      String platformInstance, TableIdentifier tableIdentifier) {
+    return new NoSuchViewException(
+        "No such view %s", fullTableName(platformInstance, tableIdentifier));
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/CachingCredentialProviderTest.java b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/CachingCredentialProviderTest.java
new file mode 100644
index 00000000000000..e8d2c10e1d9cff
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/CachingCredentialProviderTest.java
@@ -0,0 +1,107 @@
+package io.datahubproject.iceberg.catalog;
+
+import static org.testng.Assert.*;
+
+import com.linkedin.metadata.authorization.PoliciesConfig;
+import io.datahubproject.iceberg.catalog.credentials.CachingCredentialProvider;
+import io.datahubproject.iceberg.catalog.credentials.CredentialProvider;
+import io.datahubproject.iceberg.catalog.credentials.S3CredentialProvider;
+import java.util.Map;
+import java.util.Set;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+import software.amazon.awssdk.services.sts.StsClient;
+import software.amazon.awssdk.services.sts.StsClientBuilder;
+
+public class CachingCredentialProviderTest {
+
+  private CredentialProvider.StorageProviderCredentials storageProviderCreds;
+  private CredentialProvider.CredentialsCacheKey cacheKey;
+
+  @Mock private StsClient stsClient;
+
+  @Mock private StsClientBuilder stsClientBuilder;
+
+  @BeforeMethod
+  public void setUp() {
+
+    MockitoAnnotations.openMocks(this);
+
+    storageProviderCreds =
+        new CredentialProvider.StorageProviderCredentials(
+            "testClientId",
+            "testClientSecret",
+            "arn:aws:iam::123456789012:role/test-role",
+            "us-east-1",
+            null);
+
+    cacheKey =
+        new CredentialProvider.CredentialsCacheKey(
+            "testPlatform",
+            PoliciesConfig.DATA_READ_ONLY_PRIVILEGE,
+            Set.of("s3://test-bucket/path/to/data"));
+  }
+
+  @Test
+  public void testCredentialCaching() {
+    TestableS3CredentialProvider backingProvider = new TestableS3CredentialProvider();
+    CachingCredentialProvider provider = new CachingCredentialProvider(backingProvider);
+
+    Map<String, String> firstResult = provider.getCredentials(cacheKey, storageProviderCreds);
+    int firstLoadCount = backingProvider.getLoadCount();
+
+    Map<String, String> secondResult = provider.getCredentials(cacheKey, storageProviderCreds);
+    int secondLoadCount = backingProvider.getLoadCount();
+
+    assertEquals(firstLoadCount, 1, "First call should load credentials");
+    assertEquals(secondLoadCount, 1, "Second call should use cached credentials");
+    assertSame(firstResult, secondResult, "Should return same cached credential map");
+  }
+
+  @Test
+  public void testDifferentKeysGetDifferentCredentials() {
+    TestableS3CredentialProvider backingProvider = new TestableS3CredentialProvider();
+    CachingCredentialProvider provider = new CachingCredentialProvider(backingProvider);
+
+    CredentialProvider.CredentialsCacheKey secondKey =
+        new CredentialProvider.CredentialsCacheKey(
+            "differentPlatform",
+            PoliciesConfig.DATA_READ_ONLY_PRIVILEGE,
+            Set.of("s3://test-bucket/path/to/data"));
+
+    Map<String, String> firstResult = provider.getCredentials(cacheKey, storageProviderCreds);
+    int firstLoadCount = backingProvider.getLoadCount();
+
+    Map<String, String> secondResult = provider.getCredentials(secondKey, storageProviderCreds);
+    int secondLoadCount = backingProvider.getLoadCount();
+
+    assertEquals(firstLoadCount, 1, "First call should load credentials");
+    assertEquals(secondLoadCount, 2, "Different key should trigger new credential load");
+    assertNotSame(firstResult, secondResult, "Different keys should get different credential maps");
+  }
+
+  /**
+   * Test implementation that allows us to verify the number of credential loads without relying on
+   * implementation details.
+   */
+  private static class TestableS3CredentialProvider extends S3CredentialProvider {
+    private int loadCount = 0;
+
+    @Override
+    public Map<String, String> getCredentials(
+        CredentialsCacheKey key, StorageProviderCredentials storageProviderCredentials) {
+      loadCount++;
+      return Map.of(
+          "client.region", storageProviderCredentials.region,
+          "s3.access-key-id", "TESTACCESSKEY" + loadCount, // Make each load unique
+          "s3.secret-access-key", "TESTSECRETKEY" + loadCount,
+          "s3.session-token", "TESTSESSIONTOKEN" + loadCount);
+    }
+
+    public int getLoadCount() {
+      return loadCount;
+    }
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/DataHubIcebergWarehouseTest.java b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/DataHubIcebergWarehouseTest.java
new file mode 100644
index 00000000000000..cacca17e2c479b
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/DataHubIcebergWarehouseTest.java
@@ -0,0 +1,428 @@
+package io.datahubproject.iceberg.catalog;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+import com.linkedin.common.AuditStamp;
+import com.linkedin.common.FabricType;
+import com.linkedin.common.urn.DataPlatformUrn;
+import com.linkedin.common.urn.DatasetUrn;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.dataplatforminstance.IcebergWarehouseInfo;
+import com.linkedin.dataset.IcebergCatalogInfo;
+import com.linkedin.entity.EnvelopedAspect;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.mxe.MetadataChangeProposal;
+import com.linkedin.platformresource.PlatformResourceInfo;
+import com.linkedin.secret.DataHubSecretValue;
+import com.linkedin.util.Pair;
+import io.datahubproject.iceberg.catalog.credentials.CredentialProvider;
+import io.datahubproject.metadata.context.OperationContext;
+import io.datahubproject.metadata.services.SecretService;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.exceptions.NoSuchTableException;
+import org.apache.iceberg.exceptions.NotFoundException;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class DataHubIcebergWarehouseTest {
+
+  @Mock private EntityService entityService;
+
+  @Mock private SecretService secretService;
+
+  @Mock private OperationContext operationContext;
+
+  private IcebergWarehouseInfo icebergWarehouse;
+
+  @Mock private RecordTemplate warehouseAspect;
+
+  @BeforeMethod
+  public void setup() {
+    MockitoAnnotations.openMocks(this);
+  }
+
+  @Test
+  public void testGetStorageProviderCredentials() throws Exception {
+    String platformInstance = "test-platform";
+    String clientId = "testClientId";
+    String clientSecret = "testClientSecret";
+    String role = "testRole";
+    String dataRoot = "s3://data-root/test/";
+    String region = "us-east-1";
+
+    Urn clientIdUrn = Urn.createFromString("urn:li:secret:clientId");
+    Urn clientSecretUrn = Urn.createFromString("urn:li:secret:clientSecret");
+
+    icebergWarehouse = new IcebergWarehouseInfo();
+    icebergWarehouse.setClientId(clientIdUrn);
+    icebergWarehouse.setClientSecret(clientSecretUrn);
+    icebergWarehouse.setDataRoot(dataRoot);
+    icebergWarehouse.setRegion(region);
+    icebergWarehouse.setRole(role);
+
+    when(entityService.getLatestAspect(
+            any(),
+            any(),
+            eq(DataHubIcebergWarehouse.DATAPLATFORM_INSTANCE_ICEBERG_WAREHOUSE_ASPECT_NAME)))
+        .thenReturn(warehouseAspect);
+    when(warehouseAspect.data()).thenReturn(icebergWarehouse.data());
+
+    when(secretService.decrypt(eq(clientId))).thenReturn("decrypted-" + clientId);
+    when(secretService.decrypt(eq(clientSecret))).thenReturn("decrypted-" + clientSecret);
+
+    DataHubSecretValue clientIdValue = new DataHubSecretValue();
+    clientIdValue.setValue(clientId);
+
+    DataHubSecretValue clientSecretValue = new DataHubSecretValue();
+    clientSecretValue.setValue(clientSecret);
+
+    Map<Urn, List<RecordTemplate>> aspectsMap = new HashMap<>();
+    aspectsMap.put(clientIdUrn, Arrays.asList(clientIdValue));
+    aspectsMap.put(clientSecretUrn, Arrays.asList(clientSecretValue));
+
+    when(entityService.getLatestAspects(
+            eq(operationContext),
+            eq(Set.of(clientIdUrn, clientSecretUrn)),
+            eq(Set.of("dataHubSecretValue")),
+            eq(false)))
+        .thenReturn(aspectsMap);
+
+    DataHubIcebergWarehouse warehouse =
+        DataHubIcebergWarehouse.of(
+            platformInstance, entityService, secretService, operationContext);
+
+    CredentialProvider.StorageProviderCredentials credentials =
+        warehouse.getStorageProviderCredentials();
+
+    assertNotNull(credentials);
+    assertEquals(credentials.clientId, "decrypted-" + clientId);
+    assertEquals(credentials.clientSecret, "decrypted-" + clientSecret);
+    assertEquals(credentials.role, role);
+    assertEquals(credentials.region, region);
+  }
+
+  @Test(
+      dependsOnMethods = {
+        "testGetStorageProviderCredentials"
+      }) // Dependency for icebergWarehouse setup
+  public void testOf_Success() throws Exception {
+    String platformInstance = "test-platform";
+    when(entityService.getLatestAspect(
+            any(OperationContext.class),
+            any(Urn.class),
+            eq(DataHubIcebergWarehouse.DATAPLATFORM_INSTANCE_ICEBERG_WAREHOUSE_ASPECT_NAME)))
+        .thenReturn(warehouseAspect);
+    when(warehouseAspect.data()).thenReturn(icebergWarehouse.data());
+
+    DataHubIcebergWarehouse warehouse =
+        DataHubIcebergWarehouse.of(
+            platformInstance, entityService, secretService, operationContext);
+
+    assertNotNull(warehouse);
+    assertEquals(warehouse.getPlatformInstance(), platformInstance);
+  }
+
+  @Test(
+      expectedExceptions = NotFoundException.class,
+      expectedExceptionsMessageRegExp = "Unknown warehouse non-existent-platform")
+  public void testOf_WarehouseNotFound() throws Exception {
+    String platformInstance = "non-existent-platform";
+    when(entityService.getLatestAspect(
+            any(OperationContext.class),
+            any(Urn.class),
+            eq(DataHubIcebergWarehouse.DATAPLATFORM_INSTANCE_ICEBERG_WAREHOUSE_ASPECT_NAME)))
+        .thenReturn(null);
+
+    DataHubIcebergWarehouse.of(platformInstance, entityService, secretService, operationContext);
+  }
+
+  @Test
+  public void testGetDataRoot() throws Exception {
+    String platformInstance = "test-platform";
+    String dataRoot = "s3://test-bucket/";
+
+    when(entityService.getLatestAspect(
+            any(),
+            any(),
+            eq(DataHubIcebergWarehouse.DATAPLATFORM_INSTANCE_ICEBERG_WAREHOUSE_ASPECT_NAME)))
+        .thenReturn(warehouseAspect);
+    when(warehouseAspect.data())
+        .thenReturn(new IcebergWarehouseInfo().setDataRoot(dataRoot).data());
+
+    DataHubIcebergWarehouse warehouse =
+        DataHubIcebergWarehouse.of(
+            platformInstance, entityService, secretService, operationContext);
+
+    String result = warehouse.getDataRoot();
+
+    assertEquals(result, dataRoot);
+  }
+
+  @Test
+  public void testGetDatasetUrn() throws Exception {
+    String platformInstance = "test-platform";
+    TableIdentifier tableId = TableIdentifier.of("db", "table");
+    Urn resourceUrn =
+        Urn.createFromString("urn:li:platformResource:iceberg.test-platform.db.table");
+    DatasetUrn expectedDatasetUrn =
+        new DatasetUrn(
+            DataPlatformUrn.createFromString("urn:li:dataPlatform:iceberg"),
+            "uuid",
+            FabricType.PROD);
+
+    PlatformResourceInfo resourceInfo = new PlatformResourceInfo();
+    resourceInfo.setPrimaryKey(expectedDatasetUrn.toString());
+
+    when(entityService.getLatestAspect(
+            any(),
+            any(),
+            eq(DataHubIcebergWarehouse.DATAPLATFORM_INSTANCE_ICEBERG_WAREHOUSE_ASPECT_NAME)))
+        .thenReturn(warehouseAspect);
+    when(warehouseAspect.data()).thenReturn(new IcebergWarehouseInfo().data());
+    when(entityService.getLatestAspect(
+            eq(operationContext), eq(resourceUrn), eq("platformResourceInfo")))
+        .thenReturn(resourceInfo);
+
+    DataHubIcebergWarehouse warehouse =
+        DataHubIcebergWarehouse.of(
+            platformInstance, entityService, secretService, operationContext);
+
+    Optional<DatasetUrn> result = warehouse.getDatasetUrn(tableId);
+
+    assertTrue(result.isPresent());
+    assertEquals(result.get(), expectedDatasetUrn);
+  }
+
+  @Test
+  public void testGetIcebergMetadata() throws Exception {
+    String platformInstance = "test-platform";
+    TableIdentifier tableId = TableIdentifier.of("db", "table");
+    DatasetUrn datasetUrn =
+        new DatasetUrn(
+            DataPlatformUrn.createFromString("urn:li:dataPlatform:iceberg"),
+            "uuid",
+            FabricType.PROD);
+
+    IcebergCatalogInfo expectedMetadata =
+        new IcebergCatalogInfo().setMetadataPointer("s3://bucket/path");
+
+    when(entityService.getLatestAspect(
+            any(),
+            any(),
+            eq(DataHubIcebergWarehouse.DATAPLATFORM_INSTANCE_ICEBERG_WAREHOUSE_ASPECT_NAME)))
+        .thenReturn(warehouseAspect);
+    when(warehouseAspect.data()).thenReturn(new IcebergWarehouseInfo().data());
+
+    // Mock getDatasetUrn behavior
+    PlatformResourceInfo resourceInfo = new PlatformResourceInfo();
+    resourceInfo.setPrimaryKey(datasetUrn.toString());
+    when(entityService.getLatestAspect(any(), any(), eq("platformResourceInfo")))
+        .thenReturn(resourceInfo);
+
+    when(entityService.getLatestAspect(
+            eq(operationContext),
+            eq(datasetUrn),
+            eq(DataHubIcebergWarehouse.DATASET_ICEBERG_METADATA_ASPECT_NAME)))
+        .thenReturn(expectedMetadata);
+
+    DataHubIcebergWarehouse warehouse =
+        DataHubIcebergWarehouse.of(
+            platformInstance, entityService, secretService, operationContext);
+
+    IcebergCatalogInfo result = warehouse.getIcebergMetadata(tableId);
+
+    assertNotNull(result);
+    assertEquals(result.getMetadataPointer(), expectedMetadata.getMetadataPointer());
+  }
+
+  @Test
+  public void testGetIcebergMetadataEnveloped() throws Exception {
+    String platformInstance = "test-platform";
+    TableIdentifier tableId = TableIdentifier.of("db", "table");
+    DatasetUrn datasetUrn =
+        new DatasetUrn(
+            DataPlatformUrn.createFromString("urn:li:dataPlatform:iceberg"),
+            "uuid",
+            FabricType.PROD);
+
+    EnvelopedAspect expectedEnvelopedAspect = mock(EnvelopedAspect.class);
+
+    when(entityService.getLatestAspect(
+            any(),
+            any(),
+            eq(DataHubIcebergWarehouse.DATAPLATFORM_INSTANCE_ICEBERG_WAREHOUSE_ASPECT_NAME)))
+        .thenReturn(warehouseAspect);
+    when(warehouseAspect.data()).thenReturn(new IcebergWarehouseInfo().data());
+
+    // Mock getDatasetUrn behavior
+    PlatformResourceInfo resourceInfo = new PlatformResourceInfo();
+    resourceInfo.setPrimaryKey(datasetUrn.toString());
+    when(entityService.getLatestAspect(any(), any(), eq("platformResourceInfo")))
+        .thenReturn(resourceInfo);
+
+    when(entityService.getLatestEnvelopedAspect(
+            eq(operationContext),
+            eq("dataset"),
+            eq(datasetUrn),
+            eq(DataHubIcebergWarehouse.DATASET_ICEBERG_METADATA_ASPECT_NAME)))
+        .thenReturn(expectedEnvelopedAspect);
+
+    DataHubIcebergWarehouse warehouse =
+        DataHubIcebergWarehouse.of(
+            platformInstance, entityService, secretService, operationContext);
+
+    Pair<EnvelopedAspect, DatasetUrn> result = warehouse.getIcebergMetadataEnveloped(tableId);
+
+    assertNotNull(result);
+    assertEquals(result.getFirst(), expectedEnvelopedAspect);
+    assertEquals(result.getSecond(), datasetUrn);
+  }
+
+  @Test
+  public void testDeleteDataset() throws Exception {
+    String platformInstance = "test-platform";
+    TableIdentifier tableId = TableIdentifier.of("db", "table");
+    Urn resourceUrn =
+        Urn.createFromString("urn:li:platformResource:iceberg.test-platform.db.table");
+    DatasetUrn datasetUrn =
+        new DatasetUrn(
+            DataPlatformUrn.createFromString("urn:li:dataPlatform:iceberg"),
+            "uuid",
+            FabricType.PROD);
+
+    when(entityService.getLatestAspect(
+            any(),
+            any(),
+            eq(DataHubIcebergWarehouse.DATAPLATFORM_INSTANCE_ICEBERG_WAREHOUSE_ASPECT_NAME)))
+        .thenReturn(warehouseAspect);
+    when(warehouseAspect.data()).thenReturn(new IcebergWarehouseInfo().data());
+    when(entityService.exists(eq(operationContext), eq(resourceUrn))).thenReturn(true);
+
+    // Mock getDatasetUrn behavior
+    PlatformResourceInfo resourceInfo = new PlatformResourceInfo();
+    resourceInfo.setPrimaryKey(datasetUrn.toString());
+    when(entityService.getLatestAspect(any(), any(), eq("platformResourceInfo")))
+        .thenReturn(resourceInfo);
+
+    DataHubIcebergWarehouse warehouse =
+        DataHubIcebergWarehouse.of(
+            platformInstance, entityService, secretService, operationContext);
+
+    boolean result = warehouse.deleteDataset(tableId);
+
+    assertTrue(result);
+    verify(entityService).deleteUrn(eq(operationContext), eq(resourceUrn));
+    verify(entityService).deleteUrn(eq(operationContext), eq(datasetUrn));
+  }
+
+  @Test
+  public void testCreateDataset() throws Exception {
+    String platformInstance = "test-platform";
+    TableIdentifier tableId = TableIdentifier.of("db", "table");
+    AuditStamp auditStamp =
+        new AuditStamp()
+            .setTime(System.currentTimeMillis())
+            .setActor(Urn.createFromString("urn:li:corpuser:testUser"));
+
+    when(entityService.getLatestAspect(any(), any(), eq("icebergWarehouseInfo")))
+        .thenReturn(warehouseAspect);
+    IcebergWarehouseInfo warehouse = new IcebergWarehouseInfo().setEnv(FabricType.PROD);
+    when(warehouseAspect.data()).thenReturn(warehouse.data());
+
+    DataHubIcebergWarehouse icebergWarehouse =
+        DataHubIcebergWarehouse.of(
+            platformInstance, entityService, secretService, operationContext);
+
+    DatasetUrn result = icebergWarehouse.createDataset(tableId, false, auditStamp);
+
+    assertNotNull(result);
+    assertEquals(result.getPlatformEntity(), Urn.createFromString("urn:li:dataPlatform:iceberg"));
+    assertEquals(result.getOriginEntity(), FabricType.PROD);
+    assertTrue(result.getDatasetNameEntity().startsWith(platformInstance + "."));
+
+    verify(entityService)
+        .ingestProposal(
+            eq(operationContext), any(MetadataChangeProposal.class), eq(auditStamp), eq(false));
+  }
+
+  @Test
+  public void testRenameDataset() throws Exception {
+    String platformInstance = "test-platform";
+    TableIdentifier fromTableId = TableIdentifier.of("db", "oldTable");
+    TableIdentifier toTableId = TableIdentifier.of("db", "newTable");
+    DatasetUrn existingDatasetUrn =
+        new DatasetUrn(
+            DataPlatformUrn.createFromString("urn:li:dataPlatform:iceberg"),
+            "test-dataset",
+            FabricType.PROD);
+    AuditStamp auditStamp =
+        new AuditStamp()
+            .setTime(System.currentTimeMillis())
+            .setActor(Urn.createFromString("urn:li:corpuser:testUser"));
+
+    when(entityService.getLatestAspect(
+            any(),
+            any(),
+            eq(DataHubIcebergWarehouse.DATAPLATFORM_INSTANCE_ICEBERG_WAREHOUSE_ASPECT_NAME)))
+        .thenReturn(warehouseAspect);
+    when(warehouseAspect.data()).thenReturn(new IcebergWarehouseInfo().data());
+
+    // Mock getDatasetUrn behavior for source table
+    PlatformResourceInfo resourceInfo = new PlatformResourceInfo();
+    resourceInfo.setPrimaryKey(existingDatasetUrn.toString());
+    when(entityService.getLatestAspect(any(), any(), eq("platformResourceInfo")))
+        .thenReturn(resourceInfo);
+
+    DataHubIcebergWarehouse warehouse =
+        DataHubIcebergWarehouse.of(
+            platformInstance, entityService, secretService, operationContext);
+
+    DatasetUrn result = warehouse.renameDataset(fromTableId, toTableId, false, auditStamp);
+
+    assertNotNull(result);
+    assertEquals(result, existingDatasetUrn);
+
+    verify(entityService)
+        .ingestProposal(
+            eq(operationContext), any(MetadataChangeProposal.class), eq(auditStamp), eq(false));
+    verify(entityService).deleteUrn(eq(operationContext), any(Urn.class));
+  }
+
+  @Test(expectedExceptions = NoSuchTableException.class)
+  public void testRenameDataset_SourceTableNotFound() throws Exception {
+    String platformInstance = "test-platform";
+    TableIdentifier fromTableId = TableIdentifier.of("db", "oldTable");
+    TableIdentifier toTableId = TableIdentifier.of("db", "newTable");
+    AuditStamp auditStamp =
+        new AuditStamp()
+            .setTime(System.currentTimeMillis())
+            .setActor(Urn.createFromString("urn:li:corpuser:testUser"));
+
+    when(entityService.getLatestAspect(any(), any(), eq("icebergWarehouseInfo")))
+        .thenReturn(warehouseAspect);
+    when(warehouseAspect.data()).thenReturn(new IcebergWarehouseInfo().data());
+
+    // Mock empty response for getDatasetUrn
+    when(entityService.getLatestAspect(any(), any(), eq("platformResourceInfo"))).thenReturn(null);
+
+    DataHubIcebergWarehouse warehouse =
+        DataHubIcebergWarehouse.of(
+            platformInstance, entityService, secretService, operationContext);
+
+    warehouse.renameDataset(fromTableId, toTableId, false, auditStamp);
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/DataHubRestCatalogTest.java b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/DataHubRestCatalogTest.java
new file mode 100644
index 00000000000000..ae333b0ccbd65c
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/DataHubRestCatalogTest.java
@@ -0,0 +1,394 @@
+package io.datahubproject.iceberg.catalog;
+
+import static com.linkedin.metadata.Constants.CONTAINER_PROPERTIES_ASPECT_NAME;
+import static io.datahubproject.iceberg.catalog.DataHubRestCatalog.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+import static org.testng.Assert.*;
+
+import com.linkedin.common.AuditStamp;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.container.ContainerProperties;
+import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.data.template.StringMap;
+import com.linkedin.dataset.DatasetProperties;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.search.EntitySearchService;
+import com.linkedin.metadata.search.SearchEntity;
+import com.linkedin.metadata.search.SearchEntityArray;
+import com.linkedin.metadata.search.SearchResult;
+import com.linkedin.mxe.MetadataChangeProposal;
+import io.datahubproject.iceberg.catalog.credentials.CredentialProvider;
+import io.datahubproject.metadata.context.OperationContext;
+import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.exceptions.NoSuchNamespaceException;
+import org.apache.iceberg.rest.requests.UpdateNamespacePropertiesRequest;
+import org.apache.iceberg.rest.responses.UpdateNamespacePropertiesResponse;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class DataHubRestCatalogTest {
+
+  @Mock private EntityService entityService;
+
+  @Mock private EntitySearchService searchService;
+
+  @Mock private OperationContext operationContext;
+
+  @Mock private DataHubIcebergWarehouse warehouse;
+
+  @Mock private CredentialProvider credentialProvider;
+
+  private DataHubRestCatalog catalog;
+
+  @BeforeMethod
+  public void setup() {
+    MockitoAnnotations.openMocks(this);
+    when(warehouse.getPlatformInstance()).thenReturn("test-platform");
+    String warehouseRoot = "s3://data/warehouse/";
+    when(warehouse.getDataRoot()).thenReturn(warehouseRoot);
+    catalog =
+        new DataHubRestCatalog(
+            entityService, searchService, operationContext, warehouse, credentialProvider);
+  }
+
+  @Test
+  public void testCreateNamespace_SingleLevel() throws Exception {
+    Namespace namespace = Namespace.of("db1");
+    Map<String, String> properties = Map.of();
+
+    catalog.createNamespace(namespace, properties);
+
+    ArgumentCaptor<MetadataChangeProposal> mcpCaptor =
+        ArgumentCaptor.forClass(MetadataChangeProposal.class);
+    verify(entityService, times(3))
+        .ingestProposal(
+            eq(operationContext), mcpCaptor.capture(), any(AuditStamp.class), eq(false));
+
+    List<MetadataChangeProposal> mcps = mcpCaptor.getAllValues();
+
+    MetadataChangeProposal subTypesMcp = mcps.get(0);
+    assertEquals(subTypesMcp.getAspectName(), "subTypes");
+
+    MetadataChangeProposal containerPropertiesMcp = mcps.get(1);
+    assertEquals(containerPropertiesMcp.getAspectName(), "containerProperties");
+  }
+
+  @Test
+  public void testCreateNamespace_MultiLevel() throws Exception {
+    Namespace namespace = Namespace.of("db1", "schema1");
+    Map<String, String> properties = Map.of();
+
+    when(entityService.exists(eq(operationContext), any(Urn.class))).thenReturn(true);
+
+    catalog.createNamespace(namespace, properties);
+
+    ArgumentCaptor<MetadataChangeProposal> mcpCaptor =
+        ArgumentCaptor.forClass(MetadataChangeProposal.class);
+    verify(entityService, times(4))
+        .ingestProposal(
+            eq(operationContext), mcpCaptor.capture(), any(AuditStamp.class), eq(false));
+
+    List<MetadataChangeProposal> mcps = mcpCaptor.getAllValues();
+    MetadataChangeProposal containerMcp = mcps.get(0);
+    assertEquals(containerMcp.getAspectName(), "container");
+  }
+
+  @Test(expectedExceptions = NoSuchNamespaceException.class)
+  public void testCreateNamespace_MultiLevel_ParentMissing() throws Exception {
+    Namespace namespace = Namespace.of("db1", "schema1");
+    Map<String, String> properties = Map.of();
+
+    when(entityService.exists(eq(operationContext), any(Urn.class))).thenReturn(false);
+
+    // Act - should throw exception
+    catalog.createNamespace(namespace, properties);
+  }
+
+  @Test
+  public void testLoadNamespaceMetadata_Exists() throws Exception {
+    Namespace namespace = Namespace.of("db1", "schema1");
+    ContainerProperties containerProperties =
+        new ContainerProperties().setCustomProperties(new StringMap());
+    Urn urn = Urn.createFromString("urn:li:container:iceberg__test-platform.db1.schema1");
+    when(entityService.getLatestAspect(
+            eq(operationContext), eq(urn), eq(CONTAINER_PROPERTIES_ASPECT_NAME)))
+        .thenReturn(containerProperties);
+
+    Map<String, String> metadata = catalog.loadNamespaceMetadata(namespace);
+
+    assertNotNull(metadata);
+    assertTrue(metadata.isEmpty());
+    verify(entityService)
+        .getLatestAspect(eq(operationContext), eq(urn), eq(CONTAINER_PROPERTIES_ASPECT_NAME));
+  }
+
+  @Test(expectedExceptions = NoSuchNamespaceException.class)
+  public void testLoadNamespaceMetadata_NotExists() throws Exception {
+    Namespace namespace = Namespace.of("db1", "schema1");
+    Urn urn = Urn.createFromString("urn:li:container:iceberg__test-platform.db1.schema1");
+    when(entityService.getLatestAspect(
+            eq(operationContext), eq(urn), eq(CONTAINER_PROPERTIES_ASPECT_NAME)))
+        .thenReturn(null);
+
+    // Act & Assert - should throw exception
+    catalog.loadNamespaceMetadata(namespace);
+  }
+
+  @Test
+  public void testDropTable() throws Exception {
+    TableIdentifier tableIdentifier = TableIdentifier.of("db1", "table1");
+    when(warehouse.deleteDataset(eq(tableIdentifier))).thenReturn(true);
+
+    boolean result = catalog.dropTable(tableIdentifier, false);
+
+    assertTrue(result);
+    verify(warehouse).deleteDataset(eq(tableIdentifier));
+  }
+
+  @Test(expectedExceptions = UnsupportedOperationException.class)
+  public void testDropTable_WithPurgeThrows() {
+    TableIdentifier tableIdentifier = TableIdentifier.of("db1", "table1");
+
+    catalog.dropTable(tableIdentifier, true);
+  }
+
+  @Test
+  public void testDropTable_NonExistentTable() throws Exception {
+    TableIdentifier tableIdentifier = TableIdentifier.of("db1", "table1");
+    when(entityService.exists(eq(operationContext), (Urn) any())).thenReturn(false);
+
+    boolean result = catalog.dropTable(tableIdentifier, false);
+
+    // Assert
+    assertFalse(result);
+    verify(entityService, never()).deleteUrn(any(), any());
+  }
+
+  @Test
+  public void testDefaultWarehouseLocation() {
+    TableIdentifier tableIdentifier = TableIdentifier.of("db1", "table1");
+
+    String location = catalog.defaultWarehouseLocation(tableIdentifier);
+
+    assertEquals(location, "s3://data/warehouse/db1/table1");
+  }
+
+  @Test
+  public void testDefaultWarehouseLocationWithoutTrailingSlash() {
+    String warehouseRoot = "s3://data/warehouse";
+    when(warehouse.getDataRoot()).thenReturn(warehouseRoot);
+    DataHubRestCatalog testCatalog =
+        new DataHubRestCatalog(
+            entityService, searchService, operationContext, warehouse, credentialProvider);
+    String warehouseLocation =
+        testCatalog.defaultWarehouseLocation(TableIdentifier.of("db1", "table1"));
+    assertEquals(warehouseLocation, "s3://data/warehouse/db1/table1");
+  }
+
+  @Test
+  public void testListNamespaces_EmptyNamespace() throws Exception {
+    // Test for root level namespace listing
+    Namespace emptyNamespace = Namespace.empty();
+    SearchResult mockResult = mock(SearchResult.class);
+    List<SearchEntity> entitiesList =
+        Arrays.asList(
+            createSearchEntity("urn:li:container:iceberg__ns1"),
+            createSearchEntity("urn:li:container:iceberg__ns2"));
+    SearchEntityArray entities = new SearchEntityArray();
+    entities.addAll(entitiesList);
+    when(mockResult.getEntities()).thenReturn(entities);
+    when(mockResult.getNumEntities()).thenReturn(2);
+    when(searchService.search(
+            eq(operationContext), any(), eq("*"), any(), any(), eq(0), eq(PAGE_SIZE)))
+        .thenReturn(mockResult);
+
+    List<Namespace> result = catalog.listNamespaces(emptyNamespace);
+
+    assertEquals(result.size(), 2);
+    assertEquals(result.get(0), Namespace.of("ns1"));
+    assertEquals(result.get(1), Namespace.of("ns2"));
+  }
+
+  @Test
+  public void testListNamespaces_NestedNamespace() throws Exception {
+    Namespace parentNamespace = Namespace.of("parent");
+    SearchResult mockResult = mock(SearchResult.class);
+    List<SearchEntity> entitiesList =
+        Arrays.asList(
+            createSearchEntity("urn:li:container:iceberg__parent.ns1"),
+            createSearchEntity("urn:li:container:iceberg__parent.ns2"));
+    SearchEntityArray entities = new SearchEntityArray();
+    entities.addAll(entitiesList);
+    when(mockResult.getEntities()).thenReturn(entities);
+    when(mockResult.getNumEntities()).thenReturn(2);
+    when(searchService.search(
+            eq(operationContext), any(), eq("*"), any(), any(), eq(0), eq(PAGE_SIZE)))
+        .thenReturn(mockResult);
+
+    List<Namespace> result = catalog.listNamespaces(parentNamespace);
+
+    assertEquals(result.size(), 2);
+    assertEquals(result.get(0), Namespace.of("parent", "ns1"));
+    assertEquals(result.get(1), Namespace.of("parent", "ns2"));
+  }
+
+  @Test
+  public void testDropNamespace() throws Exception {
+    Namespace namespace = Namespace.of("db1");
+    boolean result = catalog.dropNamespace(namespace);
+    assertFalse(result); // Current implementation always returns false
+  }
+
+  @Test
+  public void testListTables() throws Exception {
+    Namespace namespace = Namespace.of("ns1");
+    List<SearchEntity> entitiesList =
+        Arrays.asList(
+            createSearchEntity("urn:li:dataset:iceberg__ns1.table1"),
+            createSearchEntity("urn:li:dataset:iceberg__ns1.table2"));
+    SearchEntityArray entities = new SearchEntityArray();
+    entities.addAll(entitiesList);
+    SearchResult searchResult = new SearchResult();
+    searchResult.setEntities(entities);
+    searchResult.setNumEntities(2);
+
+    // Mock aspect retrieval
+    Map<Urn, List<RecordTemplate>> aspects = new HashMap<>();
+    for (SearchEntity entity : entities) {
+      DatasetProperties props =
+          new DatasetProperties()
+              .setQualifiedName(
+                  "warehouse.ns1.table"
+                      + entity
+                          .getEntity()
+                          .toString()
+                          .charAt(entity.getEntity().toString().length() - 1));
+      aspects.put(entity.getEntity(), Arrays.asList(props));
+    }
+    when(entityService.getLatestAspects(eq(operationContext), any(), any(), eq(false)))
+        .thenReturn(aspects);
+    when(searchService.search(
+            eq(operationContext), any(), any(), any(), any(), eq(0), eq(PAGE_SIZE)))
+        .thenReturn(searchResult);
+
+    List<TableIdentifier> result = catalog.listTables(namespace);
+
+    assertEquals(result.size(), 2);
+    assertEquals(result.get(0), TableIdentifier.of("ns1", "table1"));
+    assertEquals(result.get(1), TableIdentifier.of("ns1", "table2"));
+  }
+
+  @Test
+  public void testListViews() throws Exception {
+    Namespace namespace = Namespace.of("ns1");
+    List<SearchEntity> entitiesList =
+        Arrays.asList(
+            createSearchEntity("urn:li:dataset:iceberg__ns1.view1"),
+            createSearchEntity("urn:li:dataset:iceberg__ns1.view2"));
+    SearchEntityArray entities = new SearchEntityArray();
+    entities.addAll(entitiesList);
+    SearchResult searchResult = new SearchResult();
+    searchResult.setEntities(entities);
+    searchResult.setNumEntities(2);
+
+    // Mock aspect retrieval
+    Map<Urn, List<RecordTemplate>> aspects = new HashMap<>();
+    for (SearchEntity entity : entities) {
+      DatasetProperties props =
+          new DatasetProperties()
+              .setQualifiedName(
+                  "warehouse.ns1.view"
+                      + entity
+                          .getEntity()
+                          .toString()
+                          .charAt(entity.getEntity().toString().length() - 1));
+      aspects.put(entity.getEntity(), Arrays.asList(props));
+    }
+    when(entityService.getLatestAspects(eq(operationContext), any(), any(), eq(false)))
+        .thenReturn(aspects);
+
+    when(searchService.search(
+            eq(operationContext), any(), any(), any(), any(), eq(0), eq(PAGE_SIZE)))
+        .thenReturn(searchResult);
+
+    List<TableIdentifier> result = catalog.listViews(namespace);
+
+    assertEquals(result.size(), 2);
+    assertEquals(result.get(0), TableIdentifier.of("ns1", "view1"));
+    assertEquals(result.get(1), TableIdentifier.of("ns1", "view2"));
+  }
+
+  @Test
+  public void testDropView() throws Exception {
+    TableIdentifier viewIdentifier = TableIdentifier.of("ns1", "view1");
+    when(warehouse.deleteDataset(eq(viewIdentifier))).thenReturn(true);
+
+    boolean result = catalog.dropView(viewIdentifier);
+
+    assertTrue(result);
+    verify(warehouse).deleteDataset(eq(viewIdentifier));
+  }
+
+  @Test
+  public void testUpdateNamespaceProperties() throws Exception {
+    Namespace namespace = Namespace.of("ns1");
+    Map<String, String> existingProps = new HashMap<>();
+    existingProps.put("existing1", "value1");
+    existingProps.put("toRemove1", "value2");
+
+    when(entityService.getLatestAspect(
+            eq(operationContext), any(), eq(CONTAINER_PROPERTIES_ASPECT_NAME)))
+        .thenReturn(new ContainerProperties().setCustomProperties(new StringMap(existingProps)));
+
+    UpdateNamespacePropertiesRequest request =
+        UpdateNamespacePropertiesRequest.builder()
+            .update("new1", "newValue1")
+            .remove("toRemove1")
+            .build();
+
+    UpdateNamespacePropertiesResponse response =
+        catalog.updateNamespaceProperties(namespace, request);
+
+    assertTrue(response.removed().contains("toRemove1"));
+    assertTrue(response.updated().contains("new1"));
+    assertTrue(response.missing().isEmpty());
+
+    ArgumentCaptor<MetadataChangeProposal> mcpCaptor =
+        ArgumentCaptor.forClass(MetadataChangeProposal.class);
+    verify(entityService, atLeastOnce())
+        .ingestProposal(
+            eq(operationContext), mcpCaptor.capture(), any(AuditStamp.class), eq(false));
+
+    // Verify the final properties
+    ContainerProperties expectedProps =
+        new ContainerProperties()
+            .setName("ns1")
+            .setCustomProperties(
+                new StringMap(
+                    Map.of(
+                        "existing1", "value1",
+                        "new1", "newValue1")));
+
+    List<MetadataChangeProposal> mcps = mcpCaptor.getAllValues();
+    MetadataChangeProposal finalMcp = mcps.get(mcps.size() - 1);
+    assertEquals(finalMcp.getAspectName(), "containerProperties");
+    // Note: You might need to add more specific verification of the serialized aspect
+  }
+
+  // Helper method for creating mock search entities
+  private SearchEntity createSearchEntity(String urn) throws Exception {
+    SearchEntity entity = new SearchEntity();
+    entity.setEntity(Urn.createFromString(urn));
+    return entity;
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/S3CredentialProviderTest.java b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/S3CredentialProviderTest.java
new file mode 100644
index 00000000000000..a4915d83d423f7
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/S3CredentialProviderTest.java
@@ -0,0 +1,126 @@
+package io.datahubproject.iceberg.catalog;
+
+import static org.mockito.Mockito.*;
+import static org.testng.Assert.*;
+
+import com.linkedin.metadata.authorization.PoliciesConfig;
+import io.datahubproject.iceberg.catalog.credentials.CredentialProvider;
+import io.datahubproject.iceberg.catalog.credentials.S3CredentialProvider;
+import java.util.Map;
+import java.util.Set;
+import org.apache.iceberg.exceptions.BadRequestException;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.MockitoAnnotations;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.sts.StsClient;
+import software.amazon.awssdk.services.sts.StsClientBuilder;
+import software.amazon.awssdk.services.sts.model.AssumeRoleRequest;
+import software.amazon.awssdk.services.sts.model.AssumeRoleResponse;
+import software.amazon.awssdk.services.sts.model.Credentials;
+
+public class S3CredentialProviderTest {
+
+  private CredentialProvider.StorageProviderCredentials storageProviderCreds;
+  private CredentialProvider.CredentialsCacheKey cacheKey;
+
+  @Mock private StsClient stsClient;
+
+  private S3CredentialProvider credentialProvider;
+
+  @Mock private StsClientBuilder stsClientBuilder;
+
+  @BeforeMethod
+  public void setUp() {
+
+    MockitoAnnotations.openMocks(this);
+
+    storageProviderCreds =
+        new CredentialProvider.StorageProviderCredentials(
+            "testClientId",
+            "testClientSecret",
+            "arn:aws:iam::123456789012:role/test-role",
+            "us-east-1",
+            null);
+
+    cacheKey =
+        new CredentialProvider.CredentialsCacheKey(
+            "testPlatform",
+            PoliciesConfig.DATA_READ_ONLY_PRIVILEGE,
+            Set.of("s3://test-bucket/path/to/data"));
+
+    credentialProvider = new S3CredentialProvider();
+  }
+
+  @Test
+  public void testGetCredentials() {
+    StsClientBuilder builderMock = mock(StsClientBuilder.class);
+    StsClient clientMock = mock(StsClient.class);
+
+    // Mock the builder chain
+    when(builderMock.region(any(Region.class))).thenReturn(builderMock);
+    when(builderMock.credentialsProvider(any(StaticCredentialsProvider.class)))
+        .thenReturn(builderMock);
+    when(builderMock.build()).thenReturn(clientMock);
+
+    AssumeRoleResponse assumeRoleResponse =
+        AssumeRoleResponse.builder()
+            .credentials(
+                Credentials.builder()
+                    .accessKeyId("testAccessId-temp")
+                    .secretAccessKey("testSecretKey-temp")
+                    .sessionToken("testSessionToken-temp")
+                    .expiration(java.time.Instant.now().plusSeconds(900))
+                    .build())
+            .build();
+    when(clientMock.assumeRole(any(AssumeRoleRequest.class))).thenReturn(assumeRoleResponse);
+
+    try (MockedStatic<StsClient> stsClientMockedStatic = mockStatic(StsClient.class)) {
+      // Mock the static builder() method
+      stsClientMockedStatic.when(StsClient::builder).thenReturn(builderMock);
+
+      /*        "client.region",
+       REGION.id(),
+       "s3.access-key-id",
+       response.credentials().accessKeyId(),
+       "s3.secret-access-key",
+       response.credentials().secretAccessKey(),
+       "s3.session-token",
+       response.credentials().sessionToken());
+
+      */
+
+      Map<String, String> creds = credentialProvider.getCredentials(cacheKey, storageProviderCreds);
+      assertNotNull(creds);
+      assertEquals(creds.get("client.region"), Region.of("us-east-1").id());
+      assertEquals(creds.get("s3.access-key-id"), "testAccessId-temp");
+      assertEquals(creds.get("s3.secret-access-key"), "testSecretKey-temp");
+      assertEquals(creds.get("s3.session-token"), "testSessionToken-temp");
+    }
+  }
+
+  @Test(expectedExceptions = IllegalStateException.class)
+  public void testGetWithUnsupportedPrivilege() {
+    S3CredentialProvider provider = new S3CredentialProvider();
+    CredentialProvider.CredentialsCacheKey keyWithUnsupportedPrivilege =
+        new CredentialProvider.CredentialsCacheKey(
+            "testPlatform",
+            PoliciesConfig.DATA_MANAGE_TABLES_PRIVILEGE,
+            Set.of("s3://test-bucket/path/to/data"));
+
+    provider.getCredentials(keyWithUnsupportedPrivilege, storageProviderCreds);
+  }
+
+  @Test(expectedExceptions = BadRequestException.class)
+  public void testGetWithEmptyLocations() {
+    S3CredentialProvider provider = new S3CredentialProvider();
+    CredentialProvider.CredentialsCacheKey keyWithEmptyLocations =
+        new CredentialProvider.CredentialsCacheKey(
+            "testPlatform", PoliciesConfig.DATA_READ_ONLY_PRIVILEGE, Set.of());
+
+    provider.getCredentials(keyWithEmptyLocations, storageProviderCreds);
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/UtilsTest.java b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/UtilsTest.java
new file mode 100644
index 00000000000000..f7eb654c59f6a4
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/UtilsTest.java
@@ -0,0 +1,143 @@
+package io.datahubproject.iceberg.catalog;
+
+import static org.mockito.Mockito.*;
+import static org.testng.Assert.*;
+
+import com.linkedin.common.AuditStamp;
+import com.linkedin.common.urn.DataPlatformUrn;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.events.metadata.ChangeType;
+import com.linkedin.metadata.Constants;
+import com.linkedin.mxe.MetadataChangeProposal;
+import java.util.Map;
+import java.util.Set;
+import org.apache.iceberg.TableMetadata;
+import org.apache.iceberg.TableProperties;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class UtilsTest {
+
+  @Mock private TableMetadata mockTableMetadata;
+
+  @BeforeMethod
+  public void setup() {
+    MockitoAnnotations.initMocks(this);
+  }
+
+  @Test
+  public void testAuditStamp() {
+    AuditStamp stamp = Utils.auditStamp();
+    assertNotNull(stamp);
+    assertEquals(stamp.getActor().toString(), Constants.SYSTEM_ACTOR);
+    assertTrue(stamp.getTime() > 0);
+  }
+
+  @Test
+  public void testPlatformInstanceMcp() {
+    String platformInstance = "testInstance";
+    String entityType = "dataset";
+    Urn urn = Utils.platformUrn();
+
+    MetadataChangeProposal mcp = Utils.platformInstanceMcp(platformInstance, urn, entityType);
+
+    assertNotNull(mcp);
+    assertEquals(mcp.getEntityUrn(), urn);
+    assertEquals(mcp.getEntityType(), entityType);
+    assertEquals(mcp.getAspectName(), Constants.DATA_PLATFORM_INSTANCE_ASPECT_NAME);
+    assertEquals(mcp.getChangeType(), ChangeType.UPSERT);
+  }
+
+  @Test
+  public void testPlatformUrn() {
+    DataPlatformUrn urn = Utils.platformUrn();
+    assertNotNull(urn);
+    assertEquals(urn.getPlatformNameEntity(), "iceberg");
+    assertEquals(urn.getEntityType(), "dataPlatform");
+  }
+
+  @Test
+  public void testContainerUrn() {
+    String platformInstance = "testInstance";
+    Namespace namespace = Namespace.of("db", "schema");
+
+    Urn containerUrn = Utils.containerUrn(platformInstance, namespace);
+
+    assertNotNull(containerUrn);
+    assertEquals(containerUrn.toString(), "urn:li:container:iceberg__testInstance.db.schema");
+  }
+
+  @Test
+  public void testLocations() {
+    String mainLocation = "s3://bucket/main";
+    String writeDataLocation = "s3://bucket/main/data";
+    String writeMetadataLocation = "s3://bucket/main/metadata";
+
+    Map<String, String> properties = mock(Map.class);
+    when(properties.containsKey(TableProperties.WRITE_DATA_LOCATION)).thenReturn(true);
+    when(properties.containsKey(TableProperties.WRITE_METADATA_LOCATION)).thenReturn(true);
+    when(properties.get(TableProperties.WRITE_DATA_LOCATION)).thenReturn(writeDataLocation);
+    when(properties.get(TableProperties.WRITE_METADATA_LOCATION)).thenReturn(writeMetadataLocation);
+
+    when(mockTableMetadata.location()).thenReturn(mainLocation);
+    when(mockTableMetadata.properties()).thenReturn(properties);
+
+    Set<String> locations = Utils.locations(mockTableMetadata);
+
+    assertEquals(locations.size(), 3);
+    assertTrue(locations.contains(mainLocation));
+    assertTrue(locations.contains(writeDataLocation));
+    assertTrue(locations.contains(writeMetadataLocation));
+  }
+
+  public void testEmptyLocations() {
+    String mainLocation = "s3://bucket/main";
+    String writeDataLocation = "s3://bucket/main/data";
+    String writeMetadataLocation = "s3://bucket/main/metadata";
+
+    Map<String, String> properties = mock(Map.class);
+    when(properties.containsKey(TableProperties.WRITE_DATA_LOCATION)).thenReturn(false);
+    when(properties.containsKey(TableProperties.WRITE_METADATA_LOCATION)).thenReturn(false);
+    when(properties.get(TableProperties.WRITE_DATA_LOCATION)).thenReturn(writeDataLocation);
+    when(properties.get(TableProperties.WRITE_METADATA_LOCATION)).thenReturn(writeMetadataLocation);
+
+    when(mockTableMetadata.location()).thenReturn(mainLocation);
+    when(mockTableMetadata.properties()).thenReturn(properties);
+
+    Set<String> locations = Utils.locations(mockTableMetadata);
+
+    assertEquals(locations.size(), 1);
+    assertTrue(locations.contains(mainLocation));
+  }
+
+  @Test
+  public void testNamespaceFromString() {
+    String namespaceStr = "db\u001fschema"; // Note, separator is \u001f
+    Namespace namespace = Utils.namespaceFromString(namespaceStr);
+
+    assertNotNull(namespace);
+    assertEquals(namespace.levels(), new String[] {"db", "schema"});
+  }
+
+  @Test
+  public void testTableIdFromString() {
+    String namespace = "db\u001fschema";
+    String table = "mytable";
+
+    TableIdentifier tableId = Utils.tableIdFromString(namespace, table);
+
+    assertNotNull(tableId);
+    assertEquals(tableId.toString(), "db.schema.mytable");
+  }
+
+  @Test
+  public void testParentDir() {
+    String fileLocation = "s3://bucket/path/to/file.txt";
+    String parentDir = Utils.parentDir(fileLocation);
+    assertEquals(parentDir, "s3://bucket/path/to");
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/common/IcebergExceptionHandlerAdviceTest.java b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/common/IcebergExceptionHandlerAdviceTest.java
new file mode 100644
index 00000000000000..01aa1136812f9b
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/common/IcebergExceptionHandlerAdviceTest.java
@@ -0,0 +1,147 @@
+package io.datahubproject.iceberg.catalog.rest.common;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
+import org.apache.iceberg.exceptions.*;
+import org.apache.iceberg.rest.responses.ErrorResponse;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class IcebergExceptionHandlerAdviceTest {
+
+  private IcebergExceptionHandlerAdvice exceptionHandler;
+  private static final String TEST_ERROR_MESSAGE = "Test error message";
+
+  @BeforeMethod
+  public void setUp() {
+    exceptionHandler = new IcebergExceptionHandlerAdvice();
+  }
+
+  @Test
+  public void testHandleAlreadyExistsException() {
+    // Arrange
+    AlreadyExistsException exception = new AlreadyExistsException(TEST_ERROR_MESSAGE);
+
+    // Act
+    ResponseEntity<?> response = exceptionHandler.handle(exception);
+    ErrorResponse errorResponse = (ErrorResponse) response.getBody();
+
+    // Assert
+    assertEquals(response.getStatusCode(), HttpStatus.CONFLICT);
+    assertErrorResponse(
+        errorResponse, HttpStatus.CONFLICT.value(), TEST_ERROR_MESSAGE, "AlreadyExistsException");
+  }
+
+  @Test
+  public void testHandleNoSuchNamespaceException() {
+    // Arrange
+    NoSuchNamespaceException exception = new NoSuchNamespaceException(TEST_ERROR_MESSAGE);
+
+    // Act
+    ResponseEntity<?> response = exceptionHandler.handle(exception);
+    ErrorResponse errorResponse = (ErrorResponse) response.getBody();
+
+    // Assert
+    assertEquals(response.getStatusCode(), HttpStatus.NOT_FOUND);
+    assertErrorResponse(
+        errorResponse,
+        HttpStatus.NOT_FOUND.value(),
+        TEST_ERROR_MESSAGE,
+        "NoSuchNamespaceException");
+  }
+
+  @Test
+  public void testHandleNoSuchTableException() {
+    // Arrange
+    NoSuchTableException exception = new NoSuchTableException(TEST_ERROR_MESSAGE);
+
+    // Act
+    ResponseEntity<?> response = exceptionHandler.handle(exception);
+    ErrorResponse errorResponse = (ErrorResponse) response.getBody();
+
+    // Assert
+    assertEquals(response.getStatusCode(), HttpStatus.NOT_FOUND);
+    assertErrorResponse(
+        errorResponse, HttpStatus.NOT_FOUND.value(), TEST_ERROR_MESSAGE, "NoSuchTableException");
+  }
+
+  @Test
+  public void testHandleNoSuchViewException() {
+    // Arrange
+    NoSuchViewException exception = new NoSuchViewException(TEST_ERROR_MESSAGE);
+
+    // Act
+    ResponseEntity<?> response = exceptionHandler.handle(exception);
+    ErrorResponse errorResponse = (ErrorResponse) response.getBody();
+
+    // Assert
+    assertEquals(response.getStatusCode(), HttpStatus.NOT_FOUND);
+    assertErrorResponse(
+        errorResponse, HttpStatus.NOT_FOUND.value(), TEST_ERROR_MESSAGE, "NoSuchViewException");
+  }
+
+  @Test
+  public void testHandleNotFoundException() {
+    // Arrange
+    NotFoundException exception = new NotFoundException(TEST_ERROR_MESSAGE);
+
+    // Act
+    ResponseEntity<?> response = exceptionHandler.handle(exception);
+    ErrorResponse errorResponse = (ErrorResponse) response.getBody();
+
+    // Assert
+    assertEquals(response.getStatusCode(), HttpStatus.NOT_FOUND);
+    assertErrorResponse(
+        errorResponse, HttpStatus.NOT_FOUND.value(), TEST_ERROR_MESSAGE, "NotFoundException");
+  }
+
+  @Test
+  public void testHandleForbiddenException() {
+    // Arrange
+    ForbiddenException exception = new ForbiddenException(TEST_ERROR_MESSAGE);
+
+    // Act
+    ResponseEntity<?> response = exceptionHandler.handle(exception);
+    ErrorResponse errorResponse = (ErrorResponse) response.getBody();
+
+    // Assert
+    assertEquals(response.getStatusCode(), HttpStatus.FORBIDDEN);
+    assertErrorResponse(
+        errorResponse, HttpStatus.FORBIDDEN.value(), TEST_ERROR_MESSAGE, "ForbiddenException");
+  }
+
+  @Test
+  public void testHandleBadRequestException() {
+    // Arrange
+    BadRequestException exception = new BadRequestException(TEST_ERROR_MESSAGE);
+
+    // Act
+    ResponseEntity<?> response = exceptionHandler.handle(exception);
+    ErrorResponse errorResponse = (ErrorResponse) response.getBody();
+
+    // Assert
+    assertEquals(response.getStatusCode(), HttpStatus.BAD_REQUEST);
+    assertErrorResponse(
+        errorResponse, HttpStatus.BAD_REQUEST.value(), TEST_ERROR_MESSAGE, "BadRequestException");
+  }
+
+  @Test(expectedExceptions = RuntimeException.class)
+  public void testHandleGenericException() throws Exception {
+    // Arrange
+    RuntimeException exception = new RuntimeException(TEST_ERROR_MESSAGE);
+
+    // Act & Assert
+    exceptionHandler.handle(exception);
+  }
+
+  private void assertErrorResponse(
+      ErrorResponse errorResponse, int expectedCode, String expectedMessage, String expectedType) {
+    assertNotNull(errorResponse, "Error response should not be null");
+    assertEquals(errorResponse.code(), expectedCode, "Response code should match");
+    assertEquals(errorResponse.message(), expectedMessage, "Error message should match");
+    assertEquals(errorResponse.type(), expectedType, "Error type should match");
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/open/PublicIcebergApiControllerTest.java b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/open/PublicIcebergApiControllerTest.java
new file mode 100644
index 00000000000000..b224ce28771a9b
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/open/PublicIcebergApiControllerTest.java
@@ -0,0 +1,141 @@
+package io.datahubproject.iceberg.catalog.rest.open;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+import static org.testng.Assert.*;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.linkedin.common.GlobalTags;
+import com.linkedin.common.TagAssociation;
+import com.linkedin.common.TagAssociationArray;
+import com.linkedin.common.urn.TagUrn;
+import com.linkedin.dataset.IcebergCatalogInfo;
+import com.linkedin.metadata.Constants;
+import com.linkedin.platformresource.PlatformResourceInfo;
+import io.datahubproject.iceberg.catalog.DataHubIcebergWarehouse;
+import io.datahubproject.iceberg.catalog.rest.secure.AbstractControllerTest;
+import java.io.IOException;
+import java.io.InputStream;
+import org.apache.iceberg.TableMetadata;
+import org.apache.iceberg.TableMetadataParser;
+import org.apache.iceberg.exceptions.NotFoundException;
+import org.apache.iceberg.rest.responses.ConfigResponse;
+import org.apache.iceberg.rest.responses.LoadTableResponse;
+import org.apache.iceberg.util.JsonUtil;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class PublicIcebergApiControllerTest
+    extends AbstractControllerTest<PublicIcebergApiController> {
+
+  private static final String PUBLIC_TAG = "public-read";
+
+  @BeforeMethod
+  @Override
+  public void setup() throws Exception {
+    super.setup();
+    ReflectionTestUtils.setField(controller, "isPublicReadEnabled", true);
+    ReflectionTestUtils.setField(controller, "publiclyReadableTag", PUBLIC_TAG);
+  }
+
+  @Test(expectedExceptions = NotFoundException.class)
+  public void testGetConfigPublicReadDisabled() {
+    ReflectionTestUtils.setField(controller, "isPublicReadEnabled", false);
+    controller.getConfig("test-warehouse");
+  }
+
+  @Test(expectedExceptions = NotFoundException.class)
+  public void testGetConfigPublicReadDisabledWithEmptyTags() {
+    ReflectionTestUtils.setField(controller, "isPublicReadEnabled", true);
+    ReflectionTestUtils.setField(controller, "publiclyReadableTag", null);
+    controller.getConfig("test-warehouse");
+  }
+
+  @Test
+  public void testGetConfigValidWarehouse() {
+    // String warehouseName = "test-warehouse";
+    ConfigResponse response = controller.getConfig(TEST_PLATFORM);
+
+    assertNotNull(response, "Config response should not be null");
+    assertNotNull(response.overrides(), "Overrides map should not be null");
+    assertTrue(response.overrides().containsKey("prefix"), "Overrides should contain 'prefix' key");
+    assertEquals(
+        response.overrides().get("prefix"),
+        TEST_PLATFORM,
+        "Warehouse name should match in the config override");
+  }
+
+  // @Test  Seems to fail only in CI due to resource path. Disabling to unblock
+  public void testLoadTableWithPublicTag() throws Exception {
+    // Setup public tag
+    TagUrn publicTagUrn = TagUrn.createFromString("urn:li:tag:" + PUBLIC_TAG);
+    GlobalTags tags = new GlobalTags();
+    TagAssociation tagAssociation = new TagAssociation();
+    tagAssociation.setTag(publicTagUrn);
+    TagAssociationArray tagAssociations = new TagAssociationArray();
+    tagAssociations.add(tagAssociation);
+    tags.setTags(tagAssociations);
+
+    // Mock entity service response
+    Mockito.when(entityService.getLatestAspect(any(), any(), eq(Constants.GLOBAL_TAGS_ASPECT_NAME)))
+        .thenReturn(tags);
+
+    IcebergCatalogInfo metadata = new IcebergCatalogInfo();
+    metadata.setMetadataPointer(TEST_METADATA_LOCATION);
+    metadata.setView(false);
+    Mockito.when(
+            entityService.getLatestAspect(
+                any(), any(), eq(DataHubIcebergWarehouse.DATASET_ICEBERG_METADATA_ASPECT_NAME)))
+        .thenReturn(metadata);
+
+    PlatformResourceInfo platformResourceInfo = new PlatformResourceInfo();
+    platformResourceInfo.setPrimaryKey(
+        "urn:li:dataset:(urn:li:dataPlatform:iceberg," + TEST_PLATFORM + "._uuid__,PROD)");
+    Mockito.when(
+            entityService.getLatestAspect(
+                any(), any(), eq(Constants.PLATFORM_RESOURCE_INFO_ASPECT_NAME)))
+        .thenReturn(platformResourceInfo);
+
+    TableMetadata sampleMetadata = loadSampleMetadata();
+    try (MockedStatic<TableMetadataParser> tableMetadataParserMock =
+        mockStatic(TableMetadataParser.class)) {
+      tableMetadataParserMock
+          .when(() -> TableMetadataParser.read(any(), anyString()))
+          .thenReturn(sampleMetadata);
+
+      LoadTableResponse response =
+          controller.loadTable(TEST_PLATFORM, TEST_NAMESPACE, TEST_TABLE, null, null);
+
+      assertNotNull(response, "Load table response should not be null");
+    }
+  }
+
+  TableMetadata loadSampleMetadata() {
+    try {
+      InputStream is = getClass().getClassLoader().getResourceAsStream("sample.metadata.json");
+      return TableMetadataParser.fromJson(
+          TEST_METADATA_LOCATION, JsonUtil.mapper().readValue(is, JsonNode.class));
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Test(expectedExceptions = org.apache.iceberg.exceptions.NoSuchTableException.class)
+  public void testLoadTableWithoutPublicTag() throws Exception {
+    // Mock entity service response with empty tags
+    GlobalTags tags = new GlobalTags();
+    Mockito.when(entityService.getLatestAspect(any(), any(), eq(Constants.GLOBAL_TAGS_ASPECT_NAME)))
+        .thenReturn(tags);
+
+    controller.loadTable(TEST_PLATFORM, TEST_NAMESPACE, TEST_TABLE, null, null);
+  }
+
+  @Override
+  protected PublicIcebergApiController newController() {
+    return new PublicIcebergApiController();
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/secure/AbstractControllerTest.java b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/secure/AbstractControllerTest.java
new file mode 100644
index 00000000000000..15ca1dd2b59693
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/secure/AbstractControllerTest.java
@@ -0,0 +1,161 @@
+package io.datahubproject.iceberg.catalog.rest.secure;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+import com.datahub.authentication.Actor;
+import com.datahub.authentication.ActorType;
+import com.datahub.authentication.Authentication;
+import com.datahub.authentication.AuthenticationContext;
+import com.datahub.authorization.AuthorizationRequest;
+import com.datahub.authorization.AuthorizationResult;
+import com.datahub.plugins.auth.authorization.Authorizer;
+import com.google.common.net.HttpHeaders;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.dataplatforminstance.IcebergWarehouseInfo;
+import com.linkedin.metadata.entity.EntityService;
+import com.linkedin.metadata.search.EntitySearchService;
+import com.linkedin.secret.DataHubSecretValue;
+import io.datahubproject.iceberg.catalog.DataHubIcebergWarehouse;
+import io.datahubproject.iceberg.catalog.Utils;
+import io.datahubproject.iceberg.catalog.credentials.CredentialProvider;
+import io.datahubproject.metadata.context.OperationContext;
+import io.datahubproject.metadata.services.SecretService;
+import io.datahubproject.test.metadata.context.TestOperationContexts;
+import jakarta.servlet.http.HttpServletRequest;
+import java.lang.reflect.Field;
+import java.util.*;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.testng.annotations.BeforeMethod;
+
+public abstract class AbstractControllerTest<T extends AbstractIcebergController> {
+  protected static final String TEST_PLATFORM = "test-platform";
+  protected static final String TEST_USER = "test-user";
+  protected static final String TEST_CREDENTIALS = "test-credentials";
+
+  protected static final String TEST_NAMESPACE = "test_namespace";
+  protected static final String TEST_TABLE = "test_table";
+  protected static final String TEST_METADATA_LOCATION =
+      "s3://test-location/test_table/sample.metadata.json";
+
+  @Mock protected EntityService entityService;
+  @Mock protected CredentialProvider credentialProvider;
+  @Mock protected Authorizer authorizer;
+  @Mock protected HttpServletRequest request;
+  @Mock protected SecretService secretService;
+  @Mock protected EntitySearchService entitySearchService;
+
+  private OperationContext systemOperationContext;
+  private Authentication authentication;
+  private Actor actor;
+  private IcebergWarehouseInfo icebergWarehouse;
+  @Mock private RecordTemplate warehouseAspect;
+  protected T controller;
+
+  @BeforeMethod
+  public void setup() throws Exception {
+    MockitoAnnotations.openMocks(this);
+    when(request.getHeader(HttpHeaders.X_FORWARDED_FOR)).thenReturn("1.2.3.4");
+    setupAuthentication();
+    setupController();
+    setupWarehouseConfiguration();
+    onSetup();
+  }
+
+  private void setupAuthentication() {
+    actor = new Actor(ActorType.USER, TEST_USER);
+    authentication = new Authentication(actor, TEST_CREDENTIALS, Collections.emptyMap());
+    AuthenticationContext.setAuthentication(authentication);
+  }
+
+  private void setupController() throws Exception {
+    controller = newController();
+    systemOperationContext =
+        TestOperationContexts.systemContext(null, null, null, null, null, null, null, null);
+
+    // Inject dependencies
+    injectControllerDependencies();
+    setupDefaultAuthorization(true);
+  }
+
+  private void injectControllerDependencies() throws Exception {
+    injectField("entityService", entityService);
+    injectField("secretService", secretService);
+    injectField("authorizer", authorizer);
+    injectField("systemOperationContext", systemOperationContext);
+    injectField("cachingCredentialProvider", credentialProvider);
+  }
+
+  protected void setupDefaultAuthorization(boolean isAuthorized) {
+    AuthorizationResult.Type resultType =
+        isAuthorized ? AuthorizationResult.Type.ALLOW : AuthorizationResult.Type.DENY;
+    String message = isAuthorized ? "Authorized" : "Not authorized";
+
+    when(authorizer.authorize(any(AuthorizationRequest.class)))
+        .thenReturn(new AuthorizationResult(mock(AuthorizationRequest.class), resultType, message));
+  }
+
+  private void injectField(String fieldName, Object value) throws Exception {
+    Field field = AbstractIcebergController.class.getDeclaredField(fieldName);
+    field.setAccessible(true);
+    field.set(controller, value);
+  }
+
+  private IcebergWarehouseInfo createTestWarehouse() throws Exception {
+    IcebergWarehouseInfo warehouse = new IcebergWarehouseInfo();
+    warehouse.setClientId(Urn.createFromString("urn:li:secret:clientId"));
+    warehouse.setClientSecret(Urn.createFromString("urn:li:secret:clientSecret"));
+    warehouse.setDataRoot("s3://data-root/test/");
+    warehouse.setRegion("us-east-1");
+    warehouse.setRole("testRole");
+    return warehouse;
+  }
+
+  private void setupWarehouseConfiguration() throws Exception {
+    // Configure warehouse settings
+    icebergWarehouse = createTestWarehouse();
+    setupWarehouseMocks();
+    setupSecretValues();
+  }
+
+  private void setupWarehouseMocks() {
+    when(entityService.getLatestAspect(
+            any(),
+            eq(Utils.platformInstanceUrn(TEST_PLATFORM)),
+            eq(DataHubIcebergWarehouse.DATAPLATFORM_INSTANCE_ICEBERG_WAREHOUSE_ASPECT_NAME)))
+        .thenReturn(warehouseAspect);
+    when(warehouseAspect.data()).thenReturn(icebergWarehouse.data());
+  }
+
+  private void setupSecretValues() throws Exception {
+
+    String clientId = "testClientId";
+    String clientSecret = "testClientSecret";
+    when(secretService.decrypt(clientId)).thenReturn("decrypt-" + clientId);
+    when(secretService.decrypt(clientSecret)).thenReturn("decrypt-" + clientSecret);
+
+    DataHubSecretValue clientIdValue = new DataHubSecretValue();
+    clientIdValue.setValue("testClientId");
+
+    DataHubSecretValue clientSecretValue = new DataHubSecretValue();
+    clientSecretValue.setValue("testClientSecret");
+
+    Map<Urn, List<RecordTemplate>> aspectsMap = new HashMap<>();
+    aspectsMap.put(icebergWarehouse.getClientId(), Arrays.asList(clientIdValue));
+    aspectsMap.put(icebergWarehouse.getClientSecret(), Arrays.asList(clientSecretValue));
+
+    when(entityService.getLatestAspects(
+            any(),
+            eq(Set.of(icebergWarehouse.getClientId(), icebergWarehouse.getClientSecret())),
+            eq(Set.of("dataHubSecretValue")),
+            eq(false)))
+        .thenReturn(aspectsMap);
+  }
+
+  protected void onSetup() {}
+
+  protected abstract T newController();
+}
diff --git a/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergConfigApiControllerTest.java b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergConfigApiControllerTest.java
new file mode 100644
index 00000000000000..6d46fee474b9ff
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergConfigApiControllerTest.java
@@ -0,0 +1,56 @@
+package io.datahubproject.iceberg.catalog.rest.secure;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.testng.Assert.*;
+
+import io.datahubproject.iceberg.catalog.DataHubIcebergWarehouse;
+import org.apache.iceberg.exceptions.NotFoundException;
+import org.apache.iceberg.rest.responses.ConfigResponse;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.testng.annotations.Test;
+
+public class IcebergConfigApiControllerTest
+    extends AbstractControllerTest<IcebergConfigApiController> {
+
+  @Test(expectedExceptions = NotFoundException.class)
+  public void testGetConfigNonExistentWarehouse() {
+    String warehouseName = "test-warehouse";
+
+    try (MockedStatic<DataHubIcebergWarehouse> warehouseMock =
+        Mockito.mockStatic(DataHubIcebergWarehouse.class)) {
+      warehouseMock
+          .when(() -> DataHubIcebergWarehouse.of(eq(warehouseName), any(), any(), any()))
+          .thenThrow(new NotFoundException(""));
+      controller.getConfig(request, warehouseName);
+    }
+  }
+
+  @Test
+  public void testGetConfigValidWarehouse() {
+    String warehouseName = "test-warehouse";
+
+    try (MockedStatic<DataHubIcebergWarehouse> warehouseMock =
+        Mockito.mockStatic(DataHubIcebergWarehouse.class)) {
+      warehouseMock
+          .when(() -> DataHubIcebergWarehouse.of(eq(warehouseName), any(), any(), any()))
+          .thenReturn(null);
+      ConfigResponse response = controller.getConfig(request, warehouseName);
+
+      assertNotNull(response, "Config response should not be null");
+      assertNotNull(response.overrides(), "Overrides map should not be null");
+      assertTrue(
+          response.overrides().containsKey("prefix"), "Overrides should contain 'prefix' key");
+      assertEquals(
+          response.overrides().get("prefix"),
+          warehouseName,
+          "Warehouse name should match in the config override");
+    }
+  }
+
+  @Override
+  protected IcebergConfigApiController newController() {
+    return new IcebergConfigApiController();
+  }
+}
diff --git a/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergNamespaceApiControllerTest.java b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergNamespaceApiControllerTest.java
new file mode 100644
index 00000000000000..42b1e24fc65dec
--- /dev/null
+++ b/metadata-service/iceberg-catalog/src/test/java/io/datahubproject/iceberg/catalog/rest/secure/IcebergNamespaceApiControllerTest.java
@@ -0,0 +1,92 @@
+package io.datahubproject.iceberg.catalog.rest.secure;
+
+import static com.linkedin.metadata.Constants.CONTAINER_PROPERTIES_ASPECT_NAME;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+import static org.testng.Assert.*;
+
+import com.linkedin.common.urn.Urn;
+import com.linkedin.container.ContainerProperties;
+import io.datahubproject.iceberg.catalog.Utils;
+import io.datahubproject.metadata.context.OperationContext;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.exceptions.ForbiddenException;
+import org.apache.iceberg.exceptions.NoSuchNamespaceException;
+import org.apache.iceberg.rest.requests.CreateNamespaceRequest;
+import org.apache.iceberg.rest.responses.*;
+import org.testng.annotations.*;
+
+public class IcebergNamespaceApiControllerTest
+    extends AbstractControllerTest<IcebergNamespaceApiController> {
+
+  private static final String TEST_PLATFORM = "test-platform";
+  private Namespace namespace;
+  private String namespaceString;
+
+  @Override
+  public void onSetup() {
+    setupNamespace();
+  }
+
+  @Override
+  protected IcebergNamespaceApiController newController() {
+    return new IcebergNamespaceApiController();
+  }
+
+  private void setupNamespace() {
+    Namespace namespaceParent = Namespace.of("db");
+    namespace = Namespace.of("db", "schema");
+    namespaceString = "db\u001fschema";
+
+    Urn parentContainerUrn = Utils.containerUrn(TEST_PLATFORM, namespaceParent);
+    Urn containerUrn = Utils.containerUrn(TEST_PLATFORM, namespace);
+
+    doReturn(true).when(entityService).exists(any(OperationContext.class), eq(parentContainerUrn));
+
+    ContainerProperties containerProperties = new ContainerProperties();
+    when(entityService.getLatestAspect(
+            any(OperationContext.class), eq(containerUrn), eq(CONTAINER_PROPERTIES_ASPECT_NAME)))
+        .thenReturn(containerProperties);
+  }
+
+  @Test
+  public void testGetNamespace() throws Exception {
+    GetNamespaceResponse response =
+        controller.getNamespace(request, TEST_PLATFORM, namespaceString);
+
+    assertNotNull(response);
+    assertEquals(response.namespace(), namespace);
+  }
+
+  @Test
+  public void testCreateNamespace() throws Exception {
+    CreateNamespaceRequest createRequest =
+        CreateNamespaceRequest.builder().withNamespace(namespace).build();
+
+    CreateNamespaceResponse response =
+        controller.createNamespace(request, TEST_PLATFORM, createRequest);
+
+    assertNotNull(response);
+    assertEquals(response.namespace(), namespace);
+  }
+
+  @Test(expectedExceptions = ForbiddenException.class)
+  public void testCreateNamespaceUnauthorized() throws Exception {
+    setupDefaultAuthorization(false);
+    CreateNamespaceRequest createRequest =
+        CreateNamespaceRequest.builder().withNamespace(namespace).build();
+
+    controller.createNamespace(request, TEST_PLATFORM, createRequest);
+  }
+
+  @Test(expectedExceptions = NoSuchNamespaceException.class)
+  public void testGetNamespaceNonexistent() throws Exception {
+    String missingNamespaceString = "db\u001fschema2";
+    Namespace missingNamespace = Namespace.of("db", "schema2");
+    Urn containerUrn = Utils.containerUrn(TEST_PLATFORM, missingNamespace);
+
+    doReturn(false).when(entityService).exists(any(OperationContext.class), eq(containerUrn));
+    controller.getNamespace(request, TEST_PLATFORM, missingNamespaceString);
+  }
+}
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/GlobalControllerExceptionHandler.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/GlobalControllerExceptionHandler.java
index b78121573811f6..4809b483b74de1 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/GlobalControllerExceptionHandler.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/GlobalControllerExceptionHandler.java
@@ -22,7 +22,8 @@
 import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver;
 
 @Slf4j
-@ControllerAdvice
+@ControllerAdvice(
+    basePackages = {"io.datahubproject.openapi", "com.datahub.graphql", "com.datahub.auth"})
 public class GlobalControllerExceptionHandler extends DefaultHandlerExceptionResolver {
 
   @PostConstruct
diff --git a/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/config/SpringWebSchemaRegistryConfig.java b/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/config/SpringWebSchemaRegistryConfig.java
index c2200eef6e60f5..56b4e575301799 100644
--- a/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/config/SpringWebSchemaRegistryConfig.java
+++ b/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/config/SpringWebSchemaRegistryConfig.java
@@ -8,7 +8,6 @@
 import io.swagger.v3.oas.annotations.info.Info;
 import io.swagger.v3.oas.annotations.servers.Server;
 import jakarta.servlet.http.HttpServletRequest;
-import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -16,13 +15,7 @@
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
-import org.springframework.http.converter.ByteArrayHttpMessageConverter;
-import org.springframework.http.converter.FormHttpMessageConverter;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Slf4j
 @EnableWebMvc
@@ -35,7 +28,7 @@
     havingValue = InternalSchemaRegistryFactory.TYPE)
 @Configuration
 @ComponentScan(basePackages = {"io.datahubproject.openapi.schema.registry"})
-public class SpringWebSchemaRegistryConfig implements WebMvcConfigurer {
+public class SpringWebSchemaRegistryConfig {
 
   @Bean
   public SchemaRegistryController schemaRegistryController(
@@ -44,12 +37,4 @@ public SchemaRegistryController schemaRegistryController(
       @Qualifier("schemaRegistryService") SchemaRegistryService schemaRegistryService) {
     return new SchemaRegistryController(objectMapper, request, schemaRegistryService);
   }
-
-  @Override
-  public void configureMessageConverters(List<HttpMessageConverter<?>> messageConverters) {
-    messageConverters.add(new StringHttpMessageConverter());
-    messageConverters.add(new ByteArrayHttpMessageConverter());
-    messageConverters.add(new FormHttpMessageConverter());
-    messageConverters.add(new MappingJackson2HttpMessageConverter());
-  }
 }
diff --git a/metadata-service/war/build.gradle b/metadata-service/war/build.gradle
index d83b29c4ad82bc..59e0f3d80a24ae 100644
--- a/metadata-service/war/build.gradle
+++ b/metadata-service/war/build.gradle
@@ -23,6 +23,8 @@ dependencies {
   implementation project(':metadata-service:openapi-entity-servlet')
   implementation project(':metadata-service:openapi-analytics-servlet')
   implementation project(':metadata-service:schema-registry-servlet')
+  implementation project(':metadata-service:iceberg-catalog')
+  implementation 'org.apache.iceberg:iceberg-core:1.6.1'
   runtimeOnly project(':metadata-jobs:mce-consumer')
   runtimeOnly project(':metadata-jobs:mae-consumer')
   runtimeOnly project(':metadata-jobs:pe-consumer')
diff --git a/metadata-service/war/src/main/java/com/linkedin/gms/ServletConfig.java b/metadata-service/war/src/main/java/com/linkedin/gms/ServletConfig.java
index fbd8d72b76c8f2..e09b38a4f1dbb4 100644
--- a/metadata-service/war/src/main/java/com/linkedin/gms/ServletConfig.java
+++ b/metadata-service/war/src/main/java/com/linkedin/gms/ServletConfig.java
@@ -7,16 +7,21 @@
 import com.datahub.gms.servlet.Config;
 import com.datahub.gms.servlet.ConfigSearchExport;
 import com.datahub.gms.servlet.HealthCheck;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.StreamReadConstraints;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.linkedin.r2.transport.http.server.RAPJakartaServlet;
 import com.linkedin.restli.server.RestliHandlerServlet;
+import io.datahubproject.iceberg.catalog.rest.common.IcebergJsonConverter;
 import io.datahubproject.openapi.converter.StringToChangeCategoryConverter;
 import java.util.List;
 import javax.annotation.Nonnull;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.iceberg.rest.RESTSerializers;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
@@ -129,6 +134,7 @@ public void configureMessageConverters(List<HttpMessageConverter<?>> messageConv
     messageConverters.add(new StringHttpMessageConverter());
     messageConverters.add(new ByteArrayHttpMessageConverter());
     messageConverters.add(new FormHttpMessageConverter());
+    messageConverters.add(createIcebergMessageConverter());
 
     ObjectMapper objectMapper = new ObjectMapper();
     int maxSize =
@@ -145,6 +151,16 @@ public void configureMessageConverters(List<HttpMessageConverter<?>> messageConv
     messageConverters.add(jsonConverter);
   }
 
+  private HttpMessageConverter<?> createIcebergMessageConverter() {
+    ObjectMapper objectMapper = new ObjectMapper();
+    MappingJackson2HttpMessageConverter jsonConverter = new IcebergJsonConverter(objectMapper);
+
+    objectMapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
+    objectMapper.setPropertyNamingStrategy(new PropertyNamingStrategies.KebabCaseStrategy());
+    RESTSerializers.registerAll(objectMapper);
+    return jsonConverter;
+  }
+
   @Override
   public void addFormatters(FormatterRegistry registry) {
     registry.addConverter(new StringToChangeCategoryConverter());
diff --git a/metadata-service/war/src/main/java/com/linkedin/gms/servlet/IcebergCatalogServletConfig.java b/metadata-service/war/src/main/java/com/linkedin/gms/servlet/IcebergCatalogServletConfig.java
new file mode 100644
index 00000000000000..135bf21a237cf5
--- /dev/null
+++ b/metadata-service/war/src/main/java/com/linkedin/gms/servlet/IcebergCatalogServletConfig.java
@@ -0,0 +1,10 @@
+package com.linkedin.gms.servlet;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+
+@EnableWebMvc
+@ComponentScan(basePackages = {"io.datahubproject.iceberg.catalog.rest"})
+@Configuration
+public class IcebergCatalogServletConfig {}
diff --git a/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java b/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java
index d3236180917aa4..6e4b7de7b3d2b7 100644
--- a/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java
+++ b/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java
@@ -406,6 +406,34 @@ public class PoliciesConfig {
           "Edit Data Contract",
           "The ability to edit the Data Contract for an entity.");
 
+  public static final Privilege DATA_READ_ONLY_PRIVILEGE =
+      Privilege.of(
+          "DATA_READ_ONLY", "Read only data-access", "The ability to read the data in a dataset.");
+
+  public static final Privilege DATA_READ_WRITE_PRIVILEGE =
+      Privilege.of(
+          "DATA_READ_WRITE",
+          "Read-write data-access",
+          "The ability to read & write the data in a dataset.");
+
+  public static final Privilege DATA_MANAGE_TABLES_PRIVILEGE =
+      Privilege.of("DATA_MANAGE_TABLES", "Manage tables", "The ability to create and drop tables.");
+
+  public static final Privilege DATA_MANAGE_VIEWS_PRIVILEGE =
+      Privilege.of("DATA_MANAGE_VIEWS", "Manage views", "The ability to create and drop views.");
+
+  public static final Privilege DATA_MANAGE_NAMESPACES_PRIVILEGE =
+      Privilege.of(
+          "DATA_MANAGE_NAMESPACES",
+          "Manage namespaces",
+          "The ability to create and drop namespaces.");
+
+  public static final Privilege DATA_LIST_ENTITIES_PRIVILEGE =
+      Privilege.of(
+          "DATA_LIST_ENTITIES",
+          "List tables, views & namespaces",
+          "The ability to list tables, views and namespaces.");
+
   // Tag Privileges
   public static final Privilege EDIT_TAG_COLOR_PRIVILEGE =
       Privilege.of("EDIT_TAG_COLOR", "Edit Tag Color", "The ability to change the color of a Tag.");
@@ -540,7 +568,9 @@ public class PoliciesConfig {
                       EDIT_LINEAGE_PRIVILEGE,
                       EDIT_ENTITY_EMBED_PRIVILEGE,
                       EDIT_QUERIES_PRIVILEGE,
-                      CREATE_ER_MODEL_RELATIONSHIP_PRIVILEGE))
+                      CREATE_ER_MODEL_RELATIONSHIP_PRIVILEGE,
+                      DATA_READ_ONLY_PRIVILEGE,
+                      DATA_READ_WRITE_PRIVILEGE))
               .flatMap(Collection::stream)
               .collect(Collectors.toList()));
 
@@ -764,6 +794,17 @@ public class PoliciesConfig {
           "A logical collection of versioned entities.",
           COMMON_ENTITY_PRIVILEGES);
 
+  public static final ResourcePrivileges PLATFORM_INSTANCE_PRIVILEGES =
+      ResourcePrivileges.of(
+          "dataPlatformInstance",
+          "Data Platform Instance",
+          "Data Platform Instances on Datahub",
+          ImmutableList.of(
+              DATA_MANAGE_VIEWS_PRIVILEGE,
+              DATA_MANAGE_TABLES_PRIVILEGE,
+              DATA_MANAGE_NAMESPACES_PRIVILEGE,
+              DATA_LIST_ENTITIES_PRIVILEGE));
+
   public static final List<ResourcePrivileges> ENTITY_RESOURCE_PRIVILEGES =
       ImmutableList.of(
           DATASET_PRIVILEGES,
@@ -783,7 +824,8 @@ public class PoliciesConfig {
           ER_MODEL_RELATIONSHIP_PRIVILEGES,
           BUSINESS_ATTRIBUTE_PRIVILEGES,
           STRUCTURED_PROPERTIES_PRIVILEGES,
-          VERSION_SET_PRIVILEGES);
+          VERSION_SET_PRIVILEGES,
+          PLATFORM_INSTANCE_PRIVILEGES);
 
   // Merge all entity specific resource privileges to create a superset of all resource privileges
   public static final ResourcePrivileges ALL_RESOURCE_PRIVILEGES =
diff --git a/settings.gradle b/settings.gradle
index 437a353f210ac4..a3c8544d8dbc37 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -78,10 +78,13 @@ include ':metadata-operation-context'
 include ':metadata-service:openapi-servlet:models'
 include ':metadata-integration:java:datahub-schematron:lib'
 include ':metadata-integration:java:datahub-schematron:cli'
+include ':metadata-service:iceberg-catalog'
 
 buildCache {
     def depotSecret = System.getenv('DEPOT_TOKEN');
 
+
+
     remote(HttpBuildCache) {
         url = 'https://cache.depot.dev'
         enabled = depotSecret != null
@@ -120,7 +123,7 @@ def installPreCommitHooks() {
             println "Install output: ${stdout}"
         } catch (Exception e) {
             println "Error installing pre-commit: ${e.message}"
-            return 
+            return
         }
     }
 

From d091fff65268612cfa68917bf77fcd7783ca537d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20G=C3=B3mez=20Villamor?= <sgomezvillamor@gmail.com>
Date: Thu, 30 Jan 2025 14:35:35 +0100
Subject: [PATCH 192/249] fix(tableau): fixes missed lineage (#12434)

---
 .../ingestion/source/tableau/tableau.py       | 26 ++++++++++---------
 .../source/tableau/tableau_common.py          |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
index 36e62c928744ef..d731624738f0c9 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
@@ -2428,10 +2428,12 @@ def parse_custom_sql(
             ]
         ],
     ) -> Optional["SqlParsingResult"]:
-        database_info = datasource.get(c.DATABASE) or {
-            c.NAME: c.UNKNOWN.lower(),
-            c.CONNECTION_TYPE: datasource.get(c.CONNECTION_TYPE),
-        }
+        database_field = datasource.get(c.DATABASE) or {}
+        database_id: Optional[str] = database_field.get(c.ID)
+        database_name: Optional[str] = database_field.get(c.NAME) or c.UNKNOWN.lower()
+        database_connection_type: Optional[str] = database_field.get(
+            c.CONNECTION_TYPE
+        ) or datasource.get(c.CONNECTION_TYPE)
 
         if (
             datasource.get(c.IS_UNSUPPORTED_CUSTOM_SQL) in (None, False)
@@ -2440,10 +2442,7 @@ def parse_custom_sql(
             logger.debug(f"datasource {datasource_urn} is not created from custom sql")
             return None
 
-        if (
-            database_info.get(c.NAME) is None
-            or database_info.get(c.CONNECTION_TYPE) is None
-        ):
+        if database_connection_type is None:
             logger.debug(
                 f"database information is missing from datasource {datasource_urn}"
             )
@@ -2459,14 +2458,14 @@ def parse_custom_sql(
 
         logger.debug(f"Parsing sql={query}")
 
-        upstream_db = database_info.get(c.NAME)
+        upstream_db = database_name
 
         if func_overridden_info is not None:
             # Override the information as per configuration
             upstream_db, platform_instance, platform, _ = func_overridden_info(
-                database_info[c.CONNECTION_TYPE],
-                database_info.get(c.NAME),
-                database_info.get(c.ID),
+                database_connection_type,
+                database_name,
+                database_id,
                 self.config.platform_instance_map,
                 self.config.lineage_overrides,
                 self.config.database_hostname_to_platform_instance_map,
@@ -2534,6 +2533,9 @@ def _create_lineage_from_unsupported_csql(
             platform_instance=self.config.platform_instance,
             func_overridden_info=get_overridden_info,
         )
+        logger.debug(
+            f"_create_lineage_from_unsupported_csql parsed_result = {parsed_result}"
+        )
 
         if parsed_result is None:
             return
diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau_common.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau_common.py
index 5d5103330fe302..b9dce0e189ab8d 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau_common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau_common.py
@@ -761,7 +761,7 @@ def make_dataset_urn(
 
 
 def get_overridden_info(
-    connection_type: Optional[str],
+    connection_type: str,
     upstream_db: Optional[str],
     upstream_db_id: Optional[str],
     platform_instance_map: Optional[Dict[str, str]],

From a80d23e15a4d3d41c81aa89adc5e7333e178ea3f Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Thu, 30 Jan 2025 08:18:38 -0600
Subject: [PATCH 193/249] fix(test): fix metadata-io test (#12503)

---
 .../request/SearchRequestHandlerTest.java      | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
index d4d5b03ea5fec9..62b9572d3c7a9e 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
@@ -195,13 +195,14 @@ public void testSearchRequestHandlerHighlightingTurnedOff() {
     // Filters
     Collection<AggregationBuilder> aggBuilders =
         sourceBuilder.aggregations().getAggregatorFactories();
-    // Expect 3 aggregations: textFieldOverride, missing␝textFieldOverride, and _index
-    assertEquals(aggBuilders.size(), 3);
+    // Expect 3 aggregations: textFieldOverride, missing␝textFieldOverride, and _entityType,
+    // _entityType␝typeNames
+    assertEquals(aggBuilders.size(), 4);
     for (AggregationBuilder aggBuilder : aggBuilders) {
-      if (aggBuilder.getName().equals("textFieldOverride")) {
+      if (aggBuilder.getName().startsWith("textFieldOverride")) {
         TermsAggregationBuilder filterPanelBuilder = (TermsAggregationBuilder) aggBuilder;
         assertEquals(filterPanelBuilder.field(), "textFieldOverride.keyword");
-      } else if (!aggBuilder.getName().equals("_entityType")
+      } else if (!aggBuilder.getName().startsWith("_entityType")
           && !aggBuilder
               .getName()
               .equals(
@@ -241,13 +242,14 @@ public void testSearchRequestHandler() {
     // Filters
     Collection<AggregationBuilder> aggBuilders =
         sourceBuilder.aggregations().getAggregatorFactories();
-    // Expect 2 aggregations: textFieldOverride and _index
-    assertEquals(aggBuilders.size(), 3);
+    // Expect 4 aggregations: textFieldOverride, missing:textFieldOverride, _entityType and
+    // _entityType:typeNames
+    assertEquals(aggBuilders.size(), 4);
     for (AggregationBuilder aggBuilder : aggBuilders) {
-      if (aggBuilder.getName().equals("textFieldOverride")) {
+      if (aggBuilder.getName().startsWith("textFieldOverride")) {
         TermsAggregationBuilder filterPanelBuilder = (TermsAggregationBuilder) aggBuilder;
         assertEquals(filterPanelBuilder.field(), "textFieldOverride.keyword");
-      } else if (!aggBuilder.getName().equals("_entityType")
+      } else if (!aggBuilder.getName().startsWith("_entityType")
           && !aggBuilder
               .getName()
               .equals(

From a15547014f67dd785b3c5889dd3dce5ed8d0c5e0 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Thu, 30 Jan 2025 08:18:56 -0600
Subject: [PATCH 194/249] fix(ci): disable ci telemetry modelDocUpload (#12504)

---
 .github/workflows/metadata-model.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/metadata-model.yml b/.github/workflows/metadata-model.yml
index f9262d89f9ef00..1cf7ded9a8b804 100644
--- a/.github/workflows/metadata-model.yml
+++ b/.github/workflows/metadata-model.yml
@@ -60,4 +60,5 @@ jobs:
         env:
           DATAHUB_SERVER: ${{ secrets.DataHubServer }}
           DATAHUB_TOKEN: ${{ secrets.DataHubToken }}
+          DATAHUB_TELEMETRY_ENABLED: false
         run: ./gradlew :metadata-ingestion:modelDocUpload

From 7a3225600548d964b93d020095be96b601582bd1 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Thu, 30 Jan 2025 12:32:10 -0800
Subject: [PATCH 195/249] docs(ingest/mode): add details on
 authentication/permissions for mode (#12508)

---
 metadata-ingestion/docs/sources/mode/mode.md  |  1 -
 .../docs/sources/mode/mode_pre.md             | 21 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 delete mode 100644 metadata-ingestion/docs/sources/mode/mode.md
 create mode 100644 metadata-ingestion/docs/sources/mode/mode_pre.md

diff --git a/metadata-ingestion/docs/sources/mode/mode.md b/metadata-ingestion/docs/sources/mode/mode.md
deleted file mode 100644
index a61c429a6ab1c1..00000000000000
--- a/metadata-ingestion/docs/sources/mode/mode.md
+++ /dev/null
@@ -1 +0,0 @@
-See Mode's [Authentication documentation](https://mode.com/developer/api-reference/authentication/) on how to generate `token` and `password`.
diff --git a/metadata-ingestion/docs/sources/mode/mode_pre.md b/metadata-ingestion/docs/sources/mode/mode_pre.md
new file mode 100644
index 00000000000000..a1fc264781175b
--- /dev/null
+++ b/metadata-ingestion/docs/sources/mode/mode_pre.md
@@ -0,0 +1,21 @@
+### Authentication
+
+See Mode's [Authentication documentation](https://mode.com/developer/api-reference/authentication/) on how to generate an API `token` and `password`.
+
+Mode does not support true "service accounts", so you must use a user account for authentication.
+Depending on your requirements, you may want to create a dedicated user account for usage with DataHub ingestion.
+
+### Permissions
+
+DataHub ingestion requires the user to have the following permissions:
+
+- Have at least the "Member" role.
+- For each Connection, have at least"View" access.
+
+  To check Connection permissions, navigate to "Workspace Settings" → "Manage Connections". For each connection in the list, click on the connection → "Permissions". If the default workspace access is "View" or "Query", you're all set for that connection. If it's "Restricted", you'll need to individually grant your ingestion user View access.
+
+- For each Space, have at least "View" access.
+
+  To check Collection permissions, navigate to the "My Collections" page as an Admin user. For each collection with Workspace Access set to "Restricted" access, the ingestion user must be manually granted the "Viewer" access in the "Manage Access" dialog. Collections with "All Members can View/Edit" do not need to be manually granted access.
+
+Note that if the ingestion user has "Admin" access, then it will automatically have "View" access for all connections and collections.

From 4dc9bfcde71e89243f81316468544b007490ba61 Mon Sep 17 00:00:00 2001
From: Tamas Nemeth <treff7es@gmail.com>
Date: Thu, 30 Jan 2025 22:49:20 +0100
Subject: [PATCH 196/249] fix(ingest/snowflake): Create all structured propery
 templates before assignation (#12469)

---
 .../source/snowflake/snowflake_config.py      |  6 ++
 .../source/snowflake/snowflake_query.py       | 11 ++++
 .../source/snowflake/snowflake_report.py      |  1 +
 .../source/snowflake/snowflake_schema.py      | 17 ++++++
 .../source/snowflake/snowflake_schema_gen.py  | 54 ++++++-----------
 .../source/snowflake/snowflake_tag.py         | 60 ++++++++++++++++++-
 .../tests/integration/snowflake/common.py     | 22 ++++++-
 .../integration/snowflake/test_snowflake.py   |  1 +
 .../snowflake/test_snowflake_tag.py           |  5 +-
 9 files changed, 135 insertions(+), 42 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
index 5f732e2621656f..7e3220daceca3c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
@@ -249,6 +249,12 @@ class SnowflakeV2Config(
         description="If enabled along with `extract_tags`, extracts snowflake's key-value tags as DataHub structured properties instead of DataHub tags.",
     )
 
+    structured_properties_template_cache_invalidation_interval: int = Field(
+        hidden_from_docs=True,
+        default=60,
+        description="Interval in seconds to invalidate the structured properties template cache.",
+    )
+
     include_external_url: bool = Field(
         default=True,
         description="Whether to populate Snowsight url for Snowflake Objects",
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_query.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_query.py
index 40bcfb514efd23..7092041f8da95c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_query.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_query.py
@@ -159,6 +159,17 @@ def tables_for_schema(schema_name: str, db_name: Optional[str]) -> str:
         and table_type in ('BASE TABLE', 'EXTERNAL TABLE', 'HYBRID TABLE')
         order by table_schema, table_name"""
 
+    @staticmethod
+    def get_all_tags():
+        return """
+        SELECT tag_database as "TAG_DATABASE",
+        tag_schema AS "TAG_SCHEMA",
+        tag_name AS "TAG_NAME",
+        FROM snowflake.account_usage.tag_references
+        GROUP BY TAG_DATABASE , TAG_SCHEMA, tag_name
+        ORDER BY TAG_DATABASE, TAG_SCHEMA, TAG_NAME  ASC;
+        """
+
     @staticmethod
     def get_all_tags_on_object_with_propagation(
         db_name: str, quoted_identifier: str, domain: str
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_report.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_report.py
index b24471f8666afa..691448e1d09768 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_report.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_report.py
@@ -114,6 +114,7 @@ class SnowflakeV2Report(
     num_tables_with_known_upstreams: int = 0
     num_upstream_lineage_edge_parsing_failed: int = 0
     num_secure_views_missing_definition: int = 0
+    num_structured_property_templates_created: int = 0
 
     data_dictionary_cache: Optional["SnowflakeDataDictionary"] = None
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py
index 173024aec0cf38..c31b7dfe5b9b4e 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py
@@ -285,6 +285,23 @@ def get_secure_view_definitions(self) -> Dict[str, Dict[str, Dict[str, str]]]:
 
         return secure_view_definitions
 
+    def get_all_tags(self) -> List[SnowflakeTag]:
+        cur = self.connection.query(
+            SnowflakeQuery.get_all_tags(),
+        )
+
+        tags = [
+            SnowflakeTag(
+                database=tag["TAG_DATABASE"],
+                schema=tag["TAG_SCHEMA"],
+                name=tag["TAG_NAME"],
+                value="",
+            )
+            for tag in cur
+        ]
+
+        return tags
+
     @serialized_lru_cache(maxsize=1)
     def get_tables_for_database(
         self, db_name: str
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
index 04bc51f1ebd3f5..134f0b343ccfe6 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
@@ -1,10 +1,10 @@
 import itertools
 import logging
+import time
 from typing import Dict, Iterable, List, Optional, Union
 
 from datahub.configuration.pattern_utils import is_schema_allowed
 from datahub.emitter.mce_builder import (
-    get_sys_time,
     make_data_platform_urn,
     make_dataset_urn_with_platform_instance,
     make_schema_field_urn,
@@ -74,7 +74,6 @@
     PROFILING,
 )
 from datahub.metadata.com.linkedin.pegasus2avro.common import (
-    AuditStamp,
     GlobalTags,
     Status,
     SubTypes,
@@ -101,15 +100,8 @@
     StringType,
     TimeType,
 )
-from datahub.metadata.com.linkedin.pegasus2avro.structured import (
-    StructuredPropertyDefinition,
-)
 from datahub.metadata.com.linkedin.pegasus2avro.tag import TagProperties
 from datahub.metadata.urns import (
-    ContainerUrn,
-    DatasetUrn,
-    DataTypeUrn,
-    EntityTypeUrn,
     SchemaFieldUrn,
     StructuredPropertyUrn,
 )
@@ -191,7 +183,7 @@ def __init__(
         self.domain_registry: Optional[DomainRegistry] = domain_registry
         self.classification_handler = ClassificationHandler(self.config, self.report)
         self.tag_extractor = SnowflakeTagExtractor(
-            config, self.data_dictionary, self.report
+            config, self.data_dictionary, self.report, identifiers
         )
         self.profiler: Optional[SnowflakeProfiler] = profiler
         self.snowsight_url_builder: Optional[SnowsightUrlBuilder] = (
@@ -217,6 +209,16 @@ def snowflake_identifier(self, identifier: str) -> str:
         return self.identifiers.snowflake_identifier(identifier)
 
     def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
+        if self.config.extract_tags_as_structured_properties:
+            logger.info("Creating structured property templates for tags")
+            yield from self.tag_extractor.create_structured_property_templates()
+            # We have to wait until cache invalidates to make sure the structured property template is available
+            logger.info(
+                f"Waiting for {self.config.structured_properties_template_cache_invalidation_interval} seconds for structured properties cache to invalidate"
+            )
+            time.sleep(
+                self.config.structured_properties_template_cache_invalidation_interval
+            )
         self.databases = []
         for database in self.get_databases() or []:
             self.report.report_entity_scanned(database.name, "database")
@@ -698,6 +700,7 @@ def _process_view(
 
     def _process_tag(self, tag: SnowflakeTag) -> Iterable[MetadataWorkUnit]:
         use_sp = self.config.extract_tags_as_structured_properties
+
         identifier = (
             self.snowflake_identifier(tag.structured_property_identifier())
             if use_sp
@@ -708,10 +711,11 @@ def _process_tag(self, tag: SnowflakeTag) -> Iterable[MetadataWorkUnit]:
             return
 
         self.report.report_tag_processed(identifier)
+
         if use_sp:
-            yield from self.gen_tag_as_structured_property_workunits(tag)
-        else:
-            yield from self.gen_tag_workunits(tag)
+            return
+
+        yield from self.gen_tag_workunits(tag)
 
     def _format_tags_as_structured_properties(
         self, tags: List[SnowflakeTag]
@@ -732,6 +736,7 @@ def gen_dataset_workunits(
         if table.tags:
             for tag in table.tags:
                 yield from self._process_tag(tag)
+
         for column_name in table.column_tags:
             for tag in table.column_tags[column_name]:
                 yield from self._process_tag(tag)
@@ -903,29 +908,6 @@ def gen_tag_workunits(self, tag: SnowflakeTag) -> Iterable[MetadataWorkUnit]:
             entityUrn=tag_urn, aspect=tag_properties_aspect
         ).as_workunit()
 
-    def gen_tag_as_structured_property_workunits(
-        self, tag: SnowflakeTag
-    ) -> Iterable[MetadataWorkUnit]:
-        identifier = self.snowflake_identifier(tag.structured_property_identifier())
-        urn = StructuredPropertyUrn(identifier).urn()
-        aspect = StructuredPropertyDefinition(
-            qualifiedName=identifier,
-            displayName=tag.name,
-            valueType=DataTypeUrn("datahub.string").urn(),
-            entityTypes=[
-                EntityTypeUrn(f"datahub.{ContainerUrn.ENTITY_TYPE}").urn(),
-                EntityTypeUrn(f"datahub.{DatasetUrn.ENTITY_TYPE}").urn(),
-                EntityTypeUrn(f"datahub.{SchemaFieldUrn.ENTITY_TYPE}").urn(),
-            ],
-            lastModified=AuditStamp(
-                time=get_sys_time(), actor="urn:li:corpuser:datahub"
-            ),
-        )
-        yield MetadataChangeProposalWrapper(
-            entityUrn=urn,
-            aspect=aspect,
-        ).as_workunit()
-
     def gen_column_tags_as_structured_properties(
         self, dataset_urn: str, table: Union[SnowflakeTable, SnowflakeView]
     ) -> Iterable[MetadataWorkUnit]:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_tag.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_tag.py
index 597e7bee4d4cc0..08d319c7fe25d2 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_tag.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_tag.py
@@ -1,6 +1,9 @@
 import logging
-from typing import Dict, List, Optional
+from typing import Dict, Iterable, List, Optional
 
+from datahub.emitter.mce_builder import get_sys_time
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.ingestion.source.snowflake.constants import SnowflakeObjectDomain
 from datahub.ingestion.source.snowflake.snowflake_config import (
     SnowflakeV2Config,
@@ -12,7 +15,22 @@
     SnowflakeTag,
     _SnowflakeTagCache,
 )
-from datahub.ingestion.source.snowflake.snowflake_utils import SnowflakeCommonMixin
+from datahub.ingestion.source.snowflake.snowflake_utils import (
+    SnowflakeCommonMixin,
+    SnowflakeIdentifierBuilder,
+)
+from datahub.metadata.com.linkedin.pegasus2avro.common import AuditStamp
+from datahub.metadata.com.linkedin.pegasus2avro.structured import (
+    StructuredPropertyDefinition,
+)
+from datahub.metadata.urns import (
+    ContainerUrn,
+    DatasetUrn,
+    DataTypeUrn,
+    EntityTypeUrn,
+    SchemaFieldUrn,
+    StructuredPropertyUrn,
+)
 
 logger: logging.Logger = logging.getLogger(__name__)
 
@@ -23,11 +41,12 @@ def __init__(
         config: SnowflakeV2Config,
         data_dictionary: SnowflakeDataDictionary,
         report: SnowflakeV2Report,
+        snowflake_identifiers: SnowflakeIdentifierBuilder,
     ) -> None:
         self.config = config
         self.data_dictionary = data_dictionary
         self.report = report
-
+        self.snowflake_identifiers = snowflake_identifiers
         self.tag_cache: Dict[str, _SnowflakeTagCache] = {}
 
     def _get_tags_on_object_without_propagation(
@@ -59,6 +78,41 @@ def _get_tags_on_object_without_propagation(
             raise ValueError(f"Unknown domain {domain}")
         return tags
 
+    def create_structured_property_templates(self) -> Iterable[MetadataWorkUnit]:
+        for tag in self.data_dictionary.get_all_tags():
+            if not self.config.structured_property_pattern.allowed(
+                tag.tag_identifier()
+            ):
+                continue
+            if self.config.extract_tags_as_structured_properties:
+                self.report.num_structured_property_templates_created += 1
+                yield from self.gen_tag_as_structured_property_workunits(tag)
+
+    def gen_tag_as_structured_property_workunits(
+        self, tag: SnowflakeTag
+    ) -> Iterable[MetadataWorkUnit]:
+        identifier = self.snowflake_identifiers.snowflake_identifier(
+            tag.structured_property_identifier()
+        )
+        urn = StructuredPropertyUrn(identifier).urn()
+        aspect = StructuredPropertyDefinition(
+            qualifiedName=identifier,
+            displayName=tag.name,
+            valueType=DataTypeUrn("datahub.string").urn(),
+            entityTypes=[
+                EntityTypeUrn(f"datahub.{ContainerUrn.ENTITY_TYPE}").urn(),
+                EntityTypeUrn(f"datahub.{DatasetUrn.ENTITY_TYPE}").urn(),
+                EntityTypeUrn(f"datahub.{SchemaFieldUrn.ENTITY_TYPE}").urn(),
+            ],
+            lastModified=AuditStamp(
+                time=get_sys_time(), actor="urn:li:corpuser:datahub"
+            ),
+        )
+        yield MetadataChangeProposalWrapper(
+            entityUrn=urn,
+            aspect=aspect,
+        ).as_workunit()
+
     def _get_tags_on_object_with_propagation(
         self,
         domain: str,
diff --git a/metadata-ingestion/tests/integration/snowflake/common.py b/metadata-ingestion/tests/integration/snowflake/common.py
index 7b4f5abe1cd462..7a296a597468ec 100644
--- a/metadata-ingestion/tests/integration/snowflake/common.py
+++ b/metadata-ingestion/tests/integration/snowflake/common.py
@@ -629,7 +629,27 @@ def default_query_results(  # noqa: C901
         ),
     ]:
         return []
-
+    elif query == snowflake_query.SnowflakeQuery.get_all_tags():
+        return [
+            *[
+                {
+                    "TAG_DATABASE": "TEST_DB",
+                    "TAG_SCHEMA": "TEST_SCHEMA",
+                    "TAG_NAME": f"my_tag_{ix}",
+                }
+                for ix in range(3)
+            ],
+            {
+                "TAG_DATABASE": "TEST_DB",
+                "TAG_SCHEMA": "TEST_SCHEMA",
+                "TAG_NAME": "security",
+            },
+            {
+                "TAG_DATABASE": "OTHER_DB",
+                "TAG_SCHEMA": "OTHER_SCHEMA",
+                "TAG_NAME": "my_other_tag",
+            },
+        ]
     elif (
         query
         == snowflake_query.SnowflakeQuery.get_all_tags_in_database_without_propagation(
diff --git a/metadata-ingestion/tests/integration/snowflake/test_snowflake.py b/metadata-ingestion/tests/integration/snowflake/test_snowflake.py
index d2e20e784282ee..340b771b76e310 100644
--- a/metadata-ingestion/tests/integration/snowflake/test_snowflake.py
+++ b/metadata-ingestion/tests/integration/snowflake/test_snowflake.py
@@ -219,6 +219,7 @@ def test_snowflake_tags_as_structured_properties(
                         include_column_lineage=False,
                         include_usage_stats=False,
                         include_operational_stats=False,
+                        structured_properties_template_cache_invalidation_interval=0,
                     ),
                 ),
                 sink=DynamicTypedConfig(
diff --git a/metadata-ingestion/tests/integration/snowflake/test_snowflake_tag.py b/metadata-ingestion/tests/integration/snowflake/test_snowflake_tag.py
index d4f6e92c93c1e0..86ffdf33f585cb 100644
--- a/metadata-ingestion/tests/integration/snowflake/test_snowflake_tag.py
+++ b/metadata-ingestion/tests/integration/snowflake/test_snowflake_tag.py
@@ -115,6 +115,7 @@ def test_snowflake_structured_property_pattern_deny():
             match_fully_qualified_names=True,
             schema_pattern=AllowDenyPattern(allow=["test_db.test_schema"]),
             extract_tags_as_structured_properties=True,
+            structured_properties_template_cache_invalidation_interval=0,
             tag_pattern=AllowDenyPattern(
                 deny=["TEST_DB.TEST_SCHEMA.my_tag_2:my_value_2"]
             ),
@@ -142,7 +143,7 @@ def test_snowflake_structured_property_pattern_deny():
         source_report = pipeline.source.get_report()
         assert isinstance(source_report, SnowflakeV2Report)
         assert source_report.tags_scanned == 5
-        assert source_report._processed_tags == {
+        assert sorted(list(source_report._processed_tags)) == [
             "snowflake.other_db.other_schema.my_other_tag",
             "snowflake.test_db.test_schema.security",
-        }
+        ]

From 301d628ba77fe505858ba92d9272108bc21628e8 Mon Sep 17 00:00:00 2001
From: Hyejin Yoon <0327jane@gmail.com>
Date: Fri, 31 Jan 2025 10:53:06 +0900
Subject: [PATCH 197/249] docs: fix token to be not required in sample script 
 (#12511)

---
 metadata-ingestion/examples/ai/dh_ai_client.py        | 2 +-
 metadata-ingestion/examples/ai/dh_ai_client_sample.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/metadata-ingestion/examples/ai/dh_ai_client.py b/metadata-ingestion/examples/ai/dh_ai_client.py
index 96adb260da4c45..b51c8dd050cf1b 100644
--- a/metadata-ingestion/examples/ai/dh_ai_client.py
+++ b/metadata-ingestion/examples/ai/dh_ai_client.py
@@ -32,7 +32,7 @@ class DatahubAIClient:
 
     def __init__(
         self,
-        token: str,
+        token: Optional[str] = None,
         server_url: str = "http://localhost:8080",
         platform: str = "mlflow",
     ) -> None:
diff --git a/metadata-ingestion/examples/ai/dh_ai_client_sample.py b/metadata-ingestion/examples/ai/dh_ai_client_sample.py
index 291cfb2ff1d619..9a8ff578314175 100644
--- a/metadata-ingestion/examples/ai/dh_ai_client_sample.py
+++ b/metadata-ingestion/examples/ai/dh_ai_client_sample.py
@@ -8,7 +8,7 @@
 if __name__ == "__main__":
     # Example usage
     parser = argparse.ArgumentParser()
-    parser.add_argument("--token", required=True, help="DataHub access token")
+    parser.add_argument("--token", required=False, help="DataHub access token")
     parser.add_argument(
         "--server_url",
         required=False,

From a7598ca20ea434dddf4b93e75368b850d642be6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20G=C3=B3mez=20Villamor?= <sgomezvillamor@gmail.com>
Date: Fri, 31 Jan 2025 09:52:26 +0100
Subject: [PATCH 198/249] fix(mssql): adds missing containers and browsepathsv2
 for dataflow and datajob (#12483)

---
 .../ingestion/source/sql/mssql/job_models.py  |  45 +++-
 .../ingestion/source/sql/mssql/source.py      |  17 ++
 .../golden_mces_mssql_no_db_to_file.json      |  18 +-
 .../golden_mces_mssql_no_db_with_filter.json  |  12 +-
 .../golden_mces_mssql_to_file.json            | 229 +++++++++++++++++-
 ...golden_mces_mssql_with_lower_case_urn.json |  18 +-
 .../sql_server/source_files/mssql_to_file.yml |   1 +
 7 files changed, 300 insertions(+), 40 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/mssql/job_models.py b/metadata-ingestion/src/datahub/ingestion/source/sql/mssql/job_models.py
index 9cd485f6d9a4b1..3d2a8af3a54999 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/mssql/job_models.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/mssql/job_models.py
@@ -7,7 +7,12 @@
     make_data_platform_urn,
     make_dataplatform_instance_urn,
 )
+from datahub.emitter.mcp_builder import (
+    DatabaseKey,
+    SchemaKey,
+)
 from datahub.metadata.schema_classes import (
+    ContainerClass,
     DataFlowInfoClass,
     DataJobInfoClass,
     DataJobInputOutputClass,
@@ -171,11 +176,7 @@ def urn(self) -> str:
             flow_id=self.entity.flow.formatted_name,
             job_id=self.entity.formatted_name,
             cluster=self.entity.flow.cluster,
-            platform_instance=(
-                self.entity.flow.platform_instance
-                if self.entity.flow.platform_instance
-                else None
-            ),
+            platform_instance=self.entity.flow.platform_instance,
         )
 
     def add_property(
@@ -222,6 +223,26 @@ def as_maybe_platform_instance_aspect(self) -> Optional[DataPlatformInstanceClas
             )
         return None
 
+    @property
+    def as_container_aspect(self) -> ContainerClass:
+        key_args = dict(
+            platform=self.entity.flow.orchestrator,
+            instance=self.entity.flow.platform_instance,
+            env=self.entity.flow.env,
+            database=self.entity.flow.db,
+        )
+        container_key = (
+            SchemaKey(
+                schema=self.entity.schema,
+                **key_args,
+            )
+            if isinstance(self.entity, StoredProcedure)
+            else DatabaseKey(
+                **key_args,
+            )
+        )
+        return ContainerClass(container=container_key.as_urn())
+
 
 @dataclass
 class MSSQLDataFlow:
@@ -244,9 +265,7 @@ def urn(self) -> str:
             orchestrator=self.entity.orchestrator,
             flow_id=self.entity.formatted_name,
             cluster=self.entity.cluster,
-            platform_instance=(
-                self.entity.platform_instance if self.entity.platform_instance else None
-            ),
+            platform_instance=self.entity.platform_instance,
         )
 
     @property
@@ -267,3 +286,13 @@ def as_maybe_platform_instance_aspect(self) -> Optional[DataPlatformInstanceClas
                 ),
             )
         return None
+
+    @property
+    def as_container_aspect(self) -> ContainerClass:
+        databaseKey = DatabaseKey(
+            platform=self.entity.orchestrator,
+            instance=self.entity.platform_instance,
+            env=self.entity.env,
+            database=self.entity.db,
+        )
+        return ContainerClass(container=databaseKey.as_urn())
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/mssql/source.py b/metadata-ingestion/src/datahub/ingestion/source/sql/mssql/source.py
index 2d0c4dc9f6f6f9..6c1f15a40075c6 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/mssql/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/mssql/source.py
@@ -108,6 +108,10 @@ class SQLServerConfig(BasicSQLAlchemyConfig):
         default=True,
         description="Enable lineage extraction for stored procedures",
     )
+    include_containers_for_pipelines: bool = Field(
+        default=False,
+        description="Enable the container aspects ingestion for both pipelines and tasks. Note that this feature requires the corresponding model support in the backend, which was introduced in version 0.15.0.1.",
+    )
 
     @pydantic.validator("uri_args")
     def passwords_match(cls, v, values, **kwargs):
@@ -641,6 +645,12 @@ def construct_job_workunits(
                 aspect=data_platform_instance_aspect,
             ).as_workunit()
 
+        if self.config.include_containers_for_pipelines:
+            yield MetadataChangeProposalWrapper(
+                entityUrn=data_job.urn,
+                aspect=data_job.as_container_aspect,
+            ).as_workunit()
+
         if include_lineage:
             yield MetadataChangeProposalWrapper(
                 entityUrn=data_job.urn,
@@ -683,6 +693,13 @@ def construct_flow_workunits(
                 entityUrn=data_flow.urn,
                 aspect=data_platform_instance_aspect,
             ).as_workunit()
+
+        if self.config.include_containers_for_pipelines:
+            yield MetadataChangeProposalWrapper(
+                entityUrn=data_flow.urn,
+                aspect=data_flow.as_container_aspect,
+            ).as_workunit()
+
         # TODO: Add SubType when it appear
 
     def get_inspectors(self) -> Iterable[Inspector]:
diff --git a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_to_file.json b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_to_file.json
index 0b478e13b86d2a..73f69273836346 100644
--- a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_to_file.json
+++ b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_to_file.json
@@ -112,11 +112,11 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "job_id": "f5a6c120-500a-4300-9b21-0c3225af1f80",
+                "job_id": "2fc72675-0c68-4260-ab00-c361b96c8c36",
                 "job_name": "Weekly Demo Data Backup",
                 "description": "No description available.",
-                "date_created": "2024-12-30 19:59:24.690000",
-                "date_modified": "2024-12-30 19:59:24.690000",
+                "date_created": "2025-01-31 08:02:41.167000",
+                "date_modified": "2025-01-31 08:02:41.360000",
                 "step_id": "1",
                 "step_name": "Set database to read only",
                 "subsystem": "TSQL",
@@ -2279,8 +2279,8 @@
                 "code": "CREATE PROCEDURE [Foo].[Proc.With.SpecialChar] @ID INT\nAS\n    SELECT @ID AS ThatDB;\n",
                 "input parameters": "['@ID']",
                 "parameter @ID": "{'type': 'int'}",
-                "date_created": "2024-12-30 19:59:24.690000",
-                "date_modified": "2024-12-30 19:59:24.690000"
+                "date_created": "2025-01-31 08:02:40.980000",
+                "date_modified": "2025-01-31 08:02:40.980000"
             },
             "name": "DemoData.Foo.Proc.With.SpecialChar",
             "type": {
@@ -2329,8 +2329,8 @@
                 "depending_on_procedure": "{}",
                 "code": "CREATE PROCEDURE [Foo].[NewProc]\n    AS\n    BEGIN\n        --insert into items table from salesreason table\n        insert into Foo.Items (ID, ItemName)\n        SELECT TempID, Name\n        FROM Foo.SalesReason;\n\n\n       IF OBJECT_ID('Foo.age_dist', 'U') IS NULL\n       BEGIN\n            -- Create and populate if table doesn't exist\n            SELECT Age, COUNT(*) as Count\n            INTO Foo.age_dist\n            FROM Foo.Persons\n            GROUP BY Age\n        END\n        ELSE\n        BEGIN\n            -- Update existing table\n            TRUNCATE TABLE Foo.age_dist;\n\n            INSERT INTO Foo.age_dist (Age, Count)\n            SELECT Age, COUNT(*) as Count\n            FROM Foo.Persons\n            GROUP BY Age\n        END\n\n        SELECT ID, Age INTO #TEMPTABLE FROM NewData.FooNew.PersonsNew\n        \n        UPDATE DemoData.Foo.Persons\n        SET Age = t.Age\n        FROM DemoData.Foo.Persons p\n        JOIN #TEMPTABLE t ON p.ID = t.ID\n\n    END\n",
                 "input parameters": "[]",
-                "date_created": "2024-12-30 19:59:24.690000",
-                "date_modified": "2024-12-30 19:59:24.690000"
+                "date_created": "2025-01-31 08:02:40.987000",
+                "date_modified": "2025-01-31 08:02:40.987000"
             },
             "name": "DemoData.Foo.NewProc",
             "type": {
@@ -4969,7 +4969,7 @@
                 "actor": "urn:li:corpuser:_ingestion"
             },
             "lastModified": {
-                "time": 1735588784503,
+                "time": 1738310563767,
                 "actor": "urn:li:corpuser:_ingestion"
             }
         }
@@ -5092,7 +5092,7 @@
                 "actor": "urn:li:corpuser:_ingestion"
             },
             "lastModified": {
-                "time": 1735588784511,
+                "time": 1738310563770,
                 "actor": "urn:li:corpuser:_ingestion"
             }
         }
diff --git a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_with_filter.json b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_with_filter.json
index c1748ff13ac93c..2789ccd3cd5a72 100644
--- a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_with_filter.json
+++ b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_with_filter.json
@@ -112,11 +112,11 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "job_id": "f5a6c120-500a-4300-9b21-0c3225af1f80",
+                "job_id": "2fc72675-0c68-4260-ab00-c361b96c8c36",
                 "job_name": "Weekly Demo Data Backup",
                 "description": "No description available.",
-                "date_created": "2024-12-30 19:59:24.690000",
-                "date_modified": "2024-12-30 19:59:24.690000",
+                "date_created": "2025-01-31 08:02:41.167000",
+                "date_modified": "2025-01-31 08:02:41.360000",
                 "step_id": "1",
                 "step_name": "Set database to read only",
                 "subsystem": "TSQL",
@@ -2279,8 +2279,8 @@
                 "code": "CREATE PROCEDURE [Foo].[Proc.With.SpecialChar] @ID INT\nAS\n    SELECT @ID AS ThatDB;\n",
                 "input parameters": "['@ID']",
                 "parameter @ID": "{'type': 'int'}",
-                "date_created": "2024-12-30 19:59:24.690000",
-                "date_modified": "2024-12-30 19:59:24.690000"
+                "date_created": "2025-01-31 08:02:40.980000",
+                "date_modified": "2025-01-31 08:02:40.980000"
             },
             "name": "DemoData.Foo.Proc.With.SpecialChar",
             "type": {
@@ -2694,7 +2694,7 @@
                 "actor": "urn:li:corpuser:_ingestion"
             },
             "lastModified": {
-                "time": 1735588789629,
+                "time": 1738310565884,
                 "actor": "urn:li:corpuser:_ingestion"
             }
         }
diff --git a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_to_file.json b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_to_file.json
index cbfc374decab2f..a9f52e4c97f012 100644
--- a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_to_file.json
+++ b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_to_file.json
@@ -128,6 +128,47 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(mssql,my-instance.Weekly Demo Data Backup,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:db8117ee3cc6397c503e7824ae3e0f6a"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mssql-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(mssql,my-instance.Weekly Demo Data Backup,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mssql,my-instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mssql,my-instance)"
+                },
+                {
+                    "id": "urn:li:container:db8117ee3cc6397c503e7824ae3e0f6a",
+                    "urn": "urn:li:container:db8117ee3cc6397c503e7824ae3e0f6a"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mssql-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataJob",
     "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,my-instance.Weekly Demo Data Backup,PROD),Weekly Demo Data Backup)",
@@ -136,11 +177,11 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "job_id": "f5a6c120-500a-4300-9b21-0c3225af1f80",
+                "job_id": "5a260993-c4ce-4bb3-a273-eaf6ef6e0382",
                 "job_name": "Weekly Demo Data Backup",
                 "description": "No description available.",
-                "date_created": "2024-12-30 19:59:24.690000",
-                "date_modified": "2024-12-30 19:59:24.690000",
+                "date_created": "2025-01-28 15:27:31.437000",
+                "date_modified": "2025-01-28 15:27:31.593000",
                 "step_id": "1",
                 "step_name": "Set database to read only",
                 "subsystem": "TSQL",
@@ -175,6 +216,22 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,my-instance.Weekly Demo Data Backup,PROD),Weekly Demo Data Backup)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:db8117ee3cc6397c503e7824ae3e0f6a"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mssql-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataJob",
     "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,my-instance.Weekly Demo Data Backup,PROD),Weekly Demo Data Backup)",
@@ -193,6 +250,31 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,my-instance.Weekly Demo Data Backup,PROD),Weekly Demo Data Backup)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mssql,my-instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mssql,my-instance)"
+                },
+                {
+                    "id": "urn:li:container:db8117ee3cc6397c503e7824ae3e0f6a",
+                    "urn": "urn:li:container:db8117ee3cc6397c503e7824ae3e0f6a"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mssql-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:5726a09b23f60be6f661206c879a3683",
@@ -2516,6 +2598,47 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(mssql,my-instance.DemoData.Foo.stored_procedures,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:db8117ee3cc6397c503e7824ae3e0f6a"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mssql-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataFlow",
+    "entityUrn": "urn:li:dataFlow:(mssql,my-instance.DemoData.Foo.stored_procedures,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mssql,my-instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mssql,my-instance)"
+                },
+                {
+                    "id": "urn:li:container:db8117ee3cc6397c503e7824ae3e0f6a",
+                    "urn": "urn:li:container:db8117ee3cc6397c503e7824ae3e0f6a"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mssql-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataJob",
     "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,my-instance.DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
@@ -2529,8 +2652,8 @@
                 "code": "CREATE PROCEDURE [Foo].[Proc.With.SpecialChar] @ID INT\nAS\n    SELECT @ID AS ThatDB;\n",
                 "input parameters": "['@ID']",
                 "parameter @ID": "{'type': 'int'}",
-                "date_created": "2024-12-30 19:59:24.690000",
-                "date_modified": "2024-12-30 19:59:24.690000"
+                "date_created": "2025-01-28 15:27:31.257000",
+                "date_modified": "2025-01-28 15:27:31.257000"
             },
             "name": "DemoData.Foo.Proc.With.SpecialChar",
             "type": {
@@ -2561,6 +2684,22 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,my-instance.DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:6fbadfb496ee98718da210cc2fca1680"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mssql-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataJob",
     "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,my-instance.DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
@@ -2584,6 +2723,35 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,my-instance.DemoData.Foo.stored_procedures,PROD),Proc.With.SpecialChar)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mssql,my-instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mssql,my-instance)"
+                },
+                {
+                    "id": "urn:li:container:db8117ee3cc6397c503e7824ae3e0f6a",
+                    "urn": "urn:li:container:db8117ee3cc6397c503e7824ae3e0f6a"
+                },
+                {
+                    "id": "urn:li:container:6fbadfb496ee98718da210cc2fca1680",
+                    "urn": "urn:li:container:6fbadfb496ee98718da210cc2fca1680"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mssql-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataJob",
     "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,my-instance.DemoData.Foo.stored_procedures,PROD),NewProc)",
@@ -2596,8 +2764,8 @@
                 "depending_on_procedure": "{}",
                 "code": "CREATE PROCEDURE [Foo].[NewProc]\n    AS\n    BEGIN\n        --insert into items table from salesreason table\n        insert into Foo.Items (ID, ItemName)\n        SELECT TempID, Name\n        FROM Foo.SalesReason;\n\n\n       IF OBJECT_ID('Foo.age_dist', 'U') IS NULL\n       BEGIN\n            -- Create and populate if table doesn't exist\n            SELECT Age, COUNT(*) as Count\n            INTO Foo.age_dist\n            FROM Foo.Persons\n            GROUP BY Age\n        END\n        ELSE\n        BEGIN\n            -- Update existing table\n            TRUNCATE TABLE Foo.age_dist;\n\n            INSERT INTO Foo.age_dist (Age, Count)\n            SELECT Age, COUNT(*) as Count\n            FROM Foo.Persons\n            GROUP BY Age\n        END\n\n        SELECT ID, Age INTO #TEMPTABLE FROM NewData.FooNew.PersonsNew\n        \n        UPDATE DemoData.Foo.Persons\n        SET Age = t.Age\n        FROM DemoData.Foo.Persons p\n        JOIN #TEMPTABLE t ON p.ID = t.ID\n\n    END\n",
                 "input parameters": "[]",
-                "date_created": "2024-12-30 19:59:24.690000",
-                "date_modified": "2024-12-30 19:59:24.690000"
+                "date_created": "2025-01-28 15:27:31.263000",
+                "date_modified": "2025-01-28 15:27:31.263000"
             },
             "name": "DemoData.Foo.NewProc",
             "type": {
@@ -2628,6 +2796,22 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,my-instance.DemoData.Foo.stored_procedures,PROD),NewProc)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:6fbadfb496ee98718da210cc2fca1680"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mssql-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataJob",
     "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,my-instance.DemoData.Foo.stored_procedures,PROD),NewProc)",
@@ -2651,6 +2835,35 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataJob",
+    "entityUrn": "urn:li:dataJob:(urn:li:dataFlow:(mssql,my-instance.DemoData.Foo.stored_procedures,PROD),NewProc)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mssql,my-instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mssql,my-instance)"
+                },
+                {
+                    "id": "urn:li:container:db8117ee3cc6397c503e7824ae3e0f6a",
+                    "urn": "urn:li:container:db8117ee3cc6397c503e7824ae3e0f6a"
+                },
+                {
+                    "id": "urn:li:container:6fbadfb496ee98718da210cc2fca1680",
+                    "urn": "urn:li:container:6fbadfb496ee98718da210cc2fca1680"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mssql-test",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "container",
     "entityUrn": "urn:li:container:5631370915311469374ef3cb5f0ebbf0",
@@ -3046,7 +3259,7 @@
                 "actor": "urn:li:corpuser:_ingestion"
             },
             "lastModified": {
-                "time": 1735588787786,
+                "time": 1738078055642,
                 "actor": "urn:li:corpuser:_ingestion"
             }
         }
diff --git a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_with_lower_case_urn.json b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_with_lower_case_urn.json
index 70f5784d6d0b18..189e673270b007 100644
--- a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_with_lower_case_urn.json
+++ b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_with_lower_case_urn.json
@@ -112,11 +112,11 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "job_id": "f5a6c120-500a-4300-9b21-0c3225af1f80",
+                "job_id": "2fc72675-0c68-4260-ab00-c361b96c8c36",
                 "job_name": "Weekly Demo Data Backup",
                 "description": "No description available.",
-                "date_created": "2024-12-30 19:59:24.690000",
-                "date_modified": "2024-12-30 19:59:24.690000",
+                "date_created": "2025-01-31 08:02:41.167000",
+                "date_modified": "2025-01-31 08:02:41.360000",
                 "step_id": "1",
                 "step_name": "Set database to read only",
                 "subsystem": "TSQL",
@@ -2279,8 +2279,8 @@
                 "code": "CREATE PROCEDURE [Foo].[Proc.With.SpecialChar] @ID INT\nAS\n    SELECT @ID AS ThatDB;\n",
                 "input parameters": "['@ID']",
                 "parameter @ID": "{'type': 'int'}",
-                "date_created": "2024-12-30 19:59:24.690000",
-                "date_modified": "2024-12-30 19:59:24.690000"
+                "date_created": "2025-01-31 08:02:40.980000",
+                "date_modified": "2025-01-31 08:02:40.980000"
             },
             "name": "DemoData.Foo.Proc.With.SpecialChar",
             "type": {
@@ -2329,8 +2329,8 @@
                 "depending_on_procedure": "{}",
                 "code": "CREATE PROCEDURE [Foo].[NewProc]\n    AS\n    BEGIN\n        --insert into items table from salesreason table\n        insert into Foo.Items (ID, ItemName)\n        SELECT TempID, Name\n        FROM Foo.SalesReason;\n\n\n       IF OBJECT_ID('Foo.age_dist', 'U') IS NULL\n       BEGIN\n            -- Create and populate if table doesn't exist\n            SELECT Age, COUNT(*) as Count\n            INTO Foo.age_dist\n            FROM Foo.Persons\n            GROUP BY Age\n        END\n        ELSE\n        BEGIN\n            -- Update existing table\n            TRUNCATE TABLE Foo.age_dist;\n\n            INSERT INTO Foo.age_dist (Age, Count)\n            SELECT Age, COUNT(*) as Count\n            FROM Foo.Persons\n            GROUP BY Age\n        END\n\n        SELECT ID, Age INTO #TEMPTABLE FROM NewData.FooNew.PersonsNew\n        \n        UPDATE DemoData.Foo.Persons\n        SET Age = t.Age\n        FROM DemoData.Foo.Persons p\n        JOIN #TEMPTABLE t ON p.ID = t.ID\n\n    END\n",
                 "input parameters": "[]",
-                "date_created": "2024-12-30 19:59:24.690000",
-                "date_modified": "2024-12-30 19:59:24.690000"
+                "date_created": "2025-01-31 08:02:40.987000",
+                "date_modified": "2025-01-31 08:02:40.987000"
             },
             "name": "DemoData.Foo.NewProc",
             "type": {
@@ -5019,7 +5019,7 @@
                 "actor": "urn:li:corpuser:_ingestion"
             },
             "lastModified": {
-                "time": 1735588791954,
+                "time": 1738310566860,
                 "actor": "urn:li:corpuser:_ingestion"
             }
         }
@@ -5166,7 +5166,7 @@
                 "actor": "urn:li:corpuser:_ingestion"
             },
             "lastModified": {
-                "time": 1735588791966,
+                "time": 1738310566866,
                 "actor": "urn:li:corpuser:_ingestion"
             }
         }
diff --git a/metadata-ingestion/tests/integration/sql_server/source_files/mssql_to_file.yml b/metadata-ingestion/tests/integration/sql_server/source_files/mssql_to_file.yml
index e003ec39cd5282..7067d04c61097c 100644
--- a/metadata-ingestion/tests/integration/sql_server/source_files/mssql_to_file.yml
+++ b/metadata-ingestion/tests/integration/sql_server/source_files/mssql_to_file.yml
@@ -8,6 +8,7 @@ source:
     database: DemoData
     host_port: localhost:21433
     platform_instance: my-instance
+    include_containers_for_pipelines: true
     # use_odbc: True
     # uri_args:
     #   driver: "ODBC Driver 17 for SQL Server"

From bde5c73ca465faedca325564b3988ef14b7f0b28 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Fri, 31 Jan 2025 16:12:45 +0530
Subject: [PATCH 199/249] fix(ingest/glue): change to warning on access denied
 (#12519)

---
 metadata-ingestion/src/datahub/ingestion/source/aws/glue.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py b/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
index 214b14a2b6c100..7c8eb2cd31236c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py
@@ -113,6 +113,7 @@
 )
 from datahub.utilities.delta import delta_type_to_hive_type
 from datahub.utilities.hive_schema_to_avro import get_schema_fields_for_hive_column
+from datahub.utilities.lossy_collections import LossyList
 
 logger = logging.getLogger(__name__)
 
@@ -220,7 +221,7 @@ def platform_validator(cls, v: str) -> str:
 class GlueSourceReport(StaleEntityRemovalSourceReport):
     catalog_id: Optional[str] = None
     tables_scanned = 0
-    filtered: List[str] = dataclass_field(default_factory=list)
+    filtered: LossyList[str] = dataclass_field(default_factory=LossyList)
     databases: EntityFilterReport = EntityFilterReport.field(type="database")
 
     num_job_script_location_missing: int = 0
@@ -746,7 +747,7 @@ def get_all_databases_and_tables(
                 for tables in self.get_tables_from_database(database):
                     all_tables.append(tables)
             except Exception as e:
-                self.report.failure(
+                self.report.warning(
                     message="Failed to get tables from database",
                     context=database["Name"],
                     exc=e,

From 9f111f8148b048a3fecbe954a20e222dcbdb2dab Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Fri, 31 Jan 2025 17:57:39 +0530
Subject: [PATCH 200/249] fix(ingest/mode): remove unused field (#12520)

---
 metadata-ingestion/src/datahub/ingestion/source/mode.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/mode.py b/metadata-ingestion/src/datahub/ingestion/source/mode.py
index bf0a33e423446a..13d92e8e41a966 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/mode.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/mode.py
@@ -24,6 +24,7 @@
 import datahub.emitter.mce_builder as builder
 from datahub.configuration.common import AllowDenyPattern, ConfigModel
 from datahub.configuration.source_common import DatasetLineageProviderConfigBase
+from datahub.configuration.validate_field_removal import pydantic_removed_field
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.emitter.mcp_builder import (
     ContainerKey,
@@ -155,10 +156,7 @@ class ModeConfig(StatefulIngestionConfigBase, DatasetLineageProviderConfigBase):
     workspace: str = Field(
         description="The Mode workspace name. Find it in Settings > Workspace > Details."
     )
-    default_schema: str = Field(
-        default="public",
-        description="Default schema to use when schema is not provided in an SQL query",
-    )
+    _default_schema = pydantic_removed_field("default_schema")
 
     space_pattern: AllowDenyPattern = Field(
         default=AllowDenyPattern(

From 4d5f3a5cd534dfb5438f52622fed9b26f2a82773 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Fri, 31 Jan 2025 18:29:18 +0530
Subject: [PATCH 201/249] docs: fix link to executor helm chart (#12522)

---
 .../operator-guide/setting-up-remote-ingestion-executor.md    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/managed-datahub/operator-guide/setting-up-remote-ingestion-executor.md b/docs/managed-datahub/operator-guide/setting-up-remote-ingestion-executor.md
index 7a58363cea6589..68ba9af38dd2ea 100644
--- a/docs/managed-datahub/operator-guide/setting-up-remote-ingestion-executor.md
+++ b/docs/managed-datahub/operator-guide/setting-up-remote-ingestion-executor.md
@@ -102,9 +102,9 @@ In order to update the executor, ie. to deploy a new container version, you'll n
 
 ### Deploying on Kubernetes
 
-The Helm chart [datahub-executor-worker](https://github.com/acryldata/datahub-executor-helm/tree/main/charts/datahub-executor-worker) can be used to deploy on a Kubernetes cluster. These instructions also apply for deploying to Amazon Elastic Kubernetes Service (EKS) or Google Kubernetes Engine (GKE).
+The Helm chart [datahub-executor-worker](https://executor-helm.acryl.io/index.yaml) can be used to deploy on a Kubernetes cluster. These instructions also apply for deploying to Amazon Elastic Kubernetes Service (EKS) or Google Kubernetes Engine (GKE).
 
-1. **Download Chart**: Download the [latest release](https://github.com/acryldata/datahub-executor-helm/releases) of the chart
+1. **Download Chart**: Download the [latest release](https://executor-helm.acryl.io/index.yaml) of the chart
 2. **Unpack the release archive**:
   ```
   tar zxvf v0.0.4.tar.gz --strip-components=2

From 6d05971073cacccf331f42a75d629dd524661a19 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Fri, 31 Jan 2025 05:05:57 -0800
Subject: [PATCH 202/249] fix(ingest): add missing dep for gcs (#12505)

---
 metadata-ingestion/setup.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py
index 628c7156dadd5c..9a421fc92f2e45 100644
--- a/metadata-ingestion/setup.py
+++ b/metadata-ingestion/setup.py
@@ -301,6 +301,8 @@
 data_lake_profiling = {
     "pydeequ>=1.1.0",
     "pyspark~=3.5.0",
+    # cachetools is used by the profiling config
+    *cachetools_lib,
 }
 
 delta_lake = {
@@ -485,9 +487,9 @@
     | classification_lib
     | {"db-dtypes"}  # Pandas extension data types
     | cachetools_lib,
-    "s3": {*s3_base, *data_lake_profiling, *cachetools_lib},
+    "s3": {*s3_base, *data_lake_profiling},
     "gcs": {*s3_base, *data_lake_profiling},
-    "abs": {*abs_base, *data_lake_profiling, *cachetools_lib},
+    "abs": {*abs_base, *data_lake_profiling},
     "sagemaker": aws_common,
     "salesforce": {"simple-salesforce", *cachetools_lib},
     "snowflake": snowflake_common | usage_common | sqlglot_lib,

From df24dfa5c7c5deab45b4367ec99f641a0d21d8e1 Mon Sep 17 00:00:00 2001
From: Gabe Lyons <gabe.lyons@acryl.io>
Date: Fri, 31 Jan 2025 05:06:28 -0800
Subject: [PATCH 203/249] docs(entity-change-events): add docs for action
 request events (#12493)

Co-authored-by: John Joyce <john@acryl.io>
---
 docs/actions/events/entity-change-event.md | 179 +++++++++++++++++++++
 1 file changed, 179 insertions(+)

diff --git a/docs/actions/events/entity-change-event.md b/docs/actions/events/entity-change-event.md
index 4a7264c20bcc62..ff992f90480307 100644
--- a/docs/actions/events/entity-change-event.md
+++ b/docs/actions/events/entity-change-event.md
@@ -417,3 +417,182 @@ This event is emitted when a new entity has been hard-deleted on DataHub.
   }
 }
 ```
+
+## Action Request Events (Proposals)
+
+Action Request events represent proposals for changes to entities that may require approval before being applied. These events have entityType "actionRequest" and use the `LIFECYCLE` category with `CREATE` operation.
+
+### Domain Association Request Event
+
+This event is emitted when a domain association is proposed for an entity on DataHub.
+
+#### Sample Event
+```json
+{
+  "entityType": "actionRequest",
+  "entityUrn": "urn:li:actionRequest:abc-123",
+  "category": "LIFECYCLE",
+  "operation": "CREATE",
+  "auditStamp": {
+    "actor": "urn:li:corpuser:jdoe",
+    "time": 1234567890
+  },
+  "version": 0,
+  "parameters": {
+    "domains": "[\"urn:li:domain:marketing\"]",
+    "actionRequestType": "DOMAIN_ASSOCIATION",
+    "resourceUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,example.table,PROD)",
+    "resourceType": "dataset"
+  }
+}
+```
+
+### Owner Association Request Event
+
+This event is emitted when an owner association is proposed for an entity on DataHub.
+
+#### Sample Event
+```json
+{
+  "entityType": "actionRequest",
+  "entityUrn": "urn:li:actionRequest:def-456",
+  "category": "LIFECYCLE", 
+  "operation": "CREATE",
+  "auditStamp": {
+    "actor": "urn:li:corpuser:jdoe",
+    "time": 1234567890
+  },
+  "version": 0,
+  "parameters": {
+    "owners": "[{\"type\":\"TECHNICAL_OWNER\",\"typeUrn\":\"urn:li:ownershipType:technical_owner\",\"ownerUrn\":\"urn:li:corpuser:jdoe\"}]",
+    "actionRequestType": "OWNER_ASSOCIATION",
+    "resourceUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,example.table,PROD)",
+    "resourceType": "dataset"
+  }
+}
+```
+
+### Tag Association Request Event
+
+This event is emitted when a tag association is proposed for an entity on DataHub.
+
+#### Sample Event
+```json
+{
+  "entityType": "actionRequest",
+  "entityUrn": "urn:li:actionRequest:ghi-789",
+  "category": "LIFECYCLE",
+  "operation": "CREATE",
+  "auditStamp": {
+    "actor": "urn:li:corpuser:jdoe",
+    "time": 1234567890
+  },
+  "version": 0,
+  "parameters": {
+    "actionRequestType": "TAG_ASSOCIATION",
+    "resourceUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,example.table,PROD)",
+    "tagUrn": "urn:li:tag:pii",
+    "resourceType": "dataset"
+  }
+}
+```
+
+### Create Glossary Term Request Event
+
+This event is emitted when a new glossary term creation is proposed on DataHub.
+
+#### Sample Event
+```json
+{
+  "entityType": "actionRequest",
+  "entityUrn": "urn:li:actionRequest:jkl-101",
+  "category": "LIFECYCLE",
+  "operation": "CREATE",
+  "auditStamp": {
+    "actor": "urn:li:corpuser:jdoe",
+    "time": 1234567890
+  },
+  "version": 0,
+  "parameters": {
+    "parentNodeUrn": "urn:li:glossaryNode:123",
+    "glossaryEntityName": "ExampleTerm",
+    "actionRequestType": "CREATE_GLOSSARY_TERM",
+    "resourceType": "glossaryTerm"
+  }
+}
+```
+
+### Term Association Request Event
+
+This event is emitted when a glossary term association is proposed for an entity on DataHub.
+
+#### Sample Event
+```json
+{
+  "entityType": "actionRequest",
+  "entityUrn": "urn:li:actionRequest:mno-102",
+  "category": "LIFECYCLE",
+  "operation": "CREATE",
+  "auditStamp": {
+    "actor": "urn:li:corpuser:jdoe",
+    "time": 1234567890
+  },
+  "version": 0,
+  "parameters": {
+    "glossaryTermUrn": "urn:li:glossaryTerm:123",
+    "actionRequestType": "TERM_ASSOCIATION",
+    "resourceUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,example.table,PROD)",
+    "resourceType": "dataset"
+  }
+}
+```
+
+### Update Description Request Event
+
+This event is emitted when an update to an entity's description is proposed on DataHub.
+
+#### Sample Event
+```json
+{
+  "entityType": "actionRequest",
+  "entityUrn": "urn:li:actionRequest:pqr-103",
+  "category": "LIFECYCLE",
+  "operation": "CREATE",
+  "auditStamp": {
+    "actor": "urn:li:corpuser:jdoe",
+    "time": 1234567890
+  },
+  "version": 0,
+  "parameters": {
+    "description": "Example description for a dataset.",
+    "actionRequestType": "UPDATE_DESCRIPTION",
+    "resourceUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,example.table,PROD)",
+    "resourceType": "dataset"
+  }
+}
+```
+
+### Structured Property Association Request Event
+
+This event is emitted when a structured property association is proposed for an entity on DataHub.
+
+#### Sample Event
+```json
+{
+  "entityType": "actionRequest",
+  "entityUrn": "urn:li:actionRequest:stu-104",
+  "category": "LIFECYCLE",
+  "operation": "CREATE",
+  "auditStamp": {
+    "actor": "urn:li:corpuser:jdoe",
+    "time": 1234567890
+  },
+  "version": 0,
+  "parameters": {
+    "structuredProperties": "[{\"propertyUrn\":\"urn:li:structuredProperty:123\",\"values\":[\"value1\",\"value2\"]}]",
+    "actionRequestType": "STRUCTURED_PROPERTY_ASSOCIATION", 
+    "resourceUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,example.table,PROD)",
+    "resourceType": "dataset"
+  }
+}
+```

From e28e682d07906984eeca1a655f43c074e53c8473 Mon Sep 17 00:00:00 2001
From: sagar-salvi-apptware
 <159135491+sagar-salvi-apptware@users.noreply.github.com>
Date: Fri, 31 Jan 2025 18:37:18 +0530
Subject: [PATCH 204/249] docs(ingest): script to add ERModelRelationship
 Entity (#12473)

---
 .../library/create_ermodelrelationship.py     | 134 ++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100644 metadata-ingestion/examples/library/create_ermodelrelationship.py

diff --git a/metadata-ingestion/examples/library/create_ermodelrelationship.py b/metadata-ingestion/examples/library/create_ermodelrelationship.py
new file mode 100644
index 00000000000000..9456a7024d333a
--- /dev/null
+++ b/metadata-ingestion/examples/library/create_ermodelrelationship.py
@@ -0,0 +1,134 @@
+import time
+
+from datahub.emitter.mce_builder import make_data_platform_urn, make_dataset_urn
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.emitter.rest_emitter import DatahubRestEmitter
+from datahub.metadata.schema_classes import (
+    AuditStampClass,
+    ERModelRelationshipCardinalityClass,
+    ERModelRelationshipKeyClass,
+    ERModelRelationshipPropertiesClass,
+    NumberTypeClass,
+    OtherSchemaClass,
+    RelationshipFieldMappingClass,
+    SchemaFieldClass,
+    SchemaFieldDataTypeClass,
+    SchemaMetadataClass,
+    StringTypeClass,
+)
+
+# Configuration
+GMS_ENDPOINT = "http://localhost:8080"
+PLATFORM = "mysql"
+ENV = "PROD"
+
+e = DatahubRestEmitter(gms_server=GMS_ENDPOINT, extra_headers={})
+
+
+def get_schema_field(
+    name: str, dtype: str, type: SchemaFieldDataTypeClass
+) -> SchemaFieldClass:
+    """Creates a schema field for MySQL columns."""
+
+    field = SchemaFieldClass(
+        fieldPath=name,
+        type=type,
+        nativeDataType=dtype,
+        description=name,
+        lastModified=AuditStampClass(
+            time=int(time.time() * 1000),
+            actor="urn:li:corpuser:ingestion",
+        ),
+    )
+    if name == "id":
+        field.isPartitioningKey = True
+    return field
+
+
+# Define Employee Table
+dataset_employee = make_dataset_urn(PLATFORM, "Employee", ENV)
+employee_fields = [
+    get_schema_field("id", "int", SchemaFieldDataTypeClass(type=NumberTypeClass())),
+    get_schema_field(
+        "name", "varchar", SchemaFieldDataTypeClass(type=StringTypeClass())
+    ),
+    get_schema_field("age", "int", SchemaFieldDataTypeClass(type=NumberTypeClass())),
+    get_schema_field(
+        "company_id", "int", SchemaFieldDataTypeClass(type=NumberTypeClass())
+    ),
+]
+
+e.emit_mcp(
+    MetadataChangeProposalWrapper(
+        entityUrn=dataset_employee,
+        aspect=SchemaMetadataClass(
+            schemaName="Employee",
+            platform=make_data_platform_urn(PLATFORM),
+            fields=employee_fields,
+            version=0,
+            hash="",
+            platformSchema=OtherSchemaClass(rawSchema=""),
+        ),
+    )
+)
+
+# Define Company Table
+dataset_company = make_dataset_urn(PLATFORM, "Company", ENV)
+company_fields = [
+    get_schema_field("id", "int", SchemaFieldDataTypeClass(type=NumberTypeClass())),
+    get_schema_field(
+        "name", "varchar", SchemaFieldDataTypeClass(type=StringTypeClass())
+    ),
+]
+
+e.emit_mcp(
+    MetadataChangeProposalWrapper(
+        entityUrn=dataset_company,
+        aspect=SchemaMetadataClass(
+            schemaName="Company",
+            platform=make_data_platform_urn(PLATFORM),
+            fields=company_fields,
+            version=0,
+            hash="",
+            platformSchema=OtherSchemaClass(rawSchema=""),
+        ),
+    )
+)
+
+# Establish Relationship (Foreign Key: Employee.company_id → Company.id)
+relationship_key = ERModelRelationshipKeyClass(id="employee_to_company")
+relationship_properties = ERModelRelationshipPropertiesClass(
+    name="Employee to Company Relationship",
+    source=dataset_employee,
+    destination=dataset_company,
+    relationshipFieldMappings=[
+        RelationshipFieldMappingClass(sourceField="company_id", destinationField="id")
+    ],
+    cardinality=ERModelRelationshipCardinalityClass.N_ONE,
+    customProperties={"constraint": "Foreign Key", "index": "company_id"},
+)
+
+relationship_urn = f"urn:li:erModelRelationship:{relationship_key.id}"
+
+e.emit_mcp(
+    MetadataChangeProposalWrapper(
+        entityType="erModelRelationship",
+        changeType="UPSERT",
+        entityKeyAspect=relationship_key,
+        aspectName=relationship_key.ASPECT_NAME,
+        aspect=relationship_key,
+    )
+)
+
+e.emit_mcp(
+    MetadataChangeProposalWrapper(
+        entityUrn=relationship_urn,
+        entityType="erModelRelationship",
+        changeType="UPSERT",
+        aspectName=relationship_properties.ASPECT_NAME,
+        aspect=relationship_properties,
+    )
+)
+
+print("relationship_urn", relationship_urn)
+print("Employee and Company tables created with ERModelRelationship linking them.")

From e2b1ed7530f1c4019d331aa98bf9782225a49b5c Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Fri, 31 Jan 2025 08:33:24 -0600
Subject: [PATCH 205/249] refactor(trace-model): refactor trace model package
 (#12510)

---
 .../java/com/linkedin/metadata/trace/KafkaTraceReader.java  | 4 ++--
 .../java/com/linkedin/metadata/trace/TraceServiceImpl.java  | 6 +++---
 .../linkedin/metadata/trace/BaseKafkaTraceReaderTest.java   | 4 ++--
 .../com/linkedin/metadata/trace/TraceServiceImplTest.java   | 6 +++---
 metadata-service/openapi-servlet/models/build.gradle        | 1 -
 .../datahubproject/openapi/v1/models/TraceResponseV1.java   | 1 -
 .../io/datahubproject/openapi/v1/models}/TraceStatus.java   | 2 +-
 .../openapi/v1/models}/TraceStorageStatus.java              | 2 +-
 .../datahubproject/openapi/v1/models}/TraceWriteStatus.java | 2 +-
 .../openapi/operations/v1/TraceControllerTest.java          | 6 +++---
 metadata-service/services/build.gradle                      | 1 +
 .../com/linkedin/metadata/systemmetadata/TraceService.java  | 1 +
 12 files changed, 18 insertions(+), 18 deletions(-)
 rename metadata-service/{services/src/main/java/com/linkedin/metadata/systemmetadata => openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models}/TraceStatus.java (88%)
 rename metadata-service/{services/src/main/java/com/linkedin/metadata/systemmetadata => openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models}/TraceStorageStatus.java (97%)
 rename metadata-service/{services/src/main/java/com/linkedin/metadata/systemmetadata => openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models}/TraceWriteStatus.java (90%)

diff --git a/metadata-io/src/main/java/com/linkedin/metadata/trace/KafkaTraceReader.java b/metadata-io/src/main/java/com/linkedin/metadata/trace/KafkaTraceReader.java
index 9ce8a1b91e66c7..8b045084c2c5c2 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/trace/KafkaTraceReader.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/trace/KafkaTraceReader.java
@@ -6,10 +6,10 @@
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.data.template.RecordTemplate;
-import com.linkedin.metadata.systemmetadata.TraceStorageStatus;
-import com.linkedin.metadata.systemmetadata.TraceWriteStatus;
 import com.linkedin.mxe.SystemMetadata;
 import com.linkedin.util.Pair;
+import io.datahubproject.openapi.v1.models.TraceStorageStatus;
+import io.datahubproject.openapi.v1.models.TraceWriteStatus;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/trace/TraceServiceImpl.java b/metadata-io/src/main/java/com/linkedin/metadata/trace/TraceServiceImpl.java
index 51e30bd6f6658d..47eddba4322466 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/trace/TraceServiceImpl.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/trace/TraceServiceImpl.java
@@ -11,9 +11,6 @@
 import com.linkedin.metadata.run.AspectRowSummary;
 import com.linkedin.metadata.systemmetadata.SystemMetadataService;
 import com.linkedin.metadata.systemmetadata.TraceService;
-import com.linkedin.metadata.systemmetadata.TraceStatus;
-import com.linkedin.metadata.systemmetadata.TraceStorageStatus;
-import com.linkedin.metadata.systemmetadata.TraceWriteStatus;
 import com.linkedin.mxe.FailedMetadataChangeProposal;
 import com.linkedin.mxe.SystemMetadata;
 import com.linkedin.util.Pair;
@@ -21,6 +18,9 @@
 import io.datahubproject.metadata.context.TraceContext;
 import io.datahubproject.metadata.context.TraceIdGenerator;
 import io.datahubproject.metadata.exception.TraceException;
+import io.datahubproject.openapi.v1.models.TraceStatus;
+import io.datahubproject.openapi.v1.models.TraceStorageStatus;
+import io.datahubproject.openapi.v1.models.TraceWriteStatus;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/trace/BaseKafkaTraceReaderTest.java b/metadata-io/src/test/java/com/linkedin/metadata/trace/BaseKafkaTraceReaderTest.java
index c5217475362295..06e40a4e142f9e 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/trace/BaseKafkaTraceReaderTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/trace/BaseKafkaTraceReaderTest.java
@@ -12,11 +12,11 @@
 import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.data.template.RecordTemplate;
 import com.linkedin.data.template.StringMap;
-import com.linkedin.metadata.systemmetadata.TraceStorageStatus;
-import com.linkedin.metadata.systemmetadata.TraceWriteStatus;
 import com.linkedin.mxe.SystemMetadata;
 import com.linkedin.util.Pair;
 import io.datahubproject.metadata.context.TraceContext;
+import io.datahubproject.openapi.v1.models.TraceStorageStatus;
+import io.datahubproject.openapi.v1.models.TraceWriteStatus;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Collections;
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/trace/TraceServiceImplTest.java b/metadata-io/src/test/java/com/linkedin/metadata/trace/TraceServiceImplTest.java
index abe65d48b3410a..1ec575e5567a97 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/trace/TraceServiceImplTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/trace/TraceServiceImplTest.java
@@ -25,9 +25,6 @@
 import com.linkedin.metadata.entity.EntityService;
 import com.linkedin.metadata.run.AspectRowSummary;
 import com.linkedin.metadata.systemmetadata.SystemMetadataService;
-import com.linkedin.metadata.systemmetadata.TraceStatus;
-import com.linkedin.metadata.systemmetadata.TraceStorageStatus;
-import com.linkedin.metadata.systemmetadata.TraceWriteStatus;
 import com.linkedin.mxe.FailedMetadataChangeProposal;
 import com.linkedin.mxe.MetadataChangeProposal;
 import com.linkedin.mxe.SystemMetadata;
@@ -35,6 +32,9 @@
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.metadata.context.TraceContext;
 import io.datahubproject.metadata.context.TraceIdGenerator;
+import io.datahubproject.openapi.v1.models.TraceStatus;
+import io.datahubproject.openapi.v1.models.TraceStorageStatus;
+import io.datahubproject.openapi.v1.models.TraceWriteStatus;
 import io.datahubproject.test.metadata.context.TestOperationContexts;
 import java.time.Instant;
 import java.util.Collections;
diff --git a/metadata-service/openapi-servlet/models/build.gradle b/metadata-service/openapi-servlet/models/build.gradle
index dbc51ca17e3388..d75e656e5ecd6c 100644
--- a/metadata-service/openapi-servlet/models/build.gradle
+++ b/metadata-service/openapi-servlet/models/build.gradle
@@ -6,7 +6,6 @@ dependencies {
   implementation project(':entity-registry')
   implementation project(':metadata-operation-context')
   implementation project(':metadata-auth:auth-api')
-  implementation project(':metadata-service:services')
 
   implementation externalDependency.jacksonDataBind
   implementation externalDependency.httpClient
diff --git a/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceResponseV1.java b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceResponseV1.java
index 5fc721c2812d41..5c3c14ee57d4cb 100644
--- a/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceResponseV1.java
+++ b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceResponseV1.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.linkedin.common.urn.Urn;
-import com.linkedin.metadata.systemmetadata.TraceStatus;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import lombok.AllArgsConstructor;
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStatus.java b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceStatus.java
similarity index 88%
rename from metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStatus.java
rename to metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceStatus.java
index 35bdecee459e1e..720c7c2a150f11 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStatus.java
+++ b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceStatus.java
@@ -1,4 +1,4 @@
-package com.linkedin.metadata.systemmetadata;
+package io.datahubproject.openapi.v1.models;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStorageStatus.java b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceStorageStatus.java
similarity index 97%
rename from metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStorageStatus.java
rename to metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceStorageStatus.java
index 0def8785a6b823..b3fb486b006cf8 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStorageStatus.java
+++ b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceStorageStatus.java
@@ -1,4 +1,4 @@
-package com.linkedin.metadata.systemmetadata;
+package io.datahubproject.openapi.v1.models;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.datahubproject.metadata.exception.TraceException;
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceWriteStatus.java b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceWriteStatus.java
similarity index 90%
rename from metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceWriteStatus.java
rename to metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceWriteStatus.java
index 78bccd6bf1ccf7..7fcbe03f1daf79 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceWriteStatus.java
+++ b/metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceWriteStatus.java
@@ -1,4 +1,4 @@
-package com.linkedin.metadata.systemmetadata;
+package io.datahubproject.openapi.v1.models;
 
 public enum TraceWriteStatus {
   // error occurred during processing
diff --git a/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/operations/v1/TraceControllerTest.java b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/operations/v1/TraceControllerTest.java
index ca26ba42832009..d4f387e618eb17 100644
--- a/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/operations/v1/TraceControllerTest.java
+++ b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/operations/v1/TraceControllerTest.java
@@ -18,15 +18,15 @@
 import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.metadata.models.registry.EntityRegistry;
 import com.linkedin.metadata.systemmetadata.TraceService;
-import com.linkedin.metadata.systemmetadata.TraceStatus;
-import com.linkedin.metadata.systemmetadata.TraceStorageStatus;
-import com.linkedin.metadata.systemmetadata.TraceWriteStatus;
 import io.datahubproject.metadata.context.ObjectMapperContext;
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.metadata.context.TraceContext;
 import io.datahubproject.openapi.config.TracingInterceptor;
 import io.datahubproject.openapi.v1.models.TraceRequestV1;
 import io.datahubproject.openapi.v1.models.TraceResponseV1;
+import io.datahubproject.openapi.v1.models.TraceStatus;
+import io.datahubproject.openapi.v1.models.TraceStorageStatus;
+import io.datahubproject.openapi.v1.models.TraceWriteStatus;
 import io.datahubproject.test.metadata.context.TestOperationContexts;
 import java.util.List;
 import java.util.Map;
diff --git a/metadata-service/services/build.gradle b/metadata-service/services/build.gradle
index 0e84580cc04da5..19815385825f17 100644
--- a/metadata-service/services/build.gradle
+++ b/metadata-service/services/build.gradle
@@ -16,6 +16,7 @@ dependencies {
     implementation project(':metadata-events:mxe-avro')
     implementation project(':metadata-events:mxe-registration')
     implementation project(':metadata-events:mxe-utils-avro')
+    api project(':metadata-service:openapi-servlet:models')
     api project(path: ':metadata-models', configuration: 'dataTemplate')
     api project(':metadata-models')
 
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceService.java b/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceService.java
index 1b6f32da1162fb..1b92200d0e1fd9 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceService.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceService.java
@@ -2,6 +2,7 @@
 
 import com.linkedin.common.urn.Urn;
 import io.datahubproject.metadata.context.OperationContext;
+import io.datahubproject.openapi.v1.models.TraceStatus;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nonnull;

From 696386389ba0fc45e3303646474f884ae0fe4175 Mon Sep 17 00:00:00 2001
From: Chakru <161002324+chakru-r@users.noreply.github.com>
Date: Fri, 31 Jan 2025 22:16:16 +0530
Subject: [PATCH 206/249] fix(ci): run smoke tests on release (#12518)

---
 .github/workflows/docker-unified.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker-unified.yml b/.github/workflows/docker-unified.yml
index a756b27a38e848..704479d958bc12 100644
--- a/.github/workflows/docker-unified.yml
+++ b/.github/workflows/docker-unified.yml
@@ -1039,12 +1039,12 @@ jobs:
           cypress_matrix=$(printf "{\"test_strategy\":\"cypress\",\"batch\":\"0\",\"batch_count\":\"$cypress_batch_count\"}"; for ((i=1;i<cypress_batch_count;i++)); do printf ",{\"test_strategy\":\"cypress\", \"batch_count\":\"$cypress_batch_count\",\"batch\":\"%d\"}" $i; done)
           
           includes=''
-          if [[  "${{ needs.setup.outputs.frontend_only }}" == 'true' ]]; then
-            includes=$cypress_matrix
-          elif [ "${{ needs.setup.outputs.ingestion_only }}" == 'true' ]; then
-            includes=$python_matrix
-          elif [[ "${{ needs.setup.outputs.backend_change }}" == 'true' || "${{ needs.setup.outputs.smoke_test_change }}" == 'true' ]]; then
+          if [[ "${{ needs.setup.outputs.backend_change }}" == 'true' || "${{ needs.setup.outputs.smoke_test_change }}" == 'true' || "${{ needs.setup.outputs.publish }}" == 'true' ]]; then
             includes="$python_matrix,$cypress_matrix"
+          elif [[  "${{ needs.setup.outputs.frontend_only }}" == 'true' ]]; then
+            includes="$cypress_matrix"
+          elif [[ "${{ needs.setup.outputs.ingestion_only }}" == 'true' ]]; then
+            includes="$python_matrix"
           fi
           echo "matrix={\"include\":[$includes] }" >> "$GITHUB_OUTPUT"
 

From ec0eb069dbd1bc43df02ed813550ab4b22ccb5d9 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Fri, 31 Jan 2025 11:59:21 -0600
Subject: [PATCH 207/249] chore(bump): bump jmx version (#12524)

---
 docker/datahub-frontend/Dockerfile     | 2 +-
 docker/datahub-gms/Dockerfile          | 2 +-
 docker/datahub-mae-consumer/Dockerfile | 2 +-
 docker/datahub-mce-consumer/Dockerfile | 2 +-
 docker/datahub-upgrade/Dockerfile      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/datahub-frontend/Dockerfile b/docker/datahub-frontend/Dockerfile
index 16e6477c37ce69..43659cb4362985 100644
--- a/docker/datahub-frontend/Dockerfile
+++ b/docker/datahub-frontend/Dockerfile
@@ -15,7 +15,7 @@ RUN if [ "${ALPINE_REPO_URL}" != "http://dl-cdn.alpinelinux.org/alpine" ] ; then
 
 # Upgrade Alpine and base packages
 # PFP-260: Upgrade Sqlite to >=3.28.0-r0 to fix https://security.snyk.io/vuln/SNYK-ALPINE39-SQLITE-449762
-ENV JMX_VERSION=0.18.0
+ENV JMX_VERSION=0.20.0
 RUN apk --no-cache --update-cache --available upgrade \
     && apk --no-cache add curl sqlite libc6-compat snappy \
     && apk --no-cache add openjdk17-jre-headless --repository=${ALPINE_REPO_URL}/edge/community \
diff --git a/docker/datahub-gms/Dockerfile b/docker/datahub-gms/Dockerfile
index 5462d4f70002c1..232802a6bad8b8 100644
--- a/docker/datahub-gms/Dockerfile
+++ b/docker/datahub-gms/Dockerfile
@@ -25,7 +25,7 @@ RUN go install github.com/jwilder/dockerize@$DOCKERIZE_VERSION
 
 FROM alpine:3.21 AS base
 
-ENV JMX_VERSION=0.18.0
+ENV JMX_VERSION=0.20.0
 
 # Re-declaring args from above to make them available in this stage (will inherit default values)
 ARG ALPINE_REPO_URL
diff --git a/docker/datahub-mae-consumer/Dockerfile b/docker/datahub-mae-consumer/Dockerfile
index 4ddec56311fb96..828b505b8b5a80 100644
--- a/docker/datahub-mae-consumer/Dockerfile
+++ b/docker/datahub-mae-consumer/Dockerfile
@@ -34,7 +34,7 @@ ARG MAVEN_CENTRAL_REPO_URL
 RUN if [ "${ALPINE_REPO_URL}" != "http://dl-cdn.alpinelinux.org/alpine" ] ; then sed -i "s#http.*://dl-cdn.alpinelinux.org/alpine#${ALPINE_REPO_URL}#g" /etc/apk/repositories ; fi
 
 # Upgrade Alpine and base packages
-ENV JMX_VERSION=0.18.0
+ENV JMX_VERSION=0.20.0
 # PFP-260: Upgrade Sqlite to >=3.28.0-r0 to fix https://security.snyk.io/vuln/SNYK-ALPINE39-SQLITE-449762
 RUN apk --no-cache --update-cache --available upgrade \
     && apk --no-cache add curl bash coreutils sqlite libc6-compat snappy \
diff --git a/docker/datahub-mce-consumer/Dockerfile b/docker/datahub-mce-consumer/Dockerfile
index 42e40cd5942144..b5a73481518dc1 100644
--- a/docker/datahub-mce-consumer/Dockerfile
+++ b/docker/datahub-mce-consumer/Dockerfile
@@ -34,7 +34,7 @@ ARG MAVEN_CENTRAL_REPO_URL
 RUN if [ "${ALPINE_REPO_URL}" != "http://dl-cdn.alpinelinux.org/alpine" ] ; then sed -i "s#http.*://dl-cdn.alpinelinux.org/alpine#${ALPINE_REPO_URL}#g" /etc/apk/repositories ; fi
 
 # Upgrade Alpine and base packages
-ENV JMX_VERSION=0.18.0
+ENV JMX_VERSION=0.20.0
 # PFP-260: Upgrade Sqlite to >=3.28.0-r0 to fix https://security.snyk.io/vuln/SNYK-ALPINE39-SQLITE-449762
 RUN apk --no-cache --update-cache --available upgrade \
     && apk --no-cache add curl bash sqlite libc6-compat snappy \
diff --git a/docker/datahub-upgrade/Dockerfile b/docker/datahub-upgrade/Dockerfile
index d63ceb83dc5295..bd4b560b8347cf 100644
--- a/docker/datahub-upgrade/Dockerfile
+++ b/docker/datahub-upgrade/Dockerfile
@@ -33,7 +33,7 @@ ARG MAVEN_CENTRAL_REPO_URL
 # Optionally set corporate mirror for apk
 RUN if [ "${ALPINE_REPO_URL}" != "http://dl-cdn.alpinelinux.org/alpine" ] ; then sed -i "s#http.*://dl-cdn.alpinelinux.org/alpine#${ALPINE_REPO_URL}#g" /etc/apk/repositories ; fi
 
-ENV JMX_VERSION=0.18.0
+ENV JMX_VERSION=0.20.0
 
 # Upgrade Alpine and base packages
 # PFP-260: Upgrade Sqlite to >=3.28.0-r0 to fix https://security.snyk.io/vuln/SNYK-ALPINE39-SQLITE-449762

From 317b74033f74540b1386bbb8b7cee27f30436285 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Fri, 31 Jan 2025 11:42:46 -0800
Subject: [PATCH 208/249] fix(cli): avoid false positive cli upgrade
 suggestions (#12497)

---
 .../src/datahub/upgrade/upgrade.py             | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/metadata-ingestion/src/datahub/upgrade/upgrade.py b/metadata-ingestion/src/datahub/upgrade/upgrade.py
index 276f4ccd54a4a1..85767c619a74b4 100644
--- a/metadata-ingestion/src/datahub/upgrade/upgrade.py
+++ b/metadata-ingestion/src/datahub/upgrade/upgrade.py
@@ -55,11 +55,19 @@ async def get_client_version_stats():
         async with session.get(pypi_url) as resp:
             response_json = await resp.json()
             try:
-                releases = response_json.get("releases", [])
-                sorted_releases = sorted(releases.keys(), key=lambda x: Version(x))
-                latest_cli_release_string = [
-                    x for x in sorted_releases if "rc" not in x
-                ][-1]
+                releases = response_json.get("releases", {})
+                filtered_releases = {
+                    version: release_files
+                    for version, release_files in releases.items()
+                    if not all(
+                        release_file.get("yanked") for release_file in release_files
+                    )
+                    and "rc" not in version
+                }
+                sorted_releases = sorted(
+                    filtered_releases.keys(), key=lambda x: Version(x)
+                )
+                latest_cli_release_string = sorted_releases[-1]
                 latest_cli_release = Version(latest_cli_release_string)
                 current_version_info = releases.get(current_version_string)
                 current_version_date = None

From 1e0f9936150c1ea037ae54f8a02f2ee1f758c0ec Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Fri, 31 Jan 2025 11:52:06 -0800
Subject: [PATCH 209/249] fix(ingest/azure-ad): limit the size of the ingestion
 report (#12498)

---
 .../ingestion/source/identity/azure_ad.py     | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/identity/azure_ad.py b/metadata-ingestion/src/datahub/ingestion/source/identity/azure_ad.py
index edb9b7b8bd5264..6102e6d61a8bd1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/identity/azure_ad.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/identity/azure_ad.py
@@ -13,6 +13,7 @@
 
 from datahub.configuration.common import AllowDenyPattern
 from datahub.configuration.source_common import DatasetSourceConfigMixin
+from datahub.configuration.validate_field_removal import pydantic_removed_field
 from datahub.emitter.mce_builder import make_group_urn, make_user_urn
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.api.common import PipelineContext
@@ -51,6 +52,7 @@
     OriginTypeClass,
     StatusClass,
 )
+from datahub.utilities.lossy_collections import LossyList
 
 logger = logging.getLogger(__name__)
 
@@ -132,11 +134,7 @@ class AzureADConfig(StatefulIngestionConfigBase, DatasetSourceConfigMixin):
         description="regex patterns for groups to include in ingestion.",
     )
 
-    # If enabled, report will contain names of filtered users and groups.
-    filtered_tracking: bool = Field(
-        default=True,
-        description="If enabled, report will contain names of filtered users and groups.",
-    )
+    _remove_filtered_tracking = pydantic_removed_field("filtered_tracking")
 
     # Optional: Whether to mask sensitive information from workunit ID's. On by default.
     mask_group_id: bool = Field(
@@ -156,14 +154,10 @@ class AzureADConfig(StatefulIngestionConfigBase, DatasetSourceConfigMixin):
 
 @dataclass
 class AzureADSourceReport(StaleEntityRemovalSourceReport):
-    filtered: List[str] = field(default_factory=list)
-    filtered_tracking: bool = field(default=True, repr=False)
-    filtered_count: int = field(default=0)
+    filtered: LossyList[str] = field(default_factory=LossyList)
 
     def report_filtered(self, name: str) -> None:
-        self.filtered_count += 1
-        if self.filtered_tracking:
-            self.filtered.append(name)
+        self.filtered.append(name)
 
 
 # Source that extracts Azure AD users, groups and group memberships using Microsoft Graph REST API
@@ -266,9 +260,7 @@ def create(cls, config_dict, ctx):
     def __init__(self, config: AzureADConfig, ctx: PipelineContext):
         super().__init__(config, ctx)
         self.config = config
-        self.report = AzureADSourceReport(
-            filtered_tracking=self.config.filtered_tracking
-        )
+        self.report = AzureADSourceReport()
         session = requests.Session()
         retries = Retry(
             total=5, backoff_factor=1, status_forcelist=[429, 500, 502, 503, 504]

From 3757a442304f75a7265524059e9bdde5e0141cd5 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Fri, 31 Jan 2025 17:31:51 -0600
Subject: [PATCH 210/249] feat(metadata-io): enable rollback transaction
 support (#12509)

---
 docs/how/updating-datahub.md                  |   6 +-
 docs/managed-datahub/release-notes/v_0_3_7.md |   2 +
 docs/managed-datahub/release-notes/v_0_3_8.md |   1 +
 .../linkedin/metadata/entity/AspectDao.java   |  12 +-
 .../metadata/entity/EntityServiceImpl.java    | 326 +++++++++---------
 .../metadata/entity/TransactionContext.java   |   6 +
 .../entity/cassandra/CassandraAspectDao.java  |  10 +-
 .../metadata/entity/ebean/EbeanAspectDao.java | 102 +-----
 .../entity/DeleteEntityServiceTest.java       |   3 +-
 .../entity/ebean/EbeanAspectDaoTest.java      |   7 +-
 .../metadata/config/EbeanConfiguration.java   |  21 +-
 .../src/main/resources/application.yaml       |   4 -
 .../java/entities/EntitiesControllerTest.java |  11 +-
 .../resources/entity/AspectResourceTest.java  |   3 +-
 .../metadata/entity/IngestAspectsResult.java  |   4 +
 .../metadata/entity/TransactionResult.java    |  27 ++
 16 files changed, 260 insertions(+), 285 deletions(-)
 create mode 100644 metadata-service/services/src/main/java/com/linkedin/metadata/entity/TransactionResult.java

diff --git a/docs/how/updating-datahub.md b/docs/how/updating-datahub.md
index 945a00088f1f74..7e4274e067e776 100644
--- a/docs/how/updating-datahub.md
+++ b/docs/how/updating-datahub.md
@@ -31,7 +31,11 @@ This file documents any backwards-incompatible changes in DataHub and assists pe
 ## 0.15.0
 
 - OpenAPI Update: PIT Keep Alive parameter added to scroll endpoints. NOTE: This parameter requires the `pointInTimeCreationEnabled` feature flag to be enabled and the `elasticSearch.implementation` configuration to be `elasticsearch`. This feature is not supported for OpenSearch at this time and the parameter will not be respected without both of these set.
-- OpenAPI Update 2: Previously there was an incorrectly marked parameter named `sort` on the generic list entities endpoint for v3. This parameter is deprecated and only supports a single string value while the documentation indicates it supports a list of strings. This documentation error has been fixed and the correct field, `sortCriteria`, is now documented which supports a list of strings. 
+- OpenAPI Update 2: Previously there was an incorrectly marked parameter named `sort` on the generic list entities endpoint for v3. This parameter is deprecated and only supports a single string value while the documentation indicates it supports a list of strings. This documentation error has been fixed and the correct field, `sortCriteria`, is now documented which supports a list of strings.
+
+### Known Issues
+
+- Persistence Exception: No Rows Updated may occur if a transaction does not change any aspect's data.
 
 ### Breaking Changes
 
diff --git a/docs/managed-datahub/release-notes/v_0_3_7.md b/docs/managed-datahub/release-notes/v_0_3_7.md
index 31302403ea9305..6264ecc12a7b6b 100644
--- a/docs/managed-datahub/release-notes/v_0_3_7.md
+++ b/docs/managed-datahub/release-notes/v_0_3_7.md
@@ -13,6 +13,8 @@ If you are using an older CLI/SDK version, then please upgrade it. This applies
 
 ## Known Issues
 
+- Persistence Exception: No Rows Updated may occur if a transaction does not change any aspect's data.
+
 ### v0.3.7.8
    * Notes Feature
       * Adding a Note to an entity will result in that note showing up in the Settings > Home Page list of announcements as well as the profile page of the entity.
diff --git a/docs/managed-datahub/release-notes/v_0_3_8.md b/docs/managed-datahub/release-notes/v_0_3_8.md
index 75bba525688d89..18a40915ad22a9 100644
--- a/docs/managed-datahub/release-notes/v_0_3_8.md
+++ b/docs/managed-datahub/release-notes/v_0_3_8.md
@@ -12,6 +12,7 @@ Recommended CLI/SDK
 ## Known Issues
 
 - Async APIs - DataHub's asynchronous APIs perform only basic schema validation when receiving MCP requests, similar to direct production to MCP Kafka topics. While requests must conform to the MCP schema to be accepted, actual processing happens later in the pipeline. Any processing failures that occur after the initial acceptance are captured in the Failed MCP topic, but these failures are not immediately surfaced to the API caller since they happen asynchronously.
+- Persistence Exception: No Rows Updated may occur if a transaction does not change any aspect's data.
 
 ## Release Changelog
 ---
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/AspectDao.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/AspectDao.java
index 0d5bdd9ff64286..e28b5e298b4f69 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/AspectDao.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/AspectDao.java
@@ -10,6 +10,7 @@
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Stream;
@@ -169,15 +170,16 @@ default Map<String, Long> getNextVersions(
   void setWritable(boolean canWrite);
 
   @Nonnull
-  <T> T runInTransactionWithRetry(
-      @Nonnull final Function<TransactionContext, T> block, final int maxTransactionRetry);
+  <T> Optional<T> runInTransactionWithRetry(
+      @Nonnull final Function<TransactionContext, TransactionResult<T>> block,
+      final int maxTransactionRetry);
 
   @Nonnull
-  default <T> List<T> runInTransactionWithRetry(
-      @Nonnull final Function<TransactionContext, T> block,
+  default <T> Optional<T> runInTransactionWithRetry(
+      @Nonnull final Function<TransactionContext, TransactionResult<T>> block,
       AspectsBatch batch,
       final int maxTransactionRetry) {
-    return List.of(runInTransactionWithRetry(block, maxTransactionRetry));
+    return runInTransactionWithRetry(block, maxTransactionRetry);
   }
 
   default void incrementWriteMetrics(String aspectName, long count, long bytes) {
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
index 7de32f7faa328e..b896fcb4cf1019 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
@@ -944,7 +944,7 @@ private IngestAspectsResult ingestAspectsToLocalDB(
                     // No changes, return
                     if (changeMCPs.isEmpty()) {
                       MetricUtils.counter(EntityServiceImpl.class, "batch_empty").inc();
-                      return IngestAspectsResult.EMPTY;
+                      return TransactionResult.ingestAspectsRollback();
                     }
 
                     // do final pre-commit checks with previous aspect value
@@ -1083,10 +1083,11 @@ This condition is specifically for an older conditional write ingestAspectIfNotP
                       log.debug("Empty transaction detected");
                     }
 
-                    return IngestAspectsResult.builder()
-                        .updateAspectResults(upsertResults)
-                        .failedUpdateAspectResults(failedUpsertResults)
-                        .build();
+                    return TransactionResult.of(
+                        IngestAspectsResult.builder()
+                            .updateAspectResults(upsertResults)
+                            .failedUpdateAspectResults(failedUpsertResults)
+                            .build());
                   },
                   inputBatch,
                   DEFAULT_MAX_TRANSACTION_RETRY)
@@ -2400,164 +2401,175 @@ RollbackResult deleteAspectWithoutMCL(
     }
 
     final RollbackResult result =
-        aspectDao.runInTransactionWithRetry(
-            (txContext) -> {
-              Integer additionalRowsDeleted = 0;
-
-              // 1. Fetch the latest existing version of the aspect.
-              final EntityAspect.EntitySystemAspect latest =
-                  (EntityAspect.EntitySystemAspect)
-                      EntityUtils.toSystemAspect(
-                              opContext.getRetrieverContext(),
-                              aspectDao.getLatestAspect(urn, aspectName, false))
-                          .orElse(null);
-
-              // 1.1 If no latest exists, skip this aspect
-              if (latest == null) {
-                return null;
-              }
+        aspectDao
+            .runInTransactionWithRetry(
+                (txContext) -> {
+                  Integer additionalRowsDeleted = 0;
+
+                  // 1. Fetch the latest existing version of the aspect.
+                  final EntityAspect.EntitySystemAspect latest =
+                      (EntityAspect.EntitySystemAspect)
+                          EntityUtils.toSystemAspect(
+                                  opContext.getRetrieverContext(),
+                                  aspectDao.getLatestAspect(urn, aspectName, false))
+                              .orElse(null);
+
+                  // 1.1 If no latest exists, skip this aspect
+                  if (latest == null) {
+                    return TransactionResult.rollback();
+                  }
 
-              // 2. Compare the match conditions, if they don't match, ignore.
-              SystemMetadata latestSystemMetadata = latest.getSystemMetadata();
-              if (!filterMatch(latestSystemMetadata, conditions)) {
-                return null;
-              }
+                  // 2. Compare the match conditions, if they don't match, ignore.
+                  SystemMetadata latestSystemMetadata = latest.getSystemMetadata();
+                  if (!filterMatch(latestSystemMetadata, conditions)) {
+                    return TransactionResult.rollback();
+                  }
 
-              // 3. Check if this is a key aspect
-              Boolean isKeyAspect = opContext.getKeyAspectName(entityUrn).equals(aspectName);
-
-              // 4. Fetch all preceding aspects, that match
-              List<EntityAspect> aspectsToDelete = new ArrayList<>();
-              Pair<Long, Long> versionRange = aspectDao.getVersionRange(urn, aspectName);
-              long minVersion = Math.max(0, versionRange.getFirst());
-              long maxVersion = Math.max(0, versionRange.getSecond());
-
-              EntityAspect.EntitySystemAspect survivingAspect = null;
-
-              boolean filterMatch = true;
-              while (maxVersion > minVersion && filterMatch) {
-                EntityAspect.EntitySystemAspect candidateAspect =
-                    (EntityAspect.EntitySystemAspect)
-                        EntityUtils.toSystemAspect(
-                                opContext.getRetrieverContext(),
-                                aspectDao.getAspect(urn, aspectName, maxVersion))
-                            .orElse(null);
-                SystemMetadata previousSysMetadata =
-                    candidateAspect != null ? candidateAspect.getSystemMetadata() : null;
-                filterMatch =
-                    previousSysMetadata != null && filterMatch(previousSysMetadata, conditions);
-                if (filterMatch) {
-                  aspectsToDelete.add(candidateAspect.getEntityAspect());
-                } else if (candidateAspect == null) {
-                  // potential gap
-                  filterMatch = true;
-                } else {
-                  survivingAspect = candidateAspect;
-                }
-                maxVersion = maxVersion - 1;
-              }
+                  // 3. Check if this is a key aspect
+                  Boolean isKeyAspect = opContext.getKeyAspectName(entityUrn).equals(aspectName);
+
+                  // 4. Fetch all preceding aspects, that match
+                  List<EntityAspect> aspectsToDelete = new ArrayList<>();
+                  Pair<Long, Long> versionRange = aspectDao.getVersionRange(urn, aspectName);
+                  long minVersion = Math.max(0, versionRange.getFirst());
+                  long maxVersion = Math.max(0, versionRange.getSecond());
+
+                  EntityAspect.EntitySystemAspect survivingAspect = null;
+
+                  boolean filterMatch = true;
+                  while (maxVersion > minVersion && filterMatch) {
+                    EntityAspect.EntitySystemAspect candidateAspect =
+                        (EntityAspect.EntitySystemAspect)
+                            EntityUtils.toSystemAspect(
+                                    opContext.getRetrieverContext(),
+                                    aspectDao.getAspect(urn, aspectName, maxVersion))
+                                .orElse(null);
+                    SystemMetadata previousSysMetadata =
+                        candidateAspect != null ? candidateAspect.getSystemMetadata() : null;
+                    filterMatch =
+                        previousSysMetadata != null && filterMatch(previousSysMetadata, conditions);
+                    if (filterMatch) {
+                      aspectsToDelete.add(candidateAspect.getEntityAspect());
+                    } else if (candidateAspect == null) {
+                      // potential gap
+                      filterMatch = true;
+                    } else {
+                      survivingAspect = candidateAspect;
+                    }
+                    maxVersion = maxVersion - 1;
+                  }
 
-              // Delete validation hooks
-              ValidationExceptionCollection preCommitExceptions =
-                  AspectsBatch.validatePreCommit(
-                      aspectsToDelete.stream()
-                          .map(
-                              toDelete ->
-                                  DeleteItemImpl.builder()
-                                      .urn(UrnUtils.getUrn(toDelete.getUrn()))
-                                      .aspectName(toDelete.getAspect())
-                                      .auditStamp(auditStamp)
-                                      .build(opContext.getAspectRetriever()))
-                          .collect(Collectors.toList()),
-                      opContext.getRetrieverContext());
-              if (!preCommitExceptions.isEmpty()) {
-                throw new ValidationException(collectMetrics(preCommitExceptions).toString());
-              }
+                  // Delete validation hooks
+                  ValidationExceptionCollection preCommitExceptions =
+                      AspectsBatch.validatePreCommit(
+                          aspectsToDelete.stream()
+                              .map(
+                                  toDelete ->
+                                      DeleteItemImpl.builder()
+                                          .urn(UrnUtils.getUrn(toDelete.getUrn()))
+                                          .aspectName(toDelete.getAspect())
+                                          .auditStamp(auditStamp)
+                                          .build(opContext.getAspectRetriever()))
+                              .collect(Collectors.toList()),
+                          opContext.getRetrieverContext());
+                  if (!preCommitExceptions.isEmpty()) {
+                    throw new ValidationException(collectMetrics(preCommitExceptions).toString());
+                  }
 
-              // 5. Apply deletes and fix up latest row
-              aspectsToDelete.forEach(aspect -> aspectDao.deleteAspect(txContext, aspect));
-
-              if (survivingAspect != null) {
-                // if there was a surviving aspect, copy its information into the latest row
-                // eBean does not like us updating a pkey column (version) for the surviving aspect
-                // as a result we copy information from survivingAspect to latest and delete
-                // survivingAspect
-                latest
-                    .getEntityAspect()
-                    .setMetadata(survivingAspect.getEntityAspect().getMetadata());
-                latest
-                    .getEntityAspect()
-                    .setSystemMetadata(survivingAspect.getEntityAspect().getSystemMetadata());
-                latest.getEntityAspect().setCreatedOn(survivingAspect.getCreatedOn());
-                latest.getEntityAspect().setCreatedBy(survivingAspect.getCreatedBy());
-                latest
-                    .getEntityAspect()
-                    .setCreatedFor(survivingAspect.getEntityAspect().getCreatedFor());
-                aspectDao.saveAspect(txContext, latest.getEntityAspect(), false);
-                // metrics
-                aspectDao.incrementWriteMetrics(
-                    aspectName, 1, latest.getMetadataRaw().getBytes(StandardCharsets.UTF_8).length);
-                aspectDao.deleteAspect(txContext, survivingAspect.getEntityAspect());
-              } else {
-                if (isKeyAspect) {
-                  if (hardDelete) {
-                    // If this is the key aspect, delete the entity entirely.
-                    additionalRowsDeleted = aspectDao.deleteUrn(txContext, urn);
-                  } else if (deleteItem.getEntitySpec().hasAspect(Constants.STATUS_ASPECT_NAME)) {
-                    // soft delete by setting status.removed=true (if applicable)
-                    final Status statusAspect = new Status();
-                    statusAspect.setRemoved(true);
-
-                    final MetadataChangeProposal gmce = new MetadataChangeProposal();
-                    gmce.setEntityUrn(entityUrn);
-                    gmce.setChangeType(ChangeType.UPSERT);
-                    gmce.setEntityType(entityUrn.getEntityType());
-                    gmce.setAspectName(Constants.STATUS_ASPECT_NAME);
-                    gmce.setAspect(GenericRecordUtils.serializeAspect(statusAspect));
-
-                    this.ingestProposal(opContext, gmce, auditStamp, false);
+                  // 5. Apply deletes and fix up latest row
+                  aspectsToDelete.forEach(aspect -> aspectDao.deleteAspect(txContext, aspect));
+
+                  if (survivingAspect != null) {
+                    // if there was a surviving aspect, copy its information into the latest row
+                    // eBean does not like us updating a pkey column (version) for the surviving
+                    // aspect
+                    // as a result we copy information from survivingAspect to latest and delete
+                    // survivingAspect
+                    latest
+                        .getEntityAspect()
+                        .setMetadata(survivingAspect.getEntityAspect().getMetadata());
+                    latest
+                        .getEntityAspect()
+                        .setSystemMetadata(survivingAspect.getEntityAspect().getSystemMetadata());
+                    latest.getEntityAspect().setCreatedOn(survivingAspect.getCreatedOn());
+                    latest.getEntityAspect().setCreatedBy(survivingAspect.getCreatedBy());
+                    latest
+                        .getEntityAspect()
+                        .setCreatedFor(survivingAspect.getEntityAspect().getCreatedFor());
+                    aspectDao.saveAspect(txContext, latest.getEntityAspect(), false);
+                    // metrics
+                    aspectDao.incrementWriteMetrics(
+                        aspectName,
+                        1,
+                        latest.getMetadataRaw().getBytes(StandardCharsets.UTF_8).length);
+                    aspectDao.deleteAspect(txContext, survivingAspect.getEntityAspect());
+                  } else {
+                    if (isKeyAspect) {
+                      if (hardDelete) {
+                        // If this is the key aspect, delete the entity entirely.
+                        additionalRowsDeleted = aspectDao.deleteUrn(txContext, urn);
+                      } else if (deleteItem
+                          .getEntitySpec()
+                          .hasAspect(Constants.STATUS_ASPECT_NAME)) {
+                        // soft delete by setting status.removed=true (if applicable)
+                        final Status statusAspect = new Status();
+                        statusAspect.setRemoved(true);
+
+                        final MetadataChangeProposal gmce = new MetadataChangeProposal();
+                        gmce.setEntityUrn(entityUrn);
+                        gmce.setChangeType(ChangeType.UPSERT);
+                        gmce.setEntityType(entityUrn.getEntityType());
+                        gmce.setAspectName(Constants.STATUS_ASPECT_NAME);
+                        gmce.setAspect(GenericRecordUtils.serializeAspect(statusAspect));
+
+                        this.ingestProposal(opContext, gmce, auditStamp, false);
+                      }
+                    } else {
+                      // Else, only delete the specific aspect.
+                      aspectDao.deleteAspect(txContext, latest.getEntityAspect());
+                    }
                   }
-                } else {
-                  // Else, only delete the specific aspect.
-                  aspectDao.deleteAspect(txContext, latest.getEntityAspect());
-                }
-              }
 
-              // 6. Emit the Update
-              try {
-                final RecordTemplate latestValue =
-                    latest == null ? null : latest.getRecordTemplate();
-                final RecordTemplate previousValue =
-                    survivingAspect == null ? null : latest.getRecordTemplate();
-
-                final Urn urnObj = Urn.createFromString(urn);
-                // We are not deleting key aspect if hardDelete has not been set so do not return a
-                // rollback result
-                if (isKeyAspect && !hardDelete) {
-                  return null;
-                }
-                return new RollbackResult(
-                    urnObj,
-                    urnObj.getEntityType(),
-                    latest.getAspectName(),
-                    latestValue,
-                    previousValue,
-                    latestSystemMetadata,
-                    previousValue == null ? null : survivingAspect.getSystemMetadata(),
-                    survivingAspect == null ? ChangeType.DELETE : ChangeType.UPSERT,
-                    isKeyAspect,
-                    additionalRowsDeleted);
-              } catch (URISyntaxException e) {
-                throw new RuntimeException(
-                    String.format("Failed to emit the update for urn %s", urn));
-              } catch (IllegalStateException e) {
-                log.warn(
-                    "Unable to find aspect, rollback result will not be sent. Error: {}",
-                    e.getMessage());
-                return null;
-              }
-            },
-            DEFAULT_MAX_TRANSACTION_RETRY);
+                  // 6. Emit the Update
+                  try {
+                    final RecordTemplate latestValue =
+                        latest == null ? null : latest.getRecordTemplate();
+                    final RecordTemplate previousValue =
+                        survivingAspect == null ? null : latest.getRecordTemplate();
+
+                    final Urn urnObj = Urn.createFromString(urn);
+                    // We are not deleting key aspect if hardDelete has not been set so do not
+                    // return a
+                    // rollback result
+                    if (isKeyAspect && !hardDelete) {
+                      return TransactionResult.rollback();
+                    }
+                    return TransactionResult.commit(
+                        new RollbackResult(
+                            urnObj,
+                            urnObj.getEntityType(),
+                            latest.getAspectName(),
+                            latestValue,
+                            previousValue,
+                            latestSystemMetadata,
+                            previousValue == null ? null : survivingAspect.getSystemMetadata(),
+                            survivingAspect == null ? ChangeType.DELETE : ChangeType.UPSERT,
+                            isKeyAspect,
+                            additionalRowsDeleted));
+                  } catch (URISyntaxException e) {
+                    throw new RuntimeException(
+                        String.format("Failed to emit the update for urn %s", urn));
+                  } catch (IllegalStateException e) {
+                    log.warn(
+                        "Unable to find aspect, rollback result will not be sent. Error: {}",
+                        e.getMessage());
+                    return TransactionResult.rollback();
+                  }
+                },
+                DEFAULT_MAX_TRANSACTION_RETRY)
+            .stream()
+            .findFirst()
+            .orElse(null);
 
     if (result != null) {
       processPostCommitMCLSideEffects(opContext, List.of(result.toMCL(auditStamp)));
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/TransactionContext.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/TransactionContext.java
index 6897c9152e9a25..e72b881aad400c 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/TransactionContext.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/TransactionContext.java
@@ -72,4 +72,10 @@ public void flush() {
       tx.flush();
     }
   }
+
+  public void rollback() {
+    if (tx != null) {
+      tx.rollback();
+    }
+  }
 }
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/cassandra/CassandraAspectDao.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/cassandra/CassandraAspectDao.java
index c5a6615ac4face..07fb896fdb02fc 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/cassandra/CassandraAspectDao.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/cassandra/CassandraAspectDao.java
@@ -30,6 +30,7 @@
 import com.linkedin.metadata.entity.EntityAspectIdentifier;
 import com.linkedin.metadata.entity.ListResult;
 import com.linkedin.metadata.entity.TransactionContext;
+import com.linkedin.metadata.entity.TransactionResult;
 import com.linkedin.metadata.entity.ebean.EbeanAspectV2;
 import com.linkedin.metadata.entity.ebean.PartitionedStream;
 import com.linkedin.metadata.entity.restoreindices.RestoreIndicesArgs;
@@ -44,6 +45,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -294,17 +296,17 @@ public ListResult<String> listAspectMetadata(
         aspectMetadatas, listResultMetadata, start, pageNumber, pageSize, totalCount);
   }
 
-  @Override
   @Nonnull
-  public <T> T runInTransactionWithRetry(
-      @Nonnull final Function<TransactionContext, T> block, final int maxTransactionRetry) {
+  @Override
+  public <T> Optional<T> runInTransactionWithRetry(
+      @Nonnull Function<TransactionContext, TransactionResult<T>> block, int maxTransactionRetry) {
     validateConnection();
     TransactionContext txContext = TransactionContext.empty(maxTransactionRetry);
     do {
       try {
         // TODO: Try to bend this code to make use of Cassandra batches. This method is called from
         // single-urn operations, so perf should not suffer much
-        return block.apply(txContext);
+        return block.apply(txContext).getResults();
       } catch (DriverException exception) {
         txContext.addException(exception);
       }
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/ebean/EbeanAspectDao.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/ebean/EbeanAspectDao.java
index ad8333407a2760..0ca903371cab4c 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/ebean/EbeanAspectDao.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/ebean/EbeanAspectDao.java
@@ -5,9 +5,6 @@
 import com.codahale.metrics.MetricRegistry;
 import com.datahub.util.exception.ModelConversionException;
 import com.datahub.util.exception.RetryLimitReached;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
 import com.linkedin.common.AuditStamp;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.metadata.aspect.RetrieverContext;
@@ -20,6 +17,7 @@
 import com.linkedin.metadata.entity.EntityAspectIdentifier;
 import com.linkedin.metadata.entity.ListResult;
 import com.linkedin.metadata.entity.TransactionContext;
+import com.linkedin.metadata.entity.TransactionResult;
 import com.linkedin.metadata.entity.ebean.batch.AspectsBatchImpl;
 import com.linkedin.metadata.entity.restoreindices.RestoreIndicesArgs;
 import com.linkedin.metadata.models.AspectSpec;
@@ -53,14 +51,10 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -89,12 +83,6 @@ public class EbeanAspectDao implements AspectDao, AspectMigrationsDao {
   // more testing.
   private int _queryKeysCount = 375; // 0 means no pagination on keys
 
-  /**
-   * Used to control write concurrency when an entity key aspect is present. If a batch contains an
-   * entity key aspect, only allow a single execution per URN
-   */
-  private final LoadingCache<String, Lock> locks;
-
   private final String batchGetMethod;
 
   public EbeanAspectDao(@Nonnull final Database server, EbeanConfiguration ebeanConfiguration) {
@@ -103,21 +91,6 @@ public EbeanAspectDao(@Nonnull final Database server, EbeanConfiguration ebeanCo
         ebeanConfiguration.getBatchGetMethod() != null
             ? ebeanConfiguration.getBatchGetMethod()
             : "IN";
-    if (ebeanConfiguration.getLocking().isEnabled()) {
-      this.locks =
-          CacheBuilder.newBuilder()
-              .maximumSize(ebeanConfiguration.getLocking().getMaximumLocks())
-              .expireAfterWrite(
-                  ebeanConfiguration.getLocking().getDurationSeconds(), TimeUnit.SECONDS)
-              .build(
-                  new CacheLoader<>() {
-                    public Lock load(String key) {
-                      return new ReentrantLock(true);
-                    }
-                  });
-    } else {
-      this.locks = null;
-    }
   }
 
   @Override
@@ -764,83 +737,42 @@ public ListResult<String> listLatestAspectMetadata(
 
   @Override
   @Nonnull
-  public <T> T runInTransactionWithRetry(
-      @Nonnull final Function<TransactionContext, T> block, final int maxTransactionRetry) {
-    return runInTransactionWithRetry(block, null, maxTransactionRetry).get(0);
+  public <T> Optional<T> runInTransactionWithRetry(
+      @Nonnull final Function<TransactionContext, TransactionResult<T>> block,
+      final int maxTransactionRetry) {
+    return runInTransactionWithRetry(block, null, maxTransactionRetry);
   }
 
   @Override
   @Nonnull
-  public <T> List<T> runInTransactionWithRetry(
-      @Nonnull final Function<TransactionContext, T> block,
+  public <T> Optional<T> runInTransactionWithRetry(
+      @Nonnull final Function<TransactionContext, TransactionResult<T>> block,
       @Nullable AspectsBatch batch,
       final int maxTransactionRetry) {
 
-    LinkedList<T> result = new LinkedList<>();
-
-    if (locks != null && batch != null) {
-      Set<Urn> urnsWithKeyAspects =
-          batch.getMCPItems().stream()
-              .filter(i -> i.getEntitySpec().getKeyAspectSpec().equals(i.getAspectSpec()))
-              .map(MCPItem::getUrn)
-              .collect(Collectors.toSet());
-
-      if (!urnsWithKeyAspects.isEmpty()) {
-
-        // Split into batches by urn with key aspect, remaining aspects in the pair's second
-        Pair<List<AspectsBatch>, AspectsBatch> splitBatches =
-            splitByUrn(batch, urnsWithKeyAspects, batch.getRetrieverContext());
-
-        // Run non-key aspect `other` batch per normal
-        if (!splitBatches.getSecond().getItems().isEmpty()) {
-          result.add(
-              runInTransactionWithRetryUnlocked(
-                  block, splitBatches.getSecond(), maxTransactionRetry));
-        }
-
-        // For each key aspect batch
-        for (AspectsBatch splitBatch : splitBatches.getFirst()) {
-          try {
-            Lock lock =
-                locks.get(splitBatch.getMCPItems().stream().findFirst().get().getUrn().toString());
-            lock.lock();
-            try {
-              result.add(runInTransactionWithRetryUnlocked(block, splitBatch, maxTransactionRetry));
-            } finally {
-              lock.unlock();
-            }
-          } catch (ExecutionException e) {
-            throw new RuntimeException(e);
-          }
-        }
-      } else {
-        // No key aspects found, run per normal
-        result.add(runInTransactionWithRetryUnlocked(block, batch, maxTransactionRetry));
-      }
-    } else {
-      // locks disabled or null batch
-      result.add(runInTransactionWithRetryUnlocked(block, batch, maxTransactionRetry));
-    }
-
-    return result;
+    return runInTransactionWithRetryUnlocked(block, batch, maxTransactionRetry).getResults();
   }
 
   @Nonnull
-  public <T> T runInTransactionWithRetryUnlocked(
-      @Nonnull final Function<TransactionContext, T> block,
+  public <T> TransactionResult<T> runInTransactionWithRetryUnlocked(
+      @Nonnull final Function<TransactionContext, TransactionResult<T>> block,
       @Nullable AspectsBatch batch,
       final int maxTransactionRetry) {
 
     validateConnection();
     TransactionContext transactionContext = TransactionContext.empty(maxTransactionRetry);
 
-    T result = null;
+    TransactionResult<T> result = null;
     do {
       try (Transaction transaction =
           _server.beginTransaction(TxScope.requiresNew().setIsolation(TX_ISOLATION))) {
         transaction.setBatchMode(true);
         result = block.apply(transactionContext.tx(transaction));
-        transaction.commit();
+        if (result.isCommitOrRollback()) {
+          transaction.commit();
+        } else {
+          transaction.rollback();
+        }
         break;
       } catch (PersistenceException exception) {
         if (exception instanceof DuplicateKeyException) {
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/entity/DeleteEntityServiceTest.java b/metadata-io/src/test/java/com/linkedin/metadata/entity/DeleteEntityServiceTest.java
index 723cb7813769f4..1ca86de911f0fa 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/entity/DeleteEntityServiceTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/entity/DeleteEntityServiceTest.java
@@ -41,6 +41,7 @@
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import org.mockito.Mockito;
 import org.testng.annotations.Test;
 
@@ -129,7 +130,7 @@ public void testDeleteUniqueRefGeneratesValidMCP() {
             1);
 
     Mockito.when(_aspectDao.runInTransactionWithRetry(Mockito.any(), Mockito.anyInt()))
-        .thenReturn(result);
+        .thenReturn(Optional.of(result));
 
     final DeleteReferencesResponse response =
         _deleteEntityService.deleteReferencesTo(opContext, container, false);
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/entity/ebean/EbeanAspectDaoTest.java b/metadata-io/src/test/java/com/linkedin/metadata/entity/ebean/EbeanAspectDaoTest.java
index 4915f897835966..c859d5e00e5eeb 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/entity/ebean/EbeanAspectDaoTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/entity/ebean/EbeanAspectDaoTest.java
@@ -12,6 +12,7 @@
 import com.linkedin.metadata.aspect.batch.AspectsBatch;
 import com.linkedin.metadata.config.EbeanConfiguration;
 import com.linkedin.metadata.entity.EntityAspectIdentifier;
+import com.linkedin.metadata.entity.TransactionResult;
 import io.ebean.Database;
 import io.ebean.test.LoggedSql;
 import java.util.List;
@@ -38,7 +39,7 @@ public void testGetNextVersionForUpdate() {
         (txContext) -> {
           testDao.getNextVersions(
               Map.of("urn:li:corpuser:testGetNextVersionForUpdate", Set.of("status")));
-          return "";
+          return TransactionResult.commit("");
         },
         mock(AspectsBatch.class),
         0);
@@ -61,7 +62,7 @@ public void testGetLatestAspectsForUpdate() throws JsonProcessingException {
         (txContext) -> {
           testDao.getLatestAspects(
               Map.of("urn:li:corpuser:testGetLatestAspectsForUpdate", Set.of("status")), true);
-          return "";
+          return TransactionResult.commit("");
         },
         mock(AspectsBatch.class),
         0);
@@ -94,7 +95,7 @@ public void testbatchGetForUpdate() throws JsonProcessingException {
                       DATA_PLATFORM_INSTANCE_ASPECT_NAME,
                       ASPECT_LATEST_VERSION)),
               true);
-          return "";
+          return TransactionResult.commit("");
         },
         mock(AspectsBatch.class),
         0);
diff --git a/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/EbeanConfiguration.java b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/EbeanConfiguration.java
index 6eb31e14a2d3b0..a8ee3dde97cbf3 100644
--- a/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/EbeanConfiguration.java
+++ b/metadata-service/configuration/src/main/java/com/linkedin/metadata/config/EbeanConfiguration.java
@@ -22,26 +22,7 @@ public class EbeanConfiguration {
   private long waitTimeoutMillis;
   private boolean autoCreateDdl;
   private boolean postgresUseIamAuth;
-  private LockingConfiguration locking;
   private String batchGetMethod;
 
-  public static final EbeanConfiguration testDefault =
-      EbeanConfiguration.builder().locking(LockingConfiguration.testDefault).build();
-
-  @Data
-  @Builder
-  @AllArgsConstructor
-  @NoArgsConstructor
-  public static class LockingConfiguration {
-    private boolean enabled;
-    private long durationSeconds;
-    private long maximumLocks;
-
-    public static final LockingConfiguration testDefault =
-        LockingConfiguration.builder()
-            .enabled(true)
-            .durationSeconds(60)
-            .maximumLocks(10000)
-            .build();
-  }
+  public static final EbeanConfiguration testDefault = EbeanConfiguration.builder().build();
 }
diff --git a/metadata-service/configuration/src/main/resources/application.yaml b/metadata-service/configuration/src/main/resources/application.yaml
index 4f6bf8d1240033..5aaac2a96efea6 100644
--- a/metadata-service/configuration/src/main/resources/application.yaml
+++ b/metadata-service/configuration/src/main/resources/application.yaml
@@ -172,10 +172,6 @@ ebean:
   autoCreateDdl: ${EBEAN_AUTOCREATE:false}
   postgresUseIamAuth: ${EBEAN_POSTGRES_USE_AWS_IAM_AUTH:false}
   batchGetMethod: ${EBEAN_BATCH_GET_METHOD:IN} # Alternative UNION
-  locking:
-    enabled: ${EBEAN_LOCKING_ENABLED:false}
-    durationSeconds: ${EBEAN_LOCKING_DURATION_SECONDS:60}
-    maximumLocks: ${EBEAN_LOCKING_MAXIMUM_LOCKS:20000}
 
 # Only required if entityService.impl is cassandra
 cassandra:
diff --git a/metadata-service/openapi-servlet/src/test/java/entities/EntitiesControllerTest.java b/metadata-service/openapi-servlet/src/test/java/entities/EntitiesControllerTest.java
index a5cff75c0c91a2..a4bb678c2ec237 100644
--- a/metadata-service/openapi-servlet/src/test/java/entities/EntitiesControllerTest.java
+++ b/metadata-service/openapi-servlet/src/test/java/entities/EntitiesControllerTest.java
@@ -16,6 +16,7 @@
 import com.linkedin.metadata.entity.AspectDao;
 import com.linkedin.metadata.entity.IngestAspectsResult;
 import com.linkedin.metadata.entity.TransactionContext;
+import com.linkedin.metadata.entity.TransactionResult;
 import com.linkedin.metadata.entity.UpdateAspectResult;
 import com.linkedin.metadata.event.EventProducer;
 import io.datahubproject.metadata.context.OperationContext;
@@ -71,14 +72,16 @@ public void setup()
     OperationContext opContext = TestOperationContexts.systemContextNoSearchAuthorization();
     AspectDao aspectDao = Mockito.mock(AspectDao.class);
     when(aspectDao.runInTransactionWithRetry(
-            ArgumentMatchers.<Function<TransactionContext, List<UpdateAspectResult>>>any(),
+            ArgumentMatchers
+                .<Function<TransactionContext, TransactionResult<List<UpdateAspectResult>>>>any(),
             any(AspectsBatch.class),
             anyInt()))
         .thenAnswer(
             i ->
-                List.of(
-                    ((Function<TransactionContext, IngestAspectsResult>) i.getArgument(0))
-                        .apply(TransactionContext.empty(Mockito.mock(Transaction.class), 0))));
+                ((Function<TransactionContext, TransactionResult<IngestAspectsResult>>)
+                        i.getArgument(0))
+                    .apply(TransactionContext.empty(Mockito.mock(Transaction.class), 0))
+                    .getResults());
 
     EventProducer mockEntityEventProducer = Mockito.mock(EventProducer.class);
     PreProcessHooks preProcessHooks = new PreProcessHooks();
diff --git a/metadata-service/restli-servlet-impl/src/test/java/com/linkedin/metadata/resources/entity/AspectResourceTest.java b/metadata-service/restli-servlet-impl/src/test/java/com/linkedin/metadata/resources/entity/AspectResourceTest.java
index 265b8a35e840c8..4d2d5cde2c1589 100644
--- a/metadata-service/restli-servlet-impl/src/test/java/com/linkedin/metadata/resources/entity/AspectResourceTest.java
+++ b/metadata-service/restli-servlet-impl/src/test/java/com/linkedin/metadata/resources/entity/AspectResourceTest.java
@@ -34,6 +34,7 @@
 import com.linkedin.mxe.MetadataChangeProposal;
 import java.net.URISyntaxException;
 import java.util.List;
+import java.util.Optional;
 
 import com.linkedin.mxe.SystemMetadata;
 import io.datahubproject.metadata.context.OperationContext;
@@ -136,7 +137,7 @@ public void testAsyncDefaultAspects() throws URISyntaxException {
                             .request(req)
                             .build()))
             .build();
-    when(aspectDao.runInTransactionWithRetry(any(), any(), anyInt())).thenReturn(List.of(txResult));
+    when(aspectDao.runInTransactionWithRetry(any(), any(), anyInt())).thenReturn(Optional.of(txResult));
     aspectResource.ingestProposal(mcp, "false");
     verify(producer, times(5))
         .produceMetadataChangeLog(any(OperationContext.class), eq(urn), any(AspectSpec.class), any(MetadataChangeLog.class));
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/entity/IngestAspectsResult.java b/metadata-service/services/src/main/java/com/linkedin/metadata/entity/IngestAspectsResult.java
index d9b7091ac44b0f..6584ea22b396b4 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/entity/IngestAspectsResult.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/entity/IngestAspectsResult.java
@@ -20,6 +20,10 @@ public class IngestAspectsResult {
   List<UpdateAspectResult> updateAspectResults;
   List<Pair<ChangeMCP, Set<AspectValidationException>>> failedUpdateAspectResults;
 
+  public boolean shouldCommit() {
+    return updateAspectResults.stream().anyMatch(Objects::nonNull);
+  }
+
   public static IngestAspectsResult combine(IngestAspectsResult first, IngestAspectsResult second) {
     if (first == null) {
       return second != null ? second : IngestAspectsResult.builder().build();
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/entity/TransactionResult.java b/metadata-service/services/src/main/java/com/linkedin/metadata/entity/TransactionResult.java
new file mode 100644
index 00000000000000..50fec5ab4b26c1
--- /dev/null
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/entity/TransactionResult.java
@@ -0,0 +1,27 @@
+package com.linkedin.metadata.entity;
+
+import java.util.Optional;
+import javax.annotation.Nonnull;
+import lombok.Value;
+
+@Value
+public class TransactionResult<T> {
+  public static TransactionResult<IngestAspectsResult> ingestAspectsRollback() {
+    return new TransactionResult<>(Optional.of(IngestAspectsResult.EMPTY), false);
+  }
+
+  public static TransactionResult<IngestAspectsResult> of(@Nonnull IngestAspectsResult results) {
+    return new TransactionResult<>(Optional.of(results), results.shouldCommit());
+  }
+
+  public static <T> TransactionResult<T> rollback() {
+    return new TransactionResult<>(Optional.empty(), false);
+  }
+
+  public static <T> TransactionResult<T> commit(@Nonnull T results) {
+    return new TransactionResult<>(Optional.of(results), true);
+  }
+
+  @Nonnull Optional<T> results;
+  boolean commitOrRollback;
+}

From ffc98daa320369111533015d994d4e794b8e33c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20G=C3=B3mez=20Villamor?= <sgomezvillamor@gmail.com>
Date: Mon, 3 Feb 2025 09:54:39 +0100
Subject: [PATCH 211/249] feat(snowflake): add missing pushdown_deny_usernames
 config to be used when use_queries_v2 (#12527)

---
 .../datahub/ingestion/source/snowflake/snowflake_config.py | 7 +++++++
 .../src/datahub/ingestion/source/snowflake/snowflake_v2.py | 1 +
 2 files changed, 8 insertions(+)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
index 7e3220daceca3c..6e1d4702b29c82 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
@@ -308,6 +308,13 @@ class SnowflakeV2Config(
         " assertions CLI in snowflake",
     )
 
+    pushdown_deny_usernames: List[str] = Field(
+        default=[],
+        description="List of snowflake usernames which will not be considered for lineage/usage/queries extraction. "
+        "This is primarily useful for improving performance by filtering out users with extremely high query volumes. "
+        "Only applicable if `use_queries_v2` is enabled.",
+    )
+
     @validator("convert_urns_to_lowercase")
     def validate_convert_urns_to_lowercase(cls, v):
         if not v:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
index 7d63f41f4bcf03..a8666643ac62fc 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
@@ -567,6 +567,7 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
                         include_queries=self.config.include_queries,
                         include_query_usage_statistics=self.config.include_query_usage_statistics,
                         user_email_pattern=self.config.user_email_pattern,
+                        pushdown_deny_usernames=self.config.pushdown_deny_usernames,
                     ),
                     structured_report=self.report,
                     filters=self.filters,

From 64aaaf126f4918323c9adde1c395923f37d3fc3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20G=C3=B3mez=20Villamor?= <sgomezvillamor@gmail.com>
Date: Mon, 3 Feb 2025 11:33:25 +0100
Subject: [PATCH 212/249] fix(model): fixes DashboardContainsDashboard
 relationship in DashboardInfo aspect (#12433)

---
 .../ReindexDashboardInfoConfig.java           |  30 ++++
 .../dashboardinfo/ReindexDashboardInfo.java   |  49 +++++++
 .../ReindexDashboardInfoStep.java             |  42 ++++++
 docs/how/updating-datahub.md                  |   2 +
 .../builder/DashboardInfoPatchBuilder.java    |  23 +++
 .../dashboard/DashboardInfoTemplate.java      |  13 ++
 .../template/DashboardInfoTemplateTest.java   |  22 +++
 .../api/incremental_lineage_helper.py         |   4 +
 .../src/datahub/specific/dashboard.py         |  44 +++++-
 .../test_incremental_lineage_helper.py        | 138 +++++++++++++++++-
 .../java/datahub/client/patch/PatchTest.java  |   7 +
 .../com/linkedin/dashboard/DashboardInfo.pdl  |  10 +-
 .../src/main/resources/application.yaml       |   5 +
 13 files changed, 381 insertions(+), 8 deletions(-)
 create mode 100644 datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/restoreindices/ReindexDashboardInfoConfig.java
 create mode 100644 datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/restoreindices/dashboardinfo/ReindexDashboardInfo.java
 create mode 100644 datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/restoreindices/dashboardinfo/ReindexDashboardInfoStep.java

diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/restoreindices/ReindexDashboardInfoConfig.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/restoreindices/ReindexDashboardInfoConfig.java
new file mode 100644
index 00000000000000..54beed11f9cb4c
--- /dev/null
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/restoreindices/ReindexDashboardInfoConfig.java
@@ -0,0 +1,30 @@
+package com.linkedin.datahub.upgrade.config.restoreindices;
+
+import com.linkedin.datahub.upgrade.config.SystemUpdateCondition;
+import com.linkedin.datahub.upgrade.system.NonBlockingSystemUpgrade;
+import com.linkedin.datahub.upgrade.system.restoreindices.dashboardinfo.ReindexDashboardInfo;
+import com.linkedin.metadata.entity.AspectDao;
+import com.linkedin.metadata.entity.EntityService;
+import io.datahubproject.metadata.context.OperationContext;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@Conditional(SystemUpdateCondition.NonBlockingSystemUpdateCondition.class)
+public class ReindexDashboardInfoConfig {
+
+  @Bean
+  public NonBlockingSystemUpgrade reindexDashboardInfo(
+      final OperationContext opContext,
+      final EntityService<?> entityService,
+      final AspectDao aspectDao,
+      @Value("${systemUpdate.dashboardInfo.enabled}") final boolean enabled,
+      @Value("${systemUpdate.dashboardInfo.batchSize}") final Integer batchSize,
+      @Value("${systemUpdate.dashboardInfo.delayMs}") final Integer delayMs,
+      @Value("${systemUpdate.dashboardInfo.limit}") final Integer limit) {
+    return new ReindexDashboardInfo(
+        opContext, entityService, aspectDao, enabled, batchSize, delayMs, limit);
+  }
+}
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/restoreindices/dashboardinfo/ReindexDashboardInfo.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/restoreindices/dashboardinfo/ReindexDashboardInfo.java
new file mode 100644
index 00000000000000..dd9a6c6f014725
--- /dev/null
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/restoreindices/dashboardinfo/ReindexDashboardInfo.java
@@ -0,0 +1,49 @@
+package com.linkedin.datahub.upgrade.system.restoreindices.dashboardinfo;
+
+import com.google.common.collect.ImmutableList;
+import com.linkedin.datahub.upgrade.UpgradeStep;
+import com.linkedin.datahub.upgrade.system.NonBlockingSystemUpgrade;
+import com.linkedin.metadata.entity.AspectDao;
+import com.linkedin.metadata.entity.EntityService;
+import io.datahubproject.metadata.context.OperationContext;
+import java.util.List;
+import javax.annotation.Nonnull;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * A job that reindexes all dashboard info aspects as part of reindexing dashboards relationship.
+ * This is required to fix the dashboards relationships for dashboards
+ */
+@Slf4j
+public class ReindexDashboardInfo implements NonBlockingSystemUpgrade {
+
+  private final List<UpgradeStep> _steps;
+
+  public ReindexDashboardInfo(
+      @Nonnull OperationContext opContext,
+      EntityService<?> entityService,
+      AspectDao aspectDao,
+      boolean enabled,
+      Integer batchSize,
+      Integer batchDelayMs,
+      Integer limit) {
+    if (enabled) {
+      _steps =
+          ImmutableList.of(
+              new ReindexDashboardInfoStep(
+                  opContext, entityService, aspectDao, batchSize, batchDelayMs, limit));
+    } else {
+      _steps = ImmutableList.of();
+    }
+  }
+
+  @Override
+  public String id() {
+    return this.getClass().getName();
+  }
+
+  @Override
+  public List<UpgradeStep> steps() {
+    return _steps;
+  }
+}
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/restoreindices/dashboardinfo/ReindexDashboardInfoStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/restoreindices/dashboardinfo/ReindexDashboardInfoStep.java
new file mode 100644
index 00000000000000..7d0780c18c29cb
--- /dev/null
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/restoreindices/dashboardinfo/ReindexDashboardInfoStep.java
@@ -0,0 +1,42 @@
+package com.linkedin.datahub.upgrade.system.restoreindices.dashboardinfo;
+
+import static com.linkedin.metadata.Constants.*;
+
+import com.linkedin.datahub.upgrade.system.AbstractMCLStep;
+import com.linkedin.metadata.entity.AspectDao;
+import com.linkedin.metadata.entity.EntityService;
+import io.datahubproject.metadata.context.OperationContext;
+import javax.annotation.Nonnull;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.Nullable;
+
+@Slf4j
+public class ReindexDashboardInfoStep extends AbstractMCLStep {
+
+  public ReindexDashboardInfoStep(
+      OperationContext opContext,
+      EntityService<?> entityService,
+      AspectDao aspectDao,
+      Integer batchSize,
+      Integer batchDelayMs,
+      Integer limit) {
+    super(opContext, entityService, aspectDao, batchSize, batchDelayMs, limit);
+  }
+
+  @Override
+  public String id() {
+    return "dashboard-info-v1";
+  }
+
+  @Nonnull
+  @Override
+  protected String getAspectName() {
+    return DASHBOARD_INFO_ASPECT_NAME;
+  }
+
+  @Nullable
+  @Override
+  protected String getUrnLike() {
+    return "urn:li:" + DASHBOARD_ENTITY_NAME + ":%";
+  }
+}
diff --git a/docs/how/updating-datahub.md b/docs/how/updating-datahub.md
index 7e4274e067e776..a21e7b6734be96 100644
--- a/docs/how/updating-datahub.md
+++ b/docs/how/updating-datahub.md
@@ -28,6 +28,8 @@ This file documents any backwards-incompatible changes in DataHub and assists pe
 
 ### Other Notable Changes
 
+- #12433: Fixes the searchable annotations in the model supporting `Dashboard` to `Dashboard` lineage within the `DashboardInfo` aspect. Mainly, users of Sigma and PowerBI Apps ingestion may be affected by this adjustment. Consequently, a [reindex](https://datahubproject.io/docs/how/restore-indices/) will be automatically triggered during the system upgrade.
+
 ## 0.15.0
 
 - OpenAPI Update: PIT Keep Alive parameter added to scroll endpoints. NOTE: This parameter requires the `pointInTimeCreationEnabled` feature flag to be enabled and the `elasticSearch.implementation` configuration to be `elasticsearch`. This feature is not supported for OpenSearch at this time and the parameter will not be respected without both of these set.
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/aspect/patch/builder/DashboardInfoPatchBuilder.java b/entity-registry/src/main/java/com/linkedin/metadata/aspect/patch/builder/DashboardInfoPatchBuilder.java
index 9156b304a394e9..1e398e1daddd92 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/aspect/patch/builder/DashboardInfoPatchBuilder.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/aspect/patch/builder/DashboardInfoPatchBuilder.java
@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.linkedin.common.Edge;
 import com.linkedin.common.urn.ChartUrn;
+import com.linkedin.common.urn.DashboardUrn;
 import com.linkedin.common.urn.DatasetUrn;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.metadata.aspect.patch.PatchOperationType;
@@ -19,6 +20,7 @@ public class DashboardInfoPatchBuilder
     extends AbstractMultiFieldPatchBuilder<DashboardInfoPatchBuilder> {
   private static final String CHART_EDGES_PATH_START = "/chartEdges/";
   private static final String DATASET_EDGES_PATH_START = "/datasetEdges/";
+  private static final String DASHBOARDS_PATH_START = "/dashboards/";
 
   // Simplified with just Urn
   public DashboardInfoPatchBuilder addChartEdge(@Nonnull ChartUrn urn) {
@@ -36,6 +38,7 @@ public DashboardInfoPatchBuilder removeChartEdge(@Nonnull ChartUrn urn) {
     return this;
   }
 
+  // Simplified with just Urn
   public DashboardInfoPatchBuilder addDatasetEdge(@Nonnull DatasetUrn urn) {
     ObjectNode value = createEdgeValue(urn);
 
@@ -52,6 +55,22 @@ public DashboardInfoPatchBuilder removeDatasetEdge(@Nonnull DatasetUrn urn) {
     return this;
   }
 
+  // Simplified with just Urn
+  public DashboardInfoPatchBuilder addDashboard(@Nonnull DashboardUrn urn) {
+    ObjectNode value = createEdgeValue(urn);
+
+    pathValues.add(
+        ImmutableTriple.of(PatchOperationType.ADD.getValue(), DASHBOARDS_PATH_START + urn, value));
+    return this;
+  }
+
+  public DashboardInfoPatchBuilder removeDashboard(@Nonnull DashboardUrn urn) {
+    pathValues.add(
+        ImmutableTriple.of(
+            PatchOperationType.REMOVE.getValue(), DASHBOARDS_PATH_START + urn, null));
+    return this;
+  }
+
   // Full Edge modification
   public DashboardInfoPatchBuilder addEdge(@Nonnull Edge edge) {
     ObjectNode value = createEdgeValue(edge);
@@ -87,6 +106,10 @@ private String getEdgePath(@Nonnull Edge edge) {
       return CHART_EDGES_PATH_START + destinationUrn;
     }
 
+    if (DASHBOARD_ENTITY_NAME.equals(destinationUrn.getEntityType())) {
+      return DASHBOARDS_PATH_START + destinationUrn;
+    }
+
     // TODO: Output Data Jobs not supported by aspect, add here if this changes
 
     throw new IllegalArgumentException(
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/aspect/patch/template/dashboard/DashboardInfoTemplate.java b/entity-registry/src/main/java/com/linkedin/metadata/aspect/patch/template/dashboard/DashboardInfoTemplate.java
index 85ce06b01c1d78..1eccb6254a2c90 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/aspect/patch/template/dashboard/DashboardInfoTemplate.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/aspect/patch/template/dashboard/DashboardInfoTemplate.java
@@ -22,6 +22,7 @@ public class DashboardInfoTemplate implements ArrayMergingTemplate<DashboardInfo
   private static final String DATASETS_FIELD_NAME = "datasets";
   private static final String CHARTS_FIELD_NAME = "charts";
   private static final String DESTINATION_URN_FIELD_NAME = "destinationUrn";
+  private static final String DASHBOARDS_FIELD_NAME = "dashboards";
 
   @Override
   public DashboardInfo getSubtype(RecordTemplate recordTemplate) throws ClassCastException {
@@ -74,6 +75,12 @@ public JsonNode transformFields(JsonNode baseNode) {
             DATASET_EDGES_FIELD_NAME,
             Collections.singletonList(DESTINATION_URN_FIELD_NAME));
 
+    transformedNode =
+        arrayFieldToMap(
+            transformedNode,
+            DASHBOARDS_FIELD_NAME,
+            Collections.singletonList(DESTINATION_URN_FIELD_NAME));
+
     transformedNode =
         arrayFieldToMap(transformedNode, DATASETS_FIELD_NAME, Collections.emptyList());
 
@@ -97,6 +104,12 @@ public JsonNode rebaseFields(JsonNode patched) {
             CHART_EDGES_FIELD_NAME,
             Collections.singletonList(DESTINATION_URN_FIELD_NAME));
 
+    rebasedNode =
+        transformedMapToArray(
+            rebasedNode,
+            DASHBOARDS_FIELD_NAME,
+            Collections.singletonList(DESTINATION_URN_FIELD_NAME));
+
     rebasedNode = transformedMapToArray(rebasedNode, DATASETS_FIELD_NAME, Collections.emptyList());
     rebasedNode = transformedMapToArray(rebasedNode, CHARTS_FIELD_NAME, Collections.emptyList());
 
diff --git a/entity-registry/src/test/java/com/linkedin/metadata/aspect/patch/template/DashboardInfoTemplateTest.java b/entity-registry/src/test/java/com/linkedin/metadata/aspect/patch/template/DashboardInfoTemplateTest.java
index 1446635c8de94f..1a66811b7387db 100644
--- a/entity-registry/src/test/java/com/linkedin/metadata/aspect/patch/template/DashboardInfoTemplateTest.java
+++ b/entity-registry/src/test/java/com/linkedin/metadata/aspect/patch/template/DashboardInfoTemplateTest.java
@@ -31,4 +31,26 @@ public void testDashboardInfoTemplate() throws Exception {
         UrnUtils.getUrn("urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD)"),
         result.getDatasetEdges().get(0).getDestinationUrn());
   }
+
+  @Test
+  public void testDashboardInfoTemplateDashboardsField() throws Exception {
+    DashboardInfoTemplate dashboardInfoTemplate = new DashboardInfoTemplate();
+    DashboardInfo dashboardInfo = dashboardInfoTemplate.getDefault();
+    JsonPatchBuilder jsonPatchBuilder = Json.createPatchBuilder();
+    jsonPatchBuilder.add(
+        "/dashboards/urn:li:dashboard:(urn:li:dataPlatform:tableau,SampleDashboard,PROD)",
+        Json.createObjectBuilder()
+            .add(
+                "destinationUrn",
+                Json.createValue(
+                    "urn:li:dashboard:(urn:li:dataPlatform:tableau,SampleDashboard,PROD)"))
+            .build());
+
+    DashboardInfo result =
+        dashboardInfoTemplate.applyPatch(dashboardInfo, jsonPatchBuilder.build());
+
+    Assert.assertEquals(
+        UrnUtils.getUrn("urn:li:dashboard:(urn:li:dataPlatform:tableau,SampleDashboard,PROD)"),
+        result.getDashboards().get(0).getDestinationUrn());
+  }
 }
diff --git a/metadata-ingestion/src/datahub/ingestion/api/incremental_lineage_helper.py b/metadata-ingestion/src/datahub/ingestion/api/incremental_lineage_helper.py
index 92ee158661d3d4..47e7e4b276309e 100644
--- a/metadata-ingestion/src/datahub/ingestion/api/incremental_lineage_helper.py
+++ b/metadata-ingestion/src/datahub/ingestion/api/incremental_lineage_helper.py
@@ -102,6 +102,10 @@ def convert_dashboard_info_to_patch(
     if aspect.datasets:
         patch_builder.add_datasets(aspect.datasets)
 
+    if aspect.dashboards:
+        for dashboard in aspect.dashboards:
+            patch_builder.add_dashboard(dashboard)
+
     if aspect.access:
         patch_builder.set_access(aspect.access)
 
diff --git a/metadata-ingestion/src/datahub/specific/dashboard.py b/metadata-ingestion/src/datahub/specific/dashboard.py
index 515fcf0c6da955..1dc97dc42a7b4d 100644
--- a/metadata-ingestion/src/datahub/specific/dashboard.py
+++ b/metadata-ingestion/src/datahub/specific/dashboard.py
@@ -161,7 +161,7 @@ def add_chart_edge(self, chart: Union[Edge, Urn, str]) -> "DashboardPatchBuilder
                 lastModified=self._mint_auditstamp(),
             )
 
-        self._ensure_urn_type("dataset", [chart_edge], "add_chart_edge")
+        self._ensure_urn_type("chart", [chart_edge], "add_chart_edge")
         self._add_patch(
             DashboardInfo.ASPECT_NAME,
             "add",
@@ -271,6 +271,48 @@ def add_datasets(
 
         return self
 
+    def add_dashboard(
+        self, dashboard: Union[Edge, Urn, str]
+    ) -> "DashboardPatchBuilder":
+        """
+        Adds an dashboard to the DashboardPatchBuilder.
+
+        Args:
+            dashboard: The dashboard, which can be an Edge object, Urn object, or a string.
+
+        Returns:
+            The DashboardPatchBuilder instance.
+
+        Raises:
+            ValueError: If the dashboard is not a Dashboard urn.
+
+        Notes:
+            If `dashboard` is an Edge object, it is used directly. If `dashboard` is a Urn object or string,
+            it is converted to an Edge object and added with default audit stamps.
+        """
+        if isinstance(dashboard, Edge):
+            dashboard_urn: str = dashboard.destinationUrn
+            dashboard_edge: Edge = dashboard
+        elif isinstance(dashboard, (Urn, str)):
+            dashboard_urn = str(dashboard)
+            if not dashboard_urn.startswith("urn:li:dashboard:"):
+                raise ValueError(f"Input {dashboard} is not a Dashboard urn")
+
+            dashboard_edge = Edge(
+                destinationUrn=dashboard_urn,
+                created=self._mint_auditstamp(),
+                lastModified=self._mint_auditstamp(),
+            )
+
+        self._ensure_urn_type("dashboard", [dashboard_edge], "add_dashboard")
+        self._add_patch(
+            DashboardInfo.ASPECT_NAME,
+            "add",
+            path=("dashboards", dashboard_urn),
+            value=dashboard_edge,
+        )
+        return self
+
     def set_dashboard_url(
         self, dashboard_url: Optional[str]
     ) -> "DashboardPatchBuilder":
diff --git a/metadata-ingestion/tests/unit/api/source_helpers/test_incremental_lineage_helper.py b/metadata-ingestion/tests/unit/api/source_helpers/test_incremental_lineage_helper.py
index c5c4a378894c32..6dd2332fec2ba6 100644
--- a/metadata-ingestion/tests/unit/api/source_helpers/test_incremental_lineage_helper.py
+++ b/metadata-ingestion/tests/unit/api/source_helpers/test_incremental_lineage_helper.py
@@ -1,11 +1,19 @@
-from typing import List
+import re
+import unittest
+from typing import List, Optional
+
+import pytest
 
 import datahub.emitter.mce_builder as builder
 import datahub.metadata.schema_classes as models
 from datahub.emitter.mce_builder import make_dataset_urn, make_schema_field_urn
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
-from datahub.ingestion.api.incremental_lineage_helper import auto_incremental_lineage
+from datahub.ingestion.api.incremental_lineage_helper import (
+    auto_incremental_lineage,
+    convert_dashboard_info_to_patch,
+)
 from datahub.ingestion.api.source_helpers import auto_workunit
+from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.ingestion.sink.file import write_metadata_file
 from tests.test_helpers import mce_helpers
 
@@ -183,3 +191,129 @@ def test_incremental_lineage_pass_through(tmp_path, pytestconfig):
     mce_helpers.check_golden_file(
         pytestconfig=pytestconfig, output_path=test_file, golden_path=golden_file
     )
+
+
+class TestConvertDashboardInfoToPatch(unittest.TestCase):
+    def setUp(self):
+        self.urn = builder.make_dashboard_urn(
+            platform="platform", name="test", platform_instance="instance"
+        )
+        self.system_metadata = models.SystemMetadataClass()
+        self.aspect = models.DashboardInfoClass(
+            title="Test Dashboard",
+            description="This is a test dashboard",
+            lastModified=models.ChangeAuditStampsClass(),
+        )
+
+    def _validate_dashboard_info_patch(
+        self, result: Optional[MetadataWorkUnit], expected_aspect_value: bytes
+    ) -> None:
+        assert (
+            result
+            and result.metadata
+            and isinstance(result.metadata, models.MetadataChangeProposalClass)
+        )
+        mcp: models.MetadataChangeProposalClass = result.metadata
+        assert (
+            mcp.entityUrn == self.urn
+            and mcp.entityType == "dashboard"
+            and mcp.aspectName == "dashboardInfo"
+            and mcp.changeType == "PATCH"
+        )
+        assert mcp.aspect and isinstance(mcp.aspect, models.GenericAspectClass)
+        aspect: models.GenericAspectClass = mcp.aspect
+        assert aspect.value == expected_aspect_value
+
+    def test_convert_dashboard_info_to_patch_with_no_additional_values(self):
+        result = convert_dashboard_info_to_patch(
+            self.urn, self.aspect, self.system_metadata
+        )
+        self._validate_dashboard_info_patch(
+            result=result,
+            expected_aspect_value=b'[{"op": "add", "path": "/title", "value": "Test Dashboard"}, {"op": "add", "path": "/description", "value": "This is a test dashboard"}, {"op": "add", "path": "/lastModified", "value": {"created": {"time": 0, "actor": "urn:li:corpuser:unknown"}, "lastModified": {"time": 0, "actor": "urn:li:corpuser:unknown"}}}]',
+        )
+
+    def test_convert_dashboard_info_to_patch_with_custom_properties(self):
+        self.aspect.customProperties = {
+            "key1": "value1",
+            "key2": "value2",
+        }
+        result = convert_dashboard_info_to_patch(
+            self.urn, self.aspect, self.system_metadata
+        )
+        self._validate_dashboard_info_patch(
+            result=result,
+            expected_aspect_value=b'[{"op": "add", "path": "/customProperties/key1", "value": "value1"}, {"op": "add", "path": "/customProperties/key2", "value": "value2"}, {"op": "add", "path": "/title", "value": "Test Dashboard"}, {"op": "add", "path": "/description", "value": "This is a test dashboard"}, {"op": "add", "path": "/lastModified", "value": {"created": {"time": 0, "actor": "urn:li:corpuser:unknown"}, "lastModified": {"time": 0, "actor": "urn:li:corpuser:unknown"}}}]',
+        )
+
+    def test_convert_dashboard_info_to_patch_with_chart_edges(self):
+        self.aspect.chartEdges = [
+            models.EdgeClass(
+                destinationUrn=builder.make_chart_urn(
+                    platform="platform",
+                    name="target-test",
+                    platform_instance="instance",
+                ),
+            )
+        ]
+        result = convert_dashboard_info_to_patch(
+            self.urn, self.aspect, self.system_metadata
+        )
+        self._validate_dashboard_info_patch(
+            result,
+            b'[{"op": "add", "path": "/chartEdges/urn:li:chart:(platform,instance.target-test)", "value": {"destinationUrn": "urn:li:chart:(platform,instance.target-test)"}}, {"op": "add", "path": "/title", "value": "Test Dashboard"}, {"op": "add", "path": "/description", "value": "This is a test dashboard"}, {"op": "add", "path": "/lastModified", "value": {"created": {"time": 0, "actor": "urn:li:corpuser:unknown"}, "lastModified": {"time": 0, "actor": "urn:li:corpuser:unknown"}}}]',
+        )
+
+    def test_convert_dashboard_info_to_patch_with_chart_edges_no_chart(self):
+        self.aspect.chartEdges = [
+            models.EdgeClass(
+                destinationUrn=builder.make_dashboard_urn(
+                    platform="platform",
+                    name="target-test",
+                    platform_instance="instance",
+                ),
+            )
+        ]
+        with pytest.raises(
+            ValueError,
+            match=re.escape(
+                "add_chart_edge: urn:li:dashboard:(platform,instance.target-test) is not of type chart"
+            ),
+        ):
+            convert_dashboard_info_to_patch(self.urn, self.aspect, self.system_metadata)
+
+    def test_convert_dashboard_info_to_patch_with_dashboards(self):
+        self.aspect.dashboards = [
+            models.EdgeClass(
+                destinationUrn=builder.make_dashboard_urn(
+                    platform="platform",
+                    name="target-test",
+                    platform_instance="instance",
+                ),
+            )
+        ]
+        result = convert_dashboard_info_to_patch(
+            self.urn, self.aspect, self.system_metadata
+        )
+        self._validate_dashboard_info_patch(
+            result,
+            b'[{"op": "add", "path": "/title", "value": "Test Dashboard"}, {"op": "add", "path": "/description", "value": "This is a test dashboard"}, {"op": "add", "path": "/dashboards/urn:li:dashboard:(platform,instance.target-test)", "value": {"destinationUrn": "urn:li:dashboard:(platform,instance.target-test)"}}, {"op": "add", "path": "/lastModified", "value": {"created": {"time": 0, "actor": "urn:li:corpuser:unknown"}, "lastModified": {"time": 0, "actor": "urn:li:corpuser:unknown"}}}]',
+        )
+
+    def test_convert_dashboard_info_to_patch_with_dashboards_no_dashboard(self):
+        self.aspect.dashboards = [
+            models.EdgeClass(
+                destinationUrn=builder.make_chart_urn(
+                    platform="platform",
+                    name="target-test",
+                    platform_instance="instance",
+                ),
+            )
+        ]
+        with pytest.raises(
+            ValueError,
+            match=re.escape(
+                "add_dashboard: urn:li:chart:(platform,instance.target-test) is not of type dashboard"
+            ),
+        ):
+            convert_dashboard_info_to_patch(self.urn, self.aspect, self.system_metadata)
diff --git a/metadata-integration/java/datahub-client/src/test/java/datahub/client/patch/PatchTest.java b/metadata-integration/java/datahub-client/src/test/java/datahub/client/patch/PatchTest.java
index 95d20600797804..e7bba709f238d3 100644
--- a/metadata-integration/java/datahub-client/src/test/java/datahub/client/patch/PatchTest.java
+++ b/metadata-integration/java/datahub-client/src/test/java/datahub/client/patch/PatchTest.java
@@ -10,6 +10,7 @@
 import com.linkedin.common.TagAssociation;
 import com.linkedin.common.urn.ChartUrn;
 import com.linkedin.common.urn.CorpuserUrn;
+import com.linkedin.common.urn.DashboardUrn;
 import com.linkedin.common.urn.DataJobUrn;
 import com.linkedin.common.urn.DataPlatformUrn;
 import com.linkedin.common.urn.DatasetUrn;
@@ -622,6 +623,9 @@ public void testLocalDashboardInfoAdd() {
                   DatasetUrn.createFromString(
                       "urn:li:dataset:(urn:li:dataPlatform:kafka,SampleHiveDataset,PROD)"))
               .addChartEdge(ChartUrn.createFromString("urn:li:chart:(dashboartTool, chartId)"))
+              .addDashboard(
+                  DashboardUrn.createFromString(
+                      "urn:li:dashboard:(dashboardTool, childDashboardId)"))
               .build();
       Future<MetadataWriteResponse> response = restEmitter.emit(dashboardInfoPatch);
 
@@ -644,6 +648,9 @@ public void testLocalDashboardInfoRemove() {
                   DatasetUrn.createFromString(
                       "urn:li:dataset:(urn:li:dataPlatform:kafka,SampleHiveDataset,PROD)"))
               .removeChartEdge(ChartUrn.createFromString("urn:li:chart:(dashboardTool, chartId)"))
+              .removeDashboard(
+                  DashboardUrn.createFromString(
+                      "urn:li:dashboard:(dashboardTool, childDashboardId)"))
               .build();
       Future<MetadataWriteResponse> response = restEmitter.emit(dashboardInfoPatch);
 
diff --git a/metadata-models/src/main/pegasus/com/linkedin/dashboard/DashboardInfo.pdl b/metadata-models/src/main/pegasus/com/linkedin/dashboard/DashboardInfo.pdl
index 0ce19b32c89301..877d42f52b1a11 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/dashboard/DashboardInfo.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/dashboard/DashboardInfo.pdl
@@ -111,11 +111,11 @@ record DashboardInfo includes CustomProperties, ExternalReference {
       "name": "DashboardContainsDashboard",
       "entityTypes": [ "dashboard" ],
       "isLineage": true,
-      "createdOn": "datasetEdges/*/created/time"
-      "createdActor": "datasetEdges/*/created/actor"
-      "updatedOn": "datasetEdges/*/lastModified/time"
-      "updatedActor": "datasetEdges/*/lastModified/actor"
-      "properties": "datasetEdges/*/properties"
+      "createdOn": "dashboards/*/created/time"
+      "createdActor": "dashboards/*/created/actor"
+      "updatedOn": "dashboards/*/lastModified/time"
+      "updatedActor": "dashboards/*/lastModified/actor"
+      "properties": "dashboards/*/properties"
     }
   }
   dashboards: array[Edge] = [ ]
diff --git a/metadata-service/configuration/src/main/resources/application.yaml b/metadata-service/configuration/src/main/resources/application.yaml
index 5aaac2a96efea6..66ea613eaa9fd3 100644
--- a/metadata-service/configuration/src/main/resources/application.yaml
+++ b/metadata-service/configuration/src/main/resources/application.yaml
@@ -402,6 +402,11 @@ systemUpdate:
     batchSize: ${BOOTSTRAP_SYSTEM_UPDATE_DOMAIN_DESCRIPTION_BATCH_SIZE:1000}
     delayMs: ${BOOTSTRAP_SYSTEM_UPDATE_DOMAIN_DESCRIPTION_DELAY_MS:30000}
     limit: ${BOOTSTRAP_SYSTEM_UPDATE_DOMAIN_DESCRIPTION_CLL_LIMIT:0}
+  dashboardInfo:
+    enabled: ${BOOTSTRAP_SYSTEM_UPDATE_DASHBOARD_INFO_ENABLED:true}
+    batchSize: ${BOOTSTRAP_SYSTEM_UPDATE_DASHBOARD_INFO_BATCH_SIZE:1000}
+    delayMs: ${BOOTSTRAP_SYSTEM_UPDATE_DASHBOARD_INFO_DELAY_MS:30000}
+    limit: ${BOOTSTRAP_SYSTEM_UPDATE_DASHBOARD_INFO_CLL_LIMIT:0}
   browsePathsV2:
     enabled: ${BOOTSTRAP_SYSTEM_UPDATE_BROWSE_PATHS_V2_ENABLED:true}
     batchSize: ${BOOTSTRAP_SYSTEM_UPDATE_BROWSE_PATHS_V2_BATCH_SIZE:5000}

From 6f0d4751a1558d65211e17c353cb78b3cb98392f Mon Sep 17 00:00:00 2001
From: RyanHolstien <RyanHolstien@users.noreply.github.com>
Date: Mon, 3 Feb 2025 10:26:27 -0600
Subject: [PATCH 213/249] feat(restoreIndices): update restore indices args and
 docs (#12529)

---
 .../restoreindices/RestoreIndices.java        |  5 +++
 .../upgrade/restoreindices/SendMAEStep.java   | 25 +++++++++++++++
 docs/how/restore-indices.md                   | 32 +++++++++++++++++++
 3 files changed, 62 insertions(+)

diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restoreindices/RestoreIndices.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restoreindices/RestoreIndices.java
index 9d239a56224862..d48ac6f2c8f1ba 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restoreindices/RestoreIndices.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restoreindices/RestoreIndices.java
@@ -28,6 +28,11 @@ public class RestoreIndices implements Upgrade {
   public static final String URN_BASED_PAGINATION_ARG_NAME = "urnBasedPagination";
 
   public static final String STARTING_OFFSET_ARG_NAME = "startingOffset";
+  public static final String LAST_URN_ARG_NAME = "lastUrn";
+  public static final String LAST_ASPECT_ARG_NAME = "lastAspect";
+  public static final String GE_PIT_EPOCH_MS_ARG_NAME = "gePitEpochMs";
+  public static final String LE_PIT_EPOCH_MS_ARG_NAME = "lePitEpochMs";
+  public static final String ASPECT_NAMES_ARG_NAME = "aspectNames";
 
   private final List<UpgradeStep> _steps;
 
diff --git a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restoreindices/SendMAEStep.java b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restoreindices/SendMAEStep.java
index 902a80ec107fd2..bf707f8b4ba14a 100644
--- a/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restoreindices/SendMAEStep.java
+++ b/datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/restoreindices/SendMAEStep.java
@@ -14,6 +14,7 @@
 import io.ebean.Database;
 import io.ebean.ExpressionList;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -123,6 +124,30 @@ private RestoreIndicesArgs getArgs(UpgradeContext context) {
     } else {
       context.report().addLine("No urnLike arg present");
     }
+    if (containsKey(context.parsedArgs(), RestoreIndices.LE_PIT_EPOCH_MS_ARG_NAME)) {
+      result.lePitEpochMs =
+          Long.parseLong(context.parsedArgs().get(RestoreIndices.LE_PIT_EPOCH_MS_ARG_NAME).get());
+      context.report().addLine(String.format("lePitEpochMs is %s", result.lePitEpochMs));
+    }
+    if (containsKey(context.parsedArgs(), RestoreIndices.GE_PIT_EPOCH_MS_ARG_NAME)) {
+      result.gePitEpochMs =
+          Long.parseLong(context.parsedArgs().get(RestoreIndices.GE_PIT_EPOCH_MS_ARG_NAME).get());
+      context.report().addLine(String.format("gePitEpochMs is %s", result.gePitEpochMs));
+    }
+    if (containsKey(context.parsedArgs(), RestoreIndices.LAST_URN_ARG_NAME)) {
+      result.lastUrn = context.parsedArgs().get(RestoreIndices.LAST_URN_ARG_NAME).get();
+      context.report().addLine(String.format("lastUrn is %s", result.lastUrn));
+    }
+    if (containsKey(context.parsedArgs(), RestoreIndices.LAST_ASPECT_ARG_NAME)) {
+      result.lastAspect = context.parsedArgs().get(RestoreIndices.LAST_ASPECT_ARG_NAME).get();
+      context.report().addLine(String.format("lastAspect is %s", result.lastAspect));
+    }
+    if (containsKey(context.parsedArgs(), RestoreIndices.ASPECT_NAMES_ARG_NAME)) {
+      result.aspectNames =
+          Arrays.asList(
+              context.parsedArgs().get(RestoreIndices.ASPECT_NAMES_ARG_NAME).get().split(","));
+      context.report().addLine(String.format("aspectNames is %s", result.aspectNames));
+    }
     return result;
   }
 
diff --git a/docs/how/restore-indices.md b/docs/how/restore-indices.md
index 447e08c2dc6f07..cc19e6c9915ac3 100644
--- a/docs/how/restore-indices.md
+++ b/docs/how/restore-indices.md
@@ -11,6 +11,38 @@ By default, restoring the indices from the local database will not remove any ex
 the search and graph indices that no longer exist in the local database, potentially leading to inconsistencies
 between the search and graph indices and the local database.
 
+## Configuration
+
+The upgrade jobs take arguments as command line args to the job itself rather than environment variables for job specific configuration. The RestoreIndices job is specified through the `-u RestoreIndices` upgrade ID parameter and then additional parameters are specified like `-a batchSize=1000`.
+The following configurations are available:
+
+### Time-Based Filtering
+
+* `lePitEpochMs`: Restore records created before this timestamp (in milliseconds)
+* `gePitEpochMs`: Restore records created after this timestamp (in milliseconds)
+
+### Pagination and Performance Options
+
+* `urnBasedPagination`: Enable key-based pagination instead of offset-based pagination. Recommended for large datasets as it's typically more efficient.
+* `startingOffset`: When using default pagination, start from this offset
+* `lastUrn`: Resume from a specific URN when using URN-based pagination
+* `lastAspect`: Used with lastUrn to resume from a specific aspect, preventing reprocessing
+* `numThreads`: Number of concurrent threads for processing restoration, only used with default offset based paging
+* `batchSize`: Configures the size of each batch as the job pages through rows
+* `batchDelayMs`: Adds a delay in between each batch to avoid overloading backend systems
+
+### Content Filtering
+
+* `aspectNames`: Comma-separated list of aspects to restore (e.g., "ownership,status")
+* `urnLike`: SQL LIKE pattern to filter URNs (e.g., "urn:li:dataset%")
+
+### Nuclear option
+* `clean`: This option wipes out the current indices by running deletes of all the documents to guarantee a consistent state with SQL. This is generally not recommended unless there is significant data corruption on the instance.
+
+### Helm
+
+These are available in the helm charts as configurations for Kubernetes deployments under the `datahubUpgrade.restoreIndices.args` path which will set them up as args to the pod command.
+
 ## Quickstart
 
 If you're using the quickstart images, you can use the `datahub` cli to restore the indices.

From d2b0e575284a9b803bf6d31859d3bb4d77180246 Mon Sep 17 00:00:00 2001
From: deepgarg-visa <149145061+deepgarg-visa@users.noreply.github.com>
Date: Tue, 4 Feb 2025 04:25:48 +0530
Subject: [PATCH 214/249] fix(businessAttribute): fix business Attribute
 related entities (#12537)

---
 .../metadata/search/utils/ESUtils.java        |  2 +
 .../metadata/search/utils/ESUtilsTest.java    | 40 +++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
index 34894a584ce69f..8f252f6440656e 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
@@ -503,6 +503,8 @@ public static String toKeywordField(
 
     return skipKeywordSuffix
             || KEYWORD_FIELDS.contains(fieldName)
+            || KEYWORD_FIELDS.stream()
+                .anyMatch(nestedField -> fieldName.endsWith("." + nestedField))
             || PATH_HIERARCHY_FIELDS.contains(fieldName)
             || SUBFIELDS.stream().anyMatch(subfield -> fieldName.endsWith("." + subfield))
         ? fieldName
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/utils/ESUtilsTest.java b/metadata-io/src/test/java/com/linkedin/metadata/search/utils/ESUtilsTest.java
index 4f2bda39ad2117..def06f03069fbd 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/utils/ESUtilsTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/utils/ESUtilsTest.java
@@ -800,6 +800,46 @@ public void testGetQueryBuilderFromCriterionFieldToExpand() {
             + "  }\n"
             + "}";
     Assert.assertEquals(envExpanded.toString(), envExpected);
+
+    final Criterion businessAttributeRefNestedFieldCriterion =
+        buildCriterion("businessAttribute", Condition.EQUAL, "urn:li:businessAttribute:value");
+
+    QueryBuilder businessAttributeExpanded =
+        ESUtils.getQueryBuilderFromCriterion(
+            businessAttributeRefNestedFieldCriterion,
+            false,
+            new HashMap<>(),
+            mock(OperationContext.class),
+            QueryFilterRewriteChain.EMPTY);
+    String businessAttributeExpected =
+        "{\n"
+            + "  \"bool\" : {\n"
+            + "    \"should\" : [\n"
+            + "      {\n"
+            + "        \"terms\" : {\n"
+            + "          \"businessAttributeRef.keyword\" : [\n"
+            + "            \"urn:li:businessAttribute:value\"\n"
+            + "          ],\n"
+            + "          \"boost\" : 1.0,\n"
+            + "          \"_name\" : \"businessAttributeRef\"\n"
+            + "        }\n"
+            + "      },\n"
+            + "      {\n"
+            + "        \"terms\" : {\n"
+            + "          \"businessAttributeRef.urn\" : [\n"
+            + "            \"urn:li:businessAttribute:value\"\n"
+            + "          ],\n"
+            + "          \"boost\" : 1.0,\n"
+            + "          \"_name\" : \"businessAttributeRef.urn\"\n"
+            + "        }\n"
+            + "      }\n"
+            + "    ],\n"
+            + "    \"adjust_pure_negative\" : true,\n"
+            + "    \"minimum_should_match\" : \"1\",\n"
+            + "    \"boost\" : 1.0\n"
+            + "  }\n"
+            + "}";
+    Assert.assertEquals(businessAttributeExpanded.toString(), businessAttributeExpected);
   }
 
   @Test

From 469cc4f8fae31d49f9ed923b52d4c2544932aec0 Mon Sep 17 00:00:00 2001
From: Hyejin Yoon <0327jane@gmail.com>
Date: Tue, 4 Feb 2025 08:53:30 +0900
Subject: [PATCH 215/249] fix(ui): make data process instance visible in
 container in V2& fix model/modelgroup names (#12513)

---
 .../src/app/entity/mlModel/MLModelEntity.tsx  |   3 +-
 .../mlModel/profile/MLModelGroupsTab.tsx      |   6 +-
 .../mlModelGroup/MLModelGroupEntity.tsx       |   3 +-
 .../DataProcessInstanceEntity.tsx             |  24 +++--
 .../profile/DataProcessInstanceSummary.tsx    | 102 ++++++++++++++++++
 .../app/entityV2/mlModel/MLModelEntity.tsx    |   5 +-
 .../app/entityV2/mlModel/preview/Preview.tsx  |   3 +-
 .../mlModel/profile/MLModelGroupsTab.tsx      |   6 +-
 .../mlModelGroup/MLModelGroupEntity.tsx       |   5 +-
 .../entityV2/mlModelGroup/preview/Preview.tsx |   3 +-
 .../src/graphql/fragments.graphql             |   3 +
 11 files changed, 142 insertions(+), 21 deletions(-)
 create mode 100644 datahub-web-react/src/app/entityV2/dataProcessInstance/profile/DataProcessInstanceSummary.tsx

diff --git a/datahub-web-react/src/app/entity/mlModel/MLModelEntity.tsx b/datahub-web-react/src/app/entity/mlModel/MLModelEntity.tsx
index 5e75b4680e427f..b5ebbd39621cb8 100644
--- a/datahub-web-react/src/app/entity/mlModel/MLModelEntity.tsx
+++ b/datahub-web-react/src/app/entity/mlModel/MLModelEntity.tsx
@@ -143,7 +143,8 @@ export class MLModelEntity implements Entity<MlModel> {
     getLineageVizConfig = (entity: MlModel) => {
         return {
             urn: entity.urn,
-            name: entity.name,
+            // eslint-disable-next-line @typescript-eslint/dot-notation
+            name: entity.properties?.['propertiesName'] || entity.name,
             type: EntityType.Mlmodel,
             icon: entity.platform?.properties?.logoUrl || undefined,
             platform: entity.platform,
diff --git a/datahub-web-react/src/app/entity/mlModel/profile/MLModelGroupsTab.tsx b/datahub-web-react/src/app/entity/mlModel/profile/MLModelGroupsTab.tsx
index f8e90f3b32a8c9..bea8e144e56f99 100644
--- a/datahub-web-react/src/app/entity/mlModel/profile/MLModelGroupsTab.tsx
+++ b/datahub-web-react/src/app/entity/mlModel/profile/MLModelGroupsTab.tsx
@@ -24,7 +24,11 @@ export default function MLModelGroupsTab() {
             title: 'Group',
             dataIndex: 'name',
             render: (name, record) => {
-                return <Link href={entityRegistry.getEntityUrl(EntityType.MlmodelGroup, record.urn)}>{name}</Link>;
+                return (
+                    <Link href={entityRegistry.getEntityUrl(EntityType.MlmodelGroup, record.urn)}>
+                        {record.properties?.name || name}
+                    </Link>
+                );
             },
         },
         {
diff --git a/datahub-web-react/src/app/entity/mlModelGroup/MLModelGroupEntity.tsx b/datahub-web-react/src/app/entity/mlModelGroup/MLModelGroupEntity.tsx
index 1217200ea46f8e..cba24c0e383452 100644
--- a/datahub-web-react/src/app/entity/mlModelGroup/MLModelGroupEntity.tsx
+++ b/datahub-web-react/src/app/entity/mlModelGroup/MLModelGroupEntity.tsx
@@ -131,7 +131,8 @@ export class MLModelGroupEntity implements Entity<MlModelGroup> {
     getLineageVizConfig = (entity: MlModelGroup) => {
         return {
             urn: entity.urn,
-            name: entity.name,
+            // eslint-disable-next-line @typescript-eslint/dot-notation
+            name: entity.properties?.['propertiesName'] || entity.name,
             type: EntityType.MlmodelGroup,
             icon: entity.platform?.properties?.logoUrl || undefined,
             platform: entity.platform,
diff --git a/datahub-web-react/src/app/entityV2/dataProcessInstance/DataProcessInstanceEntity.tsx b/datahub-web-react/src/app/entityV2/dataProcessInstance/DataProcessInstanceEntity.tsx
index 09301b101b259c..4cd58f7847549a 100644
--- a/datahub-web-react/src/app/entityV2/dataProcessInstance/DataProcessInstanceEntity.tsx
+++ b/datahub-web-react/src/app/entityV2/dataProcessInstance/DataProcessInstanceEntity.tsx
@@ -1,4 +1,5 @@
 import { GenericEntityProperties } from '@app/entity/shared/types';
+import { Entity as GraphQLEntity } from '@types';
 import { globalEntityRegistryV2 } from '@app/EntityRegistryProvider';
 import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity';
 import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile';
@@ -11,24 +12,21 @@ import { getDataProduct } from '@app/entityV2/shared/utils';
 import { GetDataProcessInstanceQuery, useGetDataProcessInstanceQuery } from '@graphql/dataProcessInstance.generated';
 import { ArrowsClockwise } from 'phosphor-react';
 import React from 'react';
-import { DataProcessInstance, Entity as GeneratedEntity, EntityType, SearchResult } from '../../../types.generated';
+import { DataProcessInstance, EntityType, SearchResult } from '../../../types.generated';
 import Preview from './preview/Preview';
+import DataProcessInstanceSummary from './profile/DataProcessInstanceSummary';
 
-const getParentEntities = (data: DataProcessInstance): GeneratedEntity[] => {
+const getParentEntities = (data: DataProcessInstance): GraphQLEntity[] => {
     const parentEntity = data?.relationships?.relationships?.find(
         (rel) => rel.type === 'InstanceOf' && rel.entity?.type === EntityType.DataJob,
     );
 
-    if (!parentEntity?.entity) return [];
+    if (!parentEntity || !parentEntity.entity) {
+        return [];
+    }
 
-    // Convert to GeneratedEntity
-    return [
-        {
-            type: parentEntity.entity.type,
-            urn: (parentEntity.entity as any).urn, // Make sure urn exists
-            relationships: (parentEntity.entity as any).relationships,
-        },
-    ];
+    // First cast to unknown, then to Entity with proper type
+    return [parentEntity.entity];
 };
 
 /**
@@ -85,6 +83,10 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
                 new Set([EntityMenuItems.UPDATE_DEPRECATION, EntityMenuItems.RAISE_INCIDENT, EntityMenuItems.SHARE])
             }
             tabs={[
+                {
+                    name: 'Summary',
+                    component: DataProcessInstanceSummary,
+                },
                 {
                     name: 'Lineage',
                     component: LineageTab,
diff --git a/datahub-web-react/src/app/entityV2/dataProcessInstance/profile/DataProcessInstanceSummary.tsx b/datahub-web-react/src/app/entityV2/dataProcessInstance/profile/DataProcessInstanceSummary.tsx
new file mode 100644
index 00000000000000..98e2909175e31b
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/dataProcessInstance/profile/DataProcessInstanceSummary.tsx
@@ -0,0 +1,102 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Space, Table, Typography } from 'antd';
+import { formatDetailedDuration } from '@src/app/shared/time/timeUtils';
+import { capitalize } from 'lodash';
+import moment from 'moment';
+import { MlHyperParam, MlMetric, DataProcessInstanceRunResultType } from '../../../../types.generated';
+import { useBaseEntity } from '../../../entity/shared/EntityContext';
+import { InfoItem } from '../../shared/components/styled/InfoItem';
+import { GetDataProcessInstanceQuery } from '../../../../graphql/dataProcessInstance.generated';
+import { Pill } from '../../../../alchemy-components/components/Pills';
+
+const TabContent = styled.div`
+    padding: 16px;
+`;
+
+const InfoItemContainer = styled.div<{ justifyContent }>`
+    display: flex;
+    position: relative;
+    justify-content: ${(props) => props.justifyContent};
+    padding: 0px 2px;
+`;
+
+const InfoItemContent = styled.div`
+    padding-top: 8px;
+    width: 100px;
+`;
+
+const propertyTableColumns = [
+    {
+        title: 'Name',
+        dataIndex: 'name',
+        width: 450,
+    },
+    {
+        title: 'Value',
+        dataIndex: 'value',
+    },
+];
+
+export default function DataProcessInstanceSummary() {
+    const baseEntity = useBaseEntity<GetDataProcessInstanceQuery>();
+    const dpi = baseEntity?.dataProcessInstance;
+
+    const formatStatus = (state) => {
+        if (!state || state.length === 0) return '-';
+        const result = state[0]?.result?.resultType;
+        const statusColor = result === DataProcessInstanceRunResultType.Success ? 'green' : 'red';
+        return <Pill label={capitalize(result)} colorScheme={statusColor} clickable={false} />;
+    };
+
+    const formatDuration = (state) => {
+        if (!state || state.length === 0) return '-';
+        return formatDetailedDuration(state[0]?.durationMillis);
+    };
+
+    return (
+        <TabContent>
+            <Space direction="vertical" style={{ width: '100%' }} size="large">
+                <Typography.Title level={3}>Details</Typography.Title>
+                <InfoItemContainer justifyContent="left">
+                    <InfoItem title="Created At">
+                        <InfoItemContent>
+                            {dpi?.properties?.created?.time
+                                ? moment(dpi.properties.created.time).format('YYYY-MM-DD HH:mm:ss')
+                                : '-'}
+                        </InfoItemContent>
+                    </InfoItem>
+                    <InfoItem title="Status">
+                        <InfoItemContent>{formatStatus(dpi?.state)}</InfoItemContent>
+                    </InfoItem>
+                    <InfoItem title="Duration">
+                        <InfoItemContent>{formatDuration(dpi?.state)}</InfoItemContent>
+                    </InfoItem>
+                    <InfoItem title="Run ID">
+                        <InfoItemContent>{dpi?.mlTrainingRunProperties?.id}</InfoItemContent>
+                    </InfoItem>
+                    <InfoItem title="Created By">
+                        <InfoItemContent>{dpi?.properties?.created?.actor}</InfoItemContent>
+                    </InfoItem>
+                </InfoItemContainer>
+                <InfoItemContainer justifyContent="left">
+                    <InfoItem title="Artifacts Location">
+                        <InfoItemContent>{dpi?.mlTrainingRunProperties?.outputUrls}</InfoItemContent>
+                    </InfoItem>
+                </InfoItemContainer>
+                <Typography.Title level={3}>Training Metrics</Typography.Title>
+                <Table
+                    pagination={false}
+                    columns={propertyTableColumns}
+                    dataSource={dpi?.mlTrainingRunProperties?.trainingMetrics as MlMetric[]}
+                />
+                <Typography.Title level={3}>Hyper Parameters</Typography.Title>
+                <Table
+                    pagination={false}
+                    columns={propertyTableColumns}
+                    dataSource={dpi?.mlTrainingRunProperties?.hyperParams as MlHyperParam[]}
+                />
+            </Space>
+        </TabContent>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/mlModel/MLModelEntity.tsx b/datahub-web-react/src/app/entityV2/mlModel/MLModelEntity.tsx
index e0839929b9f556..7527d0133d62e0 100644
--- a/datahub-web-react/src/app/entityV2/mlModel/MLModelEntity.tsx
+++ b/datahub-web-react/src/app/entityV2/mlModel/MLModelEntity.tsx
@@ -192,7 +192,8 @@ export class MLModelEntity implements Entity<MlModel> {
     getLineageVizConfig = (entity: MlModel) => {
         return {
             urn: entity.urn,
-            name: entity.name,
+            // eslint-disable-next-line @typescript-eslint/dot-notation
+            name: entity.properties?.['propertiesName'] || entity.name,
             type: EntityType.Mlmodel,
             icon: entity.platform?.properties?.logoUrl || undefined,
             platform: entity.platform,
@@ -201,7 +202,7 @@ export class MLModelEntity implements Entity<MlModel> {
     };
 
     displayName = (data: MlModel) => {
-        return data.name || data.urn;
+        return data.properties?.name || data.name || data.urn;
     };
 
     getGenericEntityProperties = (mlModel: MlModel) => {
diff --git a/datahub-web-react/src/app/entityV2/mlModel/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/mlModel/preview/Preview.tsx
index 89529a9087cc86..24e635f7661ca3 100644
--- a/datahub-web-react/src/app/entityV2/mlModel/preview/Preview.tsx
+++ b/datahub-web-react/src/app/entityV2/mlModel/preview/Preview.tsx
@@ -31,7 +31,8 @@ export const Preview = ({
     return (
         <DefaultPreviewCard
             url={entityRegistry.getEntityUrl(EntityType.Mlmodel, model.urn)}
-            name={model.name || ''}
+            // eslint-disable-next-line @typescript-eslint/dot-notation
+            name={model?.properties?.['propertiesName'] || model?.name || ''}
             urn={model.urn}
             data={data}
             description={model.description || ''}
diff --git a/datahub-web-react/src/app/entityV2/mlModel/profile/MLModelGroupsTab.tsx b/datahub-web-react/src/app/entityV2/mlModel/profile/MLModelGroupsTab.tsx
index 2ba9e0edd6783d..506a624da6db5f 100644
--- a/datahub-web-react/src/app/entityV2/mlModel/profile/MLModelGroupsTab.tsx
+++ b/datahub-web-react/src/app/entityV2/mlModel/profile/MLModelGroupsTab.tsx
@@ -24,7 +24,11 @@ export default function MLModelGroupsTab() {
             title: 'Group',
             dataIndex: 'name',
             render: (name, record) => {
-                return <Link href={entityRegistry.getEntityUrl(EntityType.MlmodelGroup, record.urn)}>{name}</Link>;
+                return (
+                    <Link href={entityRegistry.getEntityUrl(EntityType.MlmodelGroup, record.urn)}>
+                        {record.properties?.name || name}
+                    </Link>
+                );
             },
         },
         {
diff --git a/datahub-web-react/src/app/entityV2/mlModelGroup/MLModelGroupEntity.tsx b/datahub-web-react/src/app/entityV2/mlModelGroup/MLModelGroupEntity.tsx
index 0a2f99e02dd761..2371920c458086 100644
--- a/datahub-web-react/src/app/entityV2/mlModelGroup/MLModelGroupEntity.tsx
+++ b/datahub-web-react/src/app/entityV2/mlModelGroup/MLModelGroupEntity.tsx
@@ -175,7 +175,8 @@ export class MLModelGroupEntity implements Entity<MlModelGroup> {
     getLineageVizConfig = (entity: MlModelGroup) => {
         return {
             urn: entity.urn,
-            name: entity.name,
+            // eslint-disable-next-line @typescript-eslint/dot-notation
+            name: entity.properties?.['propertiesName'] || entity.name,
             type: EntityType.MlmodelGroup,
             icon: entity.platform?.properties?.logoUrl || undefined,
             platform: entity.platform,
@@ -184,7 +185,7 @@ export class MLModelGroupEntity implements Entity<MlModelGroup> {
     };
 
     displayName = (data: MlModelGroup) => {
-        return data.name || data.urn;
+        return data.properties?.name || data.name || data.urn;
     };
 
     getGenericEntityProperties = (mlModelGroup: MlModelGroup) => {
diff --git a/datahub-web-react/src/app/entityV2/mlModelGroup/preview/Preview.tsx b/datahub-web-react/src/app/entityV2/mlModelGroup/preview/Preview.tsx
index 31abd228e4466e..0451cea9cebd1b 100644
--- a/datahub-web-react/src/app/entityV2/mlModelGroup/preview/Preview.tsx
+++ b/datahub-web-react/src/app/entityV2/mlModelGroup/preview/Preview.tsx
@@ -30,7 +30,8 @@ export const Preview = ({
     return (
         <DefaultPreviewCard
             url={entityRegistry.getEntityUrl(EntityType.MlmodelGroup, group.urn)}
-            name={group?.name || ''}
+            // eslint-disable-next-line @typescript-eslint/dot-notation
+            name={group?.properties?.['propertiesName'] || group?.name || ''}
             urn={group.urn}
             data={data}
             platformInstanceId={group.dataPlatformInstance?.instanceId}
diff --git a/datahub-web-react/src/graphql/fragments.graphql b/datahub-web-react/src/graphql/fragments.graphql
index c78be584a81f10..513857b8b4f3c0 100644
--- a/datahub-web-react/src/graphql/fragments.graphql
+++ b/datahub-web-react/src/graphql/fragments.graphql
@@ -1054,6 +1054,9 @@ fragment nonRecursiveMLModel on MLModel {
             urn
             name
             description
+            properties {
+                name
+            }
         }
         customProperties {
             key

From 35e2bbb960b7ecd74046fdac618a494eb08401d9 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Mon, 3 Feb 2025 22:19:37 -0800
Subject: [PATCH 216/249] fix(ingest): avoid multiprocessing "fork" start
 method (#12543)

---
 .../docs/dev_guides/classification.md         | 79 +++++++++----------
 metadata-ingestion/src/datahub/entrypoints.py |  9 +++
 .../glossary/classification_mixin.py          |  6 ++
 .../datahub/ingestion/glossary/classifier.py  |  5 +-
 4 files changed, 57 insertions(+), 42 deletions(-)

diff --git a/metadata-ingestion/docs/dev_guides/classification.md b/metadata-ingestion/docs/dev_guides/classification.md
index 457725b6783e52..0c939fd1d3423b 100644
--- a/metadata-ingestion/docs/dev_guides/classification.md
+++ b/metadata-ingestion/docs/dev_guides/classification.md
@@ -6,21 +6,21 @@ The classification feature enables sources to be configured to automatically pre
 
 Note that a `.` is used to denote nested fields in the YAML recipe.
 
-| Field                     | Required | Type                                    | Description                                                                                                                                                                                                                                                                                                                              | Default                                                    |
-| ------------------------- | -------- | --------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |------------------------------------------------------------|
-| enabled                   |          | boolean                                 | Whether classification should be used to auto-detect glossary terms                                                                                                                                                                                                                                                                      | False                                                      |
-| sample_size               |          | int                                     | Number of sample values used for classification.                                                                                                                                                                                                                                                                                         | 100                                                        |
-| max_workers               |          | int                                     | Number of worker processes to use for classification. Note that any number above 1 might lead to a deadlock. Set to 1 to disable.                                                                                                                                                                                                                                                               | 1                                                          |
-| info_type_to_term         |          | Dict[str,string]                        | Optional mapping to provide glossary term identifier for info type.                                                                                                                                                                                                                                                                      | By default, info type is used as glossary term identifier. |
-| classifiers               |          | Array of object                         | Classifiers to use to auto-detect glossary terms. If more than one classifier, infotype predictions from the classifier defined later in sequence take precedance.                                                                                                                                                                       | [{'type': 'datahub', 'config': None}]                      |
-| table_pattern             |          | AllowDenyPattern (see below for fields) | Regex patterns to filter tables for classification. This is used in combination with other patterns in parent config. Specify regex to match the entire table name in `database.schema.table` format. e.g. to match all tables starting with customer in Customer database and public schema, use the regex 'Customer.public.customer.*' | {'allow': ['.*'], 'deny': [], 'ignoreCase': True}          |
-| table_pattern.allow       |          | Array of string                         | List of regex patterns to include in ingestion                                                                                                                                                                                                                                                                                           | ['.*']                                                     |
-| table_pattern.deny        |          | Array of string                         | List of regex patterns to exclude from ingestion.                                                                                                                                                                                                                                                                                        | []                                                         |
-| table_pattern.ignoreCase  |          | boolean                                 | Whether to ignore case sensitivity during pattern matching.                                                                                                                                                                                                                                                                              | True                                                       |
-| column_pattern            |          | AllowDenyPattern (see below for fields) | Regex patterns to filter columns for classification. This is used in combination with other patterns in parent config. Specify regex to match the column name in `database.schema.table.column` format.                                                                                                                                  | {'allow': ['.*'], 'deny': [], 'ignoreCase': True}          |
-| column_pattern.allow      |          | Array of string                         | List of regex patterns to include in ingestion                                                                                                                                                                                                                                                                                           | ['.*']                                                     |
-| column_pattern.deny       |          | Array of string                         | List of regex patterns to exclude from ingestion.                                                                                                                                                                                                                                                                                        | []                                                         |
-| column_pattern.ignoreCase |          | boolean                                 | Whether to ignore case sensitivity during pattern matching.                                                                                                                                                                                                                                                                              | True                                                       |
+| Field                     | Required | Type                                    | Description                                                                                                                                                                                                                                                                                                                               | Default                                                    |
+| ------------------------- | -------- | --------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------- |
+| enabled                   |          | boolean                                 | Whether classification should be used to auto-detect glossary terms                                                                                                                                                                                                                                                                       | False                                                      |
+| sample_size               |          | int                                     | Number of sample values used for classification.                                                                                                                                                                                                                                                                                          | 100                                                        |
+| max_workers               |          | int                                     | Number of worker processes to use for classification. Set to 1 to disable.                                                                                                                                                                                                                                                                | Number of CPU cores                                        |
+| info_type_to_term         |          | Dict[str,string]                        | Optional mapping to provide glossary term identifier for info type.                                                                                                                                                                                                                                                                       | By default, info type is used as glossary term identifier. |
+| classifiers               |          | Array of object                         | Classifiers to use to auto-detect glossary terms. If more than one classifier, infotype predictions from the classifier defined later in sequence take precedance.                                                                                                                                                                        | [{'type': 'datahub', 'config': None}]                      |
+| table_pattern             |          | AllowDenyPattern (see below for fields) | Regex patterns to filter tables for classification. This is used in combination with other patterns in parent config. Specify regex to match the entire table name in `database.schema.table` format. e.g. to match all tables starting with customer in Customer database and public schema, use the regex 'Customer.public.customer.\*' | {'allow': ['.*'], 'deny': [], 'ignoreCase': True}          |
+| table_pattern.allow       |          | Array of string                         | List of regex patterns to include in ingestion                                                                                                                                                                                                                                                                                            | ['.*']                                                     |
+| table_pattern.deny        |          | Array of string                         | List of regex patterns to exclude from ingestion.                                                                                                                                                                                                                                                                                         | []                                                         |
+| table_pattern.ignoreCase  |          | boolean                                 | Whether to ignore case sensitivity during pattern matching.                                                                                                                                                                                                                                                                               | True                                                       |
+| column_pattern            |          | AllowDenyPattern (see below for fields) | Regex patterns to filter columns for classification. This is used in combination with other patterns in parent config. Specify regex to match the column name in `database.schema.table.column` format.                                                                                                                                   | {'allow': ['.*'], 'deny': [], 'ignoreCase': True}          |
+| column_pattern.allow      |          | Array of string                         | List of regex patterns to include in ingestion                                                                                                                                                                                                                                                                                            | ['.*']                                                     |
+| column_pattern.deny       |          | Array of string                         | List of regex patterns to exclude from ingestion.                                                                                                                                                                                                                                                                                         | []                                                         |
+| column_pattern.ignoreCase |          | boolean                                 | Whether to ignore case sensitivity during pattern matching.                                                                                                                                                                                                                                                                               | True                                                       |
 
 ## DataHub Classifier
 
@@ -28,27 +28,29 @@ DataHub Classifier is the default classifier implementation, which uses [acryl-d
 
 ### Config Details
 
-| Field                                                  | Required                                              | Type                                           | Description                                                                                                                                                         | Default                                                                                                                                                               |
-| ------------------------------------------------------ | ----------------------------------------------------- | ---------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| confidence_level_threshold                             |                                                       | number                                         |                                                                                                                                                                     | 0.68                                                                                                                                                                  |
-| strip_exclusion_formatting                             |                                                       | bool                                           | A flag that determines whether the exclusion list uses exact matching or format stripping (case-insensitivity, punctuation removal, and special character removal). | True                                                                                                                                                                  |
-| info_types                                             |                                                       | list[string]                                   | List of infotypes to be predicted. By default, all supported infotypes are considered, along with any custom infotypes configured in `info_types_config`.           | None                                                                                                                                                                  |
-| info_types_config                                      | Configuration details for infotypes                   | Dict[str, InfoTypeConfig]                      |                                                                                                                                                                     | See [reference_input.py](https://github.com/acryldata/datahub-classify/blob/main/datahub-classify/src/datahub_classify/reference_input.py) for default configuration. |
+| Field                                                  | Required                                               | Type                                           | Description                                                                                                                                                         | Default                                                                                                                                                               |
+| ------------------------------------------------------ | ------------------------------------------------------ | ---------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| confidence_level_threshold                             |                                                        | number                                         |                                                                                                                                                                     | 0.68                                                                                                                                                                  |
+| strip_exclusion_formatting                             |                                                        | bool                                           | A flag that determines whether the exclusion list uses exact matching or format stripping (case-insensitivity, punctuation removal, and special character removal). | True                                                                                                                                                                  |
+| info_types                                             |                                                        | list[string]                                   | List of infotypes to be predicted. By default, all supported infotypes are considered, along with any custom infotypes configured in `info_types_config`.           | None                                                                                                                                                                  |
+| info_types_config                                      | Configuration details for infotypes                    | Dict[str, InfoTypeConfig]                      |                                                                                                                                                                     | See [reference_input.py](https://github.com/acryldata/datahub-classify/blob/main/datahub-classify/src/datahub_classify/reference_input.py) for default configuration. |
 | info_types_config.`key`.prediction_factors_and_weights | ❓ (required if info_types_config.`key` is set)        | Dict[str,number]                               | Factors and their weights to consider when predicting info types                                                                                                    |                                                                                                                                                                       |
-| info_types_config.`key`.exclude_name                   |                                                       | list[string]                                   | Optional list of names to exclude from classification.                                                                                                              | None                                                                                                                                                                  |
-| info_types_config.`key`.name                           |                                                       | NameFactorConfig (see below for fields)        |                                                                                                                                                                     |                                                                                                                                                                       |
-| info_types_config.`key`.name.regex                     |                                                       | Array of string                                | List of regex patterns the column name follows for the info type                                                                                                    | ['.*']                                                                                                                                                                |
-| info_types_config.`key`.description                    |                                                       | DescriptionFactorConfig (see below for fields) |                                                                                                                                                                     |                                                                                                                                                                       |
-| info_types_config.`key`.description.regex              |                                                       | Array of string                                | List of regex patterns the column description follows for the info type                                                                                             | ['.*']                                                                                                                                                                |
-| info_types_config.`key`.datatype                       |                                                       | DataTypeFactorConfig (see below for fields)    |                                                                                                                                                                     |                                                                                                                                                                       |
-| info_types_config.`key`.datatype.type                  |                                                       | Array of string                                | List of data types for the info type                                                                                                                                | ['.*']                                                                                                                                                                |
-| info_types_config.`key`.values                         |                                                       | ValuesFactorConfig (see below for fields)      |                                                                                                                                                                     |                                                                                                                                                                       |
+| info_types_config.`key`.exclude_name                   |                                                        | list[string]                                   | Optional list of names to exclude from classification.                                                                                                              | None                                                                                                                                                                  |
+| info_types_config.`key`.name                           |                                                        | NameFactorConfig (see below for fields)        |                                                                                                                                                                     |                                                                                                                                                                       |
+| info_types_config.`key`.name.regex                     |                                                        | Array of string                                | List of regex patterns the column name follows for the info type                                                                                                    | ['.*']                                                                                                                                                                |
+| info_types_config.`key`.description                    |                                                        | DescriptionFactorConfig (see below for fields) |                                                                                                                                                                     |                                                                                                                                                                       |
+| info_types_config.`key`.description.regex              |                                                        | Array of string                                | List of regex patterns the column description follows for the info type                                                                                             | ['.*']                                                                                                                                                                |
+| info_types_config.`key`.datatype                       |                                                        | DataTypeFactorConfig (see below for fields)    |                                                                                                                                                                     |                                                                                                                                                                       |
+| info_types_config.`key`.datatype.type                  |                                                        | Array of string                                | List of data types for the info type                                                                                                                                | ['.*']                                                                                                                                                                |
+| info_types_config.`key`.values                         |                                                        | ValuesFactorConfig (see below for fields)      |                                                                                                                                                                     |                                                                                                                                                                       |
 | info_types_config.`key`.values.prediction_type         | ❓ (required if info_types_config.`key`.values is set) | string                                         |                                                                                                                                                                     | None                                                                                                                                                                  |
-| info_types_config.`key`.values.regex                   |                                                       | Array of string                                | List of regex patterns the column value follows for the info type                                                                                                   | None                                                                                                                                                                  |
-| info_types_config.`key`.values.library                 |                                                       | Array of string                                | Library used for prediction                                                                                                                                         | None                                                                                                                                                                  |
-| minimum_values_threshold                               |                                                       | number                                         | Minimum number of non-null column values required to process `values` prediction factor.                                                                            | 50                                                                                                                                                                    |
+| info_types_config.`key`.values.regex                   |                                                        | Array of string                                | List of regex patterns the column value follows for the info type                                                                                                   | None                                                                                                                                                                  |
+| info_types_config.`key`.values.library                 |                                                        | Array of string                                | Library used for prediction                                                                                                                                         | None                                                                                                                                                                  |
+| minimum_values_threshold                               |                                                        | number                                         | Minimum number of non-null column values required to process `values` prediction factor.                                                                            | 50                                                                                                                                                                    |
 |                                                        |
+
 ### Supported infotypes
+
 - `Email_Address`
 - `Gender`
 - `Credit_Debit_Card_Number`
@@ -73,8 +75,7 @@ DataHub Classifier is the default classifier implementation, which uses [acryl-d
 
 - Classification for nested columns (struct, array type)
 
-
-## Examples 
+## Examples
 
 ### Basic
 
@@ -99,7 +100,7 @@ source:
     classification:
       enabled: True
       classifiers:
-        - type: datahub          
+        - type: datahub
 ```
 
 ### Advanced Configuration: Customizing configuration for supported info types
@@ -127,7 +128,7 @@ source:
       info_type_to_term:
         Email_Address: "Email"
       classifiers:
-        - type: datahub          
+        - type: datahub
           config:
             confidence_level_threshold: 0.7
             info_types_config:
@@ -403,10 +404,8 @@ source:
                   regex: []
                   library:
                     - rule_based_logic
-
 ```
 
-
 ### Advanced Configuration: Specifying Custom InfoType
 
 ```yml
@@ -430,7 +429,7 @@ source:
     classification:
       enabled: True
       classifiers:
-        - type: datahub          
+        - type: datahub
           config:
             confidence_level_threshold: 0.7
             minimum_values_threshold: 10
@@ -452,4 +451,4 @@ source:
 
 ### DataHub Blog
 
-* [PII Classification just got easier with DataHub](https://blog.datahubproject.io/pii-classification-just-got-easier-with-datahub-6bab2b63abcb)
+- [PII Classification just got easier with DataHub](https://blog.datahubproject.io/pii-classification-just-got-easier-with-datahub-6bab2b63abcb)
diff --git a/metadata-ingestion/src/datahub/entrypoints.py b/metadata-ingestion/src/datahub/entrypoints.py
index 5ae465bbc89eea..24f2e12423d97b 100644
--- a/metadata-ingestion/src/datahub/entrypoints.py
+++ b/metadata-ingestion/src/datahub/entrypoints.py
@@ -1,4 +1,5 @@
 import logging
+import multiprocessing
 import os
 import platform
 import sys
@@ -217,6 +218,14 @@ def init(use_password: bool = False) -> None:
 
 
 def main(**kwargs):
+    # We use threads in a variety of places within our CLI. The multiprocessing
+    # "fork" start method is not safe to use with threads.
+    # MacOS and Windows already default to "spawn", and Linux will as well starting in Python 3.14.
+    # https://docs.python.org/3/library/multiprocessing.html#contexts-and-start-methods
+    # Eventually it may make sense to use "forkserver" as the default where available,
+    # but we can revisit that in the future.
+    multiprocessing.set_start_method("spawn", force=True)
+
     # This wrapper prevents click from suppressing errors.
     try:
         sys.exit(datahub(standalone_mode=False, **kwargs))
diff --git a/metadata-ingestion/src/datahub/ingestion/glossary/classification_mixin.py b/metadata-ingestion/src/datahub/ingestion/glossary/classification_mixin.py
index 98c43079a3bc15..4465317ae351a6 100644
--- a/metadata-ingestion/src/datahub/ingestion/glossary/classification_mixin.py
+++ b/metadata-ingestion/src/datahub/ingestion/glossary/classification_mixin.py
@@ -1,5 +1,6 @@
 import concurrent.futures
 import logging
+import multiprocessing
 from dataclasses import dataclass, field
 from functools import partial
 from math import ceil
@@ -182,6 +183,11 @@ def async_classify(
 
         with concurrent.futures.ProcessPoolExecutor(
             max_workers=self.config.classification.max_workers,
+            # The fork start method, which is the default on Linux for Python < 3.14, is not
+            # safe when the main process uses threads. The default start method on windows/macOS is
+            # already spawn, and will be changed to spawn for Linux in Python 3.14.
+            # https://docs.python.org/3/library/multiprocessing.html#contexts-and-start-methods
+            mp_context=multiprocessing.get_context("spawn"),
         ) as executor:
             column_info_proposal_futures = [
                 executor.submit(
diff --git a/metadata-ingestion/src/datahub/ingestion/glossary/classifier.py b/metadata-ingestion/src/datahub/ingestion/glossary/classifier.py
index bdcdcb8990eba7..ddcb74e354613a 100644
--- a/metadata-ingestion/src/datahub/ingestion/glossary/classifier.py
+++ b/metadata-ingestion/src/datahub/ingestion/glossary/classifier.py
@@ -1,3 +1,4 @@
+import os
 from abc import ABCMeta, abstractmethod
 from dataclasses import dataclass
 from typing import Any, Dict, List, Optional
@@ -37,8 +38,8 @@ class ClassificationConfig(ConfigModel):
     )
 
     max_workers: int = Field(
-        default=1,
-        description="Number of worker processes to use for classification. Note that any number above 1 might lead to a deadlock. Set to 1 to disable.",
+        default=(os.cpu_count() or 4),
+        description="Number of worker processes to use for classification. Set to 1 to disable.",
     )
 
     table_pattern: AllowDenyPattern = Field(

From de5578879e3da13f970cebbb675c12cdf6506240 Mon Sep 17 00:00:00 2001
From: kevinkarchacryl <kevin.karch@acryl.io>
Date: Tue, 4 Feb 2025 01:34:56 -0500
Subject: [PATCH 217/249] fix(ui): revert backend breaking changes to mau
 (#12461)

---
 .../analytics/resolver/GetChartsResolver.java | 16 ++------------
 .../datahub/graphql/utils/DateUtilTest.java   | 22 -------------------
 2 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/analytics/resolver/GetChartsResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/analytics/resolver/GetChartsResolver.java
index d9b8008d46286a..9bcb24e0beffa5 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/analytics/resolver/GetChartsResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/analytics/resolver/GetChartsResolver.java
@@ -85,20 +85,8 @@ private TimeSeriesChart getActiveUsersTimeSeriesChart(
       final String title,
       final DateInterval interval) {
 
-    final DateRange dateRange;
-
-    // adjust month to show 1st of month rather than last day of previous month
-    if (interval == DateInterval.MONTH) {
-      dateRange =
-          new DateRange(
-              String.valueOf(beginning.plusDays(1).getMillis()), // Shift start by 1 day
-              String.valueOf(end.plusDays(1).getMillis()) // Shift end by 1 day
-              );
-    } else {
-      // week display starting Sundays
-      dateRange =
-          new DateRange(String.valueOf(beginning.getMillis()), String.valueOf(end.getMillis()));
-    }
+    final DateRange dateRange =
+        new DateRange(String.valueOf(beginning.getMillis()), String.valueOf(end.getMillis()));
 
     final List<NamedLine> timeSeriesLines =
         _analyticsService.getTimeseriesChart(
diff --git a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/utils/DateUtilTest.java b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/utils/DateUtilTest.java
index 4383df9d46a4bc..6ecbc8d015b29a 100644
--- a/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/utils/DateUtilTest.java
+++ b/datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/utils/DateUtilTest.java
@@ -47,26 +47,4 @@ public void testStartOfNextWeek() {
     Mockito.when(dateUtil.getNow()).thenReturn(setTimeParts(8, false));
     assertEqualStartOfNextWeek(dateUtil, 9);
   }
-
-  // validates logic to display correct dates in MAU chart
-  @Test
-  public void testDateAdjustmentsForMonth() {
-    DateUtil dateUtil = Mockito.spy(DateUtil.class);
-
-    Mockito.when(dateUtil.getNow()).thenReturn(new DateTime(2024, 11, 15, 0, 0, 0));
-
-    // start date should be next month minus a day
-    // but we want to display Dec 1 instead of Nov 30, so add a day and verify it's Dec
-    DateTime startOfNextMonthMinus12 = dateUtil.getStartOfNextMonth().minusMonths(12);
-    DateTime adjustedStart = startOfNextMonthMinus12.minusMillis(1).plusDays(1);
-    assertEquals(12, adjustedStart.getMonthOfYear()); // Verify it is December
-    assertEquals(2023, adjustedStart.getYear()); // Verify it is 2023
-
-    // verify that the end date displays correctly
-    // the chart will display Oct 1 as the last month because we don't show current month
-    DateTime startOfThisMonth = dateUtil.getStartOfThisMonth();
-    DateTime adjustedEnd = startOfThisMonth.minusMillis(1).plusDays(1);
-    assertEquals(11, adjustedEnd.getMonthOfYear()); // Verify it is November
-    assertEquals(2024, adjustedEnd.getYear()); // Verify it is 2024
-  }
 }

From 6cb51916efbda2b960c11cf0867dde9f071fce3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20G=C3=B3mez=20Villamor?= <sgomezvillamor@gmail.com>
Date: Tue, 4 Feb 2025 12:41:13 +0100
Subject: [PATCH 218/249] tests(kafka-connect): fixes integration tests setup
 (#12531)

---
 .../kafka-connect/docker-compose.override.yml | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/metadata-ingestion/tests/integration/kafka-connect/docker-compose.override.yml b/metadata-ingestion/tests/integration/kafka-connect/docker-compose.override.yml
index 85b6a310a06d20..5811346dce6873 100644
--- a/metadata-ingestion/tests/integration/kafka-connect/docker-compose.override.yml
+++ b/metadata-ingestion/tests/integration/kafka-connect/docker-compose.override.yml
@@ -21,21 +21,30 @@ services:
       - bash
       - -c
       - |
-        echo "Installing Connector"
+        echo "Install confluent CLI"
+        # https://docs.confluent.io/confluent-cli/current/install.html#tarball-or-zip-installation
+        wget https://packages.confluent.io/confluent-cli/archives/4.16.0/confluent_linux_amd64.tar.gz
+        mkdir -p /tmp/confluent-cli
+        tar -xvf confluent_linux_amd64.tar.gz -C /tmp/confluent-cli
+        export PATH=/tmp/confluent-cli/confluent:$PATH
+        echo "Done!"
+        echo "Installing Connectors"
         #
-        confluent-hub install --no-prompt confluentinc/kafka-connect-jdbc:10.2.5      
+        confluent connect plugin install --force confluentinc/kafka-connect-jdbc:10.2.5      
         #
-        confluent-hub install --no-prompt confluentinc/connect-transforms:1.4.1
+        confluent connect plugin install --force confluentinc/connect-transforms:1.4.1
         #
-        confluent-hub install --no-prompt confluentinc/kafka-connect-datagen:0.6.0
+        confluent connect plugin install --force confluentinc/kafka-connect-datagen:0.6.0
         #
-        confluent-hub install --no-prompt debezium/debezium-connector-mysql:1.7.0
+        confluent connect plugin install --force debezium/debezium-connector-mysql:1.7.0
         #
-        confluent-hub install --no-prompt wepay/kafka-connect-bigquery:1.6.8
+        confluent connect plugin install --force wepay/kafka-connect-bigquery:1.6.8
         #
-        confluent-hub install --no-prompt mongodb/kafka-connect-mongodb:1.10.1
+        confluent connect plugin install --force mongodb/kafka-connect-mongodb:1.10.1
         #
-        confluent-hub install --no-prompt confluentinc/kafka-connect-s3:10.5.1
+        confluent connect plugin install --force confluentinc/kafka-connect-s3:10.5.1
+        #
+        mkdir -p /usr/share/confluent-hub-components/confluentinc-kafka-connect-jdbc/lib
         #
         curl -k -SL "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-8.0.27.tar.gz" \
              | tar -xzf - -C /usr/share/confluent-hub-components/confluentinc-kafka-connect-jdbc/lib \

From 808447db2747f1d81197b93d0355906ec11d1ec4 Mon Sep 17 00:00:00 2001
From: Mayuri Nehate <33225191+mayurinehate@users.noreply.github.com>
Date: Tue, 4 Feb 2025 19:19:06 +0530
Subject: [PATCH 219/249] fix(ingest/unity): add row count in table profile of
 delta tables (#12480)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sergio Gómez Villamor <sgomezvillamor@gmail.com>
---
 .../ingestion/source/ge_profiling_config.py   | 18 +++---
 .../ingestion/source/unity/ge_profiler.py     | 59 +++++++++++++++++--
 .../datahub/ingestion/source/unity/report.py  |  1 +
 3 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/ge_profiling_config.py b/metadata-ingestion/src/datahub/ingestion/source/ge_profiling_config.py
index 93142a347ca0e6..9c251c040bed13 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/ge_profiling_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/ge_profiling_config.py
@@ -115,26 +115,30 @@ class GEProfilingConfig(GEProfilingBaseConfig):
     )
     max_number_of_fields_to_profile: Optional[pydantic.PositiveInt] = Field(
         default=None,
-        description="A positive integer that specifies the maximum number of columns to profile for any table. `None` implies all columns. The cost of profiling goes up significantly as the number of columns to profile goes up.",
+        description="A positive integer that specifies the maximum number of columns to profile for "
+        "any table. `None` implies all columns. The cost of profiling goes up significantly as the "
+        "number of columns to profile goes up.",
     )
 
     profile_if_updated_since_days: Optional[pydantic.PositiveFloat] = Field(
         default=None,
-        description="Profile table only if it has been updated since these many number of days. If set to `null`, no constraint of last modified time for tables to profile. Supported only in `snowflake` and `BigQuery`.",
+        description="Profile table only if it has been updated since these many number of days. "
+        "If set to `null`, no constraint of last modified time for tables to profile. "
+        "Supported only in `snowflake` and `BigQuery`.",
     )
 
     profile_table_size_limit: Optional[int] = Field(
         default=5,
         description="Profile tables only if their size is less than specified GBs. If set to `null`, "
-        "no limit on the size of tables to profile. Supported only in `snowflake` and `BigQuery`"
-        "Supported for `oracle` based on calculated size from gathered stats.",
+        "no limit on the size of tables to profile. Supported only in `Snowflake`, `BigQuery` and "
+        "`Databricks`. Supported for `Oracle` based on calculated size from gathered stats.",
     )
 
     profile_table_row_limit: Optional[int] = Field(
         default=5000000,
-        description="Profile tables only if their row count is less than specified count. If set to `null`, "
-        "no limit on the row count of tables to profile. Supported only in `snowflake` and `BigQuery`"
-        "Supported for `oracle` based on gathered stats.",
+        description="Profile tables only if their row count is less than specified count. "
+        "If set to `null`, no limit on the row count of tables to profile. Supported only in "
+        "`Snowflake`, `BigQuery`. Supported for `Oracle` based on gathered stats.",
     )
 
     profile_table_row_count_estimate_only: bool = Field(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/unity/ge_profiler.py b/metadata-ingestion/src/datahub/ingestion/source/unity/ge_profiler.py
index e24ca8330777ed..a8658d476b87b0 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/unity/ge_profiler.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/unity/ge_profiler.py
@@ -3,6 +3,7 @@
 from dataclasses import dataclass, field
 from typing import Iterable, List, Optional
 
+from databricks.sdk.service.catalog import DataSourceFormat
 from sqlalchemy import create_engine
 from sqlalchemy.engine import Connection
 
@@ -34,6 +35,11 @@ def __init__(self, table: Table):
         self.size_in_bytes = None
         self.rows_count = None
         self.ddl = None
+        self.data_source_format = table.data_source_format
+
+    @property
+    def is_delta_table(self) -> bool:
+        return self.data_source_format == DataSourceFormat.DELTA
 
 
 class UnityCatalogGEProfiler(GenericProfiler):
@@ -110,13 +116,20 @@ def get_unity_profile_request(
         profile_table_level_only = self.profiling_config.profile_table_level_only
 
         dataset_name = table.ref.qualified_table_name
-        try:
-            table.size_in_bytes = _get_dataset_size_in_bytes(table, conn)
-        except Exception as e:
-            logger.warning(f"Failed to get table size for {dataset_name}: {e}")
+        if table.is_delta_table:
+            try:
+                table.size_in_bytes = _get_dataset_size_in_bytes(table, conn)
+            except Exception as e:
+                self.report.warning(
+                    title="Incomplete Dataset Profile",
+                    message="Failed to get table size",
+                    context=dataset_name,
+                    exc=e,
+                )
 
         if table.size_in_bytes is None:
             self.report.num_profile_missing_size_in_bytes += 1
+
         if not self.is_dataset_eligible_for_profiling(
             dataset_name,
             size_in_bytes=table.size_in_bytes,
@@ -143,6 +156,23 @@ def get_unity_profile_request(
                 self.report.report_dropped(dataset_name)
             return None
 
+        if profile_table_level_only and table.is_delta_table:
+            # For requests with profile_table_level_only set, dataset profile is generated
+            # by looking at table.rows_count. For delta tables (a typical databricks table)
+            # count(*) is an efficient query to compute row count.
+            try:
+                table.rows_count = _get_dataset_row_count(table, conn)
+            except Exception as e:
+                self.report.warning(
+                    title="Incomplete Dataset Profile",
+                    message="Failed to get table row count",
+                    context=dataset_name,
+                    exc=e,
+                )
+
+        if table.rows_count is None:
+            self.report.num_profile_missing_row_count += 1
+
         self.report.report_entity_profiled(dataset_name)
         logger.debug(f"Preparing profiling request for {dataset_name}")
         return TableProfilerRequest(
@@ -160,6 +190,9 @@ def _get_dataset_size_in_bytes(
         conn.dialect.identifier_preparer.quote(c)
         for c in [table.ref.catalog, table.ref.schema, table.ref.table]
     )
+    # This query only works for delta table.
+    # Ref: https://docs.databricks.com/en/delta/table-details.html
+    # Note: Any change here should also update _get_dataset_row_count
     row = conn.execute(f"DESCRIBE DETAIL {name}").fetchone()
     if row is None:
         return None
@@ -168,3 +201,21 @@ def _get_dataset_size_in_bytes(
             return int(row._asdict()["sizeInBytes"])
         except Exception:
             return None
+
+
+def _get_dataset_row_count(
+    table: UnityCatalogSQLGenericTable, conn: Connection
+) -> Optional[int]:
+    name = ".".join(
+        conn.dialect.identifier_preparer.quote(c)
+        for c in [table.ref.catalog, table.ref.schema, table.ref.table]
+    )
+    # This query only works efficiently for delta table
+    row = conn.execute(f"select count(*) as numRows from {name}").fetchone()
+    if row is None:
+        return None
+    else:
+        try:
+            return int(row._asdict()["numRows"])
+        except Exception:
+            return None
diff --git a/metadata-ingestion/src/datahub/ingestion/source/unity/report.py b/metadata-ingestion/src/datahub/ingestion/source/unity/report.py
index f16769341853a1..2288514fb82388 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/unity/report.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/unity/report.py
@@ -52,6 +52,7 @@ class UnityCatalogReport(IngestionStageReport, SQLSourceReport):
         default_factory=LossyDict
     )
     num_profile_missing_size_in_bytes: int = 0
+    num_profile_missing_row_count: int = 0
     num_profile_failed_unsupported_column_type: int = 0
     num_profile_failed_int_casts: int = 0
 

From d1e8a0a145abf5d5e5c98ae471ce69b39756acbf Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Tue, 4 Feb 2025 19:42:11 +0530
Subject: [PATCH 220/249] fix(ingest): use lossy collections (#12523)

---
 .../src/datahub/ingestion/source/abs/report.py     |  4 ++--
 .../source/aws/sagemaker_processors/common.py      |  5 +++--
 .../source/bigquery_v2/bigquery_report.py          |  2 +-
 .../datahub/ingestion/source/delta_lake/report.py  |  4 ++--
 .../datahub/ingestion/source/dynamodb/dynamodb.py  |  3 ++-
 .../src/datahub/ingestion/source/elastic_search.py |  3 ++-
 .../ingestion/source/iceberg/iceberg_common.py     |  5 +++--
 .../src/datahub/ingestion/source/identity/okta.py  |  3 ++-
 .../src/datahub/ingestion/source/kafka/kafka.py    |  3 ++-
 .../ingestion/source/kafka_connect/common.py       |  3 ++-
 .../src/datahub/ingestion/source/ldap.py           |  3 ++-
 .../ingestion/source/looker/lookml_config.py       | 14 +++++++++-----
 .../src/datahub/ingestion/source/mongodb.py        |  3 ++-
 .../src/datahub/ingestion/source/nifi.py           |  3 ++-
 .../src/datahub/ingestion/source/powerbi/config.py |  4 ++--
 .../source/powerbi_report_server/report_server.py  |  3 ++-
 .../src/datahub/ingestion/source/redash.py         | 10 +++++-----
 .../src/datahub/ingestion/source/salesforce.py     |  5 ++++-
 .../ingestion/source/snowflake/snowflake_report.py |  3 ++-
 .../datahub/ingestion/source/tableau/tableau.py    |  3 ++-
 .../src/datahub/ingestion/source_report/pulsar.py  |  9 +++++----
 21 files changed, 58 insertions(+), 37 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/abs/report.py b/metadata-ingestion/src/datahub/ingestion/source/abs/report.py
index c24e2f97060916..2c0ccc4bb1d845 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/abs/report.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/abs/report.py
@@ -1,16 +1,16 @@
 import dataclasses
 from dataclasses import field as dataclass_field
-from typing import List
 
 from datahub.ingestion.source.state.stale_entity_removal_handler import (
     StaleEntityRemovalSourceReport,
 )
+from datahub.utilities.lossy_collections import LossyList
 
 
 @dataclasses.dataclass
 class DataLakeSourceReport(StaleEntityRemovalSourceReport):
     files_scanned = 0
-    filtered: List[str] = dataclass_field(default_factory=list)
+    filtered: LossyList[str] = dataclass_field(default_factory=LossyList)
 
     def report_file_scanned(self) -> None:
         self.files_scanned += 1
diff --git a/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker_processors/common.py b/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker_processors/common.py
index 73d8d33dd11be7..fc933b0f0586df 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker_processors/common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/aws/sagemaker_processors/common.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import Dict, List, Optional, Union
+from typing import Dict, Optional, Union
 
 from pydantic.fields import Field
 
@@ -9,6 +9,7 @@
     StatefulIngestionConfigBase,
     StatefulStaleMetadataRemovalConfig,
 )
+from datahub.utilities.lossy_collections import LossyList
 
 
 class SagemakerSourceConfig(
@@ -42,7 +43,7 @@ class SagemakerSourceReport(StaleEntityRemovalSourceReport):
     jobs_scanned = 0
     jobs_processed = 0
     datasets_scanned = 0
-    filtered: List[str] = field(default_factory=list)
+    filtered: LossyList[str] = field(default_factory=LossyList)
     model_endpoint_lineage = 0
     model_group_lineage = 0
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_report.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_report.py
index 8e55d81aac5fe3..cfdbb585d97c5f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_report.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery_report.py
@@ -141,7 +141,7 @@ class BigQueryV2Report(
     profiling_skipped_invalid_partition_type: Dict[str, str] = field(
         default_factory=TopKDict
     )
-    profiling_skipped_partition_profiling_disabled: List[str] = field(
+    profiling_skipped_partition_profiling_disabled: LossyList[str] = field(
         default_factory=LossyList
     )
     allow_pattern: Optional[str] = None
diff --git a/metadata-ingestion/src/datahub/ingestion/source/delta_lake/report.py b/metadata-ingestion/src/datahub/ingestion/source/delta_lake/report.py
index e8690a24f8b85e..090ed1fa92a7d6 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/delta_lake/report.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/delta_lake/report.py
@@ -1,14 +1,14 @@
 import dataclasses
 from dataclasses import field as dataclass_field
-from typing import List
 
 from datahub.ingestion.api.source import SourceReport
+from datahub.utilities.lossy_collections import LossyList
 
 
 @dataclasses.dataclass
 class DeltaLakeSourceReport(SourceReport):
     files_scanned = 0
-    filtered: List[str] = dataclass_field(default_factory=list)
+    filtered: LossyList[str] = dataclass_field(default_factory=LossyList)
 
     def report_file_scanned(self) -> None:
         self.files_scanned += 1
diff --git a/metadata-ingestion/src/datahub/ingestion/source/dynamodb/dynamodb.py b/metadata-ingestion/src/datahub/ingestion/source/dynamodb/dynamodb.py
index cb3f0dd9cf29f4..db3795f225c9e3 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/dynamodb/dynamodb.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/dynamodb/dynamodb.py
@@ -68,6 +68,7 @@
     StringTypeClass,
     UnionTypeClass,
 )
+from datahub.utilities.lossy_collections import LossyList
 from datahub.utilities.registries.domain_registry import DomainRegistry
 
 MAX_ITEMS_TO_RETRIEVE = 100
@@ -120,7 +121,7 @@ def dynamodb_client(self):
 
 @dataclass
 class DynamoDBSourceReport(StaleEntityRemovalSourceReport, ClassificationReportMixin):
-    filtered: List[str] = field(default_factory=list)
+    filtered: LossyList[str] = field(default_factory=LossyList)
 
     def report_dropped(self, name: str) -> None:
         self.filtered.append(name)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/elastic_search.py b/metadata-ingestion/src/datahub/ingestion/source/elastic_search.py
index ce1c60dcafdd46..9b4c94cd1a0274 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/elastic_search.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/elastic_search.py
@@ -62,6 +62,7 @@
     SubTypesClass,
 )
 from datahub.utilities.config_clean import remove_protocol
+from datahub.utilities.lossy_collections import LossyList
 from datahub.utilities.urns.dataset_urn import DatasetUrn
 
 logger = logging.getLogger(__name__)
@@ -189,7 +190,7 @@ def get_schema_fields(
 @dataclass
 class ElasticsearchSourceReport(SourceReport):
     index_scanned: int = 0
-    filtered: List[str] = field(default_factory=list)
+    filtered: LossyList[str] = field(default_factory=LossyList)
 
     def report_index_scanned(self, index: str) -> None:
         self.index_scanned += 1
diff --git a/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg_common.py b/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg_common.py
index 83fe3d1c079f17..831b3b1a7e9132 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg_common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/iceberg/iceberg_common.py
@@ -1,6 +1,6 @@
 import logging
 from dataclasses import dataclass, field
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, Optional
 
 from humanfriendly import format_timespan
 from pydantic import Field, validator
@@ -20,6 +20,7 @@
     OperationConfig,
     is_profiling_enabled,
 )
+from datahub.utilities.lossy_collections import LossyList
 from datahub.utilities.stats_collections import TopKDict, int_top_k_dict
 
 logger = logging.getLogger(__name__)
@@ -198,7 +199,7 @@ def __str__(self) -> str:
 class IcebergSourceReport(StaleEntityRemovalSourceReport):
     tables_scanned: int = 0
     entities_profiled: int = 0
-    filtered: List[str] = field(default_factory=list)
+    filtered: LossyList[str] = field(default_factory=LossyList)
     load_table_timings: TimingClass = field(default_factory=TimingClass)
     processing_table_timings: TimingClass = field(default_factory=TimingClass)
     profiling_table_timings: TimingClass = field(default_factory=TimingClass)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/identity/okta.py b/metadata-ingestion/src/datahub/ingestion/source/identity/okta.py
index 5452fbcd3f053b..002608e119bbf0 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/identity/okta.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/identity/okta.py
@@ -50,6 +50,7 @@
     OriginTypeClass,
     StatusClass,
 )
+from datahub.utilities.lossy_collections import LossyList
 
 logger = logging.getLogger(__name__)
 nest_asyncio.apply()
@@ -173,7 +174,7 @@ def okta_groups_one_of_filter_or_search(cls, v, values):
 
 @dataclass
 class OktaSourceReport(StaleEntityRemovalSourceReport):
-    filtered: List[str] = field(default_factory=list)
+    filtered: LossyList[str] = field(default_factory=LossyList)
 
     def report_filtered(self, name: str) -> None:
         self.filtered.append(name)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/kafka/kafka.py b/metadata-ingestion/src/datahub/ingestion/source/kafka/kafka.py
index 9f15eda1501f11..3ba6ef142bc41f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/kafka/kafka.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/kafka/kafka.py
@@ -73,6 +73,7 @@
     OwnershipSourceTypeClass,
     SubTypesClass,
 )
+from datahub.utilities.lossy_collections import LossyList
 from datahub.utilities.mapping import Constants, OperationProcessor
 from datahub.utilities.registries.domain_registry import DomainRegistry
 from datahub.utilities.str_enum import StrEnum
@@ -190,7 +191,7 @@ def get_kafka_admin_client(
 @dataclass
 class KafkaSourceReport(StaleEntityRemovalSourceReport):
     topics_scanned: int = 0
-    filtered: List[str] = field(default_factory=list)
+    filtered: LossyList[str] = field(default_factory=LossyList)
 
     def report_topic_scanned(self, topic: str) -> None:
         self.topics_scanned += 1
diff --git a/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/common.py b/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/common.py
index 36f6a96c0d4080..7f54df26e3df1f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/kafka_connect/common.py
@@ -16,6 +16,7 @@
 from datahub.ingestion.source.state.stateful_ingestion_base import (
     StatefulIngestionConfigBase,
 )
+from datahub.utilities.lossy_collections import LossyList
 
 logger = logging.getLogger(__name__)
 
@@ -83,7 +84,7 @@ class KafkaConnectSourceConfig(
 @dataclass
 class KafkaConnectSourceReport(StaleEntityRemovalSourceReport):
     connectors_scanned: int = 0
-    filtered: List[str] = field(default_factory=list)
+    filtered: LossyList[str] = field(default_factory=LossyList)
 
     def report_connector_scanned(self, connector: str) -> None:
         self.connectors_scanned += 1
diff --git a/metadata-ingestion/src/datahub/ingestion/source/ldap.py b/metadata-ingestion/src/datahub/ingestion/source/ldap.py
index 236e91a86700c3..68765c1b4b66cd 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/ldap.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/ldap.py
@@ -37,6 +37,7 @@
     CorpUserSnapshotClass,
     GroupMembershipClass,
 )
+from datahub.utilities.lossy_collections import LossyList
 
 # default mapping for attrs
 user_attrs_map: Dict[str, Any] = {}
@@ -160,7 +161,7 @@ class LDAPSourceConfig(StatefulIngestionConfigBase, DatasetSourceConfigMixin):
 
 @dataclasses.dataclass
 class LDAPSourceReport(StaleEntityRemovalSourceReport):
-    dropped_dns: List[str] = dataclasses.field(default_factory=list)
+    dropped_dns: LossyList[str] = dataclasses.field(default_factory=LossyList)
 
     def report_dropped(self, dn: str) -> None:
         self.dropped_dns.append(dn)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_config.py b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_config.py
index 75de6f1fe3c6e1..7e848adf2dd383 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_config.py
@@ -1,7 +1,7 @@
 import logging
 from dataclasses import dataclass, field as dataclass_field
 from datetime import timedelta
-from typing import Any, Dict, List, Literal, Optional, Union
+from typing import Any, Dict, Literal, Optional, Union
 
 import pydantic
 from pydantic import root_validator, validator
@@ -48,13 +48,17 @@
 class LookMLSourceReport(StaleEntityRemovalSourceReport):
     git_clone_latency: Optional[timedelta] = None
     models_discovered: int = 0
-    models_dropped: List[str] = dataclass_field(default_factory=LossyList)
+    models_dropped: LossyList[str] = dataclass_field(default_factory=LossyList)
     views_discovered: int = 0
-    views_dropped: List[str] = dataclass_field(default_factory=LossyList)
-    views_dropped_unreachable: List[str] = dataclass_field(default_factory=LossyList)
+    views_dropped: LossyList[str] = dataclass_field(default_factory=LossyList)
+    views_dropped_unreachable: LossyList[str] = dataclass_field(
+        default_factory=LossyList
+    )
     query_parse_attempts: int = 0
     query_parse_failures: int = 0
-    query_parse_failure_views: List[str] = dataclass_field(default_factory=LossyList)
+    query_parse_failure_views: LossyList[str] = dataclass_field(
+        default_factory=LossyList
+    )
     _looker_api: Optional[LookerAPI] = None
 
     def report_models_scanned(self) -> None:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/mongodb.py b/metadata-ingestion/src/datahub/ingestion/source/mongodb.py
index ad8487c1a759ec..32e94bb9288f2c 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/mongodb.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/mongodb.py
@@ -68,6 +68,7 @@
     UnionTypeClass,
 )
 from datahub.metadata.urns import DatasetUrn
+from datahub.utilities.lossy_collections import LossyList
 
 logger = logging.getLogger(__name__)
 
@@ -143,7 +144,7 @@ def check_max_doc_size_filter_is_valid(cls, doc_size_filter_value):
 
 @dataclass
 class MongoDBSourceReport(StaleEntityRemovalSourceReport):
-    filtered: List[str] = field(default_factory=list)
+    filtered: LossyList[str] = field(default_factory=LossyList)
 
     def report_dropped(self, name: str) -> None:
         self.filtered.append(name)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/nifi.py b/metadata-ingestion/src/datahub/ingestion/source/nifi.py
index 52b1386e21d85a..d365d727826714 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/nifi.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/nifi.py
@@ -46,6 +46,7 @@
     DatasetPropertiesClass,
 )
 from datahub.specific.datajob import DataJobPatchBuilder
+from datahub.utilities.lossy_collections import LossyList
 
 logger = logging.getLogger(__name__)
 NIFI = "nifi"
@@ -452,7 +453,7 @@ def get_attribute_value(attr_lst: List[dict], attr_name: str) -> Optional[str]:
 
 @dataclass
 class NifiSourceReport(SourceReport):
-    filtered: List[str] = field(default_factory=list)
+    filtered: LossyList[str] = field(default_factory=LossyList)
 
     def report_dropped(self, ent_name: str) -> None:
         self.filtered.append(ent_name)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py
index 14beab6bc9391e..9692eca4176fad 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py
@@ -195,8 +195,8 @@ class PowerBiDashboardSourceReport(StaleEntityRemovalSourceReport):
 
     dashboards_scanned: int = 0
     charts_scanned: int = 0
-    filtered_dashboards: List[str] = dataclass_field(default_factory=list)
-    filtered_charts: List[str] = dataclass_field(default_factory=list)
+    filtered_dashboards: LossyList[str] = dataclass_field(default_factory=LossyList)
+    filtered_charts: LossyList[str] = dataclass_field(default_factory=LossyList)
 
     m_query_parse_timer: PerfTimer = dataclass_field(default_factory=PerfTimer)
     m_query_parse_attempts: int = 0
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi_report_server/report_server.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi_report_server/report_server.py
index 4764400215e12a..b103965b391112 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi_report_server/report_server.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi_report_server/report_server.py
@@ -53,6 +53,7 @@
     StatusClass,
 )
 from datahub.utilities.dedup_list import deduplicate_list
+from datahub.utilities.lossy_collections import LossyList
 
 LOGGER = logging.getLogger(__name__)
 
@@ -476,7 +477,7 @@ def to_datahub_work_units(self, report: Report) -> List[EquableMetadataWorkUnit]
 @dataclass
 class PowerBiReportServerDashboardSourceReport(SourceReport):
     scanned_report: int = 0
-    filtered_reports: List[str] = dataclass_field(default_factory=list)
+    filtered_reports: LossyList[str] = dataclass_field(default_factory=LossyList)
 
     def report_scanned(self, count: int = 1) -> None:
         self.scanned_report += count
diff --git a/metadata-ingestion/src/datahub/ingestion/source/redash.py b/metadata-ingestion/src/datahub/ingestion/source/redash.py
index 666cc8c63aa9ed..afffbba1f6ac63 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/redash.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/redash.py
@@ -2,7 +2,7 @@
 import math
 import sys
 from dataclasses import dataclass, field
-from typing import Dict, Iterable, List, Optional, Set
+from typing import Dict, Iterable, List, Optional
 
 import dateutil.parser as dp
 from packaging import version
@@ -39,7 +39,7 @@
     DashboardInfoClass,
 )
 from datahub.sql_parsing.sqlglot_lineage import create_lineage_sql_parsed_result
-from datahub.utilities.lossy_collections import LossyDict, LossyList
+from datahub.utilities.lossy_collections import LossyDict, LossyList, LossySet
 from datahub.utilities.perf_timer import PerfTimer
 from datahub.utilities.threaded_iterator_executor import ThreadedIteratorExecutor
 
@@ -280,9 +280,9 @@ class RedashConfig(ConfigModel):
 class RedashSourceReport(SourceReport):
     items_scanned: int = 0
     filtered: LossyList[str] = field(default_factory=LossyList)
-    queries_problem_parsing: Set[str] = field(default_factory=set)
-    queries_no_dataset: Set[str] = field(default_factory=set)
-    charts_no_input: Set[str] = field(default_factory=set)
+    queries_problem_parsing: LossySet[str] = field(default_factory=LossySet)
+    queries_no_dataset: LossySet[str] = field(default_factory=LossySet)
+    charts_no_input: LossySet[str] = field(default_factory=LossySet)
     total_queries: Optional[int] = field(
         default=None,
     )
diff --git a/metadata-ingestion/src/datahub/ingestion/source/salesforce.py b/metadata-ingestion/src/datahub/ingestion/source/salesforce.py
index 66e0e6b741d1ff..4d9b7fc85d9620 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/salesforce.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/salesforce.py
@@ -1,6 +1,7 @@
 import json
 import logging
 import time
+from dataclasses import dataclass, field as dataclass_field
 from datetime import datetime
 from enum import Enum
 from typing import Any, Dict, Iterable, List, Optional
@@ -60,6 +61,7 @@
     TagAssociationClass,
 )
 from datahub.utilities import config_clean
+from datahub.utilities.lossy_collections import LossyList
 
 logger = logging.getLogger(__name__)
 
@@ -146,8 +148,9 @@ def remove_trailing_slash(cls, v):
         return config_clean.remove_trailing_slashes(v)
 
 
+@dataclass
 class SalesforceSourceReport(SourceReport):
-    filtered: List[str] = []
+    filtered: LossyList[str] = dataclass_field(default_factory=LossyList)
 
     def report_dropped(self, ent_name: str) -> None:
         self.filtered.append(ent_name)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_report.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_report.py
index 691448e1d09768..8feebf1d661385 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_report.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_report.py
@@ -12,6 +12,7 @@
 from datahub.ingestion.source_report.ingestion_stage import IngestionStageReport
 from datahub.ingestion.source_report.time_window import BaseTimeWindowReport
 from datahub.sql_parsing.sql_parsing_aggregator import SqlAggregatorReport
+from datahub.utilities.lossy_collections import LossyDict
 from datahub.utilities.perf_timer import PerfTimer
 
 if TYPE_CHECKING:
@@ -66,7 +67,7 @@ class SnowflakeReport(SQLSourceReport, BaseTimeWindowReport):
     num_external_table_edges_scanned: int = 0
     ignore_start_time_lineage: Optional[bool] = None
     upstream_lineage_in_report: Optional[bool] = None
-    upstream_lineage: Dict[str, List[str]] = field(default_factory=dict)
+    upstream_lineage: LossyDict[str, List[str]] = field(default_factory=LossyDict)
 
     lineage_start_time: Optional[datetime] = None
     lineage_end_time: Optional[datetime] = None
diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
index d731624738f0c9..042c1b1a9efdc1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/tableau/tableau.py
@@ -170,6 +170,7 @@
     create_lineage_sql_parsed_result,
 )
 from datahub.utilities import config_clean
+from datahub.utilities.lossy_collections import LossyList
 from datahub.utilities.perf_timer import PerfTimer
 from datahub.utilities.stats_collections import TopKDict
 from datahub.utilities.urns.dataset_urn import DatasetUrn
@@ -798,7 +799,7 @@ class TableauSourceReport(
     num_upstream_table_lineage_failed_parse_sql: int = 0
     num_upstream_fine_grained_lineage_failed_parse_sql: int = 0
     num_hidden_assets_skipped: int = 0
-    logged_in_user: List[UserInfo] = dataclass_field(default_factory=list)
+    logged_in_user: LossyList[UserInfo] = dataclass_field(default_factory=LossyList)
 
     last_authenticated_at: Optional[datetime] = None
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source_report/pulsar.py b/metadata-ingestion/src/datahub/ingestion/source_report/pulsar.py
index 8d825d8eda7cdd..e916bb17831a5a 100644
--- a/metadata-ingestion/src/datahub/ingestion/source_report/pulsar.py
+++ b/metadata-ingestion/src/datahub/ingestion/source_report/pulsar.py
@@ -1,9 +1,10 @@
 from dataclasses import dataclass, field
-from typing import List, Optional
+from typing import Optional
 
 from datahub.ingestion.source.state.stale_entity_removal_handler import (
     StaleEntityRemovalSourceReport,
 )
+from datahub.utilities.lossy_collections import LossyList
 
 
 @dataclass
@@ -12,9 +13,9 @@ class PulsarSourceReport(StaleEntityRemovalSourceReport):
     tenants_scanned: Optional[int] = None
     namespaces_scanned: Optional[int] = None
     topics_scanned: Optional[int] = None
-    tenants_filtered: List[str] = field(default_factory=list)
-    namespaces_filtered: List[str] = field(default_factory=list)
-    topics_filtered: List[str] = field(default_factory=list)
+    tenants_filtered: LossyList[str] = field(default_factory=LossyList)
+    namespaces_filtered: LossyList[str] = field(default_factory=LossyList)
+    topics_filtered: LossyList[str] = field(default_factory=LossyList)
 
     def report_pulsar_version(self, version: str) -> None:
         self.pulsar_version = version

From a4f64fd49bc4895379d7508f57a5cbe0b1726e6d Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Tue, 4 Feb 2025 08:26:12 -0600
Subject: [PATCH 221/249] fix(misc-openapi): fix openlineage, platform events &
 swagger (#12539)

---
 .../openapi/config/SpringWebConfig.java       |  2 +-
 .../controller/LineageApiImpl.java            |  2 +-
 .../PlatformEntitiesController.java           |  2 +-
 .../openapi/v3/OpenAPIV3Generator.java        | 23 ++++++++-----
 .../config/SpringWebSchemaRegistryConfig.java |  6 ----
 .../tests/openapi/openlineage/__init__.py     |  0
 .../openapi/openlineage/openlineage.json      | 34 +++++++++++++++++++
 .../tests/openapi/v2/platform_entities.json   | 31 +++++++++++++++++
 .../tests/utilities/concurrent_openapi.py     |  7 ++--
 9 files changed, 87 insertions(+), 20 deletions(-)
 create mode 100644 smoke-test/tests/openapi/openlineage/__init__.py
 create mode 100644 smoke-test/tests/openapi/openlineage/openlineage.json
 create mode 100644 smoke-test/tests/openapi/v2/platform_entities.json

diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java
index fb2dba8103d59e..6f3f058e9d9975 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java
@@ -28,7 +28,7 @@
 @EnableWebMvc
 @OpenAPIDefinition(
     info = @Info(title = "DataHub OpenAPI", version = "2.0.0"),
-    servers = {@Server(url = "/openapi/", description = "Default Server URL")})
+    servers = {@Server(url = "/", description = "Default Server URL")})
 @Order(2)
 @Configuration
 public class SpringWebConfig implements WebMvcConfigurer {
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/openlineage/controller/LineageApiImpl.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/openlineage/controller/LineageApiImpl.java
index f1da20fefe6bff..61c4794bbfa580 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/openlineage/controller/LineageApiImpl.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/openlineage/controller/LineageApiImpl.java
@@ -27,7 +27,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/openlineage/api/v1")
+@RequestMapping("/openapi/openlineage/api/v1")
 @Slf4j
 public class LineageApiImpl implements LineageApi {
   private static final ObjectMapper OBJECT_MAPPER = OpenLineageClientUtils.newObjectMapper();
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/PlatformEntitiesController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/PlatformEntitiesController.java
index bfd1f952f95f74..79fe25411540ba 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/PlatformEntitiesController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v2/controller/PlatformEntitiesController.java
@@ -39,7 +39,7 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/openapiv2/platform/entities/v1")
+@RequestMapping("/openapi/v2/platform/entities/v1")
 @Slf4j
 @Tag(
     name = "Platform Entities",
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java
index f7764f2ddb39a1..349672ef2dcecc 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java
@@ -35,6 +35,7 @@
 
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class OpenAPIV3Generator {
+  private static final String PATH_PREFIX = "/openapi/v3";
   private static final String MODEL_VERSION = "_v3";
   private static final String TYPE_OBJECT = "object";
   private static final String TYPE_BOOLEAN = "boolean";
@@ -171,18 +172,19 @@ public static OpenAPI generateOpenApiSpec(
     final Paths paths = new Paths();
 
     // --> Cross-entity Paths
-    paths.addPathItem("/v3/entity/scroll", buildGenericListEntitiesPath());
+    paths.addPathItem(PATH_PREFIX + "/entity/scroll", buildGenericListEntitiesPath());
 
     // --> Entity Paths
     definedEntitySpecs.forEach(
         e -> {
           paths.addPathItem(
-              String.format("/v3/entity/%s", e.getName().toLowerCase()), buildListEntityPath(e));
+              String.format(PATH_PREFIX + "/entity/%s", e.getName().toLowerCase()),
+              buildListEntityPath(e));
           paths.addPathItem(
-              String.format("/v3/entity/%s/batchGet", e.getName().toLowerCase()),
+              String.format(PATH_PREFIX + "/entity/%s/batchGet", e.getName().toLowerCase()),
               buildBatchGetEntityPath(e));
           paths.addPathItem(
-              String.format("/v3/entity/%s/{urn}", e.getName().toLowerCase()),
+              String.format(PATH_PREFIX + "/entity/%s/{urn}", e.getName().toLowerCase()),
               buildSingleEntityPath(e));
         });
 
@@ -196,8 +198,9 @@ public static OpenAPI generateOpenApiSpec(
                     a ->
                         paths.addPathItem(
                             String.format(
-                                "/v3/entity/%s/{urn}/%s",
-                                e.getName().toLowerCase(), a.getName().toLowerCase()),
+                                PATH_PREFIX + "/entity/%s/{urn}/%s",
+                                e.getName().toLowerCase(),
+                                a.getName().toLowerCase()),
                             buildSingleEntityAspectPath(e, a))));
     definedEntitySpecs.forEach(
         e ->
@@ -208,8 +211,9 @@ public static OpenAPI generateOpenApiSpec(
                     a ->
                         paths.addPathItem(
                             String.format(
-                                "/v3/entity/%s/{urn}/%s",
-                                e.getName().toLowerCase(), a.getName().toLowerCase()),
+                                PATH_PREFIX + "/entity/%s/{urn}/%s",
+                                e.getName().toLowerCase(),
+                                a.getName().toLowerCase()),
                             buildSingleEntityAspectPath(e, a))));
 
     // --> Link & Unlink APIs
@@ -219,7 +223,8 @@ public static OpenAPI generateOpenApiSpec(
           .forEach(
               entitySpec -> {
                 paths.addPathItem(
-                    "/v3/entity/versioning/{versionSetUrn}/relationship/versionOf/{entityUrn}",
+                    PATH_PREFIX
+                        + "/entity/versioning/{versionSetUrn}/relationship/versionOf/{entityUrn}",
                     buildVersioningRelationshipPath());
               });
     }
diff --git a/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/config/SpringWebSchemaRegistryConfig.java b/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/config/SpringWebSchemaRegistryConfig.java
index 56b4e575301799..ef899d00ec9360 100644
--- a/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/config/SpringWebSchemaRegistryConfig.java
+++ b/metadata-service/schema-registry-servlet/src/main/java/io/datahubproject/openapi/schema/registry/config/SpringWebSchemaRegistryConfig.java
@@ -4,9 +4,6 @@
 import com.linkedin.gms.factory.kafka.schemaregistry.InternalSchemaRegistryFactory;
 import com.linkedin.metadata.registry.SchemaRegistryService;
 import io.datahubproject.openapi.schema.registry.SchemaRegistryController;
-import io.swagger.v3.oas.annotations.OpenAPIDefinition;
-import io.swagger.v3.oas.annotations.info.Info;
-import io.swagger.v3.oas.annotations.servers.Server;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -19,9 +16,6 @@
 
 @Slf4j
 @EnableWebMvc
-@OpenAPIDefinition(
-    info = @Info(title = "DataHub OpenAPI", version = "1.0.0"),
-    servers = {@Server(url = "/schema-registry/", description = "Schema Registry Server URL")})
 @Order(3)
 @ConditionalOnProperty(
     name = "kafka.schemaRegistry.type",
diff --git a/smoke-test/tests/openapi/openlineage/__init__.py b/smoke-test/tests/openapi/openlineage/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/smoke-test/tests/openapi/openlineage/openlineage.json b/smoke-test/tests/openapi/openlineage/openlineage.json
new file mode 100644
index 00000000000000..f40fd110a1b1ba
--- /dev/null
+++ b/smoke-test/tests/openapi/openlineage/openlineage.json
@@ -0,0 +1,34 @@
+[
+  {
+    "request": {
+      "url": "/openapi/openlineage/api/v1/lineage",
+      "description": "Post openlineage",
+      "json": {
+        "eventType": "START",
+        "eventTime": "2020-12-28T19:52:00.001+10:00",
+        "run": {
+          "runId": "d46e465b-d358-4d32-83d4-df660ff614dd"
+        },
+        "job": {
+          "namespace": "workshop",
+          "name": "process_taxes"
+        },
+        "inputs": [
+          {
+            "namespace": "postgres://workshop-db:None",
+            "name": "workshop.public.taxes",
+            "facets": {
+              "dataSource": {
+                "_producer": "https://github.com/OpenLineage/OpenLineage/tree/0.10.0/integration/airflow",
+                "_schemaURL": "https://raw.githubusercontent.com/OpenLineage/OpenLineage/main/spec/OpenLineage.json#/definitions/DataSourceDatasetFacet",
+                "name": "postgres://workshop-db:None",
+                "uri": "workshop-db"
+              }
+            }
+          }
+        ],
+        "producer": "https://github.com/OpenLineage/OpenLineage/blob/v1-0-0/client"
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/smoke-test/tests/openapi/v2/platform_entities.json b/smoke-test/tests/openapi/v2/platform_entities.json
new file mode 100644
index 00000000000000..206f5d0b152b8c
--- /dev/null
+++ b/smoke-test/tests/openapi/v2/platform_entities.json
@@ -0,0 +1,31 @@
+[
+  {
+    "request": {
+      "url": "/openapi/v2/platform/entities/v1/",
+      "description": "Create data product",
+      "params": {
+        "async": "false"
+      },
+      "json": [
+        {
+          "entityType": "dataProduct",
+          "entityUrn": "urn:li:dataProduct:4fd5aea7-a15f-4842-a2cc-e6562605ebf7",
+          "changeType": "UPSERT",
+          "aspectName": "status",
+          "aspect": {
+            "value": {
+              "__type": "Status",
+              "removed": false
+            },
+            "contentType": "application/json"
+          }
+        }
+      ]
+    },
+    "response": {
+      "json": [
+        "urn:li:dataProduct:4fd5aea7-a15f-4842-a2cc-e6562605ebf7"
+      ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/smoke-test/tests/utilities/concurrent_openapi.py b/smoke-test/tests/utilities/concurrent_openapi.py
index 076cd12c7a3b3a..03a7a00f005a3c 100644
--- a/smoke-test/tests/utilities/concurrent_openapi.py
+++ b/smoke-test/tests/utilities/concurrent_openapi.py
@@ -57,13 +57,14 @@ def evaluate_test(auth_session, test_name, test_data):
                 continue
             url = req_resp["request"]["url"]
             actual_resp = execute_request(auth_session, req_resp["request"])
+            diff = None
             try:
                 if "response" in req_resp and "status_codes" in req_resp["response"]:
                     assert (
                         actual_resp.status_code in req_resp["response"]["status_codes"]
                     )
                 else:
-                    assert actual_resp.status_code in [200, 202, 204]
+                    assert actual_resp.status_code in [200, 201, 202, 204]
                 if "response" in req_resp:
                     if "json" in req_resp["response"]:
                         if "exclude_regex_paths" in req_resp["response"]:
@@ -87,7 +88,9 @@ def evaluate_test(auth_session, test_name, test_data):
                 )
                 if description:
                     logger.error(f"Step {idx} Description: {description}")
-                logger.error(f"Response content: {actual_resp.content}")
+                if diff:
+                    logger.error(f"Unexpected diff: {diff}")
+                logger.debug(f"Response content: {actual_resp.content}")
                 raise e
     except Exception as e:
         logger.error(f"Error executing test: {test_name}")

From e1ce780220e2a4dcfde582ed5bc65f67ecd6c8b9 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Tue, 4 Feb 2025 22:21:48 +0530
Subject: [PATCH 222/249] fix(test): move reading env variable inside method
 (#12549)

---
 smoke-test/tests/consistency_utils.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/smoke-test/tests/consistency_utils.py b/smoke-test/tests/consistency_utils.py
index 9179432a3f16e1..5a2d82dad03766 100644
--- a/smoke-test/tests/consistency_utils.py
+++ b/smoke-test/tests/consistency_utils.py
@@ -27,15 +27,13 @@ def infer_kafka_broker_container() -> str:
     return lines[0]
 
 
-KAFKA_BROKER_CONTAINER: str = str(
-    os.getenv("KAFKA_BROKER_CONTAINER", infer_kafka_broker_container())
-)
-
-
 def wait_for_writes_to_sync(max_timeout_in_sec: int = 120) -> None:
     if USE_STATIC_SLEEP:
         time.sleep(ELASTICSEARCH_REFRESH_INTERVAL_SECONDS)
         return
+    KAFKA_BROKER_CONTAINER: str = str(
+        os.getenv("KAFKA_BROKER_CONTAINER", infer_kafka_broker_container())
+    )
     start_time = time.time()
     # get offsets
     lag_zero = False

From b51327e0be7c9edb9164446581ff89d5027f5c85 Mon Sep 17 00:00:00 2001
From: Andrew Sikowitz <andrew.sikowitz@acryl.io>
Date: Tue, 4 Feb 2025 09:57:41 -0800
Subject: [PATCH 223/249] feat(versioning): Add V2 UI; make backend more
 synchronous; add to component library (#12542)

---
 .../components/Badge/Badge.stories.tsx        |   10 +-
 .../components/Badge/types.ts                 |    2 +-
 .../components/Badge/utils.ts                 |    2 +-
 .../components/Button/Button.tsx              |   11 +-
 .../components/Button/components.ts           |    4 +-
 .../components/Button/types.ts                |   27 +-
 .../components/Button/utils.ts                |  101 +-
 .../components/Card/Card.tsx                  |    2 +-
 .../components/Heading/Heading.tsx            |    7 +-
 .../components/Heading/components.ts          |   10 +-
 .../components/Heading/types.ts               |   18 +-
 .../components/Icon/Icon.stories.tsx          |   58 +-
 .../components/Icon/Icon.tsx                  |   18 +-
 .../components/Icon/constants.ts              | 1054 ++++++++++++++++-
 .../components/Icon/index.ts                  |    2 +-
 .../components/Icon/types.ts                  |   18 +-
 .../components/Icon/utils.ts                  |    6 +-
 .../components/Input/Input.tsx                |    9 +-
 .../components/Input/types.ts                 |    7 +-
 .../components/Modal/Modal.stories.tsx        |   98 ++
 .../components/Modal/Modal.tsx                |  117 ++
 .../components/Modal/index.ts                 |    1 +
 .../components/Pills/Pill.stories.tsx         |   75 +-
 .../components/Pills/Pill.tsx                 |   47 +-
 .../components/Pills/components.ts            |    6 +-
 .../components/Pills/types.ts                 |   17 +-
 .../components/Pills/utils.ts                 |  135 +--
 .../components/Select/AutoCompleteSelect.tsx  |  226 ++++
 .../components/Text/components.ts             |    6 +-
 .../components/Text/types.ts                  |    4 +-
 .../components/Tooltip2/Tooltip2.tsx          |   59 +-
 .../components/Tooltip2/components.ts         |   18 +-
 .../src/alchemy-components/index.ts           |    1 +
 .../alchemy-components/theme/config/types.ts  |   80 +-
 .../theme/foundations/colors.ts               |   76 +-
 datahub-web-react/src/app/analytics/event.ts  |   32 +-
 .../profile/DataProcessInstanceSummary.tsx    |    2 +-
 .../entity/mlModel/profile/MLModelSummary.tsx |    2 +-
 .../mlModelGroup/profile/ModelGroupModels.tsx |    7 +-
 .../header/StructuredPropertyBadge.tsx        |    7 +-
 .../src/app/entity/shared/types.ts            |    8 +
 .../profile/DataProcessInstanceSummary.tsx    |    2 +-
 .../app/entityV2/dataset/DatasetEntity.tsx    |    1 +
 .../app/entityV2/mlModel/MLModelEntity.tsx    |    1 +
 .../shared/EntityDropdown/EntityDropdown.tsx  |   97 +-
 .../EntityDropdown/EntityMenuActions.tsx      |   20 +-
 .../EntityDropdown/MoreOptionsMenuAction.tsx  |    3 +-
 .../versioning/LinkAssetVersionModal.tsx      |  146 +++
 .../versioning/UnlinkAssetVersionModal.tsx    |   61 +
 .../EntitySearchInputResultV2.tsx             |   62 +
 .../EntitySearchInput/EntitySearchInputV2.tsx |   83 ++
 .../containers/profile/EntityProfile.tsx      |   16 +-
 .../profile/header/DefaultEntityHeader.tsx    |    5 +
 .../header/StructuredPropertyBadge.tsx        |    7 +-
 .../shared/versioning/VersioningBadge.tsx     |   29 +
 .../shared/versioning/VersionsDrawer.tsx      |  225 ++++
 .../shared/versioning/VersionsPreview.tsx     |  153 +++
 .../app/entityV2/shared/versioning/common.tsx |   17 +
 .../DisplayPreferences.tsx                    |   11 +-
 .../src/app/homeV2/layout/CustomNavLink.tsx   |    2 +-
 .../layout/navBarRedesign/NavBarMenuItem.tsx  |    2 +-
 .../DataProcessInstanceRightColumn.tsx        |    2 +-
 .../src/app/previewV2/BrowsePaths.tsx         |   18 +-
 .../src/app/previewV2/ContextPath.tsx         |    5 +-
 .../app/previewV2/ContextPathEntityLink.tsx   |   16 +-
 .../src/app/previewV2/EntityHeader.tsx        |    2 +
 .../app/searchV2/filters/ParentEntities.tsx   |    4 +-
 .../share/v2/items/CopyLinkMenuItem.tsx       |   33 +-
 .../src/app/shared/subscribe/drawer/utils.tsx |   37 -
 .../src/conf/theme/global-overrides-v2.less   |    4 +
 .../metadata/aspect/TestEntityRegistry.java   |   15 +
 .../java/com/linkedin/metadata/Constants.java |    2 +
 .../client/dagster_generator.py               |   24 +-
 .../src/datahub/ingestion/graph/client.py     |    3 +-
 .../ingestion/graph/entity_versioning.py      |  201 ++++
 .../metadata/entity/EntityServiceImpl.java    |   95 +-
 .../EntityVersioningServiceImpl.java          |  130 +-
 .../sideeffects/VersionSetSideEffect.java     |   55 +-
 .../VersionPropertiesValidator.java           |   55 +
 .../EntityVersioningServiceTest.java          |  177 ++-
 .../sideeffects/VersionSetSideEffectTest.java |   64 +-
 .../VersionPropertiesValidatorTest.java       |   14 +
 .../src/test/java/mock/MockEntityService.java |    3 +-
 .../resources/entity/EntityResource.java      |    2 +-
 .../datahubusage/DataHubUsageEventType.java   |    5 +-
 .../metadata/entity/EntityService.java        |   48 +-
 .../metadata/search/utils/QueryUtils.java     |    8 +
 .../metadata/utils/CriterionUtils.java        |    9 +
 .../e2e/auto_completeV2/v2_auto_complete.js   |    2 +-
 .../entity_versioning/test_versioning.py      |  258 +++-
 90 files changed, 3899 insertions(+), 725 deletions(-)
 create mode 100644 datahub-web-react/src/alchemy-components/components/Modal/Modal.stories.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Modal/Modal.tsx
 create mode 100644 datahub-web-react/src/alchemy-components/components/Modal/index.ts
 create mode 100644 datahub-web-react/src/alchemy-components/components/Select/AutoCompleteSelect.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/versioning/LinkAssetVersionModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntityDropdown/versioning/UnlinkAssetVersionModal.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResultV2.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputV2.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/versioning/VersioningBadge.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/versioning/VersionsDrawer.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/versioning/VersionsPreview.tsx
 create mode 100644 datahub-web-react/src/app/entityV2/shared/versioning/common.tsx
 delete mode 100644 datahub-web-react/src/app/shared/subscribe/drawer/utils.tsx
 create mode 100644 metadata-ingestion/src/datahub/ingestion/graph/entity_versioning.py

diff --git a/datahub-web-react/src/alchemy-components/components/Badge/Badge.stories.tsx b/datahub-web-react/src/alchemy-components/components/Badge/Badge.stories.tsx
index 88d499226feafd..931720d8e136f5 100644
--- a/datahub-web-react/src/alchemy-components/components/Badge/Badge.stories.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Badge/Badge.stories.tsx
@@ -85,11 +85,11 @@ export const sizes = () => (
 export const colors = () => (
     <GridList>
         <Badge count={100} />
-        <Badge count={100} colorScheme="violet" />
-        <Badge count={100} colorScheme="green" />
-        <Badge count={100} colorScheme="red" />
-        <Badge count={100} colorScheme="blue" />
-        <Badge count={100} colorScheme="gray" />
+        <Badge count={100} color="violet" />
+        <Badge count={100} color="green" />
+        <Badge count={100} color="red" />
+        <Badge count={100} color="blue" />
+        <Badge count={100} color="gray" />
     </GridList>
 );
 
diff --git a/datahub-web-react/src/alchemy-components/components/Badge/types.ts b/datahub-web-react/src/alchemy-components/components/Badge/types.ts
index 21348f2a083419..b83844252495dc 100644
--- a/datahub-web-react/src/alchemy-components/components/Badge/types.ts
+++ b/datahub-web-react/src/alchemy-components/components/Badge/types.ts
@@ -1,7 +1,7 @@
 import { HTMLAttributes } from 'react';
 import { PillProps } from '../Pills/types';
 
-export interface BadgeProps extends HTMLAttributes<HTMLElement>, Omit<PillProps, 'label'> {
+export interface BadgeProps extends Omit<PillProps, 'label'>, Omit<HTMLAttributes<HTMLElement>, 'color'> {
     count: number;
     overflowCount?: number;
     showZero?: boolean;
diff --git a/datahub-web-react/src/alchemy-components/components/Badge/utils.ts b/datahub-web-react/src/alchemy-components/components/Badge/utils.ts
index e59ec2af998e74..a0b85b4bcdde0e 100644
--- a/datahub-web-react/src/alchemy-components/components/Badge/utils.ts
+++ b/datahub-web-react/src/alchemy-components/components/Badge/utils.ts
@@ -4,7 +4,7 @@ export const formatBadgeValue = (value: number, overflowCount?: number): string
     return `${overflowCount}+`;
 };
 
-export function omitKeys<T extends object, K extends keyof T>(obj: T, keys: K[]): Omit<T, K> {
+export function omitKeys<T extends object, K extends keyof T>(obj: T | undefined, keys: K[]): Omit<T, K> {
     const { ...rest } = obj;
 
     keys.forEach((key) => {
diff --git a/datahub-web-react/src/alchemy-components/components/Button/Button.tsx b/datahub-web-react/src/alchemy-components/components/Button/Button.tsx
index daf3d39dccdb8c..a41cdad05a6c81 100644
--- a/datahub-web-react/src/alchemy-components/components/Button/Button.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Button/Button.tsx
@@ -5,9 +5,9 @@ import { LoadingOutlined } from '@ant-design/icons';
 import { Icon } from '@components';
 
 import { ButtonBase } from './components';
-import { ButtonProps } from './types';
+import { ButtonProps, ButtonPropsDefaults } from './types';
 
-export const buttonDefaults: ButtonProps = {
+export const buttonDefaults: ButtonPropsDefaults = {
     variant: 'filled',
     color: 'violet',
     size: 'md',
@@ -32,7 +32,7 @@ export const Button = ({
     children,
     ...props
 }: ButtonProps) => {
-    const sharedProps = {
+    const styleProps = {
         variant,
         color,
         size,
@@ -40,19 +40,18 @@ export const Button = ({
         isLoading,
         isActive,
         isDisabled,
-        disabled: isDisabled,
     };
 
     if (isLoading) {
         return (
-            <ButtonBase {...sharedProps} {...props}>
+            <ButtonBase {...styleProps} {...props}>
                 <LoadingOutlined rotate={10} /> {!isCircle && children}
             </ButtonBase>
         );
     }
 
     return (
-        <ButtonBase {...sharedProps} {...props}>
+        <ButtonBase {...styleProps} {...props}>
             {icon && iconPosition === 'left' && <Icon icon={icon} size={iconSize || size} />}
             {!isCircle && children}
             {icon && iconPosition === 'right' && <Icon icon={icon} size={iconSize || size} />}
diff --git a/datahub-web-react/src/alchemy-components/components/Button/components.ts b/datahub-web-react/src/alchemy-components/components/Button/components.ts
index 49fa9a12ede6e2..c1a943af5e241c 100644
--- a/datahub-web-react/src/alchemy-components/components/Button/components.ts
+++ b/datahub-web-react/src/alchemy-components/components/Button/components.ts
@@ -1,12 +1,12 @@
 import styled from 'styled-components';
 
 import { spacing } from '@components/theme';
-import { ButtonProps } from './types';
+import { ButtonStyleProps } from './types';
 import { getButtonStyle } from './utils';
 
 export const ButtonBase = styled.button(
     // Dynamic styles
-    (props: ButtonProps) => ({ ...getButtonStyle(props as ButtonProps) }),
+    (props: ButtonStyleProps) => ({ ...getButtonStyle(props) }),
     {
         // Base root styles
         display: 'flex',
diff --git a/datahub-web-react/src/alchemy-components/components/Button/types.ts b/datahub-web-react/src/alchemy-components/components/Button/types.ts
index f0f50b0e0cf8b6..8e1ee6953a4938 100644
--- a/datahub-web-react/src/alchemy-components/components/Button/types.ts
+++ b/datahub-web-react/src/alchemy-components/components/Button/types.ts
@@ -3,15 +3,24 @@ import { ButtonHTMLAttributes } from 'react';
 import type { IconNames } from '@components';
 import type { SizeOptions, ColorOptions, FontSizeOptions } from '@components/theme/config';
 
-export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
-    variant?: 'filled' | 'outline' | 'text';
-    color?: ColorOptions;
-    size?: SizeOptions;
+export type ButtonVariant = 'filled' | 'outline' | 'text';
+
+export interface ButtonPropsDefaults {
+    variant: ButtonVariant;
+    color: ColorOptions;
+    size: SizeOptions;
+    iconPosition: 'left' | 'right';
+    isCircle: boolean;
+    isLoading: boolean;
+    isDisabled: boolean;
+    isActive: boolean;
+}
+
+export interface ButtonProps
+    extends Partial<ButtonPropsDefaults>,
+        Omit<ButtonHTMLAttributes<HTMLButtonElement>, 'color'> {
     icon?: IconNames;
-    iconPosition?: 'left' | 'right';
     iconSize?: FontSizeOptions;
-    isCircle?: boolean;
-    isLoading?: boolean;
-    isDisabled?: boolean;
-    isActive?: boolean;
 }
+
+export type ButtonStyleProps = Omit<ButtonPropsDefaults, 'iconPosition'>;
diff --git a/datahub-web-react/src/alchemy-components/components/Button/utils.ts b/datahub-web-react/src/alchemy-components/components/Button/utils.ts
index c08f4f067304d1..6eacf232b0373a 100644
--- a/datahub-web-react/src/alchemy-components/components/Button/utils.ts
+++ b/datahub-web-react/src/alchemy-components/components/Button/utils.ts
@@ -3,11 +3,25 @@
  */
 
 import { typography, colors, shadows, radius, spacing } from '@components/theme';
+import { ColorOptions, SizeOptions } from '@components/theme/config';
 import { getColor, getFontSize } from '@components/theme/utils';
-import { ButtonProps } from './types';
+import { CSSObject } from 'styled-components';
+import { ButtonStyleProps, ButtonVariant } from './types';
+
+interface ColorStyles {
+    bgColor: string;
+    hoverBgColor: string;
+    activeBgColor: string;
+    disabledBgColor: string;
+    borderColor: string;
+    activeBorderColor: string;
+    disabledBorderColor: string;
+    textColor: string;
+    disabledTextColor: string;
+}
 
 // Utility function to get color styles for button - does not generate CSS
-const getButtonColorStyles = (variant, color) => {
+const getButtonColorStyles = (variant: ButtonVariant, color: ColorOptions): ColorStyles => {
     const color500 = getColor(color, 500); // value of 500 shade
     const isViolet = color === 'violet';
 
@@ -79,49 +93,49 @@ const getButtonColorStyles = (variant, color) => {
 };
 
 // Generate color styles for button
-const getButtonVariantStyles = (variant, color) => {
+const getButtonVariantStyles = (variant: ButtonVariant, colorStyles: ColorStyles): CSSObject => {
     const variantStyles = {
         filled: {
-            backgroundColor: color.bgColor,
-            border: `1px solid ${color.borderColor}`,
-            color: color.textColor,
+            backgroundColor: colorStyles.bgColor,
+            border: `1px solid ${colorStyles.borderColor}`,
+            color: colorStyles.textColor,
             '&:hover': {
-                backgroundColor: color.hoverBgColor,
-                border: `1px solid ${color.hoverBgColor}`,
+                backgroundColor: colorStyles.hoverBgColor,
+                border: `1px solid ${colorStyles.hoverBgColor}`,
                 boxShadow: shadows.sm,
             },
             '&:disabled': {
-                backgroundColor: color.disabledBgColor,
-                border: `1px solid ${color.disabledBorderColor}`,
-                color: color.disabledTextColor,
+                backgroundColor: colorStyles.disabledBgColor,
+                border: `1px solid ${colorStyles.disabledBorderColor}`,
+                color: colorStyles.disabledTextColor,
                 boxShadow: shadows.xs,
             },
         },
         outline: {
             backgroundColor: 'transparent',
-            border: `1px solid ${color.borderColor}`,
-            color: color.textColor,
+            border: `1px solid ${colorStyles.borderColor}`,
+            color: colorStyles.textColor,
             '&:hover': {
-                backgroundColor: color.hoverBgColor,
+                backgroundColor: colorStyles.hoverBgColor,
                 boxShadow: 'none',
             },
             '&:disabled': {
-                backgroundColor: color.disabledBgColor,
-                border: `1px solid ${color.disabledBorderColor}`,
-                color: color.disabledTextColor,
+                backgroundColor: colorStyles.disabledBgColor,
+                border: `1px solid ${colorStyles.disabledBorderColor}`,
+                color: colorStyles.disabledTextColor,
                 boxShadow: shadows.xs,
             },
         },
         text: {
             backgroundColor: 'transparent',
             border: 'none',
-            color: color.textColor,
+            color: colorStyles.textColor,
             '&:hover': {
-                backgroundColor: color.hoverBgColor,
+                backgroundColor: colorStyles.hoverBgColor,
             },
             '&:disabled': {
-                backgroundColor: color.disabledBgColor,
-                color: color.disabledTextColor,
+                backgroundColor: colorStyles.disabledBgColor,
+                color: colorStyles.disabledTextColor,
             },
         },
     };
@@ -130,7 +144,7 @@ const getButtonVariantStyles = (variant, color) => {
 };
 
 // Generate font styles for button
-const getButtonFontStyles = (size) => {
+const getButtonFontStyles = (size: SizeOptions) => {
     const baseFontStyles = {
         fontFamily: typography.fonts.body,
         fontWeight: typography.fontWeights.normal,
@@ -160,39 +174,46 @@ const getButtonFontStyles = (size) => {
 };
 
 // Generate radii styles for button
-const getButtonRadiiStyles = (isCircle) => {
+const getButtonRadiiStyles = (isCircle: boolean) => {
     if (isCircle) return { borderRadius: radius.full };
     return { borderRadius: radius.sm }; // radius is the same for all button sizes
 };
 
 // Generate padding styles for button
-const getButtonPadding = (size, isCircle) => {
+const getButtonPadding = (size: SizeOptions, variant: ButtonVariant, isCircle: boolean) => {
     if (isCircle) return { padding: spacing.xsm };
 
     const paddingStyles = {
         sm: {
-            padding: '8px 12px',
+            vertical: 8,
+            horizontal: 12,
         },
         md: {
-            padding: '10px 12px',
+            vertical: 10,
+            horizontal: 12,
         },
         lg: {
-            padding: '10px 16px',
+            vertical: 10,
+            horizontal: 16,
         },
         xl: {
-            padding: '12px 20px',
+            vertical: 12,
+            horizontal: 20,
         },
     };
 
-    return paddingStyles[size];
+    const selectedStyle = paddingStyles[size];
+    const verticalPadding = selectedStyle.vertical;
+    const horizontalPadding = variant === 'text' ? 0 : selectedStyle.horizontal;
+    return { padding: `${verticalPadding}px ${horizontalPadding}px` };
 };
 
 // Generate active styles for button
-const getButtonActiveStyles = (styleColors) => ({
+const getButtonActiveStyles = (colorStyles: ColorStyles) => ({
     borderColor: 'transparent',
-    backgroundColor: styleColors.activeBgColor,
+    backgroundColor: colorStyles.activeBgColor,
     // TODO: Figure out how to make the #fff interior border transparent
-    boxShadow: `0 0 0 2px #fff, 0 0 0 4px ${styleColors.activeBgColor}`,
+    boxShadow: `0 0 0 2px #fff, 0 0 0 4px ${colorStyles.activeBgColor}`,
 });
 
 // Generate loading styles for button
@@ -204,17 +225,17 @@ const getButtonLoadingStyles = () => ({
 /*
  * Main function to generate styles for button
  */
-export const getButtonStyle = (props: ButtonProps) => {
-    const { variant, color, size, isCircle, isActive, isLoading } = props;
+export const getButtonStyle = (props: ButtonStyleProps) => {
+    const { variant, color, size, isCircle, isActive, isLoading, isDisabled } = props;
 
     // Get map of colors
-    const colorStyles = getButtonColorStyles(variant, color) || ({} as any);
+    const colorStyles = getButtonColorStyles(variant, color);
 
     // Define styles for button
     const variantStyles = getButtonVariantStyles(variant, colorStyles);
     const fontStyles = getButtonFontStyles(size);
     const radiiStyles = getButtonRadiiStyles(isCircle);
-    const paddingStyles = getButtonPadding(size, isCircle);
+    const paddingStyles = getButtonPadding(size, variant, isCircle);
 
     // Base of all generated styles
     let styles = {
@@ -226,9 +247,11 @@ export const getButtonStyle = (props: ButtonProps) => {
 
     // Focus & Active styles are the same, but active styles are applied conditionally & override prevs styles
     const activeStyles = { ...getButtonActiveStyles(colorStyles) };
-    styles['&:focus'] = activeStyles;
-    styles['&:active'] = activeStyles;
-    if (isActive) styles = { ...styles, ...activeStyles };
+    if (!isDisabled && isActive) {
+        styles['&:focus'] = activeStyles;
+        styles['&:active'] = activeStyles;
+        styles = { ...styles, ...activeStyles };
+    }
 
     // Loading styles
     if (isLoading) styles = { ...styles, ...getButtonLoadingStyles() };
diff --git a/datahub-web-react/src/alchemy-components/components/Card/Card.tsx b/datahub-web-react/src/alchemy-components/components/Card/Card.tsx
index 397ae2a664e6f4..384741ed980fdd 100644
--- a/datahub-web-react/src/alchemy-components/components/Card/Card.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Card/Card.tsx
@@ -43,7 +43,7 @@ export const Card = ({
                                     <Pill
                                         label={`${Math.abs(percent)}%`}
                                         size="sm"
-                                        colorScheme={percent < 0 ? 'red' : 'green'}
+                                        color={percent < 0 ? 'red' : 'green'}
                                         leftIcon={percent < 0 ? 'TrendingDown' : 'TrendingUp'}
                                         clickable={false}
                                     />
diff --git a/datahub-web-react/src/alchemy-components/components/Heading/Heading.tsx b/datahub-web-react/src/alchemy-components/components/Heading/Heading.tsx
index 6449ff512adacc..cf795c66294696 100644
--- a/datahub-web-react/src/alchemy-components/components/Heading/Heading.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Heading/Heading.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 
-import { HeadingProps } from './types';
+import { HeadingProps, HeadingPropsDefaults } from './types';
 import { H1, H2, H3, H4, H5, H6 } from './components';
 
-export const headingDefaults: HeadingProps = {
+export const headingDefaults: HeadingPropsDefaults = {
     type: 'h1',
     color: 'inherit',
     size: '2xl',
@@ -15,9 +15,10 @@ export const Heading = ({
     size = headingDefaults.size,
     color = headingDefaults.color,
     weight = headingDefaults.weight,
+    colorLevel,
     children,
 }: HeadingProps) => {
-    const sharedProps = { size, color, weight };
+    const sharedProps = { size, color, colorLevel, weight };
 
     switch (type) {
         case 'h1':
diff --git a/datahub-web-react/src/alchemy-components/components/Heading/components.ts b/datahub-web-react/src/alchemy-components/components/Heading/components.ts
index beea5338585d83..d26ed681cef27b 100644
--- a/datahub-web-react/src/alchemy-components/components/Heading/components.ts
+++ b/datahub-web-react/src/alchemy-components/components/Heading/components.ts
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 import { typography, colors } from '@components/theme';
 import { getColor, getFontSize } from '@components/theme/utils';
-import { HeadingProps } from './types';
+import { HeadingStyleProps } from './types';
 
 const headingStyles = {
     H1: {
@@ -48,10 +48,10 @@ const baseStyles = {
 };
 
 // Prop Driven Styles
-const propStyles = (props, isText = false) => {
+const propStyles = (props: HeadingStyleProps, isText = false) => {
     const styles = {} as any;
     if (props.size) styles.fontSize = getFontSize(props.size);
-    if (props.color) styles.color = getColor(props.color);
+    if (props.color) styles.color = getColor(props.color, props.colorLevel);
     if (props.weight) styles.fontWeight = typography.fontWeights[props.weight];
     if (isText) styles.lineHeight = typography.lineHeights[props.size];
     return styles;
@@ -62,8 +62,8 @@ const headings = {} as any;
 
 ['H1', 'H2', 'H3', 'H4', 'H5', 'H6'].forEach((heading) => {
     const component = styled[heading.toLowerCase()];
-    headings[heading] = component({ ...baseStyles, ...headingStyles[heading] }, (props: HeadingProps) => ({
-        ...propStyles(props as HeadingProps),
+    headings[heading] = component({ ...baseStyles, ...headingStyles[heading] }, (props: HeadingStyleProps) => ({
+        ...propStyles(props),
     }));
 });
 
diff --git a/datahub-web-react/src/alchemy-components/components/Heading/types.ts b/datahub-web-react/src/alchemy-components/components/Heading/types.ts
index 96fcf1ea292bf7..5e6764da02afd5 100644
--- a/datahub-web-react/src/alchemy-components/components/Heading/types.ts
+++ b/datahub-web-react/src/alchemy-components/components/Heading/types.ts
@@ -1,9 +1,15 @@
 import { HTMLAttributes } from 'react';
-import type { FontSizeOptions, FontColorOptions, FontWeightOptions } from '@components/theme/config';
+import type { FontSizeOptions, FontColorOptions, FontWeightOptions, Color } from '@components/theme/config';
 
-export interface HeadingProps extends HTMLAttributes<HTMLElement> {
-    type?: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
-    size?: FontSizeOptions;
-    color?: FontColorOptions;
-    weight?: FontWeightOptions;
+export interface HeadingPropsDefaults {
+    type: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
+    color: FontColorOptions;
+    size: FontSizeOptions;
+    weight: FontWeightOptions;
 }
+
+export interface HeadingProps extends Partial<HeadingPropsDefaults>, Omit<HTMLAttributes<HTMLElement>, 'color'> {
+    colorLevel?: keyof Color;
+}
+
+export type HeadingStyleProps = Omit<HeadingPropsDefaults, 'type'> & Pick<HeadingProps, 'colorLevel'>;
diff --git a/datahub-web-react/src/alchemy-components/components/Icon/Icon.stories.tsx b/datahub-web-react/src/alchemy-components/components/Icon/Icon.stories.tsx
index 3dcbd74ceb0b71..9b1d5bb425542a 100644
--- a/datahub-web-react/src/alchemy-components/components/Icon/Icon.stories.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Icon/Icon.stories.tsx
@@ -1,9 +1,19 @@
+import { ColorValues, FontSizeValues } from '@components/theme/config';
 import React from 'react';
 
 import type { Meta, StoryObj } from '@storybook/react';
 
 import { GridList } from '@components/.docs/mdx-components';
-import { Icon, iconDefaults, AVAILABLE_ICONS } from '.';
+import { Icon, iconDefaults, AVAILABLE_ICONS, IconProps } from '.';
+
+const storyMaterialDefaults: Pick<IconProps, 'icon' | 'source'> = {
+    icon: 'AccountCircle',
+    source: 'material',
+};
+const storyDefaults: Pick<IconProps, 'icon' | 'source'> = {
+    icon: 'Activity',
+    source: 'phosphor',
+};
 
 // Auto Docs
 const meta = {
@@ -71,7 +81,8 @@ const meta = {
 
     // Define defaults for required args
     args: {
-        icon: iconDefaults.icon,
+        icon: 'Activity',
+        source: 'phosphor',
     },
 } satisfies Meta<typeof Icon>;
 
@@ -97,28 +108,33 @@ export const filled = () => (
 );
 
 export const sizes = () => (
-    <GridList>
-        <Icon icon={iconDefaults.icon} size="xs" />
-        <Icon icon={iconDefaults.icon} size="sm" />
-        <Icon icon={iconDefaults.icon} size="md" />
-        <Icon icon={iconDefaults.icon} size="lg" />
-        <Icon icon={iconDefaults.icon} size="xl" />
-        <Icon icon={iconDefaults.icon} size="2xl" />
-        <Icon icon={iconDefaults.icon} size="3xl" />
-        <Icon icon={iconDefaults.icon} size="4xl" />
-    </GridList>
+    <>
+        <GridList>
+            {Object.values(FontSizeValues).map((size) => (
+                <Icon key={size} {...storyDefaults} size={size} />
+            ))}
+        </GridList>
+        <GridList>
+            {Object.values(FontSizeValues).map((size) => (
+                <Icon key={size} {...storyMaterialDefaults} size={size} />
+            ))}
+        </GridList>
+    </>
 );
 
 export const colors = () => (
-    <GridList>
-        <Icon icon={iconDefaults.icon} color="white" />
-        <Icon icon={iconDefaults.icon} color="black" />
-        <Icon icon={iconDefaults.icon} color="violet" />
-        <Icon icon={iconDefaults.icon} color="green" />
-        <Icon icon={iconDefaults.icon} color="red" />
-        <Icon icon={iconDefaults.icon} color="blue" />
-        <Icon icon={iconDefaults.icon} color="gray" />
-    </GridList>
+    <>
+        <GridList>
+            {Object.values(ColorValues).map((color) => (
+                <Icon key={color} {...storyDefaults} color={color} />
+            ))}
+        </GridList>
+        <GridList>
+            {Object.values(ColorValues).map((color) => (
+                <Icon key={color} {...storyMaterialDefaults} color={color} />
+            ))}
+        </GridList>
+    </>
 );
 
 export const rotation = () => (
diff --git a/datahub-web-react/src/alchemy-components/components/Icon/Icon.tsx b/datahub-web-react/src/alchemy-components/components/Icon/Icon.tsx
index 50c30d7203aed8..5bf96154878e8f 100644
--- a/datahub-web-react/src/alchemy-components/components/Icon/Icon.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Icon/Icon.tsx
@@ -2,12 +2,12 @@ import React from 'react';
 
 import { getFontSize, getColor, getRotationTransform } from '@components/theme/utils';
 
-import { IconProps } from './types';
+import { IconProps, IconPropsDefaults } from './types';
 import { IconWrapper } from './components';
 import { getIconNames, getIconComponent } from './utils';
 
-export const iconDefaults: IconProps = {
-    icon: 'AccountCircle',
+export const iconDefaults: IconPropsDefaults = {
+    source: 'material',
     variant: 'outline',
     size: '4xl',
     color: 'inherit',
@@ -16,6 +16,7 @@ export const iconDefaults: IconProps = {
 
 export const Icon = ({
     icon,
+    source = iconDefaults.source,
     variant = iconDefaults.variant,
     size = iconDefaults.size,
     color = iconDefaults.color,
@@ -28,23 +29,21 @@ export const Icon = ({
     if (!icon) return null;
 
     // Get outlined icon component name
-    const isOutlined = variant === 'outline';
-    const outlinedIconName = `${icon}Outlined`;
+    const iconName = source === 'material' && variant === 'outline' ? `${icon}Outlined` : icon;
 
     // Warn if the icon does not have the specified variant
-    if (variant === 'outline' && !outlined.includes(outlinedIconName)) {
+    if (source === 'material' && variant === 'outline' && !outlined.includes(iconName)) {
         console.warn(`Icon "${icon}" does not have an outlined variant.`);
         return null;
     }
 
     // Warn if the icon does not have the specified variant
-    if (variant === 'filled' && !filled.includes(icon)) {
+    if (source === 'material' && variant === 'filled' && !filled.includes(iconName)) {
         console.warn(`Icon "${icon}" does not have a filled variant.`);
         return null;
     }
 
-    // Get outlined icon component
-    const IconComponent = getIconComponent(isOutlined ? outlinedIconName : icon);
+    const IconComponent = getIconComponent(source, iconName);
 
     return (
         <IconWrapper size={getFontSize(size)} rotate={getRotationTransform(rotate)} {...props}>
@@ -53,6 +52,7 @@ export const Icon = ({
                     fontSize: getFontSize(size),
                     color: getColor(color),
                 }}
+                style={{ color: getColor(color) }}
             />
         </IconWrapper>
     );
diff --git a/datahub-web-react/src/alchemy-components/components/Icon/constants.ts b/datahub-web-react/src/alchemy-components/components/Icon/constants.ts
index 25145a5970f0f2..3c16eb713b2c94 100644
--- a/datahub-web-react/src/alchemy-components/components/Icon/constants.ts
+++ b/datahub-web-react/src/alchemy-components/components/Icon/constants.ts
@@ -1,4 +1,4 @@
-export const AVAILABLE_ICONS = [
+const MATERIAL_UI_ICONS = [
     'AccountCircle',
     'AccountTree',
     'AddCircle',
@@ -545,3 +545,1055 @@ export const AVAILABLE_ICONS = [
     'ZoomIn',
     'ZoomOutMap',
 ];
+
+const PHOSPHOR_ICONS = [
+    'Activity',
+    'AddressBook',
+    'Airplane',
+    'AirplaneInFlight',
+    'AirplaneLanding',
+    'AirplaneTakeoff',
+    'AirplaneTilt',
+    'Airplay',
+    'Alarm',
+    'Alien',
+    'AlignBottom',
+    'AlignBottomSimple',
+    'AlignCenterHorizontal',
+    'AlignCenterHorizontalSimple',
+    'AlignCenterVertical',
+    'AlignCenterVerticalSimple',
+    'AlignLeft',
+    'AlignLeftSimple',
+    'AlignRight',
+    'AlignRightSimple',
+    'AlignTop',
+    'AlignTopSimple',
+    'Anchor',
+    'AnchorSimple',
+    'AndroidLogo',
+    'AngularLogo',
+    'Aperture',
+    'AppStoreLogo',
+    'AppWindow',
+    'AppleLogo',
+    'ApplePodcastsLogo',
+    'Archive',
+    'ArchiveBox',
+    'ArchiveTray',
+    'Armchair',
+    'ArrowArcLeft',
+    'ArrowArcRight',
+    'ArrowBendDoubleUpLeft',
+    'ArrowBendDoubleUpRight',
+    'ArrowBendDownLeft',
+    'ArrowBendDownRight',
+    'ArrowBendLeftDown',
+    'ArrowBendLeftUp',
+    'ArrowBendRightDown',
+    'ArrowBendRightUp',
+    'ArrowBendUpLeft',
+    'ArrowBendUpRight',
+    'ArrowCircleDown',
+    'ArrowCircleDownLeft',
+    'ArrowCircleDownRight',
+    'ArrowCircleLeft',
+    'ArrowCircleRight',
+    'ArrowCircleUp',
+    'ArrowCircleUpLeft',
+    'ArrowCircleUpRight',
+    'ArrowClockwise',
+    'ArrowCounterClockwise',
+    'ArrowDown',
+    'ArrowDownLeft',
+    'ArrowDownRight',
+    'ArrowElbowDownLeft',
+    'ArrowElbowDownRight',
+    'ArrowElbowLeft',
+    'ArrowElbowLeftDown',
+    'ArrowElbowLeftUp',
+    'ArrowElbowRight',
+    'ArrowElbowRightDown',
+    'ArrowElbowRightUp',
+    'ArrowElbowUpLeft',
+    'ArrowElbowUpRight',
+    'ArrowFatDown',
+    'ArrowFatLeft',
+    'ArrowFatLineDown',
+    'ArrowFatLineLeft',
+    'ArrowFatLineRight',
+    'ArrowFatLineUp',
+    'ArrowFatLinesDown',
+    'ArrowFatLinesLeft',
+    'ArrowFatLinesRight',
+    'ArrowFatLinesUp',
+    'ArrowFatRight',
+    'ArrowFatUp',
+    'ArrowLeft',
+    'ArrowLineDown',
+    'ArrowLineDownLeft',
+    'ArrowLineDownRight',
+    'ArrowLineLeft',
+    'ArrowLineRight',
+    'ArrowLineUp',
+    'ArrowLineUpLeft',
+    'ArrowLineUpRight',
+    'ArrowRight',
+    'ArrowSquareDown',
+    'ArrowSquareDownLeft',
+    'ArrowSquareDownRight',
+    'ArrowSquareIn',
+    'ArrowSquareLeft',
+    'ArrowSquareOut',
+    'ArrowSquareRight',
+    'ArrowSquareUp',
+    'ArrowSquareUpLeft',
+    'ArrowSquareUpRight',
+    'ArrowUDownLeft',
+    'ArrowUDownRight',
+    'ArrowULeftDown',
+    'ArrowULeftUp',
+    'ArrowURightDown',
+    'ArrowURightUp',
+    'ArrowUUpLeft',
+    'ArrowUUpRight',
+    'ArrowUp',
+    'ArrowUpLeft',
+    'ArrowUpRight',
+    'ArrowsClockwise',
+    'ArrowsCounterClockwise',
+    'ArrowsDownUp',
+    'ArrowsHorizontal',
+    'ArrowsIn',
+    'ArrowsInCardinal',
+    'ArrowsInLineHorizontal',
+    'ArrowsInLineVertical',
+    'ArrowsInSimple',
+    'ArrowsLeftRight',
+    'ArrowsOut',
+    'ArrowsOutCardinal',
+    'ArrowsOutLineHorizontal',
+    'ArrowsOutLineVertical',
+    'ArrowsOutSimple',
+    'ArrowsVertical',
+    'Article',
+    'ArticleMedium',
+    'ArticleNyTimes',
+    'Asterisk',
+    'AsteriskSimple',
+    'At',
+    'Atom',
+    'Baby',
+    'Backpack',
+    'Backspace',
+    'Bag',
+    'BagSimple',
+    'Balloon',
+    'Bandaids',
+    'Bank',
+    'Barbell',
+    'Barcode',
+    'Barricade',
+    'Baseball',
+    'Basketball',
+    'Bathtub',
+    'BatteryCharging',
+    'BatteryChargingVertical',
+    'BatteryEmpty',
+    'BatteryFull',
+    'BatteryHigh',
+    'BatteryLow',
+    'BatteryMedium',
+    'BatteryPlus',
+    'BatteryWarning',
+    'BatteryWarningVertical',
+    'Bed',
+    'BeerBottle',
+    'BehanceLogo',
+    'Bell',
+    'BellRinging',
+    'BellSimple',
+    'BellSimpleRinging',
+    'BellSimpleSlash',
+    'BellSimpleZ',
+    'BellSlash',
+    'BellZ',
+    'BezierCurve',
+    'Bicycle',
+    'Binoculars',
+    'Bird',
+    'Bluetooth',
+    'BluetoothConnected',
+    'BluetoothSlash',
+    'BluetoothX',
+    'Boat',
+    'Book',
+    'BookBookmark',
+    'BookOpen',
+    'Bookmark',
+    'BookmarkSimple',
+    'Bookmarks',
+    'BookmarksSimple',
+    'Books',
+    'BoundingBox',
+    'BracketsAngle',
+    'BracketsCurly',
+    'BracketsRound',
+    'BracketsSquare',
+    'Brain',
+    'Brandy',
+    'Briefcase',
+    'BriefcaseMetal',
+    'Broadcast',
+    'Browser',
+    'Browsers',
+    'Bug',
+    'BugBeetle',
+    'BugDroid',
+    'Buildings',
+    'Bus',
+    'Butterfly',
+    'Cactus',
+    'Cake',
+    'Calculator',
+    'Calendar',
+    'CalendarBlank',
+    'CalendarCheck',
+    'CalendarPlus',
+    'CalendarX',
+    'Camera',
+    'CameraRotate',
+    'CameraSlash',
+    'Campfire',
+    'Car',
+    'CarSimple',
+    'Cardholder',
+    'Cards',
+    'CaretCircleDoubleDown',
+    'CaretCircleDoubleLeft',
+    'CaretCircleDoubleRight',
+    'CaretCircleDoubleUp',
+    'CaretCircleDown',
+    'CaretCircleLeft',
+    'CaretCircleRight',
+    'CaretCircleUp',
+    'CaretDoubleDown',
+    'CaretDoubleLeft',
+    'CaretDoubleRight',
+    'CaretDoubleUp',
+    'CaretDown',
+    'CaretLeft',
+    'CaretRight',
+    'CaretUp',
+    'Cat',
+    'CellSignalFull',
+    'CellSignalHigh',
+    'CellSignalLow',
+    'CellSignalMedium',
+    'CellSignalNone',
+    'CellSignalSlash',
+    'CellSignalX',
+    'Chalkboard',
+    'ChalkboardSimple',
+    'ChalkboardTeacher',
+    'ChartBar',
+    'ChartBarHorizontal',
+    'ChartLine',
+    'ChartLineUp',
+    'ChartPie',
+    'ChartPieSlice',
+    'Chat',
+    'ChatCentered',
+    'ChatCenteredDots',
+    'ChatCenteredText',
+    'ChatCircle',
+    'ChatCircleDots',
+    'ChatCircleText',
+    'ChatDots',
+    'ChatTeardrop',
+    'ChatTeardropDots',
+    'ChatTeardropText',
+    'ChatText',
+    'Chats',
+    'ChatsCircle',
+    'ChatsTeardrop',
+    'Check',
+    'CheckCircle',
+    'CheckSquare',
+    'CheckSquareOffset',
+    'Checks',
+    'Circle',
+    'CircleDashed',
+    'CircleHalf',
+    'CircleHalfTilt',
+    'CircleNotch',
+    'CircleWavy',
+    'CircleWavyCheck',
+    'CircleWavyQuestion',
+    'CircleWavyWarning',
+    'CirclesFour',
+    'CirclesThree',
+    'CirclesThreePlus',
+    'Clipboard',
+    'ClipboardText',
+    'Clock',
+    'ClockAfternoon',
+    'ClockClockwise',
+    'ClockCounterClockwise',
+    'ClosedCaptioning',
+    'Cloud',
+    'CloudArrowDown',
+    'CloudArrowUp',
+    'CloudCheck',
+    'CloudFog',
+    'CloudLightning',
+    'CloudMoon',
+    'CloudRain',
+    'CloudSlash',
+    'CloudSnow',
+    'CloudSun',
+    'Club',
+    'CoatHanger',
+    'Code',
+    'CodeSimple',
+    'CodepenLogo',
+    'CodesandboxLogo',
+    'Coffee',
+    'Coin',
+    'CoinVertical',
+    'Coins',
+    'Columns',
+    'Command',
+    'Compass',
+    'ComputerTower',
+    'Confetti',
+    'Cookie',
+    'CookingPot',
+    'Copy',
+    'CopySimple',
+    'Copyleft',
+    'Copyright',
+    'CornersIn',
+    'CornersOut',
+    'Cpu',
+    'CreditCard',
+    'Crop',
+    'Crosshair',
+    'CrosshairSimple',
+    'Crown',
+    'CrownSimple',
+    'Cube',
+    'CurrencyBtc',
+    'CurrencyCircleDollar',
+    'CurrencyCny',
+    'CurrencyDollar',
+    'CurrencyDollarSimple',
+    'CurrencyEth',
+    'CurrencyEur',
+    'CurrencyGbp',
+    'CurrencyInr',
+    'CurrencyJpy',
+    'CurrencyKrw',
+    'CurrencyKzt',
+    'CurrencyNgn',
+    'CurrencyRub',
+    'Cursor',
+    'CursorText',
+    'Cylinder',
+    'Database',
+    'Desktop',
+    'DesktopTower',
+    'Detective',
+    'DeviceMobile',
+    'DeviceMobileCamera',
+    'DeviceMobileSpeaker',
+    'DeviceTablet',
+    'DeviceTabletCamera',
+    'DeviceTabletSpeaker',
+    'Diamond',
+    'DiamondsFour',
+    'DiceFive',
+    'DiceFour',
+    'DiceOne',
+    'DiceSix',
+    'DiceThree',
+    'DiceTwo',
+    'Disc',
+    'DiscordLogo',
+    'Divide',
+    'Dog',
+    'Door',
+    'DotsNine',
+    'DotsSix',
+    'DotsSixVertical',
+    'DotsThree',
+    'DotsThreeCircle',
+    'DotsThreeCircleVertical',
+    'DotsThreeOutline',
+    'DotsThreeOutlineVertical',
+    'DotsThreeVertical',
+    'Download',
+    'DownloadSimple',
+    'DribbbleLogo',
+    'Drop',
+    'DropHalf',
+    'DropHalfBottom',
+    'Ear',
+    'EarSlash',
+    'Egg',
+    'EggCrack',
+    'Eject',
+    'EjectSimple',
+    'Envelope',
+    'EnvelopeOpen',
+    'EnvelopeSimple',
+    'EnvelopeSimpleOpen',
+    'Equalizer',
+    'Equals',
+    'Eraser',
+    'Exam',
+    'Export',
+    'Eye',
+    'EyeClosed',
+    'EyeSlash',
+    'Eyedropper',
+    'EyedropperSample',
+    'Eyeglasses',
+    'FaceMask',
+    'FacebookLogo',
+    'Factory',
+    'Faders',
+    'FadersHorizontal',
+    'FastForward',
+    'FastForwardCircle',
+    'FigmaLogo',
+    'File',
+    'FileArrowDown',
+    'FileArrowUp',
+    'FileAudio',
+    'FileCloud',
+    'FileCode',
+    'FileCss',
+    'FileCsv',
+    'FileDoc',
+    'FileDotted',
+    'FileHtml',
+    'FileImage',
+    'FileJpg',
+    'FileJs',
+    'FileJsx',
+    'FileLock',
+    'FileMinus',
+    'FilePdf',
+    'FilePlus',
+    'FilePng',
+    'FilePpt',
+    'FileRs',
+    'FileSearch',
+    'FileText',
+    'FileTs',
+    'FileTsx',
+    'FileVideo',
+    'FileVue',
+    'FileX',
+    'FileXls',
+    'FileZip',
+    'Files',
+    'FilmScript',
+    'FilmSlate',
+    'FilmStrip',
+    'Fingerprint',
+    'FingerprintSimple',
+    'FinnTheHuman',
+    'Fire',
+    'FireSimple',
+    'FirstAid',
+    'FirstAidKit',
+    'Fish',
+    'FishSimple',
+    'Flag',
+    'FlagBanner',
+    'FlagCheckered',
+    'Flame',
+    'Flashlight',
+    'Flask',
+    'FloppyDisk',
+    'FloppyDiskBack',
+    'FlowArrow',
+    'Flower',
+    'FlowerLotus',
+    'FlyingSaucer',
+    'Folder',
+    'FolderDotted',
+    'FolderLock',
+    'FolderMinus',
+    'FolderNotch',
+    'FolderNotchMinus',
+    'FolderNotchOpen',
+    'FolderNotchPlus',
+    'FolderOpen',
+    'FolderPlus',
+    'FolderSimple',
+    'FolderSimpleDotted',
+    'FolderSimpleLock',
+    'FolderSimpleMinus',
+    'FolderSimplePlus',
+    'FolderSimpleStar',
+    'FolderSimpleUser',
+    'FolderStar',
+    'FolderUser',
+    'Folders',
+    'Football',
+    'ForkKnife',
+    'FrameCorners',
+    'FramerLogo',
+    'Function',
+    'Funnel',
+    'FunnelSimple',
+    'GameController',
+    'GasPump',
+    'Gauge',
+    'Gear',
+    'GearSix',
+    'GenderFemale',
+    'GenderIntersex',
+    'GenderMale',
+    'GenderNeuter',
+    'GenderNonbinary',
+    'GenderTransgender',
+    'Ghost',
+    'Gif',
+    'Gift',
+    'GitBranch',
+    'GitCommit',
+    'GitDiff',
+    'GitFork',
+    'GitMerge',
+    'GitPullRequest',
+    'GithubLogo',
+    'GitlabLogo',
+    'GitlabLogoSimple',
+    'Globe',
+    'GlobeHemisphereEast',
+    'GlobeHemisphereWest',
+    'GlobeSimple',
+    'GlobeStand',
+    'GoogleChromeLogo',
+    'GoogleLogo',
+    'GooglePhotosLogo',
+    'GooglePlayLogo',
+    'GooglePodcastsLogo',
+    'Gradient',
+    'GraduationCap',
+    'Graph',
+    'GridFour',
+    'Hamburger',
+    'Hand',
+    'HandEye',
+    'HandFist',
+    'HandGrabbing',
+    'HandPalm',
+    'HandPointing',
+    'HandSoap',
+    'HandWaving',
+    'Handbag',
+    'HandbagSimple',
+    'HandsClapping',
+    'Handshake',
+    'HardDrive',
+    'HardDrives',
+    'Hash',
+    'HashStraight',
+    'Headlights',
+    'Headphones',
+    'Headset',
+    'Heart',
+    'HeartBreak',
+    'HeartStraight',
+    'HeartStraightBreak',
+    'Heartbeat',
+    'Hexagon',
+    'HighlighterCircle',
+    'Horse',
+    'Hourglass',
+    'HourglassHigh',
+    'HourglassLow',
+    'HourglassMedium',
+    'HourglassSimple',
+    'HourglassSimpleHigh',
+    'HourglassSimpleLow',
+    'HourglassSimpleMedium',
+    'House',
+    'HouseLine',
+    'HouseSimple',
+    'IdentificationBadge',
+    'IdentificationCard',
+    'Image',
+    'ImageSquare',
+    'Infinity',
+    'Info',
+    'InstagramLogo',
+    'Intersect',
+    'Jeep',
+    'Kanban',
+    'Key',
+    'KeyReturn',
+    'Keyboard',
+    'Keyhole',
+    'Knife',
+    'Ladder',
+    'LadderSimple',
+    'Lamp',
+    'Laptop',
+    'Layout',
+    'Leaf',
+    'Lifebuoy',
+    'Lightbulb',
+    'LightbulbFilament',
+    'Lightning',
+    'LightningSlash',
+    'LineSegment',
+    'LineSegments',
+    'Link',
+    'LinkBreak',
+    'LinkSimple',
+    'LinkSimpleBreak',
+    'LinkSimpleHorizontal',
+    'LinkSimpleHorizontalBreak',
+    'LinkedinLogo',
+    'LinuxLogo',
+    'List',
+    'ListBullets',
+    'ListChecks',
+    'ListDashes',
+    'ListNumbers',
+    'ListPlus',
+    'Lock',
+    'LockKey',
+    'LockKeyOpen',
+    'LockLaminated',
+    'LockLaminatedOpen',
+    'LockOpen',
+    'LockSimple',
+    'LockSimpleOpen',
+    'MagicWand',
+    'Magnet',
+    'MagnetStraight',
+    'MagnifyingGlass',
+    'MagnifyingGlassMinus',
+    'MagnifyingGlassPlus',
+    'MapPin',
+    'MapPinLine',
+    'MapTrifold',
+    'MarkerCircle',
+    'Martini',
+    'MaskHappy',
+    'MaskSad',
+    'MathOperations',
+    'Medal',
+    'MediumLogo',
+    'Megaphone',
+    'MegaphoneSimple',
+    'MessengerLogo',
+    'Microphone',
+    'MicrophoneSlash',
+    'MicrophoneStage',
+    'MicrosoftExcelLogo',
+    'MicrosoftPowerpointLogo',
+    'MicrosoftTeamsLogo',
+    'MicrosoftWordLogo',
+    'Minus',
+    'MinusCircle',
+    'Money',
+    'Monitor',
+    'MonitorPlay',
+    'Moon',
+    'MoonStars',
+    'Mountains',
+    'Mouse',
+    'MouseSimple',
+    'MusicNote',
+    'MusicNoteSimple',
+    'MusicNotes',
+    'MusicNotesPlus',
+    'MusicNotesSimple',
+    'NavigationArrow',
+    'Needle',
+    'Newspaper',
+    'NewspaperClipping',
+    'Note',
+    'NoteBlank',
+    'NotePencil',
+    'Notebook',
+    'Notepad',
+    'Notification',
+    'NumberCircleEight',
+    'NumberCircleFive',
+    'NumberCircleFour',
+    'NumberCircleNine',
+    'NumberCircleOne',
+    'NumberCircleSeven',
+    'NumberCircleSix',
+    'NumberCircleThree',
+    'NumberCircleTwo',
+    'NumberCircleZero',
+    'NumberEight',
+    'NumberFive',
+    'NumberFour',
+    'NumberNine',
+    'NumberOne',
+    'NumberSeven',
+    'NumberSix',
+    'NumberSquareEight',
+    'NumberSquareFive',
+    'NumberSquareFour',
+    'NumberSquareNine',
+    'NumberSquareOne',
+    'NumberSquareSeven',
+    'NumberSquareSix',
+    'NumberSquareThree',
+    'NumberSquareTwo',
+    'NumberSquareZero',
+    'NumberThree',
+    'NumberTwo',
+    'NumberZero',
+    'Nut',
+    'NyTimesLogo',
+    'Octagon',
+    'Option',
+    'Package',
+    'PaintBrush',
+    'PaintBrushBroad',
+    'PaintBrushHousehold',
+    'PaintBucket',
+    'PaintRoller',
+    'Palette',
+    'PaperPlane',
+    'PaperPlaneRight',
+    'PaperPlaneTilt',
+    'Paperclip',
+    'PaperclipHorizontal',
+    'Parachute',
+    'Password',
+    'Path',
+    'Pause',
+    'PauseCircle',
+    'PawPrint',
+    'Peace',
+    'Pen',
+    'PenNib',
+    'PenNibStraight',
+    'Pencil',
+    'PencilCircle',
+    'PencilLine',
+    'PencilSimple',
+    'PencilSimpleLine',
+    'Percent',
+    'Person',
+    'PersonSimple',
+    'PersonSimpleRun',
+    'PersonSimpleWalk',
+    'Perspective',
+    'Phone',
+    'PhoneCall',
+    'PhoneDisconnect',
+    'PhoneIncoming',
+    'PhoneOutgoing',
+    'PhoneSlash',
+    'PhoneX',
+    'PhosphorLogo',
+    'PianoKeys',
+    'PictureInPicture',
+    'Pill',
+    'PinterestLogo',
+    'Pinwheel',
+    'Pizza',
+    'Placeholder',
+    'Planet',
+    'Play',
+    'PlayCircle',
+    'Playlist',
+    'Plug',
+    'Plugs',
+    'PlugsConnected',
+    'Plus',
+    'PlusCircle',
+    'PlusMinus',
+    'PokerChip',
+    'PoliceCar',
+    'Polygon',
+    'Popcorn',
+    'Power',
+    'Prescription',
+    'Presentation',
+    'PresentationChart',
+    'Printer',
+    'Prohibit',
+    'ProhibitInset',
+    'ProjectorScreen',
+    'ProjectorScreenChart',
+    'PushPin',
+    'PushPinSimple',
+    'PushPinSimpleSlash',
+    'PushPinSlash',
+    'PuzzlePiece',
+    'QrCode',
+    'Question',
+    'Queue',
+    'Quotes',
+    'Radical',
+    'Radio',
+    'RadioButton',
+    'Rainbow',
+    'RainbowCloud',
+    'Receipt',
+    'Record',
+    'Rectangle',
+    'Recycle',
+    'RedditLogo',
+    'Repeat',
+    'RepeatOnce',
+    'Rewind',
+    'RewindCircle',
+    'Robot',
+    'Rocket',
+    'RocketLaunch',
+    'Rows',
+    'Rss',
+    'RssSimple',
+    'Rug',
+    'Ruler',
+    'Scales',
+    'Scan',
+    'Scissors',
+    'Screencast',
+    'ScribbleLoop',
+    'Scroll',
+    'Selection',
+    'SelectionAll',
+    'SelectionBackground',
+    'SelectionForeground',
+    'SelectionInverse',
+    'SelectionPlus',
+    'SelectionSlash',
+    'Share',
+    'ShareNetwork',
+    'Shield',
+    'ShieldCheck',
+    'ShieldCheckered',
+    'ShieldChevron',
+    'ShieldPlus',
+    'ShieldSlash',
+    'ShieldStar',
+    'ShieldWarning',
+    'ShoppingBag',
+    'ShoppingBagOpen',
+    'ShoppingCart',
+    'ShoppingCartSimple',
+    'Shower',
+    'Shuffle',
+    'ShuffleAngular',
+    'ShuffleSimple',
+    'Sidebar',
+    'SidebarSimple',
+    'SignIn',
+    'SignOut',
+    'Signpost',
+    'SimCard',
+    'SketchLogo',
+    'SkipBack',
+    'SkipBackCircle',
+    'SkipForward',
+    'SkipForwardCircle',
+    'Skull',
+    'SlackLogo',
+    'Sliders',
+    'SlidersHorizontal',
+    'Smiley',
+    'SmileyBlank',
+    'SmileyMeh',
+    'SmileyNervous',
+    'SmileySad',
+    'SmileySticker',
+    'SmileyWink',
+    'SmileyXEyes',
+    'SnapchatLogo',
+    'Snowflake',
+    'SoccerBall',
+    'SortAscending',
+    'SortDescending',
+    'Spade',
+    'Sparkle',
+    'SpeakerHigh',
+    'SpeakerLow',
+    'SpeakerNone',
+    'SpeakerSimpleHigh',
+    'SpeakerSimpleLow',
+    'SpeakerSimpleNone',
+    'SpeakerSimpleSlash',
+    'SpeakerSimpleX',
+    'SpeakerSlash',
+    'SpeakerX',
+    'Spinner',
+    'SpinnerGap',
+    'Spiral',
+    'SpotifyLogo',
+    'Square',
+    'SquareHalf',
+    'SquareHalfBottom',
+    'SquareLogo',
+    'SquaresFour',
+    'Stack',
+    'StackOverflowLogo',
+    'StackSimple',
+    'Stamp',
+    'Star',
+    'StarFour',
+    'StarHalf',
+    'Sticker',
+    'Stop',
+    'StopCircle',
+    'Storefront',
+    'Strategy',
+    'StripeLogo',
+    'Student',
+    'Suitcase',
+    'SuitcaseSimple',
+    'Sun',
+    'SunDim',
+    'SunHorizon',
+    'Sunglasses',
+    'Swap',
+    'Swatches',
+    'Sword',
+    'Syringe',
+    'TShirt',
+    'Table',
+    'Tabs',
+    'Tag',
+    'TagChevron',
+    'TagSimple',
+    'Target',
+    'Taxi',
+    'TelegramLogo',
+    'Television',
+    'TelevisionSimple',
+    'TennisBall',
+    'Terminal',
+    'TerminalWindow',
+    'TestTube',
+    'TextAa',
+    'TextAlignCenter',
+    'TextAlignJustify',
+    'TextAlignLeft',
+    'TextAlignRight',
+    'TextBolder',
+    'TextH',
+    'TextHFive',
+    'TextHFour',
+    'TextHOne',
+    'TextHSix',
+    'TextHThree',
+    'TextHTwo',
+    'TextIndent',
+    'TextItalic',
+    'TextOutdent',
+    'TextStrikethrough',
+    'TextT',
+    'TextUnderline',
+    'Textbox',
+    'Thermometer',
+    'ThermometerCold',
+    'ThermometerHot',
+    'ThermometerSimple',
+    'ThumbsDown',
+    'ThumbsUp',
+    'Ticket',
+    'TiktokLogo',
+    'Timer',
+    'ToggleLeft',
+    'ToggleRight',
+    'Toilet',
+    'ToiletPaper',
+    'Tote',
+    'ToteSimple',
+    'TrademarkRegistered',
+    'TrafficCone',
+    'TrafficSign',
+    'TrafficSignal',
+    'Train',
+    'TrainRegional',
+    'TrainSimple',
+    'Translate',
+    'Trash',
+    'TrashSimple',
+    'Tray',
+    'Tree',
+    'TreeEvergreen',
+    'TreeStructure',
+    'TrendDown',
+    'TrendUp',
+    'Triangle',
+    'Trophy',
+    'Truck',
+    'TwitchLogo',
+    'TwitterLogo',
+    'Umbrella',
+    'UmbrellaSimple',
+    'Upload',
+    'UploadSimple',
+    'User',
+    'UserCircle',
+    'UserCircleGear',
+    'UserCircleMinus',
+    'UserCirclePlus',
+    'UserFocus',
+    'UserGear',
+    'UserList',
+    'UserMinus',
+    'UserPlus',
+    'UserRectangle',
+    'UserSquare',
+    'UserSwitch',
+    'Users',
+    'UsersFour',
+    'UsersThree',
+    'Vault',
+    'Vibrate',
+    'VideoCamera',
+    'VideoCameraSlash',
+    'Vignette',
+    'Voicemail',
+    'Volleyball',
+    'Wall',
+    'Wallet',
+    'Warning',
+    'WarningCircle',
+    'WarningOctagon',
+    'Watch',
+    'WaveSawtooth',
+    'WaveSine',
+    'WaveSquare',
+    'WaveTriangle',
+    'Waves',
+    'Webcam',
+    'WhatsappLogo',
+    'Wheelchair',
+    'WifiHigh',
+    'WifiLow',
+    'WifiMedium',
+    'WifiNone',
+    'WifiSlash',
+    'WifiX',
+    'Wind',
+    'WindowsLogo',
+    'Wine',
+    'Wrench',
+    'X',
+    'XCircle',
+    'XSquare',
+    'YinYang',
+    'YoutubeLogo',
+];
+
+export const AVAILABLE_ICONS = [...MATERIAL_UI_ICONS, ...PHOSPHOR_ICONS];
diff --git a/datahub-web-react/src/alchemy-components/components/Icon/index.ts b/datahub-web-react/src/alchemy-components/components/Icon/index.ts
index 23ca0a7ef7da2f..b81f39a0319e4d 100644
--- a/datahub-web-react/src/alchemy-components/components/Icon/index.ts
+++ b/datahub-web-react/src/alchemy-components/components/Icon/index.ts
@@ -1,3 +1,3 @@
 export { Icon, iconDefaults } from './Icon';
-export type { IconProps, IconNames } from './types';
+export type { IconProps, IconNames, MaterialIconVariant } from './types';
 export { AVAILABLE_ICONS } from './constants';
diff --git a/datahub-web-react/src/alchemy-components/components/Icon/types.ts b/datahub-web-react/src/alchemy-components/components/Icon/types.ts
index f5a050e9338a71..76f350519f8db2 100644
--- a/datahub-web-react/src/alchemy-components/components/Icon/types.ts
+++ b/datahub-web-react/src/alchemy-components/components/Icon/types.ts
@@ -14,10 +14,18 @@ function createEnum<T extends string>(values: T[]): { [K in T]: K } {
 const names = createEnum(AVAILABLE_ICONS);
 export type IconNames = keyof typeof names;
 
-export interface IconProps extends HTMLAttributes<HTMLElement> {
+export type MaterialIconVariant = 'filled' | 'outline';
+export type IconSource = 'material' | 'phosphor';
+
+export interface IconPropsDefaults {
+    source: IconSource;
+    variant: MaterialIconVariant;
+    size: FontSizeOptions;
+    color: FontColorOptions;
+    rotate: RotationOptions;
+}
+
+export interface IconProps extends Partial<IconPropsDefaults>, Omit<HTMLAttributes<HTMLElement>, 'color'> {
     icon: IconNames;
-    variant?: 'filled' | 'outline';
-    size?: FontSizeOptions;
-    color?: FontColorOptions;
-    rotate?: RotationOptions;
+    className?: string;
 }
diff --git a/datahub-web-react/src/alchemy-components/components/Icon/utils.ts b/datahub-web-react/src/alchemy-components/components/Icon/utils.ts
index 1137b3da28bc7a..2cbbbb0812cdcf 100644
--- a/datahub-web-react/src/alchemy-components/components/Icon/utils.ts
+++ b/datahub-web-react/src/alchemy-components/components/Icon/utils.ts
@@ -1,4 +1,6 @@
+import { IconSource } from '@components/components/Icon/types';
 import * as materialIcons from '@mui/icons-material';
+import * as phosphorIcons from 'phosphor-react';
 
 export const getIconNames = () => {
     // We only want "Filled" (mui default) and "Outlined" icons
@@ -24,6 +26,6 @@ export const getIconNames = () => {
     };
 };
 
-export const getIconComponent = (icon: string) => {
-    return materialIcons[icon];
+export const getIconComponent = (source: IconSource, icon: string) => {
+    return source === 'phosphor' ? phosphorIcons[icon] : materialIcons[icon];
 };
diff --git a/datahub-web-react/src/alchemy-components/components/Input/Input.tsx b/datahub-web-react/src/alchemy-components/components/Input/Input.tsx
index 976fc47ffc5948..75c199610f81e1 100644
--- a/datahub-web-react/src/alchemy-components/components/Input/Input.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Input/Input.tsx
@@ -1,5 +1,6 @@
 import { Tooltip } from '@components';
 import React from 'react';
+import styled from 'styled-components';
 
 import { InputProps } from './types';
 
@@ -25,6 +26,10 @@ export const inputDefaults: InputProps = {
     type: 'text',
 };
 
+const SearchIcon = styled(Icon)`
+    margin-left: 8px;
+`;
+
 export const Input = ({
     value = inputDefaults.value,
     setValue = inputDefaults.setValue,
@@ -54,6 +59,7 @@ export const Input = ({
 
     // Input base props
     const inputBaseProps = {
+        type,
         label,
         isSuccess,
         error,
@@ -70,7 +76,7 @@ export const Input = ({
                 </Label>
             )}
             <InputContainer {...inputBaseProps}>
-                {icon && <Icon icon={icon} size="lg" />}
+                {icon && <SearchIcon icon={icon.name} source={icon.source} variant={icon.variant} size="xl" />}
                 <InputField
                     value={value}
                     onChange={(e) => setValue?.(e.target.value)}
@@ -80,6 +86,7 @@ export const Input = ({
                     disabled={isDisabled}
                     required={isRequired}
                     id={id}
+                    style={{ paddingLeft: icon ? '8px' : '' }}
                 />
                 {!isPassword && (
                     <Tooltip title={errorOnHover ? error : ''} showArrow={false}>
diff --git a/datahub-web-react/src/alchemy-components/components/Input/types.ts b/datahub-web-react/src/alchemy-components/components/Input/types.ts
index 1b2abf132d3283..8ec3c8ed3e3586 100644
--- a/datahub-web-react/src/alchemy-components/components/Input/types.ts
+++ b/datahub-web-react/src/alchemy-components/components/Input/types.ts
@@ -1,13 +1,14 @@
-import { InputHTMLAttributes } from 'react';
+import { IconSource } from '@components/components/Icon/types';
+import React, { InputHTMLAttributes } from 'react';
 
-import { IconNames } from '../Icon';
+import { IconNames, MaterialIconVariant } from '../Icon';
 
 export interface InputProps extends InputHTMLAttributes<HTMLInputElement> {
     value?: string | number | readonly string[] | undefined;
     setValue?: React.Dispatch<React.SetStateAction<string>>;
     label: string;
     placeholder?: string;
-    icon?: IconNames;
+    icon?: { name: IconNames; source: IconSource; variant?: MaterialIconVariant };
     error?: string;
     warning?: string;
     isSuccess?: boolean;
diff --git a/datahub-web-react/src/alchemy-components/components/Modal/Modal.stories.tsx b/datahub-web-react/src/alchemy-components/components/Modal/Modal.stories.tsx
new file mode 100644
index 00000000000000..d93c47b3a954a7
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Modal/Modal.stories.tsx
@@ -0,0 +1,98 @@
+import { Button, Text } from '@components';
+import { BADGE } from '@geometricpanda/storybook-addon-badges';
+import type { Meta, StoryObj } from '@storybook/react';
+import React from 'react';
+import { Modal } from '.';
+import { ModalButton } from './Modal';
+
+type ModalWithExampleButtons = React.ComponentProps<typeof Modal> & { buttonExamples?: string[]; content?: string };
+
+const meta = {
+    title: 'Components / Modal',
+    component: Modal,
+
+    // Display Properties
+    parameters: {
+        badges: [BADGE.BETA],
+        docs: {
+            subtitle: 'Single component for all modals, backed by Ant modal',
+        },
+    },
+
+    // Component-level argTypes
+    argTypes: {
+        buttons: {
+            description: "Buttons to display in the modal's footer",
+            control: 'object',
+        },
+        buttonExamples: {
+            options: ['Cancel', 'Propose', 'Submit'],
+            description: 'Example buttons for storybook',
+            control: 'check',
+        },
+        title: {
+            description: 'The title of the modal',
+            control: 'text',
+        },
+        subtitle: {
+            description: 'Secondary title that goes below the title in the header',
+            control: 'text',
+        },
+        content: {
+            description: 'Example content of the modal',
+            control: 'text',
+        },
+        onCancel: {
+            description: 'Function to call when the modal is closed, mainly to hide the modal',
+        },
+    },
+
+    // Define defaults
+    args: {
+        buttons: [],
+        buttonExamples: [],
+        title: 'Title',
+        subtitle: 'This is the modal subtitle',
+        content: '',
+        onCancel: () => {},
+    },
+} satisfies Meta<ModalWithExampleButtons>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const sandbox: Story = {
+    tags: ['dev'],
+    render: Render,
+};
+
+// eslint-disable-next-line react/prop-types
+function Render({ buttons, buttonExamples, content, ...props }: ModalWithExampleButtons) {
+    const [isOpen, setIsOpen] = React.useState(false);
+
+    const exampleButtons: ModalButton[] =
+        buttonExamples?.map((text) => {
+            switch (text) {
+                case 'Cancel':
+                    return { text, variant: 'text', onClick: () => setIsOpen(false) };
+                case 'Propose':
+                    // TODO: Replace with secondary variant once it's supported
+                    return { text, variant: 'outline', onClick: () => setIsOpen(false) };
+                case 'Submit':
+                default:
+                    return { text, variant: 'filled', onClick: () => setIsOpen(false) };
+            }
+        }) || [];
+
+    return (
+        <>
+            <Button onClick={() => setIsOpen(true)}>Open Modal</Button>
+            {isOpen && (
+                <Modal {...props} buttons={[...buttons, ...exampleButtons]} onCancel={() => setIsOpen(false)}>
+                    {content && <Text color="gray">{content}</Text>}
+                </Modal>
+            )}
+        </>
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/Modal/Modal.tsx b/datahub-web-react/src/alchemy-components/components/Modal/Modal.tsx
new file mode 100644
index 00000000000000..d15aada76623c7
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Modal/Modal.tsx
@@ -0,0 +1,117 @@
+import { Button, ButtonProps, Heading, typography, Text, Icon } from '@components';
+import { Modal as AntModal, ModalProps as AntModalProps } from 'antd';
+import React from 'react';
+import styled from 'styled-components';
+
+const StyledModal = styled(AntModal)<{ hasChildren: boolean }>`
+    font-family: ${typography.fonts.body};
+
+    &&& .ant-modal-content {
+        box-shadow: 0px 4px 12px 0px rgba(9, 1, 61, 0.12);
+        border-radius: 12px;
+    }
+
+    .ant-modal-header {
+        //margin-bottom: 24px;
+        padding: 12px 20px;
+        border-radius: ${({ hasChildren }) => (hasChildren ? '12px 12px 0 0' : '12px')};
+        border-bottom: ${({ hasChildren }) => (hasChildren ? `1px solid #F0F0F0` : '0')};
+    }
+
+    .ant-modal-body {
+        padding: ${({ hasChildren }) => (hasChildren ? '24px 20px' : '8px 20px')};
+    }
+
+    .ant-modal-footer {
+        padding: 12px 20px;
+    }
+
+    .ant-modal-close {
+        top: 16px;
+        right: 16px;
+
+        .ant-modal-close-x {
+            height: 24px;
+            width: 24px;
+        }
+    }
+`;
+
+const HeaderContainer = styled.div<{ hasChildren: boolean }>`
+    display: flex;
+    flex-direction: column;
+`;
+
+const ButtonsContainer = styled.div`
+    display: flex;
+    gap: 16px;
+    justify-content: end;
+`;
+
+export interface ModalButton extends ButtonProps {
+    text: string;
+    onClick: () => void;
+}
+
+export interface ModalProps {
+    buttons: ModalButton[];
+    title: string;
+    subtitle?: string;
+    children?: React.ReactNode;
+    onCancel: () => void;
+    dataTestId?: string;
+}
+
+export function Modal({
+    buttons,
+    title,
+    subtitle,
+    children,
+    onCancel,
+    dataTestId,
+    ...props
+}: ModalProps & AntModalProps) {
+    return (
+        <StyledModal
+            open
+            centered
+            onCancel={onCancel}
+            closeIcon={<Icon icon="X" source="phosphor" />}
+            hasChildren={!!children}
+            title={
+                <HeaderContainer hasChildren={!!children}>
+                    <Heading type="h1" color="gray" colorLevel={600} weight="bold" size="lg">
+                        {title}
+                    </Heading>
+                    {!!subtitle && (
+                        <Text type="span" color="gray" colorLevel={1700} weight="medium">
+                            {subtitle}
+                        </Text>
+                    )}
+                </HeaderContainer>
+            }
+            footer={
+                !!buttons.length && (
+                    <ButtonsContainer>
+                        {buttons.map(({ text, variant, onClick, ...buttonProps }, index) => (
+                            <Button
+                                key={text}
+                                data-testid={dataTestId && `${dataTestId}-${variant}-${index}`}
+                                variant={variant}
+                                onClick={onClick}
+                                {...buttonProps}
+                            >
+                                <Text type="span" weight="bold" lineHeight="none">
+                                    {text}
+                                </Text>
+                            </Button>
+                        ))}
+                    </ButtonsContainer>
+                )
+            }
+            {...props}
+        >
+            {children}
+        </StyledModal>
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/Modal/index.ts b/datahub-web-react/src/alchemy-components/components/Modal/index.ts
new file mode 100644
index 00000000000000..8deb0a3dffac0e
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Modal/index.ts
@@ -0,0 +1 @@
+export { Modal } from './Modal';
diff --git a/datahub-web-react/src/alchemy-components/components/Pills/Pill.stories.tsx b/datahub-web-react/src/alchemy-components/components/Pills/Pill.stories.tsx
index d5cdffef6d6bd3..1f162348fdbcfb 100644
--- a/datahub-web-react/src/alchemy-components/components/Pills/Pill.stories.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Pills/Pill.stories.tsx
@@ -1,3 +1,5 @@
+import { PillProps } from '@components/components/Pills/types';
+import { ColorValues, getSizeName, PillVariantValues, SizeValues } from '@components/theme/config';
 import React from 'react';
 
 import { BADGE } from '@geometricpanda/storybook-addon-badges';
@@ -5,9 +7,16 @@ import type { Meta, StoryObj } from '@storybook/react';
 
 import { GridList } from '@components/.docs/mdx-components';
 import { AVAILABLE_ICONS } from '../Icon';
-import { Pill, pillDefault } from './Pill';
+import { Pill, SUPPORTED_CONFIGURATIONS } from './Pill';
 
-const meta = {
+const defaults: PillProps = {
+    label: 'Label',
+    size: 'md',
+    variant: 'filled',
+    clickable: true,
+};
+
+const meta: Meta = {
     title: 'Components / Pill',
     component: Pill,
 
@@ -25,7 +34,7 @@ const meta = {
         label: {
             description: 'Label for the Pill.',
             table: {
-                defaultValue: { summary: pillDefault.label },
+                defaultValue: { summary: defaults.label },
             },
             control: {
                 type: 'text',
@@ -49,9 +58,9 @@ const meta = {
         },
         size: {
             description: 'The size of the pill.',
-            options: ['sm', 'md', 'lg', 'xl'],
+            options: Object.values(SizeValues),
             table: {
-                defaultValue: { summary: pillDefault.size },
+                defaultValue: { summary: defaults.size },
             },
             control: {
                 type: 'select',
@@ -59,19 +68,19 @@ const meta = {
         },
         variant: {
             description: 'The size of the Pill.',
-            options: ['filled', 'outline'],
+            options: Object.values(PillVariantValues),
             table: {
-                defaultValue: { summary: pillDefault.variant },
+                defaultValue: { summary: defaults.variant },
             },
             control: {
                 type: 'select',
             },
         },
-        colorScheme: {
+        color: {
             description: 'The color of the Pill.',
-            options: ['violet', 'green', 'red', 'blue', 'gray'],
+            options: Object.values(ColorValues),
             table: {
-                defaultValue: { summary: pillDefault.color },
+                defaultValue: { summary: defaults.color },
             },
             control: {
                 type: 'select',
@@ -81,11 +90,11 @@ const meta = {
 
     // Define defaults
     args: {
-        label: pillDefault.label,
-        leftIcon: pillDefault.leftIcon,
-        rightIcon: pillDefault.rightIcon,
-        size: pillDefault.size,
-        variant: pillDefault.variant,
+        label: defaults.label,
+        leftIcon: defaults.leftIcon,
+        rightIcon: defaults.rightIcon,
+        size: defaults.size,
+        variant: defaults.variant,
     },
 } satisfies Meta<typeof Pill>;
 
@@ -95,25 +104,41 @@ type Story = StoryObj<typeof meta>;
 
 export const sandbox: Story = {
     tags: ['dev'],
-    render: (props) => <Pill {...props} />,
+    render: (props) => <Pill label={defaults.label} {...props} />,
 };
 
 export const sizes = () => (
     <GridList>
         <Pill label="Default" />
-        <Pill label="small" size="sm" />
-        <Pill label="large" size="lg" />
+        {Object.values(SizeValues).map((size) => (
+            <Pill key={size} label={getSizeName(size)} size={size} />
+        ))}
     </GridList>
 );
 
-export const colors = () => (
+export const filled = () => (
     <GridList>
-        <Pill label="Default" />
-        <Pill label="Violet" colorScheme="violet" />
-        <Pill label="Green" colorScheme="green" />
-        <Pill label="Red" colorScheme="red" />
-        <Pill label="Blue" colorScheme="blue" />
-        <Pill label="Gray" colorScheme="gray" />
+        <Pill label="Default" clickable />
+        {SUPPORTED_CONFIGURATIONS[PillVariantValues.filled].map((color) => (
+            <Pill key={color} label={color} color={color} clickable />
+        ))}
+    </GridList>
+);
+
+export const outline = () => (
+    <GridList>
+        <Pill label="Default" variant="outline" clickable />
+        {SUPPORTED_CONFIGURATIONS[PillVariantValues.outline].map((color) => (
+            <Pill key={color} label={color} color={color} variant="outline" clickable />
+        ))}
+    </GridList>
+);
+
+export const versionPills = () => (
+    <GridList>
+        {SUPPORTED_CONFIGURATIONS[PillVariantValues.version].map((color) => (
+            <Pill key={color} label={color} color={color} variant="version" clickable />
+        ))}
     </GridList>
 );
 
diff --git a/datahub-web-react/src/alchemy-components/components/Pills/Pill.tsx b/datahub-web-react/src/alchemy-components/components/Pills/Pill.tsx
index 86a12149272047..a65d9e355363f1 100644
--- a/datahub-web-react/src/alchemy-components/components/Pills/Pill.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Pills/Pill.tsx
@@ -1,23 +1,42 @@
 import { Icon } from '@components';
+import { ColorOptions, ColorValues, PillVariantOptions, PillVariantValues, SizeValues } from '@components/theme/config';
 import React from 'react';
 import { PillContainer, PillText } from './components';
-import { PillProps } from './types';
+import { PillProps, PillPropsDefaults } from './types';
 
-export const pillDefault: PillProps = {
-    label: 'Label',
-    size: 'md',
-    variant: 'filled',
-    clickable: true,
+export const SUPPORTED_CONFIGURATIONS: Record<PillVariantOptions, ColorOptions[]> = {
+    [PillVariantValues.filled]: [
+        ColorValues.violet,
+        ColorValues.blue,
+        ColorValues.green,
+        ColorValues.red,
+        ColorValues.yellow,
+    ],
+    [PillVariantValues.outline]: [
+        ColorValues.violet,
+        ColorValues.blue,
+        ColorValues.green,
+        ColorValues.red,
+        ColorValues.yellow,
+    ],
+    [PillVariantValues.version]: [ColorValues.white, ColorValues.gray],
+};
+
+export const pillDefaults: PillPropsDefaults = {
+    size: SizeValues.md,
+    variant: PillVariantValues.filled,
+    color: ColorValues.gray,
+    clickable: false,
 };
 
 export function Pill({
-    label = pillDefault.label,
-    size = pillDefault.size,
+    label,
+    size = pillDefaults.size,
+    variant = pillDefaults.variant,
+    clickable = pillDefaults.clickable,
+    color = pillDefaults.color,
     leftIcon,
     rightIcon,
-    colorScheme,
-    variant = pillDefault.variant,
-    clickable = pillDefault.clickable,
     id,
     onClickRightIcon,
     onClickLeftIcon,
@@ -25,10 +44,14 @@ export function Pill({
     customStyle,
     customIconRenderer,
 }: PillProps) {
+    if (!SUPPORTED_CONFIGURATIONS[variant].includes(color)) {
+        console.debug(`Unsupported configuration for Pill: variant=${variant}, color=${color}`);
+    }
+
     return (
         <PillContainer
             variant={variant}
-            colorScheme={colorScheme}
+            color={color}
             size={size}
             clickable={clickable}
             id={id}
diff --git a/datahub-web-react/src/alchemy-components/components/Pills/components.ts b/datahub-web-react/src/alchemy-components/components/Pills/components.ts
index bd3b8e0e5578e7..c2822ef7e8e047 100644
--- a/datahub-web-react/src/alchemy-components/components/Pills/components.ts
+++ b/datahub-web-react/src/alchemy-components/components/Pills/components.ts
@@ -1,12 +1,10 @@
 import { spacing } from '@components/theme';
 import styled from 'styled-components';
-
 import { PillStyleProps } from './types';
+
 import { getPillStyle } from './utils';
 
 export const PillContainer = styled.div(
-    // Dynamic styles
-    (props: PillStyleProps) => ({ ...getPillStyle(props as PillStyleProps) }),
     {
         // Base root styles
         display: 'inline-flex',
@@ -22,6 +20,8 @@ export const PillContainer = styled.div(
             cursor: 'not-allowed',
         },
     },
+    // Dynamic styles
+    (props: PillStyleProps) => ({ ...getPillStyle(props) }),
 );
 
 export const PillText = styled.span({
diff --git a/datahub-web-react/src/alchemy-components/components/Pills/types.ts b/datahub-web-react/src/alchemy-components/components/Pills/types.ts
index 51685019f79b9c..379ba5e9657592 100644
--- a/datahub-web-react/src/alchemy-components/components/Pills/types.ts
+++ b/datahub-web-react/src/alchemy-components/components/Pills/types.ts
@@ -1,15 +1,16 @@
-import { ColorOptions, SizeOptions, VariantOptions } from '@src/alchemy-components/theme/config';
+import { ColorOptions, SizeOptions, PillVariantOptions } from '@src/alchemy-components/theme/config';
 import { HTMLAttributes } from 'react';
 
-export interface PillStyleProps {
-    colorScheme?: ColorOptions; // need to keep colorScheme because HTMLAttributes also have color property
-    variant?: VariantOptions;
-    size?: SizeOptions;
-    clickable?: boolean;
+export interface PillPropsDefaults {
+    variant: PillVariantOptions;
+    size: SizeOptions;
+    color: ColorOptions;
+    clickable: boolean;
 }
 
-export interface PillProps extends HTMLAttributes<HTMLElement>, PillStyleProps {
+export interface PillProps extends Partial<PillPropsDefaults>, Omit<HTMLAttributes<HTMLElement>, 'color'> {
     label: string;
+    color?: ColorOptions;
     rightIcon?: string;
     leftIcon?: string;
     customStyle?: React.CSSProperties;
@@ -18,3 +19,5 @@ export interface PillProps extends HTMLAttributes<HTMLElement>, PillStyleProps {
     onClickLeftIcon?: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void;
     onPillClick?: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void;
 }
+
+export type PillStyleProps = PillPropsDefaults & Pick<PillProps, 'color'>;
diff --git a/datahub-web-react/src/alchemy-components/components/Pills/utils.ts b/datahub-web-react/src/alchemy-components/components/Pills/utils.ts
index 832bf95640982b..43cc1445656be0 100644
--- a/datahub-web-react/src/alchemy-components/components/Pills/utils.ts
+++ b/datahub-web-react/src/alchemy-components/components/Pills/utils.ts
@@ -1,82 +1,51 @@
-import { colors, typography } from '@src/alchemy-components/theme';
+import { PillStyleProps } from '@components/components/Pills/types';
+import { ColorOptions, PillVariantOptions, SizeOptions } from '@components/theme/config';
+import { typography } from '@src/alchemy-components/theme';
 import { getColor, getFontSize } from '@src/alchemy-components/theme/utils';
-import { PillStyleProps } from './types';
+import { CSSObject } from 'styled-components';
 
-// Utility function to get color styles for pill - does not generate CSS
-const getPillColorStyles = (variant, color) => {
-    const defaultStyles = {
-        bgColor: getColor(color, 100),
-        hoverBgColor: getColor('gray', 100),
-        borderColor: '',
-        activeBorderColor: getColor('violet', 500),
-        textColor: getColor(color, 600),
-    };
+interface ColorStyles {
+    primaryColor: string;
+    bgColor: string;
+    borderColor: string;
+    hoverColor?: string;
+}
 
-    const colorOverrides = {
-        violet: {
-            textColor: getColor(color, 500),
-            bgColor: getColor('gray', 1000),
-            borderColor: 'transparent',
-            hoverBgColor: getColor(color, 100),
-            activeBorderColor: getColor(color, 500),
-        },
-        blue: {
-            textColor: getColor(color, 1000),
-            bgColor: getColor('gray', 1100),
-            borderColor: 'transparent',
-            hoverBgColor: getColor(color, 1100),
-            activeBorderColor: getColor(color, 1000),
-        },
-        red: {
-            textColor: getColor(color, 1000),
-            bgColor: getColor('gray', 1200),
-            hoverBgColor: getColor(color, 1100),
-            activeBorderColor: getColor(color, 1000),
-        },
-        green: {
-            textColor: getColor(color, 1000),
-            bgColor: getColor('gray', 1300),
-            hoverBgColor: getColor(color, 1100),
-            activeBorderColor: getColor(color, 1000),
-        },
-        yellow: {
-            textColor: getColor(color, 1000),
-            bgColor: getColor('gray', 1400),
-            hoverBgColor: getColor(color, 1100),
-            activeBorderColor: getColor(color, 1000),
-        },
-    };
-
-    const styles = colorOverrides[color] || defaultStyles;
-
-    if (variant === 'outline') {
+// Utility function to get color styles for pill - does not generate CSS
+function getPillColorStyles(variant: PillVariantOptions, color: ColorOptions): ColorStyles {
+    if (variant === 'version') {
         return {
-            bgColor: colors.transparent,
-            borderColor: getColor('gray', 1400),
-            textColor: getColor(color, 600),
+            bgColor: getColor('gray', color === 'white' ? 1500 : 100),
+            borderColor: getColor('gray', 100),
+            primaryColor: getColor('gray', 1700),
         };
     }
 
-    return styles;
-};
+    return {
+        primaryColor: getColor(color, 500),
+        bgColor: color === 'gray' ? getColor(color, 100) : getColor(color, 0),
+        hoverColor: color === 'gray' ? getColor(color, 100) : getColor(color, 1100),
+        borderColor: getColor('gray', 1400),
+    };
+}
 
 // Generate variant styles for pill
-const getPillVariantStyles = (variant, colorStyles) =>
+const getPillVariantStyles = (variant: PillVariantOptions, colorStyles: ColorStyles): CSSObject =>
     ({
         filled: {
             backgroundColor: colorStyles.bgColor,
             border: `1px solid transparent`,
-            color: colorStyles.textColor,
+            color: colorStyles.primaryColor,
             '&:hover': {
-                backgroundColor: colorStyles.hoverBgColor,
+                backgroundColor: colorStyles.hoverColor,
             },
         },
         outline: {
             backgroundColor: 'transparent',
-            border: `1px solid ${colorStyles.borderColor}`,
-            color: colorStyles.textColor,
+            border: `1px solid ${colorStyles.primaryColor}`,
+            color: colorStyles.primaryColor,
             '&:hover': {
-                backgroundColor: colorStyles.hoverBgColor,
+                backgroundColor: colorStyles.hoverColor,
                 border: `1px solid transparent`,
             },
             '&:disabled': {
@@ -84,19 +53,27 @@ const getPillVariantStyles = (variant, colorStyles) =>
             },
         },
         text: {
-            color: colorStyles.textColor,
+            color: colorStyles.primaryColor,
+        },
+        version: {
+            backgroundColor: colorStyles.bgColor,
+            border: `1px solid ${colorStyles.borderColor}`,
+            color: colorStyles.primaryColor,
+            '&:hover': {
+                backgroundColor: colorStyles.hoverColor,
+            },
+            borderRadius: '4px',
         },
     }[variant]);
 
-// Generate font styles for pill
-const getPillFontStyles = (size) => {
+const getPillFontStyles = (variant: PillVariantOptions, size: SizeOptions): CSSObject => {
     const baseFontStyles = {
         fontFamily: typography.fonts.body,
         fontWeight: typography.fontWeights.normal,
         lineHeight: typography.lineHeights.none,
     };
 
-    const sizeMap = {
+    const sizeMap: Record<SizeOptions, CSSObject> = {
         xs: { fontSize: getFontSize(size), lineHeight: '16px' },
         sm: { fontSize: getFontSize(size), lineHeight: '22px' },
         md: { fontSize: getFontSize(size), lineHeight: '24px' },
@@ -104,36 +81,40 @@ const getPillFontStyles = (size) => {
         xl: { fontSize: getFontSize(size), lineHeight: '34px' },
     };
 
+    const variantOverrides: Partial<Record<PillVariantOptions, CSSObject>> = {
+        version: {
+            fontWeight: typography.fontWeights.semiBold,
+            lineHeight: 1.4,
+        },
+    };
+
     return {
         ...baseFontStyles,
         ...sizeMap[size],
+        ...variantOverrides[variant],
     };
 };
 
-// Generate active styles for pill
-const getPillActiveStyles = (styleColors) => ({
-    borderColor: styleColors.activeBorderColor,
+const getPillActiveStyles = (variant: PillVariantOptions, colorStyles: ColorStyles): CSSObject => ({
+    borderColor: variant === 'filled' || variant === 'outline' ? colorStyles.primaryColor : '',
 });
 
-/*
- * Main function to generate styles for pill
- */
-export const getPillStyle = (props: PillStyleProps) => {
-    const { variant, colorScheme = 'gray', size, clickable = true } = props;
+export function getPillStyle(props: PillStyleProps): CSSObject {
+    const { variant, color, size, clickable = true } = props;
 
     // Get map of colors
-    const colorStyles = getPillColorStyles(variant, colorScheme);
+    const colorStyles = getPillColorStyles(variant, color);
 
     // Define styles for pill
     let styles = {
         ...getPillVariantStyles(variant, colorStyles),
-        ...getPillFontStyles(size),
+        ...getPillFontStyles(variant, size),
         '&:focus': {
-            ...getPillActiveStyles(colorStyles),
+            ...getPillActiveStyles(variant, colorStyles),
             outline: 'none', // Remove default browser focus outline if needed
         },
         '&:active': {
-            ...getPillActiveStyles(colorStyles),
+            ...getPillActiveStyles(variant, colorStyles),
         },
     };
     if (!clickable) {
@@ -144,4 +125,4 @@ export const getPillStyle = (props: PillStyleProps) => {
     }
 
     return styles;
-};
+}
diff --git a/datahub-web-react/src/alchemy-components/components/Select/AutoCompleteSelect.tsx b/datahub-web-react/src/alchemy-components/components/Select/AutoCompleteSelect.tsx
new file mode 100644
index 00000000000000..ed16e42dbc6500
--- /dev/null
+++ b/datahub-web-react/src/alchemy-components/components/Select/AutoCompleteSelect.tsx
@@ -0,0 +1,226 @@
+import { Text } from '@components';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import styled from 'styled-components';
+import { Input } from '../Input';
+import {
+    ActionButtonsContainer,
+    Container,
+    Dropdown,
+    LabelsWrapper,
+    OptionContainer,
+    OptionLabel,
+    OptionList,
+    Placeholder,
+    SearchInputContainer,
+    SelectBase,
+    SelectLabel,
+    SelectLabelContainer,
+    StyledClearButton,
+    StyledIcon,
+} from './components';
+import { ActionButtonsProps, SelectProps } from './types';
+
+const NoSuggestions = styled.div`
+    padding: 8px;
+`;
+
+const defaults: Partial<Props<any>> = {
+    label: '',
+    size: 'md',
+    isDisabled: false,
+    isReadOnly: false,
+    isRequired: false,
+    width: 255,
+    placeholder: 'Select an option ',
+    disabledValues: [],
+};
+
+export interface Suggestion<T> {
+    data: T;
+    value: string;
+}
+
+type Props<T> = Pick<
+    SelectProps,
+    | 'label'
+    | 'size'
+    | 'isDisabled'
+    | 'isReadOnly'
+    | 'isRequired'
+    | 'disabledValues'
+    | 'width'
+    | 'placeholder'
+    | 'icon'
+    | 'optionListTestId'
+> & {
+    render: (data: T) => React.ReactNode;
+    emptySuggestions?: Suggestion<T>[];
+    autoCompleteSuggestions?: Suggestion<T>[];
+    onSearch: (query: string) => void;
+    onUpdate?: (data: T | undefined) => void;
+    searchPlaceholder?: string;
+    name?: string;
+    className?: string;
+};
+
+export default function AutoCompleteSelect<T>({
+    render,
+    emptySuggestions,
+    autoCompleteSuggestions,
+    onSearch,
+    onUpdate,
+    name,
+    label = defaults.label,
+    isDisabled = defaults.isDisabled,
+    isReadOnly = defaults.isReadOnly,
+    isRequired = defaults.isRequired,
+    size = defaults.size,
+    placeholder = defaults.placeholder,
+    disabledValues = defaults.disabledValues,
+    icon,
+    searchPlaceholder,
+    optionListTestId,
+    className,
+    ...props
+}: Props<T>) {
+    const [query, setQuery] = useState('');
+    const [isOpen, setIsOpen] = useState(false);
+    const [selectedValue, setSelectedValue] = useState<Suggestion<T> | undefined>(undefined);
+    const selectRef = useRef<HTMLDivElement>(null);
+
+    const handleDocumentClick = useCallback((e: MouseEvent) => {
+        if (selectRef.current && !selectRef.current.contains(e.target as Node)) {
+            setIsOpen(false);
+        }
+    }, []);
+
+    useEffect(() => {
+        document.addEventListener('click', handleDocumentClick);
+        return () => {
+            document.removeEventListener('click', handleDocumentClick);
+        };
+    }, [handleDocumentClick]);
+
+    const handleSelectClick = useCallback(() => {
+        if (!isDisabled && !isReadOnly) {
+            setIsOpen((prev) => !prev);
+        }
+    }, [isDisabled, isReadOnly]);
+
+    const handleOptionChange = useCallback(
+        (option: Suggestion<T>) => {
+            setSelectedValue(option);
+            onUpdate?.(option.data);
+            setIsOpen(false);
+        },
+        [onUpdate],
+    );
+
+    const handleClearSelection = useCallback(() => {
+        setSelectedValue(undefined);
+        setIsOpen(false);
+        onUpdate?.(undefined);
+    }, [onUpdate]);
+
+    const isQuerySet = !!query;
+    const [displayedSuggestions, setDisplayedSuggestions] = useState<Suggestion<T>[]>([]);
+    useEffect(() => {
+        if (isQuerySet && autoCompleteSuggestions) {
+            setDisplayedSuggestions(autoCompleteSuggestions);
+        } else if (!isQuerySet && emptySuggestions) {
+            setDisplayedSuggestions(emptySuggestions);
+        }
+    }, [isQuerySet, autoCompleteSuggestions, emptySuggestions]);
+
+    return (
+        <Container
+            ref={selectRef}
+            className={className}
+            size={size || 'md'}
+            width={props.width || 255}
+            isSelected={selectedValue !== undefined}
+        >
+            {label && <SelectLabel onClick={handleSelectClick}>{label}</SelectLabel>}
+            <SelectBase
+                isDisabled={isDisabled}
+                isReadOnly={isReadOnly}
+                isRequired={isRequired}
+                isOpen={isOpen}
+                onClick={handleSelectClick}
+                fontSize={size}
+                {...props}
+            >
+                <SelectLabelContainer>
+                    {icon && <StyledIcon icon={icon} size="lg" />}
+                    <LabelsWrapper>
+                        {!selectedValue && placeholder && <Placeholder>{placeholder}</Placeholder>}
+                        {selectedValue && render(selectedValue.data)}
+                    </LabelsWrapper>
+                </SelectLabelContainer>
+                <SelectActionButtons
+                    selectedValues={selectedValue ? [selectedValue.value] : []}
+                    isOpen={isOpen}
+                    isDisabled={!!isDisabled}
+                    isReadOnly={!!isReadOnly}
+                    handleClearSelection={handleClearSelection}
+                    showClear
+                />
+            </SelectBase>
+            <input type="hidden" name={name} value={selectedValue?.value || ''} readOnly />
+            {isOpen && (
+                <Dropdown>
+                    <SearchInputContainer>
+                        <Input
+                            label=""
+                            type="text"
+                            icon={{ name: 'MagnifyingGlass', source: 'phosphor' }}
+                            placeholder={searchPlaceholder || ''}
+                            value={query}
+                            onChange={(e) => {
+                                setQuery(e.target.value);
+                                onSearch(e.target.value);
+                            }}
+                        />
+                    </SearchInputContainer>
+                    <OptionList data-testid={optionListTestId}>
+                        {!displayedSuggestions.length && (
+                            <NoSuggestions>
+                                <Text type="span" color="gray" weight="semiBold">
+                                    No results found
+                                </Text>
+                            </NoSuggestions>
+                        )}
+                        {displayedSuggestions?.map((option) => (
+                            <OptionLabel
+                                key={option.value}
+                                onClick={() => handleOptionChange(option)}
+                                isSelected={selectedValue?.value === option.value}
+                                isDisabled={disabledValues?.includes(option.value)}
+                            >
+                                <OptionContainer>{render(option.data)}</OptionContainer>
+                            </OptionLabel>
+                        ))}
+                    </OptionList>
+                </Dropdown>
+            )}
+        </Container>
+    );
+}
+
+function SelectActionButtons({
+    selectedValues,
+    isOpen,
+    isDisabled,
+    isReadOnly,
+    showClear,
+    handleClearSelection,
+}: ActionButtonsProps) {
+    return (
+        <ActionButtonsContainer>
+            {showClear && selectedValues.length > 0 && !isDisabled && !isReadOnly && (
+                <StyledClearButton icon="Close" isCircle onClick={handleClearSelection} iconSize="lg" />
+            )}
+            <StyledIcon icon="ChevronLeft" rotate={isOpen ? '90' : '270'} size="lg" />
+        </ActionButtonsContainer>
+    );
+}
diff --git a/datahub-web-react/src/alchemy-components/components/Text/components.ts b/datahub-web-react/src/alchemy-components/components/Text/components.ts
index 1d48497f39c9c8..f2cd045a0e6f7d 100644
--- a/datahub-web-react/src/alchemy-components/components/Text/components.ts
+++ b/datahub-web-react/src/alchemy-components/components/Text/components.ts
@@ -28,12 +28,12 @@ const baseStyles = {
 };
 
 // Prop Driven Styles
-const propStyles = (props, isText = false) => {
+const propStyles = (props: TextProps, isText = false) => {
     const styles = {} as any;
     if (props.size) styles.fontSize = getFontSize(props.size);
-    if (props.color) styles.color = getColor(props.color);
+    if (props.color) styles.color = getColor(props.color, props.colorLevel);
     if (props.weight) styles.fontWeight = typography.fontWeights[props.weight];
-    if (isText) styles.lineHeight = typography.lineHeights[props.size || 'md'];
+    if (isText) styles.lineHeight = typography.lineHeights[props.lineHeight || props.size || 'md'];
     return styles;
 };
 
diff --git a/datahub-web-react/src/alchemy-components/components/Text/types.ts b/datahub-web-react/src/alchemy-components/components/Text/types.ts
index 6a41929da12a9b..96b3bfe2ba230d 100644
--- a/datahub-web-react/src/alchemy-components/components/Text/types.ts
+++ b/datahub-web-react/src/alchemy-components/components/Text/types.ts
@@ -1,9 +1,11 @@
 import { HTMLAttributes } from 'react';
-import type { FontSizeOptions, FontColorOptions, FontWeightOptions } from '@components/theme/config';
+import { Color, FontSizeOptions, FontColorOptions, FontWeightOptions, SpacingOptions } from '@components/theme/config';
 
 export interface TextProps extends HTMLAttributes<HTMLElement> {
     type?: 'span' | 'p' | 'div';
     size?: FontSizeOptions;
     color?: FontColorOptions;
+    colorLevel?: keyof Color;
     weight?: FontWeightOptions;
+    lineHeight?: SpacingOptions;
 }
diff --git a/datahub-web-react/src/alchemy-components/components/Tooltip2/Tooltip2.tsx b/datahub-web-react/src/alchemy-components/components/Tooltip2/Tooltip2.tsx
index 8b77195fb40726..ed701d9cf8d093 100644
--- a/datahub-web-react/src/alchemy-components/components/Tooltip2/Tooltip2.tsx
+++ b/datahub-web-react/src/alchemy-components/components/Tooltip2/Tooltip2.tsx
@@ -1,4 +1,5 @@
-import { Tooltip, TooltipProps } from 'antd';
+import { Popover } from '@components';
+import { TooltipProps } from 'antd';
 import * as React from 'react';
 import {
     Container,
@@ -12,49 +13,47 @@ import {
 } from './components';
 import { Tooltip2Props } from './types';
 
+/**
+ * Note: Depends on styling set in global-overrides-v2.less to override ant padding
+ */
 export function Tooltip2(props: Tooltip2Props & TooltipProps) {
     const { header: Header, width, title, sections, ...otherProps } = props;
 
-    if (!Header && !title) return null;
-
-    const renderTitle = () => {
-        return (
-            <Container>
-                {Header && <Header />}
-                <Title>{title}</Title>
-                {sections && (
-                    <SectionsContainer>
-                        {sections?.map((section) => (
-                            <Section>
-                                <SectionHeader>
-                                    <SectionTitle>{section.title}</SectionTitle>
-                                    {section.titleSuffix && <TitleSuffix>{section.titleSuffix}</TitleSuffix>}
-                                </SectionHeader>
-                                {section?.content && <Content>{section.content}</Content>}
-                            </Section>
-                        ))}
-                    </SectionsContainer>
-                )}
-            </Container>
-        );
-    };
+    const content = (
+        <Container>
+            {Header && <Header />}
+            {title && <Title>{title}</Title>}
+            {sections && (
+                <SectionsContainer>
+                    {sections?.map((section) => (
+                        <Section>
+                            <SectionHeader>
+                                <SectionTitle>{section.title}</SectionTitle>
+                                {section.titleSuffix && <TitleSuffix>{section.titleSuffix}</TitleSuffix>}
+                            </SectionHeader>
+                            {section?.content && <Content>{section.content}</Content>}
+                        </Section>
+                    ))}
+                </SectionsContainer>
+            )}
+        </Container>
+    );
 
     return (
-        <Tooltip
+        <Popover
             {...otherProps}
-            showArrow={false}
-            title={renderTitle()}
+            content={content}
+            overlayClassName="sectioned-tooltip"
             overlayStyle={{
-                width: `${width || 278}px`,
+                width: `${width}px`,
             }}
             overlayInnerStyle={{
                 fontFamily: 'Mulish',
                 padding: '12px',
-                backgroundColor: 'white',
                 borderRadius: '8px',
             }}
         >
             {props.children}
-        </Tooltip>
+        </Popover>
     );
 }
diff --git a/datahub-web-react/src/alchemy-components/components/Tooltip2/components.ts b/datahub-web-react/src/alchemy-components/components/Tooltip2/components.ts
index bb2af3a1c9eccd..19db36b50e94d1 100644
--- a/datahub-web-react/src/alchemy-components/components/Tooltip2/components.ts
+++ b/datahub-web-react/src/alchemy-components/components/Tooltip2/components.ts
@@ -12,12 +12,12 @@ export const TitleSuffix = styled.div`
 `;
 
 export const SectionsContainer = styled.div`
-    margin-top: 8px;
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
 `;
 
-export const Section = styled.div`
-    margin-top: 12px;
-`;
+export const Section = styled.div``;
 
 export const SectionHeader = styled.div`
     display: flex;
@@ -31,11 +31,13 @@ export const SectionTitle = styled.div`
 `;
 
 export const Content = styled.div`
-    margin: 4px 0;
+    margin-top: 4px;
+    color: ${colors.gray[1700]};
+    font-size: 14px;
 `;
 
 export const Container = styled.div`
-    ${Section}:first-child {
-        margin-top: 0px;
-    }
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
 `;
diff --git a/datahub-web-react/src/alchemy-components/index.ts b/datahub-web-react/src/alchemy-components/index.ts
index ac05349437fd04..62c444985e3fc6 100644
--- a/datahub-web-react/src/alchemy-components/index.ts
+++ b/datahub-web-react/src/alchemy-components/index.ts
@@ -17,6 +17,7 @@ export * from './components/Icon';
 export * from './components/Input';
 export * from './components/LineChart';
 export * from './components/Loader';
+export * from './components/Modal';
 export * from './components/PageTitle';
 export * from './components/Pills';
 export * from './components/Popover';
diff --git a/datahub-web-react/src/alchemy-components/theme/config/types.ts b/datahub-web-react/src/alchemy-components/theme/config/types.ts
index f4d06f4c043ba6..e2a798638e9c35 100644
--- a/datahub-web-react/src/alchemy-components/theme/config/types.ts
+++ b/datahub-web-react/src/alchemy-components/theme/config/types.ts
@@ -1,5 +1,28 @@
 // General types
-export type SizeOptions = 'xs' | 'sm' | 'md' | 'lg' | 'xl';
+export enum SizeValues {
+    xs = 'xs',
+    sm = 'sm',
+    md = 'md',
+    lg = 'lg',
+    xl = 'xl',
+}
+export type SizeOptions = keyof typeof SizeValues;
+export function getSizeName(size: SizeOptions): string {
+    switch (size) {
+        case SizeValues.xs:
+            return 'xs';
+        case SizeValues.sm:
+            return 'small';
+        case SizeValues.md:
+            return 'medium';
+        case SizeValues.lg:
+            return 'large';
+        case SizeValues.xl:
+            return 'extra large';
+        default:
+            return '';
+    }
+}
 
 // Color types
 export interface Color {
@@ -12,36 +35,67 @@ export interface Color {
     700: string;
     800: string;
     900: string;
+    1000: string;
+    1100: string;
+    1200: string;
+    1300: string;
+    1400: string;
+    1500: string;
+    1600: string;
+    1700: string;
+    1800: string;
+    1900: string;
 }
-export type ColorOptions = 'white' | 'black' | 'violet' | 'green' | 'red' | 'blue' | 'gray' | 'yellow';
+
+export enum ColorValues {
+    white = 'white',
+    black = 'black',
+    violet = 'violet',
+    green = 'green',
+    red = 'red',
+    blue = 'blue',
+    yellow = 'yellow',
+    gray = 'gray',
+}
+
+export type ColorOptions = keyof typeof ColorValues;
+
 export type MiscColorOptions = 'transparent' | 'current' | 'inherit';
 export type ColorShadeOptions = 'light' | 'default' | 'dark';
 
 // Typography types
-export type FontSizeOptions = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl' | '4xl';
+export enum FontSizeValues {
+    xs = 'xs',
+    sm = 'sm',
+    md = 'md',
+    lg = 'lg',
+    xl = 'xl',
+    '2xl' = '2xl',
+    '3xl' = '3xl',
+    '4xl' = '4xl',
+}
+export type FontSizeOptions = keyof typeof FontSizeValues;
 export type FontWeightOptions = 'normal' | 'medium' | 'semiBold' | 'bold';
 export type FontColorOptions = MiscColorOptions | ColorOptions;
 
-// Border radius types
 export type BorderRadiusOptions = 'none' | 'sm' | 'md' | 'lg' | 'xl' | 'full';
 
-// Box shadow types
 export type BoxShadowOptions = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | 'inner' | 'outline' | 'dropdown' | 'none';
 
-// Spacing types
-export type SpacingOptions = 'none' | 'sm' | 'md' | 'lg' | 'xl' | '3xl' | '4xl';
+export type SpacingOptions = 'none' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl' | '4xl';
 
-// Transform types
 export type RotationOptions = '0' | '90' | '180' | '270';
 
-// Variant types
-export type VariantOptions = 'filled' | 'outline';
+export enum PillVariantValues {
+    filled = 'filled',
+    outline = 'outline',
+    version = 'version',
+}
+
+export type PillVariantOptions = keyof typeof PillVariantValues;
 
-// Alignment types
 export type AlignmentOptions = 'left' | 'right' | 'center' | 'justify';
 
-// Avatar Size options
 export type AvatarSizeOptions = 'sm' | 'md' | 'lg' | 'xl' | 'default';
 
-// Icon Alignment types
 export type IconAlignmentOptions = 'horizontal' | 'vertical';
diff --git a/datahub-web-react/src/alchemy-components/theme/foundations/colors.ts b/datahub-web-react/src/alchemy-components/theme/foundations/colors.ts
index 013a1f55cfb323..fa9f4dbd18141c 100644
--- a/datahub-web-react/src/alchemy-components/theme/foundations/colors.ts
+++ b/datahub-web-react/src/alchemy-components/theme/foundations/colors.ts
@@ -1,7 +1,7 @@
 const colors = {
     transparent: 'transparent',
     current: 'currentColor',
-    white: '#ffffff',
+    white: '#FFFFFF',
     black: '#000000',
 
     gray: {
@@ -14,7 +14,7 @@ const colors = {
         700: '#2F3657',
         800: '#272D48',
         900: '#231A58',
-        1000: '#F1F3FD',
+        1000: '#F1F3FD', // grays 1000-1300 aren't actually gray, should not be used
         1100: '#F1FBFE',
         1200: '#FBF3EF',
         1300: '#F7FBF4',
@@ -27,6 +27,7 @@ const colors = {
     },
 
     violet: {
+        0: '#F1F3FD',
         100: '#CAC3F1',
         200: '#B0A7EA',
         300: '#8C7EE0',
@@ -37,44 +38,48 @@ const colors = {
         800: '#2E2373',
         900: '#231A58',
         1000: '#E5E2F8',
+        1100: '#E5E2F8',
     },
 
     green: {
-        100: '#d5e9c9',
-        200: '#c0deaf',
-        300: '#a4cf8a',
-        400: '#92c573',
-        500: '#77b750', // primary value
-        600: '#6ca749',
+        0: '#F1F8EE',
+        100: '#D5E9C9',
+        200: '#C0DEAF',
+        300: '#A4CF8A',
+        400: '#92C573',
+        500: '#77B750', // primary value
+        600: '#6CA749',
         700: '#548239',
-        800: '#41652c',
-        900: '#324d22',
+        800: '#41652C',
+        900: '#324D22',
         1000: '#0D7543',
         1100: '#E1F0D6',
     },
 
     red: {
-        100: '#f6d5d5',
-        200: '#f2c1c1',
-        300: '#eca5a5',
-        400: '#e99393',
-        500: '#e37878', // primary value
-        600: '#cf6d6d',
-        700: '#a15555',
-        800: '#7d4242',
-        900: '#5f3232',
+        0: '#FBF3EF',
+        100: '#F6D5D5',
+        200: '#F2C1C1',
+        300: '#ECA5A5',
+        400: '#E99393',
+        500: '#E37878', // primary value
+        600: '#CF6D6D',
+        700: '#A15555',
+        800: '#7D4242',
+        900: '#5F3232',
         1000: '#C4360B',
         1100: '#F3DACE',
     },
 
     blue: {
-        100: '#eff8fc',
-        200: '#e6f5fb',
-        300: '#ccebf6',
-        400: '#5abde1', // primary value
-        500: '#51aacb',
-        600: '#4897b4',
-        700: '#448ea9',
+        0: '#F1FBFE',
+        100: '#EFF8FC',
+        200: '#E6F5FB',
+        300: '#CCEBF6',
+        400: '#5ABDE1', // primary value
+        500: '#51AACB',
+        600: '#4897B4',
+        700: '#448EA9',
         800: '#367187',
         900: '#285565',
         1000: '#09739A',
@@ -82,15 +87,16 @@ const colors = {
     },
 
     yellow: {
-        100: '#fcedc7',
-        200: '#fae4ab',
-        300: '#f8d785',
-        400: '#f6d06d',
-        500: '#eeae09', // primary value
-        600: '#deb242',
-        700: '#ad8b34',
-        800: '#866c28',
-        900: '#66521f',
+        0: '#FFFAEB',
+        100: '#FCEDC7',
+        200: '#FAE4AB',
+        300: '#F8D785',
+        400: '#F6D06D',
+        500: '#EEAE09', // primary value
+        600: '#DEB242',
+        700: '#AD8B34',
+        800: '#866C28',
+        900: '#66521F',
         1000: '#C77100',
         1100: '#FCEDC7',
     },
diff --git a/datahub-web-react/src/app/analytics/event.ts b/datahub-web-react/src/app/analytics/event.ts
index 7d213acb42a59e..91b7ff84a43005 100644
--- a/datahub-web-react/src/app/analytics/event.ts
+++ b/datahub-web-react/src/app/analytics/event.ts
@@ -111,6 +111,9 @@ export enum EventType {
     SearchLineageColumnsEvent,
     FilterLineageColumnsEvent,
     DrillDownLineageEvent,
+    LinkAssetVersionEvent,
+    UnlinkAssetVersionEvent,
+    ShowAllVersionsEvent,
 }
 
 /**
@@ -816,6 +819,30 @@ export interface RemoveStructuredPropertyEvent extends StructuredPropertyOnAsset
     type: EventType.RemoveStructuredPropertyEvent;
 }
 
+export interface LinkAssetVersionEvent extends BaseEvent {
+    type: EventType.LinkAssetVersionEvent;
+    newAssetUrn: string;
+    oldAssetUrn?: string;
+    versionSetUrn?: string;
+    entityType: EntityType;
+}
+
+export interface UnlinkAssetVersionEvent extends BaseEvent {
+    type: EventType.UnlinkAssetVersionEvent;
+    assetUrn: string;
+    versionSetUrn?: string;
+    entityType: EntityType;
+}
+
+export interface ShowAllVersionsEvent extends BaseEvent {
+    type: EventType.ShowAllVersionsEvent;
+    assetUrn: string;
+    versionSetUrn?: string;
+    entityType: EntityType;
+    numVersions?: number;
+    uiLocation: 'preview' | 'more-options';
+}
+
 /**
  * Event consisting of a union of specific event types.
  */
@@ -914,4 +941,7 @@ export type Event =
     | ApplyStructuredPropertyEvent
     | UpdateStructuredPropertyOnAssetEvent
     | RemoveStructuredPropertyEvent
-    | ClickDocRequestCTA;
+    | ClickDocRequestCTA
+    | LinkAssetVersionEvent
+    | UnlinkAssetVersionEvent
+    | ShowAllVersionsEvent;
diff --git a/datahub-web-react/src/app/entity/dataProcessInstance/profile/DataProcessInstanceSummary.tsx b/datahub-web-react/src/app/entity/dataProcessInstance/profile/DataProcessInstanceSummary.tsx
index c6591d4f5faa1d..f046d5dce8c897 100644
--- a/datahub-web-react/src/app/entity/dataProcessInstance/profile/DataProcessInstanceSummary.tsx
+++ b/datahub-web-react/src/app/entity/dataProcessInstance/profile/DataProcessInstanceSummary.tsx
@@ -46,7 +46,7 @@ export default function MLModelSummary() {
         if (!state || state.length === 0) return '-';
         const result = state[0]?.result?.resultType;
         const statusColor = result === DataProcessInstanceRunResultType.Success ? 'green' : 'red';
-        return <Pill label={capitalize(result)} colorScheme={statusColor} clickable={false} />;
+        return <Pill label={capitalize(result)} color={statusColor} clickable={false} />;
     };
 
     const formatDuration = (state) => {
diff --git a/datahub-web-react/src/app/entity/mlModel/profile/MLModelSummary.tsx b/datahub-web-react/src/app/entity/mlModel/profile/MLModelSummary.tsx
index e637c6d299d8d3..0bcdb0b96bc0e5 100644
--- a/datahub-web-react/src/app/entity/mlModel/profile/MLModelSummary.tsx
+++ b/datahub-web-react/src/app/entity/mlModel/profile/MLModelSummary.tsx
@@ -111,7 +111,7 @@ export default function MLModelSummary() {
                                 <Pill
                                     label={alias.versionTag ?? '-'}
                                     key={alias.versionTag}
-                                    colorScheme="blue"
+                                    color="blue"
                                     clickable={false}
                                 />
                             ))}
diff --git a/datahub-web-react/src/app/entity/mlModelGroup/profile/ModelGroupModels.tsx b/datahub-web-react/src/app/entity/mlModelGroup/profile/ModelGroupModels.tsx
index e06b2fc932c6dd..a443a5d30fa31b 100644
--- a/datahub-web-react/src/app/entity/mlModelGroup/profile/ModelGroupModels.tsx
+++ b/datahub-web-react/src/app/entity/mlModelGroup/profile/ModelGroupModels.tsx
@@ -118,12 +118,7 @@ export default function MLGroupModels() {
                 return (
                     <TagContainer>
                         {aliases.map((alias) => (
-                            <Pill
-                                key={alias.versionTag}
-                                label={alias.versionTag}
-                                colorScheme="blue"
-                                clickable={false}
-                            />
+                            <Pill key={alias.versionTag} label={alias.versionTag} color="blue" clickable={false} />
                         ))}
                     </TagContainer>
                 );
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/StructuredPropertyBadge.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/StructuredPropertyBadge.tsx
index fc7892f6ba6cca..37efdfaf446273 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/header/StructuredPropertyBadge.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/StructuredPropertyBadge.tsx
@@ -78,12 +78,7 @@ const StructuredPropertyBadge = ({ structuredProperties }: Props) => {
             overlayInnerStyle={{ width: 250, padding: 16 }}
         >
             <BadgeContainer>
-                <Pill
-                    label={propRow?.values[0]?.value?.toString() || ''}
-                    size="sm"
-                    colorScheme="violet"
-                    clickable={false}
-                />
+                <Pill label={propRow?.values[0]?.value?.toString() || ''} size="sm" color="violet" clickable={false} />
             </BadgeContainer>
         </StyledTooltip>
     );
diff --git a/datahub-web-react/src/app/entity/shared/types.ts b/datahub-web-react/src/app/entity/shared/types.ts
index 8ef1dbac678ab2..079c257efbb2a5 100644
--- a/datahub-web-react/src/app/entity/shared/types.ts
+++ b/datahub-web-react/src/app/entity/shared/types.ts
@@ -1,4 +1,5 @@
 import { MutationFunctionOptions, FetchResult } from '@apollo/client';
+import React from 'react';
 
 import {
     DataPlatform,
@@ -43,6 +44,7 @@ import {
     ScrollResults,
     Documentation,
     DisplayProperties,
+    VersionProperties,
 } from '../../../types.generated';
 import { FetchedEntity } from '../../lineage/types';
 
@@ -132,6 +134,7 @@ export type GenericEntityProperties = {
     parent?: Maybe<GenericEntityProperties>;
     displayProperties?: Maybe<DisplayProperties>;
     notes?: Maybe<EntityRelationshipsResult>;
+    versionProperties?: Maybe<VersionProperties>;
 };
 
 export type GenericEntityUpdate = {
@@ -160,6 +163,10 @@ interface EntityState {
     setShouldRefetchContents: (shouldRefetch: boolean) => void;
 }
 
+export enum DrawerType {
+    VERSIONS,
+}
+
 export type EntityContextType = {
     urn: string;
     entityType: EntityType;
@@ -174,6 +181,7 @@ export type EntityContextType = {
     shouldRefetchEmbeddedListSearch?: boolean;
     setShouldRefetchEmbeddedListSearch?: React.Dispatch<React.SetStateAction<boolean>>;
     entityState?: EntityState;
+    setDrawer?: React.Dispatch<React.SetStateAction<DrawerType | undefined>>;
 };
 
 export type SchemaContextType = {
diff --git a/datahub-web-react/src/app/entityV2/dataProcessInstance/profile/DataProcessInstanceSummary.tsx b/datahub-web-react/src/app/entityV2/dataProcessInstance/profile/DataProcessInstanceSummary.tsx
index 98e2909175e31b..d0bfae7b998e3f 100644
--- a/datahub-web-react/src/app/entityV2/dataProcessInstance/profile/DataProcessInstanceSummary.tsx
+++ b/datahub-web-react/src/app/entityV2/dataProcessInstance/profile/DataProcessInstanceSummary.tsx
@@ -46,7 +46,7 @@ export default function DataProcessInstanceSummary() {
         if (!state || state.length === 0) return '-';
         const result = state[0]?.result?.resultType;
         const statusColor = result === DataProcessInstanceRunResultType.Success ? 'green' : 'red';
-        return <Pill label={capitalize(result)} colorScheme={statusColor} clickable={false} />;
+        return <Pill label={capitalize(result)} color={statusColor} clickable={false} />;
     };
 
     const formatDuration = (state) => {
diff --git a/datahub-web-react/src/app/entityV2/dataset/DatasetEntity.tsx b/datahub-web-react/src/app/entityV2/dataset/DatasetEntity.tsx
index 2257940158afa1..49adc85be02391 100644
--- a/datahub-web-react/src/app/entityV2/dataset/DatasetEntity.tsx
+++ b/datahub-web-react/src/app/entityV2/dataset/DatasetEntity.tsx
@@ -72,6 +72,7 @@ const headerDropdownItems = new Set([
     EntityMenuItems.UPDATE_DEPRECATION,
     EntityMenuItems.RAISE_INCIDENT,
     EntityMenuItems.ANNOUNCE,
+    EntityMenuItems.LINK_VERSION,
 ]);
 
 /**
diff --git a/datahub-web-react/src/app/entityV2/mlModel/MLModelEntity.tsx b/datahub-web-react/src/app/entityV2/mlModel/MLModelEntity.tsx
index 7527d0133d62e0..93c1afd83080d0 100644
--- a/datahub-web-react/src/app/entityV2/mlModel/MLModelEntity.tsx
+++ b/datahub-web-react/src/app/entityV2/mlModel/MLModelEntity.tsx
@@ -31,6 +31,7 @@ const headerDropdownItems = new Set([
     EntityMenuItems.UPDATE_DEPRECATION,
     EntityMenuItems.RAISE_INCIDENT,
     EntityMenuItems.ANNOUNCE,
+    EntityMenuItems.LINK_VERSION,
 ]);
 
 /**
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityDropdown.tsx
index 45915290ca5ca2..7f871bed06b78c 100644
--- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityDropdown.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityDropdown.tsx
@@ -4,15 +4,19 @@ import {
     FolderAddOutlined,
     FolderOpenOutlined,
     LinkOutlined,
-    MoreOutlined,
     NotificationOutlined,
     PlusOutlined,
     ShareAltOutlined,
     WarningOutlined,
 } from '@ant-design/icons';
+import { EventType } from '@app/analytics';
+import analytics from '@app/analytics/analytics';
+import { useEntityContext } from '@app/entity/shared/EntityContext';
+import { DrawerType, GenericEntityProperties } from '@app/entity/shared/types';
+import { Tooltip } from '@components';
 import MoreVertOutlinedIcon from '@mui/icons-material/MoreVertOutlined';
 import { Dropdown, Menu, message } from 'antd';
-import { Tooltip } from '@components';
+import { GitCommit, Link as LinkIcon, LinkBreak } from 'phosphor-react';
 import React, { useState } from 'react';
 import { Redirect, useHistory } from 'react-router';
 import styled from 'styled-components';
@@ -21,7 +25,7 @@ import { EntityType } from '../../../../types.generated';
 import { useUserContext } from '../../../context/useUserContext';
 import { getEntityProfileDeleteRedirectPath } from '../../../shared/deleteUtils';
 import ShareButtonMenu from '../../../shared/share/v2/ShareButtonMenu';
-import { useIsNestedDomainsEnabled } from '../../../useAppConfig';
+import { useAppConfig, useIsNestedDomainsEnabled } from '../../../useAppConfig';
 import { useEntityRegistry } from '../../../useEntityRegistry';
 import CreateEntityAnnouncementModal from '../announce/CreateEntityAnnouncementModal';
 import { MarkAsDeprecatedButtonContents } from '../components/styled/MarkAsDeprecatedButton';
@@ -36,15 +40,8 @@ import MoveGlossaryEntityModal from './MoveGlossaryEntityModal';
 import { UpdateDeprecationModal } from './UpdateDeprecationModal';
 import useDeleteEntity from './useDeleteEntity';
 import { isDeleteDisabled, isMoveDisabled, shouldDisplayChildDeletionWarning } from './utils';
-
-export const MenuIcon = styled(MoreOutlined)<{ fontSize?: number }>`
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    font-size: ${(props) => props.fontSize || '24'}px;
-    height: 32px;
-    margin-left: 5px;
-`;
+import LinkAssetVersionModal from './versioning/LinkAssetVersionModal';
+import UnlinkAssetVersionModal from './versioning/UnlinkAssetVersionModal';
 
 const MenuItem = styled.div`
     font-size: 13px;
@@ -69,6 +66,7 @@ const StyledMoreIcon = styled(MoreVertOutlinedIcon)`
         display: flex;
         font-size: 20px;
         padding: 2px;
+
         :hover {
             color: ${REDESIGN_COLORS.TITLE_PURPLE};
         }
@@ -77,13 +75,12 @@ const StyledMoreIcon = styled(MoreVertOutlinedIcon)`
 
 const StyledMenuItem = styled(Menu.Item)<{ disabled?: boolean }>`
     ${(props) =>
-        props.disabled
-            ? `
-            ${MenuItem} {
-                color: ${ANTD_GRAY[7]};
-            }
-    `
-            : ''}
+        props.disabled &&
+        `
+        ${MenuItem} {
+            color: ${ANTD_GRAY[7]};
+        }
+    `}
 `;
 
 interface Options {
@@ -94,7 +91,7 @@ interface Options {
 interface Props {
     urn: string;
     entityType: EntityType;
-    entityData?: any;
+    entityData: GenericEntityProperties | null;
     menuItems: Set<EntityMenuItems>;
     options?: Options;
     refetchForEntity?: () => void;
@@ -121,9 +118,13 @@ const EntityDropdown = (props: Props) => {
         options,
         triggerType = ['click'],
     } = props;
+    const { urn: entityProfileUrn, setDrawer } = useEntityContext();
+    const onEntityProfile = entityProfileUrn === urn;
 
     const me = useUserContext();
     const entityRegistry = useEntityRegistry();
+    const versioningEnabled = useAppConfig().config.featureFlags.entityVersioningEnabled;
+
     const [updateDeprecation] = useUpdateDeprecationMutation();
     const isHideSiblingMode = useIsSeparateSiblingsMode();
     const isNestedDomainsEnabled = useIsNestedDomainsEnabled();
@@ -141,8 +142,9 @@ const EntityDropdown = (props: Props) => {
     const [isDeprecationModalVisible, setIsDeprecationModalVisible] = useState(false);
     const [isEntityAnnouncementModalVisible, setIsEntityAnnouncementModalVisible] = useState(false);
     const [isMoveModalVisible, setIsMoveModalVisible] = useState(false);
-    // acryl-main only
     const [isRaiseIncidentModalVisible, setIsRaiseIncidentModalVisible] = useState(false);
+    const [isLinkAssetVersionModalVisible, setIsLinkAssetVersionModalVisible] = useState(false);
+    const [isUnlinkAssetVersionModalVisible, setIsUnlinkAssetVersionModalVisible] = useState(false);
 
     const handleUpdateDeprecation = async (deprecatedStatus: boolean) => {
         message.loading({ content: 'Updating...' });
@@ -290,6 +292,41 @@ const EntityDropdown = (props: Props) => {
                                 </MenuItem>
                             </StyledMenuItem>
                         )}
+                        {onEntityProfile &&
+                            versioningEnabled &&
+                            menuItems.has(EntityMenuItems.LINK_VERSION) &&
+                            !entityData?.versionProperties && (
+                                <StyledMenuItem key="link" disabled={false}>
+                                    <MenuItem onClick={() => setIsLinkAssetVersionModalVisible(true)}>
+                                        <LinkIcon fontSize="inherit" /> &nbsp;Link a Newer Version
+                                    </MenuItem>
+                                </StyledMenuItem>
+                            )}
+                        {onEntityProfile && entityData?.versionProperties?.isLatest && (
+                            <StyledMenuItem key="unlink" disabled={false}>
+                                <MenuItem onClick={() => setIsUnlinkAssetVersionModalVisible(true)}>
+                                    <LinkBreak fontSize="inherit" /> &nbsp;Unlink from Previous Version
+                                </MenuItem>
+                            </StyledMenuItem>
+                        )}
+                        {onEntityProfile && entityData?.versionProperties && setDrawer && (
+                            <StyledMenuItem key="showVersions" disabled={false}>
+                                <MenuItem
+                                    onClick={() => {
+                                        analytics.event({
+                                            type: EventType.ShowAllVersionsEvent,
+                                            assetUrn: urn,
+                                            versionSetUrn: entityData?.versionProperties?.versionSet?.urn,
+                                            entityType,
+                                            uiLocation: 'preview',
+                                        });
+                                        setDrawer(DrawerType.VERSIONS);
+                                    }}
+                                >
+                                    <GitCommit fontSize="inherit" /> &nbsp;Show Versions
+                                </MenuItem>
+                            </StyledMenuItem>
+                        )}
                         {menuItems.has(EntityMenuItems.SHARE) && (
                             <StyledSubMenu
                                 key="8"
@@ -358,7 +395,6 @@ const EntityDropdown = (props: Props) => {
             )}
             {isMoveModalVisible && isDomainEntity && <MoveDomainModal onClose={() => setIsMoveModalVisible(false)} />}
             {hasBeenDeleted && !onDelete && deleteRedirectPath && <Redirect to={deleteRedirectPath} />}
-            {/* acryl-main only */}
             {isRaiseIncidentModalVisible && (
                 <AddIncidentModal
                     urn={urn}
@@ -382,6 +418,23 @@ const EntityDropdown = (props: Props) => {
                     }
                 />
             )}
+            {isLinkAssetVersionModalVisible && (
+                <LinkAssetVersionModal
+                    urn={urn}
+                    entityType={entityType}
+                    closeModal={() => setIsLinkAssetVersionModalVisible(false)}
+                    refetch={refetchForEntity}
+                />
+            )}
+            {isUnlinkAssetVersionModalVisible && (
+                <UnlinkAssetVersionModal
+                    urn={urn}
+                    entityType={entityType}
+                    versionSetUrn={entityData?.versionProperties?.versionSet?.urn}
+                    closeModal={() => setIsUnlinkAssetVersionModalVisible(false)}
+                    refetch={refetchForEntity}
+                />
+            )}
         </>
     );
 };
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx
index 116dd47caaa0e9..96d2e22cb8ee39 100644
--- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx
@@ -2,7 +2,6 @@ import { MoreOutlined } from '@ant-design/icons';
 import React, { useContext } from 'react';
 import styled from 'styled-components';
 import { useEntityData, useRefetch } from '../../../entity/shared/EntityContext';
-import { ENTITY_PROFILE_V2_SUBSCRIPTION_ID } from '../../../onboarding/configV2/EntityProfileOnboardingConfig';
 import ShareMenuAction from '../../../shared/share/v2/ShareMenuAction';
 import EntitySidebarContext from '../../../sharedV2/EntitySidebarContext';
 import DeleteEntityMenuItem from './DeleteEntityMenuAction';
@@ -24,6 +23,7 @@ export enum EntityMenuItems {
     EDIT, // acryl-main only
     ANNOUNCE, // acryl-main only
     RAISE_INCIDENT,
+    LINK_VERSION,
 }
 
 export const MenuIcon = styled(MoreOutlined)<{ fontSize?: number }>`
@@ -63,6 +63,7 @@ function EntityMenuActions(props: Props) {
 
     const refetch = useRefetch();
 
+    const hasVersioningActions = !!(menuItems.has(EntityMenuItems.LINK_VERSION) || entityData?.versionProperties);
     return (
         <>
             {isClosed ? (
@@ -75,11 +76,26 @@ function EntityMenuActions(props: Props) {
                         <DeleteEntityMenuItem onDelete={onDelete} options={options} />
                     )}
                     {menuItems.has(EntityMenuItems.RAISE_INCIDENT) && <RaiseIncidentMenuAction />}{' '}
+                    {hasVersioningActions && (
+                        <MoreOptionsContainer>
+                            <MoreOptionsMenuAction
+                                menuItems={
+                                    menuItems.has(EntityMenuItems.LINK_VERSION)
+                                        ? new Set([EntityMenuItems.LINK_VERSION])
+                                        : new Set()
+                                }
+                                urn={urn}
+                                entityType={entityType}
+                                entityData={entityData}
+                                refetch={refetch}
+                            />
+                        </MoreOptionsContainer>
+                    )}
                 </MenuItems>
             ) : (
                 <MenuItems>
                     {menuItems.has(EntityMenuItems.EXTERNAL_URL) && <ExternalUrlMenuAction />}
-                    <MoreOptionsContainer id={ENTITY_PROFILE_V2_SUBSCRIPTION_ID}>
+                    <MoreOptionsContainer>
                         <MoreOptionsMenuAction
                             menuItems={menuItems}
                             urn={urn}
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoreOptionsMenuAction.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoreOptionsMenuAction.tsx
index 38781c63a229de..a9e40637a0061c 100644
--- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoreOptionsMenuAction.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/MoreOptionsMenuAction.tsx
@@ -1,3 +1,4 @@
+import { GenericEntityProperties } from '@app/entity/shared/types';
 import React from 'react';
 import { ActionMenuItem } from './styledComponents';
 import { EntityMenuItems } from './EntityMenuActions';
@@ -9,7 +10,7 @@ interface Props {
     menuItems: Set<EntityMenuItems>;
     urn: string;
     entityType: EntityType;
-    entityData?: any;
+    entityData: GenericEntityProperties | null;
     refetch?: () => void;
     size?: number;
     triggerType?: ('click' | 'contextMenu' | 'hover')[] | undefined;
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/versioning/LinkAssetVersionModal.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/versioning/LinkAssetVersionModal.tsx
new file mode 100644
index 00000000000000..482c74f2a7a7bd
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/versioning/LinkAssetVersionModal.tsx
@@ -0,0 +1,146 @@
+import analytics, { EventType } from '@app/analytics';
+import { EntitySearchInputV2 } from '@app/entityV2/shared/EntitySearchInput/EntitySearchInputV2';
+import { useEntityRegistry } from '@app/useEntityRegistry';
+import { Input, Modal } from '@components';
+import { Label } from '@components/components/Input/components';
+import { useLinkAssetVersionMutation } from '@graphql/versioning.generated';
+import { Entity, EntityType } from '@types';
+import { Form, message } from 'antd';
+import React, { useState } from 'react';
+import { v4 as uuidv4 } from 'uuid';
+
+const ENTITY_FIELD_NAME = 'entity';
+const LABEL_FIELD_NAME = 'label';
+const COMMENT_FIELD_NAME = 'comment';
+
+interface FormType {
+    entityUrnToLink?: string;
+    label: string;
+    comment?: string;
+}
+
+interface Props {
+    urn: string;
+    entityType: EntityType;
+    closeModal: () => void;
+    refetch?: () => void;
+}
+
+export default function LinkAssetVersionModal({ urn, entityType, closeModal, refetch }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const [link] = useLinkAssetVersionMutation();
+
+    const [form] = Form.useForm<FormType>();
+    const formValues = Form.useWatch([], form);
+    const [selectedEntity, setSelectedEntity] = useState<Entity | undefined>();
+
+    function close() {
+        form.resetFields();
+        closeModal();
+    }
+
+    function handleLink() {
+        form.validateFields().then(() => {
+            const versionProperties =
+                selectedEntity &&
+                entityRegistry.getGenericEntityProperties(selectedEntity.type, selectedEntity)?.versionProperties;
+
+            if (selectedEntity && (!versionProperties?.isLatest || !versionProperties?.versionSet?.urn)) {
+                message.error({
+                    content: 'Cannot link to a non-versioned or non-latest entity',
+                    duration: 3,
+                });
+                return;
+            }
+
+            const versionSetUrn =
+                versionProperties?.versionSet?.urn ||
+                `urn:li:versionSet:(${uuidv4()},${entityRegistry.getGraphNameFromType(entityType)})`;
+
+            link({
+                variables: {
+                    input: {
+                        linkedEntity: urn,
+                        versionSet: versionSetUrn,
+                        version: formValues.label,
+                        comment: formValues.comment,
+                    },
+                },
+            })
+                .then(() => {
+                    close();
+                    analytics.event({
+                        type: EventType.LinkAssetVersionEvent,
+                        oldAssetUrn: selectedEntity?.urn,
+                        newAssetUrn: urn,
+                        versionSetUrn,
+                        entityType,
+                    });
+                    message.loading({
+                        content: 'Linking...',
+                        duration: 2,
+                    });
+
+                    setTimeout(() => {
+                        refetch?.();
+                        message.success({
+                            content: `Linked ${entityRegistry.getEntityName(entityType)}!`,
+                            duration: 2,
+                        });
+                    }, 2000);
+                })
+                .catch((e) => {
+                    message.destroy();
+                    message.error({ content: `Failed to link: \n ${e.message || ''}`, duration: 3 });
+                });
+        });
+    }
+
+    return (
+        <Modal
+            title="Link a Newer Version"
+            onCancel={close}
+            buttons={[
+                { text: 'Cancel', variant: 'text', onClick: close },
+                { text: 'Create', variant: 'filled', onClick: handleLink },
+            ]}
+        >
+            <Form
+                form={form}
+                layout="vertical"
+                onKeyDown={(e) => {
+                    // Preventing the modal from closing when the Enter key is pressed
+                    if (e.key === 'Enter') {
+                        e.preventDefault();
+                        e.stopPropagation();
+                    }
+                }}
+            >
+                <Form.Item name={ENTITY_FIELD_NAME}>
+                    <Label>Previous Version</Label>
+                    <EntitySearchInputV2
+                        entityTypes={[entityType]}
+                        placeholder={`Select a ${entityRegistry
+                            .getEntityName(entityType)
+                            ?.toLocaleLowerCase()} to link`}
+                        searchPlaceholder={`Search for a ${entityRegistry
+                            .getCollectionName(entityType)
+                            .toLocaleLowerCase()}`}
+                        orFilters={[{ and: [{ field: 'isLatest', values: ['true'] }] }]}
+                        onUpdate={setSelectedEntity}
+                    />
+                </Form.Item>
+                <Form.Item
+                    name={LABEL_FIELD_NAME}
+                    rules={[{ min: 1, max: 100, required: true, message: 'Version name is required' }]}
+                    hasFeedback
+                >
+                    <Input label="Version Name" placeholder="v.2321" />
+                </Form.Item>
+                <Form.Item name={COMMENT_FIELD_NAME} rules={[{ min: 1, max: 500 }]} hasFeedback>
+                    <Input label="Version Note" placeholder="This version does..." />
+                </Form.Item>
+            </Form>
+        </Modal>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/versioning/UnlinkAssetVersionModal.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/versioning/UnlinkAssetVersionModal.tsx
new file mode 100644
index 00000000000000..e978df65307220
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/versioning/UnlinkAssetVersionModal.tsx
@@ -0,0 +1,61 @@
+import analytics, { EventType } from '@app/analytics';
+import { useEntityRegistry } from '@app/useEntityRegistry';
+import { Modal } from '@components';
+import { useUnlinkAssetVersionMutation } from '@graphql/versioning.generated';
+import { EntityType } from '@types';
+import { message } from 'antd';
+import React from 'react';
+
+interface Props {
+    urn: string;
+    entityType: EntityType;
+    closeModal: () => void;
+    versionSetUrn?: string;
+    refetch?: () => void;
+}
+
+export default function UnlinkAssetVersionModal({ urn, entityType, closeModal, versionSetUrn, refetch }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const [unlink] = useUnlinkAssetVersionMutation();
+
+    function handleUnlink() {
+        unlink({ variables: { input: { unlinkedEntity: urn, versionSet: versionSetUrn } } })
+            .then(() => {
+                closeModal();
+                analytics.event({
+                    type: EventType.UnlinkAssetVersionEvent,
+                    assetUrn: urn,
+                    versionSetUrn,
+                    entityType,
+                });
+                message.loading({
+                    content: 'Unlinking...',
+                    duration: 2,
+                });
+
+                setTimeout(() => {
+                    refetch?.();
+                    message.success({
+                        content: `Unlinked ${entityRegistry.getEntityName(entityType)}!`,
+                        duration: 2,
+                    });
+                }, 2000);
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to unlink: \n ${e.message || ''}`, duration: 3 });
+            });
+    }
+
+    return (
+        <Modal
+            title="Are you sure?"
+            subtitle="Would you like to unlink this version?"
+            buttons={[
+                { text: 'No', variant: 'text', onClick: closeModal },
+                { text: 'Yes', variant: 'filled', onClick: handleUnlink },
+            ]}
+            onCancel={closeModal}
+        />
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResultV2.tsx b/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResultV2.tsx
new file mode 100644
index 00000000000000..03534433adb147
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResultV2.tsx
@@ -0,0 +1,62 @@
+import { getDisplayedEntityType } from '@app/entityV2/shared/containers/profile/header/utils';
+import ContextPath from '@app/previewV2/ContextPath';
+import useContentTruncation from '@app/shared/useContentTruncation';
+import { Skeleton } from 'antd';
+import React from 'react';
+import { useEntityRegistry } from '@app/useEntityRegistry';
+import { Text } from '@components';
+import { Entity } from '@types';
+import styled from 'styled-components';
+
+const Wrapper = styled.div`
+    display: flex;
+    align-items: center;
+    gap: 10px;
+`;
+
+const TextWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+`;
+
+const IconContainer = styled.img`
+    height: 24px;
+    min-width: 24px;
+`;
+
+type Props = {
+    entity: Entity;
+};
+
+export default function EntitySearchInputResultV2({ entity }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const properties = entityRegistry.getGenericEntityProperties(entity.type, entity);
+    const platformIcon = properties?.platform?.properties?.logoUrl;
+
+    const { contentRef, isContentTruncated } = useContentTruncation(properties);
+    const displayedEntityType = getDisplayedEntityType(properties, entityRegistry, entity.type);
+
+    return (
+        <Wrapper>
+            {!platformIcon && <Skeleton.Avatar size={24} active />}
+            {platformIcon && <IconContainer src={platformIcon} />}
+            <TextWrapper>
+                <Text size="lg">{entityRegistry.getDisplayName(entity.type, entity)}</Text>
+                <ContextPath
+                    instanceId={properties?.dataPlatformInstance?.instanceId}
+                    entityType={entity.type}
+                    type={displayedEntityType}
+                    browsePaths={properties?.browsePathV2}
+                    parentEntities={
+                        properties?.parentContainers?.containers ||
+                        properties?.parentDomains?.domains ||
+                        properties?.parentNodes?.nodes
+                    }
+                    contentRef={contentRef}
+                    isContentTruncated={isContentTruncated}
+                    linksDisabled
+                />
+            </TextWrapper>
+        </Wrapper>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputV2.tsx b/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputV2.tsx
new file mode 100644
index 00000000000000..f22ef413fdb929
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputV2.tsx
@@ -0,0 +1,83 @@
+import AutoCompleteSelect from '@src/alchemy-components/components/Select/AutoCompleteSelect';
+import EntitySearchInputResultV2 from '@app/entityV2/shared/EntitySearchInput/EntitySearchInputResultV2';
+import React, { useState } from 'react';
+import { useDebounce } from 'react-use';
+import {
+    useGetAutoCompleteMultipleResultsLazyQuery,
+    useGetSearchResultsForMultipleQuery,
+} from '@graphql/search.generated';
+import { AndFilterInput, Entity, EntityType } from '@types';
+
+interface Props {
+    entityTypes: EntityType[];
+    placeholder?: string;
+    searchPlaceholder?: string;
+    orFilters?: AndFilterInput[];
+    onUpdate?: (entity: Entity | undefined) => void;
+}
+
+/**
+ * This component allows you to search and select entities. It will handle everything, including
+ * resolving the entities to their display name when required.
+ *
+ * Version 2 uses the component library, has different styling of entities, and only supports single selection.
+ */
+export const EntitySearchInputV2 = ({ entityTypes, placeholder, searchPlaceholder, orFilters, onUpdate }: Props) => {
+    // Suggestions when user hasn't provided a search query
+    const { data: searchResults } = useGetSearchResultsForMultipleQuery({
+        variables: {
+            input: {
+                types: entityTypes,
+                query: '*',
+                start: 0,
+                count: 10,
+                orFilters,
+                searchFlags: { skipCache: true }, // To support chain linking
+            },
+        },
+    });
+
+    const [autoComplete, { data: autoCompleteResults }] = useGetAutoCompleteMultipleResultsLazyQuery();
+
+    const emptySuggestions = searchResults?.searchAcrossEntities?.searchResults?.map((result) => ({
+        value: result.entity.urn,
+        data: result.entity,
+    }));
+    const autoCompleteSuggestions = autoCompleteResults?.autoCompleteForMultiple?.suggestions
+        .flatMap((suggestion) => suggestion.entities)
+        .map((entity) => ({ value: entity.urn, data: entity }));
+
+    const [searchQuery, setSearchQuery] = useState<string>('');
+    useDebounce(
+        () => {
+            if (searchQuery) {
+                autoComplete({
+                    variables: {
+                        input: {
+                            types: entityTypes,
+                            query: searchQuery,
+                            limit: 10,
+                            orFilters,
+                        },
+                    },
+                });
+            }
+        },
+        100,
+        [searchQuery],
+    );
+
+    return (
+        <AutoCompleteSelect<Entity>
+            emptySuggestions={emptySuggestions}
+            autoCompleteSuggestions={autoCompleteSuggestions}
+            render={(entity) => <EntitySearchInputResultV2 entity={entity} />}
+            placeholder={placeholder}
+            searchPlaceholder={searchPlaceholder || 'Search for entities...'}
+            onSearch={setSearchQuery}
+            onUpdate={onUpdate}
+            width="full"
+            data-testid="entity-search-input-v2"
+        />
+    );
+};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/EntityProfile.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/EntityProfile.tsx
index 74d6accd09a732..9fec70c8092d86 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/EntityProfile.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/EntityProfile.tsx
@@ -1,3 +1,4 @@
+import VersionsDrawer from '@app/entityV2/shared/versioning/VersionsDrawer';
 import LineageGraph from '@app/lineageV2/LineageGraph';
 import React, { useCallback, useContext, useState } from 'react';
 import { Alert } from 'antd';
@@ -44,7 +45,12 @@ import EntitySidebarContext from '../../../../sharedV2/EntitySidebarContext';
 import TabFullsizeContext from '../../../../shared/TabFullsizedContext';
 import { useUpdateDomainEntityDataOnChange as useUpdateDomainEntityDataOnChangeV2 } from '../../../../domainV2/utils';
 import { EntityContext } from '../../../../entity/shared/EntityContext';
-import { EntitySubHeaderSection, GenericEntityProperties, GenericEntityUpdate } from '../../../../entity/shared/types';
+import {
+    DrawerType,
+    EntitySubHeaderSection,
+    GenericEntityProperties,
+    GenericEntityUpdate,
+} from '../../../../entity/shared/types';
 import { EntitySidebarSection, EntitySidebarTab, EntityTab, TabContextType, TabRenderType } from '../../types';
 
 type Props<T, U> = {
@@ -209,6 +215,7 @@ export const EntityProfile = <T, U>({
     const [showAlert, setShowAlert] = useState(true);
     const entityState = useEntityState();
     const isShowNavBarRedesign = useShowNavBarRedesign();
+    const [drawer, setDrawer] = useState<DrawerType | undefined>(undefined);
 
     const { width } = React.useContext(EntitySidebarContext);
     const isCompact = React.useContext(CompactContext);
@@ -347,6 +354,7 @@ export const EntityProfile = <T, U>({
                 shouldRefetchEmbeddedListSearch,
                 setShouldRefetchEmbeddedListSearch,
                 entityState,
+                setDrawer,
             }}
         >
             {entityData?.status?.removed && (
@@ -417,6 +425,12 @@ export const EntityProfile = <T, U>({
                     </ContentContainer>
                 )}
             </Wrapper>
+            {!!entityData?.versionProperties?.versionSet && (
+                <VersionsDrawer
+                    versionSetUrn={entityData.versionProperties?.versionSet.urn}
+                    open={drawer === DrawerType.VERSIONS}
+                />
+            )}
         </EntityContext.Provider>
     );
 };
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx
index 1569b047429775..6860921b3f9ef9 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx
@@ -1,3 +1,4 @@
+import VersioningBadge from '@app/entityV2/shared/versioning/VersioningBadge';
 import { Divider } from 'antd';
 import React, { useState } from 'react';
 import styled from 'styled-components/macro';
@@ -223,6 +224,10 @@ export const DefaultEntityHeader = ({
                                         <StructuredPropertyBadge
                                             structuredProperties={entityData?.structuredProperties}
                                         />
+                                        <VersioningBadge
+                                            versionProperties={entityData?.versionProperties ?? undefined}
+                                            showPopover
+                                        />
                                     </TitleRow>
                                     <HeaderRow>
                                         <ContextPath
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge.tsx
index 956b8688d3893e..53b6ea4166ef0f 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge.tsx
@@ -79,12 +79,7 @@ const StructuredPropertyBadge = ({ structuredProperties }: Props) => {
             overlayInnerStyle={{ width: 250, padding: 16 }}
         >
             <BadgeContainer>
-                <Pill
-                    label={propRow?.values[0]?.value?.toString() || ''}
-                    size="sm"
-                    colorScheme="violet"
-                    clickable={false}
-                />
+                <Pill label={propRow?.values[0]?.value?.toString() || ''} size="sm" color="violet" clickable={false} />
             </BadgeContainer>
         </StyledTooltip>
     );
diff --git a/datahub-web-react/src/app/entityV2/shared/versioning/VersioningBadge.tsx b/datahub-web-react/src/app/entityV2/shared/versioning/VersioningBadge.tsx
new file mode 100644
index 00000000000000..b08d65ae8f151d
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/versioning/VersioningBadge.tsx
@@ -0,0 +1,29 @@
+import { VersionPill } from '@app/entityV2/shared/versioning/common';
+import VersionsPreview from '@app/entityV2/shared/versioning/VersionsPreview';
+import { Popover } from '@components';
+import { Space } from 'antd';
+import React from 'react';
+import { VersionProperties } from '@types';
+
+interface Props {
+    versionProperties?: VersionProperties;
+    showPopover: boolean;
+}
+
+export default function VersioningBadge({ showPopover, versionProperties }: Props) {
+    if (!versionProperties?.version.versionTag) {
+        return null;
+    }
+
+    return (
+        <Popover content={showPopover && <VersionsPreview versionSet={versionProperties.versionSet ?? undefined} />}>
+            <Space>
+                <VersionPill
+                    label={versionProperties?.version.versionTag}
+                    isLatest={versionProperties.isLatest}
+                    clickable
+                />
+            </Space>
+        </Popover>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/versioning/VersionsDrawer.tsx b/datahub-web-react/src/app/entityV2/shared/versioning/VersionsDrawer.tsx
new file mode 100644
index 00000000000000..6662aec3d700bc
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/versioning/VersionsDrawer.tsx
@@ -0,0 +1,225 @@
+import { CloseOutlined } from '@ant-design/icons';
+import { useEntityContext } from '@app/entity/shared/EntityContext';
+import { VersionPill } from '@app/entityV2/shared/versioning/common';
+import { SimpleCopyLinkMenuItem } from '@app/shared/share/v2/items/CopyLinkMenuItem';
+import { useEntityRegistry } from '@app/useEntityRegistry';
+import { colors, Icon, Input, Table, Text } from '@components';
+import { Tooltip2 } from '@components/components/Tooltip2';
+import { useSearchAcrossVersionsQuery } from '@graphql/versioning.generated';
+import LinkOut from '@images/link-out.svg?react';
+import { FilterOperator } from '@types';
+import { Drawer, Dropdown, Pagination, Typography } from 'antd';
+import { ItemType } from 'antd/es/menu/hooks/useItems';
+import moment from 'moment';
+import React, { useState } from 'react';
+import { Link } from 'react-router-dom';
+import { useDebounce } from 'react-use';
+import styled from 'styled-components';
+
+const PAGE_SIZE = 10;
+
+const COLUMNS = [
+    {
+        title: 'Name',
+        dataIndex: 'label',
+        key: 'name',
+    },
+    {
+        title: 'Note',
+        dataIndex: 'comment',
+        key: 'notes',
+        width: '200px',
+    },
+    {
+        title: 'Created',
+        dataIndex: 'createdAt',
+        key: 'created',
+    },
+    {
+        title: '',
+        dataIndex: 'menu',
+        key: 'menu',
+    },
+];
+
+const LinkOutIcon = styled(LinkOut)`
+    width: 14px;
+    height: 14px;
+`;
+
+const Contents = styled.div`
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 18px;
+`;
+
+const Title = styled(Text)`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+`;
+
+const CloseIcon = styled.div`
+    color: ${colors.gray[1800]};
+    cursor: pointer;
+`;
+
+const MenuIcon = styled(Icon)`
+    border-radius: 200px;
+    border: ${colors.gray[100]} 1px solid;
+    cursor: pointer;
+    transition: border 0.3s ease;
+
+    svg {
+        padding: 2px; // To match 3 dot icon in EntityDropdown
+    }
+
+    :hover {
+        border: ${colors.violet[500]} 1px solid;
+    }
+`;
+
+const MenuItemText = styled(Text)`
+    display: flex;
+    align-items: center;
+    gap: 12px;
+`;
+
+const StyledDropdown = styled(Dropdown)`
+    border-radius: 100px;
+`;
+
+interface Props {
+    versionSetUrn: string;
+    open: boolean;
+}
+
+export default function VersionsDrawer({ versionSetUrn, open }: Props) {
+    const entityRegistry = useEntityRegistry();
+    const { setDrawer } = useEntityContext();
+
+    const [searchInput, setSearchInput] = useState<string>('');
+    const [query, setQuery] = useState<string>('');
+    const [page, setPage] = useState<number>(1);
+
+    useDebounce(() => setQuery(searchInput), 200, [searchInput]);
+
+    const { data } = useSearchAcrossVersionsQuery({
+        skip: !open,
+        variables: {
+            versionSetUrn,
+            input: {
+                query: '*',
+                count: PAGE_SIZE,
+                start: (page - 1) * PAGE_SIZE,
+                orFilters: [
+                    {
+                        and: [
+                            {
+                                field: 'version',
+                                condition: FilterOperator.Contain,
+                                values: [query],
+                            }, // { field: 'sourceCreatedTimestamp', condition: FilterOperator.Between, values: query },
+                        ],
+                    },
+                ],
+            },
+        },
+    });
+
+    const tableData = data?.versionSet?.versionsSearch?.searchResults?.map((version) => {
+        const { urn, type } = version.entity;
+        const versionProperties = entityRegistry.getGenericEntityProperties(type, version.entity)?.versionProperties;
+        const items: ItemType[] = [
+            {
+                key: 'COPY',
+                label: <SimpleCopyLinkMenuItem urn={urn} entityType={type} text="Copy Version Link" />,
+            },
+            {
+                key: 'OPEN',
+                label: (
+                    <Link to={entityRegistry.getEntityUrl(type, urn)} onClick={() => setDrawer?.(undefined)}>
+                        <MenuItemText>
+                            <LinkOutIcon />
+                            Open
+                        </MenuItemText>
+                    </Link>
+                ),
+            },
+        ];
+
+        return {
+            urn,
+            label: (
+                <VersionPill
+                    label={versionProperties?.version.versionTag || '<unlabeled>'}
+                    isLatest={versionProperties?.isLatest}
+                />
+            ),
+            comment: <Typography.Text ellipsis={{ tooltip: true }}>{versionProperties?.comment}</Typography.Text>,
+            createdAt: (
+                <Tooltip2
+                    width={250}
+                    placement="topRight"
+                    sections={[
+                        {
+                            title: 'Created in Source',
+                            content: moment(versionProperties?.createdInSource?.time).format('MMMM D, YYYY h:mm A'),
+                        },
+                        {
+                            title: 'Synced to DataHub',
+                            content: moment(versionProperties?.created?.time).format('MMMM D, YYYY h:mm A'),
+                        },
+                    ]}
+                >
+                    {moment(versionProperties?.created?.time).fromNow()}
+                </Tooltip2>
+            ),
+            menu: (
+                <StyledDropdown
+                    menu={{ items, style: { borderRadius: '12px', boxShadow: '0px 0px 14px 0px rgba(0, 0, 0, 0.15)' } }}
+                    trigger={['click']}
+                    overlayStyle={{ borderRadius: '100px' }}
+                >
+                    <MenuIcon icon="MoreVert" variant="outline" size="2xl" color="gray" />
+                </StyledDropdown>
+            ),
+        };
+    });
+
+    return (
+        <Drawer
+            title={
+                <Title size="xl" color="gray" colorLevel={600} weight="semiBold">
+                    Versions
+                    <CloseIcon onClick={() => setDrawer?.(undefined)}>
+                        <CloseOutlined />
+                    </CloseIcon>
+                </Title>
+            }
+            open={open}
+            width="542px"
+            onClose={() => setDrawer?.(undefined)}
+            closable={false}
+        >
+            <Contents>
+                <Input
+                    label=""
+                    placeholder="Search versions by name..."
+                    icon={{ name: 'MagnifyingGlass', source: 'phosphor' }}
+                    value={searchInput}
+                    setValue={setSearchInput}
+                />
+                <Table data={tableData || []} columns={COLUMNS} />
+                <Pagination
+                    pageSize={PAGE_SIZE}
+                    current={page}
+                    onChange={setPage}
+                    total={data?.versionSet?.versionsSearch?.total}
+                    hideOnSinglePage
+                />
+            </Contents>
+        </Drawer>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/versioning/VersionsPreview.tsx b/datahub-web-react/src/app/entityV2/shared/versioning/VersionsPreview.tsx
new file mode 100644
index 00000000000000..4a509e7d266fd5
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/versioning/VersionsPreview.tsx
@@ -0,0 +1,153 @@
+import analytics, { EventType } from '@app/analytics';
+import { useEntityContext, useEntityData } from '@app/entity/shared/EntityContext';
+import { DrawerType } from '@app/entity/shared/types';
+import { VersionPill } from '@app/entityV2/shared/versioning/common';
+import { useEntityRegistry } from '@app/useEntityRegistry';
+import { colors, Pill, Text } from '@components';
+import { Entity, VersionSet } from '@types';
+import React from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+
+const Wrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+
+    min-width: 200px;
+`;
+
+const Header = styled(Text)`
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    gap: 6px;
+    margin-bottom: 8px;
+
+    color: ${colors.gray[600]};
+    font-size: 14px;
+    line-height: 1.2;
+`;
+
+const VersionsCount = styled(Pill)`
+    line-height: 1.2;
+`;
+
+const VersionsWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+`;
+
+const Footer = styled.div`
+    display: flex;
+    justify-content: end;
+    padding: 4px 0;
+`;
+
+const ShowAllButton = styled(Text)`
+    cursor: pointer;
+`;
+
+interface Props {
+    versionSet?: VersionSet;
+}
+
+export default function VersionsPreview({ versionSet }: Props) {
+    const { urn, entityType, setDrawer } = useEntityContext();
+
+    const count = versionSet?.versionsSearch?.count;
+    const total = versionSet?.versionsSearch?.total;
+    return (
+        <Wrapper>
+            <Header size="xl" type="div">
+                <Text weight="semiBold">Versions</Text>
+                {!!total && <VersionsCount label={total.toString()} size="sm" clickable={false} />}
+            </Header>
+            <VersionsWrapper>
+                {versionSet?.versionsSearch?.searchResults.map((result) => (
+                    <VersionPreviewRow entity={result.entity} />
+                ))}
+            </VersionsWrapper>
+            {!!count && !!total && total > count && setDrawer && (
+                <Footer>
+                    <ShowAllButton
+                        size="md"
+                        color="gray"
+                        weight="bold"
+                        onClick={() => {
+                            analytics.event({
+                                type: EventType.ShowAllVersionsEvent,
+                                assetUrn: urn,
+                                versionSetUrn: versionSet?.urn,
+                                entityType,
+                                numVersions: total,
+                                uiLocation: 'preview',
+                            });
+                            setDrawer(DrawerType.VERSIONS);
+                        }}
+                    >
+                        View all
+                    </ShowAllButton>
+                </Footer>
+            )}
+        </Wrapper>
+    );
+}
+
+const VersionPreviewEntry = styled.div<{ isViewing: boolean }>`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 8px;
+    padding: 8px;
+
+    ${({ isViewing }) =>
+        isViewing &&
+        'background: linear-gradient(180deg, rgba(83, 63, 209, 0.04) -3.99%, rgba(112, 94, 228, 0.04) 53.04%, rgba(112, 94, 228, 0.04) 100%)'};
+`;
+
+const VersionPreviewHeader = styled.span`
+    display: flex;
+    align-items: center;
+    gap: 8px;
+`;
+
+interface VersionPreviewRowProps {
+    entity: Entity;
+}
+
+function VersionPreviewRow({ entity }: VersionPreviewRowProps) {
+    const entityRegistry = useEntityRegistry();
+    const { urn: entityProfileUrn } = useEntityData();
+
+    const versionProperties = entityRegistry.getGenericEntityProperties(entity.type, entity)?.versionProperties;
+
+    const isViewing = entity.urn === entityProfileUrn;
+    return (
+        <VersionPreviewEntry isViewing={isViewing}>
+            <VersionPreviewHeader>
+                <VersionPill
+                    label={versionProperties?.version.versionTag ?? '<unlabeled>'}
+                    isLatest={versionProperties?.isLatest}
+                />
+                {!!versionProperties?.isLatest && (
+                    <Text size="md" color="gray">
+                        Latest
+                    </Text>
+                )}
+            </VersionPreviewHeader>
+            {isViewing && (
+                <Text size="md" color="gray" colorLevel={1800} weight="semiBold">
+                    Viewing
+                </Text>
+            )}
+            {!isViewing && (
+                <Link to={entityRegistry.getEntityUrl(entity.type, entity.urn)}>
+                    <Text size="md" color="violet" weight="semiBold">
+                        View
+                    </Text>
+                </Link>
+            )}
+        </VersionPreviewEntry>
+    );
+}
diff --git a/datahub-web-react/src/app/entityV2/shared/versioning/common.tsx b/datahub-web-react/src/app/entityV2/shared/versioning/common.tsx
new file mode 100644
index 00000000000000..379dc3a58da9ac
--- /dev/null
+++ b/datahub-web-react/src/app/entityV2/shared/versioning/common.tsx
@@ -0,0 +1,17 @@
+import { Pill } from '@components';
+import { PillProps } from '@components/components/Pills/types';
+import React from 'react';
+import styled from 'styled-components';
+
+const StyledPill = styled(Pill)`
+    font-weight: 600;
+    line-height: 1.4;
+`;
+
+interface Props {
+    isLatest?: boolean;
+}
+
+export function VersionPill(props: Props & PillProps) {
+    return <StyledPill variant="version" clickable={false} color={props.isLatest ? 'white' : undefined} {...props} />;
+}
diff --git a/datahub-web-react/src/app/govern/structuredProperties/DisplayPreferences.tsx b/datahub-web-react/src/app/govern/structuredProperties/DisplayPreferences.tsx
index 95823de0f27c40..6ed3703453b60a 100644
--- a/datahub-web-react/src/app/govern/structuredProperties/DisplayPreferences.tsx
+++ b/datahub-web-react/src/app/govern/structuredProperties/DisplayPreferences.tsx
@@ -146,14 +146,11 @@ const DisplayPreferences = ({
                     modalText={
                         <p>
                             <span>Another property </span>
-                            <Pill
-                                label={getDisplayName(badgeProperty)}
-                                size="sm"
-                                colorScheme="violet"
-                                clickable={false}
-                            />
+                            <Pill label={getDisplayName(badgeProperty)} size="sm" color="violet" clickable={false} />
                             &nbsp;is already being shown on asset previews, but only one property is allowed at a time.
-                            Do you want to replace the current property? This will hide {getDisplayName(badgeProperty)}{' '}
+                            Do you want to replace the current property? This will hide {getDisplayName(
+                                badgeProperty,
+                            )}{' '}
                             on all asset previews.
                         </p>
                     }
diff --git a/datahub-web-react/src/app/homeV2/layout/CustomNavLink.tsx b/datahub-web-react/src/app/homeV2/layout/CustomNavLink.tsx
index 361b59bf693129..c96c85e0dd6788 100644
--- a/datahub-web-react/src/app/homeV2/layout/CustomNavLink.tsx
+++ b/datahub-web-react/src/app/homeV2/layout/CustomNavLink.tsx
@@ -78,7 +78,7 @@ const CustomNavLink: React.FC<Props> = ({
                 <LinkTitle>{title}</LinkTitle>
                 {showNewTag && (
                     <PillWrapper>
-                        <Pill label="New" size="xs" clickable={false} colorScheme="blue" />
+                        <Pill label="New" size="xs" clickable={false} color="blue" />
                     </PillWrapper>
                 )}
             </TitleWrapper>
diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItem.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItem.tsx
index 5e73f75de4b418..df58351e36b6e0 100644
--- a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItem.tsx
+++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarMenuItem.tsx
@@ -132,7 +132,7 @@ export default function NavBarMenuItem({ item, isCollapsed, isSelected, iconSize
                         <StyledText size="md" type="div" weight="semiBold" $isSelected={isSelected}>
                             {item.title}
                         </StyledText>
-                        {item?.badge?.show && <Badge count={item.badge.count} clickable={false} colorScheme="violet" />}
+                        {item?.badge?.show && <Badge count={item.badge.count} clickable={false} color="violet" />}
                     </ItemTitleContentWrapper>
                 )}
             </StyledMenuItem>
diff --git a/datahub-web-react/src/app/preview/DataProcessInstanceRightColumn.tsx b/datahub-web-react/src/app/preview/DataProcessInstanceRightColumn.tsx
index 015761f247dd77..ba4990836c8f41 100644
--- a/datahub-web-react/src/app/preview/DataProcessInstanceRightColumn.tsx
+++ b/datahub-web-react/src/app/preview/DataProcessInstanceRightColumn.tsx
@@ -78,7 +78,7 @@ export default function DataProcessInstanceRightColumn({ startTime, duration, st
             {status && (
                 <>
                     <StatContainer>
-                        <Pill label={capitalize(status)} colorScheme={statusPillColor} clickable={false} />
+                        <Pill label={capitalize(status)} color={statusPillColor} clickable={false} />
                     </StatContainer>
                 </>
             )}
diff --git a/datahub-web-react/src/app/previewV2/BrowsePaths.tsx b/datahub-web-react/src/app/previewV2/BrowsePaths.tsx
index 81de58c403d77f..32ce1cb7806643 100644
--- a/datahub-web-react/src/app/previewV2/BrowsePaths.tsx
+++ b/datahub-web-react/src/app/previewV2/BrowsePaths.tsx
@@ -64,17 +64,25 @@ interface Props {
     browsePaths?: Maybe<BrowsePathV2> | undefined;
     contentRef: React.RefObject<HTMLDivElement>;
     isContentTruncated: boolean;
+    linksDisabled?: boolean;
 }
 
-const BrowsePathSection = ({ path }: { path: BrowsePathEntry }) => {
+const BrowsePathSection = ({ path, linksDisabled }: { path: BrowsePathEntry } & Pick<Props, 'linksDisabled'>) => {
     if (!path.entity) {
         return <PlatFormTitle>{path.name}</PlatFormTitle>;
     }
-    return <ContextPathEntityLink key={path?.entity?.urn} entity={path?.entity} style={{ fontSize: '12px' }} />;
+    return (
+        <ContextPathEntityLink
+            key={path?.entity?.urn}
+            entity={path?.entity}
+            style={{ fontSize: '12px' }}
+            linkDisabled={linksDisabled}
+        />
+    );
 };
 
 function BrowsePaths(props: Props) {
-    const { previewType, browsePaths, contentRef, isContentTruncated } = props;
+    const { previewType, browsePaths, contentRef, isContentTruncated, linksDisabled } = props;
 
     const parentPath = browsePaths?.path?.[0];
     const remainingParentPaths = browsePaths?.path && browsePaths.path.slice(1, browsePaths.path.length);
@@ -91,7 +99,7 @@ function BrowsePaths(props: Props) {
                 <ParentNodesWrapper ref={contentRef}>
                     {parentPath && (
                         <PlatformText>
-                            <BrowsePathSection path={parentPath} />
+                            <BrowsePathSection path={parentPath} linksDisabled={linksDisabled} />
                             {remainingParentPaths && remainingParentPaths?.length > 0 && <ContextPathSeparator />}
                         </PlatformText>
                     )}
@@ -99,7 +107,7 @@ function BrowsePaths(props: Props) {
                         remainingParentPaths.map((container, index) => {
                             return (
                                 <PlatformText>
-                                    <BrowsePathSection path={container} />
+                                    <BrowsePathSection path={container} linksDisabled={linksDisabled} />
                                     {index < remainingParentPaths.length - 1 && <ContextPathSeparator />}
                                 </PlatformText>
                             );
diff --git a/datahub-web-react/src/app/previewV2/ContextPath.tsx b/datahub-web-react/src/app/previewV2/ContextPath.tsx
index 65c31a0100c315..b957ee50b3a746 100644
--- a/datahub-web-react/src/app/previewV2/ContextPath.tsx
+++ b/datahub-web-react/src/app/previewV2/ContextPath.tsx
@@ -94,6 +94,7 @@ interface Props {
     browsePaths?: Maybe<BrowsePathV2> | undefined;
     contentRef: React.RefObject<HTMLDivElement>;
     isContentTruncated?: boolean;
+    linksDisabled?: boolean;
 }
 
 function ContextPath(props: Props) {
@@ -108,6 +109,7 @@ function ContextPath(props: Props) {
         isCompactView,
         contentRef,
         isContentTruncated = false,
+        linksDisabled,
     } = props;
 
     const entityRegistry = useEntityRegistryV2();
@@ -146,9 +148,10 @@ function ContextPath(props: Props) {
                     previewType={previewType}
                     contentRef={contentRef}
                     isContentTruncated={isContentTruncated}
+                    linksDisabled={linksDisabled}
                 />
             ) : (
-                <ParentEntities parentEntities={parentEntities || []} numVisible={3} />
+                <ParentEntities parentEntities={parentEntities || []} numVisible={3} linksDisabled={linksDisabled} />
             )}
         </PlatformContentWrapper>
     );
diff --git a/datahub-web-react/src/app/previewV2/ContextPathEntityLink.tsx b/datahub-web-react/src/app/previewV2/ContextPathEntityLink.tsx
index 3dce233504dfba..14f3498d26dba6 100644
--- a/datahub-web-react/src/app/previewV2/ContextPathEntityLink.tsx
+++ b/datahub-web-react/src/app/previewV2/ContextPathEntityLink.tsx
@@ -28,7 +28,7 @@ const ContainerText = styled.span`
     max-width: 150px; // TODO: Remove in favor of smart truncation
 `;
 
-const StyledLink = styled(Link)`
+const StyledLink = styled(Link)<{ $disabled?: boolean }>`
     white-space: nowrap;
     border-radius: 4px;
     overflow: hidden;
@@ -44,21 +44,22 @@ const StyledLink = styled(Link)`
     }
 
     :hover {
-        color: ${colors.violet[500]};
+        color: ${({ $disabled }) => ($disabled ? REDESIGN_COLORS.LINK_GREY : colors.violet[500])};
 
         && svg {
-            color: ${colors.violet[500]};
+            color: ${({ $disabled }) => ($disabled ? REDESIGN_COLORS.LINK_GREY : colors.violet[500])};
         }
     }
 `;
 
 interface Props {
     entity: Maybe<Entity>;
+    linkDisabled?: boolean;
     style?: React.CSSProperties;
 }
 
 function ContextPathEntityLink(props: Props) {
-    const { entity, style } = props;
+    const { entity, linkDisabled, style } = props;
     const entityRegistry = useEntityRegistry();
     const linkProps = useEmbeddedProfileLinkProps();
 
@@ -69,7 +70,12 @@ function ContextPathEntityLink(props: Props) {
 
     return (
         <Path style={style}>
-            <StyledLink to={containerUrl} data-testid="container" {...linkProps}>
+            <StyledLink
+                to={linkDisabled ? null : containerUrl}
+                data-testid="container"
+                $disabled={linkDisabled}
+                {...linkProps}
+            >
                 <ContextPathEntityIcon entity={entity} />
                 <ContainerText title={containerName}>{containerName}</ContainerText>
             </StyledLink>
diff --git a/datahub-web-react/src/app/previewV2/EntityHeader.tsx b/datahub-web-react/src/app/previewV2/EntityHeader.tsx
index 9ebf30732b9d7b..f4ab41eb79a666 100644
--- a/datahub-web-react/src/app/previewV2/EntityHeader.tsx
+++ b/datahub-web-react/src/app/previewV2/EntityHeader.tsx
@@ -1,3 +1,4 @@
+import VersioningBadge from '@app/entityV2/shared/versioning/VersioningBadge';
 import React from 'react';
 import { Link } from 'react-router-dom';
 import { Tooltip } from '@components';
@@ -119,6 +120,7 @@ const EntityHeader: React.FC<EntityHeaderProps> = ({
             )}
             {health && <HealthIcon urn={urn} health={health} baseUrl={url} />}
             <StructuredPropertyBadge structuredProperties={previewData?.structuredProperties} />
+            <VersioningBadge versionProperties={previewData?.versionProperties ?? undefined} showPopover={false} />
         </EntityTitleContainer>
     );
 };
diff --git a/datahub-web-react/src/app/searchV2/filters/ParentEntities.tsx b/datahub-web-react/src/app/searchV2/filters/ParentEntities.tsx
index 1803ca044c874e..b7b0530da50fa1 100644
--- a/datahub-web-react/src/app/searchV2/filters/ParentEntities.tsx
+++ b/datahub-web-react/src/app/searchV2/filters/ParentEntities.tsx
@@ -28,9 +28,10 @@ const DEFAULT_NUM_VISIBLE = 2;
 interface Props {
     parentEntities: Entity[];
     numVisible?: number;
+    linksDisabled?: boolean; // don't allow links to parent entities
 }
 
-export default function ParentEntities({ parentEntities, numVisible = DEFAULT_NUM_VISIBLE }: Props) {
+export default function ParentEntities({ parentEntities, numVisible = DEFAULT_NUM_VISIBLE, linksDisabled }: Props) {
     const entityRegistry = useEntityRegistry();
 
     // parent nodes/domains are returned with direct parent first
@@ -72,6 +73,7 @@ export default function ParentEntities({ parentEntities, numVisible = DEFAULT_NU
                             <ContextPathEntityLink
                                 key={parentEntity.urn}
                                 entity={parentEntity}
+                                linkDisabled={linksDisabled}
                                 style={{ fontSize: '12px' }}
                             />
                             {index !== visibleNodes.length - 1 && <ContextPathSeparator />}
diff --git a/datahub-web-react/src/app/shared/share/v2/items/CopyLinkMenuItem.tsx b/datahub-web-react/src/app/shared/share/v2/items/CopyLinkMenuItem.tsx
index 5e4088ab8a09fd..ec1646c9a5432e 100644
--- a/datahub-web-react/src/app/shared/share/v2/items/CopyLinkMenuItem.tsx
+++ b/datahub-web-react/src/app/shared/share/v2/items/CopyLinkMenuItem.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import styled from 'styled-components/macro';
 import { CheckOutlined, LinkOutlined } from '@ant-design/icons';
-import { Tooltip } from '@components';
+import { Text, Tooltip } from '@components';
 import { StyledMenuItem } from '../styledComponents';
 import { EntityType } from '../../../../../types.generated';
 import { useEntityRegistryV2 } from '../../../../useEntityRegistry';
@@ -49,3 +49,34 @@ export default function CopyLinkMenuItem({ key, urn, entityType }: CopyLinkMenuI
         </StyledMenuItem>
     );
 }
+
+const SimpleMenuItem = styled(Text)`
+    display: flex;
+    align-items: center;
+    gap: 12px;
+`;
+
+export function SimpleCopyLinkMenuItem({
+    urn,
+    entityType,
+    text,
+}: Pick<CopyLinkMenuItemProps, 'urn' | 'entityType'> & { text: string }) {
+    const { origin } = window.location;
+    const entityRegistry = useEntityRegistryV2();
+
+    const [isClicked, setIsClicked] = useState(false);
+
+    const copyUrl = `${origin}${entityRegistry.getEntityUrl(entityType, urn)}/`;
+
+    return (
+        <SimpleMenuItem
+            onClick={() => {
+                navigator.clipboard.writeText(copyUrl);
+                setIsClicked(true);
+            }}
+        >
+            {isClicked ? <CheckOutlined /> : <StyledLinkOutlined />}
+            {text}
+        </SimpleMenuItem>
+    );
+}
diff --git a/datahub-web-react/src/app/shared/subscribe/drawer/utils.tsx b/datahub-web-react/src/app/shared/subscribe/drawer/utils.tsx
deleted file mode 100644
index 907f41ff7682c2..00000000000000
--- a/datahub-web-react/src/app/shared/subscribe/drawer/utils.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import _ from 'lodash';
-
-/**
- * Remove the GraphQL __typename fields from any object
- * @param obj
- * @returns {T}
- */
-export function removeNestedTypeNames<T>(obj: T): T {
-    // Check if the argument is an object and not null
-    if (typeof obj !== 'object' || obj === null) return obj;
-    // Shallow clone object so we're not modifying it directly
-    // NOTE: the recursive call below will effectively do a deep clone where necessary
-    const clonedObj = _.clone(obj as object);
-
-    // Iterate over object properties
-    Object.keys(clonedObj).forEach((prop) => {
-        if (prop === '__typename') {
-            // Remove __typename property
-            delete clonedObj[prop];
-        } else if (typeof clonedObj[prop] === 'object' && clonedObj[prop] !== null) {
-            // Recurse for nested objects and arrays
-            clonedObj[prop] = removeNestedTypeNames(clonedObj[prop]);
-        }
-    });
-    return clonedObj as T;
-}
-
-export function cleanAssertionDescription(builderStateData) {
-    const newBuilderStateData = { ...builderStateData };
-    // Create a shallow copy of the assertion to avoid modifying the original object
-    const assertion = { ...newBuilderStateData.assertion };
-    // Description support not added in backend for testAssertion api, so deleting it here won't reflect in the original assertion
-    delete assertion.description;
-    newBuilderStateData.assertion = assertion;
-    const { type } = assertion;
-    return { newBuilderStateData, type };
-}
diff --git a/datahub-web-react/src/conf/theme/global-overrides-v2.less b/datahub-web-react/src/conf/theme/global-overrides-v2.less
index 13cbf4814456ef..b4eadfca71dcd7 100644
--- a/datahub-web-react/src/conf/theme/global-overrides-v2.less
+++ b/datahub-web-react/src/conf/theme/global-overrides-v2.less
@@ -49,3 +49,7 @@
         color: #5abde1;
     }
 }
+
+.sectioned-tooltip .ant-popover-inner-content {
+    padding: 0;
+}
diff --git a/entity-registry/src/testFixtures/java/com/linkedin/test/metadata/aspect/TestEntityRegistry.java b/entity-registry/src/testFixtures/java/com/linkedin/test/metadata/aspect/TestEntityRegistry.java
index cad3b8c730e4bd..497776e5d04d9c 100644
--- a/entity-registry/src/testFixtures/java/com/linkedin/test/metadata/aspect/TestEntityRegistry.java
+++ b/entity-registry/src/testFixtures/java/com/linkedin/test/metadata/aspect/TestEntityRegistry.java
@@ -1,9 +1,16 @@
 package com.linkedin.test.metadata.aspect;
 
+import static com.linkedin.metadata.Constants.VERSION_PROPERTIES_ASPECT_NAME;
+
 import com.linkedin.data.schema.annotation.PathSpecBasedSchemaAnnotationVisitor;
 import com.linkedin.data.template.RecordTemplate;
+import com.linkedin.metadata.aspect.patch.template.AspectTemplateEngine;
+import com.linkedin.metadata.aspect.patch.template.Template;
+import com.linkedin.metadata.aspect.patch.template.common.VersionPropertiesTemplate;
 import com.linkedin.metadata.models.registry.ConfigEntityRegistry;
+import java.util.HashMap;
 import java.util.Map;
+import javax.annotation.Nonnull;
 
 public class TestEntityRegistry extends ConfigEntityRegistry {
 
@@ -28,4 +35,12 @@ public static <T extends RecordTemplate> String getAspectName(T aspect) {
 
     throw new IllegalStateException("Cannot determine aspect name");
   }
+
+  @Nonnull
+  @Override
+  public AspectTemplateEngine getAspectTemplateEngine() {
+    Map<String, Template<? extends RecordTemplate>> aspectTemplateMap = new HashMap<>();
+    aspectTemplateMap.put(VERSION_PROPERTIES_ASPECT_NAME, new VersionPropertiesTemplate());
+    return new AspectTemplateEngine(aspectTemplateMap);
+  }
 }
diff --git a/li-utils/src/main/java/com/linkedin/metadata/Constants.java b/li-utils/src/main/java/com/linkedin/metadata/Constants.java
index 80012bc24724cb..ee2f10be75457b 100644
--- a/li-utils/src/main/java/com/linkedin/metadata/Constants.java
+++ b/li-utils/src/main/java/com/linkedin/metadata/Constants.java
@@ -481,6 +481,8 @@ public class Constants {
   public static final String INITIAL_VERSION_SORT_ID = "AAAAAAAA";
   public static final String VERSION_SORT_ID_FIELD_NAME = "versionSortId";
   public static final String IS_LATEST_FIELD_NAME = "isLatest";
+  public static final String VERSION_SET_FIELD_NAME = "versionSet";
+  public static final String VERSION_LABEL_FIELD_NAME = "version";
 
   public static final String DISPLAY_PROPERTIES_ASPECT_NAME = "displayProperties";
 
diff --git a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/client/dagster_generator.py b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/client/dagster_generator.py
index 033d3967145017..666895e6d5e090 100644
--- a/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/client/dagster_generator.py
+++ b/metadata-ingestion-modules/dagster-plugin/src/datahub_dagster_plugin/client/dagster_generator.py
@@ -41,19 +41,6 @@
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.api.workunit import MetadataWorkUnit
 from datahub.ingestion.graph.client import DatahubClientConfig, DataHubGraph
-from datahub.metadata._schema_classes import (
-    AuditStampClass,
-    BrowsePathEntryClass,
-    BrowsePathsV2Class,
-    GlobalTagsClass,
-    QueryLanguageClass,
-    QueryPropertiesClass,
-    QuerySourceClass,
-    QueryStatementClass,
-    QuerySubjectClass,
-    QuerySubjectsClass,
-    TagAssociationClass,
-)
 from datahub.metadata.com.linkedin.pegasus2avro.schema import (
     ArrayType,
     BooleanType,
@@ -70,10 +57,21 @@
     TimeType,
 )
 from datahub.metadata.schema_classes import (
+    AuditStampClass,
+    BrowsePathEntryClass,
+    BrowsePathsV2Class,
     DataPlatformInstanceClass,
     DatasetKeyClass,
     DatasetLineageTypeClass,
+    GlobalTagsClass,
+    QueryLanguageClass,
+    QueryPropertiesClass,
+    QuerySourceClass,
+    QueryStatementClass,
+    QuerySubjectClass,
+    QuerySubjectsClass,
     SubTypesClass,
+    TagAssociationClass,
     UpstreamClass,
 )
 from datahub.metadata.urns import CorpUserUrn
diff --git a/metadata-ingestion/src/datahub/ingestion/graph/client.py b/metadata-ingestion/src/datahub/ingestion/graph/client.py
index 48a008536ed1ed..dfb484743fa27f 100644
--- a/metadata-ingestion/src/datahub/ingestion/graph/client.py
+++ b/metadata-ingestion/src/datahub/ingestion/graph/client.py
@@ -40,6 +40,7 @@
     connections_gql,
     get_id_from_connection_urn,
 )
+from datahub.ingestion.graph.entity_versioning import EntityVersioningAPI
 from datahub.ingestion.graph.filters import (
     RemovedStatusFilter,
     SearchFilterRule,
@@ -125,7 +126,7 @@ def _graphql_entity_type(entity_type: str) -> str:
     return entity_type
 
 
-class DataHubGraph(DatahubRestEmitter):
+class DataHubGraph(DatahubRestEmitter, EntityVersioningAPI):
     def __init__(self, config: DatahubClientConfig) -> None:
         self.config = config
         super().__init__(
diff --git a/metadata-ingestion/src/datahub/ingestion/graph/entity_versioning.py b/metadata-ingestion/src/datahub/ingestion/graph/entity_versioning.py
new file mode 100644
index 00000000000000..3d2288fdc627ab
--- /dev/null
+++ b/metadata-ingestion/src/datahub/ingestion/graph/entity_versioning.py
@@ -0,0 +1,201 @@
+import uuid
+from typing import Dict, Optional, Protocol, Type
+
+from datahub.emitter.mce_builder import Aspect
+from datahub.metadata.schema_classes import (
+    VersionPropertiesClass,
+    VersionSetPropertiesClass,
+)
+from datahub.metadata.urns import VersionSetUrn
+from datahub.utilities.urns.urn import guess_entity_type
+
+
+class DataHubGraphProtocol(Protocol):
+    def execute_graphql(
+        self,
+        query: str,
+        variables: Optional[Dict],
+        operation_name: Optional[str] = None,
+        format_exception: bool = True,
+    ) -> Dict: ...
+
+    def get_aspect(
+        self,
+        entity_urn: str,
+        aspect_type: Type[Aspect],
+        version: int = 0,
+    ) -> Optional[Aspect]: ...
+
+
+class EntityVersioningAPI(DataHubGraphProtocol):
+    LINK_VERSION_MUTATION = """
+        mutation($input: LinkVersionInput!) {
+            linkAssetVersion(input: $input) {
+                urn
+            }
+        }
+    """
+
+    UNLINK_VERSION_MUTATION = """
+        mutation($input: UnlinkVersionInput!) {
+            unlinkAssetVersion(input: $input) {
+                urn
+            }
+        }
+    """
+
+    def link_asset_to_version_set(
+        self,
+        asset_urn: str,
+        version_set_urn: Optional[str],
+        label: str,
+        *,
+        comment: Optional[str] = None,
+    ) -> Optional[str]:
+        """Sets an entity as the latest version of a version set.
+        Can also be used to create a new version set, with `asset_urn` as the first version.
+
+        Args:
+            asset_urn: URN of the entity.
+            version_set_urn: URN of the version set, or None to generate a new version set urn
+            label: Label of the version.
+            comment: Comment about the version.
+
+        Returns:
+            URN of the version set to which `asset_urn` was linked,
+            or None if the `asset_urn` was already linked to `version_set_urn`.
+        """
+
+        entity_type = guess_entity_type(asset_urn)
+        if version_set_urn is None:
+            version_set_urn = VersionSetUrn(str(uuid.uuid4()), entity_type).urn()
+        elif guess_entity_type(version_set_urn) != "versionSet":
+            raise ValueError(f"Expected version set URN, got {version_set_urn}")
+
+        entity_version = self.get_aspect(asset_urn, VersionPropertiesClass)
+        if entity_version and entity_version.versionSet:
+            if entity_version.versionSet == version_set_urn:
+                return None
+            else:
+                raise ValueError(
+                    f"Asset {asset_urn} is already a version of {entity_version.versionSet}"
+                )
+
+        variables = {
+            "input": {
+                "versionSet": version_set_urn,
+                "linkedEntity": asset_urn,
+                "version": label,
+                "comment": comment,
+            }
+        }
+        response = self.execute_graphql(self.LINK_VERSION_MUTATION, variables)
+        try:
+            return response["linkAssetVersion"]["urn"]
+        except KeyError:
+            raise ValueError(f"Unexpected response: {response}")
+
+    def link_asset_to_versioned_asset(
+        self,
+        new_asset_urn: str,
+        old_asset_urn: str,
+        label: str,
+        *,
+        comment: Optional[str] = None,
+    ) -> Optional[str]:
+        """Sets an entity as the latest version of an existing versioned entity.
+
+        Args:
+            new_asset_urn: URN of the new latest entity.
+            old_asset_urn: URN of an existing versioned entity to link onto.
+            label: Label of the version.
+            comment: Comment about the version.
+
+        Returns:
+            URN of the version set to which `new_asset_urn` was linked,
+            or None if the `new_asset_urn` was already linked to `old_asset_urn`.
+        """
+
+        new_entity_type = guess_entity_type(new_asset_urn)
+        old_entity_type = guess_entity_type(old_asset_urn)
+        if new_entity_type != old_entity_type:
+            raise ValueError(
+                f"Expected URNs of the same type, got {new_entity_type} and {old_entity_type}"
+            )
+
+        old_entity_version = self.get_aspect(old_asset_urn, VersionPropertiesClass)
+        if not old_entity_version:
+            raise ValueError(f"Asset {old_asset_urn} is not versioned")
+
+        new_entity_version = self.get_aspect(new_asset_urn, VersionPropertiesClass)
+        if new_entity_version:
+            if new_entity_version.versionSet == old_entity_version.versionSet:
+                return None
+            else:
+                raise ValueError(
+                    f"Asset {new_asset_urn} is already a version of {new_entity_version.versionSet}"
+                )
+
+        return self.link_asset_to_version_set(
+            new_asset_urn, old_entity_version.versionSet, label, comment=comment
+        )
+
+    def unlink_asset_from_version_set(self, asset_urn: str) -> Optional[str]:
+        """Unlinks an entity from its version set.
+
+        Args:
+            asset_urn: URN of the entity to unlink from its version set.
+
+        Returns:
+            If successful, the URN of the version set from which `asset_urn` was unlinked,
+            or None if `asset_urn` was not linked to any version set.
+        """
+
+        entity_version = self.get_aspect(asset_urn, VersionPropertiesClass)
+        if not entity_version:
+            return None
+
+        variables = {
+            "input": {
+                "versionSet": entity_version.versionSet,
+                "unlinkedEntity": asset_urn,
+            }
+        }
+        response = self.execute_graphql(self.UNLINK_VERSION_MUTATION, variables)
+        try:
+            return response["unlinkAssetVersion"]["urn"]
+        except KeyError:
+            raise ValueError(f"Unexpected response: {response}")
+
+    def unlink_latest_asset_from_version_set(
+        self, version_set_urn: str
+    ) -> Optional[str]:
+        """Unlinks the latest version of a version set.
+
+        Args:
+            version_set_urn: URN of the version set.
+
+        Returns:
+            If successful, the URN of the entity that was unlinked from `version_set_urn`,
+            or None if no entity was unlinked.
+        """
+
+        version_set_properties = self.get_aspect(
+            version_set_urn, VersionSetPropertiesClass
+        )
+        if not version_set_properties:
+            raise ValueError(
+                f"Version set {version_set_urn} does not exist or has no versions"
+            )
+
+        variables = {
+            "input": {
+                "versionSet": version_set_urn,
+                "unlinkedEntity": version_set_properties.latest,
+            }
+        }
+        response = self.execute_graphql(self.UNLINK_VERSION_MUTATION, variables)
+        try:
+            return response["unlinkAssetVersion"]["urn"]
+        except KeyError:
+            raise ValueError(f"Unexpected response: {response}")
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
index b896fcb4cf1019..2cefb40dbaa3c2 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
@@ -1498,34 +1498,31 @@ public String batchApplyRetention(
 
   private boolean preprocessEvent(
       @Nonnull OperationContext opContext, MetadataChangeLog metadataChangeLog) {
-    if (updateIndicesService == null) {
-      return false;
-    }
-
-    boolean syncIndexUpdate = false;
 
-    if (preProcessHooks.isUiEnabled()) {
-      if (metadataChangeLog.getSystemMetadata() != null) {
-        if (metadataChangeLog.getSystemMetadata().getProperties() != null) {
-          if (UI_SOURCE.equals(
-              metadataChangeLog.getSystemMetadata().getProperties().get(APP_SOURCE))) {
-            // Pre-process the update indices hook for UI updates to avoid perceived lag from Kafka
-            syncIndexUpdate = true;
-          }
-        }
-      }
-    }
-    if (!syncIndexUpdate && metadataChangeLog.getHeaders() != null) {
-      if (metadataChangeLog
-          .getHeaders()
-          .getOrDefault(SYNC_INDEX_UPDATE_HEADER_NAME, "false")
-          .equalsIgnoreCase(Boolean.toString(true))) {
-        // A specific MCP requested a sync index update.
-        syncIndexUpdate = true;
-      }
-    }
+    return preprocessEvent(opContext, metadataChangeLog, false);
+  }
 
-    if (syncIndexUpdate) {
+  private boolean preprocessEvent(
+      @Nonnull OperationContext opContext,
+      MetadataChangeLog metadataChangeLog,
+      boolean forcePreProcessIndices) {
+    // Deletes cannot rely on System Metadata being passed through so can't always be determined by
+    // system metadata,
+    // for all other types of events should use system metadata rather than the boolean param.
+    boolean isUISource =
+        preProcessHooks.isUiEnabled()
+            && metadataChangeLog.getSystemMetadata() != null
+            && metadataChangeLog.getSystemMetadata().getProperties() != null
+            && UI_SOURCE.equals(
+                metadataChangeLog.getSystemMetadata().getProperties().get(APP_SOURCE));
+    boolean syncIndexUpdate =
+        metadataChangeLog.getHeaders() != null
+            && metadataChangeLog
+                .getHeaders()
+                .getOrDefault(SYNC_INDEX_UPDATE_HEADER_NAME, "false")
+                .equalsIgnoreCase(Boolean.toString(true));
+
+    if (updateIndicesService != null && (isUISource || syncIndexUpdate || forcePreProcessIndices)) {
       updateIndicesService.handleChangeEvent(opContext, metadataChangeLog);
       return true;
     }
@@ -1870,6 +1867,47 @@ public Pair<Future<?>, Boolean> alwaysProduceMCLAsync(
     return Pair.of(future, preprocessed);
   }
 
+  @Override
+  public Pair<Future<?>, Boolean> alwaysProduceMCLAsync(
+      @Nonnull OperationContext opContext,
+      @Nonnull final Urn urn,
+      @Nullable final AspectSpec aspectSpec,
+      @Nonnull final MetadataChangeLog metadataChangeLog,
+      boolean forcePreProcessHooks) {
+    Future<?> future = producer.produceMetadataChangeLog(urn, aspectSpec, metadataChangeLog);
+    return Pair.of(future, preprocessEvent(opContext, metadataChangeLog, forcePreProcessHooks));
+  }
+
+  @Override
+  public Pair<Future<?>, Boolean> alwaysProduceMCLAsync(
+      @Nonnull OperationContext opContext,
+      @Nonnull final Urn urn,
+      @Nonnull String entityName,
+      @Nonnull String aspectName,
+      @Nullable final AspectSpec aspectSpec,
+      @Nullable final RecordTemplate oldAspectValue,
+      @Nullable final RecordTemplate newAspectValue,
+      @Nullable final SystemMetadata oldSystemMetadata,
+      @Nullable final SystemMetadata newSystemMetadata,
+      @Nonnull AuditStamp auditStamp,
+      @Nonnull final ChangeType changeType,
+      boolean forcePreProcessHooks) {
+    final MetadataChangeLog metadataChangeLog =
+        constructMCL(
+            null,
+            entityName,
+            urn,
+            changeType,
+            aspectName,
+            auditStamp,
+            newAspectValue,
+            newSystemMetadata,
+            oldAspectValue,
+            oldSystemMetadata);
+    return alwaysProduceMCLAsync(
+        opContext, urn, aspectSpec, metadataChangeLog, forcePreProcessHooks);
+  }
+
   @Override
   public Pair<Future<?>, Boolean> alwaysProduceMCLAsync(
       @Nonnull OperationContext opContext,
@@ -2168,7 +2206,7 @@ public RollbackRunResult rollbackRun(
       String runId,
       boolean hardDelete) {
     return rollbackWithConditions(
-        opContext, aspectRows, Collections.singletonMap("runId", runId), hardDelete);
+        opContext, aspectRows, Collections.singletonMap("runId", runId), hardDelete, false);
   }
 
   @Override
@@ -2176,7 +2214,8 @@ public RollbackRunResult rollbackWithConditions(
       @Nonnull OperationContext opContext,
       List<AspectRowSummary> aspectRows,
       Map<String, String> conditions,
-      boolean hardDelete) {
+      boolean hardDelete,
+      boolean preProcessHooks) {
     List<AspectRowSummary> removedAspects = new ArrayList<>();
     List<RollbackResult> removedAspectResults = new ArrayList<>();
     AtomicInteger rowsDeletedFromEntityDeletion = new AtomicInteger(0);
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/EntityVersioningServiceImpl.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/EntityVersioningServiceImpl.java
index 48f5a00e9e8d5a..ced4b8a65b9763 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/EntityVersioningServiceImpl.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/EntityVersioningServiceImpl.java
@@ -1,12 +1,15 @@
 package com.linkedin.metadata.entity.versioning;
 
+import static com.linkedin.metadata.Constants.APP_SOURCE;
 import static com.linkedin.metadata.Constants.INITIAL_VERSION_SORT_ID;
+import static com.linkedin.metadata.Constants.UI_SOURCE;
 import static com.linkedin.metadata.Constants.VERSION_PROPERTIES_ASPECT_NAME;
 import static com.linkedin.metadata.Constants.VERSION_SET_ENTITY_NAME;
 import static com.linkedin.metadata.Constants.VERSION_SET_KEY_ASPECT_NAME;
 import static com.linkedin.metadata.Constants.VERSION_SET_PROPERTIES_ASPECT_NAME;
 import static com.linkedin.metadata.Constants.VERSION_SORT_ID_FIELD_NAME;
 import static com.linkedin.metadata.aspect.validation.ConditionalWriteValidator.HTTP_HEADER_IF_VERSION_MATCH;
+import static com.linkedin.metadata.utils.SystemMetadataUtils.createDefaultSystemMetadata;
 
 import com.datahub.util.RecordUtils;
 import com.google.common.collect.ImmutableList;
@@ -26,7 +29,6 @@
 import com.linkedin.metadata.entity.EntityService;
 import com.linkedin.metadata.entity.IngestResult;
 import com.linkedin.metadata.entity.RollbackResult;
-import com.linkedin.metadata.entity.RollbackRunResult;
 import com.linkedin.metadata.entity.SearchRetriever;
 import com.linkedin.metadata.entity.ebean.batch.AspectsBatchImpl;
 import com.linkedin.metadata.key.VersionSetKey;
@@ -34,13 +36,13 @@
 import com.linkedin.metadata.query.filter.SortCriterion;
 import com.linkedin.metadata.query.filter.SortOrder;
 import com.linkedin.metadata.search.ScrollResult;
-import com.linkedin.metadata.search.SearchEntity;
 import com.linkedin.metadata.search.SearchEntityArray;
 import com.linkedin.metadata.search.utils.QueryUtils;
 import com.linkedin.metadata.utils.CriterionUtils;
 import com.linkedin.metadata.utils.EntityKeyUtils;
 import com.linkedin.metadata.utils.GenericRecordUtils;
 import com.linkedin.mxe.MetadataChangeProposal;
+import com.linkedin.mxe.SystemMetadata;
 import com.linkedin.versionset.VersionSetProperties;
 import com.linkedin.versionset.VersioningScheme;
 import io.datahubproject.metadata.context.OperationContext;
@@ -74,11 +76,11 @@ public List<IngestResult> linkLatestVersion(
       Urn versionSet,
       Urn newLatestVersion,
       VersionPropertiesInput inputProperties) {
-    List<MetadataChangeProposal> proposals = new ArrayList<>();
+    List<IngestResult> ingestResults = new ArrayList<>();
     AspectRetriever aspectRetriever = opContext.getAspectRetriever();
     String sortId;
     Long versionSetConstraint;
-    Long versionPropertiesConstraint;
+    Long versionPropertiesConstraint = -1L;
     VersionSetKey versionSetKey =
         (VersionSetKey)
             EntityKeyUtils.convertUrnToEntityKey(
@@ -97,12 +99,12 @@ public List<IngestResult> linkLatestVersion(
       versionSetKeyProposal.setAspectName(VERSION_SET_KEY_ASPECT_NAME);
       versionSetKeyProposal.setAspect(GenericRecordUtils.serializeAspect(versionSetKey));
       versionSetKeyProposal.setChangeType(ChangeType.CREATE_ENTITY);
-      entityService.ingestProposal(
-          opContext, versionSetKeyProposal, opContext.getAuditStamp(), false);
+      ingestResults.add(
+          entityService.ingestProposal(
+              opContext, versionSetKeyProposal, opContext.getAuditStamp(), false));
 
       sortId = INITIAL_VERSION_SORT_ID;
       versionSetConstraint = -1L;
-      versionPropertiesConstraint = -1L;
     } else {
       SystemAspect versionSetPropertiesAspect =
           aspectRetriever.getLatestSystemAspect(versionSet, VERSION_SET_PROPERTIES_ASPECT_NAME);
@@ -119,8 +121,6 @@ public List<IngestResult> linkLatestVersion(
       VersionProperties latestVersionProperties =
           RecordUtils.toRecordTemplate(
               VersionProperties.class, latestVersion.getRecordTemplate().data());
-      versionPropertiesConstraint =
-          latestVersion.getSystemMetadataVersion().orElse(latestVersion.getVersion());
       // When more impls for versioning scheme are set up, this will need to be resolved to the
       // correct scheme generation strategy
       sortId = AlphanumericSortIdGenerator.increment(latestVersionProperties.getSortId());
@@ -168,6 +168,11 @@ public List<IngestResult> linkLatestVersion(
       versionProperties.setSourceCreatedTimestamp(sourceCreatedAuditStamp);
     }
     MetadataChangeProposal versionPropertiesProposal = new MetadataChangeProposal();
+    SystemMetadata systemMetadata = createDefaultSystemMetadata();
+    StringMap properties = new StringMap();
+    properties.put(APP_SOURCE, UI_SOURCE);
+    systemMetadata.setProperties(properties);
+    versionPropertiesProposal.setSystemMetadata(systemMetadata);
     versionPropertiesProposal.setEntityUrn(newLatestVersion);
     versionPropertiesProposal.setEntityType(newLatestVersion.getEntityType());
     versionPropertiesProposal.setAspectName(VERSION_PROPERTIES_ASPECT_NAME);
@@ -176,7 +181,10 @@ public List<IngestResult> linkLatestVersion(
     StringMap headerMap = new StringMap();
     headerMap.put(HTTP_HEADER_IF_VERSION_MATCH, versionPropertiesConstraint.toString());
     versionPropertiesProposal.setChangeType(ChangeType.UPSERT);
-    proposals.add(versionPropertiesProposal);
+    versionPropertiesProposal.setHeaders(headerMap);
+    ingestResults.add(
+        entityService.ingestProposal(
+            opContext, versionPropertiesProposal, opContext.getAuditStamp(), false));
 
     // Might want to refactor this to a Patch w/ Create if not exists logic if more properties get
     // added
@@ -198,14 +206,12 @@ public List<IngestResult> linkLatestVersion(
     StringMap versionSetHeaderMap = new StringMap();
     versionSetHeaderMap.put(HTTP_HEADER_IF_VERSION_MATCH, versionSetConstraint.toString());
     versionSetPropertiesProposal.setHeaders(versionSetHeaderMap);
-    proposals.add(versionSetPropertiesProposal);
+    versionSetPropertiesProposal.setSystemMetadata(systemMetadata);
+    ingestResults.add(
+        entityService.ingestProposal(
+            opContext, versionSetPropertiesProposal, opContext.getAuditStamp(), false));
 
-    return entityService.ingestProposal(
-        opContext,
-        AspectsBatchImpl.builder()
-            .mcps(proposals, opContext.getAuditStamp(), opContext.getRetrieverContext())
-            .build(),
-        false);
+    return ingestResults;
   }
 
   /**
@@ -237,13 +243,14 @@ public List<RollbackResult> unlinkVersion(
               "Version is not linked to specified version set: %s but is linked to: %s",
               versionSet, versionSetUrn));
     }
-    // Delete latest version properties
+    // Delete linked version properties
     entityService
         .deleteAspect(
             opContext,
             linkedVersion.toString(),
             VERSION_PROPERTIES_ASPECT_NAME,
             Collections.emptyMap(),
+            true,
             true)
         .ifPresent(deletedAspects::add);
 
@@ -253,25 +260,7 @@ public List<RollbackResult> unlinkVersion(
             EntityKeyUtils.convertUrnToEntityKey(
                 versionSetUrn,
                 opContext.getEntityRegistryContext().getKeyAspectSpec(versionSetUrn));
-    SearchRetriever searchRetriever = opContext.getRetrieverContext().getSearchRetriever();
 
-    // Find current latest version and previous
-    ScrollResult linkedVersions =
-        searchRetriever.scroll(
-            ImmutableList.of(versionSetKey.getEntityType()),
-            QueryUtils.newConjunctiveFilter(
-                CriterionUtils.buildCriterion(
-                    "versionSet", Condition.EQUAL, versionSetUrn.toString())),
-            null,
-            2,
-            ImmutableList.of(
-                new SortCriterion()
-                    .setField(VERSION_SORT_ID_FIELD_NAME)
-                    .setOrder(SortOrder.DESCENDING)),
-            SearchRetriever.RETRIEVER_SEARCH_FLAGS_NO_CACHE_ALL_VERSIONS);
-    String updatedLatestVersionUrn = null;
-
-    SearchEntityArray linkedEntities = linkedVersions.getEntities();
     SystemAspect versionSetPropertiesAspect =
         aspectRetriever.getLatestSystemAspect(versionSetUrn, VERSION_SET_PROPERTIES_ASPECT_NAME);
     if (versionSetPropertiesAspect == null) {
@@ -287,33 +276,48 @@ public List<RollbackResult> unlinkVersion(
             .getSystemMetadataVersion()
             .orElse(versionSetPropertiesAspect.getVersion());
     boolean isLatest = linkedVersion.equals(versionSetProperties.getLatest());
+    SearchRetriever searchRetriever = opContext.getRetrieverContext().getSearchRetriever();
 
-    if (linkedEntities.size() == 2 && isLatest) {
-      // If the version to unlink is the same as the last search result and is currently the latest
-      // based on SQL, set to one immediately before.
-      // Otherwise set to most current one in search results assuming we have not gotten the index
-      // update for a recent update to latest.
-      // Does assume that there are not multiple index updates waiting in the queue so rapid fire
-      // updates intermixed with deletes should be avoided.
-      SearchEntity maybeLatestVersion = linkedEntities.get(0);
-      if (maybeLatestVersion.getEntity().equals(linkedVersion)) {
-        SearchEntity priorLatestVersion = linkedEntities.get(1);
-        updatedLatestVersionUrn = priorLatestVersion.getEntity().toString();
-      } else {
-        updatedLatestVersionUrn = maybeLatestVersion.getEntity().toString();
-      }
+    String updatedLatestVersionUrn = null;
+    if (isLatest) {
+
+      // Find current latest version and previous
+      ScrollResult linkedVersions =
+          searchRetriever.scroll(
+              ImmutableList.of(versionSetKey.getEntityType()),
+              QueryUtils.newConjunctiveFilter(
+                  CriterionUtils.buildCriterion(
+                      "versionSet", Condition.EQUAL, versionSetUrn.toString()),
+                  CriterionUtils.buildCriterion(
+                      VERSION_SORT_ID_FIELD_NAME,
+                      Condition.LESS_THAN,
+                      linkedVersionProperties.getSortId())),
+              null,
+              2,
+              ImmutableList.of(
+                  new SortCriterion()
+                      .setField(VERSION_SORT_ID_FIELD_NAME)
+                      .setOrder(SortOrder.DESCENDING)),
+              SearchRetriever.RETRIEVER_SEARCH_FLAGS_NO_CACHE_ALL_VERSIONS);
+
+      SearchEntityArray linkedEntities = linkedVersions.getEntities();
 
-    } else if (linkedEntities.size() == 1 && isLatest) {
-      // Missing a version, if that version is not the one being unlinked then set as latest
-      // version. Same reasoning as above
-      SearchEntity maybePriorLatestVersion = linkedEntities.get(0);
-      if (!linkedVersion.equals(maybePriorLatestVersion.getEntity())) {
-        updatedLatestVersionUrn = maybePriorLatestVersion.getEntity().toString();
+      if (!linkedEntities.isEmpty()) {
+        // There is a version left, set to latest linked version that is less than the current sort
+        // id
+        updatedLatestVersionUrn = linkedEntities.get(0).getEntity().toString();
       } else {
-        // Delete Version Set if we are removing the last version
-        // TODO: Conditional deletes impl + only do the delete if version match
-        RollbackRunResult deleteResult = entityService.deleteUrn(opContext, versionSetUrn);
-        deletedAspects.addAll(deleteResult.getRollbackResults());
+        // No versions left, remove the version set
+        log.info("No more versions in version set: {}, deleting.", versionSetUrn);
+        entityService
+            .deleteAspect(
+                opContext,
+                versionSetUrn.toString(),
+                VERSION_SET_KEY_ASPECT_NAME,
+                Collections.emptyMap(),
+                true,
+                true)
+            .ifPresent(deletedAspects::add);
       }
     }
 
@@ -322,6 +326,7 @@ public List<RollbackResult> unlinkVersion(
       // Might want to refactor this to a Patch w/ Create if not exists logic if more properties
       // get added
       // to Version Set Properties
+      log.info("Setting new latest version: {}", updatedLatestVersionUrn);
       VersionSetProperties newVersionSetProperties =
           new VersionSetProperties()
               .setVersioningScheme(
@@ -340,6 +345,11 @@ public List<RollbackResult> unlinkVersion(
       StringMap headerMap = new StringMap();
       headerMap.put(HTTP_HEADER_IF_VERSION_MATCH, Long.toString(versionConstraint));
       versionSetPropertiesProposal.setHeaders(headerMap);
+      SystemMetadata systemMetadata = createDefaultSystemMetadata();
+      StringMap properties = new StringMap();
+      properties.put(APP_SOURCE, UI_SOURCE);
+      systemMetadata.setProperties(properties);
+      versionSetPropertiesProposal.setSystemMetadata(systemMetadata);
       entityService.ingestProposal(
           opContext,
           AspectsBatchImpl.builder()
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/sideeffects/VersionSetSideEffect.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/sideeffects/VersionSetSideEffect.java
index 7e9692841c79ae..5b26f5c8b11ddc 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/sideeffects/VersionSetSideEffect.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/sideeffects/VersionSetSideEffect.java
@@ -3,7 +3,10 @@
 import static com.linkedin.metadata.Constants.VERSION_PROPERTIES_ASPECT_NAME;
 import static com.linkedin.metadata.Constants.VERSION_SET_PROPERTIES_ASPECT_NAME;
 
+import com.datahub.util.RecordUtils;
+import com.linkedin.common.VersionProperties;
 import com.linkedin.common.urn.Urn;
+import com.linkedin.entity.Aspect;
 import com.linkedin.metadata.aspect.RetrieverContext;
 import com.linkedin.metadata.aspect.batch.ChangeMCP;
 import com.linkedin.metadata.aspect.batch.MCLItem;
@@ -17,7 +20,6 @@
 import com.linkedin.versionset.VersionSetProperties;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
 import javax.annotation.Nonnull;
@@ -40,23 +42,23 @@ public class VersionSetSideEffect extends MCPSideEffect {
   @Override
   protected Stream<ChangeMCP> applyMCPSideEffect(
       Collection<ChangeMCP> changeMCPS, @Nonnull RetrieverContext retrieverContext) {
-    return Stream.of();
+    return changeMCPS.stream().flatMap(item -> updateLatest(item, retrieverContext));
   }
 
   @Override
   protected Stream<MCPItem> postMCPSideEffect(
       Collection<MCLItem> mclItems, @Nonnull RetrieverContext retrieverContext) {
-    return mclItems.stream().flatMap(item -> updateLatest(item, retrieverContext));
+    return Stream.of();
   }
 
-  private static Stream<MCPItem> updateLatest(
-      MCLItem mclItem, @Nonnull RetrieverContext retrieverContext) {
+  private static Stream<ChangeMCP> updateLatest(
+      ChangeMCP changeMCP, @Nonnull RetrieverContext retrieverContext) {
 
-    if (VERSION_SET_PROPERTIES_ASPECT_NAME.equals(mclItem.getAspectName())) {
-      List<MCPItem> mcpItems = new ArrayList<>();
-      VersionSetProperties versionSetProperties = mclItem.getAspect(VersionSetProperties.class);
+    if (VERSION_SET_PROPERTIES_ASPECT_NAME.equals(changeMCP.getAspectName())) {
+      List<ChangeMCP> mcpItems = new ArrayList<>();
+      VersionSetProperties versionSetProperties = changeMCP.getAspect(VersionSetProperties.class);
       if (versionSetProperties == null) {
-        log.error("Unable to process version set properties for urn: {}", mclItem.getUrn());
+        log.error("Unable to process version set properties for urn: {}", changeMCP.getUrn());
         return Stream.empty();
       }
       // Set old latest isLatest to false, set new latest isLatest to true
@@ -68,19 +70,21 @@ private static Stream<MCPItem> updateLatest(
       Urn newLatest = versionSetProperties.getLatest();
 
       VersionSetProperties previousVersionSetProperties =
-          mclItem.getPreviousAspect(VersionSetProperties.class);
+          changeMCP.getPreviousAspect(VersionSetProperties.class);
       if (previousVersionSetProperties != null) {
         Urn previousLatest = previousVersionSetProperties.getLatest();
-        if (!newLatest.equals(previousLatest)
-            && retrieverContext
+        Aspect previousLatestEntity =
+            retrieverContext
                 .getAspectRetriever()
-                .entityExists(Collections.singleton(previousLatest))
-                .getOrDefault(previousLatest, false)) {
+                .getLatestAspectObject(previousLatest, VERSION_PROPERTIES_ASPECT_NAME);
+        if (!newLatest.equals(previousLatest) && previousLatestEntity != null) {
           EntitySpec entitySpec =
               retrieverContext
                   .getAspectRetriever()
                   .getEntityRegistry()
                   .getEntitySpec(previousLatest.getEntityType());
+          VersionProperties previousLatestProperties =
+              RecordUtils.toRecordTemplate(VersionProperties.class, previousLatestEntity.data());
           GenericJsonPatch.PatchOp previousPatch = new GenericJsonPatch.PatchOp();
           previousPatch.setOp(PatchOperationType.ADD.getValue());
           previousPatch.setPath("/isLatest");
@@ -96,17 +100,19 @@ private static Stream<MCPItem> updateLatest(
                           .patch(List.of(previousPatch))
                           .build()
                           .getJsonPatch())
-                  .auditStamp(mclItem.getAuditStamp())
-                  .systemMetadata(mclItem.getSystemMetadata())
-                  .build(retrieverContext.getAspectRetriever().getEntityRegistry()));
+                  .auditStamp(changeMCP.getAuditStamp())
+                  .systemMetadata(changeMCP.getSystemMetadata())
+                  .build(retrieverContext.getAspectRetriever().getEntityRegistry())
+                  .applyPatch(previousLatestProperties, retrieverContext.getAspectRetriever()));
         }
       }
 
       // Explicitly error here to avoid downstream patch error with less context
-      if (retrieverContext
+      Aspect newLatestEntity =
+          retrieverContext
               .getAspectRetriever()
-              .getLatestAspectObject(newLatest, VERSION_PROPERTIES_ASPECT_NAME)
-          == null) {
+              .getLatestAspectObject(newLatest, VERSION_PROPERTIES_ASPECT_NAME);
+      if (newLatestEntity == null) {
         throw new UnsupportedOperationException(
             "Cannot set latest version to unversioned entity: " + newLatest);
       }
@@ -116,6 +122,8 @@ private static Stream<MCPItem> updateLatest(
               .getAspectRetriever()
               .getEntityRegistry()
               .getEntitySpec(newLatest.getEntityType());
+      VersionProperties newLatestProperties =
+          RecordUtils.toRecordTemplate(VersionProperties.class, newLatestEntity.data());
       GenericJsonPatch.PatchOp currentPatch = new GenericJsonPatch.PatchOp();
       currentPatch.setOp(PatchOperationType.ADD.getValue());
       currentPatch.setPath("/isLatest");
@@ -127,9 +135,10 @@ private static Stream<MCPItem> updateLatest(
               .aspectName(VERSION_PROPERTIES_ASPECT_NAME)
               .aspectSpec(entitySpec.getAspectSpec(VERSION_PROPERTIES_ASPECT_NAME))
               .patch(GenericJsonPatch.builder().patch(List.of(currentPatch)).build().getJsonPatch())
-              .auditStamp(mclItem.getAuditStamp())
-              .systemMetadata(mclItem.getSystemMetadata())
-              .build(retrieverContext.getAspectRetriever().getEntityRegistry()));
+              .auditStamp(changeMCP.getAuditStamp())
+              .systemMetadata(changeMCP.getSystemMetadata())
+              .build(retrieverContext.getAspectRetriever().getEntityRegistry())
+              .applyPatch(newLatestProperties, retrieverContext.getAspectRetriever()));
       return mcpItems.stream();
     }
     return Stream.empty();
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/validation/VersionPropertiesValidator.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/validation/VersionPropertiesValidator.java
index 4d29cc254c1ba6..53f4d9b1b3dcea 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/validation/VersionPropertiesValidator.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/versioning/validation/VersionPropertiesValidator.java
@@ -1,11 +1,15 @@
 package com.linkedin.metadata.entity.versioning.validation;
 
+import static com.linkedin.metadata.Constants.VERSION_LABEL_FIELD_NAME;
 import static com.linkedin.metadata.Constants.VERSION_PROPERTIES_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.VERSION_SET_FIELD_NAME;
 import static com.linkedin.metadata.Constants.VERSION_SET_KEY_ASPECT_NAME;
 import static com.linkedin.metadata.Constants.VERSION_SET_PROPERTIES_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.VERSION_SORT_ID_FIELD_NAME;
 
 import com.datahub.util.RecordUtils;
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.linkedin.common.VersionProperties;
 import com.linkedin.common.urn.Urn;
@@ -18,12 +22,22 @@
 import com.linkedin.metadata.aspect.plugins.validation.AspectPayloadValidator;
 import com.linkedin.metadata.aspect.plugins.validation.AspectValidationException;
 import com.linkedin.metadata.aspect.plugins.validation.ValidationExceptionCollection;
+import com.linkedin.metadata.entity.SearchRetriever;
 import com.linkedin.metadata.entity.ebean.batch.PatchItemImpl;
 import com.linkedin.metadata.key.VersionSetKey;
+import com.linkedin.metadata.query.filter.Condition;
+import com.linkedin.metadata.query.filter.Filter;
+import com.linkedin.metadata.query.filter.SortCriterion;
+import com.linkedin.metadata.query.filter.SortOrder;
+import com.linkedin.metadata.search.ScrollResult;
+import com.linkedin.metadata.search.SearchEntity;
+import com.linkedin.metadata.search.utils.QueryUtils;
+import com.linkedin.metadata.utils.CriterionUtils;
 import com.linkedin.versionset.VersionSetProperties;
 import com.linkedin.versionset.VersioningScheme;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -120,6 +134,47 @@ public static Stream<AspectValidationException> validatePropertiesUpserts(
       } else {
         exceptions.addException(mcpItem, "Version Set specified does not exist: " + versionSetUrn);
       }
+
+      // Best effort validate on uniqueness for sort ID and version label, search has potential
+      // timing gap
+      SearchRetriever searchRetriever = retrieverContext.getSearchRetriever();
+      Filter versionSetAndSortIdOrVersionLabelMatch =
+          QueryUtils.newDisjunctiveFilter(
+              CriterionUtils.buildConjunctiveCriterion(
+                  CriterionUtils.buildCriterion(
+                      VERSION_SET_FIELD_NAME, Condition.EQUAL, versionSetUrn.toString()),
+                  CriterionUtils.buildCriterion(
+                      VERSION_SORT_ID_FIELD_NAME, Condition.EQUAL, versionProperties.getSortId())),
+              CriterionUtils.buildConjunctiveCriterion(
+                  CriterionUtils.buildCriterion(
+                      VERSION_SET_FIELD_NAME, Condition.EQUAL, versionSetUrn.toString()),
+                  CriterionUtils.buildCriterion(
+                      VERSION_LABEL_FIELD_NAME,
+                      Condition.EQUAL,
+                      versionProperties.getVersion().getVersionTag())));
+      ScrollResult scrollResult =
+          searchRetriever.scroll(
+              ImmutableList.of(mcpItem.getEntitySpec().getName()),
+              versionSetAndSortIdOrVersionLabelMatch,
+              null,
+              1,
+              ImmutableList.of(
+                  new SortCriterion()
+                      .setField(VERSION_SORT_ID_FIELD_NAME)
+                      .setOrder(SortOrder.DESCENDING)),
+              SearchRetriever.RETRIEVER_SEARCH_FLAGS_NO_CACHE_ALL_VERSIONS);
+      List<SearchEntity> matchedEntities =
+          scrollResult.getEntities().stream()
+              .filter(entity -> !mcpItem.getUrn().equals(entity.getEntity()))
+              .collect(Collectors.toList());
+      if (!matchedEntities.isEmpty()) {
+        exceptions.addException(
+            mcpItem,
+            "Sort Id and Version label must be unique: sort ID: "
+                + versionProperties.getSortId()
+                + " version label: "
+                + versionProperties.getVersion().getVersionTag());
+      }
     }
     return exceptions.streamAllExceptions();
   }
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/EntityVersioningServiceTest.java b/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/EntityVersioningServiceTest.java
index 8c4d81af129428..a88dd4158503b5 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/EntityVersioningServiceTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/EntityVersioningServiceTest.java
@@ -2,6 +2,7 @@
 
 import static com.linkedin.metadata.Constants.INITIAL_VERSION_SORT_ID;
 import static com.linkedin.metadata.Constants.VERSION_PROPERTIES_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.VERSION_SET_KEY_ASPECT_NAME;
 import static com.linkedin.metadata.Constants.VERSION_SET_PROPERTIES_ASPECT_NAME;
 import static org.mockito.Mockito.*;
 import static org.testng.Assert.*;
@@ -13,16 +14,13 @@
 import com.linkedin.common.urn.DatasetUrn;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.common.urn.UrnUtils;
-import com.linkedin.data.template.RecordTemplate;
 import com.linkedin.metadata.aspect.AspectRetriever;
 import com.linkedin.metadata.aspect.CachingAspectRetriever;
 import com.linkedin.metadata.aspect.GraphRetriever;
 import com.linkedin.metadata.aspect.SystemAspect;
-import com.linkedin.metadata.aspect.batch.AspectsBatch;
 import com.linkedin.metadata.entity.EntityService;
 import com.linkedin.metadata.entity.EntityServiceAspectRetriever;
 import com.linkedin.metadata.entity.RollbackResult;
-import com.linkedin.metadata.entity.RollbackRunResult;
 import com.linkedin.metadata.entity.SearchRetriever;
 import com.linkedin.metadata.entity.TestEntityRegistry;
 import com.linkedin.metadata.models.registry.ConfigEntityRegistry;
@@ -34,12 +32,13 @@
 import com.linkedin.metadata.search.SearchEntityArray;
 import com.linkedin.metadata.search.SearchResultMetadata;
 import com.linkedin.metadata.snapshot.Snapshot;
+import com.linkedin.metadata.utils.GenericRecordUtils;
+import com.linkedin.mxe.MetadataChangeProposal;
 import com.linkedin.versionset.VersionSetProperties;
 import com.linkedin.versionset.VersioningScheme;
 import io.datahubproject.metadata.context.OperationContext;
 import io.datahubproject.metadata.context.RetrieverContext;
 import io.datahubproject.test.metadata.context.TestOperationContexts;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -108,45 +107,44 @@ public void testLinkLatestVersionNewVersionSet() throws Exception {
         .thenReturn(Map.of(TEST_VERSION_SET_URN, false));
 
     // Capture the proposals
-    ArgumentCaptor<AspectsBatch> aspectsCaptor = ArgumentCaptor.forClass(AspectsBatch.class);
-    when(mockEntityService.ingestProposal(eq(mockOpContext), aspectsCaptor.capture(), eq(false)))
-        .thenReturn(List.of());
+    ArgumentCaptor<MetadataChangeProposal> aspectsCaptor =
+        ArgumentCaptor.forClass(MetadataChangeProposal.class);
+    when(mockEntityService.ingestProposal(
+            eq(mockOpContext), aspectsCaptor.capture(), any(), eq(false)))
+        .thenReturn(null);
 
     // Execute
     versioningService.linkLatestVersion(
         mockOpContext, TEST_VERSION_SET_URN, TEST_DATASET_URN, input);
 
     // Verify
-    List<AspectsBatch> capturedAspects = aspectsCaptor.getAllValues();
-    List<RecordTemplate> versionPropertiesAspect =
-        capturedAspects.get(0).getMCPItems().stream()
+    List<MetadataChangeProposal> capturedAspects = aspectsCaptor.getAllValues();
+    MetadataChangeProposal versionPropertiesProposal =
+        capturedAspects.stream()
             .filter(mcpItem -> VERSION_PROPERTIES_ASPECT_NAME.equals(mcpItem.getAspectName()))
-            .map(mcpItem -> mcpItem.getAspect(VersionProperties.class))
-            .collect(Collectors.toList());
-
-    // Verify VersionProperties has initial sort ID
+            .collect(Collectors.toList())
+            .get(0);
     VersionProperties versionProps =
-        (VersionProperties)
-            versionPropertiesAspect.stream()
-                .filter(a -> a instanceof VersionProperties)
-                .findFirst()
-                .orElseThrow(() -> new AssertionError("VersionProperties not found"));
+        GenericRecordUtils.deserializeAspect(
+            versionPropertiesProposal.getAspect().getValue(),
+            versionPropertiesProposal.getAspect().getContentType(),
+            VersionProperties.class);
 
+    // Verify VersionProperties has initial sort ID
     assertEquals(versionProps.getSortId(), INITIAL_VERSION_SORT_ID);
     assertEquals(versionProps.getComment(), "Test comment");
     assertEquals(versionProps.getVersionSet(), TEST_VERSION_SET_URN);
 
-    List<RecordTemplate> versionSetPropertiesAspect =
-        capturedAspects.get(0).getMCPItems().stream()
+    MetadataChangeProposal versionSetPropertiesProposal =
+        capturedAspects.stream()
             .filter(mcpItem -> VERSION_SET_PROPERTIES_ASPECT_NAME.equals(mcpItem.getAspectName()))
-            .map(mcpItem -> mcpItem.getAspect(VersionSetProperties.class))
-            .collect(Collectors.toList());
+            .collect(Collectors.toList())
+            .get(0);
     VersionSetProperties versionSetProperties =
-        (VersionSetProperties)
-            versionSetPropertiesAspect.stream()
-                .filter(aspect -> aspect instanceof VersionSetProperties)
-                .findFirst()
-                .orElseThrow(() -> new AssertionError("Version Set Properties not found"));
+        GenericRecordUtils.deserializeAspect(
+            versionSetPropertiesProposal.getAspect().getValue(),
+            versionSetPropertiesProposal.getAspect().getContentType(),
+            VersionSetProperties.class);
     assertEquals(versionSetProperties.getLatest(), TEST_DATASET_URN);
     assertEquals(
         versionSetProperties.getVersioningScheme(),
@@ -186,30 +184,30 @@ public void testLinkLatestVersionExistingVersionSet() throws Exception {
         .thenReturn(mockVersionPropertiesAspect);
 
     // Capture the proposals
-    ArgumentCaptor<AspectsBatch> aspectsCaptor = ArgumentCaptor.forClass(AspectsBatch.class);
-    when(mockEntityService.ingestProposal(eq(mockOpContext), aspectsCaptor.capture(), eq(false)))
-        .thenReturn(List.of());
+    ArgumentCaptor<MetadataChangeProposal> aspectsCaptor =
+        ArgumentCaptor.forClass(MetadataChangeProposal.class);
+    when(mockEntityService.ingestProposal(
+            eq(mockOpContext), aspectsCaptor.capture(), any(), eq(false)))
+        .thenReturn(null);
 
     // Execute
     versioningService.linkLatestVersion(
         mockOpContext, TEST_VERSION_SET_URN, TEST_DATASET_URN_2, input);
 
     // Verify
-    List<AspectsBatch> capturedAspects = aspectsCaptor.getAllValues();
-    List<RecordTemplate> aspects =
-        capturedAspects.get(0).getMCPItems().stream()
+    List<MetadataChangeProposal> capturedAspects = aspectsCaptor.getAllValues();
+    MetadataChangeProposal versionPropertiesProposal =
+        capturedAspects.stream()
             .filter(mcpItem -> VERSION_PROPERTIES_ASPECT_NAME.equals(mcpItem.getAspectName()))
-            .map(mcpItem -> mcpItem.getAspect(VersionProperties.class))
-            .collect(Collectors.toList());
-
-    // Verify VersionProperties has incremented sort ID
+            .collect(Collectors.toList())
+            .get(0);
     VersionProperties versionProps =
-        (VersionProperties)
-            aspects.stream()
-                .filter(a -> a instanceof VersionProperties)
-                .findFirst()
-                .orElseThrow(() -> new AssertionError("VersionProperties not found"));
+        GenericRecordUtils.deserializeAspect(
+            versionPropertiesProposal.getAspect().getValue(),
+            versionPropertiesProposal.getAspect().getContentType(),
+            VersionProperties.class);
 
+    // Verify VersionProperties has incremented sort ID
     assertEquals(versionProps.getSortId(), "AAAAAAAB");
     assertEquals(versionProps.getComment(), "Test comment");
     assertEquals(versionProps.getVersionSet(), TEST_VERSION_SET_URN);
@@ -253,8 +251,6 @@ public void testUnlinkInitialVersion() throws Exception {
             null,
             false,
             0);
-    RollbackRunResult rollbackRunResult =
-        new RollbackRunResult(new ArrayList<>(), 1, List.of(versionSetDeleteResult));
     RollbackResult versionPropsDeleteResult =
         new RollbackResult(
             TEST_DATASET_URN,
@@ -268,15 +264,25 @@ public void testUnlinkInitialVersion() throws Exception {
             false,
             0);
 
-    when(mockEntityService.deleteUrn(eq(mockOpContext), eq(TEST_VERSION_SET_URN)))
-        .thenReturn(rollbackRunResult);
     when(mockEntityService.deleteAspect(
-            eq(mockOpContext), anyString(), eq(VERSION_PROPERTIES_ASPECT_NAME), anyMap(), eq(true)))
+            eq(mockOpContext),
+            eq(TEST_VERSION_SET_URN.toString()),
+            eq(VERSION_SET_KEY_ASPECT_NAME),
+            anyMap(),
+            eq(true),
+            eq(true)))
+        .thenReturn(Optional.of(versionSetDeleteResult));
+    when(mockEntityService.deleteAspect(
+            eq(mockOpContext),
+            anyString(),
+            eq(VERSION_PROPERTIES_ASPECT_NAME),
+            anyMap(),
+            eq(true),
+            eq(true)))
         .thenReturn(Optional.of(versionPropsDeleteResult));
 
     // Mock graph retriever response
     SearchEntityArray relatedEntities = new SearchEntityArray();
-    relatedEntities.add(new SearchEntity().setEntity(TEST_DATASET_URN));
 
     ScrollResult scrollResult =
         new ScrollResult().setEntities(relatedEntities).setMetadata(new SearchResultMetadata());
@@ -289,15 +295,22 @@ public void testUnlinkInitialVersion() throws Exception {
 
     // Verify
     assertEquals(results.size(), 2);
-    verify(mockEntityService).deleteUrn(eq(mockOpContext), eq(TEST_VERSION_SET_URN));
+    verify(mockEntityService)
+        .deleteAspect(
+            eq(mockOpContext),
+            eq(TEST_VERSION_SET_URN.toString()),
+            eq(VERSION_SET_KEY_ASPECT_NAME),
+            anyMap(),
+            eq(true),
+            eq(true));
     verify(mockEntityService)
         .deleteAspect(
             eq(mockOpContext),
             eq(TEST_DATASET_URN.toString()),
             eq(VERSION_PROPERTIES_ASPECT_NAME),
             anyMap(),
+            eq(true),
             eq(true));
-    verify(mockSearchRetriever, never()).scroll(any(), any(), anyString(), anyInt(), any(), any());
   }
 
   @Test
@@ -350,7 +363,12 @@ public void testUnlinkLatestVersionWithPriorVersion() throws Exception {
             false,
             0);
     when(mockEntityService.deleteAspect(
-            eq(mockOpContext), anyString(), eq(VERSION_PROPERTIES_ASPECT_NAME), anyMap(), eq(true)))
+            eq(mockOpContext),
+            anyString(),
+            eq(VERSION_PROPERTIES_ASPECT_NAME),
+            anyMap(),
+            eq(true),
+            eq(true)))
         .thenReturn(Optional.of(versionPropsDeleteResult));
 
     // Execute
@@ -365,9 +383,17 @@ public void testUnlinkLatestVersionWithPriorVersion() throws Exception {
             eq(TEST_DATASET_URN.toString()),
             eq(VERSION_PROPERTIES_ASPECT_NAME),
             anyMap(),
+            eq(true),
             eq(true));
     verify(mockEntityService).ingestProposal(eq(mockOpContext), any(), eq(false));
-    verify(mockEntityService, never()).deleteUrn(eq(mockOpContext), eq(TEST_VERSION_SET_URN));
+    verify(mockEntityService, never())
+        .deleteAspect(
+            eq(mockOpContext),
+            eq(TEST_VERSION_SET_URN.toString()),
+            eq(VERSION_SET_KEY_ASPECT_NAME),
+            anyMap(),
+            eq(true),
+            eq(true));
   }
 
   @Test
@@ -424,6 +450,7 @@ public void testUnlinkNotLatestVersionWithPriorVersion() throws Exception {
             eq(TEST_DATASET_URN_2.toString()),
             eq(VERSION_PROPERTIES_ASPECT_NAME),
             anyMap(),
+            eq(true),
             eq(true)))
         .thenReturn(Optional.of(versionPropsDeleteResult));
 
@@ -439,8 +466,16 @@ public void testUnlinkNotLatestVersionWithPriorVersion() throws Exception {
             eq(TEST_DATASET_URN_2.toString()),
             eq(VERSION_PROPERTIES_ASPECT_NAME),
             anyMap(),
+            eq(true),
+            eq(true));
+    verify(mockEntityService, never())
+        .deleteAspect(
+            eq(mockOpContext),
+            eq(TEST_VERSION_SET_URN.toString()),
+            eq(VERSION_SET_KEY_ASPECT_NAME),
+            anyMap(),
+            eq(true),
             eq(true));
-    verify(mockEntityService, never()).deleteUrn(eq(mockOpContext), eq(TEST_VERSION_SET_URN));
   }
 
   @Test
@@ -492,7 +527,12 @@ public void testUnlinkNotReturnedSingleVersionWithPriorVersion() throws Exceptio
             false,
             0);
     when(mockEntityService.deleteAspect(
-            eq(mockOpContext), anyString(), eq(VERSION_PROPERTIES_ASPECT_NAME), anyMap(), eq(true)))
+            eq(mockOpContext),
+            anyString(),
+            eq(VERSION_PROPERTIES_ASPECT_NAME),
+            anyMap(),
+            eq(true),
+            eq(true)))
         .thenReturn(Optional.of(versionPropsDeleteResult));
 
     // Execute
@@ -507,9 +547,17 @@ public void testUnlinkNotReturnedSingleVersionWithPriorVersion() throws Exceptio
             eq(TEST_DATASET_URN_2.toString()),
             eq(VERSION_PROPERTIES_ASPECT_NAME),
             anyMap(),
+            eq(true),
             eq(true));
     verify(mockEntityService).ingestProposal(eq(mockOpContext), any(), eq(false));
-    verify(mockEntityService, never()).deleteUrn(eq(mockOpContext), eq(TEST_VERSION_SET_URN));
+    verify(mockEntityService, never())
+        .deleteAspect(
+            eq(mockOpContext),
+            eq(TEST_VERSION_SET_URN.toString()),
+            eq(VERSION_SET_KEY_ASPECT_NAME),
+            anyMap(),
+            eq(true),
+            eq(true));
   }
 
   @Test
@@ -562,7 +610,12 @@ public void testUnlinkNotReturnedDoubleVersionWithPriorVersion() throws Exceptio
             false,
             0);
     when(mockEntityService.deleteAspect(
-            eq(mockOpContext), anyString(), eq(VERSION_PROPERTIES_ASPECT_NAME), anyMap(), eq(true)))
+            eq(mockOpContext),
+            anyString(),
+            eq(VERSION_PROPERTIES_ASPECT_NAME),
+            anyMap(),
+            eq(true),
+            eq(true)))
         .thenReturn(Optional.of(versionPropsDeleteResult));
 
     // Execute
@@ -577,9 +630,17 @@ public void testUnlinkNotReturnedDoubleVersionWithPriorVersion() throws Exceptio
             eq(TEST_DATASET_URN_3.toString()),
             eq(VERSION_PROPERTIES_ASPECT_NAME),
             anyMap(),
+            eq(true),
             eq(true));
     verify(mockEntityService).ingestProposal(eq(mockOpContext), any(), eq(false));
-    verify(mockEntityService, never()).deleteUrn(eq(mockOpContext), eq(TEST_VERSION_SET_URN));
+    verify(mockEntityService, never())
+        .deleteAspect(
+            eq(mockOpContext),
+            eq(TEST_VERSION_SET_URN.toString()),
+            eq(VERSION_SET_KEY_ASPECT_NAME),
+            anyMap(),
+            eq(true),
+            eq(true));
   }
 
   @Test
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/sideeffects/VersionSetSideEffectTest.java b/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/sideeffects/VersionSetSideEffectTest.java
index 35445efaedc607..ed4ec2608b0f94 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/sideeffects/VersionSetSideEffectTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/sideeffects/VersionSetSideEffectTest.java
@@ -5,21 +5,23 @@
 import static com.linkedin.metadata.Constants.VERSION_SET_ENTITY_NAME;
 import static com.linkedin.metadata.Constants.VERSION_SET_PROPERTIES_ASPECT_NAME;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
 
 import com.linkedin.common.GlobalTags;
 import com.linkedin.common.TagAssociationArray;
 import com.linkedin.common.VersionProperties;
+import com.linkedin.common.VersionTag;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.data.template.RecordTemplate;
 import com.linkedin.metadata.aspect.GraphRetriever;
+import com.linkedin.metadata.aspect.SystemAspect;
 import com.linkedin.metadata.aspect.batch.MCPItem;
 import com.linkedin.metadata.aspect.plugins.config.AspectPluginConfig;
 import com.linkedin.metadata.entity.SearchRetriever;
 import com.linkedin.metadata.entity.ebean.batch.ChangeItemImpl;
 import com.linkedin.metadata.entity.ebean.batch.MCLItemImpl;
-import com.linkedin.metadata.entity.ebean.batch.PatchItemImpl;
 import com.linkedin.metadata.models.EntitySpec;
 import com.linkedin.metadata.utils.AuditStampUtils;
 import com.linkedin.test.metadata.aspect.MockAspectRetriever;
@@ -27,7 +29,6 @@
 import com.linkedin.versionset.VersionSetProperties;
 import com.linkedin.versionset.VersioningScheme;
 import io.datahubproject.metadata.context.RetrieverContext;
-import jakarta.json.JsonObject;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -70,12 +71,14 @@ public void setup() {
         new VersionProperties()
             .setVersionSet(TEST_VERSION_SET_URN)
             .setIsLatest(false)
-            .setSortId("AAAAAAAA");
+            .setSortId("AAAAAAAA")
+            .setVersion(new VersionTag().setVersionTag("123"));
     VersionProperties previousLatestProperties =
         new VersionProperties()
             .setVersionSet(TEST_VERSION_SET_URN)
             .setIsLatest(true)
-            .setSortId("AAAAAAAB");
+            .setSortId("AAAAAAAB")
+            .setVersion(new VersionTag().setVersionTag("123"));
     Map<Urn, List<RecordTemplate>> data = new HashMap<>();
     data.put(NEW_LATEST_URN, Collections.singletonList(existingProperties));
     data.put(PREVIOUS_LATEST_URN, Collections.singletonList(previousLatestProperties));
@@ -107,6 +110,8 @@ public void testUpdateLatestVersion() {
 
     EntitySpec entitySpec = TEST_REGISTRY.getEntitySpec(VERSION_SET_ENTITY_NAME);
 
+    SystemAspect prevData = mock(SystemAspect.class);
+    when(prevData.getRecordTemplate()).thenReturn(previousProperties);
     // Create change item
     ChangeItemImpl changeItem =
         ChangeItemImpl.builder()
@@ -115,40 +120,29 @@ public void testUpdateLatestVersion() {
             .entitySpec(entitySpec)
             .aspectSpec(entitySpec.getAspectSpec(VERSION_SET_PROPERTIES_ASPECT_NAME))
             .recordTemplate(newProperties)
+            .previousSystemAspect(prevData)
             .auditStamp(AuditStampUtils.createDefaultAuditStamp())
             .build(mockAspectRetriever);
 
-    // Create MCL item with previous aspect
-    MCLItemImpl mclItem =
-        MCLItemImpl.builder()
-            .previousRecordTemplate(previousProperties)
-            .build(changeItem, previousProperties, null, retrieverContext.getAspectRetriever());
-
     // Run side effect
     List<MCPItem> sideEffectResults =
         sideEffect
-            .postMCPSideEffect(Collections.singletonList(mclItem), retrieverContext)
+            .applyMCPSideEffect(Collections.singletonList(changeItem), retrieverContext)
             .collect(Collectors.toList());
 
     // Verify results
     assertEquals(sideEffectResults.size(), 2, "Expected two patch operations");
 
     // Verify patch for previous latest version
-    MCPItem previousPatch = sideEffectResults.get(0);
-    assertEquals(previousPatch.getUrn(), PREVIOUS_LATEST_URN);
-    JsonObject previousPatchOp =
-        ((PatchItemImpl) previousPatch).getPatch().toJsonArray().getJsonObject(0);
-    assertEquals(previousPatchOp.getString("op"), "add");
-    assertEquals(previousPatchOp.getString("path"), "/isLatest");
-    assertEquals(previousPatchOp.getBoolean("value"), false);
-
-    // Verify patch for new latest version
-    MCPItem newPatch = sideEffectResults.get(1);
-    assertEquals(newPatch.getUrn(), NEW_LATEST_URN);
-    JsonObject newPatchOp = ((PatchItemImpl) newPatch).getPatch().toJsonArray().getJsonObject(0);
-    assertEquals(newPatchOp.getString("op"), "add");
-    assertEquals(newPatchOp.getString("path"), "/isLatest");
-    assertEquals(newPatchOp.getBoolean("value"), true);
+    MCPItem patched = sideEffectResults.get(0);
+    assertEquals(patched.getUrn(), PREVIOUS_LATEST_URN);
+    VersionProperties versionProperties = patched.getAspect(VersionProperties.class);
+    assertEquals(versionProperties.isIsLatest(), false);
+
+    MCPItem patched2 = sideEffectResults.get(1);
+    assertEquals(patched2.getUrn(), NEW_LATEST_URN);
+    VersionProperties versionProperties2 = patched2.getAspect(VersionProperties.class);
+    assertEquals(versionProperties2.isIsLatest(), true);
   }
 
   @Test
@@ -175,28 +169,20 @@ public void testNoChangesWhenLatestRemainsSame() {
             .auditStamp(AuditStampUtils.createDefaultAuditStamp())
             .build(mockAspectRetriever);
 
-    // Create MCL item with previous aspect
-    MCLItemImpl mclItem =
-        MCLItemImpl.builder()
-            .previousRecordTemplate(previousProperties)
-            .build(changeItem, null, null, retrieverContext.getAspectRetriever());
-
     // Run side effect
     List<MCPItem> sideEffectResults =
         sideEffect
-            .postMCPSideEffect(Collections.singletonList(mclItem), retrieverContext)
+            .applyMCPSideEffect(Collections.singletonList(changeItem), retrieverContext)
             .collect(Collectors.toList());
 
     // Verify results - should still get one patch to set isLatest=true on current latest
     assertEquals(sideEffectResults.size(), 1, "Expected one patch operation");
 
     // Verify patch operation
-    MCPItem patch = sideEffectResults.get(0);
-    assertEquals(patch.getUrn(), NEW_LATEST_URN);
-    JsonObject patchOp = ((PatchItemImpl) patch).getPatch().toJsonArray().getJsonObject(0);
-    assertEquals(patchOp.getString("op"), "add");
-    assertEquals(patchOp.getString("path"), "/isLatest");
-    assertEquals(patchOp.getBoolean("value"), true);
+    MCPItem patched = sideEffectResults.get(0);
+    assertEquals(patched.getUrn(), NEW_LATEST_URN);
+    VersionProperties versionProperties = patched.getAspect(VersionProperties.class);
+    assertEquals(versionProperties.isIsLatest(), true);
   }
 
   @Test
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/validation/VersionPropertiesValidatorTest.java b/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/validation/VersionPropertiesValidatorTest.java
index 4afd05c98a9312..95bdd73adb9013 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/validation/VersionPropertiesValidatorTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/entity/versioning/validation/VersionPropertiesValidatorTest.java
@@ -1,8 +1,14 @@
 package com.linkedin.metadata.entity.versioning.validation;
 
 import static com.linkedin.metadata.Constants.CHART_ENTITY_NAME;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.when;
 
 import com.linkedin.common.VersionProperties;
+import com.linkedin.common.VersionTag;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.data.template.RecordTemplate;
@@ -11,6 +17,8 @@
 import com.linkedin.metadata.aspect.plugins.validation.AspectValidationException;
 import com.linkedin.metadata.entity.SearchRetriever;
 import com.linkedin.metadata.key.VersionSetKey;
+import com.linkedin.metadata.search.ScrollResult;
+import com.linkedin.metadata.search.SearchEntityArray;
 import com.linkedin.test.metadata.aspect.MockAspectRetriever;
 import com.linkedin.test.metadata.aspect.TestEntityRegistry;
 import com.linkedin.test.metadata.aspect.batch.TestMCP;
@@ -42,6 +50,9 @@ public class VersionPropertiesValidatorTest {
   @BeforeMethod
   public void setup() {
     mockSearchRetriever = Mockito.mock(SearchRetriever.class);
+    when(mockSearchRetriever.scroll(
+            anyList(), any(), nullable(String.class), anyInt(), anyList(), any()))
+        .thenReturn(new ScrollResult().setEntities(new SearchEntityArray()));
     mockGraphRetriever = Mockito.mock(GraphRetriever.class);
 
     // Create version set key and properties
@@ -69,6 +80,7 @@ public void testValidVersionProperties() {
     VersionProperties properties = new VersionProperties();
     properties.setVersionSet(TEST_VERSION_SET_URN);
     properties.setSortId("ABCDEFGH"); // Valid 8-char uppercase alpha
+    properties.setVersion(new VersionTag().setVersionTag("123"));
 
     Stream<AspectValidationException> validationResult =
         VersionPropertiesValidator.validatePropertiesUpserts(
@@ -83,6 +95,7 @@ public void testInvalidSortId() {
     VersionProperties properties = new VersionProperties();
     properties.setVersionSet(TEST_VERSION_SET_URN);
     properties.setSortId("123"); // Invalid - not 8 chars, not alpha
+    properties.setVersion(new VersionTag().setVersionTag("123"));
 
     Stream<AspectValidationException> validationResult =
         VersionPropertiesValidator.validatePropertiesUpserts(
@@ -135,6 +148,7 @@ public void testEntityTypeMismatch() {
     VersionProperties properties = new VersionProperties();
     properties.setVersionSet(TEST_VERSION_SET_URN);
     properties.setSortId("ABCDEFGH");
+    properties.setVersion(new VersionTag().setVersionTag("123"));
 
     Stream<AspectValidationException> validationResult =
         VersionPropertiesValidator.validatePropertiesUpserts(
diff --git a/metadata-service/openapi-servlet/src/test/java/mock/MockEntityService.java b/metadata-service/openapi-servlet/src/test/java/mock/MockEntityService.java
index 4073bff4a22f95..e30323e5357754 100644
--- a/metadata-service/openapi-servlet/src/test/java/mock/MockEntityService.java
+++ b/metadata-service/openapi-servlet/src/test/java/mock/MockEntityService.java
@@ -232,7 +232,8 @@ public RollbackRunResult rollbackWithConditions(
       @Nonnull OperationContext opContext,
       List<AspectRowSummary> aspectRows,
       Map<String, String> conditions,
-      boolean hardDelete) {
+      boolean hardDelete,
+      boolean preProcessHooks) {
     return null;
   }
 
diff --git a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityResource.java b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityResource.java
index d05bf4a4598473..1241d5085c4616 100644
--- a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityResource.java
+++ b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/EntityResource.java
@@ -879,7 +879,7 @@ public Task<RollbackResponse> deleteEntities(
             Map<String, String> conditions = new HashMap();
             conditions.put("registryName", finalRegistryName1);
             conditions.put("registryVersion", finalRegistryVersion1.toString());
-            entityService.rollbackWithConditions(opContext, aspectRowsToDelete, conditions, false);
+            entityService.rollbackWithConditions(opContext, aspectRowsToDelete, conditions, false, false);
           }
           return response;
         },
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/datahubusage/DataHubUsageEventType.java b/metadata-service/services/src/main/java/com/linkedin/metadata/datahubusage/DataHubUsageEventType.java
index d20130e483c0a9..72391aa6664d3b 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/datahubusage/DataHubUsageEventType.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/datahubusage/DataHubUsageEventType.java
@@ -98,7 +98,10 @@ public enum DataHubUsageEventType {
   SHOW_HIDE_LINEAGE_COLUMNS_EVENT("ShowHideLineageColumnsEvent"),
   SEARCH_LINEAGE_COLUMNS_EVENT("SearchLineageColumnsEvent"),
   FILTER_LINEAGE_COLUMNS_EVENT("FilterLineageColumnsEvent"),
-  DRILL_DOWN_LINEAGE_EVENT("DrillDownLineageEvent");
+  DRILL_DOWN_LINEAGE_EVENT("DrillDownLineageEvent"),
+  SHOW_ALL_VERSIONS_EVENT("ShowAllVersionsEvent"),
+  LINK_ASSET_VERSION_EVENT("LinkAssetVersionEvent"),
+  UNLINK_ASSET_VERSION_EVENT("UnlinkAssetVersionEvent");
 
   private final String type;
 
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/entity/EntityService.java b/metadata-service/services/src/main/java/com/linkedin/metadata/entity/EntityService.java
index 57af4aa05fff6f..a6869be916300e 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/entity/EntityService.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/entity/EntityService.java
@@ -461,6 +461,38 @@ Pair<Future<?>, Boolean> alwaysProduceMCLAsync(
       AspectSpec aspectSpec,
       @Nonnull final MetadataChangeLog metadataChangeLog);
 
+  /**
+   * Generally should not be necessary, created for delete flow which does not have System Metadata,
+   * so it lacks a way to force through index updates synchronously.
+   *
+   * @param opContext the current operation context
+   * @param urn urn to produce event for
+   * @param aspectSpec aspect of the entity
+   * @param metadataChangeLog the MCL to produce
+   * @return list of the mcl produce future along with a boolean indicating if the event was
+   *     pre-processed
+   */
+  Pair<Future<?>, Boolean> alwaysProduceMCLAsync(
+      @Nonnull OperationContext opContext,
+      @Nonnull final Urn urn,
+      AspectSpec aspectSpec,
+      @Nonnull final MetadataChangeLog metadataChangeLog,
+      boolean forcePreProcessHooks);
+
+  Pair<Future<?>, Boolean> alwaysProduceMCLAsync(
+      @Nonnull OperationContext opContext,
+      @Nonnull final Urn urn,
+      @Nonnull String entityName,
+      @Nonnull String aspectName,
+      @Nullable final AspectSpec aspectSpec,
+      @Nullable final RecordTemplate oldAspectValue,
+      @Nullable final RecordTemplate newAspectValue,
+      @Nullable final SystemMetadata oldSystemMetadata,
+      @Nullable final SystemMetadata newSystemMetadata,
+      @Nonnull AuditStamp auditStamp,
+      @Nonnull final ChangeType changeType,
+      boolean forcePreProcessHooks);
+
   Pair<Future<?>, Boolean> alwaysProduceMCLAsync(
       @Nonnull OperationContext opContext,
       @Nonnull final Urn urn,
@@ -502,9 +534,20 @@ default Optional<RollbackResult> deleteAspect(
       String aspectName,
       @Nonnull Map<String, String> conditions,
       boolean hardDelete) {
+    return deleteAspect(opContext, urn, aspectName, conditions, hardDelete, false);
+  }
+
+  default Optional<RollbackResult> deleteAspect(
+      @Nonnull OperationContext opContext,
+      String urn,
+      String aspectName,
+      @Nonnull Map<String, String> conditions,
+      boolean hardDelete,
+      boolean preProcessHooks) {
     AspectRowSummary aspectRowSummary =
         new AspectRowSummary().setUrn(urn).setAspectName(aspectName);
-    return rollbackWithConditions(opContext, List.of(aspectRowSummary), conditions, hardDelete)
+    return rollbackWithConditions(
+            opContext, List.of(aspectRowSummary), conditions, hardDelete, preProcessHooks)
         .getRollbackResults()
         .stream()
         .findFirst();
@@ -522,7 +565,8 @@ RollbackRunResult rollbackWithConditions(
       @Nonnull OperationContext opContext,
       List<AspectRowSummary> aspectRows,
       Map<String, String> conditions,
-      boolean hardDelete);
+      boolean hardDelete,
+      boolean preProcessHooks);
 
   List<IngestResult> ingestProposal(
       @Nonnull OperationContext opContext, AspectsBatch aspectsBatch, final boolean async);
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/search/utils/QueryUtils.java b/metadata-service/services/src/main/java/com/linkedin/metadata/search/utils/QueryUtils.java
index 4cd9ec6c75b786..16faced03bc0c6 100644
--- a/metadata-service/services/src/main/java/com/linkedin/metadata/search/utils/QueryUtils.java
+++ b/metadata-service/services/src/main/java/com/linkedin/metadata/search/utils/QueryUtils.java
@@ -87,6 +87,14 @@ public static Filter newDisjunctiveFilter(@Nonnull Criterion... orCriterion) {
                 .collect(Collectors.toCollection(ConjunctiveCriterionArray::new)));
   }
 
+  @Nonnull
+  public static Filter newDisjunctiveFilter(@Nonnull ConjunctiveCriterion... orCriterion) {
+    return new Filter()
+        .setOr(
+            Arrays.stream(orCriterion)
+                .collect(Collectors.toCollection(ConjunctiveCriterionArray::new)));
+  }
+
   @Nonnull
   public static Filter newConjunctiveFilter(@Nonnull Criterion... andCriterion) {
     ConjunctiveCriterionArray orCriteria = new ConjunctiveCriterionArray();
diff --git a/metadata-utils/src/main/java/com/linkedin/metadata/utils/CriterionUtils.java b/metadata-utils/src/main/java/com/linkedin/metadata/utils/CriterionUtils.java
index f8e138487fc168..88917eef36ce76 100644
--- a/metadata-utils/src/main/java/com/linkedin/metadata/utils/CriterionUtils.java
+++ b/metadata-utils/src/main/java/com/linkedin/metadata/utils/CriterionUtils.java
@@ -4,7 +4,9 @@
 
 import com.linkedin.data.template.StringArray;
 import com.linkedin.metadata.query.filter.Condition;
+import com.linkedin.metadata.query.filter.ConjunctiveCriterion;
 import com.linkedin.metadata.query.filter.Criterion;
+import com.linkedin.metadata.query.filter.CriterionArray;
 import com.linkedin.metadata.query.filter.Filter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -132,4 +134,11 @@ public static Criterion buildCriterion(
     criterion.setValue(""); // deprecated
     return criterion;
   }
+
+  public static ConjunctiveCriterion buildConjunctiveCriterion(Criterion... criteria) {
+    ConjunctiveCriterion conjunctiveCriterion = new ConjunctiveCriterion();
+    conjunctiveCriterion.setAnd(
+        new CriterionArray(Arrays.stream(criteria).collect(Collectors.toList())));
+    return conjunctiveCriterion;
+  }
 }
diff --git a/smoke-test/tests/cypress/cypress/e2e/auto_completeV2/v2_auto_complete.js b/smoke-test/tests/cypress/cypress/e2e/auto_completeV2/v2_auto_complete.js
index fcd999e26c43b5..fbae20c3da53f2 100644
--- a/smoke-test/tests/cypress/cypress/e2e/auto_completeV2/v2_auto_complete.js
+++ b/smoke-test/tests/cypress/cypress/e2e/auto_completeV2/v2_auto_complete.js
@@ -34,7 +34,7 @@ describe("auto-complete", () => {
   it("should send you to the entity profile after clicking on an auto-complete option", () => {
     cy.get("input[data-testid=search-input]")
       .should("be.visible")
-      .type("SampleCypressHiveDataset");
+      .type("SampleCypressHiveDataset", { delay: 0 });
     cy.get('[data-testid^="auto-complete-option"]').first().click();
     cy.url().should(
       "include",
diff --git a/smoke-test/tests/entity_versioning/test_versioning.py b/smoke-test/tests/entity_versioning/test_versioning.py
index c331cc5305a336..c6e25b3418e550 100644
--- a/smoke-test/tests/entity_versioning/test_versioning.py
+++ b/smoke-test/tests/entity_versioning/test_versioning.py
@@ -1,64 +1,214 @@
 import pytest
 
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.ingestion.graph.client import DataHubGraph
+from datahub.metadata.schema_classes import (
+    DatasetKeyClass,
+    VersionPropertiesClass,
+    VersionSetPropertiesClass,
+)
+from datahub.metadata.urns import DatasetUrn, VersionSetUrn
+from tests.consistency_utils import wait_for_writes_to_sync
 
-@pytest.fixture(scope="module", autouse=True)
-def test_link_unlink_version(auth_session):
-    """Fixture to execute setup before and tear down after all tests are run"""
-    res_data = link_version(auth_session)
+VERSION_SET_URN = VersionSetUrn("12345678910", DatasetUrn.ENTITY_TYPE).urn()
+ENTITY_URN_OBJS = [DatasetUrn("snowflake", f"versioning_{i}") for i in range(3)]
+ENTITY_URNS = [urn.urn() for urn in ENTITY_URN_OBJS]
 
-    assert res_data
-    assert res_data["data"]
-    assert res_data["data"]["linkAssetVersion"]
+
+@pytest.fixture(scope="function", autouse=True)
+def ingest_cleanup_data(graph_client: DataHubGraph):
+    try:
+        for urn in ENTITY_URN_OBJS:
+            graph_client.emit_mcp(
+                MetadataChangeProposalWrapper(
+                    entityUrn=urn.urn(),
+                    aspect=DatasetKeyClass(
+                        platform=urn.platform, name=urn.name, origin=urn.env
+                    ),
+                )
+            )
+        for i in [2, 1, 0, 0, 1, 2]:
+            graph_client.unlink_asset_from_version_set(ENTITY_URNS[i])
+        yield
+    finally:
+        for i in [2, 1, 0, 0, 1, 2]:
+            graph_client.unlink_asset_from_version_set(ENTITY_URNS[i])
+        wait_for_writes_to_sync()
+
+
+def test_link_unlink_version(graph_client: DataHubGraph):
+    assert graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass) is None
+    version_set_urn = graph_client.link_asset_to_version_set(
+        ENTITY_URNS[0], VERSION_SET_URN, "v0"
+    )
+    assert version_set_urn == VERSION_SET_URN
+    # We should not need to wait here, but we do
+    wait_for_writes_to_sync()
+    unlinked_version_set = graph_client.unlink_asset_from_version_set(ENTITY_URNS[0])
+    assert unlinked_version_set == VERSION_SET_URN
+    assert graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass) is None
+
+
+def test_link_unlink_three_versions(graph_client):
+    assert graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass) is None
+    for i, entity_urn in enumerate(ENTITY_URNS):
+        version_set_urn = graph_client.link_asset_to_version_set(
+            entity_urn, VERSION_SET_URN, f"v{i}"
+        )
+        assert version_set_urn == VERSION_SET_URN
+    # We should not need to wait here, but we do
+    wait_for_writes_to_sync()
+    assert (
+        graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass).latest
+        == ENTITY_URNS[2]
+    )
+    assert graph_client.get_aspect(ENTITY_URNS[2], VersionPropertiesClass).isLatest
+
+    unlinked_version_set = graph_client.unlink_asset_from_version_set(ENTITY_URNS[2])
+    assert unlinked_version_set == VERSION_SET_URN
+
+    assert (
+        graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass).latest
+        == ENTITY_URNS[1]
+    )
+    assert graph_client.get_aspect(ENTITY_URNS[1], VersionPropertiesClass).isLatest
+
+
+def test_link_unlink_three_versions_unlink_all(graph_client):
+    assert graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass) is None
+    for i, entity_urn in enumerate(ENTITY_URNS):
+        version_set_urn = graph_client.link_asset_to_version_set(
+            entity_urn, VERSION_SET_URN, f"v{i}"
+        )
+        assert version_set_urn == VERSION_SET_URN
+
+    # We should not need to wait here, but we do
+    wait_for_writes_to_sync()
+    assert (
+        graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass).latest
+        == ENTITY_URNS[2]
+    )
+    assert graph_client.get_aspect(ENTITY_URNS[2], VersionPropertiesClass).isLatest
+
+    unlinked_version_set = graph_client.unlink_asset_from_version_set(ENTITY_URNS[2])
+    # We should not need to wait here, but we do
+    wait_for_writes_to_sync()
+    assert unlinked_version_set == VERSION_SET_URN
+
+    assert (
+        graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass).latest
+        == ENTITY_URNS[1]
+    )
+    assert graph_client.get_aspect(ENTITY_URNS[1], VersionPropertiesClass).isLatest
+
+    unlinked_version_set = graph_client.unlink_asset_from_version_set(ENTITY_URNS[1])
+    # We should not need to wait here, but we do
+    wait_for_writes_to_sync()
+
+    assert unlinked_version_set == VERSION_SET_URN
+
+    assert (
+        graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass).latest
+        == ENTITY_URNS[0]
+    )
+    assert graph_client.get_aspect(ENTITY_URNS[0], VersionPropertiesClass).isLatest
+
+    unlinked_version_set = graph_client.unlink_asset_from_version_set(ENTITY_URNS[0])
+
+    assert unlinked_version_set == VERSION_SET_URN
+
+    assert graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass) is None
+
+
+def test_link_unlink_three_versions_unlink_middle_and_latest(graph_client):
+    assert graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass) is None
+    for i, entity_urn in enumerate(ENTITY_URNS):
+        version_set_urn = graph_client.link_asset_to_version_set(
+            entity_urn, VERSION_SET_URN, f"v{i}"
+        )
+        assert version_set_urn == VERSION_SET_URN
+    # We should not need to wait here, but we do
+    wait_for_writes_to_sync()
+    assert (
+        graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass).latest
+        == ENTITY_URNS[2]
+    )
+    assert graph_client.get_aspect(ENTITY_URNS[2], VersionPropertiesClass).isLatest
+
+    unlinked_version_set = graph_client.unlink_asset_from_version_set(ENTITY_URNS[1])
+    # We should not need to wait here, but we do
+    wait_for_writes_to_sync()
+    assert unlinked_version_set == VERSION_SET_URN
+
+    assert (
+        graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass).latest
+        == ENTITY_URNS[2]
+    )
+    assert graph_client.get_aspect(ENTITY_URNS[2], VersionPropertiesClass).isLatest
+
+    unlinked_version_set = graph_client.unlink_asset_from_version_set(ENTITY_URNS[2])
+
+    assert unlinked_version_set == VERSION_SET_URN
+
+    assert (
+        graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass).latest
+        == ENTITY_URNS[0]
+    )
+    assert graph_client.get_aspect(ENTITY_URNS[0], VersionPropertiesClass).isLatest
+
+
+def test_link_unlink_three_versions_unlink_and_relink(graph_client):
+    assert graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass) is None
+    for i, entity_urn in enumerate(ENTITY_URNS):
+        version_set_urn = graph_client.link_asset_to_version_set(
+            entity_urn, VERSION_SET_URN, f"v{i}"
+        )
+        assert version_set_urn == VERSION_SET_URN
+    # We should not need to wait here, but we do
+    wait_for_writes_to_sync()
     assert (
-        res_data["data"]["linkAssetVersion"]
-        == "urn:li:dataset:(urn:li:dataPlatform:kafka,SampleKafkaDataset,PROD)"
+        graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass).latest
+        == ENTITY_URNS[2]
     )
+    assert graph_client.get_aspect(ENTITY_URNS[2], VersionPropertiesClass).isLatest
 
-    res_data = unlink_version(auth_session)
-
-    assert res_data
-    assert res_data["data"]
-    assert res_data["data"]["unlinkAssetVersion"]
-
-
-def link_version(auth_session):
-    json = {
-        "mutation": """mutation linkAssetVersion($input: LinkVersionInput!) {\n
-            linkAssetVersion(input: $input)
-            }\n
-        }""",
-        "variables": {
-            "input": {
-                "version": "1233456",
-                "versionSet": "urn:li:versionSet:(12345678910,dataset)",
-                "linkedEntity": "urn:li:dataset:(urn:li:dataPlatform:kafka,SampleKafkaDataset,PROD)",
-            }
-        },
-    }
-    response = auth_session.post(
-        f"{auth_session.frontend_url()}/api/v2/graphql", json=json
+    unlinked_version_set = graph_client.unlink_asset_from_version_set(ENTITY_URNS[2])
+    # We should not need to wait here, but we do
+    wait_for_writes_to_sync()
+    assert unlinked_version_set == VERSION_SET_URN
+
+    assert (
+        graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass).latest
+        == ENTITY_URNS[1]
     )
-    response.raise_for_status()
-
-    return response.json()
-
-
-def unlink_version(auth_session):
-    json = {
-        "mutation": """mutation unlinkAssetVersion($input: UnlinkVersionInput!) {\n
-            unlinkAssetVersion(input: $input)
-            }\n
-        }""",
-        "variables": {
-            "input": {
-                "versionSet": "urn:li:versionSet:(12345678910,dataset)",
-                "unlinkedEntity": "urn:li:dataset:(urn:li:dataPlatform:kafka,SampleKafkaDataset,PROD)",
-            }
-        },
-    }
-    response = auth_session.post(
-        f"{auth_session.frontend_url()}/api/v2/graphql", json=json
+    assert graph_client.get_aspect(ENTITY_URNS[1], VersionPropertiesClass).isLatest
+
+    unlinked_version_set = graph_client.unlink_asset_from_version_set(ENTITY_URNS[1])
+    # We should not need to wait here, but we do
+    wait_for_writes_to_sync()
+
+    assert unlinked_version_set == VERSION_SET_URN
+
+    assert (
+        graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass).latest
+        == ENTITY_URNS[0]
     )
-    response.raise_for_status()
+    assert graph_client.get_aspect(ENTITY_URNS[0], VersionPropertiesClass).isLatest
+
+    unlinked_version_set = graph_client.unlink_asset_from_version_set(ENTITY_URNS[0])
+
+    assert unlinked_version_set == VERSION_SET_URN
+
+    assert graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass) is None
 
-    return response.json()
+    for i, entity_urn in enumerate(ENTITY_URNS):
+        version_set_urn = graph_client.link_asset_to_version_set(
+            entity_urn, VERSION_SET_URN, f"v{i}"
+        )
+        assert version_set_urn == VERSION_SET_URN
+
+    assert (
+        graph_client.get_aspect(VERSION_SET_URN, VersionSetPropertiesClass).latest
+        == ENTITY_URNS[2]
+    )
+    assert graph_client.get_aspect(ENTITY_URNS[2], VersionPropertiesClass).isLatest

From 7f6e3995d3b4f88579c5b30022443cfa1a72a50d Mon Sep 17 00:00:00 2001
From: Chakru <161002324+chakru-r@users.noreply.github.com>
Date: Wed, 5 Feb 2025 00:57:56 +0530
Subject: [PATCH 224/249] docs(iceberg): add iceberg user guide (#12533)

---
 docs-website/sidebars.js                      |   5 +
 docs/iceberg-catalog.md                       | 402 ++++++++++++++++++
 .../docs/sources/iceberg/iceberg.md           |   3 +
 3 files changed, 410 insertions(+)
 create mode 100644 docs/iceberg-catalog.md

diff --git a/docs-website/sidebars.js b/docs-website/sidebars.js
index 7638db168b641a..02b7dd632e9212 100644
--- a/docs-website/sidebars.js
+++ b/docs-website/sidebars.js
@@ -919,6 +919,11 @@ module.exports = {
         },
       ],
     },
+    {
+      type: "doc",
+      id: "docs/iceberg-catalog",
+      label: "DataHub Iceberg REST Catalog",
+    },
     {
       "API & SDK Guides": [
         "docs/api/tutorials/datasets",
diff --git a/docs/iceberg-catalog.md b/docs/iceberg-catalog.md
new file mode 100644
index 00000000000000..ee3d13d2ad36cb
--- /dev/null
+++ b/docs/iceberg-catalog.md
@@ -0,0 +1,402 @@
+import FeatureAvailability from '@site/src/components/FeatureAvailability';
+
+# DataHub Iceberg Catalog
+
+<FeatureAvailability/>
+
+> Note that this feature is currently in open **Beta**. With any questions or issues, please reach out to your Acryl 
+> representative.
+
+> Open Source DataHub: 1.0.0
+
+## Introduction
+
+DataHub Iceberg Catalog provides integration with Apache Iceberg, allowing you to manage Iceberg tables through DataHub. This tutorial walks through setting up and using the DataHub Iceberg Catalog to create, read, and manage Iceberg tables. The catalog provides a secure way to manage Iceberg tables through DataHub's permissions model  while also enabling discovery use-cases for humans instantly.
+
+## Use Cases
+
+- Create and manage Iceberg tables through DataHub
+- Maintain consistent metadata across DataHub and Iceberg
+- Facilitate data discovery by exposing Iceberg table metadata in DataHub
+- Enable secure access to Iceberg tables through DataHub's permissions model
+
+## Conceptual Mapping
+
+| Iceberg Concept | DataHub Concept | Notes |
+|-----------------|-----------------|--------|
+| Overall platform | dataPlatform | `iceberg` platform |
+| Warehouse | dataPlatformInstance | Stores info such as storage credentials |
+| Namespace | container | Hierarchical containers of subtype "Namespace" |
+| Tables, Views | dataset | Dataset URN is UUID that persists across renames |
+| Table/View Names | platformResource | Points to dataset, changes with rename operations |
+
+## Prerequisites
+
+Before starting, ensure you have:
+
+1. DataHub installed and running locally, and `datahub` cli is installed and setup to point to it. 
+2. AWS credentials and appropriate permissions configured.
+3. The following environment variables set:
+   ```bash
+   DH_ICEBERG_CLIENT_ID="your_client_id"
+   DH_ICEBERG_CLIENT_SECRET="your_client_secret" 
+   DH_ICEBERG_AWS_ROLE="arn:aws:iam::123456789012:role/your-role-name"  # Example format
+   DH_ICEBERG_DATA_ROOT="s3://your-bucket/path"
+
+   ```
+4. Configure pyiceberg to use your local datahub using one of its supported ways. For example, create `~/.pyiceberg.yaml` with
+```commandline
+catalog:
+  local_datahub:
+    uri: http://localhost:8080/iceberg
+    warehouse: arctic_warehouse
+```
+
+Note: The python code snippets in this tutorial are available in the `metadata-ingestion/examples/iceberg` folder of the DataHub repository. These snippets require `pyiceberg[duckdb] >=0.8.1` to be installed.
+
+### Required AWS Permissions
+
+The AWS role must have read and write permissions for the S3 location specified in `DH_ICEBERG_DATA_ROOT`.
+
+Note: These permissions must be granted for the specific S3 bucket and path prefix where your Iceberg tables will be stored (as specified in `DH_ICEBERG_DATA_ROOT`). Additionally, the role must have a trust policy that allows it to be assumed using the AWS credentials provided in `DH_ICEBERG_CLIENT_ID` and `DH_ICEBERG_CLIENT_SECRET`.
+
+## Setup Instructions
+
+### 1. Provision a Warehouse
+
+First, create an Iceberg warehouse in DataHub using the provided script (`provision_warehouse.py`):
+
+```python
+import os
+
+from constants import warehouse
+
+# Assert that env variables are present
+
+assert os.environ.get("DH_ICEBERG_CLIENT_ID"), (
+   "DH_ICEBERG_CLIENT_ID variable is not present"
+)
+assert os.environ.get("DH_ICEBERG_CLIENT_SECRET"), (
+   "DH_ICEBERG_CLIENT_SECRET variable is not present"
+)
+assert os.environ.get("DH_ICEBERG_AWS_ROLE"), (
+   "DH_ICEBERG_AWS_ROLE variable is not present"
+)
+assert os.environ.get("DH_ICEBERG_DATA_ROOT"), (
+   "DH_ICEBERG_DATA_ROOT variable is not present"
+)
+
+assert os.environ.get("DH_ICEBERG_DATA_ROOT", "").startswith("s3://")
+
+os.system(
+   f"datahub iceberg create --warehouse {warehouse} --data_root $DH_ICEBERG_DATA_ROOT/{warehouse} --client_id $DH_ICEBERG_CLIENT_ID --client_secret $DH_ICEBERG_CLIENT_SECRET --region 'us-east-1' --role $DH_ICEBERG_AWS_ROLE"
+)
+```
+
+After provisioning the warehouse, ensure your DataHub user has the following privileges to the resource type Data Platform Instance, which were introduced with Iceberg support:
+- `DATA_MANAGE_VIEWS_PRIVILEGE`
+- `DATA_MANAGE_TABLES_PRIVILEGE`
+- `DATA_MANAGE_NAMESPACES_PRIVILEGE`
+- `DATA_LIST_ENTITIES_PRIVILEGE`
+
+You can grant these privileges through the DataHub UI under the Policies section.
+
+### 2. Create a Table
+
+You can create Iceberg tables using PyIceberg with a defined schema. Here's an example creating a ski resort metrics table:
+
+```python
+from constants import namespace, table_name, warehouse
+
+from pyiceberg.schema import Schema
+from pyiceberg.types import LongType, NestedField, StringType, TimestampType
+from pyiceberg.catalog import load_catalog
+from datahub.ingestion.graph.client import get_default_graph
+
+# Get DataHub graph client for authentication
+graph = get_default_graph()
+
+# Define schema with documentation
+schema = Schema(
+    NestedField(
+        field_id=1,
+        name="resort_id",
+        field_type=LongType(),
+        required=True,
+        doc="Unique identifier for each ski resort"
+    ),
+    NestedField(
+        field_id=2,
+        name="resort_name",
+        field_type=StringType(),
+        required=True,
+        doc="Official name of the ski resort"
+    ),
+    NestedField(
+        field_id=3,
+        name="daily_snowfall",
+        field_type=LongType(),
+        required=False,
+        doc="Amount of new snow in inches during the last 24 hours"
+    ),
+    NestedField(
+        field_id=4,
+        name="conditions",
+        field_type=StringType(),
+        required=False,
+        doc="Current snow conditions description"
+    ),
+    NestedField(
+        field_id=5,
+        name="last_updated",
+        field_type=TimestampType(),
+        required=False,
+        doc="Timestamp of when the snow report was last updated"
+    )
+)
+
+# Load catalog and create table
+catalog = load_catalog("local_datahub", warehouse=warehouse, token=graph.config.token)
+catalog.create_namespace(namespace)
+catalog.create_table(f"{namespace}.{table_name}", schema)
+```
+
+### 3. Write Data
+
+You can write data to your Iceberg table using PyArrow. Note the importance of matching the schema exactly:
+
+```python
+import pyarrow as pa
+from datetime import datetime
+
+# Create PyArrow schema to match Iceberg schema
+pa_schema = pa.schema([
+    ("resort_id", pa.int64(), False),  # False means not nullable
+    ("resort_name", pa.string(), False),
+    ("daily_snowfall", pa.int64(), True),
+    ("conditions", pa.string(), True),
+    ("last_updated", pa.timestamp("us"), True),
+])
+
+# Create sample data
+sample_data = pa.Table.from_pydict(
+    {
+        "resort_id": [1, 2, 3],
+        "resort_name": ["Snowpeak Resort", "Alpine Valley", "Glacier Heights"],
+        "daily_snowfall": [12, 8, 15],
+        "conditions": ["Powder", "Packed", "Fresh Powder"],
+        "last_updated": [
+            datetime.now(),
+            datetime.now(),
+            datetime.now()
+        ]
+    },
+    schema=pa_schema
+)
+
+# Write to table
+table = catalog.load_table(f"{namespace}.{table_name}")
+table.overwrite(sample_data)
+
+# Refresh table to see changes
+table.refresh()
+```
+
+### 4. Read Data
+
+Reading data from an Iceberg table using DuckDB integration:
+
+```python
+from pyiceberg.catalog import load_catalog
+
+# Get DataHub graph client for authentication
+graph = get_default_graph()
+
+
+catalog = load_catalog("local_datahub", warehouse=warehouse, token=graph.config.token)
+table = catalog.load_table(f"{namespace}.{table_name}")
+con = table.scan().to_duckdb(table_name=table_name)
+
+# Query the data
+print("\nResort Metrics Data:")
+print("-" * 50)
+for row in con.execute(f"SELECT * FROM {table_name}").fetchall():
+    print(row)
+```
+
+## Integration with Compute Engines
+
+### Spark Integration
+
+You can connect to the DataHub Iceberg Catalog using Spark SQL by defining `$GMS_HOST`, `$GMS_PORT`, `$WAREHOUSE` to connect to and `$USER_PAT` - the DataHub Personal Access Token used to connect to the catalog:
+
+```sql
+spark-sql --packages org.apache.iceberg:iceberg-spark-runtime-3.5_2.12:1.6.1,org.apache.iceberg:iceberg-aws-bundle:1.6.1 \
+    --conf spark.sql.extensions=org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions \
+    --conf spark.sql.catalog.spark_catalog=org.apache.iceberg.spark.SparkSessionCatalog \
+    --conf spark.sql.catalog.local=org.apache.iceberg.spark.SparkCatalog \
+    --conf spark.sql.catalog.local.type=rest \
+    --conf spark.sql.catalog.local.uri=http://$GMS_HOST:$GMS_PORT/iceberg/ \
+    --conf spark.sql.catalog.local.warehouse=$WAREHOUSE \
+    --conf spark.sql.catalog.local.token=$USER_PAT \
+    --conf spark.sql.catalog.local.header.X-Iceberg-Access-Delegation=vended-credentials \
+    --conf spark.sql.defaultCatalog=local
+```
+
+## Reference Information
+
+### Trust Policy Example
+When setting up your AWS role, you'll need to configure a trust policy. Here's an example:
+
+```json
+{
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Effect": "Allow",
+            "Principal": {
+                "AWS": "arn:aws:iam::123456789012:user/iceberg-user"  // The IAM user or role associated with your credentials
+            },
+            "Action": "sts:AssumeRole"
+        }
+    ]
+}
+```
+
+### Namespace and Configuration Requirements
+
+1. **Namespace Creation**: A namespace must be created before any tables can be created within it.
+
+2. **Spark SQL Configuration**: To simplify SQL statements by avoiding the need to prefix catalog name and namespace, you can set defaults in your Spark configuration:
+   ```
+   --conf spark.sql.defaultCatalog=<default-catalog-name> \
+   --conf spark.sql.catalog.local.default-namespace=<default-namespace>
+   ```
+
+### DataHub Iceberg CLI
+
+The DataHub CLI provides several commands for managing Iceberg warehouses:
+
+1. **List Warehouses**:
+   ```
+   datahub iceberg list
+   ```
+
+2. **Update Warehouse Configuration**:
+   ```
+   datahub iceberg update \
+     -w $WAREHOUSE_NAME \
+     -d $DH_ICEBERG_DATA_ROOT \
+     -i $DH_ICEBERG_CLIENT_ID \
+     --client_secret $DH_ICEBERG_CLIENT_ID \
+     --region $DH_ICEBERG_REGION \
+     --role DH_ICEBERG_AWS_ROLE
+   ```
+
+3. **Delete Warehouse**:
+   ```
+   datahub iceberg delete -w $WAREHOUSE_NAME
+   ```
+   Note: This command deletes Containers associated with Namespaces and Datasets associated with Tables and Views in this warehouse. However, it does not delete any backing data in the warehouse data_root location - it only deletes entries from the catalog.
+
+For additional options and help, run:
+```
+datahub iceberg [command] --help
+```
+
+### Migrating from Other Iceberg Catalogs
+
+When migrating from another Iceberg catalog, you can register existing Iceberg tables using the `system.register_table` command. This allows you to start managing existing Iceberg tables through DataHub without moving the underlying data.
+
+Example of registering an existing table:
+```
+# REGISTER EXISTING ICEBERG TABLE 
+call system.register_table('barTable', 's3://my-s3-bucket/my-data-root/fooNs/barTable/metadata/00000-f9dbba67-df4f-4742-9ba5-123aa2bb4076.metadata.json');
+select * from barTable;
+```
+
+### Security and Permissions
+
+DataHub provides granular access control for Iceberg operations through policies. The following privileges were introduced with Iceberg support:
+
+| Operation | Required Privilege | Resource Type |
+|-----------|-------------------|---------------|
+| CREATE or DROP namespaces | Manage Namespaces | Data Platform Instance |
+| CREATE, ALTER or DROP tables | Manage Tables | Data Platform Instance |
+| CREATE, ALTER or DROP views | Manage Views | Data Platform Instance |
+| SELECT from tables or views | Read Only data-access | Dataset |
+| INSERT, UPDATE, DELETE or ALTER tables | Read-write data-access | Dataset |
+| List tables or views | List tables, views and namespaces | Data Platform Instance |
+
+To configure access:
+1. Create policies with the appropriate privileges for Iceberg users
+<p>
+  <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/cec184aa1e3cb15c087625ffc997b4345a858c8b/imgs/iceberg-policy-type.png"/>
+</p>
+
+2. Scope the policies by:
+    * Selecting specific warehouse Data Platform Instances for namespace, table management, and listing privileges
+    * Selecting specific DataSets for table and view data access privileges
+    * Selecting Tags that may be applied to DataSets or Data Platform Instances
+
+<p>
+  <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/cec184aa1e3cb15c087625ffc997b4345a858c8b/imgs/iceberg-policy-privileges.png"/>
+</p>
+
+3. Assign the policies to relevant users or groups
+<p>
+  <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/cec184aa1e3cb15c087625ffc997b4345a858c8b/imgs/iceberg-policy-users-groups.png"/>
+</p>
+
+### Iceberg tables in DataHub
+Once you create tables in iceberg, each of those tables show up in DataHub as a DataSet
+<p>
+  <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/cec184aa1e3cb15c087625ffc997b4345a858c8b/imgs/iceberg-dataset-schema.png"/>
+</p>
+
+## Troubleshooting
+
+### Q: How do I verify my warehouse was created successfully?
+
+A: Check the DataHub UI under Data Platform Instances, or try creating and reading a table using the provided scripts.
+
+### Q: What permissions are needed for S3 access?
+
+A: The role specified in `DH_ICEBERG_AWS_ROLE` should have permissions to read and write to the S3 bucket specified in `DH_ICEBERG_DATA_ROOT`.
+
+### Q: How does my compute engine authenticate with DataHub?
+
+A: A DataHub Personal Access Token can be used via bearer token to authenticate with DataHub.
+
+### Q: What should I do if table creation fails?
+
+A: Check that:
+1. All required environment variables are set correctly
+2. Your AWS role has the necessary permissions
+3. The namespace exists (create it if needed)
+4. The table name doesn't already exist
+
+## Known Limitations
+
+- AWS S3 only support
+- Concurrency - supports single instance of GMS
+- Multi-table transactional `/commit` is not yet supported
+- Table operation purge is not yet implemented
+- Metric collection and credential refresh mechanisms are still in development
+
+## Future Enhancements
+
+- Improved concurrency with multiple replicas of GMS
+- Support for Iceberg multi-table transactional `/commit`
+- Additional table APIs (scan, drop table purge)
+- Azure and GCP Support
+- Namespace permissions
+- Enhanced metrics
+- Credential refresh 
+- Proxy to another REST Catalog to use its capabilities while DataHub has real-time metadata updates.
+
+## Related Documentation
+
+- [Apache Iceberg Documentation](https://iceberg.apache.org/)
+- [PyIceberg Documentation](https://py.iceberg.apache.org/)
+- [DataHub Documentation](https://datahubproject.io/docs/)
\ No newline at end of file
diff --git a/metadata-ingestion/docs/sources/iceberg/iceberg.md b/metadata-ingestion/docs/sources/iceberg/iceberg.md
index 92aac5ffa6ce51..54801ebaae9bf6 100644
--- a/metadata-ingestion/docs/sources/iceberg/iceberg.md
+++ b/metadata-ingestion/docs/sources/iceberg/iceberg.md
@@ -23,3 +23,6 @@ This ingestion source maps the following Source System Concepts to DataHub Conce
 Each processing thread will open several files/sockets to download manifest files from blob storage. If you experience
 exceptions appearing when increasing `processing_threads` configuration parameter, try to increase limit of open
 files (i.e. using `ulimit` in Linux).
+
+## DataHub Iceberg REST Catalog
+DataHub also implements the Iceberg REST Catalog. See [here](docs/iceberg-catalog.md) for more details.
\ No newline at end of file

From ac13f255e6f2dd6fc95e2d25ff610b842a2d0aa9 Mon Sep 17 00:00:00 2001
From: Brock Griffey <52086127+brock-acryl@users.noreply.github.com>
Date: Wed, 5 Feb 2025 00:18:37 -0500
Subject: [PATCH 225/249] feat(ingestion/snowflake):adds streams as a new
 dataset with lineage and properties. (#12318)

Co-authored-by: Mayuri Nehate <33225191+mayurinehate@users.noreply.github.com>
---
 .../docs/sources/snowflake/snowflake_pre.md   |    9 +-
 .../ingestion/source/common/subtypes.py       |    1 +
 .../ingestion/source/snowflake/constants.py   |    1 +
 .../source/snowflake/snowflake_config.py      |   10 +
 .../source/snowflake/snowflake_queries.py     |   55 +-
 .../source/snowflake/snowflake_query.py       |   21 +-
 .../source/snowflake/snowflake_report.py      |    6 +
 .../source/snowflake/snowflake_schema.py      |  102 +-
 .../source/snowflake/snowflake_schema_gen.py  |  356 +-
 .../source/snowflake/snowflake_utils.py       |   25 +-
 .../source/snowflake/snowflake_v2.py          |   18 +-
 .../tests/integration/snowflake/common.py     |   46 +
 .../snowflake/snowflake_golden.json           | 4236 ++++++++++-------
 .../snowflake_privatelink_golden.json         |  383 ++
 ...nowflake_structured_properties_golden.json |  314 ++
 .../integration/snowflake/test_snowflake.py   |    3 +-
 .../snowflake/test_snowflake_failures.py      |    8 +-
 17 files changed, 3783 insertions(+), 1811 deletions(-)

diff --git a/metadata-ingestion/docs/sources/snowflake/snowflake_pre.md b/metadata-ingestion/docs/sources/snowflake/snowflake_pre.md
index 4cfbc470e8c239..420715e5312cb6 100644
--- a/metadata-ingestion/docs/sources/snowflake/snowflake_pre.md
+++ b/metadata-ingestion/docs/sources/snowflake/snowflake_pre.md
@@ -15,6 +15,8 @@ grant operate, usage on warehouse "<your-warehouse>" to role datahub_role;
 grant usage on DATABASE "<your-database>" to role datahub_role;
 grant usage on all schemas in database "<your-database>" to role datahub_role;
 grant usage on future schemas in database "<your-database>" to role datahub_role;
+grant select on all streams in database "<your-database>> to role datahub_role;
+grant select on future streams in database "<your-database>> to role datahub_role;
 
 // If you are NOT using Snowflake Profiling or Classification feature: Grant references privileges to your tables and views
 grant references on all tables in database "<your-database>" to role datahub_role;
@@ -50,9 +52,12 @@ The details of each granted privilege can be viewed in [snowflake docs](https://
   If the warehouse is already running during ingestion or has auto-resume enabled,
   this permission is not required.
 - `usage` is required for us to run queries using the warehouse
-- `usage` on `database` and `schema` are required because without it tables and views inside them are not accessible. If an admin does the required grants on `table` but misses the grants on `schema` or the `database` in which the table/view exists then we will not be able to get metadata for the table/view.
+- `usage` on `database` and `schema` are required because without it tables, views, and streams inside them are not accessible. If an admin does the required grants on `table` but misses the grants on `schema` or the `database` in which the table/view/stream exists then we will not be able to get metadata for the table/view/stream.
 - If metadata is required only on some schemas then you can grant the usage privilieges only on a particular schema like
-
+```sql
+grant usage on schema "<your-database>"."<your-schema>" to role datahub_role;
+```
+- `select` on `streams` is required in order for stream definitions to be available. This does not allow selecting of the data (not required) unless the underlying dataset has select access as well.
 ```sql
 grant usage on schema "<your-database>"."<your-schema>" to role datahub_role;
 ```
diff --git a/metadata-ingestion/src/datahub/ingestion/source/common/subtypes.py b/metadata-ingestion/src/datahub/ingestion/source/common/subtypes.py
index a5eecf198a9b49..8eb53259df8062 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/common/subtypes.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/common/subtypes.py
@@ -24,6 +24,7 @@ class DatasetSubTypes(StrEnum):
     SAC_LIVE_DATA_MODEL = "Live Data Model"
     NEO4J_NODE = "Neo4j Node"
     NEO4J_RELATIONSHIP = "Neo4j Relationship"
+    SNOWFLAKE_STREAM = "Snowflake Stream"
 
     # TODO: Create separate entity...
     NOTEBOOK = "Notebook"
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/constants.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/constants.py
index fc464cc5ea9bb5..84ccd2c67c95a1 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/constants.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/constants.py
@@ -53,6 +53,7 @@ class SnowflakeObjectDomain(StrEnum):
     SCHEMA = "schema"
     COLUMN = "column"
     ICEBERG_TABLE = "iceberg table"
+    STREAM = "stream"
 
 
 GENERIC_PERMISSION_ERROR_KEY = "permission-error"
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
index 6e1d4702b29c82..94ce51c031b8a0 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_config.py
@@ -98,6 +98,11 @@ class SnowflakeFilterConfig(SQLFilterConfig):
     )
     # table_pattern and view_pattern are inherited from SQLFilterConfig
 
+    stream_pattern: AllowDenyPattern = Field(
+        default=AllowDenyPattern.allow_all(),
+        description="Regex patterns for streams to filter in ingestion. Note: Defaults to table_pattern if not specified. Specify regex to match the entire view name in database.schema.view format. e.g. to match all views starting with customer in Customer database and public schema, use the regex 'Customer.public.customer.*'",
+    )
+
     match_fully_qualified_names: bool = Field(
         default=False,
         description="Whether `schema_pattern` is matched against fully qualified schema name `<catalog>.<schema>`.",
@@ -274,6 +279,11 @@ class SnowflakeV2Config(
         description="List of regex patterns for tags to include in ingestion. Only used if `extract_tags` is enabled.",
     )
 
+    include_streams: bool = Field(
+        default=True,
+        description="If enabled, streams will be ingested as separate entities from tables/views.",
+    )
+
     structured_property_pattern: AllowDenyPattern = Field(
         default=AllowDenyPattern.allow_all(),
         description=(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_queries.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_queries.py
index 69d0b62a8edfdf..eb015f9d13281f 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_queries.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_queries.py
@@ -49,6 +49,7 @@
 from datahub.sql_parsing.schema_resolver import SchemaResolver
 from datahub.sql_parsing.sql_parsing_aggregator import (
     KnownLineageMapping,
+    ObservedQuery,
     PreparsedQuery,
     SqlAggregatorReport,
     SqlParsingAggregator,
@@ -241,7 +242,13 @@ def get_workunits_internal(
         use_cached_audit_log = audit_log_file.exists()
 
         queries: FileBackedList[
-            Union[KnownLineageMapping, PreparsedQuery, TableRename, TableSwap]
+            Union[
+                KnownLineageMapping,
+                PreparsedQuery,
+                TableRename,
+                TableSwap,
+                ObservedQuery,
+            ]
         ]
         if use_cached_audit_log:
             logger.info("Using cached audit log")
@@ -252,7 +259,13 @@ def get_workunits_internal(
 
             shared_connection = ConnectionWrapper(audit_log_file)
             queries = FileBackedList(shared_connection)
-            entry: Union[KnownLineageMapping, PreparsedQuery, TableRename, TableSwap]
+            entry: Union[
+                KnownLineageMapping,
+                PreparsedQuery,
+                TableRename,
+                TableSwap,
+                ObservedQuery,
+            ]
 
             with self.report.copy_history_fetch_timer:
                 for entry in self.fetch_copy_history():
@@ -329,7 +342,7 @@ def fetch_copy_history(self) -> Iterable[KnownLineageMapping]:
 
     def fetch_query_log(
         self, users: UsersMapping
-    ) -> Iterable[Union[PreparsedQuery, TableRename, TableSwap]]:
+    ) -> Iterable[Union[PreparsedQuery, TableRename, TableSwap, ObservedQuery]]:
         query_log_query = _build_enriched_query_log_query(
             start_time=self.config.window.start_time,
             end_time=self.config.window.end_time,
@@ -362,7 +375,7 @@ def fetch_query_log(
 
     def _parse_audit_log_row(
         self, row: Dict[str, Any], users: UsersMapping
-    ) -> Optional[Union[TableRename, TableSwap, PreparsedQuery]]:
+    ) -> Optional[Union[TableRename, TableSwap, PreparsedQuery, ObservedQuery]]:
         json_fields = {
             "DIRECT_OBJECTS_ACCESSED",
             "OBJECTS_MODIFIED",
@@ -398,6 +411,34 @@ def _parse_audit_log_row(
                 pass
             else:
                 return None
+
+        user = CorpUserUrn(
+            self.identifiers.get_user_identifier(
+                res["user_name"], users.get(res["user_name"])
+            )
+        )
+
+        # Use direct_objects_accessed instead objects_modified
+        # objects_modified returns $SYS_VIEW_X with no mapping
+        has_stream_objects = any(
+            obj.get("objectDomain") == "Stream" for obj in direct_objects_accessed
+        )
+
+        # If a stream is used, default to query parsing.
+        if has_stream_objects:
+            logger.debug("Found matching stream object")
+            return ObservedQuery(
+                query=res["query_text"],
+                session_id=res["session_id"],
+                timestamp=res["query_start_time"].astimezone(timezone.utc),
+                user=user,
+                default_db=res["default_db"],
+                default_schema=res["default_schema"],
+                query_hash=get_query_fingerprint(
+                    res["query_text"], self.identifiers.platform, fast=True
+                ),
+            )
+
         upstreams = []
         column_usage = {}
 
@@ -460,12 +501,6 @@ def _parse_audit_log_row(
                     )
                 )
 
-        user = CorpUserUrn(
-            self.identifiers.get_user_identifier(
-                res["user_name"], users.get(res["user_name"])
-            )
-        )
-
         timestamp: datetime = res["query_start_time"]
         timestamp = timestamp.astimezone(timezone.utc)
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_query.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_query.py
index 7092041f8da95c..565ebb60701888 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_query.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_query.py
@@ -9,6 +9,7 @@
 from datahub.utilities.prefix_batch_builder import PrefixGroup
 
 SHOW_VIEWS_MAX_PAGE_SIZE = 10000
+SHOW_STREAM_MAX_PAGE_SIZE = 10000
 
 
 def create_deny_regex_sql_filter(
@@ -36,6 +37,7 @@ class SnowflakeQuery:
         SnowflakeObjectDomain.VIEW.capitalize(),
         SnowflakeObjectDomain.MATERIALIZED_VIEW.capitalize(),
         SnowflakeObjectDomain.ICEBERG_TABLE.capitalize(),
+        SnowflakeObjectDomain.STREAM.capitalize(),
     }
 
     ACCESS_HISTORY_TABLE_VIEW_DOMAINS_FILTER = "({})".format(
@@ -44,7 +46,8 @@ class SnowflakeQuery:
     ACCESS_HISTORY_TABLE_DOMAINS_FILTER = (
         "("
         f"'{SnowflakeObjectDomain.TABLE.capitalize()}',"
-        f"'{SnowflakeObjectDomain.VIEW.capitalize()}'"
+        f"'{SnowflakeObjectDomain.VIEW.capitalize()}',"
+        f"'{SnowflakeObjectDomain.STREAM.capitalize()}',"
         ")"
     )
 
@@ -963,3 +966,19 @@ def dmf_assertion_results(start_time_millis: int, end_time_millis: int) -> str:
     @staticmethod
     def get_all_users() -> str:
         return """SELECT name as "NAME", email as "EMAIL" FROM SNOWFLAKE.ACCOUNT_USAGE.USERS"""
+
+    @staticmethod
+    def streams_for_database(
+        db_name: str,
+        limit: int = SHOW_STREAM_MAX_PAGE_SIZE,
+        stream_pagination_marker: Optional[str] = None,
+    ) -> str:
+        # SHOW STREAMS can return a maximum of 10000 rows.
+        # https://docs.snowflake.com/en/sql-reference/sql/show-streams#usage-notes
+        assert limit <= SHOW_STREAM_MAX_PAGE_SIZE
+
+        # To work around this, we paginate through the results using the FROM clause.
+        from_clause = (
+            f"""FROM '{stream_pagination_marker}'""" if stream_pagination_marker else ""
+        )
+        return f"""SHOW STREAMS IN DATABASE {db_name} LIMIT {limit} {from_clause};"""
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_report.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_report.py
index 8feebf1d661385..bd558bc72f1aad 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_report.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_report.py
@@ -104,6 +104,7 @@ class SnowflakeV2Report(
     schemas_scanned: int = 0
     databases_scanned: int = 0
     tags_scanned: int = 0
+    streams_scanned: int = 0
 
     include_usage_stats: bool = False
     include_operational_stats: bool = False
@@ -113,6 +114,7 @@ class SnowflakeV2Report(
     table_lineage_query_secs: float = -1
     external_lineage_queries_secs: float = -1
     num_tables_with_known_upstreams: int = 0
+    num_streams_with_known_upstreams: int = 0
     num_upstream_lineage_edge_parsing_failed: int = 0
     num_secure_views_missing_definition: int = 0
     num_structured_property_templates_created: int = 0
@@ -131,6 +133,8 @@ class SnowflakeV2Report(
     num_get_tags_for_object_queries: int = 0
     num_get_tags_on_columns_for_table_queries: int = 0
 
+    num_get_streams_for_schema_queries: int = 0
+
     rows_zero_objects_modified: int = 0
 
     _processed_tags: MutableSet[str] = field(default_factory=set)
@@ -157,6 +161,8 @@ def report_entity_scanned(self, name: str, ent_type: str = "table") -> None:
                 return
             self._scanned_tags.add(name)
             self.tags_scanned += 1
+        elif ent_type == "stream":
+            self.streams_scanned += 1
         else:
             raise KeyError(f"Unknown entity {ent_type}.")
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py
index c31b7dfe5b9b4e..c1d29127699aaf 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py
@@ -14,7 +14,7 @@
 )
 from datahub.ingestion.source.sql.sql_generic import BaseColumn, BaseTable, BaseView
 from datahub.utilities.file_backed_collections import FileBackedDict
-from datahub.utilities.prefix_batch_builder import build_prefix_batches
+from datahub.utilities.prefix_batch_builder import PrefixGroup, build_prefix_batches
 from datahub.utilities.serialized_lru_cache import serialized_lru_cache
 
 logger: logging.Logger = logging.getLogger(__name__)
@@ -118,6 +118,7 @@ class SnowflakeSchema:
     comment: Optional[str]
     tables: List[str] = field(default_factory=list)
     views: List[str] = field(default_factory=list)
+    streams: List[str] = field(default_factory=list)
     tags: Optional[List[SnowflakeTag]] = None
 
 
@@ -131,6 +132,29 @@ class SnowflakeDatabase:
     tags: Optional[List[SnowflakeTag]] = None
 
 
+@dataclass
+class SnowflakeStream:
+    name: str
+    created: datetime
+    owner: str
+    source_type: str
+    type: str
+    stale: str
+    mode: str
+    invalid_reason: str
+    owner_role_type: str
+    database_name: str
+    schema_name: str
+    table_name: str
+    comment: Optional[str]
+    columns: List[SnowflakeColumn] = field(default_factory=list)
+    stale_after: Optional[datetime] = None
+    base_tables: Optional[str] = None
+    tags: Optional[List[SnowflakeTag]] = None
+    column_tags: Dict[str, List[SnowflakeTag]] = field(default_factory=dict)
+    last_altered: Optional[datetime] = None
+
+
 class _SnowflakeTagCache:
     def __init__(self) -> None:
         # self._database_tags[<database_name>] = list of tags applied to database
@@ -208,6 +232,7 @@ def as_obj(self) -> Dict[str, Dict[str, int]]:
             self.get_tables_for_database,
             self.get_views_for_database,
             self.get_columns_for_schema,
+            self.get_streams_for_database,
             self.get_pk_constraints_for_schema,
             self.get_fk_constraints_for_schema,
         ]
@@ -431,9 +456,18 @@ def get_columns_for_schema(
             # For massive schemas, use a FileBackedDict to avoid memory issues.
             columns = FileBackedDict()
 
-        object_batches = build_prefix_batches(
-            all_objects, max_batch_size=10000, max_groups_in_batch=5
-        )
+        # Single prefix table case (for streams)
+        if len(all_objects) == 1:
+            object_batches = [
+                [PrefixGroup(prefix=all_objects[0], names=[], exact_match=True)]
+            ]
+        else:
+            # Build batches for full schema scan
+            object_batches = build_prefix_batches(
+                all_objects, max_batch_size=10000, max_groups_in_batch=5
+            )
+
+        # Process batches
         for batch_index, object_batch in enumerate(object_batches):
             if batch_index > 0:
                 logger.info(
@@ -611,3 +645,63 @@ def get_tags_on_columns_for_table(
             tags[column_name].append(snowflake_tag)
 
         return tags
+
+    @serialized_lru_cache(maxsize=1)
+    def get_streams_for_database(
+        self, db_name: str
+    ) -> Dict[str, List[SnowflakeStream]]:
+        page_limit = SHOW_VIEWS_MAX_PAGE_SIZE
+
+        streams: Dict[str, List[SnowflakeStream]] = {}
+
+        first_iteration = True
+        stream_pagination_marker: Optional[str] = None
+        while first_iteration or stream_pagination_marker is not None:
+            cur = self.connection.query(
+                SnowflakeQuery.streams_for_database(
+                    db_name,
+                    limit=page_limit,
+                    stream_pagination_marker=stream_pagination_marker,
+                )
+            )
+
+            first_iteration = False
+            stream_pagination_marker = None
+
+            result_set_size = 0
+            for stream in cur:
+                result_set_size += 1
+
+                stream_name = stream["name"]
+                schema_name = stream["schema_name"]
+                if schema_name not in streams:
+                    streams[schema_name] = []
+                streams[stream["schema_name"]].append(
+                    SnowflakeStream(
+                        name=stream["name"],
+                        created=stream["created_on"],
+                        owner=stream["owner"],
+                        comment=stream["comment"],
+                        source_type=stream["source_type"],
+                        type=stream["type"],
+                        stale=stream["stale"],
+                        mode=stream["mode"],
+                        database_name=stream["database_name"],
+                        schema_name=stream["schema_name"],
+                        invalid_reason=stream["invalid_reason"],
+                        owner_role_type=stream["owner_role_type"],
+                        stale_after=stream["stale_after"],
+                        table_name=stream["table_name"],
+                        base_tables=stream["base_tables"],
+                        last_altered=stream["created_on"],
+                    )
+                )
+
+            if result_set_size >= page_limit:
+                # If we hit the limit, we need to send another request to get the next page.
+                logger.info(
+                    f"Fetching next page of streams for {db_name} - after {stream_name}"
+                )
+                stream_pagination_marker = stream_name
+
+        return streams
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
index 134f0b343ccfe6..0490b323bda9ea 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
@@ -48,6 +48,7 @@
     SnowflakeFK,
     SnowflakePK,
     SnowflakeSchema,
+    SnowflakeStream,
     SnowflakeTable,
     SnowflakeTag,
     SnowflakeView,
@@ -58,6 +59,7 @@
     SnowflakeIdentifierBuilder,
     SnowflakeStructuredReportMixin,
     SnowsightUrlBuilder,
+    split_qualified_name,
 )
 from datahub.ingestion.source.sql.sql_utils import (
     add_table_to_schema_container,
@@ -70,6 +72,7 @@
 )
 from datahub.ingestion.source_report.ingestion_stage import (
     EXTERNAL_TABLE_DDL_LINEAGE,
+    LINEAGE_EXTRACTION,
     METADATA_EXTRACTION,
     PROFILING,
 )
@@ -81,6 +84,7 @@
     TimeStamp,
 )
 from datahub.metadata.com.linkedin.pegasus2avro.dataset import (
+    DatasetLineageTypeClass,
     DatasetProperties,
     ViewProperties,
 )
@@ -420,73 +424,120 @@ def _process_schema(
         schema_name = snowflake_schema.name
 
         if self.config.extract_tags != TagOption.skip:
-            snowflake_schema.tags = self.tag_extractor.get_tags_on_object(
-                schema_name=schema_name, db_name=db_name, domain="schema"
-            )
+            self._process_tags(snowflake_schema, schema_name, db_name, domain="schema")
 
         if self.config.include_technical_schema:
             yield from self.gen_schema_containers(snowflake_schema, db_name)
 
-        # We need to do this first so that we can use it when fetching columns.
+        tables, views, streams = [], [], []
+
         if self.config.include_tables:
             tables = self.fetch_tables_for_schema(
                 snowflake_schema, db_name, schema_name
             )
+            db_tables[schema_name] = tables
+            yield from self._process_tables(
+                tables, snowflake_schema, db_name, schema_name
+            )
+
         if self.config.include_views:
             views = self.fetch_views_for_schema(snowflake_schema, db_name, schema_name)
+            yield from self._process_views(
+                views, snowflake_schema, db_name, schema_name
+            )
 
-        if self.config.include_tables:
-            db_tables[schema_name] = tables
+        if self.config.include_streams:
+            self.report.num_get_streams_for_schema_queries += 1
+            streams = self.fetch_streams_for_schema(
+                snowflake_schema, db_name, schema_name
+            )
+            yield from self._process_streams(streams, snowflake_schema, db_name)
 
-            if self.config.include_technical_schema:
-                data_reader = self.make_data_reader()
-                for table in tables:
-                    table_wu_generator = self._process_table(
-                        table, snowflake_schema, db_name
-                    )
+        if self.config.include_technical_schema and snowflake_schema.tags:
+            yield from self._process_tags_in_schema(snowflake_schema)
 
-                    yield from classification_workunit_processor(
-                        table_wu_generator,
-                        self.classification_handler,
-                        data_reader,
-                        [db_name, schema_name, table.name],
-                    )
+        if (
+            not snowflake_schema.views
+            and not snowflake_schema.tables
+            and not snowflake_schema.streams
+        ):
+            self.structured_reporter.info(
+                title="No tables/views/streams found in schema",
+                message="If objects exist, please grant REFERENCES or SELECT permissions on them.",
+                context=f"{db_name}.{schema_name}",
+            )
 
-        if self.config.include_views:
-            if self.aggregator:
-                for view in views:
-                    view_identifier = self.identifiers.get_dataset_identifier(
+    def _process_tags(self, snowflake_schema, schema_name, db_name, domain):
+        snowflake_schema.tags = self.tag_extractor.get_tags_on_object(
+            schema_name=schema_name, db_name=db_name, domain=domain
+        )
+
+    def _process_tables(
+        self,
+        tables: List[SnowflakeTable],
+        snowflake_schema: SnowflakeSchema,
+        db_name: str,
+        schema_name: str,
+    ) -> Iterable[MetadataWorkUnit]:
+        if self.config.include_technical_schema:
+            data_reader = self.make_data_reader()
+            for table in tables:
+                table_wu_generator = self._process_table(
+                    table, snowflake_schema, db_name
+                )
+                yield from classification_workunit_processor(
+                    table_wu_generator,
+                    self.classification_handler,
+                    data_reader,
+                    [db_name, schema_name, table.name],
+                )
+
+    def _process_views(
+        self,
+        views: List[SnowflakeView],
+        snowflake_schema: SnowflakeSchema,
+        db_name: str,
+        schema_name: str,
+    ) -> Iterable[MetadataWorkUnit]:
+        if self.aggregator:
+            for view in views:
+                view_identifier = self.identifiers.get_dataset_identifier(
+                    view.name, schema_name, db_name
+                )
+                if view.is_secure and not view.view_definition:
+                    view.view_definition = self.fetch_secure_view_definition(
                         view.name, schema_name, db_name
                     )
-                    if view.is_secure and not view.view_definition:
-                        view.view_definition = self.fetch_secure_view_definition(
-                            view.name, schema_name, db_name
-                        )
-                    if view.view_definition:
-                        self.aggregator.add_view_definition(
-                            view_urn=self.identifiers.gen_dataset_urn(view_identifier),
-                            view_definition=view.view_definition,
-                            default_db=db_name,
-                            default_schema=schema_name,
-                        )
-                    elif view.is_secure:
-                        self.report.num_secure_views_missing_definition += 1
+                if view.view_definition:
+                    self.aggregator.add_view_definition(
+                        view_urn=self.identifiers.gen_dataset_urn(view_identifier),
+                        view_definition=view.view_definition,
+                        default_db=db_name,
+                        default_schema=schema_name,
+                    )
+                elif view.is_secure:
+                    self.report.num_secure_views_missing_definition += 1
 
-            if self.config.include_technical_schema:
-                for view in views:
-                    yield from self._process_view(view, snowflake_schema, db_name)
+        if self.config.include_technical_schema:
+            for view in views:
+                yield from self._process_view(view, snowflake_schema, db_name)
 
-        if self.config.include_technical_schema and snowflake_schema.tags:
+    def _process_streams(
+        self,
+        streams: List[SnowflakeStream],
+        snowflake_schema: SnowflakeSchema,
+        db_name: str,
+    ) -> Iterable[MetadataWorkUnit]:
+        for stream in streams:
+            yield from self._process_stream(stream, snowflake_schema, db_name)
+
+    def _process_tags_in_schema(
+        self, snowflake_schema: SnowflakeSchema
+    ) -> Iterable[MetadataWorkUnit]:
+        if snowflake_schema.tags:
             for tag in snowflake_schema.tags:
                 yield from self._process_tag(tag)
 
-        if not snowflake_schema.views and not snowflake_schema.tables:
-            self.structured_reporter.info(
-                title="No tables/views found in schema",
-                message="If tables exist, please grant REFERENCES or SELECT permissions on them.",
-                context=f"{db_name}.{schema_name}",
-            )
-
     def fetch_secure_view_definition(
         self, table_name: str, schema_name: str, db_name: str
     ) -> Optional[str]:
@@ -729,7 +780,7 @@ def _format_tags_as_structured_properties(
 
     def gen_dataset_workunits(
         self,
-        table: Union[SnowflakeTable, SnowflakeView],
+        table: Union[SnowflakeTable, SnowflakeView, SnowflakeStream],
         schema_name: str,
         db_name: str,
     ) -> Iterable[MetadataWorkUnit]:
@@ -788,7 +839,9 @@ def gen_dataset_workunits(
 
         subTypes = SubTypes(
             typeNames=(
-                [DatasetSubTypes.VIEW]
+                [DatasetSubTypes.SNOWFLAKE_STREAM]
+                if isinstance(table, SnowflakeStream)
+                else [DatasetSubTypes.VIEW]
                 if isinstance(table, SnowflakeView)
                 else [DatasetSubTypes.TABLE]
             )
@@ -843,28 +896,50 @@ def gen_dataset_workunits(
 
     def get_dataset_properties(
         self,
-        table: Union[SnowflakeTable, SnowflakeView],
+        table: Union[SnowflakeTable, SnowflakeView, SnowflakeStream],
         schema_name: str,
         db_name: str,
     ) -> DatasetProperties:
         custom_properties = {}
 
         if isinstance(table, SnowflakeTable):
-            if table.clustering_key:
-                custom_properties["CLUSTERING_KEY"] = table.clustering_key
-
-            if table.is_hybrid:
-                custom_properties["IS_HYBRID"] = "true"
-
-            if table.is_dynamic:
-                custom_properties["IS_DYNAMIC"] = "true"
-
-            if table.is_iceberg:
-                custom_properties["IS_ICEBERG"] = "true"
+            custom_properties.update(
+                {
+                    k: v
+                    for k, v in {
+                        "CLUSTERING_KEY": table.clustering_key,
+                        "IS_HYBRID": "true" if table.is_hybrid else None,
+                        "IS_DYNAMIC": "true" if table.is_dynamic else None,
+                        "IS_ICEBERG": "true" if table.is_iceberg else None,
+                    }.items()
+                    if v
+                }
+            )
 
         if isinstance(table, SnowflakeView) and table.is_secure:
             custom_properties["IS_SECURE"] = "true"
 
+        elif isinstance(table, SnowflakeStream):
+            custom_properties.update(
+                {
+                    k: v
+                    for k, v in {
+                        "SOURCE_TYPE": table.source_type,
+                        "TYPE": table.type,
+                        "STALE": table.stale,
+                        "MODE": table.mode,
+                        "INVALID_REASON": table.invalid_reason,
+                        "OWNER_ROLE_TYPE": table.owner_role_type,
+                        "TABLE_NAME": table.table_name,
+                        "BASE_TABLES": table.base_tables,
+                        "STALE_AFTER": table.stale_after.isoformat()
+                        if table.stale_after
+                        else None,
+                    }.items()
+                    if v
+                }
+            )
+
         return DatasetProperties(
             name=table.name,
             created=(
@@ -909,7 +984,9 @@ def gen_tag_workunits(self, tag: SnowflakeTag) -> Iterable[MetadataWorkUnit]:
         ).as_workunit()
 
     def gen_column_tags_as_structured_properties(
-        self, dataset_urn: str, table: Union[SnowflakeTable, SnowflakeView]
+        self,
+        dataset_urn: str,
+        table: Union[SnowflakeTable, SnowflakeView, SnowflakeStream],
     ) -> Iterable[MetadataWorkUnit]:
         for column_name in table.column_tags:
             schema_field_urn = SchemaFieldUrn(dataset_urn, column_name).urn()
@@ -922,7 +999,7 @@ def gen_column_tags_as_structured_properties(
 
     def gen_schema_metadata(
         self,
-        table: Union[SnowflakeTable, SnowflakeView],
+        table: Union[SnowflakeTable, SnowflakeView, SnowflakeStream],
         schema_name: str,
         db_name: str,
     ) -> SchemaMetadata:
@@ -1214,3 +1291,158 @@ def _external_tables_ddl_lineage(
                 "External table ddl lineage extraction failed",
                 exc=e,
             )
+
+    def fetch_streams_for_schema(
+        self, snowflake_schema: SnowflakeSchema, db_name: str, schema_name: str
+    ) -> List[SnowflakeStream]:
+        try:
+            streams: List[SnowflakeStream] = []
+            for stream in self.get_streams_for_schema(schema_name, db_name):
+                stream_identifier = self.identifiers.get_dataset_identifier(
+                    stream.name, schema_name, db_name
+                )
+
+                self.report.report_entity_scanned(stream_identifier, "stream")
+
+                if not self.filters.is_dataset_pattern_allowed(
+                    stream_identifier, SnowflakeObjectDomain.STREAM
+                ):
+                    self.report.report_dropped(stream_identifier)
+                else:
+                    streams.append(stream)
+            snowflake_schema.streams = [stream.name for stream in streams]
+            return streams
+        except Exception as e:
+            if isinstance(e, SnowflakePermissionError):
+                error_msg = f"Failed to get streams for schema {db_name}.{schema_name}. Please check permissions."
+                raise SnowflakePermissionError(error_msg) from e.__cause__
+            else:
+                self.structured_reporter.warning(
+                    "Failed to get streams for schema",
+                    f"{db_name}.{schema_name}",
+                    exc=e,
+                )
+                return []
+
+    def get_streams_for_schema(
+        self, schema_name: str, db_name: str
+    ) -> List[SnowflakeStream]:
+        streams = self.data_dictionary.get_streams_for_database(db_name)
+
+        return streams.get(schema_name, [])
+
+    def _process_stream(
+        self,
+        stream: SnowflakeStream,
+        snowflake_schema: SnowflakeSchema,
+        db_name: str,
+    ) -> Iterable[MetadataWorkUnit]:
+        schema_name = snowflake_schema.name
+
+        try:
+            # Retrieve and register the schema without metadata to prevent columns from mapping upstream
+            stream.columns = self.get_columns_for_stream(stream.table_name)
+            yield from self.gen_dataset_workunits(stream, schema_name, db_name)
+
+            if self.config.include_column_lineage:
+                with self.report.new_stage(f"*: {LINEAGE_EXTRACTION}"):
+                    self.populate_stream_upstreams(stream, db_name, schema_name)
+
+        except Exception as e:
+            self.structured_reporter.warning(
+                "Failed to get columns for stream:", stream.name, exc=e
+            )
+
+    def get_columns_for_stream(
+        self,
+        source_object: str,  # Qualified name of source table/view
+    ) -> List[SnowflakeColumn]:
+        """
+        Get column information for a stream by getting source object columns and adding metadata columns.
+        Stream includes all columns from source object plus metadata columns like:
+        - METADATA$ACTION
+        - METADATA$ISUPDATE
+        - METADATA$ROW_ID
+        """
+        columns: List[SnowflakeColumn] = []
+
+        source_parts = split_qualified_name(source_object)
+
+        source_db, source_schema, source_name = source_parts
+
+        # Get columns from source object
+        source_columns = self.data_dictionary.get_columns_for_schema(
+            source_schema, source_db, itertools.chain([source_name])
+        ).get(source_name, [])
+
+        # Add all source columns
+        columns.extend(source_columns)
+
+        # Add standard stream metadata columns
+        metadata_columns = [
+            SnowflakeColumn(
+                name="METADATA$ACTION",
+                ordinal_position=len(columns) + 1,
+                is_nullable=False,
+                data_type="VARCHAR",
+                comment="Type of DML operation (INSERT/DELETE)",
+                character_maximum_length=10,
+                numeric_precision=None,
+                numeric_scale=None,
+            ),
+            SnowflakeColumn(
+                name="METADATA$ISUPDATE",
+                ordinal_position=len(columns) + 2,
+                is_nullable=False,
+                data_type="BOOLEAN",
+                comment="Whether row is from UPDATE operation",
+                character_maximum_length=None,
+                numeric_precision=None,
+                numeric_scale=None,
+            ),
+            SnowflakeColumn(
+                name="METADATA$ROW_ID",
+                ordinal_position=len(columns) + 3,
+                is_nullable=False,
+                data_type="NUMBER",
+                comment="Unique row identifier",
+                character_maximum_length=None,
+                numeric_precision=38,
+                numeric_scale=0,
+            ),
+        ]
+
+        columns.extend(metadata_columns)
+
+        return columns
+
+    def populate_stream_upstreams(
+        self, stream: SnowflakeStream, db_name: str, schema_name: str
+    ) -> None:
+        """
+        Populate Streams upstream tables
+        """
+        self.report.num_streams_with_known_upstreams += 1
+        if self.aggregator:
+            source_parts = split_qualified_name(stream.table_name)
+            source_db, source_schema, source_name = source_parts
+
+            dataset_identifier = self.identifiers.get_dataset_identifier(
+                stream.name, schema_name, db_name
+            )
+            dataset_urn = self.identifiers.gen_dataset_urn(dataset_identifier)
+
+            upstream_identifier = self.identifiers.get_dataset_identifier(
+                source_name, source_schema, source_db
+            )
+            upstream_urn = self.identifiers.gen_dataset_urn(upstream_identifier)
+
+            logger.debug(
+                f"""upstream_urn: {upstream_urn}, downstream_urn: {dataset_urn}"""
+            )
+
+            self.aggregator.add_known_lineage_mapping(
+                upstream_urn=upstream_urn,
+                downstream_urn=dataset_urn,
+                lineage_type=DatasetLineageTypeClass.COPY,
+            )
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_utils.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_utils.py
index 030edfde4ca1da..1e95597061577e 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_utils.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_utils.py
@@ -124,19 +124,20 @@ def is_dataset_pattern_allowed(
             SnowflakeObjectDomain.VIEW,
             SnowflakeObjectDomain.MATERIALIZED_VIEW,
             SnowflakeObjectDomain.ICEBERG_TABLE,
+            SnowflakeObjectDomain.STREAM,
         ):
             return False
         if _is_sys_table(dataset_name):
             return False
 
-        dataset_params = _split_qualified_name(dataset_name)
+        dataset_params = split_qualified_name(dataset_name)
         if len(dataset_params) != 3:
             self.structured_reporter.info(
                 title="Unexpected dataset pattern",
                 message=f"Found a {dataset_type} with an unexpected number of parts. Database and schema filtering will not work as expected, but table filtering will still work.",
                 context=dataset_name,
             )
-            # We fall-through here so table/view filtering still works.
+            # We fall-through here so table/view/stream filtering still works.
 
         if (
             len(dataset_params) >= 1
@@ -169,6 +170,14 @@ def is_dataset_pattern_allowed(
         ):
             return False
 
+        if (
+            dataset_type.lower() == SnowflakeObjectDomain.STREAM
+            and not self.filter_config.stream_pattern.allowed(
+                _cleanup_qualified_name(dataset_name, self.structured_reporter)
+            )
+        ):
+            return False
+
         return True
 
 
@@ -183,17 +192,17 @@ def _is_sys_table(table_name: str) -> bool:
     return table_name.lower().startswith("sys$")
 
 
-def _split_qualified_name(qualified_name: str) -> List[str]:
+def split_qualified_name(qualified_name: str) -> List[str]:
     """
     Split a qualified name into its constituent parts.
 
-    >>> _split_qualified_name("db.my_schema.my_table")
+    >>> split_qualified_name("db.my_schema.my_table")
     ['db', 'my_schema', 'my_table']
-    >>> _split_qualified_name('"db"."my_schema"."my_table"')
+    >>> split_qualified_name('"db"."my_schema"."my_table"')
     ['db', 'my_schema', 'my_table']
-    >>> _split_qualified_name('TEST_DB.TEST_SCHEMA."TABLE.WITH.DOTS"')
+    >>> split_qualified_name('TEST_DB.TEST_SCHEMA."TABLE.WITH.DOTS"')
     ['TEST_DB', 'TEST_SCHEMA', 'TABLE.WITH.DOTS']
-    >>> _split_qualified_name('TEST_DB."SCHEMA.WITH.DOTS".MY_TABLE')
+    >>> split_qualified_name('TEST_DB."SCHEMA.WITH.DOTS".MY_TABLE')
     ['TEST_DB', 'SCHEMA.WITH.DOTS', 'MY_TABLE']
     """
 
@@ -231,7 +240,7 @@ def _split_qualified_name(qualified_name: str) -> List[str]:
 def _cleanup_qualified_name(
     qualified_name: str, structured_reporter: SourceReport
 ) -> str:
-    name_parts = _split_qualified_name(qualified_name)
+    name_parts = split_qualified_name(qualified_name)
     if len(name_parts) != 3:
         if not _is_sys_table(qualified_name):
             structured_reporter.info(
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
index a8666643ac62fc..daeb839e5f54da 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py
@@ -539,15 +539,27 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
             for schema in db.schemas
             for table_name in schema.views
         ]
+        discovered_streams: List[str] = [
+            self.identifiers.get_dataset_identifier(stream_name, schema.name, db.name)
+            for db in databases
+            for schema in db.schemas
+            for stream_name in schema.streams
+        ]
 
-        if len(discovered_tables) == 0 and len(discovered_views) == 0:
+        if (
+            len(discovered_tables) == 0
+            and len(discovered_views) == 0
+            and len(discovered_streams) == 0
+        ):
             self.structured_reporter.failure(
                 GENERIC_PERMISSION_ERROR_KEY,
-                "No tables/views found. Please check permissions.",
+                "No tables/views/streams found. Please check permissions.",
             )
             return
 
-        self.discovered_datasets = discovered_tables + discovered_views
+        self.discovered_datasets = (
+            discovered_tables + discovered_views + discovered_streams
+        )
 
         if self.config.use_queries_v2:
             with self.report.new_stage(f"*: {VIEW_PARSING}"):
diff --git a/metadata-ingestion/tests/integration/snowflake/common.py b/metadata-ingestion/tests/integration/snowflake/common.py
index 7a296a597468ec..9b9b6269ca6a3b 100644
--- a/metadata-ingestion/tests/integration/snowflake/common.py
+++ b/metadata-ingestion/tests/integration/snowflake/common.py
@@ -7,9 +7,11 @@
 from datahub.configuration.time_window_config import BucketDuration
 from datahub.ingestion.source.snowflake import snowflake_query
 from datahub.ingestion.source.snowflake.snowflake_query import SnowflakeQuery
+from datahub.utilities.prefix_batch_builder import PrefixGroup
 
 NUM_TABLES = 10
 NUM_VIEWS = 2
+NUM_STREAMS = 1
 NUM_COLS = 10
 NUM_OPS = 10
 NUM_USAGE = 0
@@ -175,6 +177,7 @@ def default_query_results(  # noqa: C901
     query,
     num_tables=NUM_TABLES,
     num_views=NUM_VIEWS,
+    num_streams=NUM_STREAMS,
     num_cols=NUM_COLS,
     num_ops=NUM_OPS,
     num_usages=NUM_USAGE,
@@ -272,6 +275,27 @@ def default_query_results(  # noqa: C901
             for view_idx in range(1, num_views + 1)
             if is_secure(view_idx)
         ]
+    elif query == SnowflakeQuery.columns_for_schema(
+        "TEST_SCHEMA",
+        "TEST_DB",
+        [PrefixGroup(prefix="TABLE_1", names=[], exact_match=True)],
+    ):
+        return [
+            {
+                "TABLE_CATALOG": "TEST_DB",
+                "TABLE_SCHEMA": "TEST_SCHEMA",
+                "TABLE_NAME": "TABLE_1",
+                "COLUMN_NAME": f"COL_{col_idx}",
+                "ORDINAL_POSITION": col_idx,
+                "IS_NULLABLE": "NO",
+                "DATA_TYPE": "TEXT" if col_idx > 1 else "NUMBER",
+                "COMMENT": "Comment for column",
+                "CHARACTER_MAXIMUM_LENGTH": 255 if col_idx > 1 else None,
+                "NUMERIC_PRECISION": None if col_idx > 1 else 38,
+                "NUMERIC_SCALE": None if col_idx > 1 else 0,
+            }
+            for col_idx in range(1, num_cols + 1)
+        ]
     elif query == SnowflakeQuery.columns_for_schema("TEST_SCHEMA", "TEST_DB"):
         return [
             {
@@ -293,6 +317,28 @@ def default_query_results(  # noqa: C901
             )
             for col_idx in range(1, num_cols + 1)
         ]
+    elif query == SnowflakeQuery.streams_for_database("TEST_DB"):
+        # TODO: Add tests for stream pagination.
+        return [
+            {
+                "created_on": datetime(2021, 6, 8, 0, 0, 0, 0, tzinfo=timezone.utc),
+                "name": f"STREAM_{stream_idx}",
+                "database_name": "TEST_DB",
+                "schema_name": "TEST_SCHEMA",
+                "owner": "ACCOUNTADMIN",
+                "comment": f"Comment for Stream {stream_idx}",
+                "table_name": f"TEST_DB.TEST_SCHEMA.TABLE_{stream_idx}",
+                "source_type": "Table",
+                "base_tables": f"TEST_DB.TEST_SCHEMA.TABLE_{stream_idx}",
+                "type": "DELTA",
+                "stale": "false",
+                "mode": "DEFAULT",
+                "stale_after": datetime(2021, 6, 22, 0, 0, 0, 0, tzinfo=timezone.utc),
+                "invalid_reason": None,
+                "owner_role_type": "ROLE",
+            }
+            for stream_idx in range(1, num_streams + 1)
+        ]
     elif query in (
         SnowflakeQuery.use_database("TEST_DB"),
         SnowflakeQuery.show_primary_keys_for_schema("TEST_SCHEMA", "TEST_DB"),
diff --git a/metadata-ingestion/tests/integration/snowflake/snowflake_golden.json b/metadata-ingestion/tests/integration/snowflake/snowflake_golden.json
index 48ec46af069cef..4b3bd16deceeae 100644
--- a/metadata-ingestion/tests/integration/snowflake/snowflake_golden.json
+++ b/metadata-ingestion/tests/integration/snowflake/snowflake_golden.json
@@ -16,16 +16,16 @@
             "description": "Comment for TEST_DB",
             "env": "PROD",
             "created": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "lastModified": {
-                "time": 1623103200000
+                "time": 1623124800000
             }
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_08_20-16_18_24",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -40,8 +40,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -56,8 +56,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -74,8 +74,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -94,8 +94,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -110,8 +110,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -127,8 +127,24 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -150,16 +166,16 @@
             "description": "comment for TEST_DB.TEST_SCHEMA",
             "env": "PROD",
             "created": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "lastModified": {
-                "time": 1623103200000
+                "time": 1623124800000
             }
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_08_20-16_18_24",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -174,8 +190,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -190,8 +206,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -208,8 +224,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -228,24 +244,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "container",
-    "entityUrn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
-    "changeType": "UPSERT",
-    "aspectName": "container",
-    "aspect": {
-        "json": {
-            "container": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -265,8 +265,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -281,8 +281,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -329,7 +329,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -353,7 +353,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -377,7 +377,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -478,8 +478,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -498,17 +498,17 @@
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_1",
             "description": "Comment for Table",
             "created": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "lastModified": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "tags": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2023_12_18-10_16_09",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -523,8 +523,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -541,8 +541,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -566,8 +566,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -582,8 +582,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -630,7 +630,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -654,7 +654,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -678,7 +678,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -779,8 +779,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -799,17 +799,17 @@
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_2",
             "description": "Comment for Table",
             "created": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "lastModified": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "tags": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2023_12_18-10_16_09",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -824,8 +824,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -842,8 +842,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -867,8 +867,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -883,8 +883,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -931,7 +931,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -955,7 +955,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -979,7 +979,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -1080,8 +1080,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -1100,17 +1100,17 @@
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_3",
             "description": "Comment for Table",
             "created": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "lastModified": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "tags": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2023_12_18-10_16_09",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -1125,8 +1125,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -1143,8 +1143,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -1168,8 +1168,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -1184,8 +1184,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -1232,7 +1232,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -1256,7 +1256,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -1280,7 +1280,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -1381,8 +1381,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -1401,17 +1401,17 @@
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_4",
             "description": "Comment for Table",
             "created": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "lastModified": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "tags": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2023_12_18-10_16_09",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -1426,8 +1426,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -1444,8 +1444,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -1469,8 +1469,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -1485,8 +1485,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -1533,7 +1533,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -1557,7 +1557,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -1581,7 +1581,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -1682,8 +1682,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -1702,17 +1702,17 @@
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_5",
             "description": "Comment for Table",
             "created": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "lastModified": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "tags": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2023_12_18-10_16_09",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -1727,8 +1727,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -1745,8 +1745,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -1770,8 +1770,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -1786,8 +1786,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -1834,7 +1834,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -1858,7 +1858,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -1882,7 +1882,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -1983,8 +1983,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2003,17 +2003,17 @@
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_6",
             "description": "Comment for Table",
             "created": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "lastModified": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "tags": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2023_12_18-10_16_09",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2028,8 +2028,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2046,8 +2046,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2071,8 +2071,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2087,8 +2087,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2135,7 +2135,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -2159,7 +2159,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -2183,7 +2183,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -2284,8 +2284,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2304,17 +2304,17 @@
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_7",
             "description": "Comment for Table",
             "created": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "lastModified": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "tags": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2023_12_18-10_16_09",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2329,8 +2329,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2347,8 +2347,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2372,8 +2372,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2388,8 +2388,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2436,7 +2436,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -2460,7 +2460,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -2484,7 +2484,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -2585,8 +2585,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2605,17 +2605,17 @@
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_8",
             "description": "Comment for Table",
             "created": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "lastModified": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "tags": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2023_12_18-10_16_09",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2630,8 +2630,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2648,8 +2648,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2673,8 +2673,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2689,8 +2689,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2737,7 +2737,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -2761,7 +2761,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -2785,7 +2785,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -2886,8 +2886,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2906,17 +2906,17 @@
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_9",
             "description": "Comment for Table",
             "created": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "lastModified": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "tags": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2023_12_18-10_16_09",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2931,8 +2931,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2949,8 +2949,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2974,8 +2974,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -2990,8 +2990,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3038,7 +3038,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -3062,7 +3062,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -3086,7 +3086,7 @@
                             }
                         ],
                         "auditStamp": {
-                            "time": 1654621200000,
+                            "time": 1615443388097,
                             "actor": "urn:li:corpuser:datahub"
                         }
                     },
@@ -3187,8 +3187,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3207,17 +3207,17 @@
             "qualifiedName": "TEST_DB.TEST_SCHEMA.TABLE_10",
             "description": "Comment for Table",
             "created": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "lastModified": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "tags": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2023_12_18-10_16_09",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3232,8 +3232,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3250,8 +3250,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3275,8 +3275,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3292,8 +3292,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3308,8 +3308,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3479,8 +3479,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3499,17 +3499,17 @@
             "qualifiedName": "TEST_DB.TEST_SCHEMA.VIEW_1",
             "description": "Comment for View",
             "created": {
-                "time": 1623090600000
+                "time": 1623124800000
             },
             "lastModified": {
-                "time": 1623090600000
+                "time": 1623124800000
             },
             "tags": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_12_16-15_30_20-649nax",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3524,8 +3524,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3542,8 +3542,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3561,7 +3561,7 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2023_10_06-17_59_03",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3585,8 +3585,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3602,8 +3602,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3619,8 +3619,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3636,8 +3636,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3652,8 +3652,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3816,8 +3816,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3834,17 +3834,17 @@
             "qualifiedName": "TEST_DB.TEST_SCHEMA.VIEW_2",
             "description": "Comment for View",
             "created": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "lastModified": {
-                "time": 1623103200000
+                "time": 1623124800000
             },
             "tags": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2023_12_18-10_16_09",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3859,8 +3859,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3877,8 +3877,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3903,33 +3903,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "browsePathsV2",
-    "aspect": {
-        "json": {
-            "path": [
-                {
-                    "id": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
-                    "urn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
-                },
-                {
-                    "id": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
-                    "urn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -3947,179 +3922,646 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2023_10_06-17_59_03",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "datasetProfile",
-    "aspect": {
-        "json": {
-            "timestampMillis": 1654621200000,
-            "partitionSpec": {
-                "partition": "FULL_TABLE_SNAPSHOT",
-                "type": "FULL_TABLE"
-            },
-            "rowCount": 10000,
-            "columnCount": 10,
-            "sizeInBytes": 1024
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "datasetProfile",
+    "aspectName": "browsePathsV2",
     "aspect": {
         "json": {
-            "timestampMillis": 1654621200000,
-            "partitionSpec": {
-                "partition": "FULL_TABLE_SNAPSHOT",
-                "type": "FULL_TABLE"
-            },
-            "rowCount": 10000,
-            "columnCount": 10,
-            "sizeInBytes": 1024
+            "path": [
+                {
+                    "id": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+                    "urn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
+                },
+                {
+                    "id": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+                    "urn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+                }
+            ]
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "datasetProfile",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "timestampMillis": 1654621200000,
-            "partitionSpec": {
-                "partition": "FULL_TABLE_SNAPSHOT",
-                "type": "FULL_TABLE"
-            },
-            "rowCount": 10000,
-            "columnCount": 10,
-            "sizeInBytes": 1024
+            "removed": false
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "datasetProfile",
+    "aspectName": "schemaMetadata",
     "aspect": {
         "json": {
-            "timestampMillis": 1654621200000,
-            "partitionSpec": {
-                "partition": "FULL_TABLE_SNAPSHOT",
-                "type": "FULL_TABLE"
+            "schemaName": "test_db.test_schema.stream_1",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
             },
-            "rowCount": 10000,
-            "columnCount": 10,
-            "sizeInBytes": 1024
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "datasetProfile",
-    "aspect": {
-        "json": {
-            "timestampMillis": 1654621200000,
-            "partitionSpec": {
-                "partition": "FULL_TABLE_SNAPSHOT",
-                "type": "FULL_TABLE"
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
             },
-            "rowCount": 10000,
-            "columnCount": 10,
-            "sizeInBytes": 1024
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "datasetProfile",
-    "aspect": {
-        "json": {
-            "timestampMillis": 1654621200000,
-            "partitionSpec": {
-                "partition": "FULL_TABLE_SNAPSHOT",
-                "type": "FULL_TABLE"
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
             },
-            "rowCount": 10000,
-            "columnCount": 10,
-            "sizeInBytes": 1024
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "datasetProfile",
-    "aspect": {
-        "json": {
-            "timestampMillis": 1654621200000,
-            "partitionSpec": {
-                "partition": "FULL_TABLE_SNAPSHOT",
-                "type": "FULL_TABLE"
+            "fields": [
+                {
+                    "fieldPath": "col_1",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_2",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_3",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_4",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_5",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_6",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_7",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_8",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_9",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_10",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "metadata$action",
+                    "nullable": false,
+                    "description": "Type of DML operation (INSERT/DELETE)",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(10)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "metadata$isupdate",
+                    "nullable": false,
+                    "description": "Whether row is from UPDATE operation",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "BOOLEAN",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "metadata$row_id",
+                    "nullable": false,
+                    "description": "Unique row identifier",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "SOURCE_TYPE": "Table",
+                "TYPE": "DELTA",
+                "STALE": "false",
+                "MODE": "DEFAULT",
+                "OWNER_ROLE_TYPE": "ROLE",
+                "TABLE_NAME": "TEST_DB.TEST_SCHEMA.TABLE_1",
+                "BASE_TABLES": "TEST_DB.TEST_SCHEMA.TABLE_1",
+                "STALE_AFTER": "2021-06-22T00:00:00+00:00"
+            },
+            "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/view/STREAM_1/",
+            "name": "STREAM_1",
+            "qualifiedName": "TEST_DB.TEST_SCHEMA.STREAM_1",
+            "description": "Comment for Stream 1",
+            "created": {
+                "time": 1623110400000
+            },
+            "lastModified": {
+                "time": 1623110400000
+            },
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Snowflake Stream"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "test_db.test_schema.stream_1",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "col_1",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_2",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_3",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_4",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_5",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_6",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_7",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_8",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_9",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_10",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "metadata$action",
+                    "nullable": false,
+                    "description": "Type of DML operation (INSERT/DELETE)",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(10)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "metadata$isupdate",
+                    "nullable": false,
+                    "description": "Whether row is from UPDATE operation",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "BOOLEAN",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "metadata$row_id",
+                    "nullable": false,
+                    "description": "Unique row identifier",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "SOURCE_TYPE": "Table",
+                "TYPE": "DELTA",
+                "STALE": "false",
+                "MODE": "DEFAULT",
+                "OWNER_ROLE_TYPE": "ROLE",
+                "TABLE_NAME": "TEST_DB.TEST_SCHEMA.TABLE_1",
+                "BASE_TABLES": "TEST_DB.TEST_SCHEMA.TABLE_1",
+                "STALE_AFTER": "2021-06-22T00:00:00+00:00"
+            },
+            "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/view/STREAM_1/",
+            "name": "STREAM_1",
+            "qualifiedName": "TEST_DB.TEST_SCHEMA.STREAM_1",
+            "description": "Comment for Stream 1",
+            "created": {
+                "time": 1623110400000
             },
-            "rowCount": 10000,
-            "columnCount": 10,
-            "sizeInBytes": 1024
+            "lastModified": {
+                "time": 1623110400000
+            },
+            "tags": []
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Snowflake Stream"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+                    "urn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
+                },
+                {
+                    "id": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+                    "urn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
     "changeType": "UPSERT",
     "aspectName": "datasetProfile",
     "aspect": {
         "json": {
-            "timestampMillis": 1654621200000,
+            "timestampMillis": 1738040516740,
             "partitionSpec": {
                 "partition": "FULL_TABLE_SNAPSHOT",
                 "type": "FULL_TABLE"
@@ -4130,19 +4572,19 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
     "changeType": "UPSERT",
     "aspectName": "datasetProfile",
     "aspect": {
         "json": {
-            "timestampMillis": 1654621200000,
+            "timestampMillis": 1738040516750,
             "partitionSpec": {
                 "partition": "FULL_TABLE_SNAPSHOT",
                 "type": "FULL_TABLE"
@@ -4153,19 +4595,19 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD)",
     "changeType": "UPSERT",
     "aspectName": "datasetProfile",
     "aspect": {
         "json": {
-            "timestampMillis": 1654621200000,
+            "timestampMillis": 1738040516750,
             "partitionSpec": {
                 "partition": "FULL_TABLE_SNAPSHOT",
                 "type": "FULL_TABLE"
@@ -4176,194 +4618,175 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "upstreamLineage",
+    "aspectName": "datasetProfile",
     "aspect": {
         "json": {
-            "upstreams": [
-                {
-                    "auditStamp": {
-                        "time": 1615443388097,
-                        "actor": "urn:li:corpuser:_ingestion"
-                    },
-                    "created": {
-                        "time": 0,
-                        "actor": "urn:li:corpuser:_ingestion"
-                    },
-                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
-                    "type": "VIEW",
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
-                }
-            ],
-            "fineGrainedLineages": [
-                {
-                    "upstreamType": "FIELD_SET",
-                    "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_1)"
-                    ],
-                    "downstreamType": "FIELD",
-                    "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_1)"
-                    ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
-                },
-                {
-                    "upstreamType": "FIELD_SET",
-                    "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_2)"
-                    ],
-                    "downstreamType": "FIELD",
-                    "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_2)"
-                    ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
-                },
-                {
-                    "upstreamType": "FIELD_SET",
-                    "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_3)"
-                    ],
-                    "downstreamType": "FIELD",
-                    "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_3)"
-                    ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
-                },
-                {
-                    "upstreamType": "FIELD_SET",
-                    "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_4)"
-                    ],
-                    "downstreamType": "FIELD",
-                    "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_4)"
-                    ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
-                },
-                {
-                    "upstreamType": "FIELD_SET",
-                    "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_5)"
-                    ],
-                    "downstreamType": "FIELD",
-                    "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_5)"
-                    ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
-                },
-                {
-                    "upstreamType": "FIELD_SET",
-                    "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_6)"
-                    ],
-                    "downstreamType": "FIELD",
-                    "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_6)"
-                    ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
-                },
-                {
-                    "upstreamType": "FIELD_SET",
-                    "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_7)"
-                    ],
-                    "downstreamType": "FIELD",
-                    "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_7)"
-                    ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
-                },
-                {
-                    "upstreamType": "FIELD_SET",
-                    "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_8)"
-                    ],
-                    "downstreamType": "FIELD",
-                    "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_8)"
-                    ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
-                },
-                {
-                    "upstreamType": "FIELD_SET",
-                    "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_9)"
-                    ],
-                    "downstreamType": "FIELD",
-                    "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_9)"
-                    ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
-                },
-                {
-                    "upstreamType": "FIELD_SET",
-                    "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_10)"
-                    ],
-                    "downstreamType": "FIELD",
-                    "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_10)"
-                    ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
-                }
-            ]
+            "timestampMillis": 1738040516751,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "rowCount": 10000,
+            "columnCount": 10,
+            "sizeInBytes": 1024
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProfile",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1738040516751,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "rowCount": 10000,
+            "columnCount": 10,
+            "sizeInBytes": 1024
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "query",
-    "entityUrn": "urn:li:query:aec91b63e3ce03877b9d80dc77b915880fc2a5f8f3b5cdf66e9341830268776b",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "queryProperties",
+    "aspectName": "datasetProfile",
     "aspect": {
         "json": {
-            "statement": {
-                "value": "INSERT INTO TEST_DB.TEST_SCHEMA.TABLE_1\nSELECT\n  *\nFROM TEST_DB.TEST_SCHEMA.TABLE_2",
-                "language": "SQL"
+            "timestampMillis": 1738040516752,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
-            "source": "SYSTEM",
-            "created": {
-                "time": 1654473600000,
-                "actor": "urn:li:corpuser:_ingestion"
+            "rowCount": 10000,
+            "columnCount": 10,
+            "sizeInBytes": 1024
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProfile",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1738040516752,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
-            "lastModified": {
-                "time": 1654473600000,
-                "actor": "urn:li:corpuser:_ingestion"
-            }
+            "rowCount": 10000,
+            "columnCount": 10,
+            "sizeInBytes": 1024
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_11-14_36_03",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProfile",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1738040516753,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "rowCount": 10000,
+            "columnCount": 10,
+            "sizeInBytes": 1024
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProfile",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1738040516754,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "rowCount": 10000,
+            "columnCount": 10,
+            "sizeInBytes": 1024
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProfile",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1738040516754,
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "rowCount": 10000,
+            "columnCount": 10,
+            "sizeInBytes": 1024
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
     "changeType": "UPSERT",
     "aspectName": "upstreamLineage",
     "aspect": {
@@ -4378,216 +4801,160 @@
                         "time": 0,
                         "actor": "urn:li:corpuser:_ingestion"
                     },
-                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
-                    "type": "VIEW",
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+                    "type": "COPY"
                 }
             ],
             "fineGrainedLineages": [
                 {
                     "upstreamType": "FIELD_SET",
                     "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_1)"
-                    ],
-                    "downstreamType": "FIELD",
-                    "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_1)"
-                    ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
-                },
-                {
-                    "upstreamType": "FIELD_SET",
-                    "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_2)"
-                    ],
-                    "downstreamType": "FIELD",
-                    "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_2)"
-                    ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
-                },
-                {
-                    "upstreamType": "FIELD_SET",
-                    "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_3)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_1)"
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_3)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD),col_1)"
                     ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                    "confidenceScore": 1.0
                 },
                 {
                     "upstreamType": "FIELD_SET",
                     "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_4)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_2)"
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_4)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD),col_2)"
                     ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                    "confidenceScore": 1.0
                 },
                 {
                     "upstreamType": "FIELD_SET",
                     "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_5)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_3)"
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_5)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD),col_3)"
                     ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                    "confidenceScore": 1.0
                 },
                 {
                     "upstreamType": "FIELD_SET",
                     "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_6)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_4)"
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_6)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD),col_4)"
                     ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                    "confidenceScore": 1.0
                 },
                 {
                     "upstreamType": "FIELD_SET",
                     "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_7)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_5)"
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_7)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD),col_5)"
                     ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                    "confidenceScore": 1.0
                 },
                 {
                     "upstreamType": "FIELD_SET",
                     "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_8)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_6)"
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_8)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD),col_6)"
                     ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                    "confidenceScore": 1.0
                 },
                 {
                     "upstreamType": "FIELD_SET",
                     "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_9)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_7)"
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_9)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD),col_7)"
                     ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                    "confidenceScore": 1.0
                 },
                 {
                     "upstreamType": "FIELD_SET",
                     "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_10)"
-                    ],
-                    "downstreamType": "FIELD",
-                    "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_10)"
-                    ],
-                    "confidenceScore": 0.9,
-                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "query",
-    "entityUrn": "urn:li:query:aec91b63e3ce03877b9d80dc77b915880fc2a5f8f3b5cdf66e9341830268776b",
-    "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
-    "aspect": {
-        "json": {
-            "platform": "urn:li:dataPlatform:snowflake"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_22-10_26_30",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "query",
-    "entityUrn": "urn:li:query:aec91b63e3ce03877b9d80dc77b915880fc2a5f8f3b5cdf66e9341830268776b",
-    "changeType": "UPSERT",
-    "aspectName": "querySubjects",
-    "aspect": {
-        "json": {
-            "subjects": [
-                {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
-                },
-                {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD)"
-                },
-                {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,other_db.other_schema.table_1,PROD)"
-                },
-                {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_1)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_2)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_3)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_4)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_5)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_6)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_8)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD),col_8)"
+                    ],
+                    "confidenceScore": 1.0
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_7)"
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_9)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD),col_9)"
+                    ],
+                    "confidenceScore": 1.0
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_8)"
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_10)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD),col_10)"
+                    ],
+                    "confidenceScore": 1.0
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_9)"
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),metadata$action)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD),metadata$action)"
+                    ],
+                    "confidenceScore": 1.0
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_10)"
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),metadata$isupdate)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD),metadata$isupdate)"
+                    ],
+                    "confidenceScore": 1.0
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_1)"
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),metadata$row_id)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD),metadata$row_id)"
+                    ],
+                    "confidenceScore": 1.0
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_07_09-14_45_18",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -4766,13 +5133,116 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:aec91b63e3ce03877b9d80dc77b915880fc2a5f8f3b5cdf66e9341830268776b",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "INSERT INTO TEST_DB.TEST_SCHEMA.TABLE_1\nSELECT\n  *\nFROM TEST_DB.TEST_SCHEMA.TABLE_2",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1654473600000,
+                "actor": "urn:li:corpuser:_ingestion"
+            },
+            "lastModified": {
+                "time": 1654473600000,
+                "actor": "urn:li:corpuser:_ingestion"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:aec91b63e3ce03877b9d80dc77b915880fc2a5f8f3b5cdf66e9341830268776b",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,other_db.other_schema.table_1,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_1)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_2)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_3)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_4)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_5)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_6)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_7)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_8)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_9)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_10)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:aec91b63e3ce03877b9d80dc77b915880fc2a5f8f3b5cdf66e9341830268776b",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD)",
     "changeType": "UPSERT",
     "aspectName": "upstreamLineage",
     "aspect": {
@@ -4789,7 +5259,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
+                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
                 }
             ],
             "fineGrainedLineages": [
@@ -4800,10 +5270,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_1)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_1)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
+                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -4812,10 +5282,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_2)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_2)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
+                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -4824,10 +5294,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_3)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_3)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
+                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -4836,10 +5306,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_4)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_4)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
+                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -4848,10 +5318,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_5)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_5)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
+                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -4860,10 +5330,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_6)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_6)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
+                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -4872,10 +5342,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_7)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_7)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
+                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -4884,10 +5354,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_8)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_8)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
+                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -4896,10 +5366,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_9)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_9)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
+                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -4908,33 +5378,17 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_10)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_10)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
+                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "query",
-    "entityUrn": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37",
-    "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
-    "aspect": {
-        "json": {
-            "platform": "urn:li:dataPlatform:snowflake"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_22-10_26_30",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -4962,41 +5416,82 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_11-14_36_03",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9",
+    "entityUrn": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37",
     "changeType": "UPSERT",
-    "aspectName": "queryProperties",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_1)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_2)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_3)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_4)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_5)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_6)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_7)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_8)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_9)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_10)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "statement": {
-                "value": "INSERT INTO TEST_DB.TEST_SCHEMA.TABLE_2\nSELECT\n  *\nFROM TEST_DB.TEST_SCHEMA.TABLE_2",
-                "language": "SQL"
-            },
-            "source": "SYSTEM",
-            "created": {
-                "time": 1654473600000,
-                "actor": "urn:li:corpuser:_ingestion"
-            },
-            "lastModified": {
-                "time": 1654473600000,
-                "actor": "urn:li:corpuser:_ingestion"
-            }
+            "platform": "urn:li:dataPlatform:snowflake"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_11-14_36_03",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
     "changeType": "UPSERT",
     "aspectName": "upstreamLineage",
     "aspect": {
@@ -5013,7 +5508,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
+                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
                 }
             ],
             "fineGrainedLineages": [
@@ -5024,10 +5519,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_1)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_1)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
+                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5036,10 +5531,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_2)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_2)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
+                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5048,10 +5543,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_3)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_3)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
+                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5060,10 +5555,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_4)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_4)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
+                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5072,10 +5567,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_5)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_5)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
+                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5084,10 +5579,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_6)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_6)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
+                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5096,10 +5591,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_7)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_7)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
+                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5108,10 +5603,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_8)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_8)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
+                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5120,10 +5615,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_9)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_9)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
+                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5132,17 +5627,45 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_10)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_10)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
+                    "query": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9"
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "INSERT INTO TEST_DB.TEST_SCHEMA.TABLE_2\nSELECT\n  *\nFROM TEST_DB.TEST_SCHEMA.TABLE_2",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1654473600000,
+                "actor": "urn:li:corpuser:_ingestion"
+            },
+            "lastModified": {
+                "time": 1654473600000,
+                "actor": "urn:li:corpuser:_ingestion"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -5154,9 +5677,6 @@
     "aspect": {
         "json": {
             "subjects": [
-                {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
-                },
                 {
                     "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
                 },
@@ -5195,7 +5715,7 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_07_09-14_45_18",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -5211,66 +5731,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_22-10_26_30",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "query",
-    "entityUrn": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37",
-    "changeType": "UPSERT",
-    "aspectName": "querySubjects",
-    "aspect": {
-        "json": {
-            "subjects": [
-                {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
-                },
-                {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_1)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_2)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_3)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_4)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_5)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_6)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_7)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_8)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_9)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_10)"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_07_09-14_45_18",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD)",
     "changeType": "UPSERT",
     "aspectName": "upstreamLineage",
     "aspect": {
@@ -5287,7 +5754,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
+                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
                 }
             ],
             "fineGrainedLineages": [
@@ -5298,10 +5765,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_1)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_1)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
+                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5310,10 +5777,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_2)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_2)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
+                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5322,10 +5789,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_3)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_3)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
+                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5334,10 +5801,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_4)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_4)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
+                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5346,10 +5813,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_5)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_5)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
+                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5358,10 +5825,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_6)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_6)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
+                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5370,10 +5837,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_7)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_7)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
+                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5382,10 +5849,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_8)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_8)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
+                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5394,10 +5861,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_9)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_9)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
+                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5406,23 +5873,120 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_10)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_10)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
+                    "query": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "INSERT INTO TEST_DB.TEST_SCHEMA.TABLE_3\nSELECT\n  *\nFROM TEST_DB.TEST_SCHEMA.TABLE_2",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1654473600000,
+                "actor": "urn:li:corpuser:_ingestion"
+            },
+            "lastModified": {
+                "time": 1654473600000,
+                "actor": "urn:li:corpuser:_ingestion"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_1)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_2)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_3)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_4)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_5)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_6)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_7)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_8)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_9)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_10)"
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD)",
     "changeType": "UPSERT",
     "aspectName": "upstreamLineage",
     "aspect": {
@@ -5439,7 +6003,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
+                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
                 }
             ],
             "fineGrainedLineages": [
@@ -5450,10 +6014,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_1)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_1)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
+                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5462,10 +6026,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_2)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_2)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
+                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5474,10 +6038,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_3)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_3)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
+                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5486,10 +6050,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_4)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_4)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
+                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5498,10 +6062,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_5)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_5)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
+                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5510,10 +6074,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_6)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_6)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
+                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5522,10 +6086,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_7)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_7)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
+                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5534,10 +6098,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_8)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_8)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
+                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5546,10 +6110,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_9)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_9)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
+                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5558,17 +6122,17 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_10)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_10)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
+                    "query": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632"
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -5596,13 +6160,66 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_11-14_36_03",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8",
+    "entityUrn": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_1)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_2)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_3)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_4)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_5)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_6)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_7)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_8)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_9)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_10)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -5612,13 +6229,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_22-10_26_30",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD)",
     "changeType": "UPSERT",
     "aspectName": "upstreamLineage",
     "aspect": {
@@ -5635,7 +6252,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
+                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
                 }
             ],
             "fineGrainedLineages": [
@@ -5646,10 +6263,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_1)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_1)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
+                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5658,10 +6275,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_2)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_2)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
+                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5670,10 +6287,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_3)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_3)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
+                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5682,10 +6299,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_4)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_4)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
+                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5694,10 +6311,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_5)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_5)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
+                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5706,10 +6323,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_6)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_6)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
+                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5718,10 +6335,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_7)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_7)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
+                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5730,10 +6347,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_8)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_8)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
+                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5742,10 +6359,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_9)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_9)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
+                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5754,23 +6371,51 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_10)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_10)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
+                    "query": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2"
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632",
+    "entityUrn": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "INSERT INTO TEST_DB.TEST_SCHEMA.TABLE_5\nSELECT\n  *\nFROM TEST_DB.TEST_SCHEMA.TABLE_2",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1654473600000,
+                "actor": "urn:li:corpuser:_ingestion"
+            },
+            "lastModified": {
+                "time": 1654473600000,
+                "actor": "urn:li:corpuser:_ingestion"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2",
     "changeType": "UPSERT",
     "aspectName": "querySubjects",
     "aspect": {
@@ -5780,44 +6425,44 @@
                     "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
                 },
                 {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD)"
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_1)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_1)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_2)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_2)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_3)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_3)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_4)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_4)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_5)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_5)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_6)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_6)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_7)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_7)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_8)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_8)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_9)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_9)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD),col_10)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_10)"
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_07_09-14_45_18",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -5825,33 +6470,21 @@
     "entityType": "query",
     "entityUrn": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2",
     "changeType": "UPSERT",
-    "aspectName": "queryProperties",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "statement": {
-                "value": "INSERT INTO TEST_DB.TEST_SCHEMA.TABLE_5\nSELECT\n  *\nFROM TEST_DB.TEST_SCHEMA.TABLE_2",
-                "language": "SQL"
-            },
-            "source": "SYSTEM",
-            "created": {
-                "time": 1654473600000,
-                "actor": "urn:li:corpuser:_ingestion"
-            },
-            "lastModified": {
-                "time": 1654473600000,
-                "actor": "urn:li:corpuser:_ingestion"
-            }
+            "platform": "urn:li:dataPlatform:snowflake"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_11-14_36_03",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD)",
     "changeType": "UPSERT",
     "aspectName": "upstreamLineage",
     "aspect": {
@@ -5868,7 +6501,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
+                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
                 }
             ],
             "fineGrainedLineages": [
@@ -5879,10 +6512,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_1)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_1)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
+                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5891,10 +6524,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_2)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_2)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
+                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5903,10 +6536,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_3)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_3)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
+                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5915,10 +6548,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_4)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_4)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
+                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5927,10 +6560,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_5)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_5)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
+                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5939,10 +6572,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_6)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_6)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
+                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5951,10 +6584,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_7)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_7)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
+                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5963,10 +6596,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_8)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_8)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
+                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5975,10 +6608,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_9)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_9)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
+                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -5987,23 +6620,51 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_10)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_10)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
+                    "query": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12"
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2",
+    "entityUrn": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "INSERT INTO TEST_DB.TEST_SCHEMA.TABLE_6\nSELECT\n  *\nFROM TEST_DB.TEST_SCHEMA.TABLE_2",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1654473600000,
+                "actor": "urn:li:corpuser:_ingestion"
+            },
+            "lastModified": {
+                "time": 1654473600000,
+                "actor": "urn:li:corpuser:_ingestion"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12",
     "changeType": "UPSERT",
     "aspectName": "querySubjects",
     "aspect": {
@@ -6013,66 +6674,50 @@
                     "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
                 },
                 {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD)"
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_1)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_1)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_2)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_2)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_3)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_3)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_4)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_4)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_5)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_5)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_6)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_6)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_7)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_7)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_8)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_8)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_9)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_9)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD),col_10)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_10)"
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_07_09-14_45_18",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "query",
-    "entityUrn": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632",
-    "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
-    "aspect": {
-        "json": {
-            "platform": "urn:li:dataPlatform:snowflake"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_22-10_26_30",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2",
+    "entityUrn": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -6082,13 +6727,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_22-10_26_30",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD)",
     "changeType": "UPSERT",
     "aspectName": "upstreamLineage",
     "aspect": {
@@ -6105,7 +6750,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
+                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
                 }
             ],
             "fineGrainedLineages": [
@@ -6116,10 +6761,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_1)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_1)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
+                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6128,10 +6773,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_2)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_2)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
+                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6140,10 +6785,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_3)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_3)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
+                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6152,10 +6797,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_4)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_4)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
+                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6164,10 +6809,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_5)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_5)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
+                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6176,10 +6821,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_6)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_6)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
+                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6188,10 +6833,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_7)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_7)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
+                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6200,10 +6845,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_8)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_8)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
+                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6212,10 +6857,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_9)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_9)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
+                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6224,29 +6869,29 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_10)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_10)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
+                    "query": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01"
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8",
+    "entityUrn": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01",
     "changeType": "UPSERT",
     "aspectName": "queryProperties",
     "aspect": {
         "json": {
             "statement": {
-                "value": "INSERT INTO TEST_DB.TEST_SCHEMA.TABLE_3\nSELECT\n  *\nFROM TEST_DB.TEST_SCHEMA.TABLE_2",
+                "value": "INSERT INTO TEST_DB.TEST_SCHEMA.TABLE_7\nSELECT\n  *\nFROM TEST_DB.TEST_SCHEMA.TABLE_2",
                 "language": "SQL"
             },
             "source": "SYSTEM",
@@ -6262,13 +6907,66 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_11-14_36_03",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12",
+    "entityUrn": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01",
+    "changeType": "UPSERT",
+    "aspectName": "querySubjects",
+    "aspect": {
+        "json": {
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_1)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_2)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_3)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_4)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_5)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_6)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_7)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_8)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_9)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_10)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01",
     "changeType": "UPSERT",
     "aspectName": "dataPlatformInstance",
     "aspect": {
@@ -6278,13 +6976,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_22-10_26_30",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD)",
     "changeType": "UPSERT",
     "aspectName": "upstreamLineage",
     "aspect": {
@@ -6301,7 +6999,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
+                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
                 }
             ],
             "fineGrainedLineages": [
@@ -6312,10 +7010,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_1)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_1)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
+                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6324,10 +7022,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_2)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_2)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
+                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6336,10 +7034,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_3)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_3)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
+                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6348,10 +7046,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_4)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_4)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
+                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6360,10 +7058,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_5)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_5)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
+                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6372,10 +7070,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_6)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_6)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
+                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6384,10 +7082,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_7)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_7)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
+                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6396,10 +7094,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_8)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_8)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
+                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6408,10 +7106,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_9)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_9)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
+                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6420,23 +7118,51 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_10)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_10)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
+                    "query": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200"
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "INSERT INTO TEST_DB.TEST_SCHEMA.TABLE_8\nSELECT\n  *\nFROM TEST_DB.TEST_SCHEMA.TABLE_2",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 1654473600000,
+                "actor": "urn:li:corpuser:_ingestion"
+            },
+            "lastModified": {
+                "time": 1654473600000,
+                "actor": "urn:li:corpuser:_ingestion"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8",
+    "entityUrn": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200",
     "changeType": "UPSERT",
     "aspectName": "querySubjects",
     "aspect": {
@@ -6446,50 +7172,66 @@
                     "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
                 },
                 {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD)"
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_1)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_1)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_2)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_2)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_3)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_3)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_4)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_4)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_5)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_5)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_6)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_6)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_7)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_7)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_8)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_8)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_9)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_9)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_3,PROD),col_10)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_10)"
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_07_09-14_45_18",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD)",
     "changeType": "UPSERT",
     "aspectName": "upstreamLineage",
     "aspect": {
@@ -6506,7 +7248,7 @@
                     },
                     "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
                     "type": "TRANSFORMED",
-                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
+                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
                 }
             ],
             "fineGrainedLineages": [
@@ -6517,10 +7259,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_1)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_1)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
+                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6529,10 +7271,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_2)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_2)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
+                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6541,10 +7283,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_3)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_3)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
+                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6553,10 +7295,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_4)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_4)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
+                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6565,10 +7307,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_5)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_5)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
+                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6577,10 +7319,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_6)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_6)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
+                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6589,10 +7331,10 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_7)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_7)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
+                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
                 },
                 {
                     "upstreamType": "FIELD_SET",
@@ -6601,214 +7343,53 @@
                     ],
                     "downstreamType": "FIELD",
                     "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_8)"
-                    ],
-                    "confidenceScore": 1.0,
-                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
-                },
-                {
-                    "upstreamType": "FIELD_SET",
-                    "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_9)"
-                    ],
-                    "downstreamType": "FIELD",
-                    "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_9)"
-                    ],
-                    "confidenceScore": 1.0,
-                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
-                },
-                {
-                    "upstreamType": "FIELD_SET",
-                    "upstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_10)"
-                    ],
-                    "downstreamType": "FIELD",
-                    "downstreams": [
-                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD),col_10)"
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_8)"
                     ],
                     "confidenceScore": 1.0,
-                    "query": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37"
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "datasetUsageStatistics",
-    "aspect": {
-        "json": {
-            "timestampMillis": 1654473600000,
-            "eventGranularity": {
-                "unit": "DAY",
-                "multiple": 1
-            },
-            "partitionSpec": {
-                "partition": "FULL_TABLE_SNAPSHOT",
-                "type": "FULL_TABLE"
-            },
-            "uniqueUserCount": 0,
-            "totalSqlQueries": 0,
-            "topSqlQueries": [],
-            "userCounts": [],
-            "fieldCounts": []
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "datasetUsageStatistics",
-    "aspect": {
-        "json": {
-            "timestampMillis": 1654473600000,
-            "eventGranularity": {
-                "unit": "DAY",
-                "multiple": 1
-            },
-            "partitionSpec": {
-                "partition": "FULL_TABLE_SNAPSHOT",
-                "type": "FULL_TABLE"
-            },
-            "uniqueUserCount": 0,
-            "totalSqlQueries": 0,
-            "topSqlQueries": [],
-            "userCounts": [],
-            "fieldCounts": []
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "query",
-    "entityUrn": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01",
-    "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
-    "aspect": {
-        "json": {
-            "platform": "urn:li:dataPlatform:snowflake"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_22-10_26_30",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "datasetUsageStatistics",
-    "aspect": {
-        "json": {
-            "timestampMillis": 1654473600000,
-            "eventGranularity": {
-                "unit": "DAY",
-                "multiple": 1
-            },
-            "partitionSpec": {
-                "partition": "FULL_TABLE_SNAPSHOT",
-                "type": "FULL_TABLE"
-            },
-            "uniqueUserCount": 0,
-            "totalSqlQueries": 0,
-            "topSqlQueries": [],
-            "userCounts": [],
-            "fieldCounts": []
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "datasetUsageStatistics",
-    "aspect": {
-        "json": {
-            "timestampMillis": 1654473600000,
-            "eventGranularity": {
-                "unit": "DAY",
-                "multiple": 1
-            },
-            "partitionSpec": {
-                "partition": "FULL_TABLE_SNAPSHOT",
-                "type": "FULL_TABLE"
-            },
-            "uniqueUserCount": 0,
-            "totalSqlQueries": 0,
-            "topSqlQueries": [],
-            "userCounts": [],
-            "fieldCounts": []
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "datasetUsageStatistics",
-    "aspect": {
-        "json": {
-            "timestampMillis": 1654473600000,
-            "eventGranularity": {
-                "unit": "DAY",
-                "multiple": 1
-            },
-            "partitionSpec": {
-                "partition": "FULL_TABLE_SNAPSHOT",
-                "type": "FULL_TABLE"
-            },
-            "uniqueUserCount": 0,
-            "totalSqlQueries": 0,
-            "topSqlQueries": [],
-            "userCounts": [],
-            "fieldCounts": []
+                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_9)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_9)"
+                    ],
+                    "confidenceScore": 1.0,
+                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_10)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_10)"
+                    ],
+                    "confidenceScore": 1.0,
+                    "query": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4"
+                }
+            ]
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12",
+    "entityUrn": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4",
     "changeType": "UPSERT",
     "aspectName": "queryProperties",
     "aspect": {
         "json": {
             "statement": {
-                "value": "INSERT INTO TEST_DB.TEST_SCHEMA.TABLE_6\nSELECT\n  *\nFROM TEST_DB.TEST_SCHEMA.TABLE_2",
+                "value": "INSERT INTO TEST_DB.TEST_SCHEMA.TABLE_9\nSELECT\n  *\nFROM TEST_DB.TEST_SCHEMA.TABLE_2",
                 "language": "SQL"
             },
             "source": "SYSTEM",
@@ -6824,58 +7405,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_11-14_36_03",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "query",
-    "entityUrn": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200",
-    "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
-    "aspect": {
-        "json": {
-            "platform": "urn:li:dataPlatform:snowflake"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_22-10_26_30",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "datasetUsageStatistics",
-    "aspect": {
-        "json": {
-            "timestampMillis": 1654473600000,
-            "eventGranularity": {
-                "unit": "DAY",
-                "multiple": 1
-            },
-            "partitionSpec": {
-                "partition": "FULL_TABLE_SNAPSHOT",
-                "type": "FULL_TABLE"
-            },
-            "uniqueUserCount": 0,
-            "totalSqlQueries": 0,
-            "topSqlQueries": [],
-            "userCounts": [],
-            "fieldCounts": []
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12",
+    "entityUrn": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4",
     "changeType": "UPSERT",
     "aspectName": "querySubjects",
     "aspect": {
@@ -6885,44 +7421,44 @@
                     "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
                 },
                 {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD)"
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_1)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_1)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_2)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_2)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_3)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_3)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_4)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_4)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_5)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_5)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_6)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_6)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_7)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_7)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_8)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_8)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_9)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_9)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD),col_10)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_10)"
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_07_09-14_45_18",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -6938,93 +7474,270 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_22-10_26_30",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "datasetUsageStatistics",
+    "aspectName": "upstreamLineage",
     "aspect": {
         "json": {
-            "timestampMillis": 1654473600000,
-            "eventGranularity": {
-                "unit": "DAY",
-                "multiple": 1
-            },
-            "partitionSpec": {
-                "partition": "FULL_TABLE_SNAPSHOT",
-                "type": "FULL_TABLE"
-            },
-            "uniqueUserCount": 0,
-            "totalSqlQueries": 0,
-            "topSqlQueries": [],
-            "userCounts": [],
-            "fieldCounts": []
+            "upstreams": [
+                {
+                    "auditStamp": {
+                        "time": 1615443388097,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+                    "type": "VIEW",
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                }
+            ],
+            "fineGrainedLineages": [
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_1)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_1)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_2)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_2)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_3)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_3)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_4)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_4)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_5)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_5)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_6)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_6)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_7)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_7)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_8)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_8)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_9)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_9)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                },
+                {
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_10)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_10)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29"
+                }
+            ]
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29",
     "changeType": "UPSERT",
     "aspectName": "queryProperties",
     "aspect": {
         "json": {
             "statement": {
-                "value": "INSERT INTO TEST_DB.TEST_SCHEMA.TABLE_8\nSELECT\n  *\nFROM TEST_DB.TEST_SCHEMA.TABLE_2",
+                "value": "CREATE VIEW view_1 AS\nSELECT\n  *\nFROM table_1",
                 "language": "SQL"
             },
             "source": "SYSTEM",
             "created": {
-                "time": 1654473600000,
+                "time": 0,
                 "actor": "urn:li:corpuser:_ingestion"
             },
             "lastModified": {
-                "time": 1654473600000,
+                "time": 1738040516852,
                 "actor": "urn:li:corpuser:_ingestion"
             }
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_11-14_36_03",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD)",
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29",
     "changeType": "UPSERT",
-    "aspectName": "datasetUsageStatistics",
+    "aspectName": "querySubjects",
     "aspect": {
         "json": {
-            "timestampMillis": 1654473600000,
-            "eventGranularity": {
-                "unit": "DAY",
-                "multiple": 1
-            },
-            "partitionSpec": {
-                "partition": "FULL_TABLE_SNAPSHOT",
-                "type": "FULL_TABLE"
-            },
-            "uniqueUserCount": 0,
-            "totalSqlQueries": 0,
-            "topSqlQueries": [],
-            "userCounts": [],
-            "fieldCounts": []
+            "subjects": [
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_1)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_10)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_2)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_3)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_4)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_5)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_6)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_7)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_8)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_9)"
+                },
+                {
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_1)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_2)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_3)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_4)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_5)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_6)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_7)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_8)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_9)"
+                },
+                {
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_10)"
+                }
+            ]
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -7032,163 +7745,278 @@
     "entityType": "query",
     "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29",
     "changeType": "UPSERT",
-    "aspectName": "queryProperties",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "statement": {
-                "value": "CREATE VIEW view_1 AS\nSELECT\n  *\nFROM table_1",
-                "language": "SQL"
-            },
-            "source": "SYSTEM",
-            "created": {
-                "time": 0,
-                "actor": "urn:li:corpuser:_ingestion"
-            },
-            "lastModified": {
-                "time": 1710193011317,
-                "actor": "urn:li:corpuser:_ingestion"
-            }
+            "platform": "urn:li:dataPlatform:snowflake"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_11-14_36_03",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "query",
-    "entityUrn": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "querySubjects",
+    "aspectName": "upstreamLineage",
     "aspect": {
         "json": {
-            "subjects": [
-                {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
-                },
+            "upstreams": [
                 {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD)"
-                },
+                    "auditStamp": {
+                        "time": 1615443388097,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "created": {
+                        "time": 0,
+                        "actor": "urn:li:corpuser:_ingestion"
+                    },
+                    "dataset": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
+                    "type": "VIEW",
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
+                }
+            ],
+            "fineGrainedLineages": [
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_1)"
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_1)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_1)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_2)"
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_2)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_2)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_3)"
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_3)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_3)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_4)"
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_4)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_4)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_5)"
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_5)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_5)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_6)"
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_6)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_6)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_7)"
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_7)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_7)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_8)"
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_8)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_8)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_9)"
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_9)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_9)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD),col_10)"
+                    "upstreamType": "FIELD_SET",
+                    "upstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_10)"
+                    ],
+                    "downstreamType": "FIELD",
+                    "downstreams": [
+                        "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_10)"
+                    ],
+                    "confidenceScore": 0.9,
+                    "query": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29"
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_07_09-14_45_18",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "query",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29",
+    "changeType": "UPSERT",
+    "aspectName": "queryProperties",
+    "aspect": {
+        "json": {
+            "statement": {
+                "value": "CREATE VIEW view_2 AS\nSELECT\n  *\nFROM table_2",
+                "language": "SQL"
+            },
+            "source": "SYSTEM",
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:_ingestion"
+            },
+            "lastModified": {
+                "time": 1738040516859,
+                "actor": "urn:li:corpuser:_ingestion"
+            }
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29",
     "changeType": "UPSERT",
     "aspectName": "querySubjects",
     "aspect": {
         "json": {
             "subjects": [
                 {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)"
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_1)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_1)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_4)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_10)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_5)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_2)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_6)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_3)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_2)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_4)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_10)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_5)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_7)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_6)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_9)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_7)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_3)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_8)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD),col_8)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_9)"
                 },
                 {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD)"
+                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_1)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_1)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_2)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_2)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_3)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_3)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_4)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_4)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_5)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_5)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_6)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_6)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_7)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_7)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_8)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_8)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_9)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_9)"
                 },
                 {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD),col_10)"
+                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_10)"
                 }
             ]
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_07_09-14_45_18",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -7204,41 +8032,42 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_22-10_26_30",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "query",
-    "entityUrn": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "queryProperties",
+    "aspectName": "datasetUsageStatistics",
     "aspect": {
         "json": {
-            "statement": {
-                "value": "INSERT INTO TEST_DB.TEST_SCHEMA.TABLE_9\nSELECT\n  *\nFROM TEST_DB.TEST_SCHEMA.TABLE_2",
-                "language": "SQL"
+            "timestampMillis": 1654473600000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
             },
-            "source": "SYSTEM",
-            "created": {
-                "time": 1654473600000,
-                "actor": "urn:li:corpuser:_ingestion"
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
-            "lastModified": {
-                "time": 1654473600000,
-                "actor": "urn:li:corpuser:_ingestion"
-            }
+            "uniqueUserCount": 0,
+            "totalSqlQueries": 0,
+            "topSqlQueries": [],
+            "userCounts": [],
+            "fieldCounts": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_11-14_36_03",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD)",
     "changeType": "UPSERT",
     "aspectName": "datasetUsageStatistics",
     "aspect": {
@@ -7260,77 +8089,66 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "query",
-    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "datasetUsageStatistics",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:snowflake"
+            "timestampMillis": 1654473600000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 0,
+            "totalSqlQueries": 0,
+            "topSqlQueries": [],
+            "userCounts": [],
+            "fieldCounts": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_22-10_26_30",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "query",
-    "entityUrn": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "querySubjects",
+    "aspectName": "datasetUsageStatistics",
     "aspect": {
         "json": {
-            "subjects": [
-                {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
-                },
-                {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_1)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_2)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_3)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_4)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_5)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_6)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_7)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_8)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_9)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD),col_10)"
-                }
-            ]
+            "timestampMillis": 1654473600000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 0,
+            "totalSqlQueries": 0,
+            "topSqlQueries": [],
+            "userCounts": [],
+            "fieldCounts": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_07_09-14_45_18",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -7358,36 +8176,37 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "query",
-    "entityUrn": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_8,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "queryProperties",
+    "aspectName": "datasetUsageStatistics",
     "aspect": {
         "json": {
-            "statement": {
-                "value": "INSERT INTO TEST_DB.TEST_SCHEMA.TABLE_7\nSELECT\n  *\nFROM TEST_DB.TEST_SCHEMA.TABLE_2",
-                "language": "SQL"
+            "timestampMillis": 1654473600000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
             },
-            "source": "SYSTEM",
-            "created": {
-                "time": 1654473600000,
-                "actor": "urn:li:corpuser:_ingestion"
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
-            "lastModified": {
-                "time": 1654473600000,
-                "actor": "urn:li:corpuser:_ingestion"
-            }
+            "uniqueUserCount": 0,
+            "totalSqlQueries": 0,
+            "topSqlQueries": [],
+            "userCounts": [],
+            "fieldCounts": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_11-14_36_03",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -7415,178 +8234,159 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_10,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1654473600000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 0,
+            "totalSqlQueries": 0,
+            "topSqlQueries": [],
+            "userCounts": [],
+            "fieldCounts": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_4,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetUsageStatistics",
+    "aspect": {
+        "json": {
+            "timestampMillis": 1654473600000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 0,
+            "totalSqlQueries": 0,
+            "topSqlQueries": [],
+            "userCounts": [],
+            "fieldCounts": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "query",
-    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_6,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "queryProperties",
+    "aspectName": "datasetUsageStatistics",
     "aspect": {
         "json": {
-            "statement": {
-                "value": "CREATE VIEW view_2 AS\nSELECT\n  *\nFROM table_2",
-                "language": "SQL"
+            "timestampMillis": 1654473600000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
             },
-            "source": "SYSTEM",
-            "created": {
-                "time": 0,
-                "actor": "urn:li:corpuser:_ingestion"
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
             },
-            "lastModified": {
-                "time": 1710193011336,
-                "actor": "urn:li:corpuser:_ingestion"
-            }
+            "uniqueUserCount": 0,
+            "totalSqlQueries": 0,
+            "topSqlQueries": [],
+            "userCounts": [],
+            "fieldCounts": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_11-14_36_03",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "query",
-    "entityUrn": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "querySubjects",
+    "aspectName": "datasetUsageStatistics",
     "aspect": {
         "json": {
-            "subjects": [
-                {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
-                },
-                {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_1)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_2)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_3)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_4)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_5)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_6)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_7)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_8)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_9)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_7,PROD),col_10)"
-                }
-            ]
+            "timestampMillis": 1654473600000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 0,
+            "totalSqlQueries": 0,
+            "topSqlQueries": [],
+            "userCounts": [],
+            "fieldCounts": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_07_09-14_45_18",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "query",
-    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29",
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)",
     "changeType": "UPSERT",
-    "aspectName": "querySubjects",
+    "aspectName": "datasetUsageStatistics",
     "aspect": {
         "json": {
-            "subjects": [
-                {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_1)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_4)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_5)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_6)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_2)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_10)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_7)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_9)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_3)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_2,PROD),col_8)"
-                },
-                {
-                    "entity": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_1)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_2)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_3)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_4)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_5)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_6)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_7)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_8)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_9)"
-                },
-                {
-                    "entity": "urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD),col_10)"
-                }
-            ]
+            "timestampMillis": 1654473600000,
+            "eventGranularity": {
+                "unit": "DAY",
+                "multiple": 1
+            },
+            "partitionSpec": {
+                "partition": "FULL_TABLE_SNAPSHOT",
+                "type": "FULL_TABLE"
+            },
+            "uniqueUserCount": 0,
+            "totalSqlQueries": 0,
+            "topSqlQueries": [],
+            "userCounts": [],
+            "fieldCounts": []
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_07_09-14_45_18",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_5,PROD)",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_9,PROD)",
     "changeType": "UPSERT",
     "aspectName": "datasetUsageStatistics",
     "aspect": {
@@ -7608,8 +8408,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -7620,7 +8420,7 @@
     "aspectName": "operation",
     "aspect": {
         "json": {
-            "timestampMillis": 1654621200000,
+            "timestampMillis": 1615443388097,
             "partitionSpec": {
                 "partition": "FULL_TABLE_SNAPSHOT",
                 "type": "FULL_TABLE"
@@ -7631,8 +8431,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -7643,7 +8443,7 @@
     "aspectName": "operation",
     "aspect": {
         "json": {
-            "timestampMillis": 1654621200000,
+            "timestampMillis": 1615443388097,
             "partitionSpec": {
                 "partition": "FULL_TABLE_SNAPSHOT",
                 "type": "FULL_TABLE"
@@ -7654,8 +8454,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -7666,7 +8466,7 @@
     "aspectName": "operation",
     "aspect": {
         "json": {
-            "timestampMillis": 1654621200000,
+            "timestampMillis": 1615443388097,
             "partitionSpec": {
                 "partition": "FULL_TABLE_SNAPSHOT",
                 "type": "FULL_TABLE"
@@ -7677,8 +8477,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -7689,7 +8489,7 @@
     "aspectName": "operation",
     "aspect": {
         "json": {
-            "timestampMillis": 1654621200000,
+            "timestampMillis": 1615443388097,
             "partitionSpec": {
                 "partition": "FULL_TABLE_SNAPSHOT",
                 "type": "FULL_TABLE"
@@ -7700,8 +8500,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -7712,7 +8512,7 @@
     "aspectName": "operation",
     "aspect": {
         "json": {
-            "timestampMillis": 1654621200000,
+            "timestampMillis": 1615443388097,
             "partitionSpec": {
                 "partition": "FULL_TABLE_SNAPSHOT",
                 "type": "FULL_TABLE"
@@ -7723,8 +8523,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -7735,7 +8535,7 @@
     "aspectName": "operation",
     "aspect": {
         "json": {
-            "timestampMillis": 1654621200000,
+            "timestampMillis": 1615443388097,
             "partitionSpec": {
                 "partition": "FULL_TABLE_SNAPSHOT",
                 "type": "FULL_TABLE"
@@ -7746,8 +8546,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -7758,7 +8558,7 @@
     "aspectName": "operation",
     "aspect": {
         "json": {
-            "timestampMillis": 1654621200000,
+            "timestampMillis": 1615443388097,
             "partitionSpec": {
                 "partition": "FULL_TABLE_SNAPSHOT",
                 "type": "FULL_TABLE"
@@ -7769,8 +8569,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -7781,7 +8581,7 @@
     "aspectName": "operation",
     "aspect": {
         "json": {
-            "timestampMillis": 1654621200000,
+            "timestampMillis": 1615443388097,
             "partitionSpec": {
                 "partition": "FULL_TABLE_SNAPSHOT",
                 "type": "FULL_TABLE"
@@ -7792,8 +8592,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -7804,7 +8604,7 @@
     "aspectName": "operation",
     "aspect": {
         "json": {
-            "timestampMillis": 1654621200000,
+            "timestampMillis": 1615443388097,
             "partitionSpec": {
                 "partition": "FULL_TABLE_SNAPSHOT",
                 "type": "FULL_TABLE"
@@ -7815,8 +8615,8 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -7827,7 +8627,7 @@
     "aspectName": "operation",
     "aspect": {
         "json": {
-            "timestampMillis": 1654621200000,
+            "timestampMillis": 1615443388097,
             "partitionSpec": {
                 "partition": "FULL_TABLE_SNAPSHOT",
                 "type": "FULL_TABLE"
@@ -7838,14 +8638,14 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "tag",
-    "entityUrn": "urn:li:tag:other_db.other_schema.my_other_tag:other",
+    "entityType": "query",
+    "entityUrn": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -7854,14 +8654,14 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "tag",
-    "entityUrn": "urn:li:tag:test_db.test_schema.my_tag_0:my_value_0",
+    "entityType": "query",
+    "entityUrn": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -7870,14 +8670,14 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "tag",
-    "entityUrn": "urn:li:tag:test_db.test_schema.my_tag_1:my_value_1",
+    "entityType": "query",
+    "entityUrn": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -7886,14 +8686,14 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "tag",
-    "entityUrn": "urn:li:tag:test_db.test_schema.my_tag_2:my_value_2",
+    "entityType": "query",
+    "entityUrn": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -7902,14 +8702,14 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "tag",
-    "entityUrn": "urn:li:tag:test_db.test_schema.security:pii",
+    "entityType": "query",
+    "entityUrn": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -7918,14 +8718,14 @@
         }
     },
     "systemMetadata": {
-        "lastObserved": 1654621200000,
-        "runId": "snowflake-2022_06_07-17_00_00",
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:973d404f0f5a9e2d5df165087f03a01fa182a04ffbcab14228c831070ade02c2",
+    "entityUrn": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -7935,13 +8735,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:ac812b1b491a3d141f66050526c1ee2483b19083ad840ceced0ca39ace552e01",
+    "entityUrn": "urn:li:query:aec91b63e3ce03877b9d80dc77b915880fc2a5f8f3b5cdf66e9341830268776b",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -7951,13 +8751,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8",
+    "entityUrn": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -7967,13 +8767,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:bfe6b2ec9f81445aae23bc757f90defb69480689f55d7e63c11f0da6a60fff12",
+    "entityUrn": "urn:li:query:d37a930ca6d2dd7100fd81bbf3d96a8cfe9f30e3469de363650d7e3146c3e4e8",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -7983,13 +8783,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:a79e59b5f5248b9247f88eaecbe3a296f788634282edc9cdca80ba1bfb504f37",
+    "entityUrn": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -7999,13 +8799,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:1d69efa7115792a07468c8b3846a4c0b3ba8620c1f2263374c2efbb2e56e6200",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -8015,13 +8815,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "query",
-    "entityUrn": "urn:li:query:84b52a9ad9d198587fbc4e210812011da567bd505381aa7ff437f243366873e9",
+    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -8031,13 +8831,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "query",
-    "entityUrn": "urn:li:query:62c3a7585398b147daace630104bf0827b366353152667718a84d22542f5aee4",
+    "entityType": "tag",
+    "entityUrn": "urn:li:tag:other_db.other_schema.my_other_tag:other",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -8047,13 +8847,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "query",
-    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_2%2CPROD%29",
+    "entityType": "tag",
+    "entityUrn": "urn:li:tag:test_db.test_schema.my_tag_0:my_value_0",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -8063,13 +8863,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "query",
-    "entityUrn": "urn:li:query:e093b2691b3cb33b6451367d1baa472eabe3b9a38fbd30152b12f22c35acc632",
+    "entityType": "tag",
+    "entityUrn": "urn:li:tag:test_db.test_schema.my_tag_1:my_value_1",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -8079,13 +8879,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "query",
-    "entityUrn": "urn:li:query:aec91b63e3ce03877b9d80dc77b915880fc2a5f8f3b5cdf66e9341830268776b",
+    "entityType": "tag",
+    "entityUrn": "urn:li:tag:test_db.test_schema.my_tag_2:my_value_2",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -8095,13 +8895,13 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
-    "entityType": "query",
-    "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29",
+    "entityType": "tag",
+    "entityUrn": "urn:li:tag:test_db.test_schema.security:pii",
     "changeType": "UPSERT",
     "aspectName": "status",
     "aspect": {
@@ -8111,7 +8911,7 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_03_01-16_29_41",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
@@ -8127,39 +8927,39 @@
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_04_15-12_58_22",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "glossaryTerm",
-    "entityUrn": "urn:li:glossaryTerm:Email_Address",
+    "entityUrn": "urn:li:glossaryTerm:CloudRegion",
     "changeType": "UPSERT",
     "aspectName": "glossaryTermKey",
     "aspect": {
         "json": {
-            "name": "Email_Address"
+            "name": "CloudRegion"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_04_15-12_58_22",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 },
 {
     "entityType": "glossaryTerm",
-    "entityUrn": "urn:li:glossaryTerm:CloudRegion",
+    "entityUrn": "urn:li:glossaryTerm:Email_Address",
     "changeType": "UPSERT",
     "aspectName": "glossaryTermKey",
     "aspect": {
         "json": {
-            "name": "CloudRegion"
+            "name": "Email_Address"
         }
     },
     "systemMetadata": {
         "lastObserved": 1615443388097,
-        "runId": "snowflake-2024_04_15-12_58_22",
+        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
         "lastRunId": "no-run-id-provided"
     }
 }
diff --git a/metadata-ingestion/tests/integration/snowflake/snowflake_privatelink_golden.json b/metadata-ingestion/tests/integration/snowflake/snowflake_privatelink_golden.json
index f22cbd122361dc..87eca14c7655eb 100644
--- a/metadata-ingestion/tests/integration/snowflake/snowflake_privatelink_golden.json
+++ b/metadata-ingestion/tests/integration/snowflake/snowflake_privatelink_golden.json
@@ -4101,6 +4101,22 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,instance1.test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "snowflake-2022_06_07-17_00_00-foacth",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,instance1.test_db.test_schema.view_2,PROD)",
@@ -4117,6 +4133,344 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,instance1.test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "test_db.test_schema.stream_1",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "col_1",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_2",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_3",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_4",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_5",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_6",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_7",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_8",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_9",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_10",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "metadata$action",
+                    "nullable": false,
+                    "description": "Type of DML operation (INSERT/DELETE)",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(10)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "metadata$isupdate",
+                    "nullable": false,
+                    "description": "Whether row is from UPDATE operation",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "BOOLEAN",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "metadata$row_id",
+                    "nullable": false,
+                    "description": "Unique row identifier",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "snowflake-2022_06_07-17_00_00-foacth",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,instance1.test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:eac598ee71ef1b5e24448d650c08aa5f"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "snowflake-2022_06_07-17_00_00-foacth",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,instance1.test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:snowflake,instance1)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "snowflake-2022_06_07-17_00_00-foacth",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,instance1.test_db.test_schema.stream_1,PROD)",
+    "changeType": "PATCH",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": [
+            {
+                "op": "add",
+                "path": "/name",
+                "value": "STREAM_1"
+            },
+            {
+                "op": "add",
+                "path": "/description",
+                "value": "Comment for Stream 1"
+            },
+            {
+                "op": "add",
+                "path": "/created",
+                "value": {
+                    "time": 1623110400000
+                }
+            },
+            {
+                "op": "add",
+                "path": "/lastModified",
+                "value": {
+                    "time": 1623110400000
+                }
+            },
+            {
+                "op": "add",
+                "path": "/qualifiedName",
+                "value": "TEST_DB.TEST_SCHEMA.STREAM_1"
+            },
+            {
+                "op": "add",
+                "path": "/customProperties/SOURCE_TYPE",
+                "value": "Table"
+            },
+            {
+                "op": "add",
+                "path": "/customProperties/TYPE",
+                "value": "DELTA"
+            },
+            {
+                "op": "add",
+                "path": "/customProperties/STALE",
+                "value": "false"
+            },
+            {
+                "op": "add",
+                "path": "/customProperties/MODE",
+                "value": "DEFAULT"
+            },
+            {
+                "op": "add",
+                "path": "/customProperties/OWNER_ROLE_TYPE",
+                "value": "ROLE"
+            },
+            {
+                "op": "add",
+                "path": "/customProperties/TABLE_NAME",
+                "value": "TEST_DB.TEST_SCHEMA.TABLE_1"
+            },
+            {
+                "op": "add",
+                "path": "/customProperties/BASE_TABLES",
+                "value": "TEST_DB.TEST_SCHEMA.TABLE_1"
+            },
+            {
+                "op": "add",
+                "path": "/customProperties/STALE_AFTER",
+                "value": "2021-06-22T00:00:00+00:00"
+            }
+        ]
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "snowflake-2022_06_07-17_00_00-ftc9zc",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,instance1.test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Snowflake Stream"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "snowflake-2022_06_07-17_00_00-foacth",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "query",
     "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Cinstance1.test_db.test_schema.view_1%2CPROD%29",
@@ -4396,6 +4750,35 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,instance1.test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:snowflake,instance1)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:snowflake,instance1)"
+                },
+                {
+                    "id": "urn:li:container:900b1327253068cb1537b1b3c807ddab",
+                    "urn": "urn:li:container:900b1327253068cb1537b1b3c807ddab"
+                },
+                {
+                    "id": "urn:li:container:eac598ee71ef1b5e24448d650c08aa5f",
+                    "urn": "urn:li:container:eac598ee71ef1b5e24448d650c08aa5f"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1654621200000,
+        "runId": "snowflake-2022_06_07-17_00_00-foacth",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "query",
     "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Cinstance1.test_db.test_schema.view_2%2CPROD%29",
diff --git a/metadata-ingestion/tests/integration/snowflake/snowflake_structured_properties_golden.json b/metadata-ingestion/tests/integration/snowflake/snowflake_structured_properties_golden.json
index 3adedd59070396..559856e1f654b3 100644
--- a/metadata-ingestion/tests/integration/snowflake/snowflake_structured_properties_golden.json
+++ b/metadata-ingestion/tests/integration/snowflake/snowflake_structured_properties_golden.json
@@ -3729,6 +3729,22 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_16-14_38_38-5znjnn",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_1,PROD)",
@@ -3881,6 +3897,279 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "test_db.test_schema.stream_1",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.MySqlDDL": {
+                    "tableSchema": ""
+                }
+            },
+            "fields": [
+                {
+                    "fieldPath": "col_1",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_2",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_3",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_4",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_5",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_6",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_7",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_8",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_9",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col_10",
+                    "nullable": false,
+                    "description": "Comment for column",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(255)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "metadata$action",
+                    "nullable": false,
+                    "description": "Type of DML operation (INSERT/DELETE)",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "VARCHAR(10)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "metadata$isupdate",
+                    "nullable": false,
+                    "description": "Whether row is from UPDATE operation",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "BOOLEAN",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "metadata$row_id",
+                    "nullable": false,
+                    "description": "Unique row identifier",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "NUMBER(38,0)",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_16-14_38_38-5znjnn",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_16-14_38_38-5znjnn",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Snowflake Stream"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_16-14_38_38-5znjnn",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "SOURCE_TYPE": "Table",
+                "TYPE": "DELTA",
+                "STALE": "false",
+                "MODE": "DEFAULT",
+                "OWNER_ROLE_TYPE": "ROLE",
+                "TABLE_NAME": "TEST_DB.TEST_SCHEMA.TABLE_1",
+                "BASE_TABLES": "TEST_DB.TEST_SCHEMA.TABLE_1",
+                "STALE_AFTER": "2021-06-22T00:00:00+00:00"
+            },
+            "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/view/STREAM_1/",
+            "name": "STREAM_1",
+            "qualifiedName": "TEST_DB.TEST_SCHEMA.STREAM_1",
+            "description": "Comment for Stream 1",
+            "created": {
+                "time": 1623110400000
+            },
+            "lastModified": {
+                "time": 1623110400000
+            },
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_17-13_30_28-vz7bmd",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "query",
     "entityUrn": "urn:li:query:view_urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Asnowflake%2Ctest_db.test_schema.view_1%2CPROD%29",
@@ -4008,6 +4297,31 @@
         "lastRunId": "no-run-id-provided"
     }
 },
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:5e359958be02ce647cd9ac196dbd4585",
+                    "urn": "urn:li:container:5e359958be02ce647cd9ac196dbd4585"
+                },
+                {
+                    "id": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c",
+                    "urn": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "snowflake-2025_01_16-14_38_38-5znjnn",
+        "lastRunId": "no-run-id-provided"
+    }
+},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.view_2,PROD)",
diff --git a/metadata-ingestion/tests/integration/snowflake/test_snowflake.py b/metadata-ingestion/tests/integration/snowflake/test_snowflake.py
index 340b771b76e310..33ba6d162cba2b 100644
--- a/metadata-ingestion/tests/integration/snowflake/test_snowflake.py
+++ b/metadata-ingestion/tests/integration/snowflake/test_snowflake.py
@@ -180,7 +180,8 @@ def test_snowflake_basic(pytestconfig, tmp_path, mock_time, mock_datahub_graph):
         cache_info = report.data_dictionary_cache.as_obj()
         assert cache_info["get_tables_for_database"]["misses"] == 1
         assert cache_info["get_views_for_database"]["misses"] == 1
-        assert cache_info["get_columns_for_schema"]["misses"] == 1
+        # When streams query specific tables, the query will not be cached resulting in 2 cache misses
+        assert cache_info["get_columns_for_schema"]["misses"] == 2
         assert cache_info["get_pk_constraints_for_schema"]["misses"] == 1
         assert cache_info["get_fk_constraints_for_schema"]["misses"] == 1
 
diff --git a/metadata-ingestion/tests/integration/snowflake/test_snowflake_failures.py b/metadata-ingestion/tests/integration/snowflake/test_snowflake_failures.py
index 4cb6cec4906efa..808734c13801ec 100644
--- a/metadata-ingestion/tests/integration/snowflake/test_snowflake_failures.py
+++ b/metadata-ingestion/tests/integration/snowflake/test_snowflake_failures.py
@@ -143,12 +143,16 @@ def test_snowflake_no_tables_causes_pipeline_failure(
             [SnowflakeQuery.tables_for_schema("TEST_SCHEMA", "TEST_DB")],
             [],
         )
-        sf_cursor.execute.side_effect = query_permission_response_override(
+        no_views_fn = query_permission_response_override(
             no_tables_fn,
             [SnowflakeQuery.show_views_for_database("TEST_DB")],
             [],
         )
-
+        sf_cursor.execute.side_effect = query_permission_response_override(
+            no_views_fn,
+            [SnowflakeQuery.streams_for_database("TEST_DB")],
+            [],
+        )
         pipeline = Pipeline(snowflake_pipeline_config)
         pipeline.run()
         assert "permission-error" in [

From 32b654ce20edaedf581983a87889297aa71ad374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20G=C3=B3mez=20Villamor?= <sgomezvillamor@gmail.com>
Date: Wed, 5 Feb 2025 11:27:48 +0100
Subject: [PATCH 226/249] feat(powerbi): Report to Dashboard lineage (#12451)

---
 .../ingestion/source/powerbi/config.py        |   1 +
 .../ingestion/source/powerbi/powerbi.py       |  31 +++-
 .../powerbi/rest_api_wrapper/data_classes.py  |   8 +-
 .../powerbi/rest_api_wrapper/data_resolver.py |  47 ++----
 .../powerbi/rest_api_wrapper/powerbi_api.py   |  21 ++-
 .../golden_test_admin_access_not_allowed.json |   5 +-
 .../integration/powerbi/golden_test_cll.json  |   5 +-
 .../powerbi/golden_test_container.json        | 142 ++++++++++--------
 .../golden_test_disabled_ownership.json       |   5 +-
 .../powerbi/golden_test_endorsement.json      |   5 +-
 .../powerbi/golden_test_ingest.json           |   5 +-
 .../golden_test_ingest_patch_disabled.json    |   5 +-
 .../powerbi/golden_test_lineage.json          |   5 +-
 .../golden_test_lower_case_urn_ingest.json    |   5 +-
 .../golden_test_platform_instance_ingest.json |   5 +-
 .../powerbi/golden_test_report.json           |  14 +-
 .../golden_test_scan_all_workspaces.json      |   5 +-
 ...lden_test_server_to_platform_instance.json |   5 +-
 .../mock_data/default_mock_response.json      |   3 +-
 .../tests/integration/powerbi/test_powerbi.py |   4 +-
 20 files changed, 188 insertions(+), 138 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py
index 9692eca4176fad..83d3336644d001 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py
@@ -132,6 +132,7 @@ class Constant:
     ACTIVE = "Active"
     SQL_PARSING_FAILURE = "SQL Parsing Failure"
     M_QUERY_NULL = '"null"'
+    REPORT_WEB_URL = "reportWebUrl"
 
 
 @dataclass
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py
index 89184d37569ffc..4342be1448b299 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py
@@ -582,8 +582,11 @@ def tile_custom_properties(tile: powerbi_data_classes.Tile) -> dict:
             if tile.dataset is not None and tile.dataset.webUrl is not None:
                 custom_properties[Constant.DATASET_WEB_URL] = tile.dataset.webUrl
 
-            if tile.report is not None and tile.report.id is not None:
-                custom_properties[Constant.REPORT_ID] = tile.report.id
+            if tile.report_id is not None:
+                custom_properties[Constant.REPORT_ID] = tile.report_id
+
+            if tile.report is not None and tile.report.webUrl is not None:
+                custom_properties[Constant.REPORT_WEB_URL] = tile.report.webUrl
 
             return custom_properties
 
@@ -1053,6 +1056,7 @@ def report_to_dashboard(
         report: powerbi_data_classes.Report,
         chart_mcps: List[MetadataChangeProposalWrapper],
         user_mcps: List[MetadataChangeProposalWrapper],
+        dashboard_edges: List[EdgeClass],
     ) -> List[MetadataChangeProposalWrapper]:
         """
         Map PowerBi report to Datahub dashboard
@@ -1074,6 +1078,7 @@ def report_to_dashboard(
             charts=chart_urn_list,
             lastModified=ChangeAuditStamps(),
             dashboardUrl=report.webUrl,
+            dashboards=dashboard_edges,
         )
 
         info_mcp = self.new_mcp(
@@ -1167,8 +1172,28 @@ def report_to_datahub_work_units(
         ds_mcps = self.to_datahub_dataset(report.dataset, workspace)
         chart_mcps = self.pages_to_chart(report.pages, workspace, ds_mcps)
 
+        # find all dashboards with a Tile referencing this report
+        downstream_dashboards_edges = []
+        for d in workspace.dashboards.values():
+            if any(t.report_id == report.id for t in d.tiles):
+                dashboard_urn = builder.make_dashboard_urn(
+                    platform=self.__config.platform_name,
+                    platform_instance=self.__config.platform_instance,
+                    name=d.get_urn_part(),
+                )
+                edge = EdgeClass(
+                    destinationUrn=dashboard_urn,
+                    sourceUrn=None,
+                    created=None,
+                    lastModified=None,
+                    properties=None,
+                )
+                downstream_dashboards_edges.append(edge)
+
         # Let's convert report to datahub dashboard
-        report_mcps = self.report_to_dashboard(workspace, report, chart_mcps, user_mcps)
+        report_mcps = self.report_to_dashboard(
+            workspace, report, chart_mcps, user_mcps, downstream_dashboards_edges
+        )
 
         # Now add MCPs in sequence
         mcps.extend(ds_mcps)
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/data_classes.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/data_classes.py
index f3e968896b3c96..a5ee6e7bc60aaf 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/data_classes.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/data_classes.py
@@ -286,11 +286,15 @@ class CreatedFrom(Enum):
     id: str
     title: str
     embedUrl: str
-    dataset: Optional["PowerBIDataset"]
     dataset_id: Optional[str]
-    report: Optional[Report]
+    report_id: Optional[str]
     createdFrom: CreatedFrom
 
+    # In a first pass, `dataset_id` and/or `report_id` are filled in.
+    # In a subsequent pass, the objects are populated.
+    dataset: Optional["PowerBIDataset"]
+    report: Optional[Report]
+
     def get_urn_part(self):
         return f"charts.{self.id}"
 
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/data_resolver.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/data_resolver.py
index 927840c44bf0b0..d98f4abc296778 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/data_resolver.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/data_resolver.py
@@ -337,41 +337,6 @@ def get_tiles(self, workspace: Workspace, dashboard: Dashboard) -> List[Tile]:
         -tiles), there is no information available on pagination
 
         """
-
-        def new_dataset_or_report(tile_instance: Any) -> dict:
-            """
-            Find out which is the data source for tile. It is either REPORT or DATASET
-            """
-            report_fields = {
-                Constant.REPORT: (
-                    self.get_report(
-                        workspace=workspace,
-                        report_id=tile_instance.get(Constant.REPORT_ID),
-                    )
-                    if tile_instance.get(Constant.REPORT_ID) is not None
-                    else None
-                ),
-                Constant.CREATED_FROM: Tile.CreatedFrom.UNKNOWN,
-            }
-
-            # reportId and datasetId are exclusive in tile_instance
-            # if datasetId is present that means tile is created from dataset
-            # if reportId is present that means tile is created from report
-            # if both i.e. reportId and datasetId are not present then tile is created from some visualization
-            if tile_instance.get(Constant.REPORT_ID) is not None:
-                report_fields[Constant.CREATED_FROM] = Tile.CreatedFrom.REPORT
-            elif tile_instance.get(Constant.DATASET_ID) is not None:
-                report_fields[Constant.CREATED_FROM] = Tile.CreatedFrom.DATASET
-            else:
-                report_fields[Constant.CREATED_FROM] = Tile.CreatedFrom.VISUALIZATION
-
-            title: Optional[str] = tile_instance.get(Constant.TITLE)
-            _id: Optional[str] = tile_instance.get(Constant.ID)
-            created_from: Any = report_fields[Constant.CREATED_FROM]
-            logger.info(f"Tile {title}({_id}) is created from {created_from}")
-
-            return report_fields
-
         tile_list_endpoint: str = self.get_tiles_endpoint(
             workspace, dashboard_id=dashboard.id
         )
@@ -393,8 +358,18 @@ def new_dataset_or_report(tile_instance: Any) -> dict:
                 title=instance.get(Constant.TITLE),
                 embedUrl=instance.get(Constant.EMBED_URL),
                 dataset_id=instance.get(Constant.DATASET_ID),
+                report_id=instance.get(Constant.REPORT_ID),
                 dataset=None,
-                **new_dataset_or_report(instance),
+                report=None,
+                createdFrom=(
+                    # In the past we considered that only one of the two report_id or dataset_id would be present
+                    # but we have seen cases where both are present. If both are present, we prioritize the report.
+                    Tile.CreatedFrom.REPORT
+                    if instance.get(Constant.REPORT_ID)
+                    else Tile.CreatedFrom.DATASET
+                    if instance.get(Constant.DATASET_ID)
+                    else Tile.CreatedFrom.VISUALIZATION
+                ),
             )
             for instance in tile_dict
             if instance is not None
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/powerbi_api.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/powerbi_api.py
index 93d734652f0ff1..efc6ea5b30b335 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/powerbi_api.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/powerbi_api.py
@@ -625,13 +625,26 @@ def fill_dashboards() -> None:
                 dashboard.tiles = self._get_resolver().get_tiles(
                     workspace, dashboard=dashboard
                 )
-                # set the dataset for tiles
+                # set the dataset and the report for tiles
                 for tile in dashboard.tiles:
+                    # In Power BI, dashboards, reports, and datasets are tightly scoped to the workspace they belong to.
+                    # https://learn.microsoft.com/en-us/power-bi/collaborate-share/service-new-workspaces
+                    if tile.report_id:
+                        tile.report = workspace.reports.get(tile.report_id)
+                        if tile.report is None:
+                            self.reporter.info(
+                                title="Missing Report Lineage For Tile",
+                                message="A Report reference that failed to be resolved. Please ensure that 'extract_reports' is set to True in the configuration.",
+                                context=f"workspace-name: {workspace.name}, tile-name: {tile.title}, report-id: {tile.report_id}",
+                            )
+                    # However, semantic models (aka datasets) can be shared accross workspaces
+                    # https://learn.microsoft.com/en-us/fabric/admin/portal-workspace#use-semantic-models-across-workspaces
+                    # That's why the global 'dataset_registry' is required
                     if tile.dataset_id:
                         tile.dataset = self.dataset_registry.get(tile.dataset_id)
                         if tile.dataset is None:
                             self.reporter.info(
-                                title="Missing Lineage For Tile",
+                                title="Missing Dataset Lineage For Tile",
                                 message="A cross-workspace reference that failed to be resolved. Please ensure that no global workspace is being filtered out due to the workspace_id_pattern.",
                                 context=f"workspace-name: {workspace.name}, tile-name: {tile.title}, dataset-id: {tile.dataset_id}",
                             )
@@ -653,10 +666,10 @@ def fill_dashboard_tags() -> None:
             for dashboard in workspace.dashboards.values():
                 dashboard.tags = workspace.dashboard_endorsements.get(dashboard.id, [])
 
+        # fill reports first since some dashboard may reference a report
+        fill_reports()
         if self.__config.extract_dashboards:
             fill_dashboards()
-
-        fill_reports()
         fill_dashboard_tags()
         self._fill_independent_datasets(workspace=workspace)
 
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_admin_access_not_allowed.json b/metadata-ingestion/tests/integration/powerbi/golden_test_admin_access_not_allowed.json
index 1394a140b0a245..6604883f8bd7ca 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_admin_access_not_allowed.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_admin_access_not_allowed.json
@@ -39,8 +39,9 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "createdFrom": "Dataset",
-                "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445"
+                "createdFrom": "Report",
+                "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445",
+                "reportId": "5b218778-e7a5-4d73-8187-f10824047715"
             },
             "title": "test_tile",
             "description": "test_tile",
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_cll.json b/metadata-ingestion/tests/integration/powerbi/golden_test_cll.json
index 5881ad5de0bcb8..96413ffeebc940 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_cll.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_cll.json
@@ -81,9 +81,10 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "createdFrom": "Dataset",
+                "createdFrom": "Report",
                 "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445",
-                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details"
+                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+                "reportId": "5b218778-e7a5-4d73-8187-f10824047715"
             },
             "title": "test_tile",
             "description": "test_tile",
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_container.json b/metadata-ingestion/tests/integration/powerbi/golden_test_container.json
index 50058405a7aec5..87fb8e5a4f0d87 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_container.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_container.json
@@ -92,14 +92,10 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:6ac0662f0f2fc3a9196ac505da2182b2",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "powerbi",
-                "dataset": "05169CD2-E713-41E6-9600-1D8066D95445"
-            },
-            "name": "library-dataset"
+            "container": "urn:li:container:a4ed52f9abd3ff9cc34960c0c41f72e9"
         }
     },
     "systemMetadata": {
@@ -112,10 +108,14 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:6ac0662f0f2fc3a9196ac505da2182b2",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "removed": false
+            "customProperties": {
+                "platform": "powerbi",
+                "dataset": "05169CD2-E713-41E6-9600-1D8066D95445"
+            },
+            "name": "library-dataset"
         }
     },
     "systemMetadata": {
@@ -128,10 +128,10 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:6ac0662f0f2fc3a9196ac505da2182b2",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:powerbi"
+            "removed": false
         }
     },
     "systemMetadata": {
@@ -144,12 +144,10 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:6ac0662f0f2fc3a9196ac505da2182b2",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Semantic Model"
-            ]
+            "platform": "urn:li:dataPlatform:powerbi"
         }
     },
     "systemMetadata": {
@@ -162,10 +160,12 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:6ac0662f0f2fc3a9196ac505da2182b2",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "container": "urn:li:container:a4ed52f9abd3ff9cc34960c0c41f72e9"
+            "typeNames": [
+                "Semantic Model"
+            ]
         }
     },
     "systemMetadata": {
@@ -1004,14 +1004,10 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:977b804137a1d2bf897ff1bbf440a1cc",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "powerbi",
-                "dataset": "ba0130a1-5b03-40de-9535-b34e778ea6ed"
-            },
-            "name": "hr_pbi_test"
+            "container": "urn:li:container:a4ed52f9abd3ff9cc34960c0c41f72e9"
         }
     },
     "systemMetadata": {
@@ -1024,10 +1020,14 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:977b804137a1d2bf897ff1bbf440a1cc",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "removed": false
+            "customProperties": {
+                "platform": "powerbi",
+                "dataset": "ba0130a1-5b03-40de-9535-b34e778ea6ed"
+            },
+            "name": "hr_pbi_test"
         }
     },
     "systemMetadata": {
@@ -1040,10 +1040,10 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:977b804137a1d2bf897ff1bbf440a1cc",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:powerbi"
+            "removed": false
         }
     },
     "systemMetadata": {
@@ -1056,12 +1056,10 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:977b804137a1d2bf897ff1bbf440a1cc",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Semantic Model"
-            ]
+            "platform": "urn:li:dataPlatform:powerbi"
         }
     },
     "systemMetadata": {
@@ -1074,10 +1072,12 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:977b804137a1d2bf897ff1bbf440a1cc",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "container": "urn:li:container:a4ed52f9abd3ff9cc34960c0c41f72e9"
+            "typeNames": [
+                "Semantic Model"
+            ]
         }
     },
     "systemMetadata": {
@@ -1377,10 +1377,13 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "createdFrom": "Dataset",
+                "createdFrom": "Report",
                 "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445",
-                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details"
+                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+                "reportId": "5b218778-e7a5-4d73-8187-f10824047715",
+                "reportWebUrl": "https://app.powerbi.com/groups/f089354e-8366-4e18-aea3-4cb4a3a50b48/reports/5b218778-e7a5-4d73-8187-f10824047715"
             },
+            "externalUrl": "https://app.powerbi.com/groups/f089354e-8366-4e18-aea3-4cb4a3a50b48/reports/5b218778-e7a5-4d73-8187-f10824047715",
             "title": "test_tile",
             "description": "test_tile",
             "lastModified": {
@@ -1867,14 +1870,10 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:6ac0662f0f2fc3a9196ac505da2182b2",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "powerbi",
-                "dataset": "05169CD2-E713-41E6-9600-1D8066D95445"
-            },
-            "name": "library-dataset"
+            "container": "urn:li:container:a4ed52f9abd3ff9cc34960c0c41f72e9"
         }
     },
     "systemMetadata": {
@@ -1887,10 +1886,14 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:6ac0662f0f2fc3a9196ac505da2182b2",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "removed": false
+            "customProperties": {
+                "platform": "powerbi",
+                "dataset": "05169CD2-E713-41E6-9600-1D8066D95445"
+            },
+            "name": "library-dataset"
         }
     },
     "systemMetadata": {
@@ -1903,10 +1906,10 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:6ac0662f0f2fc3a9196ac505da2182b2",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:powerbi"
+            "removed": false
         }
     },
     "systemMetadata": {
@@ -1919,12 +1922,10 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:6ac0662f0f2fc3a9196ac505da2182b2",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Semantic Model"
-            ]
+            "platform": "urn:li:dataPlatform:powerbi"
         }
     },
     "systemMetadata": {
@@ -1937,10 +1938,12 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:6ac0662f0f2fc3a9196ac505da2182b2",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "container": "urn:li:container:a4ed52f9abd3ff9cc34960c0c41f72e9"
+            "typeNames": [
+                "Semantic Model"
+            ]
         }
     },
     "systemMetadata": {
@@ -2945,6 +2948,13 @@
                 "path": "/dashboardUrl",
                 "value": "https://app.powerbi.com/groups/f089354e-8366-4e18-aea3-4cb4a3a50b48/reports/5b218778-e7a5-4d73-8187-f10824047715"
             },
+            {
+                "op": "add",
+                "path": "/dashboards/urn:li:dashboard:(powerbi,dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
+                "value": {
+                    "destinationUrn": "urn:li:dashboard:(powerbi,dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)"
+                }
+            },
             {
                 "op": "add",
                 "path": "/lastModified",
@@ -3089,14 +3099,10 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:6ac0662f0f2fc3a9196ac505da2182b2",
     "changeType": "UPSERT",
-    "aspectName": "containerProperties",
+    "aspectName": "container",
     "aspect": {
         "json": {
-            "customProperties": {
-                "platform": "powerbi",
-                "dataset": "05169CD2-E713-41E6-9600-1D8066D95445"
-            },
-            "name": "library-dataset"
+            "container": "urn:li:container:a4ed52f9abd3ff9cc34960c0c41f72e9"
         }
     },
     "systemMetadata": {
@@ -3109,10 +3115,14 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:6ac0662f0f2fc3a9196ac505da2182b2",
     "changeType": "UPSERT",
-    "aspectName": "status",
+    "aspectName": "containerProperties",
     "aspect": {
         "json": {
-            "removed": false
+            "customProperties": {
+                "platform": "powerbi",
+                "dataset": "05169CD2-E713-41E6-9600-1D8066D95445"
+            },
+            "name": "library-dataset"
         }
     },
     "systemMetadata": {
@@ -3125,10 +3135,10 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:6ac0662f0f2fc3a9196ac505da2182b2",
     "changeType": "UPSERT",
-    "aspectName": "dataPlatformInstance",
+    "aspectName": "status",
     "aspect": {
         "json": {
-            "platform": "urn:li:dataPlatform:powerbi"
+            "removed": false
         }
     },
     "systemMetadata": {
@@ -3141,12 +3151,10 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:6ac0662f0f2fc3a9196ac505da2182b2",
     "changeType": "UPSERT",
-    "aspectName": "subTypes",
+    "aspectName": "dataPlatformInstance",
     "aspect": {
         "json": {
-            "typeNames": [
-                "Semantic Model"
-            ]
+            "platform": "urn:li:dataPlatform:powerbi"
         }
     },
     "systemMetadata": {
@@ -3159,10 +3167,12 @@
     "entityType": "container",
     "entityUrn": "urn:li:container:6ac0662f0f2fc3a9196ac505da2182b2",
     "changeType": "UPSERT",
-    "aspectName": "container",
+    "aspectName": "subTypes",
     "aspect": {
         "json": {
-            "container": "urn:li:container:a4ed52f9abd3ff9cc34960c0c41f72e9"
+            "typeNames": [
+                "Semantic Model"
+            ]
         }
     },
     "systemMetadata": {
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_disabled_ownership.json b/metadata-ingestion/tests/integration/powerbi/golden_test_disabled_ownership.json
index 099f75a190ca26..3cd79437ee528f 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_disabled_ownership.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_disabled_ownership.json
@@ -410,9 +410,10 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "createdFrom": "Dataset",
+                "createdFrom": "Report",
                 "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445",
-                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details"
+                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+                "reportId": "5b218778-e7a5-4d73-8187-f10824047715"
             },
             "title": "test_tile",
             "description": "test_tile",
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_endorsement.json b/metadata-ingestion/tests/integration/powerbi/golden_test_endorsement.json
index 07bb4f9aaad44c..a126a9bb67dbe1 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_endorsement.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_endorsement.json
@@ -526,9 +526,10 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "createdFrom": "Dataset",
+                "createdFrom": "Report",
                 "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445",
-                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details"
+                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+                "reportId": "5b218778-e7a5-4d73-8187-f10824047715"
             },
             "title": "test_tile",
             "description": "test_tile",
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_ingest.json b/metadata-ingestion/tests/integration/powerbi/golden_test_ingest.json
index 4bbd2e2b06542c..33c6f2c1e5e3c0 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_ingest.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_ingest.json
@@ -432,9 +432,10 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "createdFrom": "Dataset",
+                "createdFrom": "Report",
                 "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445",
-                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details"
+                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+                "reportId": "5b218778-e7a5-4d73-8187-f10824047715"
             },
             "title": "test_tile",
             "description": "test_tile",
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_ingest_patch_disabled.json b/metadata-ingestion/tests/integration/powerbi/golden_test_ingest_patch_disabled.json
index a943472f307e5c..f76c3ecfdecf03 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_ingest_patch_disabled.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_ingest_patch_disabled.json
@@ -432,9 +432,10 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "createdFrom": "Dataset",
+                "createdFrom": "Report",
                 "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445",
-                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details"
+                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+                "reportId": "5b218778-e7a5-4d73-8187-f10824047715"
             },
             "title": "test_tile",
             "description": "test_tile",
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_lineage.json b/metadata-ingestion/tests/integration/powerbi/golden_test_lineage.json
index df56bdc45db762..49da7c7eeb4dfd 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_lineage.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_lineage.json
@@ -516,9 +516,10 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "createdFrom": "Dataset",
+                "createdFrom": "Report",
                 "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445",
-                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details"
+                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+                "reportId": "5b218778-e7a5-4d73-8187-f10824047715"
             },
             "title": "test_tile",
             "description": "test_tile",
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_lower_case_urn_ingest.json b/metadata-ingestion/tests/integration/powerbi/golden_test_lower_case_urn_ingest.json
index 4c27dec3c67520..f96841a71e6c88 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_lower_case_urn_ingest.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_lower_case_urn_ingest.json
@@ -173,9 +173,10 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "createdFrom": "Dataset",
+                "createdFrom": "Report",
                 "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445",
-                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details"
+                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+                "reportId": "5b218778-e7a5-4d73-8187-f10824047715"
             },
             "title": "test_tile",
             "description": "test_tile",
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_platform_instance_ingest.json b/metadata-ingestion/tests/integration/powerbi/golden_test_platform_instance_ingest.json
index b2ec0f7a67a969..c4a4fc6cc24bd2 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_platform_instance_ingest.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_platform_instance_ingest.json
@@ -718,9 +718,10 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "createdFrom": "Dataset",
+                "createdFrom": "Report",
                 "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445",
-                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details"
+                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+                "reportId": "5b218778-e7a5-4d73-8187-f10824047715"
             },
             "title": "test_tile",
             "description": "test_tile",
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_report.json b/metadata-ingestion/tests/integration/powerbi/golden_test_report.json
index 1805272b84d486..8f0e9eab428979 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_report.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_report.json
@@ -705,10 +705,13 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "createdFrom": "Dataset",
+                "createdFrom": "Report",
                 "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445",
-                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details"
+                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+                "reportId": "5b218778-e7a5-4d73-8187-f10824047715",
+                "reportWebUrl": "https://app.powerbi.com/groups/f089354e-8366-4e18-aea3-4cb4a3a50b48/reports/5b218778-e7a5-4d73-8187-f10824047715"
             },
+            "externalUrl": "https://app.powerbi.com/groups/f089354e-8366-4e18-aea3-4cb4a3a50b48/reports/5b218778-e7a5-4d73-8187-f10824047715",
             "title": "test_tile",
             "description": "test_tile",
             "lastModified": {
@@ -1990,6 +1993,13 @@
                 "path": "/dashboardUrl",
                 "value": "https://app.powerbi.com/groups/f089354e-8366-4e18-aea3-4cb4a3a50b48/reports/5b218778-e7a5-4d73-8187-f10824047715"
             },
+            {
+                "op": "add",
+                "path": "/dashboards/urn:li:dashboard:(powerbi,dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)",
+                "value": {
+                    "destinationUrn": "urn:li:dashboard:(powerbi,dashboards.7D668CAD-7FFC-4505-9215-655BCA5BEBAE)"
+                }
+            },
             {
                 "op": "add",
                 "path": "/lastModified",
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_scan_all_workspaces.json b/metadata-ingestion/tests/integration/powerbi/golden_test_scan_all_workspaces.json
index bc0feef4a127d3..36afe746e94333 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_scan_all_workspaces.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_scan_all_workspaces.json
@@ -25,9 +25,10 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "createdFrom": "Dataset",
+                "createdFrom": "Report",
                 "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445",
-                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details"
+                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+                "reportId": "5b218778-e7a5-4d73-8187-f10824047715"
             },
             "title": "test_tile",
             "description": "test_tile",
diff --git a/metadata-ingestion/tests/integration/powerbi/golden_test_server_to_platform_instance.json b/metadata-ingestion/tests/integration/powerbi/golden_test_server_to_platform_instance.json
index bcf7b76285110a..ea4c39e56aaa99 100644
--- a/metadata-ingestion/tests/integration/powerbi/golden_test_server_to_platform_instance.json
+++ b/metadata-ingestion/tests/integration/powerbi/golden_test_server_to_platform_instance.json
@@ -516,9 +516,10 @@
     "aspect": {
         "json": {
             "customProperties": {
-                "createdFrom": "Dataset",
+                "createdFrom": "Report",
                 "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445",
-                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details"
+                "datasetWebUrl": "http://localhost/groups/64ED5CAD-7C10-4684-8180-826122881108/datasets/05169CD2-E713-41E6-9600-1D8066D95445/details",
+                "reportId": "5b218778-e7a5-4d73-8187-f10824047715"
             },
             "title": "test_tile",
             "description": "test_tile",
diff --git a/metadata-ingestion/tests/integration/powerbi/mock_data/default_mock_response.json b/metadata-ingestion/tests/integration/powerbi/mock_data/default_mock_response.json
index 28972fbded9e82..a9fad07478d4cb 100644
--- a/metadata-ingestion/tests/integration/powerbi/mock_data/default_mock_response.json
+++ b/metadata-ingestion/tests/integration/powerbi/mock_data/default_mock_response.json
@@ -149,7 +149,8 @@
                     "id": "B8E293DC-0C83-4AA0-9BB9-0A8738DF24A0",
                     "title": "test_tile",
                     "embedUrl": "https://localhost/tiles/embed/1",
-                    "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445"
+                    "datasetId": "05169CD2-E713-41E6-9600-1D8066D95445",
+                    "reportId": "5b218778-e7a5-4d73-8187-f10824047715"
                 },
                 {
                     "id": "23212598-23b5-4980-87cc-5fc0ecd84385",
diff --git a/metadata-ingestion/tests/integration/powerbi/test_powerbi.py b/metadata-ingestion/tests/integration/powerbi/test_powerbi.py
index 571c0092dcc8c1..2179e94af358b1 100644
--- a/metadata-ingestion/tests/integration/powerbi/test_powerbi.py
+++ b/metadata-ingestion/tests/integration/powerbi/test_powerbi.py
@@ -1440,12 +1440,12 @@ def test_powerbi_cross_workspace_reference_info_message(
     is_entry_present: bool = False
     # Printing INFO entries
     for entry in info_entries.values():
-        if entry.title == "Missing Lineage For Tile":
+        if entry.title == "Missing Dataset Lineage For Tile":
             is_entry_present = True
             break
 
     assert is_entry_present, (
-        'Info message "Missing Lineage For Tile" should be present in reporter'
+        'Info message "Missing Dataset Lineage For Tile" should be present in reporter'
     )
 
     test_resources_dir = pytestconfig.rootpath / "tests/integration/powerbi"

From 66bce0d9f1c13d115e7c9c1436e63e78fd0a720f Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Wed, 5 Feb 2025 08:36:34 -0600
Subject: [PATCH 227/249] fix(no-rows-updated): fix no rows updated (#12530)

---
 .../metadata/entity/EntityServiceImpl.java    |  12 +-
 .../entity/EbeanEntityServiceTest.java        | 115 ++++++++++++++++--
 2 files changed, 118 insertions(+), 9 deletions(-)

diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
index 2cefb40dbaa3c2..79894d603b5860 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
@@ -1031,7 +1031,17 @@ This condition is specifically for an older conditional write ingestAspectIfNotP
                     if (!upsertResults.isEmpty()) {
                       // commit upserts prior to retention or kafka send, if supported by impl
                       if (txContext != null) {
-                        txContext.commitAndContinue();
+                        try {
+                          txContext.commitAndContinue();
+                        } catch (EntityNotFoundException e) {
+                          if (e.getMessage() != null
+                              && e.getMessage().contains("No rows updated")) {
+                            log.debug("Ignoring no rows updated condition for metadata update", e);
+                            MetricUtils.counter(EntityServiceImpl.class, "no_rows_updated").inc();
+                            return TransactionResult.rollback();
+                          }
+                          throw e;
+                        }
                       }
 
                       // Retention optimization and tx
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/entity/EbeanEntityServiceTest.java b/metadata-io/src/test/java/com/linkedin/metadata/entity/EbeanEntityServiceTest.java
index 88f84ee94c8ee7..3620eb0c85f923 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/entity/EbeanEntityServiceTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/entity/EbeanEntityServiceTest.java
@@ -3,8 +3,21 @@
 import static com.linkedin.metadata.Constants.CORP_USER_ENTITY_NAME;
 import static com.linkedin.metadata.Constants.STATUS_ASPECT_NAME;
 import static com.linkedin.metadata.entity.ebean.EbeanAspectDao.TX_ISOLATION;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
@@ -41,6 +54,7 @@
 import io.ebean.Database;
 import io.ebean.Transaction;
 import io.ebean.TxScope;
+import jakarta.persistence.EntityNotFoundException;
 import java.net.URISyntaxException;
 import java.sql.Timestamp;
 import java.time.Instant;
@@ -50,10 +64,11 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import org.apache.commons.lang3.tuple.Triple;
-import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -112,14 +127,98 @@ public void setupTest() {
             null);
   }
 
-  /**
-   * Ideally, all tests would be in the base class, so they're reused between all implementations.
-   * When that's the case - test runner will ignore this class (and its base!) so we keep this dummy
-   * test to make sure this class will always be discovered.
-   */
   @Test
-  public void obligatoryTest() throws AssertionError {
-    Assert.assertTrue(true);
+  public void testNoRowsUpdatedErrorHandling() throws Exception {
+    // Setup test data
+    Urn entityUrn = UrnUtils.getUrn("urn:li:corpuser:testUser");
+    SystemMetadata systemMetadata = AspectGenerationUtils.createSystemMetadata();
+    CorpUserInfo writeAspect = AspectGenerationUtils.createCorpUserInfo("email@test.com");
+    String aspectName = PegasusUtils.getAspectNameFromSchema(writeAspect.schema());
+
+    // Create database and spy on aspectDao
+    Database server = EbeanTestUtils.createTestServer(EbeanEntityServiceTest.class.getSimpleName());
+    EbeanAspectDao aspectDao = spy(new EbeanAspectDao(server, EbeanConfiguration.testDefault));
+
+    // Prevent actual saves
+    doNothing().when(aspectDao).saveAspect(any(), any(), anyBoolean());
+    doReturn(0L)
+        .when(aspectDao)
+        .saveLatestAspect(
+            any(),
+            anyString(),
+            anyString(),
+            any(),
+            any(),
+            any(),
+            any(),
+            any(),
+            anyString(),
+            anyString(),
+            any(),
+            any(),
+            any(),
+            anyLong());
+
+    // Create spied transaction context that throws on commitAndContinue
+    AtomicReference<TransactionContext> capturedTxContext = new AtomicReference<>();
+    AtomicReference<TransactionResult<?>> capturedResult = new AtomicReference<>();
+
+    doAnswer(
+            invocation -> {
+              Function<TransactionContext, TransactionResult<?>> block = invocation.getArgument(0);
+              Integer maxTransactionRetry = invocation.getArgument(2);
+
+              TransactionContext txContext = spy(TransactionContext.empty(maxTransactionRetry));
+              capturedTxContext.set(txContext);
+
+              doThrow(new EntityNotFoundException("No rows updated"))
+                  .when(txContext)
+                  .commitAndContinue();
+
+              TransactionResult<?> result = block.apply(txContext);
+              capturedResult.set(result);
+              return result.getResults();
+            })
+        .when(aspectDao)
+        .runInTransactionWithRetry(any(), any(), anyInt());
+
+    // Create the service with our spied dao
+    PreProcessHooks preProcessHooks = new PreProcessHooks();
+    preProcessHooks.setUiEnabled(false);
+    EntityServiceImpl entityService =
+        new EntityServiceImpl(aspectDao, _mockProducer, false, preProcessHooks, true);
+
+    // Create the test batch
+    List<ChangeItemImpl> items =
+        List.of(
+            ChangeItemImpl.builder()
+                .urn(entityUrn)
+                .aspectName(aspectName)
+                .recordTemplate(writeAspect)
+                .systemMetadata(systemMetadata)
+                .auditStamp(TEST_AUDIT_STAMP)
+                .build(TestOperationContexts.emptyActiveUsersAspectRetriever(null)));
+
+    AspectsBatchImpl batch =
+        AspectsBatchImpl.builder()
+            .retrieverContext(opContext.getRetrieverContext())
+            .items(items)
+            .build();
+
+    // Execute the test
+    List<UpdateAspectResult> results = entityService.ingestAspects(opContext, batch, false, true);
+
+    // Verify results
+    assertEquals(results.size(), 0, "Expected no results for rolled back transaction");
+
+    // Verify transaction behavior
+    verify(aspectDao).runInTransactionWithRetry(any(), eq(batch), anyInt());
+    verify(capturedTxContext.get()).commitAndContinue();
+
+    // Verify the transaction result was a rollback
+    TransactionResult<?> result = capturedResult.get();
+    assertNotNull(result, "Expected a transaction result");
+    assertFalse(result.isCommitOrRollback(), "Expected a rollback result");
   }
 
   @Override

From 1cb916550ef363da993ab201cd71e78f378ac08a Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Wed, 5 Feb 2025 10:50:31 -0800
Subject: [PATCH 228/249] ci(smoke): report smoke test results to codecov
 (#12556)

---
 .github/workflows/docker-unified.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/docker-unified.yml b/.github/workflows/docker-unified.yml
index 704479d958bc12..dc2552b6ac9625 100644
--- a/.github/workflows/docker-unified.yml
+++ b/.github/workflows/docker-unified.yml
@@ -1274,6 +1274,11 @@ jobs:
             **/build/test-results/test/**
             **/junit.*.xml
             !**/binary/**
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
   deploy_datahub_head:
     name: Deploy to Datahub HEAD
     runs-on: ubuntu-latest

From 468112b11ce2e65b65c8c5436d97d4c58e4d3424 Mon Sep 17 00:00:00 2001
From: Pinaki Bhattacharjee <pinakipb2@gmail.com>
Date: Thu, 6 Feb 2025 00:38:01 +0530
Subject: [PATCH 229/249] feat(UI): Confirmation before deleting Link (#12162)

---
 .../tabs/Documentation/components/LinkList.tsx   | 16 +++++++++++++++-
 .../cypress/e2e/domains/nested_domains.js        |  6 +++++-
 .../cypress/e2e/mutations/edit_documentation.js  | 12 ++++++++++--
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx
index 6eb680785599e1..bfc516a796c996 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx
@@ -103,6 +103,20 @@ export const LinkList = ({ refetch }: LinkListProps) => {
         }
     };
 
+    const onConfirmDelete = (link) => {
+        Modal.confirm({
+            title: `Delete Link '${link?.description}'`,
+            content: `Are you sure you want to remove this Link?`,
+            onOk() {
+                handleDeleteLink(link);
+            },
+            onCancel() {},
+            okText: 'Yes',
+            maskClosable: true,
+            closable: true,
+        });
+    };
+
     return entityData ? (
         <>
             <Modal
@@ -162,7 +176,7 @@ export const LinkList = ({ refetch }: LinkListProps) => {
                                     <Button onClick={() => handleEditLink(link)} type="text" shape="circle">
                                         <EditOutlined />
                                     </Button>
-                                    <Button onClick={() => handleDeleteLink(link)} type="text" shape="circle" danger>
+                                    <Button onClick={() => onConfirmDelete(link)} type="text" shape="circle" danger>
                                         <DeleteOutlined />
                                     </Button>
                                 </>
diff --git a/smoke-test/tests/cypress/cypress/e2e/domains/nested_domains.js b/smoke-test/tests/cypress/cypress/e2e/domains/nested_domains.js
index 4d8499d91e2b94..af7135ce4b1b9b 100644
--- a/smoke-test/tests/cypress/cypress/e2e/domains/nested_domains.js
+++ b/smoke-test/tests/cypress/cypress/e2e/domains/nested_domains.js
@@ -77,7 +77,11 @@ const clearAndDelete = () => {
   cy.clickOptionWithTestId("description-editor-save-button");
   cy.waitTextVisible("No documentation");
   cy.mouseover(".ant-list-item-meta-content");
-  cy.get('[aria-label="delete"]').click();
+  cy.get('[aria-label="delete"]').click().wait(1000);
+  cy.get("button")
+    .contains("span", "Yes")
+    .should("be.visible")
+    .click({ force: true });
   cy.waitTextVisible("Link Removed");
 };
 
diff --git a/smoke-test/tests/cypress/cypress/e2e/mutations/edit_documentation.js b/smoke-test/tests/cypress/cypress/e2e/mutations/edit_documentation.js
index 4d14683ac4b135..623d5078e77bca 100644
--- a/smoke-test/tests/cypress/cypress/e2e/mutations/edit_documentation.js
+++ b/smoke-test/tests/cypress/cypress/e2e/mutations/edit_documentation.js
@@ -35,7 +35,11 @@ describe("edit documentation and link to dataset", () => {
     );
     cy.openEntityTab("Documentation");
     cy.contains("Sample doc").trigger("mouseover", { force: true });
-    cy.get('[data-icon="delete"]').click();
+    cy.get('[data-icon="delete"]').click().wait(1000);
+    cy.get("button")
+      .contains("span", "Yes")
+      .should("be.visible")
+      .click({ force: true });
     cy.waitTextVisible("Link Removed");
     cy.clickOptionWithTestId("add-link-button").wait(1000);
     cy.enterTextInTestId("add-link-modal-url", wrong_url);
@@ -69,7 +73,11 @@ describe("edit documentation and link to dataset", () => {
     cy.get("[data-testid='edit-documentation-button']").should("be.visible");
     cy.get(`[href='${correct_url}']`).should("be.visible");
     cy.contains("Sample doc").trigger("mouseover", { force: true });
-    cy.get('[data-icon="delete"]').click();
+    cy.get('[data-icon="delete"]').click().wait(1000);
+    cy.get("button")
+      .contains("span", "Yes")
+      .should("be.visible")
+      .click({ force: true });
     cy.waitTextVisible("Link Removed");
   });
 

From 5ed4b5bce93766fdc8726ed6739fcfe3f7d0fe93 Mon Sep 17 00:00:00 2001
From: Austin SeungJun Park <110667795+eagle-25@users.noreply.github.com>
Date: Thu, 6 Feb 2025 04:19:44 +0900
Subject: [PATCH 230/249] feat(ingest/s3): ignore depth mismatched path
 (#12326)

---
 .../src/datahub/ingestion/source/s3/source.py | 19 +++--
 .../tests/unit/data_lake/test_path_spec.py    | 31 ++++++++
 .../tests/unit/s3/test_s3_source.py           | 73 +++++++++++++++----
 3 files changed, 105 insertions(+), 18 deletions(-)
 create mode 100644 metadata-ingestion/tests/unit/data_lake/test_path_spec.py

diff --git a/metadata-ingestion/src/datahub/ingestion/source/s3/source.py b/metadata-ingestion/src/datahub/ingestion/source/s3/source.py
index b5bc08912ee946..b1554ad127b7ac 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/s3/source.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/s3/source.py
@@ -866,8 +866,21 @@ def get_folder_info(
         Returns:
         List[Folder]: A list of Folder objects representing the partitions found.
         """
+
+        def _is_allowed_path(path_spec_: PathSpec, s3_uri: str) -> bool:
+            allowed = path_spec_.allowed(s3_uri)
+            if not allowed:
+                logger.debug(f"File {s3_uri} not allowed and skipping")
+                self.report.report_file_dropped(s3_uri)
+            return allowed
+
+        s3_objects = (
+            obj
+            for obj in bucket.objects.filter(Prefix=prefix).page_size(PAGE_SIZE)
+            if _is_allowed_path(path_spec, f"s3://{obj.bucket_name}/{obj.key}")
+        )
+
         partitions: List[Folder] = []
-        s3_objects = bucket.objects.filter(Prefix=prefix).page_size(PAGE_SIZE)
         grouped_s3_objects_by_dirname = groupby_unsorted(
             s3_objects,
             key=lambda obj: obj.key.rsplit("/", 1)[0],
@@ -878,10 +891,6 @@ def get_folder_info(
             modification_time = None
 
             for item in group:
-                file_path = self.create_s3_path(item.bucket_name, item.key)
-                if not path_spec.allowed(file_path):
-                    logger.debug(f"File {file_path} not allowed and skipping")
-                    continue
                 file_size += item.size
                 if creation_time is None or item.last_modified < creation_time:
                     creation_time = item.last_modified
diff --git a/metadata-ingestion/tests/unit/data_lake/test_path_spec.py b/metadata-ingestion/tests/unit/data_lake/test_path_spec.py
new file mode 100644
index 00000000000000..305f4b72f5329d
--- /dev/null
+++ b/metadata-ingestion/tests/unit/data_lake/test_path_spec.py
@@ -0,0 +1,31 @@
+import pytest
+
+from datahub.ingestion.source.data_lake_common.path_spec import PathSpec
+
+
+@pytest.mark.parametrize(
+    "include, s3_uri, expected",
+    [
+        (
+            "s3://bucket/{table}/{partition0}/*.csv",
+            "s3://bucket/table/p1/test.csv",
+            True,
+        ),
+        (
+            "s3://bucket/{table}/{partition0}/*.csv",
+            "s3://bucket/table/p1/p2/test.csv",
+            False,
+        ),
+    ],
+)
+def test_allowed_ignores_depth_mismatch(
+    include: str, s3_uri: str, expected: bool
+) -> None:
+    # arrange
+    path_spec = PathSpec(
+        include=include,
+        table_name="{table}",
+    )
+
+    # act, assert
+    assert path_spec.allowed(s3_uri) == expected
diff --git a/metadata-ingestion/tests/unit/s3/test_s3_source.py b/metadata-ingestion/tests/unit/s3/test_s3_source.py
index 902987213e122f..e91874dcb42368 100644
--- a/metadata-ingestion/tests/unit/s3/test_s3_source.py
+++ b/metadata-ingestion/tests/unit/s3/test_s3_source.py
@@ -1,6 +1,6 @@
 from datetime import datetime
 from typing import List, Tuple
-from unittest.mock import Mock
+from unittest.mock import Mock, call
 
 import pytest
 
@@ -12,6 +12,18 @@
 from datahub.ingestion.source.s3.source import S3Source, partitioned_folder_comparator
 
 
+def _get_s3_source(path_spec_: PathSpec) -> S3Source:
+    return S3Source.create(
+        config_dict={
+            "path_spec": {
+                "include": path_spec_.include,
+                "table_name": path_spec_.table_name,
+            },
+        },
+        ctx=PipelineContext(run_id="test-s3"),
+    )
+
+
 def test_partition_comparator_numeric_folder_name():
     folder1 = "3"
     folder2 = "12"
@@ -249,18 +261,6 @@ def test_get_folder_info():
     """
     Test S3Source.get_folder_info returns the latest file in each folder
     """
-
-    def _get_s3_source(path_spec_: PathSpec) -> S3Source:
-        return S3Source.create(
-            config_dict={
-                "path_spec": {
-                    "include": path_spec_.include,
-                    "table_name": path_spec_.table_name,
-                },
-            },
-            ctx=PipelineContext(run_id="test-s3"),
-        )
-
     # arrange
     path_spec = PathSpec(
         include="s3://my-bucket/{table}/{partition0}/*.csv",
@@ -303,3 +303,50 @@ def _get_s3_source(path_spec_: PathSpec) -> S3Source:
     assert len(res) == 2
     assert res[0].sample_file == "s3://my-bucket/my-folder/dir1/0002.csv"
     assert res[1].sample_file == "s3://my-bucket/my-folder/dir2/0001.csv"
+
+
+def test_get_folder_info_ignores_disallowed_path(
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """
+    Test S3Source.get_folder_info skips disallowed files and logs a message
+    """
+    # arrange
+    path_spec = Mock(
+        spec=PathSpec,
+        include="s3://my-bucket/{table}/{partition0}/*.csv",
+        table_name="{table}",
+    )
+    path_spec.allowed = Mock(return_value=False)
+
+    bucket = Mock()
+    bucket.objects.filter().page_size = Mock(
+        return_value=[
+            Mock(
+                bucket_name="my-bucket",
+                key="my-folder/ignore/this/path/0001.csv",
+                creation_time=datetime(2025, 1, 1, 1),
+                last_modified=datetime(2025, 1, 1, 1),
+                size=100,
+            ),
+        ]
+    )
+
+    s3_source = _get_s3_source(path_spec)
+
+    # act
+    res = s3_source.get_folder_info(path_spec, bucket, prefix="/my-folder")
+
+    # assert
+    expected_called_s3_uri = "s3://my-bucket/my-folder/ignore/this/path/0001.csv"
+
+    assert path_spec.allowed.call_args_list == [call(expected_called_s3_uri)], (
+        "File should be checked if it's allowed"
+    )
+    assert f"File {expected_called_s3_uri} not allowed and skipping" in caplog.text, (
+        "Dropped file should be logged"
+    )
+    assert s3_source.get_report().filtered == [expected_called_s3_uri], (
+        "Dropped file should be in the report.filtered"
+    )
+    assert res == [], "Dropped file should not be in the result"

From 8773ff5f1577df9917493718393a70aac1e49ecf Mon Sep 17 00:00:00 2001
From: Jay <159848059+jayacryl@users.noreply.github.com>
Date: Wed, 5 Feb 2025 14:20:44 -0500
Subject: [PATCH 231/249] feat(docs-site) adding case studies and updating
 banner (#12525)

---
 docs-website/adoptionStoriesIndexes.json      |  23 ++++++++++++++++++
 docs-website/docusaurus.config.js             |   2 +-
 .../_components/CaseStudy/caseStudyContent.js |  20 +++++++++++----
 .../adoption-stories-etsy.png                 | Bin 0 -> 136849 bytes
 .../adoption-stories-slack.png                | Bin 0 -> 134202 bytes
 .../static/img/logos/companies/etsy.png       | Bin 0 -> 35207 bytes
 .../static/img/logos/companies/slack.png      | Bin 0 -> 72176 bytes
 7 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 docs-website/static/img/adoption-stories/adoption-stories-etsy.png
 create mode 100644 docs-website/static/img/adoption-stories/adoption-stories-slack.png
 create mode 100644 docs-website/static/img/logos/companies/etsy.png
 create mode 100644 docs-website/static/img/logos/companies/slack.png

diff --git a/docs-website/adoptionStoriesIndexes.json b/docs-website/adoptionStoriesIndexes.json
index 618cd4bbb33342..ba0ca4a3ed58a7 100644
--- a/docs-website/adoptionStoriesIndexes.json
+++ b/docs-website/adoptionStoriesIndexes.json
@@ -70,6 +70,17 @@
       "imageUrl": "/img/logos/companies/snap.png",
       "imageSize": "small"
     },
+    {
+      "name": "Slack",
+      "slug": "slack",
+      "imageUrl": "/img/logos/companies/slack.png",
+      "imageSize": "large",
+      "link": "https://youtu.be/G5B0W03dvuU",
+      "linkType": "video",
+      "tagline": "Why Slack chose DataHub to solve lineage and discovery.",
+      "category": "B2B & B2C",
+      "description": "Slack adopted DataHub to track their entire data landscape, build lineage, and add rich context to metadata for search & discovery."
+    },
     {
       "name": "Airtel",
       "slug": "airtel",
@@ -161,6 +172,18 @@
       "category": "Financial & Fintech",
       "description": "Discover how Checkout leverage DataHub for advanced data management and compliance, especially in managing sensitive data types."
     },
+    {
+      "name": "Etsy",
+      "slug": "etsy",
+      "imageUrl": "/img/logos/companies/etsy.png",
+      "imageSize": "medium",
+      "link": "https://youtu.be/kLe_xfTR_rM",
+      "linkType": "video",
+      "tagline": "Why Etsy used DataHub to solve their Data Discovery needs.",
+      "category": "E-Commerce",
+      "platform": "cloud",
+      "description": "Etsy leverages DataHub to solve their data discovery needs, enabling their data teams to find, understand, and trust their data."
+    },
     {
       "name": "MYOB",
       "slug": "myob",
diff --git a/docs-website/docusaurus.config.js b/docs-website/docusaurus.config.js
index 686c28fa3d1b93..4349c9b0bc44a2 100644
--- a/docs-website/docusaurus.config.js
+++ b/docs-website/docusaurus.config.js
@@ -77,7 +77,7 @@ module.exports = {
     announcementBar: {
           id: "announcement-3",
           content:
-            '<div style="display: flex; justify-content: center; align-items: center;width: 100%;"><!--img src="/img/acryl-logo-white-mark.svg" / --><!--div style="font-size: .8rem; font-weight: 600; background-color: white; color: #111; padding: 0px 8px; border-radius: 4px; margin-right:12px;">NEW</div--><p>Learn about DataHub 1.0 launching at our 5th birthday party!</p><a href="https://lu.ma/0j5jcocn" target="_blank" class="button">Register<span> →</span></a></div>',
+            '<div style="display: flex; justify-content: center; align-items: center;width: 100%;"><!--img src="/img/acryl-logo-white-mark.svg" / --><!--div style="font-size: .8rem; font-weight: 600; background-color: white; color: #111; padding: 0px 8px; border-radius: 4px; margin-right:12px;">NEW</div--><p>Learn about DataHub 1.0</p><a href="https://youtu.be/B3IA6cLaKEk" target="_blank" class="button">Watch Now<span> →</span></a></div>',
           backgroundColor: "#111",
           textColor: "#ffffff",
           isCloseable: false,
diff --git a/docs-website/src/pages/_components/CaseStudy/caseStudyContent.js b/docs-website/src/pages/_components/CaseStudy/caseStudyContent.js
index 4bb1b769b288aa..1aebfab12ece40 100644
--- a/docs-website/src/pages/_components/CaseStudy/caseStudyContent.js
+++ b/docs-website/src/pages/_components/CaseStudy/caseStudyContent.js
@@ -50,14 +50,14 @@ const caseStudyData = [
     link: "https://www.youtube.com/watch?v=YoxTg8tQSwg",
   },
   {
-    title: "Reliable Data Products",
+    title: "Powering Discovery in Slack's data ecosystem",
     description:
-      "How Miro leverages DataHub Cloud to deliver reliable data products.",
+      "Learn why DataHub was the obvious choice for Slack to solve their lineage and discovery needs.",
     tag: "Technology",
     backgroundImage:
-      "https://miro.com/blog/wp-content/uploads/2024/08/header-diagramming-s4-02.png",
-    image: "/img/logos/companies/miro.png",
-    link: "https://miro.com/careers/life-at-miro/tech/data-products-reliability-the-power-of-metadata/",
+      "https://i.pcmag.com/imagery/reviews/07td46ju7p6lLVb0QGwc5VF-19.fit_lim.size_1050x.png",
+    image: "/img/logos/companies/slack.png",
+    link: "https://datahubproject.io/adoption-stories/#slack",
   },
   {
     title: "Working with Petabyte Scale Healthcare Data",
@@ -89,6 +89,16 @@ const caseStudyData = [
     image: "/img/logos/companies/zynga.png",
     link: "https://datahubproject.io/adoption-stories/#zynga",
   },
+  {
+    title: "Reliable Data Products",
+    description:
+      "How Miro leverages DataHub Cloud to deliver reliable data products.",
+    tag: "Technology",
+    backgroundImage:
+      "https://miro.com/blog/wp-content/uploads/2024/08/header-diagramming-s4-02.png",
+    image: "/img/logos/companies/miro.png",
+    link: "https://miro.com/careers/life-at-miro/tech/data-products-reliability-the-power-of-metadata/",
+  },
   {
     title: "And many more...",
     description:
diff --git a/docs-website/static/img/adoption-stories/adoption-stories-etsy.png b/docs-website/static/img/adoption-stories/adoption-stories-etsy.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b4985695ad118d284e337f9b2c06278efe73b86
GIT binary patch
literal 136849
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%0Dbq{
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
FV1fz~H&6fo

literal 0
HcmV?d00001

diff --git a/docs-website/static/img/adoption-stories/adoption-stories-slack.png b/docs-website/static/img/adoption-stories/adoption-stories-slack.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ce397690faa6907127ddade418ca6056f27e97e
GIT binary patch
literal 134202
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
a|7A2uDCU;_yFl{*_)(Nqm8p>W5cq$7K8l?H

literal 0
HcmV?d00001

diff --git a/docs-website/static/img/logos/companies/etsy.png b/docs-website/static/img/logos/companies/etsy.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8474db4a4f4ec1b41d81a56dd3543bab2db3341
GIT binary patch
literal 35207
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

literal 0
HcmV?d00001

diff --git a/docs-website/static/img/logos/companies/slack.png b/docs-website/static/img/logos/companies/slack.png
new file mode 100644
index 0000000000000000000000000000000000000000..bef1d39f6065a6810bf63c5477f744178d95f4da
GIT binary patch
literal 72176
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

literal 0
HcmV?d00001


From 06bee0d7c04f3efc62b2d16c90c664691081efdf Mon Sep 17 00:00:00 2001
From: Jaesung Ryu <cwryu6252@naver.com>
Date: Thu, 6 Feb 2025 04:25:09 +0900
Subject: [PATCH 232/249] feat(ingest/mongodb) re-order aggregation logic
 (#12428)

Co-authored-by: Kade Ryu <kade@wrtn.io>
---
 .../src/datahub/ingestion/source/mongodb.py   |   33 +-
 ...ongodb_mces_no_random_sampling_golden.json | 4567 +++++++++++++++++
 .../tests/integration/mongodb/test_mongodb.py |   33 +
 3 files changed, 4617 insertions(+), 16 deletions(-)
 create mode 100644 metadata-ingestion/tests/integration/mongodb/mongodb_mces_no_random_sampling_golden.json

diff --git a/metadata-ingestion/src/datahub/ingestion/source/mongodb.py b/metadata-ingestion/src/datahub/ingestion/source/mongodb.py
index 32e94bb9288f2c..d80f5f117bac25 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/mongodb.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/mongodb.py
@@ -219,26 +219,27 @@ def construct_schema_pymongo(
     """
 
     aggregations: List[Dict] = []
+
+    # The order of the aggregations impacts execution time. By setting the sample/limit aggregation first,
+    # the subsequent aggregations process a much smaller dataset, improving performance.
+    if sample_size:
+        if use_random_sampling:
+            aggregations.append({"$sample": {"size": sample_size}})
+        else:
+            aggregations.append({"$limit": sample_size})
+
     if should_add_document_size_filter:
         doc_size_field = "temporary_doc_size_field"
         # create a temporary field to store the size of the document. filter on it and then remove it.
-        aggregations = [
-            {"$addFields": {doc_size_field: {"$bsonSize": "$$ROOT"}}},
-            {"$match": {doc_size_field: {"$lt": max_document_size}}},
-            {"$project": {doc_size_field: 0}},
-        ]
-    if use_random_sampling:
-        # get sample documents in collection
-        if sample_size:
-            aggregations.append({"$sample": {"size": sample_size}})
-        documents = collection.aggregate(
-            aggregations,
-            allowDiskUse=True,
+        aggregations.extend(
+            [
+                {"$addFields": {doc_size_field: {"$bsonSize": "$$ROOT"}}},
+                {"$match": {doc_size_field: {"$lt": max_document_size}}},
+                {"$project": {doc_size_field: 0}},
+            ]
         )
-    else:
-        if sample_size:
-            aggregations.append({"$limit": sample_size})
-        documents = collection.aggregate(aggregations, allowDiskUse=True)
+
+    documents = collection.aggregate(aggregations, allowDiskUse=True)
 
     return construct_schema(list(documents), delimiter)
 
diff --git a/metadata-ingestion/tests/integration/mongodb/mongodb_mces_no_random_sampling_golden.json b/metadata-ingestion/tests/integration/mongodb/mongodb_mces_no_random_sampling_golden.json
new file mode 100644
index 00000000000000..4606dfb6892123
--- /dev/null
+++ b/metadata-ingestion/tests/integration/mongodb/mongodb_mces_no_random_sampling_golden.json
@@ -0,0 +1,4567 @@
+[
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "mongodb",
+                "instance": "instance",
+                "env": "PROD",
+                "database": "mngdb"
+            },
+            "name": "mngdb",
+            "env": "PROD"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:mongodb",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Database"
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.emptyCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.emptyCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "emptyCollection",
+            "platform": "urn:li:dataPlatform:mongodb",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.Schemaless": {}
+            },
+            "fields": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.emptyCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "name": "emptyCollection",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.emptyCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:mongodb",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.emptyCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+                },
+                {
+                    "id": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+                    "urn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.firstCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.firstCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "firstCollection",
+            "platform": "urn:li:dataPlatform:mongodb",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.Schemaless": {}
+            },
+            "fields": [
+                {
+                    "fieldPath": "favoriteFood.ingredients.from",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "favoriteFood.ingredients.name",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "_id",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BytesType": {}
+                        }
+                    },
+                    "nativeDataType": "oid",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "age",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "float",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "canSwim",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "boolean",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "favoriteFood",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "OBJECT",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "favoriteFood.ingredients",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "ARRAY",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "favoriteFood.name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "legs",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "mixedType",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.UnionType": {}
+                        }
+                    },
+                    "nativeDataType": "mixed",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "seen",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "float",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "tags",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "ARRAY",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "type",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "favoriteFood.calories",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "favoriteFood.servings",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "float",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "emptyObject",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "OBJECT",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "favoriteColor",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "favoriteFood.emptyObject",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.RecordType": {}
+                        }
+                    },
+                    "nativeDataType": "OBJECT",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "favoriteFood.ingredients.color",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "servings",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "sometimesNull",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.firstCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "name": "firstCollection",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.firstCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:mongodb",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.firstCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+                },
+                {
+                    "id": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+                    "urn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.largeCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.largeCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "largeCollection",
+            "platform": "urn:li:dataPlatform:mongodb",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.Schemaless": {}
+            },
+            "fields": [
+                {
+                    "fieldPath": "_id",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BytesType": {}
+                        }
+                    },
+                    "nativeDataType": "oid",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_205",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_214",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_220",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_224",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_233",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_239",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_241",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_242",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_247",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_266",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_269",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_271",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_272",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_276",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_277",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_281",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_286",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_295",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_315",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_322",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_326",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_333",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_337",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_345",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_349",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_351",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_354",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_358",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_362",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_366",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_368",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_376",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_381",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_387",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_388",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_389",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_391",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_395",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_400",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_404",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_406",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_410",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_411",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_418",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_429",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_430",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_436",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_438",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_445",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_447",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_450",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_455",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_456",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_467",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_479",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_481",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_495",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_204",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_208",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_209",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_212",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_213",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_216",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_218",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_219",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_225",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_229",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_232",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_234",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_235",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_236",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_240",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_244",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_248",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_249",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_255",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_262",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_264",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_273",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_274",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_279",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_292",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_298",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_299",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_301",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_311",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_313",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_314",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_319",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_320",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_327",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_329",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_338",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_339",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_340",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_341",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_342",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_343",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_344",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_347",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_348",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_350",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_355",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_356",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_359",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_360",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_370",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_371",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_375",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_377",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_380",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_382",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_383",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_384",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_398",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_399",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_405",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_407",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_415",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_419",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_428",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_432",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_435",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_437",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_440",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_443",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_448",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_457",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_460",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_461",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_465",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_466",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_471",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_472",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_473",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_475",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_477",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_484",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_490",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_492",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_494",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_496",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_497",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_201",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_203",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_206",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_211",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_215",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_217",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_222",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_226",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_227",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_237",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_238",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_243",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_245",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_251",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_252",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_253",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_254",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_256",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_258",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_263",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_265",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_284",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_285",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_287",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_289",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_291",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_293",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_296",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_302",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_306",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_308",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_316",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_318",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_331",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_332",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_334",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_335",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_357",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_363",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_364",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_374",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_378",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_379",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_386",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_392",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_393",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_401",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_409",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_412",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_414",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_416",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_417",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_420",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_421",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_422",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_427",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_439",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_441",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_444",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_446",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_454",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_463",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_478",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_482",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_486",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_487",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_489",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_491",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_493",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_498",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_499",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_210",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_223",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_228",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_230",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_250",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_260",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_267",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_270",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_294",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_297",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_303",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_305",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_309",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_310",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_312",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_317",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_323",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_324",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_330",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_346",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_352",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_353",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_361",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_365",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_367",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_385",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_394",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_397",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_402",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_403",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_408",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_423",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_431",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_433",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_434",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_442",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_452",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_453",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_459",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_468",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_470",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_476",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_483",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_488",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_202",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_221",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_231",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_259",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_268",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_275",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_278",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_283",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_290",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_300",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_304",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_307",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_321",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_328",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_336",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_369",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_372",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_390",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_396",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_413",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_449",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_451",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_458",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_462",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_464",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_474",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_200",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_207",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_246",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_257",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_261",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_280",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_325",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_424",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_425",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_469",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_480",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_288",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_282",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_426",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field_485",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.largeCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "schema.downsampled": "True",
+                "schema.totalFields": "502"
+            },
+            "name": "largeCollection",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.largeCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:mongodb",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.largeCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+                },
+                {
+                    "id": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+                    "urn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.secondCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.secondCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "secondCollection",
+            "platform": "urn:li:dataPlatform:mongodb",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.Schemaless": {}
+            },
+            "fields": [
+                {
+                    "fieldPath": "_id",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BytesType": {}
+                        }
+                    },
+                    "nativeDataType": "oid",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "mixedType",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.UnionType": {}
+                        }
+                    },
+                    "nativeDataType": "mixed",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "name",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "rating",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "float",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "tasty",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.BooleanType": {}
+                        }
+                    },
+                    "nativeDataType": "boolean",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "nullableMixedType",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.UnionType": {}
+                        }
+                    },
+                    "nativeDataType": "mixed",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "varieties",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.ArrayType": {}
+                        }
+                    },
+                    "nativeDataType": "ARRAY",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "mixedType.fieldA",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "mixedType.fieldTwo",
+                    "nullable": true,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "integer",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.secondCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "name": "secondCollection",
+            "tags": []
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.secondCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:mongodb",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.secondCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:mongodb,instance)"
+                },
+                {
+                    "id": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed",
+                    "urn": "urn:li:container:f5ff6ace1ed73cb3fd4c73dc718c39ed"
+                }
+            ]
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.emptyCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.firstCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.largeCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mongodb,instance.mngdb.secondCollection,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "status",
+    "aspect": {
+        "json": {
+            "removed": false
+        }
+    },
+    "systemMetadata": {
+        "lastObserved": 1615443388097,
+        "runId": "mongodb-test-no-random-sampling",
+        "lastRunId": "no-run-id-provided"
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/integration/mongodb/test_mongodb.py b/metadata-ingestion/tests/integration/mongodb/test_mongodb.py
index 6dc8bb295ed455..60b71657465c2c 100644
--- a/metadata-ingestion/tests/integration/mongodb/test_mongodb.py
+++ b/metadata-ingestion/tests/integration/mongodb/test_mongodb.py
@@ -79,3 +79,36 @@ def test_mongodb_ingest(docker_compose_runner, pytestconfig, tmp_path, mock_time
             golden_path=test_resources_dir
             / "mongodb_mces_small_schema_size_golden.json",
         )
+
+        # Run the metadata ingestion pipeline.
+        pipeline = Pipeline.create(
+            {
+                "run_id": "mongodb-test-no-random-sampling",
+                "source": {
+                    "type": "mongodb",
+                    "config": {
+                        "connect_uri": "mongodb://localhost:57017",
+                        "username": "mongoadmin",
+                        "password": "examplepass",
+                        "useRandomSampling": False,
+                        "platform_instance": "instance",
+                    },
+                },
+                "sink": {
+                    "type": "file",
+                    "config": {
+                        "filename": f"{tmp_path}/mongodb_mces_no_random_sampling.json",
+                    },
+                },
+            }
+        )
+        pipeline.run()
+        pipeline.raise_from_status()
+
+        # Verify the output.
+        mce_helpers.check_golden_file(
+            pytestconfig,
+            output_path=tmp_path / "mongodb_mces_no_random_sampling.json",
+            golden_path=test_resources_dir
+            / "mongodb_mces_no_random_sampling_golden.json",
+        )

From 23a86fd47909874f8ae35de03a38f77a6bc5a232 Mon Sep 17 00:00:00 2001
From: remisalmon <salmon.remi@gmail.com>
Date: Wed, 5 Feb 2025 12:28:08 -0700
Subject: [PATCH 233/249] docs(salesforce): add missing salesforce source to
 cli doc (#12550)

---
 docs/cli.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/cli.md b/docs/cli.md
index 10f330a3ecfc6e..c9cd85fd0e8155 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -736,7 +736,7 @@ Please see our [Integrations page](https://datahubproject.io/integrations) if yo
 | [datahub-lineage-file](./generated/ingestion/sources/file-based-lineage.md)                    | _no additional dependencies_                               | Lineage File source                     |
 | [datahub-business-glossary](./generated/ingestion/sources/business-glossary.md)                | _no additional dependencies_                               | Business Glossary File source           |
 | [dbt](./generated/ingestion/sources/dbt.md)                                                    | _no additional dependencies_                               | dbt source                              |
-| [dremio](./generated/ingestion/sources/dremio.md)                                              | `pip install 'acryl-datahub[dremio]'`                      | Dremio Source                          |
+| [dremio](./generated/ingestion/sources/dremio.md)                                              | `pip install 'acryl-datahub[dremio]'`                      | Dremio Source                           |
 | [druid](./generated/ingestion/sources/druid.md)                                                | `pip install 'acryl-datahub[druid]'`                       | Druid Source                            |
 | [feast](./generated/ingestion/sources/feast.md)                                                | `pip install 'acryl-datahub[feast]'`                       | Feast source (0.26.0)                   |
 | [glue](./generated/ingestion/sources/glue.md)                                                  | `pip install 'acryl-datahub[glue]'`                        | AWS Glue source                         |
@@ -759,6 +759,7 @@ Please see our [Integrations page](https://datahubproject.io/integrations) if yo
 | [redash](./generated/ingestion/sources/redash.md)                                              | `pip install 'acryl-datahub[redash]'`                      | Redash source                           |
 | [redshift](./generated/ingestion/sources/redshift.md)                                          | `pip install 'acryl-datahub[redshift]'`                    | Redshift source                         |
 | [sagemaker](./generated/ingestion/sources/sagemaker.md)                                        | `pip install 'acryl-datahub[sagemaker]'`                   | AWS SageMaker source                    |
+| [salesforce](./generated/ingestion/sources/salesforce.md)                                      | `pip install 'acryl-datahub[salesforce]'`                  | Salesforce source                       |
 | [snowflake](./generated/ingestion/sources/snowflake.md)                                        | `pip install 'acryl-datahub[snowflake]'`                   | Snowflake source                        |
 | [sqlalchemy](./generated/ingestion/sources/sqlalchemy.md)                                      | `pip install 'acryl-datahub[sqlalchemy]'`                  | Generic SQLAlchemy source               |
 | [superset](./generated/ingestion/sources/superset.md)                                          | `pip install 'acryl-datahub[superset]'`                    | Superset source                         |

From 7f88710e02c1141df3df0826e128cfb3b285102e Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Wed, 5 Feb 2025 17:26:05 -0600
Subject: [PATCH 234/249] feat(openapi): precondition exceptions return 412
 (#12552)

---
 .../validation/AspectValidationException.java |  26 +-
 .../ValidationExceptionCollection.java        |  39 ++-
 .../plugins/validation/ValidationSubType.java |  10 +
 .../ValidationExceptionCollectionTest.java    | 223 ++++++++++++++++++
 .../validation/ValidationException.java       |  13 +
 .../metadata/entity/EntityServiceImpl.java    |   3 +-
 .../GlobalControllerExceptionHandler.java     |  36 ++-
 smoke-test/tests/openapi/v3/exceptions.json   |  71 ++++++
 8 files changed, 384 insertions(+), 37 deletions(-)
 create mode 100644 entity-registry/src/main/java/com/linkedin/metadata/aspect/plugins/validation/ValidationSubType.java
 create mode 100644 entity-registry/src/test/java/com/linkedin/metadata/aspect/plugins/validation/ValidationExceptionCollectionTest.java
 create mode 100644 smoke-test/tests/openapi/v3/exceptions.json

diff --git a/entity-registry/src/main/java/com/linkedin/metadata/aspect/plugins/validation/AspectValidationException.java b/entity-registry/src/main/java/com/linkedin/metadata/aspect/plugins/validation/AspectValidationException.java
index 938cb2d5f99e62..b3003de2322474 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/aspect/plugins/validation/AspectValidationException.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/aspect/plugins/validation/AspectValidationException.java
@@ -18,7 +18,7 @@ public static AspectValidationException forItem(BatchItem item, String msg) {
   }
 
   public static AspectValidationException forItem(BatchItem item, String msg, Exception e) {
-    return new AspectValidationException(item, msg, SubType.VALIDATION, e);
+    return new AspectValidationException(item, msg, ValidationSubType.VALIDATION, e);
   }
 
   public static AspectValidationException forPrecondition(BatchItem item, String msg) {
@@ -26,45 +26,39 @@ public static AspectValidationException forPrecondition(BatchItem item, String m
   }
 
   public static AspectValidationException forFilter(BatchItem item, String msg) {
-    return new AspectValidationException(item, msg, SubType.FILTER);
+    return new AspectValidationException(item, msg, ValidationSubType.FILTER);
   }
 
   public static AspectValidationException forPrecondition(BatchItem item, String msg, Exception e) {
-    return new AspectValidationException(item, msg, SubType.PRECONDITION, e);
+    return new AspectValidationException(item, msg, ValidationSubType.PRECONDITION, e);
   }
 
   @Nonnull BatchItem item;
   @Nonnull ChangeType changeType;
   @Nonnull Urn entityUrn;
   @Nonnull String aspectName;
-  @Nonnull SubType subType;
+  @Nonnull ValidationSubType subType;
   @Nullable String msg;
 
-  public AspectValidationException(@Nonnull BatchItem item, String msg, SubType subType) {
+  public AspectValidationException(@Nonnull BatchItem item, String msg, ValidationSubType subType) {
     this(item, msg, subType, null);
   }
 
   public AspectValidationException(
-      @Nonnull BatchItem item, @Nonnull String msg, @Nullable SubType subType, Exception e) {
+      @Nonnull BatchItem item,
+      @Nonnull String msg,
+      @Nullable ValidationSubType subType,
+      Exception e) {
     super(msg, e);
     this.item = item;
     this.changeType = item.getChangeType();
     this.entityUrn = item.getUrn();
     this.aspectName = item.getAspectName();
     this.msg = msg;
-    this.subType = subType != null ? subType : SubType.VALIDATION;
+    this.subType = subType != null ? subType : ValidationSubType.VALIDATION;
   }
 
   public Pair<Urn, String> getAspectGroup() {
     return Pair.of(entityUrn, aspectName);
   }
-
-  public enum SubType {
-    // A validation exception is thrown
-    VALIDATION,
-    // A failed precondition is thrown if the header constraints are not met
-    PRECONDITION,
-    // Exclude from processing further
-    FILTER
-  }
 }
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/aspect/plugins/validation/ValidationExceptionCollection.java b/entity-registry/src/main/java/com/linkedin/metadata/aspect/plugins/validation/ValidationExceptionCollection.java
index fc1fcb68029ce1..975d4292972245 100644
--- a/entity-registry/src/main/java/com/linkedin/metadata/aspect/plugins/validation/ValidationExceptionCollection.java
+++ b/entity-registry/src/main/java/com/linkedin/metadata/aspect/plugins/validation/ValidationExceptionCollection.java
@@ -7,6 +7,7 @@
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -15,17 +16,20 @@
 public class ValidationExceptionCollection
     extends HashMap<Pair<Urn, String>, Set<AspectValidationException>> {
 
-  private final Set<Integer> failedHashCodes;
-  private final Set<Integer> filteredHashCodes;
+  private final Map<ValidationSubType, Set<Integer>> subTypeHashCodes;
 
   public ValidationExceptionCollection() {
     super();
-    this.failedHashCodes = new HashSet<>();
-    this.filteredHashCodes = new HashSet<>();
+    this.subTypeHashCodes = new HashMap<>();
   }
 
   public boolean hasFatalExceptions() {
-    return !failedHashCodes.isEmpty();
+    return subTypeHashCodes.keySet().stream()
+        .anyMatch(subType -> !ValidationSubType.FILTER.equals(subType));
+  }
+
+  public Set<ValidationSubType> getSubTypes() {
+    return subTypeHashCodes.keySet();
   }
 
   public static ValidationExceptionCollection newCollection() {
@@ -34,11 +38,9 @@ public static ValidationExceptionCollection newCollection() {
 
   public void addException(AspectValidationException exception) {
     super.computeIfAbsent(exception.getAspectGroup(), key -> new HashSet<>()).add(exception);
-    if (!AspectValidationException.SubType.FILTER.equals(exception.getSubType())) {
-      failedHashCodes.add(exception.getItem().hashCode());
-    } else {
-      filteredHashCodes.add(exception.getItem().hashCode());
-    }
+    subTypeHashCodes
+        .computeIfAbsent(exception.getSubType(), key -> new HashSet<>())
+        .add(exception.getItem().hashCode());
   }
 
   public void addException(BatchItem item, String message) {
@@ -58,8 +60,7 @@ public <T extends BatchItem> Collection<T> successful(Collection<T> items) {
   }
 
   public <T extends BatchItem> Stream<T> streamSuccessful(Stream<T> items) {
-    return items.filter(
-        i -> !failedHashCodes.contains(i.hashCode()) && !filteredHashCodes.contains(i.hashCode()));
+    return items.filter(i -> isSuccessful(i.hashCode()));
   }
 
   public <T extends BatchItem> Collection<T> exceptions(Collection<T> items) {
@@ -67,7 +68,19 @@ public <T extends BatchItem> Collection<T> exceptions(Collection<T> items) {
   }
 
   public <T extends BatchItem> Stream<T> streamExceptions(Stream<T> items) {
-    return items.filter(i -> failedHashCodes.contains(i.hashCode()));
+    return items.filter(i -> isException(i.hashCode()));
+  }
+
+  private boolean isException(int hashCode) {
+    return subTypeHashCodes.keySet().stream()
+        .filter(subType -> !ValidationSubType.FILTER.equals(subType))
+        .anyMatch(subType -> subTypeHashCodes.get(subType).contains(hashCode));
+  }
+
+  private boolean isSuccessful(int hashCode) {
+    return !isException(hashCode)
+        && (!subTypeHashCodes.containsKey(ValidationSubType.FILTER)
+            || !subTypeHashCodes.get(ValidationSubType.FILTER).contains(hashCode));
   }
 
   @Override
diff --git a/entity-registry/src/main/java/com/linkedin/metadata/aspect/plugins/validation/ValidationSubType.java b/entity-registry/src/main/java/com/linkedin/metadata/aspect/plugins/validation/ValidationSubType.java
new file mode 100644
index 00000000000000..f533a342039abd
--- /dev/null
+++ b/entity-registry/src/main/java/com/linkedin/metadata/aspect/plugins/validation/ValidationSubType.java
@@ -0,0 +1,10 @@
+package com.linkedin.metadata.aspect.plugins.validation;
+
+public enum ValidationSubType {
+  // A validation exception is thrown
+  VALIDATION,
+  // A failed precondition is thrown if the header constraints are not met
+  PRECONDITION,
+  // Exclude from processing further
+  FILTER
+}
diff --git a/entity-registry/src/test/java/com/linkedin/metadata/aspect/plugins/validation/ValidationExceptionCollectionTest.java b/entity-registry/src/test/java/com/linkedin/metadata/aspect/plugins/validation/ValidationExceptionCollectionTest.java
new file mode 100644
index 00000000000000..17373685f884c2
--- /dev/null
+++ b/entity-registry/src/test/java/com/linkedin/metadata/aspect/plugins/validation/ValidationExceptionCollectionTest.java
@@ -0,0 +1,223 @@
+package com.linkedin.metadata.aspect.plugins.validation;
+
+import static org.mockito.Mockito.*;
+import static org.testng.Assert.*;
+
+import com.datahub.test.TestEntityProfile;
+import com.linkedin.common.Status;
+import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.data.schema.annotation.PathSpecBasedSchemaAnnotationVisitor;
+import com.linkedin.metadata.aspect.batch.BatchItem;
+import com.linkedin.metadata.models.registry.ConfigEntityRegistry;
+import com.linkedin.metadata.models.registry.EntityRegistry;
+import com.linkedin.test.metadata.aspect.batch.TestMCP;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+public class ValidationExceptionCollectionTest {
+  private final Urn TEST_URN = UrnUtils.getUrn("urn:li:chart:123");
+
+  private ValidationExceptionCollection collection;
+  private EntityRegistry testEntityRegistry;
+
+  private static final String ERROR_MESSAGE = "Test error message";
+
+  @BeforeTest
+  public void disableAssert() {
+    PathSpecBasedSchemaAnnotationVisitor.class
+        .getClassLoader()
+        .setClassAssertionStatus(PathSpecBasedSchemaAnnotationVisitor.class.getName(), false);
+  }
+
+  @BeforeMethod
+  public void setUp() {
+    collection = ValidationExceptionCollection.newCollection();
+    testEntityRegistry =
+        new ConfigEntityRegistry(
+            TestEntityProfile.class
+                .getClassLoader()
+                .getResourceAsStream("test-entity-registry.yml"));
+  }
+
+  @Test
+  public void testNewCollection() {
+    assertNotNull(collection);
+    assertTrue(collection.isEmpty());
+    assertFalse(collection.hasFatalExceptions());
+    assertEquals(collection.getSubTypes().size(), 0);
+  }
+
+  @Test
+  public void testAddException() {
+    BatchItem testItem =
+        TestMCP.ofOneMCP(TEST_URN, new Status(), testEntityRegistry).stream().findFirst().get();
+    AspectValidationException exception =
+        new AspectValidationException(testItem, ERROR_MESSAGE, ValidationSubType.VALIDATION, null);
+
+    collection.addException(exception);
+
+    assertEquals(collection.size(), 1);
+    assertTrue(collection.containsKey(exception.getAspectGroup()));
+    assertTrue(collection.get(exception.getAspectGroup()).contains(exception));
+  }
+
+  @Test
+  public void testAddExceptionWithMessage() {
+    BatchItem testItem =
+        TestMCP.ofOneMCP(TEST_URN, new Status(), testEntityRegistry).stream().findFirst().get();
+    collection.addException(testItem, ERROR_MESSAGE);
+
+    assertEquals(collection.size(), 1);
+    assertTrue(collection.hasFatalExceptions());
+  }
+
+  @Test
+  public void testHasFatalExceptionsWithMultipleTypes() {
+    BatchItem testItem =
+        TestMCP.ofOneMCP(TEST_URN, new Status(), testEntityRegistry).stream().findFirst().get();
+
+    // Add FILTER exception
+    collection.addException(
+        new AspectValidationException(testItem, ERROR_MESSAGE, ValidationSubType.FILTER, null));
+    assertFalse(collection.hasFatalExceptions());
+
+    // Add VALIDATION exception
+    collection.addException(
+        new AspectValidationException(testItem, ERROR_MESSAGE, ValidationSubType.VALIDATION, null));
+    assertTrue(collection.hasFatalExceptions());
+  }
+
+  @Test
+  public void testGetSubTypesWithAllTypes() {
+    BatchItem testItem =
+        TestMCP.ofOneMCP(TEST_URN, new Status(), testEntityRegistry).stream().findFirst().get();
+
+    collection.addException(
+        new AspectValidationException(testItem, ERROR_MESSAGE, ValidationSubType.FILTER, null));
+    collection.addException(
+        new AspectValidationException(testItem, ERROR_MESSAGE, ValidationSubType.VALIDATION, null));
+    collection.addException(
+        new AspectValidationException(
+            testItem, ERROR_MESSAGE, ValidationSubType.PRECONDITION, null));
+
+    Set<ValidationSubType> subTypes = collection.getSubTypes();
+    assertEquals(subTypes.size(), 3);
+    assertTrue(
+        subTypes.containsAll(
+            Arrays.asList(
+                ValidationSubType.FILTER,
+                ValidationSubType.VALIDATION,
+                ValidationSubType.PRECONDITION)));
+  }
+
+  @Test
+  public void testSuccessfulAndExceptionItems() {
+    BatchItem validationItem =
+        TestMCP.ofOneMCP(UrnUtils.getUrn("urn:li:chart:111"), new Status(), testEntityRegistry)
+            .stream()
+            .findFirst()
+            .get();
+    BatchItem filterItem =
+        TestMCP.ofOneMCP(UrnUtils.getUrn("urn:li:chart:222"), new Status(), testEntityRegistry)
+            .stream()
+            .findFirst()
+            .get();
+    BatchItem successItem =
+        TestMCP.ofOneMCP(UrnUtils.getUrn("urn:li:chart:333"), new Status(), testEntityRegistry)
+            .stream()
+            .findFirst()
+            .get();
+
+    collection.addException(
+        new AspectValidationException(
+            validationItem, ERROR_MESSAGE, ValidationSubType.VALIDATION, null));
+    collection.addException(
+        new AspectValidationException(filterItem, ERROR_MESSAGE, ValidationSubType.FILTER, null));
+
+    Collection<BatchItem> items = Arrays.asList(validationItem, filterItem, successItem);
+
+    // Test successful items
+    Collection<BatchItem> successful = collection.successful(items);
+    assertEquals(successful.size(), 1);
+    assertTrue(successful.contains(successItem));
+
+    // Test exception items
+    Collection<BatchItem> exceptions = collection.exceptions(items);
+    assertEquals(exceptions.size(), 1);
+    assertTrue(exceptions.contains(validationItem));
+    assertFalse(exceptions.contains(filterItem)); // FILTER type should not be included
+  }
+
+  @Test
+  public void testStreamOperations() {
+    BatchItem validationItem =
+        TestMCP.ofOneMCP(UrnUtils.getUrn("urn:li:chart:111"), new Status(), testEntityRegistry)
+            .stream()
+            .findFirst()
+            .get();
+    BatchItem successItem =
+        TestMCP.ofOneMCP(UrnUtils.getUrn("urn:li:chart:222"), new Status(), testEntityRegistry)
+            .stream()
+            .findFirst()
+            .get();
+
+    collection.addException(
+        new AspectValidationException(
+            validationItem, ERROR_MESSAGE, ValidationSubType.VALIDATION, null));
+
+    List<BatchItem> items = Arrays.asList(validationItem, successItem);
+
+    // Test streamSuccessful
+    List<BatchItem> successful = collection.streamSuccessful(items.stream()).toList();
+    assertEquals(successful.size(), 1);
+    assertTrue(successful.contains(successItem));
+
+    // Test streamExceptions
+    List<BatchItem> exceptions = collection.streamExceptions(items.stream()).toList();
+    assertEquals(exceptions.size(), 1);
+    assertTrue(exceptions.contains(validationItem));
+  }
+
+  @Test
+  public void testMultipleExceptionsForSameEntityDifferentAspects() {
+    BatchItem item1 =
+        TestMCP.ofOneMCP(UrnUtils.getUrn("urn:li:chart:111"), new Status(), testEntityRegistry)
+            .stream()
+            .findFirst()
+            .get();
+    BatchItem item2 =
+        TestMCP.ofOneMCP(UrnUtils.getUrn("urn:li:chart:222"), new Status(), testEntityRegistry)
+            .stream()
+            .findFirst()
+            .get();
+
+    collection.addException(
+        new AspectValidationException(item1, ERROR_MESSAGE, ValidationSubType.VALIDATION, null));
+    collection.addException(
+        new AspectValidationException(item2, ERROR_MESSAGE, ValidationSubType.VALIDATION, null));
+
+    assertEquals(collection.size(), 2);
+    assertEquals(collection.getSubTypes().size(), 1);
+  }
+
+  @Test
+  public void testToString() {
+    BatchItem testItem =
+        TestMCP.ofOneMCP(TEST_URN, new Status(), testEntityRegistry).stream().findFirst().get();
+    AspectValidationException exception =
+        new AspectValidationException(testItem, ERROR_MESSAGE, ValidationSubType.VALIDATION, null);
+
+    collection.addException(exception);
+
+    String result = collection.toString();
+    assertTrue(result.contains("ValidationExceptionCollection"));
+    assertTrue(result.contains("EntityAspect:"));
+    assertTrue(result.contains("urn:li:chart:123"));
+  }
+}
diff --git a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/validation/ValidationException.java b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/validation/ValidationException.java
index 6a86a02a94449d..b5e95b87d2c44d 100644
--- a/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/validation/ValidationException.java
+++ b/metadata-io/metadata-io-api/src/main/java/com/linkedin/metadata/entity/validation/ValidationException.java
@@ -1,8 +1,21 @@
 package com.linkedin.metadata.entity.validation;
 
+import com.linkedin.metadata.aspect.plugins.validation.ValidationExceptionCollection;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import lombok.Getter;
+
 /** Exception thrown when a metadata record cannot be validated against its schema. */
+@Getter
 public class ValidationException extends RuntimeException {
+  @Nullable private ValidationExceptionCollection validationExceptionCollection;
+
   public ValidationException(final String message) {
     super(message);
   }
+
+  public ValidationException(@Nonnull ValidationExceptionCollection validationExceptionCollection) {
+    this(validationExceptionCollection.toString());
+    this.validationExceptionCollection = validationExceptionCollection;
+  }
 }
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
index 79894d603b5860..9ee4745e7fc15e 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
@@ -959,7 +959,8 @@ private IngestAspectsResult ingestAspectsToLocalDB(
                         MetricUtils.counter(
                                 EntityServiceImpl.class, "batch_request_validation_exception")
                             .inc();
-                        throw new ValidationException(collectMetrics(exceptions).toString());
+                        collectMetrics(exceptions);
+                        throw new ValidationException(exceptions);
                       }
 
                       MetricUtils.counter(
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/GlobalControllerExceptionHandler.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/GlobalControllerExceptionHandler.java
index 4809b483b74de1..1430faf2fd26b5 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/GlobalControllerExceptionHandler.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/GlobalControllerExceptionHandler.java
@@ -1,6 +1,8 @@
 package io.datahubproject.openapi.config;
 
+import com.linkedin.metadata.aspect.plugins.validation.ValidationSubType;
 import com.linkedin.metadata.dao.throttle.APIThrottleException;
+import com.linkedin.metadata.entity.validation.ValidationException;
 import io.datahubproject.metadata.exception.ActorAccessException;
 import io.datahubproject.openapi.exception.InvalidUrnException;
 import io.datahubproject.openapi.exception.UnauthorizedException;
@@ -8,6 +10,8 @@
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nullable;
 import javax.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.ConversionNotSupportedException;
@@ -32,7 +36,7 @@ public void init() {
   }
 
   public GlobalControllerExceptionHandler() {
-    setOrder(Ordered.HIGHEST_PRECEDENCE);
+    setOrder(Ordered.LOWEST_PRECEDENCE - 1);
     setWarnLogCategory(getClass().getName());
   }
 
@@ -72,21 +76,39 @@ public static ResponseEntity<Map<String, String>> actorAccessException(ActorAcce
 
   @Override
   protected void logException(Exception ex, HttpServletRequest request) {
-    log.error("Error while resolving request: " + request.getRequestURI(), ex);
+    log.error("Error while resolving request: {}", request.getRequestURI(), ex);
   }
 
   @Override
   protected void sendServerError(
-      Exception ex, HttpServletRequest request, HttpServletResponse response) throws IOException {
-    log.error("Error while resolving request: " + request.getRequestURI(), ex);
+      @Nullable Exception ex, HttpServletRequest request, HttpServletResponse response)
+      throws IOException {
+    log.error("Error while resolving request: {}", request.getRequestURI(), ex);
     request.setAttribute("jakarta.servlet.error.exception", ex);
-    response.sendError(500);
+    response.sendError(HttpStatus.INTERNAL_SERVER_ERROR.value());
+  }
+
+  @ExceptionHandler(ValidationException.class)
+  public ResponseEntity<Map<String, String>> handleValidationException(
+      ValidationException e, HttpServletRequest request) {
+    log.error("Validation exception occurred for request:{}", request.getRequestURI(), e);
+    if (e.getValidationExceptionCollection() != null
+        && e.getValidationExceptionCollection()
+            .getSubTypes()
+            .equals(Set.of(ValidationSubType.PRECONDITION))) {
+      return new ResponseEntity<>(
+          Map.of("error", "Validation Error", "message", e.getMessage()),
+          HttpStatus.PRECONDITION_FAILED);
+    } else {
+      return new ResponseEntity<>(
+          Map.of("error", "Validation Error", "message", e.getMessage()), HttpStatus.BAD_REQUEST);
+    }
   }
 
   @ExceptionHandler(Exception.class)
   public ResponseEntity<Map<String, String>> handleGenericException(
       Exception e, HttpServletRequest request) {
-    log.error("Unhandled exception occurred for request: " + request.getRequestURI(), e);
+    log.error("Unhandled exception occurred for request: {}", request.getRequestURI(), e);
     return new ResponseEntity<>(
         Map.of("error", "Internal server error occurred"), HttpStatus.INTERNAL_SERVER_ERROR);
   }
@@ -96,7 +118,7 @@ public static ResponseEntity<Map<String, String>> handleNoHandlerFoundException(
       NoHandlerFoundException ex, HttpServletRequest request) {
     String message = String.format("No endpoint %s %s.", ex.getHttpMethod(), ex.getRequestURL());
 
-    log.error("No handler found for request: " + request.getRequestURI());
+    log.error("No handler found for request: {}", request.getRequestURI());
     return new ResponseEntity<>(Map.of("error", message), HttpStatus.NOT_FOUND);
   }
 }
diff --git a/smoke-test/tests/openapi/v3/exceptions.json b/smoke-test/tests/openapi/v3/exceptions.json
new file mode 100644
index 00000000000000..6ac498cc08c7b0
--- /dev/null
+++ b/smoke-test/tests/openapi/v3/exceptions.json
@@ -0,0 +1,71 @@
+[
+  {
+    "request": {
+      "url": "/openapi/v3/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CpreconditionV3%2CPROD%29",
+      "description": "Remove test dataset",
+      "method": "delete"
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v3/entity/dataset",
+      "description": "Test Precondition Validation Entity",
+      "params": {
+        "async": "false"
+      },
+      "json": [
+        {
+          "urn": "urn:li:dataset:(urn:li:dataPlatform:test,preconditionV3,PROD)",
+          "status": {
+            "value": {
+              "removed": false
+            },
+            "headers": {
+              "If-Version-Match": "-10000"
+            }
+          }
+        }
+      ]
+    },
+    "response": {
+      "status_codes": [
+        412
+      ],
+      "exclude_regex_paths": [
+        "root\\['message'\\]"
+      ],
+      "json": {
+        "error": "Validation Error"
+      }
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v3/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2CpreconditionV3%2CPROD%29/status",
+      "description": "Test Precondition Validation Aspect",
+      "params": {
+        "createIfNotExists": "false",
+        "async": "false"
+      },
+      "json": {
+        "value": {
+          "removed": false
+        },
+        "headers": {
+          "If-Version-Match": "-10000"
+        }
+      }
+    },
+    "response": {
+      "status_codes": [
+        412
+      ],
+      "exclude_regex_paths": [
+        "root\\['message'\\]"
+      ],
+      "json": {
+        "error": "Validation Error"
+      }
+    }
+  }
+]
\ No newline at end of file

From 0ed3d7f4a4ce63db1348ece71a4731f9e920f2eb Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Wed, 5 Feb 2025 18:07:33 -0600
Subject: [PATCH 235/249] feat(openapi): point in time parameter (elasticsearch
 only) (#12553)

---
 .../controller/GenericEntitiesController.java |  12 +-
 .../openapi/v3/OpenAPIV3Generator.java        |   8 +-
 .../v3/controller/EntityController.java       |  12 +-
 smoke-test/tests/openapi/v3/entities.json     | 160 ++++++++++++++++++
 4 files changed, 185 insertions(+), 7 deletions(-)
 create mode 100644 smoke-test/tests/openapi/v3/entities.json

diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/controller/GenericEntitiesController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/controller/GenericEntitiesController.java
index d3c67355d0f85d..b5e6120ec08035 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/controller/GenericEntitiesController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/controller/GenericEntitiesController.java
@@ -57,6 +57,8 @@
 import io.datahubproject.openapi.models.GenericEntityScrollResult;
 import io.datahubproject.openapi.util.RequestInputUtil;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import java.lang.reflect.InvocationTargetException;
@@ -212,8 +214,12 @@ public ResponseEntity<S> getEntities(
           Boolean skipCache,
       @RequestParam(value = "includeSoftDelete", required = false, defaultValue = "false")
           Boolean includeSoftDelete,
-      @RequestParam(value = "pitKeepAlive", required = false, defaultValue = "5m")
-          String pitKeepALive)
+      @Parameter(
+              schema = @Schema(nullable = true),
+              description =
+                  "Point In Time keep alive, accepts a time based string like \"5m\" for five minutes.")
+          @RequestParam(value = "pitKeepAlive", required = false, defaultValue = "5m")
+          String pitKeepAlive)
       throws URISyntaxException {
 
     EntitySpec entitySpec = entityRegistry.getEntitySpec(entityName);
@@ -261,7 +267,7 @@ public ResponseEntity<S> getEntities(
             null,
             sortCriteria,
             scrollId,
-            pitKeepALive,
+            pitKeepAlive != null && pitKeepAlive.isEmpty() ? null : pitKeepAlive,
             count);
 
     if (!AuthUtil.isAPIAuthorizedResult(opContext, result)) {
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java
index 349672ef2dcecc..4a2293fd4c613c 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java
@@ -360,6 +360,12 @@ private static PathItem buildListEntityPath(final EntitySpec entity) {
                 .$ref(
                     String.format(
                         "#/components/parameters/%s", aspectParameterName + MODEL_VERSION)),
+            new Parameter()
+                .in(NAME_QUERY)
+                .name(NAME_PIT_KEEP_ALIVE)
+                .description(
+                    "Point In Time keep alive, accepts a time based string like \"5m\" for five minutes.")
+                .schema(new Schema().type(TYPE_STRING)._default("5m")),
             new Parameter().$ref("#/components/parameters/PaginationCount" + MODEL_VERSION),
             new Parameter().$ref("#/components/parameters/ScrollId" + MODEL_VERSION),
             new Parameter().$ref("#/components/parameters/SortBy" + MODEL_VERSION),
@@ -534,7 +540,7 @@ private static PathItem buildGenericListEntitiesPath() {
                 .name(NAME_PIT_KEEP_ALIVE)
                 .description(
                     "Point In Time keep alive, accepts a time based string like \"5m\" for five minutes.")
-                .schema(new Schema().type(TYPE_STRING)._default("5m")),
+                .schema(new Schema().type(TYPE_STRING)._default("5m").nullable(true)),
             new Parameter().$ref("#/components/parameters/PaginationCount" + MODEL_VERSION),
             new Parameter().$ref("#/components/parameters/ScrollId" + MODEL_VERSION),
             new Parameter().$ref("#/components/parameters/SortBy" + MODEL_VERSION),
diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java
index 9bf7851653d920..6236b1eb7a7d3a 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/controller/EntityController.java
@@ -59,6 +59,8 @@
 import io.datahubproject.openapi.v3.models.GenericEntityV3;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import java.net.URISyntaxException;
@@ -160,8 +162,12 @@ public ResponseEntity<GenericEntityScrollResultV3> scrollEntities(
           Boolean skipCache,
       @RequestParam(value = "includeSoftDelete", required = false, defaultValue = "false")
           Boolean includeSoftDelete,
-      @RequestParam(value = "pitKeepAlive", required = false, defaultValue = "5m")
-          String pitKeepALive,
+      @Parameter(
+              schema = @Schema(nullable = true),
+              description =
+                  "Point In Time keep alive, accepts a time based string like \"5m\" for five minutes.")
+          @RequestParam(value = "pitKeepAlive", required = false, defaultValue = "5m")
+          String pitKeepAlive,
       @RequestBody @Nonnull GenericEntityAspectsBodyV3 entityAspectsBody)
       throws URISyntaxException {
 
@@ -218,7 +224,7 @@ public ResponseEntity<GenericEntityScrollResultV3> scrollEntities(
             null,
             sortCriteria,
             scrollId,
-            pitKeepALive,
+            pitKeepAlive != null && pitKeepAlive.isEmpty() ? null : pitKeepAlive,
             count);
 
     if (!AuthUtil.isAPIAuthorizedResult(opContext, result)) {
diff --git a/smoke-test/tests/openapi/v3/entities.json b/smoke-test/tests/openapi/v3/entities.json
new file mode 100644
index 00000000000000..079174fd78bcab
--- /dev/null
+++ b/smoke-test/tests/openapi/v3/entities.json
@@ -0,0 +1,160 @@
+[
+  {
+    "request": {
+      "url": "/openapi/v3/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2Cdataset1EntityV3%2CPROD%29",
+      "description": "Remove test dataset 1",
+      "method": "delete"
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v3/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2Cdataset2EntityV3%2CPROD%29",
+      "description": "Remove test dataset 2",
+      "method": "delete"
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v3/entity/dataset/urn%3Ali%3Adataset%3A%28urn%3Ali%3AdataPlatform%3Atest%2Cdataset3EntityV3%2CPROD%29",
+      "description": "Remove test dataset 3",
+      "method": "delete"
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v3/entity/dataset",
+      "params": {
+        "createIfNotExists": "false",
+        "createEntityIfNotExists": "false",
+        "async": "false"
+      },
+      "description": "Create 3 datasets",
+      "json": [
+        {
+          "urn": "urn:li:dataset:(urn:li:dataPlatform:test,dataset1EntityV3,PROD)",
+          "datasetProperties": {
+            "value": {
+              "name": "dataset1EntityV3",
+              "qualifiedName": "entities.dataset1EntityV3",
+              "customProperties": {},
+              "tags": []
+            }
+          },
+          "status": {
+            "value": {
+              "removed": false
+            }
+          }
+        },
+        {
+          "urn": "urn:li:dataset:(urn:li:dataPlatform:test,dataset2EntityV3,PROD)",
+          "datasetProperties": {
+            "value": {
+              "name": "dataset2EntityV3",
+              "qualifiedName": "entities.dataset2EntityV3",
+              "customProperties": {},
+              "tags": []
+            }
+          },
+          "status": {
+            "value": {
+              "removed": false
+            }
+          }
+        },
+        {
+          "urn": "urn:li:dataset:(urn:li:dataPlatform:test,dataset3EntityV3,PROD)",
+          "datasetProperties": {
+            "value": {
+              "name": "dataset3EntityV3",
+              "qualifiedName": "entities.dataset3EntityV3",
+              "customProperties": {},
+              "tags": []
+            }
+          },
+          "status": {
+            "value": {
+              "removed": false
+            }
+          }
+        }
+      ]
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v3/entity/scroll",
+      "params": {
+        "pitKeepAlive": "1m",
+        "count": "1",
+        "query": "qualifiedName:entities\\.dataset*",
+        "sortCriteria": "urn"
+      },
+      "description": "Generic scroll",
+      "json": {
+        "aspects": [
+          "datasetProperties"
+        ]
+      }
+    },
+    "response": {
+      "exclude_regex_paths": [
+        "root\\['scrollId'\\]"
+      ],
+      "json": {
+        "entities": [
+          {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:test,dataset1EntityV3,PROD)",
+            "datasetProperties": {
+              "value": {
+                "name": "dataset1EntityV3",
+                "qualifiedName": "entities.dataset1EntityV3",
+                "customProperties": {},
+                "tags": []
+              }
+            }
+          }
+        ]
+      }
+    }
+  },
+  {
+    "request": {
+      "url": "/openapi/v3/entity/dataset?aspects=datasetProperties&aspects=status",
+      "method": "get",
+      "params": {
+        "pitKeepAlive": "1m",
+        "count": "1",
+        "query": "qualifiedName:entities\\.dataset*",
+        "sortCriteria": "urn",
+        "sortOrder": "DESCENDING"
+      },
+      "description": "Dataset Entity scroll"
+    },
+    "response": {
+      "exclude_regex_paths": [
+        "root\\['scrollId'\\]"
+      ],
+      "json": {
+        "entities": [
+          {
+            "urn": "urn:li:dataset:(urn:li:dataPlatform:test,dataset3EntityV3,PROD)",
+            "datasetProperties": {
+              "value": {
+                "name": "dataset3EntityV3",
+                "qualifiedName": "entities.dataset3EntityV3",
+                "customProperties": {},
+                "tags": []
+              }
+            },
+            "status": {
+              "value": {
+                "removed": false
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
+]
\ No newline at end of file

From 65376ee2d391b3599bec307ff7f83ead96d12eb4 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Wed, 5 Feb 2025 18:17:53 -0600
Subject: [PATCH 236/249] fix(openapi-spec): fix openapi spec oneOf schema
 (#12561)

---
 .../openapi/v3/OpenAPIV3Generator.java        | 17 +++++++------
 .../openapi/v3/OpenAPIV3GeneratorTest.java    | 25 +++++++++++++++++++
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java
index 4a2293fd4c613c..9b8df7d7c313d7 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/v3/OpenAPIV3Generator.java
@@ -731,13 +731,16 @@ private static Schema buildAspectsRefResponseSchema(final EntityRegistry entityR
             .description(ASPECT_DESCRIPTION)
             .required(List.of(PROPERTY_VALUE));
 
-    entityRegistry
-        .getAspectSpecs()
-        .values()
-        .forEach(
-            aspect ->
-                result.addProperty(
-                    PROPERTY_VALUE, new Schema<>().$ref(PATH_DEFINITIONS + aspect.getName())));
+    // Create a list of reference schemas for each aspect
+    List<Schema> aspectRefs =
+        entityRegistry.getAspectSpecs().values().stream()
+            .map(aspect -> new Schema<>().$ref(PATH_DEFINITIONS + toUpperFirst(aspect.getName())))
+            .distinct()
+            .collect(Collectors.toList());
+
+    // Add the value property with oneOf constraint
+    result.addProperty(PROPERTY_VALUE, new Schema<>().oneOf(aspectRefs));
+
     result.addProperty(
         NAME_SYSTEM_METADATA,
         new Schema<>()
diff --git a/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/OpenAPIV3GeneratorTest.java b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/OpenAPIV3GeneratorTest.java
index d8f04b60455abb..30b8d823605393 100644
--- a/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/OpenAPIV3GeneratorTest.java
+++ b/metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/v3/OpenAPIV3GeneratorTest.java
@@ -105,5 +105,30 @@ public void testOpenApiSpecBuilder() throws Exception {
             entry ->
                 assertEquals(
                     "#/components/schemas/BatchGetRequestBody", entry.getValue().get$ref()));
+
+    // Assert aspect response schemas have value property with oneOf references
+    Schema<?> aspectResponseSchema =
+        openAPI.getComponents().getSchemas().get("AspectsAspectResponse_v3");
+    Schema<?> valueProperty = aspectResponseSchema.getProperties().get("value");
+    assertTrue(
+        valueProperty.getOneOf() != null && !valueProperty.getOneOf().isEmpty(),
+        "value property should use oneOf");
+
+    // Check each reference has proper format and capitalization
+    valueProperty
+        .getOneOf()
+        .forEach(
+            schema -> {
+              String ref = schema.get$ref();
+              assertTrue(
+                  ref != null && ref.startsWith("#/components/schemas/"),
+                  "reference should start with '#/components/schemas/': " + ref);
+
+              // Extract the last part after the last slash and check first character
+              String refName = ref.substring(ref.lastIndexOf('/') + 1);
+              assertTrue(
+                  Character.isUpperCase(refName.charAt(0)),
+                  "schema reference should start with capital letter: " + name);
+            });
   }
 }

From 52f71dd111e2cb70a7275d6121e7edb039cc4e99 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Wed, 5 Feb 2025 20:04:53 -0600
Subject: [PATCH 237/249] fix(autocomplete): fix autocomplete duplicate field
 (#12558)

---
 .../elasticsearch/query/ESBrowseDAO.java      |  4 +-
 .../elasticsearch/query/ESSearchDAO.java      | 18 +++--
 .../request/AutocompleteRequestHandler.java   | 67 +++++++++---------
 .../query/request/BaseRequestHandler.java     | 69 +++++++++++++++++++
 .../query/request/SearchRequestHandler.java   | 60 ++++++----------
 .../AutocompleteRequestHandlerTest.java       | 40 +++++++----
 .../request/SearchRequestHandlerTest.java     | 36 +++-------
 .../gms/servlet/ConfigSearchExport.java       | 11 +--
 8 files changed, 173 insertions(+), 132 deletions(-)
 create mode 100644 metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/BaseRequestHandler.java

diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESBrowseDAO.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESBrowseDAO.java
index 3a84d1cb2de489..1c20d5a6ef8d91 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESBrowseDAO.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESBrowseDAO.java
@@ -642,7 +642,7 @@ private QueryBuilder buildQueryStringV2(
     EntitySpec entitySpec = opContext.getEntityRegistry().getEntitySpec(entityName);
     QueryBuilder query =
         SearchRequestHandler.getBuilder(
-                opContext.getEntityRegistry(),
+                opContext,
                 entitySpec,
                 searchConfiguration,
                 customSearchConfiguration,
@@ -683,7 +683,7 @@ private QueryBuilder buildQueryStringBrowseAcrossEntities(
 
     QueryBuilder query =
         SearchRequestHandler.getBuilder(
-                finalOpContext.getEntityRegistry(),
+                finalOpContext,
                 entitySpecs,
                 searchConfiguration,
                 customSearchConfiguration,
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESSearchDAO.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESSearchDAO.java
index a720e0bf815c26..ae483ad7711b02 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESSearchDAO.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESSearchDAO.java
@@ -150,7 +150,7 @@ private SearchResult executeAndExtract(
             return transformIndexIntoEntityName(
                 opContext.getSearchContext().getIndexConvention(),
                 SearchRequestHandler.getBuilder(
-                        opContext.getEntityRegistry(),
+                        opContext,
                         entitySpec,
                         searchConfiguration,
                         customSearchConfiguration,
@@ -257,7 +257,7 @@ private ScrollResult executeAndExtract(
             return transformIndexIntoEntityName(
                 opContext.getSearchContext().getIndexConvention(),
                 SearchRequestHandler.getBuilder(
-                        opContext.getEntityRegistry(),
+                        opContext,
                         entitySpecs,
                         searchConfiguration,
                         customSearchConfiguration,
@@ -311,7 +311,7 @@ public SearchResult search(
             "searchRequest",
             () ->
                 SearchRequestHandler.getBuilder(
-                        opContext.getEntityRegistry(),
+                        opContext,
                         entitySpecs,
                         searchConfiguration,
                         customSearchConfiguration,
@@ -357,7 +357,7 @@ public SearchResult filter(
     Filter transformedFilters = transformFilterForEntities(filters, indexConvention);
     final SearchRequest searchRequest =
         SearchRequestHandler.getBuilder(
-                opContext.getEntityRegistry(),
+                opContext,
                 entitySpec,
                 searchConfiguration,
                 customSearchConfiguration,
@@ -395,7 +395,11 @@ public AutoCompleteResult autoComplete(
       IndexConvention indexConvention = opContext.getSearchContext().getIndexConvention();
       AutocompleteRequestHandler builder =
           AutocompleteRequestHandler.getBuilder(
-              entitySpec, customSearchConfiguration, queryFilterRewriteChain, searchConfiguration);
+              opContext,
+              entitySpec,
+              customSearchConfiguration,
+              queryFilterRewriteChain,
+              searchConfiguration);
       SearchRequest req =
           builder.getSearchRequest(
               opContext,
@@ -441,7 +445,7 @@ public Map<String, Long> aggregateByValue(
     IndexConvention indexConvention = opContext.getSearchContext().getIndexConvention();
     final SearchRequest searchRequest =
         SearchRequestHandler.getBuilder(
-                opContext.getEntityRegistry(),
+                opContext,
                 entitySpecs,
                 searchConfiguration,
                 customSearchConfiguration,
@@ -578,7 +582,7 @@ private SearchRequest getScrollRequest(
     }
 
     return SearchRequestHandler.getBuilder(
-            opContext.getEntityRegistry(),
+            opContext,
             entitySpecs,
             searchConfiguration,
             customSearchConfiguration,
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/AutocompleteRequestHandler.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/AutocompleteRequestHandler.java
index 45359285b4a046..d755d5c6f7a408 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/AutocompleteRequestHandler.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/AutocompleteRequestHandler.java
@@ -23,6 +23,7 @@
 import io.datahubproject.metadata.context.OperationContext;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -45,9 +46,9 @@
 import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder;
 
 @Slf4j
-public class AutocompleteRequestHandler {
+public class AutocompleteRequestHandler extends BaseRequestHandler {
 
-  private final List<Pair> _defaultAutocompleteFields;
+  private final List<Pair<String, String>> _defaultAutocompleteFields;
   private final Map<String, Set<SearchableAnnotation.FieldType>> searchableFieldTypes;
 
   private static final Map<EntitySpec, AutocompleteRequestHandler>
@@ -58,8 +59,10 @@ public class AutocompleteRequestHandler {
   private final EntitySpec entitySpec;
   private final QueryFilterRewriteChain queryFilterRewriteChain;
   private final SearchConfiguration searchConfiguration;
+  @Nonnull private final HighlightBuilder highlights;
 
   public AutocompleteRequestHandler(
+      @Nonnull OperationContext systemOperationContext,
       @Nonnull EntitySpec entitySpec,
       @Nullable CustomSearchConfiguration customSearchConfiguration,
       @Nonnull QueryFilterRewriteChain queryFilterRewriteChain,
@@ -79,6 +82,7 @@ public AutocompleteRequestHandler(
                                 Double.toString(searchableAnnotation.getBoostScore()))),
                 Stream.of(Pair.of("urn", "1.0")))
             .collect(Collectors.toList());
+    this.highlights = getDefaultHighlights(systemOperationContext);
     searchableFieldTypes =
         fieldSpecs.stream()
             .collect(
@@ -98,6 +102,7 @@ public AutocompleteRequestHandler(
   }
 
   public static AutocompleteRequestHandler getBuilder(
+      @Nonnull OperationContext systemOperationContext,
       @Nonnull EntitySpec entitySpec,
       @Nullable CustomSearchConfiguration customSearchConfiguration,
       @Nonnull QueryFilterRewriteChain queryFilterRewriteChain,
@@ -106,6 +111,7 @@ public static AutocompleteRequestHandler getBuilder(
         entitySpec,
         k ->
             new AutocompleteRequestHandler(
+                systemOperationContext,
                 entitySpec,
                 customSearchConfiguration,
                 queryFilterRewriteChain,
@@ -165,7 +171,8 @@ public SearchRequest getSearchRequest(
     ESUtils.buildSortOrder(searchSourceBuilder, null, List.of(entitySpec));
 
     // wire inner non-scored query
-    searchSourceBuilder.highlighter(getHighlights(field));
+    searchSourceBuilder.highlighter(
+        field == null || field.isEmpty() ? highlights : getHighlights(opContext, List.of(field)));
     searchRequest.source(searchSourceBuilder);
     return searchRequest;
   }
@@ -181,7 +188,7 @@ private BoolQueryBuilder getQuery(
   public BoolQueryBuilder getQuery(
       @Nonnull ObjectMapper objectMapper,
       @Nullable AutocompleteConfiguration customAutocompleteConfig,
-      List<Pair> autocompleteFields,
+      List<Pair<String, String>> autocompleteFields,
       @Nonnull String query) {
 
     BoolQueryBuilder finalQuery =
@@ -201,7 +208,7 @@ public BoolQueryBuilder getQuery(
 
   private Optional<QueryBuilder> getAutocompleteQuery(
       @Nullable AutocompleteConfiguration customConfig,
-      List<Pair> autocompleteFields,
+      List<Pair<String, String>> autocompleteFields,
       @Nonnull String query) {
     Optional<QueryBuilder> result = Optional.empty();
 
@@ -212,7 +219,8 @@ private Optional<QueryBuilder> getAutocompleteQuery(
     return result;
   }
 
-  private BoolQueryBuilder defaultQuery(List<Pair> autocompleteFields, @Nonnull String query) {
+  private BoolQueryBuilder defaultQuery(
+      List<Pair<String, String>> autocompleteFields, @Nonnull String query) {
     BoolQueryBuilder finalQuery = QueryBuilders.boolQuery().minimumShouldMatch(1);
 
     // Search for exact matches with higher boost and ngram matches
@@ -248,38 +256,25 @@ private BoolQueryBuilder defaultQuery(List<Pair> autocompleteFields, @Nonnull St
     return finalQuery;
   }
 
-  // Get HighlightBuilder to highlight the matched field
-  private HighlightBuilder getHighlights(@Nullable String field) {
-    HighlightBuilder highlightBuilder =
-        new HighlightBuilder()
-            // Don't set tags to get the original field value
-            .preTags("")
-            .postTags("")
-            .numOfFragments(1);
-    // Check for each field name and any subfields
-    getAutocompleteFields(field)
-        .forEach(
-            pair -> {
-              final String fieldName = (String) pair.getLeft();
-              highlightBuilder
-                  .field(fieldName)
-                  .field(fieldName + ".*")
-                  .field(fieldName + ".ngram")
-                  .field(fieldName + ".delimited");
-              if (!fieldName.equalsIgnoreCase("urn")) {
-                highlightBuilder.field(fieldName + ".keyword");
-              }
-            });
-
-    // set field match req false for ngram
-    highlightBuilder.fields().stream()
-        .filter(f -> f.name().contains("ngram"))
-        .forEach(f -> f.requireFieldMatch(false).noMatchSize(200));
-
-    return highlightBuilder;
+  @Override
+  public Collection<String> getDefaultQueryFieldNames() {
+    return _defaultAutocompleteFields.stream().map(Pair::getKey).collect(Collectors.toList());
   }
 
-  private List<Pair> getAutocompleteFields(@Nullable String field) {
+  @Override
+  protected Collection<String> getValidQueryFieldNames() {
+    return searchableFieldTypes.keySet();
+  }
+
+  @Override
+  protected Stream<String> highlightFieldExpansion(
+      @Nonnull OperationContext opContext, @Nonnull String fieldName) {
+    return Stream.concat(
+        Stream.of(fieldName, fieldName + ".*", fieldName + ".ngram", fieldName + ".delimited"),
+        Stream.of(ESUtils.toKeywordField(fieldName, false, opContext.getAspectRetriever())));
+  }
+
+  private List<Pair<String, String>> getAutocompleteFields(@Nullable String field) {
     if (field != null && !field.isEmpty() && !field.equalsIgnoreCase("urn")) {
       return ImmutableList.of(Pair.of(field, "10.0"));
     }
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/BaseRequestHandler.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/BaseRequestHandler.java
new file mode 100644
index 00000000000000..ec431221078b2f
--- /dev/null
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/BaseRequestHandler.java
@@ -0,0 +1,69 @@
+package com.linkedin.metadata.search.elasticsearch.query.request;
+
+import com.google.common.annotations.VisibleForTesting;
+import io.datahubproject.metadata.context.OperationContext;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.stream.Stream;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder;
+
+public abstract class BaseRequestHandler {
+
+  /**
+   * Provide the fields which are queried by default
+   *
+   * @return collection of field names
+   */
+  protected abstract Collection<String> getDefaultQueryFieldNames();
+
+  protected abstract Collection<String> getValidQueryFieldNames();
+
+  protected abstract Stream<String> highlightFieldExpansion(
+      @Nonnull OperationContext opContext, @Nonnull String fieldName);
+
+  @VisibleForTesting
+  public HighlightBuilder getDefaultHighlights(@Nonnull OperationContext opContext) {
+    return getHighlights(opContext, null);
+  }
+
+  @VisibleForTesting
+  public HighlightBuilder getHighlights(
+      @Nonnull OperationContext opContext, @Nullable Collection<String> fieldsToHighlight) {
+    HighlightBuilder highlightBuilder =
+        new HighlightBuilder()
+            // Don't set tags to get the original field value
+            .preTags("")
+            .postTags("")
+            .numOfFragments(1);
+
+    final Stream<String> fieldStream;
+    if (fieldsToHighlight == null || fieldsToHighlight.isEmpty()) {
+      fieldStream = getDefaultQueryFieldNames().stream();
+    } else {
+      // filter for valid names
+      fieldStream =
+          fieldsToHighlight.stream()
+              .filter(Objects::nonNull)
+              .filter(fieldName -> !fieldName.isEmpty())
+              .filter(getValidQueryFieldNames()::contains);
+    }
+
+    fieldStream
+        .flatMap(fieldName -> highlightFieldExpansion(opContext, fieldName))
+        .distinct()
+        .map(HighlightBuilder.Field::new)
+        .map(
+            field -> {
+              if (field.name().endsWith("ngram")) {
+                return field.requireFieldMatch(false).noMatchSize(200);
+              } else {
+                return field;
+              }
+            })
+        .forEach(highlightBuilder::field);
+
+    return highlightBuilder;
+  }
+}
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchRequestHandler.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchRequestHandler.java
index 0ecf1a932e4bfd..90ab6cd5979faf 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchRequestHandler.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchRequestHandler.java
@@ -78,7 +78,7 @@
 import org.opensearch.search.suggest.term.TermSuggestion;
 
 @Slf4j
-public class SearchRequestHandler {
+public class SearchRequestHandler extends BaseRequestHandler {
 
   private static final Map<List<EntitySpec>, SearchRequestHandler> REQUEST_HANDLER_BY_ENTITY_NAME =
       new ConcurrentHashMap<>();
@@ -94,13 +94,13 @@ public class SearchRequestHandler {
   private final QueryFilterRewriteChain queryFilterRewriteChain;
 
   private SearchRequestHandler(
-      @Nonnull EntityRegistry entityRegistry,
+      @Nonnull OperationContext opContext,
       @Nonnull EntitySpec entitySpec,
       @Nonnull SearchConfiguration configs,
       @Nullable CustomSearchConfiguration customSearchConfiguration,
       @Nonnull QueryFilterRewriteChain queryFilterRewriteChain) {
     this(
-        entityRegistry,
+        opContext,
         ImmutableList.of(entitySpec),
         configs,
         customSearchConfiguration,
@@ -108,7 +108,7 @@ private SearchRequestHandler(
   }
 
   private SearchRequestHandler(
-      @Nonnull EntityRegistry entityRegistry,
+      @Nonnull OperationContext opContext,
       @Nonnull List<EntitySpec> entitySpecs,
       @Nonnull SearchConfiguration configs,
       @Nullable CustomSearchConfiguration customSearchConfiguration,
@@ -121,16 +121,17 @@ private SearchRequestHandler(
             .flatMap(List::stream)
             .collect(Collectors.toList());
     defaultQueryFieldNames = getDefaultQueryFieldNames(annotations);
-    highlights = getHighlights();
+    highlights = getDefaultHighlights(opContext);
     searchQueryBuilder = new SearchQueryBuilder(configs, customSearchConfiguration);
     aggregationQueryBuilder = new AggregationQueryBuilder(configs, entitySearchAnnotations);
     this.configs = configs;
-    this.searchableFieldTypes = buildSearchableFieldTypes(entityRegistry, entitySpecs);
+    this.searchableFieldTypes =
+        buildSearchableFieldTypes(opContext.getEntityRegistry(), entitySpecs);
     this.queryFilterRewriteChain = queryFilterRewriteChain;
   }
 
   public static SearchRequestHandler getBuilder(
-      @Nonnull EntityRegistry entityRegistry,
+      @Nonnull OperationContext systemOperationContext,
       @Nonnull EntitySpec entitySpec,
       @Nonnull SearchConfiguration configs,
       @Nullable CustomSearchConfiguration customSearchConfiguration,
@@ -139,7 +140,7 @@ public static SearchRequestHandler getBuilder(
         ImmutableList.of(entitySpec),
         k ->
             new SearchRequestHandler(
-                entityRegistry,
+                systemOperationContext,
                 entitySpec,
                 configs,
                 customSearchConfiguration,
@@ -147,7 +148,7 @@ public static SearchRequestHandler getBuilder(
   }
 
   public static SearchRequestHandler getBuilder(
-      @Nonnull EntityRegistry entityRegistry,
+      @Nonnull OperationContext systemOperationContext,
       @Nonnull List<EntitySpec> entitySpecs,
       @Nonnull SearchConfiguration configs,
       @Nullable CustomSearchConfiguration customSearchConfiguration,
@@ -156,7 +157,7 @@ public static SearchRequestHandler getBuilder(
         ImmutableList.copyOf(entitySpecs),
         k ->
             new SearchRequestHandler(
-                entityRegistry,
+                systemOperationContext,
                 entitySpecs,
                 configs,
                 customSearchConfiguration,
@@ -185,6 +186,11 @@ private Set<String> getDefaultQueryFieldNames(List<SearchableAnnotation> annotat
         .collect(Collectors.toSet());
   }
 
+  @Override
+  protected Collection<String> getValidQueryFieldNames() {
+    return searchableFieldTypes.keySet();
+  }
+
   public BoolQueryBuilder getFilterQuery(
       @Nonnull OperationContext opContext, @Nullable Filter filter) {
     return getFilterQuery(opContext, filter, searchableFieldTypes, queryFilterRewriteChain);
@@ -246,7 +252,7 @@ public SearchRequest getSearchRequest(
     if (Boolean.FALSE.equals(searchFlags.isSkipHighlighting())) {
       if (CollectionUtils.isNotEmpty(searchFlags.getCustomHighlightingFields())) {
         searchSourceBuilder.highlighter(
-            getValidatedHighlighter(searchFlags.getCustomHighlightingFields()));
+            getHighlights(opContext, searchFlags.getCustomHighlightingFields()));
       } else {
         searchSourceBuilder.highlighter(highlights);
       }
@@ -383,22 +389,10 @@ public QueryBuilder getQuery(
     return searchQueryBuilder.buildQuery(opContext, entitySpecs, query, fulltext);
   }
 
-  @VisibleForTesting
-  public HighlightBuilder getHighlights() {
-    HighlightBuilder highlightBuilder =
-        new HighlightBuilder()
-            // Don't set tags to get the original field value
-            .preTags("")
-            .postTags("")
-            .numOfFragments(1);
-
-    // Check for each field name and any subfields
-    defaultQueryFieldNames.stream()
-        .flatMap(fieldName -> Stream.of(fieldName, fieldName + ".*"))
-        .distinct()
-        .forEach(highlightBuilder::field);
-
-    return highlightBuilder;
+  @Override
+  protected Stream<String> highlightFieldExpansion(
+      @Nonnull OperationContext opContext, @Nonnull String fieldName) {
+    return Stream.of(fieldName, fieldName + ".*");
   }
 
   @WithSpan
@@ -597,18 +591,6 @@ private List<SearchSuggestion> extractSearchSuggestions(@Nonnull SearchResponse
     return searchSuggestions;
   }
 
-  private HighlightBuilder getValidatedHighlighter(Collection<String> fieldsToHighlight) {
-    HighlightBuilder highlightBuilder = new HighlightBuilder();
-    highlightBuilder.preTags("");
-    highlightBuilder.postTags("");
-    fieldsToHighlight.stream()
-        .filter(defaultQueryFieldNames::contains)
-        .flatMap(fieldName -> Stream.of(fieldName, fieldName + ".*"))
-        .distinct()
-        .forEach(highlightBuilder::field);
-    return highlightBuilder;
-  }
-
   /**
    * Calculate the field types based on annotations if available, with fallback to ES mappings
    *
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AutocompleteRequestHandlerTest.java b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AutocompleteRequestHandlerTest.java
index e91dc1e6a8b0b9..4055736926f43e 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AutocompleteRequestHandlerTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AutocompleteRequestHandlerTest.java
@@ -49,11 +49,12 @@
 import org.opensearch.index.query.functionscore.ScoreFunctionBuilders;
 import org.opensearch.search.builder.SearchSourceBuilder;
 import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 public class AutocompleteRequestHandlerTest {
   private static SearchConfiguration testQueryConfig;
-  private static AutocompleteRequestHandler handler;
+  private AutocompleteRequestHandler handler;
   private OperationContext mockOpContext =
       TestOperationContexts.systemContextNoSearchAuthorization(mock(EntityRegistry.class));
   private OperationContext nonMockOpContext =
@@ -83,9 +84,13 @@ public class AutocompleteRequestHandlerTest {
     testQueryConfig.setExactMatch(exactMatchConfiguration);
     testQueryConfig.setWordGram(wordGramConfiguration);
     testQueryConfig.setPartial(partialConfiguration);
+  }
 
+  @BeforeClass
+  public void beforeTest() {
     handler =
         AutocompleteRequestHandler.getBuilder(
+            mockOpContext,
             TestEntitySpecBuilder.getSpec(),
             CustomSearchConfiguration.builder().build(),
             QueryFilterRewriteChain.EMPTY,
@@ -177,9 +182,9 @@ public void testDefaultAutocompleteRequest() {
 
   @Test
   public void testAutocompleteRequestWithField() {
-    // When field is null
+    // The field must be a valid field in the model. Pick from `keyPart1` or `urn`
     SearchRequest autocompleteRequest =
-        handler.getSearchRequest(mockOpContext, "input", "field", null, 10);
+        handler.getSearchRequest(mockOpContext, "input", "keyPart1", null, 10);
     SearchSourceBuilder sourceBuilder = autocompleteRequest.source();
     assertEquals(sourceBuilder.size(), 10);
     BoolQueryBuilder wrapper =
@@ -189,19 +194,19 @@ public void testAutocompleteRequestWithField() {
     assertEquals(query.should().size(), 3);
 
     MatchQueryBuilder matchQueryBuilder = (MatchQueryBuilder) query.should().get(0);
-    assertEquals("field.keyword", matchQueryBuilder.fieldName());
+    assertEquals("keyPart1.keyword", matchQueryBuilder.fieldName());
 
     MultiMatchQueryBuilder autocompleteQuery = (MultiMatchQueryBuilder) query.should().get(2);
     Map<String, Float> queryFields = autocompleteQuery.fields();
-    assertTrue(queryFields.containsKey("field.ngram"));
-    assertTrue(queryFields.containsKey("field.ngram._2gram"));
-    assertTrue(queryFields.containsKey("field.ngram._3gram"));
-    assertTrue(queryFields.containsKey("field.ngram._4gram"));
+    assertTrue(queryFields.containsKey("keyPart1.ngram"));
+    assertTrue(queryFields.containsKey("keyPart1.ngram._2gram"));
+    assertTrue(queryFields.containsKey("keyPart1.ngram._3gram"));
+    assertTrue(queryFields.containsKey("keyPart1.ngram._4gram"));
     assertEquals(autocompleteQuery.type(), MultiMatchQueryBuilder.Type.BOOL_PREFIX);
 
     MatchPhrasePrefixQueryBuilder prefixQuery =
         (MatchPhrasePrefixQueryBuilder) query.should().get(1);
-    assertEquals("field.delimited", prefixQuery.fieldName());
+    assertEquals("keyPart1.delimited", prefixQuery.fieldName());
 
     TermQueryBuilder removedFilter = (TermQueryBuilder) wrapper.mustNot().get(0);
     assertEquals(removedFilter.fieldName(), "removed");
@@ -209,11 +214,11 @@ public void testAutocompleteRequestWithField() {
     HighlightBuilder highlightBuilder = sourceBuilder.highlighter();
     List<HighlightBuilder.Field> highlightedFields = highlightBuilder.fields();
     assertEquals(highlightedFields.size(), 5);
-    assertEquals(highlightedFields.get(0).name(), "field");
-    assertEquals(highlightedFields.get(1).name(), "field.*");
-    assertEquals(highlightedFields.get(2).name(), "field.ngram");
-    assertEquals(highlightedFields.get(3).name(), "field.delimited");
-    assertEquals(highlightedFields.get(4).name(), "field.keyword");
+    assertEquals(highlightedFields.get(0).name(), "keyPart1");
+    assertEquals(highlightedFields.get(1).name(), "keyPart1.*");
+    assertEquals(highlightedFields.get(2).name(), "keyPart1.ngram");
+    assertEquals(highlightedFields.get(3).name(), "keyPart1.delimited");
+    assertEquals(highlightedFields.get(4).name(), "keyPart1.keyword");
   }
 
   @Test
@@ -221,6 +226,7 @@ public void testCustomConfigWithDefault() {
     // Exclude Default query
     AutocompleteRequestHandler withoutDefaultQuery =
         AutocompleteRequestHandler.getBuilder(
+            mockOpContext,
             TestEntitySpecBuilder.getSpec(),
             CustomSearchConfiguration.builder()
                 .autocompleteConfigurations(
@@ -248,6 +254,7 @@ public void testCustomConfigWithDefault() {
     // Include Default query
     AutocompleteRequestHandler withDefaultQuery =
         AutocompleteRequestHandler.getBuilder(
+            mockOpContext,
             TestEntitySpecBuilder.getSpec(),
             CustomSearchConfiguration.builder()
                 .autocompleteConfigurations(
@@ -290,6 +297,7 @@ public void testCustomConfigWithInheritedQueryFunctionScores() {
     // Pickup scoring functions from non-autocomplete
     AutocompleteRequestHandler withInherit =
         AutocompleteRequestHandler.getBuilder(
+            mockOpContext,
             TestEntitySpecBuilder.getSpec(),
             CustomSearchConfiguration.builder()
                 .queryConfigurations(List.of(TEST_QUERY_CONFIG))
@@ -332,6 +340,7 @@ public void testCustomConfigWithInheritedQueryFunctionScores() {
     // no search query customization
     AutocompleteRequestHandler noQueryCustomization =
         AutocompleteRequestHandler.getBuilder(
+            mockOpContext,
             TestEntitySpecBuilder.getSpec(),
             CustomSearchConfiguration.builder()
                 .autocompleteConfigurations(
@@ -378,6 +387,7 @@ public void testCustomConfigWithFunctionScores() {
     // Scoring functions explicit autocomplete override
     AutocompleteRequestHandler explicitNoInherit =
         AutocompleteRequestHandler.getBuilder(
+            mockOpContext,
             TestEntitySpecBuilder.getSpec(),
             CustomSearchConfiguration.builder()
                 .queryConfigurations(List.of(TEST_QUERY_CONFIG)) // should be ignored
@@ -432,6 +442,7 @@ public void testCustomConfigWithFunctionScores() {
     // inherit enabled)
     AutocompleteRequestHandler explicit =
         AutocompleteRequestHandler.getBuilder(
+            mockOpContext,
             TestEntitySpecBuilder.getSpec(),
             CustomSearchConfiguration.builder()
                 .queryConfigurations(List.of(TEST_QUERY_CONFIG)) // should be ignored
@@ -605,6 +616,7 @@ private BoolQueryBuilder getQuery(
 
     AutocompleteRequestHandler requestHandler =
         AutocompleteRequestHandler.getBuilder(
+            mockOpContext,
             entitySpec,
             CustomSearchConfiguration.builder().build(),
             QueryFilterRewriteChain.EMPTY,
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
index 62b9572d3c7a9e..f1e56e63502ffc 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
@@ -119,17 +119,13 @@ public void testDatasetFieldsAndHighlights() {
     EntitySpec entitySpec = operationContext.getEntityRegistry().getEntitySpec("dataset");
     SearchRequestHandler datasetHandler =
         SearchRequestHandler.getBuilder(
-            operationContext.getEntityRegistry(),
-            entitySpec,
-            testQueryConfig,
-            null,
-            QueryFilterRewriteChain.EMPTY);
+            operationContext, entitySpec, testQueryConfig, null, QueryFilterRewriteChain.EMPTY);
 
     /*
       Ensure efficient query performance, we do not expect upstream/downstream/fineGrained lineage
     */
     List<String> highlightFields =
-        datasetHandler.getHighlights().fields().stream()
+        datasetHandler.getDefaultHighlights(operationContext).fields().stream()
             .map(HighlightBuilder.Field::name)
             .collect(Collectors.toList());
     assertTrue(
@@ -144,7 +140,7 @@ public void testCustomHighlights() {
     EntitySpec entitySpec = operationContext.getEntityRegistry().getEntitySpec("dataset");
     SearchRequestHandler requestHandler =
         SearchRequestHandler.getBuilder(
-            operationContext.getEntityRegistry(),
+            operationContext,
             TestEntitySpecBuilder.getSpec(),
             testQueryConfig,
             null,
@@ -174,7 +170,7 @@ public void testCustomHighlights() {
   public void testSearchRequestHandlerHighlightingTurnedOff() {
     SearchRequestHandler requestHandler =
         SearchRequestHandler.getBuilder(
-            operationContext.getEntityRegistry(),
+            operationContext,
             TestEntitySpecBuilder.getSpec(),
             testQueryConfig,
             null,
@@ -220,7 +216,7 @@ public void testSearchRequestHandlerHighlightingTurnedOff() {
   public void testSearchRequestHandler() {
     SearchRequestHandler requestHandler =
         SearchRequestHandler.getBuilder(
-            operationContext.getEntityRegistry(),
+            operationContext,
             TestEntitySpecBuilder.getSpec(),
             testQueryConfig,
             null,
@@ -294,7 +290,7 @@ public void testSearchRequestHandler() {
   public void testAggregationsInSearch() {
     SearchRequestHandler requestHandler =
         SearchRequestHandler.getBuilder(
-            operationContext.getEntityRegistry(),
+            operationContext,
             TestEntitySpecBuilder.getSpec(),
             testQueryConfig,
             null,
@@ -368,7 +364,7 @@ public void testFilteredSearch() {
 
     final SearchRequestHandler requestHandler =
         SearchRequestHandler.getBuilder(
-            operationContext.getEntityRegistry(),
+            operationContext,
             TestEntitySpecBuilder.getSpec(),
             testQueryConfig,
             null,
@@ -793,11 +789,7 @@ public void testQueryByDefault() {
           operationContext.getEntityRegistry().getEntitySpec(EntityTypeMapper.getName(entityType));
       SearchRequestHandler handler =
           SearchRequestHandler.getBuilder(
-              operationContext.getEntityRegistry(),
-              entitySpec,
-              testQueryConfig,
-              null,
-              QueryFilterRewriteChain.EMPTY);
+              operationContext, entitySpec, testQueryConfig, null, QueryFilterRewriteChain.EMPTY);
 
       Set<String> unexpected = new HashSet<>(handler.getDefaultQueryFieldNames());
       unexpected.removeAll(expectedEntityQueryByDefault);
@@ -1027,11 +1019,7 @@ private BoolQueryBuilder getQuery(
 
     final SearchRequestHandler requestHandler =
         SearchRequestHandler.getBuilder(
-            operationContext.getEntityRegistry(),
-            entitySpec,
-            testQueryConfig,
-            null,
-            QueryFilterRewriteChain.EMPTY);
+            operationContext, entitySpec, testQueryConfig, null, QueryFilterRewriteChain.EMPTY);
 
     return (BoolQueryBuilder)
         requestHandler
@@ -1059,11 +1047,7 @@ private BoolQueryBuilder getAggregationQuery(
 
     final SearchRequestHandler requestHandler =
         SearchRequestHandler.getBuilder(
-            operationContext.getEntityRegistry(),
-            entitySpec,
-            testQueryConfig,
-            null,
-            QueryFilterRewriteChain.EMPTY);
+            operationContext, entitySpec, testQueryConfig, null, QueryFilterRewriteChain.EMPTY);
 
     return (BoolQueryBuilder)
         requestHandler
diff --git a/metadata-service/servlet/src/main/java/com/datahub/gms/servlet/ConfigSearchExport.java b/metadata-service/servlet/src/main/java/com/datahub/gms/servlet/ConfigSearchExport.java
index f80581bf6fbdde..720845e7ac1a33 100644
--- a/metadata-service/servlet/src/main/java/com/datahub/gms/servlet/ConfigSearchExport.java
+++ b/metadata-service/servlet/src/main/java/com/datahub/gms/servlet/ConfigSearchExport.java
@@ -6,7 +6,6 @@
 import com.datahub.gms.util.CSVWriter;
 import com.linkedin.datahub.graphql.types.entitytype.EntityTypeMapper;
 import com.linkedin.gms.factory.config.ConfigurationProvider;
-import com.linkedin.metadata.aspect.AspectRetriever;
 import com.linkedin.metadata.config.search.SearchConfiguration;
 import com.linkedin.metadata.models.EntitySpec;
 import com.linkedin.metadata.models.registry.EntityRegistry;
@@ -40,10 +39,6 @@ private static ConfigurationProvider getConfigProvider(WebApplicationContext ctx
     return (ConfigurationProvider) ctx.getBean("configurationProvider");
   }
 
-  private static AspectRetriever getAspectRetriever(WebApplicationContext ctx) {
-    return (AspectRetriever) ctx.getBean("aspectRetriever");
-  }
-
   private static OperationContext getOperationContext(WebApplicationContext ctx) {
     return (OperationContext) ctx.getBean("systemOperationContext");
   }
@@ -53,9 +48,9 @@ private static QueryFilterRewriteChain getQueryFilterRewriteChain(WebApplication
   }
 
   private void writeSearchCsv(WebApplicationContext ctx, PrintWriter pw) {
+    OperationContext systemOpContext = getOperationContext(ctx);
     SearchConfiguration searchConfiguration = getConfigProvider(ctx).getElasticSearch().getSearch();
-    AspectRetriever aspectRetriever = getAspectRetriever(ctx);
-    EntityRegistry entityRegistry = aspectRetriever.getEntityRegistry();
+    EntityRegistry entityRegistry = systemOpContext.getEntityRegistry();
     QueryFilterRewriteChain queryFilterRewriteChain = getQueryFilterRewriteChain(ctx);
 
     CSVWriter writer = CSVWriter.builder().printWriter(pw).build();
@@ -92,7 +87,7 @@ private void writeSearchCsv(WebApplicationContext ctx, PrintWriter pw) {
               EntitySpec entitySpec = entitySpecOpt.get();
               SearchRequest searchRequest =
                   SearchRequestHandler.getBuilder(
-                          entityRegistry,
+                          systemOpContext,
                           entitySpec,
                           searchConfiguration,
                           null,

From a98d4c2a1e86a941e1b3634cb1ea22ee8c24a2b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2025 11:43:09 -0600
Subject: [PATCH 238/249] build(deps): bump black from 23.7.0 to 24.3.0 in
 /metadata-service/iceberg-catalog (#12502)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 metadata-service/iceberg-catalog/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata-service/iceberg-catalog/requirements.txt b/metadata-service/iceberg-catalog/requirements.txt
index de0d0e77672fd2..0bd935018d504e 100644
--- a/metadata-service/iceberg-catalog/requirements.txt
+++ b/metadata-service/iceberg-catalog/requirements.txt
@@ -3,7 +3,7 @@ pytest-dependency>=0.5.1
 pyspark==3.5.3
 -e ../../metadata-ingestion[iceberg-catalog]
 # libaries for linting below this
-black==23.7.0
+black==24.3.0
 isort==5.12.0
 mypy==1.5.1
 ruff==0.0.287

From 4448fc24b7184c621d3881e019fbe5efedcab59c Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Thu, 6 Feb 2025 11:17:21 -0800
Subject: [PATCH 239/249] feat(sdk): add scaffolding for sdk v2 (#12554)

---
 metadata-ingestion/setup.cfg                  |   5 +-
 metadata-ingestion/src/datahub/errors.py      |  35 ++
 .../src/datahub/sdk/__init__.py               |  33 +
 .../src/datahub/sdk/_all_entities.py          |  15 +
 .../src/datahub/sdk/_attribution.py           |  48 ++
 metadata-ingestion/src/datahub/sdk/_entity.py |  89 +++
 metadata-ingestion/src/datahub/sdk/_shared.py | 338 ++++++++++
 .../src/datahub/sdk/container.py              | 193 ++++++
 metadata-ingestion/src/datahub/sdk/dataset.py | 584 ++++++++++++++++++
 .../src/datahub/sdk/entity_client.py          | 115 ++++
 .../src/datahub/sdk/main_client.py            |  56 ++
 .../src/datahub/sdk/resolver_client.py        | 101 +++
 .../test_dataset_basic_golden.json            |  91 +++
 .../test_dataset_complex_golden.json          | 275 +++++++++
 .../test_dataset_ingestion_golden.json        | 231 +++++++
 .../test_container_db_golden.json             |  52 ++
 .../test_container_schema_golden.json         |  69 +++
 .../test_dataset_creation_golden.json         | 142 +++++
 .../test_dataset_update_golden.json           |  45 ++
 .../tests/unit/sdk_v2/test_client_v2.py       |  55 ++
 .../tests/unit/sdk_v2/test_dataset.py         | 189 ++++++
 .../tests/unit/sdk_v2/test_entity_client.py   | 142 +++++
 22 files changed, 2902 insertions(+), 1 deletion(-)
 create mode 100644 metadata-ingestion/src/datahub/errors.py
 create mode 100644 metadata-ingestion/src/datahub/sdk/__init__.py
 create mode 100644 metadata-ingestion/src/datahub/sdk/_all_entities.py
 create mode 100644 metadata-ingestion/src/datahub/sdk/_attribution.py
 create mode 100644 metadata-ingestion/src/datahub/sdk/_entity.py
 create mode 100644 metadata-ingestion/src/datahub/sdk/_shared.py
 create mode 100644 metadata-ingestion/src/datahub/sdk/container.py
 create mode 100644 metadata-ingestion/src/datahub/sdk/dataset.py
 create mode 100644 metadata-ingestion/src/datahub/sdk/entity_client.py
 create mode 100644 metadata-ingestion/src/datahub/sdk/main_client.py
 create mode 100644 metadata-ingestion/src/datahub/sdk/resolver_client.py
 create mode 100644 metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_basic_golden.json
 create mode 100644 metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_complex_golden.json
 create mode 100644 metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_ingestion_golden.json
 create mode 100644 metadata-ingestion/tests/unit/sdk_v2/entity_client_goldens/test_container_db_golden.json
 create mode 100644 metadata-ingestion/tests/unit/sdk_v2/entity_client_goldens/test_container_schema_golden.json
 create mode 100644 metadata-ingestion/tests/unit/sdk_v2/entity_client_goldens/test_dataset_creation_golden.json
 create mode 100644 metadata-ingestion/tests/unit/sdk_v2/entity_client_goldens/test_dataset_update_golden.json
 create mode 100644 metadata-ingestion/tests/unit/sdk_v2/test_client_v2.py
 create mode 100644 metadata-ingestion/tests/unit/sdk_v2/test_dataset.py
 create mode 100644 metadata-ingestion/tests/unit/sdk_v2/test_entity_client.py

diff --git a/metadata-ingestion/setup.cfg b/metadata-ingestion/setup.cfg
index b7cf43b80b149e..ec58f1f5ab7d7b 100644
--- a/metadata-ingestion/setup.cfg
+++ b/metadata-ingestion/setup.cfg
@@ -15,6 +15,9 @@ warn_unused_configs = yes
 disallow_untyped_defs = no
 
 # try to be a bit more strict in certain areas of the codebase
+[mypy-datahub]
+# Only for datahub's __init__.py - allow implicit reexport
+implicit_reexport = yes
 [mypy-datahub.*]
 ignore_missing_imports = no
 implicit_reexport = no
@@ -54,7 +57,7 @@ addopts = --cov=src --cov-report= --cov-config setup.cfg --strict-markers -p no:
 markers =
     slow: marks tests that are slow to run, including all docker-based tests (deselect with '-m not slow')
     integration: marks all integration tests, across all batches (deselect with '-m "not integration"')
-    integration_batch_0: mark tests to run in batch 0 of integration tests. This is done mainly for parallelisation in CI. Batch 0 is the default batch.
+    integration_batch_0: mark tests to run in batch 0 of integration tests. This is done mainly for parallelization in CI. Batch 0 is the default batch.
     integration_batch_1: mark tests to run in batch 1 of integration tests
     integration_batch_2: mark tests to run in batch 2 of integration tests
 testpaths =
diff --git a/metadata-ingestion/src/datahub/errors.py b/metadata-ingestion/src/datahub/errors.py
new file mode 100644
index 00000000000000..cb57251fcb8e1b
--- /dev/null
+++ b/metadata-ingestion/src/datahub/errors.py
@@ -0,0 +1,35 @@
+from datahub.configuration.common import MetaError
+
+# TODO: Move all other error types to this file.
+
+
+class SdkUsageError(MetaError):
+    pass
+
+
+class AlreadyExistsError(SdkUsageError):
+    pass
+
+
+class ItemNotFoundError(SdkUsageError):
+    pass
+
+
+class MultipleItemsFoundError(SdkUsageError):
+    pass
+
+
+class SchemaFieldKeyError(SdkUsageError, KeyError):
+    pass
+
+
+class IngestionAttributionWarning(Warning):
+    pass
+
+
+class MultipleSubtypesWarning(Warning):
+    pass
+
+
+class ExperimentalWarning(Warning):
+    pass
diff --git a/metadata-ingestion/src/datahub/sdk/__init__.py b/metadata-ingestion/src/datahub/sdk/__init__.py
new file mode 100644
index 00000000000000..54bd18c3230476
--- /dev/null
+++ b/metadata-ingestion/src/datahub/sdk/__init__.py
@@ -0,0 +1,33 @@
+import warnings
+
+import datahub.metadata.schema_classes as models
+from datahub.errors import ExperimentalWarning, SdkUsageError
+from datahub.ingestion.graph.config import DatahubClientConfig
+from datahub.metadata.urns import (
+    ChartUrn,
+    ContainerUrn,
+    CorpGroupUrn,
+    CorpUserUrn,
+    DashboardUrn,
+    DataPlatformInstanceUrn,
+    DataPlatformUrn,
+    DatasetUrn,
+    DomainUrn,
+    GlossaryTermUrn,
+    SchemaFieldUrn,
+    TagUrn,
+)
+from datahub.sdk.container import Container
+from datahub.sdk.dataset import Dataset
+from datahub.sdk.main_client import DataHubClient
+
+warnings.warn(
+    "The new datahub SDK (e.g. datahub.sdk.*) is experimental. "
+    "Our typical backwards-compatibility and stability guarantees do not apply to this code. "
+    "When it's promoted to stable, the import path will change "
+    "from `from datahub.sdk import ...` to `from datahub import ...`.",
+    ExperimentalWarning,
+    stacklevel=2,
+)
+del warnings
+del ExperimentalWarning
diff --git a/metadata-ingestion/src/datahub/sdk/_all_entities.py b/metadata-ingestion/src/datahub/sdk/_all_entities.py
new file mode 100644
index 00000000000000..04c5fb6045ae61
--- /dev/null
+++ b/metadata-ingestion/src/datahub/sdk/_all_entities.py
@@ -0,0 +1,15 @@
+from typing import Dict, List, Type
+
+from datahub.sdk._entity import Entity
+from datahub.sdk.container import Container
+from datahub.sdk.dataset import Dataset
+
+# TODO: Is there a better way to declare this?
+ENTITY_CLASSES_LIST: List[Type[Entity]] = [
+    Container,
+    Dataset,
+]
+
+ENTITY_CLASSES: Dict[str, Type[Entity]] = {
+    cls.get_urn_type().ENTITY_TYPE: cls for cls in ENTITY_CLASSES_LIST
+}
diff --git a/metadata-ingestion/src/datahub/sdk/_attribution.py b/metadata-ingestion/src/datahub/sdk/_attribution.py
new file mode 100644
index 00000000000000..4faf441f58df76
--- /dev/null
+++ b/metadata-ingestion/src/datahub/sdk/_attribution.py
@@ -0,0 +1,48 @@
+from __future__ import annotations
+
+import contextlib
+from typing import Iterator
+
+from datahub.utilities.str_enum import StrEnum
+
+
+class KnownAttribution(StrEnum):
+    INGESTION = "INGESTION"
+    INGESTION_ALTERNATE = "INGESTION_ALTERNATE"
+
+    UI = "UI"
+    SDK = "SDK"
+
+    PROPAGATION = "PROPAGATION"
+
+    def is_ingestion(self) -> bool:
+        return self in (
+            KnownAttribution.INGESTION,
+            KnownAttribution.INGESTION_ALTERNATE,
+        )
+
+
+_default_attribution = KnownAttribution.SDK
+
+
+def get_default_attribution() -> KnownAttribution:
+    return _default_attribution
+
+
+def set_default_attribution(attribution: KnownAttribution) -> None:
+    global _default_attribution
+    _default_attribution = attribution
+
+
+@contextlib.contextmanager
+def change_default_attribution(attribution: KnownAttribution) -> Iterator[None]:
+    old_attribution = get_default_attribution()
+    try:
+        set_default_attribution(attribution)
+        yield
+    finally:
+        set_default_attribution(old_attribution)
+
+
+def is_ingestion_attribution() -> bool:
+    return get_default_attribution().is_ingestion()
diff --git a/metadata-ingestion/src/datahub/sdk/_entity.py b/metadata-ingestion/src/datahub/sdk/_entity.py
new file mode 100644
index 00000000000000..34a088a25949c5
--- /dev/null
+++ b/metadata-ingestion/src/datahub/sdk/_entity.py
@@ -0,0 +1,89 @@
+import abc
+from typing import List, Optional, Type, Union
+
+from typing_extensions import Self
+
+import datahub.metadata.schema_classes as models
+from datahub.emitter.mce_builder import Aspect as AspectTypeVar
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.errors import SdkUsageError
+from datahub.metadata.urns import Urn
+from datahub.utilities.urns._urn_base import _SpecificUrn
+
+
+class Entity:
+    __slots__ = ("_urn", "_prev_aspects", "_aspects")
+
+    def __init__(self, /, urn: Urn):
+        # This method is not meant for direct usage.
+        if type(self) is Entity:
+            raise SdkUsageError(f"{Entity.__name__} cannot be instantiated directly.")
+
+        assert isinstance(urn, self.get_urn_type())
+        self._urn: _SpecificUrn = urn
+
+        # prev_aspects is None means this was created from scratch
+        self._prev_aspects: Optional[models.AspectBag] = None
+        self._aspects: models.AspectBag = {}
+
+    @classmethod
+    def _new_from_graph(cls, urn: Urn, current_aspects: models.AspectBag) -> Self:
+        # If an init method from a subclass adds required fields, it also needs to override this method.
+        # An alternative approach would call cls.__new__() to bypass the init method, but it's a bit
+        # too hacky for my taste.
+        entity = cls(urn=urn)
+        return entity._init_from_graph(current_aspects)
+
+    def _init_from_graph(self, current_aspects: models.AspectBag) -> Self:
+        self._prev_aspects = current_aspects
+        aspect: models._Aspect
+        for aspect_name, aspect in (current_aspects or {}).items():  # type: ignore
+            aspect_copy = type(aspect).from_obj(aspect.to_obj())
+            self._aspects[aspect_name] = aspect_copy  # type: ignore
+        return self
+
+    @classmethod
+    @abc.abstractmethod
+    def get_urn_type(cls) -> Type[_SpecificUrn]: ...
+
+    @property
+    def urn(self) -> _SpecificUrn:
+        return self._urn
+
+    def _get_aspect(
+        self,
+        aspect_type: Type[AspectTypeVar],
+        /,
+    ) -> Optional[AspectTypeVar]:
+        return self._aspects.get(aspect_type.ASPECT_NAME)  # type: ignore
+
+    def _set_aspect(self, value: AspectTypeVar, /) -> None:
+        self._aspects[value.ASPECT_NAME] = value  # type: ignore
+
+    def _setdefault_aspect(self, default_aspect: AspectTypeVar, /) -> AspectTypeVar:
+        # Similar semantics to dict.setdefault.
+        if existing_aspect := self._get_aspect(type(default_aspect)):
+            return existing_aspect
+        self._set_aspect(default_aspect)
+        return default_aspect
+
+    def _as_mcps(
+        self,
+        change_type: Union[str, models.ChangeTypeClass] = models.ChangeTypeClass.UPSERT,
+    ) -> List[MetadataChangeProposalWrapper]:
+        urn_str = str(self.urn)
+
+        mcps = []
+        for aspect in self._aspects.values():
+            assert isinstance(aspect, models._Aspect)
+            mcps.append(
+                MetadataChangeProposalWrapper(
+                    entityUrn=urn_str,
+                    aspect=aspect,
+                    changeType=change_type,
+                )
+            )
+        return mcps
+
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}('{self.urn}')"
diff --git a/metadata-ingestion/src/datahub/sdk/_shared.py b/metadata-ingestion/src/datahub/sdk/_shared.py
new file mode 100644
index 00000000000000..559b30ddd5288d
--- /dev/null
+++ b/metadata-ingestion/src/datahub/sdk/_shared.py
@@ -0,0 +1,338 @@
+import warnings
+from datetime import datetime
+from typing import (
+    TYPE_CHECKING,
+    List,
+    Optional,
+    Tuple,
+    Union,
+)
+
+from typing_extensions import TypeAlias
+
+import datahub.metadata.schema_classes as models
+from datahub.emitter.mce_builder import (
+    make_ts_millis,
+    make_user_urn,
+    parse_ts_millis,
+    validate_ownership_type,
+)
+from datahub.emitter.mcp_builder import ContainerKey
+from datahub.errors import MultipleSubtypesWarning, SdkUsageError
+from datahub.metadata.urns import (
+    CorpGroupUrn,
+    CorpUserUrn,
+    DataJobUrn,
+    DataPlatformInstanceUrn,
+    DataPlatformUrn,
+    DatasetUrn,
+    DomainUrn,
+    GlossaryTermUrn,
+    OwnershipTypeUrn,
+    TagUrn,
+    Urn,
+)
+from datahub.sdk._entity import Entity
+from datahub.utilities.urns.error import InvalidUrnError
+
+if TYPE_CHECKING:
+    from datahub.sdk.container import Container
+
+UrnOrStr: TypeAlias = Union[Urn, str]
+DatasetUrnOrStr: TypeAlias = Union[str, DatasetUrn]
+DatajobUrnOrStr: TypeAlias = Union[str, DataJobUrn]
+
+ActorUrn: TypeAlias = Union[CorpUserUrn, CorpGroupUrn]
+
+
+def make_time_stamp(ts: Optional[datetime]) -> Optional[models.TimeStampClass]:
+    if ts is None:
+        return None
+    return models.TimeStampClass(time=make_ts_millis(ts))
+
+
+def parse_time_stamp(ts: Optional[models.TimeStampClass]) -> Optional[datetime]:
+    if ts is None:
+        return None
+    return parse_ts_millis(ts.time)
+
+
+class HasPlatformInstance(Entity):
+    __slots__ = ()
+
+    def _set_platform_instance(
+        self,
+        platform: Union[str, DataPlatformUrn],
+        instance: Union[None, str, DataPlatformInstanceUrn],
+    ) -> None:
+        platform = DataPlatformUrn(platform)
+        if instance is not None:
+            try:
+                instance = DataPlatformInstanceUrn.from_string(instance)
+            except InvalidUrnError:
+                if not isinstance(
+                    instance, DataPlatformInstanceUrn
+                ):  # redundant check to make mypy happy
+                    instance = DataPlatformInstanceUrn(platform, instance)
+        # At this point, instance is either None or a DataPlatformInstanceUrn.
+
+        self._set_aspect(
+            models.DataPlatformInstanceClass(
+                platform=platform.urn(),
+                instance=instance.urn() if instance else None,
+            )
+        )
+
+    @property
+    def platform_instance(self) -> Optional[DataPlatformInstanceUrn]:
+        dataPlatformInstance = self._get_aspect(models.DataPlatformInstanceClass)
+        if dataPlatformInstance and dataPlatformInstance.instance:
+            return DataPlatformInstanceUrn.from_string(dataPlatformInstance.instance)
+        return None
+
+
+class HasSubtype(Entity):
+    __slots__ = ()
+
+    @property
+    def subtype(self) -> Optional[str]:
+        subtypes = self._get_aspect(models.SubTypesClass)
+        if subtypes and subtypes.typeNames:
+            if len(subtypes.typeNames) > 1:
+                warnings.warn(
+                    f"The entity {self.urn} has multiple subtypes: {subtypes.typeNames}. "
+                    "Only the first subtype will be considered.",
+                    MultipleSubtypesWarning,
+                    stacklevel=2,
+                )
+            return subtypes.typeNames[0]
+        return None
+
+    def set_subtype(self, subtype: str) -> None:
+        self._set_aspect(models.SubTypesClass(typeNames=[subtype]))
+
+
+OwnershipTypeType: TypeAlias = Union[str, OwnershipTypeUrn]
+OwnerInputType: TypeAlias = Union[
+    str,
+    ActorUrn,
+    Tuple[Union[str, ActorUrn], OwnershipTypeType],
+    models.OwnerClass,
+]
+OwnersInputType: TypeAlias = List[OwnerInputType]
+
+
+class HasOwnership(Entity):
+    __slots__ = ()
+
+    @staticmethod
+    def _parse_owner_class(owner: OwnerInputType) -> models.OwnerClass:
+        if isinstance(owner, models.OwnerClass):
+            return owner
+
+        owner_type = models.OwnershipTypeClass.TECHNICAL_OWNER
+        owner_type_urn = None
+
+        if isinstance(owner, tuple):
+            raw_owner, raw_owner_type = owner
+
+            if isinstance(raw_owner_type, OwnershipTypeUrn):
+                owner_type = models.OwnershipTypeClass.CUSTOM
+                owner_type_urn = str(raw_owner_type)
+            else:
+                owner_type, owner_type_urn = validate_ownership_type(raw_owner_type)
+        else:
+            raw_owner = owner
+
+        if isinstance(raw_owner, str):
+            # Tricky: this will gracefully handle a user passing in a group urn as a string.
+            # TODO: is this the right behavior? or should we require a valid urn here?
+            return models.OwnerClass(
+                owner=make_user_urn(raw_owner),
+                type=owner_type,
+                typeUrn=owner_type_urn,
+            )
+        elif isinstance(raw_owner, Urn):
+            return models.OwnerClass(
+                owner=str(raw_owner),
+                type=owner_type,
+                typeUrn=owner_type_urn,
+            )
+        else:
+            raise SdkUsageError(
+                f"Invalid owner {owner}: {type(owner)} is not a valid owner type"
+            )
+
+    # TODO: Return a custom type with deserialized urns, instead of the raw aspect.
+    # Ideally we'd also use first-class ownership type urns here, not strings.
+    @property
+    def owners(self) -> Optional[List[models.OwnerClass]]:
+        if owners_aspect := self._get_aspect(models.OwnershipClass):
+            return owners_aspect.owners
+        return None
+
+    def set_owners(self, owners: OwnersInputType) -> None:
+        # TODO: add docs on the default parsing + default ownership type
+        parsed_owners = [self._parse_owner_class(owner) for owner in owners]
+        self._set_aspect(models.OwnershipClass(owners=parsed_owners))
+
+
+ContainerInputType: TypeAlias = Union["Container", ContainerKey]
+
+
+class HasContainer(Entity):
+    __slots__ = ()
+
+    def _set_container(self, container: Optional[ContainerInputType]) -> None:
+        # We need to allow container to be None. It won't happen for datasets much, but
+        # will be required for root containers.
+        from datahub.sdk.container import Container
+
+        browse_path: List[Union[str, models.BrowsePathEntryClass]] = []
+        if isinstance(container, Container):
+            container_urn = container.urn.urn()
+
+            parent_browse_path = container._get_aspect(models.BrowsePathsV2Class)
+            if parent_browse_path is None:
+                raise SdkUsageError(
+                    "Parent container does not have a browse path, so cannot generate one for its children."
+                )
+            browse_path = [
+                *parent_browse_path.path,
+                models.BrowsePathEntryClass(
+                    id=container_urn,
+                    urn=container_urn,
+                ),
+            ]
+        elif container is not None:
+            container_urn = container.as_urn()
+
+            browse_path_reversed = [container_urn]
+            parent_key = container.parent_key()
+            while parent_key is not None:
+                browse_path_reversed.append(parent_key.as_urn())
+                parent_key = parent_key.parent_key()
+            browse_path = list(reversed(browse_path_reversed))
+        else:
+            container_urn = None
+            browse_path = []
+
+        if container_urn:
+            self._set_aspect(models.ContainerClass(container=container_urn))
+
+        self._set_aspect(
+            models.BrowsePathsV2Class(
+                path=[
+                    (
+                        entry
+                        if isinstance(entry, models.BrowsePathEntryClass)
+                        else models.BrowsePathEntryClass(
+                            id=entry,
+                            urn=entry,
+                        )
+                    )
+                    for entry in browse_path
+                ]
+            )
+        )
+
+
+TagInputType: TypeAlias = Union[str, TagUrn, models.TagAssociationClass]
+TagsInputType: TypeAlias = List[TagInputType]
+
+
+class HasTags(Entity):
+    __slots__ = ()
+
+    # TODO: Return a custom type with deserialized urns, instead of the raw aspect.
+    @property
+    def tags(self) -> Optional[List[models.TagAssociationClass]]:
+        if tags := self._get_aspect(models.GlobalTagsClass):
+            return tags.tags
+        return None
+
+    @classmethod
+    def _parse_tag_association_class(
+        cls, tag: TagInputType
+    ) -> models.TagAssociationClass:
+        if isinstance(tag, models.TagAssociationClass):
+            return tag
+        elif isinstance(tag, str):
+            assert TagUrn.from_string(tag)
+        return models.TagAssociationClass(tag=str(tag))
+
+    def set_tags(self, tags: TagsInputType) -> None:
+        self._set_aspect(
+            models.GlobalTagsClass(
+                tags=[self._parse_tag_association_class(tag) for tag in tags]
+            )
+        )
+
+
+TermInputType: TypeAlias = Union[
+    str, GlossaryTermUrn, models.GlossaryTermAssociationClass
+]
+TermsInputType: TypeAlias = List[TermInputType]
+
+
+class HasTerms(Entity):
+    __slots__ = ()
+
+    # TODO: Return a custom type with deserialized urns, instead of the raw aspect.
+    @property
+    def terms(self) -> Optional[List[models.GlossaryTermAssociationClass]]:
+        if glossary_terms := self._get_aspect(models.GlossaryTermsClass):
+            return glossary_terms.terms
+        return None
+
+    @classmethod
+    def _parse_glossary_term_association_class(
+        cls, term: TermInputType
+    ) -> models.GlossaryTermAssociationClass:
+        if isinstance(term, models.GlossaryTermAssociationClass):
+            return term
+        elif isinstance(term, str):
+            assert GlossaryTermUrn.from_string(term)
+        return models.GlossaryTermAssociationClass(urn=str(term))
+
+    @classmethod
+    def _terms_audit_stamp(self) -> models.AuditStampClass:
+        return models.AuditStampClass(
+            time=0,
+            # TODO figure out what to put here
+            actor=CorpUserUrn("__ingestion").urn(),
+        )
+
+    def set_terms(self, terms: TermsInputType) -> None:
+        self._set_aspect(
+            models.GlossaryTermsClass(
+                terms=[
+                    self._parse_glossary_term_association_class(term) for term in terms
+                ],
+                auditStamp=self._terms_audit_stamp(),
+            )
+        )
+
+
+DomainInputType: TypeAlias = Union[str, DomainUrn]
+
+
+class HasDomain(Entity):
+    __slots__ = ()
+
+    @property
+    def domain(self) -> Optional[DomainUrn]:
+        if domains := self._get_aspect(models.DomainsClass):
+            if len(domains.domains) > 1:
+                raise SdkUsageError(
+                    f"The entity has multiple domains set, but only one is supported: {domains.domains}"
+                )
+            elif domains.domains:
+                domain_str = domains.domains[0]
+                return DomainUrn.from_string(domain_str)
+
+        return None
+
+    def set_domain(self, domain: DomainInputType) -> None:
+        domain_urn = DomainUrn.from_string(domain)  # basically a type assertion
+        self._set_aspect(models.DomainsClass(domains=[str(domain_urn)]))
diff --git a/metadata-ingestion/src/datahub/sdk/container.py b/metadata-ingestion/src/datahub/sdk/container.py
new file mode 100644
index 00000000000000..b4edae693bc9e7
--- /dev/null
+++ b/metadata-ingestion/src/datahub/sdk/container.py
@@ -0,0 +1,193 @@
+from __future__ import annotations
+
+from datetime import datetime
+from typing import Dict, Optional, Type
+
+from typing_extensions import Self
+
+import datahub.metadata.schema_classes as models
+from datahub.emitter.mce_builder import ALL_ENV_TYPES
+from datahub.emitter.mcp_builder import (
+    _INCLUDE_ENV_IN_CONTAINER_PROPERTIES,
+    ContainerKey,
+)
+from datahub.errors import SdkUsageError
+from datahub.metadata.urns import (
+    ContainerUrn,
+    Urn,
+)
+from datahub.sdk._entity import Entity
+from datahub.sdk._shared import (
+    DomainInputType,
+    HasContainer,
+    HasDomain,
+    HasOwnership,
+    HasPlatformInstance,
+    HasSubtype,
+    HasTags,
+    HasTerms,
+    OwnersInputType,
+    TagsInputType,
+    TermsInputType,
+    make_time_stamp,
+    parse_time_stamp,
+)
+
+
+class Container(
+    HasPlatformInstance,
+    HasSubtype,
+    HasContainer,
+    HasOwnership,
+    HasTags,
+    HasTerms,
+    HasDomain,
+    Entity,
+):
+    __slots__ = ()
+
+    @classmethod
+    def get_urn_type(cls) -> Type[ContainerUrn]:
+        return ContainerUrn
+
+    def __init__(
+        self,
+        /,
+        # Identity.
+        container_key: ContainerKey | ContainerUrn,
+        *,
+        # Container attributes.
+        display_name: str,
+        qualified_name: Optional[str] = None,
+        description: Optional[str] = None,
+        external_url: Optional[str] = None,
+        # TODO: call this custom properties?
+        extra_properties: Optional[Dict[str, str]] = None,
+        created: Optional[datetime] = None,
+        last_modified: Optional[datetime] = None,
+        # Standard aspects.
+        subtype: Optional[str] = None,
+        owners: Optional[OwnersInputType] = None,
+        tags: Optional[TagsInputType] = None,
+        terms: Optional[TermsInputType] = None,
+        domain: Optional[DomainInputType] = None,
+    ):
+        if isinstance(container_key, ContainerUrn):
+            urn = container_key
+        else:
+            urn = ContainerUrn.from_string(container_key.as_urn())
+        super().__init__(urn)
+
+        # This needs to come first to ensure that the display name is registered.
+        self._ensure_container_props(name=display_name)
+
+        # TODO: Normal usages should require container key. Only the graph init method can accept an urn.
+        if isinstance(container_key, ContainerKey):
+            self._set_platform_instance(container_key.platform, container_key.instance)
+
+            self._set_container(container_key.parent_key())
+
+            self.set_custom_properties(
+                {
+                    **container_key.property_dict(),
+                    **(extra_properties or {}),
+                }
+            )
+
+            # Extra validation on the env field.
+            # In certain cases (mainly for backwards compatibility), the env field will actually
+            # have a platform instance name.
+            env = container_key.env if container_key.env in ALL_ENV_TYPES else None
+            if _INCLUDE_ENV_IN_CONTAINER_PROPERTIES and env is not None:
+                self._ensure_container_props().env = env
+
+        if description is not None:
+            self.set_description(description)
+        if external_url is not None:
+            self.set_external_url(external_url)
+        if qualified_name is not None:
+            self.set_qualified_name(qualified_name)
+        if created is not None:
+            self.set_created(created)
+        if last_modified is not None:
+            self.set_last_modified(last_modified)
+
+        if subtype is not None:
+            self.set_subtype(subtype)
+        if owners is not None:
+            self.set_owners(owners)
+        if tags is not None:
+            self.set_tags(tags)
+        if terms is not None:
+            self.set_terms(terms)
+        if domain is not None:
+            self.set_domain(domain)
+
+    @classmethod
+    def _new_from_graph(cls, urn: Urn, current_aspects: models.AspectBag) -> Self:
+        assert isinstance(urn, ContainerUrn)
+        entity = cls(urn, display_name="__dummy_value__")
+        return entity._init_from_graph(current_aspects)
+
+    def _ensure_container_props(
+        self, *, name: Optional[str] = None
+    ) -> models.ContainerPropertiesClass:
+        # TODO: Not super happy with this method's implementation, but it's
+        # internal-only and enforces the constraints that we need.
+        if name is not None:
+            return self._setdefault_aspect(models.ContainerPropertiesClass(name=name))
+
+        props = self._get_aspect(models.ContainerPropertiesClass)
+        if props is None:
+            raise SdkUsageError("Containers must have a name.")
+        return props
+
+    @property
+    def display_name(self) -> str:
+        return self._ensure_container_props().name
+
+    def set_display_name(self, value: str) -> None:
+        self._ensure_container_props().name = value
+
+    @property
+    def description(self) -> Optional[str]:
+        return self._ensure_container_props().description
+
+    def set_description(self, description: str) -> None:
+        self._ensure_container_props().description = description
+
+    @property
+    def custom_properties(self) -> Optional[Dict[str, str]]:
+        return self._ensure_container_props().customProperties
+
+    def set_custom_properties(self, custom_properties: Dict[str, str]) -> None:
+        # TODO: How do we ensure that the container key props are always retained?
+        self._ensure_container_props().customProperties = custom_properties
+
+    @property
+    def external_url(self) -> Optional[str]:
+        return self._ensure_container_props().externalUrl
+
+    def set_external_url(self, external_url: str) -> None:
+        self._ensure_container_props().externalUrl = external_url
+
+    @property
+    def qualified_name(self) -> Optional[str]:
+        return self._ensure_container_props().qualifiedName
+
+    def set_qualified_name(self, qualified_name: str) -> None:
+        self._ensure_container_props().qualifiedName = qualified_name
+
+    @property
+    def created(self) -> Optional[datetime]:
+        return parse_time_stamp(self._ensure_container_props().created)
+
+    def set_created(self, created: datetime) -> None:
+        self._ensure_container_props().created = make_time_stamp(created)
+
+    @property
+    def last_modified(self) -> Optional[datetime]:
+        return parse_time_stamp(self._ensure_container_props().lastModified)
+
+    def set_last_modified(self, last_modified: datetime) -> None:
+        self._ensure_container_props().lastModified = make_time_stamp(last_modified)
diff --git a/metadata-ingestion/src/datahub/sdk/dataset.py b/metadata-ingestion/src/datahub/sdk/dataset.py
new file mode 100644
index 00000000000000..f68b2c0845c803
--- /dev/null
+++ b/metadata-ingestion/src/datahub/sdk/dataset.py
@@ -0,0 +1,584 @@
+from __future__ import annotations
+
+import warnings
+from datetime import datetime
+from typing import Dict, List, Optional, Tuple, Type, Union
+
+from typing_extensions import Self, TypeAlias, assert_never
+
+import datahub.metadata.schema_classes as models
+from datahub.cli.cli_utils import first_non_null
+from datahub.emitter.mce_builder import DEFAULT_ENV
+from datahub.errors import (
+    IngestionAttributionWarning,
+    ItemNotFoundError,
+    SchemaFieldKeyError,
+)
+from datahub.ingestion.source.sql.sql_types import resolve_sql_type
+from datahub.metadata.urns import DatasetUrn, SchemaFieldUrn, Urn
+from datahub.sdk._attribution import is_ingestion_attribution
+from datahub.sdk._entity import Entity
+from datahub.sdk._shared import (
+    ContainerInputType,
+    DatasetUrnOrStr,
+    DomainInputType,
+    HasContainer,
+    HasDomain,
+    HasOwnership,
+    HasPlatformInstance,
+    HasSubtype,
+    HasTags,
+    HasTerms,
+    OwnersInputType,
+    TagsInputType,
+    TermsInputType,
+    make_time_stamp,
+    parse_time_stamp,
+)
+
+SchemaFieldInputType: TypeAlias = Union[
+    str,
+    Tuple[str, str],  # (name, type)
+    Tuple[str, str, str],  # (name, type, description)
+    models.SchemaFieldClass,
+]
+SchemaFieldsInputType: TypeAlias = Union[
+    List[SchemaFieldInputType],
+    models.SchemaMetadataClass,
+]
+
+UpstreamInputType: TypeAlias = Union[
+    # Dataset upstream variants.
+    DatasetUrnOrStr,
+    models.UpstreamClass,
+    # Column upstream variants.
+    models.FineGrainedLineageClass,
+]
+# Mapping of { downstream_column -> [upstream_columns] }
+ColumnLineageMapping: TypeAlias = Dict[str, List[str]]
+UpstreamLineageInputType: TypeAlias = Union[
+    models.UpstreamLineageClass,
+    List[UpstreamInputType],
+    # Combined variant.
+    # Map of { upstream_dataset -> { downstream_column -> [upstream_column] } }
+    Dict[DatasetUrnOrStr, ColumnLineageMapping],
+]
+
+
+def _parse_upstream_input(
+    upstream_input: UpstreamInputType,
+) -> Union[models.UpstreamClass, models.FineGrainedLineageClass]:
+    if isinstance(upstream_input, models.UpstreamClass):
+        return upstream_input
+    elif isinstance(upstream_input, models.FineGrainedLineageClass):
+        return upstream_input
+    elif isinstance(upstream_input, (str, DatasetUrn)):
+        return models.UpstreamClass(
+            dataset=str(upstream_input),
+            type=models.DatasetLineageTypeClass.TRANSFORMED,
+        )
+    else:
+        assert_never(upstream_input)
+
+
+def _parse_cll_mapping(
+    *,
+    upstream: DatasetUrnOrStr,
+    downstream: DatasetUrnOrStr,
+    cll_mapping: ColumnLineageMapping,
+) -> List[models.FineGrainedLineageClass]:
+    cll = []
+    for downstream_column, upstream_columns in cll_mapping.items():
+        cll.append(
+            models.FineGrainedLineageClass(
+                upstreamType=models.FineGrainedLineageUpstreamTypeClass.FIELD_SET,
+                downstreamType=models.FineGrainedLineageDownstreamTypeClass.FIELD,
+                upstreams=[
+                    SchemaFieldUrn(upstream, upstream_column).urn()
+                    for upstream_column in upstream_columns
+                ],
+                downstreams=[SchemaFieldUrn(downstream, downstream_column).urn()],
+            )
+        )
+    return cll
+
+
+def _parse_upstream_lineage_input(
+    upstream_input: UpstreamLineageInputType, downstream_urn: DatasetUrn
+) -> models.UpstreamLineageClass:
+    if isinstance(upstream_input, models.UpstreamLineageClass):
+        return upstream_input
+    elif isinstance(upstream_input, list):
+        upstreams = [_parse_upstream_input(upstream) for upstream in upstream_input]
+
+        # Partition into table and column lineages.
+        tll = [
+            upstream
+            for upstream in upstreams
+            if isinstance(upstream, models.UpstreamClass)
+        ]
+        cll = [
+            upstream
+            for upstream in upstreams
+            if not isinstance(upstream, models.UpstreamClass)
+        ]
+
+        # TODO: check that all things in cll are also in tll
+        return models.UpstreamLineageClass(upstreams=tll, fineGrainedLineages=cll)
+    elif isinstance(upstream_input, dict):
+        tll = []
+        cll = []
+        for dataset_urn, column_lineage in upstream_input.items():
+            tll.append(
+                models.UpstreamClass(
+                    dataset=str(dataset_urn),
+                    type=models.DatasetLineageTypeClass.TRANSFORMED,
+                )
+            )
+            cll.extend(
+                _parse_cll_mapping(
+                    upstream=dataset_urn,
+                    downstream=downstream_urn,
+                    cll_mapping=column_lineage,
+                )
+            )
+
+        return models.UpstreamLineageClass(upstreams=tll, fineGrainedLineages=cll)
+    else:
+        assert_never(upstream_input)
+
+
+class SchemaField:
+    __slots__ = ("_parent", "_field_path")
+
+    def __init__(self, parent: Dataset, field_path: str):
+        self._parent = parent
+        self._field_path = field_path
+
+    def _base_schema_field(self) -> models.SchemaFieldClass:
+        # This must exist - if it doesn't, we've got a larger bug.
+        schema_dict = self._parent._schema_dict()
+        return schema_dict[self._field_path]
+
+    def _get_editable_schema_field(
+        self,
+    ) -> Optional[models.EditableSchemaFieldInfoClass]:
+        # This method does not make any mutations.
+        editable_schema = self._parent._get_aspect(models.EditableSchemaMetadataClass)
+        if editable_schema is None:
+            return None
+        for field in editable_schema.editableSchemaFieldInfo:
+            if field.fieldPath == self._field_path:
+                return field
+        return None
+
+    def _ensure_editable_schema_field(self) -> models.EditableSchemaFieldInfoClass:
+        if is_ingestion_attribution():
+            warnings.warn(
+                "This method should not be used in ingestion mode.",
+                IngestionAttributionWarning,
+                stacklevel=2,
+            )
+        editable_schema = self._parent._setdefault_aspect(
+            models.EditableSchemaMetadataClass(editableSchemaFieldInfo=[])
+        )
+        for field in editable_schema.editableSchemaFieldInfo:
+            if field.fieldPath == self._field_path:
+                return field
+
+        # If we don't have an entry for this field yet, create one.
+        field = models.EditableSchemaFieldInfoClass(fieldPath=self._field_path)
+        editable_schema.editableSchemaFieldInfo.append(field)
+        return field
+
+    @property
+    def field_path(self) -> str:
+        return self._field_path
+
+    @property
+    def mapped_type(self) -> models.SchemaFieldDataTypeClass:
+        return self._base_schema_field().type
+
+    @property
+    def native_type(self) -> str:
+        return self._base_schema_field().nativeDataType
+
+    # TODO expose nullability and primary/foreign key details
+
+    @property
+    def description(self) -> Optional[str]:
+        editable_field = self._get_editable_schema_field()
+        return first_non_null(
+            [
+                editable_field.description if editable_field is not None else None,
+                self._base_schema_field().description,
+            ]
+        )
+
+    def set_description(self, description: str) -> None:
+        if is_ingestion_attribution():
+            editable_field = self._get_editable_schema_field()
+            if editable_field and editable_field.description is not None:
+                warnings.warn(
+                    "The field description will be hidden by UI-based edits. "
+                    "Change the edit mode to OVERWRITE_UI to override this behavior.",
+                    category=IngestionAttributionWarning,
+                    stacklevel=2,
+                )
+
+            self._base_schema_field().description = description
+        else:
+            self._ensure_editable_schema_field().description = description
+
+    @property
+    def tags(self) -> Optional[List[models.TagAssociationClass]]:
+        # Tricky: if either has a non-null globalTags, this will not return None.
+        tags = None
+
+        if (base_tags := self._base_schema_field().globalTags) is not None:
+            tags = tags or []
+            tags.extend(base_tags.tags)
+
+        if editable_field := self._get_editable_schema_field():
+            if (editable_tags := editable_field.globalTags) is not None:
+                tags = tags or []
+                tags.extend(editable_tags.tags)
+
+        return tags
+
+    def set_tags(self, tags: TagsInputType) -> None:
+        parsed_tags = [self._parent._parse_tag_association_class(tag) for tag in tags]
+
+        if is_ingestion_attribution():
+            editable_field = self._get_editable_schema_field()
+            if editable_field and editable_field.globalTags:
+                warnings.warn(
+                    "Overwriting non-ingestion tags from ingestion is an anti-pattern.",
+                    category=IngestionAttributionWarning,
+                    stacklevel=2,
+                )
+                editable_field.globalTags = None
+
+            self._base_schema_field().globalTags = models.GlobalTagsClass(
+                tags=parsed_tags
+            )
+        else:
+            base_field = self._base_schema_field()
+            if base_field.globalTags:
+                base_field.globalTags = None
+
+            self._ensure_editable_schema_field().globalTags = models.GlobalTagsClass(
+                tags=parsed_tags
+            )
+
+    @property
+    def terms(self) -> Optional[List[models.GlossaryTermAssociationClass]]:
+        # TODO: Basically the same implementation as tags - can we share code?
+        terms = None
+
+        if (base_terms := self._base_schema_field().glossaryTerms) is not None:
+            terms = terms or []
+            terms.extend(base_terms.terms)
+
+        if editable_field := self._get_editable_schema_field():
+            if (editable_terms := editable_field.glossaryTerms) is not None:
+                terms = terms or []
+                terms.extend(editable_terms.terms)
+
+        return terms
+
+    def set_terms(self, terms: List[models.GlossaryTermAssociationClass]) -> None:
+        parsed_terms = [
+            self._parent._parse_glossary_term_association_class(term) for term in terms
+        ]
+
+        if is_ingestion_attribution():
+            editable_field = self._get_editable_schema_field()
+            if editable_field and editable_field.glossaryTerms:
+                warnings.warn(
+                    "Overwriting non-ingestion terms from ingestion is an anti-pattern.",
+                    category=IngestionAttributionWarning,
+                    stacklevel=2,
+                )
+                editable_field.glossaryTerms = None
+
+            self._base_schema_field().glossaryTerms = models.GlossaryTermsClass(
+                terms=parsed_terms,
+                auditStamp=self._parent._terms_audit_stamp(),
+            )
+        else:
+            base_field = self._base_schema_field()
+            if base_field.glossaryTerms:
+                base_field.glossaryTerms = None
+
+            self._ensure_editable_schema_field().glossaryTerms = (
+                models.GlossaryTermsClass(
+                    terms=parsed_terms,
+                    auditStamp=self._parent._terms_audit_stamp(),
+                )
+            )
+
+
+class Dataset(
+    HasPlatformInstance,
+    HasSubtype,
+    HasContainer,
+    HasOwnership,
+    HasTags,
+    HasTerms,
+    HasDomain,
+    Entity,
+):
+    __slots__ = ()
+
+    @classmethod
+    def get_urn_type(cls) -> Type[DatasetUrn]:
+        return DatasetUrn
+
+    def __init__(
+        self,
+        *,
+        # Identity.
+        platform: str,
+        name: str,
+        platform_instance: Optional[str] = None,
+        env: str = DEFAULT_ENV,
+        # Dataset properties.
+        description: Optional[str] = None,
+        display_name: Optional[str] = None,
+        qualified_name: Optional[str] = None,
+        external_url: Optional[str] = None,
+        custom_properties: Optional[Dict[str, str]] = None,
+        created: Optional[datetime] = None,
+        last_modified: Optional[datetime] = None,
+        # Standard aspects.
+        subtype: Optional[str] = None,
+        container: Optional[ContainerInputType] = None,
+        owners: Optional[OwnersInputType] = None,
+        tags: Optional[TagsInputType] = None,
+        terms: Optional[TermsInputType] = None,
+        # TODO structured_properties
+        domain: Optional[DomainInputType] = None,
+        # Dataset-specific aspects.
+        schema: Optional[SchemaFieldsInputType] = None,
+        upstreams: Optional[models.UpstreamLineageClass] = None,
+    ):
+        urn = DatasetUrn.create_from_ids(
+            platform_id=platform,
+            table_name=name,
+            platform_instance=platform_instance,
+            env=env,
+        )
+        super().__init__(urn)
+
+        self._set_platform_instance(urn.platform, platform_instance)
+
+        if schema is not None:
+            self._set_schema(schema)
+        if upstreams is not None:
+            self.set_upstreams(upstreams)
+
+        if description is not None:
+            self.set_description(description)
+        if display_name is not None:
+            self.set_display_name(display_name)
+        if qualified_name is not None:
+            self.set_qualified_name(qualified_name)
+        if external_url is not None:
+            self.set_external_url(external_url)
+        if custom_properties is not None:
+            self.set_custom_properties(custom_properties)
+        if created is not None:
+            self.set_created(created)
+        if last_modified is not None:
+            self.set_last_modified(last_modified)
+
+        if subtype is not None:
+            self.set_subtype(subtype)
+        if container is not None:
+            self._set_container(container)
+        if owners is not None:
+            self.set_owners(owners)
+        if tags is not None:
+            self.set_tags(tags)
+        if terms is not None:
+            self.set_terms(terms)
+        if domain is not None:
+            self.set_domain(domain)
+
+    @classmethod
+    def _new_from_graph(cls, urn: Urn, current_aspects: models.AspectBag) -> Self:
+        assert isinstance(urn, DatasetUrn)
+        entity = cls(
+            platform=urn.platform,
+            name=urn.name,
+            env=urn.env,
+        )
+        return entity._init_from_graph(current_aspects)
+
+    @property
+    def urn(self) -> DatasetUrn:
+        return self._urn  # type: ignore
+
+    def _ensure_dataset_props(self) -> models.DatasetPropertiesClass:
+        return self._setdefault_aspect(models.DatasetPropertiesClass())
+
+    def _get_editable_props(self) -> Optional[models.EditableDatasetPropertiesClass]:
+        return self._get_aspect(models.EditableDatasetPropertiesClass)
+
+    def _ensure_editable_props(self) -> models.EditableDatasetPropertiesClass:
+        # Note that most of the fields in this aspect are not used.
+        # The only one that's relevant for us is the description.
+        return self._setdefault_aspect(models.EditableDatasetPropertiesClass())
+
+    @property
+    def description(self) -> Optional[str]:
+        editable_props = self._get_editable_props()
+        return first_non_null(
+            [
+                editable_props.description if editable_props is not None else None,
+                self._ensure_dataset_props().description,
+            ]
+        )
+
+    def set_description(self, description: str) -> None:
+        if is_ingestion_attribution():
+            editable_props = self._get_editable_props()
+            if editable_props is not None and editable_props.description is not None:
+                warnings.warn(
+                    "Overwriting non-ingestion description from ingestion is an anti-pattern.",
+                    category=IngestionAttributionWarning,
+                    stacklevel=2,
+                )
+                # Force the ingestion description to show up.
+                editable_props.description = None
+
+            self._ensure_dataset_props().description = description
+        else:
+            self._ensure_editable_props().description = description
+
+    @property
+    def display_name(self) -> Optional[str]:
+        return self._ensure_dataset_props().name
+
+    def set_display_name(self, display_name: str) -> None:
+        self._ensure_dataset_props().name = display_name
+
+    @property
+    def qualified_name(self) -> Optional[str]:
+        return self._ensure_dataset_props().qualifiedName
+
+    def set_qualified_name(self, qualified_name: str) -> None:
+        self._ensure_dataset_props().qualifiedName = qualified_name
+
+    @property
+    def external_url(self) -> Optional[str]:
+        return self._ensure_dataset_props().externalUrl
+
+    def set_external_url(self, external_url: str) -> None:
+        self._ensure_dataset_props().externalUrl = external_url
+
+    @property
+    def custom_properties(self) -> Dict[str, str]:
+        return self._ensure_dataset_props().customProperties
+
+    def set_custom_properties(self, custom_properties: Dict[str, str]) -> None:
+        self._ensure_dataset_props().customProperties = custom_properties
+
+    @property
+    def created(self) -> Optional[datetime]:
+        return parse_time_stamp(self._ensure_dataset_props().created)
+
+    def set_created(self, created: datetime) -> None:
+        self._ensure_dataset_props().created = make_time_stamp(created)
+
+    @property
+    def last_modified(self) -> Optional[datetime]:
+        return parse_time_stamp(self._ensure_dataset_props().lastModified)
+
+    def set_last_modified(self, last_modified: datetime) -> None:
+        self._ensure_dataset_props().lastModified = make_time_stamp(last_modified)
+
+    def _schema_dict(self) -> Dict[str, models.SchemaFieldClass]:
+        schema_metadata = self._get_aspect(models.SchemaMetadataClass)
+        if schema_metadata is None:
+            raise ItemNotFoundError(f"Schema is not set for dataset {self.urn}")
+        return {field.fieldPath: field for field in schema_metadata.fields}
+
+    @property
+    def schema(self) -> List[SchemaField]:
+        # TODO: Add some caching here to avoid iterating over the schema every time.
+        schema_dict = self._schema_dict()
+        return [SchemaField(self, field_path) for field_path in schema_dict]
+
+    def _parse_schema_field_input(
+        self, schema_field_input: SchemaFieldInputType
+    ) -> models.SchemaFieldClass:
+        if isinstance(schema_field_input, models.SchemaFieldClass):
+            return schema_field_input
+        elif isinstance(schema_field_input, tuple):
+            # Support (name, type) and (name, type, description) forms
+            if len(schema_field_input) == 2:
+                name, field_type = schema_field_input
+                description = None
+            elif len(schema_field_input) == 3:
+                name, field_type, description = schema_field_input
+            else:
+                assert_never(schema_field_input)
+            return models.SchemaFieldClass(
+                fieldPath=name,
+                type=models.SchemaFieldDataTypeClass(
+                    resolve_sql_type(
+                        field_type,
+                        platform=self.urn.get_data_platform_urn().platform_name,
+                    )
+                    or models.NullTypeClass()
+                ),
+                nativeDataType=field_type,
+                description=description,
+            )
+        elif isinstance(schema_field_input, str):
+            # TODO: Not sure this branch makes sense - we should probably just require types?
+            return models.SchemaFieldClass(
+                fieldPath=schema_field_input,
+                type=models.SchemaFieldDataTypeClass(models.NullTypeClass()),
+                nativeDataType="unknown",
+                description=None,
+            )
+        else:
+            assert_never(schema_field_input)
+
+    def _set_schema(self, schema: SchemaFieldsInputType) -> None:
+        # This method is not public. Ingestion/restatement users should be setting
+        # the schema via the constructor. SDK users that got a dataset from the graph
+        # probably shouldn't be adding/removing fields ad-hoc. The field-level mutators
+        # can be used instead.
+        if isinstance(schema, models.SchemaMetadataClass):
+            self._set_aspect(schema)
+        else:
+            parsed_schema = [self._parse_schema_field_input(field) for field in schema]
+            self._set_aspect(
+                models.SchemaMetadataClass(
+                    fields=parsed_schema,
+                    # The rest of these fields are not used, and so we can set them to dummy/default values.
+                    schemaName="",
+                    platform=self.urn.platform,
+                    version=0,
+                    hash="",
+                    platformSchema=models.SchemalessClass(),
+                )
+            )
+
+    def __getitem__(self, field_path: str) -> SchemaField:
+        # TODO: Automatically deal with field path v2?
+        schema_dict = self._schema_dict()
+        if field_path not in schema_dict:
+            raise SchemaFieldKeyError(f"Field {field_path} not found in schema")
+        return SchemaField(self, field_path)
+
+    @property
+    def upstreams(self) -> Optional[models.UpstreamLineageClass]:
+        return self._get_aspect(models.UpstreamLineageClass)
+
+    def set_upstreams(self, upstreams: UpstreamLineageInputType) -> None:
+        self._set_aspect(_parse_upstream_lineage_input(upstreams, self.urn))
diff --git a/metadata-ingestion/src/datahub/sdk/entity_client.py b/metadata-ingestion/src/datahub/sdk/entity_client.py
new file mode 100644
index 00000000000000..99dc7f9a280aba
--- /dev/null
+++ b/metadata-ingestion/src/datahub/sdk/entity_client.py
@@ -0,0 +1,115 @@
+from __future__ import annotations
+
+import warnings
+from typing import TYPE_CHECKING, Union, overload
+
+import datahub.metadata.schema_classes as models
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.emitter.mcp_patch_builder import MetadataPatchProposal
+from datahub.errors import IngestionAttributionWarning, ItemNotFoundError, SdkUsageError
+from datahub.ingestion.graph.client import DataHubGraph
+from datahub.metadata.urns import (
+    ContainerUrn,
+    DatasetUrn,
+    Urn,
+)
+from datahub.sdk._all_entities import ENTITY_CLASSES
+from datahub.sdk._entity import Entity
+from datahub.sdk._shared import UrnOrStr
+from datahub.sdk.container import Container
+from datahub.sdk.dataset import Dataset
+
+if TYPE_CHECKING:
+    from datahub.sdk.main_client import DataHubClient
+
+
+class EntityClient:
+    def __init__(self, client: DataHubClient):
+        self._client = client
+
+    # TODO: Make all of these methods sync by default.
+
+    @property
+    def _graph(self) -> DataHubGraph:
+        return self._client._graph
+
+    @overload
+    def get(self, urn: ContainerUrn) -> Container: ...
+    @overload
+    def get(self, urn: DatasetUrn) -> Dataset: ...
+    @overload
+    def get(self, urn: Union[Urn, str]) -> Entity: ...
+    def get(self, urn: UrnOrStr) -> Entity:
+        if not isinstance(urn, Urn):
+            urn = Urn.from_string(urn)
+
+        # TODO: add error handling around this with a suggested alternative if not yet supported
+        EntityClass = ENTITY_CLASSES[urn.entity_type]
+
+        if not self._graph.exists(str(urn)):
+            raise ItemNotFoundError(f"Entity {urn} not found")
+
+        aspects = self._graph.get_entity_semityped(str(urn))
+
+        # TODO: save the timestamp so we can use If-Unmodified-Since on the updates
+        return EntityClass._new_from_graph(urn, aspects)
+
+    def create(self, entity: Entity) -> None:
+        mcps = []
+
+        if self._graph.exists(str(entity.urn)):
+            raise SdkUsageError(
+                f"Entity {entity.urn} already exists. Use client.entities.upsert() to update it."
+            )
+
+        # Extra safety check: by putting this first, we can ensure that
+        # the request fails if the entity already exists.
+        mcps.append(
+            MetadataChangeProposalWrapper(
+                entityUrn=str(entity.urn),
+                aspect=entity.urn.to_key_aspect(),
+                changeType=models.ChangeTypeClass.CREATE_ENTITY,
+            )
+        )
+        mcps.extend(entity._as_mcps(models.ChangeTypeClass.CREATE))
+
+        self._graph.emit_mcps(mcps)
+
+    def upsert(self, entity: Entity) -> None:
+        if entity._prev_aspects is None and self._graph.exists(str(entity.urn)):
+            warnings.warn(
+                f"The entity {entity.urn} already exists. This operation will partially overwrite the existing entity.",
+                IngestionAttributionWarning,
+                stacklevel=2,
+            )
+            # TODO: If there are no previous aspects but the entity exists, should we delete aspects that are not present here?
+
+        mcps = entity._as_mcps(models.ChangeTypeClass.UPSERT)
+        self._graph.emit_mcps(mcps)
+
+    def update(self, entity: Union[Entity, MetadataPatchProposal]) -> None:
+        if isinstance(entity, MetadataPatchProposal):
+            return self._update_patch(entity)
+
+        if entity._prev_aspects is None:
+            raise SdkUsageError(
+                f"For entities created via {entity.__class__.__name__}(...), use client.entities.create() or client.entities.upsert() instead"
+            )
+
+        # TODO: respect If-Unmodified-Since?
+        # -> probably add a "mode" parameter that can be "update" (e.g. if not modified) or "update_force"
+
+        mcps = entity._as_mcps(models.ChangeTypeClass.UPSERT)
+        self._graph.emit_mcps(mcps)
+
+    def _update_patch(
+        self, updater: MetadataPatchProposal, check_exists: bool = True
+    ) -> None:
+        if check_exists and not self._graph.exists(updater.urn):
+            raise SdkUsageError(
+                f"Entity {updater.urn} does not exist, and hence cannot be updated. "
+                "You can bypass this check by setting check_exists=False."
+            )
+
+        mcps = updater.build()
+        self._graph.emit_mcps(mcps)
diff --git a/metadata-ingestion/src/datahub/sdk/main_client.py b/metadata-ingestion/src/datahub/sdk/main_client.py
new file mode 100644
index 00000000000000..7243114192a9dc
--- /dev/null
+++ b/metadata-ingestion/src/datahub/sdk/main_client.py
@@ -0,0 +1,56 @@
+from __future__ import annotations
+
+from typing import Optional, overload
+
+from datahub.errors import SdkUsageError
+from datahub.ingestion.graph.client import DataHubGraph, get_default_graph
+from datahub.ingestion.graph.config import DatahubClientConfig
+from datahub.sdk.entity_client import EntityClient
+from datahub.sdk.resolver_client import ResolverClient
+
+
+class DataHubClient:
+    @overload
+    def __init__(self, *, server: str, token: Optional[str] = None): ...
+    @overload
+    def __init__(self, *, config: DatahubClientConfig): ...
+    @overload
+    def __init__(self, *, graph: DataHubGraph): ...
+    def __init__(
+        self,
+        *,
+        server: Optional[str] = None,
+        token: Optional[str] = None,
+        graph: Optional[DataHubGraph] = None,
+        config: Optional[DatahubClientConfig] = None,
+    ):
+        if server is not None:
+            if config is not None:
+                raise SdkUsageError("Cannot specify both server and config")
+            if graph is not None:
+                raise SdkUsageError("Cannot specify both server and graph")
+            graph = DataHubGraph(config=DatahubClientConfig(server=server, token=token))
+        elif config is not None:
+            if graph is not None:
+                raise SdkUsageError("Cannot specify both config and graph")
+            graph = DataHubGraph(config=config)
+        elif graph is None:
+            raise SdkUsageError("Must specify either server, config, or graph")
+
+        self._graph = graph
+
+    @classmethod
+    def from_env(cls) -> "DataHubClient":
+        # Inspired by the DockerClient.from_env() method.
+        # TODO: This one also reads from ~/.datahubenv, so the "from_env" name might be a bit confusing.
+        # That file is part of the "environment", but is not a traditional "env variable".
+        graph = get_default_graph()
+        return cls(graph=graph)
+
+    @property
+    def entities(self) -> EntityClient:
+        return EntityClient(self)
+
+    @property
+    def resolve(self) -> ResolverClient:
+        return ResolverClient(self)
diff --git a/metadata-ingestion/src/datahub/sdk/resolver_client.py b/metadata-ingestion/src/datahub/sdk/resolver_client.py
new file mode 100644
index 00000000000000..dae2f61a918dd0
--- /dev/null
+++ b/metadata-ingestion/src/datahub/sdk/resolver_client.py
@@ -0,0 +1,101 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Optional, overload
+
+from datahub.errors import ItemNotFoundError, MultipleItemsFoundError, SdkUsageError
+from datahub.ingestion.graph.client import DataHubGraph
+from datahub.metadata.urns import (
+    CorpUserUrn,
+    DomainUrn,
+    GlossaryTermUrn,
+)
+
+if TYPE_CHECKING:
+    from datahub.sdk.main_client import DataHubClient
+
+
+class ResolverClient:
+    def __init__(self, client: DataHubClient):
+        self._client = client
+
+    # TODO: add caching to this method
+
+    @property
+    def _graph(self) -> DataHubGraph:
+        return self._client._graph
+
+    def domain(self, *, name: str) -> DomainUrn:
+        urn_str = self._graph.get_domain_urn_by_name(name)
+        if urn_str is None:
+            raise ItemNotFoundError(f"Domain with name {name} not found")
+        return DomainUrn.from_string(urn_str)
+
+    @overload
+    def user(self, *, name: str) -> CorpUserUrn: ...
+    @overload
+    def user(self, *, email: str) -> CorpUserUrn: ...
+    def user(
+        self, *, name: Optional[str] = None, email: Optional[str] = None
+    ) -> CorpUserUrn:
+        filter_explanation: str
+        filters = []
+        if name is not None:
+            if email is not None:
+                raise SdkUsageError("Cannot specify both name and email for auto_user")
+            # TODO: do we filter on displayName or fullName?
+            filter_explanation = f"with name {name}"
+            filters.append(
+                {
+                    "field": "fullName",
+                    "values": [name],
+                    "condition": "EQUAL",
+                }
+            )
+        elif email is not None:
+            filter_explanation = f"with email {email}"
+            filters.append(
+                {
+                    "field": "email",
+                    "values": [email],
+                    "condition": "EQUAL",
+                }
+            )
+        else:
+            raise SdkUsageError("Must specify either name or email for auto_user")
+
+        users = list(
+            self._graph.get_urns_by_filter(
+                entity_types=[CorpUserUrn.ENTITY_TYPE],
+                extraFilters=filters,
+            )
+        )
+        if len(users) == 0:
+            # TODO: In auto methods, should we just create the user/domain/etc if it doesn't exist?
+            raise ItemNotFoundError(f"User {filter_explanation} not found")
+        elif len(users) > 1:
+            raise MultipleItemsFoundError(
+                f"Multiple users found {filter_explanation}: {users}"
+            )
+        else:
+            return CorpUserUrn.from_string(users[0])
+
+    def term(self, *, name: str) -> GlossaryTermUrn:
+        # TODO: Add some limits on the graph fetch
+        terms = list(
+            self._graph.get_urns_by_filter(
+                entity_types=[GlossaryTermUrn.ENTITY_TYPE],
+                extraFilters=[
+                    {
+                        "field": "id",
+                        "values": [name],
+                        "condition": "EQUAL",
+                    }
+                ],
+            )
+        )
+        if len(terms) == 0:
+            raise ItemNotFoundError(f"Term with name {name} not found")
+        elif len(terms) > 1:
+            raise SdkUsageError(f"Multiple terms found with name {name}: {terms}")
+        else:
+            return GlossaryTermUrn.from_string(terms[0])
diff --git a/metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_basic_golden.json b/metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_basic_golden.json
new file mode 100644
index 00000000000000..bff58b02c091b0
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_basic_golden.json
@@ -0,0 +1,91 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,proj.dataset.table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,proj.dataset.table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "",
+            "platform": "urn:li:dataPlatform:bigquery",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.Schemaless": {}
+            },
+            "fields": [
+                {
+                    "fieldPath": "field1",
+                    "nullable": false,
+                    "description": "field1 description",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field2",
+                    "nullable": false,
+                    "description": "field2 description",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NullType": {}
+                        }
+                    },
+                    "nativeDataType": "int64",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,proj.dataset.table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:bigquery,proj.dataset.table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "tags": []
+        }
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_complex_golden.json b/metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_complex_golden.json
new file mode 100644
index 00000000000000..3b96b4d26ed2e1
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_complex_golden.json
@@ -0,0 +1,275 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:snowflake,my_instance)"
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.Schemaless": {}
+            },
+            "fields": [
+                {
+                    "fieldPath": "field1",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field2",
+                    "nullable": false,
+                    "description": "field2 description",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NullType": {}
+                        }
+                    },
+                    "nativeDataType": "int64",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "editableDatasetProperties",
+    "aspect": {
+        "json": {
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "description": "test"
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "key1": "value1",
+                "key2": "value2"
+            },
+            "externalUrl": "https://example.com",
+            "name": "MY_TABLE",
+            "qualifiedName": "MY_DB.MY_SCHEMA.MY_TABLE",
+            "created": {
+                "time": 1735787045000
+            },
+            "lastModified": {
+                "time": 1736391846000
+            },
+            "tags": []
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:66c5ac35f0bfc521dee6f7d9533a8056"
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:37d6500021cda2a0aa7ae1900eab5a9c",
+                    "urn": "urn:li:container:37d6500021cda2a0aa7ae1900eab5a9c"
+                },
+                {
+                    "id": "urn:li:container:66c5ac35f0bfc521dee6f7d9533a8056",
+                    "urn": "urn:li:container:66c5ac35f0bfc521dee6f7d9533a8056"
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "ownership",
+    "aspect": {
+        "json": {
+            "owners": [
+                {
+                    "owner": "urn:li:corpuser:admin@datahubproject.io",
+                    "type": "TECHNICAL_OWNER"
+                }
+            ],
+            "ownerTypes": {},
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            }
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "globalTags",
+    "aspect": {
+        "json": {
+            "tags": [
+                {
+                    "tag": "urn:li:tag:tag1"
+                },
+                {
+                    "tag": "urn:li:tag:tag2"
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "glossaryTerms",
+    "aspect": {
+        "json": {
+            "terms": [
+                {
+                    "urn": "urn:li:glossaryTerm:AccountBalance"
+                }
+            ],
+            "auditStamp": {
+                "time": 0,
+                "actor": "urn:li:corpuser:__ingestion"
+            }
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "domains",
+    "aspect": {
+        "json": {
+            "domains": [
+                "urn:li:domain:Marketing"
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "editableSchemaMetadata",
+    "aspect": {
+        "json": {
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "editableSchemaFieldInfo": [
+                {
+                    "fieldPath": "field1",
+                    "description": "field1 description",
+                    "globalTags": {
+                        "tags": [
+                            {
+                                "tag": "urn:li:tag:field1_tag1"
+                            },
+                            {
+                                "tag": "urn:li:tag:field1_tag2"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "fieldPath": "field2",
+                    "glossaryTerms": {
+                        "terms": [
+                            {
+                                "urn": "urn:li:glossaryTerm:field2_term1"
+                            },
+                            {
+                                "urn": "urn:li:glossaryTerm:field2_term2"
+                            }
+                        ],
+                        "auditStamp": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:__ingestion"
+                        }
+                    }
+                }
+            ]
+        }
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_ingestion_golden.json b/metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_ingestion_golden.json
new file mode 100644
index 00000000000000..3325e5e080e7a1
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_ingestion_golden.json
@@ -0,0 +1,231 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:snowflake,my_instance)"
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.Schemaless": {}
+            },
+            "fields": [
+                {
+                    "fieldPath": "field1",
+                    "nullable": false,
+                    "description": "field1 description",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "globalTags": {
+                        "tags": [
+                            {
+                                "tag": "urn:li:tag:field1_tag1"
+                            },
+                            {
+                                "tag": "urn:li:tag:field1_tag2"
+                            }
+                        ]
+                    },
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "field2",
+                    "nullable": false,
+                    "description": "field2 description",
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NullType": {}
+                        }
+                    },
+                    "nativeDataType": "int64",
+                    "recursive": false,
+                    "glossaryTerms": {
+                        "terms": [
+                            {
+                                "urn": "urn:li:glossaryTerm:field2_term1"
+                            },
+                            {
+                                "urn": "urn:li:glossaryTerm:field2_term2"
+                            }
+                        ],
+                        "auditStamp": {
+                            "time": 0,
+                            "actor": "urn:li:corpuser:__ingestion"
+                        }
+                    },
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "key1": "value1",
+                "key2": "value2"
+            },
+            "externalUrl": "https://example.com",
+            "name": "MY_TABLE",
+            "qualifiedName": "MY_DB.MY_SCHEMA.MY_TABLE",
+            "description": "test",
+            "created": {
+                "time": 1735787045000
+            },
+            "lastModified": {
+                "time": 1736391846000
+            },
+            "tags": []
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Table"
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:66c5ac35f0bfc521dee6f7d9533a8056"
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:37d6500021cda2a0aa7ae1900eab5a9c",
+                    "urn": "urn:li:container:37d6500021cda2a0aa7ae1900eab5a9c"
+                },
+                {
+                    "id": "urn:li:container:66c5ac35f0bfc521dee6f7d9533a8056",
+                    "urn": "urn:li:container:66c5ac35f0bfc521dee6f7d9533a8056"
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "ownership",
+    "aspect": {
+        "json": {
+            "owners": [
+                {
+                    "owner": "urn:li:corpuser:admin@datahubproject.io",
+                    "type": "TECHNICAL_OWNER"
+                }
+            ],
+            "ownerTypes": {},
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            }
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "globalTags",
+    "aspect": {
+        "json": {
+            "tags": [
+                {
+                    "tag": "urn:li:tag:tag1"
+                },
+                {
+                    "tag": "urn:li:tag:tag2"
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "glossaryTerms",
+    "aspect": {
+        "json": {
+            "terms": [
+                {
+                    "urn": "urn:li:glossaryTerm:AccountBalance"
+                }
+            ],
+            "auditStamp": {
+                "time": 0,
+                "actor": "urn:li:corpuser:__ingestion"
+            }
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,my_instance.my_db.my_schema.my_table,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "domains",
+    "aspect": {
+        "json": {
+            "domains": [
+                "urn:li:domain:Marketing"
+            ]
+        }
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sdk_v2/entity_client_goldens/test_container_db_golden.json b/metadata-ingestion/tests/unit/sdk_v2/entity_client_goldens/test_container_db_golden.json
new file mode 100644
index 00000000000000..6789608570ba8a
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sdk_v2/entity_client_goldens/test_container_db_golden.json
@@ -0,0 +1,52 @@
+[
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ff645a51ee3284db4355c6b1b7aec6de",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "snowflake",
+                "database": "test_db"
+            },
+            "name": "test_db"
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ff645a51ee3284db4355c6b1b7aec6de",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake"
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ff645a51ee3284db4355c6b1b7aec6de",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": []
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:ff645a51ee3284db4355c6b1b7aec6de",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Database"
+            ]
+        }
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sdk_v2/entity_client_goldens/test_container_schema_golden.json b/metadata-ingestion/tests/unit/sdk_v2/entity_client_goldens/test_container_schema_golden.json
new file mode 100644
index 00000000000000..c9729dc33546d3
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sdk_v2/entity_client_goldens/test_container_schema_golden.json
@@ -0,0 +1,69 @@
+[
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:07540cbc78ed6aff6882a43442d7e8c6",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "snowflake",
+                "database": "test_db",
+                "schema": "test_schema"
+            },
+            "name": "test_schema"
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:07540cbc78ed6aff6882a43442d7e8c6",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake"
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:07540cbc78ed6aff6882a43442d7e8c6",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:ff645a51ee3284db4355c6b1b7aec6de"
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:07540cbc78ed6aff6882a43442d7e8c6",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:ff645a51ee3284db4355c6b1b7aec6de",
+                    "urn": "urn:li:container:ff645a51ee3284db4355c6b1b7aec6de"
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:07540cbc78ed6aff6882a43442d7e8c6",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Schema"
+            ]
+        }
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sdk_v2/entity_client_goldens/test_dataset_creation_golden.json b/metadata-ingestion/tests/unit/sdk_v2/entity_client_goldens/test_dataset_creation_golden.json
new file mode 100644
index 00000000000000..4fd65e3fdfccd9
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sdk_v2/entity_client_goldens/test_dataset_creation_golden.json
@@ -0,0 +1,142 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+    "changeType": "CREATE_ENTITY",
+    "aspectName": "datasetKey",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake",
+            "name": "test_db.test_schema.table_1",
+            "origin": "PROD"
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+    "changeType": "CREATE",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake"
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+    "changeType": "CREATE",
+    "aspectName": "schemaMetadata",
+    "aspect": {
+        "json": {
+            "schemaName": "",
+            "platform": "urn:li:dataPlatform:snowflake",
+            "version": 0,
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "hash": "",
+            "platformSchema": {
+                "com.linkedin.schema.Schemaless": {}
+            },
+            "fields": [
+                {
+                    "fieldPath": "col1",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.StringType": {}
+                        }
+                    },
+                    "nativeDataType": "string",
+                    "recursive": false,
+                    "isPartOfKey": false
+                },
+                {
+                    "fieldPath": "col2",
+                    "nullable": false,
+                    "type": {
+                        "type": {
+                            "com.linkedin.schema.NumberType": {}
+                        }
+                    },
+                    "nativeDataType": "int",
+                    "recursive": false,
+                    "isPartOfKey": false
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+    "changeType": "CREATE",
+    "aspectName": "editableDatasetProperties",
+    "aspect": {
+        "json": {
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "description": "test description"
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+    "changeType": "CREATE",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:07540cbc78ed6aff6882a43442d7e8c6"
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+    "changeType": "CREATE",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:container:ff645a51ee3284db4355c6b1b7aec6de",
+                    "urn": "urn:li:container:ff645a51ee3284db4355c6b1b7aec6de"
+                },
+                {
+                    "id": "urn:li:container:07540cbc78ed6aff6882a43442d7e8c6",
+                    "urn": "urn:li:container:07540cbc78ed6aff6882a43442d7e8c6"
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+    "changeType": "CREATE",
+    "aspectName": "globalTags",
+    "aspect": {
+        "json": {
+            "tags": [
+                {
+                    "tag": "urn:li:tag:tag1"
+                }
+            ]
+        }
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sdk_v2/entity_client_goldens/test_dataset_update_golden.json b/metadata-ingestion/tests/unit/sdk_v2/entity_client_goldens/test_dataset_update_golden.json
new file mode 100644
index 00000000000000..4e2ba2a59a2b18
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sdk_v2/entity_client_goldens/test_dataset_update_golden.json
@@ -0,0 +1,45 @@
+[
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake"
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "datasetProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {},
+            "description": "original description",
+            "tags": []
+        }
+    }
+},
+{
+    "entityType": "dataset",
+    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.table_1,PROD)",
+    "changeType": "UPSERT",
+    "aspectName": "editableDatasetProperties",
+    "aspect": {
+        "json": {
+            "created": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            },
+            "description": "updated description"
+        }
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sdk_v2/test_client_v2.py b/metadata-ingestion/tests/unit/sdk_v2/test_client_v2.py
new file mode 100644
index 00000000000000..7acb0a8d2bf976
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sdk_v2/test_client_v2.py
@@ -0,0 +1,55 @@
+from unittest.mock import Mock
+
+import pytest
+
+from datahub.errors import ItemNotFoundError, MultipleItemsFoundError, SdkUsageError
+from datahub.ingestion.graph.client import DataHubGraph
+from datahub.ingestion.graph.config import DatahubClientConfig
+from datahub.metadata.urns import CorpUserUrn
+from datahub.sdk.main_client import DataHubClient
+
+
+@pytest.fixture
+def mock_graph() -> Mock:
+    graph = Mock(spec=DataHubGraph)
+    graph.exists.return_value = False
+    return graph
+
+
+def test_client_creation(mock_graph: Mock) -> None:
+    assert DataHubClient(graph=mock_graph)
+    assert DataHubClient(server="https://example.com", token="token")
+
+
+def test_client_init_errors(mock_graph: Mock) -> None:
+    config = DatahubClientConfig(server="https://example.com", token="token")
+
+    with pytest.raises(SdkUsageError):
+        DataHubClient(server="https://example.com", graph=mock_graph)  # type: ignore
+    with pytest.raises(SdkUsageError):
+        DataHubClient(server="https://example.com", config=config)  # type: ignore
+    with pytest.raises(SdkUsageError):
+        DataHubClient(config=config, graph=mock_graph)  # type: ignore
+    with pytest.raises(SdkUsageError):
+        DataHubClient()  # type: ignore
+
+
+def test_resolve_user(mock_graph: Mock) -> None:
+    client = DataHubClient(graph=mock_graph)
+
+    # This test doesn't really validate the graphql query or vars.
+    # It probably makes more sense to test via smoke-tests.
+
+    mock_graph.get_urns_by_filter.return_value = []
+    with pytest.raises(ItemNotFoundError):
+        client.resolve.user(name="User")
+
+    mock_graph.get_urns_by_filter.return_value = ["urn:li:corpuser:user"]
+    assert client.resolve.user(name="User") == CorpUserUrn("urn:li:corpuser:user")
+
+    mock_graph.get_urns_by_filter.return_value = [
+        "urn:li:corpuser:user",
+        "urn:li:corpuser:user2",
+    ]
+    with pytest.raises(MultipleItemsFoundError):
+        client.resolve.user(name="User")
diff --git a/metadata-ingestion/tests/unit/sdk_v2/test_dataset.py b/metadata-ingestion/tests/unit/sdk_v2/test_dataset.py
new file mode 100644
index 00000000000000..da041ba3d4e303
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sdk_v2/test_dataset.py
@@ -0,0 +1,189 @@
+import pathlib
+from datetime import datetime, timezone
+
+import pytest
+
+from datahub.emitter.mcp_builder import SchemaKey
+from datahub.errors import SchemaFieldKeyError
+from datahub.ingestion.source.common.subtypes import DatasetSubTypes
+from datahub.metadata.urns import (
+    CorpUserUrn,
+    DatasetUrn,
+    DomainUrn,
+    GlossaryTermUrn,
+    TagUrn,
+)
+from datahub.sdk._attribution import KnownAttribution, change_default_attribution
+from datahub.sdk._entity import Entity
+from datahub.sdk.dataset import Dataset
+from tests.test_helpers import mce_helpers
+
+_GOLDEN_DIR = pathlib.Path(__file__).parent / "dataset_golden"
+
+
+def assert_entity_golden(
+    pytestconfig: pytest.Config, entity: Entity, golden_path: pathlib.Path
+) -> None:
+    mce_helpers.check_goldens_stream(
+        pytestconfig=pytestconfig,
+        outputs=entity._as_mcps(),
+        golden_path=golden_path,
+        ignore_order=False,
+    )
+
+
+def test_dataset_basic(pytestconfig: pytest.Config) -> None:
+    d = Dataset(
+        platform="bigquery",
+        name="proj.dataset.table",
+        subtype=DatasetSubTypes.TABLE,
+        schema=[
+            ("field1", "string", "field1 description"),
+            ("field2", "int64", "field2 description"),
+        ],
+    )
+
+    # Check urn setup.
+    assert Dataset.get_urn_type() == DatasetUrn
+    assert isinstance(d.urn, DatasetUrn)
+    assert (
+        str(d.urn)
+        == "urn:li:dataset:(urn:li:dataPlatform:bigquery,proj.dataset.table,PROD)"
+    )
+    assert str(d.urn) in repr(d)
+
+    # Check most attributes.
+    assert d.platform_instance is None
+    assert d.tags is None
+    assert d.terms is None
+    assert d.created is None
+    assert d.last_modified is None
+    assert d.description is None
+    assert d.custom_properties == {}
+    assert d.domain is None
+
+    # TODO: The column descriptions should go in the editable fields, since we're not in ingestion mode.
+    assert len(d.schema) == 2
+    assert d["field1"].description == "field1 description"
+
+    with pytest.raises(SchemaFieldKeyError, match=r"Field .* not found"):
+        d["should_be_missing"]
+
+    with pytest.raises(AttributeError):
+        assert d.extra_attribute  # type: ignore
+    with pytest.raises(AttributeError):
+        d.extra_attribute = "slots should reject extra fields"  # type: ignore
+    with pytest.raises(AttributeError):
+        # This should fail. Eventually we should make it suggest calling set_owners instead.
+        d.owners = []  # type: ignore
+
+    assert_entity_golden(
+        pytestconfig, d, _GOLDEN_DIR / "test_dataset_basic_golden.json"
+    )
+
+
+def _build_complex_dataset() -> Dataset:
+    schema = SchemaKey(
+        platform="snowflake",
+        instance="my_instance",
+        database="MY_DB",
+        schema="MY_SCHEMA",
+    )
+
+    created = datetime(2025, 1, 2, 3, 4, 5, tzinfo=timezone.utc)
+    updated = datetime(2025, 1, 9, 3, 4, 6, tzinfo=timezone.utc)
+
+    d = Dataset(
+        platform="snowflake",
+        platform_instance="my_instance",
+        name="my_db.my_schema.my_table",
+        container=schema,
+        subtype=DatasetSubTypes.TABLE,
+        schema=[
+            ("field1", "string"),
+            ("field2", "int64", "field2 description"),
+        ],
+        display_name="MY_TABLE",
+        qualified_name="MY_DB.MY_SCHEMA.MY_TABLE",
+        created=created,
+        last_modified=updated,
+        custom_properties={
+            "key1": "value1",
+            "key2": "value2",
+        },
+        description="test",
+        external_url="https://example.com",
+        owners=[
+            CorpUserUrn("admin@datahubproject.io"),
+        ],
+        tags=[
+            TagUrn("tag1"),
+            TagUrn("tag2"),
+        ],
+        terms=[
+            GlossaryTermUrn("AccountBalance"),
+        ],
+        domain=DomainUrn("Marketing"),
+    )
+    assert d.platform_instance is not None
+    assert (
+        str(d.platform_instance)
+        == "urn:li:dataPlatformInstance:(urn:li:dataPlatform:snowflake,my_instance)"
+    )
+    assert d.subtype == "Table"
+    assert d.description == "test"
+    assert d.display_name == "MY_TABLE"
+    assert d.qualified_name == "MY_DB.MY_SCHEMA.MY_TABLE"
+    assert d.external_url == "https://example.com"
+    assert d.created == created
+    assert d.last_modified == updated
+    assert d.custom_properties == {"key1": "value1", "key2": "value2"}
+
+    # Check standard aspects.
+    assert d.domain == DomainUrn("Marketing")
+    assert d.tags is not None
+    assert len(d.tags) == 2
+    assert d.terms is not None
+    assert len(d.terms) == 1
+    assert d.owners is not None
+    assert len(d.owners) == 1
+
+    assert len(d.schema) == 2
+
+    # Schema field description.
+    assert d["field1"].description is None
+    assert d["field2"].description == "field2 description"
+    d["field1"].set_description("field1 description")
+    assert d["field1"].description == "field1 description"
+
+    # Schema field tags.
+    assert d["field1"].tags is None
+    d["field1"].set_tags([TagUrn("field1_tag1"), TagUrn("field1_tag2")])
+    assert d["field1"].tags is not None
+    assert len(d["field1"].tags) == 2
+
+    # Schema field terms.
+    assert d["field2"].terms is None
+    d["field2"].set_terms(
+        [GlossaryTermUrn("field2_term1"), GlossaryTermUrn("field2_term2")]
+    )
+    assert d["field2"].terms is not None
+    assert len(d["field2"].terms) == 2
+
+    return d
+
+
+def test_dataset_complex(pytestconfig: pytest.Config) -> None:
+    d = _build_complex_dataset()
+    assert_entity_golden(
+        pytestconfig, d, _GOLDEN_DIR / "test_dataset_complex_golden.json"
+    )
+
+
+def test_dataset_ingestion(pytestconfig: pytest.Config) -> None:
+    with change_default_attribution(KnownAttribution.INGESTION):
+        d = _build_complex_dataset()
+
+        assert_entity_golden(
+            pytestconfig, d, _GOLDEN_DIR / "test_dataset_ingestion_golden.json"
+        )
diff --git a/metadata-ingestion/tests/unit/sdk_v2/test_entity_client.py b/metadata-ingestion/tests/unit/sdk_v2/test_entity_client.py
new file mode 100644
index 00000000000000..2218ef2f909448
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sdk_v2/test_entity_client.py
@@ -0,0 +1,142 @@
+import pathlib
+from unittest.mock import Mock
+
+import pytest
+
+import datahub.metadata.schema_classes as models
+from datahub.emitter.mcp_builder import DatabaseKey, SchemaKey
+from datahub.errors import ItemNotFoundError, SdkUsageError
+from datahub.ingestion.graph.client import DataHubGraph
+from datahub.metadata.urns import DatasetUrn, TagUrn
+from datahub.sdk.container import Container
+from datahub.sdk.dataset import Dataset
+from datahub.sdk.main_client import DataHubClient
+from tests.test_helpers import mce_helpers
+
+_GOLDEN_DIR = pathlib.Path(__file__).parent / "entity_client_goldens"
+
+
+@pytest.fixture
+def mock_graph() -> Mock:
+    graph = Mock(spec=DataHubGraph)
+    graph.exists.return_value = False
+    return graph
+
+
+@pytest.fixture
+def client(mock_graph: Mock) -> DataHubClient:
+    return DataHubClient(graph=mock_graph)
+
+
+def assert_client_golden(
+    pytestconfig: pytest.Config,
+    client: DataHubClient,
+    golden_path: pathlib.Path,
+) -> None:
+    mcps = client._graph.emit_mcps.call_args[0][0]  # type: ignore
+    mce_helpers.check_goldens_stream(
+        pytestconfig=pytestconfig,
+        outputs=mcps,
+        golden_path=golden_path,
+        ignore_order=False,
+    )
+
+
+def test_container_creation_flow(
+    pytestconfig: pytest.Config, client: DataHubClient, mock_graph: Mock
+) -> None:
+    # Create database and schema containers
+    db = DatabaseKey(platform="snowflake", database="test_db")
+    schema = SchemaKey(**db.dict(), schema="test_schema")
+
+    db_container = Container(db, display_name="test_db", subtype="Database")
+    schema_container = Container(schema, display_name="test_schema", subtype="Schema")
+
+    # Test database container creation
+    client.entities.upsert(db_container)
+    assert_client_golden(
+        pytestconfig, client, _GOLDEN_DIR / "test_container_db_golden.json"
+    )
+
+    # Test schema container creation
+    client.entities.upsert(schema_container)
+    assert_client_golden(
+        pytestconfig, client, _GOLDEN_DIR / "test_container_schema_golden.json"
+    )
+
+
+def test_dataset_creation(
+    pytestconfig: pytest.Config, client: DataHubClient, mock_graph: Mock
+) -> None:
+    schema = SchemaKey(platform="snowflake", database="test_db", schema="test_schema")
+
+    dataset = Dataset(
+        platform="snowflake",
+        name="test_db.test_schema.table_1",
+        env="prod",
+        container=schema,
+        schema=[
+            ("col1", "string"),
+            ("col2", "int"),
+        ],
+        description="test description",
+        tags=[TagUrn("tag1")],
+    )
+
+    client.entities.create(dataset)
+    assert_client_golden(
+        pytestconfig, client, _GOLDEN_DIR / "test_dataset_creation_golden.json"
+    )
+
+
+def test_dataset_read_modify_write(
+    pytestconfig: pytest.Config, client: DataHubClient, mock_graph: Mock
+) -> None:
+    # Setup mock for existing dataset
+    mock_graph.exists.return_value = True
+    dataset_urn = DatasetUrn(
+        platform="snowflake", name="test_db.test_schema.table_1", env="prod"
+    )
+
+    # Mock the get_entity_semityped response with initial state
+    mock_graph.get_entity_semityped.return_value = {
+        "datasetProperties": models.DatasetPropertiesClass(
+            description="original description",
+            customProperties={},
+            tags=[],
+        )
+    }
+
+    # Get and update dataset
+    dataset = client.entities.get(dataset_urn)
+    dataset.set_description("updated description")
+
+    client.entities.update(dataset)
+    assert_client_golden(
+        pytestconfig, client, _GOLDEN_DIR / "test_dataset_update_golden.json"
+    )
+
+
+def test_create_existing_dataset_fails(client: DataHubClient, mock_graph: Mock) -> None:
+    mock_graph.exists.return_value = True
+
+    dataset = Dataset(
+        platform="snowflake",
+        name="test_db.test_schema.table_1",
+        env="prod",
+        schema=[("col1", "string")],
+    )
+
+    with pytest.raises(SdkUsageError, match="Entity .* already exists"):
+        client.entities.create(dataset)
+
+
+def test_get_nonexistent_dataset_fails(client: DataHubClient, mock_graph: Mock) -> None:
+    mock_graph.exists.return_value = False
+
+    dataset_urn = DatasetUrn(
+        platform="snowflake", name="test_db.test_schema.missing_table", env="prod"
+    )
+
+    with pytest.raises(ItemNotFoundError, match="Entity .* not found"):
+        client.entities.get(dataset_urn)

From 4d998da861324f724075da98319561cccf7f468d Mon Sep 17 00:00:00 2001
From: remisalmon <salmon.remi@gmail.com>
Date: Thu, 6 Feb 2025 15:04:17 -0700
Subject: [PATCH 240/249] doc(dbt): Add missing dbt extra requirement to cli
 doc (#12568)

---
 docs/cli.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/cli.md b/docs/cli.md
index c9cd85fd0e8155..f332f77d9d21a5 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -735,7 +735,7 @@ Please see our [Integrations page](https://datahubproject.io/integrations) if yo
 | [bigquery](./generated/ingestion/sources/bigquery.md)                                          | `pip install 'acryl-datahub[bigquery]'`                    | BigQuery source                         |
 | [datahub-lineage-file](./generated/ingestion/sources/file-based-lineage.md)                    | _no additional dependencies_                               | Lineage File source                     |
 | [datahub-business-glossary](./generated/ingestion/sources/business-glossary.md)                | _no additional dependencies_                               | Business Glossary File source           |
-| [dbt](./generated/ingestion/sources/dbt.md)                                                    | _no additional dependencies_                               | dbt source                              |
+| [dbt](./generated/ingestion/sources/dbt.md)                                                    | `pip install 'acryl-datahub[dbt]'`                         | dbt source                              |
 | [dremio](./generated/ingestion/sources/dremio.md)                                              | `pip install 'acryl-datahub[dremio]'`                      | Dremio Source                           |
 | [druid](./generated/ingestion/sources/druid.md)                                                | `pip install 'acryl-datahub[druid]'`                       | Druid Source                            |
 | [feast](./generated/ingestion/sources/feast.md)                                                | `pip install 'acryl-datahub[feast]'`                       | Feast source (0.26.0)                   |

From 140b71f8fdc0d4ed7778e789ff144e815b1cca7a Mon Sep 17 00:00:00 2001
From: Pedro Silva <pedro@acryl.io>
Date: Fri, 7 Feb 2025 08:25:47 +0000
Subject: [PATCH 241/249] feat(docs): Add live secret reload in k8s remote
 executor page (#12541)

---
 .../setting-up-remote-ingestion-executor.md   | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/docs/managed-datahub/operator-guide/setting-up-remote-ingestion-executor.md b/docs/managed-datahub/operator-guide/setting-up-remote-ingestion-executor.md
index 68ba9af38dd2ea..e5b0562734273d 100644
--- a/docs/managed-datahub/operator-guide/setting-up-remote-ingestion-executor.md
+++ b/docs/managed-datahub/operator-guide/setting-up-remote-ingestion-executor.md
@@ -125,6 +125,50 @@ The Helm chart [datahub-executor-worker](https://executor-helm.acryl.io/index.ya
     --set image.tag=v0.3.1 \
     acryl datahub-executor-worker
   ```
+9. As of DataHub Cloud `v0.3.8.2` It is possible to pass secrets to ingestion recipes using Kubernetes Secret CRDs as shown below. This allows to update secrets at runtime without restarting Remote Executor process.
+  ```
+    # 1. Create K8s Secret object in remote executor namespace, e.g.
+    apiVersion: v1
+    kind: Secret
+    metadata:
+      name: datahub-secret-store
+    data:
+      REDSHIFT_PASSWORD: cmVkc2hpZnQtc2VjcmV0Cg==
+      SNOWFLAKE_PASSWORD: c25vd2ZsYWtlLXNlY3JldAo=
+    # 2. Add secret into your Remote Executor deployment:
+    extraVolumes:
+      - name: datahub-secret-store
+        secret:
+          secretName: datahub-secret-store
+    # 3. Mount it under /mnt/secrets directory
+    extraVolumeMounts:
+    - mountPath: /mnt/secrets
+      name: datahub-secret-store
+  ```
+You can then reference the mounted secrets directly in the ingestion recipe:
+```yaml
+source:
+    type: redshift
+    config:
+        host_port: '<redshift host:port>'
+        username: connector_test
+        table_lineage_mode: mixed
+        include_table_lineage: true
+        include_tables: true
+        include_views: true
+        profiling:
+            enabled: true
+            profile_table_level_only: false
+        stateful_ingestion:
+            enabled: true
+        password: '${REDSHIFT_PASSWORD}'
+``` 
+
+By default the executor will look for files mounted in `/mnt/secrets`, this is override-able by setting the env var: 
+`DATAHUB_EXECUTOR_FILE_SECRET_BASEDIR` to a different location (default: `/mnt/secrets`)
+
+These files are expected to be under 1MB in data by default. To increase this limit set a higher value using:
+`DATAHUB_EXECUTOR_FILE_SECRET_MAXLEN` (default: `1024768`, size in bytes)
 
 ## FAQ
 

From 180087f992e5c865e3f11ac7cf257cf0f011fe70 Mon Sep 17 00:00:00 2001
From: Mayuri Nehate <33225191+mayurinehate@users.noreply.github.com>
Date: Fri, 7 Feb 2025 14:21:31 +0530
Subject: [PATCH 242/249] fix(ingest): remove duplicate mcps,more typing
 (#12557)

---
 .../source/snowflake/snowflake_schema.py      |  10 +
 .../source/snowflake/snowflake_schema_gen.py  |  25 +-
 .../snowflake/snowflake_golden.json           | 289 ------------------
 3 files changed, 21 insertions(+), 303 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py
index c1d29127699aaf..e3cf7147fd27d8 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema.py
@@ -6,6 +6,7 @@
 from typing import Callable, Dict, Iterable, List, MutableMapping, Optional
 
 from datahub.ingestion.api.report import SupportsAsObj
+from datahub.ingestion.source.common.subtypes import DatasetSubTypes
 from datahub.ingestion.source.snowflake.constants import SnowflakeObjectDomain
 from datahub.ingestion.source.snowflake.snowflake_connection import SnowflakeConnection
 from datahub.ingestion.source.snowflake.snowflake_query import (
@@ -100,6 +101,9 @@ class SnowflakeTable(BaseTable):
     def is_hybrid(self) -> bool:
         return self.type is not None and self.type == "HYBRID TABLE"
 
+    def get_subtype(self) -> DatasetSubTypes:
+        return DatasetSubTypes.TABLE
+
 
 @dataclass
 class SnowflakeView(BaseView):
@@ -109,6 +113,9 @@ class SnowflakeView(BaseView):
     column_tags: Dict[str, List[SnowflakeTag]] = field(default_factory=dict)
     is_secure: bool = False
 
+    def get_subtype(self) -> DatasetSubTypes:
+        return DatasetSubTypes.VIEW
+
 
 @dataclass
 class SnowflakeSchema:
@@ -154,6 +161,9 @@ class SnowflakeStream:
     column_tags: Dict[str, List[SnowflakeTag]] = field(default_factory=dict)
     last_altered: Optional[datetime] = None
 
+    def get_subtype(self) -> DatasetSubTypes:
+        return DatasetSubTypes.SNOWFLAKE_STREAM
+
 
 class _SnowflakeTagCache:
     def __init__(self) -> None:
diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
index 0490b323bda9ea..03f83a4e7320ae 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_schema_gen.py
@@ -21,7 +21,6 @@
 from datahub.ingestion.source.aws.s3_util import make_s3_urn_for_lineage
 from datahub.ingestion.source.common.subtypes import (
     DatasetContainerSubTypes,
-    DatasetSubTypes,
 )
 from datahub.ingestion.source.snowflake.constants import (
     GENERIC_PERMISSION_ERROR_KEY,
@@ -467,7 +466,13 @@ def _process_schema(
                 context=f"{db_name}.{schema_name}",
             )
 
-    def _process_tags(self, snowflake_schema, schema_name, db_name, domain):
+    def _process_tags(
+        self,
+        snowflake_schema: SnowflakeSchema,
+        schema_name: str,
+        db_name: str,
+        domain: str,
+    ) -> None:
         snowflake_schema.tags = self.tag_extractor.get_tags_on_object(
             schema_name=schema_name, db_name=db_name, domain=domain
         )
@@ -837,15 +842,7 @@ def gen_dataset_workunits(
         if dpi_aspect:
             yield dpi_aspect
 
-        subTypes = SubTypes(
-            typeNames=(
-                [DatasetSubTypes.SNOWFLAKE_STREAM]
-                if isinstance(table, SnowflakeStream)
-                else [DatasetSubTypes.VIEW]
-                if isinstance(table, SnowflakeView)
-                else [DatasetSubTypes.TABLE]
-            )
-        )
+        subTypes = SubTypes(typeNames=[table.get_subtype()])
 
         yield MetadataChangeProposalWrapper(
             entityUrn=dataset_urn, aspect=subTypes
@@ -932,9 +929,9 @@ def get_dataset_properties(
                         "OWNER_ROLE_TYPE": table.owner_role_type,
                         "TABLE_NAME": table.table_name,
                         "BASE_TABLES": table.base_tables,
-                        "STALE_AFTER": table.stale_after.isoformat()
-                        if table.stale_after
-                        else None,
+                        "STALE_AFTER": (
+                            table.stale_after.isoformat() if table.stale_after else None
+                        ),
                     }.items()
                     if v
                 }
diff --git a/metadata-ingestion/tests/integration/snowflake/snowflake_golden.json b/metadata-ingestion/tests/integration/snowflake/snowflake_golden.json
index 4b3bd16deceeae..3e9a889640c973 100644
--- a/metadata-ingestion/tests/integration/snowflake/snowflake_golden.json
+++ b/metadata-ingestion/tests/integration/snowflake/snowflake_golden.json
@@ -4240,295 +4240,6 @@
         "lastRunId": "no-run-id-provided"
     }
 },
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "status",
-    "aspect": {
-        "json": {
-            "removed": false
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "schemaMetadata",
-    "aspect": {
-        "json": {
-            "schemaName": "test_db.test_schema.stream_1",
-            "platform": "urn:li:dataPlatform:snowflake",
-            "version": 0,
-            "created": {
-                "time": 0,
-                "actor": "urn:li:corpuser:unknown"
-            },
-            "lastModified": {
-                "time": 0,
-                "actor": "urn:li:corpuser:unknown"
-            },
-            "hash": "",
-            "platformSchema": {
-                "com.linkedin.schema.MySqlDDL": {
-                    "tableSchema": ""
-                }
-            },
-            "fields": [
-                {
-                    "fieldPath": "col_1",
-                    "nullable": false,
-                    "description": "Comment for column",
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.NumberType": {}
-                        }
-                    },
-                    "nativeDataType": "NUMBER(38,0)",
-                    "recursive": false,
-                    "isPartOfKey": false
-                },
-                {
-                    "fieldPath": "col_2",
-                    "nullable": false,
-                    "description": "Comment for column",
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.StringType": {}
-                        }
-                    },
-                    "nativeDataType": "VARCHAR(255)",
-                    "recursive": false,
-                    "isPartOfKey": false
-                },
-                {
-                    "fieldPath": "col_3",
-                    "nullable": false,
-                    "description": "Comment for column",
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.StringType": {}
-                        }
-                    },
-                    "nativeDataType": "VARCHAR(255)",
-                    "recursive": false,
-                    "isPartOfKey": false
-                },
-                {
-                    "fieldPath": "col_4",
-                    "nullable": false,
-                    "description": "Comment for column",
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.StringType": {}
-                        }
-                    },
-                    "nativeDataType": "VARCHAR(255)",
-                    "recursive": false,
-                    "isPartOfKey": false
-                },
-                {
-                    "fieldPath": "col_5",
-                    "nullable": false,
-                    "description": "Comment for column",
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.StringType": {}
-                        }
-                    },
-                    "nativeDataType": "VARCHAR(255)",
-                    "recursive": false,
-                    "isPartOfKey": false
-                },
-                {
-                    "fieldPath": "col_6",
-                    "nullable": false,
-                    "description": "Comment for column",
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.StringType": {}
-                        }
-                    },
-                    "nativeDataType": "VARCHAR(255)",
-                    "recursive": false,
-                    "isPartOfKey": false
-                },
-                {
-                    "fieldPath": "col_7",
-                    "nullable": false,
-                    "description": "Comment for column",
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.StringType": {}
-                        }
-                    },
-                    "nativeDataType": "VARCHAR(255)",
-                    "recursive": false,
-                    "isPartOfKey": false
-                },
-                {
-                    "fieldPath": "col_8",
-                    "nullable": false,
-                    "description": "Comment for column",
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.StringType": {}
-                        }
-                    },
-                    "nativeDataType": "VARCHAR(255)",
-                    "recursive": false,
-                    "isPartOfKey": false
-                },
-                {
-                    "fieldPath": "col_9",
-                    "nullable": false,
-                    "description": "Comment for column",
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.StringType": {}
-                        }
-                    },
-                    "nativeDataType": "VARCHAR(255)",
-                    "recursive": false,
-                    "isPartOfKey": false
-                },
-                {
-                    "fieldPath": "col_10",
-                    "nullable": false,
-                    "description": "Comment for column",
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.StringType": {}
-                        }
-                    },
-                    "nativeDataType": "VARCHAR(255)",
-                    "recursive": false,
-                    "isPartOfKey": false
-                },
-                {
-                    "fieldPath": "metadata$action",
-                    "nullable": false,
-                    "description": "Type of DML operation (INSERT/DELETE)",
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.StringType": {}
-                        }
-                    },
-                    "nativeDataType": "VARCHAR(10)",
-                    "recursive": false,
-                    "isPartOfKey": false
-                },
-                {
-                    "fieldPath": "metadata$isupdate",
-                    "nullable": false,
-                    "description": "Whether row is from UPDATE operation",
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.BooleanType": {}
-                        }
-                    },
-                    "nativeDataType": "BOOLEAN",
-                    "recursive": false,
-                    "isPartOfKey": false
-                },
-                {
-                    "fieldPath": "metadata$row_id",
-                    "nullable": false,
-                    "description": "Unique row identifier",
-                    "type": {
-                        "type": {
-                            "com.linkedin.schema.NumberType": {}
-                        }
-                    },
-                    "nativeDataType": "NUMBER(38,0)",
-                    "recursive": false,
-                    "isPartOfKey": false
-                }
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "datasetProperties",
-    "aspect": {
-        "json": {
-            "customProperties": {
-                "SOURCE_TYPE": "Table",
-                "TYPE": "DELTA",
-                "STALE": "false",
-                "MODE": "DEFAULT",
-                "OWNER_ROLE_TYPE": "ROLE",
-                "TABLE_NAME": "TEST_DB.TEST_SCHEMA.TABLE_1",
-                "BASE_TABLES": "TEST_DB.TEST_SCHEMA.TABLE_1",
-                "STALE_AFTER": "2021-06-22T00:00:00+00:00"
-            },
-            "externalUrl": "https://app.snowflake.com/ap-south-1.aws/abc12345/#/data/databases/TEST_DB/schemas/TEST_SCHEMA/view/STREAM_1/",
-            "name": "STREAM_1",
-            "qualifiedName": "TEST_DB.TEST_SCHEMA.STREAM_1",
-            "description": "Comment for Stream 1",
-            "created": {
-                "time": 1623110400000
-            },
-            "lastModified": {
-                "time": 1623110400000
-            },
-            "tags": []
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "container",
-    "aspect": {
-        "json": {
-            "container": "urn:li:container:94c696a054bab40b73e640a7f82e3b1c"
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
-        "lastRunId": "no-run-id-provided"
-    }
-},
-{
-    "entityType": "dataset",
-    "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",
-    "changeType": "UPSERT",
-    "aspectName": "subTypes",
-    "aspect": {
-        "json": {
-            "typeNames": [
-                "Snowflake Stream"
-            ]
-        }
-    },
-    "systemMetadata": {
-        "lastObserved": 1615443388097,
-        "runId": "snowflake-2025_01_28-00_01_52-5vkne0",
-        "lastRunId": "no-run-id-provided"
-    }
-},
 {
     "entityType": "dataset",
     "entityUrn": "urn:li:dataset:(urn:li:dataPlatform:snowflake,test_db.test_schema.stream_1,PROD)",

From bd47b11537b3aed220864d96777dfb40b48bc1f4 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Fri, 7 Feb 2025 16:11:04 +0530
Subject: [PATCH 243/249] doc: update doc of first release (#12574)

---
 docs/managed-datahub/release-notes/v_0_3_8.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/managed-datahub/release-notes/v_0_3_8.md b/docs/managed-datahub/release-notes/v_0_3_8.md
index 18a40915ad22a9..488ce0e7ac772e 100644
--- a/docs/managed-datahub/release-notes/v_0_3_8.md
+++ b/docs/managed-datahub/release-notes/v_0_3_8.md
@@ -3,7 +3,7 @@
 
 Release Availability Date
 ---
-21-Jan-2025
+29-Jan-2025
 
 Recommended CLI/SDK
 ---

From 9f27d5903fc98c9382ad004487d488955078270f Mon Sep 17 00:00:00 2001
From: Jay <159848059+jayacryl@users.noreply.github.com>
Date: Fri, 7 Feb 2025 10:58:02 -0500
Subject: [PATCH 244/249] fix(docs): need to restore indices when adding
 @Searchable (#12576)

---
 docs/modeling/extending-the-metadata-model.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/modeling/extending-the-metadata-model.md b/docs/modeling/extending-the-metadata-model.md
index 8b308fb65d243c..b1a8655481365c 100644
--- a/docs/modeling/extending-the-metadata-model.md
+++ b/docs/modeling/extending-the-metadata-model.md
@@ -361,6 +361,8 @@ It takes the following parameters:
 This annotation is applied to fields inside an Aspect. It instructs DataHub to index the field so it can be retrieved
 via the search APIs.
 
+:::note If you are adding @Searchable to a field that already has data, you'll want to restore indices [via api](https://datahubproject.io/docs/api/restli/restore-indices/) or [via upgrade step](https://github.com/datahub-project/datahub/blob/master/metadata-service/factories/src/main/java/com/linkedin/metadata/boot/steps/RestoreGlossaryIndices.java) to have it be populated with existing data.
+
 It takes the following parameters:
 
 - **fieldType**: string - The settings for how each field is indexed is defined by the field type. Each field type is

From 7c1954237fd61ea8f966cf1144e93c4ada7963ca Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Fri, 7 Feb 2025 08:21:56 -0800
Subject: [PATCH 245/249] fix(sdk): fix platform instance generation in the sdk
 (#12573)

---
 metadata-ingestion/src/datahub/sdk/_shared.py |   7 +
 .../src/datahub/sdk/container.py              |   2 +-
 .../tests/test_helpers/sdk_v2_helpers.py      |  17 ++
 .../test_container_basic_golden.json          |  52 ++++++
 .../test_container_complex_golden.json        | 157 ++++++++++++++++++
 .../test_dataset_complex_golden.json          |   4 +
 .../test_dataset_ingestion_golden.json        |   4 +
 .../tests/unit/sdk_v2/test_container.py       | 135 +++++++++++++++
 .../tests/unit/sdk_v2/test_dataset.py         |  14 +-
 9 files changed, 378 insertions(+), 14 deletions(-)
 create mode 100644 metadata-ingestion/tests/test_helpers/sdk_v2_helpers.py
 create mode 100644 metadata-ingestion/tests/unit/sdk_v2/container_golden/test_container_basic_golden.json
 create mode 100644 metadata-ingestion/tests/unit/sdk_v2/container_golden/test_container_complex_golden.json
 create mode 100644 metadata-ingestion/tests/unit/sdk_v2/test_container.py

diff --git a/metadata-ingestion/src/datahub/sdk/_shared.py b/metadata-ingestion/src/datahub/sdk/_shared.py
index 559b30ddd5288d..80651115cad5fc 100644
--- a/metadata-ingestion/src/datahub/sdk/_shared.py
+++ b/metadata-ingestion/src/datahub/sdk/_shared.py
@@ -212,6 +212,13 @@ def _set_container(self, container: Optional[ContainerInputType]) -> None:
             while parent_key is not None:
                 browse_path_reversed.append(parent_key.as_urn())
                 parent_key = parent_key.parent_key()
+            if container.instance is not None:
+                browse_path_reversed.append(
+                    DataPlatformInstanceUrn(
+                        container.platform, container.instance
+                    ).urn()
+                )
+
             browse_path = list(reversed(browse_path_reversed))
         else:
             container_urn = None
diff --git a/metadata-ingestion/src/datahub/sdk/container.py b/metadata-ingestion/src/datahub/sdk/container.py
index b4edae693bc9e7..0555773cd202f3 100644
--- a/metadata-ingestion/src/datahub/sdk/container.py
+++ b/metadata-ingestion/src/datahub/sdk/container.py
@@ -147,7 +147,7 @@ def display_name(self) -> str:
         return self._ensure_container_props().name
 
     def set_display_name(self, value: str) -> None:
-        self._ensure_container_props().name = value
+        self._ensure_container_props(name=value).name = value
 
     @property
     def description(self) -> Optional[str]:
diff --git a/metadata-ingestion/tests/test_helpers/sdk_v2_helpers.py b/metadata-ingestion/tests/test_helpers/sdk_v2_helpers.py
new file mode 100644
index 00000000000000..76715b93f1cf8b
--- /dev/null
+++ b/metadata-ingestion/tests/test_helpers/sdk_v2_helpers.py
@@ -0,0 +1,17 @@
+import pathlib
+
+import pytest
+
+from datahub.sdk._entity import Entity
+from tests.test_helpers import mce_helpers
+
+
+def assert_entity_golden(
+    pytestconfig: pytest.Config, entity: Entity, golden_path: pathlib.Path
+) -> None:
+    mce_helpers.check_goldens_stream(
+        pytestconfig=pytestconfig,
+        outputs=entity._as_mcps(),
+        golden_path=golden_path,
+        ignore_order=False,
+    )
diff --git a/metadata-ingestion/tests/unit/sdk_v2/container_golden/test_container_basic_golden.json b/metadata-ingestion/tests/unit/sdk_v2/container_golden/test_container_basic_golden.json
new file mode 100644
index 00000000000000..d812e83fa36e71
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sdk_v2/container_golden/test_container_basic_golden.json
@@ -0,0 +1,52 @@
+[
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:1e476e4c36434ae8a7ea78e467e5b59d",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "bigquery",
+                "database": "my_bq_project"
+            },
+            "name": "my_bq_project"
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:1e476e4c36434ae8a7ea78e467e5b59d",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:bigquery"
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:1e476e4c36434ae8a7ea78e467e5b59d",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": []
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:1e476e4c36434ae8a7ea78e467e5b59d",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Project"
+            ]
+        }
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sdk_v2/container_golden/test_container_complex_golden.json b/metadata-ingestion/tests/unit/sdk_v2/container_golden/test_container_complex_golden.json
new file mode 100644
index 00000000000000..6735cccdf5e879
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sdk_v2/container_golden/test_container_complex_golden.json
@@ -0,0 +1,157 @@
+[
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:66c5ac35f0bfc521dee6f7d9533a8056",
+    "changeType": "UPSERT",
+    "aspectName": "containerProperties",
+    "aspect": {
+        "json": {
+            "customProperties": {
+                "platform": "snowflake",
+                "instance": "my_instance",
+                "database": "MY_DB",
+                "schema": "MY_SCHEMA",
+                "key1": "value1",
+                "key2": "value2"
+            },
+            "externalUrl": "https://example.com",
+            "name": "MY_SCHEMA",
+            "qualifiedName": "MY_DB.MY_SCHEMA",
+            "description": "test",
+            "created": {
+                "time": 1735787045000
+            },
+            "lastModified": {
+                "time": 1736391846000
+            }
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:66c5ac35f0bfc521dee6f7d9533a8056",
+    "changeType": "UPSERT",
+    "aspectName": "dataPlatformInstance",
+    "aspect": {
+        "json": {
+            "platform": "urn:li:dataPlatform:snowflake",
+            "instance": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:snowflake,my_instance)"
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:66c5ac35f0bfc521dee6f7d9533a8056",
+    "changeType": "UPSERT",
+    "aspectName": "container",
+    "aspect": {
+        "json": {
+            "container": "urn:li:container:37d6500021cda2a0aa7ae1900eab5a9c"
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:66c5ac35f0bfc521dee6f7d9533a8056",
+    "changeType": "UPSERT",
+    "aspectName": "browsePathsV2",
+    "aspect": {
+        "json": {
+            "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:snowflake,my_instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:snowflake,my_instance)"
+                },
+                {
+                    "id": "urn:li:container:37d6500021cda2a0aa7ae1900eab5a9c",
+                    "urn": "urn:li:container:37d6500021cda2a0aa7ae1900eab5a9c"
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:66c5ac35f0bfc521dee6f7d9533a8056",
+    "changeType": "UPSERT",
+    "aspectName": "subTypes",
+    "aspect": {
+        "json": {
+            "typeNames": [
+                "Schema"
+            ]
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:66c5ac35f0bfc521dee6f7d9533a8056",
+    "changeType": "UPSERT",
+    "aspectName": "ownership",
+    "aspect": {
+        "json": {
+            "owners": [
+                {
+                    "owner": "urn:li:corpuser:admin@datahubproject.io",
+                    "type": "TECHNICAL_OWNER"
+                }
+            ],
+            "ownerTypes": {},
+            "lastModified": {
+                "time": 0,
+                "actor": "urn:li:corpuser:unknown"
+            }
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:66c5ac35f0bfc521dee6f7d9533a8056",
+    "changeType": "UPSERT",
+    "aspectName": "globalTags",
+    "aspect": {
+        "json": {
+            "tags": [
+                {
+                    "tag": "urn:li:tag:tag1"
+                },
+                {
+                    "tag": "urn:li:tag:tag2"
+                }
+            ]
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:66c5ac35f0bfc521dee6f7d9533a8056",
+    "changeType": "UPSERT",
+    "aspectName": "glossaryTerms",
+    "aspect": {
+        "json": {
+            "terms": [
+                {
+                    "urn": "urn:li:glossaryTerm:AccountBalance"
+                }
+            ],
+            "auditStamp": {
+                "time": 0,
+                "actor": "urn:li:corpuser:__ingestion"
+            }
+        }
+    }
+},
+{
+    "entityType": "container",
+    "entityUrn": "urn:li:container:66c5ac35f0bfc521dee6f7d9533a8056",
+    "changeType": "UPSERT",
+    "aspectName": "domains",
+    "aspect": {
+        "json": {
+            "domains": [
+                "urn:li:domain:Marketing"
+            ]
+        }
+    }
+}
+]
\ No newline at end of file
diff --git a/metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_complex_golden.json b/metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_complex_golden.json
index 3b96b4d26ed2e1..b224c8c7090dd3 100644
--- a/metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_complex_golden.json
+++ b/metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_complex_golden.json
@@ -138,6 +138,10 @@
     "aspect": {
         "json": {
             "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:snowflake,my_instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:snowflake,my_instance)"
+                },
                 {
                     "id": "urn:li:container:37d6500021cda2a0aa7ae1900eab5a9c",
                     "urn": "urn:li:container:37d6500021cda2a0aa7ae1900eab5a9c"
diff --git a/metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_ingestion_golden.json b/metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_ingestion_golden.json
index 3325e5e080e7a1..ca3a9a6d64bbe7 100644
--- a/metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_ingestion_golden.json
+++ b/metadata-ingestion/tests/unit/sdk_v2/dataset_golden/test_dataset_ingestion_golden.json
@@ -145,6 +145,10 @@
     "aspect": {
         "json": {
             "path": [
+                {
+                    "id": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:snowflake,my_instance)",
+                    "urn": "urn:li:dataPlatformInstance:(urn:li:dataPlatform:snowflake,my_instance)"
+                },
                 {
                     "id": "urn:li:container:37d6500021cda2a0aa7ae1900eab5a9c",
                     "urn": "urn:li:container:37d6500021cda2a0aa7ae1900eab5a9c"
diff --git a/metadata-ingestion/tests/unit/sdk_v2/test_container.py b/metadata-ingestion/tests/unit/sdk_v2/test_container.py
new file mode 100644
index 00000000000000..3cd2d928fac08c
--- /dev/null
+++ b/metadata-ingestion/tests/unit/sdk_v2/test_container.py
@@ -0,0 +1,135 @@
+import pathlib
+from datetime import datetime, timezone
+
+import pytest
+
+from datahub.emitter.mcp_builder import DatabaseKey, SchemaKey
+from datahub.ingestion.source.common.subtypes import (
+    DatasetContainerSubTypes,
+)
+from datahub.metadata.urns import (
+    ContainerUrn,
+    CorpUserUrn,
+    DomainUrn,
+    GlossaryTermUrn,
+    TagUrn,
+)
+from datahub.sdk.container import Container
+from tests.test_helpers.sdk_v2_helpers import assert_entity_golden
+
+_GOLDEN_DIR = pathlib.Path(__file__).parent / "container_golden"
+
+
+def test_container_basic(pytestconfig: pytest.Config) -> None:
+    db_key = DatabaseKey(
+        platform="bigquery",
+        database="my_bq_project",
+    )
+
+    c = Container(
+        db_key,
+        display_name="my_bq_project",
+        subtype=DatasetContainerSubTypes.BIGQUERY_PROJECT,
+    )
+
+    # Check urn setup.
+    assert Container.get_urn_type() == ContainerUrn
+    assert isinstance(c.urn, ContainerUrn)
+    assert str(c.urn) == "urn:li:container:1e476e4c36434ae8a7ea78e467e5b59d"
+    assert str(c.urn) in repr(c)
+
+    # Check most attributes.
+    assert c.platform_instance is None
+    assert c.tags is None
+    assert c.terms is None
+    assert c.created is None
+    assert c.last_modified is None
+    assert c.description is None
+    assert c.custom_properties == {
+        "platform": "bigquery",
+        "database": "my_bq_project",
+    }
+    assert c.domain is None
+
+    # Check slots.
+    with pytest.raises(AttributeError):
+        assert c.extra_attribute  # type: ignore
+    with pytest.raises(AttributeError):
+        c.extra_attribute = "slots should reject extra fields"  # type: ignore
+    with pytest.raises(AttributeError):
+        # This should fail. Eventually we should make it suggest calling set_owners instead.
+        c.owners = []  # type: ignore
+
+    assert_entity_golden(
+        pytestconfig, c, _GOLDEN_DIR / "test_container_basic_golden.json"
+    )
+
+
+def test_container_complex(pytestconfig: pytest.Config) -> None:
+    schema_key = SchemaKey(
+        platform="snowflake",
+        instance="my_instance",
+        database="MY_DB",
+        schema="MY_SCHEMA",
+    )
+    created = datetime(2025, 1, 2, 3, 4, 5, tzinfo=timezone.utc)
+    updated = datetime(2025, 1, 9, 3, 4, 6, tzinfo=timezone.utc)
+
+    d = Container(
+        schema_key,
+        display_name="MY_SCHEMA",
+        qualified_name="MY_DB.MY_SCHEMA",
+        subtype=DatasetContainerSubTypes.SCHEMA,
+        created=created,
+        last_modified=updated,
+        extra_properties={
+            "key1": "value1",
+            "key2": "value2",
+        },
+        description="test",
+        external_url="https://example.com",
+        owners=[
+            CorpUserUrn("admin@datahubproject.io"),
+        ],
+        tags=[
+            TagUrn("tag1"),
+            TagUrn("tag2"),
+        ],
+        terms=[
+            GlossaryTermUrn("AccountBalance"),
+        ],
+        domain=DomainUrn("Marketing"),
+    )
+    assert d.platform_instance is not None
+    assert (
+        str(d.platform_instance)
+        == "urn:li:dataPlatformInstance:(urn:li:dataPlatform:snowflake,my_instance)"
+    )
+    assert d.subtype == "Schema"
+    assert d.description == "test"
+    assert d.display_name == "MY_SCHEMA"
+    assert d.qualified_name == "MY_DB.MY_SCHEMA"
+    assert d.external_url == "https://example.com"
+    assert d.created == created
+    assert d.last_modified == updated
+    assert d.custom_properties == {
+        "platform": "snowflake",
+        "instance": "my_instance",
+        "database": "MY_DB",
+        "schema": "MY_SCHEMA",
+        "key1": "value1",
+        "key2": "value2",
+    }
+
+    # Check standard aspects.
+    assert d.domain == DomainUrn("Marketing")
+    assert d.tags is not None
+    assert len(d.tags) == 2
+    assert d.terms is not None
+    assert len(d.terms) == 1
+    assert d.owners is not None
+    assert len(d.owners) == 1
+
+    assert_entity_golden(
+        pytestconfig, d, _GOLDEN_DIR / "test_container_complex_golden.json"
+    )
diff --git a/metadata-ingestion/tests/unit/sdk_v2/test_dataset.py b/metadata-ingestion/tests/unit/sdk_v2/test_dataset.py
index da041ba3d4e303..d64302d8fdd911 100644
--- a/metadata-ingestion/tests/unit/sdk_v2/test_dataset.py
+++ b/metadata-ingestion/tests/unit/sdk_v2/test_dataset.py
@@ -14,24 +14,12 @@
     TagUrn,
 )
 from datahub.sdk._attribution import KnownAttribution, change_default_attribution
-from datahub.sdk._entity import Entity
 from datahub.sdk.dataset import Dataset
-from tests.test_helpers import mce_helpers
+from tests.test_helpers.sdk_v2_helpers import assert_entity_golden
 
 _GOLDEN_DIR = pathlib.Path(__file__).parent / "dataset_golden"
 
 
-def assert_entity_golden(
-    pytestconfig: pytest.Config, entity: Entity, golden_path: pathlib.Path
-) -> None:
-    mce_helpers.check_goldens_stream(
-        pytestconfig=pytestconfig,
-        outputs=entity._as_mcps(),
-        golden_path=golden_path,
-        ignore_order=False,
-    )
-
-
 def test_dataset_basic(pytestconfig: pytest.Config) -> None:
     d = Dataset(
         platform="bigquery",

From 390a672b52a8b3a4cb7ad5c8808595ef0ba99944 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Fri, 7 Feb 2025 10:51:23 -0800
Subject: [PATCH 246/249] fix(looker): sort user mapping for consistency
 (#12569)

---
 .../src/datahub/ingestion/source/looker/looker_common.py     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_common.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_common.py
index abe9b5684f8f1f..950c1ccf5bfb41 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_common.py
@@ -1673,10 +1673,11 @@ def to_platform_resource(
                 primary_key="",
             )
 
-            # Extract user email mappings
+            # Extract user email mappings.
+            # Sort it to ensure the order is deterministic.
             user_email_cache = {
                 user_id: user.email
-                for user_id, user in self._user_cache.items()
+                for user_id, user in sorted(self._user_cache.items())
                 if user.email
             }
 

From 45c81233c997981ec7bbb83719e6138e36621c5e Mon Sep 17 00:00:00 2001
From: Brock Griffey <52086127+brock-acryl@users.noreply.github.com>
Date: Fri, 7 Feb 2025 14:07:08 -0500
Subject: [PATCH 247/249] fix(ingestion/teradata): teradata profiling fix for
 pooling  (#12507)

---
 .../datahub/ingestion/source/sql/sql_common.py   | 16 ++++++++++------
 .../src/datahub/ingestion/source/sql/teradata.py | 12 ++++++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/sql_common.py b/metadata-ingestion/src/datahub/ingestion/source/sql/sql_common.py
index a0bd9ce0760bd1..5b1b9b1c2952c3 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/sql_common.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/sql_common.py
@@ -352,6 +352,15 @@ def __init__(self, config: SQLCommonConfig, ctx: PipelineContext, platform: str)
         )
         self.report.sql_aggregator = self.aggregator.report
 
+    def _add_default_options(self, sql_config: SQLCommonConfig) -> None:
+        """Add default SQLAlchemy options. Can be overridden by subclasses to add additional defaults."""
+        # Extra default SQLAlchemy option for better connection pooling and threading.
+        # https://docs.sqlalchemy.org/en/14/core/pooling.html#sqlalchemy.pool.QueuePool.params.max_overflow
+        if sql_config.is_profiling_enabled():
+            sql_config.options.setdefault(
+                "max_overflow", sql_config.profiling.max_workers
+            )
+
     @classmethod
     def test_connection(cls, config_dict: dict) -> TestConnectionReport:
         test_report = TestConnectionReport()
@@ -519,12 +528,7 @@ def get_workunits_internal(self) -> Iterable[Union[MetadataWorkUnit, SqlWorkUnit
             # Known issue with sqlalchemy https://stackoverflow.com/questions/60804288/pycharm-duplicated-log-for-sqlalchemy-echo-true
             sqlalchemy_log._add_default_handler = lambda x: None  # type: ignore
 
-        # Extra default SQLAlchemy option for better connection pooling and threading.
-        # https://docs.sqlalchemy.org/en/14/core/pooling.html#sqlalchemy.pool.QueuePool.params.max_overflow
-        if sql_config.is_profiling_enabled():
-            sql_config.options.setdefault(
-                "max_overflow", sql_config.profiling.max_workers
-            )
+        self._add_default_options(sql_config)
 
         for inspector in self.get_inspectors():
             profiler = None
diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/teradata.py b/metadata-ingestion/src/datahub/ingestion/source/sql/teradata.py
index e6319f668ecb8c..c52eceb726955e 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/teradata.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/teradata.py
@@ -22,6 +22,7 @@
 from sqlalchemy.engine import Engine
 from sqlalchemy.engine.base import Connection
 from sqlalchemy.engine.reflection import Inspector
+from sqlalchemy.pool import QueuePool
 from sqlalchemy.sql.expression import text
 from teradatasqlalchemy.dialect import TeradataDialect
 from teradatasqlalchemy.options import configure
@@ -678,6 +679,16 @@ def __init__(self, config: TeradataConfig, ctx: PipelineContext):
             if self.config.stateful_ingestion:
                 self.config.stateful_ingestion.remove_stale_metadata = False
 
+    def _add_default_options(self, sql_config: SQLCommonConfig) -> None:
+        """Add Teradata-specific default options"""
+        super()._add_default_options(sql_config)
+        if sql_config.is_profiling_enabled():
+            # Sqlalchemy uses QueuePool by default however Teradata uses SingletonThreadPool.
+            # SingletonThreadPool does not support parellel connections. For using profiling, we need to use QueuePool.
+            # https://docs.sqlalchemy.org/en/20/core/pooling.html#connection-pool-configuration
+            # https://github.com/Teradata/sqlalchemy-teradata/issues/96
+            sql_config.options.setdefault("poolclass", QueuePool)
+
     @classmethod
     def create(cls, config_dict, ctx):
         config = TeradataConfig.parse_obj(config_dict)
@@ -705,6 +716,7 @@ def get_inspectors(self):
         # This method can be overridden in the case that you want to dynamically
         # run on multiple databases.
         url = self.config.get_sql_alchemy_url()
+
         logger.debug(f"sql_alchemy_url={url}")
         engine = create_engine(url, **self.config.options)
         with engine.connect() as conn:

From 03f1f2d3e2093c22e65b286fe095c7f4d28f0232 Mon Sep 17 00:00:00 2001
From: Chris Collins <chriscollins3456@gmail.com>
Date: Fri, 7 Feb 2025 16:36:46 -0500
Subject: [PATCH 248/249] fix(structuredProps) Add validation for allowedTypes
 and harden API for invalid types (#12578)

---
 .../types/entitytype/EntityTypeUrnMapper.java |   4 +
 .../StructuredPropertyMapper.java             |  18 ++-
 .../PropertyDefinitionValidator.java          |  55 ++++++++-
 .../PropertyDefinitionValidatorTest.java      | 112 ++++++++++++++++++
 4 files changed, 186 insertions(+), 3 deletions(-)

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapper.java
index 334faf753cb8b5..205b6b7d11443e 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/entitytype/EntityTypeUrnMapper.java
@@ -111,4 +111,8 @@ public static String getEntityTypeUrn(String name) {
     }
     return ENTITY_NAME_TO_ENTITY_TYPE_URN.get(name);
   }
+
+  public static boolean isValidEntityType(String entityTypeUrn) {
+    return ENTITY_TYPE_URN_TO_NAME.containsKey(entityTypeUrn);
+  }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/structuredproperty/StructuredPropertyMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/structuredproperty/StructuredPropertyMapper.java
index 5dc73d9ad09388..98d48d7aa143e3 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/structuredproperty/StructuredPropertyMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/structuredproperty/StructuredPropertyMapper.java
@@ -20,6 +20,7 @@
 import com.linkedin.datahub.graphql.generated.StructuredPropertySettings;
 import com.linkedin.datahub.graphql.generated.TypeQualifier;
 import com.linkedin.datahub.graphql.types.common.mappers.util.MappingHelper;
+import com.linkedin.datahub.graphql.types.entitytype.EntityTypeUrnMapper;
 import com.linkedin.datahub.graphql.types.mappers.MapperUtils;
 import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
 import com.linkedin.entity.EntityResponse;
@@ -30,7 +31,9 @@
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 public class StructuredPropertyMapper
     implements ModelMapper<EntityResponse, StructuredPropertyEntity> {
 
@@ -141,8 +144,21 @@ private TypeQualifier mapTypeQualifier(final StringArrayMap gmsTypeQualifier) {
     final TypeQualifier typeQualifier = new TypeQualifier();
     List<String> allowedTypes = gmsTypeQualifier.get(ALLOWED_TYPES);
     if (allowedTypes != null) {
+      // filter out correct allowedTypes
+      List<String> validAllowedTypes =
+          allowedTypes.stream()
+              .filter(EntityTypeUrnMapper::isValidEntityType)
+              .collect(Collectors.toList());
+      if (validAllowedTypes.size() != allowedTypes.size()) {
+        log.error(
+            String.format(
+                "Property has invalid allowed types set. Current list of allowed types: %s",
+                allowedTypes));
+      }
       typeQualifier.setAllowedTypes(
-          allowedTypes.stream().map(this::createEntityTypeEntity).collect(Collectors.toList()));
+          validAllowedTypes.stream()
+              .map(this::createEntityTypeEntity)
+              .collect(Collectors.toList()));
     }
     return typeQualifier;
   }
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/structuredproperties/validation/PropertyDefinitionValidator.java b/metadata-io/src/main/java/com/linkedin/metadata/structuredproperties/validation/PropertyDefinitionValidator.java
index 6e047c12da9a9f..18553d6930b8d4 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/structuredproperties/validation/PropertyDefinitionValidator.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/structuredproperties/validation/PropertyDefinitionValidator.java
@@ -1,13 +1,14 @@
 package com.linkedin.metadata.structuredproperties.validation;
 
-import static com.linkedin.metadata.Constants.STATUS_ASPECT_NAME;
-import static com.linkedin.metadata.Constants.STRUCTURED_PROPERTY_DEFINITION_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.*;
 import static com.linkedin.structured.PropertyCardinality.*;
 
 import com.google.common.collect.ImmutableSet;
 import com.linkedin.common.Status;
 import com.linkedin.common.urn.Urn;
+import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.data.template.GetMode;
+import com.linkedin.data.template.StringArrayMap;
 import com.linkedin.entity.Aspect;
 import com.linkedin.metadata.Constants;
 import com.linkedin.metadata.aspect.AspectRetriever;
@@ -24,6 +25,8 @@
 import com.linkedin.structured.StructuredPropertyDefinition;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -42,6 +45,8 @@
 public class PropertyDefinitionValidator extends AspectPayloadValidator {
   private AspectPluginConfig config;
 
+  private static String ALLOWED_TYPES = "allowedTypes";
+
   /**
    * Prevent deletion of the definition or key aspect (only soft delete)
    *
@@ -92,6 +97,9 @@ public static Stream<AspectValidationException> validateDefinitionUpserts(
       urnIdCheck(item).ifPresent(exceptions::addException);
       qualifiedNameCheck(item, newDefinition.getQualifiedName())
           .ifPresent(exceptions::addException);
+      allowedTypesCheck(
+              item, newDefinition.getTypeQualifier(), retrieverContext.getAspectRetriever())
+          .ifPresent(exceptions::addException);
 
       if (item.getPreviousSystemAspect() != null) {
 
@@ -211,4 +219,47 @@ private static Optional<AspectValidationException> qualifiedNameCheck(
     }
     return Optional.empty();
   }
+
+  private static Optional<AspectValidationException> allowedTypesCheck(
+      MCPItem item, @Nullable StringArrayMap typeQualifier, AspectRetriever aspectRetriever) {
+    if (typeQualifier == null || typeQualifier.get(ALLOWED_TYPES) == null) {
+      return Optional.empty();
+    }
+    List<String> allowedTypes = typeQualifier.get(ALLOWED_TYPES);
+    try {
+      List<Urn> allowedTypesUrns =
+          allowedTypes.stream().map(UrnUtils::getUrn).collect(Collectors.toList());
+
+      // ensure all types are entityTypes
+      if (allowedTypesUrns.stream()
+          .anyMatch(t -> !t.getEntityType().equals(ENTITY_TYPE_ENTITY_NAME))) {
+        return Optional.of(
+            AspectValidationException.forItem(
+                item,
+                String.format(
+                    "Provided allowedType that is not an entityType entity. List of allowedTypes: %s",
+                    allowedTypes)));
+      }
+
+      // ensure all types exist as entities
+      Map<Urn, Boolean> existsMap = aspectRetriever.entityExists(new HashSet<>(allowedTypesUrns));
+      if (existsMap.containsValue(false)) {
+        return Optional.of(
+            AspectValidationException.forItem(
+                item,
+                String.format(
+                    "Provided allowedType that does not exist. List of allowedTypes: %s",
+                    allowedTypes)));
+      }
+    } catch (Exception e) {
+      return Optional.of(
+          AspectValidationException.forItem(
+              item,
+              String.format(
+                  "Issue resolving allowedTypes inside of typeQualifier. These must be entity type urns. List of allowedTypes: %s",
+                  allowedTypes)));
+    }
+
+    return Optional.empty();
+  }
 }
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/structuredproperties/validators/PropertyDefinitionValidatorTest.java b/metadata-io/src/test/java/com/linkedin/metadata/structuredproperties/validators/PropertyDefinitionValidatorTest.java
index 18949f0566dd19..681b31a2dbc7f1 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/structuredproperties/validators/PropertyDefinitionValidatorTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/structuredproperties/validators/PropertyDefinitionValidatorTest.java
@@ -1,5 +1,6 @@
 package com.linkedin.metadata.structuredproperties.validators;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
@@ -8,6 +9,8 @@
 import com.linkedin.common.urn.Urn;
 import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.data.template.SetMode;
+import com.linkedin.data.template.StringArray;
+import com.linkedin.data.template.StringArrayMap;
 import com.linkedin.metadata.aspect.AspectRetriever;
 import com.linkedin.metadata.aspect.GraphRetriever;
 import com.linkedin.metadata.aspect.RetrieverContext;
@@ -22,6 +25,7 @@
 import com.linkedin.test.metadata.aspect.TestEntityRegistry;
 import com.linkedin.test.metadata.aspect.batch.TestMCP;
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
@@ -37,6 +41,8 @@ public void init() {
     testPropertyUrn = UrnUtils.getUrn("urn:li:structuredProperty:foo.bar");
     AspectRetriever mockAspectRetriever = mock(AspectRetriever.class);
     when(mockAspectRetriever.getEntityRegistry()).thenReturn(entityRegistry);
+    HashMap<Urn, Boolean> map = new HashMap<>();
+    when(mockAspectRetriever.entityExists(any())).thenReturn(map);
     GraphRetriever mockGraphRetriever = mock(GraphRetriever.class);
     mockRetrieverContext = mock(RetrieverContext.class);
     when(mockRetrieverContext.getAspectRetriever()).thenReturn(mockAspectRetriever);
@@ -433,4 +439,110 @@ public void testQualifiedNameWithSpace()
             .count(),
         1);
   }
+
+  @Test
+  public void testValidAllowedTypes()
+      throws URISyntaxException, CloneNotSupportedException, AspectValidationException {
+    Urn propertyUrn = UrnUtils.getUrn("urn:li:structuredProperty:foo.bar");
+    StructuredPropertyDefinition newProperty = createValidPropertyDefinition();
+    StringArrayMap typeQualifier = new StringArrayMap();
+    typeQualifier.put("allowedTypes", new StringArray("urn:li:entityType:datahub.dataset"));
+    newProperty.setTypeQualifier(typeQualifier);
+    assertEquals(
+        PropertyDefinitionValidator.validateDefinitionUpserts(
+                TestMCP.ofOneMCP(propertyUrn, null, newProperty, entityRegistry),
+                mockRetrieverContext)
+            .count(),
+        0);
+  }
+
+  @Test
+  public void testInvalidUrnsInAllowedTypes()
+      throws URISyntaxException, CloneNotSupportedException, AspectValidationException {
+    Urn propertyUrn = UrnUtils.getUrn("urn:li:structuredProperty:foo.bar");
+    StructuredPropertyDefinition newProperty = createValidPropertyDefinition();
+    StringArrayMap typeQualifier = new StringArrayMap();
+    // invalid urn here
+    typeQualifier.put("allowedTypes", new StringArray("invalidUrn"));
+    newProperty.setTypeQualifier(typeQualifier);
+    assertEquals(
+        PropertyDefinitionValidator.validateDefinitionUpserts(
+                TestMCP.ofOneMCP(propertyUrn, null, newProperty, entityRegistry),
+                mockRetrieverContext)
+            .count(),
+        1);
+  }
+
+  @Test
+  public void testNotEntityTypeInAllowedTypes()
+      throws URISyntaxException, CloneNotSupportedException, AspectValidationException {
+    Urn propertyUrn = UrnUtils.getUrn("urn:li:structuredProperty:foo.bar");
+    StructuredPropertyDefinition newProperty = createValidPropertyDefinition();
+    StringArrayMap typeQualifier = new StringArrayMap();
+    // urn that is not an entityType
+    typeQualifier.put("allowedTypes", new StringArray("urn:li:dataPlatform:snowflake"));
+    newProperty.setTypeQualifier(typeQualifier);
+    assertEquals(
+        PropertyDefinitionValidator.validateDefinitionUpserts(
+                TestMCP.ofOneMCP(propertyUrn, null, newProperty, entityRegistry),
+                mockRetrieverContext)
+            .count(),
+        1);
+  }
+
+  @Test
+  public void testEntityTypeDoesNotExistInAllowedTypes()
+      throws URISyntaxException, CloneNotSupportedException, AspectValidationException {
+    AspectRetriever mockAspectRetriever = mock(AspectRetriever.class);
+    when(mockAspectRetriever.getEntityRegistry()).thenReturn(entityRegistry);
+    HashMap<Urn, Boolean> map = new HashMap<>();
+    map.put(UrnUtils.getUrn("urn:li:entityType:datahub.fakeEntity"), false);
+    when(mockAspectRetriever.entityExists(any())).thenReturn(map);
+    GraphRetriever mockGraphRetriever = mock(GraphRetriever.class);
+    RetrieverContext retrieverContext = mock(RetrieverContext.class);
+    when(retrieverContext.getAspectRetriever()).thenReturn(mockAspectRetriever);
+    when(retrieverContext.getGraphRetriever()).thenReturn(mockGraphRetriever);
+
+    Urn propertyUrn = UrnUtils.getUrn("urn:li:structuredProperty:foo.bar");
+    StructuredPropertyDefinition newProperty = createValidPropertyDefinition();
+    StringArrayMap typeQualifier = new StringArrayMap();
+    // urn that doesn't exist
+    typeQualifier.put("allowedTypes", new StringArray("urn:li:entityType:datahub.fakeEntity"));
+    newProperty.setTypeQualifier(typeQualifier);
+    assertEquals(
+        PropertyDefinitionValidator.validateDefinitionUpserts(
+                TestMCP.ofOneMCP(propertyUrn, null, newProperty, entityRegistry), retrieverContext)
+            .count(),
+        1);
+  }
+
+  @Test
+  public void testAllowedTypesMixOfValidAndInvalid()
+      throws URISyntaxException, CloneNotSupportedException, AspectValidationException {
+    Urn propertyUrn = UrnUtils.getUrn("urn:li:structuredProperty:foo.bar");
+    StructuredPropertyDefinition newProperty = createValidPropertyDefinition();
+    StringArrayMap typeQualifier = new StringArrayMap();
+    // urn that is not an entityType
+    typeQualifier.put(
+        "allowedTypes",
+        new StringArray("urn:li:entityType:datahub.dataset", "urn:li:dataPlatform:snowflake"));
+    newProperty.setTypeQualifier(typeQualifier);
+    assertEquals(
+        PropertyDefinitionValidator.validateDefinitionUpserts(
+                TestMCP.ofOneMCP(propertyUrn, null, newProperty, entityRegistry),
+                mockRetrieverContext)
+            .count(),
+        1);
+  }
+
+  private StructuredPropertyDefinition createValidPropertyDefinition() throws URISyntaxException {
+    StructuredPropertyDefinition newProperty = new StructuredPropertyDefinition();
+    newProperty.setEntityTypes(
+        new UrnArray(Urn.createFromString("urn:li:entityType:datahub.dataset")));
+    newProperty.setDisplayName("oldProp");
+    newProperty.setQualifiedName("foo.bar");
+    newProperty.setCardinality(PropertyCardinality.MULTIPLE);
+    newProperty.setValueType(Urn.createFromString("urn:li:dataType:datahub.urn"));
+    return newProperty;
+  }
 }

From 03bce475968636bbb35fe42929cdb3078b26d1cf Mon Sep 17 00:00:00 2001
From: kevinkarchacryl <kevin.karch@acryl.io>
Date: Fri, 7 Feb 2025 18:25:17 -0500
Subject: [PATCH 249/249] fix(ui): better experience for analytics charts
 (#12462)

---
 .../components/TimeSeriesChart.tsx            | 37 +++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/datahub-web-react/src/app/analyticsDashboard/components/TimeSeriesChart.tsx b/datahub-web-react/src/app/analyticsDashboard/components/TimeSeriesChart.tsx
index 68851a950bcc55..85fa7843d108e5 100644
--- a/datahub-web-react/src/app/analyticsDashboard/components/TimeSeriesChart.tsx
+++ b/datahub-web-react/src/app/analyticsDashboard/components/TimeSeriesChart.tsx
@@ -84,6 +84,38 @@ export function computeLines(chartData: TimeSeriesChartType, insertBlankPoints:
     return returnLines;
 }
 
+const formatAxisDate = (value: number, chartData: TimeSeriesChartType) => {
+    const date = new Date(value);
+
+    switch (chartData.interval) {
+        case 'MONTH':
+            return date.toLocaleDateString('en-US', {
+                month: 'short',
+                year: 'numeric',
+                timeZone: 'UTC',
+            });
+        case 'WEEK':
+            return date.toLocaleDateString('en-US', {
+                month: 'short',
+                day: 'numeric',
+                timeZone: 'UTC',
+            });
+        case 'DAY':
+            return date.toLocaleDateString('en-US', {
+                weekday: 'short',
+                day: 'numeric',
+                timeZone: 'UTC',
+            });
+        default:
+            return date.toLocaleDateString('en-US', {
+                month: 'short',
+                day: 'numeric',
+                year: 'numeric',
+                timeZone: 'UTC',
+            });
+    }
+};
+
 export const TimeSeriesChart = ({
     chartData,
     width,
@@ -117,6 +149,7 @@ export const TimeSeriesChart = ({
                     strokeWidth={style?.axisWidth}
                     tickLabelProps={{ fill: 'black', fontFamily: 'inherit', fontSize: 10 }}
                     numTicks={3}
+                    tickFormat={(value) => formatAxisDate(value, chartData)}
                 />
                 <Axis
                     orientation="right"
@@ -151,9 +184,7 @@ export const TimeSeriesChart = ({
                         tooltipData?.nearestDatum && (
                             <div>
                                 <div>
-                                    {new Date(
-                                        Number(accessors.xAccessor(tooltipData.nearestDatum.datum)),
-                                    ).toDateString()}
+                                    {formatAxisDate(accessors.xAccessor(tooltipData.nearestDatum.datum), chartData)}
                                 </div>
                                 <div>{accessors.yAccessor(tooltipData.nearestDatum.datum)}</div>
                             </div>